From 2eac490bd22f5488a60e59f93ce54d4babf33c23 Mon Sep 17 00:00:00 2001
From: Jiangli Zhou <jiangli@openjdk.org>
Date: Thu, 13 Feb 2025 19:08:03 +0000
Subject: [PATCH 001/587] 8349868: Remove unneeded libjava shared library
 dependency from jtreg test libNewDirectByteBuffer, libDirectIO and
 libInheritedChannel

Reviewed-by: bpb
---
 make/test/JtregNativeJdk.gmk | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/make/test/JtregNativeJdk.gmk b/make/test/JtregNativeJdk.gmk
index be40e24ba95..60a88ca1c9a 100644
--- a/make/test/JtregNativeJdk.gmk
+++ b/make/test/JtregNativeJdk.gmk
@@ -56,7 +56,6 @@ BUILD_JDK_JTREG_EXECUTABLES_JDK_LIBS_exeCallerAccessTest := java.base:libjvm
 BUILD_JDK_JTREG_EXECUTABLES_JDK_LIBS_exeNullCallerTest := java.base:libjvm
 
 BUILD_JDK_JTREG_LIBRARIES_JDK_LIBS_libstringPlatformChars := java.base:libjava
-BUILD_JDK_JTREG_LIBRARIES_JDK_LIBS_libNewDirectByteBuffer := java.base:libjava
 BUILD_JDK_JTREG_LIBRARIES_JDK_LIBS_libGetXSpace := java.base:libjava
 
 # Platform specific setup
@@ -69,7 +68,6 @@ ifeq ($(call isTargetOs, windows), true)
   BUILD_JDK_JTREG_EXECUTABLES_LIBS_exerevokeall := advapi32.lib
   BUILD_JDK_JTREG_EXECUTABLES_CFLAGS_exeNullCallerTest := /EHsc
 else
-  BUILD_JDK_JTREG_LIBRARIES_JDK_LIBS_libDirectIO := java.base:libjava
   BUILD_JDK_JTREG_LIBRARIES_LDFLAGS_libNativeThread := -pthread
 
   # java.lang.foreign tests
@@ -83,7 +81,6 @@ else
   BUILD_JDK_JTREG_LIBRARIES_LDFLAGS_libImplicitAttach := -pthread
   BUILD_JDK_JTREG_EXCLUDE += exerevokeall.c
   ifeq ($(call isTargetOs, linux), true)
-    BUILD_JDK_JTREG_LIBRARIES_JDK_LIBS_libInheritedChannel := java.base:libjava
     BUILD_JDK_JTREG_EXECUTABLES_LIBS_exelauncher := -ldl
   endif
   BUILD_JDK_JTREG_EXECUTABLES_LIBS_exeNullCallerTest := $(LIBCXX)

From a88e2a58bf834081db55c2071d072567ea763354 Mon Sep 17 00:00:00 2001
From: Doug Simon <dnsimon@openjdk.org>
Date: Thu, 13 Feb 2025 19:35:42 +0000
Subject: [PATCH 002/587] 8349977: JVMCIRuntime::_shared_library_javavm_id
 should be jlong

Reviewed-by: yzheng, never
---
 src/hotspot/share/jvmci/jvmciCompilerToVM.cpp | 4 ++--
 src/hotspot/share/jvmci/jvmciRuntime.cpp      | 6 +++---
 src/hotspot/share/jvmci/jvmciRuntime.hpp      | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/hotspot/share/jvmci/jvmciCompilerToVM.cpp b/src/hotspot/share/jvmci/jvmciCompilerToVM.cpp
index 9bbf4fccae1..f2807dbecd7 100644
--- a/src/hotspot/share/jvmci/jvmciCompilerToVM.cpp
+++ b/src/hotspot/share/jvmci/jvmciCompilerToVM.cpp
@@ -2724,7 +2724,7 @@ C2V_VMENTRY_PREFIX(jboolean, attachCurrentThread, (JNIEnv* env, jobject c2vm, jb
     if (res == JNI_OK) {
       guarantee(peerJNIEnv != nullptr, "must be");
       runtime->init_JavaVM_info(javaVM_info, JVMCI_CHECK_0);
-      JVMCI_event_1("attached to JavaVM[%d] for JVMCI runtime %d", runtime->get_shared_library_javavm_id(), runtime->id());
+      JVMCI_event_1("attached to JavaVM[" JLONG_FORMAT "] for JVMCI runtime %d", runtime->get_shared_library_javavm_id(), runtime->id());
       return true;
     }
     JVMCI_THROW_MSG_0(InternalError, err_msg("Error %d while attaching %s", res, attach_args.name));
@@ -2757,7 +2757,7 @@ C2V_VMENTRY_PREFIX(jboolean, detachCurrentThread, (JNIEnv* env, jobject c2vm, jb
     if (res != JNI_OK) {
       JVMCI_THROW_MSG_0(InternalError, err_msg("Error %d while attaching %s", res, thread->name()));
     }
-    JVMCI_event_1("detached from JavaVM[%d] for JVMCI runtime %d",
+    JVMCI_event_1("detached from JavaVM[" JLONG_FORMAT "] for JVMCI runtime %d",
         runtime->get_shared_library_javavm_id(), runtime->id());
     if (release) {
       return runtime->detach_thread(thread, "user thread detach");
diff --git a/src/hotspot/share/jvmci/jvmciRuntime.cpp b/src/hotspot/share/jvmci/jvmciRuntime.cpp
index 9a2a1de23a5..c88a4390590 100644
--- a/src/hotspot/share/jvmci/jvmciRuntime.cpp
+++ b/src/hotspot/share/jvmci/jvmciRuntime.cpp
@@ -1569,7 +1569,7 @@ bool JVMCIRuntime::destroy_shared_library_javavm() {
   guarantee(_num_attached_threads == cannot_be_attached,
       "cannot destroy JavaVM for JVMCI runtime %d with %d attached threads", _id, _num_attached_threads);
   JavaVM* javaVM;
-  int javaVM_id = _shared_library_javavm_id;
+  jlong javaVM_id = _shared_library_javavm_id;
   {
     // Exactly one thread can destroy the JavaVM
     // and release the handle to it.
@@ -1588,9 +1588,9 @@ bool JVMCIRuntime::destroy_shared_library_javavm() {
       result = javaVM->DestroyJavaVM();
     }
     if (result == JNI_OK) {
-      JVMCI_event_1("destroyed JavaVM[%d]@" PTR_FORMAT " for JVMCI runtime %d", javaVM_id, p2i(javaVM), _id);
+      JVMCI_event_1("destroyed JavaVM[" JLONG_FORMAT "]@" PTR_FORMAT " for JVMCI runtime %d", javaVM_id, p2i(javaVM), _id);
     } else {
-      warning("Non-zero result (%d) when calling JNI_DestroyJavaVM on JavaVM[%d]@" PTR_FORMAT, result, javaVM_id, p2i(javaVM));
+      warning("Non-zero result (%d) when calling JNI_DestroyJavaVM on JavaVM[" JLONG_FORMAT "]@" PTR_FORMAT, result, javaVM_id, p2i(javaVM));
     }
     return true;
   }
diff --git a/src/hotspot/share/jvmci/jvmciRuntime.hpp b/src/hotspot/share/jvmci/jvmciRuntime.hpp
index 99738393b5b..884d11f792e 100644
--- a/src/hotspot/share/jvmci/jvmciRuntime.hpp
+++ b/src/hotspot/share/jvmci/jvmciRuntime.hpp
@@ -183,7 +183,7 @@ class JVMCIRuntime: public CHeapObj<mtJVMCI> {
   JavaVM* _shared_library_javavm;
 
   // Id for _shared_library_javavm.
-  int _shared_library_javavm_id;
+  jlong _shared_library_javavm_id;
 
   // Position and link in global list of JVMCI shared library runtimes.
   // The HotSpot heap based runtime will have an id of -1 and the
@@ -280,7 +280,7 @@ class JVMCIRuntime: public CHeapObj<mtJVMCI> {
   bool has_shared_library_javavm() { return _shared_library_javavm != nullptr; }
 
   // Gets an ID for the JVMCI shared library JavaVM associated with this runtime.
-  int get_shared_library_javavm_id() { return _shared_library_javavm_id; }
+  jlong get_shared_library_javavm_id() { return _shared_library_javavm_id; }
 
   // Copies info about the JVMCI shared library JavaVM associated with this
   // runtime into `info` as follows:

From d8fcd43a24a989b71ed30945fda78541c1e42b60 Mon Sep 17 00:00:00 2001
From: Aleksey Shipilev <shade@openjdk.org>
Date: Thu, 13 Feb 2025 20:06:33 +0000
Subject: [PATCH 003/587] 8349927: Waiting for compiler termination delays
 shutdown for 10+ ms

Reviewed-by: kvn, dholmes
---
 src/hotspot/share/runtime/vmOperations.cpp | 43 ++++++++++++++--------
 1 file changed, 27 insertions(+), 16 deletions(-)

diff --git a/src/hotspot/share/runtime/vmOperations.cpp b/src/hotspot/share/runtime/vmOperations.cpp
index 7cc8367d6d0..da833150d74 100644
--- a/src/hotspot/share/runtime/vmOperations.cpp
+++ b/src/hotspot/share/runtime/vmOperations.cpp
@@ -500,7 +500,6 @@ int VM_Exit::wait_for_threads_in_native_to_block() {
   assert(SafepointSynchronize::is_at_safepoint(), "must be at safepoint already");
 
   Thread * thr_cur = Thread::current();
-  Monitor timer(Mutex::nosafepoint, "VM_ExitTimer_lock");
 
   // Compiler threads need longer wait because they can access VM data directly
   // while in native. If they are active and some structures being used are
@@ -509,12 +508,23 @@ int VM_Exit::wait_for_threads_in_native_to_block() {
   // data, and they will be stopped during state transition. In theory, we
   // don't have to wait for user threads to be quiescent, but it's always
   // better to terminate VM when current thread is the only active thread, so
-  // wait for user threads too. Numbers are in 10 milliseconds.
-  int wait_time_per_attempt = 10;               // in milliseconds
-  int max_wait_attempts_user_thread = UserThreadWaitAttemptsAtExit;
-  int max_wait_attempts_compiler_thread = 1000; // at least 10 seconds
+  // wait for user threads too.
+
+  // Time per attempt. It is practical to start waiting with 10us delays
+  // (around scheduling delay / timer slack), and exponentially ramp up
+  // to 10ms if compiler threads are not responding.
+  jlong max_wait_time = millis_to_nanos(10);
+  jlong wait_time = 10000;
+
+  jlong start_time = os::javaTimeNanos();
+
+  // Deadline for user threads in native code.
+  // User-settable flag counts "attempts" in 10ms units, to a maximum of 10s.
+  jlong user_threads_deadline = start_time + (UserThreadWaitAttemptsAtExit * millis_to_nanos(10));
+
+  // Deadline for compiler threads: at least 10 seconds.
+  jlong compiler_threads_deadline = start_time + millis_to_nanos(10000);
 
-  int attempts = 0;
   JavaThreadIteratorWithHandle jtiwh;
   while (true) {
     int num_active = 0;
@@ -543,19 +553,20 @@ int VM_Exit::wait_for_threads_in_native_to_block() {
       }
     }
 
+    jlong time = os::javaTimeNanos();
+
     if (num_active == 0) {
-       return 0;
-    } else if (attempts >= max_wait_attempts_compiler_thread) {
-       return num_active;
-    } else if (num_active_compiler_thread == 0 &&
-               attempts >= max_wait_attempts_user_thread) {
-       return num_active;
+      return 0;
+    }
+    if (time >= compiler_threads_deadline) {
+      return num_active;
+    }
+    if ((num_active_compiler_thread == 0) && (time >= user_threads_deadline)) {
+      return num_active;
     }
 
-    attempts++;
-
-    MonitorLocker ml(&timer, Mutex::_no_safepoint_check_flag);
-    ml.wait(wait_time_per_attempt);
+    os::naked_short_nanosleep(wait_time);
+    wait_time = MIN2(max_wait_time, wait_time * 2);
   }
 }
 

From 3e7acfac48229441b243a6ac564e719963e4f43d Mon Sep 17 00:00:00 2001
From: Naoto Sato <naoto@openjdk.org>
Date: Thu, 13 Feb 2025 20:57:48 +0000
Subject: [PATCH 004/587] 8349873: StackOverflowError after JDK-8342550 if
 -Duser.timezone= is set to a deprecated zone id

Reviewed-by: joehw, jlu, iris
---
 .../share/classes/java/util/TimeZone.java     |  7 +++---
 .../java/util/TimeZone/ThreeLetterZoneID.java | 24 +++++++++++++------
 2 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/src/java.base/share/classes/java/util/TimeZone.java b/src/java.base/share/classes/java/util/TimeZone.java
index 52d06a858b0..2071ae79b20 100644
--- a/src/java.base/share/classes/java/util/TimeZone.java
+++ b/src/java.base/share/classes/java/util/TimeZone.java
@@ -47,7 +47,6 @@ import jdk.internal.util.StaticProperty;
 import sun.util.calendar.ZoneInfo;
 import sun.util.calendar.ZoneInfoFile;
 import sun.util.locale.provider.TimeZoneNameUtility;
-import sun.util.logging.PlatformLogger;
 
 /**
  * {@code TimeZone} represents a time zone offset, and also figures out daylight
@@ -599,9 +598,9 @@ public abstract class TimeZone implements Serializable, Cloneable {
 
     private static TimeZone getTimeZone(String ID, boolean fallback) {
         if (ZoneId.SHORT_IDS.containsKey(ID)) {
-            PlatformLogger.getLogger(TimeZone.class.getName())
-                .warning("Use of the three-letter time zone ID \"%s\" is deprecated and it will be removed in a future release"
-                    .formatted(ID));
+            System.err.printf(
+                "WARNING: Use of the three-letter time zone ID \"%s\" is deprecated and it will be removed in a future release%n",
+                ID);
         }
         TimeZone tz = ZoneInfo.getTimeZone(ID);
         if (tz == null) {
diff --git a/test/jdk/java/util/TimeZone/ThreeLetterZoneID.java b/test/jdk/java/util/TimeZone/ThreeLetterZoneID.java
index 5df3ebe5bf0..02b4d89ce2b 100644
--- a/test/jdk/java/util/TimeZone/ThreeLetterZoneID.java
+++ b/test/jdk/java/util/TimeZone/ThreeLetterZoneID.java
@@ -23,27 +23,37 @@
 
 /*
  * @test
- * @bug 8342550
+ * @bug 8342550 8349873
  * @summary Three-letter time zone IDs should output a deprecated warning
  *          message.
  * @library /test/lib
  * @build jdk.test.lib.process.ProcessTools
- * @run main ThreeLetterZoneID
+ * @run junit ThreeLetterZoneID
  */
 import java.util.TimeZone;
 import jdk.test.lib.process.ProcessTools;
 
+import org.junit.jupiter.api.Test;
+
 public class ThreeLetterZoneID {
-    public static void main(String... args) throws Exception {
+    private static final String WARNING =
+        "WARNING: Use of the three-letter time zone ID \"PST\" is deprecated and it will be removed in a future release";
+
+    public static void main(String... args) {
         if (args.length > 0) {
             TimeZone.getTimeZone("PST");
         } else {
-            checkWarningMessage();
+            TimeZone.getDefault();
         }
     }
 
-    public static void checkWarningMessage() throws Exception {
-        ProcessTools.executeTestJava("ThreeLetterZoneID", "dummy")
-            .shouldContain("Use of the three-letter time zone ID \"PST\" is deprecated and it will be removed in a future release");
+    @Test
+    public void testExplicitGetTimeZone() throws Exception {
+        ProcessTools.executeTestJava("ThreeLetterZoneID", "dummy").stderrShouldMatch(WARNING);
+    }
+
+    @Test
+    public void testSysProp() throws Exception {
+        ProcessTools.executeTestJava("-Duser.timezone=PST", "ThreeLetterZoneID").stderrShouldMatch(WARNING);
     }
 }

From 3741c980b865b7122d07655353657d683923c40d Mon Sep 17 00:00:00 2001
From: Justin Lu <jlu@openjdk.org>
Date: Thu, 13 Feb 2025 22:25:23 +0000
Subject: [PATCH 005/587] 8349883: Locale.LanguageRange.parse("-") throws
 ArrayIndexOutOfBoundsException

Reviewed-by: naoto
---
 .../share/classes/java/util/Locale.java       |  8 +-
 test/jdk/java/util/Locale/LRToString.java     | 64 ----------------
 .../java/util/Locale/LanguageRangeTest.java   | 76 +++++++++++++++++--
 3 files changed, 71 insertions(+), 77 deletions(-)
 delete mode 100644 test/jdk/java/util/Locale/LRToString.java

diff --git a/src/java.base/share/classes/java/util/Locale.java b/src/java.base/share/classes/java/util/Locale.java
index 1dd4c2feca7..f6abefb29a7 100644
--- a/src/java.base/share/classes/java/util/Locale.java
+++ b/src/java.base/share/classes/java/util/Locale.java
@@ -3266,9 +3266,7 @@ public final class Locale implements Cloneable, Serializable {
          * or greater than {@code MAX_WEIGHT}
          */
         public LanguageRange(String range, double weight) {
-            if (range == null) {
-                throw new NullPointerException();
-            }
+            Objects.requireNonNull(range);
             if (weight < MIN_WEIGHT || weight > MAX_WEIGHT) {
                 throw new IllegalArgumentException("weight=" + weight);
             }
@@ -3278,8 +3276,8 @@ public final class Locale implements Cloneable, Serializable {
             // Do syntax check.
             boolean isIllFormed = false;
             String[] subtags = range.split("-");
-            if (isSubtagIllFormed(subtags[0], true)
-                || range.endsWith("-")) {
+            if (range.endsWith("-") ||
+                    isSubtagIllFormed(subtags[0], true)) {
                 isIllFormed = true;
             } else {
                 for (int i = 1; i < subtags.length; i++) {
diff --git a/test/jdk/java/util/Locale/LRToString.java b/test/jdk/java/util/Locale/LRToString.java
deleted file mode 100644
index 229507b71b3..00000000000
--- a/test/jdk/java/util/Locale/LRToString.java
+++ /dev/null
@@ -1,64 +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 8026766
- * @summary Confirm that LanguageRange.toString() returns an expected result.
- * @run junit LRToString
- */
-
-import java.util.Locale.LanguageRange;
-import java.util.stream.Stream;
-
-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.assertEquals;
-
-public class LRToString {
-
-    /**
-     * This test ensures that the output of LanguageRange.toString()
-     * returns an expected result, that is, the weight is hidden if it is
-     * equal to 1.0.
-     */
-    @ParameterizedTest
-    @MethodSource("ranges")
-    public void toStringTest(String range, double weight) {
-        LanguageRange lr = new LanguageRange(range, weight);
-        String expected = weight == 1.0
-                ? range
-                : range+";q="+weight;
-        assertEquals(lr.toString(), expected);
-    }
-
-    private static Stream<Arguments> ranges() {
-        return Stream.of(
-                Arguments.of("ja", 1.0),
-                Arguments.of("de", 0.5),
-                Arguments.of("fr", 0.0)
-        );
-    }
-}
diff --git a/test/jdk/java/util/Locale/LanguageRangeTest.java b/test/jdk/java/util/Locale/LanguageRangeTest.java
index cb0dd9fda66..d269cb9dc15 100644
--- a/test/jdk/java/util/Locale/LanguageRangeTest.java
+++ b/test/jdk/java/util/Locale/LanguageRangeTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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,62 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-/**
+
+/*
  * @test
- * @bug 8253321
- * @summary test LanguageRange class
- * @run testng LanguageRangeTest
+ * @bug 8026766 8253321 8349883
+ * @summary LanguageRange tests: toString(), hashCode()/equals(), checking
+ *          for IAE on ill-formed ranges
+ * @run junit LanguageRangeTest
  */
 
 import static java.util.Locale.LanguageRange;
 
-import org.testng.annotations.Test;
-import static org.testng.Assert.assertEquals;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+
+import java.util.HashMap;
+import java.util.Locale;
+import java.util.stream.Stream;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-@Test
 public class LanguageRangeTest {
 
+    // 8349883: Test endpoints w/ ill-formed language range fail with IAE
+    @ParameterizedTest
+    @MethodSource("illegalRanges")
+    public void illformedRangeTest(String range) {
+        // static parses
+        assertThrows(IllegalArgumentException.class,
+                () -> Locale.LanguageRange.parse(range));
+        assertThrows(IllegalArgumentException.class,
+                () -> Locale.LanguageRange.parse(range, new HashMap<>()));
+        // ctors
+        assertThrows(IllegalArgumentException.class,
+                () -> new Locale.LanguageRange(range));
+        assertThrows(IllegalArgumentException.class,
+                () -> new Locale.LanguageRange(range, Locale.LanguageRange.MIN_WEIGHT));
+    }
+
+    private static Stream<String> illegalRanges() {
+        return Stream.of(
+                // 8349883 offending range
+                "-",
+                // Other general ill-formed test cases
+                "-foo",
+                "foo-",
+                "foo1",
+                "foo-123456789",
+                "*-*-",
+                ""
+        );
+    }
+
+    // 8253321: Ensure invoking hashCode does not affect equals result
     @Test
     public void hashCodeTest() {
         var range1 = new LanguageRange("en-GB", 0);
@@ -45,4 +86,23 @@ public class LanguageRangeTest {
         range2.hashCode();
         assertEquals(range1, range2);
     }
+
+    // 8026766: toString() should hide weight if equal to MAX_WEIGHT (1.0)
+    @ParameterizedTest
+    @MethodSource("ranges")
+    public void toStringTest(String range, double weight) {
+        LanguageRange lr = new LanguageRange(range, weight);
+        String expected = weight == 1.0
+                ? range
+                : range+";q="+weight;
+        assertEquals(lr.toString(), expected);
+    }
+
+    private static Stream<Arguments> ranges() {
+        return Stream.of(
+                Arguments.of("ja", 1.0),
+                Arguments.of("de", 0.5),
+                Arguments.of("fr", 0.0)
+        );
+    }
 }

From ff52859d2ad65b97c56dd19323213a0d07be47ae Mon Sep 17 00:00:00 2001
From: Alexey Semenyuk <asemenyuk@openjdk.org>
Date: Thu, 13 Feb 2025 22:53:30 +0000
Subject: [PATCH 006/587] 8285624: jpackage fails to create exe, msi when
 Windows OS is in FIPS mode

Reviewed-by: almatvee
---
 .../jdk/jpackage/internal/WixPipeline.java    |   6 +-
 .../jdk/jpackage/internal/WixTool.java        | 126 ++++++++++++------
 .../jdk/jpackage/internal/WixToolset.java     |  13 +-
 3 files changed, 97 insertions(+), 48 deletions(-)

diff --git a/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WixPipeline.java b/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WixPipeline.java
index d7c1b54a48c..be15b202877 100644
--- a/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WixPipeline.java
+++ b/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WixPipeline.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -258,6 +258,10 @@ final class WixPipeline {
                 "-out", wixObj.toString()
         ));
 
+        if (toolset.needFipsParameter()) {
+            cmdline.add("-fips");
+        }
+
         addWixVariblesToCommandLine(wixSource.variables, cmdline);
 
         execute(cmdline);
diff --git a/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WixTool.java b/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WixTool.java
index ee98327b032..e2c84ab8be4 100644
--- a/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WixTool.java
+++ b/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WixTool.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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,25 +56,45 @@ public enum WixTool {
         this.minimalVersion = minimalVersion;
     }
 
-    static final class ToolInfo {
+    interface ToolInfo {
+        Path path();
+        DottedVersion version();
+    }
 
-        ToolInfo(Path path, String version) {
-            this.path = path;
-            this.version = DottedVersion.lazy(version);
+    interface CandleInfo extends ToolInfo {
+        boolean fips();
+    }
+
+    private record DefaultToolInfo(Path path, DottedVersion version) implements ToolInfo {
+        DefaultToolInfo {
+            Objects.requireNonNull(path);
+            Objects.requireNonNull(version);
         }
 
-        final Path path;
-        final DottedVersion version;
+        DefaultToolInfo(Path path, String version) {
+            this(path, DottedVersion.lazy(version));
+        }
+    }
+
+    private record DefaultCandleInfo(Path path, DottedVersion version, boolean fips) implements CandleInfo {
+        DefaultCandleInfo {
+            Objects.requireNonNull(path);
+            Objects.requireNonNull(version);
+        }
+
+        DefaultCandleInfo(ToolInfo info, boolean fips) {
+            this(info.path(), info.version(), fips);
+        }
     }
 
     static WixToolset createToolset() throws ConfigException {
         Function<List<ToolLookupResult>, Map<WixTool, ToolInfo>> conv = lookupResults -> {
             return lookupResults.stream().filter(ToolLookupResult::isValid).collect(Collectors.
                     groupingBy(lookupResult -> {
-                return lookupResult.getInfo().version.toString();
+                return lookupResult.info().version().toString();
             })).values().stream().filter(sameVersionLookupResults -> {
                 Set<WixTool> sameVersionTools = sameVersionLookupResults.stream().map(
-                        ToolLookupResult::getTool).collect(Collectors.toSet());
+                        ToolLookupResult::tool).collect(Collectors.toSet());
                 if (sameVersionTools.equals(Set.of(Candle3)) || sameVersionTools.equals(Set.of(
                         Light3))) {
                     // There is only one tool from WiX v3 toolset of some version available. Discard it.
@@ -82,10 +102,10 @@ public enum WixTool {
                 } else {
                     return true;
                 }
-            }).flatMap(List::stream).collect(Collectors.toMap(ToolLookupResult::getTool,
-                    ToolLookupResult::getInfo, (ToolInfo x, ToolInfo y) -> {
+            }).flatMap(List::stream).collect(Collectors.toMap(ToolLookupResult::tool,
+                    ToolLookupResult::info, (ToolInfo x, ToolInfo y) -> {
                         return Stream.of(x, y).sorted(Comparator.comparing((ToolInfo toolInfo) -> {
-                            return toolInfo.version.toComponentsString();
+                            return toolInfo.version().toComponentsString();
                         }).reversed()).findFirst().get();
                     }));
         };
@@ -99,8 +119,8 @@ public enum WixTool {
         };
 
         var toolsInPath = Stream.of(values()).map(tool -> {
-            return new ToolLookupResult(tool, null);
-        }).toList();
+            return ToolLookupResult.lookup(tool, Optional.empty());
+        }).filter(Optional::isPresent).map(Optional::get).toList();
 
         // Try to build a toolset from tools in the PATH first.
         var toolset = createToolset.apply(toolsInPath);
@@ -111,9 +131,9 @@ public enum WixTool {
         // Look up for WiX tools in known locations.
         var toolsInKnownWiXDirs = findWixInstallDirs().stream().map(dir -> {
             return Stream.of(values()).map(tool -> {
-                return new ToolLookupResult(tool, dir);
+                return ToolLookupResult.lookup(tool, Optional.of(dir));
             });
-        }).flatMap(Function.identity()).toList();
+        }).flatMap(Function.identity()).filter(Optional::isPresent).map(Optional::get).toList();
 
         // Build a toolset found in the PATH and in known locations.
         var allFoundTools = Stream.of(toolsInPath, toolsInKnownWiXDirs).flatMap(List::stream).filter(
@@ -128,8 +148,8 @@ public enum WixTool {
             var toolOldVerErr = allFoundTools.stream().map(lookupResult -> {
                 if (lookupResult.versionTooOld) {
                     return new ConfigException(MessageFormat.format(I18N.getString(
-                            "message.wrong-tool-version"), lookupResult.getInfo().path,
-                            lookupResult.getInfo().version, lookupResult.getTool().minimalVersion),
+                            "message.wrong-tool-version"), lookupResult.info().path(),
+                            lookupResult.info().version(), lookupResult.tool().minimalVersion),
                             I18N.getString("error.no-wix-tools.advice"));
                 } else {
                     return null;
@@ -144,11 +164,18 @@ public enum WixTool {
         }
     }
 
-    private static class ToolLookupResult {
+    private record ToolLookupResult(WixTool tool, ToolInfo info, boolean versionTooOld) {
 
-        ToolLookupResult(WixTool tool, Path lookupDir) {
+        ToolLookupResult {
+            Objects.requireNonNull(tool);
+            Objects.requireNonNull(info);
+        }
 
-            final Path toolPath = Optional.ofNullable(lookupDir).map(p -> p.resolve(
+        static Optional<ToolLookupResult> lookup(WixTool tool, Optional<Path> lookupDir) {
+            Objects.requireNonNull(tool);
+            Objects.requireNonNull(lookupDir);
+
+            final Path toolPath = lookupDir.map(p -> p.resolve(
                     tool.toolFileName)).orElse(tool.toolFileName);
 
             final boolean[] tooOld = new boolean[1];
@@ -165,7 +192,19 @@ public enum WixTool {
             final Function<Stream<String>, String> versionParser;
 
             if (Set.of(Candle3, Light3).contains(tool)) {
-                validator.setCommandLine("/?");
+                final String printVersionArg;
+                if (tool == Candle3) {
+                    // Add '-fips' to make "candle.exe" print help message and return
+                    // 0 exit code instead of returning error exit code and printing
+                    // "error CNDL0308 : The Federal Information Processing Standard (FIPS) appears to be enabled on the machine..."
+                    // error message if FIPS is enabled.
+                    // If FIPS is disabled, passing '-fips' parameter still makes
+                    // "candle.exe" print help message and return 0 exit code.
+                    printVersionArg = "-fips";
+                } else {
+                    printVersionArg = "-?";
+                }
+                validator.setCommandLine(printVersionArg);
                 versionParser = output -> {
                     String firstLineOfOutput = output.findFirst().orElse("");
                     int separatorIdx = firstLineOfOutput.lastIndexOf(' ');
@@ -186,36 +225,35 @@ public enum WixTool {
                 return parsedVersion[0];
             });
 
-            this.tool = tool;
             if (validator.validate() == null) {
                 // Tool found
-                this.versionTooOld = tooOld[0];
-                this.info = new ToolInfo(toolPath, parsedVersion[0]);
+                ToolInfo info = new DefaultToolInfo(toolPath, parsedVersion[0]);
+                if (tool == Candle3) {
+                    // Detect FIPS mode
+                    var fips = false;
+                    try {
+                        final var exec = Executor.of(toolPath.toString(), "-?").setQuiet(true).saveOutput(true);
+                        final var exitCode = exec.execute();
+                        if (exitCode != 0 /* 308 */) {
+                            final var output = exec.getOutput();
+                            if (!output.isEmpty() && output.get(0).contains("error CNDL0308")) {
+                                fips = true;
+                            }
+                        }
+                    } catch (IOException ex) {
+                        Log.verbose(ex);
+                    }
+                    info = new DefaultCandleInfo(info, fips);
+                }
+                return Optional.of(new ToolLookupResult(tool, info, tooOld[0]));
             } else {
-                this.versionTooOld = false;
-                this.info = null;
+                return Optional.empty();
             }
         }
 
-        WixTool getTool() {
-            return tool;
-        }
-
-        ToolInfo getInfo() {
-            return info;
-        }
-
         boolean isValid() {
-            return info != null && !versionTooOld;
+            return !versionTooOld;
         }
-
-        boolean isVersionTooOld() {
-            return versionTooOld;
-        }
-
-        private final WixTool tool;
-        private final ToolInfo info;
-        private final boolean versionTooOld;
     }
 
     private static Path getSystemDir(String envVar, String knownDir) {
diff --git a/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WixToolset.java b/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WixToolset.java
index ab433616f44..046dc5efe4e 100644
--- a/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WixToolset.java
+++ b/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WixToolset.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2024, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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,18 @@ final class WixToolset {
     }
 
     Path getToolPath(WixTool tool) {
-        return tools.get(tool).path;
+        return tools.get(tool).path();
     }
 
     DottedVersion getVersion() {
-        return tools.values().iterator().next().version;
+        return tools.values().iterator().next().version();
+    }
+
+    boolean needFipsParameter() {
+        return tools.values().stream()
+                .filter(WixTool.CandleInfo.class::isInstance)
+                .map(WixTool.CandleInfo.class::cast)
+                .anyMatch(WixTool.CandleInfo::fips);
     }
 
     static WixToolset create(Set<WixTool> requiredTools, Map<WixTool, WixTool.ToolInfo> allTools) {

From 57f4c30fb6be1da57c8fcc742b5c36d842eef397 Mon Sep 17 00:00:00 2001
From: Dmitry Chuyko <dchuyko@openjdk.org>
Date: Fri, 14 Feb 2025 07:54:44 +0000
Subject: [PATCH 007/587] 8347917: AArch64: Enable upper GPR registers in C1

Reviewed-by: aph
---
 src/hotspot/cpu/aarch64/c1_Defs_aarch64.hpp   | 15 ++++----
 .../cpu/aarch64/c1_FrameMap_aarch64.cpp       | 34 +++++++++++++++++--
 .../cpu/aarch64/c1_FrameMap_aarch64.hpp       | 27 ++++++++++++---
 .../cpu/aarch64/c1_LinearScan_aarch64.hpp     |  8 ++---
 .../cpu/aarch64/c1_Runtime1_aarch64.cpp       | 17 ++++++----
 src/hotspot/share/c1/c1_Compiler.cpp          |  2 +-
 src/hotspot/share/c1/c1_FrameMap.hpp          |  3 +-
 7 files changed, 80 insertions(+), 26 deletions(-)

diff --git a/src/hotspot/cpu/aarch64/c1_Defs_aarch64.hpp b/src/hotspot/cpu/aarch64/c1_Defs_aarch64.hpp
index 9470caae9fe..5f65ef5f043 100644
--- a/src/hotspot/cpu/aarch64/c1_Defs_aarch64.hpp
+++ b/src/hotspot/cpu/aarch64/c1_Defs_aarch64.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2025, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2014, Red Hat Inc. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -41,16 +41,17 @@ enum {
 
 // registers
 enum {
+  pd_nof_available_regs = 32,
   pd_nof_cpu_regs_frame_map = Register::number_of_registers,       // number of GP registers used during code emission
   pd_nof_fpu_regs_frame_map = FloatRegister::number_of_registers,  // number of FP registers used during code emission
 
-  pd_nof_caller_save_cpu_regs_frame_map = 19 - 2 /* rscratch1 and rscratch2 */ R18_RESERVED_ONLY(- 1),  // number of registers killed by calls
+  pd_nof_caller_save_cpu_regs_frame_map = pd_nof_available_regs,  // number of registers killed by calls
   pd_nof_caller_save_fpu_regs_frame_map = 32,  // number of registers killed by calls
 
-  pd_first_callee_saved_reg = 19 - 2 /* rscratch1 and rscratch2 */ R18_RESERVED_ONLY(- 1),
-  pd_last_callee_saved_reg = 26 - 2 /* rscratch1 and rscratch2 */ R18_RESERVED_ONLY(- 1),
+  pd_first_callee_saved_reg = pd_nof_available_regs - 1,
+  pd_last_callee_saved_reg = pd_first_callee_saved_reg - 1, // in fact, no callee saved regs
 
-  pd_last_allocatable_cpu_reg = 16 R18_RESERVED_ONLY(- 1),
+  pd_last_allocatable_cpu_reg = pd_nof_available_regs - 1,
 
   pd_nof_cpu_regs_reg_alloc
     = pd_last_allocatable_cpu_reg + 1,  // number of registers that are visible to register allocator
@@ -60,9 +61,9 @@ enum {
   pd_nof_fpu_regs_linearscan = pd_nof_fpu_regs_frame_map, // number of registers visible to linear scan
   pd_nof_xmm_regs_linearscan = 0,  // don't have vector registers
   pd_first_cpu_reg = 0,
-  pd_last_cpu_reg = 16 R18_RESERVED_ONLY(- 1),
+  pd_last_cpu_reg = pd_nof_available_regs - 1,
   pd_first_byte_reg = 0,
-  pd_last_byte_reg = 16 R18_RESERVED_ONLY(- 1),
+  pd_last_byte_reg = pd_last_cpu_reg,
   pd_first_fpu_reg = pd_nof_cpu_regs_frame_map,
   pd_last_fpu_reg =  pd_first_fpu_reg + 31,
 
diff --git a/src/hotspot/cpu/aarch64/c1_FrameMap_aarch64.cpp b/src/hotspot/cpu/aarch64/c1_FrameMap_aarch64.cpp
index 051b2ff47c1..9d30092b45a 100644
--- a/src/hotspot/cpu/aarch64/c1_FrameMap_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/c1_FrameMap_aarch64.cpp
@@ -193,9 +193,26 @@ void FrameMap::initialize() {
   map_register(i, r25); r25_opr = LIR_OprFact::single_cpu(i); i++;
   map_register(i, r26); r26_opr = LIR_OprFact::single_cpu(i); i++;
 
-  map_register(i, r27); r27_opr = LIR_OprFact::single_cpu(i); i++; // rheapbase
+  // r27 is allocated conditionally. With compressed oops it holds
+  // the heapbase value and is not visible to the allocator.
+  bool preserve_rheapbase = i >= nof_caller_save_cpu_regs();
+  if (!preserve_rheapbase) {
+    map_register(i, r27); r27_opr = LIR_OprFact::single_cpu(i); i++; // rheapbase
+  }
+
+  if(!PreserveFramePointer) {
+    map_register(i, r29); r29_opr = LIR_OprFact::single_cpu(i); i++;
+  }
+
+  // The unallocatable registers are at the end
+
+  if (preserve_rheapbase) {
+    map_register(i, r27); r27_opr = LIR_OprFact::single_cpu(i); i++; // rheapbase
+  }
   map_register(i, r28); r28_opr = LIR_OprFact::single_cpu(i); i++; // rthread
-  map_register(i, r29); r29_opr = LIR_OprFact::single_cpu(i); i++; // rfp
+  if(PreserveFramePointer) {
+    map_register(i, r29); r29_opr = LIR_OprFact::single_cpu(i); i++; // rfp
+  }
   map_register(i, r30); r30_opr = LIR_OprFact::single_cpu(i); i++; // lr
   map_register(i, r31_sp); sp_opr = LIR_OprFact::single_cpu(i); i++; // sp
   map_register(i, r8); r8_opr = LIR_OprFact::single_cpu(i); i++;   // rscratch1
@@ -239,6 +256,19 @@ void FrameMap::initialize() {
   _caller_save_cpu_regs[16] = r18_opr;
 #endif
 
+  _caller_save_cpu_regs[17 R18_RESERVED_ONLY(-1)] = r19_opr;
+  _caller_save_cpu_regs[18 R18_RESERVED_ONLY(-1)] = r20_opr;
+  _caller_save_cpu_regs[19 R18_RESERVED_ONLY(-1)] = r21_opr;
+  _caller_save_cpu_regs[20 R18_RESERVED_ONLY(-1)] = r22_opr;
+  _caller_save_cpu_regs[21 R18_RESERVED_ONLY(-1)] = r23_opr;
+  _caller_save_cpu_regs[22 R18_RESERVED_ONLY(-1)] = r24_opr;
+  _caller_save_cpu_regs[23 R18_RESERVED_ONLY(-1)] = r25_opr;
+  _caller_save_cpu_regs[24 R18_RESERVED_ONLY(-1)] = r26_opr;
+
+  if (nof_caller_save_cpu_regs() > 25 R18_RESERVED_ONLY(-1)) {
+    _caller_save_cpu_regs[25 R18_RESERVED_ONLY(-1)] = r27_opr;
+  }
+
   for (int i = 0; i < 8; i++) {
     _caller_save_fpu_regs[i] = LIR_OprFact::single_fpu(i);
   }
diff --git a/src/hotspot/cpu/aarch64/c1_FrameMap_aarch64.hpp b/src/hotspot/cpu/aarch64/c1_FrameMap_aarch64.hpp
index 3ec3ce1f679..4d783418429 100644
--- a/src/hotspot/cpu/aarch64/c1_FrameMap_aarch64.hpp
+++ b/src/hotspot/cpu/aarch64/c1_FrameMap_aarch64.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2025, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2014, Red Hat Inc. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -140,8 +140,27 @@
   static bool is_caller_save_register (LIR_Opr opr) { return true; }
   static bool is_caller_save_register (Register r) { return true; }
 
-  static int nof_caller_save_cpu_regs() { return pd_nof_caller_save_cpu_regs_frame_map; }
-  static int last_cpu_reg()             { return pd_last_cpu_reg;  }
-  static int last_byte_reg()            { return pd_last_byte_reg; }
+  static int adjust_reg_range(int range, bool exclude_fp = true) {
+    // r27 is not allocatable when compressed oops is on and heapbase is not
+    // zero, compressed klass pointers doesn't use r27 after JDK-8234794
+    if (UseCompressedOops && (CompressedOops::base() != nullptr)) {
+      range -= 1;
+    }
+
+    // r29 is not allocatable when PreserveFramePointer is on,
+    // but fp saving is handled in MacroAssembler::build_frame()/remove_frame()
+    if (exclude_fp) {
+      range -= 1;
+    }
+
+    // rscratch registers r8, r9
+    // r28=rthread, r30=lr, r31=sp
+    // r18 on masOS/Windows
+    return range - 5 R18_RESERVED_ONLY(-1);
+  }
+
+  static int nof_caller_save_cpu_regs() { return adjust_reg_range(pd_nof_caller_save_cpu_regs_frame_map);  }
+  static int last_cpu_reg()             { return adjust_reg_range(pd_last_cpu_reg, PreserveFramePointer);  }
+  static int last_byte_reg()            { return adjust_reg_range(pd_last_byte_reg, PreserveFramePointer); }
 
 #endif // CPU_AARCH64_C1_FRAMEMAP_AARCH64_HPP
diff --git a/src/hotspot/cpu/aarch64/c1_LinearScan_aarch64.hpp b/src/hotspot/cpu/aarch64/c1_LinearScan_aarch64.hpp
index 01a4d27532a..4062adf4154 100644
--- a/src/hotspot/cpu/aarch64/c1_LinearScan_aarch64.hpp
+++ b/src/hotspot/cpu/aarch64/c1_LinearScan_aarch64.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2025, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2014, Red Hat Inc. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -41,9 +41,9 @@ inline bool LinearScan::requires_adjacent_regs(BasicType type) {
 
 inline bool LinearScan::is_caller_save(int assigned_reg) {
   assert(assigned_reg >= 0 && assigned_reg < nof_regs, "should call this only for registers");
-  if (assigned_reg < pd_first_callee_saved_reg)
+  if (assigned_reg < FrameMap::nof_caller_save_cpu_regs())
     return true;
-  if (assigned_reg > pd_last_callee_saved_reg && assigned_reg < pd_first_callee_saved_fpu_reg)
+  if (assigned_reg >= pd_first_fpu_reg && assigned_reg < pd_first_callee_saved_fpu_reg)
     return true;
   if (assigned_reg > pd_last_callee_saved_fpu_reg && assigned_reg < pd_last_fpu_reg)
     return true;
@@ -66,7 +66,7 @@ inline bool LinearScanWalker::pd_init_regs_for_alloc(Interval* cur) {
     return true;
   } else if (cur->type() == T_INT || cur->type() == T_LONG || cur->type() == T_OBJECT || cur->type() == T_ADDRESS || cur->type() == T_METADATA) {
     _first_reg = pd_first_cpu_reg;
-    _last_reg = pd_last_allocatable_cpu_reg;
+    _last_reg = FrameMap::last_cpu_reg();
     return true;
   }
   return false;
diff --git a/src/hotspot/cpu/aarch64/c1_Runtime1_aarch64.cpp b/src/hotspot/cpu/aarch64/c1_Runtime1_aarch64.cpp
index 7082b4110cd..063918ee20b 100644
--- a/src/hotspot/cpu/aarch64/c1_Runtime1_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/c1_Runtime1_aarch64.cpp
@@ -257,15 +257,18 @@ static OopMap* generate_oop_map(StubAssembler* sasm, bool save_fpu_registers) {
   int frame_size_in_slots = frame_size_in_bytes / sizeof(jint);
   OopMap* oop_map = new OopMap(frame_size_in_slots, 0);
 
-  for (int i = 0; i < FrameMap::nof_cpu_regs; i++) {
-    Register r = as_Register(i);
-    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());
-    }
+  for (int i = 0; i < FrameMap::nof_caller_save_cpu_regs(); i++) {
+    LIR_Opr opr = FrameMap::caller_save_cpu_reg_at(i);
+    Register r = opr->as_register();
+    int reg_num = r->encoding();
+    int sp_offset = cpu_reg_save_offsets[reg_num];
+    oop_map->set_callee_saved(VMRegImpl::stack2reg(cpu_reg_save_offsets[reg_num]), r->as_VMReg());
   }
 
+  Register r = rthread;
+  int reg_num = r->encoding();
+  oop_map->set_callee_saved(VMRegImpl::stack2reg(cpu_reg_save_offsets[reg_num]), r->as_VMReg());
+
   if (save_fpu_registers) {
     for (int i = 0; i < FrameMap::nof_fpu_regs; i++) {
       FloatRegister r = as_FloatRegister(i);
diff --git a/src/hotspot/share/c1/c1_Compiler.cpp b/src/hotspot/share/c1/c1_Compiler.cpp
index 7d2e6ee75d9..a26320589c4 100644
--- a/src/hotspot/share/c1/c1_Compiler.cpp
+++ b/src/hotspot/share/c1/c1_Compiler.cpp
@@ -49,8 +49,8 @@ Compiler::Compiler() : AbstractCompiler(compiler_c1) {
 
 void Compiler::init_c1_runtime() {
   BufferBlob* buffer_blob = CompilerThread::current()->get_buffer_blob();
-  Runtime1::initialize(buffer_blob);
   FrameMap::initialize();
+  Runtime1::initialize(buffer_blob);
   // initialize data structures
   ValueType::initialize();
   GraphBuilder::initialize();
diff --git a/src/hotspot/share/c1/c1_FrameMap.hpp b/src/hotspot/share/c1/c1_FrameMap.hpp
index 1fd7dd3edff..dab3aa6e734 100644
--- a/src/hotspot/share/c1/c1_FrameMap.hpp
+++ b/src/hotspot/share/c1/c1_FrameMap.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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 "runtime/frame.hpp"
 #include "utilities/globalDefinitions.hpp"
 #include "utilities/macros.hpp"
+#include "oops/compressedOops.hpp"
 
 class ciMethod;
 class CallingConvention;

From fa1bd2344e60163bf247c668b94f98c50c72855a Mon Sep 17 00:00:00 2001
From: Nizar Benalla <nbenalla@openjdk.org>
Date: Fri, 14 Feb 2025 12:24:36 +0000
Subject: [PATCH 008/587] 8343802: Prevent NULL usage backsliding

Reviewed-by: kbarrett
---
 test/hotspot/jtreg/TEST.groups             |   6 +-
 test/hotspot/jtreg/sources/TestNoNULL.java | 140 +++++++++++++++++++++
 2 files changed, 145 insertions(+), 1 deletion(-)
 create mode 100644 test/hotspot/jtreg/sources/TestNoNULL.java

diff --git a/test/hotspot/jtreg/TEST.groups b/test/hotspot/jtreg/TEST.groups
index c3bc2351ac8..abbcc90f8c7 100644
--- a/test/hotspot/jtreg/TEST.groups
+++ b/test/hotspot/jtreg/TEST.groups
@@ -629,12 +629,16 @@ tier1_serviceability = \
   -serviceability/sa/TestJmapCore.java \
   -serviceability/sa/TestJmapCoreMetaspace.java
 
+tier1_sources = \
+   sources
+
 tier1 = \
   :tier1_common \
   :tier1_compiler \
   :tier1_gc \
   :tier1_runtime \
-  :tier1_serviceability
+  :tier1_serviceability \
+  :tier1_sources
 
 tier2 = \
   :hotspot_tier2_runtime \
diff --git a/test/hotspot/jtreg/sources/TestNoNULL.java b/test/hotspot/jtreg/sources/TestNoNULL.java
new file mode 100644
index 00000000000..73a415466fe
--- /dev/null
+++ b/test/hotspot/jtreg/sources/TestNoNULL.java
@@ -0,0 +1,140 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact 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 8343802
+ * @summary Test prevent NULL backsliding in hotspot code and tests
+ * @run main TestNoNULL
+ */
+
+import java.io.IOException;
+import java.nio.charset.MalformedInputException;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.*;
+import java.nio.file.attribute.BasicFileAttributes;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import java.util.regex.Pattern;
+
+public class TestNoNULL {
+    private static final Set<String> excludedSourceFiles = new HashSet<>();
+    private static final Set<String> excludedTestFiles = new HashSet<>();
+    private static final Set<String> excludedTestExtensions = Set.of(".c", ".java", ".jar", ".class", ".zip");
+    private static final Pattern NULL_PATTERN = Pattern.compile("\\bNULL\\b");
+    private static Path dir = Paths.get(System.getProperty("test.src"));
+    private static int errorCount = 0;
+
+    public static void main(String[] args) throws IOException {
+        int maxIter = 20;
+        while (maxIter-- > 0 && dir != null && !Files.exists(dir.resolve("src"))) {
+            dir = dir.getParent();
+        }
+
+        if (dir == null) {
+            throw new RuntimeException("Could not locate the 'src' directory within 20 parent directories.");
+        }
+
+        Path srcPath = dir.resolve("src").resolve("hotspot");
+        Path testPath = dir.resolve("test").resolve("hotspot");
+
+        initializeExcludedPaths(dir);
+
+        if (Files.exists(srcPath)) {
+            processFiles(srcPath, excludedSourceFiles, Set.of());
+        }
+        processFiles(testPath, excludedTestFiles, excludedTestExtensions);
+
+        if (errorCount > 0) {
+            throw new RuntimeException("Test found " + errorCount + " usages of 'NULL' in source files. See errors above.");
+        }
+    }
+
+    private static void initializeExcludedPaths(Path rootDir) {
+        List<String> sourceExclusions = List.of(
+                "src/hotspot/share/prims/jvmti.xml",
+                "src/hotspot/share/prims/jvmti.xsl",
+                "src/hotspot/share/utilities/globalDefinitions_visCPP.hpp"
+        );
+
+        List<String> testExclusions = List.of(
+                "test/hotspot/jtreg/vmTestbase/nsk/share/jvmti/README",
+                "test/hotspot/jtreg/vmTestbase/nsk/share/jni/README"
+        );
+
+        sourceExclusions.forEach(relativePath ->
+                excludedSourceFiles.add(rootDir.resolve(relativePath).normalize().toString()));
+        testExclusions.forEach(relativePath ->
+                excludedTestFiles.add(rootDir.resolve(relativePath).normalize().toString()));
+    }
+
+    private static void processFiles(Path directory, Set<String> excludedFiles, Set<String> excludedExtensions) throws IOException {
+        Files.walkFileTree(directory, new SimpleFileVisitor<>() {
+            @Override
+            public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) {
+                if (isIncluded(file, excludedFiles, excludedExtensions)) {
+                    checkForNull(file);
+                }
+                return FileVisitResult.CONTINUE;
+            }
+
+            @Override
+            public FileVisitResult postVisitDirectory(Path dir, IOException exc) {
+                return FileVisitResult.CONTINUE;
+            }
+        });
+    }
+
+    private static boolean isIncluded(Path file, Set<String> excludedFiles, Set<String> excludedExtensions) {
+        String filePath = file.normalize().toString();
+
+        if (excludedFiles.contains(filePath)) {
+            return false;
+        }
+
+        for (String ext : excludedExtensions) {
+            if (filePath.endsWith(ext)) {
+                return false;
+            }
+        }
+
+        return true;
+    }
+
+    private static void checkForNull(Path path) {
+        try {
+            List<String> lines = Files.readAllLines(path, StandardCharsets.UTF_8);
+            for (int i = 0; i < lines.size(); i++) {
+                if (NULL_PATTERN.matcher(lines.get(i)).find()) {
+                    errorCount++;
+                    System.err.printf("Error: 'NULL' found in %s at line %d:%n%s%n", path, i + 1, lines.get(i));
+                }
+            }
+        } catch (MalformedInputException e) {
+            System.err.println("Skipping binary file: " + path);
+        } catch (IOException e) {
+            System.err.printf("Skipping unreadable file: " + path);
+        }
+    }
+}

From 19c0ce43e258d00d77314d76a361feb2069a5af1 Mon Sep 17 00:00:00 2001
From: Alexander Zvegintsev <azvegint@openjdk.org>
Date: Fri, 14 Feb 2025 12:55:36 +0000
Subject: [PATCH 009/587] 8349751: AIX build failure after upgrade pipewire to
 1.3.81

Reviewed-by: mdoerr
---
 .../unix/native/libpipewire/include/spa/utils/endian.h        | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/java.desktop/unix/native/libpipewire/include/spa/utils/endian.h b/src/java.desktop/unix/native/libpipewire/include/spa/utils/endian.h
index 2d002d4538c..0a8f62c73ce 100644
--- a/src/java.desktop/unix/native/libpipewire/include/spa/utils/endian.h
+++ b/src/java.desktop/unix/native/libpipewire/include/spa/utils/endian.h
@@ -18,6 +18,10 @@
 #define bswap_16 _byteswap_ushort
 #define bswap_32 _byteswap_ulong
 #define bswap_64 _byteswap_uint64
+#elif defined(AIX)
+#include <sys/machine.h>
+#define __BIG_ENDIAN      BIG_ENDIAN
+#define __BYTE_ORDER      BIG_ENDIAN
 #else
 #include <endian.h>
 #include <byteswap.h>

From db42a48dc5d49783545757bd34aeead851f9288e Mon Sep 17 00:00:00 2001
From: Alexey Semenyuk <asemenyuk@openjdk.org>
Date: Fri, 14 Feb 2025 13:12:30 +0000
Subject: [PATCH 010/587] 8350011: Convert jpackage test lib tests in JUnit
 format

Reviewed-by: almatvee
---
 .../jpackage/helpers-test/TEST.properties     |  9 +++
 .../jdk/jpackage/test/AnnotationsTest.java    | 55 +++++++------
 .../test/DirectoryContentVerifierTest.java    | 49 +++++-------
 .../jdk/jpackage/test/JUnitAdapter.java       | 79 +++++++++++++++++++
 .../jdk/jpackage/test/JavaAppDescTest.java    | 15 +---
 .../jdk/jpackage/test/TKitTest.java           | 51 +++---------
 .../jdk/jpackage/test/TestSuite.java          | 63 ---------------
 .../helpers/jdk/jpackage/test/Main.java       |  7 +-
 .../jdk/jpackage/test/TestBuilder.java        | 44 +++++++++--
 .../jdk/jpackage/test/TestInstance.java       | 12 +--
 10 files changed, 199 insertions(+), 185 deletions(-)
 create mode 100644 test/jdk/tools/jpackage/helpers-test/TEST.properties
 create mode 100644 test/jdk/tools/jpackage/helpers-test/jdk/jpackage/test/JUnitAdapter.java
 delete mode 100644 test/jdk/tools/jpackage/helpers-test/jdk/jpackage/test/TestSuite.java

diff --git a/test/jdk/tools/jpackage/helpers-test/TEST.properties b/test/jdk/tools/jpackage/helpers-test/TEST.properties
new file mode 100644
index 00000000000..1830ea05443
--- /dev/null
+++ b/test/jdk/tools/jpackage/helpers-test/TEST.properties
@@ -0,0 +1,9 @@
+JUnit.dirs = .
+
+lib.dirs = /test/jdk/tools/jpackage/helpers /test/jdk/tools/jpackage/helpers-test
+
+modules=jdk.jpackage/jdk.jpackage.internal:+open \
+        jdk.jpackage/jdk.jpackage.internal.util:+open \
+        jdk.jpackage/jdk.jpackage.internal.util.function:+open \
+        java.base/jdk.internal.util \
+        jdk.jlink/jdk.tools.jlink.internal
diff --git a/test/jdk/tools/jpackage/helpers-test/jdk/jpackage/test/AnnotationsTest.java b/test/jdk/tools/jpackage/helpers-test/jdk/jpackage/test/AnnotationsTest.java
index d439452ffa0..cd7914b917b 100644
--- a/test/jdk/tools/jpackage/helpers-test/jdk/jpackage/test/AnnotationsTest.java
+++ b/test/jdk/tools/jpackage/helpers-test/jdk/jpackage/test/AnnotationsTest.java
@@ -23,6 +23,9 @@
 package jdk.jpackage.test;
 
 import static java.lang.StackWalker.Option.RETAIN_CLASS_REFERENCE;
+import static java.util.stream.Collectors.toMap;
+import static jdk.jpackage.internal.util.function.ThrowingSupplier.toSupplier;
+
 import java.lang.reflect.Method;
 import java.nio.file.Path;
 import java.time.LocalDate;
@@ -32,34 +35,34 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Optional;
 import java.util.Set;
-import static java.util.stream.Collectors.toMap;
 import java.util.stream.Stream;
 import jdk.internal.util.OperatingSystem;
 import jdk.jpackage.test.Annotations.Parameter;
 import jdk.jpackage.test.Annotations.ParameterSupplier;
 import jdk.jpackage.test.Annotations.Parameters;
 import jdk.jpackage.test.Annotations.Test;
-import static jdk.jpackage.internal.util.function.ThrowingSupplier.toSupplier;
+import org.junit.jupiter.api.io.TempDir;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.EnumSource;
+import org.junit.jupiter.params.provider.ValueSource;
 
-/*
- * @test
- * @summary Test jpackage test library's annotation processor
- * @library /test/jdk/tools/jpackage/helpers
- * @build jdk.jpackage.test.*
- * @run main/othervm/timeout=360 -Xmx512m jdk.jpackage.test.AnnotationsTest
- */
-public class AnnotationsTest {
+public class AnnotationsTest extends JUnitAdapter {
 
-    public static void main(String... args) {
-        runTests(List.of(BasicTest.class, ParameterizedInstanceTest.class));
-        for (var os : OperatingSystem.values()) {
-            try {
-                TestBuilderConfig.setOperatingSystem(os);
-                TKit.log("Current operating system: " + os);
-                runTests(List.of(IfOSTest.class));
-            } finally {
-                TestBuilderConfig.setDefaults();
-            }
+    @ParameterizedTest
+    @ValueSource(classes = {BasicTest.class, ParameterizedInstanceTest.class})
+    public void test(Class<? extends TestExecutionRecorder> clazz, @TempDir Path workDir) {
+        runTest(clazz, workDir);
+    }
+
+    @ParameterizedTest
+    @EnumSource(OperatingSystem.class)
+    public void testIfOSTest(OperatingSystem os, @TempDir Path workDir) {
+        try {
+            TestBuilderConfig.setOperatingSystem(os);
+            TKit.log("Current operating system: " + os);
+            runTest(IfOSTest.class, workDir);
+        } finally {
+            TestBuilderConfig.setDefaults();
         }
     }
 
@@ -300,22 +303,18 @@ public class AnnotationsTest {
         });
     }
 
-    private static void runTests(List<Class<? extends TestExecutionRecorder>> tests) {
+    private static void runTest(Class<? extends TestExecutionRecorder> test, Path workDir) {
         ACTUAL_TEST_DESCS.get().clear();
 
-        var expectedTestDescs = tests.stream()
-                .map(AnnotationsTest::getExpectedTestDescs)
-                .flatMap(x -> x)
+        var expectedTestDescs = getExpectedTestDescs(test)
                 // Collect in the map to check for collisions for free
                 .collect(toMap(x -> x, x -> ""))
                 .keySet();
 
-        var args = tests.stream().map(test -> {
-            return String.format("--jpt-run=%s", test.getName());
-        }).toArray(String[]::new);
+        var args = new String[] { String.format("--jpt-run=%s", test.getName()) };
 
         try {
-            Main.main(args);
+            Main.main(TestBuilder.build().workDirRoot(workDir), args);
             assertRecordedTestDescs(expectedTestDescs);
         } catch (Throwable t) {
             t.printStackTrace(System.err);
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 f7471988051..ea69a525df9 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
@@ -22,7 +22,11 @@
  */
 package jdk.jpackage.test;
 
-import java.io.IOException;
+import static java.util.stream.Collectors.toSet;
+import static jdk.jpackage.test.DirectoryContentVerifierTest.AssertType.CONTAINS;
+import static jdk.jpackage.test.DirectoryContentVerifierTest.AssertType.MATCH;
+import static jdk.jpackage.test.TKit.assertAssert;
+
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.ArrayList;
@@ -30,16 +34,12 @@ import java.util.Collection;
 import java.util.List;
 import java.util.Set;
 import java.util.function.BiConsumer;
-import static java.util.stream.Collectors.toSet;
 import java.util.stream.Stream;
-import jdk.jpackage.test.Annotations.Parameters;
+import jdk.jpackage.test.Annotations.ParameterSupplier;
 import jdk.jpackage.test.Annotations.Test;
-import static jdk.jpackage.test.DirectoryContentVerifierTest.AssertType.CONTAINS;
-import static jdk.jpackage.test.DirectoryContentVerifierTest.AssertType.MATCH;
 import jdk.jpackage.test.TKit.DirectoryContentVerifier;
-import static jdk.jpackage.test.TKit.assertAssert;
 
-public class DirectoryContentVerifierTest {
+public class DirectoryContentVerifierTest extends JUnitAdapter {
 
     enum AssertType {
         MATCH(DirectoryContentVerifier::match),
@@ -105,7 +105,6 @@ public class DirectoryContentVerifierTest {
         private boolean success = true;
     }
 
-    @Parameters
     public static Collection<?> input() {
         List<Object[]> data = new ArrayList<>();
         buildArgs().applyVariantsTo(data);
@@ -127,35 +126,23 @@ public class DirectoryContentVerifierTest {
         return data;
     }
 
-    public DirectoryContentVerifierTest(String[] expectedPaths, String[] actualPaths,
-            AssertType assertOp, Boolean success) {
-        this.expectedPaths = conv(expectedPaths);
-        this.actualPaths = conv(actualPaths);
-        this.assertOp = assertOp;
-        this.success = success;
-    }
-
     @Test
-    public void test() {
-        TKit.withTempDirectory("basedir", this::test);
-    }
+    @ParameterSupplier("input")
+    public void test(String[] expectedPaths, String[] actualPaths, AssertType assertOp, Boolean success) {
+        final var expectedPathsAsSet = conv(expectedPaths);
+        final var actualPathsAsSet = conv(actualPaths);
+        TKit.withTempDirectory("basedir", basedir -> {
+            for (var path : actualPathsAsSet) {
+                Files.createFile(basedir.resolve(path));
+            }
 
-    private void test(Path basedir) throws IOException {
-        for (var path : actualPaths) {
-            Files.createFile(basedir.resolve(path));
-        }
+            var testee = TKit.assertDirectoryContent(basedir);
 
-        var testee = TKit.assertDirectoryContent(basedir);
-
-        assertAssert(success, () -> assertOp.assertFunc.accept(testee, expectedPaths));
+            assertAssert(success, () -> assertOp.assertFunc.accept(testee, expectedPathsAsSet));
+        });
     }
 
     private static Set<Path> conv(String... paths) {
         return Stream.of(paths).map(Path::of).collect(toSet());
     }
-
-    private final Set<Path> expectedPaths;
-    private final Set<Path> actualPaths;
-    private final AssertType assertOp;
-    private final boolean success;
 }
diff --git a/test/jdk/tools/jpackage/helpers-test/jdk/jpackage/test/JUnitAdapter.java b/test/jdk/tools/jpackage/helpers-test/jdk/jpackage/test/JUnitAdapter.java
new file mode 100644
index 00000000000..7bf1f57a254
--- /dev/null
+++ b/test/jdk/tools/jpackage/helpers-test/jdk/jpackage/test/JUnitAdapter.java
@@ -0,0 +1,79 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please 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 static jdk.jpackage.internal.util.function.ThrowingRunnable.toRunnable;
+
+import java.io.BufferedReader;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.PrintStream;
+import java.io.UncheckedIOException;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Path;
+import java.util.List;
+import jdk.jpackage.internal.util.function.ThrowingRunnable;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
+
+public class JUnitAdapter {
+
+    JUnitAdapter() {
+        if (System.getProperty("test.src") == null) {
+            // Was called by somebody else but not by jtreg
+            System.setProperty("test.src", Path.of("@@openJdkDir@@/test/jdk/tools/jpackage").toString());
+        }
+    }
+
+    @Test
+    void runJPackageTests(@TempDir Path workDir) throws Throwable {
+        if (!getClass().equals(JUnitAdapter.class)) {
+            Main.main(TestBuilder.build().workDirRoot(workDir), new String [] {
+                    "--jpt-before-run=jdk.jpackage.test.JPackageCommand.useToolProviderByDefault",
+                    "--jpt-run=" + getClass().getName()
+                    });
+        }
+    }
+
+    static List<String> captureJPackageTestLog(ThrowingRunnable runnable) {
+        final var buf = new ByteArrayOutputStream();
+        try (PrintStream ps = new PrintStream(buf, true, StandardCharsets.UTF_8)) {
+            TKit.withExtraLogStream(runnable, ps);
+        }
+
+        try (final var in = new ByteArrayInputStream(buf.toByteArray());
+                final var reader = new InputStreamReader(in, StandardCharsets.UTF_8);
+                final var bufReader = new BufferedReader(reader)) {
+            return bufReader.lines().map(line -> {
+                // Skip timestamp
+                return line.substring(LOG_MSG_TIMESTAMP_LENGTH);
+            }).toList();
+        } catch (IOException ex) {
+            throw new UncheckedIOException(ex);
+        }
+    }
+
+    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/JavaAppDescTest.java b/test/jdk/tools/jpackage/helpers-test/jdk/jpackage/test/JavaAppDescTest.java
index a2cde44f009..50f1992f796 100644
--- a/test/jdk/tools/jpackage/helpers-test/jdk/jpackage/test/JavaAppDescTest.java
+++ b/test/jdk/tools/jpackage/helpers-test/jdk/jpackage/test/JavaAppDescTest.java
@@ -26,18 +26,14 @@ 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.ParameterSupplier;
 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;
-    }
+public class JavaAppDescTest extends JUnitAdapter {
 
     @Test
-    public void test() {
+    @ParameterSupplier("input")
+    public void test(JavaAppDesc expectedAppDesc, JavaAppDesc actualAppDesc) {
         TKit.assertEquals(expectedAppDesc.toString(), actualAppDesc.toString(), null);
         TKit.assertTrue(expectedAppDesc.equals(actualAppDesc), null);
     }
@@ -53,7 +49,6 @@ public class JavaAppDescTest {
                 appDesc).classFilePath().toString(), null);
     }
 
-    @Parameters
     public static List<Object[]> input() {
         return List.of(new Object[][] {
             createTestCase("", "hello.jar:Hello"),
@@ -93,6 +88,4 @@ public class JavaAppDescTest {
         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
index 98a7d873190..4cddb1eb912 100644
--- a/test/jdk/tools/jpackage/helpers-test/jdk/jpackage/test/TKitTest.java
+++ b/test/jdk/tools/jpackage/helpers-test/jdk/jpackage/test/TKitTest.java
@@ -22,28 +22,22 @@
  */
 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 static jdk.jpackage.internal.util.function.ThrowingRunnable.toRunnable;
+import static jdk.jpackage.internal.util.function.ThrowingSupplier.toSupplier;
+
 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.internal.util.function.ThrowingRunnable;
-import static jdk.jpackage.internal.util.function.ThrowingRunnable.toRunnable;
-import static jdk.jpackage.internal.util.function.ThrowingSupplier.toSupplier;
+import jdk.jpackage.test.Annotations.ParameterSupplier;
+import jdk.jpackage.test.Annotations.Test;
 
-public class TKitTest {
+public class TKitTest extends JUnitAdapter {
 
-    @Parameters
     public static Collection<Object[]> assertTestsData() {
         List<MethodCallConfig> data = new ArrayList<>();
 
@@ -191,12 +185,9 @@ public class TKitTest {
         }
     }
 
-    public TKitTest(MethodCallConfig methodCall) {
-        this.methodCall = methodCall;
-    }
-
     @Test
-    public void test() {
+    @ParameterSupplier("assertTestsData")
+    public void test(MethodCallConfig methodCall) {
         runAssertWithExpectedLogOutput(() -> {
             methodCall.method.invoke(null, methodCall.args);
         }, methodCall.expectFail, methodCall.expectLog);
@@ -211,23 +202,11 @@ public class TKitTest {
 
     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();
+        final var output = JUnitAdapter.captureJPackageTestLog(action);
+        if (output.size() == 1 && expectLogStrings.length == 1) {
+            TKit.assertEquals(expectLogStrings[0], output.get(0), null);
+        } else {
+            TKit.assertStringListEquals(List.of(expectLogStrings), output, null);
         }
     }
 
@@ -237,8 +216,4 @@ public class TKitTest {
         }
         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
deleted file mode 100644
index f9dda851414..00000000000
--- a/test/jdk/tools/jpackage/helpers-test/jdk/jpackage/test/TestSuite.java
+++ /dev/null
@@ -1,63 +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.
- */
-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/Main.java b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/Main.java
index 5919d8361c4..439479a666e 100644
--- a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/Main.java
+++ b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/Main.java
@@ -38,10 +38,15 @@ import static jdk.jpackage.test.TestBuilder.CMDLINE_ARG_PREFIX;
 
 
 public final class Main {
+
     public static void main(String args[]) throws Throwable {
+        main(TestBuilder.build(), args);
+    }
+
+    public static void main(TestBuilder.Builder builder, String args[]) throws Throwable {
         boolean listTests = false;
         List<TestInstance> tests = new ArrayList<>();
-        try (TestBuilder testBuilder = new TestBuilder(tests::add)) {
+        try (TestBuilder testBuilder = builder.testConsumer(tests::add).create()) {
             Deque<String> argsAsList = new ArrayDeque<>(List.of(args));
             while (!argsAsList.isEmpty()) {
                 var arg = argsAsList.pop();
diff --git a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/TestBuilder.java b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/TestBuilder.java
index 195d1ea3936..17c0f131af3 100644
--- a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/TestBuilder.java
+++ b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/TestBuilder.java
@@ -23,9 +23,13 @@
 
 package jdk.jpackage.test;
 
+import static jdk.jpackage.internal.util.function.ThrowingConsumer.toConsumer;
+import static jdk.jpackage.test.TestMethodSupplier.MethodQuery.fromQualifiedMethodName;
+
 import java.lang.annotation.Annotation;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
+import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.Comparator;
 import java.util.HashSet;
@@ -38,14 +42,12 @@ import java.util.function.Consumer;
 import java.util.function.UnaryOperator;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
+import jdk.jpackage.internal.util.function.ThrowingConsumer;
+import jdk.jpackage.internal.util.function.ThrowingFunction;
 import jdk.jpackage.test.Annotations.AfterEach;
 import jdk.jpackage.test.Annotations.BeforeEach;
 import jdk.jpackage.test.Annotations.Test;
-import jdk.jpackage.internal.util.function.ThrowingConsumer;
-import static jdk.jpackage.internal.util.function.ThrowingConsumer.toConsumer;
-import jdk.jpackage.internal.util.function.ThrowingFunction;
 import jdk.jpackage.test.TestMethodSupplier.InvalidAnnotationException;
-import static jdk.jpackage.test.TestMethodSupplier.MethodQuery.fromQualifiedMethodName;
 
 final class TestBuilder implements AutoCloseable {
 
@@ -54,8 +56,35 @@ final class TestBuilder implements AutoCloseable {
         flushTestGroup();
     }
 
-    TestBuilder(Consumer<TestInstance> testConsumer) {
+    static Builder build() {
+        return new Builder();
+    }
+
+    final static class Builder {
+        private Builder() {
+        }
+
+        Builder testConsumer(Consumer<TestInstance> v) {
+            testConsumer = v;
+            return this;
+        }
+
+        Builder workDirRoot(Path v) {
+            workDirRoot = v;
+            return this;
+        }
+
+        TestBuilder create() {
+            return new TestBuilder(testConsumer, workDirRoot);
+        }
+
+        private Consumer<TestInstance> testConsumer;
+        private Path workDirRoot = Path.of("");
+    }
+
+    private TestBuilder(Consumer<TestInstance> testConsumer, Path workDirRoot) {
         this.testMethodSupplier = TestBuilderConfig.getDefault().createTestMethodSupplier();
+        this.workDirRoot = Objects.requireNonNull(workDirRoot);
         argProcessors = Map.of(
                 CMDLINE_ARG_PREFIX + "after-run",
                 arg -> getJavaMethodsFromArg(arg).map(
@@ -88,7 +117,7 @@ final class TestBuilder implements AutoCloseable {
                 CMDLINE_ARG_PREFIX + "dry-run",
                 arg -> dryRun = true
         );
-        this.testConsumer = testConsumer;
+        this.testConsumer = Objects.requireNonNull(testConsumer);
         clear();
     }
 
@@ -188,7 +217,7 @@ final class TestBuilder implements AutoCloseable {
         }
 
         TestInstance test = new TestInstance(testBody, curBeforeActions,
-                curAfterActions, dryRun);
+                curAfterActions, dryRun, workDirRoot);
         if (includedTests == null) {
             trace(String.format("Create: %s", test.fullName()));
         }
@@ -348,6 +377,7 @@ final class TestBuilder implements AutoCloseable {
     private final TestMethodSupplier testMethodSupplier;
     private final Map<String, ThrowingConsumer<String>> argProcessors;
     private final Consumer<TestInstance> testConsumer;
+    private final Path workDirRoot;
     private List<MethodCall> testGroup;
     private List<ThrowingConsumer<Object>> beforeActions;
     private List<ThrowingConsumer<Object>> afterActions;
diff --git a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/TestInstance.java b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/TestInstance.java
index dd1e46eb09e..ca9523d5760 100644
--- a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/TestInstance.java
+++ b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/TestInstance.java
@@ -150,7 +150,7 @@ final class TestInstance implements ThrowingRunnable {
         private String instanceArgs;
     }
 
-    TestInstance(ThrowingRunnable testBody) {
+    TestInstance(ThrowingRunnable testBody, Path workDirRoot) {
         assertCount = 0;
         this.testConstructor = (unused) -> null;
         this.testBody = (unused) -> testBody.run();
@@ -158,11 +158,11 @@ final class TestInstance implements ThrowingRunnable {
         this.afterActions = Collections.emptyList();
         this.testDesc = TestDesc.createBuilder().get();
         this.dryRun = false;
-        this.workDir = createWorkDirName(testDesc);
+        this.workDir = workDirRoot.resolve(createWorkDirPath(testDesc));
     }
 
     TestInstance(MethodCall testBody, List<ThrowingConsumer<Object>> beforeActions,
-            List<ThrowingConsumer<Object>> afterActions, boolean dryRun) {
+            List<ThrowingConsumer<Object>> afterActions, boolean dryRun, Path workDirRoot) {
         assertCount = 0;
         this.testConstructor = v -> ((MethodCall)v).newInstance();
         this.testBody = testBody;
@@ -170,7 +170,7 @@ final class TestInstance implements ThrowingRunnable {
         this.afterActions = afterActions;
         this.testDesc = testBody.createDescription();
         this.dryRun = dryRun;
-        this.workDir = createWorkDirName(testDesc);
+        this.workDir = workDirRoot.resolve(createWorkDirPath(testDesc));
     }
 
     void notifyAssert() {
@@ -276,8 +276,8 @@ final class TestInstance implements ThrowingRunnable {
         return false;
     }
 
-    private static Path createWorkDirName(TestDesc testDesc) {
-        Path result = Path.of(".");
+    private static Path createWorkDirPath(TestDesc testDesc) {
+        Path result = Path.of("");
         if (!isCalledByJavatest()) {
             result = result.resolve(testDesc.clazz.getSimpleName());
         }

From 742e735d7f6c4ee9ca5a4d290c59d7d6ec1f7635 Mon Sep 17 00:00:00 2001
From: Aleksey Shipilev <shade@openjdk.org>
Date: Fri, 14 Feb 2025 13:53:06 +0000
Subject: [PATCH 011/587] 8349858: Print compilation task before blocking
 compiler thread for shutdown

Reviewed-by: kvn, chagedorn
---
 src/hotspot/share/compiler/compileBroker.cpp | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/src/hotspot/share/compiler/compileBroker.cpp b/src/hotspot/share/compiler/compileBroker.cpp
index c2e2e2d607f..c34d9eb785e 100644
--- a/src/hotspot/share/compiler/compileBroker.cpp
+++ b/src/hotspot/share/compiler/compileBroker.cpp
@@ -2074,7 +2074,21 @@ void CompileBroker::maybe_block() {
     if (PrintCompilation && (Verbose || WizardMode))
       tty->print_cr("compiler thread " INTPTR_FORMAT " poll detects block request", p2i(Thread::current()));
 #endif
+    // If we are executing a task during the request to block, report the task
+    // before disappearing.
+    CompilerThread* thread = CompilerThread::current();
+    if (thread != nullptr) {
+      CompileTask* task = thread->task();
+      if (task != nullptr) {
+        if (PrintCompilation) {
+          task->print(tty, "blocked");
+        }
+        task->print_ul("blocked");
+      }
+    }
+    // Go to VM state and block for final VM shutdown safepoint.
     ThreadInVMfromNative tivfn(JavaThread::current());
+    assert(false, "Should never unblock from TIVNM entry");
   }
 }
 

From 9ea81d90175c11460d0efa83f82ceccc4ee2cd3b Mon Sep 17 00:00:00 2001
From: anass baya <anass.baya@oracle.com>
Date: Fri, 14 Feb 2025 15:19:09 +0000
Subject: [PATCH 012/587] 8349351: Combine Screen Inset Tests into a Single
 File

Reviewed-by: honkar, dnguyen, aivanov
---
 .../MultiScreenInsetsTest.java                | 118 --------------
 .../ScreenInsetsTest/ScreenInsetsTest.java    | 147 ++++++++----------
 2 files changed, 69 insertions(+), 196 deletions(-)
 delete mode 100644 test/jdk/java/awt/Multiscreen/MultiScreenInsetsTest/MultiScreenInsetsTest.java

diff --git a/test/jdk/java/awt/Multiscreen/MultiScreenInsetsTest/MultiScreenInsetsTest.java b/test/jdk/java/awt/Multiscreen/MultiScreenInsetsTest/MultiScreenInsetsTest.java
deleted file mode 100644
index 301d4f2caa3..00000000000
--- a/test/jdk/java/awt/Multiscreen/MultiScreenInsetsTest/MultiScreenInsetsTest.java
+++ /dev/null
@@ -1,118 +0,0 @@
-/*
- * Copyright (c) 2014, 2025, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact 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 8020443 6899304
-  @summary Test to check if the frame is created on the specified GraphicsDevice
-  and if getScreenInsets()returns the correct values across multiple monitors.
-  @library /test/lib
-  @build jdk.test.lib.Platform jtreg.SkippedException
-  @run main MultiScreenInsetsTest
- */
-
-import java.awt.Frame;
-import java.awt.GraphicsConfiguration;
-import java.awt.GraphicsDevice;
-import java.awt.GraphicsEnvironment;
-import java.awt.Insets;
-import java.awt.Rectangle;
-import java.awt.Toolkit;
-
-import jdk.test.lib.Platform;
-import jtreg.SkippedException;
-
-public class MultiScreenInsetsTest {
-    private static final int SIZE = 100;
-    // Allow a margin tolerance of 1 pixel due to scaling
-    private static final int MARGIN_TOLERANCE = 1;
-
-    public static void main(String[] args) throws InterruptedException {
-        GraphicsEnvironment ge = GraphicsEnvironment.getLocalGraphicsEnvironment();
-        GraphicsDevice[] gds = ge.getScreenDevices();
-        if (gds.length < 2) {
-            throw new SkippedException("It's a multi-screen test... skipping!");
-        }
-
-        for (int screen = 0; screen < gds.length; ++screen) {
-            GraphicsDevice gd = gds[screen];
-            GraphicsConfiguration gc = gd.getDefaultConfiguration();
-            Rectangle bounds = gc.getBounds();
-            Insets insets = Toolkit.getDefaultToolkit().getScreenInsets(gc);
-            System.out.println("Screen #" + screen);
-            System.out.println("Screen Bounds: " + bounds);
-            System.out.println("Insets: " + insets);
-
-            Frame frame = new Frame(gc);
-            frame.setLocation(bounds.x + (bounds.width - SIZE) / 2,
-                              bounds.y + (bounds.height - SIZE) / 2);
-            frame.setSize(SIZE, SIZE);
-
-            /*
-             * On Windows, undecorated maximized frames are placed over the taskbar.
-             * Use a decorated frame instead.
-             */
-            if (Platform.isWindows()) {
-                frame.setUndecorated(false);
-            } else {
-                frame.setUndecorated(true);
-            }
-
-            frame.setVisible(true);
-
-            // Maximize Frame to reach the struts
-            frame.setExtendedState(java.awt.Frame.MAXIMIZED_BOTH);
-            Thread.sleep(2000);
-
-            Rectangle frameBounds = frame.getBounds();
-            System.out.println("Frame bounds: " + frameBounds);
-
-            frame.dispose();
-
-            /*
-             * On Windows, the top-left corner of an undecorated maximized frame
-             * may have negative coordinates (x, y).
-             * Adjust the frame bounds accordingly.
-             */
-            if (frameBounds.x < bounds.x) {
-                frameBounds.width -= (bounds.x - frameBounds.x) * 2;
-                frameBounds.x = bounds.x;
-            }
-            if (frameBounds.y < bounds.y) {
-                frameBounds.height -= (bounds.y - frameBounds.y) * 2;
-                frameBounds.y = bounds.y;
-            }
-            System.out.println("Adjusted Frame bounds: " + frameBounds);
-
-            if (bounds.x + insets.left != frameBounds.x
-                || bounds.y + insets.top != frameBounds.y
-                || Math.abs((bounds.width - insets.right - insets.left) - frameBounds.width) > MARGIN_TOLERANCE
-                || Math.abs((bounds.height - insets.bottom - insets.top) - frameBounds.height) > MARGIN_TOLERANCE) {
-                throw new RuntimeException("Test FAILED! Wrong screen #" +
-                                           screen + " insets: " + insets);
-            }
-        }
-        System.out.println("Test PASSED!");
-    }
-}
diff --git a/test/jdk/java/awt/Toolkit/ScreenInsetsTest/ScreenInsetsTest.java b/test/jdk/java/awt/Toolkit/ScreenInsetsTest/ScreenInsetsTest.java
index 70ea3e379d7..2cd05b08fc5 100644
--- a/test/jdk/java/awt/Toolkit/ScreenInsetsTest/ScreenInsetsTest.java
+++ b/test/jdk/java/awt/Toolkit/ScreenInsetsTest/ScreenInsetsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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,14 @@
  */
 
 /*
-  @test
-  @key headful
-  @bug 4737732
-  @summary Tests that Toolkit.getScreenInsets() returns correct insets
-  @author artem.ananiev: area=awt.toplevel
-  @library ../../regtesthelpers
-  @build Util
-  @run main ScreenInsetsTest
-*/
+ * @test
+ * @key headful
+ * @bug 8020443 6899304 4737732
+ * @summary Tests that Toolkit.getScreenInsets() returns correct insets
+ * @library /test/lib
+ * @build jdk.test.lib.Platform
+ * @run main ScreenInsetsTest
+ */
 
 import java.awt.Frame;
 import java.awt.GraphicsConfiguration;
@@ -40,85 +39,77 @@ import java.awt.Insets;
 import java.awt.Rectangle;
 import java.awt.Toolkit;
 
-import test.java.awt.regtesthelpers.Util;
+import jdk.test.lib.Platform;
 
-public class ScreenInsetsTest
-{
-    public static void main(String[] args)
-    {
-        boolean passed = true;
+public class ScreenInsetsTest {
+    private static final int SIZE = 100;
+    // Allow a margin tolerance of 1 pixel due to scaling
+    private static final int MARGIN_TOLERANCE = 1;
 
+    public static void main(String[] args) throws InterruptedException {
         GraphicsEnvironment ge = GraphicsEnvironment.getLocalGraphicsEnvironment();
         GraphicsDevice[] gds = ge.getScreenDevices();
-        for (GraphicsDevice gd : gds) {
+
+        for (int screen = 0; screen < gds.length; ++screen) {
+            GraphicsDevice gd = gds[screen];
             GraphicsConfiguration gc = gd.getDefaultConfiguration();
-            Rectangle gcBounds = gc.getBounds();
-            Insets gcInsets = Toolkit.getDefaultToolkit().getScreenInsets(gc);
-            int left = gcInsets.left;
-            int right = gcInsets.right;
-            int bottom = gcInsets.bottom;
-            int top = gcInsets.top;
-            if (left < 0 || right < 0 || bottom < 0 || top < 0) {
-                throw new RuntimeException("Negative value: " + gcInsets);
-            }
-            int maxW = gcBounds.width / 3;
-            int maxH = gcBounds.height / 3;
-            if (left > maxW || right > maxW || bottom > maxH || top > maxH) {
-                throw new RuntimeException("Big value: " + gcInsets);
+            Rectangle bounds = gc.getBounds();
+            Insets insets = Toolkit.getDefaultToolkit().getScreenInsets(gc);
+            int workAreaWidth = bounds.width - insets.left - insets.right;
+            int workAreaHeight = bounds.height - insets.top - insets.bottom;
+            System.out.println("Screen #" + screen);
+            System.out.println("Screen Bounds: " + bounds);
+            System.out.println("Insets: " + insets);
+
+            Frame frame = new Frame(gc);
+            frame.setLocation(bounds.x + (bounds.width - SIZE) / 2,
+                    bounds.y + (bounds.height - SIZE) / 2);
+            frame.setSize(SIZE, SIZE);
+
+            /*
+             * On Windows, undecorated maximized frames are placed over the taskbar.
+             * Use a decorated frame instead.
+             */
+            if (Platform.isWindows()) {
+                frame.setUndecorated(false);
+            } else {
+                frame.setUndecorated(true);
             }
 
-            if (!Toolkit.getDefaultToolkit().isFrameStateSupported(Frame.MAXIMIZED_BOTH))
-            {
-                // this state is used in the test - sorry
-                continue;
+            frame.setVisible(true);
+
+            // Maximize Frame to reach the struts
+            frame.setExtendedState(java.awt.Frame.MAXIMIZED_BOTH);
+            Thread.sleep(2000);
+
+            Rectangle frameBounds = frame.getBounds();
+            System.out.println("Frame bounds: " + frameBounds);
+
+            frame.dispose();
+
+            /*
+             * On Windows, the top-left corner of an undecorated maximized frame
+             * may have negative coordinates (x, y).
+             * Adjust the frame bounds accordingly.
+             */
+            if (frameBounds.x < bounds.x) {
+                frameBounds.width -= (bounds.x - frameBounds.x) * 2;
+                frameBounds.x = bounds.x;
             }
-
-            Frame f = new Frame("Test", gc);
-            f.setUndecorated(true);
-            f.setBounds(gcBounds.x + 100, gcBounds.y + 100, 320, 240);
-            f.setVisible(true);
-            Util.waitForIdle(null);
-
-            f.setExtendedState(Frame.MAXIMIZED_BOTH);
-            Util.waitForIdle(null);
-
-            Rectangle fBounds = f.getBounds();
-            // workaround: on Windows maximized windows have negative coordinates
-            if (fBounds.x < gcBounds.x)
-            {
-                fBounds.width -= (gcBounds.x - fBounds.x) * 2; // width is decreased
-                fBounds.x = gcBounds.x;
+            if (frameBounds.y < bounds.y) {
+                frameBounds.height -= (bounds.y - frameBounds.y) * 2;
+                frameBounds.y = bounds.y;
             }
-            if (fBounds.y < gcBounds.y)
-            {
-                fBounds.height -= (gcBounds.y - fBounds.y) * 2; // height is decreased
-                fBounds.y = gcBounds.y;
-            }
-            Insets expected = new Insets(fBounds.y - gcBounds.y,
-                                         fBounds.x - gcBounds.x,
-                                         gcBounds.y + gcBounds.height - fBounds.y - fBounds.height,
-                                         gcBounds.x + gcBounds.width - fBounds.x - fBounds.width);
+            System.out.println("Adjusted Frame bounds: " + frameBounds);
 
-            // On Windows 10 and up system allows undecorated maximized windows
-            // to be placed over the taskbar so calculated insets might
-            // be smaller than reported ones depending on the taskbar position
-            if (gcInsets.top < expected.top
-                    || gcInsets.bottom < expected.bottom
-                    || gcInsets.left < expected.left
-                    || gcInsets.right < expected.right)
-            {
-                passed = false;
-                System.err.println("Wrong insets for GraphicsConfig: " + gc);
-                System.err.println("\tExpected: " + expected);
-                System.err.println("\tActual: " + gcInsets);
+            if (bounds.x + insets.left != frameBounds.x
+                    || bounds.y + insets.top != frameBounds.y
+                    || Math.abs(workAreaWidth - frameBounds.width) > MARGIN_TOLERANCE
+                    || Math.abs(workAreaHeight - frameBounds.height) > MARGIN_TOLERANCE) {
+                throw new RuntimeException("Test FAILED! Wrong screen #" +
+                        screen + " insets: " + insets);
             }
-
-            f.dispose();
-        }
-
-        if (!passed)
-        {
-            throw new RuntimeException("TEST FAILED: Toolkit.getScreenInsets() returns wrong value for some screens");
         }
+        System.out.println("Test PASSED!");
     }
 }

From 0414dcec118fce24037ca1a6b00561c0ce4c6953 Mon Sep 17 00:00:00 2001
From: Maxim Kartashev <mkartashev@openjdk.org>
Date: Fri, 14 Feb 2025 15:28:59 +0000
Subject: [PATCH 013/587] 8349812: (fs) Files.newByteChannel with empty path
 name and CREATE_NEW throws unexpected exception

Reviewed-by: bpb
---
 .../sun/nio/fs/UnixChannelFactory.java        |  4 +--
 test/jdk/java/nio/file/Files/SBC.java         | 28 +++++++++++++++++--
 2 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/src/java.base/unix/classes/sun/nio/fs/UnixChannelFactory.java b/src/java.base/unix/classes/sun/nio/fs/UnixChannelFactory.java
index dec13180f2f..1e04291d458 100644
--- a/src/java.base/unix/classes/sun/nio/fs/UnixChannelFactory.java
+++ b/src/java.base/unix/classes/sun/nio/fs/UnixChannelFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -195,7 +195,7 @@ class UnixChannelFactory {
 
             // create flags
             if (flags.createNew) {
-                byte[] pathForSysCall = path.asByteArray();
+                byte[] pathForSysCall = path.getByteArrayForSysCalls();
 
                 // throw exception if file name is "." to avoid confusing error
                 if ((pathForSysCall[pathForSysCall.length-1] == '.') &&
diff --git a/test/jdk/java/nio/file/Files/SBC.java b/test/jdk/java/nio/file/Files/SBC.java
index 7aa04b18462..1e7d463644b 100644
--- a/test/jdk/java/nio/file/Files/SBC.java
+++ b/test/jdk/java/nio/file/Files/SBC.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,7 @@
  */
 
 /* @test
- * @bug 4313887
+ * @bug 4313887 8349812
  * @summary Unit test for java.nio.file.Files.newByteChannel
  * @library ..
  * @modules jdk.unsupported
@@ -63,6 +63,7 @@ public class SBC {
             badCombinations(dir);
             unsupportedOptions(dir);
             nullTests(dir);
+            emptyPathTest();
 
         } finally {
             TestUtil.removeAll(dir);
@@ -424,6 +425,29 @@ public class SBC {
         } catch (NullPointerException x) { }
     }
 
+    static void emptyPathTest() throws Exception {
+        try {
+            Files.newByteChannel(Path.of(""), WRITE, CREATE_NEW);
+            throw new RuntimeException("FileAlreadyExistsException expected");
+        } catch (FileAlreadyExistsException x) {
+        } catch (AccessDeniedException x) {
+            /* Thrown on Windows only */
+        }
+
+        try {
+            Files.newByteChannel(Path.of(""), WRITE, CREATE, DELETE_ON_CLOSE);
+            throw new RuntimeException("FileSystemException expected");
+        } catch (FileSystemException x) { }
+
+        try {
+            Files.newByteChannel(Path.of(""), WRITE, LinkOption.NOFOLLOW_LINKS);
+            throw new RuntimeException("FileSystemException expected");
+        } catch (FileSystemException x) { }
+
+        try (var channel = Files.newByteChannel(Path.of(""), READ, LinkOption.NOFOLLOW_LINKS)) {
+        } catch(AccessDeniedException x) { /* Thrown on Windows only */ }
+    }
+
     static void write(WritableByteChannel wbc, String msg) throws IOException {
         ByteBuffer buf = ByteBuffer.wrap(msg.getBytes());
         while (buf.hasRemaining())

From 2a90b90a95da91b71cd90caeafae5adaee621ebf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ivan=20=C5=A0ipka?= <isipka@openjdk.org>
Date: Fri, 14 Feb 2025 16:18:47 +0000
Subject: [PATCH 014/587] 8346117: Add test annotation

Reviewed-by: coffeys
---
 test/jdk/sun/nio/cs/Test6392804.java | 1 +
 test/jdk/sun/nio/cs/TestUTF_32.java  | 1 +
 2 files changed, 2 insertions(+)

diff --git a/test/jdk/sun/nio/cs/Test6392804.java b/test/jdk/sun/nio/cs/Test6392804.java
index a89c2aa5333..a98428c3e7f 100644
--- a/test/jdk/sun/nio/cs/Test6392804.java
+++ b/test/jdk/sun/nio/cs/Test6392804.java
@@ -22,6 +22,7 @@
  */
 
 /*
+   @test
    @bug 6392804
    @summary Decoder fails to detect decoding error
 */
diff --git a/test/jdk/sun/nio/cs/TestUTF_32.java b/test/jdk/sun/nio/cs/TestUTF_32.java
index 3179768957e..ba042494fd2 100644
--- a/test/jdk/sun/nio/cs/TestUTF_32.java
+++ b/test/jdk/sun/nio/cs/TestUTF_32.java
@@ -22,6 +22,7 @@
  */
 
 /*
+   @test
    @bug 6346419
    @summary Check correctness of the UTF-32 and its variant charsets
  */

From 38322407cd1664115e975c7fd9cb61e40d9557b5 Mon Sep 17 00:00:00 2001
From: Kelvin Nilsen <kdnilsen@openjdk.org>
Date: Fri, 14 Feb 2025 16:40:08 +0000
Subject: [PATCH 015/587] 8348594: Shenandoah: Do not penalize for degeneration
 when not the fault of triggering heuristic

Reviewed-by: phh, wkemper
---
 .../shenandoahAdaptiveHeuristics.cpp          | 17 +++++++++--
 .../shenandoahAdaptiveHeuristics.hpp          |  5 ++++
 .../shenandoahAggressiveHeuristics.cpp        |  1 +
 .../shenandoahCompactHeuristics.cpp           |  2 ++
 .../heuristics/shenandoahHeuristics.cpp       | 16 +++++++++-
 .../heuristics/shenandoahHeuristics.hpp       | 29 +++++++++++++++++++
 .../shenandoahPassiveHeuristics.cpp           |  1 +
 .../heuristics/shenandoahStaticHeuristics.cpp |  1 +
 .../heuristics/shenandoahYoungHeuristics.cpp  |  5 ++++
 .../gc/shenandoah/shenandoahControlThread.cpp |  2 ++
 .../share/gc/shenandoah/shenandoahFreeSet.hpp |  1 +
 .../shenandoah/shenandoahRegulatorThread.cpp  |  6 ++++
 12 files changed, 82 insertions(+), 4 deletions(-)

diff --git a/src/hotspot/share/gc/shenandoah/heuristics/shenandoahAdaptiveHeuristics.cpp b/src/hotspot/share/gc/shenandoah/heuristics/shenandoahAdaptiveHeuristics.cpp
index 02a363d2392..7a624d4d4a4 100644
--- a/src/hotspot/share/gc/shenandoah/heuristics/shenandoahAdaptiveHeuristics.cpp
+++ b/src/hotspot/share/gc/shenandoah/heuristics/shenandoahAdaptiveHeuristics.cpp
@@ -240,6 +240,10 @@ bool ShenandoahAdaptiveHeuristics::should_start_gc() {
   log_debug(gc)("should_start_gc? available: %zu, soft_max_capacity: %zu"
                 ", allocated: %zu", available, capacity, allocated);
 
+  if (_start_gc_is_pending) {
+    return true;
+  }
+
   // Track allocation rate even if we decide to start a cycle for other reasons.
   double rate = _allocation_rate.sample(allocated);
   _last_trigger = OTHER;
@@ -249,6 +253,7 @@ bool ShenandoahAdaptiveHeuristics::should_start_gc() {
     log_trigger("Free (%zu%s) is below minimum threshold (%zu%s)",
                  byte_size_in_proper_unit(available), proper_unit_for_byte_size(available),
                  byte_size_in_proper_unit(min_threshold), proper_unit_for_byte_size(min_threshold));
+    accept_trigger_with_type(OTHER);
     return true;
   }
 
@@ -261,6 +266,7 @@ bool ShenandoahAdaptiveHeuristics::should_start_gc() {
                    _gc_times_learned + 1, max_learn,
                    byte_size_in_proper_unit(available), proper_unit_for_byte_size(available),
                    byte_size_in_proper_unit(init_threshold), proper_unit_for_byte_size(init_threshold));
+      accept_trigger_with_type(OTHER);
       return true;
     }
   }
@@ -292,7 +298,7 @@ bool ShenandoahAdaptiveHeuristics::should_start_gc() {
                        byte_size_in_proper_unit(spike_headroom),      proper_unit_for_byte_size(spike_headroom),
                        byte_size_in_proper_unit(penalties),           proper_unit_for_byte_size(penalties),
                        byte_size_in_proper_unit(allocation_headroom), proper_unit_for_byte_size(allocation_headroom));
-    _last_trigger = RATE;
+    accept_trigger_with_type(RATE);
     return true;
   }
 
@@ -303,11 +309,16 @@ bool ShenandoahAdaptiveHeuristics::should_start_gc() {
                  byte_size_in_proper_unit(rate), proper_unit_for_byte_size(rate),
                  byte_size_in_proper_unit(allocation_headroom), proper_unit_for_byte_size(allocation_headroom),
                  _spike_threshold_sd);
-    _last_trigger = SPIKE;
+    accept_trigger_with_type(SPIKE);
     return true;
   }
 
-  return ShenandoahHeuristics::should_start_gc();
+  if (ShenandoahHeuristics::should_start_gc()) {
+    _start_gc_is_pending = true;
+    return true;
+  } else {
+    return false;
+  }
 }
 
 void ShenandoahAdaptiveHeuristics::adjust_last_trigger_parameters(double amount) {
diff --git a/src/hotspot/share/gc/shenandoah/heuristics/shenandoahAdaptiveHeuristics.hpp b/src/hotspot/share/gc/shenandoah/heuristics/shenandoahAdaptiveHeuristics.hpp
index 5ee10c6bebf..a47024f3a4b 100644
--- a/src/hotspot/share/gc/shenandoah/heuristics/shenandoahAdaptiveHeuristics.hpp
+++ b/src/hotspot/share/gc/shenandoah/heuristics/shenandoahAdaptiveHeuristics.hpp
@@ -145,6 +145,11 @@ protected:
   // this threshold, or we might consider this when dynamically resizing generations
   // in the generational case. Controlled by global flag ShenandoahMinFreeThreshold.
   size_t min_free_threshold();
+
+  inline void accept_trigger_with_type(Trigger trigger_type) {
+    _last_trigger = trigger_type;
+    ShenandoahHeuristics::accept_trigger();
+  }
 };
 
 #endif // SHARE_GC_SHENANDOAH_HEURISTICS_SHENANDOAHADAPTIVEHEURISTICS_HPP
diff --git a/src/hotspot/share/gc/shenandoah/heuristics/shenandoahAggressiveHeuristics.cpp b/src/hotspot/share/gc/shenandoah/heuristics/shenandoahAggressiveHeuristics.cpp
index 63a4e74fb1d..a833e39631c 100644
--- a/src/hotspot/share/gc/shenandoah/heuristics/shenandoahAggressiveHeuristics.cpp
+++ b/src/hotspot/share/gc/shenandoah/heuristics/shenandoahAggressiveHeuristics.cpp
@@ -52,6 +52,7 @@ void ShenandoahAggressiveHeuristics::choose_collection_set_from_regiondata(Shena
 
 bool ShenandoahAggressiveHeuristics::should_start_gc() {
   log_trigger("Start next cycle immediately");
+  accept_trigger();
   return true;
 }
 
diff --git a/src/hotspot/share/gc/shenandoah/heuristics/shenandoahCompactHeuristics.cpp b/src/hotspot/share/gc/shenandoah/heuristics/shenandoahCompactHeuristics.cpp
index 9d98ff6bf73..9d211314474 100644
--- a/src/hotspot/share/gc/shenandoah/heuristics/shenandoahCompactHeuristics.cpp
+++ b/src/hotspot/share/gc/shenandoah/heuristics/shenandoahCompactHeuristics.cpp
@@ -61,6 +61,7 @@ bool ShenandoahCompactHeuristics::should_start_gc() {
     log_trigger("Free (%zu%s) is below minimum threshold (%zu%s)",
                 byte_size_in_proper_unit(available),     proper_unit_for_byte_size(available),
                 byte_size_in_proper_unit(min_threshold), proper_unit_for_byte_size(min_threshold));
+    accept_trigger();
     return true;
   }
 
@@ -69,6 +70,7 @@ bool ShenandoahCompactHeuristics::should_start_gc() {
     log_trigger("Allocated since last cycle (%zu%s) is larger than allocation threshold (%zu%s)",
                 byte_size_in_proper_unit(bytes_allocated),           proper_unit_for_byte_size(bytes_allocated),
                 byte_size_in_proper_unit(threshold_bytes_allocated), proper_unit_for_byte_size(threshold_bytes_allocated));
+    accept_trigger();
     return true;
   }
 
diff --git a/src/hotspot/share/gc/shenandoah/heuristics/shenandoahHeuristics.cpp b/src/hotspot/share/gc/shenandoah/heuristics/shenandoahHeuristics.cpp
index fe0d82a72e3..f5bc74b2b1b 100644
--- a/src/hotspot/share/gc/shenandoah/heuristics/shenandoahHeuristics.cpp
+++ b/src/hotspot/share/gc/shenandoah/heuristics/shenandoahHeuristics.cpp
@@ -46,6 +46,9 @@ int ShenandoahHeuristics::compare_by_garbage(RegionData a, RegionData b) {
 }
 
 ShenandoahHeuristics::ShenandoahHeuristics(ShenandoahSpaceInfo* space_info) :
+  _start_gc_is_pending(false),
+  _declined_trigger_count(0),
+  _most_recent_declined_trigger_count(0),
   _space_info(space_info),
   _region_data(nullptr),
   _guaranteed_gc_interval(0),
@@ -184,10 +187,14 @@ void ShenandoahHeuristics::record_cycle_end() {
 }
 
 bool ShenandoahHeuristics::should_start_gc() {
+  if (_start_gc_is_pending) {
+    return true;
+  }
   // Perform GC to cleanup metaspace
   if (has_metaspace_oom()) {
     // Some of vmTestbase/metaspace tests depend on following line to count GC cycles
     log_trigger("%s", GCCause::to_string(GCCause::_metadata_GC_threshold));
+    accept_trigger();
     return true;
   }
 
@@ -196,10 +203,11 @@ bool ShenandoahHeuristics::should_start_gc() {
     if (last_time_ms > _guaranteed_gc_interval) {
       log_trigger("Time since last GC (%.0f ms) is larger than guaranteed interval (%zu ms)",
                    last_time_ms, _guaranteed_gc_interval);
+      accept_trigger();
       return true;
     }
   }
-
+  decline_trigger();
   return false;
 }
 
@@ -211,6 +219,12 @@ void ShenandoahHeuristics::adjust_penalty(intx step) {
   assert(0 <= _gc_time_penalties && _gc_time_penalties <= 100,
          "In range before adjustment: %zd", _gc_time_penalties);
 
+  if ((_most_recent_declined_trigger_count <= Penalty_Free_Declinations) && (step > 0)) {
+    // Don't penalize if heuristics are not responsible for a negative outcome.  Allow Penalty_Free_Declinations following
+    // previous GC for self calibration without penalty.
+    step = 0;
+  }
+
   intx new_val = _gc_time_penalties + step;
   if (new_val < 0) {
     new_val = 0;
diff --git a/src/hotspot/share/gc/shenandoah/heuristics/shenandoahHeuristics.hpp b/src/hotspot/share/gc/shenandoah/heuristics/shenandoahHeuristics.hpp
index 8bd5c7775c4..d036a62a32c 100644
--- a/src/hotspot/share/gc/shenandoah/heuristics/shenandoahHeuristics.hpp
+++ b/src/hotspot/share/gc/shenandoah/heuristics/shenandoahHeuristics.hpp
@@ -69,6 +69,9 @@ class ShenandoahHeuristics : public CHeapObj<mtGC> {
   static const intx Degenerated_Penalty = 10; // how much to penalize average GC duration history on Degenerated GC
   static const intx Full_Penalty        = 20; // how much to penalize average GC duration history on Full GC
 
+  // How many times can I decline a trigger opportunity without being penalized for excessive idle span before trigger?
+  static const size_t Penalty_Free_Declinations = 16;
+
 #ifdef ASSERT
   enum UnionTag {
     is_uninitialized, is_garbage, is_live_data
@@ -78,6 +81,18 @@ class ShenandoahHeuristics : public CHeapObj<mtGC> {
 protected:
   static const uint Moving_Average_Samples = 10; // Number of samples to store in moving averages
 
+  bool _start_gc_is_pending;              // True denotes that GC has been triggered, so no need to trigger again.
+  size_t _declined_trigger_count;         // This counts how many times since previous GC finished that this
+                                          //  heuristic has answered false to should_start_gc().
+  size_t _most_recent_declined_trigger_count;
+                                       ;  // This represents the value of _declined_trigger_count as captured at the
+                                          //  moment the most recent GC effort was triggered.  In case the most recent
+                                          //  concurrent GC effort degenerates, the value of this variable allows us to
+                                          //  differentiate between degeneration because heuristic was overly optimistic
+                                          //  in delaying the trigger vs. degeneration for other reasons (such as the
+                                          //  most recent GC triggered "immediately" after previous GC finished, but the
+                                          //  free headroom has already been depleted).
+
   class RegionData {
     private:
     ShenandoahHeapRegion* _region;
@@ -167,6 +182,16 @@ protected:
 
   void adjust_penalty(intx step);
 
+  inline void accept_trigger() {
+    _most_recent_declined_trigger_count = _declined_trigger_count;
+    _declined_trigger_count = 0;
+    _start_gc_is_pending = true;
+  }
+
+  inline void decline_trigger() {
+    _declined_trigger_count++;
+  }
+
 public:
   ShenandoahHeuristics(ShenandoahSpaceInfo* space_info);
   virtual ~ShenandoahHeuristics();
@@ -185,6 +210,10 @@ public:
 
   virtual bool should_start_gc();
 
+  inline void cancel_trigger_request() {
+    _start_gc_is_pending = false;
+  }
+
   virtual bool should_degenerate_cycle();
 
   virtual void record_success_concurrent();
diff --git a/src/hotspot/share/gc/shenandoah/heuristics/shenandoahPassiveHeuristics.cpp b/src/hotspot/share/gc/shenandoah/heuristics/shenandoahPassiveHeuristics.cpp
index a0f209b0d20..b5e9cc433ea 100644
--- a/src/hotspot/share/gc/shenandoah/heuristics/shenandoahPassiveHeuristics.cpp
+++ b/src/hotspot/share/gc/shenandoah/heuristics/shenandoahPassiveHeuristics.cpp
@@ -36,6 +36,7 @@ ShenandoahPassiveHeuristics::ShenandoahPassiveHeuristics(ShenandoahSpaceInfo* sp
 
 bool ShenandoahPassiveHeuristics::should_start_gc() {
   // Never do concurrent GCs.
+  decline_trigger();
   return false;
 }
 
diff --git a/src/hotspot/share/gc/shenandoah/heuristics/shenandoahStaticHeuristics.cpp b/src/hotspot/share/gc/shenandoah/heuristics/shenandoahStaticHeuristics.cpp
index 8918d1b3d94..e6f60dc1c83 100644
--- a/src/hotspot/share/gc/shenandoah/heuristics/shenandoahStaticHeuristics.cpp
+++ b/src/hotspot/share/gc/shenandoah/heuristics/shenandoahStaticHeuristics.cpp
@@ -55,6 +55,7 @@ bool ShenandoahStaticHeuristics::should_start_gc() {
     log_trigger("Free (%zu%s) is below minimum threshold (%zu%s)",
                  byte_size_in_proper_unit(available),           proper_unit_for_byte_size(available),
                  byte_size_in_proper_unit(threshold_available), proper_unit_for_byte_size(threshold_available));
+    accept_trigger();
     return true;
   }
   return ShenandoahHeuristics::should_start_gc();
diff --git a/src/hotspot/share/gc/shenandoah/heuristics/shenandoahYoungHeuristics.cpp b/src/hotspot/share/gc/shenandoah/heuristics/shenandoahYoungHeuristics.cpp
index 8e983f62ce1..9f8c6225d23 100644
--- a/src/hotspot/share/gc/shenandoah/heuristics/shenandoahYoungHeuristics.cpp
+++ b/src/hotspot/share/gc/shenandoah/heuristics/shenandoahYoungHeuristics.cpp
@@ -119,6 +119,8 @@ bool ShenandoahYoungHeuristics::should_start_gc() {
     if (old_generation->is_preparing_for_mark() || old_generation->is_concurrent_mark_in_progress()) {
       size_t old_time_elapsed = size_t(old_heuristics->elapsed_cycle_time() * 1000);
       if (old_time_elapsed < ShenandoahMinimumOldTimeMs) {
+        // Do not decline_trigger() when waiting for minimum quantum of Old-gen marking.  It is not at our discretion
+        // to trigger at this time.
         return false;
       }
     }
@@ -140,6 +142,7 @@ bool ShenandoahYoungHeuristics::should_start_gc() {
     // Detect unsigned arithmetic underflow
     assert(promo_potential < heap->capacity(), "Sanity");
     log_trigger("Expedite promotion of " PROPERFMT, PROPERFMTARGS(promo_potential));
+    accept_trigger();
     return true;
   }
 
@@ -150,9 +153,11 @@ bool ShenandoahYoungHeuristics::should_start_gc() {
     // candidates, but has not completed. There is no point in trying to start the young cycle before the old
     // cycle completes.
     log_trigger("Expedite mixed evacuation of %zu regions", mixed_candidates);
+    accept_trigger();
     return true;
   }
 
+  // Don't decline_trigger() here  That was done in ShenandoahAdaptiveHeuristics::should_start_gc()
   return false;
 }
 
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahControlThread.cpp b/src/hotspot/share/gc/shenandoah/shenandoahControlThread.cpp
index 7208a092682..1ddfb6b7054 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahControlThread.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahControlThread.cpp
@@ -131,6 +131,8 @@ void ShenandoahControlThread::run_service() {
       // GC is starting, bump the internal ID
       update_gc_id();
 
+      heuristics->cancel_trigger_request();
+
       heap->reset_bytes_allocated_since_gc_start();
 
       MetaspaceCombinedStats meta_sizes = MetaspaceUtils::get_combined_statistics();
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahFreeSet.hpp b/src/hotspot/share/gc/shenandoah/shenandoahFreeSet.hpp
index 45b33e5253b..9f4d1d222b5 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahFreeSet.hpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahFreeSet.hpp
@@ -437,6 +437,7 @@ public:
 
   inline size_t capacity()  const { return _partitions.capacity_of(ShenandoahFreeSetPartitionId::Mutator); }
   inline size_t used()      const { return _partitions.used_by(ShenandoahFreeSetPartitionId::Mutator);     }
+
   inline size_t available() const {
     assert(used() <= capacity(), "must use less than capacity");
     return capacity() - used();
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahRegulatorThread.cpp b/src/hotspot/share/gc/shenandoah/shenandoahRegulatorThread.cpp
index 7ed2803f877..a684e8ff228 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahRegulatorThread.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahRegulatorThread.cpp
@@ -65,6 +65,7 @@ void ShenandoahRegulatorThread::regulate_young_and_old_cycles() {
         if (request_concurrent_gc(GLOBAL)) {
           // Some of vmTestbase/metaspace tests depend on following line to count GC cycles
           _global_heuristics->log_trigger("%s", GCCause::to_string(GCCause::_metadata_GC_threshold));
+          _global_heuristics->cancel_trigger_request();
         }
       } else {
         if (_young_heuristics->should_start_gc()) {
@@ -72,14 +73,17 @@ void ShenandoahRegulatorThread::regulate_young_and_old_cycles() {
           // begins with a 'bootstrap' cycle that will also collect young.
           if (start_old_cycle()) {
             log_debug(gc)("Heuristics request for old collection accepted");
+            _young_heuristics->cancel_trigger_request();
           } else if (request_concurrent_gc(YOUNG)) {
             log_debug(gc)("Heuristics request for young collection accepted");
+            _young_heuristics->cancel_trigger_request();
           }
         }
       }
     } else if (mode == ShenandoahGenerationalControlThread::servicing_old) {
       if (start_young_cycle()) {
         log_debug(gc)("Heuristics request to interrupt old for young collection accepted");
+        _young_heuristics->cancel_trigger_request();
       }
     }
 
@@ -93,8 +97,10 @@ void ShenandoahRegulatorThread::regulate_young_and_global_cycles() {
     if (_control_thread->gc_mode() == ShenandoahGenerationalControlThread::none) {
       if (start_global_cycle()) {
         log_debug(gc)("Heuristics request for global collection accepted.");
+        _global_heuristics->cancel_trigger_request();
       } else if (start_young_cycle()) {
         log_debug(gc)("Heuristics request for young collection accepted.");
+        _young_heuristics->cancel_trigger_request();
       }
     }
 

From ba6c96599aac1a6c08cb66c611474f83bbc9b260 Mon Sep 17 00:00:00 2001
From: Kelvin Nilsen <kdnilsen@openjdk.org>
Date: Fri, 14 Feb 2025 16:41:26 +0000
Subject: [PATCH 016/587] 8348595: GenShen: Fix generational free-memory
 no-progress check

Reviewed-by: phh, xpeng
---
 .../gc/shenandoah/shenandoahDegeneratedGC.cpp |  2 +-
 .../share/gc/shenandoah/shenandoahFreeSet.hpp |  3 +++
 .../share/gc/shenandoah/shenandoahFullGC.cpp  |  2 +-
 .../share/gc/shenandoah/shenandoahMetrics.cpp | 24 ++++++++++++++++---
 .../share/gc/shenandoah/shenandoahMetrics.hpp |  2 +-
 5 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/src/hotspot/share/gc/shenandoah/shenandoahDegeneratedGC.cpp b/src/hotspot/share/gc/shenandoah/shenandoahDegeneratedGC.cpp
index 95d8543f46a..17af519392e 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahDegeneratedGC.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahDegeneratedGC.cpp
@@ -303,7 +303,7 @@ void ShenandoahDegenGC::op_degenerated() {
 
   // Check for futility and fail. There is no reason to do several back-to-back Degenerated cycles,
   // because that probably means the heap is overloaded and/or fragmented.
-  if (!metrics.is_good_progress()) {
+  if (!metrics.is_good_progress(_generation)) {
     heap->cancel_gc(GCCause::_shenandoah_upgrade_to_full_gc);
     op_degenerated_futile();
   } else {
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahFreeSet.hpp b/src/hotspot/share/gc/shenandoah/shenandoahFreeSet.hpp
index 9f4d1d222b5..d4754167236 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahFreeSet.hpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahFreeSet.hpp
@@ -435,6 +435,9 @@ public:
   // Acquire heap lock and log status, assuming heap lock is not acquired by the caller.
   void log_status_under_lock();
 
+  // Note that capacity is the number of regions that had available memory at most recent rebuild.  It is not the
+  // entire size of the young or global generation.  (Regions within the generation that were fully utilized at time of
+  // rebuild are not counted as part of capacity.)
   inline size_t capacity()  const { return _partitions.capacity_of(ShenandoahFreeSetPartitionId::Mutator); }
   inline size_t used()      const { return _partitions.used_by(ShenandoahFreeSetPartitionId::Mutator);     }
 
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahFullGC.cpp b/src/hotspot/share/gc/shenandoah/shenandoahFullGC.cpp
index c83de047e97..5f8543ca751 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahFullGC.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahFullGC.cpp
@@ -119,7 +119,7 @@ void ShenandoahFullGC::op_full(GCCause::Cause cause) {
 
   metrics.snap_after();
 
-  if (metrics.is_good_progress()) {
+  if (metrics.is_good_progress(heap->global_generation())) {
     heap->notify_gc_progress();
   } else {
     // Nothing to do. Tell the allocation path that we have failed to make
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahMetrics.cpp b/src/hotspot/share/gc/shenandoah/shenandoahMetrics.cpp
index 201bcdc9e39..32386e6aec0 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahMetrics.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahMetrics.cpp
@@ -43,10 +43,28 @@ void ShenandoahMetricsSnapshot::snap_after() {
   _ef_after = _heap->free_set()->external_fragmentation();
 }
 
-bool ShenandoahMetricsSnapshot::is_good_progress() {
+// For degenerated GC, generation is Young in generational mode, Global in non-generational mode.
+// For full GC, generation is always Global.
+//
+// Note that the size of the chosen collection set is proportional to the relevant generation's collection set.
+// Note also that the generation size may change following selection of the collection set, as a side effect
+// of evacuation.  Evacuation may promote objects, causing old to grow and young to shrink.  Or this may be a
+// mixed evacuation.  When old regions are evacuated, this typically allows young to expand.  In all of these
+// various scenarios, the purpose of asking is_good_progress() is to determine if there is enough memory available
+// within young generation to justify making an attempt to perform a concurrent collection.  For this reason, we'll
+// use the current size of the generation (which may not be different than when the collection set was chosen) to
+// assess how much free memory we require in order to consider the most recent GC to have had good progress.
+
+bool ShenandoahMetricsSnapshot::is_good_progress(ShenandoahGeneration* generation) {
   // Under the critical threshold?
-  size_t free_actual   = _heap->free_set()->available();
-  size_t free_expected = _heap->max_capacity() / 100 * ShenandoahCriticalFreeThreshold;
+  ShenandoahFreeSet* free_set = _heap->free_set();
+  size_t free_actual   = free_set->available();
+
+  // ShenandoahCriticalFreeThreshold is expressed as a percentage.  We multiple this percentage by 1/100th
+  // of the generation capacity to determine whether the available memory within the generation exceeds the
+  // critical threshold.
+  size_t free_expected = (generation->max_capacity() / 100) * ShenandoahCriticalFreeThreshold;
+
   bool prog_free = free_actual >= free_expected;
   log_info(gc, ergo)("%s progress for free space: %zu%s, need %zu%s",
                      prog_free ? "Good" : "Bad",
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahMetrics.hpp b/src/hotspot/share/gc/shenandoah/shenandoahMetrics.hpp
index 202d90bb1be..20d8ebfd595 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahMetrics.hpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahMetrics.hpp
@@ -40,7 +40,7 @@ public:
   void snap_before();
   void snap_after();
 
-  bool is_good_progress();
+  bool is_good_progress(ShenandoahGeneration *generation);
 };
 
 #endif // SHARE_GC_SHENANDOAH_SHENANDOAHMETRICS_HPP

From b6443f6ff96707f67552df41c01d18c193560223 Mon Sep 17 00:00:00 2001
From: Chris Plummer <cjplummer@openjdk.org>
Date: Fri, 14 Feb 2025 19:40:47 +0000
Subject: [PATCH 017/587] 8348347: Cleanup JavaThread subclass support in SA

Reviewed-by: kevinw, sspitsyn
---
 .../hotspot/runtime/AttachListenerThread.java | 41 -----------------
 .../jvm/hotspot/runtime/CompilerThread.java   | 17 +++++--
 .../runtime/DeoptimizeObjectsALotThread.java  | 42 ------------------
 ...DedupThread.java => HiddenJavaThread.java} | 10 +++--
 .../sun/jvm/hotspot/runtime/JavaThread.java   | 20 +--------
 .../jvm/hotspot/runtime/JvmtiAgentThread.java | 44 -------------------
 .../runtime/MonitorDeflationThread.java       | 41 -----------------
 .../hotspot/runtime/NotificationThread.java   | 37 ----------------
 .../jvm/hotspot/runtime/ServiceThread.java    | 41 -----------------
 .../sun/jvm/hotspot/runtime/Thread.java       |  9 ----
 .../jvm/hotspot/runtime/ThreadStackTrace.java |  5 +--
 .../sun/jvm/hotspot/runtime/Threads.java      | 39 ++++++++--------
 .../sun/jvm/hotspot/tools/StackTrace.java     | 31 +++++++------
 .../sun/jvm/hotspot/ui/JavaThreadsPanel.java  |  4 +-
 .../hotspot/utilities/PointerLocation.java    | 17 +++----
 15 files changed, 63 insertions(+), 335 deletions(-)
 delete mode 100644 src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/AttachListenerThread.java
 delete mode 100644 src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/DeoptimizeObjectsALotThread.java
 rename src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/{StringDedupThread.java => HiddenJavaThread.java} (84%)
 delete mode 100644 src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/JvmtiAgentThread.java
 delete mode 100644 src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/MonitorDeflationThread.java
 delete mode 100644 src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/NotificationThread.java
 delete mode 100644 src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/ServiceThread.java

diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/AttachListenerThread.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/AttachListenerThread.java
deleted file mode 100644
index 55d440f79fd..00000000000
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/AttachListenerThread.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright (c) 2023, Alibaba Group Holding Limited. All Rights Reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please 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;
-
-import java.io.*;
-
-import sun.jvm.hotspot.debugger.Address;
-
-public class AttachListenerThread extends JavaThread {
-
-  public AttachListenerThread (Address addr) {
-    super(addr);
-  }
-
-  public boolean isJavaThread() { return false; }
-
-  public boolean isAttachListenerThread() { return true; }
-
-}
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/CompilerThread.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/CompilerThread.java
index a54ad3f30f6..e5c3ec30887 100644
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/CompilerThread.java
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/CompilerThread.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -65,8 +65,17 @@ public class CompilerThread extends JavaThread {
     super(addr);
   }
 
-  public boolean isJavaThread() { return false; }
-  public boolean isHiddenFromExternalView() { return true; }
-  public boolean isCompilerThread() { return true; }
+  @Override
+  public boolean isHiddenFromExternalView() {
+      /*
+       * See JDK-8348317. CompilerThreads are sometimes hidden and sometimes not. They
+       * are not when JVMCI is enabled and a compiler implemented in java is running
+       * on the CompilerThread. This is hard for SA to determine, and not something a customer
+       * is likely to ever run across or care about, so by default all CompilerThreads
+       * are considered to be hidden. However, we allow this behaviour to be overridden
+       * in case the user has a need to make the CompilerThreads visible.
+       */
+      return !Boolean.getBoolean("sun.jvm.hotspot.runtime.CompilerThread.visible");
+  }
 
 }
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/DeoptimizeObjectsALotThread.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/DeoptimizeObjectsALotThread.java
deleted file mode 100644
index b79d43948a2..00000000000
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/DeoptimizeObjectsALotThread.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please 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;
-
-import java.io.*;
-
-import sun.jvm.hotspot.debugger.Address;
-
-public class DeoptimizeObjectsALotThread extends JavaThread {
-
-  public DeoptimizeObjectsALotThread (Address addr) {
-    super(addr);
-  }
-
-  public boolean isJavaThread() { return false; }
-  public boolean isHiddenFromExternalView() { return true; }
-
-  public boolean isDeoptimizeObjectsALotThread() { return true; }
-
-}
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/StringDedupThread.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/HiddenJavaThread.java
similarity index 84%
rename from src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/StringDedupThread.java
rename to src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/HiddenJavaThread.java
index 3922a2275da..a11aab54bd5 100644
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/StringDedupThread.java
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/HiddenJavaThread.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,11 +26,13 @@ package sun.jvm.hotspot.runtime;
 
 import sun.jvm.hotspot.debugger.Address;
 
-public class StringDedupThread extends JavaThread {
-    public StringDedupThread(Address addr) {
+public class HiddenJavaThread extends JavaThread {
+
+    public HiddenJavaThread(Address addr) {
         super(addr);
     }
 
-    public boolean isJavaThread() { return false; }
+    @Override
     public boolean isHiddenFromExternalView() { return true; }
+
 }
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 0efd1d94ca1..d92f464f0d2 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, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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,13 +33,6 @@ import sun.jvm.hotspot.utilities.*;
 import sun.jvm.hotspot.utilities.Observable;
 import sun.jvm.hotspot.utilities.Observer;
 
-/** This is an abstract class because there are certain OS- and
-    CPU-specific operations (like the setting and getting of the last
-    Java frame pointer) which need to be factored out. These
-    operations are implemented by, for example,
-    SolarisSPARCJavaThread, and the concrete subclasses are
-    instantiated by the JavaThreadFactory in the Threads class. */
-
 public class JavaThread extends Thread {
   private static final boolean DEBUG = System.getProperty("sun.jvm.hotspot.runtime.JavaThread.DEBUG") != null;
 
@@ -58,6 +51,7 @@ public class JavaThread extends Thread {
   private static CIntegerField monitorOwnerIDField;
   private static long oopPtrSize;
 
+  // For accessing platform dependent functionality
   private static JavaThreadPDAccess access;
 
   // JavaThreadStates read from underlying process
@@ -133,16 +127,6 @@ public class JavaThread extends Thread {
     this.access = access;
   }
 
-  /** NOTE: for convenience, this differs in definition from the underlying VM.
-      Only "pure" JavaThreads return true; CompilerThreads,
-      JVMDIDebuggerThreads return false.
-      FIXME:
-      consider encapsulating platform-specific functionality in an
-      object instead of using inheritance (which is the primary reason
-      we can't traverse CompilerThreads, etc; didn't want to have, for
-      example, "SolarisSPARCCompilerThread".) */
-  public boolean isJavaThread() { return true; }
-
   public boolean isExiting () {
       return (getTerminated() == EXITING) || isTerminated();
   }
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/JvmtiAgentThread.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/JvmtiAgentThread.java
deleted file mode 100644
index 79d66fb2454..00000000000
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/JvmtiAgentThread.java
+++ /dev/null
@@ -1,44 +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.
- *
- */
-
-package sun.jvm.hotspot.runtime;
-
-import java.io.*;
-
-import sun.jvm.hotspot.debugger.*;
-import sun.jvm.hotspot.types.*;
-
-/** FIXME: should be in ../prims dir if that directory existed; for
-    now keep it in runtime dir */
-
-public class JvmtiAgentThread extends JavaThread {
-  public JvmtiAgentThread(Address addr) {
-    super(addr);
-  }
-
-  public boolean isJavaThread() { return false; }
-
-  public boolean isJvmtiAgentThread() { return true; }
-
-}
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/MonitorDeflationThread.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/MonitorDeflationThread.java
deleted file mode 100644
index 8bd6492f880..00000000000
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/MonitorDeflationThread.java
+++ /dev/null
@@ -1,41 +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.
- *
- */
-
-package sun.jvm.hotspot.runtime;
-
-import java.io.*;
-
-import sun.jvm.hotspot.debugger.*;
-import sun.jvm.hotspot.types.*;
-
-public class MonitorDeflationThread extends JavaThread {
-  public MonitorDeflationThread(Address addr) {
-    super(addr);
-  }
-
-  public boolean isJavaThread() { return false; }
-  public boolean isHiddenFromExternalView() { return true; }
-  public boolean isMonitorDeflationThread() { return true; }
-
-}
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/NotificationThread.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/NotificationThread.java
deleted file mode 100644
index 2173d4e7191..00000000000
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/NotificationThread.java
+++ /dev/null
@@ -1,37 +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.jvm.hotspot.runtime;
-
-
-import sun.jvm.hotspot.debugger.Address;
-
-public class NotificationThread extends JavaThread {
-    public NotificationThread(Address addr) {
-        super(addr);
-    }
-
-    public boolean isJavaThread() { return false; }
-
-}
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/ServiceThread.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/ServiceThread.java
deleted file mode 100644
index d4e28404176..00000000000
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/ServiceThread.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright (c) 2003, 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.
- *
- */
-
-package sun.jvm.hotspot.runtime;
-
-import java.io.*;
-
-import sun.jvm.hotspot.debugger.*;
-import sun.jvm.hotspot.types.*;
-
-public class ServiceThread extends JavaThread {
-  public ServiceThread(Address addr) {
-    super(addr);
-  }
-
-  public boolean isJavaThread() { return false; }
-  public boolean isHiddenFromExternalView() { return true; }
-  public boolean isServiceThread() { return true; }
-
-}
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/Thread.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/Thread.java
index f9f2f578928..22bc02a06d9 100644
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/Thread.java
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/Thread.java
@@ -80,16 +80,7 @@ public class Thread extends VMObject {
   }
 
   public boolean   isVMThread()                  { return false; }
-  public boolean   isJavaThread()                { return false; }
-  public boolean   isCompilerThread()            { return false; }
-  public boolean   isCodeCacheSweeperThread()    { return false; }
   public boolean   isHiddenFromExternalView()    { return false; }
-  public boolean   isJvmtiAgentThread()          { return false; }
-  public boolean   isWatcherThread()             { return false; }
-  public boolean   isServiceThread()             { return false; }
-  public boolean   isMonitorDeflationThread()    { return false; }
-  public boolean   isAttachListenerThread()      { return false; }
-  public boolean   isDeoptimizeObjectsALotThread() { return false; }
 
   /** Memory operations */
   public void oopsDo(AddressVisitor oopVisitor) {
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/ThreadStackTrace.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/ThreadStackTrace.java
index 6d3a8109f1b..4053becd916 100644
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/ThreadStackTrace.java
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/ThreadStackTrace.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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 class ThreadStackTrace {
     }
 
     public void dumpStack(int maxDepth) {
-        if (!thread.isJavaThread()) {
-            return;
-        }
         try {
             for (JavaVFrame vf = thread.getLastJavaVFrameDbg(); vf != null; vf = vf.javaSender()) {
                 StackFrameInfo frame = new StackFrameInfo(vf);
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 a894380a76f..b6935963de9 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
@@ -142,21 +142,29 @@ public class Threads {
         }
 
         virtualConstructor = new VirtualConstructor(db);
-        // Add mappings for all known thread types
+
+        /*
+         * Add mappings for JavaThread types
+         */
+
         virtualConstructor.addMapping("JavaThread", JavaThread.class);
+
         if (!VM.getVM().isCore()) {
             virtualConstructor.addMapping("CompilerThread", CompilerThread.class);
         }
-        virtualConstructor.addMapping("JvmtiAgentThread", JvmtiAgentThread.class);
-        virtualConstructor.addMapping("ServiceThread", ServiceThread.class);
-        virtualConstructor.addMapping("MonitorDeflationThread", MonitorDeflationThread.class);
-        virtualConstructor.addMapping("NotificationThread", NotificationThread.class);
-        virtualConstructor.addMapping("StringDedupThread", StringDedupThread.class);
-        virtualConstructor.addMapping("AttachListenerThread", AttachListenerThread.class);
 
-        /* Only add DeoptimizeObjectsALotThread if it is actually present in the type database. */
+        // These are all the visible JavaThread subclasses that execute java code.
+        virtualConstructor.addMapping("JvmtiAgentThread", JavaThread.class);
+        virtualConstructor.addMapping("NotificationThread", JavaThread.class);
+        virtualConstructor.addMapping("AttachListenerThread", JavaThread.class);
+
+        // These are all the hidden JavaThread subclasses that don't execute java code.
+        virtualConstructor.addMapping("StringDedupThread", HiddenJavaThread.class);
+        virtualConstructor.addMapping("ServiceThread", HiddenJavaThread.class);
+        virtualConstructor.addMapping("MonitorDeflationThread", HiddenJavaThread.class);
+        // Only add DeoptimizeObjectsALotThread if it is actually present in the type database.
         if (db.lookupType("DeoptimizeObjectsALotThread", false) != null) {
-            virtualConstructor.addMapping("DeoptimizeObjectsALotThread", DeoptimizeObjectsALotThread.class);
+            virtualConstructor.addMapping("DeoptimizeObjectsALotThread", HiddenJavaThread.class);
         }
     }
 
@@ -164,17 +172,6 @@ public class Threads {
         _list = VMObjectFactory.newObject(ThreadsList.class, threadListField.getValue());
     }
 
-    /** NOTE: this returns objects of type JavaThread or one if its subclasses:
-      CompilerThread, JvmtiAgentThread, NotificationThread, MonitorDeflationThread,
-      StringDedupThread, AttachListenerThread, DeoptimizeObjectsALotThread and
-      ServiceThread. Most operations (fetching the top frame, etc.) are only
-      allowed to be performed on a "pure" JavaThread. For this reason,
-      {@link sun.jvm.hotspot.runtime.JavaThread#isJavaThread} has been
-      changed from the definition in the VM (which returns true for
-      all of these thread types) to return true for JavaThreads and
-      false for the seven subclasses. FIXME: should reconsider the
-      inheritance hierarchy; see {@link
-      sun.jvm.hotspot.runtime.JavaThread#isJavaThread}. */
     public JavaThread getJavaThreadAt(int i) {
         if (i < _list.length()) {
             return createJavaThreadWrapper(_list.getJavaThreadAddressAt(i));
@@ -258,7 +255,7 @@ public class Threads {
         List<JavaThread> pendingThreads = new ArrayList<>();
         for (int i = 0; i < getNumberOfThreads(); i++) {
             JavaThread thread = getJavaThreadAt(i);
-            if (thread.isCompilerThread() || thread.isCodeCacheSweeperThread()) {
+            if (thread.isHiddenFromExternalView()) {
                 continue;
             }
             ObjectMonitor pending = thread.getCurrentPendingMonitor();
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/tools/StackTrace.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/tools/StackTrace.java
index 2dfdd1ec5a9..266dd852742 100644
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/tools/StackTrace.java
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/tools/StackTrace.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -73,7 +73,7 @@ public class StackTrace extends Tool {
             Threads threads = VM.getVM().getThreads();
             for (int i = 0; i < threads.getNumberOfThreads(); i++) {
                 JavaThread cur = threads.getJavaThreadAt(i);
-                if (cur.isJavaThread()) {
+                if (!cur.isHiddenFromExternalView()) {
                     cur.printThreadInfoOn(tty);
                     try {
                         int count = 0;
@@ -126,20 +126,19 @@ public class StackTrace extends Tool {
                         concLocksPrinter.print(cur);
                         tty.println();
                     }
-              }
-          }
-      }
-      catch (AddressException e) {
-        System.err.println("Error accessing address 0x" + Long.toHexString(e.getAddress()));
-        e.printStackTrace();
-      }
-   }
+                }
+            }
+        } catch (AddressException e) {
+            System.err.println("Error accessing address 0x" + Long.toHexString(e.getAddress()));
+            e.printStackTrace();
+        }
+    }
 
-   public static void main(String[] args) {
-      StackTrace st = new StackTrace();
-      st.execute(args);
-   }
+    public static void main(String[] args) {
+        StackTrace st = new StackTrace();
+        st.execute(args);
+    }
 
-   private boolean verbose;
-   private boolean concurrentLocks;
+    private boolean verbose;
+    private boolean concurrentLocks;
 }
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/JavaThreadsPanel.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/JavaThreadsPanel.java
index 587cba545a4..3946db8938e 100644
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/JavaThreadsPanel.java
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/JavaThreadsPanel.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -464,7 +464,7 @@ public class JavaThreadsPanel extends SAPanel implements ActionListener {
       Threads threads = VM.getVM().getThreads();
       for (int i = 0; i < threads.getNumberOfThreads(); i++) {
         JavaThread t = threads.getJavaThreadAt(i);
-        if (t.isJavaThread()) {
+        if (!t.isHiddenFromExternalView()) {
             cachedThreads.add(new CachedThread(t));
         }
       }
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/PointerLocation.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/PointerLocation.java
index c3f09bd5e3d..9cfa03bc15c 100644
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/PointerLocation.java
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/PointerLocation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -86,7 +86,7 @@ public class PointerLocation {
 
   boolean inLocalJNIHandleBlock;
   JNIHandleBlock handleBlock;
-  sun.jvm.hotspot.runtime.Thread handleThread;
+  JavaThread handleThread;
 
   public PointerLocation(Address addr) {
     this.addr = addr;
@@ -200,7 +200,7 @@ public class PointerLocation {
   }
 
   /** Only valid if isInLocalJNIHandleBlock is true */
-  public sun.jvm.hotspot.runtime.Thread getJNIHandleThread() {
+  public JavaThread getJNIHandleThread() {
     assert isInLocalJNIHandleBlock();
     return handleThread;
   }
@@ -356,14 +356,9 @@ public class PointerLocation {
       tty.println("In JNI weak global");
     } else if (isInLocalJNIHandleBlock()) {
       tty.print("In thread-local");
-      tty.print(" JNI handle block (" + handleBlock.top() + " handle slots present)");
-      if (handleThread.isJavaThread()) {
-        tty.print(" for JavaThread ");
-        ((JavaThread) handleThread).printThreadIDOn(tty);
-        tty.println();
-      } else {
-        tty.println(" for a non-Java Thread");
-      }
+      tty.print(" JNI handle block (" + handleBlock.top() + " handle slots present) for JavaThread ");
+      handleThread.printThreadIDOn(tty);
+      tty.println();
     } else {
       // This must be last
       if (Assert.ASSERTS_ENABLED) {

From 623453647a8a387b2d8d375cb18b33666abc16ee Mon Sep 17 00:00:00 2001
From: Aleksey Shipilev <shade@openjdk.org>
Date: Sat, 15 Feb 2025 07:22:20 +0000
Subject: [PATCH 018/587] 8349915: CTW: Lots of level 3 compiles are done at
 level 2 after JDK-8348570

Reviewed-by: kvn, chagedorn
---
 src/hotspot/share/compiler/compilationPolicy.cpp | 5 +++++
 src/hotspot/share/compiler/compileTask.hpp       | 2 ++
 2 files changed, 7 insertions(+)

diff --git a/src/hotspot/share/compiler/compilationPolicy.cpp b/src/hotspot/share/compiler/compilationPolicy.cpp
index e28c4511d52..7f2a67f641b 100644
--- a/src/hotspot/share/compiler/compilationPolicy.cpp
+++ b/src/hotspot/share/compiler/compilationPolicy.cpp
@@ -633,6 +633,11 @@ CompileTask* CompilationPolicy::select_task(CompileQueue* compile_queue) {
       task = next_task;
       continue;
     }
+    if (task->compile_reason() == CompileTask::Reason_Whitebox) {
+      // Whitebox (CTW) tasks do not participate in rate selection and/or any level
+      // adjustments. Just return them in order.
+      return task;
+    }
     Method* method = task->method();
     methodHandle mh(Thread::current(), method);
     if (task->can_become_stale() && is_stale(t, TieredCompileTaskTimeout, mh) && !is_old(mh)) {
diff --git a/src/hotspot/share/compiler/compileTask.hpp b/src/hotspot/share/compiler/compileTask.hpp
index 14591a3abdf..04ad7e35a13 100644
--- a/src/hotspot/share/compiler/compileTask.hpp
+++ b/src/hotspot/share/compiler/compileTask.hpp
@@ -199,6 +199,8 @@ class CompileTask : public CHeapObj<mtCompiler> {
   int          comp_level()                      { return _comp_level;}
   void         set_comp_level(int comp_level)    { _comp_level = comp_level;}
 
+  CompileReason compile_reason()                 { return _compile_reason; }
+
   AbstractCompiler* compiler() const;
   CompileTask*      select_for_compilation();
 

From 5cf11324afdeed0189e0491845a7ffe78c7c1e13 Mon Sep 17 00:00:00 2001
From: Alexey Semenyuk <asemenyuk@openjdk.org>
Date: Sat, 15 Feb 2025 14:31:29 +0000
Subject: [PATCH 019/587] 8350098: jpackage test lib erroneously will run
 methods without @Test annotation as tests

Reviewed-by: almatvee
---
 .../jdk/jpackage/test/AnnotationsTest.java    | 39 ++++++++++++++++++-
 .../jdk/jpackage/test/Annotations.java        |  2 +-
 .../jdk/jpackage/test/TestBuilder.java        | 25 +++++-------
 .../jdk/jpackage/test/TestMethodSupplier.java | 11 ++++--
 4 files changed, 55 insertions(+), 22 deletions(-)

diff --git a/test/jdk/tools/jpackage/helpers-test/jdk/jpackage/test/AnnotationsTest.java b/test/jdk/tools/jpackage/helpers-test/jdk/jpackage/test/AnnotationsTest.java
index cd7914b917b..fdbd30ac7e9 100644
--- a/test/jdk/tools/jpackage/helpers-test/jdk/jpackage/test/AnnotationsTest.java
+++ b/test/jdk/tools/jpackage/helpers-test/jdk/jpackage/test/AnnotationsTest.java
@@ -102,6 +102,12 @@ public class AnnotationsTest extends JUnitAdapter {
             recordTestCase(v);
         }
 
+        @Test
+        @ParameterSupplier
+        public void testDates2(LocalDate v) {
+            recordTestCase(v);
+        }
+
         public static Set<String> getExpectedTestDescs() {
             return Set.of(
                     "().testNoArg()",
@@ -115,7 +121,9 @@ public class AnnotationsTest extends JUnitAdapter {
                     "().testDates(2018-05-05)",
                     "().testDates(2018-07-11)",
                     "().testDates(2034-05-05)",
-                    "().testDates(2056-07-11)"
+                    "().testDates(2056-07-11)",
+                    "().testDates2(2028-05-05)",
+                    "().testDates2(2028-07-11)"
             );
         }
 
@@ -125,6 +133,20 @@ public class AnnotationsTest extends JUnitAdapter {
                 { LocalDate.parse("2018-07-11") },
             });
         }
+
+        public static Collection<Object[]> testDates2() {
+            return List.of(new Object[][] {
+                { LocalDate.parse("2028-05-05") },
+                { LocalDate.parse("2028-07-11") },
+            });
+        }
+
+        public static void testDates2(Object unused) {
+        }
+
+        public int testNoArg(int v) {
+            return 0;
+        }
     }
 
     public static class ParameterizedInstanceTest extends TestExecutionRecorder {
@@ -313,12 +335,25 @@ public class AnnotationsTest extends JUnitAdapter {
 
         var args = new String[] { String.format("--jpt-run=%s", test.getName()) };
 
+        final List<String> log;
         try {
-            Main.main(TestBuilder.build().workDirRoot(workDir), args);
+            log = captureJPackageTestLog(() -> Main.main(TestBuilder.build().workDirRoot(workDir), args));
             assertRecordedTestDescs(expectedTestDescs);
         } catch (Throwable t) {
             t.printStackTrace(System.err);
             System.exit(1);
+
+            // Redundant, but needed to suppress "The local variable log may not have been initialized" error.
+            throw new RuntimeException(t);
+        }
+
+        final var actualTestCount = Integer.parseInt(log.stream().dropWhile(line -> {
+            return !(line.startsWith("[==========]") && line.endsWith("tests ran"));
+        }).findFirst().orElseThrow().split(" ")[1]);
+
+        if (actualTestCount != expectedTestDescs.size()) {
+            throw new AssertionError(String.format(
+                    "Expected %d executed tests. Actual %d executed tests", expectedTestDescs.size(), actualTestCount));
         }
     }
 
diff --git a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/Annotations.java b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/Annotations.java
index ad1e77b4171..4b6072c80b5 100644
--- a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/Annotations.java
+++ b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/Annotations.java
@@ -82,7 +82,7 @@ public class Annotations {
     @Repeatable(ParameterSupplierGroup.class)
     public @interface ParameterSupplier {
 
-        String value();
+        String value() default "";
 
         OperatingSystem[] ifOS() default {
             OperatingSystem.LINUX,
diff --git a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/TestBuilder.java b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/TestBuilder.java
index 17c0f131af3..db4810ce5e2 100644
--- a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/TestBuilder.java
+++ b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/TestBuilder.java
@@ -249,10 +249,11 @@ final class TestBuilder implements AutoCloseable {
                 .sorted(Comparator.comparing(Method::getName));
     }
 
-    private Stream<String> cmdLineArgValueToMethodNames(String v) {
-        List<String> result = new ArrayList<>();
+    private Stream<Method> getJavaMethodsFromArg(String argValue) {
+        final List<Method> methods = new ArrayList<>();
+
         String defaultClassName = null;
-        for (String token : v.split(",")) {
+        for (String token : argValue.split(",")) {
             Class<?> testSet = probeClass(token);
             if (testSet != null) {
                 if (testMethodSupplier.isTestClass(testSet)) {
@@ -263,11 +264,9 @@ final class TestBuilder implements AutoCloseable {
                 // from the class with @Test annotation removing name duplicates.
                 // Overloads will be handled at the next phase of processing.
                 defaultClassName = token;
-                result.addAll(Stream.of(testSet.getMethods())
+                methods.addAll(Stream.of(testSet.getMethods())
                         .filter(m -> m.isAnnotationPresent(Test.class))
                         .filter(testMethodSupplier::isEnabled)
-                        .map(Method::getName).distinct()
-                        .map(name -> String.join(".", token, name))
                         .toList());
 
                 continue;
@@ -283,9 +282,11 @@ final class TestBuilder implements AutoCloseable {
             } else {
                 qualifiedMethodName = String.join(".", defaultClassName, token);
             }
-            result.add(qualifiedMethodName);
+            methods.addAll(getJavaMethodFromString(qualifiedMethodName));
         }
-        return result.stream();
+
+        trace(String.format("%s -> %s", argValue, methods));
+        return methods.stream();
     }
 
     private List<Method> getJavaMethodFromString(String qualifiedMethodName) {
@@ -302,14 +303,6 @@ final class TestBuilder implements AutoCloseable {
         }
     }
 
-    private Stream<Method> getJavaMethodsFromArg(String argValue) {
-        var methods = cmdLineArgValueToMethodNames(argValue)
-                .map(this::getJavaMethodFromString)
-                .flatMap(List::stream).toList();
-        trace(String.format("%s -> %s", argValue, methods));
-        return methods.stream();
-    }
-
     private Stream<MethodCall> toMethodCalls(Method method) throws
             IllegalAccessException, InvocationTargetException, InvalidAnnotationException {
         return testMethodSupplier.mapToMethodCalls(method).peek(methodCall -> {
diff --git a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/TestMethodSupplier.java b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/TestMethodSupplier.java
index 6ba4da0590c..8b92ae7ca46 100644
--- a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/TestMethodSupplier.java
+++ b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/TestMethodSupplier.java
@@ -256,12 +256,17 @@ final class TestMethodSupplier {
         }
 
         final Class<?> execClass = exec.getDeclaringClass();
-        final var supplierFuncName = a.value();
+        final String supplierFuncName;
+        if (a.value().isEmpty()) {
+            supplierFuncName = exec.getName();
+        } else {
+            supplierFuncName = a.value();
+        }
 
         final MethodQuery methodQuery;
-        if (!a.value().contains(".")) {
+        if (!supplierFuncName.contains(".")) {
             // No class name specified
-            methodQuery = new MethodQuery(execClass.getName(), a.value());
+            methodQuery = new MethodQuery(execClass.getName(), supplierFuncName);
         } else {
             methodQuery = MethodQuery.fromQualifiedMethodName(supplierFuncName);
         }

From 7d11418c820b46926a25907766d16083a4b349de Mon Sep 17 00:00:00 2001
From: Bradford Wetmore <wetmore@openjdk.org>
Date: Sat, 15 Feb 2025 22:40:46 +0000
Subject: [PATCH 020/587] 8350147: Replace example in KEM class with the one
 from JEP 452

Reviewed-by: weijun
---
 .../share/classes/javax/crypto/KEM.java       | 44 +++++++++++++------
 1 file changed, 30 insertions(+), 14 deletions(-)

diff --git a/src/java.base/share/classes/javax/crypto/KEM.java b/src/java.base/share/classes/javax/crypto/KEM.java
index 927b36ba25c..0486e48615a 100644
--- a/src/java.base/share/classes/javax/crypto/KEM.java
+++ b/src/java.base/share/classes/javax/crypto/KEM.java
@@ -65,24 +65,40 @@ import java.util.Objects;
  * new shared secret and key encapsulation message.
  * <p>
  *
- * Example:
+ * Example operation using a ficticious {@code KEM} algorithm {@code ABC}:
  * {@snippet lang = java:
- *    // Receiver side
- *    var kpg = KeyPairGenerator.getInstance("X25519");
- *    var kp = kpg.generateKeyPair();
+ *     // Receiver side
+ *     KeyPairGenerator g = KeyPairGenerator.getInstance("ABC");
+ *     KeyPair kp = g.generateKeyPair();
+ *     publishKey(kp.getPublic());
  *
- *    // Sender side
- *    var kem1 = KEM.getInstance("DHKEM");
- *    var sender = kem1.newEncapsulator(kp.getPublic());
- *    var encapsulated = sender.encapsulate();
- *    var k1 = encapsulated.key();
+ *     // Sender side
+ *     KEM senderKEM = KEM.getInstance("ABC");
+ *     PublicKey receiverPublicKey = retrieveKey();
+ *     ABCKEMParameterSpec senderSpec = new ABCKEMParameterSpec(args);
+ *     KEM.Encapsulator e = senderKEM.newEncapsulator(
+ *             receiverPublicKey, senderSpec, null);
+ *     KEM.Encapsulated enc = e.encapsulate();
+ *     SecretKey senderSecret = enc.key();
  *
- *    // Receiver side
- *    var kem2 = KEM.getInstance("DHKEM");
- *    var receiver = kem2.newDecapsulator(kp.getPrivate());
- *    var k2 = receiver.decapsulate(encapsulated.encapsulation());
+ *     sendBytes(enc.encapsulation());
+ *     sendBytes(enc.params());
  *
- *    assert Arrays.equals(k1.getEncoded(), k2.getEncoded());
+ *     // Receiver side
+ *     byte[] ciphertext = receiveBytes();
+ *     byte[] params = receiveBytes();
+ *
+ *     KEM receiverKEM = KEM.getInstance("ABC");
+ *     AlgorithmParameters algParams =
+ *             AlgorithmParameters.getInstance("ABC");
+ *     algParams.init(params);
+ *     ABCKEMParameterSpec receiverSpec =
+ *             algParams.getParameterSpec(ABCKEMParameterSpec.class);
+ *     KEM.Decapsulator d =
+ *             receiverKEM.newDecapsulator(kp.getPrivate(), receiverSpec);
+ *     SecretKey receiverSecret = d.decapsulate(ciphertext);
+ *
+ *     // senderSecret and receiverSecret should now be equal.
  * }
  *
  * @since 21

From 2192723734e4edd2d2136637a46e9256c1b15703 Mon Sep 17 00:00:00 2001
From: David Holmes <dholmes@openjdk.org>
Date: Mon, 17 Feb 2025 02:09:25 +0000
Subject: [PATCH 021/587] 8350162: ProblemList
 compiler/tiered/Level2RecompilationTest.java

Reviewed-by: jpai
---
 test/hotspot/jtreg/ProblemList.txt | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/test/hotspot/jtreg/ProblemList.txt b/test/hotspot/jtreg/ProblemList.txt
index e8656a74f4b..991d0435a91 100644
--- a/test/hotspot/jtreg/ProblemList.txt
+++ b/test/hotspot/jtreg/ProblemList.txt
@@ -43,6 +43,8 @@
 
 # :hotspot_compiler
 
+compiler/tiered/Level2RecompilationTest.java 8350159 generic-all
+
 compiler/ciReplay/TestSAServer.java 8029528 generic-all
 compiler/compilercontrol/jcmd/ClearDirectivesFileStackTest.java 8225370 generic-all
 

From 5e9d72e2241426c0cf26abadab73e63434d51a4a Mon Sep 17 00:00:00 2001
From: Matthias Baesken <mbaesken@openjdk.org>
Date: Mon, 17 Feb 2025 08:02:51 +0000
Subject: [PATCH 022/587] 8350094: Linux gcc 13.2.0 build fails when ubsan is
 enabled

Reviewed-by: mdoerr, prr, kbarrett
---
 make/autoconf/jdk-options.m4 | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/make/autoconf/jdk-options.m4 b/make/autoconf/jdk-options.m4
index b90f04a89e2..991f57505dc 100644
--- a/make/autoconf/jdk-options.m4
+++ b/make/autoconf/jdk-options.m4
@@ -516,10 +516,11 @@ AC_DEFUN_ONCE([JDKOPT_SETUP_UNDEFINED_BEHAVIOR_SANITIZER],
       OPTIONAL: true)
 
   # GCC reports lots of likely false positives for stringop-truncation and format-overflow.
+  # GCC 13 also for array-bounds and stringop-overflow
   # Silence them for now.
   UBSAN_CHECKS="-fsanitize=undefined -fsanitize=float-divide-by-zero -fno-sanitize=shift-base -fno-sanitize=alignment \
       $ADDITIONAL_UBSAN_CHECKS"
-  UBSAN_CFLAGS="$UBSAN_CHECKS -Wno-stringop-truncation -Wno-format-overflow -fno-omit-frame-pointer -DUNDEFINED_BEHAVIOR_SANITIZER"
+  UBSAN_CFLAGS="$UBSAN_CHECKS -Wno-stringop-truncation -Wno-format-overflow -Wno-array-bounds -Wno-stringop-overflow -fno-omit-frame-pointer -DUNDEFINED_BEHAVIOR_SANITIZER"
   UBSAN_LDFLAGS="$UBSAN_CHECKS"
   UTIL_ARG_ENABLE(NAME: ubsan, DEFAULT: false, RESULT: UBSAN_ENABLED,
       DESC: [enable UndefinedBehaviorSanitizer],

From b1b48286a6cbee8a9f96d739ab437915c573022c Mon Sep 17 00:00:00 2001
From: Aleksey Shipilev <shade@openjdk.org>
Date: Mon, 17 Feb 2025 09:21:49 +0000
Subject: [PATCH 023/587] 8350086: Inline hot Method accessors for faster task
 selection

Reviewed-by: kvn, coleenp, aph, vlivanov
---
 src/hotspot/share/compiler/compileTask.cpp |  1 +
 src/hotspot/share/oops/method.cpp          | 33 ------------------
 src/hotspot/share/oops/method.hpp          |  8 ++---
 src/hotspot/share/oops/method.inline.hpp   | 39 ++++++++++++++++++++++
 src/hotspot/share/oops/methodData.cpp      |  1 +
 src/hotspot/share/runtime/java.cpp         |  2 +-
 6 files changed, 46 insertions(+), 38 deletions(-)

diff --git a/src/hotspot/share/compiler/compileTask.cpp b/src/hotspot/share/compiler/compileTask.cpp
index e266a215de1..6668f212b21 100644
--- a/src/hotspot/share/compiler/compileTask.cpp
+++ b/src/hotspot/share/compiler/compileTask.cpp
@@ -31,6 +31,7 @@
 #include "logging/logStream.hpp"
 #include "memory/resourceArea.hpp"
 #include "oops/klass.inline.hpp"
+#include "oops/method.inline.hpp"
 #include "runtime/handles.inline.hpp"
 #include "runtime/jniHandles.hpp"
 #include "runtime/mutexLocker.hpp"
diff --git a/src/hotspot/share/oops/method.cpp b/src/hotspot/share/oops/method.cpp
index a0f6a901cf7..1a3b908434f 100644
--- a/src/hotspot/share/oops/method.cpp
+++ b/src/hotspot/share/oops/method.cpp
@@ -1919,39 +1919,6 @@ void Method::clear_all_breakpoints() {
 
 #endif // INCLUDE_JVMTI
 
-int Method::invocation_count() const {
-  MethodCounters* mcs = method_counters();
-  MethodData* mdo = method_data();
-  if (((mcs != nullptr) ? mcs->invocation_counter()->carry() : false) ||
-      ((mdo != nullptr) ? mdo->invocation_counter()->carry() : false)) {
-    return InvocationCounter::count_limit;
-  } else {
-    return ((mcs != nullptr) ? mcs->invocation_counter()->count() : 0) +
-           ((mdo != nullptr) ? mdo->invocation_counter()->count() : 0);
-  }
-}
-
-int Method::backedge_count() const {
-  MethodCounters* mcs = method_counters();
-  MethodData* mdo = method_data();
-  if (((mcs != nullptr) ? mcs->backedge_counter()->carry() : false) ||
-      ((mdo != nullptr) ? mdo->backedge_counter()->carry() : false)) {
-    return InvocationCounter::count_limit;
-  } else {
-    return ((mcs != nullptr) ? mcs->backedge_counter()->count() : 0) +
-           ((mdo != nullptr) ? mdo->backedge_counter()->count() : 0);
-  }
-}
-
-int Method::highest_comp_level() const {
-  const MethodCounters* mcs = method_counters();
-  if (mcs != nullptr) {
-    return mcs->highest_comp_level();
-  } else {
-    return CompLevel_none;
-  }
-}
-
 int Method::highest_osr_comp_level() const {
   const MethodCounters* mcs = method_counters();
   if (mcs != nullptr) {
diff --git a/src/hotspot/share/oops/method.hpp b/src/hotspot/share/oops/method.hpp
index 7b13337ecaf..5daa572a46c 100644
--- a/src/hotspot/share/oops/method.hpp
+++ b/src/hotspot/share/oops/method.hpp
@@ -255,7 +255,7 @@ class Method : public Metadata {
   void set_deprecated_for_removal() { constMethod()->set_deprecated_for_removal(); }
   bool deprecated_for_removal() const { return constMethod()->deprecated_for_removal(); }
 
-  int highest_comp_level() const;
+  inline int highest_comp_level() const;
   void set_highest_comp_level(int level);
   int highest_osr_comp_level() const;
   void set_highest_osr_comp_level(int level);
@@ -334,8 +334,8 @@ class Method : public Metadata {
   inline float rate() const;
   inline void set_rate(float rate);
 
-  int invocation_count() const;
-  int backedge_count() const;
+  inline int invocation_count() const;
+  inline int backedge_count() const;
 
   bool was_executed_more_than(int n);
   bool was_never_executed()                     { return !was_executed_more_than(0);  }
@@ -344,7 +344,7 @@ class Method : public Metadata {
 
   static MethodCounters* build_method_counters(Thread* current, Method* m);
 
-  int interpreter_invocation_count()            { return invocation_count();          }
+  inline int interpreter_invocation_count() const;
 
 #ifndef PRODUCT
   int64_t  compiled_invocation_count() const    { return _compiled_invocation_count;}
diff --git a/src/hotspot/share/oops/method.inline.hpp b/src/hotspot/share/oops/method.inline.hpp
index f27834de30b..18fca354b6b 100644
--- a/src/hotspot/share/oops/method.inline.hpp
+++ b/src/hotspot/share/oops/method.inline.hpp
@@ -28,7 +28,9 @@
 #include "oops/method.hpp"
 
 #include "classfile/vmIntrinsics.hpp"
+#include "code/nmethod.inline.hpp"
 #include "oops/methodCounters.hpp"
+#include "oops/methodData.inline.hpp"
 #include "runtime/atomic.hpp"
 
 inline address Method::from_compiled_entry() const {
@@ -188,4 +190,41 @@ inline void Method::set_rate(float rate) {
   }
 }
 
+inline int Method::invocation_count() const {
+  MethodCounters* mcs = method_counters();
+  MethodData* mdo = method_data();
+  if (((mcs != nullptr) ? mcs->invocation_counter()->carry() : false) ||
+      ((mdo != nullptr) ? mdo->invocation_counter()->carry() : false)) {
+    return InvocationCounter::count_limit;
+  } else {
+    return ((mcs != nullptr) ? mcs->invocation_counter()->count() : 0) +
+           ((mdo != nullptr) ? mdo->invocation_counter()->count() : 0);
+  }
+}
+
+inline int Method::backedge_count() const {
+  MethodCounters* mcs = method_counters();
+  MethodData* mdo = method_data();
+  if (((mcs != nullptr) ? mcs->backedge_counter()->carry() : false) ||
+      ((mdo != nullptr) ? mdo->backedge_counter()->carry() : false)) {
+    return InvocationCounter::count_limit;
+  } else {
+    return ((mcs != nullptr) ? mcs->backedge_counter()->count() : 0) +
+           ((mdo != nullptr) ? mdo->backedge_counter()->count() : 0);
+  }
+}
+
+inline int Method::highest_comp_level() const {
+  const MethodCounters* mcs = method_counters();
+  if (mcs != nullptr) {
+    return mcs->highest_comp_level();
+  } else {
+    return CompLevel_none;
+  }
+}
+
+inline int Method::interpreter_invocation_count() const {
+  return invocation_count();
+}
+
 #endif // SHARE_OOPS_METHOD_INLINE_HPP
diff --git a/src/hotspot/share/oops/methodData.cpp b/src/hotspot/share/oops/methodData.cpp
index 1abc34acc6b..2d366168f08 100644
--- a/src/hotspot/share/oops/methodData.cpp
+++ b/src/hotspot/share/oops/methodData.cpp
@@ -33,6 +33,7 @@
 #include "memory/metaspaceClosure.hpp"
 #include "memory/resourceArea.hpp"
 #include "oops/klass.inline.hpp"
+#include "oops/method.inline.hpp"
 #include "oops/methodData.inline.hpp"
 #include "prims/jvmtiRedefineClasses.hpp"
 #include "runtime/atomic.hpp"
diff --git a/src/hotspot/share/runtime/java.cpp b/src/hotspot/share/runtime/java.cpp
index 46038b1049e..d6dda04e053 100644
--- a/src/hotspot/share/runtime/java.cpp
+++ b/src/hotspot/share/runtime/java.cpp
@@ -54,7 +54,7 @@
 #include "oops/instanceKlass.hpp"
 #include "oops/instanceOop.hpp"
 #include "oops/klassVtable.hpp"
-#include "oops/method.hpp"
+#include "oops/method.inline.hpp"
 #include "oops/objArrayOop.hpp"
 #include "oops/oop.inline.hpp"
 #include "oops/symbol.hpp"

From f1258f9e16b063c0fdbdd614ae2dc76c67607654 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Johan=20Sj=C3=B6len?= <jsjolen@openjdk.org>
Date: Mon, 17 Feb 2025 09:22:57 +0000
Subject: [PATCH 024/587] 8349755: Fix corner case issues in async UL

Reviewed-by: dholmes, aboldtch
---
 src/hotspot/share/logging/logAsyncWriter.cpp  | 82 +++++++++++++++++--
 src/hotspot/share/logging/logAsyncWriter.hpp  |  9 +-
 src/hotspot/share/logging/logFileOutput.cpp   |  9 +-
 .../share/logging/logFileStreamOutput.cpp     |  8 +-
 src/hotspot/share/logging/logTag.hpp          |  2 +
 src/hotspot/share/logging/logTagSet.cpp       |  9 +-
 .../jtreg/runtime/logging/AsyncDeathTest.java | 54 ++++++++++++
 7 files changed, 147 insertions(+), 26 deletions(-)
 create mode 100644 test/hotspot/jtreg/runtime/logging/AsyncDeathTest.java

diff --git a/src/hotspot/share/logging/logAsyncWriter.cpp b/src/hotspot/share/logging/logAsyncWriter.cpp
index 8360a4af91d..44758958dd3 100644
--- a/src/hotspot/share/logging/logAsyncWriter.cpp
+++ b/src/hotspot/share/logging/logAsyncWriter.cpp
@@ -31,18 +31,34 @@
 #include "runtime/atomic.hpp"
 #include "runtime/os.inline.hpp"
 
+DEBUG_ONLY(bool AsyncLogWriter::ignore_recursive_logging = false;)
+
 class AsyncLogWriter::AsyncLogLocker : public StackObj {
- public:
+  static Thread* _holder;
+public:
+  static Thread* current_holder() { return _holder; }
   AsyncLogLocker() {
     assert(_instance != nullptr, "AsyncLogWriter::_lock is unavailable");
     _instance->_lock.lock();
+    _holder = Thread::current_or_null();
   }
 
   ~AsyncLogLocker() {
+    assert(_holder == Thread::current_or_null(), "must be");
+    _holder = nullptr;
     _instance->_lock.unlock();
   }
+
+  void wait() {
+    Thread* saved_holder = _holder;
+    _holder = nullptr;
+    _instance->_lock.wait(0/* no timeout */);
+    _holder = saved_holder;
+  }
 };
 
+Thread* AsyncLogWriter::AsyncLogLocker::_holder = nullptr;
+
 // LogDecorator::None applies to 'constant initialization' because of its constexpr constructor.
 const LogDecorations& AsyncLogWriter::None = LogDecorations(LogLevel::Warning, LogTagSetMapping<LogTag::__NO_TAG>::tagset(),
                                       LogDecorators::None);
@@ -84,19 +100,67 @@ void AsyncLogWriter::enqueue_locked(LogFileStreamOutput* output, const LogDecora
   _lock.notify();
 }
 
-void AsyncLogWriter::enqueue(LogFileStreamOutput& output, const LogDecorations& decorations, const char* msg) {
+// This function checks for cases where continuing with asynchronous logging may lead to stability issues, such as a deadlock.
+// If this returns false then we give up on logging asynchronously and do so synchronously instead.
+bool AsyncLogWriter::is_enqueue_allowed() {
+  AsyncLogWriter* alw = AsyncLogWriter::instance();
+  Thread* holding_thread = AsyncLogWriter::AsyncLogLocker::current_holder();
+  Thread* this_thread = Thread::current_or_null();
+  if (this_thread == nullptr) {
+    // The current thread is unattached.
+    return false;
+  }
+
+  if (holding_thread == this_thread) {
+    // A thread, while enqueuing a message, has attempted to log something.
+    // Do not log while holding the Async log lock.
+    // Try to catch possible occurrences in debug builds.
+#ifdef ASSERT
+    if (!AsyncLogWriter::ignore_recursive_logging) {
+      ShouldNotReachHere();
+    }
+#endif // ASSERT
+    return false;
+  }
+
+  if (alw == nullptr) {
+    // There is no AsyncLogWriter instance yet.
+    return false;
+  }
+
+  if (this_thread == alw) {
+    // The async log producer is attempting to log, leading to recursive logging.
+    return false;
+  }
+
+  return true;
+}
+
+bool AsyncLogWriter::enqueue(LogFileStreamOutput& output, const LogDecorations& decorations, const char* msg) {
+  if (!is_enqueue_allowed()) {
+    return false;
+  }
+
   AsyncLogLocker locker;
-  enqueue_locked(&output, decorations, msg);
+  DEBUG_ONLY(log_debug(deathtest)("Induce a recursive log for testing (for crashing)");)
+  DEBUG_ONLY(log_debug(deathtest2)("Induce a recursive log for testing");)
+  AsyncLogWriter::instance()->enqueue_locked(&output, decorations, msg);
+  return true;
 }
 
 // LogMessageBuffer consists of a multiple-part/multiple-line message.
 // The lock here guarantees its integrity.
-void AsyncLogWriter::enqueue(LogFileStreamOutput& output, LogMessageBuffer::Iterator msg_iterator) {
-  AsyncLogLocker locker;
-
-  for (; !msg_iterator.is_at_end(); msg_iterator++) {
-    enqueue_locked(&output, msg_iterator.decorations(), msg_iterator.message());
+bool AsyncLogWriter::enqueue(LogFileStreamOutput& output, LogMessageBuffer::Iterator msg_iterator) {
+  if (!is_enqueue_allowed()) {
+    return false;
   }
+
+  // If we get here we know the AsyncLogWriter is initialized.
+  AsyncLogLocker locker;
+  for (; !msg_iterator.is_at_end(); msg_iterator++) {
+    AsyncLogWriter::instance()->enqueue_locked(&output, msg_iterator.decorations(), msg_iterator.message());
+  }
+  return true;
 }
 
 AsyncLogWriter::AsyncLogWriter()
@@ -155,7 +219,7 @@ void AsyncLogWriter::run() {
       AsyncLogLocker locker;
 
       while (!_data_available) {
-        _lock.wait(0/* no timeout */);
+        locker.wait();
       }
       // Only doing a swap and statistics under the lock to
       // guarantee that I/O jobs don't block logsites.
diff --git a/src/hotspot/share/logging/logAsyncWriter.hpp b/src/hotspot/share/logging/logAsyncWriter.hpp
index 4d18e612110..e2c8cb36e07 100644
--- a/src/hotspot/share/logging/logAsyncWriter.hpp
+++ b/src/hotspot/share/logging/logAsyncWriter.hpp
@@ -195,9 +195,12 @@ class AsyncLogWriter : public NonJavaThread {
     ~BufferUpdater();
   };
 
- public:
-  void enqueue(LogFileStreamOutput& output, const LogDecorations& decorations, const char* msg);
-  void enqueue(LogFileStreamOutput& output, LogMessageBuffer::Iterator msg_iterator);
+  static bool is_enqueue_allowed();
+
+public:
+  DEBUG_ONLY(static bool ignore_recursive_logging;)
+  static bool enqueue(LogFileStreamOutput& output, const LogDecorations& decorations, const char* msg);
+  static bool enqueue(LogFileStreamOutput& output, LogMessageBuffer::Iterator msg_iterator);
 
   static AsyncLogWriter* instance();
   static void initialize();
diff --git a/src/hotspot/share/logging/logFileOutput.cpp b/src/hotspot/share/logging/logFileOutput.cpp
index 568708a5961..9d6d19d739e 100644
--- a/src/hotspot/share/logging/logFileOutput.cpp
+++ b/src/hotspot/share/logging/logFileOutput.cpp
@@ -292,9 +292,7 @@ int LogFileOutput::write(const LogDecorations& decorations, const char* msg) {
     return 0;
   }
 
-  AsyncLogWriter* aio_writer = AsyncLogWriter::instance();
-  if (aio_writer != nullptr) {
-    aio_writer->enqueue(*this, decorations, msg);
+  if (AsyncLogWriter::enqueue(*this, decorations, msg)) {
     return 0;
   }
 
@@ -306,10 +304,7 @@ int LogFileOutput::write(LogMessageBuffer::Iterator msg_iterator) {
     // An error has occurred with this output, avoid writing to it.
     return 0;
   }
-
-  AsyncLogWriter* aio_writer = AsyncLogWriter::instance();
-  if (aio_writer != nullptr) {
-    aio_writer->enqueue(*this, msg_iterator);
+  if (AsyncLogWriter::enqueue(*this, msg_iterator)) {
     return 0;
   }
 
diff --git a/src/hotspot/share/logging/logFileStreamOutput.cpp b/src/hotspot/share/logging/logFileStreamOutput.cpp
index f8bbb28472c..2464bc806c2 100644
--- a/src/hotspot/share/logging/logFileStreamOutput.cpp
+++ b/src/hotspot/share/logging/logFileStreamOutput.cpp
@@ -173,9 +173,7 @@ int LogFileStreamOutput::write_blocking(const LogDecorations& decorations, const
 }
 
 int LogFileStreamOutput::write(const LogDecorations& decorations, const char* msg) {
-  AsyncLogWriter* aio_writer = AsyncLogWriter::instance();
-  if (aio_writer != nullptr) {
-    aio_writer->enqueue(*this, decorations, msg);
+  if (AsyncLogWriter::enqueue(*this, decorations, msg)) {
     return 0;
   }
 
@@ -186,9 +184,7 @@ int LogFileStreamOutput::write(const LogDecorations& decorations, const char* ms
 }
 
 int LogFileStreamOutput::write(LogMessageBuffer::Iterator msg_iterator) {
-  AsyncLogWriter* aio_writer = AsyncLogWriter::instance();
-  if (aio_writer != nullptr) {
-    aio_writer->enqueue(*this, msg_iterator);
+  if (AsyncLogWriter::enqueue(*this, msg_iterator)) {
     return 0;
   }
 
diff --git a/src/hotspot/share/logging/logTag.hpp b/src/hotspot/share/logging/logTag.hpp
index 15ac30d09ab..c3db84930ad 100644
--- a/src/hotspot/share/logging/logTag.hpp
+++ b/src/hotspot/share/logging/logTag.hpp
@@ -68,6 +68,8 @@ class outputStream;
   LOG_TAG(data) \
   LOG_TAG(datacreation) \
   LOG_TAG(dcmd) \
+  DEBUG_ONLY(LOG_TAG(deathtest)) /* Log Internal death test tag */ \
+  DEBUG_ONLY(LOG_TAG(deathtest2)) /* Log Internal death test tag */ \
   LOG_TAG(decoder) \
   LOG_TAG(defaultmethods) \
   LOG_TAG(deoptimization) \
diff --git a/src/hotspot/share/logging/logTagSet.cpp b/src/hotspot/share/logging/logTagSet.cpp
index 3cb04a033c6..718627be3a5 100644
--- a/src/hotspot/share/logging/logTagSet.cpp
+++ b/src/hotspot/share/logging/logTagSet.cpp
@@ -22,6 +22,7 @@
  *
  */
 #include "jvm.h"
+#include "logging/logAsyncWriter.hpp"
 #include "logging/logDecorations.hpp"
 #include "logging/logFileStreamOutput.hpp"
 #include "logging/logLevel.hpp"
@@ -77,7 +78,13 @@ void LogTagSet::log(LogLevelType level, const char* msg) {
   // the implied memory order of Atomic::add().
   LogOutputList::Iterator it = _output_list.iterator(level);
   LogDecorations decorations(level, *this, _decorators);
-
+#ifdef ASSERT
+  // If we log for tag deathtest2 then we're testing that recursive logging works.
+  // In this case, do not crash when detecting recursive logging.
+  if (this->contains(LogTagType::_deathtest2)) {
+    AsyncLogWriter::ignore_recursive_logging = true;
+  }
+#endif
   for (; it != _output_list.end(); it++) {
     (*it)->write(decorations, msg);
   }
diff --git a/test/hotspot/jtreg/runtime/logging/AsyncDeathTest.java b/test/hotspot/jtreg/runtime/logging/AsyncDeathTest.java
new file mode 100644
index 00000000000..2dff887f108
--- /dev/null
+++ b/test/hotspot/jtreg/runtime/logging/AsyncDeathTest.java
@@ -0,0 +1,54 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact 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 8349755
+ * @summary Perform recursive logging in async UL on purpose
+ * @requires vm.flagless
+ * @requires vm.debug
+ * @library /test/lib
+ * @modules java.base/jdk.internal.misc
+ *          java.management
+ * @run driver AsyncDeathTest
+ */
+
+import jdk.test.lib.process.ProcessTools;
+import jdk.test.lib.process.OutputAnalyzer;
+
+public class AsyncDeathTest {
+    public static void main(String[] args) throws Exception {
+        // For deathtest we expect the VM to reach ShouldNotReachHere() and die
+        ProcessBuilder pb =
+            ProcessTools.createLimitedTestJavaProcessBuilder("-Xlog:async", "-Xlog:os,deathtest=debug", "-XX:-CreateCoredumpOnCrash", "--version");
+        OutputAnalyzer output = new OutputAnalyzer(pb.start());
+        output.shouldNotHaveExitValue(0);
+        output.shouldNotContain("Induce a recursive log for testing");
+        // For deathtest2 we expect the VM to ignore that recursive logging has been detected and is handled by printing synchronously.
+        ProcessBuilder pb2 =
+            ProcessTools.createLimitedTestJavaProcessBuilder("-Xlog:async", "-Xlog:os,deathtest2=debug", "--version");
+        OutputAnalyzer output2 = new OutputAnalyzer(pb2.start());
+        output2.shouldHaveExitValue(0);
+        output2.shouldContain("Induce a recursive log for testing");
+    }
+}

From 071c8f515537d6030ae7055e309b4f4a6a495bc8 Mon Sep 17 00:00:00 2001
From: Jaikiran Pai <jpai@openjdk.org>
Date: Mon, 17 Feb 2025 11:05:59 +0000
Subject: [PATCH 025/587] 8349909:
 jdk.internal.jimage.decompressor.ZipDecompressor does not close the Inflater
 in exceptional cases

Reviewed-by: lancea, alanb
---
 .../jimage/decompressor/ZipDecompressor.java   | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/java.base/share/classes/jdk/internal/jimage/decompressor/ZipDecompressor.java b/src/java.base/share/classes/jdk/internal/jimage/decompressor/ZipDecompressor.java
index f8e9d46a777..b5cba5a17dc 100644
--- a/src/java.base/share/classes/jdk/internal/jimage/decompressor/ZipDecompressor.java
+++ b/src/java.base/share/classes/jdk/internal/jimage/decompressor/ZipDecompressor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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,15 +50,17 @@ final class ZipDecompressor implements ResourceDecompressor {
         }
         byte[] bytesOut = new byte[(int) originalSize];
 
-        Inflater inflater = new Inflater();
-        inflater.setInput(bytesIn, offset, bytesIn.length - offset);
-
         int count = 0;
-        while (!inflater.finished() && count < originalSize) {
-            count += inflater.inflate(bytesOut, count, bytesOut.length - count);
-        }
+        Inflater inflater = new Inflater();
+        try {
+            inflater.setInput(bytesIn, offset, bytesIn.length - offset);
 
-        inflater.end();
+            while (!inflater.finished() && count < originalSize) {
+                count += inflater.inflate(bytesOut, count, bytesOut.length - count);
+            }
+        } finally {
+            inflater.end();
+        }
 
         if (count != originalSize) {
             throw new IOException("Resource content size mismatch");

From b3a4026c65eb049eb4f3a3cbf52c9f0c9979a256 Mon Sep 17 00:00:00 2001
From: Gui Cao <gcao@openjdk.org>
Date: Mon, 17 Feb 2025 11:35:07 +0000
Subject: [PATCH 026/587] 8349764: RISC-V: C1: Improve Class.isInstance
 intrinsic

Reviewed-by: fyang, mli
---
 .../cpu/riscv/c1_LIRGenerator_riscv.cpp       |  2 +-
 src/hotspot/cpu/riscv/c1_Runtime1_riscv.cpp   | 46 +++++++++++++++++++
 2 files changed, 47 insertions(+), 1 deletion(-)

diff --git a/src/hotspot/cpu/riscv/c1_LIRGenerator_riscv.cpp b/src/hotspot/cpu/riscv/c1_LIRGenerator_riscv.cpp
index e31a1024f76..3868c5ea829 100644
--- a/src/hotspot/cpu/riscv/c1_LIRGenerator_riscv.cpp
+++ b/src/hotspot/cpu/riscv/c1_LIRGenerator_riscv.cpp
@@ -1104,7 +1104,7 @@ void LIRGenerator::do_InstanceOf(InstanceOf* x) {
 
 // Intrinsic for Class::isInstance
 address LIRGenerator::isInstance_entry() {
-  return CAST_FROM_FN_PTR(address, Runtime1::is_instance_of);
+  return Runtime1::entry_for(C1StubId::is_instance_of_id);
 }
 
 void LIRGenerator::do_If(If* x) {
diff --git a/src/hotspot/cpu/riscv/c1_Runtime1_riscv.cpp b/src/hotspot/cpu/riscv/c1_Runtime1_riscv.cpp
index c076f28be6c..0f1f1dd891c 100644
--- a/src/hotspot/cpu/riscv/c1_Runtime1_riscv.cpp
+++ b/src/hotspot/cpu/riscv/c1_Runtime1_riscv.cpp
@@ -925,6 +925,52 @@ OopMapSet* Runtime1::generate_code_for(C1StubId id, StubAssembler* sasm) {
       }
       break;
 
+    case C1StubId::is_instance_of_id:
+      {
+        // Mirror: x10
+        // Object: x11
+        // Temps: x13, x14, x15, x16, x17
+        // Result: x10
+
+        // Get the Klass* into x16
+        Register klass = x16, obj = x11, result = x10;
+        __ ld(klass, Address(x10, java_lang_Class::klass_offset()));
+
+        Label fail, is_secondary, success;
+
+        __ beqz(klass, fail); // Klass is null
+        __ beqz(obj, fail); // obj is null
+
+        __ lwu(x13, Address(klass, in_bytes(Klass::super_check_offset_offset())));
+        __ mv(x17, in_bytes(Klass::secondary_super_cache_offset()));
+        __ beq(x13, x17, is_secondary); // Klass is a secondary superclass
+
+        // Klass is a concrete class
+        __ load_klass(x15, obj);
+        __ add(x17, x15, x13);
+        __ ld(x17, Address(x17));
+        __ beq(klass, x17, success);
+        __ mv(result, 0);
+        __ ret();
+
+        __ bind(is_secondary);
+        __ load_klass(obj, obj);
+
+        // This is necessary because I am never in my own secondary_super list.
+        __ beq(obj, klass, success);
+
+        __ lookup_secondary_supers_table_var(obj, klass, result, x13, x14, x15, x17, &success);
+
+        __ bind(fail);
+        __ mv(result, 0);
+        __ ret();
+
+        __ bind(success);
+        __ mv(result, 1);
+        __ ret();
+      }
+      break;
+
     case C1StubId::monitorexit_nofpu_id:
       save_fpu_registers = false;
       // fall through

From 7f3ecb4d92fdb084ce632cab484cf4578487b090 Mon Sep 17 00:00:00 2001
From: Matthias Ernst <mernst-github@mernst.org>
Date: Mon, 17 Feb 2025 13:07:23 +0000
Subject: [PATCH 027/587] 8346664: C2: Optimize mask check with constant offset

Reviewed-by: epeter, qamai
---
 src/hotspot/share/opto/mulnode.cpp            | 206 ++++++------
 src/hotspot/share/opto/mulnode.hpp            |   4 +-
 .../compiler/c2/irTests/TestShiftAndMask.java | 300 +++++++++++++-----
 .../superword/TestEquivalentInvariants.java   |  80 ++++-
 .../vectorization/TestPopulateIndex.java      |  30 +-
 5 files changed, 431 insertions(+), 189 deletions(-)

diff --git a/src/hotspot/share/opto/mulnode.cpp b/src/hotspot/share/opto/mulnode.cpp
index 58439ce3773..b1a9219e113 100644
--- a/src/hotspot/share/opto/mulnode.cpp
+++ b/src/hotspot/share/opto/mulnode.cpp
@@ -692,9 +692,11 @@ const Type *AndINode::mul_ring( const Type *t0, const Type *t1 ) const {
   return and_value<TypeInt>(r0, r1);
 }
 
+static bool AndIL_is_zero_element_under_mask(const PhaseGVN* phase, const Node* expr, const Node* mask, BasicType bt);
+
 const Type* AndINode::Value(PhaseGVN* phase) const {
-  // patterns similar to (v << 2) & 3
-  if (AndIL_shift_and_mask_is_always_zero(phase, in(1), in(2), T_INT, true)) {
+  if (AndIL_is_zero_element_under_mask(phase, in(1), in(2), T_INT) ||
+      AndIL_is_zero_element_under_mask(phase, in(2), in(1), T_INT)) {
     return TypeInt::ZERO;
   }
 
@@ -740,8 +742,8 @@ Node* AndINode::Identity(PhaseGVN* phase) {
 
 //------------------------------Ideal------------------------------------------
 Node *AndINode::Ideal(PhaseGVN *phase, bool can_reshape) {
-  // pattern similar to (v1 + (v2 << 2)) & 3 transformed to v1 & 3
-  Node* progress = AndIL_add_shift_and_mask(phase, T_INT);
+  // Simplify (v1 + v2) & mask to v1 & mask or v2 & mask when possible.
+  Node* progress = AndIL_sum_and_mask(phase, T_INT);
   if (progress != nullptr) {
     return progress;
   }
@@ -824,8 +826,8 @@ const Type *AndLNode::mul_ring( const Type *t0, const Type *t1 ) const {
 }
 
 const Type* AndLNode::Value(PhaseGVN* phase) const {
-  // patterns similar to (v << 2) & 3
-  if (AndIL_shift_and_mask_is_always_zero(phase, in(1), in(2), T_LONG, true)) {
+  if (AndIL_is_zero_element_under_mask(phase, in(1), in(2), T_LONG) ||
+      AndIL_is_zero_element_under_mask(phase, in(2), in(1), T_LONG)) {
     return TypeLong::ZERO;
   }
 
@@ -872,8 +874,8 @@ Node* AndLNode::Identity(PhaseGVN* phase) {
 
 //------------------------------Ideal------------------------------------------
 Node *AndLNode::Ideal(PhaseGVN *phase, bool can_reshape) {
-  // pattern similar to (v1 + (v2 << 2)) & 3 transformed to v1 & 3
-  Node* progress = AndIL_add_shift_and_mask(phase, T_LONG);
+  // Simplify (v1 + v2) & mask to v1 & mask or v2 & mask when possible.
+  Node* progress = AndIL_sum_and_mask(phase, T_LONG);
   if (progress != nullptr) {
     return progress;
   }
@@ -2096,99 +2098,109 @@ const Type* RotateRightNode::Value(PhaseGVN* phase) const {
   }
 }
 
-// Given an expression (AndX shift mask) or (AndX mask shift),
-// determine if the AndX must always produce zero, because the
-// the shift (x<<N) is bitwise disjoint from the mask #M.
-// The X in AndX must be I or L, depending on bt.
-// Specifically, the following cases fold to zero,
-// when the shift value N is large enough to zero out
-// all the set positions of the and-mask M.
-//   (AndI (LShiftI _ #N) #M) => #0
-//   (AndL (LShiftL _ #N) #M) => #0
-//   (AndL (ConvI2L (LShiftI _ #N)) #M) => #0
-// The M and N values must satisfy ((-1 << N) & M) == 0.
-// Because the optimization might work for a non-constant
-// mask M, we check the AndX for both operand orders.
-bool MulNode::AndIL_shift_and_mask_is_always_zero(PhaseGVN* phase, Node* shift, Node* mask, BasicType bt, bool check_reverse) {
-  if (mask == nullptr || shift == nullptr) {
-    return false;
+//------------------------------ Sum & Mask ------------------------------
+
+// Returns a lower bound on the number of trailing zeros in expr.
+static jint AndIL_min_trailing_zeros(const PhaseGVN* phase, const Node* expr, BasicType bt) {
+  expr = expr->uncast();
+  const TypeInteger* type = phase->type(expr)->isa_integer(bt);
+  if (type == nullptr) {
+    return 0;
   }
-  const TypeInteger* mask_t = phase->type(mask)->isa_integer(bt);
-  if (mask_t == nullptr || phase->type(shift)->isa_integer(bt) == nullptr) {
-    return false;
+
+  if (type->is_con()) {
+    jlong con = type->get_con_as_long(bt);
+    return con == 0L ? (type2aelembytes(bt) * BitsPerByte) : count_trailing_zeros(con);
   }
-  shift = shift->uncast();
-  if (shift == nullptr) {
-    return false;
-  }
-  if (phase->type(shift)->isa_integer(bt) == nullptr) {
-    return false;
-  }
-  BasicType shift_bt = bt;
-  if (bt == T_LONG && shift->Opcode() == Op_ConvI2L) {
+
+  if (expr->Opcode() == Op_ConvI2L) {
+    expr = expr->in(1)->uncast();
     bt = T_INT;
-    Node* val = shift->in(1);
-    if (val == nullptr) {
-      return false;
-    }
-    val = val->uncast();
-    if (val == nullptr) {
-      return false;
-    }
-    if (val->Opcode() == Op_LShiftI) {
-      shift_bt = T_INT;
-      shift = val;
-      if (phase->type(shift)->isa_integer(bt) == nullptr) {
-        return false;
-      }
-    }
-  }
-  if (shift->Opcode() != Op_LShift(shift_bt)) {
-    if (check_reverse &&
-        (mask->Opcode() == Op_LShift(bt) ||
-         (bt == T_LONG && mask->Opcode() == Op_ConvI2L))) {
-      // try it the other way around
-      return AndIL_shift_and_mask_is_always_zero(phase, mask, shift, bt, false);
-    }
-    return false;
-  }
-  Node* shift2 = shift->in(2);
-  if (shift2 == nullptr) {
-    return false;
-  }
-  const Type* shift2_t = phase->type(shift2);
-  if (!shift2_t->isa_int() || !shift2_t->is_int()->is_con()) {
-    return false;
+    type = phase->type(expr)->isa_int();
   }
 
-  jint shift_con = shift2_t->is_int()->get_con() & ((shift_bt == T_INT ? BitsPerJavaInteger : BitsPerJavaLong) - 1);
-  if ((((jlong)1) << shift_con) > mask_t->hi_as_long() && mask_t->lo_as_long() >= 0) {
-    return true;
+  // Pattern: expr = (x << shift)
+  if (expr->Opcode() == Op_LShift(bt)) {
+    const TypeInt* shift_t = phase->type(expr->in(2))->isa_int();
+    if (shift_t == nullptr || !shift_t->is_con()) {
+      return 0;
+    }
+    // We need to truncate the shift, as it may not have been canonicalized yet.
+    // T_INT:  0..31 -> shift_mask = 4 * 8 - 1 = 31
+    // T_LONG: 0..63 -> shift_mask = 8 * 8 - 1 = 63
+    // (JLS: "Shift Operators")
+    jint shift_mask = type2aelembytes(bt) * BitsPerByte - 1;
+    return shift_t->get_con() & shift_mask;
   }
 
-  return false;
+  return 0;
 }
 
-// Given an expression (AndX (AddX v1 (LShiftX v2 #N)) #M)
-// determine if the AndX must always produce (AndX v1 #M),
-// because the shift (v2<<N) is bitwise disjoint from the mask #M.
-// The X in AndX will be I or L, depending on bt.
-// Specifically, the following cases fold,
-// when the shift value N is large enough to zero out
-// all the set positions of the and-mask M.
-//   (AndI (AddI v1 (LShiftI _ #N)) #M) => (AndI v1 #M)
-//   (AndL (AddI v1 (LShiftL _ #N)) #M) => (AndL v1 #M)
-//   (AndL (AddL v1 (ConvI2L (LShiftI _ #N))) #M) => (AndL v1 #M)
-// The M and N values must satisfy ((-1 << N) & M) == 0.
-// Because the optimization might work for a non-constant
-// mask M, and because the AddX operands can come in either
-// order, we check for every operand order.
-Node* MulNode::AndIL_add_shift_and_mask(PhaseGVN* phase, BasicType bt) {
+// Checks whether expr is neutral additive element (zero) under mask,
+// i.e. whether an expression of the form:
+//   (AndX (AddX (expr addend) mask)
+//   (expr + addend) & mask
+// is equivalent to
+//   (AndX addend mask)
+//   addend & mask
+// for any addend.
+// (The X in AndX must be I or L, depending on bt).
+//
+// We check for the sufficient condition when the lowest set bit in expr is higher than
+// the highest set bit in mask, i.e.:
+// expr: eeeeee0000000000000
+// mask: 000000mmmmmmmmmmmmm
+//             <--w bits--->
+// We do not test for other cases.
+//
+// Correctness:
+//   Given "expr" with at least "w" trailing zeros,
+//   let "mod = 2^w", "suffix_mask = mod - 1"
+//
+//   Since "mask" only has bits set where "suffix_mask" does, we have:
+//     mask = suffix_mask & mask     (SUFFIX_MASK)
+//
+//   And since expr only has bits set above w, and suffix_mask only below:
+//     expr & suffix_mask == 0     (NO_BIT_OVERLAP)
+//
+//   From unsigned modular arithmetic (with unsigned modulo %), and since mod is
+//   a power of 2, and we are computing in a ring of powers of 2, we know that
+//     (x + y) % mod         = (x % mod         + y) % mod
+//     (x + y) & suffix_mask = (x & suffix_mask + y) & suffix_mask       (MOD_ARITH)
+//
+//   We can now prove the equality:
+//     (expr               + addend)               & mask
+//   = (expr               + addend) & suffix_mask & mask    (SUFFIX_MASK)
+//   = (expr & suffix_mask + addend) & suffix_mask & mask    (MOD_ARITH)
+//   = (0                  + addend) & suffix_mask & mask    (NO_BIT_OVERLAP)
+//   =                       addend                & mask    (SUFFIX_MASK)
+//
+// Hence, an expr with at least w trailing zeros is a neutral additive element under any mask with bit width w.
+static bool AndIL_is_zero_element_under_mask(const PhaseGVN* phase, const Node* expr, const Node* mask, BasicType bt) {
+  // When the mask is negative, it has the most significant bit set.
+  const TypeInteger* mask_t = phase->type(mask)->isa_integer(bt);
+  if (mask_t == nullptr || mask_t->lo_as_long() < 0) {
+    return false;
+  }
+
+  // When the mask is constant zero, we defer to MulNode::Value to eliminate the entire AndX operation.
+  if (mask_t->hi_as_long() == 0) {
+    assert(mask_t->lo_as_long() == 0, "checked earlier");
+    return false;
+  }
+
+  jint mask_bit_width = BitsPerLong - count_leading_zeros(mask_t->hi_as_long());
+  jint expr_trailing_zeros = AndIL_min_trailing_zeros(phase, expr, bt);
+  return expr_trailing_zeros >= mask_bit_width;
+}
+
+// Reduces the pattern:
+//   (AndX (AddX add1 add2) mask)
+// to
+//   (AndX add1 mask), if add2 is neutral wrt mask (see above), and vice versa.
+Node* MulNode::AndIL_sum_and_mask(PhaseGVN* phase, BasicType bt) {
   Node* add = in(1);
   Node* mask = in(2);
-  if (add == nullptr || mask == nullptr) {
-    return nullptr;
-  }
   int addidx = 0;
   if (add->Opcode() == Op_Add(bt)) {
     addidx = 1;
@@ -2200,14 +2212,12 @@ Node* MulNode::AndIL_add_shift_and_mask(PhaseGVN* phase, BasicType bt) {
   if (addidx > 0) {
     Node* add1 = add->in(1);
     Node* add2 = add->in(2);
-    if (add1 != nullptr && add2 != nullptr) {
-      if (AndIL_shift_and_mask_is_always_zero(phase, add1, mask, bt, false)) {
-        set_req_X(addidx, add2, phase);
-        return this;
-      } else if (AndIL_shift_and_mask_is_always_zero(phase, add2, mask, bt, false)) {
-        set_req_X(addidx, add1, phase);
-        return this;
-      }
+    if (AndIL_is_zero_element_under_mask(phase, add1, mask, bt)) {
+      set_req_X(addidx, add2, phase);
+      return this;
+    } else if (AndIL_is_zero_element_under_mask(phase, add2, mask, bt)) {
+      set_req_X(addidx, add1, phase);
+      return this;
     }
   }
   return nullptr;
diff --git a/src/hotspot/share/opto/mulnode.hpp b/src/hotspot/share/opto/mulnode.hpp
index bb572b9d9a2..65a2cd112ec 100644
--- a/src/hotspot/share/opto/mulnode.hpp
+++ b/src/hotspot/share/opto/mulnode.hpp
@@ -83,8 +83,8 @@ public:
 
   static MulNode* make(Node* in1, Node* in2, BasicType bt);
 
-  static bool AndIL_shift_and_mask_is_always_zero(PhaseGVN* phase, Node* shift, Node* mask, BasicType bt, bool check_reverse);
-  Node* AndIL_add_shift_and_mask(PhaseGVN* phase, BasicType bt);
+protected:
+  Node* AndIL_sum_and_mask(PhaseGVN* phase, BasicType bt);
 };
 
 //------------------------------MulINode---------------------------------------
diff --git a/test/hotspot/jtreg/compiler/c2/irTests/TestShiftAndMask.java b/test/hotspot/jtreg/compiler/c2/irTests/TestShiftAndMask.java
index 4396873425a..2cdc6414685 100644
--- a/test/hotspot/jtreg/compiler/c2/irTests/TestShiftAndMask.java
+++ b/test/hotspot/jtreg/compiler/c2/irTests/TestShiftAndMask.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, Red Hat, Inc. All rights reserved.
+ * Copyright (c) 2021, 2025, 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
@@ -30,7 +30,7 @@ import java.util.Objects;
 
 /*
  * @test
- * @bug 8277850 8278949 8285793
+ * @bug 8277850 8278949 8285793 8346664
  * @summary C2: optimize mask checks in counted loops
  * @library /test/lib /
  * @run driver compiler.c2.irTests.TestShiftAndMask
@@ -43,11 +43,48 @@ public class TestShiftAndMask {
         TestFramework.run();
     }
 
+    // any X << INT_MASK_WIDTH is zero under any INT_MASK
+    static final int INT_MASK_WIDTH = 1 + RANDOM.nextInt(30);
+    static final int INT_MAX_MASK = (1 << INT_MASK_WIDTH) - 1;
+    static final int INT_MASK = 1 + RANDOM.nextInt(INT_MAX_MASK);
+    static final int INT_MASK2 = 1 + RANDOM.nextInt(INT_MAX_MASK);
+    static final int INT_ZERO_CONST = RANDOM.nextInt() << INT_MASK_WIDTH;
+
+    static final int INT_RANDOM_CONST = RANDOM.nextInt();
+    static final int INT_RANDOM_SHIFT = RANDOM.nextInt();
+    static final int INT_RANDOM_MASK = RANDOM.nextInt();
+
+    // any X << LONG_MASK_WIDTH is zero under any LONG_MASK
+    static final int LONG_MASK_WIDTH = 1 + RANDOM.nextInt(62);
+    static final long LONG_MAX_MASK = (1L << LONG_MASK_WIDTH) - 1;
+    static final long LONG_MASK = 1 + RANDOM.nextLong(LONG_MAX_MASK);
+    static final long LONG_MASK2 = 1 + RANDOM.nextLong(LONG_MAX_MASK);
+    static final long LONG_ZERO_CONST = RANDOM.nextLong() << LONG_MASK_WIDTH;
+
+    static final long LONG_RANDOM_CONST = RANDOM.nextLong();
+    static final long LONG_RANDOM_SHIFT = RANDOM.nextLong();
+    static final long LONG_RANDOM_MASK = RANDOM.nextLong();
+
+    @Test
+    public static int intSumAndMask(int i, int j) {
+        return (j + i << INT_RANDOM_SHIFT + INT_RANDOM_CONST) & INT_RANDOM_MASK;
+    }
+
+    @Run(test = { "intSumAndMask" })
+    public static void checkIntSumAndMask() {
+        int j = RANDOM.nextInt();
+        int i = RANDOM.nextInt();
+        int res = intSumAndMask(i, j);
+        if (res != ((j + i << INT_RANDOM_SHIFT + INT_RANDOM_CONST) & INT_RANDOM_MASK)) {
+            throw new RuntimeException("incorrect result: " + res);
+        }
+    }
+
     @Test
     @Arguments(values = Argument.RANDOM_EACH)
     @IR(failOn = { IRNode.AND_I, IRNode.LSHIFT_I })
     public static int shiftMaskInt(int i) {
-        return (i << 2) & 3; // transformed to: return 0;
+        return (i << INT_MASK_WIDTH) & INT_MASK; // transformed to: return 0;
     }
 
     @Check(test = "shiftMaskInt")
@@ -57,11 +94,26 @@ public class TestShiftAndMask {
         }
     }
 
+    @Test
+    public static long longSumAndMask(long i, long j) {
+        return (j + i << LONG_RANDOM_SHIFT + LONG_RANDOM_CONST) & LONG_RANDOM_MASK;
+    }
+
+    @Run(test = { "longSumAndMask" })
+    public static void checkLongSumAndMask() {
+        long j = RANDOM.nextLong();
+        long i = RANDOM.nextLong();
+        long res = longSumAndMask(i, j);
+        if (res != ((j + i << LONG_RANDOM_SHIFT + LONG_RANDOM_CONST) & LONG_RANDOM_MASK)) {
+            throw new RuntimeException("incorrect result: " + res);
+        }
+    }
+
     @Test
     @Arguments(values = Argument.RANDOM_EACH)
     @IR(failOn = { IRNode.AND_L, IRNode.LSHIFT_L })
     public static long shiftMaskLong(long i) {
-        return (i << 2) & 3; // transformed to: return 0;
+        return (i << LONG_MASK_WIDTH) & LONG_MASK; // transformed to: return 0;
     }
 
 
@@ -81,11 +133,11 @@ public class TestShiftAndMask {
         int mask;
         if (flag) {
             barrier = 42;
-            mask = 3;
+            mask = INT_MASK;
         } else {
-            mask = 1;
+            mask = INT_MASK2;
         }
-        return mask & (i << 2); // transformed to: return 0;
+        return mask & (i << INT_MASK_WIDTH); // transformed to: return 0;
     }
 
     @Check(test = "shiftNonConstMaskInt")
@@ -102,11 +154,11 @@ public class TestShiftAndMask {
         long mask;
         if (flag) {
             barrier = 42;
-            mask = 3;
+            mask = LONG_MASK;
         } else {
-            mask = 1;
+            mask = LONG_MASK2;
         }
-        return mask & (i << 2); // transformed to: return 0;
+        return mask & (i << LONG_MASK_WIDTH); // transformed to: return 0;
     }
 
     @Check(test = "shiftNonConstMaskLong")
@@ -120,7 +172,7 @@ public class TestShiftAndMask {
     @IR(counts = { IRNode.AND_I, "1" })
     @IR(failOn = { IRNode.ADD_I, IRNode.LSHIFT_I })
     public static int addShiftMaskInt(int i, int j) {
-        return (j + (i << 2)) & 3; // transformed to: return j & 3;
+        return (j + (i << INT_MASK_WIDTH)) & INT_MASK; // transformed to: return j & INT_MASK;
     }
 
     @Run(test = "addShiftMaskInt")
@@ -128,11 +180,42 @@ public class TestShiftAndMask {
         int i = RANDOM.nextInt();
         int j = RANDOM.nextInt();
         int res = addShiftMaskInt(i, j);
-        if (res != (j & 3)) {
+        if (res != (j & INT_MASK)) {
             throw new RuntimeException("incorrect result: " + res);
         }
     }
 
+    @Test
+    @IR(counts = { IRNode.AND_I, "1" })
+    @IR(failOn = { IRNode.ADD_I, IRNode.LSHIFT_I })
+    public static int addShiftPlusConstMaskInt(int i, int j) {
+        return (j + ((i + INT_RANDOM_CONST) << INT_MASK_WIDTH)) & INT_MASK; // transformed to: return j & INT_MASK;
+    }
+
+    @Run(test = "addShiftPlusConstMaskInt")
+    public static void addShiftPlusConstMaskInt_runner() {
+        int i = RANDOM.nextInt();
+        int j = RANDOM.nextInt();
+        int res = addShiftPlusConstMaskInt(i, j);
+        if (res != (j & INT_MASK)) {
+            throw new RuntimeException("incorrect result: " + res);
+        }
+    }
+
+    @Test
+    @Arguments(values = {Argument.RANDOM_EACH, Argument.RANDOM_EACH})
+    @IR(counts = { IRNode.ADD_I, "2", IRNode.LSHIFT_I, "1" })
+    public static int addShiftPlusConstDisjointMaskInt(int i, int j) {
+        return (j + ((i + 5) << 2)) & 32; // NOT transformed even though (5<<2) & 32 == 0
+    }
+
+    @Test
+    @Arguments(values = {Argument.RANDOM_EACH, Argument.RANDOM_EACH})
+    @IR(counts = { IRNode.ADD_I, "1", IRNode.LSHIFT_I, "1" })
+    public static int addShiftPlusConstOverlyLargeShift(int i, int j) {
+        return (j + i << 129) & 32; // NOT transformed, only lower 5 bits of shift count.
+    }
+
     @Test
     @IR(counts = { IRNode.AND_I, "1" })
     @IR(failOn = { IRNode.ADD_I, IRNode.LSHIFT_I })
@@ -140,11 +223,11 @@ public class TestShiftAndMask {
         int mask;
         if (flag) {
             barrier = 42;
-            mask = 3;
+            mask = INT_MASK;
         } else {
-            mask = 1;
+            mask = INT_MASK2;
         }
-        return mask & (j + (i << 2)); // transformed to: return j & mask;
+        return mask & (j + (i << INT_MASK_WIDTH)); // transformed to: return j & mask;
     }
 
     @Run(test = "addSshiftNonConstMaskInt")
@@ -152,11 +235,38 @@ public class TestShiftAndMask {
         int i = RANDOM.nextInt();
         int j = RANDOM.nextInt();
         int res = addSshiftNonConstMaskInt(i, j, true);
-        if (res != (j & 3)) {
+        if (res != (j & INT_MASK)) {
             throw new RuntimeException("incorrect result: " + res);
         }
         res = addSshiftNonConstMaskInt(i, j, false);
-        if (res != (j & 1)) {
+        if (res != (j & INT_MASK2)) {
+            throw new RuntimeException("incorrect result: " + res);
+        }
+    }
+
+    @Test
+    @IR(counts = { IRNode.AND_I, "1" })
+    @IR(failOn = { IRNode.ADD_I })
+    public static int addConstNonConstMaskInt(int j, boolean flag) {
+        int mask;
+        if (flag) {
+            barrier = 42;
+            mask = INT_MASK;
+        } else {
+            mask = INT_MASK2;
+        }
+        return mask & (j + INT_ZERO_CONST); // transformed to: return j & mask;
+    }
+
+    @Run(test = "addConstNonConstMaskInt")
+    public static void addConstNonConstMaskInt_runner() {
+        int j = RANDOM.nextInt();
+        int res = addConstNonConstMaskInt(j, true);
+        if (res != (j & INT_MASK)) {
+            throw new RuntimeException("incorrect result: " + res);
+        }
+        res = addConstNonConstMaskInt(j, false);
+        if (res != (j & INT_MASK2)) {
             throw new RuntimeException("incorrect result: " + res);
         }
     }
@@ -165,7 +275,7 @@ public class TestShiftAndMask {
     @IR(counts = { IRNode.AND_L, "1" })
     @IR(failOn = { IRNode.ADD_L, IRNode.LSHIFT_L })
     public static long addShiftMaskLong(long i, long j) {
-        return (j + (i << 2)) & 3; // transformed to: return j & 3;
+        return (j + (i << LONG_MASK_WIDTH)) & LONG_MASK; // transformed to: return j & INT_MASK;
     }
 
     @Run(test = "addShiftMaskLong")
@@ -173,7 +283,24 @@ public class TestShiftAndMask {
         long i = RANDOM.nextLong();
         long j = RANDOM.nextLong();
         long res = addShiftMaskLong(i, j);
-        if (res != (j & 3)) {
+        if (res != (j & LONG_MASK)) {
+            throw new RuntimeException("incorrect result: " + res);
+        }
+    }
+
+    @Test
+    @IR(counts = { IRNode.AND_L, "1" })
+    @IR(failOn = { IRNode.ADD_L, IRNode.LSHIFT_L })
+    public static long addShiftPlusConstMaskLong(long i, long j) {
+        return (j + ((i + LONG_RANDOM_CONST) << LONG_MASK_WIDTH)) & LONG_MASK; // transformed to: return j & LONG_MASK;
+    }
+
+    @Run(test = "addShiftPlusConstMaskLong")
+    public static void addShiftPlusConstMaskLong_runner() {
+        long i = RANDOM.nextLong();
+        long j = RANDOM.nextLong();
+        long res = addShiftPlusConstMaskLong(i, j);
+        if (res != (j & LONG_MASK)) {
             throw new RuntimeException("incorrect result: " + res);
         }
     }
@@ -182,14 +309,14 @@ public class TestShiftAndMask {
     @IR(counts = { IRNode.AND_L, "1" })
     @IR(failOn = { IRNode.ADD_L, IRNode.LSHIFT_L })
     public static long addSshiftNonConstMaskLong(long i, long j, boolean flag) {
-        int mask;
+        long mask;
         if (flag) {
             barrier = 42;
-            mask = 3;
+            mask = LONG_MASK;
         } else {
-            mask = 1;
+            mask = LONG_MASK2;
         }
-        return mask & (j + (i << 2)); // transformed to: return j & mask;
+        return mask & (j + (i << LONG_MASK_WIDTH)); // transformed to: return j & mask
     }
 
     @Run(test = "addSshiftNonConstMaskLong")
@@ -197,11 +324,38 @@ public class TestShiftAndMask {
         long i = RANDOM.nextLong();
         long j = RANDOM.nextLong();
         long res = addSshiftNonConstMaskLong(i, j, true);
-        if (res != (j & 3)) {
+        if (res != (j & LONG_MASK)) {
             throw new RuntimeException("incorrect result: " + res);
         }
         res = addSshiftNonConstMaskLong(i, j, false);
-        if (res != (j & 1)) {
+        if (res != (j & LONG_MASK2)) {
+            throw new RuntimeException("incorrect result: " + res);
+        }
+    }
+
+    @Test
+    @IR(counts = { IRNode.AND_L, "1" })
+    @IR(failOn = { IRNode.ADD_L })
+    public static long addConstNonConstMaskLong(long j, boolean flag) {
+        long mask;
+        if (flag) {
+            barrier = 42;
+            mask = LONG_MASK;
+        } else {
+            mask = LONG_MASK2;
+        }
+        return mask & (j + LONG_ZERO_CONST); // transformed to: return j & mask;
+    }
+
+    @Run(test = "addConstNonConstMaskLong")
+    public static void addConstNonConstMaskLong_runner() {
+        long j = RANDOM.nextLong();
+        long res = addConstNonConstMaskLong(j, true);
+        if (res != (j & LONG_MASK)) {
+            throw new RuntimeException("incorrect result: " + res);
+        }
+        res = addConstNonConstMaskLong(j, false);
+        if (res != (j & LONG_MASK2)) {
             throw new RuntimeException("incorrect result: " + res);
         }
     }
@@ -210,7 +364,7 @@ public class TestShiftAndMask {
     @Arguments(values = {Argument.RANDOM_EACH, Argument.RANDOM_EACH})
     @IR(failOn = { IRNode.AND_I, IRNode.ADD_I, IRNode.LSHIFT_I })
     public static int addShiftMaskInt2(int i, int j) {
-        return ((j << 2) + (i << 2)) & 3; // transformed to: return 0;
+        return ((j << INT_MASK_WIDTH) + (i << INT_MASK_WIDTH)) & INT_MASK; // transformed to: return 0;
     }
 
     @Check(test = "addShiftMaskInt2")
@@ -224,7 +378,7 @@ public class TestShiftAndMask {
     @Arguments(values = {Argument.RANDOM_EACH, Argument.RANDOM_EACH})
     @IR(failOn = { IRNode.AND_L, IRNode.ADD_L, IRNode.LSHIFT_L })
     public static long addShiftMaskLong2(long i, long j) {
-        return ((j << 2) + (i << 2)) & 3; // transformed to: return 0;
+        return ((j << INT_MASK_WIDTH) + (i << INT_MASK_WIDTH)) & INT_MASK; // transformed to: return 0;
     }
 
     @Check(test = "addShiftMaskLong2")
@@ -239,9 +393,9 @@ public class TestShiftAndMask {
     @IR(counts = { IRNode.AND_I, "1" })
     @IR(failOn = { IRNode.ADD_I, IRNode.LSHIFT_I })
     public static int addShiftMaskInt3(int i, long j) {
-        int add1 = (i << 2);
+        int add1 = (i << INT_MASK_WIDTH);
         int add2 = (int)j;
-        return (add1 + add2) & 3; // transformed to: return j & 3;
+        return (add1 + add2) & INT_MASK; // transformed to: return j & INT_MASK;
     }
 
     @Run(test = "addShiftMaskInt3")
@@ -249,7 +403,7 @@ public class TestShiftAndMask {
         int i = RANDOM.nextInt();
         int j = RANDOM.nextInt();
         int res = addShiftMaskInt3(i, j);
-        if (res != (j & 3)) {
+        if (res != (j & INT_MASK)) {
             throw new RuntimeException("incorrect result: " + res);
         }
     }
@@ -258,9 +412,9 @@ public class TestShiftAndMask {
     @IR(counts = { IRNode.AND_L, "1" })
     @IR(failOn = { IRNode.ADD_L, IRNode.LSHIFT_L })
     public static long addShiftMaskLong3(long i, float j) {
-        long add1 = (i << 2);
+        long add1 = (i << LONG_MASK_WIDTH);
         long add2 = (long)j;
-        return (add1 + add2) & 3; // transformed to: return j & 3;
+        return (add1 + add2) & LONG_MASK; // transformed to: return j & LONG_MASK;
     }
 
     @Run(test = "addShiftMaskLong3")
@@ -268,7 +422,7 @@ public class TestShiftAndMask {
         long i = RANDOM.nextLong();
         float j = RANDOM.nextFloat();
         long res = addShiftMaskLong3(i, j);
-        if (res != (((long)j) & 3)) {
+        if (res != (((long) j) & LONG_MASK)) {
             throw new RuntimeException("incorrect result: " + res);
         }
     }
@@ -277,7 +431,7 @@ public class TestShiftAndMask {
     @Arguments(values = {Argument.RANDOM_EACH})
     @IR(failOn = { IRNode.AND_L, IRNode.LSHIFT_I, IRNode.CONV_I2L })
     public static long shiftConvMask(int i) {
-        return ((long)(i << 2)) & 3; // transformed to: return 0;
+        return ((long) (i << INT_MASK_WIDTH)) & INT_MASK; // transformed to: return 0;
     }
 
     @Check(test = "shiftConvMask")
@@ -294,11 +448,11 @@ public class TestShiftAndMask {
         long mask;
         if (flag) {
             barrier = 42;
-            mask = 3;
+            mask = INT_MASK;
         } else {
-            mask = 1;
+            mask = INT_MASK2;
         }
-        return mask & ((long)(i << 2)); // transformed to: return 0;
+        return mask & ((long) (i << INT_MASK_WIDTH)); // transformed to: return 0;
     }
 
     @Check(test = "shiftNotConstConvMask")
@@ -312,7 +466,7 @@ public class TestShiftAndMask {
     @IR(counts = { IRNode.AND_L, "1" })
     @IR(failOn = { IRNode.ADD_L, IRNode.LSHIFT_I, IRNode.CONV_I2L })
     public static long addShiftConvMask(int i, long j) {
-        return (j + (i << 2)) & 3; // transformed to: return j & 3;
+        return (j + (i << INT_MASK_WIDTH)) & INT_MASK; // transformed to: return j & INT_MASK;
     }
 
     @Run(test = "addShiftConvMask")
@@ -320,7 +474,7 @@ public class TestShiftAndMask {
         int i = RANDOM.nextInt();
         long j = RANDOM.nextLong();
         long res = addShiftConvMask(i, j);
-        if (res != (j & 3)) {
+        if (res != (j & INT_MASK)) {
             throw new RuntimeException("incorrect result: " + res);
         }
     }
@@ -329,7 +483,7 @@ public class TestShiftAndMask {
     @Arguments(values = {Argument.RANDOM_EACH, Argument.RANDOM_EACH})
     @IR(failOn = { IRNode.AND_L, IRNode.ADD_L, IRNode.LSHIFT_I, IRNode.CONV_I2L })
     public static long addShiftConvMask2(int i, int j) {
-        return (((long)(j << 2)) + ((long)(i << 2))) & 3; // transformed to: return 0;
+        return (((long) (j << INT_MASK_WIDTH)) + ((long) (i << INT_MASK_WIDTH))) & INT_MASK; // transformed to: return 0;
     }
 
     @Check(test = "addShiftConvMask2")
@@ -342,13 +496,13 @@ public class TestShiftAndMask {
     @Test
     @IR(failOn = { IRNode.AND_I })
     public static int shiftMaskIntCheckIndex(int i, int length) {
-        return Objects.checkIndex(i << 2, length) & 3; // transformed to: return 0;
+        return Objects.checkIndex(i << INT_MASK_WIDTH, length) & INT_MASK; // transformed to: return 0;
     }
 
     @Run(test = "shiftMaskIntCheckIndex")
     public static void shiftMaskIntCheckIndex_runner() {
-        int i = RANDOM.nextInt((Integer.MAX_VALUE - 1) >> 2);
-        int res = shiftMaskIntCheckIndex(i, (i << 2) + 1);
+        int i = RANDOM.nextInt((Integer.MAX_VALUE - 1) >> INT_MASK_WIDTH);
+        int res = shiftMaskIntCheckIndex(i, (i << INT_MASK_WIDTH) + 1);
         if (res != 0) {
             throw new RuntimeException("incorrect result: " + res);
         }
@@ -357,13 +511,13 @@ public class TestShiftAndMask {
     @Test
     @IR(failOn = { IRNode.AND_L })
     public static long shiftMaskLongCheckIndex(long i, long length) {
-        return Objects.checkIndex(i << 2, length) & 3; // transformed to: return 0;
+        return Objects.checkIndex(i << LONG_MASK_WIDTH, length) & LONG_MASK; // transformed to: return 0;
     }
 
     @Run(test = "shiftMaskLongCheckIndex")
     public static void shiftMaskLongCheckIndex_runner() {
-        long i = RANDOM.nextInt((Integer.MAX_VALUE - 1) >> 2);
-        long res = shiftMaskLongCheckIndex(i, (i << 2) + 1);
+        long i = RANDOM.nextLong((Long.MAX_VALUE - 1) >> LONG_MASK_WIDTH);
+        long res = shiftMaskLongCheckIndex(i, (i << LONG_MASK_WIDTH) + 1);
         if (res != 0) {
             throw new RuntimeException("incorrect result: " + res);
         }
@@ -373,15 +527,15 @@ public class TestShiftAndMask {
     @IR(counts = { IRNode.AND_I, "1" })
     @IR(failOn = { IRNode.ADD_I })
     public static int addShiftMaskIntCheckIndex(int i, int j, int length) {
-        return (j + Objects.checkIndex(i << 2, length)) & 3; // transformed to: return j & 3;
+        return (j + Objects.checkIndex(i << INT_MASK_WIDTH, length)) & INT_MASK; // transformed to: return j & INT_MASK;
     }
 
     @Run(test = "addShiftMaskIntCheckIndex")
     public static void addShiftMaskIntCheckIndex_runner() {
-        int i = RANDOM.nextInt((Integer.MAX_VALUE - 1) >> 2);
+        int i = RANDOM.nextInt((Integer.MAX_VALUE - 1) >> INT_MASK_WIDTH);
         int j = RANDOM.nextInt();
-        int res = addShiftMaskIntCheckIndex(i, j, (i << 2) + 1);
-        if (res != (j & 3)) {
+        int res = addShiftMaskIntCheckIndex(i, j, (i << INT_MASK_WIDTH) + 1);
+        if (res != (j & INT_MASK)) {
             throw new RuntimeException("incorrect result: " + res);
         }
     }
@@ -390,15 +544,15 @@ public class TestShiftAndMask {
     @IR(counts = { IRNode.AND_L, "1" })
     @IR(failOn = { IRNode.ADD_L })
     public static long addShiftMaskLongCheckIndex(long i, long j, long length) {
-        return (j + Objects.checkIndex(i << 2, length)) & 3; // transformed to: return j & 3;
+        return (j + Objects.checkIndex(i << LONG_MASK_WIDTH, length)) & LONG_MASK; // transformed to: return j & LONG_MASK;
     }
 
     @Run(test = "addShiftMaskLongCheckIndex")
     public static void addShiftMaskLongCheckIndex_runner() {
-        long i = RANDOM.nextInt((Integer.MAX_VALUE - 1) >> 2);
+        long i = RANDOM.nextLong((Long.MAX_VALUE - 1) >> LONG_MASK_WIDTH);
         long j = RANDOM.nextLong();
-        long res = addShiftMaskLongCheckIndex(i, j, (i << 2) + 1);
-        if (res != (j & 3)) {
+        long res = addShiftMaskLongCheckIndex(i, j, (i << LONG_MASK_WIDTH) + 1);
+        if (res != (j & LONG_MASK)) {
             throw new RuntimeException("incorrect result: " + res);
         }
     }
@@ -406,15 +560,15 @@ public class TestShiftAndMask {
     @Test
     @IR(failOn = { IRNode.AND_I, IRNode.ADD_I })
     public static int addShiftMaskIntCheckIndex2(int i, int j, int length) {
-        return (Objects.checkIndex(j << 2, length) + Objects.checkIndex(i << 2, length)) & 3; // transformed to: return 0;
+        return (Objects.checkIndex(j << INT_MASK_WIDTH, length) + Objects.checkIndex(i << INT_MASK_WIDTH, length)) & INT_MASK; // transformed to: return 0;
     }
 
 
     @Run(test = "addShiftMaskIntCheckIndex2")
     public static void addShiftMaskIntCheckIndex2_runner() {
-        int i = RANDOM.nextInt((Integer.MAX_VALUE - 1) >> 2);
-        int j = RANDOM.nextInt((Integer.MAX_VALUE - 1) >> 2);
-        int res = addShiftMaskIntCheckIndex2(i, j, (Integer.max(i, j) << 2) + 1);
+        int i = RANDOM.nextInt((Integer.MAX_VALUE - 1) >> INT_MASK_WIDTH);
+        int j = RANDOM.nextInt((Integer.MAX_VALUE - 1) >> INT_MASK_WIDTH);
+        int res = addShiftMaskIntCheckIndex2(i, j, (Integer.max(i, j) << INT_MASK_WIDTH) + 1);
         if (res != 0) {
             throw new RuntimeException("incorrect result: " + res);
         }
@@ -423,14 +577,14 @@ public class TestShiftAndMask {
     @Test
     @IR(failOn = { IRNode.AND_L, IRNode.ADD_L })
     public static long addShiftMaskLongCheckIndex2(long i, long j, long length) {
-        return (Objects.checkIndex(j << 2, length) + Objects.checkIndex(i << 2, length)) & 3; // transformed to: return 0;
+        return (Objects.checkIndex(j << LONG_MASK_WIDTH, length) + Objects.checkIndex(i << LONG_MASK_WIDTH, length)) & LONG_MASK; // transformed to: return 0;
     }
 
     @Run(test = "addShiftMaskLongCheckIndex2")
     public static void addShiftMaskLongCheckIndex2_runner() {
-        long i = RANDOM.nextInt((Integer.MAX_VALUE - 1) >> 2);
-        long j = RANDOM.nextInt((Integer.MAX_VALUE - 1) >> 2);
-        long res = addShiftMaskLongCheckIndex2(i, j, (Long.max(i, j) << 2) + 1);
+        long i = RANDOM.nextLong((Long.MAX_VALUE - 1) >> LONG_MASK_WIDTH);
+        long j = RANDOM.nextLong((Long.MAX_VALUE - 1) >> LONG_MASK_WIDTH);
+        long res = addShiftMaskLongCheckIndex2(i, j, (Long.max(i, j) << LONG_MASK_WIDTH) + 1);
         if (res != 0) {
             throw new RuntimeException("incorrect result: " + res);
         }
@@ -439,13 +593,13 @@ public class TestShiftAndMask {
     @Test
     @IR(failOn = { IRNode.AND_L, IRNode.CONV_I2L })
     public static long shiftConvMaskCheckIndex(int i, int length) {
-        return ((long)Objects.checkIndex(i << 2, length)) & 3; // transformed to: return 0;
+        return ((long) Objects.checkIndex(i << INT_MASK_WIDTH, length)) & INT_MASK; // transformed to: return 0;
     }
 
     @Run(test = "shiftConvMaskCheckIndex")
     public static void shiftConvMaskCheckIndex_runner() {
-        int i = RANDOM.nextInt((Integer.MAX_VALUE - 1) >> 2);
-        long res = shiftConvMaskCheckIndex(i, (i << 2) + 1);
+        int i = RANDOM.nextInt((Integer.MAX_VALUE - 1) >> INT_MASK_WIDTH);
+        long res = shiftConvMaskCheckIndex(i, (i << INT_MASK_WIDTH) + 1);
         if (res != 0) {
             throw new RuntimeException("incorrect result: " + res);
         }
@@ -455,15 +609,15 @@ public class TestShiftAndMask {
     @IR(counts = { IRNode.AND_L, "1" })
     @IR(failOn = { IRNode.ADD_L, IRNode.CONV_I2L })
     public static long addShiftConvMaskCheckIndex(int i, long j, int length) {
-        return (j + Objects.checkIndex(i << 2, length)) & 3; // transformed to: return j & 3;
+        return (j + Objects.checkIndex(i << INT_MASK_WIDTH, length)) & INT_MASK; // transformed to: return j & INT_MASK;
     }
 
     @Run(test = "addShiftConvMaskCheckIndex")
     public static void addShiftConvMaskCheckIndex_runner() {
-        int i = RANDOM.nextInt((Integer.MAX_VALUE - 1) >> 2);
+        int i = RANDOM.nextInt((Integer.MAX_VALUE - 1) >> INT_MASK_WIDTH);
         long j = RANDOM.nextLong();
-        long res = addShiftConvMaskCheckIndex(i, j, (i << 2) + 1);
-        if (res != (j & 3)) {
+        long res = addShiftConvMaskCheckIndex(i, j, (i << INT_MASK_WIDTH) + 1);
+        if (res != (j & INT_MASK)) {
             throw new RuntimeException("incorrect result: " + res);
         }
     }
@@ -471,14 +625,14 @@ public class TestShiftAndMask {
     @Test
     @IR(failOn = { IRNode.AND_L, IRNode.ADD_L })
     public static long addShiftConvMaskCheckIndex2(int i, int j, int length) {
-        return (((long)Objects.checkIndex(j << 2, length)) + ((long)Objects.checkIndex(i << 2, length))) & 3; // transformed to: return 0;
+        return (((long) Objects.checkIndex(j << INT_MASK_WIDTH, length)) + ((long) Objects.checkIndex(i << INT_MASK_WIDTH, length))) & INT_MASK; // transformed to: return 0;
     }
 
     @Run(test = "addShiftConvMaskCheckIndex2")
     public static void addShiftConvMaskCheckIndex2_runner() {
-        int i = RANDOM.nextInt((Integer.MAX_VALUE - 1) >> 2);
-        int j = RANDOM.nextInt((Integer.MAX_VALUE - 1) >> 2);
-        long res = addShiftConvMaskCheckIndex2(i, j, (Integer.max(i, j) << 2) + 1);
+        int i = RANDOM.nextInt((Integer.MAX_VALUE - 1) >> INT_MASK_WIDTH);
+        int j = RANDOM.nextInt((Integer.MAX_VALUE - 1) >> INT_MASK_WIDTH);
+        long res = addShiftConvMaskCheckIndex2(i, j, (Integer.max(i, j) << INT_MASK_WIDTH) + 1);
         if (res != 0) {
             throw new RuntimeException("incorrect result: " + res);
         }
diff --git a/test/hotspot/jtreg/compiler/loopopts/superword/TestEquivalentInvariants.java b/test/hotspot/jtreg/compiler/loopopts/superword/TestEquivalentInvariants.java
index a9b158f1c09..09b087bee54 100644
--- a/test/hotspot/jtreg/compiler/loopopts/superword/TestEquivalentInvariants.java
+++ b/test/hotspot/jtreg/compiler/loopopts/superword/TestEquivalentInvariants.java
@@ -173,9 +173,13 @@ public class TestEquivalentInvariants {
           return testMemorySegmentIInvarL3e(data, 1, 2, 3, RANGE-200);
         });
         tests.put("testMemorySegmentIInvarL3f", () -> {
-          MemorySegment data = MemorySegment.ofArray(aI.clone());
+          MemorySegment data = MemorySegment.ofArray(aL.clone());
           return testMemorySegmentIInvarL3f(data, 1, 2, 3, RANGE-200);
         });
+        tests.put("testMemorySegmentIInvarL3g", () -> {
+          MemorySegment data = MemorySegment.ofArray(aI.clone());
+          return testMemorySegmentIInvarL3g(data, 1, 2, 3, RANGE-200);
+        });
         tests.put("testMemorySegmentLInvarL3a", () -> {
           MemorySegment data = MemorySegment.ofArray(aL.clone());
           return testMemorySegmentLInvarL3a(data, 1, 2, 3, RANGE-200);
@@ -246,6 +250,7 @@ public class TestEquivalentInvariants {
                  "testMemorySegmentIInvarL3d3",
                  "testMemorySegmentIInvarL3e",
                  "testMemorySegmentIInvarL3f",
+                 "testMemorySegmentIInvarL3g",
                  "testMemorySegmentLInvarL3a",
                  "testMemorySegmentLInvarL3b",
                  "testMemorySegmentLInvarL3c",
@@ -681,12 +686,17 @@ public class TestEquivalentInvariants {
     }
 
     @Test
+    @IR(counts = {IRNode.LOAD_VECTOR_I, "> 0",
+                  IRNode.STORE_VECTOR,  "> 0"},
+        applyIfPlatform = {"64-bit", "true"},
+        applyIf = {"AlignVector", "false"},
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"})
     @IR(counts = {IRNode.LOAD_VECTOR_I, "= 0",
                   IRNode.STORE_VECTOR,  "= 0"},
         applyIfPlatform = {"64-bit", "true"},
+        applyIf = {"AlignVector", "true"},
         applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"})
-    // Would be nice if it vectorized.
-    // Fails because of control flow. Somehow the "offsetPlain" check (checks for alignment) is not folded away.
+    // With AlignVector (strict alignment requirements): we cannot prove that the invariants are alignable -> no vectorization.
     static Object[] testMemorySegmentIInvarL3d(MemorySegment m, int invar1, int invar2, int invar3, int size) {
         long i1 = (long)(-invar1 + invar2 + invar3);
         long i2 = (long)(invar2 + invar3 - invar1); // equivalent
@@ -700,12 +710,17 @@ public class TestEquivalentInvariants {
     }
 
     @Test
+    @IR(counts = {IRNode.LOAD_VECTOR_I, "> 0",
+                  IRNode.STORE_VECTOR,  "> 0"},
+        applyIfPlatform = {"64-bit", "true"},
+        applyIf = {"AlignVector", "false"},
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"})
     @IR(counts = {IRNode.LOAD_VECTOR_I, "= 0",
                   IRNode.STORE_VECTOR,  "= 0"},
         applyIfPlatform = {"64-bit", "true"},
+        applyIf = {"AlignVector", "true"},
         applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"})
-    // Would be nice if it vectorized.
-    // Fails because of control flow. Somehow the "offsetPlain" check (checks for alignment) is not folded away.
+    // With AlignVector (strict alignment requirements): we cannot prove that the invariants are alignable -> no vectorization.
     static Object[] testMemorySegmentIInvarL3d2(MemorySegment m, int invar1, int invar2, int invar3, int size) {
         long i1 = (long)(-invar1 + invar2 + invar3);
         for (int i = 0; i < size; i+=2) {
@@ -735,6 +750,31 @@ public class TestEquivalentInvariants {
         return new Object[]{ m };
     }
 
+    @Test
+    @IR(counts = {IRNode.LOAD_VECTOR_I, "> 0",
+                  IRNode.STORE_VECTOR,  "> 0"},
+        applyIfPlatform = {"64-bit", "true"},
+        applyIf = {"AlignVector", "false"},
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"})
+    @IR(counts = {IRNode.LOAD_VECTOR_I, "= 0",
+                  IRNode.STORE_VECTOR,  "= 0"},
+        applyIfPlatform = {"64-bit", "true"},
+        applyIf = {"AlignVector", "true"},
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"})
+    // With AlignVector (strict alignment requirements): we cannot prove that the invariants are alignable -> no vectorization.
+    static Object[] testMemorySegmentIInvarL3e(MemorySegment m, int invar1, int invar2, int invar3, int size) {
+        long i1 = (long)(-invar1 + invar2 + invar3);
+        long i2 = (long)(invar2 + invar3) - (long)(invar1); // not equivalent
+        for (int i = 0; i < size; i+=2) {
+            int v0 = m.getAtIndex(ValueLayout.JAVA_INT, i + i1 + 0);
+            int v1 = m.getAtIndex(ValueLayout.JAVA_INT, i + i2 + 1);
+            m.setAtIndex(ValueLayout.JAVA_INT, i + i1 + 0, v0 + 1);
+            m.setAtIndex(ValueLayout.JAVA_INT, i + i2 + 1, v1 + 1);
+        }
+        return new Object[]{ m };
+    }
+
+    // Same as testMemorySegmentIInvarL3e, but with long[] input.
     @Test
     @IR(counts = {IRNode.LOAD_VECTOR_I, "= 0",
                   IRNode.STORE_VECTOR,  "= 0"},
@@ -743,7 +783,7 @@ public class TestEquivalentInvariants {
     // Should never vectorize, since i1 and i2 are not guaranteed to be adjacent
     // invar2 + invar3 could overflow, and the address be valid with and without overflow.
     // So both addresses are valid, and not adjacent.
-    static Object[] testMemorySegmentIInvarL3e(MemorySegment m, int invar1, int invar2, int invar3, int size) {
+    static Object[] testMemorySegmentIInvarL3f(MemorySegment m, int invar1, int invar2, int invar3, int size) {
         long i1 = (long)(-invar1 + invar2 + invar3);
         long i2 = (long)(invar2 + invar3) - (long)(invar1); // not equivalent
         for (int i = 0; i < size; i+=2) {
@@ -762,7 +802,7 @@ public class TestEquivalentInvariants {
         applyIfPlatform = {"64-bit", "true"},
         applyIf = {"AlignVector", "false"},
         applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"})
-    static Object[] testMemorySegmentIInvarL3f(MemorySegment m, long invar1, long invar2, long invar3, int size) {
+    static Object[] testMemorySegmentIInvarL3g(MemorySegment m, long invar1, long invar2, long invar3, int size) {
         long i1 = -invar1 + invar2 + invar3;
         long i2 = invar2 + invar3 - invar1; // equivalent
         for (int i = 0; i < size; i++) {
@@ -825,12 +865,17 @@ public class TestEquivalentInvariants {
     }
 
     @Test
+    @IR(counts = {IRNode.LOAD_VECTOR_L, "> 0",
+                  IRNode.STORE_VECTOR,  "> 0"},
+        applyIfPlatform = {"64-bit", "true"},
+        applyIf = {"AlignVector", "false"},
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"})
     @IR(counts = {IRNode.LOAD_VECTOR_L, "= 0",
                   IRNode.STORE_VECTOR,  "= 0"},
         applyIfPlatform = {"64-bit", "true"},
+        applyIf = {"AlignVector", "true"},
         applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"})
-    // Would be nice if it vectorized.
-    // Fails because of control flow. Somehow the "offsetPlain" check (checks for alignment) is not folded away.
+    // With AlignVector (strict alignment requirements): we cannot prove that the invariants are alignable -> no vectorization.
     static Object[] testMemorySegmentLInvarL3d(MemorySegment m, int invar1, int invar2, int invar3, int size) {
         long i1 = (long)(-invar1 + invar2 + invar3);
         long i2 = (long)(invar2 + invar3 - invar1); // equivalent
@@ -844,12 +889,17 @@ public class TestEquivalentInvariants {
     }
 
     @Test
+    @IR(counts = {IRNode.LOAD_VECTOR_L, "> 0",
+                  IRNode.STORE_VECTOR,  "> 0"},
+        applyIfPlatform = {"64-bit", "true"},
+        applyIf = {"AlignVector", "false"},
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"})
     @IR(counts = {IRNode.LOAD_VECTOR_L, "= 0",
                   IRNode.STORE_VECTOR,  "= 0"},
         applyIfPlatform = {"64-bit", "true"},
+        applyIf = {"AlignVector", "true"},
         applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"})
-    // Would be nice if it vectorized.
-    // Fails because of control flow. Somehow the "offsetPlain" check (checks for alignment) is not folded away.
+    // With AlignVector (strict alignment requirements): we cannot prove that the invariants are alignable -> no vectorization.
     static Object[] testMemorySegmentLInvarL3d2(MemorySegment m, int invar1, int invar2, int invar3, int size) {
         long i1 = (long)(-invar1 + invar2 + invar3);
         for (int i = 0; i < size; i+=2) {
@@ -880,11 +930,17 @@ public class TestEquivalentInvariants {
     }
 
     @Test
+    @IR(counts = {IRNode.LOAD_VECTOR_L, "> 0",
+                  IRNode.STORE_VECTOR,  "> 0"},
+        applyIfPlatform = {"64-bit", "true"},
+        applyIf = {"AlignVector", "false"},
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"})
     @IR(counts = {IRNode.LOAD_VECTOR_L, "= 0",
                   IRNode.STORE_VECTOR,  "= 0"},
         applyIfPlatform = {"64-bit", "true"},
+        applyIf = {"AlignVector", "true"},
         applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"})
-    // FAILS: should be ok to vectorize, but does not. Investigate in JDK-8331659.
+    // With AlignVector (strict alignment requirements): we cannot prove that the invariants are alignable -> no vectorization.
     static Object[] testMemorySegmentLInvarL3e(MemorySegment m, int invar1, int invar2, int invar3, int size) {
         long i1 = (long)(-invar1 + invar2 + invar3);
         long i2 = (long)(invar2 + invar3) - (long)(invar1); // not equivalent
diff --git a/test/hotspot/jtreg/compiler/vectorization/TestPopulateIndex.java b/test/hotspot/jtreg/compiler/vectorization/TestPopulateIndex.java
index e23accd27b0..afe733bad4b 100644
--- a/test/hotspot/jtreg/compiler/vectorization/TestPopulateIndex.java
+++ b/test/hotspot/jtreg/compiler/vectorization/TestPopulateIndex.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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,17 +78,17 @@ public class TestPopulateIndex {
     }
 
     @Test
-    @IR(counts = {IRNode.POPULATE_INDEX, "> 0"})
+    // Does not vectorize, possibly because the OrI is pushed through the Phi, see also JDK-8348096.
     public void exprWithIndex1() {
         for (int i = 0; i < count; i++) {
-            dst[i] = src[i] * (i & 7);
+            dst[i] = src[i] * (i | 7);
         }
         checkResultExprWithIndex1();
     }
 
     public void checkResultExprWithIndex1() {
         for (int i = 0; i < count; i++) {
-            int expected = src[i] * (i & 7);
+            int expected = src[i] * (i | 7);
             if (dst[i] != expected) {
                 throw new RuntimeException("Invalid result: dst[" + i + "] = " + dst[i] + " != " + expected);
             }
@@ -112,4 +112,26 @@ public class TestPopulateIndex {
             }
         }
     }
+
+    @Test
+    // Does not vectorize: due to sum-under-mask optimization.
+    // (i+0) & 7, (i+1) & 7 ... (i+8) & 7 ....  -> PopulateIndex
+    // becomes
+    // (i+0) & 7, (i+1) & 7 ... (i+0) & 7 .... -> pattern broken
+    // See JDK-8349128.
+    public void exprWithIndex3() {
+        for (int i = 0; i < count; i++) {
+            dst[i] = src[i] * (i & 7);
+        }
+        checkResultExprWithIndex3();
+    }
+
+    public void checkResultExprWithIndex3() {
+        for (int i = 0; i < count; i++) {
+            int expected = src[i] * (i & 7);
+            if (dst[i] != expected) {
+                throw new RuntimeException("Invalid result: dst[" + i + "] = " + dst[i] + " != " + expected);
+            }
+        }
+    }
 }

From 2bd8f026dbd449e810dc6ce96cd9235e5cb51a9b Mon Sep 17 00:00:00 2001
From: Alexey Ivanov <aivanov@openjdk.org>
Date: Mon, 17 Feb 2025 13:12:02 +0000
Subject: [PATCH 028/587] 8342524: Use latch in AbstractButton/bug6298940.java
 instead of delay

Reviewed-by: azvegint, kizune, dnguyen, achung
---
 .../swing/AbstractButton/bug6298940.java      | 93 +++++++++++++++++++
 1 file changed, 93 insertions(+)
 create mode 100644 test/jdk/javax/swing/AbstractButton/bug6298940.java

diff --git a/test/jdk/javax/swing/AbstractButton/bug6298940.java b/test/jdk/javax/swing/AbstractButton/bug6298940.java
new file mode 100644
index 00000000000..c2857c68ae3
--- /dev/null
+++ b/test/jdk/javax/swing/AbstractButton/bug6298940.java
@@ -0,0 +1,93 @@
+/*
+ * Copyright (c) 2005, 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact 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 6298940
+ * @key headful
+ * @summary Tests that mnemonic keystroke fires an action
+ * @library /javax/swing/regtesthelpers
+ * @build Util
+ * @run main bug6298940
+ */
+
+import java.awt.Robot;
+import java.awt.event.KeyEvent;
+import java.util.concurrent.CountDownLatch;
+
+import javax.swing.ButtonModel;
+import javax.swing.DefaultButtonModel;
+import javax.swing.JButton;
+import javax.swing.JFrame;
+import javax.swing.SwingUtilities;
+
+import static java.util.concurrent.TimeUnit.SECONDS;
+
+public final class bug6298940 {
+    private static JFrame frame;
+
+    private static final CountDownLatch actionEvent = new CountDownLatch(1);
+
+    private static void createAndShowGUI() {
+        ButtonModel model = new DefaultButtonModel();
+        model.addActionListener(event -> {
+            System.out.println("ActionEvent");
+            actionEvent.countDown();
+        });
+        model.setMnemonic('T');
+
+        JButton button = new JButton("Test");
+        button.setModel(model);
+
+        frame = new JFrame("bug6298940");
+        frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
+        frame.add(button);
+        frame.pack();
+        frame.setLocationRelativeTo(null);
+        frame.setVisible(true);
+        frame.toFront();
+    }
+
+    public static void main(String[] args) throws Exception {
+        Robot robot = new Robot();
+
+        SwingUtilities.invokeAndWait(bug6298940::createAndShowGUI);
+
+        robot.waitForIdle();
+        robot.delay(500);
+
+        Util.hitMnemonics(robot, KeyEvent.VK_T);
+
+        try {
+            if (!actionEvent.await(1, SECONDS)) {
+                throw new RuntimeException("Mnemonic didn't fire an action");
+            }
+        } finally {
+            SwingUtilities.invokeAndWait(() -> {
+                if (frame != null) {
+                    frame.dispose();
+                }
+            });
+        }
+    }
+}

From 906358d3a14ce755fec771f0a6bb856b3a8f3297 Mon Sep 17 00:00:00 2001
From: Alexey Ivanov <aivanov@openjdk.org>
Date: Mon, 17 Feb 2025 13:13:15 +0000
Subject: [PATCH 029/587] 8294155: Exception thrown before awaitAndCheck hangs
 PassFailJFrame

Reviewed-by: serb, azvegint, kizune
---
 .../java/awt/regtesthelpers/PassFailJFrame.java  | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/test/jdk/java/awt/regtesthelpers/PassFailJFrame.java b/test/jdk/java/awt/regtesthelpers/PassFailJFrame.java
index 95d925d7b3d..5f559ea47c3 100644
--- a/test/jdk/java/awt/regtesthelpers/PassFailJFrame.java
+++ b/test/jdk/java/awt/regtesthelpers/PassFailJFrame.java
@@ -1787,8 +1787,20 @@ public final class PassFailJFrame {
 
         public PassFailJFrame build() throws InterruptedException,
                 InvocationTargetException {
-            validate();
-            return new PassFailJFrame(this);
+            try {
+                validate();
+                return new PassFailJFrame(this);
+            } catch (final Throwable t) {
+                // Dispose of all the windows, including those that may not
+                // be registered with PassFailJFrame to allow AWT to shut down
+                try {
+                    invokeOnEDT(() -> Arrays.stream(Window.getWindows())
+                                            .forEach(Window::dispose));
+                } catch (Throwable edt) {
+                    t.addSuppressed(edt);
+                }
+                throw t;
+            }
         }
 
         /**

From 650d0d954ea8e20e31f17d459993d5edecf08a4c Mon Sep 17 00:00:00 2001
From: Alexey Ivanov <aivanov@openjdk.org>
Date: Mon, 17 Feb 2025 13:13:42 +0000
Subject: [PATCH 030/587] 8348865: JButton/bug4796987.java never runs because
 Windows XP is unavailable

Reviewed-by: tr, abhiscxk, serb
---
 .../swing/JButton/4796987/bug4796987.java     | 106 +++++++++++-------
 1 file changed, 68 insertions(+), 38 deletions(-)

diff --git a/test/jdk/javax/swing/JButton/4796987/bug4796987.java b/test/jdk/javax/swing/JButton/4796987/bug4796987.java
index 62d11fc18c0..bfa6ef8d129 100644
--- a/test/jdk/javax/swing/JButton/4796987/bug4796987.java
+++ b/test/jdk/javax/swing/JButton/4796987/bug4796987.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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,67 +26,91 @@
  * @bug 4796987
  * @key headful
  * @requires (os.family == "windows")
- * @summary XP Only: JButton.setBorderPainted() does not work with XP L&F
- * @author Alexander Scherbatiy
+ * @summary Verify JButton.setBorderPainted(false) removes border
+ *      for Windows visual styles (Windows XP and later)
  * @library ../../regtesthelpers
- * @library /test/lib
- * @modules java.desktop/com.sun.java.swing.plaf.windows
- *          java.desktop/sun.awt
- * @build jdk.test.lib.OSVersion jdk.test.lib.Platform
  * @build Util
  * @run main bug4796987
  */
 
-import jdk.test.lib.Platform;
-import jdk.test.lib.OSVersion;
-import java.awt.*;
-import javax.swing.*;
-import com.sun.java.swing.plaf.windows.WindowsLookAndFeel;
+import java.awt.BorderLayout;
+import java.awt.Dimension;
+import java.awt.Point;
+import java.awt.Rectangle;
+import java.awt.Robot;
+import java.awt.image.BufferedImage;
+import java.io.File;
+import java.io.IOException;
+
+import javax.imageio.ImageIO;
+import javax.swing.JButton;
+import javax.swing.JFrame;
+import javax.swing.JPanel;
+import javax.swing.SwingUtilities;
+import javax.swing.UIManager;
 
 public class bug4796987 {
 
     private static JButton button1;
     private static JButton button2;
     private static JFrame frame;
+    private static JPanel panel;
 
     public static void main(String[] args) throws Exception {
         try {
-            if (Platform.isWindows()
-                && OSVersion.current().equals(OSVersion.WINDOWS_XP)) {
-                UIManager.setLookAndFeel(new WindowsLookAndFeel());
-                testButtonBorder();
-            }
+            UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
+            testButtonBorder();
         } finally {
-            if (frame != null) SwingUtilities.invokeAndWait(() -> frame.dispose());
+            SwingUtilities.invokeAndWait(() -> {
+                if (frame != null) {
+                    frame.dispose();
+                }
+            });
         }
     }
 
     private static void testButtonBorder() throws Exception {
         Robot robot = new Robot();
-        robot.setAutoDelay(50);
-
-        SwingUtilities.invokeAndWait(new Runnable() {
-
-            public void run() {
-                createAndShowGUI();
-            }
-        });
 
+        SwingUtilities.invokeAndWait(bug4796987::createAndShowGUI);
         robot.waitForIdle();
-        Thread.sleep(500);
+        robot.delay(500);
 
-        Point p1 = Util.getCenterPoint(button1);
-        Point p2 = Util.getCenterPoint(button2);
+        // Hover over button1
+        Point b1Center = Util.getCenterPoint(button1);
+        robot.mouseMove(b1Center.x, b1Center.y);
+        robot.waitForIdle();
 
-        Color color = robot.getPixelColor(p1.x, p2.x);
-        for (int dx = p1.x; dx < p2.x - p1.x; dx++) {
-            robot.mouseMove(p1.x + dx, p1.y);
-            if (!color.equals(robot.getPixelColor(p1.x + dx, p1.y))) {
+        Rectangle panelBounds = Util.invokeOnEDT(() ->
+                new Rectangle(panel.getLocationOnScreen(),
+                              panel.getSize()));
+        BufferedImage image = robot.createScreenCapture(panelBounds);
+
+        final Point p1 = Util.invokeOnEDT(() -> getCenterPoint(button1));
+        final Point p2 = Util.invokeOnEDT(() -> getCenterPoint(button2));
+
+        final int color = image.getRGB(p1.x, p1.y);
+        for (int dx = 0; p1.x + dx < p2.x; dx++) {
+            if (color != image.getRGB(p1.x + dx, p1.y)) {
+                System.err.println("Wrong color at " + (p1.x + dx) + ", " + p1.y
+                                   + " - expected " + Integer.toHexString(color));
+                saveImage(image);
                 throw new RuntimeException("Button has border and background!");
             }
         }
     }
 
+    /**
+     * {@return the center point of a button relative to its parent}
+     * @param button the button to calculate the center point
+     */
+    private static Point getCenterPoint(JButton button) {
+        Point location = button.getLocation();
+        Dimension size = button.getSize();
+        location.translate(size.width / 2, size.height / 2);
+        return location;
+    }
+
     private static JButton getButton() {
         JButton button = new JButton();
         button.setBorderPainted(false);
@@ -95,18 +119,24 @@ public class bug4796987 {
     }
 
     private static void createAndShowGUI() {
-        frame = new JFrame("Test");
+        frame = new JFrame("bug4796987");
         frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
         frame.setSize(200, 200);
 
-        JButton button = new JButton();
-        button.setBorder(null);
-
-        JPanel panel = new JPanel(new BorderLayout(50, 50));
+        panel = new JPanel(new BorderLayout(50, 50));
         panel.add(getButton(), BorderLayout.CENTER);
         panel.add(button1 = getButton(), BorderLayout.WEST);
         panel.add(button2 = getButton(), BorderLayout.EAST);
         frame.getContentPane().add(panel);
+        frame.setLocationRelativeTo(null);
         frame.setVisible(true);
     }
+
+    private static void saveImage(BufferedImage image) {
+        try {
+            ImageIO.write(image, "png",
+                          new File("frame.png"));
+        } catch (IOException ignored) {
+        }
+    }
 }

From 8b2aa51b0c36a993e46fea7a4b61788dd101d606 Mon Sep 17 00:00:00 2001
From: Suchismith Roy <sroy@openjdk.org>
Date: Mon, 17 Feb 2025 13:28:34 +0000
Subject: [PATCH 031/587] 8349780: AIX os::get_summary_cpu_info  support Power
 11

Reviewed-by: stuefe, amitkumar
---
 src/hotspot/os/aix/os_aix.cpp | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/src/hotspot/os/aix/os_aix.cpp b/src/hotspot/os/aix/os_aix.cpp
index 9222104c6d6..bebd1f1a8c1 100644
--- a/src/hotspot/os/aix/os_aix.cpp
+++ b/src/hotspot/os/aix/os_aix.cpp
@@ -164,6 +164,12 @@ extern "C" int getargs(procsinfo*, int, char*, int);
 #ifndef PV_10_Compat
   #define PV_10_Compat  0x508000  /* Power PC 10 */
 #endif
+#ifndef PV_11
+  #define PV_11           0x600000        /* Power PC 11 */
+#endif
+#ifndef PV_11_Compat
+  #define PV_11_Compat    0x608000        /* Power PC 11 */
+#endif
 
 static address resolve_function_descriptor_to_code_pointer(address p);
 
@@ -1219,6 +1225,9 @@ void os::print_memory_info(outputStream* st) {
 void os::get_summary_cpu_info(char* buf, size_t buflen) {
   // read _system_configuration.version
   switch (_system_configuration.version) {
+  case PV_11:
+    strncpy(buf, "Power PC 11", buflen);
+    break;
   case PV_10:
     strncpy(buf, "Power PC 10", buflen);
     break;
@@ -1264,6 +1273,9 @@ void os::get_summary_cpu_info(char* buf, size_t buflen) {
   case PV_10_Compat:
     strncpy(buf, "PV_10_Compat", buflen);
     break;
+  case PV_11_Compat:
+    strncpy(buf, "PV_11_Compat", buflen);
+    break;
   default:
     strncpy(buf, "unknown", buflen);
   }

From 3f0c1370269db978072814c2170fc3987efade85 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hannes=20Walln=C3=B6fer?= <hannesw@openjdk.org>
Date: Mon, 17 Feb 2025 15:31:18 +0000
Subject: [PATCH 032/587] 8347123: Add missing @serial tags to other modules

Reviewed-by: prr, nbenalla, alanb
---
 .../classes/java/awt/datatransfer/DataFlavor.java      |  5 ++++-
 .../classes/javax/management/ImmutableDescriptor.java  |  6 +++---
 .../classes/javax/management/MBeanPermission.java      |  2 +-
 .../classes/javax/management/remote/JMXServiceURL.java | 10 +++++-----
 .../javax/management/remote/NotificationResult.java    |  5 ++++-
 .../share/classes/javax/script/ScriptException.java    |  5 ++++-
 .../javax/security/auth/kerberos/KerberosTicket.java   |  4 ++--
 .../share/classes/javax/smartcardio/ATR.java           |  3 ++-
 .../classes/javax/sql/rowset/serial/SerialBlob.java    |  4 ++--
 .../classes/javax/sql/rowset/serial/SerialClob.java    |  4 ++--
 .../javax/sql/rowset/serial/SerialJavaObject.java      |  6 +++---
 .../classes/javax/sql/rowset/serial/SerialRef.java     |  6 +++---
 .../javax/sql/rowset/spi/SyncProviderException.java    |  4 ++--
 .../share/classes/java/sql/SQLClientInfoException.java |  4 ++--
 .../share/classes/javax/sql/StatementEvent.java        |  6 +++---
 .../javax/xml/crypto/URIReferenceException.java        |  4 ++--
 .../share/classes/javax/xml/namespace/QName.java       |  6 +++---
 .../javax/xml/parsers/FactoryConfigurationError.java   |  4 ++--
 .../javax/xml/stream/FactoryConfigurationError.java    |  4 ++--
 .../classes/javax/xml/stream/XMLStreamException.java   |  6 +++++-
 .../javax/xml/transform/TransformerException.java      |  6 +++---
 .../TransformerFactoryConfigurationError.java          |  4 ++--
 .../share/classes/org/w3c/dom/DOMException.java        |  4 ++++
 .../classes/org/w3c/dom/events/EventException.java     |  3 +++
 .../share/classes/org/w3c/dom/ls/LSException.java      |  3 +++
 .../classes/org/w3c/dom/ranges/RangeException.java     |  3 +++
 .../sun/tools/attach/AgentInitializationException.java |  3 ++-
 .../share/classes/jdk/dynalink/beans/StaticClass.java  |  4 ++--
 .../share/classes/jdk/incubator/vector/Float16.java    |  1 +
 .../classes/com/sun/jdi/ClassNotLoadedException.java   |  3 ++-
 .../share/classes/com/sun/jdi/InternalException.java   |  3 ++-
 .../share/classes/com/sun/jdi/InvocationException.java |  3 ++-
 .../connect/IllegalConnectorArgumentsException.java    |  3 ++-
 .../classes/com/sun/jdi/connect/VMStartException.java  |  3 ++-
 .../share/classes/jdk/jshell/EvalException.java        |  3 ++-
 .../jdk/jshell/UnresolvedReferenceException.java       |  3 ++-
 .../share/classes/jdk/jshell/spi/ExecutionControl.java |  7 ++++++-
 .../classes/jdk/jshell/spi/SPIResolutionException.java |  3 ++-
 .../classes/org/w3c/dom/xpath/XPathException.java      |  3 +++
 39 files changed, 104 insertions(+), 59 deletions(-)

diff --git a/src/java.datatransfer/share/classes/java/awt/datatransfer/DataFlavor.java b/src/java.datatransfer/share/classes/java/awt/datatransfer/DataFlavor.java
index 3a18834a567..cfb89118ff7 100644
--- a/src/java.datatransfer/share/classes/java/awt/datatransfer/DataFlavor.java
+++ b/src/java.datatransfer/share/classes/java/awt/datatransfer/DataFlavor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -1286,6 +1286,9 @@ public class DataFlavor implements Externalizable, Cloneable {
 
     /**
      * Serializes this {@code DataFlavor}.
+     *
+     * @serialData The {@code mimeType} field with the {@code humanPresentableName} parameter set,
+     * followed by the {@code representationClass} field
      */
    public synchronized void writeExternal(ObjectOutput os) throws IOException {
        if (mimeType != null) {
diff --git a/src/java.management/share/classes/javax/management/ImmutableDescriptor.java b/src/java.management/share/classes/javax/management/ImmutableDescriptor.java
index c151f423215..c9044b68ed2 100644
--- a/src/java.management/share/classes/javax/management/ImmutableDescriptor.java
+++ b/src/java.management/share/classes/javax/management/ImmutableDescriptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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,13 @@ public class ImmutableDescriptor implements Descriptor {
     private static final long serialVersionUID = 8853308591080540165L;
 
     /**
-     * The names of the fields in this ImmutableDescriptor with their
+     * @serial The names of the fields in this ImmutableDescriptor with their
      * original case.  The names must be in alphabetical order as determined
      * by {@link String#CASE_INSENSITIVE_ORDER}.
      */
     private final String[] names;
     /**
-     * The values of the fields in this ImmutableDescriptor.  The
+     * @serial The values of the fields in this ImmutableDescriptor.  The
      * elements in this array match the corresponding elements in the
      * {@code names} array.
      */
diff --git a/src/java.management/share/classes/javax/management/MBeanPermission.java b/src/java.management/share/classes/javax/management/MBeanPermission.java
index abc3cdda7a8..b26df6edada 100644
--- a/src/java.management/share/classes/javax/management/MBeanPermission.java
+++ b/src/java.management/share/classes/javax/management/MBeanPermission.java
@@ -222,7 +222,7 @@ public class MBeanPermission extends Permission {
         UnregisterMBean;
 
     /**
-     * The actions string.
+     * @serial The actions string.
      */
     private String actions;
 
diff --git a/src/java.management/share/classes/javax/management/remote/JMXServiceURL.java b/src/java.management/share/classes/javax/management/remote/JMXServiceURL.java
index 61dfeaffeae..b6c2860b9cd 100644
--- a/src/java.management/share/classes/javax/management/remote/JMXServiceURL.java
+++ b/src/java.management/share/classes/javax/management/remote/JMXServiceURL.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -758,22 +758,22 @@ public class JMXServiceURL implements Serializable {
     }
 
     /**
-     * The value returned by {@link #getProtocol()}.
+     * @serial The value returned by {@link #getProtocol()}.
      */
     private String protocol;
 
     /**
-     * The value returned by {@link #getHost()}.
+     * @serial The value returned by {@link #getHost()}.
      */
     private String host;
 
     /**
-     * The value returned by {@link #getPort()}.
+     * @serial The value returned by {@link #getPort()}.
      */
     private int port;
 
     /**
-     * The value returned by {@link #getURLPath()}.
+     * @serial The value returned by {@link #getURLPath()}.
      */
     private String urlPath;
 
diff --git a/src/java.management/share/classes/javax/management/remote/NotificationResult.java b/src/java.management/share/classes/javax/management/remote/NotificationResult.java
index 4dedcc348fc..7c147cfc3dc 100644
--- a/src/java.management/share/classes/javax/management/remote/NotificationResult.java
+++ b/src/java.management/share/classes/javax/management/remote/NotificationResult.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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,8 +148,11 @@ public class NotificationResult implements Serializable {
         }
     }
 
+    /** @serial */
     private long earliestSequenceNumber;
+    /** @serial */
     private long nextSequenceNumber;
+    /** @serial */
     private TargetedNotification[] targetedNotifications;
 
     private static void validate(TargetedNotification[] targetedNotifications,
diff --git a/src/java.scripting/share/classes/javax/script/ScriptException.java b/src/java.scripting/share/classes/javax/script/ScriptException.java
index f10ead75510..1037ccde27f 100644
--- a/src/java.scripting/share/classes/javax/script/ScriptException.java
+++ b/src/java.scripting/share/classes/javax/script/ScriptException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -38,8 +38,11 @@ public class ScriptException extends Exception {
 
     private static final long serialVersionUID = 8265071037049225001L;
 
+    /** @serial */
     private final String fileName;
+    /** @serial */
     private final int lineNumber;
+    /** @serial */
     private final int columnNumber;
 
     /**
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 d82337c3e2e..333a6ec0a8e 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, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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,7 +187,7 @@ public class KerberosTicket implements Destroyable, Refreshable,
     private InetAddress[] clientAddresses;
 
     /**
-     * Evidence ticket if proxy_impersonator. This field can be accessed
+     * @serial Evidence ticket if proxy_impersonator. This field can be accessed
      * by KerberosSecrets. It's serialized.
      */
     KerberosTicket proxy = null;
diff --git a/src/java.smartcardio/share/classes/javax/smartcardio/ATR.java b/src/java.smartcardio/share/classes/javax/smartcardio/ATR.java
index 49537c394e5..6038d8ded92 100644
--- a/src/java.smartcardio/share/classes/javax/smartcardio/ATR.java
+++ b/src/java.smartcardio/share/classes/javax/smartcardio/ATR.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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 final class ATR implements java.io.Serializable {
 
     private static final long serialVersionUID = 6695383790847736493L;
 
+    /** @serial */
     private byte[] atr;
 
     private transient int startHistorical, nHistorical;
diff --git a/src/java.sql.rowset/share/classes/javax/sql/rowset/serial/SerialBlob.java b/src/java.sql.rowset/share/classes/javax/sql/rowset/serial/SerialBlob.java
index 34474deb593..9d499ab03b7 100644
--- a/src/java.sql.rowset/share/classes/javax/sql/rowset/serial/SerialBlob.java
+++ b/src/java.sql.rowset/share/classes/javax/sql/rowset/serial/SerialBlob.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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 @@ public class SerialBlob implements Blob, Serializable, Cloneable {
     private byte[] buf;
 
     /**
-     * The internal representation of the <code>Blob</code> object on which this
+     * @serial The internal representation of the <code>Blob</code> object on which this
      * <code>SerialBlob</code> object is based.
      */
     @SuppressWarnings("serial") // Not statically typed as Serializable; checked in writeObject
diff --git a/src/java.sql.rowset/share/classes/javax/sql/rowset/serial/SerialClob.java b/src/java.sql.rowset/share/classes/javax/sql/rowset/serial/SerialClob.java
index b64001a0a91..51ae1d8f336 100644
--- a/src/java.sql.rowset/share/classes/javax/sql/rowset/serial/SerialClob.java
+++ b/src/java.sql.rowset/share/classes/javax/sql/rowset/serial/SerialClob.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -65,7 +65,7 @@ public class SerialClob implements Clob, Serializable, Cloneable {
     private char buf[];
 
     /**
-     * Internal Clob representation if SerialClob is initialized with a
+     * @serial Internal Clob representation if SerialClob is initialized with a
      * Clob. Null if SerialClob is initialized with a char[].
      */
     @SuppressWarnings("serial")  // Not statically typed as Serializable; checked in writeObject
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 154c95bc1c4..9486c325278 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, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -56,7 +56,7 @@ import javax.sql.rowset.RowSetWarning;
 public class SerialJavaObject implements Serializable, Cloneable {
 
     /**
-     * Placeholder for object to be serialized.
+     * @serial Placeholder for object to be serialized.
      */
     @SuppressWarnings("serial") // Not statically typed as Serializable
     private Object obj;
@@ -139,7 +139,7 @@ public class SerialJavaObject implements Serializable, Cloneable {
     static final long serialVersionUID = -1465795139032831023L;
 
     /**
-     * A container for the warnings issued on this <code>SerialJavaObject</code>
+     * @serial A container for the warnings issued on this <code>SerialJavaObject</code>
      * object. When there are multiple warnings, each warning is chained to the
      * previous warning.
      */
diff --git a/src/java.sql.rowset/share/classes/javax/sql/rowset/serial/SerialRef.java b/src/java.sql.rowset/share/classes/javax/sql/rowset/serial/SerialRef.java
index f31df04e914..4e8bbc9ea0a 100644
--- a/src/java.sql.rowset/share/classes/javax/sql/rowset/serial/SerialRef.java
+++ b/src/java.sql.rowset/share/classes/javax/sql/rowset/serial/SerialRef.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -54,13 +54,13 @@ public class SerialRef implements Ref, Serializable, Cloneable {
     private String baseTypeName;
 
     /**
-     * This will store the type <code>Ref</code> as an <code>Object</code>.
+     * @serial This will store the type <code>Ref</code> as an <code>Object</code>.
      */
     @SuppressWarnings("serial") // Not statically typed as Serializable
     private Object object;
 
     /**
-     * Private copy of the Ref reference.
+     * @serial Private copy of the Ref reference.
      */
     @SuppressWarnings("serial") // Not statically typed as Serializable; checked in writeObject
     private Ref reference;
diff --git a/src/java.sql.rowset/share/classes/javax/sql/rowset/spi/SyncProviderException.java b/src/java.sql.rowset/share/classes/javax/sql/rowset/spi/SyncProviderException.java
index 694d6b56314..b1dd9f7e761 100644
--- a/src/java.sql.rowset/share/classes/javax/sql/rowset/spi/SyncProviderException.java
+++ b/src/java.sql.rowset/share/classes/javax/sql/rowset/spi/SyncProviderException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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,7 +66,7 @@ import javax.sql.rowset.*;
 public class SyncProviderException extends java.sql.SQLException {
 
     /**
-     * The instance of <code>javax.sql.rowset.spi.SyncResolver</code> that
+     * @serial The instance of <code>javax.sql.rowset.spi.SyncResolver</code> that
      * this <code>SyncProviderException</code> object will return when its
      * <code>getSyncResolver</code> method is called.
      */
diff --git a/src/java.sql/share/classes/java/sql/SQLClientInfoException.java b/src/java.sql/share/classes/java/sql/SQLClientInfoException.java
index 59a479b8056..fdffd2fc931 100644
--- a/src/java.sql/share/classes/java/sql/SQLClientInfoException.java
+++ b/src/java.sql/share/classes/java/sql/SQLClientInfoException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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 @@ import java.util.Map;
 public class SQLClientInfoException extends SQLException {
 
         /**
-         * A {@code Map} containing the client info properties that could not be set.
+         * @serial A {@code Map} containing the client info properties that could not be set.
          */
         @SuppressWarnings("serial") // Not statically typed as Serializable
         private Map<String, ClientInfoStatus>   failedProperties;
diff --git a/src/java.sql/share/classes/javax/sql/StatementEvent.java b/src/java.sql/share/classes/javax/sql/StatementEvent.java
index 6588bebfd40..68b0ebeb5e9 100644
--- a/src/java.sql/share/classes/javax/sql/StatementEvent.java
+++ b/src/java.sql/share/classes/javax/sql/StatementEvent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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,12 +44,12 @@ public class StatementEvent extends EventObject {
 
         static final long serialVersionUID = -8089573731826608315L;
         /**
-         * The {@code SQLException} the driver is about to throw to the application.
+         * @serial The {@code SQLException} the driver is about to throw to the application.
          */
         private SQLException            exception;
 
         /**
-         * The {@code PreparedStatement} that is being closed or is invalid.
+         * @serial The {@code PreparedStatement} that is being closed or is invalid.
          */
         @SuppressWarnings("serial") // Not statically typed as Serializable
         private PreparedStatement       statement;
diff --git a/src/java.xml.crypto/share/classes/javax/xml/crypto/URIReferenceException.java b/src/java.xml.crypto/share/classes/javax/xml/crypto/URIReferenceException.java
index df56fd3105a..766d10ee0a6 100644
--- a/src/java.xml.crypto/share/classes/javax/xml/crypto/URIReferenceException.java
+++ b/src/java.xml.crypto/share/classes/javax/xml/crypto/URIReferenceException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -58,7 +58,7 @@ public class URIReferenceException extends Exception {
     private Throwable cause;
 
     /**
-     * The {@code URIReference} that was being dereferenced
+     * @serial The {@code URIReference} that was being dereferenced
      * when the exception was thrown, or {@code null} if not specified.
      */
     @SuppressWarnings("serial") // Type of field is not Serializable
diff --git a/src/java.xml/share/classes/javax/xml/namespace/QName.java b/src/java.xml/share/classes/javax/xml/namespace/QName.java
index aaab6ae5333..8fb3e15d2bd 100644
--- a/src/java.xml/share/classes/javax/xml/namespace/QName.java
+++ b/src/java.xml/share/classes/javax/xml/namespace/QName.java
@@ -70,17 +70,17 @@ public class QName implements Serializable {
     private static final long serialVersionUID = -9120448754896609940L;
 
     /**
-     * <p>Namespace URI of this <code>QName</code>.</p>
+     * @serial <p>Namespace URI of this <code>QName</code>.</p>
      */
     private final String namespaceURI;
 
     /**
-     * <p>local part of this <code>QName</code>.</p>
+     * @serial <p>local part of this <code>QName</code>.</p>
      */
     private final String localPart;
 
     /**
-     * <p>prefix of this <code>QName</code>.</p>
+     * @serial <p>prefix of this <code>QName</code>.</p>
      */
     private final String prefix;
 
diff --git a/src/java.xml/share/classes/javax/xml/parsers/FactoryConfigurationError.java b/src/java.xml/share/classes/javax/xml/parsers/FactoryConfigurationError.java
index 67a0152e761..cc17030c3a4 100644
--- a/src/java.xml/share/classes/javax/xml/parsers/FactoryConfigurationError.java
+++ b/src/java.xml/share/classes/javax/xml/parsers/FactoryConfigurationError.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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 @@ public class FactoryConfigurationError extends Error {
     private static final long serialVersionUID = -827108682472263355L;
 
     /**
-     *<code>Exception</code> that represents the error.
+     * @serial <code>Exception</code> that represents the error.
      */
     private Exception exception;
 
diff --git a/src/java.xml/share/classes/javax/xml/stream/FactoryConfigurationError.java b/src/java.xml/share/classes/javax/xml/stream/FactoryConfigurationError.java
index e882914b622..9a479a150c4 100644
--- a/src/java.xml/share/classes/javax/xml/stream/FactoryConfigurationError.java
+++ b/src/java.xml/share/classes/javax/xml/stream/FactoryConfigurationError.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -37,7 +37,7 @@ public class FactoryConfigurationError extends Error {
     private static final long serialVersionUID = -2994412584589975744L;
 
   /**
-   * The nested exception.
+   * @serial The nested exception.
    */
   Exception nested;
 
diff --git a/src/java.xml/share/classes/javax/xml/stream/XMLStreamException.java b/src/java.xml/share/classes/javax/xml/stream/XMLStreamException.java
index a6bac73e528..e529e8a839c 100644
--- a/src/java.xml/share/classes/javax/xml/stream/XMLStreamException.java
+++ b/src/java.xml/share/classes/javax/xml/stream/XMLStreamException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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,11 +39,15 @@ public class XMLStreamException extends Exception {
 
   /**
    * The nested exception.
+   *
+   * @serial
    */
   protected Throwable nested;
 
   /**
    * The location of the error.
+   *
+   * @serial
    */
   @SuppressWarnings("serial") // Type of field is not Serializable
   protected Location location;
diff --git a/src/java.xml/share/classes/javax/xml/transform/TransformerException.java b/src/java.xml/share/classes/javax/xml/transform/TransformerException.java
index 2e01dc00361..292486f4d5d 100644
--- a/src/java.xml/share/classes/javax/xml/transform/TransformerException.java
+++ b/src/java.xml/share/classes/javax/xml/transform/TransformerException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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 @@ public class TransformerException extends Exception {
 
     private static final long serialVersionUID = 975798773772956428L;
 
-    /** Field locator specifies where the error occurred */
+    /** @serial Field locator specifies where the error occurred */
     @SuppressWarnings("serial") // Type of field is not Serializable
     SourceLocator locator;
 
@@ -68,7 +68,7 @@ public class TransformerException extends Exception {
         this.locator = location;
     }
 
-    /** Field containedException specifies a wrapped exception.  May be null. */
+    /** @serial Field containedException specifies a wrapped exception.  May be null. */
     Throwable containedException;
 
     /**
diff --git a/src/java.xml/share/classes/javax/xml/transform/TransformerFactoryConfigurationError.java b/src/java.xml/share/classes/javax/xml/transform/TransformerFactoryConfigurationError.java
index 3eda99138af..a620abfdd4a 100644
--- a/src/java.xml/share/classes/javax/xml/transform/TransformerFactoryConfigurationError.java
+++ b/src/java.xml/share/classes/javax/xml/transform/TransformerFactoryConfigurationError.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -37,7 +37,7 @@ public class TransformerFactoryConfigurationError extends Error {
     private static final long serialVersionUID = -6527718720676281516L;
 
     /**
-     * <code>Exception</code> for the
+     * @serial <code>Exception</code> for the
      *  <code>TransformerFactoryConfigurationError</code>.
      */
     private Exception exception;
diff --git a/src/java.xml/share/classes/org/w3c/dom/DOMException.java b/src/java.xml/share/classes/org/w3c/dom/DOMException.java
index b49351ba621..10a4fd35a91 100644
--- a/src/java.xml/share/classes/org/w3c/dom/DOMException.java
+++ b/src/java.xml/share/classes/org/w3c/dom/DOMException.java
@@ -66,6 +66,10 @@ public class DOMException extends RuntimeException {
        super(message);
        this.code = code;
     }
+
+    /**
+     * @serial
+     */
     public short   code;
     // ExceptionCode
     /**
diff --git a/src/java.xml/share/classes/org/w3c/dom/events/EventException.java b/src/java.xml/share/classes/org/w3c/dom/events/EventException.java
index 53bb3480754..778019b09de 100644
--- a/src/java.xml/share/classes/org/w3c/dom/events/EventException.java
+++ b/src/java.xml/share/classes/org/w3c/dom/events/EventException.java
@@ -54,6 +54,9 @@ public class EventException extends RuntimeException {
        super(message);
        this.code = code;
     }
+    /**
+     * @serial
+     */
     public short   code;
     // EventExceptionCode
     /**
diff --git a/src/java.xml/share/classes/org/w3c/dom/ls/LSException.java b/src/java.xml/share/classes/org/w3c/dom/ls/LSException.java
index 61ec756ed91..80f439a8020 100644
--- a/src/java.xml/share/classes/org/w3c/dom/ls/LSException.java
+++ b/src/java.xml/share/classes/org/w3c/dom/ls/LSException.java
@@ -64,6 +64,9 @@ public class LSException extends RuntimeException {
        super(message);
        this.code = code;
     }
+    /**
+     * @serial
+     */
     public short   code;
     // LSExceptionCode
     /**
diff --git a/src/java.xml/share/classes/org/w3c/dom/ranges/RangeException.java b/src/java.xml/share/classes/org/w3c/dom/ranges/RangeException.java
index 46a4eb5d9b6..41534ae94ba 100644
--- a/src/java.xml/share/classes/org/w3c/dom/ranges/RangeException.java
+++ b/src/java.xml/share/classes/org/w3c/dom/ranges/RangeException.java
@@ -54,6 +54,9 @@ public class RangeException extends RuntimeException {
        super(message);
        this.code = code;
     }
+    /**
+     * @serial
+     */
     public short   code;
     // RangeExceptionCode
     /**
diff --git a/src/jdk.attach/share/classes/com/sun/tools/attach/AgentInitializationException.java b/src/jdk.attach/share/classes/com/sun/tools/attach/AgentInitializationException.java
index 520355c1d8b..4bf5c907280 100644
--- a/src/jdk.attach/share/classes/com/sun/tools/attach/AgentInitializationException.java
+++ b/src/jdk.attach/share/classes/com/sun/tools/attach/AgentInitializationException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -47,6 +47,7 @@ public class AgentInitializationException extends Exception {
     /** use serialVersionUID for interoperability */
     static final long serialVersionUID = -1508756333332806353L;
 
+    /** @serial */
     private int returnValue;
 
     /**
diff --git a/src/jdk.dynalink/share/classes/jdk/dynalink/beans/StaticClass.java b/src/jdk.dynalink/share/classes/jdk/dynalink/beans/StaticClass.java
index f8c6a95b2d1..3aa2dabdc59 100644
--- a/src/jdk.dynalink/share/classes/jdk/dynalink/beans/StaticClass.java
+++ b/src/jdk.dynalink/share/classes/jdk/dynalink/beans/StaticClass.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -115,7 +115,7 @@ public final class StaticClass implements Serializable {
     private static final long serialVersionUID = 1L;
 
     /**
-     * The runtime {@code Class} object whose static members this
+     * @serial The runtime {@code Class} object whose static members this
      * {@code StaticClass} represents.
      */
     private final Class<?> clazz;
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
index f918878324d..fce71e4589e 100644
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Float16.java
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Float16.java
@@ -101,6 +101,7 @@ import jdk.internal.vm.vector.Float16Math;
 public final class Float16
     extends Number
     implements Comparable<Float16> {
+    /** @serial */
     private final short value;
     private static final long serialVersionUID = 16; // May not be needed when a value class?
 
diff --git a/src/jdk.jdi/share/classes/com/sun/jdi/ClassNotLoadedException.java b/src/jdk.jdi/share/classes/com/sun/jdi/ClassNotLoadedException.java
index 51cfac7e943..07135eb8458 100644
--- a/src/jdk.jdi/share/classes/com/sun/jdi/ClassNotLoadedException.java
+++ b/src/jdk.jdi/share/classes/com/sun/jdi/ClassNotLoadedException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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,6 +71,7 @@ public class ClassNotLoadedException extends Exception {
 
     private static final long serialVersionUID = -6242978768444298722L;
 
+    /** @serial */
     private String className;
 
     public ClassNotLoadedException(String className) {
diff --git a/src/jdk.jdi/share/classes/com/sun/jdi/InternalException.java b/src/jdk.jdi/share/classes/com/sun/jdi/InternalException.java
index ab7373b3574..2161812a4bf 100644
--- a/src/jdk.jdi/share/classes/com/sun/jdi/InternalException.java
+++ b/src/jdk.jdi/share/classes/com/sun/jdi/InternalException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -36,6 +36,7 @@ public class InternalException extends RuntimeException {
 
     private static final long serialVersionUID = -9171606393104480607L;
 
+    /** @serial */
     private int errorCode;
 
     public InternalException() {
diff --git a/src/jdk.jdi/share/classes/com/sun/jdi/InvocationException.java b/src/jdk.jdi/share/classes/com/sun/jdi/InvocationException.java
index ecc1142990a..f13537d9ed9 100644
--- a/src/jdk.jdi/share/classes/com/sun/jdi/InvocationException.java
+++ b/src/jdk.jdi/share/classes/com/sun/jdi/InvocationException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -36,6 +36,7 @@ public class InvocationException extends Exception {
 
     private static final long serialVersionUID = 6066780907971918568L;
 
+    /** @serial */
     @SuppressWarnings("serial") // Not statically typed as Serializable
     ObjectReference exception;
 
diff --git a/src/jdk.jdi/share/classes/com/sun/jdi/connect/IllegalConnectorArgumentsException.java b/src/jdk.jdi/share/classes/com/sun/jdi/connect/IllegalConnectorArgumentsException.java
index 6a0dba81a04..dccf43a1bae 100644
--- a/src/jdk.jdi/share/classes/com/sun/jdi/connect/IllegalConnectorArgumentsException.java
+++ b/src/jdk.jdi/share/classes/com/sun/jdi/connect/IllegalConnectorArgumentsException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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 @@ public class IllegalConnectorArgumentsException extends Exception {
 
     private static final long serialVersionUID = -3042212603611350941L;
 
+    /** @serial */
     @SuppressWarnings("serial") // Conditionally serializable
     List<String> names;
 
diff --git a/src/jdk.jdi/share/classes/com/sun/jdi/connect/VMStartException.java b/src/jdk.jdi/share/classes/com/sun/jdi/connect/VMStartException.java
index 45850a197f4..43ffcda25b3 100644
--- a/src/jdk.jdi/share/classes/com/sun/jdi/connect/VMStartException.java
+++ b/src/jdk.jdi/share/classes/com/sun/jdi/connect/VMStartException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -38,6 +38,7 @@ public class VMStartException extends Exception {
 
     private static final long serialVersionUID = 6408644824640801020L;
 
+    /** @serial */
     @SuppressWarnings("serial") // Not statically typed as Serializable
     Process process;
 
diff --git a/src/jdk.jshell/share/classes/jdk/jshell/EvalException.java b/src/jdk.jshell/share/classes/jdk/jshell/EvalException.java
index 01721db3fa6..783368f221b 100644
--- a/src/jdk.jshell/share/classes/jdk/jshell/EvalException.java
+++ b/src/jdk.jshell/share/classes/jdk/jshell/EvalException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -43,6 +43,7 @@ package jdk.jshell;
  */
 @SuppressWarnings("serial")             // serialVersionUID intentionally omitted
 public class EvalException extends JShellException {
+    /** @serial */
     private final String exceptionClass;
 
     EvalException(String message, String exceptionClass,
diff --git a/src/jdk.jshell/share/classes/jdk/jshell/UnresolvedReferenceException.java b/src/jdk.jshell/share/classes/jdk/jshell/UnresolvedReferenceException.java
index 44c33e6a074..ab60ca36f2e 100644
--- a/src/jdk.jshell/share/classes/jdk/jshell/UnresolvedReferenceException.java
+++ b/src/jdk.jshell/share/classes/jdk/jshell/UnresolvedReferenceException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -42,6 +42,7 @@ package jdk.jshell;
 @SuppressWarnings("serial")             // serialVersionUID intentionally omitted
 public class UnresolvedReferenceException extends JShellException {
 
+    /** @serial */
     final DeclarationSnippet snippet;
 
     UnresolvedReferenceException(DeclarationSnippet snippet, StackTraceElement[] stackElements) {
diff --git a/src/jdk.jshell/share/classes/jdk/jshell/spi/ExecutionControl.java b/src/jdk.jshell/share/classes/jdk/jshell/spi/ExecutionControl.java
index 13514a1c5cf..830a354bebb 100644
--- a/src/jdk.jshell/share/classes/jdk/jshell/spi/ExecutionControl.java
+++ b/src/jdk.jshell/share/classes/jdk/jshell/spi/ExecutionControl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -302,7 +302,9 @@ public interface ExecutionControl extends AutoCloseable {
     public static final class ClassBytecodes implements Serializable {
 
         private static final long serialVersionUID = 0xC1A55B47EC0DE5L;
+        /** @serial */
         private final String name;
+        /** @serial */
         private final byte[] bytecodes;
 
         /**
@@ -389,6 +391,7 @@ public interface ExecutionControl extends AutoCloseable {
 
         private static final long serialVersionUID = 1L;
 
+        /** @serial */
         private final boolean[] installed;
 
         public ClassInstallException(String message, boolean[] installed) {
@@ -426,6 +429,7 @@ public interface ExecutionControl extends AutoCloseable {
 
         private static final long serialVersionUID = 1L;
 
+        /** @serial */
         private final String causeExceptionClass;
 
         @SuppressWarnings("this-escape")
@@ -459,6 +463,7 @@ public interface ExecutionControl extends AutoCloseable {
 
         private static final long serialVersionUID = 1L;
 
+        /** @serial */
         private final int id;
 
         /**
diff --git a/src/jdk.jshell/share/classes/jdk/jshell/spi/SPIResolutionException.java b/src/jdk.jshell/share/classes/jdk/jshell/spi/SPIResolutionException.java
index c9199ab7495..60ba33beac4 100644
--- a/src/jdk.jshell/share/classes/jdk/jshell/spi/SPIResolutionException.java
+++ b/src/jdk.jshell/share/classes/jdk/jshell/spi/SPIResolutionException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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 @@ package jdk.jshell.spi;
 @SuppressWarnings("serial")             // serialVersionUID intentionally omitted
 public class SPIResolutionException extends RuntimeException {
 
+    /** @serial */
     private final int id;
 
     /**
diff --git a/src/jdk.xml.dom/share/classes/org/w3c/dom/xpath/XPathException.java b/src/jdk.xml.dom/share/classes/org/w3c/dom/xpath/XPathException.java
index e686e06b2a4..30b85cbcdb0 100644
--- a/src/jdk.xml.dom/share/classes/org/w3c/dom/xpath/XPathException.java
+++ b/src/jdk.xml.dom/share/classes/org/w3c/dom/xpath/XPathException.java
@@ -62,6 +62,9 @@ public class XPathException extends RuntimeException {
        super(message);
        this.code = code;
     }
+    /**
+     * @serial
+     */
     public short   code;
     // XPathExceptionCode
     /**

From 8ec589390f7dc67dd883a1efddb8da32790f6591 Mon Sep 17 00:00:00 2001
From: Doug Simon <dnsimon@openjdk.org>
Date: Mon, 17 Feb 2025 19:34:29 +0000
Subject: [PATCH 033/587] 8346781: [JVMCI] Limit ServiceLoader to class
 initializers

Reviewed-by: never, yzheng
---
 .../classes/jdk/vm/ci/hotspot/Cleaner.java    |  4 +-
 .../vm/ci/hotspot/HotSpotJVMCIRuntime.java    | 53 ++++-------
 .../jdk/vm/ci/hotspot/HotSpotVMConfig.java    |  2 +-
 .../vm/ci/services/JVMCIServiceLocator.java   | 28 ++----
 .../classes/jdk/vm/ci/services/Services.java  | 89 -------------------
 .../events/JvmciShutdownEventListener.java    | 12 +--
 .../jvmci/events/JvmciShutdownEventTest.java  |  8 +-
 7 files changed, 40 insertions(+), 156 deletions(-)

diff --git a/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/Cleaner.java b/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/Cleaner.java
index b6f4395f055..87760efb8a0 100644
--- a/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/Cleaner.java
+++ b/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/Cleaner.java
@@ -36,7 +36,7 @@ import jdk.vm.ci.meta.ResolvedJavaType;
  * referenced by this might be referenced by {@link ResolvedJavaType} which is kept alive by a
  * {@link WeakReference} so we need equivalent reference strength.
  */
-abstract class Cleaner extends WeakReference<Object> {
+public abstract class Cleaner extends WeakReference<Object> {
 
     /**
      * Head of linked list of cleaners.
@@ -107,7 +107,7 @@ abstract class Cleaner extends WeakReference<Object> {
     /**
      * Remove the cleaners whose referents have become weakly reachable.
      */
-    static void clean() {
+    public static void clean() {
         Cleaner c = (Cleaner) queue.poll();
         boolean oopHandleCleared = false;
         while (c != null) {
diff --git a/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/HotSpotJVMCIRuntime.java b/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/HotSpotJVMCIRuntime.java
index bc221c46717..0943b0f8162 100644
--- a/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/HotSpotJVMCIRuntime.java
+++ b/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/HotSpotJVMCIRuntime.java
@@ -23,7 +23,6 @@
 package jdk.vm.ci.hotspot;
 
 import static jdk.vm.ci.common.InitTimer.timer;
-import static jdk.vm.ci.services.Services.IS_BUILDING_NATIVE_IMAGE;
 import static jdk.vm.ci.services.Services.IS_IN_NATIVE_IMAGE;
 
 import java.io.IOException;
@@ -453,33 +452,26 @@ public final class HotSpotJVMCIRuntime implements JVMCIRuntime {
         }
     }
 
-    private static HotSpotJVMCIBackendFactory findFactory(String architecture) {
-        Iterable<HotSpotJVMCIBackendFactory> factories = getHotSpotJVMCIBackendFactories();
-        assert factories != null : "sanity";
-        for (HotSpotJVMCIBackendFactory factory : factories) {
-            if (factory.getArchitecture().equalsIgnoreCase(architecture)) {
-                return factory;
+    /**
+     * The backend factory for the JVMCI shared library.
+     */
+    private static final HotSpotJVMCIBackendFactory backendFactory;
+    static {
+        String arch = HotSpotVMConfig.getHostArchitectureName();
+        HotSpotJVMCIBackendFactory selected = null;
+        for (HotSpotJVMCIBackendFactory factory : ServiceLoader.load(HotSpotJVMCIBackendFactory.class)) {
+            if (factory.getArchitecture().equalsIgnoreCase(arch)) {
+                if (selected != null) {
+                    throw new JVMCIError("Multiple factories available for %s: %s and %s",
+                        arch, selected, factory);
+                }
+                selected = factory;
             }
         }
-
-        throw new JVMCIError("No JVMCI runtime available for the %s architecture", architecture);
-    }
-
-    private static volatile List<HotSpotJVMCIBackendFactory> cachedHotSpotJVMCIBackendFactories;
-
-    @SuppressFBWarnings(value = "LI_LAZY_INIT_UPDATE_STATIC", justification = "not sure about this")
-    private static Iterable<HotSpotJVMCIBackendFactory> getHotSpotJVMCIBackendFactories() {
-        if (IS_IN_NATIVE_IMAGE || cachedHotSpotJVMCIBackendFactories != null) {
-            return cachedHotSpotJVMCIBackendFactories;
+        if (selected == null) {
+            throw new JVMCIError("No JVMCI runtime available for the %s architecture", arch);
         }
-        Iterable<HotSpotJVMCIBackendFactory> result = ServiceLoader.load(HotSpotJVMCIBackendFactory.class, ClassLoader.getSystemClassLoader());
-        if (IS_BUILDING_NATIVE_IMAGE) {
-            cachedHotSpotJVMCIBackendFactories = new ArrayList<>();
-            for (HotSpotJVMCIBackendFactory factory : result) {
-                cachedHotSpotJVMCIBackendFactories.add(factory);
-            }
-        }
-        return result;
+        backendFactory = selected;
     }
 
     /**
@@ -587,15 +579,8 @@ public final class HotSpotJVMCIRuntime implements JVMCIRuntime {
         // Initialize the Option values.
         Option.parse(this);
 
-        String hostArchitecture = config.getHostArchitectureName();
-
-        HotSpotJVMCIBackendFactory factory;
-        try (InitTimer t = timer("find factory:", hostArchitecture)) {
-            factory = findFactory(hostArchitecture);
-        }
-
-        try (InitTimer t = timer("create JVMCI backend:", hostArchitecture)) {
-            hostBackend = registerBackend(factory.createJVMCIBackend(this, null));
+        try (InitTimer t = timer("create JVMCI backend:", backendFactory.getArchitecture())) {
+            hostBackend = registerBackend(backendFactory.createJVMCIBackend(this, null));
         }
 
         compilerFactory = HotSpotJVMCICompilerConfig.getCompilerFactory(this);
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 5d5956a667c..e93b98042b6 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
@@ -55,7 +55,7 @@ class HotSpotVMConfig extends HotSpotVMConfigAccess {
      * Gets the host architecture name for the purpose of finding the corresponding
      * {@linkplain HotSpotJVMCIBackendFactory backend}.
      */
-    String getHostArchitectureName() {
+    static String getHostArchitectureName() {
         Architecture arch = Architecture.current();
         switch (arch) {
             case X64: return "amd64";
diff --git a/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/services/JVMCIServiceLocator.java b/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/services/JVMCIServiceLocator.java
index c155c9c8613..265b8c24f3e 100644
--- a/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/services/JVMCIServiceLocator.java
+++ b/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/services/JVMCIServiceLocator.java
@@ -22,8 +22,6 @@
  */
 package jdk.vm.ci.services;
 
-import static jdk.vm.ci.services.Services.IS_BUILDING_NATIVE_IMAGE;
-
 import java.util.ArrayList;
 import java.util.List;
 import java.util.ServiceLoader;
@@ -71,24 +69,12 @@ public abstract class JVMCIServiceLocator {
      */
     protected abstract <S> S getProvider(Class<S> service);
 
-    private static volatile List<JVMCIServiceLocator> cachedLocators;
-
-    private static Iterable<JVMCIServiceLocator> getJVMCIServiceLocators() {
-        Iterable<JVMCIServiceLocator> result = cachedLocators;
-        if (result != null) {
-            return result;
-        }
-        result = ServiceLoader.load(JVMCIServiceLocator.class, ClassLoader.getSystemClassLoader());
-        if (IS_BUILDING_NATIVE_IMAGE) {
-            ArrayList<JVMCIServiceLocator> l = new ArrayList<>();
-            for (JVMCIServiceLocator locator : result) {
-                l.add(locator);
-            }
-            l.trimToSize();
-            cachedLocators = l;
-            return l;
-        }
-        return result;
+    /**
+     * The available set of locators.
+     */
+    private static final List<JVMCIServiceLocator> locators = new ArrayList<>();
+    static {
+        ServiceLoader.load(JVMCIServiceLocator.class).forEach(locators::add);
     }
 
     /**
@@ -106,7 +92,7 @@ public abstract class JVMCIServiceLocator {
             sm.checkPermission(new JVMCIPermission());
         }
         List<S> providers = new ArrayList<>();
-        for (JVMCIServiceLocator access : getJVMCIServiceLocators()) {
+        for (JVMCIServiceLocator access : locators) {
             S provider = access.getProvider(service);
             if (provider != null) {
                 providers.add(provider);
diff --git a/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/services/Services.java b/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/services/Services.java
index d4171002247..d16a788eb14 100644
--- a/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/services/Services.java
+++ b/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/services/Services.java
@@ -22,13 +22,10 @@
  */
 package jdk.vm.ci.services;
 
-import java.util.ArrayList;
-import java.util.Formatter;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
-import java.util.ServiceLoader;
 import java.util.Set;
 import java.util.function.Consumer;
 import java.util.function.Supplier;
@@ -44,13 +41,6 @@ import jdk.internal.util.OperatingSystem;
  */
 public final class Services {
 
-    /**
-     * Guards code that should be run when building an JVMCI shared library but should be excluded
-     * from (being compiled into) the library. Such code must be directly guarded by an {@code if}
-     * statement on this field - the guard cannot be behind a method call.
-     */
-    public static final boolean IS_BUILDING_NATIVE_IMAGE = Boolean.parseBoolean(VM.getSavedProperty("jdk.vm.ci.services.aot"));
-
     /**
      * Guards code that should only be run in a JVMCI shared library. Such code must be directly
      * guarded by an {@code if} statement on this field - the guard cannot be behind a method call.
@@ -131,34 +121,6 @@ public final class Services {
         }
     }
 
-    private static final Map<Class<?>, List<?>> servicesCache = IS_BUILDING_NATIVE_IMAGE ? new HashMap<>() : null;
-
-    @SuppressWarnings("unchecked")
-    private static <S> Iterable<S> load0(Class<S> service) {
-        if (IS_IN_NATIVE_IMAGE || IS_BUILDING_NATIVE_IMAGE) {
-            List<?> list = servicesCache.get(service);
-            if (list != null) {
-                return (Iterable<S>) list;
-            }
-            if (IS_IN_NATIVE_IMAGE) {
-                throw new InternalError(String.format("No %s providers found when building native image", service.getName()));
-            }
-        }
-
-        Iterable<S> providers = ServiceLoader.load(service, ClassLoader.getSystemClassLoader());
-        if (IS_BUILDING_NATIVE_IMAGE) {
-            synchronized (servicesCache) {
-                ArrayList<S> providersList = new ArrayList<>();
-                for (S provider : providers) {
-                    providersList.add(provider);
-                }
-                servicesCache.put(service, providersList);
-                providers = providersList;
-            }
-        }
-        return providers;
-    }
-
     /**
      * Opens all JVMCI packages to {@code otherModule}.
      */
@@ -175,57 +137,6 @@ public final class Services {
         }
     }
 
-    /**
-     * Gets an {@link Iterable} of the JVMCI providers available for a given service.
-     *
-     * @throws SecurityException if a security manager is present and it denies <tt>
-     *             {@link RuntimePermission}("jvmci")</tt>
-     */
-    public static <S> Iterable<S> load(Class<S> service) {
-        @SuppressWarnings("removal")
-        SecurityManager sm = System.getSecurityManager();
-        if (sm != null) {
-            sm.checkPermission(new JVMCIPermission());
-        }
-        return load0(service);
-    }
-
-    /**
-     * Gets the JVMCI provider for a given service for which at most one provider must be available.
-     *
-     * @param service the service whose provider is being requested
-     * @param required specifies if an {@link InternalError} should be thrown if no provider of
-     *            {@code service} is available
-     * @throws SecurityException if a security manager is present and it denies <tt>
-     *             {@link RuntimePermission}("jvmci")</tt>
-     */
-    public static <S> S loadSingle(Class<S> service, boolean required) {
-        @SuppressWarnings("removal")
-        SecurityManager sm = System.getSecurityManager();
-        if (sm != null) {
-            sm.checkPermission(new JVMCIPermission());
-        }
-        Iterable<S> providers = load0(service);
-
-        S singleProvider = null;
-        for (S provider : providers) {
-            if (singleProvider != null) {
-                throw new InternalError(String.format("Multiple %s providers found: %s, %s", service.getName(), singleProvider.getClass().getName(), provider.getClass().getName()));
-            }
-            singleProvider = provider;
-        }
-        if (singleProvider == null && required) {
-            String javaHome = Services.getSavedProperty("java.home");
-            String vmName = Services.getSavedProperty("java.vm.name");
-            Formatter errorMessage = new Formatter();
-            errorMessage.format("The VM does not expose required service %s.%n", service.getName());
-            errorMessage.format("Currently used Java home directory is %s.%n", javaHome);
-            errorMessage.format("Currently used VM configuration is: %s", vmName);
-            throw new UnsupportedOperationException(errorMessage.toString());
-        }
-        return singleProvider;
-    }
-
     /**
      * Creates a thread-local variable that notifies {@code onThreadTermination} when a thread
      * terminates and it has been initialized in the terminating thread (even if it was initialized
diff --git a/test/hotspot/jtreg/compiler/jvmci/events/JvmciShutdownEventListener.java b/test/hotspot/jtreg/compiler/jvmci/events/JvmciShutdownEventListener.java
index 1d855aeb4e5..59066126d87 100644
--- a/test/hotspot/jtreg/compiler/jvmci/events/JvmciShutdownEventListener.java
+++ b/test/hotspot/jtreg/compiler/jvmci/events/JvmciShutdownEventListener.java
@@ -31,11 +31,13 @@ public class JvmciShutdownEventListener extends JVMCIServiceLocator implements H
     public static final String MESSAGE = "Shutdown notified";
     public static final String GOT_INTERNAL_ERROR = "Got internal error";
 
-    public static void main(String args[]) {
-        try {
-            HotSpotJVMCIRuntime.runtime(); // let's trigger that lazy jvmci init
-        } catch (Error e) {
-            System.out.println(GOT_INTERNAL_ERROR);
+    public static class Main {
+        public static void main(String args[]) {
+            try {
+                HotSpotJVMCIRuntime.runtime(); // let's trigger that lazy jvmci init
+            } catch (Error e) {
+                System.out.println(GOT_INTERNAL_ERROR);
+            }
         }
     }
 
diff --git a/test/hotspot/jtreg/compiler/jvmci/events/JvmciShutdownEventTest.java b/test/hotspot/jtreg/compiler/jvmci/events/JvmciShutdownEventTest.java
index 0242f548cca..0f0d34bf2d8 100644
--- a/test/hotspot/jtreg/compiler/jvmci/events/JvmciShutdownEventTest.java
+++ b/test/hotspot/jtreg/compiler/jvmci/events/JvmciShutdownEventTest.java
@@ -53,11 +53,11 @@ import jdk.test.lib.process.ExitCode;
 import jdk.test.lib.cli.CommandLineOptionTest;
 
 public class JvmciShutdownEventTest {
-    private final static String[] MESSAGE = new String[]{
+    private final static String[] MESSAGE = {
         JvmciShutdownEventListener.MESSAGE
     };
 
-    private final static String[] ERROR_MESSAGE = new String[]{
+    private final static String[] ERROR_MESSAGE = {
         JvmciShutdownEventListener.GOT_INTERNAL_ERROR
     };
 
@@ -68,7 +68,7 @@ public class JvmciShutdownEventTest {
                 "Unexpected output with +EnableJVMCI", ExitCode.OK,
                 addTestVMOptions, "-XX:+UnlockExperimentalVMOptions",
                 "-XX:+EnableJVMCI", "-XX:-UseJVMCICompiler", "-Xbootclasspath/a:.",
-                JvmciShutdownEventListener.class.getName()
+                JvmciShutdownEventListener.Main.class.getName()
         );
 
         CommandLineOptionTest.verifyJVMStartup(ERROR_MESSAGE, MESSAGE,
@@ -76,7 +76,7 @@ public class JvmciShutdownEventTest {
                 "Unexpected output with -EnableJVMCI", ExitCode.OK,
                 addTestVMOptions, "-XX:+UnlockExperimentalVMOptions",
                 "-XX:-EnableJVMCI", "-XX:-UseJVMCICompiler", "-Xbootclasspath/a:.",
-                JvmciShutdownEventListener.class.getName()
+                JvmciShutdownEventListener.Main.class.getName()
         );
     }
 }

From 8df804005ed772936fd77a4c0335a5620f909570 Mon Sep 17 00:00:00 2001
From: Fei Yang <fyang@openjdk.org>
Date: Tue, 18 Feb 2025 00:19:46 +0000
Subject: [PATCH 034/587] 8350093: RISC-V:
 java/math/BigInteger/LargeValueExceptions.java timeout with COH

Reviewed-by: mli, fjiang
---
 .../cpu/riscv/macroAssembler_riscv.cpp        | 21 +++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/src/hotspot/cpu/riscv/macroAssembler_riscv.cpp b/src/hotspot/cpu/riscv/macroAssembler_riscv.cpp
index b7d1f869f98..4276595ffcc 100644
--- a/src/hotspot/cpu/riscv/macroAssembler_riscv.cpp
+++ b/src/hotspot/cpu/riscv/macroAssembler_riscv.cpp
@@ -5484,21 +5484,31 @@ void MacroAssembler::multiply_to_len(Register x, Register xlen, Register y, Regi
   const Register jdx = tmp1;
 
   if (AvoidUnalignedAccesses) {
-    // Check if x and y are both 8-byte aligned.
-    orr(t0, xlen, ylen);
-    test_bit(t0, t0, 0);
-    beqz(t0, L_multiply_64_x_64_loop);
+    int base_offset = arrayOopDesc::base_offset_in_bytes(T_INT);
+    assert((base_offset % (UseCompactObjectHeaders ? 4 :
+                           (UseCompressedClassPointers ? 8 : 4))) == 0, "Must be");
+
+    if ((base_offset % 8) == 0) {
+      // multiply_64_x_64_loop emits 8-byte load/store to access two elements
+      // at a time from int arrays x and y. When base_offset is 8 bytes, these
+      // accesses are naturally aligned if both xlen and ylen are even numbers.
+      orr(t0, xlen, ylen);
+      test_bit(t0, t0, 0);
+      beqz(t0, L_multiply_64_x_64_loop);
+    }
+
+    Label L_second_loop_unaligned, L_third_loop, L_third_loop_exit;
 
     multiply_32_x_32_loop(x, xstart, x_xstart, y, y_idx, z, carry, product, idx, kdx);
     shadd(t0, xstart, z, t0, LogBytesPerInt);
     sw(carry, Address(t0, 0));
 
-    Label L_second_loop_unaligned;
     bind(L_second_loop_unaligned);
     mv(carry, zr);
     mv(jdx, ylen);
     subiw(xstart, xstart, 1);
     bltz(xstart, L_done);
+
     subi(sp, sp, 2 * wordSize);
     sd(z, Address(sp, 0));
     sd(zr, Address(sp, wordSize));
@@ -5506,7 +5516,6 @@ void MacroAssembler::multiply_to_len(Register x, Register xlen, Register y, Regi
     addi(z, t0, 4);
     shadd(t0, xstart, x, t0, LogBytesPerInt);
     lwu(product, Address(t0, 0));
-    Label L_third_loop, L_third_loop_exit;
 
     blez(jdx, L_third_loop_exit);
 

From 3353f8e0875165adbc8ee764a4c8d8817a87cd88 Mon Sep 17 00:00:00 2001
From: Stefan Karlsson <stefank@openjdk.org>
Date: Tue, 18 Feb 2025 07:51:45 +0000
Subject: [PATCH 035/587] 8349652: Rewire nmethod oop load barriers

Reviewed-by: kvn, aboldtch
---
 src/hotspot/share/code/nmethod.cpp            |  8 ++++--
 .../share/gc/shared/barrierSetNMethod.cpp     |  8 ++++++
 .../share/gc/shared/barrierSetNMethod.hpp     |  4 +++
 src/hotspot/share/gc/z/zBarrierSet.inline.hpp |  6 +----
 src/hotspot/share/gc/z/zBarrierSetNMethod.cpp |  8 ++++++
 src/hotspot/share/gc/z/zBarrierSetNMethod.hpp |  3 +++
 src/hotspot/share/gc/z/zNMethod.cpp           | 24 ++++++++++-------
 src/hotspot/share/gc/z/zNMethod.hpp           |  6 ++++-
 src/hotspot/share/oops/access.hpp             |  6 -----
 src/hotspot/share/oops/accessDecorators.hpp   | 26 +++++++++----------
 10 files changed, 62 insertions(+), 37 deletions(-)

diff --git a/src/hotspot/share/code/nmethod.cpp b/src/hotspot/share/code/nmethod.cpp
index 283970afa69..e454d8f3f68 100644
--- a/src/hotspot/share/code/nmethod.cpp
+++ b/src/hotspot/share/code/nmethod.cpp
@@ -2143,14 +2143,18 @@ oop nmethod::oop_at(int index) const {
   if (index == 0) {
     return nullptr;
   }
-  return NMethodAccess<AS_NO_KEEPALIVE>::oop_load(oop_addr_at(index));
+
+  BarrierSetNMethod* bs_nm = BarrierSet::barrier_set()->barrier_set_nmethod();
+  return bs_nm->oop_load_no_keepalive(this, index);
 }
 
 oop nmethod::oop_at_phantom(int index) const {
   if (index == 0) {
     return nullptr;
   }
-  return NMethodAccess<ON_PHANTOM_OOP_REF>::oop_load(oop_addr_at(index));
+
+  BarrierSetNMethod* bs_nm = BarrierSet::barrier_set()->barrier_set_nmethod();
+  return bs_nm->oop_load_phantom(this, index);
 }
 
 //
diff --git a/src/hotspot/share/gc/shared/barrierSetNMethod.cpp b/src/hotspot/share/gc/shared/barrierSetNMethod.cpp
index 4b81f321be3..c5d8a7e5401 100644
--- a/src/hotspot/share/gc/shared/barrierSetNMethod.cpp
+++ b/src/hotspot/share/gc/shared/barrierSetNMethod.cpp
@@ -212,3 +212,11 @@ bool BarrierSetNMethod::nmethod_osr_entry_barrier(nmethod* nm) {
   OrderAccess::cross_modify_fence();
   return result;
 }
+
+oop BarrierSetNMethod::oop_load_no_keepalive(const nmethod* nm, int index) {
+  return NativeAccess<AS_NO_KEEPALIVE>::oop_load(nm->oop_addr_at(index));
+}
+
+oop BarrierSetNMethod::oop_load_phantom(const nmethod* nm, int index) {
+  return NativeAccess<ON_PHANTOM_OOP_REF>::oop_load(nm->oop_addr_at(index));
+}
diff --git a/src/hotspot/share/gc/shared/barrierSetNMethod.hpp b/src/hotspot/share/gc/shared/barrierSetNMethod.hpp
index d003abe9bbe..756dc43b3f1 100644
--- a/src/hotspot/share/gc/shared/barrierSetNMethod.hpp
+++ b/src/hotspot/share/gc/shared/barrierSetNMethod.hpp
@@ -26,6 +26,7 @@
 #define SHARE_GC_SHARED_BARRIERSETNMETHOD_HPP
 
 #include "memory/allocation.hpp"
+#include "oops/oopsHierarchy.hpp"
 #include "utilities/formatBuffer.hpp"
 #include "utilities/globalDefinitions.hpp"
 #include "utilities/sizes.hpp"
@@ -57,6 +58,9 @@ public:
 
   void arm_all_nmethods();
 
+  virtual oop oop_load_no_keepalive(const nmethod* nm, int index);
+  virtual oop oop_load_phantom(const nmethod* nm, int index);
+
 #if INCLUDE_JVMCI
   bool verify_barrier(nmethod* nm, FormatBuffer<>& msg);
 #endif
diff --git a/src/hotspot/share/gc/z/zBarrierSet.inline.hpp b/src/hotspot/share/gc/z/zBarrierSet.inline.hpp
index 174cdfd9e90..f7baf85efbf 100644
--- a/src/hotspot/share/gc/z/zBarrierSet.inline.hpp
+++ b/src/hotspot/share/gc/z/zBarrierSet.inline.hpp
@@ -473,11 +473,7 @@ template <DecoratorSet decorators, typename BarrierSetT>
 inline oop ZBarrierSet::AccessBarrier<decorators, BarrierSetT>::oop_load_not_in_heap(oop* p) {
   verify_decorators_absent<ON_UNKNOWN_OOP_REF>();
 
-  if (HasDecorator<decorators, IN_NMETHOD>::value) {
-    return ZNMethod::load_oop(p, decorators);
-  } else {
-    return oop_load_not_in_heap((zpointer*)p);
-  }
+  return oop_load_not_in_heap((zpointer*)p);
 }
 
 template <DecoratorSet decorators, typename BarrierSetT>
diff --git a/src/hotspot/share/gc/z/zBarrierSetNMethod.cpp b/src/hotspot/share/gc/z/zBarrierSetNMethod.cpp
index cdb17018756..0d6be2b789f 100644
--- a/src/hotspot/share/gc/z/zBarrierSetNMethod.cpp
+++ b/src/hotspot/share/gc/z/zBarrierSetNMethod.cpp
@@ -97,3 +97,11 @@ int* ZBarrierSetNMethod::disarmed_guard_value_address() const {
 ByteSize ZBarrierSetNMethod::thread_disarmed_guard_value_offset() const {
   return ZThreadLocalData::nmethod_disarmed_offset();
 }
+
+oop ZBarrierSetNMethod::oop_load_no_keepalive(const nmethod* nm, int index) {
+  return ZNMethod::oop_load_no_keepalive(nm, index);
+}
+
+oop ZBarrierSetNMethod::oop_load_phantom(const nmethod* nm, int index) {
+  return ZNMethod::oop_load_phantom(nm, index);
+}
diff --git a/src/hotspot/share/gc/z/zBarrierSetNMethod.hpp b/src/hotspot/share/gc/z/zBarrierSetNMethod.hpp
index ed9f06672e7..780d3772123 100644
--- a/src/hotspot/share/gc/z/zBarrierSetNMethod.hpp
+++ b/src/hotspot/share/gc/z/zBarrierSetNMethod.hpp
@@ -36,6 +36,9 @@ protected:
 public:
   virtual ByteSize thread_disarmed_guard_value_offset() const;
   virtual int* disarmed_guard_value_address() const;
+
+  virtual oop oop_load_no_keepalive(const nmethod* nm, int index);
+  virtual oop oop_load_phantom(const nmethod* nm, int index);
 };
 
 #endif // SHARE_GC_Z_ZBARRIERSETNMETHOD_HPP
diff --git a/src/hotspot/share/gc/z/zNMethod.cpp b/src/hotspot/share/gc/z/zNMethod.cpp
index 26f2ab96946..4ae440ea231 100644
--- a/src/hotspot/share/gc/z/zNMethod.cpp
+++ b/src/hotspot/share/gc/z/zNMethod.cpp
@@ -305,26 +305,32 @@ uintptr_t ZNMethod::color(nmethod* nm) {
   return (uintptr_t)bs_nm->guard_value(nm);
 }
 
-oop ZNMethod::load_oop(oop* p, DecoratorSet decorators) {
-  assert((decorators & ON_WEAK_OOP_REF) == 0,
-         "nmethod oops have phantom strength, not weak");
-  nmethod* const nm = CodeCache::find_nmethod((void*)p);
-  assert(nm != nullptr, "did not find nmethod");
+oop ZNMethod::oop_load_no_keepalive(const nmethod* nm, int index) {
+  return oop_load(nm, index, false /* keep_alive */);
+}
+
+oop ZNMethod::oop_load_phantom(const nmethod* nm, int index) {
+  return oop_load(nm, index, true /* keep_alive */);
+}
+
+oop ZNMethod::oop_load(const nmethod* const_nm, int index, bool keep_alive) {
+  // The rest of the code is not ready to handle const nmethod, so cast it away
+  // until we are more consistent with our const corectness.
+  nmethod* nm = const_cast<nmethod*>(const_nm);
+
   if (!is_armed(nm)) {
     // If the nmethod entry barrier isn't armed, then it has been applied
     // already. The implication is that the contents of the memory location
     // is already a valid oop, and the barrier would have kept it alive if
     // necessary. Therefore, no action is required, and we are allowed to
     // simply read the oop.
-    return *p;
+    return *nm->oop_addr_at(index);
   }
 
-  const bool keep_alive = (decorators & ON_PHANTOM_OOP_REF) != 0 &&
-                          (decorators & AS_NO_KEEPALIVE) == 0;
   ZLocker<ZReentrantLock> locker(ZNMethod::lock_for_nmethod(nm));
 
   // Make a local root
-  zaddress_unsafe obj = *ZUncoloredRoot::cast(p);
+  zaddress_unsafe obj = *ZUncoloredRoot::cast(nm->oop_addr_at(index));
 
   if (keep_alive) {
     ZUncoloredRoot::process(&obj, ZNMethod::color(nm));
diff --git a/src/hotspot/share/gc/z/zNMethod.hpp b/src/hotspot/share/gc/z/zNMethod.hpp
index 2c92e1f5efb..5d797f3fd55 100644
--- a/src/hotspot/share/gc/z/zNMethod.hpp
+++ b/src/hotspot/share/gc/z/zNMethod.hpp
@@ -42,6 +42,8 @@ private:
   static void log_unregister(const nmethod* nm);
   static void log_purge(const nmethod* nm);
 
+  static oop oop_load(const nmethod* nm, int index, bool keep_alive);
+
 public:
   static void register_nmethod(nmethod* nm);
   static void unregister_nmethod(nmethod* nm);
@@ -69,7 +71,9 @@ public:
   static void purge();
 
   static uintptr_t color(nmethod* nm);
-  static oop load_oop(oop* p, DecoratorSet decorators);
+
+  static oop oop_load_no_keepalive(const nmethod* nm, int index);
+  static oop oop_load_phantom(const nmethod* nm, int index);
 };
 
 #endif // SHARE_GC_Z_ZNMETHOD_HPP
diff --git a/src/hotspot/share/oops/access.hpp b/src/hotspot/share/oops/access.hpp
index 34393462d03..917627f445e 100644
--- a/src/hotspot/share/oops/access.hpp
+++ b/src/hotspot/share/oops/access.hpp
@@ -284,11 +284,6 @@ class HeapAccess: public Access<IN_HEAP | decorators> {};
 template <DecoratorSet decorators = DECORATORS_NONE>
 class NativeAccess: public Access<IN_NATIVE | decorators> {};
 
-// Helper for performing accesses in nmethods. These accesses
-// may resolve an accessor on a GC barrier set.
-template <DecoratorSet decorators = DECORATORS_NONE>
-class NMethodAccess: public Access<IN_NMETHOD | decorators> {};
-
 // Helper for array access.
 template <DecoratorSet decorators = DECORATORS_NONE>
 class ArrayAccess: public HeapAccess<IS_ARRAY | decorators> {
@@ -366,7 +361,6 @@ void Access<decorators>::verify_decorators() {
   const DecoratorSet location_decorators = decorators & IN_DECORATOR_MASK;
   STATIC_ASSERT(location_decorators == 0 || ( // make sure location decorators are disjoint if set
     (location_decorators ^ IN_NATIVE) == 0 ||
-    (location_decorators ^ IN_NMETHOD) == 0 ||
     (location_decorators ^ IN_HEAP) == 0
   ));
 }
diff --git a/src/hotspot/share/oops/accessDecorators.hpp b/src/hotspot/share/oops/accessDecorators.hpp
index fc5860d6487..3d89b5c4334 100644
--- a/src/hotspot/share/oops/accessDecorators.hpp
+++ b/src/hotspot/share/oops/accessDecorators.hpp
@@ -173,11 +173,9 @@ const DecoratorSet ON_DECORATOR_MASK  = ON_STRONG_OOP_REF | ON_WEAK_OOP_REF |
 // * IN_HEAP: The access is performed in the heap. Many barriers such as card marking will
 //   be omitted if this decorator is not set.
 // * IN_NATIVE: The access is performed in an off-heap data structure.
-// * IN_NMETHOD: The access is performed inside of an nmethod.
 const DecoratorSet IN_HEAP            = UCONST64(1) << 18;
 const DecoratorSet IN_NATIVE          = UCONST64(1) << 19;
-const DecoratorSet IN_NMETHOD         = UCONST64(1) << 20;
-const DecoratorSet IN_DECORATOR_MASK  = IN_HEAP | IN_NATIVE | IN_NMETHOD;
+const DecoratorSet IN_DECORATOR_MASK  = IN_HEAP | IN_NATIVE;
 
 // == Boolean Flag Decorators ==
 // * IS_ARRAY: The access is performed on a heap allocated array. This is sometimes a special case
@@ -185,9 +183,9 @@ const DecoratorSet IN_DECORATOR_MASK  = IN_HEAP | IN_NATIVE | IN_NMETHOD;
 // * IS_DEST_UNINITIALIZED: This property can be important to e.g. SATB barriers by
 //   marking that the previous value is uninitialized nonsense rather than a real value.
 // * IS_NOT_NULL: This property can make certain barriers faster such as compressing oops.
-const DecoratorSet IS_ARRAY              = UCONST64(1) << 21;
-const DecoratorSet IS_DEST_UNINITIALIZED = UCONST64(1) << 22;
-const DecoratorSet IS_NOT_NULL           = UCONST64(1) << 23;
+const DecoratorSet IS_ARRAY              = UCONST64(1) << 20;
+const DecoratorSet IS_DEST_UNINITIALIZED = UCONST64(1) << 21;
+const DecoratorSet IS_NOT_NULL           = UCONST64(1) << 22;
 
 // == Arraycopy Decorators ==
 // * ARRAYCOPY_CHECKCAST: This property means that the class of the objects in source
@@ -199,11 +197,11 @@ const DecoratorSet IS_NOT_NULL           = UCONST64(1) << 23;
 // * ARRAYCOPY_ARRAYOF: The copy is in the arrayof form.
 // * ARRAYCOPY_ATOMIC: The accesses have to be atomic over the size of its elements.
 // * ARRAYCOPY_ALIGNED: The accesses have to be aligned on a HeapWord.
-const DecoratorSet ARRAYCOPY_CHECKCAST            = UCONST64(1) << 24;
-const DecoratorSet ARRAYCOPY_DISJOINT             = UCONST64(1) << 25;
-const DecoratorSet ARRAYCOPY_ARRAYOF              = UCONST64(1) << 26;
-const DecoratorSet ARRAYCOPY_ATOMIC               = UCONST64(1) << 27;
-const DecoratorSet ARRAYCOPY_ALIGNED              = UCONST64(1) << 28;
+const DecoratorSet ARRAYCOPY_CHECKCAST            = UCONST64(1) << 23;
+const DecoratorSet ARRAYCOPY_DISJOINT             = UCONST64(1) << 24;
+const DecoratorSet ARRAYCOPY_ARRAYOF              = UCONST64(1) << 25;
+const DecoratorSet ARRAYCOPY_ATOMIC               = UCONST64(1) << 26;
+const DecoratorSet ARRAYCOPY_ALIGNED              = UCONST64(1) << 27;
 const DecoratorSet ARRAYCOPY_DECORATOR_MASK       = ARRAYCOPY_CHECKCAST | ARRAYCOPY_DISJOINT |
                                                     ARRAYCOPY_DISJOINT | ARRAYCOPY_ARRAYOF |
                                                     ARRAYCOPY_ATOMIC | ARRAYCOPY_ALIGNED;
@@ -212,11 +210,11 @@ const DecoratorSet ARRAYCOPY_DECORATOR_MASK       = ARRAYCOPY_CHECKCAST | ARRAYC
 // * ACCESS_READ: Indicate that the resolved object is accessed read-only. This allows the GC
 //   backend to use weaker and more efficient barriers.
 // * ACCESS_WRITE: Indicate that the resolved object is used for write access.
-const DecoratorSet ACCESS_READ                    = UCONST64(1) << 29;
-const DecoratorSet ACCESS_WRITE                   = UCONST64(1) << 30;
+const DecoratorSet ACCESS_READ                    = UCONST64(1) << 28;
+const DecoratorSet ACCESS_WRITE                   = UCONST64(1) << 29;
 
 // Keep track of the last decorator.
-const DecoratorSet DECORATOR_LAST = UCONST64(1) << 30;
+const DecoratorSet DECORATOR_LAST = UCONST64(1) << 29;
 
 namespace AccessInternal {
   // This class adds implied decorators that follow according to decorator rules.

From 013fda1dad22d7aca3ee24c11dc42cb3885b5323 Mon Sep 17 00:00:00 2001
From: Marc Chevalier <marc.chevalier@oracle.com>
Date: Tue, 18 Feb 2025 08:43:21 +0000
Subject: [PATCH 036/587] 8348172: C2: Remove unused local variables in
 filter_helper() methods

Reviewed-by: kvn, haosun, chagedorn
---
 src/hotspot/share/opto/type.cpp | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/hotspot/share/opto/type.cpp b/src/hotspot/share/opto/type.cpp
index db6070428ce..b56e3739a9d 100644
--- a/src/hotspot/share/opto/type.cpp
+++ b/src/hotspot/share/opto/type.cpp
@@ -4019,8 +4019,6 @@ intptr_t TypeOopPtr::get_con() const {
 const Type *TypeOopPtr::filter_helper(const Type *kills, bool include_speculative) const {
 
   const Type* ft = join_helper(kills, include_speculative);
-  const TypeInstPtr* ftip = ft->isa_instptr();
-  const TypeInstPtr* ktip = kills->isa_instptr();
 
   if (ft->empty()) {
     return Type::TOP;           // Canonical empty value
@@ -5853,8 +5851,6 @@ const Type *TypeKlassPtr::filter_helper(const Type *kills, bool include_speculat
   // logic here mirrors the one from TypeOopPtr::filter. See comments
   // there.
   const Type* ft = join_helper(kills, include_speculative);
-  const TypeKlassPtr* ftkp = ft->isa_instklassptr();
-  const TypeKlassPtr* ktkp = kills->isa_instklassptr();
 
   if (ft->empty()) {
     return Type::TOP;           // Canonical empty value

From ff05d9795322fee6def559bd6776de42b96c27dc Mon Sep 17 00:00:00 2001
From: Marc Chevalier <marc.chevalier@oracle.com>
Date: Tue, 18 Feb 2025 09:25:24 +0000
Subject: [PATCH 037/587] 8349180: Remove redundant initialization in ciField
 constructor

Reviewed-by: chagedorn
---
 src/hotspot/share/ci/ciField.cpp | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/hotspot/share/ci/ciField.cpp b/src/hotspot/share/ci/ciField.cpp
index 44d7fa37960..cbe0cadbc93 100644
--- a/src/hotspot/share/ci/ciField.cpp
+++ b/src/hotspot/share/ci/ciField.cpp
@@ -102,8 +102,6 @@ ciField::ciField(ciInstanceKlass* klass, int index, Bytecodes::Code bc) :
     _type = ciType::make(field_type);
   }
 
-  _name = (ciSymbol*)ciEnv::current(THREAD)->get_symbol(name);
-
   // Get the field's declared holder.
   //
   // Note: we actually create a ciInstanceKlass for this klass,

From 160db5f0f000f8471f71e0725da862d57db28c8a Mon Sep 17 00:00:00 2001
From: Afshin Zafari <azafari@openjdk.org>
Date: Tue, 18 Feb 2025 09:56:38 +0000
Subject: [PATCH 038/587] 8340110: Ubsan: verifier.cpp:2043:19: runtime error:
 shift exponent 100 is too large for 32-bit type 'int'

Reviewed-by: dholmes, jsjolen
---
 src/hotspot/share/classfile/verifier.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/hotspot/share/classfile/verifier.cpp b/src/hotspot/share/classfile/verifier.cpp
index 95e5f55c172..1e9bdcc682d 100644
--- a/src/hotspot/share/classfile/verifier.cpp
+++ b/src/hotspot/share/classfile/verifier.cpp
@@ -2037,7 +2037,8 @@ void ClassVerifier::verify_cp_type(
 
   verify_cp_index(bci, cp, index, CHECK_VERIFY(this));
   unsigned int tag = cp->tag_at(index).value();
-  if ((types & (1 << tag)) == 0) {
+  // tags up to JVM_CONSTANT_ExternalMax are verifiable and valid for shift op
+  if (tag > JVM_CONSTANT_ExternalMax || (types & (1 << tag)) == 0) {
     verify_error(ErrorContext::bad_cp_index(bci, index),
       "Illegal type at constant pool entry %d in class %s",
       index, cp->pool_holder()->external_name());

From d7baae3ee92bbc94e380703f173a4d4a9de75e29 Mon Sep 17 00:00:00 2001
From: SendaoYan <syan@openjdk.org>
Date: Tue, 18 Feb 2025 09:56:49 +0000
Subject: [PATCH 039/587] 8350178: Incorrect comment after JDK-8345580

Reviewed-by: chagedorn, kvn
---
 src/hotspot/share/opto/node.hpp | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/hotspot/share/opto/node.hpp b/src/hotspot/share/opto/node.hpp
index a2ea0b4939f..2e52c12e4e8 100644
--- a/src/hotspot/share/opto/node.hpp
+++ b/src/hotspot/share/opto/node.hpp
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2024, Alibaba Group Holding Limited. All rights reserved.
+ * Copyright (c) 2024, 2025, Alibaba Group Holding Limited. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -337,11 +337,9 @@ protected:
   void out_grow( uint len );
 
  public:
-  // Each Node is assigned a unique small/dense number.  This number is used
+  // Each Node is assigned a unique small/dense number. This number is used
   // to index into auxiliary arrays of data and bit vectors.
-  // The field _idx is declared constant to defend against inadvertent assignments,
-  // since it is used by clients as a naked field. However, the field's value can be
-  // changed using the set_idx() method.
+  // The value of _idx can be changed using the set_idx() method.
   //
   // The PhaseRenumberLive phase renumbers nodes based on liveness information.
   // Therefore, it updates the value of the _idx field. The parse-time _idx is

From 8193e0d53ac806d6974e2aacc7b7476aeb52a5fd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Roberto=20Casta=C3=B1eda=20Lozano?=
 <rcastanedalo@openjdk.org>
Date: Tue, 18 Feb 2025 10:23:35 +0000
Subject: [PATCH 040/587] 8346280: C2: implement late barrier elision for G1

Reviewed-by: tschatzl, aboldtch, mdoerr
---
 src/hotspot/share/gc/g1/c2/g1BarrierSetC2.cpp |  57 +++
 src/hotspot/share/gc/g1/c2/g1BarrierSetC2.hpp |   6 +-
 .../share/gc/shared/c2/barrierSetC2.cpp       | 256 ++++++++++++
 .../share/gc/shared/c2/barrierSetC2.hpp       |  10 +-
 .../gc/shared/c2/cardTableBarrierSetC2.cpp    |   2 +-
 .../gc/shared/c2/cardTableBarrierSetC2.hpp    |   2 +-
 src/hotspot/share/gc/z/c2/zBarrierSetC2.cpp   | 269 +------------
 src/hotspot/share/gc/z/c2/zBarrierSetC2.hpp   |   4 +-
 .../gcbarriers/TestG1BarrierGeneration.java   | 375 +++++++++++++++++-
 9 files changed, 693 insertions(+), 288 deletions(-)

diff --git a/src/hotspot/share/gc/g1/c2/g1BarrierSetC2.cpp b/src/hotspot/share/gc/g1/c2/g1BarrierSetC2.cpp
index 7999efe54bf..71fd3ec6610 100644
--- a/src/hotspot/share/gc/g1/c2/g1BarrierSetC2.cpp
+++ b/src/hotspot/share/gc/g1/c2/g1BarrierSetC2.cpp
@@ -529,8 +529,65 @@ int G1BarrierSetC2::get_store_barrier(C2Access& access) const {
   return barriers;
 }
 
+void G1BarrierSetC2::elide_dominated_barrier(MachNode* mach) const {
+  uint8_t barrier_data = mach->barrier_data();
+  barrier_data &= ~G1C2BarrierPre;
+  if (CardTableBarrierSetC2::use_ReduceInitialCardMarks()) {
+    barrier_data &= ~G1C2BarrierPost;
+    barrier_data &= ~G1C2BarrierPostNotNull;
+  }
+  mach->set_barrier_data(barrier_data);
+}
+
+void G1BarrierSetC2::analyze_dominating_barriers() const {
+  ResourceMark rm;
+  PhaseCFG* const cfg = Compile::current()->cfg();
+
+  // Find allocations and memory accesses (stores and atomic operations), and
+  // track them in lists.
+  Node_List accesses;
+  Node_List allocations;
+  for (uint i = 0; i < cfg->number_of_blocks(); ++i) {
+    const Block* const block = cfg->get_block(i);
+    for (uint j = 0; j < block->number_of_nodes(); ++j) {
+      Node* const node = block->get_node(j);
+      if (node->is_Phi()) {
+        if (BarrierSetC2::is_allocation(node)) {
+          allocations.push(node);
+        }
+        continue;
+      } else if (!node->is_Mach()) {
+        continue;
+      }
+
+      MachNode* const mach = node->as_Mach();
+      switch (mach->ideal_Opcode()) {
+      case Op_StoreP:
+      case Op_StoreN:
+      case Op_CompareAndExchangeP:
+      case Op_CompareAndSwapP:
+      case Op_GetAndSetP:
+      case Op_CompareAndExchangeN:
+      case Op_CompareAndSwapN:
+      case Op_GetAndSetN:
+        if (mach->barrier_data() != 0) {
+          accesses.push(mach);
+        }
+        break;
+      default:
+        break;
+      }
+    }
+  }
+
+  // Find dominating allocations for each memory access (store or atomic
+  // operation) and elide barriers if there is no safepoint poll in between.
+  elide_dominated_barriers(accesses, allocations);
+}
+
 void G1BarrierSetC2::late_barrier_analysis() const {
   compute_liveness_at_stubs();
+  analyze_dominating_barriers();
 }
 
 void G1BarrierSetC2::emit_stubs(CodeBuffer& cb) const {
diff --git a/src/hotspot/share/gc/g1/c2/g1BarrierSetC2.hpp b/src/hotspot/share/gc/g1/c2/g1BarrierSetC2.hpp
index 81e67df29ce..5f85714d889 100644
--- a/src/hotspot/share/gc/g1/c2/g1BarrierSetC2.hpp
+++ b/src/hotspot/share/gc/g1/c2/g1BarrierSetC2.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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,6 +86,9 @@ public:
 };
 
 class G1BarrierSetC2: public CardTableBarrierSetC2 {
+private:
+  void analyze_dominating_barriers() const;
+
 protected:
   bool g1_can_remove_pre_barrier(GraphKit* kit,
                                  PhaseValues* phase,
@@ -117,6 +120,7 @@ public:
                                   ArrayCopyNode* ac) const;
   virtual void* create_barrier_state(Arena* comp_arena) const;
   virtual void emit_stubs(CodeBuffer& cb) const;
+  virtual void elide_dominated_barrier(MachNode* mach) const;
   virtual void late_barrier_analysis() const;
 
 #ifndef PRODUCT
diff --git a/src/hotspot/share/gc/shared/c2/barrierSetC2.cpp b/src/hotspot/share/gc/shared/c2/barrierSetC2.cpp
index 3d59e972925..b0082b6444d 100644
--- a/src/hotspot/share/gc/shared/c2/barrierSetC2.cpp
+++ b/src/hotspot/share/gc/shared/c2/barrierSetC2.cpp
@@ -896,6 +896,262 @@ void BarrierSetC2::clone_at_expansion(PhaseMacroExpand* phase, ArrayCopyNode* ac
 
 #undef XTOP
 
+static bool block_has_safepoint(const Block* block, uint from, uint to) {
+  for (uint i = from; i < to; i++) {
+    if (block->get_node(i)->is_MachSafePoint()) {
+      // Safepoint found
+      return true;
+    }
+  }
+
+  // Safepoint not found
+  return false;
+}
+
+static bool block_has_safepoint(const Block* block) {
+  return block_has_safepoint(block, 0, block->number_of_nodes());
+}
+
+static uint block_index(const Block* block, const Node* node) {
+  for (uint j = 0; j < block->number_of_nodes(); ++j) {
+    if (block->get_node(j) == node) {
+      return j;
+    }
+  }
+  ShouldNotReachHere();
+  return 0;
+}
+
+// Look through various node aliases
+static const Node* look_through_node(const Node* node) {
+  while (node != nullptr) {
+    const Node* new_node = node;
+    if (node->is_Mach()) {
+      const MachNode* const node_mach = node->as_Mach();
+      if (node_mach->ideal_Opcode() == Op_CheckCastPP) {
+        new_node = node->in(1);
+      }
+      if (node_mach->is_SpillCopy()) {
+        new_node = node->in(1);
+      }
+    }
+    if (new_node == node || new_node == nullptr) {
+      break;
+    } else {
+      node = new_node;
+    }
+  }
+
+  return node;
+}
+
+// Whether the given offset is undefined.
+static bool is_undefined(intptr_t offset) {
+  return offset == Type::OffsetTop;
+}
+
+// Whether the given offset is unknown.
+static bool is_unknown(intptr_t offset) {
+  return offset == Type::OffsetBot;
+}
+
+// Whether the given offset is concrete (defined and compile-time known).
+static bool is_concrete(intptr_t offset) {
+  return !is_undefined(offset) && !is_unknown(offset);
+}
+
+// Compute base + offset components of the memory address accessed by mach.
+// Return a node representing the base address, or null if the base cannot be
+// found or the offset is undefined or a concrete negative value. If a non-null
+// base is returned, the offset is a concrete, nonnegative value or unknown.
+static const Node* get_base_and_offset(const MachNode* mach, intptr_t& offset) {
+  const TypePtr* adr_type = nullptr;
+  offset = 0;
+  const Node* base = mach->get_base_and_disp(offset, adr_type);
+
+  if (base == nullptr || base == NodeSentinel) {
+    return nullptr;
+  }
+
+  if (offset == 0 && base->is_Mach() && base->as_Mach()->ideal_Opcode() == Op_AddP) {
+    // The memory address is computed by 'base' and fed to 'mach' via an
+    // indirect memory operand (indicated by offset == 0). The ultimate base and
+    // offset can be fetched directly from the inputs and Ideal type of 'base'.
+    const TypeOopPtr* oopptr = base->bottom_type()->isa_oopptr();
+    if (oopptr == nullptr) return nullptr;
+    offset = oopptr->offset();
+    // Even if 'base' is not an Ideal AddP node anymore, Matcher::ReduceInst()
+    // guarantees that the base address is still available at the same slot.
+    base = base->in(AddPNode::Base);
+    assert(base != nullptr, "");
+  }
+
+  if (is_undefined(offset) || (is_concrete(offset) && offset < 0)) {
+    return nullptr;
+  }
+
+  return look_through_node(base);
+}
+
+// Whether a phi node corresponds to an array allocation.
+// This test is incomplete: in some edge cases, it might return false even
+// though the node does correspond to an array allocation.
+static bool is_array_allocation(const Node* phi) {
+  precond(phi->is_Phi());
+  // Check whether phi has a successor cast (CheckCastPP) to Java array pointer,
+  // possibly below spill copies and other cast nodes. Limit the exploration to
+  // a single path from the phi node consisting of these node types.
+  const Node* current = phi;
+  while (true) {
+    const Node* next = nullptr;
+    for (DUIterator_Fast imax, i = current->fast_outs(imax); i < imax; i++) {
+      if (!current->fast_out(i)->isa_Mach()) {
+        continue;
+      }
+      const MachNode* succ = current->fast_out(i)->as_Mach();
+      if (succ->ideal_Opcode() == Op_CheckCastPP) {
+        if (succ->get_ptr_type()->isa_aryptr()) {
+          // Cast to Java array pointer: phi corresponds to an array allocation.
+          return true;
+        }
+        // Other cast: record as candidate for further exploration.
+        next = succ;
+      } else if (succ->is_SpillCopy() && next == nullptr) {
+        // Spill copy, and no better candidate found: record as candidate.
+        next = succ;
+      }
+    }
+    if (next == nullptr) {
+      // No evidence found that phi corresponds to an array allocation, and no
+      // candidates available to continue exploring.
+      return false;
+    }
+    // Continue exploring from the best candidate found.
+    current = next;
+  }
+  ShouldNotReachHere();
+}
+
+bool BarrierSetC2::is_allocation(const Node* node) {
+  assert(node->is_Phi(), "expected phi node");
+  if (node->req() != 3) {
+    return false;
+  }
+  const Node* const fast_node = node->in(2);
+  if (!fast_node->is_Mach()) {
+    return false;
+  }
+  const MachNode* const fast_mach = fast_node->as_Mach();
+  if (fast_mach->ideal_Opcode() != Op_LoadP) {
+    return false;
+  }
+  intptr_t offset;
+  const Node* const base = get_base_and_offset(fast_mach, offset);
+  if (base == nullptr || !base->is_Mach() || !is_concrete(offset)) {
+    return false;
+  }
+  const MachNode* const base_mach = base->as_Mach();
+  if (base_mach->ideal_Opcode() != Op_ThreadLocal) {
+    return false;
+  }
+  return offset == in_bytes(Thread::tlab_top_offset());
+}
+
+void BarrierSetC2::elide_dominated_barriers(Node_List& accesses, Node_List& access_dominators) const {
+  Compile* const C = Compile::current();
+  PhaseCFG* const cfg = C->cfg();
+
+  for (uint i = 0; i < accesses.size(); i++) {
+    MachNode* const access = accesses.at(i)->as_Mach();
+    intptr_t access_offset;
+    const Node* const access_obj = get_base_and_offset(access, access_offset);
+    Block* const access_block = cfg->get_block_for_node(access);
+    const uint access_index = block_index(access_block, access);
+
+    if (access_obj == nullptr) {
+      // No information available
+      continue;
+    }
+
+    for (uint j = 0; j < access_dominators.size(); j++) {
+     const  Node* const mem = access_dominators.at(j);
+      if (mem->is_Phi()) {
+        assert(is_allocation(mem), "expected allocation phi node");
+        if (mem != access_obj) {
+          continue;
+        }
+        if (is_unknown(access_offset) && !is_array_allocation(mem)) {
+          // The accessed address has an unknown offset, but the allocated
+          // object cannot be determined to be an array. Avoid eliding in this
+          // case, to be on the safe side.
+          continue;
+        }
+        assert((is_concrete(access_offset) && access_offset >= 0) || (is_unknown(access_offset) && is_array_allocation(mem)),
+               "candidate allocation-dominated access offsets must be either concrete and nonnegative, or unknown (for array allocations only)");
+      } else {
+        // Access node
+        const MachNode* const mem_mach = mem->as_Mach();
+        intptr_t mem_offset;
+        const Node* const mem_obj = get_base_and_offset(mem_mach, mem_offset);
+
+        if (mem_obj == nullptr ||
+            !is_concrete(access_offset) ||
+            !is_concrete(mem_offset)) {
+          // No information available
+          continue;
+        }
+
+        if (mem_obj != access_obj || mem_offset != access_offset) {
+          // Not the same addresses, not a candidate
+          continue;
+        }
+        assert(is_concrete(access_offset) && access_offset >= 0,
+               "candidate non-allocation-dominated access offsets must be concrete and nonnegative");
+      }
+
+      Block* mem_block = cfg->get_block_for_node(mem);
+      const uint mem_index = block_index(mem_block, mem);
+
+      if (access_block == mem_block) {
+        // Earlier accesses in the same block
+        if (mem_index < access_index && !block_has_safepoint(mem_block, mem_index + 1, access_index)) {
+          elide_dominated_barrier(access);
+        }
+      } else if (mem_block->dominates(access_block)) {
+        // Dominating block? Look around for safepoints
+        ResourceMark rm;
+        Block_List stack;
+        VectorSet visited;
+        stack.push(access_block);
+        bool safepoint_found = block_has_safepoint(access_block);
+        while (!safepoint_found && stack.size() > 0) {
+          const Block* const block = stack.pop();
+          if (visited.test_set(block->_pre_order)) {
+            continue;
+          }
+          if (block_has_safepoint(block)) {
+            safepoint_found = true;
+            break;
+          }
+          if (block == mem_block) {
+            continue;
+          }
+
+          // Push predecessor blocks
+          for (uint p = 1; p < block->num_preds(); ++p) {
+            Block* const pred = cfg->get_block_for_node(block->pred(p));
+            stack.push(pred);
+          }
+        }
+
+        if (!safepoint_found) {
+          elide_dominated_barrier(access);
+        }
+      }
+    }
+  }
+}
+
 void BarrierSetC2::compute_liveness_at_stubs() const {
   ResourceMark rm;
   Compile* const C = Compile::current();
diff --git a/src/hotspot/share/gc/shared/c2/barrierSetC2.hpp b/src/hotspot/share/gc/shared/c2/barrierSetC2.hpp
index a78fd434ad9..7b9cb985cff 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, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -364,6 +364,14 @@ public:
   virtual bool matcher_find_shared_post_visit(Matcher* matcher, Node* n, uint opcode) const { return false; };
   virtual bool matcher_is_store_load_barrier(Node* x, uint xop) const { return false; }
 
+  // Whether the given phi node joins OOPs from fast and slow allocation paths.
+  static bool is_allocation(const Node* node);
+  // Elide GC barriers from a Mach node according to elide_dominated_barriers().
+  virtual void elide_dominated_barrier(MachNode* mach) const { }
+  // Elide GC barriers from instructions in 'accesses' if they are dominated by
+  // instructions in 'access_dominators' (according to elide_mach_barrier()) and
+  // there is no safepoint poll in between.
+  void elide_dominated_barriers(Node_List& accesses, Node_List& access_dominators) const;
   virtual void late_barrier_analysis() const { }
   virtual void compute_liveness_at_stubs() const;
   virtual int estimate_stub_size() const { return 0; }
diff --git a/src/hotspot/share/gc/shared/c2/cardTableBarrierSetC2.cpp b/src/hotspot/share/gc/shared/c2/cardTableBarrierSetC2.cpp
index 870e351db66..7df210d9fb6 100644
--- a/src/hotspot/share/gc/shared/c2/cardTableBarrierSetC2.cpp
+++ b/src/hotspot/share/gc/shared/c2/cardTableBarrierSetC2.cpp
@@ -120,7 +120,7 @@ void CardTableBarrierSetC2::post_barrier(GraphKit* kit,
   kit->final_sync(ideal);
 }
 
-bool CardTableBarrierSetC2::use_ReduceInitialCardMarks() const {
+bool CardTableBarrierSetC2::use_ReduceInitialCardMarks() {
   return ReduceInitialCardMarks;
 }
 
diff --git a/src/hotspot/share/gc/shared/c2/cardTableBarrierSetC2.hpp b/src/hotspot/share/gc/shared/c2/cardTableBarrierSetC2.hpp
index a380ec4a484..1263030a8b5 100644
--- a/src/hotspot/share/gc/shared/c2/cardTableBarrierSetC2.hpp
+++ b/src/hotspot/share/gc/shared/c2/cardTableBarrierSetC2.hpp
@@ -41,7 +41,7 @@ public:
   virtual void eliminate_gc_barrier(PhaseMacroExpand* macro, Node* node) const;
   virtual bool array_copy_requires_gc_barriers(bool tightly_coupled_alloc, BasicType type, bool is_clone, bool is_clone_instance, ArrayCopyPhase phase) const;
 
-  bool use_ReduceInitialCardMarks() const;
+  static bool use_ReduceInitialCardMarks();
 };
 
 #endif // SHARE_GC_SHARED_C2_CARDTABLEBARRIERSETC2_HPP
diff --git a/src/hotspot/share/gc/z/c2/zBarrierSetC2.cpp b/src/hotspot/share/gc/z/c2/zBarrierSetC2.cpp
index 311ea2871f7..650918e2d30 100644
--- a/src/hotspot/share/gc/z/c2/zBarrierSetC2.cpp
+++ b/src/hotspot/share/gc/z/c2/zBarrierSetC2.cpp
@@ -28,7 +28,6 @@
 #include "gc/z/zBarrierSetAssembler.hpp"
 #include "gc/z/zBarrierSetRuntime.hpp"
 #include "opto/arraycopynode.hpp"
-#include "opto/addnode.hpp"
 #include "opto/block.hpp"
 #include "opto/compile.hpp"
 #include "opto/graphKit.hpp"
@@ -38,7 +37,6 @@
 #include "opto/node.hpp"
 #include "opto/output.hpp"
 #include "opto/regalloc.hpp"
-#include "opto/rootnode.hpp"
 #include "opto/runtime.hpp"
 #include "opto/type.hpp"
 #include "utilities/debug.hpp"
@@ -475,269 +473,10 @@ void ZBarrierSetC2::clone_at_expansion(PhaseMacroExpand* phase, ArrayCopyNode* a
 
 #undef XTOP
 
-// == Dominating barrier elision ==
-
-static bool block_has_safepoint(const Block* block, uint from, uint to) {
-  for (uint i = from; i < to; i++) {
-    if (block->get_node(i)->is_MachSafePoint()) {
-      // Safepoint found
-      return true;
-    }
-  }
-
-  // Safepoint not found
-  return false;
-}
-
-static bool block_has_safepoint(const Block* block) {
-  return block_has_safepoint(block, 0, block->number_of_nodes());
-}
-
-static uint block_index(const Block* block, const Node* node) {
-  for (uint j = 0; j < block->number_of_nodes(); ++j) {
-    if (block->get_node(j) == node) {
-      return j;
-    }
-  }
-  ShouldNotReachHere();
-  return 0;
-}
-
-// Look through various node aliases
-static const Node* look_through_node(const Node* node) {
-  while (node != nullptr) {
-    const Node* new_node = node;
-    if (node->is_Mach()) {
-      const MachNode* const node_mach = node->as_Mach();
-      if (node_mach->ideal_Opcode() == Op_CheckCastPP) {
-        new_node = node->in(1);
-      }
-      if (node_mach->is_SpillCopy()) {
-        new_node = node->in(1);
-      }
-    }
-    if (new_node == node || new_node == nullptr) {
-      break;
-    } else {
-      node = new_node;
-    }
-  }
-
-  return node;
-}
-
-// Whether the given offset is undefined.
-static bool is_undefined(intptr_t offset) {
-  return offset == Type::OffsetTop;
-}
-
-// Whether the given offset is unknown.
-static bool is_unknown(intptr_t offset) {
-  return offset == Type::OffsetBot;
-}
-
-// Whether the given offset is concrete (defined and compile-time known).
-static bool is_concrete(intptr_t offset) {
-  return !is_undefined(offset) && !is_unknown(offset);
-}
-
-// Compute base + offset components of the memory address accessed by mach.
-// Return a node representing the base address, or null if the base cannot be
-// found or the offset is undefined or a concrete negative value. If a non-null
-// base is returned, the offset is a concrete, nonnegative value or unknown.
-static const Node* get_base_and_offset(const MachNode* mach, intptr_t& offset) {
-  const TypePtr* adr_type = nullptr;
-  offset = 0;
-  const Node* base = mach->get_base_and_disp(offset, adr_type);
-
-  if (base == nullptr || base == NodeSentinel) {
-    return nullptr;
-  }
-
-  if (offset == 0 && base->is_Mach() && base->as_Mach()->ideal_Opcode() == Op_AddP) {
-    // The memory address is computed by 'base' and fed to 'mach' via an
-    // indirect memory operand (indicated by offset == 0). The ultimate base and
-    // offset can be fetched directly from the inputs and Ideal type of 'base'.
-    const TypeOopPtr* oopptr = base->bottom_type()->isa_oopptr();
-    if (oopptr == nullptr) return nullptr;
-    offset = oopptr->offset();
-    // Even if 'base' is not an Ideal AddP node anymore, Matcher::ReduceInst()
-    // guarantees that the base address is still available at the same slot.
-    base = base->in(AddPNode::Base);
-    assert(base != nullptr, "");
-  }
-
-  if (is_undefined(offset) || (is_concrete(offset) && offset < 0)) {
-    return nullptr;
-  }
-
-  return look_through_node(base);
-}
-
-// Whether a phi node corresponds to an array allocation.
-// This test is incomplete: in some edge cases, it might return false even
-// though the node does correspond to an array allocation.
-static bool is_array_allocation(const Node* phi) {
-  precond(phi->is_Phi());
-  // Check whether phi has a successor cast (CheckCastPP) to Java array pointer,
-  // possibly below spill copies and other cast nodes. Limit the exploration to
-  // a single path from the phi node consisting of these node types.
-  const Node* current = phi;
-  while (true) {
-    const Node* next = nullptr;
-    for (DUIterator_Fast imax, i = current->fast_outs(imax); i < imax; i++) {
-      if (!current->fast_out(i)->isa_Mach()) {
-        continue;
-      }
-      const MachNode* succ = current->fast_out(i)->as_Mach();
-      if (succ->ideal_Opcode() == Op_CheckCastPP) {
-        if (succ->get_ptr_type()->isa_aryptr()) {
-          // Cast to Java array pointer: phi corresponds to an array allocation.
-          return true;
-        }
-        // Other cast: record as candidate for further exploration.
-        next = succ;
-      } else if (succ->is_SpillCopy() && next == nullptr) {
-        // Spill copy, and no better candidate found: record as candidate.
-        next = succ;
-      }
-    }
-    if (next == nullptr) {
-      // No evidence found that phi corresponds to an array allocation, and no
-      // candidates available to continue exploring.
-      return false;
-    }
-    // Continue exploring from the best candidate found.
-    current = next;
-  }
-  ShouldNotReachHere();
-}
-
-// Match the phi node that connects a TLAB allocation fast path with its slowpath
-static bool is_allocation(const Node* node) {
-  if (node->req() != 3) {
-    return false;
-  }
-  const Node* const fast_node = node->in(2);
-  if (!fast_node->is_Mach()) {
-    return false;
-  }
-  const MachNode* const fast_mach = fast_node->as_Mach();
-  if (fast_mach->ideal_Opcode() != Op_LoadP) {
-    return false;
-  }
-  const TypePtr* const adr_type = nullptr;
-  intptr_t offset;
-  const Node* const base = get_base_and_offset(fast_mach, offset);
-  if (base == nullptr || !base->is_Mach() || !is_concrete(offset)) {
-    return false;
-  }
-  const MachNode* const base_mach = base->as_Mach();
-  if (base_mach->ideal_Opcode() != Op_ThreadLocal) {
-    return false;
-  }
-  return offset == in_bytes(Thread::tlab_top_offset());
-}
-
-static void elide_mach_barrier(MachNode* mach) {
+void ZBarrierSetC2::elide_dominated_barrier(MachNode* mach) const {
   mach->set_barrier_data(ZBarrierElided);
 }
 
-void ZBarrierSetC2::analyze_dominating_barriers_impl(Node_List& accesses, Node_List& access_dominators) const {
-  Compile* const C = Compile::current();
-  PhaseCFG* const cfg = C->cfg();
-
-  for (uint i = 0; i < accesses.size(); i++) {
-    MachNode* const access = accesses.at(i)->as_Mach();
-    intptr_t access_offset;
-    const Node* const access_obj = get_base_and_offset(access, access_offset);
-    Block* const access_block = cfg->get_block_for_node(access);
-    const uint access_index = block_index(access_block, access);
-
-    if (access_obj == nullptr) {
-      // No information available
-      continue;
-    }
-
-    for (uint j = 0; j < access_dominators.size(); j++) {
-     const  Node* const mem = access_dominators.at(j);
-      if (mem->is_Phi()) {
-        // Allocation node
-        if (mem != access_obj) {
-          continue;
-        }
-        if (is_unknown(access_offset) && !is_array_allocation(mem)) {
-          // The accessed address has an unknown offset, but the allocated
-          // object cannot be determined to be an array. Avoid eliding in this
-          // case, to be on the safe side.
-          continue;
-        }
-        assert((is_concrete(access_offset) && access_offset >= 0) || (is_unknown(access_offset) && is_array_allocation(mem)),
-               "candidate allocation-dominated access offsets must be either concrete and nonnegative, or unknown (for array allocations only)");
-      } else {
-        // Access node
-        const MachNode* const mem_mach = mem->as_Mach();
-        intptr_t mem_offset;
-        const Node* const mem_obj = get_base_and_offset(mem_mach, mem_offset);
-
-        if (mem_obj == nullptr ||
-            !is_concrete(access_offset) ||
-            !is_concrete(mem_offset)) {
-          // No information available
-          continue;
-        }
-
-        if (mem_obj != access_obj || mem_offset != access_offset) {
-          // Not the same addresses, not a candidate
-          continue;
-        }
-        assert(is_concrete(access_offset) && access_offset >= 0,
-               "candidate non-allocation-dominated access offsets must be concrete and nonnegative");
-      }
-
-      Block* mem_block = cfg->get_block_for_node(mem);
-      const uint mem_index = block_index(mem_block, mem);
-
-      if (access_block == mem_block) {
-        // Earlier accesses in the same block
-        if (mem_index < access_index && !block_has_safepoint(mem_block, mem_index + 1, access_index)) {
-          elide_mach_barrier(access);
-        }
-      } else if (mem_block->dominates(access_block)) {
-        // Dominating block? Look around for safepoints
-        ResourceMark rm;
-        Block_List stack;
-        VectorSet visited;
-        stack.push(access_block);
-        bool safepoint_found = block_has_safepoint(access_block);
-        while (!safepoint_found && stack.size() > 0) {
-          const Block* const block = stack.pop();
-          if (visited.test_set(block->_pre_order)) {
-            continue;
-          }
-          if (block_has_safepoint(block)) {
-            safepoint_found = true;
-            break;
-          }
-          if (block == mem_block) {
-            continue;
-          }
-
-          // Push predecessor blocks
-          for (uint p = 1; p < block->num_preds(); ++p) {
-            Block* const pred = cfg->get_block_for_node(block->pred(p));
-            stack.push(pred);
-          }
-        }
-
-        if (!safepoint_found) {
-          elide_mach_barrier(access);
-        }
-      }
-    }
-  }
-}
-
 void ZBarrierSetC2::analyze_dominating_barriers() const {
   ResourceMark rm;
   Compile* const C = Compile::current();
@@ -807,9 +546,9 @@ void ZBarrierSetC2::analyze_dominating_barriers() const {
   }
 
   // Step 2 - Find dominating accesses or allocations for each access
-  analyze_dominating_barriers_impl(loads, load_dominators);
-  analyze_dominating_barriers_impl(stores, store_dominators);
-  analyze_dominating_barriers_impl(atomics, atomic_dominators);
+  elide_dominated_barriers(loads, load_dominators);
+  elide_dominated_barriers(stores, store_dominators);
+  elide_dominated_barriers(atomics, atomic_dominators);
 }
 
 void ZBarrierSetC2::eliminate_gc_barrier(PhaseMacroExpand* macro, Node* node) const {
diff --git a/src/hotspot/share/gc/z/c2/zBarrierSetC2.hpp b/src/hotspot/share/gc/z/c2/zBarrierSetC2.hpp
index 2aa4d0daa85..370a543f381 100644
--- a/src/hotspot/share/gc/z/c2/zBarrierSetC2.hpp
+++ b/src/hotspot/share/gc/z/c2/zBarrierSetC2.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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,7 +99,6 @@ public:
 
 class ZBarrierSetC2 : public BarrierSetC2 {
 private:
-  void analyze_dominating_barriers_impl(Node_List& accesses, Node_List& access_dominators) const;
   void analyze_dominating_barriers() const;
 
 protected:
@@ -128,6 +127,7 @@ public:
   virtual void clone_at_expansion(PhaseMacroExpand* phase,
                                   ArrayCopyNode* ac) const;
 
+  virtual void elide_dominated_barrier(MachNode* mach) const;
   virtual void late_barrier_analysis() const;
   virtual int estimate_stub_size() const;
   virtual void emit_stubs(CodeBuffer& cb) const;
diff --git a/test/hotspot/jtreg/compiler/gcbarriers/TestG1BarrierGeneration.java b/test/hotspot/jtreg/compiler/gcbarriers/TestG1BarrierGeneration.java
index 36ad0bf84a4..a9df0019ab1 100644
--- a/test/hotspot/jtreg/compiler/gcbarriers/TestG1BarrierGeneration.java
+++ b/test/hotspot/jtreg/compiler/gcbarriers/TestG1BarrierGeneration.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2024, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -47,6 +47,7 @@ public class TestG1BarrierGeneration {
     static final String POST_ONLY_NOT_NULL = "post notnull";
     static final String PRE_AND_POST = "pre post";
     static final String PRE_AND_POST_NOT_NULL = "pre post notnull";
+    static final String ANY = ".*";
 
     static class Outer {
         Object f;
@@ -90,6 +91,9 @@ public class TestG1BarrierGeneration {
         }
     }
 
+    @DontInline
+    static void nonInlinedMethod() {}
+
     public static void main(String[] args) {
         TestFramework framework = new TestFramework();
         Scenario[] scenarios = new Scenario[2*2];
@@ -194,10 +198,11 @@ public class TestG1BarrierGeneration {
         counts = {IRNode.G1_ENCODE_P_AND_STORE_N_WITH_BARRIER_FLAG, POST_ONLY, "1"},
         phase = CompilePhase.FINAL_CODE)
     @IR(applyIfAnd = {"UseCompressedOops", "false", "ReduceInitialCardMarks", "true"},
-        failOn = {IRNode.G1_STORE_P},
+        failOn = {IRNode.G1_STORE_P_WITH_BARRIER_FLAG, ANY},
         phase = CompilePhase.FINAL_CODE)
     @IR(applyIfAnd = {"UseCompressedOops", "true", "ReduceInitialCardMarks", "true"},
-        failOn = {IRNode.G1_STORE_N, IRNode.G1_ENCODE_P_AND_STORE_N},
+        failOn = {IRNode.G1_STORE_N_WITH_BARRIER_FLAG, ANY,
+                  IRNode.G1_ENCODE_P_AND_STORE_N_WITH_BARRIER_FLAG, ANY},
         phase = CompilePhase.FINAL_CODE)
     public static Outer testStoreOnNewObject(Object o1) {
         Outer o = new Outer();
@@ -222,10 +227,11 @@ public class TestG1BarrierGeneration {
         counts = {IRNode.G1_ENCODE_P_AND_STORE_N_WITH_BARRIER_FLAG, POST_ONLY_NOT_NULL, "1"},
         phase = CompilePhase.FINAL_CODE)
     @IR(applyIfAnd = {"UseCompressedOops", "false", "ReduceInitialCardMarks", "true"},
-        failOn = {IRNode.G1_STORE_P},
+        failOn = {IRNode.G1_STORE_P_WITH_BARRIER_FLAG, ANY},
         phase = CompilePhase.FINAL_CODE)
     @IR(applyIfAnd = {"UseCompressedOops", "true", "ReduceInitialCardMarks", "true"},
-        failOn = {IRNode.G1_STORE_N, IRNode.G1_ENCODE_P_AND_STORE_N},
+        failOn = {IRNode.G1_STORE_N_WITH_BARRIER_FLAG, ANY,
+                  IRNode.G1_ENCODE_P_AND_STORE_N_WITH_BARRIER_FLAG, ANY},
         phase = CompilePhase.FINAL_CODE)
     public static Outer testStoreNotNullOnNewObject(Object o1) {
         if (o1.hashCode() == 42) {
@@ -244,10 +250,11 @@ public class TestG1BarrierGeneration {
         counts = {IRNode.G1_ENCODE_P_AND_STORE_N_WITH_BARRIER_FLAG, POST_ONLY, "2"},
         phase = CompilePhase.FINAL_CODE)
     @IR(applyIfAnd = {"UseCompressedOops", "false", "ReduceInitialCardMarks", "true"},
-        failOn = {IRNode.G1_STORE_P},
+        failOn = {IRNode.G1_STORE_P_WITH_BARRIER_FLAG, ANY},
         phase = CompilePhase.FINAL_CODE)
     @IR(applyIfAnd = {"UseCompressedOops", "true", "ReduceInitialCardMarks", "true"},
-        failOn = {IRNode.G1_STORE_N, IRNode.G1_ENCODE_P_AND_STORE_N},
+        failOn = {IRNode.G1_STORE_N_WITH_BARRIER_FLAG, ANY,
+                  IRNode.G1_ENCODE_P_AND_STORE_N_WITH_BARRIER_FLAG, ANY},
         phase = CompilePhase.FINAL_CODE)
     public static Outer testStoreOnNewObjectInTwoPaths(Object o1, boolean c) {
         Outer o;
@@ -261,6 +268,63 @@ public class TestG1BarrierGeneration {
         return o;
     }
 
+    @Test
+    @IR(applyIfAnd = {"UseCompressedOops", "false", "ReduceInitialCardMarks", "false"},
+        counts = {IRNode.G1_STORE_P_WITH_BARRIER_FLAG, POST_ONLY, "1"},
+        phase = CompilePhase.FINAL_CODE)
+    @IR(applyIfAnd = {"UseCompressedOops", "true", "ReduceInitialCardMarks", "false"},
+        counts = {IRNode.G1_ENCODE_P_AND_STORE_N_WITH_BARRIER_FLAG, POST_ONLY, "1"},
+        phase = CompilePhase.FINAL_CODE)
+    @IR(applyIfAnd = {"UseCompressedOops", "false", "ReduceInitialCardMarks", "true"},
+        failOn = {IRNode.G1_STORE_P_WITH_BARRIER_FLAG, ANY},
+        phase = CompilePhase.FINAL_CODE)
+    @IR(applyIfAnd = {"UseCompressedOops", "true", "ReduceInitialCardMarks", "true"},
+        failOn = {IRNode.G1_STORE_N, IRNode.G1_ENCODE_P_AND_STORE_N_WITH_BARRIER_FLAG, ANY},
+        phase = CompilePhase.FINAL_CODE)
+    public static Outer testStoreConditionallyOnNewObject(Object o1, boolean c) {
+        Outer o = new Outer();
+        if (c) {
+            o.f = o1;
+        }
+        return o;
+    }
+
+    @Test
+    @IR(applyIfAnd = {"UseCompressedOops", "false", "ReduceInitialCardMarks", "false"},
+        counts = {IRNode.G1_STORE_P_WITH_BARRIER_FLAG, POST_ONLY, "1"},
+        phase = CompilePhase.FINAL_CODE)
+    @IR(applyIfAnd = {"UseCompressedOops", "true", "ReduceInitialCardMarks", "false"},
+        counts = {IRNode.G1_ENCODE_P_AND_STORE_N_WITH_BARRIER_FLAG, POST_ONLY, "1"},
+        phase = CompilePhase.FINAL_CODE)
+    @IR(applyIfAnd = {"UseCompressedOops", "false", "ReduceInitialCardMarks", "true"},
+        failOn = {IRNode.G1_STORE_P_WITH_BARRIER_FLAG, ANY},
+        phase = CompilePhase.FINAL_CODE)
+    @IR(applyIfAnd = {"UseCompressedOops", "true", "ReduceInitialCardMarks", "true"},
+        failOn = {IRNode.G1_STORE_N, IRNode.G1_ENCODE_P_AND_STORE_N_WITH_BARRIER_FLAG, ANY},
+        phase = CompilePhase.FINAL_CODE)
+    public static Outer testStoreOnNewObjectAfterException(Object o1, boolean c) throws Exception {
+        Outer o = new Outer();
+        if (c) {
+            throw new Exception("");
+        }
+        o.f = o1;
+        return o;
+    }
+
+    @Test
+    @IR(applyIf = {"UseCompressedOops", "false"},
+        counts = {IRNode.G1_STORE_P_WITH_BARRIER_FLAG, PRE_AND_POST, "1"},
+        phase = CompilePhase.FINAL_CODE)
+    @IR(applyIf = {"UseCompressedOops", "true"},
+        counts = {IRNode.G1_ENCODE_P_AND_STORE_N_WITH_BARRIER_FLAG, PRE_AND_POST, "1"},
+        phase = CompilePhase.FINAL_CODE)
+    public static Outer testStoreOnNewObjectAfterCall(Object o1) {
+        Outer o = new Outer();
+        nonInlinedMethod();
+        o.f = o1;
+        return o;
+    }
+
     @Run(test = {"testStore",
                  "testStoreNull",
                  "testStoreObfuscatedNull",
@@ -270,7 +334,10 @@ public class TestG1BarrierGeneration {
                  "testStoreOnNewObject",
                  "testStoreNullOnNewObject",
                  "testStoreNotNullOnNewObject",
-                 "testStoreOnNewObjectInTwoPaths"})
+                 "testStoreOnNewObjectInTwoPaths",
+                 "testStoreConditionallyOnNewObject",
+                 "testStoreOnNewObjectAfterException",
+                 "testStoreOnNewObjectAfterCall"})
     public void runStoreTests() {
         {
             Outer o = new Outer();
@@ -328,6 +395,24 @@ public class TestG1BarrierGeneration {
             Outer o = testStoreOnNewObjectInTwoPaths(o1, ThreadLocalRandom.current().nextBoolean());
             Asserts.assertEquals(o1, o.f);
         }
+        {
+            Object o1 = new Object();
+            boolean c = ThreadLocalRandom.current().nextBoolean();
+            Outer o = testStoreConditionallyOnNewObject(o1, c);
+            Asserts.assertTrue(o.f == (c ? o1 : null));
+        }
+        {
+            Object o1 = new Object();
+            boolean c = ThreadLocalRandom.current().nextBoolean();
+            try {
+                Outer o = testStoreOnNewObjectAfterException(o1, c);
+            } catch (Exception e) {}
+        }
+        {
+            Object o1 = new Object();
+            Outer o = testStoreOnNewObjectAfterCall(o1);
+            Asserts.assertEquals(o1, o.f);
+        }
     }
 
     @Test
@@ -379,25 +464,91 @@ public class TestG1BarrierGeneration {
     }
 
     @Test
+    @IR(applyIfAnd = {"UseCompressedOops", "false", "ReduceInitialCardMarks", "false"},
+        counts = {IRNode.G1_STORE_P_WITH_BARRIER_FLAG, POST_ONLY, "1"},
+        phase = CompilePhase.FINAL_CODE)
+    @IR(applyIfAnd = {"UseCompressedOops", "true", "ReduceInitialCardMarks", "false"},
+        counts = {IRNode.G1_ENCODE_P_AND_STORE_N_WITH_BARRIER_FLAG, POST_ONLY, "1"},
+        phase = CompilePhase.FINAL_CODE)
     @IR(applyIfAnd = {"UseCompressedOops", "false", "ReduceInitialCardMarks", "true"},
-        failOn = {IRNode.G1_STORE_P},
+        failOn = {IRNode.G1_STORE_P_WITH_BARRIER_FLAG, ANY},
         phase = CompilePhase.FINAL_CODE)
     @IR(applyIfAnd = {"UseCompressedOops", "true", "ReduceInitialCardMarks", "true"},
-        failOn = {IRNode.G1_STORE_N, IRNode.G1_ENCODE_P_AND_STORE_N},
+        failOn = {IRNode.G1_STORE_N_WITH_BARRIER_FLAG, ANY,
+                  IRNode.G1_ENCODE_P_AND_STORE_N_WITH_BARRIER_FLAG, ANY},
         phase = CompilePhase.FINAL_CODE)
-    public static Object[] testStoreOnNewArray(Object o1) {
+    public static Object[] testStoreOnNewArrayAtKnownIndex(Object o1) {
         Object[] a = new Object[10];
-        // The index needs to be concrete for C2 to detect that it is safe to
-        // remove the pre-barrier.
         a[4] = o1;
         return a;
     }
 
+    @Test
+    @IR(applyIfAnd = {"UseCompressedOops", "false", "ReduceInitialCardMarks", "false"},
+        counts = {IRNode.G1_STORE_P_WITH_BARRIER_FLAG, POST_ONLY, "1"},
+        phase = CompilePhase.FINAL_CODE)
+    @IR(applyIfAnd = {"UseCompressedOops", "true", "ReduceInitialCardMarks", "false"},
+        counts = {IRNode.G1_ENCODE_P_AND_STORE_N_WITH_BARRIER_FLAG, POST_ONLY, "1"},
+        phase = CompilePhase.FINAL_CODE)
+    @IR(applyIfAnd = {"UseCompressedOops", "false", "ReduceInitialCardMarks", "true"},
+        failOn = {IRNode.G1_STORE_P_WITH_BARRIER_FLAG, ANY},
+        phase = CompilePhase.FINAL_CODE)
+    @IR(applyIfAnd = {"UseCompressedOops", "true", "ReduceInitialCardMarks", "true"},
+        failOn = {IRNode.G1_STORE_N_WITH_BARRIER_FLAG, ANY,
+                  IRNode.G1_ENCODE_P_AND_STORE_N_WITH_BARRIER_FLAG, ANY},
+        phase = CompilePhase.FINAL_CODE)
+    public static Object[] testStoreOnNewArrayAtUnknownIndex(Object o1, int index) {
+        Object[] a = new Object[10];
+        a[index] = o1;
+        return a;
+    }
+
+    @Test
+    @IR(failOn = IRNode.SAFEPOINT)
+    @IR(applyIfAnd = {"UseCompressedOops", "false", "ReduceInitialCardMarks", "false"},
+        counts = {IRNode.G1_STORE_P_WITH_BARRIER_FLAG, POST_ONLY, "1"},
+        phase = CompilePhase.FINAL_CODE)
+    @IR(applyIfAnd = {"UseCompressedOops", "true", "ReduceInitialCardMarks", "false"},
+        counts = {IRNode.G1_ENCODE_P_AND_STORE_N_WITH_BARRIER_FLAG, POST_ONLY, "1"},
+        phase = CompilePhase.FINAL_CODE)
+    @IR(applyIfAnd = {"UseCompressedOops", "false", "ReduceInitialCardMarks", "true"},
+        failOn = {IRNode.G1_STORE_P_WITH_BARRIER_FLAG, ANY},
+        phase = CompilePhase.FINAL_CODE)
+    @IR(applyIfAnd = {"UseCompressedOops", "true", "ReduceInitialCardMarks", "true"},
+        failOn = {IRNode.G1_STORE_N, IRNode.G1_ENCODE_P_AND_STORE_N_WITH_BARRIER_FLAG, ANY},
+        phase = CompilePhase.FINAL_CODE)
+    public static Object[] testStoreAllOnNewSmallArray(Object o1) {
+        Object[] a = new Object[64];
+        for (int i = 0; i < a.length; i++) {
+            a[i] = o1;
+        }
+        return a;
+    }
+
+    @Test
+    @IR(counts = {IRNode.SAFEPOINT, "1"})
+    @IR(applyIf = {"UseCompressedOops", "false"},
+        counts = {IRNode.G1_STORE_P_WITH_BARRIER_FLAG, PRE_AND_POST, "1"},
+        phase = CompilePhase.FINAL_CODE)
+    @IR(applyIf = {"UseCompressedOops", "true"},
+        counts = {IRNode.G1_ENCODE_P_AND_STORE_N_WITH_BARRIER_FLAG, PRE_AND_POST, "1"},
+        phase = CompilePhase.FINAL_CODE)
+    public static Object[] testStoreAllOnNewLargeArray(Object o1) {
+        Object[] a = new Object[1024];
+        for (int i = 0; i < a.length; i++) {
+            a[i] = o1;
+        }
+        return a;
+    }
+
     @Run(test = {"testArrayStore",
                  "testArrayStoreNull",
                  "testArrayStoreNotNull",
                  "testArrayStoreTwice",
-                 "testStoreOnNewArray"})
+                 "testStoreOnNewArrayAtKnownIndex",
+                 "testStoreOnNewArrayAtUnknownIndex",
+                 "testStoreAllOnNewSmallArray",
+                 "testStoreAllOnNewLargeArray"})
     public void runArrayStoreTests() {
         {
             Object[] a = new Object[10];
@@ -426,9 +577,28 @@ public class TestG1BarrierGeneration {
         }
         {
             Object o1 = new Object();
-            Object[] a = testStoreOnNewArray(o1);
+            Object[] a = testStoreOnNewArrayAtKnownIndex(o1);
             Asserts.assertEquals(o1, a[4]);
         }
+        {
+            Object o1 = new Object();
+            Object[] a = testStoreOnNewArrayAtUnknownIndex(o1, 5);
+            Asserts.assertEquals(o1, a[5]);
+        }
+        {
+            Object o1 = new Object();
+            Object[] a = testStoreAllOnNewSmallArray(o1);
+            for (int i = 0; i < a.length; i++) {
+                Asserts.assertEquals(o1, a[i]);
+            }
+        }
+        {
+            Object o1 = new Object();
+            Object[] a = testStoreAllOnNewLargeArray(o1);
+            for (int i = 0; i < a.length; i++) {
+                Asserts.assertEquals(o1, a[i]);
+            }
+        }
     }
 
     @Test
@@ -442,7 +612,9 @@ public class TestG1BarrierGeneration {
 
     @Test
     @IR(applyIf = {"ReduceInitialCardMarks", "true"},
-        failOn = {IRNode.G1_STORE_P, IRNode.G1_STORE_N, IRNode.G1_ENCODE_P_AND_STORE_N},
+        failOn = {IRNode.G1_STORE_P_WITH_BARRIER_FLAG, ANY,
+                  IRNode.G1_STORE_N_WITH_BARRIER_FLAG, ANY,
+                  IRNode.G1_ENCODE_P_AND_STORE_N_WITH_BARRIER_FLAG, ANY},
         phase = CompilePhase.FINAL_CODE)
     @IR(applyIfAnd = {"ReduceInitialCardMarks", "false", "UseCompressedOops", "false"},
         counts = {IRNode.G1_STORE_P_WITH_BARRIER_FLAG, POST_ONLY, "2"},
@@ -565,9 +737,139 @@ public class TestG1BarrierGeneration {
         return fVarHandle.getAndSet(o, newVal);
     }
 
+    // IR checks are disabled for s390 because barriers are not elided (to be investigated).
+    @Test
+    @IR(applyIfAnd = {"UseCompressedOops", "false", "ReduceInitialCardMarks", "false"},
+        applyIfPlatform = {"s390", "false"},
+        counts = {IRNode.G1_COMPARE_AND_EXCHANGE_P_WITH_BARRIER_FLAG, POST_ONLY, "1"},
+        phase = CompilePhase.FINAL_CODE)
+    @IR(applyIfAnd = {"UseCompressedOops", "true", "ReduceInitialCardMarks", "false"},
+        applyIfPlatform = {"s390", "false"},
+        counts = {IRNode.G1_COMPARE_AND_EXCHANGE_N_WITH_BARRIER_FLAG, POST_ONLY, "1"},
+        phase = CompilePhase.FINAL_CODE)
+    @IR(applyIfAnd = {"UseCompressedOops", "false", "ReduceInitialCardMarks", "true"},
+        applyIfPlatform = {"s390", "false"},
+        failOn = {IRNode.G1_COMPARE_AND_EXCHANGE_P_WITH_BARRIER_FLAG, ANY},
+        phase = CompilePhase.FINAL_CODE)
+    @IR(applyIfAnd = {"UseCompressedOops", "true", "ReduceInitialCardMarks", "true"},
+        applyIfPlatform = {"s390", "false"},
+        failOn = {IRNode.G1_COMPARE_AND_EXCHANGE_N_WITH_BARRIER_FLAG, ANY},
+        phase = CompilePhase.FINAL_CODE)
+    static Object testCompareAndExchangeOnNewObject(Object oldVal, Object newVal) {
+        Outer o = new Outer();
+        o.f = oldVal;
+        return fVarHandle.compareAndExchange(o, oldVal, newVal);
+    }
+
+    // IR checks are disabled for s390 when OOPs compression is disabled
+    // because barriers are not elided in this configuration (to be investigated).
+    @Test
+    @IR(applyIfAnd = {"UseCompressedOops", "false", "ReduceInitialCardMarks", "false"},
+        applyIfPlatform = {"s390", "false"},
+        counts = {IRNode.G1_COMPARE_AND_SWAP_P_WITH_BARRIER_FLAG, POST_ONLY, "1"},
+        phase = CompilePhase.FINAL_CODE)
+    @IR(applyIfAnd = {"UseCompressedOops", "true", "ReduceInitialCardMarks", "false"},
+        counts = {IRNode.G1_COMPARE_AND_SWAP_N_WITH_BARRIER_FLAG, POST_ONLY, "1"},
+        phase = CompilePhase.FINAL_CODE)
+    @IR(applyIfAnd = {"UseCompressedOops", "false", "ReduceInitialCardMarks", "true"},
+        applyIfPlatform = {"s390", "false"},
+        failOn = {IRNode.G1_COMPARE_AND_SWAP_P_WITH_BARRIER_FLAG, ANY},
+        phase = CompilePhase.FINAL_CODE)
+    @IR(applyIfAnd = {"UseCompressedOops", "true", "ReduceInitialCardMarks", "true"},
+        failOn = {IRNode.G1_COMPARE_AND_SWAP_N_WITH_BARRIER_FLAG, ANY},
+        phase = CompilePhase.FINAL_CODE)
+    static boolean testCompareAndSwapOnNewObject(Object oldVal, Object newVal) {
+        Outer o = new Outer();
+        o.f = oldVal;
+        return fVarHandle.compareAndSet(o, oldVal, newVal);
+    }
+
+    @Test
+    @IR(applyIfAnd = {"UseCompressedOops", "false", "ReduceInitialCardMarks", "false"},
+        counts = {IRNode.G1_GET_AND_SET_P_WITH_BARRIER_FLAG, POST_ONLY, "1"},
+        phase = CompilePhase.FINAL_CODE)
+    @IR(applyIfAnd = {"UseCompressedOops", "true", "ReduceInitialCardMarks", "false"},
+        counts = {IRNode.G1_GET_AND_SET_N_WITH_BARRIER_FLAG, POST_ONLY, "1"},
+        phase = CompilePhase.FINAL_CODE)
+    @IR(applyIfAnd = {"UseCompressedOops", "false", "ReduceInitialCardMarks", "true"},
+        failOn = {IRNode.G1_GET_AND_SET_P_WITH_BARRIER_FLAG, ANY},
+        phase = CompilePhase.FINAL_CODE)
+    @IR(applyIfAnd = {"UseCompressedOops", "true", "ReduceInitialCardMarks", "true"},
+        failOn = {IRNode.G1_GET_AND_SET_N_WITH_BARRIER_FLAG, ANY},
+        phase = CompilePhase.FINAL_CODE)
+    static Object testGetAndSetOnNewObject(Object oldVal, Object newVal) {
+        Outer o = new Outer();
+        o.f = oldVal;
+        return fVarHandle.getAndSet(o, newVal);
+    }
+
+    @Test
+    @IR(applyIfAnd = {"UseCompressedOops", "false", "ReduceInitialCardMarks", "false"},
+        counts = {IRNode.G1_GET_AND_SET_P_WITH_BARRIER_FLAG, POST_ONLY, "1"},
+        phase = CompilePhase.FINAL_CODE)
+    @IR(applyIfAnd = {"UseCompressedOops", "true", "ReduceInitialCardMarks", "false"},
+        counts = {IRNode.G1_GET_AND_SET_N_WITH_BARRIER_FLAG, POST_ONLY, "1"},
+        phase = CompilePhase.FINAL_CODE)
+    @IR(applyIfAnd = {"UseCompressedOops", "false", "ReduceInitialCardMarks", "true"},
+        failOn = {IRNode.G1_GET_AND_SET_P_WITH_BARRIER_FLAG, ANY},
+        phase = CompilePhase.FINAL_CODE)
+    @IR(applyIfAnd = {"UseCompressedOops", "true", "ReduceInitialCardMarks", "true"},
+        failOn = {IRNode.G1_GET_AND_SET_N_WITH_BARRIER_FLAG, ANY},
+        phase = CompilePhase.FINAL_CODE)
+    static Object testGetAndSetConditionallyOnNewObject(Object oldVal, Object newVal, boolean c) {
+        Outer o = new Outer();
+        o.f = oldVal;
+        if (c) {
+            return fVarHandle.getAndSet(o, newVal);
+        }
+        return oldVal;
+    }
+
+    @Test
+    @IR(applyIfAnd = {"UseCompressedOops", "false", "ReduceInitialCardMarks", "false"},
+        counts = {IRNode.G1_GET_AND_SET_P_WITH_BARRIER_FLAG, POST_ONLY, "1"},
+        phase = CompilePhase.FINAL_CODE)
+    @IR(applyIfAnd = {"UseCompressedOops", "true", "ReduceInitialCardMarks", "false"},
+        counts = {IRNode.G1_GET_AND_SET_N_WITH_BARRIER_FLAG, POST_ONLY, "1"},
+        phase = CompilePhase.FINAL_CODE)
+    @IR(applyIfAnd = {"UseCompressedOops", "false", "ReduceInitialCardMarks", "true"},
+        failOn = {IRNode.G1_GET_AND_SET_P_WITH_BARRIER_FLAG, ANY},
+        phase = CompilePhase.FINAL_CODE)
+    @IR(applyIfAnd = {"UseCompressedOops", "true", "ReduceInitialCardMarks", "true"},
+        failOn = {IRNode.G1_GET_AND_SET_N_WITH_BARRIER_FLAG, ANY},
+        phase = CompilePhase.FINAL_CODE)
+    static Object testGetAndSetOnNewObjectAfterException(Object oldVal, Object newVal, boolean c) throws Exception {
+        Outer o = new Outer();
+        if (c) {
+            throw new Exception("");
+        }
+        o.f = oldVal;
+        return fVarHandle.getAndSet(o, newVal);
+    }
+
+    @Test
+    @IR(applyIf = {"UseCompressedOops", "false"},
+        counts = {IRNode.G1_GET_AND_SET_P_WITH_BARRIER_FLAG, PRE_AND_POST, "1"},
+        phase = CompilePhase.FINAL_CODE)
+    @IR(applyIf = {"UseCompressedOops", "true"},
+        counts = {IRNode.G1_GET_AND_SET_N_WITH_BARRIER_FLAG, PRE_AND_POST, "1"},
+        phase = CompilePhase.FINAL_CODE)
+    static Object testGetAndSetOnNewObjectAfterCall(Object oldVal, Object newVal) {
+        Outer o = new Outer();
+        nonInlinedMethod();
+        o.f = oldVal;
+        return fVarHandle.getAndSet(o, newVal);
+    }
+
     @Run(test = {"testCompareAndExchange",
                  "testCompareAndSwap",
-                 "testGetAndSet"})
+                 "testGetAndSet",
+                 "testCompareAndExchangeOnNewObject",
+                 "testCompareAndSwapOnNewObject",
+                 "testGetAndSetOnNewObject",
+                 "testGetAndSetConditionallyOnNewObject",
+                 "testGetAndSetOnNewObjectAfterException",
+                 "testGetAndSetOnNewObjectAfterCall"})
     public void runAtomicTests() {
         {
             Outer o = new Outer();
@@ -596,6 +898,45 @@ public class TestG1BarrierGeneration {
             Asserts.assertEquals(oldVal, oldVal2);
             Asserts.assertEquals(o.f, newVal);
         }
+        {
+            Object oldVal = new Object();
+            Object newVal = new Object();
+            Object oldVal2 = testCompareAndExchangeOnNewObject(oldVal, newVal);
+            Asserts.assertEquals(oldVal, oldVal2);
+        }
+        {
+            Object oldVal = new Object();
+            Object newVal = new Object();
+            boolean b = testCompareAndSwapOnNewObject(oldVal, newVal);
+            Asserts.assertTrue(b);
+        }
+        {
+            Object oldVal = new Object();
+            Object newVal = new Object();
+            Object oldVal2 = testGetAndSetOnNewObject(oldVal, newVal);
+            Asserts.assertEquals(oldVal, oldVal2);
+        }
+        {
+            Object oldVal = new Object();
+            Object newVal = new Object();
+            boolean c = ThreadLocalRandom.current().nextBoolean();
+            Object oldVal2 = testGetAndSetConditionallyOnNewObject(oldVal, newVal, c);
+            Asserts.assertEquals(oldVal, oldVal2);
+        }
+        {
+            Object oldVal = new Object();
+            Object newVal = new Object();
+            boolean c = ThreadLocalRandom.current().nextBoolean();
+            try {
+                Object oldVal2 = testGetAndSetOnNewObjectAfterException(oldVal, newVal, c);
+            } catch (Exception e) {}
+        }
+        {
+            Object oldVal = new Object();
+            Object newVal = new Object();
+            Object oldVal2 = testGetAndSetOnNewObjectAfterCall(oldVal, newVal);
+            Asserts.assertEquals(oldVal, oldVal2);
+        }
     }
 
     @Test

From 885be2efa6b1359a7c7ab36882e19a7eaba77fb3 Mon Sep 17 00:00:00 2001
From: Hamlin Li <mli@openjdk.org>
Date: Tue, 18 Feb 2025 10:24:51 +0000
Subject: [PATCH 041/587] 8349908: RISC-V: C2 SelectFromTwoVector

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

diff --git a/src/hotspot/cpu/riscv/riscv_v.ad b/src/hotspot/cpu/riscv/riscv_v.ad
index 4b30a911152..7be169ef709 100644
--- a/src/hotspot/cpu/riscv/riscv_v.ad
+++ b/src/hotspot/cpu/riscv/riscv_v.ad
@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
+// Copyright (c) 2020, 2025, Oracle and/or its affiliates. All rights reserved.
 // Copyright (c) 2020, 2023, Arm Limited. All rights reserved.
 // Copyright (c) 2020, 2022, Huawei Technologies Co., Ltd. All rights reserved.
 // DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -109,6 +109,13 @@ source %{
     if (!UseRVV) {
       return false;
     }
+    switch (opcode) {
+      case Op_SelectFromTwoVector:
+        // There is no masked version of selectFrom two vector, i.e. selectFrom(av, bv, mask) in vector API.
+        return false;
+      default:
+        break;
+    }
     return match_rule_supported_vector(opcode, vlen, bt);
   }
 
@@ -4425,6 +4432,34 @@ instruct vmask_reinterpret_diff_esize(vRegMask dst, vRegMask_V0 src, vReg tmp) %
   ins_pipe(pipe_slow);
 %}
 
+// ------------------------------ Vector selectFrom -----------------------------
+
+instruct select_from_two_vectors(vReg dst, vReg src1, vReg src2, vReg index, vRegMask_V0 v0, vReg tmp) %{
+  match(Set dst (SelectFromTwoVector (Binary index src1) src2));
+  effect(TEMP_DEF dst, TEMP v0, TEMP tmp);
+  format %{ "select_from_two_vectors $dst, $src1, $src2, $index" %}
+  ins_encode %{
+    BasicType bt = Matcher::vector_element_basic_type(this);
+    __ vsetvli_helper(bt, Matcher::vector_length(this));
+    __ vrgather_vv(as_VectorRegister($dst$$reg), as_VectorRegister($src1$$reg),
+                   as_VectorRegister($index$$reg));
+    bool use_imm = __ is_simm5(Matcher::vector_length(this) - 1);
+    if (use_imm) {
+      __ vmsgtu_vi(v0, as_VectorRegister($index$$reg), Matcher::vector_length(this) - 1);
+      __ vadd_vi(as_VectorRegister($tmp$$reg), as_VectorRegister($index$$reg),
+                 -Matcher::vector_length(this), Assembler::v0_t);
+    } else {
+      __ mv(t0, Matcher::vector_length(this) - 1);
+      __ vmsgtu_vx(v0, as_VectorRegister($index$$reg), t0);
+      __ mv(t0, -Matcher::vector_length(this));
+      __ vadd_vx(as_VectorRegister($tmp$$reg), as_VectorRegister($index$$reg), t0, Assembler::v0_t);
+    }
+    __ vrgather_vv(as_VectorRegister($dst$$reg), as_VectorRegister($src2$$reg),
+                   as_VectorRegister($tmp$$reg), Assembler::v0_t);
+  %}
+  ins_pipe(pipe_slow);
+%}
+
 // ------------------------------ Vector rearrange -----------------------------
 
 instruct rearrange(vReg dst, vReg src, vReg shuffle) %{

From e1d0a9c832ef3e92faaed7f290ff56c0ed8a9d94 Mon Sep 17 00:00:00 2001
From: Matthias Baesken <mbaesken@openjdk.org>
Date: Tue, 18 Feb 2025 13:20:05 +0000
Subject: [PATCH 042/587] 8350202: Tune for Power10 CPUs on Linux ppc64le

Reviewed-by: mdoerr
---
 make/autoconf/flags-cflags.m4 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/make/autoconf/flags-cflags.m4 b/make/autoconf/flags-cflags.m4
index 61645cda6dd..1674d10fa91 100644
--- a/make/autoconf/flags-cflags.m4
+++ b/make/autoconf/flags-cflags.m4
@@ -719,7 +719,7 @@ AC_DEFUN([FLAGS_SETUP_CFLAGS_CPU_DEP],
       elif test "x$FLAGS_CPU" = xppc64le; then
         # Little endian machine uses ELFv2 ABI.
         # Use Power8, this is the first CPU to support PPC64 LE with ELFv2 ABI.
-        $1_CFLAGS_CPU_JVM="${$1_CFLAGS_CPU_JVM} -DABI_ELFv2 -mcpu=power8 -mtune=power8"
+        $1_CFLAGS_CPU_JVM="${$1_CFLAGS_CPU_JVM} -DABI_ELFv2 -mcpu=power8 -mtune=power10"
       fi
     elif test "x$FLAGS_CPU" = xs390x; then
       $1_CFLAGS_CPU="-mbackchain -march=z10"
@@ -740,7 +740,7 @@ AC_DEFUN([FLAGS_SETUP_CFLAGS_CPU_DEP],
       if test "x$FLAGS_CPU" = xppc64le; then
         # Little endian machine uses ELFv2 ABI.
         # Use Power8, this is the first CPU to support PPC64 LE with ELFv2 ABI.
-        $1_CFLAGS_CPU_JVM="${$1_CFLAGS_CPU_JVM} -DABI_ELFv2 -mcpu=power8 -mtune=power8"
+        $1_CFLAGS_CPU_JVM="${$1_CFLAGS_CPU_JVM} -DABI_ELFv2 -mcpu=power8 -mtune=power10"
       fi
     fi
     if test "x$OPENJDK_TARGET_OS" = xaix; then

From 62d93f2a2222a044ac4aa409efd69e776f0d43da Mon Sep 17 00:00:00 2001
From: Leonid Mesnik <lmesnik@openjdk.org>
Date: Tue, 18 Feb 2025 20:06:05 +0000
Subject: [PATCH 043/587] 8346050: Update BuildTestLib.gmk to build whole
 testlibrary

Reviewed-by: weijun, ihse
---
 make/test/BuildTestLib.gmk                             | 10 +++++++++-
 test/lib/jdk/test/lib/security/CertUtils.java          |  6 ++++--
 test/lib/jdk/test/lib/security/FixedSecureRandom.java  |  4 +++-
 test/lib/jdk/test/lib/security/SeededSecureRandom.java |  4 +++-
 test/lib/jdk/test/lib/security/XMLUtils.java           |  3 ++-
 5 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/make/test/BuildTestLib.gmk b/make/test/BuildTestLib.gmk
index 3dc00aeff87..54b4b306cb8 100644
--- a/make/test/BuildTestLib.gmk
+++ b/make/test/BuildTestLib.gmk
@@ -52,10 +52,14 @@ $(eval $(call SetupJavaCompilation, BUILD_WB_JAR, \
 
 TARGETS += $(BUILD_WB_JAR)
 
+ifeq ($(call isTargetOs, linux), false)
+    BUILD_TEST_LIB_JAR_EXCLUDES := jdk/test/lib/containers
+endif
+
 $(eval $(call SetupJavaCompilation, BUILD_TEST_LIB_JAR, \
     TARGET_RELEASE := $(TARGET_RELEASE_NEWJDK_UPGRADED), \
     SRC := $(TEST_LIB_SOURCE_DIR), \
-    EXCLUDES := jdk/test/lib/containers jdk/test/lib/security, \
+    EXCLUDES := $(BUILD_TEST_LIB_JAR_EXCLUDES), \
     BIN := $(TEST_LIB_SUPPORT)/test-lib_classes, \
     HEADERS := $(TEST_LIB_SUPPORT)/test-lib_headers, \
     JAR := $(TEST_LIB_SUPPORT)/test-lib.jar, \
@@ -64,6 +68,10 @@ $(eval $(call SetupJavaCompilation, BUILD_TEST_LIB_JAR, \
         --add-exports java.base/jdk.internal.classfile.attribute=ALL-UNNAMED \
         --add-exports java.base/jdk.internal.classfile.constantpool=ALL-UNNAMED \
         --add-exports java.base/jdk.internal.module=ALL-UNNAMED \
+        --add-exports java.base/jdk.internal.platform=ALL-UNNAMED \
+        --add-exports java.base/sun.security.pkcs=ALL-UNNAMED \
+        --add-exports java.base/sun.security.tools.keytool=ALL-UNNAMED \
+        --add-exports java.base/sun.security.x509=ALL-UNNAMED \
         --enable-preview, \
 ))
 
diff --git a/test/lib/jdk/test/lib/security/CertUtils.java b/test/lib/jdk/test/lib/security/CertUtils.java
index c52d98c2572..e5bd3169c0b 100644
--- a/test/lib/jdk/test/lib/security/CertUtils.java
+++ b/test/lib/jdk/test/lib/security/CertUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -21,7 +21,7 @@
  * questions.
  */
 
-/**
+/*
  *
  * @author Sean Mullan
  * @author Steve Hanna
@@ -645,7 +645,9 @@ public class CertUtils {
      * This class is useful for overriding one or more methods of an
      * X509Certificate for testing purposes.
      */
+    @SuppressWarnings("deprecation")
     public static class ForwardingX509Certificate extends X509Certificate {
+        private static final long serialVersionUID = -8453912214640985478L;
         private final X509Certificate cert;
         public ForwardingX509Certificate(X509Certificate cert) {
             this.cert = cert;
diff --git a/test/lib/jdk/test/lib/security/FixedSecureRandom.java b/test/lib/jdk/test/lib/security/FixedSecureRandom.java
index cfe8ccc212f..d6a08730b0e 100644
--- a/test/lib/jdk/test/lib/security/FixedSecureRandom.java
+++ b/test/lib/jdk/test/lib/security/FixedSecureRandom.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2024, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -37,6 +37,8 @@ import java.security.SecureRandom;
 /// bytes are exhausted.
 public class FixedSecureRandom extends SecureRandom {
 
+    private static final long serialVersionUID = -8753752741562231543L;
+
     private byte[] buffer;
     private int offset;
 
diff --git a/test/lib/jdk/test/lib/security/SeededSecureRandom.java b/test/lib/jdk/test/lib/security/SeededSecureRandom.java
index 305a91c41d2..d56af1aee14 100644
--- a/test/lib/jdk/test/lib/security/SeededSecureRandom.java
+++ b/test/lib/jdk/test/lib/security/SeededSecureRandom.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2024, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -35,6 +35,8 @@ import java.util.Random;
  */
 public class SeededSecureRandom extends SecureRandom {
 
+    private static final long serialVersionUID = 4657031557630518194L;
+
     private final Random rnd;
 
     public static long seed() {
diff --git a/test/lib/jdk/test/lib/security/XMLUtils.java b/test/lib/jdk/test/lib/security/XMLUtils.java
index efc8f6d5449..e70a30d9b3d 100644
--- a/test/lib/jdk/test/lib/security/XMLUtils.java
+++ b/test/lib/jdk/test/lib/security/XMLUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -559,6 +559,7 @@ public class XMLUtils {
     /**
      * Adds a new rule to "jdk.xml.dsig.secureValidationPolicy"
      */
+    @SuppressWarnings("dangling-doc-comments")
     public static void addPolicy(String rule) {
         String value = Security.getProperty("jdk.xml.dsig.secureValidationPolicy");
         value = rule + "," + value;

From 46d4a601e04f90b11d4ccc97a49f4e7010b4fd83 Mon Sep 17 00:00:00 2001
From: Vladimir Kozlov <kvn@openjdk.org>
Date: Tue, 18 Feb 2025 20:08:08 +0000
Subject: [PATCH 044/587] 8349088: De-virtualize Codeblob and nmethod

Co-authored-by: Stefan Karlsson <stefank@openjdk.org>
Co-authored-by: Chris Plummer <cjplummer@openjdk.org>
Reviewed-by: cjplummer, aboldtch, dlong
---
 src/hotspot/share/code/codeBlob.cpp           | 140 +++++++++++------
 src/hotspot/share/code/codeBlob.hpp           | 148 ++++++++++++------
 src/hotspot/share/code/dependencyContext.cpp  |   2 +-
 src/hotspot/share/code/nmethod.cpp            |  23 ++-
 src/hotspot/share/code/nmethod.hpp            |  32 ++--
 src/hotspot/share/runtime/vmStructs.cpp       |  19 +++
 .../classes/sun/jvm/hotspot/c1/Runtime1.java  |   4 +-
 .../sun/jvm/hotspot/code/AdapterBlob.java     |   6 +-
 .../sun/jvm/hotspot/code/BufferBlob.java      |   6 +-
 .../sun/jvm/hotspot/code/CodeBlob.java        |  87 ++++++++--
 .../sun/jvm/hotspot/code/CodeCache.java       |  92 +++--------
 .../jvm/hotspot/code/DeoptimizationBlob.java  |   6 +-
 .../sun/jvm/hotspot/code/ExceptionBlob.java   |   6 +-
 .../code/MethodHandlesAdapterBlob.java        |   6 +-
 .../classes/sun/jvm/hotspot/code/NMethod.java |   3 +-
 .../sun/jvm/hotspot/code/RuntimeStub.java     |   6 +-
 .../sun/jvm/hotspot/code/SafepointBlob.java   |   6 +-
 .../sun/jvm/hotspot/code/SingletonBlob.java   |   4 +-
 .../jvm/hotspot/code/UncommonTrapBlob.java    |   6 +-
 .../sun/jvm/hotspot/code/UpcallStub.java      |   6 +-
 .../sun/jvm/hotspot/code/VtableBlob.java      |   6 +-
 .../sun/jvm/hotspot/memory/CodeHeap.java      |   4 +-
 .../classes/sun/jvm/hotspot/tools/PStack.java |  26 +--
 23 files changed, 377 insertions(+), 267 deletions(-)

diff --git a/src/hotspot/share/code/codeBlob.cpp b/src/hotspot/share/code/codeBlob.cpp
index c033bff6ff7..3ed00a08e40 100644
--- a/src/hotspot/share/code/codeBlob.cpp
+++ b/src/hotspot/share/code/codeBlob.cpp
@@ -53,6 +53,53 @@
 #include "c1/c1_Runtime1.hpp"
 #endif
 
+#include <type_traits>
+
+// Virtual methods are not allowed in code blobs to simplify caching compiled code.
+// Check all "leaf" subclasses of CodeBlob class.
+
+static_assert(!std::is_polymorphic<nmethod>::value,            "no virtual methods are allowed in nmethod");
+static_assert(!std::is_polymorphic<AdapterBlob>::value,        "no virtual methods are allowed in code blobs");
+static_assert(!std::is_polymorphic<VtableBlob>::value,         "no virtual methods are allowed in code blobs");
+static_assert(!std::is_polymorphic<MethodHandlesAdapterBlob>::value, "no virtual methods are allowed in code blobs");
+static_assert(!std::is_polymorphic<RuntimeStub>::value,        "no virtual methods are allowed in code blobs");
+static_assert(!std::is_polymorphic<DeoptimizationBlob>::value, "no virtual methods are allowed in code blobs");
+static_assert(!std::is_polymorphic<SafepointBlob>::value,      "no virtual methods are allowed in code blobs");
+static_assert(!std::is_polymorphic<UpcallStub>::value,         "no virtual methods are allowed in code blobs");
+#ifdef COMPILER2
+static_assert(!std::is_polymorphic<ExceptionBlob>::value,      "no virtual methods are allowed in code blobs");
+static_assert(!std::is_polymorphic<UncommonTrapBlob>::value,   "no virtual methods are allowed in code blobs");
+#endif
+
+// Add proxy vtables.
+// We need only few for now - they are used only from prints.
+const nmethod::Vptr                  nmethod::_vptr;
+const BufferBlob::Vptr               BufferBlob::_vptr;
+const RuntimeStub::Vptr              RuntimeStub::_vptr;
+const SingletonBlob::Vptr            SingletonBlob::_vptr;
+const DeoptimizationBlob::Vptr       DeoptimizationBlob::_vptr;
+const UpcallStub::Vptr               UpcallStub::_vptr;
+
+const CodeBlob::Vptr* CodeBlob::vptr() const {
+  constexpr const CodeBlob::Vptr* array[(size_t)CodeBlobKind::Number_Of_Kinds] = {
+      nullptr/* None */,
+      &nmethod::_vptr,
+      &BufferBlob::_vptr,
+      &AdapterBlob::_vptr,
+      &VtableBlob::_vptr,
+      &MethodHandlesAdapterBlob::_vptr,
+      &RuntimeStub::_vptr,
+      &DeoptimizationBlob::_vptr,
+      &SafepointBlob::_vptr,
+#ifdef COMPILER2
+      &ExceptionBlob::_vptr,
+      &UncommonTrapBlob::_vptr,
+#endif
+      &UpcallStub::_vptr
+  };
+
+  return array[(size_t)_kind];
+}
 
 unsigned int CodeBlob::align_code_offset(int offset) {
   // align the size to CodeEntryAlignment
@@ -386,7 +433,7 @@ RuntimeStub::RuntimeStub(
   OopMapSet*  oop_maps,
   bool        caller_must_gc_arguments
 )
-: RuntimeBlob(name, CodeBlobKind::Runtime_Stub, cb, size, sizeof(RuntimeStub),
+: RuntimeBlob(name, CodeBlobKind::RuntimeStub, cb, size, sizeof(RuntimeStub),
               frame_complete, frame_size, oop_maps, caller_must_gc_arguments)
 {
 }
@@ -482,18 +529,18 @@ DeoptimizationBlob* DeoptimizationBlob::create(
   return blob;
 }
 
+#ifdef COMPILER2
 
 //----------------------------------------------------------------------------------------------------
 // Implementation of UncommonTrapBlob
 
-#ifdef COMPILER2
 UncommonTrapBlob::UncommonTrapBlob(
   CodeBuffer* cb,
   int         size,
   OopMapSet*  oop_maps,
   int         frame_size
 )
-: SingletonBlob("UncommonTrapBlob", CodeBlobKind::Uncommon_Trap, cb,
+: SingletonBlob("UncommonTrapBlob", CodeBlobKind::UncommonTrap, cb,
                 size, sizeof(UncommonTrapBlob), frame_size, oop_maps)
 {}
 
@@ -516,14 +563,9 @@ UncommonTrapBlob* UncommonTrapBlob::create(
   return blob;
 }
 
-
-#endif // COMPILER2
-
-
 //----------------------------------------------------------------------------------------------------
 // Implementation of ExceptionBlob
 
-#ifdef COMPILER2
 ExceptionBlob::ExceptionBlob(
   CodeBuffer* cb,
   int         size,
@@ -553,10 +595,8 @@ ExceptionBlob* ExceptionBlob::create(
   return blob;
 }
 
-
 #endif // COMPILER2
 
-
 //----------------------------------------------------------------------------------------------------
 // Implementation of SafepointBlob
 
@@ -644,17 +684,45 @@ void UpcallStub::free(UpcallStub* blob) {
 //----------------------------------------------------------------------------------------------------
 // Verification and printing
 
+void CodeBlob::verify() {
+  if (is_nmethod()) {
+    as_nmethod()->verify();
+  }
+}
+
 void CodeBlob::print_on(outputStream* st) const {
-  st->print_cr("[CodeBlob (" INTPTR_FORMAT ")]", p2i(this));
-  st->print_cr("Framesize: %d", _frame_size);
+  vptr()->print_on(this, st);
 }
 
 void CodeBlob::print() const { print_on(tty); }
 
 void CodeBlob::print_value_on(outputStream* st) const {
+  vptr()->print_value_on(this, st);
+}
+
+void CodeBlob::print_on_impl(outputStream* st) const {
+  st->print_cr("[CodeBlob (" INTPTR_FORMAT ")]", p2i(this));
+  st->print_cr("Framesize: %d", _frame_size);
+}
+
+void CodeBlob::print_value_on_impl(outputStream* st) const {
   st->print_cr("[CodeBlob]");
 }
 
+void CodeBlob::print_block_comment(outputStream* stream, address block_begin) const {
+#if defined(SUPPORT_ASSEMBLY) || defined(SUPPORT_ABSTRACT_ASSEMBLY)
+  if (is_nmethod()) {
+    as_nmethod()->print_nmethod_labels(stream, block_begin);
+  }
+#endif
+
+#ifndef PRODUCT
+  ptrdiff_t offset = block_begin - code_begin();
+  assert(offset >= 0, "Expecting non-negative offset!");
+  _asm_remarks.print(uint(offset), stream);
+#endif
+  }
+
 void CodeBlob::dump_for_addr(address addr, outputStream* st, bool verbose) const {
   if (is_buffer_blob() || is_adapter_blob() || is_vtable_blob() || is_method_handles_adapter_blob()) {
     // the interpreter is generated into a buffer blob
@@ -708,7 +776,7 @@ void CodeBlob::dump_for_addr(address addr, outputStream* st, bool verbose) const
       // verbose is only ever true when called from findpc in debug.cpp
       nm->print_nmethod(true);
     } else {
-      nm->print(st);
+      nm->print_on(st);
     }
     return;
   }
@@ -716,61 +784,45 @@ void CodeBlob::dump_for_addr(address addr, outputStream* st, bool verbose) const
   print_on(st);
 }
 
-void BufferBlob::verify() {
-  // unimplemented
+void BufferBlob::print_on_impl(outputStream* st) const {
+  RuntimeBlob::print_on_impl(st);
+  print_value_on_impl(st);
 }
 
-void BufferBlob::print_on(outputStream* st) const {
-  RuntimeBlob::print_on(st);
-  print_value_on(st);
-}
-
-void BufferBlob::print_value_on(outputStream* st) const {
+void BufferBlob::print_value_on_impl(outputStream* st) const {
   st->print_cr("BufferBlob (" INTPTR_FORMAT  ") used for %s", p2i(this), name());
 }
 
-void RuntimeStub::verify() {
-  // unimplemented
-}
-
-void RuntimeStub::print_on(outputStream* st) const {
+void RuntimeStub::print_on_impl(outputStream* st) const {
   ttyLocker ttyl;
-  RuntimeBlob::print_on(st);
+  RuntimeBlob::print_on_impl(st);
   st->print("Runtime Stub (" INTPTR_FORMAT "): ", p2i(this));
   st->print_cr("%s", name());
   Disassembler::decode((RuntimeBlob*)this, st);
 }
 
-void RuntimeStub::print_value_on(outputStream* st) const {
+void RuntimeStub::print_value_on_impl(outputStream* st) const {
   st->print("RuntimeStub (" INTPTR_FORMAT "): ", p2i(this)); st->print("%s", name());
 }
 
-void SingletonBlob::verify() {
-  // unimplemented
-}
-
-void SingletonBlob::print_on(outputStream* st) const {
+void SingletonBlob::print_on_impl(outputStream* st) const {
   ttyLocker ttyl;
-  RuntimeBlob::print_on(st);
+  RuntimeBlob::print_on_impl(st);
   st->print_cr("%s", name());
   Disassembler::decode((RuntimeBlob*)this, st);
 }
 
-void SingletonBlob::print_value_on(outputStream* st) const {
+void SingletonBlob::print_value_on_impl(outputStream* st) const {
   st->print_cr("%s", name());
 }
 
-void DeoptimizationBlob::print_value_on(outputStream* st) const {
+void DeoptimizationBlob::print_value_on_impl(outputStream* st) const {
   st->print_cr("Deoptimization (frame not available)");
 }
 
-void UpcallStub::verify() {
-  // unimplemented
-}
-
-void UpcallStub::print_on(outputStream* st) const {
-  RuntimeBlob::print_on(st);
-  print_value_on(st);
+void UpcallStub::print_on_impl(outputStream* st) const {
+  RuntimeBlob::print_on_impl(st);
+  print_value_on_impl(st);
   st->print_cr("Frame data offset: %d", (int) _frame_data_offset);
   oop recv = JNIHandles::resolve(_receiver);
   st->print("Receiver MH=");
@@ -778,6 +830,6 @@ void UpcallStub::print_on(outputStream* st) const {
   Disassembler::decode((RuntimeBlob*)this, st);
 }
 
-void UpcallStub::print_value_on(outputStream* st) const {
+void UpcallStub::print_value_on_impl(outputStream* st) const {
   st->print_cr("UpcallStub (" INTPTR_FORMAT  ") used for %s", p2i(this), name());
 }
diff --git a/src/hotspot/share/code/codeBlob.hpp b/src/hotspot/share/code/codeBlob.hpp
index 63294d71892..fd9a96a2a6b 100644
--- a/src/hotspot/share/code/codeBlob.hpp
+++ b/src/hotspot/share/code/codeBlob.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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,8 @@ enum class CodeBlobType {
 //   RuntimeStub         : Call to VM runtime methods
 //   SingletonBlob       : Super-class for all blobs that exist in only one instance
 //    DeoptimizationBlob : Used for deoptimization
-//    ExceptionBlob      : Used for stack unrolling
 //    SafepointBlob      : Used to handle illegal instruction exceptions
+//    ExceptionBlob      : Used for stack unrolling
 //    UncommonTrapBlob   : Used to handle uncommon traps
 //   UpcallStub  : Used for upcalls from native code
 //
@@ -80,12 +80,14 @@ enum class CodeBlobKind : u1 {
   Buffer,
   Adapter,
   Vtable,
-  MH_Adapter,
-  Runtime_Stub,
+  MHAdapter,
+  RuntimeStub,
   Deoptimization,
-  Exception,
   Safepoint,
-  Uncommon_Trap,
+#ifdef COMPILER2
+  Exception,
+  UncommonTrap,
+#endif
   Upcall,
   Number_Of_Kinds
 };
@@ -128,6 +130,17 @@ protected:
   DbgStrings _dbg_strings;
 #endif
 
+  void print_on_impl(outputStream* st) const;
+  void print_value_on_impl(outputStream* st) const;
+
+  class Vptr {
+   public:
+    virtual void print_on(const CodeBlob* instance, outputStream* st) const = 0;
+    virtual void print_value_on(const CodeBlob* instance, outputStream* st) const = 0;
+  };
+
+  const Vptr* vptr() const;
+
   CodeBlob(const char* name, CodeBlobKind kind, CodeBuffer* cb, int size, uint16_t header_size,
            int16_t frame_complete_offset, int frame_size, OopMapSet* oop_maps, bool caller_must_gc_arguments);
 
@@ -138,7 +151,7 @@ protected:
 
 public:
 
-  virtual ~CodeBlob() {
+  ~CodeBlob() {
     assert(_oop_maps == nullptr, "Not flushed");
   }
 
@@ -152,20 +165,25 @@ public:
   // Typing
   bool is_nmethod() const                     { return _kind == CodeBlobKind::Nmethod; }
   bool is_buffer_blob() const                 { return _kind == CodeBlobKind::Buffer; }
-  bool is_runtime_stub() const                { return _kind == CodeBlobKind::Runtime_Stub; }
+  bool is_runtime_stub() const                { return _kind == CodeBlobKind::RuntimeStub; }
   bool is_deoptimization_stub() const         { return _kind == CodeBlobKind::Deoptimization; }
-  bool is_uncommon_trap_stub() const          { return _kind == CodeBlobKind::Uncommon_Trap; }
+#ifdef COMPILER2
+  bool is_uncommon_trap_stub() const          { return _kind == CodeBlobKind::UncommonTrap; }
   bool is_exception_stub() const              { return _kind == CodeBlobKind::Exception; }
+#else
+  bool is_uncommon_trap_stub() const          { return false; }
+  bool is_exception_stub() const              { return false; }
+#endif
   bool is_safepoint_stub() const              { return _kind == CodeBlobKind::Safepoint; }
   bool is_adapter_blob() const                { return _kind == CodeBlobKind::Adapter; }
   bool is_vtable_blob() const                 { return _kind == CodeBlobKind::Vtable; }
-  bool is_method_handles_adapter_blob() const { return _kind == CodeBlobKind::MH_Adapter; }
+  bool is_method_handles_adapter_blob() const { return _kind == CodeBlobKind::MHAdapter; }
   bool is_upcall_stub() const                 { return _kind == CodeBlobKind::Upcall; }
 
   // Casting
-  nmethod* as_nmethod_or_null()               { return is_nmethod() ? (nmethod*) this : nullptr; }
-  nmethod* as_nmethod()                       { assert(is_nmethod(), "must be nmethod"); return (nmethod*) this; }
-  CodeBlob* as_codeblob_or_null() const       { return (CodeBlob*) this; }
+  nmethod* as_nmethod_or_null() const         { return is_nmethod() ? (nmethod*) this : nullptr; }
+  nmethod* as_nmethod() const                 { assert(is_nmethod(), "must be nmethod"); return (nmethod*) this; }
+  CodeBlob* as_codeblob() const               { return (CodeBlob*) this; }
   UpcallStub* as_upcall_stub() const          { assert(is_upcall_stub(), "must be upcall stub"); return (UpcallStub*) this; }
   RuntimeStub* as_runtime_stub() const        { assert(is_runtime_stub(), "must be runtime blob"); return (RuntimeStub*) this; }
 
@@ -233,21 +251,16 @@ public:
   void set_name(const char* name)                { _name = name; }
 
   // Debugging
-  virtual void verify() = 0;
-  virtual void print() const;
-  virtual void print_on(outputStream* st) const;
-  virtual void print_value_on(outputStream* st) const;
+  void verify();
+  void print() const;
+  void print_on(outputStream* st) const;
+  void print_value_on(outputStream* st) const;
+
   void dump_for_addr(address addr, outputStream* st, bool verbose) const;
   void print_code_on(outputStream* st);
 
   // Print to stream, any comments associated with offset.
-  virtual void print_block_comment(outputStream* stream, address block_begin) const {
-#ifndef PRODUCT
-    ptrdiff_t offset = block_begin - code_begin();
-    assert(offset >= 0, "Expecting non-negative offset!");
-    _asm_remarks.print(uint(offset), stream);
-#endif
-  }
+  void print_block_comment(outputStream* stream, address block_begin) const;
 
 #ifndef PRODUCT
   AsmRemarks &asm_remarks() { return _asm_remarks; }
@@ -290,6 +303,9 @@ class RuntimeBlob : public CodeBlob {
 
   // Deal with Disassembler, VTune, Forte, JvmtiExport, MemoryService.
   static void trace_new_stub(RuntimeBlob* blob, const char* name1, const char* name2 = "");
+
+  class Vptr : public CodeBlob::Vptr {
+  };
 };
 
 class WhiteBox;
@@ -318,11 +334,19 @@ class BufferBlob: public RuntimeBlob {
 
   static void free(BufferBlob* buf);
 
-  // Verification support
-  void verify() override;
+  void print_on_impl(outputStream* st) const;
+  void print_value_on_impl(outputStream* st) const;
 
-  void print_on(outputStream* st) const override;
-  void print_value_on(outputStream* st) const override;
+  class Vptr : public RuntimeBlob::Vptr {
+    void print_on(const CodeBlob* instance, outputStream* st) const override {
+      ((const BufferBlob*)instance)->print_on_impl(st);
+    }
+    void print_value_on(const CodeBlob* instance, outputStream* st) const override {
+      ((const BufferBlob*)instance)->print_value_on_impl(st);
+    }
+  };
+
+  static const Vptr _vptr;
 };
 
 
@@ -355,7 +379,7 @@ public:
 
 class MethodHandlesAdapterBlob: public BufferBlob {
 private:
-  MethodHandlesAdapterBlob(int size): BufferBlob("MethodHandles adapters", CodeBlobKind::MH_Adapter, size) {}
+  MethodHandlesAdapterBlob(int size): BufferBlob("MethodHandles adapters", CodeBlobKind::MHAdapter, size) {}
 
 public:
   // Creation
@@ -396,13 +420,21 @@ class RuntimeStub: public RuntimeBlob {
 
   static void free(RuntimeStub* stub) { RuntimeBlob::free(stub); }
 
-  address entry_point() const                    { return code_begin(); }
+  address entry_point() const         { return code_begin(); }
 
-  // Verification support
-  void verify() override;
+  void print_on_impl(outputStream* st) const;
+  void print_value_on_impl(outputStream* st) const;
 
-  void print_on(outputStream* st) const override;
-  void print_value_on(outputStream* st) const override;
+  class Vptr : public RuntimeBlob::Vptr {
+    void print_on(const CodeBlob* instance, outputStream* st) const override {
+      instance->as_runtime_stub()->print_on_impl(st);
+    }
+    void print_value_on(const CodeBlob* instance, outputStream* st) const override {
+      instance->as_runtime_stub()->print_value_on_impl(st);
+    }
+  };
+
+  static const Vptr _vptr;
 };
 
 
@@ -430,11 +462,19 @@ class SingletonBlob: public RuntimeBlob {
 
   address entry_point()                          { return code_begin(); }
 
-  // Verification support
-  void verify() override; // does nothing
+  void print_on_impl(outputStream* st) const;
+  void print_value_on_impl(outputStream* st) const;
 
-  void print_on(outputStream* st) const override;
-  void print_value_on(outputStream* st) const override;
+  class Vptr : public RuntimeBlob::Vptr {
+    void print_on(const CodeBlob* instance, outputStream* st) const override {
+      ((const SingletonBlob*)instance)->print_on_impl(st);
+    }
+    void print_value_on(const CodeBlob* instance, outputStream* st) const override {
+      ((const SingletonBlob*)instance)->print_value_on_impl(st);
+    }
+  };
+
+  static const Vptr _vptr;
 };
 
 
@@ -479,9 +519,6 @@ class DeoptimizationBlob: public SingletonBlob {
     int         frame_size
   );
 
-  // Printing
-  void print_value_on(outputStream* st) const override;
-
   address unpack() const                         { return code_begin() + _unpack_offset;           }
   address unpack_with_exception() const          { return code_begin() + _unpack_with_exception;   }
   address unpack_with_reexecution() const        { return code_begin() + _unpack_with_reexecution; }
@@ -511,6 +548,16 @@ class DeoptimizationBlob: public SingletonBlob {
   }
   address implicit_exception_uncommon_trap() const { return code_begin() + _implicit_exception_uncommon_trap_offset; }
 #endif // INCLUDE_JVMCI
+
+  void print_value_on_impl(outputStream* st) const;
+
+  class Vptr : public SingletonBlob::Vptr {
+    void print_value_on(const CodeBlob* instance, outputStream* st) const override {
+      ((const DeoptimizationBlob*)instance)->print_value_on_impl(st);
+    }
+  };
+
+  static const Vptr _vptr;
 };
 
 
@@ -623,13 +670,22 @@ class UpcallStub: public RuntimeBlob {
 
   JavaFrameAnchor* jfa_for_frame(const frame& frame) const;
 
-  // GC/Verification support
+  // GC support
   void oops_do(OopClosure* f, const frame& frame);
-  void verify() override;
 
-  // Misc.
-  void print_on(outputStream* st) const override;
-  void print_value_on(outputStream* st) const override;
+  void print_on_impl(outputStream* st) const;
+  void print_value_on_impl(outputStream* st) const;
+
+  class Vptr : public RuntimeBlob::Vptr {
+    void print_on(const CodeBlob* instance, outputStream* st) const override {
+      instance->as_upcall_stub()->print_on_impl(st);
+    }
+    void print_value_on(const CodeBlob* instance, outputStream* st) const override {
+      instance->as_upcall_stub()->print_value_on_impl(st);
+    }
+  };
+
+  static const Vptr _vptr;
 };
 
 #endif // SHARE_CODE_CODEBLOB_HPP
diff --git a/src/hotspot/share/code/dependencyContext.cpp b/src/hotspot/share/code/dependencyContext.cpp
index f64b6e15c1a..2b3253030c5 100644
--- a/src/hotspot/share/code/dependencyContext.cpp
+++ b/src/hotspot/share/code/dependencyContext.cpp
@@ -218,7 +218,7 @@ void DependencyContext::print_dependent_nmethods(bool verbose) {
     nmethod* nm = b->get_nmethod();
     tty->print("[%d] { ", idx++);
     if (!verbose) {
-      nm->print_on(tty, "nmethod");
+      nm->print_on_with_msg(tty, "nmethod");
       tty->print_cr(" } ");
     } else {
       nm->print();
diff --git a/src/hotspot/share/code/nmethod.cpp b/src/hotspot/share/code/nmethod.cpp
index e454d8f3f68..4f72c193d7f 100644
--- a/src/hotspot/share/code/nmethod.cpp
+++ b/src/hotspot/share/code/nmethod.cpp
@@ -1619,7 +1619,7 @@ void nmethod::log_new_nmethod() const {
 
 
 // Print out more verbose output usually for a newly created nmethod.
-void nmethod::print_on(outputStream* st, const char* msg) const {
+void nmethod::print_on_with_msg(outputStream* st, const char* msg) const {
   if (st != nullptr) {
     ttyLocker ttyl;
     if (WizardMode) {
@@ -1971,7 +1971,7 @@ void nmethod::log_state_change() const {
 
   CompileTask::print_ul(this, "made not entrant");
   if (PrintCompilation) {
-    print_on(tty, "made not entrant");
+    print_on_with_msg(tty, "made not entrant");
   }
 }
 
@@ -3033,12 +3033,7 @@ void nmethod::verify_scopes() {
 // -----------------------------------------------------------------------------
 // Printing operations
 
-void nmethod::print() const {
-  ttyLocker ttyl;   // keep the following output all in one block
-  print(tty);
-}
-
-void nmethod::print(outputStream* st) const {
+void nmethod::print_on_impl(outputStream* st) const {
   ResourceMark rm;
 
   st->print("Compiled method ");
@@ -3053,7 +3048,7 @@ void nmethod::print(outputStream* st) const {
     st->print("(n/a) ");
   }
 
-  print_on(st, nullptr);
+  print_on_with_msg(st, nullptr);
 
   if (WizardMode) {
     st->print("((nmethod*) " INTPTR_FORMAT ") ", p2i(this));
@@ -3404,7 +3399,7 @@ void nmethod::decode2(outputStream* ost) const {
 #endif
 
   st->cr();
-  this->print(st);
+  this->print_on(st);
   st->cr();
 
 #if defined(SUPPORT_ASSEMBLY)
@@ -3953,12 +3948,12 @@ address nmethod::call_instruction_address(address pc) const {
   return nullptr;
 }
 
+void nmethod::print_value_on_impl(outputStream* st) const {
+  st->print_cr("nmethod");
 #if defined(SUPPORT_DATA_STRUCTS)
-void nmethod::print_value_on(outputStream* st) const {
-  st->print("nmethod");
-  print_on(st, nullptr);
-}
+  print_on_with_msg(st, nullptr);
 #endif
+}
 
 #ifndef PRODUCT
 
diff --git a/src/hotspot/share/code/nmethod.hpp b/src/hotspot/share/code/nmethod.hpp
index 095c0ba4a26..39bf18547d8 100644
--- a/src/hotspot/share/code/nmethod.hpp
+++ b/src/hotspot/share/code/nmethod.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -900,7 +900,7 @@ public:
   void post_compiled_method_load_event(JvmtiThreadState* state = nullptr);
 
   // verify operations
-  void verify() override;
+  void verify();
   void verify_scopes();
   void verify_interrupt_point(address interrupt_point, bool is_inline_cache);
 
@@ -912,9 +912,9 @@ public:
   void decode(outputStream* st) const { decode2(st); } // just delegate here.
 
   // printing support
-  void print()                 const override;
-  void print(outputStream* st) const;
+  void print_on_impl(outputStream* st) const;
   void print_code();
+  void print_value_on_impl(outputStream* st) const;
 
 #if defined(SUPPORT_DATA_STRUCTS)
   // print output in opt build for disassembler library
@@ -922,7 +922,6 @@ public:
   void print_pcs_on(outputStream* st);
   void print_scopes() { print_scopes_on(tty); }
   void print_scopes_on(outputStream* st)          PRODUCT_RETURN;
-  void print_value_on(outputStream* st) const override;
   void print_handler_table();
   void print_nul_chk_table();
   void print_recorded_oop(int log_n, int index);
@@ -941,9 +940,7 @@ public:
   void maybe_print_nmethod(const DirectiveSet* directive);
   void print_nmethod(bool print_code);
 
-  // need to re-define this from CodeBlob else the overload hides it
-  void print_on(outputStream* st) const override { CodeBlob::print_on(st); }
-  void print_on(outputStream* st, const char* msg) const;
+  void print_on_with_msg(outputStream* st, const char* msg) const;
 
   // Logging
   void log_identity(xmlStream* log) const;
@@ -951,13 +948,6 @@ public:
   void log_state_change() const;
 
   // Prints block-level comments, including nmethod specific block labels:
-  void print_block_comment(outputStream* stream, address block_begin) const override {
-#if defined(SUPPORT_ASSEMBLY) || defined(SUPPORT_ABSTRACT_ASSEMBLY)
-    print_nmethod_labels(stream, block_begin);
-    CodeBlob::print_block_comment(stream, block_begin);
-#endif
-  }
-
   void print_nmethod_labels(outputStream* stream, address block_begin, bool print_section_labels=true) const;
   const char* nmethod_section_label(address pos) const;
 
@@ -995,6 +985,18 @@ public:
 
   void make_deoptimized();
   void finalize_relocations();
+
+  class Vptr : public CodeBlob::Vptr {
+    void print_on(const CodeBlob* instance, outputStream* st) const override {
+      ttyLocker ttyl;
+      instance->as_nmethod()->print_on_impl(st);
+    }
+    void print_value_on(const CodeBlob* instance, outputStream* st) const override {
+      instance->as_nmethod()->print_value_on_impl(st);
+    }
+  };
+
+  static const Vptr _vptr;
 };
 
 #endif // SHARE_CODE_NMETHOD_HPP
diff --git a/src/hotspot/share/runtime/vmStructs.cpp b/src/hotspot/share/runtime/vmStructs.cpp
index ac6a6682beb..1c776f7b8e2 100644
--- a/src/hotspot/share/runtime/vmStructs.cpp
+++ b/src/hotspot/share/runtime/vmStructs.cpp
@@ -549,6 +549,7 @@
                                                                                                                                      \
   nonstatic_field(CodeBlob,                    _name,                                         const char*)                           \
   nonstatic_field(CodeBlob,                    _size,                                         int)                                   \
+  nonstatic_field(CodeBlob,                    _kind,                                         CodeBlobKind)                          \
   nonstatic_field(CodeBlob,                    _header_size,                                  u2)                                    \
   nonstatic_field(CodeBlob,                    _relocation_size,                              int)                                   \
   nonstatic_field(CodeBlob,                    _content_offset,                               int)                                   \
@@ -1916,6 +1917,7 @@
                                                                           \
   declare_integer_type(CompLevel)                                         \
   declare_integer_type(ByteSize)                                          \
+  declare_integer_type(CodeBlobKind)                                      \
   JVMTI_ONLY(declare_toplevel_type(BreakpointInfo))                       \
   JVMTI_ONLY(declare_toplevel_type(BreakpointInfo*))                      \
   declare_toplevel_type(CodeBlob*)                                        \
@@ -2373,6 +2375,23 @@
   declare_constant(CompLevel_full_profile)                                \
   declare_constant(CompLevel_full_optimization)                           \
                                                                           \
+  /****************/                                                      \
+  /* CodeBlobKind */                                                      \
+  /****************/                                                      \
+                                                                          \
+  declare_constant(CodeBlobKind::Nmethod)                                 \
+  declare_constant(CodeBlobKind::Buffer)                                  \
+  declare_constant(CodeBlobKind::Adapter)                                 \
+  declare_constant(CodeBlobKind::Vtable)                                  \
+  declare_constant(CodeBlobKind::MHAdapter)                               \
+  declare_constant(CodeBlobKind::RuntimeStub)                             \
+  declare_constant(CodeBlobKind::Deoptimization)                          \
+  declare_constant(CodeBlobKind::Safepoint)                               \
+  COMPILER2_PRESENT(declare_constant(CodeBlobKind::Exception))            \
+  COMPILER2_PRESENT(declare_constant(CodeBlobKind::UncommonTrap))         \
+  declare_constant(CodeBlobKind::Upcall)                                  \
+  declare_constant(CodeBlobKind::Number_Of_Kinds)                         \
+                                                                          \
   /***************/                                                       \
   /* OopMapValue */                                                       \
   /***************/                                                       \
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/c1/Runtime1.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/c1/Runtime1.java
index b7bcc87e933..b26e42ebfdf 100644
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/c1/Runtime1.java
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/c1/Runtime1.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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,6 @@ public class Runtime1 {
   /** FIXME: consider making argument "type-safe" in Java port */
   public CodeBlob blobFor(int id) {
     Address blobAddr = blobsField.getStaticFieldAddress().getAddressAt(id * VM.getVM().getAddressSize());
-    return VM.getVM().getCodeCache().createCodeBlobWrapper(blobAddr);
+    return VM.getVM().getCodeCache().createCodeBlobWrapper(blobAddr, blobAddr);
   }
 }
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/AdapterBlob.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/AdapterBlob.java
index eefc2ed808a..8fa69a2686c 100644
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/AdapterBlob.java
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/AdapterBlob.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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,10 +50,6 @@ public class AdapterBlob extends RuntimeBlob {
     super(addr);
   }
 
-  public boolean isAdapterBlob() {
-    return true;
-  }
-
   public String getName() {
     return "AdapterBlob: " + super.getName();
   }
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/BufferBlob.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/BufferBlob.java
index 97fc59d25e1..8f2ed2aa601 100644
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/BufferBlob.java
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/BufferBlob.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -49,8 +49,4 @@ public class BufferBlob extends RuntimeBlob {
   public BufferBlob(Address addr) {
     super(addr);
   }
-
-  public boolean isBufferBlob() {
-    return true;
-  }
 }
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/CodeBlob.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/CodeBlob.java
index 90e4b5b98b4..326600d79f4 100644
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/CodeBlob.java
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/CodeBlob.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -43,6 +43,7 @@ import sun.jvm.hotspot.utilities.Observer;
 public class CodeBlob extends VMObject {
   private static AddressField nameField;
   private static CIntegerField sizeField;
+  private static CIntegerField kindField;
   private static CIntegerField relocationSizeField;
   private static CIntField     headerSizeField;
   private static CIntegerField contentOffsetField;
@@ -52,6 +53,22 @@ public class CodeBlob extends VMObject {
   private static CIntegerField frameSizeField;
   private static AddressField  oopMapsField;
 
+  // Kinds of Codeblob
+  private static int NMethodKind;
+  private static int BufferKind;
+  private static int AdapterKind;
+  private static int VtableKind;
+  private static int MHAdapterKind;
+  private static int RuntimeStubKind;
+  private static int DeoptimizationKind;
+  private static int ExceptionKind;
+  private static int SafepointKind;
+  private static int UncommonTrapKind;
+  private static int UpcallKind;
+  private static int NumberOfKinds;
+
+  private static Class[] wrapperClasses;
+
   public CodeBlob(Address addr) {
     super(addr);
   }
@@ -63,6 +80,7 @@ public class CodeBlob extends VMObject {
 
     nameField                = type.getAddressField("_name");
     sizeField                = type.getCIntegerField("_size");
+    kindField                = type.getCIntegerField("_kind");
     relocationSizeField      = type.getCIntegerField("_relocation_size");
     headerSizeField          = new CIntField(type.getCIntegerField("_header_size"), 0);
     contentOffsetField       = type.getCIntegerField("_content_offset");
@@ -76,6 +94,40 @@ public class CodeBlob extends VMObject {
       matcherInterpreterFramePointerReg =
           db.lookupIntConstant("Matcher::interpreter_frame_pointer_reg").intValue();
     }
+
+    NMethodKind        = db.lookupIntConstant("CodeBlobKind::Nmethod").intValue();
+    BufferKind         = db.lookupIntConstant("CodeBlobKind::Buffer").intValue();
+    AdapterKind        = db.lookupIntConstant("CodeBlobKind::Adapter").intValue();
+    VtableKind         = db.lookupIntConstant("CodeBlobKind::Vtable").intValue();
+    MHAdapterKind      = db.lookupIntConstant("CodeBlobKind::MHAdapter").intValue();
+    RuntimeStubKind    = db.lookupIntConstant("CodeBlobKind::RuntimeStub").intValue();
+    DeoptimizationKind = db.lookupIntConstant("CodeBlobKind::Deoptimization").intValue();
+    SafepointKind      = db.lookupIntConstant("CodeBlobKind::Safepoint").intValue();
+    UpcallKind         = db.lookupIntConstant("CodeBlobKind::Upcall").intValue();
+    NumberOfKinds      = db.lookupIntConstant("CodeBlobKind::Number_Of_Kinds").intValue();
+    if (VM.getVM().isServerCompiler()) {
+        ExceptionKind    = db.lookupIntConstant("CodeBlobKind::Exception").intValue();
+        UncommonTrapKind = db.lookupIntConstant("CodeBlobKind::UncommonTrap").intValue();
+    } else {
+        // Set invalid value to not match default.
+        ExceptionKind    = NumberOfKinds + 1;
+        UncommonTrapKind = NumberOfKinds + 1;
+    }
+
+    wrapperClasses                     = new Class[NumberOfKinds];
+    wrapperClasses[NMethodKind]        = NMethod.class;
+    wrapperClasses[BufferKind]         = BufferBlob.class;
+    wrapperClasses[AdapterKind]        = AdapterBlob.class;
+    wrapperClasses[VtableKind]         = VtableBlob.class;
+    wrapperClasses[MHAdapterKind]      = MethodHandlesAdapterBlob.class;
+    wrapperClasses[RuntimeStubKind]    = RuntimeStub.class;
+    wrapperClasses[DeoptimizationKind] = DeoptimizationBlob.class;
+    wrapperClasses[SafepointKind]      = SafepointBlob.class;
+    wrapperClasses[UpcallKind]         = UpcallStub.class;
+    if (VM.getVM().isServerCompiler()) {
+      wrapperClasses[ExceptionKind]    = ExceptionBlob.class;
+      wrapperClasses[UncommonTrapKind] = UncommonTrapBlob.class;
+    }
   }
 
   static {
@@ -86,6 +138,11 @@ public class CodeBlob extends VMObject {
     });
   }
 
+  public static Class<?> getClassFor(Address addr) {
+      CodeBlob cb = new CodeBlob(addr);
+      return wrapperClasses[cb.getKind()];
+  }
+
   public Address headerBegin()    { return getAddress(); }
 
   public Address headerEnd()      { return getAddress().addOffsetTo(getHeaderSize()); }
@@ -124,6 +181,10 @@ public class CodeBlob extends VMObject {
     return CStringUtilities.getString(nameField.getValue(addr));
   }
 
+  public int getKind() {
+    return (int) kindField.getValue(addr);
+  }
+
   /** OopMap for frame; can return null if none available */
   public ImmutableOopMapSet getOopMaps() {
     Address value = oopMapsField.getValue(addr);
@@ -135,27 +196,29 @@ public class CodeBlob extends VMObject {
 
 
   // Typing
-  public boolean isBufferBlob()         { return false; }
+  public boolean isBufferBlob()         { return getKind() == BufferKind; }
 
-  public boolean isCompiled()           { return false; }
+  public boolean isNMethod()            { return getKind() == NMethodKind; }
 
-  public boolean isNMethod()            { return false; }
+  public boolean isRuntimeStub()        { return getKind() == RuntimeStubKind; }
 
-  public boolean isRuntimeStub()        { return false; }
+  public boolean isUpcallStub()         { return getKind() == UpcallKind; }
 
-  public boolean isUpcallStub()         { return false; }
+  public boolean isDeoptimizationBlob() { return getKind() == DeoptimizationKind; }
 
-  public boolean isDeoptimizationStub() { return false; }
+  public boolean isUncommonTrapBlob()   { return getKind() == UncommonTrapKind; }
 
-  public boolean isUncommonTrapStub()   { return false; }
+  public boolean isExceptionBlob()      { return getKind() == ExceptionKind; }
 
-  public boolean isExceptionStub()      { return false; }
+  public boolean isSafepointBlob()      { return getKind() == SafepointKind; }
 
-  public boolean isSafepointStub()      { return false; }
+  public boolean isAdapterBlob()        { return getKind() == AdapterKind; }
 
-  public boolean isAdapterBlob()        { return false; }
+  public boolean isMHAdapterBlob()      { return getKind() == MHAdapterKind; }
 
-  // Fine grain nmethod support: isNmethod() == isJavaMethod() || isNativeMethod() || isOSRMethod()
+  public boolean isVtableBlob()         { return getKind() == VtableKind; }
+
+  // Fine grain nmethod support: isNMethod() == isJavaMethod() || isNativeMethod() || isOSRMethod()
   public boolean isJavaMethod()         { return false; }
 
   public boolean isNativeMethod()       { return false; }
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/CodeCache.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/CodeCache.java
index e2eac930e02..73135a873e5 100644
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/CodeCache.java
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/CodeCache.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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 sun.jvm.hotspot.utilities.Observer;
 
 public class CodeCache {
   private static GrowableArray<CodeHeap> heapArray;
-  private static VirtualConstructor virtualConstructor;
 
   static {
     VM.registerVMInitializedObserver(new Observer() {
@@ -51,22 +50,6 @@ public class CodeCache {
     // Get array of CodeHeaps
     AddressField heapsField = type.getAddressField("_heaps");
     heapArray = GrowableArray.create(heapsField.getValue(), new StaticBaseConstructor<>(CodeHeap.class));
-
-    virtualConstructor = new VirtualConstructor(db);
-    // Add mappings for all possible CodeBlob subclasses
-    virtualConstructor.addMapping("BufferBlob", BufferBlob.class);
-    virtualConstructor.addMapping("nmethod", NMethod.class);
-    virtualConstructor.addMapping("RuntimeStub", RuntimeStub.class);
-    virtualConstructor.addMapping("AdapterBlob", AdapterBlob.class);
-    virtualConstructor.addMapping("MethodHandlesAdapterBlob", MethodHandlesAdapterBlob.class);
-    virtualConstructor.addMapping("VtableBlob", VtableBlob.class);
-    virtualConstructor.addMapping("UpcallStub", UpcallStub.class);
-    virtualConstructor.addMapping("SafepointBlob", SafepointBlob.class);
-    virtualConstructor.addMapping("DeoptimizationBlob", DeoptimizationBlob.class);
-    if (VM.getVM().isServerCompiler()) {
-      virtualConstructor.addMapping("ExceptionBlob", ExceptionBlob.class);
-      virtualConstructor.addMapping("UncommonTrapBlob", UncommonTrapBlob.class);
-    }
   }
 
   public boolean contains(Address p) {
@@ -80,8 +63,8 @@ public class CodeCache {
 
   /** When VM.getVM().isDebugging() returns true, this behaves like
       findBlobUnsafe */
-  public CodeBlob findBlob(Address start) {
-    CodeBlob result = findBlobUnsafe(start);
+  public CodeBlob findBlob(Address addr) {
+    CodeBlob result = findBlobUnsafe(addr);
     if (result == null) return null;
     if (VM.getVM().isDebugging()) {
       return result;
@@ -91,11 +74,10 @@ public class CodeCache {
     return result;
   }
 
-  public CodeBlob findBlobUnsafe(Address start) {
-    CodeBlob result = null;
+  public CodeBlob findBlobUnsafe(Address addr) {
     CodeHeap containing_heap = null;
     for (int i = 0; i < heapArray.length(); ++i) {
-      if (heapArray.at(i).contains(start)) {
+      if (heapArray.at(i).contains(addr)) {
         containing_heap = heapArray.at(i);
         break;
       }
@@ -104,76 +86,52 @@ public class CodeCache {
       return null;
     }
 
-    try {
-      result = (CodeBlob) virtualConstructor.instantiateWrapperFor(containing_heap.findStart(start));
-    }
-    catch (WrongTypeException wte) {
-      Address cbAddr = null;
-      try {
-        cbAddr = containing_heap.findStart(start);
-      }
-      catch (Exception findEx) {
-        findEx.printStackTrace();
-      }
+    Address cbStart = containing_heap.findStart(addr);
+    if (cbStart == null) return null;
 
+    return createCodeBlobWrapper(cbStart, addr);
+  }
+
+  // cbStart - address of a code blob
+  // addr    - address inside of a code blob
+  public CodeBlob createCodeBlobWrapper(Address cbStart, Address addr) {
+    Class<?> cbClass = CodeBlob.getClassFor(cbStart);
+    if (cbClass == null) {
       String message = "Couldn't deduce type of CodeBlob ";
-      if (cbAddr != null) {
-        message = message + "@" + cbAddr + " ";
-      }
-      message = message + "for PC=" + start;
+      message = message + "@" + cbStart + " ";
+      message = message + "for PC=" + addr;
 
-      throw new RuntimeException(message, wte);
+      throw new RuntimeException(message);
     }
-    if (result == null) return null;
+    CodeBlob result = (CodeBlob) VMObjectFactory.newObject(cbClass, cbStart);
     if (Assert.ASSERTS_ENABLED) {
       // The pointer to the HeapBlock that contains this blob is outside of the blob,
       // but it shouldn't be an error to find a blob based on the pointer to the HeapBlock.
       // The heap block header is padded out to an 8-byte boundary. See heap.hpp. The
       // simplest way to compute the header size is just 2 * addressSize.
-      Assert.that(result.blobContains(start) ||
-                  result.blobContains(start.addOffsetTo(2 * VM.getVM().getAddressSize())),
+      Assert.that(result.blobContains(addr) ||
+                  result.blobContains(addr.addOffsetTo(2 * VM.getVM().getAddressSize())),
                   "found wrong CodeBlob");
     }
     return result;
   }
 
-  public NMethod findNMethod(Address start) {
-    CodeBlob cb = findBlob(start);
+  public NMethod findNMethod(Address addr) {
+    CodeBlob cb = findBlob(addr);
     if (Assert.ASSERTS_ENABLED) {
       Assert.that(cb == null || cb.isNMethod(), "did not find an nmethod");
     }
     return (NMethod) cb;
   }
 
-  public NMethod findNMethodUnsafe(Address start) {
-    CodeBlob cb = findBlobUnsafe(start);
+  public NMethod findNMethodUnsafe(Address addr) {
+    CodeBlob cb = findBlobUnsafe(addr);
     if (Assert.ASSERTS_ENABLED) {
       Assert.that(cb == null || cb.isNMethod(), "did not find an nmethod");
     }
     return (NMethod) cb;
   }
 
-  /** Routine for instantiating appropriately-typed wrapper for a
-      CodeBlob. Used by CodeCache, Runtime1, etc. */
-  public CodeBlob createCodeBlobWrapper(Address codeBlobAddr) {
-    try {
-      return (CodeBlob) virtualConstructor.instantiateWrapperFor(codeBlobAddr);
-    }
-    catch (Exception e) {
-      String message = "Unable to deduce type of CodeBlob from address " + codeBlobAddr +
-                       " (expected type nmethod, RuntimeStub, VtableBlob, ";
-      if (VM.getVM().isClientCompiler()) {
-        message = message + " or ";
-      }
-      message = message + "SafepointBlob";
-      if (VM.getVM().isServerCompiler()) {
-        message = message + ", DeoptimizationBlob, or ExceptionBlob";
-      }
-      message = message + ")";
-      throw new RuntimeException(message);
-    }
-  }
-
   public void iterate(CodeCacheVisitor visitor) {
     visitor.prologue(lowBound(), highBound());
     for (int i = 0; i < heapArray.length(); ++i) {
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/DeoptimizationBlob.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/DeoptimizationBlob.java
index d6686e1bb96..51a5184ca85 100644
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/DeoptimizationBlob.java
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/DeoptimizationBlob.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -49,8 +49,4 @@ public class DeoptimizationBlob extends SingletonBlob {
   public DeoptimizationBlob(Address addr) {
     super(addr);
   }
-
-  public boolean isDeoptimizationStub() {
-    return true;
-  }
 }
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/ExceptionBlob.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/ExceptionBlob.java
index 6ce32c03b65..30025a41866 100644
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/ExceptionBlob.java
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/ExceptionBlob.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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,4 @@ public class ExceptionBlob extends SingletonBlob {
   public ExceptionBlob(Address addr) {
     super(addr);
   }
-
-  public boolean isExceptionStub() {
-    return true;
-  }
 }
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/MethodHandlesAdapterBlob.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/MethodHandlesAdapterBlob.java
index fa3cc84f179..53c9593d0b8 100644
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/MethodHandlesAdapterBlob.java
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/MethodHandlesAdapterBlob.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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,10 +50,6 @@ public class MethodHandlesAdapterBlob extends AdapterBlob {
     super(addr);
   }
 
-  public boolean isMethodHandlesAdapterBlob() {
-    return true;
-  }
-
   public String getName() {
     return "MethodHandlesAdapterBlob: " + super.getName();
   }
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/NMethod.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/NMethod.java
index 8eacd1a8a86..8cd2342750d 100644
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/NMethod.java
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/NMethod.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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,6 @@ public class NMethod extends CodeBlob {
   }
 
   // Type info
-  public boolean isNMethod()      { return true;                    }
   public boolean isJavaMethod()   { return !getMethod().isNative(); }
   public boolean isNativeMethod() { return getMethod().isNative();  }
   public boolean isOSRMethod()    { return getEntryBCI() != VM.getVM().getInvocationEntryBCI(); }
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/RuntimeStub.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/RuntimeStub.java
index 10568701a43..f51dcd76516 100644
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/RuntimeStub.java
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/RuntimeStub.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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,10 +53,6 @@ public class RuntimeStub extends RuntimeBlob {
     super(addr);
   }
 
-  public boolean isRuntimeStub() {
-    return true;
-  }
-
   public boolean callerMustGCArguments() {
     return callerMustGCArgumentsField.getValue(addr) != 0;
   }
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/SafepointBlob.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/SafepointBlob.java
index 70d6f1a3c5f..3f3ba79ff9f 100644
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/SafepointBlob.java
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/SafepointBlob.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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,8 +51,4 @@ public class SafepointBlob extends SingletonBlob {
   public SafepointBlob(Address addr) {
     super(addr);
   }
-
-  public boolean isSafepointStub() {
-    return true;
-  }
 }
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/SingletonBlob.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/SingletonBlob.java
index 7957fba1d92..5a80b957e1d 100644
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/SingletonBlob.java
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/SingletonBlob.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -49,6 +49,4 @@ public class SingletonBlob extends RuntimeBlob {
   public SingletonBlob(Address addr) {
     super(addr);
   }
-
-  public boolean isSingletonBlob()      { return true; }
 }
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/UncommonTrapBlob.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/UncommonTrapBlob.java
index b7fa1d25821..077e49b5fe6 100644
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/UncommonTrapBlob.java
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/UncommonTrapBlob.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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,8 +51,4 @@ public class UncommonTrapBlob extends SingletonBlob {
   public UncommonTrapBlob(Address addr) {
     super(addr);
   }
-
-  public boolean isUncommonTrapStub() {
-    return true;
-  }
 }
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/UpcallStub.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/UpcallStub.java
index 4e324ba38e4..eeb5821bb60 100644
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/UpcallStub.java
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/UpcallStub.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2024, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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,10 +85,6 @@ public class UpcallStub extends RuntimeBlob {
     return lastJavaPCField.getValue(getJavaFrameAnchor(frame));
   }
 
-  public boolean isUpcallStub() {
-    return true;
-  }
-
   public static class FrameData extends VMObject {
 
     private static AddressField jfaField;
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/VtableBlob.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/VtableBlob.java
index e992cfe7787..a193d5ff340 100644
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/VtableBlob.java
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/VtableBlob.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2025, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2020, NTT DATA.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -33,10 +33,6 @@ public class VtableBlob extends BufferBlob {
         super(addr);
     }
 
-    public boolean isVtableBlob() {
-        return true;
-    }
-
     public String getName() {
         return "VtableBlob: " + super.getName();
     }
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/memory/CodeHeap.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/memory/CodeHeap.java
index 4b188ac2b5a..5df4050a6a9 100644
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/memory/CodeHeap.java
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/memory/CodeHeap.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -108,7 +108,7 @@ public class CodeHeap extends VMObject {
     while (ptr != null && ptr.lessThan(end())) {
       try {
         // Use findStart to get a pointer inside blob other findBlob asserts
-        CodeBlob blob = cache.createCodeBlobWrapper(findStart(ptr));
+        CodeBlob blob = cache.createCodeBlobWrapper(findStart(ptr), ptr);
         if (blob != null) {
           visitor.visit(blob);
           if (blob == lastBlob) {
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/tools/PStack.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/tools/PStack.java
index 2f48c75eb78..945dd6bcc49 100644
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/tools/PStack.java
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/tools/PStack.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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,16 +162,24 @@ public class PStack extends Tool {
                                }
                             } else if (cb.isBufferBlob()) {
                                out.println("<StubRoutines>");
+                            } else if (cb.isAdapterBlob()) {
+                               out.println("<AdapterBlob>");
+                            } else if (cb.isVtableBlob()) {
+                               out.println("<VtableBlob>");
+                            } else if (cb.isMHAdapterBlob()) {
+                               out.println("<MethodHandlesAdapterBlob>");
                             } else if (cb.isRuntimeStub()) {
                                out.println("<RuntimeStub>");
-                            } else if (cb.isDeoptimizationStub()) {
-                               out.println("<DeoptimizationStub>");
-                            } else if (cb.isUncommonTrapStub()) {
-                               out.println("<UncommonTrap>");
-                            } else if (cb.isExceptionStub()) {
-                               out.println("<ExceptionStub>");
-                            } else if (cb.isSafepointStub()) {
-                               out.println("<SafepointStub>");
+                            } else if (cb.isUpcallStub()) {
+                               out.println("<UpcallStub>");
+                            } else if (cb.isDeoptimizationBlob()) {
+                               out.println("<DeoptimizationBlob>");
+                            } else if (cb.isUncommonTrapBlob()) {
+                               out.println("<UncommonTrapBlob>");
+                            } else if (cb.isExceptionBlob()) {
+                               out.println("<ExceptionBlob>");
+                            } else if (cb.isSafepointBlob()) {
+                               out.println("<SafepointBlob>");
                             } else {
                                out.println("<Unknown code blob>");
                             }

From f2b4e12afe67086a2ae08081fd545e5ce4d731fd Mon Sep 17 00:00:00 2001
From: Doug Simon <dnsimon@openjdk.org>
Date: Tue, 18 Feb 2025 20:18:08 +0000
Subject: [PATCH 045/587] 8350263: JvmciNotifyBootstrapFinishedEventTest
 intermittently times out

Reviewed-by: yzheng, never
---
 .../TestUncaughtErrorInCompileMethod.config   |  2 +-
 .../TestUncaughtErrorInCompileMethod.java     | 52 ++++++++++---------
 ...mciNotifyBootstrapFinishedEventTest.config |  2 +-
 ...JvmciNotifyBootstrapFinishedEventTest.java | 31 ++++++-----
 4 files changed, 48 insertions(+), 39 deletions(-)

diff --git a/test/hotspot/jtreg/compiler/jvmci/TestUncaughtErrorInCompileMethod.config b/test/hotspot/jtreg/compiler/jvmci/TestUncaughtErrorInCompileMethod.config
index 521c27977f2..f54fcb0b8dc 100644
--- a/test/hotspot/jtreg/compiler/jvmci/TestUncaughtErrorInCompileMethod.config
+++ b/test/hotspot/jtreg/compiler/jvmci/TestUncaughtErrorInCompileMethod.config
@@ -1 +1 @@
-compiler.jvmci.TestUncaughtErrorInCompileMethod
+compiler.jvmci.TestUncaughtErrorInCompileMethod$Locator
diff --git a/test/hotspot/jtreg/compiler/jvmci/TestUncaughtErrorInCompileMethod.java b/test/hotspot/jtreg/compiler/jvmci/TestUncaughtErrorInCompileMethod.java
index 511e0c4b98c..49eae648bfc 100644
--- a/test/hotspot/jtreg/compiler/jvmci/TestUncaughtErrorInCompileMethod.java
+++ b/test/hotspot/jtreg/compiler/jvmci/TestUncaughtErrorInCompileMethod.java
@@ -56,7 +56,7 @@ import java.util.List;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
 
-public class TestUncaughtErrorInCompileMethod extends JVMCIServiceLocator {
+public class TestUncaughtErrorInCompileMethod {
 
     static volatile boolean compilerCreationErrorOccurred;
 
@@ -86,6 +86,7 @@ public class TestUncaughtErrorInCompileMethod extends JVMCIServiceLocator {
         ProcessBuilder pb = ProcessTools.createLimitedTestJavaProcessBuilder(
             "-XX:+UnlockExperimentalVMOptions",
             "-XX:+UseJVMCICompiler", "-Djvmci.Compiler=ErrorCompiler",
+            "-XX:-UseJVMCINativeLibrary",
             "-XX:-TieredCompilation",
             "-XX:+PrintCompilation",
             "--add-exports=jdk.internal.vm.ci/jdk.vm.ci.services=ALL-UNNAMED",
@@ -124,7 +125,7 @@ public class TestUncaughtErrorInCompileMethod extends JVMCIServiceLocator {
 
             // Check that hs-err contains the stack trace of the fatal exception (sample shown above)
             String[] stackTraceSubstrings = {
-                "at compiler.jvmci.TestUncaughtErrorInCompileMethod$1.createCompiler(TestUncaughtErrorInCompileMethod.java",
+                "at compiler.jvmci.TestUncaughtErrorInCompileMethod$Locator$1.createCompiler(TestUncaughtErrorInCompileMethod.java",
                 "at jdk.internal.vm.ci/jdk.vm.ci.hotspot.HotSpotJVMCIRuntime.compileMethod(HotSpotJVMCIRuntime.java"
             };
             for (String expect : stackTraceSubstrings) {
@@ -172,31 +173,34 @@ public class TestUncaughtErrorInCompileMethod extends JVMCIServiceLocator {
         }
     }
 
-    @Override
-    public <S> S getProvider(Class<S> service) {
-        if (service == JVMCICompilerFactory.class) {
-            return service.cast(new JVMCICompilerFactory() {
-                final AtomicInteger counter = new AtomicInteger();
-                @Override
-                public String getCompilerName() {
-                    return "ErrorCompiler";
-                }
+    public static class Locator extends JVMCIServiceLocator {
 
-                @Override
-                public JVMCICompiler createCompiler(JVMCIRuntime runtime) {
-                    int attempt = counter.incrementAndGet();
-                    CompilerCreationError e = new CompilerCreationError(attempt);
-                    e.printStackTrace();
-                    if (attempt >= 10) {
-                        // Delay notifying the loop in main so that compilation failures
-                        // have time to be reported by -XX:+PrintCompilation.
-                        compilerCreationErrorOccurred = true;
+        @Override
+        public <S> S getProvider(Class<S> service) {
+            if (service == JVMCICompilerFactory.class) {
+                return service.cast(new JVMCICompilerFactory() {
+                    final AtomicInteger counter = new AtomicInteger();
+                    @Override
+                    public String getCompilerName() {
+                        return "ErrorCompiler";
                     }
-                    throw e;
-                }
-            });
+
+                    @Override
+                    public JVMCICompiler createCompiler(JVMCIRuntime runtime) {
+                        int attempt = counter.incrementAndGet();
+                        CompilerCreationError e = new CompilerCreationError(attempt);
+                        e.printStackTrace();
+                        if (attempt >= 10) {
+                            // Delay notifying the loop in main so that compilation failures
+                            // have time to be reported by -XX:+PrintCompilation.
+                            compilerCreationErrorOccurred = true;
+                        }
+                        throw e;
+                    }
+                });
+            }
+            return null;
         }
-        return null;
     }
 
     /**
diff --git a/test/hotspot/jtreg/compiler/jvmci/events/JvmciNotifyBootstrapFinishedEventTest.config b/test/hotspot/jtreg/compiler/jvmci/events/JvmciNotifyBootstrapFinishedEventTest.config
index 19cd01ec1e1..709b87f94ef 100644
--- a/test/hotspot/jtreg/compiler/jvmci/events/JvmciNotifyBootstrapFinishedEventTest.config
+++ b/test/hotspot/jtreg/compiler/jvmci/events/JvmciNotifyBootstrapFinishedEventTest.config
@@ -1,2 +1,2 @@
-compiler.jvmci.events.JvmciNotifyBootstrapFinishedEventTest
+compiler.jvmci.events.JvmciNotifyBootstrapFinishedEventTest$Locator
 compiler.jvmci.common.JVMCIHelpers
diff --git a/test/hotspot/jtreg/compiler/jvmci/events/JvmciNotifyBootstrapFinishedEventTest.java b/test/hotspot/jtreg/compiler/jvmci/events/JvmciNotifyBootstrapFinishedEventTest.java
index 6230dda8802..8d3b5fcce5b 100644
--- a/test/hotspot/jtreg/compiler/jvmci/events/JvmciNotifyBootstrapFinishedEventTest.java
+++ b/test/hotspot/jtreg/compiler/jvmci/events/JvmciNotifyBootstrapFinishedEventTest.java
@@ -62,29 +62,34 @@ import jdk.test.lib.Asserts;
 import jdk.vm.ci.services.JVMCIServiceLocator;
 import jdk.vm.ci.hotspot.HotSpotVMEventListener;
 
-public class JvmciNotifyBootstrapFinishedEventTest extends JVMCIServiceLocator implements HotSpotVMEventListener {
+public class JvmciNotifyBootstrapFinishedEventTest {
     private static final boolean BOOTSTRAP = Boolean
             .getBoolean("compiler.jvmci.events.JvmciNotifyBootstrapFinishedEventTest.bootstrap");
-    private static volatile int gotBoostrapNotification = 0;
+    private static volatile int gotBootstrapNotification = 0;
 
     public static void main(String args[]) {
         if (BOOTSTRAP) {
-            Asserts.assertEQ(gotBoostrapNotification, 1, "Did not receive expected number of bootstrap events");
+            Asserts.assertEQ(gotBootstrapNotification, 1, "Did not receive expected number of bootstrap events");
         } else {
-            Asserts.assertEQ(gotBoostrapNotification, 0, "Got unexpected bootstrap event");
+            Asserts.assertEQ(gotBootstrapNotification, 0, "Got unexpected bootstrap event");
         }
     }
 
-    @Override
-    public <S> S getProvider(Class<S> service) {
-        if (service == HotSpotVMEventListener.class) {
-            return service.cast(this);
+    public static class Locator extends JVMCIServiceLocator implements HotSpotVMEventListener {
+        public Locator() {
+            Thread.dumpStack();
+        }
+        @Override
+        public <S> S getProvider(Class<S> service) {
+            if (service == HotSpotVMEventListener.class) {
+                return service.cast(this);
+            }
+            return null;
         }
-        return null;
-    }
 
-    @Override
-    public void notifyBootstrapFinished() {
-        gotBoostrapNotification++;
+        @Override
+        public void notifyBootstrapFinished() {
+            gotBootstrapNotification++;
+        }
     }
 }

From 2d03bd007895b139b027947852c8b5ad8eab49b6 Mon Sep 17 00:00:00 2001
From: Leonid Mesnik <lmesnik@openjdk.org>
Date: Tue, 18 Feb 2025 20:58:04 +0000
Subject: [PATCH 046/587] 8350280: The JDK-8346050 testlibrary changes break
 the build

Reviewed-by: dholmes
---
 make/test/BuildTestLib.gmk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/make/test/BuildTestLib.gmk b/make/test/BuildTestLib.gmk
index 54b4b306cb8..dc5e0a9bd64 100644
--- a/make/test/BuildTestLib.gmk
+++ b/make/test/BuildTestLib.gmk
@@ -70,6 +70,7 @@ $(eval $(call SetupJavaCompilation, BUILD_TEST_LIB_JAR, \
         --add-exports java.base/jdk.internal.module=ALL-UNNAMED \
         --add-exports java.base/jdk.internal.platform=ALL-UNNAMED \
         --add-exports java.base/sun.security.pkcs=ALL-UNNAMED \
+        --add-exports java.base/sun.security.provider.certpath=ALL-UNNAMED \
         --add-exports java.base/sun.security.tools.keytool=ALL-UNNAMED \
         --add-exports java.base/sun.security.x509=ALL-UNNAMED \
         --enable-preview, \

From 04659a40736610164855ac161120e63fcd46fe31 Mon Sep 17 00:00:00 2001
From: SendaoYan <syan@openjdk.org>
Date: Wed, 19 Feb 2025 01:30:16 +0000
Subject: [PATCH 047/587] 8350197: [UBSAN] Node::dump_idx reported
 float-cast-overflow

Reviewed-by: chagedorn
---
 src/hotspot/share/opto/loopnode.cpp | 2 +-
 src/hotspot/share/opto/node.cpp     | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/hotspot/share/opto/loopnode.cpp b/src/hotspot/share/opto/loopnode.cpp
index 3329d4dadc6..ed2db13421f 100644
--- a/src/hotspot/share/opto/loopnode.cpp
+++ b/src/hotspot/share/opto/loopnode.cpp
@@ -6831,7 +6831,7 @@ void PhaseIdealLoop::get_idoms(Node* n, const uint count, Unique_Node_List& idom
 void PhaseIdealLoop::dump_idoms_in_reverse(const Node* n, const Node_List& idom_list) const {
   Node* next;
   uint padding = 3;
-  uint node_index_padding_width = static_cast<int>(log10(static_cast<double>(C->unique()))) + 1;
+  uint node_index_padding_width = (C->unique() == 0 ? 0 : static_cast<int>(log10(static_cast<double>(C->unique())))) + 1;
   for (int i = idom_list.size() - 1; i >= 0; i--) {
     if (i == 9 || i == 99) {
       padding++;
diff --git a/src/hotspot/share/opto/node.cpp b/src/hotspot/share/opto/node.cpp
index 0c185c682b3..0e2957ac66e 100644
--- a/src/hotspot/share/opto/node.cpp
+++ b/src/hotspot/share/opto/node.cpp
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2024, Alibaba Group Holding Limited. All rights reserved.
+ * Copyright (c) 2024, 2025, Alibaba Group Holding Limited. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -2425,9 +2425,9 @@ void Node::dump_idx(bool align, outputStream* st, DumpConfig* dc) const {
   bool is_new = C->node_arena()->contains(this);
   if (align) { // print prefix empty spaces$
     // +1 for leading digit, +1 for "o"
-    uint max_width = static_cast<uint>(log10(static_cast<double>(C->unique()))) + 2;
+    uint max_width = (C->unique() == 0 ? 0 : static_cast<uint>(log10(static_cast<double>(C->unique())))) + 2;
     // +1 for leading digit, maybe +1 for "o"
-    uint width = static_cast<uint>(log10(static_cast<double>(_idx))) + 1 + (is_new ? 0 : 1);
+    uint width = (_idx == 0 ? 0 : static_cast<uint>(log10(static_cast<double>(_idx)))) + 1 + (is_new ? 0 : 1);
     while (max_width > width) {
       st->print(" ");
       width++;

From 4de92a40d0750a2e6f72eb675d900f1129718d39 Mon Sep 17 00:00:00 2001
From: Prasanta Sadhukhan <psadhukhan@openjdk.org>
Date: Wed, 19 Feb 2025 02:19:27 +0000
Subject: [PATCH 048/587] 8350224: Test
 javax/swing/JComboBox/TestComboBoxComponentRendering.java fails in ubuntu
 23.x and later

Reviewed-by: aivanov, azvegint
---
 test/jdk/ProblemList.txt                                      | 4 ----
 .../javax/swing/JComboBox/TestComboBoxComponentRendering.java | 4 +++-
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/test/jdk/ProblemList.txt b/test/jdk/ProblemList.txt
index 2c63cd43d25..c6e62a55962 100644
--- a/test/jdk/ProblemList.txt
+++ b/test/jdk/ProblemList.txt
@@ -695,10 +695,6 @@ sanity/client/SwingSet/src/ToolTipDemoTest.java 8293001 linux-all
 sanity/client/SwingSet/src/ButtonDemoScreenshotTest.java 8265770 macosx-all
 sanity/client/SwingSet/src/EditorPaneDemoTest.java 8212240 linux-x64
 
-# jdk_swing Ubuntu 23.04 specific
-
-javax/swing/JComboBox/TestComboBoxComponentRendering.java 8309734 linux-all
-
 # This test fails on macOS 14
 javax/swing/plaf/synth/7158712/bug7158712.java 8324782 macosx-all
 
diff --git a/test/jdk/javax/swing/JComboBox/TestComboBoxComponentRendering.java b/test/jdk/javax/swing/JComboBox/TestComboBoxComponentRendering.java
index 0e176a911a3..da914314670 100644
--- a/test/jdk/javax/swing/JComboBox/TestComboBoxComponentRendering.java
+++ b/test/jdk/javax/swing/JComboBox/TestComboBoxComponentRendering.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -33,6 +33,7 @@
 import java.awt.Color;
 import java.awt.Component;
 import java.awt.image.BufferedImage;
+import java.awt.Font;
 import java.awt.Point;
 import java.awt.Rectangle;
 import java.awt.Robot;
@@ -137,6 +138,7 @@ class ComboBoxCustomRenderer extends JLabel
         implements ListCellRenderer {
 
     public ComboBoxCustomRenderer() {
+        setFont(new Font("SansSerif", Font.BOLD, 32));
         setOpaque(true);
         setHorizontalAlignment(CENTER);
         setVerticalAlignment(CENTER);

From 9042aa82a890b0f0348ac8127dbd3268f2620346 Mon Sep 17 00:00:00 2001
From: Christian Stein <cstein@openjdk.org>
Date: Wed, 19 Feb 2025 06:38:39 +0000
Subject: [PATCH 049/587] 8339238: Update to use jtreg 7.5.1

Reviewed-by: erikj, jpai, rriggs, iris
---
 make/autoconf/lib-tests.m4    | 4 ++--
 make/conf/github-actions.conf | 4 ++--
 make/conf/jib-profiles.js     | 4 ++--
 test/docs/TEST.ROOT           | 4 ++--
 test/hotspot/jtreg/TEST.ROOT  | 2 +-
 test/jaxp/TEST.ROOT           | 2 +-
 test/jdk/TEST.ROOT            | 2 +-
 test/langtools/TEST.ROOT      | 2 +-
 test/lib-test/TEST.ROOT       | 4 ++--
 9 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/make/autoconf/lib-tests.m4 b/make/autoconf/lib-tests.m4
index afb94030808..d2a4fcbb191 100644
--- a/make/autoconf/lib-tests.m4
+++ b/make/autoconf/lib-tests.m4
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
 # 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 @@
 ################################################################################
 
 # Minimum supported versions
-JTREG_MINIMUM_VERSION=7.4
+JTREG_MINIMUM_VERSION=7.5.1
 GTEST_MINIMUM_VERSION=1.14.0
 
 ################################################################################
diff --git a/make/conf/github-actions.conf b/make/conf/github-actions.conf
index a6b383daa8f..c34c90ef76e 100644
--- a/make/conf/github-actions.conf
+++ b/make/conf/github-actions.conf
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2020, 2025, Oracle and/or its affiliates. All rights reserved.
 # 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 @@
 # Versions and download locations for dependencies used by GitHub Actions (GHA)
 
 GTEST_VERSION=1.14.0
-JTREG_VERSION=7.4+1
+JTREG_VERSION=7.5.1+1
 
 LINUX_X64_BOOT_JDK_EXT=tar.gz
 LINUX_X64_BOOT_JDK_URL=https://download.java.net/java/GA/jdk23/3c5b90190c68498b986a97f276efd28a/37/GPL/openjdk-23_linux-x64_bin.tar.gz
diff --git a/make/conf/jib-profiles.js b/make/conf/jib-profiles.js
index 9f04fce2ca6..397e75968e4 100644
--- a/make/conf/jib-profiles.js
+++ b/make/conf/jib-profiles.js
@@ -1186,9 +1186,9 @@ var getJibProfilesDependencies = function (input, common) {
         jtreg: {
             server: "jpg",
             product: "jtreg",
-            version: "7.4",
+            version: "7.5.1",
             build_number: "1",
-            file: "bundles/jtreg-7.4+1.zip",
+            file: "bundles/jtreg-7.5.1+1.zip",
             environment_name: "JT_HOME",
             environment_path: input.get("jtreg", "home_path") + "/bin",
             configure_args: "--with-jtreg=" + input.get("jtreg", "home_path"),
diff --git a/test/docs/TEST.ROOT b/test/docs/TEST.ROOT
index af2e5896779..9be915dd4ff 100644
--- a/test/docs/TEST.ROOT
+++ b/test/docs/TEST.ROOT
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2024, 2025, Oracle and/or its affiliates. All rights reserved.
 # 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 @@
 groups=TEST.groups
 
 # Minimum jtreg version
-requiredVersion=7.4+1
+requiredVersion=7.5.1+1
 
 # Use new module options
 useNewOptions=true
diff --git a/test/hotspot/jtreg/TEST.ROOT b/test/hotspot/jtreg/TEST.ROOT
index eacf856075c..ac4321e6839 100644
--- a/test/hotspot/jtreg/TEST.ROOT
+++ b/test/hotspot/jtreg/TEST.ROOT
@@ -95,7 +95,7 @@ requires.properties= \
     jlink.packagedModules
 
 # Minimum jtreg version
-requiredVersion=7.4+1
+requiredVersion=7.5.1+1
 
 # Path to libraries in the topmost test directory. This is needed so @library
 # does not need ../../../ notation to reach them
diff --git a/test/jaxp/TEST.ROOT b/test/jaxp/TEST.ROOT
index 8098695b80e..7a457d87b69 100644
--- a/test/jaxp/TEST.ROOT
+++ b/test/jaxp/TEST.ROOT
@@ -23,7 +23,7 @@ modules=java.xml
 groups=TEST.groups
 
 # Minimum jtreg version
-requiredVersion=7.4+1
+requiredVersion=7.5.1+1
 
 # Path to libraries in the topmost test directory. This is needed so @library
 # does not need ../../ notation to reach them
diff --git a/test/jdk/TEST.ROOT b/test/jdk/TEST.ROOT
index db48d501707..3b0b824b36f 100644
--- a/test/jdk/TEST.ROOT
+++ b/test/jdk/TEST.ROOT
@@ -114,7 +114,7 @@ requires.properties= \
     jlink.packagedModules
 
 # Minimum jtreg version
-requiredVersion=7.4+1
+requiredVersion=7.5.1+1
 
 # Path to libraries in the topmost test directory. This is needed so @library
 # does not need ../../ notation to reach them
diff --git a/test/langtools/TEST.ROOT b/test/langtools/TEST.ROOT
index d816d5b096b..c6c79ac81df 100644
--- a/test/langtools/TEST.ROOT
+++ b/test/langtools/TEST.ROOT
@@ -15,7 +15,7 @@ keys=intermittent randomness needs-src needs-src-jdk_javadoc
 groups=TEST.groups
 
 # Minimum jtreg version
-requiredVersion=7.4+1
+requiredVersion=7.5.1+1
 
 # Use new module options
 useNewOptions=true
diff --git a/test/lib-test/TEST.ROOT b/test/lib-test/TEST.ROOT
index 27576a2d040..5908b50cb17 100644
--- a/test/lib-test/TEST.ROOT
+++ b/test/lib-test/TEST.ROOT
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2020, 2025, Oracle and/or its affiliates. All rights reserved.
 # 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 @@
 keys=randomness
 
 # Minimum jtreg version
-requiredVersion=7.4+1
+requiredVersion=7.5.1+1
 
 # Path to libraries in the topmost test directory. This is needed so @library
 # does not need ../../ notation to reach them

From 0ef1c40991e703592fc79325bda1a6d2fc6caf4e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Roberto=20Casta=C3=B1eda=20Lozano?=
 <rcastanedalo@openjdk.org>
Date: Wed, 19 Feb 2025 09:17:27 +0000
Subject: [PATCH 050/587] 8350006: IGV: show memory slices as type information

Reviewed-by: dlunden, chagedorn, dfenacci
---
 src/hotspot/share/opto/idealGraphPrinter.cpp  | 25 +++++++++++++++++++
 src/hotspot/share/opto/idealGraphPrinter.hpp  |  4 +--
 .../servercompiler/filters/showTypes.filter   | 17 +++++++++----
 3 files changed, 39 insertions(+), 7 deletions(-)

diff --git a/src/hotspot/share/opto/idealGraphPrinter.cpp b/src/hotspot/share/opto/idealGraphPrinter.cpp
index 6a28074f4d9..f6ec1a72506 100644
--- a/src/hotspot/share/opto/idealGraphPrinter.cpp
+++ b/src/hotspot/share/opto/idealGraphPrinter.cpp
@@ -542,6 +542,31 @@ void IdealGraphPrinter::visit_node(Node* n, bool edges) {
     assert(s2.size() < sizeof(buffer), "size in range");
     print_prop("dump_spec", buffer);
 
+    const TypePtr* adr_type = node->adr_type();
+    if (adr_type != nullptr && C->have_alias_type(adr_type)) {
+      Compile::AliasType* at = C->alias_type(adr_type);
+      if (at != nullptr) {
+        print_prop("alias_index", at->index());
+        // The value of at->field(), if present, is already dumped in the
+        // "source"/"destination" properties.
+        const Type* element = at->element();
+        if (element != nullptr) {
+          stringStream element_stream;
+          element->dump_on(&element_stream);
+          print_prop("alias_element", element_stream.freeze());
+        }
+        if (at->is_rewritable()) {
+          print_prop("alias_is_rewritable", "true");
+        }
+        if (at->is_volatile()) {
+          print_prop("alias_is_volatile", "true");
+        }
+        if (at->general_index() != at->index()) {
+          print_prop("alias_general_index", at->general_index());
+        }
+      }
+    }
+
     if (node->is_block_proj()) {
       print_prop("is_block_proj", "true");
     }
diff --git a/src/hotspot/share/opto/idealGraphPrinter.hpp b/src/hotspot/share/opto/idealGraphPrinter.hpp
index 042ac694843..aab35c7a908 100644
--- a/src/hotspot/share/opto/idealGraphPrinter.hpp
+++ b/src/hotspot/share/opto/idealGraphPrinter.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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,7 +98,7 @@ class IdealGraphPrinter : public CHeapObj<mtCompiler> {
   outputStream *_output;
   ciMethod *_current_method;
   int _depth;
-  char buffer[512];
+  char buffer[2048];
   bool _should_send_method;
   PhaseChaitin* _chaitin;
   bool _traverse_outs;
diff --git a/src/utils/IdealGraphVisualizer/ServerCompiler/src/main/resources/com/sun/hotspot/igv/servercompiler/filters/showTypes.filter b/src/utils/IdealGraphVisualizer/ServerCompiler/src/main/resources/com/sun/hotspot/igv/servercompiler/filters/showTypes.filter
index 16360d78c18..a50729080a8 100644
--- a/src/utils/IdealGraphVisualizer/ServerCompiler/src/main/resources/com/sun/hotspot/igv/servercompiler/filters/showTypes.filter
+++ b/src/utils/IdealGraphVisualizer/ServerCompiler/src/main/resources/com/sun/hotspot/igv/servercompiler/filters/showTypes.filter
@@ -44,8 +44,16 @@ function simplifyType(type) {
 }
 
 // Merge a possibly existing extra label, bottom type, and phase type into a
-// new, single extra label.
-function mergeAndAppendTypeInfo(extra_label, bottom_type, phase_type) {
+// new, single extra label. For memory nodes, add an extra label with the memory
+// slice, extracted from the dump_spec field.
+function mergeAndAppendTypeInfo(extra_label, bottom_type, phase_type, category, dump_spec) {
+  new_extra_label = extra_label == null ? "" : (extra_label + " ");
+  if (category == "memory") {
+    m = /idx=([^\s]+);/.exec(dump_spec);
+    if (m != null) {
+      return new_extra_label + "mem: " + m[1];
+    }
+  }
   if (phase_type == null && bottom_type == null) {
     return extra_label;
   }
@@ -62,11 +70,10 @@ function mergeAndAppendTypeInfo(extra_label, bottom_type, phase_type) {
     type += "B: ";
     type += simplifyType(bottom_type);
   }
-  new_extra_label = extra_label == null ? "" : (extra_label + " ");
   return new_extra_label + type;
 }
 
 editProperty(not(or([matches("bottom_type", "bottom"),
                      matches("bottom_type", "abIO")])),
-             ["extra_label", "bottom_type", "phase_type"], "extra_label",
-             function(propertyValues) {return mergeAndAppendTypeInfo(propertyValues[0], propertyValues[1], propertyValues[2]);});
+             ["extra_label", "bottom_type", "phase_type", "category", "dump_spec"], "extra_label",
+             function(propertyValues) {return mergeAndAppendTypeInfo(propertyValues[0], propertyValues[1], propertyValues[2], propertyValues[3], propertyValues[4]);});

From d13fd5738f8a3d4b4009c2e15cfd967332d97bbd Mon Sep 17 00:00:00 2001
From: Aleksey Shipilev <shade@openjdk.org>
Date: Wed, 19 Feb 2025 11:02:14 +0000
Subject: [PATCH 051/587] 8350211: CTW: Attempt to preload all classes in
 constant pool

Reviewed-by: vlivanov, chagedorn
---
 .../ctw/src/sun/hotspot/tools/ctw/Compiler.java   | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/test/hotspot/jtreg/testlibrary/ctw/src/sun/hotspot/tools/ctw/Compiler.java b/test/hotspot/jtreg/testlibrary/ctw/src/sun/hotspot/tools/ctw/Compiler.java
index de804b3d2c8..b8f2919e594 100644
--- a/test/hotspot/jtreg/testlibrary/ctw/src/sun/hotspot/tools/ctw/Compiler.java
+++ b/test/hotspot/jtreg/testlibrary/ctw/src/sun/hotspot/tools/ctw/Compiler.java
@@ -122,17 +122,16 @@ public class Compiler {
 
     private static void preloadClasses(String className, long id,
             ConstantPool constantPool) {
-        try {
-            for (int i = 0, n = constantPool.getSize(); i < n; ++i) {
-                try {
+        for (int i = 0, n = constantPool.getSize(); i < n; ++i) {
+            try {
+                if (constantPool.getTagAt(i) == ConstantPool.Tag.CLASS) {
                     constantPool.getClassAt(i);
-                } catch (IllegalArgumentException ignore) {
                 }
+            } catch (Throwable t) {
+                CompileTheWorld.OUT.println(String.format("[%d]\t%s\tWARNING preloading failed : %s",
+                         id, className, t));
+                t.printStackTrace(CompileTheWorld.ERR);
             }
-        } catch (Throwable t) {
-            CompileTheWorld.OUT.println(String.format("[%d]\t%s\tWARNING preloading failed : %s",
-                    id, className, t));
-            t.printStackTrace(CompileTheWorld.ERR);
         }
     }
 

From 79db2d4186eb2af827295581464be8602ac95f98 Mon Sep 17 00:00:00 2001
From: Aleksey Shipilev <shade@openjdk.org>
Date: Wed, 19 Feb 2025 11:33:57 +0000
Subject: [PATCH 052/587] 8350159: compiler/tiered/Level2RecompilationTest.java
 fails after JDK-8349915

Reviewed-by: kvn, chagedorn
---
 src/hotspot/share/compiler/compilationPolicy.cpp | 6 +++---
 test/hotspot/jtreg/ProblemList.txt               | 2 --
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/hotspot/share/compiler/compilationPolicy.cpp b/src/hotspot/share/compiler/compilationPolicy.cpp
index 7f2a67f641b..82061d92daa 100644
--- a/src/hotspot/share/compiler/compilationPolicy.cpp
+++ b/src/hotspot/share/compiler/compilationPolicy.cpp
@@ -633,9 +633,9 @@ CompileTask* CompilationPolicy::select_task(CompileQueue* compile_queue) {
       task = next_task;
       continue;
     }
-    if (task->compile_reason() == CompileTask::Reason_Whitebox) {
-      // Whitebox (CTW) tasks do not participate in rate selection and/or any level
-      // adjustments. Just return them in order.
+    if (task->is_blocking() && task->compile_reason() == CompileTask::Reason_Whitebox) {
+      // CTW tasks, submitted as blocking Whitebox requests, do not participate in rate
+      // selection and/or any level adjustments. Just return them in order.
       return task;
     }
     Method* method = task->method();
diff --git a/test/hotspot/jtreg/ProblemList.txt b/test/hotspot/jtreg/ProblemList.txt
index 991d0435a91..e8656a74f4b 100644
--- a/test/hotspot/jtreg/ProblemList.txt
+++ b/test/hotspot/jtreg/ProblemList.txt
@@ -43,8 +43,6 @@
 
 # :hotspot_compiler
 
-compiler/tiered/Level2RecompilationTest.java 8350159 generic-all
-
 compiler/ciReplay/TestSAServer.java 8029528 generic-all
 compiler/compilercontrol/jcmd/ClearDirectivesFileStackTest.java 8225370 generic-all
 

From 2353f3e2f18ccaa972ee7a292d5a45035c647881 Mon Sep 17 00:00:00 2001
From: Aleksey Shipilev <shade@openjdk.org>
Date: Wed, 19 Feb 2025 11:35:00 +0000
Subject: [PATCH 053/587] 8350210: CTW: Use stackless exceptions

Reviewed-by: kvn, chagedorn
---
 .../testlibrary/ctw/src/sun/hotspot/tools/ctw/CtwRunner.java    | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/test/hotspot/jtreg/testlibrary/ctw/src/sun/hotspot/tools/ctw/CtwRunner.java b/test/hotspot/jtreg/testlibrary/ctw/src/sun/hotspot/tools/ctw/CtwRunner.java
index c909d34eae8..573b70faabe 100644
--- a/test/hotspot/jtreg/testlibrary/ctw/src/sun/hotspot/tools/ctw/CtwRunner.java
+++ b/test/hotspot/jtreg/testlibrary/ctw/src/sun/hotspot/tools/ctw/CtwRunner.java
@@ -305,6 +305,8 @@ public class CtwRunner {
                 // Expand the optimization scope by disallowing most traps.
                 "-XX:PerMethodTrapLimit=0",
                 "-XX:PerMethodSpecTrapLimit=0",
+                // Do not pay extra stack trace generation cost for normally thrown exceptions
+                "-XX:-StackTraceInThrowable",
                 "-XX:+IgnoreUnrecognizedVMOptions",
                 // Do not pay extra zapping cost for explicit GC invocations
                 "-XX:-ZapUnusedHeapArea",

From 59810ad745b28f50d287fa8db650c3f1924791d9 Mon Sep 17 00:00:00 2001
From: Matthias Baesken <mbaesken@openjdk.org>
Date: Wed, 19 Feb 2025 12:14:04 +0000
Subject: [PATCH 054/587] 8350201: Out of bounds access on Linux aarch64 in
 os::print_register_info

Reviewed-by: dholmes, mdoerr
---
 src/hotspot/os_cpu/aix_ppc/os_aix_ppc.cpp             | 2 +-
 src/hotspot/os_cpu/linux_aarch64/os_linux_aarch64.cpp | 2 +-
 src/hotspot/os_cpu/linux_ppc/os_linux_ppc.cpp         | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

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 720c732327e..3d11bfe037a 100644
--- a/src/hotspot/os_cpu/aix_ppc/os_aix_ppc.cpp
+++ b/src/hotspot/os_cpu/aix_ppc/os_aix_ppc.cpp
@@ -447,7 +447,7 @@ void os::print_context(outputStream *st, const void *context) {
 }
 
 void os::print_register_info(outputStream *st, const void *context, int& continuation) {
-  const int register_count = 32 /* r0-r32 */ + 3 /* pc, lr, sp */;
+  const int register_count = 32 /* r0-r31 */ + 3 /* pc, lr, sp */;
   int n = continuation;
   assert(n >= 0 && n <= register_count, "Invalid continuation value");
   if (context == nullptr || n == register_count) {
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 171b40e414e..7728c62682c 100644
--- a/src/hotspot/os_cpu/linux_aarch64/os_linux_aarch64.cpp
+++ b/src/hotspot/os_cpu/linux_aarch64/os_linux_aarch64.cpp
@@ -354,7 +354,7 @@ void os::print_context(outputStream *st, const void *context) {
 }
 
 void os::print_register_info(outputStream *st, const void *context, int& continuation) {
-  const int register_count = 32 /* r0-r31 */;
+  const int register_count = 31 /* r0-r30 */;
   int n = continuation;
   assert(n >= 0 && n <= register_count, "Invalid continuation value");
   if (context == nullptr || n == register_count) {
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 11ac1b01784..81fede02956 100644
--- a/src/hotspot/os_cpu/linux_ppc/os_linux_ppc.cpp
+++ b/src/hotspot/os_cpu/linux_ppc/os_linux_ppc.cpp
@@ -467,7 +467,7 @@ void os::print_context(outputStream *st, const void *context) {
 }
 
 void os::print_register_info(outputStream *st, const void *context, int& continuation) {
-  const int register_count = 32 /* r0-r32 */ + 3 /* pc, lr, ctr */;
+  const int register_count = 32 /* r0-r31 */ + 3 /* pc, lr, ctr */;
   int n = continuation;
   assert(n >= 0 && n <= register_count, "Invalid continuation value");
   if (context == nullptr || n == register_count) {

From 014701a09b23d21f57edb5b085820532804475bd Mon Sep 17 00:00:00 2001
From: Alexey Ivanov <aivanov@openjdk.org>
Date: Wed, 19 Feb 2025 12:22:51 +0000
Subject: [PATCH 055/587] 8350260: Improve HTML instruction formatting in
 PassFailJFrame

Reviewed-by: kizune, azvegint, abhiscxk
---
 test/jdk/java/awt/regtesthelpers/PassFailJFrame.java | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/test/jdk/java/awt/regtesthelpers/PassFailJFrame.java b/test/jdk/java/awt/regtesthelpers/PassFailJFrame.java
index 5f559ea47c3..5b825bb4c37 100644
--- a/test/jdk/java/awt/regtesthelpers/PassFailJFrame.java
+++ b/test/jdk/java/awt/regtesthelpers/PassFailJFrame.java
@@ -633,6 +633,8 @@ public final class PassFailJFrame {
                               ? configureHTML(instructions, rows, columns)
                               : configurePlainText(instructions, rows, columns);
         text.setEditable(false);
+        text.setBorder(createTextBorder());
+        text.setCaretPosition(0);
 
         JPanel textPanel = new JPanel(new BorderLayout());
         textPanel.setBorder(createEmptyBorder(GAP, 0, GAP, 0));
@@ -687,7 +689,6 @@ public final class PassFailJFrame {
         JTextArea text = new JTextArea(instructions, rows, columns);
         text.setLineWrap(true);
         text.setWrapStyleWord(true);
-        text.setBorder(createTextBorder());
         return text;
     }
 
@@ -701,10 +702,10 @@ public final class PassFailJFrame {
 
         HTMLEditorKit kit = (HTMLEditorKit) text.getEditorKit();
         StyleSheet styles = kit.getStyleSheet();
-        // Reduce the default margins
-        styles.addRule("ol, ul { margin-left-ltr: 20; margin-left-rtl: 20 }");
-        // Make the size of code blocks the same as other text
-        styles.addRule("code { font-size: inherit }");
+        // Reduce the list default margins
+        styles.addRule("ol, ul { margin-left-ltr: 30; margin-left-rtl: 30 }");
+        // Make the size of code (and other elements) the same as other text
+        styles.addRule("code, kbd, samp, pre { font-size: inherit }");
 
         return text;
     }

From 577ff98a6733a99ea49510f15d631beff39c34a5 Mon Sep 17 00:00:00 2001
From: Sean Mullan <mullan@openjdk.org>
Date: Wed, 19 Feb 2025 13:18:20 +0000
Subject: [PATCH 056/587] 8347946: Add API note that caller should
 validate/trust signers to the getCertificates and getCodeSigners methods of
 JarEntry and JarURLConnection

Reviewed-by: lancea, jpai
---
 .../classes/java/net/JarURLConnection.java    | 20 ++++++++++++++++---
 .../share/classes/java/util/jar/JarEntry.java | 20 ++++++++++++++++++-
 .../share/classes/java/util/jar/JarFile.java  |  4 ++--
 3 files changed, 38 insertions(+), 6 deletions(-)

diff --git a/src/java.base/share/classes/java/net/JarURLConnection.java b/src/java.base/share/classes/java/net/JarURLConnection.java
index 2c2734b08d7..160b7e8de64 100644
--- a/src/java.base/share/classes/java/net/JarURLConnection.java
+++ b/src/java.base/share/classes/java/net/JarURLConnection.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -301,9 +301,23 @@ public abstract class JarURLConnection extends URLConnection {
      * can only be called once
      * the connection has been completely verified by reading
      * from the input stream until the end of the stream has been
-     * reached. Otherwise, this method will return {@code null}
+     * reached. Otherwise, this method will return {@code null}.
      *
-     * @return the Certificate object for this connection if the URL
+     * <p>The returned certificate array comprises all the signer certificates
+     * that were used to verify this entry. Each signer certificate is
+     * followed by its supporting certificate chain (which may be empty).
+     * Each 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).
+     *
+     * @apiNote
+     * The verification process does not include validating or establishing
+     * trust in the code signers. A caller should perform additional checks,
+     * such as using a {@link java.security.cert.CertPathValidator} to
+     * validate each signer's certificate chain, and determining whether
+     * to trust the entry signed by the signers.
+     *
+     * @return the Certificate objects for this connection if the URL
      * for it points to a JAR file entry, null otherwise.
      *
      * @throws    IOException if getting the JAR entry causes an
diff --git a/src/java.base/share/classes/java/util/jar/JarEntry.java b/src/java.base/share/classes/java/util/jar/JarEntry.java
index 5e1d687e6c6..ff0750a3342 100644
--- a/src/java.base/share/classes/java/util/jar/JarEntry.java
+++ b/src/java.base/share/classes/java/util/jar/JarEntry.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -97,6 +97,9 @@ public class JarEntry extends ZipEntry {
      * from the entry input stream until the end of the stream has been
      * reached. Otherwise, this method will return {@code null}.
      *
+     * <p>It is recommended to use the {@link getCodeSigners} method instead,
+     * which returns an array of {@code CodeSigner}s.
+     *
      * <p>The returned certificate array comprises all the signer certificates
      * that were used to verify this entry. Each signer certificate is
      * followed by its supporting certificate chain (which may be empty).
@@ -104,8 +107,16 @@ public class JarEntry extends ZipEntry {
      * bottom-to-top (i.e., with the signer certificate first and the (root)
      * certificate authority last).
      *
+     * @apiNote
+     * The verification process does not include validating or establishing
+     * trust in the code signers. A caller should perform additional checks,
+     * such as using a {@link java.security.cert.CertPathValidator} to
+     * validate each signer's certificate chain, and determining whether
+     * to trust the entry signed by the signers.
+     *
      * @return the {@code Certificate} objects for this entry, or
      * {@code null} if none.
+     *
      */
     public Certificate[] getCertificates() {
         return certs == null ? null : certs.clone();
@@ -121,6 +132,13 @@ public class JarEntry extends ZipEntry {
      * <p>The returned array comprises all the code signers that have signed
      * this entry.
      *
+     * @apiNote
+     * The verification process does not include validating or establishing
+     * trust in the code signers. A caller should perform additional checks,
+     * such as using a {@link java.security.cert.CertPathValidator} to
+     * validate each signer's certificate chain, and determining whether
+     * to trust the entry signed by the signers.
+     *
      * @return the {@code CodeSigner} objects for this entry, or
      * {@code null} if none.
      *
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 7b64e3cdd04..e7725c8636f 100644
--- a/src/java.base/share/classes/java/util/jar/JarFile.java
+++ b/src/java.base/share/classes/java/util/jar/JarFile.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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,7 +93,7 @@ import java.util.zip.ZipFile;
  * multi-release jar file, the content of a versioned entry is verified against
  * its own signature and {@link JarEntry#getCodeSigners()} returns its own signers.
  *
- * Please note that the verification process does not include validating the
+ * <p>Please note that the verification process does not include validating the
  * signer's certificate. A caller should inspect the return value of
  * {@link JarEntry#getCodeSigners()} to further determine if the signature
  * can be trusted.

From c6e47fd5812997e3428249be1c77c60e7b05a5df Mon Sep 17 00:00:00 2001
From: Albert Mingkun Yang <ayang@openjdk.org>
Date: Wed, 19 Feb 2025 14:15:16 +0000
Subject: [PATCH 057/587] 8348171: Refactor GenerationCounters and its
 subclasses

Co-authored-by: Thomas Schatzl <tschatzl@openjdk.org>
Reviewed-by: gli, tschatzl, zgu
---
 .../gc/epsilon/epsilonMonitoringSupport.cpp   |  4 +-
 .../gc/epsilon/epsilonMonitoringSupport.hpp   |  4 +-
 .../share/gc/g1/g1MonitoringSupport.cpp       |  8 +--
 .../share/gc/g1/g1MonitoringSupport.hpp       |  6 +-
 .../gc/parallel/psGenerationCounters.cpp      | 66 -------------------
 .../gc/parallel/psGenerationCounters.hpp      | 51 --------------
 src/hotspot/share/gc/parallel/psOldGen.cpp    |  8 +--
 src/hotspot/share/gc/parallel/psOldGen.hpp    |  3 +-
 src/hotspot/share/gc/parallel/psYoungGen.cpp  |  6 +-
 src/hotspot/share/gc/parallel/psYoungGen.hpp  |  3 +-
 .../share/gc/serial/defNewGeneration.cpp      |  4 +-
 .../share/gc/serial/tenuredGeneration.cpp     |  4 +-
 .../share/gc/shared/generationCounters.cpp    | 31 ++-------
 .../share/gc/shared/generationCounters.hpp    | 25 +------
 .../shenandoahMonitoringSupport.cpp           |  6 +-
 .../shenandoahMonitoringSupport.hpp           |  7 +-
 src/hotspot/share/gc/z/zServiceability.cpp    |  2 +-
 17 files changed, 42 insertions(+), 196 deletions(-)
 delete mode 100644 src/hotspot/share/gc/parallel/psGenerationCounters.cpp
 delete mode 100644 src/hotspot/share/gc/parallel/psGenerationCounters.hpp

diff --git a/src/hotspot/share/gc/epsilon/epsilonMonitoringSupport.cpp b/src/hotspot/share/gc/epsilon/epsilonMonitoringSupport.cpp
index 55f15fb473d..540ede9dd83 100644
--- a/src/hotspot/share/gc/epsilon/epsilonMonitoringSupport.cpp
+++ b/src/hotspot/share/gc/epsilon/epsilonMonitoringSupport.cpp
@@ -90,8 +90,8 @@ public:
           _heap(heap)
   {};
 
-  virtual void update_all() {
-    _current_size->set_value(_heap->capacity());
+  void update_all() {
+    GenerationCounters::update_all(_heap->capacity());
   }
 };
 
diff --git a/src/hotspot/share/gc/epsilon/epsilonMonitoringSupport.hpp b/src/hotspot/share/gc/epsilon/epsilonMonitoringSupport.hpp
index 73cfc943612..67a60d92778 100644
--- a/src/hotspot/share/gc/epsilon/epsilonMonitoringSupport.hpp
+++ b/src/hotspot/share/gc/epsilon/epsilonMonitoringSupport.hpp
@@ -27,13 +27,13 @@
 
 #include "memory/allocation.hpp"
 
-class GenerationCounters;
+class EpsilonGenerationCounters;
 class EpsilonSpaceCounters;
 class EpsilonHeap;
 
 class EpsilonMonitoringSupport : public CHeapObj<mtGC> {
 private:
-  GenerationCounters*   _heap_counters;
+  EpsilonGenerationCounters* _heap_counters;
   EpsilonSpaceCounters* _space_counters;
 
 public:
diff --git a/src/hotspot/share/gc/g1/g1MonitoringSupport.cpp b/src/hotspot/share/gc/g1/g1MonitoringSupport.cpp
index e018515a051..03bd1840206 100644
--- a/src/hotspot/share/gc/g1/g1MonitoringSupport.cpp
+++ b/src/hotspot/share/gc/g1/g1MonitoringSupport.cpp
@@ -60,9 +60,9 @@ public:
     }
   }
 
-  virtual void update_all() {
+  void update_all() {
     size_t committed = _monitoring_support->young_gen_committed();
-    _current_size->set_value(committed);
+    GenerationCounters::update_all(committed);
   }
 };
 
@@ -81,9 +81,9 @@ public:
     }
   }
 
-  virtual void update_all() {
+  void update_all() {
     size_t committed = _monitoring_support->old_gen_committed();
-    _current_size->set_value(committed);
+    GenerationCounters::update_all(committed);
   }
 };
 
diff --git a/src/hotspot/share/gc/g1/g1MonitoringSupport.hpp b/src/hotspot/share/gc/g1/g1MonitoringSupport.hpp
index 1f62b53d97c..f22581ad9b1 100644
--- a/src/hotspot/share/gc/g1/g1MonitoringSupport.hpp
+++ b/src/hotspot/share/gc/g1/g1MonitoringSupport.hpp
@@ -33,6 +33,8 @@
 
 class CollectorCounters;
 class G1CollectedHeap;
+class G1OldGenerationCounters;
+class G1YoungGenerationCounters;
 class HSpaceCounters;
 class MemoryPool;
 
@@ -146,10 +148,10 @@ class G1MonitoringSupport : public CHeapObj<mtGC> {
   //  young collection set counters.  The _eden_counters,
   // _from_counters, and _to_counters are associated with
   // this "generational" counter.
-  GenerationCounters*  _young_gen_counters;
+  G1YoungGenerationCounters*  _young_gen_counters;
   //  old collection set counters. The _old_space_counters
   // below are associated with this "generational" counter.
-  GenerationCounters*  _old_gen_counters;
+  G1OldGenerationCounters*  _old_gen_counters;
   // Counters for the capacity and used for
   //   the whole heap
   HSpaceCounters*      _old_space_counters;
diff --git a/src/hotspot/share/gc/parallel/psGenerationCounters.cpp b/src/hotspot/share/gc/parallel/psGenerationCounters.cpp
deleted file mode 100644
index 8792df7cf27..00000000000
--- a/src/hotspot/share/gc/parallel/psGenerationCounters.cpp
+++ /dev/null
@@ -1,66 +0,0 @@
-
-/*
- * Copyright (c) 2004, 2025, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please 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 "gc/parallel/psGenerationCounters.hpp"
-#include "memory/allocation.inline.hpp"
-#include "memory/resourceArea.hpp"
-
-PSGenerationCounters::PSGenerationCounters(const char* name,
-                                       int ordinal, int spaces,
-                                       size_t min_capacity,
-                                       size_t max_capacity,
-                                       PSVirtualSpace* v):
-    _ps_virtual_space(v) {
-
-  if (UsePerfData) {
-
-    EXCEPTION_MARK;
-    ResourceMark rm;
-
-    const char* cns = PerfDataManager::name_space("generation", ordinal);
-
-    _name_space = NEW_C_HEAP_ARRAY(char, strlen(cns)+1, mtGC);
-    strcpy(_name_space, cns);
-
-    const char* cname = PerfDataManager::counter_name(_name_space, "name");
-    PerfDataManager::create_string_constant(SUN_GC, cname, name, CHECK);
-
-    cname = PerfDataManager::counter_name(_name_space, "spaces");
-    PerfDataManager::create_constant(SUN_GC, cname, PerfData::U_None,
-                                     spaces, CHECK);
-
-    cname = PerfDataManager::counter_name(_name_space, "minCapacity");
-    PerfDataManager::create_constant(SUN_GC, cname, PerfData::U_Bytes,
-      min_capacity, CHECK);
-
-    cname = PerfDataManager::counter_name(_name_space, "maxCapacity");
-    PerfDataManager::create_constant(SUN_GC, cname, PerfData::U_Bytes,
-      max_capacity, CHECK);
-
-    cname = PerfDataManager::counter_name(_name_space, "capacity");
-    _current_size = PerfDataManager::create_variable(SUN_GC, cname,
-       PerfData::U_Bytes, _ps_virtual_space->committed_size(), CHECK);
-  }
-}
diff --git a/src/hotspot/share/gc/parallel/psGenerationCounters.hpp b/src/hotspot/share/gc/parallel/psGenerationCounters.hpp
deleted file mode 100644
index 60385965feb..00000000000
--- a/src/hotspot/share/gc/parallel/psGenerationCounters.hpp
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright (c) 2004, 2023, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- *
- */
-
-#ifndef SHARE_GC_PARALLEL_PSGENERATIONCOUNTERS_HPP
-#define SHARE_GC_PARALLEL_PSGENERATIONCOUNTERS_HPP
-
-#include "gc/parallel/psVirtualspace.hpp"
-#include "gc/shared/generationCounters.hpp"
-#include "runtime/perfData.hpp"
-
-// A PSGenerationCounter is a holder class for performance counters
-// that track a generation
-
-class PSGenerationCounters: public GenerationCounters {
-  friend class VMStructs;
-
- private:
-  PSVirtualSpace*      _ps_virtual_space;
-
- public:
-  PSGenerationCounters(const char* name, int ordinal, int spaces,
-                       size_t min_capacity, size_t max_capacity, PSVirtualSpace* v);
-
-  void update_all() {
-    assert(_virtual_space == nullptr, "Only one should be in use");
-    _current_size->set_value(_ps_virtual_space->committed_size());
-  }
-};
-
-#endif // SHARE_GC_PARALLEL_PSGENERATIONCOUNTERS_HPP
diff --git a/src/hotspot/share/gc/parallel/psOldGen.cpp b/src/hotspot/share/gc/parallel/psOldGen.cpp
index ab74d3468e1..8eadc833ac7 100644
--- a/src/hotspot/share/gc/parallel/psOldGen.cpp
+++ b/src/hotspot/share/gc/parallel/psOldGen.cpp
@@ -113,8 +113,8 @@ void PSOldGen::initialize_work(const char* perf_data_name, int level) {
 
 void PSOldGen::initialize_performance_counters(const char* perf_data_name, int level) {
   // Generation Counters, generation 'level', 1 subspace
-  _gen_counters = new PSGenerationCounters(perf_data_name, level, 1, min_gen_size(),
-                                           max_gen_size(), virtual_space());
+  _gen_counters = new GenerationCounters(perf_data_name, level, 1, min_gen_size(),
+                                         max_gen_size(), virtual_space()->committed_size());
   _space_counters = new SpaceCounters(perf_data_name, 0,
                                       virtual_space()->reserved_size(),
                                       _object_space, _gen_counters);
@@ -243,7 +243,7 @@ bool PSOldGen::expand_by(size_t bytes) {
     post_resize();
     if (UsePerfData) {
       _space_counters->update_capacity();
-      _gen_counters->update_all();
+      _gen_counters->update_all(_virtual_space->committed_size());
     }
   }
 
@@ -379,7 +379,7 @@ void PSOldGen::print_on(outputStream* st) const {
 void PSOldGen::update_counters() {
   if (UsePerfData) {
     _space_counters->update_all();
-    _gen_counters->update_all();
+    _gen_counters->update_all(_virtual_space->committed_size());
   }
 }
 
diff --git a/src/hotspot/share/gc/parallel/psOldGen.hpp b/src/hotspot/share/gc/parallel/psOldGen.hpp
index c2ae50bfcf8..138b2a5b30c 100644
--- a/src/hotspot/share/gc/parallel/psOldGen.hpp
+++ b/src/hotspot/share/gc/parallel/psOldGen.hpp
@@ -27,7 +27,6 @@
 
 #include "gc/parallel/mutableSpace.hpp"
 #include "gc/parallel/objectStartArray.hpp"
-#include "gc/parallel/psGenerationCounters.hpp"
 #include "gc/parallel/psVirtualspace.hpp"
 #include "gc/parallel/spaceCounters.hpp"
 #include "runtime/mutexLocker.hpp"
@@ -43,7 +42,7 @@ class PSOldGen : public CHeapObj<mtGC> {
   MutableSpace*            _object_space;      // Where all the objects live
 
   // Performance Counters
-  PSGenerationCounters*    _gen_counters;
+  GenerationCounters*      _gen_counters;
   SpaceCounters*           _space_counters;
 
   // Sizing information, in bytes, set in constructor
diff --git a/src/hotspot/share/gc/parallel/psYoungGen.cpp b/src/hotspot/share/gc/parallel/psYoungGen.cpp
index 82b946201d2..309b293e5ac 100644
--- a/src/hotspot/share/gc/parallel/psYoungGen.cpp
+++ b/src/hotspot/share/gc/parallel/psYoungGen.cpp
@@ -91,8 +91,8 @@ void PSYoungGen::initialize_work() {
   _to_space   = new MutableSpace(virtual_space()->alignment());
 
   // Generation Counters - generation 0, 3 subspaces
-  _gen_counters = new PSGenerationCounters("new", 0, 3, min_gen_size(),
-                                           max_gen_size(), virtual_space());
+  _gen_counters = new GenerationCounters("new", 0, 3, min_gen_size(),
+                                         max_gen_size(), virtual_space()->committed_size());
 
   // Compute maximum space sizes for performance counters
   size_t alignment = SpaceAlignment;
@@ -809,7 +809,7 @@ void PSYoungGen::update_counters() {
     _eden_counters->update_all();
     _from_counters->update_all();
     _to_counters->update_all();
-    _gen_counters->update_all();
+    _gen_counters->update_all(_virtual_space->committed_size());
   }
 }
 
diff --git a/src/hotspot/share/gc/parallel/psYoungGen.hpp b/src/hotspot/share/gc/parallel/psYoungGen.hpp
index e6e73b8aee2..5140ea08bd1 100644
--- a/src/hotspot/share/gc/parallel/psYoungGen.hpp
+++ b/src/hotspot/share/gc/parallel/psYoungGen.hpp
@@ -27,7 +27,6 @@
 
 #include "gc/parallel/mutableSpace.hpp"
 #include "gc/parallel/objectStartArray.hpp"
-#include "gc/parallel/psGenerationCounters.hpp"
 #include "gc/parallel/psVirtualspace.hpp"
 #include "gc/parallel/spaceCounters.hpp"
 
@@ -51,7 +50,7 @@ class PSYoungGen : public CHeapObj<mtGC> {
   const size_t _max_gen_size;
 
   // Performance counters
-  PSGenerationCounters* _gen_counters;
+  GenerationCounters*   _gen_counters;
   SpaceCounters*        _eden_counters;
   SpaceCounters*        _from_counters;
   SpaceCounters*        _to_counters;
diff --git a/src/hotspot/share/gc/serial/defNewGeneration.cpp b/src/hotspot/share/gc/serial/defNewGeneration.cpp
index f637eb62a00..c5c1b67d5cf 100644
--- a/src/hotspot/share/gc/serial/defNewGeneration.cpp
+++ b/src/hotspot/share/gc/serial/defNewGeneration.cpp
@@ -250,7 +250,7 @@ DefNewGeneration::DefNewGeneration(ReservedSpace rs,
 
   // Generation counters -- generation 0, 3 subspaces
   _gen_counters = new GenerationCounters("new", 0, 3,
-      min_size, max_size, &_virtual_space);
+      min_size, max_size, _virtual_space.committed_size());
   _gc_counters = new CollectorCounters(policy, 0);
 
   _eden_counters = new CSpaceCounters("eden", 0, _max_eden_size, _eden_space,
@@ -826,7 +826,7 @@ void DefNewGeneration::update_counters() {
     _eden_counters->update_all();
     _from_counters->update_all();
     _to_counters->update_all();
-    _gen_counters->update_all();
+    _gen_counters->update_all(_virtual_space.committed_size());
   }
 }
 
diff --git a/src/hotspot/share/gc/serial/tenuredGeneration.cpp b/src/hotspot/share/gc/serial/tenuredGeneration.cpp
index e3b7eef478a..c793f138de0 100644
--- a/src/hotspot/share/gc/serial/tenuredGeneration.cpp
+++ b/src/hotspot/share/gc/serial/tenuredGeneration.cpp
@@ -329,7 +329,7 @@ TenuredGeneration::TenuredGeneration(ReservedSpace rs,
   const char* gen_name = "old";
   // Generation Counters -- generation 1, 1 subspace
   _gen_counters = new GenerationCounters(gen_name, 1, 1,
-      min_byte_size, max_byte_size, &_virtual_space);
+      min_byte_size, max_byte_size, _virtual_space.committed_size());
 
   _gc_counters = new CollectorCounters("Serial full collection pauses", 1);
 
@@ -371,7 +371,7 @@ void TenuredGeneration::update_promote_stats() {
 void TenuredGeneration::update_counters() {
   if (UsePerfData) {
     _space_counters->update_all();
-    _gen_counters->update_all();
+    _gen_counters->update_all(_virtual_space.committed_size());
   }
 }
 
diff --git a/src/hotspot/share/gc/shared/generationCounters.cpp b/src/hotspot/share/gc/shared/generationCounters.cpp
index a8e5889dd8e..4af7b412aea 100644
--- a/src/hotspot/share/gc/shared/generationCounters.cpp
+++ b/src/hotspot/share/gc/shared/generationCounters.cpp
@@ -28,9 +28,10 @@
 #include "memory/virtualspace.hpp"
 #include "runtime/perfData.hpp"
 
-void GenerationCounters::initialize(const char* name, int ordinal, int spaces,
-                                    size_t min_capacity, size_t max_capacity,
-                                    size_t curr_capacity) {
+GenerationCounters::GenerationCounters(const char* name,
+                                       int ordinal, int spaces,
+                                       size_t min_capacity, size_t max_capacity,
+                                       size_t curr_capacity) {
   if (UsePerfData) {
     EXCEPTION_MARK;
     ResourceMark rm;
@@ -62,29 +63,11 @@ void GenerationCounters::initialize(const char* name, int ordinal, int spaces,
   }
 }
 
-GenerationCounters::GenerationCounters(const char* name,
-                                       int ordinal, int spaces,
-                                       size_t min_capacity, size_t max_capacity,
-                                       VirtualSpace* v)
-  : _virtual_space(v) {
-  assert(v != nullptr, "don't call this constructor if v == nullptr");
-  initialize(name, ordinal, spaces,
-             min_capacity, max_capacity, v->committed_size());
-}
-
-GenerationCounters::GenerationCounters(const char* name,
-                                       int ordinal, int spaces,
-                                       size_t min_capacity, size_t max_capacity,
-                                       size_t curr_capacity)
-  : _virtual_space(nullptr) {
-  initialize(name, ordinal, spaces, min_capacity, max_capacity, curr_capacity);
-}
-
 GenerationCounters::~GenerationCounters() {
   FREE_C_HEAP_ARRAY(char, _name_space);
 }
 
-void GenerationCounters::update_all() {
-  assert(_virtual_space != nullptr, "otherwise, override this method");
-  _current_size->set_value(_virtual_space->committed_size());
+void GenerationCounters::update_all(size_t curr_capacity) {
+  _current_size->set_value(curr_capacity);
 }
+
diff --git a/src/hotspot/share/gc/shared/generationCounters.hpp b/src/hotspot/share/gc/shared/generationCounters.hpp
index 603d9850a73..50672ab5d74 100644
--- a/src/hotspot/share/gc/shared/generationCounters.hpp
+++ b/src/hotspot/share/gc/shared/generationCounters.hpp
@@ -28,22 +28,13 @@
 #include "memory/allocation.hpp"
 #include "runtime/perfDataTypes.hpp"
 
-class VirtualSpace;
-
 // A GenerationCounter is a holder class for performance counters
 // that track a generation
 
 class GenerationCounters: public CHeapObj<mtGC> {
   friend class VMStructs;
 
-private:
-  void initialize(const char* name, int ordinal, int spaces,
-                  size_t min_capacity, size_t max_capacity,
-                  size_t curr_capacity);
-
- protected:
   PerfVariable*      _current_size;
-  VirtualSpace*      _virtual_space;
 
   // Constant PerfData types don't need to retain a reference.
   // However, it's a good idea to document them here.
@@ -54,27 +45,15 @@ private:
 
   char*              _name_space;
 
-  // This constructor is only meant for use with the PSGenerationCounters
-  // constructor. The need for such an constructor should be eliminated
-  // when VirtualSpace and PSVirtualSpace are unified.
-  GenerationCounters()
-             : _current_size(nullptr), _virtual_space(nullptr), _name_space(nullptr) {}
-
-  // This constructor is used for subclasses that do not have a space
-  // associated with them (e.g, in G1).
+ public:
   GenerationCounters(const char* name, int ordinal, int spaces,
                      size_t min_capacity, size_t max_capacity,
                      size_t curr_capacity);
 
- public:
-  GenerationCounters(const char* name, int ordinal, int spaces,
-                     size_t min_capacity, size_t max_capacity, VirtualSpace* v);
-
   ~GenerationCounters();
 
-  virtual void update_all();
+  void update_all(size_t curr_capacity);
 
   const char* name_space() const        { return _name_space; }
-
 };
 #endif // SHARE_GC_SHARED_GENERATIONCOUNTERS_HPP
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahMonitoringSupport.cpp b/src/hotspot/share/gc/shenandoah/shenandoahMonitoringSupport.cpp
index 77d586dd90b..31265addda8 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahMonitoringSupport.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahMonitoringSupport.cpp
@@ -36,7 +36,7 @@ public:
   ShenandoahYoungGenerationCounters() :
           GenerationCounters("Young", 0, 0, 0, (size_t)0, (size_t)0) {};
 
-  void update_all() override {
+  void update_all() {
     // no update
   }
 };
@@ -50,8 +50,8 @@ public:
           _heap(heap)
   {};
 
-  void update_all() override {
-    _current_size->set_value(_heap->capacity());
+  void update_all() {
+    GenerationCounters::update_all(_heap->capacity());
   }
 };
 
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahMonitoringSupport.hpp b/src/hotspot/share/gc/shenandoah/shenandoahMonitoringSupport.hpp
index 2d90f887707..c58c91e1622 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahMonitoringSupport.hpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahMonitoringSupport.hpp
@@ -29,12 +29,13 @@
 #include "memory/allocation.hpp"
 #include "runtime/task.hpp"
 
-class GenerationCounters;
 class HSpaceCounters;
 class ShenandoahHeap;
 class CollectorCounters;
 class ShenandoahHeapRegionCounters;
 class ShenandoahMonitoringSupport;
+class ShenandoahGenerationCounters;
+class ShenandoahYoungGenerationCounters;
 
 class ShenandoahPeriodicCountersUpdateTask : public PeriodicTask {
 private:
@@ -60,8 +61,8 @@ private:
   CollectorCounters*   _partial_counters;
   CollectorCounters*   _full_counters;
 
-  GenerationCounters* _young_counters;
-  GenerationCounters* _heap_counters;
+  ShenandoahYoungGenerationCounters* _young_counters;
+  ShenandoahGenerationCounters*      _heap_counters;
 
   HSpaceCounters* _space_counters;
 
diff --git a/src/hotspot/share/gc/z/zServiceability.cpp b/src/hotspot/share/gc/z/zServiceability.cpp
index f2a7ad2dc1a..076d310ff71 100644
--- a/src/hotspot/share/gc/z/zServiceability.cpp
+++ b/src/hotspot/share/gc/z/zServiceability.cpp
@@ -66,7 +66,7 @@ public:
                          curr_capacity) {}
 
   void update_capacity(size_t capacity) {
-    _current_size->set_value(capacity);
+    update_all(capacity);
   }
 };
 

From efbad00c4d7931177ccc5e9bce3b30dfbac94010 Mon Sep 17 00:00:00 2001
From: Ivan Walulya <iwalulya@openjdk.org>
Date: Wed, 19 Feb 2025 14:27:33 +0000
Subject: [PATCH 058/587] 8349688: G1: Wrong initial optional region index when
 selecting candidates from retained regions

Reviewed-by: tschatzl, ayang
---
 src/hotspot/share/gc/g1/g1CollectionSet.cpp | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/hotspot/share/gc/g1/g1CollectionSet.cpp b/src/hotspot/share/gc/g1/g1CollectionSet.cpp
index 19056245152..075951ab07c 100644
--- a/src/hotspot/share/gc/g1/g1CollectionSet.cpp
+++ b/src/hotspot/share/gc/g1/g1CollectionSet.cpp
@@ -383,6 +383,8 @@ double G1CollectionSet::select_candidates_from_marking(double time_remaining_ms)
   uint num_initial_groups = 0;
   uint num_optional_regions = 0;
 
+  assert(_optional_groups.num_regions() == 0, "Optional regions should not already be selected");
+
   double predicted_initial_time_ms = 0.0;
   double predicted_optional_time_ms = 0.0;
 
@@ -483,7 +485,8 @@ double G1CollectionSet::select_candidates_from_marking(double time_remaining_ms)
 
 void G1CollectionSet::select_candidates_from_retained(double time_remaining_ms) {
   uint num_initial_regions = 0;
-  uint num_optional_regions = 0;
+  uint prev_num_optional_regions = _optional_groups.num_regions();
+  uint num_optional_regions = prev_num_optional_regions;
   uint num_expensive_regions = 0;
   uint num_pinned_regions = 0;
 
@@ -576,10 +579,13 @@ void G1CollectionSet::select_candidates_from_retained(double time_remaining_ms)
 
   groups_to_abandon.clear(true /* uninstall_group_cardset */);
 
+  assert(num_optional_regions >= prev_num_optional_regions, "Sanity");
+  uint selected_optional_regions = num_optional_regions - prev_num_optional_regions;
+
   log_debug(gc, ergo, cset)("Finish adding retained candidates to collection set. Initial: %u, optional: %u, pinned: %u, "
                             "predicted initial time: %1.2fms, predicted optional time: %1.2fms, "
                             "time remaining: %1.2fms optional time remaining %1.2fms",
-                            num_initial_regions, num_optional_regions, num_pinned_regions,
+                            num_initial_regions, selected_optional_regions, num_pinned_regions,
                             predicted_initial_time_ms, predicted_optional_time_ms, time_remaining_ms, optional_time_remaining_ms);
 }
 

From 70a6c0b7ac952eebdffa1d64399cd0ee1efec1f6 Mon Sep 17 00:00:00 2001
From: konanki sreenath <konanki.sreenath@oracle.com>
Date: Wed, 19 Feb 2025 16:47:54 +0000
Subject: [PATCH 059/587] 8346094: Harden X509CertImpl.getExtensionValue for
 NPE cases

Reviewed-by: coffeys, weijun
---
 .../sun/security/x509/X509CertImpl.java       |  71 ++-----
 .../HostnameChecker/TestHostnameChecker.java  |   5 +-
 .../x509/X509CertImpl/CertExtensions.java     | 201 ++++++++++++++++++
 3 files changed, 220 insertions(+), 57 deletions(-)
 create mode 100644 test/jdk/sun/security/x509/X509CertImpl/CertExtensions.java

diff --git a/src/java.base/share/classes/sun/security/x509/X509CertImpl.java b/src/java.base/share/classes/sun/security/x509/X509CertImpl.java
index 656e4c168fb..0f4388fb07b 100644
--- a/src/java.base/share/classes/sun/security/x509/X509CertImpl.java
+++ b/src/java.base/share/classes/sun/security/x509/X509CertImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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 @@ public class X509CertImpl extends X509Certificate implements DerEncoder {
      */
     public X509CertImpl(X509CertInfo info, AlgorithmId algId, byte[] signature,
                         byte[] signedCert) {
-        this.info = info;
+        this.info = Objects.requireNonNull(info);
         this.algId = algId;
         this.signature = signature;
         this.signedCert = Objects.requireNonNull(signedCert);
@@ -553,7 +553,7 @@ public class X509CertImpl extends X509Certificate implements DerEncoder {
      * before this function may be called.
      */
     public String toString() {
-        if (info == null || algId == null || signature == null)
+        if (algId == null || signature == null)
             return "";
 
         HexDumpEncoder encoder = new HexDumpEncoder();
@@ -570,8 +570,6 @@ public class X509CertImpl extends X509Certificate implements DerEncoder {
      * @return the publickey.
      */
     public PublicKey getPublicKey() {
-        if (info == null)
-            return null;
         return info.getKey().getKey();
     }
 
@@ -581,8 +579,6 @@ public class X509CertImpl extends X509Certificate implements DerEncoder {
      * @return the version number, i.e. 1, 2 or 3.
      */
     public int getVersion() {
-        if (info == null)
-            return -1;
         try {
             int vers = info.getVersion().getVersion();
             return vers + 1;
@@ -609,8 +605,6 @@ public class X509CertImpl extends X509Certificate implements DerEncoder {
      * @return the serial number.
      */
     public SerialNumber getSerialNumberObject() {
-        if (info == null)
-            return null;
         return info.getSerialNumber().getSerial();
     }
 
@@ -622,8 +616,6 @@ public class X509CertImpl extends X509Certificate implements DerEncoder {
      */
     @SuppressWarnings("deprecation")
     public Principal getSubjectDN() {
-        if (info == null)
-            return null;
         return info.getSubject();
     }
 
@@ -633,9 +625,6 @@ public class X509CertImpl extends X509Certificate implements DerEncoder {
      * also aware of X509CertImpl mutability.
      */
     public X500Principal getSubjectX500Principal() {
-        if (info == null) {
-            return null;
-        }
         try {
             return info.getSubject().asX500Principal();
         } catch (Exception e) {
@@ -650,8 +639,6 @@ public class X509CertImpl extends X509Certificate implements DerEncoder {
      */
     @SuppressWarnings("deprecation")
     public Principal getIssuerDN() {
-        if (info == null)
-            return null;
         return info.getIssuer();
     }
 
@@ -661,9 +648,6 @@ public class X509CertImpl extends X509Certificate implements DerEncoder {
      * also aware of X509CertImpl mutability.
      */
     public X500Principal getIssuerX500Principal() {
-        if (info == null) {
-            return null;
-        }
         try {
             return info.getIssuer().asX500Principal();
         } catch (Exception e) {
@@ -677,8 +661,6 @@ public class X509CertImpl extends X509Certificate implements DerEncoder {
      * @return the start date of the validity period.
      */
     public Date getNotBefore() {
-        if (info == null)
-            return null;
         return info.getValidity().getNotBefore();
     }
 
@@ -688,8 +670,6 @@ public class X509CertImpl extends X509Certificate implements DerEncoder {
      * @return the end date of the validity period.
      */
     public Date getNotAfter() {
-        if (info == null)
-            return null;
         return info.getValidity().getNotAfter();
     }
 
@@ -702,10 +682,7 @@ public class X509CertImpl extends X509Certificate implements DerEncoder {
      * @exception CertificateEncodingException if an encoding error occurs.
      */
     public byte[] getTBSCertificate() throws CertificateEncodingException {
-        if (info != null) {
-            return info.getEncodedInfo();
-        } else
-            throw new CertificateEncodingException("Uninitialized certificate");
+        return info.getEncodedInfo();
     }
 
     /**
@@ -766,8 +743,6 @@ public class X509CertImpl extends X509Certificate implements DerEncoder {
      * @return the Issuer Unique Identity.
      */
     public boolean[] getIssuerUniqueID() {
-        if (info == null)
-            return null;
         UniqueIdentity id = info.getIssuerUniqueId();
         if (id == null)
             return null;
@@ -781,8 +756,6 @@ public class X509CertImpl extends X509Certificate implements DerEncoder {
      * @return the Subject Unique Identity.
      */
     public boolean[] getSubjectUniqueID() {
-        if (info == null)
-            return null;
         UniqueIdentity id = info.getSubjectUniqueId();
         if (id == null)
             return null;
@@ -935,8 +908,6 @@ public class X509CertImpl extends X509Certificate implements DerEncoder {
      * not supported, otherwise return false.
      */
     public boolean hasUnsupportedCriticalExtension() {
-        if (info == null)
-            return false;
         CertificateExtensions exts = info.getExtensions();
         if (exts == null)
             return false;
@@ -952,9 +923,6 @@ public class X509CertImpl extends X509Certificate implements DerEncoder {
      * certificate that are marked critical.
      */
     public Set<String> getCriticalExtensionOIDs() {
-        if (info == null) {
-            return null;
-        }
         try {
             CertificateExtensions exts = info.getExtensions();
             if (exts == null) {
@@ -981,9 +949,6 @@ public class X509CertImpl extends X509Certificate implements DerEncoder {
      * certificate that are NOT marked critical.
      */
     public Set<String> getNonCriticalExtensionOIDs() {
-        if (info == null) {
-            return null;
-        }
         try {
             CertificateExtensions exts = info.getExtensions();
             if (exts == null) {
@@ -1010,9 +975,6 @@ public class X509CertImpl extends X509Certificate implements DerEncoder {
      *         extension
      */
     public Extension getExtension(ObjectIdentifier oid) {
-        if (info == null) {
-            return null;
-        }
         CertificateExtensions extensions = info.getExtensions();
         if (extensions != null) {
             Extension ex = extensions.getExtension(oid.toString());
@@ -1031,9 +993,6 @@ public class X509CertImpl extends X509Certificate implements DerEncoder {
     }
 
     public Extension getUnparseableExtension(ObjectIdentifier oid) {
-        if (info == null) {
-            return null;
-        }
         CertificateExtensions extensions = info.getExtensions();
         if (extensions == null) {
             return null;
@@ -1047,6 +1006,8 @@ public class X509CertImpl extends X509Certificate implements DerEncoder {
      * oid String.
      *
      * @param oid the Object Identifier value for the extension.
+     * @return the DER-encoded extension value, or {@code null} if
+     *         the extensions are not present or the value is not found
      */
     public byte[] getExtensionValue(String oid) {
         try {
@@ -1054,13 +1015,11 @@ public class X509CertImpl extends X509Certificate implements DerEncoder {
             String extAlias = OIDMap.getName(findOID);
             Extension certExt = null;
             CertificateExtensions exts = info.getExtensions();
-
+            if (exts == null) {
+                return null;
+            }
             if (extAlias == null) { // may be unknown
                 // get the extensions, search through' for this oid
-                if (exts == null) {
-                    return null;
-                }
-
                 for (Extension ex : exts.getAllExtensions()) {
                     ObjectIdentifier inCertOID = ex.getExtensionId();
                     if (inCertOID.equals(findOID)) {
@@ -1069,12 +1028,10 @@ public class X509CertImpl extends X509Certificate implements DerEncoder {
                     }
                 }
             } else { // there's subclass that can handle this extension
-                certExt = getInfo().getExtensions().getExtension(extAlias);
+                certExt = exts.getExtension(extAlias);
             }
             if (certExt == null) {
-                if (exts != null) {
-                    certExt = exts.getUnparseableExtensions().get(oid);
-                }
+                certExt = exts.getUnparseableExtensions().get(oid);
                 if (certExt == null) {
                     return null;
                 }
@@ -1098,8 +1055,12 @@ public class X509CertImpl extends X509Certificate implements DerEncoder {
      */
     public boolean[] getKeyUsage() {
         try {
+            CertificateExtensions extensions = info.getExtensions();
+            if (extensions == null) {
+                return null;
+            }
             KeyUsageExtension certExt = (KeyUsageExtension)
-                    getInfo().getExtensions().getExtension(KeyUsageExtension.NAME);
+                    extensions.getExtension(KeyUsageExtension.NAME);
             if (certExt == null)
                 return null;
 
diff --git a/test/jdk/sun/security/util/HostnameChecker/TestHostnameChecker.java b/test/jdk/sun/security/util/HostnameChecker/TestHostnameChecker.java
index 162ed46de20..63eb4057f8e 100644
--- a/test/jdk/sun/security/util/HostnameChecker/TestHostnameChecker.java
+++ b/test/jdk/sun/security/util/HostnameChecker/TestHostnameChecker.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -36,6 +36,7 @@ import java.util.List;
 import jdk.test.lib.security.CertUtils;
 import sun.security.util.*;
 import sun.security.x509.X509CertImpl;
+import sun.security.x509.X509CertInfo;
 
 /**
  * Certificate 1:
@@ -225,7 +226,7 @@ public class TestHostnameChecker {
     }
 
     private static X509Certificate mock(String domain) {
-        return new X509CertImpl(null, null, null, new byte[0]) {
+        return new X509CertImpl(new X509CertInfo(), null, null, new byte[0]) {
             @Override
             public Collection<List<?>> getSubjectAlternativeNames() {
                 return List.of(List.of(2, domain));
diff --git a/test/jdk/sun/security/x509/X509CertImpl/CertExtensions.java b/test/jdk/sun/security/x509/X509CertImpl/CertExtensions.java
new file mode 100644
index 00000000000..f8ee13e8f51
--- /dev/null
+++ b/test/jdk/sun/security/x509/X509CertImpl/CertExtensions.java
@@ -0,0 +1,201 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact 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 8346094
+ * @summary validating getExtensionValue and getKeyUsage with specified and
+ *          unspecified extensions on the X509Certificate.
+ * @library /test/lib
+ * @modules java.base/sun.security.x509
+ *          java.base/sun.security.util
+ */
+
+import jdk.test.lib.Asserts;
+import sun.security.util.ObjectIdentifier;
+import sun.security.x509.*;
+
+import java.io.IOException;
+import java.math.BigInteger;
+import java.security.*;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.TimeZone;
+
+
+public class CertExtensions {
+
+    public static void main(String[] args) throws Exception {
+        X509CertImpl x509Certimpl = createCertificate();
+        /**
+         * Certificate is created without extensions. Invoking getExtensionValue
+         * with oid must return NULL else it is incorrect
+         */
+        Asserts.assertNull(x509Certimpl.getExtensionValue("2.5.29.17"));
+        /**
+         * Certificate is created with extensions. Invoking getExtensionValue
+         * with oid must not return NULL else it is incorrect
+         */
+        x509Certimpl.getInfo().setExtensions(createCertificateExtensions(
+                x509Certimpl.getInfo().getKey().getKey()));
+        Asserts.assertNotNull(x509Certimpl.getExtensionValue("2.5.29.17"));
+        /**
+         * Certificate is created with extensions. Invoking getExtensionValue
+         * with invalid oid must return NULL else it is incorrect
+         */
+        Asserts.assertNull(x509Certimpl.getExtensionValue("1.2.3.4"));
+        /**
+         * Certificate is created with extensions. Invoking getKeyUsage
+         * must not return NULL else it is incorrect
+         */
+        Asserts.assertNotNull(x509Certimpl.getKeyUsage());
+        /**
+         * Certificate is created without extensions. Invoking getKeyUsage
+         * must return NULL else it is incorrect
+         */
+        x509Certimpl.getInfo().setExtensions(null);
+        Asserts.assertNull(x509Certimpl.getKeyUsage());
+    }
+
+    private static X509CertImpl createCertificate() throws Exception {
+        X509CertImpl x509Certimpl = null;
+        try {
+            X509CertInfo x509CertInfo = new X509CertInfo();
+            x509CertInfo.setVersion(new CertificateVersion(CertificateVersion.V3));
+
+            // Generate Key Pair (RSA)
+            KeyPairGenerator keyPairGenerator = KeyPairGenerator.getInstance("RSA");
+            keyPairGenerator.initialize(2048);
+            KeyPair keyPair = keyPairGenerator.generateKeyPair();
+            PrivateKey privateKey = keyPair.getPrivate();
+            PublicKey publicKey = keyPair.getPublic();
+            x509CertInfo.setKey(new CertificateX509Key(publicKey));
+
+            // Create and set the DN name for Subject and Issuer.
+            X500Name subject = new X500Name("CN=www.Subject.com, O=MyOrg, OU=LocalBiz, L=XYZ, S=YY, C=XX");
+            X500Name issuer = new X500Name("CN=www.Issuer.com, O=Oracle,OU=Java,L=XYZ,S=YY, C=XX");
+            x509CertInfo.setIssuer(issuer);
+            x509CertInfo.setSubject(subject);
+
+            // create and set the subject and issuer unique identity
+            byte[] issuerId = {1, 2, 3, 4, 5};
+            byte[] subjectId = {6, 7, 8, 9, 10};
+            x509CertInfo.setSubjectUniqueId(new UniqueIdentity(subjectId));
+            x509CertInfo.setIssuerUniqueId(new UniqueIdentity(issuerId));
+
+            // create and set the serial number
+            BigInteger serialNumber = BigInteger.valueOf(new SecureRandom().nextInt(Integer.MAX_VALUE));
+            x509CertInfo.setSerialNumber(new CertificateSerialNumber(serialNumber));
+
+            // create and set the validity interval
+            Date notBefore = new Date(); // Valid from now
+            Date notAfter = new Date(System.currentTimeMillis() + 365L * 24 * 60 * 60 * 1000); // Valid for 1 year
+            x509CertInfo.setValidity(new CertificateValidity(notBefore, notAfter));
+
+            // Create Certificate Info which is the representation of X509 Certificate.
+            x509CertInfo.setAlgorithmId(new CertificateAlgorithmId(AlgorithmId.get("SHA256withRSA")));
+
+            // Sign the certificate
+            Signature signature = Signature.getInstance("SHA256withRSA");
+            signature.initSign(privateKey);
+            signature.update(x509CertInfo.getEncodedInfo());
+            byte[] signedData = signature.sign();
+            byte[] signedCert = {};
+
+            x509Certimpl = new X509CertImpl(x509CertInfo,
+                    AlgorithmId.get("SHA256withRSA"), signedData, signedCert);
+        } catch (Exception e) {
+            System.out.println("caught exception while creating the certificate : " + e.getMessage());
+            throw e;
+        }
+        return x509Certimpl;
+    }
+
+    public static sun.security.x509.CertificateExtensions createCertificateExtensions
+            (PublicKey publicKey) throws IOException, NoSuchAlgorithmException {
+        // Create Extensions
+        sun.security.x509.CertificateExtensions certificateExtensions =
+                new sun.security.x509.CertificateExtensions();
+
+        GeneralNameInterface mailInf = new RFC822Name("test@Oracle.com");
+        GeneralName mail = new GeneralName(mailInf);
+        GeneralNameInterface dnsInf = new DNSName("Oracle.com");
+        GeneralName dns = new GeneralName(dnsInf);
+        GeneralNameInterface uriInf = new URIName("http://www.Oracle.com");
+        GeneralName uri = new GeneralName(uriInf);
+
+        // localhost
+        byte[] address = new byte[]{127, 0, 0, 1};
+
+        GeneralNameInterface ipInf = new IPAddressName(address);
+        GeneralName ip = new GeneralName(ipInf);
+
+        GeneralNameInterface oidInf = new OIDName(ObjectIdentifier.of("1.2.3.4"));
+        GeneralName oid = new GeneralName(oidInf);
+
+
+        GeneralNames subjectNames = new GeneralNames();
+        subjectNames.add(mail);
+        subjectNames.add(dns);
+        subjectNames.add(uri);
+        SubjectAlternativeNameExtension subjectName = new SubjectAlternativeNameExtension(subjectNames);
+
+        GeneralNames issuerNames = new GeneralNames();
+        issuerNames.add(ip);
+        issuerNames.add(oid);
+        IssuerAlternativeNameExtension issuerName = new IssuerAlternativeNameExtension(issuerNames);
+        Calendar cal = Calendar.getInstance(TimeZone.getTimeZone("America/Los_Angeles"));
+        cal.set(2014, 03, 10, 12, 30, 30);
+        cal.set(2000, 11, 15, 12, 30, 30);
+        Date lastDate = cal.getTime();
+        Date firstDate = new Date();
+        PrivateKeyUsageExtension pkusage = new PrivateKeyUsageExtension(firstDate, lastDate);
+
+        KeyUsageExtension usage = new KeyUsageExtension();
+        usage.set(KeyUsageExtension.CRL_SIGN, true);
+        usage.set(KeyUsageExtension.DIGITAL_SIGNATURE, true);
+        usage.set(KeyUsageExtension.NON_REPUDIATION, true);
+        MessageDigest md = MessageDigest.getInstance("SHA");
+
+        byte[] keyId = md.digest(publicKey.getEncoded());
+        KeyIdentifier kid = new KeyIdentifier(keyId);
+        SerialNumber sn = new SerialNumber(42);
+        AuthorityKeyIdentifierExtension aki = new AuthorityKeyIdentifierExtension(kid, subjectNames, sn);
+
+        SubjectKeyIdentifierExtension ski = new SubjectKeyIdentifierExtension(keyId);
+
+        BasicConstraintsExtension cons = new BasicConstraintsExtension(true, 10);
+
+        PolicyConstraintsExtension pce = new PolicyConstraintsExtension(2, 4);
+
+        certificateExtensions.setExtension(SubjectAlternativeNameExtension.NAME, subjectName);
+        certificateExtensions.setExtension(IssuerAlternativeNameExtension.NAME, issuerName);
+        certificateExtensions.setExtension(PrivateKeyUsageExtension.NAME, pkusage);
+        certificateExtensions.setExtension(KeyUsageExtension.NAME, usage);
+        certificateExtensions.setExtension(AuthorityKeyIdentifierExtension.NAME, aki);
+        certificateExtensions.setExtension(SubjectKeyIdentifierExtension.NAME, ski);
+        certificateExtensions.setExtension(BasicConstraintsExtension.NAME, cons);
+        certificateExtensions.setExtension(PolicyConstraintsExtension.NAME, pce);
+        return certificateExtensions;
+    }
+}

From 3487f8cbd55b06d332d897a010ae8eb371dd4956 Mon Sep 17 00:00:00 2001
From: Alexey Semenyuk <asemenyuk@openjdk.org>
Date: Wed, 19 Feb 2025 17:08:01 +0000
Subject: [PATCH 060/587] 8350102: Decouple jpackage test-lib Executor.Result
 and Executor classes

Reviewed-by: almatvee
---
 .../helpers/jdk/jpackage/test/Executor.java   | 64 +++++++++++--------
 .../jdk/jpackage/test/JPackageCommand.java    |  4 +-
 .../jdk/jpackage/test/WindowsHelper.java      |  6 +-
 3 files changed, 41 insertions(+), 33 deletions(-)

diff --git a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/Executor.java b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/Executor.java
index b00f72a328e..a8a849cb9e7 100644
--- a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/Executor.java
+++ b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/Executor.java
@@ -36,6 +36,7 @@ import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Objects;
+import java.util.Optional;
 import java.util.Set;
 import java.util.function.Supplier;
 import java.util.regex.Pattern;
@@ -76,6 +77,10 @@ public final class Executor extends CommandArguments<Executor> {
         return setToolProvider(v.asToolProvider());
     }
 
+    public Optional<Path> getExecutable() {
+        return Optional.ofNullable(executable);
+    }
+
     public Executor setDirectory(Path v) {
         directory = v;
         return this;
@@ -173,10 +178,10 @@ public final class Executor extends CommandArguments<Executor> {
         return this;
     }
 
-    public class Result {
+    public record Result(int exitCode, List<String> output, Supplier<String> cmdline) {
 
-        Result(int exitCode) {
-            this.exitCode = exitCode;
+        public Result {
+            Objects.requireNonNull(cmdline);
         }
 
         public String getFirstLineOfOutput() {
@@ -187,14 +192,10 @@ public final class Executor extends CommandArguments<Executor> {
             return output;
         }
 
-        public String getPrintableCommandLine() {
-            return Executor.this.getPrintableCommandLine();
-        }
-
         public Result assertExitCodeIs(int expectedExitCode) {
             TKit.assertEquals(expectedExitCode, exitCode, String.format(
                     "Check command %s exited with %d code",
-                    getPrintableCommandLine(), expectedExitCode));
+                    cmdline.get(), expectedExitCode));
             return this;
         }
 
@@ -205,9 +206,6 @@ public final class Executor extends CommandArguments<Executor> {
         public int getExitCode() {
             return exitCode;
         }
-
-        final int exitCode;
-        private List<String> output;
     }
 
     public Result executeWithoutExitCodeCheck() {
@@ -408,28 +406,34 @@ public final class Executor extends CommandArguments<Executor> {
             }
         }
 
-        Result reply = new Result(process.waitFor());
-        trace("Done. Exit code: " + reply.exitCode);
+        final int exitCode = process.waitFor();
+        trace("Done. Exit code: " + exitCode);
 
+        final List<String> output;
         if (outputLines != null) {
-            reply.output = Collections.unmodifiableList(outputLines);
+            output = Collections.unmodifiableList(outputLines);
+        } else {
+            output = null;
         }
-        return reply;
+        return createResult(exitCode, output);
     }
 
-    private Result runToolProvider(PrintStream out, PrintStream err) {
+    private int runToolProvider(PrintStream out, PrintStream err) {
         trace("Execute " + getPrintableCommandLine() + "...");
-        Result reply = new Result(toolProvider.run(out, err, args.toArray(
-                String[]::new)));
-        trace("Done. Exit code: " + reply.exitCode);
-        return reply;
+        final int exitCode = toolProvider.run(out, err, args.toArray(
+                String[]::new));
+        trace("Done. Exit code: " + exitCode);
+        return exitCode;
     }
 
+    private Result createResult(int exitCode, List<String> output) {
+        return new Result(exitCode, output, this::getPrintableCommandLine);
+    }
 
     private Result runToolProvider() throws IOException {
         if (!withSavedOutput()) {
             if (saveOutputType.contains(SaveOutputType.DUMP)) {
-                return runToolProvider(System.out, System.err);
+                return createResult(runToolProvider(System.out, System.err), null);
             }
 
             PrintStream nullPrintStream = new PrintStream(new OutputStream() {
@@ -438,36 +442,40 @@ public final class Executor extends CommandArguments<Executor> {
                     // Nop
                 }
             });
-            return runToolProvider(nullPrintStream, nullPrintStream);
+            return createResult(runToolProvider(nullPrintStream, nullPrintStream), null);
         }
 
         try (ByteArrayOutputStream buf = new ByteArrayOutputStream();
                 PrintStream ps = new PrintStream(buf)) {
-            Result reply = runToolProvider(ps, ps);
+            final var exitCode = runToolProvider(ps, ps);
             ps.flush();
+            final List<String> output;
             try (BufferedReader bufReader = new BufferedReader(new StringReader(
                     buf.toString()))) {
                 if (saveOutputType.contains(SaveOutputType.FIRST_LINE)) {
                     String firstLine = bufReader.lines().findFirst().orElse(null);
                     if (firstLine != null) {
-                        reply.output = List.of(firstLine);
+                        output = List.of(firstLine);
+                    } else {
+                        output = null;
                     }
                 } else if (saveOutputType.contains(SaveOutputType.FULL)) {
-                    reply.output = bufReader.lines().collect(
-                            Collectors.toUnmodifiableList());
+                    output = bufReader.lines().collect(Collectors.toUnmodifiableList());
+                } else {
+                    output = null;
                 }
 
                 if (saveOutputType.contains(SaveOutputType.DUMP)) {
                     Stream<String> lines;
                     if (saveOutputType.contains(SaveOutputType.FULL)) {
-                        lines = reply.output.stream();
+                        lines = output.stream();
                     } else {
                         lines = bufReader.lines();
                     }
                     lines.forEach(System.out::println);
                 }
             }
-            return reply;
+            return createResult(exitCode, output);
         }
     }
 
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 bbf7d429f08..418d7377ec6 100644
--- a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/JPackageCommand.java
+++ b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/JPackageCommand.java
@@ -56,7 +56,7 @@ import jdk.jpackage.internal.util.function.ThrowingSupplier;
  * anything. The simplest is to compile test application and pack in a jar for
  * use on jpackage command line.
  */
-public final class JPackageCommand extends CommandArguments<JPackageCommand> {
+public class JPackageCommand extends CommandArguments<JPackageCommand> {
 
     public JPackageCommand() {
         prerequisiteActions = new Actions();
@@ -799,7 +799,7 @@ public final class JPackageCommand extends CommandArguments<JPackageCommand> {
             outputValidator.accept(result.getOutput().stream());
         }
 
-        if (result.exitCode == 0) {
+        if (result.exitCode() == 0) {
             executeVerifyActions();
         }
 
diff --git a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/WindowsHelper.java b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/WindowsHelper.java
index 9d289c56540..48643463e0b 100644
--- a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/WindowsHelper.java
+++ b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/WindowsHelper.java
@@ -72,7 +72,7 @@ public class WindowsHelper {
         for (int attempt = 0; attempt < 8; ++attempt) {
             result = misexec.executeWithoutExitCodeCheck();
 
-            if (result.exitCode == 1605) {
+            if (result.exitCode() == 1605) {
                 // ERROR_UNKNOWN_PRODUCT, attempt to uninstall not installed
                 // package
                 return;
@@ -81,7 +81,7 @@ public class WindowsHelper {
             // The given Executor may either be of an msiexec command or an
             // unpack.bat script containing the msiexec command. In the later
             // case, when misexec returns 1618, the unpack.bat may return 1603
-            if ((result.exitCode == 1618) || (result.exitCode == 1603)) {
+            if ((result.exitCode() == 1618) || (result.exitCode() == 1603)) {
                 // Another installation is already in progress.
                 // Wait a little and try again.
                 Long timeout = 1000L * (attempt + 3); // from 3 to 10 seconds
@@ -523,7 +523,7 @@ public class WindowsHelper {
         var status = Executor.of("reg", "query", keyPath, "/v", valueName)
                 .saveOutput()
                 .executeWithoutExitCodeCheck();
-        if (status.exitCode == 1) {
+        if (status.exitCode() == 1) {
             // Should be the case of no such registry value or key
             String lookupString = "ERROR: The system was unable to find the specified registry key or value.";
             TKit.assertTextStream(lookupString)

From 76319845255d5f71acb2f88e684ba788bdadfa93 Mon Sep 17 00:00:00 2001
From: Matias Saavedra Silva <matsaave@openjdk.org>
Date: Wed, 19 Feb 2025 17:26:41 +0000
Subject: [PATCH 061/587] 8349923: Refactor StackMapTable constructor and
 StackMapReader

Reviewed-by: coleenp, dholmes
---
 src/hotspot/share/classfile/stackMapTable.cpp | 203 ++++++++++--------
 src/hotspot/share/classfile/stackMapTable.hpp |  49 +++--
 src/hotspot/share/classfile/verifier.cpp      |   5 +-
 3 files changed, 150 insertions(+), 107 deletions(-)

diff --git a/src/hotspot/share/classfile/stackMapTable.cpp b/src/hotspot/share/classfile/stackMapTable.cpp
index b66416ff1bf..ff8c8378027 100644
--- a/src/hotspot/share/classfile/stackMapTable.cpp
+++ b/src/hotspot/share/classfile/stackMapTable.cpp
@@ -29,38 +29,49 @@
 #include "oops/oop.inline.hpp"
 #include "runtime/handles.inline.hpp"
 
-StackMapTable::StackMapTable(StackMapReader* reader, StackMapFrame* init_frame,
-                             u2 max_locals, u2 max_stack,
-                             char* code_data, int code_len, TRAPS) {
-  _code_length = code_len;
+StackMapTable::StackMapTable(StackMapReader* reader, TRAPS) {
+  _code_length = reader->code_length();
   _frame_count = reader->get_frame_count();
   if (_frame_count > 0) {
-    _frame_array = NEW_RESOURCE_ARRAY_IN_THREAD(THREAD,
-                                                StackMapFrame*, _frame_count);
-    StackMapFrame* pre_frame = init_frame;
-    for (int32_t i = 0; i < _frame_count; i++) {
-      StackMapFrame* frame = reader->next(
-        pre_frame, i == 0, max_locals, max_stack,
-        CHECK_VERIFY(pre_frame->verifier()));
-      _frame_array[i] = frame;
-      int offset = frame->offset();
-      if (offset >= code_len || code_data[offset] == 0) {
-        frame->verifier()->verify_error(
-            ErrorContext::bad_stackmap(i, frame),
-            "StackMapTable error: bad offset");
-        return;
+    _frame_array = new GrowableArray<StackMapFrame*>(_frame_count);
+    while (!reader->at_end()) {
+      StackMapFrame* frame = reader->next(CHECK_VERIFY(reader->prev_frame()->verifier()));
+      if (frame != nullptr) {
+        _frame_array->push(frame);
       }
-      pre_frame = frame;
     }
+    reader->check_end(CHECK);
+    // Correct frame count based on how many actual frames are generated
+    _frame_count = _frame_array->length();
+  }
+}
+
+void StackMapReader::check_offset(StackMapFrame* frame) {
+  int offset = frame->offset();
+  if (offset >= _code_length || _code_data[offset] == 0) {
+    _verifier->verify_error(ErrorContext::bad_stackmap(0, frame),
+                            "StackMapTable error: bad offset");
+  }
+}
+
+void StackMapReader::check_size(TRAPS) {
+  if (_frame_count < _parsed_frame_count) {
+    StackMapStream::stackmap_format_error("wrong attribute size", THREAD);
+  }
+}
+
+void StackMapReader::check_end(TRAPS) {
+  assert(_stream->at_end(), "must be");
+  if (_frame_count != _parsed_frame_count) {
+    StackMapStream::stackmap_format_error("wrong attribute size", THREAD);
   }
-  reader->check_end(CHECK);
 }
 
 // This method is only called by method in StackMapTable.
 int StackMapTable::get_index_from_offset(int32_t offset) const {
   int i = 0;
   for (; i < _frame_count; i++) {
-    if (_frame_array[i]->offset() == offset) {
+    if (_frame_array->at(i)->offset() == offset) {
       return i;
     }
   }
@@ -95,7 +106,7 @@ bool StackMapTable::match_stackmap(
     return false;
   }
 
-  StackMapFrame *stackmap_frame = _frame_array[frame_index];
+  StackMapFrame* stackmap_frame = _frame_array->at(frame_index);
   bool result = true;
   if (match) {
     // Has direct control flow from last instruction, need to match the two
@@ -137,16 +148,20 @@ void StackMapTable::print_on(outputStream* str) const {
   {
     streamIndentor si(str);
     for (int32_t i = 0; i < _frame_count; ++i) {
-      _frame_array[i]->print_on(str);
+      _frame_array->at(i)->print_on(str);
     }
   }
   str->print_cr(" }");
 }
 
-StackMapReader::StackMapReader(ClassVerifier* v, StackMapStream* stream, char* code_data,
-                               int32_t code_len, TRAPS) :
-                               _verifier(v), _stream(stream),
-                               _code_data(code_data), _code_length(code_len) {
+StackMapReader::StackMapReader(ClassVerifier* v, StackMapStream* stream,
+                               char* code_data, int32_t code_len,
+                               StackMapFrame* init_frame,
+                               u2 max_locals, u2 max_stack, TRAPS) :
+                                  _verifier(v), _stream(stream), _code_data(code_data),
+                                  _code_length(code_len), _parsed_frame_count(0),
+                                  _prev_frame(init_frame), _max_locals(max_locals),
+                                  _max_stack(max_stack), _first(true) {
   methodHandle m = v->method();
   if (m->has_stackmap_table()) {
     _cp = constantPoolHandle(THREAD, m->constants());
@@ -210,45 +225,56 @@ VerificationType StackMapReader::parse_verification_type(u1* flags, TRAPS) {
   return VerificationType::bogus_type();
 }
 
-StackMapFrame* StackMapReader::next(
-    StackMapFrame* pre_frame, bool first, u2 max_locals, u2 max_stack, TRAPS) {
+StackMapFrame* StackMapReader::next(TRAPS) {
+  _parsed_frame_count++;
+  check_size(CHECK_NULL);
+  StackMapFrame* frame = next_helper(CHECK_VERIFY_(_verifier, nullptr));
+  if (frame != nullptr) {
+    check_offset(frame);
+    _prev_frame = frame;
+  }
+  return frame;
+}
+
+StackMapFrame* StackMapReader::next_helper(TRAPS) {
   StackMapFrame* frame;
   int offset;
   VerificationType* locals = nullptr;
   u1 frame_type = _stream->get_u1(CHECK_NULL);
   if (frame_type < 64) {
     // same_frame
-    if (first) {
+    if (_first) {
       offset = frame_type;
       // Can't share the locals array since that is updated by the verifier.
-      if (pre_frame->locals_size() > 0) {
+      if (_prev_frame->locals_size() > 0) {
         locals = NEW_RESOURCE_ARRAY_IN_THREAD(
-          THREAD, VerificationType, pre_frame->locals_size());
+          THREAD, VerificationType, _prev_frame->locals_size());
       }
     } else {
-      offset = pre_frame->offset() + frame_type + 1;
-      locals = pre_frame->locals();
+      offset = _prev_frame->offset() + frame_type + 1;
+      locals = _prev_frame->locals();
     }
     frame = new StackMapFrame(
-      offset, pre_frame->flags(), pre_frame->locals_size(), 0,
-      max_locals, max_stack, locals, nullptr, _verifier);
-    if (first && locals != nullptr) {
-      frame->copy_locals(pre_frame);
+      offset, _prev_frame->flags(), _prev_frame->locals_size(), 0,
+      _max_locals, _max_stack, locals, nullptr, _verifier);
+    if (_first && locals != nullptr) {
+      frame->copy_locals(_prev_frame);
     }
+    _first = false;
     return frame;
   }
   if (frame_type < 128) {
     // same_locals_1_stack_item_frame
-    if (first) {
+    if (_first) {
       offset = frame_type - 64;
       // Can't share the locals array since that is updated by the verifier.
-      if (pre_frame->locals_size() > 0) {
+      if (_prev_frame->locals_size() > 0) {
         locals = NEW_RESOURCE_ARRAY_IN_THREAD(
-          THREAD, VerificationType, pre_frame->locals_size());
+          THREAD, VerificationType, _prev_frame->locals_size());
       }
     } else {
-      offset = pre_frame->offset() + frame_type - 63;
-      locals = pre_frame->locals();
+      offset = _prev_frame->offset() + frame_type - 63;
+      locals = _prev_frame->locals();
     }
     VerificationType* stack = NEW_RESOURCE_ARRAY_IN_THREAD(
       THREAD, VerificationType, 2);
@@ -259,13 +285,14 @@ StackMapFrame* StackMapReader::next(
       stack_size = 2;
     }
     check_verification_type_array_size(
-      stack_size, max_stack, CHECK_VERIFY_(_verifier, nullptr));
+      stack_size, _max_stack, CHECK_VERIFY_(_verifier, nullptr));
     frame = new StackMapFrame(
-      offset, pre_frame->flags(), pre_frame->locals_size(), stack_size,
-      max_locals, max_stack, locals, stack, _verifier);
-    if (first && locals != nullptr) {
-      frame->copy_locals(pre_frame);
+      offset, _prev_frame->flags(), _prev_frame->locals_size(), stack_size,
+      _max_locals, _max_stack, locals, stack, _verifier);
+    if (_first && locals != nullptr) {
+      frame->copy_locals(_prev_frame);
     }
+    _first = false;
     return frame;
   }
 
@@ -279,16 +306,16 @@ StackMapFrame* StackMapReader::next(
 
   if (frame_type == SAME_LOCALS_1_STACK_ITEM_EXTENDED) {
     // same_locals_1_stack_item_frame_extended
-    if (first) {
+    if (_first) {
       offset = offset_delta;
       // Can't share the locals array since that is updated by the verifier.
-      if (pre_frame->locals_size() > 0) {
+      if (_prev_frame->locals_size() > 0) {
         locals = NEW_RESOURCE_ARRAY_IN_THREAD(
-          THREAD, VerificationType, pre_frame->locals_size());
+          THREAD, VerificationType, _prev_frame->locals_size());
       }
     } else {
-      offset = pre_frame->offset() + offset_delta + 1;
-      locals = pre_frame->locals();
+      offset = _prev_frame->offset() + offset_delta + 1;
+      locals = _prev_frame->locals();
     }
     VerificationType* stack = NEW_RESOURCE_ARRAY_IN_THREAD(
       THREAD, VerificationType, 2);
@@ -299,27 +326,28 @@ StackMapFrame* StackMapReader::next(
       stack_size = 2;
     }
     check_verification_type_array_size(
-      stack_size, max_stack, CHECK_VERIFY_(_verifier, nullptr));
+      stack_size, _max_stack, CHECK_VERIFY_(_verifier, nullptr));
     frame = new StackMapFrame(
-      offset, pre_frame->flags(), pre_frame->locals_size(), stack_size,
-      max_locals, max_stack, locals, stack, _verifier);
-    if (first && locals != nullptr) {
-      frame->copy_locals(pre_frame);
+      offset, _prev_frame->flags(), _prev_frame->locals_size(), stack_size,
+      _max_locals, _max_stack, locals, stack, _verifier);
+    if (_first && locals != nullptr) {
+      frame->copy_locals(_prev_frame);
     }
+    _first = false;
     return frame;
   }
 
   if (frame_type <= SAME_EXTENDED) {
     // chop_frame or same_frame_extended
-    locals = pre_frame->locals();
-    int length = pre_frame->locals_size();
+    locals = _prev_frame->locals();
+    int length = _prev_frame->locals_size();
     int chops = SAME_EXTENDED - frame_type;
     int new_length = length;
-    u1 flags = pre_frame->flags();
+    u1 flags = _prev_frame->flags();
     if (chops != 0) {
       new_length = chop(locals, length, chops);
       check_verification_type_array_size(
-        new_length, max_locals, CHECK_VERIFY_(_verifier, nullptr));
+        new_length, _max_locals, CHECK_VERIFY_(_verifier, nullptr));
       // Recompute flags since uninitializedThis could have been chopped.
       flags = 0;
       for (int i=0; i<new_length; i++) {
@@ -329,7 +357,7 @@ StackMapFrame* StackMapReader::next(
         }
       }
     }
-    if (first) {
+    if (_first) {
       offset = offset_delta;
       // Can't share the locals array since that is updated by the verifier.
       if (new_length > 0) {
@@ -339,28 +367,28 @@ StackMapFrame* StackMapReader::next(
         locals = nullptr;
       }
     } else {
-      offset = pre_frame->offset() + offset_delta + 1;
+      offset = _prev_frame->offset() + offset_delta + 1;
     }
     frame = new StackMapFrame(
-      offset, flags, new_length, 0, max_locals, max_stack,
+      offset, flags, new_length, 0, _max_locals, _max_stack,
       locals, nullptr, _verifier);
-    if (first && locals != nullptr) {
-      frame->copy_locals(pre_frame);
+    if (_first && locals != nullptr) {
+      frame->copy_locals(_prev_frame);
     }
+    _first = false;
     return frame;
   } else if (frame_type < SAME_EXTENDED + 4) {
     // append_frame
     int appends = frame_type - SAME_EXTENDED;
-    int real_length = pre_frame->locals_size();
+    int real_length = _prev_frame->locals_size();
     int new_length = real_length + appends*2;
     locals = NEW_RESOURCE_ARRAY_IN_THREAD(THREAD, VerificationType, new_length);
-    VerificationType* pre_locals = pre_frame->locals();
-    int i;
-    for (i=0; i<pre_frame->locals_size(); i++) {
+    VerificationType* pre_locals = _prev_frame->locals();
+    for (int i = 0; i < _prev_frame->locals_size(); i++) {
       locals[i] = pre_locals[i];
     }
-    u1 flags = pre_frame->flags();
-    for (i=0; i<appends; i++) {
+    u1 flags = _prev_frame->flags();
+    for (int i = 0; i < appends; i++) {
       locals[real_length] = parse_verification_type(&flags, CHECK_NULL);
       if (locals[real_length].is_category2()) {
         locals[real_length + 1] = locals[real_length].to_category2_2nd();
@@ -369,15 +397,16 @@ StackMapFrame* StackMapReader::next(
       ++real_length;
     }
     check_verification_type_array_size(
-      real_length, max_locals, CHECK_VERIFY_(_verifier, nullptr));
-    if (first) {
+      real_length, _max_locals, CHECK_VERIFY_(_verifier, nullptr));
+    if (_first) {
       offset = offset_delta;
     } else {
-      offset = pre_frame->offset() + offset_delta + 1;
+      offset = _prev_frame->offset() + offset_delta + 1;
     }
     frame = new StackMapFrame(
-      offset, flags, real_length, 0, max_locals,
-      max_stack, locals, nullptr, _verifier);
+      offset, flags, real_length, 0, _max_locals,
+      _max_stack, locals, nullptr, _verifier);
+    _first = false;
     return frame;
   }
   if (frame_type == FULL) {
@@ -389,8 +418,7 @@ StackMapFrame* StackMapReader::next(
       locals = NEW_RESOURCE_ARRAY_IN_THREAD(
         THREAD, VerificationType, locals_size*2);
     }
-    int i;
-    for (i=0; i<locals_size; i++) {
+    for (int i = 0; i < locals_size; i++) {
       locals[real_locals_size] = parse_verification_type(&flags, CHECK_NULL);
       if (locals[real_locals_size].is_category2()) {
         locals[real_locals_size + 1] =
@@ -400,7 +428,7 @@ StackMapFrame* StackMapReader::next(
       ++real_locals_size;
     }
     check_verification_type_array_size(
-      real_locals_size, max_locals, CHECK_VERIFY_(_verifier, nullptr));
+      real_locals_size, _max_locals, CHECK_VERIFY_(_verifier, nullptr));
     u2 stack_size = _stream->get_u2(CHECK_NULL);
     int real_stack_size = 0;
     VerificationType* stack = nullptr;
@@ -408,7 +436,7 @@ StackMapFrame* StackMapReader::next(
       stack = NEW_RESOURCE_ARRAY_IN_THREAD(
         THREAD, VerificationType, stack_size*2);
     }
-    for (i=0; i<stack_size; i++) {
+    for (int i = 0; i < stack_size; i++) {
       stack[real_stack_size] = parse_verification_type(nullptr, CHECK_NULL);
       if (stack[real_stack_size].is_category2()) {
         stack[real_stack_size + 1] = stack[real_stack_size].to_category2_2nd();
@@ -417,19 +445,20 @@ StackMapFrame* StackMapReader::next(
       ++real_stack_size;
     }
     check_verification_type_array_size(
-      real_stack_size, max_stack, CHECK_VERIFY_(_verifier, nullptr));
-    if (first) {
+      real_stack_size, _max_stack, CHECK_VERIFY_(_verifier, nullptr));
+    if (_first) {
       offset = offset_delta;
     } else {
-      offset = pre_frame->offset() + offset_delta + 1;
+      offset = _prev_frame->offset() + offset_delta + 1;
     }
     frame = new StackMapFrame(
       offset, flags, real_locals_size, real_stack_size,
-      max_locals, max_stack, locals, stack, _verifier);
+      _max_locals, _max_stack, locals, stack, _verifier);
+    _first = false;
     return frame;
   }
 
   _stream->stackmap_format_error(
-    "reserved frame type", CHECK_VERIFY_(pre_frame->verifier(), nullptr));
+    "reserved frame type", CHECK_VERIFY_(_prev_frame->verifier(), nullptr));
   return nullptr;
 }
diff --git a/src/hotspot/share/classfile/stackMapTable.hpp b/src/hotspot/share/classfile/stackMapTable.hpp
index a8ec3fc45db..cc4202f3280 100644
--- a/src/hotspot/share/classfile/stackMapTable.hpp
+++ b/src/hotspot/share/classfile/stackMapTable.hpp
@@ -44,16 +44,14 @@ class StackMapTable : public StackObj {
   // Widening the type and making it signed will help detect these.
   int32_t              _code_length;
   int32_t              _frame_count;     // Stackmap frame count
-  StackMapFrame**       _frame_array;
+  GrowableArray<StackMapFrame*>* _frame_array;
 
  public:
-  StackMapTable(StackMapReader* reader, StackMapFrame* init_frame,
-                u2 max_locals, u2 max_stack,
-                char* code_data, int code_len, TRAPS);
+  StackMapTable(StackMapReader* reader, TRAPS);
 
   inline int32_t get_frame_count() const { return _frame_count; }
   inline int get_offset(int index) const {
-    return _frame_array[index]->offset();
+    return _frame_array->at(index)->offset();
   }
 
   // Match and/or update current_frame to the frame in stackmap table with
@@ -116,9 +114,25 @@ class StackMapReader : StackObj {
   char* _code_data;
   int32_t _code_length;
 
-  // information get from the attribute
-  int32_t  _frame_count;       // frame count
+  // information from the attribute
+  int32_t  _frame_count;
 
+  // Number of frames parsed
+  int32_t  _parsed_frame_count;
+
+  // Previous frame buffer
+  StackMapFrame* _prev_frame;
+
+  // information from method
+  u2 _max_locals;
+  u2 _max_stack;
+
+  // Check if reading first entry
+  bool _first;
+
+  StackMapFrame* next_helper(TRAPS);
+  void check_offset(StackMapFrame* frame);
+  void check_size(TRAPS);
   int32_t chop(VerificationType* locals, int32_t length, int32_t chops);
   VerificationType parse_verification_type(u1* flags, TRAPS);
   void check_verification_type_array_size(
@@ -141,18 +155,19 @@ class StackMapReader : StackObj {
 
  public:
   // Constructor
-  StackMapReader(ClassVerifier* v, StackMapStream* stream, char* code_data,
-                 int32_t code_len, TRAPS);
+  StackMapReader(ClassVerifier* v, StackMapStream* stream,
+                 char* code_data, int32_t code_len,
+                 StackMapFrame* init_frame,
+                 u2 max_locals, u2 max_stack, TRAPS);
 
-  inline int32_t get_frame_count() const                { return _frame_count; }
-  StackMapFrame* next(StackMapFrame* pre_frame, bool first,
-                      u2 max_locals, u2 max_stack, TRAPS);
+  inline int32_t get_frame_count()   const { return _frame_count; }
+  inline StackMapFrame* prev_frame() const { return _prev_frame; }
+  inline char* code_data()           const { return _code_data; }
+  inline int32_t code_length()       const { return _code_length; }
+  inline bool at_end()               const { return _stream->at_end(); }
 
-  void check_end(TRAPS) {
-    if (!_stream->at_end()) {
-      StackMapStream::stackmap_format_error("wrong attribute size", CHECK);
-    }
-  }
+  StackMapFrame* next(TRAPS);
+  void check_end(TRAPS);
 };
 
 #endif // SHARE_CLASSFILE_STACKMAPTABLE_HPP
diff --git a/src/hotspot/share/classfile/verifier.cpp b/src/hotspot/share/classfile/verifier.cpp
index 1e9bdcc682d..b1daee82747 100644
--- a/src/hotspot/share/classfile/verifier.cpp
+++ b/src/hotspot/share/classfile/verifier.cpp
@@ -736,9 +736,8 @@ void ClassVerifier::verify_method(const methodHandle& m, TRAPS) {
 
   Array<u1>* stackmap_data = m->stackmap_data();
   StackMapStream stream(stackmap_data);
-  StackMapReader reader(this, &stream, code_data, code_length, THREAD);
-  StackMapTable stackmap_table(&reader, &current_frame, max_locals, max_stack,
-                               code_data, code_length, CHECK_VERIFY(this));
+  StackMapReader reader(this, &stream, code_data, code_length, &current_frame, max_locals, max_stack, THREAD);
+  StackMapTable stackmap_table(&reader, CHECK_VERIFY(this));
 
   LogTarget(Debug, verification) lt;
   if (lt.is_enabled()) {

From 7734f8ed13f04ba01258b4fbe18a3d9b66f7fc7a Mon Sep 17 00:00:00 2001
From: Mikhail Yankelevich <mikhail.yankelevich@oracle.com>
Date: Wed, 19 Feb 2025 18:56:26 +0000
Subject: [PATCH 062/587] 8349664: HEX dump should always use ASCII or
 ISO_8859_1

Reviewed-by: weijun
---
 .../sun/security/util/HexDumpEncoder.java     |  8 +-
 .../security/util/HexDumpEncoderTests.java    | 99 +++++++++++++++++++
 2 files changed, 104 insertions(+), 3 deletions(-)
 create mode 100644 test/jdk/sun/security/util/HexDumpEncoderTests.java

diff --git a/src/java.base/share/classes/sun/security/util/HexDumpEncoder.java b/src/java.base/share/classes/sun/security/util/HexDumpEncoder.java
index 0d1b4ae8984..2431b95562f 100644
--- a/src/java.base/share/classes/sun/security/util/HexDumpEncoder.java
+++ b/src/java.base/share/classes/sun/security/util/HexDumpEncoder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1995, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1995, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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 class HexDumpEncoder {
 
     protected void encodeBufferPrefix(OutputStream o) throws IOException {
         offset = 0;
-        pStream = new PrintStream(o);
+        pStream = new PrintStream(o, false, ISO_8859_1);
     }
 
     protected void encodeLinePrefix(OutputStream o, int len) {
@@ -303,6 +303,8 @@ public class HexDumpEncoder {
     /**
      * A 'streamless' version of encode that simply takes a buffer of
      * bytes and returns a string containing the encoded buffer.
+     * <P>
+     * Returned string is encoded with the ISO-8859-1, also known as ISO-LATIN-1.
      */
     public String encodeBuffer(byte[] aBuffer) {
         ByteArrayOutputStream   outStream = new ByteArrayOutputStream();
@@ -313,7 +315,7 @@ public class HexDumpEncoder {
             // This should never happen.
             throw new Error("CharacterEncoder.encodeBuffer internal error");
         }
-        return (outStream.toString());
+        return (outStream.toString(ISO_8859_1));
     }
 
     /**
diff --git a/test/jdk/sun/security/util/HexDumpEncoderTests.java b/test/jdk/sun/security/util/HexDumpEncoderTests.java
new file mode 100644
index 00000000000..9ff08cdb192
--- /dev/null
+++ b/test/jdk/sun/security/util/HexDumpEncoderTests.java
@@ -0,0 +1,99 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please 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.process.ProcessTools;
+import sun.security.util.HexDumpEncoder;
+
+import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
+import java.util.Arrays;
+
+/*
+ * @test
+ * @bug 8349664
+ * @summary HEX dump should always use ASCII or ISO_8859_1
+ * @modules java.base/sun.security.util
+ * @library /test/lib
+ */
+public class HexDumpEncoderTests {
+
+
+    private static String[] getTestCommand(final String encoding) {
+        return new String[]{
+                "--add-modules", "java.base",
+                "--add-exports", "java.base/sun.security.util=ALL-UNNAMED",
+                "-Dfile.encoding=" + encoding,
+                HexDumpEncoderTests.HexDumpEncoderTest.class.getName()
+        };
+    }
+
+    public static void main(String[] args) throws Exception {
+
+        final var testCommandIso = getTestCommand("ISO-8859-1");
+
+        final var resultIso = ProcessTools.executeTestJava(testCommandIso);
+        resultIso.shouldHaveExitValue(0);
+
+        // This will take all available StandardCharsets and test them all comparing to the ISO_8859_1
+        // Dome im parallel, as this is significantly faster
+        Arrays.stream(StandardCharsets.class.getDeclaredFields())
+                .parallel()
+                .forEach(field -> {
+                    if (java.lang.reflect.Modifier.isStatic(field.getModifiers())) {
+                        try {
+                            final var charset = (Charset) field.get(StandardCharsets.ISO_8859_1); // getting the charset to test
+
+                            final var testCommand = getTestCommand(charset.name());
+
+                            final var result = ProcessTools.executeTestJava(testCommand);
+                            result.shouldHaveExitValue(0);
+
+                            // The outputs of the ISO encoding must be identical to the one tested
+                            Asserts.assertEquals(resultIso.getStdout(),
+                                    result.getStdout(),
+                                    "Encoding " + charset.name());
+                        } catch (Exception e) {
+                            throw new RuntimeException(e);
+                        }
+                    }
+                });
+    }
+
+    public static class HexDumpEncoderTest {
+
+        /**
+         * This will test the encode and encode buffer functions at once,
+         * as they are both representing the string in LATIN_1
+         * <p>
+         * The output is put as a system.out
+         */
+        public static void main(String[] args) throws Exception {
+
+            final var encoder = new HexDumpEncoder();
+
+            System.out.printf("\nCert Encoded With Encode Buffer: %s\n", encoder.encodeBuffer(new byte[100]));
+            System.out.printf("\nCert Encoded With Encode: %s\n", encoder.encode(new byte[100]));
+        }
+    }
+}

From 4e60c2d937fca8170b356f36e72b271104130c40 Mon Sep 17 00:00:00 2001
From: Joe Wang <joehw@openjdk.org>
Date: Wed, 19 Feb 2025 19:36:30 +0000
Subject: [PATCH 063/587] 8349699: XSL transform fails with certain UTF-8
 characters on 1024 byte boundaries

Reviewed-by: lancea, naoto
---
 .../xml/internal/serializer/ToStream.java     |   6 +-
 .../jaxp/unittest/transform/JDK8207760.java   | 125 +++++++++++++++++-
 2 files changed, 125 insertions(+), 6 deletions(-)

diff --git a/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/ToStream.java b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/ToStream.java
index fc01f006e97..7bff17a455f 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/ToStream.java
+++ b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/ToStream.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2025, Oracle and/or its affiliates. All rights reserved.
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -55,7 +55,7 @@ import org.xml.sax.SAXException;
  * serializers (xml, html, text ...) that write output to a stream.
  *
  * @xsl.usage internal
- * @LastModified: Mar 2022
+ * @LastModified: Feb 2025
  */
 abstract public class ToStream extends SerializerBase {
 
@@ -955,7 +955,7 @@ abstract public class ToStream extends SerializerBase {
         throws IOException, SAXException
     {
         int status = -1;
-        if (i + 1 >= end)
+        if (i + 1 >= end && m_highSurrogate == 0)
         {
             m_highSurrogate = c;
             return status;
diff --git a/test/jaxp/javax/xml/jaxp/unittest/transform/JDK8207760.java b/test/jaxp/javax/xml/jaxp/unittest/transform/JDK8207760.java
index 00c1b8a8e25..6055fa878bc 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, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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,10 +41,10 @@ import org.testng.annotations.DataProvider;
 
 /*
  * @test
+ * @bug 8207760 8349699
+ * @summary Verifies that a surrogate pair at the edge of a buffer is properly handled
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
  * @run testng/othervm transform.JDK8207760
- * @summary Verifies that a surrogate pair at the edge of a buffer is properly handled
- * @bug 8207760
  */
 public class JDK8207760 {
     final String xsl8207760 =
@@ -93,6 +93,14 @@ public class JDK8207760 {
         "\n" +
         "</xsl:stylesheet>";
 
+    final String xsl8349699 = """
+                <?xml version="1.0" encoding="UTF-8"?>
+                <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+                  <xsl:output encoding="UTF-8" method="text" />
+                  <xsl:template match="/"><xsl:apply-templates select="node()" /></xsl:template>
+                </xsl:stylesheet>
+                """;
+
     @DataProvider(name = "xsls")
     public Object[][] getDataBug8207760_cdata() {
         return new Object[][]{
@@ -101,6 +109,117 @@ public class JDK8207760 {
         };
     }
 
+    /*
+     * Data for verifying the patch for JDK8349699
+     * @see testBug8349699
+     */
+    @DataProvider(name = "surrogatePair")
+    public Object[][] getDataFor8349699() {
+        return new Object[][]{
+            // a surrogate pair in an XML element placed anywhere in a string
+            {getXML(1024, 1024, "<b>\uD835\uDF00</b>"), getString(1024, 1024, "\uD835\uDF00")},
+            {getXML(1023, 1023, "<b>\uD835\uDF00</b>"), getString(1023, 1023, "\uD835\uDF00")},
+            {getXML(1023,0, "<b>\uD835\uDF00</b>"), getString(1023,0, "\uD835\uDF00")},
+            {getXML(1023,120, "<b>\uD835\uDF00</b>"), getString(1023,120, "\uD835\uDF00")},
+            // this is the original test as demonstrated in the bug report
+            {getXML(1017,1017, "\uD835\uDF03\uD835\uDF00\uD835\uDF00<b>\uD835\uDF00</b>\uD835\uDF00"),
+                    getString(1017,1017, "\uD835\uDF03\uD835\uDF00\uD835\uDF00\uD835\uDF00\uD835\uDF00")},
+            {getXML(1017,0, "\uD835\uDF03\uD835\uDF00\uD835\uDF00<b>\uD835\uDF00</b>\uD835\uDF00"),
+                    getString(1017,0, "\uD835\uDF03\uD835\uDF00\uD835\uDF00\uD835\uDF00\uD835\uDF00")},
+            {getXML(1017,120, "\uD835\uDF03\uD835\uDF00\uD835\uDF00<b>\uD835\uDF00</b>\uD835\uDF00"),
+                    getString(1017,120, "\uD835\uDF03\uD835\uDF00\uD835\uDF00\uD835\uDF00\uD835\uDF00")},
+        };
+    }
+
+    /*
+     * Data for verifying the patch for JDK8349699
+     * @see testBug8349699N
+     */
+    @DataProvider(name = "invalidSurrogatePair")
+    public Object[][] getDataFor8349699N() {
+        return new Object[][]{
+                // invalid pair: high/high
+                {getXML(1024, 1024, "<b>\uD835\uD835</b>")},
+                {getXML(1023, 1023, "<b>\uD835\uD835</b>")},
+                {getXML(1023,0, "<b>\uD835\uD835</b>")},
+                {getXML(1023,120, "<b>\uD835\uD835</b>")},
+                // invalid pair: low/low
+                {getXML(1024, 1024, "<b>\uDF00\uDF00</b>")},
+                {getXML(1023, 1023, "<b>\uDF00\uDF00</b>")},
+                {getXML(1023,0, "<b>\uDF00\uDF00</b>")},
+                {getXML(1023,120, "<b>\uDF00\uDF00</b>")},
+                // invalid pair in the original test string
+                {getXML(1017,1017, "\uD835\uDF03\uD835\uDF00\uD835\uDF00<b>\uD835\uD835</b>\uD835\uDF00")},
+                {getXML(1017,0, "\uD835\uDF03\uD835\uDF00\uD835\uDF00<b>\uD835\uD835</b>\uD835\uDF00")},
+                {getXML(1017,120, "\uD835\uDF03\uD835\uDF00\uD835\uDF00<b>\uD835\uD835</b>\uD835\uDF00")},
+                {getXML(1017,1017, "\uD835\uDF03\uD835\uDF00\uD835\uDF00<b>\uDF00\uDF00</b>\uD835\uDF00")},
+                {getXML(1017,0, "\uD835\uDF03\uD835\uDF00\uD835\uDF00<b>\uDF00\uDF00</b>\uD835\uDF00")},
+                {getXML(1017,120, "\uD835\uDF03\uD835\uDF00\uD835\uDF00<b>\uDF00\uDF00</b>\uD835\uDF00")},
+        };
+    }
+
+    /*
+     * @bug 8349699
+     * Verifies that a surrogate pair at the edge of a buffer is properly handled
+     * when serializing into a Character section.
+     */
+    @Test(dataProvider = "surrogatePair")
+    public final void testBug8349699(String xml, String expected) throws Exception {
+        Transformer t = createTransformerFromInputstream(
+                new ByteArrayInputStream(xsl8349699.getBytes(StandardCharsets.UTF_8)));
+        StringWriter sw = new StringWriter();
+        t.transform(new StreamSource(new StringReader(xml)), new StreamResult(sw));
+        Assert.assertEquals(sw.toString(), expected);
+    }
+
+    /*
+     * @bug 8349699
+     * Verifies that invalid surrogate pairs are caught.
+     */
+    @Test(dataProvider = "invalidSurrogatePair")
+    public final void testBug8349699N(String xml) throws Exception {
+        Assert.assertThrows(TransformerException.class, () -> {
+            Transformer t = createTransformerFromInputstream(
+                    new ByteArrayInputStream(xsl8349699.getBytes(StandardCharsets.UTF_8)));
+            StringWriter sw = new StringWriter();
+            t.transform(new StreamSource(new StringReader(xml)), new StreamResult(sw));
+        });
+    }
+
+    /**
+     * Returns an XML with the input string inserted in a text of length 'len' at
+     * the position 'pos'.
+     * @param len the length of the text to be placed in the XML
+     * @param pos the position at which the input string will be inserted into the text
+     * @param input the input string
+     * @return an XML
+     */
+    private String getXML(int len, int pos, String input) {
+        StringBuilder sb = new StringBuilder("<?xml version=\"1.0\" ?><a>");
+        sb.append(getString(len, pos, input));
+        sb.append("</a>");
+        return sb.toString();
+    }
+
+    /**
+     * Returns a text string with the input string inserted at the specified position.
+     * @param len the length of the text to be returned
+     * @param pos the position at which the input string will be inserted into the text
+     * @param input the input string
+     * @return a text string
+     */
+    private String getString(int len, int pos, String input) {
+        StringBuilder sb = new StringBuilder();
+        if (pos == 0) {
+            sb.append(input).append("x".repeat(len));
+        } else if (pos == len) {
+            sb.append("x".repeat(len)).append(input);
+        } else {
+            sb.append("x".repeat(pos)).append(input).append("x".repeat(len - pos));
+        }
+        return sb.toString();
+    }
+
     /*
      * @bug 8207760
      * Verifies that a surrogate pair at the edge of a buffer is properly handled

From 4fb70c79c1383507bd42cd7f569cbde28393a2b8 Mon Sep 17 00:00:00 2001
From: Chris Plummer <cjplummer@openjdk.org>
Date: Wed, 19 Feb 2025 19:58:11 +0000
Subject: [PATCH 064/587] 8229012: When single stepping, the debug agent can
 cause the thread to remain in interpreter mode after single stepping
 completes

Reviewed-by: kevinw, sspitsyn
---
 .../share/native/libjdwp/stepControl.c        |  62 ++++-
 .../sun/jdi/SingleStepCompilationTest.java    | 236 ++++++++++++++++++
 2 files changed, 295 insertions(+), 3 deletions(-)
 create mode 100644 test/jdk/com/sun/jdi/SingleStepCompilationTest.java

diff --git a/src/jdk.jdwp.agent/share/native/libjdwp/stepControl.c b/src/jdk.jdwp.agent/share/native/libjdwp/stepControl.c
index aeec8175b17..cf330d74d29 100644
--- a/src/jdk.jdwp.agent/share/native/libjdwp/stepControl.c
+++ b/src/jdk.jdwp.agent/share/native/libjdwp/stepControl.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -858,6 +858,17 @@ stepControl_beginStep(JNIEnv *env, jthread thread, jint size, jint depth,
     return error;
 }
 
+static jint
+getThreadState(jthread thread)
+{
+    jint state = 0;
+    jvmtiError error = JVMTI_FUNC_PTR(gdata->jvmti,GetThreadState)
+        (gdata->jvmti, thread, &state);
+    if (error != JVMTI_ERROR_NONE) {
+        EXIT_ERROR(error, "getting thread state");
+    }
+    return state;
+}
 
 static void
 clearStep(jthread thread, StepRequest *step)
@@ -877,15 +888,60 @@ clearStep(jthread thread, StepRequest *step)
             (void)eventHandler_free(step->methodEnterHandlerNode);
             step->methodEnterHandlerNode = NULL;
         }
-        step->pending = JNI_FALSE;
-
         /*
          * Warning: Do not clear step->method, step->lineEntryCount,
          *          or step->lineEntries here, they will likely
          *          be needed on the next step.
          */
 
+        jvmtiError error;
+        jboolean needsSuspending; // true if we needed to suspend this thread
+
+        // The thread needs suspending if it is not the current thread and is
+        // not already suspended.
+        if (isSameObject(getEnv(), threadControl_currentThread(), thread)) {
+            needsSuspending = JNI_FALSE;
+        } else {
+            jint state = getThreadState(thread);
+            needsSuspending = ((state & JVMTI_THREAD_STATE_SUSPENDED) == 0);
+        }
+
+        if (needsSuspending) {
+            // Don't use threadControl_suspendThread() here. It does a lot of
+            // locking, increasing the risk of deadlock issues. None of that
+            // locking is needed here.
+            error = JVMTI_FUNC_PTR(gdata->jvmti,SuspendThread)
+                (gdata->jvmti, thread);
+            if (error != JVMTI_ERROR_NONE) {
+                EXIT_ERROR(error, "suspending thread");
+            }
+        }
+
+        error = JVMTI_FUNC_PTR(gdata->jvmti,ClearAllFramePops)
+            (gdata->jvmti, thread);
+        if (error != JVMTI_ERROR_NONE) {
+#ifdef DEBUG
+            jint currentDepth = getFrameCount(thread);
+            jint state = getThreadState(thread);
+            tty_message("JVMTI ERROR(%d): ClearAllFramePops (state=0x%x fromDepth=%d currentDepth=%d)",
+                        error, state, step->fromStackDepth, currentDepth);
+            printThreadInfo(thread);
+            printStackTrace(thread);
+            threadControl_dumpThread(thread);
+#endif
+            EXIT_ERROR(error, "clearing all frame pops");
+        }
+
+        if (needsSuspending) {
+            error = JVMTI_FUNC_PTR(gdata->jvmti,ResumeThread)
+                (gdata->jvmti, thread);
+            if (error != JVMTI_ERROR_NONE) {
+                EXIT_ERROR(error, "resuming thread");
+            }
+        }
     }
+
+    step->pending = JNI_FALSE;
 }
 
 jvmtiError
diff --git a/test/jdk/com/sun/jdi/SingleStepCompilationTest.java b/test/jdk/com/sun/jdi/SingleStepCompilationTest.java
new file mode 100644
index 00000000000..f821c4f2dff
--- /dev/null
+++ b/test/jdk/com/sun/jdi/SingleStepCompilationTest.java
@@ -0,0 +1,236 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please 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 TEST IS LINE NUMBER SENSITIVE
+
+/**
+ * @test
+ * @bug 8229012
+ * @summary Verify that during single stepping a method is not compiled and
+ *          after single stepping it is compiled.
+ * @requires vm.compMode == "Xmixed"
+ * @library /test/lib
+ * @build jdk.test.whitebox.WhiteBox
+ * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox
+ * @run build TestScaffold VMConnection TargetListener TargetAdapter
+ * @run compile -g SingleStepCompilationTest.java
+ * @run driver SingleStepCompilationTest
+ */
+
+import com.sun.jdi.*;
+import com.sun.jdi.event.*;
+import com.sun.jdi.request.*;
+
+import java.util.*;
+import java.lang.reflect.Method;
+
+import jdk.test.whitebox.WhiteBox;
+
+class TestTarg {
+    public final static int BKPT_LINE = 66;
+
+    public static void main(String[] args) {
+        // Call buswork() and verify that is get compiled.
+        busyWork("Warmup");
+        if (!isCompiled()) {
+            throw new RuntimeException("busywork() did not get compiled after warmup");
+        }
+
+        // We need to force deopt the method now. Although we are about to force interp_only
+        // mode by enabling single stepping, this does not result in the method being
+        // deopt right away. It just causes the compiled method not to be used.
+        deoptimizeMethod();
+
+        // Call busywork() again. This time the debugger will have single stepping
+        // enabled. After calling, verify that busywork() is not compiled.
+        busyWork("StepOver"); // BKPT_LINE: We do a STEP_OVER here
+        if (isCompiled()) {
+            throw new RuntimeException("busywork() compiled during single stepping");
+        }
+
+        // Call busywork a 3rd time. This time the debugger will not have single stepping
+        // enabled. After calling, verify that busywork is compiled.
+        busyWork("AfterStep");
+        if (!isCompiled()) {
+            throw new RuntimeException("busywork() not compiled after single stepping completes");
+        }
+    }
+
+    private static final WhiteBox WB = WhiteBox.getWhiteBox();
+    private static Method busyWorkMethod;
+    static {
+        try {
+            busyWorkMethod = TestTarg.class.getDeclaredMethod("busyWork", String.class);
+        } catch (NoSuchMethodException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    private static boolean isCompiled() {
+        return WB.isMethodCompiled(busyWorkMethod, true) || WB.isMethodCompiled(busyWorkMethod, false);
+    }
+
+    private static void deoptimizeMethod() {
+        System.out.println("Decompile count before: " + WB.getMethodDecompileCount(busyWorkMethod));
+        WB.deoptimizeMethod(busyWorkMethod, true);
+        WB.deoptimizeMethod(busyWorkMethod, false);
+        System.out.println("Decompile count after: " + WB.getMethodDecompileCount(busyWorkMethod));
+    }
+
+    // We put the array and the result variables in static volatiles just to make sure
+    // the compiler doesn't optimize them away.
+    public static final int ARRAY_SIZE = 1000*1024;
+    public static volatile int[] a = new int[ARRAY_SIZE];
+    public static volatile long result = 0;
+
+    // Do something compute intensive to trigger compilation.
+    public static void busyWork(String phase) {
+        // Although timing is not necessary for this test, it is useful to have in the
+        // log output for troubleshooting. The timing when step over is enabled should
+        // be sigficantly slower than when not.
+        long start = System.currentTimeMillis();
+
+        // Burn some CPU time and trigger OSR compilation.
+        for (int j = 0; j < 500; j++) {
+            for (int i = 0; i < ARRAY_SIZE; i++) {
+                a[i] = j*i + i << 5 + j;
+            }
+        }
+        for (int i = 0; i < ARRAY_SIZE; i++) {
+            result += a[i];
+        }
+
+        long end = System.currentTimeMillis();
+        long totalTime = end - start;
+        System.out.println(phase + " time: " + totalTime);
+    }
+}
+
+/********** test program **********/
+
+public class SingleStepCompilationTest extends TestScaffold {
+    ClassType targetClass;
+    ThreadReference mainThread;
+
+    SingleStepCompilationTest (String args[]) {
+        super(args);
+    }
+
+    public static void main(String[] args) throws Exception {
+        /*
+         * We need to pass some extra args to the debuggee for WhiteBox support and
+         * for more consistent compilation behavior.
+         */
+        String[] newArgs = new String[5];
+        if (args.length != 0) {
+            throw new RuntimeException("Unexpected arguments passed to test");
+        }
+
+        // These are all needed for WhiteBoxAPI
+        newArgs[0] = "-Xbootclasspath/a:.";
+        newArgs[1] = "-XX:+UnlockDiagnosticVMOptions";
+        newArgs[2] = "-XX:+WhiteBoxAPI";
+
+        // In order to make sure the compilation is complete before we exit busyWork(),
+        // we don't allow background compilations.
+        newArgs[3] = "-XX:-BackgroundCompilation";
+
+        // Disabled tiered compilations so a new compilation doesn't start in the middle
+        // of executing busyWork(). (Might not really be needed)
+        newArgs[4] = "-XX:-TieredCompilation";
+
+        new SingleStepCompilationTest(newArgs).startTests();
+    }
+
+    /********** event handlers **********/
+
+    EventRequestManager erm;
+    BreakpointRequest bkptRequest;
+    StepRequest stepRequest;
+
+    // When we get a bkpt we want to disable the request and enable single stepping.
+    public void breakpointReached(BreakpointEvent event) {
+        System.out.println("Got BreakpointEvent: " + event);
+        EventRequest req = event.request();
+        req.disable();
+        stepRequest = erm.createStepRequest(mainThread,
+                                            StepRequest.STEP_LINE,
+                                            StepRequest.STEP_OVER);
+        stepRequest.enable();
+    }
+
+    public void stepCompleted(StepEvent event) {
+        System.out.println("Got StepEvent: " + event);
+        EventRequest req = event.request();
+        req.disable();
+    }
+
+    public void eventSetComplete(EventSet set) {
+        set.resume();
+    }
+
+    public void vmDisconnected(VMDisconnectEvent event) {
+        System.out.println("Got VMDisconnectEvent");
+    }
+
+    /********** test core **********/
+
+    protected void runTests() throws Exception {
+        /*
+         * Get to the top of main() to determine targetClass and mainThread.
+         */
+        BreakpointEvent bpe = startToMain("TestTarg");
+        targetClass = (ClassType)bpe.location().declaringType();
+        mainThread = bpe.thread();
+        erm = vm().eventRequestManager();
+
+        // The BKPT_LINE is the line we will STEP_OVER.
+        Location loc1 = findLocation(targetClass, TestTarg.BKPT_LINE);
+        bkptRequest = erm.createBreakpointRequest(loc1);
+        bkptRequest.enable();
+
+        try {
+            addListener(this);
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            failure("failure: Could not add listener");
+            throw new RuntimeException("SingleStepCompilationTest: failed", ex);
+        }
+
+        vm().resume();
+        waitForVMDisconnect();
+
+        System.out.println("done with loop");
+        removeListener(this);
+
+        /*
+         * Deal with results of test. If anything has called failure("foo")
+         * then testFailed will be true.
+         */
+        if (!testFailed) {
+            System.out.println("SingleStepCompilationTest: passed");
+        } else {
+            throw new Exception("SingleStepCompilationTest: failed");
+        }
+    }
+}

From 92efab90db24a76cc28fc1ae1db870a0dd670266 Mon Sep 17 00:00:00 2001
From: Boris Ulasevich <bulasevich@openjdk.org>
Date: Wed, 19 Feb 2025 21:02:27 +0000
Subject: [PATCH 065/587] 8350344: Cross-build failure: _vptr name conflict

Reviewed-by: kvn
---
 src/hotspot/share/code/codeBlob.cpp | 34 ++++++++++++++---------------
 src/hotspot/share/code/codeBlob.hpp | 10 ++++-----
 src/hotspot/share/code/nmethod.hpp  |  2 +-
 3 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/src/hotspot/share/code/codeBlob.cpp b/src/hotspot/share/code/codeBlob.cpp
index 3ed00a08e40..9b61d9e6650 100644
--- a/src/hotspot/share/code/codeBlob.cpp
+++ b/src/hotspot/share/code/codeBlob.cpp
@@ -73,29 +73,29 @@ static_assert(!std::is_polymorphic<UncommonTrapBlob>::value,   "no virtual metho
 
 // Add proxy vtables.
 // We need only few for now - they are used only from prints.
-const nmethod::Vptr                  nmethod::_vptr;
-const BufferBlob::Vptr               BufferBlob::_vptr;
-const RuntimeStub::Vptr              RuntimeStub::_vptr;
-const SingletonBlob::Vptr            SingletonBlob::_vptr;
-const DeoptimizationBlob::Vptr       DeoptimizationBlob::_vptr;
-const UpcallStub::Vptr               UpcallStub::_vptr;
+const nmethod::Vptr                  nmethod::_vpntr;
+const BufferBlob::Vptr               BufferBlob::_vpntr;
+const RuntimeStub::Vptr              RuntimeStub::_vpntr;
+const SingletonBlob::Vptr            SingletonBlob::_vpntr;
+const DeoptimizationBlob::Vptr       DeoptimizationBlob::_vpntr;
+const UpcallStub::Vptr               UpcallStub::_vpntr;
 
 const CodeBlob::Vptr* CodeBlob::vptr() const {
   constexpr const CodeBlob::Vptr* array[(size_t)CodeBlobKind::Number_Of_Kinds] = {
       nullptr/* None */,
-      &nmethod::_vptr,
-      &BufferBlob::_vptr,
-      &AdapterBlob::_vptr,
-      &VtableBlob::_vptr,
-      &MethodHandlesAdapterBlob::_vptr,
-      &RuntimeStub::_vptr,
-      &DeoptimizationBlob::_vptr,
-      &SafepointBlob::_vptr,
+      &nmethod::_vpntr,
+      &BufferBlob::_vpntr,
+      &AdapterBlob::_vpntr,
+      &VtableBlob::_vpntr,
+      &MethodHandlesAdapterBlob::_vpntr,
+      &RuntimeStub::_vpntr,
+      &DeoptimizationBlob::_vpntr,
+      &SafepointBlob::_vpntr,
 #ifdef COMPILER2
-      &ExceptionBlob::_vptr,
-      &UncommonTrapBlob::_vptr,
+      &ExceptionBlob::_vpntr,
+      &UncommonTrapBlob::_vpntr,
 #endif
-      &UpcallStub::_vptr
+      &UpcallStub::_vpntr
   };
 
   return array[(size_t)_kind];
diff --git a/src/hotspot/share/code/codeBlob.hpp b/src/hotspot/share/code/codeBlob.hpp
index fd9a96a2a6b..d0ac2bf1b5f 100644
--- a/src/hotspot/share/code/codeBlob.hpp
+++ b/src/hotspot/share/code/codeBlob.hpp
@@ -346,7 +346,7 @@ class BufferBlob: public RuntimeBlob {
     }
   };
 
-  static const Vptr _vptr;
+  static const Vptr _vpntr;
 };
 
 
@@ -434,7 +434,7 @@ class RuntimeStub: public RuntimeBlob {
     }
   };
 
-  static const Vptr _vptr;
+  static const Vptr _vpntr;
 };
 
 
@@ -474,7 +474,7 @@ class SingletonBlob: public RuntimeBlob {
     }
   };
 
-  static const Vptr _vptr;
+  static const Vptr _vpntr;
 };
 
 
@@ -557,7 +557,7 @@ class DeoptimizationBlob: public SingletonBlob {
     }
   };
 
-  static const Vptr _vptr;
+  static const Vptr _vpntr;
 };
 
 
@@ -685,7 +685,7 @@ class UpcallStub: public RuntimeBlob {
     }
   };
 
-  static const Vptr _vptr;
+  static const Vptr _vpntr;
 };
 
 #endif // SHARE_CODE_CODEBLOB_HPP
diff --git a/src/hotspot/share/code/nmethod.hpp b/src/hotspot/share/code/nmethod.hpp
index 39bf18547d8..ac9b1a7098f 100644
--- a/src/hotspot/share/code/nmethod.hpp
+++ b/src/hotspot/share/code/nmethod.hpp
@@ -996,7 +996,7 @@ public:
     }
   };
 
-  static const Vptr _vptr;
+  static const Vptr _vpntr;
 };
 
 #endif // SHARE_CODE_NMETHOD_HPP

From 3ebed78328bd64d2e18369d63d6ea323b87a7b24 Mon Sep 17 00:00:00 2001
From: Nicole Xu <yuyangx@nvidia.com>
Date: Thu, 20 Feb 2025 01:33:58 +0000
Subject: [PATCH 066/587] 8349943: [JMH] Use jvmArgs consistently

Reviewed-by: syan, redestad, haosun
---
 .../bench/java/lang/foreign/CallByRefHighArity.java       | 4 ++--
 .../openjdk/bench/java/lang/foreign/LoopOverRandom.java   | 4 ++--
 .../openjdk/bench/java/lang/foreign/SegmentOfBuffer.java  | 6 +++---
 test/micro/org/openjdk/bench/java/security/MLDSA.java     | 2 +-
 .../micro/org/openjdk/bench/java/security/MLKEMBench.java | 2 +-
 .../org/openjdk/bench/javax/crypto/full/AESBench.java     | 4 ++--
 .../jdk/incubator/vector/VectorMultiplyOptBenchmark.java  | 4 ++--
 .../jdk/incubator/vector/VectorXXH3HashingBenchmark.java  | 4 ++--
 test/micro/org/openjdk/bench/vm/compiler/MergeStores.java | 8 +++++---
 9 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/test/micro/org/openjdk/bench/java/lang/foreign/CallByRefHighArity.java b/test/micro/org/openjdk/bench/java/lang/foreign/CallByRefHighArity.java
index 417a7c39c1a..51060e3ff6d 100644
--- a/test/micro/org/openjdk/bench/java/lang/foreign/CallByRefHighArity.java
+++ b/test/micro/org/openjdk/bench/java/lang/foreign/CallByRefHighArity.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2024, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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 @@ import java.util.function.Supplier;
 @Measurement(iterations = 10, time = 500, timeUnit = TimeUnit.MILLISECONDS)
 @State(org.openjdk.jmh.annotations.Scope.Thread)
 @OutputTimeUnit(TimeUnit.NANOSECONDS)
-@Fork(value = 3, jvmArgsAppend = { "--enable-native-access=ALL-UNNAMED", "-Djava.library.path=micro/native" })
+@Fork(value = 3, jvmArgs = { "--enable-native-access=ALL-UNNAMED", "-Djava.library.path=micro/native" })
 public class CallByRefHighArity {
 
     static {
diff --git a/test/micro/org/openjdk/bench/java/lang/foreign/LoopOverRandom.java b/test/micro/org/openjdk/bench/java/lang/foreign/LoopOverRandom.java
index 392ac6d667b..b21f4d72007 100644
--- a/test/micro/org/openjdk/bench/java/lang/foreign/LoopOverRandom.java
+++ b/test/micro/org/openjdk/bench/java/lang/foreign/LoopOverRandom.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2024, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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 @@ import jdk.internal.misc.Unsafe;
 @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"})
+@Fork(value = 3, jvmArgs = { "--enable-native-access=ALL-UNNAMED", "--add-opens=java.base/jdk.internal.misc=ALL-UNNAMED"})
 public class LoopOverRandom extends JavaLayouts {
     static final int SEED = 0;
 
diff --git a/test/micro/org/openjdk/bench/java/lang/foreign/SegmentOfBuffer.java b/test/micro/org/openjdk/bench/java/lang/foreign/SegmentOfBuffer.java
index 25bfd44b063..973d800eb4c 100644
--- a/test/micro/org/openjdk/bench/java/lang/foreign/SegmentOfBuffer.java
+++ b/test/micro/org/openjdk/bench/java/lang/foreign/SegmentOfBuffer.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ *  Copyright (c) 2024, 2025, Oracle and/or its affiliates. All rights reserved.
  *  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,13 +57,13 @@ public class SegmentOfBuffer {
     }
 
     @Benchmark
-    @Fork(value = 3, jvmArgsAppend = "-XX:CompileCommand=inline,jdk.internal.foreign.AbstractMemorySegmentImpl::ofBuffer,false")
+    @Fork(value = 3, jvmArgs = "-XX:CompileCommand=inline,jdk.internal.foreign.AbstractMemorySegmentImpl::ofBuffer,false")
     public long ofBufferInlineFalse() {
         return MemorySegment.ofBuffer(buffer).address();
     }
 
     @Benchmark
-    @Fork(value = 3, jvmArgsAppend = "-XX:CompileCommand=inline,jdk.internal.foreign.AbstractMemorySegmentImpl::ofBuffer,true")
+    @Fork(value = 3, jvmArgs = "-XX:CompileCommand=inline,jdk.internal.foreign.AbstractMemorySegmentImpl::ofBuffer,true")
     public long ofBufferInlineTrue() {
         return MemorySegment.ofBuffer(buffer).address();
     }
diff --git a/test/micro/org/openjdk/bench/java/security/MLDSA.java b/test/micro/org/openjdk/bench/java/security/MLDSA.java
index 7f3d77a0b82..36b616ab599 100644
--- a/test/micro/org/openjdk/bench/java/security/MLDSA.java
+++ b/test/micro/org/openjdk/bench/java/security/MLDSA.java
@@ -56,7 +56,7 @@ import java.util.concurrent.TimeUnit;
 @State(Scope.Thread)
 @Warmup(iterations = 5, time = 1)
 @Measurement(iterations = 5, time = 1)
-@Fork(value = 3, jvmArgsAppend = {"--add-opens", "java.base/sun.security.provider=ALL-UNNAMED"})
+@Fork(value = 3, jvmArgs = {"--add-opens", "java.base/sun.security.provider=ALL-UNNAMED"})
 
 public class MLDSA {
         @Param({"ML-DSA-44", "ML-DSA-65", "ML-DSA-87"} )
diff --git a/test/micro/org/openjdk/bench/java/security/MLKEMBench.java b/test/micro/org/openjdk/bench/java/security/MLKEMBench.java
index 30481ed86a5..db87c24b48f 100644
--- a/test/micro/org/openjdk/bench/java/security/MLKEMBench.java
+++ b/test/micro/org/openjdk/bench/java/security/MLKEMBench.java
@@ -55,7 +55,7 @@ import java.util.concurrent.TimeUnit;
 @State(Scope.Thread)
 @Warmup(iterations = 5, time = 1)
 @Measurement(iterations = 5, time = 1)
-@Fork(value = 3, jvmArgsAppend = {"--add-opens", "java.base/com.sun.crypto.provider=ALL-UNNAMED"})
+@Fork(value = 3, jvmArgs = {"--add-opens", "java.base/com.sun.crypto.provider=ALL-UNNAMED"})
 
 public class MLKEMBench {
         @Param({"ML-KEM-512", "ML-KEM-768", "ML-KEM-1024"} )
diff --git a/test/micro/org/openjdk/bench/javax/crypto/full/AESBench.java b/test/micro/org/openjdk/bench/javax/crypto/full/AESBench.java
index f04e5d015a2..0977d2bc462 100644
--- a/test/micro/org/openjdk/bench/javax/crypto/full/AESBench.java
+++ b/test/micro/org/openjdk/bench/javax/crypto/full/AESBench.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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 @@ import java.security.InvalidKeyException;
 import java.security.NoSuchAlgorithmException;
 import java.security.spec.InvalidParameterSpecException;
 
-@Fork(jvmArgsAppend = {"-Xms20g", "-Xmx20g", "-XX:+UseZGC"})
+@Fork(jvmArgs = {"-Xms20g", "-Xmx20g", "-XX:+UseZGC"})
 public class AESBench extends CryptoBase {
 
     public static final int SET_SIZE = 8;
diff --git a/test/micro/org/openjdk/bench/jdk/incubator/vector/VectorMultiplyOptBenchmark.java b/test/micro/org/openjdk/bench/jdk/incubator/vector/VectorMultiplyOptBenchmark.java
index 51f8300a044..a6c2db965f0 100644
--- a/test/micro/org/openjdk/bench/jdk/incubator/vector/VectorMultiplyOptBenchmark.java
+++ b/test/micro/org/openjdk/bench/jdk/incubator/vector/VectorMultiplyOptBenchmark.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2024, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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 @@ import java.util.stream.*;
 @State(Scope.Benchmark)
 @Warmup(iterations = 3, time = 1)
 @Measurement(iterations = 5, time = 1)
-@Fork(value = 1, jvmArgsPrepend = {"--add-modules=jdk.incubator.vector"})
+@Fork(value = 1, jvmArgs = {"--add-modules=jdk.incubator.vector"})
 public class VectorMultiplyOptBenchmark {
     @Param({"1024", "2048", "4096"})
     private int  SIZE;
diff --git a/test/micro/org/openjdk/bench/jdk/incubator/vector/VectorXXH3HashingBenchmark.java b/test/micro/org/openjdk/bench/jdk/incubator/vector/VectorXXH3HashingBenchmark.java
index 32056da49aa..8a40e0fd95b 100644
--- a/test/micro/org/openjdk/bench/jdk/incubator/vector/VectorXXH3HashingBenchmark.java
+++ b/test/micro/org/openjdk/bench/jdk/incubator/vector/VectorXXH3HashingBenchmark.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2024, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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 @@ import java.util.stream.*;
 @State(Scope.Benchmark)
 @Warmup(iterations = 3, time = 1)
 @Measurement(iterations = 5, time = 1)
-@Fork(value = 1, jvmArgsPrepend = {"--add-modules=jdk.incubator.vector"})
+@Fork(value = 1, jvmArgs = {"--add-modules=jdk.incubator.vector"})
 public class VectorXXH3HashingBenchmark {
     @Param({"1024", "2048", "4096", "8192"})
     private int  SIZE;
diff --git a/test/micro/org/openjdk/bench/vm/compiler/MergeStores.java b/test/micro/org/openjdk/bench/vm/compiler/MergeStores.java
index 809ec01f495..679502c121d 100644
--- a/test/micro/org/openjdk/bench/vm/compiler/MergeStores.java
+++ b/test/micro/org/openjdk/bench/vm/compiler/MergeStores.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2024, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -743,8 +743,10 @@ public class MergeStores {
         UNSAFE.putLongUnaligned(null, native_adr + offset + 0, vL);
     }
 
-    @Fork(value = 1, jvmArgsPrepend = {
-        "-XX:+UnlockDiagnosticVMOptions", "-XX:-MergeStores"
+    @Fork(value = 1, jvmArgs = {
+        "-XX:+UnlockDiagnosticVMOptions", "-XX:-MergeStores",
+        "--add-exports", "java.base/jdk.internal.misc=ALL-UNNAMED",
+        "--add-exports", "java.base/jdk.internal.util=ALL-UNNAMED"
     })
     public static class MergeStoresDisabled extends MergeStores {}
 }

From 0131c1bfd8ccfdf4f3d73cddfc2a87e2a6e99581 Mon Sep 17 00:00:00 2001
From: Ioi Lam <iklam@openjdk.org>
Date: Thu, 20 Feb 2025 02:13:41 +0000
Subject: [PATCH 067/587] 8349953: Avoid editing AOTConfiguration file in "make
 test JTREG=AOT_JDK=true"

Reviewed-by: erikj, ccheung
---
 make/Main.gmk                             | 14 ++++-
 make/RunTests.gmk                         | 61 ++++++++++----------
 make/test/BuildTestSetupAOT.gmk           | 69 +++++++++++++++++++++++
 src/hotspot/share/cds/classListParser.cpp |  7 +--
 test/setup_aot/TestSetupAOT.java          | 59 +++++++++++++++++++
 5 files changed, 175 insertions(+), 35 deletions(-)
 create mode 100644 make/test/BuildTestSetupAOT.gmk
 create mode 100644 test/setup_aot/TestSetupAOT.java

diff --git a/make/Main.gmk b/make/Main.gmk
index 4690139e6ad..f2f1bce0e10 100644
--- a/make/Main.gmk
+++ b/make/Main.gmk
@@ -753,6 +753,17 @@ $(eval $(call SetupTarget, test-image-lib, \
     DEPS := build-test-lib, \
 ))
 
+$(eval $(call SetupTarget, build-test-setup-aot, \
+    MAKEFILE := test/BuildTestSetupAOT, \
+    DEPS := interim-langtools exploded-image, \
+))
+
+$(eval $(call SetupTarget, test-image-setup-aot, \
+    MAKEFILE := test/BuildTestSetupAOT, \
+    TARGET := images, \
+    DEPS :=  build-test-setup-aot, \
+))
+
 ifeq ($(BUILD_FAILURE_HANDLER), true)
   # Builds the failure handler jtreg extension
   $(eval $(call SetupTarget, build-test-failure-handler, \
@@ -1281,7 +1292,8 @@ all-docs-bundles: docs-jdk-bundles docs-javase-bundles docs-reference-bundles
 # This target builds the test image
 test-image: prepare-test-image test-image-jdk-jtreg-native \
     test-image-demos-jdk test-image-libtest-jtreg-native \
-    test-image-lib test-image-lib-native
+    test-image-lib test-image-lib-native \
+    test-image-setup-aot
 
 ifneq ($(JVM_TEST_IMAGE_TARGETS), )
   # If JVM_TEST_IMAGE_TARGETS is externally defined, use it instead of the
diff --git a/make/RunTests.gmk b/make/RunTests.gmk
index 3e20de3f82e..616341a8901 100644
--- a/make/RunTests.gmk
+++ b/make/RunTests.gmk
@@ -703,6 +703,9 @@ define SetJtregValue
   endif
 endef
 
+################################################################################
+# Helper function for creating a customized AOT cache for running tests
+################################################################################
 
 # Parameter 1 is the name of the rule.
 #
@@ -713,48 +716,47 @@ endef
 #   $1_AOT_TARGETS   List of all targets that the test rule will need to depend on
 #   $1_AOT_JDK_CACHE The AOT cache file to be used to run the test with
 #
-SetupAot = $(NamedParamsMacroTemplate)
-define SetupAotBody
-  $1_AOT_JDK_CONF  := $$($1_TEST_SUPPORT_DIR)/aot/jdk.aotconf
+SetupAOT = $(NamedParamsMacroTemplate)
+define SetupAOTBody
+  $1_AOT_JDK_CONF := $$($1_TEST_SUPPORT_DIR)/aot/jdk.aotconf
   $1_AOT_JDK_CACHE := $$($1_TEST_SUPPORT_DIR)/aot/jdk.aotcache
+  $1_AOT_JDK_LOG := $$($1_TEST_SUPPORT_DIR)/aot/TestSetupAOT.log
 
-  $1_JAVA_TOOL_OPTS := $$(addprefix -J, $$($1_VM_OPTIONS))
+  # We execute the training run with $(TEST_IMAGE_DIR)/setup_aot/TestSetupAOT.class
+  # to touch a fair number of classes inside the JDK. Note that we can't specify a classpath,
+  # or else the AOT cache cannot be used with jtreg test cases that use a different value
+  # for their classpaths. Instead, we run in the $(TEST_IMAGE_DIR)/setup_aot/ directory.
+  # The "java" launcher will have an implicit classpath of ".", so it can pick up the TestSetupAOT
+  # class from the JVM's current directory.
+  #
+  # The TestSetupAOT class (or any other classes that are loaded from ".") will be excluded
+  # from the the AOT cache as "." is an unsupported location. As a result, the AOT cache will contain
+  # only classes from the JDK.
 
   $$($1_AOT_JDK_CACHE): $$(JDK_IMAGE_DIR)/release
 	$$(call MakeDir, $$($1_TEST_SUPPORT_DIR)/aot)
 
-	$(foreach jtool, javac javap jlink jar, \
-	    $(info AOT: Create cache configuration for $(jtool)) \
-	    $$(call ExecuteWithLog, $$($1_TEST_SUPPORT_DIR)/aot.$(jtool), ( \
-	        $$(FIXPATH) $(JDK_UNDER_TEST)/bin/$(jtool) $$($1_JAVA_TOOL_OPTS) \
-	                    -J-XX:AOTMode=record -J-XX:AOTConfiguration=$$($1_AOT_JDK_CONF).$(jtool) --help \
-	    ))
-	)
-
-	$$(info AOT: Copy $(JDK_UNDER_TEST)/lib/classlist to $$($1_AOT_JDK_CONF).jdk )
+	$$(call LogWarn, AOT: Create cache configuration) \
 	$$(call ExecuteWithLog, $$($1_TEST_SUPPORT_DIR)/aot, ( \
-		$$(FIXPATH) $(CP) $(JDK_UNDER_TEST)/lib/classlist $$($1_AOT_JDK_CONF).jdk \
+	    $(CD) $(TEST_IMAGE_DIR)/setup_aot; \
+	    $$(FIXPATH) $(JDK_UNDER_TEST)/bin/java $$($1_VM_OPTIONS) \
+	        -Xlog:cds,cds+class=debug:file=$$($1_AOT_JDK_CONF).log  -Xlog:cds*=error \
+	        -XX:AOTMode=record -XX:AOTConfiguration=$$($1_AOT_JDK_CONF) \
+	        TestSetupAOT > $$($1_AOT_JDK_LOG) \
 	))
 
-	$$(FIXPATH) $$(CAT) $$($1_AOT_JDK_CONF).* > $$($1_AOT_JDK_CONF).temp
-	$$(FIXPATH) $$(CAT) $$($1_AOT_JDK_CONF).temp | $(GREP) -v '#' | $(GREP) -v '@' | $(SORT) | \
-	        $(SED) -e 's/id:.*//g' | uniq \
-		> $$($1_AOT_JDK_CONF)
-	$$(FIXPATH) $$(CAT) $$($1_AOT_JDK_CONF).temp | $(GREP) '@cp' | $(SORT) \
-	        >> $$($1_AOT_JDK_CONF)
-
-	$$(info AOT: Generate AOT cache $$($1_AOT_JDK_CACHE) with flags: $$($1_VM_OPTIONS))
+	$$(call LogWarn, AOT: Generate AOT cache $$($1_AOT_JDK_CACHE) with flags: $$($1_VM_OPTIONS))
 	$$(call ExecuteWithLog, $$($1_TEST_SUPPORT_DIR)/aot, ( \
-		$$(FIXPATH) $(JDK_UNDER_TEST)/bin/java \
-	        $$($1_VM_OPTIONS) -Xlog:cds,cds+class=debug:file=$$($1_AOT_JDK_CACHE).log \
-		-XX:AOTMode=create -XX:AOTConfiguration=$$($1_AOT_JDK_CONF) -XX:AOTCache=$$($1_AOT_JDK_CACHE) \
+	    $$(FIXPATH) $(JDK_UNDER_TEST)/bin/java \
+	        $$($1_VM_OPTIONS) -Xlog:cds,cds+class=debug:file=$$($1_AOT_JDK_CACHE).log -Xlog:cds*=error \
+	        -XX:ExtraSharedClassListFile=$(JDK_UNDER_TEST)/lib/classlist \
+	        -XX:AOTMode=create -XX:AOTConfiguration=$$($1_AOT_JDK_CONF) -XX:AOTCache=$$($1_AOT_JDK_CACHE) \
 	))
 
   $1_AOT_TARGETS += $$($1_AOT_JDK_CACHE)
 
 endef
 
-
 SetupRunJtregTest = $(NamedParamsMacroTemplate)
 define SetupRunJtregTestBody
   $1_TEST_RESULTS_DIR := $$(TEST_RESULTS_DIR)/$1
@@ -946,11 +948,10 @@ define SetupRunJtregTestBody
   endif
 
   ifeq ($$(JTREG_AOT_JDK), true)
-    $$(info Add AOT target for $1)
-    $$(eval $$(call SetupAot, $1, VM_OPTIONS := $$(JTREG_ALL_OPTIONS) ))
+    $$(call LogWarn, Add AOT target for $1)
+    $$(eval $$(call SetupAOT, $1, VM_OPTIONS := $$(JTREG_ALL_OPTIONS) ))
 
-    $$(info AOT_TARGETS=$$($1_AOT_TARGETS))
-    $$(info AOT_JDK_CACHE=$$($1_AOT_JDK_CACHE))
+    $$(call LogWarn, AOT_JDK_CACHE=$$($1_AOT_JDK_CACHE))
 
     $1_JTREG_BASIC_OPTIONS += -vmoption:-XX:AOTCache="$$($1_AOT_JDK_CACHE)"
   endif
diff --git a/make/test/BuildTestSetupAOT.gmk b/make/test/BuildTestSetupAOT.gmk
new file mode 100644
index 00000000000..46b18005366
--- /dev/null
+++ b/make/test/BuildTestSetupAOT.gmk
@@ -0,0 +1,69 @@
+#
+# Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute 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 MakeFileStart.gmk
+
+################################################################################
+# This file builds the TestSetupAOT.class, which is used by SetupAOT
+# in ../RunTests.gmk
+################################################################################
+
+include CopyFiles.gmk
+include JavaCompilation.gmk
+
+################################################################################
+
+SETUP_AOT_BASEDIR := $(TOPDIR)/test/setup_aot
+SETUP_AOT_SUPPORT := $(SUPPORT_OUTPUTDIR)/test/setup_aot
+SETUP_AOT_CLASS := $(SETUP_AOT_SUPPORT)/classes/TestSetupAOT.class
+
+$(eval $(call SetupJavaCompilation, BUILD_SETUP_AOT, \
+    TARGET_RELEASE := $(TARGET_RELEASE_NEWJDK_UPGRADED), \
+    SRC := $(SETUP_AOT_BASEDIR), \
+    BIN := $(SETUP_AOT_SUPPORT)/classes, \
+))
+
+TARGETS += $(BUILD_SETUP_AOT)
+
+################################################################################
+# Targets for building test-image.
+################################################################################
+
+# Copy to hotspot jtreg test image
+$(eval $(call SetupCopyFiles, COPY_SETUP_AOT, \
+    SRC := $(SETUP_AOT_SUPPORT)/classes, \
+    DEST := $(TEST_IMAGE_DIR)/setup_aot, \
+    FILES := TestSetupAOT.class, \
+))
+
+IMAGES_TARGETS += $(COPY_SETUP_AOT)
+
+images: $(IMAGES_TARGETS)
+
+.PHONY: images
+
+################################################################################
+
+include MakeFileEnd.gmk
diff --git a/src/hotspot/share/cds/classListParser.cpp b/src/hotspot/share/cds/classListParser.cpp
index 1b4b6ffb22c..9a5ac12b475 100644
--- a/src/hotspot/share/cds/classListParser.cpp
+++ b/src/hotspot/share/cds/classListParser.cpp
@@ -443,10 +443,9 @@ void ClassListParser::print_diagnostic_info(outputStream* st, const char* msg, v
     error_index = 0;
   }
 
-  jio_fprintf(defaultStream::error_stream(),
-              "An error has occurred while processing class list file %s %zu:%d.\n",
-              _classlist_file, lineno(), (error_index + 1));
-  jio_vfprintf(defaultStream::error_stream(), msg, ap);
+  st->print("An error has occurred while processing class list file %s %zu:%d.\n",
+            _classlist_file, lineno(), (error_index + 1));
+  st->vprint(msg, ap);
 
   if (_line_len <= 0) {
     st->print("\n");
diff --git a/test/setup_aot/TestSetupAOT.java b/test/setup_aot/TestSetupAOT.java
new file mode 100644
index 00000000000..1cae8bae246
--- /dev/null
+++ b/test/setup_aot/TestSetupAOT.java
@@ -0,0 +1,59 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.util.spi.ToolProvider;
+
+// This program is executed by make/RunTests.gmk to support running HotSpot tests
+// in the "AOT mode", for example:
+//
+//     make test JTREG=AOT_JDK=true TEST=open/test/hotspot/jtreg/runtime/invokedynamic
+//
+// All JDK classes touched by this program will be stored into a customized AOT cache.
+// This is a larger set of classes than those stored in the JDK's default CDS archive.
+// This customized cache can also have additional optimizations that are not
+// enabled in the default CDS archive. For example, AOT-linked classes and lambda
+// expressions. In the future, it can also contain AOT profiles and AOT compiled methods.
+//
+// We can use this customized AOT cache to run various HotSpot tests to improve
+// coverage on AOT.
+//
+// Note that make/RunTests.gmk loads this class using an implicit classpath of ".", so
+// this class will be excluded from the customized AOT cache. As a result,
+// the customized AOT cache contains *only* classes from the JDK itself.
+
+public class TestSetupAOT {
+    public static void main(String[] args) throws Throwable {
+        String[] tools = {
+            "javac", "javap", "jlink", "jar",
+        };
+        // TODO: we should do more substantial work than just running with "--help".
+        // E.g., use javac to compile a program.
+        for (String tool : tools) {
+            ToolProvider t = ToolProvider.findFirst(tool)
+                .orElseThrow(() -> new RuntimeException(tool + " not found"));
+            t.run(System.out, System.out, "--help");
+        }
+    }
+}

From 00d4e4a9710f89506f36156c24b0f3c5412971fa Mon Sep 17 00:00:00 2001
From: SendaoYan <syan@openjdk.org>
Date: Thu, 20 Feb 2025 02:51:24 +0000
Subject: [PATCH 068/587] 8350051: [JMH] Several tests fails NPE

Reviewed-by: erikj, redestad
---
 make/test/BuildMicrobenchmark.gmk                   | 13 ++++++++++++-
 .../openjdk/bench/javax/xml/AbstractXMLMicro.java   |  6 ++----
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/make/test/BuildMicrobenchmark.gmk b/make/test/BuildMicrobenchmark.gmk
index 53ee942d5d0..92f40472c3c 100644
--- a/make/test/BuildMicrobenchmark.gmk
+++ b/make/test/BuildMicrobenchmark.gmk
@@ -122,9 +122,20 @@ $(JMH_UNPACKED_JARS_DONE): $(JMH_RUNTIME_JARS)
 	$(RM) $(JMH_UNPACKED_DIR)/*.xml
 	$(TOUCH) $@
 
+# Copy dependency files for inclusion in the benchmark JARs
+$(eval $(call SetupCopyFiles, COPY_JAXP_TEST_XML, \
+    SRC := $(TOPDIR)/test/jaxp/javax/xml/jaxp/unittest, \
+    DEST := $(MICROBENCHMARK_CLASSES)/org/openjdk/bench/javax/xml, \
+    FILES := \
+        stream/XMLStreamWriterTest/message_12.xml \
+        validation/tck/reZ003vExc23082309.xml \
+        transform/msgAttach.xml, \
+    FLATTEN := true, \
+))
+
 # Create benchmarks JAR file with benchmarks for both the old and new JDK
 $(eval $(call SetupJarArchive, BUILD_JDK_JAR, \
-    DEPENDENCIES := $(BUILD_JDK_MICROBENCHMARK) $(JMH_UNPACKED_JARS_DONE), \
+    DEPENDENCIES := $(BUILD_JDK_MICROBENCHMARK) $(JMH_UNPACKED_JARS_DONE) $(COPY_JAXP_TEST_XML), \
     SRCS := $(MICROBENCHMARK_CLASSES) $(JMH_UNPACKED_DIR), \
     BIN := $(MICROBENCHMARK_JAR_BIN), \
     SUFFIXES := .*, \
diff --git a/test/micro/org/openjdk/bench/javax/xml/AbstractXMLMicro.java b/test/micro/org/openjdk/bench/javax/xml/AbstractXMLMicro.java
index 9d7955f3981..95593b38b3b 100644
--- a/test/micro/org/openjdk/bench/javax/xml/AbstractXMLMicro.java
+++ b/test/micro/org/openjdk/bench/javax/xml/AbstractXMLMicro.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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,15 +38,13 @@ import java.util.concurrent.ConcurrentHashMap;
 @State(Scope.Benchmark)
 public abstract class AbstractXMLMicro {
 
-  public static final String BUILDIMPL = "build-impl.xml";
-  public static final String LOGCOMP = "log_comp.xml";
   public static final String MESSAGE12 = "message_12.xml";
   public static final String MSGATTACH = "msgAttach.xml";
   public static final String REZ = "reZ003vExc23082309.xml";
 
   protected static final ConcurrentHashMap<String, byte[]> byteCache = new ConcurrentHashMap<>();
 
-  @Param({BUILDIMPL,LOGCOMP,MESSAGE12,MSGATTACH,REZ})
+  @Param({MESSAGE12,MSGATTACH,REZ})
   protected String doc;
 
   /**

From 26bf445f4726f1936a0a4cbaf1424c5235424bfb Mon Sep 17 00:00:00 2001
From: SendaoYan <syan@openjdk.org>
Date: Thu, 20 Feb 2025 07:24:51 +0000
Subject: [PATCH 069/587] 8350049: [JMH] Float16OperationsBenchmark fails
 java.lang.NoClassDefFoundError

Reviewed-by: jbhateja
---
 .../bench/jdk/incubator/vector/Float16OperationsBenchmark.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/micro/org/openjdk/bench/jdk/incubator/vector/Float16OperationsBenchmark.java b/test/micro/org/openjdk/bench/jdk/incubator/vector/Float16OperationsBenchmark.java
index ca8c0edfc74..a0a462ad6b1 100644
--- a/test/micro/org/openjdk/bench/jdk/incubator/vector/Float16OperationsBenchmark.java
+++ b/test/micro/org/openjdk/bench/jdk/incubator/vector/Float16OperationsBenchmark.java
@@ -31,7 +31,7 @@ import static java.lang.Float.*;
 
 @OutputTimeUnit(TimeUnit.MILLISECONDS)
 @State(Scope.Thread)
-@Fork(jvmArgsPrepend = {"--add-modules=jdk.incubator.vector", "-Xbatch",  "-XX:-TieredCompilation"})
+@Fork(jvmArgs = {"--add-modules=jdk.incubator.vector", "-Xbatch", "-XX:-TieredCompilation"})
 public class Float16OperationsBenchmark {
     @Param({"256", "512", "1024", "2048"})
     int vectorDim;

From c5c91a82931d8bd3aa4dc1568162097ef4b66ce0 Mon Sep 17 00:00:00 2001
From: Amit Kumar <amitkumar@openjdk.org>
Date: Thu, 20 Feb 2025 08:53:19 +0000
Subject: [PATCH 070/587] 8345285: [s390x] test failures:
 foreign/normalize/TestNormalize.java with C2

Reviewed-by: mdoerr, aph
---
 src/hotspot/cpu/s390/abstractInterpreter_s390.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/hotspot/cpu/s390/abstractInterpreter_s390.cpp b/src/hotspot/cpu/s390/abstractInterpreter_s390.cpp
index bddac3953a1..37aa9d9a0e8 100644
--- a/src/hotspot/cpu/s390/abstractInterpreter_s390.cpp
+++ b/src/hotspot/cpu/s390/abstractInterpreter_s390.cpp
@@ -190,7 +190,7 @@ void AbstractInterpreter::layout_activation(Method* method,
     assert(is_bottom_frame && (sender_sp == caller->unextended_sp()),
            "must initialize sender_sp of bottom skeleton frame when pushing it");
   } else {
-    assert(caller->is_entry_frame(), "is there a new frame type??");
+    assert(caller->is_entry_frame() || caller->is_upcall_stub_frame(), "is there a new frame type??");
     sender_sp = caller->sp(); // Call_stub only uses it's fp.
   }
 
@@ -200,6 +200,8 @@ void AbstractInterpreter::layout_activation(Method* method,
   interpreter_frame->interpreter_frame_set_monitor_end((BasicObjectLock *)monitor);
   *interpreter_frame->interpreter_frame_cache_addr() = method->constants()->cache();
   interpreter_frame->interpreter_frame_set_tos_address(tos);
-  interpreter_frame->interpreter_frame_set_sender_sp(sender_sp);
+  if (!is_bottom_frame) {
+    interpreter_frame->interpreter_frame_set_sender_sp(sender_sp);
+  }
   interpreter_frame->interpreter_frame_set_top_frame_sp(top_frame_sp);
 }

From 0662e39a6ef722f6e09383566648c794a47ebabe Mon Sep 17 00:00:00 2001
From: Matthias Baesken <mbaesken@openjdk.org>
Date: Thu, 20 Feb 2025 08:58:18 +0000
Subject: [PATCH 071/587] 8350267: Set mtune and mcpu settings in JDK native
 lib compilation on Linux ppc64(le)

Reviewed-by: mdoerr, asteiner, erikj
---
 make/autoconf/flags-cflags.m4 | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/make/autoconf/flags-cflags.m4 b/make/autoconf/flags-cflags.m4
index 1674d10fa91..857e2b65e57 100644
--- a/make/autoconf/flags-cflags.m4
+++ b/make/autoconf/flags-cflags.m4
@@ -715,11 +715,13 @@ AC_DEFUN([FLAGS_SETUP_CFLAGS_CPU_DEP],
       if test "x$FLAGS_CPU" = xppc64; then
         # -mminimal-toc fixes `relocation truncated to fit' error for gcc 4.1.
         # Use ppc64 instructions, but schedule for power5
-        $1_CFLAGS_CPU_JVM="${$1_CFLAGS_CPU_JVM} -mminimal-toc -mcpu=powerpc64 -mtune=power5"
+        $1_CFLAGS_CPU="-mcpu=powerpc64 -mtune=power5"
+        $1_CFLAGS_CPU_JVM="${$1_CFLAGS_CPU_JVM} -mminimal-toc"
       elif test "x$FLAGS_CPU" = xppc64le; then
         # Little endian machine uses ELFv2 ABI.
         # Use Power8, this is the first CPU to support PPC64 LE with ELFv2 ABI.
-        $1_CFLAGS_CPU_JVM="${$1_CFLAGS_CPU_JVM} -DABI_ELFv2 -mcpu=power8 -mtune=power10"
+        $1_CFLAGS_CPU="-mcpu=power8 -mtune=power10"
+        $1_CFLAGS_CPU_JVM="${$1_CFLAGS_CPU_JVM} -DABI_ELFv2"
       fi
     elif test "x$FLAGS_CPU" = xs390x; then
       $1_CFLAGS_CPU="-mbackchain -march=z10"

From 86d0616276c0a8d60c3b7ff79ade6c83ff0c72a2 Mon Sep 17 00:00:00 2001
From: Hao Sun <haosun@openjdk.org>
Date: Thu, 20 Feb 2025 09:03:53 +0000
Subject: [PATCH 072/587] 8350303: ARM32:
 StubCodeGenerator::verify_stub(StubGenStubId) failed after JDK-8343767

Reviewed-by: shade, adinn
---
 src/hotspot/share/runtime/stubDeclarations.hpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/hotspot/share/runtime/stubDeclarations.hpp b/src/hotspot/share/runtime/stubDeclarations.hpp
index 6930ded7fb8..804bdc579b1 100644
--- a/src/hotspot/share/runtime/stubDeclarations.hpp
+++ b/src/hotspot/share/runtime/stubDeclarations.hpp
@@ -552,6 +552,8 @@
            catch_exception_entry)                                       \
   do_stub(initial, fence)                                               \
   do_entry(initial, fence, fence_entry, fence_entry)                    \
+  do_stub(initial, atomic_add)                                          \
+  do_entry(initial, atomic_add, atomic_add_entry, atomic_add_entry)     \
   do_stub(initial, atomic_xchg)                                         \
   do_entry(initial, atomic_xchg, atomic_xchg_entry, atomic_xchg_entry)  \
   do_stub(initial, atomic_cmpxchg)                                      \
@@ -638,8 +640,6 @@
                                   do_arch_blob,                         \
                                   do_arch_entry, do_arch_entry_init)    \
   do_blob(compiler)                                                     \
-  do_stub(compiler, atomic_add)                                         \
-  do_entry(compiler, atomic_add, atomic_add_entry, atomic_add_entry)    \
   do_stub(compiler, array_sort)                                         \
   do_entry(compiler, array_sort, array_sort, select_arraysort_function) \
   do_stub(compiler, array_partition)                                    \

From 1e87ff01994df16df7de331040fc5d7a4a85f630 Mon Sep 17 00:00:00 2001
From: Abhishek Kumar <abhiscxk@openjdk.org>
Date: Thu, 20 Feb 2025 09:17:40 +0000
Subject: [PATCH 073/587] 8348936: [Accessibility,macOS,VoiceOver] VoiceOver
 doesn't announce untick on toggling the checkbox with "space" key on macOS
 8345728: [Accessibility,macOS,Screen Magnifier]: JCheckbox unchecked state
 does not magnify but works for checked state

Reviewed-by: aivanov, kizune, dnguyen, asemenov
---
 .../classes/sun/lwawt/macosx/CAccessible.java |   7 +-
 .../TestJCheckBoxToggleAccessibility.java     | 129 ++++++++++++++++++
 2 files changed, 133 insertions(+), 3 deletions(-)
 create mode 100644 test/jdk/javax/accessibility/TestJCheckBoxToggleAccessibility.java

diff --git a/src/java.desktop/macosx/classes/sun/lwawt/macosx/CAccessible.java b/src/java.desktop/macosx/classes/sun/lwawt/macosx/CAccessible.java
index 779423bc28f..8f67a06a13d 100644
--- a/src/java.desktop/macosx/classes/sun/lwawt/macosx/CAccessible.java
+++ b/src/java.desktop/macosx/classes/sun/lwawt/macosx/CAccessible.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,6 +28,7 @@ package sun.lwawt.macosx;
 import java.awt.Component;
 import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
+import java.util.Objects;
 
 import javax.accessibility.Accessible;
 import javax.accessibility.AccessibleContext;
@@ -182,7 +183,7 @@ class CAccessible extends CFRetainedResource implements Accessible {
 
                     // Do send check box state changes to native side
                     if (thisRole == AccessibleRole.CHECK_BOX) {
-                        if (newValue != null && !newValue.equals(oldValue)) {
+                        if (!Objects.equals(newValue, oldValue)) {
                             valueChanged(ptr);
                         }
 
@@ -208,7 +209,7 @@ class CAccessible extends CFRetainedResource implements Accessible {
 
                     // Do send toggle button state changes to native side
                     if (thisRole == AccessibleRole.TOGGLE_BUTTON) {
-                        if (newValue != null && !newValue.equals(oldValue)) {
+                        if (!Objects.equals(newValue, oldValue)) {
                             valueChanged(ptr);
                         }
                     }
diff --git a/test/jdk/javax/accessibility/TestJCheckBoxToggleAccessibility.java b/test/jdk/javax/accessibility/TestJCheckBoxToggleAccessibility.java
new file mode 100644
index 00000000000..2a1d03117b7
--- /dev/null
+++ b/test/jdk/javax/accessibility/TestJCheckBoxToggleAccessibility.java
@@ -0,0 +1,129 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.awt.BorderLayout;
+import java.awt.GridLayout;
+
+import javax.swing.JCheckBox;
+import javax.swing.JFrame;
+import javax.swing.JPanel;
+import javax.swing.JToggleButton;
+
+/*
+ * @test
+ * @bug 8348936 8345728
+ * @summary Verifies that VoiceOver announces the untick state of CheckBox and
+ *          ToggleButton when space key is pressed. Also verifies that CheckBox
+ *          and ToggleButton untick state is magnified with Screen Magnifier.
+ * @requires os.family == "mac"
+ * @library /java/awt/regtesthelpers
+ * @build PassFailJFrame
+ * @run main/manual TestJCheckBoxToggleAccessibility
+ */
+
+public class TestJCheckBoxToggleAccessibility {
+    public static void main(String[] args) throws Exception {
+        String INSTRUCTIONS = """
+                <html><body>
+                <p><b>Testing with VoiceOver</b></p>
+
+                <ol>
+                  <li>Start the VoiceOver application
+                      (Press <kbd>Command</kbd> + <kbd>F5</kbd>)
+                  <li>Click on the <i>Frame with CheckBox and ToggleButton</i>
+                      window to move focus
+                  <li>Press <kbd>Spacebar</kbd>
+                  <li>VO should announce the checked state
+                  <li>Press <kbd>Spacebar</kbd> again
+                  <li>VO should announce the unchecked state
+                  <li>Press <kbd>Tab</kbd> to move focus to <i>ToggleButton</i>
+                  <li>Repeat steps 3 to 6 and listen the announcement
+                  <li>If announcements are incorrect, press <b>Fail</b>
+                  <li>Stop the VoiceOver application
+                      (Press <kbd>Command</kbd> + <kbd>F5</kbd> again)
+                </ol>
+
+                <p><b>Testing with Screen Magnifier</b></p>
+                <ol style="margin-bottom: 0">
+                  <li>Enable Screen magnifier on the Mac:
+                   <b>System Settings</b> -> <b>Accessibility</b> ->
+                   <b>Hover Text</b> -> Enable <b>Hover Text</b><br>
+                   Default Hover Text Activation Modifier is <kbd>Command</kbd> key
+                  <li>Move focus back to the test application and perform the following tests
+
+                  <ul style="margin-bottom: 0">
+                    <li>Test <i>CheckBox</i> states with Screen Magnifier
+                      <ol style="list-style-type: lower-alpha; margin-top: 0; margin-bottom: 0">
+                        <li>Click on <i>CheckBox</i> to select it
+                        <li>Press the <kbd>Command</kbd> key and
+                            hover mouse over <i>CheckBox</i>
+                        <li>CheckBox ticked state along with its label should be magnified
+                        <li>Keep the <kbd>Command</kbd> key pressed and
+                            click <i>CheckBox</i> to deselect it
+                        <li>CheckBox unticked state along with its label should be magnified
+                        <li>Release the <kbd>Command</kbd> key
+                        <li>If Screen Magnifier behaviour is incorrect, press <b>Fail</b>
+                      </ol>
+                    <li>Test <i>ToggleButton</i> states with Screen Magnifier
+                      <ol style="list-style-type: lower-alpha; margin-top: 0; margin-bottom: 0">
+                        <li>Click on <i>ToggleButton</i> to select it
+                        <li>Press the <kbd>Command</kbd> key and
+                            hover mouse over <i>ToggleButton</i>
+                        <li>Ticked state along with label should be magnified
+                        <li>Keep the <kbd>Command</kbd> button pressed and
+                            click <i>ToggleButton</i> to deselect it
+                        <li>Unticked state along with its label should be magnified
+                        <li>Release the <kbd>Command</kbd> key
+                        <li>If Screen Magnifier behaviour is incorrect, press <b>Fail</b>
+                      </ol>
+                  </ul>
+                  <li>Disable <b>Hover Text</b> (optionally) in the Settings
+                </ol>
+
+                <p>Press <b>Pass</b> if you are able to hear correct VoiceOver announcements and
+                able to see the correct screen magnifier behaviour.</p></body></html>""";
+
+        PassFailJFrame.builder()
+                .title("TestJCheckBoxToggleAccessibility Instruction")
+                .instructions(INSTRUCTIONS)
+                .columns(40)
+                .rows(25)
+                .testUI(TestJCheckBoxToggleAccessibility::createUI)
+                .testTimeOut(8)
+                .build()
+                .awaitAndCheck();
+    }
+
+    private static JFrame createUI() {
+        JFrame frame = new JFrame("A Frame with CheckBox and ToggleButton");
+        JCheckBox cb = new JCheckBox("CheckBox", false);
+        JToggleButton tb = new JToggleButton("ToggleButton");
+
+        JPanel p = new JPanel(new GridLayout(2, 1));
+        p.add(cb);
+        p.add(tb);
+        frame.getContentPane().add(p, BorderLayout.CENTER);
+        frame.setSize(400, 400);
+        return frame;
+    }
+}

From 735805d9259037ae594eb4f75e96860d43feea5d Mon Sep 17 00:00:00 2001
From: Martin Doerr <mdoerr@openjdk.org>
Date: Thu, 20 Feb 2025 12:03:08 +0000
Subject: [PATCH 074/587] 8349727: [PPC] C1: Improve Class.isInstance intrinsic

Reviewed-by: rrich, varadam
---
 src/hotspot/cpu/ppc/c1_LIRAssembler_ppc.cpp | 17 +++---
 src/hotspot/cpu/ppc/c1_LIRGenerator_ppc.cpp |  3 +-
 src/hotspot/cpu/ppc/c1_Runtime1_ppc.cpp     | 67 +++++++++++++++++++++
 src/hotspot/cpu/ppc/macroAssembler_ppc.cpp  | 31 +++++-----
 4 files changed, 95 insertions(+), 23 deletions(-)

diff --git a/src/hotspot/cpu/ppc/c1_LIRAssembler_ppc.cpp b/src/hotspot/cpu/ppc/c1_LIRAssembler_ppc.cpp
index 67a4a65b871..cae192982d5 100644
--- a/src/hotspot/cpu/ppc/c1_LIRAssembler_ppc.cpp
+++ b/src/hotspot/cpu/ppc/c1_LIRAssembler_ppc.cpp
@@ -2839,25 +2839,28 @@ void LIR_Assembler::negate(LIR_Opr left, LIR_Opr dest, LIR_Opr tmp) {
 
 void LIR_Assembler::rt_call(LIR_Opr result, address dest,
                             const LIR_OprList* args, LIR_Opr tmp, CodeEmitInfo* info) {
-  // Stubs: Called via rt_call, but dest is a stub address (no function descriptor).
+  // Stubs: Called via rt_call, but dest is a stub address (no FunctionDescriptor).
   if (dest == Runtime1::entry_for(C1StubId::register_finalizer_id) ||
-      dest == Runtime1::entry_for(C1StubId::new_multi_array_id   )) {
+      dest == Runtime1::entry_for(C1StubId::new_multi_array_id   ) ||
+      dest == Runtime1::entry_for(C1StubId::is_instance_of_id    )) {
+    assert(CodeCache::contains(dest), "simplified call is only for special C1 stubs");
     //__ load_const_optimized(R0, dest);
     __ add_const_optimized(R0, R29_TOC, MacroAssembler::offset_to_global_toc(dest));
     __ mtctr(R0);
     __ bctrl();
-    assert(info != nullptr, "sanity");
-    add_call_info_here(info);
-    __ post_call_nop();
+    if (info != nullptr) {
+      add_call_info_here(info);
+      __ post_call_nop();
+    }
     return;
   }
 
   __ call_c(dest, relocInfo::runtime_call_type);
+  assert(__ last_calls_return_pc() == __ pc(), "pcn not at return pc");
   if (info != nullptr) {
     add_call_info_here(info);
+    __ post_call_nop();
   }
-  assert(__ last_calls_return_pc() == __ pc(), "pcn not at return pc");
-  __ post_call_nop();
 }
 
 
diff --git a/src/hotspot/cpu/ppc/c1_LIRGenerator_ppc.cpp b/src/hotspot/cpu/ppc/c1_LIRGenerator_ppc.cpp
index d9ccf63bed3..b9c8ced8ef1 100644
--- a/src/hotspot/cpu/ppc/c1_LIRGenerator_ppc.cpp
+++ b/src/hotspot/cpu/ppc/c1_LIRGenerator_ppc.cpp
@@ -1128,9 +1128,10 @@ void LIRGenerator::do_InstanceOf(InstanceOf* x) {
                 x->profiled_method(), x->profiled_bci());
 }
 
+
 // Intrinsic for Class::isInstance
 address LIRGenerator::isInstance_entry() {
-  return CAST_FROM_FN_PTR(address, Runtime1::is_instance_of);
+  return Runtime1::entry_for(C1StubId::is_instance_of_id);
 }
 
 
diff --git a/src/hotspot/cpu/ppc/c1_Runtime1_ppc.cpp b/src/hotspot/cpu/ppc/c1_Runtime1_ppc.cpp
index b1ee11317d2..11c01dcdc60 100644
--- a/src/hotspot/cpu/ppc/c1_Runtime1_ppc.cpp
+++ b/src/hotspot/cpu/ppc/c1_Runtime1_ppc.cpp
@@ -609,6 +609,73 @@ OopMapSet* Runtime1::generate_code_for(C1StubId id, StubAssembler* sasm) {
       }
       break;
 
+    case C1StubId::is_instance_of_id:
+      {
+        // Called like a C function, but without FunctionDescriptor (see LIR_Assembler::rt_call).
+
+        // Arguments and return value.
+        Register mirror = R3_ARG1;
+        Register obj    = R4_ARG2;
+        Register result = R3_RET;
+
+        // Other argument registers can be used as temp registers.
+        Register klass  = R5;
+        Register offset = R6;
+        Register sub_klass = R7;
+
+        Label is_secondary, success;
+
+        // Get the Klass*.
+        __ ld(klass, java_lang_Class::klass_offset(), mirror);
+
+        // Return false if obj or klass is null.
+        mirror = noreg; // killed by next instruction
+        __ li(result, 0); // assume result is false
+        __ cmpdi(CR0, obj, 0);
+        __ cmpdi(CR1, klass, 0);
+        __ cror(CR0, Assembler::equal, CR1, Assembler::equal);
+        __ bclr(Assembler::bcondCRbiIs1, Assembler::bi0(CR0, Assembler::equal), Assembler::bhintbhBCLRisReturn);
+
+        __ lwz(offset, in_bytes(Klass::super_check_offset_offset()), klass);
+        __ load_klass(sub_klass, obj);
+        __ cmpwi(CR0, offset, in_bytes(Klass::secondary_super_cache_offset()));
+        __ beq(CR0, is_secondary); // Klass is a secondary superclass
+
+        // Klass is a concrete class
+        __ ldx(R0, sub_klass, offset);
+        __ cmpd(CR0, klass, R0);
+        if (VM_Version::has_brw()) {
+          // Power10 can set the result by one instruction. No need for a branch.
+          __ setbc(result, CR0, Assembler::equal);
+        } else {
+          __ beq(CR0, success);
+        }
+        __ blr();
+
+        __ bind(is_secondary);
+
+        // This is necessary because I am never in my own secondary_super list.
+        __ cmpd(CR0, sub_klass, klass);
+        __ beq(CR0, success);
+
+        __ lookup_secondary_supers_table_var(sub_klass, klass,
+                                             /*temps*/R9, R10, R11, R12,
+                                             /*result*/R8);
+        __ cmpdi(CR0, R8, 0); // 0 means is subclass
+        if (VM_Version::has_brw()) {
+          // Power10 can set the result by one instruction. No need for a branch.
+          __ setbc(result, CR0, Assembler::equal);
+        } else {
+          __ beq(CR0, success);
+        }
+        __ blr();
+
+        __ bind(success);
+        __ li(result, 1);
+        __ blr();
+      }
+      break;
+
     case C1StubId::monitorenter_nofpu_id:
     case C1StubId::monitorenter_id:
       {
diff --git a/src/hotspot/cpu/ppc/macroAssembler_ppc.cpp b/src/hotspot/cpu/ppc/macroAssembler_ppc.cpp
index 1267fa0e516..6bdb4f80266 100644
--- a/src/hotspot/cpu/ppc/macroAssembler_ppc.cpp
+++ b/src/hotspot/cpu/ppc/macroAssembler_ppc.cpp
@@ -2265,27 +2265,28 @@ void MacroAssembler::check_klass_subtype(Register sub_klass,
 // generic (count must be >0)
 // iff found: CR0 eq, scratch == 0
 void MacroAssembler::repne_scan(Register addr, Register value, Register count, Register scratch) {
-  Label Lloop, Lexit;
+  Label Lloop, Lafter_loop, Lexit;
 
-#ifdef ASSERT
-  {
-    Label ok;
-    cmpdi(CR0, count, 0);
-    bgt(CR0, ok);
-    stop("count must be positive");
-    bind(ok);
-  }
-#endif
+  srdi_(scratch, count, 1);
+  beq(CR0, Lafter_loop);
+  mtctr(scratch);
 
-  mtctr(count);
-
-  bind(Lloop);
-  ld(scratch, 0 , addr);
+  bind(Lloop); // 2x unrolled
+  ld(scratch, 0, addr);
   xor_(scratch, scratch, value);
   beq(CR0, Lexit);
-  addi(addr, addr, wordSize);
+  ld(scratch, 8, addr);
+  xor_(scratch, scratch, value);
+  beq(CR0, Lexit);
+  addi(addr, addr, 2 * wordSize);
   bdnz(Lloop);
 
+  bind(Lafter_loop);
+  andi_(scratch, count, 1);
+  beq(CR0, Lexit); // if taken: CR0 eq and scratch == 0
+  ld(scratch, 0, addr);
+  xor_(scratch, scratch, value);
+
   bind(Lexit);
 }
 

From 960ad211867d65a993b2fc4e6dafa8cea9827b3f Mon Sep 17 00:00:00 2001
From: Jiangli Zhou <jiangli@openjdk.org>
Date: Thu, 20 Feb 2025 15:47:54 +0000
Subject: [PATCH 075/587] 8349620: Add VMProps for static JDK

Reviewed-by: alanb, manc
---
 src/hotspot/share/prims/whitebox.cpp                   | 8 +++++++-
 test/hotspot/jtreg/TEST.ROOT                           | 3 ++-
 test/hotspot/jtreg/runtime/modules/ModulesSymLink.java | 1 +
 test/jdk/TEST.ROOT                                     | 3 ++-
 test/jtreg-ext/requires/VMProps.java                   | 5 +++++
 test/lib/jdk/test/whitebox/WhiteBox.java               | 2 ++
 6 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/src/hotspot/share/prims/whitebox.cpp b/src/hotspot/share/prims/whitebox.cpp
index 686797f8dd6..a612a3d55a9 100644
--- a/src/hotspot/share/prims/whitebox.cpp
+++ b/src/hotspot/share/prims/whitebox.cpp
@@ -47,6 +47,7 @@
 #include "gc/shared/gcConfig.hpp"
 #include "gc/shared/gcLocker.inline.hpp"
 #include "gc/shared/genArguments.hpp"
+#include "jvm.h"
 #include "jvmtifiles/jvmtiEnv.hpp"
 #include "logging/log.hpp"
 #include "memory/iterator.hpp"
@@ -1804,6 +1805,10 @@ WB_ENTRY(jlong, WB_RootChunkWordSize(JNIEnv* env))
   return (jlong)Metaspace::reserve_alignment_words();
 WB_END
 
+WB_ENTRY(jboolean, WB_IsStaticallyLinked(JNIEnv* env, jobject wb))
+  return JVM_IsStaticallyLinked();
+WB_END
+
 //////////////
 
 WB_ENTRY(jlong, WB_AllocateMetaspace(JNIEnv* env, jobject wb, jobject class_loader, jlong size))
@@ -3003,7 +3008,8 @@ static JNINativeMethod methods[] = {
   {CC"printString", CC"(Ljava/lang/String;I)Ljava/lang/String;", (void*)&WB_PrintString},
   {CC"lockAndStuckInSafepoint", CC"()V", (void*)&WB_TakeLockAndHangInSafepoint},
   {CC"wordSize", CC"()J",                             (void*)&WB_WordSize},
-  {CC"rootChunkWordSize", CC"()J",                    (void*)&WB_RootChunkWordSize}
+  {CC"rootChunkWordSize", CC"()J",                    (void*)&WB_RootChunkWordSize},
+  {CC"isStatic", CC"()Z",                             (void*)&WB_IsStaticallyLinked}
 };
 
 
diff --git a/test/hotspot/jtreg/TEST.ROOT b/test/hotspot/jtreg/TEST.ROOT
index ac4321e6839..ffc70d1bb18 100644
--- a/test/hotspot/jtreg/TEST.ROOT
+++ b/test/hotspot/jtreg/TEST.ROOT
@@ -92,7 +92,8 @@ requires.properties= \
     systemd.support \
     jdk.containerized \
     jlink.runtime.linkable \
-    jlink.packagedModules
+    jlink.packagedModules \
+    jdk.static
 
 # Minimum jtreg version
 requiredVersion=7.5.1+1
diff --git a/test/hotspot/jtreg/runtime/modules/ModulesSymLink.java b/test/hotspot/jtreg/runtime/modules/ModulesSymLink.java
index f19897f9638..18d618cf8bc 100644
--- a/test/hotspot/jtreg/runtime/modules/ModulesSymLink.java
+++ b/test/hotspot/jtreg/runtime/modules/ModulesSymLink.java
@@ -27,6 +27,7 @@
  * @bug 8220095
  * @requires os.family == "linux" | os.family == "mac"
  * @requires vm.flagless
+ * @requires !jdk.static
  * @library /test/lib
  * @modules java.management
  *          jdk.jlink
diff --git a/test/jdk/TEST.ROOT b/test/jdk/TEST.ROOT
index 3b0b824b36f..91c44bc4d05 100644
--- a/test/jdk/TEST.ROOT
+++ b/test/jdk/TEST.ROOT
@@ -111,7 +111,8 @@ requires.properties= \
     jdk.containerized \
     jdk.foreign.linker \
     jlink.runtime.linkable \
-    jlink.packagedModules
+    jlink.packagedModules \
+    jdk.static
 
 # Minimum jtreg version
 requiredVersion=7.5.1+1
diff --git a/test/jtreg-ext/requires/VMProps.java b/test/jtreg-ext/requires/VMProps.java
index 7e4553f0611..6f8beff8cf9 100644
--- a/test/jtreg-ext/requires/VMProps.java
+++ b/test/jtreg-ext/requires/VMProps.java
@@ -140,6 +140,7 @@ public class VMProps implements Callable<Map<String, String>> {
         map.put("vm.flagless", this::isFlagless);
         map.put("jdk.foreign.linker", this::jdkForeignLinker);
         map.put("jlink.packagedModules", this::packagedModules);
+        map.put("jdk.static", this::isStatic);
         vmGC(map); // vm.gc.X = true/false
         vmGCforCDS(map); // may set vm.gc
         vmOptFinalFlags(map);
@@ -820,6 +821,10 @@ public class VMProps implements Callable<Map<String, String>> {
         return String.valueOf(CABI.current());
     }
 
+    private String isStatic() {
+        return Boolean.toString(WB.isStatic());
+    }
+
     /**
      * Dumps the map to the file if the file name is given as the property.
      * This functionality could be helpful to know context in the real
diff --git a/test/lib/jdk/test/whitebox/WhiteBox.java b/test/lib/jdk/test/whitebox/WhiteBox.java
index 41ad60a7c4b..7222c6fedcf 100644
--- a/test/lib/jdk/test/whitebox/WhiteBox.java
+++ b/test/lib/jdk/test/whitebox/WhiteBox.java
@@ -798,4 +798,6 @@ public class WhiteBox {
 
   public native void preTouchMemory(long addr, long size);
   public native long rss();
+
+  public native boolean isStatic();
 }

From 10bf48a6b0b796b48cdca15250e1ee7e7be83c82 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Johan=20Sj=C3=B6len?= <jsjolen@openjdk.org>
Date: Thu, 20 Feb 2025 15:50:24 +0000
Subject: [PATCH 076/587] 8350214: Test gtest/AsyncLogGtest.java fails after
 JDK-8349755

Reviewed-by: aboldtch, dholmes
---
 src/hotspot/share/logging/logAsyncWriter.cpp      | 14 ++++++++++----
 src/hotspot/share/logging/logAsyncWriter.hpp      |  1 -
 src/hotspot/share/logging/logTag.hpp              |  1 -
 src/hotspot/share/logging/logTagSet.cpp           |  8 +-------
 src/hotspot/share/runtime/globals.hpp             |  4 ++++
 .../jtreg/runtime/logging/AsyncDeathTest.java     | 15 +++++++++++----
 6 files changed, 26 insertions(+), 17 deletions(-)

diff --git a/src/hotspot/share/logging/logAsyncWriter.cpp b/src/hotspot/share/logging/logAsyncWriter.cpp
index 44758958dd3..737f001c049 100644
--- a/src/hotspot/share/logging/logAsyncWriter.cpp
+++ b/src/hotspot/share/logging/logAsyncWriter.cpp
@@ -30,8 +30,8 @@
 #include "memory/resourceArea.hpp"
 #include "runtime/atomic.hpp"
 #include "runtime/os.inline.hpp"
+#include "runtime/globals.hpp"
 
-DEBUG_ONLY(bool AsyncLogWriter::ignore_recursive_logging = false;)
 
 class AsyncLogWriter::AsyncLogLocker : public StackObj {
   static Thread* _holder;
@@ -116,10 +116,11 @@ bool AsyncLogWriter::is_enqueue_allowed() {
     // Do not log while holding the Async log lock.
     // Try to catch possible occurrences in debug builds.
 #ifdef ASSERT
-    if (!AsyncLogWriter::ignore_recursive_logging) {
+    if (!TestingAsyncLoggingDeathTestNoCrash) {
       ShouldNotReachHere();
     }
 #endif // ASSERT
+
     return false;
   }
 
@@ -142,8 +143,13 @@ bool AsyncLogWriter::enqueue(LogFileStreamOutput& output, const LogDecorations&
   }
 
   AsyncLogLocker locker;
-  DEBUG_ONLY(log_debug(deathtest)("Induce a recursive log for testing (for crashing)");)
-  DEBUG_ONLY(log_debug(deathtest2)("Induce a recursive log for testing");)
+
+#ifdef ASSERT
+  if (TestingAsyncLoggingDeathTest || TestingAsyncLoggingDeathTestNoCrash) {
+    log_debug(deathtest)("Induce a recursive log for testing");
+  }
+#endif // ASSERT
+
   AsyncLogWriter::instance()->enqueue_locked(&output, decorations, msg);
   return true;
 }
diff --git a/src/hotspot/share/logging/logAsyncWriter.hpp b/src/hotspot/share/logging/logAsyncWriter.hpp
index e2c8cb36e07..00818634bdd 100644
--- a/src/hotspot/share/logging/logAsyncWriter.hpp
+++ b/src/hotspot/share/logging/logAsyncWriter.hpp
@@ -198,7 +198,6 @@ class AsyncLogWriter : public NonJavaThread {
   static bool is_enqueue_allowed();
 
 public:
-  DEBUG_ONLY(static bool ignore_recursive_logging;)
   static bool enqueue(LogFileStreamOutput& output, const LogDecorations& decorations, const char* msg);
   static bool enqueue(LogFileStreamOutput& output, LogMessageBuffer::Iterator msg_iterator);
 
diff --git a/src/hotspot/share/logging/logTag.hpp b/src/hotspot/share/logging/logTag.hpp
index c3db84930ad..d61e2461e8d 100644
--- a/src/hotspot/share/logging/logTag.hpp
+++ b/src/hotspot/share/logging/logTag.hpp
@@ -69,7 +69,6 @@ class outputStream;
   LOG_TAG(datacreation) \
   LOG_TAG(dcmd) \
   DEBUG_ONLY(LOG_TAG(deathtest)) /* Log Internal death test tag */ \
-  DEBUG_ONLY(LOG_TAG(deathtest2)) /* Log Internal death test tag */ \
   LOG_TAG(decoder) \
   LOG_TAG(defaultmethods) \
   LOG_TAG(deoptimization) \
diff --git a/src/hotspot/share/logging/logTagSet.cpp b/src/hotspot/share/logging/logTagSet.cpp
index 718627be3a5..f7b0e01331c 100644
--- a/src/hotspot/share/logging/logTagSet.cpp
+++ b/src/hotspot/share/logging/logTagSet.cpp
@@ -78,13 +78,7 @@ void LogTagSet::log(LogLevelType level, const char* msg) {
   // the implied memory order of Atomic::add().
   LogOutputList::Iterator it = _output_list.iterator(level);
   LogDecorations decorations(level, *this, _decorators);
-#ifdef ASSERT
-  // If we log for tag deathtest2 then we're testing that recursive logging works.
-  // In this case, do not crash when detecting recursive logging.
-  if (this->contains(LogTagType::_deathtest2)) {
-    AsyncLogWriter::ignore_recursive_logging = true;
-  }
-#endif
+
   for (; it != _output_list.end(); it++) {
     (*it)->write(decorations, msg);
   }
diff --git a/src/hotspot/share/runtime/globals.hpp b/src/hotspot/share/runtime/globals.hpp
index 11c13fe3c9e..d3bdb0c68b2 100644
--- a/src/hotspot/share/runtime/globals.hpp
+++ b/src/hotspot/share/runtime/globals.hpp
@@ -481,6 +481,10 @@ const int ObjectAlignmentInBytes = 8;
                                                                             \
   develop(bool, ZapTLAB, trueInDebug,                                       \
           "Zap allocated TLABs")                                            \
+  develop(bool, TestingAsyncLoggingDeathTest, false,                        \
+          "Recursive logging death test")                                   \
+  develop(bool, TestingAsyncLoggingDeathTestNoCrash, false,                 \
+          "Recursive logging death test (no crash)")                        \
                                                                             \
   product(bool, ExecutingUnitTests, false,                                  \
           "Whether the JVM is running unit tests or not")                   \
diff --git a/test/hotspot/jtreg/runtime/logging/AsyncDeathTest.java b/test/hotspot/jtreg/runtime/logging/AsyncDeathTest.java
index 2dff887f108..cd4a50f65c1 100644
--- a/test/hotspot/jtreg/runtime/logging/AsyncDeathTest.java
+++ b/test/hotspot/jtreg/runtime/logging/AsyncDeathTest.java
@@ -38,17 +38,24 @@ import jdk.test.lib.process.OutputAnalyzer;
 
 public class AsyncDeathTest {
     public static void main(String[] args) throws Exception {
-        // For deathtest we expect the VM to reach ShouldNotReachHere() and die
+        // TestingAsyncLoggingDeathTest is set: We expect the VM to reach ShouldNotReachHere() and die.
         ProcessBuilder pb =
-            ProcessTools.createLimitedTestJavaProcessBuilder("-Xlog:async", "-Xlog:os,deathtest=debug", "-XX:-CreateCoredumpOnCrash", "--version");
+            ProcessTools.createLimitedTestJavaProcessBuilder("-Xlog:async", "-Xlog:os,deathtest=debug", "-XX:-CreateCoredumpOnCrash", "-XX:+TestingAsyncLoggingDeathTest", "--version");
         OutputAnalyzer output = new OutputAnalyzer(pb.start());
         output.shouldNotHaveExitValue(0);
         output.shouldNotContain("Induce a recursive log for testing");
-        // For deathtest2 we expect the VM to ignore that recursive logging has been detected and is handled by printing synchronously.
+        // TestingAsyncLoggingDeathTestNoCrash is set: We expect the VM to ignore that recursive logging has been detected and the logging should be handled by printing synchronously.
         ProcessBuilder pb2 =
-            ProcessTools.createLimitedTestJavaProcessBuilder("-Xlog:async", "-Xlog:os,deathtest2=debug", "--version");
+            ProcessTools.createLimitedTestJavaProcessBuilder("-Xlog:async", "-Xlog:os,deathtest=debug", "-XX:+TestingAsyncLoggingDeathTestNoCrash" , "--version");
         OutputAnalyzer output2 = new OutputAnalyzer(pb2.start());
         output2.shouldHaveExitValue(0);
         output2.shouldContain("Induce a recursive log for testing");
+
+        // For -Xlog:all=debug but without any global set, the test should succeed and not contain the recursive message.
+        ProcessBuilder pb3 =
+            ProcessTools.createLimitedTestJavaProcessBuilder("-Xlog:async", "-Xlog:all=debug", "--version");
+        OutputAnalyzer output3 = new OutputAnalyzer(pb3.start());
+        output3.shouldHaveExitValue(0);
+        output3.shouldNotContain("Induce a recursive log for testing");
     }
 }

From 53db57648a09c4c380064eea11fcdb680011d741 Mon Sep 17 00:00:00 2001
From: Nizar Benalla <nbenalla@openjdk.org>
Date: Thu, 20 Feb 2025 15:53:05 +0000
Subject: [PATCH 077/587] 8350137: After JDK-8348975, Linux builds contain man
 pages for windows only tools

Reviewed-by: erikj
---
 make/Docs.gmk           | 2 +-
 make/common/Modules.gmk | 9 ++++++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/make/Docs.gmk b/make/Docs.gmk
index 5c67393fb66..be9efbdc370 100644
--- a/make/Docs.gmk
+++ b/make/Docs.gmk
@@ -673,7 +673,7 @@ ifeq ($(ENABLE_PANDOC), true)
 
   $(foreach m, $(ALL_MODULES), \
     $(eval MAN_$m := $(call ApplySpecFilter, $(filter %.md, $(call FindFiles, \
-          $(call FindModuleManDirs, $m))))) \
+          $(call FindModuleManDirsForDocs, $m))))) \
     $(if $(MAN_$m), \
       $(eval $(call SetupProcessMarkdown, MAN_TO_HTML_$m, \
         FILES := $(MAN_$m), \
diff --git a/make/common/Modules.gmk b/make/common/Modules.gmk
index 03548ca8778..f4f815c740d 100644
--- a/make/common/Modules.gmk
+++ b/make/common/Modules.gmk
@@ -87,7 +87,10 @@ SRC_SUBDIRS += share/classes
 
 SPEC_SUBDIRS += share/specs
 
-MAN_SUBDIRS += share/man windows/man
+MAN_SUBDIRS += share/man $(TARGET_OS)/man
+
+# The docs should include the sum of all man pages for all platforms
+MAN_DOCS_SUBDIRS += share/man windows/man
 
 # Find all module-info.java files for the current build target platform and
 # configuration.
@@ -153,6 +156,10 @@ FindModuleManDirs = \
     $(strip $(wildcard \
         $(foreach sub, $(MAN_SUBDIRS), $(addsuffix /$(strip $1)/$(sub), $(TOP_SRC_DIRS)))))
 
+FindModuleManDirsForDocs = \
+    $(strip $(wildcard \
+        $(foreach sub, $(MAN_DOCS_SUBDIRS), $(addsuffix /$(strip $1)/$(sub), $(TOP_SRC_DIRS)))))
+
 # Construct the complete module source path
 GetModuleSrcPath = \
     $(call PathList, \

From 16873732a752d79c3bf1bc450c63839997986d9e Mon Sep 17 00:00:00 2001
From: Erik Joelsson <erikj@openjdk.org>
Date: Thu, 20 Feb 2025 17:46:06 +0000
Subject: [PATCH 078/587] 8349933: Mixing of includes and snippets stack causes
 the wrong -post snippet to be included

Reviewed-by: ihse
---
 make/common/MakeIncludeEnd.gmk   | 6 +++---
 make/common/MakeIncludeStart.gmk | 8 ++++----
 make/common/MakeSnippetEnd.gmk   | 6 +++---
 make/common/MakeSnippetStart.gmk | 4 ++--
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/make/common/MakeIncludeEnd.gmk b/make/common/MakeIncludeEnd.gmk
index f0520d84b6c..7023a861fa1 100644
--- a/make/common/MakeIncludeEnd.gmk
+++ b/make/common/MakeIncludeEnd.gmk
@@ -34,12 +34,12 @@ ifneq ($(NO_CUSTOM_EXTENSIONS), true)
 endif
 
 # Pop our helper name off the stack
-HELPER_STACK := $(wordlist 2, $(words $(HELPER_STACK)), $(HELPER_STACK))
+INCLUDE_STACK := $(wordlist 2, $(words $(INCLUDE_STACK)), $(INCLUDE_STACK))
 
 # Print an indented message, also counting the top-level makefile as a level
 ifeq ($(LOG_FLOW), true)
-  $(info :$(foreach s, top $(HELPER_STACK),    )Leave $(THIS_INCLUDE))
+  $(info :$(foreach s, top $(INCLUDE_STACK) $(SNIPPET_STACK),    )Leave $(THIS_INCLUDE))
 endif
 
 # Restore the previous helper name
-THIS_INCLUDE := $(firstword $(HELPER_STACK))
+THIS_INCLUDE := $(firstword $(INCLUDE_STACK))
diff --git a/make/common/MakeIncludeStart.gmk b/make/common/MakeIncludeStart.gmk
index e754114211c..d09f027c1d3 100644
--- a/make/common/MakeIncludeStart.gmk
+++ b/make/common/MakeIncludeStart.gmk
@@ -39,11 +39,11 @@ else
 endif
 
 ifeq ($(LOG_FLOW), true)
-  $(info :$(foreach s, top $(HELPER_STACK),    )Enter $(THIS_INCLUDE) [$(THIS_INCLUDE_MSG)])
+  $(info :$(foreach s, top $(INCLUDE_STACK) $(SNIPPET_STACK),    )Enter $(THIS_INCLUDE) [$(THIS_INCLUDE_MSG)])
 endif
 
-ifneq ($(filter $(THIS_INCLUDE), $(HELPER_STACK)), )
-  $(error Internal makefile error: Include loop detected: $(THIS_INCLUDE) $(HELPER_STACK))
+ifneq ($(filter $(THIS_INCLUDE), $(INCLUDE_STACK)), )
+  $(error Internal makefile error: Include loop detected: $(THIS_INCLUDE) $(INCLUDE_STACK))
 endif
 
 ifeq ($(words $(MAKEFILE_LIST)), 2)
@@ -66,7 +66,7 @@ ifneq ($(IS_PREINIT_ENV), true)
 endif
 
 # Push our helper name onto the stack
-HELPER_STACK := $(THIS_INCLUDE) $(HELPER_STACK)
+INCLUDE_STACK := $(THIS_INCLUDE) $(INCLUDE_STACK)
 
 # Setup an automatic include guard
 ifneq ($(INCLUDE_GUARD_$(THIS_INCLUDE)), true)
diff --git a/make/common/MakeSnippetEnd.gmk b/make/common/MakeSnippetEnd.gmk
index 833df2e9edb..7b46310330a 100644
--- a/make/common/MakeSnippetEnd.gmk
+++ b/make/common/MakeSnippetEnd.gmk
@@ -34,12 +34,12 @@ ifneq ($(NO_CUSTOM_EXTENSIONS), true)
 endif
 
 # Pop our helper name off the stack
-HELPER_STACK := $(wordlist 2, $(words $(HELPER_STACK)), $(HELPER_STACK))
+SNIPPET_STACK := $(wordlist 2, $(words $(SNIPPET_STACK)), $(SNIPPET_STACK))
 
 # Print an indented message, also counting the top-level makefile as a level
 ifeq ($(LOG_FLOW), true)
-  $(info :$(foreach s, top $(HELPER_STACK),    )Leave $(THIS_SNIPPET))
+  $(info :$(foreach s, top $(INCLUDE_STACK) $(SNIPPET_STACK),    )Leave $(THIS_SNIPPET))
 endif
 
 # Restore the previous helper name
-THIS_SNIPPET := $(firstword $(HELPER_STACK))
+THIS_SNIPPET := $(firstword $(SNIPPET_STACK))
diff --git a/make/common/MakeSnippetStart.gmk b/make/common/MakeSnippetStart.gmk
index dfe7f9f0007..1df5a1e20cb 100644
--- a/make/common/MakeSnippetStart.gmk
+++ b/make/common/MakeSnippetStart.gmk
@@ -33,11 +33,11 @@ endif
 
 # Print an indented message, also counting the top-level makefile as a level
 ifeq ($(LOG_FLOW), true)
-  $(info :$(foreach s, top $(HELPER_STACK),    )Enter $(THIS_SNIPPET) [snippet])
+  $(info :$(foreach s, top $(INCLUDE_STACK) $(SNIPPET_STACK),    )Enter $(THIS_SNIPPET) [snippet])
 endif
 
 # Push our helper name onto the stack
-HELPER_STACK := $(THIS_SNIPPET) $(HELPER_STACK)
+SNIPPET_STACK := $(THIS_SNIPPET) $(SNIPPET_STACK)
 
 # Hook to include the corresponding custom file, if present.
 ifneq ($(NO_CUSTOM_EXTENSIONS), true)

From 1eb0db37608ae1dd05accc1e22c57d76fa2c72ce Mon Sep 17 00:00:00 2001
From: Leonid Mesnik <lmesnik@openjdk.org>
Date: Thu, 20 Feb 2025 18:00:33 +0000
Subject: [PATCH 079/587] 8350151: Support requires property to filter tests
 incompatible with --enable-preview

Reviewed-by: alanb, rriggs
---
 test/hotspot/jtreg/TEST.ROOT                         |  7 +++++--
 test/jdk/TEST.ROOT                                   |  8 ++++++--
 .../invoke/defineHiddenClass/PreviewHiddenClass.java |  3 ++-
 test/jtreg-ext/requires/VMProps.java                 |  5 +++++
 test/langtools/TEST.ROOT                             | 12 +++++++++---
 5 files changed, 27 insertions(+), 8 deletions(-)

diff --git a/test/hotspot/jtreg/TEST.ROOT b/test/hotspot/jtreg/TEST.ROOT
index ffc70d1bb18..b48a86d4d6d 100644
--- a/test/hotspot/jtreg/TEST.ROOT
+++ b/test/hotspot/jtreg/TEST.ROOT
@@ -46,13 +46,16 @@ requires.extraPropDefns.bootlibs = ../../lib/jdk/test/whitebox
 requires.extraPropDefns.libs = \
     ../../lib/jdk/test/lib/Platform.java \
     ../../lib/jdk/test/lib/Container.java
-requires.extraPropDefns.javacOpts = --add-exports java.base/jdk.internal.foreign=ALL-UNNAMED
+requires.extraPropDefns.javacOpts = \
+    --add-exports java.base/jdk.internal.foreign=ALL-UNNAMED \
+    --add-exports java.base/jdk.internal.misc=ALL-UNNAMED
 requires.extraPropDefns.vmOpts = \
     -XX:+UnlockDiagnosticVMOptions \
     -XX:+LogVMOutput -XX:-DisplayVMOutput -XX:LogFile=vmprops.flags.final.vm.log \
     -XX:+PrintFlagsFinal \
     -XX:+WhiteBoxAPI \
-    --add-exports java.base/jdk.internal.foreign=ALL-UNNAMED
+    --add-exports java.base/jdk.internal.foreign=ALL-UNNAMED \
+    --add-exports java.base/jdk.internal.misc=ALL-UNNAMED
 requires.properties= \
     sun.arch.data.model \
     vm.simpleArch \
diff --git a/test/jdk/TEST.ROOT b/test/jdk/TEST.ROOT
index 91c44bc4d05..30e2f7cab41 100644
--- a/test/jdk/TEST.ROOT
+++ b/test/jdk/TEST.ROOT
@@ -74,16 +74,20 @@ requires.extraPropDefns.bootlibs = ../lib/jdk/test/whitebox
 requires.extraPropDefns.libs = \
     ../lib/jdk/test/lib/Platform.java \
     ../lib/jdk/test/lib/Container.java
-requires.extraPropDefns.javacOpts = --add-exports java.base/jdk.internal.foreign=ALL-UNNAMED
+requires.extraPropDefns.javacOpts = \
+    --add-exports java.base/jdk.internal.foreign=ALL-UNNAMED \
+    --add-exports java.base/jdk.internal.misc=ALL-UNNAMED
 requires.extraPropDefns.vmOpts = \
     -XX:+UnlockDiagnosticVMOptions \
     -XX:+LogVMOutput -XX:-DisplayVMOutput -XX:LogFile=vmprops.flags.final.vm.log \
     -XX:+PrintFlagsFinal \
     -XX:+WhiteBoxAPI \
-    --add-exports java.base/jdk.internal.foreign=ALL-UNNAMED
+    --add-exports java.base/jdk.internal.foreign=ALL-UNNAMED \
+    --add-exports java.base/jdk.internal.misc=ALL-UNNAMED
 requires.properties= \
     sun.arch.data.model \
     java.runtime.name \
+    java.enablePreview \
     vm.flagless \
     vm.gc.G1 \
     vm.gc.Serial \
diff --git a/test/jdk/java/lang/invoke/defineHiddenClass/PreviewHiddenClass.java b/test/jdk/java/lang/invoke/defineHiddenClass/PreviewHiddenClass.java
index 3b572c6581b..fddbb348517 100644
--- a/test/jdk/java/lang/invoke/defineHiddenClass/PreviewHiddenClass.java
+++ b/test/jdk/java/lang/invoke/defineHiddenClass/PreviewHiddenClass.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,7 @@
  * @bug 8245432
  * @modules jdk.compiler
  * @library /test/lib
+ * @requires !java.enablePreview
  * @build jdk.test.lib.Utils
  *        jdk.test.lib.compiler.CompilerUtils
  * @run testng PreviewHiddenClass
diff --git a/test/jtreg-ext/requires/VMProps.java b/test/jtreg-ext/requires/VMProps.java
index 6f8beff8cf9..5f74ffa6ea6 100644
--- a/test/jtreg-ext/requires/VMProps.java
+++ b/test/jtreg-ext/requires/VMProps.java
@@ -50,6 +50,7 @@ import java.util.regex.Pattern;
 import java.util.stream.Stream;
 
 import jdk.internal.foreign.CABI;
+import jdk.internal.misc.PreviewFeatures;
 import jdk.test.whitebox.code.Compiler;
 import jdk.test.whitebox.cpuinfo.CPUInfo;
 import jdk.test.whitebox.gc.GC;
@@ -129,6 +130,7 @@ public class VMProps implements Callable<Map<String, String>> {
         map.put("vm.graal.enabled", this::isGraalEnabled);
         // jdk.hasLibgraal is true if the libgraal shared library file is present
         map.put("jdk.hasLibgraal", this::hasLibgraal);
+        map.put("java.enablePreview", this::isPreviewEnabled);
         map.put("vm.libgraal.jit", this::isLibgraalJIT);
         map.put("vm.compiler1.enabled", this::isCompiler1Enabled);
         map.put("vm.compiler2.enabled", this::isCompiler2Enabled);
@@ -586,6 +588,9 @@ public class VMProps implements Callable<Map<String, String>> {
         return "" + Compiler.isC2Enabled();
     }
 
+    protected String isPreviewEnabled() {
+        return "" + PreviewFeatures.isEnabled();
+    }
     /**
      * A simple check for container support
      *
diff --git a/test/langtools/TEST.ROOT b/test/langtools/TEST.ROOT
index c6c79ac81df..9b1c5368e66 100644
--- a/test/langtools/TEST.ROOT
+++ b/test/langtools/TEST.ROOT
@@ -37,10 +37,16 @@ requires.extraPropDefns.bootlibs = ../lib/jdk/test/whitebox
 requires.extraPropDefns.libs = \
     ../lib/jdk/test/lib/Platform.java \
     ../lib/jdk/test/lib/Container.java
-requires.extraPropDefns.javacOpts = --add-exports java.base/jdk.internal.foreign=ALL-UNNAMED
+requires.extraPropDefns.javacOpts = \
+    --add-exports java.base/jdk.internal.foreign=ALL-UNNAMED \
+    --add-exports java.base/jdk.internal.misc=ALL-UNNAMED
 requires.extraPropDefns.vmOpts = \
-    -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI \
-    --add-exports java.base/jdk.internal.foreign=ALL-UNNAMED
+    -XX:+UnlockDiagnosticVMOptions \
+    -XX:+LogVMOutput -XX:-DisplayVMOutput -XX:LogFile=vmprops.flags.final.vm.log \
+    -XX:+PrintFlagsFinal \
+    -XX:+WhiteBoxAPI \
+    --add-exports java.base/jdk.internal.foreign=ALL-UNNAMED \
+    --add-exports java.base/jdk.internal.misc=ALL-UNNAMED
 requires.properties= \
     vm.continuations \
     vm.debug

From f979f727b6137be9a3f85baed4fbfdd785970044 Mon Sep 17 00:00:00 2001
From: Fernando Guallini <fguallini@openjdk.org>
Date: Thu, 20 Feb 2025 18:52:30 +0000
Subject: [PATCH 080/587] 8337723: Remove redundant tests from
 com/sun/security/sasl/gsskerb

Reviewed-by: rhalade
---
 test/jdk/ProblemList.txt                      |   3 -
 test/jdk/TEST.groups                          |   3 -
 .../sun/security/sasl/gsskerb/AuthOnly.java   | 165 ---------------
 .../sasl/gsskerb/ConfSecurityLayer.java       | 196 -----------------
 .../sasl/gsskerb/NoSecurityLayer.java         | 199 ------------------
 .../PropertiesFileCallbackHandler.java        | 145 -------------
 .../sun/security/sasl/gsskerb/gsseg_jaas.conf |  21 --
 .../sun/security/sasl/gsskerb/log.properties  |   3 -
 .../security/sasl/gsskerb/run-conf-wjaas.csh  |  29 ---
 .../security/sasl/gsskerb/run-nosec-wjaas.csh |  24 ---
 .../sun/security/sasl/gsskerb/runwjaas.csh    |  24 ---
 .../jdk/sun/security/krb5/auto/SaslBasic.java |  97 +++++++--
 12 files changed, 75 insertions(+), 834 deletions(-)
 delete mode 100644 test/jdk/com/sun/security/sasl/gsskerb/AuthOnly.java
 delete mode 100644 test/jdk/com/sun/security/sasl/gsskerb/ConfSecurityLayer.java
 delete mode 100644 test/jdk/com/sun/security/sasl/gsskerb/NoSecurityLayer.java
 delete mode 100644 test/jdk/com/sun/security/sasl/gsskerb/PropertiesFileCallbackHandler.java
 delete mode 100644 test/jdk/com/sun/security/sasl/gsskerb/gsseg_jaas.conf
 delete mode 100644 test/jdk/com/sun/security/sasl/gsskerb/log.properties
 delete mode 100644 test/jdk/com/sun/security/sasl/gsskerb/run-conf-wjaas.csh
 delete mode 100644 test/jdk/com/sun/security/sasl/gsskerb/run-nosec-wjaas.csh
 delete mode 100644 test/jdk/com/sun/security/sasl/gsskerb/runwjaas.csh

diff --git a/test/jdk/ProblemList.txt b/test/jdk/ProblemList.txt
index c6e62a55962..7472e4adad2 100644
--- a/test/jdk/ProblemList.txt
+++ b/test/jdk/ProblemList.txt
@@ -633,9 +633,6 @@ sun/security/smartcardio/TestExclusive.java                     8039280 generic-
 sun/security/smartcardio/TestMultiplePresent.java               8039280 generic-all
 sun/security/smartcardio/TestPresent.java                       8039280 generic-all
 sun/security/smartcardio/TestTransmit.java                      8039280 generic-all
-com/sun/security/sasl/gsskerb/AuthOnly.java                     8039280 generic-all
-com/sun/security/sasl/gsskerb/ConfSecurityLayer.java            8039280 generic-all
-com/sun/security/sasl/gsskerb/NoSecurityLayer.java              8039280 generic-all
 
 sun/security/pkcs11/sslecc/ClientJSSEServerJSSE.java            8316183 linux-ppc64le
 
diff --git a/test/jdk/TEST.groups b/test/jdk/TEST.groups
index d3b0b3009ca..7c009f557ad 100644
--- a/test/jdk/TEST.groups
+++ b/test/jdk/TEST.groups
@@ -631,9 +631,6 @@ jdk_security_manual_no_input = \
     :jdk_security_infra \
     com/sun/crypto/provider/Cipher/AEAD/GCMIncrementByte4.java \
     com/sun/crypto/provider/Cipher/AEAD/GCMIncrementDirect4.java \
-    com/sun/security/sasl/gsskerb/AuthOnly.java \
-    com/sun/security/sasl/gsskerb/ConfSecurityLayer.java \
-    com/sun/security/sasl/gsskerb/NoSecurityLayer.java \
     sun/security/smartcardio/TestChannel.java \
     sun/security/smartcardio/TestConnect.java \
     sun/security/smartcardio/TestConnectAgain.java \
diff --git a/test/jdk/com/sun/security/sasl/gsskerb/AuthOnly.java b/test/jdk/com/sun/security/sasl/gsskerb/AuthOnly.java
deleted file mode 100644
index c8e906d0ac1..00000000000
--- a/test/jdk/com/sun/security/sasl/gsskerb/AuthOnly.java
+++ /dev/null
@@ -1,165 +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 4634892
- * @summary Ensure authentication via GSS-API/Kerberos v5 works.
- * @run main/manual AuthOnly
- */
-
-/*
- * Set logging to FINEST to view exchange.
- * See runwjaas.csh for instructions for how to run this test.
- */
-
-import javax.security.sasl.*;
-import javax.security.auth.callback.*;
-import javax.security.auth.Subject;
-import javax.security.auth.login.*;
-import com.sun.security.auth.callback.*;
-import java.util.HashMap;
-import java.util.concurrent.Callable;
-
-public class AuthOnly {
-    private static final String MECH = "GSSAPI";
-    private static final String SERVER_FQDN = "machineX.imc.org";
-    private static final String PROTOCOL = "sample";
-
-    private static String namesfile, proxyfile;
-    private static final byte[] EMPTY = new byte[0];
-    private static boolean auto;
-    private static boolean verbose = false;
-
-    public static void main(String[] args) throws Exception {
-        if (args.length == 0) {
-            namesfile = null;
-            auto = true;
-        } else {
-            int i = 0;
-            if (args[i].equals("-m")) {
-                i++;
-                auto = false;
-            }
-            if (args.length > i) {
-                namesfile = args[i++];
-                if (args.length > i) {
-                    proxyfile = args[i];
-                }
-            } else {
-                namesfile = null;
-            }
-        }
-
-        CallbackHandler clntCbh = null;
-        final CallbackHandler srvCbh = new PropertiesFileCallbackHandler(
-            null, namesfile, proxyfile);
-
-        Subject clntSubj = doLogin("client");
-        Subject srvSubj = doLogin("server");
-        final HashMap clntprops = new HashMap();
-        final HashMap srvprops = new HashMap();
-
-        clntprops.put(Sasl.QOP, "auth");
-        srvprops.put(Sasl.QOP, "auth,auth-int,auth-conf");
-
-        final SaslClient clnt = (SaslClient)
-            Subject.callAs(clntSubj, new Callable<>() {
-                public Object call() throws Exception {
-                    return Sasl.createSaslClient(
-                        new String[]{MECH}, null, PROTOCOL, SERVER_FQDN,
-                        clntprops, null);
-                }
-            });
-
-        if (verbose) {
-            System.out.println(clntSubj);
-            System.out.println(srvSubj);
-        }
-        final SaslServer srv = (SaslServer)
-            Subject.callAs(srvSubj, new Callable<Object>() {
-                public Object call() throws Exception {
-                    return Sasl.createSaslServer(MECH, PROTOCOL, SERVER_FQDN,
-                        srvprops, srvCbh);
-                }
-            });
-
-
-        if (clnt == null) {
-            throw new IllegalStateException(
-                "Unable to find client impl for " + MECH);
-        }
-        if (srv == null) {
-            throw new IllegalStateException(
-                "Unable to find server impl for " + MECH);
-        }
-
-        byte[] response;
-        byte[] challenge;
-
-        response = (byte[]) Subject.callAs(clntSubj,
-                () -> (clnt.hasInitialResponse()? clnt.evaluateChallenge(EMPTY) : EMPTY));
-
-        while (!clnt.isComplete() || !srv.isComplete()) {
-            final byte[] responseCopy = response;
-            challenge = (byte[]) Subject.callAs(srvSubj,
-                    () -> srv.evaluateResponse(responseCopy));
-
-            if (challenge != null) {
-                final byte[] challengeCopy = challenge;
-                response = (byte[]) Subject.callAs(clntSubj,
-                        () -> clnt.evaluateChallenge(challengeCopy));
-            }
-        }
-
-        if (clnt.isComplete() && srv.isComplete()) {
-            if (verbose) {
-                System.out.println("SUCCESS");
-                System.out.println("authzid is " + srv.getAuthorizationID());
-            }
-        } else {
-            throw new IllegalStateException("FAILURE: mismatched state:" +
-                " client complete? " + clnt.isComplete() +
-                " server complete? " + srv.isComplete());
-        }
-    }
-
-    private static Subject doLogin(String msg) throws LoginException {
-        LoginContext lc = null;
-        if (verbose) {
-            System.out.println(msg);
-        }
-        try {
-            lc = new LoginContext(msg, new TextCallbackHandler());
-
-            // Attempt authentication
-            // You might want to do this in a "for" loop to give
-            // user more than one chance to enter correct username/password
-            lc.login();
-
-        } catch (LoginException le) {
-            throw le;
-        }
-        return lc.getSubject();
-    }
-}
diff --git a/test/jdk/com/sun/security/sasl/gsskerb/ConfSecurityLayer.java b/test/jdk/com/sun/security/sasl/gsskerb/ConfSecurityLayer.java
deleted file mode 100644
index 8a699a5920d..00000000000
--- a/test/jdk/com/sun/security/sasl/gsskerb/ConfSecurityLayer.java
+++ /dev/null
@@ -1,196 +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.
- */
-
-/*
- * @test
- * @bug 5014493
- * @summary SaslServer.wrap throws NullPointerException when security
- *    layer negotiated.
- * @run main/manual ConfSecurityLayer
- */
-
-/*
- * Set logging to FINEST to view exchange.
- * See run-conf-wjaas.csh for instructions for how to run this test.
- */
-
-import javax.security.sasl.*;
-import javax.security.auth.callback.*;
-import javax.security.auth.Subject;
-import javax.security.auth.login.*;
-import com.sun.security.auth.callback.*;
-import java.util.HashMap;
-
-public class ConfSecurityLayer {
-    private static final String MECH = "GSSAPI";
-    private static final String SERVER_FQDN = "machineX.imc.org";
-    private static final String PROTOCOL = "sample";
-
-    private static String namesfile, proxyfile;
-    private static final byte[] EMPTY = new byte[0];
-    private static boolean auto;
-    private static boolean verbose = false;
-
-    public static void main(String[] args) throws Exception {
-        if (args.length == 0) {
-            namesfile = null;
-            auto = true;
-        } else {
-            int i = 0;
-            if (args[i].equals("-m")) {
-                i++;
-                auto = false;
-            }
-            if (args.length > i) {
-                namesfile = args[i++];
-                if (args.length > i) {
-                    proxyfile = args[i];
-                }
-            } else {
-                namesfile = null;
-            }
-        }
-
-        CallbackHandler clntCbh = null;
-        final CallbackHandler srvCbh = new PropertiesFileCallbackHandler(
-            null, namesfile, proxyfile);
-
-        Subject clntSubj = doLogin("client");
-        Subject srvSubj = doLogin("server");
-        final HashMap clntprops = new HashMap();
-        final HashMap srvprops = new HashMap();
-
-        clntprops.put(Sasl.QOP, "auth-conf");
-        srvprops.put(Sasl.QOP, "auth,auth-int,auth-conf");
-
-        final SaslClient clnt = (SaslClient)
-            Subject.callAs(clntSubj, () ->Sasl.createSaslClient(
-                        new String[]{MECH}, null, PROTOCOL, SERVER_FQDN,
-                        clntprops, null));
-
-        if (verbose) {
-            System.out.println(clntSubj);
-            System.out.println(srvSubj);
-        }
-        final SaslServer srv = (SaslServer)
-            Subject.callAs(srvSubj, () ->
-                    Sasl.createSaslServer(MECH, PROTOCOL, SERVER_FQDN,
-                        srvprops, srvCbh));
-
-
-        if (clnt == null) {
-            throw new IllegalStateException(
-                "Unable to find client impl for " + MECH);
-        }
-        if (srv == null) {
-            throw new IllegalStateException(
-                "Unable to find server impl for " + MECH);
-        }
-
-        byte[] response;
-        byte[] challenge;
-
-        response = Subject.callAs(clntSubj,
-                () -> (clnt.hasInitialResponse()? clnt.evaluateChallenge(EMPTY) : EMPTY));
-
-        while (!clnt.isComplete() || !srv.isComplete()) {
-            final byte[] responseCopy = response;
-            challenge = Subject.callAs(srvSubj,
-                    () -> srv.evaluateResponse(responseCopy));
-
-            if (challenge != null) {
-                final byte[] challengeCopy = challenge;
-                response = Subject.callAs(clntSubj,
-                        () -> clnt.evaluateChallenge(challengeCopy));
-            }
-        }
-
-        if (clnt.isComplete() && srv.isComplete()) {
-            if (verbose) {
-                System.out.println("SUCCESS");
-                System.out.println("authzid is " + srv.getAuthorizationID());
-            }
-        } else {
-            throw new IllegalStateException("FAILURE: mismatched state:" +
-                " client complete? " + clnt.isComplete() +
-                " server complete? " + srv.isComplete());
-        }
-
-        if (verbose) {
-            System.out.println(clnt.getNegotiatedProperty(Sasl.QOP));
-        }
-
-        // Now try to use security layer
-
-        byte[] clntBuf = new byte[]{0, 1, 2, 3};
-        byte[] wrappedClnt = clnt.wrap(clntBuf, 0, clntBuf.length);
-        System.out.println("plaintext2: " + bytesToString(clntBuf));
-        System.out.println("wrapped2: " + bytesToString(wrappedClnt));
-
-        byte[] srvBuf = new byte[]{10, 11, 12, 13};
-        byte[] wrappedSrv = srv.wrap(srvBuf, 0, srvBuf.length);
-        System.out.println("plaintext1: " + bytesToString(srvBuf));
-        System.out.println("wrapped1: " + bytesToString(wrappedSrv));
-
-        byte[] unwrapped1 = clnt.unwrap(wrappedSrv, 0, wrappedSrv.length);
-        System.out.println("unwrapped1: " + bytesToString(unwrapped1));
-
-        byte[] unwrapped2 = srv.unwrap(wrappedClnt, 0, wrappedClnt.length);
-        System.out.println("unwrapped2: " + bytesToString(unwrapped2));
-    }
-
-    private static Subject doLogin(String msg) throws LoginException {
-        LoginContext lc = null;
-        if (verbose) {
-            System.out.println(msg);
-        }
-        try {
-            lc = new LoginContext(msg, new TextCallbackHandler());
-
-            // Attempt authentication
-            // You might want to do this in a "for" loop to give
-            // user more than one chance to enter correct username/password
-            lc.login();
-
-        } catch (LoginException le) {
-            throw le;
-        }
-        return lc.getSubject();
-    }
-
-    private static String bytesToString(byte[] digest) {
-        // Get character representation of digest
-        StringBuffer digestString = new StringBuffer();
-
-        for (int i = 0; i < digest.length; i++) {
-            if ((digest[i] & 0x000000ff) < 0x10) {
-                digestString.append("0" +
-                    Integer.toHexString(digest[i] & 0x000000ff));
-            } else {
-                digestString.append(
-                    Integer.toHexString(digest[i] & 0x000000ff));
-            }
-        }
-        return digestString.toString();
-    }
-}
diff --git a/test/jdk/com/sun/security/sasl/gsskerb/NoSecurityLayer.java b/test/jdk/com/sun/security/sasl/gsskerb/NoSecurityLayer.java
deleted file mode 100644
index 45d7d1fc1fb..00000000000
--- a/test/jdk/com/sun/security/sasl/gsskerb/NoSecurityLayer.java
+++ /dev/null
@@ -1,199 +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 4873552
- * @summary GSS-API/krb5 SASL mechanism should throw IllegalStateException
- *     for auth-only
- * @run main/manual NoSecurityLayer
- */
-
-/*
- * Set logging to FINEST to view exchange.
- * See run-nosec-wjaas.csh for instructions for how to run this test.
- */
-
-import javax.security.sasl.*;
-import javax.security.auth.callback.*;
-import javax.security.auth.Subject;
-import javax.security.auth.login.*;
-import com.sun.security.auth.callback.*;
-import java.util.HashMap;
-
-public class NoSecurityLayer {
-    private static final String MECH = "GSSAPI";
-    private static final String SERVER_FQDN = "anti.imc.org";
-    private static final String PROTOCOL = "sample";
-
-    private static String namesfile, proxyfile;
-    private static final byte[] EMPTY = new byte[0];
-    private static boolean auto;
-    private static boolean verbose = false;
-
-    public static void main(String[] args) throws Exception {
-        if (args.length == 0) {
-            namesfile = null;
-            auto = true;
-        } else {
-            int i = 0;
-            if (args[i].equals("-m")) {
-                i++;
-                auto = false;
-            }
-            if (args.length > i) {
-                namesfile = args[i++];
-                if (args.length > i) {
-                    proxyfile = args[i];
-                }
-            } else {
-                namesfile = null;
-            }
-        }
-
-        CallbackHandler clntCbh = null;
-        final CallbackHandler srvCbh = new PropertiesFileCallbackHandler(
-            null, namesfile, proxyfile);
-
-        Subject clntSubj = doLogin("client");
-        Subject srvSubj = doLogin("server");
-        final HashMap clntprops = new HashMap();
-        final HashMap srvprops = new HashMap();
-
-        clntprops.put(Sasl.QOP, "auth");
-        srvprops.put(Sasl.QOP, "auth,auth-int,auth-conf");
-
-        final SaslClient clnt =
-            Subject.callAs(clntSubj, () ->
-                    Sasl.createSaslClient(
-                        new String[]{MECH}, null, PROTOCOL, SERVER_FQDN,
-                        clntprops, null));
-
-        if (verbose) {
-            System.out.println(clntSubj);
-            System.out.println(srvSubj);
-        }
-        final SaslServer srv =
-            Subject.callAs(srvSubj, () ->
-                Sasl.createSaslServer(MECH, PROTOCOL, SERVER_FQDN,
-                        srvprops, srvCbh));
-
-
-        if (clnt == null) {
-            throw new IllegalStateException(
-                "Unable to find client impl for " + MECH);
-        }
-        if (srv == null) {
-            throw new IllegalStateException(
-                "Unable to find server impl for " + MECH);
-        }
-
-        byte[] response;
-        byte[] challenge;
-
-        response = Subject.callAs(clntSubj,
-                () -> (clnt.hasInitialResponse()? clnt.evaluateChallenge(EMPTY) : EMPTY));
-
-        while (!clnt.isComplete() || !srv.isComplete()) {
-            final byte[] responseCopy = response;
-            challenge = Subject.callAs(srvSubj,
-                    () -> srv.evaluateResponse(responseCopy));
-
-            if (challenge != null) {
-                final byte[] challengeCopy = challenge;
-                response = Subject.callAs(clntSubj,
-                        () -> clnt.evaluateChallenge(challengeCopy));
-            }
-        }
-
-        if (clnt.isComplete() && srv.isComplete()) {
-            if (verbose) {
-                System.out.println("SUCCESS");
-                System.out.println("authzid is " + srv.getAuthorizationID());
-            }
-        } else {
-            throw new IllegalStateException("FAILURE: mismatched state:" +
-                " client complete? " + clnt.isComplete() +
-                " server complete? " + srv.isComplete());
-        }
-
-        if (verbose) {
-            System.out.println(clnt.getNegotiatedProperty(Sasl.QOP));
-        }
-
-        // Now try to use security layer
-
-        byte[] clntBuf = new byte[]{0, 1, 2, 3};
-        try {
-            byte[] wrapped = clnt.wrap(clntBuf, 0, clntBuf.length);
-            throw new Exception(
-                "clnt wrap should not be allowed w/no security layer");
-        } catch (IllegalStateException e) {
-            // expected
-        }
-
-        byte[] srvBuf = new byte[]{10, 11, 12, 13};
-        try {
-            byte[] wrapped = srv.wrap(srvBuf, 0, srvBuf.length);
-            throw new Exception(
-                "srv wrap should not be allowed w/no security layer");
-        } catch (IllegalStateException e) {
-            // expected
-        }
-
-        try {
-            byte[] unwrapped = clnt.unwrap(clntBuf, 0, clntBuf.length);
-            throw new Exception(
-                "clnt wrap should not be allowed w/no security layer");
-        } catch (IllegalStateException e) {
-            // expected
-        }
-
-        try {
-            byte[] unwrapped = srv.unwrap(srvBuf, 0, srvBuf.length);
-            throw new Exception(
-                "srv wrap should not be allowed w/no security layer");
-        } catch (IllegalStateException e) {
-            // expected
-        }
-    }
-
-    private static Subject doLogin(String msg) throws LoginException {
-        LoginContext lc = null;
-        if (verbose) {
-            System.out.println(msg);
-        }
-        try {
-            lc = new LoginContext(msg, new TextCallbackHandler());
-
-            // Attempt authentication
-            // You might want to do this in a "for" loop to give
-            // user more than one chance to enter correct username/password
-            lc.login();
-
-        } catch (LoginException le) {
-            throw le;
-        }
-        return lc.getSubject();
-    }
-}
diff --git a/test/jdk/com/sun/security/sasl/gsskerb/PropertiesFileCallbackHandler.java b/test/jdk/com/sun/security/sasl/gsskerb/PropertiesFileCallbackHandler.java
deleted file mode 100644
index 79f19c74f58..00000000000
--- a/test/jdk/com/sun/security/sasl/gsskerb/PropertiesFileCallbackHandler.java
+++ /dev/null
@@ -1,145 +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.
- */
-
-import javax.security.auth.callback.*;
-import java.util.Map;
-import java.util.Properties;
-import java.io.*;
-import javax.security.sasl.AuthorizeCallback;
-import javax.security.sasl.RealmCallback;
-
-public final class PropertiesFileCallbackHandler implements CallbackHandler {
-    private Properties pwDb, namesDb, proxyDb;
-
-    /**
-     * Contents of files are in the Properties file format.
-     *
-     * @param pwFile name of file containing name/password pairs
-     * @param namesFile name of file containing name to canonicalized name
-     * @param proxyFile name of file containing authname to list of authzids
-     */
-    public PropertiesFileCallbackHandler(String pwFile, String namesFile,
-        String proxyFile) throws IOException {
-        String dir = System.getProperty("test.src");
-        if (dir == null) {
-            dir = ".";
-        }
-        dir = dir + "/";
-
-        if (pwFile != null) {
-            pwDb = new Properties();
-            pwDb.load(new FileInputStream(dir+pwFile));
-        }
-
-        if (namesFile != null) {
-            namesDb = new Properties();
-            namesDb.load(new FileInputStream(dir+namesFile));
-        }
-
-        if (proxyFile != null) {
-            proxyDb = new Properties();
-            proxyDb.load(new FileInputStream(dir+proxyFile));
-        }
-    }
-
-    public void handle(Callback[] callbacks)
-        throws UnsupportedCallbackException {
-        NameCallback ncb = null;
-        PasswordCallback pcb = null;
-        AuthorizeCallback acb = null;
-        RealmCallback rcb = null;
-
-        for (int i = 0; i < callbacks.length; i++) {
-            if (callbacks[i] instanceof NameCallback) {
-                ncb = (NameCallback) callbacks[i];
-            } else if (callbacks[i] instanceof PasswordCallback) {
-                pcb = (PasswordCallback) callbacks[i];
-            } else if (callbacks[i] instanceof AuthorizeCallback) {
-                acb = (AuthorizeCallback) callbacks[i];
-            } else if (callbacks[i] instanceof RealmCallback) {
-                rcb = (RealmCallback) callbacks[i];
-            } else {
-                throw new UnsupportedCallbackException(callbacks[i]);
-            }
-        }
-
-        // Process retrieval of password; can get password iff
-        // username is available in NameCallback
-        //
-        // Ignore realm for now; could potentially use different dbs for
-        // different realms
-
-        if (pcb != null && ncb != null) {
-            String username = ncb.getDefaultName();
-            String pw = pwDb.getProperty(username);
-            if (pw != null) {
-                char[] pwchars = pw.toCharArray();
-                pcb.setPassword(pwchars);
-                // Clear pw
-                for (int i = 0; i <pwchars.length; i++) {
-                    pwchars[i] = 0;
-                }
-
-                // Set canonicalized username if any
-                String canonAuthid =
-                    (namesDb != null? namesDb.getProperty(username) : null);
-                if (canonAuthid != null) {
-                    ncb.setName(canonAuthid);
-                }
-            }
-        }
-
-        // Check for authorization
-
-        // Ignore realm for now; could potentially use different dbs for
-        // different realms
-
-        if (acb != null) {
-            String authid = acb.getAuthenticationID();
-            String authzid = acb.getAuthorizationID();
-            if (authid.equals(authzid)) {
-                // Self is always authorized
-                acb.setAuthorized(true);
-
-            } else {
-                // Check db for allowed authzids
-                String authzes = (proxyDb != null ? proxyDb.getProperty(authid)
-                    : null);
-                if (authzes != null && authzes.indexOf(authzid) >= 0) {
-                    // XXX need to search for subtrings or use StringTokenizer
-                    // to avoid incorrectly matching subnames
-                    acb.setAuthorized(true);
-                }
-            }
-
-            if (acb.isAuthorized()) {
-                // Set canonicalized name
-                String canonAuthzid = (namesDb != null ?
-                    namesDb.getProperty(authzid) : null);
-                if (canonAuthzid != null) {
-                    acb.setAuthorizedID(canonAuthzid);
-                }
-            }
-        }
-    }
-}
diff --git a/test/jdk/com/sun/security/sasl/gsskerb/gsseg_jaas.conf b/test/jdk/com/sun/security/sasl/gsskerb/gsseg_jaas.conf
deleted file mode 100644
index 18deaa715d9..00000000000
--- a/test/jdk/com/sun/security/sasl/gsskerb/gsseg_jaas.conf
+++ /dev/null
@@ -1,21 +0,0 @@
-/** 
- * Login Configuration for JAAS. 
- *
- * Specify that Kerberos v5 is a required login module for the 
- * example classes: GssExample and Mutual.
- */
-other {
-  com.sun.security.auth.module.Krb5LoginModule required;
-};
-
-client {
-  com.sun.security.auth.module.Krb5LoginModule required
-	principal="john@IMC.ORG";
-};
-server {
-  com.sun.security.auth.module.Krb5LoginModule required storeKey=true
-	principal="sample/machineX.imc.org@IMC.ORG" 
-	useKeyTab=true
-	keyTab=machineX.keytab;
-};
-
diff --git a/test/jdk/com/sun/security/sasl/gsskerb/log.properties b/test/jdk/com/sun/security/sasl/gsskerb/log.properties
deleted file mode 100644
index c301c787474..00000000000
--- a/test/jdk/com/sun/security/sasl/gsskerb/log.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-javax.security.sasl.level=FINE
-#handlers=java.util.logging.ConsoleHandler
-#java.util.logging.ConsoleHandler.level=FINE
diff --git a/test/jdk/com/sun/security/sasl/gsskerb/run-conf-wjaas.csh b/test/jdk/com/sun/security/sasl/gsskerb/run-conf-wjaas.csh
deleted file mode 100644
index f284d3e43e6..00000000000
--- a/test/jdk/com/sun/security/sasl/gsskerb/run-conf-wjaas.csh
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/csh -f
-#
-# @bug 5014493
-# @summary SaslServer.wrap throws NullPointerException when security 
-#    layer negotiated
-#
-# BEFORE running this test, you need to set up the environment as follows.
-# 1. Create a 'sample' service principal in the KDC.
-# 2. Create a keytab for the server principal 'sample/fqdn@REALM'
-#    where 'fqdn' is the fully qualified domain name of the server and
-#    REALM is the KDC's realm. The principal must be a host-based service.
-#    For example, a principal name might be
-#      'sample/machineX.imc.org@IMC.ORG'. 
-#    On Windows, for example, you use the ktpass utility to create a host keytab 
-#    file.
-#    c:> ktpass -princ sample/machineX.imc.org@IMC.ORG -mapuser sample \
-#        -ptype KRB5_NT_SRV_HST \
-#        -pass servertest123 -out machineX.keytab
-# 3. Create a user principal in the KDC.
-# 4. Set up a JAAS login module configuration file like gsseg_jaas.conf, updating
-#    the client and server entries according to the principal and machine names
-#    used.
-# 5. Update AuthOnly.SERVER_FQDN with fqdn of server machine.
-# 6. To examine exchange, turn on logging by adding
-#        -Djava.util.logging.config.file=log.properties
-# 7. Update the realm and kdc settings in this script.
-#
-#
-$JAVA_HOME/bin/java -Djava.security.krb5.realm=IMC.ORG -Djava.security.krb5.kdc=machineX.imc.org -Djava.security.auth.login.config=gsseg_jaas.conf  ConfSecurityLayer
diff --git a/test/jdk/com/sun/security/sasl/gsskerb/run-nosec-wjaas.csh b/test/jdk/com/sun/security/sasl/gsskerb/run-nosec-wjaas.csh
deleted file mode 100644
index afac8e0eeae..00000000000
--- a/test/jdk/com/sun/security/sasl/gsskerb/run-nosec-wjaas.csh
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/bin/csh -f
-#
-# BEFORE running this test, you need to set up the environment as follows.
-# 1. Create a 'sample' service principal in the KDC.
-# 2. Create a keytab for the server principal 'sample/fqdn@REALM'
-#    where 'fqdn' is the fully qualified domain name of the server and
-#    REALM is the KDC's realm. The principal must be a host-based service.
-#    For example, a principal name might be
-#      'sample/machineX.imc.org@IMC.ORG'. 
-#    On Windows, for example, you use the ktpass utility to create a host keytab 
-#    file.
-#    c:> ktpass -princ sample/machineX.imc.org@IMC.ORG -mapuser sample \
-#        -ptype KRB5_NT_SRV_HST \
-#        -pass servertest123 -out machineX.keytab
-# 3. Create a user principal in the KDC.
-# 4. Set up a JAAS login module configuration file like gsseg_jaas.conf, updating
-#    the client and server entries according to the principal and machine names
-#    used.
-# 5. Update AuthOnly.SERVER_FQDN with fqdn of server machine.
-# 6. To examine exchange, turn on logging by adding
-#        -Djava.util.logging.config.file=log.properties
-# 7. Update the realm and kdc settings in this script.
-#
-java -Djava.security.krb5.realm=IMC.ORG -Djava.security.krb5.kdc=machineX.imc.org -Djava.security.auth.login.config=gsseg_jaas.conf  NoSecurityLayer
diff --git a/test/jdk/com/sun/security/sasl/gsskerb/runwjaas.csh b/test/jdk/com/sun/security/sasl/gsskerb/runwjaas.csh
deleted file mode 100644
index 9757b818de4..00000000000
--- a/test/jdk/com/sun/security/sasl/gsskerb/runwjaas.csh
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/bin/csh -f
-#
-# BEFORE running this test, you need to set up the environment as follows.
-# 1. Create a 'sample' service principal in the KDC.
-# 2. Create a keytab for the server principal 'sample/fqdn@REALM'
-#    where 'fqdn' is the fully qualified domain name of the server and
-#    REALM is the KDC's realm. The principal must be a host-based service.
-#    For example, a principal name might be
-#      'sample/machineX.imc.org@IMC.ORG'. 
-#    On Windows, for example, you use the ktpass utility to create a host keytab 
-#    file.
-#    c:> ktpass -princ sample/machineX.imc.org@IMC.ORG -mapuser sample \
-#        -ptype KRB5_NT_SRV_HST \
-#        -pass servertest123 -out machineX.keytab
-# 3. Create a user principal in the KDC.
-# 4. Set up a JAAS login module configuration file like gsseg_jaas.conf, updating
-#    the client and server entries according to the principal and machine names
-#    used.
-# 5. Update AuthOnly.SERVER_FQDN with fqdn of server machine.
-# 6. To examine exchange, turn on logging by adding
-#        -Djava.util.logging.config.file=log.properties
-# 7. Update the realm and kdc settings in this script.
-#
-java -Djava.security.krb5.realm=IMC.ORG -Djava.security.krb5.kdc=machineX.imc.org -Djava.security.auth.login.config=gsseg_jaas.conf  AuthOnly
diff --git a/test/jdk/sun/security/krb5/auto/SaslBasic.java b/test/jdk/sun/security/krb5/auto/SaslBasic.java
index 0aebdefbe04..89eb22383f2 100644
--- a/test/jdk/sun/security/krb5/auto/SaslBasic.java
+++ b/test/jdk/sun/security/krb5/auto/SaslBasic.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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,12 +32,11 @@
  * @run main/othervm -Djdk.net.hosts.file=TestHosts SaslBasic unbound auth-conf
  * @run main/othervm -Djdk.net.hosts.file=TestHosts SaslBasic bound auth
  */
-import java.io.IOException;
+import static jdk.test.lib.Asserts.assertEquals;
+
 import java.util.Arrays;
 import java.util.HashMap;
 import javax.security.auth.callback.Callback;
-import javax.security.auth.callback.CallbackHandler;
-import javax.security.auth.callback.UnsupportedCallbackException;
 import javax.security.sasl.*;
 
 // The basic krb5 test skeleton you can copy from
@@ -61,15 +60,12 @@ public class SaslBasic {
         srvprops.put(Sasl.QOP, "auth,auth-int,auth-conf");
         SaslServer ss = Sasl.createSaslServer("GSSAPI", "server",
                 bound? name: null, srvprops,
-                new CallbackHandler() {
-                    public void handle(Callback[] callbacks)
-                            throws IOException, UnsupportedCallbackException {
-                        for (Callback cb : callbacks) {
-                            if (cb instanceof RealmCallback) {
-                                ((RealmCallback) cb).setText(OneKDC.REALM);
-                            } else if (cb instanceof AuthorizeCallback) {
-                                ((AuthorizeCallback) cb).setAuthorized(true);
-                            }
+                callbacks -> {
+                    for (Callback cb : callbacks) {
+                        if (cb instanceof RealmCallback) {
+                            ((RealmCallback) cb).setText(OneKDC.REALM);
+                        } else if (cb instanceof AuthorizeCallback) {
+                            ((AuthorizeCallback) cb).setAuthorized(true);
                         }
                     }
                 });
@@ -89,28 +85,85 @@ public class SaslBasic {
             String boundName = (String)ss.getNegotiatedProperty(
                     Sasl.BOUND_SERVER_NAME);
             if (!boundName.equals(name)) {
-                throw new Exception("Wrong bound server name");
+                throw new RuntimeException("Wrong bound server name");
             }
         }
         Object key = ss.getNegotiatedProperty(
                 "com.sun.security.jgss.inquiretype.krb5_get_session_key");
         if (key == null) {
-            throw new Exception("Extended negotiated property not read");
+            throw new RuntimeException("Extended negotiated property not read");
         }
 
         if (args[1].equals("auth")) {
             // 8170732. These are the maximum size bytes after jgss/krb5 wrap.
             if (lastClientToken[17] != 0 || lastClientToken[18] != 0
                     || lastClientToken[19] != 0) {
-                throw new Exception("maximum size for auth must be 0");
+                throw new RuntimeException("maximum size for auth must be 0");
             }
+            testWrapUnwrapNoSecLayer(sc, ss);
         } else {
-            byte[] hello = "hello".getBytes();
-            token = sc.wrap(hello, 0, hello.length);
-            token = ss.unwrap(token, 0, token.length);
-            if (!Arrays.equals(hello, token)) {
-                throw new Exception("Message altered");
-            }
+            testWrapUnwrapWithSecLayer(sc, ss);
+        }
+    }
+
+    private static void testWrapUnwrapWithSecLayer(SaslClient sc, SaslServer ss)
+        throws SaslException {
+        byte[] token;
+        byte[] hello = "hello".getBytes();
+
+        // test client wrap and server unwrap
+        token = sc.wrap(hello, 0, hello.length);
+        token = ss.unwrap(token, 0, token.length);
+
+        if (!Arrays.equals(hello, token)) {
+            throw new RuntimeException("Client message altered");
+        }
+
+        // test server wrap and client unwrap
+        token = ss.wrap(hello, 0, hello.length);
+        token = sc.unwrap(token, 0, token.length);
+
+        if (!Arrays.equals(hello, token)) {
+            throw new RuntimeException("Server message altered");
+        }
+    }
+
+    private static void testWrapUnwrapNoSecLayer(SaslClient sc, SaslServer ss)
+        throws SaslException {
+        byte[] clntBuf = new byte[]{0, 1, 2, 3};
+        byte[] srvBuf = new byte[]{10, 11, 12, 13};
+        String expectedError = "No security layer negotiated";
+
+        try {
+            sc.wrap(clntBuf, 0, clntBuf.length);
+            throw new RuntimeException(
+                    "client wrap should not be allowed w/no security layer");
+        } catch (IllegalStateException e) {
+            assertEquals(expectedError, e.getMessage());
+        }
+
+        try {
+            ss.wrap(srvBuf, 0, srvBuf.length);
+            throw new RuntimeException(
+                    "server wrap should not be allowed w/no security layer");
+        } catch (IllegalStateException e) {
+            assertEquals(expectedError, e.getMessage());
+        }
+
+        try {
+            sc.unwrap(clntBuf, 0, clntBuf.length);
+            throw new RuntimeException(
+                    "client unwrap should not be allowed w/no security layer");
+        } catch (IllegalStateException e) {
+            assertEquals(expectedError, e.getMessage());
+        }
+
+        try {
+            ss.unwrap(srvBuf, 0, srvBuf.length);
+            throw new RuntimeException(
+                    "server unwrap should not be allowed w/no security layer");
+        } catch (IllegalStateException e) {
+            assertEquals(expectedError, e.getMessage());
         }
     }
 }

From 16033ea79a01b27a7f5cbb31d64da0e80afc7dc3 Mon Sep 17 00:00:00 2001
From: Fernando Guallini <fguallini@openjdk.org>
Date: Thu, 20 Feb 2025 18:52:57 +0000
Subject: [PATCH 081/587] 8342238: Test
 javax/crypto/CryptoPermissions/InconsistentEntries.java writes files in
 tested JDK dir

Reviewed-by: jnimeh, rhalade
---
 .../InconsistentEntries.java                  | 63 ++++++++++---------
 1 file changed, 35 insertions(+), 28 deletions(-)

diff --git a/test/jdk/javax/crypto/CryptoPermissions/InconsistentEntries.java b/test/jdk/javax/crypto/CryptoPermissions/InconsistentEntries.java
index 9c06cbaf613..85118f34d03 100644
--- a/test/jdk/javax/crypto/CryptoPermissions/InconsistentEntries.java
+++ b/test/jdk/javax/crypto/CryptoPermissions/InconsistentEntries.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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,16 @@
  * @run testng/othervm InconsistentEntries
  */
 
+import java.util.List;
+import jdk.test.lib.Utils;
+import jdk.test.lib.cds.CDSTestUtils;
+import jdk.test.lib.process.ProcessTools;
 import org.testng.Assert;
-import org.testng.annotations.AfterTest;
 import org.testng.annotations.BeforeTest;
 import org.testng.annotations.Test;
 
 import javax.crypto.*;
 import java.io.File;
-import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
@@ -45,42 +47,35 @@ import java.security.Security;
 
 public class InconsistentEntries {
 
-    private static final String JDK_HOME = System.getProperty("test.jdk");
-    private static final String TEST_SRC = System.getProperty("test.src");
-    private static final Path POLICY_DIR = Paths.get(JDK_HOME, "conf", "security",
-            "policy", "testlimited");
-    private static final Path POLICY_FILE = Paths.get(TEST_SRC, "default_local.policy");
-
-    Path targetFile = null;
+    private static final String JDK_HOME = System.getProperty("test.jdk", ".");
+    private static final String TEST_SRC = System.getProperty("test.src", ".");
+    private static final Path TEMP_JDK_HOME = Path.of("java");
+    private static final Path POLICY_DIR = TEMP_JDK_HOME.resolve(Path.of("conf", "security",
+            "policy", "testlimited"));
+    private static final Path POLICY_FILE_SRC = Paths.get(TEST_SRC, "default_local.policy");
+    private static final Path POLICY_FILE_TARGET = POLICY_DIR
+        .resolve(POLICY_FILE_SRC.getFileName());
 
     @BeforeTest
-    public void setUp() throws IOException {
+    public void setUp() throws Exception {
+        // Clone the tested JDK to the scratch directory
+        CDSTestUtils.clone(new File(JDK_HOME), new File(TEMP_JDK_HOME.toString()));
+
+        // create policy directory in the cloned JDK
         if (!POLICY_DIR.toFile().exists()) {
             Files.createDirectory(POLICY_DIR);
         }
 
-        targetFile = POLICY_DIR.resolve(POLICY_FILE.getFileName());
-        Files.copy(POLICY_FILE, targetFile, StandardCopyOption.REPLACE_EXISTING);
+        // copy policy file into policy directory
+        Files.copy(POLICY_FILE_SRC, POLICY_FILE_TARGET, StandardCopyOption.REPLACE_EXISTING);
     }
 
-    @AfterTest
-    public void cleanUp() throws IOException {
-        Files.delete(targetFile);
-    }
-
-    @Test
-    public void test() throws Exception {
-        String JAVA_HOME = System.getProperty("java.home");
-        String FS = System.getProperty("file.separator");
-        Path testlimited = Path.of(JAVA_HOME + FS + "conf" + FS + "security" +
-                FS + "policy" + FS + "testlimited");
-        if (!Files.exists(testlimited)) {
+    public static void main(String[] args) throws Throwable {
+        if (!Files.exists(POLICY_DIR)) {
             throw new RuntimeException(
                     "custom policy subdirectory: testlimited does not exist");
         }
-
-        File testpolicy = new File(JAVA_HOME + FS + "conf" + FS + "security" +
-                FS + "policy" + FS + "testlimited" + FS + "default_local.policy");
+        File testpolicy = new File(POLICY_FILE_TARGET.toString());
         if (testpolicy.length() == 0) {
             throw new RuntimeException(
                     "policy: default_local.policy does not exist or is empty");
@@ -91,4 +86,16 @@ public class InconsistentEntries {
         Assert.assertThrows(ExceptionInInitializerError.class,
                 () -> Cipher.getMaxAllowedKeyLength("AES"));
     }
+
+    @Test
+    public void test() throws Exception {
+        String tmpJava = TEMP_JDK_HOME.resolve("bin").resolve("java").toString();
+        String[] args = Utils.prependTestJavaOpts(InconsistentEntries.class.getName());
+        ProcessBuilder pb = new ProcessBuilder(tmpJava);
+        pb.command().addAll(List.of(args));
+
+        ProcessTools
+            .executeProcess(pb)
+            .shouldHaveExitValue(0);
+    }
 }

From c73fead5caea8008586b31a5009c64011637b8cc Mon Sep 17 00:00:00 2001
From: Hamlin Li <mli@openjdk.org>
Date: Fri, 21 Feb 2025 09:48:54 +0000
Subject: [PATCH 082/587] 8350383: Test: add more test case for string compare
 (UL case)

Reviewed-by: fyang
---
 .../jtreg/compiler/intrinsics/string/TestStringIntrinsics.java   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/hotspot/jtreg/compiler/intrinsics/string/TestStringIntrinsics.java b/test/hotspot/jtreg/compiler/intrinsics/string/TestStringIntrinsics.java
index 65984029397..062866d657f 100644
--- a/test/hotspot/jtreg/compiler/intrinsics/string/TestStringIntrinsics.java
+++ b/test/hotspot/jtreg/compiler/intrinsics/string/TestStringIntrinsics.java
@@ -155,6 +155,7 @@ public class TestStringIntrinsics {
                 char cL = latin1.charAt(indexL);
                 char cU = utf16.charAt(indexU);
                 invokeAndCheck(m, cL - cU, latin1, latin1.replace(cL, cU));
+                invokeAndCheck(m, cU - cL, latin1.replace(cL, cU), latin1);
                 invokeAndCheck(m, cU - cL, utf16, utf16.replace(cU, cL));
 
                 // Different lengths

From 1b6281d98cf0e7c5435c563bfedd6f07b79bfa62 Mon Sep 17 00:00:00 2001
From: Hamlin Li <mli@openjdk.org>
Date: Fri, 21 Feb 2025 10:25:50 +0000
Subject: [PATCH 083/587] 8321003: RISC-V: C2 MulReductionVI 8321004: RISC-V:
 C2 MulReductionVL

Reviewed-by: fyang, rehn
---
 .../cpu/riscv/c2_MacroAssembler_riscv.cpp     | 39 +++++++++++
 .../cpu/riscv/c2_MacroAssembler_riscv.hpp     |  4 ++
 src/hotspot/cpu/riscv/riscv_v.ad              | 68 +++++++++++++++++++
 .../loopopts/superword/ProdRed_Int.java       |  6 +-
 .../loopopts/superword/RedTest_int.java       |  4 ++
 .../loopopts/superword/RedTest_long.java      |  4 ++
 6 files changed, 124 insertions(+), 1 deletion(-)

diff --git a/src/hotspot/cpu/riscv/c2_MacroAssembler_riscv.cpp b/src/hotspot/cpu/riscv/c2_MacroAssembler_riscv.cpp
index c23a574e401..34a61177774 100644
--- a/src/hotspot/cpu/riscv/c2_MacroAssembler_riscv.cpp
+++ b/src/hotspot/cpu/riscv/c2_MacroAssembler_riscv.cpp
@@ -2954,6 +2954,45 @@ void C2_MacroAssembler::reduce_integral_v(Register dst, Register src1,
   vmv_x_s(dst, tmp);
 }
 
+void C2_MacroAssembler::reduce_mul_integral_v(Register dst, Register src1, VectorRegister src2,
+                                              VectorRegister vtmp1, VectorRegister vtmp2,
+                                              BasicType bt, uint vector_length, VectorMask vm) {
+  assert(bt == T_BYTE || bt == T_SHORT || bt == T_INT || bt == T_LONG, "unsupported element type");
+  vsetvli_helper(bt, vector_length);
+
+  vector_length /= 2;
+  if (vm != Assembler::unmasked) {
+    // This behaviour is consistent with spec requirements of vector API, for `reduceLanes`:
+    //  If no elements are selected, an operation-specific identity value is returned.
+    //    If the operation is MUL, then the identity value is one.
+    vmv_v_i(vtmp1, 1);
+    vmerge_vvm(vtmp2, vtmp1, src2); // vm == v0
+    vslidedown_vi(vtmp1, vtmp2, vector_length);
+
+    vsetvli_helper(bt, vector_length);
+    vmul_vv(vtmp1, vtmp1, vtmp2);
+  } else {
+    vslidedown_vi(vtmp1, src2, vector_length);
+
+    vsetvli_helper(bt, vector_length);
+    vmul_vv(vtmp1, vtmp1, src2);
+  }
+
+  while (vector_length > 1) {
+    vector_length /= 2;
+    vslidedown_vi(vtmp2, vtmp1, vector_length);
+    vsetvli_helper(bt, vector_length);
+    vmul_vv(vtmp1, vtmp1, vtmp2);
+  }
+
+  vmv_x_s(dst, vtmp1);
+  if (bt == T_INT) {
+    mulw(dst, dst, src1);
+  } else {
+    mul(dst, dst, src1);
+  }
+}
+
 // Set vl and vtype for full and partial vector operations.
 // (vma = mu, vta = tu, vill = false)
 void C2_MacroAssembler::vsetvli_helper(BasicType bt, uint vector_length, LMUL vlmul, Register tmp) {
diff --git a/src/hotspot/cpu/riscv/c2_MacroAssembler_riscv.hpp b/src/hotspot/cpu/riscv/c2_MacroAssembler_riscv.hpp
index 114ad0a101c..c79c360d2eb 100644
--- a/src/hotspot/cpu/riscv/c2_MacroAssembler_riscv.hpp
+++ b/src/hotspot/cpu/riscv/c2_MacroAssembler_riscv.hpp
@@ -239,6 +239,10 @@
                         int opc, BasicType bt, uint vector_length,
                         VectorMask vm = Assembler::unmasked);
 
+  void reduce_mul_integral_v(Register dst, Register src1, VectorRegister src2,
+                             VectorRegister vtmp1, VectorRegister vtmp2, BasicType bt,
+                             uint vector_length, VectorMask vm = Assembler::unmasked);
+
   void vsetvli_helper(BasicType bt, uint vector_length, LMUL vlmul = Assembler::m1, Register tmp = t0);
 
   void compare_integral_v(VectorRegister dst, VectorRegister src1, VectorRegister src2, int cond,
diff --git a/src/hotspot/cpu/riscv/riscv_v.ad b/src/hotspot/cpu/riscv/riscv_v.ad
index 7be169ef709..9892d2b9c03 100644
--- a/src/hotspot/cpu/riscv/riscv_v.ad
+++ b/src/hotspot/cpu/riscv/riscv_v.ad
@@ -2,6 +2,7 @@
 // Copyright (c) 2020, 2025, Oracle and/or its affiliates. All rights reserved.
 // Copyright (c) 2020, 2023, Arm Limited. All rights reserved.
 // Copyright (c) 2020, 2022, Huawei Technologies Co., Ltd. All rights reserved.
+// Copyright (c) 2023, 2025, Rivos 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
@@ -99,6 +100,12 @@ source %{
           return false;
         }
         break;
+      case Op_MulReductionVI:
+      case Op_MulReductionVL:
+        // When vlen < 4, our log2(vlen) implementation does not help to gain performance improvement.
+        if (vlen < 4) {
+          return false;
+        }
       default:
         break;
     }
@@ -2427,6 +2434,67 @@ instruct vreduce_minD_masked(fRegD dst, fRegD src1, vReg src2, vRegMask_V0 v0, v
   ins_pipe(pipe_slow);
 %}
 
+
+// ------------------------------ Vector reduction mul -------------------------
+
+instruct reduce_mulI(iRegINoSp dst, iRegIorL2I isrc, vReg vsrc,
+                     vReg tmp1, vReg tmp2) %{
+  match(Set dst (MulReductionVI isrc vsrc));
+  effect(TEMP_DEF dst, TEMP tmp1, TEMP tmp2);
+  format %{ "reduce_mulI $dst, $isrc, $vsrc\t" %}
+
+  ins_encode %{
+    __ reduce_mul_integral_v($dst$$Register, $isrc$$Register, as_VectorRegister($vsrc$$reg),
+                             as_VectorRegister($tmp1$$reg), as_VectorRegister($tmp2$$reg),
+                             Matcher::vector_element_basic_type(this, $vsrc), Matcher::vector_length(this, $vsrc));
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+instruct reduce_mulI_masked(iRegINoSp dst, iRegIorL2I isrc, vReg vsrc,
+                            vRegMask_V0 v0, vReg tmp1, vReg tmp2) %{
+  match(Set dst (MulReductionVI (Binary isrc vsrc) v0));
+  effect(TEMP_DEF dst, TEMP tmp1, TEMP tmp2);
+  format %{ "reduce_mulI_masked $dst, $isrc, $vsrc, $v0\t" %}
+
+  ins_encode %{
+    __ reduce_mul_integral_v($dst$$Register, $isrc$$Register, as_VectorRegister($vsrc$$reg),
+                             as_VectorRegister($tmp1$$reg), as_VectorRegister($tmp2$$reg),
+                             Matcher::vector_element_basic_type(this, $vsrc), Matcher::vector_length(this, $vsrc),
+                             Assembler::v0_t);
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+instruct reduce_mulL(iRegLNoSp dst, iRegL isrc, vReg vsrc,
+                     vReg tmp1, vReg tmp2) %{
+  match(Set dst (MulReductionVL isrc vsrc));
+  effect(TEMP_DEF dst, TEMP tmp1, TEMP tmp2);
+  format %{ "reduce_mulL $dst, $isrc, $vsrc\t" %}
+
+  ins_encode %{
+    __ reduce_mul_integral_v($dst$$Register, $isrc$$Register, as_VectorRegister($vsrc$$reg),
+                             as_VectorRegister($tmp1$$reg), as_VectorRegister($tmp2$$reg),
+                             Matcher::vector_element_basic_type(this, $vsrc), Matcher::vector_length(this, $vsrc));
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+instruct reduce_mulL_masked(iRegLNoSp dst, iRegL isrc, vReg vsrc,
+                            vRegMask_V0 v0, vReg tmp1, vReg tmp2) %{
+  match(Set dst (MulReductionVL (Binary isrc vsrc) v0));
+  effect(TEMP_DEF dst, TEMP tmp1, TEMP tmp2);
+  format %{ "reduce_mulL_masked $dst, $isrc, $vsrc, $v0\t" %}
+
+  ins_encode %{
+    __ reduce_mul_integral_v($dst$$Register, $isrc$$Register, as_VectorRegister($vsrc$$reg),
+                             as_VectorRegister($tmp1$$reg), as_VectorRegister($tmp2$$reg),
+                             Matcher::vector_element_basic_type(this, $vsrc), Matcher::vector_length(this, $vsrc),
+                             Assembler::v0_t);
+  %}
+  ins_pipe(pipe_slow);
+%}
+
 // vector replicate
 
 instruct replicate(vReg dst, iRegIorL2I src) %{
diff --git a/test/hotspot/jtreg/compiler/loopopts/superword/ProdRed_Int.java b/test/hotspot/jtreg/compiler/loopopts/superword/ProdRed_Int.java
index 17f3a97a8e8..ebc8251e025 100644
--- a/test/hotspot/jtreg/compiler/loopopts/superword/ProdRed_Int.java
+++ b/test/hotspot/jtreg/compiler/loopopts/superword/ProdRed_Int.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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,6 +85,10 @@ public class ProdRed_Int {
     @IR(applyIfCPUFeature = {"sse4.1", "true"},
         applyIfAnd = {"SuperWordReductions", "true", "LoopMaxUnroll", ">= 8"},
         counts = {IRNode.MUL_REDUCTION_VI, ">= 1", IRNode.MUL_REDUCTION_VI, "<= 2"}) // one for main-loop, one for vector-post-loop
+    @IR(applyIfPlatform = {"riscv64", "true"},
+        applyIfCPUFeature = {"rvv", "true"},
+        applyIfAnd = {"SuperWordReductions", "true", "LoopMaxUnroll", ">= 8"},
+        counts = {IRNode.MUL_REDUCTION_VI, ">= 1", IRNode.MUL_REDUCTION_VI, "<= 2"}) // one for main-loop, one for vector-post-loop
     public static int prodReductionImplement(int[] a, int[] b, int total) {
         for (int i = 0; i < a.length; i++) {
             total *= a[i] + b[i];
diff --git a/test/hotspot/jtreg/compiler/loopopts/superword/RedTest_int.java b/test/hotspot/jtreg/compiler/loopopts/superword/RedTest_int.java
index d4b6777ded8..5cf7077cf17 100644
--- a/test/hotspot/jtreg/compiler/loopopts/superword/RedTest_int.java
+++ b/test/hotspot/jtreg/compiler/loopopts/superword/RedTest_int.java
@@ -219,6 +219,10 @@ public class RedTest_int {
     @IR(applyIfCPUFeature = {"sse4.1", "true"},
         applyIfAnd = {"SuperWordReductions", "true", "LoopMaxUnroll", ">= 8"},
         counts = {IRNode.MUL_REDUCTION_VI, ">= 1", IRNode.MUL_REDUCTION_VI, "<= 2"}) // one for main-loop, one for vector-post-loop
+    @IR(applyIfPlatform = {"riscv64", "true"},
+        applyIfCPUFeature = {"rvv", "true"},
+        applyIfAnd = {"SuperWordReductions", "true", "LoopMaxUnroll", ">= 8"},
+        counts = {IRNode.MUL_REDUCTION_VI, ">= 1", IRNode.MUL_REDUCTION_VI, "<= 2"}) // one for main-loop, one for vector-post-loop
     public static int mulReductionImplement(
             int[] a,
             int[] b,
diff --git a/test/hotspot/jtreg/compiler/loopopts/superword/RedTest_long.java b/test/hotspot/jtreg/compiler/loopopts/superword/RedTest_long.java
index 63228330ed5..10cd32bbbc7 100644
--- a/test/hotspot/jtreg/compiler/loopopts/superword/RedTest_long.java
+++ b/test/hotspot/jtreg/compiler/loopopts/superword/RedTest_long.java
@@ -226,6 +226,10 @@ public class RedTest_long {
         applyIfAnd = {"SuperWordReductions", "true", "LoopMaxUnroll", ">= 8"},
         applyIfPlatform = {"64-bit", "true"},
         counts = {IRNode.MUL_REDUCTION_VL, ">= 1", IRNode.MUL_REDUCTION_VL, "<= 2"}) // one for main-loop, one for vector-post-loop
+    @IR(applyIfPlatform = {"riscv64", "true"},
+        applyIfCPUFeature = {"rvv", "true"},
+        applyIfAnd = {"SuperWordReductions", "true", "LoopMaxUnroll", ">= 8"},
+        counts = {IRNode.MUL_REDUCTION_VL, ">= 1", IRNode.MUL_REDUCTION_VL, "<= 2"}) // one for main-loop, one for vector-post-loop
     public static long mulReductionImplement(
             long[] a,
             long[] b,

From dfcd0df60c60cf89dc01682264a573ad39e61a17 Mon Sep 17 00:00:00 2001
From: Volkan Yazici <vyazici@openjdk.org>
Date: Fri, 21 Feb 2025 10:26:55 +0000
Subject: [PATCH 084/587] 8350019: HttpClient: DelegatingExecutor should resort
 to the fallback executor only on RejectedExecutionException

Reviewed-by: dfuchs
---
 .../jdk/internal/net/http/HttpClientImpl.java |   6 +-
 .../DelegatingExecutorTestDriver.java         |  30 +++
 .../net/http/DelegatingExecutorTest.java      | 176 ++++++++++++++++++
 3 files changed, 209 insertions(+), 3 deletions(-)
 create mode 100644 test/jdk/java/net/httpclient/whitebox/DelegatingExecutorTestDriver.java
 create mode 100644 test/jdk/java/net/httpclient/whitebox/java.net.http/jdk/internal/net/http/DelegatingExecutorTest.java

diff --git a/src/java.net.http/share/classes/jdk/internal/net/http/HttpClientImpl.java b/src/java.net.http/share/classes/jdk/internal/net/http/HttpClientImpl.java
index 4d7518d4054..c58f0b0c752 100644
--- a/src/java.net.http/share/classes/jdk/internal/net/http/HttpClientImpl.java
+++ b/src/java.net.http/share/classes/jdk/internal/net/http/HttpClientImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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,13 +172,13 @@ final class HttpClientImpl extends HttpClient implements Trackable {
         public void ensureExecutedAsync(Runnable command) {
             try {
                 delegate.execute(command);
-            } catch (Throwable t) {
+            } catch (RejectedExecutionException t) {
                 errorHandler.accept(command, t);
                 ASYNC_POOL.execute(command);
             }
         }
 
-        private void shutdown() {
+        void shutdown() {
             if (delegate instanceof ExecutorService service) {
                 service.shutdown();
             }
diff --git a/test/jdk/java/net/httpclient/whitebox/DelegatingExecutorTestDriver.java b/test/jdk/java/net/httpclient/whitebox/DelegatingExecutorTestDriver.java
new file mode 100644
index 00000000000..4b1b783b1b6
--- /dev/null
+++ b/test/jdk/java/net/httpclient/whitebox/DelegatingExecutorTestDriver.java
@@ -0,0 +1,30 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact 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 8350019
+ * @summary Verifies `HttpClientImpl.DelegatingExecutor` behavior
+ * @modules java.net.http/jdk.internal.net.http
+ * @run junit java.net.http/jdk.internal.net.http.DelegatingExecutorTest
+ */
diff --git a/test/jdk/java/net/httpclient/whitebox/java.net.http/jdk/internal/net/http/DelegatingExecutorTest.java b/test/jdk/java/net/httpclient/whitebox/java.net.http/jdk/internal/net/http/DelegatingExecutorTest.java
new file mode 100644
index 00000000000..5b96ce4125d
--- /dev/null
+++ b/test/jdk/java/net/httpclient/whitebox/java.net.http/jdk/internal/net/http/DelegatingExecutorTest.java
@@ -0,0 +1,176 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please 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.net.http;
+
+import jdk.internal.net.http.HttpClientImpl.DelegatingExecutor;
+import org.junit.jupiter.api.Test;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.Executor;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.LinkedBlockingQueue;
+import java.util.concurrent.RejectedExecutionException;
+import java.util.concurrent.ThreadPoolExecutor;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.function.BiConsumer;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
+
+public class DelegatingExecutorTest {
+
+    @Test
+    public void testInlineExecution() {
+        Thread callSiteThread = Thread.currentThread();
+        Thread[] runSiteThreadRef = {null};
+        new DelegatingExecutor(() -> false, null, null)
+                .execute(() -> runSiteThreadRef[0] = Thread.currentThread());
+        assertSame(callSiteThread, runSiteThreadRef[0]);
+    }
+
+    @Test
+    public void testDelegateDeferral() {
+        ImmediateExecutor delegate = new ImmediateExecutor();
+        Runnable task = () -> {};
+        new DelegatingExecutor(() -> true, delegate, null).execute(task);
+        delegate.assertReception(task);
+    }
+
+    @Test
+    public void testRejectedExecutionException() throws InterruptedException {
+
+        // Create a deterministically throwing task
+        RuntimeException error = new RejectedExecutionException();
+        FirstThrowingAndThenCompletingRunnable task = new FirstThrowingAndThenCompletingRunnable(error);
+
+        // Create a recording delegate
+        ImmediateExecutor delegate = new ImmediateExecutor();
+
+        // Create a recording error handler
+        List<Runnable> reportedTasks = new ArrayList<>();
+        List<Throwable> reportedErrors = new ArrayList<>();
+        BiConsumer<Runnable, Throwable> errorHandler = (task_, error_) -> {
+            synchronized (this) {
+                reportedTasks.add(task_);
+                reportedErrors.add(error_);
+            }
+        };
+
+        // Verify the initial failing execution
+        new DelegatingExecutor(() -> true, delegate, errorHandler).execute(task);
+        delegate.assertReception(task);
+
+        // Verify fallback to the async. pool
+        assertEquals(1, reportedTasks.size());
+        assertSame(task, reportedTasks.getFirst());
+        assertEquals(1, reportedErrors.size());
+        assertSame(error, reportedErrors.getFirst());
+        boolean completed = task.completionLatch.await(5, TimeUnit.SECONDS);
+        assertTrue(completed);
+
+    }
+
+    @Test
+    public void testNotRejectedExecutionException() {
+
+        // Create a deterministically throwing task
+        RuntimeException error = new RuntimeException();
+        FirstThrowingAndThenCompletingRunnable task = new FirstThrowingAndThenCompletingRunnable(error);
+
+        // Create a recording delegate
+        ImmediateExecutor delegate = new ImmediateExecutor();
+
+        // Verify the immediate exception propagation
+        Throwable thrownError = assertThrows(
+                Throwable.class,
+                () -> new DelegatingExecutor(() -> true, delegate, null).execute(task));
+        delegate.assertReception(task);
+        assertSame(error, thrownError);
+
+    }
+
+    private static final class ImmediateExecutor implements Executor {
+
+        private final List<Runnable> receivedTasks = new ArrayList<>();
+
+        @Override
+        public synchronized void execute(Runnable task) {
+            receivedTasks.add(task);
+            task.run();
+        }
+
+        private synchronized void assertReception(Runnable... tasks) {
+            assertSame(tasks.length, receivedTasks.size());
+            for (int taskIndex = 0; taskIndex < tasks.length; taskIndex++) {
+                assertSame(tasks[taskIndex], receivedTasks.get(taskIndex));
+            }
+        }
+
+    }
+
+    private static final class FirstThrowingAndThenCompletingRunnable implements Runnable {
+
+        private final AtomicInteger invocationCounter = new AtomicInteger(0);
+
+        private final CountDownLatch completionLatch = new CountDownLatch(1);
+
+        private final RuntimeException exception;
+
+        private FirstThrowingAndThenCompletingRunnable(RuntimeException exception) {
+            this.exception = exception;
+        }
+
+        @Override
+        public void run() {
+            switch (invocationCounter.getAndIncrement()) {
+                case 0: throw exception;
+                case 1: { completionLatch.countDown(); break; }
+                default: fail();
+            }
+        }
+
+    }
+
+    @Test
+    public void testDelegateShutdown() {
+        AtomicInteger invocationCounter = new AtomicInteger();
+        try (ExecutorService delegate = new ThreadPoolExecutor(1, 1, 1, TimeUnit.DAYS, new LinkedBlockingQueue<>()) {
+            @Override
+            public void shutdown() {
+                invocationCounter.incrementAndGet();
+                super.shutdown();
+            }
+        }) {
+            new DelegatingExecutor(() -> true, delegate, null).shutdown();
+            assertEquals(1, invocationCounter.get());
+        }
+    }
+
+}

From 24b557361a481d7f38f8016506573623b91bd8c8 Mon Sep 17 00:00:00 2001
From: Matias Saavedra Silva <matsaave@openjdk.org>
Date: Fri, 21 Feb 2025 16:17:31 +0000
Subject: [PATCH 085/587] 8350444: Check for verifer error in
 StackMapReader::check_offset()

Reviewed-by: coleenp, dholmes
---
 src/hotspot/share/classfile/stackMapTable.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/hotspot/share/classfile/stackMapTable.cpp b/src/hotspot/share/classfile/stackMapTable.cpp
index ff8c8378027..b452beecb00 100644
--- a/src/hotspot/share/classfile/stackMapTable.cpp
+++ b/src/hotspot/share/classfile/stackMapTable.cpp
@@ -231,6 +231,9 @@ StackMapFrame* StackMapReader::next(TRAPS) {
   StackMapFrame* frame = next_helper(CHECK_VERIFY_(_verifier, nullptr));
   if (frame != nullptr) {
     check_offset(frame);
+    if (frame->verifier()->has_error()) {
+      return nullptr;
+    }
     _prev_frame = frame;
   }
   return frame;

From bd8ad309b59bceb3073a8d6411cca74e73508885 Mon Sep 17 00:00:00 2001
From: Xiaolong Peng <xpeng@openjdk.org>
Date: Fri, 21 Feb 2025 16:39:17 +0000
Subject: [PATCH 086/587] 8350285: Shenandoah: Regression caused by
 ShenandoahLock under extreme contention

Reviewed-by: shade, kdnilsen
---
 .../share/gc/shenandoah/shenandoahLock.cpp    | 19 ++++++++++++++++---
 .../share/gc/shenandoah/shenandoahLock.hpp    |  2 ++
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/src/hotspot/share/gc/shenandoah/shenandoahLock.cpp b/src/hotspot/share/gc/shenandoah/shenandoahLock.cpp
index be72127c6ec..47a144a638f 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahLock.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahLock.cpp
@@ -45,6 +45,7 @@ void ShenandoahLock::contended_lock_internal(JavaThread* java_thread) {
   assert(!ALLOW_BLOCK || java_thread != nullptr, "Must have a Java thread when allowing block.");
   // Spin this much, but only on multi-processor systems.
   int ctr = os::is_MP() ? 0xFF : 0;
+  int yields = 0;
   // Apply TTAS to avoid more expensive CAS calls if the lock is still held by other thread.
   while (Atomic::load(&_state) == locked ||
          Atomic::cmpxchg(&_state, unlocked, locked) != unlocked) {
@@ -67,17 +68,29 @@ void ShenandoahLock::contended_lock_internal(JavaThread* java_thread) {
         // VM thread to arm the poll sooner.
         while (SafepointSynchronize::is_synchronizing() &&
                !SafepointMechanism::local_poll_armed(java_thread)) {
-          os::naked_yield();
+          yield_or_sleep(yields);
         }
       } else {
-        os::naked_yield();
+        yield_or_sleep(yields);
       }
     } else {
-      os::naked_yield();
+      yield_or_sleep(yields);
     }
   }
 }
 
+void ShenandoahLock::yield_or_sleep(int &yields) {
+  // Simple yield-sleep policy: do one 100us sleep after every N yields.
+  // Tested with different values of N, and chose 3 for best performance.
+  if (yields < 3) {
+    os::naked_yield();
+    yields++;
+  } else {
+    os::naked_short_nanosleep(100000);
+    yields = 0;
+  }
+}
+
 ShenandoahSimpleLock::ShenandoahSimpleLock() {
   assert(os::mutex_init_done(), "Too early!");
 }
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahLock.hpp b/src/hotspot/share/gc/shenandoah/shenandoahLock.hpp
index 4d7eefd460c..0cef2414c0d 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahLock.hpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahLock.hpp
@@ -42,6 +42,8 @@ private:
 
   template<bool ALLOW_BLOCK>
   void contended_lock_internal(JavaThread* java_thread);
+  static void yield_or_sleep(int &yields);
+
 public:
   ShenandoahLock() : _state(unlocked), _owner(nullptr) {};
 

From b45c32cd4fb55fac4fc5161b9cd76415c69b203b Mon Sep 17 00:00:00 2001
From: Chris Plummer <cjplummer@openjdk.org>
Date: Fri, 21 Feb 2025 19:09:38 +0000
Subject: [PATCH 087/587] 8350287: Cleanup SA's support for CodeBlob subclasses

Reviewed-by: kvn, sspitsyn
---
 .../sun/jvm/hotspot/code/AdapterBlob.java     | 56 --------------
 .../sun/jvm/hotspot/code/BufferBlob.java      | 52 -------------
 .../sun/jvm/hotspot/code/CodeBlob.java        | 77 ++++---------------
 .../sun/jvm/hotspot/code/CodeCache.java       |  7 --
 .../jvm/hotspot/code/DeoptimizationBlob.java  | 52 -------------
 .../sun/jvm/hotspot/code/ExceptionBlob.java   | 55 -------------
 .../code/MethodHandlesAdapterBlob.java        | 56 --------------
 .../sun/jvm/hotspot/code/RuntimeBlob.java     | 60 ---------------
 .../sun/jvm/hotspot/code/RuntimeStub.java     | 64 ---------------
 .../sun/jvm/hotspot/code/SafepointBlob.java   | 54 -------------
 .../sun/jvm/hotspot/code/SingletonBlob.java   | 52 -------------
 .../jvm/hotspot/code/UncommonTrapBlob.java    | 54 -------------
 .../sun/jvm/hotspot/code/UpcallStub.java      |  2 +-
 .../sun/jvm/hotspot/code/VtableBlob.java      | 40 ----------
 .../classes/sun/jvm/hotspot/tools/PStack.java | 22 +-----
 15 files changed, 18 insertions(+), 685 deletions(-)
 delete mode 100644 src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/AdapterBlob.java
 delete mode 100644 src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/BufferBlob.java
 delete mode 100644 src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/DeoptimizationBlob.java
 delete mode 100644 src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/ExceptionBlob.java
 delete mode 100644 src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/MethodHandlesAdapterBlob.java
 delete mode 100644 src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/RuntimeBlob.java
 delete mode 100644 src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/RuntimeStub.java
 delete mode 100644 src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/SafepointBlob.java
 delete mode 100644 src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/SingletonBlob.java
 delete mode 100644 src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/UncommonTrapBlob.java
 delete mode 100644 src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/VtableBlob.java

diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/AdapterBlob.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/AdapterBlob.java
deleted file mode 100644
index 8fa69a2686c..00000000000
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/AdapterBlob.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- *
- */
-
-package sun.jvm.hotspot.code;
-
-import java.util.*;
-import sun.jvm.hotspot.debugger.*;
-import sun.jvm.hotspot.runtime.*;
-import sun.jvm.hotspot.types.*;
-import sun.jvm.hotspot.utilities.Observable;
-import sun.jvm.hotspot.utilities.Observer;
-
-public class AdapterBlob extends RuntimeBlob {
-  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("AdapterBlob");
-
-    // // FIXME: add any needed fields
-  }
-
-  public AdapterBlob(Address addr) {
-    super(addr);
-  }
-
-  public String getName() {
-    return "AdapterBlob: " + super.getName();
-  }
-}
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/BufferBlob.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/BufferBlob.java
deleted file mode 100644
index 8f2ed2aa601..00000000000
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/BufferBlob.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright (c) 2000, 2025, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- *
- */
-
-package sun.jvm.hotspot.code;
-
-import java.util.*;
-import sun.jvm.hotspot.debugger.*;
-import sun.jvm.hotspot.runtime.*;
-import sun.jvm.hotspot.types.*;
-import sun.jvm.hotspot.utilities.Observable;
-import sun.jvm.hotspot.utilities.Observer;
-
-public class BufferBlob extends RuntimeBlob {
-  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("BufferBlob");
-
-    // FIXME: add any needed fields
-  }
-
-  public BufferBlob(Address addr) {
-    super(addr);
-  }
-}
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/CodeBlob.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/CodeBlob.java
index 326600d79f4..b401f3656f9 100644
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/CodeBlob.java
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/CodeBlob.java
@@ -52,20 +52,12 @@ public class CodeBlob extends VMObject {
   private static CIntegerField dataOffsetField;
   private static CIntegerField frameSizeField;
   private static AddressField  oopMapsField;
+  private static CIntegerField callerMustGCArgumentsField;
 
-  // Kinds of Codeblob
+  // Kinds of CodeBlobs that we need to know about.
   private static int NMethodKind;
-  private static int BufferKind;
-  private static int AdapterKind;
-  private static int VtableKind;
-  private static int MHAdapterKind;
   private static int RuntimeStubKind;
-  private static int DeoptimizationKind;
-  private static int ExceptionKind;
-  private static int SafepointKind;
-  private static int UncommonTrapKind;
   private static int UpcallKind;
-  private static int NumberOfKinds;
 
   private static Class[] wrapperClasses;
 
@@ -89,6 +81,7 @@ public class CodeBlob extends VMObject {
     dataOffsetField          = type.getCIntegerField("_data_offset");
     frameSizeField           = type.getCIntegerField("_frame_size");
     oopMapsField             = type.getAddressField("_oop_maps");
+    callerMustGCArgumentsField = type.getCIntegerField("_caller_must_gc_arguments");
 
     if (VM.getVM().isServerCompiler()) {
       matcherInterpreterFramePointerReg =
@@ -96,38 +89,8 @@ public class CodeBlob extends VMObject {
     }
 
     NMethodKind        = db.lookupIntConstant("CodeBlobKind::Nmethod").intValue();
-    BufferKind         = db.lookupIntConstant("CodeBlobKind::Buffer").intValue();
-    AdapterKind        = db.lookupIntConstant("CodeBlobKind::Adapter").intValue();
-    VtableKind         = db.lookupIntConstant("CodeBlobKind::Vtable").intValue();
-    MHAdapterKind      = db.lookupIntConstant("CodeBlobKind::MHAdapter").intValue();
     RuntimeStubKind    = db.lookupIntConstant("CodeBlobKind::RuntimeStub").intValue();
-    DeoptimizationKind = db.lookupIntConstant("CodeBlobKind::Deoptimization").intValue();
-    SafepointKind      = db.lookupIntConstant("CodeBlobKind::Safepoint").intValue();
     UpcallKind         = db.lookupIntConstant("CodeBlobKind::Upcall").intValue();
-    NumberOfKinds      = db.lookupIntConstant("CodeBlobKind::Number_Of_Kinds").intValue();
-    if (VM.getVM().isServerCompiler()) {
-        ExceptionKind    = db.lookupIntConstant("CodeBlobKind::Exception").intValue();
-        UncommonTrapKind = db.lookupIntConstant("CodeBlobKind::UncommonTrap").intValue();
-    } else {
-        // Set invalid value to not match default.
-        ExceptionKind    = NumberOfKinds + 1;
-        UncommonTrapKind = NumberOfKinds + 1;
-    }
-
-    wrapperClasses                     = new Class[NumberOfKinds];
-    wrapperClasses[NMethodKind]        = NMethod.class;
-    wrapperClasses[BufferKind]         = BufferBlob.class;
-    wrapperClasses[AdapterKind]        = AdapterBlob.class;
-    wrapperClasses[VtableKind]         = VtableBlob.class;
-    wrapperClasses[MHAdapterKind]      = MethodHandlesAdapterBlob.class;
-    wrapperClasses[RuntimeStubKind]    = RuntimeStub.class;
-    wrapperClasses[DeoptimizationKind] = DeoptimizationBlob.class;
-    wrapperClasses[SafepointKind]      = SafepointBlob.class;
-    wrapperClasses[UpcallKind]         = UpcallStub.class;
-    if (VM.getVM().isServerCompiler()) {
-      wrapperClasses[ExceptionKind]    = ExceptionBlob.class;
-      wrapperClasses[UncommonTrapKind] = UncommonTrapBlob.class;
-    }
   }
 
   static {
@@ -140,7 +103,16 @@ public class CodeBlob extends VMObject {
 
   public static Class<?> getClassFor(Address addr) {
       CodeBlob cb = new CodeBlob(addr);
-      return wrapperClasses[cb.getKind()];
+      int kind = cb.getKind();
+      if (kind == NMethodKind) {
+          return NMethod.class;
+      } else if (kind == UpcallKind) {
+          return UpcallStub.class;
+      } else {
+          // All other CodeBlob kinds have no special functionality in SA and can be
+          // represented by the generic CodeBlob class.
+          return CodeBlob.class;
+      }
   }
 
   public Address headerBegin()    { return getAddress(); }
@@ -196,35 +168,16 @@ public class CodeBlob extends VMObject {
 
 
   // Typing
-  public boolean isBufferBlob()         { return getKind() == BufferKind; }
-
   public boolean isNMethod()            { return getKind() == NMethodKind; }
 
   public boolean isRuntimeStub()        { return getKind() == RuntimeStubKind; }
 
   public boolean isUpcallStub()         { return getKind() == UpcallKind; }
 
-  public boolean isDeoptimizationBlob() { return getKind() == DeoptimizationKind; }
-
-  public boolean isUncommonTrapBlob()   { return getKind() == UncommonTrapKind; }
-
-  public boolean isExceptionBlob()      { return getKind() == ExceptionKind; }
-
-  public boolean isSafepointBlob()      { return getKind() == SafepointKind; }
-
-  public boolean isAdapterBlob()        { return getKind() == AdapterKind; }
-
-  public boolean isMHAdapterBlob()      { return getKind() == MHAdapterKind; }
-
-  public boolean isVtableBlob()         { return getKind() == VtableKind; }
-
-  // Fine grain nmethod support: isNMethod() == isJavaMethod() || isNativeMethod() || isOSRMethod()
   public boolean isJavaMethod()         { return false; }
 
   public boolean isNativeMethod()       { return false; }
 
-  /** On-Stack Replacement method */
-  public boolean isOSRMethod()          { return false; }
 
   public NMethod asNMethodOrNull() {
     if (isNMethod()) return (NMethod)this;
@@ -266,7 +219,9 @@ public class CodeBlob extends VMObject {
   }
 
   // Returns true, if the next frame is responsible for GC'ing oops passed as arguments
-  public boolean callerMustGCArguments() { return false; }
+  public boolean callerMustGCArguments() {
+    return callerMustGCArgumentsField.getValue(addr) != 0;
+  }
 
   public void print() {
     printOn(System.out);
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/CodeCache.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/CodeCache.java
index 73135a873e5..ff8b29ae12e 100644
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/CodeCache.java
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/CodeCache.java
@@ -96,13 +96,6 @@ public class CodeCache {
   // addr    - address inside of a code blob
   public CodeBlob createCodeBlobWrapper(Address cbStart, Address addr) {
     Class<?> cbClass = CodeBlob.getClassFor(cbStart);
-    if (cbClass == null) {
-      String message = "Couldn't deduce type of CodeBlob ";
-      message = message + "@" + cbStart + " ";
-      message = message + "for PC=" + addr;
-
-      throw new RuntimeException(message);
-    }
     CodeBlob result = (CodeBlob) VMObjectFactory.newObject(cbClass, cbStart);
     if (Assert.ASSERTS_ENABLED) {
       // The pointer to the HeapBlock that contains this blob is outside of the blob,
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/DeoptimizationBlob.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/DeoptimizationBlob.java
deleted file mode 100644
index 51a5184ca85..00000000000
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/DeoptimizationBlob.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright (c) 2000, 2025, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- *
- */
-
-package sun.jvm.hotspot.code;
-
-import java.util.*;
-import sun.jvm.hotspot.debugger.*;
-import sun.jvm.hotspot.runtime.*;
-import sun.jvm.hotspot.types.*;
-import sun.jvm.hotspot.utilities.Observable;
-import sun.jvm.hotspot.utilities.Observer;
-
-public class DeoptimizationBlob extends SingletonBlob {
-  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("DeoptimizationBlob");
-
-    // FIXME: add any needed fields
-  }
-
-  public DeoptimizationBlob(Address addr) {
-    super(addr);
-  }
-}
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/ExceptionBlob.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/ExceptionBlob.java
deleted file mode 100644
index 30025a41866..00000000000
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/ExceptionBlob.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright (c) 2000, 2025, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- *
- */
-
-package sun.jvm.hotspot.code;
-
-import java.util.*;
-import sun.jvm.hotspot.debugger.*;
-import sun.jvm.hotspot.runtime.*;
-import sun.jvm.hotspot.types.*;
-import sun.jvm.hotspot.utilities.Observable;
-import sun.jvm.hotspot.utilities.Observer;
-
-/** ExceptionBlob: used for exception unwinding in compiled code
-    (currently only used by Compiler 2) */
-
-public class ExceptionBlob extends SingletonBlob {
-  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("ExceptionBlob");
-
-    // FIXME: add any needed fields
-  }
-
-  public ExceptionBlob(Address addr) {
-    super(addr);
-  }
-}
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/MethodHandlesAdapterBlob.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/MethodHandlesAdapterBlob.java
deleted file mode 100644
index 53c9593d0b8..00000000000
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/MethodHandlesAdapterBlob.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- *
- */
-
-package sun.jvm.hotspot.code;
-
-import java.util.*;
-import sun.jvm.hotspot.debugger.*;
-import sun.jvm.hotspot.runtime.*;
-import sun.jvm.hotspot.types.*;
-import sun.jvm.hotspot.utilities.Observable;
-import sun.jvm.hotspot.utilities.Observer;
-
-public class MethodHandlesAdapterBlob extends AdapterBlob {
-  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("MethodHandlesAdapterBlob");
-
-    // FIXME: add any needed fields
-  }
-
-  public MethodHandlesAdapterBlob(Address addr) {
-    super(addr);
-  }
-
-  public String getName() {
-    return "MethodHandlesAdapterBlob: " + super.getName();
-  }
-}
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/RuntimeBlob.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/RuntimeBlob.java
deleted file mode 100644
index d6f69d622b1..00000000000
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/RuntimeBlob.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Copyright (c) 2016, 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.code;
-
-import java.util.*;
-
-import sun.jvm.hotspot.compiler.*;
-import sun.jvm.hotspot.debugger.*;
-import sun.jvm.hotspot.runtime.*;
-import sun.jvm.hotspot.types.*;
-import sun.jvm.hotspot.utilities.*;
-import sun.jvm.hotspot.utilities.Observable;
-import sun.jvm.hotspot.utilities.Observer;
-
-public class RuntimeBlob extends CodeBlob {
-
-  // Only used by server compiler on x86; computed over in SA rather
-  // than relying on computation in target VM
-  private static final int     NOT_YET_COMPUTED = -2;
-  private static final int     UNDEFINED        = -1;
-  private              int     linkOffset       = NOT_YET_COMPUTED;
-
-  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("RuntimeBlob");
-  }
-
-  public RuntimeBlob(Address addr) {
-    super(addr);
-  }
-}
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/RuntimeStub.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/RuntimeStub.java
deleted file mode 100644
index f51dcd76516..00000000000
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/RuntimeStub.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Copyright (c) 2000, 2025, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- *
- */
-
-package sun.jvm.hotspot.code;
-
-import java.util.*;
-import sun.jvm.hotspot.debugger.*;
-import sun.jvm.hotspot.runtime.*;
-import sun.jvm.hotspot.types.*;
-import sun.jvm.hotspot.utilities.Observable;
-import sun.jvm.hotspot.utilities.Observer;
-
-public class RuntimeStub extends RuntimeBlob {
-  private static CIntegerField callerMustGCArgumentsField;
-
-  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("RuntimeStub");
-    callerMustGCArgumentsField                = type.getCIntegerField("_caller_must_gc_arguments");
-
-    // FIXME: add any needed fields
-  }
-
-  public RuntimeStub(Address addr) {
-    super(addr);
-  }
-
-  public boolean callerMustGCArguments() {
-    return callerMustGCArgumentsField.getValue(addr) != 0;
-  }
-
-
-  public String getName() {
-    return "RuntimeStub: " + super.getName();
-  }
-}
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/SafepointBlob.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/SafepointBlob.java
deleted file mode 100644
index 3f3ba79ff9f..00000000000
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/SafepointBlob.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright (c) 2000, 2025, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- *
- */
-
-package sun.jvm.hotspot.code;
-
-import java.util.*;
-import sun.jvm.hotspot.debugger.*;
-import sun.jvm.hotspot.runtime.*;
-import sun.jvm.hotspot.types.*;
-import sun.jvm.hotspot.utilities.Observable;
-import sun.jvm.hotspot.utilities.Observer;
-
-/** SafepointBlob: handles illegal_instruction exceptions during a safepoint */
-
-public class SafepointBlob extends SingletonBlob {
-  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("SafepointBlob");
-
-    // FIXME: add any needed fields
-  }
-
-  public SafepointBlob(Address addr) {
-    super(addr);
-  }
-}
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/SingletonBlob.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/SingletonBlob.java
deleted file mode 100644
index 5a80b957e1d..00000000000
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/SingletonBlob.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright (c) 2000, 2025, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- *
- */
-
-package sun.jvm.hotspot.code;
-
-import java.util.*;
-import sun.jvm.hotspot.debugger.*;
-import sun.jvm.hotspot.runtime.*;
-import sun.jvm.hotspot.types.*;
-import sun.jvm.hotspot.utilities.Observable;
-import sun.jvm.hotspot.utilities.Observer;
-
-public class SingletonBlob extends RuntimeBlob {
-  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("SingletonBlob");
-
-    // FIXME: add any needed fields
-  }
-
-  public SingletonBlob(Address addr) {
-    super(addr);
-  }
-}
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/UncommonTrapBlob.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/UncommonTrapBlob.java
deleted file mode 100644
index 077e49b5fe6..00000000000
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/UncommonTrapBlob.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright (c) 2000, 2025, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- *
- */
-
-package sun.jvm.hotspot.code;
-
-import java.util.*;
-import sun.jvm.hotspot.debugger.*;
-import sun.jvm.hotspot.runtime.*;
-import sun.jvm.hotspot.types.*;
-import sun.jvm.hotspot.utilities.Observable;
-import sun.jvm.hotspot.utilities.Observer;
-
-/** UncommonTrapBlob (currently only used by Compiler 2) */
-
-public class UncommonTrapBlob extends SingletonBlob {
-  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("UncommonTrapBlob");
-
-    // FIXME: add any needed fields
-  }
-
-  public UncommonTrapBlob(Address addr) {
-    super(addr);
-  }
-}
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/UpcallStub.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/UpcallStub.java
index eeb5821bb60..360e047943b 100644
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/UpcallStub.java
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/UpcallStub.java
@@ -31,7 +31,7 @@ import sun.jvm.hotspot.types.*;
 import sun.jvm.hotspot.utilities.Observable;
 import sun.jvm.hotspot.utilities.Observer;
 
-public class UpcallStub extends RuntimeBlob {
+public class UpcallStub extends CodeBlob {
 
   private static CIntegerField frameDataOffsetField;
   private static AddressField lastJavaFPField;
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/VtableBlob.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/VtableBlob.java
deleted file mode 100644
index a193d5ff340..00000000000
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/VtableBlob.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (c) 2020, 2025, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2020, NTT DATA.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- *
- */
-
-package sun.jvm.hotspot.code;
-
-import sun.jvm.hotspot.debugger.Address;
-
-public class VtableBlob extends BufferBlob {
-
-    public VtableBlob(Address addr) {
-        super(addr);
-    }
-
-    public String getName() {
-        return "VtableBlob: " + super.getName();
-    }
-
-}
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/tools/PStack.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/tools/PStack.java
index 945dd6bcc49..a0099b4c4de 100644
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/tools/PStack.java
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/tools/PStack.java
@@ -160,28 +160,8 @@ public class PStack extends Tool {
                                     out.println("<Unknown compiled code>");
                                   }
                                }
-                            } else if (cb.isBufferBlob()) {
-                               out.println("<StubRoutines>");
-                            } else if (cb.isAdapterBlob()) {
-                               out.println("<AdapterBlob>");
-                            } else if (cb.isVtableBlob()) {
-                               out.println("<VtableBlob>");
-                            } else if (cb.isMHAdapterBlob()) {
-                               out.println("<MethodHandlesAdapterBlob>");
-                            } else if (cb.isRuntimeStub()) {
-                               out.println("<RuntimeStub>");
-                            } else if (cb.isUpcallStub()) {
-                               out.println("<UpcallStub>");
-                            } else if (cb.isDeoptimizationBlob()) {
-                               out.println("<DeoptimizationBlob>");
-                            } else if (cb.isUncommonTrapBlob()) {
-                               out.println("<UncommonTrapBlob>");
-                            } else if (cb.isExceptionBlob()) {
-                               out.println("<ExceptionBlob>");
-                            } else if (cb.isSafepointBlob()) {
-                               out.println("<SafepointBlob>");
                             } else {
-                               out.println("<Unknown code blob>");
+                               out.println("<" + cb.getName() + ">");
                             }
                          } else {
                             printUnknown(out);

From 9d9d7a17d3d1a8971712ef1b22e919012350db6f Mon Sep 17 00:00:00 2001
From: Jamil Nimeh <jnimeh@openjdk.org>
Date: Fri, 21 Feb 2025 20:30:02 +0000
Subject: [PATCH 088/587] 8349759: Add unit test for CertificateBuilder and
 SimpleOCSPServer test utilities

Reviewed-by: mullan
---
 .../test/lib/security/CPVAlgTestWithOCSP.java | 230 ++++++++++++++++++
 .../test/lib/security/CertificateBuilder.java |  46 ++--
 .../test/lib/security/SimpleOCSPServer.java   |  93 +++----
 3 files changed, 309 insertions(+), 60 deletions(-)
 create mode 100644 test/lib-test/jdk/test/lib/security/CPVAlgTestWithOCSP.java

diff --git a/test/lib-test/jdk/test/lib/security/CPVAlgTestWithOCSP.java b/test/lib-test/jdk/test/lib/security/CPVAlgTestWithOCSP.java
new file mode 100644
index 00000000000..c1874492a3b
--- /dev/null
+++ b/test/lib-test/jdk/test/lib/security/CPVAlgTestWithOCSP.java
@@ -0,0 +1,230 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact 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 8349759
+ * @summary Test the CertificateBuilder and SimpleOCSPServer test utility
+ *          classes using a range of signature algorithms and parameters.
+ *          The goal is to test with both no-parameter and parameterized
+ *          signature algorithms and use the CertPathValidator to validate
+ *          the correctness of the certificate and OCSP server-side structures.
+ * @modules java.base/sun.security.x509
+ *          java.base/sun.security.provider.certpath
+ *          java.base/sun.security.util
+ * @library /test/lib
+ * @run main/othervm CPVAlgTestWithOCSP RSA
+ * @run main/othervm CPVAlgTestWithOCSP RSA:3072
+ * @run main/othervm CPVAlgTestWithOCSP DSA
+ * @run main/othervm CPVAlgTestWithOCSP DSA:3072
+ * @run main/othervm CPVAlgTestWithOCSP RSASSA-PSS
+ * @run main/othervm CPVAlgTestWithOCSP RSASSA-PSS:3072
+ * @run main/othervm CPVAlgTestWithOCSP RSASSA-PSS:4096:SHA-512:SHA3-384:128:1
+ * @run main/othervm CPVAlgTestWithOCSP EC
+ * @run main/othervm CPVAlgTestWithOCSP EC:secp521r1
+ * @run main/othervm CPVAlgTestWithOCSP Ed25519
+ * @run main/othervm CPVAlgTestWithOCSP ML-DSA-65
+ */
+
+import java.math.BigInteger;
+import java.security.*;
+import java.security.cert.*;
+import java.security.cert.Certificate;
+import java.security.spec.*;
+import java.util.*;
+import java.util.concurrent.TimeUnit;
+
+import jdk.test.lib.security.SimpleOCSPServer;
+import jdk.test.lib.security.CertificateBuilder;
+
+import static java.security.cert.PKIXRevocationChecker.Option.NO_FALLBACK;
+
+public class CPVAlgTestWithOCSP {
+
+    static final String passwd = "passphrase";
+    static final String ROOT_ALIAS = "root";
+    static final boolean[] CA_KU_FLAGS = {true, false, false, false, false,
+            true, true, false, false};
+    static final boolean[] EE_KU_FLAGS = {true, false, false, false, false,
+            false, false, false, false};
+    static final List<String> EE_EKU_OIDS = List.of("1.3.6.1.5.5.7.3.1",
+            "1.3.6.1.5.5.7.3.2");
+
+    public static void main(String[] args) throws Exception {
+        if (args == null || args.length < 1) {
+            throw new RuntimeException(
+                    "Usage: CPVAlgTestWithOCSP <IssKeyAlg>");
+        }
+        String keyGenAlg = args[0];
+
+        // Generate Root and EE keys
+        KeyPairGenerator keyGen = getKpGen(keyGenAlg);
+        KeyPair rootCaKP = keyGen.genKeyPair();
+        KeyPair eeKp = keyGen.genKeyPair();
+
+        // Set up the Root CA Cert
+        // Make a 3 year validity starting from 60 days ago
+        long start = System.currentTimeMillis() - TimeUnit.DAYS.toMillis(60);
+        long end = start + TimeUnit.DAYS.toMillis(1085);
+        CertificateBuilder cbld = new CertificateBuilder();
+        cbld.setSubjectName("CN=Root CA Cert, O=SomeCompany").
+                setPublicKey(rootCaKP.getPublic()).
+                setSerialNumber(new BigInteger("1")).
+                setValidity(new Date(start), new Date(end)).
+                addSubjectKeyIdExt(rootCaKP.getPublic()).
+                addAuthorityKeyIdExt(rootCaKP.getPublic()).
+                addBasicConstraintsExt(true, true, -1).
+                addKeyUsageExt(CA_KU_FLAGS);
+
+        // Make our Root CA Cert!
+        X509Certificate rootCert = cbld.build(null, rootCaKP.getPrivate());
+        log("Root CA Created:\n%s", rootCert);
+
+        // Now build a keystore and add the keys and cert
+        KeyStore.Builder keyStoreBuilder =
+                KeyStore.Builder.newInstance("PKCS12", null,
+                new KeyStore.PasswordProtection("adminadmin0".toCharArray()));
+        KeyStore rootKeystore = keyStoreBuilder.getKeyStore();
+        Certificate[] rootChain = {rootCert};
+        rootKeystore.setKeyEntry(ROOT_ALIAS, rootCaKP.getPrivate(),
+                passwd.toCharArray(), rootChain);
+
+        // Now fire up the OCSP responder
+        SimpleOCSPServer rootOcsp = new SimpleOCSPServer(rootKeystore,
+                passwd, ROOT_ALIAS, null);
+        rootOcsp.enableLog(true);
+        rootOcsp.setNextUpdateInterval(3600);
+        rootOcsp.start();
+
+        // Wait 60 seconds for server ready
+        boolean readyStatus = rootOcsp.awaitServerReady(60, TimeUnit.SECONDS);
+        if (!readyStatus) {
+            throw new RuntimeException("Server not ready");
+        }
+        int rootOcspPort = rootOcsp.getPort();
+        String rootRespURI = "http://localhost:" + rootOcspPort;
+        log("Root OCSP Responder URI is %s", rootRespURI);
+
+        // Let's make an EE cert
+        // Make a 1 year validity starting from 60 days ago
+        start = System.currentTimeMillis() - TimeUnit.DAYS.toMillis(60);
+        end = start + TimeUnit.DAYS.toMillis(365);
+        cbld.reset().setSubjectName("CN=Brave Sir Robin, O=SomeCompany").
+                setPublicKey(eeKp.getPublic()).
+                setValidity(new Date(start), new Date(end)).
+                addSubjectKeyIdExt(eeKp.getPublic()).
+                addAuthorityKeyIdExt(rootCaKP.getPublic()).
+                addKeyUsageExt(EE_KU_FLAGS).
+                addExtendedKeyUsageExt(EE_EKU_OIDS).
+                addSubjectAltNameDNSExt(Collections.singletonList("localhost")).
+                addAIAExt(Collections.singletonList(rootRespURI));
+        X509Certificate eeCert = cbld.build(rootCert, rootCaKP.getPrivate());
+        log("EE CA Created:\n%s", eeCert);
+
+        // Provide end entity cert revocation info to the Root CA
+        // OCSP responder.
+        Map<BigInteger, SimpleOCSPServer.CertStatusInfo> revInfo =
+                new HashMap<>();
+        revInfo.put(eeCert.getSerialNumber(),
+                new SimpleOCSPServer.CertStatusInfo(
+                        SimpleOCSPServer.CertStatus.CERT_STATUS_GOOD));
+        rootOcsp.updateStatusDb(revInfo);
+
+        // validate chain
+        CertPathValidator cpv = CertPathValidator.getInstance("PKIX");
+        PKIXRevocationChecker prc =
+                (PKIXRevocationChecker) cpv.getRevocationChecker();
+        prc.setOptions(EnumSet.of(NO_FALLBACK));
+        PKIXParameters params =
+                new PKIXParameters(Set.of(new TrustAnchor(rootCert, null)));
+        params.addCertPathChecker(prc);
+        CertificateFactory cf = CertificateFactory.getInstance("X.509");
+        CertPath cp = cf.generateCertPath(List.of(eeCert));
+        cpv.validate(cp, params);
+    }
+
+    private static KeyPairGenerator getKpGen(String keyGenAlg)
+            throws GeneralSecurityException {
+        String[] algComps = keyGenAlg.split(":");
+        KeyPairGenerator kpg = KeyPairGenerator.getInstance(algComps[0]);
+        int bitLen;
+
+        // Handle any parameters in additional tokenized fields
+        switch (algComps[0].toUpperCase()) {
+            case "EC":
+                // The curve name will be the second token, or secp256r1
+                // if not provided.
+                String curveName = (algComps.length >= 2) ? algComps[1] :
+                        "secp256r1";
+                kpg.initialize(new ECGenParameterSpec(curveName));
+                break;
+            case "RSA":
+            case "DSA":
+                // Form is RSA|DSA[:<KeyBitLen>]
+                bitLen = (algComps.length >= 2) ?
+                        Integer.parseInt(algComps[1]) : 2048;
+                kpg.initialize(bitLen);
+                break;
+            case "RSASSA-PSS":
+                // Form is RSASSA-PSS[:<KeyBitLen>[:HASH:MGFHASH:SALTLEN:TR]]
+                switch (algComps.length) {
+                    case 1:     // Default key length and parameters
+                        kpg.initialize(2048);
+                        break;
+                    case 2:     // Specified key length, default params
+                        kpg.initialize(Integer.parseInt(algComps[1]));
+                        break;
+                    default:    // len > 2, key length and specified parameters
+                        bitLen = Integer.parseInt(algComps[1]);
+                        String hashAlg = algComps[2];
+                        MGF1ParameterSpec mSpec = (algComps.length >= 4) ?
+                                new MGF1ParameterSpec(algComps[3]) :
+                                MGF1ParameterSpec.SHA256;
+                        int saltLen = (algComps.length >= 5) ?
+                                Integer.parseInt(algComps[4]) : 32;
+                        int trail = (algComps.length >= 6) ?
+                                Integer.parseInt(algComps[5]) :
+                                PSSParameterSpec.TRAILER_FIELD_BC;
+                        PSSParameterSpec pSpec = new PSSParameterSpec(hashAlg,
+                                "MGF1", mSpec, saltLen, trail);
+                        kpg.initialize(new RSAKeyGenParameterSpec(bitLen,
+                                RSAKeyGenParameterSpec.F4, pSpec));
+                        break;
+                }
+
+            // Default: just use the KPG as-is, no additional init needed.
+    }
+
+        return kpg;
+    }
+
+    /**
+     * Log a message on stdout
+     *
+     * @param format the format string for the log entry
+     * @param args zero or more arguments corresponding to the format string
+     */
+    private static void log(String format, Object ... args) {
+        System.out.format(format + "\n", args);
+    }
+}
diff --git a/test/lib/jdk/test/lib/security/CertificateBuilder.java b/test/lib/jdk/test/lib/security/CertificateBuilder.java
index 7ff066bc7e0..60358c9a4ea 100644
--- a/test/lib/jdk/test/lib/security/CertificateBuilder.java
+++ b/test/lib/jdk/test/lib/security/CertificateBuilder.java
@@ -51,7 +51,6 @@ import sun.security.x509.DNSName;
 import sun.security.x509.GeneralName;
 import sun.security.x509.GeneralNames;
 import sun.security.x509.KeyUsageExtension;
-import sun.security.x509.SerialNumber;
 import sun.security.x509.SubjectAlternativeNameExtension;
 import sun.security.x509.URIName;
 import sun.security.x509.KeyIdentifier;
@@ -288,11 +287,8 @@ public class CertificateBuilder {
      *
      * @param bitSettings Boolean array for all nine bit settings in the order
      * documented in RFC 5280 section 4.2.1.3.
-     *
-     * @throws IOException if an encoding error occurs.
      */
-    public CertificateBuilder addKeyUsageExt(boolean[] bitSettings)
-            throws IOException {
+    public CertificateBuilder addKeyUsageExt(boolean[] bitSettings) {
         return addExtension(new KeyUsageExtension(bitSettings));
     }
 
@@ -305,11 +301,9 @@ public class CertificateBuilder {
      * @param maxPathLen The maximum path length issued by this CA.  Values
      * less than zero will omit this field from the resulting extension and
      * no path length constraint will be asserted.
-     *
-     * @throws IOException if an encoding error occurs.
      */
     public CertificateBuilder addBasicConstraintsExt(boolean crit, boolean isCA,
-            int maxPathLen) throws IOException {
+            int maxPathLen) {
         return addExtension(new BasicConstraintsExtension(crit, isCA,
                 maxPathLen));
     }
@@ -389,7 +383,27 @@ public class CertificateBuilder {
     }
 
     /**
-     * Build the certificate.
+     * Build the certificate using the default algorithm for the provided
+     * signing key.
+     *
+     * @param issuerCert The certificate of the issuing authority, or
+     * {@code null} if the resulting certificate is self-signed.
+     * @param issuerKey The private key of the issuing authority
+     *
+     * @return The resulting {@link X509Certificate}
+     *
+     * @throws IOException if an encoding error occurs.
+     * @throws CertificateException If the certificate cannot be generated
+     * by the underlying {@link CertificateFactory}
+     */
+    public X509Certificate build(X509Certificate issuerCert,
+            PrivateKey issuerKey) throws IOException, CertificateException {
+        return build(issuerCert, issuerKey,
+                SignatureUtil.getDefaultSigAlgForKey(issuerKey));
+    }
+
+    /**
+     * Build the certificate using the key and specified signing algorithm.
      *
      * @param issuerCert The certificate of the issuing authority, or
      * {@code null} if the resulting certificate is self-signed.
@@ -401,14 +415,10 @@ public class CertificateBuilder {
      * @throws IOException if an encoding error occurs.
      * @throws CertificateException If the certificate cannot be generated
      * by the underlying {@link CertificateFactory}
-     * @throws NoSuchAlgorithmException If an invalid signature algorithm
-     * is provided.
      */
     public X509Certificate build(X509Certificate issuerCert,
             PrivateKey issuerKey, String algName)
-            throws IOException, CertificateException, NoSuchAlgorithmException {
-        // TODO: add some basic checks (key usage, basic constraints maybe)
-
+            throws IOException, CertificateException {
         byte[] encodedCert = encodeTopLevel(issuerCert, issuerKey, algName);
         ByteArrayInputStream bais = new ByteArrayInputStream(encodedCert);
         return (X509Certificate)factory.generateCertificate(bais);
@@ -437,15 +447,14 @@ public class CertificateBuilder {
      */
     private byte[] encodeTopLevel(X509Certificate issuerCert,
             PrivateKey issuerKey, String algName)
-            throws CertificateException, IOException, NoSuchAlgorithmException {
+            throws CertificateException, IOException {
 
-        AlgorithmId signAlg = AlgorithmId.get(algName);
+        AlgorithmId signAlg;
         DerOutputStream outerSeq = new DerOutputStream();
         DerOutputStream topLevelItems = new DerOutputStream();
 
         try {
-            Signature sig = SignatureUtil.fromKey(signAlg.getName(), issuerKey, (Provider)null);
-            // Rewrite signAlg, RSASSA-PSS needs some parameters.
+            Signature sig = SignatureUtil.fromKey(algName, issuerKey, "");
             signAlg = SignatureUtil.fromSignature(sig, issuerKey);
             tbsCertBytes = encodeTbsCert(issuerCert, signAlg);
             sig.update(tbsCertBytes);
@@ -566,7 +575,6 @@ public class CertificateBuilder {
      */
     private void encodeExtensions(DerOutputStream tbsStream)
             throws IOException {
-
         if (extensions.isEmpty()) {
             return;
         }
diff --git a/test/lib/jdk/test/lib/security/SimpleOCSPServer.java b/test/lib/jdk/test/lib/security/SimpleOCSPServer.java
index e8ce021b138..4e25467ca80 100644
--- a/test/lib/jdk/test/lib/security/SimpleOCSPServer.java
+++ b/test/lib/jdk/test/lib/security/SimpleOCSPServer.java
@@ -25,6 +25,7 @@ package jdk.test.lib.security;
 
 import java.io.*;
 import java.net.*;
+import java.nio.charset.StandardCharsets;
 import java.security.*;
 import java.security.cert.CRLReason;
 import java.security.cert.X509Certificate;
@@ -61,7 +62,7 @@ public class SimpleOCSPServer {
     static final int FREE_PORT = 0;
 
     // CertStatus values
-    public static enum CertStatus {
+    public enum CertStatus {
         CERT_STATUS_GOOD,
         CERT_STATUS_REVOKED,
         CERT_STATUS_UNKNOWN,
@@ -69,14 +70,14 @@ public class SimpleOCSPServer {
 
     // Fields used for the networking portion of the responder
     private ServerSocket servSocket;
-    private InetAddress listenAddress;
+    private final InetAddress listenAddress;
     private int listenPort;
 
     // Keystore information (certs, keys, etc.)
-    private KeyStore keystore;
-    private X509Certificate issuerCert;
-    private X509Certificate signerCert;
-    private PrivateKey signerKey;
+    private final KeyStore keystore;
+    private final X509Certificate issuerCert;
+    private final X509Certificate signerCert;
+    private final PrivateKey signerKey;
 
     // Fields used for the operational portions of the server
     private boolean logEnabled = false;
@@ -91,9 +92,9 @@ public class SimpleOCSPServer {
     // Fields used in the generation of responses
     private long nextUpdateInterval = -1;
     private Date nextUpdate = null;
-    private ResponderId respId;
-    private AlgorithmId sigAlgId;
-    private Map<CertId, CertStatusInfo> statusDb =
+    private final ResponderId respId;
+    private String sigAlgName;
+    private final Map<CertId, CertStatusInfo> statusDb =
             Collections.synchronizedMap(new HashMap<>());
 
     /**
@@ -140,25 +141,24 @@ public class SimpleOCSPServer {
     public SimpleOCSPServer(InetAddress addr, int port, KeyStore ks,
             String password, String issuerAlias, String signerAlias)
             throws GeneralSecurityException, IOException {
-        Objects.requireNonNull(ks, "Null keystore provided");
+        keystore = Objects.requireNonNull(ks, "Null keystore provided");
         Objects.requireNonNull(issuerAlias, "Null issuerName provided");
 
         utcDateFmt.setTimeZone(TimeZone.getTimeZone("GMT"));
 
-        keystore = ks;
-        issuerCert = (X509Certificate)ks.getCertificate(issuerAlias);
+        issuerCert = (X509Certificate)keystore.getCertificate(issuerAlias);
         if (issuerCert == null) {
             throw new IllegalArgumentException("Certificate for alias " +
                     issuerAlias + " not found");
         }
 
         if (signerAlias != null) {
-            signerCert = (X509Certificate)ks.getCertificate(signerAlias);
+            signerCert = (X509Certificate)keystore.getCertificate(signerAlias);
             if (signerCert == null) {
                 throw new IllegalArgumentException("Certificate for alias " +
                     signerAlias + " not found");
             }
-            signerKey = (PrivateKey)ks.getKey(signerAlias,
+            signerKey = (PrivateKey)keystore.getKey(signerAlias,
                     password.toCharArray());
             if (signerKey == null) {
                 throw new IllegalArgumentException("PrivateKey for alias " +
@@ -166,14 +166,14 @@ public class SimpleOCSPServer {
             }
         } else {
             signerCert = issuerCert;
-            signerKey = (PrivateKey)ks.getKey(issuerAlias,
+            signerKey = (PrivateKey)keystore.getKey(issuerAlias,
                     password.toCharArray());
             if (signerKey == null) {
                 throw new IllegalArgumentException("PrivateKey for alias " +
                     issuerAlias + " not found");
             }
         }
-        sigAlgId = AlgorithmId.get(SignatureUtil.getDefaultSigAlgForKey(signerKey));
+        sigAlgName = SignatureUtil.getDefaultSigAlgForKey(signerKey);
         respId = new ResponderId(signerCert.getSubjectX500Principal());
         listenAddress = addr;
         listenPort = port;
@@ -495,8 +495,14 @@ public class SimpleOCSPServer {
     public void setSignatureAlgorithm(String algName)
             throws NoSuchAlgorithmException {
         if (!started) {
-            sigAlgId = AlgorithmId.get(algName);
-            log("Signature algorithm set to " + sigAlgId.getName());
+            // We don't care about the AlgorithmId object, we're just
+            // using it to validate the algName parameter.
+            AlgorithmId.get(algName);
+            sigAlgName = algName;
+            log("Signature algorithm set to " + algName);
+        } else {
+            log("Signature algorithm cannot be set on a running server, " +
+                    "stop the server first");
         }
     }
 
@@ -604,9 +610,9 @@ public class SimpleOCSPServer {
      * object may be used to construct OCSP responses.
      */
     public static class CertStatusInfo {
-        private CertStatus certStatusType;
+        private final CertStatus certStatusType;
         private CRLReason reason;
-        private Date revocationTime;
+        private final Date revocationTime;
 
         /**
          * Create a Certificate status object by providing the status only.
@@ -745,7 +751,7 @@ public class SimpleOCSPServer {
                 // This will be tokenized so we know if we are dealing with
                 // a GET or POST.
                 String[] headerTokens = readLine(in).split(" ");
-                LocalOcspRequest ocspReq = null;
+                LocalOcspRequest ocspReq;
                 LocalOcspResponse ocspResp = null;
                 ResponseStatus respStat = ResponseStatus.INTERNAL_ERROR;
                 try {
@@ -794,7 +800,7 @@ public class SimpleOCSPServer {
                 out.flush();
 
                 log("Closing " + ocspSocket);
-            } catch (IOException | CertificateException exc) {
+            } catch (IOException | GeneralSecurityException exc) {
                 err(exc);
             }
         }
@@ -826,10 +832,10 @@ public class SimpleOCSPServer {
                         append("\r\n");
             }
             sb.append("\r\n");
-
-            out.write(sb.toString().getBytes("UTF-8"));
-            out.write(respBytes);
             log(resp.toString());
+
+            out.write(sb.toString().getBytes(StandardCharsets.UTF_8));
+            out.write(respBytes);
         }
 
         /**
@@ -940,7 +946,7 @@ public class SimpleOCSPServer {
             // "/" off before decoding.
             return new LocalOcspRequest(Base64.getMimeDecoder().decode(
                     URLDecoder.decode(headerTokens[1].replaceAll("/", ""),
-                            "UTF-8")));
+                            StandardCharsets.UTF_8)));
         }
 
         /**
@@ -974,8 +980,7 @@ public class SimpleOCSPServer {
                     bos.write(b);
                 }
             }
-
-            return new String(bos.toByteArray(), "UTF-8");
+            return bos.toString(StandardCharsets.UTF_8);
         }
     }
 
@@ -1052,7 +1057,6 @@ public class SimpleOCSPServer {
 
             if (sigItems[2].isContextSpecific((byte)0)) {
                 DerValue[] certDerItems = sigItems[2].data.getSequence(4);
-                int i = 0;
                 for (DerValue dv : certDerItems) {
                     X509Certificate xc = new X509CertImpl(dv);
                     certificates.add(xc);
@@ -1131,7 +1135,7 @@ public class SimpleOCSPServer {
          * Return the list of X.509 Certificates in this OCSP request.
          *
          * @return an unmodifiable {@code List} of zero or more
-         * {@cpde X509Certificate} objects.
+         * {@code X509Certificate} objects.
          */
         private List<X509Certificate> getCertificates() {
             return Collections.unmodifiableList(certificates);
@@ -1295,7 +1299,8 @@ public class SimpleOCSPServer {
         private final Map<String, Extension> responseExtensions;
         private byte[] signature;
         private final List<X509Certificate> certificates;
-        private final byte[] encodedResponse;
+        private final Signature signEngine;
+        private final AlgorithmId sigAlgId;
 
         /**
          * Constructor for the generation of non-successful responses
@@ -1305,9 +1310,11 @@ public class SimpleOCSPServer {
          * @throws IOException if an error happens during encoding
          * @throws NullPointerException if {@code respStat} is {@code null}
          * or {@code respStat} is successful.
+         * @throws GeneralSecurityException if errors occur while obtaining
+         * the signature object or any algorithm identifier parameters.
          */
         public LocalOcspResponse(OCSPResponse.ResponseStatus respStat)
-                throws IOException {
+                throws IOException, GeneralSecurityException {
             this(respStat, null, null);
         }
 
@@ -1324,10 +1331,13 @@ public class SimpleOCSPServer {
          * @throws NullPointerException if {@code respStat} is {@code null}
          * or {@code respStat} is successful, and a {@code null} {@code itemMap}
          * has been provided.
+         * @throws GeneralSecurityException if errors occur while obtaining
+         * the signature object or any algorithm identifier parameters.
          */
         public LocalOcspResponse(OCSPResponse.ResponseStatus respStat,
                 Map<CertId, CertStatusInfo> itemMap,
-                Map<String, Extension> reqExtensions) throws IOException {
+                Map<String, Extension> reqExtensions)
+                throws IOException, GeneralSecurityException {
             responseStatus = Objects.requireNonNull(respStat,
                     "Illegal null response status");
             if (responseStatus == ResponseStatus.SUCCESSFUL) {
@@ -1348,13 +1358,18 @@ public class SimpleOCSPServer {
                     certificates.add(signerCert);
                 }
                 certificates.add(issuerCert);
+                // Create the signature object and AlgorithmId that we'll use
+                // later to create the signature on this response.
+                signEngine = SignatureUtil.fromKey(sigAlgName, signerKey, "");
+                sigAlgId = SignatureUtil.fromSignature(signEngine, signerKey);
             } else {
                 respItemMap = null;
                 producedAtDate = null;
                 responseExtensions = null;
                 certificates = null;
+                signEngine = null;
+                sigAlgId = null;
             }
-            encodedResponse = this.getBytes();
         }
 
         /**
@@ -1436,13 +1451,9 @@ public class SimpleOCSPServer {
             basicORItemStream.write(tbsResponseBytes);
 
             try {
-                // Create the signature
-                Signature sig = SignatureUtil.fromKey(
-                        sigAlgId.getName(), signerKey, (Provider)null);
-                sig.update(tbsResponseBytes);
-                signature = sig.sign();
-                // Rewrite signAlg, RSASSA-PSS needs some parameters.
-                sigAlgId = SignatureUtil.fromSignature(sig, signerKey);
+                // Create the signature with the initialized Signature object
+                signEngine.update(tbsResponseBytes);
+                signature = signEngine.sign();
                 sigAlgId.encode(basicORItemStream);
                 basicORItemStream.putBitString(signature);
             } catch (GeneralSecurityException exc) {

From 825ab20ba99b1f1127dd94b87ae56020d1831529 Mon Sep 17 00:00:00 2001
From: Fernando Guallini <fguallini@openjdk.org>
Date: Fri, 21 Feb 2025 21:06:54 +0000
Subject: [PATCH 089/587] 8350456: Test
 javax/crypto/CryptoPermissions/InconsistentEntries.java crashed:
 EXCEPTION_ACCESS_VIOLATION

Reviewed-by: rhalade, jnimeh
---
 .../InconsistentEntries.java                  |  4 +--
 test/lib/jdk/test/lib/util/FileUtils.java     | 27 +++++++++++++++++++
 2 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/test/jdk/javax/crypto/CryptoPermissions/InconsistentEntries.java b/test/jdk/javax/crypto/CryptoPermissions/InconsistentEntries.java
index 85118f34d03..1e84316867e 100644
--- a/test/jdk/javax/crypto/CryptoPermissions/InconsistentEntries.java
+++ b/test/jdk/javax/crypto/CryptoPermissions/InconsistentEntries.java
@@ -31,8 +31,8 @@
 
 import java.util.List;
 import jdk.test.lib.Utils;
-import jdk.test.lib.cds.CDSTestUtils;
 import jdk.test.lib.process.ProcessTools;
+import jdk.test.lib.util.FileUtils;
 import org.testng.Assert;
 import org.testng.annotations.BeforeTest;
 import org.testng.annotations.Test;
@@ -59,7 +59,7 @@ public class InconsistentEntries {
     @BeforeTest
     public void setUp() throws Exception {
         // Clone the tested JDK to the scratch directory
-        CDSTestUtils.clone(new File(JDK_HOME), new File(TEMP_JDK_HOME.toString()));
+        FileUtils.copyDirectory(Path.of(JDK_HOME), TEMP_JDK_HOME);
 
         // create policy directory in the cloned JDK
         if (!POLICY_DIR.toFile().exists()) {
diff --git a/test/lib/jdk/test/lib/util/FileUtils.java b/test/lib/jdk/test/lib/util/FileUtils.java
index 7b2ab434af2..8b99d1e9d54 100644
--- a/test/lib/jdk/test/lib/util/FileUtils.java
+++ b/test/lib/jdk/test/lib/util/FileUtils.java
@@ -36,6 +36,7 @@ import java.nio.file.Files;
 import java.nio.file.NoSuchFileException;
 import java.nio.file.Path;
 import java.nio.file.SimpleFileVisitor;
+import java.nio.file.StandardCopyOption;
 import java.nio.file.attribute.BasicFileAttributes;
 import java.time.Instant;
 import java.util.ArrayList;
@@ -48,6 +49,8 @@ import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
 import jdk.test.lib.Platform;
 
 import com.sun.management.UnixOperatingSystemMXBean;
@@ -364,6 +367,30 @@ public final class FileUtils {
         });
     }
 
+    /**
+     * Copies a directory and all entries in the directory to a destination path.
+     * Makes the access permission of the destination entries writable.
+     *
+     * @param src the path of the source directory
+     * @param dst the path of the destination directory
+     * @throws IOException      if an I/O error occurs while walking the file tree
+     * @throws RuntimeException if an I/O error occurs during the copy operation
+     *                          or if the source or destination paths are invalid
+     */
+    public static void copyDirectory(Path src, Path dst) throws IOException {
+        try (Stream<Path> stream = Files.walk(src)) {
+            stream.forEach(sourcePath -> {
+                try {
+                    Path destPath = dst.resolve(src.relativize(sourcePath));
+                    Files.copy(sourcePath, destPath, StandardCopyOption.REPLACE_EXISTING);
+                    destPath.toFile().setWritable(true);
+                } catch (IOException e) {
+                    throw new RuntimeException(e);
+                }
+            });
+        }
+    }
+
     // Return the current process handle count
     @SuppressWarnings("restricted")
     public static long getProcessHandleCount() {

From 25322aae8e224680db376098d2e45f26cf3334a0 Mon Sep 17 00:00:00 2001
From: Dmitry Chuyko <dchuyko@openjdk.org>
Date: Fri, 21 Feb 2025 21:43:54 +0000
Subject: [PATCH 090/587] 8350258: AArch64: Client build fails after
 JDK-8347917

Reviewed-by: dlong, kvn
---
 src/hotspot/cpu/aarch64/frame_aarch64.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/hotspot/cpu/aarch64/frame_aarch64.cpp b/src/hotspot/cpu/aarch64/frame_aarch64.cpp
index 7201674cd63..b07fa2fa9df 100644
--- a/src/hotspot/cpu/aarch64/frame_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/frame_aarch64.cpp
@@ -507,11 +507,11 @@ frame frame::sender_for_interpreter_frame(RegisterMap* map) const {
   intptr_t* unextended_sp = interpreter_frame_sender_sp();
   intptr_t* sender_fp = link();
 
-#if COMPILER2_OR_JVMCI
+#if defined(COMPILER1) || COMPILER2_OR_JVMCI
   if (map->update_map()) {
     update_map_with_saved_link(map, (intptr_t**) addr_at(link_offset));
   }
-#endif // COMPILER2_OR_JVMCI
+#endif // defined(COMPILER1) || COMPILER1_OR_COMPILER2
 
   // For ROP protection, Interpreter will have signed the sender_pc,
   // but there is no requirement to authenticate it here.

From 5cbd9d1fe19b6d9516233cd1ed8d3ba340b7a1e6 Mon Sep 17 00:00:00 2001
From: SendaoYan <syan@openjdk.org>
Date: Sat, 22 Feb 2025 03:11:42 +0000
Subject: [PATCH 091/587] 8349959: Test CR6740048.java passes unexpectedly
 missing CR6740048.xsd

Reviewed-by: joehw
---
 .../javax/xml/jaxp/unittest/validation/CR6740048.java  | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/test/jaxp/javax/xml/jaxp/unittest/validation/CR6740048.java b/test/jaxp/javax/xml/jaxp/unittest/validation/CR6740048.java
index 6fcff45fc05..fbb515aca70 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, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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,11 +59,9 @@ public class CR6740048 {
             DocumentBuilderFactory docBuilderFactory = DocumentBuilderFactory.newInstance();
             docBuilderFactory.setNamespaceAware(true);
 
-            if (xsd != null) {
-                docBuilderFactory.setValidating(true);
-                docBuilderFactory.setAttribute(SCHEMA_LANGUAGE_URL, XML_SCHEMA_URL);
-                docBuilderFactory.setAttribute(SCHEMA_SOURCE_URL, xsd);
-            }
+            docBuilderFactory.setValidating(true);
+            docBuilderFactory.setAttribute(SCHEMA_LANGUAGE_URL, XML_SCHEMA_URL);
+            docBuilderFactory.setAttribute(SCHEMA_SOURCE_URL, xsd);
 
             final DocumentBuilder documentBuilder = docBuilderFactory.newDocumentBuilder();
             documentBuilder.setErrorHandler(new ErrorHandler() {

From a891630817844c8c42994da3b3110925ca4595a0 Mon Sep 17 00:00:00 2001
From: Fei Yang <fyang@openjdk.org>
Date: Sat, 22 Feb 2025 10:16:51 +0000
Subject: [PATCH 092/587] 8350480: RISC-V: Relax assertion about registers in
 C2_MacroAssembler::minmax_fp

Reviewed-by: mli, fjiang
---
 src/hotspot/cpu/riscv/c2_MacroAssembler_riscv.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/hotspot/cpu/riscv/c2_MacroAssembler_riscv.cpp b/src/hotspot/cpu/riscv/c2_MacroAssembler_riscv.cpp
index 34a61177774..e52cf7565be 100644
--- a/src/hotspot/cpu/riscv/c2_MacroAssembler_riscv.cpp
+++ b/src/hotspot/cpu/riscv/c2_MacroAssembler_riscv.cpp
@@ -2135,7 +2135,8 @@ void C2_MacroAssembler::enc_cmove(int cmpFlag, Register op1, Register op2, Regis
 // Set dst to NaN if any NaN input.
 void C2_MacroAssembler::minmax_fp(FloatRegister dst, FloatRegister src1, FloatRegister src2,
                                   bool is_double, bool is_min) {
-  assert_different_registers(dst, src1, src2);
+  assert_different_registers(dst, src1);
+  assert_different_registers(dst, src2);
 
   Label Done, Compare;
 

From 05b481294cbf2ad7c8d917b8e039e7aebcf91104 Mon Sep 17 00:00:00 2001
From: Jiangli Zhou <jiangli@openjdk.org>
Date: Sun, 23 Feb 2025 02:35:57 +0000
Subject: [PATCH 093/587] 8350041: Skip
 test/jdk/java/lang/String/nativeEncoding/StringPlatformChars.java on static
 JDK

Reviewed-by: alanb
---
 .../java/lang/String/nativeEncoding/StringPlatformChars.java   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/test/jdk/java/lang/String/nativeEncoding/StringPlatformChars.java b/test/jdk/java/lang/String/nativeEncoding/StringPlatformChars.java
index db4c407a17a..fec8b34e5ad 100644
--- a/test/jdk/java/lang/String/nativeEncoding/StringPlatformChars.java
+++ b/test/jdk/java/lang/String/nativeEncoding/StringPlatformChars.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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 @@
 
  /*
  * @test
+ * @requires !jdk.static
  * @run main/othervm/native -Xcheck:jni StringPlatformChars
  */
 import java.util.Arrays;

From 0795d11bfc0c6640ed7e9f05a17eb2a733d88bc0 Mon Sep 17 00:00:00 2001
From: David Holmes <dholmes@openjdk.org>
Date: Mon, 24 Feb 2025 03:13:55 +0000
Subject: [PATCH 094/587] 8350464: The flags to set the native priority for the
 VMThread and Java threads need a broader range

Reviewed-by: stuefe, shade
---
 src/hotspot/share/runtime/globals.hpp | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/hotspot/share/runtime/globals.hpp b/src/hotspot/share/runtime/globals.hpp
index d3bdb0c68b2..61c4c0633c7 100644
--- a/src/hotspot/share/runtime/globals.hpp
+++ b/src/hotspot/share/runtime/globals.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -1605,47 +1605,47 @@ const int ObjectAlignmentInBytes = 8;
   product(int, VMThreadPriority, -1,                                        \
           "The native priority at which the VM thread should run "          \
           "(-1 means no change)")                                           \
-          range(-1, 127)                                                    \
+          range(min_jint, max_jint)                                         \
                                                                             \
   product(int, JavaPriority1_To_OSPriority, -1,                             \
           "Map Java priorities to OS priorities")                           \
-          range(-1, 127)                                                    \
+          range(min_jint, max_jint)                                         \
                                                                             \
   product(int, JavaPriority2_To_OSPriority, -1,                             \
           "Map Java priorities to OS priorities")                           \
-          range(-1, 127)                                                    \
+          range(min_jint, max_jint)                                         \
                                                                             \
   product(int, JavaPriority3_To_OSPriority, -1,                             \
           "Map Java priorities to OS priorities")                           \
-          range(-1, 127)                                                    \
+          range(min_jint, max_jint)                                         \
                                                                             \
   product(int, JavaPriority4_To_OSPriority, -1,                             \
           "Map Java priorities to OS priorities")                           \
-          range(-1, 127)                                                    \
+          range(min_jint, max_jint)                                         \
                                                                             \
   product(int, JavaPriority5_To_OSPriority, -1,                             \
           "Map Java priorities to OS priorities")                           \
-          range(-1, 127)                                                    \
+          range(min_jint, max_jint)                                         \
                                                                             \
   product(int, JavaPriority6_To_OSPriority, -1,                             \
           "Map Java priorities to OS priorities")                           \
-          range(-1, 127)                                                    \
+          range(min_jint, max_jint)                                         \
                                                                             \
   product(int, JavaPriority7_To_OSPriority, -1,                             \
           "Map Java priorities to OS priorities")                           \
-          range(-1, 127)                                                    \
+          range(min_jint, max_jint)                                         \
                                                                             \
   product(int, JavaPriority8_To_OSPriority, -1,                             \
           "Map Java priorities to OS priorities")                           \
-          range(-1, 127)                                                    \
+          range(min_jint, max_jint)                                         \
                                                                             \
   product(int, JavaPriority9_To_OSPriority, -1,                             \
           "Map Java priorities to OS priorities")                           \
-          range(-1, 127)                                                    \
+          range(min_jint, max_jint)                                         \
                                                                             \
   product(int, JavaPriority10_To_OSPriority,-1,                             \
           "Map Java priorities to OS priorities")                           \
-          range(-1, 127)                                                    \
+          range(min_jint, max_jint)                                         \
                                                                             \
   product(bool, UseCriticalJavaThreadPriority, false, EXPERIMENTAL,         \
           "Java thread priority 10 maps to critical scheduling priority")   \

From 302bed055c3b4881f97c584d5953273b9dbc2969 Mon Sep 17 00:00:00 2001
From: Ao Qi <aoqi@openjdk.org>
Date: Mon, 24 Feb 2025 03:17:56 +0000
Subject: [PATCH 095/587] 8350499: Minimal build fails with slowdebug builds

Reviewed-by: kbarrett, dholmes
---
 src/hotspot/share/classfile/verifier.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/hotspot/share/classfile/verifier.cpp b/src/hotspot/share/classfile/verifier.cpp
index b1daee82747..4434b06c0b8 100644
--- a/src/hotspot/share/classfile/verifier.cpp
+++ b/src/hotspot/share/classfile/verifier.cpp
@@ -31,7 +31,6 @@
 #include "classfile/stackMapTableFormat.hpp"
 #include "classfile/symbolTable.hpp"
 #include "classfile/systemDictionary.hpp"
-#include "classfile/systemDictionaryShared.hpp"
 #include "classfile/verifier.hpp"
 #include "classfile/vmClasses.hpp"
 #include "classfile/vmSymbols.hpp"
@@ -60,6 +59,9 @@
 #include "services/threadService.hpp"
 #include "utilities/align.hpp"
 #include "utilities/bytes.hpp"
+#if INCLUDE_CDS
+#include "classfile/systemDictionaryShared.hpp"
+#endif
 
 #define NOFAILOVER_MAJOR_VERSION                       51
 #define NONZERO_PADDING_BYTES_IN_SWITCH_MAJOR_VERSION  51
@@ -234,11 +236,13 @@ bool Verifier::verify(InstanceKlass* klass, bool should_verify_class, TRAPS) {
          exception_name == vmSymbols::java_lang_ClassFormatError())) {
       log_info(verification)("Fail over class verification to old verifier for: %s", klass->external_name());
       log_info(class, init)("Fail over class verification to old verifier for: %s", klass->external_name());
+#if INCLUDE_CDS
       // Exclude any classes that fail over during dynamic dumping
       if (CDSConfig::is_dumping_dynamic_archive()) {
         SystemDictionaryShared::warn_excluded(klass, "Failed over class verification while dynamic dumping");
         SystemDictionaryShared::set_excluded(klass);
       }
+#endif
       message_buffer = NEW_RESOURCE_ARRAY(char, message_buffer_len);
       exception_message = message_buffer;
       exception_name = inference_verify(

From a5c9a4dbde410c687f05951b8f1d3cf72fcaedc0 Mon Sep 17 00:00:00 2001
From: Christian Hagedorn <chagedorn@openjdk.org>
Date: Mon, 24 Feb 2025 07:28:05 +0000
Subject: [PATCH 096/587] 8349032: C2: Parse Predicate refactoring in Loop
 Unswitching broke fix for JDK-8290850

Reviewed-by: kvn, thartmann
---
 src/hotspot/share/opto/loopPredicate.cpp      |  7 +-
 src/hotspot/share/opto/loopnode.hpp           |  6 +-
 src/hotspot/share/opto/predicates.cpp         | 14 ++--
 src/hotspot/share/opto/predicates.hpp         |  8 +--
 .../TestParsePredicateUCTWithPhi.java         | 69 +++++++++++++++++++
 5 files changed, 88 insertions(+), 16 deletions(-)
 create mode 100644 test/hotspot/jtreg/compiler/predicates/TestParsePredicateUCTWithPhi.java

diff --git a/src/hotspot/share/opto/loopPredicate.cpp b/src/hotspot/share/opto/loopPredicate.cpp
index dc7d125cc91..96e0fd26d0d 100644
--- a/src/hotspot/share/opto/loopPredicate.cpp
+++ b/src/hotspot/share/opto/loopPredicate.cpp
@@ -96,8 +96,11 @@ void PhaseIdealLoop::register_control(Node* n, IdealLoopTree *loop, Node* pred,
 //
 // We will create a region to guard the uct call if there is no one there.
 // The continuation projection (if_cont) of the new_iff is returned which
-// is an IfTrue projection. This code is also used to clone predicates to cloned loops.
-IfTrueNode* PhaseIdealLoop::create_new_if_for_predicate(ParsePredicateSuccessProj* parse_predicate_success_proj,
+// is an IfTrue projection. This code is also used to clone predicates to
+// cloned loops. 'rewire_uncommon_proj_phi_inputs' should be set to the
+// non-default value 'true' when called for a false-path loop during
+// Loop Unswitching.
+IfTrueNode* PhaseIdealLoop::create_new_if_for_predicate(const ParsePredicateSuccessProj* parse_predicate_success_proj,
                                                         Node* new_entry, const Deoptimization::DeoptReason reason,
                                                         const int opcode, const bool rewire_uncommon_proj_phi_inputs) {
   assert(parse_predicate_success_proj->is_uncommon_trap_if_pattern(reason), "must be a uct if pattern!");
diff --git a/src/hotspot/share/opto/loopnode.hpp b/src/hotspot/share/opto/loopnode.hpp
index 91508c512cb..4e5a60ee3cd 100644
--- a/src/hotspot/share/opto/loopnode.hpp
+++ b/src/hotspot/share/opto/loopnode.hpp
@@ -1358,9 +1358,9 @@ public:
                                       bool* p_short_scale, int depth);
 
   // 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);
+  IfTrueNode* create_new_if_for_predicate(const ParsePredicateSuccessProj* parse_predicate_proj, Node* new_entry,
+                                          Deoptimization::DeoptReason reason, int opcode,
+                                          bool rewire_uncommon_proj_phi_inputs = false);
 
  private:
   // Helper functions for create_new_if_for_predicate()
diff --git a/src/hotspot/share/opto/predicates.cpp b/src/hotspot/share/opto/predicates.cpp
index d2b33ceed44..6badaa65487 100644
--- a/src/hotspot/share/opto/predicates.cpp
+++ b/src/hotspot/share/opto/predicates.cpp
@@ -81,20 +81,20 @@ ParsePredicateNode* ParsePredicate::init_parse_predicate(const Node* parse_predi
   return nullptr;
 }
 
-ParsePredicate ParsePredicate::clone_to_unswitched_loop(Node* new_control, const bool is_true_path_loop,
+ParsePredicate ParsePredicate::clone_to_unswitched_loop(Node* new_control, const bool is_false_path_loop,
                                                         PhaseIdealLoop* phase) const {
   ParsePredicateSuccessProj* success_proj = phase->create_new_if_for_predicate(_success_proj, new_control,
                                                                                _parse_predicate_node->deopt_reason(),
-                                                                               Op_ParsePredicate, is_true_path_loop);
-  NOT_PRODUCT(trace_cloned_parse_predicate(is_true_path_loop, success_proj));
+                                                                               Op_ParsePredicate, is_false_path_loop);
+  NOT_PRODUCT(trace_cloned_parse_predicate(is_false_path_loop, success_proj));
   return ParsePredicate(success_proj, _parse_predicate_node->deopt_reason());
 }
 
 #ifndef PRODUCT
-void ParsePredicate::trace_cloned_parse_predicate(const bool is_true_path_loop,
+void ParsePredicate::trace_cloned_parse_predicate(const bool is_false_path_loop,
                                                   const ParsePredicateSuccessProj* success_proj) {
   if (TraceLoopPredicate) {
-    tty->print("Parse Predicate cloned to %s path loop: ", is_true_path_loop ? "true" : "false");
+    tty->print("Parse Predicate cloned to %s path loop: ", is_false_path_loop ? "false" : "true");
     success_proj->in(0)->dump();
   }
 }
@@ -1066,8 +1066,8 @@ void CloneUnswitchedLoopPredicatesVisitor::visit(const ParsePredicate& parse_pre
     _has_hoisted_check_parse_predicates = true;
   }
 
-  _clone_predicate_to_true_path_loop.clone_parse_predicate(parse_predicate, true);
-  _clone_predicate_to_false_path_loop.clone_parse_predicate(parse_predicate, false);
+  _clone_predicate_to_true_path_loop.clone_parse_predicate(parse_predicate, false);
+  _clone_predicate_to_false_path_loop.clone_parse_predicate(parse_predicate, true);
   parse_predicate.kill(_phase->igvn());
 }
 
diff --git a/src/hotspot/share/opto/predicates.hpp b/src/hotspot/share/opto/predicates.hpp
index c4e2bbc79c6..bfc1b23115e 100644
--- a/src/hotspot/share/opto/predicates.hpp
+++ b/src/hotspot/share/opto/predicates.hpp
@@ -296,7 +296,7 @@ class ParsePredicate : public Predicate {
   }
 
   static ParsePredicateNode* init_parse_predicate(const Node* parse_predicate_proj, Deoptimization::DeoptReason deopt_reason);
-  NOT_PRODUCT(static void trace_cloned_parse_predicate(bool is_true_path_loop,
+  NOT_PRODUCT(static void trace_cloned_parse_predicate(bool is_false_path_loop,
                                                        const ParsePredicateSuccessProj* success_proj);)
 
  public:
@@ -327,7 +327,7 @@ class ParsePredicate : public Predicate {
     return _success_proj;
   }
 
-  ParsePredicate clone_to_unswitched_loop(Node* new_control, bool is_true_path_loop,
+  ParsePredicate clone_to_unswitched_loop(Node* new_control, bool is_false_path_loop,
                                           PhaseIdealLoop* phase) const;
 
   // Kills this Parse Predicate by marking it useless. Will be folded away in the next IGVN round.
@@ -1106,9 +1106,9 @@ public:
   ClonePredicateToTargetLoop(LoopNode* target_loop_head, const NodeInLoopBody& node_in_loop_body, PhaseIdealLoop* phase);
 
   // Clones the provided Parse Predicate to the head of the current predicate chain at the target loop.
-  void clone_parse_predicate(const ParsePredicate& parse_predicate, bool is_true_path_loop) {
+  void clone_parse_predicate(const ParsePredicate& parse_predicate, bool is_false_path_loop) {
     ParsePredicate cloned_parse_predicate = parse_predicate.clone_to_unswitched_loop(_old_target_loop_entry,
-                                                                                     is_true_path_loop, _phase);
+                                                                                     is_false_path_loop, _phase);
     _target_loop_predicate_chain.insert_predicate(cloned_parse_predicate);
   }
 
diff --git a/test/hotspot/jtreg/compiler/predicates/TestParsePredicateUCTWithPhi.java b/test/hotspot/jtreg/compiler/predicates/TestParsePredicateUCTWithPhi.java
new file mode 100644
index 00000000000..977b7b31940
--- /dev/null
+++ b/test/hotspot/jtreg/compiler/predicates/TestParsePredicateUCTWithPhi.java
@@ -0,0 +1,69 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact 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 8349032
+ * @summary Test that UCT for a Parse Predicate with a Phi does not incorrectly have a top input after Loop Unswitching.
+ * @run main/othervm -Xcomp -XX:CompileCommand=compileonly,*TestParsePredicateUCTWithPhi*::test
+ *                   compiler.predicates.TestParsePredicateUCTWithPhi
+ */
+
+package compiler.predicates;
+
+public class TestParsePredicateUCTWithPhi {
+    static int iFld;
+    static int[][] iArrFld = new int[100][100];
+    static int[] iArr = new int[100];
+
+    public static void main(String[] strArr) {
+        for (int i = 0; i < 10; i++) {
+            test();
+        }
+    }
+
+    static void test() {
+        int i1 = 3;
+        for (int i = 7; i < 28; i++) {
+            int i20 = 4;
+            try {
+                iArr[3] = i1 / i;
+            } catch (ArithmeticException a_e) {
+            }
+            try {
+                i1 = 6 / iArrFld[i][i];
+            } catch (ArithmeticException a_e) {
+            }
+            int i22 = 1;
+            while (++i22 < 7) {
+                try {
+                    i20 = i20 / iArrFld[i][i];
+                    i1 = 0;
+                    i1 = iArr[1] / i;
+                } catch (ArithmeticException a_e) {
+                }
+                iFld = i20;
+            }
+        }
+    }
+}

From f755fadc3d7fd1e09cdc2442531fa724ebb77dce Mon Sep 17 00:00:00 2001
From: Per Minborg <pminborg@openjdk.org>
Date: Mon, 24 Feb 2025 07:38:29 +0000
Subject: [PATCH 097/587] 8349653: Clarify the docs for
 MemorySegment::reinterpret

Reviewed-by: jvernee, mcimadamore
---
 .../java/lang/foreign/MemorySegment.java      | 36 +++++++++----------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/src/java.base/share/classes/java/lang/foreign/MemorySegment.java b/src/java.base/share/classes/java/lang/foreign/MemorySegment.java
index 70af8e7e041..3d85e4c32cc 100644
--- a/src/java.base/share/classes/java/lang/foreign/MemorySegment.java
+++ b/src/java.base/share/classes/java/lang/foreign/MemorySegment.java
@@ -756,14 +756,14 @@ public sealed interface MemorySegment permits AbstractMemorySegmentImpl {
 
     /**
      * Returns a new memory segment with the same address and size as this segment, but
-     * with the provided scope. As such, the returned segment cannot be accessed after
-     * the provided arena has been closed. Moreover, the returned segment can be
+     * with the provided arena's scope. As such, the returned segment cannot be accessed
+     * after the provided arena has been closed. Moreover, the returned segment can be
      * accessed compatibly with the confinement restrictions associated with the provided
      * arena: that is, if the provided arena is a {@linkplain Arena#ofConfined() confined arena},
      * the returned segment can only be accessed by the arena's owner thread, regardless
      * of the confinement restrictions associated with this segment. In other words, this
      * method returns a segment that can be used as any other segment allocated using the
-     * provided arena. However, The returned segment is backed by the same memory region
+     * provided arena. However, the returned segment is backed by the same memory region
      * as that of the original segment. As such, the region of memory backing the
      * returned segment is deallocated only when this segment's arena is closed.
      * This might lead to <em>use-after-free</em> issues, as the returned segment can be
@@ -771,15 +771,15 @@ public sealed interface MemorySegment permits AbstractMemorySegmentImpl {
      * segment's arena.
      * <p>
      * Clients can specify an optional cleanup action that should be executed when the
-     * provided scope becomes invalid. This cleanup action receives a fresh memory
+     * provided arena's scope becomes invalid. This cleanup action receives a fresh memory
      * segment that is obtained from this segment as follows:
      * {@snippet lang=java :
      * MemorySegment cleanupSegment = MemorySegment.ofAddress(this.address())
      *                                             .reinterpret(byteSize());
      * }
      * That is, the cleanup action receives a segment that is associated with the global
-     * scope, and is accessible from any thread. The size of the segment accepted by the
-     * cleanup action is {@link #byteSize()}.
+     * arena's scope, and is accessible from any thread. The size of the segment accepted
+     * by the cleanup action is {@link #byteSize()}.
      * <p>
      * If this segment is {@linkplain MemorySegment#isReadOnly() read-only},
      * the returned segment is also {@linkplain MemorySegment#isReadOnly() read-only}.
@@ -790,8 +790,8 @@ public sealed interface MemorySegment permits AbstractMemorySegmentImpl {
      * @apiNote The cleanup action (if present) should take care not to leak the received
      *          segment to external clients that might access the segment after its
      *          backing region of memory is no longer available. Furthermore, if the
-     *          provided scope is the scope of an {@linkplain Arena#ofAuto() automatic arena},
-     *          the cleanup action must not prevent the scope from becoming
+     *          provided arena is an {@linkplain Arena#ofAuto() automatic arena},
+     *          the cleanup action must not prevent the arena from becoming
      *          {@linkplain java.lang.ref##reachability unreachable}.
      *          A failure to do so will permanently prevent the regions of memory
      *          allocated by the automatic arena from being deallocated.
@@ -812,14 +812,14 @@ public sealed interface MemorySegment permits AbstractMemorySegmentImpl {
 
     /**
      * Returns a new segment with the same address as this segment, but with the provided
-     * size and scope. As such, the returned segment cannot be accessed after the
-     * provided arena has been closed. Moreover, if the returned segment can be accessed
-     * compatibly with the confinement restrictions associated with the provided arena:
-     * that is, if the provided arena is a {@linkplain Arena#ofConfined() confined arena},
+     * size and the provided arena's scope. As such, the returned segment cannot be
+     * accessed after the provided arena has been closed. Moreover, if the returned
+     * segment can be accessed compatibly with the confinement restrictions associated
+     * with the provided arena: that is, if the provided arena is a {@linkplain Arena#ofConfined() confined arena},
      * the returned segment can only be accessed by the arena's owner thread, regardless
      * of the confinement restrictions associated with this segment. In other words, this
      * method returns a segment that can be used as any other segment allocated using the
-     * provided arena. However, The returned segment is backed by the same memory region
+     * provided arena. However, the returned segment is backed by the same memory region
      * as that of the original segment. As such, the region of memory backing the
      * returned segment is deallocated only when this segment's arena is closed.
      * This might lead to <em>use-after-free</em> issues, as the returned segment can be
@@ -827,15 +827,15 @@ public sealed interface MemorySegment permits AbstractMemorySegmentImpl {
      * segment's arena.
      * <p>
      * Clients can specify an optional cleanup action that should be executed when the
-     * provided scope becomes invalid. This cleanup action receives a fresh memory
+     * provided arena's scope becomes invalid. This cleanup action receives a fresh memory
      * segment that is obtained from this segment as follows:
      * {@snippet lang=java :
      * MemorySegment cleanupSegment = MemorySegment.ofAddress(this.address())
      *                                             .reinterpret(newSize);
      * }
      * That is, the cleanup action receives a segment that is associated with the global
-     * scope, and is accessible from any thread. The size of the segment accepted by the
-     * cleanup action is {@code newSize}.
+     * arena's scope, and is accessible from any thread. The size of the segment accepted
+     * by the cleanup action is {@code newSize}.
      * <p>
      * If this segment is {@linkplain MemorySegment#isReadOnly() read-only},
      * the returned segment is also {@linkplain MemorySegment#isReadOnly() read-only}.
@@ -846,8 +846,8 @@ public sealed interface MemorySegment permits AbstractMemorySegmentImpl {
      * @apiNote The cleanup action (if present) should take care not to leak the received
      *          segment to external clients that might access the segment after its
      *          backing region of memory is no longer available. Furthermore, if the
-     *          provided scope is the scope of an {@linkplain Arena#ofAuto() automatic arena},
-     *          the cleanup action must not prevent the scope from becoming
+     *          provided arena is an {@linkplain Arena#ofAuto() automatic arena},
+     *          the cleanup action must not prevent the arena from becoming
      *          {@linkplain java.lang.ref##reachability unreachable}.
      *          A failure to do so will permanently prevent the regions of memory
      *          allocated by the automatic arena from being deallocated.

From e410af00e69587b86536b298b869ddc898fd9862 Mon Sep 17 00:00:00 2001
From: Jatin Bhateja <jbhateja@openjdk.org>
Date: Mon, 24 Feb 2025 07:40:17 +0000
Subject: [PATCH 098/587] 8342393: Promote commutative vector IR node sharing

Reviewed-by: vlivanov, epeter, sviswanathan
---
 src/hotspot/share/opto/vectornode.cpp         |  57 +-
 src/hotspot/share/opto/vectornode.hpp         |   2 +
 .../VectorCommutativeOperSharingTest.java     | 576 ++++++++++++++++++
 ...VectorCommutativeOperSharingBenchmark.java | 155 +++++
 4 files changed, 789 insertions(+), 1 deletion(-)
 create mode 100644 test/hotspot/jtreg/compiler/vectorapi/VectorCommutativeOperSharingTest.java
 create mode 100644 test/micro/org/openjdk/bench/jdk/incubator/vector/VectorCommutativeOperSharingBenchmark.java

diff --git a/src/hotspot/share/opto/vectornode.cpp b/src/hotspot/share/opto/vectornode.cpp
index 4ef864fe9c4..dc7fd18a8d0 100644
--- a/src/hotspot/share/opto/vectornode.cpp
+++ b/src/hotspot/share/opto/vectornode.cpp
@@ -1042,10 +1042,65 @@ Node* VectorNode::try_to_gen_masked_vector(PhaseGVN* gvn, Node* node, const Type
   }
 }
 
+bool VectorNode::should_swap_inputs_to_help_global_value_numbering() {
+  // Predicated vector operations are sensitive to ordering of inputs.
+  // When the mask corresponding to a vector lane is false then
+  // the result of the operation is corresponding lane of its first operand.
+  //   i.e. RES = VEC1.lanewise(OPER, VEC2, MASK) is semantically equivalent to
+  //        RES = BLEND(VEC1, VEC1.lanewise(OPER, VEC2), MASK)
+  if (is_predicated_vector()) {
+    return false;
+  }
+
+  switch(Opcode()) {
+    case Op_AddVB:
+    case Op_AddVS:
+    case Op_AddVI:
+    case Op_AddVL:
+    case Op_AddVF:
+    case Op_AddVD:
+
+    case Op_MulVB:
+    case Op_MulVS:
+    case Op_MulVI:
+    case Op_MulVL:
+    case Op_MulVF:
+    case Op_MulVD:
+
+    case Op_MaxV:
+    case Op_MinV:
+    case Op_XorV:
+    case Op_OrV:
+    case Op_AndV:
+    case Op_UMinV:
+    case Op_UMaxV:
+
+    case Op_AndVMask:
+    case Op_OrVMask:
+    case Op_XorVMask:
+
+    case Op_SaturatingAddV:
+      assert(req() == 3, "Must be a binary operation");
+      // For non-predicated commutative operations, sort the inputs in
+      // increasing order of node indices.
+      if (in(1)->_idx > in(2)->_idx) {
+        return true;
+      }
+      // fallthrough
+    default:
+      return false;
+  }
+}
+
 Node* VectorNode::Ideal(PhaseGVN* phase, bool can_reshape) {
   if (Matcher::vector_needs_partial_operations(this, vect_type())) {
     return try_to_gen_masked_vector(phase, this, vect_type());
   }
+
+  // Sort inputs of commutative non-predicated vector operations to help value numbering.
+  if (should_swap_inputs_to_help_global_value_numbering()) {
+    swap_edges(1, 2);
+  }
   return nullptr;
 }
 
@@ -2076,7 +2131,7 @@ Node* XorVNode::Ideal(PhaseGVN* phase, bool can_reshape) {
     Node* zero = phase->transform(phase->zerocon(bt));
     return VectorNode::scalar2vector(zero, length(), bt, bottom_type()->isa_vectmask() != nullptr);
   }
-  return nullptr;
+  return VectorNode::Ideal(phase, can_reshape);
 }
 
 Node* VectorBlendNode::Identity(PhaseGVN* phase) {
diff --git a/src/hotspot/share/opto/vectornode.hpp b/src/hotspot/share/opto/vectornode.hpp
index 0bd1c71d7e6..50220c9362b 100644
--- a/src/hotspot/share/opto/vectornode.hpp
+++ b/src/hotspot/share/opto/vectornode.hpp
@@ -88,6 +88,8 @@ class VectorNode : public TypeNode {
   static bool is_convert_opcode(int opc);
   static bool is_minmax_opcode(int opc);
 
+  bool should_swap_inputs_to_help_global_value_numbering();
+
   static bool is_vshift_cnt_opcode(int opc);
 
   static bool is_rotate_opcode(int opc);
diff --git a/test/hotspot/jtreg/compiler/vectorapi/VectorCommutativeOperSharingTest.java b/test/hotspot/jtreg/compiler/vectorapi/VectorCommutativeOperSharingTest.java
new file mode 100644
index 00000000000..c2237000e6f
--- /dev/null
+++ b/test/hotspot/jtreg/compiler/vectorapi/VectorCommutativeOperSharingTest.java
@@ -0,0 +1,576 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package compiler.vectorapi;
+
+import compiler.lib.ir_framework.*;
+import compiler.lib.verify.*;
+import java.util.Random;
+import jdk.incubator.vector.*;
+import jdk.test.lib.Utils;
+
+/**
+ * @test
+ * @bug 8342393
+ * @key randomness
+ * @library /test/lib /
+ * @summary Promote vector IR node sharing
+ * @modules jdk.incubator.vector
+ *
+ * @run driver compiler.vectorapi.VectorCommutativeOperSharingTest
+ */
+
+public class VectorCommutativeOperSharingTest {
+    private static final VectorSpecies<Integer> I_SPECIES = IntVector.SPECIES_PREFERRED;
+
+    private static int LENGTH = 128;
+    private static final Random RD = Utils.getRandomInstance();
+
+    private static int[] ia;
+    private static int[] ib;
+    private static int[] ir1;
+    private static int[] ir2;
+    private static int[] ir3;
+    private static int[] ir4;
+
+    static {
+        ia = new int[LENGTH];
+        ib = new int[LENGTH];
+        ir1 = new int[LENGTH];
+        ir2 = new int[LENGTH];
+        ir3 = new int[LENGTH];
+        ir4 = new int[LENGTH];
+
+        for (int i = 0; i < LENGTH; i++) {
+            ia[i] = RD.nextInt(Integer.MAX_VALUE);
+            ib[i] = RD.nextInt(Integer.MAX_VALUE);
+        }
+    }
+
+    public static void main(String[] args) {
+        TestFramework.runWithFlags("--add-modules=jdk.incubator.vector");
+    }
+
+    @Test
+    @IR(counts = {IRNode.ADD_VI, IRNode.VECTOR_SIZE_ANY, " 2 ",
+                  IRNode.MUL_VI, IRNode.VECTOR_SIZE_ANY, " 2 ",
+                  IRNode.MAX_VI, IRNode.VECTOR_SIZE_ANY, " 2 ",
+                  IRNode.MIN_VI, IRNode.VECTOR_SIZE_ANY, " 2 "},
+        applyIfCPUFeature = {"avx", "true"})
+    public void testVectorIRSharing1(int index) {
+        IntVector vec1 = IntVector.fromArray(I_SPECIES, ia, index);
+        IntVector vec2 = IntVector.fromArray(I_SPECIES, ib, index);
+        vec1.lanewise(VectorOperators.ADD, vec2)
+            .lanewise(VectorOperators.ADD, vec2.lanewise(VectorOperators.ADD, vec1))
+            .intoArray(ir1, index);
+        vec1.lanewise(VectorOperators.MUL, vec2)
+            .lanewise(VectorOperators.MUL, vec2.lanewise(VectorOperators.MUL, vec1))
+            .intoArray(ir2, index);
+        vec1.lanewise(VectorOperators.MAX, vec2)
+            .lanewise(VectorOperators.MAX, vec2.lanewise(VectorOperators.MAX, vec1))
+            .intoArray(ir3, index);
+        vec1.lanewise(VectorOperators.MIN, vec2)
+            .lanewise(VectorOperators.MIN, vec2.lanewise(VectorOperators.MIN, vec1))
+            .intoArray(ir4, index);
+    }
+
+    @Run(test = "testVectorIRSharing1")
+    public void testVectorIRSharingDriver1() {
+        for (int i = 0; i < I_SPECIES.loopBound(LENGTH); i += I_SPECIES.length()) {
+            testVectorIRSharing1(i);
+        }
+        checkVectorIRSharing1();
+    }
+
+    public void checkVectorIRSharing1() {
+        for (int i = 0; i < I_SPECIES.loopBound(LENGTH); i++) {
+            Verify.checkEQ(ir1[i], (ia[i] + ib[i]) + (ib[i] + ia[i]));
+            Verify.checkEQ(ir2[i], (ia[i] * ib[i]) * (ib[i] * ia[i]));
+            Verify.checkEQ(ir3[i], Integer.max(Integer.max(ia[i], ib[i]), Integer.max(ib[i], ia[i])));
+            Verify.checkEQ(ir4[i], Integer.min(Integer.max(ia[i], ib[i]), Integer.min(ib[i], ia[i])));
+        }
+    }
+
+    @Test
+    @IR(counts = {IRNode.XOR_VI, IRNode.VECTOR_SIZE_ANY, " 0 ",
+                  IRNode.OR_VI, IRNode.VECTOR_SIZE_ANY, " 1 ",
+                  IRNode.AND_VI, IRNode.VECTOR_SIZE_ANY, " 1 "},
+        applyIfCPUFeature = {"avx", "true"})
+    public void testVectorIRSharing2(int index) {
+        IntVector vec1 = IntVector.fromArray(I_SPECIES, ia, index);
+        IntVector vec2 = IntVector.fromArray(I_SPECIES, ib, index);
+        vec1.lanewise(VectorOperators.XOR, vec2)
+            .lanewise(VectorOperators.XOR, vec2.lanewise(VectorOperators.XOR, vec1))
+            .intoArray(ir1, index);
+        vec1.lanewise(VectorOperators.AND, vec2)
+            .lanewise(VectorOperators.AND, vec2.lanewise(VectorOperators.AND, vec1))
+            .intoArray(ir2, index);
+        vec1.lanewise(VectorOperators.OR, vec2)
+            .lanewise(VectorOperators.OR, vec2.lanewise(VectorOperators.OR, vec1))
+            .intoArray(ir3, index);
+    }
+
+    @Run(test = "testVectorIRSharing2")
+    public void testVectorIRSharingDriver2() {
+        for (int i = 0; i < I_SPECIES.loopBound(LENGTH); i += I_SPECIES.length()) {
+            testVectorIRSharing2(i);
+        }
+        checkVectorIRSharing2();
+    }
+
+    public void checkVectorIRSharing2() {
+        for (int i = 0; i < I_SPECIES.loopBound(LENGTH); i++) {
+            Verify.checkEQ(ir1[i], (ia[i] ^ ib[i]) ^ (ib[i] ^ ia[i]));
+            Verify.checkEQ(ir2[i], (ia[i] & ib[i]) & (ib[i] & ia[i]));
+            Verify.checkEQ(ir3[i], (ia[i] | ib[i]) | (ib[i] | ia[i]));
+        }
+    }
+
+    @Test
+    @IR(counts = {IRNode.SATURATING_ADD_VI, IRNode.VECTOR_SIZE_ANY, " 2 "}, applyIfCPUFeature = {"avx2", "true"})
+    public void testVectorIRSharing3(int index) {
+        IntVector vec1 = IntVector.fromArray(I_SPECIES, ia, index);
+        IntVector vec2 = IntVector.fromArray(I_SPECIES, ib, index);
+        vec1.lanewise(VectorOperators.SADD, vec2)
+            .lanewise(VectorOperators.SADD, vec2.lanewise(VectorOperators.SADD, vec1))
+            .intoArray(ir4, index);
+    }
+
+    @Run(test = "testVectorIRSharing3")
+    public void testVectorIRSharingDriver3() {
+        for (int i = 0; i < I_SPECIES.loopBound(LENGTH); i += I_SPECIES.length()) {
+            testVectorIRSharing3(i);
+        }
+        checkVectorIRSharing3();
+    }
+
+    public void checkVectorIRSharing3() {
+        for (int i = 0; i < I_SPECIES.loopBound(LENGTH); i++) {
+            Verify.checkEQ(ir4[i], VectorMath.addSaturating(VectorMath.addSaturating(ia[i], ib[i]),
+                                                            VectorMath.addSaturating(ib[i], ia[i])));
+        }
+    }
+
+    @Test
+    @IR(counts = {IRNode.ADD_VI, IRNode.VECTOR_SIZE_ANY, " 2 "}, applyIfCPUFeature = {"avx", "true"})
+    public void testVectorIRSharing4(int index) {
+        IntVector vec1 = IntVector.fromArray(I_SPECIES, ia, index);
+        IntVector vec2 = IntVector.fromArray(I_SPECIES, ib, index);
+        // (vec1 + vec1) + (vec1 + vec1)
+        vec1.lanewise(VectorOperators.ADD, vec1)
+            .lanewise(VectorOperators.ADD, vec1.lanewise(VectorOperators.ADD, vec1))
+            .intoArray(ir1, index);
+    }
+
+    @Run(test = "testVectorIRSharing4")
+    public void testVectorIRSharingDriver4() {
+        for (int i = 0; i < I_SPECIES.loopBound(LENGTH); i += I_SPECIES.length()) {
+            testVectorIRSharing4(i);
+        }
+        checkVectorIRSharing4();
+    }
+
+    public void checkVectorIRSharing4() {
+        for (int i = 0; i < I_SPECIES.loopBound(LENGTH); i++) {
+            Verify.checkEQ(ir1[i], (ia[i] + ia[i]) + (ia[i] + ia[i]));
+        }
+    }
+
+    @Test
+    @IR(counts = {IRNode.ADD_VI, IRNode.VECTOR_SIZE_ANY, " 3 "}, applyIfCPUFeature = {"avx", "true"})
+    public void testVectorIRSharing5(int index) {
+        IntVector vec1 = IntVector.fromArray(I_SPECIES, ia, index);
+        IntVector vec2 = IntVector.fromArray(I_SPECIES, ib, index);
+        // (vec1 + vec1) + (vec1 + vec2)
+        vec1.lanewise(VectorOperators.ADD, vec1)
+            .lanewise(VectorOperators.ADD, vec1.lanewise(VectorOperators.ADD, vec2))
+            .intoArray(ir1, index);
+    }
+
+    @Run(test = "testVectorIRSharing5")
+    public void testVectorIRSharingDriver5() {
+        for (int i = 0; i < I_SPECIES.loopBound(LENGTH); i += I_SPECIES.length()) {
+            testVectorIRSharing5(i);
+        }
+        checkVectorIRSharing5();
+    }
+
+    public void checkVectorIRSharing5() {
+        for (int i = 0; i < I_SPECIES.loopBound(LENGTH); i++) {
+            Verify.checkEQ(ir1[i], (ia[i] + ia[i]) + (ia[i] + ib[i]));
+        }
+    }
+
+    @Test
+    @IR(counts = {IRNode.ADD_VI, IRNode.VECTOR_SIZE_ANY, " 3 "}, applyIfCPUFeature = {"avx", "true"})
+    public void testVectorIRSharing6(int index) {
+        IntVector vec1 = IntVector.fromArray(I_SPECIES, ia, index);
+        IntVector vec2 = IntVector.fromArray(I_SPECIES, ib, index);
+        // (vec1 + vec1) + (vec2 + vec1)
+        vec1.lanewise(VectorOperators.ADD, vec1)
+            .lanewise(VectorOperators.ADD, vec2.lanewise(VectorOperators.ADD, vec1))
+            .intoArray(ir1, index);
+    }
+
+    @Run(test = "testVectorIRSharing6")
+    public void testVectorIRSharingDriver6() {
+        for (int i = 0; i < I_SPECIES.loopBound(LENGTH); i += I_SPECIES.length()) {
+            testVectorIRSharing6(i);
+        }
+        checkVectorIRSharing6();
+    }
+
+    public void checkVectorIRSharing6() {
+        for (int i = 0; i < I_SPECIES.loopBound(LENGTH); i++) {
+            Verify.checkEQ(ir1[i], (ia[i] + ia[i]) + (ib[i] + ia[i]));
+        }
+    }
+
+    @Test
+    @IR(counts = {IRNode.ADD_VI, IRNode.VECTOR_SIZE_ANY, " 3 "}, applyIfCPUFeature = {"avx", "true"})
+    public void testVectorIRSharing7(int index) {
+        IntVector vec1 = IntVector.fromArray(I_SPECIES, ia, index);
+        IntVector vec2 = IntVector.fromArray(I_SPECIES, ib, index);
+        // (vec1 + vec1) + (vec2 + vec2)
+        vec1.lanewise(VectorOperators.ADD, vec1)
+            .lanewise(VectorOperators.ADD, vec2.lanewise(VectorOperators.ADD, vec2))
+            .intoArray(ir1, index);
+    }
+
+    @Run(test = "testVectorIRSharing7")
+    public void testVectorIRSharingDriver7() {
+        for (int i = 0; i < I_SPECIES.loopBound(LENGTH); i += I_SPECIES.length()) {
+            testVectorIRSharing7(i);
+        }
+        checkVectorIRSharing7();
+    }
+
+    public void checkVectorIRSharing7() {
+        for (int i = 0; i < I_SPECIES.loopBound(LENGTH); i++) {
+            Verify.checkEQ(ir1[i], (ia[i] + ia[i]) + (ib[i] + ib[i]));
+        }
+    }
+
+    @Test
+    @IR(counts = {IRNode.ADD_VI, IRNode.VECTOR_SIZE_ANY, " 3 "}, applyIfCPUFeature = {"avx", "true"})
+    public void testVectorIRSharing8(int index) {
+        IntVector vec1 = IntVector.fromArray(I_SPECIES, ia, index);
+        IntVector vec2 = IntVector.fromArray(I_SPECIES, ib, index);
+        // (vec1 + vec2) + (vec1 + vec1)
+        vec1.lanewise(VectorOperators.ADD, vec2)
+            .lanewise(VectorOperators.ADD, vec1.lanewise(VectorOperators.ADD, vec1))
+            .intoArray(ir1, index);
+    }
+
+    @Run(test = "testVectorIRSharing8")
+    public void testVectorIRSharingDriver8() {
+        for (int i = 0; i < I_SPECIES.loopBound(LENGTH); i += I_SPECIES.length()) {
+            testVectorIRSharing8(i);
+        }
+        checkVectorIRSharing8();
+    }
+
+    public void checkVectorIRSharing8() {
+        for (int i = 0; i < I_SPECIES.loopBound(LENGTH); i++) {
+            Verify.checkEQ(ir1[i], (ia[i] + ib[i]) + (ia[i] + ia[i]));
+        }
+    }
+
+    @Test
+    @IR(counts = {IRNode.ADD_VI, IRNode.VECTOR_SIZE_ANY, " 2 "}, applyIfCPUFeature = {"avx", "true"})
+    public void testVectorIRSharing9(int index) {
+        IntVector vec1 = IntVector.fromArray(I_SPECIES, ia, index);
+        IntVector vec2 = IntVector.fromArray(I_SPECIES, ib, index);
+        // (vec1 + vec2) + (vec1 + vec2)
+        vec1.lanewise(VectorOperators.ADD, vec2)
+            .lanewise(VectorOperators.ADD, vec1.lanewise(VectorOperators.ADD, vec2))
+            .intoArray(ir1, index);
+    }
+
+    @Run(test = "testVectorIRSharing9")
+    public void testVectorIRSharingDriver9() {
+        for (int i = 0; i < I_SPECIES.loopBound(LENGTH); i += I_SPECIES.length()) {
+            testVectorIRSharing9(i);
+        }
+        checkVectorIRSharing9();
+    }
+
+    public void checkVectorIRSharing9() {
+        for (int i = 0; i < I_SPECIES.loopBound(LENGTH); i++) {
+            Verify.checkEQ(ir1[i], (ia[i] + ib[i]) + (ia[i] + ib[i]));
+        }
+    }
+
+    @Test
+    @IR(counts = {IRNode.ADD_VI, IRNode.VECTOR_SIZE_ANY, " 2 "}, applyIfCPUFeature = {"avx", "true"})
+    public void testVectorIRSharing10(int index) {
+        IntVector vec1 = IntVector.fromArray(I_SPECIES, ia, index);
+        IntVector vec2 = IntVector.fromArray(I_SPECIES, ib, index);
+        // (vec1 + vec2) + (vec2 + vec1)
+        vec1.lanewise(VectorOperators.ADD, vec2)
+            .lanewise(VectorOperators.ADD, vec2.lanewise(VectorOperators.ADD, vec1))
+            .intoArray(ir1, index);
+    }
+
+    @Run(test = "testVectorIRSharing10")
+    public void testVectorIRSharingDriver10() {
+        for (int i = 0; i < I_SPECIES.loopBound(LENGTH); i += I_SPECIES.length()) {
+            testVectorIRSharing10(i);
+        }
+        checkVectorIRSharing10();
+    }
+
+    public void checkVectorIRSharing10() {
+        for (int i = 0; i < I_SPECIES.loopBound(LENGTH); i++) {
+            Verify.checkEQ(ir1[i], (ia[i] + ib[i]) + (ib[i] + ia[i]));
+        }
+    }
+
+    @Test
+    @IR(counts = {IRNode.ADD_VI, IRNode.VECTOR_SIZE_ANY, " 3 "}, applyIfCPUFeature = {"avx", "true"})
+    public void testVectorIRSharing11(int index) {
+        IntVector vec1 = IntVector.fromArray(I_SPECIES, ia, index);
+        IntVector vec2 = IntVector.fromArray(I_SPECIES, ib, index);
+        // (vec1 + vec2) + (vec2 + vec2)
+        vec1.lanewise(VectorOperators.ADD, vec2)
+            .lanewise(VectorOperators.ADD, vec2.lanewise(VectorOperators.ADD, vec2))
+            .intoArray(ir1, index);
+    }
+
+    @Run(test = "testVectorIRSharing11")
+    public void testVectorIRSharingDriver11() {
+        for (int i = 0; i < I_SPECIES.loopBound(LENGTH); i += I_SPECIES.length()) {
+            testVectorIRSharing11(i);
+        }
+        checkVectorIRSharing11();
+    }
+
+    public void checkVectorIRSharing11() {
+        for (int i = 0; i < I_SPECIES.loopBound(LENGTH); i++) {
+            Verify.checkEQ(ir1[i], (ia[i] + ib[i]) + (ib[i] + ib[i]));
+        }
+    }
+
+    @Test
+    @IR(counts = {IRNode.ADD_VI, IRNode.VECTOR_SIZE_ANY, " 3 "}, applyIfCPUFeature = {"avx", "true"})
+    public void testVectorIRSharing12(int index) {
+        IntVector vec1 = IntVector.fromArray(I_SPECIES, ia, index);
+        IntVector vec2 = IntVector.fromArray(I_SPECIES, ib, index);
+        // (vec2 + vec1) + (vec1 + vec1)
+        vec2.lanewise(VectorOperators.ADD, vec1)
+            .lanewise(VectorOperators.ADD, vec1.lanewise(VectorOperators.ADD, vec1))
+            .intoArray(ir1, index);
+    }
+
+    @Run(test = "testVectorIRSharing12")
+    public void testVectorIRSharingDriver12() {
+        for (int i = 0; i < I_SPECIES.loopBound(LENGTH); i += I_SPECIES.length()) {
+            testVectorIRSharing12(i);
+        }
+        checkVectorIRSharing12();
+    }
+
+    public void checkVectorIRSharing12() {
+        for (int i = 0; i < I_SPECIES.loopBound(LENGTH); i++) {
+            Verify.checkEQ(ir1[i], (ib[i] + ia[i]) + (ia[i] + ia[i]));
+        }
+    }
+
+    @Test
+    @IR(counts = {IRNode.ADD_VI, IRNode.VECTOR_SIZE_ANY, " 2 "}, applyIfCPUFeature = {"avx", "true"})
+    public void testVectorIRSharing13(int index) {
+        IntVector vec1 = IntVector.fromArray(I_SPECIES, ia, index);
+        IntVector vec2 = IntVector.fromArray(I_SPECIES, ib, index);
+        // (vec2 + vec1) + (vec1 + vec2)
+        vec2.lanewise(VectorOperators.ADD, vec1)
+            .lanewise(VectorOperators.ADD, vec1.lanewise(VectorOperators.ADD, vec2))
+            .intoArray(ir1, index);
+    }
+
+    @Run(test = "testVectorIRSharing13")
+    public void testVectorIRSharingDriver13() {
+        for (int i = 0; i < I_SPECIES.loopBound(LENGTH); i += I_SPECIES.length()) {
+            testVectorIRSharing13(i);
+        }
+        checkVectorIRSharing13();
+    }
+
+    public void checkVectorIRSharing13() {
+        for (int i = 0; i < I_SPECIES.loopBound(LENGTH); i++) {
+            Verify.checkEQ(ir1[i], (ib[i] + ia[i]) + (ia[i] + ib[i]));
+        }
+    }
+
+    @Test
+    @IR(counts = {IRNode.ADD_VI, IRNode.VECTOR_SIZE_ANY, " 2 "}, applyIfCPUFeature = {"avx", "true"})
+    public void testVectorIRSharing14(int index) {
+        IntVector vec1 = IntVector.fromArray(I_SPECIES, ia, index);
+        IntVector vec2 = IntVector.fromArray(I_SPECIES, ib, index);
+        // (vec2 + vec1) + (vec2 + vec1)
+        vec2.lanewise(VectorOperators.ADD, vec1)
+            .lanewise(VectorOperators.ADD, vec2.lanewise(VectorOperators.ADD, vec1))
+            .intoArray(ir1, index);
+    }
+
+    @Run(test = "testVectorIRSharing14")
+    public void testVectorIRSharingDriver14() {
+        for (int i = 0; i < I_SPECIES.loopBound(LENGTH); i += I_SPECIES.length()) {
+            testVectorIRSharing14(i);
+        }
+        checkVectorIRSharing14();
+    }
+
+    public void checkVectorIRSharing14() {
+        for (int i = 0; i < I_SPECIES.loopBound(LENGTH); i++) {
+            Verify.checkEQ(ir1[i], (ib[i] + ia[i]) + (ib[i] + ia[i]));
+        }
+    }
+
+    @Test
+    @IR(counts = {IRNode.ADD_VI, IRNode.VECTOR_SIZE_ANY, " 3 "}, applyIfCPUFeature = {"avx", "true"})
+    public void testVectorIRSharing15(int index) {
+        IntVector vec1 = IntVector.fromArray(I_SPECIES, ia, index);
+        IntVector vec2 = IntVector.fromArray(I_SPECIES, ib, index);
+        // (vec2 + vec1) + (vec2 + vec2)
+        vec2.lanewise(VectorOperators.ADD, vec1)
+            .lanewise(VectorOperators.ADD, vec2.lanewise(VectorOperators.ADD, vec2))
+            .intoArray(ir1, index);
+    }
+
+    @Run(test = "testVectorIRSharing15")
+    public void testVectorIRSharingDriver15() {
+        for (int i = 0; i < I_SPECIES.loopBound(LENGTH); i += I_SPECIES.length()) {
+            testVectorIRSharing15(i);
+        }
+        checkVectorIRSharing15();
+    }
+
+    public void checkVectorIRSharing15() {
+        for (int i = 0; i < I_SPECIES.loopBound(LENGTH); i++) {
+            Verify.checkEQ(ir1[i], (ib[i] + ia[i]) + (ib[i] + ib[i]));
+        }
+    }
+
+    @Test
+    @IR(counts = {IRNode.ADD_VI, IRNode.VECTOR_SIZE_ANY, " 3 "}, applyIfCPUFeature = {"avx", "true"})
+    public void testVectorIRSharing16(int index) {
+        IntVector vec1 = IntVector.fromArray(I_SPECIES, ia, index);
+        IntVector vec2 = IntVector.fromArray(I_SPECIES, ib, index);
+        // (vec2 + vec2) + (vec1 + vec1)
+        vec2.lanewise(VectorOperators.ADD, vec2)
+            .lanewise(VectorOperators.ADD, vec1.lanewise(VectorOperators.ADD, vec1))
+            .intoArray(ir1, index);
+    }
+
+    @Run(test = "testVectorIRSharing16")
+    public void testVectorIRSharingDriver16() {
+        for (int i = 0; i < I_SPECIES.loopBound(LENGTH); i += I_SPECIES.length()) {
+            testVectorIRSharing16(i);
+        }
+        checkVectorIRSharing16();
+    }
+
+    public void checkVectorIRSharing16() {
+        for (int i = 0; i < I_SPECIES.loopBound(LENGTH); i++) {
+            Verify.checkEQ(ir1[i], (ib[i] + ib[i]) + (ia[i] + ia[i]));
+        }
+    }
+
+    @Test
+    @IR(counts = {IRNode.ADD_VI, IRNode.VECTOR_SIZE_ANY, " 3 "}, applyIfCPUFeature = {"avx", "true"})
+    public void testVectorIRSharing17(int index) {
+        IntVector vec1 = IntVector.fromArray(I_SPECIES, ia, index);
+        IntVector vec2 = IntVector.fromArray(I_SPECIES, ib, index);
+        // (vec2 + vec2) + (vec1 + vec2)
+        vec2.lanewise(VectorOperators.ADD, vec2)
+            .lanewise(VectorOperators.ADD, vec1.lanewise(VectorOperators.ADD, vec2))
+            .intoArray(ir1, index);
+    }
+
+    @Run(test = "testVectorIRSharing17")
+    public void testVectorIRSharingDriver17() {
+        for (int i = 0; i < I_SPECIES.loopBound(LENGTH); i += I_SPECIES.length()) {
+            testVectorIRSharing17(i);
+        }
+        checkVectorIRSharing17();
+    }
+
+    public void checkVectorIRSharing17() {
+        for (int i = 0; i < I_SPECIES.loopBound(LENGTH); i++) {
+            Verify.checkEQ(ir1[i], (ib[i] + ib[i]) + (ia[i] + ib[i]));
+        }
+    }
+
+    @Test
+    @IR(counts = {IRNode.ADD_VI, IRNode.VECTOR_SIZE_ANY, " 3 "}, applyIfCPUFeature = {"avx", "true"})
+    public void testVectorIRSharing18(int index) {
+        IntVector vec1 = IntVector.fromArray(I_SPECIES, ia, index);
+        IntVector vec2 = IntVector.fromArray(I_SPECIES, ib, index);
+        // (vec2 + vec2) + (vec2 + vec1)
+        vec2.lanewise(VectorOperators.ADD, vec2)
+            .lanewise(VectorOperators.ADD, vec2.lanewise(VectorOperators.ADD, vec1))
+            .intoArray(ir1, index);
+    }
+
+    @Run(test = "testVectorIRSharing18")
+    public void testVectorIRSharingDriver18() {
+        for (int i = 0; i < I_SPECIES.loopBound(LENGTH); i += I_SPECIES.length()) {
+            testVectorIRSharing18(i);
+        }
+        checkVectorIRSharing18();
+    }
+
+    public void checkVectorIRSharing18() {
+        for (int i = 0; i < I_SPECIES.loopBound(LENGTH); i++) {
+            Verify.checkEQ(ir1[i], (ib[i] + ib[i]) + (ib[i] + ia[i]));
+        }
+    }
+
+    @Test
+    @IR(counts = {IRNode.ADD_VI, IRNode.VECTOR_SIZE_ANY, " 3 "}, applyIfCPUFeatureOr = {"avx512vl", "true", "sve", "true"})
+    public void testVectorIRSharing19(int index) {
+        VectorMask<Integer> VMASK = VectorMask.fromLong(I_SPECIES, ((1 << 4) - 1));
+        IntVector vec1 = IntVector.fromArray(I_SPECIES, ia, index);
+        IntVector vec2 = IntVector.fromArray(I_SPECIES, ib, index);
+        // PRED:(vec1 + vec2) + PRED:(vec2 + vec1)
+        vec1.lanewise(VectorOperators.ADD, vec2, VMASK)
+            .lanewise(VectorOperators.ADD, vec2.lanewise(VectorOperators.ADD, vec1, VMASK))
+            .intoArray(ir1, index);
+    }
+
+    @Run(test = "testVectorIRSharing19")
+    public void testVectorIRSharingDriver19() {
+        for (int i = 0; i < I_SPECIES.loopBound(LENGTH); i += I_SPECIES.length()) {
+            testVectorIRSharing19(i);
+        }
+        checkVectorIRSharing19();
+    }
+
+    public void checkVectorIRSharing19() {
+        VectorMask<Integer> VMASK = VectorMask.fromLong(I_SPECIES, ((1 << 4) - 1));
+        for (int i = 0; i < I_SPECIES.loopBound(LENGTH); i++) {
+            boolean mask = VMASK.laneIsSet(i & (I_SPECIES.length() - 1));
+            Verify.checkEQ(ir1[i], (mask ? ia[i] + ib[i] : ia[i]) + (mask ? ib[i] + ia[i] : ib[i]));
+        }
+    }
+}
diff --git a/test/micro/org/openjdk/bench/jdk/incubator/vector/VectorCommutativeOperSharingBenchmark.java b/test/micro/org/openjdk/bench/jdk/incubator/vector/VectorCommutativeOperSharingBenchmark.java
new file mode 100644
index 00000000000..91851efa4f3
--- /dev/null
+++ b/test/micro/org/openjdk/bench/jdk/incubator/vector/VectorCommutativeOperSharingBenchmark.java
@@ -0,0 +1,155 @@
+/*
+ *  Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ *  DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ *  This code is free software; you can redistribute it and/or modify it
+ *  under the terms of the GNU General Public License version 2 only, as
+ *  published by the Free Software Foundation.
+ *
+ *  This code is distributed in the hope that it will be useful, but WITHOUT
+ *  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ *  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ *  version 2 for more details (a copy is included in the LICENSE file that
+ *  accompanied this code).
+ *
+ *  You should have received a copy of the GNU General Public License version
+ *  2 along with this work; if not, write to the Free Software Foundation,
+ *  Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ *  Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ *  or visit www.oracle.com if you need additional information or have any
+ *  questions.
+ *
+ */
+
+package org.openjdk.bench.jdk.incubator.vector;
+
+import java.util.Random;
+import java.util.Arrays;
+import jdk.incubator.vector.*;
+import java.util.concurrent.TimeUnit;
+import org.openjdk.jmh.annotations.*;
+
+@OutputTimeUnit(TimeUnit.MILLISECONDS)
+@State(Scope.Thread)
+@Fork(jvmArgsPrepend = {"--add-modules=jdk.incubator.vector"})
+public class VectorCommutativeOperSharingBenchmark {
+    @Param({"1024","2048"})
+    int size;
+
+    byte[] bytesrc1;
+    byte[] bytesrc2;
+    byte[] byteres;
+
+    short[] shortsrc1;
+    short[] shortsrc2;
+    short[] shortres;
+
+    int[] intsrc1;
+    int[] intsrc2;
+    int[] intres;
+
+    long[] longsrc1;
+    long[] longsrc2;
+    long[] longres;
+
+    @Setup(Level.Trial)
+    public void BmSetup() {
+        Random r = new Random(1024);
+        bytesrc1 = new byte[size];
+        bytesrc2 = new byte[size];
+        byteres = new byte[size];
+
+        shortsrc1 = new short[size];
+        shortsrc2 = new short[size];
+        shortres = new short[size];
+
+        intsrc1 = new int[size];
+        intsrc2 = new int[size];
+        intres = new int[size];
+
+        longsrc1 = new long[size];
+        longsrc2 = new long[size];
+        longres = new long[size];
+
+        Arrays.fill(bytesrc1, (byte)1);
+        Arrays.fill(bytesrc2, (byte)2);
+
+        Arrays.fill(shortsrc1, (short)1);
+        Arrays.fill(shortsrc2, (short)2);
+
+        Arrays.fill(intsrc1, 1);
+        Arrays.fill(intsrc2, 2);
+
+        Arrays.fill(longsrc1, 1);
+        Arrays.fill(longsrc2, 2);
+    }
+
+    @Benchmark
+    public void commutativeByteOperationShairing() {
+        for (int i = 0; i < size; i += ByteVector.SPECIES_PREFERRED.length()) {
+            ByteVector vec1 = ByteVector.fromArray(ByteVector.SPECIES_PREFERRED, bytesrc1, i);
+            ByteVector vec2 = ByteVector.fromArray(ByteVector.SPECIES_PREFERRED, bytesrc2, i);
+            vec1.lanewise(VectorOperators.ADD, vec2)
+                 .lanewise(VectorOperators.ADD, vec2.lanewise(VectorOperators.ADD, vec1))
+                 .lanewise(VectorOperators.MUL, vec1.lanewise(VectorOperators.MUL, vec2))
+                 .lanewise(VectorOperators.MUL, vec2.lanewise(VectorOperators.MUL, vec1))
+                 .lanewise(VectorOperators.AND, vec1.lanewise(VectorOperators.AND, vec2))
+                 .lanewise(VectorOperators.AND, vec2.lanewise(VectorOperators.AND, vec1))
+                 .lanewise(VectorOperators.OR, vec1.lanewise(VectorOperators.OR, vec2))
+                 .lanewise(VectorOperators.OR, vec2.lanewise(VectorOperators.OR, vec1))
+                 .intoArray(byteres, i);
+        }
+    }
+
+    @Benchmark
+    public void commutativeShortOperationShairing() {
+        for (int i = 0; i < size; i += ShortVector.SPECIES_PREFERRED.length()) {
+            ShortVector vec1 = ShortVector.fromArray(ShortVector.SPECIES_PREFERRED, shortsrc1, i);
+            ShortVector vec2 = ShortVector.fromArray(ShortVector.SPECIES_PREFERRED, shortsrc2, i);
+            vec1.lanewise(VectorOperators.ADD, vec2)
+                 .lanewise(VectorOperators.ADD, vec2.lanewise(VectorOperators.ADD, vec1))
+                 .lanewise(VectorOperators.MUL, vec1.lanewise(VectorOperators.MUL, vec2))
+                 .lanewise(VectorOperators.MUL, vec2.lanewise(VectorOperators.MUL, vec1))
+                 .lanewise(VectorOperators.AND, vec1.lanewise(VectorOperators.AND, vec2))
+                 .lanewise(VectorOperators.AND, vec2.lanewise(VectorOperators.AND, vec1))
+                 .lanewise(VectorOperators.OR, vec1.lanewise(VectorOperators.OR, vec2))
+                 .lanewise(VectorOperators.OR, vec2.lanewise(VectorOperators.OR, vec1))
+                 .intoArray(shortres, i);
+        }
+    }
+
+    @Benchmark
+    public void commutativeIntOperationShairing() {
+        for (int i = 0; i < size; i += IntVector.SPECIES_PREFERRED.length()) {
+            IntVector vec1 = IntVector.fromArray(IntVector.SPECIES_PREFERRED, intsrc1, i);
+            IntVector vec2 = IntVector.fromArray(IntVector.SPECIES_PREFERRED, intsrc2, i);
+            vec1.lanewise(VectorOperators.ADD, vec2)
+                 .lanewise(VectorOperators.ADD, vec2.lanewise(VectorOperators.ADD, vec1))
+                 .lanewise(VectorOperators.MUL, vec1.lanewise(VectorOperators.MUL, vec2))
+                 .lanewise(VectorOperators.MUL, vec2.lanewise(VectorOperators.MUL, vec1))
+                 .lanewise(VectorOperators.AND, vec1.lanewise(VectorOperators.AND, vec2))
+                 .lanewise(VectorOperators.AND, vec2.lanewise(VectorOperators.AND, vec1))
+                 .lanewise(VectorOperators.OR, vec1.lanewise(VectorOperators.OR, vec2))
+                 .lanewise(VectorOperators.OR, vec2.lanewise(VectorOperators.OR, vec1))
+                 .intoArray(intres, i);
+        }
+    }
+
+    @Benchmark
+    public void commutativeLongOperationShairing() {
+        for (int i = 0; i < size; i += LongVector.SPECIES_PREFERRED.length()) {
+            LongVector vec1 = LongVector.fromArray(LongVector.SPECIES_PREFERRED, longsrc1, i);
+            LongVector vec2 = LongVector.fromArray(LongVector.SPECIES_PREFERRED, longsrc2, i);
+            vec1.lanewise(VectorOperators.ADD, vec2)
+                 .lanewise(VectorOperators.ADD, vec2.lanewise(VectorOperators.ADD, vec1))
+                 .lanewise(VectorOperators.MUL, vec1.lanewise(VectorOperators.MUL, vec2))
+                 .lanewise(VectorOperators.MUL, vec2.lanewise(VectorOperators.MUL, vec1))
+                 .lanewise(VectorOperators.AND, vec1.lanewise(VectorOperators.AND, vec2))
+                 .lanewise(VectorOperators.AND, vec2.lanewise(VectorOperators.AND, vec1))
+                 .lanewise(VectorOperators.OR, vec1.lanewise(VectorOperators.OR, vec2))
+                 .lanewise(VectorOperators.OR, vec2.lanewise(VectorOperators.OR, vec1))
+                 .intoArray(longres, i);
+        }
+    }
+}

From 65f79c145b7b1b32ed064a37ad4d2b6aca935a4c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Erik=20=C3=96sterlund?= <eosterlund@openjdk.org>
Date: Mon, 24 Feb 2025 12:03:42 +0000
Subject: [PATCH 099/587] 8347335: ZGC: Use limitless mark stack memory

Reviewed-by: aboldtch, iwalulya
---
 src/hotspot/share/gc/z/zAddressSpaceLimit.cpp |   6 -
 src/hotspot/share/gc/z/zAddressSpaceLimit.hpp |   1 -
 src/hotspot/share/gc/z/zArguments.cpp         |   9 -
 src/hotspot/share/gc/z/zBarrierSet.cpp        |   2 +-
 src/hotspot/share/gc/z/zGeneration.cpp        |   8 +-
 src/hotspot/share/gc/z/zGeneration.hpp        |   4 +-
 src/hotspot/share/gc/z/zGlobals.hpp           |  11 -
 src/hotspot/share/gc/z/zHeap.cpp              |   8 +-
 src/hotspot/share/gc/z/zHeap.hpp              |   2 +-
 src/hotspot/share/gc/z/zInitialize.cpp        |   1 -
 src/hotspot/share/gc/z/zMark.cpp              |  66 ++--
 src/hotspot/share/gc/z/zMark.hpp              |  31 +-
 src/hotspot/share/gc/z/zMark.inline.hpp       |   2 +-
 src/hotspot/share/gc/z/zMarkStack.cpp         | 332 +++++++++++-------
 src/hotspot/share/gc/z/zMarkStack.hpp         | 118 +++----
 src/hotspot/share/gc/z/zMarkStack.inline.hpp  | 207 ++++-------
 .../share/gc/z/zMarkStackAllocator.cpp        | 236 -------------
 .../share/gc/z/zMarkTerminate.inline.hpp      |   4 +-
 src/hotspot/share/gc/z/zMarkingSMR.cpp        | 112 ++++++
 ...MarkStackAllocator.hpp => zMarkingSMR.hpp} |  67 +---
 src/hotspot/share/gc/z/zRemembered.cpp        |   2 +-
 src/hotspot/share/gc/z/zStat.cpp              |   9 +-
 src/hotspot/share/gc/z/zStat.hpp              |   1 -
 src/hotspot/share/gc/z/z_globals.hpp          |   4 -
 src/hotspot/share/runtime/arguments.cpp       |   1 +
 25 files changed, 504 insertions(+), 740 deletions(-)
 delete mode 100644 src/hotspot/share/gc/z/zMarkStackAllocator.cpp
 create mode 100644 src/hotspot/share/gc/z/zMarkingSMR.cpp
 rename src/hotspot/share/gc/z/{zMarkStackAllocator.hpp => zMarkingSMR.hpp} (50%)

diff --git a/src/hotspot/share/gc/z/zAddressSpaceLimit.cpp b/src/hotspot/share/gc/z/zAddressSpaceLimit.cpp
index c737644472c..fc42d9f3db1 100644
--- a/src/hotspot/share/gc/z/zAddressSpaceLimit.cpp
+++ b/src/hotspot/share/gc/z/zAddressSpaceLimit.cpp
@@ -39,12 +39,6 @@ static size_t address_space_limit() {
   return SIZE_MAX;
 }
 
-size_t ZAddressSpaceLimit::mark_stack() {
-  // Allow mark stacks to occupy 10% of the address space
-  const size_t limit = address_space_limit() / 10;
-  return align_up(limit, ZMarkStackSpaceExpandSize);
-}
-
 size_t ZAddressSpaceLimit::heap() {
   // Allow the heap to occupy 50% of the address space
   const size_t limit = address_space_limit() / MaxVirtMemFraction;
diff --git a/src/hotspot/share/gc/z/zAddressSpaceLimit.hpp b/src/hotspot/share/gc/z/zAddressSpaceLimit.hpp
index d8e7e7cfd36..66e01f0ebb0 100644
--- a/src/hotspot/share/gc/z/zAddressSpaceLimit.hpp
+++ b/src/hotspot/share/gc/z/zAddressSpaceLimit.hpp
@@ -29,7 +29,6 @@
 
 class ZAddressSpaceLimit : public AllStatic {
 public:
-  static size_t mark_stack();
   static size_t heap();
 };
 
diff --git a/src/hotspot/share/gc/z/zArguments.cpp b/src/hotspot/share/gc/z/zArguments.cpp
index 7c082252133..ee761d03e18 100644
--- a/src/hotspot/share/gc/z/zArguments.cpp
+++ b/src/hotspot/share/gc/z/zArguments.cpp
@@ -120,15 +120,6 @@ void ZArguments::select_max_gc_threads() {
 void ZArguments::initialize() {
   GCArguments::initialize();
 
-  // Check mark stack size
-  const size_t mark_stack_space_limit = ZAddressSpaceLimit::mark_stack();
-  if (ZMarkStackSpaceLimit > mark_stack_space_limit) {
-    if (!FLAG_IS_DEFAULT(ZMarkStackSpaceLimit)) {
-      vm_exit_during_initialization("ZMarkStackSpaceLimit too large for limited address space");
-    }
-    FLAG_SET_DEFAULT(ZMarkStackSpaceLimit, mark_stack_space_limit);
-  }
-
   // Enable NUMA by default
   if (FLAG_IS_DEFAULT(UseNUMA)) {
     FLAG_SET_DEFAULT(UseNUMA, true);
diff --git a/src/hotspot/share/gc/z/zBarrierSet.cpp b/src/hotspot/share/gc/z/zBarrierSet.cpp
index f88a593b1c3..a4893fc351a 100644
--- a/src/hotspot/share/gc/z/zBarrierSet.cpp
+++ b/src/hotspot/share/gc/z/zBarrierSet.cpp
@@ -101,7 +101,7 @@ void ZBarrierSet::on_thread_attach(Thread* thread) {
 
 void ZBarrierSet::on_thread_detach(Thread* thread) {
   // Flush and free any remaining mark stacks
-  ZHeap::heap()->mark_flush_and_free(thread);
+  ZHeap::heap()->mark_flush(thread);
 }
 
 static void deoptimize_allocation(JavaThread* thread) {
diff --git a/src/hotspot/share/gc/z/zGeneration.cpp b/src/hotspot/share/gc/z/zGeneration.cpp
index 9a2535d527f..0dc8e93b8e7 100644
--- a/src/hotspot/share/gc/z/zGeneration.cpp
+++ b/src/hotspot/share/gc/z/zGeneration.cpp
@@ -131,10 +131,6 @@ ZGeneration::ZGeneration(ZGenerationId id, ZPageTable* page_table, ZPageAllocato
     _stat_relocation(),
     _gc_timer(nullptr) {}
 
-bool ZGeneration::is_initialized() const {
-  return _mark.is_initialized();
-}
-
 ZWorkers* ZGeneration::workers() {
   return &_workers;
 }
@@ -151,8 +147,8 @@ void ZGeneration::threads_do(ThreadClosure* tc) const {
   _workers.threads_do(tc);
 }
 
-void ZGeneration::mark_flush_and_free(Thread* thread) {
-  _mark.flush_and_free(thread);
+void ZGeneration::mark_flush(Thread* thread) {
+  _mark.flush(thread);
 }
 
 void ZGeneration::mark_free() {
diff --git a/src/hotspot/share/gc/z/zGeneration.hpp b/src/hotspot/share/gc/z/zGeneration.hpp
index 3e18919eee4..2670ab51699 100644
--- a/src/hotspot/share/gc/z/zGeneration.hpp
+++ b/src/hotspot/share/gc/z/zGeneration.hpp
@@ -99,8 +99,6 @@ protected:
   void log_phase_switch(Phase from, Phase to);
 
 public:
-  bool is_initialized() const;
-
   // GC phases
   void set_phase(Phase new_phase);
   bool is_phase_relocate() const;
@@ -161,7 +159,7 @@ public:
   void mark_object(zaddress addr);
   template <bool resurrect, bool gc_thread, bool follow, bool finalizable>
   void mark_object_if_active(zaddress addr);
-  void mark_flush_and_free(Thread* thread);
+  void mark_flush(Thread* thread);
 
   // Relocation
   void synchronize_relocation();
diff --git a/src/hotspot/share/gc/z/zGlobals.hpp b/src/hotspot/share/gc/z/zGlobals.hpp
index f7c0a3eaa26..918301b1853 100644
--- a/src/hotspot/share/gc/z/zGlobals.hpp
+++ b/src/hotspot/share/gc/z/zGlobals.hpp
@@ -67,17 +67,6 @@ const int         ZObjectAlignmentLarge         = 1 << ZObjectAlignmentLargeShif
 const size_t      ZCacheLineSize                = ZPlatformCacheLineSize;
 #define           ZCACHE_ALIGNED                ATTRIBUTE_ALIGNED(ZCacheLineSize)
 
-// Mark stack space
-const size_t      ZMarkStackSpaceExpandSize     = (size_t)1 << 25; // 32M
-
-// Mark stack and magazine sizes
-const size_t      ZMarkStackSizeShift           = 11; // 2K
-const size_t      ZMarkStackSize                = (size_t)1 << ZMarkStackSizeShift;
-const size_t      ZMarkStackHeaderSize          = (size_t)1 << 4; // 16B
-const size_t      ZMarkStackSlots               = (ZMarkStackSize - ZMarkStackHeaderSize) / sizeof(uintptr_t);
-const size_t      ZMarkStackMagazineSize        = (size_t)1 << 15; // 32K
-const size_t      ZMarkStackMagazineSlots       = (ZMarkStackMagazineSize / ZMarkStackSize) - 1;
-
 // Mark stripe size
 const size_t      ZMarkStripeShift              = ZGranuleSizeShift;
 
diff --git a/src/hotspot/share/gc/z/zHeap.cpp b/src/hotspot/share/gc/z/zHeap.cpp
index 7169b915cb5..bca9e2f8c41 100644
--- a/src/hotspot/share/gc/z/zHeap.cpp
+++ b/src/hotspot/share/gc/z/zHeap.cpp
@@ -68,7 +68,7 @@ ZHeap::ZHeap()
   assert(_heap == nullptr, "Already initialized");
   _heap = this;
 
-  if (!_page_allocator.is_initialized() || !_young.is_initialized() || !_old.is_initialized()) {
+  if (!_page_allocator.is_initialized()) {
     return;
   }
 
@@ -271,9 +271,9 @@ void ZHeap::keep_alive(oop obj) {
   ZBarrier::mark<ZMark::Resurrect, ZMark::AnyThread, ZMark::Follow, ZMark::Strong>(addr);
 }
 
-void ZHeap::mark_flush_and_free(Thread* thread) {
-  _young.mark_flush_and_free(thread);
-  _old.mark_flush_and_free(thread);
+void ZHeap::mark_flush(Thread* thread) {
+  _young.mark_flush(thread);
+  _old.mark_flush(thread);
 }
 
 bool ZHeap::is_allocating(zaddress addr) const {
diff --git a/src/hotspot/share/gc/z/zHeap.hpp b/src/hotspot/share/gc/z/zHeap.hpp
index 955cdf6fd79..4bf4727c3e3 100644
--- a/src/hotspot/share/gc/z/zHeap.hpp
+++ b/src/hotspot/share/gc/z/zHeap.hpp
@@ -99,7 +99,7 @@ public:
   bool is_object_live(zaddress addr) const;
   bool is_object_strongly_live(zaddress addr) const;
   void keep_alive(oop obj);
-  void mark_flush_and_free(Thread* thread);
+  void mark_flush(Thread* thread);
 
   // Page allocation
   ZPage* alloc_page(ZPageType type, size_t size, ZAllocationFlags flags, ZPageAge age);
diff --git a/src/hotspot/share/gc/z/zInitialize.cpp b/src/hotspot/share/gc/z/zInitialize.cpp
index a8d6a32a7d5..125231355ac 100644
--- a/src/hotspot/share/gc/z/zInitialize.cpp
+++ b/src/hotspot/share/gc/z/zInitialize.cpp
@@ -31,7 +31,6 @@
 #include "gc/z/zInitialize.hpp"
 #include "gc/z/zJNICritical.hpp"
 #include "gc/z/zLargePages.hpp"
-#include "gc/z/zMarkStackAllocator.hpp"
 #include "gc/z/zNMT.hpp"
 #include "gc/z/zNUMA.hpp"
 #include "gc/z/zStat.hpp"
diff --git a/src/hotspot/share/gc/z/zMark.cpp b/src/hotspot/share/gc/z/zMark.cpp
index 554cef8cec5..e0c68213ca3 100644
--- a/src/hotspot/share/gc/z/zMark.cpp
+++ b/src/hotspot/share/gc/z/zMark.cpp
@@ -81,8 +81,8 @@ static const ZStatSubPhase ZSubPhaseConcurrentMarkRootColoredOld("Concurrent Mar
 ZMark::ZMark(ZGeneration* generation, ZPageTable* page_table)
   : _generation(generation),
     _page_table(page_table),
-    _allocator(),
-    _stripes(_allocator.start()),
+    _marking_smr(),
+    _stripes(),
     _terminate(),
     _work_nproactiveflush(0),
     _work_nterminateflush(0),
@@ -92,10 +92,6 @@ ZMark::ZMark(ZGeneration* generation, ZPageTable* page_table)
     _ncontinue(0),
     _nworkers(0) {}
 
-bool ZMark::is_initialized() const {
-  return _allocator.is_initialized();
-}
-
 size_t ZMark::calculate_nstripes(uint nworkers) const {
   // Calculate the number of stripes from the number of workers we use,
   // where the number of stripes must be a power of two and we want to
@@ -196,7 +192,7 @@ void ZMark::push_partial_array(zpointer* addr, size_t length, bool finalizable)
   log_develop_trace(gc, marking)("Array push partial: " PTR_FORMAT " (%zu), stripe: %zu",
                                  p2i(addr), length, _stripes.stripe_id(stripe));
 
-  stacks->push(&_allocator, &_stripes, stripe, &_terminate, entry, false /* publish */);
+  stacks->push(&_stripes, stripe, &_terminate, entry, false /* publish */);
 }
 
 static void mark_barrier_on_oop_array(volatile zpointer* p, size_t length, bool finalizable, bool young) {
@@ -471,21 +467,26 @@ bool ZMark::rebalance_work(ZMarkContext* context) {
   const size_t nstripes = _stripes.nstripes();
 
   if (assumed_nstripes != nstripes) {
+    // The number of stripes has changed; reflect that change locally
     context->set_nstripes(nstripes);
-  } else if (nstripes < calculate_nstripes(_nworkers) && _allocator.clear_and_get_expanded_recently()) {
+  } else if (nstripes < calculate_nstripes(_nworkers) && _stripes.is_crowded()) {
+    // We are running on a reduced number of threads to minimize the amount of work
+    // hidden in local stacks when the stripes are less well balanced. When this situation
+    // starts getting crowded, we bump the number of stripes again.
     const size_t new_nstripes = nstripes << 1;
-    _stripes.set_nstripes(new_nstripes);
-    context->set_nstripes(new_nstripes);
+    if (_stripes.try_set_nstripes(nstripes, new_nstripes)) {
+      context->set_nstripes(new_nstripes);
+    }
   }
 
   ZMarkStripe* stripe = _stripes.stripe_for_worker(_nworkers, WorkerThread::worker_id());
   if (context->stripe() != stripe) {
     // Need to switch stripe
     context->set_stripe(stripe);
-    flush_and_free();
+    flush(Thread::current());
   } else if (!_terminate.saturated()) {
     // Work imbalance detected; striped marking is likely going to be in the way
-    flush_and_free();
+    flush(Thread::current());
   }
 
   SuspendibleThreadSet::yield();
@@ -502,7 +503,7 @@ bool ZMark::drain(ZMarkContext* context) {
   context->set_nstripes(_stripes.nstripes());
 
   // Drain stripe stacks
-  while (stacks->pop(&_allocator, &_stripes, context->stripe(), entry)) {
+  while (stacks->pop(&_marking_smr, &_stripes, context->stripe(), &entry)) {
     mark_and_follow(context, entry);
 
     if ((processed++ & 31) == 0 && rebalance_work(context)) {
@@ -541,7 +542,7 @@ bool ZMark::try_steal_global(ZMarkContext* context) {
   for (ZMarkStripe* victim_stripe = _stripes.stripe_next(stripe);
        victim_stripe != stripe;
        victim_stripe = _stripes.stripe_next(victim_stripe)) {
-    ZMarkStack* const stack = victim_stripe->steal_stack();
+    ZMarkStack* const stack = victim_stripe->steal_stack(&_marking_smr);
     if (stack != nullptr) {
       // Success, install the stolen stack
       stacks->install(&_stripes, stripe, stack);
@@ -557,19 +558,19 @@ bool ZMark::try_steal(ZMarkContext* context) {
   return try_steal_local(context) || try_steal_global(context);
 }
 
-class ZMarkFlushAndFreeStacksClosure : public HandshakeClosure {
+class ZMarkFlushStacksClosure : public HandshakeClosure {
 private:
   ZMark* const _mark;
   bool         _flushed;
 
 public:
-  ZMarkFlushAndFreeStacksClosure(ZMark* mark)
-    : HandshakeClosure("ZMarkFlushAndFreeStacks"),
+  ZMarkFlushStacksClosure(ZMark* mark)
+    : HandshakeClosure("ZMarkFlushStacks"),
       _mark(mark),
       _flushed(false) {}
 
   void do_thread(Thread* thread) {
-    if (_mark->flush_and_free(thread)) {
+    if (_mark->flush(thread)) {
       _flushed = true;
       if (SafepointSynchronize::is_at_safepoint()) {
         log_debug(gc, marking)("Thread broke mark termination %s", thread->name());
@@ -606,7 +607,7 @@ public:
 };
 
 bool ZMark::flush() {
-  ZMarkFlushAndFreeStacksClosure cl(this);
+  ZMarkFlushStacksClosure cl(this);
   VM_ZMarkFlushOperation vm_cl(&cl);
   Handshake::execute(&cl);
   VMThread::execute(&vm_cl);
@@ -623,8 +624,7 @@ bool ZMark::try_terminate_flush() {
     verify_worker_stacks_empty();
   }
 
-  return flush() ||
-         _terminate.resurrected();
+  return flush() || _terminate.resurrected();
 }
 
 bool ZMark::try_proactive_flush() {
@@ -850,7 +850,7 @@ public:
     // the set of workers executing during root scanning
     // can be different from the set of workers executing
     // during mark.
-    ZHeap::heap()->mark_flush_and_free(Thread::current());
+    ZHeap::heap()->mark_flush(Thread::current());
   }
 };
 
@@ -908,7 +908,7 @@ public:
     // the set of workers executing during root scanning
     // can be different from the set of workers executing
     // during mark.
-    ZHeap::heap()->mark_flush_and_free(Thread::current());
+    ZHeap::heap()->mark_flush(Thread::current());
   }
 };
 
@@ -934,7 +934,7 @@ public:
     // publish such marking stacks to prevent that generation from getting a mark continue.
     // We also flush in case of a resize where a new worker thread continues the marking
     // work, causing a mark continue for the collected generation.
-    ZHeap::heap()->mark_flush_and_free(Thread::current());
+    ZHeap::heap()->mark_flush(Thread::current());
   }
 
   virtual void resize_workers(uint nworkers) {
@@ -978,7 +978,7 @@ bool ZMark::try_end() {
   }
 
   // Try end marking
-  ZMarkFlushAndFreeStacksClosure cl(this);
+  ZMarkFlushStacksClosure cl(this);
   Threads::non_java_threads_do(&cl);
 
   // Check if non-java threads have any pending marking
@@ -1012,25 +1012,15 @@ bool ZMark::end() {
 
 void ZMark::free() {
   // Free any unused mark stack space
-  _allocator.free();
-
-  // Update statistics
-  _generation->stat_mark()->at_mark_free(_allocator.size());
+  _marking_smr.free();
 }
 
-void ZMark::flush_and_free() {
-  Thread* const thread = Thread::current();
-  flush_and_free(thread);
-}
-
-bool ZMark::flush_and_free(Thread* thread) {
+bool ZMark::flush(Thread* thread) {
   if (thread->is_Java_thread()) {
     ZThreadLocalData::store_barrier_buffer(thread)->flush();
   }
   ZMarkThreadLocalStacks* const stacks = ZThreadLocalData::mark_stacks(thread, _generation->id());
-  const bool flushed = stacks->flush(&_allocator, &_stripes, &_terminate);
-  stacks->free(&_allocator);
-  return flushed;
+  return stacks->flush(&_stripes, &_terminate);
 }
 
 class ZVerifyMarkStacksEmptyClosure : public ThreadClosure {
diff --git a/src/hotspot/share/gc/z/zMark.hpp b/src/hotspot/share/gc/z/zMark.hpp
index 552bf3b959d..07e73849af6 100644
--- a/src/hotspot/share/gc/z/zMark.hpp
+++ b/src/hotspot/share/gc/z/zMark.hpp
@@ -25,8 +25,8 @@
 #define SHARE_GC_Z_ZMARK_HPP
 
 #include "gc/z/zAddress.hpp"
+#include "gc/z/zMarkingSMR.hpp"
 #include "gc/z/zMarkStack.hpp"
-#include "gc/z/zMarkStackAllocator.hpp"
 #include "gc/z/zMarkStackEntry.hpp"
 #include "gc/z/zMarkTerminate.hpp"
 #include "oops/oopsHierarchy.hpp"
@@ -55,18 +55,18 @@ public:
   static const bool Finalizable   = true;
 
 private:
-  ZGeneration* const  _generation;
-  ZPageTable* const   _page_table;
-  ZMarkStackAllocator _allocator;
-  ZMarkStripeSet      _stripes;
-  ZMarkTerminate      _terminate;
-  volatile size_t     _work_nproactiveflush;
-  volatile size_t     _work_nterminateflush;
-  size_t              _nproactiveflush;
-  size_t              _nterminateflush;
-  size_t              _ntrycomplete;
-  size_t              _ncontinue;
-  uint                _nworkers;
+  ZGeneration* const _generation;
+  ZPageTable* const  _page_table;
+  ZMarkingSMR        _marking_smr;
+  ZMarkStripeSet     _stripes;
+  ZMarkTerminate     _terminate;
+  volatile size_t    _work_nproactiveflush;
+  volatile size_t    _work_nterminateflush;
+  size_t             _nproactiveflush;
+  size_t             _nterminateflush;
+  size_t             _ntrycomplete;
+  size_t             _ncontinue;
+  uint               _nworkers;
 
   size_t calculate_nstripes(uint nworkers) const;
 
@@ -101,8 +101,6 @@ private:
 public:
   ZMark(ZGeneration* generation, ZPageTable* page_table);
 
-  bool is_initialized() const;
-
   template <bool resurrect, bool gc_thread, bool follow, bool finalizable>
   void mark_object(zaddress addr);
 
@@ -113,8 +111,7 @@ public:
   bool end();
   void free();
 
-  void flush_and_free();
-  bool flush_and_free(Thread* thread);
+  bool flush(Thread* thread);
 
   // Following work
   void prepare_work();
diff --git a/src/hotspot/share/gc/z/zMark.inline.hpp b/src/hotspot/share/gc/z/zMark.inline.hpp
index 9edc57a6000..26c84679cc0 100644
--- a/src/hotspot/share/gc/z/zMark.inline.hpp
+++ b/src/hotspot/share/gc/z/zMark.inline.hpp
@@ -84,7 +84,7 @@ inline void ZMark::mark_object(zaddress addr) {
   assert(ZHeap::heap()->is_young(addr) == _generation->is_young(), "Phase/object mismatch");
 
   const bool publish = !gc_thread;
-  stacks->push(&_allocator, &_stripes, stripe, &_terminate, entry, publish);
+  stacks->push(&_stripes, stripe, &_terminate, entry, publish);
 }
 
 #endif // SHARE_GC_Z_ZMARK_INLINE_HPP
diff --git a/src/hotspot/share/gc/z/zMarkStack.cpp b/src/hotspot/share/gc/z/zMarkStack.cpp
index 00a534d236f..692defc50f1 100644
--- a/src/hotspot/share/gc/z/zMarkStack.cpp
+++ b/src/hotspot/share/gc/z/zMarkStack.cpp
@@ -21,41 +21,214 @@
  * questions.
  */
 
+#include "gc/z/zMarkingSMR.hpp"
 #include "gc/z/zMarkStack.inline.hpp"
-#include "gc/z/zMarkStackAllocator.hpp"
 #include "gc/z/zMarkTerminate.inline.hpp"
 #include "logging/log.hpp"
 #include "runtime/atomic.hpp"
+#include "runtime/orderAccess.hpp"
 #include "utilities/debug.hpp"
 #include "utilities/powerOfTwo.hpp"
 
-ZMarkStripe::ZMarkStripe(uintptr_t base)
-  : _published(base),
-    _overflowed(base) {}
+ZMarkStack* ZMarkStack::create(bool first_stack) {
+  // When allocating the first stack on a stripe, we try to use a
+  // smaller mark stack to promote sharing of stacks with other
+  // threads instead. Once more than one stack is needed, we revert
+  // to a larger stack size instead, which reduces synchronization
+  // overhead of churning around stacks on a stripe.
+  const size_t capacity = first_stack ? 128 : 512;
 
-ZMarkStripeSet::ZMarkStripeSet(uintptr_t base)
-  : _nstripes_mask(0),
-    _stripes() {
+  void* const memory = AttachedArray::alloc(capacity);
+  return ::new (memory) ZMarkStack(capacity);
+}
 
-  // Re-construct array elements with the correct base
-  for (size_t i = 0; i < ARRAY_SIZE(_stripes); i++) {
-    _stripes[i] = ZMarkStripe(base);
+void ZMarkStack::destroy(ZMarkStack* stack) {
+  stack->~ZMarkStack();
+  AttachedArray::free(stack);
+}
+
+ZMarkStack::ZMarkStack(size_t capacity)
+  : _top(0),
+    _entries(capacity) {}
+
+ZMarkStackListNode::ZMarkStackListNode(ZMarkStack* stack)
+  : _stack(stack),
+    _next() {}
+
+ZMarkStack* ZMarkStackListNode::stack() const {
+  return _stack;
+}
+
+ZMarkStackListNode* ZMarkStackListNode::next() const {
+  return _next;
+}
+
+void ZMarkStackListNode::set_next(ZMarkStackListNode* next) {
+  _next = next;
+}
+
+ZMarkStackList::ZMarkStackList()
+  : _head(),
+    _length() {}
+
+bool ZMarkStackList::is_empty() const {
+  return Atomic::load(&_head) == nullptr;
+}
+
+void ZMarkStackList::push(ZMarkStack* stack) {
+  ZMarkStackListNode* const node = new ZMarkStackListNode(stack);
+  ZMarkStackListNode* head = Atomic::load(&_head);
+  for (;;) {
+    node->set_next(head);
+    // Between reading the head and the linearizing CAS that pushes
+    // the node onto the list, there could be an ABA problem. Except,
+    // on the pushing side, that is benign. The node is never
+    // dereferenced while pushing and if we were to detect the ABA
+    // situation and run this loop one more time, we would end up
+    // having the same side effects: set the next pointer to the same
+    // head again, and CAS the head link.
+    ZMarkStackListNode* prev = Atomic::cmpxchg(&_head, head, node, memory_order_release);
+
+    if (prev == head) {
+      // Success
+
+      // Bookkeep the population count
+      Atomic::inc(&_length, memory_order_relaxed);
+      return;
+    }
+
+    // Retry
+    head = prev;
   }
 }
 
+ZMarkStack* ZMarkStackList::pop(ZMarkingSMR* marking_smr) {
+  ZMarkStackListNode* volatile* const hazard_ptr = marking_smr->hazard_ptr();
+
+  ZMarkStackListNode* head = Atomic::load(&_head);
+  for (;;) {
+    if (head == nullptr) {
+      // Stack is empty
+      return nullptr;
+    }
+
+    // Establish what the head is and publish a hazard pointer denoting
+    // that the head is not safe to concurrently free while we are in the
+    // middle of popping it and finding out that we lost the race.
+    Atomic::store(hazard_ptr, head);
+
+    // A full fence is needed to ensure the store and subsequent load do
+    // not reorder. If they did reorder, the second head load could happen
+    // before other threads scanning hazard pointers can observe it, meaning
+    // it could get concurrently freed.
+    OrderAccess::fence();
+
+    // The acquire fence when loading the head is necessary to make sure
+    // the next pointer load below observes the next pointer published
+    // with the releasing CAS for the push operation that published the
+    // marking stack.
+    ZMarkStackListNode* const head_after_publish = Atomic::load_acquire(&_head);
+    if (head_after_publish != head) {
+      // Race during hazard pointer publishing
+      head = head_after_publish;
+      continue;
+    }
+
+    // With the hazard pointer published, we can read the next pointer,
+    // knowing that it is indeed the next pointer of the intended logical
+    // head node that we established above.
+    ZMarkStackListNode* const next = head->next();
+
+    // Popping entries from the list does not require any particular memory
+    // ordering.
+    ZMarkStackListNode* const prev = Atomic::cmpxchg(&_head, head, next, memory_order_relaxed);
+
+    if (prev == head) {
+      // Success
+
+      // The ABA hazard is gone after the CAS. We use release_store to ensure
+      // that the relinquishing of the hazard pointer becomes observable after
+      // the unlinking CAS.
+      Atomic::release_store(hazard_ptr, (ZMarkStackListNode*)nullptr);
+
+      // Perform bookkeeping of the population count.
+      Atomic::dec(&_length, memory_order_relaxed);
+
+      ZMarkStack* result = head->stack();
+
+      marking_smr->free_node(head);
+
+      return result;
+    }
+
+    // Retry
+    head = prev;
+  }
+}
+
+size_t ZMarkStackList::length() const {
+  const ssize_t result = Atomic::load(&_length);
+
+  if (result < 0) {
+    return 0;
+  }
+
+  return (size_t)result;
+}
+
+ZMarkStripe::ZMarkStripe()
+  : _published(),
+    _overflowed() {}
+
+ZMarkStack* ZMarkStripe::steal_stack(ZMarkingSMR* marking_smr) {
+  // Steal overflowed stacks first, then published stacks
+  ZMarkStack* const stack = _overflowed.pop(marking_smr);
+  if (stack != nullptr) {
+    return stack;
+  }
+
+  return _published.pop(marking_smr);
+}
+
+size_t ZMarkStripe::population() const {
+  return _overflowed.length() + _published.length();
+}
+
+ZMarkStripeSet::ZMarkStripeSet()
+  : _nstripes_mask(0),
+    _stripes() {}
+
 void ZMarkStripeSet::set_nstripes(size_t nstripes) {
   assert(is_power_of_2(nstripes), "Must be a power of two");
   assert(is_power_of_2(ZMarkStripesMax), "Must be a power of two");
   assert(nstripes >= 1, "Invalid number of stripes");
   assert(nstripes <= ZMarkStripesMax, "Invalid number of stripes");
 
-  // Mutators may read these values concurrently. It doesn't matter
-  // if they see the old or new values.
-  Atomic::store(&_nstripes_mask, nstripes - 1);
+  const size_t new_nstripes_mask = nstripes - 1;
+  _nstripes_mask = new_nstripes_mask;
 
   log_debug(gc, marking)("Using %zu mark stripes", nstripes);
 }
 
+bool ZMarkStripeSet::try_set_nstripes(size_t old_nstripes, size_t new_nstripes) {
+  assert(is_power_of_2(new_nstripes), "Must be a power of two");
+  assert(is_power_of_2(ZMarkStripesMax), "Must be a power of two");
+  assert(new_nstripes >= 1, "Invalid number of stripes");
+  assert(new_nstripes <= ZMarkStripesMax, "Invalid number of stripes");
+
+  const size_t old_nstripes_mask = old_nstripes - 1;
+  const size_t new_nstripes_mask = new_nstripes - 1;
+
+  // Mutators may read these values concurrently. It doesn't matter
+  // if they see the old or new values.
+  if (Atomic::cmpxchg(&_nstripes_mask, old_nstripes_mask, new_nstripes_mask) == old_nstripes_mask) {
+    log_debug(gc, marking)("Using %zu mark stripes", new_nstripes);
+    return true;
+  }
+
+  return false;
+}
+
 size_t ZMarkStripeSet::nstripes() const {
   return Atomic::load(&_nstripes_mask) + 1;
 }
@@ -70,6 +243,20 @@ bool ZMarkStripeSet::is_empty() const {
   return true;
 }
 
+bool ZMarkStripeSet::is_crowded() const {
+  size_t population = 0;
+  const size_t crowded_threshold = nstripes() << 4;
+
+  for (size_t i = 0; i < ZMarkStripesMax; i++) {
+    population += _stripes[i].population();
+    if (population > crowded_threshold) {
+      return true;
+    }
+  }
+
+  return false;
+}
+
 ZMarkStripe* ZMarkStripeSet::stripe_for_worker(uint nworkers, uint worker_id) {
   const size_t mask = Atomic::load(&_nstripes_mask);
   const size_t nstripes = mask + 1;
@@ -92,8 +279,7 @@ ZMarkStripe* ZMarkStripeSet::stripe_for_worker(uint nworkers, uint worker_id) {
   return &_stripes[index];
 }
 
-ZMarkThreadLocalStacks::ZMarkThreadLocalStacks()
-  : _magazine(nullptr) {
+ZMarkThreadLocalStacks::ZMarkThreadLocalStacks() {
   for (size_t i = 0; i < ZMarkStripesMax; i++) {
     _stacks[i] = nullptr;
   }
@@ -110,104 +296,8 @@ bool ZMarkThreadLocalStacks::is_empty(const ZMarkStripeSet* stripes) const {
   return true;
 }
 
-ZMarkStack* ZMarkThreadLocalStacks::allocate_stack(ZMarkStackAllocator* allocator) {
-  if (_magazine == nullptr) {
-    // Allocate new magazine
-    _magazine = allocator->alloc_magazine();
-    if (_magazine == nullptr) {
-      return nullptr;
-    }
-  }
-
-  ZMarkStack* stack = nullptr;
-
-  if (!_magazine->pop(stack)) {
-    // Magazine is empty, convert magazine into a new stack
-    _magazine->~ZMarkStackMagazine();
-    stack = new ((void*)_magazine) ZMarkStack();
-    _magazine = nullptr;
-  }
-
-  return stack;
-}
-
-void ZMarkThreadLocalStacks::free_stack(ZMarkStackAllocator* allocator, ZMarkStack* stack) {
-  for (;;) {
-    if (_magazine == nullptr) {
-      // Convert stack into a new magazine
-      stack->~ZMarkStack();
-      _magazine = new ((void*)stack) ZMarkStackMagazine();
-      return;
-    }
-
-    if (_magazine->push(stack)) {
-      // Success
-      return;
-    }
-
-    // Free and uninstall full magazine
-    allocator->free_magazine(_magazine);
-    _magazine = nullptr;
-  }
-}
-
-bool ZMarkThreadLocalStacks::push_slow(ZMarkStackAllocator* allocator,
-                                       ZMarkStripe* stripe,
-                                       ZMarkStack** stackp,
-                                       ZMarkTerminate* terminate,
-                                       ZMarkStackEntry entry,
-                                       bool publish) {
-  ZMarkStack* stack = *stackp;
-
-  for (;;) {
-    if (stack == nullptr) {
-      // Allocate and install new stack
-      *stackp = stack = allocate_stack(allocator);
-      if (stack == nullptr) {
-        // Out of mark stack memory
-        return false;
-      }
-    }
-
-    if (stack->push(entry)) {
-      // Success
-      return true;
-    }
-
-    // Publish/Overflow and uninstall stack
-    stripe->publish_stack(stack, terminate, publish);
-    *stackp = stack = nullptr;
-  }
-}
-
-bool ZMarkThreadLocalStacks::pop_slow(ZMarkStackAllocator* allocator,
-                                      ZMarkStripe* stripe,
-                                      ZMarkStack** stackp,
-                                      ZMarkStackEntry& entry) {
-  ZMarkStack* stack = *stackp;
-
-  for (;;) {
-    if (stack == nullptr) {
-      // Try steal and install stack
-      *stackp = stack = stripe->steal_stack();
-      if (stack == nullptr) {
-        // Nothing to steal
-        return false;
-      }
-    }
-
-    if (stack->pop(entry)) {
-      // Success
-      return true;
-    }
-
-    // Free and uninstall stack
-    free_stack(allocator, stack);
-    *stackp = stack = nullptr;
-  }
-}
-
-bool ZMarkThreadLocalStacks::flush(ZMarkStackAllocator* allocator, ZMarkStripeSet* stripes, ZMarkTerminate* terminate) {
+bool ZMarkThreadLocalStacks::flush(ZMarkStripeSet* stripes,
+                                   ZMarkTerminate* terminate) {
   bool flushed = false;
 
   // Flush all stacks
@@ -220,22 +310,10 @@ bool ZMarkThreadLocalStacks::flush(ZMarkStackAllocator* allocator, ZMarkStripeSe
     }
 
     // Free/Publish and uninstall stack
-    if (stack->is_empty()) {
-      free_stack(allocator, stack);
-    } else {
-      stripe->publish_stack(stack, terminate, true /* publish */);
-      flushed = true;
-    }
+    stripe->publish_stack(stack, terminate, true /* publish */);
+    flushed = true;
     *stackp = nullptr;
   }
 
   return flushed;
 }
-
-void ZMarkThreadLocalStacks::free(ZMarkStackAllocator* allocator) {
-  // Free and uninstall magazine
-  if (_magazine != nullptr) {
-    allocator->free_magazine(_magazine);
-    _magazine = nullptr;
-  }
-}
diff --git a/src/hotspot/share/gc/z/zMarkStack.hpp b/src/hotspot/share/gc/z/zMarkStack.hpp
index 8a24c84c8d9..7c0e6d4c712 100644
--- a/src/hotspot/share/gc/z/zMarkStack.hpp
+++ b/src/hotspot/share/gc/z/zMarkStack.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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,73 +24,81 @@
 #ifndef SHARE_GC_Z_ZMARKSTACK_HPP
 #define SHARE_GC_Z_ZMARKSTACK_HPP
 
+#include "gc/z/zAttachedArray.hpp"
 #include "gc/z/zGlobals.hpp"
 #include "gc/z/zMarkStackEntry.hpp"
+#include "memory/allocation.hpp"
 #include "utilities/globalDefinitions.hpp"
 
+class ZMarkingSMR;
+class ZMarkStripe;
 class ZMarkTerminate;
 
-template <typename T, size_t S>
-class ZStack {
+class ZMarkStack {
 private:
-  size_t        _top;
-  ZStack<T, S>* _next;
-  T             _slots[S];
+  using AttachedArray = ZAttachedArray<ZMarkStack, ZMarkStackEntry>;
 
+  size_t              _top;
+  const AttachedArray _entries;
+
+  ZMarkStackEntry* slots();
+
+  ZMarkStack(size_t capacity);
+
+public:
+  static ZMarkStack* create(bool first_stack);
+  static void destroy(ZMarkStack* stack);
+
+  bool is_empty() const;
   bool is_full() const;
 
-public:
-  ZStack();
-
-  bool is_empty() const;
-
-  bool push(T value);
-  bool pop(T& value);
-
-  ZStack<T, S>* next() const;
-  ZStack<T, S>** next_addr();
+  void push(ZMarkStackEntry value);
+  ZMarkStackEntry pop();
 };
 
-template <typename T>
-class ZCACHE_ALIGNED ZStackList {
+class ZMarkStackListNode : public CHeapObj<mtGC> {
 private:
-  uintptr_t   _base;
-  T* volatile _head;
-
-  T* encode_versioned_pointer(const T* stack, uint32_t version) const;
-  void decode_versioned_pointer(const T* vstack, T** stack, uint32_t* version) const;
+  ZMarkStack* const   _stack;
+  ZMarkStackListNode* _next;
 
 public:
-  explicit ZStackList(uintptr_t base);
+  ZMarkStackListNode(ZMarkStack* stack);
+
+  ZMarkStack* stack() const;
+
+  ZMarkStackListNode* next() const;
+  void set_next(ZMarkStackListNode* next);
+};
+
+class ZCACHE_ALIGNED ZMarkStackList {
+private:
+  ZMarkStackListNode* volatile _head;
+  ssize_t volatile             _length;
+
+public:
+  ZMarkStackList();
 
   bool is_empty() const;
 
-  void push(T* stack);
-  T* pop();
+  size_t length() const;
 
-  void clear();
+  void push(ZMarkStack* stack);
+  ZMarkStack* pop(ZMarkingSMR* marking_smr);
 };
 
-using ZMarkStack = ZStack<ZMarkStackEntry, ZMarkStackSlots>;
-using ZMarkStackList = ZStackList<ZMarkStack>;
-using ZMarkStackMagazine = ZStack<ZMarkStack*, ZMarkStackMagazineSlots>;
-using ZMarkStackMagazineList = ZStackList<ZMarkStackMagazine>;
-
-static_assert(sizeof(ZMarkStack) == ZMarkStackSize, "ZMarkStack size mismatch");
-static_assert(sizeof(ZMarkStackMagazine) <= ZMarkStackSize, "ZMarkStackMagazine size too large");
-
 class ZMarkStripe {
 private:
   ZCACHE_ALIGNED ZMarkStackList _published;
   ZCACHE_ALIGNED ZMarkStackList _overflowed;
 
 public:
-  explicit ZMarkStripe(uintptr_t base = 0);
+  explicit ZMarkStripe();
 
   bool is_empty() const;
+  size_t population() const;
 
   void publish_stack(ZMarkStack* stack, ZMarkTerminate* terminate, bool publish);
-  ZMarkStack* steal_stack();
+  ZMarkStack* steal_stack(ZMarkingSMR* marking_smr);
 };
 
 class ZMarkStripeSet {
@@ -99,12 +107,14 @@ private:
   ZMarkStripe _stripes[ZMarkStripesMax];
 
 public:
-  explicit ZMarkStripeSet(uintptr_t base);
+  explicit ZMarkStripeSet();
 
   void set_nstripes(size_t nstripes);
+  bool try_set_nstripes(size_t old_nstripes, size_t new_nstripes);
   size_t nstripes() const;
 
   bool is_empty() const;
+  bool is_crowded() const;
 
   size_t stripe_id(const ZMarkStripe* stripe) const;
   ZMarkStripe* stripe_at(size_t index);
@@ -113,27 +123,9 @@ public:
   ZMarkStripe* stripe_for_addr(uintptr_t addr);
 };
 
-class ZMarkStackAllocator;
-
 class ZMarkThreadLocalStacks {
 private:
-  ZMarkStackMagazine* _magazine;
-  ZMarkStack*         _stacks[ZMarkStripesMax];
-
-  ZMarkStack* allocate_stack(ZMarkStackAllocator* allocator);
-  void free_stack(ZMarkStackAllocator* allocator, ZMarkStack* stack);
-
-  bool push_slow(ZMarkStackAllocator* allocator,
-                 ZMarkStripe* stripe,
-                 ZMarkStack** stackp,
-                 ZMarkTerminate* terminate,
-                 ZMarkStackEntry entry,
-                 bool publish);
-
-  bool pop_slow(ZMarkStackAllocator* allocator,
-                ZMarkStripe* stripe,
-                ZMarkStack** stackp,
-                ZMarkStackEntry& entry);
+  ZMarkStack* _stacks[ZMarkStripesMax];
 
 public:
   ZMarkThreadLocalStacks();
@@ -147,23 +139,19 @@ public:
   ZMarkStack* steal(ZMarkStripeSet* stripes,
                     ZMarkStripe* stripe);
 
-  bool push(ZMarkStackAllocator* allocator,
-            ZMarkStripeSet* stripes,
+  void push(ZMarkStripeSet* stripes,
             ZMarkStripe* stripe,
             ZMarkTerminate* terminate,
             ZMarkStackEntry entry,
             bool publish);
 
-  bool pop(ZMarkStackAllocator* allocator,
+  bool pop(ZMarkingSMR* marking_smr,
            ZMarkStripeSet* stripes,
            ZMarkStripe* stripe,
-           ZMarkStackEntry& entry);
+           ZMarkStackEntry* entry);
 
-  bool flush(ZMarkStackAllocator* allocator,
-             ZMarkStripeSet* stripes,
+  bool flush(ZMarkStripeSet* stripes,
              ZMarkTerminate* terminate);
-
-  void free(ZMarkStackAllocator* allocator);
 };
 
 #endif // SHARE_GC_Z_ZMARKSTACK_HPP
diff --git a/src/hotspot/share/gc/z/zMarkStack.inline.hpp b/src/hotspot/share/gc/z/zMarkStack.inline.hpp
index cd8667dd73f..ed3b167762c 100644
--- a/src/hotspot/share/gc/z/zMarkStack.inline.hpp
+++ b/src/hotspot/share/gc/z/zMarkStack.inline.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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,142 +26,30 @@
 
 #include "gc/z/zMarkStack.hpp"
 
+#include "gc/z/zAttachedArray.inline.hpp"
 #include "gc/z/zMarkTerminate.inline.hpp"
-#include "runtime/atomic.hpp"
 #include "utilities/debug.hpp"
 
-template <typename T, size_t S>
-inline ZStack<T, S>::ZStack()
-  : _top(0),
-    _next(nullptr) {}
-
-template <typename T, size_t S>
-inline bool ZStack<T, S>::is_empty() const {
+inline bool ZMarkStack::is_empty() const {
   return _top == 0;
 }
 
-template <typename T, size_t S>
-inline bool ZStack<T, S>::is_full() const {
-  return _top == S;
+inline bool ZMarkStack::is_full() const {
+  return _top == _entries.length();
 }
 
-template <typename T, size_t S>
-inline bool ZStack<T, S>::push(T value) {
-  if (is_full()) {
-    return false;
-  }
-
-  _slots[_top++] = value;
-  return true;
+inline ZMarkStackEntry* ZMarkStack::slots() {
+  return _entries(this);
 }
 
-template <typename T, size_t S>
-inline bool ZStack<T, S>::pop(T& value) {
-  if (is_empty()) {
-    return false;
-  }
-
-  value = _slots[--_top];
-  return true;
+inline void ZMarkStack::push(ZMarkStackEntry value) {
+  assert(!is_full(), "can't push to full stack");
+  slots()[_top++] = value;
 }
 
-template <typename T, size_t S>
-inline ZStack<T, S>* ZStack<T, S>::next() const {
-  return _next;
-}
-
-template <typename T, size_t S>
-inline ZStack<T, S>** ZStack<T, S>::next_addr() {
-  return &_next;
-}
-
-template <typename T>
-inline ZStackList<T>::ZStackList(uintptr_t base)
-  : _base(base),
-    _head(encode_versioned_pointer(nullptr, 0)) {}
-
-template <typename T>
-inline T* ZStackList<T>::encode_versioned_pointer(const T* stack, uint32_t version) const {
-  uint64_t addr;
-
-  if (stack == nullptr) {
-    addr = (uint32_t)-1;
-  } else {
-    addr = ((uint64_t)stack - _base) >> ZMarkStackSizeShift;
-  }
-
-  return (T*)((addr << 32) | (uint64_t)version);
-}
-
-template <typename T>
-inline void ZStackList<T>::decode_versioned_pointer(const T* vstack, T** stack, uint32_t* version) const {
-  const uint64_t addr = (uint64_t)vstack >> 32;
-
-  if (addr == (uint32_t)-1) {
-    *stack = nullptr;
-  } else {
-    *stack = (T*)((addr << ZMarkStackSizeShift) + _base);
-  }
-
-  *version = (uint32_t)(uint64_t)vstack;
-}
-
-template <typename T>
-inline bool ZStackList<T>::is_empty() const {
-  const T* vstack = _head;
-  T* stack = nullptr;
-  uint32_t version = 0;
-
-  decode_versioned_pointer(vstack, &stack, &version);
-  return stack == nullptr;
-}
-
-template <typename T>
-inline void ZStackList<T>::push(T* stack) {
-  T* vstack = _head;
-  uint32_t version = 0;
-
-  for (;;) {
-    decode_versioned_pointer(vstack, stack->next_addr(), &version);
-    T* const new_vstack = encode_versioned_pointer(stack, version + 1);
-    T* const prev_vstack = Atomic::cmpxchg(&_head, vstack, new_vstack);
-    if (prev_vstack == vstack) {
-      // Success
-      break;
-    }
-
-    // Retry
-    vstack = prev_vstack;
-  }
-}
-
-template <typename T>
-inline T* ZStackList<T>::pop() {
-  T* vstack = _head;
-  T* stack = nullptr;
-  uint32_t version = 0;
-
-  for (;;) {
-    decode_versioned_pointer(vstack, &stack, &version);
-    if (stack == nullptr) {
-      return nullptr;
-    }
-
-    T* const new_vstack = encode_versioned_pointer(stack->next(), version + 1);
-    T* const prev_vstack = Atomic::cmpxchg(&_head, vstack, new_vstack);
-    if (prev_vstack == vstack) {
-      // Success
-      return stack;
-    }
-
-    // Retry
-    vstack = prev_vstack;
-  }
-}
-
-template <typename T>
-inline void ZStackList<T>::clear() {
-  _head = encode_versioned_pointer(nullptr, 0);
+inline ZMarkStackEntry ZMarkStack::pop() {
+  assert(!is_empty(), "can't pop from empty stack");
+  return slots()[--_top];
 }
 
 inline bool ZMarkStripe::is_empty() const {
@@ -175,6 +63,8 @@ inline void ZMarkStripe::publish_stack(ZMarkStack* stack, ZMarkTerminate* termin
   // to publish stacks that overflowed. The intention here is to avoid
   // contention between mutators and GC workers as much as possible, while
   // still allowing GC workers to help out and steal work from each other.
+  assert(!stack->is_empty(), "we never publish empty stacks");
+
   if (publish) {
     _published.push(stack);
   } else {
@@ -184,16 +74,6 @@ inline void ZMarkStripe::publish_stack(ZMarkStack* stack, ZMarkTerminate* termin
   terminate->wake_up();
 }
 
-inline ZMarkStack* ZMarkStripe::steal_stack() {
-  // Steal overflowed stacks first, then published stacks
-  ZMarkStack* const stack = _overflowed.pop();
-  if (stack != nullptr) {
-    return stack;
-  }
-
-  return _published.pop();
-}
-
 inline size_t ZMarkStripeSet::stripe_id(const ZMarkStripe* stripe) const {
   const size_t index = ((uintptr_t)stripe - (uintptr_t)_stripes) / sizeof(ZMarkStripe);
   assert(index < ZMarkStripesMax, "Invalid index");
@@ -236,32 +116,63 @@ inline ZMarkStack* ZMarkThreadLocalStacks::steal(ZMarkStripeSet* stripes,
   return stack;
 }
 
-inline bool ZMarkThreadLocalStacks::push(ZMarkStackAllocator* allocator,
-                                         ZMarkStripeSet* stripes,
+inline void ZMarkThreadLocalStacks::push(ZMarkStripeSet* stripes,
                                          ZMarkStripe* stripe,
                                          ZMarkTerminate* terminate,
                                          ZMarkStackEntry entry,
                                          bool publish) {
-  ZMarkStack** const stackp = &_stacks[stripes->stripe_id(stripe)];
-  ZMarkStack* const stack = *stackp;
-  if (stack != nullptr && stack->push(entry)) {
-    return true;
+  const size_t stripe_id = stripes->stripe_id(stripe);
+  ZMarkStack** const stackp = &_stacks[stripe_id];
+  ZMarkStack* const prev_stack = *stackp;
+
+  if (prev_stack != nullptr) {
+    if (!prev_stack->is_full()) {
+      // There's a stack and it isn't full: just push
+      prev_stack->push(entry);
+      return;
+    }
+
+    // Publish full stacks
+    stripe->publish_stack(prev_stack, terminate, publish);
+    *stackp = nullptr;
   }
 
-  return push_slow(allocator, stripe, stackp, terminate, entry, publish);
+  // If no stack was available, allocate one and push to it
+  const bool first_stack = prev_stack == nullptr;
+  ZMarkStack* const new_stack = ZMarkStack::create(first_stack);
+  *stackp = new_stack;
+
+  new_stack->push(entry);
 }
 
-inline bool ZMarkThreadLocalStacks::pop(ZMarkStackAllocator* allocator,
+inline bool ZMarkThreadLocalStacks::pop(ZMarkingSMR* marking_smr,
                                         ZMarkStripeSet* stripes,
                                         ZMarkStripe* stripe,
-                                        ZMarkStackEntry& entry) {
+                                        ZMarkStackEntry* entry) {
   ZMarkStack** const stackp = &_stacks[stripes->stripe_id(stripe)];
-  ZMarkStack* const stack = *stackp;
-  if (stack != nullptr && stack->pop(entry)) {
-    return true;
+  ZMarkStack* stack = *stackp;
+
+  // First make sure there is a stack to pop from
+  if (stack == nullptr) {
+    // If we have no stack, try to steal one
+    stack = stripe->steal_stack(marking_smr);
+    *stackp = stack;
+
+    if (stack == nullptr) {
+      // Out of stacks to pop from
+      return false;
+    }
   }
 
-  return pop_slow(allocator, stripe, stackp, entry);
+  *entry = stack->pop();
+
+  if (stack->is_empty()) {
+    // Eagerly free empty stacks while on a worker thread
+    ZMarkStack::destroy(stack);
+    *stackp = nullptr;
+  }
+
+  return true;
 }
 
 #endif // SHARE_GC_Z_ZMARKSTACK_INLINE_HPP
diff --git a/src/hotspot/share/gc/z/zMarkStackAllocator.cpp b/src/hotspot/share/gc/z/zMarkStackAllocator.cpp
deleted file mode 100644
index 02a903985e7..00000000000
--- a/src/hotspot/share/gc/z/zMarkStackAllocator.cpp
+++ /dev/null
@@ -1,236 +0,0 @@
-/*
- * Copyright (c) 2016, 2025, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please 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 "gc/shared/gc_globals.hpp"
-#include "gc/z/zInitialize.hpp"
-#include "gc/z/zLock.inline.hpp"
-#include "gc/z/zMarkStack.inline.hpp"
-#include "gc/z/zMarkStackAllocator.hpp"
-#include "logging/log.hpp"
-#include "runtime/atomic.hpp"
-#include "runtime/os.hpp"
-#include "utilities/debug.hpp"
-
-ZMarkStackSpace::ZMarkStackSpace()
-  : _expand_lock(),
-    _start(0),
-    _top(0),
-    _end(0) {
-  assert(ZMarkStackSpaceLimit >= ZMarkStackSpaceExpandSize, "ZMarkStackSpaceLimit too small");
-
-  // Reserve address space
-  const size_t size = ZMarkStackSpaceLimit;
-  const uintptr_t addr = (uintptr_t)os::reserve_memory(size, !ExecMem, mtGC);
-  if (addr == 0) {
-    ZInitialize::error_d("Failed to reserve address space for mark stacks");
-    return;
-  }
-
-  // Successfully initialized
-  _start = _top = _end = addr;
-
-  // Prime space
-  _end += expand_space();
-}
-
-bool ZMarkStackSpace::is_initialized() const {
-  return _start != 0;
-}
-
-uintptr_t ZMarkStackSpace::start() const {
-  return _start;
-}
-
-size_t ZMarkStackSpace::size() const {
-  return _end - _start;
-}
-
-size_t ZMarkStackSpace::used() const {
-  return _top - _start;
-}
-
-size_t ZMarkStackSpace::expand_space() {
-  const size_t expand_size = ZMarkStackSpaceExpandSize;
-  const size_t old_size = size();
-  const size_t new_size = old_size + expand_size;
-
-  if (new_size > ZMarkStackSpaceLimit) {
-    // Expansion limit reached. This is a fatal error since we
-    // currently can't recover from running out of mark stack space.
-    fatal("Mark stack space exhausted. Use -XX:ZMarkStackSpaceLimit=<size> to increase the "
-          "maximum number of bytes allocated for mark stacks. Current limit is %zuM.",
-          ZMarkStackSpaceLimit / M);
-  }
-
-  log_debug(gc, marking)("Expanding mark stack space: %zuM->%zuM",
-                         old_size / M, new_size / M);
-
-  // Expand
-  os::commit_memory_or_exit((char*)_end, expand_size, false /* executable */, "Mark stack space");
-
-  return expand_size;
-}
-
-size_t ZMarkStackSpace::shrink_space() {
-  // Shrink to what is currently used
-  const size_t old_size = size();
-  const size_t new_size = align_up(used(), ZMarkStackSpaceExpandSize);
-  const size_t shrink_size = old_size - new_size;
-
-  if (shrink_size > 0) {
-    // Shrink
-    log_debug(gc, marking)("Shrinking mark stack space: %zuM->%zuM",
-                           old_size / M, new_size / M);
-
-    const uintptr_t shrink_start = _end - shrink_size;
-    os::uncommit_memory((char*)shrink_start, shrink_size, false /* executable */);
-  }
-
-  return shrink_size;
-}
-
-uintptr_t ZMarkStackSpace::alloc_space(size_t size) {
-  uintptr_t top = Atomic::load(&_top);
-
-  for (;;) {
-    const uintptr_t end = Atomic::load(&_end);
-    const uintptr_t new_top = top + size;
-    if (new_top > end) {
-      // Not enough space left
-      return 0;
-    }
-
-    const uintptr_t prev_top = Atomic::cmpxchg(&_top, top, new_top);
-    if (prev_top == top) {
-      // Success
-      return top;
-    }
-
-    // Retry
-    top = prev_top;
-  }
-}
-
-uintptr_t ZMarkStackSpace::expand_and_alloc_space(size_t size) {
-  ZLocker<ZLock> locker(&_expand_lock);
-
-  // Retry allocation before expanding
-  uintptr_t addr = alloc_space(size);
-  if (addr != 0) {
-    return addr;
-  }
-
-  // Expand
-  const size_t expand_size = expand_space();
-
-  // Increment top before end to make sure another
-  // thread can't steal out newly expanded space.
-  addr = Atomic::fetch_then_add(&_top, size);
-  Atomic::add(&_end, expand_size);
-
-  return addr;
-}
-
-uintptr_t ZMarkStackSpace::alloc(size_t size) {
-  assert(size <= ZMarkStackSpaceExpandSize, "Invalid size");
-
-  const uintptr_t addr = alloc_space(size);
-  if (addr != 0) {
-    return addr;
-  }
-
-  return expand_and_alloc_space(size);
-}
-
-void ZMarkStackSpace::free() {
-  _end -= shrink_space();
-  _top = _start;
-}
-
-ZMarkStackAllocator::ZMarkStackAllocator()
-  : _space(),
-    _freelist(_space.start()),
-    _expanded_recently(false) {}
-
-bool ZMarkStackAllocator::is_initialized() const {
-  return _space.is_initialized();
-}
-
-uintptr_t ZMarkStackAllocator::start() const {
-  return _space.start();
-}
-
-size_t ZMarkStackAllocator::size() const {
-  return _space.size();
-}
-
-ZMarkStackMagazine* ZMarkStackAllocator::create_magazine_from_space(uintptr_t addr, size_t size) {
-  assert(is_aligned(size, ZMarkStackSize), "Invalid size");
-
-  // Use first stack as magazine
-  ZMarkStackMagazine* const magazine = new ((void*)addr) ZMarkStackMagazine();
-  for (size_t i = ZMarkStackSize; i < size; i += ZMarkStackSize) {
-    ZMarkStack* const stack = new ((void*)(addr + i)) ZMarkStack();
-    const bool success = magazine->push(stack);
-    assert(success, "Magazine should never get full");
-  }
-
-  return magazine;
-}
-
-ZMarkStackMagazine* ZMarkStackAllocator::alloc_magazine() {
-  // Try allocating from the free list first
-  ZMarkStackMagazine* const magazine = _freelist.pop();
-  if (magazine != nullptr) {
-    return magazine;
-  }
-
-  if (!Atomic::load(&_expanded_recently)) {
-    Atomic::cmpxchg(&_expanded_recently, false, true);
-  }
-
-  // Allocate new magazine
-  const uintptr_t addr = _space.alloc(ZMarkStackMagazineSize);
-  if (addr == 0) {
-    return nullptr;
-  }
-
-  return create_magazine_from_space(addr, ZMarkStackMagazineSize);
-}
-
-bool ZMarkStackAllocator::clear_and_get_expanded_recently() {
-  if (!Atomic::load(&_expanded_recently)) {
-    return false;
-  }
-
-  return Atomic::cmpxchg(&_expanded_recently, true, false);
-}
-
-void ZMarkStackAllocator::free_magazine(ZMarkStackMagazine* magazine) {
-  _freelist.push(magazine);
-}
-
-void ZMarkStackAllocator::free() {
-  _freelist.clear();
-  _space.free();
-}
diff --git a/src/hotspot/share/gc/z/zMarkTerminate.inline.hpp b/src/hotspot/share/gc/z/zMarkTerminate.inline.hpp
index 79d3f8ef2a0..cdd9e7dce25 100644
--- a/src/hotspot/share/gc/z/zMarkTerminate.inline.hpp
+++ b/src/hotspot/share/gc/z/zMarkTerminate.inline.hpp
@@ -28,6 +28,7 @@
 
 #include "gc/shared/suspendibleThreadSet.hpp"
 #include "gc/z/zLock.inline.hpp"
+#include "gc/z/zMarkStack.hpp"
 #include "logging/log.hpp"
 #include "runtime/atomic.hpp"
 #include "runtime/osThread.hpp"
@@ -60,8 +61,7 @@ inline void ZMarkTerminate::leave() {
 inline void ZMarkTerminate::maybe_reduce_stripes(ZMarkStripeSet* stripes, size_t used_nstripes) {
   size_t nstripes = stripes->nstripes();
   if (used_nstripes == nstripes && nstripes > 1u) {
-    nstripes >>= 1;
-    stripes->set_nstripes(nstripes);
+    stripes->try_set_nstripes(nstripes, nstripes >> 1);
   }
 }
 
diff --git a/src/hotspot/share/gc/z/zMarkingSMR.cpp b/src/hotspot/share/gc/z/zMarkingSMR.cpp
new file mode 100644
index 00000000000..2335d009c74
--- /dev/null
+++ b/src/hotspot/share/gc/z/zMarkingSMR.cpp
@@ -0,0 +1,112 @@
+/*
+ * Copyright (c) 2016, 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please 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 "gc/z/zMarkingSMR.hpp"
+#include "gc/z/zMarkStack.inline.hpp"
+#include "gc/z/zValue.inline.hpp"
+#include "runtime/atomic.hpp"
+
+ZMarkingSMR::ZMarkingSMR()
+  : _worker_states(),
+    _expanded_recently() {
+}
+
+void ZMarkingSMR::free_node(ZMarkStackListNode* node) {
+  // We use hazard pointers as an safe memory reclamation (SMR) technique,
+  // for marking stacks. Each stripe has a lock-free stack of mark stacks.
+  // When a GC thread (1) pops a mark stack from this lock-free stack,
+  // there is a small window of time when the head has been read and we
+  // are about to read its next pointer. It is then of great importance
+  // that the node is not concurrently freed by another concurrent GC
+  // thread (2), popping the same entry. In such an event, the memory
+  // of the freed node could, for example become part of a separate
+  // node, and potentially pushed onto a separate stripe, with a
+  // different next pointer referring to a node of the other stripe.
+  // When GC thread (1) then reads the next pointer of what it believed
+  // to be the current head node of the first stripe, it actually read
+  // a next pointer of a logically different node, pointing into the
+  // other stripe. GC thread (2) could then pop the node from the second
+  // mark stripe and re-insert it as the head of the first stripe.
+  // Disaster eventually hits when GC thread (1) succeeds with its
+  // CAS (ABA problem), switching the loaded head to the loaded next
+  // pointer of the head. Due to the next pointer belonging to a logically
+  // different node than the logical head, we can accidentally corrupt the
+  // stack integrity. Using hazard pointers involves publishing what head
+  // was observed by GC thread (1), so that GC thread (2) knows not to
+  // free the node when popping it in this race. This prevents the racy
+  // interactions from causing any such use-after-free problems.
+
+  assert(Thread::current()->is_Worker_thread(), "must be a worker");
+
+  ZWorkerState* const local_state = _worker_states.addr();
+  ZArray<ZMarkStackListNode*>* const freeing = &local_state->_freeing;
+  freeing->append(node);
+
+  if (freeing->length() < (int)ZPerWorkerStorage::count() * 8) {
+    return;
+  }
+
+  ZPerWorkerIterator<ZWorkerState> iter(&_worker_states);
+  ZArray<ZMarkStackListNode*>* const scanned_hazards = &local_state->_scanned_hazards;
+
+  for (ZWorkerState* remote_state; iter.next(&remote_state);) {
+    ZMarkStackListNode* const hazard = Atomic::load(&remote_state->_hazard_ptr);
+
+    if (hazard != nullptr) {
+      scanned_hazards->append(hazard);
+    }
+  }
+
+  int kept = 0;
+  for (int i = 0; i < freeing->length(); ++i) {
+    ZMarkStackListNode* node = freeing->at(i);
+    freeing->at_put(i, nullptr);
+
+    if (scanned_hazards->contains(node)) {
+      // Keep
+      freeing->at_put(kept++, node);
+    } else {
+      // Delete
+      delete node;
+    }
+  }
+
+  scanned_hazards->clear();
+  freeing->trunc_to(kept);
+}
+
+void ZMarkingSMR::free() {
+  // Here it is free by definition to free mark stacks.
+  ZPerWorkerIterator<ZWorkerState> iter(&_worker_states);
+  for (ZWorkerState* worker_state; iter.next(&worker_state);) {
+    ZArray<ZMarkStackListNode*>* const freeing = &worker_state->_freeing;
+    for (ZMarkStackListNode* node: *freeing) {
+      delete node;
+    }
+    freeing->clear();
+  }
+}
+
+ZMarkStackListNode* volatile* ZMarkingSMR::hazard_ptr() {
+  return &_worker_states.addr()->_hazard_ptr;
+}
diff --git a/src/hotspot/share/gc/z/zMarkStackAllocator.hpp b/src/hotspot/share/gc/z/zMarkingSMR.hpp
similarity index 50%
rename from src/hotspot/share/gc/z/zMarkStackAllocator.hpp
rename to src/hotspot/share/gc/z/zMarkingSMR.hpp
index dc18a23e101..a6c5afe76c9 100644
--- a/src/hotspot/share/gc/z/zMarkStackAllocator.hpp
+++ b/src/hotspot/share/gc/z/zMarkingSMR.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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,61 +24,30 @@
 #ifndef SHARE_GC_Z_ZMARKSTACKALLOCATOR_HPP
 #define SHARE_GC_Z_ZMARKSTACKALLOCATOR_HPP
 
-#include "gc/z/zGlobals.hpp"
-#include "gc/z/zLock.hpp"
-#include "gc/z/zMarkStack.hpp"
+#include "gc/z/zArray.hpp"
+#include "gc/z/zValue.hpp"
 #include "utilities/globalDefinitions.hpp"
+#include "memory/allocation.hpp"
 
-class ZMarkStackSpace {
+class ZMarkStackListNode;
+
+class ZMarkingSMR: public CHeapObj<mtGC> {
 private:
-  ZLock              _expand_lock;
-  uintptr_t          _start;
-  volatile uintptr_t _top;
-  volatile uintptr_t _end;
-  volatile bool      _recently_expanded;
+  struct ZWorkerState {
+    ZMarkStackListNode* volatile _hazard_ptr;
+    ZArray<ZMarkStackListNode*>  _scanned_hazards;
+    ZArray<ZMarkStackListNode*>  _freeing;
+  };
 
-  size_t used() const;
-
-  size_t expand_space();
-  size_t shrink_space();
-
-  uintptr_t alloc_space(size_t size);
-  uintptr_t expand_and_alloc_space(size_t size);
+  ZPerWorker<ZWorkerState> _worker_states;
+  volatile bool            _expanded_recently;
 
 public:
-  ZMarkStackSpace();
-
-  bool is_initialized() const;
-
-  uintptr_t start() const;
-  size_t size() const;
-
-  uintptr_t alloc(size_t size);
-  void free();
-};
-
-class ZMarkStackAllocator : public CHeapObj<mtGC> {
-private:
-  ZCACHE_ALIGNED ZMarkStackSpace        _space;
-  ZCACHE_ALIGNED ZMarkStackMagazineList _freelist;
-  ZCACHE_ALIGNED volatile bool          _expanded_recently;
-
-  ZMarkStackMagazine* create_magazine_from_space(uintptr_t addr, size_t size);
-
-public:
-  ZMarkStackAllocator();
-
-  bool is_initialized() const;
-
-  uintptr_t start() const;
-  size_t size() const;
-
-  bool clear_and_get_expanded_recently();
-
-  ZMarkStackMagazine* alloc_magazine();
-  void free_magazine(ZMarkStackMagazine* magazine);
-
+  ZMarkingSMR();
   void free();
+  ZMarkStackListNode* allocate_stack();
+  void free_node(ZMarkStackListNode* stack);
+  ZMarkStackListNode* volatile* hazard_ptr();
 };
 
 #endif // SHARE_GC_Z_ZMARKSTACKALLOCATOR_HPP
diff --git a/src/hotspot/share/gc/z/zRemembered.cpp b/src/hotspot/share/gc/z/zRemembered.cpp
index 4cfc349acc4..3bb17152d41 100644
--- a/src/hotspot/share/gc/z/zRemembered.cpp
+++ b/src/hotspot/share/gc/z/zRemembered.cpp
@@ -550,7 +550,7 @@ public:
     // publish such marking stacks to prevent that generation from getting a mark continue.
     // We also flush in case of a resize where a new worker thread continues the marking
     // work, causing a mark continue for the collected generation.
-    ZHeap::heap()->mark_flush_and_free(Thread::current());
+    ZHeap::heap()->mark_flush(Thread::current());
   }
 
   virtual void resize_workers(uint nworkers) {
diff --git a/src/hotspot/share/gc/z/zStat.cpp b/src/hotspot/share/gc/z/zStat.cpp
index 3fe60f48e89..558ccdf105a 100644
--- a/src/hotspot/share/gc/z/zStat.cpp
+++ b/src/hotspot/share/gc/z/zStat.cpp
@@ -1424,8 +1424,7 @@ ZStatMark::ZStatMark()
     _nproactiveflush(),
     _nterminateflush(),
     _ntrycomplete(),
-    _ncontinue(),
-    _mark_stack_usage() {}
+    _ncontinue() {}
 
 void ZStatMark::at_mark_start(size_t nstripes) {
   _nstripes = nstripes;
@@ -1441,10 +1440,6 @@ void ZStatMark::at_mark_end(size_t nproactiveflush,
   _ncontinue = ncontinue;
 }
 
-void ZStatMark::at_mark_free(size_t mark_stack_usage) {
-  _mark_stack_usage = mark_stack_usage;
-}
-
 void ZStatMark::print() {
   log_info(gc, marking)("Mark: "
                         "%zu stripe(s), "
@@ -1457,8 +1452,6 @@ void ZStatMark::print() {
                         _nterminateflush,
                         _ntrycomplete,
                         _ncontinue);
-
-  log_info(gc, marking)("Mark Stack Usage: %zuM", _mark_stack_usage / M);
 }
 
 //
diff --git a/src/hotspot/share/gc/z/zStat.hpp b/src/hotspot/share/gc/z/zStat.hpp
index d1693857918..0078c963626 100644
--- a/src/hotspot/share/gc/z/zStat.hpp
+++ b/src/hotspot/share/gc/z/zStat.hpp
@@ -506,7 +506,6 @@ public:
                    size_t nterminateflush,
                    size_t ntrycomplete,
                    size_t ncontinue);
-  void at_mark_free(size_t mark_stack_usage);
 
   void print();
 };
diff --git a/src/hotspot/share/gc/z/z_globals.hpp b/src/hotspot/share/gc/z/z_globals.hpp
index 4e307632969..4555b470cac 100644
--- a/src/hotspot/share/gc/z/z_globals.hpp
+++ b/src/hotspot/share/gc/z/z_globals.hpp
@@ -41,10 +41,6 @@
           "Maximum allowed heap fragmentation")                             \
           range(0, 100)                                                     \
                                                                             \
-  product(size_t, ZMarkStackSpaceLimit, 8*G,                                \
-          "Maximum number of bytes allocated for mark stacks")              \
-          range(32*M, 1024*G)                                               \
-                                                                            \
   product(double, ZCollectionInterval, 0,                                   \
           "Force GC at a fixed time interval (in seconds). "                \
           "Backwards compatible alias for ZCollectionIntervalMajor")        \
diff --git a/src/hotspot/share/runtime/arguments.cpp b/src/hotspot/share/runtime/arguments.cpp
index baeb591ef1a..b3f70592f6f 100644
--- a/src/hotspot/share/runtime/arguments.cpp
+++ b/src/hotspot/share/runtime/arguments.cpp
@@ -534,6 +534,7 @@ static SpecialFlag const special_jvm_flags[] = {
 
   { "MetaspaceReclaimPolicy",       JDK_Version::undefined(), JDK_Version::jdk(21), JDK_Version::undefined() },
   { "ZGenerational",                JDK_Version::jdk(23), JDK_Version::jdk(24), JDK_Version::undefined() },
+  { "ZMarkStackSpaceLimit",         JDK_Version::undefined(), JDK_Version::jdk(25), JDK_Version::undefined() },
 
 #ifdef ASSERT
   { "DummyObsoleteTestFlag",        JDK_Version::undefined(), JDK_Version::jdk(18), JDK_Version::undefined() },

From ddb256911032cd7e6fae17c342261276066d8d25 Mon Sep 17 00:00:00 2001
From: Calvin Cheung <ccheung@openjdk.org>
Date: Mon, 24 Feb 2025 19:54:48 +0000
Subject: [PATCH 100/587] 8280682: Refactor AOT code source validation checks

Co-authored-by: Ioi Lam <iklam@openjdk.org>
Reviewed-by: iklam, asmehra, dholmes, kvn
---
 src/hotspot/share/cds/aotClassLocation.cpp    | 999 ++++++++++++++++++
 src/hotspot/share/cds/aotClassLocation.hpp    | 269 +++++
 src/hotspot/share/cds/archiveHeapLoader.hpp   |   3 +-
 src/hotspot/share/cds/cdsConfig.cpp           |   1 +
 src/hotspot/share/cds/cdsConstants.cpp        |   1 -
 src/hotspot/share/cds/cdsProtectionDomain.cpp |  26 +-
 src/hotspot/share/cds/cppVtables.cpp          |   1 -
 src/hotspot/share/cds/dynamicArchive.cpp      |  15 +-
 src/hotspot/share/cds/filemap.cpp             | 828 +--------------
 src/hotspot/share/cds/filemap.hpp             | 196 +---
 src/hotspot/share/cds/heapShared.cpp          |   6 +-
 src/hotspot/share/cds/metaspaceShared.cpp     |  33 +-
 src/hotspot/share/cds/unregisteredClasses.cpp |   1 +
 src/hotspot/share/classfile/classLoader.cpp   | 246 +----
 src/hotspot/share/classfile/classLoader.hpp   |  58 +-
 .../share/classfile/classLoader.inline.hpp    |  43 +-
 .../share/classfile/classLoaderDataShared.cpp |  17 +
 .../share/classfile/classLoaderDataShared.hpp |   4 +-
 .../share/classfile/classLoaderExt.cpp        | 254 +----
 .../share/classfile/classLoaderExt.hpp        |  90 +-
 src/hotspot/share/classfile/moduleEntry.cpp   |   6 +-
 src/hotspot/share/classfile/stringTable.cpp   |   1 -
 .../share/classfile/systemDictionary.cpp      |  14 +-
 src/hotspot/share/memory/allocation.hpp       |   3 +-
 src/hotspot/share/oops/klass.hpp              |   6 +-
 src/hotspot/share/prims/jvmtiEnv.cpp          |   4 +-
 src/hotspot/share/runtime/arguments.cpp       |   1 -
 src/hotspot/share/runtime/threads.cpp         |   9 -
 .../cds/appcds/BootClassPathMismatch.java     |  23 +-
 .../runtime/cds/appcds/ClassPathAttr.java     |  38 +-
 .../cds/appcds/CommonAppClasspath.java        |   4 +-
 .../runtime/cds/appcds/NonExistClasspath.java |   4 +-
 .../cds/appcds/PrintSharedArchiveAndExit.java |  18 +-
 .../cds/appcds/SharedArchiveConsistency.java  |  12 +-
 .../cds/appcds/TraceLongClasspath.java        |  14 +-
 .../runtime/cds/appcds/WrongClasspath.java    |   4 +-
 .../dynamicArchive/ArchiveConsistency.java    |  18 +-
 .../dynamicArchive/WrongTopClasspath.java     |   4 +-
 .../jigsaw/modulepath/ModulePathAndFMG.java   |  47 +-
 .../lib/jdk/test/lib/cds/CDSArchiveUtils.java |   9 +-
 40 files changed, 1537 insertions(+), 1793 deletions(-)
 create mode 100644 src/hotspot/share/cds/aotClassLocation.cpp
 create mode 100644 src/hotspot/share/cds/aotClassLocation.hpp

diff --git a/src/hotspot/share/cds/aotClassLocation.cpp b/src/hotspot/share/cds/aotClassLocation.cpp
new file mode 100644
index 00000000000..8d453fe1773
--- /dev/null
+++ b/src/hotspot/share/cds/aotClassLocation.cpp
@@ -0,0 +1,999 @@
+/*
+ * Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please 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 "cds/aotClassLocation.hpp"
+#include "cds/archiveBuilder.hpp"
+#include "cds/cdsConfig.hpp"
+#include "cds/dynamicArchive.hpp"
+#include "cds/filemap.hpp"
+#include "cds/metaspaceShared.hpp"
+#include "cds/serializeClosure.hpp"
+#include "classfile/classLoader.hpp"
+#include "classfile/classLoaderData.hpp"
+#include "classfile/javaClasses.hpp"
+#include "logging/log.hpp"
+#include "logging/logStream.hpp"
+#include "memory/metadataFactory.hpp"
+#include "memory/metaspaceClosure.hpp"
+#include "memory/resourceArea.hpp"
+#include "oops/array.hpp"
+#include "oops/objArrayKlass.hpp"
+#include "runtime/arguments.hpp"
+#include "utilities/classpathStream.hpp"
+#include "utilities/formatBuffer.hpp"
+#include "utilities/stringUtils.hpp"
+
+#include <sys/stat.h>
+#include <errno.h>
+
+AOTClassLocationConfig* AOTClassLocationConfig::_dumptime_instance = nullptr;
+const AOTClassLocationConfig* AOTClassLocationConfig::_runtime_instance = nullptr;
+
+// A ClassLocationStream represents a list of code locations, which can be iterated using
+// start() and has_next().
+class ClassLocationStream {
+protected:
+  GrowableArray<const char*> _array;
+  int _current;
+
+  // Add one path to this stream.
+  void add_one_path(const char* path) {
+    _array.append(path);
+  }
+
+  // Add all paths specified in cp; cp must be from -classpath or -Xbootclasspath/a.
+  void add_paths_in_classpath(const char* cp) {
+    ClasspathStream cp_stream(cp);
+    while (cp_stream.has_next()) {
+      add_one_path(cp_stream.get_next());
+    }
+  }
+
+public:
+  ClassLocationStream() : _array(), _current(0) {}
+
+  void print(outputStream* st) const {
+    const char* sep = "";
+    for (int i = 0; i < _array.length(); i++) {
+      st->print("%s%s", sep, _array.at(i));
+      sep = os::path_separator();
+    }
+  }
+
+  void add(ClassLocationStream& css) {
+    for (css.start(); css.has_next();) {
+      add_one_path(css.get_next());
+    }
+  }
+
+  // Iteration
+  void start() { _current = 0; }
+  bool has_next() const { return _current < _array.length(); }
+  const char* get_next() {
+    return _array.at(_current++);
+  }
+
+  int current() const { return _current; }
+  bool is_empty() const { return _array.length() == 0; }
+};
+
+class BootCpClassLocationStream : public ClassLocationStream {
+public:
+  BootCpClassLocationStream() : ClassLocationStream() {
+    // Arguments::get_boot_class_path() contains $JAVA_HOME/lib/modules, but we treat that separately
+    for (const char* bootcp = Arguments::get_boot_class_path(); *bootcp != '\0'; ++bootcp) {
+      if (*bootcp == *os::path_separator()) {
+        ++bootcp;
+        add_paths_in_classpath(bootcp);
+        break;
+      }
+    }
+  }
+};
+
+class AppCpClassLocationStream : public ClassLocationStream {
+public:
+  AppCpClassLocationStream() : ClassLocationStream() {
+    const char* appcp = Arguments::get_appclasspath();
+    if (strcmp(appcp, ".") == 0) {
+      appcp = "";
+    }
+    add_paths_in_classpath(appcp);
+  }
+};
+
+class ModulePathClassLocationStream : public ClassLocationStream {
+  bool _has_non_jar_modules;
+public:
+  ModulePathClassLocationStream();
+  bool has_non_jar_modules() { return _has_non_jar_modules; }
+};
+
+// AllClassLocationStreams is used to iterate over all the code locations that
+// are available to the application from -Xbootclasspath, -classpath and --module-path.
+// When creating an AOT cache, we store the contents from AllClassLocationStreams
+// into an array of AOTClassLocations. See AOTClassLocationConfig::dumptime_init_helper().
+// When loading the AOT cache in a production run, we compare the contents of the
+// stored AOTClassLocations against the current AllClassLocationStreams to determine whether
+// the AOT cache is compatible with the current JVM. See AOTClassLocationConfig::validate().
+class AllClassLocationStreams {
+  BootCpClassLocationStream _boot_cp;          // Specified by -Xbootclasspath/a
+  AppCpClassLocationStream _app_cp;            // Specified by -classpath
+  ModulePathClassLocationStream _module_path;  // Specified by --module-path
+  ClassLocationStream _boot_and_app_cp;        // Convenience for iterating over both _boot and _app
+public:
+  BootCpClassLocationStream& boot_cp()             { return _boot_cp; }
+  AppCpClassLocationStream& app_cp()               { return _app_cp; }
+  ModulePathClassLocationStream& module_path()     { return _module_path; }
+  ClassLocationStream& boot_and_app_cp()           { return _boot_and_app_cp; }
+
+  AllClassLocationStreams() : _boot_cp(), _app_cp(), _module_path(), _boot_and_app_cp() {
+    _boot_and_app_cp.add(_boot_cp);
+    _boot_and_app_cp.add(_app_cp);
+  }
+};
+
+static bool has_jar_suffix(const char* filename) {
+  // In jdk.internal.module.ModulePath.readModule(), it checks for the ".jar" suffix.
+  // Performing the same check here.
+  const char* dot = strrchr(filename, '.');
+  if (dot != nullptr && strcmp(dot + 1, "jar") == 0) {
+    return true;
+  }
+  return false;
+}
+
+static int compare_module_path_by_name(const char** p1, const char** p2) {
+  return strcmp(*p1, *p2);
+}
+
+ModulePathClassLocationStream::ModulePathClassLocationStream() : ClassLocationStream(), _has_non_jar_modules(false) {
+  // Note: for handling of --module-path, see
+  //   https://openjdk.org/jeps/261#Module-paths
+  //   https://docs.oracle.com/en/java/javase/23/docs/api/java.base/java/lang/module/ModuleFinder.html#of(java.nio.file.Path...)
+
+  const char* jdk_module_path = Arguments::get_property("jdk.module.path");
+  if (jdk_module_path == nullptr) {
+    return;
+  }
+
+  ClasspathStream cp_stream(jdk_module_path);
+  while (cp_stream.has_next()) {
+    const char* path = cp_stream.get_next();
+    DIR* dirp = os::opendir(path);
+    if (dirp == nullptr && errno == ENOTDIR && has_jar_suffix(path)) {
+      add_one_path(path);
+    } else if (dirp != nullptr) {
+      struct dirent* dentry;
+      bool found_jar = false;
+      while ((dentry = os::readdir(dirp)) != nullptr) {
+        const char* file_name = dentry->d_name;
+        if (has_jar_suffix(file_name)) {
+          size_t full_name_len = strlen(path) + strlen(file_name) + strlen(os::file_separator()) + 1;
+          char* full_name = NEW_RESOURCE_ARRAY(char, full_name_len);
+          int n = os::snprintf(full_name, full_name_len, "%s%s%s", path, os::file_separator(), file_name);
+          assert((size_t)n == full_name_len - 1, "Unexpected number of characters in string");
+          add_one_path(full_name);
+          found_jar = true;
+        } else if (strcmp(file_name, ".") != 0 && strcmp(file_name, "..") != 0) {
+          // Found some non jar entries
+          _has_non_jar_modules = true;
+          log_info(class, path)("Found non-jar path: '%s%s%s'", path, os::file_separator(), file_name);
+        }
+      }
+      if (!found_jar) {
+        log_info(class, path)("Found exploded module path: '%s'", path);
+        _has_non_jar_modules = true;
+      }
+      os::closedir(dirp);
+    } else {
+      _has_non_jar_modules = true;
+    }
+  }
+
+  _array.sort(compare_module_path_by_name);
+}
+
+AOTClassLocation* AOTClassLocation::allocate(JavaThread* current, const char* path, int index,
+                                             Group group, bool from_cpattr, bool is_jrt) {
+  size_t path_length = 0;
+  size_t manifest_length = 0;
+  bool check_time = false;
+  time_t timestamp = 0;
+  int64_t filesize = 0;
+  FileType type = FileType::NORMAL;
+  // Do not record the actual path of the jrt, as the entire JDK can be moved to a different
+  // directory.
+  const char* recorded_path = is_jrt ? "" : path;
+  path_length = strlen(recorded_path);
+
+  struct stat st;
+  if (os::stat(path, &st) == 0) {
+    if ((st.st_mode & S_IFMT) == S_IFDIR) {
+      type = FileType::DIR;
+    } else {
+      timestamp = st.st_mtime;
+      filesize = st.st_size;
+
+      // The timestamp of $JAVA_HOME/lib/modules is not checked at runtime.
+      check_time = !is_jrt;
+    }
+#ifdef _WINDOWS
+  } else if (errno == ERROR_FILE_NOT_FOUND || errno == ERROR_PATH_NOT_FOUND) {
+    // On Windows, the errno could be ERROR_PATH_NOT_FOUND (3) in case the directory
+    // path doesn't exist.
+    type = FileType::NOT_EXIST;
+#endif
+  } else if (errno == ENOENT) {
+    // We allow the file to not exist, as long as it also doesn't exist during runtime.
+    type = FileType::NOT_EXIST;
+  } else {
+    log_error(cds)("Unable to open file %s.", path);
+    MetaspaceShared::unrecoverable_loading_error();
+  }
+
+  ResourceMark rm(current);
+  char* manifest = nullptr;
+
+  if (!is_jrt && type == FileType::NORMAL) {
+    manifest = read_manifest(current, path, manifest_length); // resource allocated
+  }
+
+  size_t cs_size = header_size() +
+    + path_length + 1 /* nul-terminated */
+    + manifest_length + 1; /* nul-terminated */
+
+  AOTClassLocation* cs = (AOTClassLocation*)os::malloc(cs_size, mtClassShared);
+  memset(cs, 0, cs_size);
+  cs->_path_length = path_length;
+  cs->_manifest_length = manifest_length;
+  cs->_check_time = check_time;
+  cs->_from_cpattr = from_cpattr;
+  cs->_timestamp = timestamp;
+  cs->_filesize = filesize;
+  cs->_file_type = type;
+  cs->_group = group;
+  cs->_index = index;
+
+  strcpy(((char*)cs) + cs->path_offset(), recorded_path);
+  if (manifest_length > 0) {
+    memcpy(((char*)cs) + cs->manifest_offset(), manifest, manifest_length);
+  }
+  assert(*(cs->manifest() + cs->manifest_length()) == '\0', "should be nul-terminated");
+
+  if (strstr(cs->manifest(), "Multi-Release: true") != nullptr) {
+    cs->_is_multi_release_jar = true;
+  }
+
+  if (strstr(cs->manifest(), "Extension-List:") != nullptr) {
+    vm_exit_during_cds_dumping(err_msg("-Xshare:dump does not support Extension-List in JAR manifest: %s", path));
+  }
+
+  return cs;
+}
+
+char* AOTClassLocation::read_manifest(JavaThread* current, const char* path, size_t& manifest_length) {
+  manifest_length = 0;
+
+  struct stat st;
+  if (os::stat(path, &st) != 0) {
+    return nullptr;
+  }
+
+  ClassPathEntry* cpe = ClassLoader::create_class_path_entry(current, path, &st);
+  if (cpe == nullptr) {
+    // <path> is a file, but not a JAR file
+    return nullptr;
+  }
+  assert(cpe->is_jar_file(), "should not be called with a directory");
+
+  const char* name = "META-INF/MANIFEST.MF";
+  char* manifest;
+  jint size;
+  manifest = (char*) ((ClassPathZipEntry*)cpe)->open_entry(current, name, &size, true);
+
+  if (manifest == nullptr || size <= 0) { // No Manifest
+    manifest_length = 0;
+  } else {
+    manifest_length = (size_t)size;
+  }
+
+  delete cpe;
+  return manifest;
+}
+
+// The result is resource allocated.
+char* AOTClassLocation::get_cpattr() const {
+  if (_manifest_length == 0) {
+    return nullptr;
+  }
+
+  size_t buf_size = _manifest_length + 1;
+  char* buf = NEW_RESOURCE_ARRAY(char, buf_size);
+  memcpy(buf, manifest(), _manifest_length);
+  buf[_manifest_length] = 0; // make sure it's 0-terminated
+
+  // See http://docs.oracle.com/javase/6/docs/technotes/guides/jar/jar.html#JAR%20Manifest
+  // Replace all CR/LF and CR with LF
+  StringUtils::replace_no_expand(buf, "\r\n", "\n");
+  // Remove all new-line continuation (remove all "\n " substrings)
+  StringUtils::replace_no_expand(buf, "\n ", "");
+
+  const char* tag = "Class-Path: ";
+  size_t tag_len = strlen(tag);
+  char* found = nullptr;
+  char* line_start = buf;
+  char* end = buf + _manifest_length;
+
+  assert(*end == 0, "must be nul-terminated");
+
+  while (line_start < end) {
+    char* line_end = strchr(line_start, '\n');
+    if (line_end == nullptr) {
+      // JAR spec require the manifest file to be terminated by a new line.
+      break;
+    }
+    if (strncmp(tag, line_start, tag_len) == 0) {
+      if (found != nullptr) {
+        // Same behavior as jdk/src/share/classes/java/util/jar/Attributes.java
+        // If duplicated entries are found, the last one is used.
+        log_warning(cds)("Warning: Duplicate name in Manifest: %s.\n"
+                         "Ensure that the manifest does not have duplicate entries, and\n"
+                         "that blank lines separate individual sections in both your\n"
+                         "manifest and in the META-INF/MANIFEST.MF entry in the jar file:\n%s\n", tag, path());
+      }
+      found = line_start + tag_len;
+      assert(found <= line_end, "sanity");
+      *line_end = '\0';
+    }
+    line_start = line_end + 1;
+  }
+
+  return found;
+}
+
+AOTClassLocation* AOTClassLocation::write_to_archive() const {
+  AOTClassLocation* archived_copy = (AOTClassLocation*)ArchiveBuilder::ro_region_alloc(total_size());
+  memcpy((char*)archived_copy, (char*)this, total_size());
+  return archived_copy;
+}
+
+const char* AOTClassLocation::file_type_string() const {
+  switch (_file_type) {
+  case FileType::NORMAL: return "file";
+  case FileType::DIR: return "dir";
+  case FileType::NOT_EXIST: default: return "not-exist";
+  }
+}
+
+bool AOTClassLocation::check(const char* runtime_path, bool has_aot_linked_classes) const {
+  struct stat st;
+  if (os::stat(runtime_path, &st) != 0) {
+    if (_file_type != FileType::NOT_EXIST) {
+      log_warning(cds)("Required classpath entry does not exist: %s", runtime_path);
+      return false;
+    }
+  } else if ((st.st_mode & S_IFMT) == S_IFDIR) {
+    if (_file_type == FileType::NOT_EXIST) {
+      log_warning(cds)("'%s' must not exist", runtime_path);
+      return false;
+    }
+    if (_file_type == FileType::NORMAL) {
+      log_warning(cds)("'%s' must be a file", runtime_path);
+      return false;
+    }
+    if (!os::dir_is_empty(runtime_path)) {
+      log_warning(cds)("directory is not empty: '%s'", runtime_path);
+      return false;
+    }
+  } else {
+    if (_file_type == FileType::NOT_EXIST) {
+      log_warning(cds)("'%s' must not exist", runtime_path);
+      if (has_aot_linked_classes) {
+        log_error(cds)("CDS archive has aot-linked classes. It cannot be used because the "
+                       "file %s exists", runtime_path);
+        return false;
+      } else {
+        log_warning(cds)("Archived non-system classes are disabled because the "
+                         "file %s exists", runtime_path);
+        FileMapInfo::current_info()->set_has_platform_or_app_classes(false);
+        if (DynamicArchive::is_mapped()) {
+          FileMapInfo::dynamic_info()->set_has_platform_or_app_classes(false);
+        }
+      }
+    }
+    if (_file_type == FileType::DIR) {
+      log_warning(cds)("'%s' must be a directory", runtime_path);
+      return false;
+    }
+    bool size_differs = _filesize != st.st_size;
+    bool time_differs = _check_time && (_timestamp != st.st_mtime);
+    if (size_differs || time_differs) {
+      log_warning(cds)("This file is not the one used while building the shared archive file: '%s'%s%s",
+                       runtime_path,
+                       time_differs ? ", timestamp has changed" : "",
+                       size_differs ? ", size has changed" : "");
+      return false;
+    }
+  }
+
+  log_info(class, path)("ok");
+  return true;
+}
+
+void AOTClassLocationConfig::dumptime_init(JavaThread* current) {
+  assert(CDSConfig::is_dumping_archive(), "");
+  _dumptime_instance = NEW_C_HEAP_OBJ(AOTClassLocationConfig, mtClassShared);
+  _dumptime_instance->dumptime_init_helper(current);
+  if (current->has_pending_exception()) {
+    // we can get an exception only when we run out of metaspace, but that
+    // shouldn't happen this early in bootstrap.
+    java_lang_Throwable::print(current->pending_exception(), tty);
+    vm_exit_during_initialization("AOTClassLocationConfig::dumptime_init_helper() failed unexpectedly");
+  }
+}
+
+void AOTClassLocationConfig::dumptime_init_helper(TRAPS) {
+  ResourceMark rm;
+  GrowableClassLocationArray tmp_array;
+  AllClassLocationStreams all_css;
+
+  AOTClassLocation* jrt = AOTClassLocation::allocate(THREAD, ClassLoader::get_jrt_entry()->name(),
+                                               0, Group::MODULES_IMAGE,
+                                               /*from_cpattr*/false, /*is_jrt*/true);
+  tmp_array.append(jrt);
+
+  parse(THREAD, tmp_array, all_css.boot_cp(), Group::BOOT_CLASSPATH, /*parse_manifest*/true);
+  _boot_classpath_end = tmp_array.length();
+
+  parse(THREAD, tmp_array, all_css.app_cp(), Group::APP_CLASSPATH, /*parse_manifest*/true);
+  _app_classpath_end = tmp_array.length();
+
+  parse(THREAD, tmp_array, all_css.module_path(), Group::MODULE_PATH, /*parse_manifest*/false);
+  _module_end = tmp_array.length();
+
+  _class_locations =  MetadataFactory::new_array<AOTClassLocation*>(ClassLoaderData::the_null_class_loader_data(),
+                                                               tmp_array.length(), CHECK);
+  for (int i = 0; i < tmp_array.length(); i++) {
+    _class_locations->at_put(i, tmp_array.at(i));
+  }
+
+  const char* lcp = find_lcp(all_css.boot_and_app_cp(), _dumptime_lcp_len);
+  if (_dumptime_lcp_len > 0) {
+    os::free((void*)lcp);
+    log_info(class, path)("Longest common prefix = %s (%zu chars)", lcp, _dumptime_lcp_len);
+  } else {
+    assert(_dumptime_lcp_len == 0, "sanity");
+    log_info(class, path)("Longest common prefix = <none> (0 chars)");
+  }
+
+  _has_non_jar_modules = all_css.module_path().has_non_jar_modules();
+  _has_platform_classes = false;
+  _has_app_classes = false;
+  _max_used_index = 0;
+}
+
+// Find the longest common prefix of two paths, up to max_lcp_len.
+// E.g.   p1 = "/a/b/foo"
+//        p2 = "/a/b/bar"
+//        max_lcp_len = 3
+// -> returns 3
+static size_t find_lcp_of_two_paths(const char* p1, const char* p2, size_t max_lcp_len) {
+  size_t lcp_len = 0;
+  char sep = os::file_separator()[0];
+  for (size_t i = 0; ; i++) {
+    char c1 = *p1++;
+    char c2 = *p2++;
+    if (c1 == 0 || c2 == 0 || c1 != c2) {
+      break;
+    }
+    if (c1 == sep) {
+      lcp_len = i + 1;
+      assert(lcp_len <= max_lcp_len, "sanity");
+      if (lcp_len == max_lcp_len) {
+        break;
+      }
+    }
+  }
+  return lcp_len;
+}
+
+// cheap-allocated if lcp_len > 0
+const char* AOTClassLocationConfig::find_lcp(ClassLocationStream& css, size_t& lcp_len) {
+  const char* first_path = nullptr;
+  char sep = os::file_separator()[0];
+
+  for (css.start(); css.has_next(); ) {
+    const char* path = css.get_next();
+    if (first_path == nullptr) {
+      first_path = path;
+      const char* p = strrchr(first_path, sep);
+      if (p == nullptr) {
+        lcp_len = 0;
+        return "";
+      } else {
+        lcp_len = p - first_path + 1;
+      }
+    } else {
+      lcp_len = find_lcp_of_two_paths(first_path, path, lcp_len);
+      if (lcp_len == 0) {
+        return "";
+      }
+    }
+  }
+
+  if (first_path != nullptr && lcp_len > 0) {
+    char* lcp = NEW_C_HEAP_ARRAY(char, lcp_len + 1, mtClassShared);
+    lcp[0] = 0;
+    strncat(lcp, first_path, lcp_len);
+    return lcp;
+  } else {
+    lcp_len = 0;
+    return "";
+  }
+}
+
+void AOTClassLocationConfig::parse(JavaThread* current, GrowableClassLocationArray& tmp_array,
+                                   ClassLocationStream& css, Group group, bool parse_manifest) {
+  for (css.start(); css.has_next(); ) {
+    add_class_location(current, tmp_array, css.get_next(), group, parse_manifest, /*from_cpattr*/false);
+  }
+}
+
+void AOTClassLocationConfig::add_class_location(JavaThread* current, GrowableClassLocationArray& tmp_array,
+                                                const char* path, Group group, bool parse_manifest, bool from_cpattr) {
+  AOTClassLocation* cs = AOTClassLocation::allocate(current, path, tmp_array.length(), group, from_cpattr);
+  tmp_array.append(cs);
+
+  if (!parse_manifest) {
+    // parse_manifest is true for -classpath and -Xbootclasspath/a, and false for --module-path.
+    return;
+  }
+
+  ResourceMark rm;
+  char* cp_attr = cs->get_cpattr(); // resource allocated
+  if (cp_attr != nullptr && strlen(cp_attr) > 0) {
+    //trace_class_path("found Class-Path: ", cp_attr); FIXME
+
+    char sep = os::file_separator()[0];
+    const char* dir_name = cs->path();
+    const char* dir_tail = strrchr(dir_name, sep);
+#ifdef _WINDOWS
+    // On Windows, we also support forward slash as the file separator when locating entries in the classpath entry.
+    const char* dir_tail2 = strrchr(dir_name, '/');
+    if (dir_tail == nullptr) {
+      dir_tail = dir_tail2;
+    } else if (dir_tail2 != nullptr && dir_tail2 > dir_tail) {
+      dir_tail = dir_tail2;
+    }
+#endif
+    int dir_len;
+    if (dir_tail == nullptr) {
+      dir_len = 0;
+    } else {
+      dir_len = pointer_delta_as_int(dir_tail, dir_name) + 1;
+    }
+
+    // Split the cp_attr by spaces, and add each file
+    char* file_start = cp_attr;
+    char* end = file_start + strlen(file_start);
+
+    while (file_start < end) {
+      char* file_end = strchr(file_start, ' ');
+      if (file_end != nullptr) {
+        *file_end = 0;
+        file_end += 1;
+      } else {
+        file_end = end;
+      }
+
+      size_t name_len = strlen(file_start);
+      if (name_len > 0) {
+        ResourceMark rm(current);
+        size_t libname_len = dir_len + name_len;
+        char* libname = NEW_RESOURCE_ARRAY(char, libname_len + 1);
+        int n = os::snprintf(libname, libname_len + 1, "%.*s%s", dir_len, dir_name, file_start);
+        assert((size_t)n == libname_len, "Unexpected number of characters in string");
+
+        // Avoid infinite recursion when two JAR files refer to each
+        // other via cpattr.
+        bool found_duplicate = false;
+        for (int i = boot_cp_start_index(); i < tmp_array.length(); i++) {
+          if (strcmp(tmp_array.at(i)->path(), libname) == 0) {
+            found_duplicate = true;
+            break;
+          }
+        }
+        if (!found_duplicate) {
+          add_class_location(current, tmp_array, libname, group, parse_manifest, /*from_cpattr*/true);
+        }
+      }
+
+      file_start = file_end;
+    }
+  }
+}
+
+AOTClassLocation const* AOTClassLocationConfig::class_location_at(int index) const {
+  return _class_locations->at(index);
+}
+
+int AOTClassLocationConfig::get_module_shared_path_index(Symbol* location) const {
+  if (location->starts_with("jrt:", 4)) {
+    assert(class_location_at(0)->is_modules_image(), "sanity");
+    return 0;
+  }
+
+  if (num_module_paths() == 0) {
+    // The archive(s) were created without --module-path option
+    return -1;
+  }
+
+  if (!location->starts_with("file:", 5)) {
+    return -1;
+  }
+
+  // skip_uri_protocol was also called during dump time -- see ClassLoaderExt::process_module_table()
+  ResourceMark rm;
+  const char* file = ClassLoader::uri_to_path(location->as_C_string());
+  for (int i = module_path_start_index(); i < module_path_end_index(); i++) {
+    const AOTClassLocation* cs = class_location_at(i);
+    assert(!cs->has_unnamed_module(), "must be");
+    bool same = os::same_files(file, cs->path());
+    log_debug(class, path)("get_module_shared_path_index (%d) %s : %s = %s", i,
+                           location->as_C_string(), cs->path(), same ? "same" : "different");
+    if (same) {
+      return i;
+    }
+  }
+  return -1;
+}
+
+// We allow non-empty dirs as long as no classes have been loaded from them.
+void AOTClassLocationConfig::check_nonempty_dirs() const {
+  assert(CDSConfig::is_dumping_archive(), "sanity");
+
+  bool has_nonempty_dir = false;
+  dumptime_iterate([&](AOTClassLocation* cs) {
+    if (cs->index() > _max_used_index) {
+      return false; // stop iterating
+    }
+    if (cs->is_dir()) {
+      if (!os::dir_is_empty(cs->path())) {
+        log_error(cds)("Error: non-empty directory '%s'", cs->path());
+        has_nonempty_dir = true;
+      }
+    }
+    return true; // keep iterating
+  });
+
+  if (has_nonempty_dir) {
+    vm_exit_during_cds_dumping("Cannot have non-empty directory in paths", nullptr);
+  }
+}
+
+AOTClassLocationConfig* AOTClassLocationConfig::write_to_archive() const {
+  Array<AOTClassLocation*>* archived_copy = ArchiveBuilder::new_ro_array<AOTClassLocation*>(_class_locations->length());
+  for (int i = 0; i < _class_locations->length(); i++) {
+    archived_copy->at_put(i, _class_locations->at(i)->write_to_archive());
+    ArchivePtrMarker::mark_pointer((address*)archived_copy->adr_at(i));
+  }
+
+  AOTClassLocationConfig* dumped = (AOTClassLocationConfig*)ArchiveBuilder::ro_region_alloc(sizeof(AOTClassLocationConfig));
+  memcpy(dumped, this, sizeof(AOTClassLocationConfig));
+  dumped->_class_locations = archived_copy;
+  ArchivePtrMarker::mark_pointer(&dumped->_class_locations);
+
+  return dumped;
+}
+
+bool AOTClassLocationConfig::check_classpaths(bool is_boot_classpath, bool has_aot_linked_classes,
+                                              int index_start, int index_end,
+                                              ClassLocationStream& runtime_css,
+                                              bool use_lcp_match, const char* runtime_lcp,
+                                              size_t runtime_lcp_len) const {
+  if (index_start >= index_end && runtime_css.is_empty()) { // nothing to check
+    return true;
+  }
+
+  ResourceMark rm;
+  const char* which = is_boot_classpath ? "boot" : "app";
+  LogTarget(Info, class, path) lt;
+  if (lt.is_enabled()) {
+    LogStream ls(lt);
+    ls.print("Checking %s classpath", which);
+    ls.print_cr("%s", use_lcp_match ? " (with longest common prefix substitution)" : "");
+    ls.print("- expected : '");
+    print_dumptime_classpath(ls, index_start, index_end, use_lcp_match, _dumptime_lcp_len, runtime_lcp, runtime_lcp_len);
+    ls.print_cr("'");
+    ls.print("- actual   : '");
+    runtime_css.print(&ls);
+    ls.print_cr("'");
+  }
+
+  runtime_css.start();
+  for (int i = index_start; i < index_end; i++) {
+    ResourceMark rm;
+    const AOTClassLocation* cs = class_location_at(i);
+    const char* effective_dumptime_path = cs->path();
+    if (use_lcp_match && _dumptime_lcp_len > 0) {
+      effective_dumptime_path = substitute(effective_dumptime_path, _dumptime_lcp_len, runtime_lcp, runtime_lcp_len);
+    }
+
+    log_info(class, path)("Checking '%s' %s%s", effective_dumptime_path, cs->file_type_string(),
+                          cs->from_cpattr() ? " (from JAR manifest ClassPath attribute)" : "");
+    if (!cs->from_cpattr() && file_exists(effective_dumptime_path)) {
+      if (!runtime_css.has_next()) {
+        log_warning(cds)("%s classpath has fewer elements than expected", which);
+        return false;
+      }
+      const char* runtime_path = runtime_css.get_next();
+      while (!file_exists(runtime_path) && runtime_css.has_next()) {
+        runtime_path = runtime_css.get_next();
+      }
+      if (!os::same_files(effective_dumptime_path, runtime_path)) {
+        log_warning(cds)("The name of %s classpath [%d] does not match: expected '%s', got '%s'",
+                         which, runtime_css.current(), effective_dumptime_path, runtime_path);
+        return false;
+      }
+    }
+
+    if (!cs->check(effective_dumptime_path, has_aot_linked_classes)) {
+      return false;
+    }
+  }
+
+  // Check if the runtime boot classpath has more entries than the one stored in the archive and if the app classpath
+  // or the module path requires validation.
+  if (is_boot_classpath && runtime_css.has_next() && (need_to_check_app_classpath() || num_module_paths() > 0)) {
+    // the check passes if all the extra runtime boot classpath entries are non-existent
+    if (check_paths_existence(runtime_css)) {
+      log_warning(cds)("boot classpath is longer than expected");
+      return false;
+    }
+  }
+
+  return true;
+}
+
+bool AOTClassLocationConfig::file_exists(const char* filename) const{
+  struct stat st;
+  return (os::stat(filename, &st) == 0 && st.st_size > 0);
+}
+
+bool AOTClassLocationConfig::check_paths_existence(ClassLocationStream& runtime_css) const {
+  bool exist = false;
+  while (runtime_css.has_next()) {
+    const char* path = runtime_css.get_next();
+    if (file_exists(path)) {
+      exist = true;
+      break;
+    }
+  }
+  return exist;
+}
+
+bool AOTClassLocationConfig::check_module_paths(bool has_aot_linked_classes, int index_start, int index_end,
+                                                ClassLocationStream& runtime_css,
+                                                bool* has_extra_module_paths) const {
+  if (index_start >= index_end && runtime_css.is_empty()) { // nothing to check
+    return true;
+  }
+
+  ResourceMark rm;
+
+  LogTarget(Info, class, path) lt;
+  if (lt.is_enabled()) {
+    LogStream ls(lt);
+    ls.print_cr("Checking module paths");
+    ls.print("- expected : '");
+    print_dumptime_classpath(ls, index_start, index_end, false, 0, nullptr, 0);
+    ls.print_cr("'");
+    ls.print("- actual   : '");
+    runtime_css.print(&ls);
+    ls.print_cr("'");
+  }
+
+  // Make sure all the dumptime module paths exist and are unchanged
+  for (int i = index_start; i < index_end; i++) {
+    const AOTClassLocation* cs = class_location_at(i);
+    const char* dumptime_path = cs->path();
+
+    assert(!cs->from_cpattr(), "not applicable for module path");
+    log_info(class, path)("Checking '%s' %s", dumptime_path, cs->file_type_string());
+
+    if (!cs->check(dumptime_path, has_aot_linked_classes)) {
+      return false;
+    }
+  }
+
+  // We allow runtime_css to be a superset of the module paths specified in dumptime. E.g.,
+  // Dumptime:    A:C
+  // Runtime:     A:B:C
+  runtime_css.start();
+  for (int i = index_start; i < index_end; i++) {
+    const AOTClassLocation* cs = class_location_at(i);
+    const char* dumptime_path = cs->path();
+
+    while (true) {
+      if (!runtime_css.has_next()) {
+        log_warning(cds)("module path has fewer elements than expected");
+        *has_extra_module_paths = true;
+        return true;
+      }
+      // Both this->class_locations() and runtime_css are alphabetically sorted. Skip
+      // items in runtime_css until we see dumptime_path.
+      const char* runtime_path = runtime_css.get_next();
+      if (!os::same_files(dumptime_path, runtime_path)) {
+        *has_extra_module_paths = true;
+        return true;
+      } else {
+        break;
+      }
+    }
+  }
+
+  if (runtime_css.has_next()) {
+    *has_extra_module_paths = true;
+  }
+
+  return true;
+}
+
+void AOTClassLocationConfig::print_dumptime_classpath(LogStream& ls, int index_start, int index_end,
+                                                      bool do_substitute, size_t remove_prefix_len,
+                                                      const char* prepend, size_t prepend_len) const {
+  const char* sep = "";
+  for (int i = index_start; i < index_end; i++) {
+    ResourceMark rm;
+    const AOTClassLocation* cs = class_location_at(i);
+    const char* path = cs->path();
+    if (!cs->from_cpattr()) {
+      ls.print("%s", sep);
+      if (do_substitute) {
+        path = substitute(path, remove_prefix_len, prepend, prepend_len);
+      }
+      ls.print("%s", path);
+      sep = os::path_separator();
+    }
+  }
+}
+
+// Returned path is resource-allocated
+const char* AOTClassLocationConfig::substitute(const char* path,         // start with this path (which was recorded from dump time)
+                                               size_t remove_prefix_len, // remove this number of chars from the beginning
+                                               const char* prepend,      // prepend this string
+                                               size_t prepend_len) {     // length of the prepended string
+  size_t len = strlen(path);
+  assert(len > remove_prefix_len, "sanity");
+  assert(prepend_len == strlen(prepend), "sanity");
+  len -= remove_prefix_len;
+  len += prepend_len;
+
+  char* buf = NEW_RESOURCE_ARRAY(char, len + 1);
+  int n = os::snprintf(buf, len + 1, "%s%s", prepend, path + remove_prefix_len);
+  assert(size_t(n) == len, "sanity");
+
+  return buf;
+}
+
+// For performance, we avoid using LCP match if there's at least one
+// AOTClassLocation can be matched exactly: this means all other AOTClassLocations must be
+// matched exactly.
+bool AOTClassLocationConfig::need_lcp_match(AllClassLocationStreams& all_css) const {
+  if (app_cp_end_index() == boot_cp_start_index()) {
+    // No need to use lcp-match when there are no boot/app paths.
+    // TODO: LCP-match not yet supported for modules.
+    return false;
+  }
+
+  if (need_lcp_match_helper(boot_cp_start_index(), boot_cp_end_index(), all_css.boot_cp()) &&
+      need_lcp_match_helper(app_cp_start_index(), app_cp_end_index(), all_css.app_cp())) {
+    return true;
+  } else {
+    return false;
+  }
+}
+
+bool AOTClassLocationConfig::need_lcp_match_helper(int start, int end, ClassLocationStream& css) const {
+  int i = start;
+  for (css.start(); i < end && css.has_next(); ) {
+    const AOTClassLocation* cs = class_location_at(i++);
+    const char* runtime_path = css.get_next();
+    if (cs->must_exist() && os::same_files(cs->path(), runtime_path)) {
+      // Most likely, we will come to here at the first iteration.
+      return false;
+    }
+  }
+  return true;
+}
+
+bool AOTClassLocationConfig::validate(bool has_aot_linked_classes, bool* has_extra_module_paths) const {
+  ResourceMark rm;
+  AllClassLocationStreams all_css;
+
+  const char* jrt = ClassLoader::get_jrt_entry()->name();
+  bool success = class_location_at(0)->check(jrt, has_aot_linked_classes);
+  log_info(class, path)("Modules image %s validation: %s", jrt, success ? "passed" : "failed");
+  if (!success) {
+    return false;
+  }
+  if (class_locations()->length() == 1) {
+    if ((module_path_start_index() >= module_path_end_index()) && Arguments::get_property("jdk.module.path") != nullptr) {
+      *has_extra_module_paths = true;
+    } else {
+      *has_extra_module_paths = false;
+    }
+  } else {
+    bool use_lcp_match = need_lcp_match(all_css);
+    const char* runtime_lcp;
+    size_t runtime_lcp_len;
+
+    log_info(class, path)("Longest common prefix substitution in boot/app classpath matching: %s",
+                          use_lcp_match ? "yes" : "no");
+    if (use_lcp_match) {
+      runtime_lcp = find_lcp(all_css.boot_and_app_cp(), runtime_lcp_len);
+      log_info(class, path)("Longest common prefix: %s (%zu chars)", runtime_lcp, runtime_lcp_len);
+    } else {
+      runtime_lcp = nullptr;
+      runtime_lcp_len = 0;
+    }
+
+    success = check_classpaths(true, has_aot_linked_classes, boot_cp_start_index(), boot_cp_end_index(), all_css.boot_cp(),
+                               use_lcp_match, runtime_lcp, runtime_lcp_len);
+    log_info(class, path)("Archived boot classpath validation: %s", success ? "passed" : "failed");
+
+    if (success && need_to_check_app_classpath()) {
+      success = check_classpaths(false, has_aot_linked_classes, app_cp_start_index(), app_cp_end_index(), all_css.app_cp(),
+                                 use_lcp_match, runtime_lcp, runtime_lcp_len);
+      log_info(class, path)("Archived app classpath validation: %s", success ? "passed" : "failed");
+    }
+
+    if (success) {
+      success = check_module_paths(has_aot_linked_classes, module_path_start_index(), module_path_end_index(),
+                                   all_css.module_path(), has_extra_module_paths);
+      log_info(class, path)("Archived module path validation: %s%s", success ? "passed" : "failed",
+                            (*has_extra_module_paths) ? " (extra module paths found)" : "");
+    }
+
+    if (runtime_lcp_len > 0) {
+      os::free((void*)runtime_lcp);
+    }
+  }
+
+  if (success) {
+    _runtime_instance = this;
+  } else {
+    const char* mismatch_msg = "shared class paths mismatch";
+    const char* hint_msg = log_is_enabled(Info, class, path) ?
+        "" : " (hint: enable -Xlog:class+path=info to diagnose the failure)";
+    if (RequireSharedSpaces && !PrintSharedArchiveAndExit) {
+      log_error(cds)("%s%s", mismatch_msg, hint_msg);
+      MetaspaceShared::unrecoverable_loading_error();
+    } else {
+      log_warning(cds)("%s%s", mismatch_msg, hint_msg);
+    }
+  }
+  return success;
+}
diff --git a/src/hotspot/share/cds/aotClassLocation.hpp b/src/hotspot/share/cds/aotClassLocation.hpp
new file mode 100644
index 00000000000..cb53e9c96e9
--- /dev/null
+++ b/src/hotspot/share/cds/aotClassLocation.hpp
@@ -0,0 +1,269 @@
+/*
+ * Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please 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_CDS_AOTCLASSLOCATION_HPP
+#define SHARE_CDS_AOTCLASSLOCATION_HPP
+
+#include "memory/allocation.hpp"
+#include "oops/array.hpp"
+#include "utilities/exceptions.hpp"
+#include "utilities/growableArray.hpp"
+#include "utilities/globalDefinitions.hpp"
+#include "utilities/macros.hpp"
+
+class AllClassLocationStreams;
+class ClassLocationStream;
+class LogStream;
+
+// An AOTClassLocation is a location where the application is configured to load Java classes
+// from. It can be:
+// - the location of $JAVA_HOME/lib/modules
+// - an entry in -Xbootclasspath/a
+// - an entry in -classpath
+// - a JAR file specified using --module-path.
+//
+// AOTClassLocation is similar to java.security.CodeSource, except:
+// - Only local files/dirs are allowed. Directories must be empty. Network locations are not allowed.
+// - No code signing information is recorded.
+//
+// We avoid using pointers in AOTClassLocation to avoid runtime pointer relocation. Each AOTClassLocation
+// is a variable-size structure:
+//    [ all fields specified below (sizeof(AOTClassLocation) bytes)          ]
+//    [ path (_path_length bytes, including the terminating zero)         ]
+//    [ manifest (_manifest_length bytes, including the terminating zero) ]
+class AOTClassLocation {
+public:
+  enum class Group : int {
+    MODULES_IMAGE,
+    BOOT_CLASSPATH,
+    APP_CLASSPATH,
+    MODULE_PATH
+  };
+private:
+  enum class FileType : int {
+    NORMAL,
+    DIR,
+    NOT_EXIST
+  };
+  size_t   _path_length;     // does NOT include terminating zero
+  size_t   _manifest_length; // does NOT include terminating zero
+  bool     _check_time;
+  bool     _from_cpattr;
+  bool     _is_multi_release_jar; // is this a JAR file that has multi-release classes?
+  FileType _file_type;
+  Group    _group;
+  int      _index; // index of this AOTClassLocation inside AOTClassLocationConfig::_class_locations
+  time_t   _timestamp;
+  int64_t  _filesize;
+
+  static size_t header_size()      { return sizeof(AOTClassLocation); } // bytes
+  size_t path_offset()       const { return header_size(); }
+  size_t manifest_offset()   const { return path_offset() + _path_length + 1; }
+  static char* read_manifest(JavaThread* current, const char* path, size_t& manifest_length);
+
+public:
+  static AOTClassLocation* allocate(JavaThread* current, const char* path, int index, Group group,
+                                    bool from_cpattr = false, bool is_jrt = false);
+
+  size_t total_size()                const { return manifest_offset() + _manifest_length + 1; }
+  const char* path()                 const { return ((const char*)this) + path_offset();  }
+  size_t manifest_length()           const { return _manifest_length; }
+  const char* manifest()             const { return ((const char*)this) + manifest_offset(); }
+  bool must_exist()                  const { return _file_type != FileType::NOT_EXIST; }
+  bool must_not_exist()              const { return _file_type == FileType::NOT_EXIST; }
+  bool is_dir()                      const { return _file_type == FileType::DIR; }
+  int index()                        const { return _index; }
+  bool is_modules_image()            const { return _group == Group::MODULES_IMAGE; }
+  bool from_boot_classpath()         const { return _group == Group::BOOT_CLASSPATH; }
+  bool from_app_classpath()          const { return _group == Group::APP_CLASSPATH; }
+  bool from_module_path()            const { return _group == Group::MODULE_PATH; }
+  bool is_multi_release_jar()        const { return _is_multi_release_jar; }
+
+  // Only boot/app classpaths can contain unnamed module
+  bool has_unnamed_module()          const { return from_boot_classpath() || from_app_classpath(); }
+
+  char* get_cpattr() const;
+  AOTClassLocation* write_to_archive() const;
+
+  // Returns true IFF this AOTClassLocation is discovered from the -classpath or -Xbootclasspath/a by parsing the
+  // "Class-Path" attribute of a JAR file.
+  bool from_cpattr() const { return _from_cpattr; }
+  const char* file_type_string() const;
+  bool check(const char* runtime_path, bool has_aot_linked_classes) const;
+};
+
+// AOTClassLocationConfig
+//
+// Keep track of the set of AOTClassLocations used when an AOTCache is created.
+// To load the AOTCache in a production run, the JVM must be using a compatible set of
+// AOTClassLocations (subjected to AOTClassLocationConfig::validate()).
+//
+// In general, validation is performed on the AOTClassLocations to ensure the code locations used
+// during AOTCache creation are the same as when the AOTCache is used during runtime.
+// Non-existent entries are recorded during AOTCache creation. Those non-existent entries,
+// if they are specified at runtime, must not exist.
+//
+// Some details on validation:
+// - the boot classpath can be appended to at runtime if there's no app classpath and no
+//   module path specified when an AOTCache is created;
+// - the app classpath can be appended to at runtime;
+// - the module path at runtime can be a superset of the one specified during AOTCache creation.
+
+class AOTClassLocationConfig : public CHeapObj<mtClassShared> {
+  using Group = AOTClassLocation::Group;
+  using GrowableClassLocationArray = GrowableArrayCHeap<AOTClassLocation*, mtClassShared>;
+
+  // Note: both of the following are non-null if we are dumping a dynamic archive.
+  static AOTClassLocationConfig* _dumptime_instance;
+  static const AOTClassLocationConfig* _runtime_instance;
+
+  Array<AOTClassLocation*>* _class_locations; // jrt -> -Xbootclasspath/a -> -classpath -> --module_path
+  int _boot_classpath_end;
+  int _app_classpath_end;
+  int _module_end;
+  bool _has_non_jar_modules;
+  bool _has_platform_classes;
+  bool _has_app_classes;
+  int  _max_used_index;
+  size_t _dumptime_lcp_len;
+
+  // accessors
+  Array<AOTClassLocation*>* class_locations() const { return _class_locations; }
+
+  void parse(JavaThread* current, GrowableClassLocationArray& tmp_array, ClassLocationStream& css,
+             Group group, bool parse_manifest);
+  void add_class_location(JavaThread* current, GrowableClassLocationArray& tmp_array, const char* path,
+                       Group group, bool parse_manifest, bool from_cpattr);
+  void dumptime_init_helper(TRAPS);
+
+  bool check_classpaths(bool is_boot_classpath, bool has_aot_linked_classes,
+                        int index_start, int index_end, ClassLocationStream& runtime_css,
+                        bool use_lcp_match, const char* runtime_lcp, size_t runtime_lcp_len) const;
+  bool check_module_paths(bool has_aot_linked_classes, int index_start, int index_end, ClassLocationStream& runtime_css,
+                          bool* has_extra_module_paths) const;
+  bool file_exists(const char* filename) const;
+  bool check_paths_existence(ClassLocationStream& runtime_css) const;
+
+  static const char* substitute(const char* path, size_t remove_prefix_len,
+                                const char* prepend, size_t prepend_len);
+  static const char* find_lcp(ClassLocationStream& css, size_t& lcp_len);
+  bool need_lcp_match(AllClassLocationStreams& all_css) const;
+  bool need_lcp_match_helper(int start, int end, ClassLocationStream& css) const;
+
+  template <typename FUNC> void dumptime_iterate_helper(FUNC func) const {
+    assert(_class_locations != nullptr, "sanity");
+    int n = _class_locations->length();
+    for (int i = 0; i < n; i++) {
+      if (!func(_class_locations->at(i))) {
+        break;
+      }
+    }
+  }
+
+  template <typename FUNC> void iterate(FUNC func) const {
+    int n = class_locations()->length();
+    for (int i = 0; i < n; i++) {
+      if (!func(class_locations()->at(i))) {
+        break;
+      }
+    }
+  }
+
+  void check_nonempty_dirs() const;
+  bool need_to_check_app_classpath() const {
+    return (num_app_classpaths() > 0) && (_max_used_index >= app_cp_start_index()) && has_platform_or_app_classes();
+  }
+
+  void print_dumptime_classpath(LogStream& ls, int index_start, int index_limit,
+                                bool do_substitute, size_t remove_prefix_len,
+                                const char* prepend, size_t prepend_len) const;
+public:
+  static AOTClassLocationConfig* dumptime() {
+    assert(_dumptime_instance != nullptr, "can only be called when dumping an AOT cache");
+    return _dumptime_instance;
+  }
+
+  static const AOTClassLocationConfig* runtime() {
+    assert(_runtime_instance != nullptr, "can only be called when using an AOT cache");
+    return _runtime_instance;
+  }
+
+  // Common accessors
+  int boot_cp_start_index()          const { return 1; }
+  int boot_cp_end_index()            const { return _boot_classpath_end; }
+  int app_cp_start_index()           const { return boot_cp_end_index(); }
+  int app_cp_end_index()             const { return _app_classpath_end; }
+  int module_path_start_index()      const { return app_cp_end_index(); }
+  int module_path_end_index()        const { return _module_end; }
+  bool has_platform_or_app_classes() const { return _has_app_classes || _has_platform_classes; }
+  bool has_non_jar_modules()         const { return _has_non_jar_modules; }
+  int num_boot_classpaths()          const { return boot_cp_end_index() - boot_cp_start_index(); }
+  int num_app_classpaths()           const { return app_cp_end_index() - app_cp_start_index(); }
+  int num_module_paths()             const { return module_path_end_index() - module_path_start_index(); }
+
+  int length() const {
+    return _class_locations->length();
+  }
+
+  const AOTClassLocation* class_location_at(int index) const;
+  int get_module_shared_path_index(Symbol* location) const;
+
+  // Functions used only during dumptime
+  static void dumptime_init(JavaThread* current);
+
+  static void dumptime_set_has_app_classes() {
+    _dumptime_instance->_has_app_classes = true;
+  }
+
+  static void dumptime_set_has_platform_classes() {
+    _dumptime_instance->_has_platform_classes = true;
+  }
+
+  static void dumptime_update_max_used_index(int index) {
+    if (_dumptime_instance == nullptr) {
+      assert(index == 0, "sanity");
+    } else if (_dumptime_instance->_max_used_index < index) {
+      _dumptime_instance->_max_used_index = index;
+    }
+  }
+
+  static void dumptime_check_nonempty_dirs() {
+    _dumptime_instance->check_nonempty_dirs();
+  }
+
+  static bool dumptime_is_ready() {
+    return _dumptime_instance != nullptr;
+  }
+  template <typename FUNC> static void dumptime_iterate(FUNC func) {
+    _dumptime_instance->dumptime_iterate_helper(func);
+  }
+
+  AOTClassLocationConfig* write_to_archive() const;
+
+  // Functions used only during runtime
+  bool validate(bool has_aot_linked_classes, bool* has_extra_module_paths) const;
+};
+
+
+#endif // SHARE_CDS_AOTCLASSLOCATION_HPP
diff --git a/src/hotspot/share/cds/archiveHeapLoader.hpp b/src/hotspot/share/cds/archiveHeapLoader.hpp
index 8b9fab91aa3..e559b447ebf 100644
--- a/src/hotspot/share/cds/archiveHeapLoader.hpp
+++ b/src/hotspot/share/cds/archiveHeapLoader.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,6 @@
 #ifndef SHARE_CDS_ARCHIVEHEAPLOADER_HPP
 #define SHARE_CDS_ARCHIVEHEAPLOADER_HPP
 
-#include "cds/filemap.hpp"
 #include "gc/shared/gc_globals.hpp"
 #include "memory/allocation.hpp"
 #include "memory/allStatic.hpp"
diff --git a/src/hotspot/share/cds/cdsConfig.cpp b/src/hotspot/share/cds/cdsConfig.cpp
index d190f987cbe..564298fa5c8 100644
--- a/src/hotspot/share/cds/cdsConfig.cpp
+++ b/src/hotspot/share/cds/cdsConfig.cpp
@@ -25,6 +25,7 @@
 #include "cds/archiveHeapLoader.hpp"
 #include "cds/cdsConfig.hpp"
 #include "cds/classListWriter.hpp"
+#include "cds/filemap.hpp"
 #include "cds/heapShared.hpp"
 #include "classfile/classLoaderDataShared.hpp"
 #include "classfile/moduleEntry.hpp"
diff --git a/src/hotspot/share/cds/cdsConstants.cpp b/src/hotspot/share/cds/cdsConstants.cpp
index 364f6d74c43..81b5920cc53 100644
--- a/src/hotspot/share/cds/cdsConstants.cpp
+++ b/src/hotspot/share/cds/cdsConstants.cpp
@@ -37,7 +37,6 @@ CDSConst CDSConstants::offsets[] = {
   { "GenericCDSFileMapHeader::_base_archive_name_size",   offset_of(GenericCDSFileMapHeader, _base_archive_name_size)   },
   { "CDSFileMapHeaderBase::_regions[0]",                  offset_of(CDSFileMapHeaderBase, _regions)                     },
   { "FileMapHeader::_jvm_ident",                          offset_of(FileMapHeader, _jvm_ident)                          },
-  { "FileMapHeader::_common_app_classpath_prefix_size",   offset_of(FileMapHeader, _common_app_classpath_prefix_size)   },
   { "CDSFileMapRegion::_crc",                             offset_of(CDSFileMapRegion, _crc)                             },
   { "CDSFileMapRegion::_used",                            offset_of(CDSFileMapRegion, _used)                            },
   { "DynamicArchiveHeader::_base_region_crc",             offset_of(DynamicArchiveHeader, _base_region_crc)             }
diff --git a/src/hotspot/share/cds/cdsProtectionDomain.cpp b/src/hotspot/share/cds/cdsProtectionDomain.cpp
index 49152753a83..dc3d8621db1 100644
--- a/src/hotspot/share/cds/cdsProtectionDomain.cpp
+++ b/src/hotspot/share/cds/cdsProtectionDomain.cpp
@@ -22,6 +22,7 @@
  *
  */
 
+#include "cds/aotClassLocation.hpp"
 #include "cds/cdsConfig.hpp"
 #include "cds/cdsProtectionDomain.hpp"
 #include "classfile/classLoader.hpp"
@@ -49,10 +50,10 @@ OopHandle CDSProtectionDomain::_shared_jar_manifests;
 Handle CDSProtectionDomain::init_security_info(Handle class_loader, InstanceKlass* ik, PackageEntry* pkg_entry, TRAPS) {
   int index = ik->shared_classpath_index();
   assert(index >= 0, "Sanity");
-  SharedClassPathEntry* ent = FileMapInfo::shared_path(index);
+  const AOTClassLocation* cl = AOTClassLocationConfig::runtime()->class_location_at(index);
   Symbol* class_name = ik->name();
 
-  if (ent->is_modules_image()) {
+  if (cl->is_modules_image()) {
     // For shared app/platform classes originated from the run-time image:
     //   The ProtectionDomains are cached in the corresponding ModuleEntries
     //   for fast access by the VM.
@@ -63,15 +64,14 @@ Handle CDSProtectionDomain::init_security_info(Handle class_loader, InstanceKlas
     return get_shared_protection_domain(class_loader, mod_entry, THREAD);
   } else {
     // For shared app/platform classes originated from JAR files on the class path:
-    //   Each of the 3 SystemDictionaryShared::_shared_xxx arrays has the same length
-    //   as the shared classpath table in the shared archive (see
-    //   FileMap::_shared_path_table in filemap.hpp for details).
+    //   Each of the 3 CDSProtectionDomain::_shared_xxx arrays has the same length
+    //   as the shared classpath table in the shared archive.
     //
     //   If a shared InstanceKlass k is loaded from the class path, let
     //
-    //     index = k->shared_classpath_index():
+    //     index = k->shared_classpath_index();
     //
-    //   FileMap::_shared_path_table[index] identifies the JAR file that contains k.
+    //   AOTClassLocationConfig::_runtime_instance->_array->at(index) identifies the JAR file that contains k.
     //
     //   k's protection domain is:
     //
@@ -84,10 +84,10 @@ Handle CDSProtectionDomain::init_security_info(Handle class_loader, InstanceKlas
     //     define_shared_package(class_name, class_loader, manifest, url, CHECK_NH);
     //
     //   Note that if an element of these 3 _shared_xxx arrays is null, it will be initialized by
-    //   the corresponding SystemDictionaryShared::get_shared_xxx() function.
+    //   the corresponding CDSProtectionDomain::get_shared_xxx() function.
     Handle manifest = get_shared_jar_manifest(index, CHECK_NH);
     Handle url = get_shared_jar_url(index, CHECK_NH);
-    int index_offset = index - ClassLoaderExt::app_class_paths_start_index();
+    int index_offset = index - AOTClassLocationConfig::runtime()->app_cp_start_index();
     if (index_offset < PackageEntry::max_index_for_defined_in_class_path()) {
       if (pkg_entry == nullptr || !pkg_entry->is_defined_by_cds_in_class_path(index_offset)) {
         // define_shared_package only needs to be called once for each package in a jar specified
@@ -178,14 +178,14 @@ Handle CDSProtectionDomain::create_jar_manifest(const char* manifest_chars, size
 Handle CDSProtectionDomain::get_shared_jar_manifest(int shared_path_index, TRAPS) {
   Handle manifest;
   if (shared_jar_manifest(shared_path_index) == nullptr) {
-    SharedClassPathEntry* ent = FileMapInfo::shared_path(shared_path_index);
-    size_t size = (size_t)ent->manifest_size();
+    const AOTClassLocation* cl = AOTClassLocationConfig::runtime()->class_location_at(shared_path_index);
+    size_t size = cl->manifest_length();
     if (size == 0) {
       return Handle();
     }
 
     // ByteArrayInputStream bais = new ByteArrayInputStream(buf);
-    const char* src = ent->manifest();
+    const char* src = cl->manifest();
     assert(src != nullptr, "No Manifest data");
     manifest = create_jar_manifest(src, size, CHECK_NH);
     atomic_set_shared_jar_manifest(shared_path_index, manifest());
@@ -198,7 +198,7 @@ Handle CDSProtectionDomain::get_shared_jar_manifest(int shared_path_index, TRAPS
 Handle CDSProtectionDomain::get_shared_jar_url(int shared_path_index, TRAPS) {
   Handle url_h;
   if (shared_jar_url(shared_path_index) == nullptr) {
-    const char* path = FileMapInfo::shared_path_name(shared_path_index);
+    const char* path = AOTClassLocationConfig::runtime()->class_location_at(shared_path_index)->path();
     oop result_oop = to_file_URL(path, url_h, CHECK_(url_h));
     atomic_set_shared_jar_url(shared_path_index, result_oop);
   }
diff --git a/src/hotspot/share/cds/cppVtables.cpp b/src/hotspot/share/cds/cppVtables.cpp
index 155bc08dc2d..39849571015 100644
--- a/src/hotspot/share/cds/cppVtables.cpp
+++ b/src/hotspot/share/cds/cppVtables.cpp
@@ -258,7 +258,6 @@ intptr_t* CppVtables::get_archived_vtable(MetaspaceObj::Type msotype, address ob
   case MetaspaceObj::ConstantPoolCacheType:
   case MetaspaceObj::AnnotationsType:
   case MetaspaceObj::MethodCountersType:
-  case MetaspaceObj::SharedClassPathEntryType:
   case MetaspaceObj::RecordComponentType:
     // These have no vtables.
     break;
diff --git a/src/hotspot/share/cds/dynamicArchive.cpp b/src/hotspot/share/cds/dynamicArchive.cpp
index acdb330d91b..4ccf23ff91c 100644
--- a/src/hotspot/share/cds/dynamicArchive.cpp
+++ b/src/hotspot/share/cds/dynamicArchive.cpp
@@ -24,6 +24,7 @@
 
 #include "cds/aotArtifactFinder.hpp"
 #include "cds/aotClassLinker.hpp"
+#include "cds/aotClassLocation.hpp"
 #include "cds/archiveBuilder.hpp"
 #include "cds/archiveHeapWriter.hpp"
 #include "cds/archiveUtils.inline.hpp"
@@ -89,7 +90,7 @@ public:
   void sort_methods();
   void sort_methods(InstanceKlass* ik) const;
   void remark_pointers_for_instance_klass(InstanceKlass* k, bool should_mark) const;
-  void write_archive(char* serialized_data);
+  void write_archive(char* serialized_data, AOTClassLocationConfig* cl_config);
   void gather_array_klasses();
 
 public:
@@ -138,6 +139,7 @@ public:
     make_klasses_shareable();
 
     char* serialized_data;
+    AOTClassLocationConfig* cl_config;
     {
       // Write the symbol table and system dictionaries to the RO space.
       // Note that these tables still point to the *original* objects, so
@@ -148,6 +150,7 @@ public:
 
       ArchiveBuilder::OtherROAllocMark mark;
       SystemDictionaryShared::write_to_archive(false);
+      cl_config = AOTClassLocationConfig::dumptime()->write_to_archive();
       DynamicArchive::dump_array_klasses();
       AOTClassLinker::write_to_archive();
 
@@ -161,7 +164,7 @@ public:
 
     relocate_to_requested();
 
-    write_archive(serialized_data);
+    write_archive(serialized_data, cl_config);
     release_header();
     DynamicArchive::post_dump();
 
@@ -172,7 +175,6 @@ public:
   }
 
   virtual void iterate_roots(MetaspaceClosure* it) {
-    FileMapInfo::metaspace_pointers_do(it);
     AOTArtifactFinder::all_cached_classes_do(it);
     SystemDictionaryShared::dumptime_classes_do(it);
     iterate_primitive_array_klasses(it);
@@ -335,8 +337,8 @@ void DynamicArchiveBuilder::remark_pointers_for_instance_klass(InstanceKlass* k,
   }
 }
 
-void DynamicArchiveBuilder::write_archive(char* serialized_data) {
-  _header->set_shared_path_table(FileMapInfo::shared_path_table().table());
+void DynamicArchiveBuilder::write_archive(char* serialized_data, AOTClassLocationConfig* cl_config) {
+  _header->set_class_location_config(cl_config);
   _header->set_serialized_data(serialized_data);
 
   FileMapInfo* dynamic_info = FileMapInfo::dynamic_info();
@@ -389,8 +391,7 @@ public:
       log_warning(cds)("This archive was created with AllowArchivingWithJavaAgent. It should be used "
               "for testing purposes only and should not be used in a production environment");
     }
-    FileMapInfo::check_nonempty_dir_in_shared_path_table();
-
+    AOTClassLocationConfig::dumptime_check_nonempty_dirs();
     _builder.doit();
   }
   ~VM_PopulateDynamicDumpSharedSpace() {
diff --git a/src/hotspot/share/cds/filemap.cpp b/src/hotspot/share/cds/filemap.cpp
index 990e4bb77e1..015032b2d38 100644
--- a/src/hotspot/share/cds/filemap.cpp
+++ b/src/hotspot/share/cds/filemap.cpp
@@ -22,6 +22,7 @@
  *
  */
 
+#include "cds/aotClassLocation.hpp"
 #include "cds/archiveBuilder.hpp"
 #include "cds/archiveHeapLoader.inline.hpp"
 #include "cds/archiveHeapWriter.hpp"
@@ -156,7 +157,6 @@ void FileMapInfo::populate_header(size_t core_region_alignment) {
   size_t header_size;
   size_t base_archive_name_size = 0;
   size_t base_archive_name_offset = 0;
-  size_t longest_common_prefix_size = 0;
   if (is_static()) {
     c_header_size = sizeof(FileMapHeader);
     header_size = c_header_size;
@@ -173,30 +173,24 @@ void FileMapInfo::populate_header(size_t core_region_alignment) {
       base_archive_name_offset = c_header_size;
     }
   }
-  ResourceMark rm;
-  GrowableArray<const char*>* app_cp_array = create_dumptime_app_classpath_array();
-  int len = app_cp_array->length();
-  longest_common_prefix_size = longest_common_app_classpath_prefix_len(len, app_cp_array);
   _header = (FileMapHeader*)os::malloc(header_size, mtInternal);
   memset((void*)_header, 0, header_size);
   _header->populate(this,
                     core_region_alignment,
                     header_size,
                     base_archive_name_size,
-                    base_archive_name_offset,
-                    longest_common_prefix_size);
+                    base_archive_name_offset);
 }
 
 void FileMapHeader::populate(FileMapInfo *info, size_t core_region_alignment,
                              size_t header_size, size_t base_archive_name_size,
-                             size_t base_archive_name_offset, size_t common_app_classpath_prefix_size) {
+                             size_t base_archive_name_offset) {
   // 1. We require _generic_header._magic to be at the beginning of the file
   // 2. FileMapHeader also assumes that _generic_header is at the beginning of the file
   assert(offset_of(FileMapHeader, _generic_header) == 0, "must be");
   set_header_size((unsigned int)header_size);
   set_base_archive_name_offset((unsigned int)base_archive_name_offset);
   set_base_archive_name_size((unsigned int)base_archive_name_size);
-  set_common_app_classpath_prefix_size((unsigned int)common_app_classpath_prefix_size);
   set_magic(CDSConfig::is_dumping_dynamic_archive() ? CDS_DYNAMIC_ARCHIVE_MAGIC : CDS_ARCHIVE_MAGIC);
   set_version(CURRENT_CDS_ARCHIVE_VERSION);
 
@@ -236,22 +230,12 @@ void FileMapHeader::populate(FileMapInfo *info, size_t core_region_alignment,
   // JVM version string ... changes on each build.
   get_header_version(_jvm_ident);
 
-  _app_class_paths_start_index = ClassLoaderExt::app_class_paths_start_index();
-  _app_module_paths_start_index = ClassLoaderExt::app_module_paths_start_index();
-  _max_used_path_index = ClassLoaderExt::max_used_path_index();
-  _num_module_paths = ClassLoader::num_module_path_entries();
-
   _verify_local = BytecodeVerificationLocal;
   _verify_remote = BytecodeVerificationRemote;
-  _has_platform_or_app_classes = ClassLoaderExt::has_platform_or_app_classes();
-  _has_non_jar_in_classpath = ClassLoaderExt::has_non_jar_in_classpath();
+  _has_platform_or_app_classes = AOTClassLocationConfig::dumptime()->has_platform_or_app_classes();
   _requested_base_address = (char*)SharedBaseAddress;
   _mapped_base_address = (char*)SharedBaseAddress;
   _allow_archiving_with_java_agent = AllowArchivingWithJavaAgent;
-
-  if (!CDSConfig::is_dumping_dynamic_archive()) {
-    set_shared_path_table(info->_shared_path_table);
-  }
 }
 
 void FileMapHeader::copy_base_archive_name(const char* archive) {
@@ -268,7 +252,6 @@ void FileMapHeader::print(outputStream* st) {
   st->print_cr("- crc:                            0x%08x", crc());
   st->print_cr("- version:                        0x%x", version());
   st->print_cr("- header_size:                    " UINT32_FORMAT, header_size());
-  st->print_cr("- common_app_classpath_size:      " UINT32_FORMAT, common_app_classpath_prefix_size());
   st->print_cr("- base_archive_name_offset:       " UINT32_FORMAT, base_archive_name_offset());
   st->print_cr("- base_archive_name_size:         " UINT32_FORMAT, base_archive_name_size());
 
@@ -294,15 +277,10 @@ void FileMapHeader::print(outputStream* st) {
   st->print_cr("- early_serialized_data_offset:   0x%zx", _early_serialized_data_offset);
   st->print_cr("- serialized_data_offset:         0x%zx", _serialized_data_offset);
   st->print_cr("- jvm_ident:                      %s", _jvm_ident);
-  st->print_cr("- shared_path_table_offset:       0x%zx", _shared_path_table_offset);
-  st->print_cr("- app_class_paths_start_index:    %d", _app_class_paths_start_index);
-  st->print_cr("- app_module_paths_start_index:   %d", _app_module_paths_start_index);
-  st->print_cr("- num_module_paths:               %d", _num_module_paths);
-  st->print_cr("- max_used_path_index:            %d", _max_used_path_index);
+  st->print_cr("- class_location_config_offset:   0x%zx", _class_location_config_offset);
   st->print_cr("- verify_local:                   %d", _verify_local);
   st->print_cr("- verify_remote:                  %d", _verify_remote);
   st->print_cr("- has_platform_or_app_classes:    %d", _has_platform_or_app_classes);
-  st->print_cr("- has_non_jar_in_classpath:       %d", _has_non_jar_in_classpath);
   st->print_cr("- requested_base_address:         " INTPTR_FORMAT, p2i(_requested_base_address));
   st->print_cr("- mapped_base_address:            " INTPTR_FORMAT, p2i(_mapped_base_address));
   st->print_cr("- heap_root_segments.roots_count: %d" , _heap_root_segments.roots_count());
@@ -321,676 +299,23 @@ void FileMapHeader::print(outputStream* st) {
   st->print_cr("- has_archived_invokedynamic      %d", _has_archived_invokedynamic);
 }
 
-void SharedClassPathEntry::init_as_non_existent(const char* path, TRAPS) {
-  _type = non_existent_entry;
-  set_name(path, CHECK);
-}
-
-void SharedClassPathEntry::init(bool is_modules_image,
-                                bool is_module_path,
-                                ClassPathEntry* cpe, TRAPS) {
-  assert(CDSConfig::is_dumping_archive(), "sanity");
-  _timestamp = 0;
-  _filesize  = 0;
-  _from_class_path_attr = false;
-
-  struct stat st;
-  if (os::stat(cpe->name(), &st) == 0) {
-    if ((st.st_mode & S_IFMT) == S_IFDIR) {
-      _type = dir_entry;
-    } else {
-      // The timestamp of the modules_image is not checked at runtime.
-      if (is_modules_image) {
-        _type = modules_image_entry;
-      } else {
-        _type = jar_entry;
-        _timestamp = st.st_mtime;
-        _from_class_path_attr = cpe->from_class_path_attr();
-        _is_multi_release = cpe->is_multi_release_jar();
-      }
-      _filesize = st.st_size;
-      _is_module_path = is_module_path;
-    }
-  } else {
-    // The file/dir must exist, or it would not have been added
-    // into ClassLoader::classpath_entry().
-    //
-    // If we can't access a jar file in the boot path, then we can't
-    // make assumptions about where classes get loaded from.
-    log_error(cds)("Unable to open file %s.", cpe->name());
-    MetaspaceShared::unrecoverable_loading_error();
-  }
-
-  // No need to save the name of the module file, as it will be computed at run time
-  // to allow relocation of the JDK directory.
-  const char* name = is_modules_image  ? "" : cpe->name();
-  set_name(name, CHECK);
-}
-
-void SharedClassPathEntry::set_name(const char* name, TRAPS) {
-  size_t len = strlen(name) + 1;
-  _name = MetadataFactory::new_array<char>(ClassLoaderData::the_null_class_loader_data(), (int)len, CHECK);
-  strcpy(_name->data(), name);
-}
-
-void SharedClassPathEntry::copy_from(SharedClassPathEntry* ent, ClassLoaderData* loader_data, TRAPS) {
-  assert(ent != nullptr, "sanity");
-  _type = ent->_type;
-  _is_module_path = ent->_is_module_path;
-  _timestamp = ent->_timestamp;
-  _filesize = ent->_filesize;
-  _from_class_path_attr = ent->_from_class_path_attr;
-  set_name(ent->name(), CHECK);
-
-  if (ent->is_jar() && ent->manifest() != nullptr) {
-    Array<u1>* buf = MetadataFactory::new_array<u1>(loader_data,
-                                                    ent->manifest_size(),
-                                                    CHECK);
-    char* p = (char*)(buf->data());
-    memcpy(p, ent->manifest(), ent->manifest_size());
-    set_manifest(buf);
-  }
-}
-
-const char* SharedClassPathEntry::name() const {
-  if (CDSConfig::is_using_archive() && is_modules_image()) {
-    // In order to validate the runtime modules image file size against the archived
-    // size information, we need to obtain the runtime modules image path. The recorded
-    // dump time modules image path in the archive may be different from the runtime path
-    // if the JDK image has beed moved after generating the archive.
-    return ClassLoader::get_jrt_entry()->name();
-  } else {
-    return _name->data();
-  }
-}
-
-bool SharedClassPathEntry::validate(bool is_class_path) const {
+bool FileMapInfo::validate_class_location() {
   assert(CDSConfig::is_using_archive(), "runtime only");
 
-  struct stat st;
-  const char* name = this->name();
-
-  bool ok = true;
-  log_info(class, path)("checking shared classpath entry: %s", name);
-  if (os::stat(name, &st) != 0 && is_class_path) {
-    // If the archived module path entry does not exist at runtime, it is not fatal
-    // (no need to invalid the shared archive) because the shared runtime visibility check
-    // filters out any archived module classes that do not have a matching runtime
-    // module path location.
-    log_warning(cds)("Required classpath entry does not exist: %s", name);
-    ok = false;
-  } else if (is_dir()) {
-    if (!os::dir_is_empty(name)) {
-      log_warning(cds)("directory is not empty: %s", name);
-      ok = false;
-    }
-  } else {
-    bool size_differs = _filesize != st.st_size;
-    bool time_differs = has_timestamp() && _timestamp != st.st_mtime;
-    if (time_differs || size_differs) {
-      ok = false;
-      if (PrintSharedArchiveAndExit) {
-        log_warning(cds)(time_differs ? "Timestamp mismatch" : "File size mismatch");
-      } else {
-        const char* bad_file_msg = "This file is not the one used while building the shared archive file:";
-        log_warning(cds)("%s %s", bad_file_msg, name);
-        if (!log_is_enabled(Info, cds)) {
-          log_warning(cds)("%s %s", bad_file_msg, name);
-        }
-        if (time_differs) {
-          log_warning(cds)("%s timestamp has changed.", name);
-        }
-        if (size_differs) {
-          log_warning(cds)("%s size has changed.", name);
-        }
-      }
-    }
-  }
-
-  if (PrintSharedArchiveAndExit && !ok) {
-    // If PrintSharedArchiveAndExit is enabled, don't report failure to the
-    // caller. Please see above comments for more details.
-    ok = true;
-    MetaspaceShared::set_archive_loading_failed();
-  }
-  return ok;
-}
-
-bool SharedClassPathEntry::check_non_existent() const {
-  assert(_type == non_existent_entry, "must be");
-  log_info(class, path)("should be non-existent: %s", name());
-  struct stat st;
-  if (os::stat(name(), &st) != 0) {
-    log_info(class, path)("ok");
-    return true; // file doesn't exist
-  } else {
-    return false;
-  }
-}
-
-void SharedClassPathEntry::metaspace_pointers_do(MetaspaceClosure* it) {
-  it->push(&_name);
-  it->push(&_manifest);
-}
-
-void SharedPathTable::metaspace_pointers_do(MetaspaceClosure* it) {
-  it->push(&_entries);
-}
-
-void SharedPathTable::dumptime_init(ClassLoaderData* loader_data, TRAPS) {
-  const int num_entries =
-    ClassLoader::num_boot_classpath_entries() +
-    ClassLoader::num_app_classpath_entries() +
-    ClassLoader::num_module_path_entries() +
-    FileMapInfo::num_non_existent_class_paths();
-  _entries = MetadataFactory::new_array<SharedClassPathEntry*>(loader_data, num_entries, CHECK);
-  for (int i = 0; i < num_entries; i++) {
-    SharedClassPathEntry* ent =
-      new (loader_data, SharedClassPathEntry::size(), MetaspaceObj::SharedClassPathEntryType, THREAD) SharedClassPathEntry;
-    _entries->at_put(i, ent);
-  }
-}
-
-void FileMapInfo::allocate_shared_path_table(TRAPS) {
-  assert(CDSConfig::is_dumping_archive(), "sanity");
-
-  ClassLoaderData* loader_data = ClassLoaderData::the_null_class_loader_data();
-  ClassPathEntry* jrt = ClassLoader::get_jrt_entry();
-
-  assert(jrt != nullptr,
-         "No modular java runtime image present when allocating the CDS classpath entry table");
-
-  _shared_path_table.dumptime_init(loader_data, CHECK);
-
-  // 1. boot class path
-  int i = 0;
-  i = add_shared_classpaths(i, "boot",   jrt, CHECK);
-  i = add_shared_classpaths(i, "app",    ClassLoader::app_classpath_entries(), CHECK);
-  i = add_shared_classpaths(i, "module", ClassLoader::module_path_entries(), CHECK);
-
-  for (int x = 0; x < num_non_existent_class_paths(); x++, i++) {
-    const char* path = _non_existent_class_paths->at(x);
-    shared_path(i)->init_as_non_existent(path, CHECK);
-  }
-
-  assert(i == _shared_path_table.size(), "number of shared path entry mismatch");
-}
-
-int FileMapInfo::add_shared_classpaths(int i, const char* which, ClassPathEntry *cpe, TRAPS) {
-  while (cpe != nullptr) {
-    bool is_jrt = (cpe == ClassLoader::get_jrt_entry());
-    bool is_module_path = i >= ClassLoaderExt::app_module_paths_start_index();
-    const char* type = (is_jrt ? "jrt" : (cpe->is_jar_file() ? "jar" : "dir"));
-    log_info(class, path)("add %s shared path (%s) %s", which, type, cpe->name());
-    SharedClassPathEntry* ent = shared_path(i);
-    ent->init(is_jrt, is_module_path, cpe, CHECK_0);
-    if (cpe->is_jar_file()) {
-      update_jar_manifest(cpe, ent, CHECK_0);
-    }
-    if (is_jrt) {
-      cpe = ClassLoader::get_next_boot_classpath_entry(cpe);
+  AOTClassLocationConfig* config = header()->class_location_config();
+  bool has_extra_module_paths;
+  if (!config->validate(header()->has_aot_linked_classes(), &has_extra_module_paths)) {
+    if (PrintSharedArchiveAndExit) {
+      MetaspaceShared::set_archive_loading_failed();
+      return true;
     } else {
-      cpe = cpe->next();
-    }
-    i++;
-  }
-
-  return i;
-}
-
-void FileMapInfo::check_nonempty_dir_in_shared_path_table() {
-  assert(CDSConfig::is_dumping_archive(), "sanity");
-
-  bool has_nonempty_dir = false;
-
-  int last = _shared_path_table.size() - 1;
-  if (last > ClassLoaderExt::max_used_path_index()) {
-     // no need to check any path beyond max_used_path_index
-     last = ClassLoaderExt::max_used_path_index();
-  }
-
-  for (int i = 0; i <= last; i++) {
-    SharedClassPathEntry *e = shared_path(i);
-    if (e->is_dir()) {
-      const char* path = e->name();
-      if (!os::dir_is_empty(path)) {
-        log_error(cds)("Error: non-empty directory '%s'", path);
-        has_nonempty_dir = true;
-      }
-    }
-  }
-
-  if (has_nonempty_dir) {
-    ClassLoader::exit_with_path_failure("Cannot have non-empty directory in paths", nullptr);
-  }
-}
-
-void FileMapInfo::record_non_existent_class_path_entry(const char* path) {
-  assert(CDSConfig::is_dumping_archive(), "sanity");
-  log_info(class, path)("non-existent Class-Path entry %s", path);
-  if (_non_existent_class_paths == nullptr) {
-    _non_existent_class_paths = new (mtClass) GrowableArray<const char*>(10, mtClass);
-  }
-  _non_existent_class_paths->append(os::strdup(path));
-}
-
-int FileMapInfo::num_non_existent_class_paths() {
-  assert(CDSConfig::is_dumping_archive(), "sanity");
-  if (_non_existent_class_paths != nullptr) {
-    return _non_existent_class_paths->length();
-  } else {
-    return 0;
-  }
-}
-
-int FileMapInfo::get_module_shared_path_index(Symbol* location) {
-  if (location->starts_with("jrt:", 4) && get_number_of_shared_paths() > 0) {
-    assert(shared_path(0)->is_modules_image(), "first shared_path must be the modules image");
-    return 0;
-  }
-
-  if (ClassLoaderExt::app_module_paths_start_index() >= get_number_of_shared_paths()) {
-    // The archive(s) were created without --module-path option
-    return -1;
-  }
-
-  if (!location->starts_with("file:", 5)) {
-    return -1;
-  }
-
-  // skip_uri_protocol was also called during dump time -- see ClassLoaderExt::process_module_table()
-  ResourceMark rm;
-  const char* file = ClassLoader::uri_to_path(location->as_C_string());
-  for (int i = ClassLoaderExt::app_module_paths_start_index(); i < get_number_of_shared_paths(); i++) {
-    SharedClassPathEntry* ent = shared_path(i);
-    if (!ent->is_non_existent()) {
-      assert(ent->in_named_module(), "must be");
-      bool cond = strcmp(file, ent->name()) == 0;
-      log_debug(class, path)("get_module_shared_path_index (%d) %s : %s = %s", i,
-                             location->as_C_string(), ent->name(), cond ? "same" : "different");
-      if (cond) {
-        return i;
-      }
-    }
-  }
-
-  return -1;
-}
-
-class ManifestStream: public ResourceObj {
-  private:
-  u1*   _buffer_start; // Buffer bottom
-  u1*   _buffer_end;   // Buffer top (one past last element)
-  u1*   _current;      // Current buffer position
-
- public:
-  // Constructor
-  ManifestStream(u1* buffer, int length) : _buffer_start(buffer),
-                                           _current(buffer) {
-    _buffer_end = buffer + length;
-  }
-
-  static bool is_attr(u1* attr, const char* name) {
-    return strncmp((const char*)attr, name, strlen(name)) == 0;
-  }
-
-  static char* copy_attr(u1* value, size_t len) {
-    char* buf = NEW_RESOURCE_ARRAY(char, len + 1);
-    strncpy(buf, (char*)value, len);
-    buf[len] = 0;
-    return buf;
-  }
-};
-
-void FileMapInfo::update_jar_manifest(ClassPathEntry *cpe, SharedClassPathEntry* ent, TRAPS) {
-  ClassLoaderData* loader_data = ClassLoaderData::the_null_class_loader_data();
-  ResourceMark rm(THREAD);
-  jint manifest_size;
-
-  assert(cpe->is_jar_file() && ent->is_jar(), "the shared class path entry is not a JAR file");
-  char* manifest = ClassLoaderExt::read_manifest(THREAD, cpe, &manifest_size);
-  if (manifest != nullptr) {
-    ManifestStream* stream = new ManifestStream((u1*)manifest,
-                                                manifest_size);
-    // Copy the manifest into the shared archive
-    manifest = ClassLoaderExt::read_raw_manifest(THREAD, cpe, &manifest_size);
-    Array<u1>* buf = MetadataFactory::new_array<u1>(loader_data,
-                                                    manifest_size,
-                                                    CHECK);
-    char* p = (char*)(buf->data());
-    memcpy(p, manifest, manifest_size);
-    ent->set_manifest(buf);
-  }
-}
-
-char* FileMapInfo::skip_first_path_entry(const char* path) {
-  size_t path_sep_len = strlen(os::path_separator());
-  char* p = strstr((char*)path, os::path_separator());
-  if (p != nullptr) {
-    debug_only( {
-      size_t image_name_len = strlen(MODULES_IMAGE_NAME);
-      assert(strncmp(p - image_name_len, MODULES_IMAGE_NAME, image_name_len) == 0,
-             "first entry must be the modules image");
-    } );
-    p += path_sep_len;
-  } else {
-    debug_only( {
-      assert(ClassLoader::string_ends_with(path, MODULES_IMAGE_NAME),
-             "first entry must be the modules image");
-    } );
-  }
-  return p;
-}
-
-int FileMapInfo::num_paths(const char* path) {
-  if (path == nullptr) {
-    return 0;
-  }
-  int npaths = 1;
-  char* p = (char*)path;
-  while (p != nullptr) {
-    char* prev = p;
-    p = strstr((char*)p, os::path_separator());
-    if (p != nullptr) {
-      p++;
-      // don't count empty path
-      if ((p - prev) > 1) {
-       npaths++;
-      }
-    }
-  }
-  return npaths;
-}
-
-// Returns true if a path within the paths exists and has non-zero size.
-bool FileMapInfo::check_paths_existence(const char* paths) {
-  ClasspathStream cp_stream(paths);
-  bool exist = false;
-  struct stat st;
-  while (cp_stream.has_next()) {
-    const char* path = cp_stream.get_next();
-    if (os::stat(path, &st) == 0 && st.st_size > 0) {
-      exist = true;
-      break;
-    }
-  }
-  return exist;
-}
-
-GrowableArray<const char*>* FileMapInfo::create_dumptime_app_classpath_array() {
-  assert(CDSConfig::is_dumping_archive(), "sanity");
-  GrowableArray<const char*>* path_array = new GrowableArray<const char*>(10);
-  ClassPathEntry* cpe = ClassLoader::app_classpath_entries();
-  while (cpe != nullptr) {
-    path_array->append(cpe->name());
-    cpe = cpe->next();
-  }
-  return path_array;
-}
-
-GrowableArray<const char*>* FileMapInfo::create_path_array(const char* paths) {
-  GrowableArray<const char*>* path_array = new GrowableArray<const char*>(10);
-  JavaThread* current = JavaThread::current();
-  ClasspathStream cp_stream(paths);
-  bool non_jar_in_cp = header()->has_non_jar_in_classpath();
-  while (cp_stream.has_next()) {
-    const char* path = cp_stream.get_next();
-    if (!non_jar_in_cp) {
-      struct stat st;
-      if (os::stat(path, &st) == 0) {
-        path_array->append(path);
-      }
-    } else {
-      const char* canonical_path = ClassLoader::get_canonical_path(path, current);
-      if (canonical_path != nullptr) {
-        char* error_msg = nullptr;
-        jzfile* zip = ClassLoader::open_zip_file(canonical_path, &error_msg, current);
-        if (zip != nullptr && error_msg == nullptr) {
-          path_array->append(path);
-        }
-      }
-    }
-  }
-  return path_array;
-}
-
-bool FileMapInfo::classpath_failure(const char* msg, const char* name) {
-  ClassLoader::trace_class_path(msg, name);
-  if (PrintSharedArchiveAndExit) {
-    MetaspaceShared::set_archive_loading_failed();
-  }
-  return false;
-}
-
-unsigned int FileMapInfo::longest_common_app_classpath_prefix_len(int num_paths,
-                                                                  GrowableArray<const char*>* rp_array) {
-  if (num_paths == 0) {
-    return 0;
-  }
-  unsigned int pos;
-  for (pos = 0; ; pos++) {
-    for (int i = 0; i < num_paths; i++) {
-      if (rp_array->at(i)[pos] != '\0' && rp_array->at(i)[pos] == rp_array->at(0)[pos]) {
-        continue;
-      }
-      // search backward for the pos before the file separator char
-      while (pos > 0) {
-        if (rp_array->at(0)[--pos] == *os::file_separator()) {
-          return pos + 1;
-        }
-      }
-      return 0;
-    }
-  }
-  return 0;
-}
-
-bool FileMapInfo::check_paths(int shared_path_start_idx, int num_paths, GrowableArray<const char*>* rp_array,
-                              unsigned int dumptime_prefix_len, unsigned int runtime_prefix_len) {
-  int i = 0;
-  int j = shared_path_start_idx;
-  while (i < num_paths) {
-    while (shared_path(j)->from_class_path_attr()) {
-      // shared_path(j) was expanded from the JAR file attribute "Class-Path:"
-      // during dump time. It's not included in the -classpath VM argument.
-      j++;
-    }
-    assert(strlen(shared_path(j)->name()) > (size_t)dumptime_prefix_len, "sanity");
-    const char* dumptime_path = shared_path(j)->name() + dumptime_prefix_len;
-    assert(strlen(rp_array->at(i)) > (size_t)runtime_prefix_len, "sanity");
-    const char* runtime_path = rp_array->at(i)  + runtime_prefix_len;
-    if (!os::same_files(dumptime_path, runtime_path)) {
       return false;
     }
-    i++;
-    j++;
-  }
-  return true;
-}
-
-bool FileMapInfo::validate_boot_class_paths() {
-  //
-  // - Archive contains boot classes only - relaxed boot path check:
-  //   Extra path elements appended to the boot path at runtime are allowed.
-  //
-  // - Archive contains application or platform classes - strict boot path check:
-  //   Validate the entire runtime boot path, which must be compatible
-  //   with the dump time boot path. Appending boot path at runtime is not
-  //   allowed.
-  //
-
-  // The first entry in boot path is the modules_image (guaranteed by
-  // ClassLoader::setup_boot_search_path()). Skip the first entry. The
-  // path of the runtime modules_image may be different from the dump
-  // time path (e.g. the JDK image is copied to a different location
-  // after generating the shared archive), which is acceptable. For most
-  // common cases, the dump time boot path might contain modules_image only.
-  char* runtime_boot_path = Arguments::get_boot_class_path();
-  char* rp = skip_first_path_entry(runtime_boot_path);
-  assert(shared_path(0)->is_modules_image(), "first shared_path must be the modules image");
-  int dp_len = header()->app_class_paths_start_index() - 1; // ignore the first path to the module image
-  bool match = true;
-
-  bool relaxed_check = !header()->has_platform_or_app_classes();
-  if (dp_len == 0 && rp == nullptr) {
-    return true;   // ok, both runtime and dump time boot paths have modules_images only
-  } else if (dp_len == 0 && rp != nullptr) {
-    if (relaxed_check) {
-      return true;   // ok, relaxed check, runtime has extra boot append path entries
-    } else {
-      ResourceMark rm;
-      if (check_paths_existence(rp)) {
-        // If a path exists in the runtime boot paths, it is considered a mismatch
-        // since there's no boot path specified during dump time.
-        match = false;
-      }
-    }
-  } else if (dp_len > 0 && rp != nullptr) {
-    int num;
-    ResourceMark rm;
-    GrowableArray<const char*>* rp_array = create_path_array(rp);
-    int rp_len = rp_array->length();
-    if (rp_len >= dp_len) {
-      if (relaxed_check) {
-        // only check the leading entries in the runtime boot path, up to
-        // the length of the dump time boot path
-        num = dp_len;
-      } else {
-        // check the full runtime boot path, must match with dump time
-        num = rp_len;
-      }
-      match = check_paths(1, num, rp_array, 0, 0);
-    } else {
-      // create_path_array() ignores non-existing paths. Although the dump time and runtime boot classpath lengths
-      // are the same initially, after the call to create_path_array(), the runtime boot classpath length could become
-      // shorter. We consider boot classpath mismatch in this case.
-      match = false;
-    }
   }
 
-  if (!match) {
-    // The paths are different
-    return classpath_failure("[BOOT classpath mismatch, actual =", runtime_boot_path);
-  }
-  return true;
-}
-
-bool FileMapInfo::validate_app_class_paths(int shared_app_paths_len) {
-  const char *appcp = Arguments::get_appclasspath();
-  assert(appcp != nullptr, "null app classpath");
-  int rp_len = num_paths(appcp);
-  bool match = false;
-  if (rp_len < shared_app_paths_len) {
-    return classpath_failure("Run time APP classpath is shorter than the one at dump time: ", appcp);
-  }
-  if (shared_app_paths_len != 0 && rp_len != 0) {
-    // Prefix is OK: E.g., dump with -cp foo.jar, but run with -cp foo.jar:bar.jar.
-    ResourceMark rm;
-    GrowableArray<const char*>* rp_array = create_path_array(appcp);
-    if (rp_array->length() == 0) {
-      // None of the jar file specified in the runtime -cp exists.
-      return classpath_failure("None of the jar file specified in the runtime -cp exists: -Djava.class.path=", appcp);
-    }
-    if (rp_array->length() < shared_app_paths_len) {
-      // create_path_array() ignores non-existing paths. Although the dump time and runtime app classpath lengths
-      // are the same initially, after the call to create_path_array(), the runtime app classpath length could become
-      // shorter. We consider app classpath mismatch in this case.
-      return classpath_failure("[APP classpath mismatch, actual: -Djava.class.path=", appcp);
-    }
-
-    // Handling of non-existent entries in the classpath: we eliminate all the non-existent
-    // entries from both the dump time classpath (ClassLoader::update_class_path_entry_list)
-    // and the runtime classpath (FileMapInfo::create_path_array), and check the remaining
-    // entries. E.g.:
-    //
-    // dump : -cp a.jar:NE1:NE2:b.jar  -> a.jar:b.jar -> recorded in archive.
-    // run 1: -cp NE3:a.jar:NE4:b.jar  -> a.jar:b.jar -> matched
-    // run 2: -cp x.jar:NE4:b.jar      -> x.jar:b.jar -> mismatched
-
-    int j = header()->app_class_paths_start_index();
-    match = check_paths(j, shared_app_paths_len, rp_array, 0, 0);
-    if (!match) {
-      // To facilitate app deployment, we allow the JAR files to be moved *together* to
-      // a different location, as long as they are still stored under the same directory
-      // structure. E.g., the following is OK.
-      //     java -Xshare:dump -cp /a/Foo.jar:/a/b/Bar.jar  ...
-      //     java -Xshare:auto -cp /x/y/Foo.jar:/x/y/b/Bar.jar  ...
-      unsigned int dumptime_prefix_len = header()->common_app_classpath_prefix_size();
-      unsigned int runtime_prefix_len = longest_common_app_classpath_prefix_len(shared_app_paths_len, rp_array);
-      if (dumptime_prefix_len != 0 || runtime_prefix_len != 0) {
-        log_info(class, path)("LCP length for app classpath (dumptime: %u, runtime: %u)",
-                              dumptime_prefix_len, runtime_prefix_len);
-        match = check_paths(j, shared_app_paths_len, rp_array,
-                               dumptime_prefix_len, runtime_prefix_len);
-      }
-      if (!match) {
-        return classpath_failure("[APP classpath mismatch, actual: -Djava.class.path=", appcp);
-      }
-    }
-  }
-  return true;
-}
-
-void FileMapInfo::log_paths(const char* msg, int start_idx, int end_idx) {
-  LogTarget(Info, class, path) lt;
-  if (lt.is_enabled()) {
-    LogStream ls(lt);
-    ls.print("%s", msg);
-    const char* prefix = "";
-    for (int i = start_idx; i < end_idx; i++) {
-      ls.print("%s%s", prefix, shared_path(i)->name());
-      prefix = os::path_separator();
-    }
-    ls.cr();
-  }
-}
-
-void FileMapInfo::extract_module_paths(const char* runtime_path, GrowableArray<const char*>* module_paths) {
-  GrowableArray<const char*>* path_array = create_path_array(runtime_path);
-  int num_paths = path_array->length();
-  for (int i = 0; i < num_paths; i++) {
-    const char* name = path_array->at(i);
-    ClassLoaderExt::extract_jar_files_from_path(name, module_paths);
-  }
-  // module paths are stored in sorted order in the CDS archive.
-  module_paths->sort(ClassLoaderExt::compare_module_names);
-}
-
-bool FileMapInfo::check_module_paths() {
-  const char* runtime_path = Arguments::get_property("jdk.module.path");
-  int archived_num_module_paths = header()->num_module_paths();
-  if (runtime_path == nullptr && archived_num_module_paths == 0) {
-    return true;
-  }
-  if ((runtime_path == nullptr && archived_num_module_paths > 0) ||
-      (runtime_path != nullptr && archived_num_module_paths == 0)) {
-    return false;
-  }
-  ResourceMark rm;
-  GrowableArray<const char*>* module_paths = new GrowableArray<const char*>(3);
-  extract_module_paths(runtime_path, module_paths);
-  int num_paths = module_paths->length();
-  if (num_paths != archived_num_module_paths) {
-    return false;
-  }
-  return check_paths(header()->app_module_paths_start_index(), num_paths, module_paths, 0, 0);
-}
-
-bool FileMapInfo::validate_shared_path_table() {
-  assert(CDSConfig::is_using_archive(), "runtime only");
-
-  _validating_shared_path_table = true;
-
-  // Load the shared path table info from the archive header
-  _shared_path_table = header()->shared_path_table();
-
-  bool matched_module_paths = true;
-  if (CDSConfig::is_dumping_dynamic_archive() || header()->has_full_module_graph()) {
-    matched_module_paths = check_module_paths();
-  }
-  if (header()->has_full_module_graph() && !matched_module_paths) {
+  if (header()->has_full_module_graph() && has_extra_module_paths) {
     CDSConfig::stop_using_optimized_module_handling();
-    log_info(cds)("optimized module handling: disabled because of mismatched module paths");
+    log_info(cds)("optimized module handling: disabled because extra module path(s) are specified");
   }
 
   if (CDSConfig::is_dumping_dynamic_archive()) {
@@ -998,17 +323,13 @@ bool FileMapInfo::validate_shared_path_table() {
     // or a simple base archive.
     // If the base layer archive contains additional path component besides
     // the runtime image and the -cp, dynamic dumping is disabled.
-    //
-    // When dynamic archiving is enabled, the _shared_path_table is overwritten
-    // to include the application path and stored in the top layer archive.
-    assert(shared_path(0)->is_modules_image(), "first shared_path must be the modules image");
-    if (header()->app_class_paths_start_index() > 1) {
+    if (config->num_boot_classpaths() > 0) {
       CDSConfig::disable_dumping_dynamic_archive();
       log_warning(cds)(
         "Dynamic archiving is disabled because base layer archive has appended boot classpath");
     }
-    if (header()->num_module_paths() > 0) {
-      if (!matched_module_paths) {
+    if (config->num_module_paths() > 0) {
+      if (has_extra_module_paths) {
         CDSConfig::disable_dumping_dynamic_archive();
         log_warning(cds)(
           "Dynamic archiving is disabled because base layer archive has a different module path");
@@ -1016,68 +337,11 @@ bool FileMapInfo::validate_shared_path_table() {
     }
   }
 
-  log_paths("Expecting BOOT path=", 0, header()->app_class_paths_start_index());
-  log_paths("Expecting -Djava.class.path=", header()->app_class_paths_start_index(), header()->app_module_paths_start_index());
-
-  int module_paths_start_index = header()->app_module_paths_start_index();
-  int shared_app_paths_len = 0;
-
-  // validate the path entries up to the _max_used_path_index
-  for (int i=0; i < header()->max_used_path_index() + 1; i++) {
-    if (i < module_paths_start_index) {
-      if (shared_path(i)->validate()) {
-        // Only count the app class paths not from the "Class-path" attribute of a jar manifest.
-        if (!shared_path(i)->from_class_path_attr() && i >= header()->app_class_paths_start_index()) {
-          shared_app_paths_len++;
-        }
-        log_info(class, path)("ok");
-      } else {
-        if (_dynamic_archive_info != nullptr && _dynamic_archive_info->_is_static) {
-          assert(!CDSConfig::is_using_archive(), "UseSharedSpaces should be disabled");
-        }
-        return false;
-      }
-    } else if (i >= module_paths_start_index) {
-      if (shared_path(i)->validate(false /* not a class path entry */)) {
-        log_info(class, path)("ok");
-      } else {
-        if (_dynamic_archive_info != nullptr && _dynamic_archive_info->_is_static) {
-          assert(!CDSConfig::is_using_archive(), "UseSharedSpaces should be disabled");
-        }
-        return false;
-      }
-    }
-  }
-
-  if (header()->max_used_path_index() == 0) {
-    // default archive only contains the module image in the bootclasspath
-    assert(shared_path(0)->is_modules_image(), "first shared_path must be the modules image");
-  } else {
-    if (!validate_boot_class_paths() || !validate_app_class_paths(shared_app_paths_len)) {
-      const char* mismatch_msg = "shared class paths mismatch";
-      const char* hint_msg = log_is_enabled(Info, class, path) ?
-          "" : " (hint: enable -Xlog:class+path=info to diagnose the failure)";
-      if (RequireSharedSpaces) {
-        log_error(cds)("%s%s", mismatch_msg, hint_msg);
-        MetaspaceShared::unrecoverable_loading_error();
-      } else {
-        log_warning(cds)("%s%s", mismatch_msg, hint_msg);
-      }
-      return false;
-    }
-  }
-
-  if (!validate_non_existent_class_paths()) {
-    return false;
-  }
-
-  _validating_shared_path_table = false;
-
 #if INCLUDE_JVMTI
   if (_classpath_entries_for_jvmti != nullptr) {
     os::free(_classpath_entries_for_jvmti);
   }
-  size_t sz = sizeof(ClassPathEntry*) * get_number_of_shared_paths();
+  size_t sz = sizeof(ClassPathEntry*) * AOTClassLocationConfig::runtime()->length();
   _classpath_entries_for_jvmti = (ClassPathEntry**)os::malloc(sz, mtClass);
   memset((void*)_classpath_entries_for_jvmti, 0, sz);
 #endif
@@ -1085,34 +349,6 @@ bool FileMapInfo::validate_shared_path_table() {
   return true;
 }
 
-bool FileMapInfo::validate_non_existent_class_paths() {
-  // All of the recorded non-existent paths came from the Class-Path: attribute from the JAR
-  // files on the app classpath. If any of these are found to exist during runtime,
-  // it will change how classes are loading for the app loader. For safety, disable
-  // loading of archived platform/app classes (currently there's no way to disable just the
-  // app classes).
-
-  assert(CDSConfig::is_using_archive(), "runtime only");
-  for (int i = header()->app_module_paths_start_index() + header()->num_module_paths();
-       i < get_number_of_shared_paths();
-       i++) {
-    SharedClassPathEntry* ent = shared_path(i);
-    if (!ent->check_non_existent()) {
-      if (header()->has_aot_linked_classes()) {
-        log_error(cds)("CDS archive has aot-linked classes. It cannot be used because the "
-                       "file %s exists", ent->name());
-        return false;
-      } else {
-        log_warning(cds)("Archived non-system classes are disabled because the "
-                         "file %s exists", ent->name());
-        header()->set_has_platform_or_app_classes(false);
-      }
-    }
-  }
-
-  return true;
-}
-
 // A utility class for reading/validating the GenericCDSFileMapHeader portion of
 // a CDS archive's header. The file header of all CDS archives with versions from
 // CDS_GENERIC_HEADER_SUPPORTED_MIN_VERSION (12) are guaranteed to always start
@@ -1365,19 +601,12 @@ bool FileMapInfo::init_from_file(int fd) {
     return false;
   }
 
-  int common_path_size = header()->common_app_classpath_prefix_size();
-  if (common_path_size < 0) {
-      log_warning(cds)("common app classpath prefix len < 0");
-      return false;
-  }
-
   unsigned int base_offset = header()->base_archive_name_offset();
   unsigned int name_size = header()->base_archive_name_size();
   unsigned int header_size = header()->header_size();
   if (base_offset != 0 && name_size != 0) {
     if (header_size != base_offset + name_size) {
       log_info(cds)("_header_size: " UINT32_FORMAT, header_size);
-      log_info(cds)("common_app_classpath_size: " UINT32_FORMAT, header()->common_app_classpath_prefix_size());
       log_info(cds)("base_archive_name_size: " UINT32_FORMAT, header()->base_archive_name_size());
       log_info(cds)("base_archive_name_offset: " UINT32_FORMAT, header()->base_archive_name_offset());
       log_warning(cds)("The shared archive file has an incorrect header size.");
@@ -2457,10 +1686,7 @@ void FileMapInfo::assert_mark(bool check) {
 FileMapInfo* FileMapInfo::_current_info = nullptr;
 FileMapInfo* FileMapInfo::_dynamic_archive_info = nullptr;
 bool FileMapInfo::_heap_pointers_need_patching = false;
-SharedPathTable FileMapInfo::_shared_path_table;
-bool FileMapInfo::_validating_shared_path_table = false;
 bool FileMapInfo::_memory_mapping_failed = false;
-GrowableArray<const char*>* FileMapInfo::_non_existent_class_paths = nullptr;
 
 // Open the shared archive file, read and validate the header
 // information (version, boot classpath, etc.). If initialization
@@ -2469,7 +1695,7 @@ GrowableArray<const char*>* FileMapInfo::_non_existent_class_paths = nullptr;
 // Validation of the archive is done in two steps:
 //
 // [1] validate_header() - done here.
-// [2] validate_shared_path_table - this is done later, because the table is in the RW
+// [2] validate_shared_path_table - this is done later, because the table is in the RO
 //     region of the archive, which is not mapped yet.
 bool FileMapInfo::initialize() {
   assert(CDSConfig::is_using_archive(), "UseSharedSpaces expected.");
@@ -2690,17 +1916,15 @@ ClassPathEntry* FileMapInfo::get_classpath_entry_for_jvmti(int i, TRAPS) {
   }
   ClassPathEntry* ent = _classpath_entries_for_jvmti[i];
   if (ent == nullptr) {
-    SharedClassPathEntry* scpe = shared_path(i);
-    assert(scpe->is_jar(), "must be"); // other types of scpe will not produce archived classes
-
-    const char* path = scpe->name();
+    const AOTClassLocation* cl = AOTClassLocationConfig::runtime()->class_location_at(i);
+    const char* path = cl->path();
     struct stat st;
     if (os::stat(path, &st) != 0) {
       char *msg = NEW_RESOURCE_ARRAY_IN_THREAD(THREAD, char, strlen(path) + 128);
       jio_snprintf(msg, strlen(path) + 127, "error in finding JAR file %s", path);
       THROW_MSG_(vmSymbols::java_io_IOException(), msg, nullptr);
     } else {
-      ent = ClassLoader::create_class_path_entry(THREAD, path, &st, false, false, scpe->is_multi_release());
+      ent = ClassLoader::create_class_path_entry(THREAD, path, &st);
       if (ent == nullptr) {
         char *msg = NEW_RESOURCE_ARRAY_IN_THREAD(THREAD, char, strlen(path) + 128);
         jio_snprintf(msg, strlen(path) + 127, "error in opening JAR file %s", path);
@@ -2724,7 +1948,7 @@ ClassPathEntry* FileMapInfo::get_classpath_entry_for_jvmti(int i, TRAPS) {
 ClassFileStream* FileMapInfo::open_stream_for_jvmti(InstanceKlass* ik, Handle class_loader, TRAPS) {
   int path_index = ik->shared_classpath_index();
   assert(path_index >= 0, "should be called for shared built-in classes only");
-  assert(path_index < (int)get_number_of_shared_paths(), "sanity");
+  assert(path_index < AOTClassLocationConfig::runtime()->length(), "sanity");
 
   ClassPathEntry* cpe = get_classpath_entry_for_jvmti(path_index, CHECK_NULL);
   assert(cpe != nullptr, "must be");
@@ -2734,8 +1958,12 @@ ClassFileStream* FileMapInfo::open_stream_for_jvmti(InstanceKlass* ik, Handle cl
   const char* const file_name = ClassLoader::file_name_for_class_name(class_name,
                                                                       name->utf8_length());
   ClassLoaderData* loader_data = ClassLoaderData::class_loader_data(class_loader());
+  const AOTClassLocation* cl = AOTClassLocationConfig::runtime()->class_location_at(path_index);
   ClassFileStream* cfs;
-  if (class_loader() != nullptr && !cpe->is_modules_image() && cpe->is_multi_release_jar()) {
+  if (class_loader() != nullptr && cl->is_multi_release_jar()) {
+    // This class was loaded from a multi-release JAR file during dump time. The
+    // process for finding its classfile is complex. Let's defer to the Java code
+    // in java.lang.ClassLoader.
     cfs = get_stream_from_class_loader(class_loader, cpe, file_name, CHECK_NULL);
   } else {
     cfs = cpe->open_stream_for_loader(THREAD, file_name, loader_data);
diff --git a/src/hotspot/share/cds/filemap.hpp b/src/hotspot/share/cds/filemap.hpp
index ae11c6c81cc..22f70635e17 100644
--- a/src/hotspot/share/cds/filemap.hpp
+++ b/src/hotspot/share/cds/filemap.hpp
@@ -42,6 +42,7 @@
 
 static const int JVM_IDENT_MAX = 256;
 
+class AOTClassLocationConfig;
 class ArchiveHeapInfo;
 class BitMapView;
 class CHeapBitMap;
@@ -51,89 +52,6 @@ class ClassPathEntry;
 class outputStream;
 class ReservedSpace;
 
-class SharedClassPathEntry : public MetaspaceObj {
-  enum {
-    modules_image_entry,
-    jar_entry,
-    dir_entry,
-    non_existent_entry,
-    unknown_entry
-  };
-
-  void set_name(const char* name, TRAPS);
-
-  u1     _type;
-  bool   _is_module_path;
-  bool   _from_class_path_attr;
-  bool   _is_multi_release;
-  time_t _timestamp;          // jar timestamp,  0 if is directory, modules image or other
-  int64_t      _filesize;     // jar/jimage file size, -1 if is directory, -2 if other
-  Array<char>* _name;
-  Array<u1>*   _manifest;
-
-public:
-  SharedClassPathEntry() : _type(0), _is_module_path(false),
-                           _from_class_path_attr(false), _is_multi_release(false), _timestamp(0),
-                           _filesize(0), _name(nullptr), _manifest(nullptr) {}
-  static int size() {
-    static_assert(is_aligned(sizeof(SharedClassPathEntry), wordSize), "must be");
-    return (int)(sizeof(SharedClassPathEntry) / wordSize);
-  }
-  void init(bool is_modules_image, bool is_module_path, ClassPathEntry* cpe, TRAPS);
-  void init_as_non_existent(const char* path, TRAPS);
-  void metaspace_pointers_do(MetaspaceClosure* it);
-  MetaspaceObj::Type type() const { return SharedClassPathEntryType; }
-  bool validate(bool is_class_path = true) const;
-
-  // The _timestamp only gets set for jar files.
-  bool has_timestamp() const {
-    return _timestamp != 0;
-  }
-  bool is_dir()           const { return _type == dir_entry; }
-  bool is_modules_image() const { return _type == modules_image_entry; }
-  bool is_jar()           const { return _type == jar_entry; }
-  bool is_non_existent()  const { return _type == non_existent_entry; }
-  bool from_class_path_attr() { return _from_class_path_attr; }
-  bool is_multi_release()     { return _is_multi_release; }
-  time_t timestamp() const { return _timestamp; }
-  const char* name() const;
-  const char* manifest() const {
-    return (_manifest == nullptr) ? nullptr : (const char*)_manifest->data();
-  }
-  int manifest_size() const {
-    return (_manifest == nullptr) ? 0 : _manifest->length();
-  }
-  void set_manifest(Array<u1>* manifest) {
-    _manifest = manifest;
-  }
-  bool check_non_existent() const;
-  void copy_from(SharedClassPathEntry* ent, ClassLoaderData* loader_data, TRAPS);
-  bool in_named_module() {
-    return is_modules_image() || // modules image doesn't contain unnamed modules
-           _is_module_path;      // module path doesn't contain unnamed modules
-  }
-};
-
-class SharedPathTable {
-  Array<SharedClassPathEntry*>* _entries;
-public:
-  SharedPathTable() : _entries(nullptr) {}
-  SharedPathTable(Array<SharedClassPathEntry*>* entries) : _entries(entries) {}
-
-  void dumptime_init(ClassLoaderData* loader_data, TRAPS);
-  void metaspace_pointers_do(MetaspaceClosure* it);
-
-  int size() {
-    return _entries == nullptr ? 0 : _entries->length();
-  }
-  SharedClassPathEntry* path_at(int index) {
-    return _entries->at(index);
-  }
-  Array<SharedClassPathEntry*>* table() {return _entries;}
-  void set_table(Array<SharedClassPathEntry*>* table) {_entries = table;}
-};
-
-
 class FileMapRegion: private CDSFileMapRegion {
 public:
   void assert_is_heap_region() const {
@@ -203,30 +121,17 @@ private:
   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
-                                                  //    0 if no common prefix exists
 
   // The following fields are all sanity checks for whether this archive
   // will function correctly with this JVM and the bootclasspath it's
   // invoked with.
   char  _jvm_ident[JVM_IDENT_MAX];  // identifier string of the jvm that created this dump
 
-  // The following is a table of all the boot/app/module path entries that were used
-  // during dumping. At run time, we validate these entries according to their
-  // SharedClassPathEntry::_type. See:
-  //      check_nonempty_dir_in_shared_path_table()
-  //      validate_shared_path_table()
-  //      validate_non_existent_class_paths()
-  size_t _shared_path_table_offset;
+  size_t _class_location_config_offset;
 
-  jshort _app_class_paths_start_index;  // Index of first app classpath entry
-  jshort _app_module_paths_start_index; // Index of first module path entry
-  jshort _max_used_path_index;          // max path index referenced during CDS dump
-  int    _num_module_paths;             // number of module path entries
   bool   _verify_local;                 // BytecodeVerificationLocal setting
   bool   _verify_remote;                // BytecodeVerificationRemote setting
-  bool   _has_platform_or_app_classes;  // Archive contains app classes
+  bool   _has_platform_or_app_classes;  // Archive contains app or platform classes
   char*  _requested_base_address;       // Archive relocation is not necessary if we map with this base address.
   char*  _mapped_base_address;          // Actual base address where archive is mapped.
 
@@ -241,10 +146,14 @@ private:
   size_t _heap_ptrmap_start_pos;        // The first bit in the ptrmap corresponds to this position in the heap.
   size_t _rw_ptrmap_start_pos;          // The first bit in the ptrmap corresponds to this position in the rw region
   size_t _ro_ptrmap_start_pos;          // The first bit in the ptrmap corresponds to this position in the ro region
-  char* from_mapped_offset(size_t offset) const {
-    return mapped_base_address() + offset;
+  template <typename T> T from_mapped_offset(size_t offset) const {
+    return (T)(mapped_base_address() + offset);
   }
   void set_as_offset(char* p, size_t *offset);
+  template <typename T> void set_as_offset(T p, size_t *offset) {
+    set_as_offset((char*)p, offset);
+  }
+
 public:
   // Accessors -- fields declared in GenericCDSFileMapHeader
   unsigned int magic()                            const { return _generic_header._magic;                    }
@@ -253,7 +162,6 @@ public:
   unsigned int header_size()                      const { return _generic_header._header_size;              }
   unsigned int base_archive_name_offset()         const { return _generic_header._base_archive_name_offset; }
   unsigned int base_archive_name_size()           const { return _generic_header._base_archive_name_size;   }
-  unsigned int common_app_classpath_prefix_size() const { return _common_app_classpath_prefix_size;         }
 
   void set_magic(unsigned int m)                            { _generic_header._magic = m;                    }
   void set_crc(int crc_value)                               { _generic_header._crc = crc_value;              }
@@ -261,7 +169,6 @@ public:
   void set_header_size(unsigned int s)                      { _generic_header._header_size = s;              }
   void set_base_archive_name_offset(unsigned int s)         { _generic_header._base_archive_name_offset = s; }
   void set_base_archive_name_size(unsigned int s)           { _generic_header._base_archive_name_size = s;   }
-  void set_common_app_classpath_prefix_size(unsigned int s) { _common_app_classpath_prefix_size = s;         }
 
   bool is_static()                         const { return magic() == CDS_ARCHIVE_MAGIC; }
   size_t core_region_alignment()           const { return _core_region_alignment; }
@@ -272,14 +179,13 @@ public:
   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); }
+  char* cloned_vtables()                   const { return from_mapped_offset<char*>(_cloned_vtables_offset); }
+  char* early_serialized_data()            const { return from_mapped_offset<char*>(_early_serialized_data_offset); }
+  char* serialized_data()                  const { return from_mapped_offset<char*>(_serialized_data_offset); }
   const char* jvm_ident()                  const { return _jvm_ident; }
   char* requested_base_address()           const { return _requested_base_address; }
   char* mapped_base_address()              const { return _mapped_base_address; }
   bool has_platform_or_app_classes()       const { return _has_platform_or_app_classes; }
-  bool has_non_jar_in_classpath()          const { return _has_non_jar_in_classpath; }
   bool has_aot_linked_classes()            const { return _has_aot_linked_classes; }
   bool compressed_oops()                   const { return _compressed_oops; }
   bool compressed_class_pointers()         const { return _compressed_class_ptrs; }
@@ -291,11 +197,6 @@ public:
   size_t heap_ptrmap_start_pos()           const { return _heap_ptrmap_start_pos; }
   size_t rw_ptrmap_start_pos()             const { return _rw_ptrmap_start_pos; }
   size_t ro_ptrmap_start_pos()             const { return _ro_ptrmap_start_pos; }
-  // FIXME: These should really return int
-  jshort max_used_path_index()             const { return _max_used_path_index; }
-  jshort app_module_paths_start_index()    const { return _app_module_paths_start_index; }
-  jshort app_class_paths_start_index()     const { return _app_class_paths_start_index; }
-  int    num_module_paths()                const { return _num_module_paths; }
 
   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); }
@@ -309,8 +210,12 @@ public:
   void set_ro_ptrmap_start_pos(size_t n)         { _ro_ptrmap_start_pos = n; }
   void copy_base_archive_name(const char* name);
 
-  void set_shared_path_table(SharedPathTable table) {
-    set_as_offset((char*)table.table(), &_shared_path_table_offset);
+  void set_class_location_config(AOTClassLocationConfig* table) {
+    set_as_offset(table, &_class_location_config_offset);
+  }
+
+  AOTClassLocationConfig* class_location_config() {
+    return from_mapped_offset<AOTClassLocationConfig*>(_class_location_config_offset);
   }
 
   void set_requested_base(char* b) {
@@ -318,11 +223,6 @@ public:
     _mapped_base_address = nullptr;
   }
 
-  SharedPathTable shared_path_table() const {
-    return SharedPathTable((Array<SharedClassPathEntry*>*)
-                           from_mapped_offset(_shared_path_table_offset));
-  }
-
   bool validate();
   int compute_crc();
 
@@ -332,8 +232,7 @@ public:
   }
 
   void populate(FileMapInfo *info, size_t core_region_alignment, size_t header_size,
-                size_t base_archive_name_size, size_t base_archive_name_offset,
-                size_t common_app_classpath_size);
+                size_t base_archive_name_size, size_t base_archive_name_offset);
   static bool is_valid_region(int region) {
     return (0 <= region && region < NUM_CDS_REGIONS);
   }
@@ -358,9 +257,6 @@ private:
   const char*    _base_archive_name;
   FileMapHeader* _header;
 
-  static SharedPathTable       _shared_path_table;
-  static bool                  _validating_shared_path_table;
-
   // FileMapHeader describes the shared space data in the file to be
   // mapped.  This structure gets written to a file.  It is not a class, so
   // that the compilers don't add any compiler-private data to it.
@@ -369,20 +265,12 @@ private:
   static FileMapInfo* _dynamic_archive_info;
   static bool _heap_pointers_need_patching;
   static bool _memory_mapping_failed;
-  static GrowableArray<const char*>* _non_existent_class_paths;
 
 public:
   FileMapHeader *header() const       { return _header; }
   static bool get_base_archive_name_from_header(const char* archive_name,
                                                 char** base_archive_name);
-  static SharedPathTable shared_path_table() {
-    return _shared_path_table;
-  }
-
   bool init_from_file(int fd);
-  static void metaspace_pointers_do(MetaspaceClosure* it) {
-    _shared_path_table.metaspace_pointers_do(it);
-  }
 
   void log_paths(const char* msg, int start_idx, int end_idx);
 
@@ -408,8 +296,6 @@ public:
   size_t  heap_ptrmap_start_pos() const { return header()->heap_ptrmap_start_pos(); }
 
   CompressedOops::Mode narrow_oop_mode()      const { return header()->narrow_oop_mode(); }
-  jshort app_module_paths_start_index()       const { return header()->app_module_paths_start_index(); }
-  jshort app_class_paths_start_index()        const { return header()->app_class_paths_start_index(); }
 
   char* cloned_vtables()                      const { return header()->cloned_vtables(); }
   void  set_cloned_vtables(char* p)           const { header()->set_cloned_vtables(p); }
@@ -494,19 +380,8 @@ public:
     NOT_CDS(return false;)
   }
 
-  static void allocate_shared_path_table(TRAPS);
-  static int add_shared_classpaths(int i, const char* which, ClassPathEntry *cpe, TRAPS);
-  static void check_nonempty_dir_in_shared_path_table();
-  bool check_module_paths();
-  bool validate_shared_path_table();
-  bool validate_non_existent_class_paths();
+  bool validate_class_location();
   bool validate_aot_class_linking();
-  static void set_shared_path_table(FileMapInfo* info) {
-    _shared_path_table = info->header()->shared_path_table();
-  }
-  static void update_jar_manifest(ClassPathEntry *cpe, SharedClassPathEntry* ent, TRAPS);
-  static int num_non_existent_class_paths();
-  static void record_non_existent_class_path_entry(const char* path);
 
 #if INCLUDE_JVMTI
   // Caller needs a ResourceMark because parts of the returned cfs are resource-allocated.
@@ -517,21 +392,6 @@ public:
                                                        TRAPS);
 #endif
 
-  static SharedClassPathEntry* shared_path(int index) {
-    return _shared_path_table.path_at(index);
-  }
-
-  static const char* shared_path_name(int index) {
-    assert(index >= 0, "Sanity");
-    return shared_path(index)->name();
-  }
-
-  static int get_number_of_shared_paths() {
-    return _shared_path_table.size();
-  }
-
-  static int get_module_shared_path_index(Symbol* location) NOT_CDS_RETURN_(-1);
-
   // The offset of the first core region in the archive, relative to SharedBaseAddress
   size_t mapping_base_offset() const { return first_core_region()->mapping_offset();    }
   // The offset of the (exclusive) end of the last core region in this archive, relative to SharedBaseAddress
@@ -564,22 +424,6 @@ public:
 
  private:
   void  seek_to_position(size_t pos);
-  char* skip_first_path_entry(const char* path) NOT_CDS_RETURN_(nullptr);
-  int   num_paths(const char* path) NOT_CDS_RETURN_(0);
-  bool  check_paths_existence(const char* paths) NOT_CDS_RETURN_(false);
-  GrowableArray<const char*>* create_dumptime_app_classpath_array() NOT_CDS_RETURN_(nullptr);
-  GrowableArray<const char*>* create_path_array(const char* path) NOT_CDS_RETURN_(nullptr);
-  bool  classpath_failure(const char* msg, const char* name) NOT_CDS_RETURN_(false);
-  unsigned int longest_common_app_classpath_prefix_len(int num_paths,
-                                                       GrowableArray<const char*>* rp_array)
-                                                       NOT_CDS_RETURN_(0);
-  bool  check_paths(int shared_path_start_idx, int num_paths,
-                    GrowableArray<const char*>* rp_array,
-                    unsigned int dumptime_prefix_len,
-                    unsigned int runtime_prefix_len) NOT_CDS_RETURN_(false);
-  void  extract_module_paths(const char* runtime_path, GrowableArray<const char*>* module_paths);
-  bool  validate_boot_class_paths() NOT_CDS_RETURN_(false);
-  bool  validate_app_class_paths(int shared_app_paths_len) NOT_CDS_RETURN_(false);
   bool  map_heap_region_impl() NOT_CDS_JAVA_HEAP_RETURN_(false);
   void  dealloc_heap_region() NOT_CDS_JAVA_HEAP_RETURN;
   bool  can_use_heap_region();
diff --git a/src/hotspot/share/cds/heapShared.cpp b/src/hotspot/share/cds/heapShared.cpp
index b619bd81670..5aa456ea438 100644
--- a/src/hotspot/share/cds/heapShared.cpp
+++ b/src/hotspot/share/cds/heapShared.cpp
@@ -24,6 +24,7 @@
 
 #include "cds/aotArtifactFinder.hpp"
 #include "cds/aotClassInitializer.hpp"
+#include "cds/aotClassLocation.hpp"
 #include "cds/archiveBuilder.hpp"
 #include "cds/archiveHeapLoader.hpp"
 #include "cds/archiveHeapWriter.hpp"
@@ -1171,11 +1172,12 @@ void HeapShared::initialize_from_archived_subgraph(JavaThread* current, Klass* k
   if (k->name()->equals("jdk/internal/module/ArchivedModuleGraph") &&
       !CDSConfig::is_using_optimized_module_handling() &&
       // archive was created with --module-path
-      ClassLoaderExt::num_module_paths() > 0) {
+      AOTClassLocationConfig::runtime()->num_module_paths() > 0) {
     // ArchivedModuleGraph was created with a --module-path that's different than the runtime --module-path.
     // Thus, it might contain references to modules that do not exist at runtime. We cannot use it.
     log_info(cds, heap)("Skip initializing ArchivedModuleGraph subgraph: is_using_optimized_module_handling=%s num_module_paths=%d",
-                        BOOL_TO_STR(CDSConfig::is_using_optimized_module_handling()), ClassLoaderExt::num_module_paths());
+                        BOOL_TO_STR(CDSConfig::is_using_optimized_module_handling()),
+                        AOTClassLocationConfig::runtime()->num_module_paths());
     return;
   }
 
diff --git a/src/hotspot/share/cds/metaspaceShared.cpp b/src/hotspot/share/cds/metaspaceShared.cpp
index ba687bea8ba..b95d524cb1d 100644
--- a/src/hotspot/share/cds/metaspaceShared.cpp
+++ b/src/hotspot/share/cds/metaspaceShared.cpp
@@ -24,6 +24,7 @@
 
 #include "cds/aotArtifactFinder.hpp"
 #include "cds/aotClassLinker.hpp"
+#include "cds/aotClassLocation.hpp"
 #include "cds/aotConstantPoolResolver.hpp"
 #include "cds/aotLinkedClassBulkLoader.hpp"
 #include "cds/archiveBuilder.hpp"
@@ -330,20 +331,9 @@ void MetaspaceShared::initialize_for_static_dump() {
 // Called by universe_post_init()
 void MetaspaceShared::post_initialize(TRAPS) {
   if (CDSConfig::is_using_archive()) {
-    int size = FileMapInfo::get_number_of_shared_paths();
+    int size = AOTClassLocationConfig::runtime()->length();
     if (size > 0) {
       CDSProtectionDomain::allocate_shared_data_arrays(size, CHECK);
-      if (!CDSConfig::is_dumping_dynamic_archive()) {
-        FileMapInfo* info;
-        if (FileMapInfo::dynamic_info() == nullptr) {
-          info = FileMapInfo::current_info();
-        } else {
-          info = FileMapInfo::dynamic_info();
-        }
-        ClassLoaderExt::init_paths_start_index(info->app_class_paths_start_index());
-        ClassLoaderExt::init_app_module_paths_start_index(info->app_module_paths_start_index());
-        ClassLoaderExt::init_num_module_paths(info->header()->num_module_paths());
-      }
     }
   }
 }
@@ -558,7 +548,7 @@ private:
     SymbolTable::write_to_archive(symbols);
   }
   char* dump_early_read_only_tables();
-  char* dump_read_only_tables();
+  char* dump_read_only_tables(AOTClassLocationConfig*& cl_config);
 
 public:
 
@@ -579,7 +569,6 @@ public:
   StaticArchiveBuilder() : ArchiveBuilder() {}
 
   virtual void iterate_roots(MetaspaceClosure* it) {
-    FileMapInfo::metaspace_pointers_do(it);
     AOTArtifactFinder::all_cached_classes_do(it);
     SystemDictionaryShared::dumptime_classes_do(it);
     Universe::metaspace_pointers_do(it);
@@ -614,10 +603,11 @@ char* VM_PopulateDumpSharedSpace::dump_early_read_only_tables() {
   return start;
 }
 
-char* VM_PopulateDumpSharedSpace::dump_read_only_tables() {
+char* VM_PopulateDumpSharedSpace::dump_read_only_tables(AOTClassLocationConfig*& cl_config) {
   ArchiveBuilder::OtherROAllocMark mark;
 
   SystemDictionaryShared::write_to_archive();
+  cl_config = AOTClassLocationConfig::dumptime()->write_to_archive();
   AOTClassLinker::write_to_archive();
   MetaspaceShared::write_method_handle_intrinsics();
 
@@ -645,7 +635,7 @@ void VM_PopulateDumpSharedSpace::doit() {
     SystemDictionary::get_all_method_handle_intrinsics(_pending_method_handle_intrinsics);
   }
 
-  FileMapInfo::check_nonempty_dir_in_shared_path_table();
+  AOTClassLocationConfig::dumptime_check_nonempty_dirs();
 
   NOT_PRODUCT(SystemDictionary::verify();)
 
@@ -679,7 +669,8 @@ void VM_PopulateDumpSharedSpace::doit() {
   dump_shared_symbol_table(_builder.symbols());
 
   char* early_serialized_data = dump_early_read_only_tables();
-  char* serialized_data = dump_read_only_tables();
+  AOTClassLocationConfig* cl_config;
+  char* serialized_data = dump_read_only_tables(cl_config);
 
   SystemDictionaryShared::adjust_lambda_proxy_class_dictionary();
 
@@ -695,6 +686,7 @@ void VM_PopulateDumpSharedSpace::doit() {
   _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());
+  _map_info->header()->set_class_location_config(cl_config);
 }
 
 class CollectCLDClosure : public CLDClosure {
@@ -791,7 +783,6 @@ void MetaspaceShared::link_shared_classes(bool jcmd_request, TRAPS) {
 void MetaspaceShared::prepare_for_dumping() {
   assert(CDSConfig::is_dumping_archive(), "sanity");
   CDSConfig::check_unsupported_dumping_module_options();
-  ClassLoader::initialize_shared_path(JavaThread::current());
 }
 
 // Preload classes from a list, populate the shared spaces and dump to a
@@ -946,6 +937,7 @@ void MetaspaceShared::preload_and_dump_impl(StaticArchiveBuilder& builder, TRAPS
     HeapShared::init_for_dumping(CHECK);
     ArchiveHeapWriter::init();
     if (CDSConfig::is_dumping_full_module_graph()) {
+      ClassLoaderDataShared::ensure_module_entry_tables_exist();
       HeapShared::reset_archived_object_states(CHECK);
     }
 
@@ -1134,11 +1126,8 @@ void MetaspaceShared::initialize_runtime_shared_and_meta_spaces() {
     _relocation_delta = static_mapinfo->relocation_delta();
     _requested_base_address = static_mapinfo->requested_base_address();
     if (dynamic_mapped) {
-      FileMapInfo::set_shared_path_table(dynamic_mapinfo);
       // turn AutoCreateSharedArchive off if successfully mapped
       AutoCreateSharedArchive = false;
-    } else {
-      FileMapInfo::set_shared_path_table(static_mapinfo);
     }
   } else {
     set_shared_metaspace_range(nullptr, nullptr, nullptr);
@@ -1641,7 +1630,7 @@ MapArchiveResult MetaspaceShared::map_archive(FileMapInfo* mapinfo, char* mapped
     return result;
   }
 
-  if (!mapinfo->validate_shared_path_table()) {
+  if (!mapinfo->validate_class_location()) {
     unmap_archive(mapinfo);
     return MAP_ARCHIVE_OTHER_FAILURE;
   }
diff --git a/src/hotspot/share/cds/unregisteredClasses.cpp b/src/hotspot/share/cds/unregisteredClasses.cpp
index 173713e341a..2e985b72310 100644
--- a/src/hotspot/share/cds/unregisteredClasses.cpp
+++ b/src/hotspot/share/cds/unregisteredClasses.cpp
@@ -22,6 +22,7 @@
  *
  */
 
+#include "cds/cdsConfig.hpp"
 #include "cds/unregisteredClasses.hpp"
 #include "classfile/classFileStream.hpp"
 #include "classfile/classLoader.inline.hpp"
diff --git a/src/hotspot/share/classfile/classLoader.cpp b/src/hotspot/share/classfile/classLoader.cpp
index fa003756685..3ca1ec237e8 100644
--- a/src/hotspot/share/classfile/classLoader.cpp
+++ b/src/hotspot/share/classfile/classLoader.cpp
@@ -22,9 +22,9 @@
  *
  */
 
+#include "cds/aotClassLocation.hpp"
 #include "cds/cds_globals.hpp"
 #include "cds/cdsConfig.hpp"
-#include "cds/filemap.hpp"
 #include "cds/heapShared.hpp"
 #include "classfile/classFileStream.hpp"
 #include "classfile/classLoader.inline.hpp"
@@ -158,12 +158,6 @@ ClassPathEntry* ClassLoader::_jrt_entry = nullptr;
 
 ClassPathEntry* volatile ClassLoader::_first_append_entry_list = nullptr;
 ClassPathEntry* volatile ClassLoader::_last_append_entry  = nullptr;
-#if INCLUDE_CDS
-ClassPathEntry* ClassLoader::_app_classpath_entries = nullptr;
-ClassPathEntry* ClassLoader::_last_app_classpath_entry = nullptr;
-ClassPathEntry* ClassLoader::_module_path_entries = nullptr;
-ClassPathEntry* ClassLoader::_last_module_path_entry = nullptr;
-#endif
 
 // helper routines
 #if INCLUDE_CDS
@@ -301,12 +295,9 @@ ClassFileStream* ClassPathDirEntry::open_stream(JavaThread* current, const char*
   return nullptr;
 }
 
-ClassPathZipEntry::ClassPathZipEntry(jzfile* zip, const char* zip_name,
-                                     bool is_boot_append, bool from_class_path_attr, bool multi_release) : ClassPathEntry() {
+ClassPathZipEntry::ClassPathZipEntry(jzfile* zip, const char* zip_name) : ClassPathEntry() {
   _zip = zip;
   _zip_name = copy_path(zip_name);
-  _from_class_path_attr = from_class_path_attr;
-  _multi_release = multi_release;
 }
 
 ClassPathZipEntry::~ClassPathZipEntry() {
@@ -463,14 +454,6 @@ bool ClassPathImageEntry::is_modules_image() const {
   return true;
 }
 
-#if INCLUDE_CDS
-void ClassLoader::exit_with_path_failure(const char* error, const char* message) {
-  assert(CDSConfig::is_dumping_archive(), "sanity");
-  tty->print_cr("Hint: enable -Xlog:class+path=info to diagnose the failure");
-  vm_exit_during_cds_dumping(error, message);
-}
-#endif
-
 ModuleClassPathList::ModuleClassPathList(Symbol* module_name) {
   _module_name = module_name;
   _module_first_entry = nullptr;
@@ -533,57 +516,6 @@ void ClassLoader::setup_bootstrap_search_path(JavaThread* current) {
   setup_bootstrap_search_path_impl(current, bootcp);
 }
 
-#if INCLUDE_CDS
-void ClassLoader::setup_app_search_path(JavaThread* current, const char *class_path) {
-  assert(CDSConfig::is_dumping_archive(), "sanity");
-
-  ResourceMark rm(current);
-  ClasspathStream cp_stream(class_path);
-
-  while (cp_stream.has_next()) {
-    const char* path = cp_stream.get_next();
-    update_class_path_entry_list(current, path, /* check_for_duplicates */ true,
-                                 /* is_boot_append */ false, /* from_class_path_attr */ false);
-  }
-}
-
-void ClassLoader::add_to_module_path_entries(const char* path,
-                                             ClassPathEntry* entry) {
-  assert(entry != nullptr, "ClassPathEntry should not be nullptr");
-  assert(CDSConfig::is_dumping_archive(), "sanity");
-
-  // The entry does not exist, add to the list
-  if (_module_path_entries == nullptr) {
-    assert(_last_module_path_entry == nullptr, "Sanity");
-    _module_path_entries = _last_module_path_entry = entry;
-  } else {
-    _last_module_path_entry->set_next(entry);
-    _last_module_path_entry = entry;
-  }
-}
-
-// Add a module path to the _module_path_entries list.
-void ClassLoader::setup_module_search_path(JavaThread* current, const char* path) {
-  assert(CDSConfig::is_dumping_archive(), "sanity");
-  struct stat st;
-  if (os::stat(path, &st) != 0) {
-    tty->print_cr("os::stat error %d (%s). CDS dump aborted (path was \"%s\").",
-      errno, os::errno_name(errno), path);
-    vm_exit_during_initialization();
-  }
-  // File or directory found
-  ClassPathEntry* new_entry = nullptr;
-  new_entry = create_class_path_entry(current, path, &st,
-                                      false /*is_boot_append */, false /* from_class_path_attr */);
-  if (new_entry != nullptr) {
-    // ClassLoaderExt::process_module_table() filters out non-jar entries before calling this function.
-    assert(new_entry->is_jar_file(), "module path entry %s is not a jar file", new_entry->name());
-    add_to_module_path_entries(path, new_entry);
-  }
-}
-
-#endif // INCLUDE_CDS
-
 void ClassLoader::close_jrt_image() {
   // Not applicable for exploded builds
   if (!ClassLoader::has_jrt_entry()) return;
@@ -616,7 +548,7 @@ void ClassLoader::setup_patch_mod_entries() {
       struct stat st;
       if (os::stat(path, &st) == 0) {
         // File or directory found
-        ClassPathEntry* new_entry = create_class_path_entry(current, path, &st, false, false);
+        ClassPathEntry* new_entry = create_class_path_entry(current, path, &st);
         // If the path specification is valid, enter it into this module's list
         if (new_entry != nullptr) {
           module_cpl->add_to_list(new_entry);
@@ -690,8 +622,7 @@ void ClassLoader::setup_bootstrap_search_path_impl(JavaThread* current, const ch
     } else {
       // Every entry on the boot class path after the initial base piece,
       // which is set by os::set_boot_path(), is considered an appended entry.
-      update_class_path_entry_list(current, path, /* check_for_duplicates */ false,
-                                    /* is_boot_append */ true, /* from_class_path_attr */ false);
+      update_class_path_entry_list(current, path);
     }
   }
 }
@@ -722,7 +653,7 @@ void ClassLoader::add_to_exploded_build_list(JavaThread* current, Symbol* module
   struct stat st;
   if (os::stat(path, &st) == 0) {
     // Directory found
-    ClassPathEntry* new_entry = create_class_path_entry(current, path, &st, false, false);
+    ClassPathEntry* new_entry = create_class_path_entry(current, path, &st);
 
     // If the path specification is valid, enter it into this module's list.
     // There is no need to check for duplicate modules in the exploded entry list,
@@ -748,10 +679,7 @@ jzfile* ClassLoader::open_zip_file(const char* canonical_path, char** error_msg,
 }
 
 ClassPathEntry* ClassLoader::create_class_path_entry(JavaThread* current,
-                                                     const char *path, const struct stat* st,
-                                                     bool is_boot_append,
-                                                     bool from_class_path_attr,
-                                                     bool is_multi_release) {
+                                                     const char *path, const struct stat* st) {
   ClassPathEntry* new_entry = nullptr;
   if ((st->st_mode & S_IFMT) == S_IFREG) {
     ResourceMark rm(current);
@@ -764,11 +692,8 @@ ClassPathEntry* ClassLoader::create_class_path_entry(JavaThread* current,
     char* error_msg = nullptr;
     jzfile* zip = open_zip_file(canonical_path, &error_msg, current);
     if (zip != nullptr && error_msg == nullptr) {
-      new_entry = new ClassPathZipEntry(zip, path, is_boot_append, from_class_path_attr, is_multi_release);
+      new_entry = new ClassPathZipEntry(zip, path);
     } else {
-#if INCLUDE_CDS
-      ClassLoaderExt::set_has_non_jar_in_classpath();
-#endif
       return nullptr;
     }
     log_info(class, path)("opened: %s", path);
@@ -784,7 +709,7 @@ ClassPathEntry* ClassLoader::create_class_path_entry(JavaThread* current,
 
 // Create a class path zip entry for a given path (return null if not found
 // or zip/JAR file cannot be opened)
-ClassPathZipEntry* ClassLoader::create_class_path_zip_entry(const char *path, bool is_boot_append) {
+ClassPathZipEntry* ClassLoader::create_class_path_zip_entry(const char *path) {
   // check for a regular file
   struct stat st;
   if (os::stat(path, &st) == 0) {
@@ -797,7 +722,7 @@ ClassPathZipEntry* ClassLoader::create_class_path_zip_entry(const char *path, bo
         jzfile* zip = open_zip_file(canonical_path, &error_msg, thread);
         if (zip != nullptr && error_msg == nullptr) {
           // create using canonical path
-          return new ClassPathZipEntry(zip, canonical_path, is_boot_append, false, false);
+          return new ClassPathZipEntry(zip, canonical_path);
         }
       }
     }
@@ -820,70 +745,20 @@ void ClassLoader::add_to_boot_append_entries(ClassPathEntry *new_entry) {
   }
 }
 
-// Record the path entries specified in -cp during dump time. The recorded
-// information will be used at runtime for loading the archived app classes.
-//
-// Note that at dump time, ClassLoader::_app_classpath_entries are NOT used for
-// loading app classes. Instead, the app class are loaded by the
-// jdk/internal/loader/ClassLoaders$AppClassLoader instance.
-bool ClassLoader::add_to_app_classpath_entries(JavaThread* current,
-                                               ClassPathEntry* entry,
-                                               bool check_for_duplicates) {
-#if INCLUDE_CDS
-  assert(entry != nullptr, "ClassPathEntry should not be nullptr");
-  ClassPathEntry* e = _app_classpath_entries;
-  if (check_for_duplicates) {
-    while (e != nullptr) {
-      if (strcmp(e->name(), entry->name()) == 0 &&
-          e->from_class_path_attr() == entry->from_class_path_attr()) {
-        // entry already exists
-        return false;
-      }
-      e = e->next();
-    }
-  }
-
-  // The entry does not exist, add to the list
-  if (_app_classpath_entries == nullptr) {
-    assert(_last_app_classpath_entry == nullptr, "Sanity");
-    _app_classpath_entries = _last_app_classpath_entry = entry;
-  } else {
-    _last_app_classpath_entry->set_next(entry);
-    _last_app_classpath_entry = entry;
-  }
-
-  if (entry->is_jar_file()) {
-    ClassLoaderExt::process_jar_manifest(current, entry);
-  }
-#endif
-  return true;
-}
-
 // Returns true IFF the file/dir exists and the entry was successfully created.
-bool ClassLoader::update_class_path_entry_list(JavaThread* current,
-                                               const char *path,
-                                               bool check_for_duplicates,
-                                               bool is_boot_append,
-                                               bool from_class_path_attr) {
+bool ClassLoader::update_class_path_entry_list(JavaThread* current, const char *path) {
   struct stat st;
   if (os::stat(path, &st) == 0) {
     // File or directory found
     ClassPathEntry* new_entry = nullptr;
-    new_entry = create_class_path_entry(current, path, &st, is_boot_append, from_class_path_attr);
+    new_entry = create_class_path_entry(current, path, &st);
     if (new_entry == nullptr) {
       return false;
     }
 
     // Do not reorder the bootclasspath which would break get_system_package().
     // Add new entry to linked list
-    if (is_boot_append) {
-      add_to_boot_append_entries(new_entry);
-    } else {
-      if (!add_to_app_classpath_entries(current, new_entry, check_for_duplicates)) {
-        // new_entry is not saved, free it now
-        delete new_entry;
-      }
-    }
+    add_to_boot_append_entries(new_entry);
     return true;
   } else {
     return false;
@@ -1318,63 +1193,61 @@ void ClassLoader::record_result(JavaThread* current, InstanceKlass* ik,
   int classpath_index = -1;
   PackageEntry* pkg_entry = ik->package();
 
-  if (FileMapInfo::get_number_of_shared_paths() > 0) {
+  if (!AOTClassLocationConfig::dumptime_is_ready()) {
+    // The shared path table is set up after module system initialization.
+    // The path table contains no entry before that. Any classes loaded prior
+    // to the setup of the shared path table must be from the modules image.
+    assert(stream->from_boot_loader_modules_image(), "stream must be loaded by boot loader from modules image");
+    classpath_index = 0;
+  } else {
     // Save the path from the file: protocol or the module name from the jrt: protocol
     // if no protocol prefix is found, path is the same as stream->source(). This path
     // must be valid since the class has been successfully parsed.
     const char* path = ClassLoader::uri_to_path(src);
     assert(path != nullptr, "sanity");
-    for (int i = 0; i < FileMapInfo::get_number_of_shared_paths(); i++) {
-      SharedClassPathEntry* ent = FileMapInfo::shared_path(i);
-      // A shared path has been validated during its creation in ClassLoader::create_class_path_entry(),
-      // it must be valid here.
-      assert(ent->name() != nullptr, "sanity");
-      // If the path (from the class stream source) is the same as the shared
-      // class or module path, then we have a match.
-      // src may come from the App/Platform class loaders, which would canonicalize
-      // the file name. We cannot use strcmp to check for equality against ent->name().
-      // We must use os::same_files (which is faster than canonicalizing ent->name()).
-      if (os::same_files(ent->name(), path)) {
+    AOTClassLocationConfig::dumptime_iterate([&] (AOTClassLocation* cl) {
+      int i = cl->index();
+      // for index 0 and the stream->source() is the modules image or has the jrt: protocol.
+      // The class must be from the runtime modules image.
+      if (cl->is_modules_image() && (stream->from_boot_loader_modules_image() || string_starts_with(src, "jrt:"))) {
+        classpath_index = i;
+      } else if (os::same_files(cl->path(), path)) {
+        // If the path (from the class stream source) is the same as the shared
+        // class or module path, then we have a match.
+        // src may come from the App/Platform class loaders, which would canonicalize
+        // the file name. We cannot use strcmp to check for equality against cs->path().
+        // We must use os::same_files (which is faster than canonicalizing cs->path()).
+
         // null pkg_entry and pkg_entry in an unnamed module implies the class
         // is from the -cp or boot loader append path which consists of -Xbootclasspath/a
         // and jvmti appended entries.
         if ((pkg_entry == nullptr) || (pkg_entry->in_unnamed_module())) {
           // Ensure the index is within the -cp range before assigning
           // to the classpath_index.
-          if (SystemDictionary::is_system_class_loader(loader) &&
-              (i >= ClassLoaderExt::app_class_paths_start_index()) &&
-              (i < ClassLoaderExt::app_module_paths_start_index())) {
+          if (SystemDictionary::is_system_class_loader(loader) && cl->from_app_classpath()) {
             classpath_index = i;
-            break;
           } else {
-            if ((i >= 1) &&
-                (i < ClassLoaderExt::app_class_paths_start_index())) {
+            if (cl->from_boot_classpath()) {
               // The class must be from boot loader append path which consists of
               // -Xbootclasspath/a and jvmti appended entries.
               assert(loader == nullptr, "sanity");
               classpath_index = i;
-              break;
             }
           }
         } else {
           // A class from a named module from the --module-path. Ensure the index is
           // within the --module-path range before assigning to the classpath_index.
-          if ((pkg_entry != nullptr) && !(pkg_entry->in_unnamed_module()) && (i > 0)) {
-            if (i >= ClassLoaderExt::app_module_paths_start_index() &&
-                i < FileMapInfo::get_number_of_shared_paths()) {
-              classpath_index = i;
-              break;
-            }
+          if ((pkg_entry != nullptr) && !(pkg_entry->in_unnamed_module()) && cl->from_module_path()) {
+            classpath_index = i;
           }
         }
       }
-      // for index 0 and the stream->source() is the modules image or has the jrt: protocol.
-      // The class must be from the runtime modules image.
-      if (i == 0 && (stream->from_boot_loader_modules_image() || string_starts_with(src, "jrt:"))) {
-        classpath_index = i;
-        break;
+      if (classpath_index >= 0) {
+        return false; // quit iterating
+      } else {
+        return true; // Keep iterating
       }
-    }
+    });
 
     // No path entry found for this class: most likely a shared class loaded by the
     // user defined classloader.
@@ -1384,13 +1257,6 @@ void ClassLoader::record_result(JavaThread* current, InstanceKlass* ik,
       SystemDictionaryShared::set_shared_class_misc_info(ik, (ClassFileStream*)stream);
       return;
     }
-  } else {
-    // The shared path table is set up after module system initialization.
-    // The path table contains no entry before that. Any classes loaded prior
-    // to the setup of the shared path table must be from the modules image.
-    assert(stream->from_boot_loader_modules_image(), "stream must be loaded by boot loader from modules image");
-    assert(FileMapInfo::get_number_of_shared_paths() == 0, "shared path table must not have been setup");
-    classpath_index = 0;
   }
 
   const char* const class_name = ik->name()->as_C_string();
@@ -1431,7 +1297,7 @@ void ClassLoader::record_hidden_class(InstanceKlass* ik) {
   } else {
     // Generated invoker classes.
     if (classloader_type == ClassLoader::APP_LOADER) {
-      ik->set_shared_classpath_index(ClassLoaderExt::app_class_paths_start_index());
+      ik->set_shared_classpath_index(AOTClassLocationConfig::dumptime()->app_cp_start_index());
     } else {
       ik->set_shared_classpath_index(0);
     }
@@ -1540,34 +1406,6 @@ bool ClassLoader::is_module_observable(const char* module_name) {
   return (*JImageFindResource)(JImage_file, module_name, jimage_version, "module-info.class", &size) != 0;
 }
 
-#if INCLUDE_CDS
-void ClassLoader::initialize_shared_path(JavaThread* current) {
-  if (CDSConfig::is_dumping_archive()) {
-    ClassLoaderExt::setup_search_paths(current);
-  }
-}
-
-void ClassLoader::initialize_module_path(TRAPS) {
-  if (CDSConfig::is_dumping_archive()) {
-    ClassLoaderExt::setup_module_paths(THREAD);
-    FileMapInfo::allocate_shared_path_table(CHECK);
-  }
-}
-
-// Helper function used by CDS code to get the number of module path
-// entries during shared classpath setup time.
-int ClassLoader::num_module_path_entries() {
-  assert(CDSConfig::is_dumping_archive(), "sanity");
-  int num_entries = 0;
-  ClassPathEntry* e= ClassLoader::_module_path_entries;
-  while (e != nullptr) {
-    num_entries ++;
-    e = e->next();
-  }
-  return num_entries;
-}
-#endif
-
 jlong ClassLoader::classloader_time_ms() {
   return UsePerfData ?
     Management::ticks_to_ms(_perf_accumulated_time->get_value()) : -1;
diff --git a/src/hotspot/share/classfile/classLoader.hpp b/src/hotspot/share/classfile/classLoader.hpp
index 8eb6593f07a..7827b6066e5 100644
--- a/src/hotspot/share/classfile/classLoader.hpp
+++ b/src/hotspot/share/classfile/classLoader.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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,10 +58,6 @@ public:
 
   virtual bool is_modules_image() const { return false; }
   virtual bool is_jar_file() const { return false; }
-  virtual bool is_multi_release_jar() const { return false; }
-  virtual void set_multi_release_jar() {}
-  // Is this entry created from the "Class-path" attribute from a JAR Manifest?
-  virtual bool from_class_path_attr() const { return false; }
   virtual const char* name() const = 0;
   virtual JImageFile* jimage() const { return nullptr; }
   virtual void close_jimage() {}
@@ -92,15 +88,10 @@ class ClassPathZipEntry: public ClassPathEntry {
  private:
   jzfile* _zip;              // The zip archive
   const char*   _zip_name;   // Name of zip archive
-  bool _from_class_path_attr; // From the "Class-path" attribute of a jar file
-  bool _multi_release;       // multi-release jar
  public:
   bool is_jar_file() const { return true;  }
-  bool is_multi_release_jar() const { return _multi_release; }
-  void set_multi_release_jar() { _multi_release = true; }
-  bool from_class_path_attr() const { return _from_class_path_attr; }
   const char* name() const { return _zip_name; }
-  ClassPathZipEntry(jzfile* zip, const char* zip_name, bool is_boot_append, bool from_class_path_attr, bool multi_release);
+  ClassPathZipEntry(jzfile* zip, const char* zip_name);
   virtual ~ClassPathZipEntry();
   u1* open_entry(JavaThread* current, const char* name, jint* filesize, bool nul_terminate);
   ClassFileStream* open_stream(JavaThread* current, const char* name);
@@ -226,22 +217,7 @@ class ClassLoader: AllStatic {
   // Last entry in linked list of appended ClassPathEntry instances
   static ClassPathEntry* volatile _last_append_entry;
 
-  // Info used by CDS
-  CDS_ONLY(static ClassPathEntry* _app_classpath_entries;)
-  CDS_ONLY(static ClassPathEntry* _last_app_classpath_entry;)
-  CDS_ONLY(static ClassPathEntry* _module_path_entries;)
-  CDS_ONLY(static ClassPathEntry* _last_module_path_entry;)
-  CDS_ONLY(static void setup_app_search_path(JavaThread* current, const char* class_path);)
-  CDS_ONLY(static void setup_module_search_path(JavaThread* current, const char* path);)
-  static bool add_to_app_classpath_entries(JavaThread* current,
-                                           ClassPathEntry* entry,
-                                           bool check_for_duplicates);
-  CDS_ONLY(static void add_to_module_path_entries(const char* path,
-                                           ClassPathEntry* entry);)
-
  public:
-  CDS_ONLY(static ClassPathEntry* app_classpath_entries() {return _app_classpath_entries;})
-  CDS_ONLY(static ClassPathEntry* module_path_entries() {return _module_path_entries;})
 
   static bool has_bootclasspath_append() { return first_append_entry() != nullptr; }
 
@@ -263,10 +239,7 @@ class ClassLoader: AllStatic {
   static void* zip_library_handle();
   static jzfile* open_zip_file(const char* canonical_path, char** error_msg, JavaThread* thread);
   static ClassPathEntry* create_class_path_entry(JavaThread* current,
-                                                 const char *path, const struct stat* st,
-                                                 bool is_boot_append,
-                                                 bool from_class_path_attr,
-                                                 bool is_multi_release = false);
+                                                 const char *path, const struct stat* st);
 
   // Canonicalizes path names, so strcmp will work properly. This is mainly
   // to avoid confusing the zip library
@@ -276,10 +249,7 @@ class ClassLoader: AllStatic {
   static PackageEntry* get_package_entry(Symbol* pkg_name, ClassLoaderData* loader_data);
   static int crc32(int crc, const char* buf, int len);
   static bool update_class_path_entry_list(JavaThread* current,
-                                           const char *path,
-                                           bool check_for_duplicates,
-                                           bool is_boot_append,
-                                           bool from_class_path_attr);
+                                           const char *path);
   static void print_bootclasspath();
 
   // Timing
@@ -363,8 +333,6 @@ class ClassLoader: AllStatic {
   // Initialization
   static void initialize(TRAPS);
   static void classLoader_init2(JavaThread* current);
-  CDS_ONLY(static void initialize_shared_path(JavaThread* current);)
-  CDS_ONLY(static void initialize_module_path(TRAPS);)
 
   static int compute_Object_vtable();
 
@@ -373,22 +341,6 @@ class ClassLoader: AllStatic {
   static bool is_in_patch_mod_entries(Symbol* module_name);
 
 #if INCLUDE_CDS
-  // Sharing dump and restore
-
-  // Helper function used by CDS code to get the number of boot classpath
-  // entries during shared classpath setup time.
-  static int num_boot_classpath_entries();
-
-  static ClassPathEntry* get_next_boot_classpath_entry(ClassPathEntry* e);
-
-  // Helper function used by CDS code to get the number of app classpath
-  // entries during shared classpath setup time.
-  static int num_app_classpath_entries();
-
-  // Helper function used by CDS code to get the number of module path
-  // entries during shared classpath setup time.
-  static int num_module_path_entries();
-  static void  exit_with_path_failure(const char* error, const char* message);
   static char* uri_to_path(const char* uri);
   static void  record_result(JavaThread* current, InstanceKlass* ik,
                              const ClassFileStream* stream, bool redefined);
@@ -419,7 +371,7 @@ class ClassLoader: AllStatic {
   static void add_to_boot_append_entries(ClassPathEntry* new_entry);
 
   // creates a class path zip entry (returns null if JAR file cannot be opened)
-  static ClassPathZipEntry* create_class_path_zip_entry(const char *apath, bool is_boot_append);
+  static ClassPathZipEntry* create_class_path_zip_entry(const char *path);
 
   static bool string_ends_with(const char* str, const char* str_to_find);
 
diff --git a/src/hotspot/share/classfile/classLoader.inline.hpp b/src/hotspot/share/classfile/classLoader.inline.hpp
index 7f158a4c854..ec3993b089e 100644
--- a/src/hotspot/share/classfile/classLoader.inline.hpp
+++ b/src/hotspot/share/classfile/classLoader.inline.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,7 +27,6 @@
 
 #include "classfile/classLoader.hpp"
 
-#include "cds/cdsConfig.hpp"
 #include "runtime/atomic.hpp"
 
 // Next entry in class path
@@ -58,44 +57,4 @@ inline ClassPathEntry* ClassLoader::classpath_entry(int n) {
   }
 }
 
-#if INCLUDE_CDS
-
-// Helper function used by CDS code to get the number of boot classpath
-// entries during shared classpath setup time.
-
-inline int ClassLoader::num_boot_classpath_entries() {
-  assert(CDSConfig::is_dumping_archive(), "sanity");
-  assert(has_jrt_entry(), "must have a java runtime image");
-  int num_entries = 1; // count the runtime image
-  ClassPathEntry* e = first_append_entry();
-  while (e != nullptr) {
-    num_entries ++;
-    e = e->next();
-  }
-  return num_entries;
-}
-
-inline ClassPathEntry* ClassLoader::get_next_boot_classpath_entry(ClassPathEntry* e) {
-  if (e == ClassLoader::_jrt_entry) {
-    return first_append_entry();
-  } else {
-    return e->next();
-  }
-}
-
-// Helper function used by CDS code to get the number of app classpath
-// entries during shared classpath setup time.
-inline int ClassLoader::num_app_classpath_entries() {
-  assert(CDSConfig::is_dumping_archive(), "sanity");
-  int num_entries = 0;
-  ClassPathEntry* e= ClassLoader::_app_classpath_entries;
-  while (e != nullptr) {
-    num_entries ++;
-    e = e->next();
-  }
-  return num_entries;
-}
-
-#endif // INCLUDE_CDS
-
 #endif // SHARE_CLASSFILE_CLASSLOADER_INLINE_HPP
diff --git a/src/hotspot/share/classfile/classLoaderDataShared.cpp b/src/hotspot/share/classfile/classLoaderDataShared.cpp
index 16a16b3a16f..5cfe2df61b1 100644
--- a/src/hotspot/share/classfile/classLoaderDataShared.cpp
+++ b/src/hotspot/share/classfile/classLoaderDataShared.cpp
@@ -27,10 +27,12 @@
 #include "classfile/classLoaderData.inline.hpp"
 #include "classfile/classLoaderDataShared.hpp"
 #include "classfile/moduleEntry.hpp"
+#include "classfile/modules.hpp"
 #include "classfile/packageEntry.hpp"
 #include "classfile/systemDictionary.hpp"
 #include "logging/log.hpp"
 #include "runtime/handles.inline.hpp"
+#include "runtime/safepoint.hpp"
 
 #if INCLUDE_CDS_JAVA_HEAP
 
@@ -143,6 +145,21 @@ static ClassLoaderData* java_system_loader_data_or_null() {
   return ClassLoaderData::class_loader_data_or_null(SystemDictionary::java_system_loader());
 }
 
+// ModuleEntryTables (even if empty) are required for iterate_symbols() to scan the
+// platform/system loaders inside the CDS safepoint, but the tables can be created only
+// when outside of safepoints. Let's do that now.
+void ClassLoaderDataShared::ensure_module_entry_tables_exist() {
+  assert(!SafepointSynchronize::is_at_safepoint(), "sanity");
+  ensure_module_entry_table_exists(SystemDictionary::java_platform_loader());
+  ensure_module_entry_table_exists(SystemDictionary::java_system_loader());
+}
+
+void ClassLoaderDataShared::ensure_module_entry_table_exists(oop class_loader) {
+  Handle h_loader(JavaThread::current(), class_loader);
+  ModuleEntryTable* met = Modules::get_module_entry_table(h_loader);
+  assert(met != nullptr, "sanity");
+}
+
 void ClassLoaderDataShared::iterate_symbols(MetaspaceClosure* closure) {
   assert(CDSConfig::is_dumping_full_module_graph(), "must be");
   _archived_boot_loader_data.iterate_symbols    (null_class_loader_data(), closure);
diff --git a/src/hotspot/share/classfile/classLoaderDataShared.hpp b/src/hotspot/share/classfile/classLoaderDataShared.hpp
index 957c705afde..b802f751030 100644
--- a/src/hotspot/share/classfile/classLoaderDataShared.hpp
+++ b/src/hotspot/share/classfile/classLoaderDataShared.hpp
@@ -1,5 +1,5 @@
  /*
- * Copyright (c) 2020, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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,9 @@ class SerializeClosure;
 
 class ClassLoaderDataShared : AllStatic {
   static bool _full_module_graph_loaded;
+  static void ensure_module_entry_table_exists(oop class_loader);
 public:
+  static void ensure_module_entry_tables_exist();
   static void allocate_archived_tables();
   static void iterate_symbols(MetaspaceClosure* closure);
   static void init_archived_tables();
diff --git a/src/hotspot/share/classfile/classLoaderExt.cpp b/src/hotspot/share/classfile/classLoaderExt.cpp
index d3d098e9a02..3a6fd0d933c 100644
--- a/src/hotspot/share/classfile/classLoaderExt.cpp
+++ b/src/hotspot/share/classfile/classLoaderExt.cpp
@@ -22,6 +22,7 @@
  *
  */
 
+#include "cds/aotClassLocation.hpp"
 #include "cds/cds_globals.hpp"
 #include "cds/cdsConfig.hpp"
 #include "cds/dynamicArchive.hpp"
@@ -51,14 +52,6 @@
 #include "utilities/checkedCast.hpp"
 #include "utilities/stringUtils.hpp"
 
-jshort ClassLoaderExt::_app_class_paths_start_index = ClassLoaderExt::max_classpath_index;
-jshort ClassLoaderExt::_app_module_paths_start_index = ClassLoaderExt::max_classpath_index;
-jshort ClassLoaderExt::_max_used_path_index = 0;
-int ClassLoaderExt::_num_module_paths = 0;
-bool ClassLoaderExt::_has_app_classes = false;
-bool ClassLoaderExt::_has_platform_classes = false;
-bool ClassLoaderExt::_has_non_jar_in_classpath = false;
-
 void ClassLoaderExt::append_boot_classpath(ClassPathEntry* new_entry) {
   if (CDSConfig::is_using_archive()) {
     warning("Sharing is only supported for boot loader classes because bootstrap classpath has been appended");
@@ -70,245 +63,10 @@ void ClassLoaderExt::append_boot_classpath(ClassPathEntry* new_entry) {
   ClassLoader::add_to_boot_append_entries(new_entry);
 }
 
-void ClassLoaderExt::setup_app_search_path(JavaThread* current) {
-  assert(CDSConfig::is_dumping_archive(), "sanity");
-  int start_index = ClassLoader::num_boot_classpath_entries();
-  _app_class_paths_start_index = checked_cast<jshort>(start_index);
-  char* app_class_path = os::strdup_check_oom(Arguments::get_appclasspath(), mtClass);
-
-  if (strcmp(app_class_path, ".") == 0) {
-    // This doesn't make any sense, even for AppCDS, so let's skip it. We
-    // don't want to throw an error here because -cp "." is usually assigned
-    // by the launcher when classpath is not specified.
-    trace_class_path("app loader class path (skipped)=", app_class_path);
-  } else {
-    trace_class_path("app loader class path=", app_class_path);
-    ClassLoader::setup_app_search_path(current, app_class_path);
-  }
-
-  os::free(app_class_path);
-}
-
 int ClassLoaderExt::compare_module_names(const char** p1, const char** p2) {
   return strcmp(*p1, *p2);
 }
 
-void ClassLoaderExt::process_module_table(JavaThread* current, ModuleEntryTable* met) {
-  ResourceMark rm(current);
-  GrowableArray<const char*>* module_paths = new GrowableArray<const char*>(5);
-
-  class ModulePathsGatherer : public ModuleClosure {
-    JavaThread* _current;
-    GrowableArray<const char*>* _module_paths;
-   public:
-    ModulePathsGatherer(JavaThread* current, GrowableArray<const char*>* module_paths) :
-      _current(current), _module_paths(module_paths) {}
-    void do_module(ModuleEntry* m) {
-      char* uri = m->location()->as_C_string();
-      if (strncmp(uri, "file:", 5) == 0) {
-        char* path = ClassLoader::uri_to_path(uri);
-        extract_jar_files_from_path(path, _module_paths);
-      }
-    }
-  };
-
-  ModulePathsGatherer gatherer(current, module_paths);
-  {
-    MutexLocker ml(Module_lock);
-    met->modules_do(&gatherer);
-  }
-
-  // Sort the module paths before storing into CDS archive for simpler
-  // checking at runtime.
-  module_paths->sort(compare_module_names);
-
-  for (int i = 0; i < module_paths->length(); i++) {
-    ClassLoader::setup_module_search_path(current, module_paths->at(i));
-  }
-}
-
-void ClassLoaderExt::setup_module_paths(JavaThread* current) {
-  assert(CDSConfig::is_dumping_archive(), "sanity");
-  int start_index = ClassLoader::num_boot_classpath_entries() +
-                    ClassLoader::num_app_classpath_entries();
-  _app_module_paths_start_index = checked_cast<jshort>(start_index);
-  Handle system_class_loader (current, SystemDictionary::java_system_loader());
-  ModuleEntryTable* met = Modules::get_module_entry_table(system_class_loader);
-  process_module_table(current, met);
-}
-
-bool ClassLoaderExt::has_jar_suffix(const char* filename) {
-  // In jdk.internal.module.ModulePath.readModule(), it checks for the ".jar" suffix.
-  // Performing the same check here.
-  const char* dot = strrchr(filename, '.');
-  if (dot != nullptr && strcmp(dot + 1, "jar") == 0) {
-    return true;
-  }
-  return false;
-}
-
-void ClassLoaderExt::extract_jar_files_from_path(const char* path, GrowableArray<const char*>* module_paths) {
-  DIR* dirp = os::opendir(path);
-  if (dirp == nullptr && errno == ENOTDIR && has_jar_suffix(path)) {
-    module_paths->append(path);
-  } else {
-    if (dirp != nullptr) {
-      struct dirent* dentry;
-      while ((dentry = os::readdir(dirp)) != nullptr) {
-        const char* file_name = dentry->d_name;
-        if (has_jar_suffix(file_name)) {
-          size_t full_name_len = strlen(path) + strlen(file_name) + strlen(os::file_separator()) + 1;
-          char* full_name = NEW_RESOURCE_ARRAY(char, full_name_len);
-          int n = os::snprintf(full_name, full_name_len, "%s%s%s", path, os::file_separator(), file_name);
-          assert((size_t)n == full_name_len - 1, "Unexpected number of characters in string");
-          module_paths->append(full_name);
-        }
-      }
-      os::closedir(dirp);
-    }
-  }
-}
-
-char* ClassLoaderExt::read_manifest(JavaThread* current, ClassPathEntry* entry,
-                                    jint *manifest_size, bool clean_text) {
-  const char* name = "META-INF/MANIFEST.MF";
-  char* manifest;
-  jint size;
-
-  assert(entry->is_jar_file(), "must be");
-  manifest = (char*) ((ClassPathZipEntry*)entry )->open_entry(current, name, &size, true);
-
-  if (manifest == nullptr) { // No Manifest
-    *manifest_size = 0;
-    return nullptr;
-  }
-
-
-  if (clean_text) {
-    // See http://docs.oracle.com/javase/6/docs/technotes/guides/jar/jar.html#JAR%20Manifest
-    // (1): replace all CR/LF and CR with LF
-    StringUtils::replace_no_expand(manifest, "\r\n", "\n");
-
-    // (2) remove all new-line continuation (remove all "\n " substrings)
-    StringUtils::replace_no_expand(manifest, "\n ", "");
-  }
-
-  *manifest_size = (jint)strlen(manifest);
-  return manifest;
-}
-
-char* ClassLoaderExt::get_class_path_attr(const char* jar_path, char* manifest, jint manifest_size) {
-  const char* tag = "Class-Path: ";
-  const int tag_len = (int)strlen(tag);
-  char* found = nullptr;
-  char* line_start = manifest;
-  char* end = manifest + manifest_size;
-
-  assert(*end == 0, "must be nul-terminated");
-
-  while (line_start < end) {
-    char* line_end = strchr(line_start, '\n');
-    if (line_end == nullptr) {
-      // JAR spec require the manifest file to be terminated by a new line.
-      break;
-    }
-    if (strncmp(tag, line_start, tag_len) == 0) {
-      if (found != nullptr) {
-        // Same behavior as jdk/src/share/classes/java/util/jar/Attributes.java
-        // If duplicated entries are found, the last one is used.
-        log_warning(cds)("Warning: Duplicate name in Manifest: %s.\n"
-                      "Ensure that the manifest does not have duplicate entries, and\n"
-                      "that blank lines separate individual sections in both your\n"
-                      "manifest and in the META-INF/MANIFEST.MF entry in the jar file:\n%s\n", tag, jar_path);
-      }
-      found = line_start + tag_len;
-      assert(found <= line_end, "sanity");
-      *line_end = '\0';
-    }
-    line_start = line_end + 1;
-  }
-  return found;
-}
-
-void ClassLoaderExt::process_jar_manifest(JavaThread* current, ClassPathEntry* entry) {
-  ResourceMark rm(current);
-  jint manifest_size;
-  char* manifest = read_manifest(current, entry, &manifest_size);
-
-  if (manifest == nullptr) {
-    return;
-  }
-
-  if (strstr(manifest, "Extension-List:") != nullptr) {
-    vm_exit_during_cds_dumping(err_msg("-Xshare:dump does not support Extension-List in JAR manifest: %s", entry->name()));
-  }
-
-  if (strstr(manifest, "Multi-Release: true") != nullptr) {
-    entry->set_multi_release_jar();
-  }
-
-  char* cp_attr = get_class_path_attr(entry->name(), manifest, manifest_size);
-
-  if (cp_attr != nullptr && strlen(cp_attr) > 0) {
-    trace_class_path("found Class-Path: ", cp_attr);
-
-    char sep = os::file_separator()[0];
-    const char* dir_name = entry->name();
-    const char* dir_tail = strrchr(dir_name, sep);
-#ifdef _WINDOWS
-    // On Windows, we also support forward slash as the file separator when locating entries in the classpath entry.
-    const char* dir_tail2 = strrchr(dir_name, '/');
-    if (dir_tail == nullptr) {
-      dir_tail = dir_tail2;
-    } else if (dir_tail2 != nullptr && dir_tail2 > dir_tail) {
-      dir_tail = dir_tail2;
-    }
-#endif
-    int dir_len;
-    if (dir_tail == nullptr) {
-      dir_len = 0;
-    } else {
-      dir_len = pointer_delta_as_int(dir_tail, dir_name) + 1;
-    }
-
-    // Split the cp_attr by spaces, and add each file
-    char* file_start = cp_attr;
-    char* end = file_start + strlen(file_start);
-
-    while (file_start < end) {
-      char* file_end = strchr(file_start, ' ');
-      if (file_end != nullptr) {
-        *file_end = 0;
-        file_end += 1;
-      } else {
-        file_end = end;
-      }
-
-      size_t name_len = strlen(file_start);
-      if (name_len > 0) {
-        ResourceMark rm(current);
-        size_t libname_len = dir_len + name_len;
-        char* libname = NEW_RESOURCE_ARRAY(char, libname_len + 1);
-        int n = os::snprintf(libname, libname_len + 1, "%.*s%s", dir_len, dir_name, file_start);
-        assert((size_t)n == libname_len, "Unexpected number of characters in string");
-        if (ClassLoader::update_class_path_entry_list(current, libname, true, false, true /* from_class_path_attr */)) {
-          trace_class_path("library = ", libname);
-        } else {
-          trace_class_path("library (non-existent) = ", libname);
-          FileMapInfo::record_non_existent_class_path_entry(libname);
-        }
-      }
-
-      file_start = file_end;
-    }
-  }
-  return;
-}
-
-void ClassLoaderExt::setup_search_paths(JavaThread* current) {
-  ClassLoaderExt::setup_app_search_path(current);
-}
-
 void ClassLoaderExt::record_result(const s2 classpath_index, InstanceKlass* result, bool redefined) {
   assert(CDSConfig::is_dumping_archive(), "sanity");
 
@@ -317,14 +75,12 @@ void ClassLoaderExt::record_result(const s2 classpath_index, InstanceKlass* resu
   s2 classloader_type = ClassLoader::BOOT_LOADER;
   if (SystemDictionary::is_system_class_loader(loader)) {
     classloader_type = ClassLoader::APP_LOADER;
-    ClassLoaderExt::set_has_app_classes();
+    AOTClassLocationConfig::dumptime_set_has_app_classes();
   } else if (SystemDictionary::is_platform_class_loader(loader)) {
     classloader_type = ClassLoader::PLATFORM_LOADER;
-    ClassLoaderExt::set_has_platform_classes();
-  }
-  if (classpath_index > ClassLoaderExt::max_used_path_index()) {
-    ClassLoaderExt::set_max_used_path_index(classpath_index);
+    AOTClassLocationConfig::dumptime_set_has_platform_classes();
   }
+  AOTClassLocationConfig::dumptime_update_max_used_index(classpath_index);
   result->set_shared_classpath_index(classpath_index);
   result->set_shared_class_loader_type(classloader_type);
 #if INCLUDE_CDS_JAVA_HEAP
@@ -334,7 +90,7 @@ void ClassLoaderExt::record_result(const s2 classpath_index, InstanceKlass* resu
     // loaders are always loaded from known locations (jimage, classpath or modulepath),
     // so classpath_index should always be >= 0.
     // The only exception is when a java agent is used during dump time (for testing
-    // purposes only). If a class is transformed by the agent, the CodeSource of
+    // purposes only). If a class is transformed by the agent, the AOTClassLocation of
     // this class may point to an unknown location. This may break heap object archiving,
     // which requires all the boot classes to be from known locations. This is an
     // uncommon scenario (even in test cases). Let's simply disable heap object archiving.
diff --git a/src/hotspot/share/classfile/classLoaderExt.hpp b/src/hotspot/share/classfile/classLoaderExt.hpp
index ce0013b9d49..86bd5cce7ba 100644
--- a/src/hotspot/share/classfile/classLoaderExt.hpp
+++ b/src/hotspot/share/classfile/classLoaderExt.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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,99 +34,13 @@ class ClassListParser;
 class ClassLoaderExt: public ClassLoader { // AllStatic
 public:
 #if INCLUDE_CDS
-private:
-  enum SomeConstants {
-    max_classpath_index = 0x7fff
-  };
-
-  static char* get_class_path_attr(const char* jar_path, char* manifest, jint manifest_size);
-  static void setup_app_search_path(JavaThread* current); // Only when -Xshare:dump
-  static void process_module_table(JavaThread* current, ModuleEntryTable* met);
-  // index of first app JAR in shared classpath entry table
-  static jshort _app_class_paths_start_index;
-  // index of first modular JAR in shared modulepath entry table
-  static jshort _app_module_paths_start_index;
-  // the largest path index being used during CDS dump time
-  static jshort _max_used_path_index;
-  // number of module paths
-  static int _num_module_paths;
-
-  static bool _has_app_classes;
-  static bool _has_platform_classes;
-  static bool _has_non_jar_in_classpath;
-
-  static char* read_manifest(JavaThread* current, ClassPathEntry* entry, jint *manifest_size, bool clean_text);
-  static bool has_jar_suffix(const char* filename);
-
 public:
-  static void process_jar_manifest(JavaThread* current, ClassPathEntry* entry);
-
   // Called by JVMTI code to add boot classpath
+
   static void append_boot_classpath(ClassPathEntry* new_entry);
 
-  static void setup_search_paths(JavaThread* current);
-  static void setup_module_paths(JavaThread* current);
-  static void extract_jar_files_from_path(const char* path, GrowableArray<const char*>* module_paths);
   static int compare_module_names(const char** p1, const char** p2);
-
-  static char* read_manifest(JavaThread* current, ClassPathEntry* entry, jint *manifest_size) {
-    // Remove all the new-line continuations (which wrap long lines at 72 characters, see
-    // http://docs.oracle.com/javase/6/docs/technotes/guides/jar/jar.html#JAR%20Manifest), so
-    // that the manifest is easier to parse.
-    return read_manifest(current, entry, manifest_size, true);
-  }
-  static char* read_raw_manifest(JavaThread* current, ClassPathEntry* entry, jint *manifest_size) {
-    // Do not remove new-line continuations, so we can easily pass it as an argument to
-    // java.util.jar.Manifest.getManifest() at run-time.
-    return read_manifest(current, entry, manifest_size, false);
-  }
-
-  static jshort app_class_paths_start_index() { return _app_class_paths_start_index; }
-
-  static jshort app_module_paths_start_index() { return _app_module_paths_start_index; }
-
-  static jshort max_used_path_index() { return _max_used_path_index; }
-
-  static int num_module_paths() { return _num_module_paths; }
-
-  static void set_max_used_path_index(jshort used_index) {
-    _max_used_path_index = used_index;
-  }
-
-  static void init_paths_start_index(jshort app_start) {
-    _app_class_paths_start_index = app_start;
-  }
-
-  static void init_app_module_paths_start_index(jshort module_start) {
-    _app_module_paths_start_index = module_start;
-  }
-
-  static void init_num_module_paths(int num_module_paths) {
-    _num_module_paths = num_module_paths;
-  }
-
-  static bool is_boot_classpath(int classpath_index) {
-    return classpath_index < _app_class_paths_start_index;
-  }
-
-  static bool has_platform_or_app_classes() {
-    return _has_app_classes || _has_platform_classes;
-  }
-
-  static bool has_non_jar_in_classpath() {
-    return _has_non_jar_in_classpath;
-  }
-
   static void record_result(const s2 classpath_index, InstanceKlass* result, bool redefined);
-  static void set_has_app_classes() {
-    _has_app_classes = true;
-  }
-  static void set_has_platform_classes() {
-    _has_platform_classes = true;
-  }
-  static void set_has_non_jar_in_classpath() {
-    _has_non_jar_in_classpath = true;
-  }
 #endif // INCLUDE_CDS
 };
 
diff --git a/src/hotspot/share/classfile/moduleEntry.cpp b/src/hotspot/share/classfile/moduleEntry.cpp
index a0f9afdc982..55363d7f41f 100644
--- a/src/hotspot/share/classfile/moduleEntry.cpp
+++ b/src/hotspot/share/classfile/moduleEntry.cpp
@@ -22,10 +22,10 @@
  *
  */
 
+#include "cds/aotClassLocation.hpp"
 #include "cds/archiveBuilder.hpp"
 #include "cds/archiveUtils.hpp"
 #include "cds/cdsConfig.hpp"
-#include "cds/filemap.hpp"
 #include "cds/heapShared.hpp"
 #include "classfile/classLoader.hpp"
 #include "classfile/classLoaderData.inline.hpp"
@@ -61,7 +61,7 @@ void ModuleEntry::set_location(Symbol* location) {
   if (location != nullptr) {
     location->increment_refcount();
     CDS_ONLY(if (CDSConfig::is_using_archive()) {
-        _shared_path_index = FileMapInfo::get_module_shared_path_index(location);
+        _shared_path_index = AOTClassLocationConfig::runtime()->get_module_shared_path_index(_location);
       });
   }
 }
@@ -483,7 +483,7 @@ void ModuleEntry::init_as_archived_entry() {
   set_archived_reads(write_growable_array(reads()));
 
   _loader_data = nullptr;  // re-init at runtime
-  _shared_path_index = FileMapInfo::get_module_shared_path_index(_location);
+  _shared_path_index = AOTClassLocationConfig::dumptime()->get_module_shared_path_index(_location);
   if (name() != nullptr) {
     _name = ArchiveBuilder::get_buffered_symbol(_name);
     ArchivePtrMarker::mark_pointer((address*)&_name);
diff --git a/src/hotspot/share/classfile/stringTable.cpp b/src/hotspot/share/classfile/stringTable.cpp
index 1943869dbb1..22ccb4e4b04 100644
--- a/src/hotspot/share/classfile/stringTable.cpp
+++ b/src/hotspot/share/classfile/stringTable.cpp
@@ -26,7 +26,6 @@
 #include "cds/archiveHeapLoader.inline.hpp"
 #include "cds/archiveHeapWriter.hpp"
 #include "cds/cdsConfig.hpp"
-#include "cds/filemap.hpp"
 #include "cds/heapShared.hpp"
 #include "classfile/altHashing.hpp"
 #include "classfile/compactHashtable.hpp"
diff --git a/src/hotspot/share/classfile/systemDictionary.cpp b/src/hotspot/share/classfile/systemDictionary.cpp
index 24273fed12f..68f9556099f 100644
--- a/src/hotspot/share/classfile/systemDictionary.cpp
+++ b/src/hotspot/share/classfile/systemDictionary.cpp
@@ -22,6 +22,7 @@
  *
  */
 
+#include "cds/aotClassLocation.hpp"
 #include "cds/cdsConfig.hpp"
 #include "cds/heapShared.hpp"
 #include "classfile/classFileParser.hpp"
@@ -962,14 +963,14 @@ bool SystemDictionary::is_shared_class_visible_impl(Symbol* class_name,
   int scp_index = ik->shared_classpath_index();
   assert(!ik->is_shared_unregistered_class(), "this function should be called for built-in classes only");
   assert(scp_index >= 0, "must be");
-  SharedClassPathEntry* scp_entry = FileMapInfo::shared_path(scp_index);
+  const AOTClassLocation* cl = AOTClassLocationConfig::runtime()->class_location_at(scp_index);
   if (!Universe::is_module_initialized()) {
-    assert(scp_entry != nullptr, "must be");
+    assert(cl != nullptr, "must be");
     // At this point, no modules have been defined yet. KlassSubGraphInfo::check_allowed_klass()
     // has restricted the classes can be loaded at this step to be only:
-    // [1] scp_entry->is_modules_image(): classes in java.base, or,
+    // [1] cs->is_modules_image(): classes in java.base, or,
     // [2] HeapShared::is_a_test_class_in_unnamed_module(ik): classes in bootstrap/unnamed module
-    assert(scp_entry->is_modules_image() || HeapShared::is_a_test_class_in_unnamed_module(ik),
+    assert(cl->is_modules_image() || HeapShared::is_a_test_class_in_unnamed_module(ik),
            "only these classes can be loaded before the module system is initialized");
     assert(class_loader.is_null(), "sanity");
     return true;
@@ -986,7 +987,7 @@ bool SystemDictionary::is_shared_class_visible_impl(Symbol* class_name,
 
   ModuleEntry* mod_entry = (pkg_entry == nullptr) ? nullptr : pkg_entry->module();
   bool should_be_in_named_module = (mod_entry != nullptr && mod_entry->is_named());
-  bool was_archived_from_named_module = scp_entry->in_named_module();
+  bool was_archived_from_named_module = !cl->has_unnamed_module();
   bool visible;
 
   if (was_archived_from_named_module) {
@@ -1587,6 +1588,9 @@ void SystemDictionary::initialize(TRAPS) {
   PlaceholderTable::initialize();
 #if INCLUDE_CDS
   SystemDictionaryShared::initialize();
+  if (CDSConfig::is_dumping_archive()) {
+    AOTClassLocationConfig::dumptime_init(THREAD);
+  }
 #endif
   // Resolve basic classes
   vmClasses::resolve_all(CHECK);
diff --git a/src/hotspot/share/memory/allocation.hpp b/src/hotspot/share/memory/allocation.hpp
index ae834ec9a72..b67dcd43e4d 100644
--- a/src/hotspot/share/memory/allocation.hpp
+++ b/src/hotspot/share/memory/allocation.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -314,7 +314,6 @@ class MetaspaceObj {
   f(ConstantPoolCache) \
   f(Annotations) \
   f(MethodCounters) \
-  f(SharedClassPathEntry) \
   f(RecordComponent)
 
 #define METASPACE_OBJ_TYPE_DECLARE(name) name ## Type,
diff --git a/src/hotspot/share/oops/klass.hpp b/src/hotspot/share/oops/klass.hpp
index 9ea021713fc..e7631f9dfe3 100644
--- a/src/hotspot/share/oops/klass.hpp
+++ b/src/hotspot/share/oops/klass.hpp
@@ -166,9 +166,9 @@ class Klass : public Metadata {
   uint8_t  _hash_slot;
 
 private:
-  // This is an index into FileMapHeader::_shared_path_table[], to
-  // associate this class with the JAR file where it's loaded from during
-  // dump time. If a class is not loaded from the shared archive, this field is
+  // This is an index into AOTClassLocationConfig::class_locations(), to
+  // indicate the AOTClassLocation where this class is loaded from during
+  // dump time. If a class is not loaded from the AOT cache, this field is
   // -1.
   s2 _shared_class_path_index;
 
diff --git a/src/hotspot/share/prims/jvmtiEnv.cpp b/src/hotspot/share/prims/jvmtiEnv.cpp
index 98b1b796813..aedd56817bf 100644
--- a/src/hotspot/share/prims/jvmtiEnv.cpp
+++ b/src/hotspot/share/prims/jvmtiEnv.cpp
@@ -667,7 +667,7 @@ JvmtiEnv::AddToBootstrapClassLoaderSearch(const char* segment) {
     // terminating the VM so we check one more time.
 
     // create the zip entry
-    ClassPathZipEntry* zip_entry = ClassLoader::create_class_path_zip_entry(segment, true);
+    ClassPathZipEntry* zip_entry = ClassLoader::create_class_path_zip_entry(segment);
     if (zip_entry == nullptr) {
       return JVMTI_ERROR_ILLEGAL_ARGUMENT;
     }
@@ -709,7 +709,7 @@ JvmtiEnv::AddToSystemClassLoaderSearch(const char* segment) {
 
     // create the zip entry (which will open the zip file and hence
     // check that the segment is indeed a zip file).
-    ClassPathZipEntry* zip_entry = ClassLoader::create_class_path_zip_entry(segment, false);
+    ClassPathZipEntry* zip_entry = ClassLoader::create_class_path_zip_entry(segment);
     if (zip_entry == nullptr) {
       return JVMTI_ERROR_ILLEGAL_ARGUMENT;
     }
diff --git a/src/hotspot/share/runtime/arguments.cpp b/src/hotspot/share/runtime/arguments.cpp
index b3f70592f6f..420d6ab39d9 100644
--- a/src/hotspot/share/runtime/arguments.cpp
+++ b/src/hotspot/share/runtime/arguments.cpp
@@ -24,7 +24,6 @@
 
 #include "cds/cds_globals.hpp"
 #include "cds/cdsConfig.hpp"
-#include "cds/filemap.hpp"
 #include "classfile/classLoader.hpp"
 #include "classfile/javaAssertions.hpp"
 #include "classfile/moduleEntry.hpp"
diff --git a/src/hotspot/share/runtime/threads.cpp b/src/hotspot/share/runtime/threads.cpp
index 4a0e859a692..006f1be112a 100644
--- a/src/hotspot/share/runtime/threads.cpp
+++ b/src/hotspot/share/runtime/threads.cpp
@@ -799,15 +799,6 @@ jint Threads::create_vm(JavaVMInitArgs* args, bool* canTryAgain) {
     initialize_class(vmSymbols::jdk_internal_vm_Continuation(), CHECK_JNI_ERR);
   }
 
-#if INCLUDE_CDS
-  // capture the module path info from the ModuleEntryTable
-  ClassLoader::initialize_module_path(THREAD);
-  if (HAS_PENDING_EXCEPTION) {
-    java_lang_Throwable::print(PENDING_EXCEPTION, tty);
-    vm_exit_during_initialization("ClassLoader::initialize_module_path() failed unexpectedly");
-  }
-#endif
-
   if (NativeHeapTrimmer::enabled()) {
     NativeHeapTrimmer::initialize();
   }
diff --git a/test/hotspot/jtreg/runtime/cds/appcds/BootClassPathMismatch.java b/test/hotspot/jtreg/runtime/cds/appcds/BootClassPathMismatch.java
index 5190f1f72e4..798275be4e7 100644
--- a/test/hotspot/jtreg/runtime/cds/appcds/BootClassPathMismatch.java
+++ b/test/hotspot/jtreg/runtime/cds/appcds/BootClassPathMismatch.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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,6 +60,11 @@ public class BootClassPathMismatch {
             // this test is not applicable to dynamic archive since
             // there is no class to be archived in the top archive
             test.testBootClassPathMatchWithAppend();
+
+            // this test is not applicable to dynamic archive since
+            // there is no class path (-cp) specified at dyanmic archive
+            // creation.
+            test.testBootClassPathAppend();
         }
         test.testBootClassPathMatch();
         test.testBootClassPathMismatchTwoJars();
@@ -235,6 +240,22 @@ public class BootClassPathMismatch {
             .assertAbnormalExit(mismatchMessage);
     }
 
+    /* Archive contains Hello class with only hello.jar in bootclasspath at dump time.
+     *
+     * No error - bootclasspath can be appended during runtime if no -cp is specified.
+     */
+    public void testBootClassPathAppend() throws Exception {
+        String appJar = JarBuilder.getOrCreateHelloJar();
+        String jar2 = ClassFileInstaller.writeJar("jar2.jar", "pkg/C2");
+        String jars = appJar + File.pathSeparator + jar2;
+        String appClasses[] = {"Hello", "pkg/C2"};
+        TestCommon.dump(
+            null, appClasses, "-Xbootclasspath/a:" + appJar);
+        TestCommon.run(
+                "-Xbootclasspath/a:" + jars, "Hello")
+            .assertNormalExit();
+    }
+
     private static void copyHelloToNewDir() throws Exception {
         String classDir = CDSTestUtils.getOutputDir();
         String dstDir = classDir + File.separator + "newdir";
diff --git a/test/hotspot/jtreg/runtime/cds/appcds/ClassPathAttr.java b/test/hotspot/jtreg/runtime/cds/appcds/ClassPathAttr.java
index df47e6bebc8..569ba8d20f7 100644
--- a/test/hotspot/jtreg/runtime/cds/appcds/ClassPathAttr.java
+++ b/test/hotspot/jtreg/runtime/cds/appcds/ClassPathAttr.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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,19 +71,13 @@ public class ClassPathAttr {
 
       TestCommon.testDump(cp, classlist);
 
-      TestCommon.run(
-          "-cp", cp,
-          "CpAttr1")
-        .assertNormalExit();
-
-      // Logging test for class+path.
       TestCommon.run(
           "-Xlog:class+path",
           "-cp", cp,
           "CpAttr1")
         .assertNormalExit(output -> {
-            output.shouldMatch("checking shared classpath entry: .*cpattr2.jar");
-            output.shouldMatch("checking shared classpath entry: .*cpattr3.jar");
+            output.shouldMatch("Checking .*cpattr2.jar.*from JAR manifest ClassPath attribute");
+            output.shouldMatch("Checking .*cpattr3.jar.*from JAR manifest ClassPath attribute");
           });
 
       // Test handling of forward slash ('/') file separator when locating entries
@@ -117,8 +111,8 @@ public class ClassPathAttr {
               "-cp", newCp,
               "CpAttr1")
             .assertNormalExit(output -> {
-                output.shouldMatch("checking shared classpath entry: .*cpattr2.jar");
-                output.shouldMatch("checking shared classpath entry: .*cpattr3.jar");
+                output.shouldMatch("Checking .*cpattr2.jar.*from JAR manifest ClassPath attribute");
+                output.shouldMatch("Checking .*cpattr3.jar.*from JAR manifest ClassPath attribute");
               });
 
           // Go one directory up.
@@ -150,8 +144,8 @@ public class ClassPathAttr {
                   "-cp", newCp,
                   "CpAttr1")
                 .assertNormalExit(output -> {
-                    output.shouldMatch("checking shared classpath entry: .*cpattr2.jar");
-                    output.shouldMatch("checking shared classpath entry: .*cpattr3.jar");
+                    output.shouldMatch("Checking .*cpattr2.jar.*from JAR manifest ClassPath attribute");
+                    output.shouldMatch("Checking .*cpattr3.jar.*from JAR manifest ClassPath attribute");
                   });
           }
       }
@@ -163,6 +157,7 @@ public class ClassPathAttr {
     TestCommon.testDump(cp, classlist);
 
     TestCommon.run(
+        "-Xlog:class+path",
         "-cp", cp,
         "CpAttr1")
       .assertNormalExit();
@@ -183,7 +178,7 @@ public class ClassPathAttr {
         "-cp", cp,
         "CpAttr6")
       .assertNormalExit(output -> {
-          output.shouldMatch("should be non-existent: .*cpattrX.jar");
+          output.shouldMatch("Checking .*cpattrX.jar.* not-exist");
         });
 
     // Now make nonExistPath exist. CDS still loads, but archived non-system classes will not be used.
@@ -198,11 +193,10 @@ public class ClassPathAttr {
         result.assertAbnormalExit(output -> {
                 output.shouldMatch("CDS archive has aot-linked classes. It cannot be used because the file .*cpattrX.jar exists");
             });
-
     } else {
-        result.assertNormalExit(output -> {
-                output.shouldMatch("Archived non-system classes are disabled because the file .*cpattrX.jar exists");
-            });
+        result.assertAbnormalExit(output -> {
+                output.shouldMatch("cpattrX.jar.* must not exist");
+        });
     }
   }
 
@@ -233,8 +227,8 @@ public class ClassPathAttr {
                    "-cp", cp,
                    "Hello")
               .assertAbnormalExit(output -> {
-                  output.shouldMatch(".*APP classpath mismatch, actual: -Djava.class.path=.*cpattr1.jar.*cpattr2.jar.*hello.jar")
-              .shouldContain("Unable to use shared archive.");
+                  output.shouldMatch("app classpath .* does not match: expected .*hello.jar.* got .*cpattr2.jar")
+                        .shouldContain("Unable to use shared archive.");
                 });
 
     // Run with different -cp cpattr2.jar:hello.jar. App classpath mismatch should be detected.
@@ -243,8 +237,8 @@ public class ClassPathAttr {
                    "-cp", cp,
                    "Hello")
               .assertAbnormalExit(output -> {
-                  output.shouldMatch(".*APP classpath mismatch, actual: -Djava.class.path=.*cpattr2.jar.*hello.jar")
-              .shouldContain("Unable to use shared archive.");
+                  output.shouldMatch("app classpath .* does not match: expected .*cpattr1.jar.* got .*cpattr2.jar")
+                        .shouldContain("Unable to use shared archive.");
                 });
 
     // Dumping with -cp cpattr1.jar:cpattr2.jar:hello.jar
diff --git a/test/hotspot/jtreg/runtime/cds/appcds/CommonAppClasspath.java b/test/hotspot/jtreg/runtime/cds/appcds/CommonAppClasspath.java
index 9dff6f3a2af..18045994ea8 100644
--- a/test/hotspot/jtreg/runtime/cds/appcds/CommonAppClasspath.java
+++ b/test/hotspot/jtreg/runtime/cds/appcds/CommonAppClasspath.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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 @@ import jdk.test.lib.cds.CDSTestUtils;
 public class CommonAppClasspath {
 
     private static final Path USER_DIR = Paths.get(CDSTestUtils.getOutputDir());
-    private static final String failedMessage = "APP classpath mismatch";
+    private static final String failedMessage = "Archived app classpath validation: failed";
     private static final String successMessage1 = "Hello source: shared objects file";
     private static final String successMessage2 = "HelloMore source: shared objects file";
 
diff --git a/test/hotspot/jtreg/runtime/cds/appcds/NonExistClasspath.java b/test/hotspot/jtreg/runtime/cds/appcds/NonExistClasspath.java
index 7f2af4bdcab..38717310aac 100644
--- a/test/hotspot/jtreg/runtime/cds/appcds/NonExistClasspath.java
+++ b/test/hotspot/jtreg/runtime/cds/appcds/NonExistClasspath.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -54,7 +54,7 @@ public class NonExistClasspath {
     }
 
     static void doTest(String appJar, boolean bootcp) throws Exception {
-        final String errorMessage3 = (bootcp ? "BOOT" : "APP") + " classpath mismatch";
+        final String errorMessage3 = (bootcp ? "boot" : "app") + " classpath validation: failed";
         (new File(nonExistPath)).delete();
 
         String classPath = nonExistPath + File.pathSeparator + appJar;
diff --git a/test/hotspot/jtreg/runtime/cds/appcds/PrintSharedArchiveAndExit.java b/test/hotspot/jtreg/runtime/cds/appcds/PrintSharedArchiveAndExit.java
index 6794b3987b6..c0dce14ab82 100644
--- a/test/hotspot/jtreg/runtime/cds/appcds/PrintSharedArchiveAndExit.java
+++ b/test/hotspot/jtreg/runtime/cds/appcds/PrintSharedArchiveAndExit.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -58,9 +58,10 @@ public class PrintSharedArchiveAndExit {
   public static void main(String[] args) throws Exception {
     String appJar = JarBuilder.getOrCreateHelloJar();
     String appJar2 = JarBuilder.build("PrintSharedArchiveAndExit-more", "HelloMore");
-
     String cp = appJar + File.pathSeparator + appJar2;
-    String lastCheckMsg = "checking shared classpath entry: " + appJar2; // the last JAR to check
+    String firstCheckShortMsg = "Checking 'hello.jar' file"; // the first JAR to check (without directory prefix)
+    String firstCheckMsg = "Checking '" + appJar + "' file"; // the first JAR to check
+    String lastCheckMsg = "Checking '" + appJar2 + "' file"; // the last JAR to check
 
     TestCommon.testDump(cp, TestCommon.list("Hello", "HelloMore"));
 
@@ -99,7 +100,7 @@ public class PrintSharedArchiveAndExit {
     TestCommon.run(
         "-cp", ".",
         "-XX:+PrintSharedArchiveAndExit")
-      .ifNoMappingFailure(output -> check(output, 1, true, lastCheckMsg, "Run time APP classpath is shorter than the one at dump time: ."));
+      .ifNoMappingFailure(output -> check(output, 1, true, firstCheckShortMsg, "app classpath has fewer elements than expected"));
 
     log("Use an invalid App CP -- all the JAR paths should be checked.\n" +
         "Non-existing jar files will be ignored.");
@@ -107,28 +108,27 @@ public class PrintSharedArchiveAndExit {
     TestCommon.run(
         "-cp", invalidCP,
         "-XX:+PrintSharedArchiveAndExit")
-      .ifNoMappingFailure(output -> check(output, 0, true, lastCheckMsg));
+      .ifNoMappingFailure(output -> check(output, 0, true, firstCheckShortMsg));
 
     log("Changed modification time of hello.jar -- all the JAR paths should be checked");
     (new File(appJar)).setLastModified(System.currentTimeMillis() + 2000);
     TestCommon.run(
         "-cp", cp,
         "-XX:+PrintSharedArchiveAndExit")
-      .ifNoMappingFailure(output -> check(output, 1, true, lastCheckMsg, "Timestamp mismatch"));
+      .ifNoMappingFailure(output -> check(output, 1, true, firstCheckMsg, "timestamp has changed"));
 
     log("Even if hello.jar is out of date, we should still be able to print the dictionary.");
     TestCommon.run(
         "-cp", cp,
         "-XX:+PrintSharedArchiveAndExit")
-      .ifNoMappingFailure(output -> check(output, 1, true, lastCheckMsg, "java.lang.Object"));
-
+      .ifNoMappingFailure(output -> check(output, 1, true, firstCheckMsg, "java.lang.Object"));
 
     log("Remove hello.jar -- all the JAR paths should be checked");
     (new File(appJar)).delete();
     TestCommon.run(
         "-cp", cp,
         "-XX:+PrintSharedArchiveAndExit")
-      .ifNoMappingFailure(output -> check(output, 1, true, lastCheckMsg, "Required classpath entry does not exist: " + appJar));
+      .ifNoMappingFailure(output -> check(output, 1, true, firstCheckMsg, "Required classpath entry does not exist: " + appJar));
 
     log("Execution with major errors -- with 'major' errors like the JSA file\n" +
         "is missing, we should stop immediately to avoid crashing the JVM.");
diff --git a/test/hotspot/jtreg/runtime/cds/appcds/SharedArchiveConsistency.java b/test/hotspot/jtreg/runtime/cds/appcds/SharedArchiveConsistency.java
index 2aa4bafdf12..090df514966 100644
--- a/test/hotspot/jtreg/runtime/cds/appcds/SharedArchiveConsistency.java
+++ b/test/hotspot/jtreg/runtime/cds/appcds/SharedArchiveConsistency.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -268,15 +268,5 @@ public class SharedArchiveConsistency {
         baseArchiveNameOffset = CDSArchiveUtils.baseArchiveNameOffset(copiedJsa);
         System.out.println("new baseArchiveNameOffset = " + baseArchiveNameOffset);
         testAndCheck(verifyExecArgs);
-
-        // modify _common_app_classpath_size
-        String wrongCommonAppClasspathOffset = startNewArchive("wrongCommonAppClasspathOffset");
-        copiedJsa = CDSArchiveUtils.copyArchiveFile(orgJsaFile, wrongCommonAppClasspathOffset);
-        int commonAppClasspathPrefixSize = CDSArchiveUtils.commonAppClasspathPrefixSize(copiedJsa);
-        System.out.println("    commonAppClasspathPrefixSize = " + commonAppClasspathPrefixSize);
-        CDSArchiveUtils.writeData(copiedJsa, CDSArchiveUtils.offsetCommonAppClasspathPrefixSize(), commonAppClasspathPrefixSize * 2);
-        commonAppClasspathPrefixSize = CDSArchiveUtils.commonAppClasspathPrefixSize(copiedJsa);
-        System.out.println("new commonAppClasspathPrefixSize = " + commonAppClasspathPrefixSize);
-        testAndCheck(verifyExecArgs);
     }
 }
diff --git a/test/hotspot/jtreg/runtime/cds/appcds/TraceLongClasspath.java b/test/hotspot/jtreg/runtime/cds/appcds/TraceLongClasspath.java
index 55d036fec42..c79aca564b5 100644
--- a/test/hotspot/jtreg/runtime/cds/appcds/TraceLongClasspath.java
+++ b/test/hotspot/jtreg/runtime/cds/appcds/TraceLongClasspath.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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,12 @@ public class TraceLongClasspath {
         // Dump an archive with a specified JAR file in -classpath
         TestCommon.testDump(dumpCP, TestCommon.list("Hello"));
 
-        // Then try to execute the archive with a different classpath and with -Xlog:class+path.
-        // The diagnostic "expecting" app classpath trace should show the entire classpath (excluding any non-existent dump-time paths).
-        String recordedCP = dummyJar + ps + appJar;
+        TestCommon.run(
+            "-Xlog:class+path", "-Xlog:cds",
+            "-cp", dumpCP,
+            "Hello")
+            .assertNormalExit();
+
         TestCommon.run(
             "-Xlog:class+path", "-Xlog:cds",
             "-cp", appJar,
@@ -98,9 +101,6 @@ public class TraceLongClasspath {
             .assertAbnormalExit(output -> {
                 output.shouldContain("Unable to use shared archive");
                 output.shouldContain("shared class paths mismatch");
-                // the "expecting" app classpath from -Xlog:class+path should not
-                // be truncated
-                output.shouldContain(recordedCP);
               });
     }
 }
diff --git a/test/hotspot/jtreg/runtime/cds/appcds/WrongClasspath.java b/test/hotspot/jtreg/runtime/cds/appcds/WrongClasspath.java
index 9fb88e0b00c..f9594b9d64d 100644
--- a/test/hotspot/jtreg/runtime/cds/appcds/WrongClasspath.java
+++ b/test/hotspot/jtreg/runtime/cds/appcds/WrongClasspath.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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,6 +109,6 @@ public class WrongClasspath {
     output = TestCommon.execAuto(
         "-cp", jars, "Hello");
     output.shouldMatch("This file is not the one used while building the shared archive file:.*jar2.jar")
-          .shouldMatch(".warning..cds.*jar2.jar timestamp has changed.");
+          .shouldMatch(".warning..cds.*jar2.jar.*timestamp has changed");
   }
 }
diff --git a/test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/ArchiveConsistency.java b/test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/ArchiveConsistency.java
index 00bd63fa3d4..ea95a2c8711 100644
--- a/test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/ArchiveConsistency.java
+++ b/test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/ArchiveConsistency.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -150,22 +150,6 @@ public class ArchiveConsistency extends DynamicArchiveTestBase {
                appJar, mainClass, isAuto ? 0 : 1,
                "Base archive name is damaged");
 
-        startTest("5a. Modify common app classpath size");
-        String wrongCommonAppClasspathOffset = getNewArchiveName("wrongCommonAppClasspathOffset");
-        copiedJsa = CDSArchiveUtils.copyArchiveFile(jsa, wrongCommonAppClasspathOffset);
-        int commonAppClasspathPrefixSize = CDSArchiveUtils.commonAppClasspathPrefixSize(copiedJsa);
-        CDSArchiveUtils.writeData(copiedJsa, CDSArchiveUtils.offsetCommonAppClasspathPrefixSize(), -1);
-        runTwo(baseArchiveName, wrongCommonAppClasspathOffset,
-               appJar, mainClass, isAuto ? 0 : 1,
-               "common app classpath prefix len < 0");
-
-        startTest("5b. Modify common app classpath size, run with -XX:-VerifySharedSpaces");
-        VERIFY_CRC = true;
-        runTwo(baseArchiveName, modTop,
-               appJar, mainClass, isAuto ? 0 : 1,
-               "Header checksum verification failed");
-        VERIFY_CRC = false;
-
         startTest("6. Make base archive name not terminated with '\0'");
         String wrongBaseName = getNewArchiveName("wrongBaseName");
         copiedJsa = CDSArchiveUtils.copyArchiveFile(jsa, wrongBaseName);
diff --git a/test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/WrongTopClasspath.java b/test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/WrongTopClasspath.java
index 54c5e66ab18..af8f3acb5e9 100644
--- a/test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/WrongTopClasspath.java
+++ b/test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/WrongTopClasspath.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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,6 +112,6 @@ public class WrongTopClasspath extends DynamicArchiveTestBase {
           .assertNormalExit(output -> {
               output.shouldContain(topArchiveMsg);
               output.shouldMatch("This file is not the one used while building the shared archive file:.*GenericTestApp.jar");
-              output.shouldMatch(".warning..cds.*GenericTestApp.jar timestamp has changed.");});
+              output.shouldMatch(".warning..cds.*GenericTestApp.jar.*timestamp has changed");});
     }
 }
diff --git a/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/modulepath/ModulePathAndFMG.java b/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/modulepath/ModulePathAndFMG.java
index fe777142046..e5ead078696 100644
--- a/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/modulepath/ModulePathAndFMG.java
+++ b/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/modulepath/ModulePathAndFMG.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2024, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -226,29 +226,30 @@ public class ModulePathAndFMG {
                                         "-m", MAIN_MODULE);
         TestCommon.checkDump(output);
 
-        tty("5. run with CDS on, without the extra module specified in dump time, should pass");
+        tty("5. run with CDS on, without the extra module specified in dump time, should fail");
         TestCommon.runWithModules(prefix,
                                  null,               // --upgrade-module-path
                                  libsDir.toString(), // --module-path
                                  MAIN_MODULE)        // -m
             .assertNormalExit(out -> {
-                out.shouldNotContain(OPTIMIZE_DISABLED)
-                   .shouldContain(OPTIMIZE_ENABLED)
-                   .shouldNotContain(FMG_DISABLED)
-                   .shouldContain(FMG_ENABLED)
+                out.shouldContain(OPTIMIZE_DISABLED)
+                   .shouldNotContain(OPTIMIZE_ENABLED)
+                   .shouldContain(FMG_DISABLED)
+                   .shouldNotContain(FMG_ENABLED)
                    .shouldMatch(MAIN_FROM_CDS)       // archived Main class is for module only
                    .shouldContain(CLASS_FOUND_MESSAGE);
             });
+
         tty("6. run with CDS on, with the extra module specified in dump time");
         TestCommon.runWithModules(prefix,
                                  null,               // --upgrade-module-path
                                  extraModulePath,    // --module-path
                                  MAIN_MODULE)        // -m
             .assertNormalExit(out -> {
-                out.shouldNotContain(OPTIMIZE_ENABLED)
-                   .shouldContain(OPTIMIZE_DISABLED)
-                   .shouldNotContain(FMG_ENABLED)
-                   .shouldContain(FMG_DISABLED)
+                out.shouldContain(OPTIMIZE_ENABLED)
+                   .shouldNotContain(OPTIMIZE_DISABLED)
+                   .shouldContain(FMG_ENABLED)
+                   .shouldNotContain(FMG_DISABLED)
                    .shouldMatch(MAIN_FROM_CDS)       // archived Main class is for module only
                    .shouldContain(CLASS_FOUND_MESSAGE);
             });
@@ -262,16 +263,16 @@ public class ModulePathAndFMG {
                                         extraJarPath,
                                         "-m", MAIN_MODULE);
         TestCommon.checkDump(output);
-        tty("7. run with CDS on, without the extra module specified in dump time, should pass");
+        tty("7. run with CDS on, without the extra module specified in dump time, should fail");
         TestCommon.runWithModules(prefix,
                                  null,               // --upgrade-module-path
                                  modularJarPath,     // --module-path
                                  MAIN_MODULE)        // -m
             .assertNormalExit(out -> {
-                out.shouldNotContain(OPTIMIZE_DISABLED)
-                   .shouldContain(OPTIMIZE_ENABLED)
-                   .shouldNotContain(FMG_DISABLED)
-                   .shouldContain(FMG_ENABLED)
+                out.shouldContain(OPTIMIZE_DISABLED)
+                   .shouldNotContain(OPTIMIZE_ENABLED)
+                   .shouldContain(FMG_DISABLED)
+                   .shouldNotContain(FMG_ENABLED)
                    .shouldMatch(MAIN_FROM_CDS)       // archived Main class is for module only
                    .shouldContain(CLASS_FOUND_MESSAGE);
             });
@@ -282,10 +283,10 @@ public class ModulePathAndFMG {
                                  extraJarPath,       // --module-path
                                  MAIN_MODULE)        // -m
             .assertNormalExit(out -> {
-                out.shouldNotContain(OPTIMIZE_ENABLED)
-                   .shouldContain(OPTIMIZE_DISABLED)
-                   .shouldNotContain(FMG_ENABLED)
-                   .shouldContain(FMG_DISABLED)
+                out.shouldContain(OPTIMIZE_ENABLED)
+                   .shouldNotContain(OPTIMIZE_DISABLED)
+                   .shouldContain(FMG_ENABLED)
+                   .shouldNotContain(FMG_DISABLED)
                    .shouldMatch(MAIN_FROM_CDS)       // archived Main class is for module only
                    .shouldContain(CLASS_FOUND_MESSAGE);
             });
@@ -295,10 +296,10 @@ public class ModulePathAndFMG {
                                  extraModulePath,    // --module-path
                                  MAIN_MODULE)        // -m
             .assertNormalExit(out -> {
-                out.shouldNotContain(OPTIMIZE_ENABLED)
-                   .shouldContain(OPTIMIZE_DISABLED)
-                   .shouldNotContain(FMG_ENABLED)
-                   .shouldContain(FMG_DISABLED)
+                out.shouldContain(OPTIMIZE_ENABLED)
+                   .shouldNotContain(OPTIMIZE_DISABLED)
+                   .shouldContain(FMG_ENABLED)
+                   .shouldNotContain(FMG_DISABLED)
                    .shouldMatch(MAIN_FROM_CDS)       // archived Main class is for module only
                    .shouldContain(CLASS_FOUND_MESSAGE);
             });
diff --git a/test/lib/jdk/test/lib/cds/CDSArchiveUtils.java b/test/lib/jdk/test/lib/cds/CDSArchiveUtils.java
index fd76df92ef6..f616b22ef38 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, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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,6 @@ public class CDSArchiveUtils {
     private static int offsetCrc;                  // offset of GenericCDSFileMapHeader::_crc
     private static int offsetVersion;              // offset of GenericCDSFileMapHeader::_version
     private static int offsetHeaderSize;           // offset of GenericCDSFileMapHeader::_header_size
-    private static int offsetCommonAppClasspathPrefixSize;// offset of GenericCDSFileMapHeader::_common_app_classpath_size
     private static int offsetBaseArchiveNameOffset;// offset of GenericCDSFileMapHeader::_base_archive_name_offset
     private static int offsetBaseArchiveNameSize;  // offset of GenericCDSFileMapHeader::_base_archive_name_size
     private static int offsetJvmIdent;             // offset of FileMapHeader::_jvm_ident
@@ -91,7 +90,6 @@ public class CDSArchiveUtils {
             offsetCrc = wb.getCDSOffsetForName("GenericCDSFileMapHeader::_crc");
             offsetVersion = wb.getCDSOffsetForName("GenericCDSFileMapHeader::_version");
             offsetHeaderSize = wb.getCDSOffsetForName("GenericCDSFileMapHeader::_header_size");
-            offsetCommonAppClasspathPrefixSize = wb.getCDSOffsetForName("FileMapHeader::_common_app_classpath_prefix_size");
             offsetBaseArchiveNameOffset = wb.getCDSOffsetForName("GenericCDSFileMapHeader::_base_archive_name_offset");
             offsetBaseArchiveNameSize = wb.getCDSOffsetForName("GenericCDSFileMapHeader::_base_archive_name_size");
             offsetJvmIdent = wb.getCDSOffsetForName("FileMapHeader::_jvm_ident");
@@ -130,7 +128,6 @@ public class CDSArchiveUtils {
     public static int offsetCrc()                   { return offsetCrc;                   }
     public static int offsetVersion()               { return offsetVersion;               }
     public static int offsetHeaderSize()            { return offsetHeaderSize;            }
-    public static int offsetCommonAppClasspathPrefixSize() { return offsetCommonAppClasspathPrefixSize; }
     public static int offsetBaseArchiveNameOffset() { return offsetBaseArchiveNameOffset; }
     public static int offsetBaseArchiveNameSize()   { return offsetBaseArchiveNameSize;   }
     public static int offsetJvmIdent()              { return offsetJvmIdent;              }
@@ -159,10 +156,6 @@ public class CDSArchiveUtils {
         return alignUpWithAlignment(size);
     }
 
-    public static int commonAppClasspathPrefixSize(File jsaFile) throws Exception {
-        return (int)readInt(jsaFile, offsetCommonAppClasspathPrefixSize, 4);
-    }
-
     public static int baseArchiveNameOffset(File jsaFile) throws Exception {
         return (int)readInt(jsaFile, offsetBaseArchiveNameOffset, 4);
     }

From 39cb493c365778a1e3a6e753b49d8664733a3e26 Mon Sep 17 00:00:00 2001
From: Rajat Mahajan <rmahajan@openjdk.org>
Date: Mon, 24 Feb 2025 20:21:20 +0000
Subject: [PATCH 101/587] 8348106: Catch C++ exception in
 Java_sun_awt_windows_WTaskbarPeer_setOverlayIcon

Reviewed-by: abhiscxk, aivanov, azvegint, serb, dmarkov
---
 .../windows/native/libawt/windows/awt_Taskbar.cpp           | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/java.desktop/windows/native/libawt/windows/awt_Taskbar.cpp b/src/java.desktop/windows/native/libawt/windows/awt_Taskbar.cpp
index 19a6fd743b4..f45265d586c 100644
--- a/src/java.desktop/windows/native/libawt/windows/awt_Taskbar.cpp
+++ b/src/java.desktop/windows/native/libawt/windows/awt_Taskbar.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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,9 +126,13 @@ JNIEXPORT void JNICALL Java_sun_awt_windows_WTaskbarPeer_flashWindow
 JNIEXPORT void JNICALL Java_sun_awt_windows_WTaskbarPeer_setOverlayIcon
   (JNIEnv *env, jobject, jlong window, jintArray buf, jint w, jint h)
 {
+    TRY;
+
     HICON icon = CreateIconFromRaster(env, buf, w, h);
     m_Taskbar->SetOverlayIcon((HWND)window, icon, NULL);
     ::DestroyIcon(icon);
+
+    CATCH_BAD_ALLOC;
 }
 #ifdef __cplusplus
 }

From 990d40e98da2ceb3261096eaa55550565af58fc1 Mon Sep 17 00:00:00 2001
From: Bradford Wetmore <wetmore@openjdk.org>
Date: Mon, 24 Feb 2025 22:57:03 +0000
Subject: [PATCH 102/587] 8350476: Fix typo introduced in JDK-8350147

Reviewed-by: jnimeh, jpai
---
 src/java.base/share/classes/javax/crypto/KEM.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/java.base/share/classes/javax/crypto/KEM.java b/src/java.base/share/classes/javax/crypto/KEM.java
index 0486e48615a..f19d3306266 100644
--- a/src/java.base/share/classes/javax/crypto/KEM.java
+++ b/src/java.base/share/classes/javax/crypto/KEM.java
@@ -65,7 +65,7 @@ import java.util.Objects;
  * new shared secret and key encapsulation message.
  * <p>
  *
- * Example operation using a ficticious {@code KEM} algorithm {@code ABC}:
+ * Example operation using a fictitious {@code KEM} algorithm {@code ABC}:
  * {@snippet lang = java:
  *     // Receiver side
  *     KeyPairGenerator g = KeyPairGenerator.getInstance("ABC");

From a6cc37fdbe77ff3c1bd8e2332f67f48e3850e56b Mon Sep 17 00:00:00 2001
From: Ioi Lam <iklam@openjdk.org>
Date: Tue, 25 Feb 2025 05:38:39 +0000
Subject: [PATCH 103/587] 8349888: AOTMode=create crashes with EpsilonGC

Reviewed-by: shade, kvn
---
 src/hotspot/share/cds/classListParser.cpp     |   8 ++
 .../LambdaInExcludedClass.java                | 103 ++++++++++++++++++
 2 files changed, 111 insertions(+)
 create mode 100644 test/hotspot/jtreg/runtime/cds/appcds/aotClassLinking/LambdaInExcludedClass.java

diff --git a/src/hotspot/share/cds/classListParser.cpp b/src/hotspot/share/cds/classListParser.cpp
index 9a5ac12b475..e0c008678ca 100644
--- a/src/hotspot/share/cds/classListParser.cpp
+++ b/src/hotspot/share/cds/classListParser.cpp
@@ -846,6 +846,14 @@ void ClassListParser::parse_constant_pool_tag() {
     }
   }
 
+  if (SystemDictionaryShared::should_be_excluded(ik)) {
+    if (log_is_enabled(Warning, cds, resolve)) {
+      ResourceMark rm;
+      log_warning(cds, resolve)("Cannot aot-resolve constants for %s because it is excluded", ik->external_name());
+    }
+    return;
+  }
+
   if (preresolve_class) {
     AOTConstantPoolResolver::preresolve_class_cp_entries(THREAD, ik, &preresolve_list);
   }
diff --git a/test/hotspot/jtreg/runtime/cds/appcds/aotClassLinking/LambdaInExcludedClass.java b/test/hotspot/jtreg/runtime/cds/appcds/aotClassLinking/LambdaInExcludedClass.java
new file mode 100644
index 00000000000..9ed2524bff1
--- /dev/null
+++ b/test/hotspot/jtreg/runtime/cds/appcds/aotClassLinking/LambdaInExcludedClass.java
@@ -0,0 +1,103 @@
+/*
+ * Copyright (c) 2024, 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact 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=static Lambda expressions in excluded classes shouldn't be resolved during the assembly phase.
+ * @bug 8349888
+ * @requires vm.cds.supports.aot.class.linking
+ * @requires vm.gc.Epsilon
+ * @comment work around JDK-8345635
+ * @requires !vm.jvmci.enabled
+ * @library /test/jdk/lib/testlibrary /test/lib
+ * @build LambdaInExcludedClass
+ * @run driver jdk.test.lib.helpers.ClassFileInstaller LambdaInExcludedClassApp
+ * @run driver LambdaInExcludedClass STATIC
+ */
+
+import jdk.test.lib.cds.CDSAppTester;
+import jdk.test.lib.helpers.ClassFileInstaller;
+import jdk.test.lib.process.OutputAnalyzer;
+
+public class LambdaInExcludedClass {
+    static final String mainClass = "LambdaInExcludedClassApp";
+
+    public static void main(String[] args) throws Exception {
+        Tester t = new Tester();
+        t.run(args);
+    }
+
+    static class Tester extends CDSAppTester {
+        public Tester() {
+            super(mainClass);
+        }
+
+        @Override
+        public String classpath(RunMode runMode) {
+            // Using "." as the classpath allows the LambdaInExcludedClassApp to be loaded in
+            // the assembly phase, but this class will be excluded from the AOT cache.
+            return ".";
+        }
+
+        @Override
+        public String[] vmArgs(RunMode runMode) {
+            return new String[] {
+                "-Xmx128m",
+                "-XX:+AOTClassLinking",
+                "-XX:+UnlockExperimentalVMOptions",
+                "-XX:+UseEpsilonGC",
+            };
+        }
+
+        @Override
+        public String[] appCommandLine(RunMode runMode) {
+            return new String[] {
+                mainClass,
+            };
+        }
+
+        @Override
+        public void checkExecution(OutputAnalyzer out, RunMode runMode) throws Exception {
+            if (runMode == RunMode.DUMP_STATIC) {
+                out.shouldContain("Skipping LambdaInExcludedClassApp: Unsupported location");
+                out.shouldContain("Cannot aot-resolve constants for LambdaInExcludedClassApp because it is excluded");
+            } else {
+                out.shouldContain("Hello LambdaInExcludedClassApp");
+            }
+        }
+    }
+}
+
+class LambdaInExcludedClassApp {
+    public static void main(String args[]) throws Exception {
+        // LambdaInExcludedClassApp is excluded, so aot-linking of lambda call sites
+        // should not happen for this class. Otherwise Epsilon GC may crash due
+        // to 8349888.
+        Runnable r = LambdaInExcludedClassApp::doit;
+        r.run();
+    }
+
+    static void doit() {
+        System.out.println("Hello LambdaInExcludedClassApp");
+    }
+}

From e1081cffcbec6020bf4cbec9f795b59b6ec1e9ef Mon Sep 17 00:00:00 2001
From: SendaoYan <syan@openjdk.org>
Date: Tue, 25 Feb 2025 06:12:39 +0000
Subject: [PATCH 104/587] 8348536: Remove remain SIZE_FORMAT usage after
 JDK-8347990

Reviewed-by: dholmes, kbarrett
---
 test/hotspot/gtest/metaspace/test_blocktree.cpp      |  2 +-
 test/hotspot/gtest/metaspace/test_metaspace_misc.cpp | 10 +++++-----
 test/hotspot/gtest/nmt/test_nmt_totals.cpp           |  2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/test/hotspot/gtest/metaspace/test_blocktree.cpp b/test/hotspot/gtest/metaspace/test_blocktree.cpp
index c0dae895b2a..6d1e8d2884d 100644
--- a/test/hotspot/gtest/metaspace/test_blocktree.cpp
+++ b/test/hotspot/gtest/metaspace/test_blocktree.cpp
@@ -143,7 +143,7 @@ static void test_find_nearest_fit_with_tree(const size_t sizes[], size_t request
     EXPECT_0(real_size);
   }
 
-  LOG(SIZE_FORMAT ": %zu.", request_size, real_size);
+  LOG("%zu: %zu.", request_size, real_size);
 
 }
 
diff --git a/test/hotspot/gtest/metaspace/test_metaspace_misc.cpp b/test/hotspot/gtest/metaspace/test_metaspace_misc.cpp
index da0ea656ed7..7793bdddf7c 100644
--- a/test/hotspot/gtest/metaspace/test_metaspace_misc.cpp
+++ b/test/hotspot/gtest/metaspace/test_metaspace_misc.cpp
@@ -74,11 +74,11 @@ TEST_VM(metaspace, chunklevel_utils)   {
 
   // These tests seem to be really basic, but it is amazing what one can
   // break accidentally...
-  LOG(SIZE_FORMAT, MAX_CHUNK_BYTE_SIZE);
-  LOG(SIZE_FORMAT, MIN_CHUNK_BYTE_SIZE);
-  LOG(SIZE_FORMAT, MIN_CHUNK_WORD_SIZE);
-  LOG(SIZE_FORMAT, MAX_CHUNK_WORD_SIZE);
-  LOG(SIZE_FORMAT, MAX_CHUNK_BYTE_SIZE);
+  LOG("%zu", MAX_CHUNK_BYTE_SIZE);
+  LOG("%zu", MIN_CHUNK_BYTE_SIZE);
+  LOG("%zu", MIN_CHUNK_WORD_SIZE);
+  LOG("%zu", MAX_CHUNK_WORD_SIZE);
+  LOG("%zu", MAX_CHUNK_BYTE_SIZE);
   LOG("%u", (unsigned)ROOT_CHUNK_LEVEL);
   LOG("%u", (unsigned)HIGHEST_CHUNK_LEVEL);
   LOG("%u", (unsigned)LOWEST_CHUNK_LEVEL);
diff --git a/test/hotspot/gtest/nmt/test_nmt_totals.cpp b/test/hotspot/gtest/nmt/test_nmt_totals.cpp
index d3fb62654c2..61c591fa0bb 100644
--- a/test/hotspot/gtest/nmt/test_nmt_totals.cpp
+++ b/test/hotspot/gtest/nmt/test_nmt_totals.cpp
@@ -65,7 +65,7 @@ static totals_t get_totals() {
   EXPECT_LE(t_real.s, t_expected.s + leeway_s);                               \
   EXPECT_GE(t_real.ovrh, t_expected.ovrh - (leeway_n * sizeof(MallocHeader)));   \
   EXPECT_LE(t_real.ovrh, t_expected.ovrh + (leeway_n * sizeof(MallocHeader)));   \
-  LOG("Deviation: n=" SSIZE_FORMAT ", s=" SSIZE_FORMAT ", ovrh=" SSIZE_FORMAT,   \
+  LOG("Deviation: n=%zd, s=%zd, ovrh=%zd",   \
       (ssize_t)t_real.n - (ssize_t)t_expected.n,                                 \
       (ssize_t)t_real.s - (ssize_t)t_expected.s,                                 \
       (ssize_t)t_real.ovrh - (ssize_t)t_expected.ovrh);                          \

From ab86a13519a50c5d8a05c493594e6bda329133f4 Mon Sep 17 00:00:00 2001
From: Adam Sotona <asotona@openjdk.org>
Date: Tue, 25 Feb 2025 08:18:52 +0000
Subject: [PATCH 105/587] 8350548: java.lang.classfile package javadoc has
 errors

Reviewed-by: liach
---
 .../share/classes/java/lang/classfile/package-info.java     | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/java.base/share/classes/java/lang/classfile/package-info.java b/src/java.base/share/classes/java/lang/classfile/package-info.java
index b5d79ff6e7e..a966a6d8269 100644
--- a/src/java.base/share/classes/java/lang/classfile/package-info.java
+++ b/src/java.base/share/classes/java/lang/classfile/package-info.java
@@ -368,13 +368,13 @@
  * <p>
  * or lift the code transform into the class transform directly:
  * {@snippet lang=java :
- * ClassTransform ct = ClassTransform.transformingMethodBodiess(fooToBar);
+ * ClassTransform ct = ClassTransform.transformingMethodBodies(fooToBar);
  * }
  * <p>
  * and then transform the classfile:
  * {@snippet lang=java :
  * var cc = ClassFile.of();
- * byte[] newBytes = cc.transform(cc.parse(bytes), ct);
+ * byte[] newBytes = cc.transformClass(cc.parse(bytes), ct);
  * }
  * <p>
  * This is much more concise (and less error-prone) than the equivalent
@@ -393,7 +393,7 @@
  *
  * {@snippet lang=java :
  * var cc = ClassFile.of();
- * byte[] newBytes = cc.transform(cc.parse(bytes),
+ * byte[] newBytes = cc.transformClass(cc.parse(bytes),
  *                                ClassTransform.transformingMethods(
  *                                    MethodTransform.transformingCode(
  *                                        fooToBar.andThen(instrumentCalls))));

From d551dacaef938cea0cad10047b79a0a7a26dcacb Mon Sep 17 00:00:00 2001
From: Matthias Baesken <mbaesken@openjdk.org>
Date: Tue, 25 Feb 2025 08:19:56 +0000
Subject: [PATCH 106/587] 8350103: Test
 containers/systemd/SystemdMemoryAwarenessTest.java fails on Linux ppc64le
 SLES15 SP6

Co-authored-by: Severin Gehwolf <sgehwolf@openjdk.org>
Reviewed-by: sgehwolf, asteiner
---
 .../containers/systemd/SystemdMemoryAwarenessTest.java | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/test/hotspot/jtreg/containers/systemd/SystemdMemoryAwarenessTest.java b/test/hotspot/jtreg/containers/systemd/SystemdMemoryAwarenessTest.java
index 2c06d48bb1c..ba77ce1c6e9 100644
--- a/test/hotspot/jtreg/containers/systemd/SystemdMemoryAwarenessTest.java
+++ b/test/hotspot/jtreg/containers/systemd/SystemdMemoryAwarenessTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024, Red Hat, Inc.
+ * Copyright (c) 2024, 2025, 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
@@ -68,14 +68,14 @@ public class SystemdMemoryAwarenessTest {
 
         OutputAnalyzer out = SystemdTestUtils.buildAndRunSystemdJava(opts);
         out.shouldHaveExitValue(0)
-           .shouldContain("Hello Systemd")
-           .shouldContain(String.format("Memory Limit is: %d", (expectedMemLimit * MB)));
+           .shouldContain("Hello Systemd");
         try {
+            out.shouldContain(String.format("Memory Limit is: %d", (expectedMemLimit * MB)));
             out.shouldContain("OSContainer::active_processor_count: " + coreLimit);
         } catch (RuntimeException e) {
-            // CPU delegation needs to be enabled when run as user on cg v2
+            // CPU/memory delegation needs to be enabled when run as user on cg v2
             if (SystemdTestUtils.RUN_AS_USER) {
-                String hint = "When run as user on cg v2 cpu delegation needs to be configured!";
+                String hint = "When run as user on cg v2 cpu/memory delegation needs to be configured!";
                 throw new SkippedException(hint);
             }
             throw e;

From aa70f0ae8be0bbc80e9d002bf02d0278c8e31bf8 Mon Sep 17 00:00:00 2001
From: Jaikiran Pai <jpai@openjdk.org>
Date: Tue, 25 Feb 2025 10:57:22 +0000
Subject: [PATCH 107/587] 8347348: Clarify that the HTTP server in
 jdk.httpserver module is not a full featured server

Reviewed-by: michaelm, dfuchs
---
 src/jdk.httpserver/share/classes/module-info.java | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/jdk.httpserver/share/classes/module-info.java b/src/jdk.httpserver/share/classes/module-info.java
index 23e04405ee8..15e9e2cc36d 100644
--- a/src/jdk.httpserver/share/classes/module-info.java
+++ b/src/jdk.httpserver/share/classes/module-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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,6 +101,14 @@
  * socket option on all incoming connections.
  * </li></ul>
  *
+ * @apiNote The API and SPI in this module are designed and implemented to support a minimal
+ * HTTP server and simple HTTP semantics primarily.
+ *
+ * @implNote The default implementation of the HTTP server provided in this module is intended
+ * for simple usages like local testing, development, and debugging. Accordingly, the design
+ * and implementation of the server does not intend to be a full-featured, high performance
+ * HTTP server.
+ *
  * @toolGuide jwebserver
  *
  * @uses com.sun.net.httpserver.spi.HttpServerProvider

From a9c9f7f0cbb2f2395fef08348bf867ffa8875d73 Mon Sep 17 00:00:00 2001
From: Albert Mingkun Yang <ayang@openjdk.org>
Date: Tue, 25 Feb 2025 11:14:20 +0000
Subject: [PATCH 108/587] 8192647: GClocker induced GCs can starve threads
 requiring memory leading to OOME

Reviewed-by: tschatzl, iwalulya, egahlin
---
 src/hotspot/share/gc/g1/g1CollectedHeap.cpp   |   2 +-
 .../gc/parallel/parallelScavengeHeap.cpp      |  73 +------
 .../gc/parallel/parallelScavengeHeap.hpp      |   4 +-
 src/hotspot/share/gc/parallel/psOldGen.cpp    |   3 -
 .../share/gc/parallel/psParallelCompact.cpp   |   4 -
 .../share/gc/parallel/psVMOperations.cpp      |   8 +-
 .../share/gc/serial/defNewGeneration.cpp      |  12 -
 src/hotspot/share/gc/serial/serialHeap.cpp    | 101 +--------
 src/hotspot/share/gc/serial/serialHeap.hpp    |   8 +-
 .../share/gc/serial/serialVMOperations.cpp    |   6 +-
 .../share/gc/serial/tenuredGeneration.cpp     |   3 -
 src/hotspot/share/gc/shared/collectedHeap.cpp |  39 +---
 src/hotspot/share/gc/shared/gcCause.cpp       |   3 -
 src/hotspot/share/gc/shared/gcCause.hpp       |   1 -
 src/hotspot/share/gc/shared/gcLocker.cpp      | 205 +++++++-----------
 src/hotspot/share/gc/shared/gcLocker.hpp      | 137 +++---------
 .../share/gc/shared/gcLocker.inline.hpp       |  47 ++--
 src/hotspot/share/gc/shared/gcTrace.hpp       |  15 --
 src/hotspot/share/gc/shared/gcTraceSend.cpp   |  46 ----
 .../share/gc/shared/gcVMOperations.cpp        |  18 +-
 .../share/gc/shared/gcVMOperations.hpp        |   6 -
 src/hotspot/share/gc/shared/gc_globals.hpp    |   5 -
 src/hotspot/share/jfr/metadata/metadata.xml   |   5 -
 src/hotspot/share/prims/downcallLinker.cpp    |   1 -
 src/hotspot/share/prims/jni.cpp               |   1 -
 src/hotspot/share/prims/whitebox.cpp          |  11 -
 src/hotspot/share/runtime/javaThread.hpp      |   3 +
 src/hotspot/share/runtime/mutexLocker.cpp     |   2 -
 src/hotspot/share/runtime/mutexLocker.hpp     |   1 -
 src/hotspot/share/runtime/safepoint.cpp       |   3 -
 src/hotspot/share/runtime/sharedRuntime.cpp   |   1 -
 .../sun/jvm/hotspot/gc/shared/GCCause.java    |   1 -
 src/jdk.jfr/share/conf/jfr/default.jfc        |   6 -
 src/jdk.jfr/share/conf/jfr/profile.jfc        |   6 -
 test/hotspot/jtreg/ProblemList.txt            |   3 -
 .../TestExcessGCLockerCollections.java        | 180 ---------------
 .../TestGCCauseWithParallelOld.java           |   3 +-
 .../gc/collection/TestGCCauseWithSerial.java  |   3 +-
 .../event/gc/detailed/TestGCLockerEvent.java  | 133 ------------
 test/lib/jdk/test/lib/jfr/EventNames.java     |   1 -
 test/lib/jdk/test/whitebox/WhiteBox.java      |   4 -
 41 files changed, 171 insertions(+), 943 deletions(-)
 delete mode 100644 test/hotspot/jtreg/gc/stress/gclocker/TestExcessGCLockerCollections.java
 delete mode 100644 test/jdk/jdk/jfr/event/gc/detailed/TestGCLockerEvent.java

diff --git a/src/hotspot/share/gc/g1/g1CollectedHeap.cpp b/src/hotspot/share/gc/g1/g1CollectedHeap.cpp
index 3f84349b90b..6cd4cd07dd8 100644
--- a/src/hotspot/share/gc/g1/g1CollectedHeap.cpp
+++ b/src/hotspot/share/gc/g1/g1CollectedHeap.cpp
@@ -1873,7 +1873,7 @@ bool G1CollectedHeap::try_collect(GCCause::Cause cause,
     return try_collect_concurrently(cause,
                                     counters_before.total_collections(),
                                     counters_before.old_marking_cycles_started());
-  } else if (cause == GCCause::_gc_locker || cause == GCCause::_wb_young_gc
+  } else if (cause == GCCause::_wb_young_gc
              DEBUG_ONLY(|| cause == GCCause::_scavenge_alot)) {
 
     // Schedule a standard evacuation pause. We're setting word_size
diff --git a/src/hotspot/share/gc/parallel/parallelScavengeHeap.cpp b/src/hotspot/share/gc/parallel/parallelScavengeHeap.cpp
index dc6a3ca565f..24cc30e1918 100644
--- a/src/hotspot/share/gc/parallel/parallelScavengeHeap.cpp
+++ b/src/hotspot/share/gc/parallel/parallelScavengeHeap.cpp
@@ -188,6 +188,7 @@ void ParallelScavengeHeap::post_initialize() {
   PSPromotionManager::initialize();
 
   ScavengableNMethods::initialize(&_is_scavengable);
+  GCLocker::initialize();
 }
 
 void ParallelScavengeHeap::update_counters() {
@@ -288,7 +289,6 @@ HeapWord* ParallelScavengeHeap::mem_allocate_work(size_t size,
 
   uint loop_count = 0;
   uint gc_count = 0;
-  uint gclocker_stalled_count = 0;
 
   while (result == nullptr) {
     // We don't want to have multiple collections for a single filled generation.
@@ -318,37 +318,10 @@ HeapWord* ParallelScavengeHeap::mem_allocate_work(size_t size,
           return result;
         }
       }
-
-      if (gclocker_stalled_count > GCLockerRetryAllocationCount) {
-        return nullptr;
-      }
-
-      // Failed to allocate without a gc.
-      if (GCLocker::is_active_and_needs_gc()) {
-        // If this thread is not in a jni critical section, we stall
-        // the requestor until the critical section has cleared and
-        // GC allowed. When the critical section clears, a GC is
-        // initiated by the last thread exiting the critical section; so
-        // we retry the allocation sequence from the beginning of the loop,
-        // rather than causing more, now probably unnecessary, GC attempts.
-        JavaThread* jthr = JavaThread::current();
-        if (!jthr->in_critical()) {
-          MutexUnlocker mul(Heap_lock);
-          GCLocker::stall_until_clear();
-          gclocker_stalled_count += 1;
-          continue;
-        } else {
-          if (CheckJNICalls) {
-            fatal("Possible deadlock due to allocating while"
-                  " in jni critical section");
-          }
-          return nullptr;
-        }
-      }
     }
 
-    if (result == nullptr) {
-      // Generate a VM operation
+    assert(result == nullptr, "inv");
+    {
       VM_ParallelCollectForAllocation op(size, is_tlab, gc_count);
       VMThread::execute(&op);
 
@@ -358,13 +331,6 @@ HeapWord* ParallelScavengeHeap::mem_allocate_work(size_t size,
       if (op.prologue_succeeded()) {
         assert(is_in_or_null(op.result()), "result not in heap");
 
-        // If GC was locked out during VM operation then retry allocation
-        // and/or stall as necessary.
-        if (op.gc_locked()) {
-          assert(op.result() == nullptr, "must be null if gc_locked() is true");
-          continue;  // retry and/or stall as necessary
-        }
-
         // Exit the loop if the gc time limit has been exceeded.
         // The allocation must have failed above ("result" guarding
         // this path is null) and the most recent collection has exceeded the
@@ -416,8 +382,8 @@ HeapWord* ParallelScavengeHeap::allocate_old_gen_and_record(size_t size) {
 }
 
 HeapWord* ParallelScavengeHeap::mem_allocate_old_gen(size_t size) {
-  if (!should_alloc_in_eden(size) || GCLocker::is_active_and_needs_gc()) {
-    // Size is too big for eden, or gc is locked out.
+  if (!should_alloc_in_eden(size)) {
+    // Size is too big for eden.
     return allocate_old_gen_and_record(size);
   }
 
@@ -425,9 +391,6 @@ HeapWord* ParallelScavengeHeap::mem_allocate_old_gen(size_t size) {
 }
 
 void ParallelScavengeHeap::do_full_collection(bool clear_all_soft_refs) {
-  if (GCLocker::check_active_before_gc()) {
-    return;
-  }
   PSParallelCompact::invoke(clear_all_soft_refs);
 }
 
@@ -446,11 +409,6 @@ HeapWord* ParallelScavengeHeap::satisfy_failed_allocation(size_t size, bool is_t
 
   HeapWord* result = nullptr;
 
-  GCLocker::check_active_before_gc();
-  if (GCLocker::is_active_and_needs_gc()) {
-    return expand_heap_and_allocate(size, is_tlab);
-  }
-
   // If young-gen can handle this allocation, attempt young-gc firstly.
   bool should_run_young_gc = is_tlab || should_alloc_in_eden(size);
   collect_at_safepoint(!should_run_young_gc);
@@ -544,10 +502,6 @@ void ParallelScavengeHeap::collect(GCCause::Cause cause) {
     full_gc_count = total_full_collections();
   }
 
-  if (GCLocker::should_discard(cause, gc_count)) {
-    return;
-  }
-
   while (true) {
     VM_ParallelGCCollect op(gc_count, full_gc_count, cause);
     VMThread::execute(&op);
@@ -562,22 +516,9 @@ void ParallelScavengeHeap::collect(GCCause::Cause cause) {
         return;
       }
     }
-
-    if (GCLocker::is_active_and_needs_gc()) {
-      // If GCLocker is active, wait until clear before retrying.
-      GCLocker::stall_until_clear();
-    }
   }
 }
 
-void ParallelScavengeHeap::try_collect_at_safepoint(bool full) {
-  assert(SafepointSynchronize::is_at_safepoint(), "precondition");
-  if (GCLocker::check_active_before_gc()) {
-    return;
-  }
-  collect_at_safepoint(full);
-}
-
 bool ParallelScavengeHeap::must_clear_all_soft_refs() {
   return _gc_cause == GCCause::_metadata_GC_clear_soft_refs ||
          _gc_cause == GCCause::_wb_full_gc;
@@ -889,11 +830,11 @@ GrowableArray<MemoryPool*> ParallelScavengeHeap::memory_pools() {
 }
 
 void ParallelScavengeHeap::pin_object(JavaThread* thread, oop obj) {
-  GCLocker::lock_critical(thread);
+  GCLocker::enter(thread);
 }
 
 void ParallelScavengeHeap::unpin_object(JavaThread* thread, oop obj) {
-  GCLocker::unlock_critical(thread);
+  GCLocker::exit(thread);
 }
 
 void ParallelScavengeHeap::update_parallel_worker_threads_cpu_time() {
diff --git a/src/hotspot/share/gc/parallel/parallelScavengeHeap.hpp b/src/hotspot/share/gc/parallel/parallelScavengeHeap.hpp
index b4151f9b8fa..ef9a4b4d5a1 100644
--- a/src/hotspot/share/gc/parallel/parallelScavengeHeap.hpp
+++ b/src/hotspot/share/gc/parallel/parallelScavengeHeap.hpp
@@ -95,8 +95,6 @@ class ParallelScavengeHeap : public CollectedHeap {
 
   void update_parallel_worker_threads_cpu_time();
 
-  void collect_at_safepoint(bool full);
-
   bool must_clear_all_soft_refs();
 
   HeapWord* allocate_new_tlab(size_t min_size, size_t requested_size, size_t* actual_size) override;
@@ -198,7 +196,7 @@ public:
   // Support for System.gc()
   void collect(GCCause::Cause cause) override;
 
-  void try_collect_at_safepoint(bool full);
+  void collect_at_safepoint(bool full);
 
   void ensure_parsability(bool retire_tlabs) override;
   void resize_all_tlabs() override;
diff --git a/src/hotspot/share/gc/parallel/psOldGen.cpp b/src/hotspot/share/gc/parallel/psOldGen.cpp
index 8eadc833ac7..0a95a55b648 100644
--- a/src/hotspot/share/gc/parallel/psOldGen.cpp
+++ b/src/hotspot/share/gc/parallel/psOldGen.cpp
@@ -217,9 +217,6 @@ bool PSOldGen::expand(size_t bytes) {
     success = expand_to_reserved();
   }
 
-  if (success && GCLocker::is_active_and_needs_gc()) {
-    log_debug(gc)("Garbage collection disabled, expanded heap instead");
-  }
   return success;
 }
 
diff --git a/src/hotspot/share/gc/parallel/psParallelCompact.cpp b/src/hotspot/share/gc/parallel/psParallelCompact.cpp
index 90f4d6367bd..9f51aba080e 100644
--- a/src/hotspot/share/gc/parallel/psParallelCompact.cpp
+++ b/src/hotspot/share/gc/parallel/psParallelCompact.cpp
@@ -993,10 +993,6 @@ bool PSParallelCompact::invoke_no_policy(bool clear_all_soft_refs) {
   assert(SafepointSynchronize::is_at_safepoint(), "must be at a safepoint");
   assert(ref_processor() != nullptr, "Sanity");
 
-  if (GCLocker::check_active_before_gc()) {
-    return false;
-  }
-
   ParallelScavengeHeap* heap = ParallelScavengeHeap::heap();
 
   GCIdMark gc_id_mark;
diff --git a/src/hotspot/share/gc/parallel/psVMOperations.cpp b/src/hotspot/share/gc/parallel/psVMOperations.cpp
index 674e51bf6d2..4873853a3dd 100644
--- a/src/hotspot/share/gc/parallel/psVMOperations.cpp
+++ b/src/hotspot/share/gc/parallel/psVMOperations.cpp
@@ -43,14 +43,10 @@ void VM_ParallelCollectForAllocation::doit() {
 
   GCCauseSetter gccs(heap, _gc_cause);
   _result = heap->satisfy_failed_allocation(_word_size, _is_tlab);
-
-  if (_result == nullptr && GCLocker::is_active_and_needs_gc()) {
-    set_gc_locked();
-  }
 }
 
 static bool is_cause_full(GCCause::Cause cause) {
-  return (cause != GCCause::_gc_locker) && (cause != GCCause::_wb_young_gc)
+  return (cause != GCCause::_wb_young_gc)
          DEBUG_ONLY(&& (cause != GCCause::_scavenge_alot));
 }
 
@@ -64,5 +60,5 @@ void VM_ParallelGCCollect::doit() {
   ParallelScavengeHeap* heap = ParallelScavengeHeap::heap();
 
   GCCauseSetter gccs(heap, _gc_cause);
-  heap->try_collect_at_safepoint(_full);
+  heap->collect_at_safepoint(_full);
 }
diff --git a/src/hotspot/share/gc/serial/defNewGeneration.cpp b/src/hotspot/share/gc/serial/defNewGeneration.cpp
index c5c1b67d5cf..8ad42bc702d 100644
--- a/src/hotspot/share/gc/serial/defNewGeneration.cpp
+++ b/src/hotspot/share/gc/serial/defNewGeneration.cpp
@@ -367,18 +367,6 @@ bool DefNewGeneration::expand(size_t bytes) {
     SpaceMangler::mangle_region(mangle_region);
   }
 
-  // Do not attempt an expand-to-the reserve size.  The
-  // request should properly observe the maximum size of
-  // the generation so an expand-to-reserve should be
-  // unnecessary.  Also a second call to expand-to-reserve
-  // value potentially can cause an undue expansion.
-  // For example if the first expand fail for unknown reasons,
-  // but the second succeeds and expands the heap to its maximum
-  // value.
-  if (GCLocker::is_active()) {
-    log_debug(gc)("Garbage collection disabled, expanded heap instead");
-  }
-
   return success;
 }
 
diff --git a/src/hotspot/share/gc/serial/serialHeap.cpp b/src/hotspot/share/gc/serial/serialHeap.cpp
index 2408a41a87b..fcf57909a03 100644
--- a/src/hotspot/share/gc/serial/serialHeap.cpp
+++ b/src/hotspot/share/gc/serial/serialHeap.cpp
@@ -101,6 +101,7 @@ SerialHeap::SerialHeap() :
     _old_pool(nullptr) {
   _young_manager = new GCMemoryManager("Copy");
   _old_manager = new GCMemoryManager("MarkSweepCompact");
+  GCLocker::initialize();
 }
 
 void SerialHeap::initialize_serviceability() {
@@ -167,11 +168,11 @@ void SerialHeap::complete_loaded_archive_space(MemRegion archive_space) {
 }
 
 void SerialHeap::pin_object(JavaThread* thread, oop obj) {
-  GCLocker::lock_critical(thread);
+  GCLocker::enter(thread);
 }
 
 void SerialHeap::unpin_object(JavaThread* thread, oop obj) {
-  GCLocker::unlock_critical(thread);
+  GCLocker::exit(thread);
 }
 
 jint SerialHeap::initialize() {
@@ -282,12 +283,10 @@ size_t SerialHeap::max_capacity() const {
 
 // Return true if any of the following is true:
 // . the allocation won't fit into the current young gen heap
-// . gc locker is occupied (jni critical section)
 // . heap memory is tight
 bool SerialHeap::should_try_older_generation_allocation(size_t word_size) const {
   size_t young_capacity = _young_gen->capacity_before_gc();
   return    (word_size > heap_word_size(young_capacity))
-         || GCLocker::is_active_and_needs_gc()
          || _is_heap_almost_full;
 }
 
@@ -306,14 +305,11 @@ HeapWord* SerialHeap::expand_heap_and_allocate(size_t size, bool is_tlab) {
   return result;
 }
 
-HeapWord* SerialHeap::mem_allocate_work(size_t size,
-                                        bool is_tlab) {
-
+HeapWord* SerialHeap::mem_allocate_work(size_t size, bool is_tlab) {
   HeapWord* result = nullptr;
 
   // Loop until the allocation is satisfied, or unsatisfied after GC.
-  for (uint try_count = 1, gclocker_stalled_count = 0; /* return or throw */; try_count += 1) {
-
+  for (uint try_count = 1; /* return or throw */; try_count += 1) {
     // First allocation attempt is lock-free.
     DefNewGeneration *young = _young_gen;
     if (young->should_allocate(size, is_tlab)) {
@@ -337,45 +333,6 @@ HeapWord* SerialHeap::mem_allocate_work(size_t size,
         return result;
       }
 
-      if (GCLocker::is_active_and_needs_gc()) {
-        if (is_tlab) {
-          return nullptr;  // Caller will retry allocating individual object.
-        }
-        if (!is_maximal_no_gc()) {
-          // Try and expand heap to satisfy request.
-          result = expand_heap_and_allocate(size, is_tlab);
-          // Result could be null if we are out of space.
-          if (result != nullptr) {
-            return result;
-          }
-        }
-
-        if (gclocker_stalled_count > GCLockerRetryAllocationCount) {
-          return nullptr; // We didn't get to do a GC and we didn't get any memory.
-        }
-
-        // If this thread is not in a jni critical section, we stall
-        // the requestor until the critical section has cleared and
-        // GC allowed. When the critical section clears, a GC is
-        // initiated by the last thread exiting the critical section; so
-        // we retry the allocation sequence from the beginning of the loop,
-        // rather than causing more, now probably unnecessary, GC attempts.
-        JavaThread* jthr = JavaThread::current();
-        if (!jthr->in_critical()) {
-          MutexUnlocker mul(Heap_lock);
-          // Wait for JNI critical section to be exited
-          GCLocker::stall_until_clear();
-          gclocker_stalled_count += 1;
-          continue;
-        } else {
-          if (CheckJNICalls) {
-            fatal("Possible deadlock due to allocating while"
-                  " in jni critical section");
-          }
-          return nullptr;
-        }
-      }
-
       // Read the gc count while the heap lock is held.
       gc_count_before = total_collections();
     }
@@ -384,10 +341,6 @@ HeapWord* SerialHeap::mem_allocate_work(size_t size,
     VMThread::execute(&op);
     if (op.prologue_succeeded()) {
       result = op.result();
-      if (op.gc_locked()) {
-         assert(result == nullptr, "must be null if gc_locked() is true");
-         continue;  // Retry and/or stall as necessary.
-      }
 
       assert(result == nullptr || is_in_reserved(result),
              "result not in heap");
@@ -397,8 +350,8 @@ HeapWord* SerialHeap::mem_allocate_work(size_t size,
     // Give a warning if we seem to be looping forever.
     if ((QueuedAllocationWarningCount > 0) &&
         (try_count % QueuedAllocationWarningCount == 0)) {
-          log_warning(gc, ergo)("SerialHeap::mem_allocate_work retries %d times,"
-                                " size=%zu %s", try_count, size, is_tlab ? "(TLAB)" : "");
+      log_warning(gc, ergo)("SerialHeap::mem_allocate_work retries %d times,"
+                            " size=%zu %s", try_count, size, is_tlab ? "(TLAB)" : "");
     }
   }
 }
@@ -517,16 +470,6 @@ HeapWord* SerialHeap::satisfy_failed_allocation(size_t size, bool is_tlab) {
 
   HeapWord* result = nullptr;
 
-  GCLocker::check_active_before_gc();
-  if (GCLocker::is_active_and_needs_gc()) {
-    // GC locker is active; instead of a collection we will attempt
-    // to expand the heap, if there's room for expansion.
-    if (!is_maximal_no_gc()) {
-      result = expand_heap_and_allocate(size, is_tlab);
-    }
-    return result;   // Could be null if we are out of space.
-  }
-
   // If young-gen can handle this allocation, attempt young-gc firstly.
   bool should_run_young_gc = _young_gen->should_allocate(size, is_tlab);
   collect_at_safepoint(!should_run_young_gc);
@@ -550,7 +493,7 @@ HeapWord* SerialHeap::satisfy_failed_allocation(size_t size, bool is_tlab) {
   {
     UIntFlagSetting flag_change(MarkSweepAlwaysCompactCount, 1); // Make sure the heap is fully compacted
     const bool clear_all_soft_refs = true;
-    do_full_collection_no_gc_locker(clear_all_soft_refs);
+    do_full_collection(clear_all_soft_refs);
   }
 
   result = attempt_allocation(size, is_tlab, false /* first_only */);
@@ -632,14 +575,6 @@ void SerialHeap::scan_evacuated_objs(YoungGenScanClosure* young_cl,
   guarantee(young_gen()->promo_failure_scan_is_complete(), "Failed to finish scan");
 }
 
-void SerialHeap::try_collect_at_safepoint(bool full) {
-  assert(SafepointSynchronize::is_at_safepoint(), "precondition");
-  if (GCLocker::check_active_before_gc()) {
-    return;
-  }
-  collect_at_safepoint(full);
-}
-
 void SerialHeap::collect_at_safepoint(bool full) {
   assert(!GCLocker::is_active(), "precondition");
   bool clear_soft_refs = must_clear_all_soft_refs();
@@ -651,7 +586,7 @@ void SerialHeap::collect_at_safepoint(bool full) {
     }
     // Upgrade to Full-GC if young-gc fails
   }
-  do_full_collection_no_gc_locker(clear_soft_refs);
+  do_full_collection(clear_soft_refs);
 }
 
 // public collection interfaces
@@ -669,12 +604,7 @@ void SerialHeap::collect(GCCause::Cause cause) {
     full_gc_count_before = total_full_collections();
   }
 
-  if (GCLocker::should_discard(cause, gc_count_before)) {
-    return;
-  }
-
   bool should_run_young_gc =  (cause == GCCause::_wb_young_gc)
-                           || (cause == GCCause::_gc_locker)
                 DEBUG_ONLY(|| (cause == GCCause::_scavenge_alot));
 
   while (true) {
@@ -683,7 +613,6 @@ void SerialHeap::collect(GCCause::Cause cause) {
                           full_gc_count_before,
                           cause);
     VMThread::execute(&op);
-
     if (!GCCause::is_explicit_full_gc(cause)) {
       return;
     }
@@ -695,22 +624,10 @@ void SerialHeap::collect(GCCause::Cause cause) {
         return;
       }
     }
-
-    if (GCLocker::is_active_and_needs_gc()) {
-      // If GCLocker is active, wait until clear before retrying.
-      GCLocker::stall_until_clear();
-    }
   }
 }
 
 void SerialHeap::do_full_collection(bool clear_all_soft_refs) {
-  if (GCLocker::check_active_before_gc()) {
-    return;
-  }
-  do_full_collection_no_gc_locker(clear_all_soft_refs);
-}
-
-void SerialHeap::do_full_collection_no_gc_locker(bool clear_all_soft_refs) {
   IsSTWGCActiveMark gc_active_mark;
   SvcGCMarker sgcm(SvcGCMarker::FULL);
   GCIdMark gc_id_mark;
diff --git a/src/hotspot/share/gc/serial/serialHeap.hpp b/src/hotspot/share/gc/serial/serialHeap.hpp
index 28ab7905bbc..754f6741cfe 100644
--- a/src/hotspot/share/gc/serial/serialHeap.hpp
+++ b/src/hotspot/share/gc/serial/serialHeap.hpp
@@ -108,9 +108,6 @@ private:
                                bool   first_only);
 
   void do_full_collection(bool clear_all_soft_refs) override;
-  void do_full_collection_no_gc_locker(bool clear_all_soft_refs);
-
-  void collect_at_safepoint(bool full);
 
   // Does the "cause" of GC indicate that
   // we absolutely __must__ clear soft refs?
@@ -147,7 +144,7 @@ public:
   HeapWord* satisfy_failed_allocation(size_t size, bool is_tlab);
 
   // Callback from VM_SerialGCCollect.
-  void try_collect_at_safepoint(bool full);
+  void collect_at_safepoint(bool full);
 
   // Perform a full collection of the heap; intended for use in implementing
   // "System.gc". This implies as full a collection as the CollectedHeap
@@ -257,8 +254,7 @@ private:
   // Try to allocate space by expanding the heap.
   HeapWord* expand_heap_and_allocate(size_t size, bool is_tlab);
 
-  HeapWord* mem_allocate_work(size_t size,
-                              bool is_tlab);
+  HeapWord* mem_allocate_work(size_t size, bool is_tlab);
 
   MemoryPool* _eden_pool;
   MemoryPool* _survivor_pool;
diff --git a/src/hotspot/share/gc/serial/serialVMOperations.cpp b/src/hotspot/share/gc/serial/serialVMOperations.cpp
index 445f5959fe0..ef9ce4e425d 100644
--- a/src/hotspot/share/gc/serial/serialVMOperations.cpp
+++ b/src/hotspot/share/gc/serial/serialVMOperations.cpp
@@ -30,14 +30,10 @@ void VM_SerialCollectForAllocation::doit() {
   GCCauseSetter gccs(gch, _gc_cause);
   _result = gch->satisfy_failed_allocation(_word_size, _tlab);
   assert(_result == nullptr || gch->is_in_reserved(_result), "result not in heap");
-
-  if (_result == nullptr && GCLocker::is_active_and_needs_gc()) {
-    set_gc_locked();
-  }
 }
 
 void VM_SerialGCCollect::doit() {
   SerialHeap* gch = SerialHeap::heap();
   GCCauseSetter gccs(gch, _gc_cause);
-  gch->try_collect_at_safepoint(_full);
+  gch->collect_at_safepoint(_full);
 }
diff --git a/src/hotspot/share/gc/serial/tenuredGeneration.cpp b/src/hotspot/share/gc/serial/tenuredGeneration.cpp
index c793f138de0..22c4808a0bd 100644
--- a/src/hotspot/share/gc/serial/tenuredGeneration.cpp
+++ b/src/hotspot/share/gc/serial/tenuredGeneration.cpp
@@ -100,9 +100,6 @@ bool TenuredGeneration::expand(size_t bytes, size_t expand_bytes) {
   if (!success) {
     success = grow_to_reserved();
   }
-  if (success && GCLocker::is_active_and_needs_gc()) {
-    log_trace(gc, heap)("Garbage collection disabled, expanded heap instead");
-  }
 
   return success;
 }
diff --git a/src/hotspot/share/gc/shared/collectedHeap.cpp b/src/hotspot/share/gc/shared/collectedHeap.cpp
index d78e1f0822e..fba95931703 100644
--- a/src/hotspot/share/gc/shared/collectedHeap.cpp
+++ b/src/hotspot/share/gc/shared/collectedHeap.cpp
@@ -29,7 +29,7 @@
 #include "gc/shared/barrierSet.hpp"
 #include "gc/shared/collectedHeap.hpp"
 #include "gc/shared/collectedHeap.inline.hpp"
-#include "gc/shared/gcLocker.inline.hpp"
+#include "gc/shared/gcLocker.hpp"
 #include "gc/shared/gcHeapSummary.hpp"
 #include "gc/shared/stringdedup/stringDedup.hpp"
 #include "gc/shared/gcTrace.hpp"
@@ -350,36 +350,10 @@ MetaWord* CollectedHeap::satisfy_failed_metadata_allocation(ClassLoaderData* loa
       return result;
     }
 
-    if (GCLocker::is_active_and_needs_gc()) {
-      // If the GCLocker is active, just expand and allocate.
-      // If that does not succeed, wait if this thread is not
-      // in a critical section itself.
-      result = loader_data->metaspace_non_null()->expand_and_allocate(word_size, mdtype);
-      if (result != nullptr) {
-        return result;
-      }
-      JavaThread* jthr = JavaThread::current();
-      if (!jthr->in_critical()) {
-        // Wait for JNI critical section to be exited
-        GCLocker::stall_until_clear();
-        // The GC invoked by the last thread leaving the critical
-        // section will be a young collection and a full collection
-        // is (currently) needed for unloading classes so continue
-        // to the next iteration to get a full GC.
-        continue;
-      } else {
-        if (CheckJNICalls) {
-          fatal("Possible deadlock due to allocating while"
-                " in jni critical section");
-        }
-        return nullptr;
-      }
-    }
-
     {  // Need lock to get self consistent gc_count's
       MutexLocker ml(Heap_lock);
-      gc_count      = Universe::heap()->total_collections();
-      full_gc_count = Universe::heap()->total_full_collections();
+      gc_count      = total_collections();
+      full_gc_count = total_full_collections();
     }
 
     // Generate a VM operation
@@ -389,13 +363,8 @@ MetaWord* CollectedHeap::satisfy_failed_metadata_allocation(ClassLoaderData* loa
                                        gc_count,
                                        full_gc_count,
                                        GCCause::_metadata_GC_threshold);
-    VMThread::execute(&op);
 
-    // If GC was locked out, try again. Check before checking success because the
-    // prologue could have succeeded and the GC still have been locked out.
-    if (op.gc_locked()) {
-      continue;
-    }
+    VMThread::execute(&op);
 
     if (op.prologue_succeeded()) {
       return op.result();
diff --git a/src/hotspot/share/gc/shared/gcCause.cpp b/src/hotspot/share/gc/shared/gcCause.cpp
index f972aeccbc4..51ce73861e0 100644
--- a/src/hotspot/share/gc/shared/gcCause.cpp
+++ b/src/hotspot/share/gc/shared/gcCause.cpp
@@ -41,9 +41,6 @@ const char* GCCause::to_string(GCCause::Cause cause) {
     case _jvmti_force_gc:
       return "JvmtiEnv ForceGarbageCollection";
 
-    case _gc_locker:
-      return "GCLocker Initiated GC";
-
     case _heap_inspection:
       return "Heap Inspection Initiated GC";
 
diff --git a/src/hotspot/share/gc/shared/gcCause.hpp b/src/hotspot/share/gc/shared/gcCause.hpp
index 347e32be86a..bd819e8f5c9 100644
--- a/src/hotspot/share/gc/shared/gcCause.hpp
+++ b/src/hotspot/share/gc/shared/gcCause.hpp
@@ -47,7 +47,6 @@ class GCCause : public AllStatic {
     _scavenge_alot,
     _allocation_profiler,
     _jvmti_force_gc,
-    _gc_locker,
     _heap_inspection,
     _heap_dump,
     _wb_young_gc,
diff --git a/src/hotspot/share/gc/shared/gcLocker.cpp b/src/hotspot/share/gc/shared/gcLocker.cpp
index 6344ba80d43..aa13209a37a 100644
--- a/src/hotspot/share/gc/shared/gcLocker.cpp
+++ b/src/hotspot/share/gc/shared/gcLocker.cpp
@@ -29,15 +29,13 @@
 #include "memory/universe.hpp"
 #include "logging/log.hpp"
 #include "runtime/atomic.hpp"
+#include "runtime/interfaceSupport.inline.hpp"
 #include "runtime/javaThread.inline.hpp"
 #include "runtime/safepoint.hpp"
+#include "utilities/spinYield.hpp"
 #include "runtime/threadSMR.hpp"
 #include "utilities/ticks.hpp"
 
-volatile jint GCLocker::_jni_lock_count = 0;
-volatile bool GCLocker::_needs_gc       = false;
-unsigned int GCLocker::_total_collections = 0;
-
 // GCLockerTimingDebugLogger tracks specific timing information for GC lock waits.
 class GCLockerTimingDebugLogger : public StackObj {
   const char* _log_message;
@@ -46,7 +44,9 @@ class GCLockerTimingDebugLogger : public StackObj {
 public:
   GCLockerTimingDebugLogger(const char* log_message) : _log_message(log_message) {
     assert(_log_message != nullptr, "GC locker debug message must be set.");
-    _start = Ticks::now();
+    if (log_is_enabled(Debug, gc, jni)) {
+      _start = Ticks::now();
+    }
   }
 
   ~GCLockerTimingDebugLogger() {
@@ -59,138 +59,89 @@ public:
   }
 };
 
-#ifdef ASSERT
-volatile jint GCLocker::_debug_jni_lock_count = 0;
-#endif
+Monitor* GCLocker::_lock;
+volatile bool GCLocker::_is_gc_request_pending;
 
+DEBUG_ONLY(uint64_t GCLocker::_verify_in_cr_count;)
+
+void GCLocker::initialize() {
+  assert(Heap_lock != nullptr, "inv");
+  _lock = Heap_lock;
+  _is_gc_request_pending = false;
+
+  DEBUG_ONLY(_verify_in_cr_count = 0;)
+}
+
+bool GCLocker::is_active() {
+  for (JavaThreadIteratorWithHandle jtiwh; JavaThread *cur = jtiwh.next(); /* empty */) {
+    if (cur->in_critical_atomic()) {
+      return true;
+    }
+  }
+  return false;
+}
+
+void GCLocker::block() {
+  assert(_lock->is_locked(), "precondition");
+  assert(Atomic::load(&_is_gc_request_pending) == false, "precondition");
+
+  GCLockerTimingDebugLogger logger("Thread blocked to start GC.");
+
+  Atomic::store(&_is_gc_request_pending, true);
+
+  // The _is_gc_request_pending and _jni_active_critical (inside
+  // in_critical_atomic()) variables form a Dekker duality. On the GC side, the
+  // _is_gc_request_pending is set and _jni_active_critical is subsequently
+  // loaded. For Java threads, the opposite is true, just like a Dekker lock.
+  // That's why there is a fence to order the accesses involved in the Dekker
+  // synchronization.
+  OrderAccess::fence();
+
+  JavaThread* java_thread = JavaThread::current();
+  ThreadBlockInVM tbivm(java_thread);
+
+  // Wait for threads leaving critical section
+  SpinYield spin_yield;
+  for (JavaThreadIteratorWithHandle jtiwh; JavaThread *cur = jtiwh.next(); /* empty */) {
+    while (cur->in_critical_atomic()) {
+      spin_yield.wait();
+    }
+  }
 
 #ifdef ASSERT
-void GCLocker::verify_critical_count() {
-  if (SafepointSynchronize::is_at_safepoint()) {
-    assert(!needs_gc() || _debug_jni_lock_count == _jni_lock_count, "must agree");
-    int count = 0;
-    // Count the number of threads with critical operations in progress
-    JavaThreadIteratorWithHandle jtiwh;
-    for (; JavaThread *thr = jtiwh.next(); ) {
-      if (thr->in_critical()) {
-        count++;
-      }
-    }
-    if (_jni_lock_count != count) {
-      log_error(gc, verify)("critical counts don't match: %d != %d", _jni_lock_count, count);
-      jtiwh.rewind();
-      for (; JavaThread *thr = jtiwh.next(); ) {
-        if (thr->in_critical()) {
-          log_error(gc, verify)(PTR_FORMAT " in_critical %d", p2i(thr), thr->in_critical());
-        }
-      }
-    }
-    assert(_jni_lock_count == count, "must be equal");
-  }
-}
-
-// In debug mode track the locking state at all times
-void GCLocker::increment_debug_jni_lock_count() {
-  assert(_debug_jni_lock_count >= 0, "bad value");
-  Atomic::inc(&_debug_jni_lock_count);
-}
-
-void GCLocker::decrement_debug_jni_lock_count() {
-  assert(_debug_jni_lock_count > 0, "bad value");
-  Atomic::dec(&_debug_jni_lock_count);
-}
+  // Matching the storestore in GCLocker::exit.
+  OrderAccess::loadload();
+  assert(Atomic::load(&_verify_in_cr_count) == 0, "inv");
 #endif
-
-void GCLocker::log_debug_jni(const char* msg) {
-  Log(gc, jni) log;
-  if (log.is_debug()) {
-    ResourceMark rm; // JavaThread::name() allocates to convert to UTF8
-    log.debug("%s Thread \"%s\" %d locked.", msg, Thread::current()->name(), _jni_lock_count);
-  }
 }
 
-bool GCLocker::is_at_safepoint() {
-  return SafepointSynchronize::is_at_safepoint();
+void GCLocker::unblock() {
+  assert(_lock->is_locked(), "precondition");
+  assert(Atomic::load(&_is_gc_request_pending) == true, "precondition");
+
+  Atomic::store(&_is_gc_request_pending, false);
 }
 
-bool GCLocker::check_active_before_gc() {
-  assert(SafepointSynchronize::is_at_safepoint(), "only read at safepoint");
-  if (is_active() && !_needs_gc) {
-    verify_critical_count();
-    _needs_gc = true;
-    GCLockerTracer::start_gc_locker(_jni_lock_count);
-    log_debug_jni("Setting _needs_gc.");
-  }
-  return is_active();
-}
+void GCLocker::enter_slow(JavaThread* current_thread) {
+  assert(current_thread == JavaThread::current(), "Must be this thread");
 
-void GCLocker::stall_until_clear() {
-  assert(!JavaThread::current()->in_critical(), "Would deadlock");
-  MonitorLocker ml(JNICritical_lock);
-
-  if (needs_gc()) {
-    GCLockerTracer::inc_stall_count();
-    log_debug_jni("Allocation failed. Thread stalled by JNI critical section.");
-    GCLockerTimingDebugLogger logger("Thread stalled by JNI critical section.");
-    // Wait for _needs_gc to be cleared
-    while (needs_gc()) {
-      ml.wait();
-    }
-  }
-}
-
-bool GCLocker::should_discard(GCCause::Cause cause, uint total_collections) {
-  return (cause == GCCause::_gc_locker) &&
-         (_total_collections != total_collections);
-}
-
-void GCLocker::jni_lock(JavaThread* thread) {
-  assert(!thread->in_critical(), "shouldn't currently be in a critical region");
-  MonitorLocker ml(JNICritical_lock);
-  // Block entering threads if there's a pending GC request.
-  if (needs_gc()) {
-    log_debug_jni("Blocking thread as there is a pending GC request");
-    GCLockerTimingDebugLogger logger("Thread blocked to enter critical region.");
-    while (needs_gc()) {
-      // There's at least one thread that has not left the critical region (CR)
-      // completely. When that last thread (no new threads can enter CR due to the
-      // blocking) exits CR, it calls `jni_unlock`, which sets `_needs_gc`
-      // to false and wakes up all blocked threads.
-      // We would like to assert #threads in CR to be > 0, `_jni_lock_count > 0`
-      // in the code, but it's too strong; it's possible that the last thread
-      // has called `jni_unlock`, but not yet finished the call, e.g. initiating
-      // a GCCause::_gc_locker GC.
-      ml.wait();
-    }
-  }
-  thread->enter_critical();
-  _jni_lock_count++;
-  increment_debug_jni_lock_count();
-}
-
-void GCLocker::jni_unlock(JavaThread* thread) {
-  assert(thread->in_last_critical(), "should be exiting critical region");
-  MutexLocker mu(JNICritical_lock);
-  _jni_lock_count--;
-  decrement_debug_jni_lock_count();
-  log_debug_jni("Thread exiting critical region.");
-  thread->exit_critical();
-  if (needs_gc() && !is_active_internal()) {
-    // We're the last thread out. Request a GC.
-    // Capture the current total collections, to allow detection of
-    // other collections that make this one unnecessary.  The value of
-    // total_collections() is only changed at a safepoint, so there
-    // must not be a safepoint between the lock becoming inactive and
-    // getting the count, else there may be unnecessary GCLocker GCs.
-    _total_collections = Universe::heap()->total_collections();
-    GCLockerTracer::report_gc_locker();
+  GCLockerTimingDebugLogger logger("Thread blocked to enter critical region.");
+  while (true) {
     {
-      // Must give up the lock while at a safepoint
-      MutexUnlocker munlock(JNICritical_lock);
-      log_debug_jni("Last thread exiting. Performing GC after exiting critical section.");
-      Universe::heap()->collect(GCCause::_gc_locker);
+      // There is a pending gc request and _lock is locked. Wait for the
+      // completion of a gc. It's enough to do an empty locker section.
+      MutexLocker locker(_lock);
     }
-    _needs_gc = false;
-    JNICritical_lock->notify_all();
+
+    current_thread->enter_critical();
+
+    // Same as fast path.
+    OrderAccess::fence();
+
+    if (!Atomic::load(&_is_gc_request_pending)) {
+      return;
+    }
+
+    current_thread->exit_critical();
   }
 }
diff --git a/src/hotspot/share/gc/shared/gcLocker.hpp b/src/hotspot/share/gc/shared/gcLocker.hpp
index e567d0c1f16..33d10f0eecd 100644
--- a/src/hotspot/share/gc/shared/gcLocker.hpp
+++ b/src/hotspot/share/gc/shared/gcLocker.hpp
@@ -27,126 +27,43 @@
 
 #include "gc/shared/gcCause.hpp"
 #include "memory/allStatic.hpp"
-#include "utilities/globalDefinitions.hpp"
-#include "utilities/macros.hpp"
+#include "runtime/mutex.hpp"
 
-class JavaThread;
-
-// The direct lock/unlock calls do not force a collection if an unlock
-// decrements the count to zero. Avoid calling these if at all possible.
+// GCLocker provides synchronization between the garbage collector (GC) and
+// threads using JNI critical APIs. When threads enter a critical region (CR),
+// certain GC implementations may suspend garbage collection until all such
+// threads have exited.
+//
+// Threads that need to trigger a GC should use the `block()` and `unblock()`
+// APIs. `block()` will block the caller and prevent new threads from entering
+// the CR.
+//
+// Threads entering or exiting a CR must call the `enter` and `exit` APIs to
+// ensure proper synchronization with the GC.
 
 class GCLocker: public AllStatic {
- private:
-  // The _jni_lock_count keeps track of the number of threads that are
-  // currently in a critical region.  It's only kept up to date when
-  // _needs_gc is true.  The current value is computed during
-  // safepointing and decremented during the slow path of GCLocker
-  // unlocking.
-  static volatile jint _jni_lock_count;  // number of jni active instances.
-  static volatile bool _needs_gc;        // heap is filling, we need a GC
-  static uint _total_collections;        // value for _gc_locker collection
+  static Monitor* _lock;
+  static volatile bool _is_gc_request_pending;
 
 #ifdef ASSERT
-  // This lock count is updated for all operations and is used to
-  // validate the jni_lock_count that is computed during safepoints.
-  static volatile jint _debug_jni_lock_count;
+  // Debug-only: to track the number of java threads in critical-region.
+  static uint64_t _verify_in_cr_count;
 #endif
+  static void enter_slow(JavaThread* current_thread);
 
-  // At a safepoint, visit all threads and count the number of active
-  // critical sections.  This is used to ensure that all active
-  // critical sections are exited before a new one is started.
-  static void verify_critical_count() NOT_DEBUG_RETURN;
+public:
+  static void initialize();
 
-  static void jni_lock(JavaThread* thread);
-  static void jni_unlock(JavaThread* thread);
+  // To query current GCLocker state. Can become outdated if called outside a safepoint.
+  static bool is_active();
 
-  static bool is_active_internal() {
-    verify_critical_count();
-    return _jni_lock_count > 0;
-  }
+  // For use by Java threads requesting GC.
+  static void block();
+  static void unblock();
 
-  static void log_debug_jni(const char* msg);
-
-  static bool is_at_safepoint();
-
- public:
-  // Accessors
-  static bool is_active() {
-    assert(GCLocker::is_at_safepoint(), "only read at safepoint");
-    return is_active_internal();
-  }
-  static bool needs_gc()       { return _needs_gc;                        }
-
-  // Shorthand
-  static bool is_active_and_needs_gc() {
-    // Use is_active_internal since _needs_gc can change from true to
-    // false outside of a safepoint, triggering the assert in
-    // is_active.
-    return needs_gc() && is_active_internal();
-  }
-
-  // In debug mode track the locking state at all times
-  static void increment_debug_jni_lock_count() NOT_DEBUG_RETURN;
-  static void decrement_debug_jni_lock_count() NOT_DEBUG_RETURN;
-
-  // Set the current lock count
-  static void set_jni_lock_count(int count) {
-    _jni_lock_count = count;
-    verify_critical_count();
-  }
-
-  // Sets _needs_gc if is_active() is true. Returns is_active().
-  static bool check_active_before_gc();
-
-  // Return true if the designated collection is a GCLocker request
-  // that should be discarded.  Returns true if cause == GCCause::_gc_locker
-  // and the given total collection value indicates a collection has been
-  // done since the GCLocker request was made.
-  static bool should_discard(GCCause::Cause cause, uint total_collections);
-
-  // Stalls the caller (who should not be in a jni critical section)
-  // until needs_gc() clears. Note however that needs_gc() may be
-  // set at a subsequent safepoint and/or cleared under the
-  // JNICritical_lock, so the caller may not safely assert upon
-  // return from this method that "!needs_gc()" since that is
-  // not a stable predicate.
-  static void stall_until_clear();
-
-  // The following two methods are used for JNI critical regions.
-  // If we find that we failed to perform a GC because the GCLocker
-  // was active, arrange for one as soon as possible by allowing
-  // all threads in critical regions to complete, but not allowing
-  // other critical regions to be entered. The reasons for that are:
-  // 1) a GC request won't be starved by overlapping JNI critical
-  //    region activities, which can cause unnecessary OutOfMemory errors.
-  // 2) even if allocation requests can still be satisfied before GC locker
-  //    becomes inactive, for example, in tenured generation possibly with
-  //    heap expansion, those allocations can trigger lots of safepointing
-  //    attempts (ineffective GC attempts) and require Heap_lock which
-  //    slow down allocations tremendously.
-  //
-  // Note that critical regions can be nested in a single thread, so
-  // we must allow threads already in critical regions to continue.
-  //
-  // JNI critical regions are the only participants in this scheme
-  // because they are, by spec, well bounded while in a critical region.
-  //
-  // Each of the following two method is split into a fast path and a
-  // slow path. JNICritical_lock is only grabbed in the slow path.
-  // _needs_gc is initially false and every java thread will go
-  // through the fast path, which simply increments or decrements the
-  // current thread's critical count.  When GC happens at a safepoint,
-  // GCLocker::is_active() is checked. Since there is no safepoint in
-  // the fast path of lock_critical() and unlock_critical(), there is
-  // no race condition between the fast path and GC. After _needs_gc
-  // is set at a safepoint, every thread will go through the slow path
-  // after the safepoint.  Since after a safepoint, each of the
-  // following two methods is either entered from the method entry and
-  // falls into the slow path, or is resumed from the safepoints in
-  // the method, which only exist in the slow path. So when _needs_gc
-  // is set, the slow path is always taken, till _needs_gc is cleared.
-  inline static void lock_critical(JavaThread* thread);
-  inline static void unlock_critical(JavaThread* thread);
+  // For use by Java threads entering/leaving critical-region.
+  inline static void enter(JavaThread* current_thread);
+  inline static void exit(JavaThread* current_thread);
 };
 
 #endif // SHARE_GC_SHARED_GCLOCKER_HPP
diff --git a/src/hotspot/share/gc/shared/gcLocker.inline.hpp b/src/hotspot/share/gc/shared/gcLocker.inline.hpp
index 82cc4bb5442..357b788ce52 100644
--- a/src/hotspot/share/gc/shared/gcLocker.inline.hpp
+++ b/src/hotspot/share/gc/shared/gcLocker.inline.hpp
@@ -29,30 +29,39 @@
 
 #include "runtime/javaThread.inline.hpp"
 
-void GCLocker::lock_critical(JavaThread* thread) {
-  if (!thread->in_critical()) {
-    if (needs_gc()) {
-      // jni_lock call calls enter_critical under the lock so that the
-      // global lock count and per thread count are in agreement.
-      jni_lock(thread);
-      return;
+void GCLocker::enter(JavaThread* current_thread) {
+  assert(current_thread == JavaThread::current(), "Must be this thread");
+
+  if (!current_thread->in_critical()) {
+    current_thread->enter_critical();
+
+    // Matching the fence in GCLocker::block.
+    OrderAccess::fence();
+
+    if (Atomic::load(&_is_gc_request_pending)) {
+      current_thread->exit_critical();
+      // slow-path
+      enter_slow(current_thread);
     }
-    increment_debug_jni_lock_count();
+
+    DEBUG_ONLY(Atomic::add(&_verify_in_cr_count, (uint64_t)1);)
+  } else {
+    current_thread->enter_critical();
   }
-  thread->enter_critical();
 }
 
-void GCLocker::unlock_critical(JavaThread* thread) {
-  if (thread->in_last_critical()) {
-    if (needs_gc()) {
-      // jni_unlock call calls exit_critical under the lock so that
-      // the global lock count and per thread count are in agreement.
-      jni_unlock(thread);
-      return;
-    }
-    decrement_debug_jni_lock_count();
+void GCLocker::exit(JavaThread* current_thread) {
+  assert(current_thread == JavaThread::current(), "Must be this thread");
+
+#ifdef ASSERT
+  if (current_thread->in_last_critical()) {
+    Atomic::add(&_verify_in_cr_count, (uint64_t)-1);
+    // Matching the loadload in GCLocker::block.
+    OrderAccess::storestore();
   }
-  thread->exit_critical();
+#endif
+
+  current_thread->exit_critical();
 }
 
 #endif // SHARE_GC_SHARED_GCLOCKER_INLINE_HPP
diff --git a/src/hotspot/share/gc/shared/gcTrace.hpp b/src/hotspot/share/gc/shared/gcTrace.hpp
index 9c747e139df..6a47e54090f 100644
--- a/src/hotspot/share/gc/shared/gcTrace.hpp
+++ b/src/hotspot/share/gc/shared/gcTrace.hpp
@@ -212,19 +212,4 @@ class DefNewTracer : public YoungGCTracer, public CHeapObj<mtGC> {
   DefNewTracer() : YoungGCTracer(DefNew) {}
 };
 
-class GCLockerTracer : public AllStatic {
-#if INCLUDE_JFR
-private:
-  static Ticks _needs_gc_start_timestamp;
-  static volatile jint _jni_lock_count;
-  static volatile jint _stall_count;
-#endif
-
-  static bool is_started() NOT_JFR_RETURN_(false);
-
-public:
-  static void start_gc_locker(jint jni_lock_count) NOT_JFR_RETURN();
-  static void inc_stall_count() NOT_JFR_RETURN();
-  static void report_gc_locker() NOT_JFR_RETURN();
-};
 #endif // SHARE_GC_SHARED_GCTRACE_HPP
diff --git a/src/hotspot/share/gc/shared/gcTraceSend.cpp b/src/hotspot/share/gc/shared/gcTraceSend.cpp
index 14e64e110b7..e244930079f 100644
--- a/src/hotspot/share/gc/shared/gcTraceSend.cpp
+++ b/src/hotspot/share/gc/shared/gcTraceSend.cpp
@@ -358,49 +358,3 @@ void GCTracer::send_phase_events(TimePartitions* time_partitions) const {
     phase->accept(&phase_reporter);
   }
 }
-
-#if INCLUDE_JFR
-Ticks GCLockerTracer::_needs_gc_start_timestamp;
-volatile jint GCLockerTracer::_jni_lock_count = 0;
-volatile jint GCLockerTracer::_stall_count = 0;
-
-bool GCLockerTracer::is_started() {
-  return _needs_gc_start_timestamp != Ticks();
-}
-
-void GCLockerTracer::start_gc_locker(const jint jni_lock_count) {
-  assert(SafepointSynchronize::is_at_safepoint(), "sanity");
-  assert(!is_started(), "sanity");
-  assert(_jni_lock_count == 0, "sanity");
-  assert(_stall_count == 0, "sanity");
-  if (EventGCLocker::is_enabled()) {
-    _needs_gc_start_timestamp.stamp();
-    _jni_lock_count = jni_lock_count;
-  }
-}
-
-void GCLockerTracer::inc_stall_count() {
-  if (is_started()) {
-    _stall_count++;
-  }
-}
-
-void GCLockerTracer::report_gc_locker() {
-  if (is_started()) {
-    EventGCLocker event(UNTIMED);
-    if (event.should_commit()) {
-      event.set_starttime(_needs_gc_start_timestamp);
-      event.set_endtime(_needs_gc_start_timestamp);
-      event.set_lockCount(_jni_lock_count);
-      event.set_stallCount(_stall_count);
-      event.commit();
-    }
-    // reset
-    _needs_gc_start_timestamp = Ticks();
-    _jni_lock_count = 0;
-    _stall_count = 0;
-
-    assert(!is_started(), "sanity");
-  }
-}
-#endif
diff --git a/src/hotspot/share/gc/shared/gcVMOperations.cpp b/src/hotspot/share/gc/shared/gcVMOperations.cpp
index 85c452a6f89..b28007962d3 100644
--- a/src/hotspot/share/gc/shared/gcVMOperations.cpp
+++ b/src/hotspot/share/gc/shared/gcVMOperations.cpp
@@ -85,19 +85,11 @@ void VM_GC_Operation::notify_gc_end() {
 
 // Allocations may fail in several threads at about the same time,
 // resulting in multiple gc requests.  We only want to do one of them.
-// In case a GC locker is active and the need for a GC is already signaled,
-// we want to skip this GC attempt altogether, without doing a futile
-// safepoint operation.
 bool VM_GC_Operation::skip_operation() const {
   bool skip = (_gc_count_before != Universe::heap()->total_collections());
   if (_full && skip) {
     skip = (_full_gc_count_before != Universe::heap()->total_full_collections());
   }
-  if (!skip && GCLocker::is_active_and_needs_gc()) {
-    skip = Universe::heap()->is_maximal_no_gc();
-    assert(!(skip && (_gc_cause == GCCause::_gc_locker)),
-           "GCLocker cannot be active when initiating GC");
-  }
   return skip;
 }
 
@@ -122,6 +114,9 @@ bool VM_GC_Operation::doit_prologue() {
     Heap_lock->unlock();
     _prologue_succeeded = false;
   } else {
+    if (UseSerialGC || UseParallelGC) {
+      GCLocker::block();
+    }
     _prologue_succeeded = true;
   }
   return _prologue_succeeded;
@@ -129,6 +124,9 @@ bool VM_GC_Operation::doit_prologue() {
 
 
 void VM_GC_Operation::doit_epilogue() {
+  if (UseSerialGC || UseParallelGC) {
+    GCLocker::unblock();
+  }
   // GC thread root traversal likely used OopMapCache a lot, which
   // might have created lots of old entries. Trigger the cleanup now.
   OopMapCache::try_trigger_cleanup();
@@ -259,10 +257,6 @@ void VM_CollectForMetadataAllocation::doit() {
   }
 
   log_debug(gc)("After Metaspace GC failed to allocate size %zu", _size);
-
-  if (GCLocker::is_active_and_needs_gc()) {
-    set_gc_locked();
-  }
 }
 
 VM_CollectForAllocation::VM_CollectForAllocation(size_t word_size, uint gc_count_before, GCCause::Cause cause)
diff --git a/src/hotspot/share/gc/shared/gcVMOperations.hpp b/src/hotspot/share/gc/shared/gcVMOperations.hpp
index e9281198fdf..5893986a70d 100644
--- a/src/hotspot/share/gc/shared/gcVMOperations.hpp
+++ b/src/hotspot/share/gc/shared/gcVMOperations.hpp
@@ -108,7 +108,6 @@ class VM_GC_Operation: public VM_GC_Sync_Operation {
   bool           _full;                    // whether a "full" collection
   bool           _prologue_succeeded;      // whether doit_prologue succeeded
   GCCause::Cause _gc_cause;                // the putative cause for this gc op
-  bool           _gc_locked;               // will be set if gc was locked
 
   virtual bool skip_operation() const;
 
@@ -123,8 +122,6 @@ class VM_GC_Operation: public VM_GC_Sync_Operation {
 
     _gc_cause           = _cause;
 
-    _gc_locked = false;
-
     _full_gc_count_before = full_gc_count_before;
     // In ParallelScavengeHeap::mem_allocate() collections can be
     // executed within a loop and _all_soft_refs_clear can be set
@@ -148,9 +145,6 @@ class VM_GC_Operation: public VM_GC_Sync_Operation {
   virtual bool allow_nested_vm_operations() const  { return true; }
   bool prologue_succeeded() const { return _prologue_succeeded; }
 
-  void set_gc_locked() { _gc_locked = true; }
-  bool gc_locked() const  { return _gc_locked; }
-
   static void notify_gc_begin(bool full = false);
   static void notify_gc_end();
 };
diff --git a/src/hotspot/share/gc/shared/gc_globals.hpp b/src/hotspot/share/gc/shared/gc_globals.hpp
index 9086c25ee48..ba29daf2fe1 100644
--- a/src/hotspot/share/gc/shared/gc_globals.hpp
+++ b/src/hotspot/share/gc/shared/gc_globals.hpp
@@ -155,11 +155,6 @@
           "A System.gc() request invokes a concurrent collection; "         \
           "(effective only when using concurrent collectors)")              \
                                                                             \
-  product(uintx, GCLockerRetryAllocationCount, 2, DIAGNOSTIC,               \
-          "Number of times to retry allocations when "                      \
-          "blocked by the GC locker")                                       \
-          range(0, max_uintx)                                               \
-                                                                            \
   product(uint, ParallelGCBufferWastePct, 10,                               \
           "Wasted fraction of parallel allocation buffer")                  \
           range(0, 100)                                                     \
diff --git a/src/hotspot/share/jfr/metadata/metadata.xml b/src/hotspot/share/jfr/metadata/metadata.xml
index a9eed63f9aa..a4b9bc78900 100644
--- a/src/hotspot/share/jfr/metadata/metadata.xml
+++ b/src/hotspot/share/jfr/metadata/metadata.xml
@@ -1241,11 +1241,6 @@
     <Field type="int" name="compression" label="Compression Level" description="Compression level of the dump, if larger than 0 we use gzip compression with this level" />
   </Event>
 
-  <Event name="GCLocker" category="Java Virtual Machine, GC, Detailed" label="GC Locker" startTime="true" thread="true" stackTrace="true">
-    <Field type="uint" name="lockCount" label="Lock Count" description="The number of Java threads in a critical section when the GC locker is started" />
-    <Field type="uint" name="stallCount" label="Stall Count" description="The number of Java threads stalled by the GC locker" />
-  </Event>
-
   <Event name="FinalizerStatistics" category="Java Application, Statistics" label="Finalizer Statistics" description="Per class statistics about finalizers" thread="false" startTime="false" period="endChunk">
     <Field type="Class" name="finalizableClass" label="Class Overriding Finalize" />
     <Field type="Symbol" name="codeSource" label="Code Source" description="URL from where the class was loaded" />
diff --git a/src/hotspot/share/prims/downcallLinker.cpp b/src/hotspot/share/prims/downcallLinker.cpp
index 3d9095f8e13..64861439817 100644
--- a/src/hotspot/share/prims/downcallLinker.cpp
+++ b/src/hotspot/share/prims/downcallLinker.cpp
@@ -22,7 +22,6 @@
  */
 
 #include "downcallLinker.hpp"
-#include "gc/shared/gcLocker.inline.hpp"
 #include "runtime/interfaceSupport.inline.hpp"
 
 #include <cerrno>
diff --git a/src/hotspot/share/prims/jni.cpp b/src/hotspot/share/prims/jni.cpp
index 6de84520278..517808a115f 100644
--- a/src/hotspot/share/prims/jni.cpp
+++ b/src/hotspot/share/prims/jni.cpp
@@ -40,7 +40,6 @@
 #include "classfile/vmSymbols.hpp"
 #include "compiler/compiler_globals.hpp"
 #include "gc/shared/collectedHeap.hpp"
-#include "gc/shared/gcLocker.inline.hpp"
 #include "gc/shared/stringdedup/stringDedup.hpp"
 #include "interpreter/linkResolver.hpp"
 #include "jni.h"
diff --git a/src/hotspot/share/prims/whitebox.cpp b/src/hotspot/share/prims/whitebox.cpp
index a612a3d55a9..dd5a23f9209 100644
--- a/src/hotspot/share/prims/whitebox.cpp
+++ b/src/hotspot/share/prims/whitebox.cpp
@@ -45,7 +45,6 @@
 #include "compiler/methodMatcher.hpp"
 #include "gc/shared/concurrentGCBreakpoints.hpp"
 #include "gc/shared/gcConfig.hpp"
-#include "gc/shared/gcLocker.inline.hpp"
 #include "gc/shared/genArguments.hpp"
 #include "jvm.h"
 #include "jvmtifiles/jvmtiEnv.hpp"
@@ -2649,14 +2648,6 @@ WB_ENTRY(jstring, WB_GetLibcName(JNIEnv* env, jobject o))
   return info_string;
 WB_END
 
-WB_ENTRY(void, WB_LockCritical(JNIEnv* env, jobject wb))
-  GCLocker::lock_critical(thread);
-WB_END
-
-WB_ENTRY(void, WB_UnlockCritical(JNIEnv* env, jobject wb))
-  GCLocker::unlock_critical(thread);
-WB_END
-
 WB_ENTRY(void, WB_PinObject(JNIEnv* env, jobject wb, jobject o))
 #if INCLUDE_G1GC
   if (!UseG1GC) {
@@ -2997,8 +2988,6 @@ static JNINativeMethod methods[] = {
   {CC"waitUnsafe", CC"(I)V",                          (void*)&WB_WaitUnsafe},
   {CC"getLibcName",     CC"()Ljava/lang/String;",     (void*)&WB_GetLibcName},
 
-  {CC"lockCritical",    CC"()V",                      (void*)&WB_LockCritical},
-  {CC"unlockCritical",  CC"()V",                      (void*)&WB_UnlockCritical},
   {CC"pinObject",       CC"(Ljava/lang/Object;)V",    (void*)&WB_PinObject},
   {CC"unpinObject",     CC"(Ljava/lang/Object;)V",    (void*)&WB_UnpinObject},
   {CC"setVirtualThreadsNotifyJvmtiMode", CC"(Z)Z",    (void*)&WB_SetVirtualThreadsNotifyJvmtiMode},
diff --git a/src/hotspot/share/runtime/javaThread.hpp b/src/hotspot/share/runtime/javaThread.hpp
index 9ae8ae151e7..06dd6d31ea9 100644
--- a/src/hotspot/share/runtime/javaThread.hpp
+++ b/src/hotspot/share/runtime/javaThread.hpp
@@ -935,6 +935,9 @@ private:
     assert(_jni_active_critical >= 0, "JNI critical nesting problem?");
   }
 
+  // Atomic version; invoked by a thread other than the owning thread.
+  bool in_critical_atomic() { return Atomic::load(&_jni_active_critical) > 0; }
+
   // Checked JNI: is the programmer required to check for exceptions, if so specify
   // which function name. Returning to a Java frame should implicitly clear the
   // pending check, this is done for Native->Java transitions (i.e. user JNI code).
diff --git a/src/hotspot/share/runtime/mutexLocker.cpp b/src/hotspot/share/runtime/mutexLocker.cpp
index 0586009f3b8..2733cbcb14c 100644
--- a/src/hotspot/share/runtime/mutexLocker.cpp
+++ b/src/hotspot/share/runtime/mutexLocker.cpp
@@ -46,7 +46,6 @@ Mutex*   CompiledIC_lock              = nullptr;
 Mutex*   VMStatistic_lock             = nullptr;
 Mutex*   JmethodIdCreation_lock       = nullptr;
 Mutex*   JfieldIdCreation_lock        = nullptr;
-Monitor* JNICritical_lock             = nullptr;
 Mutex*   JvmtiThreadState_lock        = nullptr;
 Monitor* EscapeBarrier_lock           = nullptr;
 Monitor* JvmtiVTMSTransition_lock     = nullptr;
@@ -339,7 +338,6 @@ void mutex_init() {
 #endif
   MUTEX_DEFL(Module_lock                    , PaddedMutex  ,  ClassLoaderDataGraph_lock);
   MUTEX_DEFL(SystemDictionary_lock          , PaddedMonitor, Module_lock);
-  MUTEX_DEFL(JNICritical_lock               , PaddedMonitor, AdapterHandlerLibrary_lock); // used for JNI critical regions
 #if INCLUDE_JVMCI
   // JVMCIRuntime_lock must be acquired before JVMCI_lock to avoid deadlock
   MUTEX_DEFL(JVMCI_lock                     , PaddedMonitor, JVMCIRuntime_lock);
diff --git a/src/hotspot/share/runtime/mutexLocker.hpp b/src/hotspot/share/runtime/mutexLocker.hpp
index 598612df8f1..aa8850b8b63 100644
--- a/src/hotspot/share/runtime/mutexLocker.hpp
+++ b/src/hotspot/share/runtime/mutexLocker.hpp
@@ -44,7 +44,6 @@ extern Mutex*   CompiledIC_lock;                 // a lock used to guard compile
 extern Mutex*   VMStatistic_lock;                // a lock used to guard statistics count increment
 extern Mutex*   JmethodIdCreation_lock;          // a lock on creating JNI method identifiers
 extern Mutex*   JfieldIdCreation_lock;           // a lock on creating JNI static field identifiers
-extern Monitor* JNICritical_lock;                // a lock used while entering and exiting JNI critical regions, allows GC to sometimes get in
 extern Mutex*   JvmtiThreadState_lock;           // a lock on modification of JVMTI thread data
 extern Monitor* EscapeBarrier_lock;              // a lock to sync reallocating and relocking objects because of JVMTI access
 extern Monitor* JvmtiVTMSTransition_lock;        // a lock for Virtual Thread Mount State transition (VTMS transition) management
diff --git a/src/hotspot/share/runtime/safepoint.cpp b/src/hotspot/share/runtime/safepoint.cpp
index 495921877d8..e6f3b84945b 100644
--- a/src/hotspot/share/runtime/safepoint.cpp
+++ b/src/hotspot/share/runtime/safepoint.cpp
@@ -408,9 +408,6 @@ void SafepointSynchronize::begin() {
   }
 #endif // ASSERT
 
-  // Update the count of active JNI critical regions
-  GCLocker::set_jni_lock_count(_current_jni_active_count);
-
   post_safepoint_synchronize_event(sync_event,
                                    _safepoint_id,
                                    initial_running,
diff --git a/src/hotspot/share/runtime/sharedRuntime.cpp b/src/hotspot/share/runtime/sharedRuntime.cpp
index 53bff3bc7ad..2f29ce9b1fc 100644
--- a/src/hotspot/share/runtime/sharedRuntime.cpp
+++ b/src/hotspot/share/runtime/sharedRuntime.cpp
@@ -37,7 +37,6 @@
 #include "compiler/disassembler.hpp"
 #include "gc/shared/barrierSet.hpp"
 #include "gc/shared/collectedHeap.hpp"
-#include "gc/shared/gcLocker.inline.hpp"
 #include "interpreter/interpreter.hpp"
 #include "interpreter/interpreterRuntime.hpp"
 #include "jvm.h"
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/shared/GCCause.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/shared/GCCause.java
index b301f774390..20fbb2128f0 100644
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/shared/GCCause.java
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/shared/GCCause.java
@@ -32,7 +32,6 @@ public enum GCCause {
   _scavenge_alot ("ScavengeAlot"),
   _allocation_profiler ("Allocation Profiler"),
   _jvmti_force_gc ("JvmtiEnv ForceGarbageCollection"),
-  _gc_locker ("GCLocker Initiated GC"),
   _heap_inspection ("Heap Inspection Initiated GC"),
   _heap_dump ("Heap Dump Initiated GC"),
   _wb_young_gc ("WhiteBox Initiated Young GC"),
diff --git a/src/jdk.jfr/share/conf/jfr/default.jfc b/src/jdk.jfr/share/conf/jfr/default.jfc
index 57016a9bdd0..231ecc494a9 100644
--- a/src/jdk.jfr/share/conf/jfr/default.jfc
+++ b/src/jdk.jfr/share/conf/jfr/default.jfc
@@ -898,12 +898,6 @@
       <setting name="period">5 s</setting>
     </event>
 
-    <event name="jdk.GCLocker">
-      <setting name="enabled">true</setting>
-      <setting name="threshold">1 s</setting>
-      <setting name="stackTrace">true</setting>
-    </event>
-
     <event name="jdk.FinalizerStatistics">
       <setting name="enabled">true</setting>
       <setting name="period">endChunk</setting>
diff --git a/src/jdk.jfr/share/conf/jfr/profile.jfc b/src/jdk.jfr/share/conf/jfr/profile.jfc
index 1df3af7475f..e7996689354 100644
--- a/src/jdk.jfr/share/conf/jfr/profile.jfc
+++ b/src/jdk.jfr/share/conf/jfr/profile.jfc
@@ -898,12 +898,6 @@
       <setting name="period">5 s</setting>
     </event>
 
-    <event name="jdk.GCLocker">
-      <setting name="enabled">true</setting>
-      <setting name="threshold">100 ms</setting>
-      <setting name="stackTrace">true</setting>
-    </event>
-
     <event name="jdk.FinalizerStatistics">
       <setting name="enabled">true</setting>
       <setting name="period">endChunk</setting>
diff --git a/test/hotspot/jtreg/ProblemList.txt b/test/hotspot/jtreg/ProblemList.txt
index e8656a74f4b..f9ad5dbd1de 100644
--- a/test/hotspot/jtreg/ProblemList.txt
+++ b/test/hotspot/jtreg/ProblemList.txt
@@ -96,7 +96,6 @@ gc/TestAlwaysPreTouchBehavior.java#Shenandoah 8334513 generic-all
 gc/TestAlwaysPreTouchBehavior.java#G1 8334513 generic-all
 gc/TestAlwaysPreTouchBehavior.java#Z 8334513 generic-all
 gc/TestAlwaysPreTouchBehavior.java#Epsilon 8334513 generic-all
-gc/stress/gclocker/TestExcessGCLockerCollections.java 8229120 generic-all
 gc/shenandoah/oom/TestAllocOutOfMemory.java#large 8344312 linux-ppc64le
 gc/shenandoah/TestEvilSyncBug.java#generational 8345501 generic-all
 
@@ -170,8 +169,6 @@ vmTestbase/nsk/jvmti/AttachOnDemand/attach045/TestDescription.java 8202971 gener
 vmTestbase/nsk/jvmti/scenarios/capability/CM03/cm03t001/TestDescription.java 8073470 linux-all
 vmTestbase/nsk/jvmti/InterruptThread/intrpthrd003/TestDescription.java 8288911 macosx-all
 
-vmTestbase/gc/lock/jni/jnilock002/TestDescription.java 8192647 generic-all
-
 vmTestbase/jit/escape/LockCoarsening/LockCoarsening001.java 8148743 generic-all
 vmTestbase/jit/escape/LockCoarsening/LockCoarsening002.java 8208259 generic-all
 
diff --git a/test/hotspot/jtreg/gc/stress/gclocker/TestExcessGCLockerCollections.java b/test/hotspot/jtreg/gc/stress/gclocker/TestExcessGCLockerCollections.java
deleted file mode 100644
index 4560d9477c1..00000000000
--- a/test/hotspot/jtreg/gc/stress/gclocker/TestExcessGCLockerCollections.java
+++ /dev/null
@@ -1,180 +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.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package gc.stress.gclocker;
-
-/*
- * @test TestExcessGCLockerCollections
- * @bug 8048556
- * @summary Check for GC Locker initiated GCs that immediately follow another
- * GC and so have very little needing to be collected.
- * @requires vm.gc != "Z"
- * @requires vm.gc != "Epsilon"
- * @requires vm.gc != "Shenandoah"
- * @requires vm.gc != "G1"
- * @requires vm.gc != null
- * @library /test/lib
- * @modules java.base/jdk.internal.misc
- * @run driver/timeout=1000 gc.stress.gclocker.TestExcessGCLockerCollections 300 4 2
- */
-
-import java.util.HashMap;
-import java.util.Map;
-
-import java.util.zip.Deflater;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-
-import jdk.test.lib.process.ProcessTools;
-import jdk.test.lib.process.OutputAnalyzer;
-
-class TestExcessGCLockerCollectionsAux {
-    static private final int LARGE_MAP_SIZE = 64 * 1024;
-
-    static private final int MAP_ARRAY_LENGTH = 4;
-    static private final int MAP_SIZE = 1024;
-
-    static private final int BYTE_ARRAY_LENGTH = 128 * 1024;
-
-    static private void println(String str) { System.out.println(str); }
-
-    static private volatile boolean keepRunning = true;
-
-    static Map<Integer,String> populateMap(int size) {
-        Map<Integer,String> map = new HashMap<Integer,String>();
-        for (int i = 0; i < size; i += 1) {
-            Integer keyInt = Integer.valueOf(i);
-            String valStr = "value is [" + i + "]";
-            map.put(keyInt,valStr);
-        }
-        return map;
-    }
-
-    static private class AllocatingWorker implements Runnable {
-        private final Object[] array = new Object[MAP_ARRAY_LENGTH];
-        private int arrayIndex = 0;
-
-        private void doStep() {
-            Map<Integer,String> map = populateMap(MAP_SIZE);
-            array[arrayIndex] = map;
-            arrayIndex = (arrayIndex + 1) % MAP_ARRAY_LENGTH;
-        }
-
-        public void run() {
-            while (keepRunning) {
-                doStep();
-            }
-        }
-    }
-
-    static private class JNICriticalWorker implements Runnable {
-        private int count;
-
-        private void doStep() {
-            byte[] inputArray = new byte[BYTE_ARRAY_LENGTH];
-            for (int i = 0; i < inputArray.length; i += 1) {
-                inputArray[i] = (byte) (count + i);
-            }
-
-            Deflater deflater = new Deflater();
-            deflater.setInput(inputArray);
-            deflater.finish();
-
-            byte[] outputArray = new byte[2 * inputArray.length];
-            deflater.deflate(outputArray);
-
-            count += 1;
-        }
-
-        public void run() {
-            while (keepRunning) {
-                doStep();
-            }
-        }
-    }
-
-    static public Map<Integer,String> largeMap;
-
-    static public void main(String args[]) {
-        long durationSec = Long.parseLong(args[0]);
-        int allocThreadNum = Integer.parseInt(args[1]);
-        int jniCriticalThreadNum = Integer.parseInt(args[2]);
-
-        println("Running for " + durationSec + " secs");
-
-        largeMap = populateMap(LARGE_MAP_SIZE);
-
-        println("Starting " + allocThreadNum + " allocating threads");
-        for (int i = 0; i < allocThreadNum; i += 1) {
-            new Thread(new AllocatingWorker()).start();
-        }
-
-        println("Starting " + jniCriticalThreadNum + " jni critical threads");
-        for (int i = 0; i < jniCriticalThreadNum; i += 1) {
-            new Thread(new JNICriticalWorker()).start();
-        }
-
-        try {
-            Thread.sleep(durationSec * 1000L);
-        } catch (InterruptedException e) {
-            throw new RuntimeException("Test Failure, did not expect an InterruptedException", e);
-        }
-
-        println("Done.");
-        keepRunning = false;
-    }
-}
-
-public class TestExcessGCLockerCollections {
-    private static final String locker =
-        "\\[gc\\s*\\] .* \\(GCLocker Initiated GC\\)";
-    private static final String ANY_LOCKER = locker + " [1-9][0-9]*M";
-    private static final String BAD_LOCKER = locker + " [1-9][0-9]?M";
-
-    private static final String[] COMMON_OPTIONS = new String[] {
-        "-Xmx1G", "-Xms1G", "-Xmn256M", "-Xlog:gc,gc+ergo*=debug,gc+ergo+cset=trace:x.log", "-XX:+UnlockDiagnosticVMOptions", "-XX:+VerifyAfterGC"};
-
-    public static void main(String args[]) throws Exception {
-        if (args.length < 3) {
-            System.out.println("usage: TestExcessGCLockerCollectionsAux" +
-                               " <duration sec> <alloc threads>" +
-                               " <jni critical threads>");
-            throw new RuntimeException("Invalid arguments");
-        }
-
-        ArrayList<String> finalArgs = new ArrayList<String>();
-        finalArgs.addAll(Arrays.asList(COMMON_OPTIONS));
-        finalArgs.add(TestExcessGCLockerCollectionsAux.class.getName());
-        finalArgs.addAll(Arrays.asList(args));
-
-        // GC and other options obtained from test framework.
-        OutputAnalyzer output = ProcessTools.executeTestJava(finalArgs);
-        output.shouldHaveExitValue(0);
-        //System.out.println("------------- begin stdout ----------------");
-        //System.out.println(output.getStdout());
-        //System.out.println("------------- end stdout ----------------");
-        output.stdoutShouldMatch(ANY_LOCKER);
-        output.stdoutShouldNotMatch(BAD_LOCKER);
-    }
-}
diff --git a/test/jdk/jdk/jfr/event/gc/collection/TestGCCauseWithParallelOld.java b/test/jdk/jdk/jfr/event/gc/collection/TestGCCauseWithParallelOld.java
index 785d761f4ee..0e27caf610d 100644
--- a/test/jdk/jdk/jfr/event/gc/collection/TestGCCauseWithParallelOld.java
+++ b/test/jdk/jdk/jfr/event/gc/collection/TestGCCauseWithParallelOld.java
@@ -39,8 +39,7 @@ public class TestGCCauseWithParallelOld {
         String testID = "ParallelOld";
         String[] vmFlags = {"-XX:+UseParallelGC"};
         String[] gcNames = {GCHelper.gcParallelScavenge, GCHelper.gcParallelOld};
-        String[] gcCauses = {"Allocation Failure", "System.gc()", "GCLocker Initiated GC",
-                             "CodeCache GC Threshold"};
+        String[] gcCauses = {"Allocation Failure", "System.gc()", "CodeCache GC Threshold"};
         GCGarbageCollectionUtil.test(testID, vmFlags, gcNames, gcCauses);
     }
 }
diff --git a/test/jdk/jdk/jfr/event/gc/collection/TestGCCauseWithSerial.java b/test/jdk/jdk/jfr/event/gc/collection/TestGCCauseWithSerial.java
index f8f95070c1c..7701fd36853 100644
--- a/test/jdk/jdk/jfr/event/gc/collection/TestGCCauseWithSerial.java
+++ b/test/jdk/jdk/jfr/event/gc/collection/TestGCCauseWithSerial.java
@@ -39,8 +39,7 @@ public class TestGCCauseWithSerial {
         String testID = "Serial";
         String[] vmFlags = {"-XX:+UseSerialGC"};
         String[] gcNames = {GCHelper.gcDefNew, GCHelper.gcSerialOld};
-        String[] gcCauses = {"Allocation Failure", "System.gc()", "GCLocker Initiated GC",
-                             "CodeCache GC Threshold"};
+        String[] gcCauses = {"Allocation Failure", "System.gc()", "CodeCache GC Threshold"};
         GCGarbageCollectionUtil.test(testID, vmFlags, gcNames, gcCauses);
     }
 }
diff --git a/test/jdk/jdk/jfr/event/gc/detailed/TestGCLockerEvent.java b/test/jdk/jdk/jfr/event/gc/detailed/TestGCLockerEvent.java
deleted file mode 100644
index 1ad0fbd86b8..00000000000
--- a/test/jdk/jdk/jfr/event/gc/detailed/TestGCLockerEvent.java
+++ /dev/null
@@ -1,133 +0,0 @@
-/*
- * Copyright (c) 2021, Alibaba Group Holding Limited. All Rights Reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- *
- */
-
-/**
- * @test TestGCLockerEvent
- * @requires vm.flagless
- * @requires vm.hasJFR
- * @requires vm.gc.Serial | vm.gc.Parallel
- * @requires vm.gc != null
- * @library /test/lib
- * @build jdk.test.whitebox.WhiteBox
- * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox
- * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xmx32m -Xms32m -Xmn12m jdk.jfr.event.gc.detailed.TestGCLockerEvent
- */
-
-package jdk.jfr.event.gc.detailed;
-
-import static jdk.test.lib.Asserts.assertTrue;
-
-import java.util.concurrent.CountDownLatch;
-
-import jdk.jfr.Recording;
-import jdk.jfr.consumer.RecordedEvent;
-import jdk.test.lib.jfr.EventNames;
-import jdk.test.lib.jfr.Events;
-
-import jdk.test.whitebox.WhiteBox;
-
-public class TestGCLockerEvent {
-
-    private static final String EVENT_NAME = EventNames.GCLocker;
-
-    private static final int CRITICAL_THREAD_COUNT = 4;
-
-    private static final CountDownLatch LOCK_COUNT_SIGNAL = new CountDownLatch(CRITICAL_THREAD_COUNT);
-
-    private static final CountDownLatch UNLOCK_SIGNAL = new CountDownLatch(1);
-
-    private static final CountDownLatch UNLOCK_COUNT_SIGNAL = new CountDownLatch(CRITICAL_THREAD_COUNT);
-
-    private static final String CRITICAL_THREAD_NAME_PREFIX = "Critical Thread ";
-
-    private static final int STALL_THREAD_COUNT = 8;
-
-    private static final CountDownLatch STALL_COUNT_SIGNAL = new CountDownLatch(STALL_THREAD_COUNT);
-
-    private static final int LOOP = 32;
-
-    private static final int M = 1024 * 1024;
-
-    public static void main(String[] args) throws Exception {
-        var recording = new Recording();
-        recording.enable(EVENT_NAME);
-        recording.start();
-
-        startCriticalThreads();
-        LOCK_COUNT_SIGNAL.await();
-        startStallThreads();
-        STALL_COUNT_SIGNAL.await();
-
-        // Wait threads to be stalled
-        Thread.sleep(1500);
-
-        UNLOCK_SIGNAL.countDown();
-        UNLOCK_COUNT_SIGNAL.await();
-        recording.stop();
-
-        // Verify recording
-        var all = Events.fromRecording(recording);
-        Events.hasEvents(all);
-        var event = all.getFirst();
-
-        assertTrue(Events.isEventType(event, EVENT_NAME));
-        Events.assertField(event, "lockCount").equal(CRITICAL_THREAD_COUNT);
-        Events.assertField(event, "stallCount").atLeast(STALL_THREAD_COUNT);
-        assertTrue(event.getThread().getJavaName().startsWith(CRITICAL_THREAD_NAME_PREFIX));
-
-        recording.close();
-    }
-
-    private static void startCriticalThreads() {
-        for (var i = 0; i < CRITICAL_THREAD_COUNT; i++) {
-            new Thread(() -> {
-                try {
-                    WhiteBox.getWhiteBox().lockCritical();
-                    LOCK_COUNT_SIGNAL.countDown();
-
-                    UNLOCK_SIGNAL.await();
-                    WhiteBox.getWhiteBox().unlockCritical();
-                    UNLOCK_COUNT_SIGNAL.countDown();
-                } catch (InterruptedException ex) {
-                }
-            }, CRITICAL_THREAD_NAME_PREFIX + i).start();
-        }
-    }
-
-    private static void startStallThreads() {
-        var ts = new Thread[STALL_THREAD_COUNT];
-        for (var i = 0; i < STALL_THREAD_COUNT; i++) {
-            ts[i] = new Thread(() -> {
-                STALL_COUNT_SIGNAL.countDown();
-                for (int j = 0; j < LOOP; j++) {
-                    byte[] bytes = new byte[M];
-                }
-            });
-        }
-        for (Thread t : ts) {
-            t.start();
-        }
-    }
-}
-
diff --git a/test/lib/jdk/test/lib/jfr/EventNames.java b/test/lib/jdk/test/lib/jfr/EventNames.java
index 77fe554c9ba..0ef1b5e6d3f 100644
--- a/test/lib/jdk/test/lib/jfr/EventNames.java
+++ b/test/lib/jdk/test/lib/jfr/EventNames.java
@@ -151,7 +151,6 @@ public class EventNames {
     public static final String ZRelocationSetGroup = PREFIX + "ZRelocationSetGroup";
     public static final String ZUncommit = PREFIX + "ZUncommit";
     public static final String ZUnmap = PREFIX + "ZUnmap";
-    public static final String GCLocker = PREFIX + "GCLocker";
     public static final String SystemGC = PREFIX + "SystemGC";
     public static final String GCCPUTime = PREFIX + "GCCPUTime";
 
diff --git a/test/lib/jdk/test/whitebox/WhiteBox.java b/test/lib/jdk/test/whitebox/WhiteBox.java
index 7222c6fedcf..be9bc646ce4 100644
--- a/test/lib/jdk/test/whitebox/WhiteBox.java
+++ b/test/lib/jdk/test/whitebox/WhiteBox.java
@@ -786,10 +786,6 @@ public class WhiteBox {
 
   public native void waitUnsafe(int time_ms);
 
-  public native void lockCritical();
-
-  public native void unlockCritical();
-
   public native void pinObject(Object o);
 
   public native void unpinObject(Object o);

From c413549eb775f4209416c718dc9aa0748144a6b4 Mon Sep 17 00:00:00 2001
From: Coleen Phillimore <coleenp@openjdk.org>
Date: Tue, 25 Feb 2025 12:35:54 +0000
Subject: [PATCH 109/587] 8349860: Make Class.isArray(), Class.isInterface()
 and Class.isPrimitive() non-native

Reviewed-by: dlong, rriggs, vlivanov, yzheng, liach
---
 src/hotspot/share/c1/c1_Canonicalizer.cpp     | 11 -----
 src/hotspot/share/c1/c1_Compiler.cpp          |  1 -
 src/hotspot/share/c1/c1_LIRGenerator.cpp      | 20 ---------
 src/hotspot/share/c1/c1_LIRGenerator.hpp      |  1 -
 src/hotspot/share/classfile/javaClasses.cpp   | 31 ++++++++-----
 src/hotspot/share/classfile/javaClasses.hpp   |  4 +-
 .../share/classfile/javaClasses.inline.hpp    |  8 ++--
 src/hotspot/share/classfile/vmIntrinsics.cpp  |  3 --
 src/hotspot/share/classfile/vmIntrinsics.hpp  |  6 ---
 src/hotspot/share/include/jvm.h               | 12 -----
 src/hotspot/share/opto/c2compiler.cpp         |  3 --
 src/hotspot/share/opto/library_call.cpp       | 36 ---------------
 src/hotspot/share/prims/jvm.cpp               | 44 +++++++------------
 .../share/classes/java/lang/Class.java        | 33 +++++++-------
 .../jdk/internal/reflect/Reflection.java      |  2 +-
 src/java.base/share/native/libjava/Class.c    |  3 --
 .../ci/runtime/test/TestResolvedJavaType.java | 10 +++--
 .../ModuleSetAccessibleTest.java              |  2 +-
 .../TrySetAccessibleTest.java                 |  2 +-
 .../reflect/Reflection/Filtering.java         |  1 +
 20 files changed, 74 insertions(+), 159 deletions(-)

diff --git a/src/hotspot/share/c1/c1_Canonicalizer.cpp b/src/hotspot/share/c1/c1_Canonicalizer.cpp
index 15b21029b68..f5a1d14e694 100644
--- a/src/hotspot/share/c1/c1_Canonicalizer.cpp
+++ b/src/hotspot/share/c1/c1_Canonicalizer.cpp
@@ -536,17 +536,6 @@ void Canonicalizer::do_Intrinsic      (Intrinsic*       x) {
     }
     break;
   }
-  case vmIntrinsics::_isPrimitive        : {
-    assert(x->number_of_arguments() == 1, "wrong type");
-
-    // Class.isPrimitive is known on constant classes:
-    InstanceConstant* c = x->argument_at(0)->type()->as_InstanceConstant();
-    if (c != nullptr && !c->value()->is_null_object()) {
-      ciType* t = c->value()->java_mirror_type();
-      set_constant(t->is_primitive_type());
-    }
-    break;
-  }
   default:
     break;
   }
diff --git a/src/hotspot/share/c1/c1_Compiler.cpp b/src/hotspot/share/c1/c1_Compiler.cpp
index a26320589c4..eb7c42e4576 100644
--- a/src/hotspot/share/c1/c1_Compiler.cpp
+++ b/src/hotspot/share/c1/c1_Compiler.cpp
@@ -155,7 +155,6 @@ bool Compiler::is_intrinsic_supported(vmIntrinsics::ID id) {
   case vmIntrinsics::_longBitsToDouble:
   case vmIntrinsics::_getClass:
   case vmIntrinsics::_isInstance:
-  case vmIntrinsics::_isPrimitive:
   case vmIntrinsics::_currentCarrierThread:
   case vmIntrinsics::_currentThread:
   case vmIntrinsics::_scopedValueCache:
diff --git a/src/hotspot/share/c1/c1_LIRGenerator.cpp b/src/hotspot/share/c1/c1_LIRGenerator.cpp
index 325b8d193ea..959e49749c5 100644
--- a/src/hotspot/share/c1/c1_LIRGenerator.cpp
+++ b/src/hotspot/share/c1/c1_LIRGenerator.cpp
@@ -1278,25 +1278,6 @@ void LIRGenerator::do_getClass(Intrinsic* x) {
               LIR_OprFact::address(new LIR_Address(temp, T_OBJECT)), result);
 }
 
-// java.lang.Class::isPrimitive()
-void LIRGenerator::do_isPrimitive(Intrinsic* x) {
-  assert(x->number_of_arguments() == 1, "wrong type");
-
-  LIRItem rcvr(x->argument_at(0), this);
-  rcvr.load_item();
-  LIR_Opr temp = new_register(T_METADATA);
-  LIR_Opr result = rlock_result(x);
-
-  CodeEmitInfo* info = nullptr;
-  if (x->needs_null_check()) {
-    info = state_for(x);
-  }
-
-  __ move(new LIR_Address(rcvr.result(), java_lang_Class::klass_offset(), T_ADDRESS), temp, info);
-  __ cmp(lir_cond_notEqual, temp, LIR_OprFact::metadataConst(nullptr));
-  __ cmove(lir_cond_notEqual, LIR_OprFact::intConst(0), LIR_OprFact::intConst(1), result, T_BOOLEAN);
-}
-
 void LIRGenerator::do_getObjectSize(Intrinsic* x) {
   assert(x->number_of_arguments() == 3, "wrong type");
   LIR_Opr result_reg = rlock_result(x);
@@ -2914,7 +2895,6 @@ void LIRGenerator::do_Intrinsic(Intrinsic* x) {
 
   case vmIntrinsics::_Object_init:    do_RegisterFinalizer(x); break;
   case vmIntrinsics::_isInstance:     do_isInstance(x);    break;
-  case vmIntrinsics::_isPrimitive:    do_isPrimitive(x);   break;
   case vmIntrinsics::_getClass:       do_getClass(x);      break;
   case vmIntrinsics::_getObjectSize:  do_getObjectSize(x); break;
   case vmIntrinsics::_currentCarrierThread: do_currentCarrierThread(x); break;
diff --git a/src/hotspot/share/c1/c1_LIRGenerator.hpp b/src/hotspot/share/c1/c1_LIRGenerator.hpp
index 18997e2dd1a..73bd883a746 100644
--- a/src/hotspot/share/c1/c1_LIRGenerator.hpp
+++ b/src/hotspot/share/c1/c1_LIRGenerator.hpp
@@ -254,7 +254,6 @@ class LIRGenerator: public InstructionVisitor, public BlockClosure {
 
   void do_RegisterFinalizer(Intrinsic* x);
   void do_isInstance(Intrinsic* x);
-  void do_isPrimitive(Intrinsic* x);
   void do_getClass(Intrinsic* x);
   void do_getObjectSize(Intrinsic* x);
   void do_currentCarrierThread(Intrinsic* x);
diff --git a/src/hotspot/share/classfile/javaClasses.cpp b/src/hotspot/share/classfile/javaClasses.cpp
index d6d1f799253..a224ef481b0 100644
--- a/src/hotspot/share/classfile/javaClasses.cpp
+++ b/src/hotspot/share/classfile/javaClasses.cpp
@@ -868,6 +868,7 @@ int java_lang_Class::_classData_offset;
 int java_lang_Class::_classRedefinedCount_offset;
 int java_lang_Class::_reflectionData_offset;
 int java_lang_Class::_modifiers_offset;
+int java_lang_Class::_is_primitive_offset;
 
 bool java_lang_Class::_offsets_computed = false;
 GrowableArray<Klass*>* java_lang_Class::_fixup_mirror_list = nullptr;
@@ -1062,7 +1063,7 @@ void java_lang_Class::allocate_mirror(Klass* k, bool is_scratch, Handle protecti
   set_klass(mirror(), k);
 
   // Set the modifiers flag.
-  int computed_modifiers = k->compute_modifier_flags();
+  u2 computed_modifiers = k->compute_modifier_flags();
   set_modifiers(mirror(), computed_modifiers);
 
   InstanceMirrorKlass* mk = InstanceMirrorKlass::cast(mirror->klass());
@@ -1272,8 +1273,11 @@ void java_lang_Class::set_protection_domain(oop java_class, oop pd) {
 
 void java_lang_Class::set_component_mirror(oop java_class, oop comp_mirror) {
   assert(_component_mirror_offset != 0, "must be set");
-    java_class->obj_field_put(_component_mirror_offset, comp_mirror);
-  }
+  assert(java_lang_Class::as_Klass(java_class) != nullptr &&
+         java_lang_Class::as_Klass(java_class)->is_array_klass(), "must be");
+  java_class->obj_field_put(_component_mirror_offset, comp_mirror);
+}
+
 oop java_lang_Class::component_mirror(oop java_class) {
   assert(_component_mirror_offset != 0, "must be set");
   return java_class->obj_field(_component_mirror_offset);
@@ -1347,9 +1351,14 @@ void java_lang_Class::set_source_file(oop java_class, oop source_file) {
   java_class->obj_field_put(_source_file_offset, source_file);
 }
 
+void java_lang_Class::set_is_primitive(oop java_class) {
+  assert(_is_primitive_offset != 0, "must be set");
+  java_class->bool_field_put(_is_primitive_offset, true);
+}
+
+
 oop java_lang_Class::create_basic_type_mirror(const char* basic_type_name, BasicType type, TRAPS) {
-  // This should be improved by adding a field at the Java level or by
-  // introducing a new VM klass (see comment in ClassFileParser)
+  // Mirrors for basic types have a null klass field, which makes them special.
   oop java_class = InstanceMirrorKlass::cast(vmClasses::Class_klass())->allocate_instance(nullptr, CHECK_NULL);
   if (type != T_VOID) {
     Klass* aklass = Universe::typeArrayKlass(type);
@@ -1361,6 +1370,7 @@ oop java_lang_Class::create_basic_type_mirror(const char* basic_type_name, Basic
   assert(static_oop_field_count(java_class) == 0, "should have been zeroed by allocation");
 #endif
   set_modifiers(java_class, JVM_ACC_ABSTRACT | JVM_ACC_FINAL | JVM_ACC_PUBLIC);
+  set_is_primitive(java_class);
   return java_class;
 }
 
@@ -1500,8 +1510,9 @@ oop java_lang_Class::primitive_mirror(BasicType t) {
   macro(_classData_offset,           k, "classData",           object_signature,       false); \
   macro(_reflectionData_offset,      k, "reflectionData",      java_lang_ref_SoftReference_signature, false); \
   macro(_signers_offset,             k, "signers",             object_array_signature, false); \
-  macro(_modifiers_offset,           k, vmSymbols::modifiers_name(), int_signature,    false); \
-  macro(_protection_domain_offset,   k, "protectionDomain",    java_security_ProtectionDomain_signature,  false);
+  macro(_modifiers_offset,           k, vmSymbols::modifiers_name(), char_signature,    false); \
+  macro(_protection_domain_offset,   k, "protectionDomain",    java_security_ProtectionDomain_signature,  false); \
+  macro(_is_primitive_offset,        k, "primitive",           bool_signature,         false);
 
 void java_lang_Class::compute_offsets() {
   if (_offsets_computed) {
@@ -1537,12 +1548,12 @@ void java_lang_Class::set_classRedefinedCount(oop the_class_mirror, int value) {
 
 int java_lang_Class::modifiers(oop the_class_mirror) {
   assert(_modifiers_offset != 0, "offsets should have been initialized");
-  return the_class_mirror->int_field(_modifiers_offset);
+  return the_class_mirror->char_field(_modifiers_offset);
 }
 
-void java_lang_Class::set_modifiers(oop the_class_mirror, int value) {
+void java_lang_Class::set_modifiers(oop the_class_mirror, u2 value) {
   assert(_modifiers_offset != 0, "offsets should have been initialized");
-  the_class_mirror->int_field_put(_modifiers_offset, value);
+  the_class_mirror->char_field_put(_modifiers_offset, value);
 }
 
 
diff --git a/src/hotspot/share/classfile/javaClasses.hpp b/src/hotspot/share/classfile/javaClasses.hpp
index 43b358f6c46..37ca22e9295 100644
--- a/src/hotspot/share/classfile/javaClasses.hpp
+++ b/src/hotspot/share/classfile/javaClasses.hpp
@@ -257,6 +257,7 @@ class java_lang_Class : AllStatic {
   static int _classRedefinedCount_offset;
   static int _reflectionData_offset;
   static int _modifiers_offset;
+  static int _is_primitive_offset;
 
   static bool _offsets_computed;
 
@@ -302,6 +303,7 @@ class java_lang_Class : AllStatic {
   static bool is_instance(oop obj);
 
   static bool is_primitive(oop java_class);
+  static void set_is_primitive(oop java_class);
   static BasicType primitive_type(oop java_class);
   static oop primitive_mirror(BasicType t);
   // JVM_NewArray support
@@ -338,7 +340,7 @@ class java_lang_Class : AllStatic {
   static void set_source_file(oop java_class, oop source_file);
 
   static int modifiers(oop java_class);
-  static void set_modifiers(oop java_class, int value);
+  static void set_modifiers(oop java_class, u2 value);
 
   static size_t oop_size(oop java_class);
   static void set_oop_size(HeapWord* java_class, size_t size);
diff --git a/src/hotspot/share/classfile/javaClasses.inline.hpp b/src/hotspot/share/classfile/javaClasses.inline.hpp
index 6a698e02298..66ecca4bbea 100644
--- a/src/hotspot/share/classfile/javaClasses.inline.hpp
+++ b/src/hotspot/share/classfile/javaClasses.inline.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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,11 +293,13 @@ inline Klass* java_lang_Class::as_Klass(oop java_class) {
 
 inline bool java_lang_Class::is_primitive(oop java_class) {
   // should assert:
-  //assert(java_lang_Class::is_instance(java_class), "must be a Class object");
+  // assert(java_lang_Class::is_instance(java_class), "must be a Class object");
   bool is_primitive = (java_class->metadata_field(_klass_offset) == nullptr);
 
 #ifdef ASSERT
-  if (is_primitive) {
+  // The heapwalker walks through Classes that have had their Klass pointers removed, so can't assert this.
+  // assert(is_primitive == java_class->bool_field(_is_primitive_offset), "must match what we told Java");
+  if (java_class->bool_field(_is_primitive_offset)) {
     Klass* k = ((Klass*)java_class->metadata_field(_array_klass_offset));
     assert(k == nullptr || is_java_primitive(ArrayKlass::cast(k)->element_type()),
         "Should be either the T_VOID primitive or a java primitive");
diff --git a/src/hotspot/share/classfile/vmIntrinsics.cpp b/src/hotspot/share/classfile/vmIntrinsics.cpp
index aaeb54f0d32..2943f9d4af3 100644
--- a/src/hotspot/share/classfile/vmIntrinsics.cpp
+++ b/src/hotspot/share/classfile/vmIntrinsics.cpp
@@ -256,9 +256,6 @@ bool vmIntrinsics::disabled_by_jvm_flags(vmIntrinsics::ID id) {
   switch (id) {
   case vmIntrinsics::_isInstance:
   case vmIntrinsics::_isAssignableFrom:
-  case vmIntrinsics::_isInterface:
-  case vmIntrinsics::_isArray:
-  case vmIntrinsics::_isPrimitive:
   case vmIntrinsics::_isHidden:
   case vmIntrinsics::_getSuperclass:
   case vmIntrinsics::_Class_cast:
diff --git a/src/hotspot/share/classfile/vmIntrinsics.hpp b/src/hotspot/share/classfile/vmIntrinsics.hpp
index cf68217ae2c..0c95f6ab410 100644
--- a/src/hotspot/share/classfile/vmIntrinsics.hpp
+++ b/src/hotspot/share/classfile/vmIntrinsics.hpp
@@ -304,12 +304,6 @@ class methodHandle;
    do_name(     isAssignableFrom_name,                           "isAssignableFrom")                                    \
   do_intrinsic(_isInstance,               java_lang_Class,        isInstance_name, object_boolean_signature,     F_RN)  \
    do_name(     isInstance_name,                                 "isInstance")                                          \
-  do_intrinsic(_isInterface,              java_lang_Class,        isInterface_name, void_boolean_signature,      F_RN)  \
-   do_name(     isInterface_name,                                "isInterface")                                         \
-  do_intrinsic(_isArray,                  java_lang_Class,        isArray_name, void_boolean_signature,          F_RN)  \
-   do_name(     isArray_name,                                    "isArray")                                             \
-  do_intrinsic(_isPrimitive,              java_lang_Class,        isPrimitive_name, void_boolean_signature,      F_RN)  \
-   do_name(     isPrimitive_name,                                "isPrimitive")                                         \
   do_intrinsic(_isHidden,                 java_lang_Class,        isHidden_name, void_boolean_signature,         F_RN)  \
    do_name(     isHidden_name,                                   "isHidden")                                            \
   do_intrinsic(_getSuperclass,            java_lang_Class,        getSuperclass_name, void_class_signature,      F_RN)  \
diff --git a/src/hotspot/share/include/jvm.h b/src/hotspot/share/include/jvm.h
index c2a1a3f53f6..c1d20387d0d 100644
--- a/src/hotspot/share/include/jvm.h
+++ b/src/hotspot/share/include/jvm.h
@@ -546,21 +546,9 @@ JVM_GetClassInterfaces(JNIEnv *env, jclass cls);
 JNIEXPORT jboolean JNICALL
 JVM_IsInterface(JNIEnv *env, jclass cls);
 
-JNIEXPORT jobject JNICALL
-JVM_GetProtectionDomain(JNIEnv *env, jclass cls);
-
-JNIEXPORT jboolean JNICALL
-JVM_IsArrayClass(JNIEnv *env, jclass cls);
-
-JNIEXPORT jboolean JNICALL
-JVM_IsPrimitiveClass(JNIEnv *env, jclass cls);
-
 JNIEXPORT jboolean JNICALL
 JVM_IsHiddenClass(JNIEnv *env, jclass cls);
 
-JNIEXPORT jint JNICALL
-JVM_GetClassModifiers(JNIEnv *env, jclass cls);
-
 JNIEXPORT jobjectArray JNICALL
 JVM_GetDeclaredClasses(JNIEnv *env, jclass ofClass);
 
diff --git a/src/hotspot/share/opto/c2compiler.cpp b/src/hotspot/share/opto/c2compiler.cpp
index c5b6d5a4895..0a769211c82 100644
--- a/src/hotspot/share/opto/c2compiler.cpp
+++ b/src/hotspot/share/opto/c2compiler.cpp
@@ -755,9 +755,6 @@ bool C2Compiler::is_intrinsic_supported(vmIntrinsics::ID id) {
   case vmIntrinsics::_clone:
   case vmIntrinsics::_isAssignableFrom:
   case vmIntrinsics::_isInstance:
-  case vmIntrinsics::_isInterface:
-  case vmIntrinsics::_isArray:
-  case vmIntrinsics::_isPrimitive:
   case vmIntrinsics::_isHidden:
   case vmIntrinsics::_getSuperclass:
   case vmIntrinsics::_getClassAccessFlags:
diff --git a/src/hotspot/share/opto/library_call.cpp b/src/hotspot/share/opto/library_call.cpp
index 6d4990787d7..6f651db58ce 100644
--- a/src/hotspot/share/opto/library_call.cpp
+++ b/src/hotspot/share/opto/library_call.cpp
@@ -516,9 +516,6 @@ bool LibraryCallKit::try_to_inline(int predicate) {
   case vmIntrinsics::_isAssignableFrom:         return inline_native_subtype_check();
 
   case vmIntrinsics::_isInstance:
-  case vmIntrinsics::_isInterface:
-  case vmIntrinsics::_isArray:
-  case vmIntrinsics::_isPrimitive:
   case vmIntrinsics::_isHidden:
   case vmIntrinsics::_getSuperclass:
   case vmIntrinsics::_getClassAccessFlags:      return inline_native_Class_query(intrinsic_id());
@@ -3892,17 +3889,6 @@ bool LibraryCallKit::inline_native_Class_query(vmIntrinsics::ID id) {
     prim_return_value = intcon(0);
     obj = argument(1);
     break;
-  case vmIntrinsics::_isInterface:
-    prim_return_value = intcon(0);
-    break;
-  case vmIntrinsics::_isArray:
-    prim_return_value = intcon(0);
-    expect_prim = true;  // cf. ObjectStreamClass.getClassSignature
-    break;
-  case vmIntrinsics::_isPrimitive:
-    prim_return_value = intcon(1);
-    expect_prim = true;  // obviously
-    break;
   case vmIntrinsics::_isHidden:
     prim_return_value = intcon(0);
     break;
@@ -3971,28 +3957,6 @@ bool LibraryCallKit::inline_native_Class_query(vmIntrinsics::ID id) {
     query_value = gen_instanceof(obj, kls, safe_for_replace);
     break;
 
-  case vmIntrinsics::_isInterface:
-    // (To verify this code sequence, check the asserts in JVM_IsInterface.)
-    if (generate_interface_guard(kls, region) != nullptr)
-      // A guard was added.  If the guard is taken, it was an interface.
-      phi->add_req(intcon(1));
-    // If we fall through, it's a plain class.
-    query_value = intcon(0);
-    break;
-
-  case vmIntrinsics::_isArray:
-    // (To verify this code sequence, check the asserts in JVM_IsArrayClass.)
-    if (generate_array_guard(kls, region) != nullptr)
-      // A guard was added.  If the guard is taken, it was an array.
-      phi->add_req(intcon(1));
-    // If we fall through, it's a plain class.
-    query_value = intcon(0);
-    break;
-
-  case vmIntrinsics::_isPrimitive:
-    query_value = intcon(0); // "normal" path produces false
-    break;
-
   case vmIntrinsics::_isHidden:
     // (To verify this code sequence, check the asserts in JVM_IsHiddenClass.)
     if (generate_hidden_class_guard(kls, region) != nullptr)
diff --git a/src/hotspot/share/prims/jvm.cpp b/src/hotspot/share/prims/jvm.cpp
index 33d82045b6e..ccb15485b07 100644
--- a/src/hotspot/share/prims/jvm.cpp
+++ b/src/hotspot/share/prims/jvm.cpp
@@ -1187,20 +1187,6 @@ JVM_ENTRY(jobjectArray, JVM_GetClassInterfaces(JNIEnv *env, jclass cls))
 JVM_END
 
 
-JVM_ENTRY(jboolean, JVM_IsInterface(JNIEnv *env, jclass cls))
-  oop mirror = JNIHandles::resolve_non_null(cls);
-  if (java_lang_Class::is_primitive(mirror)) {
-    return JNI_FALSE;
-  }
-  Klass* k = java_lang_Class::as_Klass(mirror);
-  jboolean result = k->is_interface();
-  assert(!result || k->is_instance_klass(),
-         "all interfaces are instance types");
-  // The compiler intrinsic for isInterface tests the
-  // Klass::_access_flags bits in the same way.
-  return result;
-JVM_END
-
 JVM_ENTRY(jboolean, JVM_IsHiddenClass(JNIEnv *env, jclass cls))
   oop mirror = JNIHandles::resolve_non_null(cls);
   if (java_lang_Class::is_primitive(mirror)) {
@@ -1259,18 +1245,6 @@ JVM_ENTRY(jobject, JVM_FindScopedValueBindings(JNIEnv *env, jclass cls))
   return nullptr;
 JVM_END
 
-JVM_ENTRY(jboolean, JVM_IsArrayClass(JNIEnv *env, jclass cls))
-  Klass* k = java_lang_Class::as_Klass(JNIHandles::resolve_non_null(cls));
-  return (k != nullptr) && k->is_array_klass() ? true : false;
-JVM_END
-
-
-JVM_ENTRY(jboolean, JVM_IsPrimitiveClass(JNIEnv *env, jclass cls))
-  oop mirror = JNIHandles::resolve_non_null(cls);
-  return (jboolean) java_lang_Class::is_primitive(mirror);
-JVM_END
-
-
 JVM_ENTRY(jobjectArray, JVM_GetDeclaredClasses(JNIEnv *env, jclass ofClass))
   JvmtiVMObjectAllocEventCollector oam;
   // ofClass is a reference to a java_lang_Class object. The mirror object
@@ -2305,7 +2279,23 @@ JVM_END
 // The function returns a Klass* of the _scratch_class if the verifier
 // was invoked in the middle of the class redefinition.
 // Otherwise it returns its argument value which is the _the_class Klass*.
-// Please, refer to the description in the jvmtiThreadSate.hpp.
+// Please, refer to the description in the jvmtiThreadState.hpp.
+
+JVM_ENTRY(jboolean, JVM_IsInterface(JNIEnv *env, jclass cls))
+  oop mirror = JNIHandles::resolve_non_null(cls);
+  if (java_lang_Class::is_primitive(mirror)) {
+    return JNI_FALSE;
+  }
+  Klass* k = java_lang_Class::as_Klass(mirror);
+  // This isn't necessary since answer is the same since redefinition
+  // has already checked this matches for the scratch class.
+  // k = JvmtiThreadState::class_to_verify_considering_redefinition(k, thread);
+  jboolean result = k->is_interface();
+  assert(!result || k->is_instance_klass(),
+         "all interfaces are instance types");
+  return result;
+JVM_END
+
 
 JVM_ENTRY(const char*, JVM_GetClassNameUTF(JNIEnv *env, jclass cls))
   Klass* k = java_lang_Class::as_Klass(JNIHandles::resolve_non_null(cls));
diff --git a/src/java.base/share/classes/java/lang/Class.java b/src/java.base/share/classes/java/lang/Class.java
index 4607858faa8..d86baaac362 100644
--- a/src/java.base/share/classes/java/lang/Class.java
+++ b/src/java.base/share/classes/java/lang/Class.java
@@ -236,13 +236,15 @@ public final class Class<T> implements java.io.Serializable,
      * This constructor is not used and prevents the default constructor being
      * generated.
      */
-    private Class(ClassLoader loader, Class<?> arrayComponentType, int mods, ProtectionDomain pd) {
+    private Class(ClassLoader loader, Class<?> arrayComponentType, char mods, ProtectionDomain pd, boolean isPrim) {
         // Initialize final field for classLoader.  The initialization value of non-null
         // prevents future JIT optimizations from assuming this final field is null.
+        // The following assignments are done directly by the VM without calling this constructor.
         classLoader = loader;
         componentType = arrayComponentType;
         modifiers = mods;
         protectionDomain = pd;
+        primitive = isPrim;
     }
 
     /**
@@ -790,8 +792,9 @@ public final class Class<T> implements java.io.Serializable,
      * @return  {@code true} if this {@code Class} object represents an interface;
      *          {@code false} otherwise.
      */
-    @IntrinsicCandidate
-    public native boolean isInterface();
+    public boolean isInterface() {
+        return Modifier.isInterface(modifiers);
+    }
 
 
     /**
@@ -801,8 +804,9 @@ public final class Class<T> implements java.io.Serializable,
      *          {@code false} otherwise.
      * @since   1.1
      */
-    @IntrinsicCandidate
-    public native boolean isArray();
+    public boolean isArray() {
+        return componentType != null;
+    }
 
 
     /**
@@ -843,8 +847,9 @@ public final class Class<T> implements java.io.Serializable,
      * @since 1.1
      * @jls 15.8.2 Class Literals
      */
-    @IntrinsicCandidate
-    public native boolean isPrimitive();
+    public boolean isPrimitive() {
+        return primitive;
+    }
 
     /**
      * Returns true if this {@code Class} object represents an annotation
@@ -1002,7 +1007,8 @@ public final class Class<T> implements java.io.Serializable,
 
     private transient Object classData; // Set by VM
     private transient Object[] signers; // Read by VM, mutable
-    private final transient int modifiers;  // Set by the VM
+    private final transient char modifiers;  // Set by the VM
+    private final transient boolean primitive;  // Set by the VM if the Class is a primitive type.
 
     // package-private
     Object getClassData() {
@@ -1284,15 +1290,12 @@ public final class Class<T> implements java.io.Serializable,
      * @since 1.1
      */
     public Class<?> getComponentType() {
-        // Only return for array types. Storage may be reused for Class for instance types.
-        if (isArray()) {
-            return componentType;
-        } else {
-            return null;
-        }
+        return componentType;
     }
 
-    private final Class<?> componentType;
+    // The componentType field's null value is the sole indication that the class
+    // is an array - see isArray().
+    private transient final Class<?> componentType;
 
     /*
      * Returns the {@code Class} representing the element type of an array class.
diff --git a/src/java.base/share/classes/jdk/internal/reflect/Reflection.java b/src/java.base/share/classes/jdk/internal/reflect/Reflection.java
index e1fe26684c8..5025b81dd10 100644
--- a/src/java.base/share/classes/jdk/internal/reflect/Reflection.java
+++ b/src/java.base/share/classes/jdk/internal/reflect/Reflection.java
@@ -56,7 +56,7 @@ public class Reflection {
         fieldFilterMap = Map.of(
             Reflection.class, ALL_MEMBERS,
             AccessibleObject.class, ALL_MEMBERS,
-            Class.class, Set.of("classLoader", "classData", "modifiers", "protectionDomain"),
+            Class.class, Set.of("classLoader", "classData", "modifiers", "protectionDomain", "primitive"),
             ClassLoader.class, ALL_MEMBERS,
             Constructor.class, ALL_MEMBERS,
             Field.class, ALL_MEMBERS,
diff --git a/src/java.base/share/native/libjava/Class.c b/src/java.base/share/native/libjava/Class.c
index 47eedaa59d9..3ab3e764bff 100644
--- a/src/java.base/share/native/libjava/Class.c
+++ b/src/java.base/share/native/libjava/Class.c
@@ -56,10 +56,7 @@ static JNINativeMethod methods[] = {
     {"initClassName",    "()" STR,          (void *)&JVM_InitClassName},
     {"getSuperclass",    "()" CLS,          NULL},
     {"getInterfaces0",   "()[" CLS,         (void *)&JVM_GetClassInterfaces},
-    {"isInterface",      "()Z",             (void *)&JVM_IsInterface},
-    {"isArray",          "()Z",             (void *)&JVM_IsArrayClass},
     {"isHidden",         "()Z",             (void *)&JVM_IsHiddenClass},
-    {"isPrimitive",      "()Z",             (void *)&JVM_IsPrimitiveClass},
     {"getDeclaredFields0","(Z)[" FLD,       (void *)&JVM_GetClassDeclaredFields},
     {"getDeclaredMethods0","(Z)[" MHD,      (void *)&JVM_GetClassDeclaredMethods},
     {"getDeclaredConstructors0","(Z)[" CTR, (void *)&JVM_GetClassDeclaredConstructors},
diff --git a/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/TestResolvedJavaType.java b/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/TestResolvedJavaType.java
index 6450f9e1e29..52b52cf647f 100644
--- a/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/TestResolvedJavaType.java
+++ b/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/TestResolvedJavaType.java
@@ -929,10 +929,12 @@ public class TestResolvedJavaType extends TypeUniverse {
             return true;
         }
         if (f.getDeclaringClass().equals(metaAccess.lookupJavaType(Class.class))) {
-            return f.getName().equals("classLoader") ||
-                   f.getName().equals("classData") ||
-                   f.getName().equals("modifiers") ||
-                   f.getName().equals("protectionDomain");
+            String name = f.getName();
+            return name.equals("classLoader") ||
+                   name.equals("classData") ||
+                   name.equals("modifiers") ||
+                   name.equals("protectionDomain") ||
+                   name.equals("primitive");
         }
         if (f.getDeclaringClass().equals(metaAccess.lookupJavaType(Lookup.class))) {
             return f.getName().equals("allowedModes") || f.getName().equals("lookupClass");
diff --git a/test/jdk/java/lang/reflect/AccessibleObject/ModuleSetAccessibleTest.java b/test/jdk/java/lang/reflect/AccessibleObject/ModuleSetAccessibleTest.java
index 08db3265c94..8ee5179ea81 100644
--- a/test/jdk/java/lang/reflect/AccessibleObject/ModuleSetAccessibleTest.java
+++ b/test/jdk/java/lang/reflect/AccessibleObject/ModuleSetAccessibleTest.java
@@ -148,7 +148,7 @@ public class ModuleSetAccessibleTest {
 
         // non-public constructor
         Constructor<?> ctor
-            = Class.class.getDeclaredConstructor(ClassLoader.class, Class.class, int.class, ProtectionDomain.class);
+            = Class.class.getDeclaredConstructor(ClassLoader.class, Class.class, char.class, ProtectionDomain.class, boolean.class);
         AccessibleObject[] ctors = { ctor };
 
         try {
diff --git a/test/jdk/java/lang/reflect/AccessibleObject/TrySetAccessibleTest.java b/test/jdk/java/lang/reflect/AccessibleObject/TrySetAccessibleTest.java
index d08798c8757..9574afee407 100644
--- a/test/jdk/java/lang/reflect/AccessibleObject/TrySetAccessibleTest.java
+++ b/test/jdk/java/lang/reflect/AccessibleObject/TrySetAccessibleTest.java
@@ -194,7 +194,7 @@ public class TrySetAccessibleTest {
 
         // non-public constructor
         Constructor<?> ctor
-            = Class.class.getDeclaredConstructor(ClassLoader.class, Class.class, int.class, ProtectionDomain.class);
+            = Class.class.getDeclaredConstructor(ClassLoader.class, Class.class, char.class, ProtectionDomain.class, boolean.class);
         AccessibleObject[] ctors = { ctor };
 
         assertFalse(ctor.trySetAccessible());
diff --git a/test/jdk/jdk/internal/reflect/Reflection/Filtering.java b/test/jdk/jdk/internal/reflect/Reflection/Filtering.java
index c399b8ff42d..88d7e23ba59 100644
--- a/test/jdk/jdk/internal/reflect/Reflection/Filtering.java
+++ b/test/jdk/jdk/internal/reflect/Reflection/Filtering.java
@@ -57,6 +57,7 @@ public class Filtering {
             { Class.class, "classData" },
             { Class.class, "modifiers" },
             { Class.class, "protectionDomain" },
+            { Class.class, "primitive" },
             { ClassLoader.class, "parent" },
             { Field.class, "clazz" },
             { Field.class, "modifiers" },

From 8cfebc41dc8ec7b0d24d9c467b91de82d28b73fc Mon Sep 17 00:00:00 2001
From: Kevin Walls <kevinw@openjdk.org>
Date: Tue, 25 Feb 2025 12:54:30 +0000
Subject: [PATCH 110/587] 8350571: Remove mention of Tonga test suite from JMX
 tests

Reviewed-by: cjplummer, lmesnik, sspitsyn
---
 .../javax/management/MBeanServer/ExceptionFactory.java | 10 +++-------
 .../javax/management/MBeanServer/ExceptionTest.java    |  6 +-----
 test/jdk/javax/management/mxbean/Utils.java            |  6 +-----
 .../management/query/SupportedQueryTypesTest.java      |  6 +-----
 test/jdk/javax/management/security/Utils.java          |  6 +-----
 5 files changed, 7 insertions(+), 27 deletions(-)

diff --git a/test/jdk/javax/management/MBeanServer/ExceptionFactory.java b/test/jdk/javax/management/MBeanServer/ExceptionFactory.java
index 2315edff3fc..a615c5252da 100644
--- a/test/jdk/javax/management/MBeanServer/ExceptionFactory.java
+++ b/test/jdk/javax/management/MBeanServer/ExceptionFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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,12 +67,8 @@ import javax.management.remote.JMXProviderException;
 import javax.management.remote.JMXServerErrorException;
 
 /**
- *  |----- Original Description Coming From Tonga Original Source Code -------|
- *  |                                                                         |
- *  | That class creates an ArrayList and fill it with an instance of each of |
- *  | the Exception class of the JMX API.                                     |
- *  | It's dedicated to use by ExceptionTest.                                 |
- *  |-------------------------------------------------------------------------|
+ * This class creates an ArrayList and fills it with an instance of each
+ * Exception class in the JMX API.  Used by ExceptionTest.
  */
 public class ExceptionFactory {
 
diff --git a/test/jdk/javax/management/MBeanServer/ExceptionTest.java b/test/jdk/javax/management/MBeanServer/ExceptionTest.java
index bb58e941242..d3550780f0b 100644
--- a/test/jdk/javax/management/MBeanServer/ExceptionTest.java
+++ b/test/jdk/javax/management/MBeanServer/ExceptionTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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 class ExceptionTest {
         return true;
     }
 
-    // Utility inner class coming from JMX Tonga test suite.
     // Also used by ExceptionFactory.
     static class Utils {
 
@@ -222,9 +221,6 @@ public class ExceptionTest {
         }
 
         /**
-         * Reproduces the original parsing and collection of test parameters
-         * from the DTonga JMX test suite.
-         *
          * Collects passed args and returns them in a map(argname, value) structure,
          * which will be then propagated as necessary to various called methods.
          */
diff --git a/test/jdk/javax/management/mxbean/Utils.java b/test/jdk/javax/management/mxbean/Utils.java
index f77196baa2c..550f11736a1 100644
--- a/test/jdk/javax/management/mxbean/Utils.java
+++ b/test/jdk/javax/management/mxbean/Utils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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.Properties;
 import java.lang.reflect.Method;
 import javax.management.remote.JMXConnectorServerMBean;
 
-// utility class for MXBean* tests coming from JMX Tonga test suite
 class Utils {
 
     // DEBUG is printed depending on the DEBUG and DEBUG_LEVEL JAVA property
@@ -60,9 +59,6 @@ class Utils {
     }
 
     /**
-     * Reproduces the original parsing and collection of test parameters
-     * from the DTonga JMX test suite.
-     *
      * Collects passed args and returns them in a map(argname, value) structure,
      * which will be then propagated as necessary to various called methods.
      */
diff --git a/test/jdk/javax/management/query/SupportedQueryTypesTest.java b/test/jdk/javax/management/query/SupportedQueryTypesTest.java
index 8c254329915..17c720d499e 100644
--- a/test/jdk/javax/management/query/SupportedQueryTypesTest.java
+++ b/test/jdk/javax/management/query/SupportedQueryTypesTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -287,7 +287,6 @@ public class SupportedQueryTypesTest {
         }
     }
 
-    // Utility inner class coming from JMX Tonga test suite.
     private static class Utils {
 
         // DEBUG is printed depending on the DEBUG and DEBUG_LEVEL JAVA property
@@ -320,9 +319,6 @@ public class SupportedQueryTypesTest {
         }
 
         /**
-         * Reproduces the original parsing and collection of test parameters
-         * from the DTonga JMX test suite.
-         *
          * Collects passed args and returns them in a map(argname, value) structure,
          * which will be then propagated as necessary to various called methods.
          */
diff --git a/test/jdk/javax/management/security/Utils.java b/test/jdk/javax/management/security/Utils.java
index c0af037a4d6..afb1a8b1842 100644
--- a/test/jdk/javax/management/security/Utils.java
+++ b/test/jdk/javax/management/security/Utils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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.util.StringTokenizer;
 import java.lang.reflect.Method;
 import javax.management.remote.JMXConnectorServerMBean;
 
-// utility class for MXBean* tests coming from JMX Tonga test suite
 class Utils {
 
     private static final String SERVER_SIDE_NAME = "-server";
@@ -64,9 +63,6 @@ class Utils {
     }
 
     /**
-     * Reproduces the original parsing and collection of test parameters
-     * from the DTonga JMX test suite.
-     *
      * Collects passed args and returns them in a map(argname, value) structure,
      * which will be then propagated as necessary to various called methods.
      */

From cfeb7d6c964f63184c939f6f0625c6e7f1afdc31 Mon Sep 17 00:00:00 2001
From: Matthias Baesken <mbaesken@openjdk.org>
Date: Tue, 25 Feb 2025 13:30:54 +0000
Subject: [PATCH 111/587] 8350497: os::create_thread unify init thread
 attributes part across UNIX platforms

Reviewed-by: dholmes
---
 src/hotspot/os/aix/os_aix.cpp | 8 ++++++--
 src/hotspot/os/bsd/os_bsd.cpp | 7 ++++++-
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/hotspot/os/aix/os_aix.cpp b/src/hotspot/os/aix/os_aix.cpp
index bebd1f1a8c1..e452bfdfd7c 100644
--- a/src/hotspot/os/aix/os_aix.cpp
+++ b/src/hotspot/os/aix/os_aix.cpp
@@ -711,8 +711,12 @@ bool os::create_thread(Thread* thread, ThreadType thr_type,
   // Init thread attributes.
   pthread_attr_t attr;
   int rslt = pthread_attr_init(&attr);
-  guarantee(rslt == 0, "pthread_attr_init has to return 0");
-  guarantee(pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED) == 0, "???");
+  if (rslt != 0) {
+    thread->set_osthread(nullptr);
+    delete osthread;
+    return false;
+  }
+  pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED);
 
   // Make sure we run in 1:1 kernel-user-thread mode.
   guarantee(pthread_attr_setscope(&attr, PTHREAD_SCOPE_SYSTEM) == 0, "???");
diff --git a/src/hotspot/os/bsd/os_bsd.cpp b/src/hotspot/os/bsd/os_bsd.cpp
index b386169138f..c538c54e86f 100644
--- a/src/hotspot/os/bsd/os_bsd.cpp
+++ b/src/hotspot/os/bsd/os_bsd.cpp
@@ -637,7 +637,12 @@ bool os::create_thread(Thread* thread, ThreadType thr_type,
 
   // init thread attributes
   pthread_attr_t attr;
-  pthread_attr_init(&attr);
+  int rslt = pthread_attr_init(&attr);
+  if (rslt != 0) {
+    thread->set_osthread(nullptr);
+    delete osthread;
+    return false;
+  }
   pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED);
 
   // calculate stack size if it's not specified by caller

From 62f39bd6468d1c99bb0d6af6a96972bae96a7588 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Johan=20Sj=C3=B6len?= <jsjolen@openjdk.org>
Date: Tue, 25 Feb 2025 14:30:24 +0000
Subject: [PATCH 112/587] 8350636: Potential null-pointer dereference in
 MallocSiteTable::new_entry

Reviewed-by: dholmes
---
 src/hotspot/share/nmt/mallocSiteTable.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/hotspot/share/nmt/mallocSiteTable.cpp b/src/hotspot/share/nmt/mallocSiteTable.cpp
index b017e139e24..71e75551e2f 100644
--- a/src/hotspot/share/nmt/mallocSiteTable.cpp
+++ b/src/hotspot/share/nmt/mallocSiteTable.cpp
@@ -179,7 +179,11 @@ MallocSite* MallocSiteTable::malloc_site(uint32_t marker) {
 MallocSiteHashtableEntry* MallocSiteTable::new_entry(const NativeCallStack& key, MemTag mem_tag) {
   void* p = AllocateHeap(sizeof(MallocSiteHashtableEntry), mtNMT,
     *hash_entry_allocation_stack(), AllocFailStrategy::RETURN_NULL);
-  return ::new (p) MallocSiteHashtableEntry(key, mem_tag);
+  if (p == nullptr) {
+    return nullptr;
+  } else {
+    return ::new (p) MallocSiteHashtableEntry(key, mem_tag);
+  }
 }
 
 bool MallocSiteTable::walk_malloc_site(MallocSiteWalker* walker) {

From b17c0b63a15246967f7cb24ba6089f2ef13e900e Mon Sep 17 00:00:00 2001
From: Matthias Baesken <mbaesken@openjdk.org>
Date: Tue, 25 Feb 2025 14:38:19 +0000
Subject: [PATCH 113/587] 8350585: InlineSecondarySupersTest must be guarded on
 ppc64 by COMPILER2

Reviewed-by: amitkumar, mdoerr
---
 src/hotspot/cpu/ppc/stubGenerator_ppc.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/hotspot/cpu/ppc/stubGenerator_ppc.cpp b/src/hotspot/cpu/ppc/stubGenerator_ppc.cpp
index 2bdff4c0995..1749447d43b 100644
--- a/src/hotspot/cpu/ppc/stubGenerator_ppc.cpp
+++ b/src/hotspot/cpu/ppc/stubGenerator_ppc.cpp
@@ -4889,12 +4889,14 @@ void generate_lookup_secondary_supers_table_stub() {
     // arraycopy stubs used by compilers
     generate_arraycopy_stubs();
 
+#ifdef COMPILER2
     if (UseSecondarySupersTable) {
       StubRoutines::_lookup_secondary_supers_table_slow_path_stub = generate_lookup_secondary_supers_table_slow_path_stub();
       if (!InlineSecondarySupersTest) {
         generate_lookup_secondary_supers_table_stub();
       }
     }
+#endif // COMPILER2
 
     StubRoutines::_upcall_stub_exception_handler = generate_upcall_stub_exception_handler();
     StubRoutines::_upcall_stub_load_target = generate_upcall_stub_load_target();

From 08bc59da9b66c6504a2d2712feebf37cc5eb2d3e Mon Sep 17 00:00:00 2001
From: Stuart Marks <smarks@openjdk.org>
Date: Tue, 25 Feb 2025 15:18:30 +0000
Subject: [PATCH 114/587] 8138614: (spec str) StringBuffer and StringBuilder
 methods improperly require "new" String to be returned

Reviewed-by: rgiulietti, shade, alanb, rriggs, liach
---
 .../java/lang/AbstractStringBuilder.java        | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/src/java.base/share/classes/java/lang/AbstractStringBuilder.java b/src/java.base/share/classes/java/lang/AbstractStringBuilder.java
index 94c4192ff5e..c2f90e22802 100644
--- a/src/java.base/share/classes/java/lang/AbstractStringBuilder.java
+++ b/src/java.base/share/classes/java/lang/AbstractStringBuilder.java
@@ -1027,13 +1027,13 @@ abstract sealed class AbstractStringBuilder implements Appendable, CharSequence
     }
 
     /**
-     * Returns a new {@code String} that contains a subsequence of
+     * Returns a {@code String} that contains a subsequence of
      * characters currently contained in this character sequence. The
      * substring begins at the specified index and extends to the end of
      * this sequence.
      *
      * @param      start    The beginning index, inclusive.
-     * @return     The new string.
+     * @return     A string containing the specified subsequence of characters.
      * @throws     StringIndexOutOfBoundsException  if {@code start} is
      *             less than zero, or greater than the length of this object.
      */
@@ -1042,7 +1042,7 @@ abstract sealed class AbstractStringBuilder implements Appendable, CharSequence
     }
 
     /**
-     * Returns a new character sequence that is a subsequence of this sequence.
+     * Returns a character sequence that is a subsequence of this sequence.
      *
      * <p> An invocation of this method of the form
      *
@@ -1072,14 +1072,14 @@ abstract sealed class AbstractStringBuilder implements Appendable, CharSequence
     }
 
     /**
-     * Returns a new {@code String} that contains a subsequence of
+     * Returns a {@code String} that contains a subsequence of
      * characters currently contained in this sequence. The
      * substring begins at the specified {@code start} and
      * extends to the character at index {@code end - 1}.
      *
      * @param      start    The beginning index, inclusive.
      * @param      end      The ending index, exclusive.
-     * @return     The new string.
+     * @return     A string containing the specified subsequence of characters.
      * @throws     StringIndexOutOfBoundsException  if {@code start}
      *             or {@code end} are negative or greater than
      *             {@code length()}, or {@code start} is
@@ -1602,11 +1602,10 @@ abstract sealed class AbstractStringBuilder implements Appendable, CharSequence
 
     /**
      * Returns a string representing the data in this sequence.
-     * A new {@code String} object is allocated and initialized to
-     * contain the character sequence currently represented by this
-     * object. This {@code String} is then returned. Subsequent
+     * The {@code String} object that is returned contains the character
+     * sequence currently represented by this object. Subsequent
      * changes to this sequence do not affect the contents of the
-     * {@code String}.
+     * returned {@code String}.
      *
      * @return  a string representation of this sequence of characters.
      */

From 50239716403732fe8af73b4b6f006b6a4b7b22db Mon Sep 17 00:00:00 2001
From: Mark Powers <mpowers@openjdk.org>
Date: Tue, 25 Feb 2025 15:21:07 +0000
Subject: [PATCH 115/587] 8267068: Incomplete @throws javadoc for various
 javax.crypto.spec classes

Reviewed-by: valeriep, jnimeh
---
 .../javax/crypto/spec/IvParameterSpec.java    | 22 ++++++++--------
 .../javax/crypto/spec/RC2ParameterSpec.java   |  7 ++++--
 .../javax/crypto/spec/RC5ParameterSpec.java   |  8 +++---
 .../javax/crypto/spec/SecretKeySpec.java      | 25 +++++++++----------
 4 files changed, 32 insertions(+), 30 deletions(-)

diff --git a/src/java.base/share/classes/javax/crypto/spec/IvParameterSpec.java b/src/java.base/share/classes/javax/crypto/spec/IvParameterSpec.java
index 6d7fa142c68..a1c7102e8a4 100644
--- a/src/java.base/share/classes/javax/crypto/spec/IvParameterSpec.java
+++ b/src/java.base/share/classes/javax/crypto/spec/IvParameterSpec.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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,30 +47,30 @@ public class IvParameterSpec implements AlgorithmParameterSpec {
      *
      * @param iv the buffer with the IV. The contents of the
      * buffer are copied to protect against subsequent modification.
-     * @throws NullPointerException if <code>iv</code> is <code>null</code>
+     * @throws NullPointerException if {@code iv} is {@code null}
      */
     public IvParameterSpec(byte[] iv) {
         this(iv, 0, iv.length);
     }
 
     /**
-     * Creates an IvParameterSpec object using the first <code>len</code>
-     * bytes in <code>iv</code>, beginning at <code>offset</code>
+     * Creates an IvParameterSpec object using the first {@code len}
+     * bytes in {@code iv}, beginning at {@code offset}
      * inclusive, as the IV.
      *
      * <p> The bytes that constitute the IV are those between
-     * <code>iv[offset]</code> and <code>iv[offset+len-1]</code> inclusive.
+     * {@code iv[offset]} and {@code iv[offset+len-1]} inclusive.
      *
-     * @param iv the buffer with the IV. The first <code>len</code>
-     * bytes of the buffer beginning at <code>offset</code> inclusive
+     * @param iv the buffer with the IV. The first {@code len}
+     * bytes of the buffer beginning at {@code offset} inclusive
      * are copied to protect against subsequent modification.
-     * @param offset the offset in <code>iv</code> where the IV
+     * @param offset the offset in {@code iv} where the IV
      * starts.
      * @param len the number of IV bytes.
-     * @throws IllegalArgumentException if <code>iv</code> is <code>null</code>
+     * @throws IllegalArgumentException if {@code iv} is {@code null}
      * or {@code (iv.length - offset < len)}
-     * @throws ArrayIndexOutOfBoundsException is thrown if <code>offset</code>
-     * or <code>len</code> index bytes outside the <code>iv</code>.
+     * @throws ArrayIndexOutOfBoundsException if {@code offset}
+     * or {@code len} are negative.
      */
     public IvParameterSpec(byte[] iv, int offset, int len) {
         if (iv == null) {
diff --git a/src/java.base/share/classes/javax/crypto/spec/RC2ParameterSpec.java b/src/java.base/share/classes/javax/crypto/spec/RC2ParameterSpec.java
index 3c2e5a57da6..e37e3872ff2 100644
--- a/src/java.base/share/classes/javax/crypto/spec/RC2ParameterSpec.java
+++ b/src/java.base/share/classes/javax/crypto/spec/RC2ParameterSpec.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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,10 @@ public class RC2ParameterSpec implements AlgorithmParameterSpec {
      * are copied to protect against subsequent modification.
      * @param offset the offset in {@code iv} where the 8-byte IV
      * starts.
-     * @exception IllegalArgumentException if {@code iv} is null.
+     * @exception IllegalArgumentException if {@code iv} is {@code null}
+     * or {@code iv.length - offset < 8}.
+     * @exception ArrayIndexOutOfBoundsException if
+     * {@code offset} is negative.
      */
     public RC2ParameterSpec(int effectiveKeyBits, byte[] iv, int offset) {
         this.effectiveKeyBits = effectiveKeyBits;
diff --git a/src/java.base/share/classes/javax/crypto/spec/RC5ParameterSpec.java b/src/java.base/share/classes/javax/crypto/spec/RC5ParameterSpec.java
index 86d128afbf8..644433f3373 100644
--- a/src/java.base/share/classes/javax/crypto/spec/RC5ParameterSpec.java
+++ b/src/java.base/share/classes/javax/crypto/spec/RC5ParameterSpec.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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,9 +106,9 @@ public class RC5ParameterSpec implements AlgorithmParameterSpec {
      * bytes of the buffer beginning at {@code offset}
      * inclusive are copied to protect against subsequent modification.
      * @param offset the offset in {@code iv} where the IV starts.
-     * @exception IllegalArgumentException if {@code iv} is
-     * {@code null} or
-     * {@code (iv.length - offset < 2 * (wordSize / 8))}
+     * @exception ArrayIndexOutOfBoundsException if {@code offset} is negative.
+     * @exception IllegalArgumentException if {@code iv} is {@code null}
+     * or {@code (iv.length - offset < 2 * (wordSize / 8))}
      */
     public RC5ParameterSpec(int version, int rounds, int wordSize,
                             byte[] iv, int offset) {
diff --git a/src/java.base/share/classes/javax/crypto/spec/SecretKeySpec.java b/src/java.base/share/classes/javax/crypto/spec/SecretKeySpec.java
index e51b1471a8c..44dbd960a74 100644
--- a/src/java.base/share/classes/javax/crypto/spec/SecretKeySpec.java
+++ b/src/java.base/share/classes/javax/crypto/spec/SecretKeySpec.java
@@ -113,16 +113,16 @@ public class SecretKeySpec implements KeySpec, SecretKey {
 
     /**
      * Constructs a secret key from the given byte array, using the first
-     * <code>len</code> bytes of <code>key</code>, starting at
-     * <code>offset</code> inclusive.
+     * {@code len} bytes of {@code key}, starting at
+     * {@code offset} inclusive.
      *
      * <p> The bytes that constitute the secret key are
-     * those between <code>key[offset]</code> and
-     * <code>key[offset+len-1]</code> inclusive.
+     * those between {@code key[offset]} and
+     * {@code key[offset+len-1]} inclusive.
      *
      * <p>This constructor does not check if the given bytes indeed specify a
      * secret key of the specified algorithm. For example, if the algorithm is
-     * DES, this constructor does not check if <code>key</code> is 8 bytes
+     * DES, this constructor does not check if {@code key} is 8 bytes
      * long, and also does not check for weak or semi-weak keys.
      * In order for those checks to be performed, an algorithm-specific key
      * specification class (in this case:
@@ -130,10 +130,10 @@ public class SecretKeySpec implements KeySpec, SecretKey {
      * must be used.
      *
      * @param key the key material of the secret key. The first
-     * <code>len</code> bytes of the array beginning at
-     * <code>offset</code> inclusive are copied to protect
+     * {@code len} bytes of the array beginning at
+     * {@code offset} inclusive are copied to protect
      * against subsequent modification.
-     * @param offset the offset in <code>key</code> where the key material
+     * @param offset the offset in {@code key} where the key material
      * starts.
      * @param len the length of the key material.
      * @param algorithm the name of the secret key algorithm to be associated
@@ -142,12 +142,11 @@ public class SecretKeySpec implements KeySpec, SecretKey {
      * <a href="{@docRoot}/../specs/security/standard-names.html#secretkey-algorithms">
      * Java Security Standard Algorithm Names Specification</a>
      * for information about standard secret key algorithm names.
-     * @exception IllegalArgumentException if <code>algorithm</code>
-     * is null or <code>key</code> is null, empty, or too short,
+     * @exception IllegalArgumentException if {@code algorithm}
+     * is {@code null} or {@code key} is {@code null}, empty, or too short,
      * i.e. {@code key.length-offset<len}.
-     * @exception ArrayIndexOutOfBoundsException is thrown if
-     * <code>offset</code> or <code>len</code> index bytes outside the
-     * <code>key</code>.
+     * @exception ArrayIndexOutOfBoundsException if
+     * {@code offset} or {@code len} are negative.
      *
      * @spec security/standard-names.html Java Security Standard Algorithm Names
      */

From dea7a9f0d640e5234bafe2157aecd942c71d5de5 Mon Sep 17 00:00:00 2001
From: Volodymyr Paprotski <vpaprotski@openjdk.org>
Date: Tue, 25 Feb 2025 16:28:25 +0000
Subject: [PATCH 116/587] 8350516: Update model numbers for ECore-based cpus

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

diff --git a/src/hotspot/cpu/x86/vm_version_x86.cpp b/src/hotspot/cpu/x86/vm_version_x86.cpp
index 788fe2c6586..68fc4380a59 100644
--- a/src/hotspot/cpu/x86/vm_version_x86.cpp
+++ b/src/hotspot/cpu/x86/vm_version_x86.cpp
@@ -928,7 +928,8 @@ void VM_Version::get_processor_features() {
 
   // Check if processor has Intel Ecore
   if (FLAG_IS_DEFAULT(EnableX86ECoreOpts) && is_intel() && cpu_family() == 6 &&
-    (_model == 0x97 || _model == 0xAA || _model == 0xAC || _model == 0xAF)) {
+    (_model == 0x97 || _model == 0xAA || _model == 0xAC || _model == 0xAF ||
+      _model == 0xCC || _model == 0xDD)) {
     FLAG_SET_DEFAULT(EnableX86ECoreOpts, true);
   }
 

From c5992ca27b7dddaaaf217b62445fdc48e7eaf240 Mon Sep 17 00:00:00 2001
From: Mikhail Yankelevich <mikhail.yankelevich@oracle.com>
Date: Tue, 25 Feb 2025 18:24:42 +0000
Subject: [PATCH 117/587] 8349533: Refactor validator tests shell files to java

Reviewed-by: weijun
---
 .../sun/security/validator/CertReplace.java   | 178 +++++++++++++++++-
 .../jdk/sun/security/validator/certreplace.sh |  88 ---------
 test/jdk/sun/security/validator/samedn.sh     |  86 ---------
 3 files changed, 168 insertions(+), 184 deletions(-)
 delete mode 100644 test/jdk/sun/security/validator/certreplace.sh
 delete mode 100644 test/jdk/sun/security/validator/samedn.sh

diff --git a/test/jdk/sun/security/validator/CertReplace.java b/test/jdk/sun/security/validator/CertReplace.java
index e858cc7657c..42885b73e96 100644
--- a/test/jdk/sun/security/validator/CertReplace.java
+++ b/test/jdk/sun/security/validator/CertReplace.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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,29 +21,186 @@
  * questions.
  */
 
-/*
- * This test is called by certreplace.sh
- */
-
 import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.nio.file.StandardOpenOption;
 import java.security.KeyStore;
+import java.security.PrivateKey;
 import java.security.cert.Certificate;
 import java.security.cert.CertificateFactory;
 import java.security.cert.X509Certificate;
-import java.util.Arrays;
 import java.util.ArrayList;
 import java.util.List;
+
+import jdk.test.lib.SecurityTools;
+import jdk.test.lib.security.CertUtils;
+import jdk.test.lib.security.KeyStoreUtils;
 import sun.security.validator.Validator;
 
+/*
+ * @test id=certreplace
+ * @bug 6948803
+ * @summary CertPath validation regression caused by SHA1 replacement root and MD2 disable feature
+ * @library /test/lib
+ * @modules java.base/sun.security.validator
+ *
+ * @run main CertReplace certreplace.jks certreplace.certs
+ */
+
+/*
+ * @test id=samedn
+ * @bug 6958869
+ * @summary Regression: PKIXValidator fails when multiple trust anchors have same dn
+ * @library /test/lib
+ * @modules java.base/sun.security.validator
+ *
+ * @run main CertReplace samedn.jks samedn1.certs
+ * @run main CertReplace samedn.jks samedn2.certs
+ */
+
 public class CertReplace {
 
+    private static final String SAMEDN_JKS = "samedn.jks";
+    private static final String CERTREPLACE_JKS = "certreplace.jks";
+    private static final String PASSWORD = "changeit";
+    private static final char[] PASSWORD_CHAR_ARR = PASSWORD.toCharArray();
+
+    /**
+     * This method creates certs for the Cert Replace test
+     *
+     * @throws Exception
+     */
+    private static void certReplace() throws Exception {
+
+        final String ktBaseParameters = "-storepass " + PASSWORD + " " +
+                                        "-keypass " + PASSWORD + " " +
+                                        "-keystore " + CERTREPLACE_JKS + " " +
+                                        "-keyalg rsa ";
+
+        final Path keystoreFilePath = Paths.get(CERTREPLACE_JKS);
+        Files.deleteIfExists(keystoreFilePath);
+
+        // 1. Generate 3 aliases in a keystore: ca, int, user
+        SecurityTools.keytool(ktBaseParameters +
+                              "-genkeypair -alias ca -dname CN=CA -keyalg rsa -sigalg md2withrsa -ext bc");
+        SecurityTools.keytool(ktBaseParameters +
+                              "-genkeypair -alias int -dname CN=Int -keyalg rsa");
+        SecurityTools.keytool(ktBaseParameters +
+                              "-genkeypair -alias user -dname CN=User -keyalg rsa");
+
+        final KeyStore keyStore = KeyStoreUtils.loadKeyStore(CERTREPLACE_JKS, PASSWORD);
+
+        // 2. Signing: ca -> int -> user
+
+        SecurityTools.keytool(ktBaseParameters +
+                              "-certreq -alias int -file int.req");
+        SecurityTools.keytool(ktBaseParameters +
+                              "-gencert -rfc -alias ca -ext bc -infile int.req " +
+                              "-outfile int.cert");
+
+        //putting the certificate in the keystore
+        try (final FileInputStream certInputStream = new FileInputStream("int.cert")) {
+            final Certificate[] certs = new Certificate[]{
+                    CertUtils.getCertFromStream(
+                            certInputStream
+                    )
+            };
+
+            final PrivateKey privateKey = (PrivateKey) keyStore.getKey("int", PASSWORD_CHAR_ARR);
+            keyStore.setKeyEntry("int", privateKey, PASSWORD_CHAR_ARR, certs);
+            keyStore.store(new FileOutputStream(CERTREPLACE_JKS), PASSWORD_CHAR_ARR);
+        }
+
+        SecurityTools.keytool(ktBaseParameters +
+                              "-certreq -alias user -file user.req");
+        SecurityTools.keytool(ktBaseParameters +
+                              "-gencert -rfc -alias int " +
+                              "-infile user.req " +
+                              "-outfile certreplace.certs"); // this will create certreplace.certs which is later appended
+
+        // 3. Create the certchain file
+        final Path certPath = Paths.get("certreplace.certs");
+
+        Files.write(certPath, Files.readAllBytes(Path.of("int.cert")), StandardOpenOption.APPEND);
+
+        final String outputCa = SecurityTools.keytool(ktBaseParameters +
+                                                      "-export -rfc -alias ca").getOutput();
+        Files.write(certPath, outputCa.getBytes(), StandardOpenOption.APPEND);
+
+        // 4. Upgrade ca from MD2withRSA to SHA256withRSA, remove other aliases and make this keystore the cacerts file
+        keyStore.deleteEntry("int");
+        keyStore.deleteEntry("user");
+        keyStore.store(new FileOutputStream(CERTREPLACE_JKS), PASSWORD_CHAR_ARR);
+
+        SecurityTools.keytool(ktBaseParameters +
+                              "-selfcert -alias ca");
+    }
+
+    /**
+     * This method creates certs for the Same DN test
+     *
+     * @throws Exception
+     */
+    private static void sameDn() throws Exception {
+
+        final String ktBaseParameters = "-storepass " + PASSWORD + " " +
+                                        "-keypass " + PASSWORD + " " +
+                                        "-keystore " + SAMEDN_JKS + " " +
+                                        "-keyalg rsa ";
+
+        final Path keystoreFilePath = Paths.get(SAMEDN_JKS);
+        Files.deleteIfExists(keystoreFilePath);
+
+        // 1. Generate 3 aliases in a keystore: ca1, ca2, user. The CAs' startdate
+        // is set to one year ago so that they are expired now
+        SecurityTools.keytool(ktBaseParameters +
+                              "-genkeypair -alias ca1 -dname CN=CA -keyalg rsa " +
+                              "-sigalg md5withrsa -ext bc -startdate -1y");
+        SecurityTools.keytool(ktBaseParameters +
+                              "-genkeypair -alias ca2 -dname CN=CA -keyalg rsa " +
+                              "-sigalg sha1withrsa -ext bc -startdate -1y");
+        SecurityTools.keytool(ktBaseParameters +
+                              "-genkeypair -alias user -dname CN=User -keyalg rsa");
+
+        // 2. Signing: ca -> user. The startdate is set to 1 minute in the past to ensure the certificate
+        // is valid at the time of validation and to prevent any issues with timing discrepancies
+        // Automatically saves the certs to the certs files
+
+        SecurityTools.keytool(ktBaseParameters +
+                              "-certreq -alias user -file user.req");
+        SecurityTools.keytool(ktBaseParameters +
+                              "-gencert -rfc -alias ca1 " +
+                              "-startdate -1M -infile user.req -outfile samedn1.certs");
+        SecurityTools.keytool(ktBaseParameters +
+                              "-gencert -rfc -alias ca2 " +
+                              "-startdate -1M -infile user.req -outfile samedn2.certs");
+
+        // 3. Remove user for cacerts
+        final KeyStore keyStore = KeyStoreUtils.loadKeyStore(SAMEDN_JKS, PASSWORD);
+        keyStore.deleteEntry("user");
+        keyStore.store(new FileOutputStream(CERTREPLACE_JKS), PASSWORD_CHAR_ARR);
+    }
+
     /**
      * @param args {cacerts keystore, cert chain}
      */
     public static void main(String[] args) throws Exception {
 
+        if (args[0].equals(CERTREPLACE_JKS)) {
+            certReplace();
+        } else if (args[0].equals(SAMEDN_JKS)) {
+            sameDn();
+        } else {
+            throw new RuntimeException("Not recognised test " + args[0]);
+        }
+
         KeyStore ks = KeyStore.getInstance("JKS");
-        ks.load(new FileInputStream(args[0]), "changeit".toCharArray());
+        try (final FileInputStream certInputStream = new FileInputStream(args[0])) {
+            ks.load(certInputStream, PASSWORD_CHAR_ARR);
+        }
         Validator v = Validator.getInstance
             (Validator.TYPE_PKIX, Validator.VAR_GENERIC, ks);
         X509Certificate[] chain = createPath(args[1]);
@@ -57,9 +214,10 @@ public class CertReplace {
     public static X509Certificate[] createPath(String chain) throws Exception {
         CertificateFactory cf = CertificateFactory.getInstance("X.509");
         List list = new ArrayList();
-        for (Certificate c: cf.generateCertificates(
-                new FileInputStream(chain))) {
-            list.add((X509Certificate)c);
+        try (final FileInputStream certInputStream = new FileInputStream(chain)) {
+            for (Certificate c : cf.generateCertificates(certInputStream)) {
+                list.add((X509Certificate) c);
+            }
         }
         return (X509Certificate[]) list.toArray(new X509Certificate[0]);
     }
diff --git a/test/jdk/sun/security/validator/certreplace.sh b/test/jdk/sun/security/validator/certreplace.sh
deleted file mode 100644
index 79c97328092..00000000000
--- a/test/jdk/sun/security/validator/certreplace.sh
+++ /dev/null
@@ -1,88 +0,0 @@
-#
-# 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
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact 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 6948803
-# @summary CertPath validation regression caused by SHA1 replacement root
-#  and MD2 disable feature
-# @modules java.base/sun.security.validator
-#
-
-if [ "${TESTSRC}" = "" ] ; then
-  TESTSRC="."
-fi
-if [ "${TESTJAVA}" = "" ] ; then
-  JAVAC_CMD=`which javac`
-  TESTJAVA=`dirname $JAVAC_CMD`/..
-  COMPILEJAVA="${TESTJAVA}"
-fi
-
-# set platform-dependent variables
-OS=`uname -s`
-case "$OS" in
-  Windows_* )
-    FS="\\"
-    ;;
-  * )
-    FS="/"
-    ;;
-esac
-
-KT="$TESTJAVA${FS}bin${FS}keytool ${TESTTOOLVMOPTS} -storepass changeit \
-    -keypass changeit -keystore certreplace.jks -keyalg rsa"
-JAVAC=$COMPILEJAVA${FS}bin${FS}javac
-JAVA=$TESTJAVA${FS}bin${FS}java
-
-rm -rf certreplace.jks 2> /dev/null
-
-# 1. Generate 3 aliases in a keystore: ca, int, user
-
-$KT -genkeypair -alias ca -dname CN=CA -keyalg rsa -sigalg md2withrsa -ext bc
-$KT -genkeypair -alias int -dname CN=Int -keyalg rsa
-$KT -genkeypair -alias user -dname CN=User -keyalg rsa
-
-# 2. Signing: ca -> int -> user
-
-$KT -certreq -alias int | $KT -gencert -rfc -alias ca -ext bc \
-    | $KT -import -alias int
-$KT -certreq -alias user | $KT -gencert -rfc -alias int \
-    | $KT -import -alias user
-
-# 3. Create the certchain file
-
-$KT -export -alias user -rfc > certreplace.certs
-$KT -export -rfc -alias int >> certreplace.certs
-$KT -export -rfc -alias ca >> certreplace.certs
-
-# 4. Upgrade ca from MD2withRSA to SHA256withRSA, remove other aliases and
-# make this keystore the cacerts file
-
-$KT -selfcert -alias ca
-$KT -delete -alias int
-$KT -delete -alias user
-
-# 5. Build and run test
-
-EXTRAOPTS="--add-exports java.base/sun.security.validator=ALL-UNNAMED"
-$JAVAC ${TESTJAVACOPTS} ${TESTTOOLVMOPTS} ${EXTRAOPTS} -d . ${TESTSRC}${FS}CertReplace.java
-$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
deleted file mode 100644
index 912bbcd40c7..00000000000
--- a/test/jdk/sun/security/validator/samedn.sh
+++ /dev/null
@@ -1,86 +0,0 @@
-#
-# 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
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact 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 6958869
-# @summary regression: PKIXValidator fails when multiple trust anchors
-# have same dn
-# @modules java.base/sun.security.validator
-#
-
-if [ "${TESTSRC}" = "" ] ; then
-  TESTSRC="."
-fi
-if [ "${TESTJAVA}" = "" ] ; then
-  JAVAC_CMD=`which javac`
-  TESTJAVA=`dirname $JAVAC_CMD`/..
-  COMPILEJAVA="${TESTJAVA}"
-fi
-
-# set platform-dependent variables
-OS=`uname -s`
-case "$OS" in
-  Windows_* )
-    FS="\\"
-    ;;
-  * )
-    FS="/"
-    ;;
-esac
-
-KT="$TESTJAVA${FS}bin${FS}keytool ${TESTTOOLVMOPTS} -storepass changeit \
-    -keypass changeit -keystore samedn.jks -keyalg rsa"
-JAVAC=$COMPILEJAVA${FS}bin${FS}javac
-JAVA=$TESTJAVA${FS}bin${FS}java
-
-rm -rf samedn.jks 2> /dev/null
-
-# 1. Generate 3 aliases in a keystore: ca1, ca2, user. The CAs' startdate
-# is set to one year ago so that they are expired now
-
-$KT -genkeypair -alias ca1 -dname CN=CA -keyalg rsa -sigalg md5withrsa -ext bc -startdate -1y
-$KT -genkeypair -alias ca2 -dname CN=CA -keyalg rsa -sigalg sha1withrsa -ext bc -startdate -1y
-$KT -genkeypair -alias user -dname CN=User -keyalg rsa
-
-# 2. Signing: ca -> user. The startdate is set to 1 minute in the past to ensure the certificate
-# is valid at the time of validation and to prevent any issues with timing discrepancies
-
-$KT -certreq -alias user | $KT -gencert -rfc -alias ca1 -startdate -1M > samedn1.certs
-$KT -certreq -alias user | $KT -gencert -rfc -alias ca2 -startdate -1M > samedn2.certs
-
-# 3. Append the ca file
-
-$KT -export -rfc -alias ca1 >> samedn1.certs
-$KT -export -rfc -alias ca2 >> samedn2.certs
-
-# 4. Remove user for cacerts
-
-$KT -delete -alias user
-
-# 5. Build and run test. Make sure the CA certs are ignored for validity check.
-# Check both, one of them might be dropped out of map in old codes.
-
-EXTRAOPTS="--add-exports java.base/sun.security.validator=ALL-UNNAMED"
-$JAVAC ${TESTJAVACOPTS} ${TESTTOOLVMOPTS} ${EXTRAOPTS} -d . ${TESTSRC}${FS}CertReplace.java
-$JAVA ${TESTVMOPTS} ${TESTJAVAOPTS} ${EXTRAOPTS} CertReplace samedn.jks samedn1.certs || exit 1
-$JAVA ${TESTVMOPTS} ${TESTJAVAOPTS} ${EXTRAOPTS} CertReplace samedn.jks samedn2.certs || exit 2

From 0151b15b7cc077a30b00f2af4a5e3f831d1d92cb Mon Sep 17 00:00:00 2001
From: Leonid Mesnik <lmesnik@openjdk.org>
Date: Tue, 25 Feb 2025 19:19:40 +0000
Subject: [PATCH 118/587] 8348367: Remove hotspot_not_fast_compiler and
 hotspot_slow_compiler test groups

Reviewed-by: thartmann, chagedorn
---
 test/hotspot/jtreg/TEST.groups | 27 ++++++++-------------------
 1 file changed, 8 insertions(+), 19 deletions(-)

diff --git a/test/hotspot/jtreg/TEST.groups b/test/hotspot/jtreg/TEST.groups
index abbcc90f8c7..f58257da2ef 100644
--- a/test/hotspot/jtreg/TEST.groups
+++ b/test/hotspot/jtreg/TEST.groups
@@ -152,24 +152,12 @@ tier1_compiler = \
   :tier1_compiler_2 \
   :tier1_compiler_3
 
-hotspot_not_fast_compiler = \
-  :hotspot_compiler \
-  -:tier1_compiler \
-  -:hotspot_slow_compiler
-
-hotspot_slow_compiler = \
-  compiler/codegen/aes \
-  compiler/codecache/stress \
-  compiler/gcbarriers/PreserveFPRegistersTest.java \
-  compiler/memoryinitialization/ZeroTLABTest.java \
-  compiler/classUnloading/methodUnloading/TestOverloadCompileQueues.java \
-  :hotspot_compiler_arraycopy
-
 tier1_compiler_1 = \
   compiler/arraycopy/ \
   compiler/blackhole/ \
   compiler/c1/ \
   compiler/c2/ \
+  -compiler/arraycopy/stress \
   -compiler/c2/Test6850611.java \
   -compiler/c2/cr6890943/Test6890943.java \
   -compiler/c2/Test6905845.java \
@@ -179,8 +167,7 @@ tier1_compiler_1 = \
   -compiler/c2/stemmer \
   -compiler/c2/Test6792161.java \
   -compiler/c2/Test6603011.java \
-  -compiler/c2/Test6912517.java \
-  -:hotspot_slow_compiler
+  -compiler/c2/Test6912517.java
 
 tier1_compiler_2 = \
   compiler/classUnloading/ \
@@ -197,7 +184,10 @@ tier1_compiler_2 = \
   compiler/integerArithmetic/ \
   compiler/interpreter/ \
   compiler/jvmci/ \
-  -:hotspot_slow_compiler
+  -compiler/classUnloading/methodUnloading/TestOverloadCompileQueues.java \
+  -compiler/codecache/stress \
+  -compiler/codegen/aes \
+  -compiler/gcbarriers/PreserveFPRegistersTest.java
 
 tier1_compiler_3 = \
   compiler/intrinsics/ \
@@ -221,6 +211,7 @@ tier1_compiler_3 = \
   -compiler/intrinsics/bigInteger/TestMultiplyToLen.java \
   -compiler/intrinsics/zip/TestAdler32.java \
   -compiler/loopopts/Test7052494.java \
+  -compiler/memoryinitialization/ZeroTLABTest.java \
   -compiler/runtime/Test6826736.java
 
 tier2_compiler = \
@@ -230,7 +221,6 @@ tier2_compiler = \
   compiler/cha/ \
   compiler/controldependency/ \
   compiler/conversions/ \
-  compiler/codegen/ \
   compiler/linkage/ \
   compiler/loopstripmining/ \
   compiler/loopopts/Test7052494.java \
@@ -248,8 +238,7 @@ tier2_compiler = \
   compiler/runtime/Test6826736.java \
   compiler/stable/ \
   compiler/stringopts/ \
-  -:tier1_compiler \
-  -:hotspot_slow_compiler
+  -:tier1_compiler
 
 tier3_compiler = \
   :hotspot_compiler \

From 829d7a845e18ec483379abf3a3fccb596d899f25 Mon Sep 17 00:00:00 2001
From: Leonid Mesnik <lmesnik@openjdk.org>
Date: Tue, 25 Feb 2025 19:20:05 +0000
Subject: [PATCH 119/587] 8339889: Several compiler tests ignore vm flags and
 not marked as flagless

Reviewed-by: thartmann
---
 .../jtreg/compiler/c2/TestReduceAllocationAndHeapDump.java    | 4 ++--
 test/hotspot/jtreg/compiler/calls/NativeCalls.java            | 3 ++-
 test/hotspot/jtreg/compiler/debug/TestStress.java             | 3 ++-
 .../compiler/inlining/TestDuplicatedLateInliningOutput.java   | 2 ++
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/test/hotspot/jtreg/compiler/c2/TestReduceAllocationAndHeapDump.java b/test/hotspot/jtreg/compiler/c2/TestReduceAllocationAndHeapDump.java
index 9d1e97e253f..e2d45d73161 100644
--- a/test/hotspot/jtreg/compiler/c2/TestReduceAllocationAndHeapDump.java
+++ b/test/hotspot/jtreg/compiler/c2/TestReduceAllocationAndHeapDump.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -54,7 +54,7 @@ public class TestReduceAllocationAndHeapDump {
                 HeapDumper.class.getName()
             };
 
-            ProcessBuilder pb = ProcessTools.createLimitedTestJavaProcessBuilder(dumperArgs);
+            ProcessBuilder pb = ProcessTools.createTestJavaProcessBuilder(dumperArgs);
             Process p = pb.start();
             OutputAnalyzer out = new OutputAnalyzer(p);
 
diff --git a/test/hotspot/jtreg/compiler/calls/NativeCalls.java b/test/hotspot/jtreg/compiler/calls/NativeCalls.java
index d0d3abfb0c4..edb371b765b 100644
--- a/test/hotspot/jtreg/compiler/calls/NativeCalls.java
+++ b/test/hotspot/jtreg/compiler/calls/NativeCalls.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright (c) 2025, 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.
  *
@@ -104,7 +105,7 @@ public class NativeCalls {
             ArrayList<String> command = new ArrayList<String>(v.options);
             command.addAll(baseOptions);
             command.add(v.compile);
-            ProcessBuilder pb = ProcessTools.createLimitedTestJavaProcessBuilder(command);
+            ProcessBuilder pb = ProcessTools.createTestJavaProcessBuilder(command);
             OutputAnalyzer analyzer = new OutputAnalyzer(pb.start());
             analyzer.shouldHaveExitValue(0);
             System.out.println(analyzer.getOutput());
diff --git a/test/hotspot/jtreg/compiler/debug/TestStress.java b/test/hotspot/jtreg/compiler/debug/TestStress.java
index cdeecff91cd..6678d09e649 100644
--- a/test/hotspot/jtreg/compiler/debug/TestStress.java
+++ b/test/hotspot/jtreg/compiler/debug/TestStress.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -32,6 +32,7 @@ import jdk.test.lib.Asserts;
  * @key stress randomness
  * @bug 8252219 8256535 8317349
  * @requires vm.debug == true & vm.compiler2.enabled
+ * @requires vm.flagless
  * @summary Tests that stress compilations with the same seed yield the same
  *          IGVN, CCP, and macro expansion traces.
  * @library /test/lib /
diff --git a/test/hotspot/jtreg/compiler/inlining/TestDuplicatedLateInliningOutput.java b/test/hotspot/jtreg/compiler/inlining/TestDuplicatedLateInliningOutput.java
index ebc5a827ea4..3c8d2c6eba9 100644
--- a/test/hotspot/jtreg/compiler/inlining/TestDuplicatedLateInliningOutput.java
+++ b/test/hotspot/jtreg/compiler/inlining/TestDuplicatedLateInliningOutput.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2023, Red Hat and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -27,6 +28,7 @@
  * @summary late inlining output shouldn't produce both failure and success messages
  * @library /test/lib
  * @requires vm.compiler2.enabled
+ * @requires vm.flagless
  * @run driver compiler.inlining.TestDuplicatedLateInliningOutput
  */
 

From d422abc55aa93d8603d29d269dfb3325bd77f34d Mon Sep 17 00:00:00 2001
From: Ioi Lam <iklam@openjdk.org>
Date: Tue, 25 Feb 2025 19:25:18 +0000
Subject: [PATCH 120/587] 8350668: has_extra_module_paths in filemap.cpp may be
 uninitialized

Reviewed-by: ccheung, shade
---
 src/hotspot/share/cds/filemap.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/hotspot/share/cds/filemap.cpp b/src/hotspot/share/cds/filemap.cpp
index 015032b2d38..7db8e78743e 100644
--- a/src/hotspot/share/cds/filemap.cpp
+++ b/src/hotspot/share/cds/filemap.cpp
@@ -303,7 +303,7 @@ bool FileMapInfo::validate_class_location() {
   assert(CDSConfig::is_using_archive(), "runtime only");
 
   AOTClassLocationConfig* config = header()->class_location_config();
-  bool has_extra_module_paths;
+  bool has_extra_module_paths = false;
   if (!config->validate(header()->has_aot_linked_classes(), &has_extra_module_paths)) {
     if (PrintSharedArchiveAndExit) {
       MetaspaceShared::set_archive_loading_failed();

From a3188e0406bcd69468de0444038525d3d069699f Mon Sep 17 00:00:00 2001
From: Archie Cobbs <acobbs@openjdk.org>
Date: Tue, 25 Feb 2025 19:39:00 +0000
Subject: [PATCH 121/587] 8349991: GraphUtils.java can use String.replace()
 instead of String.replaceAll()

Reviewed-by: mcimadamore
---
 .../classes/com/sun/tools/javac/util/GraphUtils.java      | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/util/GraphUtils.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/util/GraphUtils.java
index 3d0aab4b010..8620caf3ee5 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/util/GraphUtils.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/util/GraphUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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,9 +251,9 @@ public class GraphUtils {
         }
 
         protected String formatProperties(Properties p) {
-            return p.toString().replaceAll(",", " ")
-                .replaceAll("\\{", "[")
-                .replaceAll("\\}", "]");
+            return p.toString().replace(',', ' ')
+                .replace('{', '[')
+                .replace('}', ']');
         }
 
         protected static String wrap(String s) {

From b78043fdc64dba62293631ad0cc263029e8dfb1e Mon Sep 17 00:00:00 2001
From: Archie Cobbs <acobbs@openjdk.org>
Date: Tue, 25 Feb 2025 19:39:21 +0000
Subject: [PATCH 122/587] 8320220: Compilation of cyclic hierarchy causes
 infinite recursion

Reviewed-by: vromero, jlahoda
---
 .../classes/com/sun/tools/javac/comp/Check.java | 17 ++++++++++++-----
 .../tools/javac/ClassCycle/ClassCycle4.java     | 10 ++++++++++
 .../tools/javac/ClassCycle/ClassCycle4.out      |  2 ++
 3 files changed, 24 insertions(+), 5 deletions(-)
 create mode 100644 test/langtools/tools/javac/ClassCycle/ClassCycle4.java
 create mode 100644 test/langtools/tools/javac/ClassCycle/ClassCycle4.out

diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Check.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Check.java
index dbf66c88f0a..a27bf235e7e 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Check.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Check.java
@@ -2374,7 +2374,12 @@ public class Check {
                 return;
             if (seenClasses.contains(c)) {
                 errorFound = true;
-                noteCyclic(pos, (ClassSymbol)c);
+                log.error(pos, Errors.CyclicInheritance(c));
+                seenClasses.stream()
+                  .filter(s -> !s.type.isErroneous())
+                  .filter(ClassSymbol.class::isInstance)
+                  .map(ClassSymbol.class::cast)
+                  .forEach(Check.this::handleCyclic);
             } else if (!c.type.isErroneous()) {
                 try {
                     seenClasses.add(c);
@@ -2451,7 +2456,8 @@ public class Check {
         if ((c.flags_field & ACYCLIC) != 0) return true;
 
         if ((c.flags_field & LOCKED) != 0) {
-            noteCyclic(pos, (ClassSymbol)c);
+            log.error(pos, Errors.CyclicInheritance(c));
+            handleCyclic((ClassSymbol)c);
         } else if (!c.type.isErroneous()) {
             try {
                 c.flags_field |= LOCKED;
@@ -2478,9 +2484,10 @@ public class Check {
         return complete;
     }
 
-    /** Note that we found an inheritance cycle. */
-    private void noteCyclic(DiagnosticPosition pos, ClassSymbol c) {
-        log.error(pos, Errors.CyclicInheritance(c));
+    /** Handle finding an inheritance cycle on a class by setting
+     *  the class' and its supertypes' types to the error type.
+     **/
+    private void handleCyclic(ClassSymbol c) {
         for (List<Type> l=types.interfaces(c.type); l.nonEmpty(); l=l.tail)
             l.head = types.createErrorType((ClassSymbol)l.head.tsym, Type.noType);
         Type st = types.supertype(c.type);
diff --git a/test/langtools/tools/javac/ClassCycle/ClassCycle4.java b/test/langtools/tools/javac/ClassCycle/ClassCycle4.java
new file mode 100644
index 00000000000..dbe13a1bf9d
--- /dev/null
+++ b/test/langtools/tools/javac/ClassCycle/ClassCycle4.java
@@ -0,0 +1,10 @@
+/*
+ * @test /nodynamiccopyright/
+ * @bug 8320220
+ * @summary Fix infinite recursion in cyclic inheritance situation
+ * @compile/fail/ref=ClassCycle4.out -XDrawDiagnostics ClassCycle4.java
+ */
+
+interface ClassCycle4 extends I1, I2 {}
+interface I1 extends ClassCycle4 {}
+interface I2 extends ClassCycle4 {}
diff --git a/test/langtools/tools/javac/ClassCycle/ClassCycle4.out b/test/langtools/tools/javac/ClassCycle/ClassCycle4.out
new file mode 100644
index 00000000000..2e3d28750ab
--- /dev/null
+++ b/test/langtools/tools/javac/ClassCycle/ClassCycle4.out
@@ -0,0 +1,2 @@
+ClassCycle4.java:8:1: compiler.err.cyclic.inheritance: ClassCycle4
+1 error

From d4fdc796aac8ece930c28579d285b21acf8e6ddb Mon Sep 17 00:00:00 2001
From: Damon Nguyen <dnguyen@openjdk.org>
Date: Tue, 25 Feb 2025 19:40:39 +0000
Subject: [PATCH 123/587] 8344981: [REDO] JDK-6672644 JComboBox still scrolling
 if switch to another window and return back

Co-authored-by: Alexander Zvegintsev <azvegint@openjdk.org>
Reviewed-by: azvegint, psadhukhan, honkar
---
 .../swing/plaf/basic/BasicScrollBarUI.java    |  17 +-
 .../JComboBox/JComboBoxScrollFocusTest.java   | 149 ++++++++++++++++++
 2 files changed, 162 insertions(+), 4 deletions(-)
 create mode 100644 test/jdk/javax/swing/JComboBox/JComboBoxScrollFocusTest.java

diff --git a/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicScrollBarUI.java b/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicScrollBarUI.java
index 60274d766cd..baff1d1b81e 100644
--- a/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicScrollBarUI.java
+++ b/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicScrollBarUI.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -1609,6 +1609,11 @@ public class BasicScrollBarUI
 
         /** {@inheritDoc} */
         public void actionPerformed(ActionEvent e) {
+            // If scrollbar isn't visible, stop the timer
+            if (!scrollbar.isShowing()) {
+                stopScrollTimer(e);
+                return;
+            }
             // If frame is disabled and timer is started in mousePressed
             // and mouseReleased is not called, then timer will not be stopped
             // Stop the timer if frame is disabled
@@ -1616,9 +1621,7 @@ public class BasicScrollBarUI
             do {
                 if (parent instanceof JFrame par) {
                     if (!par.isEnabled()) {
-                        ((Timer)e.getSource()).stop();
-                        buttonListener.handledEvent = false;
-                        scrollbar.setValueIsAdjusting(false);
+                        stopScrollTimer(e);
                         return;
                     }
                     break;
@@ -1660,6 +1663,12 @@ public class BasicScrollBarUI
         }
     }
 
+    private void stopScrollTimer(ActionEvent e) {
+        ((Timer) e.getSource()).stop();
+        buttonListener.handledEvent = false;
+        scrollbar.setValueIsAdjusting(false);
+    }
+
     private boolean isMouseLeftOfThumb() {
         return trackListener.currentMouseX < getThumbBounds().x;
     }
diff --git a/test/jdk/javax/swing/JComboBox/JComboBoxScrollFocusTest.java b/test/jdk/javax/swing/JComboBox/JComboBoxScrollFocusTest.java
new file mode 100644
index 00000000000..c7c3ba2f12e
--- /dev/null
+++ b/test/jdk/javax/swing/JComboBox/JComboBoxScrollFocusTest.java
@@ -0,0 +1,149 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please 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.Component;
+import java.awt.Point;
+import java.awt.Rectangle;
+import java.awt.Robot;
+import java.awt.event.InputEvent;
+import java.util.concurrent.FutureTask;
+import java.util.concurrent.TimeUnit;
+
+import javax.swing.JComboBox;
+import javax.swing.JFrame;
+import javax.swing.JScrollBar;
+import javax.swing.JScrollPane;
+import javax.swing.SwingUtilities;
+import javax.swing.plaf.basic.BasicComboPopup;
+
+/*
+ * @test
+ * @key headful
+ * @bug 6672644
+ * @summary Tests JComboBox scrollbar behavior when alt-tabbing
+ * @run main JComboBoxScrollFocusTest
+ */
+
+public class JComboBoxScrollFocusTest {
+    private static Robot robot;
+    private static JFrame comboboxFrame;
+    private static JComboBox<String> combobox;
+
+    public static void main(String[] args) throws Exception {
+        robot = new Robot();
+        try {
+            SwingUtilities.invokeAndWait(JComboBoxScrollFocusTest::createAndShowGUI);
+            doTest();
+        } finally {
+            SwingUtilities.invokeAndWait(comboboxFrame::dispose);
+        }
+    }
+
+    private static void createAndShowGUI() {
+        comboboxFrame = new JFrame("JComboBoxScrollFocusTest Test Frame");
+        combobox = new JComboBox<>();
+        for (int i = 0; i < 100; i++) {
+            combobox.addItem(String.valueOf(i));
+        }
+        comboboxFrame.add(combobox);
+        comboboxFrame.setSize(400, 200);
+        comboboxFrame.setLocationRelativeTo(null);
+        comboboxFrame.setVisible(true);
+    }
+
+    static Rectangle getOnScreenBoundsOnEDT(Component component) throws Exception {
+        robot.waitForIdle();
+        FutureTask<Rectangle> task = new FutureTask<>(()
+                -> new Rectangle(component.getLocationOnScreen(),
+                component.getSize()));
+        SwingUtilities.invokeLater(task);
+        return task.get(500, TimeUnit.MILLISECONDS);
+    }
+
+    private static JScrollBar getScrollBar() {
+        BasicComboPopup popup = (BasicComboPopup) combobox
+                .getAccessibleContext().getAccessibleChild(0);
+        JScrollPane scrollPane = (JScrollPane) popup
+                .getAccessibleContext().getAccessibleChild(0);
+        return scrollPane.getVerticalScrollBar();
+    }
+
+    private static int getScrollbarValue() throws Exception {
+        FutureTask<Integer> task = new FutureTask<>(() -> {
+            JScrollBar scrollBar = getScrollBar();
+            return scrollBar.getValue();
+        });
+        SwingUtilities.invokeAndWait(task);
+
+        return task.get(500, TimeUnit.MILLISECONDS);
+    }
+
+    private static void doTest() throws Exception {
+        robot.waitForIdle();
+        robot.delay(500);
+
+        Rectangle rectangle = getOnScreenBoundsOnEDT(combobox);
+
+        Point ptOpenComboboxPopup = new Point(rectangle.x + rectangle.width - 5,
+                rectangle.y + rectangle.height / 2);
+
+        robot.mouseMove(ptOpenComboboxPopup.x, ptOpenComboboxPopup.y);
+        robot.mousePress(InputEvent.BUTTON1_DOWN_MASK);
+        robot.mouseRelease(InputEvent.BUTTON1_DOWN_MASK);
+        robot.waitForIdle();
+        robot.delay(500);
+
+        JScrollBar scrollBar = getScrollBar();
+
+        // Start scrolling
+        Rectangle scrollbarBounds = getOnScreenBoundsOnEDT(scrollBar);
+        robot.mouseMove(scrollbarBounds.x + scrollbarBounds.width / 2,
+                scrollbarBounds.y + scrollbarBounds.height - 5);
+        robot.mousePress(InputEvent.BUTTON1_DOWN_MASK);
+
+        robot.delay(1000);
+
+        if (getScrollbarValue() == 0) {
+            throw new RuntimeException("The scrollbar is not scrolling");
+        }
+
+        // closing popup by moving focus to the main window
+        comboboxFrame.requestFocus();
+        robot.waitForIdle();
+        robot.mouseRelease(InputEvent.BUTTON1_DOWN_MASK);
+
+        robot.waitForIdle();
+        robot.delay(500);
+
+        // open popup again
+        robot.mouseMove(ptOpenComboboxPopup.x, ptOpenComboboxPopup.y);
+        robot.mousePress(InputEvent.BUTTON1_DOWN_MASK);
+        robot.mouseRelease(InputEvent.BUTTON1_DOWN_MASK);
+        robot.waitForIdle();
+        robot.delay(500);
+
+        if (getScrollbarValue() != 0) {
+            throw new RuntimeException("The scroll bar is scrolling");
+        }
+    }
+}

From 2efb0336e0c257c34f9e49a50cbad1704691582e Mon Sep 17 00:00:00 2001
From: Alexey Semenyuk <asemenyuk@openjdk.org>
Date: Tue, 25 Feb 2025 21:53:24 +0000
Subject: [PATCH 124/587] 8350601: Miscellaneous updates to jpackage test lib

Reviewed-by: almatvee
---
 .../jdk/jpackage/test/TKitTest.java           | 146 +++++++++++++++++-
 .../jdk/jpackage/test/AdditionalLauncher.java |  17 +-
 .../jdk/jpackage/test/JPackageCommand.java    |  11 +-
 .../helpers/jdk/jpackage/test/TKit.java       | 105 +++++++++----
 .../jpackage/share/AppImagePackageTest.java   |   2 +-
 5 files changed, 227 insertions(+), 54 deletions(-)

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
index 4cddb1eb912..f7f76a209cc 100644
--- a/test/jdk/tools/jpackage/helpers-test/jdk/jpackage/test/TKitTest.java
+++ b/test/jdk/tools/jpackage/helpers-test/jdk/jpackage/test/TKitTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2024, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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,24 @@ import static jdk.jpackage.internal.util.function.ThrowingRunnable.toRunnable;
 import static jdk.jpackage.internal.util.function.ThrowingSupplier.toSupplier;
 
 import java.lang.reflect.Method;
+import java.nio.file.Files;
+import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.List;
 import java.util.Objects;
+import java.util.Optional;
+import java.util.function.Consumer;
 import java.util.stream.Stream;
+import jdk.jpackage.internal.util.function.ThrowingFunction;
 import jdk.jpackage.internal.util.function.ThrowingRunnable;
 import jdk.jpackage.test.Annotations.ParameterSupplier;
 import jdk.jpackage.test.Annotations.Test;
 
 public class TKitTest extends JUnitAdapter {
 
-    public static Collection<Object[]> assertTestsData() {
+    public static Collection<Object[]> test() {
         List<MethodCallConfig> data = new ArrayList<>();
 
         var assertFunc = MethodCallConfig.build("assertTrue", boolean.class, String.class);
@@ -57,6 +62,12 @@ public class TKitTest extends JUnitAdapter {
         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("assertEquals", boolean.class, boolean.class, String.class);
+        data.addAll(List.of(assertFunc.args(true, true).pass().expectLog("assertEquals(true)").createForMessage("Emu")));
+        data.addAll(List.of(assertFunc.args(false, false).pass().expectLog("assertEquals(false)").createForMessage("Emu")));
+        data.addAll(List.of(assertFunc.args(true, false).fail().expectLog("Expected [true]. Actual [false]").createForMessage("Emu")));
+        data.addAll(List.of(assertFunc.args(false, true).fail().expectLog("Expected [false]. Actual [true]").createForMessage("Emu")));
+
         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")));
@@ -65,6 +76,12 @@ public class TKitTest extends JUnitAdapter {
         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("assertNotEquals", boolean.class, boolean.class, String.class);
+        data.addAll(List.of(assertFunc.args(true, false).pass().expectLog("assertNotEquals(true, false)").createForMessage("Sparrow")));
+        data.addAll(List.of(assertFunc.args(false, true).pass().expectLog("assertNotEquals(false, true)").createForMessage("Sparrow")));
+        data.addAll(List.of(assertFunc.args(true, true).fail().expectLog("Unexpected [true] value").createForMessage("Sparrow")));
+        data.addAll(List.of(assertFunc.args(false, false).fail().expectLog("Unexpected [false] value").createForMessage("Sparrow")));
+
         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")));
@@ -186,13 +203,136 @@ public class TKitTest extends JUnitAdapter {
     }
 
     @Test
-    @ParameterSupplier("assertTestsData")
+    @ParameterSupplier
     public void test(MethodCallConfig methodCall) {
         runAssertWithExpectedLogOutput(() -> {
             methodCall.method.invoke(null, methodCall.args);
         }, methodCall.expectFail, methodCall.expectLog);
     }
 
+    @Test
+    @ParameterSupplier("testCreateTempPath")
+    public void testCreateTempFile(CreateTempTestSpec testSpec) throws Throwable {
+        testSpec.test(TKit::createTempFile, TKit::assertFileExists);
+    }
+
+    @Test
+    @ParameterSupplier("testCreateTempPath")
+    public void testCreateTempDirectory(CreateTempTestSpec testSpec) throws Throwable {
+        testSpec.test(TKit::createTempDirectory, TKit::assertDirectoryEmpty);
+    }
+
+    record CreateTempTestSpec(String role, Path expectedPath, List<Path> existingFiles,
+            Class<? extends Exception> expectedExceptionClass) {
+
+        CreateTempTestSpec {
+            Objects.requireNonNull(existingFiles);
+            if ((expectedExceptionClass == null) == (expectedPath == null)) {
+                throw new IllegalArgumentException("Only one of `expectedPath` and `expectedExceptionClass` should be set");
+            }
+        }
+
+        void test(ThrowingFunction<String, Path> createTempPath, Consumer<Path> assertTempPathExists) throws Throwable {
+            for (var existingFile : existingFiles) {
+                existingFile = TKit.workDir().resolve(existingFile);
+
+                Files.createDirectories(existingFile.getParent());
+                Files.createFile(existingFile);
+            }
+
+            if (expectedExceptionClass != null) {
+                try {
+                    createTempPath.apply(role);
+                    TKit.assertUnexpected("Exception expected");
+                } catch (Exception ex) {
+                    TKit.assertTrue(expectedExceptionClass.isInstance(ex),
+                            String.format("Check exception [%s] is instance of %s", ex, expectedExceptionClass));
+                }
+            } else {
+                final var tempPath = createTempPath.apply(role);
+
+                assertTempPathExists.accept(tempPath);
+                TKit.assertTrue(tempPath.startsWith(TKit.workDir()), "Check temp path created in the work directory");
+
+                final var relativeTempPath = TKit.workDir().relativize(tempPath);
+                TKit.assertTrue(expectedPath.equals(relativeTempPath),
+                        String.format("Check [%s]=[%s]", expectedPath, relativeTempPath));
+            }
+        }
+
+        @Override
+        public String toString() {
+            final var sb = new StringBuilder();
+            sb.append("role=").append(role);
+            if (expectedPath != null) {
+                sb.append("; expected=").append(expectedPath);
+            }
+            if (!existingFiles.isEmpty()) {
+                sb.append("; exits=").append(existingFiles);
+            }
+            if (expectedExceptionClass != null) {
+                sb.append("; exception=").append(expectedExceptionClass);
+            }
+            return sb.toString();
+        }
+
+        static Builder role(String role) {
+            return new Builder(role);
+        }
+
+        final static class Builder {
+
+            private Builder(String role) {
+                this.role = role;
+            }
+
+            CreateTempTestSpec create() {
+                return new CreateTempTestSpec(role, expectedPath, existingFiles, expectedExceptionClass);
+            }
+
+            Builder expectedPath(String v) {
+                expectedPath = Optional.of(v).map(Path::of).orElse(null);
+                return this;
+            }
+
+            Builder existingFiles(String ...v) {
+                existingFiles.addAll(Stream.of(v).map(Path::of).toList());
+                return this;
+            }
+
+            Builder expectedExceptionClass(Class<? extends Exception> v) {
+                expectedExceptionClass = v;
+                return this;
+            }
+
+            private final String role;
+            private Path expectedPath;
+            private final List<Path> existingFiles = new ArrayList<>();
+            private Class<? extends Exception> expectedExceptionClass;
+        }
+    }
+
+    public static Collection<Object[]> testCreateTempPath() {
+        return Stream.of(
+                CreateTempTestSpec.role("foo").expectedPath("foo"),
+                CreateTempTestSpec.role("foo.b").expectedPath("foo.b"),
+                CreateTempTestSpec.role("foo").expectedPath("foo-0").existingFiles("foo"),
+                CreateTempTestSpec.role("foo.b").expectedPath("foo-0.b").existingFiles("foo.b"),
+                CreateTempTestSpec.role("foo..b").expectedPath("foo.-0.b").existingFiles("foo..b"),
+                CreateTempTestSpec.role("a.b.c.d").expectedPath("a.b.c-0.d").existingFiles("a.b.c.d"),
+                CreateTempTestSpec.role("foo").expectedPath("foo-1").existingFiles("foo", "foo-0"),
+                CreateTempTestSpec.role("foo/bar/buz").expectedPath("foo/bar/buz"),
+                CreateTempTestSpec.role("foo/bar/buz").expectedPath("foo/bar/buz-0").existingFiles("foo/bar/buz"),
+                CreateTempTestSpec.role("foo/bar/buz.tmp").expectedPath("foo/bar/buz-0.tmp").existingFiles("foo/bar/buz.tmp"),
+                CreateTempTestSpec.role("foo/bar").expectedPath("foo/bar-0").existingFiles("foo/bar/buz"),
+                CreateTempTestSpec.role(Path.of("").toAbsolutePath().toString()).expectedExceptionClass(IllegalArgumentException.class),
+                CreateTempTestSpec.role(null).expectedExceptionClass(NullPointerException.class),
+                CreateTempTestSpec.role("").expectedExceptionClass(IllegalArgumentException.class)
+        ).map(CreateTempTestSpec.Builder::create).map(testSpec -> {
+            return new Object[] { testSpec };
+        }).toList();
+    }
+
     private static void runAssertWithExpectedLogOutput(ThrowingRunnable action,
             boolean expectFail, String... expectLogStrings) {
         runWithExpectedLogOutput(() -> {
diff --git a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/AdditionalLauncher.java b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/AdditionalLauncher.java
index 03914759f16..5089dc0c602 100644
--- a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/AdditionalLauncher.java
+++ b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/AdditionalLauncher.java
@@ -186,21 +186,10 @@ public class AdditionalLauncher {
         return Optional.of(shell[0]).get();
     }
 
-    private void initialize(JPackageCommand cmd) {
-        Path propsFile = TKit.workDir().resolve(name + ".properties");
-        if (Files.exists(propsFile)) {
-            // File with the given name exists, pick another name that
-            // will not reference existing file.
-            try {
-                propsFile = TKit.createTempFile(propsFile);
-                TKit.deleteIfExists(propsFile);
-            } catch (IOException ex) {
-                rethrowUnchecked(ex);
-            }
-        }
+    private void initialize(JPackageCommand cmd) throws IOException {
+        final Path propsFile = TKit.createTempFile(name + ".properties");
 
-        cmd.addArguments("--add-launcher", String.format("%s=%s", name,
-                    propsFile));
+        cmd.addArguments("--add-launcher", String.format("%s=%s", name, propsFile));
 
         List<Map.Entry<String, String>> properties = new ArrayList<>();
         if (defaultArguments != null) {
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 418d7377ec6..6fc5cfad3f9 100644
--- a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/JPackageCommand.java
+++ b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/JPackageCommand.java
@@ -252,11 +252,7 @@ public class JPackageCommand extends CommandArguments<JPackageCommand> {
 
     public JPackageCommand setInputToEmptyDirectory() {
         if (Files.exists(inputDir())) {
-            try {
-                setArgumentValue("--input", TKit.createTempDirectory("input"));
-            } catch (IOException ex) {
-                throw new RuntimeException(ex);
-            }
+            setArgumentValue("--input", TKit.createTempDirectory("input"));
         }
         return this;
     }
@@ -841,6 +837,11 @@ public class JPackageCommand extends CommandArguments<JPackageCommand> {
                 TKit.assertFileExists(cmd.appLauncherCfgPath(null));
             }
         }),
+        MAIN_JAR_FILE(cmd -> {
+            Optional.ofNullable(cmd.getArgumentValue("--main-jar", () -> null)).ifPresent(mainJar -> {
+                TKit.assertFileExists(cmd.appLayout().appDirectory().resolve(mainJar));
+            });
+        }),
         RUNTIME_DIRECTORY(cmd -> {
             TKit.assertDirectoryExists(cmd.appRuntimeDirectory());
             if (TKit.isOSX()) {
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 d3473952cf8..f10415b5e97 100644
--- a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/TKit.java
+++ b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/TKit.java
@@ -22,18 +22,21 @@
  */
 package jdk.jpackage.test;
 
+import static java.nio.file.StandardWatchEventKinds.ENTRY_CREATE;
+import static java.nio.file.StandardWatchEventKinds.ENTRY_MODIFY;
+import static java.util.stream.Collectors.toSet;
+
 import java.io.Closeable;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.PrintStream;
+import java.io.UncheckedIOException;
 import java.lang.reflect.InvocationTargetException;
 import java.nio.file.FileSystems;
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.nio.file.StandardWatchEventKinds;
 import java.nio.file.StandardCopyOption;
-import static java.nio.file.StandardWatchEventKinds.ENTRY_CREATE;
-import static java.nio.file.StandardWatchEventKinds.ENTRY_MODIFY;
+import java.nio.file.StandardWatchEventKinds;
 import java.nio.file.WatchEvent;
 import java.nio.file.WatchKey;
 import java.nio.file.WatchService;
@@ -58,13 +61,13 @@ import java.util.function.Consumer;
 import java.util.function.Predicate;
 import java.util.function.Supplier;
 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.internal.util.function.ExceptionBox;
 import jdk.jpackage.internal.util.function.ThrowingConsumer;
 import jdk.jpackage.internal.util.function.ThrowingRunnable;
 import jdk.jpackage.internal.util.function.ThrowingSupplier;
+import jdk.jpackage.internal.util.function.ThrowingUnaryOperator;
 
 public final class TKit {
 
@@ -288,9 +291,17 @@ public final class TKit {
         }
     }
 
-    private static final String TEMP_FILE_PREFIX = null;
+    private static Path createUniquePath(String defaultName) {
+        return createUniquePath(defaultName, workDir());
+    }
+
+    private static Path createUniquePath(String defaultName, Path basedir) {
+        Objects.requireNonNull(defaultName);
+        Objects.requireNonNull(basedir);
+        if (defaultName.isEmpty()) {
+            throw new IllegalArgumentException();
+        }
 
-    private static Path createUniqueFileName(String defaultName) {
         final String[] nameComponents;
 
         int separatorIdx = defaultName.lastIndexOf('.');
@@ -304,7 +315,6 @@ public final class TKit {
                 separatorIdx + 1)};
         }
 
-        final Path basedir = workDir();
         int i = 0;
         for (; i < 100; ++i) {
             Path path = basedir.resolve(String.join(".", nameComponents));
@@ -320,32 +330,42 @@ public final class TKit {
                 baseName, i));
     }
 
-    public static Path createTempDirectory(String role) throws IOException {
-        if (role == null) {
-            return Files.createTempDirectory(workDir(), TEMP_FILE_PREFIX);
+    public static Path createTempDirectory(String role) {
+        return createTempDirectory(Path.of(role));
+    }
+
+    public static Path createTempDirectory(Path role) {
+        return createTempPath(role, Files::createDirectory);
+    }
+
+    public static Path createTempFile(String role) {
+        return createTempFile(Path.of(role));
+    }
+
+    public static Path createTempFile(Path role) {
+        return createTempPath(role, Files::createFile);
+    }
+
+    private static Path createTempPath(Path templatePath, ThrowingUnaryOperator<Path> createPath) {
+        if (templatePath.isAbsolute()) {
+            throw new IllegalArgumentException();
+        }
+        final Path basedir;
+        if (templatePath.getNameCount() > 1) {
+            basedir = workDir().resolve(templatePath.getParent());
+        } else {
+            basedir = workDir();
         }
-        return Files.createDirectory(createUniqueFileName(role));
-    }
 
-    public static Path createTempFile(Path templateFile) throws
-            IOException {
-        return Files.createFile(createUniqueFileName(
-                templateFile.getFileName().toString()));
-    }
+        final var path = createUniquePath(templatePath.getFileName().toString(), basedir);
 
-    public static Path withTempFile(Path templateFile,
-            ThrowingConsumer<Path> action) {
-        final Path tempFile = ThrowingSupplier.toSupplier(() -> createTempFile(
-                templateFile)).get();
-        boolean keepIt = true;
         try {
-            ThrowingConsumer.toConsumer(action).accept(tempFile);
-            keepIt = false;
-            return tempFile;
-        } finally {
-            if (tempFile != null && !keepIt) {
-                ThrowingRunnable.toRunnable(() -> Files.deleteIfExists(tempFile)).run();
-            }
+            Files.createDirectories(path.getParent());
+            return createPath.apply(path);
+        } catch (IOException ex) {
+            throw new UncheckedIOException(ex);
+        } catch (Throwable t) {
+            throw ExceptionBox.rethrowUnchecked(t);
         }
     }
 
@@ -509,7 +529,7 @@ public final class TKit {
 
     public static Path createRelativePathCopy(final Path file) {
         Path fileCopy = ThrowingSupplier.toSupplier(() -> {
-            Path localPath = createTempFile(file);
+            Path localPath = createTempFile(file.getFileName());
             Files.copy(file, localPath, StandardCopyOption.REPLACE_EXISTING);
             return localPath;
         }).get().toAbsolutePath().normalize();
@@ -609,6 +629,29 @@ public final class TKit {
                 actual), msg));
     }
 
+    public static void assertEquals(boolean expected, boolean actual, String msg) {
+        currentTest.notifyAssert();
+        if (expected != actual) {
+            error(concatMessages(String.format(
+                    "Expected [%s]. Actual [%s]", expected, actual),
+                    msg));
+        }
+
+        traceAssert(concatMessages(String.format("assertEquals(%s)", expected), msg));
+    }
+
+    public static void assertNotEquals(boolean expected, boolean actual, String msg) {
+        currentTest.notifyAssert();
+        if (expected == actual) {
+            error(concatMessages(String.format("Unexpected [%s] value", actual),
+                    msg));
+        }
+
+        traceAssert(concatMessages(String.format("assertNotEquals(%s, %s)", expected,
+                actual), msg));
+    }
+
+
     public static void assertEquals(String expected, String actual, String msg) {
         currentTest.notifyAssert();
         if ((actual != null && !actual.equals(expected))
@@ -703,7 +746,7 @@ public final class TKit {
         assertDirectoryExists(path, Optional.of(true));
     }
 
-    public static void assertDirectoryExists(Path path, Optional<Boolean> isEmptyCheck) {
+    private static void assertDirectoryExists(Path path, Optional<Boolean> isEmptyCheck) {
         assertPathExists(path, true);
         boolean isDirectory = Files.isDirectory(path);
         if (isEmptyCheck.isEmpty() || !isDirectory) {
diff --git a/test/jdk/tools/jpackage/share/AppImagePackageTest.java b/test/jdk/tools/jpackage/share/AppImagePackageTest.java
index 030cca50f14..fc545cc1f55 100644
--- a/test/jdk/tools/jpackage/share/AppImagePackageTest.java
+++ b/test/jdk/tools/jpackage/share/AppImagePackageTest.java
@@ -73,7 +73,7 @@ public class AppImagePackageTest {
     public static void testEmpty(boolean withIcon) throws IOException {
         final String name = "EmptyAppImagePackageTest";
         final String imageName = name + (TKit.isOSX() ? ".app" : "");
-        Path appImageDir = TKit.createTempDirectory(null).resolve(imageName);
+        Path appImageDir = TKit.createTempDirectory("appimage").resolve(imageName);
 
         Files.createDirectories(appImageDir.resolve("bin"));
         Path libDir = Files.createDirectories(appImageDir.resolve("lib"));

From 267d69bed6265ec2820f17eb7534ec64d80ad093 Mon Sep 17 00:00:00 2001
From: Alexey Semenyuk <asemenyuk@openjdk.org>
Date: Tue, 25 Feb 2025 22:49:26 +0000
Subject: [PATCH 125/587] 8326447: jpackage creates Windows installers that
 cannot be signed

Reviewed-by: almatvee
---
 src/jdk.jpackage/share/man/jpackage.md        |   6 +
 .../jdk/jpackage/internal/WinExeBundler.java  |  12 +-
 .../resources/WinResources.properties         |   3 +-
 .../jpackage/test/LauncherIconVerifier.java   | 195 +-----------
 .../test/WinExecutableIconVerifier.java       | 290 ++++++++++++++++++
 .../resources/read-executable-icon.ps1        |  54 ++++
 .../windows/WinInstallerResourceTest.java     | 102 ++++++
 7 files changed, 463 insertions(+), 199 deletions(-)
 create mode 100644 test/jdk/tools/jpackage/helpers/jdk/jpackage/test/WinExecutableIconVerifier.java
 create mode 100644 test/jdk/tools/jpackage/resources/read-executable-icon.ps1
 create mode 100644 test/jdk/tools/jpackage/windows/WinInstallerResourceTest.java

diff --git a/src/jdk.jpackage/share/man/jpackage.md b/src/jdk.jpackage/share/man/jpackage.md
index edc76f7caff..61b671579da 100644
--- a/src/jdk.jpackage/share/man/jpackage.md
+++ b/src/jdk.jpackage/share/man/jpackage.md
@@ -686,6 +686,12 @@ jpackage will lookup files by specific names in the resource directory.
 
 :   A Windows Script File (WSF) to run after building embedded MSI installer for EXE installer
 
+`installer.exe`
+
+:   Executable wrapper for MSI installer
+
+    Default resource is *msiwrapper.exe*
+
 
 ### Resource directory files considered only when running on macOS:
 
diff --git a/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WinExeBundler.java b/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WinExeBundler.java
index cc2e9298e99..04838fe6b87 100644
--- a/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WinExeBundler.java
+++ b/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WinExeBundler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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.jpackage.internal;
 
+import static jdk.jpackage.internal.OverridableResource.createResource;
+
 import java.io.IOException;
 import java.io.InputStream;
 import java.nio.file.Files;
@@ -129,9 +131,11 @@ public class WinExeBundler extends AbstractBundler {
 
         // Copy template msi wrapper next to msi file
         final Path exePath = PathUtils.replaceSuffix(msi, ".exe");
-        try (InputStream is = OverridableResource.readDefault(EXE_WRAPPER_NAME)) {
-            Files.copy(is, exePath);
-        }
+
+        createResource(EXE_WRAPPER_NAME, params)
+                .setCategory(I18N.getString("resource.installer-exe"))
+                .setPublicName("installer.exe")
+                .saveToFile(exePath);
 
         new ExecutableRebrander().addAction((resourceLock) -> {
             // Embed msi in msi wrapper exe.
diff --git a/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/resources/WinResources.properties b/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/resources/WinResources.properties
index 506ffa59ed6..91fc8806e10 100644
--- a/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/resources/WinResources.properties
+++ b/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/resources/WinResources.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -41,6 +41,7 @@ resource.shortcutpromptdlg-wix-file=Shortcut prompt dialog WiX project file
 resource.installdirnotemptydlg-wix-file=Not empty install directory dialog WiX project file
 resource.launcher-as-service-wix-file=Service installer WiX project file
 resource.wix-src-conv=XSLT stylesheet converting WiX sources from WiX v3 to WiX v4 format
+resource.installer-exe=installer executable
 
 error.no-wix-tools=Can not find WiX tools. Was looking for WiX v3 light.exe and candle.exe or WiX v4/v5 wix.exe and none was found
 error.no-wix-tools.advice=Download WiX 3.0 or later from https://wixtoolset.org and add it to the PATH.
diff --git a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/LauncherIconVerifier.java b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/LauncherIconVerifier.java
index 05510461c16..a5eb24980ae 100644
--- a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/LauncherIconVerifier.java
+++ b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/LauncherIconVerifier.java
@@ -23,15 +23,9 @@
 
 package jdk.jpackage.test;
 
-import java.awt.image.BufferedImage;
 import java.io.IOException;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.util.Optional;
-import javax.imageio.ImageIO;
-import static jdk.jpackage.internal.util.function.ExceptionBox.rethrowUnchecked;
 
 public final class LauncherIconVerifier {
     public LauncherIconVerifier() {
@@ -68,7 +62,7 @@ public final class LauncherIconVerifier {
 
         if (TKit.isWindows()) {
             TKit.assertPathExists(iconPath, false);
-            WinIconVerifier.instance.verifyLauncherIcon(cmd, launcherName,
+            WinExecutableIconVerifier.verifyLauncherIcon(cmd, launcherName,
                     expectedIcon, expectedDefault);
         } else if (expectedDefault) {
             TKit.assertPathExists(iconPath, true);
@@ -83,193 +77,6 @@ public final class LauncherIconVerifier {
         }
     }
 
-    private static class WinIconVerifier {
-
-        void verifyLauncherIcon(JPackageCommand cmd, String launcherName,
-                Path expectedIcon, boolean expectedDefault) {
-            TKit.withTempDirectory("icons", tmpDir -> {
-                Path launcher = cmd.appLauncherPath(launcherName);
-                Path iconWorkDir = tmpDir.resolve(launcher.getFileName());
-                Path iconContainer = iconWorkDir.resolve("container.exe");
-                Files.createDirectories(iconContainer.getParent());
-                Files.copy(getDefaultAppLauncher(expectedIcon == null
-                        && !expectedDefault), iconContainer);
-                if (expectedIcon != null) {
-                    Executor.tryRunMultipleTimes(() -> {
-                        setIcon(expectedIcon, iconContainer);
-                    }, 3, 5);
-                }
-
-                Path extractedExpectedIcon = extractIconFromExecutable(
-                        iconWorkDir, iconContainer, "expected");
-                Path extractedActualIcon = extractIconFromExecutable(iconWorkDir,
-                        launcher, "actual");
-
-                TKit.trace(String.format(
-                        "Check icon file [%s] of %s launcher is a copy of source icon file [%s]",
-                        extractedActualIcon,
-                        Optional.ofNullable(launcherName).orElse("main"),
-                        extractedExpectedIcon));
-
-                if (Files.mismatch(extractedExpectedIcon, extractedActualIcon)
-                        != -1) {
-                    // On Windows11 .NET API extracting icons from executables
-                    // produce slightly different output for the same icon.
-                    // To workaround it, compare pixels of images and if the
-                    // number of off pixels is below a threshold, assume
-                    // equality.
-                    BufferedImage expectedImg = ImageIO.read(
-                            extractedExpectedIcon.toFile());
-                    BufferedImage actualImg = ImageIO.read(
-                            extractedActualIcon.toFile());
-
-                    int w = expectedImg.getWidth();
-                    int h = expectedImg.getHeight();
-
-                    TKit.assertEquals(w, actualImg.getWidth(),
-                            "Check expected and actual icons have the same width");
-                    TKit.assertEquals(h, actualImg.getHeight(),
-                            "Check expected and actual icons have the same height");
-
-                    int diffPixelCount = 0;
-
-                    for (int i = 0; i != w; ++i) {
-                        for (int j = 0; j != h; ++j) {
-                            int expectedRGB = expectedImg.getRGB(i, j);
-                            int actualRGB = actualImg.getRGB(i, j);
-
-                            if (expectedRGB != actualRGB) {
-                                TKit.trace(String.format(
-                                        "Images mismatch at [%d, %d] pixel", i,
-                                        j));
-                                diffPixelCount++;
-                            }
-                        }
-                    }
-
-                    double threshold = 0.1;
-                    TKit.assertTrue(((double) diffPixelCount) / (w * h)
-                            < threshold,
-                            String.format(
-                                    "Check the number of mismatched pixels [%d] of [%d] is < [%f] threshold",
-                                    diffPixelCount, (w * h), threshold));
-                }
-            });
-        }
-
-        private WinIconVerifier() {
-            try {
-                executableRebranderClass = Class.forName(
-                        "jdk.jpackage.internal.ExecutableRebrander");
-
-                lockResource = executableRebranderClass.getDeclaredMethod(
-                        "lockResource", String.class);
-                // Note: this reflection call requires
-                // --add-opens jdk.jpackage/jdk.jpackage.internal=ALL-UNNAMED
-                lockResource.setAccessible(true);
-
-                unlockResource = executableRebranderClass.getDeclaredMethod(
-                        "unlockResource", long.class);
-                unlockResource.setAccessible(true);
-
-                iconSwapWrapper = executableRebranderClass.getDeclaredMethod(
-                        "iconSwapWrapper", long.class, String.class);
-                iconSwapWrapper.setAccessible(true);
-            } catch (ClassNotFoundException | NoSuchMethodException
-                    | SecurityException ex) {
-                throw rethrowUnchecked(ex);
-            }
-        }
-
-        private Path extractIconFromExecutable(Path outputDir, Path executable,
-                String label) {
-            // Run .NET code to extract icon from the given executable.
-            // ExtractAssociatedIcon() will succeed even if the target file
-            // is locked (by an antivirus). It will output a default icon
-            // in case of error. To prevent this "fail safe" behavior we try
-            // lock the target file with Open() call. If the attempt
-            // fails ExtractAssociatedIcon() is not called and the script exits
-            // with the exit code that will be trapped
-            // inside of Executor.executeAndRepeatUntilExitCode() method that
-            // will keep running the script until it succeeds or the number of
-            // allowed attempts is exceeded.
-
-            Path extractedIcon = outputDir.resolve(label + ".bmp");
-            String script = String.join(";",
-                    String.format(
-                            "try { [System.io.File]::Open('%s', 'Open', 'Read', 'None') } catch { exit 100 }",
-                            executable.toAbsolutePath().normalize()),
-                    "[System.Reflection.Assembly]::LoadWithPartialName('System.Drawing')",
-                    String.format(
-                            "[System.Drawing.Icon]::ExtractAssociatedIcon('%s').ToBitmap().Save('%s', [System.Drawing.Imaging.ImageFormat]::Bmp)",
-                            executable.toAbsolutePath().normalize(),
-                            extractedIcon.toAbsolutePath().normalize()));
-
-            Executor.of("powershell", "-NoLogo", "-NoProfile", "-Command",
-                    script).executeAndRepeatUntilExitCode(0, 5, 10);
-
-            return extractedIcon;
-        }
-
-        private Path getDefaultAppLauncher(boolean noIcon) {
-            // Create app image with the sole purpose to get the default app launcher
-            Path defaultAppOutputDir = TKit.workDir().resolve(String.format(
-                    "out-%d", ProcessHandle.current().pid()));
-            JPackageCommand cmd = JPackageCommand.helloAppImage().setFakeRuntime().setArgumentValue(
-                    "--dest", defaultAppOutputDir);
-
-            String launcherName;
-            if (noIcon) {
-                launcherName = "no-icon";
-                new AdditionalLauncher(launcherName).setNoIcon().applyTo(cmd);
-            } else {
-                launcherName = null;
-            }
-
-            if (!Files.isExecutable(cmd.appLauncherPath(launcherName))) {
-                cmd.execute();
-            }
-            return cmd.appLauncherPath(launcherName);
-        }
-
-        private void setIcon(Path iconPath, Path launcherPath) {
-            TKit.trace(String.format("Set icon of [%s] launcher to [%s] file",
-                    launcherPath, iconPath));
-            try {
-                launcherPath.toFile().setWritable(true, true);
-                try {
-                    long lock = 0;
-                    try {
-                        lock = (Long) lockResource.invoke(null, new Object[]{
-                            launcherPath.toAbsolutePath().normalize().toString()});
-                        if (lock == 0) {
-                            throw new RuntimeException(String.format(
-                                    "Failed to lock [%s] executable",
-                                    launcherPath));
-                        }
-                        iconSwapWrapper.invoke(null, new Object[]{lock,
-                            iconPath.toAbsolutePath().normalize().toString()});
-                    } finally {
-                        if (lock != 0) {
-                            unlockResource.invoke(null, new Object[]{lock});
-                        }
-                    }
-                } catch (IllegalAccessException | InvocationTargetException ex) {
-                    throw rethrowUnchecked(ex);
-                }
-            } finally {
-                launcherPath.toFile().setWritable(false, true);
-            }
-        }
-
-        static final WinIconVerifier instance = new WinIconVerifier();
-
-        private final Class<?> executableRebranderClass;
-        private final Method lockResource;
-        private final Method unlockResource;
-        private final Method iconSwapWrapper;
-    }
-
     private String launcherName;
     private Path expectedIcon;
     private boolean expectedDefault;
diff --git a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/WinExecutableIconVerifier.java b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/WinExecutableIconVerifier.java
new file mode 100644
index 00000000000..5110259e6f3
--- /dev/null
+++ b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/WinExecutableIconVerifier.java
@@ -0,0 +1,290 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please 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 static jdk.jpackage.internal.util.function.ExceptionBox.rethrowUnchecked;
+
+import java.awt.image.BufferedImage;
+import java.io.IOException;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.Objects;
+import java.util.Optional;
+import javax.imageio.ImageIO;
+
+public final class WinExecutableIconVerifier {
+
+    static void verifyLauncherIcon(JPackageCommand cmd, String launcherName,
+            Path expectedIcon, boolean expectedDefault) {
+        Objects.requireNonNull(cmd);
+        INSTANCE.verifyExecutablesHaveSameIcon(new Input() {
+            @Override
+            public Path executableWithExpectedIcon(Path iconWorkDir) throws IOException {
+                final var iconContainer = iconWorkDir.resolve("container.exe");
+                Files.createDirectories(iconContainer.getParent());
+                Files.copy(INSTANCE.getDefaultAppLauncher(expectedIcon == null
+                        && !expectedDefault), iconContainer);
+                if (expectedIcon != null) {
+                    Executor.tryRunMultipleTimes(() -> {
+                        INSTANCE.setIcon(expectedIcon, iconContainer);
+                    }, 3, 5);
+                }
+                return iconContainer;
+            }
+
+            @Override
+            public Path executableWithActualIcon(Path iconWorkDir) {
+                return cmd.appLauncherPath(launcherName);
+            }
+
+            @Override
+            public void trace(Path extractedActualIcon, Path extractedExpectedIcon) {
+                TKit.trace(String.format(
+                        "Check icon file [%s] of %s launcher is a copy of source icon file [%s]",
+                        extractedActualIcon,
+                        Optional.ofNullable(launcherName).orElse("main"),
+                        extractedExpectedIcon));
+            }
+        });
+    }
+
+    public static void verifyExecutablesHaveSameIcon(Path executableWithExpectedIcon,
+            Path executableWithActualIcon) {
+        Objects.requireNonNull(executableWithExpectedIcon);
+        Objects.requireNonNull(executableWithActualIcon);
+        INSTANCE.verifyExecutablesHaveSameIcon(new Input() {
+            @Override
+            public Path executableWithExpectedIcon(Path iconWorkDir) {
+                return executableWithExpectedIcon;
+            }
+
+            @Override
+            public Path executableWithActualIcon(Path iconWorkDir) {
+                return executableWithActualIcon;
+            }
+
+            @Override
+            public void trace(Path extractedActualIcon, Path extractedExpectedIcon) {
+                TKit.trace(String.format(
+                        "Check icon file [%s] extracted from [%s] executable is a copy of icon file [%s] extracted from [%s] executable",
+                        extractedActualIcon, executableWithActualIcon,
+                        extractedExpectedIcon, executableWithExpectedIcon));
+            }
+        });
+    }
+
+    private interface Input {
+        Path executableWithExpectedIcon(Path iconWorkDir) throws IOException;
+        Path executableWithActualIcon(Path iconWorkDir) throws IOException;
+        void trace(Path extractedActualIcon, Path extractedExpectedIcon);
+    }
+
+    private void verifyExecutablesHaveSameIcon(Input input) {
+
+        Objects.requireNonNull(input);
+
+        TKit.withTempDirectory("icons", iconWorkDir -> {
+
+            final var executableWithExpectedIcon = input.executableWithExpectedIcon(iconWorkDir);
+            final var executableWithActualIcon = input.executableWithActualIcon(iconWorkDir);
+
+            if (Files.isSameFile(executableWithExpectedIcon, executableWithActualIcon)) {
+                throw new IllegalArgumentException("Supply different files for icon comparison");
+            }
+
+            Path extractedExpectedIcon = extractIconFromExecutable(
+                    iconWorkDir, executableWithExpectedIcon, "expected");
+            Path extractedActualIcon = extractIconFromExecutable(iconWorkDir,
+                    executableWithActualIcon, "actual");
+
+            input.trace(extractedActualIcon, extractedExpectedIcon);
+
+            // If executable doesn't have an icon, icon file will be empty.
+            // Both icon files must be empty or not empty.
+            // If only one icon file is empty executables have different icons.
+            final var expectedIconIsEmpty = isFileEmpty(extractedExpectedIcon);
+            final var actualIconIsEmpty = isFileEmpty(extractedActualIcon);
+
+            TKit.assertTrue(expectedIconIsEmpty == actualIconIsEmpty,
+                    "Check both icon files are empty or not empty");
+
+            if (!expectedIconIsEmpty && Files.mismatch(extractedExpectedIcon, extractedActualIcon) != -1) {
+                // On Windows11 .NET API extracting icons from executables
+                // produce slightly different output for the same icon.
+                // To workaround it, compare pixels of images and if the
+                // number of off pixels is below a threshold, assume
+                // equality.
+                BufferedImage expectedImg = ImageIO.read(
+                        extractedExpectedIcon.toFile());
+                BufferedImage actualImg = ImageIO.read(
+                        extractedActualIcon.toFile());
+
+                int w = expectedImg.getWidth();
+                int h = expectedImg.getHeight();
+
+                TKit.assertEquals(w, actualImg.getWidth(),
+                        "Check expected and actual icons have the same width");
+                TKit.assertEquals(h, actualImg.getHeight(),
+                        "Check expected and actual icons have the same height");
+
+                int diffPixelCount = 0;
+
+                for (int i = 0; i != w; ++i) {
+                    for (int j = 0; j != h; ++j) {
+                        int expectedRGB = expectedImg.getRGB(i, j);
+                        int actualRGB = actualImg.getRGB(i, j);
+
+                        if (expectedRGB != actualRGB) {
+                            TKit.trace(String.format(
+                                    "Images mismatch at [%d, %d] pixel", i,
+                                    j));
+                            diffPixelCount++;
+                        }
+                    }
+                }
+
+                double threshold = 0.1;
+                TKit.assertTrue(((double) diffPixelCount) / (w * h)
+                        < threshold,
+                        String.format(
+                                "Check the number of mismatched pixels [%d] of [%d] is < [%f] threshold",
+                                diffPixelCount, (w * h), threshold));
+            }
+        });
+    }
+
+    private WinExecutableIconVerifier() {
+        try {
+            executableRebranderClass = Class.forName(
+                    "jdk.jpackage.internal.ExecutableRebrander");
+
+            lockResource = executableRebranderClass.getDeclaredMethod(
+                    "lockResource", String.class);
+            // Note: this reflection call requires
+            // --add-opens jdk.jpackage/jdk.jpackage.internal=ALL-UNNAMED
+            lockResource.setAccessible(true);
+
+            unlockResource = executableRebranderClass.getDeclaredMethod(
+                    "unlockResource", long.class);
+            unlockResource.setAccessible(true);
+
+            iconSwap = executableRebranderClass.getDeclaredMethod(
+                    "iconSwap", long.class, String.class);
+            iconSwap.setAccessible(true);
+        } catch (ClassNotFoundException | NoSuchMethodException
+                | SecurityException ex) {
+            throw rethrowUnchecked(ex);
+        }
+    }
+
+    private Path extractIconFromExecutable(Path outputDir, Path executable,
+            String extractedIconFilename) {
+
+        Objects.requireNonNull(outputDir);
+        Objects.requireNonNull(executable);
+        Objects.requireNonNull(extractedIconFilename);
+
+        Path extractedIcon = outputDir.resolve(extractedIconFilename + ".bmp");
+
+        Executor.of("powershell", "-NoLogo", "-NoProfile", "-ExecutionPolicy", "Unrestricted",
+                "-File", EXTRACT_ICON_PS1.toString(),
+                "-InputExecutable", executable.toAbsolutePath().normalize().toString(),
+                "-OutputIcon", extractedIcon.toAbsolutePath().normalize().toString()
+        ).executeAndRepeatUntilExitCode(0, 5, 10);
+
+        return extractedIcon;
+    }
+
+    private Path getDefaultAppLauncher(boolean noIcon) {
+        // Create app image with the sole purpose to get the default app launcher
+        Path defaultAppOutputDir = TKit.workDir().resolve(String.format(
+                "out-%d", ProcessHandle.current().pid()));
+        JPackageCommand cmd = JPackageCommand.helloAppImage().setFakeRuntime().setArgumentValue(
+                "--dest", defaultAppOutputDir);
+
+        String launcherName;
+        if (noIcon) {
+            launcherName = "no-icon";
+            new AdditionalLauncher(launcherName).setNoIcon().applyTo(cmd);
+        } else {
+            launcherName = null;
+        }
+
+        if (!Files.isExecutable(cmd.appLauncherPath(launcherName))) {
+            cmd.execute();
+        }
+        return cmd.appLauncherPath(launcherName);
+    }
+
+    private void setIcon(Path iconPath, Path executable) {
+        Objects.requireNonNull(iconPath);
+        Objects.requireNonNull(executable);
+
+        try {
+            executable.toFile().setWritable(true, true);
+            try {
+                long lock = 0;
+                try {
+                    lock = (Long) lockResource.invoke(null, new Object[]{
+                            executable.toAbsolutePath().normalize().toString()});
+                    if (lock == 0) {
+                        throw new RuntimeException(String.format(
+                                "Failed to lock [%s] executable",
+                                executable));
+                    }
+                    var exitCode = (Integer) iconSwap.invoke(null, new Object[]{
+                        lock,
+                        iconPath.toAbsolutePath().normalize().toString()});
+                    if (exitCode != 0) {
+                        throw new RuntimeException(String.format(
+                                "Failed to swap icon of [%s] executable",
+                                executable));
+                    }
+                } finally {
+                    if (lock != 0) {
+                        unlockResource.invoke(null, new Object[]{lock});
+                    }
+                }
+            } catch (IllegalAccessException | InvocationTargetException ex) {
+                throw rethrowUnchecked(ex);
+            }
+        } finally {
+            executable.toFile().setWritable(false, true);
+        }
+    }
+
+    private static boolean isFileEmpty(Path file) {
+        return file.toFile().length() == 0;
+    }
+
+    private final Class<?> executableRebranderClass;
+    private final Method lockResource;
+    private final Method unlockResource;
+    private final Method iconSwap;
+
+    private static final WinExecutableIconVerifier INSTANCE = new WinExecutableIconVerifier();
+
+    private static final Path EXTRACT_ICON_PS1 = TKit.TEST_SRC_ROOT.resolve(Path.of("resources/read-executable-icon.ps1")).normalize();
+}
diff --git a/test/jdk/tools/jpackage/resources/read-executable-icon.ps1 b/test/jdk/tools/jpackage/resources/read-executable-icon.ps1
new file mode 100644
index 00000000000..55effdc4708
--- /dev/null
+++ b/test/jdk/tools/jpackage/resources/read-executable-icon.ps1
@@ -0,0 +1,54 @@
+#
+# Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+param (
+  # Path to input executable file.
+  [Parameter(Mandatory=$true)]
+  [string]$InputExecutable,
+
+  # Path to BMP file where to save an icon extracted from the input executable.
+  [Parameter(Mandatory=$true)]
+  [string]$OutputIcon
+)
+
+Add-Type -AssemblyName 'System.Drawing'
+
+$Shell32MethodDefinitions = @'
+[DllImport("shell32.dll", SetLastError = true, CharSet = CharSet.Unicode)]
+public static extern uint ExtractIconEx(string szFileName, int nIconIndex, IntPtr[] phiconLarge, IntPtr[] phiconSmall, uint nIcons);
+'@
+$Shell32 = Add-Type -MemberDefinition $Shell32MethodDefinitions -Name 'Shell32' -Namespace 'Win32' -PassThru
+
+$IconHandleArray = New-Object IntPtr[] 1 # Allocate IntPtr[1] to recieve HICON
+$IconCount = $Shell32::ExtractIconEx($InputExecutable, 0, $IconHandleArray, $null, 1);
+if ($IconCount -eq [uint32]::MaxValue) {
+  Write-Error "Failed to read icon."
+  exit 100
+} elseif ($IconCount -ne 0) {
+  # Executable has an icon.
+  $Icon = [System.Drawing.Icon]::FromHandle($IconHandleArray[0]);
+  $Icon.ToBitmap().Save($OutputIcon, [System.Drawing.Imaging.ImageFormat]::Bmp)
+} else {
+  # Execeutable doesn't have an icon. Empty output icon file.
+  $null = New-Item -Force $OutputIcon -ItemType File
+}
diff --git a/test/jdk/tools/jpackage/windows/WinInstallerResourceTest.java b/test/jdk/tools/jpackage/windows/WinInstallerResourceTest.java
new file mode 100644
index 00000000000..bb2008bbda7
--- /dev/null
+++ b/test/jdk/tools/jpackage/windows/WinInstallerResourceTest.java
@@ -0,0 +1,102 @@
+/*
+ * Copyright (c) 2021, 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please 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 static jdk.jpackage.test.WinExecutableIconVerifier.verifyExecutablesHaveSameIcon;
+
+import java.nio.file.Files;
+import java.nio.file.Path;
+import jdk.jpackage.test.Annotations.Test;
+import jdk.jpackage.test.JPackageCommand;
+import jdk.jpackage.test.PackageTest;
+import jdk.jpackage.test.PackageType;
+import jdk.jpackage.test.RunnablePackageTest.Action;
+import jdk.jpackage.test.TKit;
+
+/**
+ * Test for installer exe from the resource directory.
+ */
+
+/*
+ * @test
+ * @summary jpackage with installer exe from the resource directory
+ * @library /test/jdk/tools/jpackage/helpers
+ * @key jpackagePlatformPackage
+ * @build jdk.jpackage.test.*
+ * @compile -Xlint:all -Werror WinInstallerResourceTest.java
+ * @requires (os.family == "windows")
+ * @run main/othervm/timeout=720 -Xmx512m  jdk.jpackage.test.Main
+ *  --jpt-run=WinInstallerResourceTest
+ */
+public class WinInstallerResourceTest {
+
+    @Test
+    public void test() {
+        createPackageTest("dummy")
+        .addInitializer(JPackageCommand::setFakeRuntime)
+        .addInitializer(cmd -> {
+            // Create exe installer using the default installer exe resource and a custom icon.
+            cmd.addArguments("--icon", iconPath("icon"));
+        })
+        .addBundleVerifier(cmd -> {
+            final var exeInstaller = cmd.outputBundle();
+
+            createPackageTest("InstallerResTest")
+            .addInitializer(cmd2 -> {
+                cmd2.setArgumentValue("--runtime-image", cmd.getArgumentValue("--runtime-image"));
+            })
+            .addInitializer(cmd2 -> {
+                //
+                // Create an exe installer using the exe installer created in the first jpackage run.
+                //
+
+                // The exe installer created in the first jpackage run has a custom icon.
+                // Configure the second jpackage run to use the default icon.
+                // This will prevent jpackage from editing icon in the exe installer.
+                // Copy the exe installer created in the first jpackage run into the
+                // resource directory for the second jpackage run.
+                // If jpackage will pick an exe installer resource from the resource directory,
+                // the output exe installer should have the same icon as
+                // the exe installer produced in the first jpackage run.
+                final var resourceDir = TKit.createTempDirectory("resources");
+                Files.copy(exeInstaller, resourceDir.resolve("installer.exe"));
+                cmd2.addArguments("--resource-dir", resourceDir);
+            })
+            .addBundleVerifier(cmd2 -> {
+                verifyExecutablesHaveSameIcon(exeInstaller, cmd2.outputBundle());
+            }).run(Action.CREATE);
+        }).run(Action.CREATE);
+    }
+
+    private PackageTest createPackageTest(String name) {
+        return new PackageTest()
+                .ignoreBundleOutputDir()
+                .forTypes(PackageType.WIN_EXE)
+                .configureHelloApp()
+                .addInitializer(cmd -> cmd.setArgumentValue("--name", name));
+    }
+
+    private static Path iconPath(String name) {
+        return TKit.TEST_SRC_ROOT.resolve(Path.of("resources", name
+                + TKit.ICON_SUFFIX));
+    }
+}

From 86024ebdb0f06517925c03e52246fbda0bad8f7c Mon Sep 17 00:00:00 2001
From: Ioi Lam <iklam@openjdk.org>
Date: Tue, 25 Feb 2025 22:56:25 +0000
Subject: [PATCH 126/587] 8348426: Generate binary file for -XX:AOTMode=record
 -XX:AOTConfiguration=file

Reviewed-by: ccheung, asmehra, kvn, iveresov
---
 src/hotspot/share/cds/aotClassLocation.cpp    |  10 +-
 src/hotspot/share/cds/archiveBuilder.cpp      |   5 +-
 src/hotspot/share/cds/archiveUtils.hpp        |  16 +-
 src/hotspot/share/cds/archiveUtils.inline.hpp |  37 +++-
 src/hotspot/share/cds/cdsConfig.cpp           | 169 +++++++++++++-----
 src/hotspot/share/cds/cdsConfig.hpp           |  37 +++-
 src/hotspot/share/cds/cds_globals.hpp         |   6 +-
 src/hotspot/share/cds/cppVtables.cpp          |  42 ++++-
 src/hotspot/share/cds/dumpTimeClassInfo.cpp   |  10 +-
 src/hotspot/share/cds/dynamicArchive.cpp      |   5 +-
 src/hotspot/share/cds/filemap.cpp             | 159 +++++++++++-----
 src/hotspot/share/cds/filemap.hpp             |   3 +
 src/hotspot/share/cds/finalImageRecipes.cpp   | 167 +++++++++++++++++
 src/hotspot/share/cds/finalImageRecipes.hpp   |  76 ++++++++
 src/hotspot/share/cds/heapShared.cpp          |   7 +-
 src/hotspot/share/cds/heapShared.hpp          |   1 +
 src/hotspot/share/cds/lambdaFormInvokers.cpp  |   4 +
 src/hotspot/share/cds/metaspaceShared.cpp     |  97 +++++++---
 src/hotspot/share/cds/runTimeClassInfo.hpp    |  21 ++-
 src/hotspot/share/classfile/moduleEntry.cpp   |   8 +-
 .../share/classfile/systemDictionary.cpp      |   4 +
 .../classfile/systemDictionaryShared.cpp      |  94 ++++++++--
 .../classfile/systemDictionaryShared.hpp      |  11 +-
 src/hotspot/share/include/cds.h               |   1 +
 src/hotspot/share/memory/metaspace.cpp        |   1 -
 src/hotspot/share/oops/constantPool.cpp       |   5 +
 src/hotspot/share/oops/instanceKlass.cpp      |   1 +
 src/hotspot/share/runtime/arguments.cpp       |  16 +-
 src/hotspot/share/runtime/java.cpp            |   5 +
 src/hotspot/share/runtime/threads.cpp         |   6 +-
 test/hotspot/jtreg/TEST.groups                |   2 +-
 .../runtime/cds/ArchiveDoesNotExist.java      |   4 +-
 .../jtreg/runtime/cds/appcds/AOTFlags.java    | 118 ++++++++++--
 .../AOTLoaderConstraintsTest.java             | 104 +++++++++++
 .../cds/appcds/aotClassLinking/BootClass.java |  30 ++++
 .../aotClassLinking/BulkLoaderTest.java       |  20 +++
 .../cds/appcds/applications/JavacBench.java   |  11 +-
 .../dynamicArchive/ArchiveConsistency.java    |   6 +-
 .../TestAutoCreateSharedArchive.java          |   6 +-
 .../TestAutoCreateSharedArchiveUpgrade.java   |   4 +-
 .../DumpingWithJavaAgent.java                 |   7 +-
 test/lib/jdk/test/lib/cds/CDSAppTester.java   |  67 ++++++-
 42 files changed, 1185 insertions(+), 218 deletions(-)
 create mode 100644 src/hotspot/share/cds/finalImageRecipes.cpp
 create mode 100644 src/hotspot/share/cds/finalImageRecipes.hpp
 create mode 100644 test/hotspot/jtreg/runtime/cds/appcds/aotClassLinking/AOTLoaderConstraintsTest.java
 create mode 100644 test/hotspot/jtreg/runtime/cds/appcds/aotClassLinking/BootClass.java

diff --git a/src/hotspot/share/cds/aotClassLocation.cpp b/src/hotspot/share/cds/aotClassLocation.cpp
index 8d453fe1773..c083213b933 100644
--- a/src/hotspot/share/cds/aotClassLocation.cpp
+++ b/src/hotspot/share/cds/aotClassLocation.cpp
@@ -989,8 +989,14 @@ bool AOTClassLocationConfig::validate(bool has_aot_linked_classes, bool* has_ext
     const char* hint_msg = log_is_enabled(Info, class, path) ?
         "" : " (hint: enable -Xlog:class+path=info to diagnose the failure)";
     if (RequireSharedSpaces && !PrintSharedArchiveAndExit) {
-      log_error(cds)("%s%s", mismatch_msg, hint_msg);
-      MetaspaceShared::unrecoverable_loading_error();
+      if (CDSConfig::is_dumping_final_static_archive()) {
+        log_error(cds)("class path and/or module path are not compatible with the "
+                       "ones specified when the AOTConfiguration file was recorded%s", hint_msg);
+        vm_exit_during_initialization("Unable to use create AOT cache.", nullptr);
+      } else {
+        log_error(cds)("%s%s", mismatch_msg, hint_msg);
+        MetaspaceShared::unrecoverable_loading_error();
+      }
     } else {
       log_warning(cds)("%s%s", mismatch_msg, hint_msg);
     }
diff --git a/src/hotspot/share/cds/archiveBuilder.cpp b/src/hotspot/share/cds/archiveBuilder.cpp
index afd2d909595..21e97457a87 100644
--- a/src/hotspot/share/cds/archiveBuilder.cpp
+++ b/src/hotspot/share/cds/archiveBuilder.cpp
@@ -507,9 +507,8 @@ bool ArchiveBuilder::is_excluded(Klass* klass) {
     return SystemDictionaryShared::is_excluded_class(ik);
   } else if (klass->is_objArray_klass()) {
     Klass* bottom = ObjArrayKlass::cast(klass)->bottom_klass();
-    if (MetaspaceShared::is_shared_static(bottom)) {
+    if (CDSConfig::is_dumping_dynamic_archive() && MetaspaceShared::is_shared_static(bottom)) {
       // The bottom class is in the static archive so it's clearly not excluded.
-      assert(CDSConfig::is_dumping_dynamic_archive(), "sanity");
       return false;
     } else if (bottom->is_instance_klass()) {
       return SystemDictionaryShared::is_excluded_class(InstanceKlass::cast(bottom));
@@ -521,7 +520,7 @@ bool ArchiveBuilder::is_excluded(Klass* klass) {
 
 ArchiveBuilder::FollowMode ArchiveBuilder::get_follow_mode(MetaspaceClosure::Ref *ref) {
   address obj = ref->obj();
-  if (MetaspaceShared::is_in_shared_metaspace(obj)) {
+  if (CDSConfig::is_dumping_dynamic_archive() && MetaspaceShared::is_in_shared_metaspace(obj)) {
     // Don't dump existing shared metadata again.
     return point_to_it;
   } else if (ref->msotype() == MetaspaceObj::MethodDataType ||
diff --git a/src/hotspot/share/cds/archiveUtils.hpp b/src/hotspot/share/cds/archiveUtils.hpp
index a10117e9f9a..59146547aca 100644
--- a/src/hotspot/share/cds/archiveUtils.hpp
+++ b/src/hotspot/share/cds/archiveUtils.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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,11 +255,23 @@ public:
 };
 
 class ArchiveUtils {
+  template <typename T> static Array<T>* archive_non_ptr_array(GrowableArray<T>* tmp_array);
+  template <typename T> static Array<T>* archive_ptr_array(GrowableArray<T>* tmp_array);
+
 public:
   static const uintx MAX_SHARED_DELTA = 0x7FFFFFFF;
   static void log_to_classlist(BootstrapInfo* bootstrap_specifier, TRAPS) NOT_CDS_RETURN;
   static bool has_aot_initialized_mirror(InstanceKlass* src_ik);
-  template <typename T> static Array<T>* archive_array(GrowableArray<T>* tmp_array);
+
+  template <typename T, ENABLE_IF(!std::is_pointer<T>::value)>
+  static Array<T>* archive_array(GrowableArray<T>* tmp_array) {
+    return archive_non_ptr_array(tmp_array);
+  }
+
+  template <typename T, ENABLE_IF(std::is_pointer<T>::value)>
+  static Array<T>* archive_array(GrowableArray<T>* tmp_array) {
+    return archive_ptr_array(tmp_array);
+  }
 
   // The following functions translate between a u4 offset and an address in the
   // the range of the mapped CDS archive (e.g., Metaspace::is_in_shared_metaspace()).
diff --git a/src/hotspot/share/cds/archiveUtils.inline.hpp b/src/hotspot/share/cds/archiveUtils.inline.hpp
index 537b3d1670c..9388bca18c7 100644
--- a/src/hotspot/share/cds/archiveUtils.inline.hpp
+++ b/src/hotspot/share/cds/archiveUtils.inline.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,6 +28,8 @@
 #include "cds/archiveUtils.hpp"
 
 #include "cds/archiveBuilder.hpp"
+#include "cds/cdsConfig.hpp"
+#include "cds/metaspaceShared.hpp"
 #include "oops/array.hpp"
 #include "utilities/bitMap.inline.hpp"
 #include "utilities/growableArray.hpp"
@@ -52,13 +54,40 @@ inline bool SharedDataRelocator::do_bit(size_t offset) {
 
 // Returns the address of an Array<T> that's allocated in the ArchiveBuilder "buffer" space.
 template <typename T>
-Array<T>* ArchiveUtils::archive_array(GrowableArray<T>* tmp_array) {
+Array<T>* ArchiveUtils::archive_non_ptr_array(GrowableArray<T>* tmp_array) {
+  ArchiveBuilder* builder = ArchiveBuilder::current();
+
   Array<T>* archived_array = ArchiveBuilder::new_ro_array<T>(tmp_array->length());
   for (int i = 0; i < tmp_array->length(); i++) {
     archived_array->at_put(i, tmp_array->at(i));
-    if (std::is_pointer<T>::value) {
+  }
+
+  return archived_array;
+}
+
+// Returns the address of an Array<T> that's allocated in the ArchiveBuilder "buffer" space.
+// All pointers in tmp_array must point to:
+//    - a buffered object; or
+//    - a source object that has been archived; or
+//    - (only when dumping dynamic archive) an object in the static archive.
+template <typename T>
+Array<T>* ArchiveUtils::archive_ptr_array(GrowableArray<T>* tmp_array) {
+  ArchiveBuilder* builder = ArchiveBuilder::current();
+  const bool is_dynamic_dump = CDSConfig::is_dumping_dynamic_archive();
+
+  Array<T>* archived_array = ArchiveBuilder::new_ro_array<T>(tmp_array->length());
+  for (int i = 0; i < tmp_array->length(); i++) {
+      T ptr = tmp_array->at(i);
+      if (!builder->is_in_buffer_space(ptr)) {
+        if (is_dynamic_dump && MetaspaceShared::is_in_shared_metaspace(ptr)) {
+          // We have a pointer that lives in the dynamic archive but points into
+          // the static archive.
+        } else {
+          ptr = builder->get_buffered_addr(ptr);
+        }
+      }
+      archived_array->at_put(i, ptr);
       ArchivePtrMarker::mark_pointer(archived_array->adr_at(i));
-    }
   }
 
   return archived_array;
diff --git a/src/hotspot/share/cds/cdsConfig.cpp b/src/hotspot/share/cds/cdsConfig.cpp
index 564298fa5c8..1bb842af953 100644
--- a/src/hotspot/share/cds/cdsConfig.cpp
+++ b/src/hotspot/share/cds/cdsConfig.cpp
@@ -40,6 +40,8 @@
 #include "utilities/formatBuffer.hpp"
 
 bool CDSConfig::_is_dumping_static_archive = false;
+bool CDSConfig::_is_dumping_preimage_static_archive = false;
+bool CDSConfig::_is_dumping_final_static_archive = false;
 bool CDSConfig::_is_dumping_dynamic_archive = false;
 bool CDSConfig::_is_using_optimized_module_handling = true;
 bool CDSConfig::_is_dumping_full_module_graph = true;
@@ -47,6 +49,7 @@ bool CDSConfig::_is_using_full_module_graph = true;
 bool CDSConfig::_has_aot_linked_classes = false;
 bool CDSConfig::_has_archived_invokedynamic = false;
 bool CDSConfig::_old_cds_flags_used = false;
+bool CDSConfig::_new_aot_flags_used = false;
 bool CDSConfig::_disable_heap_dumping = false;
 
 char* CDSConfig::_default_archive_path = nullptr;
@@ -64,7 +67,7 @@ int CDSConfig::get_status() {
 }
 
 void CDSConfig::initialize() {
-  if (is_dumping_static_archive()) {
+  if (is_dumping_static_archive() && !is_dumping_final_static_archive()) {
     if (RequireSharedSpaces) {
       warning("Cannot dump shared archive while using shared archive");
     }
@@ -210,6 +213,7 @@ void CDSConfig::init_shared_archive_paths() {
               warning("-XX:+AutoCreateSharedArchive is unsupported when base CDS archive is not loaded. Run with -Xlog:cds for more info.");
               AutoCreateSharedArchive = false;
             }
+            log_error(cds)("Not a valid %s (%s)", new_aot_flags_used() ? "AOT cache" : "archive", SharedArchiveFile);
             Arguments::no_shared_spaces("invalid archive");
           }
         } else if (base_archive_path == nullptr) {
@@ -333,7 +337,11 @@ bool CDSConfig::has_unsupported_runtime_module_options() {
     if (RequireSharedSpaces) {
       warning("CDS is disabled when the %s option is specified.", option);
     } else {
-      log_info(cds)("CDS is disabled when the %s option is specified.", option);
+      if (new_aot_flags_used()) {
+        log_warning(cds)("AOT cache is disabled when the %s option is specified.", option);
+      } else {
+        log_info(cds)("CDS is disabled when the %s option is specified.", option);
+      }
     }
     return true;
   }
@@ -343,7 +351,7 @@ bool CDSConfig::has_unsupported_runtime_module_options() {
 #define CHECK_ALIAS(f) check_flag_alias(FLAG_IS_DEFAULT(f), #f)
 
 void CDSConfig::check_flag_alias(bool alias_is_default, const char* alias_name) {
-  if (_old_cds_flags_used && !alias_is_default) {
+  if (old_cds_flags_used() && !alias_is_default) {
     vm_exit_during_initialization(err_msg("Option %s cannot be used at the same time with "
                                           "-Xshare:on, -Xshare:auto, -Xshare:off, -Xshare:dump, "
                                           "DumpLoadedClassList, SharedClassListFile, or SharedArchiveFile",
@@ -351,7 +359,7 @@ void CDSConfig::check_flag_alias(bool alias_is_default, const char* alias_name)
   }
 }
 
-void CDSConfig::check_flag_aliases() {
+void CDSConfig::check_aot_flags() {
   if (!FLAG_IS_DEFAULT(DumpLoadedClassList) ||
       !FLAG_IS_DEFAULT(SharedClassListFile) ||
       !FLAG_IS_DEFAULT(SharedArchiveFile)) {
@@ -363,30 +371,16 @@ void CDSConfig::check_flag_aliases() {
   CHECK_ALIAS(AOTMode);
 
   if (FLAG_IS_DEFAULT(AOTCache) && FLAG_IS_DEFAULT(AOTConfiguration) && FLAG_IS_DEFAULT(AOTMode)) {
-    // Aliases not used.
+    // AOTCache/AOTConfiguration/AOTMode not used.
     return;
+  } else {
+    _new_aot_flags_used = true;
   }
 
   if (FLAG_IS_DEFAULT(AOTMode) || strcmp(AOTMode, "auto") == 0 || strcmp(AOTMode, "on") == 0) {
-    if (!FLAG_IS_DEFAULT(AOTConfiguration)) {
-      vm_exit_during_initialization("AOTConfiguration can only be used with -XX:AOTMode=record or -XX:AOTMode=create");
-    }
-
-    if (!FLAG_IS_DEFAULT(AOTCache)) {
-      assert(FLAG_IS_DEFAULT(SharedArchiveFile), "already checked");
-      FLAG_SET_ERGO(SharedArchiveFile, AOTCache);
-    }
-
-    UseSharedSpaces = true;
-    if (FLAG_IS_DEFAULT(AOTMode) || (strcmp(AOTMode, "auto") == 0)) {
-      RequireSharedSpaces = false;
-    } else {
-      assert(strcmp(AOTMode, "on") == 0, "already checked");
-      RequireSharedSpaces = true;
-    }
+    check_aotmode_auto_or_on();
   } else if (strcmp(AOTMode, "off") == 0) {
-    UseSharedSpaces = false;
-    RequireSharedSpaces = false;
+    check_aotmode_off();
   } else {
     // AOTMode is record or create
     if (FLAG_IS_DEFAULT(AOTConfiguration)) {
@@ -394,32 +388,78 @@ void CDSConfig::check_flag_aliases() {
     }
 
     if (strcmp(AOTMode, "record") == 0) {
-      if (!FLAG_IS_DEFAULT(AOTCache)) {
-        vm_exit_during_initialization("AOTCache must not be specified when using -XX:AOTMode=record");
-      }
-
-      assert(FLAG_IS_DEFAULT(DumpLoadedClassList), "already checked");
-      FLAG_SET_ERGO(DumpLoadedClassList, AOTConfiguration);
-      UseSharedSpaces = false;
-      RequireSharedSpaces = false;
+      check_aotmode_record();
     } else {
       assert(strcmp(AOTMode, "create") == 0, "checked by AOTModeConstraintFunc");
-      if (FLAG_IS_DEFAULT(AOTCache)) {
-        vm_exit_during_initialization("AOTCache must be specified when using -XX:AOTMode=create");
-      }
-
-      assert(FLAG_IS_DEFAULT(SharedClassListFile), "already checked");
-      FLAG_SET_ERGO(SharedClassListFile, AOTConfiguration);
-      assert(FLAG_IS_DEFAULT(SharedArchiveFile), "already checked");
-      FLAG_SET_ERGO(SharedArchiveFile, AOTCache);
-
-      CDSConfig::enable_dumping_static_archive();
+      check_aotmode_create();
     }
   }
 }
 
+void CDSConfig::check_aotmode_off() {
+  UseSharedSpaces = false;
+  RequireSharedSpaces = false;
+}
+
+void CDSConfig::check_aotmode_auto_or_on() {
+  if (!FLAG_IS_DEFAULT(AOTConfiguration)) {
+    vm_exit_during_initialization("AOTConfiguration can only be used with -XX:AOTMode=record or -XX:AOTMode=create");
+  }
+
+  if (!FLAG_IS_DEFAULT(AOTCache)) {
+    assert(FLAG_IS_DEFAULT(SharedArchiveFile), "already checked");
+    FLAG_SET_ERGO(SharedArchiveFile, AOTCache);
+  }
+
+  UseSharedSpaces = true;
+  if (FLAG_IS_DEFAULT(AOTMode) || (strcmp(AOTMode, "auto") == 0)) {
+    RequireSharedSpaces = false;
+  } else {
+    assert(strcmp(AOTMode, "on") == 0, "already checked");
+    RequireSharedSpaces = true;
+  }
+}
+
+void CDSConfig::check_aotmode_record() {
+  if (!FLAG_IS_DEFAULT(AOTCache)) {
+    vm_exit_during_initialization("AOTCache must not be specified when using -XX:AOTMode=record");
+  }
+
+  assert(FLAG_IS_DEFAULT(DumpLoadedClassList), "already checked");
+  assert(FLAG_IS_DEFAULT(SharedArchiveFile), "already checked");
+  FLAG_SET_ERGO(SharedArchiveFile, AOTConfiguration);
+  FLAG_SET_ERGO(DumpLoadedClassList, nullptr);
+  UseSharedSpaces = false;
+  RequireSharedSpaces = false;
+  _is_dumping_static_archive = true;
+  _is_dumping_preimage_static_archive = true;
+
+  // At VM exit, the module graph may be contaminated with program states.
+  // We will rebuild the module graph when dumping the CDS final image.
+  disable_heap_dumping();
+}
+
+void CDSConfig::check_aotmode_create() {
+  if (FLAG_IS_DEFAULT(AOTCache)) {
+    vm_exit_during_initialization("AOTCache must be specified when using -XX:AOTMode=create");
+  }
+
+  assert(FLAG_IS_DEFAULT(SharedArchiveFile), "already checked");
+
+  _is_dumping_final_static_archive = true;
+  FLAG_SET_ERGO(SharedArchiveFile, AOTConfiguration);
+  UseSharedSpaces = true;
+  RequireSharedSpaces = true;
+
+  if (!FileMapInfo::is_preimage_static_archive(AOTConfiguration)) {
+    vm_exit_during_initialization("Must be a valid AOT configuration generated by the current JVM", AOTConfiguration);
+  }
+
+  CDSConfig::enable_dumping_static_archive();
+}
+
 bool CDSConfig::check_vm_args_consistency(bool patch_mod_javabase, bool mode_flag_cmd_line) {
-  check_flag_aliases();
+  check_aot_flags();
 
   if (!FLAG_IS_DEFAULT(AOTMode)) {
     // Using any form of the new AOTMode switch enables enhanced optimizations.
@@ -435,7 +475,9 @@ bool CDSConfig::check_vm_args_consistency(bool patch_mod_javabase, bool mode_fla
   }
 
   if (is_dumping_static_archive()) {
-    if (!mode_flag_cmd_line) {
+    if (is_dumping_preimage_static_archive()) {
+      // Don't tweak execution mode
+    } else if (!mode_flag_cmd_line) {
       // By default, -Xshare:dump runs in interpreter-only mode, which is required for deterministic archive.
       //
       // If your classlist is large and you don't care about deterministic dumping, you can use
@@ -499,6 +541,20 @@ bool CDSConfig::check_vm_args_consistency(bool patch_mod_javabase, bool mode_fla
   return true;
 }
 
+bool CDSConfig::is_dumping_classic_static_archive() {
+  return _is_dumping_static_archive &&
+    !is_dumping_preimage_static_archive() &&
+    !is_dumping_final_static_archive();
+}
+
+bool CDSConfig::is_dumping_preimage_static_archive() {
+  return _is_dumping_preimage_static_archive;
+}
+
+bool CDSConfig::is_dumping_final_static_archive() {
+  return _is_dumping_final_static_archive;
+}
+
 bool CDSConfig::allow_only_single_java_thread() {
   // See comments in JVM_StartThread()
   return is_dumping_static_archive();
@@ -534,6 +590,26 @@ bool CDSConfig::current_thread_is_vm_or_dumper() {
   return t != nullptr && (t->is_VM_thread() || t == _dumper_thread);
 }
 
+const char* CDSConfig::type_of_archive_being_loaded() {
+  if (is_dumping_final_static_archive()) {
+    return "AOT configuration file";
+  } else if (new_aot_flags_used()) {
+    return "AOT cache";
+  } else {
+    return "shared archive file";
+  }
+}
+
+const char* CDSConfig::type_of_archive_being_written() {
+  if (is_dumping_preimage_static_archive()) {
+    return "AOT configuration file";
+  } else if (new_aot_flags_used()) {
+    return "AOT cache";
+  } else {
+    return "shared archive file";
+  }
+}
+
 // If an incompatible VM options is found, return a text message that explains why
 static const char* check_options_incompatible_with_dumping_heap() {
 #if INCLUDE_CDS_JAVA_HEAP
@@ -574,12 +650,11 @@ bool CDSConfig::are_vm_options_incompatible_with_dumping_heap() {
 
 
 bool CDSConfig::is_dumping_heap() {
-  if (!is_dumping_static_archive() // heap dump is not supported in dynamic dump
+  if (!(is_dumping_classic_static_archive() || is_dumping_final_static_archive())
       || are_vm_options_incompatible_with_dumping_heap()
       || _disable_heap_dumping) {
     return false;
   }
-
   return true;
 }
 
@@ -627,7 +702,9 @@ void CDSConfig::stop_using_full_module_graph(const char* reason) {
 }
 
 bool CDSConfig::is_dumping_aot_linked_classes() {
-  if (is_dumping_dynamic_archive()) {
+  if (is_dumping_preimage_static_archive()) {
+    return false;
+  } else if (is_dumping_dynamic_archive()) {
     return is_using_full_module_graph() && AOTClassLinking;
   } else if (is_dumping_static_archive()) {
     return is_dumping_full_module_graph() && AOTClassLinking;
diff --git a/src/hotspot/share/cds/cdsConfig.hpp b/src/hotspot/share/cds/cdsConfig.hpp
index c2dc2b41a93..d9f5a593098 100644
--- a/src/hotspot/share/cds/cdsConfig.hpp
+++ b/src/hotspot/share/cds/cdsConfig.hpp
@@ -34,6 +34,8 @@ class JavaThread;
 class CDSConfig : public AllStatic {
 #if INCLUDE_CDS
   static bool _is_dumping_static_archive;
+  static bool _is_dumping_preimage_static_archive;
+  static bool _is_dumping_final_static_archive;
   static bool _is_dumping_dynamic_archive;
   static bool _is_using_optimized_module_handling;
   static bool _is_dumping_full_module_graph;
@@ -46,6 +48,7 @@ class CDSConfig : public AllStatic {
   static char* _dynamic_archive_path;
 
   static bool  _old_cds_flags_used;
+  static bool  _new_aot_flags_used;
   static bool  _disable_heap_dumping;
 
   static JavaThread* _dumper_thread;
@@ -57,7 +60,11 @@ class CDSConfig : public AllStatic {
   static void init_shared_archive_paths();
 
   static void check_flag_alias(bool alias_is_default, const char* alias_name);
-  static void check_flag_aliases();
+  static void check_aot_flags();
+  static void check_aotmode_off();
+  static void check_aotmode_auto_or_on();
+  static void check_aotmode_record();
+  static void check_aotmode_create();
 
 public:
   // Used by jdk.internal.misc.CDS.getCDSConfigStatus();
@@ -71,11 +78,14 @@ public:
   static void initialize() NOT_CDS_RETURN;
   static void set_old_cds_flags_used()                       { CDS_ONLY(_old_cds_flags_used = true); }
   static bool old_cds_flags_used()                           { return CDS_ONLY(_old_cds_flags_used) NOT_CDS(false); }
+  static bool new_aot_flags_used()                           { return CDS_ONLY(_new_aot_flags_used) NOT_CDS(false); }
   static void check_internal_module_property(const char* key, const char* value) NOT_CDS_RETURN;
   static void check_incompatible_property(const char* key, const char* value) NOT_CDS_RETURN;
   static void check_unsupported_dumping_module_options() NOT_CDS_RETURN;
   static bool has_unsupported_runtime_module_options() NOT_CDS_RETURN_(false);
   static bool check_vm_args_consistency(bool patch_mod_javabase, bool mode_flag_cmd_line) NOT_CDS_RETURN_(true);
+  static const char* type_of_archive_being_loaded();
+  static const char* type_of_archive_being_written();
 
   // --- Basic CDS features
 
@@ -88,6 +98,30 @@ public:
   static bool is_dumping_static_archive()                    { return CDS_ONLY(_is_dumping_static_archive) NOT_CDS(false); }
   static void enable_dumping_static_archive()                { CDS_ONLY(_is_dumping_static_archive = true); }
 
+  // A static CDS archive can be dumped in three modes:
+  //
+  // "classic"   - This is the traditional CDS workflow of
+  //               "java -Xshare:dump -XX:SharedClassListFile=file.txt".
+  //
+  // "preimage"  - This happens when we execute the JEP 483 training run, e.g:
+  //               "java -XX:AOTMode=record -XX:AOTConfiguration=app.aotconfig -cp app.jar App"
+  //               The above command writes app.aotconfig as a "CDS preimage". This
+  //               is a binary file that contains all the classes loaded during the
+  //               training run, plus profiling data (e.g., the resolved constant pool entries).
+  //
+  // "final"     - This happens when we execute the JEP 483 assembly phase, e.g:
+  //               "java -XX:AOTMode=create -XX:AOTConfiguration=app.aotconfig -XX:AOTCache=app.aot -cp app.jar"
+  //               The above command loads all classes from app.aotconfig, perform additional linking,
+  //               and writes app.aot as a "CDS final image" file.
+  //
+  // The main structural difference between "preimage" and "final" is that the preimage
+  // - has a different magic number (0xcafea07c)
+  // - does not have any archived Java heap objects
+  // - does not have aot-linked classes
+  static bool is_dumping_classic_static_archive()            NOT_CDS_RETURN_(false);
+  static bool is_dumping_preimage_static_archive()           NOT_CDS_RETURN_(false);
+  static bool is_dumping_final_static_archive()              NOT_CDS_RETURN_(false);
+
   // dynamic_archive
   static bool is_dumping_dynamic_archive()                   { return CDS_ONLY(_is_dumping_dynamic_archive) NOT_CDS(false); }
   static void enable_dumping_dynamic_archive()               { CDS_ONLY(_is_dumping_dynamic_archive = true); }
@@ -135,7 +169,6 @@ public:
   static void stop_dumping_full_module_graph(const char* reason = nullptr) NOT_CDS_JAVA_HEAP_RETURN;
   static void stop_using_full_module_graph(const char* reason = nullptr) NOT_CDS_JAVA_HEAP_RETURN;
 
-
   // Some CDS functions assume that they are called only within a single-threaded context. I.e.,
   // they are called from:
   //    - The VM thread (e.g., inside VM_PopulateDumpSharedSpace)
diff --git a/src/hotspot/share/cds/cds_globals.hpp b/src/hotspot/share/cds/cds_globals.hpp
index 811740cfbcb..bb9ffe2044b 100644
--- a/src/hotspot/share/cds/cds_globals.hpp
+++ b/src/hotspot/share/cds/cds_globals.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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,9 @@
           constraint(AOTModeConstraintFunc, AtParse)                        \
                                                                             \
   product(ccstr, AOTConfiguration, nullptr,                                 \
-          "Configuration information used by CreateAOTCache")               \
+          "The configuration file written by -XX:AOTMode=record, and "      \
+          "loaded by -XX:AOTMode=create. This file contains profiling data "\
+          "for deciding what contents should be added to AOTCache. ")       \
                                                                             \
   product(ccstr, AOTCache, nullptr,                                         \
           "Cache for improving start up and warm up")                       \
diff --git a/src/hotspot/share/cds/cppVtables.cpp b/src/hotspot/share/cds/cppVtables.cpp
index 39849571015..b8243cedf6d 100644
--- a/src/hotspot/share/cds/cppVtables.cpp
+++ b/src/hotspot/share/cds/cppVtables.cpp
@@ -189,12 +189,22 @@ enum ClonedVtableKind {
   _num_cloned_vtable_kinds
 };
 
-// This is a map of all the original vtptrs. E.g., for
+// _orig_cpp_vtptrs and _archived_cpp_vtptrs are used for type checking in
+// CppVtables::get_archived_vtable().
+//
+// _orig_cpp_vtptrs is a map of all the original vtptrs. E.g., for
 //     ConstantPool *cp = new (...) ConstantPool(...) ; // a dynamically allocated constant pool
 // the following holds true:
-//     _orig_cpp_vtptrs[ConstantPool_Kind] ==  ((intptr_t**)cp)[0]
-static intptr_t* _orig_cpp_vtptrs[_num_cloned_vtable_kinds];
+//     _orig_cpp_vtptrs[ConstantPool_Kind] == ((intptr_t**)cp)[0]
+//
+// _archived_cpp_vtptrs is a map of all the vptprs used by classes in a preimage. E.g., for
+//    InstanceKlass* k = a class loaded from the preimage;
+//    ConstantPool* cp = k->constants();
+// the following holds true:
+//     _archived_cpp_vtptrs[ConstantPool_Kind] == ((intptr_t**)cp)[0]
 static bool _orig_cpp_vtptrs_inited = false;
+static intptr_t* _orig_cpp_vtptrs[_num_cloned_vtable_kinds];
+static intptr_t* _archived_cpp_vtptrs[_num_cloned_vtable_kinds];
 
 template <class T>
 void CppVtableCloner<T>::init_orig_cpp_vtptr(int kind) {
@@ -212,15 +222,27 @@ void CppVtableCloner<T>::init_orig_cpp_vtptr(int kind) {
 //     _index[InstanceKlass_Kind]->cloned_vtable() == ((intptr_t**)ik)[0]
 static CppVtableInfo* _index[_num_cloned_vtable_kinds];
 
-// Vtables are all fixed offsets from ArchiveBuilder::current()->mapped_base()
-// E.g. ConstantPool is at offset 0x58. We can archive these offsets in the
-// RO region and use them to alculate their location at runtime without storing
-// the pointers in the RW region
+// This marks the location in the archive where _index[0] is stored. This location
+// will be stored as FileMapHeader::_cloned_vtables_offset into the archive header.
+// Serviceability Agent uses this information to determine the vtables of
+// archived Metadata objects.
 char* CppVtables::_vtables_serialized_base = nullptr;
 
 void CppVtables::dumptime_init(ArchiveBuilder* builder) {
   assert(CDSConfig::is_dumping_static_archive(), "cpp tables are only dumped into static archive");
 
+  if (CDSConfig::is_dumping_final_static_archive()) {
+    // When dumping final archive, _index[kind] at this point is in the preimage.
+    // Remember these vtable pointers in _archived_cpp_vtptrs, as _index[kind] will now be rewritten
+    // to point to the runtime vtable data.
+    for (int i = 0; i < _num_cloned_vtable_kinds; i++) {
+      assert(_index[i] != nullptr, "must have been restored by CppVtables::serialize()");
+      _archived_cpp_vtptrs[i] = _index[i]->cloned_vtable();
+    }
+  } else {
+    memset(_archived_cpp_vtptrs, 0, sizeof(_archived_cpp_vtptrs));
+  }
+
   CPP_VTABLE_TYPES_DO(ALLOCATE_AND_INITIALIZE_VTABLE);
 
   size_t cpp_tables_size = builder->rw_region()->top() - builder->rw_region()->base();
@@ -267,7 +289,8 @@ intptr_t* CppVtables::get_archived_vtable(MetaspaceObj::Type msotype, address ob
     break;
   default:
     for (kind = 0; kind < _num_cloned_vtable_kinds; kind ++) {
-      if (vtable_of((Metadata*)obj) == _orig_cpp_vtptrs[kind]) {
+      if (vtable_of((Metadata*)obj) == _orig_cpp_vtptrs[kind] ||
+          vtable_of((Metadata*)obj) == _archived_cpp_vtptrs[kind]) {
         break;
       }
     }
@@ -295,5 +318,6 @@ void CppVtables::zero_archived_vtables() {
 
 bool CppVtables::is_valid_shared_method(const Method* m) {
   assert(MetaspaceShared::is_in_shared_metaspace(m), "must be");
-  return vtable_of(m) == _index[Method_Kind]->cloned_vtable();
+  return vtable_of(m) == _index[Method_Kind]->cloned_vtable() ||
+         vtable_of(m) == _archived_cpp_vtptrs[Method_Kind];
 }
diff --git a/src/hotspot/share/cds/dumpTimeClassInfo.cpp b/src/hotspot/share/cds/dumpTimeClassInfo.cpp
index 18136d6eeec..94a0f14ff1f 100644
--- a/src/hotspot/share/cds/dumpTimeClassInfo.cpp
+++ b/src/hotspot/share/cds/dumpTimeClassInfo.cpp
@@ -66,9 +66,9 @@ void DumpTimeClassInfo::add_verification_constraint(InstanceKlass* k, Symbol* na
 
   GrowableArray<char>* vcflags_array = _verifier_constraint_flags;
   char c = 0;
-  c |= from_field_is_protected ? SystemDictionaryShared::FROM_FIELD_IS_PROTECTED : 0;
-  c |= from_is_array           ? SystemDictionaryShared::FROM_IS_ARRAY           : 0;
-  c |= from_is_object          ? SystemDictionaryShared::FROM_IS_OBJECT          : 0;
+  c |= from_field_is_protected ? RunTimeClassInfo::FROM_FIELD_IS_PROTECTED : 0;
+  c |= from_is_array           ? RunTimeClassInfo::FROM_IS_ARRAY           : 0;
+  c |= from_is_object          ? RunTimeClassInfo::FROM_IS_OBJECT          : 0;
   vcflags_array->append(c);
 
   if (log_is_enabled(Trace, cds, verification)) {
@@ -142,7 +142,7 @@ bool DumpTimeClassInfo::is_builtin() {
 }
 
 DumpTimeClassInfo* DumpTimeSharedClassTable::allocate_info(InstanceKlass* k) {
-  assert(!k->is_shared(), "Do not call with shared classes");
+  assert(CDSConfig::is_dumping_final_static_archive() || !k->is_shared(), "Do not call with shared classes");
   bool created;
   DumpTimeClassInfo* p = put_if_absent(k, &created);
   assert(created, "must not exist in table");
@@ -151,7 +151,7 @@ DumpTimeClassInfo* DumpTimeSharedClassTable::allocate_info(InstanceKlass* k) {
 }
 
 DumpTimeClassInfo* DumpTimeSharedClassTable::get_info(InstanceKlass* k) {
-  assert(!k->is_shared(), "Do not call with shared classes");
+  assert(CDSConfig::is_dumping_final_static_archive() || !k->is_shared(), "Do not call with shared classes");
   DumpTimeClassInfo* p = get(k);
   assert(p != nullptr, "we must not see any non-shared InstanceKlass* that's "
          "not stored with SystemDictionaryShared::init_dumptime_info");
diff --git a/src/hotspot/share/cds/dynamicArchive.cpp b/src/hotspot/share/cds/dynamicArchive.cpp
index 4ccf23ff91c..095b443af66 100644
--- a/src/hotspot/share/cds/dynamicArchive.cpp
+++ b/src/hotspot/share/cds/dynamicArchive.cpp
@@ -388,8 +388,9 @@ public:
   void doit() {
     ResourceMark rm;
     if (AllowArchivingWithJavaAgent) {
-      log_warning(cds)("This archive was created with AllowArchivingWithJavaAgent. It should be used "
-              "for testing purposes only and should not be used in a production environment");
+      log_warning(cds)("This %s was created with AllowArchivingWithJavaAgent. It should be used "
+                       "for testing purposes only and should not be used in a production environment",
+                       CDSConfig::type_of_archive_being_loaded());
     }
     AOTClassLocationConfig::dumptime_check_nonempty_dirs();
     _builder.doit();
diff --git a/src/hotspot/share/cds/filemap.cpp b/src/hotspot/share/cds/filemap.cpp
index 7db8e78743e..8a7e66c19e4 100644
--- a/src/hotspot/share/cds/filemap.cpp
+++ b/src/hotspot/share/cds/filemap.cpp
@@ -151,6 +151,13 @@ FileMapInfo::~FileMapInfo() {
   }
 }
 
+void FileMapInfo::free_current_info() {
+  assert(CDSConfig::is_dumping_final_static_archive(), "only supported in this mode");
+  assert(_current_info != nullptr, "sanity");
+  delete _current_info;
+  assert(_current_info == nullptr, "sanity"); // Side effect expected from the above "delete" operator.
+}
+
 void FileMapInfo::populate_header(size_t core_region_alignment) {
   assert(_header == nullptr, "Sanity check");
   size_t c_header_size;
@@ -191,7 +198,13 @@ void FileMapHeader::populate(FileMapInfo *info, size_t core_region_alignment,
   set_header_size((unsigned int)header_size);
   set_base_archive_name_offset((unsigned int)base_archive_name_offset);
   set_base_archive_name_size((unsigned int)base_archive_name_size);
-  set_magic(CDSConfig::is_dumping_dynamic_archive() ? CDS_DYNAMIC_ARCHIVE_MAGIC : CDS_ARCHIVE_MAGIC);
+  if (CDSConfig::is_dumping_dynamic_archive()) {
+    set_magic(CDS_DYNAMIC_ARCHIVE_MAGIC);
+  } else if (CDSConfig::is_dumping_preimage_static_archive()) {
+    set_magic(CDS_PREIMAGE_ARCHIVE_MAGIC);
+  } else {
+    set_magic(CDS_ARCHIVE_MAGIC);
+  }
   set_version(CURRENT_CDS_ARCHIVE_VERSION);
 
   if (!info->is_static() && base_archive_name_size != 0) {
@@ -386,7 +399,7 @@ public:
     assert(_archive_name != nullptr, "Archive name is null");
     _fd = os::open(_archive_name, O_RDONLY | O_BINARY, 0);
     if (_fd < 0) {
-      log_info(cds)("Specified shared archive not found (%s)", _archive_name);
+      log_info(cds)("Specified %s not found (%s)", CDSConfig::type_of_archive_being_loaded(), _archive_name);
       return false;
     }
     return initialize(_fd);
@@ -397,30 +410,32 @@ public:
     assert(_archive_name != nullptr, "Archive name is null");
     assert(fd != -1, "Archive must be opened already");
     // First read the generic header so we know the exact size of the actual header.
+    const char* file_type = CDSConfig::type_of_archive_being_loaded();
     GenericCDSFileMapHeader gen_header;
     size_t size = sizeof(GenericCDSFileMapHeader);
     os::lseek(fd, 0, SEEK_SET);
     size_t n = ::read(fd, (void*)&gen_header, (unsigned int)size);
     if (n != size) {
-      log_warning(cds)("Unable to read generic CDS file map header from shared archive");
+      log_warning(cds)("Unable to read generic CDS file map header from %s", file_type);
       return false;
     }
 
     if (gen_header._magic != CDS_ARCHIVE_MAGIC &&
-        gen_header._magic != CDS_DYNAMIC_ARCHIVE_MAGIC) {
-      log_warning(cds)("The shared archive file has a bad magic number: %#x", gen_header._magic);
+        gen_header._magic != CDS_DYNAMIC_ARCHIVE_MAGIC &&
+        gen_header._magic != CDS_PREIMAGE_ARCHIVE_MAGIC) {
+      log_warning(cds)("The %s has a bad magic number: %#x", file_type, gen_header._magic);
       return false;
     }
 
     if (gen_header._version < CDS_GENERIC_HEADER_SUPPORTED_MIN_VERSION) {
-      log_warning(cds)("Cannot handle shared archive file version 0x%x. Must be at least 0x%x.",
-                                 gen_header._version, CDS_GENERIC_HEADER_SUPPORTED_MIN_VERSION);
+      log_warning(cds)("Cannot handle %s version 0x%x. Must be at least 0x%x.",
+                       file_type, gen_header._version, CDS_GENERIC_HEADER_SUPPORTED_MIN_VERSION);
       return false;
     }
 
     if (gen_header._version !=  CURRENT_CDS_ARCHIVE_VERSION) {
-      log_warning(cds)("The shared archive file version 0x%x does not match the required version 0x%x.",
-                                 gen_header._version, CURRENT_CDS_ARCHIVE_VERSION);
+      log_warning(cds)("The %s version 0x%x does not match the required version 0x%x.",
+                       file_type, gen_header._version, CURRENT_CDS_ARCHIVE_VERSION);
     }
 
     size_t filelen = os::lseek(fd, 0, SEEK_END);
@@ -435,7 +450,7 @@ public:
     os::lseek(fd, 0, SEEK_SET);
     n = ::read(fd, (void*)_header, (unsigned int)size);
     if (n != size) {
-      log_warning(cds)("Unable to read actual CDS file map header from shared archive");
+      log_warning(cds)("Unable to read file map header from %s", file_type);
       return false;
     }
 
@@ -462,6 +477,18 @@ public:
     return _base_archive_name;
   }
 
+  bool is_static_archive() const {
+    return _header->_magic == CDS_ARCHIVE_MAGIC;
+  }
+
+  bool is_dynamic_archive() const {
+    return _header->_magic == CDS_DYNAMIC_ARCHIVE_MAGIC;
+  }
+
+  bool is_preimage_static_archive() const {
+    return _header->_magic == CDS_PREIMAGE_ARCHIVE_MAGIC;
+  }
+
  private:
   bool check_header_crc() const {
     if (VerifySharedSpaces) {
@@ -487,7 +514,8 @@ public:
                                  name_offset, name_size);
       return false;
     }
-    if (_header->_magic == CDS_ARCHIVE_MAGIC) {
+
+    if (is_static_archive() || is_preimage_static_archive()) {
       if (name_offset != 0) {
         log_warning(cds)("static shared archive must have zero _base_archive_name_offset");
         return false;
@@ -497,7 +525,7 @@ public:
         return false;
       }
     } else {
-      assert(_header->_magic == CDS_DYNAMIC_ARCHIVE_MAGIC, "must be");
+      assert(is_dynamic_archive(), "must be");
       if ((name_size == 0 && name_offset != 0) ||
           (name_size != 0 && name_offset == 0)) {
         // If either is zero, both must be zero. This indicates that we are using the default base archive.
@@ -545,7 +573,12 @@ bool FileMapInfo::get_base_archive_name_from_header(const char* archive_name,
     return false;
   }
   GenericCDSFileMapHeader* header = file_helper.get_generic_file_header();
-  if (header->_magic != CDS_DYNAMIC_ARCHIVE_MAGIC) {
+  switch (header->_magic) {
+  case CDS_PREIMAGE_ARCHIVE_MAGIC:
+    return false; // This is a binary config file, not a proper archive
+  case CDS_DYNAMIC_ARCHIVE_MAGIC:
+    break;
+  default:
     assert(header->_magic == CDS_ARCHIVE_MAGIC, "must be");
     if (AutoCreateSharedArchive) {
      log_warning(cds)("AutoCreateSharedArchive is ignored because %s is a static archive", archive_name);
@@ -563,6 +596,14 @@ bool FileMapInfo::get_base_archive_name_from_header(const char* archive_name,
   return true;
 }
 
+bool FileMapInfo::is_preimage_static_archive(const char* file) {
+  FileHeaderHelper file_helper(file, false);
+  if (!file_helper.initialize()) {
+    return false;
+  }
+  return file_helper.is_preimage_static_archive();
+}
+
 // Read the FileMapInfo information from the file.
 
 bool FileMapInfo::init_from_file(int fd) {
@@ -573,9 +614,17 @@ bool FileMapInfo::init_from_file(int fd) {
   }
   GenericCDSFileMapHeader* gen_header = file_helper.get_generic_file_header();
 
+  const char* file_type = CDSConfig::type_of_archive_being_loaded();
   if (_is_static) {
-    if (gen_header->_magic != CDS_ARCHIVE_MAGIC) {
-      log_warning(cds)("Not a base shared archive: %s", _full_path);
+    if ((gen_header->_magic == CDS_ARCHIVE_MAGIC) ||
+        (gen_header->_magic == CDS_PREIMAGE_ARCHIVE_MAGIC && CDSConfig::is_dumping_final_static_archive())) {
+      // Good
+    } else {
+      if (CDSConfig::new_aot_flags_used()) {
+        log_warning(cds)("Not a valid %s %s", file_type, _full_path);
+      } else {
+        log_warning(cds)("Not a base shared archive: %s", _full_path);
+      }
       return false;
     }
   } else {
@@ -597,7 +646,7 @@ bool FileMapInfo::init_from_file(int fd) {
   if (header()->version() != CURRENT_CDS_ARCHIVE_VERSION) {
     log_info(cds)("_version expected: 0x%x", CURRENT_CDS_ARCHIVE_VERSION);
     log_info(cds)("           actual: 0x%x", header()->version());
-    log_warning(cds)("The shared archive file has the wrong version.");
+    log_warning(cds)("The %s has the wrong version.", file_type);
     return false;
   }
 
@@ -609,7 +658,7 @@ bool FileMapInfo::init_from_file(int fd) {
       log_info(cds)("_header_size: " UINT32_FORMAT, header_size);
       log_info(cds)("base_archive_name_size: " UINT32_FORMAT, header()->base_archive_name_size());
       log_info(cds)("base_archive_name_offset: " UINT32_FORMAT, header()->base_archive_name_offset());
-      log_warning(cds)("The shared archive file has an incorrect header size.");
+      log_warning(cds)("The %s has an incorrect header size.", file_type);
       return false;
     }
   }
@@ -626,8 +675,8 @@ bool FileMapInfo::init_from_file(int fd) {
   if (strncmp(actual_ident, expected_ident, JVM_IDENT_MAX-1) != 0) {
     log_info(cds)("_jvm_ident expected: %s", expected_ident);
     log_info(cds)("             actual: %s", actual_ident);
-    log_warning(cds)("The shared archive file was created by a different"
-                  " version or build of HotSpot");
+    log_warning(cds)("The %s was created by a different"
+                  " version or build of HotSpot", file_type);
     return false;
   }
 
@@ -638,7 +687,7 @@ bool FileMapInfo::init_from_file(int fd) {
   for (int i = 0; i < MetaspaceShared::n_regions; i++) {
     FileMapRegion* r = region_at(i);
     if (r->file_offset() > len || len - r->file_offset() < r->used()) {
-      log_warning(cds)("The shared archive file has been truncated.");
+      log_warning(cds)("The %s has been truncated.", file_type);
       return false;
     }
   }
@@ -658,18 +707,21 @@ bool FileMapInfo::open_for_read() {
   if (_file_open) {
     return true;
   }
-  log_info(cds)("trying to map %s", _full_path);
+  const char* file_type = CDSConfig::type_of_archive_being_loaded();
+  const char* info = CDSConfig::is_dumping_final_static_archive() ?
+    "AOTConfiguration file " : "";
+  log_info(cds)("trying to map %s%s", info, _full_path);
   int fd = os::open(_full_path, O_RDONLY | O_BINARY, 0);
   if (fd < 0) {
     if (errno == ENOENT) {
-      log_info(cds)("Specified shared archive not found (%s)", _full_path);
+      log_info(cds)("Specified %s not found (%s)", file_type, _full_path);
     } else {
-      log_warning(cds)("Failed to open shared archive file (%s)",
+      log_warning(cds)("Failed to open %s (%s)", file_type,
                     os::strerror(errno));
     }
     return false;
   } else {
-    log_info(cds)("Opened archive %s.", _full_path);
+    log_info(cds)("Opened %s %s.", file_type, _full_path);
   }
 
   _fd = fd;
@@ -682,20 +734,25 @@ bool FileMapInfo::open_for_read() {
 void FileMapInfo::open_for_write() {
   LogMessage(cds) msg;
   if (msg.is_info()) {
-    msg.info("Dumping shared data to file: ");
+    if (CDSConfig::is_dumping_preimage_static_archive()) {
+      msg.info("Writing binary AOTConfiguration file: ");
+    } else {
+      msg.info("Dumping shared data to file: ");
+    }
     msg.info("   %s", _full_path);
   }
 
 #ifdef _WINDOWS  // On Windows, need WRITE permission to remove the file.
-    chmod(_full_path, _S_IREAD | _S_IWRITE);
+  chmod(_full_path, _S_IREAD | _S_IWRITE);
 #endif
 
   // Use remove() to delete the existing file because, on Unix, this will
   // allow processes that have it open continued access to the file.
   remove(_full_path);
-  int fd = os::open(_full_path, O_RDWR | O_CREAT | O_TRUNC | O_BINARY, 0444);
+  int mode = CDSConfig::is_dumping_preimage_static_archive() ? 0666 : 0444;
+  int fd = os::open(_full_path, O_RDWR | O_CREAT | O_TRUNC | O_BINARY, mode);
   if (fd < 0) {
-    log_error(cds)("Unable to create shared archive file %s: (%s).", _full_path,
+    log_error(cds)("Unable to create %s %s: (%s).", CDSConfig::type_of_archive_being_written(), _full_path,
                    os::strerror(errno));
     MetaspaceShared::writing_error();
     return;
@@ -951,7 +1008,14 @@ void FileMapInfo::write_bytes(const void* buffer, size_t nbytes) {
     // If the shared archive is corrupted, close it and remove it.
     close();
     remove(_full_path);
-    MetaspaceShared::writing_error("Unable to write to shared archive file.");
+
+    if (CDSConfig::is_dumping_preimage_static_archive()) {
+      MetaspaceShared::writing_error("Unable to write to AOT configuration file.");
+    } else if (CDSConfig::new_aot_flags_used()) {
+      MetaspaceShared::writing_error("Unable to write to AOT cache.");
+    } else {
+      MetaspaceShared::writing_error("Unable to write to shared archive.");
+    }
   }
   _file_offset += nbytes;
 }
@@ -1793,15 +1857,16 @@ int FileMapHeader::compute_crc() {
 
 // This function should only be called during run time with UseSharedSpaces enabled.
 bool FileMapHeader::validate() {
+  const char* file_type = CDSConfig::type_of_archive_being_loaded();
   if (_obj_alignment != ObjectAlignmentInBytes) {
-    log_info(cds)("The shared archive file's ObjectAlignmentInBytes of %d"
+    log_info(cds)("The %s's ObjectAlignmentInBytes of %d"
                   " does not equal the current ObjectAlignmentInBytes of %d.",
-                  _obj_alignment, ObjectAlignmentInBytes);
+                  file_type, _obj_alignment, ObjectAlignmentInBytes);
     return false;
   }
   if (_compact_strings != CompactStrings) {
-    log_info(cds)("The shared archive file's CompactStrings setting (%s)"
-                  " does not equal the current CompactStrings setting (%s).",
+    log_info(cds)("The %s's CompactStrings setting (%s)"
+                  " does not equal the current CompactStrings setting (%s).", file_type,
                   _compact_strings ? "enabled" : "disabled",
                   CompactStrings   ? "enabled" : "disabled");
     return false;
@@ -1825,8 +1890,8 @@ bool FileMapHeader::validate() {
 
   if (!_verify_local && BytecodeVerificationLocal) {
     //  we cannot load boot classes, so there's no point of using the CDS archive
-    log_info(cds)("The shared archive file's BytecodeVerificationLocal setting (%s)"
-                               " does not equal the current BytecodeVerificationLocal setting (%s).",
+    log_info(cds)("The %s's BytecodeVerificationLocal setting (%s)"
+                               " does not equal the current BytecodeVerificationLocal setting (%s).", file_type,
                                _verify_local ? "enabled" : "disabled",
                                BytecodeVerificationLocal ? "enabled" : "disabled");
     return false;
@@ -1837,8 +1902,8 @@ bool FileMapHeader::validate() {
   if (_has_platform_or_app_classes
       && !_verify_remote // we didn't verify the archived platform/app classes
       && BytecodeVerificationRemote) { // but we want to verify all loaded platform/app classes
-    log_info(cds)("The shared archive file was created with less restrictive "
-                               "verification setting than the current setting.");
+    log_info(cds)("The %s was created with less restrictive "
+                               "verification setting than the current setting.", file_type);
     // Pretend that we didn't have any archived platform/app classes, so they won't be loaded
     // by SystemDictionaryShared.
     _has_platform_or_app_classes = false;
@@ -1850,32 +1915,32 @@ bool FileMapHeader::validate() {
   // while AllowArchivingWithJavaAgent is set during the current run.
   if (_allow_archiving_with_java_agent && !AllowArchivingWithJavaAgent) {
     log_warning(cds)("The setting of the AllowArchivingWithJavaAgent is different "
-                               "from the setting in the shared archive.");
+                               "from the setting in the %s.", file_type);
     return false;
   }
 
   if (_allow_archiving_with_java_agent) {
-    log_warning(cds)("This archive was created with AllowArchivingWithJavaAgent. It should be used "
-            "for testing purposes only and should not be used in a production environment");
+    log_warning(cds)("This %s was created with AllowArchivingWithJavaAgent. It should be used "
+            "for testing purposes only and should not be used in a production environment", file_type);
   }
 
-  log_info(cds)("Archive was created with UseCompressedOops = %d, UseCompressedClassPointers = %d, UseCompactObjectHeaders = %d",
-                          compressed_oops(), compressed_class_pointers(), compact_headers());
+  log_info(cds)("The %s was created with UseCompressedOops = %d, UseCompressedClassPointers = %d, UseCompactObjectHeaders = %d",
+                          file_type, compressed_oops(), compressed_class_pointers(), compact_headers());
   if (compressed_oops() != UseCompressedOops || compressed_class_pointers() != UseCompressedClassPointers) {
-    log_warning(cds)("Unable to use shared archive.\nThe saved state of UseCompressedOops and UseCompressedClassPointers is "
-                               "different from runtime, CDS will be disabled.");
+    log_warning(cds)("Unable to use %s.\nThe saved state of UseCompressedOops and UseCompressedClassPointers is "
+                               "different from runtime, CDS will be disabled.", file_type);
     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).",
+    log_warning(cds)("Unable to use %s.\nThe %s's UseCompactObjectHeaders setting (%s)"
+                     " does not equal the current UseCompactObjectHeaders setting (%s).", file_type, file_type,
                      _compact_headers          ? "enabled" : "disabled",
                      UseCompactObjectHeaders   ? "enabled" : "disabled");
     return false;
   }
 
-  if (!_use_optimized_module_handling) {
+  if (!_use_optimized_module_handling && !CDSConfig::is_dumping_final_static_archive()) {
     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 22f70635e17..25550d76d2a 100644
--- a/src/hotspot/share/cds/filemap.hpp
+++ b/src/hotspot/share/cds/filemap.hpp
@@ -270,12 +270,15 @@ public:
   FileMapHeader *header() const       { return _header; }
   static bool get_base_archive_name_from_header(const char* archive_name,
                                                 char** base_archive_name);
+  static bool is_preimage_static_archive(const char* file);
+
   bool init_from_file(int fd);
 
   void log_paths(const char* msg, int start_idx, int end_idx);
 
   FileMapInfo(const char* full_apth, bool is_static);
   ~FileMapInfo();
+  static void free_current_info();
 
   // Accessors
   int    compute_header_crc()  const { return header()->compute_crc(); }
diff --git a/src/hotspot/share/cds/finalImageRecipes.cpp b/src/hotspot/share/cds/finalImageRecipes.cpp
new file mode 100644
index 00000000000..55855679a1c
--- /dev/null
+++ b/src/hotspot/share/cds/finalImageRecipes.cpp
@@ -0,0 +1,167 @@
+/*
+ * Copyright (c) 2024, 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please 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 "cds/aotConstantPoolResolver.hpp"
+#include "cds/archiveBuilder.hpp"
+#include "cds/archiveUtils.inline.hpp"
+#include "cds/cdsConfig.hpp"
+#include "cds/finalImageRecipes.hpp"
+#include "classfile/classLoader.hpp"
+#include "classfile/javaClasses.hpp"
+#include "classfile/systemDictionary.hpp"
+#include "classfile/systemDictionaryShared.hpp"
+#include "classfile/vmClasses.hpp"
+#include "memory/oopFactory.hpp"
+#include "memory/resourceArea.hpp"
+#include "oops/constantPool.inline.hpp"
+#include "runtime/handles.inline.hpp"
+
+static FinalImageRecipes* _final_image_recipes = nullptr;
+
+void* FinalImageRecipes::operator new(size_t size) throw() {
+  return ArchiveBuilder::current()->ro_region_alloc(size);
+}
+
+void FinalImageRecipes::record_recipes_impl() {
+  assert(CDSConfig::is_dumping_preimage_static_archive(), "must be");
+  ResourceMark rm;
+  GrowableArray<Klass*>* klasses = ArchiveBuilder::current()->klasses();
+
+  // Record the indys that have been resolved in the training run. These indys will be
+  // resolved during the final image assembly.
+
+  GrowableArray<InstanceKlass*> tmp_indy_klasses;
+  GrowableArray<Array<int>*> tmp_indy_cp_indices;
+  int total_indys_to_resolve = 0;
+  for (int i = 0; i < klasses->length(); i++) {
+    Klass* k = klasses->at(i);
+    if (k->is_instance_klass()) {
+      InstanceKlass* ik = InstanceKlass::cast(k);
+      GrowableArray<int> indices;
+
+      if (ik->constants()->cache() != nullptr) {
+        Array<ResolvedIndyEntry>* tmp_indy_entries = ik->constants()->cache()->resolved_indy_entries();
+        if (tmp_indy_entries != nullptr) {
+          for (int i = 0; i < tmp_indy_entries->length(); i++) {
+            ResolvedIndyEntry* rie = tmp_indy_entries->adr_at(i);
+            int cp_index = rie->constant_pool_index();
+            if (rie->is_resolved()) {
+              indices.append(cp_index);
+            }
+          }
+        }
+      }
+
+      if (indices.length() > 0) {
+        tmp_indy_klasses.append(ArchiveBuilder::current()->get_buffered_addr(ik));
+        tmp_indy_cp_indices.append(ArchiveUtils::archive_array(&indices));
+        total_indys_to_resolve += indices.length();
+      }
+    }
+  }
+
+  _all_klasses = ArchiveUtils::archive_array(klasses);
+  ArchivePtrMarker::mark_pointer(&_all_klasses);
+
+  assert(tmp_indy_klasses.length() == tmp_indy_cp_indices.length(), "must be");
+  if (tmp_indy_klasses.length() > 0) {
+    _indy_klasses = ArchiveUtils::archive_array(&tmp_indy_klasses);
+    _indy_cp_indices = ArchiveUtils::archive_array(&tmp_indy_cp_indices);
+
+    ArchivePtrMarker::mark_pointer(&_indy_klasses);
+    ArchivePtrMarker::mark_pointer(&_indy_cp_indices);
+  }
+  log_info(cds)("%d indies in %d classes will be resolved in final CDS image", total_indys_to_resolve, tmp_indy_klasses.length());
+}
+
+void FinalImageRecipes::load_all_classes(TRAPS) {
+  assert(CDSConfig::is_dumping_final_static_archive(), "sanity");
+  Handle class_loader(THREAD, SystemDictionary::java_system_loader());
+  for (int i = 0; i < _all_klasses->length(); i++) {
+    Klass* k = _all_klasses->at(i);
+    if (k->is_instance_klass()) {
+      InstanceKlass* ik = InstanceKlass::cast(k);
+      if (!ik->is_shared_unregistered_class() && !ik->is_hidden()) {
+        Klass* actual = SystemDictionary::resolve_or_fail(ik->name(), class_loader, true, CHECK);
+        if (actual != ik) {
+          ResourceMark rm(THREAD);
+          log_error(cds)("Unable to resolve class from CDS archive: %s", ik->external_name());
+          log_error(cds)("Expected: " INTPTR_FORMAT ", actual: " INTPTR_FORMAT, p2i(ik), p2i(actual));
+          log_error(cds)("Please check if your VM command-line is the same as in the training run");
+          MetaspaceShared::unrecoverable_writing_error();
+        }
+        assert(ik->is_loaded(), "must be");
+        ik->link_class(CHECK);
+      }
+    }
+  }
+}
+
+void FinalImageRecipes::apply_recipes_for_invokedynamic(TRAPS) {
+  assert(CDSConfig::is_dumping_final_static_archive(), "must be");
+
+  if (CDSConfig::is_dumping_invokedynamic() && _indy_klasses != nullptr) {
+    assert(_indy_cp_indices != nullptr, "must be");
+    for (int i = 0; i < _indy_klasses->length(); i++) {
+      InstanceKlass* ik = _indy_klasses->at(i);
+      ConstantPool* cp = ik->constants();
+      Array<int>* cp_indices = _indy_cp_indices->at(i);
+      GrowableArray<bool> preresolve_list(cp->length(), cp->length(), false);
+      for (int j = 0; j < cp_indices->length(); j++) {
+        preresolve_list.at_put(cp_indices->at(j), true);
+      }
+      AOTConstantPoolResolver::preresolve_indy_cp_entries(THREAD, ik, &preresolve_list);
+    }
+  }
+}
+
+void FinalImageRecipes::record_recipes() {
+  _final_image_recipes = new FinalImageRecipes();
+  _final_image_recipes->record_recipes_impl();
+}
+
+void FinalImageRecipes::apply_recipes(TRAPS) {
+  assert(CDSConfig::is_dumping_final_static_archive(), "must be");
+  if (_final_image_recipes != nullptr) {
+    _final_image_recipes->apply_recipes_impl(THREAD);
+    if (HAS_PENDING_EXCEPTION) {
+      log_error(cds)("%s: %s", PENDING_EXCEPTION->klass()->external_name(),
+                     java_lang_String::as_utf8_string(java_lang_Throwable::message(PENDING_EXCEPTION)));
+      log_error(cds)("Please check if your VM command-line is the same as in the training run");
+      MetaspaceShared::unrecoverable_writing_error("Unexpected exception, use -Xlog:cds,exceptions=trace for detail");
+    }
+  }
+
+  // Set it to null as we don't need to write this table into the final image.
+  _final_image_recipes = nullptr;
+}
+
+void FinalImageRecipes::apply_recipes_impl(TRAPS) {
+  load_all_classes(CHECK);
+  apply_recipes_for_invokedynamic(CHECK);
+}
+
+void FinalImageRecipes::serialize(SerializeClosure* soc) {
+  soc->do_ptr((void**)&_final_image_recipes);
+}
diff --git a/src/hotspot/share/cds/finalImageRecipes.hpp b/src/hotspot/share/cds/finalImageRecipes.hpp
new file mode 100644
index 00000000000..f07d9787af9
--- /dev/null
+++ b/src/hotspot/share/cds/finalImageRecipes.hpp
@@ -0,0 +1,76 @@
+/*
+ * Copyright (c) 2024, 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please 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_CDS_FINALIMAGERECIPES_HPP
+#define SHARE_CDS_FINALIMAGERECIPES_HPP
+
+#include "oops/oopsHierarchy.hpp"
+#include "utilities/exceptions.hpp"
+
+class InstanceKlass;
+class Klass;
+
+template <typename T> class GrowableArray;
+template <typename T> class Array;
+
+// This class is used for transferring information from the AOTConfiguration file (aka the "preimage")
+// to the JVM that creates the AOTCache (aka the "final image").
+//   - The recipes are recorded when CDSConfig::is_dumping_preimage_static_archive() is true.
+//   - The recipes are applied when CDSConfig::is_dumping_final_static_archive() is true.
+// The following information are recorded:
+//   - The list of all classes that are stored in the AOTConfiguration file.
+//   - The list of all classes that require AOT resolution of invokedynamic call sites.
+class FinalImageRecipes {
+  // A list of all the archived classes from the preimage. We want to transfer all of these
+  // into the final image.
+  Array<Klass*>* _all_klasses;
+
+  // The classes who have resolved at least one indy CP entry during the training run.
+  // _indy_cp_indices[i] is a list of all resolved CP entries for _indy_klasses[i].
+  Array<InstanceKlass*>* _indy_klasses;
+  Array<Array<int>*>*    _indy_cp_indices;
+
+  FinalImageRecipes() : _indy_klasses(nullptr), _indy_cp_indices(nullptr) {}
+
+  void* operator new(size_t size) throw();
+
+  // Called when dumping preimage
+  void record_recipes_impl();
+
+  // Called when dumping final image
+  void apply_recipes_impl(TRAPS);
+  void load_all_classes(TRAPS);
+  void apply_recipes_for_invokedynamic(TRAPS);
+
+public:
+  static void serialize(SerializeClosure* soc);
+
+  // Called when dumping preimage
+  static void record_recipes();
+
+  // Called when dumping final image
+  static void apply_recipes(TRAPS);
+};
+
+#endif // SHARE_CDS_FINALIMAGERECIPES_HPP
diff --git a/src/hotspot/share/cds/heapShared.cpp b/src/hotspot/share/cds/heapShared.cpp
index 5aa456ea438..c95a358de5f 100644
--- a/src/hotspot/share/cds/heapShared.cpp
+++ b/src/hotspot/share/cds/heapShared.cpp
@@ -401,6 +401,11 @@ objArrayOop HeapShared::scratch_resolved_references(ConstantPool* src) {
   return (objArrayOop)_scratch_references_table->get_oop(src);
 }
 
+void HeapShared::init_dumping() {
+  _scratch_java_mirror_table = new (mtClass)MetaspaceObjToOopHandleTable();
+  _scratch_references_table = new (mtClass)MetaspaceObjToOopHandleTable();
+}
+
 void HeapShared::init_scratch_objects(TRAPS) {
   for (int i = T_BOOLEAN; i < T_VOID+1; i++) {
     BasicType bt = (BasicType)i;
@@ -409,8 +414,6 @@ void HeapShared::init_scratch_objects(TRAPS) {
       _scratch_basic_type_mirrors[i] = OopHandle(Universe::vm_global(), m);
     }
   }
-  _scratch_java_mirror_table = new (mtClass)MetaspaceObjToOopHandleTable();
-  _scratch_references_table = new (mtClass)MetaspaceObjToOopHandleTable();
 }
 
 // Given java_mirror that represents a (primitive or reference) type T,
diff --git a/src/hotspot/share/cds/heapShared.hpp b/src/hotspot/share/cds/heapShared.hpp
index 11250f1a35c..ba2fe5be775 100644
--- a/src/hotspot/share/cds/heapShared.hpp
+++ b/src/hotspot/share/cds/heapShared.hpp
@@ -405,6 +405,7 @@ private:
   static void write_heap(ArchiveHeapInfo* heap_info) NOT_CDS_JAVA_HEAP_RETURN;
   static objArrayOop scratch_resolved_references(ConstantPool* src);
   static void add_scratch_resolved_references(ConstantPool* src, objArrayOop dest) NOT_CDS_JAVA_HEAP_RETURN;
+  static void init_dumping() NOT_CDS_JAVA_HEAP_RETURN;
   static void init_scratch_objects(TRAPS) NOT_CDS_JAVA_HEAP_RETURN;
   static void init_box_classes(TRAPS) NOT_CDS_JAVA_HEAP_RETURN;
   static bool is_heap_region(int idx) {
diff --git a/src/hotspot/share/cds/lambdaFormInvokers.cpp b/src/hotspot/share/cds/lambdaFormInvokers.cpp
index ee3e9cff782..fc1917086f3 100644
--- a/src/hotspot/share/cds/lambdaFormInvokers.cpp
+++ b/src/hotspot/share/cds/lambdaFormInvokers.cpp
@@ -263,4 +263,8 @@ void LambdaFormInvokers::read_static_archive_invokers() {
 
 void LambdaFormInvokers::serialize(SerializeClosure* soc) {
   soc->do_ptr(&_static_archive_invokers);
+  if (soc->reading() && CDSConfig::is_dumping_final_static_archive()) {
+    LambdaFormInvokers::read_static_archive_invokers();
+    _static_archive_invokers = nullptr;
+  }
 }
diff --git a/src/hotspot/share/cds/metaspaceShared.cpp b/src/hotspot/share/cds/metaspaceShared.cpp
index b95d524cb1d..2e5ebff456e 100644
--- a/src/hotspot/share/cds/metaspaceShared.cpp
+++ b/src/hotspot/share/cds/metaspaceShared.cpp
@@ -39,6 +39,7 @@
 #include "cds/dumpAllocStats.hpp"
 #include "cds/dynamicArchive.hpp"
 #include "cds/filemap.hpp"
+#include "cds/finalImageRecipes.hpp"
 #include "cds/heapShared.hpp"
 #include "cds/lambdaFormInvokers.hpp"
 #include "cds/metaspaceShared.hpp"
@@ -489,6 +490,7 @@ void MetaspaceShared::serialize(SerializeClosure* soc) {
   HeapShared::serialize_tables(soc);
   SystemDictionaryShared::serialize_dictionary_headers(soc);
   AOTLinkedClassBulkLoader::serialize(soc, true);
+  FinalImageRecipes::serialize(soc);
   InstanceMirrorKlass::serialize_offsets(soc);
 
   // Dump/restore well known classes (pointers)
@@ -609,6 +611,9 @@ char* VM_PopulateDumpSharedSpace::dump_read_only_tables(AOTClassLocationConfig*&
   SystemDictionaryShared::write_to_archive();
   cl_config = AOTClassLocationConfig::dumptime()->write_to_archive();
   AOTClassLinker::write_to_archive();
+  if (CDSConfig::is_dumping_preimage_static_archive()) {
+    FinalImageRecipes::record_recipes();
+  }
   MetaspaceShared::write_method_handle_intrinsics();
 
   // Write lambform lines into archive
@@ -624,7 +629,9 @@ char* VM_PopulateDumpSharedSpace::dump_read_only_tables(AOTClassLocationConfig*&
 }
 
 void VM_PopulateDumpSharedSpace::doit() {
-  guarantee(!CDSConfig::is_using_archive(), "We should not be using an archive when we dump");
+  if (!CDSConfig::is_dumping_final_static_archive()) {
+    guarantee(!CDSConfig::is_using_archive(), "We should not be using an archive when we dump");
+  }
 
   DEBUG_ONLY(SystemDictionaryShared::NoClassLoadingMark nclm);
 
@@ -679,7 +686,13 @@ void VM_PopulateDumpSharedSpace::doit() {
   CppVtables::zero_archived_vtables();
 
   // Write the archive file
-  const char* static_archive = CDSConfig::static_archive_path();
+  const char* static_archive;
+  if (CDSConfig::is_dumping_final_static_archive()) {
+    static_archive = AOTCache;
+    FileMapInfo::free_current_info();
+  } else {
+    static_archive = CDSConfig::static_archive_path();
+  }
   assert(static_archive != nullptr, "SharedArchiveFile not set?");
   _map_info = new FileMapInfo(static_archive, true);
   _map_info->populate_header(MetaspaceShared::core_region_alignment());
@@ -743,7 +756,7 @@ bool MetaspaceShared::link_class_for_cds(InstanceKlass* ik, TRAPS) {
 void MetaspaceShared::link_shared_classes(bool jcmd_request, TRAPS) {
   AOTClassLinker::initialize();
 
-  if (!jcmd_request) {
+  if (!jcmd_request && !CDSConfig::is_dumping_final_static_archive()) {
     LambdaFormInvokers::regenerate_holder_classes(CHECK);
   }
 
@@ -778,6 +791,10 @@ void MetaspaceShared::link_shared_classes(bool jcmd_request, TRAPS) {
     // Class linking includes verification which may load more classes.
     // Keep scanning until we have linked no more classes.
   }
+
+  if (CDSConfig::is_dumping_final_static_archive()) {
+    FinalImageRecipes::apply_recipes(CHECK);
+  }
 }
 
 void MetaspaceShared::prepare_for_dumping() {
@@ -804,13 +821,18 @@ void MetaspaceShared::preload_and_dump(TRAPS) {
     }
   }
 
-  if (!CDSConfig::old_cds_flags_used()) {
-    // The JLI launcher only recognizes the "old" -Xshare:dump flag.
-    // When the new -XX:AOTMode=create flag is used, we can't return
-    // to the JLI launcher, as the launcher will fail when trying to
-    // run the main class, which is not what we want.
-    tty->print_cr("AOTCache creation is complete: %s", AOTCache);
-    vm_exit(0);
+  if (CDSConfig::new_aot_flags_used()) {
+    if (CDSConfig::is_dumping_preimage_static_archive()) {
+      tty->print_cr("AOTConfiguration recorded: %s", AOTConfiguration);
+      vm_exit(0);
+    } else {
+      // The JLI launcher only recognizes the "old" -Xshare:dump flag.
+      // When the new -XX:AOTMode=create flag is used, we can't return
+      // to the JLI launcher, as the launcher will fail when trying to
+      // run the main class, which is not what we want.
+      tty->print_cr("AOTCache creation is complete: %s", AOTCache);
+      vm_exit(0);
+    }
   }
 }
 
@@ -910,12 +932,34 @@ void MetaspaceShared::exercise_runtime_cds_code(TRAPS) {
 }
 
 void MetaspaceShared::preload_and_dump_impl(StaticArchiveBuilder& builder, TRAPS) {
-  preload_classes(CHECK);
+  if (CDSConfig::is_dumping_classic_static_archive()) {
+    // We are running with -Xshare:dump
+    preload_classes(CHECK);
 
-  if (SharedArchiveConfigFile) {
-    log_info(cds)("Reading extra data from %s ...", SharedArchiveConfigFile);
-    read_extra_data(THREAD, SharedArchiveConfigFile);
-    log_info(cds)("Reading extra data: done.");
+    if (SharedArchiveConfigFile) {
+      log_info(cds)("Reading extra data from %s ...", SharedArchiveConfigFile);
+      read_extra_data(THREAD, SharedArchiveConfigFile);
+      log_info(cds)("Reading extra data: done.");
+    }
+  }
+
+  if (CDSConfig::is_dumping_preimage_static_archive()) {
+    log_info(cds)("Reading lambda form invokers from JDK default classlist ...");
+    char default_classlist[JVM_MAXPATHLEN];
+    get_default_classlist(default_classlist, sizeof(default_classlist));
+    struct stat statbuf;
+    if (os::stat(default_classlist, &statbuf) == 0) {
+      ClassListParser::parse_classlist(default_classlist,
+                                       ClassListParser::_parse_lambda_forms_invokers_only, CHECK);
+    }
+  }
+
+  if (CDSConfig::is_dumping_final_static_archive()) {
+    if (ExtraSharedClassListFile) {
+      log_info(cds)("Loading extra classes from %s ...", ExtraSharedClassListFile);
+      ClassListParser::parse_classlist(ExtraSharedClassListFile,
+                                       ClassListParser::_parse_all, CHECK);
+    }
   }
 
   // Rewrite and link classes
@@ -993,8 +1037,8 @@ bool MetaspaceShared::write_static_archive(ArchiveBuilder* builder, FileMapInfo*
   builder->write_archive(map_info, heap_info);
 
   if (AllowArchivingWithJavaAgent) {
-    log_warning(cds)("This archive was created with AllowArchivingWithJavaAgent. It should be used "
-            "for testing purposes only and should not be used in a production environment");
+    log_warning(cds)("This %s was created with AllowArchivingWithJavaAgent. It should be used "
+            "for testing purposes only and should not be used in a production environment", CDSConfig::type_of_archive_being_loaded());
   }
   return true;
 }
@@ -1004,7 +1048,13 @@ bool MetaspaceShared::try_link_class(JavaThread* current, InstanceKlass* ik) {
   ExceptionMark em(current);
   JavaThread* THREAD = current; // For exception macros.
   assert(CDSConfig::is_dumping_archive(), "sanity");
-  if (!ik->is_shared() && ik->is_loaded() && !ik->is_linked() && ik->can_be_verified_at_dumptime() &&
+
+  if (ik->is_shared() && !CDSConfig::is_dumping_final_static_archive()) {
+    assert(CDSConfig::is_dumping_dynamic_archive(), "must be");
+    return false;
+  }
+
+  if (ik->is_loaded() && !ik->is_linked() && ik->can_be_verified_at_dumptime() &&
       !SystemDictionaryShared::has_class_failed_verification(ik)) {
     bool saved = BytecodeVerificationLocal;
     if (ik->is_shared_unregistered_class() && ik->class_loader() == nullptr) {
@@ -1072,11 +1122,18 @@ bool MetaspaceShared::is_shared_static(void* p) {
 // - When -XX:+RequireSharedSpaces is specified, AND the JVM cannot load the archive(s) due
 //   to version or classpath mismatch.
 void MetaspaceShared::unrecoverable_loading_error(const char* message) {
-  log_error(cds)("An error has occurred while processing the shared archive file.");
+  log_error(cds)("An error has occurred while processing the %s.", CDSConfig::type_of_archive_being_loaded());
   if (message != nullptr) {
     log_error(cds)("%s", message);
   }
-  vm_exit_during_initialization("Unable to use shared archive.", nullptr);
+
+  if (CDSConfig::is_dumping_final_static_archive()) {
+    vm_exit_during_initialization("Must be a valid AOT configuration generated by the current JVM", AOTConfiguration);
+  } else if (CDSConfig::new_aot_flags_used()) {
+    vm_exit_during_initialization("Unable to use AOT cache.", nullptr);
+  } else {
+    vm_exit_during_initialization("Unable to use shared archive.", nullptr);
+  }
 }
 
 // This function is called when the JVM is unable to write the specified CDS archive due to an
diff --git a/src/hotspot/share/cds/runTimeClassInfo.hpp b/src/hotspot/share/cds/runTimeClassInfo.hpp
index ca60e11736d..8ad2efcbccb 100644
--- a/src/hotspot/share/cds/runTimeClassInfo.hpp
+++ b/src/hotspot/share/cds/runTimeClassInfo.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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,13 @@ class Method;
 class Symbol;
 
 class RunTimeClassInfo {
-public:
+ public:
+ enum : char {
+    FROM_FIELD_IS_PROTECTED = 1 << 0,
+    FROM_IS_ARRAY           = 1 << 1,
+    FROM_IS_OBJECT          = 1 << 2
+  };
+
   struct CrcInfo {
     int _clsfile_size;
     int _clsfile_crc32;
@@ -202,6 +208,17 @@ public:
     return verifier_constraint_flags()[i];
   }
 
+  bool from_field_is_protected(int i) {
+    return (verifier_constraint_flag(i) & FROM_FIELD_IS_PROTECTED) != 0;
+  }
+
+  bool from_is_array(int i) {
+    return (verifier_constraint_flag(i) & FROM_IS_ARRAY) != 0;
+  }
+  bool from_is_object(int i) {
+    return (verifier_constraint_flag(i) & FROM_IS_OBJECT) != 0;
+  }
+
   int num_enum_klass_static_fields(int i) const {
     return enum_klass_static_fields_addr()->_num;
   }
diff --git a/src/hotspot/share/classfile/moduleEntry.cpp b/src/hotspot/share/classfile/moduleEntry.cpp
index 55363d7f41f..18f2abfd5f4 100644
--- a/src/hotspot/share/classfile/moduleEntry.cpp
+++ b/src/hotspot/share/classfile/moduleEntry.cpp
@@ -413,7 +413,13 @@ ModuleEntry* ModuleEntry::allocate_archived_entry() const {
   _archive_modules_entries->put(this, archived_entry);
   DEBUG_ONLY(_num_archived_module_entries++);
 
-  assert(archived_entry->shared_protection_domain() == nullptr, "never set during -Xshare:dump");
+  if (CDSConfig::is_dumping_final_static_archive()) {
+    OopHandle null_handle;
+    archived_entry->_shared_pd = null_handle;
+  } else {
+    assert(archived_entry->shared_protection_domain() == nullptr, "never set during -Xshare:dump");
+  }
+
   // Clear handles and restore at run time. Handles cannot be archived.
   OopHandle null_handle;
   archived_entry->_module = null_handle;
diff --git a/src/hotspot/share/classfile/systemDictionary.cpp b/src/hotspot/share/classfile/systemDictionary.cpp
index 68f9556099f..811ba12a1e9 100644
--- a/src/hotspot/share/classfile/systemDictionary.cpp
+++ b/src/hotspot/share/classfile/systemDictionary.cpp
@@ -1177,6 +1177,10 @@ void SystemDictionary::load_shared_class_misc(InstanceKlass* ik, ClassLoaderData
 
   // notify a class loaded from shared object
   ClassLoadingService::notify_class_loaded(ik, true /* shared class */);
+
+  if (CDSConfig::is_dumping_final_static_archive()) {
+    SystemDictionaryShared::init_dumptime_info_from_preimage(ik);
+  }
 }
 
 #endif // INCLUDE_CDS
diff --git a/src/hotspot/share/classfile/systemDictionaryShared.cpp b/src/hotspot/share/classfile/systemDictionaryShared.cpp
index b8e24bb2caa..2f7887c2d46 100644
--- a/src/hotspot/share/classfile/systemDictionaryShared.cpp
+++ b/src/hotspot/share/classfile/systemDictionaryShared.cpp
@@ -22,6 +22,7 @@
  *
  */
 
+#include "cds/aotClassLocation.hpp"
 #include "cds/archiveBuilder.hpp"
 #include "cds/archiveHeapLoader.hpp"
 #include "cds/archiveUtils.hpp"
@@ -193,23 +194,20 @@ InstanceKlass* SystemDictionaryShared::acquire_class_for_current_thread(
 // k must not be a shared class.
 DumpTimeClassInfo* SystemDictionaryShared::get_info(InstanceKlass* k) {
   MutexLocker ml(DumpTimeTable_lock, Mutex::_no_safepoint_check_flag);
-  assert(!k->is_shared(), "sanity");
   return get_info_locked(k);
 }
 
 DumpTimeClassInfo* SystemDictionaryShared::get_info_locked(InstanceKlass* k) {
   assert_lock_strong(DumpTimeTable_lock);
-  assert(!k->is_shared(), "sanity");
   DumpTimeClassInfo* info = _dumptime_table->get_info(k);
   assert(info != nullptr, "must be");
   return info;
 }
 
 bool SystemDictionaryShared::check_for_exclusion(InstanceKlass* k, DumpTimeClassInfo* info) {
-  if (MetaspaceShared::is_in_shared_metaspace(k)) {
+  if (CDSConfig::is_dumping_dynamic_archive() && MetaspaceShared::is_in_shared_metaspace(k)) {
     // We have reached a super type that's already in the base archive. Treat it
     // as "not excluded".
-    assert(CDSConfig::is_dumping_dynamic_archive(), "must be");
     return false;
   }
 
@@ -277,6 +275,11 @@ bool SystemDictionaryShared::is_hidden_lambda_proxy(InstanceKlass* ik) {
 }
 
 bool SystemDictionaryShared::check_for_exclusion_impl(InstanceKlass* k) {
+  if (CDSConfig::is_dumping_final_static_archive() && k->is_shared_unregistered_class()
+      && k->is_shared()) {
+    return false; // Do not exclude: unregistered classes are passed from preimage to final image.
+  }
+
   if (k->is_in_error_state()) {
     return warn_excluded(k, "In error state");
   }
@@ -329,6 +332,10 @@ bool SystemDictionaryShared::check_for_exclusion_impl(InstanceKlass* k) {
       // class may fail to verify in AOTLinkedClassBulkLoader::init_required_classes_for_loader(),
       // causing the JVM to fail at bootstrap.
       return warn_excluded(k, "Unlinked class not supported by AOTClassLinking");
+    } else if (CDSConfig::is_dumping_preimage_static_archive()) {
+      // When dumping the final static archive, we will unconditionally load and link all
+      // classes from tje preimage. We don't want to get a VerifyError when linking this class.
+      return warn_excluded(k, "Unlinked class not supported by AOTConfiguration");
     }
   } else {
     if (!k->can_be_verified_at_dumptime()) {
@@ -497,6 +504,9 @@ void SystemDictionaryShared::initialize() {
     _dumptime_table = new (mtClass) DumpTimeSharedClassTable;
     _dumptime_lambda_proxy_class_dictionary =
                       new (mtClass) DumpTimeLambdaProxyClassDictionary;
+    if (CDSConfig::is_dumping_heap()) {
+      HeapShared::init_dumping();
+    }
   }
 }
 
@@ -537,6 +547,18 @@ void SystemDictionaryShared::handle_class_unloading(InstanceKlass* klass) {
   }
 }
 
+void SystemDictionaryShared::init_dumptime_info_from_preimage(InstanceKlass* k) {
+  init_dumptime_info(k);
+  copy_verification_constraints_from_preimage(k);
+  copy_linking_constraints_from_preimage(k);
+
+  if (SystemDictionary::is_platform_class_loader(k->class_loader())) {
+    AOTClassLocationConfig::dumptime_set_has_platform_classes();
+  } else if (SystemDictionary::is_system_class_loader(k->class_loader())) {
+    AOTClassLocationConfig::dumptime_set_has_app_classes();
+  }
+}
+
 // Check if a class or any of its supertypes has been redefined.
 bool SystemDictionaryShared::has_been_redefined(InstanceKlass* k) {
   if (k->has_been_redefined()) {
@@ -723,7 +745,10 @@ void SystemDictionaryShared::dumptime_classes_do(class MetaspaceClosure* it) {
   assert_lock_strong(DumpTimeTable_lock);
 
   auto do_klass = [&] (InstanceKlass* k, DumpTimeClassInfo& info) {
-    if (k->is_loader_alive() && !info.is_excluded()) {
+    if (CDSConfig::is_dumping_final_static_archive() && !k->is_loaded()) {
+      assert(k->is_shared_unregistered_class(), "must be");
+      info.metaspace_pointers_do(it);
+    } else if (k->is_loader_alive() && !info.is_excluded()) {
       info.metaspace_pointers_do(it);
     }
   };
@@ -795,6 +820,10 @@ void SystemDictionaryShared::add_lambda_proxy_class(InstanceKlass* caller_ik,
     // There's no need to remember them in a separate table.
     return;
   }
+  if (CDSConfig::is_dumping_preimage_static_archive()) {
+    // Information about lambda proxies are recorded in FinalImageRecipes.
+    return;
+  }
 
   assert(caller_ik->class_loader() == lambda_ik->class_loader(), "mismatched class loader");
   assert(caller_ik->class_loader_data() == lambda_ik->class_loader_data(), "mismatched class loader data");
@@ -832,6 +861,10 @@ InstanceKlass* SystemDictionaryShared::get_shared_lambda_proxy_class(InstanceKla
                                                                      Symbol* method_type,
                                                                      Method* member_method,
                                                                      Symbol* instantiated_method_type) {
+  if (CDSConfig::is_dumping_final_static_archive()) {
+    return nullptr;
+  }
+
   assert(caller_ik != nullptr, "sanity");
   assert(invoked_name != nullptr, "sanity");
   assert(invoked_type != nullptr, "sanity");
@@ -956,7 +989,7 @@ InstanceKlass* SystemDictionaryShared::prepare_shared_lambda_proxy_class(Instanc
 
 void SystemDictionaryShared::check_verification_constraints(InstanceKlass* klass,
                                                             TRAPS) {
-  assert(!CDSConfig::is_dumping_static_archive() && CDSConfig::is_using_archive(), "called at run time with CDS enabled only");
+  assert(CDSConfig::is_using_archive(), "called at run time with CDS enabled only");
   RunTimeClassInfo* record = RunTimeClassInfo::get_for(klass);
 
   int length = record->num_verifier_constraints();
@@ -965,21 +998,16 @@ void SystemDictionaryShared::check_verification_constraints(InstanceKlass* klass
       RunTimeClassInfo::RTVerifierConstraint* vc = record->verifier_constraint_at(i);
       Symbol* name      = vc->name();
       Symbol* from_name = vc->from_name();
-      char c            = record->verifier_constraint_flag(i);
 
       if (log_is_enabled(Trace, cds, verification)) {
         ResourceMark rm(THREAD);
         log_trace(cds, verification)("check_verification_constraint: %s: %s must be subclass of %s [0x%x]",
                                      klass->external_name(), from_name->as_klass_external_name(),
-                                     name->as_klass_external_name(), c);
+                                     name->as_klass_external_name(), record->verifier_constraint_flag(i));
       }
 
-      bool from_field_is_protected = (c & SystemDictionaryShared::FROM_FIELD_IS_PROTECTED) ? true : false;
-      bool from_is_array           = (c & SystemDictionaryShared::FROM_IS_ARRAY)           ? true : false;
-      bool from_is_object          = (c & SystemDictionaryShared::FROM_IS_OBJECT)          ? true : false;
-
-      bool ok = VerificationType::resolve_and_check_assignability(klass, name,
-         from_name, from_field_is_protected, from_is_array, from_is_object, CHECK);
+      bool ok = VerificationType::resolve_and_check_assignability(klass, name, from_name,
+         record->from_field_is_protected(i), record->from_is_array(i), record->from_is_object(i), CHECK);
       if (!ok) {
         ResourceMark rm(THREAD);
         stringStream ss;
@@ -995,6 +1023,24 @@ void SystemDictionaryShared::check_verification_constraints(InstanceKlass* klass
   }
 }
 
+void SystemDictionaryShared::copy_verification_constraints_from_preimage(InstanceKlass* klass) {
+  assert(CDSConfig::is_using_archive(), "called at run time with CDS enabled only");
+  DumpTimeClassInfo* dt_info = get_info(klass);
+  RunTimeClassInfo* rt_info = RunTimeClassInfo::get_for(klass); // from preimage
+
+  int length = rt_info->num_verifier_constraints();
+  if (length > 0) {
+    for (int i = 0; i < length; i++) {
+      RunTimeClassInfo::RTVerifierConstraint* vc = rt_info->verifier_constraint_at(i);
+      Symbol* name      = vc->name();
+      Symbol* from_name = vc->from_name();
+
+      dt_info->add_verification_constraint(klass, name, from_name,
+         rt_info->from_field_is_protected(i), rt_info->from_is_array(i), rt_info->from_is_object(i));
+    }
+  }
+}
+
 static oop get_class_loader_by(char type) {
   if (type == (char)ClassLoader::BOOT_LOADER) {
     return (oop)nullptr;
@@ -1066,7 +1112,7 @@ void SystemDictionaryShared::record_linking_constraint(Symbol* name, InstanceKla
 // returns true IFF there's no need to re-initialize the i/v-tables for klass for
 // the purpose of checking class loader constraints.
 bool SystemDictionaryShared::check_linking_constraints(Thread* current, InstanceKlass* klass) {
-  assert(!CDSConfig::is_dumping_static_archive() && CDSConfig::is_using_archive(), "called at run time with CDS enabled only");
+  assert(CDSConfig::is_using_archive(), "called at run time with CDS enabled only");
   LogTarget(Info, class, loader, constraints) log;
   if (klass->is_shared_boot_class()) {
     // No class loader constraint check performed for boot classes.
@@ -1112,6 +1158,24 @@ bool SystemDictionaryShared::check_linking_constraints(Thread* current, Instance
   return false;
 }
 
+void SystemDictionaryShared::copy_linking_constraints_from_preimage(InstanceKlass* klass) {
+  assert(CDSConfig::is_using_archive(), "called at run time with CDS enabled only");
+  JavaThread* current = JavaThread::current();
+  if (klass->is_shared_platform_class() || klass->is_shared_app_class()) {
+    RunTimeClassInfo* rt_info = RunTimeClassInfo::get_for(klass); // from preimage
+
+    if (rt_info->num_loader_constraints() > 0) {
+      for (int i = 0; i < rt_info->num_loader_constraints(); i++) {
+        RunTimeClassInfo::RTLoaderConstraint* lc = rt_info->loader_constraint_at(i);
+        Symbol* name = lc->constraint_name();
+        Handle loader1(current, get_class_loader_by(lc->_loader_type1));
+        Handle loader2(current, get_class_loader_by(lc->_loader_type2));
+        record_linking_constraint(name, klass, loader1, loader2);
+      }
+    }
+  }
+}
+
 bool SystemDictionaryShared::is_supported_invokedynamic(BootstrapInfo* bsi) {
   LogTarget(Debug, cds, lambda) log;
   if (bsi->arg_values() == nullptr || !bsi->arg_values()->is_objArray()) {
diff --git a/src/hotspot/share/classfile/systemDictionaryShared.hpp b/src/hotspot/share/classfile/systemDictionaryShared.hpp
index 41e3d9c9716..7286bdad3fd 100644
--- a/src/hotspot/share/classfile/systemDictionaryShared.hpp
+++ b/src/hotspot/share/classfile/systemDictionaryShared.hpp
@@ -152,13 +152,6 @@ class SystemDictionaryShared: public SystemDictionary {
     void print_table_statistics(const char* prefix, outputStream* st);
   };
 
-public:
-  enum : char {
-    FROM_FIELD_IS_PROTECTED = 1 << 0,
-    FROM_IS_ARRAY           = 1 << 1,
-    FROM_IS_OBJECT          = 1 << 2
-  };
-
 private:
 
   static DumpTimeSharedClassTable* _dumptime_table;
@@ -199,6 +192,9 @@ private:
   static InstanceKlass* retrieve_lambda_proxy_class(const RunTimeLambdaProxyClassInfo* info) NOT_CDS_RETURN_(nullptr);
   DEBUG_ONLY(static bool _class_loading_may_happen;)
 
+  static void copy_verification_constraints_from_preimage(InstanceKlass* klass);
+  static void copy_linking_constraints_from_preimage(InstanceKlass* klass);
+
 public:
   static bool is_registered_lambda_proxy_class(InstanceKlass* ik);
   static bool is_hidden_lambda_proxy(InstanceKlass* ik);
@@ -229,6 +225,7 @@ public:
 
   static void initialize() NOT_CDS_RETURN;
   static void init_dumptime_info(InstanceKlass* k) NOT_CDS_RETURN;
+  static void init_dumptime_info_from_preimage(InstanceKlass* k) NOT_CDS_RETURN;
   static void handle_class_unloading(InstanceKlass* k) NOT_CDS_RETURN;
 
   static Dictionary* boot_loader_dictionary() {
diff --git a/src/hotspot/share/include/cds.h b/src/hotspot/share/include/cds.h
index 16d9d74e398..2a80dd68abd 100644
--- a/src/hotspot/share/include/cds.h
+++ b/src/hotspot/share/include/cds.h
@@ -38,6 +38,7 @@
 #define NUM_CDS_REGIONS 4 // this must be the same as MetaspaceShared::n_regions
 #define CDS_ARCHIVE_MAGIC 0xf00baba2
 #define CDS_DYNAMIC_ARCHIVE_MAGIC 0xf00baba8
+#define CDS_PREIMAGE_ARCHIVE_MAGIC 0xcafea07c
 #define CDS_GENERIC_HEADER_SUPPORTED_MIN_VERSION 13
 #define CURRENT_CDS_ARCHIVE_VERSION 18
 
diff --git a/src/hotspot/share/memory/metaspace.cpp b/src/hotspot/share/memory/metaspace.cpp
index c1fc0bf669b..99d1d027db0 100644
--- a/src/hotspot/share/memory/metaspace.cpp
+++ b/src/hotspot/share/memory/metaspace.cpp
@@ -716,7 +716,6 @@ void Metaspace::global_initialize() {
   metaspace::ChunkHeaderPool::initialize();
 
   if (CDSConfig::is_dumping_static_archive()) {
-    assert(!CDSConfig::is_using_archive(), "sanity");
     MetaspaceShared::initialize_for_static_dump();
   }
 
diff --git a/src/hotspot/share/oops/constantPool.cpp b/src/hotspot/share/oops/constantPool.cpp
index 8aba2bb2ba3..ee53e43c327 100644
--- a/src/hotspot/share/oops/constantPool.cpp
+++ b/src/hotspot/share/oops/constantPool.cpp
@@ -454,6 +454,11 @@ void ConstantPool::restore_unshareable_info(TRAPS) {
       }
     }
   }
+
+  if (CDSConfig::is_dumping_final_static_archive() && resolved_references() != nullptr) {
+    objArrayOop scratch_references = oopFactory::new_objArray(vmClasses::Object_klass(), resolved_references()->length(), CHECK);
+    HeapShared::add_scratch_resolved_references(this, scratch_references);
+  }
 }
 
 void ConstantPool::remove_unshareable_info() {
diff --git a/src/hotspot/share/oops/instanceKlass.cpp b/src/hotspot/share/oops/instanceKlass.cpp
index 9e3f73596e2..fb1b84b826a 100644
--- a/src/hotspot/share/oops/instanceKlass.cpp
+++ b/src/hotspot/share/oops/instanceKlass.cpp
@@ -2707,6 +2707,7 @@ void InstanceKlass::remove_unshareable_info() {
   }
   init_shared_package_entry();
   _dep_context_last_cleaned = 0;
+  DEBUG_ONLY(_shared_class_load_count = 0);
 
   remove_unshareable_flags();
 }
diff --git a/src/hotspot/share/runtime/arguments.cpp b/src/hotspot/share/runtime/arguments.cpp
index 420d6ab39d9..ab05cbeb891 100644
--- a/src/hotspot/share/runtime/arguments.cpp
+++ b/src/hotspot/share/runtime/arguments.cpp
@@ -1365,11 +1365,19 @@ void Arguments::set_mode_flags(Mode mode) {
 // incompatible command line options were chosen.
 void Arguments::no_shared_spaces(const char* message) {
   if (RequireSharedSpaces) {
-    jio_fprintf(defaultStream::error_stream(),
-      "Class data sharing is inconsistent with other specified options.\n");
-    vm_exit_during_initialization("Unable to use shared archive", message);
+    log_error(cds)("%s is incompatible with other specified options.",
+                   CDSConfig::new_aot_flags_used() ? "AOT cache" : "CDS");
+    if (CDSConfig::new_aot_flags_used()) {
+      vm_exit_during_initialization("Unable to use AOT cache", message);
+    } else {
+      vm_exit_during_initialization("Unable to use shared archive", message);
+    }
   } else {
-    log_info(cds)("Unable to use shared archive: %s", message);
+    if (CDSConfig::new_aot_flags_used()) {
+      log_warning(cds)("Unable to use AOT cache: %s", message);
+    } else {
+      log_info(cds)("Unable to use shared archive: %s", message);
+    }
     UseSharedSpaces = false;
   }
 }
diff --git a/src/hotspot/share/runtime/java.cpp b/src/hotspot/share/runtime/java.cpp
index d6dda04e053..b2c24169505 100644
--- a/src/hotspot/share/runtime/java.cpp
+++ b/src/hotspot/share/runtime/java.cpp
@@ -23,6 +23,7 @@
  */
 
 #include "cds/cds_globals.hpp"
+#include "cds/cdsConfig.hpp"
 #include "cds/classListWriter.hpp"
 #include "cds/dynamicArchive.hpp"
 #include "classfile/classLoader.hpp"
@@ -440,6 +441,10 @@ void before_exit(JavaThread* thread, bool halt) {
 
 #if INCLUDE_CDS
   ClassListWriter::write_resolved_constants();
+
+  if (CDSConfig::is_dumping_preimage_static_archive()) {
+    MetaspaceShared::preload_and_dump(thread);
+  }
 #endif
 
   // Hang forever on exit if we're reporting an error.
diff --git a/src/hotspot/share/runtime/threads.cpp b/src/hotspot/share/runtime/threads.cpp
index 006f1be112a..32859bf2718 100644
--- a/src/hotspot/share/runtime/threads.cpp
+++ b/src/hotspot/share/runtime/threads.cpp
@@ -853,7 +853,11 @@ jint Threads::create_vm(JavaVMInitArgs* args, bool* canTryAgain) {
   _vm_complete = true;
 #endif
 
-  if (CDSConfig::is_dumping_static_archive()) {
+  if (CDSConfig::is_dumping_classic_static_archive()) {
+    // Classic -Xshare:dump, aka "old workflow"
+    MetaspaceShared::preload_and_dump(CHECK_JNI_ERR);
+  } else if (CDSConfig::is_dumping_final_static_archive()) {
+    tty->print_cr("Reading AOTConfiguration %s and writing AOTCache %s", AOTConfiguration, AOTCache);
     MetaspaceShared::preload_and_dump(CHECK_JNI_ERR);
   }
 
diff --git a/test/hotspot/jtreg/TEST.groups b/test/hotspot/jtreg/TEST.groups
index f58257da2ef..c71f5e2dfc9 100644
--- a/test/hotspot/jtreg/TEST.groups
+++ b/test/hotspot/jtreg/TEST.groups
@@ -405,6 +405,7 @@ hotspot_cds_only = \
 
 hotspot_appcds_dynamic = \
   runtime/cds/appcds/ \
+ -runtime/cds/appcds/aotClassLinking \
  -runtime/cds/appcds/applications \
  -runtime/cds/appcds/cacheObject \
  -runtime/cds/appcds/complexURI \
@@ -423,7 +424,6 @@ hotspot_appcds_dynamic = \
  -runtime/cds/appcds/jvmti/redefineClasses/OldClassAndRedefineClass.java \
  -runtime/cds/appcds/lambdaForm/DefaultClassListLFInvokers.java \
  -runtime/cds/appcds/methodHandles \
- -runtime/cds/appcds/aotClassLinking/BulkLoaderTest.java \
  -runtime/cds/appcds/sharedStrings \
  -runtime/cds/appcds/resolvedConstants \
  -runtime/cds/appcds/ArchiveRelocationTest.java \
diff --git a/test/hotspot/jtreg/runtime/cds/ArchiveDoesNotExist.java b/test/hotspot/jtreg/runtime/cds/ArchiveDoesNotExist.java
index d8cf5816a1c..57e9269d8d1 100644
--- a/test/hotspot/jtreg/runtime/cds/ArchiveDoesNotExist.java
+++ b/test/hotspot/jtreg/runtime/cds/ArchiveDoesNotExist.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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 @@ public class ArchiveDoesNotExist {
         // -Xshare=on
         OutputAnalyzer out = CDSTestUtils.runWithArchive(opts);
         CDSTestUtils.checkMappingFailure(out);
-        out.shouldContain("Specified shared archive not found")
+        out.shouldContain("Specified shared archive file not found")
             .shouldHaveExitValue(1);
 
         // -Xshare=auto
diff --git a/test/hotspot/jtreg/runtime/cds/appcds/AOTFlags.java b/test/hotspot/jtreg/runtime/cds/appcds/AOTFlags.java
index 98ff155abfa..aeb0476346d 100644
--- a/test/hotspot/jtreg/runtime/cds/appcds/AOTFlags.java
+++ b/test/hotspot/jtreg/runtime/cds/appcds/AOTFlags.java
@@ -49,17 +49,21 @@ public class AOTFlags {
     }
 
     static void positiveTests() throws Exception {
-        // (1) Training Run
+        //----------------------------------------------------------------------
+        printTestCase("Training Run");
         ProcessBuilder pb = ProcessTools.createLimitedTestJavaProcessBuilder(
             "-XX:AOTMode=record",
             "-XX:AOTConfiguration=" + aotConfigFile,
+            "-Xlog:cds=debug",
             "-cp", appJar, helloClass);
 
         OutputAnalyzer out = CDSTestUtils.executeAndLog(pb, "train");
         out.shouldContain("Hello World");
+        out.shouldContain("AOTConfiguration recorded: " + aotConfigFile);
         out.shouldHaveExitValue(0);
 
-        // (2) Assembly Phase (AOTClassLinking unspecified -> should be enabled by default)
+        //----------------------------------------------------------------------
+        printTestCase("Assembly Phase (AOTClassLinking unspecified -> should be enabled by default)");
         pb = ProcessTools.createLimitedTestJavaProcessBuilder(
             "-XX:AOTMode=create",
             "-XX:AOTConfiguration=" + aotConfigFile,
@@ -71,18 +75,20 @@ public class AOTFlags {
         out.shouldMatch("cds.*hello[.]aot");
         out.shouldHaveExitValue(0);
 
-        // (3) Production Run with AOTCache
+        //----------------------------------------------------------------------
+        printTestCase("Production Run with AOTCache");
         pb = ProcessTools.createLimitedTestJavaProcessBuilder(
             "-XX:AOTCache=" + aotCacheFile,
             "-Xlog:cds",
             "-cp", appJar, helloClass);
         out = CDSTestUtils.executeAndLog(pb, "prod");
         out.shouldContain("Using AOT-linked classes: true (static archive: has aot-linked classes)");
-        out.shouldContain("Opened archive hello.aot.");
+        out.shouldContain("Opened AOT cache hello.aot.");
         out.shouldContain("Hello World");
         out.shouldHaveExitValue(0);
 
-        // (4) AOTMode=off
+        //----------------------------------------------------------------------
+        printTestCase("AOTMode=off");
         pb = ProcessTools.createLimitedTestJavaProcessBuilder(
             "-XX:AOTCache=" + aotCacheFile,
             "--show-version",
@@ -91,11 +97,12 @@ public class AOTFlags {
             "-cp", appJar, helloClass);
         out = CDSTestUtils.executeAndLog(pb, "prod");
         out.shouldNotContain(", sharing");
-        out.shouldNotContain("Opened archive hello.aot.");
+        out.shouldNotContain("Opened AOT cache hello.aot.");
         out.shouldContain("Hello World");
         out.shouldHaveExitValue(0);
 
-        // (5) AOTMode=auto
+        //----------------------------------------------------------------------
+        printTestCase("AOTMode=auto");
         pb = ProcessTools.createLimitedTestJavaProcessBuilder(
             "-XX:AOTCache=" + aotCacheFile,
             "--show-version",
@@ -104,11 +111,12 @@ public class AOTFlags {
             "-cp", appJar, helloClass);
         out = CDSTestUtils.executeAndLog(pb, "prod");
         out.shouldContain(", sharing");
-        out.shouldContain("Opened archive hello.aot.");
+        out.shouldContain("Opened AOT cache hello.aot.");
         out.shouldContain("Hello World");
         out.shouldHaveExitValue(0);
 
-        // (6) AOTMode=on
+        //----------------------------------------------------------------------
+        printTestCase("AOTMode=on");
         pb = ProcessTools.createLimitedTestJavaProcessBuilder(
             "-XX:AOTCache=" + aotCacheFile,
             "--show-version",
@@ -117,11 +125,12 @@ public class AOTFlags {
             "-cp", appJar, helloClass);
         out = CDSTestUtils.executeAndLog(pb, "prod");
         out.shouldContain(", sharing");
-        out.shouldContain("Opened archive hello.aot.");
+        out.shouldContain("Opened AOT cache hello.aot.");
         out.shouldContain("Hello World");
         out.shouldHaveExitValue(0);
 
-        // (7) Assembly Phase with -XX:-AOTClassLinking
+        //----------------------------------------------------------------------
+        printTestCase("Assembly Phase with -XX:-AOTClassLinking");
         pb = ProcessTools.createLimitedTestJavaProcessBuilder(
             "-XX:AOTMode=create",
             "-XX:-AOTClassLinking",
@@ -134,20 +143,22 @@ public class AOTFlags {
         out.shouldMatch("cds.*hello[.]aot");
         out.shouldHaveExitValue(0);
 
-        // (8) Production Run with AOTCache, which was created with -XX:-AOTClassLinking
+        //----------------------------------------------------------------------
+        printTestCase("Production Run with AOTCache, which was created with -XX:-AOTClassLinking");
         pb = ProcessTools.createLimitedTestJavaProcessBuilder(
             "-XX:AOTCache=" + aotCacheFile,
             "-Xlog:cds",
             "-cp", appJar, helloClass);
         out = CDSTestUtils.executeAndLog(pb, "prod");
         out.shouldContain("Using AOT-linked classes: false (static archive: no aot-linked classes)");
-        out.shouldContain("Opened archive hello.aot.");
+        out.shouldContain("Opened AOT cache hello.aot.");
         out.shouldContain("Hello World");
         out.shouldHaveExitValue(0);
     }
 
     static void negativeTests() throws Exception {
-        // (1) Mixing old and new options
+       //----------------------------------------------------------------------
+        printTestCase("Mixing old and new options");
         String mixOldNewErrSuffix = " cannot be used at the same time with -Xshare:on, -Xshare:auto, "
             + "-Xshare:off, -Xshare:dump, DumpLoadedClassList, SharedClassListFile, "
             + "or SharedArchiveFile";
@@ -169,7 +180,8 @@ public class AOTFlags {
         out.shouldContain("Option AOTCache" + mixOldNewErrSuffix);
         out.shouldNotHaveExitValue(0);
 
-        // (2) Use AOTConfiguration without AOTMode
+        //----------------------------------------------------------------------
+        printTestCase("Use AOTConfiguration without AOTMode");
         pb = ProcessTools.createLimitedTestJavaProcessBuilder(
             "-XX:AOTConfiguration=" + aotConfigFile,
             "-cp", appJar, helloClass);
@@ -178,7 +190,8 @@ public class AOTFlags {
         out.shouldContain("AOTConfiguration can only be used with -XX:AOTMode=record or -XX:AOTMode=create");
         out.shouldNotHaveExitValue(0);
 
-        // (3) Use AOTMode without AOTConfiguration
+        //----------------------------------------------------------------------
+        printTestCase("Use AOTMode without AOTConfiguration");
         pb = ProcessTools.createLimitedTestJavaProcessBuilder(
             "-XX:AOTMode=record",
             "-cp", appJar, helloClass);
@@ -194,7 +207,8 @@ public class AOTFlags {
         out.shouldContain("-XX:AOTMode=create cannot be used without setting AOTConfiguration");
         out.shouldNotHaveExitValue(0);
 
-        // (4) Bad AOTMode
+        //----------------------------------------------------------------------
+        printTestCase("Bad AOTMode");
         pb = ProcessTools.createLimitedTestJavaProcessBuilder(
             "-XX:AOTMode=foo",
             "-cp", appJar, helloClass);
@@ -203,7 +217,8 @@ public class AOTFlags {
         out.shouldContain("Unrecognized value foo for AOTMode. Must be one of the following: off, record, create, auto, on");
         out.shouldNotHaveExitValue(0);
 
-        // (5) AOTCache specified with -XX:AOTMode=record
+        //----------------------------------------------------------------------
+        printTestCase("AOTCache specified with -XX:AOTMode=record");
         pb = ProcessTools.createLimitedTestJavaProcessBuilder(
             "-XX:AOTMode=record",
             "-XX:AOTConfiguration=" + aotConfigFile,
@@ -214,7 +229,8 @@ public class AOTFlags {
         out.shouldContain("AOTCache must not be specified when using -XX:AOTMode=record");
         out.shouldNotHaveExitValue(0);
 
-        // (5) AOTCache not specified with -XX:AOTMode=create
+        //----------------------------------------------------------------------
+        printTestCase("AOTCache not specified with -XX:AOTMode=create");
         pb = ProcessTools.createLimitedTestJavaProcessBuilder(
             "-XX:AOTMode=create",
             "-XX:AOTConfiguration=" + aotConfigFile,
@@ -224,5 +240,69 @@ public class AOTFlags {
         out.shouldContain("AOTCache must be specified when using -XX:AOTMode=create");
         out.shouldNotHaveExitValue(0);
 
+        //----------------------------------------------------------------------
+        printTestCase("No such config file");
+        pb = ProcessTools.createLimitedTestJavaProcessBuilder(
+            "-XX:AOTMode=create",
+            "-XX:AOTConfiguration=no-such-file",
+            "-XX:AOTCache=" + aotCacheFile,
+            "-cp", appJar, helloClass);
+
+        out = CDSTestUtils.executeAndLog(pb, "neg");
+        out.shouldContain("Must be a valid AOT configuration generated by the current JVM: no-such-file");
+        out.shouldNotHaveExitValue(0);
+
+        //----------------------------------------------------------------------
+        printTestCase("AOTConfiguration file cannot be used as a CDS archive");
+
+        // first make sure we have a valid aotConfigFile
+        pb = ProcessTools.createLimitedTestJavaProcessBuilder(
+            "-XX:AOTMode=record",
+            "-XX:AOTConfiguration=" + aotConfigFile,
+            "-cp", appJar, helloClass);
+
+        out = CDSTestUtils.executeAndLog(pb, "train");
+        out.shouldHaveExitValue(0);
+
+        // Cannot use this config file as a AOT cache
+        pb = ProcessTools.createLimitedTestJavaProcessBuilder(
+            "-XX:AOTMode=on",
+            "-XX:AOTCache=" + aotConfigFile,
+            "-cp", appJar, helloClass);
+
+        out = CDSTestUtils.executeAndLog(pb, "neg");
+        out.shouldContain("Not a valid AOT cache (hello.aotconfig)");
+        out.shouldNotHaveExitValue(0);
+
+        // Cannot use this config file as a CDS archive
+        pb = ProcessTools.createLimitedTestJavaProcessBuilder(
+            "-Xshare:on",
+            "-XX:SharedArchiveFile=" + aotConfigFile,
+            "-cp", appJar, helloClass);
+
+        out = CDSTestUtils.executeAndLog(pb, "neg");
+        out.shouldContain("Not a valid archive (hello.aotconfig)");
+        out.shouldNotHaveExitValue(0);
+
+        //----------------------------------------------------------------------
+        printTestCase("Classpath mismatch when creating archive");
+
+        pb = ProcessTools.createLimitedTestJavaProcessBuilder(
+            "-XX:AOTMode=create",
+            "-XX:AOTConfiguration=" + aotConfigFile,
+            "-XX:AOTCache=" + aotCacheFile,
+            "-cp", "noSuchJar.jar");
+
+        out = CDSTestUtils.executeAndLog(pb, "neg");
+        out.shouldContain("class path and/or module path are not compatible with the ones " +
+                          "specified when the AOTConfiguration file was recorded");
+        out.shouldContain("Unable to use create AOT cache");
+        out.shouldHaveExitValue(1);
+    }
+
+    static int testNum = 0;
+    static void printTestCase(String s) {
+        System.out.println("vvvvvvv TEST CASE " + testNum + ": " + s + " starts here vvvvvvv");
+        testNum++;
     }
 }
diff --git a/test/hotspot/jtreg/runtime/cds/appcds/aotClassLinking/AOTLoaderConstraintsTest.java b/test/hotspot/jtreg/runtime/cds/appcds/aotClassLinking/AOTLoaderConstraintsTest.java
new file mode 100644
index 00000000000..63be2038907
--- /dev/null
+++ b/test/hotspot/jtreg/runtime/cds/appcds/aotClassLinking/AOTLoaderConstraintsTest.java
@@ -0,0 +1,104 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+/*
+ * @test Make sure loader constraints are passed from AOT preimage to final image.
+ * @bug 8348426
+ * @requires vm.cds.supports.aot.class.linking
+ * @comment work around JDK-8345635
+ * @requires !vm.jvmci.enabled
+ * @library /test/jdk/lib/testlibrary /test/lib
+ * @build AOTLoaderConstraintsTest BootClass
+ * @run driver jdk.test.lib.helpers.ClassFileInstaller -jar boot.jar BootClass
+ * @run driver jdk.test.lib.helpers.ClassFileInstaller -jar AOTLoaderConstraintsTestApp.jar AOTLoaderConstraintsTestApp AppClass
+ * @run driver AOTLoaderConstraintsTest AOT
+ */
+
+import jdk.test.lib.cds.CDSAppTester;
+import jdk.test.lib.helpers.ClassFileInstaller;
+import jdk.test.lib.process.OutputAnalyzer;
+
+public class AOTLoaderConstraintsTest {
+    static final String appJar = ClassFileInstaller.getJarPath("AOTLoaderConstraintsTestApp.jar");
+    static final String mainClass = "AOTLoaderConstraintsTestApp";
+
+    public static void main(String[] args) throws Exception {
+        Tester t = new Tester();
+        t.run(args);
+    }
+
+    static class Tester extends CDSAppTester {
+        public Tester() {
+            super(mainClass);
+        }
+
+        @Override
+        public String classpath(RunMode runMode) {
+            return appJar;
+        }
+
+        @Override
+        public String[] vmArgs(RunMode runMode) {
+            return new String[] {
+                "-Xbootclasspath/a:boot.jar",
+                "-Xlog:class+loader+constraints=debug",
+                "-Xlog:class+path=debug",
+            };
+        }
+
+        @Override
+        public String[] appCommandLine(RunMode runMode) {
+            return new String[] {
+                mainClass,
+            };
+        }
+
+        @Override
+        public void checkExecution(OutputAnalyzer out, RunMode runMode) throws Exception {
+            switch (runMode) {
+            case RunMode.ASSEMBLY:   // JEP 485 + binary AOTConfiguration -- should load AppClass from preimage
+            case RunMode.PRODUCTION:
+                out.shouldContain("CDS add loader constraint for class AppClass symbol java/lang/String loader[0] 'app' loader[1] 'bootstrap'");
+            }
+        }
+    }
+}
+
+class AOTLoaderConstraintsTestApp {
+    public static void main(String args[]) throws Exception {
+        AppClass obj = new AppClass();
+        obj.func("Hello");
+    }
+}
+
+class AppClass extends BootClass {
+    @Override
+    public void func(String s) {
+        // This method overrides BootClass, which is loaded by the boot loader.
+        // AppClass is loaded by the app loader. To make sure that you cannot use
+        // type masquerade attacks, we need to add a loader constraint that says:
+        //  app and boot loaders must resolve the symbol "java/lang/String" to the same type.
+        super.func(s + " From AppClass");
+    }
+}
diff --git a/test/hotspot/jtreg/runtime/cds/appcds/aotClassLinking/BootClass.java b/test/hotspot/jtreg/runtime/cds/appcds/aotClassLinking/BootClass.java
new file mode 100644
index 00000000000..40c22772c86
--- /dev/null
+++ b/test/hotspot/jtreg/runtime/cds/appcds/aotClassLinking/BootClass.java
@@ -0,0 +1,30 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please 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 is a test class to be loaded by the boot loader.
+public class BootClass {
+    public void func(String s) {
+        System.out.println(s);
+    }
+}
diff --git a/test/hotspot/jtreg/runtime/cds/appcds/aotClassLinking/BulkLoaderTest.java b/test/hotspot/jtreg/runtime/cds/appcds/aotClassLinking/BulkLoaderTest.java
index c4648bd2eb3..9db886e20a5 100644
--- a/test/hotspot/jtreg/runtime/cds/appcds/aotClassLinking/BulkLoaderTest.java
+++ b/test/hotspot/jtreg/runtime/cds/appcds/aotClassLinking/BulkLoaderTest.java
@@ -53,6 +53,19 @@
  * @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:. BulkLoaderTest DYNAMIC
  */
 
+/*
+ * @test id=aot
+ * @requires vm.cds.supports.aot.class.linking
+ * @comment work around JDK-8345635
+ * @requires !vm.jvmci.enabled
+ * @library /test/jdk/lib/testlibrary /test/lib
+ * @build InitiatingLoaderTester BadOldClassA BadOldClassB
+ * @build BulkLoaderTest
+ * @run driver jdk.test.lib.helpers.ClassFileInstaller -jar BulkLoaderTestApp.jar BulkLoaderTestApp MyUtil InitiatingLoaderTester
+ *                 BadOldClassA BadOldClassB
+ * @run driver BulkLoaderTest AOT
+ */
+
 import java.io.File;
 import java.lang.StackWalker.StackFrame;
 import java.util.List;
@@ -122,6 +135,13 @@ public class BulkLoaderTest {
                 mainClass,
             };
         }
+
+        @Override
+        public void checkExecution(OutputAnalyzer out, RunMode runMode) throws Exception {
+            if (isAOTWorkflow() && runMode == RunMode.TRAINING) {
+                out.shouldContain("Skipping BadOldClassA: Unlinked class not supported by AOTConfiguration");
+            }
+        }
     }
 }
 
diff --git a/test/hotspot/jtreg/runtime/cds/appcds/applications/JavacBench.java b/test/hotspot/jtreg/runtime/cds/appcds/applications/JavacBench.java
index a95119f1a47..332f2fc909e 100644
--- a/test/hotspot/jtreg/runtime/cds/appcds/applications/JavacBench.java
+++ b/test/hotspot/jtreg/runtime/cds/appcds/applications/JavacBench.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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,15 @@
  * @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:. JavacBench DYNAMIC
  */
 
+/*
+ * @test id=aot
+ * @requires vm.cds.supports.aot.class.linking
+ * @summary Run JavacBenchApp with AOT cache (JEP 483)
+ * @requires vm.cds
+ * @library /test/lib
+ * @run driver JavacBench AOT
+ */
+
 import jdk.test.lib.cds.CDSAppTester;
 import jdk.test.lib.helpers.ClassFileInstaller;
 
diff --git a/test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/ArchiveConsistency.java b/test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/ArchiveConsistency.java
index ea95a2c8711..ef0df473a98 100644
--- a/test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/ArchiveConsistency.java
+++ b/test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/ArchiveConsistency.java
@@ -188,7 +188,7 @@ public class ArchiveConsistency extends DynamicArchiveTestBase {
         nonExistBaseFile.delete();
         runTwo(nonExistBase, topArchiveName,
                appJar, mainClass, isAuto ? 0 : 1,
-               "Specified shared archive not found (" + nonExistBase + ")");
+               "Specified shared archive file not found (" + nonExistBase + ")");
 
         startTest("9. Non-exist top archive");
         String nonExistTop = "non-exist-top.jsa";
@@ -196,11 +196,11 @@ public class ArchiveConsistency extends DynamicArchiveTestBase {
         nonExistTopFile.delete();
         runTwo(baseArchiveName, nonExistTop,
                appJar, mainClass, isAuto ? 0 : 1,
-               "Specified shared archive not found (" + nonExistTop + ")");
+               "Specified shared archive file not found (" + nonExistTop + ")");
 
         startTest("10. nost-exist-base and non-exist-top");
         runTwo(nonExistBase, nonExistTop,
                appJar, mainClass, isAuto ? 0 : 1,
-               "Specified shared archive not found (" + nonExistBase + ")");
+               "Specified shared archive file not found (" + nonExistBase + ")");
     }
 }
diff --git a/test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/TestAutoCreateSharedArchive.java b/test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/TestAutoCreateSharedArchive.java
index 493d5fa5665..c8a04027a3d 100644
--- a/test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/TestAutoCreateSharedArchive.java
+++ b/test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/TestAutoCreateSharedArchive.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -663,7 +663,7 @@ public class TestAutoCreateSharedArchive extends DynamicArchiveTestBase {
              "-cp", appJar,
              mainAppClass)
              .assertNormalExit(output -> {
-                 output.shouldContain("Specified shared archive not found (" + nonExistTop + ")")
+                 output.shouldContain("Specified shared archive file not found (" + nonExistTop + ")")
                        .shouldContain(HELLO_WORLD)
                        .shouldContain("Dumping shared data to file:");
              });
@@ -688,7 +688,7 @@ public class TestAutoCreateSharedArchive extends DynamicArchiveTestBase {
              "-cp", appJar,
              mainAppClass)
              .assertNormalExit(output -> {
-                 output.shouldContain("Specified shared archive not found (" + nonExistBase + ")")
+                 output.shouldContain("Specified shared archive file not found (" + nonExistBase + ")")
                        .shouldContain(HELLO_WORLD)
                        .shouldNotContain("Dumping shared data to file:");
              });
diff --git a/test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/TestAutoCreateSharedArchiveUpgrade.java b/test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/TestAutoCreateSharedArchiveUpgrade.java
index 88697496ac6..852fa1823a1 100644
--- a/test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/TestAutoCreateSharedArchiveUpgrade.java
+++ b/test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/TestAutoCreateSharedArchiveUpgrade.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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,7 @@ public class TestAutoCreateSharedArchiveUpgrade {
     }
 
     static void assertJSANotFound(OutputAnalyzer output) {
-        output.shouldContain("Specified shared archive not found");
+        output.shouldContain("Specified shared archive file not found");
     }
 
     static void assertCreatedJSA(OutputAnalyzer output) {
diff --git a/test/hotspot/jtreg/runtime/cds/appcds/jvmti/dumpingWithAgent/DumpingWithJavaAgent.java b/test/hotspot/jtreg/runtime/cds/appcds/jvmti/dumpingWithAgent/DumpingWithJavaAgent.java
index 7d68fdf0fc8..54cb3fb23fb 100644
--- a/test/hotspot/jtreg/runtime/cds/appcds/jvmti/dumpingWithAgent/DumpingWithJavaAgent.java
+++ b/test/hotspot/jtreg/runtime/cds/appcds/jvmti/dumpingWithAgent/DumpingWithJavaAgent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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,12 @@ public class DumpingWithJavaAgent {
     };
 
     public static String warningMessages[] = {
-        "This archive was created with AllowArchivingWithJavaAgent",
+        "This shared archive file was created with AllowArchivingWithJavaAgent",
         "It should be used for testing purposes only and should not be used in a production environment",
     };
 
     public static String errorMessage =
-        "The setting of the AllowArchivingWithJavaAgent is different from the setting in the shared archive.";
-
+        "The setting of the AllowArchivingWithJavaAgent is different from the setting in the shared archive file.";
 
     public static String diagnosticOption = "-XX:+AllowArchivingWithJavaAgent";
 
diff --git a/test/lib/jdk/test/lib/cds/CDSAppTester.java b/test/lib/jdk/test/lib/cds/CDSAppTester.java
index 3a2fc1e1f69..7b4ad6eb5c4 100644
--- a/test/lib/jdk/test/lib/cds/CDSAppTester.java
+++ b/test/lib/jdk/test/lib/cds/CDSAppTester.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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,12 @@ abstract public class CDSAppTester {
     private final String name;
     private final String classListFile;
     private final String classListFileLog;
+    private final String aotConfigurationFile;
+    private final String aotConfigurationFileLog;
     private final String staticArchiveFile;
     private final String staticArchiveFileLog;
+    private final String aotCacheFile;
+    private final String aotCacheFileLog;
     private final String dynamicArchiveFile;
     private final String dynamicArchiveFileLog;
     private final String tempBaseArchiveFile;
@@ -56,8 +60,12 @@ abstract public class CDSAppTester {
         this.name = name;
         classListFile = name() + ".classlist";
         classListFileLog = classListFile + ".log";
+        aotConfigurationFile = name() + ".aotconfig";
+        aotConfigurationFileLog = aotConfigurationFile + ".log";
         staticArchiveFile = name() + ".static.jsa";
         staticArchiveFileLog = staticArchiveFile + ".log";
+        aotCacheFile = name() + ".aot";
+        aotCacheFileLog = aotCacheFile + ".log";
         dynamicArchiveFile = name() + ".dynamic.jsa";
         dynamicArchiveFileLog = dynamicArchiveFile + ".log";
         tempBaseArchiveFile = name() + ".temp-base.jsa";
@@ -74,13 +82,15 @@ abstract public class CDSAppTester {
     private enum Workflow {
         STATIC,        // classic -Xshare:dump workflow
         DYNAMIC,       // classic -XX:ArchiveClassesAtExit
+        AOT,           // JEP 483 Ahead-of-Time Class Loading & Linking
     }
 
     public enum RunMode {
-        CLASSLIST,
-        DUMP_STATIC,
-        DUMP_DYNAMIC,
-        PRODUCTION;
+        TRAINING,       // -XX:DumpLoadedClassList OR {-XX:AOTMode=create -XX:AOTConfiguration}
+        DUMP_STATIC,    // -Xshare:dump
+        DUMP_DYNAMIC,   // -XX:ArchiveClassesArExit
+        ASSEMBLY,       // JEP 483
+        PRODUCTION;     // Running with the CDS archive produced from the above steps
 
         public boolean isStaticDump() {
             return this == DUMP_STATIC;
@@ -126,6 +136,10 @@ abstract public class CDSAppTester {
         return workflow == Workflow.DYNAMIC;
     }
 
+    public final boolean isAOTWorkflow() {
+        return workflow == Workflow.AOT;
+    }
+
     private String logToFile(String logFile, String... logTags) {
         StringBuilder sb = new StringBuilder("-Xlog:");
         String prefix = "";
@@ -163,8 +177,20 @@ abstract public class CDSAppTester {
         return output;
     }
 
+    private OutputAnalyzer recordAOTConfiguration() throws Exception {
+        RunMode runMode = RunMode.TRAINING;
+        String[] cmdLine = StringArrayUtils.concat(vmArgs(runMode),
+                                                   "-XX:AOTMode=record",
+                                                   "-XX:AOTConfiguration=" + aotConfigurationFile,
+                                                   "-cp", classpath(runMode),
+                                                   logToFile(aotConfigurationFileLog,
+                                                             "class+load=debug"));
+        cmdLine = StringArrayUtils.concat(cmdLine, appCommandLine(runMode));
+        return executeAndCheck(cmdLine, runMode, aotConfigurationFile, aotConfigurationFileLog);
+    }
+
     private OutputAnalyzer createClassList() throws Exception {
-        RunMode runMode = RunMode.CLASSLIST;
+        RunMode runMode = RunMode.TRAINING;
         String[] cmdLine = StringArrayUtils.concat(vmArgs(runMode),
                                                    "-Xshare:off",
                                                    "-XX:DumpLoadedClassList=" + classListFile,
@@ -192,6 +218,23 @@ abstract public class CDSAppTester {
         return executeAndCheck(cmdLine, runMode, staticArchiveFile, staticArchiveFileLog);
     }
 
+    private OutputAnalyzer createAOTCache() throws Exception {
+        RunMode runMode = RunMode.ASSEMBLY;
+        String[] cmdLine = StringArrayUtils.concat(vmArgs(runMode),
+                                                   "-Xlog:cds",
+                                                   "-Xlog:cds+heap=error",
+                                                   "-XX:AOTMode=create",
+                                                   "-XX:AOTConfiguration=" + aotConfigurationFile,
+                                                   "-XX:AOTCache=" + aotCacheFile,
+                                                   "-cp", classpath(runMode),
+                                                   logToFile(aotCacheFileLog,
+                                                             "cds=debug",
+                                                             "cds+class=debug",
+                                                             "cds+heap=warning",
+                                                             "cds+resolve=debug"));
+        return executeAndCheck(cmdLine, runMode, aotCacheFile, aotCacheFileLog);
+    }
+
     // Creating a dynamic CDS archive (with -XX:ArchiveClassesAtExit=<foo>.jsa) requires that the current
     // JVM process is using a static archive (which is usually the default CDS archive included in the JDK).
     // However, if the JDK doesn't include a default CDS archive that's compatible with the set of
@@ -264,6 +307,8 @@ abstract public class CDSAppTester {
             cmdLine = StringArrayUtils.concat(cmdLine, "-Xshare:on", "-XX:SharedArchiveFile=" + staticArchiveFile);
         } else if (isDynamicWorkflow()) {
             cmdLine = StringArrayUtils.concat(cmdLine, "-Xshare:on", "-XX:SharedArchiveFile=" + dynamicArchiveFile);
+       } else if (isAOTWorkflow()) {
+            cmdLine = StringArrayUtils.concat(cmdLine, "-XX:AOTMode=on", "-XX:AOTCache=" + aotCacheFile);
         }
 
         if (extraVmArgs != null) {
@@ -296,6 +341,8 @@ abstract public class CDSAppTester {
                 runStaticWorkflow();
             } else if (args[0].equals("DYNAMIC")) {
                 runDynamicWorkflow();
+            } else if (args[0].equals("AOT")) {
+                runAOTWorkflow();
             } else {
                 throw new RuntimeException(err);
             }
@@ -314,4 +361,12 @@ abstract public class CDSAppTester {
         dumpDynamicArchive();
         productionRun();
     }
+
+    // See JEP 485
+    private void runAOTWorkflow() throws Exception {
+        this.workflow = Workflow.AOT;
+        recordAOTConfiguration();
+        createAOTCache();
+        productionRun();
+    }
 }

From c8a521fddac9d42fe93ea9b3ab89e804bc48bf4e Mon Sep 17 00:00:00 2001
From: Naoto Sato <naoto@openjdk.org>
Date: Tue, 25 Feb 2025 23:03:18 +0000
Subject: [PATCH 127/587] 8345213: JVM Prefers /etc/timezone Over
 /etc/localtime on Debian 12

Reviewed-by: joehw, jpai, alanb
---
 .../unix/native/libjava/TimeZone_md.c         | 32 ++-----------------
 1 file changed, 2 insertions(+), 30 deletions(-)

diff --git a/src/java.base/unix/native/libjava/TimeZone_md.c b/src/java.base/unix/native/libjava/TimeZone_md.c
index bc55f099bd9..cd253edde60 100644
--- a/src/java.base/unix/native/libjava/TimeZone_md.c
+++ b/src/java.base/unix/native/libjava/TimeZone_md.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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 @@
 #define fileclose       fclose
 
 #if defined(__linux__) || defined(_ALLBSD_SOURCE)
-static const char *ETC_TIMEZONE_FILE = "/etc/timezone";
 static const char *ZONEINFO_DIR = "/usr/share/zoneinfo";
 static const char *DEFAULT_ZONEINFO_FILE = "/etc/localtime";
 #else
@@ -248,40 +247,13 @@ getPlatformTimeZoneID()
 {
     struct stat statbuf;
     char *tz = NULL;
-    FILE *fp;
     int fd;
     char *buf;
     size_t size;
     int res;
 
-#if defined(__linux__)
     /*
-     * Try reading the /etc/timezone file for Debian distros. There's
-     * no spec of the file format available. This parsing assumes that
-     * there's one line of an Olson tzid followed by a '\n', no
-     * leading or trailing spaces, no comments.
-     */
-    if ((fp = fopen(ETC_TIMEZONE_FILE, "r")) != NULL) {
-        char line[256];
-
-        if (fgets(line, sizeof(line), fp) != NULL) {
-            char *p = strchr(line, '\n');
-            if (p != NULL) {
-                *p = '\0';
-            }
-            if (strlen(line) > 0) {
-                tz = strdup(line);
-            }
-        }
-        (void) fclose(fp);
-        if (tz != NULL) {
-            return tz;
-        }
-    }
-#endif /* defined(__linux__) */
-
-    /*
-     * Next, try /etc/localtime to find the zone ID.
+     * Try /etc/localtime to find the zone ID.
      */
     RESTARTABLE(lstat(DEFAULT_ZONEINFO_FILE, &statbuf), res);
     if (res == -1) {

From 037e47112bdf2fa2324f7c58198f6d433f17d9fd Mon Sep 17 00:00:00 2001
From: Calvin Cheung <ccheung@openjdk.org>
Date: Tue, 25 Feb 2025 23:49:52 +0000
Subject: [PATCH 128/587] 8350666: cmp-baseline builds fail after JDK-8280682

Reviewed-by: iklam
---
 src/hotspot/share/cds/aotClassLocation.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/hotspot/share/cds/aotClassLocation.cpp b/src/hotspot/share/cds/aotClassLocation.cpp
index c083213b933..656d7551b03 100644
--- a/src/hotspot/share/cds/aotClassLocation.cpp
+++ b/src/hotspot/share/cds/aotClassLocation.cpp
@@ -270,7 +270,7 @@ AOTClassLocation* AOTClassLocation::allocate(JavaThread* current, const char* pa
   cs->_manifest_length = manifest_length;
   cs->_check_time = check_time;
   cs->_from_cpattr = from_cpattr;
-  cs->_timestamp = timestamp;
+  cs->_timestamp = check_time ? timestamp : 0;
   cs->_filesize = filesize;
   cs->_file_type = type;
   cs->_group = group;

From f529bf712d8946584999dfc98abea60c22c97167 Mon Sep 17 00:00:00 2001
From: Patrick Zhang <qpzhang@openjdk.org>
Date: Wed, 26 Feb 2025 09:07:07 +0000
Subject: [PATCH 129/587] 8350483: AArch64: turn on signum intrinsics by
 default on Ampere CPUs

Reviewed-by: aph
---
 src/hotspot/cpu/aarch64/vm_version_aarch64.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/hotspot/cpu/aarch64/vm_version_aarch64.cpp b/src/hotspot/cpu/aarch64/vm_version_aarch64.cpp
index 874f8a380ae..bca39ae9db2 100644
--- a/src/hotspot/cpu/aarch64/vm_version_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/vm_version_aarch64.cpp
@@ -161,6 +161,9 @@ void VM_Version::initialize() {
         (_model == CPU_MODEL_AMPERE_1A || _model == CPU_MODEL_AMPERE_1B)) {
       FLAG_SET_DEFAULT(CodeEntryAlignment, 32);
     }
+    if (FLAG_IS_DEFAULT(UseSignumIntrinsic)) {
+      FLAG_SET_DEFAULT(UseSignumIntrinsic, true);
+    }
   }
 
   // ThunderX

From a70eba8e4212c2c7125475f69b3952197e7a8ce3 Mon Sep 17 00:00:00 2001
From: Thomas Stuefe <stuefe@openjdk.org>
Date: Wed, 26 Feb 2025 09:51:56 +0000
Subject: [PATCH 130/587] 8330174: Protection zone for easier detection of
 accidental zero-nKlass use

Co-authored-by: Ioi Lam <iklam@openjdk.org>
Reviewed-by: iklam, rkennke
---
 src/hotspot/share/cds/archiveBuilder.cpp      |  17 +-
 src/hotspot/share/cds/archiveBuilder.hpp      |  13 +-
 src/hotspot/share/cds/archiveUtils.cpp        |  55 ++---
 src/hotspot/share/cds/dynamicArchive.cpp      |   1 -
 src/hotspot/share/cds/filemap.hpp             |   2 +-
 src/hotspot/share/cds/metaspaceShared.cpp     |  92 +++++---
 src/hotspot/share/cds/metaspaceShared.hpp     |   1 +
 src/hotspot/share/include/cds.h               |   5 +-
 src/hotspot/share/memory/metaspace.cpp        |  41 ++--
 src/hotspot/share/oops/compressedKlass.cpp    |  29 ++-
 src/hotspot/share/oops/compressedKlass.hpp    |  11 +-
 .../share/oops/compressedKlass.inline.hpp     |   6 +-
 src/hotspot/share/prims/whitebox.cpp          |  12 ++
 src/hotspot/share/runtime/os.cpp              |   6 +
 .../AccessZeroNKlassHitsProtectionZone.java   | 203 ++++++++++++++++++
 test/lib/jdk/test/whitebox/WhiteBox.java      |   4 +-
 16 files changed, 400 insertions(+), 98 deletions(-)
 create mode 100644 test/hotspot/jtreg/runtime/ErrorHandling/AccessZeroNKlassHitsProtectionZone.java

diff --git a/src/hotspot/share/cds/archiveBuilder.cpp b/src/hotspot/share/cds/archiveBuilder.cpp
index 21e97457a87..f093b9d8070 100644
--- a/src/hotspot/share/cds/archiveBuilder.cpp
+++ b/src/hotspot/share/cds/archiveBuilder.cpp
@@ -153,7 +153,6 @@ void ArchiveBuilder::SourceObjList::relocate(int i, ArchiveBuilder* builder) {
 ArchiveBuilder::ArchiveBuilder() :
   _current_dump_region(nullptr),
   _buffer_bottom(nullptr),
-  _num_dump_regions_used(0),
   _requested_static_archive_bottom(nullptr),
   _requested_static_archive_top(nullptr),
   _requested_dynamic_archive_bottom(nullptr),
@@ -161,6 +160,7 @@ ArchiveBuilder::ArchiveBuilder() :
   _mapped_static_archive_bottom(nullptr),
   _mapped_static_archive_top(nullptr),
   _buffer_to_requested_delta(0),
+  _pz_region("pz", MAX_SHARED_DELTA), // protection zone -- used only during dumping; does NOT exist in cds archive.
   _rw_region("rw", MAX_SHARED_DELTA),
   _ro_region("ro", MAX_SHARED_DELTA),
   _ptrmap(mtClassShared),
@@ -323,9 +323,14 @@ address ArchiveBuilder::reserve_buffer() {
   _shared_rs = rs;
 
   _buffer_bottom = buffer_bottom;
-  _current_dump_region = &_rw_region;
-  _num_dump_regions_used = 1;
-  _current_dump_region->init(&_shared_rs, &_shared_vs);
+
+  if (CDSConfig::is_dumping_static_archive()) {
+    _current_dump_region = &_pz_region;
+    _current_dump_region->init(&_shared_rs, &_shared_vs);
+  } else {
+    _current_dump_region = &_rw_region;
+    _current_dump_region->init(&_shared_rs, &_shared_vs);
+  }
 
   ArchivePtrMarker::initialize(&_ptrmap, &_shared_vs);
 
@@ -366,7 +371,8 @@ address ArchiveBuilder::reserve_buffer() {
   if (CDSConfig::is_dumping_static_archive()) {
     // We don't want any valid object to be at the very bottom of the archive.
     // See ArchivePtrMarker::mark_pointer().
-    rw_region()->allocate(16);
+    _pz_region.allocate(MetaspaceShared::protection_zone_size());
+    start_dump_region(&_rw_region);
   }
 
   return buffer_bottom;
@@ -544,7 +550,6 @@ ArchiveBuilder::FollowMode ArchiveBuilder::get_follow_mode(MetaspaceClosure::Ref
 void ArchiveBuilder::start_dump_region(DumpRegion* next) {
   current_dump_region()->pack(next);
   _current_dump_region = next;
-  _num_dump_regions_used ++;
 }
 
 char* ArchiveBuilder::ro_strdup(const char* s) {
diff --git a/src/hotspot/share/cds/archiveBuilder.hpp b/src/hotspot/share/cds/archiveBuilder.hpp
index e3efedd46f1..5913ae29c78 100644
--- a/src/hotspot/share/cds/archiveBuilder.hpp
+++ b/src/hotspot/share/cds/archiveBuilder.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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,6 @@ class ArchiveBuilder : public StackObj {
 protected:
   DumpRegion* _current_dump_region;
   address _buffer_bottom;                      // for writing the contents of rw/ro regions
-  int _num_dump_regions_used;
 
   // These are the addresses where we will request the static and dynamic archives to be
   // mapped at run time. If the request fails (due to ASLR), we will map the archives at
@@ -210,6 +209,12 @@ private:
   ReservedSpace _shared_rs;
   VirtualSpace _shared_vs;
 
+  // The "pz" region is used only during static dumps to reserve an unused space between SharedBaseAddress and
+  // the bottom of the rw region. During runtime, this space will be filled with a reserved area that disallows
+  // read/write/exec, so we can track for bad CompressedKlassPointers encoding.
+  // Note: this region does NOT exist in the cds archive.
+  DumpRegion _pz_region;
+
   DumpRegion _rw_region;
   DumpRegion _ro_region;
 
@@ -270,9 +275,6 @@ private:
 
 protected:
   virtual void iterate_roots(MetaspaceClosure* it) = 0;
-
-  static const int _total_dump_regions = 2;
-
   void start_dump_region(DumpRegion* next);
 
 public:
@@ -367,6 +369,7 @@ public:
   void remember_embedded_pointer_in_enclosing_obj(MetaspaceClosure::Ref* ref);
   static void serialize_dynamic_archivable_items(SerializeClosure* soc);
 
+  DumpRegion* pz_region() { return &_pz_region; }
   DumpRegion* rw_region() { return &_rw_region; }
   DumpRegion* ro_region() { return &_ro_region; }
 
diff --git a/src/hotspot/share/cds/archiveUtils.cpp b/src/hotspot/share/cds/archiveUtils.cpp
index 90eefd13d46..7e04b6227f2 100644
--- a/src/hotspot/share/cds/archiveUtils.cpp
+++ b/src/hotspot/share/cds/archiveUtils.cpp
@@ -73,34 +73,39 @@ void ArchivePtrMarker::initialize(CHeapBitMap* ptrmap, VirtualSpace* vs) {
 }
 
 void ArchivePtrMarker::initialize_rw_ro_maps(CHeapBitMap* rw_ptrmap, CHeapBitMap* ro_ptrmap) {
-  address* rw_bottom = (address*)ArchiveBuilder::current()->rw_region()->base();
-  address* ro_bottom = (address*)ArchiveBuilder::current()->ro_region()->base();
+  address* buff_bottom = (address*)ArchiveBuilder::current()->buffer_bottom();
+  address* rw_bottom   = (address*)ArchiveBuilder::current()->rw_region()->base();
+  address* ro_bottom   = (address*)ArchiveBuilder::current()->ro_region()->base();
+
+  // The bit in _ptrmap that cover the very first word in the rw/ro regions.
+  size_t rw_start = rw_bottom - buff_bottom;
+  size_t ro_start = ro_bottom - buff_bottom;
+
+  // The number of bits used by the rw/ro ptrmaps. We might have lots of zero
+  // bits at the bottom and top of rrw/ro ptrmaps, but these zeros will be
+  // removed by FileMapInfo::write_bitmap_region().
+  size_t rw_size = ArchiveBuilder::current()->rw_region()->used() / sizeof(address);
+  size_t ro_size = ArchiveBuilder::current()->ro_region()->used() / sizeof(address);
+
+  // The last (exclusive) bit in _ptrmap that covers the rw/ro regions.
+  // Note: _ptrmap is dynamically expanded only when an actual pointer is written, so
+  // it may not be as large as we want.
+  size_t rw_end = MIN2<size_t>(rw_start + rw_size, _ptrmap->size());
+  size_t ro_end = MIN2<size_t>(ro_start + ro_size, _ptrmap->size());
+
+  rw_ptrmap->initialize(rw_size);
+  ro_ptrmap->initialize(ro_size);
+
+  for (size_t rw_bit = rw_start; rw_bit < rw_end; rw_bit++) {
+    rw_ptrmap->at_put(rw_bit - rw_start, _ptrmap->at(rw_bit));
+  }
+
+  for(size_t ro_bit = ro_start; ro_bit < ro_end; ro_bit++) {
+    ro_ptrmap->at_put(ro_bit - ro_start, _ptrmap->at(ro_bit));
+  }
 
   _rw_ptrmap = rw_ptrmap;
   _ro_ptrmap = ro_ptrmap;
-
-  size_t rw_size = ArchiveBuilder::current()->rw_region()->used() / sizeof(address);
-  size_t ro_size = ArchiveBuilder::current()->ro_region()->used() / sizeof(address);
-  // ro_start is the first bit in _ptrmap that covers the pointer that would sit at ro_bottom.
-  // E.g., if rw_bottom = (address*)100
-  //          ro_bottom = (address*)116
-  //       then for 64-bit platform:
-  //          ro_start = ro_bottom - rw_bottom = (116 - 100) / sizeof(address) = 2;
-  size_t ro_start = ro_bottom - rw_bottom;
-
-  // Note: ptrmap is big enough only to cover the last pointer in ro_region.
-  // See ArchivePtrMarker::compact()
-  _rw_ptrmap->initialize(rw_size);
-  _ro_ptrmap->initialize(_ptrmap->size() - ro_start);
-
-  for (size_t rw_bit = 0; rw_bit < _rw_ptrmap->size(); rw_bit++) {
-    _rw_ptrmap->at_put(rw_bit, _ptrmap->at(rw_bit));
-  }
-
-  for(size_t ro_bit = ro_start; ro_bit < _ptrmap->size(); ro_bit++) {
-    _ro_ptrmap->at_put(ro_bit-ro_start, _ptrmap->at(ro_bit));
-  }
-  assert(_ptrmap->size() - ro_start == _ro_ptrmap->size(), "must be");
 }
 
 void ArchivePtrMarker::mark_pointer(address* ptr_loc) {
diff --git a/src/hotspot/share/cds/dynamicArchive.cpp b/src/hotspot/share/cds/dynamicArchive.cpp
index 095b443af66..bcec4146aeb 100644
--- a/src/hotspot/share/cds/dynamicArchive.cpp
+++ b/src/hotspot/share/cds/dynamicArchive.cpp
@@ -170,7 +170,6 @@ public:
 
     post_dump();
 
-    assert(_num_dump_regions_used == _total_dump_regions, "must be");
     verify_universe("After CDS dynamic dump");
   }
 
diff --git a/src/hotspot/share/cds/filemap.hpp b/src/hotspot/share/cds/filemap.hpp
index 25550d76d2a..52e8827a69a 100644
--- a/src/hotspot/share/cds/filemap.hpp
+++ b/src/hotspot/share/cds/filemap.hpp
@@ -400,7 +400,7 @@ public:
   // The offset of the (exclusive) end of the last core region in this archive, relative to SharedBaseAddress
   size_t mapping_end_offset()  const { return last_core_region()->mapping_end_offset(); }
 
-  char* mapped_base()    const { return first_core_region()->mapped_base(); }
+  char* mapped_base()    const { return header()->mapped_base_address();    }
   char* mapped_end()     const { return last_core_region()->mapped_end();   }
 
   // Non-zero if the archive needs to be mapped a non-default location due to ASLR.
diff --git a/src/hotspot/share/cds/metaspaceShared.cpp b/src/hotspot/share/cds/metaspaceShared.cpp
index 2e5ebff456e..e8866336b7a 100644
--- a/src/hotspot/share/cds/metaspaceShared.cpp
+++ b/src/hotspot/share/cds/metaspaceShared.cpp
@@ -147,6 +147,10 @@ size_t MetaspaceShared::core_region_alignment() {
   return os::cds_core_region_alignment();
 }
 
+size_t MetaspaceShared::protection_zone_size() {
+  return os::cds_core_region_alignment();
+}
+
 static bool shared_base_valid(char* shared_base) {
   // We check user input for SharedBaseAddress at dump time.
 
@@ -1280,6 +1284,7 @@ MapArchiveResult MetaspaceShared::map_archives(FileMapInfo* static_mapinfo, File
 
   ReservedSpace total_space_rs, archive_space_rs, class_space_rs;
   MapArchiveResult result = MAP_ARCHIVE_OTHER_FAILURE;
+  size_t prot_zone_size = 0;
   char* mapped_base_address = reserve_address_space_for_archives(static_mapinfo,
                                                                  dynamic_mapinfo,
                                                                  use_requested_addr,
@@ -1291,14 +1296,29 @@ MapArchiveResult MetaspaceShared::map_archives(FileMapInfo* static_mapinfo, File
     log_debug(cds)("Failed to reserve spaces (use_requested_addr=%u)", (unsigned)use_requested_addr);
   } else {
 
+    if (Metaspace::using_class_space()) {
+      prot_zone_size = protection_zone_size();
+#ifdef ASSERT
+      // Before mapping the core regions into the newly established address space, we mark
+      // start and the end of the future protection zone with canaries. That way we easily
+      // catch mapping errors (accidentally mapping data into the future protection zone).
+      os::commit_memory(mapped_base_address, prot_zone_size, false);
+      *(mapped_base_address) = 'P';
+      *(mapped_base_address + prot_zone_size - 1) = 'P';
+#endif
+    }
+
 #ifdef ASSERT
     // Some sanity checks after reserving address spaces for archives
     //  and class space.
     assert(archive_space_rs.is_reserved(), "Sanity");
     if (Metaspace::using_class_space()) {
+      assert(archive_space_rs.base() == mapped_base_address &&
+          archive_space_rs.size() > protection_zone_size(),
+          "Archive space must lead and include the protection zone");
       // Class space must closely follow the archive space. Both spaces
       //  must be aligned correctly.
-      assert(class_space_rs.is_reserved(),
+      assert(class_space_rs.is_reserved() && class_space_rs.size() > 0,
              "A class space should have been reserved");
       assert(class_space_rs.base() >= archive_space_rs.end(),
              "class space should follow the cds archive space");
@@ -1311,8 +1331,9 @@ MapArchiveResult MetaspaceShared::map_archives(FileMapInfo* static_mapinfo, File
     }
 #endif // ASSERT
 
-    log_info(cds)("Reserved archive_space_rs [" INTPTR_FORMAT " - " INTPTR_FORMAT "] (%zu) bytes",
-                   p2i(archive_space_rs.base()), p2i(archive_space_rs.end()), archive_space_rs.size());
+    log_info(cds)("Reserved archive_space_rs [" INTPTR_FORMAT " - " INTPTR_FORMAT "] (%zu) bytes%s",
+                   p2i(archive_space_rs.base()), p2i(archive_space_rs.end()), archive_space_rs.size(),
+                   (prot_zone_size > 0 ? " (includes protection zone)" : ""));
     log_info(cds)("Reserved class_space_rs   [" INTPTR_FORMAT " - " INTPTR_FORMAT "] (%zu) bytes",
                    p2i(class_space_rs.base()), p2i(class_space_rs.end()), class_space_rs.size());
 
@@ -1384,38 +1405,40 @@ MapArchiveResult MetaspaceShared::map_archives(FileMapInfo* static_mapinfo, File
   if (result == MAP_ARCHIVE_SUCCESS) {
     SharedBaseAddress = (size_t)mapped_base_address;
 #ifdef _LP64
-        if (Metaspace::using_class_space()) {
-          // Set up ccs in metaspace.
-          Metaspace::initialize_class_space(class_space_rs);
+    if (Metaspace::using_class_space()) {
+      assert(*(mapped_base_address) == 'P' &&
+             *(mapped_base_address + prot_zone_size - 1) == 'P',
+          "Protection zone was overwritten?");
 
-          // Set up compressed Klass pointer encoding: the encoding range must
-          //  cover both archive and class space.
-          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 || 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
-            );
-          } 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();
-        }
+      // Set up ccs in metaspace.
+      Metaspace::initialize_class_space(class_space_rs);
+
+      // Set up compressed Klass pointer encoding: the encoding range must
+      //  cover both archive and class space.
+      const address encoding_base = (address)mapped_base_address;
+      const address klass_range_start = encoding_base + prot_zone_size;
+      const size_t klass_range_size = (address)class_space_rs.end() - klass_range_start;
+      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 (including protection zone), shift should be the shift used at archive generation time.
+        CompressedKlassPointers::initialize_for_given_encoding(
+          klass_range_start, klass_range_size,
+          encoding_base, ArchiveBuilder::precomputed_narrow_klass_shift() // precomputed encoding, see ArchiveBuilder
+        );
+      } else {
+        // Let JVM freely chose encoding base and shift
+        CompressedKlassPointers::initialize(klass_range_start, klass_range_size);
+      }
+      CompressedKlassPointers::establish_protection_zone(encoding_base, prot_zone_size);
+
+      // 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();
+    }
 #endif // _LP64
     log_info(cds)("initial optimized module handling: %s", CDSConfig::is_using_optimized_module_handling() ? "enabled" : "disabled");
     log_info(cds)("initial full module graph: %s", CDSConfig::is_using_full_module_graph() ? "enabled" : "disabled");
@@ -1497,7 +1520,6 @@ char* MetaspaceShared::reserve_address_space_for_archives(FileMapInfo* static_ma
   const size_t archive_space_alignment = core_region_alignment();
 
   // Size and requested location of the archive_space_rs (for both static and dynamic archives)
-  assert(static_mapinfo->mapping_base_offset() == 0, "Must be");
   size_t archive_end_offset  = (dynamic_mapinfo == nullptr) ? static_mapinfo->mapping_end_offset() : dynamic_mapinfo->mapping_end_offset();
   size_t archive_space_size = align_up(archive_end_offset, archive_space_alignment);
 
diff --git a/src/hotspot/share/cds/metaspaceShared.hpp b/src/hotspot/share/cds/metaspaceShared.hpp
index 6d5f273041a..27df816833c 100644
--- a/src/hotspot/share/cds/metaspaceShared.hpp
+++ b/src/hotspot/share/cds/metaspaceShared.hpp
@@ -139,6 +139,7 @@ public:
   // Alignment for the 2 core CDS regions (RW/RO) only.
   // (Heap region alignments are decided by GC).
   static size_t core_region_alignment();
+  static size_t protection_zone_size();
   static void rewrite_nofast_bytecodes_and_calculate_fingerprints(Thread* thread, InstanceKlass* ik);
   // print loaded classes names to file.
   static void dump_loaded_classes(const char* file_name, TRAPS);
diff --git a/src/hotspot/share/include/cds.h b/src/hotspot/share/include/cds.h
index 2a80dd68abd..8819e4c00be 100644
--- a/src/hotspot/share/include/cds.h
+++ b/src/hotspot/share/include/cds.h
@@ -70,7 +70,10 @@ 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 used for mapping the core regions. At that address the
+                              // zero nklass protection zone is established; following that (at offset
+                              // MetaspaceShared::protection_zone_size()) the lowest core region (rw for the
+                              // static archive) is is mapped.
   bool    _in_reserved_space; // Is this region in a ReservedSpace
 } CDSFileMapRegion;
 
diff --git a/src/hotspot/share/memory/metaspace.cpp b/src/hotspot/share/memory/metaspace.cpp
index 99d1d027db0..2566c61188f 100644
--- a/src/hotspot/share/memory/metaspace.cpp
+++ b/src/hotspot/share/memory/metaspace.cpp
@@ -1,7 +1,7 @@
 /*
  * Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2017, 2021 SAP SE. All rights reserved.
- * Copyright (c) 2023, 2024, Red Hat, Inc. All rights reserved.
+ * Copyright (c) 2023, 2025, 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
@@ -37,6 +37,7 @@
 #include "memory/metaspace/chunkManager.hpp"
 #include "memory/metaspace/commitLimiter.hpp"
 #include "memory/metaspace/internalStats.hpp"
+#include "memory/metaspace/metachunk.hpp"
 #include "memory/metaspace/metaspaceCommon.hpp"
 #include "memory/metaspace/metaspaceContext.hpp"
 #include "memory/metaspace/metaspaceReporter.hpp"
@@ -804,29 +805,37 @@ void Metaspace::global_initialize() {
     // 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());
+
+    // After narrowKlass encoding scheme is decided: if the encoding base points to class space start,
+    // establish a protection zone. Accidentally decoding a zero nKlass ID and then using it will result
+    // in an immediate segmentation fault instead of a delayed error much later.
+    if (CompressedKlassPointers::base() == (address)rs.base()) {
+      // Let the protection zone be a whole commit granule. Otherwise, buddy allocator may later place neighboring
+      // chunks in the same granule, see that the granule is not yet committed, and commit it, which would replace
+      // the protection mapping and make the zone readable.
+      // Alternatively, we could commit the chunk right now, but that is a tiny bit more fiddly, since we are not
+      // fully set up yet at this point.
+      const size_t protzone_size = metaspace::Settings::commit_granule_bytes(); // granule size >= page size
+      const size_t protzone_wordsize = protzone_size / BytesPerWord;
+      const metaspace::chunklevel_t lvl = metaspace::chunklevel::level_fitting_word_size(protzone_wordsize);
+      metaspace::Metachunk* const chunk = MetaspaceContext::context_class()->cm()->get_chunk(lvl);
+      const address protzone = (address) chunk->base();
+      assert(protzone == (address)rs.base(), "The very first chunk should be located at the class space start?");
+      assert(chunk->word_size() == protzone_wordsize, "Weird chunk size");
+      CompressedKlassPointers::establish_protection_zone(protzone, protzone_size);
+    } else {
+      assert(CompressedKlassPointers::base() == nullptr, "Zero-based encoding expected");
+    }
+
   }
 
-#endif
+#endif // _LP64
 
   // Initialize non-class virtual space list, and its chunk manager:
   MetaspaceContext::initialize_nonclass_space_context();
 
   _tracer = new MetaspaceTracer();
 
-  // We must prevent the very first address of the ccs from being used to store
-  // metadata, since that address would translate to a narrow pointer of 0, and the
-  // VM does not distinguish between "narrow 0 as in null" and "narrow 0 as in start
-  //  of ccs".
-  // Before Elastic Metaspace that did not happen due to the fact that every Metachunk
-  // had a header and therefore could not allocate anything at offset 0.
-#ifdef _LP64
-  if (using_class_space()) {
-    // The simplest way to fix this is to allocate a tiny dummy chunk right at the
-    // start of ccs and do not use it for anything.
-    MetaspaceContext::context_class()->cm()->get_chunk(metaspace::chunklevel::HIGHEST_CHUNK_LEVEL);
-  }
-#endif
-
 #ifdef _LP64
   if (UseCompressedClassPointers) {
     // Note: "cds" would be a better fit but keep this for backward compatibility.
diff --git a/src/hotspot/share/oops/compressedKlass.cpp b/src/hotspot/share/oops/compressedKlass.cpp
index fc8c0513ca0..1e00571ef60 100644
--- a/src/hotspot/share/oops/compressedKlass.cpp
+++ b/src/hotspot/share/oops/compressedKlass.cpp
@@ -42,6 +42,7 @@ 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;
+size_t CompressedKlassPointers::_protection_zone_size = 0;
 
 #ifdef _LP64
 
@@ -162,11 +163,6 @@ void CompressedKlassPointers::initialize_for_given_encoding(address addr, size_t
     vm_exit_during_initialization(ss.base());
   }
 
-  // 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");
-
   // Remember Klass range:
   _klass_range_start = addr;
   _klass_range_end = addr + len;
@@ -304,9 +300,32 @@ void CompressedKlassPointers::print_mode(outputStream* st) {
     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);
+    if (_protection_zone_size > 0) {
+      st->print_cr("Protection zone: " RANGEFMT, RANGEFMTARGS(_base, _protection_zone_size));
+    } else {
+      st->print_cr("No protection zone.");
+    }
   } else {
     st->print_cr("UseCompressedClassPointers off");
   }
 }
 
+// Protect a zone a the start of the encoding range
+void CompressedKlassPointers::establish_protection_zone(address addr, size_t size) {
+  assert(_protection_zone_size == 0, "just once");
+  assert(addr == base(), "Protection zone not at start of encoding range?");
+  assert(size > 0 && is_aligned(size, os::vm_page_size()), "Protection zone not page sized");
+  const bool rc = os::protect_memory((char*)addr, size, os::MEM_PROT_NONE, false);
+  assert(rc, "Failed to protect the Class space protection zone");
+  log_info(metaspace)("%s Narrow Klass Protection zone " RANGEFMT,
+      (rc ? "Established" : "FAILED to establish "),
+      RANGEFMTARGS(addr, size));
+  _protection_zone_size = size;
+}
+
+bool CompressedKlassPointers::is_in_protection_zone(address addr) {
+  return _protection_zone_size > 0 ?
+      (addr >= base() && addr < base() + _protection_zone_size) : false;
+}
+
 #endif // _LP64
diff --git a/src/hotspot/share/oops/compressedKlass.hpp b/src/hotspot/share/oops/compressedKlass.hpp
index dd54c8130eb..4ce644d9cef 100644
--- a/src/hotspot/share/oops/compressedKlass.hpp
+++ b/src/hotspot/share/oops/compressedKlass.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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,6 +134,8 @@ class CompressedKlassPointers : public AllStatic {
   static narrowKlass _lowest_valid_narrow_klass_id;
   static narrowKlass _highest_valid_narrow_klass_id;
 
+  // Protection zone size (0 if not set up)
+  static size_t _protection_zone_size;
 
   // 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);
@@ -231,6 +233,7 @@ public:
   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);
@@ -258,6 +261,12 @@ public:
         is_aligned(addr, klass_alignment_in_bytes());
   }
 
+  // Protect a zone a the start of the encoding range
+  static void establish_protection_zone(address addr, size_t size);
+
+  // Returns true if address points into protection zone (for error reporting)
+  static bool is_in_protection_zone(address addr);
+
 #if defined(AARCH64) && !defined(ZERO)
   // Check that with the given base, shift and range, aarch64 code can encode and decode the klass pointer.
   static bool check_klass_decode_mode(address base, int shift, const size_t range);
diff --git a/src/hotspot/share/oops/compressedKlass.inline.hpp b/src/hotspot/share/oops/compressedKlass.inline.hpp
index 7c5da48a494..94a78ed1894 100644
--- a/src/hotspot/share/oops/compressedKlass.inline.hpp
+++ b/src/hotspot/share/oops/compressedKlass.inline.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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,10 @@ inline narrowKlass CompressedKlassPointers::encode_not_null_without_asserts(Klas
   return (narrowKlass)(pointer_delta(k, narrow_base, 1) >> shift);
 }
 
+inline Klass* CompressedKlassPointers::decode_not_null_without_asserts(narrowKlass v) {
+  return decode_not_null_without_asserts(v, base(), shift());
+}
+
 inline Klass* CompressedKlassPointers::decode_without_asserts(narrowKlass v) {
   return is_null(v) ? nullptr : decode_not_null_without_asserts(v, base(), shift());
 }
diff --git a/src/hotspot/share/prims/whitebox.cpp b/src/hotspot/share/prims/whitebox.cpp
index dd5a23f9209..84fa9d06a1c 100644
--- a/src/hotspot/share/prims/whitebox.cpp
+++ b/src/hotspot/share/prims/whitebox.cpp
@@ -325,6 +325,17 @@ WB_ENTRY(void, WB_ReadFromNoaccessArea(JNIEnv* env, jobject o))
                 *(vs.low_boundary() - rhs.noaccess_prefix() / 2 ));
 WB_END
 
+WB_ENTRY(void, WB_DecodeNKlassAndAccessKlass(JNIEnv* env, jobject o, jint nKlass))
+  assert(UseCompressedClassPointers, "Should only call for UseCompressedClassPointers");
+  const narrowKlass nk = (narrowKlass)nKlass;
+  const Klass* const k = CompressedKlassPointers::decode_not_null_without_asserts(nKlass);
+  printf("WB_DecodeNKlassAndAccessKlass: nk %u k " PTR_FORMAT "\n", nk, p2i(k));
+  printf("Will attempt to crash now...\n");
+  fflush(stdout); // flush now - we will crash below
+  // Access k by calling a virtual function - will result in loading the vtable from *k
+  k->print_on(tty);
+WB_END
+
 static jint wb_stress_virtual_space_resize(size_t reserved_space_size,
                                            size_t magnitude, size_t iterations) {
   size_t granularity = os::vm_allocation_granularity();
@@ -2733,6 +2744,7 @@ static JNINativeMethod methods[] = {
       (void*)&WB_GetCompressedOopsMaxHeapSize},
   {CC"printHeapSizes",     CC"()V",                   (void*)&WB_PrintHeapSizes    },
   {CC"readFromNoaccessArea",CC"()V",                  (void*)&WB_ReadFromNoaccessArea},
+  {CC"decodeNKlassAndAccessKlass",CC"(I)V",            (void*)&WB_DecodeNKlassAndAccessKlass},
   {CC"stressVirtualSpaceResize",CC"(JJJ)I",           (void*)&WB_StressVirtualSpaceResize},
 #if INCLUDE_CDS
   {CC"getCDSOffsetForName0", CC"(Ljava/lang/String;)I",  (void*)&WB_GetCDSOffsetForName},
diff --git a/src/hotspot/share/runtime/os.cpp b/src/hotspot/share/runtime/os.cpp
index d266b632ed1..efff891c72f 100644
--- a/src/hotspot/share/runtime/os.cpp
+++ b/src/hotspot/share/runtime/os.cpp
@@ -1291,6 +1291,12 @@ void os::print_location(outputStream* st, intptr_t x, bool verbose) {
 
   bool accessible = is_readable_pointer(addr);
 
+  // Check if addr points into the narrow Klass protection zone
+  if (UseCompressedClassPointers && CompressedKlassPointers::is_in_protection_zone(addr)) {
+    st->print_cr(PTR_FORMAT " points into nKlass protection zone", p2i(addr));
+    return;
+  }
+
   // Check if addr is a JNI handle.
   if (align_down((intptr_t)addr, sizeof(intptr_t)) != 0 && accessible) {
     if (JNIHandles::is_global_handle((jobject) addr)) {
diff --git a/test/hotspot/jtreg/runtime/ErrorHandling/AccessZeroNKlassHitsProtectionZone.java b/test/hotspot/jtreg/runtime/ErrorHandling/AccessZeroNKlassHitsProtectionZone.java
new file mode 100644
index 00000000000..2e70c1d8786
--- /dev/null
+++ b/test/hotspot/jtreg/runtime/ErrorHandling/AccessZeroNKlassHitsProtectionZone.java
@@ -0,0 +1,203 @@
+/*
+ * Copyright (c) 2025, Red Hat, Inc.
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact 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=no_coh_no_cds
+ * @summary Test that dereferencing a Klass that is the result of a decode(0) crashes accessing the nKlass guard zone
+ * @library /test/lib
+ * @requires vm.bits == 64 & vm.debug == true
+ * @requires vm.flagless
+ * @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 driver AccessZeroNKlassHitsProtectionZone no_coh_no_cds
+ */
+
+/*
+ * @test id=no_coh_cds
+ * @summary Test that dereferencing a Klass that is the result of a decode(0) crashes accessing the nKlass guard zone
+ * @requires vm.bits == 64 & vm.debug == true & vm.flagless
+ * @library /test/lib
+ * @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 driver AccessZeroNKlassHitsProtectionZone no_coh_cds
+ */
+
+/*
+ * @test id=coh_no_cds
+ * @summary Test that dereferencing a Klass that is the result of a decode(0) crashes accessing the nKlass guard zone
+ * @requires vm.bits == 64 & vm.debug == true & vm.flagless
+ * @library /test/lib
+ * @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 driver AccessZeroNKlassHitsProtectionZone coh_no_cds
+ */
+
+/*
+ * @test id=coh_cds
+ * @summary Test that dereferencing a Klass that is the result of a decode(0) crashes accessing the nKlass guard zone
+ * @requires vm.bits == 64 & vm.debug == true & vm.flagless
+ * @library /test/lib
+ * @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 driver AccessZeroNKlassHitsProtectionZone coh_cds
+ */
+
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.process.ProcessTools;
+import jdk.test.whitebox.WhiteBox;
+import jtreg.SkippedException;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.regex.Pattern;
+
+// Test that dereferencing a Klass that is the result of a narrowKlass=0 will give us immediate crashes
+// that hit the protection zone at encoding base.
+public class AccessZeroNKlassHitsProtectionZone {
+
+    private static OutputAnalyzer run_test(boolean COH, boolean CDS, String forceBaseString) throws IOException, SkippedException {
+        ArrayList<String> args = new ArrayList<>();
+        args.add("-Xbootclasspath/a:.");
+        args.add("-XX:+UnlockDiagnosticVMOptions");
+        args.add("-XX:+WhiteBoxAPI");
+        args.add("-XX:CompressedClassSpaceSize=128m");
+        args.add("-Xmx128m");
+        args.add("-XX:-CreateCoredumpOnCrash");
+        args.add("-Xlog:metaspace*");
+        if (COH) {
+            args.add("-XX:+UnlockExperimentalVMOptions");
+            args.add("-XX:+UseCompactObjectHeaders");
+        }
+        if (CDS) {
+            args.add("-Xshare:on");
+        } else {
+            args.add("-Xshare:off");
+            args.add("-XX:CompressedClassSpaceBaseAddress=" + forceBaseString);
+        }
+        args.add(AccessZeroNKlassHitsProtectionZone.class.getName());
+        args.add("runwb");
+        ProcessBuilder pb = ProcessTools.createLimitedTestJavaProcessBuilder(args.toArray(new String[0]));
+
+        OutputAnalyzer output = new OutputAnalyzer(pb.start());
+        output.reportDiagnosticSummary();
+        return output;
+    }
+
+    private static void run_test(boolean COH, boolean CDS) throws IOException, SkippedException {
+        // Notes:
+        // We want to enforce zero-based encoding, to test the protection page in that case. For zero-based encoding,
+        // protection page is at address zero, no need to test that.
+        // If CDS is on, we never use zero-based, forceBase is ignored.
+        // If CDS is off, we use forceBase to (somewhat) reliably force the encoding base to beyond 32G,
+        // in order to prevent zero-based encoding. Since that may fail, we try several times.
+        OutputAnalyzer output = null;
+        long forceBase = -1;
+        if (CDS) {
+            output = run_test(COH, CDS, "");
+        } else {
+            long g4 = 0x1_0000_0000L;
+            long start = g4 * 8; // 32g
+            long step = g4;
+            long end = start + step * 16;
+            for (forceBase = start; forceBase < end; forceBase += step) {
+                String thisBaseString = String.format("0x%016X", forceBase).toLowerCase();
+                output = run_test(COH, CDS, thisBaseString);
+                if (output.contains("CompressedClassSpaceBaseAddress=" + thisBaseString + " given, but reserving class space failed.")) {
+                    // try next one
+                } else if (output.contains("Successfully forced class space address to " + thisBaseString)) {
+                    break;
+                } else {
+                    throw new RuntimeException("Unexpected");
+                }
+            }
+            if (forceBase >= end) {
+                throw new SkippedException("Failed to force ccs to any of the given bases. Skipping test.");
+            }
+        }
+
+        // Parse the encoding base from the output. In case of CDS, it depends on ASLR. Even in case of CDS=off, we want
+        // to double-check it is the force address.
+        String nKlassBaseString = output.firstMatch("Narrow klass base: 0x([0-9a-f]+)", 1);
+        if (nKlassBaseString == null) {
+            throw new RuntimeException("did not find Narrow klass base in log output");
+        }
+        long nKlassBase = Long.valueOf(nKlassBaseString, 16);
+
+        if (!CDS && nKlassBase != forceBase) {
+            throw new RuntimeException("Weird - we should have mapped at force base"); // .. otherwise we would have skipped out above
+        }
+        if (nKlassBase == 0) {
+            throw new RuntimeException("We should not be running zero-based at this point.");
+        }
+
+        // Calculate the expected crash address pattern. The precise crash address is unknown, but should be located
+        // in the lower part of the guard page following the encoding base. We just accept any address matching the
+        // upper 52 digits (leaving 4K = 12 bits = 4 nibbles of wiggle room)
+        String expectedCrashAddressString = nKlassBaseString.substring(0, nKlassBaseString.length() - 3);
+
+        // output from whitebox function: Klass* should point to encoding base
+        output.shouldMatch("WB_DecodeNKlassAndAccessKlass: nk 0 k 0x" + nKlassBaseString);
+
+        // Then, we should have crashed
+        output.shouldNotHaveExitValue(0);
+        output.shouldContain("# A fatal error has been detected");
+
+        // The hs-err file should contain a reference to the nKlass protection zone, like this:
+        // "RDI=0x0000000800000000 points into nKlass protection zone"
+        File hsErrFile = HsErrFileUtils.openHsErrFileFromOutput(output);
+
+        ArrayList<Pattern> hsErrPatternList = new ArrayList<>();
+        hsErrPatternList.add(Pattern.compile(".*(SIGBUS|SIGSEGV|EXCEPTION_ACCESS_VIOLATION).*"));
+
+        hsErrPatternList.add(Pattern.compile(".*siginfo:.*" + expectedCrashAddressString + ".*"));
+        hsErrPatternList.add(Pattern.compile(".*" + expectedCrashAddressString + ".*points into nKlass protection zone.*"));
+        Pattern[] hsErrPattern = hsErrPatternList.toArray(new Pattern[0]);
+        HsErrFileUtils.checkHsErrFileContent(hsErrFile, hsErrPattern, true);
+    }
+
+    enum Argument { runwb, no_coh_no_cds, no_coh_cds, coh_no_cds, coh_cds };
+    public static void main(String[] args) throws Exception {
+        if (args.length != 1) {
+            throw new RuntimeException("Expecting one argument");
+        }
+        Argument arg = Argument.valueOf(args[0]);
+        System.out.println(arg);
+        switch (arg) {
+            case runwb -> WhiteBox.getWhiteBox().decodeNKlassAndAccessKlass(0);
+            case no_coh_no_cds -> run_test(false, false);
+            case no_coh_cds -> run_test(false, true);
+            case coh_no_cds -> run_test(true, false);
+            case coh_cds -> run_test(true, true);
+        }
+    }
+}
diff --git a/test/lib/jdk/test/whitebox/WhiteBox.java b/test/lib/jdk/test/whitebox/WhiteBox.java
index be9bc646ce4..c45aecbced5 100644
--- a/test/lib/jdk/test/whitebox/WhiteBox.java
+++ b/test/lib/jdk/test/whitebox/WhiteBox.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -642,6 +642,8 @@ public class WhiteBox {
   // Tests on ReservedSpace/VirtualSpace classes
   public native int stressVirtualSpaceResize(long reservedSpaceSize, long magnitude, long iterations);
   public native void readFromNoaccessArea();
+
+  public native void decodeNKlassAndAccessKlass(int nKlass);
   public native long getThreadStackSize();
   public native long getThreadRemainingStackSize();
 

From a43104640420fbd82868788ccd8a3a8e938f365a Mon Sep 17 00:00:00 2001
From: "Tagir F. Valeev" <tvaleev@openjdk.org>
Date: Wed, 26 Feb 2025 10:08:29 +0000
Subject: [PATCH 131/587] 8350518:
 org.openjdk.bench.java.util.TreeMapUpdate.compute fails with 
 "java.lang.IllegalArgumentException: key out of range"

Reviewed-by: liach, skuksenko
---
 test/micro/org/openjdk/bench/java/util/TreeMapUpdate.java | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/test/micro/org/openjdk/bench/java/util/TreeMapUpdate.java b/test/micro/org/openjdk/bench/java/util/TreeMapUpdate.java
index 2a5a9cf0bed..b93c3c309c5 100644
--- a/test/micro/org/openjdk/bench/java/util/TreeMapUpdate.java
+++ b/test/micro/org/openjdk/bench/java/util/TreeMapUpdate.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -56,7 +56,7 @@ import java.util.stream.IntStream;
 @Fork(3)
 @State(Scope.Thread)
 public class TreeMapUpdate {
-    @Param({"TreeMap", "descendingMap", "tailMap"})
+    @Param({"TreeMap", "descendingMap", "subMap"})
     public String mode;
 
     @Param({"10", "1000", "100000"})
@@ -86,8 +86,8 @@ public class TreeMapUpdate {
             case "descendingMap":
                 transformer = map -> map.descendingMap();
                 break;
-            case "tailMap":
-                transformer = map -> map.tailMap(0, true);
+            case "subMap":
+                transformer = comparator ? map -> map.headMap(0, true) : map -> map.tailMap(0, true);
                 break;
             default:
                 throw new IllegalStateException(mode);

From aac9cb4537b13a4af123ae76f29359e851dc4c82 Mon Sep 17 00:00:00 2001
From: Thomas Schatzl <tschatzl@openjdk.org>
Date: Wed, 26 Feb 2025 10:30:01 +0000
Subject: [PATCH 132/587] 8349906: G1: Improve initial survivor rate for newly
 used young regions

Reviewed-by: kbarrett, iwalulya
---
 src/hotspot/share/gc/g1/g1SurvRateGroup.cpp | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/src/hotspot/share/gc/g1/g1SurvRateGroup.cpp b/src/hotspot/share/gc/g1/g1SurvRateGroup.cpp
index 1eaaf44a1fb..c5c0ca992b0 100644
--- a/src/hotspot/share/gc/g1/g1SurvRateGroup.cpp
+++ b/src/hotspot/share/gc/g1/g1SurvRateGroup.cpp
@@ -68,13 +68,26 @@ void G1SurvRateGroup::stop_adding_regions() {
     _accum_surv_rate_pred = REALLOC_C_HEAP_ARRAY(double, _accum_surv_rate_pred, _num_added_regions, mtGC);
     _surv_rate_predictors = REALLOC_C_HEAP_ARRAY(TruncatedSeq*, _surv_rate_predictors, _num_added_regions, mtGC);
 
+    // Assume that the prediction for the newly added regions is the same as the
+    // ones at the (current) end of the array. Particularly predictions at the end
+    // of this array fairly seldom get updated, so having a better initial value
+    // that is at least somewhat related to the actual application is preferable.
+    double new_pred = _stats_arrays_length > 1
+                    ? _accum_surv_rate_pred[_stats_arrays_length - 1] - _accum_surv_rate_pred[_stats_arrays_length - 2]
+                    : InitialSurvivorRate;
+
     for (size_t i = _stats_arrays_length; i < _num_added_regions; ++i) {
       // Initialize predictors and accumulated survivor rate predictions.
       _surv_rate_predictors[i] = new TruncatedSeq(10);
-      _surv_rate_predictors[i]->add(InitialSurvivorRate);
-      _accum_surv_rate_pred[i] = ((i == 0) ? 0.0 : _accum_surv_rate_pred[i-1]) + InitialSurvivorRate;
+      if (i == 0) {
+        _surv_rate_predictors[i]->add(InitialSurvivorRate);
+        _accum_surv_rate_pred[i] = 0.0;
+      } else {
+        _surv_rate_predictors[i]->add(_surv_rate_predictors[i-1]->last());
+        _accum_surv_rate_pred[i] = _accum_surv_rate_pred[i-1] + new_pred;
+      }
     }
-    _last_pred = InitialSurvivorRate;
+    _last_pred = new_pred;
 
     _stats_arrays_length = _num_added_regions;
   }

From a0dd56543219343306aea99b684b5e2cb04c7d76 Mon Sep 17 00:00:00 2001
From: Thomas Schatzl <tschatzl@openjdk.org>
Date: Wed, 26 Feb 2025 11:31:48 +0000
Subject: [PATCH 133/587] 8350643: G1: Make loop iteration variable type
 correspond to limit in G1SurvRateGroup

Reviewed-by: ayang, kbarrett
---
 src/hotspot/share/gc/g1/g1SurvRateGroup.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/hotspot/share/gc/g1/g1SurvRateGroup.cpp b/src/hotspot/share/gc/g1/g1SurvRateGroup.cpp
index c5c0ca992b0..d5fd50c4523 100644
--- a/src/hotspot/share/gc/g1/g1SurvRateGroup.cpp
+++ b/src/hotspot/share/gc/g1/g1SurvRateGroup.cpp
@@ -46,7 +46,7 @@ void G1SurvRateGroup::reset() {
   // The call to stop_adding_regions() will use "new" to refill
   // the _surv_rate_pred array, so we need to make sure to call
   // "delete".
-  for (size_t i = 0; i < _stats_arrays_length; ++i) {
+  for (uint i = 0; i < _stats_arrays_length; ++i) {
     delete _surv_rate_predictors[i];
   }
   _stats_arrays_length = 0;
@@ -76,7 +76,7 @@ void G1SurvRateGroup::stop_adding_regions() {
                     ? _accum_surv_rate_pred[_stats_arrays_length - 1] - _accum_surv_rate_pred[_stats_arrays_length - 2]
                     : InitialSurvivorRate;
 
-    for (size_t i = _stats_arrays_length; i < _num_added_regions; ++i) {
+    for (uint i = _stats_arrays_length; i < _num_added_regions; ++i) {
       // Initialize predictors and accumulated survivor rate predictions.
       _surv_rate_predictors[i] = new TruncatedSeq(10);
       if (i == 0) {
@@ -123,7 +123,7 @@ double G1SurvRateGroup::accum_surv_rate_pred(uint age) const {
 void G1SurvRateGroup::fill_in_last_surv_rates() {
   if (_num_added_regions > 0) { // conservative
     double surv_rate = _surv_rate_predictors[_num_added_regions-1]->last();
-    for (size_t i = _num_added_regions; i < _stats_arrays_length; ++i) {
+    for (uint i = _num_added_regions; i < _stats_arrays_length; ++i) {
       _surv_rate_predictors[i]->add(surv_rate);
     }
   }
@@ -132,7 +132,7 @@ void G1SurvRateGroup::fill_in_last_surv_rates() {
 void G1SurvRateGroup::finalize_predictions(const G1Predictions& predictor) {
   double accum = 0.0;
   double pred = 0.0;
-  for (size_t i = 0; i < _stats_arrays_length; ++i) {
+  for (uint i = 0; i < _stats_arrays_length; ++i) {
     pred = predictor.predict_in_unit_interval(_surv_rate_predictors[i]);
     accum += pred;
     _accum_surv_rate_pred[i] = accum;

From 1e18fffee456382c4eeb017b3fad0dc99ccaad35 Mon Sep 17 00:00:00 2001
From: Coleen Phillimore <coleenp@openjdk.org>
Date: Wed, 26 Feb 2025 11:49:09 +0000
Subject: [PATCH 134/587] 8328473: StringTable and SymbolTable statistics delay
 time to safepoint

Reviewed-by: shade, eosterlund
---
 src/hotspot/share/classfile/stringTable.cpp   | 22 +++++-
 src/hotspot/share/classfile/symbolTable.cpp   | 34 ++++++---
 .../share/utilities/concurrentHashTable.hpp   | 16 ++--
 .../utilities/concurrentHashTable.inline.hpp  | 75 +++++++------------
 .../concurrentHashTableTasks.inline.hpp       | 46 +++++++++++-
 5 files changed, 123 insertions(+), 70 deletions(-)

diff --git a/src/hotspot/share/classfile/stringTable.cpp b/src/hotspot/share/classfile/stringTable.cpp
index 22ccb4e4b04..1076ffb2dd7 100644
--- a/src/hotspot/share/classfile/stringTable.cpp
+++ b/src/hotspot/share/classfile/stringTable.cpp
@@ -744,13 +744,29 @@ struct SizeFunc : StackObj {
 TableStatistics StringTable::get_table_statistics() {
   static TableStatistics ts;
   SizeFunc sz;
-  ts = _local_table->statistics_get(Thread::current(), sz, ts);
+
+  Thread* jt = Thread::current();
+  StringTableHash::StatisticsTask sts(_local_table);
+  if (!sts.prepare(jt)) {
+    return ts;  // return old table statistics
+  }
+  {
+    TraceTime timer("GetStatistics", TRACETIME_LOG(Debug, stringtable, perf));
+    while (sts.do_task(jt, sz)) {
+      sts.pause(jt);
+      if (jt->is_Java_thread()) {
+        ThreadBlockInVM tbivm(JavaThread::cast(jt));
+      }
+      sts.cont(jt);
+    }
+  }
+  ts = sts.done(jt);
   return ts;
 }
 
 void StringTable::print_table_statistics(outputStream* st) {
-  SizeFunc sz;
-  _local_table->statistics_to(Thread::current(), sz, st, "StringTable");
+  TableStatistics ts = get_table_statistics();
+  ts.print(st, "StringTable");
 #if INCLUDE_CDS_JAVA_HEAP
   if (!_shared_table.empty()) {
     _shared_table.print_table_statistics(st, "Shared String Table");
diff --git a/src/hotspot/share/classfile/symbolTable.cpp b/src/hotspot/share/classfile/symbolTable.cpp
index 84c0a5a39de..3cb453aaecb 100644
--- a/src/hotspot/share/classfile/symbolTable.cpp
+++ b/src/hotspot/share/classfile/symbolTable.cpp
@@ -572,23 +572,35 @@ Symbol* SymbolTable::new_permanent_symbol(const char* name) {
   return sym;
 }
 
-struct SizeFunc : StackObj {
-  size_t operator()(Symbol* value) {
+TableStatistics SymbolTable::get_table_statistics() {
+  static TableStatistics ts;
+  auto sz = [&](Symbol* value) {
     assert(value != nullptr, "expected valid value");
     return (value)->size() * HeapWordSize;
   };
+
+  Thread* jt = Thread::current();
+  SymbolTableHash::StatisticsTask sts(_local_table);
+  if (!sts.prepare(jt)) {
+    return ts;  // return old table statistics
+  }
+  {
+    TraceTime timer("GetStatistics", TRACETIME_LOG(Debug, symboltable, perf));
+    while (sts.do_task(jt, sz)) {
+      sts.pause(jt);
+      if (jt->is_Java_thread()) {
+        ThreadBlockInVM tbivm(JavaThread::cast(jt));
+      }
+      sts.cont(jt);
+    }
+  }
+  ts = sts.done(jt);
+  return ts;
 };
 
-TableStatistics SymbolTable::get_table_statistics() {
-  static TableStatistics ts;
-  SizeFunc sz;
-  ts = _local_table->statistics_get(Thread::current(), sz, ts);
-  return ts;
-}
-
 void SymbolTable::print_table_statistics(outputStream* st) {
-  SizeFunc sz;
-  _local_table->statistics_to(Thread::current(), sz, st, "SymbolTable");
+  TableStatistics ts = get_table_statistics();
+  ts.print(st, "SymbolTable");
 
   if (!_shared_table.empty()) {
     _shared_table.print_table_statistics(st, "Shared Symbol Table");
diff --git a/src/hotspot/share/utilities/concurrentHashTable.hpp b/src/hotspot/share/utilities/concurrentHashTable.hpp
index 402a767c0b8..48166b22126 100644
--- a/src/hotspot/share/utilities/concurrentHashTable.hpp
+++ b/src/hotspot/share/utilities/concurrentHashTable.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -56,9 +56,12 @@ class ConcurrentHashTable : public CHeapObj<MT> {
       _stats_rate->remove();
     }
   }
-  // Calculate statistics. Item sizes are calculated with VALUE_SIZE_FUNC.
+  // Calculate statistics. Item sizes are calculated with VALUE_SIZE_FUNC, and accumulated in summary and literal_size.
   template <typename VALUE_SIZE_FUNC>
-  TableStatistics statistics_calculate(Thread* thread, VALUE_SIZE_FUNC& vs_f);
+  void internal_statistics_range(Thread* thread, size_t start, size_t stop,
+                                 VALUE_SIZE_FUNC& sts_f, NumberSeq& summary, size_t& literal_size);
+
+  TableStatistics internal_statistics_epilog(Thread* thread, NumberSeq summary, size_t literal_size);
 
   // This is the internal node structure.
   // Only constructed with placement new from memory allocated with MemTag of
@@ -531,12 +534,6 @@ class ConcurrentHashTable : public CHeapObj<MT> {
   template <typename VALUE_SIZE_FUNC>
   TableStatistics statistics_get(Thread* thread, VALUE_SIZE_FUNC& vs_f, TableStatistics old);
 
-  // Writes statistics to the outputStream. Item sizes are calculated with
-  // VALUE_SIZE_FUNC.
-  template <typename VALUE_SIZE_FUNC>
-  void statistics_to(Thread* thread, VALUE_SIZE_FUNC& vs_f, outputStream* st,
-                     const char* table_name);
-
   // Moves all nodes from this table to to_cht with new hash code.
   // Must be done at a safepoint.
   void rehash_nodes_to(Thread* thread, ConcurrentHashTable<CONFIG, MT>* to_cht);
@@ -559,6 +556,7 @@ class ConcurrentHashTable : public CHeapObj<MT> {
  public:
   class BulkDeleteTask;
   class GrowTask;
+  class StatisticsTask;
   class ScanTask;
 };
 
diff --git a/src/hotspot/share/utilities/concurrentHashTable.inline.hpp b/src/hotspot/share/utilities/concurrentHashTable.inline.hpp
index 929d70c74bd..3b6e3fefabf 100644
--- a/src/hotspot/share/utilities/concurrentHashTable.inline.hpp
+++ b/src/hotspot/share/utilities/concurrentHashTable.inline.hpp
@@ -1232,35 +1232,34 @@ inline void ConcurrentHashTable<CONFIG, MT>::
 
 template <typename CONFIG, MemTag MT>
 template <typename VALUE_SIZE_FUNC>
-inline TableStatistics ConcurrentHashTable<CONFIG, MT>::
-  statistics_calculate(Thread* thread, VALUE_SIZE_FUNC& vs_f)
+inline void ConcurrentHashTable<CONFIG, MT>::
+  internal_statistics_range(Thread* thread, size_t start, size_t stop,
+                            VALUE_SIZE_FUNC& vs_f, NumberSeq& summary, size_t& literal_size)
 {
-  constexpr size_t batch_size = 128;
-  NumberSeq summary;
-  size_t literal_bytes = 0;
-  InternalTable* table = get_table();
-  size_t num_batches = table->_size / batch_size;
-  for (size_t batch_start = 0; batch_start < _table->_size; batch_start += batch_size) {
-    // We batch the use of ScopedCS here as it has been found to be quite expensive to
-    // invoke it for every single bucket.
-    size_t batch_end = MIN2(batch_start + batch_size, _table->_size);
-    ScopedCS cs(thread, this);
-    for (size_t bucket_it = batch_start; bucket_it < batch_end; bucket_it++) {
-      size_t count = 0;
-      Bucket* bucket = table->get_bucket(bucket_it);
-      if (bucket->have_redirect() || bucket->is_locked()) {
-        continue;
-      }
-      Node* current_node = bucket->first();
-      while (current_node != nullptr) {
-        ++count;
-        literal_bytes += vs_f(current_node->value());
-        current_node = current_node->next();
-      }
-      summary.add((double)count);
+  // We batch the use of ScopedCS here as it has been found to be quite expensive to
+  // invoke it for every single bucket.
+  ScopedCS cs(thread, this);
+  for (size_t bucket_it = start; bucket_it < stop; bucket_it++) {
+    size_t count = 0;
+    Bucket* bucket = _table->get_bucket(bucket_it);
+    if (bucket->have_redirect() || bucket->is_locked()) {
+      continue;
     }
+    Node* current_node = bucket->first();
+    while (current_node != nullptr) {
+      ++count;
+      literal_size += vs_f(current_node->value());
+      current_node = current_node->next();
+    }
+    summary.add((double)count);
   }
+}
 
+template <typename CONFIG, MemTag MT>
+inline TableStatistics ConcurrentHashTable<CONFIG, MT>::
+  internal_statistics_epilog(Thread* thread, NumberSeq summary, size_t literal_bytes)
+{
+  unlock_resize_lock(thread);
   if (_stats_rate == nullptr) {
     return TableStatistics(summary, literal_bytes, sizeof(Bucket), sizeof(Node));
   } else {
@@ -1276,28 +1275,12 @@ inline TableStatistics ConcurrentHashTable<CONFIG, MT>::
   if (!try_resize_lock(thread)) {
     return old;
   }
+  InternalTable* table = get_table();
+  NumberSeq summary;
+  size_t    literal_bytes = 0;
 
-  TableStatistics ts = statistics_calculate(thread, vs_f);
-  unlock_resize_lock(thread);
-
-  return ts;
-}
-
-template <typename CONFIG, MemTag MT>
-template <typename VALUE_SIZE_FUNC>
-inline void ConcurrentHashTable<CONFIG, MT>::
-  statistics_to(Thread* thread, VALUE_SIZE_FUNC& vs_f,
-                outputStream* st, const char* table_name)
-{
-  if (!try_resize_lock(thread)) {
-    st->print_cr("statistics unavailable at this moment");
-    return;
-  }
-
-  TableStatistics ts = statistics_calculate(thread, vs_f);
-  unlock_resize_lock(thread);
-
-  ts.print(st, table_name);
+  internal_statistics_range(thread, 0, table->_size, vs_f, summary, literal_bytes);
+  return internal_statistics_epilog(thread, summary, literal_bytes);
 }
 
 template <typename CONFIG, MemTag MT>
diff --git a/src/hotspot/share/utilities/concurrentHashTableTasks.inline.hpp b/src/hotspot/share/utilities/concurrentHashTableTasks.inline.hpp
index 44b2f91c3f2..f9808ba6c9c 100644
--- a/src/hotspot/share/utilities/concurrentHashTableTasks.inline.hpp
+++ b/src/hotspot/share/utilities/concurrentHashTableTasks.inline.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -229,6 +229,50 @@ class ConcurrentHashTable<CONFIG, MT>::GrowTask :
   }
 };
 
+template <typename CONFIG, MemTag MT>
+class ConcurrentHashTable<CONFIG, MT>::StatisticsTask :
+  public BucketsOperation
+{
+  NumberSeq _summary;
+  size_t    _literal_bytes;
+ public:
+  StatisticsTask(ConcurrentHashTable<CONFIG, MT>* cht) : BucketsOperation(cht), _literal_bytes(0) { }
+
+  // Before start prepare must be called.
+  bool prepare(Thread* thread) {
+    bool lock = BucketsOperation::_cht->try_resize_lock(thread);
+    if (!lock) {
+      return false;
+    }
+
+    this->setup(thread);
+    return true;
+  }
+
+  // Scans part of the table adding to statistics.
+  template <typename VALUE_SIZE_FUNC>
+  bool do_task(Thread* thread, VALUE_SIZE_FUNC& sz) {
+    size_t start, stop;
+    assert(BucketsOperation::_cht->_resize_lock_owner != nullptr,
+           "Should be locked");
+    if (!this->claim(&start, &stop)) {
+      return false;
+    }
+    BucketsOperation::_cht->internal_statistics_range(thread, start, stop, sz, _summary, _literal_bytes);
+    assert(BucketsOperation::_cht->_resize_lock_owner != nullptr,
+           "Should be locked");
+    return true;
+  }
+
+  // Must be called after do_task returns false.
+  TableStatistics done(Thread* thread) {
+    this->thread_owns_resize_lock(thread);
+    TableStatistics ts = BucketsOperation::_cht->internal_statistics_epilog(thread, _summary, _literal_bytes);
+    this->thread_do_not_own_resize_lock(thread);
+    return ts;
+  }
+};
+
 template <typename CONFIG, MemTag MT>
 class ConcurrentHashTable<CONFIG, MT>::ScanTask :
   public BucketsOperation

From e7d4b360fe27585f1a021fd1d1da1fda7f27a37c Mon Sep 17 00:00:00 2001
From: Matthias Baesken <mbaesken@openjdk.org>
Date: Wed, 26 Feb 2025 12:40:53 +0000
Subject: [PATCH 135/587] 8350667: Remove startThread_lock() and
 _startThread_lock on AIX

Reviewed-by: stuefe, jkern
---
 src/hotspot/os/aix/osThread_aix.cpp | 4 +---
 src/hotspot/os/aix/osThread_aix.hpp | 9 ---------
 src/hotspot/os/aix/os_aix.cpp       | 2 ++
 3 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/src/hotspot/os/aix/osThread_aix.cpp b/src/hotspot/os/aix/osThread_aix.cpp
index 204b271ceee..bbc7cf41e52 100644
--- a/src/hotspot/os/aix/osThread_aix.cpp
+++ b/src/hotspot/os/aix/osThread_aix.cpp
@@ -37,11 +37,9 @@ OSThread::OSThread()
     _siginfo(nullptr),
     _ucontext(nullptr),
     _expanding_stack(0),
-    _alt_sig_stack(nullptr),
-    _startThread_lock(new Monitor(Mutex::event, "startThread_lock")) {
+    _alt_sig_stack(nullptr) {
   sigemptyset(&_caller_sigmask);
 }
 
 OSThread::~OSThread() {
-  delete _startThread_lock;
 }
diff --git a/src/hotspot/os/aix/osThread_aix.hpp b/src/hotspot/os/aix/osThread_aix.hpp
index 771c2c19e45..81c0eafa0f7 100644
--- a/src/hotspot/os/aix/osThread_aix.hpp
+++ b/src/hotspot/os/aix/osThread_aix.hpp
@@ -114,15 +114,6 @@ class OSThread : public OSThreadBase {
   void set_alt_sig_stack(address val)     { _alt_sig_stack = val; }
   address alt_sig_stack(void)             { return _alt_sig_stack; }
 
- private:
-  Monitor* _startThread_lock;     // sync parent and child in thread creation
-
- public:
-
-  Monitor* startThread_lock() const {
-    return _startThread_lock;
-  }
-
   // Printing
   uintx thread_id_for_printing() const override {
     return (uintx)_thread_id;
diff --git a/src/hotspot/os/aix/os_aix.cpp b/src/hotspot/os/aix/os_aix.cpp
index e452bfdfd7c..315c5fde157 100644
--- a/src/hotspot/os/aix/os_aix.cpp
+++ b/src/hotspot/os/aix/os_aix.cpp
@@ -796,6 +796,8 @@ bool os::create_thread(Thread* thread, ThreadType thr_type,
   // OSThread::thread_id is the pthread id.
   osthread->set_thread_id(tid);
 
+  // child thread synchronization is not done here on AIX, a thread is started in suspended state
+
   return true;
 }
 

From ea2c92384927a22dd1e1e8676723c7cc720a128b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Johan=20Sj=C3=B6len?= <jsjolen@openjdk.org>
Date: Wed, 26 Feb 2025 12:51:35 +0000
Subject: [PATCH 136/587] 8323807: Async UL: Add a stalling mode to async UL

Reviewed-by: dholmes, aboldtch
---
 src/hotspot/share/logging/logAsyncWriter.cpp  | 143 +++++++++++++-----
 src/hotspot/share/logging/logAsyncWriter.hpp  |  22 ++-
 .../share/logging/logConfiguration.cpp        |  25 ++-
 .../share/logging/logConfiguration.hpp        |  18 ++-
 src/hotspot/share/runtime/arguments.cpp       |   6 +-
 src/hotspot/share/runtime/globals.hpp         |   2 +-
 src/java.base/share/man/java.md               |  10 +-
 test/hotspot/gtest/logging/test_asynclog.cpp  |  19 ++-
 .../jtreg/runtime/logging/StressAsyncUL.java  |  57 +++++++
 9 files changed, 241 insertions(+), 61 deletions(-)
 create mode 100644 test/hotspot/jtreg/runtime/logging/StressAsyncUL.java

diff --git a/src/hotspot/share/logging/logAsyncWriter.cpp b/src/hotspot/share/logging/logAsyncWriter.cpp
index 737f001c049..ea5cc5c96ab 100644
--- a/src/hotspot/share/logging/logAsyncWriter.cpp
+++ b/src/hotspot/share/logging/logAsyncWriter.cpp
@@ -26,45 +26,63 @@
 #include "logging/logConfiguration.hpp"
 #include "logging/logFileOutput.hpp"
 #include "logging/logFileStreamOutput.hpp"
-#include "logging/logHandle.hpp"
+#include "memory/allocation.hpp"
 #include "memory/resourceArea.hpp"
 #include "runtime/atomic.hpp"
-#include "runtime/os.inline.hpp"
-#include "runtime/globals.hpp"
 
+class AsyncLogWriter::Locker : public StackObj {
+  Thread*& _holder;
+  PlatformMonitor& _lock;
 
-class AsyncLogWriter::AsyncLogLocker : public StackObj {
-  static Thread* _holder;
 public:
-  static Thread* current_holder() { return _holder; }
-  AsyncLogLocker() {
-    assert(_instance != nullptr, "AsyncLogWriter::_lock is unavailable");
-    _instance->_lock.lock();
+  Locker(Thread*& holder, PlatformMonitor& lock)
+  : _holder(holder),
+    _lock(lock) {
+    _lock.lock();
     _holder = Thread::current_or_null();
   }
 
-  ~AsyncLogLocker() {
+  ~Locker() {
     assert(_holder == Thread::current_or_null(), "must be");
     _holder = nullptr;
-    _instance->_lock.unlock();
+    _lock.unlock();
+  }
+
+  void notify() {
+    _lock.notify();
   }
 
   void wait() {
     Thread* saved_holder = _holder;
     _holder = nullptr;
-    _instance->_lock.wait(0/* no timeout */);
+    _lock.wait(0 /* no timeout */);
     _holder = saved_holder;
   }
 };
 
-Thread* AsyncLogWriter::AsyncLogLocker::_holder = nullptr;
+class AsyncLogWriter::ProducerLocker : public Locker {
+  static Thread* _holder;
+public:
+  static Thread* current_holder() { return _holder; }
+  ProducerLocker() : Locker(_holder, _instance->_producer_lock) {}
+};
+
+class AsyncLogWriter::ConsumerLocker : public Locker {
+  static Thread* _holder;
+public:
+  static Thread* current_holder() { return _holder; }
+  ConsumerLocker() : Locker(_holder, _instance->_consumer_lock) {}
+};
+
+Thread* AsyncLogWriter::ProducerLocker::_holder = nullptr;
+Thread* AsyncLogWriter::ConsumerLocker::_holder = nullptr;
 
 // LogDecorator::None applies to 'constant initialization' because of its constexpr constructor.
 const LogDecorations& AsyncLogWriter::None = LogDecorations(LogLevel::Warning, LogTagSetMapping<LogTag::__NO_TAG>::tagset(),
                                       LogDecorators::None);
 
-bool AsyncLogWriter::Buffer::push_back(LogFileStreamOutput* output, const LogDecorations& decorations, const char* msg) {
-  const size_t len = strlen(msg);
+bool AsyncLogWriter::Buffer::push_back(LogFileStreamOutput* output, const LogDecorations& decorations, const char* msg, const size_t msg_len) {
+  const size_t len = msg_len;
   const size_t sz = Message::calc_size(len);
   const bool is_token = output == nullptr;
   // Always leave headroom for the flush token. Pushing a token must succeed.
@@ -80,7 +98,7 @@ bool AsyncLogWriter::Buffer::push_back(LogFileStreamOutput* output, const LogDec
 }
 
 void AsyncLogWriter::Buffer::push_flush_token() {
-  bool result = push_back(nullptr, AsyncLogWriter::None, "");
+  bool result = push_back(nullptr, AsyncLogWriter::None, "", 0);
   assert(result, "fail to enqueue the flush token.");
 }
 
@@ -89,22 +107,45 @@ void AsyncLogWriter::enqueue_locked(LogFileStreamOutput* output, const LogDecora
   // client should use "" instead.
   assert(msg != nullptr, "enqueuing a null message!");
 
-  if (!_buffer->push_back(output, decorations, msg)) {
-    bool p_created;
-    uint32_t* counter = _stats.put_if_absent(output, 0, &p_created);
-    *counter = *counter + 1;
-    return;
-  }
+  size_t msg_len = strlen(msg);
+  void* stalled_message = nullptr;
+  {
+    ConsumerLocker clocker;
+    if (_buffer->push_back(output, decorations, msg, msg_len)) {
+      _data_available = true;
+      clocker.notify();
+      return;
+    }
 
-  _data_available = true;
-  _lock.notify();
+    if (LogConfiguration::async_mode() == LogConfiguration::AsyncMode::Stall) {
+      size_t size = Message::calc_size(msg_len);
+      stalled_message = os::malloc(size, mtLogging);
+      if (stalled_message == nullptr) {
+        // Out of memory. We bail without any notice.
+        // Some other part of the system will probably fail later.
+        return;
+      }
+      _stalled_message = new (stalled_message) Message(output, decorations, msg, msg_len);
+      _data_available = true;
+      clocker.notify();
+      // Note: we still hold the producer lock so cannot race against other threads trying to log a message
+      while (_stalled_message != nullptr) {
+        clocker.wait();
+      }
+    } else {
+      bool p_created;
+      uint32_t* counter = _stats.put_if_absent(output, 0, &p_created);
+      *counter = *counter + 1;
+    }
+  } // ConsumerLocker out of scope
+  os::free(stalled_message);
 }
 
 // This function checks for cases where continuing with asynchronous logging may lead to stability issues, such as a deadlock.
 // If this returns false then we give up on logging asynchronously and do so synchronously instead.
 bool AsyncLogWriter::is_enqueue_allowed() {
   AsyncLogWriter* alw = AsyncLogWriter::instance();
-  Thread* holding_thread = AsyncLogWriter::AsyncLogLocker::current_holder();
+  Thread* holding_thread = AsyncLogWriter::ProducerLocker::current_holder();
   Thread* this_thread = Thread::current_or_null();
   if (this_thread == nullptr) {
     // The current thread is unattached.
@@ -142,7 +183,7 @@ bool AsyncLogWriter::enqueue(LogFileStreamOutput& output, const LogDecorations&
     return false;
   }
 
-  AsyncLogLocker locker;
+  ProducerLocker plocker;
 
 #ifdef ASSERT
   if (TestingAsyncLoggingDeathTest || TestingAsyncLoggingDeathTestNoCrash) {
@@ -162,7 +203,7 @@ bool AsyncLogWriter::enqueue(LogFileStreamOutput& output, LogMessageBuffer::Iter
   }
 
   // If we get here we know the AsyncLogWriter is initialized.
-  AsyncLogLocker locker;
+  ProducerLocker plocker;
   for (; !msg_iterator.is_at_end(); msg_iterator++) {
     AsyncLogWriter::instance()->enqueue_locked(&output, msg_iterator.decorations(), msg_iterator.message());
   }
@@ -170,9 +211,13 @@ bool AsyncLogWriter::enqueue(LogFileStreamOutput& output, LogMessageBuffer::Iter
 }
 
 AsyncLogWriter::AsyncLogWriter()
-  : _flush_sem(0), _lock(), _data_available(false),
-    _initialized(false),
-    _stats() {
+: _flush_sem(0),
+  _producer_lock(),
+  _consumer_lock(),
+  _data_available(false),
+  _initialized(false),
+  _stats(),
+  _stalled_message(nullptr) {
 
   size_t size = AsyncLogBufferSize / 2;
   _buffer = new Buffer(size);
@@ -185,7 +230,7 @@ AsyncLogWriter::AsyncLogWriter()
   }
 }
 
-void AsyncLogWriter::write(AsyncLogMap<AnyObj::RESOURCE_AREA>& snapshot) {
+bool AsyncLogWriter::write(AsyncLogMap<AnyObj::RESOURCE_AREA>& snapshot) {
   int req = 0;
   auto it = _buffer_staging->iterator();
   while (it.hasNext()) {
@@ -213,8 +258,9 @@ void AsyncLogWriter::write(AsyncLogMap<AnyObj::RESOURCE_AREA>& snapshot) {
 
   if (req > 0) {
     assert(req == 1, "Only one token is allowed in queue. AsyncLogWriter::flush() is NOT MT-safe!");
-    _flush_sem.signal(req);
+    return true;
   }
+  return false;
 }
 
 void AsyncLogWriter::run() {
@@ -222,11 +268,11 @@ void AsyncLogWriter::run() {
     ResourceMark rm;
     AsyncLogMap<AnyObj::RESOURCE_AREA> snapshot;
     {
-      AsyncLogLocker locker;
-
+      ConsumerLocker clocker;
       while (!_data_available) {
-        locker.wait();
+        clocker.wait();
       }
+
       // Only doing a swap and statistics under the lock to
       // guarantee that I/O jobs don't block logsites.
       _buffer_staging->reset();
@@ -243,7 +289,23 @@ void AsyncLogWriter::run() {
       });
       _data_available = false;
     }
-    write(snapshot);
+
+    bool saw_flush_token = write(snapshot);
+
+    // Any stalled message must be written *after* the buffer has been written.
+    // This is because we try hard to output messages in program-order.
+    if (_stalled_message != nullptr) {
+      assert(LogConfiguration::async_mode() == LogConfiguration::AsyncMode::Stall, "must be");
+      ConsumerLocker clocker;
+      Message* m = (Message*)_stalled_message;
+      m->output()->write_blocking(m->decorations(), m->message());
+      _stalled_message = nullptr;
+      clocker.notify();
+    }
+
+    if (saw_flush_token) {
+      _flush_sem.signal(1);
+    }
   }
 }
 
@@ -281,11 +343,12 @@ AsyncLogWriter* AsyncLogWriter::instance() {
 void AsyncLogWriter::flush() {
   if (_instance != nullptr) {
     {
-      AsyncLogLocker locker;
+      ProducerLocker plocker;
+      ConsumerLocker clocker;
       // Push directly in-case we are at logical max capacity, as this must not get dropped.
       _instance->_buffer->push_flush_token();
       _instance->_data_available = true;
-      _instance->_lock.notify();
+      clocker.notify();
     }
 
     _instance->_flush_sem.wait();
@@ -293,7 +356,7 @@ void AsyncLogWriter::flush() {
 }
 
 AsyncLogWriter::BufferUpdater::BufferUpdater(size_t newsize) {
-  AsyncLogLocker locker;
+  ConsumerLocker clocker;
   auto p = AsyncLogWriter::_instance;
 
   _buf1 = p->_buffer;
@@ -307,7 +370,7 @@ AsyncLogWriter::BufferUpdater::~BufferUpdater() {
   auto p = AsyncLogWriter::_instance;
 
   {
-    AsyncLogLocker locker;
+    ConsumerLocker clocker;
 
     delete p->_buffer;
     delete p->_buffer_staging;
diff --git a/src/hotspot/share/logging/logAsyncWriter.hpp b/src/hotspot/share/logging/logAsyncWriter.hpp
index 00818634bdd..355d15b904c 100644
--- a/src/hotspot/share/logging/logAsyncWriter.hpp
+++ b/src/hotspot/share/logging/logAsyncWriter.hpp
@@ -29,6 +29,7 @@
 #include "logging/logMessageBuffer.hpp"
 #include "memory/allocation.hpp"
 #include "runtime/mutex.hpp"
+#include "runtime/os.inline.hpp"
 #include "runtime/nonJavaThread.hpp"
 #include "runtime/semaphore.hpp"
 #include "utilities/resourceHash.hpp"
@@ -59,7 +60,9 @@ class LogFileStreamOutput;
 class AsyncLogWriter : public NonJavaThread {
   friend class AsyncLogTest;
   friend class AsyncLogTest_logBuffer_vm_Test;
-  class AsyncLogLocker;
+  class Locker;
+  class ProducerLocker;
+  class ConsumerLocker;
 
   // account for dropped messages
   template <AnyObj::allocation_type ALLOC_TYPE>
@@ -125,7 +128,7 @@ class AsyncLogWriter : public NonJavaThread {
     }
 
     void push_flush_token();
-    bool push_back(LogFileStreamOutput* output, const LogDecorations& decorations, const char* msg);
+    bool push_back(LogFileStreamOutput* output, const LogDecorations& decorations, const char* msg, const size_t msg_len);
 
     void reset() {
       // Ensure _pos is Message-aligned
@@ -159,8 +162,13 @@ class AsyncLogWriter : public NonJavaThread {
   static AsyncLogWriter* _instance;
   Semaphore _flush_sem;
   // Can't use a Monitor here as we need a low-level API that can be used without Thread::current().
-  PlatformMonitor _lock;
+  // Producers take both locks in the order producer lock and then consumer lock.
+  // The consumer protects the buffers and performs all communication between producer and consumer via wait/notify.
+  // This allows a producer to await progress from the consumer thread (by only releasing the producer lock)), whilst preventing all other producers from progressing.
+  PlatformMonitor _producer_lock;
+  PlatformMonitor _consumer_lock;
   bool _data_available;
+  // _initialized is set to true if the constructor succeeds
   volatile bool _initialized;
   AsyncLogMap<AnyObj::C_HEAP> _stats;
 
@@ -168,11 +176,17 @@ class AsyncLogWriter : public NonJavaThread {
   Buffer* _buffer;
   Buffer* _buffer_staging;
 
+  // Stalled message
+  // Stalling is implemented by the producer writing to _stalled_message, notifying the consumer lock and releasing it.
+  // The consumer will then write all of the current buffers' content and then write the stalled message, at the end notifying the consumer lock and releasing it for the
+  // owning producer thread of the stalled message. This thread will finally release both locks in order, allowing for other producers to continue.
+  volatile Message* _stalled_message;
+
   static const LogDecorations& None;
 
   AsyncLogWriter();
   void enqueue_locked(LogFileStreamOutput* output, const LogDecorations& decorations, const char* msg);
-  void write(AsyncLogMap<AnyObj::RESOURCE_AREA>& snapshot);
+  bool write(AsyncLogMap<AnyObj::RESOURCE_AREA>& snapshot);
   void run() override;
   void pre_run() override {
     NonJavaThread::pre_run();
diff --git a/src/hotspot/share/logging/logConfiguration.cpp b/src/hotspot/share/logging/logConfiguration.cpp
index 5f8a045c356..194bd622b15 100644
--- a/src/hotspot/share/logging/logConfiguration.cpp
+++ b/src/hotspot/share/logging/logConfiguration.cpp
@@ -636,10 +636,15 @@ void LogConfiguration::print_command_line_help(outputStream* out) {
   out->cr();
 
   out->print_cr("Asynchronous logging (off by default):");
-  out->print_cr(" -Xlog:async");
+  out->print_cr(" -Xlog:async[:[mode]]");
   out->print_cr("  All log messages are written to an intermediate buffer first and will then be flushed"
                 " to the corresponding log outputs by a standalone thread. Write operations at logsites are"
                 " guaranteed non-blocking.");
+  out->print_cr(" A mode, either 'drop' or 'stall', may be provided. If 'drop' is provided then"
+                " messages will be dropped if there is no room in the intermediate buffer."
+                " If 'stall' is provided then the log operation will wait for room to be made by the output thread, without dropping any messages."
+                " The default mode is 'drop'.");
+
   out->cr();
 
   out->print_cr("Some examples:");
@@ -715,4 +720,20 @@ void LogConfiguration::notify_update_listeners() {
   }
 }
 
-bool LogConfiguration::_async_mode = false;
+LogConfiguration::AsyncMode LogConfiguration::_async_mode = AsyncMode::Off;
+
+bool LogConfiguration::parse_async_argument(const char* async_tail) {
+  bool ret = true;
+  if (*async_tail == '\0') {
+    // Default is to drop.
+    LogConfiguration::set_async_mode(LogConfiguration::AsyncMode::Drop);
+  } else if (strcmp(async_tail, ":stall") == 0) {
+    LogConfiguration::set_async_mode(LogConfiguration::AsyncMode::Stall);
+  } else if (strcmp(async_tail, ":drop") == 0) {
+    LogConfiguration::set_async_mode(LogConfiguration::AsyncMode::Drop);
+  } else {
+    // User provided unknown async option
+    ret = false;
+  }
+  return ret;
+}
diff --git a/src/hotspot/share/logging/logConfiguration.hpp b/src/hotspot/share/logging/logConfiguration.hpp
index e9cf3e53c8b..840f6a9af57 100644
--- a/src/hotspot/share/logging/logConfiguration.hpp
+++ b/src/hotspot/share/logging/logConfiguration.hpp
@@ -62,7 +62,14 @@ class LogConfiguration : public AllStatic {
 
   static UpdateListenerFunction*    _listener_callbacks;
   static size_t                     _n_listener_callbacks;
-  static bool                       _async_mode;
+
+public:
+  enum class AsyncMode {
+    Off, Stall, Drop
+  };
+
+private:
+  static AsyncMode _async_mode;
 
   // Create a new output. Returns null if failed.
   static LogOutput* new_output(const char* name, const char* options, outputStream* errstream);
@@ -120,6 +127,8 @@ class LogConfiguration : public AllStatic {
                                   const char* output_options,
                                   outputStream* errstream);
 
+  static bool parse_async_argument(const char* async_tail);
+
   // Prints log configuration to outputStream, used by JCmd/MBean.
   static void describe(outputStream* out);
 
@@ -129,9 +138,10 @@ class LogConfiguration : public AllStatic {
   // Rotates all LogOutput
   static void rotate_all_outputs();
 
-  static bool is_async_mode() { return _async_mode; }
-  static void set_async_mode(bool value) {
-    _async_mode = value;
+  static AsyncMode async_mode() { return _async_mode; }
+  static bool is_async_mode() { return _async_mode != AsyncMode::Off; }
+  static void set_async_mode(AsyncMode mode) {
+    _async_mode = mode;
   }
 };
 
diff --git a/src/hotspot/share/runtime/arguments.cpp b/src/hotspot/share/runtime/arguments.cpp
index ab05cbeb891..c6651c46e02 100644
--- a/src/hotspot/share/runtime/arguments.cpp
+++ b/src/hotspot/share/runtime/arguments.cpp
@@ -2605,9 +2605,9 @@ jint Arguments::parse_each_vm_init_arg(const JavaVMInitArgs* args, JVMFlagOrigin
       } else if (strcmp(tail, ":disable") == 0) {
         LogConfiguration::disable_logging();
         ret = true;
-      } else if (strcmp(tail, ":async") == 0) {
-        LogConfiguration::set_async_mode(true);
-        ret = true;
+      } else if (strncmp(tail, ":async", strlen(":async")) == 0) {
+        const char* async_tail = tail + strlen(":async");
+        ret = LogConfiguration::parse_async_argument(async_tail);
       } else if (*tail == '\0') {
         ret = LogConfiguration::parse_command_line_arguments();
         assert(ret, "-Xlog without arguments should never fail to parse");
diff --git a/src/hotspot/share/runtime/globals.hpp b/src/hotspot/share/runtime/globals.hpp
index 61c4c0633c7..a1ebe226e85 100644
--- a/src/hotspot/share/runtime/globals.hpp
+++ b/src/hotspot/share/runtime/globals.hpp
@@ -1871,7 +1871,7 @@ const int ObjectAlignmentInBytes = 8;
   product(size_t, AsyncLogBufferSize, 2*M,                                  \
           "Memory budget (in bytes) for the buffer of Asynchronous "        \
           "Logging (-Xlog:async).")                                         \
-          range(100*K, 50*M)                                                \
+          range(DEBUG_ONLY(192) NOT_DEBUG(100*K), 50*M)                     \
                                                                             \
   product(bool, CheckIntrinsics, true, DIAGNOSTIC,                          \
              "When a class C is loaded, check that "                        \
diff --git a/src/java.base/share/man/java.md b/src/java.base/share/man/java.md
index e1a247b20c3..32280f2c516 100644
--- a/src/java.base/share/man/java.md
+++ b/src/java.base/share/man/java.md
@@ -3357,16 +3357,18 @@ getting overwritten.
 ### -Xlog Output Mode
 
 By default logging messages are output synchronously - each log message is written to
-the designated output when the logging call is made. But you can instead use asynchronous
+the designated output when the logging call is made. You can instead use asynchronous
 logging mode by specifying:
 
-`-Xlog:async`
+`-Xlog:async[:[stall|drop]]`
 :     Write all logging asynchronously.
 
 In asynchronous logging mode, log sites enqueue all logging messages to an intermediate buffer
 and a standalone thread is responsible for flushing them to the corresponding outputs. The
-intermediate buffer is bounded and on buffer exhaustion the enqueuing message is discarded.
-Log entry write operations are guaranteed non-blocking.
+intermediate buffer is bounded. On buffer exhaustion the enqueuing message is either discarded (`async:drop`),
+or logging threads are stalled until the flushing thread catches up (`async:stall`).
+If no specific mode is chosen, then `async:drop` is chosen by default.
+Log entry write operations are guaranteed to be non-blocking in the `async:drop` case.
 
 The option `-XX:AsyncLogBufferSize=N` specifies the memory budget in bytes for the intermediate buffer.
 The default value should be big enough to cater for most cases. Users can provide a custom value to
diff --git a/test/hotspot/gtest/logging/test_asynclog.cpp b/test/hotspot/gtest/logging/test_asynclog.cpp
index 401e31804ad..cb674603563 100644
--- a/test/hotspot/gtest/logging/test_asynclog.cpp
+++ b/test/hotspot/gtest/logging/test_asynclog.cpp
@@ -25,6 +25,7 @@
 #include "jvm.h"
 #include "logging/log.hpp"
 #include "logging/logAsyncWriter.hpp"
+#include "logging/logConfiguration.hpp"
 #include "logging/logFileOutput.hpp"
 #include "logging/logMessage.hpp"
 #include "logTestFixture.hpp"
@@ -173,10 +174,10 @@ TEST_VM_F(AsyncLogTest, logBuffer) {
   const uintptr_t mask = (uintptr_t)(sizeof(void*) - 1);
   bool res;
 
-  res = buffer->push_back(output, Default, "a log line");
+  res = buffer->push_back(output, Default, "a log line", strlen("a log line"));
   EXPECT_TRUE(res) << "first message should succeed.";
   line++;
-  res = buffer->push_back(output, Default, "yet another");
+  res = buffer->push_back(output, Default, "yet another", strlen("yet another"));
   EXPECT_TRUE(res) << "second message should succeed.";
   line++;
 
@@ -201,7 +202,7 @@ TEST_VM_F(AsyncLogTest, logBuffer) {
   written = e->output()->write_blocking(e->decorations(), e->message());
   EXPECT_GT(written, 0);
 
-  while (buffer->push_back(output, Default, "0123456789abcdef")) {
+  while (buffer->push_back(output, Default, "0123456789abcdef", strlen("0123456789abcdef"))) {
     line++;
   }
 
@@ -252,6 +253,18 @@ TEST_VM_F(AsyncLogTest, droppingMessage) {
   EXPECT_TRUE(file_contains_substring(TestLogFileName, "messages dropped due to async logging"));
 }
 
+TEST_VM_F(AsyncLogTest, StallingModePreventsDroppedMessages) {
+  if (AsyncLogWriter::instance() == nullptr) {
+    return;
+  }
+  set_log_config(TestLogFileName, "logging=debug");
+  LogConfiguration::AsyncMode prev_mode = LogConfiguration::async_mode();
+  LogConfiguration::set_async_mode(LogConfiguration::AsyncMode::Off);
+  test_asynclog_drop_messages();
+  EXPECT_FALSE(file_contains_substring(TestLogFileName, "messages dropped due to async logging"));
+  LogConfiguration::set_async_mode(prev_mode);
+}
+
 TEST_VM_F(AsyncLogTest, stdoutOutput) {
   testing::internal::CaptureStdout();
 
diff --git a/test/hotspot/jtreg/runtime/logging/StressAsyncUL.java b/test/hotspot/jtreg/runtime/logging/StressAsyncUL.java
new file mode 100644
index 00000000000..1fa6ab76ec2
--- /dev/null
+++ b/test/hotspot/jtreg/runtime/logging/StressAsyncUL.java
@@ -0,0 +1,57 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact 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 async UL in dropping and stalling mode
+ * @requires vm.flagless
+ * @requires vm.debug
+ * @library /test/lib
+ * @modules java.base/jdk.internal.misc
+ * @run driver StressAsyncUL
+ */
+
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.process.ProcessTools;
+
+public class StressAsyncUL {
+    static void analyze_output(String... args) throws Exception {
+        ProcessBuilder pb =
+            ProcessTools.createLimitedTestJavaProcessBuilder(args);
+        OutputAnalyzer output = new OutputAnalyzer(pb.start());
+        output.shouldHaveExitValue(0);
+    }
+    public static void main(String[] args) throws Exception {
+        analyze_output("-Xlog:async:drop", "-Xlog:all=trace", InnerClass.class.getName());
+        analyze_output("-Xlog:async:stall", "-Xlog:all=trace", InnerClass.class.getName());
+        // Stress test with a very small buffer. Note: Any valid buffer size must be able to hold a flush token.
+        // Therefore the size of the buffer cannot be zero.
+        analyze_output("-Xlog:async:drop", "-Xlog:all=trace", "-XX:AsyncLogBufferSize=192", InnerClass.class.getName());
+        analyze_output("-Xlog:async:stall", "-Xlog:all=trace", "-XX:AsyncLogBufferSize=192", InnerClass.class.getName());
+    }
+
+    public static class InnerClass {
+        public static void main(String[] args) {
+        }
+    }
+}

From 0f82268134df65bbc65ecda158d25f708f18d150 Mon Sep 17 00:00:00 2001
From: Matthew Donovan <mdonovan@openjdk.org>
Date: Wed, 26 Feb 2025 14:14:33 +0000
Subject: [PATCH 137/587] 8345598: Upgrade NSS binaries for interop tests

Reviewed-by: weijun, rhalade
---
 test/jdk/sun/security/pkcs11/PKCS11Test.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/jdk/sun/security/pkcs11/PKCS11Test.java b/test/jdk/sun/security/pkcs11/PKCS11Test.java
index b624afd69fb..a371effc72f 100644
--- a/test/jdk/sun/security/pkcs11/PKCS11Test.java
+++ b/test/jdk/sun/security/pkcs11/PKCS11Test.java
@@ -82,7 +82,7 @@ public abstract class PKCS11Test {
 
     // Version of the NSS artifact. This coincides with the version of
     // the NSS version
-    private static final String NSS_BUNDLE_VERSION = "3.101";
+    private static final String NSS_BUNDLE_VERSION = "3.107";
     private static final String NSSLIB = "jpg.tests.jdk.nsslib";
 
     static double nss_version = -1;

From 2731712383937ce7213c4c2b89f8c041708a3f90 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hannes=20Walln=C3=B6fer?= <hannesw@openjdk.org>
Date: Wed, 26 Feb 2025 14:59:18 +0000
Subject: [PATCH 138/587] 8287749: Re-enable javadoc -serialwarn option

Reviewed-by: erikj
---
 make/Docs.gmk                 | 4 ++--
 make/scripts/genExceptions.sh | 4 +++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/make/Docs.gmk b/make/Docs.gmk
index be9efbdc370..49c97946f75 100644
--- a/make/Docs.gmk
+++ b/make/Docs.gmk
@@ -98,14 +98,14 @@ JAVA_WARNINGS_ARE_ERRORS ?= -Werror
 
 # The initial set of options for javadoc
 JAVADOC_OPTIONS := -use -keywords -notimestamp \
-    -encoding ISO-8859-1 -docencoding UTF-8 -breakiterator \
+    -serialwarn -encoding ISO-8859-1 -docencoding UTF-8 -breakiterator \
     -splitIndex --system none -javafx --expand-requires transitive \
     --override-methods=summary
 
 # The reference options must stay stable to allow for comparisons across the
 # development cycle.
 REFERENCE_OPTIONS := -XDignore.symbol.file=true -use -keywords -notimestamp \
-    -encoding ISO-8859-1 -breakiterator -splitIndex --system none \
+    -serialwarn -encoding ISO-8859-1 -breakiterator -splitIndex --system none \
     -html5 -javafx --expand-requires transitive
 
 # Should we add DRAFT stamps to the generated javadoc?
diff --git a/make/scripts/genExceptions.sh b/make/scripts/genExceptions.sh
index 4f6c0d9820b..7c191189827 100644
--- a/make/scripts/genExceptions.sh
+++ b/make/scripts/genExceptions.sh
@@ -1,6 +1,6 @@
 #! /bin/sh
 #
-# Copyright (c) 2000, 2021, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2000, 2025, Oracle and/or its affiliates. All rights reserved.
 # 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,6 +70,8 @@ __END__
 
     /**
      * The $ARG_PHRASE.
+     *
+     * @serial
      */
     private $ARG_TYPE $ARG_ID;
 

From bd112c4fab8c6b6a8181d4629009b6cb408727a1 Mon Sep 17 00:00:00 2001
From: Aleksey Shipilev <shade@openjdk.org>
Date: Wed, 26 Feb 2025 15:00:47 +0000
Subject: [PATCH 139/587] 8350443: GHA: Split static-libs-bundles into a
 separate job

Reviewed-by: ihse, yzheng
---
 .github/actions/upload-bundles/action.yml |  5 ++++-
 .github/workflows/build-linux.yml         | 20 ++++++++------------
 .github/workflows/main.yml                | 19 +++++++++++++++++++
 3 files changed, 31 insertions(+), 13 deletions(-)

diff --git a/.github/actions/upload-bundles/action.yml b/.github/actions/upload-bundles/action.yml
index 4e974ae58ba..30f4ac03c1e 100644
--- a/.github/actions/upload-bundles/action.yml
+++ b/.github/actions/upload-bundles/action.yml
@@ -32,6 +32,9 @@ inputs:
   debug-suffix:
     description: 'File name suffix denoting debug level, possibly empty'
     required: false
+  bundle-suffix:
+    description: 'Bundle name suffix, possibly empty'
+    required: false
 
 runs:
   using: composite
@@ -75,7 +78,7 @@ runs:
     - name: 'Upload bundles artifact'
       uses: actions/upload-artifact@v4
       with:
-        name: bundles-${{ inputs.platform }}${{ inputs.debug-suffix }}
+        name: bundles-${{ inputs.platform }}${{ inputs.debug-suffix }}${{ inputs.bundle-suffix }}
         path: bundles
         retention-days: 1
       if: steps.bundles.outputs.bundles-found == 'true'
diff --git a/.github/workflows/build-linux.yml b/.github/workflows/build-linux.yml
index b1d4278f8b4..101668b2bd5 100644
--- a/.github/workflows/build-linux.yml
+++ b/.github/workflows/build-linux.yml
@@ -61,6 +61,9 @@ on:
       make-arguments:
         required: false
         type: string
+      bundle-suffix:
+        required: false
+        type: string
 
 jobs:
   build-linux:
@@ -71,10 +74,6 @@ jobs:
       fail-fast: false
       matrix:
         debug-level: ${{ fromJSON(inputs.debug-levels) }}
-        include:
-          - debug-level: debug
-            flags: --with-debug-level=fastdebug
-            suffix: -debug
 
     steps:
       - name: 'Checkout the JDK source'
@@ -118,7 +117,7 @@ jobs:
         run: >
           bash configure
           --with-conf-name=${{ inputs.platform }}
-          ${{ matrix.flags }}
+          ${{ matrix.debug-level == 'debug' && '--with-debug-level=fastdebug' || '' }}
           --with-version-opt=${GITHUB_ACTOR}-${GITHUB_SHA}
           --with-boot-jdk=${{ steps.bootjdk.outputs.path }}
           --with-jtreg=${{ steps.jtreg.outputs.path }}
@@ -133,17 +132,14 @@ jobs:
       - name: 'Build'
         id: build
         uses: ./.github/actions/do-build
-        env:
-          # Only build static-libs-bundles for release builds.
-          # For debug builds, building static-libs often exceeds disk space.
-          STATIC_LIBS: ${{ matrix.debug-level == 'release' && 'static-libs-bundles' }}
         with:
-          make-target: '${{ inputs.make-target }} ${STATIC_LIBS} ${{ inputs.make-arguments }}'
+          make-target: '${{ inputs.make-target }} ${{ inputs.make-arguments }}'
           platform: ${{ inputs.platform }}
-          debug-suffix: '${{ matrix.suffix }}'
+          debug-suffix: "${{ matrix.debug-level == 'debug' && '-debug' || '' }}"
 
       - name: 'Upload bundles'
         uses: ./.github/actions/upload-bundles
         with:
           platform: ${{ inputs.platform }}
-          debug-suffix: '${{ matrix.suffix }}'
+          debug-suffix: "${{ matrix.debug-level == 'debug' && '-debug' || '' }}"
+          bundle-suffix: ${{ inputs.bundle-suffix }}
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 3ea07501477..2339bb390b9 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -225,6 +225,25 @@ jobs:
       make-arguments: ${{ github.event.inputs.make-arguments }}
     if: needs.prepare.outputs.linux-x64-variants == 'true'
 
+  build-linux-x64-static-libs:
+    name: linux-x64-static-libs
+    needs: prepare
+    uses: ./.github/workflows/build-linux.yml
+    with:
+      platform: linux-x64
+      make-target: 'static-libs-bundles'
+      # Only build static-libs-bundles for release builds.
+      # For debug builds, building static-libs often exceeds disk space.
+      debug-levels: '[ "release" ]'
+      gcc-major-version: '10'
+      configure-arguments: ${{ github.event.inputs.configure-arguments }}
+      make-arguments: ${{ github.event.inputs.make-arguments }}
+      # Upload static libs bundles separately to avoid interference with normal linux-x64 bundle.
+      # This bundle is not used by testing jobs, but downstreams use it to check that
+      # dependent projects, e.g. libgraal, builds fine.
+      bundle-suffix: "-static-libs"
+    if: needs.prepare.outputs.linux-x64-variants == 'true'
+
   build-linux-cross-compile:
     name: linux-cross-compile
     needs: prepare

From 3e46480dcfabf79b74cc371eaa84dce2e252f3da Mon Sep 17 00:00:00 2001
From: Thomas Stuefe <stuefe@openjdk.org>
Date: Wed, 26 Feb 2025 15:57:37 +0000
Subject: [PATCH 140/587] 8350770: [BACKOUT] Protection zone for easier
 detection of accidental zero-nKlass use

Reviewed-by: mdoerr, rkennke
---
 src/hotspot/share/cds/archiveBuilder.cpp      |  17 +-
 src/hotspot/share/cds/archiveBuilder.hpp      |  13 +-
 src/hotspot/share/cds/archiveUtils.cpp        |  55 +++--
 src/hotspot/share/cds/dynamicArchive.cpp      |   1 +
 src/hotspot/share/cds/filemap.hpp             |   2 +-
 src/hotspot/share/cds/metaspaceShared.cpp     |  92 +++-----
 src/hotspot/share/cds/metaspaceShared.hpp     |   1 -
 src/hotspot/share/include/cds.h               |   5 +-
 src/hotspot/share/memory/metaspace.cpp        |  41 ++--
 src/hotspot/share/oops/compressedKlass.cpp    |  29 +--
 src/hotspot/share/oops/compressedKlass.hpp    |  11 +-
 .../share/oops/compressedKlass.inline.hpp     |   6 +-
 src/hotspot/share/prims/whitebox.cpp          |  12 --
 src/hotspot/share/runtime/os.cpp              |   6 -
 .../AccessZeroNKlassHitsProtectionZone.java   | 203 ------------------
 test/lib/jdk/test/whitebox/WhiteBox.java      |   4 +-
 16 files changed, 98 insertions(+), 400 deletions(-)
 delete mode 100644 test/hotspot/jtreg/runtime/ErrorHandling/AccessZeroNKlassHitsProtectionZone.java

diff --git a/src/hotspot/share/cds/archiveBuilder.cpp b/src/hotspot/share/cds/archiveBuilder.cpp
index f093b9d8070..21e97457a87 100644
--- a/src/hotspot/share/cds/archiveBuilder.cpp
+++ b/src/hotspot/share/cds/archiveBuilder.cpp
@@ -153,6 +153,7 @@ void ArchiveBuilder::SourceObjList::relocate(int i, ArchiveBuilder* builder) {
 ArchiveBuilder::ArchiveBuilder() :
   _current_dump_region(nullptr),
   _buffer_bottom(nullptr),
+  _num_dump_regions_used(0),
   _requested_static_archive_bottom(nullptr),
   _requested_static_archive_top(nullptr),
   _requested_dynamic_archive_bottom(nullptr),
@@ -160,7 +161,6 @@ ArchiveBuilder::ArchiveBuilder() :
   _mapped_static_archive_bottom(nullptr),
   _mapped_static_archive_top(nullptr),
   _buffer_to_requested_delta(0),
-  _pz_region("pz", MAX_SHARED_DELTA), // protection zone -- used only during dumping; does NOT exist in cds archive.
   _rw_region("rw", MAX_SHARED_DELTA),
   _ro_region("ro", MAX_SHARED_DELTA),
   _ptrmap(mtClassShared),
@@ -323,14 +323,9 @@ address ArchiveBuilder::reserve_buffer() {
   _shared_rs = rs;
 
   _buffer_bottom = buffer_bottom;
-
-  if (CDSConfig::is_dumping_static_archive()) {
-    _current_dump_region = &_pz_region;
-    _current_dump_region->init(&_shared_rs, &_shared_vs);
-  } else {
-    _current_dump_region = &_rw_region;
-    _current_dump_region->init(&_shared_rs, &_shared_vs);
-  }
+  _current_dump_region = &_rw_region;
+  _num_dump_regions_used = 1;
+  _current_dump_region->init(&_shared_rs, &_shared_vs);
 
   ArchivePtrMarker::initialize(&_ptrmap, &_shared_vs);
 
@@ -371,8 +366,7 @@ address ArchiveBuilder::reserve_buffer() {
   if (CDSConfig::is_dumping_static_archive()) {
     // We don't want any valid object to be at the very bottom of the archive.
     // See ArchivePtrMarker::mark_pointer().
-    _pz_region.allocate(MetaspaceShared::protection_zone_size());
-    start_dump_region(&_rw_region);
+    rw_region()->allocate(16);
   }
 
   return buffer_bottom;
@@ -550,6 +544,7 @@ ArchiveBuilder::FollowMode ArchiveBuilder::get_follow_mode(MetaspaceClosure::Ref
 void ArchiveBuilder::start_dump_region(DumpRegion* next) {
   current_dump_region()->pack(next);
   _current_dump_region = next;
+  _num_dump_regions_used ++;
 }
 
 char* ArchiveBuilder::ro_strdup(const char* s) {
diff --git a/src/hotspot/share/cds/archiveBuilder.hpp b/src/hotspot/share/cds/archiveBuilder.hpp
index 5913ae29c78..e3efedd46f1 100644
--- a/src/hotspot/share/cds/archiveBuilder.hpp
+++ b/src/hotspot/share/cds/archiveBuilder.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2025, 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
@@ -96,6 +96,7 @@ class ArchiveBuilder : public StackObj {
 protected:
   DumpRegion* _current_dump_region;
   address _buffer_bottom;                      // for writing the contents of rw/ro regions
+  int _num_dump_regions_used;
 
   // These are the addresses where we will request the static and dynamic archives to be
   // mapped at run time. If the request fails (due to ASLR), we will map the archives at
@@ -209,12 +210,6 @@ private:
   ReservedSpace _shared_rs;
   VirtualSpace _shared_vs;
 
-  // The "pz" region is used only during static dumps to reserve an unused space between SharedBaseAddress and
-  // the bottom of the rw region. During runtime, this space will be filled with a reserved area that disallows
-  // read/write/exec, so we can track for bad CompressedKlassPointers encoding.
-  // Note: this region does NOT exist in the cds archive.
-  DumpRegion _pz_region;
-
   DumpRegion _rw_region;
   DumpRegion _ro_region;
 
@@ -275,6 +270,9 @@ private:
 
 protected:
   virtual void iterate_roots(MetaspaceClosure* it) = 0;
+
+  static const int _total_dump_regions = 2;
+
   void start_dump_region(DumpRegion* next);
 
 public:
@@ -369,7 +367,6 @@ public:
   void remember_embedded_pointer_in_enclosing_obj(MetaspaceClosure::Ref* ref);
   static void serialize_dynamic_archivable_items(SerializeClosure* soc);
 
-  DumpRegion* pz_region() { return &_pz_region; }
   DumpRegion* rw_region() { return &_rw_region; }
   DumpRegion* ro_region() { return &_ro_region; }
 
diff --git a/src/hotspot/share/cds/archiveUtils.cpp b/src/hotspot/share/cds/archiveUtils.cpp
index 7e04b6227f2..90eefd13d46 100644
--- a/src/hotspot/share/cds/archiveUtils.cpp
+++ b/src/hotspot/share/cds/archiveUtils.cpp
@@ -73,39 +73,34 @@ void ArchivePtrMarker::initialize(CHeapBitMap* ptrmap, VirtualSpace* vs) {
 }
 
 void ArchivePtrMarker::initialize_rw_ro_maps(CHeapBitMap* rw_ptrmap, CHeapBitMap* ro_ptrmap) {
-  address* buff_bottom = (address*)ArchiveBuilder::current()->buffer_bottom();
-  address* rw_bottom   = (address*)ArchiveBuilder::current()->rw_region()->base();
-  address* ro_bottom   = (address*)ArchiveBuilder::current()->ro_region()->base();
-
-  // The bit in _ptrmap that cover the very first word in the rw/ro regions.
-  size_t rw_start = rw_bottom - buff_bottom;
-  size_t ro_start = ro_bottom - buff_bottom;
-
-  // The number of bits used by the rw/ro ptrmaps. We might have lots of zero
-  // bits at the bottom and top of rrw/ro ptrmaps, but these zeros will be
-  // removed by FileMapInfo::write_bitmap_region().
-  size_t rw_size = ArchiveBuilder::current()->rw_region()->used() / sizeof(address);
-  size_t ro_size = ArchiveBuilder::current()->ro_region()->used() / sizeof(address);
-
-  // The last (exclusive) bit in _ptrmap that covers the rw/ro regions.
-  // Note: _ptrmap is dynamically expanded only when an actual pointer is written, so
-  // it may not be as large as we want.
-  size_t rw_end = MIN2<size_t>(rw_start + rw_size, _ptrmap->size());
-  size_t ro_end = MIN2<size_t>(ro_start + ro_size, _ptrmap->size());
-
-  rw_ptrmap->initialize(rw_size);
-  ro_ptrmap->initialize(ro_size);
-
-  for (size_t rw_bit = rw_start; rw_bit < rw_end; rw_bit++) {
-    rw_ptrmap->at_put(rw_bit - rw_start, _ptrmap->at(rw_bit));
-  }
-
-  for(size_t ro_bit = ro_start; ro_bit < ro_end; ro_bit++) {
-    ro_ptrmap->at_put(ro_bit - ro_start, _ptrmap->at(ro_bit));
-  }
+  address* rw_bottom = (address*)ArchiveBuilder::current()->rw_region()->base();
+  address* ro_bottom = (address*)ArchiveBuilder::current()->ro_region()->base();
 
   _rw_ptrmap = rw_ptrmap;
   _ro_ptrmap = ro_ptrmap;
+
+  size_t rw_size = ArchiveBuilder::current()->rw_region()->used() / sizeof(address);
+  size_t ro_size = ArchiveBuilder::current()->ro_region()->used() / sizeof(address);
+  // ro_start is the first bit in _ptrmap that covers the pointer that would sit at ro_bottom.
+  // E.g., if rw_bottom = (address*)100
+  //          ro_bottom = (address*)116
+  //       then for 64-bit platform:
+  //          ro_start = ro_bottom - rw_bottom = (116 - 100) / sizeof(address) = 2;
+  size_t ro_start = ro_bottom - rw_bottom;
+
+  // Note: ptrmap is big enough only to cover the last pointer in ro_region.
+  // See ArchivePtrMarker::compact()
+  _rw_ptrmap->initialize(rw_size);
+  _ro_ptrmap->initialize(_ptrmap->size() - ro_start);
+
+  for (size_t rw_bit = 0; rw_bit < _rw_ptrmap->size(); rw_bit++) {
+    _rw_ptrmap->at_put(rw_bit, _ptrmap->at(rw_bit));
+  }
+
+  for(size_t ro_bit = ro_start; ro_bit < _ptrmap->size(); ro_bit++) {
+    _ro_ptrmap->at_put(ro_bit-ro_start, _ptrmap->at(ro_bit));
+  }
+  assert(_ptrmap->size() - ro_start == _ro_ptrmap->size(), "must be");
 }
 
 void ArchivePtrMarker::mark_pointer(address* ptr_loc) {
diff --git a/src/hotspot/share/cds/dynamicArchive.cpp b/src/hotspot/share/cds/dynamicArchive.cpp
index bcec4146aeb..095b443af66 100644
--- a/src/hotspot/share/cds/dynamicArchive.cpp
+++ b/src/hotspot/share/cds/dynamicArchive.cpp
@@ -170,6 +170,7 @@ public:
 
     post_dump();
 
+    assert(_num_dump_regions_used == _total_dump_regions, "must be");
     verify_universe("After CDS dynamic dump");
   }
 
diff --git a/src/hotspot/share/cds/filemap.hpp b/src/hotspot/share/cds/filemap.hpp
index 52e8827a69a..25550d76d2a 100644
--- a/src/hotspot/share/cds/filemap.hpp
+++ b/src/hotspot/share/cds/filemap.hpp
@@ -400,7 +400,7 @@ public:
   // The offset of the (exclusive) end of the last core region in this archive, relative to SharedBaseAddress
   size_t mapping_end_offset()  const { return last_core_region()->mapping_end_offset(); }
 
-  char* mapped_base()    const { return header()->mapped_base_address();    }
+  char* mapped_base()    const { return first_core_region()->mapped_base(); }
   char* mapped_end()     const { return last_core_region()->mapped_end();   }
 
   // Non-zero if the archive needs to be mapped a non-default location due to ASLR.
diff --git a/src/hotspot/share/cds/metaspaceShared.cpp b/src/hotspot/share/cds/metaspaceShared.cpp
index e8866336b7a..2e5ebff456e 100644
--- a/src/hotspot/share/cds/metaspaceShared.cpp
+++ b/src/hotspot/share/cds/metaspaceShared.cpp
@@ -147,10 +147,6 @@ size_t MetaspaceShared::core_region_alignment() {
   return os::cds_core_region_alignment();
 }
 
-size_t MetaspaceShared::protection_zone_size() {
-  return os::cds_core_region_alignment();
-}
-
 static bool shared_base_valid(char* shared_base) {
   // We check user input for SharedBaseAddress at dump time.
 
@@ -1284,7 +1280,6 @@ MapArchiveResult MetaspaceShared::map_archives(FileMapInfo* static_mapinfo, File
 
   ReservedSpace total_space_rs, archive_space_rs, class_space_rs;
   MapArchiveResult result = MAP_ARCHIVE_OTHER_FAILURE;
-  size_t prot_zone_size = 0;
   char* mapped_base_address = reserve_address_space_for_archives(static_mapinfo,
                                                                  dynamic_mapinfo,
                                                                  use_requested_addr,
@@ -1296,29 +1291,14 @@ MapArchiveResult MetaspaceShared::map_archives(FileMapInfo* static_mapinfo, File
     log_debug(cds)("Failed to reserve spaces (use_requested_addr=%u)", (unsigned)use_requested_addr);
   } else {
 
-    if (Metaspace::using_class_space()) {
-      prot_zone_size = protection_zone_size();
-#ifdef ASSERT
-      // Before mapping the core regions into the newly established address space, we mark
-      // start and the end of the future protection zone with canaries. That way we easily
-      // catch mapping errors (accidentally mapping data into the future protection zone).
-      os::commit_memory(mapped_base_address, prot_zone_size, false);
-      *(mapped_base_address) = 'P';
-      *(mapped_base_address + prot_zone_size - 1) = 'P';
-#endif
-    }
-
 #ifdef ASSERT
     // Some sanity checks after reserving address spaces for archives
     //  and class space.
     assert(archive_space_rs.is_reserved(), "Sanity");
     if (Metaspace::using_class_space()) {
-      assert(archive_space_rs.base() == mapped_base_address &&
-          archive_space_rs.size() > protection_zone_size(),
-          "Archive space must lead and include the protection zone");
       // Class space must closely follow the archive space. Both spaces
       //  must be aligned correctly.
-      assert(class_space_rs.is_reserved() && class_space_rs.size() > 0,
+      assert(class_space_rs.is_reserved(),
              "A class space should have been reserved");
       assert(class_space_rs.base() >= archive_space_rs.end(),
              "class space should follow the cds archive space");
@@ -1331,9 +1311,8 @@ MapArchiveResult MetaspaceShared::map_archives(FileMapInfo* static_mapinfo, File
     }
 #endif // ASSERT
 
-    log_info(cds)("Reserved archive_space_rs [" INTPTR_FORMAT " - " INTPTR_FORMAT "] (%zu) bytes%s",
-                   p2i(archive_space_rs.base()), p2i(archive_space_rs.end()), archive_space_rs.size(),
-                   (prot_zone_size > 0 ? " (includes protection zone)" : ""));
+    log_info(cds)("Reserved archive_space_rs [" INTPTR_FORMAT " - " INTPTR_FORMAT "] (%zu) bytes",
+                   p2i(archive_space_rs.base()), p2i(archive_space_rs.end()), archive_space_rs.size());
     log_info(cds)("Reserved class_space_rs   [" INTPTR_FORMAT " - " INTPTR_FORMAT "] (%zu) bytes",
                    p2i(class_space_rs.base()), p2i(class_space_rs.end()), class_space_rs.size());
 
@@ -1405,40 +1384,38 @@ MapArchiveResult MetaspaceShared::map_archives(FileMapInfo* static_mapinfo, File
   if (result == MAP_ARCHIVE_SUCCESS) {
     SharedBaseAddress = (size_t)mapped_base_address;
 #ifdef _LP64
-    if (Metaspace::using_class_space()) {
-      assert(*(mapped_base_address) == 'P' &&
-             *(mapped_base_address + prot_zone_size - 1) == 'P',
-          "Protection zone was overwritten?");
+        if (Metaspace::using_class_space()) {
+          // Set up ccs in metaspace.
+          Metaspace::initialize_class_space(class_space_rs);
 
-      // Set up ccs in metaspace.
-      Metaspace::initialize_class_space(class_space_rs);
-
-      // Set up compressed Klass pointer encoding: the encoding range must
-      //  cover both archive and class space.
-      const address encoding_base = (address)mapped_base_address;
-      const address klass_range_start = encoding_base + prot_zone_size;
-      const size_t klass_range_size = (address)class_space_rs.end() - klass_range_start;
-      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 (including protection zone), shift should be the shift used at archive generation time.
-        CompressedKlassPointers::initialize_for_given_encoding(
-          klass_range_start, klass_range_size,
-          encoding_base, ArchiveBuilder::precomputed_narrow_klass_shift() // precomputed encoding, see ArchiveBuilder
-        );
-      } else {
-        // Let JVM freely chose encoding base and shift
-        CompressedKlassPointers::initialize(klass_range_start, klass_range_size);
-      }
-      CompressedKlassPointers::establish_protection_zone(encoding_base, prot_zone_size);
-
-      // 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();
-    }
+          // Set up compressed Klass pointer encoding: the encoding range must
+          //  cover both archive and class space.
+          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 || 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
+            );
+          } 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();
+        }
 #endif // _LP64
     log_info(cds)("initial optimized module handling: %s", CDSConfig::is_using_optimized_module_handling() ? "enabled" : "disabled");
     log_info(cds)("initial full module graph: %s", CDSConfig::is_using_full_module_graph() ? "enabled" : "disabled");
@@ -1520,6 +1497,7 @@ char* MetaspaceShared::reserve_address_space_for_archives(FileMapInfo* static_ma
   const size_t archive_space_alignment = core_region_alignment();
 
   // Size and requested location of the archive_space_rs (for both static and dynamic archives)
+  assert(static_mapinfo->mapping_base_offset() == 0, "Must be");
   size_t archive_end_offset  = (dynamic_mapinfo == nullptr) ? static_mapinfo->mapping_end_offset() : dynamic_mapinfo->mapping_end_offset();
   size_t archive_space_size = align_up(archive_end_offset, archive_space_alignment);
 
diff --git a/src/hotspot/share/cds/metaspaceShared.hpp b/src/hotspot/share/cds/metaspaceShared.hpp
index 27df816833c..6d5f273041a 100644
--- a/src/hotspot/share/cds/metaspaceShared.hpp
+++ b/src/hotspot/share/cds/metaspaceShared.hpp
@@ -139,7 +139,6 @@ public:
   // Alignment for the 2 core CDS regions (RW/RO) only.
   // (Heap region alignments are decided by GC).
   static size_t core_region_alignment();
-  static size_t protection_zone_size();
   static void rewrite_nofast_bytecodes_and_calculate_fingerprints(Thread* thread, InstanceKlass* ik);
   // print loaded classes names to file.
   static void dump_loaded_classes(const char* file_name, TRAPS);
diff --git a/src/hotspot/share/include/cds.h b/src/hotspot/share/include/cds.h
index 8819e4c00be..2a80dd68abd 100644
--- a/src/hotspot/share/include/cds.h
+++ b/src/hotspot/share/include/cds.h
@@ -70,10 +70,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 used for mapping the core regions. At that address the
-                              // zero nklass protection zone is established; following that (at offset
-                              // MetaspaceShared::protection_zone_size()) the lowest core region (rw for the
-                              // static archive) is is mapped.
+  char*   _mapped_base;       // Actually mapped address (null if this region is not mapped).
   bool    _in_reserved_space; // Is this region in a ReservedSpace
 } CDSFileMapRegion;
 
diff --git a/src/hotspot/share/memory/metaspace.cpp b/src/hotspot/share/memory/metaspace.cpp
index 2566c61188f..99d1d027db0 100644
--- a/src/hotspot/share/memory/metaspace.cpp
+++ b/src/hotspot/share/memory/metaspace.cpp
@@ -1,7 +1,7 @@
 /*
  * Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2017, 2021 SAP SE. All rights reserved.
- * Copyright (c) 2023, 2025, Red Hat, Inc. All rights reserved.
+ * Copyright (c) 2023, 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
@@ -37,7 +37,6 @@
 #include "memory/metaspace/chunkManager.hpp"
 #include "memory/metaspace/commitLimiter.hpp"
 #include "memory/metaspace/internalStats.hpp"
-#include "memory/metaspace/metachunk.hpp"
 #include "memory/metaspace/metaspaceCommon.hpp"
 #include "memory/metaspace/metaspaceContext.hpp"
 #include "memory/metaspace/metaspaceReporter.hpp"
@@ -805,37 +804,29 @@ void Metaspace::global_initialize() {
     // 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());
-
-    // After narrowKlass encoding scheme is decided: if the encoding base points to class space start,
-    // establish a protection zone. Accidentally decoding a zero nKlass ID and then using it will result
-    // in an immediate segmentation fault instead of a delayed error much later.
-    if (CompressedKlassPointers::base() == (address)rs.base()) {
-      // Let the protection zone be a whole commit granule. Otherwise, buddy allocator may later place neighboring
-      // chunks in the same granule, see that the granule is not yet committed, and commit it, which would replace
-      // the protection mapping and make the zone readable.
-      // Alternatively, we could commit the chunk right now, but that is a tiny bit more fiddly, since we are not
-      // fully set up yet at this point.
-      const size_t protzone_size = metaspace::Settings::commit_granule_bytes(); // granule size >= page size
-      const size_t protzone_wordsize = protzone_size / BytesPerWord;
-      const metaspace::chunklevel_t lvl = metaspace::chunklevel::level_fitting_word_size(protzone_wordsize);
-      metaspace::Metachunk* const chunk = MetaspaceContext::context_class()->cm()->get_chunk(lvl);
-      const address protzone = (address) chunk->base();
-      assert(protzone == (address)rs.base(), "The very first chunk should be located at the class space start?");
-      assert(chunk->word_size() == protzone_wordsize, "Weird chunk size");
-      CompressedKlassPointers::establish_protection_zone(protzone, protzone_size);
-    } else {
-      assert(CompressedKlassPointers::base() == nullptr, "Zero-based encoding expected");
-    }
-
   }
 
-#endif // _LP64
+#endif
 
   // Initialize non-class virtual space list, and its chunk manager:
   MetaspaceContext::initialize_nonclass_space_context();
 
   _tracer = new MetaspaceTracer();
 
+  // We must prevent the very first address of the ccs from being used to store
+  // metadata, since that address would translate to a narrow pointer of 0, and the
+  // VM does not distinguish between "narrow 0 as in null" and "narrow 0 as in start
+  //  of ccs".
+  // Before Elastic Metaspace that did not happen due to the fact that every Metachunk
+  // had a header and therefore could not allocate anything at offset 0.
+#ifdef _LP64
+  if (using_class_space()) {
+    // The simplest way to fix this is to allocate a tiny dummy chunk right at the
+    // start of ccs and do not use it for anything.
+    MetaspaceContext::context_class()->cm()->get_chunk(metaspace::chunklevel::HIGHEST_CHUNK_LEVEL);
+  }
+#endif
+
 #ifdef _LP64
   if (UseCompressedClassPointers) {
     // Note: "cds" would be a better fit but keep this for backward compatibility.
diff --git a/src/hotspot/share/oops/compressedKlass.cpp b/src/hotspot/share/oops/compressedKlass.cpp
index 1e00571ef60..fc8c0513ca0 100644
--- a/src/hotspot/share/oops/compressedKlass.cpp
+++ b/src/hotspot/share/oops/compressedKlass.cpp
@@ -42,7 +42,6 @@ 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;
-size_t CompressedKlassPointers::_protection_zone_size = 0;
 
 #ifdef _LP64
 
@@ -163,6 +162,11 @@ void CompressedKlassPointers::initialize_for_given_encoding(address addr, size_t
     vm_exit_during_initialization(ss.base());
   }
 
+  // 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");
+
   // Remember Klass range:
   _klass_range_start = addr;
   _klass_range_end = addr + len;
@@ -300,32 +304,9 @@ void CompressedKlassPointers::print_mode(outputStream* st) {
     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);
-    if (_protection_zone_size > 0) {
-      st->print_cr("Protection zone: " RANGEFMT, RANGEFMTARGS(_base, _protection_zone_size));
-    } else {
-      st->print_cr("No protection zone.");
-    }
   } else {
     st->print_cr("UseCompressedClassPointers off");
   }
 }
 
-// Protect a zone a the start of the encoding range
-void CompressedKlassPointers::establish_protection_zone(address addr, size_t size) {
-  assert(_protection_zone_size == 0, "just once");
-  assert(addr == base(), "Protection zone not at start of encoding range?");
-  assert(size > 0 && is_aligned(size, os::vm_page_size()), "Protection zone not page sized");
-  const bool rc = os::protect_memory((char*)addr, size, os::MEM_PROT_NONE, false);
-  assert(rc, "Failed to protect the Class space protection zone");
-  log_info(metaspace)("%s Narrow Klass Protection zone " RANGEFMT,
-      (rc ? "Established" : "FAILED to establish "),
-      RANGEFMTARGS(addr, size));
-  _protection_zone_size = size;
-}
-
-bool CompressedKlassPointers::is_in_protection_zone(address addr) {
-  return _protection_zone_size > 0 ?
-      (addr >= base() && addr < base() + _protection_zone_size) : false;
-}
-
 #endif // _LP64
diff --git a/src/hotspot/share/oops/compressedKlass.hpp b/src/hotspot/share/oops/compressedKlass.hpp
index 4ce644d9cef..dd54c8130eb 100644
--- a/src/hotspot/share/oops/compressedKlass.hpp
+++ b/src/hotspot/share/oops/compressedKlass.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -134,8 +134,6 @@ class CompressedKlassPointers : public AllStatic {
   static narrowKlass _lowest_valid_narrow_klass_id;
   static narrowKlass _highest_valid_narrow_klass_id;
 
-  // Protection zone size (0 if not set up)
-  static size_t _protection_zone_size;
 
   // 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);
@@ -233,7 +231,6 @@ public:
   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);
@@ -261,12 +258,6 @@ public:
         is_aligned(addr, klass_alignment_in_bytes());
   }
 
-  // Protect a zone a the start of the encoding range
-  static void establish_protection_zone(address addr, size_t size);
-
-  // Returns true if address points into protection zone (for error reporting)
-  static bool is_in_protection_zone(address addr);
-
 #if defined(AARCH64) && !defined(ZERO)
   // Check that with the given base, shift and range, aarch64 code can encode and decode the klass pointer.
   static bool check_klass_decode_mode(address base, int shift, const size_t range);
diff --git a/src/hotspot/share/oops/compressedKlass.inline.hpp b/src/hotspot/share/oops/compressedKlass.inline.hpp
index 94a78ed1894..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, 2025, 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
@@ -40,10 +40,6 @@ inline narrowKlass CompressedKlassPointers::encode_not_null_without_asserts(Klas
   return (narrowKlass)(pointer_delta(k, narrow_base, 1) >> shift);
 }
 
-inline Klass* CompressedKlassPointers::decode_not_null_without_asserts(narrowKlass v) {
-  return decode_not_null_without_asserts(v, base(), shift());
-}
-
 inline Klass* CompressedKlassPointers::decode_without_asserts(narrowKlass v) {
   return is_null(v) ? nullptr : decode_not_null_without_asserts(v, base(), shift());
 }
diff --git a/src/hotspot/share/prims/whitebox.cpp b/src/hotspot/share/prims/whitebox.cpp
index 84fa9d06a1c..dd5a23f9209 100644
--- a/src/hotspot/share/prims/whitebox.cpp
+++ b/src/hotspot/share/prims/whitebox.cpp
@@ -325,17 +325,6 @@ WB_ENTRY(void, WB_ReadFromNoaccessArea(JNIEnv* env, jobject o))
                 *(vs.low_boundary() - rhs.noaccess_prefix() / 2 ));
 WB_END
 
-WB_ENTRY(void, WB_DecodeNKlassAndAccessKlass(JNIEnv* env, jobject o, jint nKlass))
-  assert(UseCompressedClassPointers, "Should only call for UseCompressedClassPointers");
-  const narrowKlass nk = (narrowKlass)nKlass;
-  const Klass* const k = CompressedKlassPointers::decode_not_null_without_asserts(nKlass);
-  printf("WB_DecodeNKlassAndAccessKlass: nk %u k " PTR_FORMAT "\n", nk, p2i(k));
-  printf("Will attempt to crash now...\n");
-  fflush(stdout); // flush now - we will crash below
-  // Access k by calling a virtual function - will result in loading the vtable from *k
-  k->print_on(tty);
-WB_END
-
 static jint wb_stress_virtual_space_resize(size_t reserved_space_size,
                                            size_t magnitude, size_t iterations) {
   size_t granularity = os::vm_allocation_granularity();
@@ -2744,7 +2733,6 @@ static JNINativeMethod methods[] = {
       (void*)&WB_GetCompressedOopsMaxHeapSize},
   {CC"printHeapSizes",     CC"()V",                   (void*)&WB_PrintHeapSizes    },
   {CC"readFromNoaccessArea",CC"()V",                  (void*)&WB_ReadFromNoaccessArea},
-  {CC"decodeNKlassAndAccessKlass",CC"(I)V",            (void*)&WB_DecodeNKlassAndAccessKlass},
   {CC"stressVirtualSpaceResize",CC"(JJJ)I",           (void*)&WB_StressVirtualSpaceResize},
 #if INCLUDE_CDS
   {CC"getCDSOffsetForName0", CC"(Ljava/lang/String;)I",  (void*)&WB_GetCDSOffsetForName},
diff --git a/src/hotspot/share/runtime/os.cpp b/src/hotspot/share/runtime/os.cpp
index efff891c72f..d266b632ed1 100644
--- a/src/hotspot/share/runtime/os.cpp
+++ b/src/hotspot/share/runtime/os.cpp
@@ -1291,12 +1291,6 @@ void os::print_location(outputStream* st, intptr_t x, bool verbose) {
 
   bool accessible = is_readable_pointer(addr);
 
-  // Check if addr points into the narrow Klass protection zone
-  if (UseCompressedClassPointers && CompressedKlassPointers::is_in_protection_zone(addr)) {
-    st->print_cr(PTR_FORMAT " points into nKlass protection zone", p2i(addr));
-    return;
-  }
-
   // Check if addr is a JNI handle.
   if (align_down((intptr_t)addr, sizeof(intptr_t)) != 0 && accessible) {
     if (JNIHandles::is_global_handle((jobject) addr)) {
diff --git a/test/hotspot/jtreg/runtime/ErrorHandling/AccessZeroNKlassHitsProtectionZone.java b/test/hotspot/jtreg/runtime/ErrorHandling/AccessZeroNKlassHitsProtectionZone.java
deleted file mode 100644
index 2e70c1d8786..00000000000
--- a/test/hotspot/jtreg/runtime/ErrorHandling/AccessZeroNKlassHitsProtectionZone.java
+++ /dev/null
@@ -1,203 +0,0 @@
-/*
- * Copyright (c) 2025, Red Hat, Inc.
- * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact 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=no_coh_no_cds
- * @summary Test that dereferencing a Klass that is the result of a decode(0) crashes accessing the nKlass guard zone
- * @library /test/lib
- * @requires vm.bits == 64 & vm.debug == true
- * @requires vm.flagless
- * @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 driver AccessZeroNKlassHitsProtectionZone no_coh_no_cds
- */
-
-/*
- * @test id=no_coh_cds
- * @summary Test that dereferencing a Klass that is the result of a decode(0) crashes accessing the nKlass guard zone
- * @requires vm.bits == 64 & vm.debug == true & vm.flagless
- * @library /test/lib
- * @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 driver AccessZeroNKlassHitsProtectionZone no_coh_cds
- */
-
-/*
- * @test id=coh_no_cds
- * @summary Test that dereferencing a Klass that is the result of a decode(0) crashes accessing the nKlass guard zone
- * @requires vm.bits == 64 & vm.debug == true & vm.flagless
- * @library /test/lib
- * @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 driver AccessZeroNKlassHitsProtectionZone coh_no_cds
- */
-
-/*
- * @test id=coh_cds
- * @summary Test that dereferencing a Klass that is the result of a decode(0) crashes accessing the nKlass guard zone
- * @requires vm.bits == 64 & vm.debug == true & vm.flagless
- * @library /test/lib
- * @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 driver AccessZeroNKlassHitsProtectionZone coh_cds
- */
-
-import jdk.test.lib.process.OutputAnalyzer;
-import jdk.test.lib.process.ProcessTools;
-import jdk.test.whitebox.WhiteBox;
-import jtreg.SkippedException;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.regex.Pattern;
-
-// Test that dereferencing a Klass that is the result of a narrowKlass=0 will give us immediate crashes
-// that hit the protection zone at encoding base.
-public class AccessZeroNKlassHitsProtectionZone {
-
-    private static OutputAnalyzer run_test(boolean COH, boolean CDS, String forceBaseString) throws IOException, SkippedException {
-        ArrayList<String> args = new ArrayList<>();
-        args.add("-Xbootclasspath/a:.");
-        args.add("-XX:+UnlockDiagnosticVMOptions");
-        args.add("-XX:+WhiteBoxAPI");
-        args.add("-XX:CompressedClassSpaceSize=128m");
-        args.add("-Xmx128m");
-        args.add("-XX:-CreateCoredumpOnCrash");
-        args.add("-Xlog:metaspace*");
-        if (COH) {
-            args.add("-XX:+UnlockExperimentalVMOptions");
-            args.add("-XX:+UseCompactObjectHeaders");
-        }
-        if (CDS) {
-            args.add("-Xshare:on");
-        } else {
-            args.add("-Xshare:off");
-            args.add("-XX:CompressedClassSpaceBaseAddress=" + forceBaseString);
-        }
-        args.add(AccessZeroNKlassHitsProtectionZone.class.getName());
-        args.add("runwb");
-        ProcessBuilder pb = ProcessTools.createLimitedTestJavaProcessBuilder(args.toArray(new String[0]));
-
-        OutputAnalyzer output = new OutputAnalyzer(pb.start());
-        output.reportDiagnosticSummary();
-        return output;
-    }
-
-    private static void run_test(boolean COH, boolean CDS) throws IOException, SkippedException {
-        // Notes:
-        // We want to enforce zero-based encoding, to test the protection page in that case. For zero-based encoding,
-        // protection page is at address zero, no need to test that.
-        // If CDS is on, we never use zero-based, forceBase is ignored.
-        // If CDS is off, we use forceBase to (somewhat) reliably force the encoding base to beyond 32G,
-        // in order to prevent zero-based encoding. Since that may fail, we try several times.
-        OutputAnalyzer output = null;
-        long forceBase = -1;
-        if (CDS) {
-            output = run_test(COH, CDS, "");
-        } else {
-            long g4 = 0x1_0000_0000L;
-            long start = g4 * 8; // 32g
-            long step = g4;
-            long end = start + step * 16;
-            for (forceBase = start; forceBase < end; forceBase += step) {
-                String thisBaseString = String.format("0x%016X", forceBase).toLowerCase();
-                output = run_test(COH, CDS, thisBaseString);
-                if (output.contains("CompressedClassSpaceBaseAddress=" + thisBaseString + " given, but reserving class space failed.")) {
-                    // try next one
-                } else if (output.contains("Successfully forced class space address to " + thisBaseString)) {
-                    break;
-                } else {
-                    throw new RuntimeException("Unexpected");
-                }
-            }
-            if (forceBase >= end) {
-                throw new SkippedException("Failed to force ccs to any of the given bases. Skipping test.");
-            }
-        }
-
-        // Parse the encoding base from the output. In case of CDS, it depends on ASLR. Even in case of CDS=off, we want
-        // to double-check it is the force address.
-        String nKlassBaseString = output.firstMatch("Narrow klass base: 0x([0-9a-f]+)", 1);
-        if (nKlassBaseString == null) {
-            throw new RuntimeException("did not find Narrow klass base in log output");
-        }
-        long nKlassBase = Long.valueOf(nKlassBaseString, 16);
-
-        if (!CDS && nKlassBase != forceBase) {
-            throw new RuntimeException("Weird - we should have mapped at force base"); // .. otherwise we would have skipped out above
-        }
-        if (nKlassBase == 0) {
-            throw new RuntimeException("We should not be running zero-based at this point.");
-        }
-
-        // Calculate the expected crash address pattern. The precise crash address is unknown, but should be located
-        // in the lower part of the guard page following the encoding base. We just accept any address matching the
-        // upper 52 digits (leaving 4K = 12 bits = 4 nibbles of wiggle room)
-        String expectedCrashAddressString = nKlassBaseString.substring(0, nKlassBaseString.length() - 3);
-
-        // output from whitebox function: Klass* should point to encoding base
-        output.shouldMatch("WB_DecodeNKlassAndAccessKlass: nk 0 k 0x" + nKlassBaseString);
-
-        // Then, we should have crashed
-        output.shouldNotHaveExitValue(0);
-        output.shouldContain("# A fatal error has been detected");
-
-        // The hs-err file should contain a reference to the nKlass protection zone, like this:
-        // "RDI=0x0000000800000000 points into nKlass protection zone"
-        File hsErrFile = HsErrFileUtils.openHsErrFileFromOutput(output);
-
-        ArrayList<Pattern> hsErrPatternList = new ArrayList<>();
-        hsErrPatternList.add(Pattern.compile(".*(SIGBUS|SIGSEGV|EXCEPTION_ACCESS_VIOLATION).*"));
-
-        hsErrPatternList.add(Pattern.compile(".*siginfo:.*" + expectedCrashAddressString + ".*"));
-        hsErrPatternList.add(Pattern.compile(".*" + expectedCrashAddressString + ".*points into nKlass protection zone.*"));
-        Pattern[] hsErrPattern = hsErrPatternList.toArray(new Pattern[0]);
-        HsErrFileUtils.checkHsErrFileContent(hsErrFile, hsErrPattern, true);
-    }
-
-    enum Argument { runwb, no_coh_no_cds, no_coh_cds, coh_no_cds, coh_cds };
-    public static void main(String[] args) throws Exception {
-        if (args.length != 1) {
-            throw new RuntimeException("Expecting one argument");
-        }
-        Argument arg = Argument.valueOf(args[0]);
-        System.out.println(arg);
-        switch (arg) {
-            case runwb -> WhiteBox.getWhiteBox().decodeNKlassAndAccessKlass(0);
-            case no_coh_no_cds -> run_test(false, false);
-            case no_coh_cds -> run_test(false, true);
-            case coh_no_cds -> run_test(true, false);
-            case coh_cds -> run_test(true, true);
-        }
-    }
-}
diff --git a/test/lib/jdk/test/whitebox/WhiteBox.java b/test/lib/jdk/test/whitebox/WhiteBox.java
index c45aecbced5..be9bc646ce4 100644
--- a/test/lib/jdk/test/whitebox/WhiteBox.java
+++ b/test/lib/jdk/test/whitebox/WhiteBox.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2025, 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
@@ -642,8 +642,6 @@ public class WhiteBox {
   // Tests on ReservedSpace/VirtualSpace classes
   public native int stressVirtualSpaceResize(long reservedSpaceSize, long magnitude, long iterations);
   public native void readFromNoaccessArea();
-
-  public native void decodeNKlassAndAccessKlass(int nKlass);
   public native long getThreadStackSize();
   public native long getThreadRemainingStackSize();
 

From 9477c705c0bd5ce2d445abb5ca44d46656fc315f Mon Sep 17 00:00:00 2001
From: Brian Burkhalter <bpb@openjdk.org>
Date: Wed, 26 Feb 2025 16:24:25 +0000
Subject: [PATCH 141/587] 8024695: new File("").exists() returns false whereas
 it is the current working directory

Reviewed-by: alanb, rriggs, lancea
---
 src/java.base/share/classes/java/io/File.java |   3 +-
 .../share/classes/java/io/FileSystem.java     |  18 +-
 .../unix/classes/java/io/UnixFileSystem.java  |  41 +--
 .../classes/java/io/WinNTFileSystem.java      |  26 +-
 test/jdk/java/io/File/EmptyPath.java          | 267 ++++++++++++++++--
 5 files changed, 308 insertions(+), 47 deletions(-)

diff --git a/src/java.base/share/classes/java/io/File.java b/src/java.base/share/classes/java/io/File.java
index 7e31379002f..15e687ebf06 100644
--- a/src/java.base/share/classes/java/io/File.java
+++ b/src/java.base/share/classes/java/io/File.java
@@ -56,7 +56,8 @@ import jdk.internal.util.StaticProperty;
  * case of Microsoft Windows UNC pathnames, a hostname.  Each subsequent name
  * in an abstract pathname denotes a directory; the last name may denote
  * either a directory or a file.  The <em>empty</em> abstract pathname has no
- * prefix and an empty name sequence.
+ * prefix and an empty name sequence.  Accessing a file with the empty abstract
+ * pathname is equivalent to accessing the current user directory.
  *
  * <p> The conversion of a pathname string to or from an abstract pathname is
  * inherently system-dependent.  When an abstract pathname is converted into a
diff --git a/src/java.base/share/classes/java/io/FileSystem.java b/src/java.base/share/classes/java/io/FileSystem.java
index db480d931de..3596e0e842a 100644
--- a/src/java.base/share/classes/java/io/FileSystem.java
+++ b/src/java.base/share/classes/java/io/FileSystem.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -33,6 +33,22 @@ import java.lang.annotation.Native;
 
 abstract class FileSystem {
 
+    /* -- Current Working Directory --*/
+
+    /* lazy initialization of CWD object */
+    private static class CurrentWorkingDirectoryHolder {
+        static final File CURRENT_WORKING_DIRECTORY = currentWorkingDirectory();
+
+        private static final File currentWorkingDirectory() {
+            return new File(".");
+        }
+    }
+
+    /* CWD object accessor */
+    static File getCWD() {
+        return CurrentWorkingDirectoryHolder.CURRENT_WORKING_DIRECTORY;
+    }
+
     /* -- Normalization and construction -- */
 
     /**
diff --git a/src/java.base/unix/classes/java/io/UnixFileSystem.java b/src/java.base/unix/classes/java/io/UnixFileSystem.java
index ea2ca28fe86..5f9edcd4356 100644
--- a/src/java.base/unix/classes/java/io/UnixFileSystem.java
+++ b/src/java.base/unix/classes/java/io/UnixFileSystem.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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,18 @@ import java.util.Properties;
 import jdk.internal.util.StaticProperty;
 
 final class UnixFileSystem extends FileSystem {
-
     private final char slash;
     private final char colon;
     private final String userDir;
 
+    private String getPathForSysCalls(String path) {
+        return path.isEmpty() ? getCWD().getPath() : path;
+    }
+
+    private File getFileForSysCalls(File file) {
+        return file.getPath().isEmpty() ? getCWD() : file;
+    }
+
     UnixFileSystem() {
         Properties props = System.getProperties();
         slash = props.getProperty("file.separator").charAt(0);
@@ -154,7 +161,7 @@ final class UnixFileSystem extends FileSystem {
 
     @Override
     public String canonicalize(String path) throws IOException {
-        return canonicalize0(path);
+        return canonicalize0(getPathForSysCalls(path));
     }
     private native String canonicalize0(String path) throws IOException;
 
@@ -164,13 +171,13 @@ final class UnixFileSystem extends FileSystem {
 
     @Override
     public int getBooleanAttributes(File f) {
-        int rv = getBooleanAttributes0(f);
+        int rv = getBooleanAttributes0(getFileForSysCalls(f));
         return rv | isHidden(f);
     }
 
     @Override
     public boolean hasBooleanAttributes(File f, int attributes) {
-        int rv = getBooleanAttributes0(f);
+        int rv = getBooleanAttributes0(getFileForSysCalls(f));
         if ((attributes & BA_HIDDEN) != 0) {
             rv |= isHidden(f);
         }
@@ -183,25 +190,25 @@ final class UnixFileSystem extends FileSystem {
 
     @Override
     public boolean checkAccess(File f, int access) {
-        return checkAccess0(f, access);
+        return checkAccess0(getFileForSysCalls(f), access);
     }
     private native boolean checkAccess0(File f, int access);
 
     @Override
     public long getLastModifiedTime(File f) {
-        return getLastModifiedTime0(f);
+        return getLastModifiedTime0(getFileForSysCalls(f));
     }
     private native long getLastModifiedTime0(File f);
 
     @Override
     public long getLength(File f) {
-        return getLength0(f);
+        return getLength0(getFileForSysCalls(f));
     }
     private native long getLength0(File f);
 
     @Override
     public boolean setPermission(File f, int access, boolean enable, boolean owneronly) {
-        return setPermission0(f, access, enable, owneronly);
+        return setPermission0(getFileForSysCalls(f), access, enable, owneronly);
     }
     private native boolean setPermission0(File f, int access, boolean enable, boolean owneronly);
 
@@ -215,37 +222,37 @@ final class UnixFileSystem extends FileSystem {
 
     @Override
     public boolean delete(File f) {
-        return delete0(f);
+        return delete0(getFileForSysCalls(f));
     }
     private native boolean delete0(File f);
 
     @Override
     public String[] list(File f) {
-        return list0(f);
+        return list0(getFileForSysCalls(f));
     }
     private native String[] list0(File f);
 
     @Override
     public boolean createDirectory(File f) {
-        return createDirectory0(f);
+        return createDirectory0(getFileForSysCalls(f));
     }
     private native boolean createDirectory0(File f);
 
     @Override
     public boolean rename(File f1, File f2) {
-        return rename0(f1, f2);
+        return rename0(getFileForSysCalls(f1), getFileForSysCalls(f2));
     }
     private native boolean rename0(File f1, File f2);
 
     @Override
     public boolean setLastModifiedTime(File f, long time) {
-        return setLastModifiedTime0(f, time);
+        return setLastModifiedTime0(getFileForSysCalls(f), time);
     }
     private native boolean setLastModifiedTime0(File f, long time);
 
     @Override
     public boolean setReadOnly(File f) {
-        return setReadOnly0(f);
+        return setReadOnly0(getFileForSysCalls(f));
     }
     private native boolean setReadOnly0(File f);
 
@@ -260,7 +267,7 @@ final class UnixFileSystem extends FileSystem {
 
     @Override
     public long getSpace(File f, int t) {
-        return getSpace0(f, t);
+        return getSpace0(getFileForSysCalls(f), t);
     }
     private native long getSpace0(File f, int t);
 
@@ -270,7 +277,7 @@ final class UnixFileSystem extends FileSystem {
 
     @Override
     public int getNameMax(String path) {
-        long nameMax = getNameMax0(path);
+        long nameMax = getNameMax0(getPathForSysCalls(path));
         if (nameMax > Integer.MAX_VALUE) {
             nameMax = Integer.MAX_VALUE;
         }
diff --git a/src/java.base/windows/classes/java/io/WinNTFileSystem.java b/src/java.base/windows/classes/java/io/WinNTFileSystem.java
index dd567be1827..3f383187517 100644
--- a/src/java.base/windows/classes/java/io/WinNTFileSystem.java
+++ b/src/java.base/windows/classes/java/io/WinNTFileSystem.java
@@ -79,6 +79,14 @@ final class WinNTFileSystem extends FileSystem {
         return path;
     }
 
+    private String getPathForWin32Calls(String path) {
+        return (path != null && path.isEmpty()) ? getCWD().getPath() : path;
+    }
+
+    private File getFileForWin32Calls(File file) {
+        return file.getPath().isEmpty() ? getCWD() : file;
+    }
+
     WinNTFileSystem() {
         Properties props = System.getProperties();
         slash = props.getProperty("file.separator").charAt(0);
@@ -495,31 +503,31 @@ final class WinNTFileSystem extends FileSystem {
 
     @Override
     public int getBooleanAttributes(File f) {
-        return getBooleanAttributes0(f);
+        return getBooleanAttributes0(getFileForWin32Calls(f));
     }
     private native int getBooleanAttributes0(File f);
 
     @Override
     public boolean checkAccess(File f, int access) {
-        return checkAccess0(f, access);
+        return checkAccess0(getFileForWin32Calls(f), access);
     }
     private native boolean checkAccess0(File f, int access);
 
     @Override
     public long getLastModifiedTime(File f) {
-        return getLastModifiedTime0(f);
+        return getLastModifiedTime0(getFileForWin32Calls(f));
     }
     private native long getLastModifiedTime0(File f);
 
     @Override
     public long getLength(File f) {
-        return getLength0(f);
+        return getLength0(getFileForWin32Calls(f));
     }
     private native long getLength0(File f);
 
     @Override
     public boolean setPermission(File f, int access, boolean enable, boolean owneronly) {
-        return setPermission0(f, access, enable, owneronly);
+        return setPermission0(getFileForWin32Calls(f), access, enable, owneronly);
     }
     private native boolean setPermission0(File f, int access, boolean enable, boolean owneronly);
 
@@ -533,7 +541,7 @@ final class WinNTFileSystem extends FileSystem {
 
     @Override
     public String[] list(File f) {
-        return list0(f);
+        return list0(getFileForWin32Calls(f));
     }
     private native String[] list0(File f);
 
@@ -545,7 +553,7 @@ final class WinNTFileSystem extends FileSystem {
 
     @Override
     public boolean setLastModifiedTime(File f, long time) {
-        return setLastModifiedTime0(f, time);
+        return setLastModifiedTime0(getFileForWin32Calls(f), time);
     }
     private native boolean setLastModifiedTime0(File f, long time);
 
@@ -591,7 +599,7 @@ final class WinNTFileSystem extends FileSystem {
             // that free space <= total space
             if (t == SPACE_FREE)
                 t = SPACE_USABLE;
-            return getSpace0(f, t);
+            return getSpace0(getFileForWin32Calls(f), t);
         }
         return 0;
     }
@@ -618,7 +626,7 @@ final class WinNTFileSystem extends FileSystem {
                 }
             }
         }
-        return getNameMax0(s);
+        return getNameMax0(getPathForWin32Calls(s));
     }
 
     @Override
diff --git a/test/jdk/java/io/File/EmptyPath.java b/test/jdk/java/io/File/EmptyPath.java
index 57da428d760..d3211f917dd 100644
--- a/test/jdk/java/io/File/EmptyPath.java
+++ b/test/jdk/java/io/File/EmptyPath.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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,257 @@
  */
 
 /* @test
-   @bug 4842706
-   @summary Test some file operations with empty path
+ * @bug 4842706 8024695
+ * @summary Test some file operations with empty path
+ * @run junit EmptyPath
  */
 
-import java.io.*;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.FileStore;
+import java.nio.file.Path;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Set;
+
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+
+import org.junit.jupiter.api.condition.DisabledOnOs;
+import org.junit.jupiter.api.condition.EnabledOnOs;
+import org.junit.jupiter.api.condition.OS;
+
+import static org.junit.jupiter.api.Assertions.*;
 
 public class EmptyPath {
-    public static void main(String [] args) throws Exception {
-        File f = new File("");
-        f.mkdir();
-        try {
-            f.createNewFile();
-            throw new RuntimeException("Expected exception not thrown");
-        } catch (IOException ioe) {
-            // Correct result
-        }
-        try {
-            FileInputStream fis = new FileInputStream(f);
-            fis.close();
-            throw new RuntimeException("Expected exception not thrown");
-        } catch (FileNotFoundException fnfe) {
-            // Correct result
+    private static final String EMPTY_STRING = "";
+
+    static File f;
+    static Path p;
+
+    @BeforeAll
+    public static void init() {
+        f = new File(EMPTY_STRING);
+        p = Path.of(EMPTY_STRING);
+    }
+
+    @Test
+    public void canExecute() {
+        assertTrue(f.canExecute());
+    }
+
+    @Test
+    public void canRead() {
+        assertTrue(f.canRead());
+    }
+
+    @Test
+    public void canWrite() {
+        assertTrue(f.canWrite());
+    }
+
+    @Test
+    public void compareTo() {
+        assertEquals(0, f.compareTo(p.toFile()));
+    }
+
+    @Test
+    public void createNewFile() {
+        assertThrows(IOException.class, () -> f.createNewFile());
+    }
+
+    @Test
+    public void open() throws FileNotFoundException {
+        assertThrows(FileNotFoundException.class,
+                     () -> new FileInputStream(f));
+    }
+
+    @Test
+    public void delete() {
+        assertFalse(f.delete());
+    }
+
+    @Test
+    public void equals() {
+        assertTrue(f.equals(p.toFile()));
+    }
+
+    @Test
+    public void exists() {
+        assertTrue(f.exists());
+    }
+
+    @Test
+    public void getAbsolutePath() {
+        System.out.println(p.toAbsolutePath().toString() + "\n" +
+                           f.getAbsolutePath());
+        assertEquals(p.toAbsolutePath().toString(), f.getAbsolutePath());
+    }
+
+    private void checkSpace(long expected, long actual) {
+        if (expected == 0) {
+            assertEquals(0L, actual);
+        } else {
+            assertTrue(actual > 0);
         }
     }
+
+    @Test
+    public void getFreeSpace() throws IOException {
+        FileStore fs = Files.getFileStore(f.toPath());
+        checkSpace(fs.getUnallocatedSpace(), f.getFreeSpace());
+    }
+
+    @Test
+    public void getName() {
+        assertEquals(p.getFileName().toString(), f.getName());
+    }
+
+    @Test
+    public void getParent() {
+        assertNull(f.getParent());
+    }
+
+    @Test
+    public void getPath() {
+        assertEquals(p.toString(), f.getPath());
+    }
+
+    @Test
+    public void getTotalSpace() throws IOException {
+        FileStore fs = Files.getFileStore(f.toPath());
+        checkSpace(fs.getTotalSpace(), f.getTotalSpace());
+    }
+
+    @Test
+    public void getUsableSpace() throws IOException {
+        FileStore fs = Files.getFileStore(f.toPath());
+        checkSpace(fs.getUsableSpace(), f.getUsableSpace());
+    }
+
+    @Test
+    public void isNotAbsolute() {
+        assertFalse(f.isAbsolute());
+    }
+
+    @Test
+    public void isAbsolute() {
+        assertTrue(f.getAbsoluteFile().isAbsolute());
+    }
+
+    @Test
+    public void isDirectory() {
+        assertTrue(f.isDirectory());
+    }
+
+    @Test
+    public void isFile() {
+        assertFalse(f.isFile());
+    }
+
+    @Test
+    public void isHidden() {
+        assertFalse(f.isHidden());
+    }
+
+    @Test
+    public void lastModified() {
+        assertTrue(f.lastModified() > 0);
+    }
+
+    @Test
+    public void length() throws IOException {
+        assertEquals(Files.size(f.toPath()), f.length());
+    }
+
+    @Test
+    public void list() throws IOException {
+        String[] files = f.list();
+        assertNotNull(files);
+        Set<String> ioSet = new HashSet(Arrays.asList(files));
+        Set<String> nioSet = new HashSet();
+        Files.list(p).forEach((x) -> nioSet.add(x.toString()));
+        assertEquals(nioSet, ioSet);
+    }
+
+    @Test
+    public void mkdir() {
+        assertFalse(f.mkdir());
+    }
+
+    @Test
+    public void setLastModified() {
+        long t0 = f.lastModified();
+        long t = System.currentTimeMillis();
+        try {
+            assertTrue(f.setLastModified(t));
+            assertEquals(t, f.lastModified());
+            assertTrue(f.setLastModified(t0));
+            assertEquals(t0, f.lastModified());
+        } finally {
+            f.setLastModified(t0);
+        }
+    }
+
+    // Note: Testing File.setExecutable is omitted because calling
+    // File.setExecutable(false) makes it impossible to set the CWD to
+    // executable again which makes subsequent tests fail
+
+    @Test
+    @DisabledOnOs({OS.WINDOWS})
+    public void setReadable() {
+        assertTrue(f.canRead());
+        try {
+            assertTrue(f.setReadable(false));
+            assertFalse(f.canRead());
+            assertTrue(f.setReadable(true));
+            assertTrue(f.canRead());
+        } finally {
+            f.setReadable(true);
+        }
+    }
+
+    @Test
+    @DisabledOnOs({OS.WINDOWS})
+    public void setReadOnly() {
+        assertTrue(f.canExecute());
+        assertTrue(f.canRead());
+        assertTrue(f.canWrite());
+        try {
+            assertTrue(f.setReadOnly());
+            assertTrue(f.canRead());
+            assertFalse(f.canWrite());
+            assertTrue(f.setWritable(true, true));
+            assertTrue(f.canWrite());
+        } finally {
+            f.setWritable(true, true);
+        }
+    }
+
+    @Test
+    @DisabledOnOs({OS.WINDOWS})
+    public void setWritable() {
+        assertTrue(f.canWrite());
+        try {
+            assertTrue(f.setWritable(false, true));
+            assertFalse(f.canWrite());
+            assertTrue(f.setWritable(true, true));
+            assertTrue(f.canWrite());
+        } finally {
+            f.setWritable(true, true);
+        }
+    }
+
+    @Test
+    public void toPath() {
+        assertEquals(p, f.toPath());
+    }
+
+    @Test
+    public void toURI() {
+        assertEquals(f.toPath().toUri(), f.toURI());
+    }
 }

From ec6624b54eaf5c0f94bd760d2e9fa8b55717c350 Mon Sep 17 00:00:00 2001
From: Aleksey Shipilev <shade@openjdk.org>
Date: Wed, 26 Feb 2025 16:41:16 +0000
Subject: [PATCH 142/587] 8350649: Class unloading accesses/resurrects dead
 Java mirror after JDK-8346567

Reviewed-by: coleenp, egahlin
---
 .../share/jfr/recorder/checkpoint/types/jfrTypeSet.cpp     | 2 +-
 src/hotspot/share/oops/klass.hpp                           | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/hotspot/share/jfr/recorder/checkpoint/types/jfrTypeSet.cpp b/src/hotspot/share/jfr/recorder/checkpoint/types/jfrTypeSet.cpp
index 8128674dc1e..b9dcd7a3694 100644
--- a/src/hotspot/share/jfr/recorder/checkpoint/types/jfrTypeSet.cpp
+++ b/src/hotspot/share/jfr/recorder/checkpoint/types/jfrTypeSet.cpp
@@ -347,7 +347,7 @@ static void do_write_klass(JfrCheckpointWriter* writer, CldPtr cld, KlassPtr kla
   writer->write(cld != nullptr ? cld_id(cld, leakp) : 0);
   writer->write(mark_symbol(klass, leakp));
   writer->write(package_id(klass, leakp));
-  writer->write(klass->modifier_flags());
+  writer->write(klass->compute_modifier_flags());
   writer->write<bool>(klass->is_hidden());
   if (leakp) {
     assert(IS_LEAKP(klass), "invariant");
diff --git a/src/hotspot/share/oops/klass.hpp b/src/hotspot/share/oops/klass.hpp
index e7631f9dfe3..87f85dab956 100644
--- a/src/hotspot/share/oops/klass.hpp
+++ b/src/hotspot/share/oops/klass.hpp
@@ -749,9 +749,14 @@ public:
   virtual void release_C_heap_structures(bool release_constant_pool = true);
 
  public:
-  virtual u2 compute_modifier_flags() const = 0;
+  // Get modifier flags from Java mirror cache.
   int modifier_flags() const;
 
+  // Compute modifier flags from the original data. This also allows
+  // accessing flags when Java mirror is already dead, e.g. during class
+  // unloading.
+  virtual u2 compute_modifier_flags() const = 0;
+
   // JVMTI support
   virtual jint jvmti_class_status() const;
 

From 9ec46968fbfddf99a8349cb6903d24b1c2fdaf1d Mon Sep 17 00:00:00 2001
From: Xiaolong Peng <xpeng@openjdk.org>
Date: Wed, 26 Feb 2025 17:29:12 +0000
Subject: [PATCH 143/587] 8350313: Include timings for leaving safepoint in
 safepoint logging

Reviewed-by: shade, dholmes
---
 src/hotspot/share/runtime/safepoint.cpp | 15 ++++++++++++---
 src/hotspot/share/runtime/safepoint.hpp |  2 ++
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/src/hotspot/share/runtime/safepoint.cpp b/src/hotspot/share/runtime/safepoint.cpp
index e6f3b84945b..6f86aa09d95 100644
--- a/src/hotspot/share/runtime/safepoint.cpp
+++ b/src/hotspot/share/runtime/safepoint.cpp
@@ -468,6 +468,8 @@ void SafepointSynchronize::disarm_safepoint() {
 // operation has been carried out
 void SafepointSynchronize::end() {
   assert(Threads_lock->owned_by_self(), "must hold Threads_lock");
+  SafepointTracing::leave();
+
   EventSafepointEnd event;
   assert(Thread::current()->is_VM_thread(), "Only VM thread can execute a safepoint");
 
@@ -862,6 +864,7 @@ void ThreadSafepointState::handle_polling_page_exception() {
 
 jlong SafepointTracing::_last_safepoint_begin_time_ns = 0;
 jlong SafepointTracing::_last_safepoint_sync_time_ns = 0;
+jlong SafepointTracing::_last_safepoint_leave_time_ns = 0;
 jlong SafepointTracing::_last_safepoint_end_time_ns = 0;
 jlong SafepointTracing::_last_app_time_ns = 0;
 int SafepointTracing::_nof_threads = 0;
@@ -963,6 +966,10 @@ void SafepointTracing::synchronized(int nof_threads, int nof_running, int traps)
   RuntimeService::record_safepoint_synchronized(_last_safepoint_sync_time_ns - _last_safepoint_begin_time_ns);
 }
 
+void SafepointTracing::leave() {
+  _last_safepoint_leave_time_ns = os::javaTimeNanos();
+}
+
 void SafepointTracing::end() {
   _last_safepoint_end_time_ns = os::javaTimeNanos();
 
@@ -981,12 +988,14 @@ void SafepointTracing::end() {
      "Time since last: " JLONG_FORMAT " ns, "
      "Reaching safepoint: " JLONG_FORMAT " ns, "
      "At safepoint: " JLONG_FORMAT " ns, "
+     "Leaving safepoint: " JLONG_FORMAT " ns, "
      "Total: " JLONG_FORMAT " ns",
       VM_Operation::name(_current_type),
       _last_app_time_ns,
-      _last_safepoint_sync_time_ns    - _last_safepoint_begin_time_ns,
-      _last_safepoint_end_time_ns     - _last_safepoint_sync_time_ns,
-      _last_safepoint_end_time_ns     - _last_safepoint_begin_time_ns
+      _last_safepoint_sync_time_ns  - _last_safepoint_begin_time_ns,
+      _last_safepoint_leave_time_ns - _last_safepoint_sync_time_ns,
+      _last_safepoint_end_time_ns   - _last_safepoint_leave_time_ns,
+      _last_safepoint_end_time_ns   - _last_safepoint_begin_time_ns
      );
 
   RuntimeService::record_safepoint_end(_last_safepoint_end_time_ns - _last_safepoint_sync_time_ns);
diff --git a/src/hotspot/share/runtime/safepoint.hpp b/src/hotspot/share/runtime/safepoint.hpp
index 93ede70c6ac..190095ec30b 100644
--- a/src/hotspot/share/runtime/safepoint.hpp
+++ b/src/hotspot/share/runtime/safepoint.hpp
@@ -230,6 +230,7 @@ private:
   // Absolute
   static jlong _last_safepoint_begin_time_ns;
   static jlong _last_safepoint_sync_time_ns;
+  static jlong _last_safepoint_leave_time_ns;
   static jlong _last_safepoint_end_time_ns;
 
   // Relative
@@ -251,6 +252,7 @@ public:
 
   static void begin(VM_Operation::VMOp_Type type);
   static void synchronized(int nof_threads, int nof_running, int traps);
+  static void leave();
   static void end();
 
   static void statistics_exit_log();

From e43960a0170bf29b28ff4733e1c8c927947fb0bb Mon Sep 17 00:00:00 2001
From: David Holmes <dholmes@openjdk.org>
Date: Wed, 26 Feb 2025 20:14:11 +0000
Subject: [PATCH 144/587] 8350616: Skip ValidateHazardPtrsClosure in non-debug
 builds

Reviewed-by: kbarrett, tschatzl, shade
---
 src/hotspot/share/runtime/threadSMR.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/hotspot/share/runtime/threadSMR.cpp b/src/hotspot/share/runtime/threadSMR.cpp
index 0a420590fad..bcfd950ee39 100644
--- a/src/hotspot/share/runtime/threadSMR.cpp
+++ b/src/hotspot/share/runtime/threadSMR.cpp
@@ -366,6 +366,7 @@ class ScanHazardPtrPrintMatchingThreadsClosure : public ThreadClosure {
   }
 };
 
+#ifdef ASSERT
 // Closure to validate hazard ptrs.
 //
 class ValidateHazardPtrsClosure : public ThreadClosure {
@@ -386,6 +387,7 @@ class ValidateHazardPtrsClosure : public ThreadClosure {
            p2i(thread));
   }
 };
+#endif
 
 // Closure to determine if the specified JavaThread is found by
 // threads_do().
@@ -950,8 +952,10 @@ void ThreadsSMRSupport::free_list(ThreadsList* threads) {
     log_debug(thread, smr)("tid=%zu: ThreadsSMRSupport::free_list: threads=" INTPTR_FORMAT " is not freed.", os::current_thread_id(), p2i(threads));
   }
 
+#ifdef ASSERT
   ValidateHazardPtrsClosure validate_cl;
   threads_do(&validate_cl);
+#endif
 
   delete scan_table;
 }

From 78c18cfbcee92ba170810582e238b40b64805e5a Mon Sep 17 00:00:00 2001
From: Jiangli Zhou <jiangli@openjdk.org>
Date: Wed, 26 Feb 2025 23:23:42 +0000
Subject: [PATCH 145/587] 8349399: GHA: Add static-jdk build on linux-x64

Reviewed-by: shade, ihse
---
 .github/workflows/main.yml | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 2339bb390b9..8dce1d214dc 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -225,6 +225,24 @@ jobs:
       make-arguments: ${{ github.event.inputs.make-arguments }}
     if: needs.prepare.outputs.linux-x64-variants == 'true'
 
+  build-linux-x64-static:
+    name: linux-x64-static
+    needs: prepare
+    uses: ./.github/workflows/build-linux.yml
+    with:
+      platform: linux-x64
+      make-target: 'static-jdk-image'
+      # There are issues with fastdebug static build in GHA due to space limit.
+      # Only do release build for now.
+      debug-levels: '[ "release" ]'
+      gcc-major-version: '10'
+      configure-arguments: ${{ github.event.inputs.configure-arguments }}
+      make-arguments: ${{ github.event.inputs.make-arguments }}
+      # It currently doesn't produce any bundles, but probably will do in
+      # the future.
+      bundle-suffix: "-static"
+    if: needs.prepare.outputs.linux-x64 == 'true'
+
   build-linux-x64-static-libs:
     name: linux-x64-static-libs
     needs: prepare

From b29f8b04780bffff2b25acb95f22b4fdf83f3724 Mon Sep 17 00:00:00 2001
From: SendaoYan <syan@openjdk.org>
Date: Thu, 27 Feb 2025 06:15:59 +0000
Subject: [PATCH 146/587] 8350665: SIZE_FORMAT_HEX macro undefined in gtest

Reviewed-by: coleenp, stuefe
---
 test/hotspot/gtest/runtime/test_virtualMemoryTracker.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/hotspot/gtest/runtime/test_virtualMemoryTracker.cpp b/test/hotspot/gtest/runtime/test_virtualMemoryTracker.cpp
index 83ecb39b7ef..2985dd7438d 100644
--- a/test/hotspot/gtest/runtime/test_virtualMemoryTracker.cpp
+++ b/test/hotspot/gtest/runtime/test_virtualMemoryTracker.cpp
@@ -58,9 +58,9 @@ namespace {
 
 static void diagnostic_print(ReservedMemoryRegion* rmr) {
   CommittedRegionIterator iter = rmr->iterate_committed_regions();
-  LOG("In reserved region " PTR_FORMAT ", size " SIZE_FORMAT_HEX ":", p2i(rmr->base()), rmr->size());
+  LOG("In reserved region " PTR_FORMAT ", size 0x%zx:", p2i(rmr->base()), rmr->size());
   for (const CommittedMemoryRegion* region = iter.next(); region != nullptr; region = iter.next()) {
-    LOG("   committed region: " PTR_FORMAT ", size " SIZE_FORMAT_HEX, p2i(region->base()), region->size());
+    LOG("   committed region: " PTR_FORMAT ", size 0x%zx", p2i(region->base()), region->size());
   }
 }
 

From bb48b7319c020f9bb135c0bdf3e8809d0314c837 Mon Sep 17 00:00:00 2001
From: SendaoYan <syan@openjdk.org>
Date: Thu, 27 Feb 2025 06:16:57 +0000
Subject: [PATCH 147/587] 8350723: RISC-V: debug.cpp help() is missing riscv
 line for pns

Reviewed-by: fyang
---
 src/hotspot/share/utilities/debug.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/hotspot/share/utilities/debug.cpp b/src/hotspot/share/utilities/debug.cpp
index 2d57df4ffe6..9413f1f72d7 100644
--- a/src/hotspot/share/utilities/debug.cpp
+++ b/src/hotspot/share/utilities/debug.cpp
@@ -625,6 +625,7 @@ void help() {
   tty->print_cr("                   pns($sp, $fp, $pc)  on Linux/AArch64 or");
   tty->print_cr("                   pns($sp, 0, $pc)    on Linux/ppc64 or");
   tty->print_cr("                   pns($sp, $s8, $pc)  on Linux/mips or");
+  tty->print_cr("                   pns($sp, $fp, $pc)  on Linux/RISC-V");
   tty->print_cr("                 - in gdb do 'set overload-resolution off' before calling pns()");
   tty->print_cr("                 - in dbx do 'frame 1' before calling pns()");
   tty->print_cr("class metadata.");

From 885338b5f38ed05d8b91efc0178b371f2f89310e Mon Sep 17 00:00:00 2001
From: Emanuel Peter <epeter@openjdk.org>
Date: Thu, 27 Feb 2025 06:58:43 +0000
Subject: [PATCH 148/587] 8323582: C2 SuperWord AlignVector: misaligned vector
 memory access with unaligned native memory

Reviewed-by: roland, kvn
---
 src/hotspot/share/jvmci/vmStructs_jvmci.cpp   |   1 +
 src/hotspot/share/opto/c2_globals.hpp         |   6 +
 src/hotspot/share/opto/cfgnode.hpp            |   2 +-
 src/hotspot/share/opto/classes.hpp            |   1 +
 src/hotspot/share/opto/graphKit.cpp           |   1 +
 src/hotspot/share/opto/ifnode.cpp             |   6 +-
 src/hotspot/share/opto/loopTransform.cpp      |  33 +-
 src/hotspot/share/opto/loopUnswitch.cpp       | 369 +++++++++++++++---
 src/hotspot/share/opto/loopnode.cpp           |  38 +-
 src/hotspot/share/opto/loopnode.hpp           |  41 +-
 src/hotspot/share/opto/loopopts.cpp           |  60 +++
 src/hotspot/share/opto/mempointer.hpp         |   5 +-
 src/hotspot/share/opto/node.hpp               |   3 +
 src/hotspot/share/opto/opaquenode.hpp         |  23 ++
 src/hotspot/share/opto/phasetype.hpp          |  11 +-
 src/hotspot/share/opto/predicates.cpp         |   3 +
 src/hotspot/share/opto/predicates.hpp         |  11 +-
 src/hotspot/share/opto/superword.cpp          |   9 +-
 .../share/opto/traceAutoVectorizationTag.hpp  |  39 +-
 src/hotspot/share/opto/vectorization.cpp      |  81 +++-
 src/hotspot/share/opto/vectorization.hpp      |  43 +-
 src/hotspot/share/opto/vtransform.cpp         |  89 +++++
 src/hotspot/share/opto/vtransform.hpp         |  15 +-
 src/hotspot/share/runtime/deoptimization.cpp  |   1 +
 src/hotspot/share/runtime/deoptimization.hpp  |   1 +
 src/hotspot/share/runtime/vmStructs.cpp       |   1 +
 .../TestMemorySegmentUnalignedAddress.java    | 303 ++++++++++++++
 27 files changed, 1067 insertions(+), 129 deletions(-)
 create mode 100644 test/hotspot/jtreg/compiler/loopopts/superword/TestMemorySegmentUnalignedAddress.java

diff --git a/src/hotspot/share/jvmci/vmStructs_jvmci.cpp b/src/hotspot/share/jvmci/vmStructs_jvmci.cpp
index 8c964b56931..93c3449d0ff 100644
--- a/src/hotspot/share/jvmci/vmStructs_jvmci.cpp
+++ b/src/hotspot/share/jvmci/vmStructs_jvmci.cpp
@@ -708,6 +708,7 @@
   declare_constant(Deoptimization::Reason_constraint)                     \
   declare_constant(Deoptimization::Reason_div0_check)                     \
   declare_constant(Deoptimization::Reason_loop_limit_check)               \
+  declare_constant(Deoptimization::Reason_auto_vectorization_check)       \
   declare_constant(Deoptimization::Reason_type_checked_inlining)          \
   declare_constant(Deoptimization::Reason_optimized_type_check)           \
   declare_constant(Deoptimization::Reason_aliasing)                       \
diff --git a/src/hotspot/share/opto/c2_globals.hpp b/src/hotspot/share/opto/c2_globals.hpp
index caa0474c475..05b34bade43 100644
--- a/src/hotspot/share/opto/c2_globals.hpp
+++ b/src/hotspot/share/opto/c2_globals.hpp
@@ -346,6 +346,12 @@
   develop(bool, TraceLoopUnswitching, false,                                \
           "Trace loop unswitching")                                         \
                                                                             \
+  product(bool, LoopMultiversioning, true, DIAGNOSTIC,                      \
+          "Enable loop multiversioning (for speculative compilation)")      \
+                                                                            \
+  develop(bool, TraceLoopMultiversioning, false,                            \
+          "Trace loop multiversioning")                                     \
+                                                                            \
   product(bool, AllowVectorizeOnDemand, true,                               \
           "Globally suppress vectorization set in VectorizeMethod")         \
                                                                             \
diff --git a/src/hotspot/share/opto/cfgnode.hpp b/src/hotspot/share/opto/cfgnode.hpp
index 899e3c9bb85..c2cc0161df1 100644
--- a/src/hotspot/share/opto/cfgnode.hpp
+++ b/src/hotspot/share/opto/cfgnode.hpp
@@ -428,7 +428,7 @@ public:
   IfNode(Node* control, Node* bol, float p, float fcnt);
   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);
+  static IfNode* make_with_same_profile(IfNode* if_node_profile, Node* ctrl, Node* bol);
 
   virtual int Opcode() const;
   virtual bool pinned() const { return true; }
diff --git a/src/hotspot/share/opto/classes.hpp b/src/hotspot/share/opto/classes.hpp
index 918d8156b5f..41b621dfce9 100644
--- a/src/hotspot/share/opto/classes.hpp
+++ b/src/hotspot/share/opto/classes.hpp
@@ -277,6 +277,7 @@ macro(OnSpinWait)
 macro(Opaque1)
 macro(OpaqueLoopInit)
 macro(OpaqueLoopStride)
+macro(OpaqueMultiversioning)
 macro(OpaqueZeroTripGuard)
 macro(OpaqueNotNull)
 macro(OpaqueInitializedAssertionPredicate)
diff --git a/src/hotspot/share/opto/graphKit.cpp b/src/hotspot/share/opto/graphKit.cpp
index 2af70960f54..bb225eeabf5 100644
--- a/src/hotspot/share/opto/graphKit.cpp
+++ b/src/hotspot/share/opto/graphKit.cpp
@@ -4086,6 +4086,7 @@ void GraphKit::add_parse_predicates(int nargs) {
   if (UseProfiledLoopPredicate) {
     add_parse_predicate(Deoptimization::Reason_profile_predicate, nargs);
   }
+  add_parse_predicate(Deoptimization::Reason_auto_vectorization_check, nargs);
   // Loop Limit Check Predicate should be near the loop.
   add_parse_predicate(Deoptimization::Reason_loop_limit_check, nargs);
 }
diff --git a/src/hotspot/share/opto/ifnode.cpp b/src/hotspot/share/opto/ifnode.cpp
index 56602135560..5da8993306f 100644
--- a/src/hotspot/share/opto/ifnode.cpp
+++ b/src/hotspot/share/opto/ifnode.cpp
@@ -469,7 +469,7 @@ static Node* split_if(IfNode *iff, PhaseIterGVN *igvn) {
   return new ConINode(TypeInt::ZERO);
 }
 
-IfNode* IfNode::make_with_same_profile(IfNode* if_node_profile, Node* ctrl, BoolNode* bol) {
+IfNode* IfNode::make_with_same_profile(IfNode* if_node_profile, Node* ctrl, Node* bol) {
   // Assert here that we only try to create a clone from an If node with the same profiling if that actually makes sense.
   // Some If node subtypes should not be cloned in this way. In theory, we should not clone BaseCountedLoopEndNodes.
   // But they can end up being used as normal If nodes when peeling a loop - they serve as zero-trip guard.
@@ -2177,6 +2177,7 @@ ParsePredicateNode::ParsePredicateNode(Node* control, Deoptimization::DeoptReaso
   switch (deopt_reason) {
     case Deoptimization::Reason_predicate:
     case Deoptimization::Reason_profile_predicate:
+    case Deoptimization::Reason_auto_vectorization_check:
     case Deoptimization::Reason_loop_limit_check:
       break;
     default:
@@ -2214,6 +2215,9 @@ void ParsePredicateNode::dump_spec(outputStream* st) const {
     case Deoptimization::DeoptReason::Reason_profile_predicate:
       st->print("Profiled Loop ");
       break;
+    case Deoptimization::DeoptReason::Reason_auto_vectorization_check:
+      st->print("Auto_Vectorization_Check ");
+      break;
     case Deoptimization::DeoptReason::Reason_loop_limit_check:
       st->print("Loop Limit Check ");
       break;
diff --git a/src/hotspot/share/opto/loopTransform.cpp b/src/hotspot/share/opto/loopTransform.cpp
index 03a7bf50e70..436d8758df3 100644
--- a/src/hotspot/share/opto/loopTransform.cpp
+++ b/src/hotspot/share/opto/loopTransform.cpp
@@ -745,6 +745,11 @@ void PhaseIdealLoop::do_peeling(IdealLoopTree *loop, Node_List &old_new) {
     cl->set_trip_count(cl->trip_count() - 1);
     if (cl->is_main_loop()) {
       cl->set_normal_loop();
+      if (cl->is_multiversion()) {
+        // Peeling also destroys the connection of the main loop
+        // to the multiversion_if.
+        cl->set_no_multiversion();
+      }
 #ifndef PRODUCT
       if (PrintOpto && VerifyLoopOptimizations) {
         tty->print("Peeling a 'main' loop; resetting to 'normal' ");
@@ -1174,8 +1179,9 @@ bool IdealLoopTree::policy_range_check(PhaseIdealLoop* phase, bool provisional,
       if (!bol->is_Bool()) {
         assert(bol->is_OpaqueNotNull() ||
                bol->is_OpaqueTemplateAssertionPredicate() ||
-               bol->is_OpaqueInitializedAssertionPredicate(),
-               "Opaque node of a non-null-check or an Assertion Predicate");
+               bol->is_OpaqueInitializedAssertionPredicate() ||
+               bol->is_OpaqueMultiversioning(),
+               "Opaque node of a non-null-check or an Assertion Predicate or Multiversioning");
         continue;
       }
       if (bol->as_Bool()->_test._test == BoolTest::ne) {
@@ -3354,6 +3360,23 @@ bool IdealLoopTree::iteration_split_impl(PhaseIdealLoop *phase, Node_List &old_n
   // Do nothing special to pre- and post- loops
   if (cl->is_pre_loop() || cl->is_post_loop()) return true;
 
+  // With multiversioning, we create a fast_loop and a slow_loop, and a multiversion_if that
+  // decides which loop is taken at runtime. At first, the multiversion_if always takes the
+  // fast_loop, and we only optimize the fast_loop. Since we are not sure if we will ever use
+  // the slow_loop, we delay optimizations for it, so we do not waste compile time and code
+  // size. If we never change the condition of the multiversion_if, the slow_loop is eventually
+  // folded away after loop-opts. While optimizing the fast_loop, we may want to perform some
+  // speculative optimization, for which we need a runtime-check. We add this runtime-check
+  // condition to the multiversion_if. Now, it becomes possible to execute the slow_loop at
+  // runtime, and we resume optimizations for slow_loop ("un-delay" it).
+  // TLDR: If the slow_loop is still in "delay" mode, check if the multiversion_if was changed
+  //       and we should now resume optimizations for it.
+  if (cl->is_multiversion_delayed_slow_loop() &&
+      !phase->try_resume_optimizations_for_delayed_slow_loop(this)) {
+    // We are still delayed, so wait with further loop-opts.
+    return true;
+  }
+
   // Compute loop trip count from profile data
   compute_profile_trip_cnt(phase);
 
@@ -3413,6 +3436,12 @@ bool IdealLoopTree::iteration_split_impl(PhaseIdealLoop *phase, Node_List &old_n
       if (!phase->may_require_nodes(estimate)) {
         return false;
       }
+
+      // We are going to add pre-loop and post-loop.
+      // But should we also multi-version for auto-vectorization speculative
+      // checks, i.e. fast and slow-paths?
+      phase->maybe_multiversion_for_auto_vectorization_runtime_checks(this, old_new);
+
       phase->insert_pre_post_loops(this, old_new, peel_only);
     }
     // Adjust the pre- and main-loop limits to let the pre and  post loops run
diff --git a/src/hotspot/share/opto/loopUnswitch.cpp b/src/hotspot/share/opto/loopUnswitch.cpp
index 05e24e2271e..051aa59ca71 100644
--- a/src/hotspot/share/opto/loopUnswitch.cpp
+++ b/src/hotspot/share/opto/loopUnswitch.cpp
@@ -32,6 +32,23 @@
 #include "opto/predicates.hpp"
 #include "opto/rootnode.hpp"
 
+// Multiversioning:
+// A loop is cloned, and a selector If decides which loop is taken at run-time: the true-path-loop (original) or the
+// false-path-loop (cloned).
+//
+// Use-cases:
+// - Speculative compilation:
+//   The selector If checks some assumptions which allow stronger optimization in the true-path-loop. If the assumptions
+//   do not hold, we can still execute in the false-path-loop, although with fewer optimizations.
+//   See: PhaseIdealLoop::maybe_multiversion_for_auto_vectorization_runtime_checks
+//        PhaseIdealLoop::create_new_if_for_multiversion
+//
+// - Unswitching:
+//   The selector If has the same (loop invariant) condition as some unswitching candidate If inside the loop. This
+//   allows us to constant-fold the unswitching candidate If to true in the true-path-loop and to false in the
+//   false-path-loop, thus eliminating the unswitching candidate If from the loop.
+//
+//
 // Loop Unswitching is a loop optimization to move an invariant, non-loop-exiting test in the loop body before the loop.
 // Such a test is either always true or always false in all loop iterations and could therefore only be executed once.
 // To achieve that, we duplicate the loop and change the original and cloned loop as follows:
@@ -145,14 +162,16 @@ IfNode* PhaseIdealLoop::find_unswitch_candidate(const IdealLoopTree* loop) const
   return unswitch_candidate;
 }
 
-// This class creates an If node (i.e. loop selector) that selects if the true-path-loop or the false-path-loop should be
-// executed at runtime. This is done by finding an invariant and non-loop-exiting unswitch candidate If node (guaranteed
-// to exist at this point) to perform Loop Unswitching on.
-class UnswitchedLoopSelector : public StackObj {
+// LoopSelector is used for loop multiversioning and unswitching. This class creates an If node (i.e. loop selector)
+// that selects if the true-path-loop or the false-path-loop should be executed at runtime.
+class LoopSelector : public StackObj {
+  // Cached fields for construction.
   PhaseIdealLoop* const _phase;
   IdealLoopTree* const _outer_loop;
   Node* const _original_loop_entry;
-  IfNode* const _unswitch_candidate;
+  const uint _dom_depth; // of original_loop_entry
+
+  // Constructed selector if with its projections.
   IfNode* const _selector;
   IfTrueNode* const _true_path_loop_proj;
   IfFalseNode* const _false_path_loop_proj;
@@ -160,52 +179,59 @@ class UnswitchedLoopSelector : public StackObj {
   enum PathToLoop { TRUE_PATH, FALSE_PATH };
 
  public:
-  UnswitchedLoopSelector(IdealLoopTree* loop)
+  // For multiversioning: create a new selector (multiversion_if) from a bol condition.
+  LoopSelector(IdealLoopTree* loop, Node* bol, float prob, float fcnt)
       : _phase(loop->_phase),
         _outer_loop(loop->skip_strip_mined()->_parent),
         _original_loop_entry(loop->_head->as_Loop()->skip_strip_mined()->in(LoopNode::EntryControl)),
-        _unswitch_candidate(find_unswitch_candidate(loop)),
-        _selector(create_selector_if()),
+        _dom_depth(_phase->dom_depth(_original_loop_entry)),
+        _selector(create_multiversioning_if(bol, prob, fcnt)), // multiversioning
         _true_path_loop_proj(create_proj_to_loop(TRUE_PATH)->as_IfTrue()),
         _false_path_loop_proj(create_proj_to_loop(FALSE_PATH)->as_IfFalse()) {
   }
-  NONCOPYABLE(UnswitchedLoopSelector);
 
- private:
-  IfNode* find_unswitch_candidate(IdealLoopTree* loop) {
-    IfNode* unswitch_candidate = _phase->find_unswitch_candidate(loop);
-    assert(unswitch_candidate != nullptr, "guaranteed to exist by policy_unswitching");
-    assert(_phase->is_member(loop, unswitch_candidate), "must be inside original loop");
-    return unswitch_candidate;
+  // For unswitching: create an unswitching if before the loop, from a pre-existing
+  //                  unswitching_candidate inside the loop.
+  LoopSelector(IdealLoopTree* loop, IfNode* unswitch_candidate)
+      : _phase(loop->_phase),
+        _outer_loop(loop->skip_strip_mined()->_parent),
+        _original_loop_entry(loop->_head->as_Loop()->skip_strip_mined()->in(LoopNode::EntryControl)),
+        _dom_depth(_phase->dom_depth(_original_loop_entry)),
+        _selector(create_unswitching_if(unswitch_candidate)), // unswitching
+        _true_path_loop_proj(create_proj_to_loop(TRUE_PATH)->as_IfTrue()),
+        _false_path_loop_proj(create_proj_to_loop(FALSE_PATH)->as_IfFalse()) {
   }
+  NONCOPYABLE(LoopSelector);
 
-  IfNode* create_selector_if() const {
-    const uint dom_depth = _phase->dom_depth(_original_loop_entry);
+  IfNode* create_multiversioning_if(Node* bol, float prob, float fcnt) {
     _phase->igvn().rehash_node_delayed(_original_loop_entry);
-    BoolNode* unswitch_candidate_bool = _unswitch_candidate->in(1)->as_Bool();
-    IfNode* selector_if = IfNode::make_with_same_profile(_unswitch_candidate, _original_loop_entry,
-                                                         unswitch_candidate_bool);
-    _phase->register_node(selector_if, _outer_loop, _original_loop_entry, dom_depth);
+    IfNode* selector_if = new IfNode(_original_loop_entry, bol, prob, fcnt);
+    _phase->register_node(selector_if, _outer_loop, _original_loop_entry, _dom_depth);
     return selector_if;
   }
 
+  IfNode* create_unswitching_if(IfNode* unswitch_candidate) {
+    _phase->igvn().rehash_node_delayed(_original_loop_entry);
+    BoolNode* unswitch_candidate_bool = unswitch_candidate->in(1)->as_Bool();
+    IfNode* selector_if = IfNode::make_with_same_profile(unswitch_candidate, _original_loop_entry,
+                                                         unswitch_candidate_bool);
+    _phase->register_node(selector_if, _outer_loop, _original_loop_entry, _dom_depth);
+    return selector_if;
+  }
+
+ private:
   IfProjNode* create_proj_to_loop(const PathToLoop path_to_loop) {
-    const uint dom_depth = _phase->dom_depth(_original_loop_entry);
     IfProjNode* proj_to_loop;
     if (path_to_loop == TRUE_PATH) {
       proj_to_loop = new IfTrueNode(_selector);
     } else {
       proj_to_loop = new IfFalseNode(_selector);
     }
-    _phase->register_node(proj_to_loop, _outer_loop, _selector, dom_depth);
+    _phase->register_node(proj_to_loop, _outer_loop, _selector, _dom_depth);
     return proj_to_loop;
   }
 
  public:
-  IfNode* unswitch_candidate() const {
-    return _unswitch_candidate;
-  }
-
   IfNode* selector() const {
     return _selector;
   }
@@ -219,6 +245,37 @@ class UnswitchedLoopSelector : public StackObj {
   }
 };
 
+// This class creates an If node (i.e. loop selector) that selects if the true-path-loop or the false-path-loop should be
+// executed at runtime. This is done by finding an invariant and non-loop-exiting unswitch candidate If node (guaranteed
+// to exist at this point) to perform Loop Unswitching on.
+class UnswitchedLoopSelector : public StackObj {
+  IfNode* const _unswitch_candidate;
+  const LoopSelector _loop_selector;
+
+ public:
+  UnswitchedLoopSelector(IdealLoopTree* loop)
+      : _unswitch_candidate(find_unswitch_candidate(loop)),
+        _loop_selector(loop, _unswitch_candidate) {}
+  NONCOPYABLE(UnswitchedLoopSelector);
+
+ private:
+  static IfNode* find_unswitch_candidate(IdealLoopTree* loop) {
+    IfNode* unswitch_candidate = loop->_phase->find_unswitch_candidate(loop);
+    assert(unswitch_candidate != nullptr, "guaranteed to exist by policy_unswitching");
+    assert(loop->_phase->is_member(loop, unswitch_candidate), "must be inside original loop");
+    return unswitch_candidate;
+  }
+
+ public:
+  IfNode* unswitch_candidate() const {
+    return _unswitch_candidate;
+  }
+
+  const LoopSelector& loop_selector() const {
+    return _loop_selector;
+  }
+};
+
 // Class to unswitch the original loop and create Predicates at the new unswitched loop versions. The newly cloned loop
 // becomes the false-path-loop while original loop becomes the true-path-loop.
 class OriginalLoop : public StackObj {
@@ -238,55 +295,62 @@ class OriginalLoop : public StackObj {
   // Unswitch the original loop on the invariant loop selector by creating a true-path-loop and a false-path-loop.
   // Remove the unswitch candidate If from both unswitched loop versions which are now covered by the loop selector If.
   void unswitch(const UnswitchedLoopSelector& unswitched_loop_selector) {
-    const uint first_false_path_loop_node_index = _phase->C->unique();
-    clone_loop(unswitched_loop_selector);
-
-    move_parse_and_template_assertion_predicates_to_unswitched_loops(unswitched_loop_selector,
-                                                                     first_false_path_loop_node_index);
-    DEBUG_ONLY(verify_unswitched_loop_versions(_loop->_head->as_Loop(), unswitched_loop_selector);)
-
-    _phase->recompute_dom_depth();
+    multiversion(unswitched_loop_selector.loop_selector());
     remove_unswitch_candidate_from_loops(unswitched_loop_selector);
   }
 
- private:
-  void clone_loop(const UnswitchedLoopSelector& unswitched_loop_selector) {
-    _phase->clone_loop(_loop, _old_new, _phase->dom_depth(_loop_head),
-                       PhaseIdealLoop::CloneIncludesStripMined, unswitched_loop_selector.selector());
-    fix_loop_entries(unswitched_loop_selector);
+  // Multiversion the original loop. The loop selector if selects between the original loop (true-path-loop), and
+  // a copy of it (false-path-loop).
+  void multiversion(const LoopSelector& loop_selector) {
+    const uint first_false_path_loop_node_index = _phase->C->unique();
+    clone_loop(loop_selector);
+
+    move_parse_and_template_assertion_predicates_to_unswitched_loops(loop_selector,
+                                                                     first_false_path_loop_node_index);
+    DEBUG_ONLY(verify_loop_versions(_loop->_head->as_Loop(), loop_selector);)
+
+    _phase->recompute_dom_depth();
   }
 
-  void fix_loop_entries(const UnswitchedLoopSelector& unswitched_loop_selector) {
-    _phase->replace_loop_entry(_loop_head, unswitched_loop_selector.true_path_loop_proj());
+ private:
+  void clone_loop(const LoopSelector& loop_selector) {
+    _phase->clone_loop(_loop, _old_new, _phase->dom_depth(_loop_head),
+                       PhaseIdealLoop::CloneIncludesStripMined, loop_selector.selector());
+    fix_loop_entries(loop_selector);
+  }
+
+  void fix_loop_entries(const LoopSelector& loop_selector) {
+    _phase->replace_loop_entry(_loop_head, loop_selector.true_path_loop_proj());
     LoopNode* false_path_loop_strip_mined_head = old_to_new(_loop_head)->as_Loop();
     _phase->replace_loop_entry(false_path_loop_strip_mined_head,
-                               unswitched_loop_selector.false_path_loop_proj());
+                               loop_selector.false_path_loop_proj());
   }
 
   // Moves the Parse And Template Assertion Predicates to the true and false path loop. They are inserted between the
   // loop heads and the loop selector If projections. The old Parse and Template Assertion Predicates before
   // the unswitched loop selector are killed.
   void move_parse_and_template_assertion_predicates_to_unswitched_loops(
-    const UnswitchedLoopSelector& unswitched_loop_selector, const uint first_false_path_loop_node_index) const {
+    const LoopSelector& loop_selector, const uint first_false_path_loop_node_index) const {
     const NodeInOriginalLoopBody node_in_true_path_loop_body(first_false_path_loop_node_index, _old_new);
     const NodeInClonedLoopBody node_in_false_path_loop_body(first_false_path_loop_node_index);
     CloneUnswitchedLoopPredicatesVisitor
     clone_unswitched_loop_predicates_visitor(_loop_head, old_to_new(_loop_head)->as_Loop(), node_in_true_path_loop_body,
                                              node_in_false_path_loop_body, _phase);
-    Node* source_loop_entry = unswitched_loop_selector.selector()->in(0);
+    Node* source_loop_entry = loop_selector.selector()->in(0);
     PredicateIterator predicate_iterator(source_loop_entry);
     predicate_iterator.for_each(clone_unswitched_loop_predicates_visitor);
   }
 
 #ifdef ASSERT
-  void verify_unswitched_loop_versions(LoopNode* true_path_loop_head,
-                                       const UnswitchedLoopSelector& unswitched_loop_selector) const {
-    verify_unswitched_loop_version(true_path_loop_head, unswitched_loop_selector.true_path_loop_proj());
-    verify_unswitched_loop_version(old_to_new(true_path_loop_head)->as_Loop(),
-                                   unswitched_loop_selector.false_path_loop_proj());
+  void verify_loop_versions(LoopNode* true_path_loop_head,
+                            const LoopSelector& loop_selector) const {
+    verify_loop_version(true_path_loop_head,
+                        loop_selector.true_path_loop_proj());
+    verify_loop_version(old_to_new(true_path_loop_head)->as_Loop(),
+                        loop_selector.false_path_loop_proj());
   }
 
-  static void verify_unswitched_loop_version(LoopNode* loop_head, IfProjNode* loop_selector_if_proj) {
+  static void verify_loop_version(LoopNode* loop_head, IfProjNode* loop_selector_if_proj) {
     Node* entry = loop_head->skip_strip_mined()->in(LoopNode::EntryControl);
     const Predicates predicates(entry);
     // When skipping all predicates, we should end up at 'loop_selector_if_proj'.
@@ -302,15 +366,15 @@ class OriginalLoop : public StackObj {
   // If node. Keep the true-path-path in the true-path-loop and the false-path-path in the false-path-loop by setting
   // the bool input accordingly. The unswitch candidate If nodes are folded in the next IGVN round.
   void remove_unswitch_candidate_from_loops(const UnswitchedLoopSelector& unswitched_loop_selector) {
-    IfNode* unswitching_candidate = unswitched_loop_selector.unswitch_candidate();
-    _phase->igvn().rehash_node_delayed(unswitching_candidate);
-    _phase->dominated_by(unswitched_loop_selector.true_path_loop_proj(), unswitching_candidate);
+    const LoopSelector& loop_selector = unswitched_loop_selector.loop_selector();;
+    IfNode* unswitch_candidate        = unswitched_loop_selector.unswitch_candidate();
+    _phase->igvn().rehash_node_delayed(unswitch_candidate);
+    _phase->dominated_by(loop_selector.true_path_loop_proj(), unswitch_candidate);
 
-    IfNode* unswitching_candidate_clone = _old_new[unswitching_candidate->_idx]->as_If();
-    _phase->igvn().rehash_node_delayed(unswitching_candidate_clone);
-    _phase->dominated_by(unswitched_loop_selector.false_path_loop_proj(), unswitching_candidate_clone);
+    IfNode* unswitch_candidate_clone = _old_new[unswitch_candidate->_idx]->as_If();
+    _phase->igvn().rehash_node_delayed(unswitch_candidate_clone);
+    _phase->dominated_by(loop_selector.false_path_loop_proj(), unswitch_candidate_clone);
   }
-
 };
 
 // See comments below file header for more information about Loop Unswitching.
@@ -343,6 +407,172 @@ void PhaseIdealLoop::do_unswitching(IdealLoopTree* loop, Node_List& old_new) {
   C->set_major_progress();
 }
 
+void PhaseIdealLoop::do_multiversioning(IdealLoopTree* lpt, Node_List& old_new) {
+#ifndef PRODUCT
+  if (TraceLoopOpts || TraceLoopMultiversioning) {
+    tty->print("Multiversion ");
+    lpt->dump_head();
+  }
+#endif
+  assert(LoopMultiversioning, "LoopMultiversioning must be enabled");
+
+  CountedLoopNode* original_head = lpt->_head->as_CountedLoop();
+  C->print_method(PHASE_BEFORE_LOOP_MULTIVERSIONING, 4, original_head);
+
+  Node* one = _igvn.intcon(1);
+  set_ctrl(one, C->root());
+  Node* opaque = new OpaqueMultiversioningNode(C, one);
+  set_ctrl(opaque, C->root());
+  _igvn.register_new_node_with_optimizer(opaque);
+  _igvn.set_type(opaque, TypeInt::BOOL);
+
+  const LoopSelector loop_selector(lpt, opaque, PROB_LIKELY_MAG(3), COUNT_UNKNOWN);
+  OriginalLoop original_loop(lpt, old_new);
+  original_loop.multiversion(loop_selector);
+
+  add_unswitched_loop_version_bodies_to_igvn(lpt, old_new);
+
+  CountedLoopNode* new_head = old_new[original_head->_idx]->as_CountedLoop();
+  original_head->set_multiversion_fast_loop();
+  new_head->set_multiversion_delayed_slow_loop();
+
+  NOT_PRODUCT(trace_loop_multiversioning_result(loop_selector, original_head, new_head);)
+  C->print_method(PHASE_AFTER_LOOP_MULTIVERSIONING, 4, new_head);
+  C->set_major_progress();
+}
+
+// Create a new if in the multiversioning pattern, adding an additional condition for the
+// multiversioning fast-loop.
+//
+// Before:
+//                       entry  opaque
+//                         |      |
+//                      multiversion_if
+//                         |      |
+//        +----------------+      +---------------+
+//        |                                       |
+//   multiversion_fast_proj          multiversion_slow_proj
+//                                                |
+//                                                +--------+
+//                                                         |
+//                                                      slow_path
+//
+//
+// After:
+//                     entry  opaque <-- to be replaced by caller
+//                         |  |
+//                        new_if
+//                         |  |
+//                         |  +-----------------------------+
+//                         |                                |
+//                 new_if_true  opaque                new_if_false
+//                         |      |                         |
+//                      multiversion_if                     |
+//                         |      |                         |
+//        +----------------+      +---------------+         |
+//        |                                       |         |
+//   multiversion_fast_proj      new_multiversion_slow_proj |
+//                                                |         |
+//                                                +------+  |
+//                                                       |  |
+//                                                      region
+//                                                         |
+//                                                      slow_path
+//
+IfTrueNode* PhaseIdealLoop::create_new_if_for_multiversion(IfTrueNode* multiversioning_fast_proj) {
+  // Give all nodes in the old sub-graph a name.
+  IfNode* multiversion_if = multiversioning_fast_proj->in(0)->as_If();
+  Node* entry = multiversion_if->in(0);
+  OpaqueMultiversioningNode* opaque = multiversion_if->in(1)->as_OpaqueMultiversioning();
+  IfFalseNode* multiversion_slow_proj = multiversion_if->proj_out(0)->as_IfFalse();
+  Node* slow_path = multiversion_slow_proj->unique_ctrl_out();
+
+  // The slow_loop may still be delayed, and waiting for runtime-checks to be added to the
+  // multiversion_if. Now that we have at least one condition for the multiversioning,
+  // we should resume optimizations for the slow loop.
+  opaque->notify_slow_loop_that_it_can_resume_optimizations();
+
+  // Create new_if with its projections.
+  IfNode* new_if = IfNode::make_with_same_profile(multiversion_if, entry, opaque);
+  IdealLoopTree* lp = get_loop(entry);
+  register_control(new_if, lp, entry);
+
+  IfTrueNode*  new_if_true  = new IfTrueNode(new_if);
+  IfFalseNode* new_if_false = new IfFalseNode(new_if);
+  register_control(new_if_true,  lp, new_if);
+  register_control(new_if_false, lp, new_if);
+
+  // Hook new_if_true into multiversion_if.
+  _igvn.replace_input_of(multiversion_if, 0, new_if_true);
+
+  // Clone multiversion_slow_path - this allows us to easily carry the dependencies to
+  // the new region below.
+  IfFalseNode* new_multiversion_slow_proj = multiversion_slow_proj->clone()->as_IfFalse();
+  register_control(new_multiversion_slow_proj, lp, multiversion_if);
+
+  // Create new Region.
+  RegionNode* region = new RegionNode(1);
+  region->add_req(new_multiversion_slow_proj);
+  region->add_req(new_if_false);
+  register_control(region, lp, new_multiversion_slow_proj);
+
+  // Hook region into slow_path, in stead of the multiversion_slow_proj.
+  // This also moves all other dependencies of the multiversion_slow_proj to the region.
+  _igvn.replace_node(multiversion_slow_proj, region);
+
+  return new_if_true;
+}
+
+OpaqueMultiversioningNode* find_multiversion_opaque_from_multiversion_if_false(Node* maybe_multiversion_if_false) {
+  IfFalseNode* multiversion_if_false = maybe_multiversion_if_false->isa_IfFalse();
+  if (multiversion_if_false == nullptr) { return nullptr; }
+  IfNode* multiversion_if = multiversion_if_false->in(0)->isa_If();
+  if (multiversion_if == nullptr) { return nullptr; }
+  return multiversion_if->in(1)->isa_OpaqueMultiversioning();
+}
+
+bool PhaseIdealLoop::try_resume_optimizations_for_delayed_slow_loop(IdealLoopTree* lpt) {
+  CountedLoopNode* cl = lpt->_head->as_CountedLoop();
+  assert(cl->is_multiversion_delayed_slow_loop(), "must currently be delayed");
+
+  // Find multiversion_if.
+  Node* entry = cl->skip_strip_mined()->in(LoopNode::EntryControl);
+  const Predicates predicates(entry);
+
+  Node* slow_path = predicates.entry();
+
+  // Find opaque.
+  OpaqueMultiversioningNode* opaque = nullptr;
+  if (slow_path->is_Region()) {
+    for (uint i = 1; i < slow_path->req(); i++) {
+      Node* n = slow_path->in(i);
+      opaque = find_multiversion_opaque_from_multiversion_if_false(n);
+      if (opaque != nullptr) { break; }
+    }
+  } else {
+    opaque = find_multiversion_opaque_from_multiversion_if_false(slow_path);
+  }
+  assert(opaque != nullptr, "must have found multiversion opaque node");
+  if (opaque == nullptr) { return false; }
+
+  // We may still be delayed, if there were not yet any runtime-checks added
+  // for the multiversioning. We may never add any, and then this loop would
+  // fold away. So we wait until some runtime-checks are added, then we know
+  // that this loop will be reachable and it is worth optimizing further.
+  if (opaque->is_delayed_slow_loop()) { return false; }
+
+  // Clear away the "delayed" status, i.e. resume optimizations.
+  cl->set_no_multiversion();
+  cl->set_multiversion_slow_loop();
+#ifndef PRODUCT
+  if (TraceLoopOpts) {
+    tty->print("Resume Optimizations ");
+    lpt->dump_head();
+  }
+#endif
+  return true;
+}
+
 bool PhaseIdealLoop::has_control_dependencies_from_predicates(LoopNode* head) {
   Node* entry = head->skip_strip_mined()->in(LoopNode::EntryControl);
   const Predicates predicates(entry);
@@ -377,7 +607,7 @@ void PhaseIdealLoop::trace_loop_unswitching_result(const UnswitchedLoopSelector&
                                                    const LoopNode* original_head, const LoopNode* new_head) {
   if (TraceLoopUnswitching) {
     IfNode* unswitch_candidate = unswitched_loop_selector.unswitch_candidate();
-    IfNode* loop_selector = unswitched_loop_selector.selector();
+    IfNode* loop_selector = unswitched_loop_selector.loop_selector().selector();
     tty->print_cr("Loop Unswitching:");
     tty->print_cr("- Unswitch-Candidate-If: %d %s", unswitch_candidate->_idx, unswitch_candidate->Name());
     tty->print_cr("- Loop-Selector-If: %d %s", loop_selector->_idx, loop_selector->Name());
@@ -385,22 +615,33 @@ void PhaseIdealLoop::trace_loop_unswitching_result(const UnswitchedLoopSelector&
     tty->print_cr("- False-Path-Loop (=Clone): %d %s", new_head->_idx, new_head->Name());
   }
 }
+
+void PhaseIdealLoop::trace_loop_multiversioning_result(const LoopSelector& loop_selector,
+                                                       const LoopNode* original_head, const LoopNode* new_head) {
+  if (TraceLoopMultiversioning) {
+    IfNode* selector_if = loop_selector.selector();
+    tty->print_cr("Loop Multiversioning:");
+    tty->print_cr("- Loop-Selector-If: %d %s", selector_if->_idx, selector_if->Name());
+    tty->print_cr("- True-Path-Loop (=Orig / Fast): %d %s", original_head->_idx, original_head->Name());
+    tty->print_cr("- False-Path-Loop (=Clone / Slow): %d %s", new_head->_idx, new_head->Name());
+  }
+}
 #endif
 
 // When unswitching a counted loop, we need to convert it back to a normal loop since it's not a proper pre, main or,
-// post loop anymore after loop unswitching.
+// post loop anymore after loop unswitching. We also lose the multiversion structure, with access to the multiversion_if.
 void PhaseIdealLoop::revert_to_normal_loop(const LoopNode* loop_head) {
   CountedLoopNode* cl = loop_head->isa_CountedLoop();
-  if (cl != nullptr && !cl->is_normal_loop()) {
-    cl->set_normal_loop();
-  }
+  if (cl == nullptr) { return; }
+  if (!cl->is_normal_loop()) { cl->set_normal_loop(); }
+  if (cl->is_multiversion()) { cl->set_no_multiversion(); }
 }
 
 // Hoist invariant CheckCastPPNodes out of each unswitched loop version to the appropriate loop selector If projection.
 void PhaseIdealLoop::hoist_invariant_check_casts(const IdealLoopTree* loop, const Node_List& old_new,
                                                  const UnswitchedLoopSelector& unswitched_loop_selector) {
   IfNode* unswitch_candidate = unswitched_loop_selector.unswitch_candidate();
-  IfNode* loop_selector = unswitched_loop_selector.selector();
+  IfNode* loop_selector = unswitched_loop_selector.loop_selector().selector();
   ResourceMark rm;
   GrowableArray<CheckCastPPNode*> loop_invariant_check_casts;
   for (DUIterator_Fast imax, i = unswitch_candidate->fast_outs(imax); i < imax; i++) {
diff --git a/src/hotspot/share/opto/loopnode.cpp b/src/hotspot/share/opto/loopnode.cpp
index ed2db13421f..a58fa44f9d6 100644
--- a/src/hotspot/share/opto/loopnode.cpp
+++ b/src/hotspot/share/opto/loopnode.cpp
@@ -1090,6 +1090,14 @@ bool PhaseIdealLoop::create_loop_nest(IdealLoopTree* loop, Node_List &old_new) {
     if (UseProfiledLoopPredicate) {
       add_parse_predicate(Deoptimization::Reason_profile_predicate, inner_head, outer_ilt, cloned_sfpt);
     }
+
+    // We only want to use the auto-vectorization check as a trap once per bci. And
+    // PhaseIdealLoop::add_parse_predicate only checks trap limits per method, so
+    // we do a custom check here.
+    if (!C->too_many_traps(cloned_sfpt->jvms()->method(), cloned_sfpt->jvms()->bci(), Deoptimization::Reason_auto_vectorization_check)) {
+      add_parse_predicate(Deoptimization::Reason_auto_vectorization_check, inner_head, outer_ilt, cloned_sfpt);
+    }
+
     add_parse_predicate(Deoptimization::Reason_loop_limit_check, inner_head, outer_ilt, cloned_sfpt);
   }
 
@@ -2511,6 +2519,9 @@ void CountedLoopNode::dump_spec(outputStream *st) const {
   if (is_main_loop()) st->print("main of N%d", _idx);
   if (is_post_loop()) st->print("post of N%d", _main_idx);
   if (is_strip_mined()) st->print(" strip mined");
+  if (is_multiversion_fast_loop())         { st->print(" multiversion_fast"); }
+  if (is_multiversion_slow_loop())         { st->print(" multiversion_slow"); }
+  if (is_multiversion_delayed_slow_loop()) { st->print(" multiversion_delayed_slow"); }
 }
 #endif
 
@@ -4303,6 +4314,9 @@ void IdealLoopTree::dump_head() {
     if (cl->is_post_loop()) tty->print(" post");
     if (cl->is_vectorized_loop()) tty->print(" vector");
     if (range_checks_present()) tty->print(" rc ");
+    if (cl->is_multiversion_fast_loop())         { tty->print(" multiversion_fast"); }
+    if (cl->is_multiversion_slow_loop())         { tty->print(" multiversion_slow"); }
+    if (cl->is_multiversion_delayed_slow_loop()) { tty->print(" multiversion_delayed_slow"); }
   }
   if (_has_call) tty->print(" has_call");
   if (_has_sfpt) tty->print(" has_sfpt");
@@ -4948,18 +4962,6 @@ void PhaseIdealLoop::build_and_optimize() {
     C->set_major_progress();
   }
 
-  // Keep loop predicates and perform optimizations with them
-  // until no more loop optimizations could be done.
-  // After that switch predicates off and do more loop optimizations.
-  if (!C->major_progress() && (C->parse_predicate_count() > 0)) {
-    C->mark_parse_predicate_nodes_useless(_igvn);
-    assert(C->parse_predicate_count() == 0, "should be zero now");
-     if (TraceLoopOpts) {
-       tty->print_cr("PredicatesOff");
-     }
-     C->set_major_progress();
-  }
-
   // Auto-vectorize main-loop
   if (C->do_superword() && C->has_loops() && !C->major_progress()) {
     Compile::TracePhase tp(_t_autoVectorize);
@@ -4992,6 +4994,18 @@ void PhaseIdealLoop::build_and_optimize() {
       }
     }
   }
+
+  // Keep loop predicates and perform optimizations with them
+  // until no more loop optimizations could be done.
+  // After that switch predicates off and do more loop optimizations.
+  if (!C->major_progress() && (C->parse_predicate_count() > 0)) {
+    C->mark_parse_predicate_nodes_useless(_igvn);
+    assert(C->parse_predicate_count() == 0, "should be zero now");
+    if (TraceLoopOpts) {
+      tty->print_cr("PredicatesOff");
+    }
+    C->set_major_progress();
+  }
 }
 
 #ifndef PRODUCT
diff --git a/src/hotspot/share/opto/loopnode.hpp b/src/hotspot/share/opto/loopnode.hpp
index 4e5a60ee3cd..a9c5d697c6b 100644
--- a/src/hotspot/share/opto/loopnode.hpp
+++ b/src/hotspot/share/opto/loopnode.hpp
@@ -43,6 +43,7 @@ class OuterStripMinedLoopEndNode;
 class PredicateBlock;
 class PathFrequency;
 class PhaseIdealLoop;
+class LoopSelector;
 class UnswitchedLoopSelector;
 class VectorSet;
 class VSharedData;
@@ -79,7 +80,12 @@ protected:
          SubwordLoop           = 1<<13,
          ProfileTripFailed     = 1<<14,
          LoopNestInnerLoop     = 1<<15,
-         LoopNestLongOuterLoop = 1<<16 };
+         LoopNestLongOuterLoop = 1<<16,
+         MultiversionFastLoop         = 1<<17,
+         MultiversionSlowLoop         = 2<<17,
+         MultiversionDelayedSlowLoop  = 3<<17,
+         MultiversionFlagsMask        = 3<<17,
+       };
   char _unswitch_count;
   enum { _unswitch_max=3 };
 
@@ -315,6 +321,32 @@ public:
   void set_slp_max_unroll(int unroll_factor) { _slp_maximum_unroll_factor = unroll_factor; }
   int  slp_max_unroll() const                { return _slp_maximum_unroll_factor; }
 
+  // Multiversioning allows us to duplicate a CountedLoop, and have two versions, and the multiversion_if
+  // decides which one is taken:
+  // (1) fast_loop: We enter this loop by default, by default the multiversion_if has its condition set to
+  //                "true", guarded by a OpaqueMultiversioning. If we want to make a speculative assumption
+  //                for an optimization, we can add the runtime-check to the multiversion_if, and if the
+  //                assumption fails we take the slow_loop instead, where we do not make the same speculative
+  //                assumption.
+  //                We call it the "fast_loop" because it has more optimizations, enabled by the speculative
+  //                runtime-checks at the multiversion_if, and we expect the fast_loop to execute faster.
+  // (2) slow_loop: By default, it is not taken, until a runtime-check is added to the multiversion_if while
+  //                optimizing the fast_looop. If such a runtime-check is never added, then after loop-opts
+  //                the multiversion_if constant folds to true, and the slow_loop is folded away. To save
+  //                compile time, we delay the optimization of the slow_loop until a runtime-check is added
+  //                to the multiversion_if, at which point we resume optimizations for the slow_loop.
+  //                We call it the "slow_loop" because it has fewer optimizations, since this is the fall-back
+  //                loop where we do not make any of the speculative assumptions we make for the fast_loop.
+  //                Hence, we expect the slow_loop to execute slower.
+  bool is_multiversion()                   const { return (_loop_flags & MultiversionFlagsMask) != Normal; }
+  bool is_multiversion_fast_loop()         const { return (_loop_flags & MultiversionFlagsMask) == MultiversionFastLoop; }
+  bool is_multiversion_slow_loop()         const { return (_loop_flags & MultiversionFlagsMask) == MultiversionSlowLoop; }
+  bool is_multiversion_delayed_slow_loop() const { return (_loop_flags & MultiversionFlagsMask) == MultiversionDelayedSlowLoop; }
+  void set_multiversion_fast_loop()         { assert(!is_multiversion(), ""); _loop_flags |= MultiversionFastLoop; }
+  void set_multiversion_slow_loop()         { assert(!is_multiversion(), ""); _loop_flags |= MultiversionSlowLoop; }
+  void set_multiversion_delayed_slow_loop() { assert(!is_multiversion(), ""); _loop_flags |= MultiversionDelayedSlowLoop; }
+  void set_no_multiversion()                { assert( is_multiversion(), ""); _loop_flags &= ~MultiversionFlagsMask; }
+
   virtual LoopNode* skip_strip_mined(int expect_skeleton = 1);
   OuterStripMinedLoopNode* outer_loop() const;
   virtual IfTrueNode* outer_loop_tail() const;
@@ -1457,6 +1489,8 @@ public:
   static void trace_loop_unswitching_impossible(const LoopNode* original_head);
   static void trace_loop_unswitching_result(const UnswitchedLoopSelector& unswitched_loop_selector,
                                             const LoopNode* original_head, const LoopNode* new_head);
+  static void trace_loop_multiversioning_result(const LoopSelector& loop_selector,
+                                                const LoopNode* original_head, const LoopNode* new_head);
 #endif
 
  public:
@@ -1483,6 +1517,11 @@ public:
   };
   AutoVectorizeStatus auto_vectorize(IdealLoopTree* lpt, VSharedData &vshared);
 
+  void maybe_multiversion_for_auto_vectorization_runtime_checks(IdealLoopTree* lpt, Node_List& old_new);
+  void do_multiversioning(IdealLoopTree* lpt, Node_List& old_new);
+  IfTrueNode* create_new_if_for_multiversion(IfTrueNode* multiversioning_fast_proj);
+  bool try_resume_optimizations_for_delayed_slow_loop(IdealLoopTree* lpt);
+
   // Move an unordered Reduction out of loop if possible
   void move_unordered_reduction_out_of_loop(IdealLoopTree* loop);
 
diff --git a/src/hotspot/share/opto/loopopts.cpp b/src/hotspot/share/opto/loopopts.cpp
index 8afce3e86ae..2d564c3c8cf 100644
--- a/src/hotspot/share/opto/loopopts.cpp
+++ b/src/hotspot/share/opto/loopopts.cpp
@@ -4482,6 +4482,66 @@ PhaseIdealLoop::auto_vectorize(IdealLoopTree* lpt, VSharedData &vshared) {
   return AutoVectorizeStatus::Success;
 }
 
+// Just before insert_pre_post_loops, we can multi-version the loop:
+//
+//              multiversion_if
+//               |       |
+//         fast_loop   slow_loop
+//
+// In the fast_loop we can make speculative assumptions, and put the
+// conditions into the multiversion_if. If the conditions hold at runtime,
+// we enter the fast_loop, if the conditions fail, we take the slow_loop
+// instead which does not make any of the speculative assumptions.
+//
+// Note: we only multiversion the loop if the loop does not have any
+//       auto vectorization check Predicate. If we have that predicate,
+//       then we can simply add the speculative assumption checks to
+//       that Predicate. This means we do not need to duplicate the
+//       loop - we have a smaller graph and save compile time. Should
+//       the conditions ever fail, then we deopt / trap at the Predicate
+//       and recompile without that Predicate. At that point we will
+//       multiversion the loop, so that we can still have speculative
+//       runtime checks.
+//
+// We perform the multiversioning when the loop is still in its single
+// iteration form, even before we insert pre and post loops. This makes
+// the cloning much simpler. However, this means that both the fast
+// and the slow loop have to be optimized independently (adding pre
+// and post loops, unrolling the main loop, auto-vectorize etc.). And
+// we may end up not needing any speculative assumptions in the fast_loop
+// and then rejecting the slow_loop by constant folding the multiversion_if.
+//
+// Therefore, we "delay" the optimization of the slow_loop until we add
+// at least one speculative assumption for the fast_loop. If we never
+// add such a speculative runtime check, the OpaqueMultiversioningNode
+// of the multiversion_if constant folds to true after loop opts, and the
+// multiversion_if folds away the "delayed" slow_loop. If we add any
+// speculative assumption, then we notify the OpaqueMultiversioningNode
+// with "notify_slow_loop_that_it_can_resume_optimizations".
+//
+// Note: new runtime checks can be added to the multiversion_if with
+//       PhaseIdealLoop::create_new_if_for_multiversion
+void PhaseIdealLoop::maybe_multiversion_for_auto_vectorization_runtime_checks(IdealLoopTree* lpt, Node_List& old_new) {
+  CountedLoopNode* cl = lpt->_head->as_CountedLoop();
+  LoopNode* outer_loop = cl->skip_strip_mined();
+  Node* entry = outer_loop->in(LoopNode::EntryControl);
+
+  // Check we have multiversioning enabled, and are not already multiversioned.
+  if (!LoopMultiversioning || cl->is_multiversion()) { return; }
+
+  // Check that we do not have a parse-predicate where we can add the runtime checks
+  // during auto-vectorization.
+  const Predicates predicates(entry);
+  const PredicateBlock* predicate_block = predicates.auto_vectorization_check_block();
+  if (predicate_block->has_parse_predicate()) { return; }
+
+  // Check node budget.
+  uint estimate = lpt->est_loop_clone_sz(2);
+  if (!may_require_nodes(estimate)) { return; }
+
+  do_multiversioning(lpt, old_new);
+}
+
 // Returns true if the Reduction node is unordered.
 static bool is_unordered_reduction(Node* n) {
   return n->is_Reduction() && !n->as_Reduction()->requires_strict_order();
diff --git a/src/hotspot/share/opto/mempointer.hpp b/src/hotspot/share/opto/mempointer.hpp
index f1d29f2453f..90216a5e2d3 100644
--- a/src/hotspot/share/opto/mempointer.hpp
+++ b/src/hotspot/share/opto/mempointer.hpp
@@ -229,9 +229,12 @@
 //     Even if we could know that there is some base address to which we add index offsets, we cannot know
 //     if this reference address points to the beginning of a native memory allocation or into the middle,
 //     or outside it. We also have no guarantee for alignment with such a base address.
+//
 //     Still: we would like to find such a base if possible, and if two pointers are similar (i.e. have the
 //     same summands), we would like to find the same base. Further, it is reasonable to speculatively
-//     assume that such base addresses are aligned (TODO: need to add this speculative check in JDK-8323582).
+//     assume that such base addresses are aligned. We performs such a speculative alignment runtime check
+//     in VTransform::add_speculative_alignment_check.
+//
 //     A base pointer must have scale = 1, and be accepted byMemPointer::is_native_memory_base_candidate.
 //     It can thus be one of these:
 //      (1) CastX2P
diff --git a/src/hotspot/share/opto/node.hpp b/src/hotspot/share/opto/node.hpp
index 2e52c12e4e8..941b816d8e0 100644
--- a/src/hotspot/share/opto/node.hpp
+++ b/src/hotspot/share/opto/node.hpp
@@ -139,6 +139,7 @@ class NeverBranchNode;
 class Opaque1Node;
 class OpaqueLoopInitNode;
 class OpaqueLoopStrideNode;
+class OpaqueMultiversioningNode;
 class OpaqueNotNullNode;
 class OpaqueInitializedAssertionPredicateNode;
 class OpaqueTemplateAssertionPredicateNode;
@@ -800,6 +801,7 @@ public:
     DEFINE_CLASS_ID(Opaque1,  Node, 16)
       DEFINE_CLASS_ID(OpaqueLoopInit, Opaque1, 0)
       DEFINE_CLASS_ID(OpaqueLoopStride, Opaque1, 1)
+      DEFINE_CLASS_ID(OpaqueMultiversioning, Opaque1, 2)
     DEFINE_CLASS_ID(OpaqueNotNull,  Node, 17)
     DEFINE_CLASS_ID(OpaqueInitializedAssertionPredicate,  Node, 18)
     DEFINE_CLASS_ID(OpaqueTemplateAssertionPredicate,  Node, 19)
@@ -982,6 +984,7 @@ public:
   DEFINE_CLASS_QUERY(OpaqueTemplateAssertionPredicate)
   DEFINE_CLASS_QUERY(OpaqueLoopInit)
   DEFINE_CLASS_QUERY(OpaqueLoopStride)
+  DEFINE_CLASS_QUERY(OpaqueMultiversioning)
   DEFINE_CLASS_QUERY(OuterStripMinedLoop)
   DEFINE_CLASS_QUERY(OuterStripMinedLoopEnd)
   DEFINE_CLASS_QUERY(Parm)
diff --git a/src/hotspot/share/opto/opaquenode.hpp b/src/hotspot/share/opto/opaquenode.hpp
index c1686d846f9..0e8a53efd34 100644
--- a/src/hotspot/share/opto/opaquenode.hpp
+++ b/src/hotspot/share/opto/opaquenode.hpp
@@ -91,6 +91,29 @@ public:
   IfNode* if_node() const;
 };
 
+// This node is used to mark the auto vectorization Predicate.
+// At first, the multiversion_if has its condition set to "true" and we always
+// take the fast_loop. Since we do not know if the slow_loop is ever going to
+// be used, we delay optimizations for it. Once the fast_loop decides to use
+// speculative runtime-checks and adds them to the multiversion_if, the slow_loop
+// can now resume optimizations, as it is reachable at runtime.
+// See PhaseIdealLoop::maybe_multiversion_for_auto_vectorization_runtime_checks
+class OpaqueMultiversioningNode : public Opaque1Node {
+private:
+  bool _is_delayed_slow_loop;
+
+public:
+  OpaqueMultiversioningNode(Compile* C, Node* n) :
+      Opaque1Node(C, n), _is_delayed_slow_loop(true)
+  {
+    init_class_id(Class_OpaqueMultiversioning);
+  }
+  virtual int Opcode() const;
+  virtual const Type* bottom_type() const { return TypeInt::BOOL; }
+  bool is_delayed_slow_loop() const { return _is_delayed_slow_loop; }
+  void notify_slow_loop_that_it_can_resume_optimizations() { _is_delayed_slow_loop = false; }
+};
+
 // This node is used in the context of intrinsics. We sometimes implicitly know that an object is non-null even though
 // the compiler cannot prove it. We therefore add a corresponding cast to propagate this implicit knowledge. However,
 // this cast could become top during optimizations (input to cast becomes null) and the data path is folded. To ensure
diff --git a/src/hotspot/share/opto/phasetype.hpp b/src/hotspot/share/opto/phasetype.hpp
index dcdf3aa3f86..8015255c03b 100644
--- a/src/hotspot/share/opto/phasetype.hpp
+++ b/src/hotspot/share/opto/phasetype.hpp
@@ -64,14 +64,17 @@
   flags(AFTER_LOOP_PEELING,             "After Loop Peeling") \
   flags(BEFORE_LOOP_UNSWITCHING,        "Before Loop Unswitching") \
   flags(AFTER_LOOP_UNSWITCHING,         "After Loop Unswitching") \
+  flags(BEFORE_LOOP_MULTIVERSIONING,    "Before Loop Multiversioning") \
+  flags(AFTER_LOOP_MULTIVERSIONING,     "After Loop Multiversioning") \
   flags(BEFORE_RANGE_CHECK_ELIMINATION, "Before Range Check Elimination") \
   flags(AFTER_RANGE_CHECK_ELIMINATION,  "After Range Check Elimination") \
   flags(BEFORE_PRE_MAIN_POST,           "Before Pre/Main/Post Loops") \
   flags(AFTER_PRE_MAIN_POST,            "After Pre/Main/Post Loops") \
-  flags(AUTO_VECTORIZATION1_BEFORE_APPLY,       "AutoVectorization 1, Before Apply") \
-  flags(AUTO_VECTORIZATION2_AFTER_REORDER,      "AutoVectorization 2, After Apply Memop Reordering") \
-  flags(AUTO_VECTORIZATION3_AFTER_ADJUST_LIMIT, "AutoVectorization 3, After Adjusting Pre-Loop Limit") \
-  flags(AUTO_VECTORIZATION4_AFTER_APPLY,        "AutoVectorization 4, After Apply") \
+  flags(AUTO_VECTORIZATION1_BEFORE_APPLY,                     "AutoVectorization 1, Before Apply") \
+  flags(AUTO_VECTORIZATION2_AFTER_REORDER,                    "AutoVectorization 2, After Apply Memop Reordering") \
+  flags(AUTO_VECTORIZATION3_AFTER_ADJUST_LIMIT,               "AutoVectorization 3, After Adjusting Pre-Loop Limit") \
+  flags(AUTO_VECTORIZATION4_AFTER_SPECULATIVE_RUNTIME_CHECKS, "AutoVectorization 4, After Adding Speculative Runtime Checks") \
+  flags(AUTO_VECTORIZATION5_AFTER_APPLY,                      "AutoVectorization 5, After Apply") \
   flags(BEFORE_CLOOPS,                  "Before CountedLoop") \
   flags(AFTER_CLOOPS,                   "After CountedLoop") \
   flags(PHASEIDEAL_BEFORE_EA,           "PhaseIdealLoop before EA") \
diff --git a/src/hotspot/share/opto/predicates.cpp b/src/hotspot/share/opto/predicates.cpp
index 6badaa65487..be4e0067c10 100644
--- a/src/hotspot/share/opto/predicates.cpp
+++ b/src/hotspot/share/opto/predicates.cpp
@@ -120,6 +120,7 @@ bool RuntimePredicate::has_valid_uncommon_trap(const Node* success_proj) {
   assert(RegularPredicate::may_be_predicate_if(success_proj), "must have been checked before");
   const Deoptimization::DeoptReason deopt_reason = uncommon_trap_reason(success_proj->as_IfProj());
   return (deopt_reason == Deoptimization::Reason_loop_limit_check ||
+          deopt_reason == Deoptimization::Reason_auto_vectorization_check ||
           deopt_reason == Deoptimization::Reason_predicate ||
           deopt_reason == Deoptimization::Reason_profile_predicate);
 }
@@ -893,6 +894,8 @@ void Predicates::dump() const {
     tty->print_cr("%d %s:", loop_head->_idx, loop_head->Name());
     tty->print_cr("- Loop Limit Check Predicate Block:");
     _loop_limit_check_predicate_block.dump("  ");
+    tty->print_cr("- Auto Vectorization Check Block:");
+    _auto_vectorization_check_block.dump("  ");
     tty->print_cr("- Profiled Loop Predicate Block:");
     _profiled_loop_predicate_block.dump("  ");
     tty->print_cr("- Loop Predicate Block:");
diff --git a/src/hotspot/share/opto/predicates.hpp b/src/hotspot/share/opto/predicates.hpp
index bfc1b23115e..ceb8fe7e317 100644
--- a/src/hotspot/share/opto/predicates.hpp
+++ b/src/hotspot/share/opto/predicates.hpp
@@ -734,6 +734,8 @@ class PredicateIterator : public StackObj {
     Node* current = _start_node;
     PredicateBlockIterator loop_limit_check_predicate_iterator(current, Deoptimization::Reason_loop_limit_check);
     current = loop_limit_check_predicate_iterator.for_each(predicate_visitor);
+    PredicateBlockIterator auto_vectorization_check_iterator(current, Deoptimization::Reason_auto_vectorization_check);
+    current = auto_vectorization_check_iterator.for_each(predicate_visitor);
     if (UseLoopPredicate) {
       if (UseProfiledLoopPredicate) {
         PredicateBlockIterator profiled_loop_predicate_iterator(current, Deoptimization::Reason_profile_predicate);
@@ -906,6 +908,7 @@ class PredicateBlock : public StackObj {
 class Predicates : public StackObj {
   Node* const _tail;
   const PredicateBlock _loop_limit_check_predicate_block;
+  const PredicateBlock _auto_vectorization_check_block;
   const PredicateBlock _profiled_loop_predicate_block;
   const PredicateBlock _loop_predicate_block;
   Node* const _entry;
@@ -914,7 +917,9 @@ class Predicates : public StackObj {
   explicit Predicates(Node* loop_entry)
       : _tail(loop_entry),
         _loop_limit_check_predicate_block(loop_entry, Deoptimization::Reason_loop_limit_check),
-        _profiled_loop_predicate_block(_loop_limit_check_predicate_block.entry(),
+        _auto_vectorization_check_block(_loop_limit_check_predicate_block.entry(),
+                                        Deoptimization::Reason_auto_vectorization_check),
+        _profiled_loop_predicate_block(_auto_vectorization_check_block.entry(),
                                        Deoptimization::Reason_profile_predicate),
         _loop_predicate_block(_profiled_loop_predicate_block.entry(),
                               Deoptimization::Reason_predicate),
@@ -935,6 +940,10 @@ class Predicates : public StackObj {
     return &_profiled_loop_predicate_block;
   }
 
+  const PredicateBlock* auto_vectorization_check_block() const {
+    return &_auto_vectorization_check_block;
+  }
+
   const PredicateBlock* loop_limit_check_predicate_block() const {
     return &_loop_limit_check_predicate_block;
   }
diff --git a/src/hotspot/share/opto/superword.cpp b/src/hotspot/share/opto/superword.cpp
index 31aa1507d23..697e4d842d5 100644
--- a/src/hotspot/share/opto/superword.cpp
+++ b/src/hotspot/share/opto/superword.cpp
@@ -1484,7 +1484,8 @@ const AlignmentSolution* SuperWord::pack_alignment_solution(const Node_List* pac
                          pack->size(),
                          pre_end->init_trip(),
                          pre_end->stride_con(),
-                         iv_stride()
+                         iv_stride(),
+                         _vloop.are_speculative_checks_possible()
                          DEBUG_ONLY(COMMA is_trace_align_vector()));
   return solver.solve();
 }
@@ -1896,6 +1897,7 @@ bool SuperWord::schedule_and_apply() const {
   VTransformTrace trace(_vloop.vtrace(),
                         is_trace_superword_rejections(),
                         is_trace_align_vector(),
+                        _vloop.is_trace_speculative_runtime_checks(),
                         is_trace_superword_info());
 #endif
   VTransform vtransform(_vloop_analyzer,
@@ -1938,8 +1940,11 @@ void VTransform::apply() {
   adjust_pre_loop_limit_to_align_main_loop_vectors();
   C->print_method(PHASE_AUTO_VECTORIZATION3_AFTER_ADJUST_LIMIT, 4, cl());
 
+  apply_speculative_runtime_checks();
+  C->print_method(PHASE_AUTO_VECTORIZATION4_AFTER_SPECULATIVE_RUNTIME_CHECKS, 4, cl());
+
   apply_vectorization();
-  C->print_method(PHASE_AUTO_VECTORIZATION4_AFTER_APPLY, 4, cl());
+  C->print_method(PHASE_AUTO_VECTORIZATION5_AFTER_APPLY, 4, cl());
 }
 
 // We prepare the memory graph for the replacement of scalar memops with vector memops.
diff --git a/src/hotspot/share/opto/traceAutoVectorizationTag.hpp b/src/hotspot/share/opto/traceAutoVectorizationTag.hpp
index 0c08777c90c..0e14964263d 100644
--- a/src/hotspot/share/opto/traceAutoVectorizationTag.hpp
+++ b/src/hotspot/share/opto/traceAutoVectorizationTag.hpp
@@ -29,25 +29,26 @@
 #include "utilities/stringUtils.hpp"
 
 #define COMPILER_TRACE_AUTO_VECTORIZATION_TAG(flags) \
-  flags(POINTER_PARSING,      "Trace VPointer/MemPointer parsing") \
-  flags(POINTER_ALIASING,     "Trace VPointer/MemPointer aliasing") \
-  flags(POINTER_ADJACENCY,    "Trace VPointer/MemPointer adjacency") \
-  flags(POINTER_OVERLAP,      "Trace VPointer/MemPointer overlap") \
-  flags(PRECONDITIONS,        "Trace VLoop::check_preconditions") \
-  flags(LOOP_ANALYZER,        "Trace VLoopAnalyzer::setup_submodules") \
-  flags(MEMORY_SLICES,        "Trace VLoopMemorySlices") \
-  flags(BODY,                 "Trace VLoopBody") \
-  flags(TYPES,                "Trace VLoopTypes") \
-  flags(POINTERS,             "Trace VLoopPointers") \
-  flags(DEPENDENCY_GRAPH,     "Trace VLoopDependencyGraph") \
-  flags(SW_ADJACENT_MEMOPS,   "Trace SuperWord::find_adjacent_memop_pairs") \
-  flags(SW_REJECTIONS,        "Trace SuperWord rejections (non vectorizations)") \
-  flags(SW_PACKSET,           "Trace SuperWord packset at different stages") \
-  flags(SW_INFO,              "Trace SuperWord info (equivalent to TraceSuperWord)") \
-  flags(SW_VERBOSE,           "Trace SuperWord verbose (all SW tags enabled)") \
-  flags(ALIGN_VECTOR,         "Trace AlignVector") \
-  flags(VTRANSFORM,           "Trace VTransform Graph") \
-  flags(ALL,                  "Trace everything (very verbose)")
+  flags(POINTER_PARSING,            "Trace VPointer/MemPointer parsing") \
+  flags(POINTER_ALIASING,           "Trace VPointer/MemPointer aliasing") \
+  flags(POINTER_ADJACENCY,          "Trace VPointer/MemPointer adjacency") \
+  flags(POINTER_OVERLAP,            "Trace VPointer/MemPointer overlap") \
+  flags(PRECONDITIONS,              "Trace VLoop::check_preconditions") \
+  flags(LOOP_ANALYZER,              "Trace VLoopAnalyzer::setup_submodules") \
+  flags(MEMORY_SLICES,              "Trace VLoopMemorySlices") \
+  flags(BODY,                       "Trace VLoopBody") \
+  flags(TYPES,                      "Trace VLoopTypes") \
+  flags(POINTERS,                   "Trace VLoopPointers") \
+  flags(DEPENDENCY_GRAPH,           "Trace VLoopDependencyGraph") \
+  flags(SW_ADJACENT_MEMOPS,         "Trace SuperWord::find_adjacent_memop_pairs") \
+  flags(SW_REJECTIONS,              "Trace SuperWord rejections (non vectorizations)") \
+  flags(SW_PACKSET,                 "Trace SuperWord packset at different stages") \
+  flags(SW_INFO,                    "Trace SuperWord info (equivalent to TraceSuperWord)") \
+  flags(SW_VERBOSE,                 "Trace SuperWord verbose (all SW tags enabled)") \
+  flags(ALIGN_VECTOR,               "Trace AlignVector") \
+  flags(SPECULATIVE_RUNTIME_CHECKS, "Trace VTransform::apply_speculative_runtime_checks") \
+  flags(VTRANSFORM,                 "Trace VTransform Graph") \
+  flags(ALL,                        "Trace everything (very verbose)")
 
 #define table_entry(name, description) name,
 enum TraceAutoVectorizationTag {
diff --git a/src/hotspot/share/opto/vectorization.cpp b/src/hotspot/share/opto/vectorization.cpp
index ffc2314a59b..e607a1065dd 100644
--- a/src/hotspot/share/opto/vectorization.cpp
+++ b/src/hotspot/share/opto/vectorization.cpp
@@ -93,9 +93,9 @@ VStatus VLoop::check_preconditions_helper() {
     return VStatus::make_failure(VLoop::FAILURE_BACKEDGE);
   }
 
-  // To align vector memory accesses in the main-loop, we will have to adjust
-  // the pre-loop limit.
   if (_cl->is_main_loop()) {
+    // To align vector memory accesses in the main-loop, we will have to adjust
+    // the pre-loop limit.
     CountedLoopEndNode* pre_end = _cl->find_pre_loop_end();
     if (pre_end == nullptr) {
       return VStatus::make_failure(VLoop::FAILURE_PRE_LOOP_LIMIT);
@@ -105,6 +105,41 @@ VStatus VLoop::check_preconditions_helper() {
       return VStatus::make_failure(VLoop::FAILURE_PRE_LOOP_LIMIT);
     }
     _pre_loop_end = pre_end;
+
+    // See if we find the infrastructure for speculative runtime-checks.
+    //  (1) Auto Vectorization Parse Predicate
+    Node* pre_ctrl = pre_loop_head()->in(LoopNode::EntryControl);
+    const Predicates predicates(pre_ctrl);
+    const PredicateBlock* predicate_block = predicates.auto_vectorization_check_block();
+    if (predicate_block->has_parse_predicate()) {
+      _auto_vectorization_parse_predicate_proj = predicate_block->parse_predicate_success_proj();
+    }
+
+    //  (2) Multiversioning fast-loop projection
+    IfTrueNode* before_predicates = predicates.entry()->isa_IfTrue();
+    if (before_predicates != nullptr &&
+        before_predicates->in(0)->is_If() &&
+        before_predicates->in(0)->in(1)->is_OpaqueMultiversioning()) {
+      _multiversioning_fast_proj = before_predicates;
+    }
+#ifndef PRODUCT
+    if (is_trace_preconditions() || is_trace_speculative_runtime_checks()) {
+      tty->print_cr(" Infrastructure for speculative runtime-checks:");
+      if (_auto_vectorization_parse_predicate_proj != nullptr) {
+        tty->print_cr("  auto_vectorization_parse_predicate_proj: speculate and trap");
+        _auto_vectorization_parse_predicate_proj->dump_bfs(5,0,"");
+      } else if (_multiversioning_fast_proj != nullptr) {
+        tty->print_cr("  multiversioning_fast_proj: speculate and multiversion");
+        _multiversioning_fast_proj->dump_bfs(5,0,"");
+      } else {
+        tty->print_cr("  Not found.");
+      }
+    }
+#endif
+    assert(_auto_vectorization_parse_predicate_proj == nullptr ||
+           _multiversioning_fast_proj == nullptr, "we should only have at most one of these");
+    assert(_cl->is_multiversion_fast_loop() == (_multiversioning_fast_proj != nullptr),
+           "must find the multiversion selector IFF loop is a multiversion fast loop");
   }
 
   return VStatus::make_success();
@@ -472,15 +507,28 @@ AlignmentSolution* AlignmentSolver::solve() const {
   //        + con                   + con                                     + C_const                   (sum of constant terms)
   //
   // We describe the 6 terms:
-  //   1) The "base" of the address is the address of a Java object (e.g. array),
-  //      and as such ObjectAlignmentInBytes (a power of 2) aligned. We have
-  //      defined aw = MIN(vector_width, ObjectAlignmentInBytes), which is also
+  //   1) The "base" of the address:
+  //        - For heap objects, this is the base of the object, and as such
+  //          ObjectAlignmentInBytes (a power of 2) aligned.
+  //        - For off-heap / native memory, the "base" has no alignment
+  //          gurantees. To ensure alignment we can do either of these:
+  //          - Add a runtime check to verify ObjectAlignmentInBytes alignment,
+  //            i.e. we can speculatively compile with an alignment assumption.
+  //            If we pass the check, we can go into the loop with the alignment
+  //            assumption, if we fail we have to trap/deopt or take the other
+  //            loop version without alignment assumptions.
+  //          - If runtime checks are not possible, then we return an empty
+  //            solution, i.e. we do not vectorize the corresponding pack.
+  //
+  //      Let us assume we have an object "base", or passed the alignment
+  //      runtime check for native "bases", hence we know:
+  //
+  //        base % ObjectAlignmentInBytes = 0
+  //
+  //      We defined aw = MIN(vector_width, ObjectAlignmentInBytes), which is
   //      a power of 2. And hence we know that "base" is thus also aw-aligned:
   //
-  //        base % ObjectAlignmentInBytes = 0     ==>    base % aw = 0
-  //
-  //      TODO: Note: we have been assuming that this also holds for native memory base
-  //                  addresses. This is incorrect, see JDK-8323582.
+  //        base % ObjectAlignmentInBytes = 0     ==>    base % aw = 0              (BASE_ALIGNED)
   //
   //   2) The "C_const" term is the sum of all constant terms. This is "con",
   //      plus "iv_scale * init" if it is constant.
@@ -505,6 +553,13 @@ AlignmentSolution* AlignmentSolver::solve() const {
   //   6) The "C_main * main_iter" term represents how much the iv is increased
   //      during "main_iter" main-loop iterations.
 
+  // For native memory, we must add a runtime-check that "base % ObjectAlignmentInBytes = ",
+  // to ensure (BASE_ALIGNED). If we cannot add this runtime-check, we have no guarantee on
+  // its alignment.
+  if (!_vpointer.mem_pointer().base().is_object() && !_are_speculative_checks_possible) {
+    return new EmptyAlignmentSolution("Cannot add speculative check for native memory alignment.");
+  }
+
   // Attribute init (i.e. _init_node) either to C_const or to C_init term.
   const int C_const_init = _init_node->is_ConI() ? _init_node->as_ConI()->get_int() : 0;
   const int C_const =      _vpointer.con() + C_const_init * iv_scale();
@@ -521,8 +576,7 @@ AlignmentSolution* AlignmentSolver::solve() const {
   // We must find a pre_iter, such that adr is aw aligned: adr % aw = 0. Note, that we are defining the
   // modulo operator "%" such that the remainder is always positive, see AlignmentSolution::mod(i, q).
   //
-  // TODO: Note: the following assumption is incorrect for native memory bases, see JDK-8323582.
-  // Since "base % aw = 0", we only need to ensure alignment of the other 5 terms:
+  // Since "base % aw = 0" (BASE_ALIGNED), we only need to ensure alignment of the other 5 terms:
   //
   //   (C_const + C_invar * var_invar + C_init * var_init + C_pre * pre_iter + C_main * main_iter) % aw = 0      (1)
   //
@@ -878,8 +932,7 @@ AlignmentSolution* AlignmentSolver::solve() const {
   //         + iv_scale * pre_stride * pre_iter
   //         + iv_scale * main_stride * main_iter)) % aw =
   //
-  //   -> base aligned: base % aw = 0
-  //        TODO: Note: this assumption is incorrect for native memory bases, see JDK-8323582.
+  //   -> apply (BASE_ALIGNED): base % aw = 0
   //   -> main-loop iterations aligned (2): C_main % aw = (iv_scale * main_stride) % aw = 0
   //   (con + invar + iv_scale * init + iv_scale * pre_stride * pre_iter) % aw =
   //
@@ -958,7 +1011,7 @@ void AlignmentSolver::trace_start_solve() const {
                   _pre_stride, _main_stride);
     // adr = base + con + invar + iv_scale * iv
     tty->print("  adr = base[%d]", base().object_or_native()->_idx);
-    tty->print(" + invar + iv_scale(%d) * iv + con(%d)", iv_scale(), _vpointer.con());
+    tty->print_cr(" + invar + iv_scale(%d) * iv + con(%d)", iv_scale(), _vpointer.con());
   }
 }
 
diff --git a/src/hotspot/share/opto/vectorization.hpp b/src/hotspot/share/opto/vectorization.hpp
index cb1e8c45856..620eac25c9b 100644
--- a/src/hotspot/share/opto/vectorization.hpp
+++ b/src/hotspot/share/opto/vectorization.hpp
@@ -85,6 +85,14 @@ private:
   PhiNode* _iv;
   CountedLoopEndNode* _pre_loop_end; // cache access to pre-loop for main loops only
 
+  // We can add speculative runtime-checks if we have one of these:
+  //  - Auto Vectorization Parse Predicate:
+  //      pass all checks or trap -> recompile without this predicate.
+  //  - Multiversioning fast-loop projection:
+  //      pass all checks or go to slow-path-loop, where we have no speculative assumptions.
+  ParsePredicateSuccessProj* _auto_vectorization_parse_predicate_proj;
+  IfTrueNode* _multiversioning_fast_proj;
+
   NOT_PRODUCT(VTrace _vtrace;)
   NOT_PRODUCT(TraceMemPointer _mptrace;)
 
@@ -104,7 +112,9 @@ public:
     _cl        (nullptr),
     _cl_exit   (nullptr),
     _iv        (nullptr),
-    _pre_loop_end (nullptr)
+    _pre_loop_end (nullptr),
+    _auto_vectorization_parse_predicate_proj(nullptr),
+    _multiversioning_fast_proj(nullptr)
 #ifndef PRODUCT
     COMMA
     _mptrace(TraceMemPointer(
@@ -138,6 +148,19 @@ public:
     return head;
   };
 
+  ParsePredicateSuccessProj* auto_vectorization_parse_predicate_proj() const {
+    return _auto_vectorization_parse_predicate_proj;
+  }
+
+  IfTrueNode* multiversioning_fast_proj() const {
+    return _multiversioning_fast_proj;
+  }
+
+  bool are_speculative_checks_possible() const {
+    return _auto_vectorization_parse_predicate_proj != nullptr ||
+           _multiversioning_fast_proj != nullptr;
+  }
+
   // Estimate maximum size for data structures, to avoid repeated reallocation
   int estimated_body_length() const { return lpt()->_body.size(); };
   int estimated_node_count()  const { return (int)(1.10 * phase()->C->unique()); };
@@ -176,6 +199,10 @@ public:
   bool is_trace_vpointers() const {
     return _vtrace.is_trace(TraceAutoVectorizationTag::POINTERS);
   }
+
+  bool is_trace_speculative_runtime_checks() const {
+    return _vtrace.is_trace(TraceAutoVectorizationTag::SPECULATIVE_RUNTIME_CHECKS);
+  }
 #endif
 
   // Is the node in the basic block of the loop?
@@ -1296,6 +1323,14 @@ private:
   const int      _pre_stride;     // address increment per pre-loop iteration
   const int      _main_stride;    // address increment per main-loop iteration
 
+  // For native bases, we have no alignment guarantee. This means we cannot in
+  // general guarantee alignment statically. But we can check alignment with a
+  // speculative runtime check, see VTransform::apply_speculative_runtime_checks.
+  // For this, we need find the Predicate for auto vectorization checks, or else
+  // we need to find the multiversion_if. If we cannot find either, then we
+  // cannot make any speculative runtime checks.
+  const bool     _are_speculative_checks_possible;
+
   DEBUG_ONLY( const bool _is_trace; );
 
   static const MemNode* mem_ref_not_null(const MemNode* mem_ref) {
@@ -1309,7 +1344,8 @@ public:
                   const uint vector_length,
                   const Node* init_node,
                   const int pre_stride,
-                  const int main_stride
+                  const int main_stride,
+                  const bool are_speculative_checks_possible
                   DEBUG_ONLY( COMMA const bool is_trace)
                   ) :
       _vpointer(          vpointer),
@@ -1318,7 +1354,8 @@ public:
       _aw(                MIN2(_vector_width, ObjectAlignmentInBytes)),
       _init_node(         init_node),
       _pre_stride(        pre_stride),
-      _main_stride(       main_stride)
+      _main_stride(       main_stride),
+      _are_speculative_checks_possible(are_speculative_checks_possible)
       DEBUG_ONLY( COMMA _is_trace(is_trace) )
   {
     assert(_mem_ref != nullptr &&
diff --git a/src/hotspot/share/opto/vtransform.cpp b/src/hotspot/share/opto/vtransform.cpp
index 4730f3ac134..18b5c09acb8 100644
--- a/src/hotspot/share/opto/vtransform.cpp
+++ b/src/hotspot/share/opto/vtransform.cpp
@@ -23,6 +23,7 @@
 
 #include "opto/vtransform.hpp"
 #include "opto/vectornode.hpp"
+#include "opto/castnode.hpp"
 #include "opto/convertnode.hpp"
 
 void VTransformGraph::add_vtnode(VTransformNode* vtnode) {
@@ -143,6 +144,94 @@ void VTransformApplyResult::trace(VTransformNode* vtnode) const {
 }
 #endif
 
+void VTransform::apply_speculative_runtime_checks() {
+  if (VLoop::vectors_should_be_aligned()) {
+#ifdef ASSERT
+    if (_trace._align_vector || _trace._speculative_runtime_checks) {
+      tty->print_cr("\nVTransform::apply_speculative_runtime_checks: native memory alignment");
+    }
+#endif
+
+    const GrowableArray<VTransformNode*>& vtnodes = _graph.vtnodes();
+    for (int i = 0; i < vtnodes.length(); i++) {
+      VTransformVectorNode* vtn = vtnodes.at(i)->isa_Vector();
+      if (vtn == nullptr) { continue; }
+      MemNode* p0 = vtn->nodes().at(0)->isa_Mem();
+      if (p0 == nullptr) { continue; }
+      const VPointer& vp = vpointer(p0);
+      if (vp.mem_pointer().base().is_object()) { continue; }
+      assert(vp.mem_pointer().base().is_native(), "VPointer base must be object or native");
+
+      // We have a native memory reference. Build a runtime check for it.
+      // See: AlignmentSolver::solve
+      // In a future RFE we may be able to speculate on invar alignment as
+      // well, and allow vectorization of more cases.
+      add_speculative_alignment_check(vp.mem_pointer().base().native(), ObjectAlignmentInBytes);
+    }
+  }
+}
+
+#define TRACE_SPECULATIVE_ALIGNMENT_CHECK(node) {                     \
+  DEBUG_ONLY(                                                         \
+    if (_trace._align_vector || _trace._speculative_runtime_checks) { \
+      tty->print("  " #node ": ");                                    \
+      node->dump();                                                   \
+    }                                                                 \
+  )                                                                   \
+}                                                                     \
+
+// Check: (node % alignment) == 0.
+void VTransform::add_speculative_alignment_check(Node* node, juint alignment) {
+  TRACE_SPECULATIVE_ALIGNMENT_CHECK(node);
+  Node* ctrl = phase()->get_ctrl(node);
+
+  // Cast adr/long -> int
+  if (node->bottom_type()->basic_type() == T_ADDRESS) {
+    // adr -> int/long
+    node = new CastP2XNode(nullptr, node);
+    phase()->register_new_node(node, ctrl);
+    TRACE_SPECULATIVE_ALIGNMENT_CHECK(node);
+  }
+  if (node->bottom_type()->basic_type() == T_LONG) {
+    // long -> int
+    node  = new ConvL2INode(node);
+    phase()->register_new_node(node, ctrl);
+    TRACE_SPECULATIVE_ALIGNMENT_CHECK(node);
+  }
+
+  Node* mask_alignment = igvn().intcon(alignment-1);
+  Node* base_alignment = new AndINode(node, mask_alignment);
+  phase()->register_new_node(base_alignment, ctrl);
+  TRACE_SPECULATIVE_ALIGNMENT_CHECK(mask_alignment);
+  TRACE_SPECULATIVE_ALIGNMENT_CHECK(base_alignment);
+
+  Node* zero = igvn().intcon(0);
+  Node* cmp_alignment = CmpNode::make(base_alignment, zero, T_INT, false);
+  BoolNode* bol_alignment = new BoolNode(cmp_alignment, BoolTest::eq);
+  phase()->register_new_node(cmp_alignment, ctrl);
+  phase()->register_new_node(bol_alignment, ctrl);
+  TRACE_SPECULATIVE_ALIGNMENT_CHECK(cmp_alignment);
+  TRACE_SPECULATIVE_ALIGNMENT_CHECK(bol_alignment);
+
+  add_speculative_check(bol_alignment);
+}
+
+void VTransform::add_speculative_check(BoolNode* bol) {
+  assert(_vloop.are_speculative_checks_possible(), "otherwise we cannot make speculative assumptions");
+  ParsePredicateSuccessProj* parse_predicate_proj = _vloop.auto_vectorization_parse_predicate_proj();
+  IfTrueNode* new_check_proj = nullptr;
+  if (parse_predicate_proj != nullptr) {
+    new_check_proj = phase()->create_new_if_for_predicate(parse_predicate_proj, nullptr,
+                                                          Deoptimization::Reason_auto_vectorization_check,
+                                                          Op_If);
+  } else {
+    new_check_proj = phase()->create_new_if_for_multiversion(_vloop.multiversioning_fast_proj());
+  }
+  Node* iff_speculate = new_check_proj->in(0);
+  igvn().replace_input_of(iff_speculate, 1, bol);
+  TRACE_SPECULATIVE_ALIGNMENT_CHECK(iff_speculate);
+}
+
 // Helper-class for VTransformGraph::has_store_to_load_forwarding_failure.
 // It wraps a VPointer. The VPointer has an iv_offset applied, which
 // simulates a virtual unrolling. They represent the memory region:
diff --git a/src/hotspot/share/opto/vtransform.hpp b/src/hotspot/share/opto/vtransform.hpp
index 4fc68c7b4df..308578ecb57 100644
--- a/src/hotspot/share/opto/vtransform.hpp
+++ b/src/hotspot/share/opto/vtransform.hpp
@@ -109,16 +109,19 @@ public:
   const bool _verbose;
   const bool _rejections;
   const bool _align_vector;
+  const bool _speculative_runtime_checks;
   const bool _info;
 
   VTransformTrace(const VTrace& vtrace,
                   const bool is_trace_rejections,
                   const bool is_trace_align_vector,
+                  const bool is_trace_speculative_runtime_checks,
                   const bool is_trace_info) :
-    _verbose     (vtrace.is_trace(TraceAutoVectorizationTag::ALL)),
-    _rejections  (_verbose | is_trace_vtransform(vtrace) | is_trace_rejections),
-    _align_vector(_verbose | is_trace_vtransform(vtrace) | is_trace_align_vector),
-    _info        (_verbose | is_trace_vtransform(vtrace) | is_trace_info) {}
+    _verbose                   (vtrace.is_trace(TraceAutoVectorizationTag::ALL)),
+    _rejections                (_verbose | is_trace_vtransform(vtrace) | is_trace_rejections),
+    _align_vector              (_verbose | is_trace_vtransform(vtrace) | is_trace_align_vector),
+    _speculative_runtime_checks(_verbose | is_trace_vtransform(vtrace) | is_trace_speculative_runtime_checks),
+    _info                      (_verbose | is_trace_vtransform(vtrace) | is_trace_info) {}
 
   static bool is_trace_vtransform(const VTrace& vtrace) {
     return vtrace.is_trace(TraceAutoVectorizationTag::VTRANSFORM);
@@ -245,6 +248,10 @@ private:
   void determine_mem_ref_and_aw_for_main_loop_alignment();
   void adjust_pre_loop_limit_to_align_main_loop_vectors();
 
+  void apply_speculative_runtime_checks();
+  void add_speculative_alignment_check(Node* node, juint alignment);
+  void add_speculative_check(BoolNode* bol);
+
   void apply_vectorization() const;
 };
 
diff --git a/src/hotspot/share/runtime/deoptimization.cpp b/src/hotspot/share/runtime/deoptimization.cpp
index 2945e98bd2b..4a51e2cbd92 100644
--- a/src/hotspot/share/runtime/deoptimization.cpp
+++ b/src/hotspot/share/runtime/deoptimization.cpp
@@ -2717,6 +2717,7 @@ const char* Deoptimization::_trap_reason_name[] = {
   "intrinsic" JVMCI_ONLY("_or_type_checked_inlining"),
   "bimorphic" JVMCI_ONLY("_or_optimized_type_check"),
   "profile_predicate",
+  "auto_vectorization_check",
   "unloaded",
   "uninitialized",
   "initialized",
diff --git a/src/hotspot/share/runtime/deoptimization.hpp b/src/hotspot/share/runtime/deoptimization.hpp
index 0a2bafb3830..42cf25e5162 100644
--- a/src/hotspot/share/runtime/deoptimization.hpp
+++ b/src/hotspot/share/runtime/deoptimization.hpp
@@ -98,6 +98,7 @@ class Deoptimization : AllStatic {
 #endif
 
     Reason_profile_predicate,     // compiler generated predicate moved from frequent branch in a loop failed
+    Reason_auto_vectorization_check, // compiler generated (speculative) auto vectorization checks failed
 
     // recorded per method
     Reason_unloaded,              // unloaded class or constant pool entry
diff --git a/src/hotspot/share/runtime/vmStructs.cpp b/src/hotspot/share/runtime/vmStructs.cpp
index 1c776f7b8e2..c9d93930d63 100644
--- a/src/hotspot/share/runtime/vmStructs.cpp
+++ b/src/hotspot/share/runtime/vmStructs.cpp
@@ -2269,6 +2269,7 @@
   declare_constant(Deoptimization::Reason_age)                            \
   declare_constant(Deoptimization::Reason_predicate)                      \
   declare_constant(Deoptimization::Reason_loop_limit_check)               \
+  declare_constant(Deoptimization::Reason_auto_vectorization_check)       \
   declare_constant(Deoptimization::Reason_speculate_class_check)          \
   declare_constant(Deoptimization::Reason_speculate_null_check)           \
   declare_constant(Deoptimization::Reason_speculate_null_assert)          \
diff --git a/test/hotspot/jtreg/compiler/loopopts/superword/TestMemorySegmentUnalignedAddress.java b/test/hotspot/jtreg/compiler/loopopts/superword/TestMemorySegmentUnalignedAddress.java
new file mode 100644
index 00000000000..13fd9ff9b17
--- /dev/null
+++ b/test/hotspot/jtreg/compiler/loopopts/superword/TestMemorySegmentUnalignedAddress.java
@@ -0,0 +1,303 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package compiler.loopopts.superword;
+
+import compiler.lib.ir_framework.*;
+import compiler.lib.verify.*;
+import jdk.test.lib.Utils;
+import java.nio.ByteBuffer;
+import java.util.Map;
+import java.util.HashMap;
+import java.util.Random;
+import java.lang.foreign.*;
+
+/*
+ * @test id=byte-buffer-direct
+ * @bug 8323582
+ * @summary Test vectorization of loops over MemorySegment, with native memory where the address is not always aligned.
+ * @library /test/lib /
+ * @run driver compiler.loopopts.superword.TestMemorySegmentUnalignedAddress ByteBufferDirect
+ */
+
+/*
+ * @test id=byte-buffer-direct-AlignVector
+ * @bug 8323582
+ * @summary Test vectorization of loops over MemorySegment, with native memory where the address is not always aligned.
+ * @library /test/lib /
+ * @run driver compiler.loopopts.superword.TestMemorySegmentUnalignedAddress ByteBufferDirect AlignVector
+ */
+
+/*
+ * @test id=byte-buffer-direct-VerifyAlignVector
+ * @bug 8323582
+ * @summary Test vectorization of loops over MemorySegment, with native memory where the address is not always aligned.
+ * @library /test/lib /
+ * @run driver compiler.loopopts.superword.TestMemorySegmentUnalignedAddress ByteBufferDirect VerifyAlignVector
+ */
+
+/*
+ * @test id=native
+ * @bug 8323582
+ * @summary Test vectorization of loops over MemorySegment, with native memory where the address is not always aligned.
+ * @library /test/lib /
+ * @run driver compiler.loopopts.superword.TestMemorySegmentUnalignedAddress Native
+ */
+
+/*
+ * @test id=native-AlignVector
+ * @bug 8323582
+ * @summary Test vectorization of loops over MemorySegment, with native memory where the address is not always aligned.
+ * @library /test/lib /
+ * @run driver compiler.loopopts.superword.TestMemorySegmentUnalignedAddress Native AlignVector
+ */
+
+/*
+ * @test id=native-VerifyAlignVector
+ * @bug 8323582
+ * @summary Test vectorization of loops over MemorySegment, with native memory where the address is not always aligned.
+ * @library /test/lib /
+ * @run driver compiler.loopopts.superword.TestMemorySegmentUnalignedAddress Native VerifyAlignVector
+ */
+
+public class TestMemorySegmentUnalignedAddress {
+    public static void main(String[] args) {
+        TestFramework framework = new TestFramework(TestMemorySegmentUnalignedAddressImpl.class);
+        framework.addFlags("-DmemorySegmentProviderNameForTestVM=" + args[0]);
+        if (args.length > 1) {
+            switch (args[1]) {
+                case "AlignVector" ->       { framework.addFlags("-XX:+AlignVector"); }
+                case "VerifyAlignVector" -> { framework.addFlags("-XX:+AlignVector", "-XX:+IgnoreUnrecognizedVMOptions", "-XX:+VerifyAlignVector"); }
+                default ->                  { throw new RuntimeException("unexpected: " + args[1]); }
+            }
+        }
+        framework.setDefaultWarmup(100);
+        framework.start();
+    }
+}
+
+class TestMemorySegmentUnalignedAddressImpl {
+    static final int SIZE = 10_000;
+    static final int BACKING_SIZE = 10_000 + 1;
+    static final Random RANDOM = Utils.getRandomInstance();
+
+    interface TestFunction {
+        Object run(int i);
+    }
+
+    interface MemorySegmentProvider {
+        MemorySegment newMemorySegment();
+    }
+
+    static MemorySegmentProvider provider;
+
+    static {
+        String providerName = System.getProperty("memorySegmentProviderNameForTestVM");
+        provider = switch (providerName) {
+            case "ByteBufferDirect" -> TestMemorySegmentUnalignedAddressImpl::newMemorySegmentOfByteBufferDirect;
+            case "Native"           -> TestMemorySegmentUnalignedAddressImpl::newMemorySegmentOfNative;
+            default -> throw new RuntimeException("Test argument not recognized: " + providerName);
+        };
+    }
+
+    // List of tests
+    Map<String, TestFunction> tests = new HashMap<>();
+
+    // List of gold, the results from the first run before compilation
+    Map<String, Object> golds = new HashMap<>();
+
+    public TestMemorySegmentUnalignedAddressImpl () {
+        // Generate two MemorySegments as inputs
+        MemorySegment a = sliceAligned(newMemorySegment());
+        MemorySegment b = sliceAligned(newMemorySegment());
+        fillRandom(a);
+        fillRandom(b);
+
+        // Add all tests to list
+        tests.put("testAlwaysAligned", (int i) -> {
+            MemorySegment ms = newMemorySegment();
+            MemorySegment slice = sliceAligned(ms);
+            copy(a, slice);
+            return testAlwaysAligned(slice);
+        });
+        tests.put("testAlwaysUnaligned", (int i) -> {
+            MemorySegment ms = newMemorySegment();
+            MemorySegment slice = sliceUnaligned(ms);
+            copy(a, slice);
+            return testAlwaysUnaligned(slice);
+        });
+        tests.put("testMixedAlignedAndUnaligned", (int i) -> {
+            MemorySegment ms = newMemorySegment();
+            MemorySegment slice = (i % 2 == 0) ? sliceUnaligned(ms) : sliceAligned(ms);
+            copy(a, slice);
+            return testMixedAlignedAndUnaligned(slice);
+        });
+
+        // Compute gold value for all test methods before compilation
+        for (Map.Entry<String,TestFunction> entry : tests.entrySet()) {
+            String name = entry.getKey();
+            TestFunction test = entry.getValue();
+            Object gold = test.run(0);
+            golds.put(name, gold);
+        }
+    }
+
+    MemorySegment sliceAligned(MemorySegment src) {
+        return src.asSlice(0, SIZE);
+    }
+
+    MemorySegment sliceUnaligned(MemorySegment src) {
+        return src.asSlice(1, SIZE);
+    }
+
+    MemorySegment newMemorySegment() {
+        return provider.newMemorySegment();
+    }
+
+    static void copy(MemorySegment src, MemorySegment dst) {
+        MemorySegment.copy(src, 0, dst, 0, src.byteSize());
+    }
+
+    static MemorySegment newMemorySegmentOfByteBufferDirect() {
+        return MemorySegment.ofBuffer(ByteBuffer.allocateDirect(BACKING_SIZE));
+    }
+
+    static MemorySegment newMemorySegmentOfNative() {
+        // Auto arena: GC decides when there is no reference to the MemorySegment,
+        // and then it deallocates the backing memory.
+        return Arena.ofAuto().allocate(BACKING_SIZE, 1);
+    }
+
+    static void fillRandom(MemorySegment data) {
+        for (int i = 0; i < (int)data.byteSize(); i++) {
+            data.set(ValueLayout.JAVA_BYTE, i, (byte)RANDOM.nextInt());
+        }
+    }
+
+    static void verify(String name, Object gold, Object result) {
+        try {
+            Verify.checkEQ(gold, result);
+        } catch (VerifyException e) {
+            throw new RuntimeException("Verify: wrong result in " + name, e);
+        }
+    }
+
+    static int runInvocationCounter = 0;
+
+    @Run(test = {"testAlwaysAligned",
+                 "testAlwaysUnaligned",
+                 "testMixedAlignedAndUnaligned"})
+    void runTests() {
+        runInvocationCounter++;
+        for (Map.Entry<String,TestFunction> entry : tests.entrySet()) {
+            String name = entry.getKey();
+            TestFunction test = entry.getValue();
+            // Recall gold value from before compilation
+            Object gold = golds.get(name);
+            // Compute new result
+            Object result = test.run(runInvocationCounter);
+            // Compare gold and new result
+            verify(name, gold, result);
+        }
+    }
+
+    @Test
+    @IR(counts = {IRNode.LOAD_VECTOR_I, "> 0",
+                  IRNode.ADD_VI,        "> 0",
+                  IRNode.STORE_VECTOR,  "> 0",
+                  "multiversion",       "= 0"},
+        applyIfPlatform = {"64-bit", "true"},
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"},
+        phase = CompilePhase.PRINT_IDEAL)
+    // We never fail the alignment check in the auto vectorization Predicate,
+    // hence we never even create the multiversioned loops.
+    static Object testAlwaysAligned(MemorySegment ms) {
+        for (long i = 0; i < ms.byteSize(); i += 4) {
+            int v = ms.get(ValueLayout.JAVA_INT_UNALIGNED, i);
+            ms.set(ValueLayout.JAVA_INT_UNALIGNED, i, (int)(v + 1));
+        }
+        return new Object[]{ ms };
+    }
+
+    @Test
+    @IR(counts = {IRNode.LOAD_VECTOR_I, "> 0",
+                  IRNode.ADD_VI,        "> 0",
+                  IRNode.STORE_VECTOR,  "> 0",
+                  "multiversion_fast",  "= 4",  // pre, main, drain, post
+                  "multiversion_slow",  "= 2"}, // main, post
+        applyIf = {"AlignVector", "true"},
+        applyIfPlatform = {"64-bit", "true"},
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"},
+        phase = CompilePhase.PRINT_IDEAL)
+    // We add alignment checks to the auto vectorization Predicate. It fails
+    // at runtime, deopts, and recompiles with multiversioning.
+    @IR(counts = {IRNode.LOAD_VECTOR_I, "> 0",
+                  IRNode.ADD_VI,        "> 0",
+                  IRNode.STORE_VECTOR,  "> 0",
+                  "multiversion_fast",  "= 0",
+                  "multiversion_slow",  "= 0"},
+        applyIf = {"AlignVector", "false"},
+        applyIfPlatform = {"64-bit", "true"},
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"},
+        phase = CompilePhase.PRINT_IDEAL)
+    // We never add any conditions to the auto vectorization Predicate, so
+    // we also never deopt and never end up multiversioning.
+    static Object testAlwaysUnaligned(MemorySegment ms) {
+        for (long i = 0; i < ms.byteSize(); i += 4) {
+            int v = ms.get(ValueLayout.JAVA_INT_UNALIGNED, i);
+            ms.set(ValueLayout.JAVA_INT_UNALIGNED, i, (int)(v + 1));
+        }
+        return new Object[]{ ms };
+    }
+
+    @Test
+    @IR(counts = {IRNode.LOAD_VECTOR_I, "> 0",
+                  IRNode.ADD_VI,        "> 0",
+                  IRNode.STORE_VECTOR,  "> 0",
+                  "multiversion_fast",  "= 4",  // pre, main, drain, post
+                  "multiversion_slow",  "= 2"}, // main, post
+        applyIf = {"AlignVector", "true"},
+        applyIfPlatform = {"64-bit", "true"},
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"},
+        phase = CompilePhase.PRINT_IDEAL)
+    // We add alignment checks to the auto vectorization Predicate. It fails
+    // at runtime, deopts, and recompiles with multiversioning.
+    @IR(counts = {IRNode.LOAD_VECTOR_I, "> 0",
+                  IRNode.ADD_VI,        "> 0",
+                  IRNode.STORE_VECTOR,  "> 0",
+                  "multiversion_fast",  "= 0",
+                  "multiversion_slow",  "= 0"},
+        applyIf = {"AlignVector", "false"},
+        applyIfPlatform = {"64-bit", "true"},
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"},
+        phase = CompilePhase.PRINT_IDEAL)
+    // We never add any conditions to the auto vectorization Predicate, so
+    // we also never deopt and never end up multiversioning.
+    static Object testMixedAlignedAndUnaligned(MemorySegment ms) {
+        for (long i = 0; i < ms.byteSize(); i += 4) {
+            int v = ms.get(ValueLayout.JAVA_INT_UNALIGNED, i);
+            ms.set(ValueLayout.JAVA_INT_UNALIGNED, i, (int)(v + 1));
+        }
+        return new Object[]{ ms };
+    }
+}

From e4d3c97c0f388fc4b1684b78844f2166277ffd91 Mon Sep 17 00:00:00 2001
From: Richard Reingruber <rrich@openjdk.org>
Date: Thu, 27 Feb 2025 09:24:15 +0000
Subject: [PATCH 149/587] 8350111: [PPC] AsyncGetCallTrace crashes when called
 while handling SIGTRAP

Reviewed-by: mdoerr, stuefe
---
 src/hotspot/cpu/ppc/frame_ppc.cpp | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/hotspot/cpu/ppc/frame_ppc.cpp b/src/hotspot/cpu/ppc/frame_ppc.cpp
index 38c26e5e497..6b6a792117d 100644
--- a/src/hotspot/cpu/ppc/frame_ppc.cpp
+++ b/src/hotspot/cpu/ppc/frame_ppc.cpp
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2000, 2025, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2012, 2024 SAP SE. All rights reserved.
+ * Copyright (c) 2012, 2025 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -195,6 +195,15 @@ bool frame::safe_for_sender(JavaThread *thread) {
     return false;
   }
 
+  if (sender_pc() == nullptr) {
+    // Likely the return pc was not yet stored to stack. We rather discard this
+    // sample also because we would hit an assertion in frame::setup(). We can
+    // find any other random value if the return pc was not yet stored to
+    // stack. We rely on consistency checks to handle this (see
+    // e.g. find_initial_Java_frame())
+    return false;
+  }
+
   return true;
 }
 

From 4522f128a3953e3ae885f96c463cb581eaa1e1e7 Mon Sep 17 00:00:00 2001
From: Andrew Dinn <adinn@openjdk.org>
Date: Thu, 27 Feb 2025 09:31:14 +0000
Subject: [PATCH 150/587] 8349921: Crash in codeBuffer.cpp:1004:
 guarantee(sect->end() <= tend) failed: sanity

Reviewed-by: kvn, dlong
---
 src/hotspot/cpu/aarch64/stubDeclarations_aarch64.hpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/hotspot/cpu/aarch64/stubDeclarations_aarch64.hpp b/src/hotspot/cpu/aarch64/stubDeclarations_aarch64.hpp
index 1830bdf4a88..3b5d0640ea4 100644
--- a/src/hotspot/cpu/aarch64/stubDeclarations_aarch64.hpp
+++ b/src/hotspot/cpu/aarch64/stubDeclarations_aarch64.hpp
@@ -44,7 +44,7 @@
                                        do_arch_blob,                    \
                                        do_arch_entry,                   \
                                        do_arch_entry_init)              \
-  do_arch_blob(compiler, 30000 ZGC_ONLY(+10000))                        \
+  do_arch_blob(compiler, 35000 ZGC_ONLY(+5000))                         \
   do_stub(compiler, vector_iota_indices)                                \
   do_arch_entry(aarch64, compiler, vector_iota_indices,                 \
                 vector_iota_indices, vector_iota_indices)               \
@@ -109,7 +109,7 @@
                                     do_arch_blob,                       \
                                     do_arch_entry,                      \
                                     do_arch_entry_init)                 \
-  do_arch_blob(final, 20000 ZGC_ONLY(+100000))                          \
+  do_arch_blob(final, 20000 ZGC_ONLY(+60000))                           \
   do_stub(final, copy_byte_f)                                           \
   do_arch_entry(aarch64, final, copy_byte_f, copy_byte_f,               \
                 copy_byte_f)                                            \

From 01bd7e417ee3d39067370e616660b7f5c723dc26 Mon Sep 17 00:00:00 2001
From: Xiaolong Peng <xpeng@openjdk.org>
Date: Thu, 27 Feb 2025 09:49:29 +0000
Subject: [PATCH 151/587] 8350314: Shenandoah: Capture thread state sync times
 in GC timings

Reviewed-by: ysr, shade, wkemper
---
 .../gc/shenandoah/shenandoahConcurrentGC.cpp  | 20 +++++++++++++++++++
 .../gc/shenandoah/shenandoahDegeneratedGC.cpp |  4 ++++
 .../share/gc/shenandoah/shenandoahFullGC.cpp  |  5 +++++
 .../share/gc/shenandoah/shenandoahOldGC.cpp   |  5 +++++
 .../gc/shenandoah/shenandoahPhaseTimings.hpp  |  6 ++++++
 .../gc/shenandoah/shenandoahVMOperations.cpp  |  7 -------
 6 files changed, 40 insertions(+), 7 deletions(-)

diff --git a/src/hotspot/share/gc/shenandoah/shenandoahConcurrentGC.cpp b/src/hotspot/share/gc/shenandoah/shenandoahConcurrentGC.cpp
index beff760cdfe..5327c9d230e 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahConcurrentGC.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahConcurrentGC.cpp
@@ -688,6 +688,11 @@ void ShenandoahConcurrentGC::op_init_mark() {
   if (ShenandoahPacing) {
     heap->pacer()->setup_for_mark();
   }
+
+  {
+    ShenandoahTimingsTracker timing(ShenandoahPhaseTimings::init_propagate_gc_state);
+    heap->propagate_gc_state_to_all_threads();
+  }
 }
 
 void ShenandoahConcurrentGC::op_mark_roots() {
@@ -755,6 +760,11 @@ void ShenandoahConcurrentGC::op_final_mark() {
       }
     }
   }
+
+  {
+    ShenandoahTimingsTracker timing(ShenandoahPhaseTimings::final_mark_propagate_gc_state);
+    heap->propagate_gc_state_to_all_threads();
+  }
 }
 
 bool ShenandoahConcurrentGC::has_in_place_promotions(ShenandoahHeap* heap) {
@@ -1158,6 +1168,11 @@ void ShenandoahConcurrentGC::op_final_update_refs() {
   }
 
   heap->rebuild_free_set(true /*concurrent*/);
+
+  {
+    ShenandoahTimingsTracker timing(ShenandoahPhaseTimings::final_update_refs_propagate_gc_state);
+    heap->propagate_gc_state_to_all_threads();
+  }
 }
 
 void ShenandoahConcurrentGC::op_final_roots() {
@@ -1182,6 +1197,11 @@ void ShenandoahConcurrentGC::op_final_roots() {
   if (VerifyAfterGC) {
     Universe::verify();
   }
+
+  {
+    ShenandoahTimingsTracker timing(ShenandoahPhaseTimings::final_roots_propagate_gc_state);
+    heap->propagate_gc_state_to_all_threads();
+  }
 }
 
 void ShenandoahConcurrentGC::op_cleanup_complete() {
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahDegeneratedGC.cpp b/src/hotspot/share/gc/shenandoah/shenandoahDegeneratedGC.cpp
index 17af519392e..95981969d06 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahDegeneratedGC.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahDegeneratedGC.cpp
@@ -83,6 +83,10 @@ void ShenandoahDegenGC::entry_degenerated() {
   heap->set_degenerated_gc_in_progress(true);
   op_degenerated();
   heap->set_degenerated_gc_in_progress(false);
+  {
+    ShenandoahTimingsTracker timing(ShenandoahPhaseTimings::degen_gc_propagate_gc_state);
+    heap->propagate_gc_state_to_all_threads();
+  }
 }
 
 void ShenandoahDegenGC::op_degenerated() {
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahFullGC.cpp b/src/hotspot/share/gc/shenandoah/shenandoahFullGC.cpp
index 5f8543ca751..474838c3bb3 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahFullGC.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahFullGC.cpp
@@ -130,6 +130,11 @@ void ShenandoahFullGC::op_full(GCCause::Cause cause) {
   // Regardless if progress was made, we record that we completed a "successful" full GC.
   heap->global_generation()->heuristics()->record_success_full();
   heap->shenandoah_policy()->record_success_full();
+
+  {
+    ShenandoahTimingsTracker timing(ShenandoahPhaseTimings::full_gc_propagate_gc_state);
+    heap->propagate_gc_state_to_all_threads();
+  }
 }
 
 void ShenandoahFullGC::do_it(GCCause::Cause gc_cause) {
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahOldGC.cpp b/src/hotspot/share/gc/shenandoah/shenandoahOldGC.cpp
index 708d27db165..2f5abf99200 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahOldGC.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahOldGC.cpp
@@ -78,6 +78,11 @@ void ShenandoahOldGC::op_final_mark() {
     if (VerifyAfterGC) {
       Universe::verify();
     }
+
+    {
+      ShenandoahTimingsTracker timing(ShenandoahPhaseTimings::final_mark_propagate_gc_state);
+      heap->propagate_gc_state_to_all_threads();
+    }
   }
 }
 
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahPhaseTimings.hpp b/src/hotspot/share/gc/shenandoah/shenandoahPhaseTimings.hpp
index 7a8fed9f548..eab1e279b0f 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahPhaseTimings.hpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahPhaseTimings.hpp
@@ -57,6 +57,7 @@ class outputStream;
   f(init_swap_rset,                                 "  Swap Remembered Set")           \
   f(init_transfer_satb,                             "  Transfer Old From SATB")        \
   f(init_update_region_states,                      "  Update Region States")          \
+  f(init_propagate_gc_state,                        "  Propagate GC State")            \
                                                                                        \
   f(init_scan_rset,                                 "Concurrent Scan Remembered Set")  \
   SHENANDOAH_PAR_PHASE_DO(init_scan_rset_,          "  RS: ", f)                       \
@@ -70,6 +71,7 @@ class outputStream;
   f(final_mark_gross,                               "Pause Final Mark (G)")            \
   f(final_mark,                                     "Pause Final Mark (N)")            \
   f(finish_mark,                                    "  Finish Mark")                   \
+  f(final_mark_propagate_gc_state,                  "  Propagate GC State")            \
   SHENANDOAH_PAR_PHASE_DO(finish_mark_,             "    FM: ", f)                     \
   f(purge,                                          "  System Purge")                  \
   SHENANDOAH_PAR_PHASE_DO(purge_cu_par_,            "      CU: ", f)                   \
@@ -107,6 +109,7 @@ class outputStream;
   f(promote_in_place,                               "Concurrent Promote Regions")      \
   f(final_roots_gross,                              "Pause Final Roots (G)")           \
   f(final_roots,                                    "Pause Final Roots (N)")           \
+  f(final_roots_propagate_gc_state,                 "  Propagate GC State")            \
                                                                                        \
   f(init_update_refs_gross,                         "Pause Init Update Refs (G)")      \
   f(init_update_refs,                               "Pause Init Update Refs (N)")      \
@@ -121,6 +124,7 @@ class outputStream;
   f(final_update_refs_update_region_states,         "  Update Region States")          \
   f(final_update_refs_trash_cset,                   "  Trash Collection Set")          \
   f(final_update_refs_rebuild_freeset,              "  Rebuild Free Set")              \
+  f(final_update_refs_propagate_gc_state,           "  Propagate GC State")            \
                                                                                        \
   f(conc_cleanup_complete,                          "Concurrent Cleanup")              \
   f(conc_coalesce_and_fill,                         "Concurrent Coalesce and Fill")    \
@@ -157,6 +161,7 @@ class outputStream;
   f(degen_gc_promote_regions,                       "  Degen Promote Regions")         \
   f(degen_gc_coalesce_and_fill,                     "  Degen Coalesce and Fill")       \
   SHENANDOAH_PAR_PHASE_DO(degen_coalesce_,          "    DC&F", f)                     \
+  f(degen_gc_propagate_gc_state,                    "  Propagate GC State")            \
                                                                                        \
   f(full_gc_gross,                                  "Pause Full GC (G)")               \
   f(full_gc,                                        "Pause Full GC (N)")               \
@@ -188,6 +193,7 @@ class outputStream;
   f(full_gc_copy_objects_rebuild,                   "    Rebuild Region Sets")         \
   f(full_gc_reconstruct_remembered_set,             "    Reconstruct Remembered Set")  \
   f(full_gc_heapdump_post,                          "  Post Heap Dump")                \
+  f(full_gc_propagate_gc_state,                     "  Propagate GC State")            \
                                                                                        \
   f(pacing,                                         "Pacing")                          \
                                                                                        \
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahVMOperations.cpp b/src/hotspot/share/gc/shenandoah/shenandoahVMOperations.cpp
index 30a677fc126..bb9c3498a06 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahVMOperations.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahVMOperations.cpp
@@ -81,47 +81,40 @@ void VM_ShenandoahInitMark::doit() {
   ShenandoahGCPauseMark mark(_gc_id, "Init Mark", SvcGCMarker::CONCURRENT);
   set_active_generation();
   _gc->entry_init_mark();
-  ShenandoahHeap::heap()->propagate_gc_state_to_all_threads();
 }
 
 void VM_ShenandoahFinalMarkStartEvac::doit() {
   ShenandoahGCPauseMark mark(_gc_id, "Final Mark", SvcGCMarker::CONCURRENT);
   set_active_generation();
   _gc->entry_final_mark();
-  ShenandoahHeap::heap()->propagate_gc_state_to_all_threads();
 }
 
 void VM_ShenandoahFullGC::doit() {
   ShenandoahGCPauseMark mark(_gc_id, "Full GC", SvcGCMarker::FULL);
   set_active_generation();
   _full_gc->entry_full(_gc_cause);
-  ShenandoahHeap::heap()->propagate_gc_state_to_all_threads();
 }
 
 void VM_ShenandoahDegeneratedGC::doit() {
   ShenandoahGCPauseMark mark(_gc_id, "Degenerated GC", SvcGCMarker::CONCURRENT);
   set_active_generation();
   _gc->entry_degenerated();
-  ShenandoahHeap::heap()->propagate_gc_state_to_all_threads();
 }
 
 void VM_ShenandoahInitUpdateRefs::doit() {
   ShenandoahGCPauseMark mark(_gc_id, "Init Update Refs", SvcGCMarker::CONCURRENT);
   set_active_generation();
   _gc->entry_init_update_refs();
-  ShenandoahHeap::heap()->propagate_gc_state_to_all_threads();
 }
 
 void VM_ShenandoahFinalUpdateRefs::doit() {
   ShenandoahGCPauseMark mark(_gc_id, "Final Update Refs", SvcGCMarker::CONCURRENT);
   set_active_generation();
   _gc->entry_final_update_refs();
-  ShenandoahHeap::heap()->propagate_gc_state_to_all_threads();
 }
 
 void VM_ShenandoahFinalRoots::doit() {
   ShenandoahGCPauseMark mark(_gc_id, "Final Roots", SvcGCMarker::CONCURRENT);
   set_active_generation();
   _gc->entry_final_roots();
-  ShenandoahHeap::heap()->propagate_gc_state_to_all_threads();
 }

From acc6f19cecd1c55afab3f4d6789cfa90b472d621 Mon Sep 17 00:00:00 2001
From: SendaoYan <syan@openjdk.org>
Date: Thu, 27 Feb 2025 11:06:50 +0000
Subject: [PATCH 152/587] 8350614: [JMH]
 jdk.incubator.vector.VectorCommutativeOperSharingBenchmark fails

Reviewed-by: redestad
---
 .../incubator/vector/VectorCommutativeOperSharingBenchmark.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/micro/org/openjdk/bench/jdk/incubator/vector/VectorCommutativeOperSharingBenchmark.java b/test/micro/org/openjdk/bench/jdk/incubator/vector/VectorCommutativeOperSharingBenchmark.java
index 91851efa4f3..cbb32ceb213 100644
--- a/test/micro/org/openjdk/bench/jdk/incubator/vector/VectorCommutativeOperSharingBenchmark.java
+++ b/test/micro/org/openjdk/bench/jdk/incubator/vector/VectorCommutativeOperSharingBenchmark.java
@@ -32,7 +32,7 @@ import org.openjdk.jmh.annotations.*;
 
 @OutputTimeUnit(TimeUnit.MILLISECONDS)
 @State(Scope.Thread)
-@Fork(jvmArgsPrepend = {"--add-modules=jdk.incubator.vector"})
+@Fork(jvmArgs = {"--add-modules=jdk.incubator.vector"})
 public class VectorCommutativeOperSharingBenchmark {
     @Param({"1024","2048"})
     int size;

From 63e0fc4331df5443f21a402153ceda87d99dbd46 Mon Sep 17 00:00:00 2001
From: Emanuel Peter <epeter@openjdk.org>
Date: Thu, 27 Feb 2025 11:29:02 +0000
Subject: [PATCH 153/587] 8350841: ProblemList
 jdk/incubator/vector/Long256VectorTests.java

Reviewed-by: thartmann
---
 test/jdk/ProblemList.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/jdk/ProblemList.txt b/test/jdk/ProblemList.txt
index 7472e4adad2..6f111ddcbfd 100644
--- a/test/jdk/ProblemList.txt
+++ b/test/jdk/ProblemList.txt
@@ -749,6 +749,7 @@ sun/tools/jstat/jstatLineCounts4.sh                             8248691,8268211
 
 jdk/incubator/vector/ShortMaxVectorTests.java                   8306592 generic-i586
 jdk/incubator/vector/LoadJsvmlTest.java                         8305390 windows-x64
+jdk/incubator/vector/Long256VectorTests.java                    8350840 generic-x64
 
 ############################################################################
 

From 799ac5288efbbb89e21319cd45657c8f817ad680 Mon Sep 17 00:00:00 2001
From: Ramkumar Sunderbabu <rsunderbabu@openjdk.org>
Date: Thu, 27 Feb 2025 12:58:35 +0000
Subject: [PATCH 154/587] 8314840: 3 gc/epsilon tests ignore external vm
 options

Reviewed-by: tschatzl
---
 test/hotspot/jtreg/gc/epsilon/TestDieDefault.java      | 6 +++---
 test/hotspot/jtreg/gc/epsilon/TestDieWithHeapDump.java | 6 +++---
 test/hotspot/jtreg/gc/epsilon/TestDieWithOnError.java  | 6 +++---
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/test/hotspot/jtreg/gc/epsilon/TestDieDefault.java b/test/hotspot/jtreg/gc/epsilon/TestDieDefault.java
index 016bb517c3c..8c393ceb178 100644
--- a/test/hotspot/jtreg/gc/epsilon/TestDieDefault.java
+++ b/test/hotspot/jtreg/gc/epsilon/TestDieDefault.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018, Red Hat, Inc. All rights reserved.
+ * Copyright (c) 2017, 2025, 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
@@ -37,13 +37,13 @@ import jdk.test.lib.process.ProcessTools;
 public class TestDieDefault {
 
   public static void passWith(String... args) throws Exception {
-    OutputAnalyzer out = ProcessTools.executeLimitedTestJava(args);
+    OutputAnalyzer out = ProcessTools.executeTestJava(args);
     out.shouldNotContain("OutOfMemoryError");
     out.shouldHaveExitValue(0);
   }
 
   public static void failWith(String... args) throws Exception {
-    OutputAnalyzer out = ProcessTools.executeLimitedTestJava(args);
+    OutputAnalyzer out = ProcessTools.executeTestJava(args);
     out.shouldContain("OutOfMemoryError");
     if (out.getExitValue() == 0) {
       throw new IllegalStateException("Should have failed with non-zero exit code");
diff --git a/test/hotspot/jtreg/gc/epsilon/TestDieWithHeapDump.java b/test/hotspot/jtreg/gc/epsilon/TestDieWithHeapDump.java
index 8f6e9a36d77..e9f94f47f0c 100644
--- a/test/hotspot/jtreg/gc/epsilon/TestDieWithHeapDump.java
+++ b/test/hotspot/jtreg/gc/epsilon/TestDieWithHeapDump.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018, Red Hat, Inc. All rights reserved.
+ * Copyright (c) 2017, 2025, 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
@@ -38,13 +38,13 @@ import jdk.test.lib.process.ProcessTools;
 public class TestDieWithHeapDump {
 
   public static void passWith(String... args) throws Exception {
-    OutputAnalyzer out = ProcessTools.executeLimitedTestJava(args);
+    OutputAnalyzer out = ProcessTools.executeTestJava(args);
     out.shouldNotContain("OutOfMemoryError");
     out.shouldHaveExitValue(0);
   }
 
   public static void failWith(String... args) throws Exception {
-    ProcessBuilder pb = ProcessTools.createLimitedTestJavaProcessBuilder(args);
+    ProcessBuilder pb = ProcessTools.createTestJavaProcessBuilder(args);
     Process p = pb.start();
     OutputAnalyzer out = new OutputAnalyzer(p);
     out.shouldContain("OutOfMemoryError");
diff --git a/test/hotspot/jtreg/gc/epsilon/TestDieWithOnError.java b/test/hotspot/jtreg/gc/epsilon/TestDieWithOnError.java
index 7be60c59595..9212cac807f 100644
--- a/test/hotspot/jtreg/gc/epsilon/TestDieWithOnError.java
+++ b/test/hotspot/jtreg/gc/epsilon/TestDieWithOnError.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018, Red Hat, Inc. All rights reserved.
+ * Copyright (c) 2017, 2025, 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
@@ -39,14 +39,14 @@ public class TestDieWithOnError {
   static String ON_ERR_MSG = "Epsilon error handler message";
 
   public static void passWith(String... args) throws Exception {
-    OutputAnalyzer out = ProcessTools.executeLimitedTestJava(args);
+    OutputAnalyzer out = ProcessTools.executeTestJava(args);
     out.shouldNotContain("OutOfMemoryError");
     out.stdoutShouldNotMatch("^" + ON_ERR_MSG);
     out.shouldHaveExitValue(0);
   }
 
   public static void failWith(String... args) throws Exception {
-    OutputAnalyzer out = ProcessTools.executeLimitedTestJava(args);
+    OutputAnalyzer out = ProcessTools.executeTestJava(args);
     out.shouldContain("OutOfMemoryError");
     if (out.getExitValue() == 0) {
       throw new IllegalStateException("Should have failed with non-zero exit code");

From e80b76b663c6b82a353665fd68819cc9295ec429 Mon Sep 17 00:00:00 2001
From: Robert Toyonaga <rtoyonag@redhat.com>
Date: Thu, 27 Feb 2025 12:59:47 +0000
Subject: [PATCH 155/587] 8276995: Bug in
 jdk.jfr.event.gc.collection.TestSystemGC

Reviewed-by: egahlin, dholmes
---
 test/jdk/jdk/jfr/event/gc/collection/TestSystemGC.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/jdk/jdk/jfr/event/gc/collection/TestSystemGC.java b/test/jdk/jdk/jfr/event/gc/collection/TestSystemGC.java
index c22670e4528..f36a48686ee 100644
--- a/test/jdk/jdk/jfr/event/gc/collection/TestSystemGC.java
+++ b/test/jdk/jdk/jfr/event/gc/collection/TestSystemGC.java
@@ -66,12 +66,12 @@ public class TestSystemGC {
             RecordedEvent event2 = events.get(1);
             Events.assertFrame(event2, Runtime.class, "gc");
             Events.assertEventThread(event2, Thread.currentThread());
-            Events.assertField(event1, "invokedConcurrent").isEqual(concurrent);
+            Events.assertField(event2, "invokedConcurrent").isEqual(concurrent);
 
             RecordedEvent event3 = events.get(2);
             // MemoryMXBean.class is an interface so can't assertFrame on it
             Events.assertEventThread(event3, Thread.currentThread());
-            Events.assertField(event1, "invokedConcurrent").isEqual(concurrent);
+            Events.assertField(event3, "invokedConcurrent").isEqual(concurrent);
         }
      }
 }

From d6d94472c21b1fa4839f548b85908967057c3f07 Mon Sep 17 00:00:00 2001
From: Matthias Baesken <mbaesken@openjdk.org>
Date: Thu, 27 Feb 2025 13:34:38 +0000
Subject: [PATCH 156/587] 8350786: Some java/lang jtreg tests miss requires
 vm.hasJFR

Reviewed-by: alanb
---
 test/jdk/java/lang/Thread/ThreadSleepEvent.java            | 3 ++-
 test/jdk/java/lang/Thread/virtual/JfrEvents.java           | 2 +-
 test/jdk/java/lang/Thread/virtual/MonitorPinnedEvents.java | 4 ++--
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/test/jdk/java/lang/Thread/ThreadSleepEvent.java b/test/jdk/java/lang/Thread/ThreadSleepEvent.java
index 7aa2f507ff0..441e79f3a94 100644
--- a/test/jdk/java/lang/Thread/ThreadSleepEvent.java
+++ b/test/jdk/java/lang/Thread/ThreadSleepEvent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,6 +24,7 @@
 /**
  * @test
  * @summary Test that Thread.sleep emits a JFR jdk.ThreadSleep event
+ * @requires vm.hasJFR
  * @modules jdk.jfr
  * @run junit ThreadSleepEvent
  */
diff --git a/test/jdk/java/lang/Thread/virtual/JfrEvents.java b/test/jdk/java/lang/Thread/virtual/JfrEvents.java
index badecba7a54..0b0c2ccc7a0 100644
--- a/test/jdk/java/lang/Thread/virtual/JfrEvents.java
+++ b/test/jdk/java/lang/Thread/virtual/JfrEvents.java
@@ -24,7 +24,7 @@
 /**
  * @test
  * @summary Basic test for JFR jdk.VirtualThreadXXX events
- * @requires vm.continuations
+ * @requires vm.continuations & vm.hasJFR
  * @modules jdk.jfr java.base/java.lang:+open jdk.management
  * @library /test/lib
  * @run junit/othervm/native --enable-native-access=ALL-UNNAMED JfrEvents
diff --git a/test/jdk/java/lang/Thread/virtual/MonitorPinnedEvents.java b/test/jdk/java/lang/Thread/virtual/MonitorPinnedEvents.java
index bf63404d79e..23078c4b892 100644
--- a/test/jdk/java/lang/Thread/virtual/MonitorPinnedEvents.java
+++ b/test/jdk/java/lang/Thread/virtual/MonitorPinnedEvents.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2024, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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
  * @summary Test JFR jdk.VirtualThreadPinned event recorded for contended monitor enter
  *     and Object.wait when pinned
- * @requires vm.continuations
+ * @requires vm.continuations & vm.hasJFR
  * @modules jdk.jfr jdk.management
  * @library /test/lib
  * @run junit/othervm --enable-native-access=ALL-UNNAMED MonitorPinnedEvents

From 3c9d64eb07c5bc9006ef05b0ab81bdc318cccc20 Mon Sep 17 00:00:00 2001
From: Kuai Wei <kuaiwei.kw@alibaba-inc.com>
Date: Thu, 27 Feb 2025 13:55:59 +0000
Subject: [PATCH 157/587] 8350858: [IR Framework] Some tests failed on Cascade
 Lake

Reviewed-by: chagedorn, epeter
---
 .../lib/ir_framework/driver/irmatching/parser/VMInfo.java       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/hotspot/jtreg/compiler/lib/ir_framework/driver/irmatching/parser/VMInfo.java b/test/hotspot/jtreg/compiler/lib/ir_framework/driver/irmatching/parser/VMInfo.java
index d76dea902c2..932bacdc795 100644
--- a/test/hotspot/jtreg/compiler/lib/ir_framework/driver/irmatching/parser/VMInfo.java
+++ b/test/hotspot/jtreg/compiler/lib/ir_framework/driver/irmatching/parser/VMInfo.java
@@ -42,7 +42,7 @@ public class VMInfo {
     private final Map<String, String> keyValueMap;
 
     private static final Pattern CPU_SKYLAKE_PATTERN =
-            Pattern.compile("family 6 model 85 stepping (\\d) ");
+            Pattern.compile("family 6 model 85 stepping (\\d+) ");
 
     public VMInfo(Map<String, String> map) {
         this.keyValueMap = map;

From 8323ddfe189e8a189176a37746985c2473ebab3b Mon Sep 17 00:00:00 2001
From: Nizar Benalla <nbenalla@openjdk.org>
Date: Thu, 27 Feb 2025 14:52:18 +0000
Subject: [PATCH 158/587] 8346659: SnippetTaglet should report an error if
 provided ambiguous links

Reviewed-by: hannesw, liach
---
 .../formats/html/taglets/SnippetTaglet.java   | 46 +++++------
 .../toolkit/resources/doclets.properties      |  6 +-
 .../ReproducibleSnippetTest.java              | 78 +++++++++++++++++++
 .../doclet/TestGlobalHtml/TestGlobalHtml.java |  4 +-
 4 files changed, 105 insertions(+), 29 deletions(-)
 create mode 100644 test/langtools/jdk/javadoc/doclet/ReproducibleSnippet/ReproducibleSnippetTest.java

diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/taglets/SnippetTaglet.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/taglets/SnippetTaglet.java
index 93f83c5ba90..37333552e10 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/taglets/SnippetTaglet.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/taglets/SnippetTaglet.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,8 +26,6 @@
 package jdk.javadoc.internal.doclets.formats.html.taglets;
 
 import java.io.IOException;
-import java.net.URI;
-import java.nio.file.Path;
 import java.util.EnumSet;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -133,43 +131,39 @@ public class SnippetTaglet extends BaseTaglet {
         if (lang != null && !lang.isBlank()) {
             code.addStyle("language-" + lang);
         }
-
         content.consumeBy((styles, sequence) -> {
             CharSequence text = Text.normalizeNewlines(sequence);
             if (styles.isEmpty()) {
                 code.add(text);
             } else {
                 Element e = null;
-                String t = null;
-                boolean linkEncountered = false;
+                String linkTarget = null;
                 boolean markupEncountered = false;
                 Set<String> classes = new HashSet<>();
                 for (Style s : styles) {
-                    if (s instanceof Style.Name n) {
-                        classes.add(n.name());
-                    } else if (s instanceof Style.Link l) {
-                        assert !linkEncountered; // TODO: do not assert; pick the first link report on subsequent
-                        linkEncountered = true;
-                        t = l.target();
-                        e = getLinkedElement(element, t);
-                        if (e == null) {
-                            // TODO: diagnostic output
+                    switch (s) {
+                        case Style.Name n -> classes.add(n.name());
+                        case Style.Link l -> {
+                            if (linkTarget != null) {
+                                messages.error(utils.getCommentHelper(element).getDocTreePath(tag),
+                                        "doclet.error.snippet.ambiguous.link",
+                                        linkTarget,
+                                        l.target(),
+                                        content.asCharSequence().toString().trim());
+                            }
+                            linkTarget = l.target();
+                            e = getLinkedElement(element, linkTarget);
+                            if (e == null) {
+                                // TODO: diagnostic output
+                            }
                         }
-                    } else if (s instanceof Style.Markup) {
-                        markupEncountered = true;
-                        break;
-                    } else {
-                        // TODO: transform this if...else into an exhaustive
-                        // switch over the sealed Style hierarchy when "Pattern
-                        // Matching for switch" has been implemented (JEP 406
-                        // and friends)
-                        throw new AssertionError(styles);
+                        case Style.Markup m -> markupEncountered = true;
                     }
                 }
                 Content c;
                 if (markupEncountered) {
                     return;
-                } else if (linkEncountered) {
+                } else if (linkTarget != null) {
                     assert e != null;
                     //disable preview tagging inside the snippets:
                     Utils.PreviewFlagProvider prevPreviewProvider = utils.setPreviewFlagProvider(el -> false);
@@ -177,7 +171,7 @@ public class SnippetTaglet extends BaseTaglet {
                         var lt = (LinkTaglet) config.tagletManager.getTaglet(DocTree.Kind.LINK);
                         c = lt.linkSeeReferenceOutput(element,
                                 null,
-                                t,
+                                linkTarget,
                                 e,
                                 false, // TODO: for now
                                 Text.of(sequence.toString()),
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/doclets.properties b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/doclets.properties
index 0ee9429ec0c..6b1cd9b0fc8 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/doclets.properties
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/doclets.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2025, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -432,3 +432,7 @@ doclet.cannot_use_snippet_path=\
 # 0: path; 1: exception
 doclet.error_setting_snippet_path=\
   Error setting snippet path {0}: {1}
+
+# 0: location
+doclet.error.snippet.ambiguous.link=\
+  snippet link tags: {0} and {1} overlap in {2}
diff --git a/test/langtools/jdk/javadoc/doclet/ReproducibleSnippet/ReproducibleSnippetTest.java b/test/langtools/jdk/javadoc/doclet/ReproducibleSnippet/ReproducibleSnippetTest.java
new file mode 100644
index 00000000000..5870d1be282
--- /dev/null
+++ b/test/langtools/jdk/javadoc/doclet/ReproducibleSnippet/ReproducibleSnippetTest.java
@@ -0,0 +1,78 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact 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      8346128 8346659
+ * @summary  Check that snippet generation is reproducible
+ * @library  /tools/lib ../../lib
+ * @modules  jdk.javadoc/jdk.javadoc.internal.tool
+ * @build    toolbox.ToolBox javadoc.tester.*
+ * @run main ReproducibleSnippetTest
+ */
+
+import javadoc.tester.JavadocTester;
+import toolbox.ToolBox;
+
+import java.nio.file.Path;
+
+public class ReproducibleSnippetTest extends JavadocTester {
+    ToolBox tb = new ToolBox();
+
+    public static void main(String... args) throws Exception {
+        var tester = new ReproducibleSnippetTest();
+        tester.runTests();
+    }
+
+    @Test
+    public void test(Path base) throws Exception {
+        Path src = base.resolve("src");
+        tb.writeJavaFiles(src,
+                """
+                        package p;
+                        public interface One {
+                            /**
+                             * {@code One obj1}
+                             * {@snippet lang = java:
+                             * // @link substring="ab" target="One#ab" :
+                             * obj1.ab(a()); // @link substring="a" target="#a"
+                             *} class comment
+                             */
+                            int a();
+                            void ab(int i);
+                        }
+                        """);
+        javadoc("-d",
+                "out",
+                "-sourcepath",
+                src.toString(),
+                "p");
+        checkExit(Exit.ERROR);
+
+        checkOutput(Output.OUT, true,
+                "One.java:5: error: snippet link tags:",
+                "#a",
+                "One#ab",
+                "overlap in obj1.ab(a());\n     * {@snippet lang = java:\n       ^");
+    }
+}
diff --git a/test/langtools/jdk/javadoc/doclet/TestGlobalHtml/TestGlobalHtml.java b/test/langtools/jdk/javadoc/doclet/TestGlobalHtml/TestGlobalHtml.java
index 8d2d8e7dd78..a0dd06a2e4a 100644
--- a/test/langtools/jdk/javadoc/doclet/TestGlobalHtml/TestGlobalHtml.java
+++ b/test/langtools/jdk/javadoc/doclet/TestGlobalHtml/TestGlobalHtml.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2024, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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      8322708
  * @summary  Test to make sure global tags work properly
  * @library  /tools/lib ../../lib
- * @modules jdk.javadoc/jdk.javadoc.internal.tool
+ * @modules  jdk.javadoc/jdk.javadoc.internal.tool
  * @build    toolbox.ToolBox javadoc.tester.*
  * @run main TestGlobalHtml
  */

From 939815fdcfd046b00b331e085c7b6c5ced0f5dbe Mon Sep 17 00:00:00 2001
From: Roland Westrelin <roland@openjdk.org>
Date: Thu, 27 Feb 2025 16:47:31 +0000
Subject: [PATCH 159/587] 8347040: C2: assert(!loop->_body.contains(in)) failed

Reviewed-by: chagedorn, kvn
---
 src/hotspot/share/opto/loopnode.cpp           |  4 +-
 ...tAssertWhenOuterStripMinedLoopRemoved.java | 55 +++++++++++++++++++
 2 files changed, 57 insertions(+), 2 deletions(-)
 create mode 100644 test/hotspot/jtreg/compiler/longcountedloops/TestAssertWhenOuterStripMinedLoopRemoved.java

diff --git a/src/hotspot/share/opto/loopnode.cpp b/src/hotspot/share/opto/loopnode.cpp
index a58fa44f9d6..8be412412ea 100644
--- a/src/hotspot/share/opto/loopnode.cpp
+++ b/src/hotspot/share/opto/loopnode.cpp
@@ -3194,10 +3194,10 @@ void OuterStripMinedLoopNode::transform_to_counted_loop(PhaseIterGVN* igvn, Phas
         if (iloop->get_loop(iloop->get_ctrl(in)) != outer_loop_ilt) {
           continue;
         }
-        assert(!loop->_body.contains(in), "");
-        loop->_body.push(in);
         wq.push(in);
       }
+      assert(!loop->_body.contains(n), "Shouldn't append node to body twice");
+      loop->_body.push(n);
     }
     iloop->set_loop(safepoint, loop);
     loop->_body.push(safepoint);
diff --git a/test/hotspot/jtreg/compiler/longcountedloops/TestAssertWhenOuterStripMinedLoopRemoved.java b/test/hotspot/jtreg/compiler/longcountedloops/TestAssertWhenOuterStripMinedLoopRemoved.java
new file mode 100644
index 00000000000..7452a5be616
--- /dev/null
+++ b/test/hotspot/jtreg/compiler/longcountedloops/TestAssertWhenOuterStripMinedLoopRemoved.java
@@ -0,0 +1,55 @@
+/*
+ * Copyright (c) 2025, 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 8347040
+ * @summary C2: assert(!loop->_body.contains(in)) failed
+ * @run main/othervm -XX:-BackgroundCompilation TestAssertWhenOuterStripMinedLoopRemoved
+ */
+
+
+import static java.lang.foreign.ValueLayout.JAVA_LONG;
+
+import java.lang.foreign.Arena;
+import java.lang.foreign.MemorySegment;
+
+public class TestAssertWhenOuterStripMinedLoopRemoved {
+    static final int COUNT = 100000;
+    static final MemorySegment segment = Arena.global().allocate(JAVA_LONG, COUNT);
+
+    public static void main(String[] args) {
+        for (int i = 0; i < 10000; i++) {
+            test();
+        }
+    }
+
+    static void test() {
+        var i = 0;
+        var j = 0;
+        while (i < 100000) {
+            segment.setAtIndex(JAVA_LONG, i++, 0);
+            segment.setAtIndex(JAVA_LONG, j++, 0);
+        }
+    }
+}

From 2fd71561107a5226f44e1732b646e43a82566eb3 Mon Sep 17 00:00:00 2001
From: Marc Chevalier <marc.chevalier@oracle.com>
Date: Thu, 27 Feb 2025 18:06:50 +0000
Subject: [PATCH 160/587] 8347426: Invalid value used for enum Cell in
 iTypeFlow::StateVector::meet_exception

Reviewed-by: dlong, kvn
---
 src/hotspot/share/ci/ciTypeFlow.cpp | 4 ++--
 src/hotspot/share/ci/ciTypeFlow.hpp | 3 +++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/hotspot/share/ci/ciTypeFlow.cpp b/src/hotspot/share/ci/ciTypeFlow.cpp
index 3caca6424bc..234b4611ea1 100644
--- a/src/hotspot/share/ci/ciTypeFlow.cpp
+++ b/src/hotspot/share/ci/ciTypeFlow.cpp
@@ -500,8 +500,8 @@ bool ciTypeFlow::StateVector::meet_exception(ciInstanceKlass* exc,
   bool different = false;
 
   // Meet locals from incoming array.
-  Cell limit = local(_outer->max_locals()-1);
-  for (Cell c = start_cell(); c <= limit; c = next_cell(c)) {
+  Cell limit = local_limit_cell();
+  for (Cell c = start_cell(); c < limit; c = next_cell(c)) {
     ciType* t1 = type_at(c);
     ciType* t2 = incoming->type_at(c);
     if (!t1->equals(t2)) {
diff --git a/src/hotspot/share/ci/ciTypeFlow.hpp b/src/hotspot/share/ci/ciTypeFlow.hpp
index 2e727985307..92db6253aa0 100644
--- a/src/hotspot/share/ci/ciTypeFlow.hpp
+++ b/src/hotspot/share/ci/ciTypeFlow.hpp
@@ -213,9 +213,12 @@ public:
       return (Cell)(outer()->max_locals() + stack_size());
     }
 
+    Cell local_limit_cell() const { return (Cell) outer()->max_locals(); }
+
     // Cell creation
     Cell      local(int lnum) const {
       assert(lnum < outer()->max_locals(), "index check");
+      assert(Cell_0 <= lnum && lnum <= Cell_max, "out of Cell's range");
       return (Cell)(lnum);
     }
 

From 3ae80bfb6085e1a6bcb551c7b0be8f27b6f9fde9 Mon Sep 17 00:00:00 2001
From: Kelvin Nilsen <kdnilsen@openjdk.org>
Date: Thu, 27 Feb 2025 18:40:20 +0000
Subject: [PATCH 161/587] 8349766: GenShen: Bad progress after degen does not
 always need full gc

Reviewed-by: wkemper
---
 .../gc/shenandoah/shenandoahDegeneratedGC.cpp | 22 ++++++++++++++++---
 .../gc/shenandoah/shenandoahDegeneratedGC.hpp |  1 +
 2 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/src/hotspot/share/gc/shenandoah/shenandoahDegeneratedGC.cpp b/src/hotspot/share/gc/shenandoah/shenandoahDegeneratedGC.cpp
index 95981969d06..4d250a98fe6 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahDegeneratedGC.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahDegeneratedGC.cpp
@@ -49,7 +49,8 @@ ShenandoahDegenGC::ShenandoahDegenGC(ShenandoahDegenPoint degen_point, Shenandoa
   ShenandoahGC(),
   _degen_point(degen_point),
   _generation(generation),
-  _abbreviated(false) {
+  _abbreviated(false),
+  _consecutive_degen_with_bad_progress(0) {
 }
 
 bool ShenandoahDegenGC::collect(GCCause::Cause cause) {
@@ -305,9 +306,24 @@ void ShenandoahDegenGC::op_degenerated() {
 
   metrics.snap_after();
 
-  // Check for futility and fail. There is no reason to do several back-to-back Degenerated cycles,
-  // because that probably means the heap is overloaded and/or fragmented.
+  // The most common scenario for lack of good progress following a degenerated GC is an accumulation of floating
+  // garbage during the most recently aborted concurrent GC effort.  With generational GC, it is far more effective to
+  // reclaim this floating garbage with another degenerated cycle (which focuses on young generation and might require
+  // a pause of 200 ms) rather than a full GC cycle (which may require over 2 seconds with a 10 GB old generation).
+  //
+  // In generational mode, we'll only upgrade to full GC if we've done two degen cycles in a row and both indicated
+  // bad progress.  In non-generational mode, we'll preserve the original behavior, which is to upgrade to full
+  // immediately following a degenerated cycle with bad progress.  This preserves original behavior of non-generational
+  // Shenandoah so as to avoid introducing "surprising new behavior."  It also makes less sense with non-generational
+  // Shenandoah to replace a full GC with a degenerated GC, because both have similar pause times in non-generational
+  // mode.
   if (!metrics.is_good_progress(_generation)) {
+    _consecutive_degen_with_bad_progress++;
+  } else {
+    _consecutive_degen_with_bad_progress = 0;
+  }
+  if (!heap->mode()->is_generational() ||
+      ((heap->shenandoah_policy()->consecutive_degenerated_gc_count() > 1) && (_consecutive_degen_with_bad_progress >= 2))) {
     heap->cancel_gc(GCCause::_shenandoah_upgrade_to_full_gc);
     op_degenerated_futile();
   } else {
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahDegeneratedGC.hpp b/src/hotspot/share/gc/shenandoah/shenandoahDegeneratedGC.hpp
index 971bd67eb0d..a2598fe4e8e 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahDegeneratedGC.hpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahDegeneratedGC.hpp
@@ -36,6 +36,7 @@ private:
   const ShenandoahDegenPoint  _degen_point;
   ShenandoahGeneration* _generation;
   bool _abbreviated;
+  size_t _consecutive_degen_with_bad_progress;
 
 public:
   ShenandoahDegenGC(ShenandoahDegenPoint degen_point, ShenandoahGeneration* generation);

From f1398ecbe4a650d8d8c21fabb1b8e2e9600fdfec Mon Sep 17 00:00:00 2001
From: Vladimir Ivanov <vaivanov@openjdk.org>
Date: Thu, 27 Feb 2025 20:35:58 +0000
Subject: [PATCH 162/587] 8350701: [JMH] test foreign.AllocFromSliceTest failed
 with Exception for size>1024

Reviewed-by: pminborg
---
 .../openjdk/bench/java/lang/foreign/AllocFromSliceTest.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/micro/org/openjdk/bench/java/lang/foreign/AllocFromSliceTest.java b/test/micro/org/openjdk/bench/java/lang/foreign/AllocFromSliceTest.java
index c54aa2e0724..58c17f09997 100644
--- a/test/micro/org/openjdk/bench/java/lang/foreign/AllocFromSliceTest.java
+++ b/test/micro/org/openjdk/bench/java/lang/foreign/AllocFromSliceTest.java
@@ -55,10 +55,10 @@ public class AllocFromSliceTest extends CLayouts {
 
     @Setup
     public void setup() {
-        arr = new byte[1024];
+        arr = new byte[size * 2];
         Random random = new Random(0);
         random.nextBytes(arr);
-        start = random.nextInt(1024 - size);
+        start = random.nextInt(size);
     }
 
     @Benchmark

From 0a4c5a8a483b23ec8c534054187c44f986d137bb Mon Sep 17 00:00:00 2001
From: Kelvin Nilsen <kdnilsen@openjdk.org>
Date: Thu, 27 Feb 2025 23:10:16 +0000
Subject: [PATCH 163/587] 8347804: GenShen: Crash with small GCCardSizeInBytes
 and small Java heap

Reviewed-by: wkemper
---
 .../gc/shenandoah/shenandoahArguments.cpp     |  6 +++
 .../gc/shenandoah/shenandoahCardTable.hpp     |  2 +
 .../shenandoah/shenandoahScanRemembered.cpp   | 33 ++++++++++------
 .../shenandoah/shenandoahScanRemembered.hpp   | 38 +++++++++++++------
 .../gc/shenandoah/compiler/TestClone.java     | 26 +++++++++++++
 5 files changed, 82 insertions(+), 23 deletions(-)

diff --git a/src/hotspot/share/gc/shenandoah/shenandoahArguments.cpp b/src/hotspot/share/gc/shenandoah/shenandoahArguments.cpp
index cd1949b19ad..d635781f90f 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahArguments.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahArguments.cpp
@@ -29,6 +29,7 @@
 #include "gc/shared/tlab_globals.hpp"
 #include "gc/shared/workerPolicy.hpp"
 #include "gc/shenandoah/shenandoahArguments.hpp"
+#include "gc/shenandoah/shenandoahCardTable.hpp"
 #include "gc/shenandoah/shenandoahCollectorPolicy.hpp"
 #include "gc/shenandoah/shenandoahGenerationalHeap.hpp"
 #include "gc/shenandoah/shenandoahHeap.inline.hpp"
@@ -187,6 +188,11 @@ void ShenandoahArguments::initialize() {
     FLAG_SET_DEFAULT(TLABAllocationWeight, 90);
   }
 
+  if (GCCardSizeInBytes < ShenandoahMinCardSizeInBytes) {
+    vm_exit_during_initialization(
+      err_msg("GCCardSizeInBytes ( %u ) must be >= %u\n", GCCardSizeInBytes, (unsigned int) ShenandoahMinCardSizeInBytes));
+  }
+
   FullGCForwarding::initialize_flags(MaxHeapSize);
 }
 
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahCardTable.hpp b/src/hotspot/share/gc/shenandoah/shenandoahCardTable.hpp
index f30ce09668a..b012da09c7a 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahCardTable.hpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahCardTable.hpp
@@ -30,6 +30,8 @@
 #include "oops/oopsHierarchy.hpp"
 #include "utilities/macros.hpp"
 
+#define ShenandoahMinCardSizeInBytes 128
+
 class ShenandoahCardTable: public CardTable {
   friend class VMStructs;
 
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahScanRemembered.cpp b/src/hotspot/share/gc/shenandoah/shenandoahScanRemembered.cpp
index b9f52909cbe..9bbb76b3e48 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahScanRemembered.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahScanRemembered.cpp
@@ -727,7 +727,6 @@ size_t ShenandoahRegionChunkIterator::calc_regular_group_size() {
   // half of the remaining heap, the third processes half of what remains and so on.  The smallest chunk size
   // is represented by _smallest_chunk_size_words.  We do not divide work any smaller than this.
   //
-
   size_t group_size = _heap->num_regions() / 2;
   return group_size;
 }
@@ -773,6 +772,7 @@ size_t ShenandoahRegionChunkIterator::calc_num_groups() {
     // Any remaining regions will be treated as if they are part of the most recently created group.  This group will
     // have more than _regular_group_size chunks within it.
   }
+  assert (num_groups <= _maximum_groups, "Cannot have more than %zu groups", _maximum_groups);
   return num_groups;
 }
 
@@ -784,21 +784,31 @@ size_t ShenandoahRegionChunkIterator::calc_total_chunks() {
   size_t current_group_span = _first_group_chunk_size_b4_rebalance * _regular_group_size;
   size_t smallest_group_span = smallest_chunk_size_words() * _regular_group_size;
 
-  // The first group gets special handling because the first chunk size can be no larger than _largest_chunk_size_words
+  // The first group gets special handling because the first chunk size can be no larger than _maximum_chunk_size_words
   if (region_size_words > _maximum_chunk_size_words) {
     // In the case that we shrink the first group's chunk size, certain other groups will also be subsumed within the first group
     size_t effective_chunk_size = _first_group_chunk_size_b4_rebalance;
+    uint coalesced_groups = 0;
     while (effective_chunk_size >= _maximum_chunk_size_words) {
+      // Each iteration of this loop subsumes one original group into a new rebalanced initial group.
       num_chunks += current_group_span / _maximum_chunk_size_words;
       unspanned_heap_size -= current_group_span;
       effective_chunk_size /= 2;
       current_group_span /= 2;
+      coalesced_groups++;
     }
+    assert(effective_chunk_size * 2 == _maximum_chunk_size_words,
+           "We assume _first_group_chunk_size_b4_rebalance is _maximum_chunk_size_words * a power of two");
+    _largest_chunk_size_words = _maximum_chunk_size_words;
+    _adjusted_num_groups = _num_groups - (coalesced_groups - 1);
   } else {
     num_chunks = _regular_group_size;
     unspanned_heap_size -= current_group_span;
+    _largest_chunk_size_words = current_group_span / num_chunks;
+    _adjusted_num_groups = _num_groups;
     current_group_span /= 2;
   }
+
   size_t spanned_groups = 1;
   while (unspanned_heap_size > 0) {
     if (current_group_span <= unspanned_heap_size) {
@@ -856,11 +866,12 @@ ShenandoahRegionChunkIterator::ShenandoahRegionChunkIterator(ShenandoahHeap* hea
   size_t expected_chunk_size_words = _clusters_in_smallest_chunk * CardTable::card_size_in_words() * ShenandoahCardCluster::CardsPerCluster;
   assert(smallest_chunk_size_words() == expected_chunk_size_words, "_smallest_chunk_size (%zu) is not valid because it does not equal (%zu)",
          smallest_chunk_size_words(), expected_chunk_size_words);
-#endif
   assert(_num_groups <= _maximum_groups,
          "The number of remembered set scanning groups must be less than or equal to maximum groups");
-  assert(smallest_chunk_size_words() << (_maximum_groups - 1) == _maximum_chunk_size_words,
-         "Maximum number of groups needs to span maximum chunk size to smallest chunk size");
+  assert(smallest_chunk_size_words() << (_adjusted_num_groups - 1) == _largest_chunk_size_words,
+         "The number of groups (%zu) needs to span smallest chunk size (%zu) to largest chunk size (%zu)",
+         _adjusted_num_groups, smallest_chunk_size_words(), _largest_chunk_size_words);
+#endif
 
   size_t words_in_region = ShenandoahHeapRegion::region_size_words();
   _region_index[0] = 0;
@@ -883,7 +894,7 @@ ShenandoahRegionChunkIterator::ShenandoahRegionChunkIterator(ShenandoahHeap* hea
   }
 
   size_t previous_group_span = _group_entries[0] * _group_chunk_size[0];
-  for (size_t i = 1; i < _num_groups; i++) {
+  for (size_t i = 1; i < _adjusted_num_groups; i++) {
     _group_chunk_size[i] = _group_chunk_size[i-1] / 2;
     size_t chunks_in_group = _regular_group_size;
     size_t this_group_span = _group_chunk_size[i] * chunks_in_group;
@@ -893,19 +904,19 @@ ShenandoahRegionChunkIterator::ShenandoahRegionChunkIterator(ShenandoahHeap* hea
     _group_entries[i] = _group_entries[i-1] + _regular_group_size;
     previous_group_span = total_span_of_groups;
   }
-  if (_group_entries[_num_groups-1] < _total_chunks) {
-    assert((_total_chunks - _group_entries[_num_groups-1]) * _group_chunk_size[_num_groups-1] + previous_group_span ==
+  if (_group_entries[_adjusted_num_groups-1] < _total_chunks) {
+    assert((_total_chunks - _group_entries[_adjusted_num_groups-1]) * _group_chunk_size[_adjusted_num_groups-1] + previous_group_span ==
            heap->num_regions() * words_in_region, "Total region chunks (%zu"
            ") do not span total heap regions (%zu)", _total_chunks, _heap->num_regions());
-    previous_group_span += (_total_chunks - _group_entries[_num_groups-1]) * _group_chunk_size[_num_groups-1];
-    _group_entries[_num_groups-1] = _total_chunks;
+    previous_group_span += (_total_chunks - _group_entries[_adjusted_num_groups-1]) * _group_chunk_size[_adjusted_num_groups-1];
+    _group_entries[_adjusted_num_groups-1] = _total_chunks;
   }
   assert(previous_group_span == heap->num_regions() * words_in_region, "Total region chunks (%zu"
          ") do not span total heap regions (%zu): %zu does not equal %zu",
          _total_chunks, _heap->num_regions(), previous_group_span, heap->num_regions() * words_in_region);
 
   // Not necessary, but keeps things tidy
-  for (size_t i = _num_groups; i < _maximum_groups; i++) {
+  for (size_t i = _adjusted_num_groups; i < _maximum_groups; i++) {
     _region_index[i] = 0;
     _group_offset[i] = 0;
     _group_entries[i] = _group_entries[i-1];
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahScanRemembered.hpp b/src/hotspot/share/gc/shenandoah/shenandoahScanRemembered.hpp
index 2a0713bf4ed..f5acb4f10ed 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahScanRemembered.hpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahScanRemembered.hpp
@@ -196,11 +196,14 @@ private:
 
   // Use symbolic constants defined in cardTable.hpp
   //  CardTable::card_shift = 9;
-  //  CardTable::card_size = 512;
-  //  CardTable::card_size_in_words = 64;
+  //  CardTable::card_size = 512;  (default value 512, a power of 2 >= 128)
+  //  CardTable::card_size_in_words = 64; (default value 64, a power of 2 >= 16)
   //  CardTable::clean_card_val()
   //  CardTable::dirty_card_val()
 
+  // See shenandoahCardTable.hpp
+  //  ShenandoahMinCardSizeInBytes 128
+
   const size_t LogCardValsPerIntPtr;    // the number of card values (entries) in an intptr_t
   const size_t LogCardSizeInWords;      // the size of a card in heap word units
 
@@ -888,14 +891,14 @@ private:
   // The largest chunk size is 4 MiB, measured in words.  Otherwise, remembered set scanning may become too unbalanced.
   // If the largest chunk size is too small, there is too much overhead sifting out assignments to individual worker threads.
   static const size_t _maximum_chunk_size_words = (4 * 1024 * 1024) / HeapWordSize;
-
   static const size_t _clusters_in_smallest_chunk = 4;
 
+  size_t _largest_chunk_size_words;
+
   // smallest_chunk_size is 4 clusters.  Each cluster spans 128 KiB.
   // This is computed from CardTable::card_size_in_words() * ShenandoahCardCluster::CardsPerCluster;
   static size_t smallest_chunk_size_words() {
-      return _clusters_in_smallest_chunk * CardTable::card_size_in_words() *
-             ShenandoahCardCluster::CardsPerCluster;
+      return _clusters_in_smallest_chunk * CardTable::card_size_in_words() * ShenandoahCardCluster::CardsPerCluster;
   }
 
   // The total remembered set scanning effort is divided into chunks of work that are assigned to individual worker tasks.
@@ -910,19 +913,30 @@ private:
   // The first group "effectively" processes chunks of size 1 MiB (or smaller for smaller region sizes).
   // The last group processes chunks of size 128 KiB.  There are four groups total.
 
-  // group[0] is 4 MiB chunk size (_maximum_chunk_size_words)
-  // group[1] is 2 MiB chunk size
-  // group[2] is 1 MiB chunk size
-  // group[3] is 512 KiB chunk size
-  // group[4] is 256 KiB chunk size
-  // group[5] is 128 Kib shunk size (_smallest_chunk_size_words = 4 * 64 * 64
-  static const size_t _maximum_groups = 6;
+  // group[ 0] is 4 MiB chunk size (_maximum_chunk_size_words)
+  // group[ 1] is 2 MiB chunk size
+  // group[ 2] is 1 MiB chunk size
+  // group[ 3] is 512 KiB chunk size
+  // group[ 4] is 256 KiB chunk size
+  // group[ 5] is 128 KiB chunk size
+  // group[ 6] is  64 KiB chunk size
+  // group[ 7] is  32 KiB chunk size
+  // group[ 8] is  16 KiB chunk size
+  // group[ 9] is   8 KiB chunk size
+  // group[10] is   4 KiB chunk size
+  //   Note: 4 KiB is smallest possible chunk_size, computed from:
+  //         _clusters_in_smallest_chunk * MinimumCardSizeInWords * ShenandoahCardCluster::CardsPerCluster, which is
+  //         4 * 16 * 64 = 4096
+
+  // We set aside arrays to represent the maximum number of groups that may be required for any heap configuration
+  static const size_t _maximum_groups = 11;
 
   const ShenandoahHeap* _heap;
 
   const size_t _regular_group_size;                        // Number of chunks in each group
   const size_t _first_group_chunk_size_b4_rebalance;
   const size_t _num_groups;                        // Number of groups in this configuration
+  size_t _adjusted_num_groups;                     // Rebalancing may coalesce groups
   const size_t _total_chunks;
 
   shenandoah_padding(0);
diff --git a/test/hotspot/jtreg/gc/shenandoah/compiler/TestClone.java b/test/hotspot/jtreg/gc/shenandoah/compiler/TestClone.java
index 2b1340890e1..2e98c72ee17 100644
--- a/test/hotspot/jtreg/gc/shenandoah/compiler/TestClone.java
+++ b/test/hotspot/jtreg/gc/shenandoah/compiler/TestClone.java
@@ -232,6 +232,32 @@
  *                   TestClone
  */
 
+/*
+ * @test id=generational-small-card-size
+ * @summary Test clone barriers work correctly
+ * @requires vm.gc.Shenandoah
+ *
+ * @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions -Xms1g -Xmx1g
+ *                   -XX:+UseShenandoahGC -XX:ShenandoahGCMode=generational -XX:GCCardSizeInBytes=128
+ *                   TestClone
+ * @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions -Xms1g -Xmx1g
+ *                   -XX:+UseShenandoahGC -XX:ShenandoahGCMode=generational -XX:GCCardSizeInBytes=128
+ *                   -Xint
+ *                   TestClone
+ * @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions -Xms1g -Xmx1g
+ *                   -XX:+UseShenandoahGC -XX:ShenandoahGCMode=generational -XX:GCCardSizeInBytes=128
+ *                   -XX:-TieredCompilation
+ *                   TestClone
+ * @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions -Xms1g -Xmx1g
+ *                   -XX:+UseShenandoahGC -XX:ShenandoahGCMode=generational -XX:GCCardSizeInBytes=128
+ *                   -XX:TieredStopAtLevel=1
+ *                   TestClone
+ * @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions -Xms1g -Xmx1g
+ *                   -XX:+UseShenandoahGC -XX:ShenandoahGCMode=generational -XX:GCCardSizeInBytes=128
+ *                   -XX:TieredStopAtLevel=4
+ *                   TestClone
+ */
+
 /*
  * @test id=generational-verify
  * @summary Test clone barriers work correctly

From ab4b0ef9242a4cd964fbcf2d1f3d370234c09408 Mon Sep 17 00:00:00 2001
From: Kelvin Nilsen <kdnilsen@openjdk.org>
Date: Thu, 27 Feb 2025 23:23:40 +0000
Subject: [PATCH 164/587] 8350889: GenShen: Break out of infinite loop of old
 GC cycles

Reviewed-by: wkemper, ysr
---
 .../gc/shenandoah/heuristics/shenandoahAdaptiveHeuristics.cpp    | 1 +
 src/hotspot/share/gc/shenandoah/shenandoahRegulatorThread.cpp    | 1 +
 2 files changed, 2 insertions(+)

diff --git a/src/hotspot/share/gc/shenandoah/heuristics/shenandoahAdaptiveHeuristics.cpp b/src/hotspot/share/gc/shenandoah/heuristics/shenandoahAdaptiveHeuristics.cpp
index 7a624d4d4a4..5280e9b2ac4 100644
--- a/src/hotspot/share/gc/shenandoah/heuristics/shenandoahAdaptiveHeuristics.cpp
+++ b/src/hotspot/share/gc/shenandoah/heuristics/shenandoahAdaptiveHeuristics.cpp
@@ -241,6 +241,7 @@ bool ShenandoahAdaptiveHeuristics::should_start_gc() {
                 ", allocated: %zu", available, capacity, allocated);
 
   if (_start_gc_is_pending) {
+    log_trigger("GC start is already pending");
     return true;
   }
 
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahRegulatorThread.cpp b/src/hotspot/share/gc/shenandoah/shenandoahRegulatorThread.cpp
index a684e8ff228..752ad743520 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahRegulatorThread.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahRegulatorThread.cpp
@@ -74,6 +74,7 @@ void ShenandoahRegulatorThread::regulate_young_and_old_cycles() {
           if (start_old_cycle()) {
             log_debug(gc)("Heuristics request for old collection accepted");
             _young_heuristics->cancel_trigger_request();
+            _old_heuristics->cancel_trigger_request();
           } else if (request_concurrent_gc(YOUNG)) {
             log_debug(gc)("Heuristics request for young collection accepted");
             _young_heuristics->cancel_trigger_request();

From 2af76de05a50dee052307b8b82055a4787e96df9 Mon Sep 17 00:00:00 2001
From: Matthias Baesken <mbaesken@openjdk.org>
Date: Fri, 28 Feb 2025 07:36:35 +0000
Subject: [PATCH 165/587] 8350683: Non-C2 / minimal JVM crashes in the build on
 ppc64 platforms

Co-authored-by: Martin Doerr <mdoerr@openjdk.org>
Reviewed-by: mdoerr, amitkumar
---
 src/hotspot/cpu/ppc/compiledIC_ppc.cpp | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

diff --git a/src/hotspot/cpu/ppc/compiledIC_ppc.cpp b/src/hotspot/cpu/ppc/compiledIC_ppc.cpp
index c8cb68e3eb4..8a29da66436 100644
--- a/src/hotspot/cpu/ppc/compiledIC_ppc.cpp
+++ b/src/hotspot/cpu/ppc/compiledIC_ppc.cpp
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2012, 2015 SAP SE. All rights reserved.
+ * Copyright (c) 2012, 2025 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,9 +29,6 @@
 #include "memory/resourceArea.hpp"
 #include "runtime/mutexLocker.hpp"
 #include "runtime/safepoint.hpp"
-#ifdef COMPILER2
-#include "opto/matcher.hpp"
-#endif
 
 // ----------------------------------------------------------------------------
 
@@ -78,7 +75,6 @@
 const int IC_pos_in_java_to_interp_stub = 8;
 #define __ masm->
 address CompiledDirectCall::emit_to_interp_stub(MacroAssembler *masm, address mark/* = nullptr*/) {
-#ifdef COMPILER2
   if (mark == nullptr) {
     // Get the mark within main instrs section which is set to the address of the call.
     mark = __ inst_mark();
@@ -108,7 +104,7 @@ address CompiledDirectCall::emit_to_interp_stub(MacroAssembler *masm, address ma
   // - call
   __ calculate_address_from_global_toc(reg_scratch, __ method_toc());
   AddressLiteral ic = __ allocate_metadata_address((Metadata *)nullptr);
-  bool success = __ load_const_from_method_toc(as_Register(Matcher::inline_cache_reg_encode()),
+  bool success = __ load_const_from_method_toc(R19_inline_cache_reg,
                                                ic, reg_scratch, /*fixed_size*/ true);
   if (!success) {
     return nullptr; // CodeCache is full
@@ -134,13 +130,9 @@ address CompiledDirectCall::emit_to_interp_stub(MacroAssembler *masm, address ma
   assert(!is_NativeCallTrampolineStub_at(__ addr_at(stub_start_offset)),
          "must not confuse java_to_interp with trampoline stubs");
 
- // End the stub.
+  // End the stub.
   __ end_a_stub();
   return stub;
-#else
-  ShouldNotReachHere();
-  return nullptr;
-#endif
 }
 #undef __
 

From eada1ea8d21c4811834e20ca467e136580d6cd0a Mon Sep 17 00:00:00 2001
From: Hamlin Li <mli@openjdk.org>
Date: Fri, 28 Feb 2025 09:05:42 +0000
Subject: [PATCH 166/587] 8350855: RISC-V: print offset by assert of
 patch_offset_in_conditional_branch

Reviewed-by: fyang
---
 src/hotspot/cpu/riscv/macroAssembler_riscv.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/hotspot/cpu/riscv/macroAssembler_riscv.cpp b/src/hotspot/cpu/riscv/macroAssembler_riscv.cpp
index 4276595ffcc..f2bdd20890b 100644
--- a/src/hotspot/cpu/riscv/macroAssembler_riscv.cpp
+++ b/src/hotspot/cpu/riscv/macroAssembler_riscv.cpp
@@ -2300,7 +2300,7 @@ static int patch_offset_in_jal(address branch, int64_t offset) {
 
 static int patch_offset_in_conditional_branch(address branch, int64_t offset) {
   assert(Assembler::is_simm13(offset) && ((offset % 2) == 0),
-         "offset is too large to be patched in one beq/bge/bgeu/blt/bltu/bne instruction!\n");
+         "offset (%ld) is too large to be patched in one beq/bge/bgeu/blt/bltu/bne instruction!\n", offset);
   Assembler::patch(branch, 31, 31, (offset >> 12) & 0x1);                       // offset[12]    ==> branch[31]
   Assembler::patch(branch, 30, 25, (offset >> 5)  & 0x3f);                      // offset[10:5]  ==> branch[30:25]
   Assembler::patch(branch, 7,  7,  (offset >> 11) & 0x1);                       // offset[11]    ==> branch[7]

From ac76d8d63ff7b06a3c116559712a8b48f8acfa20 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Johan=20Sj=C3=B6len?= <jsjolen@openjdk.org>
Date: Fri, 28 Feb 2025 09:48:17 +0000
Subject: [PATCH 167/587] 8350824: New async logging gtest
 StallingModePreventsDroppedMessages fails

Reviewed-by: mbaesken, dholmes
---
 test/hotspot/gtest/logging/test_asynclog.cpp   | 18 ++++--------------
 .../jtreg/runtime/logging/StressAsyncUL.java   | 13 ++++++++-----
 2 files changed, 12 insertions(+), 19 deletions(-)

diff --git a/test/hotspot/gtest/logging/test_asynclog.cpp b/test/hotspot/gtest/logging/test_asynclog.cpp
index cb674603563..ebc3e35a4b9 100644
--- a/test/hotspot/gtest/logging/test_asynclog.cpp
+++ b/test/hotspot/gtest/logging/test_asynclog.cpp
@@ -253,18 +253,6 @@ TEST_VM_F(AsyncLogTest, droppingMessage) {
   EXPECT_TRUE(file_contains_substring(TestLogFileName, "messages dropped due to async logging"));
 }
 
-TEST_VM_F(AsyncLogTest, StallingModePreventsDroppedMessages) {
-  if (AsyncLogWriter::instance() == nullptr) {
-    return;
-  }
-  set_log_config(TestLogFileName, "logging=debug");
-  LogConfiguration::AsyncMode prev_mode = LogConfiguration::async_mode();
-  LogConfiguration::set_async_mode(LogConfiguration::AsyncMode::Off);
-  test_asynclog_drop_messages();
-  EXPECT_FALSE(file_contains_substring(TestLogFileName, "messages dropped due to async logging"));
-  LogConfiguration::set_async_mode(prev_mode);
-}
-
 TEST_VM_F(AsyncLogTest, stdoutOutput) {
   testing::internal::CaptureStdout();
 
@@ -272,7 +260,8 @@ TEST_VM_F(AsyncLogTest, stdoutOutput) {
     return;
   }
 
-  bool async = AsyncLogWriter::instance() != nullptr;
+  bool async = AsyncLogWriter::instance() != nullptr
+               && LogConfiguration::async_mode() == LogConfiguration::AsyncMode::Drop;
   if (async) {
     test_asynclog_drop_messages();
     AsyncLogWriter::flush();
@@ -301,7 +290,8 @@ TEST_VM_F(AsyncLogTest, stderrOutput) {
     return;
   }
 
-  bool async = AsyncLogWriter::instance() != nullptr;
+  bool async = AsyncLogWriter::instance() != nullptr
+               && LogConfiguration::async_mode() == LogConfiguration::AsyncMode::Drop;
   if (async) {
     test_asynclog_drop_messages();
     AsyncLogWriter::flush();
diff --git a/test/hotspot/jtreg/runtime/logging/StressAsyncUL.java b/test/hotspot/jtreg/runtime/logging/StressAsyncUL.java
index 1fa6ab76ec2..e14cad6cc65 100644
--- a/test/hotspot/jtreg/runtime/logging/StressAsyncUL.java
+++ b/test/hotspot/jtreg/runtime/logging/StressAsyncUL.java
@@ -35,19 +35,22 @@ import jdk.test.lib.process.OutputAnalyzer;
 import jdk.test.lib.process.ProcessTools;
 
 public class StressAsyncUL {
-    static void analyze_output(String... args) throws Exception {
+    static void analyze_output(boolean stalling_mode, String... args) throws Exception {
         ProcessBuilder pb =
             ProcessTools.createLimitedTestJavaProcessBuilder(args);
         OutputAnalyzer output = new OutputAnalyzer(pb.start());
         output.shouldHaveExitValue(0);
+        if (stalling_mode) {
+            output.shouldNotContain("messages dropped due to async logging");
+        }
     }
     public static void main(String[] args) throws Exception {
-        analyze_output("-Xlog:async:drop", "-Xlog:all=trace", InnerClass.class.getName());
-        analyze_output("-Xlog:async:stall", "-Xlog:all=trace", InnerClass.class.getName());
+        analyze_output(false, "-Xlog:async:drop", "-Xlog:all=trace", InnerClass.class.getName());
+        analyze_output(true, "-Xlog:async:stall", "-Xlog:all=trace", InnerClass.class.getName());
         // Stress test with a very small buffer. Note: Any valid buffer size must be able to hold a flush token.
         // Therefore the size of the buffer cannot be zero.
-        analyze_output("-Xlog:async:drop", "-Xlog:all=trace", "-XX:AsyncLogBufferSize=192", InnerClass.class.getName());
-        analyze_output("-Xlog:async:stall", "-Xlog:all=trace", "-XX:AsyncLogBufferSize=192", InnerClass.class.getName());
+        analyze_output(false, "-Xlog:async:drop", "-Xlog:all=trace", "-XX:AsyncLogBufferSize=192", InnerClass.class.getName());
+        analyze_output(true, "-Xlog:async:stall", "-Xlog:all=trace", "-XX:AsyncLogBufferSize=192", InnerClass.class.getName());
     }
 
     public static class InnerClass {

From 2019f44539db0e19d92eeb1b4e80b74a6de3276c Mon Sep 17 00:00:00 2001
From: Ivan Bereziuk <Navi.Bereziuk@gmail.com>
Date: Fri, 28 Feb 2025 13:46:17 +0000
Subject: [PATCH 168/587] 8343832: Enhance test summary with number of skipped
 tests

Co-authored-by: Magnus Ihse Bursie <ihse@openjdk.org>
Reviewed-by: ihse, erikj
---
 make/RunTests.gmk | 92 +++++++++++++++++++++++++++++++++++++----------
 1 file changed, 73 insertions(+), 19 deletions(-)

diff --git a/make/RunTests.gmk b/make/RunTests.gmk
index 616341a8901..44d387080df 100644
--- a/make/RunTests.gmk
+++ b/make/RunTests.gmk
@@ -530,21 +530,34 @@ define SetupRunGtestTestBody
 	$$(call LogWarn, Test report is stored in $$(strip \
 	    $$(subst $$(TOPDIR)/, , $$($1_TEST_RESULTS_DIR))))
 	$$(if $$(wildcard $$($1_RESULT_FILE)), \
-	  $$(eval $1_TOTAL := $$(shell $$(AWK) '/==========.* tests? from .* \
-	      test (cases?|suites?) ran/ { print $$$$2 }' $$($1_RESULT_FILE))) \
-	  $$(if $$($1_TOTAL), , $$(eval $1_TOTAL := 0)) \
+	  $$(eval $1_RUN := $$(shell $$(AWK) \
+	      '/==========.* tests? from .* test (cases?|suites?) ran/ { print $$$$2 }' \
+	      $$($1_RESULT_FILE))) \
+	  $$(if $$($1_RUN), , $$(eval $1_RUN := 0)) \
 	  $$(eval $1_PASSED := $$(shell $$(AWK) '/\[  PASSED  \] .* tests?./ \
 	      { print $$$$4 }' $$($1_RESULT_FILE))) \
 	  $$(if $$($1_PASSED), , $$(eval $1_PASSED := 0)) \
+	  $$(eval $1_SKIPPED := $$(shell $$(AWK) \
+	      '/YOU HAVE [0-9]+ DISABLED TEST/ { \
+	          if (match($$$$0, /[0-9]+/, arr)) { \
+	            print arr[0]; \
+	            found=1; \
+	          } \
+	          if (!found) { print 0; } \
+	      }' \
+	      $$($1_RESULT_FILE))) \
 	  $$(eval $1_FAILED := $$(shell $$(AWK) '/\[  FAILED  \] .* tests?, \
 	      listed below/ { print $$$$4 }' $$($1_RESULT_FILE))) \
 	  $$(if $$($1_FAILED), , $$(eval $1_FAILED := 0)) \
 	  $$(eval $1_ERROR := $$(shell \
-	      $$(EXPR) $$($1_TOTAL) - $$($1_PASSED) - $$($1_FAILED))) \
+	      $$(EXPR) $$($1_RUN) - $$($1_PASSED) - $$($1_FAILED))) \
+	  $$(eval $1_TOTAL := $$(shell \
+	      $$(EXPR) $$($1_RUN) + $$($1_SKIPPED))) \
 	, \
 	  $$(eval $1_PASSED := 0) \
 	  $$(eval $1_FAILED := 0) \
 	  $$(eval $1_ERROR := 1) \
+	  $$(eval $1_SKIPPED := 0) \
 	  $$(eval $1_TOTAL := 1) \
 	)
 
@@ -668,6 +681,7 @@ define SetupRunMicroTestBody
 	  $$(eval $1_ERROR := 1) \
 	  $$(eval $1_TOTAL := 1) \
 	)
+	$$(eval $1_SKIPPED := 0)
 
   $1: run-test-$1 parse-test-$1
 
@@ -1036,23 +1050,64 @@ define SetupRunJtregTestBody
 	$$(call LogWarn, Finished running test '$$($1_TEST)')
 	$$(call LogWarn, Test report is stored in $$(strip \
 	    $$(subst $$(TOPDIR)/, , $$($1_TEST_RESULTS_DIR))))
+
+	# Read jtreg documentation to learn on the test stats categories:
+	# https://github.com/openjdk/jtreg/blob/master/src/share/doc/javatest/regtest/faq.md#what-do-all-those-numbers-in-the-test-results-line-mean
+	# In jtreg, "skipped:" category accounts for tests that threw jtreg.SkippedException at runtime.
+	# At the same time these tests contribute to "passed:" tests.
+	# In here we don't want that and so we substract number of "skipped:" from "passed:".
+
 	$$(if $$(wildcard $$($1_RESULT_FILE)), \
-	  $$(eval $1_PASSED := $$(shell $$(AWK) '{ gsub(/[,;]/, ""); \
+	  $$(eval $1_PASSED_AND_RUNTIME_SKIPPED := $$(shell $$(AWK) '{ gsub(/[,;]/, ""); \
 	      for (i=1; i<=NF; i++) { if ($$$$i == "passed:") \
 	      print $$$$(i+1) } }' $$($1_RESULT_FILE))) \
-	  $$(if $$($1_PASSED), , $$(eval $1_PASSED := 0)) \
+	  $$(if $$($1_PASSED_AND_RUNTIME_SKIPPED), , $$(eval $1_PASSED_AND_RUNTIME_SKIPPED := 0)) \
 	  $$(eval $1_FAILED := $$(shell $$(AWK) '{gsub(/[,;]/, ""); \
 	      for (i=1; i<=NF; i++) { if ($$$$i == "failed:") \
 	      print $$$$(i+1) } }' $$($1_RESULT_FILE))) \
 	  $$(if $$($1_FAILED), , $$(eval $1_FAILED := 0)) \
+	  $$(eval $1_RUNTIME_SKIPPED := $$(shell $$(AWK) '{gsub(/[,;]/, ""); \
+	      for (i=1; i<=NF; i++) { if ($$$$i == "skipped:") \
+	      print $$$$(i+1) } }' $$($1_RESULT_FILE))) \
+	  $$(if $$($1_RUNTIME_SKIPPED), , $$(eval $1_RUNTIME_SKIPPED := 0)) \
+	  $$(eval $1_SKIPPED := $$(shell \
+	      $$(AWK) \
+	        'BEGIN { \
+	          overall_skipped = 0; \
+	          patterns[1] = "skipped"; \
+	          patterns[2] = "excluded"; \
+	          patterns[3] = "not in match-list"; \
+	          patterns[4] = "did not match keywords"; \
+	          patterns[5] = "did not meet module requirements"; \
+	          patterns[6] = "did not meet platform requirements"; \
+	          patterns[7] = "did not match prior status"; \
+	          patterns[8] = "did not meet time-limit requirements"; \
+	        } { \
+	          split($$$$0, arr, ";"); \
+	          for (item in arr) { \
+	            for (p in patterns) { \
+	              if (match(arr[item], patterns[p] ": [0-9]+")) { \
+	                overall_skipped += substr(arr[item], RSTART + length(patterns[p]) + 2, RLENGTH); \
+	              } \
+	            } \
+	          } \
+	          print overall_skipped; \
+	        }' \
+	        $$($1_RESULT_FILE) \
+	  )) \
 	  $$(eval $1_ERROR := $$(shell $$(AWK) '{gsub(/[,;]/, ""); \
 	      for (i=1; i<=NF; i++) { if ($$$$i == "error:") \
 	      print $$$$(i+1) } }' $$($1_RESULT_FILE))) \
 	  $$(if $$($1_ERROR), , $$(eval $1_ERROR := 0)) \
+	  \
+	  $$(eval $1_PASSED := $$(shell \
+	      $$(EXPR) $$($1_PASSED_AND_RUNTIME_SKIPPED) - $$($1_RUNTIME_SKIPPED))) \
 	  $$(eval $1_TOTAL := $$(shell \
-	      $$(EXPR) $$($1_PASSED) + $$($1_FAILED) + $$($1_ERROR))) \
+	      $$(EXPR) $$($1_PASSED) + $$($1_FAILED) + $$($1_ERROR) + $$($1_SKIPPED))) \
 	, \
-	  $$(eval $1_PASSED := 0) \
+	  $$(eval $1_PASSED_AND_RUNTIME_SKIPPED := 0) \
+	  $$(eval $1_RUNTIME_SKIPPED := 0) \
+	  $$(eval $1_SKIPPED := 0) \
 	  $$(eval $1_FAILED := 0) \
 	  $$(eval $1_ERROR := 1) \
 	  $$(eval $1_TOTAL := 1) \
@@ -1111,8 +1166,6 @@ define SetupRunSpecialTestBody
 	    || $$(ECHO) $$$$? > $$($1_EXITCODE) \
 	))
 
-  $1_RESULT_FILE := $$($1_TEST_RESULTS_DIR)/gtest.txt
-
   # We can not parse the various "special" tests.
   parse-test-$1: run-test-$1
 	$$(call LogWarn, Finished running test '$$($1_TEST)')
@@ -1122,6 +1175,7 @@ define SetupRunSpecialTestBody
 	$$(eval $1_PASSED := $$(shell \
 	  if [ `$(CAT) $$($1_EXITCODE)` = "0" ]; then $(ECHO) 1; else $(ECHO) 0; fi \
 	))
+	$$(eval $1_SKIPPED := 0)
 	$$(eval $1_FAILED := $$(shell \
 	  if [ `$(CAT) $$($1_EXITCODE)` = "0" ]; then $(ECHO) 0; else $(ECHO) 1; fi \
 	))
@@ -1231,8 +1285,8 @@ run-test-report: post-run-test
 	$(ECHO) >> $(TEST_SUMMARY) ==============================
 	$(ECHO) >> $(TEST_SUMMARY) Test summary
 	$(ECHO) >> $(TEST_SUMMARY) ==============================
-	$(PRINTF) >> $(TEST_SUMMARY) "%2s %-49s %5s %5s %5s %5s %2s\n" "  " \
-	    TEST TOTAL PASS FAIL ERROR " "
+	$(PRINTF) >> $(TEST_SUMMARY) "%2s %-49s %5s %5s %5s %5s %5s %2s\n" "  " \
+	    TEST TOTAL PASS FAIL ERROR SKIP " "
 	$(foreach test, $(TESTS_TO_RUN), \
 	  $(eval TEST_ID := $(shell $(ECHO) $(strip $(test)) | \
 	      $(TR) -cs '[a-z][A-Z][0-9]\n' '[_*1000]')) \
@@ -1244,15 +1298,15 @@ run-test-report: post-run-test
 	  , \
 	    $(eval TEST_NAME := $(test)) \
 	  ) \
-	  $(if $(filter $($(TEST_ID)_PASSED), $($(TEST_ID)_TOTAL)), \
-	    $(PRINTF) >> $(TEST_SUMMARY) "%2s %-49s %5d %5d %5d %5d %2s\n" \
-	        "  " "$(TEST_NAME)" $($(TEST_ID)_TOTAL) $($(TEST_ID)_PASSED) \
-	        $($(TEST_ID)_FAILED) $($(TEST_ID)_ERROR) "  " $(NEWLINE) \
-	  , \
-	    $(PRINTF) >> $(TEST_SUMMARY) "%2s %-49s %5d %5d %5d %5d %2s\n" \
+	  $(if $(filter-out 0, $($(TEST_ID)_FAILED) $($(TEST_ID)_ERROR)), \
+	    $(PRINTF) >> $(TEST_SUMMARY) "%2s %-49s %5d %5d %5d %5d %5d %2s\n" \
 	         ">>" "$(TEST_NAME)" $($(TEST_ID)_TOTAL) $($(TEST_ID)_PASSED) \
-	        $($(TEST_ID)_FAILED) $($(TEST_ID)_ERROR) "<<" $(NEWLINE) \
+	        $($(TEST_ID)_FAILED) $($(TEST_ID)_ERROR) $($(TEST_ID)_SKIPPED) "<<" $(NEWLINE) \
 	    $(eval TEST_FAILURE := true) \
+	  , \
+	    $(PRINTF) >> $(TEST_SUMMARY) "%2s %-49s %5d %5d %5d %5d %5d %2s\n" \
+	        "  " "$(TEST_NAME)" $($(TEST_ID)_TOTAL) $($(TEST_ID)_PASSED) \
+	        $($(TEST_ID)_FAILED) $($(TEST_ID)_ERROR) $($(TEST_ID)_SKIPPED) "  " $(NEWLINE) \
 	  ) \
 	)
 	$(ECHO) >> $(TEST_SUMMARY) ==============================

From d6c4be672f6348f8ed985416ed90d0447f5d5bb3 Mon Sep 17 00:00:00 2001
From: Thomas Schatzl <tschatzl@openjdk.org>
Date: Fri, 28 Feb 2025 14:16:52 +0000
Subject: [PATCH 169/587] 8350758: G1: Use actual last prediction in
 accumulated survivor rate prediction too

Reviewed-by: ayang, iwalulya
---
 src/hotspot/share/gc/g1/g1SurvRateGroup.cpp | 21 +++++++++------------
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/src/hotspot/share/gc/g1/g1SurvRateGroup.cpp b/src/hotspot/share/gc/g1/g1SurvRateGroup.cpp
index d5fd50c4523..f858b93b13d 100644
--- a/src/hotspot/share/gc/g1/g1SurvRateGroup.cpp
+++ b/src/hotspot/share/gc/g1/g1SurvRateGroup.cpp
@@ -68,26 +68,23 @@ void G1SurvRateGroup::stop_adding_regions() {
     _accum_surv_rate_pred = REALLOC_C_HEAP_ARRAY(double, _accum_surv_rate_pred, _num_added_regions, mtGC);
     _surv_rate_predictors = REALLOC_C_HEAP_ARRAY(TruncatedSeq*, _surv_rate_predictors, _num_added_regions, mtGC);
 
-    // Assume that the prediction for the newly added regions is the same as the
-    // ones at the (current) end of the array. Particularly predictions at the end
-    // of this array fairly seldom get updated, so having a better initial value
-    // that is at least somewhat related to the actual application is preferable.
-    double new_pred = _stats_arrays_length > 1
-                    ? _accum_surv_rate_pred[_stats_arrays_length - 1] - _accum_surv_rate_pred[_stats_arrays_length - 2]
-                    : InitialSurvivorRate;
-
     for (uint i = _stats_arrays_length; i < _num_added_regions; ++i) {
       // Initialize predictors and accumulated survivor rate predictions.
       _surv_rate_predictors[i] = new TruncatedSeq(10);
       if (i == 0) {
         _surv_rate_predictors[i]->add(InitialSurvivorRate);
-        _accum_surv_rate_pred[i] = 0.0;
+        _accum_surv_rate_pred[i] = InitialSurvivorRate;
       } else {
-        _surv_rate_predictors[i]->add(_surv_rate_predictors[i-1]->last());
-        _accum_surv_rate_pred[i] = _accum_surv_rate_pred[i-1] + new_pred;
+        // Assume that the prediction for the newly added regions is the same as the
+        // ones at the (current) end of the array. Particularly predictions at the end
+        // of this array fairly seldom get updated, so having a better initial value
+        // that is at least somewhat related to the actual application is preferable.
+        double next_pred = _surv_rate_predictors[i-1]->last();
+        _surv_rate_predictors[i]->add(next_pred);
+        _accum_surv_rate_pred[i] = _accum_surv_rate_pred[i-1] + next_pred;
       }
     }
-    _last_pred = new_pred;
+    _last_pred = _surv_rate_predictors[_num_added_regions-1]->last();
 
     _stats_arrays_length = _num_added_regions;
   }

From e98df71d9c5120fbb73a4c2f49863775fe5db781 Mon Sep 17 00:00:00 2001
From: Calvin Cheung <ccheung@openjdk.org>
Date: Fri, 28 Feb 2025 17:08:25 +0000
Subject: [PATCH 170/587] 8348028: Unable to run gtests with CDS enabled

Reviewed-by: dholmes, iklam, ihse
---
 make/hotspot/lib/CompileJvm.gmk                   |  1 +
 src/hotspot/os/bsd/os_bsd.cpp                     | 12 +-----------
 src/hotspot/share/cds/cdsConfig.cpp               |  8 +++-----
 src/hotspot/share/runtime/abstract_vm_version.cpp |  8 ++++++++
 src/hotspot/share/runtime/abstract_vm_version.hpp |  3 ++-
 5 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/make/hotspot/lib/CompileJvm.gmk b/make/hotspot/lib/CompileJvm.gmk
index b2c59505f9a..6b5edc85b23 100644
--- a/make/hotspot/lib/CompileJvm.gmk
+++ b/make/hotspot/lib/CompileJvm.gmk
@@ -89,6 +89,7 @@ CFLAGS_VM_VERSION := \
     -DHOTSPOT_VM_DISTRO='"$(HOTSPOT_VM_DISTRO)"' \
     -DCPU='"$(OPENJDK_TARGET_CPU_VM_VERSION)"' \
     -DHOTSPOT_BUILD_TIME='"$(HOTSPOT_BUILD_TIME)"' \
+    -DJVM_VARIANT='"$(JVM_VARIANT)"' \
     #
 
 ################################################################################
diff --git a/src/hotspot/os/bsd/os_bsd.cpp b/src/hotspot/os/bsd/os_bsd.cpp
index c538c54e86f..faa3efa2384 100644
--- a/src/hotspot/os/bsd/os_bsd.cpp
+++ b/src/hotspot/os/bsd/os_bsd.cpp
@@ -242,16 +242,6 @@ static char cpu_arch[] = "ppc";
   #error Add appropriate cpu_arch setting
 #endif
 
-// JVM variant
-#if   defined(ZERO)
-  #define JVM_VARIANT "zero"
-#elif defined(COMPILER2)
-  #define JVM_VARIANT "server"
-#else
-  #define JVM_VARIANT "client"
-#endif
-
-
 void os::Bsd::initialize_system_info() {
   int mib[2];
   size_t len;
@@ -1558,7 +1548,7 @@ void os::jvm_path(char *buf, jint buflen) {
         // Add the appropriate JVM variant subdir
         len = strlen(buf);
         jrelib_p = buf + len;
-        snprintf(jrelib_p, buflen-len, "/%s", JVM_VARIANT);
+        snprintf(jrelib_p, buflen-len, "/%s", Abstract_VM_Version::vm_variant());
         if (0 != access(buf, F_OK)) {
           snprintf(jrelib_p, buflen-len, "%s", "");
         }
diff --git a/src/hotspot/share/cds/cdsConfig.cpp b/src/hotspot/share/cds/cdsConfig.cpp
index 1bb842af953..a5c5742eaf2 100644
--- a/src/hotspot/share/cds/cdsConfig.cpp
+++ b/src/hotspot/share/cds/cdsConfig.cpp
@@ -89,12 +89,10 @@ void CDSConfig::initialize() {
 
 char* CDSConfig::default_archive_path() {
   if (_default_archive_path == nullptr) {
-    char jvm_path[JVM_MAXPATHLEN];
-    os::jvm_path(jvm_path, sizeof(jvm_path));
-    char *end = strrchr(jvm_path, *os::file_separator());
-    if (end != nullptr) *end = '\0';
     stringStream tmp;
-    tmp.print("%s%sclasses", jvm_path, os::file_separator());
+    const char* subdir = WINDOWS_ONLY("bin") NOT_WINDOWS("lib");
+    tmp.print("%s%s%s%s%s%sclasses", Arguments::get_java_home(), os::file_separator(), subdir,
+              os::file_separator(), Abstract_VM_Version::vm_variant(), os::file_separator());
 #ifdef _LP64
     if (!UseCompressedOops) {
       tmp.print_raw("_nocoops");
diff --git a/src/hotspot/share/runtime/abstract_vm_version.cpp b/src/hotspot/share/runtime/abstract_vm_version.cpp
index 0776d501339..05cccd4fe45 100644
--- a/src/hotspot/share/runtime/abstract_vm_version.cpp
+++ b/src/hotspot/share/runtime/abstract_vm_version.cpp
@@ -81,6 +81,10 @@ VirtualizationType Abstract_VM_Version::_detected_virtualization = NoDetectedVir
   #error HOTSPOT_BUILD_TIME must be defined
 #endif
 
+#ifndef JVM_VARIANT
+  #error JVM_VARIANT must be defined
+#endif
+
 #define VM_RELEASE HOTSPOT_VERSION_STRING
 
 // HOTSPOT_VERSION_STRING equals the JDK VERSION_STRING (unless overridden
@@ -195,6 +199,10 @@ const char *Abstract_VM_Version::vm_platform_string() {
   return OS "-" CPU;
 }
 
+const char* Abstract_VM_Version::vm_variant() {
+  return JVM_VARIANT;
+}
+
 const char* Abstract_VM_Version::internal_vm_info_string() {
   #ifndef HOTSPOT_BUILD_COMPILER
     #ifdef _MSC_VER
diff --git a/src/hotspot/share/runtime/abstract_vm_version.hpp b/src/hotspot/share/runtime/abstract_vm_version.hpp
index 491d8a49dae..8cfc7031f97 100644
--- a/src/hotspot/share/runtime/abstract_vm_version.hpp
+++ b/src/hotspot/share/runtime/abstract_vm_version.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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,6 +110,7 @@ class Abstract_VM_Version: AllStatic {
   static const char* vm_info_string();
   static const char* vm_release();
   static const char* vm_platform_string();
+  static const char* vm_variant();
 
   static int vm_major_version()               { return _vm_major_version; }
   static int vm_minor_version()               { return _vm_minor_version; }

From 197004f4c621d7ab4c8b9e48362973eaa18156a4 Mon Sep 17 00:00:00 2001
From: Leonid Mesnik <lmesnik@openjdk.org>
Date: Fri, 28 Feb 2025 18:13:53 +0000
Subject: [PATCH 171/587] 8350820: OperatingSystemMXBean CpuLoad() methods
 return -1.0 on Windows

Reviewed-by: kevinw, jwaters
---
 .../libmanagement_ext/OperatingSystemImpl.c   | 60 +++++++++----------
 1 file changed, 30 insertions(+), 30 deletions(-)

diff --git a/src/jdk.management/windows/native/libmanagement_ext/OperatingSystemImpl.c b/src/jdk.management/windows/native/libmanagement_ext/OperatingSystemImpl.c
index 3cfd4679134..37c30bbc898 100644
--- a/src/jdk.management/windows/native/libmanagement_ext/OperatingSystemImpl.c
+++ b/src/jdk.management/windows/native/libmanagement_ext/OperatingSystemImpl.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -436,13 +436,13 @@ makeFullCounterPath(const char* const objectName,
             return NULL;
         }
 
-        snprintf(fullCounterPath,
-                 fullCounterPathLen,
-                 PROCESS_OBJECT_INSTANCE_COUNTER_FMT,
-                 objectName,
-                 imageName,
-                 instance,
-                 counterName);
+        _snprintf(fullCounterPath,
+                  fullCounterPathLen,
+                  PROCESS_OBJECT_INSTANCE_COUNTER_FMT,
+                  objectName,
+                  imageName,
+                  instance,
+                  counterName);
     } else {
         if (instance) {
             /*
@@ -472,18 +472,18 @@ makeFullCounterPath(const char* const objectName,
         }
 
         if (instance) {
-            snprintf(fullCounterPath,
-                     fullCounterPathLen,
-                     OBJECT_WITH_INSTANCES_COUNTER_FMT,
-                     objectName,
-                     instance,
-                     counterName);
+            _snprintf(fullCounterPath,
+                      fullCounterPathLen,
+                      OBJECT_WITH_INSTANCES_COUNTER_FMT,
+                      objectName,
+                      instance,
+                      counterName);
         } else {
-            snprintf(fullCounterPath,
-                     fullCounterPathLen,
-                     OBJECT_COUNTER_FMT,
-                     objectName,
-                     counterName);
+            _snprintf(fullCounterPath,
+                      fullCounterPathLen,
+                      OBJECT_COUNTER_FMT,
+                      objectName,
+                      counterName);
         }
     }
 
@@ -719,10 +719,10 @@ currentQueryIndexForProcess(void) {
             PDH_FMT_COUNTERVALUE counterValue;
             PDH_STATUS res;
 
-            snprintf(fullIDProcessCounterPath,
-                     MAX_PATH,
-                     pdhIDProcessCounterFmt,
-                     index);
+            _snprintf(fullIDProcessCounterPath,
+                      MAX_PATH,
+                      pdhIDProcessCounterFmt,
+                      index);
 
             if (addCounter(tmpQuery, fullIDProcessCounterPath, &handleCounter) != 0) {
                 break;
@@ -1059,13 +1059,13 @@ allocateAndInitializePdhConstants() {
     }
 
     /* "\Process(java#%d)\ID Process" */
-    snprintf(pdhIDProcessCounterFmt,
-             pdhIDProcessCounterFmtLen,
-             PROCESS_OBJECT_INSTANCE_COUNTER_FMT,
-             pdhLocalizedProcessObject,
-             pdhProcessImageName,
-             "%d",
-             pdhLocalizedIDProcessCounter);
+    _snprintf(pdhIDProcessCounterFmt,
+              pdhIDProcessCounterFmtLen,
+              PROCESS_OBJECT_INSTANCE_COUNTER_FMT,
+              pdhLocalizedProcessObject,
+              pdhProcessImageName,
+              "%d",
+              pdhLocalizedIDProcessCounter);
 
     pdhIDProcessCounterFmt[pdhIDProcessCounterFmtLen] = '\0';
 

From 3a7d98687849ba0625fed2b516f4103ee8d27e41 Mon Sep 17 00:00:00 2001
From: Justin Lu <jlu@openjdk.org>
Date: Fri, 28 Feb 2025 19:37:36 +0000
Subject: [PATCH 172/587] 8350646: Calendar.Builder.build() Throws
 ArrayIndexOutOfBoundsException

Reviewed-by: naoto
---
 .../java/util/JapaneseImperialCalendar.java    | 10 +++++++++-
 .../util/Calendar/Builder/BuilderTest.java     | 10 ++++++++--
 .../Calendar/SupplementalJapaneseEraTest.java  | 18 +++++++++++++++++-
 .../SupplementalJapaneseEraTestRun.java        |  4 ++--
 4 files changed, 36 insertions(+), 6 deletions(-)

diff --git a/src/java.base/share/classes/java/util/JapaneseImperialCalendar.java b/src/java.base/share/classes/java/util/JapaneseImperialCalendar.java
index d275b09834a..755fe1133f5 100644
--- a/src/java.base/share/classes/java/util/JapaneseImperialCalendar.java
+++ b/src/java.base/share/classes/java/util/JapaneseImperialCalendar.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -1856,6 +1856,14 @@ class JapaneseImperialCalendar extends Calendar {
 
         if (isSet(ERA)) {
             era = internalGet(ERA);
+            // Don't check under, historically we have allowed values under
+            // BEFORE_MEIJI to be ignored during normalization
+            // We check against eras.length (not the highest constant ERA value)
+            // due to future added eras, or additional eras via
+            // "jdk.calendar.japanese.supplemental.era"
+            if (era >= eras.length) {
+                throw new IllegalArgumentException("Invalid era");
+            }
             year = isSet(YEAR) ? internalGet(YEAR) : 1;
         } else {
             if (isSet(YEAR)) {
diff --git a/test/jdk/java/util/Calendar/Builder/BuilderTest.java b/test/jdk/java/util/Calendar/Builder/BuilderTest.java
index d74c38c067a..34fab9204ed 100644
--- a/test/jdk/java/util/Calendar/Builder/BuilderTest.java
+++ b/test/jdk/java/util/Calendar/Builder/BuilderTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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 4745761
+ * @bug 4745761 8350646
  * @summary Unit test for Calendar.Builder.
+ * @run main BuilderTest
  */
 
 import java.time.LocalDateTime;
@@ -245,6 +246,11 @@ public class BuilderTest {
         checkException(calb, IllegalArgumentException.class);
         calb = builder().setCalendarType("japanese").setWeekDate(2013, 1, MONDAY);
         checkException(calb, IllegalArgumentException.class);
+        // JDK-8350646 : Ensure IAE (instead of AIOOBE) for ERA over largest supported
+        calb = builder().setCalendarType("japanese").setFields(ERA, 6);
+        checkException(calb, IllegalArgumentException.class);
+        // Note that we don't check ERAs under BEFORE_MEIJI, i.e. -1, -2, ... as
+        // historically JapaneseImperialCalendar ignores such values when normalizing
     }
 
     private static Calendar.Builder builder() {
diff --git a/test/jdk/java/util/Calendar/SupplementalJapaneseEraTest.java b/test/jdk/java/util/Calendar/SupplementalJapaneseEraTest.java
index 010519dc89e..411fc528dce 100644
--- a/test/jdk/java/util/Calendar/SupplementalJapaneseEraTest.java
+++ b/test/jdk/java/util/Calendar/SupplementalJapaneseEraTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -67,6 +67,22 @@ public class SupplementalJapaneseEraTest {
     }
 
     private static void testProperty() {
+        // JDK-8350646: Ensure that IAE is thrown for out of range era, when
+        // additional era is defined
+        try {
+            new Calendar.Builder()
+                    .setCalendarType("japanese")
+                    .setFields(ERA, JapaneseEra.values().length + 2)
+                    .build();
+            System.err.println("Out of range era should have thrown IAE");
+            errors++;
+        } catch (Exception e) {
+            if (!(e instanceof IllegalArgumentException)) {
+                System.err.printf("Out of range era threw \"%s\" instead of IAE\n", e);
+                errors++;
+            }
+        }
+
         Calendar jcal = new Calendar.Builder()
             .setCalendarType("japanese")
             .setFields(ERA, 6, YEAR, 1, DAY_OF_YEAR, 1)
diff --git a/test/jdk/java/util/Calendar/SupplementalJapaneseEraTestRun.java b/test/jdk/java/util/Calendar/SupplementalJapaneseEraTestRun.java
index 5383d0d1240..8eac4a97ef7 100644
--- a/test/jdk/java/util/Calendar/SupplementalJapaneseEraTestRun.java
+++ b/test/jdk/java/util/Calendar/SupplementalJapaneseEraTestRun.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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 8048123 8054214 8173423
+ * @bug 8048123 8054214 8173423 8350646
  * @summary Test for jdk.calendar.japanese.supplemental.era support
  * @library /test/lib
  * @build SupplementalJapaneseEraTest

From fb659eba028f793f7efb844d42024e903c1d0c5f Mon Sep 17 00:00:00 2001
From: Volkan Yazici <vyazici@openjdk.org>
Date: Fri, 28 Feb 2025 19:38:25 +0000
Subject: [PATCH 173/587] 8350915: [JMH] test SocketChannelConnectionSetup
 failed for 2 threads config

Reviewed-by: michaelm
---
 .../bench/java/net/SocketChannelConnectionSetup.java | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/test/micro/org/openjdk/bench/java/net/SocketChannelConnectionSetup.java b/test/micro/org/openjdk/bench/java/net/SocketChannelConnectionSetup.java
index dedaaa59229..505e124e43e 100644
--- a/test/micro/org/openjdk/bench/java/net/SocketChannelConnectionSetup.java
+++ b/test/micro/org/openjdk/bench/java/net/SocketChannelConnectionSetup.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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,8 @@
 package org.openjdk.bench.java.net;
 
 import java.io.IOException;
-import java.net.InetAddress;
-import java.net.InetSocketAddress;
 import java.net.StandardProtocolFamily;
 import java.net.UnixDomainSocketAddress;
-import java.nio.channels.ClosedChannelException;
 import java.nio.channels.ServerSocketChannel;
 import java.nio.channels.SocketChannel;
 import java.nio.file.*;
@@ -80,7 +77,6 @@ public class SocketChannelConnectionSetup {
 
 
     private ServerSocketChannel getInetServerSocketChannel() throws IOException {
-        InetAddress iaddr = InetAddress.getLoopbackAddress();
         return ServerSocketChannel.open().bind(null);
     }
 
@@ -97,11 +93,11 @@ public class SocketChannelConnectionSetup {
     }
 
     @TearDown(Level.Trial)
-    public void afterRun() throws IOException, InterruptedException {
+    public void afterRun() throws IOException {
         ssc.close();
         if (family.equals("unix")) {
-            Files.delete(socket);
-            Files.delete(Path.of(tempDir));
+            Files.deleteIfExists(socket);
+            Files.deleteIfExists(Path.of(tempDir));
         }
     }
 

From c7fa499bf5023a3f16bb3742d2ba3cd74f2b41bd Mon Sep 17 00:00:00 2001
From: Chen Liang <liach@openjdk.org>
Date: Fri, 28 Feb 2025 20:01:17 +0000
Subject: [PATCH 174/587] 8350118: Simplify the layout access VarHandle

Reviewed-by: mcimadamore, jvernee, erikj
---
 .../gensrc/GensrcScopedMemoryAccess.gmk       |   24 +-
 .../java.base/gensrc/GensrcVarHandles.gmk     |   19 +-
 .../java/lang/invoke/MethodHandleImpl.java    |    7 +-
 .../java/lang/invoke/SegmentVarHandle.java    |   95 +
 .../classes/java/lang/invoke/VarForm.java     |   23 +-
 .../classes/java/lang/invoke/VarHandle.java   |    3 +-
 .../java/lang/invoke/VarHandleGuards.java     | 1912 +++++++++++------
 .../lang/invoke/VarHandleSegmentViewBase.java |   55 -
 .../classes/java/lang/invoke/VarHandles.java  |  109 +-
 .../X-VarHandleSegmentView.java.template      |  651 ++++--
 .../internal/access/JavaLangInvokeAccess.java |    6 +-
 .../jdk/internal/foreign/LayoutPath.java      |   13 +-
 .../classes/jdk/internal/foreign/Utils.java   |  138 +-
 .../jdk/internal/foreign/abi/SharedUtils.java |    9 +
 .../internal/foreign/layout/ValueLayouts.java |   23 +-
 .../classes/jdk/internal/invoke/MhUtil.java   |   27 +-
 .../misc/X-ScopedMemoryAccess.java.template   |    2 +-
 test/jdk/java/foreign/TestAccessModes.java    |    1 +
 18 files changed, 1977 insertions(+), 1140 deletions(-)
 create mode 100644 src/java.base/share/classes/java/lang/invoke/SegmentVarHandle.java
 delete mode 100644 src/java.base/share/classes/java/lang/invoke/VarHandleSegmentViewBase.java

diff --git a/make/modules/java.base/gensrc/GensrcScopedMemoryAccess.gmk b/make/modules/java.base/gensrc/GensrcScopedMemoryAccess.gmk
index 1ed3fb3db79..00fba64394b 100644
--- a/make/modules/java.base/gensrc/GensrcScopedMemoryAccess.gmk
+++ b/make/modules/java.base/gensrc/GensrcScopedMemoryAccess.gmk
@@ -42,6 +42,17 @@ define GenerateScopedOp
 
   $1_Type := $2
 
+  ifeq ($$($1_Type), Boolean)
+    $1_type := boolean
+    $1_BoxType := $$($1_Type)
+
+    $1_rawType := $$($1_type)
+    $1_RawType := $$($1_Type)
+    $1_RawBoxType := $$($1_BoxType)
+
+    $1_ARGS += -KCAS
+  endif
+
   ifeq ($$($1_Type), Byte)
     $1_type := byte
     $1_BoxType := $$($1_Type)
@@ -50,6 +61,7 @@ define GenerateScopedOp
     $1_RawType := $$($1_Type)
     $1_RawBoxType := $$($1_BoxType)
 
+    $1_ARGS += -KCAS
     $1_ARGS += -Kbyte
   endif
 
@@ -60,6 +72,8 @@ define GenerateScopedOp
     $1_rawType := $$($1_type)
     $1_RawType := $$($1_Type)
     $1_RawBoxType := $$($1_BoxType)
+
+    $1_ARGS += -KCAS
     $1_ARGS += -KUnaligned
   endif
 
@@ -70,6 +84,8 @@ define GenerateScopedOp
     $1_rawType := $$($1_type)
     $1_RawType := $$($1_Type)
     $1_RawBoxType := $$($1_BoxType)
+
+    $1_ARGS += -KCAS
     $1_ARGS += -KUnaligned
   endif
 
@@ -82,8 +98,6 @@ define GenerateScopedOp
     $1_RawBoxType := $$($1_BoxType)
 
     $1_ARGS += -KCAS
-    $1_ARGS += -KAtomicAdd
-    $1_ARGS += -KBitwise
     $1_ARGS += -KUnaligned
   endif
 
@@ -96,8 +110,6 @@ define GenerateScopedOp
     $1_RawBoxType := $$($1_BoxType)
 
     $1_ARGS += -KCAS
-    $1_ARGS += -KAtomicAdd
-    $1_ARGS += -KBitwise
     $1_ARGS += -KUnaligned
   endif
 
@@ -133,7 +145,7 @@ define GenerateScopedOp
     $1_ARGS += -KBitwise
   endif
 
-  ifneq ($$(findstring $$($1_Type), Byte Short Char), )
+  ifneq ($$(findstring $$($1_Type), Boolean Byte Short Char), )
     $1_ARGS += -KShorterThanInt
   endif
 endef
@@ -141,7 +153,7 @@ endef
 ################################################################################
 # Setup a rule for generating the ScopedMemoryAccess java class
 
-SCOPE_MEMORY_ACCESS_TYPES := Byte Short Char Int Long Float Double
+SCOPE_MEMORY_ACCESS_TYPES := Boolean Byte Short Char Int Long Float Double
 $(foreach t, $(SCOPE_MEMORY_ACCESS_TYPES), \
   $(eval $(call GenerateScopedOp,BIN_$t,$t)))
 
diff --git a/make/modules/java.base/gensrc/GensrcVarHandles.gmk b/make/modules/java.base/gensrc/GensrcVarHandles.gmk
index e2f5664dec6..899f827462c 100644
--- a/make/modules/java.base/gensrc/GensrcVarHandles.gmk
+++ b/make/modules/java.base/gensrc/GensrcVarHandles.gmk
@@ -174,6 +174,18 @@ define GenerateVarHandleMemorySegment
 
   $1_FILENAME := $(VARHANDLES_GENSRC_DIR)/VarHandleSegmentAs$$($1_Type)s.java
 
+  ifeq ($$($1_Type), Boolean)
+    $1_type := boolean
+    $1_BoxType := $$($1_Type)
+
+    $1_rawType := $$($1_type)
+    $1_RawType := $$($1_Type)
+    $1_RawBoxType := $$($1_BoxType)
+
+    $1_ARGS += -Kbyte
+    $1_ARGS += -KShorterThanInt
+  endif
+
   ifeq ($$($1_Type), Byte)
     $1_type := byte
     $1_BoxType := $$($1_Type)
@@ -183,6 +195,7 @@ define GenerateVarHandleMemorySegment
     $1_RawBoxType := $$($1_BoxType)
 
     $1_ARGS += -Kbyte
+    $1_ARGS += -KShorterThanInt
   endif
 
   ifeq ($$($1_Type), Short)
@@ -192,6 +205,8 @@ define GenerateVarHandleMemorySegment
     $1_rawType := $$($1_type)
     $1_RawType := $$($1_Type)
     $1_RawBoxType := $$($1_BoxType)
+
+    $1_ARGS += -KShorterThanInt
   endif
 
   ifeq ($$($1_Type), Char)
@@ -201,6 +216,8 @@ define GenerateVarHandleMemorySegment
     $1_rawType := $$($1_type)
     $1_RawType := $$($1_Type)
     $1_RawBoxType := $$($1_BoxType)
+
+    $1_ARGS += -KShorterThanInt
   endif
 
   ifeq ($$($1_Type), Int)
@@ -277,7 +294,7 @@ $(foreach t, $(VARHANDLES_BYTE_ARRAY_TYPES), \
   $(eval $(call GenerateVarHandleByteArray,VAR_HANDLE_BYTE_ARRAY_$t,$t)))
 
 # List the types to generate source for, with capitalized first letter
-VARHANDLES_MEMORY_SEGMENT_TYPES := Byte Short Char Int Long Float Double
+VARHANDLES_MEMORY_SEGMENT_TYPES := Boolean Byte Short Char Int Long Float Double
 $(foreach t, $(VARHANDLES_MEMORY_SEGMENT_TYPES), \
   $(eval $(call GenerateVarHandleMemorySegment,VAR_HANDLE_MEMORY_SEGMENT_$t,$t)))
 
diff --git a/src/java.base/share/classes/java/lang/invoke/MethodHandleImpl.java b/src/java.base/share/classes/java/lang/invoke/MethodHandleImpl.java
index e11ec88e2e6..d57a932c4dd 100644
--- a/src/java.base/share/classes/java/lang/invoke/MethodHandleImpl.java
+++ b/src/java.base/share/classes/java/lang/invoke/MethodHandleImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -43,6 +43,7 @@ import sun.invoke.util.Wrapper;
 
 import java.lang.classfile.ClassFile;
 import java.lang.constant.ClassDesc;
+import java.lang.foreign.MemoryLayout;
 import java.lang.invoke.MethodHandles.Lookup;
 import java.lang.reflect.Array;
 import java.lang.reflect.Constructor;
@@ -1552,8 +1553,8 @@ abstract class MethodHandleImpl {
             }
 
             @Override
-            public VarHandle memorySegmentViewHandle(Class<?> carrier, long alignmentMask, ByteOrder order) {
-                return VarHandles.memorySegmentViewHandle(carrier, alignmentMask, order);
+            public VarHandle memorySegmentViewHandle(Class<?> carrier, MemoryLayout enclosing, long alignmentMask, ByteOrder order, boolean constantOffset, long offset) {
+                return VarHandles.memorySegmentViewHandle(carrier, enclosing, alignmentMask, constantOffset, offset, order);
             }
 
             @Override
diff --git a/src/java.base/share/classes/java/lang/invoke/SegmentVarHandle.java b/src/java.base/share/classes/java/lang/invoke/SegmentVarHandle.java
new file mode 100644
index 00000000000..99fb35379e0
--- /dev/null
+++ b/src/java.base/share/classes/java/lang/invoke/SegmentVarHandle.java
@@ -0,0 +1,95 @@
+/*
+ * Copyright (c) 2019, 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute 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.invoke;
+
+import java.lang.foreign.MemoryLayout;
+import java.lang.foreign.MemorySegment;
+import java.util.Objects;
+
+import jdk.internal.foreign.AbstractMemorySegmentImpl;
+import jdk.internal.misc.ScopedMemoryAccess;
+import jdk.internal.vm.annotation.ForceInline;
+
+/**
+ * A var handle that accesses primitive values in a memory segment.
+ */
+final class SegmentVarHandle extends VarHandle {
+
+    // Common implementation fields for the VarForms
+    static final boolean BE = MethodHandleStatics.UNSAFE.isBigEndian();
+    static final ScopedMemoryAccess SCOPED_MEMORY_ACCESS = ScopedMemoryAccess.getScopedMemoryAccess();
+
+    /** endianness **/
+    final boolean be;
+    /** The layout the accessed segment must be compatible with. */
+    final MemoryLayout enclosing;
+    /** The offset value, if is constant. vform decides if offset is constant or variable. */
+    final long offset;
+
+    SegmentVarHandle(VarForm form, boolean be, MemoryLayout enclosing, long offset, boolean exact) {
+        super(form, exact);
+        this.be = be;
+        this.enclosing = enclosing;
+        this.offset = offset;
+    }
+
+    @Override
+    final MethodType accessModeTypeUncached(VarHandle.AccessType accessType) {
+        var getType = vform.methodType_table[0]; // erased, but our value type is erase-compatible
+        return getType.parameterCount() == 2
+                ? accessType.accessModeType(MemorySegment.class, getType.returnType(), long.class)
+                : accessType.accessModeType(MemorySegment.class, getType.returnType(), long.class, long.class);
+    }
+
+    @Override
+    public SegmentVarHandle withInvokeExactBehavior() {
+        return hasInvokeExactBehavior() ?
+                this :
+                new SegmentVarHandle(vform, be, enclosing, offset, true);
+    }
+
+    @Override
+    public SegmentVarHandle withInvokeBehavior() {
+        return !hasInvokeExactBehavior() ?
+                this :
+                new SegmentVarHandle(vform, be, enclosing, offset, false);
+    }
+
+    // Common implementation methods for the VarForms
+
+    @ForceInline
+    static long offset(AbstractMemorySegmentImpl bb, long base, long offset) {
+        long segment_base = bb.unsafeGetOffset();
+        return segment_base + base + offset;
+    }
+
+    @ForceInline
+    AbstractMemorySegmentImpl checkSegment(Object obb, long base, boolean ro) {
+        AbstractMemorySegmentImpl oo = (AbstractMemorySegmentImpl) Objects.requireNonNull(obb);
+        oo.checkEnclosingLayout(base, this.enclosing, ro);
+        return oo;
+    }
+}
diff --git a/src/java.base/share/classes/java/lang/invoke/VarForm.java b/src/java.base/share/classes/java/lang/invoke/VarForm.java
index 0856bf126f9..f1f94a1c26b 100644
--- a/src/java.base/share/classes/java/lang/invoke/VarForm.java
+++ b/src/java.base/share/classes/java/lang/invoke/VarForm.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -36,6 +36,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 import static java.lang.invoke.MethodHandleNatives.Constants.REF_invokeStatic;
+import static java.lang.invoke.MethodHandleStatics.UNSAFE;
 
 /**
  * A var handle form containing a set of member name, one for each operation.
@@ -43,6 +44,7 @@ import static java.lang.invoke.MethodHandleNatives.Constants.REF_invokeStatic;
  */
 final class VarForm {
 
+    // implClass must be initialized when the member names are accessed!
     final Class<?> implClass;
 
     final @Stable MethodType[] methodType_table;
@@ -63,6 +65,15 @@ final class VarForm {
         }
     }
 
+    VarForm(Class<?> implClass, VarForm methodTypeSource) {
+        this.implClass = implClass;
+        // reuse initMethodTypes result from methodTypeSource
+        this.methodType_table = methodTypeSource.methodType_table;
+        this.methodType_V_table = methodTypeSource.methodType_V_table;
+        this.memberName_table = new MemberName[VarHandle.AccessMode.COUNT];
+        assert assertMethodTypeTableInitialized() : implClass;
+    }
+
     // Used by IndirectVarHandle
     VarForm(Class<?> value, Class<?>[] coordinates) {
         this.methodType_table = new MethodType[VarHandle.AccessType.COUNT];
@@ -103,6 +114,15 @@ final class VarForm {
                 type.changeReturnType(boolean.class);
     }
 
+    private boolean assertMethodTypeTableInitialized() {
+        if (methodType_table == null)
+            return false;
+        for (int i = 0; i < VarHandle.AccessType.COUNT; i++) {
+            assert methodType_table[i] != null : implClass + " " + VarHandle.AccessType.values()[i];
+        }
+        return true;
+    }
+
     @ForceInline
     final MethodType getMethodType(int type) {
         return methodType_table[type];
@@ -137,6 +157,7 @@ final class VarForm {
         AccessMode value = AccessMode.valueFromOrdinal(mode);
         String methodName = value.methodName();
         MethodType type = methodType_table[value.at.ordinal()].insertParameterTypes(0, VarHandle.class);
+        assert !UNSAFE.shouldBeInitialized(implClass) : implClass;
         return memberName_table[mode] = MethodHandles.Lookup.IMPL_LOOKUP
             .resolveOrNull(REF_invokeStatic, implClass, methodName, type);
     }
diff --git a/src/java.base/share/classes/java/lang/invoke/VarHandle.java b/src/java.base/share/classes/java/lang/invoke/VarHandle.java
index dda5f999715..9246fdc0395 100644
--- a/src/java.base/share/classes/java/lang/invoke/VarHandle.java
+++ b/src/java.base/share/classes/java/lang/invoke/VarHandle.java
@@ -472,8 +472,7 @@ import static java.lang.invoke.MethodHandleStatics.UNSAFE;
  * @since 9
  */
 public abstract sealed class VarHandle implements Constable
-     permits IndirectVarHandle, LazyInitializingVarHandle,
-             VarHandleSegmentViewBase,
+     permits IndirectVarHandle, LazyInitializingVarHandle, SegmentVarHandle,
              VarHandleByteArrayAsChars.ByteArrayViewVarHandle,
              VarHandleByteArrayAsDoubles.ByteArrayViewVarHandle,
              VarHandleByteArrayAsFloats.ByteArrayViewVarHandle,
diff --git a/src/java.base/share/classes/java/lang/invoke/VarHandleGuards.java b/src/java.base/share/classes/java/lang/invoke/VarHandleGuards.java
index 8b73587eca5..1590053a6d0 100644
--- a/src/java.base/share/classes/java/lang/invoke/VarHandleGuards.java
+++ b/src/java.base/share/classes/java/lang/invoke/VarHandleGuards.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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,49 +47,125 @@ final class VarHandleGuards {
     @ForceInline
     @LambdaForm.Compiled
     @Hidden
-    static final void guard_LL_V(VarHandle handle, Object arg0, Object arg1, VarHandle.AccessDescriptor ad) throws Throwable {
+    static final int guard_L_I(VarHandle handle, Object arg0, VarHandle.AccessDescriptor ad) throws Throwable {
         boolean direct = handle.checkAccessModeThenIsDirect(ad);
         if (direct && handle.vform.methodType_table[ad.type] == ad.symbolicMethodTypeErased) {
-            MethodHandle.linkToStatic(handle, arg0, arg1, handle.vform.getMemberName(ad.mode));
-        } else if (direct && handle.vform.getMethodType_V(ad.type) == ad.symbolicMethodTypeErased) {
-            MethodHandle.linkToStatic(handle, arg0, arg1, handle.vform.getMemberName(ad.mode));
+            return (int) MethodHandle.linkToStatic(handle, arg0, handle.vform.getMemberName(ad.mode));
         } else {
             MethodHandle mh = handle.getMethodHandle(ad.mode);
-            mh.asType(ad.symbolicMethodTypeInvoker).invokeBasic(handle.asDirect(), arg0, arg1);
+            return (int) mh.asType(ad.symbolicMethodTypeInvoker).invokeBasic(handle.asDirect(), arg0);
         }
     }
 
     @ForceInline
     @LambdaForm.Compiled
     @Hidden
-    static final boolean guard_LLL_Z(VarHandle handle, Object arg0, Object arg1, Object arg2, VarHandle.AccessDescriptor ad) throws Throwable {
+    static final long guard_L_J(VarHandle handle, Object arg0, VarHandle.AccessDescriptor ad) throws Throwable {
         boolean direct = handle.checkAccessModeThenIsDirect(ad);
         if (direct && handle.vform.methodType_table[ad.type] == ad.symbolicMethodTypeErased) {
-            return (boolean) MethodHandle.linkToStatic(handle, arg0, arg1, arg2, handle.vform.getMemberName(ad.mode));
+            return (long) MethodHandle.linkToStatic(handle, arg0, handle.vform.getMemberName(ad.mode));
         } else {
             MethodHandle mh = handle.getMethodHandle(ad.mode);
-            return (boolean) mh.asType(ad.symbolicMethodTypeInvoker).invokeBasic(handle.asDirect(), arg0, arg1, arg2);
+            return (long) mh.asType(ad.symbolicMethodTypeInvoker).invokeBasic(handle.asDirect(), arg0);
         }
     }
 
     @ForceInline
     @LambdaForm.Compiled
     @Hidden
-    static final Object guard_LLL_L(VarHandle handle, Object arg0, Object arg1, Object arg2, VarHandle.AccessDescriptor ad) throws Throwable {
+    static final float guard_L_F(VarHandle handle, Object arg0, VarHandle.AccessDescriptor ad) throws Throwable {
         boolean direct = handle.checkAccessModeThenIsDirect(ad);
         if (direct && handle.vform.methodType_table[ad.type] == ad.symbolicMethodTypeErased) {
-            Object r = MethodHandle.linkToStatic(handle, arg0, arg1, arg2, handle.vform.getMemberName(ad.mode));
+            return (float) MethodHandle.linkToStatic(handle, arg0, handle.vform.getMemberName(ad.mode));
+        } else {
+            MethodHandle mh = handle.getMethodHandle(ad.mode);
+            return (float) mh.asType(ad.symbolicMethodTypeInvoker).invokeBasic(handle.asDirect(), arg0);
+        }
+    }
+
+    @ForceInline
+    @LambdaForm.Compiled
+    @Hidden
+    static final double guard_L_D(VarHandle handle, Object arg0, VarHandle.AccessDescriptor ad) throws Throwable {
+        boolean direct = handle.checkAccessModeThenIsDirect(ad);
+        if (direct && handle.vform.methodType_table[ad.type] == ad.symbolicMethodTypeErased) {
+            return (double) MethodHandle.linkToStatic(handle, arg0, handle.vform.getMemberName(ad.mode));
+        } else {
+            MethodHandle mh = handle.getMethodHandle(ad.mode);
+            return (double) mh.asType(ad.symbolicMethodTypeInvoker).invokeBasic(handle.asDirect(), arg0);
+        }
+    }
+
+    @ForceInline
+    @LambdaForm.Compiled
+    @Hidden
+    static final Object guard__L(VarHandle handle, VarHandle.AccessDescriptor ad) throws Throwable {
+        boolean direct = handle.checkAccessModeThenIsDirect(ad);
+        if (direct && handle.vform.methodType_table[ad.type] == ad.symbolicMethodTypeErased) {
+            Object r = MethodHandle.linkToStatic(handle, handle.vform.getMemberName(ad.mode));
             return ad.returnType.cast(r);
         } else {
             MethodHandle mh = handle.getMethodHandle(ad.mode);
-            return mh.asType(ad.symbolicMethodTypeInvoker).invokeBasic(handle.asDirect(), arg0, arg1, arg2);
+            return mh.asType(ad.symbolicMethodTypeInvoker).invokeBasic(handle.asDirect());
         }
     }
 
     @ForceInline
     @LambdaForm.Compiled
     @Hidden
-    static final Object guard_LL_L(VarHandle handle, Object arg0, Object arg1, VarHandle.AccessDescriptor ad) throws Throwable {
+    static final int guard__I(VarHandle handle, VarHandle.AccessDescriptor ad) throws Throwable {
+        boolean direct = handle.checkAccessModeThenIsDirect(ad);
+        if (direct && handle.vform.methodType_table[ad.type] == ad.symbolicMethodTypeErased) {
+            return (int) MethodHandle.linkToStatic(handle, handle.vform.getMemberName(ad.mode));
+        } else {
+            MethodHandle mh = handle.getMethodHandle(ad.mode);
+            return (int) mh.asType(ad.symbolicMethodTypeInvoker).invokeBasic(handle.asDirect());
+        }
+    }
+
+    @ForceInline
+    @LambdaForm.Compiled
+    @Hidden
+    static final long guard__J(VarHandle handle, VarHandle.AccessDescriptor ad) throws Throwable {
+        boolean direct = handle.checkAccessModeThenIsDirect(ad);
+        if (direct && handle.vform.methodType_table[ad.type] == ad.symbolicMethodTypeErased) {
+            return (long) MethodHandle.linkToStatic(handle, handle.vform.getMemberName(ad.mode));
+        } else {
+            MethodHandle mh = handle.getMethodHandle(ad.mode);
+            return (long) mh.asType(ad.symbolicMethodTypeInvoker).invokeBasic(handle.asDirect());
+        }
+    }
+
+    @ForceInline
+    @LambdaForm.Compiled
+    @Hidden
+    static final float guard__F(VarHandle handle, VarHandle.AccessDescriptor ad) throws Throwable {
+        boolean direct = handle.checkAccessModeThenIsDirect(ad);
+        if (direct && handle.vform.methodType_table[ad.type] == ad.symbolicMethodTypeErased) {
+            return (float) MethodHandle.linkToStatic(handle, handle.vform.getMemberName(ad.mode));
+        } else {
+            MethodHandle mh = handle.getMethodHandle(ad.mode);
+            return (float) mh.asType(ad.symbolicMethodTypeInvoker).invokeBasic(handle.asDirect());
+        }
+    }
+
+    @ForceInline
+    @LambdaForm.Compiled
+    @Hidden
+    static final double guard__D(VarHandle handle, VarHandle.AccessDescriptor ad) throws Throwable {
+        boolean direct = handle.checkAccessModeThenIsDirect(ad);
+        if (direct && handle.vform.methodType_table[ad.type] == ad.symbolicMethodTypeErased) {
+            return (double) MethodHandle.linkToStatic(handle, handle.vform.getMemberName(ad.mode));
+        } else {
+            MethodHandle mh = handle.getMethodHandle(ad.mode);
+            return (double) mh.asType(ad.symbolicMethodTypeInvoker).invokeBasic(handle.asDirect());
+        }
+    }
+
+    @ForceInline
+    @LambdaForm.Compiled
+    @Hidden
+    static final Object guard_LI_L(VarHandle handle, Object arg0, int arg1, VarHandle.AccessDescriptor ad) throws Throwable {
         boolean direct = handle.checkAccessModeThenIsDirect(ad);
         if (direct && handle.vform.methodType_table[ad.type] == ad.symbolicMethodTypeErased) {
             Object r = MethodHandle.linkToStatic(handle, arg0, arg1, handle.vform.getMemberName(ad.mode));
@@ -103,13 +179,199 @@ final class VarHandleGuards {
     @ForceInline
     @LambdaForm.Compiled
     @Hidden
-    static final int guard_L_I(VarHandle handle, Object arg0, VarHandle.AccessDescriptor ad) throws Throwable {
+    static final int guard_LI_I(VarHandle handle, Object arg0, int arg1, VarHandle.AccessDescriptor ad) throws Throwable {
         boolean direct = handle.checkAccessModeThenIsDirect(ad);
         if (direct && handle.vform.methodType_table[ad.type] == ad.symbolicMethodTypeErased) {
-            return (int) MethodHandle.linkToStatic(handle, arg0, handle.vform.getMemberName(ad.mode));
+            return (int) MethodHandle.linkToStatic(handle, arg0, arg1, handle.vform.getMemberName(ad.mode));
         } else {
             MethodHandle mh = handle.getMethodHandle(ad.mode);
-            return (int) mh.asType(ad.symbolicMethodTypeInvoker).invokeBasic(handle.asDirect(), arg0);
+            return (int) mh.asType(ad.symbolicMethodTypeInvoker).invokeBasic(handle.asDirect(), arg0, arg1);
+        }
+    }
+
+    @ForceInline
+    @LambdaForm.Compiled
+    @Hidden
+    static final long guard_LI_J(VarHandle handle, Object arg0, int arg1, VarHandle.AccessDescriptor ad) throws Throwable {
+        boolean direct = handle.checkAccessModeThenIsDirect(ad);
+        if (direct && handle.vform.methodType_table[ad.type] == ad.symbolicMethodTypeErased) {
+            return (long) MethodHandle.linkToStatic(handle, arg0, arg1, handle.vform.getMemberName(ad.mode));
+        } else {
+            MethodHandle mh = handle.getMethodHandle(ad.mode);
+            return (long) mh.asType(ad.symbolicMethodTypeInvoker).invokeBasic(handle.asDirect(), arg0, arg1);
+        }
+    }
+
+    @ForceInline
+    @LambdaForm.Compiled
+    @Hidden
+    static final float guard_LI_F(VarHandle handle, Object arg0, int arg1, VarHandle.AccessDescriptor ad) throws Throwable {
+        boolean direct = handle.checkAccessModeThenIsDirect(ad);
+        if (direct && handle.vform.methodType_table[ad.type] == ad.symbolicMethodTypeErased) {
+            return (float) MethodHandle.linkToStatic(handle, arg0, arg1, handle.vform.getMemberName(ad.mode));
+        } else {
+            MethodHandle mh = handle.getMethodHandle(ad.mode);
+            return (float) mh.asType(ad.symbolicMethodTypeInvoker).invokeBasic(handle.asDirect(), arg0, arg1);
+        }
+    }
+
+    @ForceInline
+    @LambdaForm.Compiled
+    @Hidden
+    static final double guard_LI_D(VarHandle handle, Object arg0, int arg1, VarHandle.AccessDescriptor ad) throws Throwable {
+        boolean direct = handle.checkAccessModeThenIsDirect(ad);
+        if (direct && handle.vform.methodType_table[ad.type] == ad.symbolicMethodTypeErased) {
+            return (double) MethodHandle.linkToStatic(handle, arg0, arg1, handle.vform.getMemberName(ad.mode));
+        } else {
+            MethodHandle mh = handle.getMethodHandle(ad.mode);
+            return (double) mh.asType(ad.symbolicMethodTypeInvoker).invokeBasic(handle.asDirect(), arg0, arg1);
+        }
+    }
+
+    @ForceInline
+    @LambdaForm.Compiled
+    @Hidden
+    static final Object guard_LJ_L(VarHandle handle, Object arg0, long arg1, VarHandle.AccessDescriptor ad) throws Throwable {
+        boolean direct = handle.checkAccessModeThenIsDirect(ad);
+        if (direct && handle.vform.methodType_table[ad.type] == ad.symbolicMethodTypeErased) {
+            Object r = MethodHandle.linkToStatic(handle, arg0, arg1, handle.vform.getMemberName(ad.mode));
+            return ad.returnType.cast(r);
+        } else {
+            MethodHandle mh = handle.getMethodHandle(ad.mode);
+            return mh.asType(ad.symbolicMethodTypeInvoker).invokeBasic(handle.asDirect(), arg0, arg1);
+        }
+    }
+
+    @ForceInline
+    @LambdaForm.Compiled
+    @Hidden
+    static final int guard_LJ_I(VarHandle handle, Object arg0, long arg1, VarHandle.AccessDescriptor ad) throws Throwable {
+        boolean direct = handle.checkAccessModeThenIsDirect(ad);
+        if (direct && handle.vform.methodType_table[ad.type] == ad.symbolicMethodTypeErased) {
+            return (int) MethodHandle.linkToStatic(handle, arg0, arg1, handle.vform.getMemberName(ad.mode));
+        } else {
+            MethodHandle mh = handle.getMethodHandle(ad.mode);
+            return (int) mh.asType(ad.symbolicMethodTypeInvoker).invokeBasic(handle.asDirect(), arg0, arg1);
+        }
+    }
+
+    @ForceInline
+    @LambdaForm.Compiled
+    @Hidden
+    static final long guard_LJ_J(VarHandle handle, Object arg0, long arg1, VarHandle.AccessDescriptor ad) throws Throwable {
+        boolean direct = handle.checkAccessModeThenIsDirect(ad);
+        if (direct && handle.vform.methodType_table[ad.type] == ad.symbolicMethodTypeErased) {
+            return (long) MethodHandle.linkToStatic(handle, arg0, arg1, handle.vform.getMemberName(ad.mode));
+        } else {
+            MethodHandle mh = handle.getMethodHandle(ad.mode);
+            return (long) mh.asType(ad.symbolicMethodTypeInvoker).invokeBasic(handle.asDirect(), arg0, arg1);
+        }
+    }
+
+    @ForceInline
+    @LambdaForm.Compiled
+    @Hidden
+    static final float guard_LJ_F(VarHandle handle, Object arg0, long arg1, VarHandle.AccessDescriptor ad) throws Throwable {
+        boolean direct = handle.checkAccessModeThenIsDirect(ad);
+        if (direct && handle.vform.methodType_table[ad.type] == ad.symbolicMethodTypeErased) {
+            return (float) MethodHandle.linkToStatic(handle, arg0, arg1, handle.vform.getMemberName(ad.mode));
+        } else {
+            MethodHandle mh = handle.getMethodHandle(ad.mode);
+            return (float) mh.asType(ad.symbolicMethodTypeInvoker).invokeBasic(handle.asDirect(), arg0, arg1);
+        }
+    }
+
+    @ForceInline
+    @LambdaForm.Compiled
+    @Hidden
+    static final double guard_LJ_D(VarHandle handle, Object arg0, long arg1, VarHandle.AccessDescriptor ad) throws Throwable {
+        boolean direct = handle.checkAccessModeThenIsDirect(ad);
+        if (direct && handle.vform.methodType_table[ad.type] == ad.symbolicMethodTypeErased) {
+            return (double) MethodHandle.linkToStatic(handle, arg0, arg1, handle.vform.getMemberName(ad.mode));
+        } else {
+            MethodHandle mh = handle.getMethodHandle(ad.mode);
+            return (double) mh.asType(ad.symbolicMethodTypeInvoker).invokeBasic(handle.asDirect(), arg0, arg1);
+        }
+    }
+
+    @ForceInline
+    @LambdaForm.Compiled
+    @Hidden
+    static final Object guard_LJJ_L(VarHandle handle, Object arg0, long arg1, long arg2, VarHandle.AccessDescriptor ad) throws Throwable {
+        boolean direct = handle.checkAccessModeThenIsDirect(ad);
+        if (direct && handle.vform.methodType_table[ad.type] == ad.symbolicMethodTypeErased) {
+            Object r = MethodHandle.linkToStatic(handle, arg0, arg1, arg2, handle.vform.getMemberName(ad.mode));
+            return ad.returnType.cast(r);
+        } else {
+            MethodHandle mh = handle.getMethodHandle(ad.mode);
+            return mh.asType(ad.symbolicMethodTypeInvoker).invokeBasic(handle.asDirect(), arg0, arg1, arg2);
+        }
+    }
+
+    @ForceInline
+    @LambdaForm.Compiled
+    @Hidden
+    static final int guard_LJJ_I(VarHandle handle, Object arg0, long arg1, long arg2, VarHandle.AccessDescriptor ad) throws Throwable {
+        boolean direct = handle.checkAccessModeThenIsDirect(ad);
+        if (direct && handle.vform.methodType_table[ad.type] == ad.symbolicMethodTypeErased) {
+            return (int) MethodHandle.linkToStatic(handle, arg0, arg1, arg2, handle.vform.getMemberName(ad.mode));
+        } else {
+            MethodHandle mh = handle.getMethodHandle(ad.mode);
+            return (int) mh.asType(ad.symbolicMethodTypeInvoker).invokeBasic(handle.asDirect(), arg0, arg1, arg2);
+        }
+    }
+
+    @ForceInline
+    @LambdaForm.Compiled
+    @Hidden
+    static final long guard_LJJ_J(VarHandle handle, Object arg0, long arg1, long arg2, VarHandle.AccessDescriptor ad) throws Throwable {
+        boolean direct = handle.checkAccessModeThenIsDirect(ad);
+        if (direct && handle.vform.methodType_table[ad.type] == ad.symbolicMethodTypeErased) {
+            return (long) MethodHandle.linkToStatic(handle, arg0, arg1, arg2, handle.vform.getMemberName(ad.mode));
+        } else {
+            MethodHandle mh = handle.getMethodHandle(ad.mode);
+            return (long) mh.asType(ad.symbolicMethodTypeInvoker).invokeBasic(handle.asDirect(), arg0, arg1, arg2);
+        }
+    }
+
+    @ForceInline
+    @LambdaForm.Compiled
+    @Hidden
+    static final float guard_LJJ_F(VarHandle handle, Object arg0, long arg1, long arg2, VarHandle.AccessDescriptor ad) throws Throwable {
+        boolean direct = handle.checkAccessModeThenIsDirect(ad);
+        if (direct && handle.vform.methodType_table[ad.type] == ad.symbolicMethodTypeErased) {
+            return (float) MethodHandle.linkToStatic(handle, arg0, arg1, arg2, handle.vform.getMemberName(ad.mode));
+        } else {
+            MethodHandle mh = handle.getMethodHandle(ad.mode);
+            return (float) mh.asType(ad.symbolicMethodTypeInvoker).invokeBasic(handle.asDirect(), arg0, arg1, arg2);
+        }
+    }
+
+    @ForceInline
+    @LambdaForm.Compiled
+    @Hidden
+    static final double guard_LJJ_D(VarHandle handle, Object arg0, long arg1, long arg2, VarHandle.AccessDescriptor ad) throws Throwable {
+        boolean direct = handle.checkAccessModeThenIsDirect(ad);
+        if (direct && handle.vform.methodType_table[ad.type] == ad.symbolicMethodTypeErased) {
+            return (double) MethodHandle.linkToStatic(handle, arg0, arg1, arg2, handle.vform.getMemberName(ad.mode));
+        } else {
+            MethodHandle mh = handle.getMethodHandle(ad.mode);
+            return (double) mh.asType(ad.symbolicMethodTypeInvoker).invokeBasic(handle.asDirect(), arg0, arg1, arg2);
+        }
+    }
+
+    @ForceInline
+    @LambdaForm.Compiled
+    @Hidden
+    static final void guard_LL_V(VarHandle handle, Object arg0, Object arg1, VarHandle.AccessDescriptor ad) throws Throwable {
+        boolean direct = handle.checkAccessModeThenIsDirect(ad);
+        if (direct && handle.vform.methodType_table[ad.type] == ad.symbolicMethodTypeErased) {
+            MethodHandle.linkToStatic(handle, arg0, arg1, handle.vform.getMemberName(ad.mode));
+        } else if (direct && handle.vform.getMethodType_V(ad.type) == ad.symbolicMethodTypeErased) {
+            MethodHandle.linkToStatic(handle, arg0, arg1, handle.vform.getMemberName(ad.mode));
+        } else {
+            MethodHandle mh = handle.getMethodHandle(ad.mode);
+            mh.asType(ad.symbolicMethodTypeInvoker).invokeBasic(handle.asDirect(), arg0, arg1);
         }
     }
 
@@ -128,58 +390,6 @@ final class VarHandleGuards {
         }
     }
 
-    @ForceInline
-    @LambdaForm.Compiled
-    @Hidden
-    static final boolean guard_LII_Z(VarHandle handle, Object arg0, int arg1, int arg2, VarHandle.AccessDescriptor ad) throws Throwable {
-        boolean direct = handle.checkAccessModeThenIsDirect(ad);
-        if (direct && handle.vform.methodType_table[ad.type] == ad.symbolicMethodTypeErased) {
-            return (boolean) MethodHandle.linkToStatic(handle, arg0, arg1, arg2, handle.vform.getMemberName(ad.mode));
-        } else {
-            MethodHandle mh = handle.getMethodHandle(ad.mode);
-            return (boolean) mh.asType(ad.symbolicMethodTypeInvoker).invokeBasic(handle.asDirect(), arg0, arg1, arg2);
-        }
-    }
-
-    @ForceInline
-    @LambdaForm.Compiled
-    @Hidden
-    static final int guard_LII_I(VarHandle handle, Object arg0, int arg1, int arg2, VarHandle.AccessDescriptor ad) throws Throwable {
-        boolean direct = handle.checkAccessModeThenIsDirect(ad);
-        if (direct && handle.vform.methodType_table[ad.type] == ad.symbolicMethodTypeErased) {
-            return (int) MethodHandle.linkToStatic(handle, arg0, arg1, arg2, handle.vform.getMemberName(ad.mode));
-        } else {
-            MethodHandle mh = handle.getMethodHandle(ad.mode);
-            return (int) mh.asType(ad.symbolicMethodTypeInvoker).invokeBasic(handle.asDirect(), arg0, arg1, arg2);
-        }
-    }
-
-    @ForceInline
-    @LambdaForm.Compiled
-    @Hidden
-    static final int guard_LI_I(VarHandle handle, Object arg0, int arg1, VarHandle.AccessDescriptor ad) throws Throwable {
-        boolean direct = handle.checkAccessModeThenIsDirect(ad);
-        if (direct && handle.vform.methodType_table[ad.type] == ad.symbolicMethodTypeErased) {
-            return (int) MethodHandle.linkToStatic(handle, arg0, arg1, handle.vform.getMemberName(ad.mode));
-        } else {
-            MethodHandle mh = handle.getMethodHandle(ad.mode);
-            return (int) mh.asType(ad.symbolicMethodTypeInvoker).invokeBasic(handle.asDirect(), arg0, arg1);
-        }
-    }
-
-    @ForceInline
-    @LambdaForm.Compiled
-    @Hidden
-    static final long guard_L_J(VarHandle handle, Object arg0, VarHandle.AccessDescriptor ad) throws Throwable {
-        boolean direct = handle.checkAccessModeThenIsDirect(ad);
-        if (direct && handle.vform.methodType_table[ad.type] == ad.symbolicMethodTypeErased) {
-            return (long) MethodHandle.linkToStatic(handle, arg0, handle.vform.getMemberName(ad.mode));
-        } else {
-            MethodHandle mh = handle.getMethodHandle(ad.mode);
-            return (long) mh.asType(ad.symbolicMethodTypeInvoker).invokeBasic(handle.asDirect(), arg0);
-        }
-    }
-
     @ForceInline
     @LambdaForm.Compiled
     @Hidden
@@ -195,58 +405,6 @@ final class VarHandleGuards {
         }
     }
 
-    @ForceInline
-    @LambdaForm.Compiled
-    @Hidden
-    static final boolean guard_LJJ_Z(VarHandle handle, Object arg0, long arg1, long arg2, VarHandle.AccessDescriptor ad) throws Throwable {
-        boolean direct = handle.checkAccessModeThenIsDirect(ad);
-        if (direct && handle.vform.methodType_table[ad.type] == ad.symbolicMethodTypeErased) {
-            return (boolean) MethodHandle.linkToStatic(handle, arg0, arg1, arg2, handle.vform.getMemberName(ad.mode));
-        } else {
-            MethodHandle mh = handle.getMethodHandle(ad.mode);
-            return (boolean) mh.asType(ad.symbolicMethodTypeInvoker).invokeBasic(handle.asDirect(), arg0, arg1, arg2);
-        }
-    }
-
-    @ForceInline
-    @LambdaForm.Compiled
-    @Hidden
-    static final long guard_LJJ_J(VarHandle handle, Object arg0, long arg1, long arg2, VarHandle.AccessDescriptor ad) throws Throwable {
-        boolean direct = handle.checkAccessModeThenIsDirect(ad);
-        if (direct && handle.vform.methodType_table[ad.type] == ad.symbolicMethodTypeErased) {
-            return (long) MethodHandle.linkToStatic(handle, arg0, arg1, arg2, handle.vform.getMemberName(ad.mode));
-        } else {
-            MethodHandle mh = handle.getMethodHandle(ad.mode);
-            return (long) mh.asType(ad.symbolicMethodTypeInvoker).invokeBasic(handle.asDirect(), arg0, arg1, arg2);
-        }
-    }
-
-    @ForceInline
-    @LambdaForm.Compiled
-    @Hidden
-    static final long guard_LJ_J(VarHandle handle, Object arg0, long arg1, VarHandle.AccessDescriptor ad) throws Throwable {
-        boolean direct = handle.checkAccessModeThenIsDirect(ad);
-        if (direct && handle.vform.methodType_table[ad.type] == ad.symbolicMethodTypeErased) {
-            return (long) MethodHandle.linkToStatic(handle, arg0, arg1, handle.vform.getMemberName(ad.mode));
-        } else {
-            MethodHandle mh = handle.getMethodHandle(ad.mode);
-            return (long) mh.asType(ad.symbolicMethodTypeInvoker).invokeBasic(handle.asDirect(), arg0, arg1);
-        }
-    }
-
-    @ForceInline
-    @LambdaForm.Compiled
-    @Hidden
-    static final float guard_L_F(VarHandle handle, Object arg0, VarHandle.AccessDescriptor ad) throws Throwable {
-        boolean direct = handle.checkAccessModeThenIsDirect(ad);
-        if (direct && handle.vform.methodType_table[ad.type] == ad.symbolicMethodTypeErased) {
-            return (float) MethodHandle.linkToStatic(handle, arg0, handle.vform.getMemberName(ad.mode));
-        } else {
-            MethodHandle mh = handle.getMethodHandle(ad.mode);
-            return (float) mh.asType(ad.symbolicMethodTypeInvoker).invokeBasic(handle.asDirect(), arg0);
-        }
-    }
-
     @ForceInline
     @LambdaForm.Compiled
     @Hidden
@@ -262,58 +420,6 @@ final class VarHandleGuards {
         }
     }
 
-    @ForceInline
-    @LambdaForm.Compiled
-    @Hidden
-    static final boolean guard_LFF_Z(VarHandle handle, Object arg0, float arg1, float arg2, VarHandle.AccessDescriptor ad) throws Throwable {
-        boolean direct = handle.checkAccessModeThenIsDirect(ad);
-        if (direct && handle.vform.methodType_table[ad.type] == ad.symbolicMethodTypeErased) {
-            return (boolean) MethodHandle.linkToStatic(handle, arg0, arg1, arg2, handle.vform.getMemberName(ad.mode));
-        } else {
-            MethodHandle mh = handle.getMethodHandle(ad.mode);
-            return (boolean) mh.asType(ad.symbolicMethodTypeInvoker).invokeBasic(handle.asDirect(), arg0, arg1, arg2);
-        }
-    }
-
-    @ForceInline
-    @LambdaForm.Compiled
-    @Hidden
-    static final float guard_LFF_F(VarHandle handle, Object arg0, float arg1, float arg2, VarHandle.AccessDescriptor ad) throws Throwable {
-        boolean direct = handle.checkAccessModeThenIsDirect(ad);
-        if (direct && handle.vform.methodType_table[ad.type] == ad.symbolicMethodTypeErased) {
-            return (float) MethodHandle.linkToStatic(handle, arg0, arg1, arg2, handle.vform.getMemberName(ad.mode));
-        } else {
-            MethodHandle mh = handle.getMethodHandle(ad.mode);
-            return (float) mh.asType(ad.symbolicMethodTypeInvoker).invokeBasic(handle.asDirect(), arg0, arg1, arg2);
-        }
-    }
-
-    @ForceInline
-    @LambdaForm.Compiled
-    @Hidden
-    static final float guard_LF_F(VarHandle handle, Object arg0, float arg1, VarHandle.AccessDescriptor ad) throws Throwable {
-        boolean direct = handle.checkAccessModeThenIsDirect(ad);
-        if (direct && handle.vform.methodType_table[ad.type] == ad.symbolicMethodTypeErased) {
-            return (float) MethodHandle.linkToStatic(handle, arg0, arg1, handle.vform.getMemberName(ad.mode));
-        } else {
-            MethodHandle mh = handle.getMethodHandle(ad.mode);
-            return (float) mh.asType(ad.symbolicMethodTypeInvoker).invokeBasic(handle.asDirect(), arg0, arg1);
-        }
-    }
-
-    @ForceInline
-    @LambdaForm.Compiled
-    @Hidden
-    static final double guard_L_D(VarHandle handle, Object arg0, VarHandle.AccessDescriptor ad) throws Throwable {
-        boolean direct = handle.checkAccessModeThenIsDirect(ad);
-        if (direct && handle.vform.methodType_table[ad.type] == ad.symbolicMethodTypeErased) {
-            return (double) MethodHandle.linkToStatic(handle, arg0, handle.vform.getMemberName(ad.mode));
-        } else {
-            MethodHandle mh = handle.getMethodHandle(ad.mode);
-            return (double) mh.asType(ad.symbolicMethodTypeInvoker).invokeBasic(handle.asDirect(), arg0);
-        }
-    }
-
     @ForceInline
     @LambdaForm.Compiled
     @Hidden
@@ -329,59 +435,6 @@ final class VarHandleGuards {
         }
     }
 
-    @ForceInline
-    @LambdaForm.Compiled
-    @Hidden
-    static final boolean guard_LDD_Z(VarHandle handle, Object arg0, double arg1, double arg2, VarHandle.AccessDescriptor ad) throws Throwable {
-        boolean direct = handle.checkAccessModeThenIsDirect(ad);
-        if (direct && handle.vform.methodType_table[ad.type] == ad.symbolicMethodTypeErased) {
-            return (boolean) MethodHandle.linkToStatic(handle, arg0, arg1, arg2, handle.vform.getMemberName(ad.mode));
-        } else {
-            MethodHandle mh = handle.getMethodHandle(ad.mode);
-            return (boolean) mh.asType(ad.symbolicMethodTypeInvoker).invokeBasic(handle.asDirect(), arg0, arg1, arg2);
-        }
-    }
-
-    @ForceInline
-    @LambdaForm.Compiled
-    @Hidden
-    static final double guard_LDD_D(VarHandle handle, Object arg0, double arg1, double arg2, VarHandle.AccessDescriptor ad) throws Throwable {
-        boolean direct = handle.checkAccessModeThenIsDirect(ad);
-        if (direct && handle.vform.methodType_table[ad.type] == ad.symbolicMethodTypeErased) {
-            return (double) MethodHandle.linkToStatic(handle, arg0, arg1, arg2, handle.vform.getMemberName(ad.mode));
-        } else {
-            MethodHandle mh = handle.getMethodHandle(ad.mode);
-            return (double) mh.asType(ad.symbolicMethodTypeInvoker).invokeBasic(handle.asDirect(), arg0, arg1, arg2);
-        }
-    }
-
-    @ForceInline
-    @LambdaForm.Compiled
-    @Hidden
-    static final double guard_LD_D(VarHandle handle, Object arg0, double arg1, VarHandle.AccessDescriptor ad) throws Throwable {
-        boolean direct = handle.checkAccessModeThenIsDirect(ad);
-        if (direct && handle.vform.methodType_table[ad.type] == ad.symbolicMethodTypeErased) {
-            return (double) MethodHandle.linkToStatic(handle, arg0, arg1, handle.vform.getMemberName(ad.mode));
-        } else {
-            MethodHandle mh = handle.getMethodHandle(ad.mode);
-            return (double) mh.asType(ad.symbolicMethodTypeInvoker).invokeBasic(handle.asDirect(), arg0, arg1);
-        }
-    }
-
-    @ForceInline
-    @LambdaForm.Compiled
-    @Hidden
-    static final Object guard__L(VarHandle handle, VarHandle.AccessDescriptor ad) throws Throwable {
-        boolean direct = handle.checkAccessModeThenIsDirect(ad);
-        if (direct && handle.vform.methodType_table[ad.type] == ad.symbolicMethodTypeErased) {
-            Object r = MethodHandle.linkToStatic(handle, handle.vform.getMemberName(ad.mode));
-            return ad.returnType.cast(r);
-        } else {
-            MethodHandle mh = handle.getMethodHandle(ad.mode);
-            return mh.asType(ad.symbolicMethodTypeInvoker).invokeBasic(handle.asDirect());
-        }
-    }
-
     @ForceInline
     @LambdaForm.Compiled
     @Hidden
@@ -397,32 +450,6 @@ final class VarHandleGuards {
         }
     }
 
-    @ForceInline
-    @LambdaForm.Compiled
-    @Hidden
-    static final boolean guard_LL_Z(VarHandle handle, Object arg0, Object arg1, VarHandle.AccessDescriptor ad) throws Throwable {
-        boolean direct = handle.checkAccessModeThenIsDirect(ad);
-        if (direct && handle.vform.methodType_table[ad.type] == ad.symbolicMethodTypeErased) {
-            return (boolean) MethodHandle.linkToStatic(handle, arg0, arg1, handle.vform.getMemberName(ad.mode));
-        } else {
-            MethodHandle mh = handle.getMethodHandle(ad.mode);
-            return (boolean) mh.asType(ad.symbolicMethodTypeInvoker).invokeBasic(handle.asDirect(), arg0, arg1);
-        }
-    }
-
-    @ForceInline
-    @LambdaForm.Compiled
-    @Hidden
-    static final int guard__I(VarHandle handle, VarHandle.AccessDescriptor ad) throws Throwable {
-        boolean direct = handle.checkAccessModeThenIsDirect(ad);
-        if (direct && handle.vform.methodType_table[ad.type] == ad.symbolicMethodTypeErased) {
-            return (int) MethodHandle.linkToStatic(handle, handle.vform.getMemberName(ad.mode));
-        } else {
-            MethodHandle mh = handle.getMethodHandle(ad.mode);
-            return (int) mh.asType(ad.symbolicMethodTypeInvoker).invokeBasic(handle.asDirect());
-        }
-    }
-
     @ForceInline
     @LambdaForm.Compiled
     @Hidden
@@ -438,58 +465,6 @@ final class VarHandleGuards {
         }
     }
 
-    @ForceInline
-    @LambdaForm.Compiled
-    @Hidden
-    static final boolean guard_II_Z(VarHandle handle, int arg0, int arg1, VarHandle.AccessDescriptor ad) throws Throwable {
-        boolean direct = handle.checkAccessModeThenIsDirect(ad);
-        if (direct && handle.vform.methodType_table[ad.type] == ad.symbolicMethodTypeErased) {
-            return (boolean) MethodHandle.linkToStatic(handle, arg0, arg1, handle.vform.getMemberName(ad.mode));
-        } else {
-            MethodHandle mh = handle.getMethodHandle(ad.mode);
-            return (boolean) mh.asType(ad.symbolicMethodTypeInvoker).invokeBasic(handle.asDirect(), arg0, arg1);
-        }
-    }
-
-    @ForceInline
-    @LambdaForm.Compiled
-    @Hidden
-    static final int guard_II_I(VarHandle handle, int arg0, int arg1, VarHandle.AccessDescriptor ad) throws Throwable {
-        boolean direct = handle.checkAccessModeThenIsDirect(ad);
-        if (direct && handle.vform.methodType_table[ad.type] == ad.symbolicMethodTypeErased) {
-            return (int) MethodHandle.linkToStatic(handle, arg0, arg1, handle.vform.getMemberName(ad.mode));
-        } else {
-            MethodHandle mh = handle.getMethodHandle(ad.mode);
-            return (int) mh.asType(ad.symbolicMethodTypeInvoker).invokeBasic(handle.asDirect(), arg0, arg1);
-        }
-    }
-
-    @ForceInline
-    @LambdaForm.Compiled
-    @Hidden
-    static final int guard_I_I(VarHandle handle, int arg0, VarHandle.AccessDescriptor ad) throws Throwable {
-        boolean direct = handle.checkAccessModeThenIsDirect(ad);
-        if (direct && handle.vform.methodType_table[ad.type] == ad.symbolicMethodTypeErased) {
-            return (int) MethodHandle.linkToStatic(handle, arg0, handle.vform.getMemberName(ad.mode));
-        } else {
-            MethodHandle mh = handle.getMethodHandle(ad.mode);
-            return (int) mh.asType(ad.symbolicMethodTypeInvoker).invokeBasic(handle.asDirect(), arg0);
-        }
-    }
-
-    @ForceInline
-    @LambdaForm.Compiled
-    @Hidden
-    static final long guard__J(VarHandle handle, VarHandle.AccessDescriptor ad) throws Throwable {
-        boolean direct = handle.checkAccessModeThenIsDirect(ad);
-        if (direct && handle.vform.methodType_table[ad.type] == ad.symbolicMethodTypeErased) {
-            return (long) MethodHandle.linkToStatic(handle, handle.vform.getMemberName(ad.mode));
-        } else {
-            MethodHandle mh = handle.getMethodHandle(ad.mode);
-            return (long) mh.asType(ad.symbolicMethodTypeInvoker).invokeBasic(handle.asDirect());
-        }
-    }
-
     @ForceInline
     @LambdaForm.Compiled
     @Hidden
@@ -505,58 +480,6 @@ final class VarHandleGuards {
         }
     }
 
-    @ForceInline
-    @LambdaForm.Compiled
-    @Hidden
-    static final boolean guard_JJ_Z(VarHandle handle, long arg0, long arg1, VarHandle.AccessDescriptor ad) throws Throwable {
-        boolean direct = handle.checkAccessModeThenIsDirect(ad);
-        if (direct && handle.vform.methodType_table[ad.type] == ad.symbolicMethodTypeErased) {
-            return (boolean) MethodHandle.linkToStatic(handle, arg0, arg1, handle.vform.getMemberName(ad.mode));
-        } else {
-            MethodHandle mh = handle.getMethodHandle(ad.mode);
-            return (boolean) mh.asType(ad.symbolicMethodTypeInvoker).invokeBasic(handle.asDirect(), arg0, arg1);
-        }
-    }
-
-    @ForceInline
-    @LambdaForm.Compiled
-    @Hidden
-    static final long guard_JJ_J(VarHandle handle, long arg0, long arg1, VarHandle.AccessDescriptor ad) throws Throwable {
-        boolean direct = handle.checkAccessModeThenIsDirect(ad);
-        if (direct && handle.vform.methodType_table[ad.type] == ad.symbolicMethodTypeErased) {
-            return (long) MethodHandle.linkToStatic(handle, arg0, arg1, handle.vform.getMemberName(ad.mode));
-        } else {
-            MethodHandle mh = handle.getMethodHandle(ad.mode);
-            return (long) mh.asType(ad.symbolicMethodTypeInvoker).invokeBasic(handle.asDirect(), arg0, arg1);
-        }
-    }
-
-    @ForceInline
-    @LambdaForm.Compiled
-    @Hidden
-    static final long guard_J_J(VarHandle handle, long arg0, VarHandle.AccessDescriptor ad) throws Throwable {
-        boolean direct = handle.checkAccessModeThenIsDirect(ad);
-        if (direct && handle.vform.methodType_table[ad.type] == ad.symbolicMethodTypeErased) {
-            return (long) MethodHandle.linkToStatic(handle, arg0, handle.vform.getMemberName(ad.mode));
-        } else {
-            MethodHandle mh = handle.getMethodHandle(ad.mode);
-            return (long) mh.asType(ad.symbolicMethodTypeInvoker).invokeBasic(handle.asDirect(), arg0);
-        }
-    }
-
-    @ForceInline
-    @LambdaForm.Compiled
-    @Hidden
-    static final float guard__F(VarHandle handle, VarHandle.AccessDescriptor ad) throws Throwable {
-        boolean direct = handle.checkAccessModeThenIsDirect(ad);
-        if (direct && handle.vform.methodType_table[ad.type] == ad.symbolicMethodTypeErased) {
-            return (float) MethodHandle.linkToStatic(handle, handle.vform.getMemberName(ad.mode));
-        } else {
-            MethodHandle mh = handle.getMethodHandle(ad.mode);
-            return (float) mh.asType(ad.symbolicMethodTypeInvoker).invokeBasic(handle.asDirect());
-        }
-    }
-
     @ForceInline
     @LambdaForm.Compiled
     @Hidden
@@ -572,58 +495,6 @@ final class VarHandleGuards {
         }
     }
 
-    @ForceInline
-    @LambdaForm.Compiled
-    @Hidden
-    static final boolean guard_FF_Z(VarHandle handle, float arg0, float arg1, VarHandle.AccessDescriptor ad) throws Throwable {
-        boolean direct = handle.checkAccessModeThenIsDirect(ad);
-        if (direct && handle.vform.methodType_table[ad.type] == ad.symbolicMethodTypeErased) {
-            return (boolean) MethodHandle.linkToStatic(handle, arg0, arg1, handle.vform.getMemberName(ad.mode));
-        } else {
-            MethodHandle mh = handle.getMethodHandle(ad.mode);
-            return (boolean) mh.asType(ad.symbolicMethodTypeInvoker).invokeBasic(handle.asDirect(), arg0, arg1);
-        }
-    }
-
-    @ForceInline
-    @LambdaForm.Compiled
-    @Hidden
-    static final float guard_FF_F(VarHandle handle, float arg0, float arg1, VarHandle.AccessDescriptor ad) throws Throwable {
-        boolean direct = handle.checkAccessModeThenIsDirect(ad);
-        if (direct && handle.vform.methodType_table[ad.type] == ad.symbolicMethodTypeErased) {
-            return (float) MethodHandle.linkToStatic(handle, arg0, arg1, handle.vform.getMemberName(ad.mode));
-        } else {
-            MethodHandle mh = handle.getMethodHandle(ad.mode);
-            return (float) mh.asType(ad.symbolicMethodTypeInvoker).invokeBasic(handle.asDirect(), arg0, arg1);
-        }
-    }
-
-    @ForceInline
-    @LambdaForm.Compiled
-    @Hidden
-    static final float guard_F_F(VarHandle handle, float arg0, VarHandle.AccessDescriptor ad) throws Throwable {
-        boolean direct = handle.checkAccessModeThenIsDirect(ad);
-        if (direct && handle.vform.methodType_table[ad.type] == ad.symbolicMethodTypeErased) {
-            return (float) MethodHandle.linkToStatic(handle, arg0, handle.vform.getMemberName(ad.mode));
-        } else {
-            MethodHandle mh = handle.getMethodHandle(ad.mode);
-            return (float) mh.asType(ad.symbolicMethodTypeInvoker).invokeBasic(handle.asDirect(), arg0);
-        }
-    }
-
-    @ForceInline
-    @LambdaForm.Compiled
-    @Hidden
-    static final double guard__D(VarHandle handle, VarHandle.AccessDescriptor ad) throws Throwable {
-        boolean direct = handle.checkAccessModeThenIsDirect(ad);
-        if (direct && handle.vform.methodType_table[ad.type] == ad.symbolicMethodTypeErased) {
-            return (double) MethodHandle.linkToStatic(handle, handle.vform.getMemberName(ad.mode));
-        } else {
-            MethodHandle mh = handle.getMethodHandle(ad.mode);
-            return (double) mh.asType(ad.symbolicMethodTypeInvoker).invokeBasic(handle.asDirect());
-        }
-    }
-
     @ForceInline
     @LambdaForm.Compiled
     @Hidden
@@ -639,59 +510,6 @@ final class VarHandleGuards {
         }
     }
 
-    @ForceInline
-    @LambdaForm.Compiled
-    @Hidden
-    static final boolean guard_DD_Z(VarHandle handle, double arg0, double arg1, VarHandle.AccessDescriptor ad) throws Throwable {
-        boolean direct = handle.checkAccessModeThenIsDirect(ad);
-        if (direct && handle.vform.methodType_table[ad.type] == ad.symbolicMethodTypeErased) {
-            return (boolean) MethodHandle.linkToStatic(handle, arg0, arg1, handle.vform.getMemberName(ad.mode));
-        } else {
-            MethodHandle mh = handle.getMethodHandle(ad.mode);
-            return (boolean) mh.asType(ad.symbolicMethodTypeInvoker).invokeBasic(handle.asDirect(), arg0, arg1);
-        }
-    }
-
-    @ForceInline
-    @LambdaForm.Compiled
-    @Hidden
-    static final double guard_DD_D(VarHandle handle, double arg0, double arg1, VarHandle.AccessDescriptor ad) throws Throwable {
-        boolean direct = handle.checkAccessModeThenIsDirect(ad);
-        if (direct && handle.vform.methodType_table[ad.type] == ad.symbolicMethodTypeErased) {
-            return (double) MethodHandle.linkToStatic(handle, arg0, arg1, handle.vform.getMemberName(ad.mode));
-        } else {
-            MethodHandle mh = handle.getMethodHandle(ad.mode);
-            return (double) mh.asType(ad.symbolicMethodTypeInvoker).invokeBasic(handle.asDirect(), arg0, arg1);
-        }
-    }
-
-    @ForceInline
-    @LambdaForm.Compiled
-    @Hidden
-    static final double guard_D_D(VarHandle handle, double arg0, VarHandle.AccessDescriptor ad) throws Throwable {
-        boolean direct = handle.checkAccessModeThenIsDirect(ad);
-        if (direct && handle.vform.methodType_table[ad.type] == ad.symbolicMethodTypeErased) {
-            return (double) MethodHandle.linkToStatic(handle, arg0, handle.vform.getMemberName(ad.mode));
-        } else {
-            MethodHandle mh = handle.getMethodHandle(ad.mode);
-            return (double) mh.asType(ad.symbolicMethodTypeInvoker).invokeBasic(handle.asDirect(), arg0);
-        }
-    }
-
-    @ForceInline
-    @LambdaForm.Compiled
-    @Hidden
-    static final Object guard_LI_L(VarHandle handle, Object arg0, int arg1, VarHandle.AccessDescriptor ad) throws Throwable {
-        boolean direct = handle.checkAccessModeThenIsDirect(ad);
-        if (direct && handle.vform.methodType_table[ad.type] == ad.symbolicMethodTypeErased) {
-            Object r = MethodHandle.linkToStatic(handle, arg0, arg1, handle.vform.getMemberName(ad.mode));
-            return ad.returnType.cast(r);
-        } else {
-            MethodHandle mh = handle.getMethodHandle(ad.mode);
-            return mh.asType(ad.symbolicMethodTypeInvoker).invokeBasic(handle.asDirect(), arg0, arg1);
-        }
-    }
-
     @ForceInline
     @LambdaForm.Compiled
     @Hidden
@@ -707,47 +525,6 @@ final class VarHandleGuards {
         }
     }
 
-    @ForceInline
-    @LambdaForm.Compiled
-    @Hidden
-    static final boolean guard_LILL_Z(VarHandle handle, Object arg0, int arg1, Object arg2, Object arg3, VarHandle.AccessDescriptor ad) throws Throwable {
-        boolean direct = handle.checkAccessModeThenIsDirect(ad);
-        if (direct && handle.vform.methodType_table[ad.type] == ad.symbolicMethodTypeErased) {
-            return (boolean) MethodHandle.linkToStatic(handle, arg0, arg1, arg2, arg3, handle.vform.getMemberName(ad.mode));
-        } else {
-            MethodHandle mh = handle.getMethodHandle(ad.mode);
-            return (boolean) mh.asType(ad.symbolicMethodTypeInvoker).invokeBasic(handle.asDirect(), arg0, arg1, arg2, arg3);
-        }
-    }
-
-    @ForceInline
-    @LambdaForm.Compiled
-    @Hidden
-    static final Object guard_LILL_L(VarHandle handle, Object arg0, int arg1, Object arg2, Object arg3, VarHandle.AccessDescriptor ad) throws Throwable {
-        boolean direct = handle.checkAccessModeThenIsDirect(ad);
-        if (direct && handle.vform.methodType_table[ad.type] == ad.symbolicMethodTypeErased) {
-            Object r = MethodHandle.linkToStatic(handle, arg0, arg1, arg2, arg3, handle.vform.getMemberName(ad.mode));
-            return ad.returnType.cast(r);
-        } else {
-            MethodHandle mh = handle.getMethodHandle(ad.mode);
-            return mh.asType(ad.symbolicMethodTypeInvoker).invokeBasic(handle.asDirect(), arg0, arg1, arg2, arg3);
-        }
-    }
-
-    @ForceInline
-    @LambdaForm.Compiled
-    @Hidden
-    static final Object guard_LIL_L(VarHandle handle, Object arg0, int arg1, Object arg2, VarHandle.AccessDescriptor ad) throws Throwable {
-        boolean direct = handle.checkAccessModeThenIsDirect(ad);
-        if (direct && handle.vform.methodType_table[ad.type] == ad.symbolicMethodTypeErased) {
-            Object r = MethodHandle.linkToStatic(handle, arg0, arg1, arg2, handle.vform.getMemberName(ad.mode));
-            return ad.returnType.cast(r);
-        } else {
-            MethodHandle mh = handle.getMethodHandle(ad.mode);
-            return mh.asType(ad.symbolicMethodTypeInvoker).invokeBasic(handle.asDirect(), arg0, arg1, arg2);
-        }
-    }
-
     @ForceInline
     @LambdaForm.Compiled
     @Hidden
@@ -763,45 +540,6 @@ final class VarHandleGuards {
         }
     }
 
-    @ForceInline
-    @LambdaForm.Compiled
-    @Hidden
-    static final boolean guard_LIII_Z(VarHandle handle, Object arg0, int arg1, int arg2, int arg3, VarHandle.AccessDescriptor ad) throws Throwable {
-        boolean direct = handle.checkAccessModeThenIsDirect(ad);
-        if (direct && handle.vform.methodType_table[ad.type] == ad.symbolicMethodTypeErased) {
-            return (boolean) MethodHandle.linkToStatic(handle, arg0, arg1, arg2, arg3, handle.vform.getMemberName(ad.mode));
-        } else {
-            MethodHandle mh = handle.getMethodHandle(ad.mode);
-            return (boolean) mh.asType(ad.symbolicMethodTypeInvoker).invokeBasic(handle.asDirect(), arg0, arg1, arg2, arg3);
-        }
-    }
-
-    @ForceInline
-    @LambdaForm.Compiled
-    @Hidden
-    static final int guard_LIII_I(VarHandle handle, Object arg0, int arg1, int arg2, int arg3, VarHandle.AccessDescriptor ad) throws Throwable {
-        boolean direct = handle.checkAccessModeThenIsDirect(ad);
-        if (direct && handle.vform.methodType_table[ad.type] == ad.symbolicMethodTypeErased) {
-            return (int) MethodHandle.linkToStatic(handle, arg0, arg1, arg2, arg3, handle.vform.getMemberName(ad.mode));
-        } else {
-            MethodHandle mh = handle.getMethodHandle(ad.mode);
-            return (int) mh.asType(ad.symbolicMethodTypeInvoker).invokeBasic(handle.asDirect(), arg0, arg1, arg2, arg3);
-        }
-    }
-
-    @ForceInline
-    @LambdaForm.Compiled
-    @Hidden
-    static final long guard_LI_J(VarHandle handle, Object arg0, int arg1, VarHandle.AccessDescriptor ad) throws Throwable {
-        boolean direct = handle.checkAccessModeThenIsDirect(ad);
-        if (direct && handle.vform.methodType_table[ad.type] == ad.symbolicMethodTypeErased) {
-            return (long) MethodHandle.linkToStatic(handle, arg0, arg1, handle.vform.getMemberName(ad.mode));
-        } else {
-            MethodHandle mh = handle.getMethodHandle(ad.mode);
-            return (long) mh.asType(ad.symbolicMethodTypeInvoker).invokeBasic(handle.asDirect(), arg0, arg1);
-        }
-    }
-
     @ForceInline
     @LambdaForm.Compiled
     @Hidden
@@ -817,58 +555,6 @@ final class VarHandleGuards {
         }
     }
 
-    @ForceInline
-    @LambdaForm.Compiled
-    @Hidden
-    static final boolean guard_LIJJ_Z(VarHandle handle, Object arg0, int arg1, long arg2, long arg3, VarHandle.AccessDescriptor ad) throws Throwable {
-        boolean direct = handle.checkAccessModeThenIsDirect(ad);
-        if (direct && handle.vform.methodType_table[ad.type] == ad.symbolicMethodTypeErased) {
-            return (boolean) MethodHandle.linkToStatic(handle, arg0, arg1, arg2, arg3, handle.vform.getMemberName(ad.mode));
-        } else {
-            MethodHandle mh = handle.getMethodHandle(ad.mode);
-            return (boolean) mh.asType(ad.symbolicMethodTypeInvoker).invokeBasic(handle.asDirect(), arg0, arg1, arg2, arg3);
-        }
-    }
-
-    @ForceInline
-    @LambdaForm.Compiled
-    @Hidden
-    static final long guard_LIJJ_J(VarHandle handle, Object arg0, int arg1, long arg2, long arg3, VarHandle.AccessDescriptor ad) throws Throwable {
-        boolean direct = handle.checkAccessModeThenIsDirect(ad);
-        if (direct && handle.vform.methodType_table[ad.type] == ad.symbolicMethodTypeErased) {
-            return (long) MethodHandle.linkToStatic(handle, arg0, arg1, arg2, arg3, handle.vform.getMemberName(ad.mode));
-        } else {
-            MethodHandle mh = handle.getMethodHandle(ad.mode);
-            return (long) mh.asType(ad.symbolicMethodTypeInvoker).invokeBasic(handle.asDirect(), arg0, arg1, arg2, arg3);
-        }
-    }
-
-    @ForceInline
-    @LambdaForm.Compiled
-    @Hidden
-    static final long guard_LIJ_J(VarHandle handle, Object arg0, int arg1, long arg2, VarHandle.AccessDescriptor ad) throws Throwable {
-        boolean direct = handle.checkAccessModeThenIsDirect(ad);
-        if (direct && handle.vform.methodType_table[ad.type] == ad.symbolicMethodTypeErased) {
-            return (long) MethodHandle.linkToStatic(handle, arg0, arg1, arg2, handle.vform.getMemberName(ad.mode));
-        } else {
-            MethodHandle mh = handle.getMethodHandle(ad.mode);
-            return (long) mh.asType(ad.symbolicMethodTypeInvoker).invokeBasic(handle.asDirect(), arg0, arg1, arg2);
-        }
-    }
-
-    @ForceInline
-    @LambdaForm.Compiled
-    @Hidden
-    static final float guard_LI_F(VarHandle handle, Object arg0, int arg1, VarHandle.AccessDescriptor ad) throws Throwable {
-        boolean direct = handle.checkAccessModeThenIsDirect(ad);
-        if (direct && handle.vform.methodType_table[ad.type] == ad.symbolicMethodTypeErased) {
-            return (float) MethodHandle.linkToStatic(handle, arg0, arg1, handle.vform.getMemberName(ad.mode));
-        } else {
-            MethodHandle mh = handle.getMethodHandle(ad.mode);
-            return (float) mh.asType(ad.symbolicMethodTypeInvoker).invokeBasic(handle.asDirect(), arg0, arg1);
-        }
-    }
-
     @ForceInline
     @LambdaForm.Compiled
     @Hidden
@@ -884,58 +570,6 @@ final class VarHandleGuards {
         }
     }
 
-    @ForceInline
-    @LambdaForm.Compiled
-    @Hidden
-    static final boolean guard_LIFF_Z(VarHandle handle, Object arg0, int arg1, float arg2, float arg3, VarHandle.AccessDescriptor ad) throws Throwable {
-        boolean direct = handle.checkAccessModeThenIsDirect(ad);
-        if (direct && handle.vform.methodType_table[ad.type] == ad.symbolicMethodTypeErased) {
-            return (boolean) MethodHandle.linkToStatic(handle, arg0, arg1, arg2, arg3, handle.vform.getMemberName(ad.mode));
-        } else {
-            MethodHandle mh = handle.getMethodHandle(ad.mode);
-            return (boolean) mh.asType(ad.symbolicMethodTypeInvoker).invokeBasic(handle.asDirect(), arg0, arg1, arg2, arg3);
-        }
-    }
-
-    @ForceInline
-    @LambdaForm.Compiled
-    @Hidden
-    static final float guard_LIFF_F(VarHandle handle, Object arg0, int arg1, float arg2, float arg3, VarHandle.AccessDescriptor ad) throws Throwable {
-        boolean direct = handle.checkAccessModeThenIsDirect(ad);
-        if (direct && handle.vform.methodType_table[ad.type] == ad.symbolicMethodTypeErased) {
-            return (float) MethodHandle.linkToStatic(handle, arg0, arg1, arg2, arg3, handle.vform.getMemberName(ad.mode));
-        } else {
-            MethodHandle mh = handle.getMethodHandle(ad.mode);
-            return (float) mh.asType(ad.symbolicMethodTypeInvoker).invokeBasic(handle.asDirect(), arg0, arg1, arg2, arg3);
-        }
-    }
-
-    @ForceInline
-    @LambdaForm.Compiled
-    @Hidden
-    static final float guard_LIF_F(VarHandle handle, Object arg0, int arg1, float arg2, VarHandle.AccessDescriptor ad) throws Throwable {
-        boolean direct = handle.checkAccessModeThenIsDirect(ad);
-        if (direct && handle.vform.methodType_table[ad.type] == ad.symbolicMethodTypeErased) {
-            return (float) MethodHandle.linkToStatic(handle, arg0, arg1, arg2, handle.vform.getMemberName(ad.mode));
-        } else {
-            MethodHandle mh = handle.getMethodHandle(ad.mode);
-            return (float) mh.asType(ad.symbolicMethodTypeInvoker).invokeBasic(handle.asDirect(), arg0, arg1, arg2);
-        }
-    }
-
-    @ForceInline
-    @LambdaForm.Compiled
-    @Hidden
-    static final double guard_LI_D(VarHandle handle, Object arg0, int arg1, VarHandle.AccessDescriptor ad) throws Throwable {
-        boolean direct = handle.checkAccessModeThenIsDirect(ad);
-        if (direct && handle.vform.methodType_table[ad.type] == ad.symbolicMethodTypeErased) {
-            return (double) MethodHandle.linkToStatic(handle, arg0, arg1, handle.vform.getMemberName(ad.mode));
-        } else {
-            MethodHandle mh = handle.getMethodHandle(ad.mode);
-            return (double) mh.asType(ad.symbolicMethodTypeInvoker).invokeBasic(handle.asDirect(), arg0, arg1);
-        }
-    }
-
     @ForceInline
     @LambdaForm.Compiled
     @Hidden
@@ -954,52 +588,15 @@ final class VarHandleGuards {
     @ForceInline
     @LambdaForm.Compiled
     @Hidden
-    static final boolean guard_LIDD_Z(VarHandle handle, Object arg0, int arg1, double arg2, double arg3, VarHandle.AccessDescriptor ad) throws Throwable {
+    static final void guard_LJL_V(VarHandle handle, Object arg0, long arg1, Object arg2, VarHandle.AccessDescriptor ad) throws Throwable {
         boolean direct = handle.checkAccessModeThenIsDirect(ad);
         if (direct && handle.vform.methodType_table[ad.type] == ad.symbolicMethodTypeErased) {
-            return (boolean) MethodHandle.linkToStatic(handle, arg0, arg1, arg2, arg3, handle.vform.getMemberName(ad.mode));
+            MethodHandle.linkToStatic(handle, arg0, arg1, arg2, handle.vform.getMemberName(ad.mode));
+        } else if (direct && handle.vform.getMethodType_V(ad.type) == ad.symbolicMethodTypeErased) {
+            MethodHandle.linkToStatic(handle, arg0, arg1, arg2, handle.vform.getMemberName(ad.mode));
         } else {
             MethodHandle mh = handle.getMethodHandle(ad.mode);
-            return (boolean) mh.asType(ad.symbolicMethodTypeInvoker).invokeBasic(handle.asDirect(), arg0, arg1, arg2, arg3);
-        }
-    }
-
-    @ForceInline
-    @LambdaForm.Compiled
-    @Hidden
-    static final double guard_LIDD_D(VarHandle handle, Object arg0, int arg1, double arg2, double arg3, VarHandle.AccessDescriptor ad) throws Throwable {
-        boolean direct = handle.checkAccessModeThenIsDirect(ad);
-        if (direct && handle.vform.methodType_table[ad.type] == ad.symbolicMethodTypeErased) {
-            return (double) MethodHandle.linkToStatic(handle, arg0, arg1, arg2, arg3, handle.vform.getMemberName(ad.mode));
-        } else {
-            MethodHandle mh = handle.getMethodHandle(ad.mode);
-            return (double) mh.asType(ad.symbolicMethodTypeInvoker).invokeBasic(handle.asDirect(), arg0, arg1, arg2, arg3);
-        }
-    }
-
-    @ForceInline
-    @LambdaForm.Compiled
-    @Hidden
-    static final double guard_LID_D(VarHandle handle, Object arg0, int arg1, double arg2, VarHandle.AccessDescriptor ad) throws Throwable {
-        boolean direct = handle.checkAccessModeThenIsDirect(ad);
-        if (direct && handle.vform.methodType_table[ad.type] == ad.symbolicMethodTypeErased) {
-            return (double) MethodHandle.linkToStatic(handle, arg0, arg1, arg2, handle.vform.getMemberName(ad.mode));
-        } else {
-            MethodHandle mh = handle.getMethodHandle(ad.mode);
-            return (double) mh.asType(ad.symbolicMethodTypeInvoker).invokeBasic(handle.asDirect(), arg0, arg1, arg2);
-        }
-    }
-
-    @ForceInline
-    @LambdaForm.Compiled
-    @Hidden
-    static final int guard_LJ_I(VarHandle handle, Object arg0, long arg1, VarHandle.AccessDescriptor ad) throws Throwable {
-        boolean direct = handle.checkAccessModeThenIsDirect(ad);
-        if (direct && handle.vform.methodType_table[ad.type] == ad.symbolicMethodTypeErased) {
-            return (int) MethodHandle.linkToStatic(handle, arg0, arg1, handle.vform.getMemberName(ad.mode));
-        } else {
-            MethodHandle mh = handle.getMethodHandle(ad.mode);
-            return (int) mh.asType(ad.symbolicMethodTypeInvoker).invokeBasic(handle.asDirect(), arg0, arg1);
+            mh.asType(ad.symbolicMethodTypeInvoker).invokeBasic(handle.asDirect(), arg0, arg1, arg2);
         }
     }
 
@@ -1021,7 +618,257 @@ final class VarHandleGuards {
     @ForceInline
     @LambdaForm.Compiled
     @Hidden
-    static final boolean guard_LJII_Z(VarHandle handle, Object arg0, long arg1, int arg2, int arg3, VarHandle.AccessDescriptor ad) throws Throwable {
+    static final void guard_LJJ_V(VarHandle handle, Object arg0, long arg1, long arg2, VarHandle.AccessDescriptor ad) throws Throwable {
+        boolean direct = handle.checkAccessModeThenIsDirect(ad);
+        if (direct && handle.vform.methodType_table[ad.type] == ad.symbolicMethodTypeErased) {
+            MethodHandle.linkToStatic(handle, arg0, arg1, arg2, handle.vform.getMemberName(ad.mode));
+        } else if (direct && handle.vform.getMethodType_V(ad.type) == ad.symbolicMethodTypeErased) {
+            MethodHandle.linkToStatic(handle, arg0, arg1, arg2, handle.vform.getMemberName(ad.mode));
+        } else {
+            MethodHandle mh = handle.getMethodHandle(ad.mode);
+            mh.asType(ad.symbolicMethodTypeInvoker).invokeBasic(handle.asDirect(), arg0, arg1, arg2);
+        }
+    }
+
+    @ForceInline
+    @LambdaForm.Compiled
+    @Hidden
+    static final void guard_LJF_V(VarHandle handle, Object arg0, long arg1, float arg2, VarHandle.AccessDescriptor ad) throws Throwable {
+        boolean direct = handle.checkAccessModeThenIsDirect(ad);
+        if (direct && handle.vform.methodType_table[ad.type] == ad.symbolicMethodTypeErased) {
+            MethodHandle.linkToStatic(handle, arg0, arg1, arg2, handle.vform.getMemberName(ad.mode));
+        } else if (direct && handle.vform.getMethodType_V(ad.type) == ad.symbolicMethodTypeErased) {
+            MethodHandle.linkToStatic(handle, arg0, arg1, arg2, handle.vform.getMemberName(ad.mode));
+        } else {
+            MethodHandle mh = handle.getMethodHandle(ad.mode);
+            mh.asType(ad.symbolicMethodTypeInvoker).invokeBasic(handle.asDirect(), arg0, arg1, arg2);
+        }
+    }
+
+    @ForceInline
+    @LambdaForm.Compiled
+    @Hidden
+    static final void guard_LJD_V(VarHandle handle, Object arg0, long arg1, double arg2, VarHandle.AccessDescriptor ad) throws Throwable {
+        boolean direct = handle.checkAccessModeThenIsDirect(ad);
+        if (direct && handle.vform.methodType_table[ad.type] == ad.symbolicMethodTypeErased) {
+            MethodHandle.linkToStatic(handle, arg0, arg1, arg2, handle.vform.getMemberName(ad.mode));
+        } else if (direct && handle.vform.getMethodType_V(ad.type) == ad.symbolicMethodTypeErased) {
+            MethodHandle.linkToStatic(handle, arg0, arg1, arg2, handle.vform.getMemberName(ad.mode));
+        } else {
+            MethodHandle mh = handle.getMethodHandle(ad.mode);
+            mh.asType(ad.symbolicMethodTypeInvoker).invokeBasic(handle.asDirect(), arg0, arg1, arg2);
+        }
+    }
+
+    @ForceInline
+    @LambdaForm.Compiled
+    @Hidden
+    static final void guard_LJJL_V(VarHandle handle, Object arg0, long arg1, long arg2, Object arg3, VarHandle.AccessDescriptor ad) throws Throwable {
+        boolean direct = handle.checkAccessModeThenIsDirect(ad);
+        if (direct && handle.vform.methodType_table[ad.type] == ad.symbolicMethodTypeErased) {
+            MethodHandle.linkToStatic(handle, arg0, arg1, arg2, arg3, handle.vform.getMemberName(ad.mode));
+        } else if (direct && handle.vform.getMethodType_V(ad.type) == ad.symbolicMethodTypeErased) {
+            MethodHandle.linkToStatic(handle, arg0, arg1, arg2, arg3, handle.vform.getMemberName(ad.mode));
+        } else {
+            MethodHandle mh = handle.getMethodHandle(ad.mode);
+            mh.asType(ad.symbolicMethodTypeInvoker).invokeBasic(handle.asDirect(), arg0, arg1, arg2, arg3);
+        }
+    }
+
+    @ForceInline
+    @LambdaForm.Compiled
+    @Hidden
+    static final void guard_LJJI_V(VarHandle handle, Object arg0, long arg1, long arg2, int arg3, VarHandle.AccessDescriptor ad) throws Throwable {
+        boolean direct = handle.checkAccessModeThenIsDirect(ad);
+        if (direct && handle.vform.methodType_table[ad.type] == ad.symbolicMethodTypeErased) {
+            MethodHandle.linkToStatic(handle, arg0, arg1, arg2, arg3, handle.vform.getMemberName(ad.mode));
+        } else if (direct && handle.vform.getMethodType_V(ad.type) == ad.symbolicMethodTypeErased) {
+            MethodHandle.linkToStatic(handle, arg0, arg1, arg2, arg3, handle.vform.getMemberName(ad.mode));
+        } else {
+            MethodHandle mh = handle.getMethodHandle(ad.mode);
+            mh.asType(ad.symbolicMethodTypeInvoker).invokeBasic(handle.asDirect(), arg0, arg1, arg2, arg3);
+        }
+    }
+
+    @ForceInline
+    @LambdaForm.Compiled
+    @Hidden
+    static final void guard_LJJJ_V(VarHandle handle, Object arg0, long arg1, long arg2, long arg3, VarHandle.AccessDescriptor ad) throws Throwable {
+        boolean direct = handle.checkAccessModeThenIsDirect(ad);
+        if (direct && handle.vform.methodType_table[ad.type] == ad.symbolicMethodTypeErased) {
+            MethodHandle.linkToStatic(handle, arg0, arg1, arg2, arg3, handle.vform.getMemberName(ad.mode));
+        } else if (direct && handle.vform.getMethodType_V(ad.type) == ad.symbolicMethodTypeErased) {
+            MethodHandle.linkToStatic(handle, arg0, arg1, arg2, arg3, handle.vform.getMemberName(ad.mode));
+        } else {
+            MethodHandle mh = handle.getMethodHandle(ad.mode);
+            mh.asType(ad.symbolicMethodTypeInvoker).invokeBasic(handle.asDirect(), arg0, arg1, arg2, arg3);
+        }
+    }
+
+    @ForceInline
+    @LambdaForm.Compiled
+    @Hidden
+    static final void guard_LJJF_V(VarHandle handle, Object arg0, long arg1, long arg2, float arg3, VarHandle.AccessDescriptor ad) throws Throwable {
+        boolean direct = handle.checkAccessModeThenIsDirect(ad);
+        if (direct && handle.vform.methodType_table[ad.type] == ad.symbolicMethodTypeErased) {
+            MethodHandle.linkToStatic(handle, arg0, arg1, arg2, arg3, handle.vform.getMemberName(ad.mode));
+        } else if (direct && handle.vform.getMethodType_V(ad.type) == ad.symbolicMethodTypeErased) {
+            MethodHandle.linkToStatic(handle, arg0, arg1, arg2, arg3, handle.vform.getMemberName(ad.mode));
+        } else {
+            MethodHandle mh = handle.getMethodHandle(ad.mode);
+            mh.asType(ad.symbolicMethodTypeInvoker).invokeBasic(handle.asDirect(), arg0, arg1, arg2, arg3);
+        }
+    }
+
+    @ForceInline
+    @LambdaForm.Compiled
+    @Hidden
+    static final void guard_LJJD_V(VarHandle handle, Object arg0, long arg1, long arg2, double arg3, VarHandle.AccessDescriptor ad) throws Throwable {
+        boolean direct = handle.checkAccessModeThenIsDirect(ad);
+        if (direct && handle.vform.methodType_table[ad.type] == ad.symbolicMethodTypeErased) {
+            MethodHandle.linkToStatic(handle, arg0, arg1, arg2, arg3, handle.vform.getMemberName(ad.mode));
+        } else if (direct && handle.vform.getMethodType_V(ad.type) == ad.symbolicMethodTypeErased) {
+            MethodHandle.linkToStatic(handle, arg0, arg1, arg2, arg3, handle.vform.getMemberName(ad.mode));
+        } else {
+            MethodHandle mh = handle.getMethodHandle(ad.mode);
+            mh.asType(ad.symbolicMethodTypeInvoker).invokeBasic(handle.asDirect(), arg0, arg1, arg2, arg3);
+        }
+    }
+
+    @ForceInline
+    @LambdaForm.Compiled
+    @Hidden
+    static final boolean guard_LLL_Z(VarHandle handle, Object arg0, Object arg1, Object arg2, VarHandle.AccessDescriptor ad) throws Throwable {
+        boolean direct = handle.checkAccessModeThenIsDirect(ad);
+        if (direct && handle.vform.methodType_table[ad.type] == ad.symbolicMethodTypeErased) {
+            return (boolean) MethodHandle.linkToStatic(handle, arg0, arg1, arg2, handle.vform.getMemberName(ad.mode));
+        } else {
+            MethodHandle mh = handle.getMethodHandle(ad.mode);
+            return (boolean) mh.asType(ad.symbolicMethodTypeInvoker).invokeBasic(handle.asDirect(), arg0, arg1, arg2);
+        }
+    }
+
+    @ForceInline
+    @LambdaForm.Compiled
+    @Hidden
+    static final boolean guard_LII_Z(VarHandle handle, Object arg0, int arg1, int arg2, VarHandle.AccessDescriptor ad) throws Throwable {
+        boolean direct = handle.checkAccessModeThenIsDirect(ad);
+        if (direct && handle.vform.methodType_table[ad.type] == ad.symbolicMethodTypeErased) {
+            return (boolean) MethodHandle.linkToStatic(handle, arg0, arg1, arg2, handle.vform.getMemberName(ad.mode));
+        } else {
+            MethodHandle mh = handle.getMethodHandle(ad.mode);
+            return (boolean) mh.asType(ad.symbolicMethodTypeInvoker).invokeBasic(handle.asDirect(), arg0, arg1, arg2);
+        }
+    }
+
+    @ForceInline
+    @LambdaForm.Compiled
+    @Hidden
+    static final boolean guard_LJJ_Z(VarHandle handle, Object arg0, long arg1, long arg2, VarHandle.AccessDescriptor ad) throws Throwable {
+        boolean direct = handle.checkAccessModeThenIsDirect(ad);
+        if (direct && handle.vform.methodType_table[ad.type] == ad.symbolicMethodTypeErased) {
+            return (boolean) MethodHandle.linkToStatic(handle, arg0, arg1, arg2, handle.vform.getMemberName(ad.mode));
+        } else {
+            MethodHandle mh = handle.getMethodHandle(ad.mode);
+            return (boolean) mh.asType(ad.symbolicMethodTypeInvoker).invokeBasic(handle.asDirect(), arg0, arg1, arg2);
+        }
+    }
+
+    @ForceInline
+    @LambdaForm.Compiled
+    @Hidden
+    static final boolean guard_LFF_Z(VarHandle handle, Object arg0, float arg1, float arg2, VarHandle.AccessDescriptor ad) throws Throwable {
+        boolean direct = handle.checkAccessModeThenIsDirect(ad);
+        if (direct && handle.vform.methodType_table[ad.type] == ad.symbolicMethodTypeErased) {
+            return (boolean) MethodHandle.linkToStatic(handle, arg0, arg1, arg2, handle.vform.getMemberName(ad.mode));
+        } else {
+            MethodHandle mh = handle.getMethodHandle(ad.mode);
+            return (boolean) mh.asType(ad.symbolicMethodTypeInvoker).invokeBasic(handle.asDirect(), arg0, arg1, arg2);
+        }
+    }
+
+    @ForceInline
+    @LambdaForm.Compiled
+    @Hidden
+    static final boolean guard_LDD_Z(VarHandle handle, Object arg0, double arg1, double arg2, VarHandle.AccessDescriptor ad) throws Throwable {
+        boolean direct = handle.checkAccessModeThenIsDirect(ad);
+        if (direct && handle.vform.methodType_table[ad.type] == ad.symbolicMethodTypeErased) {
+            return (boolean) MethodHandle.linkToStatic(handle, arg0, arg1, arg2, handle.vform.getMemberName(ad.mode));
+        } else {
+            MethodHandle mh = handle.getMethodHandle(ad.mode);
+            return (boolean) mh.asType(ad.symbolicMethodTypeInvoker).invokeBasic(handle.asDirect(), arg0, arg1, arg2);
+        }
+    }
+
+    @ForceInline
+    @LambdaForm.Compiled
+    @Hidden
+    static final boolean guard_LL_Z(VarHandle handle, Object arg0, Object arg1, VarHandle.AccessDescriptor ad) throws Throwable {
+        boolean direct = handle.checkAccessModeThenIsDirect(ad);
+        if (direct && handle.vform.methodType_table[ad.type] == ad.symbolicMethodTypeErased) {
+            return (boolean) MethodHandle.linkToStatic(handle, arg0, arg1, handle.vform.getMemberName(ad.mode));
+        } else {
+            MethodHandle mh = handle.getMethodHandle(ad.mode);
+            return (boolean) mh.asType(ad.symbolicMethodTypeInvoker).invokeBasic(handle.asDirect(), arg0, arg1);
+        }
+    }
+
+    @ForceInline
+    @LambdaForm.Compiled
+    @Hidden
+    static final boolean guard_II_Z(VarHandle handle, int arg0, int arg1, VarHandle.AccessDescriptor ad) throws Throwable {
+        boolean direct = handle.checkAccessModeThenIsDirect(ad);
+        if (direct && handle.vform.methodType_table[ad.type] == ad.symbolicMethodTypeErased) {
+            return (boolean) MethodHandle.linkToStatic(handle, arg0, arg1, handle.vform.getMemberName(ad.mode));
+        } else {
+            MethodHandle mh = handle.getMethodHandle(ad.mode);
+            return (boolean) mh.asType(ad.symbolicMethodTypeInvoker).invokeBasic(handle.asDirect(), arg0, arg1);
+        }
+    }
+
+    @ForceInline
+    @LambdaForm.Compiled
+    @Hidden
+    static final boolean guard_JJ_Z(VarHandle handle, long arg0, long arg1, VarHandle.AccessDescriptor ad) throws Throwable {
+        boolean direct = handle.checkAccessModeThenIsDirect(ad);
+        if (direct && handle.vform.methodType_table[ad.type] == ad.symbolicMethodTypeErased) {
+            return (boolean) MethodHandle.linkToStatic(handle, arg0, arg1, handle.vform.getMemberName(ad.mode));
+        } else {
+            MethodHandle mh = handle.getMethodHandle(ad.mode);
+            return (boolean) mh.asType(ad.symbolicMethodTypeInvoker).invokeBasic(handle.asDirect(), arg0, arg1);
+        }
+    }
+
+    @ForceInline
+    @LambdaForm.Compiled
+    @Hidden
+    static final boolean guard_FF_Z(VarHandle handle, float arg0, float arg1, VarHandle.AccessDescriptor ad) throws Throwable {
+        boolean direct = handle.checkAccessModeThenIsDirect(ad);
+        if (direct && handle.vform.methodType_table[ad.type] == ad.symbolicMethodTypeErased) {
+            return (boolean) MethodHandle.linkToStatic(handle, arg0, arg1, handle.vform.getMemberName(ad.mode));
+        } else {
+            MethodHandle mh = handle.getMethodHandle(ad.mode);
+            return (boolean) mh.asType(ad.symbolicMethodTypeInvoker).invokeBasic(handle.asDirect(), arg0, arg1);
+        }
+    }
+
+    @ForceInline
+    @LambdaForm.Compiled
+    @Hidden
+    static final boolean guard_DD_Z(VarHandle handle, double arg0, double arg1, VarHandle.AccessDescriptor ad) throws Throwable {
+        boolean direct = handle.checkAccessModeThenIsDirect(ad);
+        if (direct && handle.vform.methodType_table[ad.type] == ad.symbolicMethodTypeErased) {
+            return (boolean) MethodHandle.linkToStatic(handle, arg0, arg1, handle.vform.getMemberName(ad.mode));
+        } else {
+            MethodHandle mh = handle.getMethodHandle(ad.mode);
+            return (boolean) mh.asType(ad.symbolicMethodTypeInvoker).invokeBasic(handle.asDirect(), arg0, arg1);
+        }
+    }
+
+    @ForceInline
+    @LambdaForm.Compiled
+    @Hidden
+    static final boolean guard_LILL_Z(VarHandle handle, Object arg0, int arg1, Object arg2, Object arg3, VarHandle.AccessDescriptor ad) throws Throwable {
         boolean direct = handle.checkAccessModeThenIsDirect(ad);
         if (direct && handle.vform.methodType_table[ad.type] == ad.symbolicMethodTypeErased) {
             return (boolean) MethodHandle.linkToStatic(handle, arg0, arg1, arg2, arg3, handle.vform.getMemberName(ad.mode));
@@ -1034,41 +881,78 @@ final class VarHandleGuards {
     @ForceInline
     @LambdaForm.Compiled
     @Hidden
-    static final int guard_LJII_I(VarHandle handle, Object arg0, long arg1, int arg2, int arg3, VarHandle.AccessDescriptor ad) throws Throwable {
+    static final boolean guard_LIII_Z(VarHandle handle, Object arg0, int arg1, int arg2, int arg3, VarHandle.AccessDescriptor ad) throws Throwable {
         boolean direct = handle.checkAccessModeThenIsDirect(ad);
         if (direct && handle.vform.methodType_table[ad.type] == ad.symbolicMethodTypeErased) {
-            return (int) MethodHandle.linkToStatic(handle, arg0, arg1, arg2, arg3, handle.vform.getMemberName(ad.mode));
+            return (boolean) MethodHandle.linkToStatic(handle, arg0, arg1, arg2, arg3, handle.vform.getMemberName(ad.mode));
         } else {
             MethodHandle mh = handle.getMethodHandle(ad.mode);
-            return (int) mh.asType(ad.symbolicMethodTypeInvoker).invokeBasic(handle.asDirect(), arg0, arg1, arg2, arg3);
+            return (boolean) mh.asType(ad.symbolicMethodTypeInvoker).invokeBasic(handle.asDirect(), arg0, arg1, arg2, arg3);
         }
     }
 
     @ForceInline
     @LambdaForm.Compiled
     @Hidden
-    static final int guard_LJI_I(VarHandle handle, Object arg0, long arg1, int arg2, VarHandle.AccessDescriptor ad) throws Throwable {
+    static final boolean guard_LIJJ_Z(VarHandle handle, Object arg0, int arg1, long arg2, long arg3, VarHandle.AccessDescriptor ad) throws Throwable {
         boolean direct = handle.checkAccessModeThenIsDirect(ad);
         if (direct && handle.vform.methodType_table[ad.type] == ad.symbolicMethodTypeErased) {
-            return (int) MethodHandle.linkToStatic(handle, arg0, arg1, arg2, handle.vform.getMemberName(ad.mode));
+            return (boolean) MethodHandle.linkToStatic(handle, arg0, arg1, arg2, arg3, handle.vform.getMemberName(ad.mode));
         } else {
             MethodHandle mh = handle.getMethodHandle(ad.mode);
-            return (int) mh.asType(ad.symbolicMethodTypeInvoker).invokeBasic(handle.asDirect(), arg0, arg1, arg2);
+            return (boolean) mh.asType(ad.symbolicMethodTypeInvoker).invokeBasic(handle.asDirect(), arg0, arg1, arg2, arg3);
         }
     }
 
     @ForceInline
     @LambdaForm.Compiled
     @Hidden
-    static final void guard_LJJ_V(VarHandle handle, Object arg0, long arg1, long arg2, VarHandle.AccessDescriptor ad) throws Throwable {
+    static final boolean guard_LIFF_Z(VarHandle handle, Object arg0, int arg1, float arg2, float arg3, VarHandle.AccessDescriptor ad) throws Throwable {
         boolean direct = handle.checkAccessModeThenIsDirect(ad);
         if (direct && handle.vform.methodType_table[ad.type] == ad.symbolicMethodTypeErased) {
-            MethodHandle.linkToStatic(handle, arg0, arg1, arg2, handle.vform.getMemberName(ad.mode));
-        } else if (direct && handle.vform.getMethodType_V(ad.type) == ad.symbolicMethodTypeErased) {
-            MethodHandle.linkToStatic(handle, arg0, arg1, arg2, handle.vform.getMemberName(ad.mode));
+            return (boolean) MethodHandle.linkToStatic(handle, arg0, arg1, arg2, arg3, handle.vform.getMemberName(ad.mode));
         } else {
             MethodHandle mh = handle.getMethodHandle(ad.mode);
-            mh.asType(ad.symbolicMethodTypeInvoker).invokeBasic(handle.asDirect(), arg0, arg1, arg2);
+            return (boolean) mh.asType(ad.symbolicMethodTypeInvoker).invokeBasic(handle.asDirect(), arg0, arg1, arg2, arg3);
+        }
+    }
+
+    @ForceInline
+    @LambdaForm.Compiled
+    @Hidden
+    static final boolean guard_LIDD_Z(VarHandle handle, Object arg0, int arg1, double arg2, double arg3, VarHandle.AccessDescriptor ad) throws Throwable {
+        boolean direct = handle.checkAccessModeThenIsDirect(ad);
+        if (direct && handle.vform.methodType_table[ad.type] == ad.symbolicMethodTypeErased) {
+            return (boolean) MethodHandle.linkToStatic(handle, arg0, arg1, arg2, arg3, handle.vform.getMemberName(ad.mode));
+        } else {
+            MethodHandle mh = handle.getMethodHandle(ad.mode);
+            return (boolean) mh.asType(ad.symbolicMethodTypeInvoker).invokeBasic(handle.asDirect(), arg0, arg1, arg2, arg3);
+        }
+    }
+
+    @ForceInline
+    @LambdaForm.Compiled
+    @Hidden
+    static final boolean guard_LJLL_Z(VarHandle handle, Object arg0, long arg1, Object arg2, Object arg3, VarHandle.AccessDescriptor ad) throws Throwable {
+        boolean direct = handle.checkAccessModeThenIsDirect(ad);
+        if (direct && handle.vform.methodType_table[ad.type] == ad.symbolicMethodTypeErased) {
+            return (boolean) MethodHandle.linkToStatic(handle, arg0, arg1, arg2, arg3, handle.vform.getMemberName(ad.mode));
+        } else {
+            MethodHandle mh = handle.getMethodHandle(ad.mode);
+            return (boolean) mh.asType(ad.symbolicMethodTypeInvoker).invokeBasic(handle.asDirect(), arg0, arg1, arg2, arg3);
+        }
+    }
+
+    @ForceInline
+    @LambdaForm.Compiled
+    @Hidden
+    static final boolean guard_LJII_Z(VarHandle handle, Object arg0, long arg1, int arg2, int arg3, VarHandle.AccessDescriptor ad) throws Throwable {
+        boolean direct = handle.checkAccessModeThenIsDirect(ad);
+        if (direct && handle.vform.methodType_table[ad.type] == ad.symbolicMethodTypeErased) {
+            return (boolean) MethodHandle.linkToStatic(handle, arg0, arg1, arg2, arg3, handle.vform.getMemberName(ad.mode));
+        } else {
+            MethodHandle mh = handle.getMethodHandle(ad.mode);
+            return (boolean) mh.asType(ad.symbolicMethodTypeInvoker).invokeBasic(handle.asDirect(), arg0, arg1, arg2, arg3);
         }
     }
 
@@ -1085,6 +969,309 @@ final class VarHandleGuards {
         }
     }
 
+    @ForceInline
+    @LambdaForm.Compiled
+    @Hidden
+    static final boolean guard_LJFF_Z(VarHandle handle, Object arg0, long arg1, float arg2, float arg3, VarHandle.AccessDescriptor ad) throws Throwable {
+        boolean direct = handle.checkAccessModeThenIsDirect(ad);
+        if (direct && handle.vform.methodType_table[ad.type] == ad.symbolicMethodTypeErased) {
+            return (boolean) MethodHandle.linkToStatic(handle, arg0, arg1, arg2, arg3, handle.vform.getMemberName(ad.mode));
+        } else {
+            MethodHandle mh = handle.getMethodHandle(ad.mode);
+            return (boolean) mh.asType(ad.symbolicMethodTypeInvoker).invokeBasic(handle.asDirect(), arg0, arg1, arg2, arg3);
+        }
+    }
+
+    @ForceInline
+    @LambdaForm.Compiled
+    @Hidden
+    static final boolean guard_LJDD_Z(VarHandle handle, Object arg0, long arg1, double arg2, double arg3, VarHandle.AccessDescriptor ad) throws Throwable {
+        boolean direct = handle.checkAccessModeThenIsDirect(ad);
+        if (direct && handle.vform.methodType_table[ad.type] == ad.symbolicMethodTypeErased) {
+            return (boolean) MethodHandle.linkToStatic(handle, arg0, arg1, arg2, arg3, handle.vform.getMemberName(ad.mode));
+        } else {
+            MethodHandle mh = handle.getMethodHandle(ad.mode);
+            return (boolean) mh.asType(ad.symbolicMethodTypeInvoker).invokeBasic(handle.asDirect(), arg0, arg1, arg2, arg3);
+        }
+    }
+
+    @ForceInline
+    @LambdaForm.Compiled
+    @Hidden
+    static final boolean guard_LJJLL_Z(VarHandle handle, Object arg0, long arg1, long arg2, Object arg3, Object arg4, VarHandle.AccessDescriptor ad) throws Throwable {
+        boolean direct = handle.checkAccessModeThenIsDirect(ad);
+        if (direct && handle.vform.methodType_table[ad.type] == ad.symbolicMethodTypeErased) {
+            return (boolean) MethodHandle.linkToStatic(handle, arg0, arg1, arg2, arg3, arg4, handle.vform.getMemberName(ad.mode));
+        } else {
+            MethodHandle mh = handle.getMethodHandle(ad.mode);
+            return (boolean) mh.asType(ad.symbolicMethodTypeInvoker).invokeBasic(handle.asDirect(), arg0, arg1, arg2, arg3, arg4);
+        }
+    }
+
+    @ForceInline
+    @LambdaForm.Compiled
+    @Hidden
+    static final boolean guard_LJJII_Z(VarHandle handle, Object arg0, long arg1, long arg2, int arg3, int arg4, VarHandle.AccessDescriptor ad) throws Throwable {
+        boolean direct = handle.checkAccessModeThenIsDirect(ad);
+        if (direct && handle.vform.methodType_table[ad.type] == ad.symbolicMethodTypeErased) {
+            return (boolean) MethodHandle.linkToStatic(handle, arg0, arg1, arg2, arg3, arg4, handle.vform.getMemberName(ad.mode));
+        } else {
+            MethodHandle mh = handle.getMethodHandle(ad.mode);
+            return (boolean) mh.asType(ad.symbolicMethodTypeInvoker).invokeBasic(handle.asDirect(), arg0, arg1, arg2, arg3, arg4);
+        }
+    }
+
+    @ForceInline
+    @LambdaForm.Compiled
+    @Hidden
+    static final boolean guard_LJJJJ_Z(VarHandle handle, Object arg0, long arg1, long arg2, long arg3, long arg4, VarHandle.AccessDescriptor ad) throws Throwable {
+        boolean direct = handle.checkAccessModeThenIsDirect(ad);
+        if (direct && handle.vform.methodType_table[ad.type] == ad.symbolicMethodTypeErased) {
+            return (boolean) MethodHandle.linkToStatic(handle, arg0, arg1, arg2, arg3, arg4, handle.vform.getMemberName(ad.mode));
+        } else {
+            MethodHandle mh = handle.getMethodHandle(ad.mode);
+            return (boolean) mh.asType(ad.symbolicMethodTypeInvoker).invokeBasic(handle.asDirect(), arg0, arg1, arg2, arg3, arg4);
+        }
+    }
+
+    @ForceInline
+    @LambdaForm.Compiled
+    @Hidden
+    static final boolean guard_LJJFF_Z(VarHandle handle, Object arg0, long arg1, long arg2, float arg3, float arg4, VarHandle.AccessDescriptor ad) throws Throwable {
+        boolean direct = handle.checkAccessModeThenIsDirect(ad);
+        if (direct && handle.vform.methodType_table[ad.type] == ad.symbolicMethodTypeErased) {
+            return (boolean) MethodHandle.linkToStatic(handle, arg0, arg1, arg2, arg3, arg4, handle.vform.getMemberName(ad.mode));
+        } else {
+            MethodHandle mh = handle.getMethodHandle(ad.mode);
+            return (boolean) mh.asType(ad.symbolicMethodTypeInvoker).invokeBasic(handle.asDirect(), arg0, arg1, arg2, arg3, arg4);
+        }
+    }
+
+    @ForceInline
+    @LambdaForm.Compiled
+    @Hidden
+    static final boolean guard_LJJDD_Z(VarHandle handle, Object arg0, long arg1, long arg2, double arg3, double arg4, VarHandle.AccessDescriptor ad) throws Throwable {
+        boolean direct = handle.checkAccessModeThenIsDirect(ad);
+        if (direct && handle.vform.methodType_table[ad.type] == ad.symbolicMethodTypeErased) {
+            return (boolean) MethodHandle.linkToStatic(handle, arg0, arg1, arg2, arg3, arg4, handle.vform.getMemberName(ad.mode));
+        } else {
+            MethodHandle mh = handle.getMethodHandle(ad.mode);
+            return (boolean) mh.asType(ad.symbolicMethodTypeInvoker).invokeBasic(handle.asDirect(), arg0, arg1, arg2, arg3, arg4);
+        }
+    }
+
+    @ForceInline
+    @LambdaForm.Compiled
+    @Hidden
+    static final Object guard_LLL_L(VarHandle handle, Object arg0, Object arg1, Object arg2, VarHandle.AccessDescriptor ad) throws Throwable {
+        boolean direct = handle.checkAccessModeThenIsDirect(ad);
+        if (direct && handle.vform.methodType_table[ad.type] == ad.symbolicMethodTypeErased) {
+            Object r = MethodHandle.linkToStatic(handle, arg0, arg1, arg2, handle.vform.getMemberName(ad.mode));
+            return ad.returnType.cast(r);
+        } else {
+            MethodHandle mh = handle.getMethodHandle(ad.mode);
+            return mh.asType(ad.symbolicMethodTypeInvoker).invokeBasic(handle.asDirect(), arg0, arg1, arg2);
+        }
+    }
+
+    @ForceInline
+    @LambdaForm.Compiled
+    @Hidden
+    static final int guard_LII_I(VarHandle handle, Object arg0, int arg1, int arg2, VarHandle.AccessDescriptor ad) throws Throwable {
+        boolean direct = handle.checkAccessModeThenIsDirect(ad);
+        if (direct && handle.vform.methodType_table[ad.type] == ad.symbolicMethodTypeErased) {
+            return (int) MethodHandle.linkToStatic(handle, arg0, arg1, arg2, handle.vform.getMemberName(ad.mode));
+        } else {
+            MethodHandle mh = handle.getMethodHandle(ad.mode);
+            return (int) mh.asType(ad.symbolicMethodTypeInvoker).invokeBasic(handle.asDirect(), arg0, arg1, arg2);
+        }
+    }
+
+    @ForceInline
+    @LambdaForm.Compiled
+    @Hidden
+    static final float guard_LFF_F(VarHandle handle, Object arg0, float arg1, float arg2, VarHandle.AccessDescriptor ad) throws Throwable {
+        boolean direct = handle.checkAccessModeThenIsDirect(ad);
+        if (direct && handle.vform.methodType_table[ad.type] == ad.symbolicMethodTypeErased) {
+            return (float) MethodHandle.linkToStatic(handle, arg0, arg1, arg2, handle.vform.getMemberName(ad.mode));
+        } else {
+            MethodHandle mh = handle.getMethodHandle(ad.mode);
+            return (float) mh.asType(ad.symbolicMethodTypeInvoker).invokeBasic(handle.asDirect(), arg0, arg1, arg2);
+        }
+    }
+
+    @ForceInline
+    @LambdaForm.Compiled
+    @Hidden
+    static final double guard_LDD_D(VarHandle handle, Object arg0, double arg1, double arg2, VarHandle.AccessDescriptor ad) throws Throwable {
+        boolean direct = handle.checkAccessModeThenIsDirect(ad);
+        if (direct && handle.vform.methodType_table[ad.type] == ad.symbolicMethodTypeErased) {
+            return (double) MethodHandle.linkToStatic(handle, arg0, arg1, arg2, handle.vform.getMemberName(ad.mode));
+        } else {
+            MethodHandle mh = handle.getMethodHandle(ad.mode);
+            return (double) mh.asType(ad.symbolicMethodTypeInvoker).invokeBasic(handle.asDirect(), arg0, arg1, arg2);
+        }
+    }
+
+    @ForceInline
+    @LambdaForm.Compiled
+    @Hidden
+    static final Object guard_LL_L(VarHandle handle, Object arg0, Object arg1, VarHandle.AccessDescriptor ad) throws Throwable {
+        boolean direct = handle.checkAccessModeThenIsDirect(ad);
+        if (direct && handle.vform.methodType_table[ad.type] == ad.symbolicMethodTypeErased) {
+            Object r = MethodHandle.linkToStatic(handle, arg0, arg1, handle.vform.getMemberName(ad.mode));
+            return ad.returnType.cast(r);
+        } else {
+            MethodHandle mh = handle.getMethodHandle(ad.mode);
+            return mh.asType(ad.symbolicMethodTypeInvoker).invokeBasic(handle.asDirect(), arg0, arg1);
+        }
+    }
+
+    @ForceInline
+    @LambdaForm.Compiled
+    @Hidden
+    static final int guard_II_I(VarHandle handle, int arg0, int arg1, VarHandle.AccessDescriptor ad) throws Throwable {
+        boolean direct = handle.checkAccessModeThenIsDirect(ad);
+        if (direct && handle.vform.methodType_table[ad.type] == ad.symbolicMethodTypeErased) {
+            return (int) MethodHandle.linkToStatic(handle, arg0, arg1, handle.vform.getMemberName(ad.mode));
+        } else {
+            MethodHandle mh = handle.getMethodHandle(ad.mode);
+            return (int) mh.asType(ad.symbolicMethodTypeInvoker).invokeBasic(handle.asDirect(), arg0, arg1);
+        }
+    }
+
+    @ForceInline
+    @LambdaForm.Compiled
+    @Hidden
+    static final long guard_JJ_J(VarHandle handle, long arg0, long arg1, VarHandle.AccessDescriptor ad) throws Throwable {
+        boolean direct = handle.checkAccessModeThenIsDirect(ad);
+        if (direct && handle.vform.methodType_table[ad.type] == ad.symbolicMethodTypeErased) {
+            return (long) MethodHandle.linkToStatic(handle, arg0, arg1, handle.vform.getMemberName(ad.mode));
+        } else {
+            MethodHandle mh = handle.getMethodHandle(ad.mode);
+            return (long) mh.asType(ad.symbolicMethodTypeInvoker).invokeBasic(handle.asDirect(), arg0, arg1);
+        }
+    }
+
+    @ForceInline
+    @LambdaForm.Compiled
+    @Hidden
+    static final float guard_FF_F(VarHandle handle, float arg0, float arg1, VarHandle.AccessDescriptor ad) throws Throwable {
+        boolean direct = handle.checkAccessModeThenIsDirect(ad);
+        if (direct && handle.vform.methodType_table[ad.type] == ad.symbolicMethodTypeErased) {
+            return (float) MethodHandle.linkToStatic(handle, arg0, arg1, handle.vform.getMemberName(ad.mode));
+        } else {
+            MethodHandle mh = handle.getMethodHandle(ad.mode);
+            return (float) mh.asType(ad.symbolicMethodTypeInvoker).invokeBasic(handle.asDirect(), arg0, arg1);
+        }
+    }
+
+    @ForceInline
+    @LambdaForm.Compiled
+    @Hidden
+    static final double guard_DD_D(VarHandle handle, double arg0, double arg1, VarHandle.AccessDescriptor ad) throws Throwable {
+        boolean direct = handle.checkAccessModeThenIsDirect(ad);
+        if (direct && handle.vform.methodType_table[ad.type] == ad.symbolicMethodTypeErased) {
+            return (double) MethodHandle.linkToStatic(handle, arg0, arg1, handle.vform.getMemberName(ad.mode));
+        } else {
+            MethodHandle mh = handle.getMethodHandle(ad.mode);
+            return (double) mh.asType(ad.symbolicMethodTypeInvoker).invokeBasic(handle.asDirect(), arg0, arg1);
+        }
+    }
+
+    @ForceInline
+    @LambdaForm.Compiled
+    @Hidden
+    static final Object guard_LILL_L(VarHandle handle, Object arg0, int arg1, Object arg2, Object arg3, VarHandle.AccessDescriptor ad) throws Throwable {
+        boolean direct = handle.checkAccessModeThenIsDirect(ad);
+        if (direct && handle.vform.methodType_table[ad.type] == ad.symbolicMethodTypeErased) {
+            Object r = MethodHandle.linkToStatic(handle, arg0, arg1, arg2, arg3, handle.vform.getMemberName(ad.mode));
+            return ad.returnType.cast(r);
+        } else {
+            MethodHandle mh = handle.getMethodHandle(ad.mode);
+            return mh.asType(ad.symbolicMethodTypeInvoker).invokeBasic(handle.asDirect(), arg0, arg1, arg2, arg3);
+        }
+    }
+
+    @ForceInline
+    @LambdaForm.Compiled
+    @Hidden
+    static final int guard_LIII_I(VarHandle handle, Object arg0, int arg1, int arg2, int arg3, VarHandle.AccessDescriptor ad) throws Throwable {
+        boolean direct = handle.checkAccessModeThenIsDirect(ad);
+        if (direct && handle.vform.methodType_table[ad.type] == ad.symbolicMethodTypeErased) {
+            return (int) MethodHandle.linkToStatic(handle, arg0, arg1, arg2, arg3, handle.vform.getMemberName(ad.mode));
+        } else {
+            MethodHandle mh = handle.getMethodHandle(ad.mode);
+            return (int) mh.asType(ad.symbolicMethodTypeInvoker).invokeBasic(handle.asDirect(), arg0, arg1, arg2, arg3);
+        }
+    }
+
+    @ForceInline
+    @LambdaForm.Compiled
+    @Hidden
+    static final long guard_LIJJ_J(VarHandle handle, Object arg0, int arg1, long arg2, long arg3, VarHandle.AccessDescriptor ad) throws Throwable {
+        boolean direct = handle.checkAccessModeThenIsDirect(ad);
+        if (direct && handle.vform.methodType_table[ad.type] == ad.symbolicMethodTypeErased) {
+            return (long) MethodHandle.linkToStatic(handle, arg0, arg1, arg2, arg3, handle.vform.getMemberName(ad.mode));
+        } else {
+            MethodHandle mh = handle.getMethodHandle(ad.mode);
+            return (long) mh.asType(ad.symbolicMethodTypeInvoker).invokeBasic(handle.asDirect(), arg0, arg1, arg2, arg3);
+        }
+    }
+
+    @ForceInline
+    @LambdaForm.Compiled
+    @Hidden
+    static final float guard_LIFF_F(VarHandle handle, Object arg0, int arg1, float arg2, float arg3, VarHandle.AccessDescriptor ad) throws Throwable {
+        boolean direct = handle.checkAccessModeThenIsDirect(ad);
+        if (direct && handle.vform.methodType_table[ad.type] == ad.symbolicMethodTypeErased) {
+            return (float) MethodHandle.linkToStatic(handle, arg0, arg1, arg2, arg3, handle.vform.getMemberName(ad.mode));
+        } else {
+            MethodHandle mh = handle.getMethodHandle(ad.mode);
+            return (float) mh.asType(ad.symbolicMethodTypeInvoker).invokeBasic(handle.asDirect(), arg0, arg1, arg2, arg3);
+        }
+    }
+
+    @ForceInline
+    @LambdaForm.Compiled
+    @Hidden
+    static final double guard_LIDD_D(VarHandle handle, Object arg0, int arg1, double arg2, double arg3, VarHandle.AccessDescriptor ad) throws Throwable {
+        boolean direct = handle.checkAccessModeThenIsDirect(ad);
+        if (direct && handle.vform.methodType_table[ad.type] == ad.symbolicMethodTypeErased) {
+            return (double) MethodHandle.linkToStatic(handle, arg0, arg1, arg2, arg3, handle.vform.getMemberName(ad.mode));
+        } else {
+            MethodHandle mh = handle.getMethodHandle(ad.mode);
+            return (double) mh.asType(ad.symbolicMethodTypeInvoker).invokeBasic(handle.asDirect(), arg0, arg1, arg2, arg3);
+        }
+    }
+
+    @ForceInline
+    @LambdaForm.Compiled
+    @Hidden
+    static final Object guard_LJLL_L(VarHandle handle, Object arg0, long arg1, Object arg2, Object arg3, VarHandle.AccessDescriptor ad) throws Throwable {
+        boolean direct = handle.checkAccessModeThenIsDirect(ad);
+        if (direct && handle.vform.methodType_table[ad.type] == ad.symbolicMethodTypeErased) {
+            Object r = MethodHandle.linkToStatic(handle, arg0, arg1, arg2, arg3, handle.vform.getMemberName(ad.mode));
+            return ad.returnType.cast(r);
+        } else {
+            MethodHandle mh = handle.getMethodHandle(ad.mode);
+            return mh.asType(ad.symbolicMethodTypeInvoker).invokeBasic(handle.asDirect(), arg0, arg1, arg2, arg3);
+        }
+    }
+
+    @ForceInline
+    @LambdaForm.Compiled
+    @Hidden
+    static final int guard_LJII_I(VarHandle handle, Object arg0, long arg1, int arg2, int arg3, VarHandle.AccessDescriptor ad) throws Throwable {
+        boolean direct = handle.checkAccessModeThenIsDirect(ad);
+        if (direct && handle.vform.methodType_table[ad.type] == ad.symbolicMethodTypeErased) {
+            return (int) MethodHandle.linkToStatic(handle, arg0, arg1, arg2, arg3, handle.vform.getMemberName(ad.mode));
+        } else {
+            MethodHandle mh = handle.getMethodHandle(ad.mode);
+            return (int) mh.asType(ad.symbolicMethodTypeInvoker).invokeBasic(handle.asDirect(), arg0, arg1, arg2, arg3);
+        }
+    }
+
     @ForceInline
     @LambdaForm.Compiled
     @Hidden
@@ -1098,4 +1285,333 @@ final class VarHandleGuards {
         }
     }
 
+    @ForceInline
+    @LambdaForm.Compiled
+    @Hidden
+    static final float guard_LJFF_F(VarHandle handle, Object arg0, long arg1, float arg2, float arg3, VarHandle.AccessDescriptor ad) throws Throwable {
+        boolean direct = handle.checkAccessModeThenIsDirect(ad);
+        if (direct && handle.vform.methodType_table[ad.type] == ad.symbolicMethodTypeErased) {
+            return (float) MethodHandle.linkToStatic(handle, arg0, arg1, arg2, arg3, handle.vform.getMemberName(ad.mode));
+        } else {
+            MethodHandle mh = handle.getMethodHandle(ad.mode);
+            return (float) mh.asType(ad.symbolicMethodTypeInvoker).invokeBasic(handle.asDirect(), arg0, arg1, arg2, arg3);
+        }
+    }
+
+    @ForceInline
+    @LambdaForm.Compiled
+    @Hidden
+    static final double guard_LJDD_D(VarHandle handle, Object arg0, long arg1, double arg2, double arg3, VarHandle.AccessDescriptor ad) throws Throwable {
+        boolean direct = handle.checkAccessModeThenIsDirect(ad);
+        if (direct && handle.vform.methodType_table[ad.type] == ad.symbolicMethodTypeErased) {
+            return (double) MethodHandle.linkToStatic(handle, arg0, arg1, arg2, arg3, handle.vform.getMemberName(ad.mode));
+        } else {
+            MethodHandle mh = handle.getMethodHandle(ad.mode);
+            return (double) mh.asType(ad.symbolicMethodTypeInvoker).invokeBasic(handle.asDirect(), arg0, arg1, arg2, arg3);
+        }
+    }
+
+    @ForceInline
+    @LambdaForm.Compiled
+    @Hidden
+    static final Object guard_LJJLL_L(VarHandle handle, Object arg0, long arg1, long arg2, Object arg3, Object arg4, VarHandle.AccessDescriptor ad) throws Throwable {
+        boolean direct = handle.checkAccessModeThenIsDirect(ad);
+        if (direct && handle.vform.methodType_table[ad.type] == ad.symbolicMethodTypeErased) {
+            Object r = MethodHandle.linkToStatic(handle, arg0, arg1, arg2, arg3, arg4, handle.vform.getMemberName(ad.mode));
+            return ad.returnType.cast(r);
+        } else {
+            MethodHandle mh = handle.getMethodHandle(ad.mode);
+            return mh.asType(ad.symbolicMethodTypeInvoker).invokeBasic(handle.asDirect(), arg0, arg1, arg2, arg3, arg4);
+        }
+    }
+
+    @ForceInline
+    @LambdaForm.Compiled
+    @Hidden
+    static final int guard_LJJII_I(VarHandle handle, Object arg0, long arg1, long arg2, int arg3, int arg4, VarHandle.AccessDescriptor ad) throws Throwable {
+        boolean direct = handle.checkAccessModeThenIsDirect(ad);
+        if (direct && handle.vform.methodType_table[ad.type] == ad.symbolicMethodTypeErased) {
+            return (int) MethodHandle.linkToStatic(handle, arg0, arg1, arg2, arg3, arg4, handle.vform.getMemberName(ad.mode));
+        } else {
+            MethodHandle mh = handle.getMethodHandle(ad.mode);
+            return (int) mh.asType(ad.symbolicMethodTypeInvoker).invokeBasic(handle.asDirect(), arg0, arg1, arg2, arg3, arg4);
+        }
+    }
+
+    @ForceInline
+    @LambdaForm.Compiled
+    @Hidden
+    static final long guard_LJJJJ_J(VarHandle handle, Object arg0, long arg1, long arg2, long arg3, long arg4, VarHandle.AccessDescriptor ad) throws Throwable {
+        boolean direct = handle.checkAccessModeThenIsDirect(ad);
+        if (direct && handle.vform.methodType_table[ad.type] == ad.symbolicMethodTypeErased) {
+            return (long) MethodHandle.linkToStatic(handle, arg0, arg1, arg2, arg3, arg4, handle.vform.getMemberName(ad.mode));
+        } else {
+            MethodHandle mh = handle.getMethodHandle(ad.mode);
+            return (long) mh.asType(ad.symbolicMethodTypeInvoker).invokeBasic(handle.asDirect(), arg0, arg1, arg2, arg3, arg4);
+        }
+    }
+
+    @ForceInline
+    @LambdaForm.Compiled
+    @Hidden
+    static final float guard_LJJFF_F(VarHandle handle, Object arg0, long arg1, long arg2, float arg3, float arg4, VarHandle.AccessDescriptor ad) throws Throwable {
+        boolean direct = handle.checkAccessModeThenIsDirect(ad);
+        if (direct && handle.vform.methodType_table[ad.type] == ad.symbolicMethodTypeErased) {
+            return (float) MethodHandle.linkToStatic(handle, arg0, arg1, arg2, arg3, arg4, handle.vform.getMemberName(ad.mode));
+        } else {
+            MethodHandle mh = handle.getMethodHandle(ad.mode);
+            return (float) mh.asType(ad.symbolicMethodTypeInvoker).invokeBasic(handle.asDirect(), arg0, arg1, arg2, arg3, arg4);
+        }
+    }
+
+    @ForceInline
+    @LambdaForm.Compiled
+    @Hidden
+    static final double guard_LJJDD_D(VarHandle handle, Object arg0, long arg1, long arg2, double arg3, double arg4, VarHandle.AccessDescriptor ad) throws Throwable {
+        boolean direct = handle.checkAccessModeThenIsDirect(ad);
+        if (direct && handle.vform.methodType_table[ad.type] == ad.symbolicMethodTypeErased) {
+            return (double) MethodHandle.linkToStatic(handle, arg0, arg1, arg2, arg3, arg4, handle.vform.getMemberName(ad.mode));
+        } else {
+            MethodHandle mh = handle.getMethodHandle(ad.mode);
+            return (double) mh.asType(ad.symbolicMethodTypeInvoker).invokeBasic(handle.asDirect(), arg0, arg1, arg2, arg3, arg4);
+        }
+    }
+
+    @ForceInline
+    @LambdaForm.Compiled
+    @Hidden
+    static final float guard_LF_F(VarHandle handle, Object arg0, float arg1, VarHandle.AccessDescriptor ad) throws Throwable {
+        boolean direct = handle.checkAccessModeThenIsDirect(ad);
+        if (direct && handle.vform.methodType_table[ad.type] == ad.symbolicMethodTypeErased) {
+            return (float) MethodHandle.linkToStatic(handle, arg0, arg1, handle.vform.getMemberName(ad.mode));
+        } else {
+            MethodHandle mh = handle.getMethodHandle(ad.mode);
+            return (float) mh.asType(ad.symbolicMethodTypeInvoker).invokeBasic(handle.asDirect(), arg0, arg1);
+        }
+    }
+
+    @ForceInline
+    @LambdaForm.Compiled
+    @Hidden
+    static final double guard_LD_D(VarHandle handle, Object arg0, double arg1, VarHandle.AccessDescriptor ad) throws Throwable {
+        boolean direct = handle.checkAccessModeThenIsDirect(ad);
+        if (direct && handle.vform.methodType_table[ad.type] == ad.symbolicMethodTypeErased) {
+            return (double) MethodHandle.linkToStatic(handle, arg0, arg1, handle.vform.getMemberName(ad.mode));
+        } else {
+            MethodHandle mh = handle.getMethodHandle(ad.mode);
+            return (double) mh.asType(ad.symbolicMethodTypeInvoker).invokeBasic(handle.asDirect(), arg0, arg1);
+        }
+    }
+
+    @ForceInline
+    @LambdaForm.Compiled
+    @Hidden
+    static final int guard_I_I(VarHandle handle, int arg0, VarHandle.AccessDescriptor ad) throws Throwable {
+        boolean direct = handle.checkAccessModeThenIsDirect(ad);
+        if (direct && handle.vform.methodType_table[ad.type] == ad.symbolicMethodTypeErased) {
+            return (int) MethodHandle.linkToStatic(handle, arg0, handle.vform.getMemberName(ad.mode));
+        } else {
+            MethodHandle mh = handle.getMethodHandle(ad.mode);
+            return (int) mh.asType(ad.symbolicMethodTypeInvoker).invokeBasic(handle.asDirect(), arg0);
+        }
+    }
+
+    @ForceInline
+    @LambdaForm.Compiled
+    @Hidden
+    static final long guard_J_J(VarHandle handle, long arg0, VarHandle.AccessDescriptor ad) throws Throwable {
+        boolean direct = handle.checkAccessModeThenIsDirect(ad);
+        if (direct && handle.vform.methodType_table[ad.type] == ad.symbolicMethodTypeErased) {
+            return (long) MethodHandle.linkToStatic(handle, arg0, handle.vform.getMemberName(ad.mode));
+        } else {
+            MethodHandle mh = handle.getMethodHandle(ad.mode);
+            return (long) mh.asType(ad.symbolicMethodTypeInvoker).invokeBasic(handle.asDirect(), arg0);
+        }
+    }
+
+    @ForceInline
+    @LambdaForm.Compiled
+    @Hidden
+    static final float guard_F_F(VarHandle handle, float arg0, VarHandle.AccessDescriptor ad) throws Throwable {
+        boolean direct = handle.checkAccessModeThenIsDirect(ad);
+        if (direct && handle.vform.methodType_table[ad.type] == ad.symbolicMethodTypeErased) {
+            return (float) MethodHandle.linkToStatic(handle, arg0, handle.vform.getMemberName(ad.mode));
+        } else {
+            MethodHandle mh = handle.getMethodHandle(ad.mode);
+            return (float) mh.asType(ad.symbolicMethodTypeInvoker).invokeBasic(handle.asDirect(), arg0);
+        }
+    }
+
+    @ForceInline
+    @LambdaForm.Compiled
+    @Hidden
+    static final double guard_D_D(VarHandle handle, double arg0, VarHandle.AccessDescriptor ad) throws Throwable {
+        boolean direct = handle.checkAccessModeThenIsDirect(ad);
+        if (direct && handle.vform.methodType_table[ad.type] == ad.symbolicMethodTypeErased) {
+            return (double) MethodHandle.linkToStatic(handle, arg0, handle.vform.getMemberName(ad.mode));
+        } else {
+            MethodHandle mh = handle.getMethodHandle(ad.mode);
+            return (double) mh.asType(ad.symbolicMethodTypeInvoker).invokeBasic(handle.asDirect(), arg0);
+        }
+    }
+
+    @ForceInline
+    @LambdaForm.Compiled
+    @Hidden
+    static final Object guard_LIL_L(VarHandle handle, Object arg0, int arg1, Object arg2, VarHandle.AccessDescriptor ad) throws Throwable {
+        boolean direct = handle.checkAccessModeThenIsDirect(ad);
+        if (direct && handle.vform.methodType_table[ad.type] == ad.symbolicMethodTypeErased) {
+            Object r = MethodHandle.linkToStatic(handle, arg0, arg1, arg2, handle.vform.getMemberName(ad.mode));
+            return ad.returnType.cast(r);
+        } else {
+            MethodHandle mh = handle.getMethodHandle(ad.mode);
+            return mh.asType(ad.symbolicMethodTypeInvoker).invokeBasic(handle.asDirect(), arg0, arg1, arg2);
+        }
+    }
+
+    @ForceInline
+    @LambdaForm.Compiled
+    @Hidden
+    static final long guard_LIJ_J(VarHandle handle, Object arg0, int arg1, long arg2, VarHandle.AccessDescriptor ad) throws Throwable {
+        boolean direct = handle.checkAccessModeThenIsDirect(ad);
+        if (direct && handle.vform.methodType_table[ad.type] == ad.symbolicMethodTypeErased) {
+            return (long) MethodHandle.linkToStatic(handle, arg0, arg1, arg2, handle.vform.getMemberName(ad.mode));
+        } else {
+            MethodHandle mh = handle.getMethodHandle(ad.mode);
+            return (long) mh.asType(ad.symbolicMethodTypeInvoker).invokeBasic(handle.asDirect(), arg0, arg1, arg2);
+        }
+    }
+
+    @ForceInline
+    @LambdaForm.Compiled
+    @Hidden
+    static final float guard_LIF_F(VarHandle handle, Object arg0, int arg1, float arg2, VarHandle.AccessDescriptor ad) throws Throwable {
+        boolean direct = handle.checkAccessModeThenIsDirect(ad);
+        if (direct && handle.vform.methodType_table[ad.type] == ad.symbolicMethodTypeErased) {
+            return (float) MethodHandle.linkToStatic(handle, arg0, arg1, arg2, handle.vform.getMemberName(ad.mode));
+        } else {
+            MethodHandle mh = handle.getMethodHandle(ad.mode);
+            return (float) mh.asType(ad.symbolicMethodTypeInvoker).invokeBasic(handle.asDirect(), arg0, arg1, arg2);
+        }
+    }
+
+    @ForceInline
+    @LambdaForm.Compiled
+    @Hidden
+    static final double guard_LID_D(VarHandle handle, Object arg0, int arg1, double arg2, VarHandle.AccessDescriptor ad) throws Throwable {
+        boolean direct = handle.checkAccessModeThenIsDirect(ad);
+        if (direct && handle.vform.methodType_table[ad.type] == ad.symbolicMethodTypeErased) {
+            return (double) MethodHandle.linkToStatic(handle, arg0, arg1, arg2, handle.vform.getMemberName(ad.mode));
+        } else {
+            MethodHandle mh = handle.getMethodHandle(ad.mode);
+            return (double) mh.asType(ad.symbolicMethodTypeInvoker).invokeBasic(handle.asDirect(), arg0, arg1, arg2);
+        }
+    }
+
+    @ForceInline
+    @LambdaForm.Compiled
+    @Hidden
+    static final Object guard_LJL_L(VarHandle handle, Object arg0, long arg1, Object arg2, VarHandle.AccessDescriptor ad) throws Throwable {
+        boolean direct = handle.checkAccessModeThenIsDirect(ad);
+        if (direct && handle.vform.methodType_table[ad.type] == ad.symbolicMethodTypeErased) {
+            Object r = MethodHandle.linkToStatic(handle, arg0, arg1, arg2, handle.vform.getMemberName(ad.mode));
+            return ad.returnType.cast(r);
+        } else {
+            MethodHandle mh = handle.getMethodHandle(ad.mode);
+            return mh.asType(ad.symbolicMethodTypeInvoker).invokeBasic(handle.asDirect(), arg0, arg1, arg2);
+        }
+    }
+
+    @ForceInline
+    @LambdaForm.Compiled
+    @Hidden
+    static final int guard_LJI_I(VarHandle handle, Object arg0, long arg1, int arg2, VarHandle.AccessDescriptor ad) throws Throwable {
+        boolean direct = handle.checkAccessModeThenIsDirect(ad);
+        if (direct && handle.vform.methodType_table[ad.type] == ad.symbolicMethodTypeErased) {
+            return (int) MethodHandle.linkToStatic(handle, arg0, arg1, arg2, handle.vform.getMemberName(ad.mode));
+        } else {
+            MethodHandle mh = handle.getMethodHandle(ad.mode);
+            return (int) mh.asType(ad.symbolicMethodTypeInvoker).invokeBasic(handle.asDirect(), arg0, arg1, arg2);
+        }
+    }
+
+    @ForceInline
+    @LambdaForm.Compiled
+    @Hidden
+    static final float guard_LJF_F(VarHandle handle, Object arg0, long arg1, float arg2, VarHandle.AccessDescriptor ad) throws Throwable {
+        boolean direct = handle.checkAccessModeThenIsDirect(ad);
+        if (direct && handle.vform.methodType_table[ad.type] == ad.symbolicMethodTypeErased) {
+            return (float) MethodHandle.linkToStatic(handle, arg0, arg1, arg2, handle.vform.getMemberName(ad.mode));
+        } else {
+            MethodHandle mh = handle.getMethodHandle(ad.mode);
+            return (float) mh.asType(ad.symbolicMethodTypeInvoker).invokeBasic(handle.asDirect(), arg0, arg1, arg2);
+        }
+    }
+
+    @ForceInline
+    @LambdaForm.Compiled
+    @Hidden
+    static final double guard_LJD_D(VarHandle handle, Object arg0, long arg1, double arg2, VarHandle.AccessDescriptor ad) throws Throwable {
+        boolean direct = handle.checkAccessModeThenIsDirect(ad);
+        if (direct && handle.vform.methodType_table[ad.type] == ad.symbolicMethodTypeErased) {
+            return (double) MethodHandle.linkToStatic(handle, arg0, arg1, arg2, handle.vform.getMemberName(ad.mode));
+        } else {
+            MethodHandle mh = handle.getMethodHandle(ad.mode);
+            return (double) mh.asType(ad.symbolicMethodTypeInvoker).invokeBasic(handle.asDirect(), arg0, arg1, arg2);
+        }
+    }
+
+    @ForceInline
+    @LambdaForm.Compiled
+    @Hidden
+    static final Object guard_LJJL_L(VarHandle handle, Object arg0, long arg1, long arg2, Object arg3, VarHandle.AccessDescriptor ad) throws Throwable {
+        boolean direct = handle.checkAccessModeThenIsDirect(ad);
+        if (direct && handle.vform.methodType_table[ad.type] == ad.symbolicMethodTypeErased) {
+            Object r = MethodHandle.linkToStatic(handle, arg0, arg1, arg2, arg3, handle.vform.getMemberName(ad.mode));
+            return ad.returnType.cast(r);
+        } else {
+            MethodHandle mh = handle.getMethodHandle(ad.mode);
+            return mh.asType(ad.symbolicMethodTypeInvoker).invokeBasic(handle.asDirect(), arg0, arg1, arg2, arg3);
+        }
+    }
+
+    @ForceInline
+    @LambdaForm.Compiled
+    @Hidden
+    static final int guard_LJJI_I(VarHandle handle, Object arg0, long arg1, long arg2, int arg3, VarHandle.AccessDescriptor ad) throws Throwable {
+        boolean direct = handle.checkAccessModeThenIsDirect(ad);
+        if (direct && handle.vform.methodType_table[ad.type] == ad.symbolicMethodTypeErased) {
+            return (int) MethodHandle.linkToStatic(handle, arg0, arg1, arg2, arg3, handle.vform.getMemberName(ad.mode));
+        } else {
+            MethodHandle mh = handle.getMethodHandle(ad.mode);
+            return (int) mh.asType(ad.symbolicMethodTypeInvoker).invokeBasic(handle.asDirect(), arg0, arg1, arg2, arg3);
+        }
+    }
+
+    @ForceInline
+    @LambdaForm.Compiled
+    @Hidden
+    static final float guard_LJJF_F(VarHandle handle, Object arg0, long arg1, long arg2, float arg3, VarHandle.AccessDescriptor ad) throws Throwable {
+        boolean direct = handle.checkAccessModeThenIsDirect(ad);
+        if (direct && handle.vform.methodType_table[ad.type] == ad.symbolicMethodTypeErased) {
+            return (float) MethodHandle.linkToStatic(handle, arg0, arg1, arg2, arg3, handle.vform.getMemberName(ad.mode));
+        } else {
+            MethodHandle mh = handle.getMethodHandle(ad.mode);
+            return (float) mh.asType(ad.symbolicMethodTypeInvoker).invokeBasic(handle.asDirect(), arg0, arg1, arg2, arg3);
+        }
+    }
+
+    @ForceInline
+    @LambdaForm.Compiled
+    @Hidden
+    static final double guard_LJJD_D(VarHandle handle, Object arg0, long arg1, long arg2, double arg3, VarHandle.AccessDescriptor ad) throws Throwable {
+        boolean direct = handle.checkAccessModeThenIsDirect(ad);
+        if (direct && handle.vform.methodType_table[ad.type] == ad.symbolicMethodTypeErased) {
+            return (double) MethodHandle.linkToStatic(handle, arg0, arg1, arg2, arg3, handle.vform.getMemberName(ad.mode));
+        } else {
+            MethodHandle mh = handle.getMethodHandle(ad.mode);
+            return (double) mh.asType(ad.symbolicMethodTypeInvoker).invokeBasic(handle.asDirect(), arg0, arg1, arg2, arg3);
+        }
+    }
+
 }
diff --git a/src/java.base/share/classes/java/lang/invoke/VarHandleSegmentViewBase.java b/src/java.base/share/classes/java/lang/invoke/VarHandleSegmentViewBase.java
deleted file mode 100644
index 31ec02c3d7c..00000000000
--- a/src/java.base/share/classes/java/lang/invoke/VarHandleSegmentViewBase.java
+++ /dev/null
@@ -1,55 +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 java.lang.invoke;
-
-/**
- * Base class for memory segment var handle view implementations.
- */
-abstract sealed class VarHandleSegmentViewBase extends VarHandle permits
-        VarHandleSegmentAsBytes,
-        VarHandleSegmentAsChars,
-        VarHandleSegmentAsDoubles,
-        VarHandleSegmentAsFloats,
-        VarHandleSegmentAsInts,
-        VarHandleSegmentAsLongs,
-        VarHandleSegmentAsShorts {
-
-    /** endianness **/
-    final boolean be;
-
-    /** alignment constraint (in bytes, expressed as a bit mask) **/
-    final long alignmentMask;
-
-    VarHandleSegmentViewBase(VarForm form, boolean be, long alignmentMask, boolean exact) {
-        super(form, exact);
-        this.be = be;
-        this.alignmentMask = alignmentMask;
-    }
-
-    static UnsupportedOperationException newUnsupportedAccessModeForAlignment(long alignment) {
-        return new UnsupportedOperationException("Unsupported access mode for alignment: " + alignment);
-    }
-}
diff --git a/src/java.base/share/classes/java/lang/invoke/VarHandles.java b/src/java.base/share/classes/java/lang/invoke/VarHandles.java
index a21092c6cf7..298b2e7baa1 100644
--- a/src/java.base/share/classes/java/lang/invoke/VarHandles.java
+++ b/src/java.base/share/classes/java/lang/invoke/VarHandles.java
@@ -27,6 +27,7 @@ package java.lang.invoke;
 
 import sun.invoke.util.Wrapper;
 
+import java.lang.foreign.MemoryLayout;
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
@@ -291,44 +292,55 @@ final class VarHandles {
     }
 
     /**
-     * Creates a memory segment view var handle.
-     *
+     * Creates a memory segment view var handle accessing a {@code carrier} element. It has access coordinates
+     * {@code (MS, long)} if {@code constantOffset}, {@code (MS, long, (validated) long)} otherwise.
+     * <p>
      * The resulting var handle will take a memory segment as first argument (the segment to be dereferenced),
-     * and a {@code long} as second argument (the offset into the segment).
+     * and a {@code long} as second argument (the offset into the segment). Both arguments are checked.
+     * <p>
+     * If {@code constantOffset == false}, the resulting var handle will take a third pre-validated additional
+     * offset instead of the given fixed {@code offset}, and caller must ensure that passed additional offset,
+     * either to the handle (such as computing through method handles) or as fixed {@code offset} here, is valid.
      *
-     * Note: the returned var handle does not perform any size or alignment check. It is up to clients
-     * to adapt the returned var handle and insert the appropriate checks.
-     *
-     * @param carrier the Java carrier type.
-     * @param alignmentMask alignment requirement to be checked upon access. In bytes. Expressed as a mask.
-     * @param byteOrder the byte order.
-     * @return the created VarHandle.
+     * @param carrier the Java carrier type of the element
+     * @param enclosing the enclosing layout to perform bound and alignment checks against
+     * @param alignmentMask alignment of this accessed element in the enclosing layout
+     * @param constantOffset if access path has a constant offset value, i.e. it has no strides
+     * @param offset the offset value, if the offset is constant
+     * @param byteOrder the byte order
+     * @return the created var handle
      */
-    static VarHandle memorySegmentViewHandle(Class<?> carrier, long alignmentMask,
-                                             ByteOrder byteOrder) {
-        if (!carrier.isPrimitive() || carrier == void.class || carrier == boolean.class) {
+    static VarHandle memorySegmentViewHandle(Class<?> carrier, MemoryLayout enclosing, long alignmentMask,
+                                             boolean constantOffset, long offset, ByteOrder byteOrder) {
+        if (!carrier.isPrimitive() || carrier == void.class) {
             throw new IllegalArgumentException("Invalid carrier: " + carrier.getName());
         }
         boolean be = byteOrder == ByteOrder.BIG_ENDIAN;
         boolean exact = VAR_HANDLE_SEGMENT_FORCE_EXACT;
 
+        // All carrier types must persist across MethodType erasure
+        VarForm form;
         if (carrier == byte.class) {
-            return maybeAdapt(new VarHandleSegmentAsBytes(be, alignmentMask, exact));
+            form = VarHandleSegmentAsBytes.selectForm(alignmentMask, constantOffset);
         } else if (carrier == char.class) {
-            return maybeAdapt(new VarHandleSegmentAsChars(be, alignmentMask, exact));
+            form = VarHandleSegmentAsChars.selectForm(alignmentMask, constantOffset);
         } else if (carrier == short.class) {
-            return maybeAdapt(new VarHandleSegmentAsShorts(be, alignmentMask, exact));
+            form = VarHandleSegmentAsShorts.selectForm(alignmentMask, constantOffset);
         } else if (carrier == int.class) {
-            return maybeAdapt(new VarHandleSegmentAsInts(be, alignmentMask, exact));
+            form = VarHandleSegmentAsInts.selectForm(alignmentMask, constantOffset);
         } else if (carrier == float.class) {
-            return maybeAdapt(new VarHandleSegmentAsFloats(be, alignmentMask, exact));
+            form = VarHandleSegmentAsFloats.selectForm(alignmentMask, constantOffset);
         } else if (carrier == long.class) {
-            return maybeAdapt(new VarHandleSegmentAsLongs(be, alignmentMask, exact));
+            form = VarHandleSegmentAsLongs.selectForm(alignmentMask, constantOffset);
         } else if (carrier == double.class) {
-            return maybeAdapt(new VarHandleSegmentAsDoubles(be, alignmentMask, exact));
+            form = VarHandleSegmentAsDoubles.selectForm(alignmentMask, constantOffset);
+        } else if (carrier == boolean.class) {
+            form = VarHandleSegmentAsBooleans.selectForm(alignmentMask, constantOffset);
         } else {
             throw new IllegalStateException("Cannot get here");
         }
+
+        return maybeAdapt(new SegmentVarHandle(form, be, enclosing, offset, exact));
     }
 
     private static VarHandle maybeAdapt(VarHandle target) {
@@ -724,7 +736,7 @@ final class VarHandles {
 //            Object getAndUpdate(Object value);
 //        }
 //
-//        record HandleType(Class<?> receiver, Class<?> value, Class<?>... intermediates) {
+//        record HandleType(Class<?> receiver, Class<?>... intermediates) {
 //        }
 //
 //        /**
@@ -744,48 +756,31 @@ final class VarHandles {
 //            System.out.println();
 //
 //            // Declare the stream of shapes
-//            Stream<HandleType> hts = Stream.of(
-//                    // Object->Object
-//                    new HandleType(Object.class, Object.class),
-//                    // Object->int
+//            List<HandleType> hts = List.of(
+//                    // Object->T
+//                    new HandleType(Object.class),
+//
+//                    // <static>->T
+//                    new HandleType(null),
+//
+//                    // Array[index]->T
 //                    new HandleType(Object.class, int.class),
-//                    // Object->long
+//
+//                    // MS[base]->T
 //                    new HandleType(Object.class, long.class),
-//                    // Object->float
-//                    new HandleType(Object.class, float.class),
-//                    // Object->double
-//                    new HandleType(Object.class, double.class),
 //
-//                    // <static>->Object
-//                    new HandleType(null, Object.class),
-//                    // <static>->int
-//                    new HandleType(null, int.class),
-//                    // <static>->long
-//                    new HandleType(null, long.class),
-//                    // <static>->float
-//                    new HandleType(null, float.class),
-//                    // <static>->double
-//                    new HandleType(null, double.class),
-//
-//                    // Array[int]->Object
-//                    new HandleType(Object.class, Object.class, int.class),
-//                    // Array[int]->int
-//                    new HandleType(Object.class, int.class, int.class),
-//                    // Array[int]->long
-//                    new HandleType(Object.class, long.class, int.class),
-//                    // Array[int]->float
-//                    new HandleType(Object.class, float.class, int.class),
-//                    // Array[int]->double
-//                    new HandleType(Object.class, double.class, int.class),
-//
-//                    // Array[long]->int
-//                    new HandleType(Object.class, int.class, long.class),
-//                    // Array[long]->long
+//                    // MS[base][offset]->T
 //                    new HandleType(Object.class, long.class, long.class)
 //            );
 //
-//            hts.flatMap(ht -> Stream.of(VarHandleTemplate.class.getMethods()).
-//                    map(m -> generateMethodType(m, ht.receiver, ht.value, ht.intermediates))).
+//            Stream.of(VarHandleTemplate.class.getMethods()).<MethodType>
+//                    mapMulti((m, sink) -> {
+//                        for (var ht : hts) {
+//                            for (var bt : LambdaForm.BasicType.ARG_TYPES) {
+//                                sink.accept(generateMethodType(m, ht.receiver, bt.btClass, ht.intermediates));
+//                            }
+//                        }
+//                    }).
 //                    distinct().
 //                    map(GuardMethodGenerator::generateMethod).
 //                    forEach(System.out::println);
diff --git a/src/java.base/share/classes/java/lang/invoke/X-VarHandleSegmentView.java.template b/src/java.base/share/classes/java/lang/invoke/X-VarHandleSegmentView.java.template
index c5942e93c46..aa8c7b28617 100644
--- a/src/java.base/share/classes/java/lang/invoke/X-VarHandleSegmentView.java.template
+++ b/src/java.base/share/classes/java/lang/invoke/X-VarHandleSegmentView.java.template
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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,53 +25,106 @@
 package java.lang.invoke;
 
 import jdk.internal.foreign.AbstractMemorySegmentImpl;
-import jdk.internal.foreign.Utils;
-import jdk.internal.misc.ScopedMemoryAccess;
 import jdk.internal.vm.annotation.ForceInline;
 
-import java.lang.foreign.MemoryLayout;
 import java.lang.foreign.MemorySegment;
-import java.lang.ref.Reference;
 
-import java.util.Objects;
-
-import static java.lang.invoke.MethodHandleStatics.UNSAFE;
+import static java.lang.invoke.SegmentVarHandle.*;
 
 #warn
 
-final class VarHandleSegmentAs$Type$s extends VarHandleSegmentViewBase {
-
-    static final boolean BE = UNSAFE.isBigEndian();
-
-    static final ScopedMemoryAccess SCOPED_MEMORY_ACCESS = ScopedMemoryAccess.getScopedMemoryAccess();
+{#if[byte]?final:sealed} class VarHandleSegmentAs$Type$s {
 
+#if[!byte]
     static final int NON_PLAIN_ACCESS_MIN_ALIGN_MASK = $BoxType$.BYTES - 1;
 
-    static final VarForm FORM = new VarForm(VarHandleSegmentAs$Type$s.class, MemorySegment.class, $type$.class, MemoryLayout.class, long.class, long.class);
-
-    VarHandleSegmentAs$Type$s(boolean be, long alignmentMask, boolean exact) {
-        super(FORM, be, alignmentMask, exact);
+#end[byte]
+    static VarForm selectForm(long alignmentMask, boolean constantOffset) {
+#if[byte]
+        return constantOffset ? CONSTANT_OFFSET_FORM : VARIABLE_OFFSET_FORM;
+#else[byte]
+        return (alignmentMask & NON_PLAIN_ACCESS_MIN_ALIGN_MASK) != NON_PLAIN_ACCESS_MIN_ALIGN_MASK ?
+                (constantOffset ? CONSTANT_OFFSET_FORM : VARIABLE_OFFSET_FORM) :
+                (constantOffset ? VarHandleSegmentAs$Type$sAligned.CONSTANT_OFFSET_FORM : VarHandleSegmentAs$Type$sAligned.VARIABLE_OFFSET_FORM);
+#end[byte]
     }
 
-    @Override
-    final MethodType accessModeTypeUncached(VarHandle.AccessType accessType) {
-        return accessType.accessModeType(MemorySegment.class, $type$.class, MemoryLayout.class, long.class, long.class);
+    static final VarForm CONSTANT_OFFSET_FORM = new VarForm(VarHandleSegmentAs$Type$s.class, MemorySegment.class, $type$.class, long.class);
+    static final VarForm VARIABLE_OFFSET_FORM = new VarForm(VarHandleSegmentAs$Type$s.class, MemorySegment.class, $type$.class, long.class, long.class);
+
+    VarHandleSegmentAs$Type$s() { throw new AssertionError(); }
+
+    @ForceInline
+    static $type$ get(VarHandle ob, Object obb, long base) {
+        return get(ob, obb, base, ((SegmentVarHandle) ob).offset);
     }
 
-    @Override
-    public VarHandleSegmentAs$Type$s withInvokeExactBehavior() {
-        return hasInvokeExactBehavior() ?
-                this :
-                new VarHandleSegmentAs$Type$s(be, alignmentMask, true);
+    @ForceInline
+    static $type$ get(VarHandle ob, Object obb, long base, long offset) {
+        SegmentVarHandle handle = (SegmentVarHandle)ob;
+        AbstractMemorySegmentImpl bb = handle.checkSegment(obb, base, true);
+#if[floatingPoint]
+        $rawType$ rawValue = SCOPED_MEMORY_ACCESS.get$RawType$Unaligned(bb.sessionImpl(),
+                bb.unsafeGetBase(),
+                offset(bb, base, offset),
+                handle.be);
+        return $Type$.$rawType$BitsTo$Type$(rawValue);
+#else[floatingPoint]
+#if[byte]
+        return SCOPED_MEMORY_ACCESS.get$Type$(bb.sessionImpl(),
+                bb.unsafeGetBase(),
+                offset(bb, base, offset));
+#else[byte]
+        return SCOPED_MEMORY_ACCESS.get$Type$Unaligned(bb.sessionImpl(),
+                bb.unsafeGetBase(),
+                offset(bb, base, offset),
+                handle.be);
+#end[byte]
+#end[floatingPoint]
     }
 
-    @Override
-    public VarHandleSegmentAs$Type$s withInvokeBehavior() {
-        return !hasInvokeExactBehavior() ?
-                this :
-                new VarHandleSegmentAs$Type$s(be, alignmentMask, false);
+    @ForceInline
+    static void set(VarHandle ob, Object obb, long base, $type$ value) {
+        set(ob, obb, base, ((SegmentVarHandle) ob).offset, value);
     }
 
+    @ForceInline
+    static void set(VarHandle ob, Object obb, long base, long offset, $type$ value) {
+        SegmentVarHandle handle = (SegmentVarHandle)ob;
+        AbstractMemorySegmentImpl bb = handle.checkSegment(obb, base, false);
+#if[floatingPoint]
+        SCOPED_MEMORY_ACCESS.put$RawType$Unaligned(bb.sessionImpl(),
+                bb.unsafeGetBase(),
+                offset(bb, base, offset),
+                $Type$.$type$ToRaw$RawType$Bits(value),
+                handle.be);
+#else[floatingPoint]
+#if[byte]
+        SCOPED_MEMORY_ACCESS.put$Type$(bb.sessionImpl(),
+                bb.unsafeGetBase(),
+                offset(bb, base, offset),
+                value);
+#else[byte]
+        SCOPED_MEMORY_ACCESS.put$Type$Unaligned(bb.sessionImpl(),
+                bb.unsafeGetBase(),
+                offset(bb, base, offset),
+                value,
+                handle.be);
+#end[byte]
+#end[floatingPoint]
+    }
+#if[!byte]
+}
+
+// This class must be accessed through non-aligned VarHandleSegmentAs$Type$s
+final class VarHandleSegmentAs$Type$sAligned extends VarHandleSegmentAs$Type$s {
+
+    static final VarForm CONSTANT_OFFSET_FORM = new VarForm(VarHandleSegmentAs$Type$sAligned.class, VarHandleSegmentAs$Type$s.CONSTANT_OFFSET_FORM);
+    static final VarForm VARIABLE_OFFSET_FORM = new VarForm(VarHandleSegmentAs$Type$sAligned.class, VarHandleSegmentAs$Type$s.VARIABLE_OFFSET_FORM);
+
+    VarHandleSegmentAs$Type$sAligned() { throw new AssertionError(); }
+#end[byte]
+
 #if[floatingPoint]
     @ForceInline
     static $rawType$ convEndian(boolean big, $type$ v) {
@@ -99,296 +152,338 @@ final class VarHandleSegmentAs$Type$s extends VarHandleSegmentViewBase {
 #end[floatingPoint]
 
     @ForceInline
-    static AbstractMemorySegmentImpl checkSegment(Object obb, Object encl, long base, boolean ro) {
-        AbstractMemorySegmentImpl oo = (AbstractMemorySegmentImpl)Objects.requireNonNull(obb);
-        oo.checkEnclosingLayout(base, (MemoryLayout)encl, ro);
-        return oo;
+    static $type$ getVolatile(VarHandle ob, Object obb, long base) {
+        return getVolatile(ob, obb, base, ((SegmentVarHandle) ob).offset);
     }
 
     @ForceInline
-    static long offsetNonPlain(AbstractMemorySegmentImpl bb, long base, long offset, long alignmentMask) {
-        if ((alignmentMask & NON_PLAIN_ACCESS_MIN_ALIGN_MASK) != NON_PLAIN_ACCESS_MIN_ALIGN_MASK) {
-            throw VarHandleSegmentViewBase.newUnsupportedAccessModeForAlignment(alignmentMask + 1);
-        }
-        return offsetPlain(bb, base, offset);
-    }
-
-    @ForceInline
-    static long offsetPlain(AbstractMemorySegmentImpl bb, long base, long offset) {
-        long segment_base = bb.unsafeGetOffset();
-        return segment_base + base + offset;
-    }
-
-    @ForceInline
-    static $type$ get(VarHandle ob, Object obb, Object encl, long base, long offset) {
-        VarHandleSegmentViewBase handle = (VarHandleSegmentViewBase)ob;
-        AbstractMemorySegmentImpl bb = checkSegment(obb, encl, base, true);
-#if[floatingPoint]
-        $rawType$ rawValue = SCOPED_MEMORY_ACCESS.get$RawType$Unaligned(bb.sessionImpl(),
-                bb.unsafeGetBase(),
-                offsetPlain(bb, base, offset),
-                handle.be);
-        return $Type$.$rawType$BitsTo$Type$(rawValue);
-#else[floatingPoint]
-#if[byte]
-        return SCOPED_MEMORY_ACCESS.get$Type$(bb.sessionImpl(),
-                bb.unsafeGetBase(),
-                offsetPlain(bb, base, offset));
-#else[byte]
-        return SCOPED_MEMORY_ACCESS.get$Type$Unaligned(bb.sessionImpl(),
-                bb.unsafeGetBase(),
-                offsetPlain(bb, base, offset),
-                handle.be);
-#end[byte]
-#end[floatingPoint]
-    }
-
-    @ForceInline
-    static void set(VarHandle ob, Object obb, Object encl, long base, long offset, $type$ value) {
-        VarHandleSegmentViewBase handle = (VarHandleSegmentViewBase)ob;
-        AbstractMemorySegmentImpl bb = checkSegment(obb, encl, base, false);
-#if[floatingPoint]
-        SCOPED_MEMORY_ACCESS.put$RawType$Unaligned(bb.sessionImpl(),
-                bb.unsafeGetBase(),
-                offsetPlain(bb, base, offset),
-                $Type$.$type$ToRaw$RawType$Bits(value),
-                handle.be);
-#else[floatingPoint]
-#if[byte]
-        SCOPED_MEMORY_ACCESS.put$Type$(bb.sessionImpl(),
-                bb.unsafeGetBase(),
-                offsetPlain(bb, base, offset),
-                value);
-#else[byte]
-        SCOPED_MEMORY_ACCESS.put$Type$Unaligned(bb.sessionImpl(),
-                bb.unsafeGetBase(),
-                offsetPlain(bb, base, offset),
-                value,
-                handle.be);
-#end[byte]
-#end[floatingPoint]
-    }
-
-    @ForceInline
-    static $type$ getVolatile(VarHandle ob, Object obb, Object encl, long base, long offset) {
-        VarHandleSegmentViewBase handle = (VarHandleSegmentViewBase)ob;
-        AbstractMemorySegmentImpl bb = checkSegment(obb, encl, base, true);
+    static $type$ getVolatile(VarHandle ob, Object obb, long base, long offset) {
+        SegmentVarHandle handle = (SegmentVarHandle)ob;
+        AbstractMemorySegmentImpl bb = handle.checkSegment(obb, base, true);
         return convEndian(handle.be,
                           SCOPED_MEMORY_ACCESS.get$RawType$Volatile(bb.sessionImpl(),
                                   bb.unsafeGetBase(),
-                                  offsetNonPlain(bb, base, offset, handle.alignmentMask)));
+                                  offset(bb, base, offset)));
     }
 
     @ForceInline
-    static void setVolatile(VarHandle ob, Object obb, Object encl, long base, long offset, $type$ value) {
-        VarHandleSegmentViewBase handle = (VarHandleSegmentViewBase)ob;
-        AbstractMemorySegmentImpl bb = checkSegment(obb, encl, base, false);
+    static void setVolatile(VarHandle ob, Object obb, long base, $type$ value) {
+        setVolatile(ob, obb, base, ((SegmentVarHandle) ob).offset, value);
+    }
+
+    @ForceInline
+    static void setVolatile(VarHandle ob, Object obb, long base, long offset, $type$ value) {
+        SegmentVarHandle handle = (SegmentVarHandle)ob;
+        AbstractMemorySegmentImpl bb = handle.checkSegment(obb, base, false);
         SCOPED_MEMORY_ACCESS.put$RawType$Volatile(bb.sessionImpl(),
                 bb.unsafeGetBase(),
-                offsetNonPlain(bb, base, offset, handle.alignmentMask),
+                offset(bb, base, offset),
                 convEndian(handle.be, value));
     }
 
     @ForceInline
-    static $type$ getAcquire(VarHandle ob, Object obb, Object encl, long base, long offset) {
-        VarHandleSegmentViewBase handle = (VarHandleSegmentViewBase)ob;
-        AbstractMemorySegmentImpl bb = checkSegment(obb, encl, base, true);
+    static $type$ getAcquire(VarHandle ob, Object obb, long base) {
+        return getAcquire(ob, obb, base, ((SegmentVarHandle) ob).offset);
+    }
+
+    @ForceInline
+    static $type$ getAcquire(VarHandle ob, Object obb, long base, long offset) {
+        SegmentVarHandle handle = (SegmentVarHandle)ob;
+        AbstractMemorySegmentImpl bb = handle.checkSegment(obb, base, true);
         return convEndian(handle.be,
                           SCOPED_MEMORY_ACCESS.get$RawType$Acquire(bb.sessionImpl(),
                                   bb.unsafeGetBase(),
-                                  offsetNonPlain(bb, base, offset, handle.alignmentMask)));
+                                  offset(bb, base, offset)));
     }
 
     @ForceInline
-    static void setRelease(VarHandle ob, Object obb, Object encl, long base, long offset, $type$ value) {
-        VarHandleSegmentViewBase handle = (VarHandleSegmentViewBase)ob;
-        AbstractMemorySegmentImpl bb = checkSegment(obb, encl, base, false);
+    static void setRelease(VarHandle ob, Object obb, long base, $type$ value) {
+        setRelease(ob, obb, base, ((SegmentVarHandle) ob).offset, value);
+    }
+
+    @ForceInline
+    static void setRelease(VarHandle ob, Object obb, long base, long offset, $type$ value) {
+        SegmentVarHandle handle = (SegmentVarHandle)ob;
+        AbstractMemorySegmentImpl bb = handle.checkSegment(obb, base, false);
         SCOPED_MEMORY_ACCESS.put$RawType$Release(bb.sessionImpl(),
                 bb.unsafeGetBase(),
-                offsetNonPlain(bb, base, offset, handle.alignmentMask),
+                offset(bb, base, offset),
                 convEndian(handle.be, value));
     }
 
     @ForceInline
-    static $type$ getOpaque(VarHandle ob, Object obb, Object encl, long base, long offset) {
-        VarHandleSegmentViewBase handle = (VarHandleSegmentViewBase)ob;
-        AbstractMemorySegmentImpl bb = checkSegment(obb, encl, base, true);
-        return convEndian(handle.be,
-                          SCOPED_MEMORY_ACCESS.get$RawType$Opaque(bb.sessionImpl(),
-                                  bb.unsafeGetBase(),
-                                  offsetNonPlain(bb, base, offset, handle.alignmentMask)));
+    static $type$ getOpaque(VarHandle ob, Object obb, long base) {
+        return getOpaque(ob, obb, base, ((SegmentVarHandle) ob).offset);
     }
 
     @ForceInline
-    static void setOpaque(VarHandle ob, Object obb, Object encl, long base, long offset, $type$ value) {
-        VarHandleSegmentViewBase handle = (VarHandleSegmentViewBase)ob;
-        AbstractMemorySegmentImpl bb = checkSegment(obb, encl, base, false);
+    static $type$ getOpaque(VarHandle ob, Object obb, long base, long offset) {
+        SegmentVarHandle handle = (SegmentVarHandle)ob;
+        AbstractMemorySegmentImpl bb = handle.checkSegment(obb, base, true);
+        return convEndian(handle.be,
+                          SCOPED_MEMORY_ACCESS.get$RawType$Opaque(bb.sessionImpl(),
+                                  bb.unsafeGetBase(),
+                                  offset(bb, base, offset)));
+    }
+
+    @ForceInline
+    static void setOpaque(VarHandle ob, Object obb, long base, $type$ value) {
+        setOpaque(ob, obb, base, ((SegmentVarHandle) ob).offset, value);
+    }
+
+    @ForceInline
+    static void setOpaque(VarHandle ob, Object obb, long base, long offset, $type$ value) {
+        SegmentVarHandle handle = (SegmentVarHandle)ob;
+        AbstractMemorySegmentImpl bb = handle.checkSegment(obb, base, false);
         SCOPED_MEMORY_ACCESS.put$RawType$Opaque(bb.sessionImpl(),
                 bb.unsafeGetBase(),
-                offsetNonPlain(bb, base, offset, handle.alignmentMask),
+                offset(bb, base, offset),
                 convEndian(handle.be, value));
     }
 #if[CAS]
 
     @ForceInline
-    static boolean compareAndSet(VarHandle ob, Object obb, Object encl, long base, long offset, $type$ expected, $type$ value) {
-        VarHandleSegmentViewBase handle = (VarHandleSegmentViewBase)ob;
-        AbstractMemorySegmentImpl bb = checkSegment(obb, encl, base, false);
+    static boolean compareAndSet(VarHandle ob, Object obb, long base, $type$ expected, $type$ value) {
+        return compareAndSet(ob, obb, base, ((SegmentVarHandle) ob).offset, expected, value);
+    }
+
+    @ForceInline
+    static boolean compareAndSet(VarHandle ob, Object obb, long base, long offset, $type$ expected, $type$ value) {
+        SegmentVarHandle handle = (SegmentVarHandle)ob;
+        AbstractMemorySegmentImpl bb = handle.checkSegment(obb, base, false);
         return SCOPED_MEMORY_ACCESS.compareAndSet$RawType$(bb.sessionImpl(),
                 bb.unsafeGetBase(),
-                offsetNonPlain(bb, base, offset, handle.alignmentMask),
+                offset(bb, base, offset),
                 convEndian(handle.be, expected), convEndian(handle.be, value));
     }
 
     @ForceInline
-    static $type$ compareAndExchange(VarHandle ob, Object obb, Object encl, long base, long offset, $type$ expected, $type$ value) {
-        VarHandleSegmentViewBase handle = (VarHandleSegmentViewBase)ob;
-        AbstractMemorySegmentImpl bb = checkSegment(obb, encl, base, false);
+    static $type$ compareAndExchange(VarHandle ob, Object obb, long base, $type$ expected, $type$ value) {
+        return compareAndExchange(ob, obb, base, ((SegmentVarHandle) ob).offset, expected, value);
+    }
+
+    @ForceInline
+    static $type$ compareAndExchange(VarHandle ob, Object obb, long base, long offset, $type$ expected, $type$ value) {
+        SegmentVarHandle handle = (SegmentVarHandle)ob;
+        AbstractMemorySegmentImpl bb = handle.checkSegment(obb, base, false);
         return convEndian(handle.be,
                           SCOPED_MEMORY_ACCESS.compareAndExchange$RawType$(bb.sessionImpl(),
                                   bb.unsafeGetBase(),
-                                  offsetNonPlain(bb, base, offset, handle.alignmentMask),
+                                  offset(bb, base, offset),
                                   convEndian(handle.be, expected), convEndian(handle.be, value)));
     }
 
     @ForceInline
-    static $type$ compareAndExchangeAcquire(VarHandle ob, Object obb, Object encl, long base, long offset, $type$ expected, $type$ value) {
-        VarHandleSegmentViewBase handle = (VarHandleSegmentViewBase)ob;
-        AbstractMemorySegmentImpl bb = checkSegment(obb, encl, base, false);
+    static $type$ compareAndExchangeAcquire(VarHandle ob, Object obb, long base, $type$ expected, $type$ value) {
+        return compareAndExchangeAcquire(ob, obb, base, ((SegmentVarHandle) ob).offset, expected, value);
+    }
+
+    @ForceInline
+    static $type$ compareAndExchangeAcquire(VarHandle ob, Object obb, long base, long offset, $type$ expected, $type$ value) {
+        SegmentVarHandle handle = (SegmentVarHandle)ob;
+        AbstractMemorySegmentImpl bb = handle.checkSegment(obb, base, false);
         return convEndian(handle.be,
                           SCOPED_MEMORY_ACCESS.compareAndExchange$RawType$Acquire(bb.sessionImpl(),
                                   bb.unsafeGetBase(),
-                                  offsetNonPlain(bb, base, offset, handle.alignmentMask),
+                                  offset(bb, base, offset),
                                   convEndian(handle.be, expected), convEndian(handle.be, value)));
     }
 
     @ForceInline
-    static $type$ compareAndExchangeRelease(VarHandle ob, Object obb, Object encl, long base, long offset, $type$ expected, $type$ value) {
-        VarHandleSegmentViewBase handle = (VarHandleSegmentViewBase)ob;
-        AbstractMemorySegmentImpl bb = checkSegment(obb, encl, base, false);
+    static $type$ compareAndExchangeRelease(VarHandle ob, Object obb, long base, $type$ expected, $type$ value) {
+        return compareAndExchangeRelease(ob, obb, base, ((SegmentVarHandle) ob).offset, expected, value);
+    }
+
+    @ForceInline
+    static $type$ compareAndExchangeRelease(VarHandle ob, Object obb, long base, long offset, $type$ expected, $type$ value) {
+        SegmentVarHandle handle = (SegmentVarHandle)ob;
+        AbstractMemorySegmentImpl bb = handle.checkSegment(obb, base, false);
         return convEndian(handle.be,
                           SCOPED_MEMORY_ACCESS.compareAndExchange$RawType$Release(bb.sessionImpl(),
                                   bb.unsafeGetBase(),
-                                  offsetNonPlain(bb, base, offset, handle.alignmentMask),
+                                  offset(bb, base, offset),
                                   convEndian(handle.be, expected), convEndian(handle.be, value)));
     }
 
     @ForceInline
-    static boolean weakCompareAndSetPlain(VarHandle ob, Object obb, Object encl, long base, long offset, $type$ expected, $type$ value) {
-        VarHandleSegmentViewBase handle = (VarHandleSegmentViewBase)ob;
-        AbstractMemorySegmentImpl bb = checkSegment(obb, encl, base, false);
+    static boolean weakCompareAndSetPlain(VarHandle ob, Object obb, long base, $type$ expected, $type$ value) {
+        return weakCompareAndSetPlain(ob, obb, base, ((SegmentVarHandle) ob).offset, expected, value);
+    }
+
+    @ForceInline
+    static boolean weakCompareAndSetPlain(VarHandle ob, Object obb, long base, long offset, $type$ expected, $type$ value) {
+        SegmentVarHandle handle = (SegmentVarHandle)ob;
+        AbstractMemorySegmentImpl bb = handle.checkSegment(obb, base, false);
         return SCOPED_MEMORY_ACCESS.weakCompareAndSet$RawType$Plain(bb.sessionImpl(),
                 bb.unsafeGetBase(),
-                offsetNonPlain(bb, base, offset, handle.alignmentMask),
+                offset(bb, base, offset),
                 convEndian(handle.be, expected), convEndian(handle.be, value));
     }
 
     @ForceInline
-    static boolean weakCompareAndSet(VarHandle ob, Object obb, Object encl, long base, long offset, $type$ expected, $type$ value) {
-        VarHandleSegmentViewBase handle = (VarHandleSegmentViewBase)ob;
-        AbstractMemorySegmentImpl bb = checkSegment(obb, encl, base, false);
+    static boolean weakCompareAndSet(VarHandle ob, Object obb, long base, $type$ expected, $type$ value) {
+        return weakCompareAndSet(ob, obb, base, ((SegmentVarHandle) ob).offset, expected, value);
+    }
+
+    @ForceInline
+    static boolean weakCompareAndSet(VarHandle ob, Object obb, long base, long offset, $type$ expected, $type$ value) {
+        SegmentVarHandle handle = (SegmentVarHandle)ob;
+        AbstractMemorySegmentImpl bb = handle.checkSegment(obb, base, false);
         return SCOPED_MEMORY_ACCESS.weakCompareAndSet$RawType$(bb.sessionImpl(),
                 bb.unsafeGetBase(),
-                offsetNonPlain(bb, base, offset, handle.alignmentMask),
+                offset(bb, base, offset),
                 convEndian(handle.be, expected), convEndian(handle.be, value));
     }
 
     @ForceInline
-    static boolean weakCompareAndSetAcquire(VarHandle ob, Object obb, Object encl, long base, long offset, $type$ expected, $type$ value) {
-        VarHandleSegmentViewBase handle = (VarHandleSegmentViewBase)ob;
-        AbstractMemorySegmentImpl bb = checkSegment(obb, encl, base, false);
+    static boolean weakCompareAndSetAcquire(VarHandle ob, Object obb, long base, $type$ expected, $type$ value) {
+        return weakCompareAndSetAcquire(ob, obb, base, ((SegmentVarHandle) ob).offset, expected, value);
+    }
+
+    @ForceInline
+    static boolean weakCompareAndSetAcquire(VarHandle ob, Object obb, long base, long offset, $type$ expected, $type$ value) {
+        SegmentVarHandle handle = (SegmentVarHandle)ob;
+        AbstractMemorySegmentImpl bb = handle.checkSegment(obb, base, false);
         return SCOPED_MEMORY_ACCESS.weakCompareAndSet$RawType$Acquire(bb.sessionImpl(),
                 bb.unsafeGetBase(),
-                offsetNonPlain(bb, base, offset, handle.alignmentMask),
+                offset(bb, base, offset),
                 convEndian(handle.be, expected), convEndian(handle.be, value));
     }
 
     @ForceInline
-    static boolean weakCompareAndSetRelease(VarHandle ob, Object obb, Object encl, long base, long offset, $type$ expected, $type$ value) {
-        VarHandleSegmentViewBase handle = (VarHandleSegmentViewBase)ob;
-        AbstractMemorySegmentImpl bb = checkSegment(obb, encl, base, false);
+    static boolean weakCompareAndSetRelease(VarHandle ob, Object obb, long base, $type$ expected, $type$ value) {
+        return weakCompareAndSetRelease(ob, obb, base, ((SegmentVarHandle) ob).offset, expected, value);
+    }
+
+    @ForceInline
+    static boolean weakCompareAndSetRelease(VarHandle ob, Object obb, long base, long offset, $type$ expected, $type$ value) {
+        SegmentVarHandle handle = (SegmentVarHandle)ob;
+        AbstractMemorySegmentImpl bb = handle.checkSegment(obb, base, false);
         return SCOPED_MEMORY_ACCESS.weakCompareAndSet$RawType$Release(bb.sessionImpl(),
                 bb.unsafeGetBase(),
-                offsetNonPlain(bb, base, offset, handle.alignmentMask),
+                offset(bb, base, offset),
                 convEndian(handle.be, expected), convEndian(handle.be, value));
     }
 
     @ForceInline
-    static $type$ getAndSet(VarHandle ob, Object obb, Object encl, long base, long offset, $type$ value) {
-        VarHandleSegmentViewBase handle = (VarHandleSegmentViewBase)ob;
-        AbstractMemorySegmentImpl bb = checkSegment(obb, encl, base, false);
+    static $type$ getAndSet(VarHandle ob, Object obb, long base, $type$ value) {
+        return getAndSet(ob, obb, base, ((SegmentVarHandle) ob).offset, value);
+    }
+
+    @ForceInline
+    static $type$ getAndSet(VarHandle ob, Object obb, long base, long offset, $type$ value) {
+        SegmentVarHandle handle = (SegmentVarHandle)ob;
+        AbstractMemorySegmentImpl bb = handle.checkSegment(obb, base, false);
         return convEndian(handle.be,
                           SCOPED_MEMORY_ACCESS.getAndSet$RawType$(bb.sessionImpl(),
                                   bb.unsafeGetBase(),
-                                  offsetNonPlain(bb, base, offset, handle.alignmentMask),
+                                  offset(bb, base, offset),
                                   convEndian(handle.be, value)));
     }
 
     @ForceInline
-    static $type$ getAndSetAcquire(VarHandle ob, Object obb, Object encl, long base, long offset, $type$ value) {
-        VarHandleSegmentViewBase handle = (VarHandleSegmentViewBase)ob;
-        AbstractMemorySegmentImpl bb = checkSegment(obb, encl, base, false);
+    static $type$ getAndSetAcquire(VarHandle ob, Object obb, long base, $type$ value) {
+        return getAndSetAcquire(ob, obb, base, ((SegmentVarHandle) ob).offset, value);
+    }
+
+    @ForceInline
+    static $type$ getAndSetAcquire(VarHandle ob, Object obb, long base, long offset, $type$ value) {
+        SegmentVarHandle handle = (SegmentVarHandle)ob;
+        AbstractMemorySegmentImpl bb = handle.checkSegment(obb, base, false);
         return convEndian(handle.be,
                           SCOPED_MEMORY_ACCESS.getAndSet$RawType$Acquire(bb.sessionImpl(),
                                   bb.unsafeGetBase(),
-                                  offsetNonPlain(bb, base, offset, handle.alignmentMask),
+                                  offset(bb, base, offset),
                                   convEndian(handle.be, value)));
     }
 
     @ForceInline
-    static $type$ getAndSetRelease(VarHandle ob, Object obb, Object encl, long base, long offset, $type$ value) {
-        VarHandleSegmentViewBase handle = (VarHandleSegmentViewBase)ob;
-        AbstractMemorySegmentImpl bb = checkSegment(obb, encl, base, false);
+    static $type$ getAndSetRelease(VarHandle ob, Object obb, long base, $type$ value) {
+        return getAndSetRelease(ob, obb, base, ((SegmentVarHandle) ob).offset, value);
+    }
+
+    @ForceInline
+    static $type$ getAndSetRelease(VarHandle ob, Object obb, long base, long offset, $type$ value) {
+        SegmentVarHandle handle = (SegmentVarHandle)ob;
+        AbstractMemorySegmentImpl bb = handle.checkSegment(obb, base, false);
         return convEndian(handle.be,
                           SCOPED_MEMORY_ACCESS.getAndSet$RawType$Release(bb.sessionImpl(),
                                   bb.unsafeGetBase(),
-                                  offsetNonPlain(bb, base, offset, handle.alignmentMask),
+                                  offset(bb, base, offset),
                                   convEndian(handle.be, value)));
     }
 #end[CAS]
 #if[AtomicAdd]
 
     @ForceInline
-    static $type$ getAndAdd(VarHandle ob, Object obb, Object encl, long base, long offset, $type$ delta) {
-        VarHandleSegmentViewBase handle = (VarHandleSegmentViewBase)ob;
-        AbstractMemorySegmentImpl bb = checkSegment(obb, encl, base, false);
+    static $type$ getAndAdd(VarHandle ob, Object obb, long base, $type$ value) {
+        return getAndAdd(ob, obb, base, ((SegmentVarHandle) ob).offset, value);
+    }
+
+    @ForceInline
+    static $type$ getAndAdd(VarHandle ob, Object obb, long base, long offset, $type$ delta) {
+        SegmentVarHandle handle = (SegmentVarHandle)ob;
+        AbstractMemorySegmentImpl bb = handle.checkSegment(obb, base, false);
+#if[!byte]
         if (handle.be == BE) {
+#end[byte]
             return SCOPED_MEMORY_ACCESS.getAndAdd$RawType$(bb.sessionImpl(),
                     bb.unsafeGetBase(),
-                    offsetNonPlain(bb, base, offset, handle.alignmentMask),
+                    offset(bb, base, offset),
                     delta);
+#if[!byte]
         } else {
-            return getAndAddConvEndianWithCAS(bb, offsetNonPlain(bb, base, offset, handle.alignmentMask), delta);
+            return getAndAddConvEndianWithCAS(bb, offset(bb, base, offset), delta);
         }
+#end[byte]
     }
 
     @ForceInline
-    static $type$ getAndAddAcquire(VarHandle ob, Object obb, Object encl, long base, long offset, $type$ delta) {
-        VarHandleSegmentViewBase handle = (VarHandleSegmentViewBase)ob;
-        AbstractMemorySegmentImpl bb = checkSegment(obb, encl, base, false);
+    static $type$ getAndAddAcquire(VarHandle ob, Object obb, long base, $type$ value) {
+        return getAndAddAcquire(ob, obb, base, ((SegmentVarHandle) ob).offset, value);
+    }
+
+    @ForceInline
+    static $type$ getAndAddAcquire(VarHandle ob, Object obb, long base, long offset, $type$ delta) {
+        SegmentVarHandle handle = (SegmentVarHandle)ob;
+        AbstractMemorySegmentImpl bb = handle.checkSegment(obb, base, false);
+#if[!byte]
         if (handle.be == BE) {
+#end[byte]
             return SCOPED_MEMORY_ACCESS.getAndAdd$RawType$Acquire(bb.sessionImpl(),
                     bb.unsafeGetBase(),
-                    offsetNonPlain(bb, base, offset, handle.alignmentMask),
+                    offset(bb, base, offset),
                     delta);
+#if[!byte]
         } else {
-            return getAndAddConvEndianWithCAS(bb, offsetNonPlain(bb, base, offset, handle.alignmentMask), delta);
+            return getAndAddConvEndianWithCAS(bb, offset(bb, base, offset), delta);
         }
+#end[byte]
     }
 
     @ForceInline
-    static $type$ getAndAddRelease(VarHandle ob, Object obb, Object encl, long base, long offset, $type$ delta) {
-        VarHandleSegmentViewBase handle = (VarHandleSegmentViewBase)ob;
-        AbstractMemorySegmentImpl bb = checkSegment(obb, encl, base, false);
+    static $type$ getAndAddRelease(VarHandle ob, Object obb, long base, $type$ value) {
+        return getAndAddRelease(ob, obb, base, ((SegmentVarHandle) ob).offset, value);
+    }
+
+    @ForceInline
+    static $type$ getAndAddRelease(VarHandle ob, Object obb, long base, long offset, $type$ delta) {
+        SegmentVarHandle handle = (SegmentVarHandle)ob;
+        AbstractMemorySegmentImpl bb = handle.checkSegment(obb, base, false);
+#if[!byte]
         if (handle.be == BE) {
+#end[byte]
             return SCOPED_MEMORY_ACCESS.getAndAdd$RawType$Release(bb.sessionImpl(),
                     bb.unsafeGetBase(),
-                    offsetNonPlain(bb, base, offset, handle.alignmentMask),
+                    offset(bb, base, offset),
                     delta);
+#if[!byte]
         } else {
-            return getAndAddConvEndianWithCAS(bb, offsetNonPlain(bb, base, offset, handle.alignmentMask), delta);
+            return getAndAddConvEndianWithCAS(bb, offset(bb, base, offset), delta);
         }
+#end[byte]
     }
+#if[!byte]
 
     @ForceInline
     static $type$ getAndAddConvEndianWithCAS(AbstractMemorySegmentImpl  bb, long offset, $type$ delta) {
@@ -398,53 +493,82 @@ final class VarHandleSegmentAs$Type$s extends VarHandleSegmentViewBase {
             nativeExpectedValue = SCOPED_MEMORY_ACCESS.get$RawType$Volatile(bb.sessionImpl(),base, offset);
             expectedValue = $RawBoxType$.reverseBytes(nativeExpectedValue);
         } while (!SCOPED_MEMORY_ACCESS.weakCompareAndSet$RawType$(bb.sessionImpl(),base, offset,
-                nativeExpectedValue, $RawBoxType$.reverseBytes(expectedValue + delta)));
+                nativeExpectedValue, $RawBoxType$.reverseBytes({#if[ShorterThanInt]?($type$) }(expectedValue + delta))));
         return expectedValue;
     }
+#end[byte]
 #end[AtomicAdd]
 #if[Bitwise]
 
     @ForceInline
-    static $type$ getAndBitwiseOr(VarHandle ob, Object obb, Object encl, long base, long offset, $type$ value) {
-        VarHandleSegmentViewBase handle = (VarHandleSegmentViewBase)ob;
-        AbstractMemorySegmentImpl bb = checkSegment(obb, encl, base, false);
+    static $type$ getAndBitwiseOr(VarHandle ob, Object obb, long base, $type$ value) {
+        return getAndBitwiseOr(ob, obb, base, ((SegmentVarHandle) ob).offset, value);
+    }
+
+    @ForceInline
+    static $type$ getAndBitwiseOr(VarHandle ob, Object obb, long base, long offset, $type$ value) {
+        SegmentVarHandle handle = (SegmentVarHandle)ob;
+        AbstractMemorySegmentImpl bb = handle.checkSegment(obb, base, false);
+#if[!byte]
         if (handle.be == BE) {
+#end[byte]
             return SCOPED_MEMORY_ACCESS.getAndBitwiseOr$RawType$(bb.sessionImpl(),
                     bb.unsafeGetBase(),
-                    offsetNonPlain(bb, base, offset, handle.alignmentMask),
+                    offset(bb, base, offset),
                     value);
+#if[!byte]
         } else {
-            return getAndBitwiseOrConvEndianWithCAS(bb, offsetNonPlain(bb, base, offset, handle.alignmentMask), value);
+            return getAndBitwiseOrConvEndianWithCAS(bb, offset(bb, base, offset), value);
         }
+#end[byte]
     }
 
     @ForceInline
-    static $type$ getAndBitwiseOrRelease(VarHandle ob, Object obb, Object encl, long base, long offset, $type$ value) {
-        VarHandleSegmentViewBase handle = (VarHandleSegmentViewBase)ob;
-        AbstractMemorySegmentImpl bb = checkSegment(obb, encl, base, false);
+    static $type$ getAndBitwiseOrRelease(VarHandle ob, Object obb, long base, $type$ value) {
+        return getAndBitwiseOrRelease(ob, obb, base, ((SegmentVarHandle) ob).offset, value);
+    }
+
+    @ForceInline
+    static $type$ getAndBitwiseOrRelease(VarHandle ob, Object obb, long base, long offset, $type$ value) {
+        SegmentVarHandle handle = (SegmentVarHandle)ob;
+        AbstractMemorySegmentImpl bb = handle.checkSegment(obb, base, false);
+#if[!byte]
         if (handle.be == BE) {
+#end[byte]
             return SCOPED_MEMORY_ACCESS.getAndBitwiseOr$RawType$Release(bb.sessionImpl(),
                     bb.unsafeGetBase(),
-                    offsetNonPlain(bb, base, offset, handle.alignmentMask),
+                    offset(bb, base, offset),
                     value);
+#if[!byte]
         } else {
-            return getAndBitwiseOrConvEndianWithCAS(bb, offsetNonPlain(bb, base, offset, handle.alignmentMask), value);
+            return getAndBitwiseOrConvEndianWithCAS(bb, offset(bb, base, offset), value);
         }
+#end[byte]
     }
 
     @ForceInline
-    static $type$ getAndBitwiseOrAcquire(VarHandle ob, Object obb, Object encl, long base, long offset, $type$ value) {
-        VarHandleSegmentViewBase handle = (VarHandleSegmentViewBase)ob;
-        AbstractMemorySegmentImpl bb = checkSegment(obb, encl, base, false);
+    static $type$ getAndBitwiseOrAcquire(VarHandle ob, Object obb, long base, $type$ value) {
+        return getAndBitwiseOrAcquire(ob, obb, base, ((SegmentVarHandle) ob).offset, value);
+    }
+
+    @ForceInline
+    static $type$ getAndBitwiseOrAcquire(VarHandle ob, Object obb, long base, long offset, $type$ value) {
+        SegmentVarHandle handle = (SegmentVarHandle)ob;
+        AbstractMemorySegmentImpl bb = handle.checkSegment(obb, base, false);
+#if[!byte]
         if (handle.be == BE) {
+#end[byte]
             return SCOPED_MEMORY_ACCESS.getAndBitwiseOr$RawType$Acquire(bb.sessionImpl(),
                     bb.unsafeGetBase(),
-                    offsetNonPlain(bb, base, offset, handle.alignmentMask),
+                    offset(bb, base, offset),
                     value);
+#if[!byte]
         } else {
-            return getAndBitwiseOrConvEndianWithCAS(bb, offsetNonPlain(bb, base, offset, handle.alignmentMask), value);
+            return getAndBitwiseOrConvEndianWithCAS(bb, offset(bb, base, offset), value);
         }
+#end[byte]
     }
+#if[!byte]
 
     @ForceInline
     static $type$ getAndBitwiseOrConvEndianWithCAS(AbstractMemorySegmentImpl  bb, long offset, $type$ value) {
@@ -454,51 +578,81 @@ final class VarHandleSegmentAs$Type$s extends VarHandleSegmentViewBase {
             nativeExpectedValue = SCOPED_MEMORY_ACCESS.get$RawType$Volatile(bb.sessionImpl(),base, offset);
             expectedValue = $RawBoxType$.reverseBytes(nativeExpectedValue);
         } while (!SCOPED_MEMORY_ACCESS.weakCompareAndSet$RawType$(bb.sessionImpl(),base, offset,
-                nativeExpectedValue, $RawBoxType$.reverseBytes(expectedValue | value)));
+                nativeExpectedValue, $RawBoxType$.reverseBytes({#if[ShorterThanInt]?($type$) }(expectedValue | value))));
         return expectedValue;
     }
+#end[byte]
 
     @ForceInline
-    static $type$ getAndBitwiseAnd(VarHandle ob, Object obb, Object encl, long base, long offset, $type$ value) {
-        VarHandleSegmentViewBase handle = (VarHandleSegmentViewBase)ob;
-        AbstractMemorySegmentImpl bb = checkSegment(obb, encl, base, false);
+    static $type$ getAndBitwiseAnd(VarHandle ob, Object obb, long base, $type$ value) {
+        return getAndBitwiseAnd(ob, obb, base, ((SegmentVarHandle) ob).offset, value);
+    }
+
+    @ForceInline
+    static $type$ getAndBitwiseAnd(VarHandle ob, Object obb, long base, long offset, $type$ value) {
+        SegmentVarHandle handle = (SegmentVarHandle)ob;
+        AbstractMemorySegmentImpl bb = handle.checkSegment(obb, base, false);
+#if[!byte]
         if (handle.be == BE) {
+#end[byte]
             return SCOPED_MEMORY_ACCESS.getAndBitwiseAnd$RawType$(bb.sessionImpl(),
                     bb.unsafeGetBase(),
-                    offsetNonPlain(bb, base, offset, handle.alignmentMask),
+                    offset(bb, base, offset),
                     value);
+#if[!byte]
         } else {
-            return getAndBitwiseAndConvEndianWithCAS(bb, offsetNonPlain(bb, base, offset, handle.alignmentMask), value);
+            return getAndBitwiseAndConvEndianWithCAS(bb, offset(bb, base, offset), value);
         }
+#end[byte]
     }
 
     @ForceInline
-    static $type$ getAndBitwiseAndRelease(VarHandle ob, Object obb, Object encl, long base, long offset, $type$ value) {
-        VarHandleSegmentViewBase handle = (VarHandleSegmentViewBase)ob;
-        AbstractMemorySegmentImpl bb = checkSegment(obb, encl, base, false);
+    static $type$ getAndBitwiseAndRelease(VarHandle ob, Object obb, long base, $type$ value) {
+        return getAndBitwiseAndRelease(ob, obb, base, ((SegmentVarHandle) ob).offset, value);
+    }
+
+    @ForceInline
+    static $type$ getAndBitwiseAndRelease(VarHandle ob, Object obb, long base, long offset, $type$ value) {
+        SegmentVarHandle handle = (SegmentVarHandle)ob;
+        AbstractMemorySegmentImpl bb = handle.checkSegment(obb, base, false);
+#if[!byte]
         if (handle.be == BE) {
+#end[byte]
             return SCOPED_MEMORY_ACCESS.getAndBitwiseAnd$RawType$Release(bb.sessionImpl(),
                     bb.unsafeGetBase(),
-                    offsetNonPlain(bb, base, offset, handle.alignmentMask),
+                    offset(bb, base, offset),
                     value);
+#if[!byte]
         } else {
-            return getAndBitwiseAndConvEndianWithCAS(bb, offsetNonPlain(bb, base, offset, handle.alignmentMask), value);
+            return getAndBitwiseAndConvEndianWithCAS(bb, offset(bb, base, offset), value);
         }
+#end[byte]
     }
 
     @ForceInline
-    static $type$ getAndBitwiseAndAcquire(VarHandle ob, Object obb, Object encl, long base, long offset, $type$ value) {
-        VarHandleSegmentViewBase handle = (VarHandleSegmentViewBase)ob;
-        AbstractMemorySegmentImpl bb = checkSegment(obb, encl, base, false);
+    static $type$ getAndBitwiseAndAcquire(VarHandle ob, Object obb, long base, $type$ value) {
+        return getAndBitwiseAndAcquire(ob, obb, base, ((SegmentVarHandle) ob).offset, value);
+    }
+
+
+    @ForceInline
+    static $type$ getAndBitwiseAndAcquire(VarHandle ob, Object obb, long base, long offset, $type$ value) {
+        SegmentVarHandle handle = (SegmentVarHandle)ob;
+        AbstractMemorySegmentImpl bb = handle.checkSegment(obb, base, false);
+#if[!byte]
         if (handle.be == BE) {
+#end[byte]
             return SCOPED_MEMORY_ACCESS.getAndBitwiseAnd$RawType$Acquire(bb.sessionImpl(),
                     bb.unsafeGetBase(),
-                    offsetNonPlain(bb, base, offset, handle.alignmentMask),
+                    offset(bb, base, offset),
                     value);
+#if[!byte]
         } else {
-            return getAndBitwiseAndConvEndianWithCAS(bb, offsetNonPlain(bb, base, offset, handle.alignmentMask), value);
+            return getAndBitwiseAndConvEndianWithCAS(bb, offset(bb, base, offset), value);
         }
+#end[byte]
     }
+#if[!byte]
 
     @ForceInline
     static $type$ getAndBitwiseAndConvEndianWithCAS(AbstractMemorySegmentImpl  bb, long offset, $type$ value) {
@@ -508,52 +662,80 @@ final class VarHandleSegmentAs$Type$s extends VarHandleSegmentViewBase {
             nativeExpectedValue = SCOPED_MEMORY_ACCESS.get$RawType$Volatile(bb.sessionImpl(),base, offset);
             expectedValue = $RawBoxType$.reverseBytes(nativeExpectedValue);
         } while (!SCOPED_MEMORY_ACCESS.weakCompareAndSet$RawType$(bb.sessionImpl(),base, offset,
-                nativeExpectedValue, $RawBoxType$.reverseBytes(expectedValue & value)));
+                nativeExpectedValue, $RawBoxType$.reverseBytes({#if[ShorterThanInt]?($type$) }(expectedValue & value))));
         return expectedValue;
     }
-
+#end[byte]
 
     @ForceInline
-    static $type$ getAndBitwiseXor(VarHandle ob, Object obb, Object encl, long base, long offset, $type$ value) {
-        VarHandleSegmentViewBase handle = (VarHandleSegmentViewBase)ob;
-        AbstractMemorySegmentImpl bb = checkSegment(obb, encl, base, false);
+    static $type$ getAndBitwiseXor(VarHandle ob, Object obb, long base, $type$ value) {
+        return getAndBitwiseXor(ob, obb, base, ((SegmentVarHandle) ob).offset, value);
+    }
+
+    @ForceInline
+    static $type$ getAndBitwiseXor(VarHandle ob, Object obb, long base, long offset, $type$ value) {
+        SegmentVarHandle handle = (SegmentVarHandle)ob;
+        AbstractMemorySegmentImpl bb = handle.checkSegment(obb, base, false);
+#if[!byte]
         if (handle.be == BE) {
+#end[byte]
             return SCOPED_MEMORY_ACCESS.getAndBitwiseXor$RawType$(bb.sessionImpl(),
                     bb.unsafeGetBase(),
-                    offsetNonPlain(bb, base, offset, handle.alignmentMask),
+                    offset(bb, base, offset),
                     value);
+#if[!byte]
         } else {
-            return getAndBitwiseXorConvEndianWithCAS(bb, offsetNonPlain(bb, base, offset, handle.alignmentMask), value);
+            return getAndBitwiseXorConvEndianWithCAS(bb, offset(bb, base, offset), value);
         }
+#end[byte]
     }
 
     @ForceInline
-    static $type$ getAndBitwiseXorRelease(VarHandle ob, Object obb, Object encl, long base, long offset, $type$ value) {
-        VarHandleSegmentViewBase handle = (VarHandleSegmentViewBase)ob;
-        AbstractMemorySegmentImpl bb = checkSegment(obb, encl, base, false);
+    static $type$ getAndBitwiseXorRelease(VarHandle ob, Object obb, long base, $type$ value) {
+        return getAndBitwiseXorRelease(ob, obb, base, ((SegmentVarHandle) ob).offset, value);
+    }
+
+    @ForceInline
+    static $type$ getAndBitwiseXorRelease(VarHandle ob, Object obb, long base, long offset, $type$ value) {
+        SegmentVarHandle handle = (SegmentVarHandle)ob;
+        AbstractMemorySegmentImpl bb = handle.checkSegment(obb, base, false);
+#if[!byte]
         if (handle.be == BE) {
+#end[byte]
             return SCOPED_MEMORY_ACCESS.getAndBitwiseXor$RawType$Release(bb.sessionImpl(),
                     bb.unsafeGetBase(),
-                    offsetNonPlain(bb, base, offset, handle.alignmentMask),
+                    offset(bb, base, offset),
                     value);
+#if[!byte]
         } else {
-            return getAndBitwiseXorConvEndianWithCAS(bb, offsetNonPlain(bb, base, offset, handle.alignmentMask), value);
+            return getAndBitwiseXorConvEndianWithCAS(bb, offset(bb, base, offset), value);
         }
+#end[byte]
     }
 
     @ForceInline
-    static $type$ getAndBitwiseXorAcquire(VarHandle ob, Object obb, Object encl, long base, long offset, $type$ value) {
-        VarHandleSegmentViewBase handle = (VarHandleSegmentViewBase)ob;
-        AbstractMemorySegmentImpl bb = checkSegment(obb, encl, base, false);
+    static $type$ getAndBitwiseXorAcquire(VarHandle ob, Object obb, long base, $type$ value) {
+        return getAndBitwiseXorAcquire(ob, obb, base, ((SegmentVarHandle) ob).offset, value);
+    }
+
+    @ForceInline
+    static $type$ getAndBitwiseXorAcquire(VarHandle ob, Object obb, long base, long offset, $type$ value) {
+        SegmentVarHandle handle = (SegmentVarHandle)ob;
+        AbstractMemorySegmentImpl bb = handle.checkSegment(obb, base, false);
+#if[!byte]
         if (handle.be == BE) {
+#end[byte]
             return SCOPED_MEMORY_ACCESS.getAndBitwiseXor$RawType$Acquire(bb.sessionImpl(),
                     bb.unsafeGetBase(),
-                    offsetNonPlain(bb, base, offset, handle.alignmentMask),
+                    offset(bb, base, offset),
                     value);
+#if[!byte]
         } else {
-            return getAndBitwiseXorConvEndianWithCAS(bb, offsetNonPlain(bb, base, offset, handle.alignmentMask), value);
+            return getAndBitwiseXorConvEndianWithCAS(bb, offset(bb, base, offset), value);
         }
+#end[byte]
     }
+#if[!byte]
 
     @ForceInline
     static $type$ getAndBitwiseXorConvEndianWithCAS(AbstractMemorySegmentImpl  bb, long offset, $type$ value) {
@@ -563,8 +745,9 @@ final class VarHandleSegmentAs$Type$s extends VarHandleSegmentViewBase {
             nativeExpectedValue = SCOPED_MEMORY_ACCESS.get$RawType$Volatile(bb.sessionImpl(),base, offset);
             expectedValue = $RawBoxType$.reverseBytes(nativeExpectedValue);
         } while (!SCOPED_MEMORY_ACCESS.weakCompareAndSet$RawType$(bb.sessionImpl(),base, offset,
-                nativeExpectedValue, $RawBoxType$.reverseBytes(expectedValue ^ value)));
+                nativeExpectedValue, $RawBoxType$.reverseBytes({#if[ShorterThanInt]?($type$) }(expectedValue ^ value))));
         return expectedValue;
     }
+#end[byte]
 #end[Bitwise]
 }
diff --git a/src/java.base/share/classes/jdk/internal/access/JavaLangInvokeAccess.java b/src/java.base/share/classes/jdk/internal/access/JavaLangInvokeAccess.java
index 563870381fe..722447eece6 100644
--- a/src/java.base/share/classes/jdk/internal/access/JavaLangInvokeAccess.java
+++ b/src/java.base/share/classes/jdk/internal/access/JavaLangInvokeAccess.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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 @@ package jdk.internal.access;
 
 import jdk.internal.foreign.abi.NativeEntryPoint;
 
+import java.lang.foreign.MemoryLayout;
 import java.lang.invoke.MethodHandle;
-import java.lang.invoke.MethodHandles.Lookup;
 import java.lang.invoke.MethodType;
 import java.lang.invoke.VarHandle;
 import java.lang.reflect.Constructor;
@@ -75,7 +75,7 @@ public interface JavaLangInvokeAccess {
      * Used by {@code jdk.internal.foreign.LayoutPath} and
      * {@code java.lang.invoke.MethodHandles}.
      */
-    VarHandle memorySegmentViewHandle(Class<?> carrier, long alignmentMask, ByteOrder order);
+    VarHandle memorySegmentViewHandle(Class<?> carrier, MemoryLayout enclosing, long alignmentMask, ByteOrder order, boolean constantOffset, long offset);
 
     /**
      * Var handle carrier combinator.
diff --git a/src/java.base/share/classes/jdk/internal/foreign/LayoutPath.java b/src/java.base/share/classes/jdk/internal/foreign/LayoutPath.java
index 58552d44ea4..11407de93a9 100644
--- a/src/java.base/share/classes/jdk/internal/foreign/LayoutPath.java
+++ b/src/java.base/share/classes/jdk/internal/foreign/LayoutPath.java
@@ -59,6 +59,7 @@ public class LayoutPath {
     private static final long[] EMPTY_STRIDES = new long[0];
     private static final long[] EMPTY_BOUNDS = new long[0];
     private static final MethodHandle[] EMPTY_DEREF_HANDLES = new MethodHandle[0];
+    public static final MemoryLayout.PathElement[] EMPTY_PATH_ELEMENTS = new MemoryLayout.PathElement[0];
 
     private static final MethodHandle MH_ADD_SCALED_OFFSET;
     private static final MethodHandle MH_SLICE;
@@ -205,15 +206,13 @@ public class LayoutPath {
                     String.format("Path does not select a value layout: %s", breadcrumbs()));
         }
 
-        VarHandle handle = Utils.makeRawSegmentViewVarHandle(valueLayout);              // (MS, ML, long, long)
-        handle = MethodHandles.insertCoordinates(handle, 1, rootLayout());          // (MS, long, long)
-        if (strides.length > 0) {
-            MethodHandle offsetAdapter = offsetHandle();
+        boolean constantOffset = strides.length == 0;
+        // (MS, long, long) if variable offset, (MS, long) if constant offset
+        VarHandle handle = Utils.makeRawSegmentViewVarHandle(rootLayout(), valueLayout, constantOffset, offset);
+        if (!constantOffset) {
+            MethodHandle offsetAdapter = offsetHandle();  // Adapter performs the bound checks
             offsetAdapter = MethodHandles.insertArguments(offsetAdapter, 0, 0L);
             handle = MethodHandles.collectCoordinates(handle, 2, offsetAdapter);    // (MS, long)
-        } else {
-            // simpler adaptation
-            handle = MethodHandles.insertCoordinates(handle, 2, offset);            // (MS, long)
         }
 
         if (adapt) {
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 391a46c092c..4214b0395b8 100644
--- a/src/java.base/share/classes/jdk/internal/foreign/Utils.java
+++ b/src/java.base/share/classes/jdk/internal/foreign/Utils.java
@@ -1,27 +1,26 @@
 /*
- *  Copyright (c) 2019, 2025, Oracle and/or its affiliates. All rights reserved.
- *  DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * Copyright (c) 2019, 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- *  This code is free software; you can redistribute 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 free software; you can redistribute 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).
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
  *
- *  You should have received a copy of the GNU General Public License version
- *  2 along with this work; if not, write to the Free Software Foundation,
- *  Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- *   Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- *  or visit www.oracle.com if you need additional information or have any
- *  questions.
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
  *
+ * Please 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.foreign;
@@ -34,7 +33,6 @@ import sun.invoke.util.Wrapper;
 
 import java.lang.foreign.AddressLayout;
 import java.lang.foreign.MemoryLayout;
-import java.lang.foreign.MemoryLayout.PathElement;
 import java.lang.foreign.MemorySegment;
 import java.lang.foreign.StructLayout;
 import java.lang.foreign.ValueLayout;
@@ -46,6 +44,7 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
+import java.util.function.Function;
 import java.util.function.Supplier;
 
 /**
@@ -56,25 +55,31 @@ public final class Utils {
     // Suppresses default constructor, ensuring non-instantiability.
     private Utils() {}
 
-    private static final MethodHandle BYTE_TO_BOOL;
-    private static final MethodHandle BOOL_TO_BYTE;
-    private static final MethodHandle ADDRESS_TO_LONG;
+    private static final Class<?> ADDRESS_CARRIER_TYPE;
+    private static final MethodHandle LONG_TO_CARRIER;
     private static final MethodHandle LONG_TO_ADDRESS_TARGET;
     private static final MethodHandle LONG_TO_ADDRESS_NO_TARGET;
 
     static {
+        MethodHandles.Lookup lookup = MethodHandles.lookup();
+        String unboxSegmentName;
+        Class<?> rawAddressType;
+        if (Unsafe.getUnsafe().addressSize() == 8) {
+            unboxSegmentName = "unboxSegment";
+            rawAddressType = long.class;
+        } else {
+            assert Unsafe.getUnsafe().addressSize() == 4 : Unsafe.getUnsafe().addressSize();
+            unboxSegmentName = "unboxSegment32";
+            rawAddressType = int.class;
+        }
+        ADDRESS_CARRIER_TYPE = rawAddressType;
         try {
-            MethodHandles.Lookup lookup = MethodHandles.lookup();
-            BYTE_TO_BOOL = lookup.findStatic(Utils.class, "byteToBoolean",
-                    MethodType.methodType(boolean.class, byte.class));
-            BOOL_TO_BYTE = lookup.findStatic(Utils.class, "booleanToByte",
-                    MethodType.methodType(byte.class, boolean.class));
-            ADDRESS_TO_LONG = lookup.findStatic(SharedUtils.class, "unboxSegment",
-                    MethodType.methodType(long.class, MemorySegment.class));
+            LONG_TO_CARRIER = lookup.findStatic(SharedUtils.class, unboxSegmentName,
+                    MethodType.methodType(rawAddressType, MemorySegment.class));
             LONG_TO_ADDRESS_TARGET = lookup.findStatic(Utils.class, "longToAddress",
-                    MethodType.methodType(MemorySegment.class, long.class, AddressLayout.class));
+                    MethodType.methodType(MemorySegment.class, rawAddressType, AddressLayout.class));
             LONG_TO_ADDRESS_NO_TARGET = lookup.findStatic(Utils.class, "longToAddress",
-                    MethodType.methodType(MemorySegment.class, long.class));
+                    MethodType.methodType(MemorySegment.class, rawAddressType));
         } catch (Throwable ex) {
             throw new ExceptionInInitializerError(ex);
         }
@@ -90,48 +95,57 @@ public final class Utils {
     }
 
     /**
-     * This method returns a <em>raw var handle</em>, that is, a var handle that does not perform any size
-     * or alignment checks. Such checks are added (using adaptation) by {@link LayoutPath#dereferenceHandle()}.
+     * This method returns a var handle that accesses a target layout in an enclosing layout, taking the memory offset
+     * and the base offset of the enclosing layout in the segment.
+     * <p>
+     * If the offset of the target layout in the enclosing layout is constant, the coordinates are (MS, long).
+     * If the offset of the target layout in the enclosing layout is variable, the coordinates are (MS, long, long).
+     * The trailing long is a pre-validated, variable extra offset, which the var handle does not perform any size or
+     * alignment checks against. Such checks are added (using adaptation) by {@link LayoutPath#dereferenceHandle()}.
      * <p>
      * We provide two level of caching of the generated var handles. First, the var handle associated
      * with a {@link ValueLayout#varHandle()} call is cached inside a stable field of the value layout implementation.
      * This optimizes common code idioms like {@code JAVA_INT.varHandle().getInt(...)}. A second layer of caching
-     * is then provided by this method: after all, var handles constructed by {@link MemoryLayout#varHandle(PathElement...)}
-     * will be obtained by adapting some raw var handle generated by this method.
+     * is then provided by this method, so different value layouts with same effects can reuse var handle instances.
+     * (The 2nd layer may be redundant in the long run)
      *
-     * @param layout the value layout for which a raw memory segment var handle is to be created.
-     * @return a raw memory segment var handle.
+     * @param enclosing the enclosing context of the value layout
+     * @param layout the value layout for which a raw memory segment var handle is to be created
+     * @param constantOffset if the VH carries a constant offset instead of taking a variable offset
+     * @param offset the offset if it is a constant
+     * @return a raw memory segment var handle
      */
-    public static VarHandle makeRawSegmentViewVarHandle(ValueLayout layout) {
-        final class VarHandleCache {
-            private static final Map<ValueLayout, VarHandle> HANDLE_MAP = new ConcurrentHashMap<>();
+    public static VarHandle makeRawSegmentViewVarHandle(MemoryLayout enclosing, ValueLayout layout, boolean constantOffset, long offset) {
+        if (enclosing instanceof ValueLayout direct) {
+            assert direct.equals(layout) && constantOffset && offset == 0;
+            record VarHandleCache() implements Function<ValueLayout, VarHandle> {
+                private static final Map<ValueLayout, VarHandle> HANDLE_MAP = new ConcurrentHashMap<>();
+                private static final VarHandleCache INSTANCE = new VarHandleCache();
+
+                @Override
+                public VarHandle apply(ValueLayout valueLayout) {
+                    return Utils.makeRawSegmentViewVarHandleInternal(valueLayout, valueLayout, true, 0);
+                }
+            }
+            return VarHandleCache.HANDLE_MAP.computeIfAbsent(direct.withoutName(), VarHandleCache.INSTANCE);
         }
-        return VarHandleCache.HANDLE_MAP
-                .computeIfAbsent(layout.withoutName(), Utils::makeRawSegmentViewVarHandleInternal);
+        return makeRawSegmentViewVarHandleInternal(enclosing, layout, constantOffset, offset);
     }
 
-    private static VarHandle makeRawSegmentViewVarHandleInternal(ValueLayout layout) {
+    private static VarHandle makeRawSegmentViewVarHandleInternal(MemoryLayout enclosing, ValueLayout layout, boolean constantOffset, long offset) {
         Class<?> baseCarrier = layout.carrier();
         if (layout.carrier() == MemorySegment.class) {
-            baseCarrier = switch ((int) ValueLayout.ADDRESS.byteSize()) {
-                case Long.BYTES -> long.class;
-                case Integer.BYTES -> int.class;
-                default -> throw new UnsupportedOperationException("Unsupported address layout");
-            };
-        } else if (layout.carrier() == boolean.class) {
-            baseCarrier = byte.class;
+            baseCarrier = ADDRESS_CARRIER_TYPE;
         }
 
         VarHandle handle = SharedSecrets.getJavaLangInvokeAccess().memorySegmentViewHandle(baseCarrier,
-                layout.byteAlignment() - 1, layout.order());
+                enclosing, layout.byteAlignment() - 1, layout.order(), constantOffset, offset);
 
-        if (layout.carrier() == boolean.class) {
-            handle = MethodHandles.filterValue(handle, BOOL_TO_BYTE, BYTE_TO_BOOL);
-        } else if (layout instanceof AddressLayout addressLayout) {
+        if (layout instanceof AddressLayout addressLayout) {
             MethodHandle longToAddressAdapter = addressLayout.targetLayout().isPresent() ?
                     MethodHandles.insertArguments(LONG_TO_ADDRESS_TARGET, 1, addressLayout) :
                     LONG_TO_ADDRESS_NO_TARGET;
-            handle = MethodHandles.filterValue(handle, ADDRESS_TO_LONG, longToAddressAdapter);
+            handle = MethodHandles.filterValue(handle, LONG_TO_CARRIER, longToAddressAdapter);
         }
         return handle;
     }
@@ -149,11 +163,23 @@ public final class Utils {
         return longToAddress(addr, 0, 1);
     }
 
+    // 32 bit
+    @ForceInline
+    public static MemorySegment longToAddress(int addr) {
+        return longToAddress(addr, 0, 1);
+    }
+
     @ForceInline
     public static MemorySegment longToAddress(long addr, AddressLayout layout) {
         return longToAddress(addr, pointeeByteSize(layout), pointeeByteAlign(layout));
     }
 
+    // 32 bit
+    @ForceInline
+    public static MemorySegment longToAddress(int addr, AddressLayout layout) {
+        return longToAddress(addr, pointeeByteSize(layout), pointeeByteAlign(layout));
+    }
+
     @ForceInline
     public static MemorySegment longToAddress(long addr, long size, long align) {
         if (!isAligned(addr, align)) {
diff --git a/src/java.base/share/classes/jdk/internal/foreign/abi/SharedUtils.java b/src/java.base/share/classes/jdk/internal/foreign/abi/SharedUtils.java
index 9078920f677..17324894ac5 100644
--- a/src/java.base/share/classes/jdk/internal/foreign/abi/SharedUtils.java
+++ b/src/java.base/share/classes/jdk/internal/foreign/abi/SharedUtils.java
@@ -321,11 +321,20 @@ public final class SharedUtils {
         }
     }
 
+    @ForceInline
     public static long unboxSegment(MemorySegment segment) {
         checkNative(segment);
         return segment.address();
     }
 
+    @ForceInline
+    public static int unboxSegment32(MemorySegment segment) {
+        // This cast to 'int' is safe, because we only call this method on 32-bit
+        // platforms, where we know the address of a segment is truncated to 32-bits.
+        // There's a similar cast for 4-byte addresses in Unsafe.putAddress.
+        return (int) unboxSegment(segment);
+    }
+
     public static void checkExceptions(MethodHandle target) {
         Class<?>[] exceptions = JLIA.exceptionTypes(target);
         if (exceptions != null && exceptions.length != 0) {
diff --git a/src/java.base/share/classes/jdk/internal/foreign/layout/ValueLayouts.java b/src/java.base/share/classes/jdk/internal/foreign/layout/ValueLayouts.java
index e546773c429..685b95691ba 100644
--- a/src/java.base/share/classes/jdk/internal/foreign/layout/ValueLayouts.java
+++ b/src/java.base/share/classes/jdk/internal/foreign/layout/ValueLayouts.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
+ *  Copyright (c) 2019, 2025, Oracle and/or its affiliates. All rights reserved.
  *  DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  *  This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@
  */
 package jdk.internal.foreign.layout;
 
+import jdk.internal.foreign.LayoutPath;
 import jdk.internal.foreign.Utils;
 import jdk.internal.misc.Unsafe;
 import jdk.internal.reflect.CallerSensitive;
@@ -38,10 +39,8 @@ import java.lang.foreign.MemorySegment;
 import java.lang.foreign.ValueLayout;
 import java.lang.invoke.VarHandle;
 import java.nio.ByteOrder;
-import java.util.Map;
 import java.util.Objects;
 import java.util.Optional;
-import java.util.concurrent.ConcurrentHashMap;
 
 /**
  * A value layout. A value layout is used to model the memory layout associated with values of basic data types, such as <em>integral</em> types
@@ -159,19 +158,13 @@ public final class ValueLayouts {
 
         @ForceInline
         public final VarHandle varHandle() {
-            final class VarHandleCache {
-                private static final Map<ValueLayout, VarHandle> HANDLE_MAP = new ConcurrentHashMap<>();
+            var vh = handle;
+            if (vh == null) {
+                vh = varHandleInternal(LayoutPath.EMPTY_PATH_ELEMENTS);
+                // benign race stable field store is safe because VarHandle is thread safe
+                handle = vh;
             }
-            if (handle == null) {
-                // this store to stable field is safe, because return value of 'makeMemoryAccessVarHandle' has stable identity
-                handle = VarHandleCache.HANDLE_MAP.computeIfAbsent(self().withoutName(), _ -> varHandleInternal());
-            }
-            return handle;
-        }
-
-        @SuppressWarnings("unchecked")
-        final V self() {
-            return (V) this;
+            return vh;
         }
     }
 
diff --git a/src/java.base/share/classes/jdk/internal/invoke/MhUtil.java b/src/java.base/share/classes/jdk/internal/invoke/MhUtil.java
index 16a4e10221c..4a8cb785470 100644
--- a/src/java.base/share/classes/jdk/internal/invoke/MhUtil.java
+++ b/src/java.base/share/classes/jdk/internal/invoke/MhUtil.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2024, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -33,6 +33,9 @@ import java.lang.invoke.VarHandle;
 /**
  * Static factories for certain VarHandle/MethodHandle variants.
  * <p>
+ * Some methods take no receiver argument. In these cases, the receiver is the
+ * lookup class.
+ * <p>
  * The methods will throw an {@link InternalError} if the lookup fails.
  * <p>
  * Here is an example of how one of these methods could be used:
@@ -63,6 +66,11 @@ public final class MhUtil {
         }
     }
 
+    public static MethodHandle findVirtual(MethodHandles.Lookup lookup,
+                                           String name,
+                                           MethodType type) {
+        return findVirtual(lookup, lookup.lookupClass(), name, type);
+    }
 
     public static MethodHandle findVirtual(MethodHandles.Lookup lookup,
                                            Class<?> refc,
@@ -75,4 +83,21 @@ public final class MhUtil {
         }
     }
 
+    public static MethodHandle findStatic(MethodHandles.Lookup lookup,
+                                          String name,
+                                          MethodType type) {
+        return findStatic(lookup, lookup.lookupClass(), name, type);
+    }
+
+    public static MethodHandle findStatic(MethodHandles.Lookup lookup,
+                                          Class<?> refc,
+                                          String name,
+                                          MethodType type) {
+        try {
+            return lookup.findStatic(refc, name, type);
+        } catch (ReflectiveOperationException e) {
+            throw new InternalError(e);
+        }
+    }
+
 }
diff --git a/src/java.base/share/classes/jdk/internal/misc/X-ScopedMemoryAccess.java.template b/src/java.base/share/classes/jdk/internal/misc/X-ScopedMemoryAccess.java.template
index c2f5f7fabd0..158df7c8bb3 100644
--- a/src/java.base/share/classes/jdk/internal/misc/X-ScopedMemoryAccess.java.template
+++ b/src/java.base/share/classes/jdk/internal/misc/X-ScopedMemoryAccess.java.template
@@ -75,7 +75,7 @@ import jdk.internal.vm.vector.VectorSupport;
  * which might be deemed to expensive; in other words, this approach prioritizes the performance of memory access over
  * that of releasing a shared memory resource.
  */
-public class ScopedMemoryAccess {
+public final class ScopedMemoryAccess {
 
     private static final Unsafe UNSAFE = Unsafe.getUnsafe();
 
diff --git a/test/jdk/java/foreign/TestAccessModes.java b/test/jdk/java/foreign/TestAccessModes.java
index 0cedcc9058e..a721c87484d 100644
--- a/test/jdk/java/foreign/TestAccessModes.java
+++ b/test/jdk/java/foreign/TestAccessModes.java
@@ -61,6 +61,7 @@ public class TestAccessModes {
             // access is unaligned
             assertTrue(segment.maxByteAlignment() < layout.byteAlignment());
         }
+        assertEquals(varHandle.isAccessModeSupported(mode), compatible);
     }
 
     static ValueLayout accessLayout(MemoryLayout layout) {

From a87dd1a75f78cf872df49bea83ba48af8acfa2fd Mon Sep 17 00:00:00 2001
From: Alexander Matveev <almatvee@openjdk.org>
Date: Fri, 28 Feb 2025 20:22:23 +0000
Subject: [PATCH 175/587] 8347139: [macos] Test
 tools/jpackage/share/InOutPathTest.java  failed:  "execution error: Finder
 got an error: AppleEvent timed out."

Reviewed-by: asemenyuk
---
 test/jdk/tools/jpackage/share/IconTest.java      | 2 +-
 test/jdk/tools/jpackage/share/InOutPathTest.java | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/jdk/tools/jpackage/share/IconTest.java b/test/jdk/tools/jpackage/share/IconTest.java
index f5498500c0b..6d84714f28b 100644
--- a/test/jdk/tools/jpackage/share/IconTest.java
+++ b/test/jdk/tools/jpackage/share/IconTest.java
@@ -52,7 +52,7 @@ import jdk.jpackage.test.Annotations.Test;
  * @library /test/jdk/tools/jpackage/helpers
  * @build jdk.jpackage.test.*
  * @compile -Xlint:all -Werror IconTest.java
- * @run main/othervm/timeout=540 -Xmx512m
+ * @run main/othervm/timeout=720 -Xmx512m
  *  jdk.jpackage.test.Main
  *  --jpt-run=IconTest
  */
diff --git a/test/jdk/tools/jpackage/share/InOutPathTest.java b/test/jdk/tools/jpackage/share/InOutPathTest.java
index 2d9fa1671de..f5fe3c618ae 100644
--- a/test/jdk/tools/jpackage/share/InOutPathTest.java
+++ b/test/jdk/tools/jpackage/share/InOutPathTest.java
@@ -50,7 +50,7 @@ import jdk.jpackage.test.TKit;
  * @library /test/jdk/tools/jpackage/helpers
  * @build jdk.jpackage.test.*
  * @compile -Xlint:all -Werror InOutPathTest.java
- * @run main/othervm/timeout=360 -Xmx512m jdk.jpackage.test.Main
+ * @run main/othervm/timeout=720 -Xmx512m jdk.jpackage.test.Main
  *  --jpt-run=InOutPathTest
  */
 public final class InOutPathTest {

From 6b719eeebc346fd4655fc718d7d033b3ebf54d9e Mon Sep 17 00:00:00 2001
From: Alisen Chung <achung@openjdk.org>
Date: Fri, 28 Feb 2025 21:22:20 +0000
Subject: [PATCH 176/587] 8348596: Update FreeType to 2.13.3

Reviewed-by: azvegint, dnguyen, prr
---
 src/java.desktop/share/legal/freetype.md      |   46 +-
 .../include/freetype/config/ftconfig.h        |    2 +-
 .../include/freetype/config/ftheader.h        |    2 +-
 .../include/freetype/config/ftoption.h        |   18 +-
 .../include/freetype/config/ftstdlib.h        |    2 +-
 .../include/freetype/config/integer-types.h   |    2 +-
 .../include/freetype/config/mac-support.h     |    2 +-
 .../include/freetype/config/public-macros.h   |    2 +-
 .../libfreetype/include/freetype/freetype.h   |  118 +-
 .../libfreetype/include/freetype/ftadvanc.h   |    2 +-
 .../libfreetype/include/freetype/ftbbox.h     |    2 +-
 .../libfreetype/include/freetype/ftbdf.h      |    2 +-
 .../libfreetype/include/freetype/ftbitmap.h   |    2 +-
 .../libfreetype/include/freetype/ftcid.h      |    2 +-
 .../libfreetype/include/freetype/ftcolor.h    |    2 +-
 .../libfreetype/include/freetype/ftdriver.h   |   76 +-
 .../libfreetype/include/freetype/fterrdef.h   |    2 +-
 .../libfreetype/include/freetype/fterrors.h   |    2 +-
 .../libfreetype/include/freetype/ftfntfmt.h   |    2 +-
 .../libfreetype/include/freetype/ftgasp.h     |    2 +-
 .../libfreetype/include/freetype/ftglyph.h    |    2 +-
 .../libfreetype/include/freetype/ftgzip.h     |    2 +-
 .../libfreetype/include/freetype/ftimage.h    |   29 +-
 .../libfreetype/include/freetype/ftincrem.h   |    2 +-
 .../libfreetype/include/freetype/ftlcdfil.h   |    2 +-
 .../libfreetype/include/freetype/ftlist.h     |    2 +-
 .../libfreetype/include/freetype/ftlogging.h  |    2 +-
 .../libfreetype/include/freetype/ftmac.h      |    2 +-
 .../libfreetype/include/freetype/ftmm.h       |   33 +-
 .../libfreetype/include/freetype/ftmodapi.h   |    2 +-
 .../libfreetype/include/freetype/ftmoderr.h   |    2 +-
 .../libfreetype/include/freetype/ftoutln.h    |    4 +-
 .../libfreetype/include/freetype/ftparams.h   |    2 +-
 .../libfreetype/include/freetype/ftrender.h   |    2 +-
 .../libfreetype/include/freetype/ftsizes.h    |    2 +-
 .../libfreetype/include/freetype/ftsnames.h   |    2 +-
 .../libfreetype/include/freetype/ftstroke.h   |    2 +-
 .../libfreetype/include/freetype/ftsynth.h    |    2 +-
 .../libfreetype/include/freetype/ftsystem.h   |    2 +-
 .../libfreetype/include/freetype/fttrigon.h   |    2 +-
 .../libfreetype/include/freetype/fttypes.h    |    2 +-
 .../include/freetype/internal/autohint.h      |    2 +-
 .../include/freetype/internal/cffotypes.h     |    2 +-
 .../include/freetype/internal/cfftypes.h      |   10 +-
 .../freetype/internal/compiler-macros.h       |    2 +-
 .../include/freetype/internal/ftcalc.h        |   21 +-
 .../include/freetype/internal/ftdebug.h       |    2 +-
 .../include/freetype/internal/ftdrv.h         |    2 +-
 .../include/freetype/internal/ftgloadr.h      |    2 +-
 .../include/freetype/internal/ftmemory.h      |    9 +-
 .../include/freetype/internal/ftmmtypes.h     |    2 +-
 .../include/freetype/internal/ftobjs.h        |    8 +-
 .../include/freetype/internal/ftpsprop.h      |    2 +-
 .../include/freetype/internal/ftrfork.h       |    2 +-
 .../include/freetype/internal/ftserv.h        |    2 +-
 .../include/freetype/internal/ftstream.h      |    2 +-
 .../include/freetype/internal/fttrace.h       |    3 +-
 .../include/freetype/internal/ftvalid.h       |    2 +-
 .../include/freetype/internal/psaux.h         |   21 +-
 .../include/freetype/internal/pshints.h       |    2 +-
 .../freetype/internal/services/svbdf.h        |    2 +-
 .../freetype/internal/services/svcfftl.h      |    2 +-
 .../freetype/internal/services/svcid.h        |    2 +-
 .../freetype/internal/services/svfntfmt.h     |    2 +-
 .../freetype/internal/services/svgldict.h     |    2 +-
 .../freetype/internal/services/svgxval.h      |    2 +-
 .../freetype/internal/services/svkern.h       |    2 +-
 .../freetype/internal/services/svmetric.h     |    2 +-
 .../include/freetype/internal/services/svmm.h |    2 +-
 .../freetype/internal/services/svotval.h      |    2 +-
 .../freetype/internal/services/svpfr.h        |    2 +-
 .../freetype/internal/services/svpostnm.h     |    2 +-
 .../freetype/internal/services/svprop.h       |    2 +-
 .../freetype/internal/services/svpscmap.h     |    2 +-
 .../freetype/internal/services/svpsinfo.h     |    2 +-
 .../freetype/internal/services/svsfnt.h       |    2 +-
 .../freetype/internal/services/svttcmap.h     |    2 +-
 .../freetype/internal/services/svtteng.h      |    2 +-
 .../freetype/internal/services/svttglyf.h     |    2 +-
 .../freetype/internal/services/svwinfnt.h     |    2 +-
 .../include/freetype/internal/sfnt.h          |    9 +-
 .../include/freetype/internal/svginterface.h  |    2 +-
 .../include/freetype/internal/t1types.h       |   52 +-
 .../include/freetype/internal/tttypes.h       |   12 +-
 .../include/freetype/internal/wofftypes.h     |    2 +-
 .../libfreetype/include/freetype/otsvg.h      |    2 +-
 .../libfreetype/include/freetype/t1tables.h   |   60 +-
 .../libfreetype/include/freetype/ttnameid.h   |    2 +-
 .../libfreetype/include/freetype/tttables.h   |    7 +-
 .../libfreetype/include/freetype/tttags.h     |    2 +-
 .../native/libfreetype/include/ft2build.h     |    2 +-
 .../native/libfreetype/src/autofit/afblue.c   |    2 +-
 .../native/libfreetype/src/autofit/afblue.cin |    2 +-
 .../native/libfreetype/src/autofit/afblue.dat |    2 +-
 .../native/libfreetype/src/autofit/afblue.h   |    2 +-
 .../native/libfreetype/src/autofit/afblue.hin |    2 +-
 .../native/libfreetype/src/autofit/afcjk.c    |    2 +-
 .../native/libfreetype/src/autofit/afcjk.h    |    4 +-
 .../native/libfreetype/src/autofit/afcover.h  |    2 +-
 .../native/libfreetype/src/autofit/afdummy.c  |    2 +-
 .../native/libfreetype/src/autofit/afdummy.h  |    2 +-
 .../native/libfreetype/src/autofit/aferrors.h |    2 +-
 .../native/libfreetype/src/autofit/afglobal.c |    2 +-
 .../native/libfreetype/src/autofit/afglobal.h |    2 +-
 .../native/libfreetype/src/autofit/afhints.c  |   18 +-
 .../native/libfreetype/src/autofit/afhints.h  |    2 +-
 .../native/libfreetype/src/autofit/afindic.c  |    2 +-
 .../native/libfreetype/src/autofit/afindic.h  |    2 +-
 .../native/libfreetype/src/autofit/aflatin.c  |    9 +-
 .../native/libfreetype/src/autofit/aflatin.h  |    4 +-
 .../native/libfreetype/src/autofit/afloader.c |    2 +-
 .../native/libfreetype/src/autofit/afloader.h |    2 +-
 .../native/libfreetype/src/autofit/afmodule.c |    4 +-
 .../native/libfreetype/src/autofit/afmodule.h |    2 +-
 .../native/libfreetype/src/autofit/afranges.c |    2 +-
 .../native/libfreetype/src/autofit/afranges.h |    2 +-
 .../native/libfreetype/src/autofit/afscript.h |    2 +-
 .../native/libfreetype/src/autofit/afshaper.c |    2 +-
 .../native/libfreetype/src/autofit/afshaper.h |    2 +-
 .../native/libfreetype/src/autofit/afstyles.h |    2 +-
 .../native/libfreetype/src/autofit/aftypes.h  |    2 +-
 .../libfreetype/src/autofit/afws-decl.h       |    2 +-
 .../libfreetype/src/autofit/afws-iter.h       |    2 +-
 .../native/libfreetype/src/base/ftadvanc.c    |    2 +-
 .../native/libfreetype/src/base/ftbase.h      |    2 +-
 .../native/libfreetype/src/base/ftbbox.c      |    4 +-
 .../native/libfreetype/src/base/ftbitmap.c    |    2 +-
 .../native/libfreetype/src/base/ftcalc.c      |  169 +-
 .../share/native/libfreetype/src/base/ftcid.c |    2 +-
 .../native/libfreetype/src/base/ftcolor.c     |    2 +-
 .../native/libfreetype/src/base/ftdbgmem.c    |    2 +-
 .../native/libfreetype/src/base/ftdebug.c     |    2 +-
 .../native/libfreetype/src/base/ftfntfmt.c    |    2 +-
 .../native/libfreetype/src/base/ftfstype.c    |    2 +-
 .../native/libfreetype/src/base/ftgasp.c      |    2 +-
 .../native/libfreetype/src/base/ftgloadr.c    |   35 +-
 .../native/libfreetype/src/base/ftglyph.c     |    2 +-
 .../native/libfreetype/src/base/ftinit.c      |    2 +-
 .../native/libfreetype/src/base/ftlcdfil.c    |    2 +-
 .../share/native/libfreetype/src/base/ftmac.c |   21 +-
 .../share/native/libfreetype/src/base/ftmm.c  |    2 +-
 .../native/libfreetype/src/base/ftobjs.c      |    9 +-
 .../native/libfreetype/src/base/ftoutln.c     |   18 +-
 .../native/libfreetype/src/base/ftpatent.c    |    2 +-
 .../native/libfreetype/src/base/ftpsprop.c    |    2 +-
 .../native/libfreetype/src/base/ftrfork.c     |    2 +-
 .../native/libfreetype/src/base/ftsnames.c    |    2 +-
 .../native/libfreetype/src/base/ftstream.c    |    8 +-
 .../native/libfreetype/src/base/ftstroke.c    |   16 +-
 .../native/libfreetype/src/base/ftsynth.c     |    2 +-
 .../native/libfreetype/src/base/ftsystem.c    |    2 +-
 .../native/libfreetype/src/base/fttrigon.c    |    2 +-
 .../native/libfreetype/src/base/fttype1.c     |    2 +-
 .../native/libfreetype/src/base/ftutil.c      |    2 +-
 .../native/libfreetype/src/cff/cffcmap.c      |    2 +-
 .../native/libfreetype/src/cff/cffcmap.h      |    2 +-
 .../native/libfreetype/src/cff/cffdrivr.c     |    2 +-
 .../native/libfreetype/src/cff/cffdrivr.h     |    2 +-
 .../native/libfreetype/src/cff/cfferrs.h      |    2 +-
 .../native/libfreetype/src/cff/cffgload.c     |    2 +-
 .../native/libfreetype/src/cff/cffgload.h     |    2 +-
 .../native/libfreetype/src/cff/cffload.c      |   77 +-
 .../native/libfreetype/src/cff/cffload.h      |    2 +-
 .../native/libfreetype/src/cff/cffobjs.c      |   95 +-
 .../native/libfreetype/src/cff/cffobjs.h      |    2 +-
 .../native/libfreetype/src/cff/cffparse.c     |   97 +-
 .../native/libfreetype/src/cff/cffparse.h     |    3 +-
 .../native/libfreetype/src/cff/cfftoken.h     |   74 +-
 .../native/libfreetype/src/cid/ciderrs.h      |    2 +-
 .../native/libfreetype/src/cid/cidgload.c     |    2 +-
 .../native/libfreetype/src/cid/cidgload.h     |    2 +-
 .../native/libfreetype/src/cid/cidload.c      |   41 +-
 .../native/libfreetype/src/cid/cidload.h      |    2 +-
 .../native/libfreetype/src/cid/cidobjs.c      |    2 +-
 .../native/libfreetype/src/cid/cidobjs.h      |    2 +-
 .../native/libfreetype/src/cid/cidparse.c     |   69 +-
 .../native/libfreetype/src/cid/cidparse.h     |    2 +-
 .../native/libfreetype/src/cid/cidriver.c     |    2 +-
 .../native/libfreetype/src/cid/cidriver.h     |    2 +-
 .../native/libfreetype/src/cid/cidtoken.h     |    2 +-
 .../native/libfreetype/src/psaux/afmparse.c   |    2 +-
 .../native/libfreetype/src/psaux/afmparse.h   |    2 +-
 .../native/libfreetype/src/psaux/cffdecode.c  |   20 +-
 .../native/libfreetype/src/psaux/cffdecode.h  |    2 +-
 .../native/libfreetype/src/psaux/psauxerr.h   |    2 +-
 .../native/libfreetype/src/psaux/psauxmod.c   |    2 +-
 .../native/libfreetype/src/psaux/psauxmod.h   |    2 +-
 .../native/libfreetype/src/psaux/psblues.c    |   48 +-
 .../native/libfreetype/src/psaux/psconv.c     |    2 +-
 .../native/libfreetype/src/psaux/psconv.h     |    2 +-
 .../share/native/libfreetype/src/psaux/psft.c |   16 +-
 .../share/native/libfreetype/src/psaux/psft.h |    8 +-
 .../native/libfreetype/src/psaux/psintrp.c    |   27 +-
 .../native/libfreetype/src/psaux/psobjs.c     |   46 +-
 .../native/libfreetype/src/psaux/psobjs.h     |    2 +-
 .../native/libfreetype/src/psaux/t1cmap.c     |    2 +-
 .../native/libfreetype/src/psaux/t1cmap.h     |    2 +-
 .../native/libfreetype/src/psaux/t1decode.c   |    2 +-
 .../native/libfreetype/src/psaux/t1decode.h   |    2 +-
 .../native/libfreetype/src/pshinter/pshalgo.c |   10 +-
 .../native/libfreetype/src/pshinter/pshalgo.h |    2 +-
 .../native/libfreetype/src/pshinter/pshglob.c |    2 +-
 .../native/libfreetype/src/pshinter/pshglob.h |    2 +-
 .../native/libfreetype/src/pshinter/pshmod.c  |    2 +-
 .../native/libfreetype/src/pshinter/pshmod.h  |    2 +-
 .../libfreetype/src/pshinter/pshnterr.h       |    2 +-
 .../native/libfreetype/src/pshinter/pshrec.c  |    4 +-
 .../native/libfreetype/src/pshinter/pshrec.h  |    2 +-
 .../native/libfreetype/src/psnames/psmodule.c |    2 +-
 .../native/libfreetype/src/psnames/psmodule.h |    2 +-
 .../native/libfreetype/src/psnames/psnamerr.h |    2 +-
 .../native/libfreetype/src/psnames/pstables.h |    2 +-
 .../native/libfreetype/src/raster/ftmisc.h    |   23 +-
 .../native/libfreetype/src/raster/ftraster.c  | 1868 ++++++-----------
 .../native/libfreetype/src/raster/ftraster.h  |    2 +-
 .../native/libfreetype/src/raster/ftrend1.c   |    2 +-
 .../native/libfreetype/src/raster/ftrend1.h   |    2 +-
 .../native/libfreetype/src/raster/rasterrs.h  |    2 +-
 .../native/libfreetype/src/sfnt/pngshim.c     |    2 +-
 .../native/libfreetype/src/sfnt/pngshim.h     |    2 +-
 .../native/libfreetype/src/sfnt/sfdriver.c    |   17 +-
 .../native/libfreetype/src/sfnt/sfdriver.h    |    2 +-
 .../native/libfreetype/src/sfnt/sferrors.h    |    2 +-
 .../native/libfreetype/src/sfnt/sfobjs.c      |   21 +-
 .../native/libfreetype/src/sfnt/sfobjs.h      |    2 +-
 .../native/libfreetype/src/sfnt/sfwoff.c      |   20 +-
 .../native/libfreetype/src/sfnt/sfwoff.h      |    2 +-
 .../native/libfreetype/src/sfnt/sfwoff2.c     |   54 +-
 .../native/libfreetype/src/sfnt/sfwoff2.h     |    2 +-
 .../native/libfreetype/src/sfnt/ttcmap.c      |    2 +-
 .../native/libfreetype/src/sfnt/ttcmap.h      |    2 +-
 .../native/libfreetype/src/sfnt/ttcmapc.h     |    2 +-
 .../native/libfreetype/src/sfnt/ttcolr.c      |   38 +-
 .../native/libfreetype/src/sfnt/ttcolr.h      |    2 +-
 .../native/libfreetype/src/sfnt/ttcpal.c      |    2 +-
 .../native/libfreetype/src/sfnt/ttcpal.h      |    2 +-
 .../native/libfreetype/src/sfnt/ttkern.c      |    2 +-
 .../native/libfreetype/src/sfnt/ttkern.h      |    2 +-
 .../native/libfreetype/src/sfnt/ttload.c      |    4 +-
 .../native/libfreetype/src/sfnt/ttload.h      |    2 +-
 .../share/native/libfreetype/src/sfnt/ttmtx.c |    2 +-
 .../share/native/libfreetype/src/sfnt/ttmtx.h |    2 +-
 .../native/libfreetype/src/sfnt/ttpost.c      |   50 +-
 .../native/libfreetype/src/sfnt/ttpost.h      |    2 +-
 .../native/libfreetype/src/sfnt/ttsbit.c      |    2 +-
 .../native/libfreetype/src/sfnt/ttsbit.h      |    2 +-
 .../native/libfreetype/src/sfnt/woff2tags.c   |    2 +-
 .../native/libfreetype/src/sfnt/woff2tags.h   |    2 +-
 .../native/libfreetype/src/smooth/ftgrays.c   |  461 ++--
 .../native/libfreetype/src/smooth/ftgrays.h   |    2 +-
 .../native/libfreetype/src/smooth/ftsmerrs.h  |    2 +-
 .../native/libfreetype/src/smooth/ftsmooth.c  |    2 +-
 .../native/libfreetype/src/smooth/ftsmooth.h  |    2 +-
 .../libfreetype/src/truetype/ttdriver.c       |   17 +-
 .../libfreetype/src/truetype/ttdriver.h       |    2 +-
 .../libfreetype/src/truetype/tterrors.h       |    2 +-
 .../native/libfreetype/src/truetype/ttgload.c |   51 +-
 .../native/libfreetype/src/truetype/ttgload.h |    2 +-
 .../native/libfreetype/src/truetype/ttgxvar.c |  419 ++--
 .../native/libfreetype/src/truetype/ttgxvar.h |    2 +-
 .../libfreetype/src/truetype/ttinterp.c       |   16 +-
 .../libfreetype/src/truetype/ttinterp.h       |    2 +-
 .../native/libfreetype/src/truetype/ttobjs.c  |   52 +-
 .../native/libfreetype/src/truetype/ttobjs.h  |    4 +-
 .../native/libfreetype/src/truetype/ttpload.c |    2 +-
 .../native/libfreetype/src/truetype/ttpload.h |    2 +-
 .../native/libfreetype/src/type1/t1afm.c      |    2 +-
 .../native/libfreetype/src/type1/t1afm.h      |    2 +-
 .../native/libfreetype/src/type1/t1driver.c   |   10 +-
 .../native/libfreetype/src/type1/t1driver.h   |    2 +-
 .../native/libfreetype/src/type1/t1errors.h   |    2 +-
 .../native/libfreetype/src/type1/t1gload.c    |    2 +-
 .../native/libfreetype/src/type1/t1gload.h    |    2 +-
 .../native/libfreetype/src/type1/t1load.c     |   28 +-
 .../native/libfreetype/src/type1/t1load.h     |    2 +-
 .../native/libfreetype/src/type1/t1objs.c     |    2 +-
 .../native/libfreetype/src/type1/t1objs.h     |    2 +-
 .../native/libfreetype/src/type1/t1parse.c    |    2 +-
 .../native/libfreetype/src/type1/t1parse.h    |    2 +-
 .../native/libfreetype/src/type1/t1tokens.h   |    2 +-
 280 files changed, 2212 insertions(+), 2863 deletions(-)

diff --git a/src/java.desktop/share/legal/freetype.md b/src/java.desktop/share/legal/freetype.md
index 0ddbe9b1136..5df525e2f67 100644
--- a/src/java.desktop/share/legal/freetype.md
+++ b/src/java.desktop/share/legal/freetype.md
@@ -1,4 +1,4 @@
-## The FreeType Project: Freetype v2.13.2
+## The FreeType Project: Freetype v2.13.3
 
 
 ### FreeType Notice
@@ -21,23 +21,23 @@ which fits your needs best.
 ### FreeType License
 ```
 
-Copyright (C) 1996-2023 by David Turner, Robert Wilhelm, and Werner Lemberg.
-Copyright (C) 2007-2023 by Dereg Clegg and Michael Toftdal.
-Copyright (C) 1996-2023 by Just van Rossum, David Turner, Robert Wilhelm, and Werner Lemberg.
-Copyright (C) 2022-2023 by David Turner, Robert Wilhelm, Werner Lemberg, George Williams, and
-Copyright (C) 2004-2023 by Masatake YAMATO and Redhat K.K.
-Copyright (C) 2007-2023 by Derek Clegg and Michael Toftdal.
-Copyright (C) 2003-2023 by Masatake YAMATO, Red Hat K.K.,
-Copyright (C) 1996-2023 by David Turner, Robert Wilhelm, Werner Lemberg, and Dominik Röttsches.
-Copyright (C) 2007-2023 by David Turner.
-Copyright (C) 2022-2023 by David Turner, Robert Wilhelm, Werner Lemberg, and Moazin Khatti.
-Copyright (C) 2007-2023 by Rahul Bhalerao <rahul.bhalerao@redhat.com>, <b.rahul.pm@gmail.com>.
-Copyright (C) 2008-2023 by David Turner, Robert Wilhelm, Werner Lemberg, and suzuki toshiya.
-Copyright (C) 2013-2023 by Google, Inc.
-Copyright (C) 2019-2023 by Nikhil Ramakrishnan, David Turner, Robert Wilhelm, and Werner Lemberg.
-Copyright (C) 2009-2023 by Oran Agra and Mickey Gabel.
-Copyright (C) 2018-2023 by David Turner, Robert Wilhelm, Dominik Röttsches, and Werner Lemberg.
-Copyright (C) 2004-2023 by David Turner, Robert Wilhelm, Werner Lemberg, and George Williams.
+Copyright (C) 1996-2024 by David Turner, Robert Wilhelm, and Werner Lemberg.
+Copyright (C) 2007-2024 by Dereg Clegg and Michael Toftdal.
+Copyright (C) 1996-2024 by Just van Rossum, David Turner, Robert Wilhelm, and Werner Lemberg.
+Copyright (C) 2022-2024 by David Turner, Robert Wilhelm, Werner Lemberg, George Williams, and
+Copyright (C) 2004-2024 by Masatake YAMATO and Redhat K.K.
+Copyright (C) 2007-2024 by Derek Clegg and Michael Toftdal.
+Copyright (C) 2003-2024 by Masatake YAMATO, Red Hat K.K.,
+Copyright (C) 1996-2024 by David Turner, Robert Wilhelm, Werner Lemberg, and Dominik Röttsches.
+Copyright (C) 2007-2024 by David Turner.
+Copyright (C) 2022-2024 by David Turner, Robert Wilhelm, Werner Lemberg, and Moazin Khatti.
+Copyright (C) 2007-2024 by Rahul Bhalerao <rahul.bhalerao@redhat.com>, <b.rahul.pm@gmail.com>.
+Copyright (C) 2008-2024 by David Turner, Robert Wilhelm, Werner Lemberg, and suzuki toshiya.
+Copyright (C) 2013-2024 by Google, Inc.
+Copyright (C) 2019-2024 by Nikhil Ramakrishnan, David Turner, Robert Wilhelm, and Werner Lemberg.
+Copyright (C) 2009-2024 by Oran Agra and Mickey Gabel.
+Copyright (C) 2018-2024 by David Turner, Robert Wilhelm, Dominik Röttsches, and Werner Lemberg.
+Copyright (C) 2004-2024 by David Turner, Robert Wilhelm, Werner Lemberg, and George Williams.
 
 
                     The FreeType Project LICENSE
@@ -559,7 +559,7 @@ Public License instead of this License.
 ```
 
 ---------------------------------
-The below license applies to the following files:
+The below applies to the following file(s):
 libfreetype/src/psaux/psarrst.c
 libfreetype/src/psaux/psarrst.h
 libfreetype/src/psaux/psblues.c
@@ -582,7 +582,7 @@ libfreetype/src/psaux/psstack.c
 libfreetype/src/psaux/psstack.h
 libfreetype/src/psaux/pstypes.h
 
-Copyright 2006-2014 Adobe Systems Incorporated.
+Copyright (C) 2006-2014 Adobe Systems Incorporated.
 
 This software, and all works of authorship, whether in source or
 object code form as indicated by the copyright notice(s) included
@@ -618,12 +618,12 @@ and you accept them fully.
 ```
 
 ---------------------------------
-The below license applies to the following files:
+The below applies to the following file(s):
 libfreetype/include/freetype/internal/fthash.h
 libfreetype/src/base/fthash.c
 
-Copyright 2000 Computing Research Labs, New Mexico State University
-Copyright 2001-2015
+Copyright (C) 2000 Computing Research Labs, New Mexico State University
+Copyright (C) 2001-2015
 
   Francesco Zappa Nardelli
 
diff --git a/src/java.desktop/share/native/libfreetype/include/freetype/config/ftconfig.h b/src/java.desktop/share/native/libfreetype/include/freetype/config/ftconfig.h
index a85151699d0..0667493fec6 100644
--- a/src/java.desktop/share/native/libfreetype/include/freetype/config/ftconfig.h
+++ b/src/java.desktop/share/native/libfreetype/include/freetype/config/ftconfig.h
@@ -4,7 +4,7 @@
  *
  *   ANSI-specific configuration file (specification only).
  *
- * Copyright (C) 1996-2023 by
+ * Copyright (C) 1996-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/src/java.desktop/share/native/libfreetype/include/freetype/config/ftheader.h b/src/java.desktop/share/native/libfreetype/include/freetype/config/ftheader.h
index e607bce15c5..f6ef2618ded 100644
--- a/src/java.desktop/share/native/libfreetype/include/freetype/config/ftheader.h
+++ b/src/java.desktop/share/native/libfreetype/include/freetype/config/ftheader.h
@@ -4,7 +4,7 @@
  *
  *   Build macros of the FreeType 2 library.
  *
- * Copyright (C) 1996-2023 by
+ * Copyright (C) 1996-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/src/java.desktop/share/native/libfreetype/include/freetype/config/ftoption.h b/src/java.desktop/share/native/libfreetype/include/freetype/config/ftoption.h
index 4375c7a6ff3..d29a0a7cefb 100644
--- a/src/java.desktop/share/native/libfreetype/include/freetype/config/ftoption.h
+++ b/src/java.desktop/share/native/libfreetype/include/freetype/config/ftoption.h
@@ -4,7 +4,7 @@
  *
  *   User-selectable configuration macros (specification only).
  *
- * Copyright (C) 1996-2023 by
+ * Copyright (C) 1996-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
@@ -757,6 +757,22 @@ FT_BEGIN_HEADER
 #endif
 
 
+  /**************************************************************************
+   *
+   * Option `TT_CONFIG_OPTION_GPOS_KERNING` enables a basic GPOS kerning
+   * implementation (for TrueType fonts only).  With this defined, FreeType
+   * is able to get kerning pair data from the GPOS 'kern' feature as well as
+   * legacy 'kern' tables; without this defined, FreeType will only be able
+   * to use legacy 'kern' tables.
+   *
+   * Note that FreeType does not support more advanced GPOS layout features;
+   * even the 'kern' feature implemented here doesn't handle more
+   * sophisticated kerning variants.  Use a higher-level library like
+   * HarfBuzz instead for that.
+   */
+/* #define TT_CONFIG_OPTION_GPOS_KERNING */
+
+
   /*************************************************************************/
   /*************************************************************************/
   /****                                                                 ****/
diff --git a/src/java.desktop/share/native/libfreetype/include/freetype/config/ftstdlib.h b/src/java.desktop/share/native/libfreetype/include/freetype/config/ftstdlib.h
index f65148a902e..e17aa7b89d5 100644
--- a/src/java.desktop/share/native/libfreetype/include/freetype/config/ftstdlib.h
+++ b/src/java.desktop/share/native/libfreetype/include/freetype/config/ftstdlib.h
@@ -5,7 +5,7 @@
  *   ANSI-specific library and header configuration file (specification
  *   only).
  *
- * Copyright (C) 2002-2023 by
+ * Copyright (C) 2002-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/src/java.desktop/share/native/libfreetype/include/freetype/config/integer-types.h b/src/java.desktop/share/native/libfreetype/include/freetype/config/integer-types.h
index 7258b508541..c27505ffc4b 100644
--- a/src/java.desktop/share/native/libfreetype/include/freetype/config/integer-types.h
+++ b/src/java.desktop/share/native/libfreetype/include/freetype/config/integer-types.h
@@ -4,7 +4,7 @@
  *
  *   FreeType integer types definitions.
  *
- * Copyright (C) 1996-2023 by
+ * Copyright (C) 1996-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/src/java.desktop/share/native/libfreetype/include/freetype/config/mac-support.h b/src/java.desktop/share/native/libfreetype/include/freetype/config/mac-support.h
index b77b96d5db8..07b6f915bd8 100644
--- a/src/java.desktop/share/native/libfreetype/include/freetype/config/mac-support.h
+++ b/src/java.desktop/share/native/libfreetype/include/freetype/config/mac-support.h
@@ -4,7 +4,7 @@
  *
  *   Mac/OS X support configuration header.
  *
- * Copyright (C) 1996-2023 by
+ * Copyright (C) 1996-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/src/java.desktop/share/native/libfreetype/include/freetype/config/public-macros.h b/src/java.desktop/share/native/libfreetype/include/freetype/config/public-macros.h
index 23d0fa6a329..f56581a6ee7 100644
--- a/src/java.desktop/share/native/libfreetype/include/freetype/config/public-macros.h
+++ b/src/java.desktop/share/native/libfreetype/include/freetype/config/public-macros.h
@@ -4,7 +4,7 @@
  *
  *   Define a set of compiler macros used in public FreeType headers.
  *
- * Copyright (C) 2020-2023 by
+ * Copyright (C) 2020-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/src/java.desktop/share/native/libfreetype/include/freetype/freetype.h b/src/java.desktop/share/native/libfreetype/include/freetype/freetype.h
index 92acf3794a7..58fc33dfe60 100644
--- a/src/java.desktop/share/native/libfreetype/include/freetype/freetype.h
+++ b/src/java.desktop/share/native/libfreetype/include/freetype/freetype.h
@@ -4,7 +4,7 @@
  *
  *   FreeType high-level API and common types (specification only).
  *
- * Copyright (C) 1996-2023 by
+ * Copyright (C) 1996-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
@@ -1322,9 +1322,13 @@ FT_BEGIN_HEADER
    *   FT_FACE_FLAG_KERNING ::
    *     The face contains kerning information.  If set, the kerning distance
    *     can be retrieved using the function @FT_Get_Kerning.  Otherwise the
-   *     function always returns the vector (0,0).  Note that FreeType
-   *     doesn't handle kerning data from the SFNT 'GPOS' table (as present
-   *     in many OpenType fonts).
+   *     function always returns the vector (0,0).
+   *
+   *     Note that for TrueType fonts only, FreeType supports both the 'kern'
+   *     table and the basic, pair-wise kerning feature from the 'GPOS' table
+   *     (with `TT_CONFIG_OPTION_GPOS_KERNING` enabled), though FreeType does
+   *     not support the more advanced GPOS layout features; use a library
+   *     like HarfBuzz for those instead.
    *
    *   FT_FACE_FLAG_FAST_GLYPHS ::
    *     THIS FLAG IS DEPRECATED.  DO NOT USE OR TEST IT.
@@ -3767,87 +3771,18 @@ FT_BEGIN_HEADER
    *     pixels and use the @FT_PIXEL_MODE_LCD_V mode.
    *
    *   FT_RENDER_MODE_SDF ::
-   *     This mode corresponds to 8-bit, single-channel signed distance field
-   *     (SDF) bitmaps.  Each pixel in the SDF grid is the value from the
-   *     pixel's position to the nearest glyph's outline.  The distances are
-   *     calculated from the center of the pixel and are positive if they are
-   *     filled by the outline (i.e., inside the outline) and negative
-   *     otherwise.  Check the note below on how to convert the output values
-   *     to usable data.
+   *     The positive (unsigned) 8-bit bitmap values can be converted to the
+   *     single-channel signed distance field (SDF) by subtracting 128, with
+   *     the positive and negative results corresponding to the inside and
+   *     the outside of a glyph contour, respectively.  The distance units are
+   *     arbitrarily determined by an adjustable @spread property.
    *
    * @note:
-   *   The selected render mode only affects vector glyphs of a font.
+   *   The selected render mode only affects scalable vector glyphs of a font.
    *   Embedded bitmaps often have a different pixel mode like
    *   @FT_PIXEL_MODE_MONO.  You can use @FT_Bitmap_Convert to transform them
    *   into 8-bit pixmaps.
    *
-   *   For @FT_RENDER_MODE_SDF the output bitmap buffer contains normalized
-   *   distances that are packed into unsigned 8-bit values.  To get pixel
-   *   values in floating point representation use the following pseudo-C
-   *   code for the conversion.
-   *
-   *   ```
-   *   // Load glyph and render using FT_RENDER_MODE_SDF,
-   *   // then use the output buffer as follows.
-   *
-   *   ...
-   *   FT_Byte  buffer = glyph->bitmap->buffer;
-   *
-   *
-   *   for pixel in buffer
-   *   {
-   *     // `sd` is the signed distance and `spread` is the current spread;
-   *     // the default spread is 2 and can be changed.
-   *
-   *     float  sd = (float)pixel - 128.0f;
-   *
-   *
-   *     // Convert to pixel values.
-   *     sd = ( sd / 128.0f ) * spread;
-   *
-   *     // Store `sd` in a buffer or use as required.
-   *   }
-   *
-   *   ```
-   *
-   *   FreeType has two rasterizers for generating SDF, namely:
-   *
-   *   1. `sdf` for generating SDF directly from glyph's outline, and
-   *
-   *   2. `bsdf` for generating SDF from rasterized bitmaps.
-   *
-   *   Depending on the glyph type (i.e., outline or bitmap), one of the two
-   *   rasterizers is chosen at runtime and used for generating SDFs.  To
-   *   force the use of `bsdf` you should render the glyph with any of the
-   *   FreeType's other rendering modes (e.g., `FT_RENDER_MODE_NORMAL`) and
-   *   then re-render with `FT_RENDER_MODE_SDF`.
-   *
-   *   There are some issues with stability and possible failures of the SDF
-   *   renderers (specifically `sdf`).
-   *
-   *   1. The `sdf` rasterizer is sensitive to really small features (e.g.,
-   *      sharp turns that are less than 1~pixel) and imperfections in the
-   *      glyph's outline, causing artifacts in the final output.
-   *
-   *   2. The `sdf` rasterizer has limited support for handling intersecting
-   *      contours and *cannot* handle self-intersecting contours whatsoever.
-   *      Self-intersection happens when a single connected contour
-   *      intersects itself at some point; having these in your font
-   *      definitely poses a problem to the rasterizer and cause artifacts,
-   *      too.
-   *
-   *   3. Generating SDF for really small glyphs may result in undesirable
-   *      output; the pixel grid (which stores distance information) becomes
-   *      too coarse.
-   *
-   *   4. Since the output buffer is normalized, precision at smaller spreads
-   *      is greater than precision at larger spread values because the
-   *      output range of [0..255] gets mapped to a smaller SDF range.  A
-   *      spread of~2 should be sufficient in most cases.
-   *
-   *   Points (1) and (2) can be avoided by using the `bsdf` rasterizer,
-   *   which is more stable than the `sdf` rasterizer in general.
-   *
    */
   typedef enum  FT_Render_Mode_
   {
@@ -4058,9 +3993,26 @@ FT_BEGIN_HEADER
    *   out of the scope of this API function -- they can be implemented
    *   through format-specific interfaces.
    *
-   *   Kerning for OpenType fonts implemented in a 'GPOS' table is not
-   *   supported; use @FT_HAS_KERNING to find out whether a font has data
-   *   that can be extracted with `FT_Get_Kerning`.
+   *   Note that, for TrueType fonts only, this can extract data from both
+   *   the 'kern' table and the basic, pair-wise kerning feature from the
+   *   GPOS table (with `TT_CONFIG_OPTION_GPOS_KERNING` enabled), though
+   *   FreeType does not support the more advanced GPOS layout features; use
+   *   a library like HarfBuzz for those instead.  If a font has both a
+   *   'kern' table and kern features of a GPOS table, the 'kern' table will
+   *   be used.
+   *
+   *   Also note for right-to-left scripts, the functionality may differ for
+   *   fonts with GPOS tables vs. 'kern' tables.  For GPOS, right-to-left
+   *   fonts typically use both a placement offset and an advance for pair
+   *   positioning, which this API does not support, so it would output
+   *   kerning values of zero; though if the right-to-left font used only
+   *   advances in GPOS pair positioning, then this API could output kerning
+   *   values for it, but it would use `left_glyph` to mean the first glyph
+   *   for that case.  Whereas 'kern' tables are always advance-only and
+   *   always store the left glyph first.
+   *
+   *   Use @FT_HAS_KERNING to find out whether a font has data that can be
+   *   extracted with `FT_Get_Kerning`.
    */
   FT_EXPORT( FT_Error )
   FT_Get_Kerning( FT_Face     face,
@@ -5222,7 +5174,7 @@ FT_BEGIN_HEADER
    */
 #define FREETYPE_MAJOR  2
 #define FREETYPE_MINOR  13
-#define FREETYPE_PATCH  2
+#define FREETYPE_PATCH  3
 
 
   /**************************************************************************
diff --git a/src/java.desktop/share/native/libfreetype/include/freetype/ftadvanc.h b/src/java.desktop/share/native/libfreetype/include/freetype/ftadvanc.h
index 4560ded6dcb..85b8ba2554b 100644
--- a/src/java.desktop/share/native/libfreetype/include/freetype/ftadvanc.h
+++ b/src/java.desktop/share/native/libfreetype/include/freetype/ftadvanc.h
@@ -4,7 +4,7 @@
  *
  *   Quick computation of advance widths (specification only).
  *
- * Copyright (C) 2008-2023 by
+ * Copyright (C) 2008-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/src/java.desktop/share/native/libfreetype/include/freetype/ftbbox.h b/src/java.desktop/share/native/libfreetype/include/freetype/ftbbox.h
index fc21740fc2b..12bbfa63a62 100644
--- a/src/java.desktop/share/native/libfreetype/include/freetype/ftbbox.h
+++ b/src/java.desktop/share/native/libfreetype/include/freetype/ftbbox.h
@@ -4,7 +4,7 @@
  *
  *   FreeType exact bbox computation (specification).
  *
- * Copyright (C) 1996-2023 by
+ * Copyright (C) 1996-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/src/java.desktop/share/native/libfreetype/include/freetype/ftbdf.h b/src/java.desktop/share/native/libfreetype/include/freetype/ftbdf.h
index e8ce6431285..6f63b0b1e78 100644
--- a/src/java.desktop/share/native/libfreetype/include/freetype/ftbdf.h
+++ b/src/java.desktop/share/native/libfreetype/include/freetype/ftbdf.h
@@ -4,7 +4,7 @@
  *
  *   FreeType API for accessing BDF-specific strings (specification).
  *
- * Copyright (C) 2002-2023 by
+ * Copyright (C) 2002-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/src/java.desktop/share/native/libfreetype/include/freetype/ftbitmap.h b/src/java.desktop/share/native/libfreetype/include/freetype/ftbitmap.h
index eb6b4b1eebe..df9d462652e 100644
--- a/src/java.desktop/share/native/libfreetype/include/freetype/ftbitmap.h
+++ b/src/java.desktop/share/native/libfreetype/include/freetype/ftbitmap.h
@@ -4,7 +4,7 @@
  *
  *   FreeType utility functions for bitmaps (specification).
  *
- * Copyright (C) 2004-2023 by
+ * Copyright (C) 2004-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/src/java.desktop/share/native/libfreetype/include/freetype/ftcid.h b/src/java.desktop/share/native/libfreetype/include/freetype/ftcid.h
index ef229390224..96b2a90fc59 100644
--- a/src/java.desktop/share/native/libfreetype/include/freetype/ftcid.h
+++ b/src/java.desktop/share/native/libfreetype/include/freetype/ftcid.h
@@ -4,7 +4,7 @@
  *
  *   FreeType API for accessing CID font information (specification).
  *
- * Copyright (C) 2007-2023 by
+ * Copyright (C) 2007-2024 by
  * Dereg Clegg and Michael Toftdal.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/src/java.desktop/share/native/libfreetype/include/freetype/ftcolor.h b/src/java.desktop/share/native/libfreetype/include/freetype/ftcolor.h
index eae200fdf14..420720ddf22 100644
--- a/src/java.desktop/share/native/libfreetype/include/freetype/ftcolor.h
+++ b/src/java.desktop/share/native/libfreetype/include/freetype/ftcolor.h
@@ -4,7 +4,7 @@
  *
  *   FreeType's glyph color management (specification).
  *
- * Copyright (C) 2018-2023 by
+ * Copyright (C) 2018-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/src/java.desktop/share/native/libfreetype/include/freetype/ftdriver.h b/src/java.desktop/share/native/libfreetype/include/freetype/ftdriver.h
index 7af7465bc76..1b7f539f5e2 100644
--- a/src/java.desktop/share/native/libfreetype/include/freetype/ftdriver.h
+++ b/src/java.desktop/share/native/libfreetype/include/freetype/ftdriver.h
@@ -4,7 +4,7 @@
  *
  *   FreeType API for controlling driver modules (specification only).
  *
- * Copyright (C) 2017-2023 by
+ * Copyright (C) 2017-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
@@ -817,6 +817,80 @@ FT_BEGIN_HEADER
    *   2.5
    */
 
+
+  /**************************************************************************
+   *
+   * @property:
+   *   spread
+   *
+   * @description:
+   *   This property of the 'sdf' and 'bsdf' renderers defines how the signed
+   *   distance field (SDF) is represented in the output bitmap.  The output
+   *   values are calculated as follows, '128 * ( SDF / spread + 1 )', with
+   *   the result clamped to the 8-bit range [0..255].  Therefore, 'spread'
+   *   is also the maximum euclidean distance from the edge after which the
+   *   values are clamped.  The spread is specified in pixels with the
+   *   default value of 8.  For accurate SDF texture mapping (interpolation),
+   *   the spread should be large enough to accommodate the target grid unit.
+   *
+   * @example:
+   *   The following example code demonstrates how to set the SDF spread
+   *   (omitting the error handling).
+   *
+   *   ```
+   *     FT_Library  library;
+   *     FT_Int      spread = 2;
+   *
+   *
+   *     FT_Init_FreeType( &library );
+   *
+   *     FT_Property_Set( library, "sdf", "spread", &spread );
+   *   ```
+   *
+   * @note:
+   *   FreeType has two rasterizers for generating SDF, namely:
+   *
+   *   1. `sdf` for generating SDF directly from glyph's outline, and
+   *
+   *   2. `bsdf` for generating SDF from rasterized bitmaps.
+   *
+   *   Depending on the glyph type (i.e., outline or bitmap), one of the two
+   *   rasterizers is chosen at runtime and used for generating SDFs.  To
+   *   force the use of `bsdf` you should render the glyph with any of the
+   *   FreeType's other rendering modes (e.g., `FT_RENDER_MODE_NORMAL`) and
+   *   then re-render with `FT_RENDER_MODE_SDF`.
+   *
+   *   There are some issues with stability and possible failures of the SDF
+   *   renderers (specifically `sdf`).
+   *
+   *   1. The `sdf` rasterizer is sensitive to really small features (e.g.,
+   *      sharp turns that are less than 1~pixel) and imperfections in the
+   *      glyph's outline, causing artifacts in the final output.
+   *
+   *   2. The `sdf` rasterizer has limited support for handling intersecting
+   *      contours and *cannot* handle self-intersecting contours whatsoever.
+   *      Self-intersection happens when a single connected contour
+   *      intersects itself at some point; having these in your font
+   *      definitely poses a problem to the rasterizer and cause artifacts,
+   *      too.
+   *
+   *   3. Generating SDF for really small glyphs may result in undesirable
+   *      output; the pixel grid (which stores distance information) becomes
+   *      too coarse.
+   *
+   *   4. Since the output buffer is normalized, precision at smaller spreads
+   *      is greater than precision at larger spread values because the
+   *      output range of [0..255] gets mapped to a smaller SDF range.  A
+   *      spread of~2 should be sufficient in most cases.
+   *
+   *   Points (1) and (2) can be avoided by using the `bsdf` rasterizer,
+   *   which is more stable than the `sdf` rasterizer in general.
+   *
+   * @since:
+   *   2.11
+   */
+
+
   /**************************************************************************
    *
    * @property:
diff --git a/src/java.desktop/share/native/libfreetype/include/freetype/fterrdef.h b/src/java.desktop/share/native/libfreetype/include/freetype/fterrdef.h
index d59b3cc2da2..710ca91bbdd 100644
--- a/src/java.desktop/share/native/libfreetype/include/freetype/fterrdef.h
+++ b/src/java.desktop/share/native/libfreetype/include/freetype/fterrdef.h
@@ -4,7 +4,7 @@
  *
  *   FreeType error codes (specification).
  *
- * Copyright (C) 2002-2023 by
+ * Copyright (C) 2002-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/src/java.desktop/share/native/libfreetype/include/freetype/fterrors.h b/src/java.desktop/share/native/libfreetype/include/freetype/fterrors.h
index 15ef3f76b59..27c0ece5c1c 100644
--- a/src/java.desktop/share/native/libfreetype/include/freetype/fterrors.h
+++ b/src/java.desktop/share/native/libfreetype/include/freetype/fterrors.h
@@ -4,7 +4,7 @@
  *
  *   FreeType error code handling (specification).
  *
- * Copyright (C) 1996-2023 by
+ * Copyright (C) 1996-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/src/java.desktop/share/native/libfreetype/include/freetype/ftfntfmt.h b/src/java.desktop/share/native/libfreetype/include/freetype/ftfntfmt.h
index c0018fc830c..7c8b0874a81 100644
--- a/src/java.desktop/share/native/libfreetype/include/freetype/ftfntfmt.h
+++ b/src/java.desktop/share/native/libfreetype/include/freetype/ftfntfmt.h
@@ -4,7 +4,7 @@
  *
  *   Support functions for font formats.
  *
- * Copyright (C) 2002-2023 by
+ * Copyright (C) 2002-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/src/java.desktop/share/native/libfreetype/include/freetype/ftgasp.h b/src/java.desktop/share/native/libfreetype/include/freetype/ftgasp.h
index d5f19add8f2..30e5a9bf82b 100644
--- a/src/java.desktop/share/native/libfreetype/include/freetype/ftgasp.h
+++ b/src/java.desktop/share/native/libfreetype/include/freetype/ftgasp.h
@@ -4,7 +4,7 @@
  *
  *   Access of TrueType's 'gasp' table (specification).
  *
- * Copyright (C) 2007-2023 by
+ * Copyright (C) 2007-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/src/java.desktop/share/native/libfreetype/include/freetype/ftglyph.h b/src/java.desktop/share/native/libfreetype/include/freetype/ftglyph.h
index 4658895f7a9..dc1eb8873ae 100644
--- a/src/java.desktop/share/native/libfreetype/include/freetype/ftglyph.h
+++ b/src/java.desktop/share/native/libfreetype/include/freetype/ftglyph.h
@@ -4,7 +4,7 @@
  *
  *   FreeType convenience functions to handle glyphs (specification).
  *
- * Copyright (C) 1996-2023 by
+ * Copyright (C) 1996-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/src/java.desktop/share/native/libfreetype/include/freetype/ftgzip.h b/src/java.desktop/share/native/libfreetype/include/freetype/ftgzip.h
index 443ec29db1b..9516dc030ac 100644
--- a/src/java.desktop/share/native/libfreetype/include/freetype/ftgzip.h
+++ b/src/java.desktop/share/native/libfreetype/include/freetype/ftgzip.h
@@ -4,7 +4,7 @@
  *
  *   Gzip-compressed stream support.
  *
- * Copyright (C) 2002-2023 by
+ * Copyright (C) 2002-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/src/java.desktop/share/native/libfreetype/include/freetype/ftimage.h b/src/java.desktop/share/native/libfreetype/include/freetype/ftimage.h
index 6baa812560e..2b4b4ac60ae 100644
--- a/src/java.desktop/share/native/libfreetype/include/freetype/ftimage.h
+++ b/src/java.desktop/share/native/libfreetype/include/freetype/ftimage.h
@@ -5,7 +5,7 @@
  *   FreeType glyph image formats and default raster interface
  *   (specification).
  *
- * Copyright (C) 1996-2023 by
+ * Copyright (C) 1996-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
@@ -21,6 +21,11 @@
    * Note: A 'raster' is simply a scan-line converter, used to render
    *       `FT_Outline`s into `FT_Bitmap`s.
    *
+   * Note: This file can be used for `STANDALONE_` compilation of raster
+   *       (B/W) and smooth (anti-aliased) renderers.  Therefore, it must
+   *       rely on standard variable types only instead of aliases in
+   *       `fttypes.h`.
+   *
    */
 
 
@@ -318,7 +323,7 @@ FT_BEGIN_HEADER
    *
    *     If bit~2 is set, bits 5-7 contain the drop-out mode (as defined in
    *     the OpenType specification; the value is the same as the argument to
-   *     the 'SCANMODE' instruction).
+   *     the 'SCANTYPE' instruction).
    *
    *     Bits 3 and~4 are reserved for internal purposes.
    *
@@ -341,14 +346,14 @@ FT_BEGIN_HEADER
    */
   typedef struct  FT_Outline_
   {
-    short       n_contours;      /* number of contours in glyph        */
-    short       n_points;        /* number of points in the glyph      */
+    unsigned short   n_contours;  /* number of contours in glyph        */
+    unsigned short   n_points;    /* number of points in the glyph      */
 
-    FT_Vector*  points;          /* the outline's points               */
-    char*       tags;            /* the points flags                   */
-    short*      contours;        /* the contour end points             */
+    FT_Vector*       points;      /* the outline's points               */
+    unsigned char*   tags;        /* the points flags                   */
+    unsigned short*  contours;    /* the contour end points             */
 
-    int         flags;           /* outline masks                      */
+    int              flags;       /* outline masks                      */
 
   } FT_Outline;
 
@@ -356,8 +361,8 @@ FT_BEGIN_HEADER
 
   /* Following limits must be consistent with */
   /* FT_Outline.{n_contours,n_points}         */
-#define FT_OUTLINE_CONTOURS_MAX  SHRT_MAX
-#define FT_OUTLINE_POINTS_MAX    SHRT_MAX
+#define FT_OUTLINE_CONTOURS_MAX  USHRT_MAX
+#define FT_OUTLINE_POINTS_MAX    USHRT_MAX
 
 
   /**************************************************************************
@@ -434,8 +439,8 @@ FT_BEGIN_HEADER
    *   rasterizer; see the `tags` field in @FT_Outline.
    *
    *   Please refer to the description of the 'SCANTYPE' instruction in the
-   *   OpenType specification (in file `ttinst1.doc`) how simple drop-outs,
-   *   smart drop-outs, and stubs are defined.
+   *   [OpenType specification](https://learn.microsoft.com/en-us/typography/opentype/spec/tt_instructions#scantype)
+   *   how simple drop-outs, smart drop-outs, and stubs are defined.
    */
 #define FT_OUTLINE_NONE             0x0
 #define FT_OUTLINE_OWNER            0x1
diff --git a/src/java.desktop/share/native/libfreetype/include/freetype/ftincrem.h b/src/java.desktop/share/native/libfreetype/include/freetype/ftincrem.h
index 2d4f5def241..816581b78eb 100644
--- a/src/java.desktop/share/native/libfreetype/include/freetype/ftincrem.h
+++ b/src/java.desktop/share/native/libfreetype/include/freetype/ftincrem.h
@@ -4,7 +4,7 @@
  *
  *   FreeType incremental loading (specification).
  *
- * Copyright (C) 2002-2023 by
+ * Copyright (C) 2002-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/src/java.desktop/share/native/libfreetype/include/freetype/ftlcdfil.h b/src/java.desktop/share/native/libfreetype/include/freetype/ftlcdfil.h
index d3723e16f67..25274dc4ac2 100644
--- a/src/java.desktop/share/native/libfreetype/include/freetype/ftlcdfil.h
+++ b/src/java.desktop/share/native/libfreetype/include/freetype/ftlcdfil.h
@@ -5,7 +5,7 @@
  *   FreeType API for color filtering of subpixel bitmap glyphs
  *   (specification).
  *
- * Copyright (C) 2006-2023 by
+ * Copyright (C) 2006-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/src/java.desktop/share/native/libfreetype/include/freetype/ftlist.h b/src/java.desktop/share/native/libfreetype/include/freetype/ftlist.h
index b5531313359..972fbfa2fe4 100644
--- a/src/java.desktop/share/native/libfreetype/include/freetype/ftlist.h
+++ b/src/java.desktop/share/native/libfreetype/include/freetype/ftlist.h
@@ -4,7 +4,7 @@
  *
  *   Generic list support for FreeType (specification).
  *
- * Copyright (C) 1996-2023 by
+ * Copyright (C) 1996-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/src/java.desktop/share/native/libfreetype/include/freetype/ftlogging.h b/src/java.desktop/share/native/libfreetype/include/freetype/ftlogging.h
index 53b8b896427..1813cfc2c27 100644
--- a/src/java.desktop/share/native/libfreetype/include/freetype/ftlogging.h
+++ b/src/java.desktop/share/native/libfreetype/include/freetype/ftlogging.h
@@ -4,7 +4,7 @@
  *
  *   Additional debugging APIs.
  *
- * Copyright (C) 2020-2023 by
+ * Copyright (C) 2020-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/src/java.desktop/share/native/libfreetype/include/freetype/ftmac.h b/src/java.desktop/share/native/libfreetype/include/freetype/ftmac.h
index a91e38f9ea7..e4efde33dd8 100644
--- a/src/java.desktop/share/native/libfreetype/include/freetype/ftmac.h
+++ b/src/java.desktop/share/native/libfreetype/include/freetype/ftmac.h
@@ -4,7 +4,7 @@
  *
  *   Additional Mac-specific API.
  *
- * Copyright (C) 1996-2023 by
+ * Copyright (C) 1996-2024 by
  * Just van Rossum, David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/src/java.desktop/share/native/libfreetype/include/freetype/ftmm.h b/src/java.desktop/share/native/libfreetype/include/freetype/ftmm.h
index d145128a9bc..35ed039c89b 100644
--- a/src/java.desktop/share/native/libfreetype/include/freetype/ftmm.h
+++ b/src/java.desktop/share/native/libfreetype/include/freetype/ftmm.h
@@ -4,7 +4,7 @@
  *
  *   FreeType Multiple Master font interface (specification).
  *
- * Copyright (C) 1996-2023 by
+ * Copyright (C) 1996-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
@@ -19,8 +19,13 @@
 #ifndef FTMM_H_
 #define FTMM_H_
 
+#include <freetype/freetype.h>
 
-#include <freetype/t1tables.h>
+#ifdef FREETYPE_H
+#error "freetype.h of FreeType 1 has been loaded!"
+#error "Please fix the directory search order for header files"
+#error "so that freetype.h of FreeType 2 is found first."
+#endif
 
 
 FT_BEGIN_HEADER
@@ -53,6 +58,30 @@ FT_BEGIN_HEADER
    */
 
 
+  /**************************************************************************
+   *
+   * @enum:
+   *   T1_MAX_MM_XXX
+   *
+   * @description:
+   *   Multiple Masters limits as defined in their specifications.
+   *
+   * @values:
+   *   T1_MAX_MM_AXIS ::
+   *     The maximum number of Multiple Masters axes.
+   *
+   *   T1_MAX_MM_DESIGNS ::
+   *     The maximum number of Multiple Masters designs.
+   *
+   *   T1_MAX_MM_MAP_POINTS ::
+   *     The maximum number of elements in a design map.
+   *
+   */
+#define T1_MAX_MM_AXIS         4
+#define T1_MAX_MM_DESIGNS     16
+#define T1_MAX_MM_MAP_POINTS  20
+
+
   /**************************************************************************
    *
    * @struct:
diff --git a/src/java.desktop/share/native/libfreetype/include/freetype/ftmodapi.h b/src/java.desktop/share/native/libfreetype/include/freetype/ftmodapi.h
index c8f0c2c2a45..0ee715898f7 100644
--- a/src/java.desktop/share/native/libfreetype/include/freetype/ftmodapi.h
+++ b/src/java.desktop/share/native/libfreetype/include/freetype/ftmodapi.h
@@ -4,7 +4,7 @@
  *
  *   FreeType modules public interface (specification).
  *
- * Copyright (C) 1996-2023 by
+ * Copyright (C) 1996-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/src/java.desktop/share/native/libfreetype/include/freetype/ftmoderr.h b/src/java.desktop/share/native/libfreetype/include/freetype/ftmoderr.h
index c8c892dcce8..6722fbf8b70 100644
--- a/src/java.desktop/share/native/libfreetype/include/freetype/ftmoderr.h
+++ b/src/java.desktop/share/native/libfreetype/include/freetype/ftmoderr.h
@@ -4,7 +4,7 @@
  *
  *   FreeType module error offsets (specification).
  *
- * Copyright (C) 2001-2023 by
+ * Copyright (C) 2001-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/src/java.desktop/share/native/libfreetype/include/freetype/ftoutln.h b/src/java.desktop/share/native/libfreetype/include/freetype/ftoutln.h
index f9329ca40c9..44e94b4f5bb 100644
--- a/src/java.desktop/share/native/libfreetype/include/freetype/ftoutln.h
+++ b/src/java.desktop/share/native/libfreetype/include/freetype/ftoutln.h
@@ -5,7 +5,7 @@
  *   Support for the FT_Outline type used to store glyph shapes of
  *   most scalable font formats (specification).
  *
- * Copyright (C) 1996-2023 by
+ * Copyright (C) 1996-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
@@ -112,7 +112,7 @@ FT_BEGIN_HEADER
    *   Degenerate contours, segments, and Bezier arcs may be reported.  In
    *   most cases, it is best to filter these out before using the outline
    *   for stroking or other path modification purposes (which may cause
-   *   degenerate segments to become non-degenrate and visible, like when
+   *   degenerate segments to become non-degenerate and visible, like when
    *   stroke caps are used or the path is otherwise outset).  Some glyph
    *   outlines may contain deliberate degenerate single points for mark
    *   attachement.
diff --git a/src/java.desktop/share/native/libfreetype/include/freetype/ftparams.h b/src/java.desktop/share/native/libfreetype/include/freetype/ftparams.h
index 6a9f243bc90..43bf69c202f 100644
--- a/src/java.desktop/share/native/libfreetype/include/freetype/ftparams.h
+++ b/src/java.desktop/share/native/libfreetype/include/freetype/ftparams.h
@@ -4,7 +4,7 @@
  *
  *   FreeType API for possible FT_Parameter tags (specification only).
  *
- * Copyright (C) 2017-2023 by
+ * Copyright (C) 2017-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/src/java.desktop/share/native/libfreetype/include/freetype/ftrender.h b/src/java.desktop/share/native/libfreetype/include/freetype/ftrender.h
index 0b6fad32e84..dc5018a1b54 100644
--- a/src/java.desktop/share/native/libfreetype/include/freetype/ftrender.h
+++ b/src/java.desktop/share/native/libfreetype/include/freetype/ftrender.h
@@ -4,7 +4,7 @@
  *
  *   FreeType renderer modules public interface (specification).
  *
- * Copyright (C) 1996-2023 by
+ * Copyright (C) 1996-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/src/java.desktop/share/native/libfreetype/include/freetype/ftsizes.h b/src/java.desktop/share/native/libfreetype/include/freetype/ftsizes.h
index 7bfb1aed4c2..4ef5c7955df 100644
--- a/src/java.desktop/share/native/libfreetype/include/freetype/ftsizes.h
+++ b/src/java.desktop/share/native/libfreetype/include/freetype/ftsizes.h
@@ -4,7 +4,7 @@
  *
  *   FreeType size objects management (specification).
  *
- * Copyright (C) 1996-2023 by
+ * Copyright (C) 1996-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/src/java.desktop/share/native/libfreetype/include/freetype/ftsnames.h b/src/java.desktop/share/native/libfreetype/include/freetype/ftsnames.h
index 9d5d22bb255..d5d5cd93103 100644
--- a/src/java.desktop/share/native/libfreetype/include/freetype/ftsnames.h
+++ b/src/java.desktop/share/native/libfreetype/include/freetype/ftsnames.h
@@ -7,7 +7,7 @@
  *
  *   This is _not_ used to retrieve glyph names!
  *
- * Copyright (C) 1996-2023 by
+ * Copyright (C) 1996-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/src/java.desktop/share/native/libfreetype/include/freetype/ftstroke.h b/src/java.desktop/share/native/libfreetype/include/freetype/ftstroke.h
index b3d90802a56..41626dc9d7b 100644
--- a/src/java.desktop/share/native/libfreetype/include/freetype/ftstroke.h
+++ b/src/java.desktop/share/native/libfreetype/include/freetype/ftstroke.h
@@ -4,7 +4,7 @@
  *
  *   FreeType path stroker (specification).
  *
- * Copyright (C) 2002-2023 by
+ * Copyright (C) 2002-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/src/java.desktop/share/native/libfreetype/include/freetype/ftsynth.h b/src/java.desktop/share/native/libfreetype/include/freetype/ftsynth.h
index af90967dda0..43081b6c330 100644
--- a/src/java.desktop/share/native/libfreetype/include/freetype/ftsynth.h
+++ b/src/java.desktop/share/native/libfreetype/include/freetype/ftsynth.h
@@ -5,7 +5,7 @@
  *   FreeType synthesizing code for emboldening and slanting
  *   (specification).
  *
- * Copyright (C) 2000-2023 by
+ * Copyright (C) 2000-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/src/java.desktop/share/native/libfreetype/include/freetype/ftsystem.h b/src/java.desktop/share/native/libfreetype/include/freetype/ftsystem.h
index 3a08f4912c9..1eacb3af398 100644
--- a/src/java.desktop/share/native/libfreetype/include/freetype/ftsystem.h
+++ b/src/java.desktop/share/native/libfreetype/include/freetype/ftsystem.h
@@ -4,7 +4,7 @@
  *
  *   FreeType low-level system interface definition (specification).
  *
- * Copyright (C) 1996-2023 by
+ * Copyright (C) 1996-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/src/java.desktop/share/native/libfreetype/include/freetype/fttrigon.h b/src/java.desktop/share/native/libfreetype/include/freetype/fttrigon.h
index 294981a6f31..a5299e938d4 100644
--- a/src/java.desktop/share/native/libfreetype/include/freetype/fttrigon.h
+++ b/src/java.desktop/share/native/libfreetype/include/freetype/fttrigon.h
@@ -4,7 +4,7 @@
  *
  *   FreeType trigonometric functions (specification).
  *
- * Copyright (C) 2001-2023 by
+ * Copyright (C) 2001-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/src/java.desktop/share/native/libfreetype/include/freetype/fttypes.h b/src/java.desktop/share/native/libfreetype/include/freetype/fttypes.h
index 5b109f0c73c..27815143a64 100644
--- a/src/java.desktop/share/native/libfreetype/include/freetype/fttypes.h
+++ b/src/java.desktop/share/native/libfreetype/include/freetype/fttypes.h
@@ -4,7 +4,7 @@
  *
  *   FreeType simple types definitions (specification only).
  *
- * Copyright (C) 1996-2023 by
+ * Copyright (C) 1996-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/src/java.desktop/share/native/libfreetype/include/freetype/internal/autohint.h b/src/java.desktop/share/native/libfreetype/include/freetype/internal/autohint.h
index bf9c8b7cf2a..8865d53b389 100644
--- a/src/java.desktop/share/native/libfreetype/include/freetype/internal/autohint.h
+++ b/src/java.desktop/share/native/libfreetype/include/freetype/internal/autohint.h
@@ -4,7 +4,7 @@
  *
  *   High-level 'autohint' module-specific interface (specification).
  *
- * Copyright (C) 1996-2023 by
+ * Copyright (C) 1996-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/src/java.desktop/share/native/libfreetype/include/freetype/internal/cffotypes.h b/src/java.desktop/share/native/libfreetype/include/freetype/internal/cffotypes.h
index 50d53538498..36b0390a5a5 100644
--- a/src/java.desktop/share/native/libfreetype/include/freetype/internal/cffotypes.h
+++ b/src/java.desktop/share/native/libfreetype/include/freetype/internal/cffotypes.h
@@ -4,7 +4,7 @@
  *
  *   Basic OpenType/CFF object type definitions (specification).
  *
- * Copyright (C) 2017-2023 by
+ * Copyright (C) 2017-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/src/java.desktop/share/native/libfreetype/include/freetype/internal/cfftypes.h b/src/java.desktop/share/native/libfreetype/include/freetype/internal/cfftypes.h
index c2521764caa..ef2e8e7569c 100644
--- a/src/java.desktop/share/native/libfreetype/include/freetype/internal/cfftypes.h
+++ b/src/java.desktop/share/native/libfreetype/include/freetype/internal/cfftypes.h
@@ -5,7 +5,7 @@
  *   Basic OpenType/CFF type definitions and interface (specification
  *   only).
  *
- * Copyright (C) 1996-2023 by
+ * Copyright (C) 1996-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
@@ -248,10 +248,10 @@ FT_BEGIN_HEADER
     FT_Byte   num_family_blues;
     FT_Byte   num_family_other_blues;
 
-    FT_Pos    blue_values[14];
-    FT_Pos    other_blues[10];
-    FT_Pos    family_blues[14];
-    FT_Pos    family_other_blues[10];
+    FT_Fixed  blue_values[14];
+    FT_Fixed  other_blues[10];
+    FT_Fixed  family_blues[14];
+    FT_Fixed  family_other_blues[10];
 
     FT_Fixed  blue_scale;
     FT_Pos    blue_shift;
diff --git a/src/java.desktop/share/native/libfreetype/include/freetype/internal/compiler-macros.h b/src/java.desktop/share/native/libfreetype/include/freetype/internal/compiler-macros.h
index 6f67650979e..876f66e2561 100644
--- a/src/java.desktop/share/native/libfreetype/include/freetype/internal/compiler-macros.h
+++ b/src/java.desktop/share/native/libfreetype/include/freetype/internal/compiler-macros.h
@@ -4,7 +4,7 @@
  *
  *   Compiler-specific macro definitions used internally by FreeType.
  *
- * Copyright (C) 2020-2023 by
+ * Copyright (C) 2020-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/src/java.desktop/share/native/libfreetype/include/freetype/internal/ftcalc.h b/src/java.desktop/share/native/libfreetype/include/freetype/internal/ftcalc.h
index d9aea236024..71128a2df90 100644
--- a/src/java.desktop/share/native/libfreetype/include/freetype/internal/ftcalc.h
+++ b/src/java.desktop/share/native/libfreetype/include/freetype/internal/ftcalc.h
@@ -4,7 +4,7 @@
  *
  *   Arithmetic computations (specification).
  *
- * Copyright (C) 1996-2023 by
+ * Copyright (C) 1996-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
@@ -415,7 +415,7 @@ FT_BEGIN_HEADER
 
 #define FT_MSB( x )  ( 31 - _CountLeadingZeros( x ) )
 
-#elif defined( _M_ARM64 ) || defined( _M_ARM )
+#elif defined( _M_ARM64 ) || defined( _M_ARM ) || defined( _M_ARM64EC )
 
 #include <intrin.h>
 #pragma intrinsic( _CountLeadingZeros )
@@ -455,6 +455,12 @@ FT_BEGIN_HEADER
 
 #define FT_MSB( x )  FT_MSB_i386( x )
 
+#elif defined( __SunOS_5_11 )
+
+#include <string.h>
+
+#define FT_MSB( x )  ( fls( x ) - 1 )
+
 #elif defined( __DECC ) || defined( __DECCXX )
 
 #include <builtins.h>
@@ -489,8 +495,6 @@ FT_BEGIN_HEADER
             FT_Fixed  y );
 
 
-#if 0
-
   /**************************************************************************
    *
    * @function:
@@ -507,12 +511,11 @@ FT_BEGIN_HEADER
    *   The result of 'sqrt(x)'.
    *
    * @note:
-   *   This function is not very fast.
+   *   This function is slow and should be avoided.  Consider @FT_Hypot or
+   *   @FT_Vector_NormLen instead.
    */
-  FT_BASE( FT_Int32 )
-  FT_SqrtFixed( FT_Int32  x );
-
-#endif /* 0 */
+  FT_BASE( FT_UInt32 )
+  FT_SqrtFixed( FT_UInt32  x );
 
 
 #define INT_TO_F26DOT6( x )    ( (FT_Long)(x) * 64  )    /* << 6  */
diff --git a/src/java.desktop/share/native/libfreetype/include/freetype/internal/ftdebug.h b/src/java.desktop/share/native/libfreetype/include/freetype/internal/ftdebug.h
index 4e013ba1e26..d7fa8dc93cf 100644
--- a/src/java.desktop/share/native/libfreetype/include/freetype/internal/ftdebug.h
+++ b/src/java.desktop/share/native/libfreetype/include/freetype/internal/ftdebug.h
@@ -4,7 +4,7 @@
  *
  *   Debugging and logging component (specification).
  *
- * Copyright (C) 1996-2023 by
+ * Copyright (C) 1996-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/src/java.desktop/share/native/libfreetype/include/freetype/internal/ftdrv.h b/src/java.desktop/share/native/libfreetype/include/freetype/internal/ftdrv.h
index 9001c07ad0b..5609b3ef12b 100644
--- a/src/java.desktop/share/native/libfreetype/include/freetype/internal/ftdrv.h
+++ b/src/java.desktop/share/native/libfreetype/include/freetype/internal/ftdrv.h
@@ -4,7 +4,7 @@
  *
  *   FreeType internal font driver interface (specification).
  *
- * Copyright (C) 1996-2023 by
+ * Copyright (C) 1996-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/src/java.desktop/share/native/libfreetype/include/freetype/internal/ftgloadr.h b/src/java.desktop/share/native/libfreetype/include/freetype/internal/ftgloadr.h
index 36e5509f9ea..f1c155b162c 100644
--- a/src/java.desktop/share/native/libfreetype/include/freetype/internal/ftgloadr.h
+++ b/src/java.desktop/share/native/libfreetype/include/freetype/internal/ftgloadr.h
@@ -4,7 +4,7 @@
  *
  *   The FreeType glyph loader (specification).
  *
- * Copyright (C) 2002-2023 by
+ * Copyright (C) 2002-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/src/java.desktop/share/native/libfreetype/include/freetype/internal/ftmemory.h b/src/java.desktop/share/native/libfreetype/include/freetype/internal/ftmemory.h
index 5eb1d21ff67..4e05a29f13a 100644
--- a/src/java.desktop/share/native/libfreetype/include/freetype/internal/ftmemory.h
+++ b/src/java.desktop/share/native/libfreetype/include/freetype/internal/ftmemory.h
@@ -4,7 +4,7 @@
  *
  *   The FreeType memory management macros (specification).
  *
- * Copyright (C) 1996-2023 by
+ * Copyright (C) 1996-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg
  *
  * This file is part of the FreeType project, and may only be used,
@@ -371,8 +371,11 @@ extern "C++"
 #define FT_STRDUP( dst, str )                           \
           FT_MEM_SET_ERROR( FT_MEM_STRDUP( dst, str ) )
 
-#define FT_MEM_DUP( dst, address, size )                                    \
-          (dst) = ft_mem_dup( memory, (address), (FT_ULong)(size), &error )
+#define FT_MEM_DUP( dst, address, size )                       \
+          FT_ASSIGNP_INNER( dst, ft_mem_dup( memory,           \
+                                             (address),        \
+                                             (FT_ULong)(size), \
+                                             &error ) )
 
 #define FT_DUP( dst, address, size )                           \
           FT_MEM_SET_ERROR( FT_MEM_DUP( dst, address, size ) )
diff --git a/src/java.desktop/share/native/libfreetype/include/freetype/internal/ftmmtypes.h b/src/java.desktop/share/native/libfreetype/include/freetype/internal/ftmmtypes.h
index c4b21d6144e..8449e7a010d 100644
--- a/src/java.desktop/share/native/libfreetype/include/freetype/internal/ftmmtypes.h
+++ b/src/java.desktop/share/native/libfreetype/include/freetype/internal/ftmmtypes.h
@@ -5,7 +5,7 @@
  *   OpenType Variations type definitions for internal use
  *   with the multi-masters service (specification).
  *
- * Copyright (C) 2022-2023 by
+ * Copyright (C) 2022-2024 by
  * David Turner, Robert Wilhelm, Werner Lemberg, George Williams, and
  * Dominik Röttsches.
  *
diff --git a/src/java.desktop/share/native/libfreetype/include/freetype/internal/ftobjs.h b/src/java.desktop/share/native/libfreetype/include/freetype/internal/ftobjs.h
index 28bc9b65f05..a1e93298fdb 100644
--- a/src/java.desktop/share/native/libfreetype/include/freetype/internal/ftobjs.h
+++ b/src/java.desktop/share/native/libfreetype/include/freetype/internal/ftobjs.h
@@ -4,7 +4,7 @@
  *
  *   The FreeType private base classes (specification).
  *
- * Copyright (C) 1996-2023 by
+ * Copyright (C) 1996-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
@@ -604,12 +604,6 @@ FT_BEGIN_HEADER
 #define FT_FACE_MEMORY( x )   FT_FACE( x )->memory
 #define FT_FACE_STREAM( x )   FT_FACE( x )->stream
 
-#define FT_SIZE_FACE( x )     FT_SIZE( x )->face
-#define FT_SLOT_FACE( x )     FT_SLOT( x )->face
-
-#define FT_FACE_SLOT( x )     FT_FACE( x )->glyph
-#define FT_FACE_SIZE( x )     FT_FACE( x )->size
-
 
   /**************************************************************************
    *
diff --git a/src/java.desktop/share/native/libfreetype/include/freetype/internal/ftpsprop.h b/src/java.desktop/share/native/libfreetype/include/freetype/internal/ftpsprop.h
index 1d5b287ad20..4f11aa16ba1 100644
--- a/src/java.desktop/share/native/libfreetype/include/freetype/internal/ftpsprop.h
+++ b/src/java.desktop/share/native/libfreetype/include/freetype/internal/ftpsprop.h
@@ -4,7 +4,7 @@
  *
  *   Get and set properties of PostScript drivers (specification).
  *
- * Copyright (C) 2017-2023 by
+ * Copyright (C) 2017-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/src/java.desktop/share/native/libfreetype/include/freetype/internal/ftrfork.h b/src/java.desktop/share/native/libfreetype/include/freetype/internal/ftrfork.h
index e96459921ef..05c1d6c48b5 100644
--- a/src/java.desktop/share/native/libfreetype/include/freetype/internal/ftrfork.h
+++ b/src/java.desktop/share/native/libfreetype/include/freetype/internal/ftrfork.h
@@ -4,7 +4,7 @@
  *
  *   Embedded resource forks accessor (specification).
  *
- * Copyright (C) 2004-2023 by
+ * Copyright (C) 2004-2024 by
  * Masatake YAMATO and Redhat K.K.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/src/java.desktop/share/native/libfreetype/include/freetype/internal/ftserv.h b/src/java.desktop/share/native/libfreetype/include/freetype/internal/ftserv.h
index 1e85d6d3856..8c35dbd7139 100644
--- a/src/java.desktop/share/native/libfreetype/include/freetype/internal/ftserv.h
+++ b/src/java.desktop/share/native/libfreetype/include/freetype/internal/ftserv.h
@@ -4,7 +4,7 @@
  *
  *   The FreeType services (specification only).
  *
- * Copyright (C) 2003-2023 by
+ * Copyright (C) 2003-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/src/java.desktop/share/native/libfreetype/include/freetype/internal/ftstream.h b/src/java.desktop/share/native/libfreetype/include/freetype/internal/ftstream.h
index 88e19287c80..fd52f767ef7 100644
--- a/src/java.desktop/share/native/libfreetype/include/freetype/internal/ftstream.h
+++ b/src/java.desktop/share/native/libfreetype/include/freetype/internal/ftstream.h
@@ -4,7 +4,7 @@
  *
  *   Stream handling (specification).
  *
- * Copyright (C) 1996-2023 by
+ * Copyright (C) 1996-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/src/java.desktop/share/native/libfreetype/include/freetype/internal/fttrace.h b/src/java.desktop/share/native/libfreetype/include/freetype/internal/fttrace.h
index 319fe56fd2d..42595a29ff3 100644
--- a/src/java.desktop/share/native/libfreetype/include/freetype/internal/fttrace.h
+++ b/src/java.desktop/share/native/libfreetype/include/freetype/internal/fttrace.h
@@ -4,7 +4,7 @@
  *
  *   Tracing handling (specification only).
  *
- * Copyright (C) 2002-2023 by
+ * Copyright (C) 2002-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
@@ -64,6 +64,7 @@ FT_TRACE_DEF( ttbdf )     /* TrueType embedded BDF   (ttbdf.c)    */
 FT_TRACE_DEF( ttcmap )    /* charmap handler         (ttcmap.c)   */
 FT_TRACE_DEF( ttcolr )    /* glyph layer table       (ttcolr.c)   */
 FT_TRACE_DEF( ttcpal )    /* color palette table     (ttcpal.c)   */
+FT_TRACE_DEF( ttgpos )    /* GPOS handler            (ttgpos.c)   */
 FT_TRACE_DEF( ttsvg )     /* OpenType SVG table      (ttsvg.c)    */
 FT_TRACE_DEF( ttkern )    /* kerning handler         (ttkern.c)   */
 FT_TRACE_DEF( ttload )    /* basic TrueType tables   (ttload.c)   */
diff --git a/src/java.desktop/share/native/libfreetype/include/freetype/internal/ftvalid.h b/src/java.desktop/share/native/libfreetype/include/freetype/internal/ftvalid.h
index e98ee4e4737..a1312f2aba6 100644
--- a/src/java.desktop/share/native/libfreetype/include/freetype/internal/ftvalid.h
+++ b/src/java.desktop/share/native/libfreetype/include/freetype/internal/ftvalid.h
@@ -4,7 +4,7 @@
  *
  *   FreeType validation support (specification).
  *
- * Copyright (C) 2004-2023 by
+ * Copyright (C) 2004-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/src/java.desktop/share/native/libfreetype/include/freetype/internal/psaux.h b/src/java.desktop/share/native/libfreetype/include/freetype/internal/psaux.h
index dfb1987f868..745d2cb56b7 100644
--- a/src/java.desktop/share/native/libfreetype/include/freetype/internal/psaux.h
+++ b/src/java.desktop/share/native/libfreetype/include/freetype/internal/psaux.h
@@ -5,7 +5,7 @@
  *   Auxiliary functions and data structures related to PostScript fonts
  *   (specification).
  *
- * Copyright (C) 1996-2023 by
+ * Copyright (C) 1996-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
@@ -225,6 +225,7 @@ FT_BEGIN_HEADER
 
   typedef enum  T1_FieldLocation_
   {
+    T1_FIELD_LOCATION_NONE = 0,
     T1_FIELD_LOCATION_CID_INFO,
     T1_FIELD_LOCATION_FONT_DICT,
     T1_FIELD_LOCATION_FONT_EXTRA,
@@ -249,6 +250,7 @@ FT_BEGIN_HEADER
   /* structure type used to model object fields */
   typedef struct  T1_FieldRec_
   {
+    FT_UInt             len;          /* field identifier length        */
     const char*         ident;        /* field identifier               */
     T1_FieldLocation    location;
     T1_FieldType        type;         /* type of field                  */
@@ -273,8 +275,9 @@ FT_BEGIN_HEADER
 
 #define T1_NEW_SIMPLE_FIELD( _ident, _type, _fname, _dict ) \
           {                                                 \
+            sizeof ( _ident ) - 1,                          \
             _ident, T1CODE, _type,                          \
-            0,                                              \
+            NULL,                                           \
             FT_FIELD_OFFSET( _fname ),                      \
             FT_FIELD_SIZE( _fname ),                        \
             0, 0,                                           \
@@ -283,6 +286,7 @@ FT_BEGIN_HEADER
 
 #define T1_NEW_CALLBACK_FIELD( _ident, _reader, _dict ) \
           {                                             \
+            sizeof ( _ident ) - 1,                      \
             _ident, T1CODE, T1_FIELD_TYPE_CALLBACK,     \
             (T1_Field_ParseFunc)_reader,                \
             0, 0,                                       \
@@ -292,8 +296,9 @@ FT_BEGIN_HEADER
 
 #define T1_NEW_TABLE_FIELD( _ident, _type, _fname, _max, _dict ) \
           {                                                      \
+            sizeof ( _ident ) - 1,                               \
             _ident, T1CODE, _type,                               \
-            0,                                                   \
+            NULL,                                                \
             FT_FIELD_OFFSET( _fname ),                           \
             FT_FIELD_SIZE_DELTA( _fname ),                       \
             _max,                                                \
@@ -303,8 +308,9 @@ FT_BEGIN_HEADER
 
 #define T1_NEW_TABLE_FIELD2( _ident, _type, _fname, _max, _dict ) \
           {                                                       \
+            sizeof ( _ident ) - 1,                                \
             _ident, T1CODE, _type,                                \
-            0,                                                    \
+            NULL,                                                 \
             FT_FIELD_OFFSET( _fname ),                            \
             FT_FIELD_SIZE_DELTA( _fname ),                        \
             _max, 0,                                              \
@@ -354,6 +360,13 @@ FT_BEGIN_HEADER
 #define T1_FIELD_CALLBACK( _ident, _name, _dict )       \
           T1_NEW_CALLBACK_FIELD( _ident, _name, _dict )
 
+#define T1_FIELD_ZERO                                         \
+          {                                                   \
+            0,                                                \
+            NULL, T1_FIELD_LOCATION_NONE, T1_FIELD_TYPE_NONE, \
+            NULL, 0, 0, 0, 0, 0                               \
+          }
+
 
   /*************************************************************************/
   /*************************************************************************/
diff --git a/src/java.desktop/share/native/libfreetype/include/freetype/internal/pshints.h b/src/java.desktop/share/native/libfreetype/include/freetype/internal/pshints.h
index ededc4c72e7..dba6c7303fd 100644
--- a/src/java.desktop/share/native/libfreetype/include/freetype/internal/pshints.h
+++ b/src/java.desktop/share/native/libfreetype/include/freetype/internal/pshints.h
@@ -6,7 +6,7 @@
  *   recorders (specification only).  These are used to support native
  *   T1/T2 hints in the 'type1', 'cid', and 'cff' font drivers.
  *
- * Copyright (C) 2001-2023 by
+ * Copyright (C) 2001-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/src/java.desktop/share/native/libfreetype/include/freetype/internal/services/svbdf.h b/src/java.desktop/share/native/libfreetype/include/freetype/internal/services/svbdf.h
index bf0c1dcc714..89e9c2e5de8 100644
--- a/src/java.desktop/share/native/libfreetype/include/freetype/internal/services/svbdf.h
+++ b/src/java.desktop/share/native/libfreetype/include/freetype/internal/services/svbdf.h
@@ -4,7 +4,7 @@
  *
  *   The FreeType BDF services (specification).
  *
- * Copyright (C) 2003-2023 by
+ * Copyright (C) 2003-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/src/java.desktop/share/native/libfreetype/include/freetype/internal/services/svcfftl.h b/src/java.desktop/share/native/libfreetype/include/freetype/internal/services/svcfftl.h
index 4a20498ee0c..3cb483c344f 100644
--- a/src/java.desktop/share/native/libfreetype/include/freetype/internal/services/svcfftl.h
+++ b/src/java.desktop/share/native/libfreetype/include/freetype/internal/services/svcfftl.h
@@ -4,7 +4,7 @@
  *
  *   The FreeType CFF tables loader service (specification).
  *
- * Copyright (C) 2017-2023 by
+ * Copyright (C) 2017-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/src/java.desktop/share/native/libfreetype/include/freetype/internal/services/svcid.h b/src/java.desktop/share/native/libfreetype/include/freetype/internal/services/svcid.h
index 06d0cb8fd62..8362cb8724d 100644
--- a/src/java.desktop/share/native/libfreetype/include/freetype/internal/services/svcid.h
+++ b/src/java.desktop/share/native/libfreetype/include/freetype/internal/services/svcid.h
@@ -4,7 +4,7 @@
  *
  *   The FreeType CID font services (specification).
  *
- * Copyright (C) 2007-2023 by
+ * Copyright (C) 2007-2024 by
  * Derek Clegg and Michael Toftdal.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/src/java.desktop/share/native/libfreetype/include/freetype/internal/services/svfntfmt.h b/src/java.desktop/share/native/libfreetype/include/freetype/internal/services/svfntfmt.h
index bc45e80568f..6b837e79fcd 100644
--- a/src/java.desktop/share/native/libfreetype/include/freetype/internal/services/svfntfmt.h
+++ b/src/java.desktop/share/native/libfreetype/include/freetype/internal/services/svfntfmt.h
@@ -4,7 +4,7 @@
  *
  *   The FreeType font format service (specification only).
  *
- * Copyright (C) 2003-2023 by
+ * Copyright (C) 2003-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/src/java.desktop/share/native/libfreetype/include/freetype/internal/services/svgldict.h b/src/java.desktop/share/native/libfreetype/include/freetype/internal/services/svgldict.h
index 6437abfbf2e..6126ec9ada4 100644
--- a/src/java.desktop/share/native/libfreetype/include/freetype/internal/services/svgldict.h
+++ b/src/java.desktop/share/native/libfreetype/include/freetype/internal/services/svgldict.h
@@ -4,7 +4,7 @@
  *
  *   The FreeType glyph dictionary services (specification).
  *
- * Copyright (C) 2003-2023 by
+ * Copyright (C) 2003-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/src/java.desktop/share/native/libfreetype/include/freetype/internal/services/svgxval.h b/src/java.desktop/share/native/libfreetype/include/freetype/internal/services/svgxval.h
index 31016afe0d0..29cf5528189 100644
--- a/src/java.desktop/share/native/libfreetype/include/freetype/internal/services/svgxval.h
+++ b/src/java.desktop/share/native/libfreetype/include/freetype/internal/services/svgxval.h
@@ -4,7 +4,7 @@
  *
  *   FreeType API for validating TrueTypeGX/AAT tables (specification).
  *
- * Copyright (C) 2004-2023 by
+ * Copyright (C) 2004-2024 by
  * Masatake YAMATO, Red Hat K.K.,
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
diff --git a/src/java.desktop/share/native/libfreetype/include/freetype/internal/services/svkern.h b/src/java.desktop/share/native/libfreetype/include/freetype/internal/services/svkern.h
index bcabbc3e68f..ac1bc30c412 100644
--- a/src/java.desktop/share/native/libfreetype/include/freetype/internal/services/svkern.h
+++ b/src/java.desktop/share/native/libfreetype/include/freetype/internal/services/svkern.h
@@ -4,7 +4,7 @@
  *
  *   The FreeType Kerning service (specification).
  *
- * Copyright (C) 2006-2023 by
+ * Copyright (C) 2006-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/src/java.desktop/share/native/libfreetype/include/freetype/internal/services/svmetric.h b/src/java.desktop/share/native/libfreetype/include/freetype/internal/services/svmetric.h
index 167617ebb3d..8b3563b25ca 100644
--- a/src/java.desktop/share/native/libfreetype/include/freetype/internal/services/svmetric.h
+++ b/src/java.desktop/share/native/libfreetype/include/freetype/internal/services/svmetric.h
@@ -4,7 +4,7 @@
  *
  *   The FreeType services for metrics variations (specification).
  *
- * Copyright (C) 2016-2023 by
+ * Copyright (C) 2016-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/src/java.desktop/share/native/libfreetype/include/freetype/internal/services/svmm.h b/src/java.desktop/share/native/libfreetype/include/freetype/internal/services/svmm.h
index 7e76ab8324e..5288fadf375 100644
--- a/src/java.desktop/share/native/libfreetype/include/freetype/internal/services/svmm.h
+++ b/src/java.desktop/share/native/libfreetype/include/freetype/internal/services/svmm.h
@@ -4,7 +4,7 @@
  *
  *   The FreeType Multiple Masters and GX var services (specification).
  *
- * Copyright (C) 2003-2023 by
+ * Copyright (C) 2003-2024 by
  * David Turner, Robert Wilhelm, Werner Lemberg, and Dominik Röttsches.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/src/java.desktop/share/native/libfreetype/include/freetype/internal/services/svotval.h b/src/java.desktop/share/native/libfreetype/include/freetype/internal/services/svotval.h
index a4683cd5fb6..7aea7ec11f0 100644
--- a/src/java.desktop/share/native/libfreetype/include/freetype/internal/services/svotval.h
+++ b/src/java.desktop/share/native/libfreetype/include/freetype/internal/services/svotval.h
@@ -4,7 +4,7 @@
  *
  *   The FreeType OpenType validation service (specification).
  *
- * Copyright (C) 2004-2023 by
+ * Copyright (C) 2004-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/src/java.desktop/share/native/libfreetype/include/freetype/internal/services/svpfr.h b/src/java.desktop/share/native/libfreetype/include/freetype/internal/services/svpfr.h
index fd189c7de77..b2fac6d086b 100644
--- a/src/java.desktop/share/native/libfreetype/include/freetype/internal/services/svpfr.h
+++ b/src/java.desktop/share/native/libfreetype/include/freetype/internal/services/svpfr.h
@@ -4,7 +4,7 @@
  *
  *   Internal PFR service functions (specification).
  *
- * Copyright (C) 2003-2023 by
+ * Copyright (C) 2003-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/src/java.desktop/share/native/libfreetype/include/freetype/internal/services/svpostnm.h b/src/java.desktop/share/native/libfreetype/include/freetype/internal/services/svpostnm.h
index 2b8f6dfecfb..d19f3adc6d5 100644
--- a/src/java.desktop/share/native/libfreetype/include/freetype/internal/services/svpostnm.h
+++ b/src/java.desktop/share/native/libfreetype/include/freetype/internal/services/svpostnm.h
@@ -4,7 +4,7 @@
  *
  *   The FreeType PostScript name services (specification).
  *
- * Copyright (C) 2003-2023 by
+ * Copyright (C) 2003-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/src/java.desktop/share/native/libfreetype/include/freetype/internal/services/svprop.h b/src/java.desktop/share/native/libfreetype/include/freetype/internal/services/svprop.h
index 932ce32e03d..ba39c0dd4da 100644
--- a/src/java.desktop/share/native/libfreetype/include/freetype/internal/services/svprop.h
+++ b/src/java.desktop/share/native/libfreetype/include/freetype/internal/services/svprop.h
@@ -4,7 +4,7 @@
  *
  *   The FreeType property service (specification).
  *
- * Copyright (C) 2012-2023 by
+ * Copyright (C) 2012-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/src/java.desktop/share/native/libfreetype/include/freetype/internal/services/svpscmap.h b/src/java.desktop/share/native/libfreetype/include/freetype/internal/services/svpscmap.h
index 6e599f3aabe..d4908ee41aa 100644
--- a/src/java.desktop/share/native/libfreetype/include/freetype/internal/services/svpscmap.h
+++ b/src/java.desktop/share/native/libfreetype/include/freetype/internal/services/svpscmap.h
@@ -4,7 +4,7 @@
  *
  *   The FreeType PostScript charmap service (specification).
  *
- * Copyright (C) 2003-2023 by
+ * Copyright (C) 2003-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/src/java.desktop/share/native/libfreetype/include/freetype/internal/services/svpsinfo.h b/src/java.desktop/share/native/libfreetype/include/freetype/internal/services/svpsinfo.h
index 09c4cdccc53..2aadcdd02a1 100644
--- a/src/java.desktop/share/native/libfreetype/include/freetype/internal/services/svpsinfo.h
+++ b/src/java.desktop/share/native/libfreetype/include/freetype/internal/services/svpsinfo.h
@@ -4,7 +4,7 @@
  *
  *   The FreeType PostScript info service (specification).
  *
- * Copyright (C) 2003-2023 by
+ * Copyright (C) 2003-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/src/java.desktop/share/native/libfreetype/include/freetype/internal/services/svsfnt.h b/src/java.desktop/share/native/libfreetype/include/freetype/internal/services/svsfnt.h
index f98df2ef5fe..9e0f4ff202e 100644
--- a/src/java.desktop/share/native/libfreetype/include/freetype/internal/services/svsfnt.h
+++ b/src/java.desktop/share/native/libfreetype/include/freetype/internal/services/svsfnt.h
@@ -4,7 +4,7 @@
  *
  *   The FreeType SFNT table loading service (specification).
  *
- * Copyright (C) 2003-2023 by
+ * Copyright (C) 2003-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/src/java.desktop/share/native/libfreetype/include/freetype/internal/services/svttcmap.h b/src/java.desktop/share/native/libfreetype/include/freetype/internal/services/svttcmap.h
index 5f9eb02d665..250886bcc5d 100644
--- a/src/java.desktop/share/native/libfreetype/include/freetype/internal/services/svttcmap.h
+++ b/src/java.desktop/share/native/libfreetype/include/freetype/internal/services/svttcmap.h
@@ -4,7 +4,7 @@
  *
  *   The FreeType TrueType/sfnt cmap extra information service.
  *
- * Copyright (C) 2003-2023 by
+ * Copyright (C) 2003-2024 by
  * Masatake YAMATO, Redhat K.K.,
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
diff --git a/src/java.desktop/share/native/libfreetype/include/freetype/internal/services/svtteng.h b/src/java.desktop/share/native/libfreetype/include/freetype/internal/services/svtteng.h
index ad577cb2904..14967529a9a 100644
--- a/src/java.desktop/share/native/libfreetype/include/freetype/internal/services/svtteng.h
+++ b/src/java.desktop/share/native/libfreetype/include/freetype/internal/services/svtteng.h
@@ -4,7 +4,7 @@
  *
  *   The FreeType TrueType engine query service (specification).
  *
- * Copyright (C) 2006-2023 by
+ * Copyright (C) 2006-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/src/java.desktop/share/native/libfreetype/include/freetype/internal/services/svttglyf.h b/src/java.desktop/share/native/libfreetype/include/freetype/internal/services/svttglyf.h
index ca6fff74444..f190b3985d0 100644
--- a/src/java.desktop/share/native/libfreetype/include/freetype/internal/services/svttglyf.h
+++ b/src/java.desktop/share/native/libfreetype/include/freetype/internal/services/svttglyf.h
@@ -4,7 +4,7 @@
  *
  *   The FreeType TrueType glyph service.
  *
- * Copyright (C) 2007-2023 by
+ * Copyright (C) 2007-2024 by
  * David Turner.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/src/java.desktop/share/native/libfreetype/include/freetype/internal/services/svwinfnt.h b/src/java.desktop/share/native/libfreetype/include/freetype/internal/services/svwinfnt.h
index 002923f8c91..49f3fb7f775 100644
--- a/src/java.desktop/share/native/libfreetype/include/freetype/internal/services/svwinfnt.h
+++ b/src/java.desktop/share/native/libfreetype/include/freetype/internal/services/svwinfnt.h
@@ -4,7 +4,7 @@
  *
  *   The FreeType Windows FNT/FONT service (specification).
  *
- * Copyright (C) 2003-2023 by
+ * Copyright (C) 2003-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/src/java.desktop/share/native/libfreetype/include/freetype/internal/sfnt.h b/src/java.desktop/share/native/libfreetype/include/freetype/internal/sfnt.h
index a2d4e15baaf..35e4e73af02 100644
--- a/src/java.desktop/share/native/libfreetype/include/freetype/internal/sfnt.h
+++ b/src/java.desktop/share/native/libfreetype/include/freetype/internal/sfnt.h
@@ -4,7 +4,7 @@
  *
  *   High-level 'sfnt' driver interface (specification).
  *
- * Copyright (C) 1996-2023 by
+ * Copyright (C) 1996-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
@@ -924,6 +924,7 @@ FT_BEGIN_HEADER
     /* this field was called `load_kerning' up to version 2.1.10 */
     TT_Load_Table_Func  load_kern;
 
+    TT_Load_Table_Func  load_gpos;
     TT_Load_Table_Func  load_gasp;
     TT_Load_Table_Func  load_pclt;
 
@@ -944,6 +945,8 @@ FT_BEGIN_HEADER
 
     /* new elements introduced after version 2.1.10 */
 
+    TT_Face_GetKerningFunc  get_gpos_kerning;
+
     /* load the font directory, i.e., the offset table and */
     /* the table directory                                 */
     TT_Load_Table_Func    load_font_dir;
@@ -1002,6 +1005,7 @@ FT_BEGIN_HEADER
           load_name_,                    \
           free_name_,                    \
           load_kern_,                    \
+          load_gpos_,                    \
           load_gasp_,                    \
           load_pclt_,                    \
           load_bhed_,                    \
@@ -1009,6 +1013,7 @@ FT_BEGIN_HEADER
           get_psname_,                   \
           free_psnames_,                 \
           get_kerning_,                  \
+          get_gpos_kerning_,             \
           load_font_dir_,                \
           load_hmtx_,                    \
           load_eblc_,                    \
@@ -1050,6 +1055,7 @@ FT_BEGIN_HEADER
     load_name_,                          \
     free_name_,                          \
     load_kern_,                          \
+    load_gpos_,                          \
     load_gasp_,                          \
     load_pclt_,                          \
     load_bhed_,                          \
@@ -1057,6 +1063,7 @@ FT_BEGIN_HEADER
     get_psname_,                         \
     free_psnames_,                       \
     get_kerning_,                        \
+    get_gpos_kerning_,                   \
     load_font_dir_,                      \
     load_hmtx_,                          \
     load_eblc_,                          \
diff --git a/src/java.desktop/share/native/libfreetype/include/freetype/internal/svginterface.h b/src/java.desktop/share/native/libfreetype/include/freetype/internal/svginterface.h
index f464b2c0583..68c99efb10a 100644
--- a/src/java.desktop/share/native/libfreetype/include/freetype/internal/svginterface.h
+++ b/src/java.desktop/share/native/libfreetype/include/freetype/internal/svginterface.h
@@ -4,7 +4,7 @@
  *
  *   Interface of ot-svg module (specification only).
  *
- * Copyright (C) 2022-2023 by
+ * Copyright (C) 2022-2024 by
  * David Turner, Robert Wilhelm, Werner Lemberg, and Moazin Khatti.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/src/java.desktop/share/native/libfreetype/include/freetype/internal/t1types.h b/src/java.desktop/share/native/libfreetype/include/freetype/internal/t1types.h
index b9c94398fd1..1821ae5cc83 100644
--- a/src/java.desktop/share/native/libfreetype/include/freetype/internal/t1types.h
+++ b/src/java.desktop/share/native/libfreetype/include/freetype/internal/t1types.h
@@ -5,7 +5,7 @@
  *   Basic Type1/Type2 type definitions and interface (specification
  *   only).
  *
- * Copyright (C) 1996-2023 by
+ * Copyright (C) 1996-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
@@ -21,7 +21,7 @@
 #define T1TYPES_H_
 
 
-#include <freetype/t1tables.h>
+#include <freetype/ftmm.h>
 #include <freetype/internal/pshints.h>
 #include <freetype/internal/ftserv.h>
 #include <freetype/internal/fthash.h>
@@ -137,6 +137,54 @@ FT_BEGIN_HEADER
   } CID_SubrsRec, *CID_Subrs;
 
 
+  /* this structure is used to store the BlendDesignMap entry for an axis */
+  typedef struct  PS_DesignMap_
+  {
+    FT_Byte    num_points;
+    FT_Long*   design_points;
+    FT_Fixed*  blend_points;
+
+  } PS_DesignMapRec, *PS_DesignMap;
+
+  /* backward compatible definition */
+  typedef PS_DesignMapRec  T1_DesignMap;
+
+
+  typedef struct  PS_BlendRec_
+  {
+    FT_UInt          num_designs;
+    FT_UInt          num_axis;
+
+    FT_String*       axis_names[T1_MAX_MM_AXIS];
+    FT_Fixed*        design_pos[T1_MAX_MM_DESIGNS];
+    PS_DesignMapRec  design_map[T1_MAX_MM_AXIS];
+
+    FT_Fixed*        weight_vector;
+    FT_Fixed*        default_weight_vector;
+
+    PS_FontInfo      font_infos[T1_MAX_MM_DESIGNS + 1];
+    PS_Private       privates  [T1_MAX_MM_DESIGNS + 1];
+
+    FT_ULong         blend_bitflags;
+
+    FT_BBox*         bboxes    [T1_MAX_MM_DESIGNS + 1];
+
+    /* since 2.3.0 */
+
+    /* undocumented, optional: the default design instance;   */
+    /* corresponds to default_weight_vector --                */
+    /* num_default_design_vector == 0 means it is not present */
+    /* in the font and associated metrics files               */
+    FT_UInt          default_design_vector[T1_MAX_MM_DESIGNS];
+    FT_UInt          num_default_design_vector;
+
+  } PS_BlendRec, *PS_Blend;
+
+
+  /* backward compatible definition */
+  typedef PS_BlendRec  T1_Blend;
+
+
   /*************************************************************************/
   /*************************************************************************/
   /*************************************************************************/
diff --git a/src/java.desktop/share/native/libfreetype/include/freetype/internal/tttypes.h b/src/java.desktop/share/native/libfreetype/include/freetype/internal/tttypes.h
index b9788c7831e..7053e656a7e 100644
--- a/src/java.desktop/share/native/libfreetype/include/freetype/internal/tttypes.h
+++ b/src/java.desktop/share/native/libfreetype/include/freetype/internal/tttypes.h
@@ -5,7 +5,7 @@
  *   Basic SFNT/TrueType type definitions and interface (specification
  *   only).
  *
- * Copyright (C) 1996-2023 by
+ * Copyright (C) 1996-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
@@ -24,6 +24,7 @@
 #include <freetype/tttables.h>
 #include <freetype/internal/ftobjs.h>
 #include <freetype/ftcolor.h>
+#include "freetype/fttypes.h"
 
 #ifdef TT_CONFIG_OPTION_GX_VAR_SUPPORT
 #include <freetype/ftmm.h>
@@ -1581,6 +1582,11 @@ FT_BEGIN_HEADER
     FT_UInt32             kern_avail_bits;
     FT_UInt32             kern_order_bits;
 
+#ifdef TT_CONFIG_OPTION_GPOS_KERNING
+    FT_Byte*              gpos_table;
+    FT_Bool               gpos_kerning_available;
+#endif
+
 #ifdef TT_CONFIG_OPTION_BDF
     TT_BDFRec             bdf;
 #endif /* TT_CONFIG_OPTION_BDF */
@@ -1649,9 +1655,9 @@ FT_BEGIN_HEADER
   {
     FT_Memory   memory;
     FT_UShort   max_points;
-    FT_Short    max_contours;
+    FT_UShort   max_contours;
     FT_UShort   n_points;    /* number of points in zone    */
-    FT_Short    n_contours;  /* number of contours          */
+    FT_UShort   n_contours;  /* number of contours          */
 
     FT_Vector*  org;         /* original point coordinates  */
     FT_Vector*  cur;         /* current point coordinates   */
diff --git a/src/java.desktop/share/native/libfreetype/include/freetype/internal/wofftypes.h b/src/java.desktop/share/native/libfreetype/include/freetype/internal/wofftypes.h
index 0c1d8eeaf8c..4a169d12f57 100644
--- a/src/java.desktop/share/native/libfreetype/include/freetype/internal/wofftypes.h
+++ b/src/java.desktop/share/native/libfreetype/include/freetype/internal/wofftypes.h
@@ -5,7 +5,7 @@
  *   Basic WOFF/WOFF2 type definitions and interface (specification
  *   only).
  *
- * Copyright (C) 1996-2023 by
+ * Copyright (C) 1996-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/src/java.desktop/share/native/libfreetype/include/freetype/otsvg.h b/src/java.desktop/share/native/libfreetype/include/freetype/otsvg.h
index bfe9a6ab74e..9d356938cc7 100644
--- a/src/java.desktop/share/native/libfreetype/include/freetype/otsvg.h
+++ b/src/java.desktop/share/native/libfreetype/include/freetype/otsvg.h
@@ -4,7 +4,7 @@
  *
  *   Interface for OT-SVG support related things (specification).
  *
- * Copyright (C) 2022-2023 by
+ * Copyright (C) 2022-2024 by
  * David Turner, Robert Wilhelm, Werner Lemberg, and Moazin Khatti.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/src/java.desktop/share/native/libfreetype/include/freetype/t1tables.h b/src/java.desktop/share/native/libfreetype/include/freetype/t1tables.h
index 1aecfbbd902..fbd558aa34d 100644
--- a/src/java.desktop/share/native/libfreetype/include/freetype/t1tables.h
+++ b/src/java.desktop/share/native/libfreetype/include/freetype/t1tables.h
@@ -5,7 +5,7 @@
  *   Basic Type 1/Type 2 tables definitions and interface (specification
  *   only).
  *
- * Copyright (C) 1996-2023 by
+ * Copyright (C) 1996-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
@@ -269,64 +269,6 @@ FT_BEGIN_HEADER
   /* */
 
 
-  /* maximum number of Multiple Masters designs, as defined in the spec */
-#define T1_MAX_MM_DESIGNS     16
-
-  /* maximum number of Multiple Masters axes, as defined in the spec */
-#define T1_MAX_MM_AXIS        4
-
-  /* maximum number of elements in a design map */
-#define T1_MAX_MM_MAP_POINTS  20
-
-
-  /* this structure is used to store the BlendDesignMap entry for an axis */
-  typedef struct  PS_DesignMap_
-  {
-    FT_Byte    num_points;
-    FT_Long*   design_points;
-    FT_Fixed*  blend_points;
-
-  } PS_DesignMapRec, *PS_DesignMap;
-
-  /* backward compatible definition */
-  typedef PS_DesignMapRec  T1_DesignMap;
-
-
-  typedef struct  PS_BlendRec_
-  {
-    FT_UInt          num_designs;
-    FT_UInt          num_axis;
-
-    FT_String*       axis_names[T1_MAX_MM_AXIS];
-    FT_Fixed*        design_pos[T1_MAX_MM_DESIGNS];
-    PS_DesignMapRec  design_map[T1_MAX_MM_AXIS];
-
-    FT_Fixed*        weight_vector;
-    FT_Fixed*        default_weight_vector;
-
-    PS_FontInfo      font_infos[T1_MAX_MM_DESIGNS + 1];
-    PS_Private       privates  [T1_MAX_MM_DESIGNS + 1];
-
-    FT_ULong         blend_bitflags;
-
-    FT_BBox*         bboxes    [T1_MAX_MM_DESIGNS + 1];
-
-    /* since 2.3.0 */
-
-    /* undocumented, optional: the default design instance;   */
-    /* corresponds to default_weight_vector --                */
-    /* num_default_design_vector == 0 means it is not present */
-    /* in the font and associated metrics files               */
-    FT_UInt          default_design_vector[T1_MAX_MM_DESIGNS];
-    FT_UInt          num_default_design_vector;
-
-  } PS_BlendRec, *PS_Blend;
-
-
-  /* backward compatible definition */
-  typedef PS_BlendRec  T1_Blend;
-
-
   /**************************************************************************
    *
    * @struct:
diff --git a/src/java.desktop/share/native/libfreetype/include/freetype/ttnameid.h b/src/java.desktop/share/native/libfreetype/include/freetype/ttnameid.h
index e31c68b9baf..d5d470e380f 100644
--- a/src/java.desktop/share/native/libfreetype/include/freetype/ttnameid.h
+++ b/src/java.desktop/share/native/libfreetype/include/freetype/ttnameid.h
@@ -4,7 +4,7 @@
  *
  *   TrueType name ID definitions (specification only).
  *
- * Copyright (C) 1996-2023 by
+ * Copyright (C) 1996-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/src/java.desktop/share/native/libfreetype/include/freetype/tttables.h b/src/java.desktop/share/native/libfreetype/include/freetype/tttables.h
index a9f60e76201..2cf0ff1bc61 100644
--- a/src/java.desktop/share/native/libfreetype/include/freetype/tttables.h
+++ b/src/java.desktop/share/native/libfreetype/include/freetype/tttables.h
@@ -5,7 +5,7 @@
  *   Basic SFNT/TrueType tables definitions and interface
  *   (specification only).
  *
- * Copyright (C) 1996-2023 by
+ * Copyright (C) 1996-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
@@ -838,8 +838,9 @@ FT_BEGIN_HEADER
    *     The target charmap.
    *
    * @return:
-   *   The format of `charmap`.  If `charmap` doesn't belong to an SFNT face,
-   *   return -1.
+   *   The format of `charmap`.  If `charmap` doesn't belong to an SFNT face
+   *   (including the synthetic Unicode charmap sometimes created by
+   *   FreeType), return -1.
    */
   FT_EXPORT( FT_Long )
   FT_Get_CMap_Format( FT_CharMap  charmap );
diff --git a/src/java.desktop/share/native/libfreetype/include/freetype/tttags.h b/src/java.desktop/share/native/libfreetype/include/freetype/tttags.h
index 9bf4fca23fb..da0af5d3f23 100644
--- a/src/java.desktop/share/native/libfreetype/include/freetype/tttags.h
+++ b/src/java.desktop/share/native/libfreetype/include/freetype/tttags.h
@@ -4,7 +4,7 @@
  *
  *   Tags for TrueType and OpenType tables (specification only).
  *
- * Copyright (C) 1996-2023 by
+ * Copyright (C) 1996-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/src/java.desktop/share/native/libfreetype/include/ft2build.h b/src/java.desktop/share/native/libfreetype/include/ft2build.h
index 58491ceea1f..d3d7685039c 100644
--- a/src/java.desktop/share/native/libfreetype/include/ft2build.h
+++ b/src/java.desktop/share/native/libfreetype/include/ft2build.h
@@ -4,7 +4,7 @@
  *
  *   FreeType 2 build and setup macros.
  *
- * Copyright (C) 1996-2023 by
+ * Copyright (C) 1996-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/src/java.desktop/share/native/libfreetype/src/autofit/afblue.c b/src/java.desktop/share/native/libfreetype/src/autofit/afblue.c
index d7655b9b99e..ea83969cdc9 100644
--- a/src/java.desktop/share/native/libfreetype/src/autofit/afblue.c
+++ b/src/java.desktop/share/native/libfreetype/src/autofit/afblue.c
@@ -7,7 +7,7 @@
  *
  *   Auto-fitter data for blue strings (body).
  *
- * Copyright (C) 2013-2023 by
+ * Copyright (C) 2013-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/src/java.desktop/share/native/libfreetype/src/autofit/afblue.cin b/src/java.desktop/share/native/libfreetype/src/autofit/afblue.cin
index d561c5093b7..d2270fac744 100644
--- a/src/java.desktop/share/native/libfreetype/src/autofit/afblue.cin
+++ b/src/java.desktop/share/native/libfreetype/src/autofit/afblue.cin
@@ -4,7 +4,7 @@
  *
  *   Auto-fitter data for blue strings (body).
  *
- * Copyright (C) 2013-2023 by
+ * Copyright (C) 2013-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/src/java.desktop/share/native/libfreetype/src/autofit/afblue.dat b/src/java.desktop/share/native/libfreetype/src/autofit/afblue.dat
index 8299baa2591..88bab2632ab 100644
--- a/src/java.desktop/share/native/libfreetype/src/autofit/afblue.dat
+++ b/src/java.desktop/share/native/libfreetype/src/autofit/afblue.dat
@@ -2,7 +2,7 @@
 //
 //   Auto-fitter data for blue strings.
 //
-// Copyright (C) 2013-2023 by
+// Copyright (C) 2013-2024 by
 // David Turner, Robert Wilhelm, and Werner Lemberg.
 //
 // This file is part of the FreeType project, and may only be used,
diff --git a/src/java.desktop/share/native/libfreetype/src/autofit/afblue.h b/src/java.desktop/share/native/libfreetype/src/autofit/afblue.h
index 76f2f47cb00..2aa9d0984ef 100644
--- a/src/java.desktop/share/native/libfreetype/src/autofit/afblue.h
+++ b/src/java.desktop/share/native/libfreetype/src/autofit/afblue.h
@@ -7,7 +7,7 @@
  *
  *   Auto-fitter data for blue strings (specification).
  *
- * Copyright (C) 2013-2023 by
+ * Copyright (C) 2013-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/src/java.desktop/share/native/libfreetype/src/autofit/afblue.hin b/src/java.desktop/share/native/libfreetype/src/autofit/afblue.hin
index 6a31298e65f..38031505a85 100644
--- a/src/java.desktop/share/native/libfreetype/src/autofit/afblue.hin
+++ b/src/java.desktop/share/native/libfreetype/src/autofit/afblue.hin
@@ -4,7 +4,7 @@
  *
  *   Auto-fitter data for blue strings (specification).
  *
- * Copyright (C) 2013-2023 by
+ * Copyright (C) 2013-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/src/java.desktop/share/native/libfreetype/src/autofit/afcjk.c b/src/java.desktop/share/native/libfreetype/src/autofit/afcjk.c
index f414289adcd..869b60487c2 100644
--- a/src/java.desktop/share/native/libfreetype/src/autofit/afcjk.c
+++ b/src/java.desktop/share/native/libfreetype/src/autofit/afcjk.c
@@ -4,7 +4,7 @@
  *
  *   Auto-fitter hinting routines for CJK writing system (body).
  *
- * Copyright (C) 2006-2023 by
+ * Copyright (C) 2006-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/src/java.desktop/share/native/libfreetype/src/autofit/afcjk.h b/src/java.desktop/share/native/libfreetype/src/autofit/afcjk.h
index f380ef6e032..bc5aaf12e6e 100644
--- a/src/java.desktop/share/native/libfreetype/src/autofit/afcjk.h
+++ b/src/java.desktop/share/native/libfreetype/src/autofit/afcjk.h
@@ -4,7 +4,7 @@
  *
  *   Auto-fitter hinting routines for CJK writing system (specification).
  *
- * Copyright (C) 2006-2023 by
+ * Copyright (C) 2006-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
@@ -84,7 +84,7 @@ FT_BEGIN_HEADER
     /* used for horizontal metrics too for CJK */
     FT_Bool        control_overshoot;
     FT_UInt        blue_count;
-    AF_CJKBlueRec  blues[AF_BLUE_STRINGSET_MAX];
+    AF_CJKBlueRec  blues[AF_BLUE_STRINGSET_MAX_LEN];
 
     FT_Fixed       org_scale;
     FT_Pos         org_delta;
diff --git a/src/java.desktop/share/native/libfreetype/src/autofit/afcover.h b/src/java.desktop/share/native/libfreetype/src/autofit/afcover.h
index 102ed427828..7980cf2e979 100644
--- a/src/java.desktop/share/native/libfreetype/src/autofit/afcover.h
+++ b/src/java.desktop/share/native/libfreetype/src/autofit/afcover.h
@@ -4,7 +4,7 @@
  *
  *   Auto-fitter coverages (specification only).
  *
- * Copyright (C) 2013-2023 by
+ * Copyright (C) 2013-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/src/java.desktop/share/native/libfreetype/src/autofit/afdummy.c b/src/java.desktop/share/native/libfreetype/src/autofit/afdummy.c
index a4629b528dc..ad667d2edc7 100644
--- a/src/java.desktop/share/native/libfreetype/src/autofit/afdummy.c
+++ b/src/java.desktop/share/native/libfreetype/src/autofit/afdummy.c
@@ -5,7 +5,7 @@
  *   Auto-fitter dummy routines to be used if no hinting should be
  *   performed (body).
  *
- * Copyright (C) 2003-2023 by
+ * Copyright (C) 2003-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/src/java.desktop/share/native/libfreetype/src/autofit/afdummy.h b/src/java.desktop/share/native/libfreetype/src/autofit/afdummy.h
index a7af3f62c9e..613c2f88a38 100644
--- a/src/java.desktop/share/native/libfreetype/src/autofit/afdummy.h
+++ b/src/java.desktop/share/native/libfreetype/src/autofit/afdummy.h
@@ -5,7 +5,7 @@
  *   Auto-fitter dummy routines to be used if no hinting should be
  *   performed (specification).
  *
- * Copyright (C) 2003-2023 by
+ * Copyright (C) 2003-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/src/java.desktop/share/native/libfreetype/src/autofit/aferrors.h b/src/java.desktop/share/native/libfreetype/src/autofit/aferrors.h
index 88faf05c950..ae584ff06db 100644
--- a/src/java.desktop/share/native/libfreetype/src/autofit/aferrors.h
+++ b/src/java.desktop/share/native/libfreetype/src/autofit/aferrors.h
@@ -4,7 +4,7 @@
  *
  *   Autofitter error codes (specification only).
  *
- * Copyright (C) 2005-2023 by
+ * Copyright (C) 2005-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/src/java.desktop/share/native/libfreetype/src/autofit/afglobal.c b/src/java.desktop/share/native/libfreetype/src/autofit/afglobal.c
index b1957570f03..b7403fa65e1 100644
--- a/src/java.desktop/share/native/libfreetype/src/autofit/afglobal.c
+++ b/src/java.desktop/share/native/libfreetype/src/autofit/afglobal.c
@@ -4,7 +4,7 @@
  *
  *   Auto-fitter routines to compute global hinting values (body).
  *
- * Copyright (C) 2003-2023 by
+ * Copyright (C) 2003-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/src/java.desktop/share/native/libfreetype/src/autofit/afglobal.h b/src/java.desktop/share/native/libfreetype/src/autofit/afglobal.h
index 66170e419dd..ddb54c89b27 100644
--- a/src/java.desktop/share/native/libfreetype/src/autofit/afglobal.h
+++ b/src/java.desktop/share/native/libfreetype/src/autofit/afglobal.h
@@ -5,7 +5,7 @@
  *   Auto-fitter routines to compute global hinting values
  *   (specification).
  *
- * Copyright (C) 2003-2023 by
+ * Copyright (C) 2003-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/src/java.desktop/share/native/libfreetype/src/autofit/afhints.c b/src/java.desktop/share/native/libfreetype/src/autofit/afhints.c
index e4a378fbf74..96ffe343aa4 100644
--- a/src/java.desktop/share/native/libfreetype/src/autofit/afhints.c
+++ b/src/java.desktop/share/native/libfreetype/src/autofit/afhints.c
@@ -4,7 +4,7 @@
  *
  *   Auto-fitter hinting routines (body).
  *
- * Copyright (C) 2003-2023 by
+ * Copyright (C) 2003-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
@@ -979,8 +979,8 @@
       /* compute coordinates & Bezier flags, next and prev */
       {
         FT_Vector*  vec           = outline->points;
-        char*       tag           = outline->tags;
-        FT_Short    endpoint      = outline->contours[0];
+        FT_Byte*    tag           = outline->tags;
+        FT_UShort   endpoint      = outline->contours[0];
         AF_Point    end           = points + endpoint;
         AF_Point    prev          = end;
         FT_Int      contour_index = 0;
@@ -1046,16 +1046,16 @@
 
       /* set up the contours array */
       {
-        AF_Point*  contour       = hints->contours;
-        AF_Point*  contour_limit = contour + hints->num_contours;
-        short*     end           = outline->contours;
-        short      idx           = 0;
+        AF_Point*   contour       = hints->contours;
+        AF_Point*   contour_limit = contour + hints->num_contours;
+        FT_UShort*  end           = outline->contours;
+        FT_Int      idx           = 0;
 
 
         for ( ; contour < contour_limit; contour++, end++ )
         {
           contour[0] = points + idx;
-          idx        = (short)( end[0] + 1 );
+          idx        = *end + 1;
         }
       }
 
@@ -1292,7 +1292,7 @@
     AF_Point    point = hints->points;
     AF_Point    limit = point + hints->num_points;
     FT_Vector*  vec   = outline->points;
-    char*       tag   = outline->tags;
+    FT_Byte*    tag   = outline->tags;
 
 
     for ( ; point < limit; point++, vec++, tag++ )
diff --git a/src/java.desktop/share/native/libfreetype/src/autofit/afhints.h b/src/java.desktop/share/native/libfreetype/src/autofit/afhints.h
index d1cf9529bf1..76fe83006a5 100644
--- a/src/java.desktop/share/native/libfreetype/src/autofit/afhints.h
+++ b/src/java.desktop/share/native/libfreetype/src/autofit/afhints.h
@@ -4,7 +4,7 @@
  *
  *   Auto-fitter hinting routines (specification).
  *
- * Copyright (C) 2003-2023 by
+ * Copyright (C) 2003-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/src/java.desktop/share/native/libfreetype/src/autofit/afindic.c b/src/java.desktop/share/native/libfreetype/src/autofit/afindic.c
index 7fb12c63d5a..c6d23efd86f 100644
--- a/src/java.desktop/share/native/libfreetype/src/autofit/afindic.c
+++ b/src/java.desktop/share/native/libfreetype/src/autofit/afindic.c
@@ -4,7 +4,7 @@
  *
  *   Auto-fitter hinting routines for Indic writing system (body).
  *
- * Copyright (C) 2007-2023 by
+ * Copyright (C) 2007-2024 by
  * Rahul Bhalerao <rahul.bhalerao@redhat.com>, <b.rahul.pm@gmail.com>.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/src/java.desktop/share/native/libfreetype/src/autofit/afindic.h b/src/java.desktop/share/native/libfreetype/src/autofit/afindic.h
index 3eb67f63b00..a7f73f25153 100644
--- a/src/java.desktop/share/native/libfreetype/src/autofit/afindic.h
+++ b/src/java.desktop/share/native/libfreetype/src/autofit/afindic.h
@@ -5,7 +5,7 @@
  *   Auto-fitter hinting routines for Indic writing system
  *   (specification).
  *
- * Copyright (C) 2007-2023 by
+ * Copyright (C) 2007-2024 by
  * Rahul Bhalerao <rahul.bhalerao@redhat.com>, <b.rahul.pm@gmail.com>.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/src/java.desktop/share/native/libfreetype/src/autofit/aflatin.c b/src/java.desktop/share/native/libfreetype/src/autofit/aflatin.c
index b86367aa94d..89287f7ea5a 100644
--- a/src/java.desktop/share/native/libfreetype/src/autofit/aflatin.c
+++ b/src/java.desktop/share/native/libfreetype/src/autofit/aflatin.c
@@ -4,7 +4,7 @@
  *
  *   Auto-fitter hinting routines for latin writing system (body).
  *
- * Copyright (C) 2003-2023 by
+ * Copyright (C) 2003-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
@@ -981,7 +981,7 @@
       /* `ref' and `shoot' values of two blue zones must not overlap */
 
       FT_UInt       i;
-      AF_LatinBlue  blue_sorted[AF_BLUE_STRINGSET_MAX_LEN + 2];
+      AF_LatinBlue  blue_sorted[AF_BLUE_STRINGSET_MAX_LEN];
 
 
       for ( i = 0; i < axis->blue_count; i++ )
@@ -1263,10 +1263,9 @@
               max_height = FT_MAX( max_height, -Axis->blues[nn].descender );
             }
 
-            dist  = FT_ABS( FT_MulFix( max_height, new_scale - scale ) );
-            dist &= ~127;
+            dist  = FT_MulFix( max_height, new_scale - scale );
 
-            if ( dist == 0 )
+            if ( -128 < dist && dist < 128 )
             {
               FT_TRACE5(( "af_latin_metrics_scale_dim:"
                           " x height alignment (style `%s'):\n",
diff --git a/src/java.desktop/share/native/libfreetype/src/autofit/aflatin.h b/src/java.desktop/share/native/libfreetype/src/autofit/aflatin.h
index 31aa91d3bdb..54e50615021 100644
--- a/src/java.desktop/share/native/libfreetype/src/autofit/aflatin.h
+++ b/src/java.desktop/share/native/libfreetype/src/autofit/aflatin.h
@@ -5,7 +5,7 @@
  *   Auto-fitter hinting routines for latin writing system
  *   (specification).
  *
- * Copyright (C) 2003-2023 by
+ * Copyright (C) 2003-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
@@ -98,7 +98,7 @@ FT_BEGIN_HEADER
 
     /* ignored for horizontal metrics */
     FT_UInt          blue_count;
-    AF_LatinBlueRec  blues[AF_BLUE_STRINGSET_MAX];
+    AF_LatinBlueRec  blues[AF_BLUE_STRINGSET_MAX_LEN];
 
     FT_Fixed         org_scale;
     FT_Pos           org_delta;
diff --git a/src/java.desktop/share/native/libfreetype/src/autofit/afloader.c b/src/java.desktop/share/native/libfreetype/src/autofit/afloader.c
index 7c47d562af6..af1d59a6896 100644
--- a/src/java.desktop/share/native/libfreetype/src/autofit/afloader.c
+++ b/src/java.desktop/share/native/libfreetype/src/autofit/afloader.c
@@ -4,7 +4,7 @@
  *
  *   Auto-fitter glyph loading routines (body).
  *
- * Copyright (C) 2003-2023 by
+ * Copyright (C) 2003-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/src/java.desktop/share/native/libfreetype/src/autofit/afloader.h b/src/java.desktop/share/native/libfreetype/src/autofit/afloader.h
index e4e197e374f..99f0e15f92b 100644
--- a/src/java.desktop/share/native/libfreetype/src/autofit/afloader.h
+++ b/src/java.desktop/share/native/libfreetype/src/autofit/afloader.h
@@ -4,7 +4,7 @@
  *
  *   Auto-fitter glyph loading routines (specification).
  *
- * Copyright (C) 2003-2023 by
+ * Copyright (C) 2003-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/src/java.desktop/share/native/libfreetype/src/autofit/afmodule.c b/src/java.desktop/share/native/libfreetype/src/autofit/afmodule.c
index 20a6b96bc4f..726f6ca2b78 100644
--- a/src/java.desktop/share/native/libfreetype/src/autofit/afmodule.c
+++ b/src/java.desktop/share/native/libfreetype/src/autofit/afmodule.c
@@ -4,7 +4,7 @@
  *
  *   Auto-fitter module implementation (body).
  *
- * Copyright (C) 2003-2023 by
+ * Copyright (C) 2003-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
@@ -438,7 +438,7 @@
     AF_Module  module = (AF_Module)module_;
 
     FT_Error   error  = FT_Err_Ok;
-    FT_Memory  memory = module->root.library->memory;
+    FT_Memory  memory = module->root.memory;
 
 #ifdef FT_DEBUG_AUTOFIT
 
diff --git a/src/java.desktop/share/native/libfreetype/src/autofit/afmodule.h b/src/java.desktop/share/native/libfreetype/src/autofit/afmodule.h
index 4b8b4562c67..91a1abfef1f 100644
--- a/src/java.desktop/share/native/libfreetype/src/autofit/afmodule.h
+++ b/src/java.desktop/share/native/libfreetype/src/autofit/afmodule.h
@@ -4,7 +4,7 @@
  *
  *   Auto-fitter module implementation (specification).
  *
- * Copyright (C) 2003-2023 by
+ * Copyright (C) 2003-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/src/java.desktop/share/native/libfreetype/src/autofit/afranges.c b/src/java.desktop/share/native/libfreetype/src/autofit/afranges.c
index cfcaf340a79..007b4328189 100644
--- a/src/java.desktop/share/native/libfreetype/src/autofit/afranges.c
+++ b/src/java.desktop/share/native/libfreetype/src/autofit/afranges.c
@@ -4,7 +4,7 @@
  *
  *   Auto-fitter Unicode script ranges (body).
  *
- * Copyright (C) 2013-2023 by
+ * Copyright (C) 2013-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/src/java.desktop/share/native/libfreetype/src/autofit/afranges.h b/src/java.desktop/share/native/libfreetype/src/autofit/afranges.h
index 5775738bc0b..813b3ee78ef 100644
--- a/src/java.desktop/share/native/libfreetype/src/autofit/afranges.h
+++ b/src/java.desktop/share/native/libfreetype/src/autofit/afranges.h
@@ -4,7 +4,7 @@
  *
  *   Auto-fitter Unicode script ranges (specification).
  *
- * Copyright (C) 2013-2023 by
+ * Copyright (C) 2013-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/src/java.desktop/share/native/libfreetype/src/autofit/afscript.h b/src/java.desktop/share/native/libfreetype/src/autofit/afscript.h
index 3a101937d70..0a83d771501 100644
--- a/src/java.desktop/share/native/libfreetype/src/autofit/afscript.h
+++ b/src/java.desktop/share/native/libfreetype/src/autofit/afscript.h
@@ -4,7 +4,7 @@
  *
  *   Auto-fitter scripts (specification only).
  *
- * Copyright (C) 2013-2023 by
+ * Copyright (C) 2013-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/src/java.desktop/share/native/libfreetype/src/autofit/afshaper.c b/src/java.desktop/share/native/libfreetype/src/autofit/afshaper.c
index abc6f1d292d..df0f46ada89 100644
--- a/src/java.desktop/share/native/libfreetype/src/autofit/afshaper.c
+++ b/src/java.desktop/share/native/libfreetype/src/autofit/afshaper.c
@@ -4,7 +4,7 @@
  *
  *   HarfBuzz interface for accessing OpenType features (body).
  *
- * Copyright (C) 2013-2023 by
+ * Copyright (C) 2013-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/src/java.desktop/share/native/libfreetype/src/autofit/afshaper.h b/src/java.desktop/share/native/libfreetype/src/autofit/afshaper.h
index 054a18ffbc2..2eb03bb5d98 100644
--- a/src/java.desktop/share/native/libfreetype/src/autofit/afshaper.h
+++ b/src/java.desktop/share/native/libfreetype/src/autofit/afshaper.h
@@ -4,7 +4,7 @@
  *
  *   HarfBuzz interface for accessing OpenType features (specification).
  *
- * Copyright (C) 2013-2023 by
+ * Copyright (C) 2013-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/src/java.desktop/share/native/libfreetype/src/autofit/afstyles.h b/src/java.desktop/share/native/libfreetype/src/autofit/afstyles.h
index 73ebef01716..7a33f37a856 100644
--- a/src/java.desktop/share/native/libfreetype/src/autofit/afstyles.h
+++ b/src/java.desktop/share/native/libfreetype/src/autofit/afstyles.h
@@ -4,7 +4,7 @@
  *
  *   Auto-fitter styles (specification only).
  *
- * Copyright (C) 2013-2023 by
+ * Copyright (C) 2013-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/src/java.desktop/share/native/libfreetype/src/autofit/aftypes.h b/src/java.desktop/share/native/libfreetype/src/autofit/aftypes.h
index 66151944965..27e4185e9f8 100644
--- a/src/java.desktop/share/native/libfreetype/src/autofit/aftypes.h
+++ b/src/java.desktop/share/native/libfreetype/src/autofit/aftypes.h
@@ -4,7 +4,7 @@
  *
  *   Auto-fitter types (specification only).
  *
- * Copyright (C) 2003-2023 by
+ * Copyright (C) 2003-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/src/java.desktop/share/native/libfreetype/src/autofit/afws-decl.h b/src/java.desktop/share/native/libfreetype/src/autofit/afws-decl.h
index 48c888afed8..b78745af74e 100644
--- a/src/java.desktop/share/native/libfreetype/src/autofit/afws-decl.h
+++ b/src/java.desktop/share/native/libfreetype/src/autofit/afws-decl.h
@@ -4,7 +4,7 @@
  *
  *   Auto-fitter writing system declarations (specification only).
  *
- * Copyright (C) 2013-2023 by
+ * Copyright (C) 2013-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/src/java.desktop/share/native/libfreetype/src/autofit/afws-iter.h b/src/java.desktop/share/native/libfreetype/src/autofit/afws-iter.h
index a0a686f8cee..c86d609a352 100644
--- a/src/java.desktop/share/native/libfreetype/src/autofit/afws-iter.h
+++ b/src/java.desktop/share/native/libfreetype/src/autofit/afws-iter.h
@@ -4,7 +4,7 @@
  *
  *   Auto-fitter writing systems iterator (specification only).
  *
- * Copyright (C) 2013-2023 by
+ * Copyright (C) 2013-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/src/java.desktop/share/native/libfreetype/src/base/ftadvanc.c b/src/java.desktop/share/native/libfreetype/src/base/ftadvanc.c
index de25476fe92..717f7d08b35 100644
--- a/src/java.desktop/share/native/libfreetype/src/base/ftadvanc.c
+++ b/src/java.desktop/share/native/libfreetype/src/base/ftadvanc.c
@@ -4,7 +4,7 @@
  *
  *   Quick computation of advance widths (body).
  *
- * Copyright (C) 2008-2023 by
+ * Copyright (C) 2008-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/src/java.desktop/share/native/libfreetype/src/base/ftbase.h b/src/java.desktop/share/native/libfreetype/src/base/ftbase.h
index 00790d3b226..1d98b26dd51 100644
--- a/src/java.desktop/share/native/libfreetype/src/base/ftbase.h
+++ b/src/java.desktop/share/native/libfreetype/src/base/ftbase.h
@@ -4,7 +4,7 @@
  *
  *   Private functions used in the `base' module (specification).
  *
- * Copyright (C) 2008-2023 by
+ * Copyright (C) 2008-2024 by
  * David Turner, Robert Wilhelm, Werner Lemberg, and suzuki toshiya.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/src/java.desktop/share/native/libfreetype/src/base/ftbbox.c b/src/java.desktop/share/native/libfreetype/src/base/ftbbox.c
index 385fea40401..d6aa5d56df8 100644
--- a/src/java.desktop/share/native/libfreetype/src/base/ftbbox.c
+++ b/src/java.desktop/share/native/libfreetype/src/base/ftbbox.c
@@ -4,7 +4,7 @@
  *
  *   FreeType bbox computation (body).
  *
- * Copyright (C) 1996-2023 by
+ * Copyright (C) 1996-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used
@@ -489,7 +489,7 @@
       return FT_THROW( Invalid_Outline );
 
     /* if outline is empty, return (0,0,0,0) */
-    if ( outline->n_points == 0 || outline->n_contours <= 0 )
+    if ( outline->n_points == 0 || outline->n_contours == 0 )
     {
       abbox->xMin = abbox->xMax = 0;
       abbox->yMin = abbox->yMax = 0;
diff --git a/src/java.desktop/share/native/libfreetype/src/base/ftbitmap.c b/src/java.desktop/share/native/libfreetype/src/base/ftbitmap.c
index 1c93648dcbc..4be145679fd 100644
--- a/src/java.desktop/share/native/libfreetype/src/base/ftbitmap.c
+++ b/src/java.desktop/share/native/libfreetype/src/base/ftbitmap.c
@@ -4,7 +4,7 @@
  *
  *   FreeType utility functions for bitmaps (body).
  *
- * Copyright (C) 2004-2023 by
+ * Copyright (C) 2004-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/src/java.desktop/share/native/libfreetype/src/base/ftcalc.c b/src/java.desktop/share/native/libfreetype/src/base/ftcalc.c
index c5bc7e3b14e..92de09ed877 100644
--- a/src/java.desktop/share/native/libfreetype/src/base/ftcalc.c
+++ b/src/java.desktop/share/native/libfreetype/src/base/ftcalc.c
@@ -4,7 +4,7 @@
  *
  *   Arithmetic computations (body).
  *
- * Copyright (C) 1996-2023 by
+ * Copyright (C) 1996-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
@@ -69,13 +69,15 @@
 
   /* transfer sign, leaving a positive number;                        */
   /* we need an unsigned value to safely negate INT_MIN (or LONG_MIN) */
-#define FT_MOVE_SIGN( x, x_unsigned, s ) \
-  FT_BEGIN_STMNT                         \
-    if ( x < 0 )                         \
-    {                                    \
-      x_unsigned = 0U - (x_unsigned);    \
-      s          = -s;                   \
-    }                                    \
+#define FT_MOVE_SIGN( utype, x, x_unsigned, s ) \
+  FT_BEGIN_STMNT                                \
+    if ( x < 0 )                                \
+    {                                           \
+      x_unsigned = 0U - (utype)x;               \
+      s          = -s;                          \
+    }                                           \
+    else                                        \
+      x_unsigned = (utype)x;                    \
   FT_END_STMNT
 
   /* The following three functions are available regardless of whether */
@@ -179,13 +181,9 @@
     FT_Long    d_;
 
 
-    a = (FT_UInt64)a_;
-    b = (FT_UInt64)b_;
-    c = (FT_UInt64)c_;
-
-    FT_MOVE_SIGN( a_, a, s );
-    FT_MOVE_SIGN( b_, b, s );
-    FT_MOVE_SIGN( c_, c, s );
+    FT_MOVE_SIGN( FT_UInt64, a_, a, s );
+    FT_MOVE_SIGN( FT_UInt64, b_, b, s );
+    FT_MOVE_SIGN( FT_UInt64, c_, c, s );
 
     d = c > 0 ? ( a * b + ( c >> 1 ) ) / c
               : 0x7FFFFFFFUL;
@@ -208,13 +206,9 @@
     FT_Long    d_;
 
 
-    a = (FT_UInt64)a_;
-    b = (FT_UInt64)b_;
-    c = (FT_UInt64)c_;
-
-    FT_MOVE_SIGN( a_, a, s );
-    FT_MOVE_SIGN( b_, b, s );
-    FT_MOVE_SIGN( c_, c, s );
+    FT_MOVE_SIGN( FT_UInt64, a_, a, s );
+    FT_MOVE_SIGN( FT_UInt64, b_, b, s );
+    FT_MOVE_SIGN( FT_UInt64, c_, c, s );
 
     d = c > 0 ? a * b / c
               : 0x7FFFFFFFUL;
@@ -257,11 +251,8 @@
     FT_Long    q_;
 
 
-    a = (FT_UInt64)a_;
-    b = (FT_UInt64)b_;
-
-    FT_MOVE_SIGN( a_, a, s );
-    FT_MOVE_SIGN( b_, b, s );
+    FT_MOVE_SIGN( FT_UInt64, a_, a, s );
+    FT_MOVE_SIGN( FT_UInt64, b_, b, s );
 
     q = b > 0 ? ( ( a << 16 ) + ( b >> 1 ) ) / b
               : 0x7FFFFFFFUL;
@@ -422,13 +413,9 @@
 
     /* XXX: this function does not allow 64-bit arguments */
 
-    a = (FT_UInt32)a_;
-    b = (FT_UInt32)b_;
-    c = (FT_UInt32)c_;
-
-    FT_MOVE_SIGN( a_, a, s );
-    FT_MOVE_SIGN( b_, b, s );
-    FT_MOVE_SIGN( c_, c, s );
+    FT_MOVE_SIGN( FT_UInt32, a_, a, s );
+    FT_MOVE_SIGN( FT_UInt32, b_, b, s );
+    FT_MOVE_SIGN( FT_UInt32, c_, c, s );
 
     if ( c == 0 )
       a = 0x7FFFFFFFUL;
@@ -470,13 +457,9 @@
 
     /* XXX: this function does not allow 64-bit arguments */
 
-    a = (FT_UInt32)a_;
-    b = (FT_UInt32)b_;
-    c = (FT_UInt32)c_;
-
-    FT_MOVE_SIGN( a_, a, s );
-    FT_MOVE_SIGN( b_, b, s );
-    FT_MOVE_SIGN( c_, c, s );
+    FT_MOVE_SIGN( FT_UInt32, a_, a, s );
+    FT_MOVE_SIGN( FT_UInt32, b_, b, s );
+    FT_MOVE_SIGN( FT_UInt32, c_, c, s );
 
     if ( c == 0 )
       a = 0x7FFFFFFFUL;
@@ -575,11 +558,8 @@
 
     /* XXX: this function does not allow 64-bit arguments */
 
-    a = (FT_UInt32)a_;
-    b = (FT_UInt32)b_;
-
-    FT_MOVE_SIGN( a_, a, s );
-    FT_MOVE_SIGN( b_, b, s );
+    FT_MOVE_SIGN( FT_UInt32, a_, a, s );
+    FT_MOVE_SIGN( FT_UInt32, b_, b, s );
 
     if ( a + ( b >> 8 ) <= 8190UL )
       a = ( a * b + 0x8000UL ) >> 16;
@@ -614,11 +594,8 @@
 
     /* XXX: this function does not allow 64-bit arguments */
 
-    a = (FT_UInt32)a_;
-    b = (FT_UInt32)b_;
-
-    FT_MOVE_SIGN( a_, a, s );
-    FT_MOVE_SIGN( b_, b, s );
+    FT_MOVE_SIGN( FT_UInt32, a_, a, s );
+    FT_MOVE_SIGN( FT_UInt32, b_, b, s );
 
     if ( b == 0 )
     {
@@ -829,11 +806,8 @@
     FT_Int     sx = 1, sy = 1, shift;
 
 
-    x = (FT_UInt32)x_;
-    y = (FT_UInt32)y_;
-
-    FT_MOVE_SIGN( x_, x, sx );
-    FT_MOVE_SIGN( y_, y, sy );
+    FT_MOVE_SIGN( FT_UInt32, x_, x, sx );
+    FT_MOVE_SIGN( FT_UInt32, y_, y, sy );
 
     /* trivial cases */
     if ( x == 0 )
@@ -913,44 +887,72 @@
   }
 
 
-#if 0
-
   /* documentation is in ftcalc.h */
 
-  FT_BASE_DEF( FT_Int32 )
-  FT_SqrtFixed( FT_Int32  x )
+  FT_BASE_DEF( FT_UInt32 )
+  FT_SqrtFixed( FT_UInt32  v )
   {
-    FT_UInt32  root, rem_hi, rem_lo, test_div;
-    FT_Int     count;
+    if ( v == 0 )
+      return 0;
 
+#ifndef FT_INT64
 
-    root = 0;
-
-    if ( x > 0 )
+    /* Algorithm by Christophe Meessen (1993) with overflow fixed and     */
+    /* rounding added.  Any unsigned fixed 16.16 argument is acceptable.  */
+    /* However, this algorithm is slower than the Babylonian method with  */
+    /* a good initial guess.  We only use it for large 32-bit values when */
+    /* 64-bit computations are not desirable.                             */
+    else if ( v > 0x10000U )
     {
-      rem_hi = 0;
-      rem_lo = (FT_UInt32)x;
-      count  = 24;
+      FT_UInt32  r = v >> 1;
+      FT_UInt32  q = ( v & 1 ) << 15;
+      FT_UInt32  b = 0x20000000;
+      FT_UInt32  t;
+
+
       do
       {
-        rem_hi   = ( rem_hi << 2 ) | ( rem_lo >> 30 );
-        rem_lo <<= 2;
-        root   <<= 1;
-        test_div = ( root << 1 ) + 1;
-
-        if ( rem_hi >= test_div )
+        t = q + b;
+        if ( r >= t )
         {
-          rem_hi -= test_div;
-          root   += 1;
+          r -= t;
+          q  = t + b;  /* equivalent to q += 2*b */
         }
-      } while ( --count );
+        r <<= 1;
+        b >>= 1;
+
+      } while ( b > 0x10 );  /* exactly 25 cycles */
+
+      return ( q + 0x40 ) >> 7;
     }
+    else
+    {
+      FT_UInt32  r = ( v << 16 ) - 1;
 
-    return (FT_Int32)root;
+#else /* FT_INT64 */
+
+    else
+    {
+      FT_UInt64  r = ( (FT_UInt64)v << 16 ) - 1;
+
+#endif /* FT_INT64 */
+
+      FT_UInt32  q = 1 << ( ( 17 + FT_MSB( v ) ) >> 1 );
+      FT_UInt32  t;
+
+
+      /* Babylonian method with rounded-up division */
+      do
+      {
+        t = q;
+        q = ( t + (FT_UInt32)( r / t ) + 1 ) >> 1;
+
+      } while ( q != t );  /* less than 6 cycles */
+
+      return q;
+    }
   }
 
-#endif /* 0 */
-
 
   /* documentation is in ftcalc.h */
 
@@ -1094,11 +1096,8 @@
       FT_UInt32  factor;
 
 
-      scalar = (FT_UInt32)s[i];
-      factor = (FT_UInt32)f[i];
-
-      FT_MOVE_SIGN( s[i], scalar, sign );
-      FT_MOVE_SIGN( f[i], factor, sign );
+      FT_MOVE_SIGN( FT_UInt32, s[i], scalar, sign );
+      FT_MOVE_SIGN( FT_UInt32, f[i], factor, sign );
 
       ft_multo64( scalar, factor, &multResult );
 
diff --git a/src/java.desktop/share/native/libfreetype/src/base/ftcid.c b/src/java.desktop/share/native/libfreetype/src/base/ftcid.c
index 866cd23e91b..4f2deb19a05 100644
--- a/src/java.desktop/share/native/libfreetype/src/base/ftcid.c
+++ b/src/java.desktop/share/native/libfreetype/src/base/ftcid.c
@@ -4,7 +4,7 @@
  *
  *   FreeType API for accessing CID font information.
  *
- * Copyright (C) 2007-2023 by
+ * Copyright (C) 2007-2024 by
  * Derek Clegg and Michael Toftdal.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/src/java.desktop/share/native/libfreetype/src/base/ftcolor.c b/src/java.desktop/share/native/libfreetype/src/base/ftcolor.c
index bcd6e893d4a..c6bf2a3cd1a 100644
--- a/src/java.desktop/share/native/libfreetype/src/base/ftcolor.c
+++ b/src/java.desktop/share/native/libfreetype/src/base/ftcolor.c
@@ -4,7 +4,7 @@
  *
  *   FreeType's glyph color management (body).
  *
- * Copyright (C) 2018-2023 by
+ * Copyright (C) 2018-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/src/java.desktop/share/native/libfreetype/src/base/ftdbgmem.c b/src/java.desktop/share/native/libfreetype/src/base/ftdbgmem.c
index 8fab50dd017..902a5dc8bbc 100644
--- a/src/java.desktop/share/native/libfreetype/src/base/ftdbgmem.c
+++ b/src/java.desktop/share/native/libfreetype/src/base/ftdbgmem.c
@@ -4,7 +4,7 @@
  *
  *   Memory debugger (body).
  *
- * Copyright (C) 2001-2023 by
+ * Copyright (C) 2001-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/src/java.desktop/share/native/libfreetype/src/base/ftdebug.c b/src/java.desktop/share/native/libfreetype/src/base/ftdebug.c
index 61c4563b0c4..11307eaace4 100644
--- a/src/java.desktop/share/native/libfreetype/src/base/ftdebug.c
+++ b/src/java.desktop/share/native/libfreetype/src/base/ftdebug.c
@@ -4,7 +4,7 @@
  *
  *   Debugging and logging component (body).
  *
- * Copyright (C) 1996-2023 by
+ * Copyright (C) 1996-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/src/java.desktop/share/native/libfreetype/src/base/ftfntfmt.c b/src/java.desktop/share/native/libfreetype/src/base/ftfntfmt.c
index 0b41f7cc83d..77b4089e7e2 100644
--- a/src/java.desktop/share/native/libfreetype/src/base/ftfntfmt.c
+++ b/src/java.desktop/share/native/libfreetype/src/base/ftfntfmt.c
@@ -4,7 +4,7 @@
  *
  *   FreeType utility file for font formats (body).
  *
- * Copyright (C) 2002-2023 by
+ * Copyright (C) 2002-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/src/java.desktop/share/native/libfreetype/src/base/ftfstype.c b/src/java.desktop/share/native/libfreetype/src/base/ftfstype.c
index ea24e64c6ea..1565c3b7e25 100644
--- a/src/java.desktop/share/native/libfreetype/src/base/ftfstype.c
+++ b/src/java.desktop/share/native/libfreetype/src/base/ftfstype.c
@@ -4,7 +4,7 @@
  *
  *   FreeType utility file to access FSType data (body).
  *
- * Copyright (C) 2008-2023 by
+ * Copyright (C) 2008-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/src/java.desktop/share/native/libfreetype/src/base/ftgasp.c b/src/java.desktop/share/native/libfreetype/src/base/ftgasp.c
index 29b7b08b787..c63d30e978c 100644
--- a/src/java.desktop/share/native/libfreetype/src/base/ftgasp.c
+++ b/src/java.desktop/share/native/libfreetype/src/base/ftgasp.c
@@ -4,7 +4,7 @@
  *
  *   Access of TrueType's `gasp' table (body).
  *
- * Copyright (C) 2007-2023 by
+ * Copyright (C) 2007-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/src/java.desktop/share/native/libfreetype/src/base/ftgloadr.c b/src/java.desktop/share/native/libfreetype/src/base/ftgloadr.c
index 9823d09e41a..484d98f1722 100644
--- a/src/java.desktop/share/native/libfreetype/src/base/ftgloadr.c
+++ b/src/java.desktop/share/native/libfreetype/src/base/ftgloadr.c
@@ -4,7 +4,7 @@
  *
  *   The FreeType glyph loader (body).
  *
- * Copyright (C) 2002-2023 by
+ * Copyright (C) 2002-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg
  *
  * This file is part of the FreeType project, and may only be used,
@@ -355,34 +355,25 @@
   FT_BASE_DEF( void )
   FT_GlyphLoader_Add( FT_GlyphLoader  loader )
   {
-    FT_GlyphLoad  base;
-    FT_GlyphLoad  current;
-
-    FT_Int        n_curr_contours;
-    FT_Int        n_base_points;
-    FT_Int        n;
+    FT_Outline*  base;
+    FT_Outline*  current;
+    FT_Int       n;
 
 
     if ( !loader )
       return;
 
-    base    = &loader->base;
-    current = &loader->current;
-
-    n_curr_contours = current->outline.n_contours;
-    n_base_points   = base->outline.n_points;
-
-    base->outline.n_points =
-      (short)( base->outline.n_points + current->outline.n_points );
-    base->outline.n_contours =
-      (short)( base->outline.n_contours + current->outline.n_contours );
-
-    base->num_subglyphs += current->num_subglyphs;
+    base    = &loader->base.outline;
+    current = &loader->current.outline;
 
     /* adjust contours count in newest outline */
-    for ( n = 0; n < n_curr_contours; n++ )
-      current->outline.contours[n] =
-        (short)( current->outline.contours[n] + n_base_points );
+    for ( n = 0; n < current->n_contours; n++ )
+      current->contours[n] += base->n_points;
+
+    base->n_points   += current->n_points;
+    base->n_contours += current->n_contours;
+
+    loader->base.num_subglyphs += loader->current.num_subglyphs;
 
     /* prepare for another new glyph image */
     FT_GlyphLoader_Prepare( loader );
diff --git a/src/java.desktop/share/native/libfreetype/src/base/ftglyph.c b/src/java.desktop/share/native/libfreetype/src/base/ftglyph.c
index 393d4949f84..1b5849f99af 100644
--- a/src/java.desktop/share/native/libfreetype/src/base/ftglyph.c
+++ b/src/java.desktop/share/native/libfreetype/src/base/ftglyph.c
@@ -4,7 +4,7 @@
  *
  *   FreeType convenience functions to handle glyphs (body).
  *
- * Copyright (C) 1996-2023 by
+ * Copyright (C) 1996-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/src/java.desktop/share/native/libfreetype/src/base/ftinit.c b/src/java.desktop/share/native/libfreetype/src/base/ftinit.c
index c9c71d24bf9..9a6c00e13ef 100644
--- a/src/java.desktop/share/native/libfreetype/src/base/ftinit.c
+++ b/src/java.desktop/share/native/libfreetype/src/base/ftinit.c
@@ -4,7 +4,7 @@
  *
  *   FreeType initialization layer (body).
  *
- * Copyright (C) 1996-2023 by
+ * Copyright (C) 1996-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/src/java.desktop/share/native/libfreetype/src/base/ftlcdfil.c b/src/java.desktop/share/native/libfreetype/src/base/ftlcdfil.c
index 6c3fd66e0bb..1e69d4da70f 100644
--- a/src/java.desktop/share/native/libfreetype/src/base/ftlcdfil.c
+++ b/src/java.desktop/share/native/libfreetype/src/base/ftlcdfil.c
@@ -4,7 +4,7 @@
  *
  *   FreeType API for color filtering of subpixel bitmap glyphs (body).
  *
- * Copyright (C) 2006-2023 by
+ * Copyright (C) 2006-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/src/java.desktop/share/native/libfreetype/src/base/ftmac.c b/src/java.desktop/share/native/libfreetype/src/base/ftmac.c
index 492d0553845..e8e35627b50 100644
--- a/src/java.desktop/share/native/libfreetype/src/base/ftmac.c
+++ b/src/java.desktop/share/native/libfreetype/src/base/ftmac.c
@@ -8,7 +8,7 @@
  * This file is for Mac OS X only; see builds/mac/ftoldmac.c for
  * classic platforms built by MPW.
  *
- * Copyright (C) 1996-2023 by
+ * Copyright (C) 1996-2024 by
  * Just van Rossum, David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
@@ -812,6 +812,7 @@
     ResourceIndex  res_index;
     Handle         fond;
     short          num_faces_in_res;
+    FT_Long        count;
 
 
     if ( noErr != FT_FSPathMakeRes( pathname, &res_ref ) )
@@ -821,8 +822,10 @@
     if ( ResError() )
       return FT_THROW( Cannot_Open_Resource );
 
+    res_index        = 1;
     num_faces_in_res = 0;
-    for ( res_index = 1; ; res_index++ )
+    count            = face_index;
+    while ( count >= 0 )
     {
       short  num_faces_in_fond;
 
@@ -834,15 +837,21 @@
       num_faces_in_fond  = count_faces( fond, pathname );
       num_faces_in_res  += num_faces_in_fond;
 
-      if ( 0 <= face_index && face_index < num_faces_in_fond && error )
-        error = FT_New_Face_From_FOND( library, fond, face_index, aface );
+      if ( count < num_faces_in_fond )
+        error = FT_New_Face_From_FOND( library, fond, count, aface );
 
-      face_index -= num_faces_in_fond;
+      res_index++;
+      count -= num_faces_in_fond;
     }
 
     CloseResFile( res_ref );
+
     if ( !error && aface && *aface )
-      (*aface)->num_faces = num_faces_in_res;
+    {
+      (*aface)->num_faces  = num_faces_in_res;
+      (*aface)->face_index = face_index;
+    }
+
     return error;
   }
 
diff --git a/src/java.desktop/share/native/libfreetype/src/base/ftmm.c b/src/java.desktop/share/native/libfreetype/src/base/ftmm.c
index 9e2dd7ee79d..cc4ca22fba3 100644
--- a/src/java.desktop/share/native/libfreetype/src/base/ftmm.c
+++ b/src/java.desktop/share/native/libfreetype/src/base/ftmm.c
@@ -4,7 +4,7 @@
  *
  *   Multiple Master font support (body).
  *
- * Copyright (C) 1996-2023 by
+ * Copyright (C) 1996-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/src/java.desktop/share/native/libfreetype/src/base/ftobjs.c b/src/java.desktop/share/native/libfreetype/src/base/ftobjs.c
index 89a25bc732d..9b97820c379 100644
--- a/src/java.desktop/share/native/libfreetype/src/base/ftobjs.c
+++ b/src/java.desktop/share/native/libfreetype/src/base/ftobjs.c
@@ -4,7 +4,7 @@
  *
  *   The FreeType private base classes (body).
  *
- * Copyright (C) 1996-2023 by
+ * Copyright (C) 1996-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
@@ -2302,7 +2302,10 @@
                                       face_index_internal, aface );
       FT_FREE( data_offsets );
       if ( !error )
-        (*aface)->num_faces = count;
+      {
+        (*aface)->num_faces  = count;
+        (*aface)->face_index = face_index_internal;
+      }
     }
 
     return error;
@@ -5791,7 +5794,7 @@
     ttface = (TT_Face)face;
     sfnt   = (SFNT_Service)ttface->sfnt;
 
-    if ( sfnt->get_colr_layer )
+    if ( sfnt->get_colr_glyph_paint )
       return sfnt->get_colr_glyph_paint( ttface,
                                          base_glyph,
                                          root_transform,
diff --git a/src/java.desktop/share/native/libfreetype/src/base/ftoutln.c b/src/java.desktop/share/native/libfreetype/src/base/ftoutln.c
index 134f39d2b1f..ef699b3c7cd 100644
--- a/src/java.desktop/share/native/libfreetype/src/base/ftoutln.c
+++ b/src/java.desktop/share/native/libfreetype/src/base/ftoutln.c
@@ -4,7 +4,7 @@
  *
  *   FreeType outline management (body).
  *
- * Copyright (C) 1996-2023 by
+ * Copyright (C) 1996-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
@@ -53,7 +53,7 @@
 
     FT_Vector*  point;
     FT_Vector*  limit;
-    char*       tags;
+    FT_Byte*    tags;
 
     FT_Error    error;
 
@@ -332,8 +332,8 @@
          FT_NEW_ARRAY( anoutline->contours, numContours ) )
       goto Fail;
 
-    anoutline->n_points    = (FT_Short)numPoints;
-    anoutline->n_contours  = (FT_Short)numContours;
+    anoutline->n_points    = (FT_UShort)numPoints;
+    anoutline->n_contours  = (FT_UShort)numContours;
     anoutline->flags      |= FT_OUTLINE_OWNER;
 
     return FT_Err_Ok;
@@ -359,12 +359,14 @@
       FT_Int  n;
 
 
+      FT_TRACE5(( "FT_Outline_Check: contours = %d, points = %d\n",
+                  n_contours, n_points ));
       /* empty glyph? */
       if ( n_points == 0 && n_contours == 0 )
         return FT_Err_Ok;
 
       /* check point and contour counts */
-      if ( n_points <= 0 || n_contours <= 0 )
+      if ( n_points == 0 || n_contours == 0 )
         goto Bad;
 
       end0 = -1;
@@ -576,13 +578,13 @@
 
       /* reverse tags table */
       {
-        char*  p = outline->tags + first;
-        char*  q = outline->tags + last;
+        FT_Byte*  p = outline->tags + first;
+        FT_Byte*  q = outline->tags + last;
 
 
         while ( p < q )
         {
-          char  swap;
+          FT_Byte  swap;
 
 
           swap = *p;
diff --git a/src/java.desktop/share/native/libfreetype/src/base/ftpatent.c b/src/java.desktop/share/native/libfreetype/src/base/ftpatent.c
index cb5efadffb1..2055757e023 100644
--- a/src/java.desktop/share/native/libfreetype/src/base/ftpatent.c
+++ b/src/java.desktop/share/native/libfreetype/src/base/ftpatent.c
@@ -5,7 +5,7 @@
  *   FreeType API for checking patented TrueType bytecode instructions
  *   (body).  Obsolete, retained for backward compatibility.
  *
- * Copyright (C) 2007-2023 by
+ * Copyright (C) 2007-2024 by
  * David Turner.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/src/java.desktop/share/native/libfreetype/src/base/ftpsprop.c b/src/java.desktop/share/native/libfreetype/src/base/ftpsprop.c
index cefdf489d7f..37a6cee6cc9 100644
--- a/src/java.desktop/share/native/libfreetype/src/base/ftpsprop.c
+++ b/src/java.desktop/share/native/libfreetype/src/base/ftpsprop.c
@@ -5,7 +5,7 @@
  *   Get and set properties of PostScript drivers (body).
  *   See `ftdriver.h' for available properties.
  *
- * Copyright (C) 2017-2023 by
+ * Copyright (C) 2017-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/src/java.desktop/share/native/libfreetype/src/base/ftrfork.c b/src/java.desktop/share/native/libfreetype/src/base/ftrfork.c
index 2ab430195f2..dc9b043d8bb 100644
--- a/src/java.desktop/share/native/libfreetype/src/base/ftrfork.c
+++ b/src/java.desktop/share/native/libfreetype/src/base/ftrfork.c
@@ -4,7 +4,7 @@
  *
  *   Embedded resource forks accessor (body).
  *
- * Copyright (C) 2004-2023 by
+ * Copyright (C) 2004-2024 by
  * Masatake YAMATO and Redhat K.K.
  *
  * FT_Raccess_Get_HeaderInfo() and raccess_guess_darwin_hfsplus() are
diff --git a/src/java.desktop/share/native/libfreetype/src/base/ftsnames.c b/src/java.desktop/share/native/libfreetype/src/base/ftsnames.c
index 1917a3f1dff..f7231fd61cc 100644
--- a/src/java.desktop/share/native/libfreetype/src/base/ftsnames.c
+++ b/src/java.desktop/share/native/libfreetype/src/base/ftsnames.c
@@ -7,7 +7,7 @@
  *
  *   This is _not_ used to retrieve glyph names!
  *
- * Copyright (C) 1996-2023 by
+ * Copyright (C) 1996-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/src/java.desktop/share/native/libfreetype/src/base/ftstream.c b/src/java.desktop/share/native/libfreetype/src/base/ftstream.c
index 64826acebe5..66722246128 100644
--- a/src/java.desktop/share/native/libfreetype/src/base/ftstream.c
+++ b/src/java.desktop/share/native/libfreetype/src/base/ftstream.c
@@ -4,7 +4,7 @@
  *
  *   I/O stream support (body).
  *
- * Copyright (C) 2000-2023 by
+ * Copyright (C) 2000-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
@@ -763,10 +763,10 @@
       case ft_frame_bytes:  /* read a byte sequence */
       case ft_frame_skip:   /* skip some bytes      */
         {
-          FT_UInt  len = fields->size;
+          FT_Offset  len = fields->size;
 
 
-          if ( cursor + len > stream->limit )
+          if ( len > (FT_Offset)( stream->limit - cursor ) )
           {
             error = FT_THROW( Invalid_Stream_Operation );
             goto Exit;
@@ -830,7 +830,7 @@
         goto Exit;
       }
 
-      /* now, compute the signed value is necessary */
+      /* now, compute the signed value if necessary */
       if ( fields->value & FT_FRAME_OP_SIGNED )
         value = (FT_ULong)( (FT_Int32)( value << sign_shift ) >> sign_shift );
 
diff --git a/src/java.desktop/share/native/libfreetype/src/base/ftstroke.c b/src/java.desktop/share/native/libfreetype/src/base/ftstroke.c
index 92f1e43080f..64f46ce43e7 100644
--- a/src/java.desktop/share/native/libfreetype/src/base/ftstroke.c
+++ b/src/java.desktop/share/native/libfreetype/src/base/ftstroke.c
@@ -4,7 +4,7 @@
  *
  *   FreeType path stroker (body).
  *
- * Copyright (C) 2002-2023 by
+ * Copyright (C) 2002-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
@@ -711,7 +711,7 @@
     {
       FT_UInt   count = border->num_points;
       FT_Byte*  read  = border->tags;
-      FT_Byte*  write = (FT_Byte*)outline->tags + outline->n_points;
+      FT_Byte*  write = outline->tags + outline->n_points;
 
 
       for ( ; count > 0; count--, read++, write++ )
@@ -727,10 +727,10 @@
 
     /* copy contours */
     {
-      FT_UInt    count = border->num_points;
-      FT_Byte*   tags  = border->tags;
-      FT_Short*  write = outline->contours + outline->n_contours;
-      FT_Short   idx   = (FT_Short)outline->n_points;
+      FT_UInt     count = border->num_points;
+      FT_Byte*    tags  = border->tags;
+      FT_UShort*  write = outline->contours + outline->n_contours;
+      FT_UShort   idx   = outline->n_points;
 
 
       for ( ; count > 0; count--, tags++, idx++ )
@@ -743,7 +743,7 @@
       }
     }
 
-    outline->n_points += (short)border->num_points;
+    outline->n_points += (FT_UShort)border->num_points;
 
     FT_ASSERT( FT_Outline_Check( outline ) == 0 );
   }
@@ -2050,7 +2050,7 @@
 
     FT_Vector*  point;
     FT_Vector*  limit;
-    char*       tags;
+    FT_Byte*    tags;
 
     FT_Error    error;
 
diff --git a/src/java.desktop/share/native/libfreetype/src/base/ftsynth.c b/src/java.desktop/share/native/libfreetype/src/base/ftsynth.c
index f32edd3388b..ec05bce33a9 100644
--- a/src/java.desktop/share/native/libfreetype/src/base/ftsynth.c
+++ b/src/java.desktop/share/native/libfreetype/src/base/ftsynth.c
@@ -4,7 +4,7 @@
  *
  *   FreeType synthesizing code for emboldening and slanting (body).
  *
- * Copyright (C) 2000-2023 by
+ * Copyright (C) 2000-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/src/java.desktop/share/native/libfreetype/src/base/ftsystem.c b/src/java.desktop/share/native/libfreetype/src/base/ftsystem.c
index 61c99e36357..eee3642334f 100644
--- a/src/java.desktop/share/native/libfreetype/src/base/ftsystem.c
+++ b/src/java.desktop/share/native/libfreetype/src/base/ftsystem.c
@@ -4,7 +4,7 @@
  *
  *   ANSI-specific FreeType low-level system interface (body).
  *
- * Copyright (C) 1996-2023 by
+ * Copyright (C) 1996-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/src/java.desktop/share/native/libfreetype/src/base/fttrigon.c b/src/java.desktop/share/native/libfreetype/src/base/fttrigon.c
index 2dd2c3459e5..4b1aced1cba 100644
--- a/src/java.desktop/share/native/libfreetype/src/base/fttrigon.c
+++ b/src/java.desktop/share/native/libfreetype/src/base/fttrigon.c
@@ -4,7 +4,7 @@
  *
  *   FreeType trigonometric functions (body).
  *
- * Copyright (C) 2001-2023 by
+ * Copyright (C) 2001-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/src/java.desktop/share/native/libfreetype/src/base/fttype1.c b/src/java.desktop/share/native/libfreetype/src/base/fttype1.c
index 637c5cf775e..cedf7c40505 100644
--- a/src/java.desktop/share/native/libfreetype/src/base/fttype1.c
+++ b/src/java.desktop/share/native/libfreetype/src/base/fttype1.c
@@ -4,7 +4,7 @@
  *
  *   FreeType utility file for PS names support (body).
  *
- * Copyright (C) 2002-2023 by
+ * Copyright (C) 2002-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/src/java.desktop/share/native/libfreetype/src/base/ftutil.c b/src/java.desktop/share/native/libfreetype/src/base/ftutil.c
index 6120846d2ca..b13512f8704 100644
--- a/src/java.desktop/share/native/libfreetype/src/base/ftutil.c
+++ b/src/java.desktop/share/native/libfreetype/src/base/ftutil.c
@@ -4,7 +4,7 @@
  *
  *   FreeType utility file for memory and list management (body).
  *
- * Copyright (C) 2002-2023 by
+ * Copyright (C) 2002-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/src/java.desktop/share/native/libfreetype/src/cff/cffcmap.c b/src/java.desktop/share/native/libfreetype/src/cff/cffcmap.c
index 10d287bc81f..ea5f8ed2885 100644
--- a/src/java.desktop/share/native/libfreetype/src/cff/cffcmap.c
+++ b/src/java.desktop/share/native/libfreetype/src/cff/cffcmap.c
@@ -4,7 +4,7 @@
  *
  *   CFF character mapping table (cmap) support (body).
  *
- * Copyright (C) 2002-2023 by
+ * Copyright (C) 2002-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/src/java.desktop/share/native/libfreetype/src/cff/cffcmap.h b/src/java.desktop/share/native/libfreetype/src/cff/cffcmap.h
index b2afc2fab62..1dd8700cd8b 100644
--- a/src/java.desktop/share/native/libfreetype/src/cff/cffcmap.h
+++ b/src/java.desktop/share/native/libfreetype/src/cff/cffcmap.h
@@ -4,7 +4,7 @@
  *
  *   CFF character mapping table (cmap) support (specification).
  *
- * Copyright (C) 2002-2023 by
+ * Copyright (C) 2002-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/src/java.desktop/share/native/libfreetype/src/cff/cffdrivr.c b/src/java.desktop/share/native/libfreetype/src/cff/cffdrivr.c
index 9898d625ca4..f6ebdb3810a 100644
--- a/src/java.desktop/share/native/libfreetype/src/cff/cffdrivr.c
+++ b/src/java.desktop/share/native/libfreetype/src/cff/cffdrivr.c
@@ -4,7 +4,7 @@
  *
  *   OpenType font driver implementation (body).
  *
- * Copyright (C) 1996-2023 by
+ * Copyright (C) 1996-2024 by
  * David Turner, Robert Wilhelm, Werner Lemberg, and Dominik Röttsches.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/src/java.desktop/share/native/libfreetype/src/cff/cffdrivr.h b/src/java.desktop/share/native/libfreetype/src/cff/cffdrivr.h
index ab1f147bb2a..fd5bc37ecd4 100644
--- a/src/java.desktop/share/native/libfreetype/src/cff/cffdrivr.h
+++ b/src/java.desktop/share/native/libfreetype/src/cff/cffdrivr.h
@@ -4,7 +4,7 @@
  *
  *   High-level OpenType driver interface (specification).
  *
- * Copyright (C) 1996-2023 by
+ * Copyright (C) 1996-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/src/java.desktop/share/native/libfreetype/src/cff/cfferrs.h b/src/java.desktop/share/native/libfreetype/src/cff/cfferrs.h
index bc9a3043fcf..128adc3b716 100644
--- a/src/java.desktop/share/native/libfreetype/src/cff/cfferrs.h
+++ b/src/java.desktop/share/native/libfreetype/src/cff/cfferrs.h
@@ -4,7 +4,7 @@
  *
  *   CFF error codes (specification only).
  *
- * Copyright (C) 2001-2023 by
+ * Copyright (C) 2001-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/src/java.desktop/share/native/libfreetype/src/cff/cffgload.c b/src/java.desktop/share/native/libfreetype/src/cff/cffgload.c
index c483d1d1a59..cbb071abdfe 100644
--- a/src/java.desktop/share/native/libfreetype/src/cff/cffgload.c
+++ b/src/java.desktop/share/native/libfreetype/src/cff/cffgload.c
@@ -4,7 +4,7 @@
  *
  *   OpenType Glyph Loader (body).
  *
- * Copyright (C) 1996-2023 by
+ * Copyright (C) 1996-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/src/java.desktop/share/native/libfreetype/src/cff/cffgload.h b/src/java.desktop/share/native/libfreetype/src/cff/cffgload.h
index 3b8cf236ddc..346d4b11c31 100644
--- a/src/java.desktop/share/native/libfreetype/src/cff/cffgload.h
+++ b/src/java.desktop/share/native/libfreetype/src/cff/cffgload.h
@@ -4,7 +4,7 @@
  *
  *   OpenType Glyph Loader (specification).
  *
- * Copyright (C) 1996-2023 by
+ * Copyright (C) 1996-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/src/java.desktop/share/native/libfreetype/src/cff/cffload.c b/src/java.desktop/share/native/libfreetype/src/cff/cffload.c
index af79082e98c..979fd45f6ca 100644
--- a/src/java.desktop/share/native/libfreetype/src/cff/cffload.c
+++ b/src/java.desktop/share/native/libfreetype/src/cff/cffload.c
@@ -4,7 +4,7 @@
  *
  *   OpenType and CFF data/program tables loader (body).
  *
- * Copyright (C) 1996-2023 by
+ * Copyright (C) 1996-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
@@ -1202,17 +1202,21 @@
         {
           CFF_AxisCoords*  axis = &region->axisList[j];
 
-          FT_Int16  start14, peak14, end14;
+          FT_Int  start, peak, end;
 
 
-          if ( FT_READ_SHORT( start14 ) ||
-               FT_READ_SHORT( peak14 )  ||
-               FT_READ_SHORT( end14 )   )
+          if ( FT_READ_SHORT( start ) ||
+               FT_READ_SHORT( peak )  ||
+               FT_READ_SHORT( end )   )
             goto Exit;
 
-          axis->startCoord = FT_fdot14ToFixed( start14 );
-          axis->peakCoord  = FT_fdot14ToFixed( peak14 );
-          axis->endCoord   = FT_fdot14ToFixed( end14 );
+          /* immediately tag invalid ranges with special peak = 0 */
+          if ( ( start < 0 && end > 0 ) || start > peak || peak > end )
+            peak = 0;
+
+          axis->startCoord = FT_fdot14ToFixed( start );
+          axis->peakCoord  = FT_fdot14ToFixed( peak );
+          axis->endCoord   = FT_fdot14ToFixed( end );
         }
       }
 
@@ -1379,10 +1383,10 @@
       /* opcode in both CFF and CFF2 DICTs.  See `cff_parse_num' for    */
       /* decode of this, which rounds to an integer.                    */
       *subFont->blend_top++ = 255;
-      *subFont->blend_top++ = (FT_Byte)( sum >> 24 );
-      *subFont->blend_top++ = (FT_Byte)( sum >> 16 );
-      *subFont->blend_top++ = (FT_Byte)( sum >>  8 );
-      *subFont->blend_top++ = (FT_Byte)sum;
+      *subFont->blend_top++ = (FT_Byte)( (FT_UInt32)sum >> 24 );
+      *subFont->blend_top++ = (FT_Byte)( (FT_UInt32)sum >> 16 );
+      *subFont->blend_top++ = (FT_Byte)( (FT_UInt32)sum >>  8 );
+      *subFont->blend_top++ = (FT_Byte)( (FT_UInt32)sum );
     }
 
     /* leave only numBlends results on parser stack */
@@ -1495,44 +1499,31 @@
       for ( j = 0; j < lenNDV; j++ )
       {
         CFF_AxisCoords*  axis = &varRegion->axisList[j];
-        FT_Fixed         axisScalar;
 
 
-        /* compute the scalar contribution of this axis; */
-        /* ignore invalid ranges                         */
-        if ( axis->startCoord > axis->peakCoord ||
-             axis->peakCoord > axis->endCoord   )
-          axisScalar = FT_FIXED_ONE;
-
-        else if ( axis->startCoord < 0 &&
-                  axis->endCoord > 0   &&
-                  axis->peakCoord != 0 )
-          axisScalar = FT_FIXED_ONE;
-
-        /* peak of 0 means ignore this axis */
-        else if ( axis->peakCoord == 0 )
-          axisScalar = FT_FIXED_ONE;
+        /* compute the scalar contribution of this axis */
+        /* with peak of 0 used for invalid axes         */
+        if ( axis->peakCoord == NDV[j] ||
+             axis->peakCoord == 0      )
+          continue;
 
         /* ignore this region if coords are out of range */
-        else if ( NDV[j] < axis->startCoord ||
-                  NDV[j] > axis->endCoord   )
-          axisScalar = 0;
-
-        /* calculate a proportional factor */
-        else
+        else if ( NDV[j] <= axis->startCoord ||
+                  NDV[j] >= axis->endCoord   )
         {
-          if ( NDV[j] == axis->peakCoord )
-            axisScalar = FT_FIXED_ONE;
-          else if ( NDV[j] < axis->peakCoord )
-            axisScalar = FT_DivFix( NDV[j] - axis->startCoord,
-                                    axis->peakCoord - axis->startCoord );
-          else
-            axisScalar = FT_DivFix( axis->endCoord - NDV[j],
-                                    axis->endCoord - axis->peakCoord );
+          blend->BV[master] = 0;
+          break;
         }
 
-        /* take product of all the axis scalars */
-        blend->BV[master] = FT_MulFix( blend->BV[master], axisScalar );
+        /* adjust proportionally */
+        else if ( NDV[j] < axis->peakCoord )
+          blend->BV[master] = FT_MulDiv( blend->BV[master],
+                                         NDV[j] - axis->startCoord,
+                                         axis->peakCoord - axis->startCoord );
+        else   /* NDV[j] > axis->peakCoord ) */
+          blend->BV[master] = FT_MulDiv( blend->BV[master],
+                                         axis->endCoord - NDV[j],
+                                         axis->endCoord - axis->peakCoord );
       }
 
       FT_TRACE4(( ", %f ",
diff --git a/src/java.desktop/share/native/libfreetype/src/cff/cffload.h b/src/java.desktop/share/native/libfreetype/src/cff/cffload.h
index b5286b0c8cb..02209245421 100644
--- a/src/java.desktop/share/native/libfreetype/src/cff/cffload.h
+++ b/src/java.desktop/share/native/libfreetype/src/cff/cffload.h
@@ -4,7 +4,7 @@
  *
  *   OpenType & CFF data/program tables loader (specification).
  *
- * Copyright (C) 1996-2023 by
+ * Copyright (C) 1996-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/src/java.desktop/share/native/libfreetype/src/cff/cffobjs.c b/src/java.desktop/share/native/libfreetype/src/cff/cffobjs.c
index 6d08620c487..7c6713739a1 100644
--- a/src/java.desktop/share/native/libfreetype/src/cff/cffobjs.c
+++ b/src/java.desktop/share/native/libfreetype/src/cff/cffobjs.c
@@ -4,7 +4,7 @@
  *
  *   OpenType objects manager (body).
  *
- * Copyright (C) 1996-2023 by
+ * Copyright (C) 1996-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
@@ -42,6 +42,8 @@
 #include <freetype/internal/psaux.h>
 #include <freetype/internal/services/svcfftl.h>
 
+#define CFF_fixedToInt( x )                          \
+          ( (FT_Short)( ( (x) + 0x8000U ) >> 16 ) )
 
   /**************************************************************************
    *
@@ -124,19 +126,20 @@
 
     count = priv->num_blue_values = cpriv->num_blue_values;
     for ( n = 0; n < count; n++ )
-      priv->blue_values[n] = (FT_Short)cpriv->blue_values[n];
+      priv->blue_values[n] = CFF_fixedToInt( cpriv->blue_values[n] );
 
     count = priv->num_other_blues = cpriv->num_other_blues;
     for ( n = 0; n < count; n++ )
-      priv->other_blues[n] = (FT_Short)cpriv->other_blues[n];
+      priv->other_blues[n] = CFF_fixedToInt( cpriv->other_blues[n] );
 
     count = priv->num_family_blues = cpriv->num_family_blues;
     for ( n = 0; n < count; n++ )
-      priv->family_blues[n] = (FT_Short)cpriv->family_blues[n];
+      priv->family_blues[n] = CFF_fixedToInt( cpriv->family_blues[n] );
 
     count = priv->num_family_other_blues = cpriv->num_family_other_blues;
     for ( n = 0; n < count; n++ )
-      priv->family_other_blues[n] = (FT_Short)cpriv->family_other_blues[n];
+      priv->family_other_blues[n] =
+        CFF_fixedToInt( cpriv->family_other_blues[n] );
 
     priv->blue_scale = cpriv->blue_scale;
     priv->blue_shift = (FT_Int)cpriv->blue_shift;
@@ -421,32 +424,23 @@
   static void
   remove_subset_prefix( FT_String*  name )
   {
-    FT_Int32  idx             = 0;
-    FT_Int32  length          = (FT_Int32)ft_strlen( name ) + 1;
-    FT_Bool   continue_search = 1;
+    FT_UInt32  i = 0, idx = 0;
 
 
-    while ( continue_search )
+    /* six ASCII uppercase letters followed by a plus sign */
+    while ( 'A' <= name[i] && name[i++] <= 'Z' &&
+            'A' <= name[i] && name[i++] <= 'Z' &&
+            'A' <= name[i] && name[i++] <= 'Z' &&
+            'A' <= name[i] && name[i++] <= 'Z' &&
+            'A' <= name[i] && name[i++] <= 'Z' &&
+            'A' <= name[i] && name[i++] <= 'Z' &&
+                              name[i++] == '+' )
     {
-      if ( length >= 7 && name[6] == '+' )
-      {
-        for ( idx = 0; idx < 6; idx++ )
-        {
-          /* ASCII uppercase letters */
-          if ( !( 'A' <= name[idx] && name[idx] <= 'Z' ) )
-            continue_search = 0;
-        }
-
-        if ( continue_search )
-        {
-          for ( idx = 7; idx < length; idx++ )
-            name[idx - 7] = name[idx];
-          length -= 7;
-        }
-      }
-      else
-        continue_search = 0;
+      idx = i;
     }
+
+    if ( idx )
+      FT_MEM_MOVE( name, name + idx, ft_strlen( name + idx ) + 1 );
   }
 
 
@@ -456,42 +450,20 @@
   remove_style( FT_String*        family_name,
                 const FT_String*  style_name )
   {
-    FT_Int32  family_name_length, style_name_length;
+    FT_String*        f = family_name + ft_strlen( family_name );
+    const FT_String*  s =  style_name + ft_strlen(  style_name );
 
 
-    family_name_length = (FT_Int32)ft_strlen( family_name );
-    style_name_length  = (FT_Int32)ft_strlen( style_name );
+    /* compare strings moving backwards */
+    while ( s > style_name )
+      if ( f == family_name || *--s != *--f )
+        return;
 
-    if ( family_name_length > style_name_length )
-    {
-      FT_Int  idx;
-
-
-      for ( idx = 1; idx <= style_name_length; idx++ )
-      {
-        if ( family_name[family_name_length - idx] !=
-             style_name[style_name_length - idx] )
-          break;
-      }
-
-      if ( idx > style_name_length )
-      {
-        /* family_name ends with style_name; remove it */
-        idx = family_name_length - style_name_length - 1;
-
-        /* also remove special characters     */
-        /* between real family name and style */
-        while ( idx > 0                     &&
-                ( family_name[idx] == '-' ||
-                  family_name[idx] == ' ' ||
-                  family_name[idx] == '_' ||
-                  family_name[idx] == '+' ) )
-          idx--;
-
-        if ( idx > 0 )
-          family_name[idx + 1] = '\0';
-      }
-    }
+    /* terminate and remove special characters */
+    do
+      *f = '\0';
+    while ( f-- > family_name                                    &&
+            ( *f == '-' || *f == ' ' || *f == '_' || *f == '+' ) );
   }
 
 
@@ -722,8 +694,7 @@
         FT_UInt  instance_index = (FT_UInt)face_index >> 16;
 
 
-        if ( FT_HAS_MULTIPLE_MASTERS( cffface ) &&
-             instance_index > 0                 )
+        if ( FT_HAS_MULTIPLE_MASTERS( cffface ) )
         {
           error = FT_Set_Named_Instance( cffface, instance_index );
           if ( error )
diff --git a/src/java.desktop/share/native/libfreetype/src/cff/cffobjs.h b/src/java.desktop/share/native/libfreetype/src/cff/cffobjs.h
index 8f05f6132bc..91ad83b1cd0 100644
--- a/src/java.desktop/share/native/libfreetype/src/cff/cffobjs.h
+++ b/src/java.desktop/share/native/libfreetype/src/cff/cffobjs.h
@@ -4,7 +4,7 @@
  *
  *   OpenType objects manager (specification).
  *
- * Copyright (C) 1996-2023 by
+ * Copyright (C) 1996-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/src/java.desktop/share/native/libfreetype/src/cff/cffparse.c b/src/java.desktop/share/native/libfreetype/src/cff/cffparse.c
index 3b076704cf7..92a69c3b516 100644
--- a/src/java.desktop/share/native/libfreetype/src/cff/cffparse.c
+++ b/src/java.desktop/share/native/libfreetype/src/cff/cffparse.c
@@ -4,7 +4,7 @@
  *
  *   CFF token stream parser (body)
  *
- * Copyright (C) 1996-2023 by
+ * Copyright (C) 1996-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
@@ -501,10 +501,10 @@
       return cff_parse_real( *d, parser->limit, scaling, NULL );
     else if ( **d == 255 )
     {
-      FT_Fixed val = ( ( ( (FT_UInt32)*( d[0] + 1 ) << 24 ) |
-                         ( (FT_UInt32)*( d[0] + 2 ) << 16 ) |
-                         ( (FT_UInt32)*( d[0] + 3 ) <<  8 ) |
-                           (FT_UInt32)*( d[0] + 4 )         ) );
+      FT_Fixed val = (FT_Int32)( ( ( (FT_UInt32)*( d[0] + 1 ) << 24 ) |
+                                   ( (FT_UInt32)*( d[0] + 2 ) << 16 ) |
+                                   ( (FT_UInt32)*( d[0] + 3 ) <<  8 ) |
+                                     (FT_UInt32)*( d[0] + 4 )         ) );
 
       if ( scaling )
       {
@@ -1031,10 +1031,14 @@
           CFF_FIELD( code, name, id, cff_kind_string )
 #define CFF_FIELD_BOOL( code, name, id )             \
           CFF_FIELD( code, name, id, cff_kind_bool )
+#define CFF_FIELD_DELTA( code, name, max, id )                        \
+          CFF_FIELD_DELTA_KIND( code, name, max, id, cff_kind_delta )
+#define CFF_FIELD_DELTA_FIXED( code, name, max, id )                        \
+          CFF_FIELD_DELTA_KIND( code, name, max, id, cff_kind_delta_fixed )
 
 
 #undef  CFF_FIELD
-#undef  CFF_FIELD_DELTA
+#undef  CFF_FIELD_DELTA_KIND
 
 
 #ifndef FT_DEBUG_LEVEL_TRACE
@@ -1064,18 +1068,18 @@
             code | CFFCODE,               \
             FT_FIELD_OFFSET( name ),      \
             FT_FIELD_SIZE( name ),        \
-            0, 0, 0                       \
+            NULL, 0, 0                    \
           },
 
-#define CFF_FIELD_DELTA( code, name, max, id ) \
-          {                                    \
-            cff_kind_delta,                    \
-            code | CFFCODE,                    \
-            FT_FIELD_OFFSET( name ),           \
-            FT_FIELD_SIZE_DELTA( name ),       \
-            0,                                 \
-            max,                               \
-            FT_FIELD_OFFSET( num_ ## name )    \
+#define CFF_FIELD_DELTA_KIND( code, name, max, id, kind ) \
+          {                                               \
+            kind,                                         \
+            code | CFFCODE,                               \
+            FT_FIELD_OFFSET( name ),                      \
+            FT_FIELD_SIZE_DELTA( name ),                  \
+            NULL,                                         \
+            max,                                          \
+            FT_FIELD_OFFSET( num_ ## name )               \
           },
 
   static const CFF_Field_Handler  cff_field_handlers[] =
@@ -1083,7 +1087,7 @@
 
 #include "cfftoken.h"
 
-    { 0, 0, 0, 0, 0, 0, 0 }
+    { 0, 0, 0, 0, NULL, 0, 0 }
   };
 
 
@@ -1117,20 +1121,20 @@
             code | CFFCODE,               \
             FT_FIELD_OFFSET( name ),      \
             FT_FIELD_SIZE( name ),        \
-            0, 0, 0,                      \
+            NULL, 0, 0,                   \
             id                            \
           },
 
-#define CFF_FIELD_DELTA( code, name, max, id ) \
-          {                                    \
-            cff_kind_delta,                    \
-            code | CFFCODE,                    \
-            FT_FIELD_OFFSET( name ),           \
-            FT_FIELD_SIZE_DELTA( name ),       \
-            0,                                 \
-            max,                               \
-            FT_FIELD_OFFSET( num_ ## name ),   \
-            id                                 \
+#define CFF_FIELD_DELTA_KIND( code, name, max, id, kind ) \
+          {                                               \
+            kind,                                         \
+            code | CFFCODE,                               \
+            FT_FIELD_OFFSET( name ),                      \
+            FT_FIELD_SIZE_DELTA( name ),                  \
+            NULL,                                         \
+            max,                                          \
+            FT_FIELD_OFFSET( num_ ## name ),              \
+            id                                            \
           },
 
   static const CFF_Field_Handler  cff_field_handlers[] =
@@ -1138,7 +1142,7 @@
 
 #include "cfftoken.h"
 
-    { 0, 0, 0, 0, 0, 0, 0, 0 }
+    { 0, 0, 0, 0, NULL, 0, 0, NULL }
   };
 
 
@@ -1356,7 +1360,8 @@
 
             /* check that we have enough arguments -- except for */
             /* delta encoded arrays, which can be empty          */
-            if ( field->kind != cff_kind_delta && num_args < 1 )
+            if ( field->kind != cff_kind_delta                       &&
+                 field->kind != cff_kind_delta_fixed && num_args < 1 )
               goto Stack_Underflow;
 
             switch ( field->kind )
@@ -1471,6 +1476,38 @@
               }
               break;
 
+            case cff_kind_delta_fixed:
+              {
+                FT_Byte*   qcount = (FT_Byte*)parser->object +
+                                      field->count_offset;
+
+                FT_Byte**  data = parser->stack;
+
+
+                if ( num_args > field->array_max )
+                  num_args = field->array_max;
+
+                FT_TRACE4(( " [" ));
+
+                /* store count */
+                *qcount = (FT_Byte)num_args;
+
+                val = 0;
+                while ( num_args > 0 )
+                {
+                  val = ADD_LONG( val, cff_parse_fixed( parser, data++ ) );
+                  *(FT_Long*)q = val;
+
+                  FT_TRACE4(( " %f\n", (double)val / 65536 ));
+
+                  q += field->size;
+                  num_args--;
+                }
+
+                FT_TRACE4(( "]\n" ));
+              }
+              break;
+
             default:  /* callback or blend */
               error = field->reader( parser );
               if ( error )
diff --git a/src/java.desktop/share/native/libfreetype/src/cff/cffparse.h b/src/java.desktop/share/native/libfreetype/src/cff/cffparse.h
index 418caacc68c..ca6b18af6aa 100644
--- a/src/java.desktop/share/native/libfreetype/src/cff/cffparse.h
+++ b/src/java.desktop/share/native/libfreetype/src/cff/cffparse.h
@@ -4,7 +4,7 @@
  *
  *   CFF token stream parser (specification)
  *
- * Copyright (C) 1996-2023 by
+ * Copyright (C) 1996-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
@@ -107,6 +107,7 @@ FT_BEGIN_HEADER
     cff_kind_string,
     cff_kind_bool,
     cff_kind_delta,
+    cff_kind_delta_fixed,
     cff_kind_callback,
     cff_kind_blend,
 
diff --git a/src/java.desktop/share/native/libfreetype/src/cff/cfftoken.h b/src/java.desktop/share/native/libfreetype/src/cff/cfftoken.h
index b61cb0e66e8..da45faa7f4e 100644
--- a/src/java.desktop/share/native/libfreetype/src/cff/cfftoken.h
+++ b/src/java.desktop/share/native/libfreetype/src/cff/cfftoken.h
@@ -4,7 +4,7 @@
  *
  *   CFF token definitions (specification only).
  *
- * Copyright (C) 1996-2023 by
+ * Copyright (C) 1996-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
@@ -80,26 +80,26 @@
 #undef  CFFCODE
 #define CFFCODE       CFF_CODE_PRIVATE
 
-  CFF_FIELD_DELTA     ( 6,     blue_values, 14,        "BlueValues" )
-  CFF_FIELD_DELTA     ( 7,     other_blues, 10,        "OtherBlues" )
-  CFF_FIELD_DELTA     ( 8,     family_blues, 14,       "FamilyBlues" )
-  CFF_FIELD_DELTA     ( 9,     family_other_blues, 10, "FamilyOtherBlues" )
-  CFF_FIELD_FIXED_1000( 0x109, blue_scale,             "BlueScale" )
-  CFF_FIELD_NUM       ( 0x10A, blue_shift,             "BlueShift" )
-  CFF_FIELD_NUM       ( 0x10B, blue_fuzz,              "BlueFuzz" )
-  CFF_FIELD_NUM       ( 10,    standard_width,         "StdHW" )
-  CFF_FIELD_NUM       ( 11,    standard_height,        "StdVW" )
-  CFF_FIELD_DELTA     ( 0x10C, snap_widths, 13,        "StemSnapH" )
-  CFF_FIELD_DELTA     ( 0x10D, snap_heights, 13,       "StemSnapV" )
-  CFF_FIELD_BOOL      ( 0x10E, force_bold,             "ForceBold" )
-  CFF_FIELD_FIXED     ( 0x10F, force_bold_threshold,   "ForceBoldThreshold" )
-  CFF_FIELD_NUM       ( 0x110, lenIV,                  "lenIV" )
-  CFF_FIELD_NUM       ( 0x111, language_group,         "LanguageGroup" )
-  CFF_FIELD_FIXED     ( 0x112, expansion_factor,       "ExpansionFactor" )
-  CFF_FIELD_NUM       ( 0x113, initial_random_seed,    "initialRandomSeed" )
-  CFF_FIELD_NUM       ( 19,    local_subrs_offset,     "Subrs" )
-  CFF_FIELD_NUM       ( 20,    default_width,          "defaultWidthX" )
-  CFF_FIELD_NUM       ( 21,    nominal_width,          "nominalWidthX" )
+  CFF_FIELD_DELTA_FIXED( 6,     blue_values, 14,        "BlueValues" )
+  CFF_FIELD_DELTA_FIXED( 7,     other_blues, 10,        "OtherBlues" )
+  CFF_FIELD_DELTA_FIXED( 8,     family_blues, 14,       "FamilyBlues" )
+  CFF_FIELD_DELTA_FIXED( 9,     family_other_blues, 10, "FamilyOtherBlues" )
+  CFF_FIELD_FIXED_1000 ( 0x109, blue_scale,             "BlueScale" )
+  CFF_FIELD_NUM        ( 0x10A, blue_shift,             "BlueShift" )
+  CFF_FIELD_NUM        ( 0x10B, blue_fuzz,              "BlueFuzz" )
+  CFF_FIELD_NUM        ( 10,    standard_width,         "StdHW" )
+  CFF_FIELD_NUM        ( 11,    standard_height,        "StdVW" )
+  CFF_FIELD_DELTA      ( 0x10C, snap_widths, 13,        "StemSnapH" )
+  CFF_FIELD_DELTA      ( 0x10D, snap_heights, 13,       "StemSnapV" )
+  CFF_FIELD_BOOL       ( 0x10E, force_bold,             "ForceBold" )
+  CFF_FIELD_FIXED      ( 0x10F, force_bold_threshold,   "ForceBoldThreshold" )
+  CFF_FIELD_NUM        ( 0x110, lenIV,                  "lenIV" )
+  CFF_FIELD_NUM        ( 0x111, language_group,         "LanguageGroup" )
+  CFF_FIELD_FIXED      ( 0x112, expansion_factor,       "ExpansionFactor" )
+  CFF_FIELD_NUM        ( 0x113, initial_random_seed,    "initialRandomSeed" )
+  CFF_FIELD_NUM        ( 19,    local_subrs_offset,     "Subrs" )
+  CFF_FIELD_NUM        ( 20,    default_width,          "defaultWidthX" )
+  CFF_FIELD_NUM        ( 21,    nominal_width,          "nominalWidthX" )
 
 
 #undef  FT_STRUCTURE
@@ -129,22 +129,22 @@
 #undef  CFFCODE
 #define CFFCODE       CFF2_CODE_PRIVATE
 
-  CFF_FIELD_DELTA     ( 6,     blue_values, 14,        "BlueValues" )
-  CFF_FIELD_DELTA     ( 7,     other_blues, 10,        "OtherBlues" )
-  CFF_FIELD_DELTA     ( 8,     family_blues, 14,       "FamilyBlues" )
-  CFF_FIELD_DELTA     ( 9,     family_other_blues, 10, "FamilyOtherBlues" )
-  CFF_FIELD_FIXED_1000( 0x109, blue_scale,             "BlueScale" )
-  CFF_FIELD_NUM       ( 0x10A, blue_shift,             "BlueShift" )
-  CFF_FIELD_NUM       ( 0x10B, blue_fuzz,              "BlueFuzz" )
-  CFF_FIELD_NUM       ( 10,    standard_width,         "StdHW" )
-  CFF_FIELD_NUM       ( 11,    standard_height,        "StdVW" )
-  CFF_FIELD_DELTA     ( 0x10C, snap_widths, 13,        "StemSnapH" )
-  CFF_FIELD_DELTA     ( 0x10D, snap_heights, 13,       "StemSnapV" )
-  CFF_FIELD_NUM       ( 0x111, language_group,         "LanguageGroup" )
-  CFF_FIELD_FIXED     ( 0x112, expansion_factor,       "ExpansionFactor" )
-  CFF_FIELD_CALLBACK  ( 22,    vsindex,                "vsindex" )
-  CFF_FIELD_BLEND     ( 23,                            "blend" )
-  CFF_FIELD_NUM       ( 19,    local_subrs_offset,     "Subrs" )
+  CFF_FIELD_DELTA_FIXED( 6,     blue_values, 14,        "BlueValues" )
+  CFF_FIELD_DELTA_FIXED( 7,     other_blues, 10,        "OtherBlues" )
+  CFF_FIELD_DELTA_FIXED( 8,     family_blues, 14,       "FamilyBlues" )
+  CFF_FIELD_DELTA_FIXED( 9,     family_other_blues, 10, "FamilyOtherBlues" )
+  CFF_FIELD_FIXED_1000 ( 0x109, blue_scale,             "BlueScale" )
+  CFF_FIELD_NUM        ( 0x10A, blue_shift,             "BlueShift" )
+  CFF_FIELD_NUM        ( 0x10B, blue_fuzz,              "BlueFuzz" )
+  CFF_FIELD_NUM        ( 10,    standard_width,         "StdHW" )
+  CFF_FIELD_NUM        ( 11,    standard_height,        "StdVW" )
+  CFF_FIELD_DELTA      ( 0x10C, snap_widths, 13,        "StemSnapH" )
+  CFF_FIELD_DELTA      ( 0x10D, snap_heights, 13,       "StemSnapV" )
+  CFF_FIELD_NUM        ( 0x111, language_group,         "LanguageGroup" )
+  CFF_FIELD_FIXED      ( 0x112, expansion_factor,       "ExpansionFactor" )
+  CFF_FIELD_CALLBACK   ( 22,    vsindex,                "vsindex" )
+  CFF_FIELD_BLEND      ( 23,                            "blend" )
+  CFF_FIELD_NUM        ( 19,    local_subrs_offset,     "Subrs" )
 
 
 /* END */
diff --git a/src/java.desktop/share/native/libfreetype/src/cid/ciderrs.h b/src/java.desktop/share/native/libfreetype/src/cid/ciderrs.h
index 40a1097d0ac..c439a8c4a0b 100644
--- a/src/java.desktop/share/native/libfreetype/src/cid/ciderrs.h
+++ b/src/java.desktop/share/native/libfreetype/src/cid/ciderrs.h
@@ -4,7 +4,7 @@
  *
  *   CID error codes (specification only).
  *
- * Copyright (C) 2001-2023 by
+ * Copyright (C) 2001-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/src/java.desktop/share/native/libfreetype/src/cid/cidgload.c b/src/java.desktop/share/native/libfreetype/src/cid/cidgload.c
index eaca765ad06..7b571322d45 100644
--- a/src/java.desktop/share/native/libfreetype/src/cid/cidgload.c
+++ b/src/java.desktop/share/native/libfreetype/src/cid/cidgload.c
@@ -4,7 +4,7 @@
  *
  *   CID-keyed Type1 Glyph Loader (body).
  *
- * Copyright (C) 1996-2023 by
+ * Copyright (C) 1996-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/src/java.desktop/share/native/libfreetype/src/cid/cidgload.h b/src/java.desktop/share/native/libfreetype/src/cid/cidgload.h
index edd6229234c..9fdc9db5892 100644
--- a/src/java.desktop/share/native/libfreetype/src/cid/cidgload.h
+++ b/src/java.desktop/share/native/libfreetype/src/cid/cidgload.h
@@ -4,7 +4,7 @@
  *
  *   OpenType Glyph Loader (specification).
  *
- * Copyright (C) 1996-2023 by
+ * Copyright (C) 1996-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/src/java.desktop/share/native/libfreetype/src/cid/cidload.c b/src/java.desktop/share/native/libfreetype/src/cid/cidload.c
index a7da8ea39d5..722f5a34ddf 100644
--- a/src/java.desktop/share/native/libfreetype/src/cid/cidload.c
+++ b/src/java.desktop/share/native/libfreetype/src/cid/cidload.c
@@ -4,7 +4,7 @@
  *
  *   CID-keyed Type1 font loader (body).
  *
- * Copyright (C) 1996-2023 by
+ * Copyright (C) 1996-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
@@ -388,7 +388,7 @@
     T1_FIELD_CALLBACK( "ExpansionFactor", parse_expansion_factor, 0 )
     T1_FIELD_CALLBACK( "FontName",        parse_font_name, 0 )
 
-    { 0, T1_FIELD_LOCATION_CID_INFO, T1_FIELD_TYPE_NONE, 0, 0, 0, 0, 0, 0 }
+    T1_FIELD_ZERO
   };
 
 
@@ -469,36 +469,23 @@
             T1_Field  keyword = (T1_Field)cid_field_records;
 
 
-            for (;;)
+            while ( keyword->len )
             {
-              FT_Byte*  name;
+              FT_Byte*  name = (FT_Byte*)keyword->ident;
 
 
-              name = (FT_Byte*)keyword->ident;
-              if ( !name )
-                break;
-
-              if ( cur[0] == name[0]                     &&
-                   len == ft_strlen( (const char*)name ) )
+              if ( keyword->len == len              &&
+                   ft_memcmp( cur, name, len ) == 0 )
               {
-                FT_UInt  n;
-
-
-                for ( n = 1; n < len; n++ )
-                  if ( cur[n] != name[n] )
-                    break;
-
-                if ( n >= len )
-                {
-                  /* we found it - run the parsing callback */
-                  parser->root.error = cid_load_keyword( face,
-                                                         loader,
-                                                         keyword );
-                  if ( parser->root.error )
-                    return parser->root.error;
-                  break;
-                }
+                /* we found it - run the parsing callback */
+                parser->root.error = cid_load_keyword( face,
+                                                       loader,
+                                                       keyword );
+                if ( parser->root.error )
+                  return parser->root.error;
+                break;
               }
+
               keyword++;
             }
           }
diff --git a/src/java.desktop/share/native/libfreetype/src/cid/cidload.h b/src/java.desktop/share/native/libfreetype/src/cid/cidload.h
index d12d2962a68..7f030b32df7 100644
--- a/src/java.desktop/share/native/libfreetype/src/cid/cidload.h
+++ b/src/java.desktop/share/native/libfreetype/src/cid/cidload.h
@@ -4,7 +4,7 @@
  *
  *   CID-keyed Type1 font loader (specification).
  *
- * Copyright (C) 1996-2023 by
+ * Copyright (C) 1996-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/src/java.desktop/share/native/libfreetype/src/cid/cidobjs.c b/src/java.desktop/share/native/libfreetype/src/cid/cidobjs.c
index f698a419289..8d337c41128 100644
--- a/src/java.desktop/share/native/libfreetype/src/cid/cidobjs.c
+++ b/src/java.desktop/share/native/libfreetype/src/cid/cidobjs.c
@@ -4,7 +4,7 @@
  *
  *   CID objects manager (body).
  *
- * Copyright (C) 1996-2023 by
+ * Copyright (C) 1996-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/src/java.desktop/share/native/libfreetype/src/cid/cidobjs.h b/src/java.desktop/share/native/libfreetype/src/cid/cidobjs.h
index 83c0c61c3ca..d371cbe9954 100644
--- a/src/java.desktop/share/native/libfreetype/src/cid/cidobjs.h
+++ b/src/java.desktop/share/native/libfreetype/src/cid/cidobjs.h
@@ -4,7 +4,7 @@
  *
  *   CID objects manager (specification).
  *
- * Copyright (C) 1996-2023 by
+ * Copyright (C) 1996-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/src/java.desktop/share/native/libfreetype/src/cid/cidparse.c b/src/java.desktop/share/native/libfreetype/src/cid/cidparse.c
index 171a886215a..73a3ade893b 100644
--- a/src/java.desktop/share/native/libfreetype/src/cid/cidparse.c
+++ b/src/java.desktop/share/native/libfreetype/src/cid/cidparse.c
@@ -4,7 +4,7 @@
  *
  *   CID-keyed Type1 parser (body).
  *
- * Copyright (C) 1996-2023 by
+ * Copyright (C) 1996-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
@@ -90,10 +90,15 @@
     if ( error )
       goto Exit;
 
-  Again:
-    /* now, read the rest of the file until we find */
-    /* `StartData' or `/sfnts'                      */
+    if ( !stream->read ) {
+      /* just parse memory-based streams */
+      offset = stream->size;
+    }
+    else
     {
+      /* Find the last `StartData` or `/sfnts`.  The parser requires */
+      /* contiguous memory; attempt to pin as little as necessary.   */
+
       /*
        * The algorithm is as follows (omitting the case with less than 256
        * bytes to fill for simplicity).
@@ -119,7 +124,8 @@
       FT_Byte*  p           = buffer;
 
 
-      for ( offset = FT_STREAM_POS(); ; offset += 256 )
+      offset = 0;
+      while ( 1 )
       {
         FT_ULong  stream_len;
 
@@ -127,7 +133,7 @@
         stream_len = stream->size - FT_STREAM_POS();
 
         read_len = FT_MIN( read_len, stream_len );
-        if ( FT_STREAM_READ( p, read_len ) )
+        if ( read_len && FT_STREAM_READ( p, read_len ) )
           goto Exit;
 
         /* ensure that we do not compare with data beyond the buffer */
@@ -141,20 +147,23 @@
                ft_strncmp( (char*)p, STARTDATA, STARTDATA_LEN ) == 0 )
           {
             /* save offset of binary data after `StartData' */
-            offset += (FT_ULong)( p - buffer ) + STARTDATA_LEN + 1;
-            goto Found;
+            offset = FT_STREAM_POS() - read_len - read_offset
+                     + (FT_ULong)( p - buffer ) + STARTDATA_LEN + 1;
           }
           else if ( p[1] == 's'                                   &&
                     ft_strncmp( (char*)p, SFNTS, SFNTS_LEN ) == 0 )
           {
-            offset += (FT_ULong)( p - buffer ) + SFNTS_LEN + 1;
-            goto Found;
+            offset = FT_STREAM_POS() - read_len - read_offset
+                     + (FT_ULong)( p - buffer ) + SFNTS_LEN + 1;
           }
         }
 
-        if ( read_offset + read_len < STARTDATA_LEN )
+        if ( read_offset + read_len <= STARTDATA_LEN )
         {
-          FT_TRACE2(( "cid_parser_new: no `StartData' keyword found\n" ));
+          if ( offset )
+            goto Found;
+
+          FT_TRACE2(( "cid_parser_new: no `StartData` keyword found\n" ));
           error = FT_THROW( Invalid_File_Format );
           goto Exit;
         }
@@ -171,9 +180,9 @@
     }
 
   Found:
-    /* We have found the start of the binary data or the `/sfnts' token. */
-    /* Now rewind and extract the frame corresponding to this PostScript */
-    /* section.                                                          */
+    /* We have found an efficient range to look for the binary data or    */
+    /* `/sfnts' token.  Now rewind and extract the frame corresponding to */
+    /* this PostScript section.                                           */
 
     ps_len = offset - base_offset;
     if ( FT_STREAM_SEEK( base_offset )                  ||
@@ -187,8 +196,8 @@
     parser->root.limit     = parser->root.cursor + ps_len;
     parser->num_dict       = FT_UINT_MAX;
 
-    /* Finally, we check whether `StartData' or `/sfnts' was real --  */
-    /* it could be in a comment or string.  We also get the arguments */
+    /* Find the first real `StartData' or `/sfnts' -- the last one    */
+    /* could be in a comment or string.  We also get the arguments    */
     /* of `StartData' to find out whether the data is represented in  */
     /* binary or hex format.                                          */
 
@@ -216,6 +225,7 @@
       {
         T1_TokenRec  type_token;
         FT_Long      binary_length;
+        FT_ULong     found_offset;
 
 
         parser->root.cursor = arg1;
@@ -234,6 +244,24 @@
             parser->binary_length = (FT_ULong)binary_length;
         }
 
+        /* set the real values for the parser, if different */
+        found_offset = (FT_ULong)( cur - parser->postscript )
+                       + STARTDATA_LEN + 1;
+        if ( found_offset != offset )
+        {
+          FT_FRAME_RELEASE( parser->postscript );
+
+          ps_len = found_offset - base_offset;
+          if ( FT_STREAM_SEEK( base_offset )                  ||
+               FT_FRAME_EXTRACT( ps_len, parser->postscript ) )
+            goto Exit;
+
+          parser->data_offset    = found_offset;
+          parser->postscript_len = ps_len;
+          parser->root.base      = parser->postscript;
+          parser->root.cursor    = parser->postscript;
+          parser->root.limit     = parser->root.cursor + ps_len;
+        }
         goto Exit;
       }
       else if ( cur[1] == 's'                                   &&
@@ -251,11 +279,8 @@
       cur  = parser->root.cursor;
     }
 
-    /* we haven't found the correct `StartData'; go back and continue */
-    /* searching                                                      */
-    FT_FRAME_RELEASE( parser->postscript );
-    if ( !FT_STREAM_SEEK( offset ) )
-      goto Again;
+    FT_TRACE2(( "cid_parser_new: no `StartData` token found\n" ));
+    error = FT_THROW( Invalid_File_Format );
 
   Exit:
     return error;
diff --git a/src/java.desktop/share/native/libfreetype/src/cid/cidparse.h b/src/java.desktop/share/native/libfreetype/src/cid/cidparse.h
index 2fd4e7a9310..0f5baddcb92 100644
--- a/src/java.desktop/share/native/libfreetype/src/cid/cidparse.h
+++ b/src/java.desktop/share/native/libfreetype/src/cid/cidparse.h
@@ -4,7 +4,7 @@
  *
  *   CID-keyed Type1 parser (specification).
  *
- * Copyright (C) 1996-2023 by
+ * Copyright (C) 1996-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/src/java.desktop/share/native/libfreetype/src/cid/cidriver.c b/src/java.desktop/share/native/libfreetype/src/cid/cidriver.c
index 99e7b118395..4be8a5c00d5 100644
--- a/src/java.desktop/share/native/libfreetype/src/cid/cidriver.c
+++ b/src/java.desktop/share/native/libfreetype/src/cid/cidriver.c
@@ -4,7 +4,7 @@
  *
  *   CID driver interface (body).
  *
- * Copyright (C) 1996-2023 by
+ * Copyright (C) 1996-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/src/java.desktop/share/native/libfreetype/src/cid/cidriver.h b/src/java.desktop/share/native/libfreetype/src/cid/cidriver.h
index a6249385c81..7ddce431c5b 100644
--- a/src/java.desktop/share/native/libfreetype/src/cid/cidriver.h
+++ b/src/java.desktop/share/native/libfreetype/src/cid/cidriver.h
@@ -4,7 +4,7 @@
  *
  *   High-level CID driver interface (specification).
  *
- * Copyright (C) 1996-2023 by
+ * Copyright (C) 1996-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/src/java.desktop/share/native/libfreetype/src/cid/cidtoken.h b/src/java.desktop/share/native/libfreetype/src/cid/cidtoken.h
index 925951acdbd..160897d1447 100644
--- a/src/java.desktop/share/native/libfreetype/src/cid/cidtoken.h
+++ b/src/java.desktop/share/native/libfreetype/src/cid/cidtoken.h
@@ -4,7 +4,7 @@
  *
  *   CID token definitions (specification only).
  *
- * Copyright (C) 1996-2023 by
+ * Copyright (C) 1996-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/src/java.desktop/share/native/libfreetype/src/psaux/afmparse.c b/src/java.desktop/share/native/libfreetype/src/psaux/afmparse.c
index db08941def7..e2f6a8e5adb 100644
--- a/src/java.desktop/share/native/libfreetype/src/psaux/afmparse.c
+++ b/src/java.desktop/share/native/libfreetype/src/psaux/afmparse.c
@@ -4,7 +4,7 @@
  *
  *   AFM parser (body).
  *
- * Copyright (C) 2006-2023 by
+ * Copyright (C) 2006-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/src/java.desktop/share/native/libfreetype/src/psaux/afmparse.h b/src/java.desktop/share/native/libfreetype/src/psaux/afmparse.h
index 2d3b6e6e169..b7766372821 100644
--- a/src/java.desktop/share/native/libfreetype/src/psaux/afmparse.h
+++ b/src/java.desktop/share/native/libfreetype/src/psaux/afmparse.h
@@ -4,7 +4,7 @@
  *
  *   AFM parser (specification).
  *
- * Copyright (C) 2006-2023 by
+ * Copyright (C) 2006-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/src/java.desktop/share/native/libfreetype/src/psaux/cffdecode.c b/src/java.desktop/share/native/libfreetype/src/psaux/cffdecode.c
index 562d17d2216..9556e11a586 100644
--- a/src/java.desktop/share/native/libfreetype/src/psaux/cffdecode.c
+++ b/src/java.desktop/share/native/libfreetype/src/psaux/cffdecode.c
@@ -4,7 +4,7 @@
  *
  *   PostScript CFF (Type 2) decoding routines (body).
  *
- * Copyright (C) 2017-2023 by
+ * Copyright (C) 2017-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
@@ -17,6 +17,7 @@
 
 
 #include <freetype/freetype.h>
+#include <freetype/internal/ftcalc.h>
 #include <freetype/internal/ftdebug.h>
 #include <freetype/internal/ftserv.h>
 #include <freetype/internal/services/svcfftl.h>
@@ -1752,22 +1753,9 @@
 
           /* without upper limit the loop below might not finish */
           if ( args[0] > 0x7FFFFFFFL )
-            args[0] = 46341;
+            args[0] = 0xB504F4L;    /* sqrt( 32768.0044 ) */
           else if ( args[0] > 0 )
-          {
-            FT_Fixed  root = args[0];
-            FT_Fixed  new_root;
-
-
-            for (;;)
-            {
-              new_root = ( root + FT_DivFix( args[0], root ) + 1 ) >> 1;
-              if ( new_root == root )
-                break;
-              root = new_root;
-            }
-            args[0] = new_root;
-          }
+            args[0] = (FT_Fixed)FT_SqrtFixed( args[0] );
           else
             args[0] = 0;
           args++;
diff --git a/src/java.desktop/share/native/libfreetype/src/psaux/cffdecode.h b/src/java.desktop/share/native/libfreetype/src/psaux/cffdecode.h
index e8bb4001cba..038f7235c3d 100644
--- a/src/java.desktop/share/native/libfreetype/src/psaux/cffdecode.h
+++ b/src/java.desktop/share/native/libfreetype/src/psaux/cffdecode.h
@@ -4,7 +4,7 @@
  *
  *   PostScript CFF (Type 2) decoding routines (specification).
  *
- * Copyright (C) 2017-2023 by
+ * Copyright (C) 2017-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/src/java.desktop/share/native/libfreetype/src/psaux/psauxerr.h b/src/java.desktop/share/native/libfreetype/src/psaux/psauxerr.h
index 895ffa48c2c..18428c40d5a 100644
--- a/src/java.desktop/share/native/libfreetype/src/psaux/psauxerr.h
+++ b/src/java.desktop/share/native/libfreetype/src/psaux/psauxerr.h
@@ -4,7 +4,7 @@
  *
  *   PS auxiliary module error codes (specification only).
  *
- * Copyright (C) 2001-2023 by
+ * Copyright (C) 2001-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/src/java.desktop/share/native/libfreetype/src/psaux/psauxmod.c b/src/java.desktop/share/native/libfreetype/src/psaux/psauxmod.c
index 45e35aa53c4..6826f9d8d3e 100644
--- a/src/java.desktop/share/native/libfreetype/src/psaux/psauxmod.c
+++ b/src/java.desktop/share/native/libfreetype/src/psaux/psauxmod.c
@@ -4,7 +4,7 @@
  *
  *   FreeType auxiliary PostScript module implementation (body).
  *
- * Copyright (C) 2000-2023 by
+ * Copyright (C) 2000-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/src/java.desktop/share/native/libfreetype/src/psaux/psauxmod.h b/src/java.desktop/share/native/libfreetype/src/psaux/psauxmod.h
index 94dbf48813c..82d7e348af8 100644
--- a/src/java.desktop/share/native/libfreetype/src/psaux/psauxmod.h
+++ b/src/java.desktop/share/native/libfreetype/src/psaux/psauxmod.h
@@ -4,7 +4,7 @@
  *
  *   FreeType auxiliary PostScript module implementation (specification).
  *
- * Copyright (C) 2000-2023 by
+ * Copyright (C) 2000-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/src/java.desktop/share/native/libfreetype/src/psaux/psblues.c b/src/java.desktop/share/native/libfreetype/src/psaux/psblues.c
index f9c864fea9a..213b943b465 100644
--- a/src/java.desktop/share/native/libfreetype/src/psaux/psblues.c
+++ b/src/java.desktop/share/native/libfreetype/src/psaux/psblues.c
@@ -54,14 +54,6 @@
 #define FT_COMPONENT  cf2blues
 
 
-  /*
-   * For blue values, the FreeType parser produces an array of integers,
-   * while the Adobe CFF engine produces an array of fixed.
-   * Define a macro to convert FreeType to fixed.
-   */
-#define cf2_blueToFixed( x )  cf2_intToFixed( x )
-
-
   FT_LOCAL_DEF( void )
   cf2_blues_init( CF2_Blues  blues,
                   CF2_Font   font )
@@ -78,10 +70,10 @@
     size_t  numFamilyBlues;
     size_t  numFamilyOtherBlues;
 
-    FT_Pos*  blueValues;
-    FT_Pos*  otherBlues;
-    FT_Pos*  familyBlues;
-    FT_Pos*  familyOtherBlues;
+    FT_Fixed*  blueValues;
+    FT_Fixed*  otherBlues;
+    FT_Fixed*  familyBlues;
+    FT_Fixed*  familyOtherBlues;
 
     size_t     i;
     CF2_Fixed  emBoxBottom, emBoxTop;
@@ -138,13 +130,13 @@
       emBoxTop    = CF2_ICF_Top;
     }
 
-    if ( cf2_getLanguageGroup( decoder ) == 1                   &&
-         ( numBlueValues == 0                                 ||
-           ( numBlueValues == 4                             &&
-             cf2_blueToFixed( blueValues[0] ) < emBoxBottom &&
-             cf2_blueToFixed( blueValues[1] ) < emBoxBottom &&
-             cf2_blueToFixed( blueValues[2] ) > emBoxTop    &&
-             cf2_blueToFixed( blueValues[3] ) > emBoxTop    ) ) )
+    if ( cf2_getLanguageGroup( decoder ) == 1     &&
+         ( numBlueValues == 0                   ||
+           ( numBlueValues == 4               &&
+             blueValues[0] < emBoxBottom      &&
+             blueValues[1] < emBoxBottom      &&
+             blueValues[2] > emBoxTop         &&
+             blueValues[3] > emBoxTop         ) ) )
     {
       /*
        * Construct hint edges suitable for synthetic ghost hints at top
@@ -189,10 +181,8 @@
     /* bottom zones                                                      */
     for ( i = 0; i < numBlueValues; i += 2 )
     {
-      blues->zone[blues->count].csBottomEdge =
-        cf2_blueToFixed( blueValues[i] );
-      blues->zone[blues->count].csTopEdge =
-        cf2_blueToFixed( blueValues[i + 1] );
+      blues->zone[blues->count].csBottomEdge = blueValues[i];
+      blues->zone[blues->count].csTopEdge    = blueValues[i + 1];
 
       zoneHeight = SUB_INT32( blues->zone[blues->count].csTopEdge,
                               blues->zone[blues->count].csBottomEdge );
@@ -238,10 +228,8 @@
 
     for ( i = 0; i < numOtherBlues; i += 2 )
     {
-      blues->zone[blues->count].csBottomEdge =
-        cf2_blueToFixed( otherBlues[i] );
-      blues->zone[blues->count].csTopEdge =
-        cf2_blueToFixed( otherBlues[i + 1] );
+      blues->zone[blues->count].csBottomEdge = otherBlues[i];
+      blues->zone[blues->count].csTopEdge    = otherBlues[i + 1];
 
       zoneHeight = SUB_INT32( blues->zone[blues->count].csTopEdge,
                               blues->zone[blues->count].csBottomEdge );
@@ -299,7 +287,7 @@
         for ( j = 0; j < numFamilyOtherBlues; j += 2 )
         {
           /* top edge */
-          flatFamilyEdge = cf2_blueToFixed( familyOtherBlues[j + 1] );
+          flatFamilyEdge = familyOtherBlues[j + 1];
 
           diff = cf2_fixedAbs( SUB_INT32( flatEdge, flatFamilyEdge ) );
 
@@ -317,7 +305,7 @@
         if ( numFamilyBlues >= 2 )
         {
           /* top edge */
-          flatFamilyEdge = cf2_blueToFixed( familyBlues[1] );
+          flatFamilyEdge = familyBlues[1];
 
           diff = cf2_fixedAbs( SUB_INT32( flatEdge, flatFamilyEdge ) );
 
@@ -337,7 +325,7 @@
         for ( j = 2; j < numFamilyBlues; j += 2 )
         {
           /* bottom edge */
-          flatFamilyEdge = cf2_blueToFixed( familyBlues[j] );
+          flatFamilyEdge = familyBlues[j];
 
           /* adjust edges of top zone upward by twice darkening amount */
           flatFamilyEdge += 2 * font->darkenY;      /* bottom edge */
diff --git a/src/java.desktop/share/native/libfreetype/src/psaux/psconv.c b/src/java.desktop/share/native/libfreetype/src/psaux/psconv.c
index b9c7138d846..56c0ecd1d7f 100644
--- a/src/java.desktop/share/native/libfreetype/src/psaux/psconv.c
+++ b/src/java.desktop/share/native/libfreetype/src/psaux/psconv.c
@@ -4,7 +4,7 @@
  *
  *   Some convenience conversions (body).
  *
- * Copyright (C) 2006-2023 by
+ * Copyright (C) 2006-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/src/java.desktop/share/native/libfreetype/src/psaux/psconv.h b/src/java.desktop/share/native/libfreetype/src/psaux/psconv.h
index b7c3ee00be8..91fcd15a1c9 100644
--- a/src/java.desktop/share/native/libfreetype/src/psaux/psconv.h
+++ b/src/java.desktop/share/native/libfreetype/src/psaux/psconv.h
@@ -4,7 +4,7 @@
  *
  *   Some convenience conversions (specification).
  *
- * Copyright (C) 2006-2023 by
+ * Copyright (C) 2006-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/src/java.desktop/share/native/libfreetype/src/psaux/psft.c b/src/java.desktop/share/native/libfreetype/src/psaux/psft.c
index 618864e6e07..fd0abe17154 100644
--- a/src/java.desktop/share/native/libfreetype/src/psaux/psft.c
+++ b/src/java.desktop/share/native/libfreetype/src/psaux/psft.c
@@ -566,12 +566,12 @@
   FT_LOCAL_DEF( void )
   cf2_getBlueValues( PS_Decoder*  decoder,
                      size_t*      count,
-                     FT_Pos*     *data )
+                     FT_Fixed*   *data )
   {
     FT_ASSERT( decoder && decoder->current_subfont );
 
     *count = decoder->current_subfont->private_dict.num_blue_values;
-    *data  = (FT_Pos*)
+    *data  = (FT_Fixed*)
                &decoder->current_subfont->private_dict.blue_values;
   }
 
@@ -579,12 +579,12 @@
   FT_LOCAL_DEF( void )
   cf2_getOtherBlues( PS_Decoder*  decoder,
                      size_t*      count,
-                     FT_Pos*     *data )
+                     FT_Fixed*   *data )
   {
     FT_ASSERT( decoder && decoder->current_subfont );
 
     *count = decoder->current_subfont->private_dict.num_other_blues;
-    *data  = (FT_Pos*)
+    *data  = (FT_Fixed*)
                &decoder->current_subfont->private_dict.other_blues;
   }
 
@@ -592,12 +592,12 @@
   FT_LOCAL_DEF( void )
   cf2_getFamilyBlues( PS_Decoder*  decoder,
                       size_t*      count,
-                      FT_Pos*     *data )
+                      FT_Fixed*   *data )
   {
     FT_ASSERT( decoder && decoder->current_subfont );
 
     *count = decoder->current_subfont->private_dict.num_family_blues;
-    *data  = (FT_Pos*)
+    *data  = (FT_Fixed*)
                &decoder->current_subfont->private_dict.family_blues;
   }
 
@@ -605,12 +605,12 @@
   FT_LOCAL_DEF( void )
   cf2_getFamilyOtherBlues( PS_Decoder*  decoder,
                            size_t*      count,
-                           FT_Pos*     *data )
+                           FT_Fixed*   *data )
   {
     FT_ASSERT( decoder && decoder->current_subfont );
 
     *count = decoder->current_subfont->private_dict.num_family_other_blues;
-    *data  = (FT_Pos*)
+    *data  = (FT_Fixed*)
                &decoder->current_subfont->private_dict.family_other_blues;
   }
 
diff --git a/src/java.desktop/share/native/libfreetype/src/psaux/psft.h b/src/java.desktop/share/native/libfreetype/src/psaux/psft.h
index 3da454e6012..d9082f3a2be 100644
--- a/src/java.desktop/share/native/libfreetype/src/psaux/psft.h
+++ b/src/java.desktop/share/native/libfreetype/src/psaux/psft.h
@@ -92,19 +92,19 @@ FT_BEGIN_HEADER
   FT_LOCAL( void )
   cf2_getBlueValues( PS_Decoder*  decoder,
                      size_t*      count,
-                     FT_Pos*     *data );
+                     FT_Fixed*   *data );
   FT_LOCAL( void )
   cf2_getOtherBlues( PS_Decoder*  decoder,
                      size_t*      count,
-                     FT_Pos*     *data );
+                     FT_Fixed*   *data );
   FT_LOCAL( void )
   cf2_getFamilyBlues( PS_Decoder*  decoder,
                       size_t*      count,
-                      FT_Pos*     *data );
+                      FT_Fixed*   *data );
   FT_LOCAL( void )
   cf2_getFamilyOtherBlues( PS_Decoder*  decoder,
                            size_t*      count,
-                           FT_Pos*     *data );
+                           FT_Fixed*   *data );
 
   FT_LOCAL( CF2_Int )
   cf2_getLanguageGroup( PS_Decoder*  decoder );
diff --git a/src/java.desktop/share/native/libfreetype/src/psaux/psintrp.c b/src/java.desktop/share/native/libfreetype/src/psaux/psintrp.c
index 6c640eebd5a..7572e225e37 100644
--- a/src/java.desktop/share/native/libfreetype/src/psaux/psintrp.c
+++ b/src/java.desktop/share/native/libfreetype/src/psaux/psintrp.c
@@ -37,6 +37,7 @@
 
 
 #include "psft.h"
+#include <freetype/internal/ftcalc.h>
 #include <freetype/internal/ftdebug.h>
 #include <freetype/internal/services/svcfftl.h>
 
@@ -428,6 +429,8 @@
     base  = cf2_stack_count( opStack ) - numOperands;
     delta = base + numBlends;
 
+    FT_TRACE6(( " (" ));
+
     for ( i = 0; i < numBlends; i++ )
     {
       const CF2_Fixed*  weight = &blend->BV[1];
@@ -442,10 +445,14 @@
                                     cf2_stack_getReal( opStack,
                                                        delta++ ) ) );
 
+      FT_TRACE6(( "%f ", (double)sum / 65536 ));
+
       /* store blended result  */
       cf2_stack_setReal( opStack, i + base, sum );
     }
 
+    FT_TRACE6(( "blended)\n" ));
+
     /* leave only `numBlends' results on stack */
     cf2_stack_pop( opStack, numOperands - numBlends );
   }
@@ -734,7 +741,7 @@
           FT_UInt  numBlends;
 
 
-          FT_TRACE4(( " blend\n" ));
+          FT_TRACE4(( " blend" ));
 
           if ( !font->isCFF2 )
             break;    /* clear stack & ignore */
@@ -2275,23 +2282,7 @@
 
                     arg = cf2_stack_popFixed( opStack );
                     if ( arg > 0 )
-                    {
-                      /* use a start value that doesn't make */
-                      /* the algorithm's addition overflow   */
-                      FT_Fixed  root = arg < 10 ? arg : arg >> 1;
-                      FT_Fixed  new_root;
-
-
-                      /* Babylonian method */
-                      for (;;)
-                      {
-                        new_root = ( root + FT_DivFix( arg, root ) + 1 ) >> 1;
-                        if ( new_root == root )
-                          break;
-                        root = new_root;
-                      }
-                      arg = new_root;
-                    }
+                      arg = (CF2_F16Dot16)FT_SqrtFixed( (FT_UInt32)arg );
                     else
                       arg = 0;
 
diff --git a/src/java.desktop/share/native/libfreetype/src/psaux/psobjs.c b/src/java.desktop/share/native/libfreetype/src/psaux/psobjs.c
index 8da755d0e57..eca465f009e 100644
--- a/src/java.desktop/share/native/libfreetype/src/psaux/psobjs.c
+++ b/src/java.desktop/share/native/libfreetype/src/psaux/psobjs.c
@@ -4,7 +4,7 @@
  *
  *   Auxiliary functions for PostScript fonts (body).
  *
- * Copyright (C) 1996-2023 by
+ * Copyright (C) 1996-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
@@ -23,6 +23,7 @@
 
 #include "psobjs.h"
 #include "psconv.h"
+#include "psft.h"
 
 #include "psauxerr.h"
 #include "psauxmod.h"
@@ -200,7 +201,9 @@
     /* add the object to the base block and adjust offset */
     table->elements[idx] = FT_OFFSET( table->block, table->cursor );
     table->lengths [idx] = length;
-    FT_MEM_COPY( table->block + table->cursor, object, length );
+    /* length == 0 also implies a NULL destination, so skip the copy call */
+    if ( length > 0 )
+      FT_MEM_COPY( table->block + table->cursor, object, length );
 
     table->cursor += length;
     return FT_Err_Ok;
@@ -1624,7 +1627,7 @@
     if ( builder->load_points )
     {
       FT_Vector*  point   = outline->points + outline->n_points;
-      FT_Byte*    control = (FT_Byte*)outline->tags + outline->n_points;
+      FT_Byte*    control = outline->tags   + outline->n_points;
 
 
       point->x = FIXED_TO_INT( x );
@@ -1677,8 +1680,7 @@
     if ( !error )
     {
       if ( outline->n_contours > 0 )
-        outline->contours[outline->n_contours - 1] =
-          (short)( outline->n_points - 1 );
+        outline->contours[outline->n_contours - 1] = outline->n_points - 1;
 
       outline->n_contours++;
     }
@@ -1740,7 +1742,7 @@
     {
       FT_Vector*  p1      = outline->points + first;
       FT_Vector*  p2      = outline->points + outline->n_points - 1;
-      FT_Byte*    control = (FT_Byte*)outline->tags + outline->n_points - 1;
+      FT_Byte*    control = outline->tags   + outline->n_points - 1;
 
 
       /* `delete' last point only if it coincides with the first */
@@ -1760,8 +1762,7 @@
         outline->n_points--;
       }
       else
-        outline->contours[outline->n_contours - 1] =
-          (short)( outline->n_points - 1 );
+        outline->contours[outline->n_contours - 1] = outline->n_points - 1;
     }
   }
 
@@ -1899,7 +1900,7 @@
     if ( builder->load_points )
     {
       FT_Vector*  point   = outline->points + outline->n_points;
-      FT_Byte*    control = (FT_Byte*)outline->tags + outline->n_points;
+      FT_Byte*    control = outline->tags   + outline->n_points;
 
 #ifdef CFF_CONFIG_OPTION_OLD_ENGINE
       PS_Driver  driver   = (PS_Driver)FT_FACE_DRIVER( builder->face );
@@ -1959,8 +1960,7 @@
     if ( !error )
     {
       if ( outline->n_contours > 0 )
-        outline->contours[outline->n_contours - 1] =
-          (short)( outline->n_points - 1 );
+        outline->contours[outline->n_contours - 1] = outline->n_points - 1;
 
       outline->n_contours++;
     }
@@ -2019,7 +2019,7 @@
     {
       FT_Vector*  p1      = outline->points + first;
       FT_Vector*  p2      = outline->points + outline->n_points - 1;
-      FT_Byte*    control = (FT_Byte*)outline->tags + outline->n_points - 1;
+      FT_Byte*    control = outline->tags   + outline->n_points - 1;
 
 
       /* `delete' last point only if it coincides with the first    */
@@ -2039,8 +2039,7 @@
         outline->n_points--;
       }
       else
-        outline->contours[outline->n_contours - 1] =
-          (short)( outline->n_points - 1 );
+        outline->contours[outline->n_contours - 1] = outline->n_points - 1;
     }
   }
 
@@ -2188,7 +2187,7 @@
     if ( builder->load_points )
     {
       FT_Vector*  point   = outline->points + outline->n_points;
-      FT_Byte*    control = (FT_Byte*)outline->tags + outline->n_points;
+      FT_Byte*    control = outline->tags   + outline->n_points;
 
 #ifdef CFF_CONFIG_OPTION_OLD_ENGINE
       PS_Driver  driver   = (PS_Driver)FT_FACE_DRIVER( builder->face );
@@ -2267,8 +2266,7 @@
     if ( !error )
     {
       if ( outline->n_contours > 0 )
-        outline->contours[outline->n_contours - 1] =
-          (short)( outline->n_points - 1 );
+        outline->contours[outline->n_contours - 1] = outline->n_points - 1;
 
       outline->n_contours++;
     }
@@ -2327,7 +2325,7 @@
     {
       FT_Vector*  p1      = outline->points + first;
       FT_Vector*  p2      = outline->points + outline->n_points - 1;
-      FT_Byte*    control = (FT_Byte*)outline->tags + outline->n_points - 1;
+      FT_Byte*    control = outline->tags   + outline->n_points - 1;
 
 
       /* `delete' last point only if it coincides with the first */
@@ -2347,8 +2345,7 @@
         outline->n_points--;
       }
       else
-        outline->contours[outline->n_contours - 1] =
-          (short)( outline->n_points - 1 );
+        outline->contours[outline->n_contours - 1] = outline->n_points - 1;
     }
   }
 
@@ -2463,19 +2460,20 @@
 
     count = cpriv->num_blue_values = priv->num_blue_values;
     for ( n = 0; n < count; n++ )
-      cpriv->blue_values[n] = (FT_Pos)priv->blue_values[n];
+      cpriv->blue_values[n] = cf2_intToFixed( priv->blue_values[n] );
 
     count = cpriv->num_other_blues = priv->num_other_blues;
     for ( n = 0; n < count; n++ )
-      cpriv->other_blues[n] = (FT_Pos)priv->other_blues[n];
+      cpriv->other_blues[n] = cf2_intToFixed( priv->other_blues[n] );
 
     count = cpriv->num_family_blues = priv->num_family_blues;
     for ( n = 0; n < count; n++ )
-      cpriv->family_blues[n] = (FT_Pos)priv->family_blues[n];
+      cpriv->family_blues[n] = cf2_intToFixed( priv->family_blues[n] );
 
     count = cpriv->num_family_other_blues = priv->num_family_other_blues;
     for ( n = 0; n < count; n++ )
-      cpriv->family_other_blues[n] = (FT_Pos)priv->family_other_blues[n];
+      cpriv->family_other_blues[n] =
+        cf2_intToFixed( priv->family_other_blues[n] );
 
     cpriv->blue_scale = priv->blue_scale;
     cpriv->blue_shift = (FT_Pos)priv->blue_shift;
diff --git a/src/java.desktop/share/native/libfreetype/src/psaux/psobjs.h b/src/java.desktop/share/native/libfreetype/src/psaux/psobjs.h
index d5bce541082..345fc8a7335 100644
--- a/src/java.desktop/share/native/libfreetype/src/psaux/psobjs.h
+++ b/src/java.desktop/share/native/libfreetype/src/psaux/psobjs.h
@@ -4,7 +4,7 @@
  *
  *   Auxiliary functions for PostScript fonts (specification).
  *
- * Copyright (C) 1996-2023 by
+ * Copyright (C) 1996-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/src/java.desktop/share/native/libfreetype/src/psaux/t1cmap.c b/src/java.desktop/share/native/libfreetype/src/psaux/t1cmap.c
index c4bcf599ea3..5681c3bd0fd 100644
--- a/src/java.desktop/share/native/libfreetype/src/psaux/t1cmap.c
+++ b/src/java.desktop/share/native/libfreetype/src/psaux/t1cmap.c
@@ -4,7 +4,7 @@
  *
  *   Type 1 character map support (body).
  *
- * Copyright (C) 2002-2023 by
+ * Copyright (C) 2002-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/src/java.desktop/share/native/libfreetype/src/psaux/t1cmap.h b/src/java.desktop/share/native/libfreetype/src/psaux/t1cmap.h
index b3702498a55..445e6a2784f 100644
--- a/src/java.desktop/share/native/libfreetype/src/psaux/t1cmap.h
+++ b/src/java.desktop/share/native/libfreetype/src/psaux/t1cmap.h
@@ -4,7 +4,7 @@
  *
  *   Type 1 character map support (specification).
  *
- * Copyright (C) 2002-2023 by
+ * Copyright (C) 2002-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/src/java.desktop/share/native/libfreetype/src/psaux/t1decode.c b/src/java.desktop/share/native/libfreetype/src/psaux/t1decode.c
index 4b6b969bcb9..c74baa8038f 100644
--- a/src/java.desktop/share/native/libfreetype/src/psaux/t1decode.c
+++ b/src/java.desktop/share/native/libfreetype/src/psaux/t1decode.c
@@ -4,7 +4,7 @@
  *
  *   PostScript Type 1 decoding routines (body).
  *
- * Copyright (C) 2000-2023 by
+ * Copyright (C) 2000-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/src/java.desktop/share/native/libfreetype/src/psaux/t1decode.h b/src/java.desktop/share/native/libfreetype/src/psaux/t1decode.h
index 0970def960b..16203b8f734 100644
--- a/src/java.desktop/share/native/libfreetype/src/psaux/t1decode.h
+++ b/src/java.desktop/share/native/libfreetype/src/psaux/t1decode.h
@@ -4,7 +4,7 @@
  *
  *   PostScript Type 1 decoding routines (specification).
  *
- * Copyright (C) 2000-2023 by
+ * Copyright (C) 2000-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/src/java.desktop/share/native/libfreetype/src/pshinter/pshalgo.c b/src/java.desktop/share/native/libfreetype/src/pshinter/pshalgo.c
index 4f622e1e440..967767b3485 100644
--- a/src/java.desktop/share/native/libfreetype/src/pshinter/pshalgo.c
+++ b/src/java.desktop/share/native/libfreetype/src/pshinter/pshalgo.c
@@ -4,7 +4,7 @@
  *
  *   PostScript hinting algorithm (body).
  *
- * Copyright (C) 2001-2023 by
+ * Copyright (C) 2001-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used
@@ -1118,7 +1118,7 @@
     FT_UInt     n;
     PSH_Point   point = glyph->points;
     FT_Vector*  vec   = glyph->outline->points;
-    char*       tags  = glyph->outline->tags;
+    FT_Byte*    tags  = glyph->outline->tags;
 
 
     for ( n = 0; n < glyph->num_points; n++ )
@@ -1171,8 +1171,8 @@
          FT_QNEW_ARRAY( glyph->contours, outline->n_contours ) )
       goto Exit;
 
-    glyph->num_points   = (FT_UInt)outline->n_points;
-    glyph->num_contours = (FT_UInt)outline->n_contours;
+    glyph->num_points   = outline->n_points;
+    glyph->num_contours = outline->n_contours;
 
     {
       FT_UInt      first = 0, next, n;
@@ -1186,7 +1186,7 @@
         PSH_Point  point;
 
 
-        next  = (FT_UInt)outline->contours[n] + 1;
+        next  = outline->contours[n] + 1;
         count = next - first;
 
         contour->start = points + first;
diff --git a/src/java.desktop/share/native/libfreetype/src/pshinter/pshalgo.h b/src/java.desktop/share/native/libfreetype/src/pshinter/pshalgo.h
index 3f0ba28a693..fb362f061b6 100644
--- a/src/java.desktop/share/native/libfreetype/src/pshinter/pshalgo.h
+++ b/src/java.desktop/share/native/libfreetype/src/pshinter/pshalgo.h
@@ -4,7 +4,7 @@
  *
  *   PostScript hinting algorithm (specification).
  *
- * Copyright (C) 2001-2023 by
+ * Copyright (C) 2001-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/src/java.desktop/share/native/libfreetype/src/pshinter/pshglob.c b/src/java.desktop/share/native/libfreetype/src/pshinter/pshglob.c
index d4c5eb32b1c..435f45838ff 100644
--- a/src/java.desktop/share/native/libfreetype/src/pshinter/pshglob.c
+++ b/src/java.desktop/share/native/libfreetype/src/pshinter/pshglob.c
@@ -5,7 +5,7 @@
  *   PostScript hinter global hinting management (body).
  *   Inspired by the new auto-hinter module.
  *
- * Copyright (C) 2001-2023 by
+ * Copyright (C) 2001-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used
diff --git a/src/java.desktop/share/native/libfreetype/src/pshinter/pshglob.h b/src/java.desktop/share/native/libfreetype/src/pshinter/pshglob.h
index 579eb2148a5..c5a5c913168 100644
--- a/src/java.desktop/share/native/libfreetype/src/pshinter/pshglob.h
+++ b/src/java.desktop/share/native/libfreetype/src/pshinter/pshglob.h
@@ -4,7 +4,7 @@
  *
  *   PostScript hinter global hinting management.
  *
- * Copyright (C) 2001-2023 by
+ * Copyright (C) 2001-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/src/java.desktop/share/native/libfreetype/src/pshinter/pshmod.c b/src/java.desktop/share/native/libfreetype/src/pshinter/pshmod.c
index 974a99e0186..9965d5b16bf 100644
--- a/src/java.desktop/share/native/libfreetype/src/pshinter/pshmod.c
+++ b/src/java.desktop/share/native/libfreetype/src/pshinter/pshmod.c
@@ -4,7 +4,7 @@
  *
  *   FreeType PostScript hinter module implementation (body).
  *
- * Copyright (C) 2001-2023 by
+ * Copyright (C) 2001-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/src/java.desktop/share/native/libfreetype/src/pshinter/pshmod.h b/src/java.desktop/share/native/libfreetype/src/pshinter/pshmod.h
index 4bd781a35d7..62ac0a60fdc 100644
--- a/src/java.desktop/share/native/libfreetype/src/pshinter/pshmod.h
+++ b/src/java.desktop/share/native/libfreetype/src/pshinter/pshmod.h
@@ -4,7 +4,7 @@
  *
  *   PostScript hinter module interface (specification).
  *
- * Copyright (C) 2001-2023 by
+ * Copyright (C) 2001-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/src/java.desktop/share/native/libfreetype/src/pshinter/pshnterr.h b/src/java.desktop/share/native/libfreetype/src/pshinter/pshnterr.h
index 97624952d8c..e9641340e53 100644
--- a/src/java.desktop/share/native/libfreetype/src/pshinter/pshnterr.h
+++ b/src/java.desktop/share/native/libfreetype/src/pshinter/pshnterr.h
@@ -4,7 +4,7 @@
  *
  *   PS Hinter error codes (specification only).
  *
- * Copyright (C) 2003-2023 by
+ * Copyright (C) 2003-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/src/java.desktop/share/native/libfreetype/src/pshinter/pshrec.c b/src/java.desktop/share/native/libfreetype/src/pshinter/pshrec.c
index 680e6d01358..0b2b549fc29 100644
--- a/src/java.desktop/share/native/libfreetype/src/pshinter/pshrec.c
+++ b/src/java.desktop/share/native/libfreetype/src/pshinter/pshrec.c
@@ -4,7 +4,7 @@
  *
  *   FreeType PostScript hints recorder (body).
  *
- * Copyright (C) 2001-2023 by
+ * Copyright (C) 2001-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
@@ -806,7 +806,7 @@
   ps_hints_stem( PS_Hints  hints,
                  FT_UInt   dimension,
                  FT_Int    count,
-                 FT_Long*  stems )
+                 FT_Pos*   stems )
   {
     PS_Dimension  dim;
 
diff --git a/src/java.desktop/share/native/libfreetype/src/pshinter/pshrec.h b/src/java.desktop/share/native/libfreetype/src/pshinter/pshrec.h
index 0b2484af121..7e375af7ba8 100644
--- a/src/java.desktop/share/native/libfreetype/src/pshinter/pshrec.h
+++ b/src/java.desktop/share/native/libfreetype/src/pshinter/pshrec.h
@@ -4,7 +4,7 @@
  *
  *   Postscript (Type1/Type2) hints recorder (specification).
  *
- * Copyright (C) 2001-2023 by
+ * Copyright (C) 2001-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/src/java.desktop/share/native/libfreetype/src/psnames/psmodule.c b/src/java.desktop/share/native/libfreetype/src/psnames/psmodule.c
index 8203a0465d2..35d054d1cfb 100644
--- a/src/java.desktop/share/native/libfreetype/src/psnames/psmodule.c
+++ b/src/java.desktop/share/native/libfreetype/src/psnames/psmodule.c
@@ -4,7 +4,7 @@
  *
  *   psnames module implementation (body).
  *
- * Copyright (C) 1996-2023 by
+ * Copyright (C) 1996-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/src/java.desktop/share/native/libfreetype/src/psnames/psmodule.h b/src/java.desktop/share/native/libfreetype/src/psnames/psmodule.h
index 0904700bfb8..770458316b1 100644
--- a/src/java.desktop/share/native/libfreetype/src/psnames/psmodule.h
+++ b/src/java.desktop/share/native/libfreetype/src/psnames/psmodule.h
@@ -4,7 +4,7 @@
  *
  *   High-level psnames module interface (specification).
  *
- * Copyright (C) 1996-2023 by
+ * Copyright (C) 1996-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/src/java.desktop/share/native/libfreetype/src/psnames/psnamerr.h b/src/java.desktop/share/native/libfreetype/src/psnames/psnamerr.h
index 0073f822848..e123eb65e39 100644
--- a/src/java.desktop/share/native/libfreetype/src/psnames/psnamerr.h
+++ b/src/java.desktop/share/native/libfreetype/src/psnames/psnamerr.h
@@ -4,7 +4,7 @@
  *
  *   PS names module error codes (specification only).
  *
- * Copyright (C) 2001-2023 by
+ * Copyright (C) 2001-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/src/java.desktop/share/native/libfreetype/src/psnames/pstables.h b/src/java.desktop/share/native/libfreetype/src/psnames/pstables.h
index 7f92cce6039..2a941b04609 100644
--- a/src/java.desktop/share/native/libfreetype/src/psnames/pstables.h
+++ b/src/java.desktop/share/native/libfreetype/src/psnames/pstables.h
@@ -4,7 +4,7 @@
  *
  *   PostScript glyph names.
  *
- * Copyright (C) 2005-2023 by
+ * Copyright (C) 2005-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/src/java.desktop/share/native/libfreetype/src/raster/ftmisc.h b/src/java.desktop/share/native/libfreetype/src/raster/ftmisc.h
index 33dbfd631e9..943f2aa0a50 100644
--- a/src/java.desktop/share/native/libfreetype/src/raster/ftmisc.h
+++ b/src/java.desktop/share/native/libfreetype/src/raster/ftmisc.h
@@ -5,7 +5,7 @@
  *   Miscellaneous macros for stand-alone rasterizer (specification
  *   only).
  *
- * Copyright (C) 2005-2023 by
+ * Copyright (C) 2005-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used
@@ -92,27 +92,6 @@
 #endif
 
 
-  static FT_Long
-  FT_MulDiv( FT_Long  a,
-             FT_Long  b,
-             FT_Long  c )
-  {
-    FT_Int   s;
-    FT_Long  d;
-
-
-    s = 1;
-    if ( a < 0 ) { a = -a; s = -1; }
-    if ( b < 0 ) { b = -b; s = -s; }
-    if ( c < 0 ) { c = -c; s = -s; }
-
-    d = (FT_Long)( c > 0 ? ( (FT_Int64)a * b + ( c >> 1 ) ) / c
-                         : 0x7FFFFFFFL );
-
-    return ( s > 0 ) ? d : -d;
-  }
-
-
   static FT_Long
   FT_MulDiv_No_Round( FT_Long  a,
                       FT_Long  b,
diff --git a/src/java.desktop/share/native/libfreetype/src/raster/ftraster.c b/src/java.desktop/share/native/libfreetype/src/raster/ftraster.c
index 192ca0701a2..e4b7b937d5a 100644
--- a/src/java.desktop/share/native/libfreetype/src/raster/ftraster.c
+++ b/src/java.desktop/share/native/libfreetype/src/raster/ftraster.c
@@ -4,7 +4,7 @@
  *
  *   The FreeType glyph rasterizer (body).
  *
- * Copyright (C) 1996-2023 by
+ * Copyright (C) 1996-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
@@ -63,8 +63,7 @@
 #else /* !STANDALONE_ */
 
 #include "ftraster.h"
-#include <freetype/internal/ftcalc.h> /* for FT_MulDiv and FT_MulDiv_No_Round */
-#include <freetype/ftoutln.h>         /* for FT_Outline_Get_CBox              */
+#include <freetype/internal/ftcalc.h> /* for FT_MulDiv_No_Round */
 
 #endif /* !STANDALONE_ */
 
@@ -115,12 +114,12 @@
    *   a change of direction is detected in the outline, a new profile is
    *   generated until the end of the outline.
    *
-   *   Note that when all profiles have been generated, the function
-   *   Finalize_Profile_Table() is used to record, for each profile, its
-   *   bottom-most scanline as well as the scanline above its upmost
-   *   boundary.  These positions are called `y-turns' because they (sort
-   *   of) correspond to local extrema.  They are stored in a sorted list
-   *   built from the top of the render pool as a downwards stack:
+   *   Note that, for all generated profiles, the function End_Profile()
+   *   is used to record all their bottom-most scanlines as well as the
+   *   scanline above their upmost boundary.  These positions are called
+   *   `y-turns' because they (sort of) correspond to local extrema.
+   *   They are stored in a sorted list built from the top of the render
+   *   pool as a downwards stack:
    *
    *     _ _ _______________________________________
    *                           |                    |
@@ -136,7 +135,7 @@
    *   optimize performance (see technical note on the sweep below).
    *
    *   Of course, the raster detects whether the two stacks collide and
-   *   handles the situation properly.
+   *   handles the situation by bisecting the job and restarting.
    *
    */
 
@@ -252,7 +251,6 @@
   /* On the other hand, SMulDiv means `Slow MulDiv', and is used typically */
   /* for clipping computations.  It simply uses the FT_MulDiv() function   */
   /* defined in `ftcalc.h'.                                                */
-#define SMulDiv           FT_MulDiv
 #define SMulDiv_No_Round  FT_MulDiv_No_Round
 
   /* The rasterizer is a very general purpose component; please leave */
@@ -305,16 +303,6 @@
   typedef unsigned char   Byte, *PByte;
   typedef char            Bool;
 
-
-  typedef union  Alignment_
-  {
-    Long    l;
-    void*   p;
-    void  (*f)(void);
-
-  } Alignment, *PAlignment;
-
-
   typedef struct  TPoint_
   {
     Long  x;
@@ -327,6 +315,7 @@
 #define Flow_Up           0x08U
 #define Overshoot_Top     0x10U
 #define Overshoot_Bottom  0x20U
+#define Dropout           0x40U
 
 
   /* States of each line, arc, and profile */
@@ -345,31 +334,28 @@
 
   struct  TProfile_
   {
-    FT_F26Dot6  X;           /* current coordinate during sweep          */
     PProfile    link;        /* link to next profile (various purposes)  */
-    PLong       offset;      /* start of profile's data in render pool   */
+    PProfile    next;        /* next profile in same contour, used       */
+                             /* during drop-out control                  */
+    Int         offset;      /* bottom or currently scanned array index  */
+    Int         height;      /* profile's height in scanlines            */
+    Int         start;       /* profile's starting scanline, also use    */
+                             /* as activation counter                    */
     UShort      flags;       /* Bit 0-2: drop-out mode                   */
                              /* Bit 3: profile orientation (up/down)     */
                              /* Bit 4: is top profile?                   */
                              /* Bit 5: is bottom profile?                */
-    Long        height;      /* profile's height in scanlines            */
-    Long        start;       /* profile's starting scanline              */
+                             /* Bit 6: dropout detected                  */
 
-    Int         countL;      /* number of lines to step before this      */
-                             /* profile becomes drawable                 */
-
-    PProfile    next;        /* next profile in same contour, used       */
-                             /* during drop-out control                  */
+    FT_F26Dot6  X;           /* current coordinate during sweep          */
+    Long        x[1];        /* actually variable array of scanline      */
+                             /* intersections with `height` elements     */
   };
 
   typedef PProfile   TProfileList;
   typedef PProfile*  PProfileList;
 
 
-#define AlignProfileSize \
-  ( ( sizeof ( TProfile ) + sizeof ( Alignment ) - 1 ) / sizeof ( Long ) )
-
-
 #undef RAS_ARG
 #undef RAS_ARGS
 #undef RAS_VAR
@@ -407,15 +393,13 @@
 
   /* prototypes used for sweep function dispatch */
   typedef void
-  Function_Sweep_Init( RAS_ARGS Short  min,
-                                Short  max );
+  Function_Sweep_Init( RAS_ARGS Int  min,
+                                Int  max );
 
   typedef void
-  Function_Sweep_Span( RAS_ARGS Short       y,
+  Function_Sweep_Span( RAS_ARGS Int         y,
                                 FT_F26Dot6  x1,
-                                FT_F26Dot6  x2,
-                                PProfile    left,
-                                PProfile    right );
+                                FT_F26Dot6  x2 );
 
   typedef void
   Function_Sweep_Step( RAS_ARG );
@@ -441,8 +425,7 @@
           (Bool)( x - FLOOR( x ) >= ras.precision_half )
 
   /* Smart dropout rounding to find which pixel is closer to span ends. */
-  /* To mimick Windows, symmetric cases break down indepenently of the  */
-  /* precision.                                                         */
+  /* To mimic Windows, symmetric cases do not depend on the precision.  */
 #define SMART( p, q )  FLOOR( ( (p) + (q) + ras.precision * 63 / 64 ) >> 1 )
 
 #if FT_RENDER_POOL_SIZE > 2048
@@ -462,7 +445,6 @@
     Int         precision_half;
     Int         precision_scale;
     Int         precision_step;
-    Int         precision_jitter;
 
     PLong       buff;               /* The profiles buffer                 */
     PLong       sizeBuff;           /* Render pool size                    */
@@ -471,24 +453,14 @@
 
     FT_Error    error;
 
-    Int         numTurns;           /* number of Y-turns in outline        */
-
     Byte        dropOutControl;     /* current drop_out control method     */
 
-    UShort      bWidth;             /* target bitmap width                 */
-    PByte       bOrigin;            /* target bitmap bottom-left origin    */
-    PByte       bLine;              /* target bitmap current line          */
-
     Long        lastX, lastY;
     Long        minY, maxY;
 
     UShort      num_Profs;          /* current number of profiles          */
+    Int         numTurns;           /* number of Y-turns in outline        */
 
-    Bool        fresh;              /* signals a fresh new profile which   */
-                                    /* `start' field must be completed     */
-    Bool        joint;              /* signals that the last arc ended     */
-                                    /* exactly on a scanline.  Allows      */
-                                    /* removal of doublets                 */
     PProfile    cProfile;           /* current profile                     */
     PProfile    fProfile;           /* head of linked list of profiles     */
     PProfile    gProfile;           /* contour's first profile in case     */
@@ -496,9 +468,14 @@
 
     TStates     state;              /* rendering state                     */
 
-    FT_Bitmap   target;             /* description of target bit/pixmap    */
     FT_Outline  outline;
 
+    Int         bTop;               /* target bitmap max line  index       */
+    Int         bRight;             /* target bitmap rightmost index       */
+    Int         bPitch;             /* target bitmap pitch                 */
+    PByte       bOrigin;            /* target bitmap bottom-left origin    */
+    PByte       bLine;              /* target bitmap current line          */
+
     /* dispatch variables */
 
     Function_Sweep_Init*  Proc_Sweep_Init;
@@ -563,187 +540,25 @@
      *
      *   256 / (1 << 12) = 0.0625 pixels.
      *
-     * `precision_jitter' is an epsilon threshold used in
-     * `Vertical_Sweep_Span' to deal with small imperfections in the Bezier
-     * decomposition (after all, we are working with approximations only);
-     * it avoids switching on additional pixels which would cause artifacts
-     * otherwise.
-     *
-     * The value of `precision_jitter' has been determined heuristically.
-     *
      */
 
     if ( High )
     {
       ras.precision_bits   = 12;
       ras.precision_step   = 256;
-      ras.precision_jitter = 30;
     }
     else
     {
       ras.precision_bits   = 6;
       ras.precision_step   = 32;
-      ras.precision_jitter = 2;
     }
 
-    FT_TRACE6(( "Set_High_Precision(%s)\n", High ? "true" : "false" ));
-
     ras.precision       = 1 << ras.precision_bits;
     ras.precision_half  = ras.precision >> 1;
     ras.precision_scale = ras.precision >> Pixel_Bits;
   }
 
 
-  /**************************************************************************
-   *
-   * @Function:
-   *   New_Profile
-   *
-   * @Description:
-   *   Create a new profile in the render pool.
-   *
-   * @Input:
-   *   aState ::
-   *     The state/orientation of the new profile.
-   *
-   *   overshoot ::
-   *     Whether the profile's unrounded start position
-   *     differs by at least a half pixel.
-   *
-   * @Return:
-   *  SUCCESS on success.  FAILURE in case of overflow or of incoherent
-   *  profile.
-   */
-  static Bool
-  New_Profile( RAS_ARGS TStates  aState,
-                        Bool     overshoot )
-  {
-    if ( !ras.fProfile )
-    {
-      ras.cProfile  = (PProfile)ras.top;
-      ras.fProfile  = ras.cProfile;
-      ras.top      += AlignProfileSize;
-    }
-
-    if ( ras.top >= ras.maxBuff )
-    {
-      ras.error = FT_THROW( Raster_Overflow );
-      return FAILURE;
-    }
-
-    ras.cProfile->start  = 0;
-    ras.cProfile->height = 0;
-    ras.cProfile->offset = ras.top;
-    ras.cProfile->link   = (PProfile)0;
-    ras.cProfile->next   = (PProfile)0;
-    ras.cProfile->flags  = ras.dropOutControl;
-
-    switch ( aState )
-    {
-    case Ascending_State:
-      ras.cProfile->flags |= Flow_Up;
-      if ( overshoot )
-        ras.cProfile->flags |= Overshoot_Bottom;
-
-      FT_TRACE6(( "  new ascending profile = %p\n", (void *)ras.cProfile ));
-      break;
-
-    case Descending_State:
-      if ( overshoot )
-        ras.cProfile->flags |= Overshoot_Top;
-      FT_TRACE6(( "  new descending profile = %p\n", (void *)ras.cProfile ));
-      break;
-
-    default:
-      FT_ERROR(( "New_Profile: invalid profile direction\n" ));
-      ras.error = FT_THROW( Invalid_Outline );
-      return FAILURE;
-    }
-
-    if ( !ras.gProfile )
-      ras.gProfile = ras.cProfile;
-
-    ras.state = aState;
-    ras.fresh = TRUE;
-    ras.joint = FALSE;
-
-    return SUCCESS;
-  }
-
-
-  /**************************************************************************
-   *
-   * @Function:
-   *   End_Profile
-   *
-   * @Description:
-   *   Finalize the current profile.
-   *
-   * @Input:
-   *   overshoot ::
-   *     Whether the profile's unrounded end position differs
-   *     by at least a half pixel.
-   *
-   * @Return:
-   *   SUCCESS on success.  FAILURE in case of overflow or incoherency.
-   */
-  static Bool
-  End_Profile( RAS_ARGS Bool  overshoot )
-  {
-    Long  h;
-
-
-    h = (Long)( ras.top - ras.cProfile->offset );
-
-    if ( h < 0 )
-    {
-      FT_ERROR(( "End_Profile: negative height encountered\n" ));
-      ras.error = FT_THROW( Raster_Negative_Height );
-      return FAILURE;
-    }
-
-    if ( h > 0 )
-    {
-      PProfile  oldProfile;
-
-
-      FT_TRACE6(( "  ending profile %p, start = %ld, height = %ld\n",
-                  (void *)ras.cProfile, ras.cProfile->start, h ));
-
-      ras.cProfile->height = h;
-      if ( overshoot )
-      {
-        if ( ras.cProfile->flags & Flow_Up )
-          ras.cProfile->flags |= Overshoot_Top;
-        else
-          ras.cProfile->flags |= Overshoot_Bottom;
-      }
-
-      oldProfile   = ras.cProfile;
-      ras.cProfile = (PProfile)ras.top;
-
-      ras.top += AlignProfileSize;
-
-      ras.cProfile->height = 0;
-      ras.cProfile->offset = ras.top;
-
-      oldProfile->next = ras.cProfile;
-      ras.num_Profs++;
-    }
-
-    if ( ras.top >= ras.maxBuff )
-    {
-      FT_TRACE1(( "overflow in End_Profile\n" ));
-      ras.error = FT_THROW( Raster_Overflow );
-      return FAILURE;
-    }
-
-    ras.joint = FALSE;
-
-    return SUCCESS;
-  }
-
-
   /**************************************************************************
    *
    * @Function:
@@ -760,31 +575,23 @@
    *   SUCCESS on success.  FAILURE in case of overflow.
    */
   static Bool
-  Insert_Y_Turn( RAS_ARGS Int  y )
+  Insert_Y_Turns( RAS_ARGS Int  y,
+                           Int  top )
   {
-    PLong  y_turns;
-    Int    n;
+    Int    n       = ras.numTurns;
+    PLong  y_turns = ras.maxBuff;
 
 
-    n       = ras.numTurns - 1;
-    y_turns = ras.sizeBuff - ras.numTurns;
+    /* update top value */
+    if ( n == 0 || top > y_turns[n] )
+      y_turns[n] = top;
 
     /* look for first y value that is <= */
-    while ( n >= 0 && y < y_turns[n] )
-      n--;
+    while ( n-- && y < y_turns[n] )
+      ;
 
     /* if it is <, simply insert it, ignore if == */
-    if ( n >= 0 && y > y_turns[n] )
-      do
-      {
-        Int  y2 = (Int)y_turns[n];
-
-
-        y_turns[n] = y;
-        y = y2;
-      } while ( --n >= 0 );
-
-    if ( n < 0 )
+    if ( n < 0 || y > y_turns[n] )
     {
       ras.maxBuff--;
       if ( ras.maxBuff <= ras.top )
@@ -792,8 +599,170 @@
         ras.error = FT_THROW( Raster_Overflow );
         return FAILURE;
       }
+
+      do
+      {
+        Int  y2 = (Int)y_turns[n];
+
+
+        y_turns[n] = y;
+        y = y2;
+      } while ( n-- >= 0 );
+
       ras.numTurns++;
-      ras.sizeBuff[-ras.numTurns] = y;
+    }
+
+    return SUCCESS;
+  }
+
+
+  /**************************************************************************
+   *
+   * @Function:
+   *   New_Profile
+   *
+   * @Description:
+   *   Create a new profile in the render pool.
+   *
+   * @Input:
+   *   aState ::
+   *     The state/orientation of the new profile.
+   *
+   * @Return:
+   *  SUCCESS on success.  FAILURE in case of overflow or of incoherent
+   *  profile.
+   */
+  static Bool
+  New_Profile( RAS_ARGS TStates  aState )
+  {
+    Long  e;
+
+
+    if ( !ras.cProfile || ras.cProfile->height )
+    {
+      ras.cProfile  = (PProfile)ras.top;
+      ras.top       = ras.cProfile->x;
+
+      if ( ras.top >= ras.maxBuff )
+      {
+        FT_TRACE1(( "overflow in New_Profile\n" ));
+        ras.error = FT_THROW( Raster_Overflow );
+        return FAILURE;
+      }
+
+      ras.cProfile->height = 0;
+    }
+
+    ras.cProfile->flags  = ras.dropOutControl;
+
+    switch ( aState )
+    {
+    case Ascending_State:
+      ras.cProfile->flags |= Flow_Up;
+      if ( IS_BOTTOM_OVERSHOOT( ras.lastY ) )
+        ras.cProfile->flags |= Overshoot_Bottom;
+
+      e = CEILING( ras.lastY );
+      break;
+
+    case Descending_State:
+      if ( IS_TOP_OVERSHOOT( ras.lastY ) )
+        ras.cProfile->flags |= Overshoot_Top;
+
+      e = FLOOR( ras.lastY );
+      break;
+
+    default:
+      FT_ERROR(( "New_Profile: invalid profile direction\n" ));
+      ras.error = FT_THROW( Invalid_Outline );
+      return FAILURE;
+    }
+
+    if ( e > ras.maxY )
+      e = ras.maxY;
+    if ( e < ras.minY )
+      e = ras.minY;
+    ras.cProfile->start = (Int)TRUNC( e );
+
+    FT_TRACE7(( "  new %s profile = %p, start = %d\n",
+                aState == Ascending_State ? "ascending" : "descending",
+                (void *)ras.cProfile, ras.cProfile->start ));
+
+    if ( ras.lastY == e )
+      *ras.top++ = ras.lastX;
+
+    ras.state = aState;
+
+    return SUCCESS;
+  }
+
+
+  /**************************************************************************
+   *
+   * @Function:
+   *   End_Profile
+   *
+   * @Description:
+   *   Finalize the current profile and record y-turns.
+   *
+   * @Return:
+   *   SUCCESS on success.  FAILURE in case of overflow or incoherency.
+   */
+  static Bool
+  End_Profile( RAS_ARG )
+  {
+    PProfile  p = ras.cProfile;
+    Int       h = (Int)( ras.top - p->x );
+    Int       bottom, top;
+
+
+    if ( h < 0 )
+    {
+      FT_ERROR(( "End_Profile: negative height encountered\n" ));
+      ras.error = FT_THROW( Raster_Negative_Height );
+      return FAILURE;
+    }
+
+    if ( h > 0 )
+    {
+      FT_TRACE7(( "  ending profile %p, start = %2d, height = %+3d\n",
+                  (void *)p, p->start, p->flags & Flow_Up ? h : -h ));
+
+      p->height = h;
+
+      if ( p->flags & Flow_Up )
+      {
+        if ( IS_TOP_OVERSHOOT( ras.lastY ) )
+          p->flags |= Overshoot_Top;
+
+        bottom    = p->start;
+        top       = bottom + h;
+        p->offset = 0;
+        p->X      = p->x[0];
+      }
+      else
+      {
+        if ( IS_BOTTOM_OVERSHOOT( ras.lastY ) )
+          p->flags |= Overshoot_Bottom;
+
+        top       = p->start + 1;
+        bottom    = top - h;
+        p->start  = bottom;
+        p->offset = h - 1;
+        p->X      = p->x[h - 1];
+      }
+
+      if ( Insert_Y_Turns( RAS_VARS bottom, top ) )
+        return FAILURE;
+
+      if ( !ras.gProfile )
+        ras.gProfile = p;
+
+      /* preliminary values to be finalized */
+      p->next = ras.gProfile;
+      p->link = (PProfile)ras.top;
+
+      ras.num_Profs++;
     }
 
     return SUCCESS;
@@ -807,56 +776,29 @@
    *
    * @Description:
    *   Adjust all links in the profiles list.
-   *
-   * @Return:
-   *   SUCCESS on success.  FAILURE in case of overflow.
    */
-  static Bool
+  static void
   Finalize_Profile_Table( RAS_ARG )
   {
-    UShort    n;
-    PProfile  p;
+    UShort    n = ras.num_Profs;
+    PProfile  p = ras.fProfile;
+    PProfile  q;
 
 
-    n = ras.num_Profs;
-    p = ras.fProfile;
-
-    if ( n > 1 && p )
+    /* there should be at least two profiles, up and down */
+    while ( --n )
     {
-      do
-      {
-        Int  bottom, top;
+      q = p->link;
 
+      /* fix the contour loop */
+      if ( q->next == p->next )
+        p->next = q;
 
-        if ( n > 1 )
-          p->link = (PProfile)( p->offset + p->height );
-        else
-          p->link = NULL;
-
-        if ( p->flags & Flow_Up )
-        {
-          bottom = (Int)p->start;
-          top    = (Int)( p->start + p->height - 1 );
-        }
-        else
-        {
-          bottom     = (Int)( p->start - p->height + 1 );
-          top        = (Int)p->start;
-          p->start   = bottom;
-          p->offset += p->height - 1;
-        }
-
-        if ( Insert_Y_Turn( RAS_VARS bottom )  ||
-             Insert_Y_Turn( RAS_VARS top + 1 ) )
-          return FAILURE;
-
-        p = p->link;
-      } while ( --n );
+      p = q;
     }
-    else
-      ras.fProfile = NULL;
 
-    return SUCCESS;
+    /* null-terminate */
+    p->link = NULL;
   }
 
 
@@ -986,107 +928,78 @@
                     Long  miny,
                     Long  maxy )
   {
-    Long   Dx, Dy;
-    Int    e1, e2, f1, f2, size;     /* XXX: is `Short' sufficient? */
-    Long   Ix, Rx, Ax;
+    Long  e, e2, Dx, Dy;
+    Long  Ix, Rx, Ax;
+    Int   size;
 
     PLong  top;
 
 
-    Dx = x2 - x1;
-    Dy = y2 - y1;
-
-    if ( Dy <= 0 || y2 < miny || y1 > maxy )
+    if ( y2 < miny || y1 > maxy )
       return SUCCESS;
 
-    if ( y1 < miny )
-    {
-      /* Take care: miny-y1 can be a very large value; we use     */
-      /*            a slow MulDiv function to avoid clipping bugs */
-      x1 += SMulDiv( Dx, miny - y1, Dy );
-      e1  = (Int)TRUNC( miny );
-      f1  = 0;
-    }
-    else
-    {
-      e1 = (Int)TRUNC( y1 );
-      f1 = (Int)FRAC( y1 );
-    }
+    e2 = y2 > maxy ? maxy : FLOOR( y2 );
+    e  = y1 < miny ? miny : CEILING( y1 );
 
-    if ( y2 > maxy )
-    {
-      /* x2 += FMulDiv( Dx, maxy - y2, Dy );  UNNECESSARY */
-      e2  = (Int)TRUNC( maxy );
-      f2  = 0;
-    }
-    else
-    {
-      e2 = (Int)TRUNC( y2 );
-      f2 = (Int)FRAC( y2 );
-    }
+    if ( y1 == e )
+      e += ras.precision;
 
-    if ( f1 > 0 )
-    {
-      if ( e1 == e2 )
-        return SUCCESS;
-      else
-      {
-        x1 += SMulDiv( Dx, ras.precision - f1, Dy );
-        e1 += 1;
-      }
-    }
-    else
-      if ( ras.joint )
-      {
-        ras.top--;
-        ras.joint = FALSE;
-      }
+    if ( e2 < e )  /* nothing to do */
+      return SUCCESS;
 
-    ras.joint = (char)( f2 == 0 );
+    size = (Int)TRUNC( e2 - e ) + 1;
+    top  = ras.top;
 
-    if ( ras.fresh )
-    {
-      ras.cProfile->start = e1;
-      ras.fresh           = FALSE;
-    }
-
-    size = e2 - e1 + 1;
-    if ( ras.top + size >= ras.maxBuff )
+    if ( top + size >= ras.maxBuff )
     {
       ras.error = FT_THROW( Raster_Overflow );
       return FAILURE;
     }
 
-    if ( Dx > 0 )
+    Dx = x2 - x1;
+    Dy = y2 - y1;
+
+    if ( Dx == 0 )  /* very easy */
     {
-      Ix = SMulDiv_No_Round( ras.precision, Dx, Dy );
-      Rx = ( ras.precision * Dx ) % Dy;
+      do
+        *top++ = x1;
+      while ( --size );
+      goto Fin;
+    }
+
+    Ix     = SMulDiv_No_Round( e - y1, Dx, Dy );
+    x1    += Ix;
+    *top++ = x1;
+
+    if ( --size )
+    {
+      Ax = Dx * ( e - y1 )    - Dy * Ix;  /* remainder */
+      Ix = FMulDiv( ras.precision, Dx, Dy );
+      Rx = Dx * ras.precision - Dy * Ix;  /* remainder */
       Dx = 1;
-    }
-    else
-    {
-      Ix = -SMulDiv_No_Round( ras.precision, -Dx, Dy );
-      Rx = ( ras.precision * -Dx ) % Dy;
-      Dx = -1;
-    }
 
-    Ax  = -Dy;
-    top = ras.top;
-
-    while ( size > 0 )
-    {
-      *top++ = x1;
-
-      x1 += Ix;
-      Ax += Rx;
-      if ( Ax >= 0 )
+      if ( x2 < x1 )
       {
-        Ax -= Dy;
-        x1 += Dx;
+        Ax = -Ax;
+        Rx = -Rx;
+        Dx = -Dx;
       }
-      size--;
+
+      do
+      {
+        x1 += Ix;
+        Ax += Rx;
+        if ( Ax >= Dy )
+        {
+          Ax -= Dy;
+          x1 += Dx;
+        }
+        *top++ = x1;
+      }
+      while ( --size );
     }
 
+  Fin:
     ras.top = top;
     return SUCCESS;
   }
@@ -1131,17 +1044,7 @@
                       Long  miny,
                       Long  maxy )
   {
-    Bool  result, fresh;
-
-
-    fresh  = ras.fresh;
-
-    result = Line_Up( RAS_VARS x1, -y1, x2, -y2, -maxy, -miny );
-
-    if ( fresh && !ras.fresh )
-      ras.cProfile->start = -ras.cProfile->start;
-
-    return result;
+    return Line_Up( RAS_VARS x1, -y1, x2, -y2, -maxy, -miny );
   }
 
 
@@ -1181,105 +1084,73 @@
                       Long       miny,
                       Long       maxy )
   {
-    Long   y1, y2, e, e2, e0;
-    Short  f1;
+    Long  y1, y2, e, e2, dy;
+    Long  dx, x2;
 
-    TPoint*  start_arc;
-
-    PLong top;
+    PLong  top;
 
 
     y1  = arc[degree].y;
     y2  = arc[0].y;
-    top = ras.top;
 
     if ( y2 < miny || y1 > maxy )
-      goto Fin;
+      return SUCCESS;
 
-    e2 = FLOOR( y2 );
+    e2 = y2 > maxy ? maxy : FLOOR( y2 );
+    e  = y1 < miny ? miny : CEILING( y1 );
 
-    if ( e2 > maxy )
-      e2 = maxy;
+    if ( y1 == e )
+      e += ras.precision;
 
-    e0 = miny;
+    if ( e2 < e )  /* nothing to do */
+      return SUCCESS;
 
-    if ( y1 < miny )
-      e = miny;
-    else
-    {
-      e  = CEILING( y1 );
-      f1 = (Short)( FRAC( y1 ) );
-      e0 = e;
-
-      if ( f1 == 0 )
-      {
-        if ( ras.joint )
-        {
-          top--;
-          ras.joint = FALSE;
-        }
-
-        *top++ = arc[degree].x;
-
-        e += ras.precision;
-      }
-    }
-
-    if ( ras.fresh )
-    {
-      ras.cProfile->start = TRUNC( e0 );
-      ras.fresh = FALSE;
-    }
-
-    if ( e2 < e )
-      goto Fin;
+    top = ras.top;
 
     if ( ( top + TRUNC( e2 - e ) + 1 ) >= ras.maxBuff )
     {
-      ras.top   = top;
       ras.error = FT_THROW( Raster_Overflow );
       return FAILURE;
     }
 
-    start_arc = arc;
-
     do
     {
-      ras.joint = FALSE;
-
       y2 = arc[0].y;
+      x2 = arc[0].x;
 
       if ( y2 > e )
       {
-        y1 = arc[degree].y;
-        if ( y2 - y1 >= ras.precision_step )
+        dy = y2 - arc[degree].y;
+        dx = x2 - arc[degree].x;
+
+        /* split condition should be invariant of direction */
+        if (  dy > ras.precision_step ||
+              dx > ras.precision_step ||
+             -dx > ras.precision_step )
         {
           splitter( arc );
           arc += degree;
         }
         else
         {
-          *top++ = arc[degree].x + FMulDiv( arc[0].x - arc[degree].x,
-                                            e - y1, y2 - y1 );
+          *top++ = x2 - FMulDiv( y2 - e, dx, dy );
+          e     += ras.precision;
           arc -= degree;
-          e   += ras.precision;
         }
       }
       else
       {
         if ( y2 == e )
         {
-          ras.joint  = TRUE;
-          *top++     = arc[0].x;
-
-          e += ras.precision;
+          *top++ = x2;
+          e     += ras.precision;
         }
-        arc -= degree;
+        arc   -= degree;
       }
-    } while ( arc >= start_arc && e <= e2 );
+    }
+    while ( e <= e2 );
 
-  Fin:
-    ras.top  = top;
+    ras.top = top;
     return SUCCESS;
   }
 
@@ -1316,7 +1187,7 @@
                         Long       miny,
                         Long       maxy )
   {
-    Bool     result, fresh;
+    Bool  result;
 
 
     arc[0].y = -arc[0].y;
@@ -1325,13 +1196,8 @@
     if ( degree > 2 )
       arc[3].y = -arc[3].y;
 
-    fresh = ras.fresh;
-
     result = Bezier_Up( RAS_VARS degree, arc, splitter, -maxy, -miny );
 
-    if ( fresh && !ras.fresh )
-      ras.cProfile->start = -ras.cProfile->start;
-
     arc[0].y = -arc[0].y;
     return result;
   }
@@ -1362,74 +1228,50 @@
   Line_To( RAS_ARGS Long  x,
                     Long  y )
   {
+    TStates  state;
+
+
+    if ( y == ras.lastY )
+      goto Fin;
+
     /* First, detect a change of direction */
 
-    switch ( ras.state )
+    state = ras.lastY < y ? Ascending_State : Descending_State;
+
+    if ( ras.state != state )
     {
-    case Unknown_State:
-      if ( y > ras.lastY )
-      {
-        if ( New_Profile( RAS_VARS Ascending_State,
-                                   IS_BOTTOM_OVERSHOOT( ras.lastY ) ) )
-          return FAILURE;
-      }
-      else
-      {
-        if ( y < ras.lastY )
-          if ( New_Profile( RAS_VARS Descending_State,
-                                     IS_TOP_OVERSHOOT( ras.lastY ) ) )
-            return FAILURE;
-      }
-      break;
+      /* finalize current profile if any */
+      if ( ras.state != Unknown_State &&
+           End_Profile( RAS_VAR )     )
+        goto Fail;
 
-    case Ascending_State:
-      if ( y < ras.lastY )
-      {
-        if ( End_Profile( RAS_VARS IS_TOP_OVERSHOOT( ras.lastY ) ) ||
-             New_Profile( RAS_VARS Descending_State,
-                                   IS_TOP_OVERSHOOT( ras.lastY ) ) )
-          return FAILURE;
-      }
-      break;
-
-    case Descending_State:
-      if ( y > ras.lastY )
-      {
-        if ( End_Profile( RAS_VARS IS_BOTTOM_OVERSHOOT( ras.lastY ) ) ||
-             New_Profile( RAS_VARS Ascending_State,
-                                   IS_BOTTOM_OVERSHOOT( ras.lastY ) ) )
-          return FAILURE;
-      }
-      break;
-
-    default:
-      ;
+      /* create a new profile */
+      if ( New_Profile( RAS_VARS state ) )
+        goto Fail;
     }
 
     /* Then compute the lines */
 
-    switch ( ras.state )
+    if ( state == Ascending_State )
     {
-    case Ascending_State:
       if ( Line_Up( RAS_VARS ras.lastX, ras.lastY,
                              x, y, ras.minY, ras.maxY ) )
-        return FAILURE;
-      break;
-
-    case Descending_State:
+        goto Fail;
+    }
+    else
+    {
       if ( Line_Down( RAS_VARS ras.lastX, ras.lastY,
                                x, y, ras.minY, ras.maxY ) )
-        return FAILURE;
-      break;
-
-    default:
-      ;
+        goto Fail;
     }
 
+  Fin:
     ras.lastX = x;
     ras.lastY = y;
-
     return SUCCESS;
+
+  Fail:
+    return FAILURE;
   }
 
 
@@ -1500,7 +1342,7 @@
         ymax = y1;
       }
 
-      if ( y2 < ymin || y2 > ymax )
+      if ( y2 < FLOOR( ymin ) || y2 > CEILING( ymax ) )
       {
         /* this arc has no given direction, split it! */
         Split_Conic( arc );
@@ -1508,8 +1350,12 @@
       }
       else if ( y1 == y3 )
       {
-        /* this arc is flat, ignore it and pop it from the Bezier stack */
+        /* this arc is flat, advance position */
+        /* and pop it from the Bezier stack   */
         arc -= 2;
+
+        ras.lastX = x3;
+        ras.lastY = y3;
       }
       else
       {
@@ -1518,18 +1364,13 @@
         state_bez = y1 < y3 ? Ascending_State : Descending_State;
         if ( ras.state != state_bez )
         {
-          Bool  o = ( state_bez == Ascending_State )
-                      ? IS_BOTTOM_OVERSHOOT( y1 )
-                      : IS_TOP_OVERSHOOT( y1 );
-
-
           /* finalize current profile if any */
           if ( ras.state != Unknown_State &&
-               End_Profile( RAS_VARS o )  )
+               End_Profile( RAS_VAR )     )
             goto Fail;
 
           /* create a new profile */
-          if ( New_Profile( RAS_VARS state_bez, o ) )
+          if ( New_Profile( RAS_VARS state_bez ) )
             goto Fail;
         }
 
@@ -1545,13 +1386,13 @@
                                      ras.minY, ras.maxY ) )
             goto Fail;
         arc -= 2;
+
+        ras.lastX = x3;
+        ras.lastY = y3;
       }
 
     } while ( arc >= arcs );
 
-    ras.lastX = x3;
-    ras.lastY = y3;
-
     return SUCCESS;
 
   Fail:
@@ -1648,7 +1489,7 @@
         ymax2 = y2;
       }
 
-      if ( ymin2 < ymin1 || ymax2 > ymax1 )
+      if ( ymin2 < FLOOR( ymin1 ) || ymax2 > CEILING( ymax1 ) )
       {
         /* this arc has no given direction, split it! */
         Split_Cubic( arc );
@@ -1656,27 +1497,26 @@
       }
       else if ( y1 == y4 )
       {
-        /* this arc is flat, ignore it and pop it from the Bezier stack */
+        /* this arc is flat, advance position */
+        /* and pop it from the Bezier stack   */
         arc -= 3;
+
+        ras.lastX = x4;
+        ras.lastY = y4;
       }
       else
       {
-        state_bez = ( y1 <= y4 ) ? Ascending_State : Descending_State;
+        state_bez = y1 < y4 ? Ascending_State : Descending_State;
 
         /* detect a change of direction */
         if ( ras.state != state_bez )
         {
-          Bool  o = ( state_bez == Ascending_State )
-                      ? IS_BOTTOM_OVERSHOOT( y1 )
-                      : IS_TOP_OVERSHOOT( y1 );
-
-
           /* finalize current profile if any */
           if ( ras.state != Unknown_State &&
-               End_Profile( RAS_VARS o )  )
+               End_Profile( RAS_VAR )     )
             goto Fail;
 
-          if ( New_Profile( RAS_VARS state_bez, o ) )
+          if ( New_Profile( RAS_VARS state_bez ) )
             goto Fail;
         }
 
@@ -1692,13 +1532,13 @@
                                      ras.minY, ras.maxY ) )
             goto Fail;
         arc -= 3;
+
+        ras.lastX = x4;
+        ras.lastY = y4;
       }
 
     } while ( arc >= arcs );
 
-    ras.lastX = x4;
-    ras.lastY = y4;
-
     return SUCCESS;
 
   Fail:
@@ -1740,6 +1580,11 @@
    *
    * @Return:
    *   SUCCESS on success, FAILURE on error.
+   *
+   * @Note:
+   *   Unlike FT_Outline_Decompose(), this function handles the scanmode
+   *   dropout tags in the individual contours.  Therefore, it cannot be
+   *   replaced.
    */
   static Bool
   Decompose_Curve( RAS_ARGS Int  first,
@@ -1753,7 +1598,7 @@
     FT_Vector*  points;
     FT_Vector*  point;
     FT_Vector*  limit;
-    char*       tags;
+    FT_Byte*    tags;
 
     UInt        tag;       /* current point's state           */
 
@@ -1974,24 +1819,17 @@
 
 
     ras.fProfile = NULL;
-    ras.joint    = FALSE;
-    ras.fresh    = FALSE;
+    ras.cProfile = NULL;
 
-    ras.maxBuff  = ras.sizeBuff - AlignProfileSize;
+    ras.top      = ras.buff;
+    ras.maxBuff  = ras.sizeBuff - 1;  /* top reserve */
 
-    ras.numTurns = 0;
-
-    ras.cProfile         = (PProfile)ras.top;
-    ras.cProfile->offset = ras.top;
-    ras.num_Profs        = 0;
+    ras.numTurns  = 0;
+    ras.num_Profs = 0;
 
     last = -1;
     for ( i = 0; i < ras.outline.n_contours; i++ )
     {
-      PProfile  lastProfile;
-      Bool      o;
-
-
       ras.state    = Unknown_State;
       ras.gProfile = NULL;
 
@@ -2001,35 +1839,30 @@
       if ( Decompose_Curve( RAS_VARS first, last, flipped ) )
         return FAILURE;
 
+      /* Note that ras.gProfile can stay nil if the contour was */
+      /* too small to be drawn or degenerate.                   */
+      if ( !ras.gProfile )
+        continue;
+
       /* we must now check whether the extreme arcs join or not */
       if ( FRAC( ras.lastY ) == 0 &&
            ras.lastY >= ras.minY  &&
            ras.lastY <= ras.maxY  )
-        if ( ras.gProfile                        &&
-             ( ras.gProfile->flags & Flow_Up ) ==
+        if ( ( ras.gProfile->flags & Flow_Up ) ==
                ( ras.cProfile->flags & Flow_Up ) )
           ras.top--;
-        /* Note that ras.gProfile can be nil if the contour was too small */
-        /* to be drawn.                                                   */
 
-      lastProfile = ras.cProfile;
-      if ( ras.top != ras.cProfile->offset &&
-           ( ras.cProfile->flags & Flow_Up ) )
-        o = IS_TOP_OVERSHOOT( ras.lastY );
-      else
-        o = IS_BOTTOM_OVERSHOOT( ras.lastY );
-      if ( End_Profile( RAS_VARS o ) )
+      if ( End_Profile( RAS_VAR ) )
         return FAILURE;
 
-      /* close the `next profile in contour' linked list */
-      if ( ras.gProfile )
-        lastProfile->next = ras.gProfile;
+      if ( !ras.fProfile )
+        ras.fProfile = ras.gProfile;
     }
 
-    if ( Finalize_Profile_Table( RAS_VAR ) )
-      return FAILURE;
+    if ( ras.fProfile )
+      Finalize_Profile_Table( RAS_VAR );
 
-    return (Bool)( ras.top < ras.maxBuff ? SUCCESS : FAILURE );
+    return SUCCESS;
   }
 
 
@@ -2042,24 +1875,11 @@
   /*************************************************************************/
 
 
-  /**************************************************************************
-   *
-   * Init_Linked
-   *
-   *   Initializes an empty linked list.
-   */
-  static void
-  Init_Linked( TProfileList*  l )
-  {
-    *l = NULL;
-  }
-
-
   /**************************************************************************
    *
    * InsNew
    *
-   *   Inserts a new profile in a linked list.
+   *   Inserts a new profile in a linked list, sorted by coordinate.
    */
   static void
   InsNew( PProfileList  list,
@@ -2073,10 +1893,8 @@
     current = *old;
     x       = profile->X;
 
-    while ( current )
+    while ( current && current->X < x )
     {
-      if ( x < current->X )
-        break;
       old     = &current->link;
       current = *old;
     }
@@ -2088,79 +1906,51 @@
 
   /**************************************************************************
    *
-   * DelOld
+   * Increment
    *
-   *   Removes an old profile from a linked list.
+   *   Advances all profile in the list to the next scanline.  It also
+   *   sorts the trace list in the unlikely case of profile crossing.
+   *   The profiles are inserted in sorted order.  We might need a single
+   *   swap to fix it when profiles (contours) cross.
+   *   Bubble sort with immediate restart is good enough and simple.
    */
   static void
-  DelOld( PProfileList    list,
-          const PProfile  profile )
-  {
-    PProfile  *old, current;
-
-
-    old     = list;
-    current = *old;
-
-    while ( current )
-    {
-      if ( current == profile )
-      {
-        *old = current->link;
-        return;
-      }
-
-      old     = &current->link;
-      current = *old;
-    }
-
-    /* we should never get there, unless the profile was not part of */
-    /* the list.                                                     */
-  }
-
-
-  /**************************************************************************
-   *
-   * Sort
-   *
-   *   Sorts a trace list.  In 95%, the list is already sorted.  We need
-   *   an algorithm which is fast in this case.  Bubble sort is enough
-   *   and simple.
-   */
-  static void
-  Sort( PProfileList  list )
+  Increment( PProfileList  list,
+             Int           flow )
   {
     PProfile  *old, current, next;
 
 
-    /* First, set the new X coordinate of each profile */
-    current = *list;
-    while ( current )
+    /* First, set the new X coordinates and remove exhausted profiles */
+    old = list;
+    while ( *old )
     {
-      current->X       = *current->offset;
-      current->offset += ( current->flags & Flow_Up ) ? 1 : -1;
-      current->height--;
-      current = current->link;
+      current = *old;
+      if ( --current->height )
+      {
+        current->offset += flow;
+        current->X       = current->x[current->offset];
+        old = &current->link;
+      }
+      else
+        *old = current->link;  /* remove */
     }
 
-    /* Then sort them */
+    /* Then make sure the list remains sorted */
     old     = list;
     current = *old;
 
     if ( !current )
       return;
 
-    next = current->link;
-
-    while ( next )
+    while ( current->link )
     {
+      next = current->link;
+
       if ( current->X <= next->X )
       {
         old     = &current->link;
-        current = *old;
-
-        if ( !current )
-          return;
+        current = next;
       }
       else
       {
@@ -2168,11 +1958,10 @@
         current->link = next->link;
         next->link    = current;
 
+        /* this is likely the only necessary swap -- restart */
         old     = list;
         current = *old;
       }
-
-      next = current->link;
     }
   }
 
@@ -2187,74 +1976,51 @@
    */
 
   static void
-  Vertical_Sweep_Init( RAS_ARGS Short  min,
-                                Short  max )
+  Vertical_Sweep_Init( RAS_ARGS Int  min,
+                                Int  max )
   {
     FT_UNUSED( max );
 
 
-    ras.bLine = ras.bOrigin - min * ras.target.pitch;
+    ras.bLine = ras.bOrigin - min * ras.bPitch;
   }
 
 
   static void
-  Vertical_Sweep_Span( RAS_ARGS Short       y,
+  Vertical_Sweep_Span( RAS_ARGS Int         y,
                                 FT_F26Dot6  x1,
-                                FT_F26Dot6  x2,
-                                PProfile    left,
-                                PProfile    right )
+                                FT_F26Dot6  x2 )
   {
-    Long  e1, e2;
-
-    Int  dropOutControl = left->flags & 7;
+    Int  e1 = (Int)TRUNC( CEILING( x1 ) );
+    Int  e2 = (Int)TRUNC(   FLOOR( x2 ) );
 
     FT_UNUSED( y );
-    FT_UNUSED( left );
-    FT_UNUSED( right );
 
 
-    /* in high-precision mode, we need 12 digits after the comma to */
-    /* represent multiples of 1/(1<<12) = 1/4096                    */
-    FT_TRACE7(( "  y=%d x=[% .12f;% .12f]",
+    FT_TRACE7(( "  y=%d x=[% .*f;% .*f]",
                 y,
-                (double)x1 / (double)ras.precision,
-                (double)x2 / (double)ras.precision ));
+                ras.precision_bits, (double)x1 / (double)ras.precision,
+                ras.precision_bits, (double)x2 / (double)ras.precision ));
 
-    /* Drop-out control */
-
-    e1 = CEILING( x1 );
-    e2 = FLOOR( x2 );
-
-    /* take care of the special case where both the left */
-    /* and right contour lie exactly on pixel centers    */
-    if ( dropOutControl != 2                             &&
-         x2 - x1 - ras.precision <= ras.precision_jitter &&
-         e1 != x1 && e2 != x2                            )
-      e2 = e1;
-
-    e1 = TRUNC( e1 );
-    e2 = TRUNC( e2 );
-
-    if ( e2 >= 0 && e1 < ras.bWidth )
+    if ( e2 >= 0 && e1 <= ras.bRight )
     {
-      Byte*  target;
+      PByte  target;
 
-      Int   c1, c2;
-      Byte  f1, f2;
+      Int   c1, f1, c2, f2;
 
 
       if ( e1 < 0 )
         e1 = 0;
-      if ( e2 >= ras.bWidth )
-        e2 = ras.bWidth - 1;
+      if ( e2 > ras.bRight )
+        e2 = ras.bRight;
 
-      FT_TRACE7(( " -> x=[%ld;%ld]", e1, e2 ));
+      FT_TRACE7(( " -> x=[%d;%d]", e1, e2 ));
 
-      c1 = (Short)( e1 >> 3 );
-      c2 = (Short)( e2 >> 3 );
+      c1 = e1 >> 3;
+      c2 = e2 >> 3;
 
-      f1 = (Byte)  ( 0xFF >> ( e1 & 7 ) );
-      f2 = (Byte) ~( 0x7F >> ( e2 & 7 ) );
+      f1 =  0xFF >> ( e1 & 7 );
+      f2 = ~0x7F >> ( e2 & 7 );
 
       target = ras.bLine + c1;
       c2 -= c1;
@@ -2280,163 +2046,50 @@
 
 
   static void
-  Vertical_Sweep_Drop( RAS_ARGS Short       y,
+  Vertical_Sweep_Drop( RAS_ARGS Int         y,
                                 FT_F26Dot6  x1,
-                                FT_F26Dot6  x2,
-                                PProfile    left,
-                                PProfile    right )
+                                FT_F26Dot6  x2 )
   {
-    Long   e1, e2, pxl;
-    Short  c1, f1;
+    Int  e1 = (Int)TRUNC( x1 );
+    Int  e2 = (Int)TRUNC( x2 );
+    Int  c1, f1;
+
+    FT_UNUSED( y );
 
 
-    FT_TRACE7(( "  y=%d x=[% .12f;% .12f]",
-                y,
-                (double)x1 / (double)ras.precision,
-                (double)x2 / (double)ras.precision ));
+    /* undocumented but confirmed: If the drop-out would result in a  */
+    /* pixel outside of the bounding box, use the pixel inside of the */
+    /* bounding box instead                                           */
+    if ( e1 < 0 || e1 > ras.bRight )
+      e1 = e2;
 
-    /* Drop-out control */
-
-    /*   e2            x2                    x1           e1   */
-    /*                                                         */
-    /*                 ^                     |                 */
-    /*                 |                     |                 */
-    /*   +-------------+---------------------+------------+    */
-    /*                 |                     |                 */
-    /*                 |                     v                 */
-    /*                                                         */
-    /* pixel         contour              contour       pixel  */
-    /* center                                           center */
-
-    /* drop-out mode    scan conversion rules (as defined in OpenType) */
-    /* --------------------------------------------------------------- */
-    /*  0                1, 2, 3                                       */
-    /*  1                1, 2, 4                                       */
-    /*  2                1, 2                                          */
-    /*  3                same as mode 2                                */
-    /*  4                1, 2, 5                                       */
-    /*  5                1, 2, 6                                       */
-    /*  6, 7             same as mode 2                                */
-
-    e1  = CEILING( x1 );
-    e2  = FLOOR  ( x2 );
-    pxl = e1;
-
-    if ( e1 > e2 )
+    /* otherwise check that the other pixel isn't set */
+    else if ( e2 >=0 && e2 <= ras.bRight )
     {
-      Int  dropOutControl = left->flags & 7;
+      c1 = e2 >> 3;
+      f1 = 0x80 >> ( e2 & 7 );
 
-
-      if ( e1 == e2 + ras.precision )
-      {
-        switch ( dropOutControl )
-        {
-        case 0: /* simple drop-outs including stubs */
-          pxl = e2;
-          break;
-
-        case 4: /* smart drop-outs including stubs */
-          pxl = SMART( x1, x2 );
-          break;
-
-        case 1: /* simple drop-outs excluding stubs */
-        case 5: /* smart drop-outs excluding stubs  */
-
-          /* Drop-out Control Rules #4 and #6 */
-
-          /* The specification neither provides an exact definition */
-          /* of a `stub' nor gives exact rules to exclude them.     */
-          /*                                                        */
-          /* Here the constraints we use to recognize a stub.       */
-          /*                                                        */
-          /*  upper stub:                                           */
-          /*                                                        */
-          /*   - P_Left and P_Right are in the same contour         */
-          /*   - P_Right is the successor of P_Left in that contour */
-          /*   - y is the top of P_Left and P_Right                 */
-          /*                                                        */
-          /*  lower stub:                                           */
-          /*                                                        */
-          /*   - P_Left and P_Right are in the same contour         */
-          /*   - P_Left is the successor of P_Right in that contour */
-          /*   - y is the bottom of P_Left                          */
-          /*                                                        */
-          /* We draw a stub if the following constraints are met.   */
-          /*                                                        */
-          /*   - for an upper or lower stub, there is top or bottom */
-          /*     overshoot, respectively                            */
-          /*   - the covered interval is greater or equal to a half */
-          /*     pixel                                              */
-
-          /* upper stub test */
-          if ( left->next == right                &&
-               left->height <= 0                  &&
-               !( left->flags & Overshoot_Top   &&
-                  x2 - x1 >= ras.precision_half ) )
-            goto Exit;
-
-          /* lower stub test */
-          if ( right->next == left                 &&
-               left->start == y                    &&
-               !( left->flags & Overshoot_Bottom &&
-                  x2 - x1 >= ras.precision_half  ) )
-            goto Exit;
-
-          if ( dropOutControl == 1 )
-            pxl = e2;
-          else
-            pxl = SMART( x1, x2 );
-          break;
-
-        default: /* modes 2, 3, 6, 7 */
-          goto Exit;  /* no drop-out control */
-        }
-
-        /* undocumented but confirmed: If the drop-out would result in a  */
-        /* pixel outside of the bounding box, use the pixel inside of the */
-        /* bounding box instead                                           */
-        if ( pxl < 0 )
-          pxl = e1;
-        else if ( TRUNC( pxl ) >= ras.bWidth )
-          pxl = e2;
-
-        /* check that the other pixel isn't set */
-        e1 = ( pxl == e1 ) ? e2 : e1;
-
-        e1 = TRUNC( e1 );
-
-        c1 = (Short)( e1 >> 3 );
-        f1 = (Short)( e1 &  7 );
-
-        if ( e1 >= 0 && e1 < ras.bWidth     &&
-             ras.bLine[c1] & ( 0x80 >> f1 ) )
-          goto Exit;
-      }
-      else
-        goto Exit;
+      if ( ras.bLine[c1] & f1 )
+        return;
     }
 
-    e1 = TRUNC( pxl );
-
-    if ( e1 >= 0 && e1 < ras.bWidth )
+    if ( e1 >= 0 && e1 <= ras.bRight )
     {
-      FT_TRACE7(( " -> x=%ld", e1 ));
+      c1 = e1 >> 3;
+      f1 = 0x80 >> ( e1 & 7 );
 
-      c1 = (Short)( e1 >> 3 );
-      f1 = (Short)( e1 & 7 );
+      FT_TRACE7(( "  y=%d x=%d%s\n", y, e1,
+                  ras.bLine[c1] & f1 ? " redundant" : "" ));
 
-      ras.bLine[c1] |= (char)( 0x80 >> f1 );
+      ras.bLine[c1] |= f1;
     }
-
-  Exit:
-    FT_TRACE7(( " dropout=%d\n", left->flags & 7 ));
   }
 
 
   static void
   Vertical_Sweep_Step( RAS_ARG )
   {
-    ras.bLine -= ras.target.pitch;
+    ras.bLine -= ras.bPitch;
   }
 
 
@@ -2450,8 +2103,8 @@
    */
 
   static void
-  Horizontal_Sweep_Init( RAS_ARGS Short  min,
-                                  Short  max )
+  Horizontal_Sweep_Init( RAS_ARGS Int  min,
+                                  Int  max )
   {
     /* nothing, really */
     FT_UNUSED_RASTER;
@@ -2461,22 +2114,18 @@
 
 
   static void
-  Horizontal_Sweep_Span( RAS_ARGS Short       y,
+  Horizontal_Sweep_Span( RAS_ARGS Int         y,
                                   FT_F26Dot6  x1,
-                                  FT_F26Dot6  x2,
-                                  PProfile    left,
-                                  PProfile    right )
+                                  FT_F26Dot6  x2 )
   {
-    Long  e1, e2;
-
-    FT_UNUSED( left );
-    FT_UNUSED( right );
+    Long  e1 = CEILING( x1 );
+    Long  e2 =   FLOOR( x2 );
 
 
-    FT_TRACE7(( "  x=%d y=[% .12f;% .12f]",
+    FT_TRACE7(( "  x=%d y=[% .*f;% .*f]",
                 y,
-                (double)x1 / (double)ras.precision,
-                (double)x2 / (double)ras.precision ));
+                ras.precision_bits, (double)x1 / (double)ras.precision,
+                ras.precision_bits, (double)x2 / (double)ras.precision ));
 
     /* We should not need this procedure but the vertical sweep   */
     /* mishandles horizontal lines through pixel centers.  So we  */
@@ -2484,20 +2133,18 @@
     /*                                                            */
     /* XXX: Can we handle horizontal lines better and drop this?  */
 
-    e1 = CEILING( x1 );
-
     if ( x1 == e1 )
     {
       e1 = TRUNC( e1 );
 
-      if ( e1 >= 0 && (ULong)e1 < ras.target.rows )
+      if ( e1 >= 0 && e1 <= ras.bTop )
       {
-        Byte   f1;
+        Int    f1;
         PByte  bits;
 
 
-        bits = ras.bOrigin + ( y >> 3 ) - e1 * ras.target.pitch;
-        f1   = (Byte)( 0x80 >> ( y & 7 ) );
+        bits = ras.bOrigin + ( y >> 3 ) - e1 * ras.bPitch;
+        f1   = 0x80 >> ( y & 7 );
 
         FT_TRACE7(( bits[0] & f1 ? " redundant"
                                  : " -> y=%ld edge", e1 ));
@@ -2506,20 +2153,18 @@
       }
     }
 
-    e2 = FLOOR  ( x2 );
-
     if ( x2 == e2 )
     {
       e2 = TRUNC( e2 );
 
-      if ( e2 >= 0 && (ULong)e2 < ras.target.rows )
+      if ( e2 >= 0 && e2 <= ras.bTop )
       {
-        Byte   f1;
+        Int    f1;
         PByte  bits;
 
 
-        bits = ras.bOrigin + ( y >> 3 ) - e2 * ras.target.pitch;
-        f1   = (Byte)( 0x80 >> ( y & 7 ) );
+        bits = ras.bOrigin + ( y >> 3 ) - e2 * ras.bPitch;
+        f1   = 0x80 >> ( y & 7 );
 
         FT_TRACE7(( bits[0] & f1 ? " redundant"
                                  : " -> y=%ld edge", e2 ));
@@ -2533,122 +2178,42 @@
 
 
   static void
-  Horizontal_Sweep_Drop( RAS_ARGS Short       y,
+  Horizontal_Sweep_Drop( RAS_ARGS Int         y,
                                   FT_F26Dot6  x1,
-                                  FT_F26Dot6  x2,
-                                  PProfile    left,
-                                  PProfile    right )
+                                  FT_F26Dot6  x2 )
   {
-    Long   e1, e2, pxl;
+    Int    e1 = (Int)TRUNC( x1 );
+    Int    e2 = (Int)TRUNC( x2 );
     PByte  bits;
-    Byte   f1;
+    Int    f1;
 
 
-    FT_TRACE7(( "  x=%d y=[% .12f;% .12f]",
-                y,
-                (double)x1 / (double)ras.precision,
-                (double)x2 / (double)ras.precision ));
+    /* undocumented but confirmed: If the drop-out would result in a  */
+    /* pixel outside of the bounding box, use the pixel inside of the */
+    /* bounding box instead                                           */
+    if ( e1 < 0 || e1 > ras.bTop )
+      e1 = e2;
 
-    /* During the horizontal sweep, we only take care of drop-outs */
-
-    /* e1     +       <-- pixel center */
-    /*        |                        */
-    /* x1  ---+-->    <-- contour      */
-    /*        |                        */
-    /*        |                        */
-    /* x2  <--+---    <-- contour      */
-    /*        |                        */
-    /*        |                        */
-    /* e2     +       <-- pixel center */
-
-    e1  = CEILING( x1 );
-    e2  = FLOOR  ( x2 );
-    pxl = e1;
-
-    if ( e1 > e2 )
+    /* otherwise check that the other pixel isn't set */
+    else if ( e2 >=0 && e2 <= ras.bTop )
     {
-      Int  dropOutControl = left->flags & 7;
+      bits = ras.bOrigin + ( y >> 3 ) - e2 * ras.bPitch;
+      f1   = 0x80 >> ( y & 7 );
 
-
-      if ( e1 == e2 + ras.precision )
-      {
-        switch ( dropOutControl )
-        {
-        case 0: /* simple drop-outs including stubs */
-          pxl = e2;
-          break;
-
-        case 4: /* smart drop-outs including stubs */
-          pxl = SMART( x1, x2 );
-          break;
-
-        case 1: /* simple drop-outs excluding stubs */
-        case 5: /* smart drop-outs excluding stubs  */
-          /* see Vertical_Sweep_Drop for details */
-
-          /* rightmost stub test */
-          if ( left->next == right                &&
-               left->height <= 0                  &&
-               !( left->flags & Overshoot_Top   &&
-                  x2 - x1 >= ras.precision_half ) )
-            goto Exit;
-
-          /* leftmost stub test */
-          if ( right->next == left                 &&
-               left->start == y                    &&
-               !( left->flags & Overshoot_Bottom &&
-                  x2 - x1 >= ras.precision_half  ) )
-            goto Exit;
-
-          if ( dropOutControl == 1 )
-            pxl = e2;
-          else
-            pxl = SMART( x1, x2 );
-          break;
-
-        default: /* modes 2, 3, 6, 7 */
-          goto Exit;  /* no drop-out control */
-        }
-
-        /* undocumented but confirmed: If the drop-out would result in a  */
-        /* pixel outside of the bounding box, use the pixel inside of the */
-        /* bounding box instead                                           */
-        if ( pxl < 0 )
-          pxl = e1;
-        else if ( (ULong)( TRUNC( pxl ) ) >= ras.target.rows )
-          pxl = e2;
-
-        /* check that the other pixel isn't set */
-        e1 = ( pxl == e1 ) ? e2 : e1;
-
-        e1 = TRUNC( e1 );
-
-        bits = ras.bOrigin + ( y >> 3 ) - e1 * ras.target.pitch;
-        f1   = (Byte)( 0x80 >> ( y & 7 ) );
-
-        if ( e1 >= 0                     &&
-             (ULong)e1 < ras.target.rows &&
-             *bits & f1                  )
-          goto Exit;
-      }
-      else
-        goto Exit;
+      if ( *bits & f1 )
+        return;
     }
 
-    e1 = TRUNC( pxl );
-
-    if ( e1 >= 0 && (ULong)e1 < ras.target.rows )
+    if ( e1 >= 0 && e1 <= ras.bTop )
     {
-      FT_TRACE7(( " -> y=%ld", e1 ));
+      bits  = ras.bOrigin + ( y >> 3 ) - e1 * ras.bPitch;
+      f1    = 0x80 >> ( y & 7 );
 
-      bits  = ras.bOrigin + ( y >> 3 ) - e1 * ras.target.pitch;
-      f1    = (Byte)( 0x80 >> ( y & 7 ) );
+      FT_TRACE7(( "  x=%d y=%d%s\n", y, e1,
+                  *bits & f1 ? " redundant" : "" ));
 
-      bits[0] |= f1;
+      *bits |= f1;
     }
-
-  Exit:
-    FT_TRACE7(( " dropout=%d\n", left->flags & 7 ));
   }
 
 
@@ -2664,116 +2229,61 @@
    *
    * Generic Sweep Drawing routine
    *
+   * Note that this routine is executed with the pool containing at least
+   * two valid profiles (up and down) and two y-turns (top and bottom).
+   *
    */
 
-  static Bool
+  static void
   Draw_Sweep( RAS_ARG )
   {
-    Short         y, y_change, y_height;
+    Int           min_Y, max_Y, dropouts;
+    Int           y, y_turn;
 
-    PProfile      P, Q, P_Left, P_Right;
+    PProfile      *Q, P, P_Left, P_Right;
 
-    Short         min_Y, max_Y, top, bottom, dropouts;
-
-    Long          x1, x2, xs, e1, e2;
-
-    TProfileList  waiting;
-    TProfileList  draw_left, draw_right;
+    TProfileList  waiting    = ras.fProfile;
+    TProfileList  draw_left  = NULL;
+    TProfileList  draw_right = NULL;
 
 
-    /* initialize empty linked lists */
+    /* use y_turns to set the drawing range */
 
-    Init_Linked( &waiting );
-
-    Init_Linked( &draw_left  );
-    Init_Linked( &draw_right );
-
-    /* first, compute min and max Y */
-
-    P     = ras.fProfile;
-    max_Y = (Short)TRUNC( ras.minY );
-    min_Y = (Short)TRUNC( ras.maxY );
-
-    while ( P )
-    {
-      Q = P->link;
-
-      bottom = (Short)P->start;
-      top    = (Short)( P->start + P->height - 1 );
-
-      if ( min_Y > bottom )
-        min_Y = bottom;
-      if ( max_Y < top )
-        max_Y = top;
-
-      P->X = 0;
-      InsNew( &waiting, P );
-
-      P = Q;
-    }
-
-    /* check the Y-turns */
-    if ( ras.numTurns == 0 )
-    {
-      ras.error = FT_THROW( Invalid_Outline );
-      return FAILURE;
-    }
+    min_Y = (Int)ras.maxBuff[0];
+    max_Y = (Int)ras.maxBuff[ras.numTurns] - 1;
 
     /* now initialize the sweep */
 
     ras.Proc_Sweep_Init( RAS_VARS min_Y, max_Y );
 
-    /* then compute the distance of each profile from min_Y */
-
-    P = waiting;
-
-    while ( P )
-    {
-      P->countL = P->start - min_Y;
-      P = P->link;
-    }
-
     /* let's go */
 
-    y        = min_Y;
-    y_height = 0;
-
-    if ( ras.numTurns > 0                     &&
-         ras.sizeBuff[-ras.numTurns] == min_Y )
-      ras.numTurns--;
-
-    while ( ras.numTurns > 0 )
+    for ( y = min_Y; y <= max_Y; )
     {
-      /* check waiting list for new activations */
+      /* check waiting list for new profile activations */
 
-      P = waiting;
-
-      while ( P )
+      Q = &waiting;
+      while ( *Q )
       {
-        Q = P->link;
-        P->countL -= y_height;
-        if ( P->countL == 0 )
+        P = *Q;
+        if ( P->start == y )
         {
-          DelOld( &waiting, P );
+          *Q = P->link;  /* remove */
 
+          /* each active list contains profiles with the same flow */
+          /* left and right are arbitrary, correspond to TrueType  */
           if ( P->flags & Flow_Up )
             InsNew( &draw_left,  P );
           else
             InsNew( &draw_right, P );
         }
-
-        P = Q;
+        else
+          Q = &P->link;
       }
 
-      /* sort the drawing lists */
+      y_turn = (Int)*++ras.maxBuff;
 
-      Sort( &draw_left );
-      Sort( &draw_right );
-
-      y_change = (Short)ras.sizeBuff[-ras.numTurns--];
-      y_height = (Short)( y_change - y );
-
-      while ( y < y_change )
+      do
       {
         /* let's trace */
 
@@ -2784,9 +2294,13 @@
 
         while ( P_Left && P_Right )
         {
-          x1 = P_Left ->X;
-          x2 = P_Right->X;
+          Long  x1 = P_Left ->X;
+          Long  x2 = P_Right->X;
+          Long  xs;
 
+
+          /* TrueType should have x2 > x1, but can be opposite */
+          /* by mistake or in CFF/Type1, fix it then           */
           if ( x1 > x2 )
           {
             xs = x1;
@@ -2794,205 +2308,130 @@
             x2 = xs;
           }
 
-          e1 = FLOOR( x1 );
-          e2 = CEILING( x2 );
+          if ( CEILING( x1 ) <= FLOOR( x2 ) )
+            ras.Proc_Sweep_Span( RAS_VARS y, x1, x2 );
 
-          if ( x2 - x1 <= ras.precision &&
-               e1 != x1 && e2 != x2     )
+          /* otherwise, bottom ceiling > top floor, it is a drop-out */
+          else
           {
-            if ( e1 > e2 || e2 == e1 + ras.precision )
+            Int  dropOutControl = P_Left->flags & 7;
+
+
+            /* Drop-out control */
+
+            /*   e2            x2                    x1           e1   */
+            /*                                                         */
+            /*                 ^                     |                 */
+            /*                 |                     |                 */
+            /*   +-------------+---------------------+------------+    */
+            /*                 |                     |                 */
+            /*                 |                     v                 */
+            /*                                                         */
+            /* pixel         contour              contour       pixel  */
+            /* center                                           center */
+
+            /* drop-out mode   scan conversion rules (OpenType specs)  */
+            /* ------------------------------------------------------- */
+            /*  bit 0          exclude stubs if set                    */
+            /*  bit 1          ignore drop-outs if set                 */
+            /*  bit 2          smart rounding if set                   */
+
+            if ( dropOutControl & 2 )
+              goto Next_Pair;
+
+            /* The specification neither provides an exact definition */
+            /* of a `stub' nor gives exact rules to exclude them.     */
+            /*                                                        */
+            /* Here the constraints we use to recognize a stub.       */
+            /*                                                        */
+            /*  upper stub:                                           */
+            /*                                                        */
+            /*   - P_Left and P_Right are in the same contour         */
+            /*   - P_Right is the successor of P_Left in that contour */
+            /*   - y is the top of P_Left and P_Right                 */
+            /*                                                        */
+            /*  lower stub:                                           */
+            /*                                                        */
+            /*   - P_Left and P_Right are in the same contour         */
+            /*   - P_Left is the successor of P_Right in that contour */
+            /*   - y is the bottom of P_Left                          */
+            /*                                                        */
+            /* We draw a stub if the following constraints are met.   */
+            /*                                                        */
+            /*   - for an upper or lower stub, there is top or bottom */
+            /*     overshoot, respectively                            */
+            /*   - the covered interval is greater or equal to a half */
+            /*     pixel                                              */
+
+            if ( dropOutControl & 1 )
             {
-              Int  dropOutControl = P_Left->flags & 7;
+              /* upper stub test */
+              if ( P_Left->height == 1                &&
+                   P_Left->next == P_Right            &&
+                   !( P_Left->flags & Overshoot_Top   &&
+                      x2 - x1 >= ras.precision_half   ) )
+                goto Next_Pair;
 
-
-              if ( dropOutControl != 2 )
-              {
-                /* a drop-out was detected */
-
-                P_Left ->X = x1;
-                P_Right->X = x2;
-
-                /* mark profile for drop-out processing */
-                P_Left->countL = 1;
-                dropouts++;
-              }
-
-              goto Skip_To_Next;
+              /* lower stub test */
+              if ( P_Left->offset == 0                 &&
+                   P_Right->next == P_Left             &&
+                   !( P_Left->flags & Overshoot_Bottom &&
+                      x2 - x1 >= ras.precision_half    ) )
+                goto Next_Pair;
             }
+
+            /* select the pixel to set and the other pixel */
+            if ( dropOutControl & 4 )
+            {
+              x2 = SMART( x1, x2 );
+              x1 = x1 > x2 ? x2 + ras.precision : x2 - ras.precision;
+            }
+            else
+            {
+              x2 = FLOOR  ( x2 );
+              x1 = CEILING( x1 );
+            }
+
+            P_Left ->X = x2;
+            P_Right->X = x1;
+
+            /* mark profile for drop-out processing */
+            P_Left->flags |= Dropout;
+            dropouts++;
           }
 
-          ras.Proc_Sweep_Span( RAS_VARS y, x1, x2, P_Left, P_Right );
+        Next_Pair:
+          P_Left  = P_Left->link;
+          P_Right = P_Right->link;
+        }
 
-        Skip_To_Next:
+        /* handle drop-outs _after_ the span drawing */
+        P_Left  = draw_left;
+        P_Right = draw_right;
+
+        while ( dropouts )
+        {
+          if ( P_Left->flags & Dropout )
+          {
+            ras.Proc_Sweep_Drop( RAS_VARS y, P_Left->X, P_Right->X );
+
+            P_Left->flags &= ~Dropout;
+            dropouts--;
+          }
 
           P_Left  = P_Left->link;
           P_Right = P_Right->link;
         }
 
-        /* handle drop-outs _after_ the span drawing --       */
-        /* drop-out processing has been moved out of the loop */
-        /* for performance tuning                             */
-        if ( dropouts > 0 )
-          goto Scan_DropOuts;
-
-      Next_Line:
-
         ras.Proc_Sweep_Step( RAS_VAR );
 
-        y++;
-
-        if ( y < y_change )
-        {
-          Sort( &draw_left  );
-          Sort( &draw_right );
-        }
+        Increment( &draw_left,   1 );
+        Increment( &draw_right, -1 );
       }
-
-      /* now finalize the profiles that need it */
-
-      P = draw_left;
-      while ( P )
-      {
-        Q = P->link;
-        if ( P->height == 0 )
-          DelOld( &draw_left, P );
-        P = Q;
-      }
-
-      P = draw_right;
-      while ( P )
-      {
-        Q = P->link;
-        if ( P->height == 0 )
-          DelOld( &draw_right, P );
-        P = Q;
-      }
-    }
-
-    /* for gray-scaling, flush the bitmap scanline cache */
-    while ( y <= max_Y )
-    {
-      ras.Proc_Sweep_Step( RAS_VAR );
-      y++;
-    }
-
-    return SUCCESS;
-
-  Scan_DropOuts:
-
-    P_Left  = draw_left;
-    P_Right = draw_right;
-
-    while ( P_Left && P_Right )
-    {
-      if ( P_Left->countL )
-      {
-        P_Left->countL = 0;
-#if 0
-        dropouts--;  /* -- this is useful when debugging only */
-#endif
-        ras.Proc_Sweep_Drop( RAS_VARS y,
-                                      P_Left->X,
-                                      P_Right->X,
-                                      P_Left,
-                                      P_Right );
-      }
-
-      P_Left  = P_Left->link;
-      P_Right = P_Right->link;
-    }
-
-    goto Next_Line;
-  }
-
-
-#ifdef STANDALONE_
-
-  /**************************************************************************
-   *
-   * The following functions should only compile in stand-alone mode,
-   * i.e., when building this component without the rest of FreeType.
-   *
-   */
-
-  /**************************************************************************
-   *
-   * @Function:
-   *   FT_Outline_Get_CBox
-   *
-   * @Description:
-   *   Return an outline's `control box'.  The control box encloses all
-   *   the outline's points, including Bézier control points.  Though it
-   *   coincides with the exact bounding box for most glyphs, it can be
-   *   slightly larger in some situations (like when rotating an outline
-   *   that contains Bézier outside arcs).
-   *
-   *   Computing the control box is very fast, while getting the bounding
-   *   box can take much more time as it needs to walk over all segments
-   *   and arcs in the outline.  To get the latter, you can use the
-   *   `ftbbox' component, which is dedicated to this single task.
-   *
-   * @Input:
-   *   outline ::
-   *     A pointer to the source outline descriptor.
-   *
-   * @Output:
-   *   acbox ::
-   *     The outline's control box.
-   *
-   * @Note:
-   *   See @FT_Glyph_Get_CBox for a discussion of tricky fonts.
-   */
-
-  static void
-  FT_Outline_Get_CBox( const FT_Outline*  outline,
-                       FT_BBox           *acbox )
-  {
-    if ( outline && acbox )
-    {
-      Long  xMin, yMin, xMax, yMax;
-
-
-      if ( outline->n_points == 0 )
-      {
-        xMin = 0;
-        yMin = 0;
-        xMax = 0;
-        yMax = 0;
-      }
-      else
-      {
-        FT_Vector*  vec   = outline->points;
-        FT_Vector*  limit = vec + outline->n_points;
-
-
-        xMin = xMax = vec->x;
-        yMin = yMax = vec->y;
-        vec++;
-
-        for ( ; vec < limit; vec++ )
-        {
-          Long  x, y;
-
-
-          x = vec->x;
-          if ( x < xMin ) xMin = x;
-          if ( x > xMax ) xMax = x;
-
-          y = vec->y;
-          if ( y < yMin ) yMin = y;
-          if ( y > yMax ) yMax = y;
-        }
-      }
-      acbox->xMin = xMin;
-      acbox->xMax = xMax;
-      acbox->yMin = yMin;
-      acbox->yMax = yMax;
+      while ( ++y < y_turn );
     }
   }
 
-#endif /* STANDALONE_ */
-
 
   /**************************************************************************
    *
@@ -3019,13 +2458,15 @@
     Int  band_stack[32];  /* enough to bisect 32-bit int bands */
 
 
+    FT_TRACE6(( "%s pass [%d..%d]\n",
+                flipped ? "Horizontal" : "Vertical",
+                y_min, y_max ));
+
     while ( 1 )
     {
       ras.minY = (Long)y_min * ras.precision;
       ras.maxY = (Long)y_max * ras.precision;
 
-      ras.top = ras.buff;
-
       ras.error = Raster_Err_Ok;
 
       if ( Convert_Glyph( RAS_VARS flipped ) )
@@ -3038,6 +2479,9 @@
         if ( y_min == y_max )
           return ras.error;  /* still Raster_Overflow */
 
+        FT_TRACE6(( "band [%d..%d]: to be bisected\n",
+                    y_min, y_max ));
+
         y_mid = ( y_min + y_max ) >> 1;
 
         band_stack[band_top++] = y_min;
@@ -3045,9 +2489,12 @@
       }
       else
       {
+        FT_TRACE6(( "band [%d..%d]: %hd profiles; %td bytes remaining\n",
+                    y_min, y_max, ras.num_Profs,
+                    (char*)ras.maxBuff - (char*)ras.top ));
+
         if ( ras.fProfile )
-          if ( Draw_Sweep( RAS_VAR ) )
-             return ras.error;
+          Draw_Sweep( RAS_VAR );
 
         if ( --band_top < 0 )
           break;
@@ -3076,53 +2523,48 @@
   Render_Glyph( RAS_ARG )
   {
     FT_Error  error;
+    Long      buffer[FT_MAX_BLACK_POOL];
 
 
+    ras.buff     = buffer;
+    ras.sizeBuff = (&buffer)[1]; /* Points to right after buffer. */
+
     Set_High_Precision( RAS_VARS ras.outline.flags &
                                  FT_OUTLINE_HIGH_PRECISION );
 
-    if ( ras.outline.flags & FT_OUTLINE_IGNORE_DROPOUTS )
-      ras.dropOutControl = 2;
-    else
-    {
-      if ( ras.outline.flags & FT_OUTLINE_SMART_DROPOUTS )
-        ras.dropOutControl = 4;
-      else
-        ras.dropOutControl = 0;
+    ras.dropOutControl = 0;
 
-      if ( !( ras.outline.flags & FT_OUTLINE_INCLUDE_STUBS ) )
-        ras.dropOutControl += 1;
-    }
+    if ( ras.outline.flags & FT_OUTLINE_IGNORE_DROPOUTS )
+      ras.dropOutControl |= 2;
+
+    if ( ras.outline.flags & FT_OUTLINE_SMART_DROPOUTS )
+      ras.dropOutControl |= 4;
+
+    if ( !( ras.outline.flags & FT_OUTLINE_INCLUDE_STUBS ) )
+      ras.dropOutControl |= 1;
+
+    FT_TRACE6(( "BW Raster: precision 1/%d, dropout mode %d\n",
+                ras.precision, ras.dropOutControl ));
 
     /* Vertical Sweep */
-    FT_TRACE7(( "Vertical pass (ftraster)\n" ));
-
     ras.Proc_Sweep_Init = Vertical_Sweep_Init;
     ras.Proc_Sweep_Span = Vertical_Sweep_Span;
     ras.Proc_Sweep_Drop = Vertical_Sweep_Drop;
     ras.Proc_Sweep_Step = Vertical_Sweep_Step;
 
-    ras.bWidth  = (UShort)ras.target.width;
-    ras.bOrigin = (Byte*)ras.target.buffer;
-
-    if ( ras.target.pitch > 0 )
-      ras.bOrigin += (Long)( ras.target.rows - 1 ) * ras.target.pitch;
-
-    error = Render_Single_Pass( RAS_VARS 0, 0, (Int)ras.target.rows - 1 );
+    error = Render_Single_Pass( RAS_VARS 0, 0, ras.bTop );
     if ( error )
       return error;
 
     /* Horizontal Sweep */
     if ( !( ras.outline.flags & FT_OUTLINE_SINGLE_PASS ) )
     {
-      FT_TRACE7(( "Horizontal pass (ftraster)\n" ));
-
       ras.Proc_Sweep_Init = Horizontal_Sweep_Init;
       ras.Proc_Sweep_Span = Horizontal_Sweep_Span;
       ras.Proc_Sweep_Drop = Horizontal_Sweep_Drop;
       ras.Proc_Sweep_Step = Horizontal_Sweep_Step;
 
-      error = Render_Single_Pass( RAS_VARS 1, 0, (Int)ras.target.width - 1 );
+      error = Render_Single_Pass( RAS_VARS 1, 0, ras.bRight );
       if ( error )
         return error;
     }
@@ -3233,8 +2675,6 @@
     black_TWorker  worker[1];
 #endif
 
-    Long  buffer[FT_MAX_BLACK_POOL];
-
 
     if ( !raster )
       return FT_THROW( Raster_Uninitialized );
@@ -3243,7 +2683,7 @@
       return FT_THROW( Invalid_Outline );
 
     /* return immediately if the outline is empty */
-    if ( outline->n_points == 0 || outline->n_contours <= 0 )
+    if ( outline->n_points == 0 || outline->n_contours == 0 )
       return Raster_Err_Ok;
 
     if ( !outline->contours || !outline->points )
@@ -3269,10 +2709,14 @@
       return FT_THROW( Invalid_Argument );
 
     ras.outline = *outline;
-    ras.target  = *target_map;
 
-    ras.buff     = buffer;
-    ras.sizeBuff = (&buffer)[1]; /* Points to right after buffer. */
+    ras.bTop    =   (Int)target_map->rows - 1;
+    ras.bRight  =   (Int)target_map->width - 1;
+    ras.bPitch  =   (Int)target_map->pitch;
+    ras.bOrigin = (PByte)target_map->buffer;
+
+    if ( ras.bPitch > 0 )
+      ras.bOrigin += ras.bTop * ras.bPitch;
 
     return Render_Glyph( RAS_VAR );
   }
diff --git a/src/java.desktop/share/native/libfreetype/src/raster/ftraster.h b/src/java.desktop/share/native/libfreetype/src/raster/ftraster.h
index b511b3a99e9..ad9cb1b9fe0 100644
--- a/src/java.desktop/share/native/libfreetype/src/raster/ftraster.h
+++ b/src/java.desktop/share/native/libfreetype/src/raster/ftraster.h
@@ -4,7 +4,7 @@
  *
  *   The FreeType glyph rasterizer (specification).
  *
- * Copyright (C) 1996-2023 by
+ * Copyright (C) 1996-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used
diff --git a/src/java.desktop/share/native/libfreetype/src/raster/ftrend1.c b/src/java.desktop/share/native/libfreetype/src/raster/ftrend1.c
index 6d442b1ff8c..fd9f174f2e1 100644
--- a/src/java.desktop/share/native/libfreetype/src/raster/ftrend1.c
+++ b/src/java.desktop/share/native/libfreetype/src/raster/ftrend1.c
@@ -4,7 +4,7 @@
  *
  *   The FreeType glyph rasterizer interface (body).
  *
- * Copyright (C) 1996-2023 by
+ * Copyright (C) 1996-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/src/java.desktop/share/native/libfreetype/src/raster/ftrend1.h b/src/java.desktop/share/native/libfreetype/src/raster/ftrend1.h
index cec35c8528a..cf3e73c0a24 100644
--- a/src/java.desktop/share/native/libfreetype/src/raster/ftrend1.h
+++ b/src/java.desktop/share/native/libfreetype/src/raster/ftrend1.h
@@ -4,7 +4,7 @@
  *
  *   The FreeType glyph rasterizer interface (specification).
  *
- * Copyright (C) 1996-2023 by
+ * Copyright (C) 1996-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/src/java.desktop/share/native/libfreetype/src/raster/rasterrs.h b/src/java.desktop/share/native/libfreetype/src/raster/rasterrs.h
index 989d8b44be1..326d42e0438 100644
--- a/src/java.desktop/share/native/libfreetype/src/raster/rasterrs.h
+++ b/src/java.desktop/share/native/libfreetype/src/raster/rasterrs.h
@@ -4,7 +4,7 @@
  *
  *   monochrome renderer error codes (specification only).
  *
- * Copyright (C) 2001-2023 by
+ * Copyright (C) 2001-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/src/java.desktop/share/native/libfreetype/src/sfnt/pngshim.c b/src/java.desktop/share/native/libfreetype/src/sfnt/pngshim.c
index 33712162e00..76181568af9 100644
--- a/src/java.desktop/share/native/libfreetype/src/sfnt/pngshim.c
+++ b/src/java.desktop/share/native/libfreetype/src/sfnt/pngshim.c
@@ -4,7 +4,7 @@
  *
  *   PNG Bitmap glyph support.
  *
- * Copyright (C) 2013-2023 by
+ * Copyright (C) 2013-2024 by
  * Google, Inc.
  * Written by Stuart Gill and Behdad Esfahbod.
  *
diff --git a/src/java.desktop/share/native/libfreetype/src/sfnt/pngshim.h b/src/java.desktop/share/native/libfreetype/src/sfnt/pngshim.h
index 903bd2bc348..6e7a5c08e71 100644
--- a/src/java.desktop/share/native/libfreetype/src/sfnt/pngshim.h
+++ b/src/java.desktop/share/native/libfreetype/src/sfnt/pngshim.h
@@ -4,7 +4,7 @@
  *
  *   PNG Bitmap glyph support.
  *
- * Copyright (C) 2013-2023 by
+ * Copyright (C) 2013-2024 by
  * Google, Inc.
  * Written by Stuart Gill and Behdad Esfahbod.
  *
diff --git a/src/java.desktop/share/native/libfreetype/src/sfnt/sfdriver.c b/src/java.desktop/share/native/libfreetype/src/sfnt/sfdriver.c
index 0925940b03f..81072207b49 100644
--- a/src/java.desktop/share/native/libfreetype/src/sfnt/sfdriver.c
+++ b/src/java.desktop/share/native/libfreetype/src/sfnt/sfdriver.c
@@ -4,7 +4,7 @@
  *
  *   High-level SFNT driver interface (body).
  *
- * Copyright (C) 1996-2023 by
+ * Copyright (C) 1996-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
@@ -49,6 +49,10 @@
 #include <freetype/internal/services/svbdf.h>
 #endif
 
+#ifdef TT_CONFIG_OPTION_GPOS_KERNING
+#include "ttgpos.h"
+#endif
+
 #include "ttcmap.h"
 #include "ttkern.h"
 #include "ttmtx.h"
@@ -1249,6 +1253,12 @@
 #define PUT_PS_NAMES( a )  a
 #else
 #define PUT_PS_NAMES( a )  NULL
+#endif
+
+#ifdef TT_CONFIG_OPTION_GPOS_KERNING
+#define PUT_GPOS_KERNING( a )  a
+#else
+#define PUT_GPOS_KERNING( a )  NULL
 #endif
 
   FT_DEFINE_SFNT_INTERFACE(
@@ -1274,6 +1284,8 @@
     tt_face_free_name,      /* TT_Free_Table_Func      free_name       */
 
     tt_face_load_kern,      /* TT_Load_Table_Func      load_kern       */
+    PUT_GPOS_KERNING( tt_face_load_gpos ),
+                            /* TT_Load_Table_Func      load_gpos       */
     tt_face_load_gasp,      /* TT_Load_Table_Func      load_gasp       */
     tt_face_load_pclt,      /* TT_Load_Table_Func      load_init       */
 
@@ -1292,6 +1304,9 @@
     /* since version 2.1.8 */
     tt_face_get_kerning,    /* TT_Face_GetKerningFunc  get_kerning     */
 
+    PUT_GPOS_KERNING( tt_face_get_gpos_kerning ),
+                           /* TT_Face_GetKerningFunc  get_gpos_kerning */
+
     /* since version 2.2 */
     tt_face_load_font_dir,  /* TT_Load_Table_Func      load_font_dir   */
     tt_face_load_hmtx,      /* TT_Load_Metrics_Func    load_hmtx       */
diff --git a/src/java.desktop/share/native/libfreetype/src/sfnt/sfdriver.h b/src/java.desktop/share/native/libfreetype/src/sfnt/sfdriver.h
index 2445958b69f..6f71489fdc1 100644
--- a/src/java.desktop/share/native/libfreetype/src/sfnt/sfdriver.h
+++ b/src/java.desktop/share/native/libfreetype/src/sfnt/sfdriver.h
@@ -4,7 +4,7 @@
  *
  *   High-level SFNT driver interface (specification).
  *
- * Copyright (C) 1996-2023 by
+ * Copyright (C) 1996-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/src/java.desktop/share/native/libfreetype/src/sfnt/sferrors.h b/src/java.desktop/share/native/libfreetype/src/sfnt/sferrors.h
index e7a8eb04bb8..d3ca1d9aa8b 100644
--- a/src/java.desktop/share/native/libfreetype/src/sfnt/sferrors.h
+++ b/src/java.desktop/share/native/libfreetype/src/sfnt/sferrors.h
@@ -4,7 +4,7 @@
  *
  *   SFNT error codes (specification only).
  *
- * Copyright (C) 2001-2023 by
+ * Copyright (C) 2001-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/src/java.desktop/share/native/libfreetype/src/sfnt/sfobjs.c b/src/java.desktop/share/native/libfreetype/src/sfnt/sfobjs.c
index f5d66ef8403..6ee4e5e939b 100644
--- a/src/java.desktop/share/native/libfreetype/src/sfnt/sfobjs.c
+++ b/src/java.desktop/share/native/libfreetype/src/sfnt/sfobjs.c
@@ -4,7 +4,7 @@
  *
  *   SFNT object management (base).
  *
- * Copyright (C) 1996-2023 by
+ * Copyright (C) 1996-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
@@ -40,6 +40,10 @@
 #include "ttbdf.h"
 #endif
 
+#ifdef TT_CONFIG_OPTION_GPOS_KERNING
+#include "ttgpos.h"
+#endif
+
 
   /**************************************************************************
    *
@@ -1026,6 +1030,10 @@
     LOAD_( gasp );
     LOAD_( kern );
 
+#ifdef TT_CONFIG_OPTION_GPOS_KERNING
+    LOAD_( gpos );
+#endif
+
     face->root.num_glyphs = face->max_profile.numGlyphs;
 
     /* Bit 8 of the `fsSelection' field in the `OS/2' table denotes  */
@@ -1119,7 +1127,11 @@
         flags |= FT_FACE_FLAG_VERTICAL;
 
       /* kerning available ? */
-      if ( TT_FACE_HAS_KERNING( face ) )
+      if ( TT_FACE_HAS_KERNING( face )
+#ifdef TT_CONFIG_OPTION_GPOS_KERNING
+           || face->gpos_kerning_available
+#endif
+         )
         flags |= FT_FACE_FLAG_KERNING;
 
 #ifdef TT_CONFIG_OPTION_GX_VAR_SUPPORT
@@ -1470,6 +1482,11 @@
     /* freeing the kerning table */
     tt_face_done_kern( face );
 
+#ifdef TT_CONFIG_OPTION_GPOS_KERNING
+    /* freeing the GPOS table */
+    tt_face_done_gpos( face );
+#endif
+
     /* freeing the collection table */
     FT_FREE( face->ttc_header.offsets );
     face->ttc_header.count = 0;
diff --git a/src/java.desktop/share/native/libfreetype/src/sfnt/sfobjs.h b/src/java.desktop/share/native/libfreetype/src/sfnt/sfobjs.h
index 906aebbf904..90847d95732 100644
--- a/src/java.desktop/share/native/libfreetype/src/sfnt/sfobjs.h
+++ b/src/java.desktop/share/native/libfreetype/src/sfnt/sfobjs.h
@@ -4,7 +4,7 @@
  *
  *   SFNT object management (specification).
  *
- * Copyright (C) 1996-2023 by
+ * Copyright (C) 1996-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/src/java.desktop/share/native/libfreetype/src/sfnt/sfwoff.c b/src/java.desktop/share/native/libfreetype/src/sfnt/sfwoff.c
index 7c0ce2205e6..14514bf9574 100644
--- a/src/java.desktop/share/native/libfreetype/src/sfnt/sfwoff.c
+++ b/src/java.desktop/share/native/libfreetype/src/sfnt/sfwoff.c
@@ -4,7 +4,7 @@
  *
  *   WOFF format management (base).
  *
- * Copyright (C) 1996-2023 by
+ * Copyright (C) 1996-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
@@ -18,6 +18,7 @@
 
 #include "sfwoff.h"
 #include <freetype/tttags.h>
+#include <freetype/internal/ftcalc.h>
 #include <freetype/internal/ftdebug.h>
 #include <freetype/internal/ftstream.h>
 #include <freetype/ftgzip.h>
@@ -149,6 +150,7 @@
     /* Miscellaneous checks. */
     if ( woff.length != stream->size                              ||
          woff.num_tables == 0                                     ||
+         woff.num_tables >  0xFFFU                                ||
          44 + woff.num_tables * 20UL >= woff.length               ||
          12 + woff.num_tables * 16UL >= woff.totalSfntSize        ||
          ( woff.totalSfntSize & 3 ) != 0                          ||
@@ -169,21 +171,11 @@
 
     /* Write sfnt header. */
     {
-      FT_UInt  searchRange, entrySelector, rangeShift, x;
+      FT_Int  entrySelector = FT_MSB( woff.num_tables );
+      FT_Int  searchRange   = ( 1 << entrySelector ) * 16;
+      FT_Int  rangeShift    = woff.num_tables * 16 - searchRange;
 
 
-      x             = woff.num_tables;
-      entrySelector = 0;
-      while ( x )
-      {
-        x            >>= 1;
-        entrySelector += 1;
-      }
-      entrySelector--;
-
-      searchRange = ( 1 << entrySelector ) * 16;
-      rangeShift  = woff.num_tables * 16 - searchRange;
-
       WRITE_ULONG ( sfnt_header, woff.flavor );
       WRITE_USHORT( sfnt_header, woff.num_tables );
       WRITE_USHORT( sfnt_header, searchRange );
diff --git a/src/java.desktop/share/native/libfreetype/src/sfnt/sfwoff.h b/src/java.desktop/share/native/libfreetype/src/sfnt/sfwoff.h
index d4384227376..a04735ffe28 100644
--- a/src/java.desktop/share/native/libfreetype/src/sfnt/sfwoff.h
+++ b/src/java.desktop/share/native/libfreetype/src/sfnt/sfwoff.h
@@ -4,7 +4,7 @@
  *
  *   WOFFF format management (specification).
  *
- * Copyright (C) 1996-2023 by
+ * Copyright (C) 1996-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/src/java.desktop/share/native/libfreetype/src/sfnt/sfwoff2.c b/src/java.desktop/share/native/libfreetype/src/sfnt/sfwoff2.c
index 2be44a347ad..589b3e0c6b7 100644
--- a/src/java.desktop/share/native/libfreetype/src/sfnt/sfwoff2.c
+++ b/src/java.desktop/share/native/libfreetype/src/sfnt/sfwoff2.c
@@ -4,7 +4,7 @@
  *
  *   WOFF2 format management (base).
  *
- * Copyright (C) 2019-2023 by
+ * Copyright (C) 2019-2024 by
  * Nikhil Ramakrishnan, David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
@@ -18,6 +18,7 @@
 #include "sfwoff2.h"
 #include "woff2tags.h"
 #include <freetype/tttags.h>
+#include <freetype/internal/ftcalc.h>
 #include <freetype/internal/ftdebug.h>
 #include <freetype/internal/ftstream.h>
 
@@ -289,23 +290,15 @@
     FT_ULong  checksum     = 0;
     FT_ULong  aligned_size = size & ~3UL;
     FT_ULong  i;
-    FT_ULong  v;
+    FT_Int    shift;
 
 
     for ( i = 0; i < aligned_size; i += 4 )
-      checksum += ( (FT_ULong)buf[i    ] << 24 ) |
-                  ( (FT_ULong)buf[i + 1] << 16 ) |
-                  ( (FT_ULong)buf[i + 2] <<  8 ) |
-                  ( (FT_ULong)buf[i + 3] <<  0 );
+      checksum += FT_NEXT_ULONG( buf );
 
-    /* If size is not aligned to 4, treat as if it is padded with 0s. */
-    if ( size != aligned_size )
-    {
-      v = 0;
-      for ( i = aligned_size ; i < size; ++i )
-        v |= (FT_ULong)buf[i] << ( 24 - 8 * ( i & 3 ) );
-      checksum += v;
-    }
+    /* remaining bytes can be shifted and added one at a time */
+    for ( shift = 24; i < size; i++, shift -= 8 )
+      checksum += (FT_UInt32)FT_NEXT_BYTE( buf ) << shift;
 
     return checksum;
   }
@@ -1799,7 +1792,6 @@
 
     FT_Byte*   sfnt        = NULL;
     FT_Stream  sfnt_stream = NULL;
-    FT_Byte*   sfnt_header;
     FT_ULong   sfnt_size;
 
     FT_Byte*  uncompressed_buf = NULL;
@@ -1853,6 +1845,7 @@
     /* Miscellaneous checks. */
     if ( woff2.length != stream->size                               ||
          woff2.num_tables == 0                                      ||
+         woff2.num_tables >  0xFFFU                                 ||
          48 + woff2.num_tables * 20UL >= woff2.length               ||
          ( woff2.metaOffset == 0 && ( woff2.metaLength != 0     ||
                                       woff2.metaOrigLength != 0 ) ) ||
@@ -2143,6 +2136,13 @@
       WOFF2_TtcFont  ttc_font = woff2.ttc_fonts + face_index;
 
 
+      if ( ttc_font->num_tables == 0 || ttc_font->num_tables > 0xFFFU )
+      {
+        FT_ERROR(( "woff2_open_font: invalid WOFF2 CollectionFontEntry\n" ));
+        error = FT_THROW( Invalid_Table );
+        goto Exit;
+      }
+
       /* Create a temporary array. */
       if ( FT_QNEW_ARRAY( temp_indices,
                           ttc_font->num_tables ) )
@@ -2198,27 +2198,15 @@
          FT_NEW( sfnt_stream )        )
       goto Exit;
 
-    sfnt_header = sfnt;
-
-    WRITE_ULONG( sfnt_header, woff2.flavor );
-
-    if ( woff2.num_tables )
     {
-      FT_UInt  searchRange, entrySelector, rangeShift, x;
+      FT_Byte*  sfnt_header = sfnt;
+
+      FT_Int  entrySelector = FT_MSB( woff2.num_tables );
+      FT_Int  searchRange   = ( 1 << entrySelector ) * 16;
+      FT_Int  rangeShift    = woff2.num_tables * 16 - searchRange;
 
 
-      x             = woff2.num_tables;
-      entrySelector = 0;
-      while ( x )
-      {
-        x            >>= 1;
-        entrySelector += 1;
-      }
-      entrySelector--;
-
-      searchRange = ( 1 << entrySelector ) * 16;
-      rangeShift  = ( woff2.num_tables * 16 ) - searchRange;
-
+      WRITE_ULONG ( sfnt_header, woff2.flavor );
       WRITE_USHORT( sfnt_header, woff2.num_tables );
       WRITE_USHORT( sfnt_header, searchRange );
       WRITE_USHORT( sfnt_header, entrySelector );
diff --git a/src/java.desktop/share/native/libfreetype/src/sfnt/sfwoff2.h b/src/java.desktop/share/native/libfreetype/src/sfnt/sfwoff2.h
index 4901286ee08..f41140648dc 100644
--- a/src/java.desktop/share/native/libfreetype/src/sfnt/sfwoff2.h
+++ b/src/java.desktop/share/native/libfreetype/src/sfnt/sfwoff2.h
@@ -4,7 +4,7 @@
  *
  *   WOFFF2 format management (specification).
  *
- * Copyright (C) 2019-2023 by
+ * Copyright (C) 2019-2024 by
  * Nikhil Ramakrishnan, David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/src/java.desktop/share/native/libfreetype/src/sfnt/ttcmap.c b/src/java.desktop/share/native/libfreetype/src/sfnt/ttcmap.c
index 9ba25dcbc13..28f4d1173c0 100644
--- a/src/java.desktop/share/native/libfreetype/src/sfnt/ttcmap.c
+++ b/src/java.desktop/share/native/libfreetype/src/sfnt/ttcmap.c
@@ -4,7 +4,7 @@
  *
  *   TrueType character mapping table (cmap) support (body).
  *
- * Copyright (C) 2002-2023 by
+ * Copyright (C) 2002-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/src/java.desktop/share/native/libfreetype/src/sfnt/ttcmap.h b/src/java.desktop/share/native/libfreetype/src/sfnt/ttcmap.h
index ff52917ed5b..e2c5e72bf02 100644
--- a/src/java.desktop/share/native/libfreetype/src/sfnt/ttcmap.h
+++ b/src/java.desktop/share/native/libfreetype/src/sfnt/ttcmap.h
@@ -4,7 +4,7 @@
  *
  *   TrueType character mapping table (cmap) support (specification).
  *
- * Copyright (C) 2002-2023 by
+ * Copyright (C) 2002-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/src/java.desktop/share/native/libfreetype/src/sfnt/ttcmapc.h b/src/java.desktop/share/native/libfreetype/src/sfnt/ttcmapc.h
index 0af48c2478a..370898363f3 100644
--- a/src/java.desktop/share/native/libfreetype/src/sfnt/ttcmapc.h
+++ b/src/java.desktop/share/native/libfreetype/src/sfnt/ttcmapc.h
@@ -4,7 +4,7 @@
  *
  *   TT CMAP classes definitions (specification only).
  *
- * Copyright (C) 2009-2023 by
+ * Copyright (C) 2009-2024 by
  * Oran Agra and Mickey Gabel.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/src/java.desktop/share/native/libfreetype/src/sfnt/ttcolr.c b/src/java.desktop/share/native/libfreetype/src/sfnt/ttcolr.c
index 281e7135eea..b37658dde9e 100644
--- a/src/java.desktop/share/native/libfreetype/src/sfnt/ttcolr.c
+++ b/src/java.desktop/share/native/libfreetype/src/sfnt/ttcolr.c
@@ -4,7 +4,7 @@
  *
  *   TrueType and OpenType colored glyph layer support (body).
  *
- * Copyright (C) 2018-2023 by
+ * Copyright (C) 2018-2024 by
  * David Turner, Robert Wilhelm, Dominik Röttsches, and Werner Lemberg.
  *
  * Originally written by Shao Yu Zhang <shaozhang@fb.com>.
@@ -208,18 +208,19 @@
     colr->num_base_glyphs = FT_NEXT_USHORT( p );
     base_glyph_offset     = FT_NEXT_ULONG( p );
 
-    if ( base_glyph_offset >= table_size )
+    if ( table_size <= base_glyph_offset )
       goto InvalidTable;
-    if ( colr->num_base_glyphs * BASE_GLYPH_SIZE >
-           table_size - base_glyph_offset )
+    if ( ( table_size - base_glyph_offset ) / BASE_GLYPH_SIZE
+             < colr->num_base_glyphs )
       goto InvalidTable;
 
     layer_offset     = FT_NEXT_ULONG( p );
     colr->num_layers = FT_NEXT_USHORT( p );
 
-    if ( layer_offset >= table_size )
+    if ( table_size <= layer_offset )
       goto InvalidTable;
-    if ( colr->num_layers * LAYER_SIZE > table_size - layer_offset )
+    if ( ( table_size - layer_offset ) / LAYER_SIZE
+             < colr->num_layers )
       goto InvalidTable;
 
     if ( colr->version == 1 )
@@ -229,14 +230,14 @@
 
       base_glyphs_offset_v1 = FT_NEXT_ULONG( p );
 
-      if ( base_glyphs_offset_v1 >= table_size - 4 )
+      if ( table_size - 4 <= base_glyphs_offset_v1 )
         goto InvalidTable;
 
       p1                 = (FT_Byte*)( table + base_glyphs_offset_v1 );
       num_base_glyphs_v1 = FT_PEEK_ULONG( p1 );
 
-      if ( num_base_glyphs_v1 * BASE_GLYPH_PAINT_RECORD_SIZE >
-             table_size - base_glyphs_offset_v1 )
+      if ( ( table_size - base_glyphs_offset_v1 ) / BASE_GLYPH_PAINT_RECORD_SIZE
+               < num_base_glyphs_v1 )
         goto InvalidTable;
 
       colr->num_base_glyphs_v1 = num_base_glyphs_v1;
@@ -244,19 +245,19 @@
 
       layer_offset_v1 = FT_NEXT_ULONG( p );
 
-      if ( layer_offset_v1 >= table_size )
+      if ( table_size <= layer_offset_v1 )
         goto InvalidTable;
 
       if ( layer_offset_v1 )
       {
-        if ( layer_offset_v1 >= table_size - 4 )
+        if ( table_size - 4 <= layer_offset_v1 )
           goto InvalidTable;
 
         p1            = (FT_Byte*)( table + layer_offset_v1 );
         num_layers_v1 = FT_PEEK_ULONG( p1 );
 
-        if ( num_layers_v1 * LAYER_V1_LIST_PAINT_OFFSET_SIZE >
-               table_size - layer_offset_v1 )
+        if ( ( table_size - layer_offset_v1 ) / LAYER_V1_LIST_PAINT_OFFSET_SIZE
+                < num_layers_v1 )
           goto InvalidTable;
 
         colr->num_layers_v1 = num_layers_v1;
@@ -279,7 +280,7 @@
 
       clip_list_offset = FT_NEXT_ULONG( p );
 
-      if ( clip_list_offset >= table_size )
+      if ( table_size <= clip_list_offset )
         goto InvalidTable;
 
       if ( clip_list_offset )
@@ -311,7 +312,7 @@
           goto InvalidTable;
 
         var_store_offset = FT_NEXT_ULONG( p );
-        if ( var_store_offset >= table_size )
+        if ( table_size <= var_store_offset )
           goto InvalidTable;
 
         if ( var_store_offset )
@@ -661,6 +662,7 @@
       FT_UInt32  first_layer_index;
 
 
+      ENSURE_READ_BYTES( 5 );
       num_layers = FT_NEXT_BYTE( p );
       if ( num_layers > colr->num_layers_v1 )
         return 0;
@@ -1278,7 +1280,8 @@
 
     while ( min < max )
     {
-      FT_UInt  mid = min + ( max - min ) / 2;
+      FT_UInt    mid = min + ( max - min ) / 2;
+      FT_UShort  gid;
 
       /*
        * `base_glyph_begin` is the beginning of `BaseGlyphV1List`;
@@ -1287,8 +1290,7 @@
        */
       FT_Byte  *p = base_glyph_begin + 4 + mid * BASE_GLYPH_PAINT_RECORD_SIZE;
 
-      FT_UShort  gid = FT_NEXT_USHORT( p );
-
+      gid = FT_NEXT_USHORT( p );
 
       if ( gid < glyph_id )
         min = mid + 1;
diff --git a/src/java.desktop/share/native/libfreetype/src/sfnt/ttcolr.h b/src/java.desktop/share/native/libfreetype/src/sfnt/ttcolr.h
index 20c85f0359f..30031464c73 100644
--- a/src/java.desktop/share/native/libfreetype/src/sfnt/ttcolr.h
+++ b/src/java.desktop/share/native/libfreetype/src/sfnt/ttcolr.h
@@ -4,7 +4,7 @@
  *
  *   TrueType and OpenType colored glyph layer support (specification).
  *
- * Copyright (C) 2018-2023 by
+ * Copyright (C) 2018-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * Originally written by Shao Yu Zhang <shaozhang@fb.com>.
diff --git a/src/java.desktop/share/native/libfreetype/src/sfnt/ttcpal.c b/src/java.desktop/share/native/libfreetype/src/sfnt/ttcpal.c
index 46ae08596f3..997eb869ffc 100644
--- a/src/java.desktop/share/native/libfreetype/src/sfnt/ttcpal.c
+++ b/src/java.desktop/share/native/libfreetype/src/sfnt/ttcpal.c
@@ -4,7 +4,7 @@
  *
  *   TrueType and OpenType color palette support (body).
  *
- * Copyright (C) 2018-2023 by
+ * Copyright (C) 2018-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * Originally written by Shao Yu Zhang <shaozhang@fb.com>.
diff --git a/src/java.desktop/share/native/libfreetype/src/sfnt/ttcpal.h b/src/java.desktop/share/native/libfreetype/src/sfnt/ttcpal.h
index 8e9913f0ccd..bb301ae88b6 100644
--- a/src/java.desktop/share/native/libfreetype/src/sfnt/ttcpal.h
+++ b/src/java.desktop/share/native/libfreetype/src/sfnt/ttcpal.h
@@ -4,7 +4,7 @@
  *
  *   TrueType and OpenType color palette support (specification).
  *
- * Copyright (C) 2018-2023 by
+ * Copyright (C) 2018-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * Originally written by Shao Yu Zhang <shaozhang@fb.com>.
diff --git a/src/java.desktop/share/native/libfreetype/src/sfnt/ttkern.c b/src/java.desktop/share/native/libfreetype/src/sfnt/ttkern.c
index a47d08bd6de..f0411366af4 100644
--- a/src/java.desktop/share/native/libfreetype/src/sfnt/ttkern.c
+++ b/src/java.desktop/share/native/libfreetype/src/sfnt/ttkern.c
@@ -5,7 +5,7 @@
  *   Load the basic TrueType kerning table.  This doesn't handle
  *   kerning data within the GPOS table at the moment.
  *
- * Copyright (C) 1996-2023 by
+ * Copyright (C) 1996-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/src/java.desktop/share/native/libfreetype/src/sfnt/ttkern.h b/src/java.desktop/share/native/libfreetype/src/sfnt/ttkern.h
index 960c7da4946..a54e51df12d 100644
--- a/src/java.desktop/share/native/libfreetype/src/sfnt/ttkern.h
+++ b/src/java.desktop/share/native/libfreetype/src/sfnt/ttkern.h
@@ -5,7 +5,7 @@
  *   Load the basic TrueType kerning table.  This doesn't handle
  *   kerning data within the GPOS table at the moment.
  *
- * Copyright (C) 1996-2023 by
+ * Copyright (C) 1996-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/src/java.desktop/share/native/libfreetype/src/sfnt/ttload.c b/src/java.desktop/share/native/libfreetype/src/sfnt/ttload.c
index 7b44e9cd2e7..c3a5fae2cb9 100644
--- a/src/java.desktop/share/native/libfreetype/src/sfnt/ttload.c
+++ b/src/java.desktop/share/native/libfreetype/src/sfnt/ttload.c
@@ -5,7 +5,7 @@
  *   Load the basic TrueType tables, i.e., tables that can be either in
  *   TTF or OTF fonts (body).
  *
- * Copyright (C) 1996-2023 by
+ * Copyright (C) 1996-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
@@ -1046,7 +1046,7 @@
   FT_LOCAL_DEF( void )
   tt_face_free_name( TT_Face  face )
   {
-    FT_Memory     memory = face->root.driver->root.memory;
+    FT_Memory     memory = face->root.memory;
     TT_NameTable  table  = &face->name_table;
 
 
diff --git a/src/java.desktop/share/native/libfreetype/src/sfnt/ttload.h b/src/java.desktop/share/native/libfreetype/src/sfnt/ttload.h
index 1499dd5735f..2b1d62d9bd9 100644
--- a/src/java.desktop/share/native/libfreetype/src/sfnt/ttload.h
+++ b/src/java.desktop/share/native/libfreetype/src/sfnt/ttload.h
@@ -5,7 +5,7 @@
  *   Load the basic TrueType tables, i.e., tables that can be either in
  *   TTF or OTF fonts (specification).
  *
- * Copyright (C) 1996-2023 by
+ * Copyright (C) 1996-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/src/java.desktop/share/native/libfreetype/src/sfnt/ttmtx.c b/src/java.desktop/share/native/libfreetype/src/sfnt/ttmtx.c
index 38ee9ae728a..27884118563 100644
--- a/src/java.desktop/share/native/libfreetype/src/sfnt/ttmtx.c
+++ b/src/java.desktop/share/native/libfreetype/src/sfnt/ttmtx.c
@@ -4,7 +4,7 @@
  *
  *   Load the metrics tables common to TTF and OTF fonts (body).
  *
- * Copyright (C) 2006-2023 by
+ * Copyright (C) 2006-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/src/java.desktop/share/native/libfreetype/src/sfnt/ttmtx.h b/src/java.desktop/share/native/libfreetype/src/sfnt/ttmtx.h
index 56d2b627661..34b3c0e18f2 100644
--- a/src/java.desktop/share/native/libfreetype/src/sfnt/ttmtx.h
+++ b/src/java.desktop/share/native/libfreetype/src/sfnt/ttmtx.h
@@ -4,7 +4,7 @@
  *
  *   Load the metrics tables common to TTF and OTF fonts (specification).
  *
- * Copyright (C) 2006-2023 by
+ * Copyright (C) 2006-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/src/java.desktop/share/native/libfreetype/src/sfnt/ttpost.c b/src/java.desktop/share/native/libfreetype/src/sfnt/ttpost.c
index 1dfad4298bd..5698a62c8d1 100644
--- a/src/java.desktop/share/native/libfreetype/src/sfnt/ttpost.c
+++ b/src/java.desktop/share/native/libfreetype/src/sfnt/ttpost.c
@@ -5,7 +5,7 @@
  *   PostScript name table processing for TrueType and OpenType fonts
  *   (body).
  *
- * Copyright (C) 1996-2023 by
+ * Copyright (C) 1996-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
@@ -204,8 +204,8 @@
     /* now load the name strings */
     if ( num_names )
     {
-      FT_ULong   p;
-      FT_Byte*   strings;
+      FT_Byte*   p;
+      FT_Byte*   p_end;
 
 
       post_len -= (FT_ULong)num_glyphs * 2;
@@ -214,36 +214,36 @@
                                     post_len + 1 ) )
         goto Fail;
 
-      strings = (FT_Byte*)( name_strings + num_names );
-      if ( FT_STREAM_READ( strings, post_len ) )
+      p = (FT_Byte*)( name_strings + num_names );
+      if ( FT_STREAM_READ( p, post_len ) )
         goto Fail;
 
+      p_end = p + post_len;
+
       /* convert from Pascal- to C-strings and set pointers */
-      for ( p = 0, n = 0; p < post_len && n < num_names; n++ )
+      for ( n = 0; p < p_end && n < num_names; n++ )
       {
-        FT_UInt  len = strings[p];
+        FT_UInt  len = *p;
 
 
-        if ( len > 63U )
-        {
-          error = FT_THROW( Invalid_File_Format );
-          goto Fail;
-        }
+        /* names in the Adobe Glyph List are shorter than 40 characters */
+        if ( len >= 40U )
+          FT_TRACE4(( "load_format_20: unusual %u-char name found\n", len ));
 
-        strings[p]      = 0;
-        name_strings[n] = strings + p + 1;
-        p              += len + 1;
+        *p++            = 0;
+        name_strings[n] = p;
+        p              += len;
       }
-      strings[post_len] = 0;
+      *p_end = 0;
 
       /* deal with missing or insufficient string data */
       if ( n < num_names )
       {
         FT_TRACE4(( "load_format_20: %hu PostScript names are truncated\n",
-                    num_names - n ));
+                    (FT_UShort)( num_names - n ) ));
 
         for ( ; n < num_names; n++ )
-          name_strings[n] = strings + post_len;
+          name_strings[n] = p_end;
       }
     }
 
@@ -436,13 +436,8 @@
 
     format = face->postscript.FormatType;
 
-    if ( format == 0x00010000L )
-    {
-      if ( idx < 258 )                    /* paranoid checking */
-        *PSname = MAC_NAME( idx );
-    }
-    else if ( format == 0x00020000L ||
-              format == 0x00025000L )
+    if ( format == 0x00020000L ||
+         format == 0x00025000L )
     {
       TT_Post_Names  names = &face->postscript_names;
 
@@ -466,6 +461,11 @@
       }
     }
 
+    /* version 1.0 is only valid with 258 glyphs */
+    else if ( format == 0x00010000L              &&
+              face->max_profile.numGlyphs == 258 )
+      *PSname = MAC_NAME( idx );
+
     /* nothing to do for format == 0x00030000L */
 
   End:
diff --git a/src/java.desktop/share/native/libfreetype/src/sfnt/ttpost.h b/src/java.desktop/share/native/libfreetype/src/sfnt/ttpost.h
index 528f1c5f2f2..150db6c3981 100644
--- a/src/java.desktop/share/native/libfreetype/src/sfnt/ttpost.h
+++ b/src/java.desktop/share/native/libfreetype/src/sfnt/ttpost.h
@@ -5,7 +5,7 @@
  *   PostScript name table processing for TrueType and OpenType fonts
  *   (specification).
  *
- * Copyright (C) 1996-2023 by
+ * Copyright (C) 1996-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/src/java.desktop/share/native/libfreetype/src/sfnt/ttsbit.c b/src/java.desktop/share/native/libfreetype/src/sfnt/ttsbit.c
index 03f90a628d6..cb3a8abf182 100644
--- a/src/java.desktop/share/native/libfreetype/src/sfnt/ttsbit.c
+++ b/src/java.desktop/share/native/libfreetype/src/sfnt/ttsbit.c
@@ -4,7 +4,7 @@
  *
  *   TrueType and OpenType embedded bitmap support (body).
  *
- * Copyright (C) 2005-2023 by
+ * Copyright (C) 2005-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * Copyright 2013 by Google, Inc.
diff --git a/src/java.desktop/share/native/libfreetype/src/sfnt/ttsbit.h b/src/java.desktop/share/native/libfreetype/src/sfnt/ttsbit.h
index 07e2db461a5..96f80a58424 100644
--- a/src/java.desktop/share/native/libfreetype/src/sfnt/ttsbit.h
+++ b/src/java.desktop/share/native/libfreetype/src/sfnt/ttsbit.h
@@ -4,7 +4,7 @@
  *
  *   TrueType and OpenType embedded bitmap support (specification).
  *
- * Copyright (C) 1996-2023 by
+ * Copyright (C) 1996-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/src/java.desktop/share/native/libfreetype/src/sfnt/woff2tags.c b/src/java.desktop/share/native/libfreetype/src/sfnt/woff2tags.c
index eeedd9906be..532ccfa1737 100644
--- a/src/java.desktop/share/native/libfreetype/src/sfnt/woff2tags.c
+++ b/src/java.desktop/share/native/libfreetype/src/sfnt/woff2tags.c
@@ -4,7 +4,7 @@
  *
  *   WOFF2 Font table tags (base).
  *
- * Copyright (C) 2019-2023 by
+ * Copyright (C) 2019-2024 by
  * Nikhil Ramakrishnan, David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/src/java.desktop/share/native/libfreetype/src/sfnt/woff2tags.h b/src/java.desktop/share/native/libfreetype/src/sfnt/woff2tags.h
index 1201848e5ec..d03b4b41bc9 100644
--- a/src/java.desktop/share/native/libfreetype/src/sfnt/woff2tags.h
+++ b/src/java.desktop/share/native/libfreetype/src/sfnt/woff2tags.h
@@ -4,7 +4,7 @@
  *
  *   WOFF2 Font table tags (specification).
  *
- * Copyright (C) 2019-2023 by
+ * Copyright (C) 2019-2024 by
  * Nikhil Ramakrishnan, David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/src/java.desktop/share/native/libfreetype/src/smooth/ftgrays.c b/src/java.desktop/share/native/libfreetype/src/smooth/ftgrays.c
index 0918272f870..b7c0632a6fa 100644
--- a/src/java.desktop/share/native/libfreetype/src/smooth/ftgrays.c
+++ b/src/java.desktop/share/native/libfreetype/src/smooth/ftgrays.c
@@ -4,7 +4,7 @@
  *
  *   A new `perfect' anti-aliasing renderer (body).
  *
- * Copyright (C) 2000-2023 by
+ * Copyright (C) 2000-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
@@ -489,7 +489,7 @@ typedef ptrdiff_t  FT_PtrDist;
 
   typedef struct  gray_TWorker_
   {
-    ft_jmp_buf  jump_buffer;
+    FT_BBox     cbox;
 
     TCoord  min_ex, max_ex;  /* min and max integer pixel coordinates */
     TCoord  min_ey, max_ey;
@@ -510,6 +510,8 @@ typedef ptrdiff_t  FT_PtrDist;
     FT_Raster_Span_Func  render_span;
     void*                render_span_data;
 
+    ft_jmp_buf  jump_buffer;
+
   } gray_TWorker, *gray_PWorker;
 
 #if defined( _MSC_VER )
@@ -997,49 +999,12 @@ typedef ptrdiff_t  FT_PtrDist;
 #endif
 
   /*
-   * Benchmarking shows that using DDA to flatten the quadratic Bézier arcs
-   * is slightly faster in the following cases:
-   *
-   *   - When the host CPU is 64-bit.
-   *   - When SSE2 SIMD registers and instructions are available (even on
-   *     x86).
-   *
-   * For other cases, using binary splits is actually slightly faster.
+   * For now, the code that uses DDA to render conic curves requires
+   * `FT_Int64` to be defined.  See for example
+   *    https://gitlab.freedesktop.org/freetype/freetype/-/issues/1071.
    */
-#if ( defined( __SSE2__ )                          ||   \
-      defined( __x86_64__ )                        ||   \
-      defined( _M_AMD64 )                          ||   \
-      ( defined( _M_IX86_FP ) && _M_IX86_FP >= 2 ) ) && \
-    !defined( __VMS )
-#  define FT_SSE2 1
-#else
-#  define FT_SSE2 0
-#endif
 
-#if FT_SSE2                || \
-    defined( __aarch64__ ) || \
-    defined( _M_ARM64 )
-#  define BEZIER_USE_DDA  1
-#else
-#  define BEZIER_USE_DDA  0
-#endif
-
-  /*
-   * For now, the code that depends on `BEZIER_USE_DDA` requires `FT_Int64`
-   * to be defined.  If `FT_INT64` is not defined, meaning there is no
-   * 64-bit type available, disable it to avoid compilation errors.  See for
-   * example https://gitlab.freedesktop.org/freetype/freetype/-/issues/1071.
-   */
-#if !defined( FT_INT64 )
-#  undef BEZIER_USE_DDA
-#  define BEZIER_USE_DDA  0
-#endif
-
-#if BEZIER_USE_DDA
-
-#if FT_SSE2
-#  include <emmintrin.h>
-#endif
+#ifdef FT_INT64
 
 #define LEFT_SHIFT( a, b )  (FT_Int64)( (FT_UInt64)(a) << (b) )
 
@@ -1095,16 +1060,17 @@ typedef ptrdiff_t  FT_PtrDist;
       return;
     }
 
-    /* We can calculate the number of necessary bisections because  */
+    /* We can calculate the number of necessary segments because    */
     /* each bisection predictably reduces deviation exactly 4-fold. */
     /* Even 32-bit deviation would vanish after 16 bisections.      */
-    shift = 0;
+    shift = 16;
     do
     {
-      dx   >>= 2;
-      shift += 1;
+      dx >>= 2;
+      shift--;
 
     } while ( dx > ONE_PIXEL / 4 );
+    count = 0x10000U >> shift;
 
     /*
      * The (P0,P1,P2) arc equation, for t in [0,1] range:
@@ -1150,75 +1116,19 @@ typedef ptrdiff_t  FT_PtrDist;
      *             = (B << (33 - N)) + (A << (32 - 2*N))
      */
 
-#if FT_SSE2
-    /* Experience shows that for small shift values, */
-    /* SSE2 is actually slower.                      */
-    if ( shift > 2 )
-    {
-      union
-      {
-        struct { FT_Int64  ax, ay, bx, by; }  i;
-        struct { __m128i  a, b; }  vec;
+    rx = LEFT_SHIFT( ax, shift + shift );
+    ry = LEFT_SHIFT( ay, shift + shift );
 
-      } u;
+    qx = LEFT_SHIFT( bx, shift + 17 ) + rx;
+    qy = LEFT_SHIFT( by, shift + 17 ) + ry;
 
-      union
-      {
-        struct { FT_Int32  px_lo, px_hi, py_lo, py_hi; }  i;
-        __m128i  vec;
-
-      } v;
-
-      __m128i  a, b;
-      __m128i  r, q, q2;
-      __m128i  p;
-
-
-      u.i.ax = ax;
-      u.i.ay = ay;
-      u.i.bx = bx;
-      u.i.by = by;
-
-      a = _mm_load_si128( &u.vec.a );
-      b = _mm_load_si128( &u.vec.b );
-
-      r  = _mm_slli_epi64( a, 33 - 2 * shift );
-      q  = _mm_slli_epi64( b, 33 - shift );
-      q2 = _mm_slli_epi64( a, 32 - 2 * shift );
-
-      q = _mm_add_epi64( q2, q );
-
-      v.i.px_lo = 0;
-      v.i.px_hi = p0.x;
-      v.i.py_lo = 0;
-      v.i.py_hi = p0.y;
-
-      p = _mm_load_si128( &v.vec );
-
-      for ( count = 1U << shift; count > 0; count-- )
-      {
-        p = _mm_add_epi64( p, q );
-        q = _mm_add_epi64( q, r );
-
-        _mm_store_si128( &v.vec, p );
-
-        gray_render_line( RAS_VAR_ v.i.px_hi, v.i.py_hi );
-      }
-
-      return;
-    }
-#endif  /* FT_SSE2 */
-
-    rx = LEFT_SHIFT( ax, 33 - 2 * shift );
-    ry = LEFT_SHIFT( ay, 33 - 2 * shift );
-
-    qx = LEFT_SHIFT( bx, 33 - shift ) + LEFT_SHIFT( ax, 32 - 2 * shift );
-    qy = LEFT_SHIFT( by, 33 - shift ) + LEFT_SHIFT( ay, 32 - 2 * shift );
+    rx *= 2;
+    ry *= 2;
 
     px = LEFT_SHIFT( p0.x, 32 );
     py = LEFT_SHIFT( p0.y, 32 );
 
-    for ( count = 1U << shift; count > 0; count-- )
+    do
     {
       px += qx;
       py += qy;
@@ -1227,10 +1137,10 @@ typedef ptrdiff_t  FT_PtrDist;
 
       gray_render_line( RAS_VAR_ (FT_Pos)( px >> 32 ),
                                  (FT_Pos)( py >> 32 ) );
-    }
+    } while ( --count );
   }
 
-#else  /* !BEZIER_USE_DDA */
+#else  /* !FT_INT64 */
 
   /*
    * Note that multiple attempts to speed up the function below
@@ -1324,7 +1234,7 @@ typedef ptrdiff_t  FT_PtrDist;
     } while ( --draw );
   }
 
-#endif  /* !BEZIER_USE_DDA */
+#endif  /* !FT_INT64 */
 
 
   /*
@@ -1486,139 +1396,6 @@ typedef ptrdiff_t  FT_PtrDist;
   }
 
 
-  static void
-  gray_sweep( RAS_ARG )
-  {
-    int  fill = ( ras.outline.flags & FT_OUTLINE_EVEN_ODD_FILL ) ? 0x100
-                                                                 : INT_MIN;
-    int  coverage;
-    int  y;
-
-
-    for ( y = ras.min_ey; y < ras.max_ey; y++ )
-    {
-      PCell   cell  = ras.ycells[y - ras.min_ey];
-      TCoord  x     = ras.min_ex;
-      TArea   cover = 0;
-
-      unsigned char*  line = ras.target.origin - ras.target.pitch * y;
-
-
-      for ( ; cell != ras.cell_null; cell = cell->next )
-      {
-        TArea  area;
-
-
-        if ( cover != 0 && cell->x > x )
-        {
-          FT_FILL_RULE( coverage, cover, fill );
-          FT_GRAY_SET( line + x, coverage, cell->x - x );
-        }
-
-        cover += (TArea)cell->cover * ( ONE_PIXEL * 2 );
-        area   = cover - cell->area;
-
-        if ( area != 0 && cell->x >= ras.min_ex )
-        {
-          FT_FILL_RULE( coverage, area, fill );
-          line[cell->x] = (unsigned char)coverage;
-        }
-
-        x = cell->x + 1;
-      }
-
-      if ( cover != 0 )  /* only if cropped */
-      {
-        FT_FILL_RULE( coverage, cover, fill );
-        FT_GRAY_SET( line + x, coverage, ras.max_ex - x );
-      }
-    }
-  }
-
-
-  static void
-  gray_sweep_direct( RAS_ARG )
-  {
-    int  fill = ( ras.outline.flags & FT_OUTLINE_EVEN_ODD_FILL ) ? 0x100
-                                                                 : INT_MIN;
-    int  coverage;
-    int  y;
-
-    FT_Span  span[FT_MAX_GRAY_SPANS];
-    int      n = 0;
-
-
-    for ( y = ras.min_ey; y < ras.max_ey; y++ )
-    {
-      PCell   cell  = ras.ycells[y - ras.min_ey];
-      TCoord  x     = ras.min_ex;
-      TArea   cover = 0;
-
-
-      for ( ; cell != ras.cell_null; cell = cell->next )
-      {
-        TArea  area;
-
-
-        if ( cover != 0 && cell->x > x )
-        {
-          FT_FILL_RULE( coverage, cover, fill );
-
-          span[n].coverage = (unsigned char)coverage;
-          span[n].x        = (short)x;
-          span[n].len      = (unsigned short)( cell->x - x );
-
-          if ( ++n == FT_MAX_GRAY_SPANS )
-          {
-            /* flush the span buffer and reset the count */
-            ras.render_span( y, n, span, ras.render_span_data );
-            n = 0;
-          }
-        }
-
-        cover += (TArea)cell->cover * ( ONE_PIXEL * 2 );
-        area   = cover - cell->area;
-
-        if ( area != 0 && cell->x >= ras.min_ex )
-        {
-          FT_FILL_RULE( coverage, area, fill );
-
-          span[n].coverage = (unsigned char)coverage;
-          span[n].x        = (short)cell->x;
-          span[n].len      = 1;
-
-          if ( ++n == FT_MAX_GRAY_SPANS )
-          {
-            /* flush the span buffer and reset the count */
-            ras.render_span( y, n, span, ras.render_span_data );
-            n = 0;
-          }
-        }
-
-        x = cell->x + 1;
-      }
-
-      if ( cover != 0 )  /* only if cropped */
-      {
-        FT_FILL_RULE( coverage, cover, fill );
-
-        span[n].coverage = (unsigned char)coverage;
-        span[n].x        = (short)x;
-        span[n].len      = (unsigned short)( ras.max_ex - x );
-
-        ++n;
-      }
-
-      if ( n )
-      {
-        /* flush the span buffer and reset the count */
-        ras.render_span( y, n, span, ras.render_span_data );
-        n = 0;
-      }
-    }
-  }
-
-
 #ifdef STANDALONE_
 
   /**************************************************************************
@@ -1934,7 +1711,7 @@ typedef ptrdiff_t  FT_PtrDist;
       if ( continued )
         FT_Trace_Enable();
 
-      FT_TRACE7(( "band [%d..%d]: %td cell%s remaining/\n",
+      FT_TRACE7(( "band [%d..%d]: %td cell%s remaining\n",
                   ras.min_ey,
                   ras.max_ey,
                   ras.cell_null - ras.cell_free,
@@ -1952,14 +1729,144 @@ typedef ptrdiff_t  FT_PtrDist;
   }
 
 
+  static void
+  gray_sweep( RAS_ARG )
+  {
+    int  fill = ( ras.outline.flags & FT_OUTLINE_EVEN_ODD_FILL ) ? 0x100
+                                                                 : INT_MIN;
+    int  coverage;
+    int  y;
+
+
+    for ( y = ras.min_ey; y < ras.max_ey; y++ )
+    {
+      PCell   cell  = ras.ycells[y - ras.min_ey];
+      TCoord  x     = ras.min_ex;
+      TArea   cover = 0;
+
+      unsigned char*  line = ras.target.origin - ras.target.pitch * y;
+
+
+      for ( ; cell != ras.cell_null; cell = cell->next )
+      {
+        TArea  area;
+
+
+        if ( cover != 0 && cell->x > x )
+        {
+          FT_FILL_RULE( coverage, cover, fill );
+          FT_GRAY_SET( line + x, coverage, cell->x - x );
+        }
+
+        cover += (TArea)cell->cover * ( ONE_PIXEL * 2 );
+        area   = cover - cell->area;
+
+        if ( area != 0 && cell->x >= ras.min_ex )
+        {
+          FT_FILL_RULE( coverage, area, fill );
+          line[cell->x] = (unsigned char)coverage;
+        }
+
+        x = cell->x + 1;
+      }
+
+      if ( cover != 0 )  /* only if cropped */
+      {
+        FT_FILL_RULE( coverage, cover, fill );
+        FT_GRAY_SET( line + x, coverage, ras.max_ex - x );
+      }
+    }
+  }
+
+
+  static void
+  gray_sweep_direct( RAS_ARG )
+  {
+    int  fill = ( ras.outline.flags & FT_OUTLINE_EVEN_ODD_FILL ) ? 0x100
+                                                                 : INT_MIN;
+    int  coverage;
+    int  y;
+
+    FT_Span  span[FT_MAX_GRAY_SPANS];
+    int      n = 0;
+
+
+    for ( y = ras.min_ey; y < ras.max_ey; y++ )
+    {
+      PCell   cell  = ras.ycells[y - ras.min_ey];
+      TCoord  x     = ras.min_ex;
+      TArea   cover = 0;
+
+
+      for ( ; cell != ras.cell_null; cell = cell->next )
+      {
+        TArea  area;
+
+
+        if ( cover != 0 && cell->x > x )
+        {
+          FT_FILL_RULE( coverage, cover, fill );
+
+          span[n].coverage = (unsigned char)coverage;
+          span[n].x        = (short)x;
+          span[n].len      = (unsigned short)( cell->x - x );
+
+          if ( ++n == FT_MAX_GRAY_SPANS )
+          {
+            /* flush the span buffer and reset the count */
+            ras.render_span( y, n, span, ras.render_span_data );
+            n = 0;
+          }
+        }
+
+        cover += (TArea)cell->cover * ( ONE_PIXEL * 2 );
+        area   = cover - cell->area;
+
+        if ( area != 0 && cell->x >= ras.min_ex )
+        {
+          FT_FILL_RULE( coverage, area, fill );
+
+          span[n].coverage = (unsigned char)coverage;
+          span[n].x        = (short)cell->x;
+          span[n].len      = 1;
+
+          if ( ++n == FT_MAX_GRAY_SPANS )
+          {
+            /* flush the span buffer and reset the count */
+            ras.render_span( y, n, span, ras.render_span_data );
+            n = 0;
+          }
+        }
+
+        x = cell->x + 1;
+      }
+
+      if ( cover != 0 )  /* only if cropped */
+      {
+        FT_FILL_RULE( coverage, cover, fill );
+
+        span[n].coverage = (unsigned char)coverage;
+        span[n].x        = (short)x;
+        span[n].len      = (unsigned short)( ras.max_ex - x );
+
+        ++n;
+      }
+
+      if ( n )
+      {
+        /* flush the span buffer and reset the count */
+        ras.render_span( y, n, span, ras.render_span_data );
+        n = 0;
+      }
+    }
+  }
+
+
   static int
   gray_convert_glyph( RAS_ARG )
   {
-    const TCoord  yMin = ras.min_ey;
-    const TCoord  yMax = ras.max_ey;
-
     TCell    buffer[FT_MAX_GRAY_POOL];
-    size_t   height = (size_t)( yMax - yMin );
+    size_t   height = (size_t)( ras.cbox.yMax - ras.cbox.yMin );
     size_t   n = FT_MAX_GRAY_POOL / 8;
     TCoord   y;
     TCoord   bands[32];  /* enough to accommodate bisections */
@@ -1985,35 +1892,36 @@ typedef ptrdiff_t  FT_PtrDist;
       height  = ( height + n - 1 ) / n;
     }
 
-    for ( y = yMin; y < yMax; )
+    for ( y = ras.cbox.yMin; y < ras.cbox.yMax; )
     {
       ras.min_ey = y;
       y         += height;
-      ras.max_ey = FT_MIN( y, yMax );
+      ras.max_ey = FT_MIN( y, ras.cbox.yMax );
+
+      ras.count_ey = ras.max_ey - ras.min_ey;
 
       band    = bands;
-      band[1] = ras.min_ey;
-      band[0] = ras.max_ey;
+      band[1] = ras.cbox.xMin;
+      band[0] = ras.cbox.xMax;
 
       do
       {
-        TCoord  width = band[0] - band[1];
-        TCoord  w;
+        TCoord  i;
         int     error;
 
 
-        for ( w = 0; w < width; ++w )
-          ras.ycells[w] = ras.cell_null;
+        ras.min_ex = band[1];
+        ras.max_ex = band[0];
 
-        /* memory management: skip ycells */
-        n = ( (size_t)width * sizeof ( PCell ) + sizeof ( TCell ) - 1 ) /
-              sizeof ( TCell );
+        /* memory management: zero out and skip ycells */
+        for ( i = 0; i < ras.count_ey; ++i )
+          ras.ycells[i] = ras.cell_null;
+
+        n = ( (size_t)ras.count_ey * sizeof ( PCell ) + sizeof ( TCell ) - 1 )
+              / sizeof ( TCell );
 
         ras.cell_free = buffer + n;
         ras.cell      = ras.cell_null;
-        ras.min_ey    = band[1];
-        ras.max_ey    = band[0];
-        ras.count_ey  = width;
 
         error     = gray_convert_glyph_inner( RAS_VAR_ continued );
         continued = 1;
@@ -2031,10 +1939,10 @@ typedef ptrdiff_t  FT_PtrDist;
           return error;
 
         /* render pool overflow; we will reduce the render band by half */
-        width >>= 1;
+        i = ( band[0] - band[1] ) >> 1;
 
         /* this should never happen even with tiny rendering pool */
-        if ( width == 0 )
+        if ( i == 0 )
         {
           FT_TRACE7(( "gray_convert_glyph: rotten glyph\n" ));
           return FT_THROW( Raster_Overflow );
@@ -2042,7 +1950,7 @@ typedef ptrdiff_t  FT_PtrDist;
 
         band++;
         band[1]  = band[0];
-        band[0] += width;
+        band[0] += i;
       } while ( band >= bands );
     }
 
@@ -2073,7 +1981,7 @@ typedef ptrdiff_t  FT_PtrDist;
       return FT_THROW( Invalid_Outline );
 
     /* return immediately if the outline is empty */
-    if ( outline->n_points == 0 || outline->n_contours <= 0 )
+    if ( outline->n_points == 0 || outline->n_contours == 0 )
       return Smooth_Err_Ok;
 
     if ( !outline->contours || !outline->points )
@@ -2093,10 +2001,7 @@ typedef ptrdiff_t  FT_PtrDist;
       ras.render_span      = (FT_Raster_Span_Func)params->gray_spans;
       ras.render_span_data = params->user;
 
-      ras.min_ex = params->clip_box.xMin;
-      ras.min_ey = params->clip_box.yMin;
-      ras.max_ex = params->clip_box.xMax;
-      ras.max_ey = params->clip_box.yMax;
+      ras.cbox = params->clip_box;
     }
     else
     {
@@ -2122,14 +2027,14 @@ typedef ptrdiff_t  FT_PtrDist;
       ras.render_span      = (FT_Raster_Span_Func)NULL;
       ras.render_span_data = NULL;
 
-      ras.min_ex = 0;
-      ras.min_ey = 0;
-      ras.max_ex = (FT_Pos)target_map->width;
-      ras.max_ey = (FT_Pos)target_map->rows;
+      ras.cbox.xMin = 0;
+      ras.cbox.yMin = 0;
+      ras.cbox.xMax = (FT_Pos)target_map->width;
+      ras.cbox.yMax = (FT_Pos)target_map->rows;
     }
 
     /* exit if nothing to do */
-    if ( ras.max_ex <= ras.min_ex || ras.max_ey <= ras.min_ey )
+    if ( ras.cbox.xMin >= ras.cbox.xMax || ras.cbox.yMin >= ras.cbox.yMax )
       return Smooth_Err_Ok;
 
     return gray_convert_glyph( RAS_VAR );
diff --git a/src/java.desktop/share/native/libfreetype/src/smooth/ftgrays.h b/src/java.desktop/share/native/libfreetype/src/smooth/ftgrays.h
index a5001bf40d3..940fbe8c79b 100644
--- a/src/java.desktop/share/native/libfreetype/src/smooth/ftgrays.h
+++ b/src/java.desktop/share/native/libfreetype/src/smooth/ftgrays.h
@@ -4,7 +4,7 @@
  *
  *   FreeType smooth renderer declaration
  *
- * Copyright (C) 1996-2023 by
+ * Copyright (C) 1996-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/src/java.desktop/share/native/libfreetype/src/smooth/ftsmerrs.h b/src/java.desktop/share/native/libfreetype/src/smooth/ftsmerrs.h
index f4ac93dc410..6d41fb8e0fd 100644
--- a/src/java.desktop/share/native/libfreetype/src/smooth/ftsmerrs.h
+++ b/src/java.desktop/share/native/libfreetype/src/smooth/ftsmerrs.h
@@ -4,7 +4,7 @@
  *
  *   smooth renderer error codes (specification only).
  *
- * Copyright (C) 2001-2023 by
+ * Copyright (C) 2001-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/src/java.desktop/share/native/libfreetype/src/smooth/ftsmooth.c b/src/java.desktop/share/native/libfreetype/src/smooth/ftsmooth.c
index 9b0e8886cb3..f0acc1ea4a6 100644
--- a/src/java.desktop/share/native/libfreetype/src/smooth/ftsmooth.c
+++ b/src/java.desktop/share/native/libfreetype/src/smooth/ftsmooth.c
@@ -4,7 +4,7 @@
  *
  *   Anti-aliasing renderer interface (body).
  *
- * Copyright (C) 2000-2023 by
+ * Copyright (C) 2000-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/src/java.desktop/share/native/libfreetype/src/smooth/ftsmooth.h b/src/java.desktop/share/native/libfreetype/src/smooth/ftsmooth.h
index f8bdc9938b3..d7b61a9e60e 100644
--- a/src/java.desktop/share/native/libfreetype/src/smooth/ftsmooth.h
+++ b/src/java.desktop/share/native/libfreetype/src/smooth/ftsmooth.h
@@ -4,7 +4,7 @@
  *
  *   Anti-aliasing renderer interface (specification).
  *
- * Copyright (C) 1996-2023 by
+ * Copyright (C) 1996-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/src/java.desktop/share/native/libfreetype/src/truetype/ttdriver.c b/src/java.desktop/share/native/libfreetype/src/truetype/ttdriver.c
index d1496fec7fa..4ab68eb9a12 100644
--- a/src/java.desktop/share/native/libfreetype/src/truetype/ttdriver.c
+++ b/src/java.desktop/share/native/libfreetype/src/truetype/ttdriver.c
@@ -4,7 +4,7 @@
  *
  *   TrueType font driver implementation (body).
  *
- * Copyright (C) 1996-2023 by
+ * Copyright (C) 1996-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
@@ -217,7 +217,20 @@
     kerning->y = 0;
 
     if ( sfnt )
-      kerning->x = sfnt->get_kerning( ttface, left_glyph, right_glyph );
+    {
+      /* Use 'kern' table if available since that can be faster; otherwise */
+      /* use GPOS kerning pairs if available.                              */
+      if ( ttface->kern_avail_bits != 0 )
+        kerning->x = sfnt->get_kerning( ttface,
+                                        left_glyph,
+                                        right_glyph );
+#ifdef TT_CONFIG_OPTION_GPOS_KERNING
+      else if ( ttface->gpos_kerning_available )
+        kerning->x = sfnt->get_gpos_kerning( ttface,
+                                             left_glyph,
+                                             right_glyph );
+#endif
+    }
 
     return 0;
   }
diff --git a/src/java.desktop/share/native/libfreetype/src/truetype/ttdriver.h b/src/java.desktop/share/native/libfreetype/src/truetype/ttdriver.h
index 757a66f425d..3e1cf234fcf 100644
--- a/src/java.desktop/share/native/libfreetype/src/truetype/ttdriver.h
+++ b/src/java.desktop/share/native/libfreetype/src/truetype/ttdriver.h
@@ -4,7 +4,7 @@
  *
  *   High-level TrueType driver interface (specification).
  *
- * Copyright (C) 1996-2023 by
+ * Copyright (C) 1996-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/src/java.desktop/share/native/libfreetype/src/truetype/tterrors.h b/src/java.desktop/share/native/libfreetype/src/truetype/tterrors.h
index 008ee99853c..7ad937bd04d 100644
--- a/src/java.desktop/share/native/libfreetype/src/truetype/tterrors.h
+++ b/src/java.desktop/share/native/libfreetype/src/truetype/tterrors.h
@@ -4,7 +4,7 @@
  *
  *   TrueType error codes (specification only).
  *
- * Copyright (C) 2001-2023 by
+ * Copyright (C) 2001-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/src/java.desktop/share/native/libfreetype/src/truetype/ttgload.c b/src/java.desktop/share/native/libfreetype/src/truetype/ttgload.c
index dc427e8a116..b656ccf04e3 100644
--- a/src/java.desktop/share/native/libfreetype/src/truetype/ttgload.c
+++ b/src/java.desktop/share/native/libfreetype/src/truetype/ttgload.c
@@ -4,7 +4,7 @@
  *
  *   TrueType Glyph Loader (body).
  *
- * Copyright (C) 1996-2023 by
+ * Copyright (C) 1996-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
@@ -353,7 +353,8 @@
     FT_Byte         c, count;
     FT_Vector       *vec, *vec_limit;
     FT_Pos          x, y;
-    FT_Short        *cont, *cont_limit, last;
+    FT_UShort       *cont, *cont_limit;
+    FT_Int          last;
 
 
     /* check that we can add the contours to the glyph */
@@ -372,7 +373,7 @@
     last = -1;
     for ( ; cont < cont_limit; cont++ )
     {
-      *cont = FT_NEXT_SHORT( p );
+      *cont = FT_NEXT_USHORT( p );
 
       if ( *cont <= last )
         goto Invalid_Outline;
@@ -418,11 +419,9 @@
       /* and thus allocate the bytecode array size by ourselves     */
       if ( n_ins )
       {
-        if ( FT_QNEW_ARRAY( exec->glyphIns, n_ins ) )
+        if ( FT_DUP( exec->glyphIns, p, n_ins ) )
           return error;
 
-        FT_MEM_COPY( exec->glyphIns, p, (FT_Long)n_ins );
-
         exec->glyphSize  = n_ins;
       }
     }
@@ -432,7 +431,7 @@
     p += n_ins;
 
     /* reading the point tags */
-    flag       = (FT_Byte*)outline->tags;
+    flag       = outline->tags;
     flag_limit = flag + n_points;
 
     FT_ASSERT( flag );
@@ -465,7 +464,7 @@
 
     vec       = outline->points;
     vec_limit = vec + n_points;
-    flag      = (FT_Byte*)outline->tags;
+    flag      = outline->tags;
     x         = 0;
 
     for ( ; vec < vec_limit; vec++, flag++ )
@@ -499,7 +498,7 @@
 
     vec       = outline->points;
     vec_limit = vec + n_points;
-    flag      = (FT_Byte*)outline->tags;
+    flag      = outline->tags;
     y         = 0;
 
     for ( ; vec < vec_limit; vec++, flag++ )
@@ -532,8 +531,8 @@
       *flag  = (FT_Byte)( f & ON_CURVE_POINT );
     }
 
-    outline->n_points   = (FT_Short)n_points;
-    outline->n_contours = (FT_Short)n_contours;
+    outline->n_points   = (FT_UShort)n_points;
+    outline->n_contours = (FT_UShort)n_contours;
 
     load->cursor = p;
 
@@ -754,15 +753,13 @@
                    FT_UInt       start_point,
                    FT_UInt       start_contour )
   {
-    zone->n_points    = (FT_UShort)load->outline.n_points + 4 -
-                          (FT_UShort)start_point;
-    zone->n_contours  = load->outline.n_contours -
-                          (FT_Short)start_contour;
+    zone->n_points    = load->outline.n_points + 4 - (FT_UShort)start_point;
+    zone->n_contours  = load->outline.n_contours - (FT_UShort)start_contour;
     zone->org         = load->extra_points + start_point;
     zone->cur         = load->outline.points + start_point;
     zone->orus        = load->extra_points2 + start_point;
-    zone->tags        = (FT_Byte*)load->outline.tags + start_point;
-    zone->contours    = (FT_UShort*)load->outline.contours + start_contour;
+    zone->tags        = load->outline.tags + start_point;
+    zone->contours    = load->outline.contours + start_contour;
     zone->first_point = (FT_UShort)start_point;
   }
 
@@ -1046,7 +1043,7 @@
     current.points   = gloader->base.outline.points +
                          num_base_points;
     current.n_points = gloader->base.outline.n_points -
-                         (short)num_base_points;
+                         (FT_UShort)num_base_points;
 
     have_scale = FT_BOOL( subglyph->flags & ( WE_HAVE_A_SCALE     |
                                               WE_HAVE_AN_XY_SCALE |
@@ -1059,7 +1056,7 @@
     /* get offset */
     if ( !( subglyph->flags & ARGS_ARE_XY_VALUES ) )
     {
-      FT_UInt     num_points = (FT_UInt)gloader->base.outline.n_points;
+      FT_UInt     num_points = gloader->base.outline.n_points;
       FT_UInt     k = (FT_UInt)subglyph->arg1;
       FT_UInt     l = (FT_UInt)subglyph->arg2;
       FT_Vector*  p1;
@@ -1721,8 +1718,8 @@
         FT_List_Add( &loader->composites, node );
       }
 
-      start_point   = (FT_UInt)gloader->base.outline.n_points;
-      start_contour = (FT_UInt)gloader->base.outline.n_contours;
+      start_point   = gloader->base.outline.n_points;
+      start_contour = gloader->base.outline.n_contours;
 
       /* for each subglyph, read composite header */
       error = face->read_composite_glyph( loader );
@@ -1741,14 +1738,14 @@
       if ( FT_IS_NAMED_INSTANCE( FT_FACE( face ) ) ||
            FT_IS_VARIATION( FT_FACE( face ) )      )
       {
-        short        i, limit;
+        FT_UShort    i, limit;
         FT_SubGlyph  subglyph;
 
         FT_Outline  outline = { 0, 0, NULL, NULL, NULL, 0 };
         FT_Vector*  unrounded = NULL;
 
 
-        limit = (short)gloader->current.num_subglyphs;
+        limit = (FT_UShort)gloader->current.num_subglyphs;
 
         /* construct an outline structure for              */
         /* communication with `TT_Vary_Apply_Glyph_Deltas' */
@@ -1874,7 +1871,7 @@
           linear_hadvance = loader->linear;
           linear_vadvance = loader->vadvance;
 
-          num_base_points = (FT_UInt)gloader->base.outline.n_points;
+          num_base_points = gloader->base.outline.n_points;
 
           error = load_truetype_glyph( loader,
                                        (FT_UInt)subglyph->index,
@@ -1898,7 +1895,7 @@
             loader->vadvance = linear_vadvance;
           }
 
-          num_points = (FT_UInt)gloader->base.outline.n_points;
+          num_points = gloader->base.outline.n_points;
 
           if ( num_points == num_base_points )
             continue;
@@ -2313,7 +2310,7 @@
        *
        * 1) we have a `tricky' font that heavily relies on the interpreter to
        *    render glyphs correctly, for example DFKai-SB, or
-       * 2) FT_RENDER_MODE_MONO (i.e, monochome rendering) is requested.
+       * 2) FT_RENDER_MODE_MONO (i.e, monochrome rendering) is requested.
        *
        * In those cases, backward compatibility needs to be turned off to get
        * correct rendering.  The rendering is then completely up to the
@@ -2719,7 +2716,7 @@
          size->metrics->y_ppem < 24         )
       glyph->outline.flags |= FT_OUTLINE_HIGH_PRECISION;
 
-    FT_TRACE1(( "  subglyphs = %u, contours = %hd, points = %hd,"
+    FT_TRACE1(( "  subglyphs = %u, contours = %hu, points = %hu,"
                 " flags = 0x%.3x\n",
                 loader.gloader->base.num_subglyphs,
                 glyph->outline.n_contours,
diff --git a/src/java.desktop/share/native/libfreetype/src/truetype/ttgload.h b/src/java.desktop/share/native/libfreetype/src/truetype/ttgload.h
index f18637dce33..22ea967f301 100644
--- a/src/java.desktop/share/native/libfreetype/src/truetype/ttgload.h
+++ b/src/java.desktop/share/native/libfreetype/src/truetype/ttgload.h
@@ -4,7 +4,7 @@
  *
  *   TrueType Glyph Loader (specification).
  *
- * Copyright (C) 1996-2023 by
+ * Copyright (C) 1996-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/src/java.desktop/share/native/libfreetype/src/truetype/ttgxvar.c b/src/java.desktop/share/native/libfreetype/src/truetype/ttgxvar.c
index 9d149ea365c..4f0083c96b7 100644
--- a/src/java.desktop/share/native/libfreetype/src/truetype/ttgxvar.c
+++ b/src/java.desktop/share/native/libfreetype/src/truetype/ttgxvar.c
@@ -4,7 +4,7 @@
  *
  *   TrueType GX Font Variation loader
  *
- * Copyright (C) 2004-2023 by
+ * Copyright (C) 2004-2024 by
  * David Turner, Robert Wilhelm, Werner Lemberg, and George Williams.
  *
  * This file is part of the FreeType project, and may only be used,
@@ -129,9 +129,6 @@
    *   stream ::
    *     The data stream.
    *
-   *   size ::
-   *     The size of the table holding the data.
-   *
    * @Output:
    *   point_cnt ::
    *     The number of points read.  A zero value means that
@@ -144,14 +141,14 @@
    */
   static FT_UShort*
   ft_var_readpackedpoints( FT_Stream  stream,
-                           FT_ULong   size,
                            FT_UInt   *point_cnt )
   {
     FT_UShort *points = NULL;
     FT_UInt    n;
-    FT_UInt    runcnt;
+    FT_UInt    runcnt, cnt;
     FT_UInt    i, j;
     FT_UShort  first;
+    FT_Byte*   p;
     FT_Memory  memory = stream->memory;
     FT_Error   error;
 
@@ -169,56 +166,60 @@
       n  |= FT_GET_BYTE();
     }
 
-    if ( n > size )
-    {
-      FT_TRACE1(( "ft_var_readpackedpoints: number of points too large\n" ));
-      return NULL;
-    }
-
-    /* in the nested loops below we increase `i' twice; */
-    /* it is faster to simply allocate one more slot    */
-    /* than to add another test within the loop         */
-    if ( FT_QNEW_ARRAY( points, n + 1 ) )
+    if ( FT_QNEW_ARRAY( points, n ) )
       return NULL;
 
-    *point_cnt = n;
-
+    p     = stream->cursor;
     first = 0;
     i     = 0;
     while ( i < n )
     {
-      runcnt = FT_GET_BYTE();
+      if ( p >= stream->limit )
+        goto Fail;
+
+      runcnt = FT_NEXT_BYTE( p );
+      cnt    = runcnt & GX_PT_POINT_RUN_COUNT_MASK;
+
+      /* first point not included in run count */
+      cnt++;
+      if ( cnt > n - i )
+        cnt = n - i;
+
       if ( runcnt & GX_PT_POINTS_ARE_WORDS )
       {
-        runcnt     &= GX_PT_POINT_RUN_COUNT_MASK;
-        first      += FT_GET_USHORT();
-        points[i++] = first;
+        if ( 2 * cnt > (FT_UInt)( stream->limit - p ) )
+          goto Fail;
 
-        /* first point not included in run count */
-        for ( j = 0; j < runcnt; j++ )
+        for ( j = 0; j < cnt; j++ )
         {
-          first      += FT_GET_USHORT();
+          first      += FT_NEXT_USHORT( p );
           points[i++] = first;
-          if ( i >= n )
-            break;
         }
       }
       else
       {
-        first      += FT_GET_BYTE();
-        points[i++] = first;
+        if ( cnt > (FT_UInt)( stream->limit - p ) )
+          goto Fail;
 
-        for ( j = 0; j < runcnt; j++ )
+        for ( j = 0; j < cnt; j++ )
         {
-          first      += FT_GET_BYTE();
+          first      += FT_NEXT_BYTE( p );
           points[i++] = first;
-          if ( i >= n )
-            break;
         }
       }
     }
 
+    stream->cursor = p;
+
+    *point_cnt = n;
+
     return points;
+
+  Fail:
+    FT_TRACE1(( "ft_var_readpackedpoints: invalid table\n" ));
+
+    FT_FREE( points );
+    return NULL;
   }
 
 
@@ -240,9 +241,6 @@
    *   stream ::
    *     The data stream.
    *
-   *   size ::
-   *     The size of the table holding the data.
-   *
    *   delta_cnt ::
    *     The number of deltas to be read.
    *
@@ -258,13 +256,12 @@
    */
   static FT_Fixed*
   ft_var_readpackeddeltas( FT_Stream  stream,
-                           FT_ULong   size,
                            FT_UInt    delta_cnt )
   {
     FT_Fixed  *deltas = NULL;
     FT_UInt    runcnt, cnt;
     FT_UInt    i, j;
-    FT_UInt    bytes_used;
+    FT_Byte*   p;
     FT_Memory  memory = stream->memory;
     FT_Error   error;
 
@@ -272,68 +269,51 @@
     if ( FT_QNEW_ARRAY( deltas, delta_cnt ) )
       return NULL;
 
-    i          = 0;
-    bytes_used = 0;
-
-    while ( i < delta_cnt && bytes_used < size )
+    p = stream->cursor;
+    i = 0;
+    while ( i < delta_cnt )
     {
-      runcnt = FT_GET_BYTE();
+      if ( p >= stream->limit )
+        goto Fail;
+
+      runcnt = FT_NEXT_BYTE( p );
       cnt    = runcnt & GX_DT_DELTA_RUN_COUNT_MASK;
 
-      bytes_used++;
+      /* first point not included in run count */
+      cnt++;
+      if ( cnt > delta_cnt - i )
+        cnt = delta_cnt - i;
 
       if ( runcnt & GX_DT_DELTAS_ARE_ZERO )
       {
-        /* `cnt` + 1 zeroes get added */
-        for ( j = 0; j <= cnt && i < delta_cnt; j++ )
+        for ( j = 0; j < cnt; j++ )
           deltas[i++] = 0;
       }
       else if ( runcnt & GX_DT_DELTAS_ARE_WORDS )
       {
-        /* `cnt` + 1 shorts from the stack */
-        bytes_used += 2 * ( cnt + 1 );
-        if ( bytes_used > size )
-        {
-          FT_TRACE1(( "ft_var_readpackeddeltas:"
-                      " number of short deltas too large\n" ));
+        if ( 2 * cnt > (FT_UInt)( stream->limit - p ) )
           goto Fail;
-        }
 
-        for ( j = 0; j <= cnt && i < delta_cnt; j++ )
-          deltas[i++] = FT_intToFixed( FT_GET_SHORT() );
+        for ( j = 0; j < cnt; j++ )
+          deltas[i++] = FT_intToFixed( FT_NEXT_SHORT( p ) );
       }
       else
       {
-        /* `cnt` + 1 signed bytes from the stack */
-        bytes_used += cnt + 1;
-        if ( bytes_used > size )
-        {
-          FT_TRACE1(( "ft_var_readpackeddeltas:"
-                      " number of byte deltas too large\n" ));
+        if ( cnt > (FT_UInt)( stream->limit - p ) )
           goto Fail;
-        }
 
-        for ( j = 0; j <= cnt && i < delta_cnt; j++ )
-          deltas[i++] = FT_intToFixed( FT_GET_CHAR() );
-      }
-
-      if ( j <= cnt )
-      {
-        FT_TRACE1(( "ft_var_readpackeddeltas:"
-                    " number of deltas too large\n" ));
-        goto Fail;
+        for ( j = 0; j < cnt; j++ )
+          deltas[i++] = FT_intToFixed( FT_NEXT_CHAR( p ) );
       }
     }
 
-    if ( i < delta_cnt )
-    {
-      FT_TRACE1(( "ft_var_readpackeddeltas: not enough deltas\n" ));
-      goto Fail;
-    }
+    stream->cursor = p;
 
     return deltas;
 
   Fail:
+    FT_TRACE1(( "ft_var_readpackeddeltas: invalid table\n" ));
+
     FT_FREE( deltas );
     return NULL;
   }
@@ -596,7 +576,7 @@
 
       for ( j = 0; j < itemStore->axisCount; j++ )
       {
-        FT_Short  start, peak, end;
+        FT_Int  start, peak, end;
 
 
         if ( FT_READ_SHORT( start ) ||
@@ -604,6 +584,10 @@
              FT_READ_SHORT( end )   )
           goto Exit;
 
+        /* immediately tag invalid ranges with special peak = 0 */
+        if ( ( start < 0 && end > 0 ) || start > peak || peak > end )
+          peak = 0;
+
         axisCoords[j].startCoord = FT_fdot14ToFixed( start );
         axisCoords[j].peakCoord  = FT_fdot14ToFixed( peak );
         axisCoords[j].endCoord   = FT_fdot14ToFixed( end );
@@ -1024,6 +1008,9 @@
     if ( innerIndex >= varData->itemCount )
       return 0; /* Out of range. */
 
+    if ( varData->regionIdxCount == 0 )
+      return 0; /* Avoid "applying zero offset to null pointer". */
+
     if ( varData->regionIdxCount < 16 )
     {
       deltaSet = deltaSetStack;
@@ -1074,43 +1061,32 @@
       /* inner loop steps through axes in this region */
       for ( j = 0; j < itemStore->axisCount; j++, axis++ )
       {
-        /* compute the scalar contribution of this axis; */
-        /* ignore invalid ranges                         */
-        if ( axis->startCoord > axis->peakCoord ||
-             axis->peakCoord > axis->endCoord   )
-          continue;
+        FT_Fixed  ncv = ttface->blend->normalizedcoords[j];
 
-        else if ( axis->startCoord < 0 &&
-                  axis->endCoord > 0   &&
-                  axis->peakCoord != 0 )
-          continue;
 
-        /* peak of 0 means ignore this axis */
-        else if ( axis->peakCoord == 0 )
-          continue;
-
-        else if ( ttface->blend->normalizedcoords[j] == axis->peakCoord )
+        /* compute the scalar contribution of this axis */
+        /* with peak of 0 used for invalid axes         */
+        if ( axis->peakCoord == ncv ||
+             axis->peakCoord == 0   )
           continue;
 
         /* ignore this region if coords are out of range */
-        else if ( ttface->blend->normalizedcoords[j] <= axis->startCoord ||
-                  ttface->blend->normalizedcoords[j] >= axis->endCoord   )
+        else if ( ncv <= axis->startCoord ||
+                  ncv >= axis->endCoord   )
         {
           scalar = 0;
           break;
         }
 
         /* cumulative product of all the axis scalars */
-        else if ( ttface->blend->normalizedcoords[j] < axis->peakCoord )
-          scalar =
-            FT_MulDiv( scalar,
-                       ttface->blend->normalizedcoords[j] - axis->startCoord,
-                       axis->peakCoord - axis->startCoord );
-        else
-          scalar =
-            FT_MulDiv( scalar,
-                       axis->endCoord - ttface->blend->normalizedcoords[j],
-                       axis->endCoord - axis->peakCoord );
+        else if ( ncv < axis->peakCoord )
+          scalar = FT_MulDiv( scalar,
+                              ncv - axis->startCoord,
+                              axis->peakCoord - axis->startCoord );
+        else   /* ncv > axis->peakCoord */
+          scalar = FT_MulDiv( scalar,
+                              axis->endCoord - ncv,
+                              axis->endCoord - axis->peakCoord );
 
       } /* per-axis loop */
 
@@ -1920,28 +1896,17 @@
 
     for ( i = 0; i < blend->num_axis; i++ )
     {
-      FT_TRACE6(( "    axis %d coordinate %.5f:\n",
-                  i, (double)blend->normalizedcoords[i] / 65536 ));
+      FT_Fixed  ncv = blend->normalizedcoords[i];
+
+
+      FT_TRACE6(( "    axis %d coordinate %.5f:\n", i, (double)ncv / 65536 ));
 
       /* It's not clear why (for intermediate tuples) we don't need     */
       /* to check against start/end -- the documentation says we don't. */
       /* Similarly, it's unclear why we don't need to scale along the   */
       /* axis.                                                          */
 
-      if ( tuple_coords[i] == 0 )
-      {
-        FT_TRACE6(( "      tuple coordinate is zero, ignore\n" ));
-        continue;
-      }
-
-      if ( blend->normalizedcoords[i] == 0 )
-      {
-        FT_TRACE6(( "      axis coordinate is zero, stop\n" ));
-        apply = 0;
-        break;
-      }
-
-      if ( blend->normalizedcoords[i] == tuple_coords[i] )
+      if ( tuple_coords[i] == ncv )
       {
         FT_TRACE6(( "      tuple coordinate %.5f fits perfectly\n",
                     (double)tuple_coords[i] / 65536 ));
@@ -1949,31 +1914,37 @@
         continue;
       }
 
+      if ( tuple_coords[i] == 0 )
+      {
+        FT_TRACE6(( "      tuple coordinate is zero, ignore\n" ));
+        continue;
+      }
+
       if ( !( tupleIndex & GX_TI_INTERMEDIATE_TUPLE ) )
       {
         /* not an intermediate tuple */
 
-        if ( blend->normalizedcoords[i] < FT_MIN( 0, tuple_coords[i] ) ||
-             blend->normalizedcoords[i] > FT_MAX( 0, tuple_coords[i] ) )
+        if ( ( tuple_coords[i] > ncv && ncv > 0 ) ||
+             ( tuple_coords[i] < ncv && ncv < 0 ) )
+        {
+          FT_TRACE6(( "      tuple coordinate %.5f fits\n",
+                      (double)tuple_coords[i] / 65536 ));
+          apply = FT_MulDiv( apply, ncv, tuple_coords[i] );
+        }
+        else
         {
           FT_TRACE6(( "      tuple coordinate %.5f is exceeded, stop\n",
                       (double)tuple_coords[i] / 65536 ));
           apply = 0;
           break;
         }
-
-        FT_TRACE6(( "      tuple coordinate %.5f fits\n",
-                    (double)tuple_coords[i] / 65536 ));
-        apply = FT_MulDiv( apply,
-                           blend->normalizedcoords[i],
-                           tuple_coords[i] );
       }
       else
       {
         /* intermediate tuple */
 
-        if ( blend->normalizedcoords[i] <= im_start_coords[i] ||
-             blend->normalizedcoords[i] >= im_end_coords[i]   )
+        if ( ncv <= im_start_coords[i] ||
+             ncv >= im_end_coords[i]   )
         {
           FT_TRACE6(( "      intermediate tuple range ]%.5f;%.5f[ is exceeded,"
                       " stop\n",
@@ -1986,13 +1957,13 @@
         FT_TRACE6(( "      intermediate tuple range ]%.5f;%.5f[ fits\n",
                     (double)im_start_coords[i] / 65536,
                     (double)im_end_coords[i] / 65536 ));
-        if ( blend->normalizedcoords[i] < tuple_coords[i] )
+        if ( ncv < tuple_coords[i] )
           apply = FT_MulDiv( apply,
-                             blend->normalizedcoords[i] - im_start_coords[i],
+                             ncv - im_start_coords[i],
                              tuple_coords[i] - im_start_coords[i] );
-        else
+        else /* ncv > tuple_coords[i] */
           apply = FT_MulDiv( apply,
-                             im_end_coords[i] - blend->normalizedcoords[i],
+                             im_end_coords[i] - ncv,
                              im_end_coords[i] - tuple_coords[i] );
       }
     }
@@ -2141,11 +2112,12 @@
                                          outerIndex,
                                          innerIndex );
 
-      v += delta << 2;
+          /* Convert delta in F2DOT14 to 16.16 before adding. */
+          v += MUL_INT( delta, 4 );
 
-      /* Clamp value range. */
-      v = v >=  0x10000L ?  0x10000 : v;
-      v = v <= -0x10000L ? -0x10000 : v;
+          /* Clamp value to range [-1, 1]. */
+          v = v >=  0x10000L ?  0x10000 : v;
+          v = v <= -0x10000L ? -0x10000 : v;
 
           new_normalized[i] = v;
         }
@@ -2721,9 +2693,8 @@
       FT_UInt  n;
 
 
-      if ( FT_ALLOC( mmvar, ttface->blend->mmvar_len ) )
+      if ( FT_DUP( mmvar, ttface->blend->mmvar, ttface->blend->mmvar_len ) )
         goto Exit;
-      FT_MEM_COPY( mmvar, ttface->blend->mmvar, ttface->blend->mmvar_len );
 
       axis_flags =
         (FT_UShort*)( (char*)mmvar + mmvar_size );
@@ -3533,9 +3504,10 @@
     FT_ULong  here;
     FT_UInt   i, j;
 
-    FT_Fixed*  tuple_coords    = NULL;
-    FT_Fixed*  im_start_coords = NULL;
-    FT_Fixed*  im_end_coords   = NULL;
+    FT_Fixed*  peak_coords = NULL;
+    FT_Fixed*  tuple_coords;
+    FT_Fixed*  im_start_coords;
+    FT_Fixed*  im_end_coords;
 
     GX_Blend  blend = face->blend;
 
@@ -3556,16 +3528,16 @@
     {
       FT_TRACE2(( "\n" ));
       FT_TRACE2(( "tt_face_vary_cvt: no blend specified\n" ));
-      error = FT_Err_Ok;
-      goto Exit;
+
+      return FT_Err_Ok;
     }
 
     if ( !face->cvt )
     {
       FT_TRACE2(( "\n" ));
       FT_TRACE2(( "tt_face_vary_cvt: no `cvt ' table\n" ));
-      error = FT_Err_Ok;
-      goto Exit;
+
+      return FT_Err_Ok;
     }
 
     error = face->goto_table( face, TTAG_cvar, stream, &table_len );
@@ -3573,15 +3545,11 @@
     {
       FT_TRACE2(( "is missing\n" ));
 
-      error = FT_Err_Ok;
-      goto Exit;
+      return FT_Err_Ok;
     }
 
     if ( FT_FRAME_ENTER( table_len ) )
-    {
-      error = FT_Err_Ok;
-      goto Exit;
-    }
+      return FT_Err_Ok;
 
     table_start = FT_Stream_FTell( stream );
     if ( FT_GET_LONG() != 0x00010000L )
@@ -3594,11 +3562,6 @@
 
     FT_TRACE2(( "loaded\n" ));
 
-    if ( FT_NEW_ARRAY( tuple_coords, blend->num_axis )    ||
-         FT_NEW_ARRAY( im_start_coords, blend->num_axis ) ||
-         FT_NEW_ARRAY( im_end_coords, blend->num_axis )   )
-      goto FExit;
-
     tupleCount   = FT_GET_USHORT();
     offsetToData = FT_GET_USHORT();
 
@@ -3621,9 +3584,8 @@
 
       FT_Stream_SeekSet( stream, offsetToData );
 
-      sharedpoints = ft_var_readpackedpoints( stream,
-                                              table_len,
-                                              &spoint_count );
+      sharedpoints = ft_var_readpackedpoints( stream, &spoint_count );
+
       offsetToData = FT_Stream_FTell( stream );
 
       FT_Stream_SeekSet( stream, here );
@@ -3634,8 +3596,12 @@
                 tupleCount & GX_TC_TUPLE_COUNT_MASK,
                 ( tupleCount & GX_TC_TUPLE_COUNT_MASK ) == 1 ? "" : "s" ));
 
-    if ( FT_NEW_ARRAY( cvt_deltas, face->cvt_size ) )
-      goto FExit;
+    if ( FT_QNEW_ARRAY( peak_coords, 3 * blend->num_axis ) ||
+         FT_NEW_ARRAY( cvt_deltas, face->cvt_size )        )
+      goto Exit;
+
+    im_start_coords = peak_coords + blend->num_axis;
+    im_end_coords = im_start_coords + blend->num_axis;
 
     for ( i = 0; i < ( tupleCount & GX_TC_TUPLE_COUNT_MASK ); i++ )
     {
@@ -3652,32 +3618,19 @@
       if ( tupleIndex & GX_TI_EMBEDDED_TUPLE_COORD )
       {
         for ( j = 0; j < blend->num_axis; j++ )
-          tuple_coords[j] = FT_fdot14ToFixed( FT_GET_SHORT() );
+          peak_coords[j] = FT_fdot14ToFixed( FT_GET_SHORT() );
+        tuple_coords = peak_coords;
       }
-      else if ( ( tupleIndex & GX_TI_TUPLE_INDEX_MASK ) >= blend->tuplecount )
+      else if ( ( tupleIndex & GX_TI_TUPLE_INDEX_MASK ) < blend->tuplecount )
+        tuple_coords = blend->tuplecoords +
+            ( tupleIndex & GX_TI_TUPLE_INDEX_MASK ) * blend->num_axis;
+      else
       {
         FT_TRACE2(( "tt_face_vary_cvt:"
                     " invalid tuple index\n" ));
 
         error = FT_THROW( Invalid_Table );
-        goto FExit;
-      }
-      else
-      {
-        if ( !blend->tuplecoords )
-        {
-          FT_TRACE2(( "tt_face_vary_cvt:"
-                      " no valid tuple coordinates available\n" ));
-
-          error = FT_THROW( Invalid_Table );
-          goto FExit;
-        }
-
-        FT_MEM_COPY(
-          tuple_coords,
-          blend->tuplecoords +
-            ( tupleIndex & GX_TI_TUPLE_INDEX_MASK ) * blend->num_axis,
-          blend->num_axis * sizeof ( FT_Fixed ) );
+        goto Exit;
       }
 
       if ( tupleIndex & GX_TI_INTERMEDIATE_TUPLE )
@@ -3706,9 +3659,7 @@
 
       if ( tupleIndex & GX_TI_PRIVATE_POINT_NUMBERS )
       {
-        localpoints = ft_var_readpackedpoints( stream,
-                                               table_len,
-                                               &point_count );
+        localpoints = ft_var_readpackedpoints( stream, &point_count );
         points      = localpoints;
       }
       else
@@ -3719,7 +3670,6 @@
       }
 
       deltas = ft_var_readpackeddeltas( stream,
-                                        table_len,
                                         point_count == 0 ? face->cvt_size
                                                          : point_count );
 
@@ -3820,22 +3770,20 @@
     for ( i = 0; i < face->cvt_size; i++ )
       face->cvt[i] += FT_fixedToFdot6( cvt_deltas[i] );
 
-  FExit:
-    FT_FRAME_EXIT();
+    /* Iterate over all `FT_Size` objects and set `cvt_ready` to -1 */
+    /* to trigger rescaling of all CVT values.                      */
+    FT_List_Iterate( &root->sizes_list,
+                     tt_cvt_ready_iterator,
+                     NULL );
 
   Exit:
     if ( sharedpoints != ALL_POINTS )
       FT_FREE( sharedpoints );
-    FT_FREE( tuple_coords );
-    FT_FREE( im_start_coords );
-    FT_FREE( im_end_coords );
     FT_FREE( cvt_deltas );
+    FT_FREE( peak_coords );
 
-    /* iterate over all FT_Size objects and set `cvt_ready' to -1 */
-    /* to trigger rescaling of all CVT values                     */
-    FT_List_Iterate( &root->sizes_list,
-                     tt_cvt_ready_iterator,
-                     NULL );
+  FExit:
+    FT_FRAME_EXIT();
 
     return error;
 
@@ -4099,9 +4047,10 @@
     FT_ULong  here;
     FT_UInt   i, j;
 
-    FT_Fixed*  tuple_coords    = NULL;
-    FT_Fixed*  im_start_coords = NULL;
-    FT_Fixed*  im_end_coords   = NULL;
+    FT_Fixed*  peak_coords = NULL;
+    FT_Fixed*  tuple_coords;
+    FT_Fixed*  im_start_coords;
+    FT_Fixed*  im_end_coords;
 
     GX_Blend  blend = face->blend;
 
@@ -4136,27 +4085,17 @@
       return FT_Err_Ok;
     }
 
-    if ( FT_NEW_ARRAY( points_org, n_points ) ||
-         FT_NEW_ARRAY( points_out, n_points ) ||
-         FT_NEW_ARRAY( has_delta, n_points )  )
-      goto Fail1;
-
     dataSize = blend->glyphoffsets[glyph_index + 1] -
                  blend->glyphoffsets[glyph_index];
 
     if ( FT_STREAM_SEEK( blend->glyphoffsets[glyph_index] ) ||
          FT_FRAME_ENTER( dataSize )                         )
-      goto Fail1;
+      return error;
 
     glyph_start = FT_Stream_FTell( stream );
 
     /* each set of glyph variation data is formatted similarly to `cvar' */
 
-    if ( FT_NEW_ARRAY( tuple_coords, blend->num_axis )    ||
-         FT_NEW_ARRAY( im_start_coords, blend->num_axis ) ||
-         FT_NEW_ARRAY( im_end_coords, blend->num_axis )   )
-      goto Fail2;
-
     tupleCount   = FT_GET_USHORT();
     offsetToData = FT_GET_USHORT();
 
@@ -4168,7 +4107,7 @@
                   " invalid glyph variation array header\n" ));
 
       error = FT_THROW( Invalid_Table );
-      goto Fail2;
+      goto FExit;
     }
 
     offsetToData += glyph_start;
@@ -4179,9 +4118,8 @@
 
       FT_Stream_SeekSet( stream, offsetToData );
 
-      sharedpoints = ft_var_readpackedpoints( stream,
-                                              blend->gvar_size,
-                                              &spoint_count );
+      sharedpoints = ft_var_readpackedpoints( stream, &spoint_count );
+
       offsetToData = FT_Stream_FTell( stream );
 
       FT_Stream_SeekSet( stream, here );
@@ -4192,9 +4130,16 @@
                 tupleCount & GX_TC_TUPLE_COUNT_MASK,
                 ( tupleCount & GX_TC_TUPLE_COUNT_MASK ) == 1 ? "" : "s" ));
 
-    if ( FT_NEW_ARRAY( point_deltas_x, n_points ) ||
-         FT_NEW_ARRAY( point_deltas_y, n_points ) )
-      goto Fail3;
+    if ( FT_QNEW_ARRAY( peak_coords, 3 * blend->num_axis ) ||
+         FT_NEW_ARRAY( point_deltas_x, 2 * n_points )      ||
+         FT_QNEW_ARRAY( points_org, n_points )             ||
+         FT_QNEW_ARRAY( points_out, n_points )             ||
+         FT_QNEW_ARRAY( has_delta, n_points )              )
+      goto Exit;
+
+    im_start_coords = peak_coords + blend->num_axis;
+    im_end_coords   = im_start_coords + blend->num_axis;
+    point_deltas_y  = point_deltas_x + n_points;
 
     for ( j = 0; j < n_points; j++ )
     {
@@ -4217,22 +4162,20 @@
       if ( tupleIndex & GX_TI_EMBEDDED_TUPLE_COORD )
       {
         for ( j = 0; j < blend->num_axis; j++ )
-          tuple_coords[j] = FT_fdot14ToFixed( FT_GET_SHORT() );
+          peak_coords[j] = FT_fdot14ToFixed( FT_GET_SHORT() );
+        tuple_coords = peak_coords;
       }
-      else if ( ( tupleIndex & GX_TI_TUPLE_INDEX_MASK ) >= blend->tuplecount )
+      else if ( ( tupleIndex & GX_TI_TUPLE_INDEX_MASK ) < blend->tuplecount )
+        tuple_coords = blend->tuplecoords +
+            ( tupleIndex & GX_TI_TUPLE_INDEX_MASK ) * blend->num_axis;
+      else
       {
         FT_TRACE2(( "TT_Vary_Apply_Glyph_Deltas:"
                     " invalid tuple index\n" ));
 
         error = FT_THROW( Invalid_Table );
-        goto Fail3;
+        goto Exit;
       }
-      else
-        FT_MEM_COPY(
-          tuple_coords,
-          blend->tuplecoords +
-            ( tupleIndex & GX_TI_TUPLE_INDEX_MASK ) * blend->num_axis,
-          blend->num_axis * sizeof ( FT_Fixed ) );
 
       if ( tupleIndex & GX_TI_INTERMEDIATE_TUPLE )
       {
@@ -4260,9 +4203,7 @@
 
       if ( tupleIndex & GX_TI_PRIVATE_POINT_NUMBERS )
       {
-        localpoints = ft_var_readpackedpoints( stream,
-                                               blend->gvar_size,
-                                               &point_count );
+        localpoints = ft_var_readpackedpoints( stream, &point_count );
         points      = localpoints;
       }
       else
@@ -4272,11 +4213,9 @@
       }
 
       deltas_x = ft_var_readpackeddeltas( stream,
-                                          blend->gvar_size,
                                           point_count == 0 ? n_points
                                                            : point_count );
       deltas_y = ft_var_readpackeddeltas( stream,
-                                          blend->gvar_size,
                                           point_count == 0 ? n_points
                                                            : point_count );
 
@@ -4460,23 +4399,17 @@
                                        unrounded[n_points - 2].y ) / 64;
     }
 
-  Fail3:
-    FT_FREE( point_deltas_x );
-    FT_FREE( point_deltas_y );
-
-  Fail2:
+  Exit:
     if ( sharedpoints != ALL_POINTS )
       FT_FREE( sharedpoints );
-    FT_FREE( tuple_coords );
-    FT_FREE( im_start_coords );
-    FT_FREE( im_end_coords );
-
-    FT_FRAME_EXIT();
-
-  Fail1:
     FT_FREE( points_org );
     FT_FREE( points_out );
     FT_FREE( has_delta );
+    FT_FREE( peak_coords );
+    FT_FREE( point_deltas_x );
+
+  FExit:
+    FT_FRAME_EXIT();
 
     return error;
   }
diff --git a/src/java.desktop/share/native/libfreetype/src/truetype/ttgxvar.h b/src/java.desktop/share/native/libfreetype/src/truetype/ttgxvar.h
index e3da6d1705c..9326011e3a2 100644
--- a/src/java.desktop/share/native/libfreetype/src/truetype/ttgxvar.h
+++ b/src/java.desktop/share/native/libfreetype/src/truetype/ttgxvar.h
@@ -4,7 +4,7 @@
  *
  *   TrueType GX Font Variation loader (specification)
  *
- * Copyright (C) 2004-2023 by
+ * Copyright (C) 2004-2024 by
  * David Turner, Robert Wilhelm, Werner Lemberg and George Williams.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/src/java.desktop/share/native/libfreetype/src/truetype/ttinterp.c b/src/java.desktop/share/native/libfreetype/src/truetype/ttinterp.c
index 79df4555d94..951891dbf51 100644
--- a/src/java.desktop/share/native/libfreetype/src/truetype/ttinterp.c
+++ b/src/java.desktop/share/native/libfreetype/src/truetype/ttinterp.c
@@ -4,7 +4,7 @@
  *
  *   TrueType bytecode interpreter (body).
  *
- * Copyright (C) 1996-2023 by
+ * Copyright (C) 1996-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
@@ -5270,11 +5270,11 @@
     FT_UShort        refp;
     FT_F26Dot6       dx, dy;
 
-    FT_Short         contour, bounds;
+    FT_UShort        contour, bounds;
     FT_UShort        start, limit, i;
 
 
-    contour = (FT_Short)args[0];
+    contour = (FT_UShort)args[0];
     bounds  = ( exc->GS.gep2 == 0 ) ? 1 : exc->zp2.n_contours;
 
     if ( BOUNDS( contour, bounds ) )
@@ -5290,15 +5290,13 @@
     if ( contour == 0 )
       start = 0;
     else
-      start = (FT_UShort)( exc->zp2.contours[contour - 1] + 1 -
-                           exc->zp2.first_point );
+      start = exc->zp2.contours[contour - 1] + 1 - exc->zp2.first_point;
 
     /* we use the number of points if in the twilight zone */
     if ( exc->GS.gep2 == 0 )
       limit = exc->zp2.n_points;
     else
-      limit = (FT_UShort)( exc->zp2.contours[contour] -
-                           exc->zp2.first_point + 1 );
+      limit = exc->zp2.contours[contour] + 1 - exc->zp2.first_point;
 
     for ( i = start; i < limit; i++ )
     {
@@ -5341,9 +5339,9 @@
     /*      Normal zone's `n_points' includes phantoms, so must    */
     /*      use end of last contour.                               */
     if ( exc->GS.gep2 == 0 )
-      limit = (FT_UShort)exc->zp2.n_points;
+      limit = exc->zp2.n_points;
     else if ( exc->GS.gep2 == 1 && exc->zp2.n_contours > 0 )
-      limit = (FT_UShort)( exc->zp2.contours[exc->zp2.n_contours - 1] + 1 );
+      limit = exc->zp2.contours[exc->zp2.n_contours - 1] + 1;
     else
       limit = 0;
 
diff --git a/src/java.desktop/share/native/libfreetype/src/truetype/ttinterp.h b/src/java.desktop/share/native/libfreetype/src/truetype/ttinterp.h
index e98e258fe7e..4f1a9bbc679 100644
--- a/src/java.desktop/share/native/libfreetype/src/truetype/ttinterp.h
+++ b/src/java.desktop/share/native/libfreetype/src/truetype/ttinterp.h
@@ -4,7 +4,7 @@
  *
  *   TrueType bytecode interpreter (specification).
  *
- * Copyright (C) 1996-2023 by
+ * Copyright (C) 1996-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/src/java.desktop/share/native/libfreetype/src/truetype/ttobjs.c b/src/java.desktop/share/native/libfreetype/src/truetype/ttobjs.c
index 5b56af711df..d0ac3181204 100644
--- a/src/java.desktop/share/native/libfreetype/src/truetype/ttobjs.c
+++ b/src/java.desktop/share/native/libfreetype/src/truetype/ttobjs.c
@@ -4,7 +4,7 @@
  *
  *   Objects manager (body).
  *
- * Copyright (C) 1996-2023 by
+ * Copyright (C) 1996-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
@@ -115,7 +115,7 @@
   FT_LOCAL_DEF( FT_Error )
   tt_glyphzone_new( FT_Memory     memory,
                     FT_UShort     maxPoints,
-                    FT_Short      maxContours,
+                    FT_UShort     maxContours,
                     TT_GlyphZone  zone )
   {
     FT_Error  error;
@@ -152,18 +152,20 @@
   static const FT_String*
   tt_skip_pdffont_random_tag( const FT_String*  name )
   {
-    unsigned int  i;
+    if ( ft_isupper( name[0] ) &&
+         ft_isupper( name[1] ) &&
+         ft_isupper( name[2] ) &&
+         ft_isupper( name[3] ) &&
+         ft_isupper( name[4] ) &&
+         ft_isupper( name[5] ) &&
+              '+' == name[6]   &&
+                     name[7]   )
+    {
+      FT_TRACE7(( "name without randomization tag: %s\n", name + 7 ));
+      return name + 7;
+    }
 
-
-    if ( ft_strlen( name ) < 8 || name[6] != '+' )
-      return name;
-
-    for ( i = 0; i < 6; i++ )
-      if ( !ft_isupper( name[i] ) )
-        return name;
-
-    FT_TRACE7(( "name without randomization tag: %s\n", name + 7 ));
-    return name + 7;
+    return name;
   }
 
 
@@ -254,17 +256,20 @@
   {
     FT_Error   error;
     FT_UInt32  checksum = 0;
-    FT_UInt    i;
+    FT_Byte*   p;
+    FT_Int     shift;
 
 
     if ( FT_FRAME_ENTER( length ) )
       return 0;
 
-    for ( ; length > 3; length -= 4 )
-      checksum += (FT_UInt32)FT_GET_ULONG();
+    p = (FT_Byte*)stream->cursor;
 
-    for ( i = 3; length > 0; length--, i-- )
-      checksum += (FT_UInt32)FT_GET_BYTE() << ( i * 8 );
+    for ( ; length > 3; length -= 4 )
+      checksum += FT_NEXT_ULONG( p );
+
+    for ( shift = 24; length > 0; length--, shift -=8 )
+      checksum += (FT_UInt32)FT_NEXT_BYTE( p ) << shift;
 
     FT_FRAME_EXIT();
 
@@ -782,8 +787,7 @@
       FT_UInt  instance_index = (FT_UInt)face_index >> 16;
 
 
-      if ( FT_HAS_MULTIPLE_MASTERS( ttface ) &&
-           instance_index > 0                )
+      if ( FT_HAS_MULTIPLE_MASTERS( ttface ) )
       {
         error = FT_Set_Named_Instance( ttface, instance_index );
         if ( error )
@@ -990,16 +994,16 @@
     FT_Error        error;
     FT_UInt         i;
 
-    /* unscaled CVT values are already stored in 26.6 format */
-    FT_Fixed  scale = size->ttmetrics.scale >> 6;
-
 
     /* Scale the cvt values to the new ppem.            */
     /* By default, we use the y ppem value for scaling. */
     FT_TRACE6(( "CVT values:\n" ));
     for ( i = 0; i < size->cvt_size; i++ )
     {
-      size->cvt[i] = FT_MulFix( face->cvt[i], scale );
+      /* Unscaled CVT values are already stored in 26.6 format.            */
+      /* Note that this scaling operation is very sensitive to rounding;   */
+      /* the integer division by 64 must be applied to the first argument. */
+      size->cvt[i] = FT_MulFix( face->cvt[i] / 64, size->ttmetrics.scale );
       FT_TRACE6(( "  %3d: %f (%f)\n",
                   i, (double)face->cvt[i] / 64, (double)size->cvt[i] / 64 ));
     }
diff --git a/src/java.desktop/share/native/libfreetype/src/truetype/ttobjs.h b/src/java.desktop/share/native/libfreetype/src/truetype/ttobjs.h
index 40eb37b4c43..9c36ca78362 100644
--- a/src/java.desktop/share/native/libfreetype/src/truetype/ttobjs.h
+++ b/src/java.desktop/share/native/libfreetype/src/truetype/ttobjs.h
@@ -4,7 +4,7 @@
  *
  *   Objects manager (specification).
  *
- * Copyright (C) 1996-2023 by
+ * Copyright (C) 1996-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
@@ -105,7 +105,7 @@ FT_BEGIN_HEADER
   FT_LOCAL( FT_Error )
   tt_glyphzone_new( FT_Memory     memory,
                     FT_UShort     maxPoints,
-                    FT_Short      maxContours,
+                    FT_UShort     maxContours,
                     TT_GlyphZone  zone );
 
 #endif /* TT_USE_BYTECODE_INTERPRETER */
diff --git a/src/java.desktop/share/native/libfreetype/src/truetype/ttpload.c b/src/java.desktop/share/native/libfreetype/src/truetype/ttpload.c
index 54a64c7b462..9505b5f179f 100644
--- a/src/java.desktop/share/native/libfreetype/src/truetype/ttpload.c
+++ b/src/java.desktop/share/native/libfreetype/src/truetype/ttpload.c
@@ -4,7 +4,7 @@
  *
  *   TrueType-specific tables loader (body).
  *
- * Copyright (C) 1996-2023 by
+ * Copyright (C) 1996-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/src/java.desktop/share/native/libfreetype/src/truetype/ttpload.h b/src/java.desktop/share/native/libfreetype/src/truetype/ttpload.h
index ed229fa4616..bc32b58020c 100644
--- a/src/java.desktop/share/native/libfreetype/src/truetype/ttpload.h
+++ b/src/java.desktop/share/native/libfreetype/src/truetype/ttpload.h
@@ -4,7 +4,7 @@
  *
  *   TrueType-specific tables loader (specification).
  *
- * Copyright (C) 1996-2023 by
+ * Copyright (C) 1996-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/src/java.desktop/share/native/libfreetype/src/type1/t1afm.c b/src/java.desktop/share/native/libfreetype/src/type1/t1afm.c
index d9b9398b013..a63cd4dc48a 100644
--- a/src/java.desktop/share/native/libfreetype/src/type1/t1afm.c
+++ b/src/java.desktop/share/native/libfreetype/src/type1/t1afm.c
@@ -4,7 +4,7 @@
  *
  *   AFM support for Type 1 fonts (body).
  *
- * Copyright (C) 1996-2023 by
+ * Copyright (C) 1996-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/src/java.desktop/share/native/libfreetype/src/type1/t1afm.h b/src/java.desktop/share/native/libfreetype/src/type1/t1afm.h
index e0d5aa5a882..7f5cdda191f 100644
--- a/src/java.desktop/share/native/libfreetype/src/type1/t1afm.h
+++ b/src/java.desktop/share/native/libfreetype/src/type1/t1afm.h
@@ -4,7 +4,7 @@
  *
  *   AFM support for Type 1 fonts (specification).
  *
- * Copyright (C) 1996-2023 by
+ * Copyright (C) 1996-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/src/java.desktop/share/native/libfreetype/src/type1/t1driver.c b/src/java.desktop/share/native/libfreetype/src/type1/t1driver.c
index a4cdf372a9e..8ed01914a5a 100644
--- a/src/java.desktop/share/native/libfreetype/src/type1/t1driver.c
+++ b/src/java.desktop/share/native/libfreetype/src/type1/t1driver.c
@@ -4,7 +4,7 @@
  *
  *   Type 1 driver interface (body).
  *
- * Copyright (C) 1996-2023 by
+ * Copyright (C) 1996-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
@@ -312,10 +312,7 @@
       {
         retval = ft_strlen( type1->glyph_names[idx] ) + 1;
         if ( value && value_len >= retval )
-        {
           ft_memcpy( value, (void *)( type1->glyph_names[idx] ), retval );
-          ((FT_Char *)value)[retval - 1] = (FT_Char)'\0';
-        }
       }
       break;
 
@@ -344,11 +341,8 @@
       {
         retval = ft_strlen( type1->encoding.char_name[idx] ) + 1;
         if ( value && value_len >= retval )
-        {
           ft_memcpy( value, (void *)( type1->encoding.char_name[idx] ),
-                     retval - 1 );
-          ((FT_Char *)value)[retval - 1] = (FT_Char)'\0';
-        }
+                     retval );
       }
       break;
 
diff --git a/src/java.desktop/share/native/libfreetype/src/type1/t1driver.h b/src/java.desktop/share/native/libfreetype/src/type1/t1driver.h
index ee7fcf43e01..5ff52b55b1a 100644
--- a/src/java.desktop/share/native/libfreetype/src/type1/t1driver.h
+++ b/src/java.desktop/share/native/libfreetype/src/type1/t1driver.h
@@ -4,7 +4,7 @@
  *
  *   High-level Type 1 driver interface (specification).
  *
- * Copyright (C) 1996-2023 by
+ * Copyright (C) 1996-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/src/java.desktop/share/native/libfreetype/src/type1/t1errors.h b/src/java.desktop/share/native/libfreetype/src/type1/t1errors.h
index 2fbd1e513f3..8aeb24ae188 100644
--- a/src/java.desktop/share/native/libfreetype/src/type1/t1errors.h
+++ b/src/java.desktop/share/native/libfreetype/src/type1/t1errors.h
@@ -4,7 +4,7 @@
  *
  *   Type 1 error codes (specification only).
  *
- * Copyright (C) 2001-2023 by
+ * Copyright (C) 2001-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/src/java.desktop/share/native/libfreetype/src/type1/t1gload.c b/src/java.desktop/share/native/libfreetype/src/type1/t1gload.c
index a32a4649d6d..c29e682510c 100644
--- a/src/java.desktop/share/native/libfreetype/src/type1/t1gload.c
+++ b/src/java.desktop/share/native/libfreetype/src/type1/t1gload.c
@@ -4,7 +4,7 @@
  *
  *   Type 1 Glyph Loader (body).
  *
- * Copyright (C) 1996-2023 by
+ * Copyright (C) 1996-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/src/java.desktop/share/native/libfreetype/src/type1/t1gload.h b/src/java.desktop/share/native/libfreetype/src/type1/t1gload.h
index c06484758a5..17a6a5941e3 100644
--- a/src/java.desktop/share/native/libfreetype/src/type1/t1gload.h
+++ b/src/java.desktop/share/native/libfreetype/src/type1/t1gload.h
@@ -4,7 +4,7 @@
  *
  *   Type 1 Glyph Loader (specification).
  *
- * Copyright (C) 1996-2023 by
+ * Copyright (C) 1996-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/src/java.desktop/share/native/libfreetype/src/type1/t1load.c b/src/java.desktop/share/native/libfreetype/src/type1/t1load.c
index be7cd0fd5e9..ee7fb42a517 100644
--- a/src/java.desktop/share/native/libfreetype/src/type1/t1load.c
+++ b/src/java.desktop/share/native/libfreetype/src/type1/t1load.c
@@ -4,7 +4,7 @@
  *
  *   Type 1 font loader (body).
  *
- * Copyright (C) 1996-2023 by
+ * Copyright (C) 1996-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
@@ -751,6 +751,7 @@
         PS_DesignMap  dmap = blend->design_map + n;
 
 
+        FT_FREE( dmap->blend_points );
         FT_FREE( dmap->design_points );
         dmap->num_points = 0;
       }
@@ -1043,9 +1044,9 @@
       }
 
       /* allocate design map data */
-      if ( FT_QNEW_ARRAY( map->design_points, num_points * 2 ) )
+      if ( FT_QNEW_ARRAY( map->design_points, num_points ) ||
+           FT_QNEW_ARRAY( map->blend_points,  num_points ) )
         goto Exit;
-      map->blend_points = map->design_points + num_points;
       map->num_points   = (FT_Byte)num_points;
 
       for ( p = 0; p < num_points; p++ )
@@ -1876,9 +1877,8 @@
         }
 
         /* t1_decrypt() shouldn't write to base -- make temporary copy */
-        if ( FT_QALLOC( temp, size ) )
+        if ( FT_DUP( temp, base, size ) )
           goto Fail;
-        FT_MEM_COPY( temp, base, size );
         psaux->t1_decrypt( temp, size, 4330 );
         size -= (FT_ULong)t1face->type1.private_dict.lenIV;
         error = T1_Add_Table( table,
@@ -2090,9 +2090,8 @@
           }
 
           /* t1_decrypt() shouldn't write to base -- make temporary copy */
-          if ( FT_QALLOC( temp, size ) )
+          if ( FT_DUP( temp, base, size ) )
             goto Fail;
-          FT_MEM_COPY( temp, base, size );
           psaux->t1_decrypt( temp, size, 4330 );
           size -= (FT_ULong)t1face->type1.private_dict.lenIV;
           error = T1_Add_Table( code_table,
@@ -2284,7 +2283,7 @@
                        T1_FIELD_DICT_PRIVATE )
 #endif
 
-    { 0, T1_FIELD_LOCATION_CID_INFO, T1_FIELD_TYPE_NONE, 0, 0, 0, 0, 0, 0 }
+    T1_FIELD_ZERO
   };
 
 
@@ -2392,18 +2391,13 @@
           T1_Field  keyword = (T1_Field)t1_keywords;
 
 
-          for (;;)
+          while ( keyword->len )
           {
-            FT_Byte*  name;
+            FT_Byte*  name = (FT_Byte*)keyword->ident;
 
 
-            name = (FT_Byte*)keyword->ident;
-            if ( !name )
-              break;
-
-            if ( cur[0] == name[0]                      &&
-                 len == ft_strlen( (const char *)name ) &&
-                 ft_memcmp( cur, name, len ) == 0       )
+            if ( keyword->len == len              &&
+                 ft_memcmp( cur, name, len ) == 0 )
             {
               /* We found it -- run the parsing callback!     */
               /* We record every instance of every field      */
diff --git a/src/java.desktop/share/native/libfreetype/src/type1/t1load.h b/src/java.desktop/share/native/libfreetype/src/type1/t1load.h
index d8c9d2d8abe..a45efa7cb7b 100644
--- a/src/java.desktop/share/native/libfreetype/src/type1/t1load.h
+++ b/src/java.desktop/share/native/libfreetype/src/type1/t1load.h
@@ -4,7 +4,7 @@
  *
  *   Type 1 font loader (specification).
  *
- * Copyright (C) 1996-2023 by
+ * Copyright (C) 1996-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/src/java.desktop/share/native/libfreetype/src/type1/t1objs.c b/src/java.desktop/share/native/libfreetype/src/type1/t1objs.c
index 69e4fd5065e..b1b27c31fe3 100644
--- a/src/java.desktop/share/native/libfreetype/src/type1/t1objs.c
+++ b/src/java.desktop/share/native/libfreetype/src/type1/t1objs.c
@@ -4,7 +4,7 @@
  *
  *   Type 1 objects manager (body).
  *
- * Copyright (C) 1996-2023 by
+ * Copyright (C) 1996-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/src/java.desktop/share/native/libfreetype/src/type1/t1objs.h b/src/java.desktop/share/native/libfreetype/src/type1/t1objs.h
index 03847b27e96..3809370c1e0 100644
--- a/src/java.desktop/share/native/libfreetype/src/type1/t1objs.h
+++ b/src/java.desktop/share/native/libfreetype/src/type1/t1objs.h
@@ -4,7 +4,7 @@
  *
  *   Type 1 objects manager (specification).
  *
- * Copyright (C) 1996-2023 by
+ * Copyright (C) 1996-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/src/java.desktop/share/native/libfreetype/src/type1/t1parse.c b/src/java.desktop/share/native/libfreetype/src/type1/t1parse.c
index 6dec6c16c3e..3717ea7c572 100644
--- a/src/java.desktop/share/native/libfreetype/src/type1/t1parse.c
+++ b/src/java.desktop/share/native/libfreetype/src/type1/t1parse.c
@@ -4,7 +4,7 @@
  *
  *   Type 1 parser (body).
  *
- * Copyright (C) 1996-2023 by
+ * Copyright (C) 1996-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/src/java.desktop/share/native/libfreetype/src/type1/t1parse.h b/src/java.desktop/share/native/libfreetype/src/type1/t1parse.h
index 0d9a2865df0..a0a2134d45c 100644
--- a/src/java.desktop/share/native/libfreetype/src/type1/t1parse.h
+++ b/src/java.desktop/share/native/libfreetype/src/type1/t1parse.h
@@ -4,7 +4,7 @@
  *
  *   Type 1 parser (specification).
  *
- * Copyright (C) 1996-2023 by
+ * Copyright (C) 1996-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/src/java.desktop/share/native/libfreetype/src/type1/t1tokens.h b/src/java.desktop/share/native/libfreetype/src/type1/t1tokens.h
index 40f36092622..5a3d2f1ef08 100644
--- a/src/java.desktop/share/native/libfreetype/src/type1/t1tokens.h
+++ b/src/java.desktop/share/native/libfreetype/src/type1/t1tokens.h
@@ -4,7 +4,7 @@
  *
  *   Type 1 tokenizer (specification).
  *
- * Copyright (C) 1996-2023 by
+ * Copyright (C) 1996-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,

From 3c72c04de7a43d265dae7160fe53baaaa8ae6f73 Mon Sep 17 00:00:00 2001
From: Leonid Mesnik <lmesnik@openjdk.org>
Date: Fri, 28 Feb 2025 22:37:41 +0000
Subject: [PATCH 177/587] 8350818: Improve OperatingSystemMXBean cpu load tests
 to not accept -1.0 by default

Reviewed-by: kevinw
---
 .../management/OperatingSystemMXBean/GetProcessCpuLoad.java | 4 ++--
 .../management/OperatingSystemMXBean/GetSystemCpuLoad.java  | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/test/jdk/com/sun/management/OperatingSystemMXBean/GetProcessCpuLoad.java b/test/jdk/com/sun/management/OperatingSystemMXBean/GetProcessCpuLoad.java
index bbf26e099f3..ecb65b7b3ea 100644
--- a/test/jdk/com/sun/management/OperatingSystemMXBean/GetProcessCpuLoad.java
+++ b/test/jdk/com/sun/management/OperatingSystemMXBean/GetProcessCpuLoad.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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 @@ public class GetProcessCpuLoad {
         double load;
         for(int i=0; i<10; i++) {
             load = mbean.getProcessCpuLoad();
-            if((load<0.0 || load>1.0) && load != -1.0) {
+            if(load<0.0 || load>1.0) {
                 throw new RuntimeException("getProcessCpuLoad() returns " + load
                        +   " which is not in the [0.0,1.0] interval");
             }
diff --git a/test/jdk/com/sun/management/OperatingSystemMXBean/GetSystemCpuLoad.java b/test/jdk/com/sun/management/OperatingSystemMXBean/GetSystemCpuLoad.java
index 71ee209258a..7bd9d162cb3 100644
--- a/test/jdk/com/sun/management/OperatingSystemMXBean/GetSystemCpuLoad.java
+++ b/test/jdk/com/sun/management/OperatingSystemMXBean/GetSystemCpuLoad.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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     7028071
- * @summary Basic unit test of OperatingSystemMXBean.getProcessCpuLoad()
+ * @summary Basic unit test of OperatingSystemMXBean.getSystemCpuLoad()
  *
  * @run main GetSystemCpuLoad
  */
@@ -39,7 +39,7 @@ public class GetSystemCpuLoad {
         double load;
         for(int i=0; i<10; i++) {
             load = mbean.getSystemCpuLoad();
-            if((load<0.0 || load>1.0) && load != -1.0) {
+            if(load<0.0 || load>1.0) {
                 throw new RuntimeException("getSystemCpuLoad() returns " + load
                        +  " which is not in the [0.0,1.0] interval");
             }

From 785e7b47e05a4c6a2b28a16221fbeaa74db4db7d Mon Sep 17 00:00:00 2001
From: Mikael Vidstedt <mikael@openjdk.org>
Date: Fri, 28 Feb 2025 23:34:07 +0000
Subject: [PATCH 178/587] 8350819: Ignore core files

Reviewed-by: erikj, dholmes
---
 .gitignore                | 1 +
 make/conf/jib-profiles.js | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index b57addfccc9..2d82e0d943c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -22,3 +22,4 @@ NashornProfile.txt
 /.cache
 /.gdbinit
 /.lldbinit
+**/core.[0-9]*
diff --git a/make/conf/jib-profiles.js b/make/conf/jib-profiles.js
index 397e75968e4..41da3833293 100644
--- a/make/conf/jib-profiles.js
+++ b/make/conf/jib-profiles.js
@@ -207,7 +207,8 @@ var getJibProfiles = function (input) {
     // Exclude list to use when Jib creates a source bundle
     data.src_bundle_excludes = [
         "build", "{,**/}webrev*", "{,**/}.hg", "{,**/}JTwork*", "{,**/}JTreport*",
-        "{,**/}.git"
+        "{,**/}.git",
+        "{,**/}core.[0-9]*"
     ];
     // Include list to use when creating a minimal jib source bundle which
     // contains just the jib configuration files.

From 157e5ad4a3abc7aea9ec2ec3d2381e42101990b8 Mon Sep 17 00:00:00 2001
From: Ioi Lam <iklam@openjdk.org>
Date: Sun, 2 Mar 2025 03:43:46 +0000
Subject: [PATCH 179/587] 8350916: Remove misleading warning "Cannot dump
 shared archive while using shared archive"

Reviewed-by: ccheung
---
 src/hotspot/share/cds/cdsConfig.cpp | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/hotspot/share/cds/cdsConfig.cpp b/src/hotspot/share/cds/cdsConfig.cpp
index a5c5742eaf2..ff11b807910 100644
--- a/src/hotspot/share/cds/cdsConfig.cpp
+++ b/src/hotspot/share/cds/cdsConfig.cpp
@@ -68,9 +68,16 @@ int CDSConfig::get_status() {
 
 void CDSConfig::initialize() {
   if (is_dumping_static_archive() && !is_dumping_final_static_archive()) {
-    if (RequireSharedSpaces) {
-      warning("Cannot dump shared archive while using shared archive");
-    }
+    // Note: -Xshare and -XX:AOTMode flags are mutually exclusive.
+    // - Classic workflow: -Xshare:on and -Xshare:dump cannot take effect at the same time.
+    // - JEP 483 workflow: -XX:AOTMode:record and -XX:AOTMode=on cannot take effect at the same time.
+    // So we can never come to here with RequireSharedSpaces==true.
+    assert(!RequireSharedSpaces, "sanity");
+
+    // If dumping the classic archive, or making an AOT training run (dumping a preimage archive),
+    // for sanity, parse all classes from classfiles.
+    // TODO: in the future, if we want to support re-training on top of an existing AOT cache, this
+    // needs to be changed.
     UseSharedSpaces = false;
   }
 

From 0a1eea112d9f709bac32908f216b8598e918ed33 Mon Sep 17 00:00:00 2001
From: Kim Barrett <kbarrett@openjdk.org>
Date: Sun, 2 Mar 2025 23:36:27 +0000
Subject: [PATCH 180/587] 8345492: Fix -Wzero-as-null-pointer-constant warnings
 in adlc code

Reviewed-by: kvn, dlong
---
 src/hotspot/share/adlc/formssel.cpp | 12 ++++++------
 src/hotspot/share/adlc/formssel.hpp |  6 +++---
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/hotspot/share/adlc/formssel.cpp b/src/hotspot/share/adlc/formssel.cpp
index f18e9eddba5..2edec13c0ff 100644
--- a/src/hotspot/share/adlc/formssel.cpp
+++ b/src/hotspot/share/adlc/formssel.cpp
@@ -1854,14 +1854,14 @@ void InsEncode::output(FILE *fp) {
   fprintf(fp,"InsEncode: ");
   _encoding.reset();
 
-  while ( (encoding = (NameAndList*)_encoding.iter()) != 0 ) {
+  while ( (encoding = (NameAndList*)_encoding.iter()) != nullptr ) {
     // Output the encoding being used
     fprintf(fp,"%s(", encoding->name() );
 
     // Output its parameter list, if any
     bool first_param = true;
     encoding->reset();
-    while (  (parameter = encoding->iter()) != 0 ) {
+    while (  (parameter = encoding->iter()) != nullptr ) {
       // Output the ',' between parameters
       if ( ! first_param )  fprintf(fp,", ");
       first_param = false;
@@ -3305,7 +3305,7 @@ void ComponentList::output(FILE *fp) {
 MatchNode::MatchNode(ArchDesc &ad, const char *result, const char *mexpr,
                      const char *opType, MatchNode *lChild, MatchNode *rChild)
   : _AD(ad), _result(result), _name(mexpr), _opType(opType),
-    _lChild(lChild), _rChild(rChild), _internalop(0), _numleaves(0),
+    _lChild(lChild), _rChild(rChild), _internalop(nullptr), _numleaves(0),
     _commutative_id(0) {
   _numleaves = (lChild ? lChild->_numleaves : 0)
                + (rChild ? rChild->_numleaves : 0);
@@ -3314,14 +3314,14 @@ MatchNode::MatchNode(ArchDesc &ad, const char *result, const char *mexpr,
 MatchNode::MatchNode(ArchDesc &ad, MatchNode& mnode)
   : _AD(ad), _result(mnode._result), _name(mnode._name),
     _opType(mnode._opType), _lChild(mnode._lChild), _rChild(mnode._rChild),
-    _internalop(0), _numleaves(mnode._numleaves),
+    _internalop(nullptr), _numleaves(mnode._numleaves),
     _commutative_id(mnode._commutative_id) {
 }
 
 MatchNode::MatchNode(ArchDesc &ad, MatchNode& mnode, int clone)
   : _AD(ad), _result(mnode._result), _name(mnode._name),
     _opType(mnode._opType),
-    _internalop(0), _numleaves(mnode._numleaves),
+    _internalop(nullptr), _numleaves(mnode._numleaves),
     _commutative_id(mnode._commutative_id) {
   if (mnode._lChild) {
     _lChild = new MatchNode(ad, *mnode._lChild, clone);
@@ -3624,7 +3624,7 @@ void MatchNode::dump() {
 }
 
 void MatchNode::output(FILE *fp) {
-  if (_lChild==0 && _rChild==0) {
+  if (_lChild==nullptr && _rChild==nullptr) {
     fprintf(fp," %s",_name);    // operand
   }
   else {
diff --git a/src/hotspot/share/adlc/formssel.hpp b/src/hotspot/share/adlc/formssel.hpp
index 61d0fb40f18..dca1a50991b 100644
--- a/src/hotspot/share/adlc/formssel.hpp
+++ b/src/hotspot/share/adlc/formssel.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -973,8 +973,8 @@ public:
   int         _commutative_id;     // id of commutative operation
 
   // Public Methods
-  MatchNode(ArchDesc &ad, const char *result = 0, const char *expr = 0,
-            const char *opType=0, MatchNode *lChild=nullptr,
+  MatchNode(ArchDesc &ad, const char *result = nullptr, const char *expr = nullptr,
+            const char *opType=nullptr, MatchNode *lChild=nullptr,
             MatchNode *rChild=nullptr);
   MatchNode(ArchDesc &ad, MatchNode& mNode); // Shallow copy constructor;
   MatchNode(ArchDesc &ad, MatchNode& mNode, int clone); // Construct clone

From d48ddfe49a4e0b07949912d3c91d6f4737658b3e Mon Sep 17 00:00:00 2001
From: Xiaohong Gong <xgong@openjdk.org>
Date: Mon, 3 Mar 2025 02:22:15 +0000
Subject: [PATCH 181/587] 8350748: VectorAPI: Method "checkMaskFromIndexSize"
 should be force inlined

Reviewed-by: psandoz
---
 .../jdk/incubator/vector/ByteVector.java      | 38 +++++-----------
 .../jdk/incubator/vector/DoubleVector.java    | 32 ++++----------
 .../jdk/incubator/vector/FloatVector.java     | 32 ++++----------
 .../jdk/incubator/vector/IntVector.java       | 34 ++++----------
 .../jdk/incubator/vector/LongVector.java      | 32 ++++----------
 .../jdk/incubator/vector/ShortVector.java     | 38 +++++-----------
 .../incubator/vector/X-Vector.java.template   | 44 +++++++------------
 7 files changed, 73 insertions(+), 177 deletions(-)

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 e3829141683..678ae25f29a 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
@@ -3060,7 +3060,8 @@ public abstract class ByteVector extends AbstractVector<Byte> {
             return vsp.dummyVector().fromArray0(a, offset, m, OFFSET_IN_RANGE);
         }
 
-        checkMaskFromIndexSize(offset, vsp, m, 1, a.length);
+        ((AbstractMask<Byte>)m)
+            .checkIndexByLane(offset, a.length, vsp.iota(), 1);
         return vsp.dummyVector().fromArray0(a, offset, m, OFFSET_OUT_OF_RANGE);
     }
 
@@ -3249,7 +3250,8 @@ public abstract class ByteVector extends AbstractVector<Byte> {
             return vsp.dummyVector().fromBooleanArray0(a, offset, m, OFFSET_IN_RANGE);
         }
 
-        checkMaskFromIndexSize(offset, vsp, m, 1, a.length);
+        ((AbstractMask<Byte>)m)
+            .checkIndexByLane(offset, a.length, vsp.iota(), 1);
         return vsp.dummyVector().fromBooleanArray0(a, offset, m, OFFSET_OUT_OF_RANGE);
     }
 
@@ -3431,7 +3433,8 @@ public abstract class ByteVector extends AbstractVector<Byte> {
             return vsp.dummyVector().fromMemorySegment0(ms, offset, m, OFFSET_IN_RANGE).maybeSwap(bo);
         }
 
-        checkMaskFromIndexSize(offset, vsp, m, 1, ms.byteSize());
+        ((AbstractMask<Byte>)m)
+            .checkIndexByLane(offset, ms.byteSize(), vsp.iota(), 1);
         return vsp.dummyVector().fromMemorySegment0(ms, offset, m, OFFSET_OUT_OF_RANGE).maybeSwap(bo);
     }
 
@@ -3499,7 +3502,8 @@ public abstract class ByteVector extends AbstractVector<Byte> {
         } else {
             ByteSpecies vsp = vspecies();
             if (!VectorIntrinsics.indexInRange(offset, vsp.length(), a.length)) {
-                checkMaskFromIndexSize(offset, vsp, m, 1, a.length);
+                ((AbstractMask<Byte>)m)
+                    .checkIndexByLane(offset, a.length, vsp.iota(), 1);
             }
             intoArray0(a, offset, m);
         }
@@ -3656,7 +3660,8 @@ public abstract class ByteVector extends AbstractVector<Byte> {
         } else {
             ByteSpecies vsp = vspecies();
             if (!VectorIntrinsics.indexInRange(offset, vsp.length(), a.length)) {
-                checkMaskFromIndexSize(offset, vsp, m, 1, a.length);
+                ((AbstractMask<Byte>)m)
+                    .checkIndexByLane(offset, a.length, vsp.iota(), 1);
             }
             intoBooleanArray0(a, offset, m);
         }
@@ -3788,7 +3793,8 @@ public abstract class ByteVector extends AbstractVector<Byte> {
             }
             ByteSpecies vsp = vspecies();
             if (!VectorIntrinsics.indexInRange(offset, vsp.vectorByteSize(), ms.byteSize())) {
-                checkMaskFromIndexSize(offset, vsp, m, 1, ms.byteSize());
+                ((AbstractMask<Byte>)m)
+                    .checkIndexByLane(offset, ms.byteSize(), vsp.iota(), 1);
             }
             maybeSwap(bo).intoMemorySegment0(ms, offset, m);
         }
@@ -4040,26 +4046,6 @@ public abstract class ByteVector extends AbstractVector<Byte> {
 
     // End of low-level memory operations.
 
-    private static
-    void checkMaskFromIndexSize(int offset,
-                                ByteSpecies vsp,
-                                VectorMask<Byte> m,
-                                int scale,
-                                int limit) {
-        ((AbstractMask<Byte>)m)
-            .checkIndexByLane(offset, limit, vsp.iota(), scale);
-    }
-
-    private static
-    void checkMaskFromIndexSize(long offset,
-                                ByteSpecies vsp,
-                                VectorMask<Byte> m,
-                                int scale,
-                                long limit) {
-        ((AbstractMask<Byte>)m)
-            .checkIndexByLane(offset, limit, vsp.iota(), scale);
-    }
-
     @ForceInline
     private void conditionalStoreNYI(int offset,
                                      ByteSpecies vsp,
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 cbb21667a15..9f1e7f9ece4 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
@@ -2836,7 +2836,8 @@ public abstract class DoubleVector extends AbstractVector<Double> {
             return vsp.dummyVector().fromArray0(a, offset, m, OFFSET_IN_RANGE);
         }
 
-        checkMaskFromIndexSize(offset, vsp, m, 1, a.length);
+        ((AbstractMask<Double>)m)
+            .checkIndexByLane(offset, a.length, vsp.iota(), 1);
         return vsp.dummyVector().fromArray0(a, offset, m, OFFSET_OUT_OF_RANGE);
     }
 
@@ -3064,7 +3065,8 @@ public abstract class DoubleVector extends AbstractVector<Double> {
             return vsp.dummyVector().fromMemorySegment0(ms, offset, m, OFFSET_IN_RANGE).maybeSwap(bo);
         }
 
-        checkMaskFromIndexSize(offset, vsp, m, 8, ms.byteSize());
+        ((AbstractMask<Double>)m)
+            .checkIndexByLane(offset, ms.byteSize(), vsp.iota(), 8);
         return vsp.dummyVector().fromMemorySegment0(ms, offset, m, OFFSET_OUT_OF_RANGE).maybeSwap(bo);
     }
 
@@ -3132,7 +3134,8 @@ public abstract class DoubleVector extends AbstractVector<Double> {
         } else {
             DoubleSpecies vsp = vspecies();
             if (!VectorIntrinsics.indexInRange(offset, vsp.length(), a.length)) {
-                checkMaskFromIndexSize(offset, vsp, m, 1, a.length);
+                ((AbstractMask<Double>)m)
+                    .checkIndexByLane(offset, a.length, vsp.iota(), 1);
             }
             intoArray0(a, offset, m);
         }
@@ -3290,7 +3293,8 @@ public abstract class DoubleVector extends AbstractVector<Double> {
             }
             DoubleSpecies vsp = vspecies();
             if (!VectorIntrinsics.indexInRange(offset, vsp.vectorByteSize(), ms.byteSize())) {
-                checkMaskFromIndexSize(offset, vsp, m, 8, ms.byteSize());
+                ((AbstractMask<Double>)m)
+                    .checkIndexByLane(offset, ms.byteSize(), vsp.iota(), 8);
             }
             maybeSwap(bo).intoMemorySegment0(ms, offset, m);
         }
@@ -3554,26 +3558,6 @@ public abstract class DoubleVector extends AbstractVector<Double> {
 
     // End of low-level memory operations.
 
-    private static
-    void checkMaskFromIndexSize(int offset,
-                                DoubleSpecies vsp,
-                                VectorMask<Double> m,
-                                int scale,
-                                int limit) {
-        ((AbstractMask<Double>)m)
-            .checkIndexByLane(offset, limit, vsp.iota(), scale);
-    }
-
-    private static
-    void checkMaskFromIndexSize(long offset,
-                                DoubleSpecies vsp,
-                                VectorMask<Double> m,
-                                int scale,
-                                long limit) {
-        ((AbstractMask<Double>)m)
-            .checkIndexByLane(offset, limit, vsp.iota(), scale);
-    }
-
     @ForceInline
     private void conditionalStoreNYI(int offset,
                                      DoubleSpecies vsp,
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 78259e7698b..cef1b431bf0 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
@@ -2860,7 +2860,8 @@ public abstract class FloatVector extends AbstractVector<Float> {
             return vsp.dummyVector().fromArray0(a, offset, m, OFFSET_IN_RANGE);
         }
 
-        checkMaskFromIndexSize(offset, vsp, m, 1, a.length);
+        ((AbstractMask<Float>)m)
+            .checkIndexByLane(offset, a.length, vsp.iota(), 1);
         return vsp.dummyVector().fromArray0(a, offset, m, OFFSET_OUT_OF_RANGE);
     }
 
@@ -3070,7 +3071,8 @@ public abstract class FloatVector extends AbstractVector<Float> {
             return vsp.dummyVector().fromMemorySegment0(ms, offset, m, OFFSET_IN_RANGE).maybeSwap(bo);
         }
 
-        checkMaskFromIndexSize(offset, vsp, m, 4, ms.byteSize());
+        ((AbstractMask<Float>)m)
+            .checkIndexByLane(offset, ms.byteSize(), vsp.iota(), 4);
         return vsp.dummyVector().fromMemorySegment0(ms, offset, m, OFFSET_OUT_OF_RANGE).maybeSwap(bo);
     }
 
@@ -3138,7 +3140,8 @@ public abstract class FloatVector extends AbstractVector<Float> {
         } else {
             FloatSpecies vsp = vspecies();
             if (!VectorIntrinsics.indexInRange(offset, vsp.length(), a.length)) {
-                checkMaskFromIndexSize(offset, vsp, m, 1, a.length);
+                ((AbstractMask<Float>)m)
+                    .checkIndexByLane(offset, a.length, vsp.iota(), 1);
             }
             intoArray0(a, offset, m);
         }
@@ -3277,7 +3280,8 @@ public abstract class FloatVector extends AbstractVector<Float> {
             }
             FloatSpecies vsp = vspecies();
             if (!VectorIntrinsics.indexInRange(offset, vsp.vectorByteSize(), ms.byteSize())) {
-                checkMaskFromIndexSize(offset, vsp, m, 4, ms.byteSize());
+                ((AbstractMask<Float>)m)
+                    .checkIndexByLane(offset, ms.byteSize(), vsp.iota(), 4);
             }
             maybeSwap(bo).intoMemorySegment0(ms, offset, m);
         }
@@ -3504,26 +3508,6 @@ public abstract class FloatVector extends AbstractVector<Float> {
 
     // End of low-level memory operations.
 
-    private static
-    void checkMaskFromIndexSize(int offset,
-                                FloatSpecies vsp,
-                                VectorMask<Float> m,
-                                int scale,
-                                int limit) {
-        ((AbstractMask<Float>)m)
-            .checkIndexByLane(offset, limit, vsp.iota(), scale);
-    }
-
-    private static
-    void checkMaskFromIndexSize(long offset,
-                                FloatSpecies vsp,
-                                VectorMask<Float> m,
-                                int scale,
-                                long limit) {
-        ((AbstractMask<Float>)m)
-            .checkIndexByLane(offset, limit, vsp.iota(), scale);
-    }
-
     @ForceInline
     private void conditionalStoreNYI(int offset,
                                      FloatSpecies vsp,
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 d68bba1d7e2..e11381e82c5 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
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -3038,7 +3038,8 @@ public abstract class IntVector extends AbstractVector<Integer> {
             return vsp.dummyVector().fromArray0(a, offset, m, OFFSET_IN_RANGE);
         }
 
-        checkMaskFromIndexSize(offset, vsp, m, 1, a.length);
+        ((AbstractMask<Integer>)m)
+            .checkIndexByLane(offset, a.length, vsp.iota(), 1);
         return vsp.dummyVector().fromArray0(a, offset, m, OFFSET_OUT_OF_RANGE);
     }
 
@@ -3248,7 +3249,8 @@ public abstract class IntVector extends AbstractVector<Integer> {
             return vsp.dummyVector().fromMemorySegment0(ms, offset, m, OFFSET_IN_RANGE).maybeSwap(bo);
         }
 
-        checkMaskFromIndexSize(offset, vsp, m, 4, ms.byteSize());
+        ((AbstractMask<Integer>)m)
+            .checkIndexByLane(offset, ms.byteSize(), vsp.iota(), 4);
         return vsp.dummyVector().fromMemorySegment0(ms, offset, m, OFFSET_OUT_OF_RANGE).maybeSwap(bo);
     }
 
@@ -3316,7 +3318,8 @@ public abstract class IntVector extends AbstractVector<Integer> {
         } else {
             IntSpecies vsp = vspecies();
             if (!VectorIntrinsics.indexInRange(offset, vsp.length(), a.length)) {
-                checkMaskFromIndexSize(offset, vsp, m, 1, a.length);
+                ((AbstractMask<Integer>)m)
+                    .checkIndexByLane(offset, a.length, vsp.iota(), 1);
             }
             intoArray0(a, offset, m);
         }
@@ -3455,7 +3458,8 @@ public abstract class IntVector extends AbstractVector<Integer> {
             }
             IntSpecies vsp = vspecies();
             if (!VectorIntrinsics.indexInRange(offset, vsp.vectorByteSize(), ms.byteSize())) {
-                checkMaskFromIndexSize(offset, vsp, m, 4, ms.byteSize());
+                ((AbstractMask<Integer>)m)
+                    .checkIndexByLane(offset, ms.byteSize(), vsp.iota(), 4);
             }
             maybeSwap(bo).intoMemorySegment0(ms, offset, m);
         }
@@ -3682,26 +3686,6 @@ public abstract class IntVector extends AbstractVector<Integer> {
 
     // End of low-level memory operations.
 
-    private static
-    void checkMaskFromIndexSize(int offset,
-                                IntSpecies vsp,
-                                VectorMask<Integer> m,
-                                int scale,
-                                int limit) {
-        ((AbstractMask<Integer>)m)
-            .checkIndexByLane(offset, limit, vsp.iota(), scale);
-    }
-
-    private static
-    void checkMaskFromIndexSize(long offset,
-                                IntSpecies vsp,
-                                VectorMask<Integer> m,
-                                int scale,
-                                long limit) {
-        ((AbstractMask<Integer>)m)
-            .checkIndexByLane(offset, limit, vsp.iota(), scale);
-    }
-
     @ForceInline
     private void conditionalStoreNYI(int offset,
                                      IntSpecies vsp,
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 1fa1cafac4e..4d54fbf7ad3 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
@@ -2899,7 +2899,8 @@ public abstract class LongVector extends AbstractVector<Long> {
             return vsp.dummyVector().fromArray0(a, offset, m, OFFSET_IN_RANGE);
         }
 
-        checkMaskFromIndexSize(offset, vsp, m, 1, a.length);
+        ((AbstractMask<Long>)m)
+            .checkIndexByLane(offset, a.length, vsp.iota(), 1);
         return vsp.dummyVector().fromArray0(a, offset, m, OFFSET_OUT_OF_RANGE);
     }
 
@@ -3127,7 +3128,8 @@ public abstract class LongVector extends AbstractVector<Long> {
             return vsp.dummyVector().fromMemorySegment0(ms, offset, m, OFFSET_IN_RANGE).maybeSwap(bo);
         }
 
-        checkMaskFromIndexSize(offset, vsp, m, 8, ms.byteSize());
+        ((AbstractMask<Long>)m)
+            .checkIndexByLane(offset, ms.byteSize(), vsp.iota(), 8);
         return vsp.dummyVector().fromMemorySegment0(ms, offset, m, OFFSET_OUT_OF_RANGE).maybeSwap(bo);
     }
 
@@ -3195,7 +3197,8 @@ public abstract class LongVector extends AbstractVector<Long> {
         } else {
             LongSpecies vsp = vspecies();
             if (!VectorIntrinsics.indexInRange(offset, vsp.length(), a.length)) {
-                checkMaskFromIndexSize(offset, vsp, m, 1, a.length);
+                ((AbstractMask<Long>)m)
+                    .checkIndexByLane(offset, a.length, vsp.iota(), 1);
             }
             intoArray0(a, offset, m);
         }
@@ -3353,7 +3356,8 @@ public abstract class LongVector extends AbstractVector<Long> {
             }
             LongSpecies vsp = vspecies();
             if (!VectorIntrinsics.indexInRange(offset, vsp.vectorByteSize(), ms.byteSize())) {
-                checkMaskFromIndexSize(offset, vsp, m, 8, ms.byteSize());
+                ((AbstractMask<Long>)m)
+                    .checkIndexByLane(offset, ms.byteSize(), vsp.iota(), 8);
             }
             maybeSwap(bo).intoMemorySegment0(ms, offset, m);
         }
@@ -3617,26 +3621,6 @@ public abstract class LongVector extends AbstractVector<Long> {
 
     // End of low-level memory operations.
 
-    private static
-    void checkMaskFromIndexSize(int offset,
-                                LongSpecies vsp,
-                                VectorMask<Long> m,
-                                int scale,
-                                int limit) {
-        ((AbstractMask<Long>)m)
-            .checkIndexByLane(offset, limit, vsp.iota(), scale);
-    }
-
-    private static
-    void checkMaskFromIndexSize(long offset,
-                                LongSpecies vsp,
-                                VectorMask<Long> m,
-                                int scale,
-                                long limit) {
-        ((AbstractMask<Long>)m)
-            .checkIndexByLane(offset, limit, vsp.iota(), scale);
-    }
-
     @ForceInline
     private void conditionalStoreNYI(int offset,
                                      LongSpecies vsp,
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 19d7fa1d95e..92ca4b1ca70 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
@@ -3061,7 +3061,8 @@ public abstract class ShortVector extends AbstractVector<Short> {
             return vsp.dummyVector().fromArray0(a, offset, m, OFFSET_IN_RANGE);
         }
 
-        checkMaskFromIndexSize(offset, vsp, m, 1, a.length);
+        ((AbstractMask<Short>)m)
+            .checkIndexByLane(offset, a.length, vsp.iota(), 1);
         return vsp.dummyVector().fromArray0(a, offset, m, OFFSET_OUT_OF_RANGE);
     }
 
@@ -3242,7 +3243,8 @@ public abstract class ShortVector extends AbstractVector<Short> {
             return vsp.dummyVector().fromCharArray0(a, offset, m, OFFSET_IN_RANGE);
         }
 
-        checkMaskFromIndexSize(offset, vsp, m, 1, a.length);
+        ((AbstractMask<Short>)m)
+            .checkIndexByLane(offset, a.length, vsp.iota(), 1);
         return vsp.dummyVector().fromCharArray0(a, offset, m, OFFSET_OUT_OF_RANGE);
     }
 
@@ -3430,7 +3432,8 @@ public abstract class ShortVector extends AbstractVector<Short> {
             return vsp.dummyVector().fromMemorySegment0(ms, offset, m, OFFSET_IN_RANGE).maybeSwap(bo);
         }
 
-        checkMaskFromIndexSize(offset, vsp, m, 2, ms.byteSize());
+        ((AbstractMask<Short>)m)
+            .checkIndexByLane(offset, ms.byteSize(), vsp.iota(), 2);
         return vsp.dummyVector().fromMemorySegment0(ms, offset, m, OFFSET_OUT_OF_RANGE).maybeSwap(bo);
     }
 
@@ -3498,7 +3501,8 @@ public abstract class ShortVector extends AbstractVector<Short> {
         } else {
             ShortSpecies vsp = vspecies();
             if (!VectorIntrinsics.indexInRange(offset, vsp.length(), a.length)) {
-                checkMaskFromIndexSize(offset, vsp, m, 1, a.length);
+                ((AbstractMask<Short>)m)
+                    .checkIndexByLane(offset, a.length, vsp.iota(), 1);
             }
             intoArray0(a, offset, m);
         }
@@ -3647,7 +3651,8 @@ public abstract class ShortVector extends AbstractVector<Short> {
         } else {
             ShortSpecies vsp = vspecies();
             if (!VectorIntrinsics.indexInRange(offset, vsp.length(), a.length)) {
-                checkMaskFromIndexSize(offset, vsp, m, 1, a.length);
+                ((AbstractMask<Short>)m)
+                    .checkIndexByLane(offset, a.length, vsp.iota(), 1);
             }
             intoCharArray0(a, offset, m);
         }
@@ -3774,7 +3779,8 @@ public abstract class ShortVector extends AbstractVector<Short> {
             }
             ShortSpecies vsp = vspecies();
             if (!VectorIntrinsics.indexInRange(offset, vsp.vectorByteSize(), ms.byteSize())) {
-                checkMaskFromIndexSize(offset, vsp, m, 2, ms.byteSize());
+                ((AbstractMask<Short>)m)
+                    .checkIndexByLane(offset, ms.byteSize(), vsp.iota(), 2);
             }
             maybeSwap(bo).intoMemorySegment0(ms, offset, m);
         }
@@ -4026,26 +4032,6 @@ public abstract class ShortVector extends AbstractVector<Short> {
 
     // End of low-level memory operations.
 
-    private static
-    void checkMaskFromIndexSize(int offset,
-                                ShortSpecies vsp,
-                                VectorMask<Short> m,
-                                int scale,
-                                int limit) {
-        ((AbstractMask<Short>)m)
-            .checkIndexByLane(offset, limit, vsp.iota(), scale);
-    }
-
-    private static
-    void checkMaskFromIndexSize(long offset,
-                                ShortSpecies vsp,
-                                VectorMask<Short> m,
-                                int scale,
-                                long limit) {
-        ((AbstractMask<Short>)m)
-            .checkIndexByLane(offset, limit, vsp.iota(), scale);
-    }
-
     @ForceInline
     private void conditionalStoreNYI(int offset,
                                      ShortSpecies vsp,
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 05979330ab1..235641b57a0 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
@@ -3666,7 +3666,8 @@ public abstract class $abstractvectortype$ extends AbstractVector<$Boxtype$> {
             return vsp.dummyVector().fromArray0(a, offset, m, OFFSET_IN_RANGE);
         }
 
-        checkMaskFromIndexSize(offset, vsp, m, 1, a.length);
+        ((AbstractMask<$Boxtype$>)m)
+            .checkIndexByLane(offset, a.length, vsp.iota(), 1);
         return vsp.dummyVector().fromArray0(a, offset, m, OFFSET_OUT_OF_RANGE);
     }
 
@@ -3902,7 +3903,8 @@ public abstract class $abstractvectortype$ extends AbstractVector<$Boxtype$> {
             return vsp.dummyVector().fromCharArray0(a, offset, m, OFFSET_IN_RANGE);
         }
 
-        checkMaskFromIndexSize(offset, vsp, m, 1, a.length);
+        ((AbstractMask<$Boxtype$>)m)
+            .checkIndexByLane(offset, a.length, vsp.iota(), 1);
         return vsp.dummyVector().fromCharArray0(a, offset, m, OFFSET_OUT_OF_RANGE);
     }
 
@@ -4061,7 +4063,8 @@ public abstract class $abstractvectortype$ extends AbstractVector<$Boxtype$> {
             return vsp.dummyVector().fromBooleanArray0(a, offset, m, OFFSET_IN_RANGE);
         }
 
-        checkMaskFromIndexSize(offset, vsp, m, 1, a.length);
+        ((AbstractMask<$Boxtype$>)m)
+            .checkIndexByLane(offset, a.length, vsp.iota(), 1);
         return vsp.dummyVector().fromBooleanArray0(a, offset, m, OFFSET_OUT_OF_RANGE);
     }
 
@@ -4253,7 +4256,8 @@ public abstract class $abstractvectortype$ extends AbstractVector<$Boxtype$> {
             return vsp.dummyVector().fromMemorySegment0(ms, offset, m, OFFSET_IN_RANGE).maybeSwap(bo);
         }
 
-        checkMaskFromIndexSize(offset, vsp, m, $sizeInBytes$, ms.byteSize());
+        ((AbstractMask<$Boxtype$>)m)
+            .checkIndexByLane(offset, ms.byteSize(), vsp.iota(), $sizeInBytes$);
         return vsp.dummyVector().fromMemorySegment0(ms, offset, m, OFFSET_OUT_OF_RANGE).maybeSwap(bo);
     }
 
@@ -4321,7 +4325,8 @@ public abstract class $abstractvectortype$ extends AbstractVector<$Boxtype$> {
         } else {
             $Type$Species vsp = vspecies();
             if (!VectorIntrinsics.indexInRange(offset, vsp.length(), a.length)) {
-                checkMaskFromIndexSize(offset, vsp, m, 1, a.length);
+                ((AbstractMask<$Boxtype$>)m)
+                    .checkIndexByLane(offset, a.length, vsp.iota(), 1);
             }
             intoArray0(a, offset, m);
         }
@@ -4541,7 +4546,8 @@ public abstract class $abstractvectortype$ extends AbstractVector<$Boxtype$> {
         } else {
             $Type$Species vsp = vspecies();
             if (!VectorIntrinsics.indexInRange(offset, vsp.length(), a.length)) {
-                checkMaskFromIndexSize(offset, vsp, m, 1, a.length);
+                ((AbstractMask<$Boxtype$>)m)
+                    .checkIndexByLane(offset, a.length, vsp.iota(), 1);
             }
             intoCharArray0(a, offset, m);
         }
@@ -4705,7 +4711,8 @@ public abstract class $abstractvectortype$ extends AbstractVector<$Boxtype$> {
         } else {
             $Type$Species vsp = vspecies();
             if (!VectorIntrinsics.indexInRange(offset, vsp.length(), a.length)) {
-                checkMaskFromIndexSize(offset, vsp, m, 1, a.length);
+                ((AbstractMask<$Boxtype$>)m)
+                    .checkIndexByLane(offset, a.length, vsp.iota(), 1);
             }
             intoBooleanArray0(a, offset, m);
         }
@@ -4838,7 +4845,8 @@ public abstract class $abstractvectortype$ extends AbstractVector<$Boxtype$> {
             }
             $Type$Species vsp = vspecies();
             if (!VectorIntrinsics.indexInRange(offset, vsp.vectorByteSize(), ms.byteSize())) {
-                checkMaskFromIndexSize(offset, vsp, m, $sizeInBytes$, ms.byteSize());
+                ((AbstractMask<$Boxtype$>)m)
+                    .checkIndexByLane(offset, ms.byteSize(), vsp.iota(), $sizeInBytes$);
             }
             maybeSwap(bo).intoMemorySegment0(ms, offset, m);
         }
@@ -5263,26 +5271,6 @@ public abstract class $abstractvectortype$ extends AbstractVector<$Boxtype$> {
 
     // End of low-level memory operations.
 
-    private static
-    void checkMaskFromIndexSize(int offset,
-                                $Type$Species vsp,
-                                VectorMask<$Boxtype$> m,
-                                int scale,
-                                int limit) {
-        ((AbstractMask<$Boxtype$>)m)
-            .checkIndexByLane(offset, limit, vsp.iota(), scale);
-    }
-
-    private static
-    void checkMaskFromIndexSize(long offset,
-                                $Type$Species vsp,
-                                VectorMask<$Boxtype$> m,
-                                int scale,
-                                long limit) {
-        ((AbstractMask<$Boxtype$>)m)
-            .checkIndexByLane(offset, limit, vsp.iota(), scale);
-    }
-
     @ForceInline
     private void conditionalStoreNYI(int offset,
                                      $Type$Species vsp,

From 93c878455bfffc07f115f9e20ee11b20186eb2be Mon Sep 17 00:00:00 2001
From: Amit Kumar <amitkumar@openjdk.org>
Date: Mon, 3 Mar 2025 03:12:37 +0000
Subject: [PATCH 182/587] 8350716: [s390] intrinsify Thread.currentThread()

Reviewed-by: lucy, mdoerr
---
 .../cpu/s390/templateInterpreterGenerator_s390.cpp | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/hotspot/cpu/s390/templateInterpreterGenerator_s390.cpp b/src/hotspot/cpu/s390/templateInterpreterGenerator_s390.cpp
index c40be5edec7..06ff4b363f5 100644
--- a/src/hotspot/cpu/s390/templateInterpreterGenerator_s390.cpp
+++ b/src/hotspot/cpu/s390/templateInterpreterGenerator_s390.cpp
@@ -2006,8 +2006,20 @@ address TemplateInterpreterGenerator::generate_CRC32C_updateBytes_entry(Abstract
   return __ addr_at(entry_off);
 }
 
+address TemplateInterpreterGenerator::generate_currentThread() {
+  uint64_t entry_off = __ offset();
+
+  __ z_lg(Z_RET, Address(Z_thread, JavaThread::threadObj_offset()));
+  __ resolve_oop_handle(Z_RET);
+
+  // Restore caller sp for c2i case.
+  __ resize_frame_absolute(Z_R10, Z_R0, true); // Cut the stack back to where the caller started.
+  __ z_br(Z_R14);
+
+  return __ addr_at(entry_off);
+}
+
 // Not supported
-address TemplateInterpreterGenerator::generate_currentThread() { return nullptr; }
 address TemplateInterpreterGenerator::generate_Float_intBitsToFloat_entry() { return nullptr; }
 address TemplateInterpreterGenerator::generate_Float_floatToRawIntBits_entry() { return nullptr; }
 address TemplateInterpreterGenerator::generate_Double_longBitsToDouble_entry() { return nullptr; }

From 3657e92ead1e678942fcb272e77c3867eb5aa13e Mon Sep 17 00:00:00 2001
From: Jasmine Karthikeyan <jkarthikeyan@openjdk.org>
Date: Mon, 3 Mar 2025 05:18:55 +0000
Subject: [PATCH 183/587] 8349637: Integer.numberOfLeadingZeros outputs
 incorrectly in certain cases

Reviewed-by: thartmann, qamai, jbhateja
---
 src/hotspot/cpu/x86/c2_MacroAssembler_x86.cpp |  14 +-
 .../TestNumberOfContinuousZeros.java          |  87 +++++++++++-
 .../vectorization/TestVectorZeroCount.java    | 128 ++++++++++++++++++
 3 files changed, 222 insertions(+), 7 deletions(-)
 create mode 100644 test/hotspot/jtreg/compiler/vectorization/TestVectorZeroCount.java

diff --git a/src/hotspot/cpu/x86/c2_MacroAssembler_x86.cpp b/src/hotspot/cpu/x86/c2_MacroAssembler_x86.cpp
index 7356f5a1913..b8ddbfe5120 100644
--- a/src/hotspot/cpu/x86/c2_MacroAssembler_x86.cpp
+++ b/src/hotspot/cpu/x86/c2_MacroAssembler_x86.cpp
@@ -6227,15 +6227,21 @@ void C2_MacroAssembler::vector_count_leading_zeros_int_avx(XMMRegister dst, XMMR
   // Since IEEE 754 floating point format represents mantissa in 1.0 format
   // hence biased exponent can be used to compute leading zero count as per
   // following formula:-
-  // LZCNT = 32 - (biased_exp - 127)
+  // LZCNT = 31 - (biased_exp - 127)
   // Special handling has been introduced for Zero, Max_Int and -ve source values.
 
   // Broadcast 0xFF
   vpcmpeqd(xtmp1, xtmp1, xtmp1, vec_enc);
   vpsrld(xtmp1, xtmp1, 24, vec_enc);
 
+  // Remove the bit to the right of the highest set bit ensuring that the conversion to float cannot round up to a higher
+  // power of 2, which has a higher exponent than the input. This transformation is valid as only the highest set bit
+  // contributes to the leading number of zeros.
+  vpsrld(xtmp2, src, 1, vec_enc);
+  vpandn(xtmp3, xtmp2, src, vec_enc);
+
   // Extract biased exponent.
-  vcvtdq2ps(dst, src, vec_enc);
+  vcvtdq2ps(dst, xtmp3, vec_enc);
   vpsrld(dst, dst, 23, vec_enc);
   vpand(dst, dst, xtmp1, vec_enc);
 
@@ -6244,7 +6250,7 @@ void C2_MacroAssembler::vector_count_leading_zeros_int_avx(XMMRegister dst, XMMR
   // Exponent = biased_exp - 127
   vpsubd(dst, dst, xtmp1, vec_enc);
 
-  // Exponent = Exponent  + 1
+  // Exponent_plus_one = Exponent + 1
   vpsrld(xtmp3, xtmp1, 6, vec_enc);
   vpaddd(dst, dst, xtmp3, vec_enc);
 
@@ -6257,7 +6263,7 @@ void C2_MacroAssembler::vector_count_leading_zeros_int_avx(XMMRegister dst, XMMR
   vpslld(xtmp1, xtmp3, 5, vec_enc);
   // Exponent is 32 if corresponding source lane contains max_int value.
   vpcmpeqd(xtmp2, dst, xtmp1, vec_enc);
-  // LZCNT = 32 - exponent
+  // LZCNT = 32 - exponent_plus_one
   vpsubd(dst, xtmp1, dst, vec_enc);
 
   // Replace LZCNT with a value 1 if corresponding source lane
diff --git a/test/hotspot/jtreg/compiler/vectorization/TestNumberOfContinuousZeros.java b/test/hotspot/jtreg/compiler/vectorization/TestNumberOfContinuousZeros.java
index db0b563d1fe..3a273c7be8c 100644
--- a/test/hotspot/jtreg/compiler/vectorization/TestNumberOfContinuousZeros.java
+++ b/test/hotspot/jtreg/compiler/vectorization/TestNumberOfContinuousZeros.java
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2022, 2023, Arm Limited. All rights reserved.
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
  * 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 +24,7 @@
 
 /**
 * @test
+* @bug 8297172 8331993 8349637
 * @key randomness
 * @summary Test vectorization of numberOfTrailingZeros/numberOfLeadingZeros for Long
 * @requires vm.compiler2.enabled
@@ -30,16 +32,20 @@
 *           (os.simpleArch == "aarch64" & vm.cpu.features ~= ".*sve.*") |
 *           (os.simpleArch == "riscv64" & vm.cpu.features ~= ".*zvbb.*")
 * @library /test/lib /
+* @modules jdk.incubator.vector
 * @run driver compiler.vectorization.TestNumberOfContinuousZeros
 */
 
 package compiler.vectorization;
 
+import jdk.incubator.vector.*;
 import compiler.lib.ir_framework.*;
 import java.util.Random;
 import jdk.test.lib.Asserts;
+import jdk.test.lib.Utils;
 
 public class TestNumberOfContinuousZeros {
+    private static final int[] SPECIAL = { 0x01FFFFFF, 0x03FFFFFE, 0x07FFFFFC, 0x0FFFFFF8, 0x1FFFFFF0, 0x3FFFFFE0, 0xFFFFFFFF };
     private long[] inputLong;
     private int[] outputLong;
     private int[] inputInt;
@@ -47,8 +53,8 @@ public class TestNumberOfContinuousZeros {
     private static final int LEN = 1024;
     private Random rng;
 
-    public static void main(String args[]) {
-        TestFramework.run();
+    public static void main(String[] args) {
+        TestFramework.runWithFlags("--add-modules=jdk.incubator.vector");
     }
 
     public TestNumberOfContinuousZeros() {
@@ -56,7 +62,7 @@ public class TestNumberOfContinuousZeros {
         outputLong = new int[LEN];
         inputInt = new int[LEN];
         outputInt = new int[LEN];
-        rng = new Random(42);
+        rng = Utils.getRandomInstance();
         for (int i = 0; i < LEN; ++i) {
             inputLong[i] = rng.nextLong();
             inputInt[i] = rng.nextInt();
@@ -119,5 +125,80 @@ public class TestNumberOfContinuousZeros {
             Asserts.assertEquals(outputInt[i], Integer.numberOfLeadingZeros(inputInt[i]));
         }
     }
+
+    @Setup
+    static Object[] setupSpecialIntArray() {
+        int[] res = new int[LEN];
+
+        for (int i = 0; i < LEN; i++) {
+            res[i] = SPECIAL[i % SPECIAL.length];
+        }
+
+        return new Object[] { res };
+    }
+
+    @Test
+    @IR(counts = {IRNode.COUNT_LEADING_ZEROS_VI, "> 0"})
+    @Arguments(setup = "setupSpecialIntArray")
+    public Object[] testSpecialIntLeadingZeros(int[] ints) {
+        int[] res = new int[LEN];
+
+        for (int i = 0; i < LEN; ++i) {
+            res[i] = Integer.numberOfLeadingZeros(ints[i]);
+        }
+
+        return new Object[] { ints, res };
+    }
+
+    @Check(test = "testSpecialIntLeadingZeros")
+    public void checkSpecialIntLeadingZeros(Object[] vals) {
+        int[] in = (int[]) vals[0];
+        int[] out = (int[]) vals[1];
+
+        for (int i = 0; i < LEN; ++i) {
+            int value = Integer.numberOfLeadingZeros(in[i]);
+
+            if (out[i] != value) {
+                throw new IllegalStateException("Expected lzcnt(" + in[i] + ") to be " + value + " but got " + out[i]);
+            }
+        }
+    }
+
+    private static final VectorSpecies<Integer> SPECIES = IntVector.SPECIES_PREFERRED;
+
+    @Test
+    @IR(counts = {IRNode.COUNT_LEADING_ZEROS_VI, "> 0"})
+    @Arguments(setup = "setupSpecialIntArray")
+    public Object[] checkSpecialIntLeadingZerosVector(int[] ints) {
+        int[] res = new int[LEN];
+
+        for (int i = 0; i < ints.length; i += SPECIES.length()) {
+            IntVector av = IntVector.fromArray(SPECIES, ints, i);
+            av.lanewise(VectorOperators.LEADING_ZEROS_COUNT).intoArray(res, i);
+        }
+
+        return new Object[] { ints, res };
+    }
+
+    @Check(test = "checkSpecialIntLeadingZerosVector")
+    public void checkSpecialIntLeadingZerosVector(Object[] vals) {
+        int[] ints = (int[]) vals[0];
+        int[] res = (int[]) vals[1];
+
+        // Verification
+
+        int[] check = new int[LEN];
+
+        for (int i = 0; i < ints.length; i += SPECIES.length()) {
+            IntVector av = IntVector.fromArray(SPECIES, ints, i);
+            av.lanewise(VectorOperators.LEADING_ZEROS_COUNT).intoArray(check, i);
+        }
+
+        for (int i = 0; i < LEN; i++) {
+            if (res[i] != check[i]) {
+                throw new IllegalStateException("Expected " + check[i] + " but got " + res[i]);
+            }
+        }
+    }
 }
 
diff --git a/test/hotspot/jtreg/compiler/vectorization/TestVectorZeroCount.java b/test/hotspot/jtreg/compiler/vectorization/TestVectorZeroCount.java
new file mode 100644
index 00000000000..a29ade54008
--- /dev/null
+++ b/test/hotspot/jtreg/compiler/vectorization/TestVectorZeroCount.java
@@ -0,0 +1,128 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact 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 8349637
+ * @summary Ensure that vectorization of numberOfLeadingZeros and numberOfTrailingZeros outputs correct values
+ * @library /test/lib /
+ * @run main/othervm compiler.vectorization.TestVectorZeroCount
+ */
+
+package compiler.vectorization;
+
+import java.util.Random;
+
+import jdk.test.lib.Utils;
+
+public class TestVectorZeroCount {
+    private static final int SIZE = 1024;
+    private static final Random RANDOM = Utils.getRandomInstance();
+
+    private static final int[] INT_VALUES = new int[SIZE];
+    private static final int[] INT_EXPECTED_LEADING = new int[SIZE];
+    private static final int[] INT_RESULT_LEADING = new int[SIZE];
+    private static final int[] INT_EXPECTED_TRAILING = new int[SIZE];
+    private static final int[] INT_RESULT_TRAILING = new int[SIZE];
+
+    private static final long[] LONG_VALUES = new long[SIZE];
+    private static final long[] LONG_EXPECTED_LEADING = new long[SIZE];
+    private static final long[] LONG_RESULT_LEADING = new long[SIZE];
+    private static final long[] LONG_EXPECTED_TRAILING = new long[SIZE];
+    private static final long[] LONG_RESULT_TRAILING = new long[SIZE];
+
+    private static int intCounter = Integer.MIN_VALUE;
+    private static int longIterations = 100_000_000;
+
+    public static boolean testInt() {
+        boolean done = false;
+
+        // Non-vectorized loop as baseline (not vectorized because source array is initialized)
+        for (int i = 0; i < SIZE; ++i) {
+            INT_VALUES[i] = intCounter++;
+            if (intCounter == Integer.MAX_VALUE) {
+                done = true;
+            }
+            INT_EXPECTED_LEADING[i] = Integer.numberOfLeadingZeros(INT_VALUES[i]);
+            INT_EXPECTED_TRAILING[i] = Integer.numberOfTrailingZeros(INT_VALUES[i]);
+        }
+        // Vectorized loop
+        for (int i = 0; i < SIZE; ++i) {
+            INT_RESULT_LEADING[i] = Integer.numberOfLeadingZeros(INT_VALUES[i]);
+        }
+        for (int i = 0; i < SIZE; ++i) {
+            INT_RESULT_TRAILING[i] = Integer.numberOfTrailingZeros(INT_VALUES[i]);
+        }
+
+        // Compare results
+        for (int i = 0; i < SIZE; ++i) {
+            if (INT_RESULT_LEADING[i] != INT_EXPECTED_LEADING[i]) {
+                throw new RuntimeException("Unexpected result for Integer.numberOfLeadingZeros(" + INT_VALUES[i] + "): " + INT_RESULT_LEADING[i] + ", expected " + INT_EXPECTED_LEADING[i]);
+            }
+            if (INT_RESULT_TRAILING[i] != INT_EXPECTED_TRAILING[i]) {
+                throw new RuntimeException("Unexpected result for Integer.numberOfTrailingZeros(" + INT_VALUES[i] + "): " + INT_RESULT_TRAILING[i] + ", expected " + INT_EXPECTED_TRAILING[i]);
+            }
+        }
+        return done;
+    }
+
+    public static boolean testLong() {
+        boolean done = false;
+
+        // Non-vectorized loop as baseline (not vectorized because source array is initialized)
+        for (int i = 0; i < SIZE; ++i) {
+            // Use random values because the long range is too large to iterate over it
+            LONG_VALUES[i] = RANDOM.nextLong();
+            if (longIterations-- == 0) {
+                done = true;
+            }
+            LONG_EXPECTED_LEADING[i] = Long.numberOfLeadingZeros(LONG_VALUES[i]);
+            LONG_EXPECTED_TRAILING[i] = Long.numberOfTrailingZeros(LONG_VALUES[i]);
+        }
+        // Vectorized loop
+        for (int i = 0; i < SIZE; ++i) {
+            LONG_RESULT_LEADING[i] = Long.numberOfLeadingZeros(LONG_VALUES[i]);
+        }
+        for (int i = 0; i < SIZE; ++i) {
+            LONG_RESULT_TRAILING[i] = Long.numberOfTrailingZeros(LONG_VALUES[i]);
+        }
+
+        // Compare results
+        for (int i = 0; i < SIZE; ++i) {
+            if (LONG_RESULT_LEADING[i] != LONG_EXPECTED_LEADING[i]) {
+                throw new RuntimeException("Unexpected result for Long.numberOfLeadingZeros(" + LONG_VALUES[i] + "): " + LONG_RESULT_LEADING[i] + ", expected " + LONG_EXPECTED_LEADING[i]);
+            }
+            if (LONG_RESULT_TRAILING[i] != LONG_EXPECTED_TRAILING[i]) {
+                throw new RuntimeException("Unexpected result for Long.numberOfTrailingZeros(" + LONG_VALUES[i] + "): " + LONG_RESULT_TRAILING[i] + ", expected " + LONG_EXPECTED_TRAILING[i]);
+            }
+        }
+        return done;
+    }
+
+    public static void main(String[] args) {
+        // Run twice to make sure compiled code is used from the beginning
+        for (int i = 0; i < 2; ++i) {
+            while (!testLong()) ;
+            while (!testInt()) ;
+        }
+    }
+}

From 717c4997a2ba4df4e7c66db9efc6b9b4d5336424 Mon Sep 17 00:00:00 2001
From: David Holmes <dholmes@openjdk.org>
Date: Mon, 3 Mar 2025 06:41:59 +0000
Subject: [PATCH 184/587] 8351014: ProblemList the
 com/sun/management/OperatingSystemMXBean cpuLoad tests on Windows

Reviewed-by: lmesnik
---
 test/jdk/ProblemList.txt | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/test/jdk/ProblemList.txt b/test/jdk/ProblemList.txt
index 6f111ddcbfd..37401913840 100644
--- a/test/jdk/ProblemList.txt
+++ b/test/jdk/ProblemList.txt
@@ -541,6 +541,9 @@ java/io/IO/IO.java                                              8337935 linux-pp
 com/sun/management/OperatingSystemMXBean/GetProcessCpuLoad.java 8030957 aix-all
 com/sun/management/OperatingSystemMXBean/GetSystemCpuLoad.java  8030957 aix-all
 
+com/sun/management/OperatingSystemMXBean/GetProcessCpuLoad.java 8351002 windows-all
+com/sun/management/OperatingSystemMXBean/GetSystemCpuLoad.java  8351002 windows-all
+
 java/lang/management/MemoryMXBean/Pending.java                  8158837 generic-all
 java/lang/management/MemoryMXBean/PendingAllGC.sh               8158837 generic-all
 java/lang/management/ThreadMXBean/ThreadMXBeanStateTest.java    8247426 generic-all

From b054d24df55a73bae70c784f6e75b3eb56d4be8b Mon Sep 17 00:00:00 2001
From: SendaoYan <syan@openjdk.org>
Date: Mon, 3 Mar 2025 07:48:12 +0000
Subject: [PATCH 185/587] 8350584: Check the usage of LOG_PLEASE

Reviewed-by: stuefe
---
 test/hotspot/gtest/metaspace/test_clms.cpp             | 2 +-
 test/hotspot/gtest/metaspace/test_metaspacearena.cpp   | 2 +-
 test/hotspot/gtest/runtime/test_os_reserve_between.cpp | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/test/hotspot/gtest/metaspace/test_clms.cpp b/test/hotspot/gtest/metaspace/test_clms.cpp
index ca126b7f615..a1bcb65eaed 100644
--- a/test/hotspot/gtest/metaspace/test_clms.cpp
+++ b/test/hotspot/gtest/metaspace/test_clms.cpp
@@ -38,7 +38,7 @@
 
 #ifdef _LP64
 
-#define LOG_PLEASE
+// #define LOG_PLEASE
 #include "metaspaceGtestCommon.hpp"
 #include "metaspaceGtestContexts.hpp"
 #include "metaspaceGtestRangeHelpers.hpp"
diff --git a/test/hotspot/gtest/metaspace/test_metaspacearena.cpp b/test/hotspot/gtest/metaspace/test_metaspacearena.cpp
index e44e3abe398..e99c22abf88 100644
--- a/test/hotspot/gtest/metaspace/test_metaspacearena.cpp
+++ b/test/hotspot/gtest/metaspace/test_metaspacearena.cpp
@@ -40,7 +40,7 @@
 #include "utilities/debug.hpp"
 #include "utilities/globalDefinitions.hpp"
 
-#define LOG_PLEASE
+// #define LOG_PLEASE
 #include "metaspaceGtestCommon.hpp"
 #include "metaspaceGtestContexts.hpp"
 #include "metaspaceGtestRangeHelpers.hpp"
diff --git a/test/hotspot/gtest/runtime/test_os_reserve_between.cpp b/test/hotspot/gtest/runtime/test_os_reserve_between.cpp
index 7e326fda439..34dd26dcf17 100644
--- a/test/hotspot/gtest/runtime/test_os_reserve_between.cpp
+++ b/test/hotspot/gtest/runtime/test_os_reserve_between.cpp
@@ -30,7 +30,7 @@
 #include "utilities/macros.hpp"
 #include "utilities/resourceHash.hpp"
 
-#define LOG_PLEASE
+// #define LOG_PLEASE
 #include "testutils.hpp"
 #include "unittest.hpp"
 

From 4109c73a78c424d409e9fdd96913a772467666c8 Mon Sep 17 00:00:00 2001
From: Marc Chevalier <marc.chevalier@oracle.com>
Date: Mon, 3 Mar 2025 09:32:54 +0000
Subject: [PATCH 186/587] 8349523: Unused runtime calls to drem/frem should be
 removed

Reviewed-by: thartmann, kvn, chagedorn
---
 src/hotspot/share/opto/compile.cpp            |  3 +
 src/hotspot/share/opto/divnode.cpp            | 40 ++++++---
 src/hotspot/share/opto/divnode.hpp            |  2 +-
 src/hotspot/share/opto/node.cpp               | 21 +++++
 src/hotspot/share/opto/node.hpp               |  4 +
 src/hotspot/share/opto/phaseX.cpp             |  2 +
 .../compiler/c2/irTests/ModDNodeTests.java    | 89 ++++++++++++++++++-
 .../compiler/c2/irTests/ModFNodeTests.java    | 89 ++++++++++++++++++-
 .../compiler/lib/ir_framework/IRNode.java     | 20 +++++
 9 files changed, 253 insertions(+), 17 deletions(-)

diff --git a/src/hotspot/share/opto/compile.cpp b/src/hotspot/share/opto/compile.cpp
index 7a03ac418a8..7c9d8250e5c 100644
--- a/src/hotspot/share/opto/compile.cpp
+++ b/src/hotspot/share/opto/compile.cpp
@@ -436,6 +436,9 @@ void Compile::disconnect_useless_nodes(Unique_Node_List& useful, Unique_Node_Lis
         n->raw_del_out(j);
         --j;
         --max;
+        if (child->is_data_proj_of_pure_function(n)) {
+          worklist.push(n);
+        }
       }
     }
     if (n->outcnt() == 1 && n->has_special_unique_user()) {
diff --git a/src/hotspot/share/opto/divnode.cpp b/src/hotspot/share/opto/divnode.cpp
index bb66ad47ed7..90b5d7f9e27 100644
--- a/src/hotspot/share/opto/divnode.cpp
+++ b/src/hotspot/share/opto/divnode.cpp
@@ -1515,6 +1515,12 @@ Node* ModFNode::Ideal(PhaseGVN* phase, bool can_reshape) {
   if (!can_reshape) {
     return nullptr;
   }
+  PhaseIterGVN* igvn = phase->is_IterGVN();
+
+  bool result_is_unused = proj_out_or_null(TypeFunc::Parms) == nullptr;
+  if (result_is_unused) {
+    return replace_with_con(igvn, TypeF::make(0.));
+  }
 
   // Either input is TOP ==> the result is TOP
   const Type* t1 = phase->type(dividend());
@@ -1535,10 +1541,10 @@ Node* ModFNode::Ideal(PhaseGVN* phase, bool can_reshape) {
 
   // If either is a NaN, return an input NaN
   if (g_isnan(f1)) {
-    return replace_with_con(phase, t1);
+    return replace_with_con(igvn, t1);
   }
   if (g_isnan(f2)) {
-    return replace_with_con(phase, t2);
+    return replace_with_con(igvn, t2);
   }
 
   // If an operand is infinity or the divisor is +/- zero, punt.
@@ -1553,13 +1559,19 @@ Node* ModFNode::Ideal(PhaseGVN* phase, bool can_reshape) {
     xr ^= min_jint;
   }
 
-  return replace_with_con(phase, TypeF::make(jfloat_cast(xr)));
+  return replace_with_con(igvn, TypeF::make(jfloat_cast(xr)));
 }
 
 Node* ModDNode::Ideal(PhaseGVN* phase, bool can_reshape) {
   if (!can_reshape) {
     return nullptr;
   }
+  PhaseIterGVN* igvn = phase->is_IterGVN();
+
+  bool result_is_unused = proj_out_or_null(TypeFunc::Parms) == nullptr;
+  if (result_is_unused) {
+    return replace_with_con(igvn, TypeD::make(0.));
+  }
 
   // Either input is TOP ==> the result is TOP
   const Type* t1 = phase->type(dividend());
@@ -1580,10 +1592,10 @@ Node* ModDNode::Ideal(PhaseGVN* phase, bool can_reshape) {
 
   // If either is a NaN, return an input NaN
   if (g_isnan(f1)) {
-    return replace_with_con(phase, t1);
+    return replace_with_con(igvn, t1);
   }
   if (g_isnan(f2)) {
-    return replace_with_con(phase, t2);
+    return replace_with_con(igvn, t2);
   }
 
   // If an operand is infinity or the divisor is +/- zero, punt.
@@ -1598,33 +1610,33 @@ Node* ModDNode::Ideal(PhaseGVN* phase, bool can_reshape) {
     xr ^= min_jlong;
   }
 
-  return replace_with_con(phase, TypeD::make(jdouble_cast(xr)));
+  return replace_with_con(igvn, TypeD::make(jdouble_cast(xr)));
 }
 
-Node* ModFloatingNode::replace_with_con(PhaseGVN* phase, const Type* con) {
+Node* ModFloatingNode::replace_with_con(PhaseIterGVN* phase, const Type* con) {
   Compile* C = phase->C;
   Node* con_node = phase->makecon(con);
   CallProjections projs;
   extract_projections(&projs, false, false);
-  C->gvn_replace_by(projs.fallthrough_proj, in(TypeFunc::Control));
+  phase->replace_node(projs.fallthrough_proj, in(TypeFunc::Control));
   if (projs.fallthrough_catchproj != nullptr) {
-    C->gvn_replace_by(projs.fallthrough_catchproj, in(TypeFunc::Control));
+    phase->replace_node(projs.fallthrough_catchproj, in(TypeFunc::Control));
   }
   if (projs.fallthrough_memproj != nullptr) {
-    C->gvn_replace_by(projs.fallthrough_memproj, in(TypeFunc::Memory));
+    phase->replace_node(projs.fallthrough_memproj, in(TypeFunc::Memory));
   }
   if (projs.catchall_memproj != nullptr) {
-    C->gvn_replace_by(projs.catchall_memproj, C->top());
+    phase->replace_node(projs.catchall_memproj, C->top());
   }
   if (projs.fallthrough_ioproj != nullptr) {
-    C->gvn_replace_by(projs.fallthrough_ioproj, in(TypeFunc::I_O));
+    phase->replace_node(projs.fallthrough_ioproj, in(TypeFunc::I_O));
   }
   assert(projs.catchall_ioproj == nullptr, "no exceptions from floating mod");
   assert(projs.catchall_catchproj == nullptr, "no exceptions from floating mod");
   if (projs.resproj != nullptr) {
-    C->gvn_replace_by(projs.resproj, con_node);
+    phase->replace_node(projs.resproj, con_node);
   }
-  C->gvn_replace_by(this, C->top());
+  phase->replace_node(this, C->top());
   C->remove_macro_node(this);
   disconnect_inputs(C);
   return nullptr;
diff --git a/src/hotspot/share/opto/divnode.hpp b/src/hotspot/share/opto/divnode.hpp
index a926f4ab122..127e2431b0b 100644
--- a/src/hotspot/share/opto/divnode.hpp
+++ b/src/hotspot/share/opto/divnode.hpp
@@ -158,7 +158,7 @@ public:
 // Base class for float and double modulus
 class ModFloatingNode : public CallLeafNode {
 protected:
-  Node* replace_with_con(PhaseGVN* phase, const Type* con);
+  Node* replace_with_con(PhaseIterGVN* phase, const Type* con);
 
 public:
   ModFloatingNode(Compile* C, const TypeFunc* tf, const char *name);
diff --git a/src/hotspot/share/opto/node.cpp b/src/hotspot/share/opto/node.cpp
index 0e2957ac66e..d1b3d96b76b 100644
--- a/src/hotspot/share/opto/node.cpp
+++ b/src/hotspot/share/opto/node.cpp
@@ -1452,6 +1452,8 @@ static void kill_dead_code( Node *dead, PhaseIterGVN *igvn ) {
             // The restriction (outcnt() <= 2) is the same as in set_req_X()
             // and remove_globally_dead_node().
             igvn->add_users_to_worklist( n );
+          } else if (dead->is_data_proj_of_pure_function(n)) {
+            igvn->_worklist.push(n);
           } else {
             BarrierSet::barrier_set()->barrier_set_c2()->enqueue_useful_gc_barrier(igvn, n);
           }
@@ -2931,6 +2933,25 @@ bool Node::is_dead_loop_safe() const {
 bool Node::is_div_or_mod(BasicType bt) const { return Opcode() == Op_Div(bt) || Opcode() == Op_Mod(bt) ||
                                                       Opcode() == Op_UDiv(bt) || Opcode() == Op_UMod(bt); }
 
+bool Node::is_pure_function() const {
+  switch (Opcode()) {
+  case Op_ModD:
+  case Op_ModF:
+    return true;
+  default:
+    return false;
+  }
+}
+
+// `maybe_pure_function` is assumed to be the input of `this`. This is a bit redundant,
+// but we already have and need maybe_pure_function in all the call sites, so
+// it makes it obvious that the `maybe_pure_function` is the same node as in the caller,
+// while it takes more thinking to realize that a locally computed in(0) must be equal to
+// the local in the caller.
+bool Node::is_data_proj_of_pure_function(const Node* maybe_pure_function) const {
+  return Opcode() == Op_Proj && as_Proj()->_con == TypeFunc::Parms && maybe_pure_function->is_pure_function();
+}
+
 //=============================================================================
 //------------------------------yank-------------------------------------------
 // Find and remove
diff --git a/src/hotspot/share/opto/node.hpp b/src/hotspot/share/opto/node.hpp
index 941b816d8e0..e89ec9455a6 100644
--- a/src/hotspot/share/opto/node.hpp
+++ b/src/hotspot/share/opto/node.hpp
@@ -1284,6 +1284,10 @@ public:
 
   bool is_div_or_mod(BasicType bt) const;
 
+  bool is_pure_function() const;
+
+  bool is_data_proj_of_pure_function(const Node* maybe_pure_function) const;
+
 //----------------- Printing, etc
 #ifndef PRODUCT
  public:
diff --git a/src/hotspot/share/opto/phaseX.cpp b/src/hotspot/share/opto/phaseX.cpp
index 0dd2acd8664..397b1e52e93 100644
--- a/src/hotspot/share/opto/phaseX.cpp
+++ b/src/hotspot/share/opto/phaseX.cpp
@@ -1342,6 +1342,8 @@ void PhaseIterGVN::remove_globally_dead_node( Node *dead ) {
                 }
                 assert(!(i < imax), "sanity");
               }
+            } else if (dead->is_data_proj_of_pure_function(in)) {
+              _worklist.push(in);
             } else {
               BarrierSet::barrier_set()->barrier_set_c2()->enqueue_useful_gc_barrier(this, in);
             }
diff --git a/test/hotspot/jtreg/compiler/c2/irTests/ModDNodeTests.java b/test/hotspot/jtreg/compiler/c2/irTests/ModDNodeTests.java
index 4cdae04c39c..3c28c936d31 100644
--- a/test/hotspot/jtreg/compiler/c2/irTests/ModDNodeTests.java
+++ b/test/hotspot/jtreg/compiler/c2/irTests/ModDNodeTests.java
@@ -41,7 +41,13 @@ public class ModDNodeTests {
         TestFramework.run();
     }
 
-    @Run(test = {"constant", "notConstant", "veryNotConstant"})
+    @Run(test = {"constant", "notConstant", "veryNotConstant",
+            "unusedResult",
+            "repeatedlyUnused",
+            "unusedResultAfterLoopOpt1",
+            "unusedResultAfterLoopOpt2",
+            "unusedResultAfterLoopOpt3",
+    })
     public void runMethod() {
         Asserts.assertEQ(constant(), q % 72.0d % 30.0d);
         Asserts.assertEQ(alsoConstant(), q % 31.432d);
@@ -49,6 +55,11 @@ public class ModDNodeTests {
         Asserts.assertTrue(Double.isNaN(nanRightConstant()));
         Asserts.assertEQ(notConstant(37.5d), 37.5d % 32.0d);
         Asserts.assertEQ(veryNotConstant(531.25d, 14.5d), 531.25d % 32.0d % 14.5d);
+        unusedResult(1.1d, 2.2d);
+        repeatedlyUnused(1.1d, 2.2d);
+        Asserts.assertEQ(unusedResultAfterLoopOpt1(1.1d, 2.2d), 0.d);
+        Asserts.assertEQ(unusedResultAfterLoopOpt2(1.1d, 2.2d), 0.d);
+        Asserts.assertEQ(unusedResultAfterLoopOpt3(1.1d, 2.2d), 0.d);
     }
 
     @Test
@@ -114,4 +125,80 @@ public class ModDNodeTests {
     public double veryNotConstant(double x, double y) {
         return x % 32.0d % y;
     }
+
+    @Test
+    @IR(failOn = IRNode.MOD_D, phase = CompilePhase.ITER_GVN1)
+    @IR(counts = {IRNode.MOD_D, "1"}, phase = CompilePhase.AFTER_PARSING)
+    public void unusedResult(double x, double y) {
+        double unused = x % y;
+    }
+
+    @Test
+    @IR(failOn = IRNode.MOD_D, phase = CompilePhase.ITER_GVN1)
+    @IR(counts = {IRNode.MOD_D, "1"}, phase = CompilePhase.AFTER_PARSING)
+    public void repeatedlyUnused(double x, double y) {
+        double unused = 1.d;
+        for (int i = 0; i < 100_000; i++) {
+            unused = x % y;
+        }
+    }
+
+    // The difference between unusedResultAfterLoopOpt1 and unusedResultAfterLoopOpt2
+    // is that they exercise a slightly different reason why the node is being removed,
+    // and thus a different execution path. In unusedResultAfterLoopOpt1 the modulo is
+    // used in the traps of the parse predicates. In unusedResultAfterLoopOpt2, it is not.
+    @Test
+    @IR(counts = {IRNode.MOD_D, "1"}, phase = CompilePhase.ITER_GVN2)
+    @IR(failOn = IRNode.MOD_D, phase = CompilePhase.BEFORE_MACRO_EXPANSION)
+    public double unusedResultAfterLoopOpt1(double x, double y) {
+        double unused = x % y;
+
+        int a = 77;
+        int b = 0;
+        do {
+            a--;
+            b++;
+        } while (a > 0);
+
+        if (b == 78) { // dead
+            return unused;
+        }
+        return 0.d;
+    }
+
+    @Test
+    @IR(counts = {IRNode.MOD_D, "1"}, phase = CompilePhase.AFTER_CLOOPS)
+    @IR(failOn = IRNode.MOD_D, phase = CompilePhase.PHASEIDEALLOOP1)
+    public double unusedResultAfterLoopOpt2(double x, double y) {
+        int a = 77;
+        int b = 0;
+        do {
+            a--;
+            b++;
+        } while (a > 0);
+
+        double unused = x % y;
+
+        if (b == 78) { // dead
+            return unused;
+        }
+        return 0.d;
+    }
+
+    @Test
+    @IR(counts = {IRNode.MOD_D, "2"}, phase = CompilePhase.AFTER_CLOOPS)
+    @IR(failOn = IRNode.MOD_D, phase = CompilePhase.PHASEIDEALLOOP1)
+    public double unusedResultAfterLoopOpt3(double x, double y) {
+        double unused = x % y;
+
+        int a = 77;
+        int b = 0;
+        do {
+            a--;
+            b++;
+        } while (a > 0);
+
+        int other = (b - 77) * (int)(x % y % 1.d);
+        return (double)other;
+    }
 }
diff --git a/test/hotspot/jtreg/compiler/c2/irTests/ModFNodeTests.java b/test/hotspot/jtreg/compiler/c2/irTests/ModFNodeTests.java
index f3adf5ca44f..1b5e14b4835 100644
--- a/test/hotspot/jtreg/compiler/c2/irTests/ModFNodeTests.java
+++ b/test/hotspot/jtreg/compiler/c2/irTests/ModFNodeTests.java
@@ -41,7 +41,13 @@ public class ModFNodeTests {
         TestFramework.run();
     }
 
-    @Run(test = {"constant", "notConstant", "veryNotConstant"})
+    @Run(test = {"constant", "notConstant", "veryNotConstant",
+            "unusedResult",
+            "repeatedlyUnused",
+            "unusedResultAfterLoopOpt1",
+            "unusedResultAfterLoopOpt2",
+            "unusedResultAfterLoopOpt3",
+    })
     public void runMethod() {
         Asserts.assertEQ(constant(), q % 72.0f % 30.0f);
         Asserts.assertEQ(alsoConstant(), q % 31.432f);
@@ -49,6 +55,11 @@ public class ModFNodeTests {
         Asserts.assertTrue(Float.isNaN(nanRightConstant()));
         Asserts.assertEQ(notConstant(37.5f), 37.5f % 32.0f);
         Asserts.assertEQ(veryNotConstant(531.25f, 14.5f), 531.25f % 32.0f % 14.5f);
+        unusedResult(1.1f, 2.2f);
+        repeatedlyUnused(1.1f, 2.2f);
+        Asserts.assertEQ(unusedResultAfterLoopOpt1(1.1f, 2.2f), 0.f);
+        Asserts.assertEQ(unusedResultAfterLoopOpt2(1.1f, 2.2f), 0.f);
+        Asserts.assertEQ(unusedResultAfterLoopOpt3(1.1f, 2.2f), 0.f);
     }
 
     @Test
@@ -114,4 +125,80 @@ public class ModFNodeTests {
     public float veryNotConstant(float x, float y) {
         return x % 32.0f % y;
     }
+
+    @Test
+    @IR(failOn = IRNode.MOD_F, phase = CompilePhase.ITER_GVN1)
+    @IR(counts = {IRNode.MOD_F, "1"}, phase = CompilePhase.AFTER_PARSING)
+    public void unusedResult(float x, float y) {
+        float unused = x % y;
+    }
+
+    @Test
+    @IR(failOn = IRNode.MOD_F, phase = CompilePhase.ITER_GVN1)
+    @IR(counts = {IRNode.MOD_F, "1"}, phase = CompilePhase.AFTER_PARSING)
+    public void repeatedlyUnused(float x, float y) {
+        float unused = 1.f;
+        for (int i = 0; i < 100_000; i++) {
+            unused = x % y;
+        }
+    }
+
+    // The difference between unusedResultAfterLoopOpt1 and unusedResultAfterLoopOpt2
+    // is that they exercise a slightly different reason why the node is being removed,
+    // and thus a different execution path. In unusedResultAfterLoopOpt1 the modulo is
+    // used in the traps of the parse predicates. In unusedResultAfterLoopOpt2, it is not.
+    @Test
+    @IR(counts = {IRNode.MOD_F, "1"}, phase = CompilePhase.ITER_GVN2)
+    @IR(failOn = IRNode.MOD_F, phase = CompilePhase.BEFORE_MACRO_EXPANSION)
+    public float unusedResultAfterLoopOpt1(float x, float y) {
+        float unused = x % y;
+
+        int a = 77;
+        int b = 0;
+        do {
+            a--;
+            b++;
+        } while (a > 0);
+
+        if (b == 78) { // dead
+            return unused;
+        }
+        return 0.f;
+    }
+
+    @Test
+    @IR(counts = {IRNode.MOD_F, "1"}, phase = CompilePhase.AFTER_CLOOPS)
+    @IR(failOn = IRNode.MOD_F, phase = CompilePhase.PHASEIDEALLOOP1)
+    public float unusedResultAfterLoopOpt2(float x, float y) {
+        int a = 77;
+        int b = 0;
+        do {
+            a--;
+            b++;
+        } while (a > 0);
+
+        float unused = x % y;
+
+        if (b == 78) { // dead
+            return unused;
+        }
+        return 0.f;
+    }
+
+    @Test
+    @IR(counts = {IRNode.MOD_F, "2"}, phase = CompilePhase.AFTER_CLOOPS)
+    @IR(failOn = IRNode.MOD_F, phase = CompilePhase.PHASEIDEALLOOP1)
+    public float unusedResultAfterLoopOpt3(float x, float y) {
+        float unused = x % y;
+
+        int a = 77;
+        int b = 0;
+        do {
+            a--;
+            b++;
+        } while (a > 0);
+
+        int other = (b - 77) * (int)(x % y % 1.f);
+        return (float)other;
+    }
 }
diff --git a/test/hotspot/jtreg/compiler/lib/ir_framework/IRNode.java b/test/hotspot/jtreg/compiler/lib/ir_framework/IRNode.java
index 8f28294a986..6e373207d9c 100644
--- a/test/hotspot/jtreg/compiler/lib/ir_framework/IRNode.java
+++ b/test/hotspot/jtreg/compiler/lib/ir_framework/IRNode.java
@@ -2531,6 +2531,16 @@ public class IRNode {
         machOnlyNameRegex(X86_CMOVEL_IMM01UCF, "cmovL_imm_01UCF");
     }
 
+    public static final String MOD_F = PREFIX + "MOD_F" + POSTFIX;
+    static {
+        macroNodes(MOD_F, "ModF");
+    }
+
+    public static final String MOD_D = PREFIX + "MOD_D" + POSTFIX;
+    static {
+        macroNodes(MOD_D, "ModD");
+    }
+
     /*
      * Utility methods to set up IR_NODE_MAPPINGS.
      */
@@ -2576,6 +2586,16 @@ public class IRNode {
         IR_NODE_MAPPINGS.put(irNode, entry);
     }
 
+    /**
+     * Apply {@code regex} on all ideal graph phases up to and including {@link CompilePhase#BEFORE_MACRO_EXPANSION}.
+     */
+    private static void macroNodes(String irNodePlaceholder, String irNodeRegex) {
+        String regex = START + irNodeRegex + MID + END;
+        IR_NODE_MAPPINGS.put(irNodePlaceholder, new SinglePhaseRangeEntry(CompilePhase.BEFORE_MACRO_EXPANSION, regex,
+                                                                          CompilePhase.BEFORE_STRINGOPTS,
+                                                                          CompilePhase.BEFORE_MACRO_EXPANSION));
+    }
+
     private static void callOfNodes(String irNodePlaceholder, String callRegex) {
         String regex = START + callRegex + MID + IS_REPLACED + " " +  END;
         IR_NODE_MAPPINGS.put(irNodePlaceholder, new RegexTypeEntry(RegexType.IDEAL_INDEPENDENT, regex));

From 8b0468faf1c38f2d1d887ab92b76dfff625482ef Mon Sep 17 00:00:00 2001
From: Coleen Phillimore <coleenp@openjdk.org>
Date: Mon, 3 Mar 2025 12:08:18 +0000
Subject: [PATCH 187/587] 8315488: Remove outdated and unused ciReplay support
 from SA

Reviewed-by: kvn, cjplummer, yzheng
---
 src/hotspot/cpu/aarch64/vmStructs_aarch64.hpp |  10 +-
 src/hotspot/cpu/arm/vmStructs_arm.hpp         |  10 +-
 src/hotspot/cpu/ppc/vmStructs_ppc.hpp         |  10 +-
 src/hotspot/cpu/riscv/vmStructs_riscv.hpp     |  10 +-
 src/hotspot/cpu/s390/vmStructs_s390.hpp       |  10 +-
 src/hotspot/cpu/x86/vmStructs_x86.hpp         |  10 +-
 src/hotspot/cpu/zero/vmStructs_zero.hpp       |  10 +-
 src/hotspot/os/aix/vmStructs_aix.hpp          |  10 +-
 src/hotspot/os/bsd/vmStructs_bsd.hpp          |  10 +-
 src/hotspot/os/linux/vmStructs_linux.hpp      |  10 +-
 src/hotspot/os/windows/vmStructs_windows.hpp  |  10 +-
 .../os_cpu/aix_ppc/vmStructs_aix_ppc.hpp      |  10 +-
 .../bsd_aarch64/vmStructs_bsd_aarch64.hpp     |  10 +-
 .../os_cpu/bsd_x86/vmStructs_bsd_x86.hpp      |  10 +-
 .../os_cpu/bsd_zero/vmStructs_bsd_zero.hpp    |  11 +-
 .../linux_aarch64/vmStructs_linux_aarch64.hpp |  10 +-
 .../os_cpu/linux_arm/vmStructs_linux_arm.hpp  |  10 +-
 .../os_cpu/linux_ppc/vmStructs_linux_ppc.hpp  |  10 +-
 .../linux_riscv/vmStructs_linux_riscv.hpp     |  10 +-
 .../linux_s390/vmStructs_linux_s390.hpp       |  10 +-
 .../os_cpu/linux_x86/vmStructs_linux_x86.hpp  |  10 +-
 .../linux_zero/vmStructs_linux_zero.hpp       |  10 +-
 .../vmStructs_windows_aarch64.hpp             |   8 +-
 .../windows_x86/vmStructs_windows_x86.hpp     |  10 +-
 src/hotspot/share/c1/c1_Runtime1.hpp          |   3 +-
 src/hotspot/share/ci/ciClassList.hpp          |   4 +-
 src/hotspot/share/ci/ciConstant.hpp           |   3 +-
 src/hotspot/share/ci/ciObjectFactory.hpp      |   3 +-
 src/hotspot/share/jvmci/vmStructs_jvmci.cpp   |  32 +-
 src/hotspot/share/opto/block.hpp              |  10 +-
 src/hotspot/share/opto/callnode.hpp           |   4 -
 src/hotspot/share/opto/chaitin.hpp            |   5 +-
 src/hotspot/share/opto/compile.hpp            |   4 +-
 src/hotspot/share/opto/node.hpp               |   6 -
 src/hotspot/share/opto/optoreg.hpp            |   3 +-
 src/hotspot/share/opto/regalloc.hpp           |   3 +-
 src/hotspot/share/opto/type.hpp               |   1 -
 src/hotspot/share/runtime/vmStructs.cpp       | 947 +-----------------
 src/jdk.hotspot.agent/doc/cireplay.html       |  41 -
 src/jdk.hotspot.agent/doc/clhsdb.html         |   9 -
 src/jdk.hotspot.agent/doc/index.html          |   6 -
 .../sun/jvm/hotspot/CommandProcessor.java     | 144 +--
 .../classes/sun/jvm/hotspot/c1/Runtime1.java  |  67 --
 .../sun/jvm/hotspot/ci/ciArrayKlass.java      |  55 -
 .../sun/jvm/hotspot/ci/ciBaseObject.java      |  59 --
 .../sun/jvm/hotspot/ci/ciConstant.java        |  69 --
 .../classes/sun/jvm/hotspot/ci/ciEnv.java     | 110 --
 .../classes/sun/jvm/hotspot/ci/ciField.java   |  64 --
 .../sun/jvm/hotspot/ci/ciInstance.java        |  53 -
 .../sun/jvm/hotspot/ci/ciInstanceKlass.java   | 165 ---
 .../classes/sun/jvm/hotspot/ci/ciKlass.java   |  65 --
 .../sun/jvm/hotspot/ci/ciMetadata.java        |  67 --
 .../classes/sun/jvm/hotspot/ci/ciMethod.java  | 114 ---
 .../sun/jvm/hotspot/ci/ciMethodData.java      | 361 -------
 .../sun/jvm/hotspot/ci/ciObjArrayKlass.java   |  57 --
 .../classes/sun/jvm/hotspot/ci/ciObject.java  |  71 --
 .../sun/jvm/hotspot/ci/ciObjectFactory.java   |  88 --
 .../classes/sun/jvm/hotspot/ci/ciSymbol.java  |  60 --
 .../classes/sun/jvm/hotspot/ci/ciType.java    |  54 -
 .../sun/jvm/hotspot/ci/ciTypeArrayKlass.java  |  52 -
 .../sun/jvm/hotspot/code/CodeBlob.java        |   7 -
 .../classes/sun/jvm/hotspot/code/NMethod.java |  36 -
 .../sun/jvm/hotspot/compiler/CompileTask.java |   3 +-
 .../sun/jvm/hotspot/oops/InstanceKlass.java   |  82 +-
 .../sun/jvm/hotspot/oops/Metadata.java        |   5 +-
 .../classes/sun/jvm/hotspot/oops/Method.java  |  18 +-
 .../sun/jvm/hotspot/oops/MethodData.java      | 109 +-
 .../classes/sun/jvm/hotspot/opto/Block.java   |  90 --
 .../sun/jvm/hotspot/opto/Block_Array.java     |  66 --
 .../sun/jvm/hotspot/opto/Block_List.java      |  58 --
 .../jvm/hotspot/opto/CallDynamicJavaNode.java |  52 -
 .../sun/jvm/hotspot/opto/CallJavaNode.java    |  68 --
 .../sun/jvm/hotspot/opto/CallNode.java        |  67 --
 .../sun/jvm/hotspot/opto/CallRuntimeNode.java |  66 --
 .../jvm/hotspot/opto/CallStaticJavaNode.java  |  77 --
 .../classes/sun/jvm/hotspot/opto/Compile.java | 107 --
 .../jvm/hotspot/opto/CompilerPhaseType.java   |  67 --
 .../sun/jvm/hotspot/opto/HaltNode.java        |  52 -
 .../sun/jvm/hotspot/opto/InlineTree.java      | 135 ---
 .../sun/jvm/hotspot/opto/JVMState.java        | 112 ---
 .../sun/jvm/hotspot/opto/LoopNode.java        |  52 -
 .../jvm/hotspot/opto/MachCallJavaNode.java    |  72 --
 .../sun/jvm/hotspot/opto/MachCallNode.java    |  59 --
 .../jvm/hotspot/opto/MachCallRuntimeNode.java |  65 --
 .../hotspot/opto/MachCallStaticJavaNode.java  |  71 --
 .../sun/jvm/hotspot/opto/MachIfNode.java      |  69 --
 .../sun/jvm/hotspot/opto/MachNode.java        |  51 -
 .../sun/jvm/hotspot/opto/MachReturnNode.java  |  51 -
 .../jvm/hotspot/opto/MachSafePointNode.java   |  77 --
 .../sun/jvm/hotspot/opto/MultiNode.java       |  52 -
 .../classes/sun/jvm/hotspot/opto/Node.java    | 271 -----
 .../sun/jvm/hotspot/opto/Node_Array.java      |  66 --
 .../sun/jvm/hotspot/opto/Node_List.java       |  58 --
 .../classes/sun/jvm/hotspot/opto/Phase.java   |  52 -
 .../sun/jvm/hotspot/opto/PhaseCFG.java        |  71 --
 .../sun/jvm/hotspot/opto/PhaseRegAlloc.java   |  60 --
 .../classes/sun/jvm/hotspot/opto/PhiNode.java |  52 -
 .../sun/jvm/hotspot/opto/ProjNode.java        |  52 -
 .../sun/jvm/hotspot/opto/RegionNode.java      |  52 -
 .../sun/jvm/hotspot/opto/RootNode.java        |  52 -
 .../sun/jvm/hotspot/opto/SafePointNode.java   |  70 --
 .../sun/jvm/hotspot/opto/TypeNode.java        |  52 -
 .../jvm/hotspot/runtime/CompilerThread.java   |  19 +-
 .../classes/sun/jvm/hotspot/runtime/VM.java   |  18 +-
 .../sun/jvm/hotspot/runtime/VMReg.java        |  20 +-
 test/hotspot/jtreg/ProblemList.txt            |   1 -
 .../jtreg/compiler/ciReplay/SABase.java       | 175 ----
 .../jtreg/compiler/ciReplay/TestSAClient.java |  35 -
 .../jtreg/compiler/ciReplay/TestSAServer.java |  35 -
 109 files changed, 185 insertions(+), 6020 deletions(-)
 delete mode 100644 src/jdk.hotspot.agent/doc/cireplay.html
 delete mode 100644 src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/c1/Runtime1.java
 delete mode 100644 src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ci/ciArrayKlass.java
 delete mode 100644 src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ci/ciBaseObject.java
 delete mode 100644 src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ci/ciConstant.java
 delete mode 100644 src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ci/ciEnv.java
 delete mode 100644 src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ci/ciField.java
 delete mode 100644 src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ci/ciInstance.java
 delete mode 100644 src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ci/ciInstanceKlass.java
 delete mode 100644 src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ci/ciKlass.java
 delete mode 100644 src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ci/ciMetadata.java
 delete mode 100644 src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ci/ciMethod.java
 delete mode 100644 src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ci/ciMethodData.java
 delete mode 100644 src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ci/ciObjArrayKlass.java
 delete mode 100644 src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ci/ciObject.java
 delete mode 100644 src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ci/ciObjectFactory.java
 delete mode 100644 src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ci/ciSymbol.java
 delete mode 100644 src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ci/ciType.java
 delete mode 100644 src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ci/ciTypeArrayKlass.java
 delete mode 100644 src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/Block.java
 delete mode 100644 src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/Block_Array.java
 delete mode 100644 src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/Block_List.java
 delete mode 100644 src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/CallDynamicJavaNode.java
 delete mode 100644 src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/CallJavaNode.java
 delete mode 100644 src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/CallNode.java
 delete mode 100644 src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/CallRuntimeNode.java
 delete mode 100644 src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/CallStaticJavaNode.java
 delete mode 100644 src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/Compile.java
 delete mode 100644 src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/CompilerPhaseType.java
 delete mode 100644 src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/HaltNode.java
 delete mode 100644 src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/InlineTree.java
 delete mode 100644 src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/JVMState.java
 delete mode 100644 src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/LoopNode.java
 delete mode 100644 src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/MachCallJavaNode.java
 delete mode 100644 src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/MachCallNode.java
 delete mode 100644 src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/MachCallRuntimeNode.java
 delete mode 100644 src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/MachCallStaticJavaNode.java
 delete mode 100644 src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/MachIfNode.java
 delete mode 100644 src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/MachNode.java
 delete mode 100644 src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/MachReturnNode.java
 delete mode 100644 src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/MachSafePointNode.java
 delete mode 100644 src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/MultiNode.java
 delete mode 100644 src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/Node.java
 delete mode 100644 src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/Node_Array.java
 delete mode 100644 src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/Node_List.java
 delete mode 100644 src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/Phase.java
 delete mode 100644 src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/PhaseCFG.java
 delete mode 100644 src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/PhaseRegAlloc.java
 delete mode 100644 src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/PhiNode.java
 delete mode 100644 src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/ProjNode.java
 delete mode 100644 src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/RegionNode.java
 delete mode 100644 src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/RootNode.java
 delete mode 100644 src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/SafePointNode.java
 delete mode 100644 src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/TypeNode.java
 delete mode 100644 test/hotspot/jtreg/compiler/ciReplay/SABase.java
 delete mode 100644 test/hotspot/jtreg/compiler/ciReplay/TestSAClient.java
 delete mode 100644 test/hotspot/jtreg/compiler/ciReplay/TestSAServer.java

diff --git a/src/hotspot/cpu/aarch64/vmStructs_aarch64.hpp b/src/hotspot/cpu/aarch64/vmStructs_aarch64.hpp
index ceb40dce921..bf9c965213c 100644
--- a/src/hotspot/cpu/aarch64/vmStructs_aarch64.hpp
+++ b/src/hotspot/cpu/aarch64/vmStructs_aarch64.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2014, Red Hat Inc. All rights reserved. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -30,17 +30,17 @@
 // constants required by the Serviceability Agent. This file is
 // referenced by vmStructs.cpp.
 
-#define VM_STRUCTS_CPU(nonstatic_field, static_field, unchecked_nonstatic_field, volatile_nonstatic_field, nonproduct_nonstatic_field, c2_nonstatic_field, unchecked_c1_static_field, unchecked_c2_static_field) \
+#define VM_STRUCTS_CPU(nonstatic_field, static_field, unchecked_nonstatic_field, volatile_nonstatic_field, nonproduct_nonstatic_field) \
   volatile_nonstatic_field(JavaFrameAnchor, _last_Java_fp,   intptr_t*) \
               static_field(VM_Version,      _rop_protection, bool)      \
               static_field(VM_Version,      _pac_mask,       uintptr_t)
 
-#define VM_TYPES_CPU(declare_type, declare_toplevel_type, declare_oop_type, declare_integer_type, declare_unsigned_integer_type, declare_c1_toplevel_type, declare_c2_type, declare_c2_toplevel_type) \
+#define VM_TYPES_CPU(declare_type, declare_toplevel_type, declare_oop_type, declare_integer_type, declare_unsigned_integer_type) \
   declare_toplevel_type(VM_Version)
 
-#define VM_INT_CONSTANTS_CPU(declare_constant, declare_preprocessor_constant, declare_c1_constant, declare_c2_constant, declare_c2_preprocessor_constant)
+#define VM_INT_CONSTANTS_CPU(declare_constant, declare_preprocessor_constant)
 
-#define VM_LONG_CONSTANTS_CPU(declare_constant, declare_preprocessor_constant, declare_c1_constant, declare_c2_constant, declare_c2_preprocessor_constant)
+#define VM_LONG_CONSTANTS_CPU(declare_constant, declare_preprocessor_constant)
 
 #define DECLARE_INT_CPU_FEATURE_CONSTANT(id, name, bit) GENERATE_VM_INT_CONSTANT_ENTRY(VM_Version::CPU_##id)
 #define VM_INT_CPU_FEATURE_CONSTANTS CPU_FEATURE_FLAGS(DECLARE_INT_CPU_FEATURE_CONSTANT)
diff --git a/src/hotspot/cpu/arm/vmStructs_arm.hpp b/src/hotspot/cpu/arm/vmStructs_arm.hpp
index 4ce78d517e8..453938a824e 100644
--- a/src/hotspot/cpu/arm/vmStructs_arm.hpp
+++ b/src/hotspot/cpu/arm/vmStructs_arm.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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 @@
 // constants required by the Serviceability Agent. This file is
 // referenced by vmStructs.cpp.
 
-#define VM_STRUCTS_CPU(nonstatic_field, static_field, unchecked_nonstatic_field, volatile_nonstatic_field, nonproduct_nonstatic_field, c2_nonstatic_field, unchecked_c1_static_field, unchecked_c2_static_field) \
+#define VM_STRUCTS_CPU(nonstatic_field, static_field, unchecked_nonstatic_field, volatile_nonstatic_field, nonproduct_nonstatic_field) \
                                                                                                                                      \
   /******************************/                                                                                                   \
   /* JavaCallWrapper            */                                                                                                   \
@@ -39,10 +39,10 @@
   /******************************/                                                                                                   \
   volatile_nonstatic_field(JavaFrameAnchor,     _last_Java_fp,                                    intptr_t*)
 
-#define VM_TYPES_CPU(declare_type, declare_toplevel_type, declare_oop_type, declare_integer_type, declare_unsigned_integer_type, declare_c1_toplevel_type, declare_c2_type, declare_c2_toplevel_type)
+#define VM_TYPES_CPU(declare_type, declare_toplevel_type, declare_oop_type, declare_integer_type, declare_unsigned_integer_type)
 
-#define VM_INT_CONSTANTS_CPU(declare_constant, declare_preprocessor_constant, declare_c1_constant, declare_c2_constant, declare_c2_preprocessor_constant)
+#define VM_INT_CONSTANTS_CPU(declare_constant, declare_preprocessor_constant)
 
-#define VM_LONG_CONSTANTS_CPU(declare_constant, declare_preprocessor_constant, declare_c1_constant, declare_c2_constant, declare_c2_preprocessor_constant)
+#define VM_LONG_CONSTANTS_CPU(declare_constant, declare_preprocessor_constant)
 
 #endif // CPU_ARM_VMSTRUCTS_ARM_HPP
diff --git a/src/hotspot/cpu/ppc/vmStructs_ppc.hpp b/src/hotspot/cpu/ppc/vmStructs_ppc.hpp
index c1bdc1b1eb5..efe7fb9ad7b 100644
--- a/src/hotspot/cpu/ppc/vmStructs_ppc.hpp
+++ b/src/hotspot/cpu/ppc/vmStructs_ppc.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2025, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2012, 2013 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -30,12 +30,12 @@
 // constants required by the Serviceability Agent. This file is
 // referenced by vmStructs.cpp.
 
-#define VM_STRUCTS_CPU(nonstatic_field, static_field, unchecked_nonstatic_field, volatile_nonstatic_field, nonproduct_nonstatic_field, c2_nonstatic_field, unchecked_c1_static_field, unchecked_c2_static_field)
+#define VM_STRUCTS_CPU(nonstatic_field, static_field, unchecked_nonstatic_field, volatile_nonstatic_field, nonproduct_nonstatic_field)
 
-#define VM_TYPES_CPU(declare_type, declare_toplevel_type, declare_oop_type, declare_integer_type, declare_unsigned_integer_type, declare_c1_toplevel_type, declare_c2_type, declare_c2_toplevel_type)
+#define VM_TYPES_CPU(declare_type, declare_toplevel_type, declare_oop_type, declare_integer_type, declare_unsigned_integer_type)
 
-#define VM_INT_CONSTANTS_CPU(declare_constant, declare_preprocessor_constant, declare_c1_constant, declare_c2_constant, declare_c2_preprocessor_constant)
+#define VM_INT_CONSTANTS_CPU(declare_constant, declare_preprocessor_constant)
 
-#define VM_LONG_CONSTANTS_CPU(declare_constant, declare_preprocessor_constant, declare_c1_constant, declare_c2_constant, declare_c2_preprocessor_constant)
+#define VM_LONG_CONSTANTS_CPU(declare_constant, declare_preprocessor_constant)
 
 #endif // CPU_PPC_VMSTRUCTS_PPC_HPP
diff --git a/src/hotspot/cpu/riscv/vmStructs_riscv.hpp b/src/hotspot/cpu/riscv/vmStructs_riscv.hpp
index 6c89133de02..ba250f77268 100644
--- a/src/hotspot/cpu/riscv/vmStructs_riscv.hpp
+++ b/src/hotspot/cpu/riscv/vmStructs_riscv.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2020, 2021, Huawei Technologies Co., Ltd. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -30,13 +30,13 @@
 // constants required by the Serviceability Agent. This file is
 // referenced by vmStructs.cpp.
 
-#define VM_STRUCTS_CPU(nonstatic_field, static_field, unchecked_nonstatic_field, volatile_nonstatic_field, nonproduct_nonstatic_field, c2_nonstatic_field, unchecked_c1_static_field, unchecked_c2_static_field) \
+#define VM_STRUCTS_CPU(nonstatic_field, static_field, unchecked_nonstatic_field, volatile_nonstatic_field, nonproduct_nonstatic_field) \
   volatile_nonstatic_field(JavaFrameAnchor, _last_Java_fp, intptr_t*)
 
-#define VM_TYPES_CPU(declare_type, declare_toplevel_type, declare_oop_type, declare_integer_type, declare_unsigned_integer_type, declare_c1_toplevel_type, declare_c2_type, declare_c2_toplevel_type)
+#define VM_TYPES_CPU(declare_type, declare_toplevel_type, declare_oop_type, declare_integer_type, declare_unsigned_integer_type)
 
-#define VM_INT_CONSTANTS_CPU(declare_constant, declare_preprocessor_constant, declare_c1_constant, declare_c2_constant, declare_c2_preprocessor_constant)
+#define VM_INT_CONSTANTS_CPU(declare_constant, declare_preprocessor_constant)
 
-#define VM_LONG_CONSTANTS_CPU(declare_constant, declare_preprocessor_constant, declare_c1_constant, declare_c2_constant, declare_c2_preprocessor_constant)
+#define VM_LONG_CONSTANTS_CPU(declare_constant, declare_preprocessor_constant)
 
 #endif // CPU_RISCV_VMSTRUCTS_RISCV_HPP
diff --git a/src/hotspot/cpu/s390/vmStructs_s390.hpp b/src/hotspot/cpu/s390/vmStructs_s390.hpp
index 1f65002977a..100fc97560e 100644
--- a/src/hotspot/cpu/s390/vmStructs_s390.hpp
+++ b/src/hotspot/cpu/s390/vmStructs_s390.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2025, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2016 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -30,12 +30,12 @@
 // constants required by the Serviceability Agent. This file is
 // referenced by vmStructs.cpp.
 
-#define VM_STRUCTS_CPU(nonstatic_field, static_field, unchecked_nonstatic_field, volatile_nonstatic_field, nonproduct_nonstatic_field, c2_nonstatic_field, unchecked_c1_static_field, unchecked_c2_static_field)
+#define VM_STRUCTS_CPU(nonstatic_field, static_field, unchecked_nonstatic_field, volatile_nonstatic_field, nonproduct_nonstatic_field)
 
-#define VM_TYPES_CPU(declare_type, declare_toplevel_type, declare_oop_type, declare_integer_type, declare_unsigned_integer_type, declare_c1_toplevel_type, declare_c2_type, declare_c2_toplevel_type)
+#define VM_TYPES_CPU(declare_type, declare_toplevel_type, declare_oop_type, declare_integer_type, declare_unsigned_integer_type)
 
-#define VM_INT_CONSTANTS_CPU(declare_constant, declare_preprocessor_constant, declare_c1_constant, declare_c2_constant, declare_c2_preprocessor_constant)
+#define VM_INT_CONSTANTS_CPU(declare_constant, declare_preprocessor_constant)
 
-#define VM_LONG_CONSTANTS_CPU(declare_constant, declare_preprocessor_constant, declare_c1_constant, declare_c2_constant, declare_c2_preprocessor_constant)
+#define VM_LONG_CONSTANTS_CPU(declare_constant, declare_preprocessor_constant)
 
 #endif // CPU_S390_VMSTRUCTS_S390_HPP
diff --git a/src/hotspot/cpu/x86/vmStructs_x86.hpp b/src/hotspot/cpu/x86/vmStructs_x86.hpp
index 4569bd9a216..d894d8b09a7 100644
--- a/src/hotspot/cpu/x86/vmStructs_x86.hpp
+++ b/src/hotspot/cpu/x86/vmStructs_x86.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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,17 @@
 // constants required by the Serviceability Agent. This file is
 // referenced by vmStructs.cpp.
 
-#define VM_STRUCTS_CPU(nonstatic_field, static_field, unchecked_nonstatic_field, volatile_nonstatic_field, nonproduct_nonstatic_field, c2_nonstatic_field, unchecked_c1_static_field, unchecked_c2_static_field)            \
+#define VM_STRUCTS_CPU(nonstatic_field, static_field, unchecked_nonstatic_field, volatile_nonstatic_field, nonproduct_nonstatic_field)            \
   volatile_nonstatic_field(JavaFrameAnchor, _last_Java_fp, intptr_t*)
 
-#define VM_TYPES_CPU(declare_type, declare_toplevel_type, declare_oop_type, declare_integer_type, declare_unsigned_integer_type, declare_c1_toplevel_type, declare_c2_type, declare_c2_toplevel_type) \
+#define VM_TYPES_CPU(declare_type, declare_toplevel_type, declare_oop_type, declare_integer_type, declare_unsigned_integer_type) \
 
-#define VM_INT_CONSTANTS_CPU(declare_constant, declare_preprocessor_constant, declare_c1_constant, declare_c2_constant, declare_c2_preprocessor_constant) \
+#define VM_INT_CONSTANTS_CPU(declare_constant, declare_preprocessor_constant) \
   LP64_ONLY(declare_constant(frame::arg_reg_save_area_bytes))       \
   declare_constant(frame::interpreter_frame_sender_sp_offset)       \
   declare_constant(frame::interpreter_frame_last_sp_offset)
 
-#define VM_LONG_CONSTANTS_CPU(declare_constant, declare_preprocessor_constant, declare_c1_constant, declare_c2_constant, declare_c2_preprocessor_constant)
+#define VM_LONG_CONSTANTS_CPU(declare_constant, declare_preprocessor_constant)
 
 #define DECLARE_LONG_CPU_FEATURE_CONSTANT(id, name, bit) GENERATE_VM_LONG_CONSTANT_ENTRY(VM_Version::CPU_##id)
 #define VM_LONG_CPU_FEATURE_CONSTANTS CPU_FEATURE_FLAGS(DECLARE_LONG_CPU_FEATURE_CONSTANT)
diff --git a/src/hotspot/cpu/zero/vmStructs_zero.hpp b/src/hotspot/cpu/zero/vmStructs_zero.hpp
index 64a9300e25c..9100c765e7e 100644
--- a/src/hotspot/cpu/zero/vmStructs_zero.hpp
+++ b/src/hotspot/cpu/zero/vmStructs_zero.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
  * Copyright 2007 Red Hat, Inc.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -30,12 +30,12 @@
 // constants required by the Serviceability Agent. This file is
 // referenced by vmStructs.cpp.
 
-#define VM_STRUCTS_CPU(nonstatic_field, static_field, unchecked_nonstatic_field, volatile_nonstatic_field, nonproduct_nonstatic_field, c2_nonstatic_field, unchecked_c1_static_field, unchecked_c2_static_field)
+#define VM_STRUCTS_CPU(nonstatic_field, static_field, unchecked_nonstatic_field, volatile_nonstatic_field, nonproduct_nonstatic_field)
 
-#define VM_TYPES_CPU(declare_type, declare_toplevel_type, declare_oop_type, declare_integer_type, declare_unsigned_integer_type, declare_c1_toplevel_type, declare_c2_type, declare_c2_toplevel_type)
+#define VM_TYPES_CPU(declare_type, declare_toplevel_type, declare_oop_type, declare_integer_type, declare_unsigned_integer_type)
 
-#define VM_INT_CONSTANTS_CPU(declare_constant, declare_preprocessor_constant, declare_c1_constant, declare_c2_constant, declare_c2_preprocessor_constant)
+#define VM_INT_CONSTANTS_CPU(declare_constant, declare_preprocessor_constant)
 
-#define VM_LONG_CONSTANTS_CPU(declare_constant, declare_preprocessor_constant, declare_c1_constant, declare_c2_constant, declare_c2_preprocessor_constant)
+#define VM_LONG_CONSTANTS_CPU(declare_constant, declare_preprocessor_constant)
 
 #endif // CPU_ZERO_VMSTRUCTS_ZERO_HPP
diff --git a/src/hotspot/os/aix/vmStructs_aix.hpp b/src/hotspot/os/aix/vmStructs_aix.hpp
index fb4b6409aaa..c79c9477fff 100644
--- a/src/hotspot/os/aix/vmStructs_aix.hpp
+++ b/src/hotspot/os/aix/vmStructs_aix.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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,14 @@
 // constants required by the Serviceability Agent. This file is
 // referenced by vmStructs.cpp.
 
-#define VM_STRUCTS_OS(nonstatic_field, static_field, unchecked_nonstatic_field, volatile_nonstatic_field, nonproduct_nonstatic_field, c2_nonstatic_field, unchecked_c1_static_field, unchecked_c2_static_field) \
+#define VM_STRUCTS_OS(nonstatic_field, static_field, unchecked_nonstatic_field, volatile_nonstatic_field, nonproduct_nonstatic_field) \
                                                                                                                                      \
   /******************************/                                                                                                   \
   /* Threads (NOTE: incomplete) */                                                                                                   \
   /******************************/                                                                                                   \
   nonstatic_field(OSThread,                      _thread_id,                                      pthread_t)                         \
 
-#define VM_TYPES_OS(declare_type, declare_toplevel_type, declare_oop_type, declare_integer_type, declare_unsigned_integer_type, declare_c1_toplevel_type, declare_c2_type, declare_c2_toplevel_type) \
+#define VM_TYPES_OS(declare_type, declare_toplevel_type, declare_oop_type, declare_integer_type, declare_unsigned_integer_type) \
                                                                           \
   /**********************/                                                \
   /* Posix Thread IDs   */                                                \
@@ -44,9 +44,9 @@
                                                                           \
   declare_unsigned_integer_type(pthread_t)
 
-#define VM_INT_CONSTANTS_OS(declare_constant, declare_preprocessor_constant, declare_c1_constant, declare_c2_constant, declare_c2_preprocessor_constant)
+#define VM_INT_CONSTANTS_OS(declare_constant, declare_preprocessor_constant)
 
-#define VM_LONG_CONSTANTS_OS(declare_constant, declare_preprocessor_constant, declare_c1_constant, declare_c2_constant, declare_c2_preprocessor_constant)
+#define VM_LONG_CONSTANTS_OS(declare_constant, declare_preprocessor_constant)
 
 #define VM_ADDRESSES_OS(declare_address, declare_preprocessor_address, declare_function)
 
diff --git a/src/hotspot/os/bsd/vmStructs_bsd.hpp b/src/hotspot/os/bsd/vmStructs_bsd.hpp
index b29067a9024..e07f1cd7dd0 100644
--- a/src/hotspot/os/bsd/vmStructs_bsd.hpp
+++ b/src/hotspot/os/bsd/vmStructs_bsd.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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 @@
 // constants required by the Serviceability Agent. This file is
 // referenced by vmStructs.cpp.
 
-#define VM_STRUCTS_OS(nonstatic_field, static_field, unchecked_nonstatic_field, volatile_nonstatic_field, nonproduct_nonstatic_field, c2_nonstatic_field, unchecked_c1_static_field, unchecked_c2_static_field) \
+#define VM_STRUCTS_OS(nonstatic_field, static_field, unchecked_nonstatic_field, volatile_nonstatic_field, nonproduct_nonstatic_field) \
                                                                                                                                      \
   /******************************/                                                                                                   \
   /* Threads (NOTE: incomplete) */                                                                                                   \
@@ -39,7 +39,7 @@
   nonstatic_field(OSThread,                      _thread_id,                                      OSThread::thread_id_t)             \
   nonstatic_field(OSThread,                      _unique_thread_id,                               uint64_t)
 
-#define VM_TYPES_OS(declare_type, declare_toplevel_type, declare_oop_type, declare_integer_type, declare_unsigned_integer_type, declare_c1_toplevel_type, declare_c2_type, declare_c2_toplevel_type) \
+#define VM_TYPES_OS(declare_type, declare_toplevel_type, declare_oop_type, declare_integer_type, declare_unsigned_integer_type) \
                                                                           \
   /**********************/                                                \
   /* Thread IDs         */                                                \
@@ -47,9 +47,9 @@
                                                                           \
   declare_unsigned_integer_type(OSThread::thread_id_t)
 
-#define VM_INT_CONSTANTS_OS(declare_constant, declare_preprocessor_constant, declare_c1_constant, declare_c2_constant, declare_c2_preprocessor_constant)
+#define VM_INT_CONSTANTS_OS(declare_constant, declare_preprocessor_constant)
 
-#define VM_LONG_CONSTANTS_OS(declare_constant, declare_preprocessor_constant, declare_c1_constant, declare_c2_constant, declare_c2_preprocessor_constant)
+#define VM_LONG_CONSTANTS_OS(declare_constant, declare_preprocessor_constant)
 
 #define VM_ADDRESSES_OS(declare_address, declare_preprocessor_address, declare_function) \
   declare_preprocessor_address("RTLD_DEFAULT", RTLD_DEFAULT)
diff --git a/src/hotspot/os/linux/vmStructs_linux.hpp b/src/hotspot/os/linux/vmStructs_linux.hpp
index 2696a891f56..90bc6517a3f 100644
--- a/src/hotspot/os/linux/vmStructs_linux.hpp
+++ b/src/hotspot/os/linux/vmStructs_linux.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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 @@
 // constants required by the Serviceability Agent. This file is
 // referenced by vmStructs.cpp.
 
-#define VM_STRUCTS_OS(nonstatic_field, static_field, unchecked_nonstatic_field, volatile_nonstatic_field, nonproduct_nonstatic_field, c2_nonstatic_field, unchecked_c1_static_field, unchecked_c2_static_field) \
+#define VM_STRUCTS_OS(nonstatic_field, static_field, unchecked_nonstatic_field, volatile_nonstatic_field, nonproduct_nonstatic_field) \
                                                                                                                                      \
   /******************************/                                                                                                   \
   /* Threads (NOTE: incomplete) */                                                                                                   \
@@ -39,7 +39,7 @@
   nonstatic_field(OSThread,                      _thread_id,                                      pid_t)                             \
   nonstatic_field(OSThread,                      _pthread_id,                                     pthread_t)
 
-#define VM_TYPES_OS(declare_type, declare_toplevel_type, declare_oop_type, declare_integer_type, declare_unsigned_integer_type, declare_c1_toplevel_type, declare_c2_type, declare_c2_toplevel_type) \
+#define VM_TYPES_OS(declare_type, declare_toplevel_type, declare_oop_type, declare_integer_type, declare_unsigned_integer_type) \
                                                                           \
   /**********************/                                                \
   /* Posix Thread IDs   */                                                \
@@ -48,9 +48,9 @@
   declare_integer_type(pid_t)                                             \
   declare_unsigned_integer_type(pthread_t)
 
-#define VM_INT_CONSTANTS_OS(declare_constant, declare_preprocessor_constant, declare_c1_constant, declare_c2_constant, declare_c2_preprocessor_constant)
+#define VM_INT_CONSTANTS_OS(declare_constant, declare_preprocessor_constant)
 
-#define VM_LONG_CONSTANTS_OS(declare_constant, declare_preprocessor_constant, declare_c1_constant, declare_c2_constant, declare_c2_preprocessor_constant)
+#define VM_LONG_CONSTANTS_OS(declare_constant, declare_preprocessor_constant)
 
 #define VM_ADDRESSES_OS(declare_address, declare_preprocessor_address, declare_function) \
   declare_preprocessor_address("RTLD_DEFAULT", RTLD_DEFAULT)
diff --git a/src/hotspot/os/windows/vmStructs_windows.hpp b/src/hotspot/os/windows/vmStructs_windows.hpp
index 26ad17bb166..7d457c82fe8 100644
--- a/src/hotspot/os/windows/vmStructs_windows.hpp
+++ b/src/hotspot/os/windows/vmStructs_windows.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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 @@
 // constants required by the Serviceability Agent. This file is
 // referenced by vmStructs.cpp.
 
-#define VM_STRUCTS_OS(nonstatic_field, static_field, unchecked_nonstatic_field, volatile_nonstatic_field, nonproduct_nonstatic_field, c2_nonstatic_field, unchecked_c1_static_field, unchecked_c2_static_field) \
+#define VM_STRUCTS_OS(nonstatic_field, static_field, unchecked_nonstatic_field, volatile_nonstatic_field, nonproduct_nonstatic_field) \
                                                                                                                                      \
   /******************************/                                                                                                   \
   /* Threads (NOTE: incomplete) */                                                                                                   \
@@ -38,13 +38,13 @@
   nonstatic_field(OSThread,                    _thread_id,                                    OSThread::thread_id_t)                 \
   unchecked_nonstatic_field(OSThread,          _thread_handle,                                sizeof(HANDLE)) /* NOTE: no type */
 
-#define VM_TYPES_OS(declare_type, declare_toplevel_type, declare_oop_type, declare_integer_type, declare_unsigned_integer_type, declare_c1_toplevel_type, declare_c2_type, declare_c2_toplevel_type) \
+#define VM_TYPES_OS(declare_type, declare_toplevel_type, declare_oop_type, declare_integer_type, declare_unsigned_integer_type) \
                                                                           \
   declare_unsigned_integer_type(OSThread::thread_id_t)
 
-#define VM_INT_CONSTANTS_OS(declare_constant, declare_preprocessor_constant, declare_c1_constant, declare_c2_constant, declare_c2_preprocessor_constant)
+#define VM_INT_CONSTANTS_OS(declare_constant, declare_preprocessor_constant)
 
-#define VM_LONG_CONSTANTS_OS(declare_constant, declare_preprocessor_constant, declare_c1_constant, declare_c2_constant, declare_c2_preprocessor_constant)
+#define VM_LONG_CONSTANTS_OS(declare_constant, declare_preprocessor_constant)
 
 #define VM_ADDRESSES_OS(declare_address, declare_preprocessor_address, declare_function)
 
diff --git a/src/hotspot/os_cpu/aix_ppc/vmStructs_aix_ppc.hpp b/src/hotspot/os_cpu/aix_ppc/vmStructs_aix_ppc.hpp
index d09b0125f25..df8857a5b84 100644
--- a/src/hotspot/os_cpu/aix_ppc/vmStructs_aix_ppc.hpp
+++ b/src/hotspot/os_cpu/aix_ppc/vmStructs_aix_ppc.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2025, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2012, 2013 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -30,12 +30,12 @@
 // constants required by the Serviceability Agent. This file is
 // referenced by vmStructs.cpp.
 
-#define VM_STRUCTS_OS_CPU(nonstatic_field, static_field, unchecked_nonstatic_field, volatile_nonstatic_field, nonproduct_nonstatic_field, c2_nonstatic_field, unchecked_c1_static_field, unchecked_c2_static_field)
+#define VM_STRUCTS_OS_CPU(nonstatic_field, static_field, unchecked_nonstatic_field, volatile_nonstatic_field, nonproduct_nonstatic_field)
 
-#define VM_TYPES_OS_CPU(declare_type, declare_toplevel_type, declare_oop_type, declare_integer_type, declare_unsigned_integer_type, declare_c1_toplevel_type, declare_c2_type, declare_c2_toplevel_type)
+#define VM_TYPES_OS_CPU(declare_type, declare_toplevel_type, declare_oop_type, declare_integer_type, declare_unsigned_integer_type)
 
-#define VM_INT_CONSTANTS_OS_CPU(declare_constant, declare_preprocessor_constant, declare_c1_constant, declare_c2_constant, declare_c2_preprocessor_constant)
+#define VM_INT_CONSTANTS_OS_CPU(declare_constant, declare_preprocessor_constant)
 
-#define VM_LONG_CONSTANTS_OS_CPU(declare_constant, declare_preprocessor_constant, declare_c1_constant, declare_c2_constant, declare_c2_preprocessor_constant)
+#define VM_LONG_CONSTANTS_OS_CPU(declare_constant, declare_preprocessor_constant)
 
 #endif // OS_CPU_AIX_PPC_VMSTRUCTS_AIX_PPC_HPP
diff --git a/src/hotspot/os_cpu/bsd_aarch64/vmStructs_bsd_aarch64.hpp b/src/hotspot/os_cpu/bsd_aarch64/vmStructs_bsd_aarch64.hpp
index 24d5c0f4dc6..fc98519eb82 100644
--- a/src/hotspot/os_cpu/bsd_aarch64/vmStructs_bsd_aarch64.hpp
+++ b/src/hotspot/os_cpu/bsd_aarch64/vmStructs_bsd_aarch64.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2025, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2014, Red Hat Inc. All rights reserved.
  * Copyright (c) 2021, Azul Systems, Inc. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -31,12 +31,12 @@
 // constants required by the Serviceability Agent. This file is
 // referenced by vmStructs.cpp.
 
-#define VM_STRUCTS_OS_CPU(nonstatic_field, static_field, unchecked_nonstatic_field, volatile_nonstatic_field, nonproduct_nonstatic_field, c2_nonstatic_field, unchecked_c1_static_field, unchecked_c2_static_field)
+#define VM_STRUCTS_OS_CPU(nonstatic_field, static_field, unchecked_nonstatic_field, volatile_nonstatic_field, nonproduct_nonstatic_field)
 
-#define VM_TYPES_OS_CPU(declare_type, declare_toplevel_type, declare_oop_type, declare_integer_type, declare_unsigned_integer_type, declare_c1_toplevel_type, declare_c2_type, declare_c2_toplevel_type)
+#define VM_TYPES_OS_CPU(declare_type, declare_toplevel_type, declare_oop_type, declare_integer_type, declare_unsigned_integer_type)
 
-#define VM_INT_CONSTANTS_OS_CPU(declare_constant, declare_preprocessor_constant, declare_c1_constant, declare_c2_constant, declare_c2_preprocessor_constant)
+#define VM_INT_CONSTANTS_OS_CPU(declare_constant, declare_preprocessor_constant)
 
-#define VM_LONG_CONSTANTS_OS_CPU(declare_constant, declare_preprocessor_constant, declare_c1_constant, declare_c2_constant, declare_c2_preprocessor_constant)
+#define VM_LONG_CONSTANTS_OS_CPU(declare_constant, declare_preprocessor_constant)
 
 #endif // OS_CPU_BSD_AARCH64_VMSTRUCTS_BSD_AARCH64_HPP
diff --git a/src/hotspot/os_cpu/bsd_x86/vmStructs_bsd_x86.hpp b/src/hotspot/os_cpu/bsd_x86/vmStructs_bsd_x86.hpp
index 4f6c4414f5f..d26921e25ba 100644
--- a/src/hotspot/os_cpu/bsd_x86/vmStructs_bsd_x86.hpp
+++ b/src/hotspot/os_cpu/bsd_x86/vmStructs_bsd_x86.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,12 +29,12 @@
 // constants required by the Serviceability Agent. This file is
 // referenced by vmStructs.cpp.
 
-#define VM_STRUCTS_OS_CPU(nonstatic_field, static_field, unchecked_nonstatic_field, volatile_nonstatic_field, nonproduct_nonstatic_field, c2_nonstatic_field, unchecked_c1_static_field, unchecked_c2_static_field)
+#define VM_STRUCTS_OS_CPU(nonstatic_field, static_field, unchecked_nonstatic_field, volatile_nonstatic_field, nonproduct_nonstatic_field)
 
-#define VM_TYPES_OS_CPU(declare_type, declare_toplevel_type, declare_oop_type, declare_integer_type, declare_unsigned_integer_type, declare_c1_toplevel_type, declare_c2_type, declare_c2_toplevel_type)
+#define VM_TYPES_OS_CPU(declare_type, declare_toplevel_type, declare_oop_type, declare_integer_type, declare_unsigned_integer_type)
 
-#define VM_INT_CONSTANTS_OS_CPU(declare_constant, declare_preprocessor_constant, declare_c1_constant, declare_c2_constant, declare_c2_preprocessor_constant)
+#define VM_INT_CONSTANTS_OS_CPU(declare_constant, declare_preprocessor_constant)
 
-#define VM_LONG_CONSTANTS_OS_CPU(declare_constant, declare_preprocessor_constant, declare_c1_constant, declare_c2_constant, declare_c2_preprocessor_constant)
+#define VM_LONG_CONSTANTS_OS_CPU(declare_constant, declare_preprocessor_constant)
 
 #endif // OS_CPU_BSD_X86_VMSTRUCTS_BSD_X86_HPP
diff --git a/src/hotspot/os_cpu/bsd_zero/vmStructs_bsd_zero.hpp b/src/hotspot/os_cpu/bsd_zero/vmStructs_bsd_zero.hpp
index ea3771b7ce6..b5b523cd0ac 100644
--- a/src/hotspot/os_cpu/bsd_zero/vmStructs_bsd_zero.hpp
+++ b/src/hotspot/os_cpu/bsd_zero/vmStructs_bsd_zero.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
  * Copyright 2007 Red Hat, Inc.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -30,13 +30,12 @@
 // constants required by the Serviceability Agent. This file is
 // referenced by vmStructs.cpp.
 
-#define VM_STRUCTS_OS_CPU(nonstatic_field, static_field, unchecked_nonstatic_field, volatile_nonstatic_field, nonproduct_nonstatic_field, c2_nonstatic_field, unchecked_c1_static_field, unchecked_c2_static_field)
+#define VM_STRUCTS_OS_CPU(nonstatic_field, static_field, unchecked_nonstatic_field, volatile_nonstatic_field, nonproduct_nonstatic_field)
 
+#define VM_TYPES_OS_CPU(declare_type, declare_toplevel_type, declare_oop_type, declare_integer_type, declare_unsigned_integer_type)
 
-#define VM_TYPES_OS_CPU(declare_type, declare_toplevel_type, declare_oop_type, declare_integer_type, declare_unsigned_integer_type, declare_c1_toplevel_type, declare_c2_type, declare_c2_toplevel_type)
+#define VM_INT_CONSTANTS_OS_CPU(declare_constant, declare_preprocessor_constant)
 
-#define VM_INT_CONSTANTS_OS_CPU(declare_constant, declare_preprocessor_constant, declare_c1_constant, declare_c2_constant, declare_c2_preprocessor_constant)
-
-#define VM_LONG_CONSTANTS_OS_CPU(declare_constant, declare_preprocessor_constant, declare_c1_constant, declare_c2_constant, declare_c2_preprocessor_constant)
+#define VM_LONG_CONSTANTS_OS_CPU(declare_constant, declare_preprocessor_constant)
 
 #endif // OS_CPU_BSD_ZERO_VMSTRUCTS_BSD_ZERO_HPP
diff --git a/src/hotspot/os_cpu/linux_aarch64/vmStructs_linux_aarch64.hpp b/src/hotspot/os_cpu/linux_aarch64/vmStructs_linux_aarch64.hpp
index 6cc6d73be77..cf44ce0ca74 100644
--- a/src/hotspot/os_cpu/linux_aarch64/vmStructs_linux_aarch64.hpp
+++ b/src/hotspot/os_cpu/linux_aarch64/vmStructs_linux_aarch64.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2025, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2014, Red Hat Inc. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -30,12 +30,12 @@
 // constants required by the Serviceability Agent. This file is
 // referenced by vmStructs.cpp.
 
-#define VM_STRUCTS_OS_CPU(nonstatic_field, static_field, unchecked_nonstatic_field, volatile_nonstatic_field, nonproduct_nonstatic_field, c2_nonstatic_field, unchecked_c1_static_field, unchecked_c2_static_field)
+#define VM_STRUCTS_OS_CPU(nonstatic_field, static_field, unchecked_nonstatic_field, volatile_nonstatic_field, nonproduct_nonstatic_field)
 
-#define VM_TYPES_OS_CPU(declare_type, declare_toplevel_type, declare_oop_type, declare_integer_type, declare_unsigned_integer_type, declare_c1_toplevel_type, declare_c2_type, declare_c2_toplevel_type)
+#define VM_TYPES_OS_CPU(declare_type, declare_toplevel_type, declare_oop_type, declare_integer_type, declare_unsigned_integer_type)
 
-#define VM_INT_CONSTANTS_OS_CPU(declare_constant, declare_preprocessor_constant, declare_c1_constant, declare_c2_constant, declare_c2_preprocessor_constant)
+#define VM_INT_CONSTANTS_OS_CPU(declare_constant, declare_preprocessor_constant)
 
-#define VM_LONG_CONSTANTS_OS_CPU(declare_constant, declare_preprocessor_constant, declare_c1_constant, declare_c2_constant, declare_c2_preprocessor_constant)
+#define VM_LONG_CONSTANTS_OS_CPU(declare_constant, declare_preprocessor_constant)
 
 #endif // OS_CPU_LINUX_AARCH64_VMSTRUCTS_LINUX_AARCH64_HPP
diff --git a/src/hotspot/os_cpu/linux_arm/vmStructs_linux_arm.hpp b/src/hotspot/os_cpu/linux_arm/vmStructs_linux_arm.hpp
index a1b73bdee8f..9d4c610b45a 100644
--- a/src/hotspot/os_cpu/linux_arm/vmStructs_linux_arm.hpp
+++ b/src/hotspot/os_cpu/linux_arm/vmStructs_linux_arm.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,12 +29,12 @@
 // constants required by the Serviceability Agent. This file is
 // referenced by vmStructs.cpp.
 
-#define VM_STRUCTS_OS_CPU(nonstatic_field, static_field, unchecked_nonstatic_field, volatile_nonstatic_field, nonproduct_nonstatic_field, c2_nonstatic_field, unchecked_c1_static_field, unchecked_c2_static_field)
+#define VM_STRUCTS_OS_CPU(nonstatic_field, static_field, unchecked_nonstatic_field, volatile_nonstatic_field, nonproduct_nonstatic_field)
 
-#define VM_TYPES_OS_CPU(declare_type, declare_toplevel_type, declare_oop_type, declare_integer_type, declare_unsigned_integer_type, declare_c1_toplevel_type, declare_c2_type, declare_c2_toplevel_type)
+#define VM_TYPES_OS_CPU(declare_type, declare_toplevel_type, declare_oop_type, declare_integer_type, declare_unsigned_integer_type)
 
-#define VM_INT_CONSTANTS_OS_CPU(declare_constant, declare_preprocessor_constant, declare_c1_constant, declare_c2_constant, declare_c2_preprocessor_constant)
+#define VM_INT_CONSTANTS_OS_CPU(declare_constant, declare_preprocessor_constant)
 
-#define VM_LONG_CONSTANTS_OS_CPU(declare_constant, declare_preprocessor_constant, declare_c1_constant, declare_c2_constant, declare_c2_preprocessor_constant)
+#define VM_LONG_CONSTANTS_OS_CPU(declare_constant, declare_preprocessor_constant)
 
 #endif // OS_CPU_LINUX_ARM_VMSTRUCTS_LINUX_ARM_HPP
diff --git a/src/hotspot/os_cpu/linux_ppc/vmStructs_linux_ppc.hpp b/src/hotspot/os_cpu/linux_ppc/vmStructs_linux_ppc.hpp
index 46288cdeaab..e52dc525e64 100644
--- a/src/hotspot/os_cpu/linux_ppc/vmStructs_linux_ppc.hpp
+++ b/src/hotspot/os_cpu/linux_ppc/vmStructs_linux_ppc.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2025, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2012, 2013 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -30,12 +30,12 @@
 // constants required by the Serviceability Agent. This file is
 // referenced by vmStructs.cpp.
 
-#define VM_STRUCTS_OS_CPU(nonstatic_field, static_field, unchecked_nonstatic_field, volatile_nonstatic_field, nonproduct_nonstatic_field, c2_nonstatic_field, unchecked_c1_static_field, unchecked_c2_static_field)
+#define VM_STRUCTS_OS_CPU(nonstatic_field, static_field, unchecked_nonstatic_field, volatile_nonstatic_field, nonproduct_nonstatic_field)
 
-#define VM_TYPES_OS_CPU(declare_type, declare_toplevel_type, declare_oop_type, declare_integer_type, declare_unsigned_integer_type, declare_c1_toplevel_type, declare_c2_type, declare_c2_toplevel_type)
+#define VM_TYPES_OS_CPU(declare_type, declare_toplevel_type, declare_oop_type, declare_integer_type, declare_unsigned_integer_type)
 
-#define VM_INT_CONSTANTS_OS_CPU(declare_constant, declare_preprocessor_constant, declare_c1_constant, declare_c2_constant, declare_c2_preprocessor_constant)
+#define VM_INT_CONSTANTS_OS_CPU(declare_constant, declare_preprocessor_constant)
 
-#define VM_LONG_CONSTANTS_OS_CPU(declare_constant, declare_preprocessor_constant, declare_c1_constant, declare_c2_constant, declare_c2_preprocessor_constant)
+#define VM_LONG_CONSTANTS_OS_CPU(declare_constant, declare_preprocessor_constant)
 
 #endif // OS_CPU_LINUX_PPC_VMSTRUCTS_LINUX_PPC_HPP
diff --git a/src/hotspot/os_cpu/linux_riscv/vmStructs_linux_riscv.hpp b/src/hotspot/os_cpu/linux_riscv/vmStructs_linux_riscv.hpp
index b39a329335a..02bcf429d42 100644
--- a/src/hotspot/os_cpu/linux_riscv/vmStructs_linux_riscv.hpp
+++ b/src/hotspot/os_cpu/linux_riscv/vmStructs_linux_riscv.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2025, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2020, 2021, Huawei Technologies Co., Ltd. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -30,12 +30,12 @@
 // constants required by the Serviceability Agent. This file is
 // referenced by vmStructs.cpp.
 
-#define VM_STRUCTS_OS_CPU(nonstatic_field, static_field, unchecked_nonstatic_field, volatile_nonstatic_field, nonproduct_nonstatic_field, c2_nonstatic_field, unchecked_c1_static_field, unchecked_c2_static_field)
+#define VM_STRUCTS_OS_CPU(nonstatic_field, static_field, unchecked_nonstatic_field, volatile_nonstatic_field, nonproduct_nonstatic_field)
 
-#define VM_TYPES_OS_CPU(declare_type, declare_toplevel_type, declare_oop_type, declare_integer_type, declare_unsigned_integer_type, declare_c1_toplevel_type, declare_c2_type, declare_c2_toplevel_type)
+#define VM_TYPES_OS_CPU(declare_type, declare_toplevel_type, declare_oop_type, declare_integer_type, declare_unsigned_integer_type)
 
-#define VM_INT_CONSTANTS_OS_CPU(declare_constant, declare_preprocessor_constant, declare_c1_constant, declare_c2_constant, declare_c2_preprocessor_constant)
+#define VM_INT_CONSTANTS_OS_CPU(declare_constant, declare_preprocessor_constant)
 
-#define VM_LONG_CONSTANTS_OS_CPU(declare_constant, declare_preprocessor_constant, declare_c1_constant, declare_c2_constant, declare_c2_preprocessor_constant)
+#define VM_LONG_CONSTANTS_OS_CPU(declare_constant, declare_preprocessor_constant)
 
 #endif // OS_CPU_LINUX_RISCV_VM_VMSTRUCTS_LINUX_RISCV_HPP
diff --git a/src/hotspot/os_cpu/linux_s390/vmStructs_linux_s390.hpp b/src/hotspot/os_cpu/linux_s390/vmStructs_linux_s390.hpp
index a52bc722579..0a75e6d4b92 100644
--- a/src/hotspot/os_cpu/linux_s390/vmStructs_linux_s390.hpp
+++ b/src/hotspot/os_cpu/linux_s390/vmStructs_linux_s390.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2025, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2016 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -30,12 +30,12 @@
 // constants required by the Serviceability Agent. This file is
 // referenced by vmStructs.cpp.
 
-#define VM_STRUCTS_OS_CPU(nonstatic_field, static_field, unchecked_nonstatic_field, volatile_nonstatic_field, nonproduct_nonstatic_field, c2_nonstatic_field, unchecked_c1_static_field, unchecked_c2_static_field)
+#define VM_STRUCTS_OS_CPU(nonstatic_field, static_field, unchecked_nonstatic_field, volatile_nonstatic_field, nonproduct_nonstatic_field)
 
-#define VM_TYPES_OS_CPU(declare_type, declare_toplevel_type, declare_oop_type, declare_integer_type, declare_unsigned_integer_type, declare_c1_toplevel_type, declare_c2_type, declare_c2_toplevel_type)
+#define VM_TYPES_OS_CPU(declare_type, declare_toplevel_type, declare_oop_type, declare_integer_type, declare_unsigned_integer_type)
 
-#define VM_INT_CONSTANTS_OS_CPU(declare_constant, declare_preprocessor_constant, declare_c1_constant, declare_c2_constant, declare_c2_preprocessor_constant)
+#define VM_INT_CONSTANTS_OS_CPU(declare_constant, declare_preprocessor_constant)
 
-#define VM_LONG_CONSTANTS_OS_CPU(declare_constant, declare_preprocessor_constant, declare_c1_constant, declare_c2_constant, declare_c2_preprocessor_constant)
+#define VM_LONG_CONSTANTS_OS_CPU(declare_constant, declare_preprocessor_constant)
 
 #endif // OS_CPU_LINUX_S390_VMSTRUCTS_LINUX_S390_HPP
diff --git a/src/hotspot/os_cpu/linux_x86/vmStructs_linux_x86.hpp b/src/hotspot/os_cpu/linux_x86/vmStructs_linux_x86.hpp
index ddba9daf131..290e30dff68 100644
--- a/src/hotspot/os_cpu/linux_x86/vmStructs_linux_x86.hpp
+++ b/src/hotspot/os_cpu/linux_x86/vmStructs_linux_x86.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,12 +29,12 @@
 // constants required by the Serviceability Agent. This file is
 // referenced by vmStructs.cpp.
 
-#define VM_STRUCTS_OS_CPU(nonstatic_field, static_field, unchecked_nonstatic_field, volatile_nonstatic_field, nonproduct_nonstatic_field, c2_nonstatic_field, unchecked_c1_static_field, unchecked_c2_static_field)
+#define VM_STRUCTS_OS_CPU(nonstatic_field, static_field, unchecked_nonstatic_field, volatile_nonstatic_field, nonproduct_nonstatic_field)
 
-#define VM_TYPES_OS_CPU(declare_type, declare_toplevel_type, declare_oop_type, declare_integer_type, declare_unsigned_integer_type, declare_c1_toplevel_type, declare_c2_type, declare_c2_toplevel_type)
+#define VM_TYPES_OS_CPU(declare_type, declare_toplevel_type, declare_oop_type, declare_integer_type, declare_unsigned_integer_type)
 
-#define VM_INT_CONSTANTS_OS_CPU(declare_constant, declare_preprocessor_constant, declare_c1_constant, declare_c2_constant, declare_c2_preprocessor_constant)
+#define VM_INT_CONSTANTS_OS_CPU(declare_constant, declare_preprocessor_constant)
 
-#define VM_LONG_CONSTANTS_OS_CPU(declare_constant, declare_preprocessor_constant, declare_c1_constant, declare_c2_constant, declare_c2_preprocessor_constant)
+#define VM_LONG_CONSTANTS_OS_CPU(declare_constant, declare_preprocessor_constant)
 
 #endif // OS_CPU_LINUX_X86_VMSTRUCTS_LINUX_X86_HPP
diff --git a/src/hotspot/os_cpu/linux_zero/vmStructs_linux_zero.hpp b/src/hotspot/os_cpu/linux_zero/vmStructs_linux_zero.hpp
index 271193cd705..651846c4b36 100644
--- a/src/hotspot/os_cpu/linux_zero/vmStructs_linux_zero.hpp
+++ b/src/hotspot/os_cpu/linux_zero/vmStructs_linux_zero.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
  * Copyright 2007 Red Hat, Inc.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -30,12 +30,12 @@
 // constants required by the Serviceability Agent. This file is
 // referenced by vmStructs.cpp.
 
-#define VM_STRUCTS_OS_CPU(nonstatic_field, static_field, unchecked_nonstatic_field, volatile_nonstatic_field, nonproduct_nonstatic_field, c2_nonstatic_field, unchecked_c1_static_field, unchecked_c2_static_field)
+#define VM_STRUCTS_OS_CPU(nonstatic_field, static_field, unchecked_nonstatic_field, volatile_nonstatic_field, nonproduct_nonstatic_field)
 
-#define VM_TYPES_OS_CPU(declare_type, declare_toplevel_type, declare_oop_type, declare_integer_type, declare_unsigned_integer_type, declare_c1_toplevel_type, declare_c2_type, declare_c2_toplevel_type)
+#define VM_TYPES_OS_CPU(declare_type, declare_toplevel_type, declare_oop_type, declare_integer_type, declare_unsigned_integer_type)
 
-#define VM_INT_CONSTANTS_OS_CPU(declare_constant, declare_preprocessor_constant, declare_c1_constant, declare_c2_constant, declare_c2_preprocessor_constant)
+#define VM_INT_CONSTANTS_OS_CPU(declare_constant, declare_preprocessor_constant)
 
-#define VM_LONG_CONSTANTS_OS_CPU(declare_constant, declare_preprocessor_constant, declare_c1_constant, declare_c2_constant, declare_c2_preprocessor_constant)
+#define VM_LONG_CONSTANTS_OS_CPU(declare_constant, declare_preprocessor_constant)
 
 #endif // OS_CPU_LINUX_ZERO_VMSTRUCTS_LINUX_ZERO_HPP
diff --git a/src/hotspot/os_cpu/windows_aarch64/vmStructs_windows_aarch64.hpp b/src/hotspot/os_cpu/windows_aarch64/vmStructs_windows_aarch64.hpp
index 18a5588b743..2462a20568d 100644
--- a/src/hotspot/os_cpu/windows_aarch64/vmStructs_windows_aarch64.hpp
+++ b/src/hotspot/os_cpu/windows_aarch64/vmStructs_windows_aarch64.hpp
@@ -29,12 +29,12 @@
 // constants required by the Serviceability Agent. This file is
 // referenced by vmStructs.cpp.
 
-#define VM_STRUCTS_OS_CPU(nonstatic_field, static_field, unchecked_nonstatic_field, volatile_nonstatic_field, nonproduct_nonstatic_field, c2_nonstatic_field, unchecked_c1_static_field, unchecked_c2_static_field)
+#define VM_STRUCTS_OS_CPU(nonstatic_field, static_field, unchecked_nonstatic_field, volatile_nonstatic_field, nonproduct_nonstatic_field)
 
-#define VM_TYPES_OS_CPU(declare_type, declare_toplevel_type, declare_oop_type, declare_integer_type, declare_unsigned_integer_type, declare_c1_toplevel_type, declare_c2_type, declare_c2_toplevel_type)
+#define VM_TYPES_OS_CPU(declare_type, declare_toplevel_type, declare_oop_type, declare_integer_type, declare_unsigned_integer_type)
 
-#define VM_INT_CONSTANTS_OS_CPU(declare_constant, declare_preprocessor_constant, declare_c1_constant, declare_c2_constant, declare_c2_preprocessor_constant)
+#define VM_INT_CONSTANTS_OS_CPU(declare_constant, declare_preprocessor_constant)
 
-#define VM_LONG_CONSTANTS_OS_CPU(declare_constant, declare_preprocessor_constant, declare_c1_constant, declare_c2_constant, declare_c2_preprocessor_constant)
+#define VM_LONG_CONSTANTS_OS_CPU(declare_constant, declare_preprocessor_constant)
 
 #endif // OS_CPU_WINDOWS_AARCH64_VMSTRUCTS_WINDOWS_AARCH64_HPP
diff --git a/src/hotspot/os_cpu/windows_x86/vmStructs_windows_x86.hpp b/src/hotspot/os_cpu/windows_x86/vmStructs_windows_x86.hpp
index 4ed62839d51..0ac47bdbd80 100644
--- a/src/hotspot/os_cpu/windows_x86/vmStructs_windows_x86.hpp
+++ b/src/hotspot/os_cpu/windows_x86/vmStructs_windows_x86.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,12 +29,12 @@
 // constants required by the Serviceability Agent. This file is
 // referenced by vmStructs.cpp.
 
-#define VM_STRUCTS_OS_CPU(nonstatic_field, static_field, unchecked_nonstatic_field, volatile_nonstatic_field, nonproduct_nonstatic_field, c2_nonstatic_field, unchecked_c1_static_field, unchecked_c2_static_field)
+#define VM_STRUCTS_OS_CPU(nonstatic_field, static_field, unchecked_nonstatic_field, volatile_nonstatic_field, nonproduct_nonstatic_field)
 
-#define VM_TYPES_OS_CPU(declare_type, declare_toplevel_type, declare_oop_type, declare_integer_type, declare_unsigned_integer_type, declare_c1_toplevel_type, declare_c2_type, declare_c2_toplevel_type)
+#define VM_TYPES_OS_CPU(declare_type, declare_toplevel_type, declare_oop_type, declare_integer_type, declare_unsigned_integer_type)
 
-#define VM_INT_CONSTANTS_OS_CPU(declare_constant, declare_preprocessor_constant, declare_c1_constant, declare_c2_constant, declare_c2_preprocessor_constant)
+#define VM_INT_CONSTANTS_OS_CPU(declare_constant, declare_preprocessor_constant)
 
-#define VM_LONG_CONSTANTS_OS_CPU(declare_constant, declare_preprocessor_constant, declare_c1_constant, declare_c2_constant, declare_c2_preprocessor_constant)
+#define VM_LONG_CONSTANTS_OS_CPU(declare_constant, declare_preprocessor_constant)
 
 #endif // OS_CPU_WINDOWS_X86_VMSTRUCTS_WINDOWS_X86_HPP
diff --git a/src/hotspot/share/c1/c1_Runtime1.hpp b/src/hotspot/share/c1/c1_Runtime1.hpp
index 5f1ae4333bc..5fce0ff4228 100644
--- a/src/hotspot/share/c1/c1_Runtime1.hpp
+++ b/src/hotspot/share/c1/c1_Runtime1.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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,6 @@ enum class C1StubId :int {
 #undef C1_STUB_ID_ENUM_DECLARE
 
 class Runtime1: public AllStatic {
-  friend class VMStructs;
   friend class ArrayCopyStub;
 
 public:
diff --git a/src/hotspot/share/ci/ciClassList.hpp b/src/hotspot/share/ci/ciClassList.hpp
index ccc99cfa211..618a052765e 100644
--- a/src/hotspot/share/ci/ciClassList.hpp
+++ b/src/hotspot/share/ci/ciClassList.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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,13 +75,11 @@ class       ciTypeArrayKlass;
 // Everyone gives access to ciObjectFactory
 #define CI_PACKAGE_ACCESS \
 friend class ciObjectFactory; \
-friend class VMStructs;
 
 // These are the packages that have access to ciEnv
 // Any more access must be given explicitly.
 #define CI_PACKAGE_ACCESS_TO           \
 friend class ciObjectFactory;          \
-friend class VMStructs;                \
 friend class ciCallSite;               \
 friend class ciConstantPoolCache;      \
 friend class ciField;                  \
diff --git a/src/hotspot/share/ci/ciConstant.hpp b/src/hotspot/share/ci/ciConstant.hpp
index 1d0f60407ed..f07d0a170df 100644
--- a/src/hotspot/share/ci/ciConstant.hpp
+++ b/src/hotspot/share/ci/ciConstant.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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 @@
 //
 // This class represents a constant value.
 class ciConstant {
-  friend class VMStructs;
 private:
   friend class ciEnv;
   friend class ciField;
diff --git a/src/hotspot/share/ci/ciObjectFactory.hpp b/src/hotspot/share/ci/ciObjectFactory.hpp
index f1f6ae24545..d95a7d1ff22 100644
--- a/src/hotspot/share/ci/ciObjectFactory.hpp
+++ b/src/hotspot/share/ci/ciObjectFactory.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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 @@
 // which ensures that for each oop, at most one ciObject is created.
 // This invariant allows efficient implementation of ciObject.
 class ciObjectFactory : public ArenaObj {
-  friend class VMStructs;
   friend class ciEnv;
 
 private:
diff --git a/src/hotspot/share/jvmci/vmStructs_jvmci.cpp b/src/hotspot/share/jvmci/vmStructs_jvmci.cpp
index 93c3449d0ff..48c9f8a64dc 100644
--- a/src/hotspot/share/jvmci/vmStructs_jvmci.cpp
+++ b/src/hotspot/share/jvmci/vmStructs_jvmci.cpp
@@ -943,7 +943,7 @@
 
 #ifdef AARCH64
 
-#define VM_STRUCTS_CPU(nonstatic_field, static_field, unchecked_nonstatic_field, volatile_nonstatic_field, nonproduct_nonstatic_field, c2_nonstatic_field, unchecked_c1_static_field, unchecked_c2_static_field) \
+#define VM_STRUCTS_CPU(nonstatic_field, static_field, unchecked_nonstatic_field, volatile_nonstatic_field, nonproduct_nonstatic_field) \
   static_field(VM_Version, _zva_length, int)                            \
   static_field(StubRoutines::aarch64, _count_positives, address)        \
   static_field(StubRoutines::aarch64, _count_positives_long, address)   \
@@ -957,11 +957,11 @@
 
 #ifdef X86
 
-#define VM_STRUCTS_CPU(nonstatic_field, static_field, unchecked_nonstatic_field, volatile_nonstatic_field, nonproduct_nonstatic_field, c2_nonstatic_field, unchecked_c1_static_field, unchecked_c2_static_field) \
+#define VM_STRUCTS_CPU(nonstatic_field, static_field, unchecked_nonstatic_field, volatile_nonstatic_field, nonproduct_nonstatic_field) \
   volatile_nonstatic_field(JavaFrameAnchor, _last_Java_fp, intptr_t*) \
   static_field(VM_Version, _has_intel_jcc_erratum, bool)
 
-#define VM_INT_CONSTANTS_CPU(declare_constant, declare_preprocessor_constant, declare_c1_constant, declare_c2_constant, declare_c2_preprocessor_constant) \
+#define VM_INT_CONSTANTS_CPU(declare_constant, declare_preprocessor_constant) \
   LP64_ONLY(declare_constant(frame::arg_reg_save_area_bytes))       \
   declare_constant(frame::interpreter_frame_sender_sp_offset)       \
   declare_constant(frame::interpreter_frame_last_sp_offset)
@@ -975,15 +975,15 @@
  * Dummy defines for architectures that don't use these.
  */
 #ifndef VM_STRUCTS_CPU
-#define VM_STRUCTS_CPU(nonstatic_field, static_field, unchecked_nonstatic_field, volatile_nonstatic_field, nonproduct_nonstatic_field, c2_nonstatic_field, unchecked_c1_static_field, unchecked_c2_static_field)
+#define VM_STRUCTS_CPU(nonstatic_field, static_field, unchecked_nonstatic_field, volatile_nonstatic_field, nonproduct_nonstatic_field)
 #endif
 
 #ifndef VM_INT_CONSTANTS_CPU
-#define VM_INT_CONSTANTS_CPU(declare_constant, declare_preprocessor_constant, declare_c1_constant, declare_c2_constant, declare_c2_preprocessor_constant)
+#define VM_INT_CONSTANTS_CPU(declare_constant, declare_preprocessor_constant)
 #endif
 
 #ifndef VM_LONG_CONSTANTS_CPU
-#define VM_LONG_CONSTANTS_CPU(declare_constant, declare_preprocessor_constant, declare_c1_constant, declare_c2_constant, declare_c2_preprocessor_constant)
+#define VM_LONG_CONSTANTS_CPU(declare_constant, declare_preprocessor_constant)
 #endif
 
 #ifndef VM_ADDRESSES_OS
@@ -1010,10 +1010,7 @@ VMStructEntry JVMCIVMStructs::localHotSpotVMStructs[] = {
                  GENERATE_STATIC_VM_STRUCT_ENTRY,
                  GENERATE_UNCHECKED_NONSTATIC_VM_STRUCT_ENTRY,
                  GENERATE_NONSTATIC_VM_STRUCT_ENTRY,
-                 GENERATE_NONPRODUCT_NONSTATIC_VM_STRUCT_ENTRY,
-                 GENERATE_C2_NONSTATIC_VM_STRUCT_ENTRY,
-                 GENERATE_C1_UNCHECKED_STATIC_VM_STRUCT_ENTRY,
-                 GENERATE_C2_UNCHECKED_STATIC_VM_STRUCT_ENTRY)
+                 GENERATE_NONPRODUCT_NONSTATIC_VM_STRUCT_ENTRY)
 
 #if INCLUDE_G1GC
   VM_STRUCTS_JVMCI_G1GC(GENERATE_NONSTATIC_VM_STRUCT_ENTRY,
@@ -1038,10 +1035,7 @@ VMIntConstantEntry JVMCIVMStructs::localHotSpotVMIntConstants[] = {
                    GENERATE_PREPROCESSOR_VM_INT_CONSTANT_ENTRY)
 
   VM_INT_CONSTANTS_CPU(GENERATE_VM_INT_CONSTANT_ENTRY,
-                       GENERATE_PREPROCESSOR_VM_INT_CONSTANT_ENTRY,
-                       GENERATE_C1_VM_INT_CONSTANT_ENTRY,
-                       GENERATE_C2_VM_INT_CONSTANT_ENTRY,
-                       GENERATE_C2_PREPROCESSOR_VM_INT_CONSTANT_ENTRY)
+                       GENERATE_PREPROCESSOR_VM_INT_CONSTANT_ENTRY)
 
 #if INCLUDE_G1GC
   VM_INT_CONSTANTS_JVMCI_G1GC(GENERATE_VM_INT_CONSTANT_ENTRY,
@@ -1064,10 +1058,7 @@ VMLongConstantEntry JVMCIVMStructs::localHotSpotVMLongConstants[] = {
                     GENERATE_PREPROCESSOR_VM_LONG_CONSTANT_ENTRY)
 
   VM_LONG_CONSTANTS_CPU(GENERATE_VM_LONG_CONSTANT_ENTRY,
-                        GENERATE_PREPROCESSOR_VM_LONG_CONSTANT_ENTRY,
-                        GENERATE_C1_VM_LONG_CONSTANT_ENTRY,
-                        GENERATE_C2_VM_LONG_CONSTANT_ENTRY,
-                        GENERATE_C2_PREPROCESSOR_VM_LONG_CONSTANT_ENTRY)
+                        GENERATE_PREPROCESSOR_VM_LONG_CONSTANT_ENTRY)
 #ifdef VM_LONG_CPU_FEATURE_CONSTANTS
   VM_LONG_CPU_FEATURE_CONSTANTS
 #endif
@@ -1123,10 +1114,7 @@ void JVMCIVMStructs::init() {
                  CHECK_STATIC_VM_STRUCT_ENTRY,
                  CHECK_NO_OP,
                  CHECK_VOLATILE_NONSTATIC_VM_STRUCT_ENTRY,
-                 CHECK_NONPRODUCT_NONSTATIC_VM_STRUCT_ENTRY,
-                 CHECK_C2_NONSTATIC_VM_STRUCT_ENTRY,
-                 CHECK_NO_OP,
-                 CHECK_NO_OP);
+                 CHECK_NONPRODUCT_NONSTATIC_VM_STRUCT_ENTRY)
 
 #if INCLUDE_G1GC
   VM_STRUCTS_JVMCI_G1GC(CHECK_NONSTATIC_VM_STRUCT_ENTRY,
diff --git a/src/hotspot/share/opto/block.hpp b/src/hotspot/share/opto/block.hpp
index 231c0994903..4ac6399d3a0 100644
--- a/src/hotspot/share/opto/block.hpp
+++ b/src/hotspot/share/opto/block.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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 @@ struct Tarjan;
 // Note that the constructor just zeros things, and since I use Arena
 // allocation I do not need a destructor to reclaim storage.
 class Block_Array : public ArenaObj {
-  friend class VMStructs;
   uint _size;                   // allocated size, as opposed to formal limit
   debug_only(uint _limit;)      // limit to formal domain
   Arena *_arena;                // Arena to allocate in
@@ -75,7 +74,6 @@ public:
 
 
 class Block_List : public Block_Array {
-  friend class VMStructs;
 public:
   uint _cnt;
   Block_List() : Block_List(Thread::current()->resource_area()) { }
@@ -93,7 +91,6 @@ public:
 
 
 class CFGElement : public AnyObj {
-  friend class VMStructs;
  public:
   double _freq; // Execution frequency (estimate)
 
@@ -109,7 +106,6 @@ class CFGElement : public AnyObj {
 // Basic blocks are used during the output routines, and are not used during
 // any optimization pass.  They are created late in the game.
 class Block : public CFGElement {
-  friend class VMStructs;
 
 private:
   // Nodes in this block, in order
@@ -372,7 +368,6 @@ public:
 //------------------------------PhaseCFG---------------------------------------
 // Build an array of Basic Block pointers, one per Node.
 class PhaseCFG : public Phase {
-  friend class VMStructs;
  private:
   // Root of whole program
   RootNode* _root;
@@ -703,7 +698,6 @@ public:
 
 //------------------------------CFGLoop-------------------------------------------
 class CFGLoop : public CFGElement {
-  friend class VMStructs;
   int _id;
   int _depth;
   CFGLoop *_parent;      // root of loop tree is the method level "pseudo" loop, it's parent is null
@@ -756,7 +750,6 @@ class CFGLoop : public CFGElement {
 // A edge between two basic blocks that will be embodied by a branch or a
 // fall-through.
 class CFGEdge : public ResourceObj {
-  friend class VMStructs;
  private:
   Block * _from;        // Source basic block
   Block * _to;          // Destination basic block
@@ -892,7 +885,6 @@ class Trace : public ResourceObj {
 //------------------------------PhaseBlockLayout-------------------------------
 // Rearrange blocks into some canonical order, based on edges and their frequencies
 class PhaseBlockLayout : public Phase {
-  friend class VMStructs;
   PhaseCFG &_cfg;               // Control flow graph
 
   GrowableArray<CFGEdge *> *edges;
diff --git a/src/hotspot/share/opto/callnode.hpp b/src/hotspot/share/opto/callnode.hpp
index ad5e9daa8f6..2f1aad60e6f 100644
--- a/src/hotspot/share/opto/callnode.hpp
+++ b/src/hotspot/share/opto/callnode.hpp
@@ -198,7 +198,6 @@ public:
 // This provides a way to map the optimized program back into the interpreter,
 // or to let the GC mark the stack.
 class JVMState : public ResourceObj {
-  friend class VMStructs;
 public:
   typedef enum {
     Reexecute_Undefined = -1, // not defined -- will be translated into false later
@@ -331,7 +330,6 @@ public:
 class SafePointNode : public MultiNode {
   friend JVMState;
   friend class GraphKit;
-  friend class VMStructs;
 
   virtual bool           cmp( const Node &n ) const;
   virtual uint           size_of() const;       // Size is bigger
@@ -672,7 +670,6 @@ class CallGenerator;
 // Call nodes now subsume the function of debug nodes at callsites, so they
 // contain the functionality of a full scope chain of debug nodes.
 class CallNode : public SafePointNode {
-  friend class VMStructs;
 
 protected:
   bool may_modify_arraycopy_helper(const TypeOopPtr* dest_t, const TypeOopPtr* t_oop, PhaseValues* phase);
@@ -760,7 +757,6 @@ public:
 // convention.  (The "Java" calling convention is the compiler's calling
 // convention, as opposed to the interpreter's or that of native C.)
 class CallJavaNode : public CallNode {
-  friend class VMStructs;
 protected:
   virtual bool cmp( const Node &n ) const;
   virtual uint size_of() const; // Size is bigger
diff --git a/src/hotspot/share/opto/chaitin.hpp b/src/hotspot/share/opto/chaitin.hpp
index cf02deb6019..4b74420f996 100644
--- a/src/hotspot/share/opto/chaitin.hpp
+++ b/src/hotspot/share/opto/chaitin.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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 @@ class PhaseChaitin;
 //------------------------------LRG--------------------------------------------
 // Live-RanGe structure.
 class LRG : public ResourceObj {
-  friend class VMStructs;
 public:
   static const uint AllStack_size = 0xFFFFF; // This mask size is used to tell that the mask of this LRG supports stack positions
   enum { SPILL_REG=29999 };     // Register number of a spilled LRG
@@ -236,7 +235,6 @@ public:
 // abstract!  It needs abstraction so I can fiddle with the implementation to
 // get even more speed.
 class PhaseIFG : public Phase {
-  friend class VMStructs;
   // Current implementation: a triangular adjacency list.
 
   // Array of adjacency-lists, indexed by live-range number
@@ -417,7 +415,6 @@ public:
 //------------------------------Chaitin----------------------------------------
 // Briggs-Chaitin style allocation, mostly.
 class PhaseChaitin : public PhaseRegAlloc {
-  friend class VMStructs;
 
   int _trip_cnt;
   int _alternate;
diff --git a/src/hotspot/share/opto/compile.hpp b/src/hotspot/share/opto/compile.hpp
index 93252891207..2ae3cca218d 100644
--- a/src/hotspot/share/opto/compile.hpp
+++ b/src/hotspot/share/opto/compile.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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,7 +175,6 @@ class CloneMap {
 
 class Options {
   friend class Compile;
-  friend class VMStructs;
  private:
   const bool _subsume_loads;         // Load can be matched as part of a larger op.
   const bool _do_escape_analysis;    // Do escape analysis.
@@ -222,7 +221,6 @@ class Options {
 // This class defines a top-level Compiler invocation.
 
 class Compile : public Phase {
-  friend class VMStructs;
 
  public:
   // Fixed alias indexes.  (See also MergeMemNode.)
diff --git a/src/hotspot/share/opto/node.hpp b/src/hotspot/share/opto/node.hpp
index e89ec9455a6..f6cb9f692bb 100644
--- a/src/hotspot/share/opto/node.hpp
+++ b/src/hotspot/share/opto/node.hpp
@@ -241,7 +241,6 @@ typedef ResizeableResourceHashtable<Node*, Node*, AnyObj::RESOURCE_AREA, mtCompi
 // whenever I have phase-specific information.
 
 class Node {
-  friend class VMStructs;
 
   // Lots of restrictions on cloning Nodes
   NONCOPYABLE(Node);
@@ -1619,7 +1618,6 @@ class SimpleDUIterator : public StackObj {
 // Note that the constructor just zeros things, and since I use Arena
 // allocation I do not need a destructor to reclaim storage.
 class Node_Array : public AnyObj {
-  friend class VMStructs;
 protected:
   Arena* _a;                    // Arena to allocate in
   uint   _max;
@@ -1664,7 +1662,6 @@ public:
 };
 
 class Node_List : public Node_Array {
-  friend class VMStructs;
   uint _cnt;
 public:
   Node_List(uint max = OptoNodeListSize) : Node_Array(Thread::current()->resource_area(), max), _cnt(0) {}
@@ -1731,7 +1728,6 @@ void Node::visit_uses(Callback callback, Check is_boundary) const {
 
 //------------------------------Unique_Node_List-------------------------------
 class Unique_Node_List : public Node_List {
-  friend class VMStructs;
   VectorSet _in_worklist;
   uint _clock_index;            // Index in list where to pop from next
 public:
@@ -1871,7 +1867,6 @@ inline void Compile::remove_for_igvn(Node* n) {
 
 //------------------------------Node_Stack-------------------------------------
 class Node_Stack {
-  friend class VMStructs;
 protected:
   struct INode {
     Node *node; // Processed node
@@ -1947,7 +1942,6 @@ public:
 // Debugging or profiling annotations loosely and sparsely associated
 // with some nodes.  See Compile::node_notes_at for the accessor.
 class Node_Notes {
-  friend class VMStructs;
   JVMState* _jvms;
 
 public:
diff --git a/src/hotspot/share/opto/optoreg.hpp b/src/hotspot/share/opto/optoreg.hpp
index b079f3473ad..6298eeea39c 100644
--- a/src/hotspot/share/opto/optoreg.hpp
+++ b/src/hotspot/share/opto/optoreg.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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,7 +182,6 @@ class OptoReg {
 // and converting that will return OptoReg::Bad losing the identity of the OptoReg.
 
 class OptoRegPair {
-  friend class VMStructs;
 private:
   short _second;
   short _first;
diff --git a/src/hotspot/share/opto/regalloc.hpp b/src/hotspot/share/opto/regalloc.hpp
index ecdf2e2bee8..86877e18325 100644
--- a/src/hotspot/share/opto/regalloc.hpp
+++ b/src/hotspot/share/opto/regalloc.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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 @@ class PhaseCFG;
 //------------------------------PhaseRegAlloc------------------------------------
 // Abstract register allocator
 class PhaseRegAlloc : public Phase {
-  friend class VMStructs;
   static void (*_alloc_statistics[MAX_REG_ALLOCATORS])();
   static int _num_allocators;
 
diff --git a/src/hotspot/share/opto/type.hpp b/src/hotspot/share/opto/type.hpp
index 67e339d3d2e..6e17ef0db05 100644
--- a/src/hotspot/share/opto/type.hpp
+++ b/src/hotspot/share/opto/type.hpp
@@ -79,7 +79,6 @@ class VerifyMeet;
 // different kind of Type exists.  Types are never modified after creation, so
 // all their interesting fields are constant.
 class Type {
-  friend class VMStructs;
 
 public:
   enum TYPES {
diff --git a/src/hotspot/share/runtime/vmStructs.cpp b/src/hotspot/share/runtime/vmStructs.cpp
index c9d93930d63..5184440499a 100644
--- a/src/hotspot/share/runtime/vmStructs.cpp
+++ b/src/hotspot/share/runtime/vmStructs.cpp
@@ -115,31 +115,7 @@
 #include "utilities/macros.hpp"
 #include "utilities/vmError.hpp"
 #ifdef COMPILER2
-#include "opto/addnode.hpp"
-#include "opto/block.hpp"
-#include "opto/callnode.hpp"
-#include "opto/castnode.hpp"
-#include "opto/cfgnode.hpp"
-#include "opto/chaitin.hpp"
-#include "opto/convertnode.hpp"
-#include "opto/divnode.hpp"
-#include "opto/intrinsicnode.hpp"
-#include "opto/locknode.hpp"
-#include "opto/loopnode.hpp"
-#include "opto/machnode.hpp"
-#include "opto/matcher.hpp"
-#include "opto/mathexactnode.hpp"
-#include "opto/movenode.hpp"
-#include "opto/mulnode.hpp"
-#include "opto/narrowptrnode.hpp"
-#include "opto/opaquenode.hpp"
 #include "opto/optoreg.hpp"
-#include "opto/parse.hpp"
-#include "opto/phaseX.hpp"
-#include "opto/regalloc.hpp"
-#include "opto/rootnode.hpp"
-#include "opto/subnode.hpp"
-#include "opto/vectornode.hpp"
 #endif // COMPILER2
 
 #include CPU_HEADER(vmStructs)
@@ -183,11 +159,7 @@
                    volatile_static_field,                                                                                            \
                    unchecked_nonstatic_field,                                                                                        \
                    volatile_nonstatic_field,                                                                                         \
-                   nonproduct_nonstatic_field,                                                                                       \
-                   c1_nonstatic_field,                                                                                               \
-                   c2_nonstatic_field,                                                                                               \
-                   unchecked_c1_static_field,                                                                                        \
-                   unchecked_c2_static_field)                                                                                        \
+                   nonproduct_nonstatic_field)                                                                                       \
                                                                                                                                      \
   /*************/                                                                                                                    \
   /* GC fields */                                                                                                                    \
@@ -595,8 +567,6 @@
   nonstatic_field(nmethod,                     _comp_level,                                   CompLevel)                             \
   volatile_nonstatic_field(nmethod,            _exception_cache,                              ExceptionCache*)                       \
                                                                                                                                      \
-  unchecked_c2_static_field(Deoptimization,    _trap_reason_name,                             void*)                                 \
-                                                                                                                                     \
   nonstatic_field(Deoptimization::UnrollBlock, _size_of_deoptimized_frame,                    int)                                   \
   nonstatic_field(Deoptimization::UnrollBlock, _caller_adjustment,                            int)                                   \
   nonstatic_field(Deoptimization::UnrollBlock, _number_of_frames,                             int)                                   \
@@ -667,7 +637,6 @@
   volatile_nonstatic_field(JavaThread,         _terminated,                                   JavaThread::TerminatedTypes)           \
   nonstatic_field(Thread,                      _osthread,                                     OSThread*)                             \
   nonstatic_field(Thread,                      _resource_area,                                ResourceArea*)                         \
-  nonstatic_field(CompilerThread,              _env,                                          ciEnv*)                                \
                                                                                                                                      \
   /************/                                                                                                                     \
   /* OSThread */                                                                                                                     \
@@ -710,75 +679,6 @@
      static_field(VMRegImpl,                   regName[0],                                    const char*)                           \
      static_field(VMRegImpl,                   stack0,                                        VMReg)                                 \
                                                                                                                                      \
-  /*******************************/                                                                                                  \
-  /* Runtime1 (NOTE: incomplete) */                                                                                                  \
-  /*******************************/                                                                                                  \
-                                                                                                                                     \
-  unchecked_c1_static_field(Runtime1,          _blobs,                                 sizeof(Runtime1::_blobs)) /* NOTE: no type */ \
-                                                                                                                                     \
-  /**************/                                                                                                                   \
-  /* CI */                                                                                                                           \
-  /************/                                                                                                                     \
-                                                                                                                                     \
-  nonstatic_field(ciEnv,                       _compiler_data,                                void*)                                 \
-  nonstatic_field(ciEnv,                       _factory,                                      ciObjectFactory*)                      \
-  nonstatic_field(ciEnv,                       _dependencies,                                 Dependencies*)                         \
-  nonstatic_field(ciEnv,                       _task,                                         CompileTask*)                          \
-  nonstatic_field(ciEnv,                       _arena,                                        Arena*)                                \
-                                                                                                                                     \
-  nonstatic_field(ciBaseObject,                _ident,                                        uint)                                  \
-                                                                                                                                     \
-  nonstatic_field(ciObject,                    _handle,                                       jobject)                               \
-  nonstatic_field(ciObject,                    _klass,                                        ciKlass*)                              \
-                                                                                                                                     \
-  nonstatic_field(ciMetadata,                  _metadata,                                     Metadata*)                             \
-                                                                                                                                     \
-  nonstatic_field(ciSymbol,                    _symbol,                                       Symbol*)                               \
-                                                                                                                                     \
-  nonstatic_field(ciType,                      _basic_type,                                   BasicType)                             \
-                                                                                                                                     \
-  nonstatic_field(ciKlass,                     _name,                                         ciSymbol*)                             \
-                                                                                                                                     \
-  nonstatic_field(ciArrayKlass,                _dimension,                                    jint)                                  \
-                                                                                                                                     \
-  nonstatic_field(ciObjArrayKlass,             _element_klass,                                ciKlass*)                              \
-  nonstatic_field(ciObjArrayKlass,             _base_element_klass,                           ciKlass*)                              \
-                                                                                                                                     \
-  nonstatic_field(ciInstanceKlass,             _init_state,                                   InstanceKlass::ClassState)             \
-  nonstatic_field(ciInstanceKlass,             _is_shared,                                    bool)                                  \
-                                                                                                                                     \
-  nonstatic_field(ciMethod,                    _interpreter_invocation_count,                 int)                                   \
-  nonstatic_field(ciMethod,                    _interpreter_throwout_count,                   int)                                   \
-  nonstatic_field(ciMethod,                    _inline_instructions_size,                     int)                                   \
-                                                                                                                                     \
-  nonstatic_field(ciMethodData,                _data_size,                                    int)                                   \
-  nonstatic_field(ciMethodData,                _state,                                        u_char)                                \
-  nonstatic_field(ciMethodData,                _extra_data_size,                              int)                                   \
-  nonstatic_field(ciMethodData,                _data,                                         intptr_t*)                             \
-  nonstatic_field(ciMethodData,                _hint_di,                                      int)                                   \
-  nonstatic_field(ciMethodData,                _eflags,                                       intx)                                  \
-  nonstatic_field(ciMethodData,                _arg_local,                                    intx)                                  \
-  nonstatic_field(ciMethodData,                _arg_stack,                                    intx)                                  \
-  nonstatic_field(ciMethodData,                _arg_returned,                                 intx)                                  \
-  nonstatic_field(ciMethodData,                _orig,                                         MethodData::CompilerCounters)          \
-                                                                                                                                     \
-  nonstatic_field(ciField,                     _holder,                                       ciInstanceKlass*)                      \
-  nonstatic_field(ciField,                     _name,                                         ciSymbol*)                             \
-  nonstatic_field(ciField,                     _signature,                                    ciSymbol*)                             \
-  nonstatic_field(ciField,                     _offset,                                       int)                                   \
-  nonstatic_field(ciField,                     _is_constant,                                  bool)                                  \
-  nonstatic_field(ciField,                     _constant_value,                               ciConstant)                            \
-                                                                                                                                     \
-  nonstatic_field(ciObjectFactory,             _ci_metadata,                                  GrowableArray<ciMetadata*>)            \
-  nonstatic_field(ciObjectFactory,             _symbols,                                      GrowableArray<ciSymbol*>)              \
-                                                                                                                                     \
-  nonstatic_field(ciConstant,                  _type,                                         BasicType)                             \
-  nonstatic_field(ciConstant,                  _value._int,                                   jint)                                  \
-  nonstatic_field(ciConstant,                  _value._long,                                  jlong)                                 \
-  nonstatic_field(ciConstant,                  _value._float,                                 jfloat)                                \
-  nonstatic_field(ciConstant,                  _value._double,                                jdouble)                               \
-  nonstatic_field(ciConstant,                  _value._object,                                ciObject*)                             \
-                                                                                                                                     \
   /************/                                                                                                                     \
   /* Monitors */                                                                                                                     \
   /************/                                                                                                                     \
@@ -798,123 +698,6 @@
   volatile_nonstatic_field(MonitorList,        _head,                                         ObjectMonitor*)                        \
                                                                                                                                      \
   /*********************/                                                                                                            \
-  /* Matcher (C2 only) */                                                                                                            \
-  /*********************/                                                                                                            \
-                                                                                                                                     \
-  unchecked_c2_static_field(Matcher,           _regEncode,                          sizeof(Matcher::_regEncode)) /* NOTE: no type */ \
-                                                                                                                                     \
-  c2_nonstatic_field(Node,                     _in,                                           Node**)                                \
-  c2_nonstatic_field(Node,                     _out,                                          Node**)                                \
-  c2_nonstatic_field(Node,                     _cnt,                                          node_idx_t)                            \
-  c2_nonstatic_field(Node,                     _max,                                          node_idx_t)                            \
-  c2_nonstatic_field(Node,                     _outcnt,                                       node_idx_t)                            \
-  c2_nonstatic_field(Node,                     _outmax,                                       node_idx_t)                            \
-  c2_nonstatic_field(Node,                     _idx,                                          const node_idx_t)                      \
-  c2_nonstatic_field(Node,                     _class_id,                                     juint)                                 \
-  c2_nonstatic_field(Node,                     _flags,                                        juint)                                 \
-                                                                                                                                     \
-  c2_nonstatic_field(Compile,                  _root,                                         RootNode*)                             \
-  c2_nonstatic_field(Compile,                  _unique,                                       uint)                                  \
-  c2_nonstatic_field(Compile,                  _entry_bci,                                    int)                                   \
-  c2_nonstatic_field(Compile,                  _top,                                          Node*)                                 \
-  c2_nonstatic_field(Compile,                  _cfg,                                          PhaseCFG*)                             \
-  c2_nonstatic_field(Compile,                  _regalloc,                                     PhaseRegAlloc*)                        \
-  c2_nonstatic_field(Compile,                  _method,                                       ciMethod*)                             \
-  c2_nonstatic_field(Compile,                  _compile_id,                                   const int)                             \
-  c2_nonstatic_field(Compile,                  _options,                                      const Options)                         \
-  c2_nonstatic_field(Compile,                  _ilt,                                          InlineTree*)                           \
-                                                                                                                                     \
-  c2_nonstatic_field(Options,                  _subsume_loads,                                const bool)                            \
-  c2_nonstatic_field(Options,                  _do_escape_analysis,                           const bool)                            \
-  c2_nonstatic_field(Options,                  _eliminate_boxing,                             const bool)                            \
-  c2_nonstatic_field(Options,                  _do_locks_coarsening,                          const bool)                            \
-  c2_nonstatic_field(Options,                  _install_code,                                 const bool)                            \
-                                                                                                                                     \
-  c2_nonstatic_field(InlineTree,               _caller_jvms,                                  JVMState*)                             \
-  c2_nonstatic_field(InlineTree,               _method,                                       ciMethod*)                             \
-  c2_nonstatic_field(InlineTree,               _caller_tree,                                  InlineTree*)                           \
-  c2_nonstatic_field(InlineTree,               _subtrees,                                     GrowableArray<InlineTree*>)            \
-                                                                                                                                     \
-  c2_nonstatic_field(OptoRegPair,              _first,                                        short)                                 \
-  c2_nonstatic_field(OptoRegPair,              _second,                                       short)                                 \
-                                                                                                                                     \
-  c2_nonstatic_field(JVMState,                 _caller,                                       JVMState*)                             \
-  c2_nonstatic_field(JVMState,                 _depth,                                        uint)                                  \
-  c2_nonstatic_field(JVMState,                 _locoff,                                       uint)                                  \
-  c2_nonstatic_field(JVMState,                 _stkoff,                                       uint)                                  \
-  c2_nonstatic_field(JVMState,                 _monoff,                                       uint)                                  \
-  c2_nonstatic_field(JVMState,                 _scloff,                                       uint)                                  \
-  c2_nonstatic_field(JVMState,                 _endoff,                                       uint)                                  \
-  c2_nonstatic_field(JVMState,                 _sp,                                           uint)                                  \
-  c2_nonstatic_field(JVMState,                 _bci,                                          int)                                   \
-  c2_nonstatic_field(JVMState,                 _method,                                       ciMethod*)                             \
-  c2_nonstatic_field(JVMState,                 _map,                                          SafePointNode*)                        \
-                                                                                                                                     \
-  c2_nonstatic_field(SafePointNode,            _jvms,                                         JVMState* const)                       \
-                                                                                                                                     \
-  c2_nonstatic_field(MachSafePointNode,        _jvms,                                         JVMState*)                             \
-  c2_nonstatic_field(MachSafePointNode,        _jvmadj,                                       uint)                                  \
-                                                                                                                                     \
-  c2_nonstatic_field(MachIfNode,               _prob,                                         jfloat)                                \
-  c2_nonstatic_field(MachIfNode,               _fcnt,                                         jfloat)                                \
-                                                                                                                                     \
-  c2_nonstatic_field(MachJumpNode,             _probs,                                        jfloat*)                               \
-                                                                                                                                     \
-  c2_nonstatic_field(CallNode,                 _entry_point,                                  address)                               \
-                                                                                                                                     \
-  c2_nonstatic_field(CallJavaNode,             _method,                                       ciMethod*)                             \
-                                                                                                                                     \
-  c2_nonstatic_field(CallRuntimeNode,          _name,                                         const char*)                           \
-                                                                                                                                     \
-  c2_nonstatic_field(CallStaticJavaNode,       _name,                                         const char*)                           \
-                                                                                                                                     \
-  c2_nonstatic_field(MachCallJavaNode,         _method,                                       ciMethod*)                             \
-                                                                                                                                     \
-  c2_nonstatic_field(MachCallStaticJavaNode,   _name,                                         const char*)                           \
-                                                                                                                                     \
-  c2_nonstatic_field(MachCallRuntimeNode,      _name,                                         const char*)                           \
-                                                                                                                                     \
-  c2_nonstatic_field(PhaseCFG,                 _number_of_blocks,                             uint)                                  \
-  c2_nonstatic_field(PhaseCFG,                 _blocks,                                       Block_List)                            \
-  c2_nonstatic_field(PhaseCFG,                 _node_to_block_mapping,                        Block_Array)                           \
-  c2_nonstatic_field(PhaseCFG,                 _root_block,                                   Block*)                                \
-                                                                                                                                     \
-  c2_nonstatic_field(PhaseRegAlloc,            _node_regs,                                    OptoRegPair*)                          \
-  c2_nonstatic_field(PhaseRegAlloc,            _node_regs_max_index,                          uint)                                  \
-  c2_nonstatic_field(PhaseRegAlloc,            _framesize,                                    uint)                                  \
-  c2_nonstatic_field(PhaseRegAlloc,            _max_reg,                                      OptoReg::Name)                         \
-                                                                                                                                     \
-  c2_nonstatic_field(PhaseChaitin,             _trip_cnt,                                     int)                                   \
-  c2_nonstatic_field(PhaseChaitin,             _alternate,                                    int)                                   \
-  c2_nonstatic_field(PhaseChaitin,             _lo_degree,                                    uint)                                  \
-  c2_nonstatic_field(PhaseChaitin,             _lo_stk_degree,                                uint)                                  \
-  c2_nonstatic_field(PhaseChaitin,             _hi_degree,                                    uint)                                  \
-  c2_nonstatic_field(PhaseChaitin,             _simplified,                                   uint)                                  \
-                                                                                                                                     \
-  c2_nonstatic_field(Block,                    _nodes,                                        Node_List)                             \
-  c2_nonstatic_field(Block,                    _succs,                                        Block_Array)                           \
-  c2_nonstatic_field(Block,                    _num_succs,                                    uint)                                  \
-  c2_nonstatic_field(Block,                    _pre_order,                                    uint)                                  \
-  c2_nonstatic_field(Block,                    _dom_depth,                                    uint)                                  \
-  c2_nonstatic_field(Block,                    _idom,                                         Block*)                                \
-  c2_nonstatic_field(Block,                    _freq,                                         jdouble)                               \
-                                                                                                                                     \
-  c2_nonstatic_field(CFGElement,               _freq,                                         jdouble)                               \
-                                                                                                                                     \
-  c2_nonstatic_field(Block_List,               _cnt,                                          uint)                                  \
-                                                                                                                                     \
-  c2_nonstatic_field(Block_Array,              _size,                                         uint)                                  \
-  c2_nonstatic_field(Block_Array,              _blocks,                                       Block**)                               \
-  c2_nonstatic_field(Block_Array,              _arena,                                        Arena*)                                \
-                                                                                                                                     \
-  c2_nonstatic_field(Node_List,                _cnt,                                          uint)                                  \
-                                                                                                                                     \
-  c2_nonstatic_field(Node_Array,               _max,                                          uint)                                  \
-  c2_nonstatic_field(Node_Array,               _nodes,                                        Node**)                                \
-  c2_nonstatic_field(Node_Array,               _a,                                            Arena*)                                \
-                                                                                                                                     \
-                                                                                                                                     \
-  /*********************/                                                                                                            \
   /* -XX flags         */                                                                                                            \
   /*********************/                                                                                                            \
                                                                                                                                      \
@@ -1063,10 +846,7 @@
                  declare_toplevel_type,                                   \
                  declare_oop_type,                                        \
                  declare_integer_type,                                    \
-                 declare_unsigned_integer_type,                           \
-                 declare_c1_toplevel_type,                                \
-                 declare_c2_type,                                         \
-                 declare_c2_toplevel_type)                                \
+                 declare_unsigned_integer_type)                           \
                                                                           \
   /*************************************************************/         \
   /* Java primitive types -- required by the SA implementation */         \
@@ -1325,8 +1105,8 @@
   declare_type(UpcallStub,               RuntimeBlob)                     \
   declare_type(SafepointBlob,            SingletonBlob)                   \
   declare_type(DeoptimizationBlob,       SingletonBlob)                   \
-  declare_c2_type(ExceptionBlob,         SingletonBlob)                   \
-  declare_c2_type(UncommonTrapBlob,      RuntimeBlob)                     \
+  COMPILER2_PRESENT(declare_type(ExceptionBlob,    SingletonBlob))        \
+  COMPILER2_PRESENT(declare_type(UncommonTrapBlob, RuntimeBlob))          \
                                                                           \
   /***************************************/                               \
   /* PcDesc and other compiled code info */                               \
@@ -1374,12 +1154,6 @@
                                                                           \
   declare_toplevel_type(OopStorage)                                       \
                                                                           \
-  /**********************/                                                \
-  /* Runtime1 (C1 only) */                                                \
-  /**********************/                                                \
-                                                                          \
-  declare_c1_toplevel_type(Runtime1)                                      \
-                                                                          \
   /************/                                                          \
   /* Monitors */                                                          \
   /************/                                                          \
@@ -1391,465 +1165,11 @@
   declare_toplevel_type(BasicObjectLock)                                  \
                                                                           \
   /*********************/                                                 \
-  /* Matcher (C2 only) */                                                 \
-  /*********************/                                                 \
-                                                                          \
-  declare_c2_toplevel_type(Matcher)                                       \
-  declare_c2_toplevel_type(Compile)                                       \
-  declare_c2_toplevel_type(Options)                                       \
-  declare_c2_toplevel_type(InlineTree)                                    \
-  declare_c2_toplevel_type(OptoRegPair)                                   \
-  declare_c2_toplevel_type(JVMState)                                      \
-  declare_c2_toplevel_type(Phase)                                         \
-    declare_c2_type(PhaseCFG, Phase)                                      \
-    declare_c2_type(PhaseRegAlloc, Phase)                                 \
-    declare_c2_type(PhaseChaitin, PhaseRegAlloc)                          \
-  declare_c2_toplevel_type(CFGElement)                                    \
-    declare_c2_type(Block, CFGElement)                                    \
-  declare_c2_toplevel_type(Block_Array)                                   \
-    declare_c2_type(Block_List, Block_Array)                              \
-  declare_c2_toplevel_type(Node_Array)                                    \
-  declare_c2_type(Node_List, Node_Array)                                  \
-  declare_c2_type(Unique_Node_List, Node_List)                            \
-  declare_c2_toplevel_type(Node)                                          \
-  declare_c2_type(AddNode, Node)                                          \
-  declare_c2_type(AddINode, AddNode)                                      \
-  declare_c2_type(AddLNode, AddNode)                                      \
-  declare_c2_type(AddFNode, AddNode)                                      \
-  declare_c2_type(AddDNode, AddNode)                                      \
-  declare_c2_type(AddPNode, Node)                                         \
-  declare_c2_type(OrINode, AddNode)                                       \
-  declare_c2_type(OrLNode, AddNode)                                       \
-  declare_c2_type(XorINode, AddNode)                                      \
-  declare_c2_type(XorLNode, AddNode)                                      \
-  declare_c2_type(MaxNode, AddNode)                                       \
-  declare_c2_type(MaxINode, MaxNode)                                      \
-  declare_c2_type(MinINode, MaxNode)                                      \
-  declare_c2_type(MaxLNode, MaxNode)                                      \
-  declare_c2_type(MinLNode, MaxNode)                                      \
-  declare_c2_type(MaxFNode, MaxNode)                                      \
-  declare_c2_type(MinFNode, MaxNode)                                      \
-  declare_c2_type(MaxDNode, MaxNode)                                      \
-  declare_c2_type(MinDNode, MaxNode)                                      \
-  declare_c2_type(StartNode, MultiNode)                                   \
-  declare_c2_type(StartOSRNode, StartNode)                                \
-  declare_c2_type(ParmNode, ProjNode)                                     \
-  declare_c2_type(ReturnNode, Node)                                       \
-  declare_c2_type(RethrowNode, Node)                                      \
-  declare_c2_type(TailCallNode, ReturnNode)                               \
-  declare_c2_type(TailJumpNode, ReturnNode)                               \
-  declare_c2_type(ForwardExceptionNode, ReturnNode)                       \
-  declare_c2_type(SafePointNode, MultiNode)                               \
-  declare_c2_type(CallNode, SafePointNode)                                \
-  declare_c2_type(CallJavaNode, CallNode)                                 \
-  declare_c2_type(CallStaticJavaNode, CallJavaNode)                       \
-  declare_c2_type(CallDynamicJavaNode, CallJavaNode)                      \
-  declare_c2_type(CallRuntimeNode, CallNode)                              \
-  declare_c2_type(CallLeafNode, CallRuntimeNode)                          \
-  declare_c2_type(CallLeafNoFPNode, CallLeafNode)                         \
-  declare_c2_type(CallLeafVectorNode, CallLeafNode)                       \
-  declare_c2_type(AllocateNode, CallNode)                                 \
-  declare_c2_type(AllocateArrayNode, AllocateNode)                        \
-  declare_c2_type(LockNode, AbstractLockNode)                             \
-  declare_c2_type(UnlockNode, AbstractLockNode)                           \
-  declare_c2_type(FastLockNode, CmpNode)                                  \
-  declare_c2_type(FastUnlockNode, CmpNode)                                \
-  declare_c2_type(RegionNode, Node)                                       \
-  declare_c2_type(JProjNode, ProjNode)                                    \
-  declare_c2_type(PhiNode, TypeNode)                                      \
-  declare_c2_type(GotoNode, Node)                                         \
-  declare_c2_type(CProjNode, ProjNode)                                    \
-  declare_c2_type(MultiBranchNode, MultiNode)                             \
-  declare_c2_type(IfNode, MultiBranchNode)                                \
-  declare_c2_type(IfTrueNode, CProjNode)                                  \
-  declare_c2_type(IfFalseNode, CProjNode)                                 \
-  declare_c2_type(PCTableNode, MultiBranchNode)                           \
-  declare_c2_type(JumpNode, PCTableNode)                                  \
-  declare_c2_type(JumpProjNode, JProjNode)                                \
-  declare_c2_type(CatchNode, PCTableNode)                                 \
-  declare_c2_type(CatchProjNode, CProjNode)                               \
-  declare_c2_type(CreateExNode, TypeNode)                                 \
-  declare_c2_type(ClearArrayNode, Node)                                   \
-  declare_c2_type(NeverBranchNode, MultiBranchNode)                       \
-  declare_c2_type(ConNode, TypeNode)                                      \
-  declare_c2_type(ConINode, ConNode)                                      \
-  declare_c2_type(ConPNode, ConNode)                                      \
-  declare_c2_type(ConNNode, ConNode)                                      \
-  declare_c2_type(ConLNode, ConNode)                                      \
-  declare_c2_type(ConFNode, ConNode)                                      \
-  declare_c2_type(ConDNode, ConNode)                                      \
-  declare_c2_type(BinaryNode, Node)                                       \
-  declare_c2_type(CMoveNode, TypeNode)                                    \
-  declare_c2_type(CMoveDNode, CMoveNode)                                  \
-  declare_c2_type(CMoveFNode, CMoveNode)                                  \
-  declare_c2_type(CMoveINode, CMoveNode)                                  \
-  declare_c2_type(CMoveLNode, CMoveNode)                                  \
-  declare_c2_type(CMovePNode, CMoveNode)                                  \
-  declare_c2_type(CMoveNNode, CMoveNode)                                  \
-  declare_c2_type(EncodePNode, TypeNode)                                  \
-  declare_c2_type(DecodeNNode, TypeNode)                                  \
-  declare_c2_type(EncodePKlassNode, TypeNode)                             \
-  declare_c2_type(DecodeNKlassNode, TypeNode)                             \
-  declare_c2_type(ConstraintCastNode, TypeNode)                           \
-  declare_c2_type(CastIINode, ConstraintCastNode)                         \
-  declare_c2_type(CastPPNode, ConstraintCastNode)                         \
-  declare_c2_type(CheckCastPPNode, TypeNode)                              \
-  declare_c2_type(Conv2BNode, Node)                                       \
-  declare_c2_type(ConvertNode, TypeNode)                                  \
-  declare_c2_type(ConvD2FNode, Node)                                      \
-  declare_c2_type(ConvD2INode, Node)                                      \
-  declare_c2_type(ConvD2LNode, Node)                                      \
-  declare_c2_type(ConvF2DNode, Node)                                      \
-  declare_c2_type(ConvF2INode, Node)                                      \
-  declare_c2_type(ConvF2LNode, Node)                                      \
-  declare_c2_type(ConvI2DNode, Node)                                      \
-  declare_c2_type(ConvI2FNode, Node)                                      \
-  declare_c2_type(ConvI2LNode, TypeNode)                                  \
-  declare_c2_type(ConvL2DNode, Node)                                      \
-  declare_c2_type(ConvL2FNode, Node)                                      \
-  declare_c2_type(ConvL2INode, Node)                                      \
-  declare_c2_type(CastX2PNode, Node)                                      \
-  declare_c2_type(CastP2XNode, Node)                                      \
-  declare_c2_type(MemBarNode, MultiNode)                                  \
-  declare_c2_type(MemBarAcquireNode, MemBarNode)                          \
-  declare_c2_type(MemBarReleaseNode, MemBarNode)                          \
-  declare_c2_type(LoadFenceNode, MemBarNode)                              \
-  declare_c2_type(StoreFenceNode, MemBarNode)                             \
-  declare_c2_type(MemBarVolatileNode, MemBarNode)                         \
-  declare_c2_type(MemBarCPUOrderNode, MemBarNode)                         \
-  declare_c2_type(OnSpinWaitNode, MemBarNode)                             \
-  declare_c2_type(BlackholeNode, MultiNode)                               \
-  declare_c2_type(InitializeNode, MemBarNode)                             \
-  declare_c2_type(ThreadLocalNode, Node)                                  \
-  declare_c2_type(Opaque1Node, Node)                                      \
-  declare_c2_type(PartialSubtypeCheckNode, Node)                          \
-  declare_c2_type(MoveI2FNode, Node)                                      \
-  declare_c2_type(MoveL2DNode, Node)                                      \
-  declare_c2_type(MoveF2INode, Node)                                      \
-  declare_c2_type(MoveD2LNode, Node)                                      \
-  declare_c2_type(DivINode, Node)                                         \
-  declare_c2_type(DivLNode, Node)                                         \
-  declare_c2_type(DivFNode, Node)                                         \
-  declare_c2_type(DivDNode, Node)                                         \
-  declare_c2_type(UDivINode, Node)                                        \
-  declare_c2_type(UDivLNode, Node)                                        \
-  declare_c2_type(ModINode, Node)                                         \
-  declare_c2_type(ModLNode, Node)                                         \
-  declare_c2_type(ModFNode, Node)                                         \
-  declare_c2_type(ModDNode, Node)                                         \
-  declare_c2_type(UModINode, Node)                                        \
-  declare_c2_type(UModLNode, Node)                                        \
-  declare_c2_type(DivModNode, MultiNode)                                  \
-  declare_c2_type(DivModINode, DivModNode)                                \
-  declare_c2_type(DivModLNode, DivModNode)                                \
-  declare_c2_type(UDivModINode, DivModNode)                               \
-  declare_c2_type(UDivModLNode, DivModNode)                               \
-  declare_c2_type(BoxLockNode, Node)                                      \
-  declare_c2_type(LoopNode, RegionNode)                                   \
-  declare_c2_type(CountedLoopNode, LoopNode)                              \
-  declare_c2_type(CountedLoopEndNode, IfNode)                             \
-  declare_c2_type(MachNode, Node)                                         \
-  declare_c2_type(MachIdealNode, MachNode)                                \
-  declare_c2_type(MachTypeNode, MachNode)                                 \
-  declare_c2_type(MachBreakpointNode, MachIdealNode)                      \
-  declare_c2_type(MachUEPNode, MachIdealNode)                             \
-  declare_c2_type(MachPrologNode, MachIdealNode)                          \
-  declare_c2_type(MachEpilogNode, MachIdealNode)                          \
-  declare_c2_type(MachNopNode, MachIdealNode)                             \
-  declare_c2_type(MachSpillCopyNode, MachIdealNode)                       \
-  declare_c2_type(MachNullCheckNode, MachIdealNode)                       \
-  declare_c2_type(MachProjNode, ProjNode)                                 \
-  declare_c2_type(MachIfNode, MachNode)                                   \
-  declare_c2_type(MachJumpNode, MachNode)                                 \
-  declare_c2_type(MachFastLockNode, MachNode)                             \
-  declare_c2_type(MachReturnNode, MachNode)                               \
-  declare_c2_type(MachSafePointNode, MachReturnNode)                      \
-  declare_c2_type(MachCallNode, MachSafePointNode)                        \
-  declare_c2_type(MachCallJavaNode, MachCallNode)                         \
-  declare_c2_type(MachCallStaticJavaNode, MachCallJavaNode)               \
-  declare_c2_type(MachCallDynamicJavaNode, MachCallJavaNode)              \
-  declare_c2_type(MachCallRuntimeNode, MachCallNode)                      \
-  declare_c2_type(MachHaltNode, MachReturnNode)                           \
-  declare_c2_type(MachTempNode, MachNode)                                 \
-  declare_c2_type(MemNode, Node)                                          \
-  declare_c2_type(MergeMemNode, Node)                                     \
-  declare_c2_type(LoadNode, MemNode)                                      \
-  declare_c2_type(LoadBNode, LoadNode)                                    \
-  declare_c2_type(LoadUSNode, LoadNode)                                   \
-  declare_c2_type(LoadINode, LoadNode)                                    \
-  declare_c2_type(LoadRangeNode, LoadINode)                               \
-  declare_c2_type(LoadLNode, LoadNode)                                    \
-  declare_c2_type(LoadL_unalignedNode, LoadLNode)                         \
-  declare_c2_type(LoadFNode, LoadNode)                                    \
-  declare_c2_type(LoadDNode, LoadNode)                                    \
-  declare_c2_type(LoadD_unalignedNode, LoadDNode)                         \
-  declare_c2_type(LoadPNode, LoadNode)                                    \
-  declare_c2_type(LoadNNode, LoadNode)                                    \
-  declare_c2_type(LoadKlassNode, LoadPNode)                               \
-  declare_c2_type(LoadNKlassNode, LoadNNode)                              \
-  declare_c2_type(LoadSNode, LoadNode)                                    \
-  declare_c2_type(StoreNode, MemNode)                                     \
-  declare_c2_type(StoreBNode, StoreNode)                                  \
-  declare_c2_type(StoreCNode, StoreNode)                                  \
-  declare_c2_type(StoreINode, StoreNode)                                  \
-  declare_c2_type(StoreLNode, StoreNode)                                  \
-  declare_c2_type(StoreFNode, StoreNode)                                  \
-  declare_c2_type(StoreDNode, StoreNode)                                  \
-  declare_c2_type(StorePNode, StoreNode)                                  \
-  declare_c2_type(StoreNNode, StoreNode)                                  \
-  declare_c2_type(StoreNKlassNode, StoreNode)                             \
-  declare_c2_type(SCMemProjNode, ProjNode)                                \
-  declare_c2_type(LoadStoreNode, Node)                                    \
-  declare_c2_type(CompareAndSwapNode, LoadStoreConditionalNode)           \
-  declare_c2_type(CompareAndSwapBNode, CompareAndSwapNode)                \
-  declare_c2_type(CompareAndSwapSNode, CompareAndSwapNode)                \
-  declare_c2_type(CompareAndSwapLNode, CompareAndSwapNode)                \
-  declare_c2_type(CompareAndSwapINode, CompareAndSwapNode)                \
-  declare_c2_type(CompareAndSwapPNode, CompareAndSwapNode)                \
-  declare_c2_type(CompareAndSwapNNode, CompareAndSwapNode)                \
-  declare_c2_type(WeakCompareAndSwapBNode, CompareAndSwapNode)            \
-  declare_c2_type(WeakCompareAndSwapSNode, CompareAndSwapNode)            \
-  declare_c2_type(WeakCompareAndSwapLNode, CompareAndSwapNode)            \
-  declare_c2_type(WeakCompareAndSwapINode, CompareAndSwapNode)            \
-  declare_c2_type(WeakCompareAndSwapPNode, CompareAndSwapNode)            \
-  declare_c2_type(WeakCompareAndSwapNNode, CompareAndSwapNode)            \
-  declare_c2_type(CompareAndExchangeNode, LoadStoreNode)                  \
-  declare_c2_type(CompareAndExchangeBNode, CompareAndExchangeNode)        \
-  declare_c2_type(CompareAndExchangeSNode, CompareAndExchangeNode)        \
-  declare_c2_type(CompareAndExchangeLNode, CompareAndExchangeNode)        \
-  declare_c2_type(CompareAndExchangeINode, CompareAndExchangeNode)        \
-  declare_c2_type(CompareAndExchangePNode, CompareAndExchangeNode)        \
-  declare_c2_type(CompareAndExchangeNNode, CompareAndExchangeNode)        \
-  declare_c2_type(MulNode, Node)                                          \
-  declare_c2_type(MulINode, MulNode)                                      \
-  declare_c2_type(MulLNode, MulNode)                                      \
-  declare_c2_type(MulFNode, MulNode)                                      \
-  declare_c2_type(MulDNode, MulNode)                                      \
-  declare_c2_type(MulHiLNode, Node)                                       \
-  declare_c2_type(UMulHiLNode, Node)                                      \
-  declare_c2_type(AndINode, MulINode)                                     \
-  declare_c2_type(AndLNode, MulLNode)                                     \
-  declare_c2_type(LShiftINode, Node)                                      \
-  declare_c2_type(LShiftLNode, Node)                                      \
-  declare_c2_type(RShiftINode, Node)                                      \
-  declare_c2_type(RShiftLNode, Node)                                      \
-  declare_c2_type(URShiftINode, Node)                                     \
-  declare_c2_type(URShiftLNode, Node)                                     \
-  declare_c2_type(MultiNode, Node)                                        \
-  declare_c2_type(ProjNode, Node)                                         \
-  declare_c2_type(TypeNode, Node)                                         \
-  declare_c2_type(RootNode, LoopNode)                                     \
-  declare_c2_type(HaltNode, Node)                                         \
-  declare_c2_type(SubNode, Node)                                          \
-  declare_c2_type(SubINode, SubNode)                                      \
-  declare_c2_type(SubLNode, SubNode)                                      \
-  declare_c2_type(SubFPNode, SubNode)                                     \
-  declare_c2_type(SubFNode, SubFPNode)                                    \
-  declare_c2_type(SubDNode, SubFPNode)                                    \
-  declare_c2_type(CmpNode, SubNode)                                       \
-  declare_c2_type(CmpINode, CmpNode)                                      \
-  declare_c2_type(CmpUNode, CmpNode)                                      \
-  declare_c2_type(CmpU3Node, CmpUNode)                                    \
-  declare_c2_type(CmpPNode, CmpNode)                                      \
-  declare_c2_type(CmpNNode, CmpNode)                                      \
-  declare_c2_type(CmpLNode, CmpNode)                                      \
-  declare_c2_type(CmpULNode, CmpNode)                                     \
-  declare_c2_type(CmpL3Node, CmpLNode)                                    \
-  declare_c2_type(CmpUL3Node, CmpULNode)                                  \
-  declare_c2_type(CmpFNode, CmpNode)                                      \
-  declare_c2_type(CmpF3Node, CmpFNode)                                    \
-  declare_c2_type(CmpDNode, CmpNode)                                      \
-  declare_c2_type(CmpD3Node, CmpDNode)                                    \
-  declare_c2_type(BoolNode, Node)                                         \
-  declare_c2_type(AbsNode, Node)                                          \
-  declare_c2_type(AbsINode, AbsNode)                                      \
-  declare_c2_type(AbsFNode, AbsNode)                                      \
-  declare_c2_type(AbsDNode, AbsNode)                                      \
-  declare_c2_type(CmpLTMaskNode, Node)                                    \
-  declare_c2_type(NegNode, Node)                                          \
-  declare_c2_type(NegINode, NegNode)                                      \
-  declare_c2_type(NegLNode, NegNode)                                      \
-  declare_c2_type(NegFNode, NegNode)                                      \
-  declare_c2_type(NegDNode, NegNode)                                      \
-  declare_c2_type(AtanDNode, Node)                                        \
-  declare_c2_type(SqrtFNode, Node)                                        \
-  declare_c2_type(SqrtDNode, Node)                                        \
-  declare_c2_type(ReverseBytesINode, Node)                                \
-  declare_c2_type(ReverseBytesLNode, Node)                                \
-  declare_c2_type(ReductionNode, Node)                                    \
-  declare_c2_type(VectorNode, Node)                                       \
-  declare_c2_type(AbsVFNode, VectorNode)                                  \
-  declare_c2_type(AbsVDNode, VectorNode)                                  \
-  declare_c2_type(AbsVBNode, VectorNode)                                  \
-  declare_c2_type(AbsVSNode, VectorNode)                                  \
-  declare_c2_type(AbsVINode, VectorNode)                                  \
-  declare_c2_type(AbsVLNode, VectorNode)                                  \
-  declare_c2_type(AddVBNode, VectorNode)                                  \
-  declare_c2_type(AddVSNode, VectorNode)                                  \
-  declare_c2_type(AddVINode, VectorNode)                                  \
-  declare_c2_type(AddReductionVINode, ReductionNode)                      \
-  declare_c2_type(AddVLNode, VectorNode)                                  \
-  declare_c2_type(AddReductionVLNode, ReductionNode)                      \
-  declare_c2_type(AddVFNode, VectorNode)                                  \
-  declare_c2_type(AddReductionVFNode, ReductionNode)                      \
-  declare_c2_type(AddVDNode, VectorNode)                                  \
-  declare_c2_type(AddReductionVDNode, ReductionNode)                      \
-  declare_c2_type(SubVBNode, VectorNode)                                  \
-  declare_c2_type(SubVSNode, VectorNode)                                  \
-  declare_c2_type(SubVINode, VectorNode)                                  \
-  declare_c2_type(SubVLNode, VectorNode)                                  \
-  declare_c2_type(SubVFNode, VectorNode)                                  \
-  declare_c2_type(SubVDNode, VectorNode)                                  \
-  declare_c2_type(MulVBNode, VectorNode)                                  \
-  declare_c2_type(MulVSNode, VectorNode)                                  \
-  declare_c2_type(MulVLNode, VectorNode)                                  \
-  declare_c2_type(MulReductionVLNode, ReductionNode)                      \
-  declare_c2_type(MulVINode, VectorNode)                                  \
-  declare_c2_type(MulReductionVINode, ReductionNode)                      \
-  declare_c2_type(MulVFNode, VectorNode)                                  \
-  declare_c2_type(MulReductionVFNode, ReductionNode)                      \
-  declare_c2_type(MulVDNode, VectorNode)                                  \
-  declare_c2_type(NegVNode, VectorNode)                                   \
-  declare_c2_type(NegVINode, NegVNode)                                    \
-  declare_c2_type(NegVLNode, NegVNode)                                    \
-  declare_c2_type(NegVFNode, NegVNode)                                    \
-  declare_c2_type(NegVDNode, NegVNode)                                    \
-  declare_c2_type(FmaVDNode, VectorNode)                                  \
-  declare_c2_type(FmaVFNode, VectorNode)                                  \
-  declare_c2_type(CompressVNode, VectorNode)                              \
-  declare_c2_type(CompressMNode, VectorNode)                              \
-  declare_c2_type(ExpandVNode, VectorNode)                                \
-  declare_c2_type(CompressBitsVNode, VectorNode)                          \
-  declare_c2_type(ExpandBitsVNode, VectorNode)                            \
-  declare_c2_type(MulReductionVDNode, ReductionNode)                      \
-  declare_c2_type(DivVFNode, VectorNode)                                  \
-  declare_c2_type(DivVDNode, VectorNode)                                  \
-  declare_c2_type(PopCountVINode, VectorNode)                             \
-  declare_c2_type(PopCountVLNode, VectorNode)                             \
-  declare_c2_type(LShiftVBNode, VectorNode)                               \
-  declare_c2_type(LShiftVSNode, VectorNode)                               \
-  declare_c2_type(LShiftVINode, VectorNode)                               \
-  declare_c2_type(LShiftVLNode, VectorNode)                               \
-  declare_c2_type(RShiftVBNode, VectorNode)                               \
-  declare_c2_type(RShiftVSNode, VectorNode)                               \
-  declare_c2_type(RShiftVINode, VectorNode)                               \
-  declare_c2_type(RShiftVLNode, VectorNode)                               \
-  declare_c2_type(URShiftVBNode, VectorNode)                              \
-  declare_c2_type(URShiftVSNode, VectorNode)                              \
-  declare_c2_type(URShiftVINode, VectorNode)                              \
-  declare_c2_type(URShiftVLNode, VectorNode)                              \
-  declare_c2_type(MinReductionVNode, ReductionNode)                       \
-  declare_c2_type(MaxReductionVNode, ReductionNode)                       \
-  declare_c2_type(AndVNode, VectorNode)                                   \
-  declare_c2_type(AndReductionVNode, ReductionNode)                       \
-  declare_c2_type(OrVNode, VectorNode)                                    \
-  declare_c2_type(OrReductionVNode, ReductionNode)                        \
-  declare_c2_type(XorVNode, VectorNode)                                   \
-  declare_c2_type(XorReductionVNode, ReductionNode)                       \
-  declare_c2_type(MaxVNode, VectorNode)                                   \
-  declare_c2_type(MinVNode, VectorNode)                                   \
-  declare_c2_type(LoadVectorNode, LoadNode)                               \
-  declare_c2_type(StoreVectorNode, StoreNode)                             \
-  declare_c2_type(ReplicateNode, VectorNode)                              \
-  declare_c2_type(PopulateIndexNode, VectorNode)                          \
-  declare_c2_type(PackNode, VectorNode)                                   \
-  declare_c2_type(PackBNode, PackNode)                                    \
-  declare_c2_type(PackSNode, PackNode)                                    \
-  declare_c2_type(PackINode, PackNode)                                    \
-  declare_c2_type(PackLNode, PackNode)                                    \
-  declare_c2_type(PackFNode, PackNode)                                    \
-  declare_c2_type(PackDNode, PackNode)                                    \
-  declare_c2_type(Pack2LNode, PackNode)                                   \
-  declare_c2_type(Pack2DNode, PackNode)                                   \
-  declare_c2_type(ExtractNode, Node)                                      \
-  declare_c2_type(ExtractBNode, ExtractNode)                              \
-  declare_c2_type(ExtractUBNode, ExtractNode)                             \
-  declare_c2_type(ExtractCNode, ExtractNode)                              \
-  declare_c2_type(ExtractSNode, ExtractNode)                              \
-  declare_c2_type(ExtractINode, ExtractNode)                              \
-  declare_c2_type(ExtractLNode, ExtractNode)                              \
-  declare_c2_type(ExtractFNode, ExtractNode)                              \
-  declare_c2_type(ExtractDNode, ExtractNode)                              \
-  declare_c2_type(OverflowNode, CmpNode)                                  \
-  declare_c2_type(OverflowINode, OverflowNode)                            \
-  declare_c2_type(OverflowAddINode, OverflowINode)                        \
-  declare_c2_type(OverflowSubINode, OverflowINode)                        \
-  declare_c2_type(OverflowMulINode, OverflowINode)                        \
-  declare_c2_type(OverflowLNode, OverflowNode)                            \
-  declare_c2_type(OverflowAddLNode, OverflowLNode)                        \
-  declare_c2_type(OverflowSubLNode, OverflowLNode)                        \
-  declare_c2_type(OverflowMulLNode, OverflowLNode)                        \
-  declare_c2_type(FmaDNode, Node)                                         \
-  declare_c2_type(FmaFNode, Node)                                         \
-  declare_c2_type(CopySignDNode, Node)                                    \
-  declare_c2_type(CopySignFNode, Node)                                    \
-  declare_c2_type(SignumDNode, Node)                                      \
-  declare_c2_type(SignumFNode, Node)                                      \
-  declare_c2_type(IsInfiniteFNode, Node)                                  \
-  declare_c2_type(IsInfiniteDNode, Node)                                  \
-  declare_c2_type(IsFiniteFNode, Node)                                    \
-  declare_c2_type(IsFiniteDNode, Node)                                    \
-  declare_c2_type(LoadVectorGatherNode, LoadVectorNode)                   \
-  declare_c2_type(StoreVectorScatterNode, StoreVectorNode)                \
-  declare_c2_type(VectorLoadMaskNode, VectorNode)                         \
-  declare_c2_type(VectorLoadShuffleNode, VectorNode)                      \
-  declare_c2_type(VectorStoreMaskNode, VectorNode)                        \
-  declare_c2_type(VectorBlendNode, VectorNode)                            \
-  declare_c2_type(VectorRearrangeNode, VectorNode)                        \
-  declare_c2_type(VectorMaskWrapperNode, VectorNode)                      \
-  declare_c2_type(VectorMaskCmpNode, VectorNode)                          \
-  declare_c2_type(VectorCastB2XNode, VectorNode)                          \
-  declare_c2_type(VectorCastS2XNode, VectorNode)                          \
-  declare_c2_type(VectorCastI2XNode, VectorNode)                          \
-  declare_c2_type(VectorCastL2XNode, VectorNode)                          \
-  declare_c2_type(VectorCastF2XNode, VectorNode)                          \
-  declare_c2_type(VectorCastD2XNode, VectorNode)                          \
-  declare_c2_type(VectorUCastB2XNode, VectorNode)                         \
-  declare_c2_type(VectorUCastS2XNode, VectorNode)                         \
-  declare_c2_type(VectorUCastI2XNode, VectorNode)                         \
-  declare_c2_type(VectorInsertNode, VectorNode)                           \
-  declare_c2_type(VectorUnboxNode, VectorNode)                            \
-  declare_c2_type(VectorReinterpretNode, VectorNode)                      \
-  declare_c2_type(VectorMaskCastNode, VectorNode)                         \
-  declare_c2_type(CountLeadingZerosVNode, VectorNode)                     \
-  declare_c2_type(CountTrailingZerosVNode, VectorNode)                    \
-  declare_c2_type(ReverseBytesVNode, VectorNode)                          \
-  declare_c2_type(ReverseVNode, VectorNode)                               \
-  declare_c2_type(MaskAllNode, VectorNode)                                \
-  declare_c2_type(AndVMaskNode, VectorNode)                               \
-  declare_c2_type(OrVMaskNode, VectorNode)                                \
-  declare_c2_type(XorVMaskNode, VectorNode)                               \
-  declare_c2_type(VectorBoxNode, Node)                                    \
-  declare_c2_type(VectorBoxAllocateNode, CallStaticJavaNode)              \
-  declare_c2_type(VectorTestNode, CmpNode)                                \
-                                                                          \
-  /*********************/                                                 \
   /* Adapter Blob Entries */                                              \
   /*********************/                                                 \
   declare_toplevel_type(AdapterHandlerEntry)                              \
   declare_toplevel_type(AdapterHandlerEntry*)                             \
                                                                           \
-  /*********************/                                                 \
-  /* CI */                                                                \
-  /*********************/                                                 \
-  declare_toplevel_type(ciEnv)                                            \
-  declare_toplevel_type(ciObjectFactory)                                  \
-  declare_toplevel_type(ciConstant)                                       \
-  declare_toplevel_type(ciField)                                          \
-  declare_toplevel_type(ciSymbol)                                         \
-  declare_toplevel_type(ciBaseObject)                                     \
-  declare_type(ciObject, ciBaseObject)                                    \
-  declare_type(ciInstance, ciObject)                                      \
-  declare_type(ciMetadata, ciBaseObject)                                  \
-  declare_type(ciMethod, ciMetadata)                                      \
-  declare_type(ciMethodData, ciMetadata)                                  \
-  declare_type(ciType, ciMetadata)                                        \
-  declare_type(ciKlass, ciType)                                           \
-  declare_type(ciInstanceKlass, ciKlass)                                  \
-  declare_type(ciArrayKlass, ciKlass)                                     \
-  declare_type(ciTypeArrayKlass, ciArrayKlass)                            \
-  declare_type(ciObjArrayKlass, ciArrayKlass)                             \
-                                                                          \
   /********************/                                                  \
   /* -XX flags        */                                                  \
   /********************/                                                  \
@@ -1894,7 +1214,6 @@
    declare_integer_type(Location::Type)                                   \
    declare_integer_type(Location::Where)                                  \
    declare_integer_type(JVMFlag::Flags)                                   \
-   COMPILER2_PRESENT(declare_integer_type(OptoReg::Name))                 \
                                                                           \
    declare_toplevel_type(CHeapObj<mtInternal>)                            \
             declare_type(Array<int>, MetaspaceObj)                        \
@@ -1946,7 +1265,6 @@
   declare_toplevel_type(Mutex)                                            \
   declare_toplevel_type(Mutex*)                                           \
   declare_toplevel_type(nmethod*)                                         \
-  COMPILER2_PRESENT(declare_unsigned_integer_type(node_idx_t))            \
   declare_toplevel_type(ObjectMonitor*)                                   \
   declare_toplevel_type(oop*)                                             \
   declare_toplevel_type(OopMapCache*)                                     \
@@ -1986,10 +1304,7 @@
 
 #define VM_INT_CONSTANTS(declare_constant,                                \
                          declare_constant_with_value,                     \
-                         declare_preprocessor_constant,                   \
-                         declare_c1_constant,                             \
-                         declare_c2_constant,                             \
-                         declare_c2_preprocessor_constant)                \
+                         declare_preprocessor_constant)                   \
                                                                           \
   /****************/                                                      \
   /* GC constants */                                                      \
@@ -2003,6 +1318,7 @@
   /******************/                                                    \
                                                                           \
   declare_preprocessor_constant("ASSERT", DEBUG_ONLY(1) NOT_DEBUG(0))     \
+  declare_preprocessor_constant("COMPILER2", COMPILER2_PRESENT(1) NOT_COMPILER2(0)) \
                                                                           \
   /****************/                                                      \
   /* Object sizes */                                                      \
@@ -2352,12 +1668,6 @@
   declare_constant(LM_LEGACY)                                             \
   declare_constant(LM_LIGHTWEIGHT)                                        \
                                                                           \
-  /*********************/                                                 \
-  /* Matcher (C2 only) */                                                 \
-  /*********************/                                                 \
-                                                                          \
-  declare_c2_preprocessor_constant("Matcher::interpreter_frame_pointer_reg", Matcher::interpreter_frame_pointer_reg()) \
-                                                                          \
   /*********************************************/                         \
   /* MethodCompilation (globalDefinitions.hpp) */                         \
   /*********************************************/                         \
@@ -2457,8 +1767,8 @@
                                                                           \
   declare_constant(ConcreteRegisterImpl::number_of_registers)             \
   declare_preprocessor_constant("REG_COUNT", REG_COUNT)                   \
-  declare_c2_preprocessor_constant("SAVED_ON_ENTRY_REG_COUNT", SAVED_ON_ENTRY_REG_COUNT) \
-  declare_c2_preprocessor_constant("C_SAVED_ON_ENTRY_REG_COUNT", C_SAVED_ON_ENTRY_REG_COUNT) \
+  COMPILER2_PRESENT(declare_preprocessor_constant("SAVED_ON_ENTRY_REG_COUNT", SAVED_ON_ENTRY_REG_COUNT)) \
+  COMPILER2_PRESENT(declare_preprocessor_constant("C_SAVED_ON_ENTRY_REG_COUNT", C_SAVED_ON_ENTRY_REG_COUNT)) \
                                                                           \
   /************/                                                          \
   /* PerfData */                                                          \
@@ -2509,7 +1819,7 @@
 // enums, etc., while "declare_preprocessor_constant" must be used for
 // all #defined constants.
 
-#define VM_LONG_CONSTANTS(declare_constant, declare_preprocessor_constant, declare_c1_constant, declare_c2_constant, declare_c2_preprocessor_constant) \
+#define VM_LONG_CONSTANTS(declare_constant, declare_preprocessor_constant) \
                                                                           \
   /****************/                                                      \
   /* GC constants */                                                      \
@@ -2575,108 +1885,6 @@
 # define ENSURE_NONPRODUCT_FIELD_TYPE_PRESENT(a, b, c)
 #endif /* PRODUCT */
 
-// Generate and check a nonstatic field in C1 builds
-#ifdef COMPILER1
-# define GENERATE_C1_NONSTATIC_VM_STRUCT_ENTRY(a, b, c) GENERATE_NONSTATIC_VM_STRUCT_ENTRY(a, b, c)
-# define CHECK_C1_NONSTATIC_VM_STRUCT_ENTRY(a, b, c)    CHECK_NONSTATIC_VM_STRUCT_ENTRY(a, b, c)
-# define ENSURE_C1_FIELD_TYPE_PRESENT(a, b, c)          ENSURE_FIELD_TYPE_PRESENT(a, b, c)
-#else
-# define GENERATE_C1_NONSTATIC_VM_STRUCT_ENTRY(a, b, c)
-# define CHECK_C1_NONSTATIC_VM_STRUCT_ENTRY(a, b, c)
-# define ENSURE_C1_FIELD_TYPE_PRESENT(a, b, c)
-#endif /* COMPILER1 */
-// Generate and check a nonstatic field in C2 builds
-#ifdef COMPILER2
-# define GENERATE_C2_NONSTATIC_VM_STRUCT_ENTRY(a, b, c) GENERATE_NONSTATIC_VM_STRUCT_ENTRY(a, b, c)
-# define CHECK_C2_NONSTATIC_VM_STRUCT_ENTRY(a, b, c)    CHECK_NONSTATIC_VM_STRUCT_ENTRY(a, b, c)
-# define ENSURE_C2_FIELD_TYPE_PRESENT(a, b, c)          ENSURE_FIELD_TYPE_PRESENT(a, b, c)
-#else
-# define GENERATE_C2_NONSTATIC_VM_STRUCT_ENTRY(a, b, c)
-# define CHECK_C2_NONSTATIC_VM_STRUCT_ENTRY(a, b, c)
-# define ENSURE_C2_FIELD_TYPE_PRESENT(a, b, c)
-#endif /* COMPILER2 */
-
-// Generate but do not check a static field in C1 builds
-#ifdef COMPILER1
-# define GENERATE_C1_UNCHECKED_STATIC_VM_STRUCT_ENTRY(a, b, c) GENERATE_UNCHECKED_STATIC_VM_STRUCT_ENTRY(a, b, c)
-#else
-# define GENERATE_C1_UNCHECKED_STATIC_VM_STRUCT_ENTRY(a, b, c)
-#endif /* COMPILER1 */
-
-// Generate but do not check a static field in C2 builds
-#ifdef COMPILER2
-# define GENERATE_C2_UNCHECKED_STATIC_VM_STRUCT_ENTRY(a, b, c) GENERATE_UNCHECKED_STATIC_VM_STRUCT_ENTRY(a, b, c)
-#else
-# define GENERATE_C2_UNCHECKED_STATIC_VM_STRUCT_ENTRY(a, b, c)
-#endif /* COMPILER2 */
-
-//--------------------------------------------------------------------------------
-// VMTypeEntry build-specific macros
-//
-
-#ifdef COMPILER1
-# define GENERATE_C1_TOPLEVEL_VM_TYPE_ENTRY(a)               GENERATE_TOPLEVEL_VM_TYPE_ENTRY(a)
-# define CHECK_C1_TOPLEVEL_VM_TYPE_ENTRY(a)
-#else
-# define GENERATE_C1_TOPLEVEL_VM_TYPE_ENTRY(a)
-# define CHECK_C1_TOPLEVEL_VM_TYPE_ENTRY(a)
-#endif /* COMPILER1 */
-
-#ifdef COMPILER2
-# define GENERATE_C2_VM_TYPE_ENTRY(a, b)                     GENERATE_VM_TYPE_ENTRY(a, b)
-# define CHECK_C2_VM_TYPE_ENTRY(a, b)                        CHECK_VM_TYPE_ENTRY(a, b)
-# define GENERATE_C2_TOPLEVEL_VM_TYPE_ENTRY(a)               GENERATE_TOPLEVEL_VM_TYPE_ENTRY(a)
-# define CHECK_C2_TOPLEVEL_VM_TYPE_ENTRY(a)
-#else
-# define GENERATE_C2_VM_TYPE_ENTRY(a, b)
-# define CHECK_C2_VM_TYPE_ENTRY(a, b)
-# define GENERATE_C2_TOPLEVEL_VM_TYPE_ENTRY(a)
-# define CHECK_C2_TOPLEVEL_VM_TYPE_ENTRY(a)
-#endif /* COMPILER2 */
-
-
-//--------------------------------------------------------------------------------
-// VMIntConstantEntry build-specific macros
-//
-
-// Generate an int constant for a C1 build
-#ifdef COMPILER1
-# define GENERATE_C1_VM_INT_CONSTANT_ENTRY(name)  GENERATE_VM_INT_CONSTANT_ENTRY(name)
-#else
-# define GENERATE_C1_VM_INT_CONSTANT_ENTRY(name)
-#endif /* COMPILER1 */
-
-// Generate an int constant for a C2 build
-#ifdef COMPILER2
-# define GENERATE_C2_VM_INT_CONSTANT_ENTRY(name)                      GENERATE_VM_INT_CONSTANT_ENTRY(name)
-# define GENERATE_C2_PREPROCESSOR_VM_INT_CONSTANT_ENTRY(name, value)  GENERATE_PREPROCESSOR_VM_INT_CONSTANT_ENTRY(name, value)
-#else
-# define GENERATE_C2_VM_INT_CONSTANT_ENTRY(name)
-# define GENERATE_C2_PREPROCESSOR_VM_INT_CONSTANT_ENTRY(name, value)
-#endif /* COMPILER1 */
-
-
-//--------------------------------------------------------------------------------
-// VMLongConstantEntry build-specific macros
-//
-
-// Generate a long constant for a C1 build
-#ifdef COMPILER1
-# define GENERATE_C1_VM_LONG_CONSTANT_ENTRY(name)  GENERATE_VM_LONG_CONSTANT_ENTRY(name)
-#else
-# define GENERATE_C1_VM_LONG_CONSTANT_ENTRY(name)
-#endif /* COMPILER1 */
-
-// Generate a long constant for a C2 build
-#ifdef COMPILER2
-# define GENERATE_C2_VM_LONG_CONSTANT_ENTRY(name)                     GENERATE_VM_LONG_CONSTANT_ENTRY(name)
-# define GENERATE_C2_PREPROCESSOR_VM_LONG_CONSTANT_ENTRY(name, value) GENERATE_PREPROCESSOR_VM_LONG_CONSTANT_ENTRY(name, value)
-#else
-# define GENERATE_C2_VM_LONG_CONSTANT_ENTRY(name)
-# define GENERATE_C2_PREPROCESSOR_VM_LONG_CONSTANT_ENTRY(name, value)
-#endif /* COMPILER1 */
-
-
 //
 // Instantiation of VMStructEntries, VMTypeEntries and VMIntConstantEntries
 //
@@ -2690,39 +1898,26 @@ VMStructEntry VMStructs::localHotSpotVMStructs[] = {
              GENERATE_VOLATILE_STATIC_VM_STRUCT_ENTRY,
              GENERATE_UNCHECKED_NONSTATIC_VM_STRUCT_ENTRY,
              GENERATE_NONSTATIC_VM_STRUCT_ENTRY,
-             GENERATE_NONPRODUCT_NONSTATIC_VM_STRUCT_ENTRY,
-             GENERATE_C1_NONSTATIC_VM_STRUCT_ENTRY,
-             GENERATE_C2_NONSTATIC_VM_STRUCT_ENTRY,
-             GENERATE_C1_UNCHECKED_STATIC_VM_STRUCT_ENTRY,
-             GENERATE_C2_UNCHECKED_STATIC_VM_STRUCT_ENTRY)
+             GENERATE_NONPRODUCT_NONSTATIC_VM_STRUCT_ENTRY)
 
 
   VM_STRUCTS_OS(GENERATE_NONSTATIC_VM_STRUCT_ENTRY,
                 GENERATE_STATIC_VM_STRUCT_ENTRY,
                 GENERATE_UNCHECKED_NONSTATIC_VM_STRUCT_ENTRY,
                 GENERATE_NONSTATIC_VM_STRUCT_ENTRY,
-                GENERATE_NONPRODUCT_NONSTATIC_VM_STRUCT_ENTRY,
-                GENERATE_C2_NONSTATIC_VM_STRUCT_ENTRY,
-                GENERATE_C1_UNCHECKED_STATIC_VM_STRUCT_ENTRY,
-                GENERATE_C2_UNCHECKED_STATIC_VM_STRUCT_ENTRY)
+                GENERATE_NONPRODUCT_NONSTATIC_VM_STRUCT_ENTRY)
 
   VM_STRUCTS_CPU(GENERATE_NONSTATIC_VM_STRUCT_ENTRY,
                  GENERATE_STATIC_VM_STRUCT_ENTRY,
                  GENERATE_UNCHECKED_NONSTATIC_VM_STRUCT_ENTRY,
                  GENERATE_NONSTATIC_VM_STRUCT_ENTRY,
-                 GENERATE_NONPRODUCT_NONSTATIC_VM_STRUCT_ENTRY,
-                 GENERATE_C2_NONSTATIC_VM_STRUCT_ENTRY,
-                 GENERATE_C1_UNCHECKED_STATIC_VM_STRUCT_ENTRY,
-                 GENERATE_C2_UNCHECKED_STATIC_VM_STRUCT_ENTRY)
+                 GENERATE_NONPRODUCT_NONSTATIC_VM_STRUCT_ENTRY)
 
   VM_STRUCTS_OS_CPU(GENERATE_NONSTATIC_VM_STRUCT_ENTRY,
                     GENERATE_STATIC_VM_STRUCT_ENTRY,
                     GENERATE_UNCHECKED_NONSTATIC_VM_STRUCT_ENTRY,
                     GENERATE_NONSTATIC_VM_STRUCT_ENTRY,
-                    GENERATE_NONPRODUCT_NONSTATIC_VM_STRUCT_ENTRY,
-                    GENERATE_C2_NONSTATIC_VM_STRUCT_ENTRY,
-                    GENERATE_C1_UNCHECKED_STATIC_VM_STRUCT_ENTRY,
-                    GENERATE_C2_UNCHECKED_STATIC_VM_STRUCT_ENTRY)
+                    GENERATE_NONPRODUCT_NONSTATIC_VM_STRUCT_ENTRY)
 
   GENERATE_VM_STRUCT_LAST_ENTRY()
 };
@@ -2737,38 +1932,25 @@ VMTypeEntry VMStructs::localHotSpotVMTypes[] = {
            GENERATE_TOPLEVEL_VM_TYPE_ENTRY,
            GENERATE_OOP_VM_TYPE_ENTRY,
            GENERATE_INTEGER_VM_TYPE_ENTRY,
-           GENERATE_UNSIGNED_INTEGER_VM_TYPE_ENTRY,
-           GENERATE_C1_TOPLEVEL_VM_TYPE_ENTRY,
-           GENERATE_C2_VM_TYPE_ENTRY,
-           GENERATE_C2_TOPLEVEL_VM_TYPE_ENTRY)
-
+           GENERATE_UNSIGNED_INTEGER_VM_TYPE_ENTRY)
 
   VM_TYPES_OS(GENERATE_VM_TYPE_ENTRY,
               GENERATE_TOPLEVEL_VM_TYPE_ENTRY,
               GENERATE_OOP_VM_TYPE_ENTRY,
               GENERATE_INTEGER_VM_TYPE_ENTRY,
-              GENERATE_UNSIGNED_INTEGER_VM_TYPE_ENTRY,
-              GENERATE_C1_TOPLEVEL_VM_TYPE_ENTRY,
-              GENERATE_C2_VM_TYPE_ENTRY,
-              GENERATE_C2_TOPLEVEL_VM_TYPE_ENTRY)
+              GENERATE_UNSIGNED_INTEGER_VM_TYPE_ENTRY)
 
   VM_TYPES_CPU(GENERATE_VM_TYPE_ENTRY,
                GENERATE_TOPLEVEL_VM_TYPE_ENTRY,
                GENERATE_OOP_VM_TYPE_ENTRY,
                GENERATE_INTEGER_VM_TYPE_ENTRY,
-               GENERATE_UNSIGNED_INTEGER_VM_TYPE_ENTRY,
-               GENERATE_C1_TOPLEVEL_VM_TYPE_ENTRY,
-               GENERATE_C2_VM_TYPE_ENTRY,
-               GENERATE_C2_TOPLEVEL_VM_TYPE_ENTRY)
+               GENERATE_UNSIGNED_INTEGER_VM_TYPE_ENTRY)
 
   VM_TYPES_OS_CPU(GENERATE_VM_TYPE_ENTRY,
                   GENERATE_TOPLEVEL_VM_TYPE_ENTRY,
                   GENERATE_OOP_VM_TYPE_ENTRY,
                   GENERATE_INTEGER_VM_TYPE_ENTRY,
-                  GENERATE_UNSIGNED_INTEGER_VM_TYPE_ENTRY,
-                  GENERATE_C1_TOPLEVEL_VM_TYPE_ENTRY,
-                  GENERATE_C2_VM_TYPE_ENTRY,
-                  GENERATE_C2_TOPLEVEL_VM_TYPE_ENTRY)
+                  GENERATE_UNSIGNED_INTEGER_VM_TYPE_ENTRY)
 
   GENERATE_VM_TYPE_LAST_ENTRY()
 };
@@ -2781,28 +1963,16 @@ VMIntConstantEntry VMStructs::localHotSpotVMIntConstants[] = {
 
   VM_INT_CONSTANTS(GENERATE_VM_INT_CONSTANT_ENTRY,
                    GENERATE_VM_INT_CONSTANT_WITH_VALUE_ENTRY,
-                   GENERATE_PREPROCESSOR_VM_INT_CONSTANT_ENTRY,
-                   GENERATE_C1_VM_INT_CONSTANT_ENTRY,
-                   GENERATE_C2_VM_INT_CONSTANT_ENTRY,
-                   GENERATE_C2_PREPROCESSOR_VM_INT_CONSTANT_ENTRY)
+                   GENERATE_PREPROCESSOR_VM_INT_CONSTANT_ENTRY)
 
   VM_INT_CONSTANTS_OS(GENERATE_VM_INT_CONSTANT_ENTRY,
-                      GENERATE_PREPROCESSOR_VM_INT_CONSTANT_ENTRY,
-                      GENERATE_C1_VM_INT_CONSTANT_ENTRY,
-                      GENERATE_C2_VM_INT_CONSTANT_ENTRY,
-                      GENERATE_C2_PREPROCESSOR_VM_INT_CONSTANT_ENTRY)
+                      GENERATE_PREPROCESSOR_VM_INT_CONSTANT_ENTRY)
 
   VM_INT_CONSTANTS_CPU(GENERATE_VM_INT_CONSTANT_ENTRY,
-                       GENERATE_PREPROCESSOR_VM_INT_CONSTANT_ENTRY,
-                       GENERATE_C1_VM_INT_CONSTANT_ENTRY,
-                       GENERATE_C2_VM_INT_CONSTANT_ENTRY,
-                       GENERATE_C2_PREPROCESSOR_VM_INT_CONSTANT_ENTRY)
+                       GENERATE_PREPROCESSOR_VM_INT_CONSTANT_ENTRY)
 
   VM_INT_CONSTANTS_OS_CPU(GENERATE_VM_INT_CONSTANT_ENTRY,
-                          GENERATE_PREPROCESSOR_VM_INT_CONSTANT_ENTRY,
-                          GENERATE_C1_VM_INT_CONSTANT_ENTRY,
-                          GENERATE_C2_VM_INT_CONSTANT_ENTRY,
-                          GENERATE_C2_PREPROCESSOR_VM_INT_CONSTANT_ENTRY)
+                          GENERATE_PREPROCESSOR_VM_INT_CONSTANT_ENTRY)
 #ifdef VM_INT_CPU_FEATURE_CONSTANTS
   VM_INT_CPU_FEATURE_CONSTANTS
 #endif
@@ -2817,28 +1987,16 @@ size_t VMStructs::localHotSpotVMIntConstantsLength() {
 VMLongConstantEntry VMStructs::localHotSpotVMLongConstants[] = {
 
   VM_LONG_CONSTANTS(GENERATE_VM_LONG_CONSTANT_ENTRY,
-                    GENERATE_PREPROCESSOR_VM_LONG_CONSTANT_ENTRY,
-                    GENERATE_C1_VM_LONG_CONSTANT_ENTRY,
-                    GENERATE_C2_VM_LONG_CONSTANT_ENTRY,
-                    GENERATE_C2_PREPROCESSOR_VM_LONG_CONSTANT_ENTRY)
+                    GENERATE_PREPROCESSOR_VM_LONG_CONSTANT_ENTRY)
 
   VM_LONG_CONSTANTS_OS(GENERATE_VM_LONG_CONSTANT_ENTRY,
-                       GENERATE_PREPROCESSOR_VM_LONG_CONSTANT_ENTRY,
-                       GENERATE_C1_VM_LONG_CONSTANT_ENTRY,
-                       GENERATE_C2_VM_LONG_CONSTANT_ENTRY,
-                       GENERATE_C2_PREPROCESSOR_VM_LONG_CONSTANT_ENTRY)
+                       GENERATE_PREPROCESSOR_VM_LONG_CONSTANT_ENTRY)
 
   VM_LONG_CONSTANTS_CPU(GENERATE_VM_LONG_CONSTANT_ENTRY,
-                        GENERATE_PREPROCESSOR_VM_LONG_CONSTANT_ENTRY,
-                        GENERATE_C1_VM_LONG_CONSTANT_ENTRY,
-                        GENERATE_C2_VM_LONG_CONSTANT_ENTRY,
-                        GENERATE_C2_PREPROCESSOR_VM_LONG_CONSTANT_ENTRY)
+                        GENERATE_PREPROCESSOR_VM_LONG_CONSTANT_ENTRY)
 
   VM_LONG_CONSTANTS_OS_CPU(GENERATE_VM_LONG_CONSTANT_ENTRY,
-                           GENERATE_PREPROCESSOR_VM_LONG_CONSTANT_ENTRY,
-                           GENERATE_C1_VM_LONG_CONSTANT_ENTRY,
-                           GENERATE_C2_VM_LONG_CONSTANT_ENTRY,
-                           GENERATE_C2_PREPROCESSOR_VM_LONG_CONSTANT_ENTRY)
+                           GENERATE_PREPROCESSOR_VM_LONG_CONSTANT_ENTRY)
 #ifdef VM_LONG_CPU_FEATURE_CONSTANTS
   VM_LONG_CPU_FEATURE_CONSTANTS
 #endif
@@ -2892,58 +2050,38 @@ void VMStructs::init() {
              CHECK_VOLATILE_STATIC_VM_STRUCT_ENTRY,
              CHECK_NO_OP,
              CHECK_VOLATILE_NONSTATIC_VM_STRUCT_ENTRY,
-             CHECK_NONPRODUCT_NONSTATIC_VM_STRUCT_ENTRY,
-             CHECK_C1_NONSTATIC_VM_STRUCT_ENTRY,
-             CHECK_C2_NONSTATIC_VM_STRUCT_ENTRY,
-             CHECK_NO_OP,
-             CHECK_NO_OP);
-
+             CHECK_NONPRODUCT_NONSTATIC_VM_STRUCT_ENTRY)
 
   VM_STRUCTS_CPU(CHECK_NONSTATIC_VM_STRUCT_ENTRY,
                  CHECK_STATIC_VM_STRUCT_ENTRY,
                  CHECK_NO_OP,
                  CHECK_VOLATILE_NONSTATIC_VM_STRUCT_ENTRY,
-                 CHECK_NONPRODUCT_NONSTATIC_VM_STRUCT_ENTRY,
-                 CHECK_C2_NONSTATIC_VM_STRUCT_ENTRY,
-                 CHECK_NO_OP,
-                 CHECK_NO_OP);
+                 CHECK_NONPRODUCT_NONSTATIC_VM_STRUCT_ENTRY)
 
   VM_STRUCTS_OS_CPU(CHECK_NONSTATIC_VM_STRUCT_ENTRY,
                     CHECK_STATIC_VM_STRUCT_ENTRY,
                     CHECK_NO_OP,
                     CHECK_VOLATILE_NONSTATIC_VM_STRUCT_ENTRY,
-                    CHECK_NONPRODUCT_NONSTATIC_VM_STRUCT_ENTRY,
-                    CHECK_C2_NONSTATIC_VM_STRUCT_ENTRY,
-                    CHECK_NO_OP,
-                    CHECK_NO_OP);
+                    CHECK_NONPRODUCT_NONSTATIC_VM_STRUCT_ENTRY)
 
   VM_TYPES(CHECK_VM_TYPE_ENTRY,
            CHECK_SINGLE_ARG_VM_TYPE_NO_OP,
            CHECK_SINGLE_ARG_VM_TYPE_NO_OP,
            CHECK_SINGLE_ARG_VM_TYPE_NO_OP,
-           CHECK_SINGLE_ARG_VM_TYPE_NO_OP,
-           CHECK_C1_TOPLEVEL_VM_TYPE_ENTRY,
-           CHECK_C2_VM_TYPE_ENTRY,
-           CHECK_C2_TOPLEVEL_VM_TYPE_ENTRY);
+           CHECK_SINGLE_ARG_VM_TYPE_NO_OP)
 
 
   VM_TYPES_CPU(CHECK_VM_TYPE_ENTRY,
                CHECK_SINGLE_ARG_VM_TYPE_NO_OP,
                CHECK_SINGLE_ARG_VM_TYPE_NO_OP,
                CHECK_SINGLE_ARG_VM_TYPE_NO_OP,
-               CHECK_SINGLE_ARG_VM_TYPE_NO_OP,
-               CHECK_C1_TOPLEVEL_VM_TYPE_ENTRY,
-               CHECK_C2_VM_TYPE_ENTRY,
-               CHECK_C2_TOPLEVEL_VM_TYPE_ENTRY);
+               CHECK_SINGLE_ARG_VM_TYPE_NO_OP)
 
   VM_TYPES_OS_CPU(CHECK_VM_TYPE_ENTRY,
                   CHECK_SINGLE_ARG_VM_TYPE_NO_OP,
                   CHECK_SINGLE_ARG_VM_TYPE_NO_OP,
                   CHECK_SINGLE_ARG_VM_TYPE_NO_OP,
-                  CHECK_SINGLE_ARG_VM_TYPE_NO_OP,
-                  CHECK_C1_TOPLEVEL_VM_TYPE_ENTRY,
-                  CHECK_C2_VM_TYPE_ENTRY,
-                  CHECK_C2_TOPLEVEL_VM_TYPE_ENTRY);
+                  CHECK_SINGLE_ARG_VM_TYPE_NO_OP)
 
   //
   // Split VM_STRUCTS() invocation into two parts to allow MS VC++ 6.0
@@ -2967,39 +2105,26 @@ void VMStructs::init() {
              CHECK_NO_OP,
              CHECK_NO_OP,
              CHECK_NO_OP,
-             CHECK_NO_OP,
-             CHECK_NO_OP,
-             CHECK_NO_OP,
-             CHECK_NO_OP,
-             CHECK_NO_OP);
+             CHECK_NO_OP)
 
   VM_STRUCTS(CHECK_NO_OP,
              ENSURE_FIELD_TYPE_PRESENT,
              ENSURE_FIELD_TYPE_PRESENT,
              CHECK_NO_OP,
              ENSURE_FIELD_TYPE_PRESENT,
-             ENSURE_NONPRODUCT_FIELD_TYPE_PRESENT,
-             ENSURE_C1_FIELD_TYPE_PRESENT,
-             ENSURE_C2_FIELD_TYPE_PRESENT,
-             CHECK_NO_OP,
-             CHECK_NO_OP);
+             ENSURE_NONPRODUCT_FIELD_TYPE_PRESENT)
 
   VM_STRUCTS_CPU(ENSURE_FIELD_TYPE_PRESENT,
                  ENSURE_FIELD_TYPE_PRESENT,
                  CHECK_NO_OP,
                  ENSURE_FIELD_TYPE_PRESENT,
-                 ENSURE_NONPRODUCT_FIELD_TYPE_PRESENT,
-                 ENSURE_C2_FIELD_TYPE_PRESENT,
-                 CHECK_NO_OP,
-                 CHECK_NO_OP);
+                 ENSURE_NONPRODUCT_FIELD_TYPE_PRESENT)
+
   VM_STRUCTS_OS_CPU(ENSURE_FIELD_TYPE_PRESENT,
                     ENSURE_FIELD_TYPE_PRESENT,
                     CHECK_NO_OP,
                     ENSURE_FIELD_TYPE_PRESENT,
-                    ENSURE_NONPRODUCT_FIELD_TYPE_PRESENT,
-                    ENSURE_C2_FIELD_TYPE_PRESENT,
-                    CHECK_NO_OP,
-                    CHECK_NO_OP);
+                    ENSURE_NONPRODUCT_FIELD_TYPE_PRESENT)
 #endif // !_WINDOWS
 }
 
diff --git a/src/jdk.hotspot.agent/doc/cireplay.html b/src/jdk.hotspot.agent/doc/cireplay.html
deleted file mode 100644
index 71da428e58e..00000000000
--- a/src/jdk.hotspot.agent/doc/cireplay.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<html>
-<head>
-<title>
-Replay
-</title>
-</head>
-<body>
-
-<h1>Compiler replay</h1>
-<p>
-The compiler replay is a function to repeat the compiling process from a crashed java process in compiled method<br>
-This function only exists in debug version of VM
-</p>
-<h2>Usage</h2>
-<pre>
-First, use SA to attach to the core file, if succeeded, do
-       hsdb&gt; dumpreplaydata &lt;address&gt; | -a | &lt;thread_id&gt; [&gt; replay.txt]
-       create file replay.txt, address is address of Method, or nmethod(CodeBlob)
-       hsdb&gt; buildreplayjars [all | boot | app]
-       create files:
-         all:
-           app.jar, boot.jar
-         boot:
-           boot.jar
-         app:
-           app.jar
-       exit SA now.
-Second, use the obtained replay text file, replay.txt and jar files, app.jar and boot.jar, using debug version of java
-       java -Xbootclasspath/p:boot.jar -cp app.jar -XX:ReplayDataFile=&lt;datafile&gt; -XX:+ReplayCompiles ....
-       This will replay the compiling process.
-
-       With ReplayCompiles, the replay will recompile all the methods in app.jar, and in boot.jar to emulate the process in java app.
-
-notes:
-       1) Most time, we don't need the boot.jar which is the classes loaded from JDK. It will be only modified when an agent(JVMDI) is running and modifies the classes.
-       2) If encounter error as "&lt;flag&gt;" not found, that means the SA is using a VMStructs which is different from the one with corefile. In this case, SA has a utility tool vmstructsdump which is located at agent/src/os/&lt;os&gt;/proc/&lt;os_platform&gt;
-
-       Use this tool to dump VM type library:
-       vmstructsdump libjvm.so &gt; &lt;type_name&gt;.db
-
-       set env SA_TYPEDB=&lt;type_name&gt;.db (refer different shell for set envs)
diff --git a/src/jdk.hotspot.agent/doc/clhsdb.html b/src/jdk.hotspot.agent/doc/clhsdb.html
index 69fd228a52e..a225530774f 100644
--- a/src/jdk.hotspot.agent/doc/clhsdb.html
+++ b/src/jdk.hotspot.agent/doc/clhsdb.html
@@ -38,9 +38,6 @@ Available commands:
   dumpclass { address | name } [ directory ] <font color="red">dump .class file for given Klass* or class name</font>
   dumpcodecache <font color="red">dump codecache contents</font>
   dumpheap [ file ] <font color="red">dump heap in hprof binary format</font>
-  dumpideal -a | id <font color="red">dump ideal graph like debug flag -XX:+PrintIdeal</font>
-  dumpilt -a | id <font color="red">dump inline tree for C2 compilation</font>
-  dumpreplaydata &lt;address&gt; | -a | &lt;thread_id&gt; [&gt;replay.txt] <font color="red">dump replay data into a file</font>
   echo [ true | false ] <font color="red">turn on/off command echo mode</font>
   examine { address[/count] | address,address } <font color="red">show contents of memory range</font>
   field [ type [ name fieldtype isStatic offset address ] ] <font color="red">print info about a field of HotSpot type</font>
@@ -84,11 +81,5 @@ Available commands:
 </code>
 </pre>
 
-<h3>Compilation Replay</h3>
-<p>
-When a java process crashes in compiled method, usually a core file is saved.
-The replay function can reproduce the compiling process in the core.
-<a href="cireplay.html">cireplay.html</a>
-
 </body>
 </html>
diff --git a/src/jdk.hotspot.agent/doc/index.html b/src/jdk.hotspot.agent/doc/index.html
index 2e3ba38e4b8..0ce8cd45970 100644
--- a/src/jdk.hotspot.agent/doc/index.html
+++ b/src/jdk.hotspot.agent/doc/index.html
@@ -40,12 +40,6 @@ More details on the command line interface can be found in the "jhsdb" man page
 </ul>
 </p>
 
-<h3>Compilation Replay</h3>
-<p>
-When a java process crashes in a compiled method, usually a core file is saved.
-The compiler replay function can reproduce the compiling process in the core.
-See <a href="cireplay.html">cireplay.html</a>
-
 <h3>Debugging transported core dumps</h3>
 <p>
 When a core dump is moved from the machine where it was produced to a
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/CommandProcessor.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/CommandProcessor.java
index 79709cce132..01b9a4a447e 100644
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/CommandProcessor.java
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/CommandProcessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -44,7 +44,6 @@ import java.util.Objects;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import sun.jvm.hotspot.ci.ciEnv;
 import sun.jvm.hotspot.code.CodeBlob;
 import sun.jvm.hotspot.code.CodeCacheVisitor;
 import sun.jvm.hotspot.code.NMethod;
@@ -66,8 +65,6 @@ import sun.jvm.hotspot.oops.Oop;
 import sun.jvm.hotspot.oops.RawHeapVisitor;
 import sun.jvm.hotspot.oops.Symbol;
 import sun.jvm.hotspot.oops.UnknownOopException;
-import sun.jvm.hotspot.opto.Compile;
-import sun.jvm.hotspot.opto.InlineTree;
 import sun.jvm.hotspot.runtime.CompiledVFrame;
 import sun.jvm.hotspot.runtime.CompilerThread;
 import sun.jvm.hotspot.runtime.JavaThread;
@@ -562,57 +559,6 @@ public class CommandProcessor {
                 }
             }
         },
-        new Command("dumpreplaydata", "dumpreplaydata { <address > | -a | <thread_id> }", false) {
-            // This is used to dump replay data from ciInstanceKlass, ciMethodData etc
-            // default file name is replay.txt, also if java crashes in compiler
-            // thread, this file will be dumped in error processing.
-            public void doit(Tokens t) {
-                if (t.countTokens() != 1) {
-                    usage();
-                    return;
-                }
-                String name = t.nextToken();
-                Address a = null;
-                try {
-                    a = VM.getVM().getDebugger().parseAddress(name);
-                } catch (NumberFormatException e) { }
-                if (a != null) {
-                    // only nmethod, Method, MethodData and InstanceKlass needed to
-                    // dump replay data
-
-                    CodeBlob cb = VM.getVM().getCodeCache().findBlob(a);
-                    if (cb instanceof NMethod nMethod) {
-                        nMethod.dumpReplayData(out);
-                        return;
-                    }
-                    // assume it is Metadata
-                    Metadata meta = Metadata.instantiateWrapperFor(a);
-                    if (meta != null) {
-                        meta.dumpReplayData(out);
-                    } else {
-                        usage();
-                        return;
-                    }
-                }
-                // Not an address
-                boolean all = name.equals("-a");
-                Threads threads = VM.getVM().getThreads();
-                for (int i = 0; i < threads.getNumberOfThreads(); i++) {
-                    JavaThread thread = threads.getJavaThreadAt(i);
-                    ByteArrayOutputStream bos = new ByteArrayOutputStream();
-                    thread.printThreadIDOn(new PrintStream(bos));
-                    if (all || bos.toString().equals(name)) {
-                        if (thread instanceof CompilerThread) {
-                            CompilerThread ct = (CompilerThread)thread;
-                            ciEnv env = ct.env();
-                            if (env != null) {
-                               env.dumpReplayData(out);
-                            }
-                        }
-                    }
-                }
-            }
-        },
         new Command("buildreplayjars", "buildreplayjars [ all | app | boot ]  | [ prefix ]", false) {
             // This is used to dump jar files of all the classes
             // loaded in the core.  Everything with null classloader
@@ -973,94 +919,6 @@ public class CommandProcessor {
                 }
             }
         },
-        new Command("dumpideal", "dumpideal { -a | id }", false) {
-            // Do a full dump of the nodes reachable from root in each compiler thread.
-            public void doit(Tokens t) {
-                if (t.countTokens() != 1) {
-                    usage();
-                } else {
-                    String name = t.nextToken();
-                    boolean all = name.equals("-a");
-                    Threads threads = VM.getVM().getThreads();
-                    for (int i = 0; i < threads.getNumberOfThreads(); i++) {
-                        JavaThread thread = threads.getJavaThreadAt(i);
-                        ByteArrayOutputStream bos = new ByteArrayOutputStream();
-                        thread.printThreadIDOn(new PrintStream(bos));
-                        if (all || bos.toString().equals(name)) {
-                          if (thread instanceof CompilerThread) {
-                            CompilerThread ct = (CompilerThread)thread;
-                            out.println(ct);
-                            ciEnv env = ct.env();
-                            if (env != null) {
-                              Compile c = env.compilerData();
-                              c.root().dump(9999, out);
-                            } else {
-                              out.println("  not compiling");
-                            }
-                          }
-                        }
-                    }
-                }
-            }
-        },
-        new Command("dumpcfg", "dumpcfg { -a | id }", false) {
-            // Dump the PhaseCFG for every compiler thread that has one live.
-            public void doit(Tokens t) {
-                if (t.countTokens() != 1) {
-                    usage();
-                } else {
-                    String name = t.nextToken();
-                    boolean all = name.equals("-a");
-                    Threads threads = VM.getVM().getThreads();
-                    for (int i = 0; i < threads.getNumberOfThreads(); i++) {
-                        JavaThread thread = threads.getJavaThreadAt(i);
-                        ByteArrayOutputStream bos = new ByteArrayOutputStream();
-                        thread.printThreadIDOn(new PrintStream(bos));
-                        if (all || bos.toString().equals(name)) {
-                          if (thread instanceof CompilerThread) {
-                            CompilerThread ct = (CompilerThread)thread;
-                            out.println(ct);
-                            ciEnv env = ct.env();
-                            if (env != null) {
-                              Compile c = env.compilerData();
-                              c.cfg().dump(out);
-                            }
-                          }
-                        }
-                    }
-                }
-            }
-        },
-        new Command("dumpilt", "dumpilt { -a | id }", false) {
-            // dumps the InlineTree of a C2 compile
-            public void doit(Tokens t) {
-                if (t.countTokens() != 1) {
-                    usage();
-                } else {
-                    String name = t.nextToken();
-                    boolean all = name.equals("-a");
-                    Threads threads = VM.getVM().getThreads();
-                    for (int i = 0; i < threads.getNumberOfThreads(); i++) {
-                        JavaThread thread = threads.getJavaThreadAt(i);
-                        ByteArrayOutputStream bos = new ByteArrayOutputStream();
-                        thread.printThreadIDOn(new PrintStream(bos));
-                        if (all || bos.toString().equals(name)) {
-                            if (thread instanceof CompilerThread) {
-                                CompilerThread ct = (CompilerThread)thread;
-                                ciEnv env = ct.env();
-                                if (env != null) {
-                                    Compile c = env.compilerData();
-                                    InlineTree ilt = c.ilt();
-                                    if (ilt != null) {
-                                        ilt.print(out);
-                                    }
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-        },
         new Command("vmstructsdump", "vmstructsdump", false) {
             public void doit(Tokens t) {
                 if (t.countTokens() != 0) {
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/c1/Runtime1.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/c1/Runtime1.java
deleted file mode 100644
index b26e42ebfdf..00000000000
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/c1/Runtime1.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Copyright (c) 2000, 2025, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please 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.c1;
-
-import java.util.*;
-import sun.jvm.hotspot.code.*;
-import sun.jvm.hotspot.debugger.*;
-import sun.jvm.hotspot.runtime.*;
-import sun.jvm.hotspot.types.*;
-import sun.jvm.hotspot.utilities.Observable;
-import sun.jvm.hotspot.utilities.Observer;
-
-/** Currently a minimal port to get C1 frame traversal working */
-
-public class Runtime1 {
-  private static Field         blobsField;
-
-  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("Runtime1");
-
-    blobsField = type.getField("_blobs");
-  }
-
-  public Runtime1() {
-  }
-
-  /** FIXME: consider making argument "type-safe" in Java port */
-  public Address entryFor(int id) {
-    return blobFor(id).codeBegin();
-  }
-
-  /** FIXME: consider making argument "type-safe" in Java port */
-  public CodeBlob blobFor(int id) {
-    Address blobAddr = blobsField.getStaticFieldAddress().getAddressAt(id * VM.getVM().getAddressSize());
-    return VM.getVM().getCodeCache().createCodeBlobWrapper(blobAddr, blobAddr);
-  }
-}
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ci/ciArrayKlass.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ci/ciArrayKlass.java
deleted file mode 100644
index c0421c39b25..00000000000
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ci/ciArrayKlass.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright (c) 2011, 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.ci;
-
-import java.io.PrintStream;
-import java.util.*;
-import sun.jvm.hotspot.debugger.*;
-import sun.jvm.hotspot.runtime.*;
-import sun.jvm.hotspot.oops.*;
-import sun.jvm.hotspot.types.*;
-import sun.jvm.hotspot.utilities.Observable;
-import sun.jvm.hotspot.utilities.Observer;
-
-public class ciArrayKlass extends ciKlass {
-  static {
-    VM.registerVMInitializedObserver(new Observer() {
-        public void update(Observable o, Object data) {
-          initialize(VM.getVM().getTypeDataBase());
-        }
-      });
-  }
-
-  private static synchronized void initialize(TypeDataBase db) throws WrongTypeException {
-    Type type      = db.lookupType("ciArrayKlass");
-    dimensionField = new IntField(type.getJIntField("_dimension"), 0);
-  }
-
-  private static IntField dimensionField;
-
-  public ciArrayKlass(Address addr) {
-    super(addr);
-  }
-}
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ci/ciBaseObject.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ci/ciBaseObject.java
deleted file mode 100644
index c3de39a705a..00000000000
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ci/ciBaseObject.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Copyright (c) 2012, 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.ci;
-
-import java.io.*;
-import java.util.*;
-import sun.jvm.hotspot.debugger.*;
-import sun.jvm.hotspot.runtime.*;
-import sun.jvm.hotspot.oops.*;
-import sun.jvm.hotspot.types.*;
-import sun.jvm.hotspot.utilities.Observable;
-import sun.jvm.hotspot.utilities.Observer;
-
-public class ciBaseObject extends VMObject {
-  static {
-    VM.registerVMInitializedObserver(new Observer() {
-        public void update(Observable o, Object data) {
-          initialize(VM.getVM().getTypeDataBase());
-        }
-      });
-  }
-
-  private static synchronized void initialize(TypeDataBase db) throws WrongTypeException {
-    Type type      = db.lookupType("ciBaseObject");
-    identField = new CIntField(type.getCIntegerField("_ident"), 0);
-  }
-
-  private static CIntField identField;
-
-  public ciBaseObject(Address addr) {
-    super(addr);
-  }
-
-  public void dumpReplayData(PrintStream out) {
-    out.println("# Unknown ci type " + getAddress().getAddressAt(0));
-  }
-}
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ci/ciConstant.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ci/ciConstant.java
deleted file mode 100644
index 24029bdd031..00000000000
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ci/ciConstant.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Copyright (c) 2011, 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.ci;
-
-import java.io.PrintStream;
-import java.util.*;
-import sun.jvm.hotspot.debugger.*;
-import sun.jvm.hotspot.runtime.*;
-import sun.jvm.hotspot.oops.*;
-import sun.jvm.hotspot.types.*;
-import sun.jvm.hotspot.utilities.Observable;
-import sun.jvm.hotspot.utilities.Observer;
-
-public class ciConstant extends VMObject {
-  static {
-    VM.registerVMInitializedObserver(new Observer() {
-        public void update(Observable o, Object data) {
-          initialize(VM.getVM().getTypeDataBase());
-        }
-      });
-  }
-
-  private static synchronized void initialize(TypeDataBase db) throws WrongTypeException {
-    Type type      = db.lookupType("ciConstant");
-    valueObjectField = type.getAddressField("_value._object");
-    valueDoubleField = type.getJDoubleField("_value._double");
-    valueFloatField = type.getJFloatField("_value._float");
-    valueLongField = type.getJLongField("_value._long");
-    valueIntField = type.getJIntField("_value._int");
-    typeField = new CIntField(type.getCIntegerField("_type"), 0);
-  }
-
-  private static AddressField valueObjectField;
-  private static JDoubleField valueDoubleField;
-  private static JFloatField valueFloatField;
-  private static JLongField valueLongField;
-  private static JIntField valueIntField;
-  private static CIntField typeField;
-
-  public ciConstant(Address addr) {
-    super(addr);
-  }
-
-  public void dumpReplayData(PrintStream out) {
-    // Nothing to be done
-  }
-}
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ci/ciEnv.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ci/ciEnv.java
deleted file mode 100644
index 9e5aa030046..00000000000
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ci/ciEnv.java
+++ /dev/null
@@ -1,110 +0,0 @@
-/*
- * Copyright (c) 2011, 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.ci;
-
-import java.io.PrintStream;
-import java.util.*;
-import sun.jvm.hotspot.debugger.*;
-import sun.jvm.hotspot.runtime.*;
-import sun.jvm.hotspot.oops.*;
-import sun.jvm.hotspot.opto.*;
-import sun.jvm.hotspot.compiler.CompileTask;
-import sun.jvm.hotspot.prims.JvmtiExport;
-import sun.jvm.hotspot.types.*;
-import sun.jvm.hotspot.utilities.GrowableArray;
-import sun.jvm.hotspot.utilities.Observable;
-import sun.jvm.hotspot.utilities.Observer;
-
-public class ciEnv extends VMObject {
-  static {
-    VM.registerVMInitializedObserver(new Observer() {
-        public void update(Observable o, Object data) {
-          initialize(VM.getVM().getTypeDataBase());
-        }
-      });
-  }
-
-  private static synchronized void initialize(TypeDataBase db) throws WrongTypeException {
-    Type type      = db.lookupType("ciEnv");
-    dependenciesField = type.getAddressField("_dependencies");
-    factoryField = type.getAddressField("_factory");
-    compilerDataField = type.getAddressField("_compiler_data");
-    taskField = type.getAddressField("_task");
-  }
-
-  private static AddressField dependenciesField;
-  private static AddressField factoryField;
-  private static AddressField compilerDataField;
-  private static AddressField taskField;
-
-  public ciEnv(Address addr) {
-    super(addr);
-  }
-
-  public Compile compilerData() {
-    Address addr = compilerDataField.getValue(this.getAddress());
-    if (addr == null) {
-      return null;
-    }
-    return new Compile(addr);
-  }
-
-  public ciObjectFactory factory() {
-    return new ciObjectFactory(factoryField.getValue(this.getAddress()));
-  }
-
-  public CompileTask task() {
-    return new CompileTask(taskField.getValue(this.getAddress()));
-  }
-
-  public void dumpReplayData(PrintStream out) {
-    out.println("JvmtiExport can_access_local_variables " +
-                (JvmtiExport.canAccessLocalVariables() ? '1' : '0'));
-    out.println("JvmtiExport can_hotswap_or_post_breakpoint " +
-                (JvmtiExport.canHotswapOrPostBreakpoint() ? '1' : '0'));
-    out.println("JvmtiExport can_post_on_exceptions " +
-                (JvmtiExport.canPostOnExceptions() ? '1' : '0'));
-
-    GrowableArray<ciMetadata> objects = factory().objects();
-    out.println("# " + objects.length() + " ciObject found");
-    for (int i = 0; i < objects.length(); i++) {
-      ciMetadata o = objects.at(i);
-      out.println("# ciMetadata" + i + " @ " + o);
-      o.dumpReplayData(out);
-    }
-    CompileTask task = task();
-    Method method = task.method();
-    int entryBci = task.osrBci();
-    int compLevel = task.compLevel();
-    out.print("compile " + method.nameAsAscii() + " " +
-              entryBci + " " + compLevel);
-    Compile compiler = compilerData();
-    if (compiler != null) {
-      // Dump inlining data.
-      compiler.dumpInlineData(out);
-    }
-    out.println();
-  }
-}
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ci/ciField.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ci/ciField.java
deleted file mode 100644
index 9c96e20c0ad..00000000000
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ci/ciField.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Copyright (c) 2011, 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.ci;
-
-import java.util.*;
-import sun.jvm.hotspot.debugger.*;
-import sun.jvm.hotspot.runtime.*;
-import sun.jvm.hotspot.oops.*;
-import sun.jvm.hotspot.types.*;
-import sun.jvm.hotspot.utilities.Observable;
-import sun.jvm.hotspot.utilities.Observer;
-
-public class ciField extends VMObject {
-  static {
-    VM.registerVMInitializedObserver(new Observer() {
-        public void update(Observable o, Object data) {
-          initialize(VM.getVM().getTypeDataBase());
-        }
-      });
-  }
-
-  private static synchronized void initialize(TypeDataBase db) throws WrongTypeException {
-    Type type      = db.lookupType("ciField");
-    constantValueField = type.getAddressField("_constant_value");
-    isConstantField = type.getAddressField("_is_constant");
-    offsetField = new CIntField(type.getCIntegerField("_offset"), 0);
-    signatureField = type.getAddressField("_signature");
-    nameField = type.getAddressField("_name");
-    holderField = type.getAddressField("_holder");
-  }
-
-  private static AddressField constantValueField;
-  private static AddressField isConstantField;
-  private static CIntField offsetField;
-  private static AddressField signatureField;
-  private static AddressField nameField;
-  private static AddressField holderField;
-
-  public ciField(Address addr) {
-    super(addr);
-  }
-}
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ci/ciInstance.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ci/ciInstance.java
deleted file mode 100644
index dcf69cacdbb..00000000000
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ci/ciInstance.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright (c) 2011, 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.ci;
-
-import java.io.PrintStream;
-import java.util.*;
-import sun.jvm.hotspot.debugger.*;
-import sun.jvm.hotspot.runtime.*;
-import sun.jvm.hotspot.oops.*;
-import sun.jvm.hotspot.types.*;
-import sun.jvm.hotspot.utilities.Observable;
-import sun.jvm.hotspot.utilities.Observer;
-
-public class ciInstance extends ciObject {
-  static {
-    VM.registerVMInitializedObserver(new Observer() {
-        public void update(Observable o, Object data) {
-          initialize(VM.getVM().getTypeDataBase());
-        }
-      });
-  }
-
-  private static synchronized void initialize(TypeDataBase db) throws WrongTypeException {
-    Type type      = db.lookupType("ciInstance");
-  }
-
-
-  public ciInstance(Address addr) {
-    super(addr);
-  }
-}
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ci/ciInstanceKlass.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ci/ciInstanceKlass.java
deleted file mode 100644
index febf476e6a6..00000000000
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ci/ciInstanceKlass.java
+++ /dev/null
@@ -1,165 +0,0 @@
-/*
- * Copyright (c) 2011, 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.ci;
-
-import java.io.*;
-import java.util.*;
-import sun.jvm.hotspot.debugger.*;
-import sun.jvm.hotspot.memory.SystemDictionary;
-import sun.jvm.hotspot.runtime.*;
-import sun.jvm.hotspot.oops.*;
-import sun.jvm.hotspot.types.Type;
-import sun.jvm.hotspot.types.TypeDataBase;
-import sun.jvm.hotspot.types.WrongTypeException;
-import sun.jvm.hotspot.utilities.Observable;
-import sun.jvm.hotspot.utilities.Observer;
-
-public class ciInstanceKlass extends ciKlass {
-  static {
-    VM.registerVMInitializedObserver(new Observer() {
-        public void update(Observable o, Object data) {
-          initialize(VM.getVM().getTypeDataBase());
-        }
-      });
-  }
-
-  private static synchronized void initialize(TypeDataBase db) throws WrongTypeException {
-    Type type      = db.lookupType("ciInstanceKlass");
-    initStateField = new CIntField(type.getCIntegerField("_init_state"), 0);
-    isSharedField = new CIntField(type.getCIntegerField("_is_shared"), 0);
-    CLASS_STATE_LINKED = db.lookupIntConstant("InstanceKlass::linked").intValue();
-    CLASS_STATE_FULLY_INITIALIZED = db.lookupIntConstant("InstanceKlass::fully_initialized").intValue();
-  }
-
-  private static CIntField initStateField;
-  private static CIntField isSharedField;
-  private static int CLASS_STATE_LINKED;
-  private static int CLASS_STATE_FULLY_INITIALIZED;
-
-  public ciInstanceKlass(Address addr) {
-    super(addr);
-  }
-
-  public int initState() {
-    int initState = (int)initStateField.getValue(getAddress());
-    if (isShared() && initState < CLASS_STATE_LINKED) {
-      InstanceKlass ik = (InstanceKlass)getMetadata();
-      initState = ik.getInitStateAsInt();
-    }
-    return initState;
-  }
-
-  public boolean isShared() {
-    return isSharedField.getValue(getAddress()) != 0;
-  }
-
-  public boolean isLinked() {
-    return initState() >= CLASS_STATE_LINKED;
-  }
-
-  public boolean isInitialized() {
-    return initState() == CLASS_STATE_FULLY_INITIALIZED;
-  }
-
-  public void dumpReplayData(PrintStream out) {
-    InstanceKlass ik = (InstanceKlass)getMetadata();
-    ConstantPool cp = ik.getConstants();
-
-    // Try to record related loaded classes
-    Klass sub = ik.getSubklassKlass();
-    while (sub != null) {
-      if (sub instanceof InstanceKlass) {
-        out.println("instanceKlass " + sub.getName().asString());
-      }
-      sub = sub.getNextSiblingKlass();
-    }
-
-    final int length = cp.getLength();
-    out.print("ciInstanceKlass " + name() + " " + (isLinked() ? 1 : 0) + " " + (isInitialized() ? 1 : 0) + " " + length);
-    for (int index = 1; index < length; index++) {
-      out.print(" " + cp.getTags().at(index));
-    }
-    out.println();
-    if (isInitialized()) {
-      Field[] staticFields = ik.getStaticFields();
-      for (int i = 0; i < staticFields.length; i++) {
-        Field f = staticFields[i];
-        Oop mirror = ik.getJavaMirror();
-        if (f.isFinal() && !f.hasInitialValue()) {
-          out.print("staticfield " + name() + " " +
-                    OopUtilities.escapeString(f.getID().getName()) + " " +
-                    f.getFieldType().getSignature().asString() + " ");
-          if (f instanceof ByteField) {
-            ByteField bf = (ByteField)f;
-            out.println(bf.getValue(mirror));
-          } else if (f instanceof BooleanField) {
-            BooleanField bf = (BooleanField)f;
-            out.println(bf.getValue(mirror) ? 1 : 0);
-          } else if (f instanceof ShortField) {
-            ShortField bf = (ShortField)f;
-            out.println(bf.getValue(mirror));
-          } else if (f instanceof CharField) {
-            CharField bf = (CharField)f;
-            out.println(bf.getValue(mirror) & 0xffff);
-          } else if (f instanceof IntField) {
-            IntField bf = (IntField)f;
-            out.println(bf.getValue(mirror));
-          } else  if (f instanceof LongField) {
-            LongField bf = (LongField)f;
-            out.println(bf.getValue(mirror));
-          } else if (f instanceof FloatField) {
-            FloatField bf = (FloatField)f;
-            out.println(Float.floatToRawIntBits(bf.getValue(mirror)));
-          } else if (f instanceof DoubleField) {
-            DoubleField bf = (DoubleField)f;
-            out.println(Double.doubleToRawLongBits(bf.getValue(mirror)));
-          } else if (f instanceof OopField) {
-            OopField bf = (OopField)f;
-            Oop value = bf.getValue(mirror);
-            if (value == null) {
-              out.println("null");
-            } else if (value.isInstance()) {
-              Instance inst = (Instance)value;
-              if (inst.isA(SystemDictionary.getStringKlass())) {
-                out.println("\"" + OopUtilities.stringOopToEscapedString(inst) + "\"");
-              } else {
-                out.println(inst.getKlass().getName().asString());
-              }
-            } else if (value.isObjArray()) {
-              ObjArray oa = (ObjArray)value;
-              Klass ek = (ObjArrayKlass)oa.getKlass();
-              out.println(oa.getLength() + " " + ek.getName().asString());
-            } else if (value.isTypeArray()) {
-              TypeArray ta = (TypeArray)value;
-              out.println(ta.getLength());
-            } else {
-              out.println(value);
-            }
-          }
-        }
-      }
-    }
-  }
-}
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ci/ciKlass.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ci/ciKlass.java
deleted file mode 100644
index 168486cecd9..00000000000
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ci/ciKlass.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Copyright (c) 2011, 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.ci;
-
-import java.io.PrintStream;
-import java.util.*;
-import sun.jvm.hotspot.debugger.*;
-import sun.jvm.hotspot.runtime.*;
-import sun.jvm.hotspot.oops.*;
-import sun.jvm.hotspot.types.*;
-import sun.jvm.hotspot.utilities.Observable;
-import sun.jvm.hotspot.utilities.Observer;
-
-public class ciKlass extends ciType {
-  static {
-    VM.registerVMInitializedObserver(new Observer() {
-        public void update(Observable o, Object data) {
-          initialize(VM.getVM().getTypeDataBase());
-        }
-      });
-  }
-
-  private static synchronized void initialize(TypeDataBase db) throws WrongTypeException {
-    Type type      = db.lookupType("ciKlass");
-    nameField = type.getAddressField("_name");
-  }
-
-  private static AddressField nameField;
-
-  public String name() {
-    ciSymbol sym = new ciSymbol(nameField.getValue(getAddress()));
-    return sym.asUtf88();
-  }
-
-  public ciKlass(Address addr) {
-    super(addr);
-  }
-
-  public void printValueOn(PrintStream tty) {
-    Klass k = (Klass)getMetadata();
-    k.printValueOn(tty);
-  }
-}
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ci/ciMetadata.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ci/ciMetadata.java
deleted file mode 100644
index e64ad9ef8f0..00000000000
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ci/ciMetadata.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Copyright (c) 2012, 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.ci;
-
-import java.io.*;
-import java.util.*;
-import sun.jvm.hotspot.debugger.*;
-import sun.jvm.hotspot.runtime.*;
-import sun.jvm.hotspot.oops.*;
-import sun.jvm.hotspot.types.*;
-import sun.jvm.hotspot.utilities.Observable;
-import sun.jvm.hotspot.utilities.Observer;
-
-public class ciMetadata extends ciBaseObject {
-  static {
-    VM.registerVMInitializedObserver(new Observer() {
-        public void update(Observable o, Object data) {
-          initialize(VM.getVM().getTypeDataBase());
-        }
-      });
-  }
-
-  private static synchronized void initialize(TypeDataBase db) throws WrongTypeException {
-    Type type      = db.lookupType("ciMetadata");
-    metadataField = new MetadataField(type.getAddressField("_metadata"), 0);
-  }
-
-  private static MetadataField metadataField;
-
-  public Metadata getMetadata() {
-    return metadataField.getValue(getAddress());
-  }
-
-  public ciMetadata(Address addr) {
-    super(addr);
-  }
-
-  public void printOn(PrintStream out) {
-    getMetadata().printValueOn(out);
-  }
-
-  public String toString() {
-    return getMetadata().toString();
-  }
-}
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ci/ciMethod.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ci/ciMethod.java
deleted file mode 100644
index 132c54d9ba0..00000000000
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ci/ciMethod.java
+++ /dev/null
@@ -1,114 +0,0 @@
-/*
- * Copyright (c) 2011, 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.ci;
-
-import java.io.*;
-import java.util.*;
-import sun.jvm.hotspot.debugger.*;
-import sun.jvm.hotspot.code.*;
-import sun.jvm.hotspot.runtime.*;
-import sun.jvm.hotspot.oops.*;
-import sun.jvm.hotspot.types.*;
-import sun.jvm.hotspot.utilities.Observable;
-import sun.jvm.hotspot.utilities.Observer;
-
-public class ciMethod extends ciMetadata {
-  static {
-    VM.registerVMInitializedObserver(new Observer() {
-        public void update(Observable o, Object data) {
-          initialize(VM.getVM().getTypeDataBase());
-        }
-      });
-  }
-
-  private static synchronized void initialize(TypeDataBase db) throws WrongTypeException {
-    Type type      = db.lookupType("ciMethod");
-    interpreterThrowoutCountField = new CIntField(type.getCIntegerField("_interpreter_throwout_count"), 0);
-    interpreterInvocationCountField = new CIntField(type.getCIntegerField("_interpreter_invocation_count"), 0);
-    try {
-        // XXX
-        instructionsSizeField = new CIntField(type.getCIntegerField("_instructions_size"), 0);
-    } catch (Exception e) {
-    }
-  }
-
-  private static CIntField interpreterThrowoutCountField;
-  private static CIntField interpreterInvocationCountField;
-  private static CIntField instructionsSizeField;
-
-  public ciMethod(Address addr) {
-    super(addr);
-  }
-
-  public Method method() {
-    return (Method)getMetadata();
-  }
-
-  public int interpreterThrowoutCount() {
-    return (int) interpreterThrowoutCountField.getValue(getAddress());
-  }
-
-  public int interpreterInvocationCount() {
-    return (int) interpreterInvocationCountField.getValue(getAddress());
-  }
-
-  public int instructionsSize() {
-    if (instructionsSizeField == null) {
-      // XXX
-      Method method = method();
-      NMethod nm = method.getNativeMethod();
-      if (nm != null) return (int)nm.codeEnd().minus(nm.getVerifiedEntryPoint());
-      return 0;
-    }
-    return (int) instructionsSizeField.getValue(getAddress());
-  }
-
-  public void printShortName(PrintStream st) {
-    Method method = method();
-    st.printf(" %s::%s", method.getMethodHolder().getName().asString().replace('/', '.'),
-              method.getName().asString());
-  }
-
-  public void dumpReplayData(PrintStream out) {
-    Method method = (Method)getMetadata();
-    NMethod nm = method.getNativeMethod();
-    out.println("ciMethod " +
-                nameAsAscii() + " " +
-                method.getInvocationCount() + " " +
-                method.getBackedgeCount() + " " +
-                interpreterInvocationCount() + " " +
-                interpreterThrowoutCount() + " " +
-                instructionsSize());
-  }
-
-  public void printValueOn(PrintStream tty) {
-    tty.print("ciMethod " + method().getName().asString() + method().getSignature().asString() + "@" + getAddress());
-  }
-
-  public String nameAsAscii() {
-    Method method = (Method)getMetadata();
-    return method.nameAsAscii();
-  }
-}
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ci/ciMethodData.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ci/ciMethodData.java
deleted file mode 100644
index 237eb6227d9..00000000000
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ci/ciMethodData.java
+++ /dev/null
@@ -1,361 +0,0 @@
-/*
- * Copyright (c) 2011, 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 sun.jvm.hotspot.ci;
-
-import java.io.*;
-import java.util.*;
-import sun.jvm.hotspot.debugger.*;
-import sun.jvm.hotspot.runtime.*;
-import sun.jvm.hotspot.oops.*;
-import sun.jvm.hotspot.types.*;
-import sun.jvm.hotspot.types.Field;
-import sun.jvm.hotspot.utilities.Observable;
-import sun.jvm.hotspot.utilities.Observer;
-
-public class ciMethodData extends ciMetadata implements MethodDataInterface<ciKlass,ciMethod> {
-  static {
-    VM.registerVMInitializedObserver(new Observer() {
-        public void update(Observable o, Object data) {
-          initialize(VM.getVM().getTypeDataBase());
-        }
-      });
-  }
-
-  private static synchronized void initialize(TypeDataBase db) throws WrongTypeException {
-    Type type      = db.lookupType("ciMethodData");
-    origField = type.getField("_orig");
-    argReturnedField = new CIntField(type.getCIntegerField("_arg_returned"), 0);
-    argStackField = new CIntField(type.getCIntegerField("_arg_stack"), 0);
-    argLocalField = new CIntField(type.getCIntegerField("_arg_local"), 0);
-    eflagsField = new CIntField(type.getCIntegerField("_eflags"), 0);
-    hintDiField = new CIntField(type.getCIntegerField("_hint_di"), 0);
-    dataField = type.getAddressField("_data");
-    extraDataSizeField = new CIntField(type.getCIntegerField("_extra_data_size"), 0);
-    dataSizeField = new CIntField(type.getCIntegerField("_data_size"), 0);
-    stateField = new CIntField(type.getCIntegerField("_state"), 0);
-    Type typeMethodData = db.lookupType("MethodData");
-    sizeofMethodDataOopDesc = (int)typeMethodData.getSize();
-    parametersTypeDataDi = new CIntField(typeMethodData.getCIntegerField("_parameters_type_data_di"), 0);
-  }
-
-  private static Field origField;
-  private static CIntField argReturnedField;
-  private static CIntField argStackField;
-  private static CIntField argLocalField;
-  private static CIntField eflagsField;
-  private static CIntField hintDiField;
-  private static AddressField dataField;
-  private static CIntField extraDataSizeField;
-  private static CIntField dataSizeField;
-  private static CIntField stateField;
-  private static int sizeofMethodDataOopDesc;
-  private static CIntField parametersTypeDataDi;
-
-  public ciMethodData(Address addr) {
-    super(addr);
-  }
-
-  public ciKlass getKlassAtAddress(Address addr) {
-    return (ciKlass)ciObjectFactory.getMetadata(addr);
-  }
-
-  public ciMethod getMethodAtAddress(Address addr) {
-    return (ciMethod)ciObjectFactory.getMetadata(addr);
-  }
-
-  public void printKlassValueOn(ciKlass klass, PrintStream st) {
-    klass.printValueOn(st);
-  }
-
-  public void printMethodValueOn(ciMethod method, PrintStream st) {
-    method.printValueOn(st);
-  }
-
-  private byte[] fetchDataAt(Address base, long size) {
-    byte[] result = new byte[(int)size];
-    for (int i = 0; i < size; i++) {
-      result[i] = base.getJByteAt(i);
-    }
-    return result;
-  }
-
-  public byte[] orig() {
-    // fetch the orig MethodData data between header and dataSize
-    Address base = getAddress().addOffsetTo(origField.getOffset());
-    byte[] result = new byte[(int)origField.getType().getSize()];
-    for (int i = 0; i < result.length; i++) {
-      result[i] = base.getJByteAt(i);
-    }
-    return result;
-  }
-
-  public  long[] data() {
-    // Read the data as an array of intptr_t elements
-    Address base = dataField.getValue(getAddress());
-    int elements = (dataSize() + extraDataSize()) / MethodData.cellSize;
-    long[] result = new long[elements];
-    for (int i = 0; i < elements; i++) {
-      Address value = base.getAddressAt(i * MethodData.cellSize);
-      if (value != null) {
-        result[i] = value.minus(null);
-      }
-    }
-    return result;
-  }
-
-  int dataSize() {
-    return (int)dataSizeField.getValue(getAddress());
-  }
-
-  int extraDataSize() {
-    return (int)extraDataSizeField.getValue(getAddress());
-  }
-
-  int state() {
-    return (int)stateField.getValue(getAddress());
-  }
-
-  int currentMileage() {
-    return 0;
-  }
-
-  boolean outOfBounds(int dataIndex) {
-    return dataIndex >= dataSize();
-  }
-
-  ParametersTypeData<ciKlass,ciMethod> parametersTypeData() {
-    int di = (int)parametersTypeDataDi.getValue(getMetadata().getAddress());
-    if (di == -1 || di == -2) {
-      return null;
-    }
-    DataLayout dataLayout = new DataLayout(dataField.getValue(getAddress()), di);
-    return new ParametersTypeData<ciKlass,ciMethod>(this, dataLayout);
-  }
-
-  ProfileData dataAt(int dataIndex) {
-    if (outOfBounds(dataIndex)) {
-      return null;
-    }
-    DataLayout dataLayout = new DataLayout(dataField.getValue(getAddress()), dataIndex);
-
-    switch (dataLayout.tag()) {
-    case DataLayout.noTag:
-    default:
-      throw new InternalError();
-    case DataLayout.bitDataTag:
-      return new BitData(dataLayout);
-    case DataLayout.counterDataTag:
-      return new CounterData(dataLayout);
-    case DataLayout.jumpDataTag:
-      return new JumpData(dataLayout);
-    case DataLayout.receiverTypeDataTag:
-      return new ReceiverTypeData<ciKlass,ciMethod>(this, dataLayout);
-    case DataLayout.virtualCallDataTag:
-      return new VirtualCallData<ciKlass,ciMethod>(this, dataLayout);
-    case DataLayout.retDataTag:
-      return new RetData(dataLayout);
-    case DataLayout.branchDataTag:
-      return new BranchData(dataLayout);
-    case DataLayout.multiBranchDataTag:
-      return new MultiBranchData(dataLayout);
-    case DataLayout.callTypeDataTag:
-      return new CallTypeData<ciKlass,ciMethod>(this, dataLayout);
-    case DataLayout.virtualCallTypeDataTag:
-      return new VirtualCallTypeData<ciKlass,ciMethod>(this, dataLayout);
-    case DataLayout.parametersTypeDataTag:
-      return new ParametersTypeData<ciKlass,ciMethod>(this, dataLayout);
-    }
-  }
-
-  int dpToDi(int dp) {
-    return dp;
-  }
-
-  int firstDi() { return 0; }
-  ProfileData firstData() { return dataAt(firstDi()); }
-  ProfileData nextData(ProfileData current) {
-    int currentIndex = dpToDi(current.dp());
-    int nextIndex = currentIndex + current.sizeInBytes();
-    return dataAt(nextIndex);
-  }
-  boolean isValid(ProfileData current) { return current != null; }
-
-  DataLayout limitDataPosition() {
-    return new DataLayout(dataField.getValue(getAddress()), dataSize());
-  }
-  DataLayout extraDataBase() {
-    return limitDataPosition();
-  }
-  DataLayout extraDataLimit() {
-    return new DataLayout(dataField.getValue(getAddress()), dataSize() + extraDataSize());
-  }
-  DataLayout nextExtra(DataLayout dataLayout) {
-    return new DataLayout(dataField.getValue(getAddress()), dataLayout.dp() + DataLayout.computeSizeInBytes(MethodData.extraNbCells(dataLayout)));
-  }
-
-  public void printDataOn(PrintStream st) {
-    if (parametersTypeData() != null) {
-      parametersTypeData().printDataOn(st);
-    }
-    ProfileData data = firstData();
-    for ( ; isValid(data); data = nextData(data)) {
-      st.print(dpToDi(data.dp()));
-      st.print(" ");
-      // st->fillTo(6);
-      data.printDataOn(st);
-    }
-    st.println("--- Extra data:");
-    DataLayout dp    = extraDataBase();
-    DataLayout end   = extraDataLimit();
-    for (;; dp = nextExtra(dp)) {
-      switch(dp.tag()) {
-      case DataLayout.noTag:
-        continue;
-      case DataLayout.bitDataTag:
-        data = new BitData(dp);
-        break;
-      case DataLayout.speculativeTrapDataTag:
-        data = new SpeculativeTrapData<ciKlass,ciMethod>(this, dp);
-        break;
-      case DataLayout.argInfoDataTag:
-        data = new ArgInfoData(dp);
-        dp = end; // ArgInfoData is at the end of extra data section.
-        break;
-      default:
-        throw new InternalError("unexpected tag " +  dp.tag());
-      }
-      st.print(dpToDi(data.dp()));
-      st.print(" ");
-      data.printDataOn(st);
-      if (dp == end) return;
-    }
-  }
-
-  int dumpReplayDataTypeHelper(PrintStream out, int round, int count, int index, ProfileData pdata, ciKlass k) {
-    if (k != null) {
-      if (round == 0) count++;
-      else out.print(" " + ((pdata.dp() + pdata.cellOffset(index)) / MethodData.cellSize) + " " + k.name());
-    }
-    return count;
-  }
-
-  int dumpReplayDataReceiverTypeHelper(PrintStream out, int round, int count, ReceiverTypeData<ciKlass,ciMethod> vdata) {
-    for (int i = 0; i < vdata.rowLimit(); i++) {
-      ciKlass k = vdata.receiver(i);
-      count = dumpReplayDataTypeHelper(out, round, count, vdata.receiverCellIndex(i), vdata, k);
-    }
-    return count;
-  }
-
-  int dumpReplayDataCallTypeHelper(PrintStream out, int round, int count, CallTypeDataInterface<ciKlass> callTypeData) {
-    if (callTypeData.hasArguments()) {
-      for (int i = 0; i < callTypeData.numberOfArguments(); i++) {
-        count = dumpReplayDataTypeHelper(out, round, count, callTypeData.argumentTypeIndex(i), (ProfileData)callTypeData, callTypeData.argumentType(i));
-      }
-    }
-    if (callTypeData.hasReturn()) {
-      count = dumpReplayDataTypeHelper(out, round, count, callTypeData.returnTypeIndex(), (ProfileData)callTypeData, callTypeData.returnType());
-    }
-    return count;
-  }
-
-  int dumpReplayDataExtraDataHelper(PrintStream out, int round, int count) {
-    DataLayout dp    = extraDataBase();
-    DataLayout end   = extraDataLimit();
-
-    for (;dp != end; dp = nextExtra(dp)) {
-      switch(dp.tag()) {
-      case DataLayout.noTag:
-      case DataLayout.argInfoDataTag:
-        return count;
-      case DataLayout.bitDataTag:
-        break;
-      case DataLayout.speculativeTrapDataTag: {
-        SpeculativeTrapData<ciKlass,ciMethod> data = new SpeculativeTrapData<ciKlass,ciMethod>(this, dp);
-        ciMethod m = data.method();
-        if (m != null) {
-          if (round == 0) {
-            count++;
-          } else {
-            out.print(" " +  (dpToDi(data.dp() + data.cellOffset(SpeculativeTrapData.methodIndex())) / MethodData.cellSize) + " " +  m.nameAsAscii());
-          }
-        }
-        break;
-      }
-      default:
-        throw new InternalError("bad tag "  + dp.tag());
-      }
-    }
-    return count;
-  }
-
-  public void dumpReplayData(PrintStream out) {
-    MethodData mdo = (MethodData)getMetadata();
-    Method method = mdo.getMethod();
-    out.print("ciMethodData " +
-              method.nameAsAscii() + " " +
-              state() + " " + currentMileage());
-    byte[] orig = orig();
-    out.print(" orig " + orig.length);
-    for (int i = 0; i < orig.length; i++) {
-      out.print(" " + (orig[i] & 0xff));
-    }
-
-    long[] data = data();
-    out.print(" data " +  data.length);
-    for (int i = 0; i < data.length; i++) {
-      out.print(" 0x" + Long.toHexString(data[i]));
-    }
-    int count = 0;
-    ParametersTypeData<ciKlass,ciMethod> parameters = parametersTypeData();
-    for (int round = 0; round < 2; round++) {
-      if (round == 1) out.print(" oops " + count);
-      ProfileData pdata = firstData();
-      for ( ; isValid(pdata); pdata = nextData(pdata)) {
-        if (pdata instanceof ReceiverTypeData) {
-          @SuppressWarnings("unchecked")
-          ReceiverTypeData<ciKlass,ciMethod> receiverTypeData = (ReceiverTypeData<ciKlass,ciMethod>)pdata;
-          count = dumpReplayDataReceiverTypeHelper(out, round, count, receiverTypeData);
-        }
-        if (pdata instanceof CallTypeDataInterface) {
-          @SuppressWarnings("unchecked")
-          CallTypeDataInterface<ciKlass> callTypeData = (CallTypeDataInterface<ciKlass>)pdata;
-          count = dumpReplayDataCallTypeHelper(out, round, count, callTypeData);
-        }
-      }
-      if (parameters != null) {
-        for (int i = 0; i < parameters.numberOfParameters(); i++) {
-          count = dumpReplayDataTypeHelper(out, round, count, ParametersTypeData.typeIndex(i), parameters, parameters.type(i));
-        }
-      }
-    }
-    count = 0;
-    for (int round = 0; round < 2; round++) {
-      if (round == 1) out.print(" methods " + count);
-      count = dumpReplayDataExtraDataHelper(out, round, count);
-    }
-    out.println();
-  }
-}
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ci/ciObjArrayKlass.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ci/ciObjArrayKlass.java
deleted file mode 100644
index ce87a98dd20..00000000000
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ci/ciObjArrayKlass.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Copyright (c) 2011, 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.ci;
-
-import java.io.PrintStream;
-import java.util.*;
-import sun.jvm.hotspot.debugger.*;
-import sun.jvm.hotspot.runtime.*;
-import sun.jvm.hotspot.oops.*;
-import sun.jvm.hotspot.types.*;
-import sun.jvm.hotspot.utilities.Observable;
-import sun.jvm.hotspot.utilities.Observer;
-
-public class ciObjArrayKlass extends ciArrayKlass {
-  static {
-    VM.registerVMInitializedObserver(new Observer() {
-        public void update(Observable o, Object data) {
-          initialize(VM.getVM().getTypeDataBase());
-        }
-      });
-  }
-
-  private static synchronized void initialize(TypeDataBase db) throws WrongTypeException {
-    Type type      = db.lookupType("ciObjArrayKlass");
-    elementKlassField = type.getAddressField("_element_klass");
-    baseElementKlassField = type.getAddressField("_base_element_klass");
-  }
-
-  private static AddressField elementKlassField;
-  private static AddressField baseElementKlassField;
-
-  public ciObjArrayKlass(Address addr) {
-    super(addr);
-  }
-}
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ci/ciObject.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ci/ciObject.java
deleted file mode 100644
index 0d462ce85dc..00000000000
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ci/ciObject.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Copyright (c) 2011, 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.ci;
-
-import java.io.*;
-import java.util.*;
-import sun.jvm.hotspot.debugger.*;
-import sun.jvm.hotspot.runtime.*;
-import sun.jvm.hotspot.oops.*;
-import sun.jvm.hotspot.types.*;
-import sun.jvm.hotspot.utilities.Observable;
-import sun.jvm.hotspot.utilities.Observer;
-
-public class ciObject extends ciBaseObject {
-  static {
-    VM.registerVMInitializedObserver(new Observer() {
-        public void update(Observable o, Object data) {
-          initialize(VM.getVM().getTypeDataBase());
-        }
-      });
-  }
-
-  private static synchronized void initialize(TypeDataBase db) throws WrongTypeException {
-    Type type      = db.lookupType("ciObject");
-    klassField = type.getAddressField("_klass");
-    handleField = type.getAddressField("_handle");
-  }
-
-  private static AddressField klassField;
-  private static AddressField handleField;
-
-  public Oop getOop() {
-    OopHandle oh =  handleField.getValue(getAddress()).getOopHandleAt(0);
-    return VM.getVM().getObjectHeap().newOop(oh);
-  }
-
-  public ciObject(Address addr) {
-    super(addr);
-  }
-
-  public void printOn(PrintStream out) {
-    getOop().printValueOn(out);
-    out.println();
-  }
-
-  public String toString() {
-    return getOop().toString();
-  }
-}
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ci/ciObjectFactory.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ci/ciObjectFactory.java
deleted file mode 100644
index 3de3ba908b2..00000000000
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ci/ciObjectFactory.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- * Copyright (c) 2011, 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.ci;
-
-import java.lang.reflect.Constructor;
-import java.util.*;
-import sun.jvm.hotspot.debugger.*;
-import sun.jvm.hotspot.runtime.*;
-import sun.jvm.hotspot.utilities.*;
-import sun.jvm.hotspot.oops.*;
-import sun.jvm.hotspot.types.*;
-import sun.jvm.hotspot.utilities.Observable;
-import sun.jvm.hotspot.utilities.Observer;
-
-public class ciObjectFactory extends VMObject {
-  static {
-    VM.registerVMInitializedObserver(new Observer() {
-        public void update(Observable o, Object data) {
-          initialize(VM.getVM().getTypeDataBase());
-        }
-      });
-  }
-
-  private static synchronized void initialize(TypeDataBase db) throws WrongTypeException {
-    Type type      = db.lookupType("ciObjectFactory");
-    ciMetadataField = type.getAddressField("_ci_metadata");
-    symbolsField = type.getAddressField("_symbols");
-
-    ciObjectConstructor = new VirtualBaseConstructor<ciObject>(db, db.lookupType("ciObject"), "sun.jvm.hotspot.ci", ciObject.class);
-    ciMetadataConstructor = new VirtualBaseConstructor<ciMetadata>(db, db.lookupType("ciMetadata"), "sun.jvm.hotspot.ci", ciMetadata.class);
-    ciSymbolConstructor = new VirtualBaseConstructor<ciSymbol>(db, db.lookupType("ciSymbol"), "sun.jvm.hotspot.ci", ciSymbol.class);
-  }
-
-  private static AddressField ciMetadataField;
-  private static AddressField symbolsField;
-
-  private static VirtualBaseConstructor<ciObject> ciObjectConstructor;
-  private static VirtualBaseConstructor<ciMetadata> ciMetadataConstructor;
-  private static VirtualBaseConstructor<ciSymbol> ciSymbolConstructor;
-
-  public static ciObject get(Address addr) {
-    if (addr == null) return null;
-
-    return ciObjectConstructor.instantiateWrapperFor(addr);
-  }
-
-  public static ciMetadata getMetadata(Address addr) {
-    if (addr == null) return null;
-
-    return ciMetadataConstructor.instantiateWrapperFor(addr);
-  }
-
-  public GrowableArray<ciMetadata> objects() {
-    Address addr = getAddress().addOffsetTo(ciMetadataField.getOffset());
-    return GrowableArray.create(addr, ciMetadataConstructor);
-  }
-
-  public GrowableArray<ciSymbol> symbols() {
-    Address addr = getAddress().addOffsetTo(symbolsField.getOffset());
-    return GrowableArray.create(addr, ciSymbolConstructor);
-  }
-
-  public ciObjectFactory(Address addr) {
-    super(addr);
-  }
-}
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ci/ciSymbol.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ci/ciSymbol.java
deleted file mode 100644
index b9f5bcce6fb..00000000000
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ci/ciSymbol.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Copyright (c) 2011, 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.ci;
-
-import java.io.PrintStream;
-import java.util.*;
-import sun.jvm.hotspot.debugger.*;
-import sun.jvm.hotspot.runtime.*;
-import sun.jvm.hotspot.oops.*;
-import sun.jvm.hotspot.types.*;
-import sun.jvm.hotspot.utilities.Observable;
-import sun.jvm.hotspot.utilities.Observer;
-
-public class ciSymbol extends ciMetadata {
-  static {
-    VM.registerVMInitializedObserver(new Observer() {
-        public void update(Observable o, Object data) {
-          initialize(VM.getVM().getTypeDataBase());
-        }
-      });
-  }
-
-  private static synchronized void initialize(TypeDataBase db) throws WrongTypeException {
-    Type type = db.lookupType("ciSymbol");
-    symbolField = type.getAddressField("_symbol");
-  }
-
-  private static AddressField symbolField;
-
-  public String asUtf88() {
-    Symbol sym = Symbol.create(symbolField.getValue(getAddress()));
-    return sym.asString();
-  }
-
-  public ciSymbol(Address addr) {
-    super(addr);
-  }
-}
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ci/ciType.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ci/ciType.java
deleted file mode 100644
index 656b2e56479..00000000000
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ci/ciType.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright (c) 2011, 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.ci;
-
-import java.util.*;
-import sun.jvm.hotspot.debugger.*;
-import sun.jvm.hotspot.runtime.*;
-import sun.jvm.hotspot.oops.*;
-import sun.jvm.hotspot.types.*;
-import sun.jvm.hotspot.utilities.Observable;
-import sun.jvm.hotspot.utilities.Observer;
-
-public class ciType extends ciMetadata {
-  static {
-    VM.registerVMInitializedObserver(new Observer() {
-        public void update(Observable o, Object data) {
-          initialize(VM.getVM().getTypeDataBase());
-        }
-      });
-  }
-
-  private static synchronized void initialize(TypeDataBase db) throws WrongTypeException {
-    Type type      = db.lookupType("ciType");
-    basicTypeField = new CIntField(type.getCIntegerField("_basic_type"), 0);
-  }
-
-  private static CIntField basicTypeField;
-
-  public ciType(Address addr) {
-    super(addr);
-  }
-}
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ci/ciTypeArrayKlass.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ci/ciTypeArrayKlass.java
deleted file mode 100644
index 43f546a5da0..00000000000
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ci/ciTypeArrayKlass.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright (c) 2011, 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.ci;
-
-import java.io.PrintStream;
-import java.util.*;
-import sun.jvm.hotspot.debugger.*;
-import sun.jvm.hotspot.runtime.*;
-import sun.jvm.hotspot.oops.*;
-import sun.jvm.hotspot.types.*;
-import sun.jvm.hotspot.utilities.Observable;
-import sun.jvm.hotspot.utilities.Observer;
-
-public class ciTypeArrayKlass extends ciArrayKlass {
-  static {
-    VM.registerVMInitializedObserver(new Observer() {
-        public void update(Observable o, Object data) {
-          initialize(VM.getVM().getTypeDataBase());
-        }
-      });
-  }
-
-  private static synchronized void initialize(TypeDataBase db) throws WrongTypeException {
-    Type type      = db.lookupType("ciTypeArrayKlass");
-  }
-
-  public ciTypeArrayKlass(Address addr) {
-    super(addr);
-  }
-}
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/CodeBlob.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/CodeBlob.java
index b401f3656f9..a085edf9936 100644
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/CodeBlob.java
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/CodeBlob.java
@@ -65,8 +65,6 @@ public class CodeBlob extends VMObject {
     super(addr);
   }
 
-  protected static       int     matcherInterpreterFramePointerReg;
-
   private static void initialize(TypeDataBase db) {
     Type type = db.lookupType("CodeBlob");
 
@@ -83,11 +81,6 @@ public class CodeBlob extends VMObject {
     oopMapsField             = type.getAddressField("_oop_maps");
     callerMustGCArgumentsField = type.getCIntegerField("_caller_must_gc_arguments");
 
-    if (VM.getVM().isServerCompiler()) {
-      matcherInterpreterFramePointerReg =
-          db.lookupIntConstant("Matcher::interpreter_frame_pointer_reg").intValue();
-    }
-
     NMethodKind        = db.lookupIntConstant("CodeBlobKind::Nmethod").intValue();
     RuntimeStubKind    = db.lookupIntConstant("CodeBlobKind::RuntimeStub").intValue();
     UpcallKind         = db.lookupIntConstant("CodeBlobKind::Upcall").intValue();
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/NMethod.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/NMethod.java
index 8cd2342750d..44d51b005ae 100644
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/NMethod.java
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/NMethod.java
@@ -489,42 +489,6 @@ public class NMethod extends CodeBlob {
            method.getSignature().asString();
   }
 
-  public void dumpReplayData(PrintStream out) {
-    HashMap<Metadata, Metadata> h = new HashMap<>();
-    for (int i = 1; i < getMetadataLength(); i++) {
-      Metadata meta = Metadata.instantiateWrapperFor(getMetadataAt(i));
-      System.err.println(meta);
-      if (h.get(meta) != null) continue;
-      h.put(meta, meta);
-      if (meta instanceof InstanceKlass) {
-        meta.dumpReplayData(out);
-      } else if (meta instanceof Method) {
-        meta.dumpReplayData(out);
-        MethodData mdo = ((Method)meta).getMethodData();
-        if (mdo != null) {
-          mdo.dumpReplayData(out);
-        }
-      }
-    }
-    Method method = getMethod();
-    if (h.get(method) == null) {
-      method.dumpReplayData(out);
-      MethodData mdo = method.getMethodData();
-      if (mdo != null) {
-        mdo.dumpReplayData(out);
-      }
-    }
-    if (h.get(method.getMethodHolder()) == null) {
-      method.getMethodHolder().dumpReplayData(out);
-    }
-    Klass holder = method.getMethodHolder();
-    out.println("compile " + holder.getName().asString() + " " +
-                OopUtilities.escapeString(method.getName().asString()) + " " +
-                method.getSignature().asString() + " " +
-                getEntryBCI() + " " + getCompLevel());
-
-  }
-
   //--------------------------------------------------------------------------------
   // Internals only below this point
   //
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/compiler/CompileTask.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/compiler/CompileTask.java
index 7b5fba44bc2..e54facaeb72 100644
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/compiler/CompileTask.java
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/compiler/CompileTask.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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.util.*;
 import sun.jvm.hotspot.debugger.*;
 import sun.jvm.hotspot.runtime.*;
 import sun.jvm.hotspot.oops.*;
-import sun.jvm.hotspot.opto.*;
 import sun.jvm.hotspot.prims.JvmtiExport;
 import sun.jvm.hotspot.types.*;
 import sun.jvm.hotspot.utilities.Observable;
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/InstanceKlass.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/InstanceKlass.java
index 05d511d422f..0cd743372d5 100644
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/InstanceKlass.java
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/InstanceKlass.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -965,84 +965,4 @@ public class InstanceKlass extends Klass {
     }
     return -1;
   }
-
-  public void dumpReplayData(PrintStream out) {
-    ConstantPool cp = getConstants();
-
-    // Try to record related loaded classes
-    Klass sub = getSubklassKlass();
-    while (sub != null) {
-        if (sub instanceof InstanceKlass) {
-            out.println("instanceKlass " + sub.getName().asString());
-        }
-        sub = sub.getNextSiblingKlass();
-    }
-
-    final int length = cp.getLength();
-    out.print("ciInstanceKlass " + getName().asString() + " " + (isLinked() ? 1 : 0) + " " + (isInitialized() ? 1 : 0) + " " + length);
-    for (int index = 1; index < length; index++) {
-      out.print(" " + cp.getTags().at(index));
-    }
-    out.println();
-    if (isInitialized()) {
-      Field[] staticFields = getStaticFields();
-      for (int i = 0; i < staticFields.length; i++) {
-        Field f = staticFields[i];
-        Oop mirror = getJavaMirror();
-        if (f.isFinal() && !f.hasInitialValue()) {
-          out.print("staticfield " + getName().asString() + " " +
-                    OopUtilities.escapeString(f.getID().getName()) + " " +
-                    f.getFieldType().getSignature().asString() + " ");
-          if (f instanceof ByteField) {
-            ByteField bf = (ByteField)f;
-            out.println(bf.getValue(mirror));
-          } else if (f instanceof BooleanField) {
-            BooleanField bf = (BooleanField)f;
-            out.println(bf.getValue(mirror) ? 1 : 0);
-          } else if (f instanceof ShortField) {
-            ShortField bf = (ShortField)f;
-            out.println(bf.getValue(mirror));
-          } else if (f instanceof CharField) {
-            CharField bf = (CharField)f;
-            out.println(bf.getValue(mirror) & 0xffff);
-          } else if (f instanceof IntField) {
-            IntField bf = (IntField)f;
-            out.println(bf.getValue(mirror));
-          } else  if (f instanceof LongField) {
-            LongField bf = (LongField)f;
-            out.println(bf.getValue(mirror));
-          } else if (f instanceof FloatField) {
-            FloatField bf = (FloatField)f;
-            out.println(Float.floatToRawIntBits(bf.getValue(mirror)));
-          } else if (f instanceof DoubleField) {
-            DoubleField bf = (DoubleField)f;
-            out.println(Double.doubleToRawLongBits(bf.getValue(mirror)));
-          } else if (f instanceof OopField) {
-            OopField bf = (OopField)f;
-
-            Oop value = bf.getValue(mirror);
-            if (value == null) {
-              out.println("null");
-            } else if (value.isInstance()) {
-              Instance inst = (Instance)value;
-              if (inst.isA(SystemDictionary.getStringKlass())) {
-                out.println("\"" + OopUtilities.stringOopToEscapedString(inst) + "\"");
-              } else {
-                out.println(inst.getKlass().getName().asString());
-              }
-            } else if (value.isObjArray()) {
-              ObjArray oa = (ObjArray)value;
-              Klass ek = (ObjArrayKlass)oa.getKlass();
-              out.println(oa.getLength() + " " + ek.getName().asString());
-            } else if (value.isTypeArray()) {
-              TypeArray ta = (TypeArray)value;
-              out.println(ta.getLength());
-            } else {
-              out.println(value);
-            }
-          }
-        }
-      }
-    }
-  }
 }
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/Metadata.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/Metadata.java
index ece6bf157b7..dfbd67ae805 100644
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/Metadata.java
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/Metadata.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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 abstract class Metadata extends VMObject {
   }
 
   public abstract void printValueOn(PrintStream tty);
-  public void dumpReplayData(PrintStream out) {
-      out.println("# Unknown Metadata");
-  }
 
   public boolean isShared() {
     VM vm = VM.getVM();
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/Method.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/Method.java
index ca7329ad6c9..75dec8edbd1 100644
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/Method.java
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/Method.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -348,22 +348,6 @@ public class Method extends Metadata {
     return buf.toString().replace('/', '.');
   }
 
-  public void dumpReplayData(PrintStream out) {
-      NMethod nm = getNativeMethod();
-      int code_size = 0;
-      if (nm != null) {
-        code_size = (int)nm.codeEnd().minus(nm.getVerifiedEntryPoint());
-      }
-      Klass holder = getMethodHolder();
-      out.println("ciMethod " +
-                  nameAsAscii() + " " +
-                  getInvocationCount() + " " +
-                  getBackedgeCount() + " " +
-                  interpreterInvocationCount() + " " +
-                  interpreterThrowoutCount() + " " +
-                  code_size);
-  }
-
   public int interpreterThrowoutCount() {
     return getMethodCounters().interpreterThrowoutCount();
   }
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/MethodData.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/MethodData.java
index 0c05cabe32d..a7c2e2bccb7 100644
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/MethodData.java
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/MethodData.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -439,111 +439,4 @@ public class MethodData extends Metadata implements MethodDataInterface<Klass,Me
     return 20000;
   }
 
-  int dumpReplayDataTypeHelper(PrintStream out, int round, int count, int index, ProfileData pdata, Klass k) {
-    if (k != null) {
-      if (round == 0) count++;
-      else out.print(" " +
-                     (dpToDi(pdata.dp() +
-                             pdata.cellOffset(index)) / cellSize) + " " +
-                     k.getName().asString());
-    }
-    return count;
-  }
-
-  int dumpReplayDataReceiverTypeHelper(PrintStream out, int round, int count, ReceiverTypeData<Klass,Method> vdata) {
-    for (int i = 0; i < vdata.rowLimit(); i++) {
-      Klass k = vdata.receiver(i);
-      count = dumpReplayDataTypeHelper(out, round, count, vdata.receiverCellIndex(i), vdata, k);
-    }
-    return count;
-  }
-
-  int dumpReplayDataCallTypeHelper(PrintStream out, int round, int count, CallTypeDataInterface<Klass> callTypeData) {
-    if (callTypeData.hasArguments()) {
-      for (int i = 0; i < callTypeData.numberOfArguments(); i++) {
-        count = dumpReplayDataTypeHelper(out, round, count, callTypeData.argumentTypeIndex(i), (ProfileData)callTypeData, callTypeData.argumentType(i));
-      }
-    }
-    if (callTypeData.hasReturn()) {
-      count = dumpReplayDataTypeHelper(out, round, count, callTypeData.returnTypeIndex(), (ProfileData)callTypeData, callTypeData.returnType());
-    }
-    return count;
-  }
-
-  int dumpReplayDataExtraDataHelper(PrintStream out, int round, int count) {
-    DataLayout dp    = extraDataBase();
-    DataLayout end   = extraDataLimit();
-
-    for (;dp != end; dp = nextExtra(dp)) {
-      switch(dp.tag()) {
-      case DataLayout.noTag:
-      case DataLayout.argInfoDataTag:
-        return count;
-      case DataLayout.bitDataTag:
-        break;
-      case DataLayout.speculativeTrapDataTag: {
-        SpeculativeTrapData<Klass,Method> data = new SpeculativeTrapData<Klass,Method>(this, dp);
-        Method m = data.method();
-        if (m != null) {
-          if (round == 0) {
-            count++;
-          } else {
-            out.print(" " +  (dpToDi(data.dp() + data.cellOffset(SpeculativeTrapData.methodIndex())) / cellSize) + " " +  m.nameAsAscii());
-          }
-        }
-        break;
-      }
-      default:
-        throw new InternalError("bad tag "  + dp.tag());
-      }
-    }
-    return count;
-  }
-
-  public void dumpReplayData(PrintStream out) {
-    Method method = getMethod();
-    out.print("ciMethodData " + method.nameAsAscii()
-              + " " + "2" + " " +
-              currentMileage());
-    byte[] orig = orig();
-    out.print(" orig " + orig.length);
-    for (int i = 0; i < orig.length; i++) {
-      out.print(" " + (orig[i] & 0xff));
-    }
-
-    long[] data = data();
-    out.print(" data " +  data.length);
-    for (int i = 0; i < data.length; i++) {
-      out.print(" 0x" + Long.toHexString(data[i]));
-    }
-    int count = 0;
-    ParametersTypeData<Klass,Method> parameters = parametersTypeData();
-    for (int round = 0; round < 2; round++) {
-      if (round == 1) out.print(" oops " + count);
-      ProfileData pdata = firstData();
-      for ( ; isValid(pdata); pdata = nextData(pdata)) {
-        if (pdata instanceof ReceiverTypeData) {
-          @SuppressWarnings("unchecked")
-          ReceiverTypeData<Klass,Method> receiverTypeData = (ReceiverTypeData<Klass,Method>)pdata;
-          count = dumpReplayDataReceiverTypeHelper(out, round, count, receiverTypeData);
-        }
-        if (pdata instanceof CallTypeDataInterface) {
-          @SuppressWarnings("unchecked")
-          CallTypeDataInterface<Klass> callTypeData = (CallTypeDataInterface<Klass>)pdata;
-          count = dumpReplayDataCallTypeHelper(out, round, count, callTypeData);
-        }
-      }
-      if (parameters != null) {
-        for (int i = 0; i < parameters.numberOfParameters(); i++) {
-          count = dumpReplayDataTypeHelper(out, round, count, ParametersTypeData.typeIndex(i), parameters, parameters.type(i));
-        }
-      }
-    }
-    count = 0;
-    for (int round = 0; round < 2; round++) {
-      if (round == 1) out.print(" methods " + count);
-      count = dumpReplayDataExtraDataHelper(out, round, count);
-    }
-    out.println();
-  }
 }
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/Block.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/Block.java
deleted file mode 100644
index 857e6da9bf8..00000000000
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/Block.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * Copyright (c) 2011, 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.opto;
-
-import java.util.*;
-import java.io.PrintStream;
-import sun.jvm.hotspot.debugger.*;
-import sun.jvm.hotspot.runtime.*;
-import sun.jvm.hotspot.oops.*;
-import sun.jvm.hotspot.types.*;
-import sun.jvm.hotspot.utilities.Observable;
-import sun.jvm.hotspot.utilities.Observer;
-
-public class Block extends VMObject {
-  static {
-    VM.registerVMInitializedObserver(new Observer() {
-        public void update(Observable o, Object data) {
-          initialize(VM.getVM().getTypeDataBase());
-        }
-      });
-  }
-
-  private static synchronized void initialize(TypeDataBase db) throws WrongTypeException {
-    Type type      = db.lookupType("Block");
-    nodesField = type.getAddressField("_nodes");
-    succsField = type.getAddressField("_succs");
-    numSuccsField = new CIntField(type.getCIntegerField("_num_succs"), 0);
-    preOrderField = new CIntField(type.getCIntegerField("_pre_order"), 0);
-    domDepthField = new CIntField(type.getCIntegerField("_dom_depth"), 0);
-    idomField = type.getAddressField("_idom");
-    freqField = type.getJDoubleField("_freq");
-  }
-
-  private static AddressField nodesField;
-  private static AddressField succsField;
-  private static CIntField numSuccsField;
-  private static CIntField preOrderField;
-  private static CIntField domDepthField;
-  private static AddressField idomField;
-  private static JDoubleField freqField;
-
-  public Block(Address addr) {
-    super(addr);
-  }
-
-  public int preOrder() {
-    return (int)preOrderField.getValue(getAddress());
-  }
-
-  public double freq() {
-    return freqField.getValue(getAddress());
-  }
-
-  public Node_List nodes() {
-    return new Node_List(getAddress().addOffsetTo(nodesField.getOffset()));
-  }
-
-  public void dump(PrintStream out) {
-    out.print("B" + preOrder());
-    out.print(" Freq: " + freq());
-    out.println();
-    Node_List nl = nodes();
-    int cnt = nl.size();
-    for( int i=0; i<cnt; i++ )
-      nl.at(i).dump(out);
-    out.print("\n");
-  }
-}
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/Block_Array.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/Block_Array.java
deleted file mode 100644
index fe6d6072129..00000000000
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/Block_Array.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Copyright (c) 2011, 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.opto;
-
-import java.util.*;
-import sun.jvm.hotspot.debugger.*;
-import sun.jvm.hotspot.runtime.*;
-import sun.jvm.hotspot.oops.*;
-import sun.jvm.hotspot.types.*;
-import sun.jvm.hotspot.utilities.Observable;
-import sun.jvm.hotspot.utilities.Observer;
-
-public class Block_Array extends VMObject {
-  static {
-    VM.registerVMInitializedObserver(new Observer() {
-        public void update(Observable o, Object data) {
-          initialize(VM.getVM().getTypeDataBase());
-        }
-      });
-  }
-
-  private static synchronized void initialize(TypeDataBase db) throws WrongTypeException {
-    Type type      = db.lookupType("Block_Array");
-    sizeField = new CIntField(type.getCIntegerField("_size"), 0);
-    blocksField = type.getAddressField("_blocks");
-    arenaField = type.getAddressField("_arena");
-  }
-
-  private static CIntField sizeField;
-  private static AddressField blocksField;
-  private static AddressField arenaField;
-
-  public Block_Array(Address addr) {
-    super(addr);
-  }
-
-  public int Max() {
-    return (int) sizeField.getValue(getAddress());
-  }
-
-  public Block at(int i) {
-    return new Block(blocksField.getValue(getAddress()).getAddressAt(i * (int)VM.getVM().getAddressSize()));
-  }
-}
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/Block_List.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/Block_List.java
deleted file mode 100644
index ee10e6f6243..00000000000
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/Block_List.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Copyright (c) 2011, 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.opto;
-
-import java.util.*;
-import sun.jvm.hotspot.debugger.*;
-import sun.jvm.hotspot.runtime.*;
-import sun.jvm.hotspot.oops.*;
-import sun.jvm.hotspot.types.*;
-import sun.jvm.hotspot.utilities.Observable;
-import sun.jvm.hotspot.utilities.Observer;
-
-public class Block_List extends Block_Array {
-  static {
-    VM.registerVMInitializedObserver(new Observer() {
-        public void update(Observable o, Object data) {
-          initialize(VM.getVM().getTypeDataBase());
-        }
-      });
-  }
-
-  private static synchronized void initialize(TypeDataBase db) throws WrongTypeException {
-    Type type      = db.lookupType("Block_List");
-    cntField = new CIntField(type.getCIntegerField("_cnt"), 0);
-  }
-
-  private static CIntField cntField;
-
-  public Block_List(Address addr) {
-    super(addr);
-  }
-
-  public int size() {
-    return (int) cntField.getValue(getAddress());
-  }
-}
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/CallDynamicJavaNode.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/CallDynamicJavaNode.java
deleted file mode 100644
index 39f1a05f0d1..00000000000
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/CallDynamicJavaNode.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright (c) 2011, 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.opto;
-
-import java.util.*;
-import sun.jvm.hotspot.debugger.*;
-import sun.jvm.hotspot.runtime.*;
-import sun.jvm.hotspot.oops.*;
-import sun.jvm.hotspot.types.*;
-import sun.jvm.hotspot.utilities.Observable;
-import sun.jvm.hotspot.utilities.Observer;
-
-public class CallDynamicJavaNode extends CallJavaNode {
-  static {
-    VM.registerVMInitializedObserver(new Observer() {
-        public void update(Observable o, Object data) {
-          initialize(VM.getVM().getTypeDataBase());
-        }
-      });
-  }
-
-  private static synchronized void initialize(TypeDataBase db) throws WrongTypeException {
-    Type type      = db.lookupType("CallDynamicJavaNode");
-  }
-
-
-  public CallDynamicJavaNode(Address addr) {
-    super(addr);
-  }
-}
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/CallJavaNode.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/CallJavaNode.java
deleted file mode 100644
index 9e330a923d3..00000000000
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/CallJavaNode.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Copyright (c) 2011, 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.opto;
-
-import java.util.*;
-import java.io.*;
-import sun.jvm.hotspot.code.*;
-import sun.jvm.hotspot.debugger.*;
-import sun.jvm.hotspot.runtime.*;
-import sun.jvm.hotspot.oops.*;
-import sun.jvm.hotspot.ci.*;
-import sun.jvm.hotspot.types.*;
-import sun.jvm.hotspot.utilities.Observable;
-import sun.jvm.hotspot.utilities.Observer;
-
-public class CallJavaNode extends CallNode {
-  static {
-    VM.registerVMInitializedObserver(new Observer() {
-        public void update(Observable o, Object data) {
-          initialize(VM.getVM().getTypeDataBase());
-        }
-      });
-  }
-
-  private static synchronized void initialize(TypeDataBase db) throws WrongTypeException {
-    Type type      = db.lookupType("CallJavaNode");
-    methodField = type.getAddressField("_method");
-  }
-
-  private static AddressField methodField;
-
-  public CallJavaNode(Address addr) {
-    super(addr);
-  }
-
-  public ciMethod method() {
-    return (ciMethod) ciObjectFactory.getMetadata(methodField.getValue(getAddress()));
-  }
-
-  public void dumpSpec(PrintStream out) {
-    if (method() !=  null) {
-      out.print(" " + method().method().externalNameAndSignature());
-    }
-    super.dumpSpec(out);
-  }
-}
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/CallNode.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/CallNode.java
deleted file mode 100644
index 3dfd8862830..00000000000
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/CallNode.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Copyright (c) 2011, 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.opto;
-
-import java.io.PrintStream;
-import java.util.*;
-import sun.jvm.hotspot.debugger.*;
-import sun.jvm.hotspot.runtime.*;
-import sun.jvm.hotspot.oops.*;
-import sun.jvm.hotspot.types.*;
-import sun.jvm.hotspot.utilities.Observable;
-import sun.jvm.hotspot.utilities.Observer;
-
-public class CallNode extends SafePointNode {
-  static {
-    VM.registerVMInitializedObserver(new Observer() {
-        public void update(Observable o, Object data) {
-          initialize(VM.getVM().getTypeDataBase());
-        }
-      });
-  }
-
-  private static synchronized void initialize(TypeDataBase db) throws WrongTypeException {
-    Type type      = db.lookupType("CallNode");
-    entryPointField = type.getAddressField("_entry_point");
-  }
-
-  private static AddressField entryPointField;
-
-  public Address entryPoint() {
-    return entryPointField.getValue(getAddress());
-  }
-
-  public CallNode(Address addr) {
-    super(addr);
-  }
-
-  public void dumpSpec(PrintStream out) {
-    out.print(" ");
-    // tf()->dumpOn(st);
-    // if (_cnt != countUnknown)  st->print(" C=%f",_cnt);
-    JVMState jvms = jvms();
-    if (jvms != null)  jvms.dumpSpec(out);
-  }
-}
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/CallRuntimeNode.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/CallRuntimeNode.java
deleted file mode 100644
index 3bfd221395e..00000000000
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/CallRuntimeNode.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Copyright (c) 2011, 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 sun.jvm.hotspot.opto;
-
-import java.io.PrintStream;
-import java.util.*;
-import sun.jvm.hotspot.utilities.CStringUtilities;
-import sun.jvm.hotspot.debugger.*;
-import sun.jvm.hotspot.runtime.*;
-import sun.jvm.hotspot.oops.*;
-import sun.jvm.hotspot.types.*;
-import sun.jvm.hotspot.utilities.Observable;
-import sun.jvm.hotspot.utilities.Observer;
-
-public class CallRuntimeNode extends CallNode {
-  static {
-    VM.registerVMInitializedObserver(new Observer() {
-        public void update(Observable o, Object data) {
-          initialize(VM.getVM().getTypeDataBase());
-        }
-      });
-  }
-
-  private static synchronized void initialize(TypeDataBase db) throws WrongTypeException {
-    Type type      = db.lookupType("CallRuntimeNode");
-    nameField    = type.getAddressField("_name");
-  }
-
-  private static AddressField nameField;
-
-  public String name() {
-    return CStringUtilities.getString(nameField.getValue(getAddress()));
-  }
-
-  public CallRuntimeNode(Address addr) {
-    super(addr);
-  }
-
-  public void dumpSpec(PrintStream out) {
-    out.print(" #");
-    out.print(name());
-    super.dumpSpec(out);
-  }
-}
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/CallStaticJavaNode.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/CallStaticJavaNode.java
deleted file mode 100644
index ab678d0e6c6..00000000000
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/CallStaticJavaNode.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * Copyright (c) 2011, 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 sun.jvm.hotspot.opto;
-
-import java.io.PrintStream;
-import java.util.*;
-import sun.jvm.hotspot.utilities.CStringUtilities;
-import sun.jvm.hotspot.debugger.*;
-import sun.jvm.hotspot.runtime.*;
-import sun.jvm.hotspot.oops.*;
-import sun.jvm.hotspot.types.*;
-import sun.jvm.hotspot.utilities.Observable;
-import sun.jvm.hotspot.utilities.Observer;
-
-public class CallStaticJavaNode extends CallJavaNode {
-  static {
-    VM.registerVMInitializedObserver(new Observer() {
-        public void update(Observable o, Object data) {
-          initialize(VM.getVM().getTypeDataBase());
-        }
-      });
-  }
-
-  private static synchronized void initialize(TypeDataBase db) throws WrongTypeException {
-    Type type      = db.lookupType("CallStaticJavaNode");
-    nameField    = type.getAddressField("_name");
-  }
-
-  private static AddressField nameField;
-
-  public String name() {
-    return CStringUtilities.getString(nameField.getValue(getAddress()));
-  }
-
-  public CallStaticJavaNode(Address addr) {
-    super(addr);
-  }
-
-  public void dumpSpec(PrintStream out) {
-    out.print(" Static ");
-    String name = name();
-    if (name != null) {
-      out.print(name);
-      // int trapReq = uncommonTrapRequest();
-      // if (trapReq != 0) {
-      //   char buf[100];
-      //   st->print("(%s)",
-      //             Deoptimization::formatTrapRequest(buf, sizeof(buf),
-      //                                                 trapReq));
-      // }
-      out.print(" ");
-    }
-    super.dumpSpec(out);
-  }
-}
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/Compile.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/Compile.java
deleted file mode 100644
index 725c95619fc..00000000000
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/Compile.java
+++ /dev/null
@@ -1,107 +0,0 @@
-/*
- * Copyright (c) 2011, 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.opto;
-
-import java.util.*;
-import java.io.PrintStream;
-import sun.jvm.hotspot.ci.*;
-import sun.jvm.hotspot.debugger.*;
-import sun.jvm.hotspot.runtime.*;
-import sun.jvm.hotspot.oops.*;
-import sun.jvm.hotspot.types.*;
-import sun.jvm.hotspot.utilities.Observable;
-import sun.jvm.hotspot.utilities.Observer;
-
-public class Compile extends VMObject {
-  static {
-    VM.registerVMInitializedObserver(new Observer() {
-        public void update(Observable o, Object data) {
-          initialize(VM.getVM().getTypeDataBase());
-        }
-      });
-  }
-
-  private static synchronized void initialize(TypeDataBase db) throws WrongTypeException {
-    Type type      = db.lookupType("Compile");
-    rootField = type.getAddressField("_root");
-    uniqueField = new CIntField(type.getCIntegerField("_unique"), 0);
-    entryBciField = new CIntField(type.getCIntegerField("_entry_bci"), 0);
-    topField = type.getAddressField("_top");
-    cfgField = type.getAddressField("_cfg");
-    regallocField = type.getAddressField("_regalloc");
-    methodField = type.getAddressField("_method");
-    iltField = type.getAddressField("_ilt");
-  }
-
-  private static AddressField rootField;
-  private static CIntField uniqueField;
-  private static CIntField entryBciField;
-  private static AddressField topField;
-  private static AddressField cfgField;
-  private static AddressField regallocField;
-  private static AddressField methodField;
-  private static AddressField iltField;
-
-  public Compile(Address addr) {
-    super(addr);
-  }
-
-  public Node root() {
-    return new RootNode(rootField.getValue(this.getAddress()));
-  }
-
-  public int entryBci() {
-    return (int)entryBciField.getValue(getAddress());
-  }
-
-  public ciMethod method() {
-    return (ciMethod) ciObjectFactory.getMetadata(methodField.getValue(getAddress()));
-  }
-
-  public PhaseCFG cfg() {
-    Address a = cfgField.getValue(this.getAddress());
-    if (a != null) {
-      return new PhaseCFG(a);
-    }
-    return null;
-  }
-
-  public InlineTree ilt() {
-    Address a = iltField.getValue(this.getAddress());
-    if (a != null) {
-      return new InlineTree(a);
-    }
-    return null;
-  }
-
-  public void dumpInlineData(PrintStream out) {
-    InlineTree inlTree = ilt();
-    if (inlTree != null) {
-      out.print(" inline " + inlTree.count());
-      inlTree.dumpReplayData(out);
-    }
-  }
-
-}
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/CompilerPhaseType.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/CompilerPhaseType.java
deleted file mode 100644
index a745d682069..00000000000
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/CompilerPhaseType.java
+++ /dev/null
@@ -1,67 +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 sun.jvm.hotspot.opto;
-
-//These definitions should be kept in sync with the definitions in the HotSpot code.
-
-public enum CompilerPhaseType {
-  PHASE_BEFORE_STRINGOPTS ("Before StringOpts"),
-  PHASE_AFTER_STRINGOPTS ("After StringOpts"),
-  PHASE_BEFORE_REMOVEUSELESS ("Before RemoveUseless"),
-  PHASE_AFTER_PARSING ("After Parsing"),
-  PHASE_ITER_GVN1 ("Iter GVN 1"),
-  PHASE_PHASEIDEAL_BEFORE_EA ("PhaseIdealLoop before EA"),
-  PHASE_ITER_GVN_AFTER_EA ("Iter GVN after EA"),
-  PHASE_ITER_GVN_AFTER_ELIMINATION ("Iter GVN after eliminating allocations and locks"),
-  PHASE_PHASEIDEALLOOP1 ("PhaseIdealLoop 1"),
-  PHASE_PHASEIDEALLOOP2 ("PhaseIdealLoop 2"),
-  PHASE_PHASEIDEALLOOP3 ("PhaseIdealLoop 3"),
-  PHASE_CCP1 ("PhaseCCP 1"),
-  PHASE_ITER_GVN2 ("Iter GVN 2"),
-  PHASE_PHASEIDEALLOOP_ITERATIONS ("PhaseIdealLoop iterations"),
-  PHASE_OPTIMIZE_FINISHED ("Optimize finished"),
-  PHASE_GLOBAL_CODE_MOTION ("Global code motion"),
-  PHASE_FINAL_CODE ("Final Code"),
-  PHASE_AFTER_EA ("After Escape Analysis"),
-  PHASE_BEFORE_CLOOPS ("Before CountedLoop"),
-  PHASE_AFTER_CLOOPS ("After CountedLoop"),
-  PHASE_BEFORE_BEAUTIFY_LOOPS ("Before beautify loops"),
-  PHASE_AFTER_BEAUTIFY_LOOPS ("After beautify loops"),
-  PHASE_BEFORE_MATCHING ("Before Matching"),
-  PHASE_INCREMENTAL_INLINE ("Incremental Inline"),
-  PHASE_INCREMENTAL_BOXING_INLINE ("Incremental Boxing Inline"),
-  PHASE_END ("End"),
-  PHASE_FAILURE ("Failure"),
-  PHASE_NUM_TYPES ("Number of Phase Types");
-
-  private final String value;
-
-  CompilerPhaseType(String val) {
-    this.value = val;
-  }
-  public String value() {
-    return value;
-  }
-}
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/HaltNode.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/HaltNode.java
deleted file mode 100644
index 5c84b2e9a6e..00000000000
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/HaltNode.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright (c) 2011, 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.opto;
-
-import java.util.*;
-import sun.jvm.hotspot.debugger.*;
-import sun.jvm.hotspot.runtime.*;
-import sun.jvm.hotspot.oops.*;
-import sun.jvm.hotspot.types.*;
-import sun.jvm.hotspot.utilities.Observable;
-import sun.jvm.hotspot.utilities.Observer;
-
-public class HaltNode extends Node {
-  static {
-    VM.registerVMInitializedObserver(new Observer() {
-        public void update(Observable o, Object data) {
-          initialize(VM.getVM().getTypeDataBase());
-        }
-      });
-  }
-
-  private static synchronized void initialize(TypeDataBase db) throws WrongTypeException {
-    Type type      = db.lookupType("HaltNode");
-  }
-
-
-  public HaltNode(Address addr) {
-    super(addr);
-  }
-}
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/InlineTree.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/InlineTree.java
deleted file mode 100644
index 9a11b1c962c..00000000000
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/InlineTree.java
+++ /dev/null
@@ -1,135 +0,0 @@
-/*
- * Copyright (c) 2011, 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.opto;
-
-import java.util.*;
-import java.io.PrintStream;
-import sun.jvm.hotspot.ci.*;
-import sun.jvm.hotspot.debugger.*;
-import sun.jvm.hotspot.runtime.*;
-import sun.jvm.hotspot.oops.*;
-import sun.jvm.hotspot.utilities.GrowableArray;
-import sun.jvm.hotspot.types.*;
-import sun.jvm.hotspot.utilities.Observable;
-import sun.jvm.hotspot.utilities.Observer;
-
-public class InlineTree extends VMObject {
-  static {
-    VM.registerVMInitializedObserver(new Observer() {
-        public void update(Observable o, Object data) {
-          initialize(VM.getVM().getTypeDataBase());
-        }
-      });
-  }
-
-  private static synchronized void initialize(TypeDataBase db) throws WrongTypeException {
-    Type type      = db.lookupType("InlineTree");
-    callerJvmsField = type.getAddressField("_caller_jvms");
-    methodField = type.getAddressField("_method");
-    callerTreeField = type.getAddressField("_caller_tree");
-    subtreesField = type.getAddressField("_subtrees");
-  }
-
-  private static AddressField callerJvmsField;
-  private static AddressField methodField;
-  private static AddressField callerTreeField;
-  private static AddressField subtreesField;
-
-  private static StaticBaseConstructor<InlineTree> inlineTreeConstructor = new StaticBaseConstructor<>(InlineTree.class);
-
-  public InlineTree(Address addr) {
-    super(addr);
-  }
-
-  public InlineTree callerTree() {
-    Address addr = callerTreeField.getValue(getAddress());
-    if (addr == null) return null;
-
-    return new InlineTree(addr);
-  }
-
-  public ciMethod method() {
-    return (ciMethod) ciObjectFactory.getMetadata(methodField.getValue(getAddress()));
-  }
-
-  public JVMState callerJvms() {
-    return JVMState.create(callerJvmsField.getValue(getAddress()));
-  }
-
-  public int callerBci() {
-    JVMState jvms = callerJvms();
-    return (jvms != null) ? jvms.bci() : -1;
-  }
-
-  public GrowableArray<InlineTree> subtrees() {
-    Address addr = getAddress().addOffsetTo(subtreesField.getOffset());
-
-    return GrowableArray.create(addr, inlineTreeConstructor);
-  }
-
-  public int inlineLevel() {
-    JVMState jvms = callerJvms();
-    return (jvms != null) ? jvms.depth() : 0;
-  }
-
-  public void printImpl(PrintStream st, int indent) {
-    for (int i = 0; i < indent; i++) st.print(" ");
-    st.printf(" @ %d ", callerBci());
-    method().printShortName(st);
-    st.println();
-
-    GrowableArray<InlineTree> subt = subtrees();
-    for (int i = 0 ; i < subt.length(); i++) {
-      subt.at(i).printImpl(st, indent + 2);
-    }
-  }
-  public void print(PrintStream st) {
-    printImpl(st, 2);
-  }
-
-  // Count number of nodes in this subtree
-  public int count() {
-    int result = 1;
-    GrowableArray<InlineTree> subt = subtrees();
-    for (int i = 0 ; i < subt.length(); i++) {
-      result += subt.at(i).count();
-    }
-    return result;
-  }
-
-  public void dumpReplayData(PrintStream out) {
-    out.printf(" %d %d ", inlineLevel(), callerBci());
-    Method method = (Method)method().getMetadata();
-    Klass holder = method.getMethodHolder();
-    out.print(holder.getName().asString() + " " +
-              OopUtilities.escapeString(method.getName().asString()) + " " +
-              method.getSignature().asString());
-
-    GrowableArray<InlineTree> subt = subtrees();
-    for (int i = 0 ; i < subt.length(); i++) {
-      subt.at(i).dumpReplayData(out);
-    }
-  }
-}
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/JVMState.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/JVMState.java
deleted file mode 100644
index d83c1df8b0d..00000000000
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/JVMState.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- * Copyright (c) 2011, 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.opto;
-
-import java.io.PrintStream;
-import java.util.*;
-import sun.jvm.hotspot.debugger.*;
-import sun.jvm.hotspot.runtime.*;
-import sun.jvm.hotspot.oops.*;
-import sun.jvm.hotspot.ci.*;
-import sun.jvm.hotspot.types.*;
-import sun.jvm.hotspot.utilities.Observable;
-import sun.jvm.hotspot.utilities.Observer;
-
-public class JVMState extends VMObject {
-  static {
-    VM.registerVMInitializedObserver(new Observer() {
-        public void update(Observable o, Object data) {
-          initialize(VM.getVM().getTypeDataBase());
-        }
-      });
-  }
-
-  private static synchronized void initialize(TypeDataBase db) throws WrongTypeException {
-    Type type      = db.lookupType("JVMState");
-    mapField = type.getAddressField("_map");
-    methodField = type.getAddressField("_method");
-    bciField = new CIntField(type.getCIntegerField("_bci"), 0);
-    spField = new CIntField(type.getCIntegerField("_sp"), 0);
-    endoffField = new CIntField(type.getCIntegerField("_endoff"), 0);
-    try {
-        scloffField = new CIntField(type.getCIntegerField("_scloff"), 0);
-    } catch (Exception e) {
-    }
-    monoffField = new CIntField(type.getCIntegerField("_monoff"), 0);
-    stkoffField = new CIntField(type.getCIntegerField("_stkoff"), 0);
-    locoffField = new CIntField(type.getCIntegerField("_locoff"), 0);
-    depthField = new CIntField(type.getCIntegerField("_depth"), 0);
-    callerField = type.getAddressField("_caller");
-  }
-
-  private static AddressField mapField;
-  private static AddressField methodField;
-  private static CIntField bciField;
-  private static CIntField spField;
-  private static CIntField endoffField;
-  private static CIntField scloffField;
-  private static CIntField monoffField;
-  private static CIntField stkoffField;
-  private static CIntField locoffField;
-  private static CIntField depthField;
-  private static AddressField callerField;
-
-  public static JVMState create(Address addr) {
-    if (addr == null) return null;
-    return new JVMState(addr);
-  }
-
-  public JVMState(Address addr) {
-    super(addr);
-  }
-
-  public ciMethod method() {
-    return (ciMethod) ciObjectFactory.getMetadata(methodField.getValue(getAddress()));
-  }
-
-  public int bci() {
-    return (int)bciField.getValue(getAddress());
-  }
-
-  public int depth() {
-    return (int)depthField.getValue(getAddress());
-  }
-
-  public JVMState caller() {
-    return create(callerField.getValue(getAddress()));
-  }
-
-  public void dumpSpec(PrintStream out) {
-    ciMethod m = method();
-    if (m != null) {
-      Method meth = m.method();
-      out.print(" " + meth.getMethodHolder().getName().asString().replace('/', '.') + "::" +
-                meth.getName().asString() + " @ bci:" + bci());
-    } else {
-      out.print(" runtime stub");
-    }
-    if (caller() != null)  caller().dumpSpec(out);
-  }
-}
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/LoopNode.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/LoopNode.java
deleted file mode 100644
index 96d96d3348c..00000000000
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/LoopNode.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright (c) 2011, 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.opto;
-
-import java.util.*;
-import sun.jvm.hotspot.debugger.*;
-import sun.jvm.hotspot.runtime.*;
-import sun.jvm.hotspot.oops.*;
-import sun.jvm.hotspot.types.*;
-import sun.jvm.hotspot.utilities.Observable;
-import sun.jvm.hotspot.utilities.Observer;
-
-public class LoopNode extends RegionNode {
-  static {
-    VM.registerVMInitializedObserver(new Observer() {
-        public void update(Observable o, Object data) {
-          initialize(VM.getVM().getTypeDataBase());
-        }
-      });
-  }
-
-  private static synchronized void initialize(TypeDataBase db) throws WrongTypeException {
-    Type type      = db.lookupType("LoopNode");
-  }
-
-
-  public LoopNode(Address addr) {
-    super(addr);
-  }
-}
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/MachCallJavaNode.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/MachCallJavaNode.java
deleted file mode 100644
index 29c411da4d7..00000000000
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/MachCallJavaNode.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Copyright (c) 2011, 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.opto;
-
-import java.util.*;
-import java.io.PrintStream;
-import sun.jvm.hotspot.ci.ciMethod;
-import sun.jvm.hotspot.ci.ciObjectFactory;
-import sun.jvm.hotspot.debugger.*;
-import sun.jvm.hotspot.runtime.*;
-import sun.jvm.hotspot.oops.*;
-import sun.jvm.hotspot.types.*;
-import sun.jvm.hotspot.utilities.Observable;
-import sun.jvm.hotspot.utilities.Observer;
-
-public class MachCallJavaNode extends MachCallNode {
-  static {
-    VM.registerVMInitializedObserver(new Observer() {
-        public void update(Observable o, Object data) {
-          initialize(VM.getVM().getTypeDataBase());
-        }
-      });
-  }
-
-  private static synchronized void initialize(TypeDataBase db) throws WrongTypeException {
-    Type type      = db.lookupType("MachCallJavaNode");
-    methodField = type.getAddressField("_method");
-    bciField = new CIntField(type.getCIntegerField("_bci"), 0);
-  }
-
-  private static AddressField methodField;
-  private static CIntField bciField;
-
-  public ciMethod method() {
-    return (ciMethod) ciObjectFactory.getMetadata(methodField.getValue(getAddress()));
-  }
-
-  public MachCallJavaNode(Address addr) {
-    super(addr);
-  }
-
-  public void dumpSpec(PrintStream st) {
-    ciMethod m = method();
-    if (m != null) {
-      m.printShortName(st);
-      st.print(" ");
-    }
-    super.dumpSpec(st);
-  }
-}
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/MachCallNode.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/MachCallNode.java
deleted file mode 100644
index 040616b4b5c..00000000000
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/MachCallNode.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Copyright (c) 2011, 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.opto;
-
-import java.util.*;
-import java.io.PrintStream;
-import sun.jvm.hotspot.debugger.*;
-import sun.jvm.hotspot.runtime.*;
-import sun.jvm.hotspot.oops.*;
-import sun.jvm.hotspot.types.*;
-import sun.jvm.hotspot.utilities.Observable;
-import sun.jvm.hotspot.utilities.Observer;
-
-public class MachCallNode extends MachSafePointNode {
-  static {
-    VM.registerVMInitializedObserver(new Observer() {
-        public void update(Observable o, Object data) {
-          initialize(VM.getVM().getTypeDataBase());
-        }
-      });
-  }
-
-  private static synchronized void initialize(TypeDataBase db) throws WrongTypeException {
-    Type type      = db.lookupType("MachCallNode");
-  }
-
-  public MachCallNode(Address addr) {
-    super(addr);
-  }
-
-  public void dumpSpec(PrintStream st) {
-      st.print("# ");
-      // tf()->dump_on(st);
-      // if (_cnt != COUNT_UNKNOWN)  st->print(" C=%f",_cnt);
-      if (jvms() != null)  jvms().dumpSpec(st);
-  }
-}
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/MachCallRuntimeNode.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/MachCallRuntimeNode.java
deleted file mode 100644
index 7fff61bb147..00000000000
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/MachCallRuntimeNode.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Copyright (c) 2011, 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.opto;
-
-import java.util.*;
-import java.io.PrintStream;
-import sun.jvm.hotspot.debugger.*;
-import sun.jvm.hotspot.runtime.*;
-import sun.jvm.hotspot.oops.*;
-import sun.jvm.hotspot.types.*;
-import sun.jvm.hotspot.utilities.CStringUtilities;
-import sun.jvm.hotspot.utilities.Observable;
-import sun.jvm.hotspot.utilities.Observer;
-
-public class MachCallRuntimeNode extends MachCallJavaNode {
-  static {
-    VM.registerVMInitializedObserver(new Observer() {
-        public void update(Observable o, Object data) {
-          initialize(VM.getVM().getTypeDataBase());
-        }
-      });
-  }
-
-  private static synchronized void initialize(TypeDataBase db) throws WrongTypeException {
-    Type type      = db.lookupType("MachCallRuntimeNode");
-    nameField    = type.getAddressField("_name");
-  }
-
-  private static AddressField nameField;
-
-  public String name() {
-    return CStringUtilities.getString(nameField.getValue(getAddress()));
-  }
-
-  public MachCallRuntimeNode(Address addr) {
-    super(addr);
-  }
-
-  public void dumpSpec(PrintStream out) {
-    out.printf("%s ", name());
-    super.dumpSpec(out);
-  }
-}
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/MachCallStaticJavaNode.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/MachCallStaticJavaNode.java
deleted file mode 100644
index 6124a0c353d..00000000000
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/MachCallStaticJavaNode.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Copyright (c) 2011, 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.opto;
-
-import java.util.*;
-import java.io.PrintStream;
-import sun.jvm.hotspot.debugger.*;
-import sun.jvm.hotspot.runtime.*;
-import sun.jvm.hotspot.oops.*;
-import sun.jvm.hotspot.types.*;
-import sun.jvm.hotspot.utilities.CStringUtilities;
-import sun.jvm.hotspot.utilities.Observable;
-import sun.jvm.hotspot.utilities.Observer;
-
-public class MachCallStaticJavaNode extends MachCallJavaNode {
-  static {
-    VM.registerVMInitializedObserver(new Observer() {
-        public void update(Observable o, Object data) {
-          initialize(VM.getVM().getTypeDataBase());
-        }
-      });
-  }
-
-  private static synchronized void initialize(TypeDataBase db) throws WrongTypeException {
-    Type type      = db.lookupType("MachCallStaticJavaNode");
-    nameField    = type.getAddressField("_name");
-  }
-
-  private static AddressField nameField;
-
-  public String name() {
-    return CStringUtilities.getString(nameField.getValue(getAddress()));
-  }
-
-  public MachCallStaticJavaNode(Address addr) {
-    super(addr);
-  }
-
-  public void dumpSpec(PrintStream st) {
-    st.print("Static ");
-    String n = name();
-    if (n != null) {
-      st.printf("wrapper for: %s", n);
-      // dump_trap_args(st);
-      st.print(" ");
-    }
-    super.dumpSpec(st);
-  }
-}
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/MachIfNode.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/MachIfNode.java
deleted file mode 100644
index dec4fd73f97..00000000000
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/MachIfNode.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Copyright (c) 2011, 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.opto;
-
-import java.util.*;
-import java.io.PrintStream;
-import sun.jvm.hotspot.debugger.*;
-import sun.jvm.hotspot.runtime.*;
-import sun.jvm.hotspot.oops.*;
-import sun.jvm.hotspot.types.*;
-import sun.jvm.hotspot.utilities.Observable;
-import sun.jvm.hotspot.utilities.Observer;
-
-public class MachIfNode extends MachNode {
-  static {
-    VM.registerVMInitializedObserver(new Observer() {
-        public void update(Observable o, Object data) {
-          initialize(VM.getVM().getTypeDataBase());
-        }
-      });
-  }
-
-  private static synchronized void initialize(TypeDataBase db) throws WrongTypeException {
-    Type type      = db.lookupType("MachIfNode");
-    probField = type.getJFloatField("_prob");
-    fcntField = type.getJFloatField("_fcnt");
-  }
-
-  private static JFloatField probField;
-  private static JFloatField fcntField;
-
-  float prob() {
-    return probField.getValue(getAddress());
-  }
-
-  float cnt() {
-    return fcntField.getValue(getAddress());
-  }
-
-  public MachIfNode(Address addr) {
-    super(addr);
-  }
-
-  public void dumpSpec(PrintStream out) {
-    out.print("P=" + prob() + ", C=" + cnt());
-  }
-}
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/MachNode.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/MachNode.java
deleted file mode 100644
index f300f52864b..00000000000
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/MachNode.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright (c) 2011, 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.opto;
-
-import java.util.*;
-import sun.jvm.hotspot.debugger.*;
-import sun.jvm.hotspot.runtime.*;
-import sun.jvm.hotspot.oops.*;
-import sun.jvm.hotspot.types.*;
-import sun.jvm.hotspot.utilities.Observable;
-import sun.jvm.hotspot.utilities.Observer;
-
-public class MachNode extends Node {
-  static {
-    VM.registerVMInitializedObserver(new Observer() {
-        public void update(Observable o, Object data) {
-          initialize(VM.getVM().getTypeDataBase());
-        }
-      });
-  }
-
-  private static synchronized void initialize(TypeDataBase db) throws WrongTypeException {
-    Type type      = db.lookupType("MachNode");
-  }
-
-  public MachNode(Address addr) {
-    super(addr);
-  }
-}
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/MachReturnNode.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/MachReturnNode.java
deleted file mode 100644
index db3a8398322..00000000000
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/MachReturnNode.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright (c) 2011, 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.opto;
-
-import java.util.*;
-import sun.jvm.hotspot.debugger.*;
-import sun.jvm.hotspot.runtime.*;
-import sun.jvm.hotspot.oops.*;
-import sun.jvm.hotspot.types.*;
-import sun.jvm.hotspot.utilities.Observable;
-import sun.jvm.hotspot.utilities.Observer;
-
-public class MachReturnNode extends MachNode {
-  static {
-    VM.registerVMInitializedObserver(new Observer() {
-        public void update(Observable o, Object data) {
-          initialize(VM.getVM().getTypeDataBase());
-        }
-      });
-  }
-
-  private static synchronized void initialize(TypeDataBase db) throws WrongTypeException {
-    Type type      = db.lookupType("MachReturnNode");
-  }
-
-  public MachReturnNode(Address addr) {
-    super(addr);
-  }
-}
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/MachSafePointNode.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/MachSafePointNode.java
deleted file mode 100644
index 8e54f0c1df0..00000000000
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/MachSafePointNode.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * Copyright (c) 2011, 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.opto;
-
-import java.util.*;
-import java.io.PrintStream;
-import sun.jvm.hotspot.debugger.*;
-import sun.jvm.hotspot.runtime.*;
-import sun.jvm.hotspot.oops.*;
-import sun.jvm.hotspot.types.*;
-import sun.jvm.hotspot.utilities.Observable;
-import sun.jvm.hotspot.utilities.Observer;
-
-public class MachSafePointNode extends MachReturnNode {
-  static {
-    VM.registerVMInitializedObserver(new Observer() {
-        public void update(Observable o, Object data) {
-          initialize(VM.getVM().getTypeDataBase());
-        }
-      });
-  }
-
-  private static synchronized void initialize(TypeDataBase db) throws WrongTypeException {
-    Type type      = db.lookupType("MachSafePointNode");
-    jvmsField = type.getAddressField("_jvms");
-    jvmadjField = new CIntField(type.getCIntegerField("_jvmadj"), 0);
-  }
-
-  private static AddressField jvmsField;
-  private static CIntField jvmadjField;
-
-  public MachSafePointNode(Address addr) {
-    super(addr);
-  }
-
-  public JVMState jvms() {
-    return JVMState.create(jvmsField.getValue(getAddress()));
-  }
-
-  public void dumpSpec(PrintStream out) {
-    try {
-      JVMState jvms = jvms();
-      if (jvms != null) out.print(" !");
-      if (jvms == null) out.print("empty jvms");
-      while (jvms != null) {
-        Method m = jvms.method().method();
-        int bci = jvms.bci();
-        out.print(" " + m.getMethodHolder().getName().asString().replace('/', '.') + "::" + m.getName().asString() + " @ bci:" + bci);
-        jvms = jvms.caller();
-      }
-    } catch (Exception e) {
-      out.print(e);
-    }
-  }
-}
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/MultiNode.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/MultiNode.java
deleted file mode 100644
index f82e574dac6..00000000000
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/MultiNode.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright (c) 2011, 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.opto;
-
-import java.util.*;
-import sun.jvm.hotspot.debugger.*;
-import sun.jvm.hotspot.runtime.*;
-import sun.jvm.hotspot.oops.*;
-import sun.jvm.hotspot.types.*;
-import sun.jvm.hotspot.utilities.Observable;
-import sun.jvm.hotspot.utilities.Observer;
-
-public class MultiNode extends Node {
-  static {
-    VM.registerVMInitializedObserver(new Observer() {
-        public void update(Observable o, Object data) {
-          initialize(VM.getVM().getTypeDataBase());
-        }
-      });
-  }
-
-  private static synchronized void initialize(TypeDataBase db) throws WrongTypeException {
-    Type type      = db.lookupType("MultiNode");
-  }
-
-
-  public MultiNode(Address addr) {
-    super(addr);
-  }
-}
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/Node.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/Node.java
deleted file mode 100644
index e79abaeb1d1..00000000000
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/Node.java
+++ /dev/null
@@ -1,271 +0,0 @@
-/*
- * Copyright (c) 2011, 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.opto;
-
-import java.io.*;
-import java.lang.reflect.Constructor;
-import java.util.*;
-import sun.jvm.hotspot.debugger.*;
-import sun.jvm.hotspot.runtime.*;
-import sun.jvm.hotspot.oops.*;
-import sun.jvm.hotspot.types.*;
-import sun.jvm.hotspot.utilities.Observable;
-import sun.jvm.hotspot.utilities.Observer;
-
-public class Node extends VMObject {
-  static {
-    VM.registerVMInitializedObserver(new Observer() {
-        public void update(Observable o, Object data) {
-          initialize(VM.getVM().getTypeDataBase());
-        }
-      });
-  }
-
-  private static synchronized void initialize(TypeDataBase db) throws WrongTypeException {
-    Type type      = db.lookupType("Node");
-    outmaxField = new CIntField(type.getCIntegerField("_outmax"), 0);
-    outcntField = new CIntField(type.getCIntegerField("_outcnt"), 0);
-    maxField = new CIntField(type.getCIntegerField("_max"), 0);
-    cntField = new CIntField(type.getCIntegerField("_cnt"), 0);
-    idxField = new CIntField(type.getCIntegerField("_idx"), 0);
-    outField = type.getAddressField("_out");
-    inField = type.getAddressField("_in");
-
-    nodeType = db.lookupType("Node");
-
-    virtualConstructor = new VirtualBaseConstructor<>(db, nodeType, "sun.jvm.hotspot.opto", Node.class);
-  }
-
-  private static CIntField outmaxField;
-  private static CIntField outcntField;
-  private static CIntField maxField;
-  private static CIntField cntField;
-  private static CIntField idxField;
-  private static AddressField outField;
-  private static AddressField inField;
-
-  private static VirtualBaseConstructor<Node> virtualConstructor;
-
-  private static Type nodeType;
-
-  static HashMap<Address, Node> nodes = new HashMap<>();
-
-  static HashMap constructors = new HashMap();
-
-  abstract static class Instantiator {
-    abstract Node create(Address addr);
-  }
-
-  public static Node create(Address addr) {
-    if (addr == null) return null;
-    Node result = nodes.get(addr);
-    if (result == null) {
-      result = virtualConstructor.instantiateWrapperFor(addr);
-      nodes.put(addr, result);
-    }
-    return result;
-  }
-
-  public Node(Address addr) {
-    super(addr);
-  }
-
-  public int outcnt() {
-    return (int)outcntField.getValue(this.getAddress());
-  }
-
-  public int req() {
-    return (int)cntField.getValue(this.getAddress());
-  }
-
-  public int len() {
-    return (int)maxField.getValue(this.getAddress());
-  }
-
-  public int idx() {
-    return (int)idxField.getValue(this.getAddress());
-  }
-
-  private Node[] _out;
-  private Node[] _in;
-
-  public Node rawOut(int i) {
-    if (_out == null) {
-      int addressSize = (int)VM.getVM().getAddressSize();
-      _out = new Node[outcnt()];
-      Address ptr = outField.getValue(this.getAddress());
-      for (int j = 0; j < outcnt(); j++) {
-        _out[j] = Node.create(ptr.getAddressAt(j * addressSize));
-      }
-    }
-    return _out[i];
-  }
-
-  public Node in(int i) {
-    if (_in == null) {
-      int addressSize = (int)VM.getVM().getAddressSize();
-      _in = new Node[len()];
-      Address ptr = inField.getValue(this.getAddress());
-      for (int j = 0; j < len(); j++) {
-        _in[j] = Node.create(ptr.getAddressAt(j * addressSize));
-      }
-    }
-    return _in[i];
-  }
-
-  public ArrayList<Node> collect(int d, boolean onlyCtrl) {
-    int depth = Math.abs(d);
-    ArrayList<Node> nstack = new ArrayList<>();
-    BitSet set = new BitSet();
-
-    nstack.add(this);
-    set.set(idx());
-    int begin = 0;
-    int end = 0;
-    for (int i = 0; i < depth; i++) {
-      end = nstack.size();
-      for(int j = begin; j < end; j++) {
-        Node tp  = nstack.get(j);
-        int limit = d > 0 ? tp.len() : tp.outcnt();
-        for(int k = 0; k < limit; k++) {
-          Node n = d > 0 ? tp.in(k) : tp.rawOut(k);
-
-          // if (not_a_node(n))  continue;
-          if (n == null) continue;
-          // do not recurse through top or the root (would reach unrelated stuff)
-          // if (n.isRoot() || n.isTop())  continue;
-          // if (onlyCtrl && !n.isCfg()) continue;
-
-          if (!set.get(n.idx())) {
-            nstack.add(n);
-            set.set(n.idx());
-          }
-        }
-      }
-      begin = end;
-    }
-    return nstack;
-  }
-
-  protected void dumpNodes(Node s, int d, boolean onlyCtrl, PrintStream out) {
-    if (s == null) return;
-
-    ArrayList nstack = s.collect(d, onlyCtrl);
-    int end = nstack.size();
-    if (d > 0) {
-      for(int j = end-1; j >= 0; j--) {
-        ((Node)nstack.get(j)).dump(out);
-      }
-    } else {
-      for(int j = 0; j < end; j++) {
-        ((Node)nstack.get(j)).dump(out);
-      }
-    }
-  }
-
-  public void dump(int depth, PrintStream out) {
-    dumpNodes(this, depth, false, out);
-  }
-
-  public String Name() {
-    Type t = VM.getVM().getTypeDataBase().findDynamicTypeForAddress(getAddress(), nodeType);
-    String name = null;
-    if (t != null) {
-        name = t.toString();
-    } else {
-        Class c = getClass();
-        if (c == Node.class) {
-            // couldn't identify class type
-            return "UnknownNode<" + getAddress().getAddressAt(0) + ">";
-        }
-        name = getClass().getName();
-        if (name.startsWith("sun.jvm.hotspot.opto.")) {
-            name = name.substring("sun.jvm.hotspot.opto.".length());
-        }
-    }
-    if (name.endsWith("Node")) {
-        return name.substring(0, name.length() - 4);
-    }
-    return name;
-  }
-
-  public void dump(PrintStream out) {
-    out.print(" ");
-    out.print(idx());
-    out.print("\t");
-    out.print(Name());
-    out.print("\t=== ");
-    int i = 0;
-    for (i = 0; i < req(); i++) {
-      Node n = in(i);
-      if (n != null) {
-        out.print(' ');
-        out.print(in(i).idx());
-      } else {
-        out.print("_");
-      }
-      out.print(" ");
-    }
-    if (len() != req()) {
-      int prec = 0;
-      for (; i < len(); i++) {
-        Node n = in(i);
-        if (n != null) {
-          if (prec++ == 0) {
-            out.print("| ");
-          }
-          out.print(in(i).idx());
-        }
-        out.print(" ");
-      }
-    }
-    dumpOut(out);
-    dumpSpec(out);
-    out.println();
-  }
-
-  void dumpOut(PrintStream out) {
-    // Delimit the output edges
-    out.print(" [[");
-    // Dump the output edges
-    for (int i = 0; i < outcnt(); i++) {    // For all outputs
-      Node u = rawOut(i);
-      if (u == null) {
-        out.print("_ ");
-      // } else if (not_a_node(u)) {
-      //   out.print("not_a_node ");
-      } else {
-        // out.print("%c%d ", Compile::current()->nodeArena()->contains(u) ? ' ' : 'o', u->_idx);
-        out.print(' ');
-        out.print(u.idx());
-        out.print(' ');
-      }
-    }
-    out.print("]] ");
-  }
-
-  public void dumpSpec(PrintStream out) {
-  }
-}
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/Node_Array.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/Node_Array.java
deleted file mode 100644
index 35b51cb5833..00000000000
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/Node_Array.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Copyright (c) 2011, 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.opto;
-
-import java.util.*;
-import sun.jvm.hotspot.debugger.*;
-import sun.jvm.hotspot.runtime.*;
-import sun.jvm.hotspot.oops.*;
-import sun.jvm.hotspot.types.*;
-import sun.jvm.hotspot.utilities.Observable;
-import sun.jvm.hotspot.utilities.Observer;
-
-public class Node_Array extends VMObject {
-  static {
-    VM.registerVMInitializedObserver(new Observer() {
-        public void update(Observable o, Object data) {
-          initialize(VM.getVM().getTypeDataBase());
-        }
-      });
-  }
-
-  private static synchronized void initialize(TypeDataBase db) throws WrongTypeException {
-    Type type      = db.lookupType("Node_Array");
-    maxField = new CIntField(type.getCIntegerField("_max"), 0);
-    nodesField = type.getAddressField("_nodes");
-    aField = type.getAddressField("_a");
-  }
-
-  private static CIntField maxField;
-  private static AddressField nodesField;
-  private static AddressField aField;
-
-  public Node_Array(Address addr) {
-    super(addr);
-  }
-
-  public int Size() {
-    return (int) maxField.getValue(getAddress());
-  }
-
-  public Node at(int i) {
-    return Node.create(nodesField.getValue(getAddress()).getAddressAt(i * (int)VM.getVM().getAddressSize()));
-  }
-}
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/Node_List.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/Node_List.java
deleted file mode 100644
index 50abdb75ad1..00000000000
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/Node_List.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Copyright (c) 2011, 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.opto;
-
-import java.util.*;
-import sun.jvm.hotspot.debugger.*;
-import sun.jvm.hotspot.runtime.*;
-import sun.jvm.hotspot.oops.*;
-import sun.jvm.hotspot.types.*;
-import sun.jvm.hotspot.utilities.Observable;
-import sun.jvm.hotspot.utilities.Observer;
-
-public class Node_List extends Node_Array {
-  static {
-    VM.registerVMInitializedObserver(new Observer() {
-        public void update(Observable o, Object data) {
-          initialize(VM.getVM().getTypeDataBase());
-        }
-      });
-  }
-
-  private static synchronized void initialize(TypeDataBase db) throws WrongTypeException {
-    Type type      = db.lookupType("Node_List");
-    cntField = new CIntField(type.getCIntegerField("_cnt"), 0);
-  }
-
-  private static CIntField cntField;
-
-  public Node_List(Address addr) {
-    super(addr);
-  }
-
-  public int size() {
-    return (int) cntField.getValue(getAddress());
-  }
-}
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/Phase.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/Phase.java
deleted file mode 100644
index fe23efff73d..00000000000
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/Phase.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright (c) 2011, 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.opto;
-
-import java.util.*;
-import sun.jvm.hotspot.debugger.*;
-import sun.jvm.hotspot.runtime.*;
-import sun.jvm.hotspot.oops.*;
-import sun.jvm.hotspot.types.*;
-import sun.jvm.hotspot.utilities.Observable;
-import sun.jvm.hotspot.utilities.Observer;
-
-public class Phase extends VMObject {
-  static {
-    VM.registerVMInitializedObserver(new Observer() {
-        public void update(Observable o, Object data) {
-          initialize(VM.getVM().getTypeDataBase());
-        }
-      });
-  }
-
-  private static synchronized void initialize(TypeDataBase db) throws WrongTypeException {
-    Type type      = db.lookupType("Phase");
-  }
-
-
-  public Phase(Address addr) {
-    super(addr);
-  }
-}
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/PhaseCFG.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/PhaseCFG.java
deleted file mode 100644
index c2561edbe40..00000000000
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/PhaseCFG.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Copyright (c) 2011, 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.opto;
-
-import java.util.*;
-import java.io.PrintStream;
-import sun.jvm.hotspot.debugger.*;
-import sun.jvm.hotspot.runtime.*;
-import sun.jvm.hotspot.oops.*;
-import sun.jvm.hotspot.types.*;
-import sun.jvm.hotspot.utilities.Observable;
-import sun.jvm.hotspot.utilities.Observer;
-
-public class PhaseCFG extends Phase {
-  static {
-    VM.registerVMInitializedObserver(new Observer() {
-        public void update(Observable o, Object data) {
-          initialize(VM.getVM().getTypeDataBase());
-        }
-      });
-  }
-
-  private static synchronized void initialize(TypeDataBase db) throws WrongTypeException {
-    Type type      = db.lookupType("PhaseCFG");
-    numBlocksField = new CIntField(type.getCIntegerField("_number_of_blocks"), 0);
-    blocksField = type.getAddressField("_blocks");
-    bbsField = type.getAddressField("_node_to_block_mapping");
-    brootField = type.getAddressField("_root_block");
-  }
-
-  private static CIntField numBlocksField;
-  private static AddressField blocksField;
-  private static AddressField bbsField;
-  private static AddressField brootField;
-
-  public PhaseCFG(Address addr) {
-    super(addr);
-  }
-
-  public void dump(PrintStream out) {
-    int addressSize = (int)VM.getVM().getAddressSize();
-    int numBlocks = (int)numBlocksField.getValue(getAddress());
-    Block_List blocks = new Block_List(getAddress().addOffsetTo(blocksField.getOffset()));
-    int offset = 0;
-    for (int i  = 0; i < numBlocks; i++) {
-      blocks.at(i).dump(out);
-    }
-  }
-}
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/PhaseRegAlloc.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/PhaseRegAlloc.java
deleted file mode 100644
index 1d0f20b34c3..00000000000
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/PhaseRegAlloc.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Copyright (c) 2011, 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.opto;
-
-import java.util.*;
-import sun.jvm.hotspot.debugger.*;
-import sun.jvm.hotspot.runtime.*;
-import sun.jvm.hotspot.oops.*;
-import sun.jvm.hotspot.types.*;
-import sun.jvm.hotspot.utilities.Observable;
-import sun.jvm.hotspot.utilities.Observer;
-
-public class PhaseRegAlloc extends Phase {
-  static {
-    VM.registerVMInitializedObserver(new Observer() {
-        public void update(Observable o, Object data) {
-          initialize(VM.getVM().getTypeDataBase());
-        }
-      });
-  }
-
-  private static synchronized void initialize(TypeDataBase db) throws WrongTypeException {
-    Type type      = db.lookupType("PhaseRegAlloc");
-    nodeRegsField = type.getAddressField("_node_regs");
-    nodeRegsMaxIndexField = new CIntField(type.getCIntegerField("_node_regs_max_index"), 0);
-    framesizeField = new CIntField(type.getCIntegerField("_framesize"), 0);
-    maxRegField = new CIntField(type.getCIntegerField("_max_reg"), 0);
-  }
-
-  private static AddressField nodeRegsField;
-  private static CIntField nodeRegsMaxIndexField;
-  private static CIntField framesizeField;
-  private static CIntField maxRegField;
-
-  public PhaseRegAlloc(Address addr) {
-    super(addr);
-  }
-}
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/PhiNode.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/PhiNode.java
deleted file mode 100644
index dce9ba1cac3..00000000000
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/PhiNode.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright (c) 2011, 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.opto;
-
-import java.util.*;
-import sun.jvm.hotspot.debugger.*;
-import sun.jvm.hotspot.runtime.*;
-import sun.jvm.hotspot.oops.*;
-import sun.jvm.hotspot.types.*;
-import sun.jvm.hotspot.utilities.Observable;
-import sun.jvm.hotspot.utilities.Observer;
-
-public class PhiNode extends TypeNode {
-  static {
-    VM.registerVMInitializedObserver(new Observer() {
-        public void update(Observable o, Object data) {
-          initialize(VM.getVM().getTypeDataBase());
-        }
-      });
-  }
-
-  private static synchronized void initialize(TypeDataBase db) throws WrongTypeException {
-    Type type      = db.lookupType("PhiNode");
-  }
-
-
-  public PhiNode(Address addr) {
-    super(addr);
-  }
-}
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/ProjNode.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/ProjNode.java
deleted file mode 100644
index cd615b4bbfd..00000000000
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/ProjNode.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright (c) 2011, 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.opto;
-
-import java.util.*;
-import sun.jvm.hotspot.debugger.*;
-import sun.jvm.hotspot.runtime.*;
-import sun.jvm.hotspot.oops.*;
-import sun.jvm.hotspot.types.*;
-import sun.jvm.hotspot.utilities.Observable;
-import sun.jvm.hotspot.utilities.Observer;
-
-public class ProjNode extends Node {
-  static {
-    VM.registerVMInitializedObserver(new Observer() {
-        public void update(Observable o, Object data) {
-          initialize(VM.getVM().getTypeDataBase());
-        }
-      });
-  }
-
-  private static synchronized void initialize(TypeDataBase db) throws WrongTypeException {
-    Type type      = db.lookupType("ProjNode");
-  }
-
-
-  public ProjNode(Address addr) {
-    super(addr);
-  }
-}
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/RegionNode.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/RegionNode.java
deleted file mode 100644
index 6c678c2a686..00000000000
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/RegionNode.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright (c) 2011, 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.opto;
-
-import java.util.*;
-import sun.jvm.hotspot.debugger.*;
-import sun.jvm.hotspot.runtime.*;
-import sun.jvm.hotspot.oops.*;
-import sun.jvm.hotspot.types.*;
-import sun.jvm.hotspot.utilities.Observable;
-import sun.jvm.hotspot.utilities.Observer;
-
-public class RegionNode extends Node {
-  static {
-    VM.registerVMInitializedObserver(new Observer() {
-        public void update(Observable o, Object data) {
-          initialize(VM.getVM().getTypeDataBase());
-        }
-      });
-  }
-
-  private static synchronized void initialize(TypeDataBase db) throws WrongTypeException {
-    Type type      = db.lookupType("RegionNode");
-  }
-
-
-  public RegionNode(Address addr) {
-    super(addr);
-  }
-}
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/RootNode.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/RootNode.java
deleted file mode 100644
index 5a39af1388c..00000000000
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/RootNode.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright (c) 2011, 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.opto;
-
-import java.util.*;
-import sun.jvm.hotspot.debugger.*;
-import sun.jvm.hotspot.runtime.*;
-import sun.jvm.hotspot.oops.*;
-import sun.jvm.hotspot.types.*;
-import sun.jvm.hotspot.utilities.Observable;
-import sun.jvm.hotspot.utilities.Observer;
-
-public class RootNode extends LoopNode {
-  static {
-    VM.registerVMInitializedObserver(new Observer() {
-        public void update(Observable o, Object data) {
-          initialize(VM.getVM().getTypeDataBase());
-        }
-      });
-  }
-
-  private static synchronized void initialize(TypeDataBase db) throws WrongTypeException {
-    Type type      = db.lookupType("RootNode");
-  }
-
-
-  public RootNode(Address addr) {
-    super(addr);
-  }
-}
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/SafePointNode.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/SafePointNode.java
deleted file mode 100644
index daea02a9601..00000000000
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/SafePointNode.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Copyright (c) 2011, 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.opto;
-
-import java.io.PrintStream;
-import java.util.*;
-import sun.jvm.hotspot.debugger.*;
-import sun.jvm.hotspot.runtime.*;
-import sun.jvm.hotspot.oops.*;
-import sun.jvm.hotspot.types.*;
-import sun.jvm.hotspot.utilities.Observable;
-import sun.jvm.hotspot.utilities.Observer;
-
-public class SafePointNode extends MultiNode {
-  static {
-    VM.registerVMInitializedObserver(new Observer() {
-        public void update(Observable o, Object data) {
-          initialize(VM.getVM().getTypeDataBase());
-        }
-      });
-  }
-
-  private static synchronized void initialize(TypeDataBase db) throws WrongTypeException {
-    Type type      = db.lookupType("SafePointNode");
-    jvmsField = type.getAddressField("_jvms");
-  }
-
-  private static AddressField jvmsField;
-
-  public SafePointNode(Address addr) {
-    super(addr);
-  }
-
-  public JVMState jvms() {
-    return JVMState.create(jvmsField.getValue(getAddress()));
-  }
-
-  public void dumpSpec(PrintStream out) {
-    JVMState jvms = jvms();
-    if (jvms != null) out.print(" !");
-    while (jvms != null) {
-      Method m = jvms.method().method();
-      int bci = jvms.bci();
-      out.print(" " + m.getMethodHolder().getName().asString().replace('/', '.') + "::" + m.getName().asString() + " @ bci:" + bci);
-      jvms = jvms.caller();
-    }
-  }
-}
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/TypeNode.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/TypeNode.java
deleted file mode 100644
index 5c0e42cf21f..00000000000
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/opto/TypeNode.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright (c) 2011, 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.opto;
-
-import java.util.*;
-import sun.jvm.hotspot.debugger.*;
-import sun.jvm.hotspot.runtime.*;
-import sun.jvm.hotspot.oops.*;
-import sun.jvm.hotspot.types.*;
-import sun.jvm.hotspot.utilities.Observable;
-import sun.jvm.hotspot.utilities.Observer;
-
-public class TypeNode extends Node {
-  static {
-    VM.registerVMInitializedObserver(new Observer() {
-        public void update(Observable o, Object data) {
-          initialize(VM.getVM().getTypeDataBase());
-        }
-      });
-  }
-
-  private static synchronized void initialize(TypeDataBase db) throws WrongTypeException {
-    Type type      = db.lookupType("TypeNode");
-  }
-
-
-  public TypeNode(Address addr) {
-    super(addr);
-  }
-}
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/CompilerThread.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/CompilerThread.java
index e5c3ec30887..7e129827c52 100644
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/CompilerThread.java
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/CompilerThread.java
@@ -28,7 +28,6 @@ import java.io.*;
 import java.util.*;
 import sun.jvm.hotspot.debugger.*;
 import sun.jvm.hotspot.types.*;
-import sun.jvm.hotspot.ci.*;
 import sun.jvm.hotspot.utilities.Observable;
 import sun.jvm.hotspot.utilities.Observer;
 
@@ -43,23 +42,7 @@ public class CompilerThread extends JavaThread {
 
   private static AddressField envField;
 
-  private static synchronized void initialize(TypeDataBase db) throws WrongTypeException {
-    Type type      = db.lookupType("CompilerThread");
-
-    envField = type.getAddressField("_env");
-  }
-
-  private ciEnv _env;
-
-  public synchronized ciEnv env() {
-    if (_env == null) {
-      Address v = envField.getValue(this.getAddress());
-      if (v != null) {
-        _env = new ciEnv(v);
-      }
-    }
-    return _env;
-  }
+  private static synchronized void initialize(TypeDataBase db) throws WrongTypeException { }
 
   public CompilerThread(Address addr) {
     super(addr);
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 202217b6071..c558374d23c 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
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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.net.*;
 import java.util.*;
 import java.util.regex.*;
 import sun.jvm.hotspot.code.*;
-import sun.jvm.hotspot.c1.*;
 import sun.jvm.hotspot.code.*;
 import sun.jvm.hotspot.debugger.*;
 import sun.jvm.hotspot.interpreter.*;
@@ -120,8 +119,6 @@ public class VM {
   private static int   Flags_WAS_SET_ON_COMMAND_LINE;
   /** This is only present in a non-core build */
   private CodeCache    codeCache;
-  /** This is only present in a C1 build */
-  private Runtime1     runtime1;
   /** These constants come from globalDefinitions.hpp */
   private int          invocationEntryBCI;
   private ReversePtrs  revPtrs;
@@ -479,7 +476,7 @@ public class VM {
         usingServerCompiler = false;
       } else {
         // Determine whether C2 is present
-        if (db.lookupType("Matcher", false) != null) {
+        if (db.lookupIntConstant("COMPILER2") != null) {
           usingServerCompiler = true;
         } else {
           usingClientCompiler = true;
@@ -866,17 +863,6 @@ public class VM {
     return codeCache;
   }
 
-  /** Should only be called for C1 builds */
-  public Runtime1 getRuntime1() {
-    if (Assert.ASSERTS_ENABLED) {
-      Assert.that(isClientCompiler(), "C1 builds only");
-    }
-    if (runtime1 == null) {
-      runtime1 = new Runtime1();
-    }
-    return runtime1;
-  }
-
   /** Test to see whether we're in debugging mode (NOTE: this really
       should not be tested by this code; currently only used in
       StackFrameStream) */
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/VMReg.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/VMReg.java
index 31b2b969530..a3632058b6f 100644
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/VMReg.java
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/VMReg.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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 @@ import sun.jvm.hotspot.utilities.Observer;
 public class VMReg {
   private int value;
 
-  // C2 only
-  public static Address matcherRegEncodeAddr;
-
   static {
     VM.registerVMInitializedObserver(new Observer() {
         public void update(Observable o, Object data) {
@@ -49,13 +46,7 @@ public class VMReg {
       });
   }
 
-  private static void initialize(TypeDataBase db) {
-    if (VM.getVM().isServerCompiler()) {
-      Type type = db.lookupType("Matcher");
-      Field f = type.getField("_regEncode");
-      matcherRegEncodeAddr = f.getStaticFieldAddress();
-    }
-  }
+  private static void initialize(TypeDataBase db) { }
 
   public VMReg(int i) {
     value = i;
@@ -65,13 +56,6 @@ public class VMReg {
     return value;
   }
 
-  public int regEncode() {
-    if (matcherRegEncodeAddr != null) {
-      return (int) matcherRegEncodeAddr.getCIntegerAt(value, 1, true);
-    }
-    return value;
-  }
-
   public boolean equals(Object arg) {
     if ((arg != null) || (!(arg instanceof VMReg))) {
       return false;
diff --git a/test/hotspot/jtreg/ProblemList.txt b/test/hotspot/jtreg/ProblemList.txt
index f9ad5dbd1de..856a5381f90 100644
--- a/test/hotspot/jtreg/ProblemList.txt
+++ b/test/hotspot/jtreg/ProblemList.txt
@@ -43,7 +43,6 @@
 
 # :hotspot_compiler
 
-compiler/ciReplay/TestSAServer.java 8029528 generic-all
 compiler/compilercontrol/jcmd/ClearDirectivesFileStackTest.java 8225370 generic-all
 
 compiler/cpuflags/TestAESIntrinsicsOnSupportedConfig.java 8190680 generic-all
diff --git a/test/hotspot/jtreg/compiler/ciReplay/SABase.java b/test/hotspot/jtreg/compiler/ciReplay/SABase.java
deleted file mode 100644
index 66f2eb1106f..00000000000
--- a/test/hotspot/jtreg/compiler/ciReplay/SABase.java
+++ /dev/null
@@ -1,175 +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.
- */
-
-package compiler.ciReplay;
-
-import java.nio.file.Files;
-import java.nio.file.Paths;
-import java.io.BufferedReader;
-import java.io.FileReader;
-import java.io.IOException;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.OutputStream;
-import java.util.Arrays;
-import jdk.test.lib.Platform;
-import jdk.test.lib.Asserts;
-import jdk.test.lib.JDKToolFinder;
-import jdk.test.lib.process.OutputAnalyzer;
-import jdk.test.lib.process.ProcessTools;
-
-public class SABase extends CiReplayBase {
-    private static final String REPLAY_FILE_COPY = "replay_vm.txt";
-
-    public static void main(String args[]) throws Exception {
-        checkSetLimits();
-        SABase base = new SABase(args);
-        boolean c2 = base.runServer.orElseThrow(() -> new Error("runServer must be set"));
-        String[] extra = {};
-        if (Platform.isTieredSupported()) {
-            if (c2) {
-                // Replay produced on first compilation. We want that
-                // compilation delayed so profile data is produced.
-                extra = new String[] {"-XX:-TieredCompilation"};
-            } else {
-                extra = new String[] {"-XX:TieredStopAtLevel=1"};
-            }
-        }
-        base.runTest(/* needCoreDump = */ true, extra);
-    }
-
-    public SABase(String[] args) {
-        super(args);
-    }
-
-    @Override
-    public void testAction() {
-        try {
-            Files.move(Paths.get(REPLAY_FILE_NAME), Paths.get(REPLAY_FILE_COPY));
-        } catch (IOException ioe) {
-            throw new Error("Can't move files: " + ioe, ioe);
-        }
-        ProcessBuilder pb;
-        try {
-            pb = ProcessTools.createTestJavaProcessBuilder("--add-modules", "jdk.hotspot.agent",
-                   "--add-exports=jdk.hotspot.agent/sun.jvm.hotspot=ALL-UNNAMED",
-                    "sun.jvm.hotspot.CLHSDB", JDKToolFinder.getTestJDKTool("java"),
-                    TEST_CORE_FILE_NAME);
-        } catch (Exception e) {
-            throw new Error("Can't create process builder: " + e, e);
-        }
-        Process p;
-        try {
-            p = pb.start();
-        } catch (IOException ioe) {
-            throw new Error("Can't start child process: " + ioe, ioe);
-        }
-        OutputStream input = p.getOutputStream();
-        String str = "dumpreplaydata -a > " + REPLAY_FILE_NAME + "\nquit\n";
-        try {
-            input.write(str.getBytes());
-            input.flush();
-        } catch (IOException ioe) {
-            throw new Error("Problem writing process input: " + str, ioe);
-        }
-        try {
-            p.waitFor();
-        } catch (InterruptedException ie) {
-            throw new Error("Problem waitinig child process: " + ie, ie);
-        }
-        int exitValue = p.exitValue();
-        if (exitValue != 0) {
-            String output;
-            try {
-                output = new OutputAnalyzer(p).getOutput();
-            } catch (IOException ioe) {
-                throw new Error("Can't get failed CLHSDB process output: " + ioe, ioe);
-            }
-            throw new AssertionError("CLHSDB wasn't run successfully: " + output);
-        }
-        File replay = new File(REPLAY_FILE_NAME);
-        Asserts.assertTrue(replay.exists() && replay.isFile() && replay.length() > 0,
-                "Replay data wasn't generated by SA");
-        // other than comment lines, content of 2 files should be identical
-        try {
-            BufferedReader rep = new BufferedReader(new FileReader(replay));
-            BufferedReader repCopy = new BufferedReader(new FileReader(REPLAY_FILE_COPY));
-            boolean failure = false;
-            while (true) {
-                String l1;
-                while ((l1 = rep.readLine()) != null) {
-                    if (!l1.startsWith("#")) {
-                        break;
-                    }
-                }
-                String l2;
-                while ((l2 = repCopy.readLine()) != null) {
-                    if (!l2.startsWith("#")) {
-                        break;
-                    }
-                }
-                if (l1 == null || l2 == null) {
-                    if (l1 != null || l2 != null) {
-                        System.out.println("Warning: replay files are not equal");
-                        System.out.println("1: " + l1);
-                        System.out.println("2: " + l2);
-                        failure = true;
-                    }
-                    break;
-                }
-                if (!l1.equals(l2)) {
-                    System.out.println("Warning: replay files are not equal");
-                    System.out.println("1: " + l1);
-                    System.out.println("2: " + l2);
-                    failure = true;
-                }
-            }
-            if (failure) {
-                throw new RuntimeException("Warning: replay files are not equal");
-            }
-        } catch (IOException ioe) {
-            throw new Error("Can't read replay files: " + ioe, ioe);
-        }
-        commonTests();
-        runVmTests();
-    }
-
-    public static void checkSetLimits() {
-        if (!Platform.isWindows()) {
-            OutputAnalyzer oa;
-            try {
-                // first check if setting limit is possible
-                oa = ProcessTools.executeProcess("sh", "-c", RUN_SHELL_NO_LIMIT + "ulimit -c");
-            } catch (Throwable t) {
-                throw new Error("Can't set limits: " + t, t);
-            }
-            oa.shouldHaveExitValue(0);
-
-            String out = oa.getOutput().trim(); // cut win/*nix newlines
-            if (!out.equals("unlimited") && !out.equals("-1")) {
-                throw new Error("Unable to set limits");
-            }
-        }
-    }
-}
-
diff --git a/test/hotspot/jtreg/compiler/ciReplay/TestSAClient.java b/test/hotspot/jtreg/compiler/ciReplay/TestSAClient.java
deleted file mode 100644
index a5a89d13c50..00000000000
--- a/test/hotspot/jtreg/compiler/ciReplay/TestSAClient.java
+++ /dev/null
@@ -1,35 +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.
- */
-
-/**
- * @test
- * @bug 8011675
- * @library / /test/lib
- * @summary testing of ciReplay with using generated by SA replay.txt
- * @requires vm.hasSA & vm.flightRecorder != true & vm.compMode != "Xint" & vm.debug == true & vm.flavor == "client"
- * @modules java.base/jdk.internal.misc
- * @build jdk.test.whitebox.WhiteBox
- * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox
- * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
- *      compiler.ciReplay.SABase client
- */
diff --git a/test/hotspot/jtreg/compiler/ciReplay/TestSAServer.java b/test/hotspot/jtreg/compiler/ciReplay/TestSAServer.java
deleted file mode 100644
index 998f63e9ceb..00000000000
--- a/test/hotspot/jtreg/compiler/ciReplay/TestSAServer.java
+++ /dev/null
@@ -1,35 +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.
- */
-
-/**
- * @test
- * @bug 8011675
- * @library / /test/lib
- * @summary testing of ciReplay with using generated by SA replay.txt
- * @requires vm.hasSA & vm.flightRecorder != true & vm.compMode != "Xint" & vm.debug == true & vm.flavor == "server"
- * @modules java.base/jdk.internal.misc
- * @build jdk.test.whitebox.WhiteBox
- * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox
- * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
- *      compiler.ciReplay.SABase server
- */

From 30b0c6098028cce63e65bd9d563973f2774fa74d Mon Sep 17 00:00:00 2001
From: Thomas Schatzl <tschatzl@openjdk.org>
Date: Mon, 3 Mar 2025 12:31:33 +0000
Subject: [PATCH 188/587] 8350956: Fix repetitions of the word "the" in
 compiler component comments

Reviewed-by: rcastanedalo
---
 src/hotspot/cpu/arm/frame_arm.inline.hpp | 2 +-
 src/hotspot/share/opto/escape.cpp        | 2 +-
 src/hotspot/share/opto/vectorization.hpp | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/hotspot/cpu/arm/frame_arm.inline.hpp b/src/hotspot/cpu/arm/frame_arm.inline.hpp
index 801b2f6177c..92a48f22f8c 100644
--- a/src/hotspot/cpu/arm/frame_arm.inline.hpp
+++ b/src/hotspot/cpu/arm/frame_arm.inline.hpp
@@ -62,7 +62,7 @@ inline void frame::init(intptr_t* sp, intptr_t* unextended_sp, intptr_t* fp, add
   if (original_pc != nullptr) {
     _pc = original_pc;
     assert(_cb->as_nmethod()->insts_contains_inclusive(_pc),
-           "original PC must be in the main code section of the the compiled method (or must be immediately following it)");
+           "original PC must be in the main code section of the compiled method (or must be immediately following it)");
     _deopt_state = is_deoptimized;
   } else {
     _deopt_state = not_deoptimized;
diff --git a/src/hotspot/share/opto/escape.cpp b/src/hotspot/share/opto/escape.cpp
index 0ab911c18be..a90c27861c1 100644
--- a/src/hotspot/share/opto/escape.cpp
+++ b/src/hotspot/share/opto/escape.cpp
@@ -4472,7 +4472,7 @@ void ConnectionGraph::split_unique_types(GrowableArray<Node *>  &alloc_worklist,
       }
     } else if (n->is_AddP()) {
       if (has_reducible_merge_base(n->as_AddP(), reducible_merges)) {
-        // This AddP will go away when we reduce the the Phi
+        // This AddP will go away when we reduce the Phi
         continue;
       }
       Node* addp_base = get_addp_base(n);
diff --git a/src/hotspot/share/opto/vectorization.hpp b/src/hotspot/share/opto/vectorization.hpp
index 620eac25c9b..2a2186ab0aa 100644
--- a/src/hotspot/share/opto/vectorization.hpp
+++ b/src/hotspot/share/opto/vectorization.hpp
@@ -445,7 +445,7 @@ private:
 // types (byte, char, short). In the C2 IR, their operations are
 // done with full int type with 4 byte precision (e.g. AddI, MulI).
 // Example:  char a,b,c;  a = (char)(b + c);
-// However, if we can prove the the upper bits are only truncated,
+// However, if we can prove the upper bits are only truncated,
 // and the lower bits for the narrower type computed correctly, we
 // can compute the operations in the narrower type directly (e.g we
 // perform the AddI or MulI with 1 or 2 bytes). This allows us to

From f47232ad7129e40bdc433525a66de2ca6657f211 Mon Sep 17 00:00:00 2001
From: Thomas Schatzl <tschatzl@openjdk.org>
Date: Mon, 3 Mar 2025 13:57:57 +0000
Subject: [PATCH 189/587] 8350954: Fix repetitions of the word "the" in gc
 component comments

Reviewed-by: iwalulya, ayang
---
 src/hotspot/share/gc/g1/g1ConcurrentRefine.cpp | 2 +-
 src/hotspot/share/gc/z/zLiveMap.inline.hpp     | 2 +-
 src/hotspot/share/gc/z/zRelocate.cpp           | 6 +++---
 src/hotspot/share/gc/z/zUncoloredRoot.hpp      | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/hotspot/share/gc/g1/g1ConcurrentRefine.cpp b/src/hotspot/share/gc/g1/g1ConcurrentRefine.cpp
index 2e48e438fc9..ce4738d784e 100644
--- a/src/hotspot/share/gc/g1/g1ConcurrentRefine.cpp
+++ b/src/hotspot/share/gc/g1/g1ConcurrentRefine.cpp
@@ -268,7 +268,7 @@ public:
   size_t sampled_code_root_rs_length() const { return _sampled_code_root_rs_length; }
 };
 
-// Adjust the target length (in regions) of the young gen, based on the the
+// Adjust the target length (in regions) of the young gen, based on the
 // current length of the remembered sets.
 //
 // At the end of the GC G1 determines the length of the young gen based on
diff --git a/src/hotspot/share/gc/z/zLiveMap.inline.hpp b/src/hotspot/share/gc/z/zLiveMap.inline.hpp
index 54589e45c45..9a5529dac04 100644
--- a/src/hotspot/share/gc/z/zLiveMap.inline.hpp
+++ b/src/hotspot/share/gc/z/zLiveMap.inline.hpp
@@ -222,7 +222,7 @@ inline BitMap::idx_t ZLiveMap::find_base_bit_in_segment(BitMap::idx_t start, Bit
   }
 
   // The bitmaps contain pairs of bits to deal with strongly marked vs only
-  // finalizable marked. Align down to get the the first bit position.
+  // finalizable marked. Align down to get the first bit position.
   return bit & ~BitMap::idx_t(1);
 }
 
diff --git a/src/hotspot/share/gc/z/zRelocate.cpp b/src/hotspot/share/gc/z/zRelocate.cpp
index 805044f9deb..213452e8d05 100644
--- a/src/hotspot/share/gc/z/zRelocate.cpp
+++ b/src/hotspot/share/gc/z/zRelocate.cpp
@@ -669,9 +669,9 @@ private:
     // moved them over to the current bitmap.
     //
     // If the young generation runs multiple cycles while the old generation is
-    // relocating, then the first cycle will have consume the the old remset,
+    // relocating, then the first cycle will have consumed the old remset,
     // bits and moved associated objects to a new old page. The old relocation
-    // could find either the the two bitmaps. So, either it will find the original
+    // could find either of the two bitmaps. So, either it will find the original
     // remset bits for the page, or it will find an empty bitmap for the page. It
     // doesn't matter for correctness, because the young generation marking has
     // already taken care of the bits.
@@ -865,7 +865,7 @@ private:
     start_in_place_relocation_prepare_remset(from_page);
 
     if (promotion) {
-      // Register the the promotion
+      // Register the promotion
       ZGeneration::young()->in_place_relocate_promote(from_page, to_page);
       ZGeneration::young()->register_in_place_relocate_promoted(from_page);
     }
diff --git a/src/hotspot/share/gc/z/zUncoloredRoot.hpp b/src/hotspot/share/gc/z/zUncoloredRoot.hpp
index e980bd70eb2..c007176e5c2 100644
--- a/src/hotspot/share/gc/z/zUncoloredRoot.hpp
+++ b/src/hotspot/share/gc/z/zUncoloredRoot.hpp
@@ -51,7 +51,7 @@
 // The zaddress_unsafe type is used to hold uncolored oops that the GC needs
 // to process before it is safe to use. E.g. the original object might have
 // been relocated and the address needs to be updated. The zaddress type
-// denotes that this pointer refers the the correct address of the object.
+// denotes that this pointer refers to the correct address of the object.
 
 class ZUncoloredRoot : public AllStatic {
 private:

From db69ec9e583791d359c5c0acb504c7f01e963e3b Mon Sep 17 00:00:00 2001
From: Thomas Stuefe <stuefe@openjdk.org>
Date: Mon, 3 Mar 2025 14:39:19 +0000
Subject: [PATCH 190/587] 8344009: Improve compiler memory statistics

Reviewed-by: rcastanedalo, asmehra
---
 src/hotspot/share/c1/c1_Compilation.cpp       |    2 +
 src/hotspot/share/ci/ciEnv.cpp                |    4 +-
 src/hotspot/share/ci/ciObjectFactory.cpp      |    2 +-
 .../compiler/compilationMemStatInternals.hpp  |  287 ++++
 .../compilationMemStatInternals.inline.hpp    |   95 ++
 .../compiler/compilationMemoryStatistic.cpp   | 1199 ++++++++++++-----
 .../compiler/compilationMemoryStatistic.hpp   |  121 +-
 src/hotspot/share/compiler/compilerOracle.cpp |    6 -
 src/hotspot/share/compiler/compilerOracle.hpp |    1 -
 src/hotspot/share/compiler/compilerThread.cpp |    6 +-
 src/hotspot/share/compiler/compilerThread.hpp |    3 +-
 src/hotspot/share/memory/arena.cpp            |   47 +-
 src/hotspot/share/memory/arena.hpp            |   30 +-
 src/hotspot/share/memory/resourceArea.hpp     |    8 +-
 src/hotspot/share/opto/chaitin.cpp            |    4 +-
 src/hotspot/share/opto/compile.cpp            |   32 +-
 src/hotspot/share/opto/compile.hpp            |    4 +-
 src/hotspot/share/opto/gcm.cpp                |    2 +-
 src/hotspot/share/opto/matcher.cpp            |    2 +-
 src/hotspot/share/opto/phase.hpp              |    9 +-
 src/hotspot/share/opto/runtime.cpp            |    2 +
 src/hotspot/share/opto/superword.cpp          |    2 +-
 src/hotspot/share/opto/type.cpp               |    2 +-
 src/hotspot/share/opto/vectorization.hpp      |    4 +-
 src/hotspot/share/opto/vtransform.hpp         |    2 +-
 src/hotspot/share/runtime/globals.hpp         |    3 +
 src/hotspot/share/runtime/java.cpp            |    4 +-
 .../share/services/diagnosticCommand.cpp      |   11 +-
 .../share/services/diagnosticCommand.hpp      |    7 +-
 src/hotspot/share/utilities/vmError.cpp       |   14 +-
 .../print/CompileCommandMemLimit.java         |  111 +-
 .../print/CompileCommandPrintMemStat.java     |   97 +-
 32 files changed, 1511 insertions(+), 612 deletions(-)
 create mode 100644 src/hotspot/share/compiler/compilationMemStatInternals.hpp
 create mode 100644 src/hotspot/share/compiler/compilationMemStatInternals.inline.hpp

diff --git a/src/hotspot/share/c1/c1_Compilation.cpp b/src/hotspot/share/c1/c1_Compilation.cpp
index 9b80c8a20a8..98ec1959cc2 100644
--- a/src/hotspot/share/c1/c1_Compilation.cpp
+++ b/src/hotspot/share/c1/c1_Compilation.cpp
@@ -410,6 +410,8 @@ int Compilation::compile_java_method() {
     env()->dump_replay_data(env()->compile_id());
   }
 
+  DEBUG_ONLY(CompilationMemoryStatistic::do_test_allocations();)
+
   {
     PhaseTraceTime timeit(_t_codeemit);
     return emit_code_body();
diff --git a/src/hotspot/share/ci/ciEnv.cpp b/src/hotspot/share/ci/ciEnv.cpp
index e87c5ba08e9..2a88154faf6 100644
--- a/src/hotspot/share/ci/ciEnv.cpp
+++ b/src/hotspot/share/ci/ciEnv.cpp
@@ -106,7 +106,7 @@ static bool firstEnv = true;
 // ------------------------------------------------------------------
 // ciEnv::ciEnv
 ciEnv::ciEnv(CompileTask* task)
-  : _ciEnv_arena(mtCompiler) {
+  : _ciEnv_arena(mtCompiler, Arena::Tag::tag_cienv) {
   VM_ENTRY_MARK;
 
   // Set up ciEnv::current immediately, for the sake of ciObjectFactory, etc.
@@ -238,7 +238,7 @@ public:
   }
 };
 
-ciEnv::ciEnv(Arena* arena) : _ciEnv_arena(mtCompiler) {
+ciEnv::ciEnv(Arena* arena) : _ciEnv_arena(mtCompiler, Arena::Tag::tag_cienv) {
   ASSERT_IN_VM;
 
   // Set up ciEnv::current immediately, for the sake of ciObjectFactory, etc.
diff --git a/src/hotspot/share/ci/ciObjectFactory.cpp b/src/hotspot/share/ci/ciObjectFactory.cpp
index 35ec27b8aaa..1fa590e4ad3 100644
--- a/src/hotspot/share/ci/ciObjectFactory.cpp
+++ b/src/hotspot/share/ci/ciObjectFactory.cpp
@@ -108,7 +108,7 @@ void ciObjectFactory::initialize() {
   // This Arena is long lived and exists in the resource mark of the
   // compiler thread that initializes the initial ciObjectFactory which
   // creates the shared ciObjects that all later ciObjectFactories use.
-  Arena* arena = new (mtCompiler) Arena(mtCompiler);
+  Arena* arena = new (mtCompiler) Arena(mtCompiler, Arena::Tag::tag_cienv);
   ciEnv initial(arena);
   ciEnv* env = ciEnv::current();
   env->_factory->init_shared_objects();
diff --git a/src/hotspot/share/compiler/compilationMemStatInternals.hpp b/src/hotspot/share/compiler/compilationMemStatInternals.hpp
new file mode 100644
index 00000000000..a6050823771
--- /dev/null
+++ b/src/hotspot/share/compiler/compilationMemStatInternals.hpp
@@ -0,0 +1,287 @@
+/*
+ * Copyright (c) 2024, 2025, Red Hat, Inc. and/or its affiliates.
+ * Copyright (c) 2024, 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please 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_COMPILER_COMPILATIONMEMSTATINTERNALS_HPP
+#define SHARE_COMPILER_COMPILATIONMEMSTATINTERNALS_HPP
+
+#include "compiler/compilationMemoryStatistic.hpp"
+#include "compiler/compilerDefinitions.hpp"
+#include "memory/allocation.hpp"
+#include "memory/arena.hpp"
+#include "utilities/globalDefinitions.hpp"
+
+#ifdef COMPILER2
+#include "opto/phase.hpp"
+#endif
+
+class CompileTask;
+class Method;
+class Symbol;
+class outputStream;
+
+#ifdef COMPILER2
+constexpr int phase_trc_id_max     = (int)Phase::PhaseTraceId::max_phase_timers;
+constexpr int phase_trc_id_none    = (int)Phase::PhaseTraceId::_t_none;
+#else
+// In minimal builds, the ArenaCounterTable is just a single-dimension vector of arena tags (see below)
+constexpr int phase_trc_id_max = 1;
+constexpr int phase_trc_id_none = 0;
+#endif
+inline void check_phase_trace_id(int v) { assert(v >= 0 && v < phase_trc_id_max, "OOB (%d)", v); }
+
+constexpr int arena_tag_max = (int)Arena::Tag::tag_count;
+inline void check_arena_tag(int v) { assert(v >= 0 && v < arena_tag_max, "OOB (%d)", v); }
+
+// A two-dimensional table, containing byte counters per arena type and
+// per compilation phase.
+class ArenaCounterTable {
+  size_t _v[phase_trc_id_max][arena_tag_max];
+public:
+  ArenaCounterTable();
+  void copy_from(const ArenaCounterTable& other);
+  inline size_t at(int phase_trc_id, int arena_tag) const;
+  inline void add(size_t size, int phase_trc_id, int arena_tag);
+  inline void sub(size_t size, int phase_trc_id, int arena_tag);
+  void print_on(outputStream* ss) const;
+  void summarize(size_t out[arena_tag_max]) const;
+};
+
+struct PhaseInfo {
+  int id, num;
+  const char* text;
+};
+
+// A stack keeping track of the current compilation phase. Fixed-width for simplicity
+// (we should never go beyond 5 or so in depth).
+class PhaseInfoStack {
+  static constexpr int max_depth = 16;
+  int _depth;
+  PhaseInfo _stack[max_depth];
+public:
+  inline PhaseInfoStack();
+  inline bool empty() const { return _depth == 0; }
+  inline void push(PhaseInfo info);
+  inline void pop();
+  inline const PhaseInfo& top() const;
+  inline int depth() const  { return _depth; }
+};
+
+// A very simple fixed-width FIFO buffer, used for the phase timeline
+template <typename T, int size>
+class SimpleFifo {
+  STATIC_ASSERT((size * 2) < INT_MAX);
+  T _v[size];
+  int _pos;
+  int _oldest;
+  uint64_t _lost;
+
+  int current_pos() const           { return _pos; }
+  static int pos_to_index(int pos)  { return pos % size; }
+  T& at(int pos)                    { return *(_v + pos_to_index(pos)); }
+
+public:
+  SimpleFifo() : _pos(0), _oldest(0), _lost(0UL) {}
+  T& current()                      { return at(current_pos()); }
+  T& last()                         { assert(!empty(), "sanity"); return at(current_pos() - 1); }
+  bool empty() const                { return _pos == _oldest; }
+  uint64_t lost() const             { return _lost; }
+
+  void advance() {
+    _pos ++;
+    if (_pos >= size) {
+      _oldest ++;
+      _lost ++;
+    }
+    if (_pos == INT_MAX) {
+      _pos -= size;
+      _oldest -= size;
+    }
+  }
+
+  void revert() {
+    assert(!empty(), "sanity");
+    _pos--;
+  }
+
+  template<typename F>
+  void iterate_all(F f) const {
+    for (int i = _oldest; i < _pos; i++) {
+      const int index = pos_to_index(i);
+      f(_v[index]);
+    }
+  }
+
+  void copy_from(const SimpleFifo& other) {
+    memcpy(_v, other._v, sizeof(_v));
+    _pos = other._pos;
+    _lost = other._lost;
+    _oldest = other._oldest;
+  }
+};
+
+// Holds a table of n entries; each entry keeping start->end footprints when
+// a phase started and ended; each entry also keeping the phase-local peak (if
+// a phase caused a temporary spike in footprint that vanished before the phase
+// ended).
+// Handling nested phases: for this structure, there is always a phase active;
+// if a phase ends, we "restart" the parent phase (which often is the
+// "outside any phase" phase).
+class FootprintTimeline {
+public:
+  static constexpr unsigned max_num_phases = 256; // beyond that we wrap, keeping just the last n phases
+private:
+  template <typename T, typename dT>
+  struct C {
+    T start, peak, cur;
+    void init(T v)        { start = cur = peak = v; }
+    void update(T v)      { cur = v; if (v > peak) peak = v; }
+    dT end_delta() const  { return (dT)cur - (dT)start; }
+    // Returns the peak size during this phase: how high usage rose above either
+    // start or end of phase. The background is that we want to know the max. memory
+    // consumption during this phase, but that may not be reflected by the start or the
+    // end counters if an Arena was created during the phase and only lived temporarily.
+    size_t temporary_peak_size() const { return MIN2(peak - cur, peak - start); }
+  };
+  struct Entry {
+    PhaseInfo info;
+    int level;
+    C<size_t, ssize_t> _bytes;
+    C<unsigned, signed int> _live_nodes;
+  };
+  SimpleFifo<Entry, max_num_phases> _fifo;
+  DEBUG_ONLY(bool _inbetween_phases;)
+public:
+  FootprintTimeline();
+  void copy_from(const FootprintTimeline& other);
+  inline void on_footprint_change(size_t cur_abs, unsigned cur_nodes);
+  void on_phase_end(size_t cur_abs, unsigned cur_nodes);
+  void on_phase_start(PhaseInfo info, size_t cur_abs, unsigned cur_nodes, int level);
+  void print_on(outputStream* st) const;
+};
+
+// We keep the name of the involved symbols in Symbol (made permanent) instead of resolving them to string and
+// storing those. That significantly reduces footprint for the result store and delays resolving until printing
+// time, which may be never.
+class FullMethodName {
+  Symbol* _k;
+  Symbol* _m;
+  Symbol* _s;
+public:
+  FullMethodName();
+  FullMethodName(const Method* m);
+  FullMethodName(const FullMethodName& o);
+  FullMethodName& operator=(const FullMethodName& o);
+  void make_permanent();
+  void print_on(outputStream* st) const;
+  char* as_C_string(char* buf, size_t len) const;
+  bool operator== (const FullMethodName& b) const;
+  DEBUG_ONLY(bool is_test_class() const;)
+};
+
+// ArenaState is the central data structure holding all statistics and temp data during
+// a single compilation. It is created on demand (if memstat is active) and tied to the
+// CompilerThread.
+class ArenaStatCounter : public CHeapObj<mtCompiler> {
+
+  FullMethodName _fmn;
+
+  // from directives
+  const bool _should_print_memstat;
+  const bool _should_crash_on_memlimit;
+
+  // Bytes total now
+  size_t _current;
+  // Bytes total at last global peak
+  size_t _peak;
+  // Bytes per arena/phase, now
+  ArenaCounterTable _counters_current;
+  // Bytes per arena/phase when we last reached the global peak
+  ArenaCounterTable _counters_at_global_peak;
+
+  // Number of live nodes now (C2 only)
+  unsigned _live_nodes_current;
+  // Number of live nodes at global peak (C2 only)
+  unsigned _live_nodes_at_global_peak;
+
+  // MemLimit handling
+  const size_t _limit;
+  bool _hit_limit;
+  bool _limit_in_process;
+
+  // Keep track of current C2 phase
+  int _phase_counter;
+  PhaseInfoStack _phase_info_stack;
+
+  // Keep track of C2 phase allocations over time
+  FootprintTimeline _timeline;
+
+  const CompilerType _comp_type;
+  const int _comp_id;
+
+  DEBUG_ONLY(bool _is_test_class;)
+
+  int retrieve_live_node_count() const;
+
+public:
+  ArenaStatCounter(const CompileTask* task, size_t limit);
+
+  void on_phase_start(PhaseInfo info);
+  void on_phase_end();
+
+  // Account an arena allocation. Returns true if new peak reached.
+  bool on_arena_chunk_allocation(size_t size, int arena_tag, uint64_t* stamp);
+
+  // Account an arena deallocation.
+  void on_arena_chunk_deallocation(size_t size, uint64_t stamp);
+
+  void print_peak_state_on(outputStream* st) const;
+  void print_error_state_on(outputStream* st) const;
+
+  size_t limit() const                  { return _limit; }
+  bool   hit_limit() const              { return _hit_limit; }
+  bool   limit_in_process() const       { return _limit_in_process; }
+  void   set_limit_in_process(bool v)   { _limit_in_process = v; }
+
+  const FullMethodName& fmn() const     { return _fmn; }
+  bool should_print_memstat()           { return _should_print_memstat; };
+  bool should_crash_on_memlimit() const { return _should_crash_on_memlimit; };
+
+  CompilerType comp_type() const        { return _comp_type; }
+  int comp_id() const                   { return _comp_id; }
+  DEBUG_ONLY(bool is_test_class() const { return _is_test_class; })
+
+  // Bytes total at last global peak
+  size_t peak() const                   { return _peak; }
+
+  // Bytes per arena/phase when we last reached the global peak
+  const ArenaCounterTable& counters_at_global_peak() const { return _counters_at_global_peak; }
+  const FootprintTimeline& timeline() const                { return _timeline; }
+  // Number of live nodes at global peak (C2 only)
+  unsigned live_nodes_at_global_peak() const { return _live_nodes_at_global_peak; }
+
+  int advance_phase_counter() { return ++_phase_counter; }
+};
+
+#endif // SHARE_COMPILER_COMPILATIONMEMSTATINTERNALS_HPP
diff --git a/src/hotspot/share/compiler/compilationMemStatInternals.inline.hpp b/src/hotspot/share/compiler/compilationMemStatInternals.inline.hpp
new file mode 100644
index 00000000000..94be8606ac9
--- /dev/null
+++ b/src/hotspot/share/compiler/compilationMemStatInternals.inline.hpp
@@ -0,0 +1,95 @@
+/*
+ * Copyright (c) 2024, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2024, 2025, Red Hat, Inc. and/or its affiliates.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please 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_COMPILATIONMEMSTATINTERNALS_INLINE_HPP
+#define SHARE_COMPILATIONMEMSTATINTERNALS_INLINE_HPP
+
+#include "compiler/compilationMemStatInternals.hpp"
+
+inline PhaseInfoStack::PhaseInfoStack() : _depth(0) {}
+
+inline void PhaseInfoStack::push(PhaseInfo info) {
+#ifdef ASSERT
+  check_phase_trace_id(info.id);
+  if (_depth == 0) {
+    assert(info.id == phase_trc_id_none, "first entry must be none");
+  } else {
+    assert(info.id != phase_trc_id_none, "subsequent entries must not be none");
+  }
+  assert(_depth < max_depth, "Sanity");
+#endif // ASSERT
+  _stack[_depth] = info;
+  if (_depth < max_depth) {
+    _depth++;
+  }
+}
+
+inline void PhaseInfoStack::pop() {
+#ifdef ASSERT
+  assert(!empty(), "Sanity ");
+  const PhaseInfo to_be_popped = top();
+  if (_depth == 1) {
+    assert(to_be_popped.id == phase_trc_id_none, "first entry must be none");
+  } else {
+    assert(to_be_popped.id != phase_trc_id_none, "subsequent entries must not be none");
+  }
+#endif // ASSERT
+  if (_depth > 0) {
+    _depth--;
+  }
+}
+
+inline const PhaseInfo& PhaseInfoStack::top() const {
+  assert(!empty(), "Sanity");
+  return _stack[_depth - 1];
+}
+
+inline size_t ArenaCounterTable::at(int phase_trc_id, int arena_tag) const {
+  check_phase_trace_id(phase_trc_id);
+  check_arena_tag(arena_tag);
+  return _v[phase_trc_id][arena_tag];
+}
+
+inline void ArenaCounterTable::add(size_t size, int phase_trc_id, int arena_tag) {
+  check_arena_tag(arena_tag);
+  const size_t old = at(phase_trc_id, arena_tag);
+  _v[phase_trc_id][arena_tag] += size;
+  assert(at(phase_trc_id, arena_tag) >= old, "Overflow");
+}
+
+inline void ArenaCounterTable::sub(size_t size, int phase_trc_id, int arena_tag) {
+  check_arena_tag(arena_tag);
+  assert(at(phase_trc_id, arena_tag) >= size, "Underflow (%zu %zu)", at(phase_trc_id, arena_tag), size);
+  _v[phase_trc_id][arena_tag] -= size;
+}
+
+inline void FootprintTimeline::on_footprint_change(size_t cur_abs, unsigned cur_nodes) {
+  assert(!_inbetween_phases, "no phase started?");
+  Entry& e = _fifo.current();
+  e._bytes.update(cur_abs);
+  e._live_nodes.update(cur_nodes);
+}
+
+#endif // SHARE_COMPILATIONMEMSTATINTERNALS_INLINE_HPP
diff --git a/src/hotspot/share/compiler/compilationMemoryStatistic.cpp b/src/hotspot/share/compiler/compilationMemoryStatistic.cpp
index 89d0b60212e..41991567c9a 100644
--- a/src/hotspot/share/compiler/compilationMemoryStatistic.cpp
+++ b/src/hotspot/share/compiler/compilationMemoryStatistic.cpp
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2023, 2025, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2023, 2024, Red Hat, Inc. and/or its affiliates.
+ * Copyright (c) 2023, 2025, Red Hat, Inc. and/or its affiliates.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,413 +23,778 @@
  *
  */
 
+#include "code/nmethod.hpp"
+#include "compiler/abstractCompiler.hpp"
+#include "compiler/compilationMemStatInternals.inline.hpp"
+#include "compiler/compilerDefinitions.inline.hpp"
+#include "compiler/compilerDirectives.hpp"
+#include "compiler/compilerOracle.hpp"
+#include "compiler/compilerThread.hpp"
+#include "compiler/compileTask.hpp"
 #include "logging/log.hpp"
 #include "logging/logStream.hpp"
-#ifdef COMPILER1
-#include "c1/c1_Compilation.hpp"
-#endif
-#include "compiler/abstractCompiler.hpp"
-#include "compiler/compilationMemoryStatistic.hpp"
-#include "compiler/compilerDirectives.hpp"
-#include "compiler/compileTask.hpp"
-#include "compiler/compilerDefinitions.hpp"
-#include "compiler/compilerThread.hpp"
 #include "memory/arena.hpp"
-#include "memory/resourceArea.hpp"
 #include "nmt/nmtCommon.hpp"
+#include "oops/method.inline.hpp"
 #include "oops/symbol.hpp"
-#ifdef COMPILER2
-#include "opto/node.hpp" // compile.hpp is not self-contained
-#include "opto/compile.hpp"
-#endif
+#include "runtime/atomic.hpp"
 #include "runtime/mutexLocker.hpp"
 #include "runtime/os.hpp"
+#include "utilities/checkedCast.hpp"
 #include "utilities/debug.hpp"
 #include "utilities/globalDefinitions.hpp"
 #include "utilities/ostream.hpp"
-#include "utilities/quickSort.hpp"
-#include "utilities/resourceHash.hpp"
 
-ArenaStatCounter::ArenaStatCounter() {
-  reset();
-}
+#ifdef COMPILER1
+#include "c1/c1_Compilation.hpp"
+#endif
 
-void ArenaStatCounter::reset() {
-  _current = 0;
-  _peak = 0;
-  _current_by_tag.clear();
-  _peak_by_tag.clear();
-  _limit = 0;
-  _hit_limit = false;
-  _limit_in_process = false;
-  _live_nodes_at_peak = 0;
-  _active = false;
-}
-
-void ArenaStatCounter::start(size_t limit) {
-  reset();
-  _active = true;
-  _limit = limit;
-}
-
-void ArenaStatCounter::end() {
-  _limit = 0;
-  _hit_limit = false;
-  _active = false;
-}
-
-void ArenaStatCounter::update_c2_node_count() {
-  assert(_active, "compilaton has not yet started");
 #ifdef COMPILER2
-  CompilerThread* const th = Thread::current()->as_Compiler_thread();
-  const CompileTask* const task = th->task();
-  if (task != nullptr &&
-      th->task()->compiler() != nullptr &&
-      th->task()->compiler()->type() == compiler_c2) {
-    const Compile* const comp = Compile::current();
-    if (comp != nullptr) {
-      _live_nodes_at_peak = comp->live_nodes();
+#include "opto/compile.hpp"
+#include "opto/node.hpp" // compile.hpp is not self-contained
+#endif
+
+static const char* phase_trc_id_to_string(int phase_trc_id) {
+  return COMPILER2_PRESENT(Phase::get_phase_trace_id_text((Phase::PhaseTraceId)phase_trc_id))
+         NOT_COMPILER2("");
+}
+
+// If crash option on memlimit is enabled and an oom occurred, the stats for the
+// first offending compilation.
+static ArenaStatCounter* volatile _arenastat_oom_crash = nullptr;
+
+// Arena-chunk stamping
+union chunkstamp_t {
+  uint64_t raw;
+  struct {
+    uint32_t tracked;
+    uint16_t arena_tag;
+    uint16_t phase_id;
+  };
+};
+STATIC_ASSERT(sizeof(chunkstamp_t) == sizeof(chunkstamp_t::raw));
+
+ArenaCounterTable::ArenaCounterTable() {
+  memset(_v, 0, sizeof(_v));
+}
+
+void ArenaCounterTable::copy_from(const ArenaCounterTable& other) {
+  memcpy(_v, other._v, sizeof(_v));
+}
+
+void ArenaCounterTable::summarize(size_t out[arena_tag_max]) const {
+  memset(out, 0, arena_tag_max * sizeof(size_t));
+  for (int i = 0; i < phase_trc_id_max; i++) {
+    for (int j = 0; j < arena_tag_max; j++) {
+      out[j] += _v[i][j];
     }
   }
-#endif
 }
 
-// Account an arena allocation or de-allocation.
-bool ArenaStatCounter::account(ssize_t delta, int tag) {
-  assert(_active, "compilaton has not yet started");
-  bool rc = false;
+void ArenaCounterTable::print_on(outputStream* st) const {
+  bool header_printed = false;
+  for (int phase_trc_id = 0; phase_trc_id < phase_trc_id_max; phase_trc_id++) {
+    size_t sum = 0;
+    for (int arena_tag = 0; arena_tag < arena_tag_max; arena_tag++) {
+      sum += at(phase_trc_id, arena_tag);
+    }
+    if (sum > 0) { // omit phases that did not contribute to allocation load
+      if (!header_printed) {
+        st->print("%-24s %10s", "Phase", "Total");
+        for (int arena_tag = 0; arena_tag < arena_tag_max; arena_tag++) {
+          st->print("%10s", Arena::tag_name[arena_tag]);
+        }
+        st->cr();
+        header_printed = true;
+      }
+      st->print("%-24s ", phase_trc_id_to_string(phase_trc_id));
+      st->print("%10zu", sum);
+      for (int arena_tag = 0; arena_tag < arena_tag_max; arena_tag++) {
+        const size_t v = at(phase_trc_id, arena_tag);
+        st->print("%10zu", v);
+      }
+      st->cr();
+    }
+  }
+}
+
+// When reporting phase footprint movements, if phase-local peak over start as well over end
+// was larger than this threshold, we report it.
+static constexpr size_t significant_peak_threshold = M;
+
+FootprintTimeline::FootprintTimeline() {
+  DEBUG_ONLY(_inbetween_phases = true;)
+}
+
+void FootprintTimeline::copy_from(const FootprintTimeline& other) {
+  _fifo.copy_from(other._fifo);
+  DEBUG_ONLY(_inbetween_phases = other._inbetween_phases;)
+}
+
+void FootprintTimeline::print_on(outputStream* st) const {
+  const int start_indent = st->indentation();
+  if (!_fifo.empty()) {
+               // .123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789
+    st->print_cr("Phase seq. number                             Bytes                  Nodes");
+    unsigned from = 0;
+    if (_fifo.lost() > 0) {
+      st->print_cr("         (" UINT64_FORMAT " older entries lost)", _fifo.lost());
+    }
+    int last_level = 0;
+    int last_num = 0; // see if we are regressing
+    auto printer = [&](const Entry& e) {
+      int col = start_indent;
+      check_phase_trace_id(e.info.id);
+      st->print("%*s", e.level,
+          ((e.level < last_level) ? "<" : ((e.level > last_level) ? ">" : " "))
+      );
+      last_level = e.level;
+      st->print("%d ", e.info.num);
+      if (e.info.num < last_num) {
+        st->print("(cont.) ");
+      }
+      last_num = e.info.num;
+      col += 15; st->fill_to(col);
+      st->print("%24s", e.info.text);
+      col += 25; st->fill_to(col);
+      char tmp[64];
+      os::snprintf(tmp, sizeof(tmp), "%9zu (%+zd)", e._bytes.cur, e._bytes.end_delta());
+      st->print("%s ", tmp); // end
+      col += 21; st->fill_to(col);
+      os::snprintf(tmp, sizeof(tmp), "%6u (%+d)", e._live_nodes.cur, e._live_nodes.end_delta());
+      st->print("%s ", tmp); // end
+      if (e._bytes.temporary_peak_size() > significant_peak_threshold) {
+        col += 20; st->fill_to(col);
+        st->print(" significant temporary peak: %zu (%+zd)", e._bytes.peak, (ssize_t)e._bytes.peak - e._bytes.start); // peak
+      }
+      st->cr();
+    };
+    _fifo.iterate_all(printer);
+  }
+}
+
+void FootprintTimeline::on_phase_end(size_t cur_abs, unsigned cur_nodes) {
+  const Entry& old = _fifo.current();
+
+  // One last counter update in old phase:
+  // We see all allocations, so cur_abs given should correspond to our topmost cur.
+  // But the same does not hold for nodes, since we only get updated when node allocation
+  // would cause a new arena chunk to be born. Node allocations that don't cause arena
+  // chunks (the vast majority) fly by us.
+  assert(old._bytes.cur == cur_abs, "miscount");
+  on_footprint_change(cur_abs, cur_nodes);
+
+  // Close old, open new entry
+  _fifo.advance();
+
+  DEBUG_ONLY(_inbetween_phases = true;)
+}
+
+void FootprintTimeline::on_phase_start(PhaseInfo info, size_t cur_abs, unsigned cur_nodes, int level) {
+  if (!_fifo.empty() && _fifo.last().info.id == info.id && _fifo.last().level == level) {
+    // Two phases with the same id are collapsed if they were not interleaved by another phase
+    _fifo.revert();
+    // We now just continue bookkeeping into the last entry
+  } else {
+    // seed current entry
+    Entry& e = _fifo.current();
+    e._bytes.init(cur_abs);
+    e._live_nodes.init(cur_nodes);
+    e.info = info;
+    e.level = level;
+  }
+  DEBUG_ONLY(_inbetween_phases = false;)
+}
+
+FullMethodName::FullMethodName() : _k(nullptr), _m(nullptr), _s(nullptr) {}
+
+FullMethodName::FullMethodName(const Method* m) :
+  _k(m->klass_name()), _m(m->name()), _s(m->signature()) {};
+
+FullMethodName::FullMethodName(const FullMethodName& o) : _k(o._k), _m(o._m), _s(o._s) {}
+
+FullMethodName& FullMethodName::operator=(const FullMethodName& o) {
+  _k = o._k; _m = o._m; _s = o._s;
+  return *this;
+}
+
+void FullMethodName::make_permanent() {
+  _k->make_permanent();
+  _m->make_permanent();
+  _s->make_permanent();
+}
+
+void FullMethodName::print_on(outputStream* st) const {
+  char tmp[1024];
+  st->print_raw(_k->as_C_string(tmp, sizeof(tmp)));
+  st->print_raw("::");
+  st->print_raw(_m->as_C_string(tmp, sizeof(tmp)));
+  st->put('(');
+  st->print_raw(_s->as_C_string(tmp, sizeof(tmp)));
+  st->put(')');
+}
+
+char* FullMethodName::as_C_string(char* buf, size_t len) const {
+  stringStream ss(buf, len);
+  print_on(&ss);
+  return buf;
+}
+
+bool FullMethodName::operator== (const FullMethodName& b) const {
+  return _k == b._k && _m == b._m && _s == b._s;
+}
+
 #ifdef ASSERT
-  // Note: if this fires, we free more arena memory under the scope of the
-  // CompilationMemoryHistoryMark than we allocate. This cannot be since we
-  // assume arena allocations in CompilerThread to be stack bound and symmetric.
-  assert(delta >= 0 || ((ssize_t)_current + delta) >= 0,
-         "Negative overflow (d=%zd %zu %zu)", delta, _current, _peak);
-#endif
-  // Update totals
-  _current += delta;
-  _current_by_tag.add(tag, delta);
-  // Did we reach a peak?
+bool FullMethodName::is_test_class() const {
+  char tmp[1024];
+  _k->as_C_string(tmp, sizeof(tmp));
+  return strstr(tmp, "CompileCommandPrintMemStat") != nullptr ||
+         strstr(tmp, "CompileCommandMemLimit") != nullptr;
+}
+#endif // ASSERT
+
+ArenaStatCounter::ArenaStatCounter(const CompileTask* task, size_t limit) :
+    _fmn(task->method()),
+    _should_print_memstat(task->directive()->should_print_memstat()),
+    _should_crash_on_memlimit(task->directive()->should_crash_at_mem_limit()),
+    _current(0), _peak(0), _live_nodes_current(0), _live_nodes_at_global_peak(0),
+    _limit(limit), _hit_limit(false), _limit_in_process(false),
+    _phase_counter(0), _comp_type(task->compiler()->type()), _comp_id(task->compile_id())
+    DEBUG_ONLY(COMMA _is_test_class(false))
+{
+  _fmn.make_permanent();
+#ifdef ASSERT
+  // If the class name matches the JTreg test class, we are in test mode and
+  // will do some test allocations to test the statistic
+  _is_test_class = _fmn.is_test_class();
+#endif // ASSERT
+}
+
+void ArenaStatCounter::on_phase_start(PhaseInfo info) {
+  // Update node counter
+  _live_nodes_current = retrieve_live_node_count();
+
+  // For the timeline, when nesting TracePhase happens, we maintain the illusion of a flat succession of
+  // separate phases. Thus, { TracePhase p1; { TracePhase p2; }} will be seen as:
+  // P1 starts -> P1 ends -> P2 starts -> P2 ends -> P1 starts -> P1 ends
+  // In other words, when a child phase interrupts a parent phase, it "ends" the parent phase, which will
+  // be "restarted" when the child phase ends.
+  // This is the only way to get a per-phase timeline that makes any sort of sense.
+  if (!_phase_info_stack.empty()) {
+    _timeline.on_phase_end(_current, _live_nodes_current);
+  }
+  _phase_info_stack.push(info);
+  _timeline.on_phase_start(info, _current, _live_nodes_current, _phase_info_stack.depth());
+}
+
+void ArenaStatCounter::on_phase_end() {
+  PhaseInfo top = _phase_info_stack.top();
+  _phase_info_stack.pop();
+  _live_nodes_current = retrieve_live_node_count();
+  _timeline.on_phase_end(_current, _live_nodes_current);
+  if (!_phase_info_stack.empty()) {
+    // "restart" parent phase in timeline
+    _timeline.on_phase_start(_phase_info_stack.top(), _current, _live_nodes_current, _phase_info_stack.depth());
+  }
+}
+
+int ArenaStatCounter::retrieve_live_node_count() const {
+  int result = 0;
+#ifdef COMPILER2
+  if (_comp_type == compiler_c2) {
+    // Update C2 node count
+    // Careful, Compile::current() may be null in a short time window when Compile itself
+    // is still being constructed.
+    if (Compile::current() != nullptr) {
+      result = Compile::current()->live_nodes();
+    }
+  }
+#endif // COMPILER2
+  return result;
+}
+
+// Account an arena allocation. Returns true if new peak reached.
+bool ArenaStatCounter::on_arena_chunk_allocation(size_t size, int arena_tag, uint64_t* stamp) {
+  bool rc = false;
+
+  const size_t old_current = _current;
+  _current += size;
+  assert(_current >= old_current, "Overflow");
+
+  const int phase_trc_id = _phase_info_stack.top().id;
+  _counters_current.add(size, phase_trc_id, arena_tag);
+  _live_nodes_current = retrieve_live_node_count();
+
+  _timeline.on_footprint_change(_current, _live_nodes_current);
+
+  // Did we reach a global peak?
   if (_current > _peak) {
     _peak = _current;
-    assert(delta > 0, "Sanity (%zu %zu)", _current, _peak);
-    update_c2_node_count();
-    _peak_by_tag = _current_by_tag;
-    rc = true;
+    // snapshot all current counters
+    _counters_at_global_peak.copy_from(_counters_current);
+    // snapshot live nodes
+    _live_nodes_at_global_peak = _live_nodes_current;
     // Did we hit the memory limit?
     if (!_hit_limit && _limit > 0 && _peak > _limit) {
       _hit_limit = true;
     }
+    // report peak back
+    rc = true;
   }
+
+  // calculate arena chunk stamp
+  chunkstamp_t cs;
+  cs.tracked = 1;
+  cs.arena_tag = checked_cast<uint16_t>(arena_tag);
+  cs.phase_id = checked_cast<uint16_t>(_phase_info_stack.top().id);
+  *stamp = cs.raw;
+
   return rc;
 }
 
-void ArenaStatCounter::print_on(outputStream* st) const {
-  st->print("%zu [", _peak);
-  for (int tag = 0; tag < _peak_by_tag.element_count(); tag++) {
-    if (_peak_by_tag.counter(tag) > 0) {
-      st->print("%s %zu ", _peak_by_tag.tag_name(tag), _peak_by_tag.counter(tag));
-    }
-  }
-  st->print("]");
-#ifdef ASSERT
-  st->print(" (%zu->%zu)", _peak, _current);
-#endif
+void ArenaStatCounter::on_arena_chunk_deallocation(size_t size, uint64_t stamp) {
+  assert(_current >= size, "Underflow (%zu %zu)", size, _current);
+
+  // Extract tag and phase id from stamp
+  chunkstamp_t cs;
+  cs.raw = stamp;
+  assert(cs.tracked == 1, "Sanity");
+  const int arena_tag = cs.arena_tag;
+  assert(arena_tag >= 0 && arena_tag < arena_tag_max, "Arena Tag OOB (%d)", arena_tag_max);
+  const int phase_trc_id(cs.phase_id);
+  assert(phase_trc_id >= 0 && phase_trc_id < phase_trc_id_max, "Phase trace id OOB (%d)", phase_trc_id);
+
+  _current -= size;
+  _counters_current.sub(size, phase_trc_id, arena_tag);
+  _live_nodes_current = retrieve_live_node_count();
+  _timeline.on_footprint_change(_current, _live_nodes_current);
 }
 
-//////////////////////////
-// Backend
-
-class FullMethodName {
-  Symbol* const _k;
-  Symbol* const _m;
-  Symbol* const _s;
-
-public:
-
-  FullMethodName(const Method* m) :
-    _k(m->klass_name()), _m(m->name()), _s(m->signature()) {};
-  FullMethodName(const FullMethodName& o) : _k(o._k), _m(o._m), _s(o._s) {}
-
-  void make_permanent() {
-    _k->make_permanent();
-    _m->make_permanent();
-    _s->make_permanent();
+// Used for logging, not for the report table generated with jcmd Compiler.memory
+void ArenaStatCounter::print_peak_state_on(outputStream* st) const {
+  st->print("Total Usage: %zu ", _peak);
+  if (_peak > 0) {
+#ifdef COMPILER2
+    // C1: print allocations broken down by arena types
+    if (_comp_type == CompilerType::compiler_c1) {
+      st->print("[");
+      size_t sums[arena_tag_max];
+      _counters_at_global_peak.summarize(sums);
+      bool print_comma = false;
+      for (int i = 0; i < arena_tag_max; i++) {
+        if (sums[i] > 0) {
+          if (print_comma) {
+            st->print_raw(", ");
+          }
+          st->print("%s %zu", Arena::tag_name[i], sums[i]);
+          print_comma = true;
+        }
+      }
+      st->print_cr("]");
+    }
+#endif // COMPILER1
+#ifdef COMPILER2
+    // C2: print counters and timeline on multiple lines, indented
+    if (_comp_type == CompilerType::compiler_c2) {
+      streamIndentor si(st, 4);
+      st->cr();
+      st->print_cr("--- Arena Usage by Arena Type and compilation phase, at arena usage peak of %zu ---", _peak);
+      {
+        streamIndentor si(st, 4);
+       _counters_at_global_peak.print_on(st);
+      }
+      st->print_cr("--- Allocation timelime by phase ---");
+      {
+        streamIndentor si(st, 4);
+        _timeline.print_on(st);
+      }
+      st->print_cr("---");
+    }
+#endif
+  } else {
+    st->cr();
   }
+}
 
-  static unsigned compute_hash(const FullMethodName& n) {
-    return Symbol::compute_hash(n._k) ^
-        Symbol::compute_hash(n._m) ^
-        Symbol::compute_hash(n._s);
-  }
+class MemStatEntry : public CHeapObj<mtCompiler> {
 
-  char* as_C_string(char* buf, size_t len) const {
-    stringStream ss(buf, len);
-    ResourceMark rm;
-    ss.print_raw(_k->as_C_string());
-    ss.print_raw("::");
-    ss.print_raw(_m->as_C_string());
-    ss.put('(');
-    ss.print_raw(_s->as_C_string());
-    ss.put(')');
-    return buf;
-  }
-  bool operator== (const FullMethodName& b) const {
-    return _k == b._k && _m == b._m && _s == b._s;
-  }
-};
-
-// Note: not mtCompiler since we don't want to change what we measure
-class MemStatEntry : public CHeapObj<mtInternal> {
-  const FullMethodName _method;
-  CompilerType _comptype;
+  FullMethodName _fmn;
+  CompilerType _comp_type;
+  int _comp_id;
   double _time;
-  // How often this has been recompiled.
-  int _num_recomp;
   // Compiling thread. Only for diagnostic purposes. Thread may not be alive anymore.
   const Thread* _thread;
   // active limit for this compilation, if any
   size_t _limit;
-
-  // peak usage, bytes, over all arenas
-  size_t _total;
-  // usage per arena tag when total peaked
-  ArenaCountersByTag _peak_by_tag;
-  // number of nodes (c2 only) when total peaked
-  unsigned _live_nodes_at_peak;
+  // true if the compilation hit the limit
+  bool _hit_limit;
+  // result as reported by compiler
   const char* _result;
 
+  // Bytes total at global peak
+  size_t _peak;
+  // Bytes per arena tag.
+  size_t _peak_composition_per_arena_tag[arena_tag_max];
+  // Number of live nodes at global peak (C2 only)
+  unsigned _live_nodes_at_global_peak;
+
+  struct Details {
+    ArenaCounterTable counters_at_global_peak;
+    FootprintTimeline timeline;
+  };
+
+  Details* _detail_stats;
+
+  MemStatEntry(const MemStatEntry& e); // deny
+
 public:
 
-  MemStatEntry(FullMethodName method)
-    : _method(method), _comptype(compiler_c1),
-      _time(0), _num_recomp(0), _thread(nullptr), _limit(0),
-      _total(0), _live_nodes_at_peak(0),
-      _result(nullptr) {
-    _peak_by_tag.clear();
+  MemStatEntry()
+    : _comp_type(compiler_none), _comp_id(-1),
+      _time(0), _thread(nullptr), _limit(0), _hit_limit(false),
+      _result(nullptr), _peak(0), _live_nodes_at_global_peak(0),
+      _detail_stats(nullptr) {
   }
 
-  void set_comptype(CompilerType comptype) { _comptype = comptype; }
+  ~MemStatEntry() {
+    clean_details();
+  }
+
+  void set_comp_id(int comp_id) { _comp_id = comp_id; }
+  void set_comptype(CompilerType comptype) { _comp_type = comptype; }
   void set_current_time() { _time = os::elapsedTime(); }
   void set_current_thread() { _thread = Thread::current(); }
   void set_limit(size_t limit) { _limit = limit; }
-  void inc_recompilation() { _num_recomp++; }
 
-  void set_total(size_t n) { _total = n; }
-  void set_peak_by_tag(ArenaCountersByTag peak_by_tag) { _peak_by_tag = peak_by_tag; }
-  void set_live_nodes_at_peak(unsigned n) { _live_nodes_at_peak = n; }
+  void set_from_state(const ArenaStatCounter* state, bool store_details) {
+    _fmn = state->fmn();
+    _comp_type = state->comp_type();
+    _comp_id = state->comp_id();
+    _limit = state->limit();
+    _hit_limit = state->hit_limit();
+    _peak = state->peak();
+    _live_nodes_at_global_peak = state->live_nodes_at_global_peak();
+    state->counters_at_global_peak().summarize(_peak_composition_per_arena_tag);
+#ifdef COMPILER2
+    assert(_detail_stats == nullptr, "should have been cleaned");
+    if (store_details) {
+      _detail_stats = NEW_C_HEAP_OBJ(Details, mtCompiler);
+      _detail_stats->counters_at_global_peak.copy_from(state->counters_at_global_peak());
+      _detail_stats->timeline.copy_from(state->timeline());
+    }
+#endif // COMPILER2
+  }
 
-  void set_result(const char* s) { _result = s; }
+  void clean_details() {
+    if (_detail_stats != nullptr) {
+      FREE_C_HEAP_ARRAY(Details, _detail_stats);
+      _detail_stats = nullptr;
+    }
+  }
 
-  size_t total() const { return _total; }
+  void reset() {
+    clean_details();
+    _comp_type = CompilerType::compiler_none;
+    _comp_id = -1;
+    _limit = _peak = 0;
+    _live_nodes_at_global_peak = 0;
+    memset(_peak_composition_per_arena_tag, 0, sizeof(_peak_composition_per_arena_tag));
+  }
+
+  void set_result(const char* s)  { _result = s; }
+
+  size_t peak() const { return _peak; }
+  bool is_c1() const { return _comp_type == CompilerType::compiler_c1; }
+  bool is_c2() const { return _comp_type == CompilerType::compiler_c2; }
 
   static void print_legend(outputStream* st) {
 #define LEGEND_KEY_FMT "%11s"
     st->print_cr("Legend:");
-    st->print_cr("  " LEGEND_KEY_FMT ": %s", "total", "memory allocated via arenas while compiling");
-    for (int tag = 0; tag < Arena::tag_count(); tag++) {
+    st->print_cr("  " LEGEND_KEY_FMT ": %s", "ctype", "compiler type");
+    st->print_cr("  " LEGEND_KEY_FMT ": %s", "total", "peak memory allocated via arenas while compiling");
+    for (int tag = 0; tag < arena_tag_max; tag++) {
       st->print_cr("  " LEGEND_KEY_FMT ": %s", Arena::tag_name[tag], Arena::tag_desc[tag]);
     }
-    st->print_cr("  " LEGEND_KEY_FMT ": %s", "result", "Result: 'ok' finished successfully, 'oom' hit memory limit, 'err' compilation failed");
     st->print_cr("  " LEGEND_KEY_FMT ": %s", "#nodes", "...how many nodes (c2 only)");
-    st->print_cr("  " LEGEND_KEY_FMT ": %s", "limit", "memory limit, if set");
-    st->print_cr("  " LEGEND_KEY_FMT ": %s", "time", "time taken for last compilation (sec)");
-    st->print_cr("  " LEGEND_KEY_FMT ": %s", "type", "compiler type");
-    st->print_cr("  " LEGEND_KEY_FMT ": %s", "#rc", "how often recompiled");
+    st->print_cr("  " LEGEND_KEY_FMT ": %s", "result", "Result reported by compiler");
+    st->print_cr("  " LEGEND_KEY_FMT ": %s", "limit", "memory limit; followed by \"*\" if the limit was hit");
+    st->print_cr("  " LEGEND_KEY_FMT ": %s", "time", "timestamp");
+    st->print_cr("  " LEGEND_KEY_FMT ": %s", "id", "compile id");
     st->print_cr("  " LEGEND_KEY_FMT ": %s", "thread", "compiler thread");
 #undef LEGEND_KEY_FMT
   }
 
   static void print_header(outputStream* st) {
+    st->print("%-6s", "ctyp");
+
 #define SIZE_FMT "%-10s"
     st->print(SIZE_FMT, "total");
-    for (int tag = 0; tag < Arena::tag_count(); tag++) {
+    for (int tag = 0; tag < arena_tag_max; tag++) {
       st->print(SIZE_FMT, Arena::tag_name[tag]);
     }
-#define HDR_FMT1 "%-8s%-8s%-8s%-8s"
-#define HDR_FMT2 "%-6s%-4s%-19s%s"
+#define HDR_FMT1 "%-8s%-8s%-10s%-8s"
+#define HDR_FMT2 "%-6s%-19s%s"
 
-    st->print(HDR_FMT1, "result", "#nodes", "limit", "time");
-    st->print(HDR_FMT2, "type", "#rc", "thread", "method");
-    st->print_cr("");
+    st->print(HDR_FMT1, "#nodes", "result", "limit", "time");
+    st->print(HDR_FMT2, "id", "thread", "method");
   }
 
-  void print_on(outputStream* st, bool human_readable) const {
-    int col = 0;
+  void print_brief_oneline(outputStream* st) const {
+    int col = st->indentation();
+
+    // Type
+    st->print("%2s ", compilertype2name(_comp_type));
+    col += 6; st->fill_to(col);
 
     // Total
-    if (human_readable) {
-      st->print(PROPERFMT " ", PROPERFMTARGS(_total));
-    } else {
-      st->print("%zu ", _total);
-    }
+    size_t v = _peak;
+    st->print("%zu ", v);
     col += 10; st->fill_to(col);
 
-    for (int tag = 0; tag < Arena::tag_count(); tag++) {
-      if (human_readable) {
-        st->print(PROPERFMT " ", PROPERFMTARGS(_peak_by_tag.counter(tag)));
-      } else {
-        st->print("%zu ", _peak_by_tag.counter(tag));
-      }
+    for (int tag = 0; tag < arena_tag_max; tag++) {
+      v = _peak_composition_per_arena_tag[tag];
+      st->print("%zu ", v);
       col += 10; st->fill_to(col);
     }
 
+    // Number of Nodes when memory peaked
+    if (_live_nodes_at_global_peak > 0) {
+      st->print("%u ", _live_nodes_at_global_peak);
+    } else {
+      st->print("-");
+    }
+    col += 8; st->fill_to(col);
+
     // result?
     st->print("%s ", _result ? _result : "");
     col += 8; st->fill_to(col);
 
-    // Number of Nodes when memory peaked
-    if (_live_nodes_at_peak > 0) {
-      st->print("%u ", _live_nodes_at_peak);
-    } else {
-      st->print("-");
-    }
-    col += 8; st->fill_to(col);
-
     // Limit
     if (_limit > 0) {
-      st->print(PROPERFMT " ", PROPERFMTARGS(_limit));
+      st->print("%zu%s ", _limit, _hit_limit ? "*" : "");
     } else {
       st->print("-");
     }
-    col += 8; st->fill_to(col);
+    col += 10; st->fill_to(col);
 
     // TimeStamp
     st->print("%.3f ", _time);
     col += 8; st->fill_to(col);
 
-    // Type
-    st->print("%s ", compilertype2name(_comptype));
+    // Compile ID
+    st->print("%d ", _comp_id);
     col += 6; st->fill_to(col);
 
-    // Recomp
-    st->print("%u ", _num_recomp);
-    col += 4; st->fill_to(col);
-
     // Thread
     st->print(PTR_FORMAT " ", p2i(_thread));
 
     // MethodName
     char buf[1024];
-    st->print("%s ", _method.as_C_string(buf, sizeof(buf)));
+    st->print("%s ", _fmn.as_C_string(buf, sizeof(buf)));
+
     st->cr();
   }
 
-  int compare_by_size(const MemStatEntry* b) const {
-    const size_t x1 = b->_total;
-    const size_t x2 = _total;
-    return x1 < x2 ? -1 : x1 == x2 ? 0 : 1;
-  }
-};
+  void print_detailed(outputStream* st) const {
+    int col = 0;
 
-// The MemStatTable contains records of memory usage of all compilations. It is printed,
-// as memory summary, either with jcmd Compiler.memory, or - if the "print" suboption has
-// been given with the MemStat compile command - as summary printout at VM exit.
-// For any given compiled method, we only keep the memory statistics of the most recent
-// compilation, but on a per-compiler basis. If one needs statistics of prior compilations,
-// one needs to look into the log produced by the "print" suboption.
+    constexpr int indent1 = 40;
+    constexpr int indent2 = 50;
 
-class MemStatTableKey {
-  const FullMethodName _fmn;
-  const CompilerType _comptype;
-public:
-  MemStatTableKey(FullMethodName fmn, CompilerType comptype) :
-    _fmn(fmn), _comptype(comptype) {}
-  MemStatTableKey(const MemStatTableKey& o) :
-    _fmn(o._fmn), _comptype(o._comptype) {}
-  bool operator== (const MemStatTableKey& other) const {
-    return _fmn == other._fmn && _comptype == other._comptype;
-  }
-  static unsigned compute_hash(const MemStatTableKey& n) {
-    return FullMethodName::compute_hash(n._fmn) + (unsigned)n._comptype;
-  }
-};
-
-class MemStatTable :
-    public ResourceHashtable<MemStatTableKey, MemStatEntry*, 7919, AnyObj::C_HEAP,
-                             mtInternal, MemStatTableKey::compute_hash>
-{
-public:
-
-  void add(const FullMethodName& fmn, CompilerType comptype,
-           size_t total, ArenaCountersByTag peak_by_tag,
-           unsigned live_nodes_at_peak, size_t limit, const char* result) {
-    assert_lock_strong(NMTCompilationCostHistory_lock);
-    MemStatTableKey key(fmn, comptype);
-    MemStatEntry** pe = get(key);
-    MemStatEntry* e = nullptr;
-    if (pe == nullptr) {
-      e = new MemStatEntry(fmn);
-      put(key, e);
-    } else {
-      // Update existing entry
-      e = *pe;
-      assert(e != nullptr, "Sanity");
+    char buf[1024];
+    st->print_cr("Method              : %s", _fmn.as_C_string(buf, sizeof(buf)));
+    st->print_cr("Compiler            : %2s", compilertype2name(_comp_type));
+    st->print(   "Arena Usage at peak : %zu", _peak);
+    if (_peak > M) {
+      st->print(" (%.2fM)", ((double)_peak/(double)M));
     }
+    st->cr();
+    if (_comp_type == CompilerType::compiler_c2) {
+      st->print_cr("Nodes at peak       : %u", _live_nodes_at_global_peak);
+    }
+    st->print_cr("Compile ID          : %d", _comp_id);
+    st->print(   "Result              : %s", _result);
+    if (strcmp(_result, "oom") == 0) {
+      st->print(" (memory limit was: %zu)", _limit);
+    }
+    st->cr();
+    st->print_cr("Thread              : " PTR_FORMAT, p2i(_thread));
+    st->print_cr("Timestamp           : %.3f", _time);
+
+    if (_detail_stats != nullptr) {
+      st->cr();
+      st->print_cr("Arena Usage by Arena Type and compilation phase, at arena usage peak of %zu:", _peak);
+      _detail_stats->counters_at_global_peak.print_on(st);
+      st->cr();
+      st->print_cr("Allocation timelime by phase:");
+      _detail_stats->timeline.print_on(st);
+    } else {
+      st->cr();
+      st->print_cr("Arena Usage by Arena Type, at arena usage peak of %zu:", _peak);
+      for (int tag = 0; tag < arena_tag_max; tag++) {
+        const size_t v = _peak_composition_per_arena_tag[tag];
+        if (v > 0) {
+          st->print_cr("%-36s: %zu ", Arena::tag_desc[tag], v);
+        }
+      }
+    }
+  }
+};
+
+class MemStatStore : public CHeapObj<mtCompiler> {
+
+  // Total number of entries. Reaching this limit, we discard the least interesting (smallest allocation size) first.
+  static constexpr int max_entries = 64;
+
+  struct {
+    size_t s; MemStatEntry* e;
+  } _entries[max_entries];
+
+  struct iteration_result { unsigned num, num_c1, num_c2, num_filtered_out; };
+  template<typename F>
+  void iterate_sorted_filtered(F f, size_t minsize, int max_num_printed, iteration_result& result) const {
+    assert_lock_strong(NMTCompilationCostHistory_lock);
+    const unsigned stop_after = max_num_printed == -1 ? UINT_MAX : (unsigned)max_num_printed;
+    result.num = result.num_c1 = result.num_c2 = result.num_filtered_out = 0;
+    for (int i = 0; _entries[i].e != nullptr && i < max_entries && result.num < stop_after; i++) {
+      if (_entries[i].s >= minsize) {
+        f(_entries[i].e);
+        result.num++;
+        result.num_c1 += _entries[i].e->is_c1() ? 1 : 0;
+        result.num_c2 += _entries[i].e->is_c2() ? 1 : 0;
+      } else {
+        result.num_filtered_out++;
+      }
+    }
+  }
+
+  void print_footer(outputStream* st, size_t minsize, const iteration_result& result) const {
+    if (result.num > 0) {
+      st->print_cr("Total: %u (C1: %u, C2: %u)", result.num, result.num_c1, result.num_c2);
+    } else {
+      st->print_cr("No entries.");
+    }
+    if (result.num_filtered_out > 0) {
+      st->print_cr(" (%d compilations smaller than %zu omitted)", result.num_filtered_out, minsize);
+    }
+  }
+
+public:
+
+  MemStatStore() {
+    memset(_entries, 0, sizeof(_entries));
+  }
+
+  void add(const ArenaStatCounter* state, const char* result) {
+
+    const size_t size = state->peak();
+
+    // search insert point
+    int i = 0;
+    while (i < max_entries && _entries[i].s > size) {
+      i++;
+    }
+    if (i == max_entries) {
+      return;
+    }
+    MemStatEntry* e = _entries[max_entries - 1].e; // recycle last one
+    if (e == nullptr) {
+      e = new MemStatEntry();
+    }
+    memmove(_entries + i + 1, _entries + i, sizeof(_entries[0]) * (max_entries - i - 1));
+
+    e->reset();
     e->set_current_time();
     e->set_current_thread();
-    e->set_comptype(comptype);
-    e->inc_recompilation();
-    e->set_total(total);
-    e->set_peak_by_tag(peak_by_tag);
-    e->set_live_nodes_at_peak(live_nodes_at_peak);
-    e->set_limit(limit);
     e->set_result(result);
+
+    // Since we don't have phases in C1, for now we just avoid saving details for C1.
+    const bool save_details = state->comp_type() == CompilerType::compiler_c2;
+    e->set_from_state(state, save_details);
+
+    _entries[i].s = e->peak();
+    _entries[i].e = e;
   }
 
-  // Returns a C-heap-allocated SortMe array containing all entries from the table,
-  // optionally filtered by entry size
-  MemStatEntry** calc_flat_array(int& num, size_t min_size) {
+  void print_table(outputStream* st, bool legend, size_t minsize, int max_num_printed) const {
     assert_lock_strong(NMTCompilationCostHistory_lock);
 
-    const int num_all = number_of_entries();
-    MemStatEntry** flat = NEW_C_HEAP_ARRAY(MemStatEntry*, num_all, mtInternal);
-    int i = 0;
-    auto do_f = [&] (const MemStatTableKey& ignored, MemStatEntry* e) {
-      if (e->total() >= min_size) {
-        flat[i] = e;
-        assert(i < num_all, "Sanity");
-        i ++;
-      }
-    };
-    iterate_all(do_f);
-    if (min_size == 0) {
-      assert(i == num_all, "Sanity");
-    } else {
-      assert(i <= num_all, "Sanity");
+    if (legend) {
+      MemStatEntry::print_legend(st);
+      st->cr();
     }
-    num = i;
-    return flat;
+
+    MemStatEntry::print_header(st);
+    st->cr();
+
+    iteration_result itres;
+    auto printer = [&](const MemStatEntry* e) {
+      e->print_brief_oneline(st);
+    };
+    iterate_sorted_filtered(printer, minsize, max_num_printed, itres);
+    print_footer(st, minsize, itres);
+  }
+
+  void print_details(outputStream* st, size_t minsize, int max_num_printed) const {
+    assert_lock_strong(NMTCompilationCostHistory_lock);
+    iteration_result itres;
+    auto printer = [&](const MemStatEntry* e) {
+      e->print_detailed(st);
+      st->cr();
+      st->print_cr("------------------------");
+      st->cr();
+    };
+    iterate_sorted_filtered(printer, minsize, max_num_printed, itres);
   }
 };
 
 bool CompilationMemoryStatistic::_enabled = false;
-
-static MemStatTable* _the_table = nullptr;
+static MemStatStore* _the_store = nullptr;
 
 void CompilationMemoryStatistic::initialize() {
-  assert(_enabled == false && _the_table == nullptr, "Only once");
-  _the_table = new (mtCompiler) MemStatTable;
+  assert(_enabled == false && _the_store == nullptr, "Only once");
+  _the_store = new MemStatStore;
   _enabled = true;
   log_info(compilation, alloc)("Compilation memory statistic enabled");
 }
 
 void CompilationMemoryStatistic::on_start_compilation(const DirectiveSet* directive) {
   assert(enabled(), "Not enabled?");
+  assert(directive->should_collect_memstat(), "Don't call if not needed");
+  CompilerThread* const th = Thread::current()->as_Compiler_thread();
+  CompileTask* const task = th->task();
   const size_t limit = directive->mem_limit();
-  Thread::current()->as_Compiler_thread()->arena_stat()->start(limit);
+  // Create new ArenaStat object and hook it into the thread
+  assert(th->arena_stat() == nullptr, "Sanity");
+  ArenaStatCounter* const arena_stat = new ArenaStatCounter(task, limit);
+  th->set_arenastat(arena_stat);
+  // Start a "root" phase
+  PhaseInfo info;
+  info.id = phase_trc_id_none;
+  info.num = 0;
+  info.text = "(outside)";
+  arena_stat->on_phase_start(info);
 }
 
 void CompilationMemoryStatistic::on_end_compilation() {
   assert(enabled(), "Not enabled?");
-  ResourceMark rm;
   CompilerThread* const th = Thread::current()->as_Compiler_thread();
   ArenaStatCounter* const arena_stat = th->arena_stat();
+  if (arena_stat == nullptr) { // not started
+    return;
+  }
+
+  // Mark end of compilation by clearing out the arena state object in the CompilerThread.
+  // Do this before the final "phase end".
+  th->set_arenastat(nullptr);
+
+  // End final outer phase.
+  arena_stat->on_phase_end();
+
   CompileTask* const task = th->task();
-  const CompilerType ct = task->compiler()->type();
+  assert(task->compile_id() == arena_stat->comp_id(), "Different compilation?");
 
   const Method* const m = th->task()->method();
-  FullMethodName fmn(m);
-  fmn.make_permanent();
 
   const DirectiveSet* directive = th->task()->directive();
   assert(directive->should_collect_memstat(), "Should only be called if memstat is enabled for this method");
@@ -438,7 +803,7 @@ void CompilationMemoryStatistic::on_end_compilation() {
   // Store memory used in task, for later processing by JFR
   task->set_arena_bytes(arena_stat->peak());
 
-  // Store result
+  // Store result (ok, failed, oom...)
   // For this to work, we must call on_end_compilation() at a point where
   // Compile|Compilation already handed over the failure string to ciEnv,
   // but ciEnv must still be alive.
@@ -453,24 +818,22 @@ void CompilationMemoryStatistic::on_end_compilation() {
 
   {
     MutexLocker ml(NMTCompilationCostHistory_lock, Mutex::_no_safepoint_check_flag);
-    assert(_the_table != nullptr, "not initialized");
-
-    _the_table->add(fmn, ct,
-                    arena_stat->peak(), // total
-                    arena_stat->peak_by_tag(),
-                    arena_stat->live_nodes_at_peak(),
-                    arena_stat->limit(),
-                    result);
+    assert(_the_store != nullptr, "not initialized");
+    _the_store->add(arena_stat, result);
   }
+
   if (print) {
-    char buf[1024];
-    fmn.as_C_string(buf, sizeof(buf));
-    tty->print("%s Arena usage %s: ", compilertype2name(ct), buf);
-    arena_stat->print_on(tty);
-    tty->cr();
+    // Pre-assemble string to prevent tearing
+    stringStream ss;
+    StreamAutoIndentor sai(&ss);
+    ss.print("%s (%d) (%s) Arena usage ", compilertype2name(arena_stat->comp_type()), arena_stat->comp_id(), result);
+    arena_stat->fmn().print_on(&ss);
+    ss.print_raw(": ");
+    arena_stat->print_peak_state_on(&ss);
+    tty->print_raw(ss.base());
   }
 
-  arena_stat->end(); // reset things
+  delete arena_stat;
 }
 
 static void inform_compilation_about_oom(CompilerType ct) {
@@ -508,124 +871,178 @@ static void inform_compilation_about_oom(CompilerType ct) {
   }
 }
 
-void CompilationMemoryStatistic::on_arena_change(ssize_t diff, const Arena* arena) {
-  assert(enabled(), "Not enabled?");
-  CompilerThread* const th = Thread::current()->as_Compiler_thread();
+void CompilationMemoryStatistic::on_arena_chunk_allocation(size_t size, int arena_tag, uint64_t* stamp) {
 
+  assert(enabled(), "Not enabled?");
+  assert(arena_tag >= 0 && arena_tag < arena_tag_max, "Arena Tag OOB (%d)", arena_tag_max);
+
+  CompilerThread* const th = Thread::current()->as_Compiler_thread();
   ArenaStatCounter* const arena_stat = th->arena_stat();
-  if (arena_stat->limit_in_process()) {
-    return; // avoid recursion on limit hit
+  if (arena_stat == nullptr ||           // not started
+      arena_stat->limit_in_process()) {  // limit handling in process, prevent recursion
+    return;
   }
 
-  bool hit_limit_before = arena_stat->hit_limit();
+  // Compiler can be slow to bailout, so we may hit memlimit more than once
+  const bool hit_limit_before = arena_stat->hit_limit();
 
-  if (arena_stat->is_active() && arena_stat->account(diff, (int)arena->get_tag())) { // new peak?
+  if (arena_stat->on_arena_chunk_allocation(size, arena_tag, stamp)) { // new peak?
 
     // Limit handling
     if (arena_stat->hit_limit()) {
       char name[1024] = "";
-      bool print = false;
-      bool crash = false;
-      CompilerType ct = compiler_none;
-
+      const CompilerType ct = arena_stat->comp_type();
+      const bool print = arena_stat->should_print_memstat();
+      const bool crash = arena_stat->should_crash_on_memlimit();
       arena_stat->set_limit_in_process(true); // prevent recursive limit hits
+      arena_stat->fmn().as_C_string(name, sizeof(name));
 
-      // get some more info
-      const CompileTask* const task = th->task();
-      if (task != nullptr) {
-        ct = task->compiler()->type();
-        const DirectiveSet* directive = task->directive();
-        print = directive->should_print_memstat();
-        crash = directive->should_crash_at_mem_limit();
-        const Method* m = th->task()->method();
-        if (m != nullptr) {
-          FullMethodName(m).as_C_string(name, sizeof(name));
+      inform_compilation_about_oom(ct);
+
+      if (crash) {
+        // Store this ArenaStat. If other threads also run into OOMs, let them sleep.
+        // We will never return, so the global store will not contain this info. We will
+        // print the stored ArenaStat in hs-err (see print_error_report)
+        if (Atomic::cmpxchg(&_arenastat_oom_crash, (ArenaStatCounter*) nullptr, arena_stat) != nullptr) {
+          os::infinite_sleep();
         }
       }
 
-      char message[1024] = "";
+      stringStream short_msg;
 
-      // build up message if we need it later
+      // We print to tty if either print is enabled or if we are to crash on MemLimit hit.
+      // If printing/crashing are not enabled, we just quietly abort the compilation. The
+      // compilation is marked as "oom" in the compilation memory result store.
       if (print || crash) {
-        stringStream ss(message, sizeof(message));
-        if (ct != compiler_none && name[0] != '\0') {
-          ss.print("%s %s: ", compilertype2name(ct), name);
-        }
-        ss.print("Hit MemLimit %s(limit: %zu now: %zu)",
+        short_msg.print("%s (%d) %s: ", compilertype2name(ct), arena_stat->comp_id(), name);
+        short_msg.print("Hit MemLimit %s- limit: %zu now: %zu",
                  (hit_limit_before ? "again " : ""),
                  arena_stat->limit(), arena_stat->peak());
-      }
-
-      // log if needed
-      if (print) {
-        tty->print_raw(message);
+        tty->print_raw(short_msg.base());
         tty->cr();
       }
 
-      // Crash out if needed
       if (crash) {
-        report_fatal(OOM_HOTSPOT_ARENA, __FILE__, __LINE__, "%s", message);
-      } else {
-        inform_compilation_about_oom(ct);
+        // Before crashing, if C2, end current phase. That causes its info (which is the most important) to
+        // be added to the phase timeline.
+        if (arena_stat->comp_type() == CompilerType::compiler_c2) {
+          arena_stat->on_phase_end();
+        }
+        // print extended message to tty (mirrors the one that should show up in the hs-err file, just for good measure)
+        tty->print_cr("Details:");
+        arena_stat->print_peak_state_on(tty);
+        tty->cr();
+        // abort VM
+        report_fatal(OOM_HOTSPOT_ARENA, __FILE__, __LINE__, "%s", short_msg.base());
       }
 
       arena_stat->set_limit_in_process(false);
-    }
+    } // end Limit handling
   }
 }
 
-static inline ssize_t diff_entries_by_size(const MemStatEntry* e1, const MemStatEntry* e2) {
-  return e1->compare_by_size(e2);
-}
-
-void CompilationMemoryStatistic::print_all_by_size(outputStream* st, bool human_readable, size_t min_size) {
-
-  MutexLocker ml(NMTCompilationCostHistory_lock, Mutex::_no_safepoint_check_flag);
-
-  st->cr();
-  st->print_cr("Compilation memory statistics");
-
-  if (!enabled()) {
-    st->print_cr("(unavailable)");
+void CompilationMemoryStatistic::on_arena_chunk_deallocation(size_t size, uint64_t stamp) {
+  assert(enabled(), "Not enabled?");
+  CompilerThread* const th = Thread::current()->as_Compiler_thread();
+  ArenaStatCounter* const arena_stat = th->arena_stat();
+  if (arena_stat == nullptr) { // not started
     return;
   }
-
-  st->cr();
-
-  MemStatEntry::print_legend(st);
-  st->cr();
-
-  if (min_size > 0) {
-    st->print_cr(" (cutoff: %zu bytes)", min_size);
+  if (arena_stat->limit_in_process()) {
+    return; // avoid recursion on limit hit
   }
-  st->cr();
 
-  MemStatEntry::print_header(st);
+  arena_stat->on_arena_chunk_deallocation(size, stamp);
+}
 
-  MemStatEntry** filtered = nullptr;
+void CompilationMemoryStatistic::on_phase_start(int phase_trc_id, const char* text) {
+  assert(enabled(), "Not enabled?");
+  assert(phase_trc_id >= 0 && phase_trc_id < phase_trc_id_max, "Phase trace id OOB (%d)", phase_trc_id);
+  CompilerThread* const th = Thread::current()->as_Compiler_thread();
+  ArenaStatCounter* const arena_stat = th->arena_stat();
+  if (arena_stat == nullptr) { // not started
+    return;
+  }
+  PhaseInfo info;
+  info.id = phase_trc_id;
+  info.num = arena_stat->advance_phase_counter();
+  info.text = text;
+  arena_stat->on_phase_start(info);
+}
 
-  if (_the_table != nullptr) {
-    // We sort with quicksort
-    int num = 0;
-    filtered = _the_table->calc_flat_array(num, min_size);
-    if (min_size > 0) {
-      st->print_cr("(%d/%d)", num, _the_table->number_of_entries());
-    }
-    if (num > 0) {
-      QuickSort::sort(filtered, num, diff_entries_by_size);
-      // Now print. Has to happen under lock protection too, since entries may be changed.
-      for (int i = 0; i < num; i ++) {
-        filtered[i]->print_on(st, human_readable);
-      }
-    } else {
-      st->print_cr("No entries.");
-    }
+void CompilationMemoryStatistic::on_phase_end() {
+  assert(enabled(), "Not enabled?");
+  CompilerThread* const th = Thread::current()->as_Compiler_thread();
+  ArenaStatCounter* const arena_stat = th->arena_stat();
+  if (arena_stat == nullptr) { // not started
+    return;
+  }
+  arena_stat->on_phase_end();
+}
+
+static bool check_before_reporting(outputStream* st) {
+  if (!CompilationMemoryStatistic::enabled()) {
+    st->print_cr("Compilation memory statistics disabled.");
+    return false;
+  }
+  if (_the_store == nullptr) {
+    st->print_cr("Compilation memory statistics not yet initialized. ");
+    return false;
+  }
+  return true;
+}
+
+bool CompilationMemoryStatistic::in_oom_crash() {
+  return Atomic::load(&_arenastat_oom_crash) != nullptr;
+}
+
+void CompilationMemoryStatistic::print_error_report(outputStream* st) {
+  if (!check_before_reporting(st)) {
+    return;
+  }
+  StreamAutoIndentor sai(tty);
+  streamIndentor si(tty, 4);
+  const ArenaStatCounter* const oom_stats = Atomic::load(&_arenastat_oom_crash);
+  if (oom_stats != nullptr) {
+    // we crashed due to a compiler limit hit. Lead with a printout of the offending stats
+    // in detail.
+    st->print_cr("Compiler Memory Statistic, hit OOM limit; offending compilation:");
+    oom_stats->fmn().print_on(st);
+    st->cr();
+    oom_stats->print_peak_state_on(st);
+    st->cr();
+  }
+  st->print_cr("Compiler Memory Statistic, 10 most expensive compilations:");
+  print_all_by_size(st, false, false, 0, 10);
+}
+
+void CompilationMemoryStatistic::print_final_report(outputStream* st) {
+  if (!check_before_reporting(st)) {
+    return;
+  }
+  st->print_cr("Compiler Memory Statistic, 10 most expensive compilations:");
+  StreamAutoIndentor sai(st);
+  streamIndentor si(st, 4);
+  print_all_by_size(st, false, false, 0, 10);
+}
+
+void CompilationMemoryStatistic::print_jcmd_report(outputStream* st, bool verbose, bool legend, size_t minsize) {
+  if (!check_before_reporting(st)) {
+    return;
+  }
+  st->print_cr("Compiler Memory Statistic");
+  StreamAutoIndentor sai(st);
+  streamIndentor si(st, 4);
+  print_all_by_size(st, verbose, legend, minsize, -1);
+}
+
+void CompilationMemoryStatistic::print_all_by_size(outputStream* st, bool verbose, bool legend, size_t minsize, int max_num_printed) {
+  MutexLocker ml(NMTCompilationCostHistory_lock, Mutex::_no_safepoint_check_flag);
+  if (verbose) {
+    _the_store->print_details(st, minsize, max_num_printed);
   } else {
-    st->print_cr("Not initialized.");
+    _the_store->print_table(st, legend, minsize, max_num_printed);
   }
-  st->cr();
-
-  FREE_C_HEAP_ARRAY(Entry, filtered);
 }
 
 const char* CompilationMemoryStatistic::failure_reason_memlimit() {
@@ -633,12 +1050,50 @@ const char* CompilationMemoryStatistic::failure_reason_memlimit() {
   return s;
 }
 
+#ifdef ASSERT
+void CompilationMemoryStatistic::do_test_allocations() {
+
+  CompilerThread* const th = Thread::current()->as_Compiler_thread();
+  ArenaStatCounter* const arena_stat = th->arena_stat();
+  if (arena_stat == nullptr || !arena_stat->is_test_class()) { // not started or not the JTREG test
+    return;
+  }
+  const CompilerType ctyp = th->task()->compiler()->type();
+
+  // Note: all allocations in here need to be tagged as mtCompiler to be recognized
+  // by the compilation memstat. ResourceArea in a CompilerThread is already tagged
+  // mtCompiler (special handling for compiler threads).
+
+#ifdef COMPILER2
+  if (ctyp == CompilerType::compiler_c2) {
+    {
+      Compile::TracePhase tp(Phase::_t_testPhase1);
+      Arena ar(MemTag::mtCompiler, Arena::Tag::tag_reglive);
+      ar.Amalloc(2 * M); // phase-local peak
+    }
+    {
+      Compile::TracePhase tp(Phase::_t_testPhase2);
+      NEW_RESOURCE_ARRAY(char, 32 * M); // leaked (until compilation end)
+    }
+  } // C2
+#endif // COMPILER2
+
+#ifdef COMPILER1
+  if (ctyp == CompilerType::compiler_c1) {
+    NEW_RESOURCE_ARRAY(char, 32 * M); // leaked (until compilation end)
+  }
+#endif // COMPILER2
+
+}
+#endif // ASSERT
+
 CompilationMemoryStatisticMark::CompilationMemoryStatisticMark(const DirectiveSet* directive)
   : _active(directive->should_collect_memstat()) {
   if (_active) {
     CompilationMemoryStatistic::on_start_compilation(directive);
   }
 }
+
 CompilationMemoryStatisticMark::~CompilationMemoryStatisticMark() {
   if (_active) {
     CompilationMemoryStatistic::on_end_compilation();
diff --git a/src/hotspot/share/compiler/compilationMemoryStatistic.hpp b/src/hotspot/share/compiler/compilationMemoryStatistic.hpp
index d9cbfabde1b..2de5b0e9abb 100644
--- a/src/hotspot/share/compiler/compilationMemoryStatistic.hpp
+++ b/src/hotspot/share/compiler/compilationMemoryStatistic.hpp
@@ -1,6 +1,6 @@
 /*
- * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2023, Red Hat, Inc. and/or its affiliates.
+ * Copyright (c) 2023, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2025, Red Hat, Inc. and/or its affiliates.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,114 +26,49 @@
 #ifndef SHARE_COMPILER_COMPILATIONMEMORYSTATISTIC_HPP
 #define SHARE_COMPILER_COMPILATIONMEMORYSTATISTIC_HPP
 
-#include "compiler/compilerDefinitions.hpp"
 #include "memory/allocation.hpp"
 #include "memory/allStatic.hpp"
-#include "memory/arena.hpp"
 #include "utilities/globalDefinitions.hpp"
 
-class outputStream;
-class Symbol;
 class DirectiveSet;
-
-// Helper class to wrap the array of arena tags for easier processing
-class ArenaCountersByTag {
-private:
-  size_t _counter[Arena::tag_count()];
-
-public:
-  int element_count() const { return Arena::tag_count(); }
-  const char* tag_name(int tag) const { return Arena::tag_name[tag]; }
-
-  size_t  counter(int tag) const {
-    assert(tag < element_count(), "invalid tag %d", tag);
-    return _counter[tag];
-  }
-
-  void add(int tag, size_t value) {
-    assert(tag < element_count(), "invalid tag %d", tag);
-    _counter[tag] += value;
-  }
-
-  void clear() {
-    memset(_counter, 0, sizeof(size_t) * element_count());
-  }
-};
-
-// Counters for allocations from arenas during compilation
-class ArenaStatCounter : public CHeapObj<mtCompiler> {
-  // Current bytes, total
-  size_t _current;
-  // bytes at last peak, total
-  size_t _peak;
-  // Current bytes used by arenas per tag
-  ArenaCountersByTag _current_by_tag;
-  // Peak composition:
-  ArenaCountersByTag _peak_by_tag;
-  // MemLimit handling
-  size_t _limit;
-  bool _hit_limit;
-  bool _limit_in_process;
-
-  // When to start accounting
-  bool _active;
-
-  // Number of live nodes when total peaked (c2 only)
-  unsigned _live_nodes_at_peak;
-
-  void update_c2_node_count();
-
-  void reset();
-
-public:
-  ArenaStatCounter();
-
-  // Size of peak since last compilation
-  size_t peak() const { return _peak; }
-
-  // Peak details
-  ArenaCountersByTag peak_by_tag() const { return _peak_by_tag; }
-  unsigned live_nodes_at_peak() const { return _live_nodes_at_peak; }
-
-  // Mark the start and end of a compilation.
-  void start(size_t limit);
-  void end();
-
-  // Account an arena allocation or de-allocation.
-  // Returns true if new peak reached
-  bool account(ssize_t delta, int tag);
-
-  void set_live_nodes_at_peak(unsigned i) { _live_nodes_at_peak = i; }
-
-  void print_on(outputStream* st) const;
-
-  size_t limit() const              { return _limit; }
-  bool   hit_limit() const          { return _hit_limit; }
-  bool   limit_in_process() const     { return _limit_in_process; }
-  void   set_limit_in_process(bool v) { _limit_in_process = v; }
-  bool   is_active() const          { return _active; }
-};
+class outputStream;
 
 class CompilationMemoryStatistic : public AllStatic {
-  static bool _enabled;
+  friend class CompilationMemoryStatisticMark;
+  static bool _enabled; // set to true if memstat is active for any method.
+
+  // Private, should only be called via CompilationMemoryStatisticMark
+  static void on_start_compilation(const DirectiveSet* directive);
+
+  // Private, should only be called via CompilationMemoryStatisticMark
+  static void on_end_compilation();
+
+  static void print_all_by_size(outputStream* st, bool verbose, bool legend, size_t minsize, int max_num_printed);
+
 public:
   static void initialize();
   // true if CollectMemStat or PrintMemStat has been enabled for any method
   static bool enabled() { return _enabled; }
-  static void on_start_compilation(const DirectiveSet* directive);
+  // true if we are in a fatal error inited by hitting the MemLimit
+  static bool in_oom_crash();
+
+  static void on_phase_start(int phase_trc_id, const char* text);
+  static void on_phase_end();
+  static void on_arena_chunk_allocation(size_t size, int arenatag, uint64_t* stamp);
+  static void on_arena_chunk_deallocation(size_t size, uint64_t stamp);
+
+  static void print_final_report(outputStream* st);
+  static void print_error_report(outputStream* st);
+  static void print_jcmd_report(outputStream* st, bool verbose, bool legend, size_t minsize);
 
-  // Called at end of compilation. Records the arena usage peak. Also takes over
-  // status information from ciEnv (compilation failed, oom'ed or went okay). ciEnv::_failure_reason
-  // must be set at this point (so place CompilationMemoryStatisticMark correctly).
-  static void on_end_compilation();
-  static void on_arena_change(ssize_t diff, const Arena* arena);
-  static void print_all_by_size(outputStream* st, bool human_readable, size_t minsize);
   // For compilers
   static const char* failure_reason_memlimit();
+
+  DEBUG_ONLY(static void do_test_allocations();)
 };
 
 // RAII object to wrap one compilation
-class CompilationMemoryStatisticMark {
+class CompilationMemoryStatisticMark : public StackObj {
   const bool _active;
 public:
   CompilationMemoryStatisticMark(const DirectiveSet* directive);
diff --git a/src/hotspot/share/compiler/compilerOracle.cpp b/src/hotspot/share/compiler/compilerOracle.cpp
index 8e296226fee..e7ef9703191 100644
--- a/src/hotspot/share/compiler/compilerOracle.cpp
+++ b/src/hotspot/share/compiler/compilerOracle.cpp
@@ -121,7 +121,6 @@ class TypedMethodOptionMatcher;
 
 static TypedMethodOptionMatcher* option_list = nullptr;
 static bool any_set = false;
-static bool print_final_memstat_report = false;
 
 // A filter for quick lookup if an option is set
 static bool option_filter[static_cast<int>(CompileCommandEnum::Unknown) + 1] = { 0 };
@@ -482,10 +481,6 @@ bool CompilerOracle::should_collect_memstat() {
   return has_command(CompileCommandEnum::MemStat) || has_command(CompileCommandEnum::MemLimit);
 }
 
-bool CompilerOracle::should_print_final_memstat_report() {
-  return print_final_memstat_report;
-}
-
 bool CompilerOracle::should_log(const methodHandle& method) {
   if (!LogCompilation) return false;
   if (!has_command(CompileCommandEnum::Log)) {
@@ -711,7 +706,6 @@ static bool parseMemStat(const char* line, uintx& value, int& bytes_read, char*
   });
   IF_ENUM_STRING("print", {
     value = (uintx)MemStatAction::print;
-    print_final_memstat_report = true;
   });
 #undef IF_ENUM_STRING
 
diff --git a/src/hotspot/share/compiler/compilerOracle.hpp b/src/hotspot/share/compiler/compilerOracle.hpp
index 0e55ca416e0..943cd2c9734 100644
--- a/src/hotspot/share/compiler/compilerOracle.hpp
+++ b/src/hotspot/share/compiler/compilerOracle.hpp
@@ -166,7 +166,6 @@ class CompilerOracle : AllStatic {
 
   // Tells whether there are any methods to (collect|collect+print) memory statistics for
   static bool should_collect_memstat();
-  static bool should_print_final_memstat_report();
 
   // Tags the method as blackhole candidate, if possible.
   static void tag_blackhole_if_possible(const methodHandle& method);
diff --git a/src/hotspot/share/compiler/compilerThread.cpp b/src/hotspot/share/compiler/compilerThread.cpp
index a72fc48b9a1..55dd8383ac4 100644
--- a/src/hotspot/share/compiler/compilerThread.cpp
+++ b/src/hotspot/share/compiler/compilerThread.cpp
@@ -22,7 +22,6 @@
  *
  */
 
-#include "compiler/compilationMemoryStatistic.hpp"
 #include "compiler/compileBroker.hpp"
 #include "compiler/compileTask.hpp"
 #include "compiler/compilerThread.hpp"
@@ -40,7 +39,7 @@ CompilerThread::CompilerThread(CompileQueue* queue,
   _buffer_blob = nullptr;
   _can_call_java = false;
   _compiler = nullptr;
-  _arena_stat = CompilationMemoryStatistic::enabled() ? new ArenaStatCounter : nullptr;
+  _arena_stat = nullptr;
 
 #ifndef PRODUCT
   _ideal_graph_printer = nullptr;
@@ -50,7 +49,8 @@ CompilerThread::CompilerThread(CompileQueue* queue,
 CompilerThread::~CompilerThread() {
   // Delete objects which were allocated on heap.
   delete _counters;
-  delete _arena_stat;
+  // arenastat should have been deleted at the end of the compilation
+  assert(_arena_stat == nullptr, "Should be null");
 }
 
 void CompilerThread::set_compiler(AbstractCompiler* c) {
diff --git a/src/hotspot/share/compiler/compilerThread.hpp b/src/hotspot/share/compiler/compilerThread.hpp
index 3531fb6d72d..e20e3017d1f 100644
--- a/src/hotspot/share/compiler/compilerThread.hpp
+++ b/src/hotspot/share/compiler/compilerThread.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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,6 +85,7 @@ class CompilerThread : public JavaThread {
   CompileQueue* queue()        const             { return _queue; }
   CompilerCounters* counters() const             { return _counters; }
   ArenaStatCounter* arena_stat() const           { return _arena_stat; }
+  void set_arenastat(ArenaStatCounter* v)        { _arena_stat = v; }
 
   // Get/set the thread's compilation environment.
   ciEnv*        env()                            { return _env; }
diff --git a/src/hotspot/share/memory/arena.cpp b/src/hotspot/share/memory/arena.cpp
index 055c6405590..d03c0776f61 100644
--- a/src/hotspot/share/memory/arena.cpp
+++ b/src/hotspot/share/memory/arena.cpp
@@ -45,13 +45,13 @@ STATIC_ASSERT(is_aligned((int)Chunk::size, ARENA_AMALLOC_ALIGNMENT));
 
 
 const char* Arena::tag_name[] = {
-#define ARENA_TAG_STRING(name, str, desc) XSTR(name),
+#define ARENA_TAG_STRING(name, desc) XSTR(name),
   DO_ARENA_TAG(ARENA_TAG_STRING)
 #undef ARENA_TAG_STRING
 };
 
 const char* Arena::tag_desc[] = {
-#define ARENA_TAG_DESC(name, str, desc) XSTR(desc),
+#define ARENA_TAG_DESC(name, desc) XSTR(desc),
   DO_ARENA_TAG(ARENA_TAG_DESC)
 #undef ARENA_TAG_DESC
 };
@@ -118,11 +118,19 @@ public:
   }
 
   // Returns an initialized and null-terminated Chunk of requested size
-  static Chunk* allocate_chunk(size_t length, AllocFailType alloc_failmode);
+  static Chunk* allocate_chunk(Arena* arena, size_t length, AllocFailType alloc_failmode);
   static void deallocate_chunk(Chunk* p);
 };
 
-Chunk* ChunkPool::allocate_chunk(size_t length, AllocFailType alloc_failmode) {
+static bool on_compiler_thread() {
+#if defined(COMPILER1) || defined(COMPILER2)
+  return Thread::current_or_null() != nullptr &&
+         Thread::current()->is_Compiler_thread();
+#endif // COMPILER1 || COMPILER2
+  return false;
+}
+
+Chunk* ChunkPool::allocate_chunk(Arena* arena, size_t length, AllocFailType alloc_failmode) {
   // - requested_size = sizeof(Chunk)
   // - length = payload size
   // We must ensure that the boundaries of the payload (C and D) are aligned to 64-bit:
@@ -164,10 +172,27 @@ Chunk* ChunkPool::allocate_chunk(size_t length, AllocFailType alloc_failmode) {
   ::new(chunk) Chunk(length);
   // We rely on arena alignment <= malloc alignment.
   assert(is_aligned(chunk, ARENA_AMALLOC_ALIGNMENT), "Chunk start address misaligned.");
+
+  if (CompilationMemoryStatistic::enabled() && on_compiler_thread()) {
+    uint64_t stamp = 0;
+    CompilationMemoryStatistic::on_arena_chunk_allocation(chunk->length(), (int)arena->get_tag(), &stamp);
+    chunk->set_stamp(stamp);
+  } else {
+    chunk->set_stamp(0);
+  }
+
   return chunk;
 }
 
 void ChunkPool::deallocate_chunk(Chunk* c) {
+
+  // Inform compilation memstat
+  if (CompilationMemoryStatistic::enabled() && c->stamp() != 0) {
+    assert(on_compiler_thread(), "we stamped this chunk");
+    CompilationMemoryStatistic::on_arena_chunk_deallocation(c->length(), c->stamp());
+    c->set_stamp(0);
+  }
+
   // If this is a standard-sized chunk, return it to its pool; otherwise free it.
   ChunkPool* pool = ChunkPool::get_pool_for_size(c->length());
   if (pool != nullptr) {
@@ -200,8 +225,8 @@ void Arena::start_chunk_pool_cleaner_task() {
   cleaner->enroll();
 }
 
-Chunk::Chunk(size_t length) : _len(length) {
-  _next = nullptr;         // Chain on the linked list
+Chunk::Chunk(size_t length) :
+    _next(nullptr), _len(length), _stamp(0) {
 }
 
 void Chunk::chop(Chunk* k) {
@@ -227,7 +252,7 @@ Arena::Arena(MemTag mem_tag, Tag tag, size_t init_size) :
   _hwm(nullptr), _max(nullptr)
 {
   init_size = ARENA_ALIGN(init_size);
-  _chunk = ChunkPool::allocate_chunk(init_size, AllocFailStrategy::EXIT_OOM);
+  _chunk = ChunkPool::allocate_chunk(this, init_size, AllocFailStrategy::EXIT_OOM);
   _first = _chunk;
   _hwm = _chunk->bottom();      // Save the cached hwm, max
   _max = _chunk->top();
@@ -258,12 +283,6 @@ void Arena::set_size_in_bytes(size_t size) {
     ssize_t delta = size - size_in_bytes();
     _size_in_bytes = size;
     MemTracker::record_arena_size_change(delta, _mem_tag);
-    if (CompilationMemoryStatistic::enabled() && _mem_tag == mtCompiler) {
-      Thread* const t = Thread::current();
-      if (t != nullptr && t->is_Compiler_thread()) {
-        CompilationMemoryStatistic::on_arena_change(delta, this);
-      }
-    }
   }
 }
 
@@ -289,7 +308,7 @@ void* Arena::grow(size_t x, AllocFailType alloc_failmode) {
   }
 
   Chunk* k = _chunk;            // Get filled-up chunk address
-  _chunk = ChunkPool::allocate_chunk(len, alloc_failmode);
+  _chunk = ChunkPool::allocate_chunk(this, len, alloc_failmode);
 
   if (_chunk == nullptr) {
     _chunk = k;                 // restore the previous value of _chunk
diff --git a/src/hotspot/share/memory/arena.hpp b/src/hotspot/share/memory/arena.hpp
index 5f0def2a655..dfa12209f40 100644
--- a/src/hotspot/share/memory/arena.hpp
+++ b/src/hotspot/share/memory/arena.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -44,6 +44,9 @@ class Chunk {
  private:
   Chunk*       _next;     // Next Chunk in list
   const size_t _len;      // Size of this Chunk
+  // Used for Compilation Memory Statistic
+  uint64_t _stamp;
+
 public:
   NONCOPYABLE(Chunk);
 
@@ -66,7 +69,8 @@ public:
     tiny_size  =  256  - slack, // Size of first chunk (tiny)
     init_size  =  1*K  - slack, // Size of first chunk (normal aka small)
     medium_size= 10*K  - slack, // Size of medium-sized chunk
-    size       = 32*K  - slack  // Default size of an Arena chunk (following the first)
+    size       = 32*K  - slack, // Default size of an Arena chunk (following the first)
+    max_default_size = size     // Largest default size
   };
 
   static void chop(Chunk* chunk);                  // Chop this chunk
@@ -81,19 +85,30 @@ public:
   char* bottom() const          { return ((char*) this) + aligned_overhead_size();  }
   char* top()    const          { return bottom() + _len; }
   bool contains(char* p) const  { return bottom() <= p && p <= top(); }
+
+  void set_stamp(uint64_t v) { _stamp = v; }
+  uint64_t stamp() const     { return _stamp; }
 };
 
+// Arena types (for Compilation Memory Statistic)
 #define DO_ARENA_TAG(FN) \
-  FN(other, Others, Other arenas) \
-  FN(ra, RA, Resource areas) \
-  FN(ha, HA, Handle area) \
-  FN(node, NA, Node arena) \
+  FN(ra,          Resource areas) \
+  FN(node,        C2 Node arena) \
+  FN(comp,        C2 Compile arena) \
+  FN(type,        C2 Type arena) \
+  FN(states,      C2 Matcher States Arena) \
+  FN(reglive,     C2 Register Allocation Live Arenas) \
+  FN(regsplit,    C2 Register Allocation Split Arena) \
+  FN(superword,   C2 SuperWord Arenas) \
+  FN(cienv,       CI Env Arena) \
+  FN(ha,          Handle area) \
+  FN(other,       Other arenas) \
 
 // Fast allocation of memory
 class Arena : public CHeapObjBase {
 public:
   enum class Tag: uint8_t {
-#define ARENA_TAG_ENUM(name, str, desc) tag_##name,
+#define ARENA_TAG_ENUM(name, desc) tag_##name,
     DO_ARENA_TAG(ARENA_TAG_ENUM)
 #undef ARENA_TAG_ENUM
     tag_count
@@ -192,6 +207,7 @@ protected:
   size_t size_in_bytes() const         {  return _size_in_bytes; };
   void set_size_in_bytes(size_t size);
 
+  MemTag get_mem_tag() const { return _mem_tag; }
   Tag get_tag() const { return _tag; }
 
 private:
diff --git a/src/hotspot/share/memory/resourceArea.hpp b/src/hotspot/share/memory/resourceArea.hpp
index 29dea9ad2f4..85ad6590d69 100644
--- a/src/hotspot/share/memory/resourceArea.hpp
+++ b/src/hotspot/share/memory/resourceArea.hpp
@@ -54,8 +54,12 @@ public:
   ResourceArea(MemTag mem_tag = mtThread) :
     Arena(mem_tag, Arena::Tag::tag_ra) DEBUG_ONLY(COMMA _nesting(0)) {}
 
-  ResourceArea(size_t init_size, MemTag mem_tag = mtThread) :
-    Arena(mem_tag, Arena::Tag::tag_ra, init_size) DEBUG_ONLY(COMMA _nesting(0)) {
+  ResourceArea(size_t init_size, MemTag mem_tag = mtThread, Arena::Tag arena_tag = Arena::Tag::tag_ra) :
+    Arena(mem_tag, arena_tag, init_size) DEBUG_ONLY(COMMA _nesting(0)) {
+  }
+
+  ResourceArea(MemTag mem_tag, Arena::Tag arena_tag) :
+    Arena(mem_tag, arena_tag) DEBUG_ONLY(COMMA _nesting(0)) {
   }
 
   char* allocate_bytes(size_t size, AllocFailType alloc_failmode = AllocFailStrategy::EXIT_OOM);
diff --git a/src/hotspot/share/opto/chaitin.cpp b/src/hotspot/share/opto/chaitin.cpp
index 30d8e1ac287..11e1797d034 100644
--- a/src/hotspot/share/opto/chaitin.cpp
+++ b/src/hotspot/share/opto/chaitin.cpp
@@ -366,8 +366,8 @@ void PhaseChaitin::Register_Allocate() {
   _alternate = 0;
   _matcher._allocation_started = true;
 
-  ResourceArea split_arena(mtCompiler);     // Arena for Split local resources
-  ResourceArea live_arena(mtCompiler);      // Arena for liveness & IFG info
+  ResourceArea split_arena(mtCompiler, Arena::Tag::tag_regsplit);     // Arena for Split local resources
+  ResourceArea live_arena(mtCompiler, Arena::Tag::tag_reglive);     // Arena for liveness & IFG info
   ResourceMark rm(&live_arena);
 
   // Need live-ness for the IFG; need the IFG for coalescing.  If the
diff --git a/src/hotspot/share/opto/compile.cpp b/src/hotspot/share/opto/compile.cpp
index 7c9d8250e5c..014463ccc21 100644
--- a/src/hotspot/share/opto/compile.cpp
+++ b/src/hotspot/share/opto/compile.cpp
@@ -41,6 +41,7 @@
 #include "jfr/jfrEvents.hpp"
 #include "jvm_io.h"
 #include "memory/allocation.hpp"
+#include "memory/arena.hpp"
 #include "memory/resourceArea.hpp"
 #include "opto/addnode.hpp"
 #include "opto/block.hpp"
@@ -638,7 +639,7 @@ Compile::Compile(ciEnv* ci_env, ciMethod* target, int osr_bci,
       _has_method_handle_invokes(false),
       _clinit_barrier_on_entry(false),
       _stress_seed(0),
-      _comp_arena(mtCompiler),
+      _comp_arena(mtCompiler, Arena::Tag::tag_comp),
       _barrier_set_state(BarrierSet::barrier_set()->barrier_set_c2()->create_barrier_state(comp_arena())),
       _env(ci_env),
       _directive(directive),
@@ -661,7 +662,7 @@ Compile::Compile(ciEnv* ci_env, ciMethod* target, int osr_bci,
       _node_arena_two(mtCompiler, Arena::Tag::tag_node),
       _node_arena(&_node_arena_one),
       _mach_constant_base_node(nullptr),
-      _Compile_types(mtCompiler),
+      _Compile_types(mtCompiler, Arena::Tag::tag_type),
       _initial_gvn(nullptr),
       _igvn_worklist(nullptr),
       _types(nullptr),
@@ -915,7 +916,7 @@ Compile::Compile(ciEnv* ci_env,
       _has_method_handle_invokes(false),
       _clinit_barrier_on_entry(false),
       _stress_seed(0),
-      _comp_arena(mtCompiler),
+      _comp_arena(mtCompiler, Arena::Tag::tag_comp),
       _barrier_set_state(BarrierSet::barrier_set()->barrier_set_c2()->create_barrier_state(comp_arena())),
       _env(ci_env),
       _directive(directive),
@@ -927,11 +928,11 @@ Compile::Compile(ciEnv* ci_env,
           _unique(0),
       _dead_node_count(0),
       _dead_node_list(comp_arena()),
-      _node_arena_one(mtCompiler),
-      _node_arena_two(mtCompiler),
+      _node_arena_one(mtCompiler, Arena::Tag::tag_node),
+      _node_arena_two(mtCompiler, Arena::Tag::tag_node),
       _node_arena(&_node_arena_one),
       _mach_constant_base_node(nullptr),
-      _Compile_types(mtCompiler),
+      _Compile_types(mtCompiler, Arena::Tag::tag_type),
       _initial_gvn(nullptr),
       _igvn_worklist(nullptr),
       _types(nullptr),
@@ -3013,6 +3014,13 @@ void Compile::Code_Gen() {
     print_method(PHASE_POSTALLOC_EXPAND, 3);
   }
 
+#ifdef ASSERT
+  {
+    CompilationMemoryStatistic::do_test_allocations();
+    if (failing()) return;
+  }
+#endif
+
   // Convert Nodes to instruction bits in a buffer
   {
     TracePhase tp(_t_output);
@@ -4313,6 +4321,7 @@ Compile::TracePhase::TracePhase(const char* name, PhaseTraceId id)
     _dolog(CITimeVerbose)
 {
   assert(_compile != nullptr, "sanity check");
+  assert(id != PhaseTraceId::_t_none, "Don't use none");
   if (_dolog) {
     _log = _compile->log();
   }
@@ -4321,12 +4330,23 @@ Compile::TracePhase::TracePhase(const char* name, PhaseTraceId id)
     _log->stamp();
     _log->end_head();
   }
+
+  // Inform memory statistic, if enabled
+  if (CompilationMemoryStatistic::enabled()) {
+    CompilationMemoryStatistic::on_phase_start((int)id, name);
+  }
 }
 
 Compile::TracePhase::TracePhase(PhaseTraceId id)
   : TracePhase(Phase::get_phase_trace_id_text(id), id) {}
 
 Compile::TracePhase::~TracePhase() {
+
+  // Inform memory statistic, if enabled
+  if (CompilationMemoryStatistic::enabled()) {
+    CompilationMemoryStatistic::on_phase_end();
+  }
+
   if (_compile->failing_internal()) {
     if (_log != nullptr) {
       _log->done("phase");
diff --git a/src/hotspot/share/opto/compile.hpp b/src/hotspot/share/opto/compile.hpp
index 2ae3cca218d..1fe6180c54f 100644
--- a/src/hotspot/share/opto/compile.hpp
+++ b/src/hotspot/share/opto/compile.hpp
@@ -236,9 +236,9 @@ class Compile : public Phase {
   // (The time collection itself is always conditionalized on CITime.)
   class TracePhase : public TraceTime {
    private:
-    Compile*    _compile;
+    Compile* const _compile;
     CompileLog* _log;
-    bool _dolog;
+    const bool _dolog;
    public:
     TracePhase(PhaseTraceId phaseTraceId);
     TracePhase(const char* name, PhaseTraceId phaseTraceId);
diff --git a/src/hotspot/share/opto/gcm.cpp b/src/hotspot/share/opto/gcm.cpp
index c9cdd235f03..eeab96de3fa 100644
--- a/src/hotspot/share/opto/gcm.cpp
+++ b/src/hotspot/share/opto/gcm.cpp
@@ -1695,7 +1695,7 @@ void PhaseCFG::global_code_motion() {
   // Enabling the scheduler for register pressure plus finding blocks of size to schedule for it
   // is key to enabling this feature.
   PhaseChaitin regalloc(C->unique(), *this, _matcher, true);
-  ResourceArea live_arena(mtCompiler);      // Arena for liveness
+  ResourceArea live_arena(mtCompiler, Arena::Tag::tag_reglive);      // Arena for liveness
   ResourceMark rm_live(&live_arena);
   PhaseLive live(*this, regalloc._lrg_map.names(), &live_arena, true);
   PhaseIFG ifg(&live_arena);
diff --git a/src/hotspot/share/opto/matcher.cpp b/src/hotspot/share/opto/matcher.cpp
index 1c9afae6510..fd89a6e5431 100644
--- a/src/hotspot/share/opto/matcher.cpp
+++ b/src/hotspot/share/opto/matcher.cpp
@@ -60,7 +60,7 @@ const uint Matcher::_end_rematerialize   = _END_REMATERIALIZE;
 //---------------------------Matcher-------------------------------------------
 Matcher::Matcher()
 : PhaseTransform( Phase::Ins_Select ),
-  _states_arena(Chunk::medium_size, mtCompiler),
+  _states_arena(Chunk::medium_size, mtCompiler, Arena::Tag::tag_states),
   _new_nodes(C->comp_arena()),
   _visited(&_states_arena),
   _shared(&_states_arena),
diff --git a/src/hotspot/share/opto/phase.hpp b/src/hotspot/share/opto/phase.hpp
index ff166c8de8e..6700df6ec17 100644
--- a/src/hotspot/share/opto/phase.hpp
+++ b/src/hotspot/share/opto/phase.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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,8 @@ class IfNode;
 class MergeMemNode;
 class Node;
 class PhaseGVN;
+class Compile;
+class ciMethod;
 
 //------------------------------Phase------------------------------------------
 // Most optimizations are done in Phases.  Creating a phase does any long
@@ -65,6 +67,7 @@ public:
   };
 
 #define ALL_PHASE_TRACE_IDS(f)                                   \
+    f(   _t_none,                    "none")                     \
     f(   _t_parser,                  "parse")                    \
     f(   _t_optimizer,               "optimizer")                \
     f(     _t_escapeAnalysis,        "escapeAnalysis")           \
@@ -118,7 +121,9 @@ public:
     f(     _t_fillBuffer,            "fill buffer")              \
     f(     _t_registerMethod,        "install_code")             \
     f(   _t_temporaryTimer1,         "tempTimer1")               \
-    f(   _t_temporaryTimer2,         "tempTimer2")
+    f(   _t_temporaryTimer2,         "tempTimer2")               \
+    f(   _t_testPhase1,              "testPhase1")               \
+    f(   _t_testPhase2,              "testPhase2")
 
   enum PhaseTraceId {
 #define DEFID(name, text) name,
diff --git a/src/hotspot/share/opto/runtime.cpp b/src/hotspot/share/opto/runtime.cpp
index 30cfbddc196..b288f21f99e 100644
--- a/src/hotspot/share/opto/runtime.cpp
+++ b/src/hotspot/share/opto/runtime.cpp
@@ -30,6 +30,7 @@
 #include "code/pcDesc.hpp"
 #include "code/scopeDesc.hpp"
 #include "code/vtableStubs.hpp"
+#include "compiler/compilationMemoryStatistic.hpp"
 #include "compiler/compileBroker.hpp"
 #include "compiler/oopMap.hpp"
 #include "gc/g1/g1HeapRegion.hpp"
@@ -267,6 +268,7 @@ address OptoRuntime::generate_stub(ciEnv* env,
 
   // Matching the default directive, we currently have no method to match.
   DirectiveSet* directive = DirectivesStack::getDefaultDirective(CompileBroker::compiler(CompLevel_full_optimization));
+  CompilationMemoryStatisticMark cmsm(directive);
   ResourceMark rm;
   Compile C(env, gen, C_function, name, is_fancy_jump, pass_tls, return_pc, directive);
   DirectivesStack::release(directive);
diff --git a/src/hotspot/share/opto/superword.cpp b/src/hotspot/share/opto/superword.cpp
index 697e4d842d5..092fa07e184 100644
--- a/src/hotspot/share/opto/superword.cpp
+++ b/src/hotspot/share/opto/superword.cpp
@@ -33,7 +33,7 @@
 SuperWord::SuperWord(const VLoopAnalyzer &vloop_analyzer) :
   _vloop_analyzer(vloop_analyzer),
   _vloop(vloop_analyzer.vloop()),
-  _arena(mtCompiler),
+  _arena(mtCompiler, Arena::Tag::tag_superword),
   _clone_map(phase()->C->clone_map()),                      // map of nodes created in cloning
   _pairset(&_arena, _vloop_analyzer),
   _packset(&_arena, _vloop_analyzer
diff --git a/src/hotspot/share/opto/type.cpp b/src/hotspot/share/opto/type.cpp
index b56e3739a9d..fabcec48719 100644
--- a/src/hotspot/share/opto/type.cpp
+++ b/src/hotspot/share/opto/type.cpp
@@ -440,7 +440,7 @@ void Type::Initialize_shared(Compile* current) {
   // locking.
 
   Arena* save = current->type_arena();
-  Arena* shared_type_arena = new (mtCompiler)Arena(mtCompiler);
+  Arena* shared_type_arena = new (mtCompiler)Arena(mtCompiler, Arena::Tag::tag_type);
 
   current->set_type_arena(shared_type_arena);
 
diff --git a/src/hotspot/share/opto/vectorization.hpp b/src/hotspot/share/opto/vectorization.hpp
index 2a2186ab0aa..d4b78515312 100644
--- a/src/hotspot/share/opto/vectorization.hpp
+++ b/src/hotspot/share/opto/vectorization.hpp
@@ -256,7 +256,7 @@ private:
 
 public:
   VSharedData() :
-    _arena(mtCompiler),
+    _arena(mtCompiler, Arena::Tag::tag_superword),
     _node_idx_to_loop_body_idx(&_arena, estimated_node_count(), 0, 0)
   {
   }
@@ -696,7 +696,7 @@ private:
 public:
   VLoopAnalyzer(const VLoop& vloop, VSharedData& vshared) :
     _vloop(vloop),
-    _arena(mtCompiler),
+    _arena(mtCompiler, Arena::Tag::tag_superword),
     _success(false),
     _reductions      (&_arena, vloop),
     _memory_slices   (&_arena, vloop),
diff --git a/src/hotspot/share/opto/vtransform.hpp b/src/hotspot/share/opto/vtransform.hpp
index 308578ecb57..588da3cd56e 100644
--- a/src/hotspot/share/opto/vtransform.hpp
+++ b/src/hotspot/share/opto/vtransform.hpp
@@ -217,7 +217,7 @@ public:
     _vloop_analyzer(vloop_analyzer),
     _vloop(vloop_analyzer.vloop()),
     NOT_PRODUCT(_trace(trace) COMMA)
-    _arena(mtCompiler),
+    _arena(mtCompiler, Arena::Tag::tag_superword),
     _graph(_vloop_analyzer, _arena NOT_PRODUCT(COMMA _trace)),
     _mem_ref_for_main_loop_alignment(mem_ref_for_main_loop_alignment),
     _aw_for_main_loop_alignment(aw_for_main_loop_alignment) {}
diff --git a/src/hotspot/share/runtime/globals.hpp b/src/hotspot/share/runtime/globals.hpp
index a1ebe226e85..e7aa034612b 100644
--- a/src/hotspot/share/runtime/globals.hpp
+++ b/src/hotspot/share/runtime/globals.hpp
@@ -1403,6 +1403,9 @@ const int ObjectAlignmentInBytes = 8;
   product(bool, PrintMetaspaceStatisticsAtExit, false, DIAGNOSTIC,          \
           "Print metaspace statistics upon VM exit.")                       \
                                                                             \
+  product(bool, PrintCompilerMemoryStatisticsAtExit, false, DIAGNOSTIC,     \
+          "Print compiler memory statistics upon VM exit.")                 \
+                                                                            \
   product(uintx, MinHeapFreeRatio, 40, MANAGEABLE,                          \
           "The minimum percentage of heap free after GC to avoid expansion."\
           " For most GCs this applies to the old generation. In G1 and"     \
diff --git a/src/hotspot/share/runtime/java.cpp b/src/hotspot/share/runtime/java.cpp
index b2c24169505..45e63e90ffb 100644
--- a/src/hotspot/share/runtime/java.cpp
+++ b/src/hotspot/share/runtime/java.cpp
@@ -353,8 +353,8 @@ void print_statistics() {
     MetaspaceUtils::print_basic_report(tty, 0);
   }
 
-  if (CompilerOracle::should_print_final_memstat_report()) {
-    CompilationMemoryStatistic::print_all_by_size(tty, false, 0);
+  if (PrintCompilerMemoryStatisticsAtExit) {
+    CompilationMemoryStatistic::print_final_report(tty);
   }
 
   ThreadsSMRSupport::log_statistics();
diff --git a/src/hotspot/share/services/diagnosticCommand.cpp b/src/hotspot/share/services/diagnosticCommand.cpp
index 13d996e7ab7..d257ef61be6 100644
--- a/src/hotspot/share/services/diagnosticCommand.cpp
+++ b/src/hotspot/share/services/diagnosticCommand.cpp
@@ -1145,16 +1145,17 @@ void VThreadPollersDCmd::execute(DCmdSource source, TRAPS) {
 
 CompilationMemoryStatisticDCmd::CompilationMemoryStatisticDCmd(outputStream* output, bool heap) :
     DCmdWithParser(output, heap),
-  _human_readable("-H", "Human readable format", "BOOLEAN", false, "false"),
-  _minsize("-s", "Minimum memory size", "MEMORY SIZE", false, "0") {
-  _dcmdparser.add_dcmd_option(&_human_readable);
+  _verbose("verbose", "Print detailed information", "BOOLEAN", false, "false"),
+  _legend("legend", "Table mode: print legend", "BOOLEAN", false, "false"),
+  _minsize("minsize", "Minimum memory size", "MEMORY SIZE", false, "0") {
+  _dcmdparser.add_dcmd_option(&_verbose);
   _dcmdparser.add_dcmd_option(&_minsize);
+  _dcmdparser.add_dcmd_option(&_legend);
 }
 
 void CompilationMemoryStatisticDCmd::execute(DCmdSource source, TRAPS) {
-  const bool human_readable = _human_readable.value();
   const size_t minsize = _minsize.has_value() ? _minsize.value()._size : 0;
-  CompilationMemoryStatistic::print_all_by_size(output(), human_readable, minsize);
+  CompilationMemoryStatistic::print_jcmd_report(output(), _verbose.value(), _legend.value(), minsize);
 }
 
 #if defined(LINUX) || defined(_WIN64) || defined(__APPLE__)
diff --git a/src/hotspot/share/services/diagnosticCommand.hpp b/src/hotspot/share/services/diagnosticCommand.hpp
index 212a8996d0a..18d06f45a6a 100644
--- a/src/hotspot/share/services/diagnosticCommand.hpp
+++ b/src/hotspot/share/services/diagnosticCommand.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -805,10 +805,11 @@ public:
 
 class CompilationMemoryStatisticDCmd: public DCmdWithParser {
 protected:
-  DCmdArgument<bool> _human_readable;
+  DCmdArgument<bool> _verbose;
+  DCmdArgument<bool> _legend;
   DCmdArgument<MemorySizeArgument> _minsize;
 public:
-  static int num_arguments() { return 2; }
+  static int num_arguments() { return 3; }
   CompilationMemoryStatisticDCmd(outputStream* output, bool heap);
   static const char* name() {
     return "Compiler.memory";
diff --git a/src/hotspot/share/utilities/vmError.cpp b/src/hotspot/share/utilities/vmError.cpp
index 9e06614bc7e..bbf1fcf9d6f 100644
--- a/src/hotspot/share/utilities/vmError.cpp
+++ b/src/hotspot/share/utilities/vmError.cpp
@@ -27,6 +27,7 @@
 #include "cds/metaspaceShared.hpp"
 #include "code/codeCache.hpp"
 #include "compiler/compilationFailureInfo.hpp"
+#include "compiler/compilationMemoryStatistic.hpp"
 #include "compiler/compileBroker.hpp"
 #include "compiler/disassembler.hpp"
 #include "gc/shared/gcConfig.hpp"
@@ -1000,6 +1001,11 @@ void VMError::report(outputStream* st, bool _verbose) {
   STEP_IF("printing pending compilation failure",
           _verbose && _thread != nullptr && _thread->is_Compiler_thread())
     CompilationFailureInfo::print_pending_compilation_failure(st);
+  if (CompilationMemoryStatistic::enabled() && CompilationMemoryStatistic::in_oom_crash()) {
+    st->cr();
+    st->print_cr(">> Please see below for a detailed breakdown of compiler memory usage.");
+    st->cr();
+  }
 #endif
 
   STEP_IF("printing registers", _verbose && _context != nullptr)
@@ -1260,6 +1266,10 @@ void VMError::report(outputStream* st, bool _verbose) {
     MemTracker::error_report(st);
     st->cr();
 
+  STEP_IF("printing compiler memory info, if any", _verbose)
+    CompilationMemoryStatistic::print_error_report(st);
+    st->cr();
+
   STEP_IF("printing periodic trim state", _verbose)
     NativeHeapTrimmer::print_state(st);
     st->cr();
@@ -1436,10 +1446,12 @@ void VMError::print_vm_info(outputStream* st) {
   st->cr();
 
   // STEP("Native Memory Tracking")
-
   MemTracker::error_report(st);
   st->cr();
 
+  // STEP("Compiler Memory Statistic")
+  CompilationMemoryStatistic::print_final_report(st);
+
   // STEP("printing periodic trim state")
   NativeHeapTrimmer::print_state(st);
   st->cr();
diff --git a/test/hotspot/jtreg/compiler/print/CompileCommandMemLimit.java b/test/hotspot/jtreg/compiler/print/CompileCommandMemLimit.java
index f1565db47d9..aef477f4402 100644
--- a/test/hotspot/jtreg/compiler/print/CompileCommandMemLimit.java
+++ b/test/hotspot/jtreg/compiler/print/CompileCommandMemLimit.java
@@ -1,6 +1,6 @@
 /*
- * Copyright (c) 2023, 2024, Red Hat, Inc. All rights reserved.
- * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2025, Red Hat, Inc. All rights reserved.
+ * Copyright (c) 2023, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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,33 +25,33 @@
 /*
  * @test id=c1_crash
  * @requires vm.compiler1.enabled
- * @summary Checks that -XX:CompileCommand=MemLimit,...,crash causes C1 to crash
+ * @summary Checks that -XX:CompileCommand=MemLimit,...,xx~crash causes C1 to crash
  * @library /test/lib
- * @run driver compiler.print.CompileCommandMemLimit crash false
+ * @run driver compiler.print.CompileCommandMemLimit c1 crash
  */
 
 /*
  * @test id=c2_crash
  * @requires vm.compiler2.enabled
- * @summary Checks that -XX:CompileCommand=MemLimit,...,crash causes C2 to crash
+ * @summary Checks that -XX:CompileCommand=MemLimit,...,xx~crash causes C2 to crash
  * @library /test/lib
- * @run driver compiler.print.CompileCommandMemLimit crash true
+ * @run driver compiler.print.CompileCommandMemLimit c2 crash
  */
 
 /*
  * @test id=c1_stop
  * @requires vm.compiler1.enabled
- * @summary Checks that -XX:CompileCommand=MemLimit,...,stop causes C1 to stop
+ * @summary Checks that -XX:CompileCommand=MemLimit,...,xx causes C1 to bail out from the compilation
  * @library /test/lib
- * @run driver compiler.print.CompileCommandMemLimit stop false
+ * @run driver compiler.print.CompileCommandMemLimit c1 stop
  */
 
 /*
  * @test id=c2_stop
  * @requires vm.compiler2.enabled
- * @summary Checks that -XX:CompileCommand=MemLimit,...,stop causes C2 to stop
+ * @summary Checks that -XX:CompileCommand=MemLimit,...,xx causes C2 to bail out from the compilation
  * @library /test/lib
- * @run driver compiler.print.CompileCommandMemLimit stop true
+ * @run driver compiler.print.CompileCommandMemLimit c2 stop
  */
 
 package compiler.print;
@@ -73,16 +73,12 @@ public class CompileCommandMemLimit {
     // Method for which we explicitly disable a limit on the command line.
     final static String METHOD3 = "method3";
 
-    static boolean c2;
-    static boolean test_crash;
+    enum TestMode { crash, stop };
+    enum CompilerType { c1, c2 };
 
     public static void main(String[] args) throws Exception {
-        switch (args[0]) {
-            case "crash" : test_crash = true; break;
-            case "stop" : test_crash = false; break;
-            default: throw new RuntimeException("invalid argument");
-        }
-        c2 = Boolean.parseBoolean(args[1]);
+        CompilerType ctyp = CompilerType.valueOf(args[0]);
+        TestMode mode = TestMode.valueOf(args[1]);
 
         List<String> options = new ArrayList<String>();
         options.add("-Xcomp");
@@ -92,19 +88,40 @@ public class CompileCommandMemLimit {
         options.add("-XX:CompileCommand=compileonly," + getTestClass() + "::*");
 
         // We want a final report
-        options.add("-XX:CompileCommand=MemStat,*.*,print");
+        options.add("-XX:CompileCommand=MemStat," + getTestMethod(METHOD2) + ",print");
 
-        // We limit method 2 to a very small limit that is guaranteed to trigger
-        options.add("-XX:CompileCommand=MemLimit," + getTestMethod(METHOD2) + ",4k" + (test_crash ? "~crash" : ""));
+        String suffix = mode == TestMode.crash ? "~crash" : "";
 
-        // We disable any limit set on method 3
-        options.add("-XX:CompileCommand=MemLimit," + getTestMethod(METHOD3) + ",0");
+        // About the limit:
+        //
+        // In the debug JVM, for this test class, compilers will allocate (near the very end of the compilation)
+        // 32MB of arena memory.
+        //
+        // C1 will allocate them in a single step from RA, leaked until end of compilation.
+        //
+        // C2 will allocate them in two steps: first 2MB inside phase "testPhase1" in a temporary arena
+        // that will be gone by phase end. So, in the phase timeline these 2MB must show up as
+        // "significant temporary peak".
+        // In a second phase "testPhase2", we allocate 32MB from resource area, which is leaked until
+        // the end of the compilation. This means that these 32MB will show up as permanent memory
+        // increase in the per-phase-timeline.
+        //
+        // We then set the limit to 31MB (just shy of the 32MB we allocate), which should reliably trigger the mem limit.
+        // The 32MB are deliberately chosen to be large, because this will harden the test against normal allocation fluctuations
+        // (the methods are tiny, so compiling them should accrue normally only a few dozen KB).
+        //
+        // In the release JVM, we just use a very tiny memlimit that we are sure to hit every time.
 
-        if (c2) {
+        long limit = Platform.isDebugBuild() ? (1024 * 1024 * 31) : 4096;
+
+        options.add("-XX:CompileCommand=MemLimit," + getTestMethod(METHOD2) + "," + limit + suffix);
+
+        if (ctyp == CompilerType.c2) {
             options.add("-XX:-TieredCompilation");
         } else {
             options.add("-XX:TieredStopAtLevel=1");
         }
+
         options.add(getTestClass());
 
         OutputAnalyzer oa = ProcessTools.executeTestJava(options);
@@ -114,14 +131,14 @@ public class CompileCommandMemLimit {
         String method1regex = testMethodNameForRegex(getTestMethod(METHOD1));
         String method2regex = testMethodNameForRegex(getTestMethod(METHOD2));
         String method3regex = testMethodNameForRegex(getTestMethod(METHOD3));
-        String ct = c2 ? "c2" : "c1";
+        String limitHitRegex = ctyp + " \\(\\d+\\) compiler/print/CompileCommandMemLimit\\$TestMain::method2.*: Hit MemLimit - limit: " + limit + " now: \\d+";
 
-        if (test_crash) {
+        if (mode == TestMode.crash) {
             oa.shouldNotHaveExitValue(0);
             oa.shouldMatch("# *Internal Error.*");
 
             // method 2 should have hit its tiny limit
-            oa.shouldMatch("# *fatal error: " + ct + " *" + method2regex + ".*: Hit MemLimit .*limit: 4096.*");
+            oa.shouldMatch("# *fatal error: " + limitHitRegex);
 
             // none of the other ones should have hit a limit
             oa.shouldNotMatch(method1regex + ".*Hit MemLimit");
@@ -143,36 +160,28 @@ public class CompileCommandMemLimit {
         } else {
             oa.shouldHaveExitValue(0);
 
-            // In debug builds we have an inbuilt MemLimit. It is very high, so we don't expect it to fire in this test.
-            // But it will still show up in the final report.
-            String implicitMemoryLimit = Platform.isDebugBuild() ? "1024M" : "-";
-
-            // With C2, we print number of nodes, with C1 we don't
-            String numberNodesRegex = c2 ? "\\d+" : "-";
-
             // method 2 should have hit its tiny limit
-            oa.shouldMatch(ct + " " + method2regex + ".*: Hit MemLimit \\(limit: 4096 now: \\d+\\)");
+            oa.shouldMatch(limitHitRegex);
+
+            // Compilation should have been aborted and marked as oom
+            oa.shouldMatch(ctyp + " \\(\\d+\\) \\(oom\\) Arena usage " + method2regex + ".*\\d+.*");
 
             // neither of the other ones should have hit a limit
             oa.shouldNotMatch(method1regex + ".*Hit MemLimit");
             oa.shouldNotMatch(method3regex + ".*Hit MemLimit");
-
-            // Final report:
-            // Method 1 should show up as "ok" and with the default limit, e.g.
-            // total     NA        RA        result  #nodes  limit   time    type  #rc thread              method
-            // 32728     0         32728     ok     -       1024M   0.045   c1    1   0x000000011b019c10  compiler/print/CompileCommandMemLimit$TestMain::method1(()J)
-            oa.shouldMatch("\\d+ +\\d+ +\\d+ +ok +" + numberNodesRegex + " +" + implicitMemoryLimit + " +.* +" + method1regex);
-
-            // Method 2 should show up as "oom" and with its tiny limit, e.g.
-            // total     NA        RA        result  #nodes  limit   time    type  #rc thread              method
-            // 32728     0         32728     oom     -       4096B   0.045   c1    1   0x000000011b019c10  compiler/print/CompileCommandMemLimit$TestMain::method1(()J)
-            oa.shouldMatch("\\d+ +\\d+ +\\d+ +oom +" + numberNodesRegex + " +4096B +.* +" + method2regex);
-
-            // Method 3 should show up as "ok", and with no limit, even in debug builds, e.g.
-            // total     NA        RA        result  #nodes  limit   time    type  #rc thread              method
-            // 32728     0         32728     ok     -       -        0.045   c1    1   0x000000011b019c10  compiler/print/CompileCommandMemLimit$TestMain::method1(()J)
-            oa.shouldMatch("\\d+ +\\d+ +\\d+ +ok +" + numberNodesRegex + " +- +.* +" + method3regex);
         }
+
+        // In C2, analyze phase timeline and per-phase accumulation
+        if (ctyp == CompilerType.c2) {
+            oa.shouldMatch("--- Arena Usage by Arena Type and compilation phase, at arena usage peak of \\d+ ---");
+            oa.shouldContain("--- Allocation timelime by phase ---");
+            if (Platform.isDebugBuild()) {
+                oa.shouldMatch(".*testPhase2 +33554432 +33554432 +0 +0 +0 +0 +0.*");
+                oa.shouldMatch(" +>\\d+ +testPhase1.*significant temporary peak: \\d+ \\(\\+2098136\\)");
+                oa.shouldMatch(" +>\\d+ +testPhase2 +\\d+ +\\(\\+33554432\\).*");
+            }
+        }
+
     }
 
     // Test class that is invoked by the sub process
diff --git a/test/hotspot/jtreg/compiler/print/CompileCommandPrintMemStat.java b/test/hotspot/jtreg/compiler/print/CompileCommandPrintMemStat.java
index 2dbf46fd040..733cb3d8513 100644
--- a/test/hotspot/jtreg/compiler/print/CompileCommandPrintMemStat.java
+++ b/test/hotspot/jtreg/compiler/print/CompileCommandPrintMemStat.java
@@ -1,6 +1,6 @@
 /*
- * Copyright (c) 2023, 2024, Red Hat, Inc. All rights reserved.
- * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2025, Red Hat, Inc. All rights reserved.
+ * Copyright (c) 2023, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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,19 @@
  */
 
 /*
- * @test
- * @summary Checks that -XX:CompileCommand=PrintMemStat,... works
- * @requires vm.compiler1.enabled | vm.compiler2.enabled
+ * @test id=c2
+ * @summary Checks that -XX:CompileCommand=MemStat,...,print works with C2
+ * @requires vm.compiler1.enabled & vm.compiler2.enabled
  * @library /test/lib
- * @run driver compiler.print.CompileCommandPrintMemStat
+ * @run driver compiler.print.CompileCommandPrintMemStat c2
+ */
+
+/*
+ * @test id=c1
+ * @summary Checks that -XX:CompileCommand=MemStat,...,print works with C1
+ * @requires vm.compiler1.enabled & vm.compiler2.enabled
+ * @library /test/lib
+ * @run driver compiler.print.CompileCommandPrintMemStat c1
  */
 
 package compiler.print;
@@ -44,22 +52,41 @@ public class CompileCommandPrintMemStat {
     final static String METHOD1 = "method1";
     final static String METHOD2 = "method2";
 
-    public static void main(String[] args) throws Exception {
-        test(METHOD1, METHOD2);
-        test(METHOD2, METHOD1);
+    enum CompType {
+        c1, c2
     }
 
-    private static void test(String include, String exclude) throws Exception {
+    public static void main(String[] args) throws Exception {
+        if (args.length != 1) {
+            throw new RuntimeException("Missing Args");
+        }
+        CompType ctyp = CompType.valueOf(args[0]);
+        test(METHOD1, METHOD2, ctyp);
+        test(METHOD2, METHOD1, ctyp);
+        test(METHOD1, METHOD2, ctyp);
+        test(METHOD2, METHOD1, ctyp);
+    }
+
+    private static void test(String include, String exclude, CompType ctyp) throws Exception {
         List<String> options = new ArrayList<String>();
         options.add("-Xcomp");
-        options.add("-XX:-Inline");
         options.add("-XX:CompileCommand=compileonly," + getTestClass() + "::*");
+        options.add("-XX:-Inline");
+        if (ctyp.equals(CompType.c2)) {
+            options.add("-XX:-TieredCompilation");
+        } else {
+            options.add("-XX:TieredStopAtLevel=1");
+        }
         options.add("-XX:CompileCommand=MemStat," + getTestMethod(include) + ",print");
+        options.add("-XX:+UnlockDiagnosticVMOptions");
+        options.add("-XX:+PrintCompilerMemoryStatisticsAtExit");
+
         options.add(getTestClass());
 
         OutputAnalyzer oa = ProcessTools.executeTestJava(options);
+        oa.reportDiagnosticSummary();
 
-        // We expect two printouts for "PrintMemStat". A line at compilation time, and a line in a summary report
+        // We expect two printouts for "MemStat". A line at compilation time, and a line in a summary report
         // that is printed when we exit. Both use the typical <class>::name format but use / as separator and also
         // print the signature.
         String expectedNameIncl = getTestMethod(include)
@@ -69,27 +96,39 @@ public class CompileCommandPrintMemStat {
                 .replace('.', '/')
                 .replace("$", "\\$");
 
-        // Should see trace output when methods are compiled
-        oa.shouldHaveExitValue(0).
-                shouldMatch("Arena usage.*" + expectedNameIncl + ".*").
-                shouldNotMatch("Arena usage.*" + expectedNameExcl + ".*");
+        oa.shouldHaveExitValue(0);
 
+        if (ctyp == CompType.c1) {
+            // Example output for a C1 compilation output:
+            // c1 (885) (ok) Arena usage java/util/zip/ZipFile$Source::get((Ljava/io/File;ZLjava/util/zip/ZipCoder;)Ljava/util/zip/ZipFile$Source;): 752744 [ra 687288, cienv 65456]
+            oa.shouldMatch("c1.*Arena usage " + expectedNameIncl + ".*: \\d+.*");
+        }
 
-        // Should see final report
-        // Looks like this:
-        // total     Others    RA        HA        NA        result  #nodes  limit   time    type  #rc thread             method
-        // 523648    32728     490920    0         0         ok      -       -       0.250   c1    1   0x00007f4ec00d4ac0 java/lang/Class::descriptorString(()Ljava/lang/String;)
-        // or
-        // 1898600   853176    750872    0         294552    ok      934     -       1.501   c2    1   0x00007f4ec00d3330 java/lang/String::replace((CC)Ljava/lang/String;)
-        oa.shouldMatch("total.*method");
-        oa.shouldMatch("\\d+ +(\\d+ +){4}ok +(\\d+|-) +.*" + expectedNameIncl + ".*");
+        // In C2, analyze phase timeline and per-phase accumulation
+        if (ctyp == CompType.c2) {
+            oa.shouldMatch("c2.*Arena usage " + expectedNameIncl + ".*: \\d+.*");
+            oa.shouldMatch("--- Arena Usage by Arena Type and compilation phase, at arena usage peak of \\d+ ---");
+            oa.shouldContain("--- Allocation timelime by phase ---");
+            if (Platform.isDebugBuild()) {
+                oa.shouldMatch(".*testPhase2 +33554432 +33554432 +0 +0 +0 +0 +0.*");
+                oa.shouldMatch(" +>\\d+ +testPhase1.*significant temporary peak: \\d+ \\(\\+2098136\\)");
+                oa.shouldMatch(" +>\\d+ +testPhase2 +\\d+ +\\(\\+33554432\\).*");
+            }
+        }
+
+        // We also print a final report to tty if print is enabled. Looks like this:
+        //
+        // Compilation Memory usage:
+        //    ctyp  total     ra        node      comp      type      index     reglive   regsplit  cienv     other     #nodes  codesz  result  limit   time    id    thread             method
+        //    c1    14104176  13776896  0         0         0         0         0         0         327280    0         -       0       oom     10240K  0,547   412   0x00007fb14c1fb640 jdk/internal/classfile/impl/StackMapGenerator::processBlock((Ljdk/internal/classfile/impl/RawBytecodeHelper;)Z)
+        //    c2    5058384   4499056   262808    197352    0         0         0         0         32728     66440     293     1464    ok      10240K  0,200   191   0x00007fb14c1f9bb0 java/lang/StringLatin1::lastIndexOf(([BII)I)
+        oa.shouldMatch("\\s+ctyp\\s+total.*method.*");
+        oa.shouldMatch("\\s+c(1|2)\\s+\\d+.*" + expectedNameIncl + ".*");
 
         // In debug builds, we have a default memory limit enabled. That implies MemStat. Therefore we
-        // expect to see all methods, not just the one we specified on the command line.
-        if (Platform.isDebugBuild()) {
-            oa.shouldMatch("\\d+ +(\\d+ +){4}ok +(\\d+|-) +.*" + expectedNameExcl + ".*");
-        } else {
-            oa.shouldNotMatch(".*" + expectedNameExcl + ".*");
+        // may see the other method also.
+        if (!Platform.isDebugBuild()) {
+            oa.shouldNotContain(expectedNameExcl);
         }
     }
 

From 4a51c61b2cfa396dace2ca21d819b5f363c9b6b5 Mon Sep 17 00:00:00 2001
From: Afshin Zafari <azafari@openjdk.org>
Date: Mon, 3 Mar 2025 15:39:35 +0000
Subject: [PATCH 191/587] 8350567: NMT: update VMATree::register_mapping to
 copy the existing tag of the region

Reviewed-by: jsjolen, stuefe
---
 src/hotspot/share/nmt/vmatree.cpp       |  2 +-
 test/hotspot/gtest/nmt/test_vmatree.cpp | 16 ++++++++++++++++
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/src/hotspot/share/nmt/vmatree.cpp b/src/hotspot/share/nmt/vmatree.cpp
index 21aee26ca87..3352a6e5cd4 100644
--- a/src/hotspot/share/nmt/vmatree.cpp
+++ b/src/hotspot/share/nmt/vmatree.cpp
@@ -206,7 +206,7 @@ VMATree::SummaryDiff VMATree::register_mapping(position A, position B, StateType
   }
 
   // Finally, we can register the new region [A, B)'s summary data.
-  SingleDiff& rescom = diff.tag[NMTUtil::tag_to_index(metadata.mem_tag)];
+  SingleDiff& rescom = diff.tag[NMTUtil::tag_to_index(stA.out.mem_tag())];
   if (state == StateType::Reserved) {
     rescom.reserve += B - A;
   } else if (state == StateType::Committed) {
diff --git a/test/hotspot/gtest/nmt/test_vmatree.cpp b/test/hotspot/gtest/nmt/test_vmatree.cpp
index 1a618604de6..80b5df50062 100644
--- a/test/hotspot/gtest/nmt/test_vmatree.cpp
+++ b/test/hotspot/gtest/nmt/test_vmatree.cpp
@@ -724,3 +724,19 @@ TEST_VM_F(NMTVMATreeTest, TestConsistencyWithSimpleTracker) {
     }
   }
 }
+
+TEST_VM_F(NMTVMATreeTest, SummaryAccountingWhenUseFlagInplace) {
+  Tree tree;
+  VMATree::RegionData rd1(si[0], mtTest);
+  VMATree::RegionData rd2(si[1], mtNone);
+  tree.reserve_mapping(0, 100, rd1);
+  VMATree::SummaryDiff diff = tree.commit_mapping(0, 50, rd2, true);
+  EXPECT_EQ(0, diff.tag[NMTUtil::tag_to_index(mtTest)].reserve);
+  EXPECT_EQ(50, diff.tag[NMTUtil::tag_to_index(mtTest)].commit);
+  diff = tree.commit_mapping(60, 10, rd2, true);
+  EXPECT_EQ(0, diff.tag[NMTUtil::tag_to_index(mtTest)].reserve);
+  EXPECT_EQ(10, diff.tag[NMTUtil::tag_to_index(mtTest)].commit);
+  diff = tree.uncommit_mapping(0, 50, rd2);
+  EXPECT_EQ(0, diff.tag[NMTUtil::tag_to_index(mtTest)].reserve);
+  EXPECT_EQ(-50, diff.tag[NMTUtil::tag_to_index(mtTest)].commit);
+}
\ No newline at end of file

From 67dfdfa6ea829fcd1ecac0df8211b591ad15f859 Mon Sep 17 00:00:00 2001
From: Kim Barrett <kbarrett@openjdk.org>
Date: Mon, 3 Mar 2025 15:53:47 +0000
Subject: [PATCH 192/587] 8350623: Fix -Wzero-as-null-pointer-constant warnings
 in nsk native test utilities

Reviewed-by: coleenp
---
 .../jtreg/vmTestbase/nsk/share/native/native_thread.cpp     | 6 +++++-
 test/hotspot/jtreg/vmTestbase/nsk/share/native/nsk_list.cpp | 4 ++--
 2 files changed, 7 insertions(+), 3 deletions(-)

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 089aab78bb5..1929864e0d0 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/share/native/native_thread.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/share/native/native_thread.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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,7 +98,11 @@ void* procedure(void* t) {
     thread->started  = 1;
     thread->status   = thread->procedure(thread->context);
     thread->finished = 1;
+#ifdef windows
     return 0;
+#else // !windows
+    return nullptr;
+#endif
 }
 
 /**
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/share/native/nsk_list.cpp b/test/hotspot/jtreg/vmTestbase/nsk/share/native/nsk_list.cpp
index 736ddafdfaf..3da3858445b 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/share/native/nsk_list.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/share/native/nsk_list.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -109,7 +109,7 @@ int nsk_list_remove(const void *plist, int ind) {
             list_info->arr[i - 1] = list_info->arr[i];
         }
     }
-    list_info->arr[--list_info->elements_count] = 0;
+    list_info->arr[--list_info->elements_count] = nullptr;
 
     return NSK_TRUE;
 }

From c988d7d6476807bf71a977dc771017915b708ca3 Mon Sep 17 00:00:00 2001
From: Kim Barrett <kbarrett@openjdk.org>
Date: Mon, 3 Mar 2025 15:55:07 +0000
Subject: [PATCH 193/587] 8350767: Fix -Wzero-as-null-pointer-constant warnings
 in nsk jni stress tests

Reviewed-by: coleenp
---
 .../nsk/stress/jni/libjnistress001.cpp         |  6 +++---
 .../nsk/stress/jni/libjnistress003.cpp         | 18 +++++++++---------
 .../nsk/stress/jni/libjnistress004.cpp         | 10 +++++-----
 .../nsk/stress/jni/libjnistress006.cpp         |  4 ++--
 .../nsk/stress/jni/libjnistress007.cpp         |  2 +-
 5 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/test/hotspot/jtreg/vmTestbase/nsk/stress/jni/libjnistress001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/stress/jni/libjnistress001.cpp
index 2a5c78488c3..0702f9e5c09 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/stress/jni/libjnistress001.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/stress/jni/libjnistress001.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -77,7 +77,7 @@ Java_nsk_stress_jni_JNIter001_jnistress (JNIEnv *env, jobject jobj, jstring jstr
   for (j = 0; j < DIGESTLENGTH; j++) {
     digest[j] = 0;
   }
-  element->str[allocs] = env->GetStringUTFChars(jstr, 0); CE
+  element->str[allocs] = env->GetStringUTFChars(jstr, nullptr); CE
   if (strlen(element->str[allocs]) != (size_t) env->GetStringUTFLength(jstr)) {
     printf("Length is wrong in string No. %d\n", allocs);
   } else {
@@ -177,7 +177,7 @@ Java_nsk_stress_jni_JNIter001_jnistress1(JNIEnv *env, jobject jobj, jstring jstr
   for (j = 0; j < DIGESTLENGTH; j++) {
     digest[j] = 0;
   }
-  javachars->str[index] = env->GetStringChars(jstr, 0); CE
+  javachars->str[index] = env->GetStringChars(jstr, nullptr); CE
   javachars->size[index] = env->GetStringUTFLength(jstr); CE
   elem_len = javachars->size[index];
   len += elem_len;
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/stress/jni/libjnistress003.cpp b/test/hotspot/jtreg/vmTestbase/nsk/stress/jni/libjnistress003.cpp
index 4a261ff6aad..66e8e67d2e0 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/stress/jni/libjnistress003.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/stress/jni/libjnistress003.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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,14 +171,14 @@ Java_nsk_stress_jni_JNIter003_jniBodyChangeArray (JNIEnv *env, jobject jobj,
 
   /* Take the elements from Java arrays into native buffers */
   /* Use Get<Type>ArrayElements */
-  boolOrig = env->GetBooleanArrayElements((jbooleanArray) arrayOrig[BOOL], 0); CE
-  byteOrig = env->GetByteArrayElements((jbyteArray) arrayOrig[BYTE], 0); CE
-  charOrig = env->GetCharArrayElements((jcharArray) arrayOrig[CHAR], 0); CE
-  shortOrig = env->GetShortArrayElements((jshortArray) arrayOrig[SHORT], 0); CE
-  intOrig = env->GetIntArrayElements((jintArray) arrayOrig[INT], 0); CE
-  longOrig = env->GetLongArrayElements((jlongArray) arrayOrig[LONG], 0); CE
-  floatOrig = env->GetFloatArrayElements((jfloatArray) arrayOrig[FLOAT], 0); CE
-  doubleOrig = env->GetDoubleArrayElements((jdoubleArray) arrayOrig[DOUBLE], 0); CE
+  boolOrig = env->GetBooleanArrayElements((jbooleanArray) arrayOrig[BOOL], nullptr); CE
+  byteOrig = env->GetByteArrayElements((jbyteArray) arrayOrig[BYTE], nullptr); CE
+  charOrig = env->GetCharArrayElements((jcharArray) arrayOrig[CHAR], nullptr); CE
+  shortOrig = env->GetShortArrayElements((jshortArray) arrayOrig[SHORT], nullptr); CE
+  intOrig = env->GetIntArrayElements((jintArray) arrayOrig[INT], nullptr); CE
+  longOrig = env->GetLongArrayElements((jlongArray) arrayOrig[LONG], nullptr); CE
+  floatOrig = env->GetFloatArrayElements((jfloatArray) arrayOrig[FLOAT], nullptr); CE
+  doubleOrig = env->GetDoubleArrayElements((jdoubleArray) arrayOrig[DOUBLE], nullptr); CE
 
   /* Alloc some memory for cloned arrays buffers */
   boolClone = (jboolean *)c_malloc(env, SIZE(BOOL) * sizeof(jboolean));
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/stress/jni/libjnistress004.cpp b/test/hotspot/jtreg/vmTestbase/nsk/stress/jni/libjnistress004.cpp
index 8347d00da80..3e3b0ea1cdf 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/stress/jni/libjnistress004.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/stress/jni/libjnistress004.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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,13 +47,13 @@ Java_nsk_stress_jni_JNIter004_CheckSum (JNIEnv *env, jobject jobj, jstring jstr)
     digest[i] = 0;
   }
   str = (char *)c_malloc(env, len * sizeof(char));
-  /*     const char *threadName = env->GetStringUTFChars(jstr, 0); */
+  /*     const char *threadName = env->GetStringUTFChars(jstr, nullptr); */
 
   CHECK(env->MonitorEnter(jobj));
   if (upper == 0) {
     tmp = (jchar *) c_malloc(env, DIGESTLENGTH * sizeof(char));
   }
-  critstr = env->GetStringCritical(jstr, 0); CE
+  critstr = env->GetStringCritical(jstr, nullptr); CE
   for (i = 0; i < len; i++) {
     str[i] = (char) critstr[i];
   }
@@ -101,7 +101,7 @@ Java_nsk_stress_jni_JNIter004_CheckCompare (JNIEnv *env, jobject jobj, jstring j
     return JNI_FALSE;
   }
   tmp = (jchar *)c_malloc(env, DIGESTLENGTH * sizeof(char));
-  critstr = env->GetStringCritical(jstr, 0); CE
+  critstr = env->GetStringCritical(jstr, nullptr); CE
   for (i = 0; i < strlen; i++) {
     str[i] = (char) critstr[i];
   }
@@ -121,7 +121,7 @@ Java_nsk_stress_jni_JNIter004_CheckCompare (JNIEnv *env, jobject jobj, jstring j
   /* Compare  */
   /*     env->MonitorEnter(jobj); */
 
-  ch = (jchar *)env->GetPrimitiveArrayCritical(cArr, 0); CE
+  ch = (jchar *)env->GetPrimitiveArrayCritical(cArr, nullptr); CE
 
   printf("Comparing: ");
   for (i = 0; i < len; i++) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/stress/jni/libjnistress006.cpp b/test/hotspot/jtreg/vmTestbase/nsk/stress/jni/libjnistress006.cpp
index c84685a50fe..5cb9b9385f0 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/stress/jni/libjnistress006.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/stress/jni/libjnistress006.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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 @@ extern "C" {
 JNIEXPORT jboolean JNICALL
 Java_nsk_stress_jni_JNIter006_refs (JNIEnv *env, jobject jobj, jobject tobj, jint LIMIT) {
 
-  static jobject *globRefsArray = 0;
+  static jobject *globRefsArray = nullptr;
   static int upper = 0;
 
   jclass clazz;
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/stress/jni/libjnistress007.cpp b/test/hotspot/jtreg/vmTestbase/nsk/stress/jni/libjnistress007.cpp
index 44c195cfd6b..8b3a0d41b1d 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/stress/jni/libjnistress007.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/stress/jni/libjnistress007.cpp
@@ -32,7 +32,7 @@ Java_nsk_stress_jni_JNIter007_incCount (JNIEnv *env, jobject jobj, jstring name)
   jclass clazz;
   jfieldID fld;
   jint value;
-  const char *str = env->GetStringUTFChars(name, 0); CE
+  const char *str = env->GetStringUTFChars(name, nullptr); CE
 
   CHECK(env->MonitorEnter(jobj));
   clazz = env->GetObjectClass(jobj); CE

From 3602c8cfd805d2e5ae07685145b91bf2c20e255a Mon Sep 17 00:00:00 2001
From: Thomas Schatzl <tschatzl@openjdk.org>
Date: Mon, 3 Mar 2025 16:51:56 +0000
Subject: [PATCH 194/587] 8350955: Fix repetitions of the word "the" in runtime
 component comments

Reviewed-by: coleenp
---
 src/hotspot/share/cds/metaspaceShared.cpp   | 2 +-
 src/hotspot/share/runtime/objectMonitor.hpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/hotspot/share/cds/metaspaceShared.cpp b/src/hotspot/share/cds/metaspaceShared.cpp
index 2e5ebff456e..9e9f9fd1d9e 100644
--- a/src/hotspot/share/cds/metaspaceShared.cpp
+++ b/src/hotspot/share/cds/metaspaceShared.cpp
@@ -151,7 +151,7 @@ static bool shared_base_valid(char* shared_base) {
   // We check user input for SharedBaseAddress at dump time.
 
   // At CDS runtime, "shared_base" will be the (attempted) mapping start. It will also
-  // be the encoding base, since the the headers of archived base objects (and with Lilliput,
+  // be the encoding base, since the headers of archived base objects (and with Lilliput,
   // the prototype mark words) carry pre-computed narrow Klass IDs that refer to the mapping
   // start as base.
   //
diff --git a/src/hotspot/share/runtime/objectMonitor.hpp b/src/hotspot/share/runtime/objectMonitor.hpp
index 94c4c242f82..29971d7b4f8 100644
--- a/src/hotspot/share/runtime/objectMonitor.hpp
+++ b/src/hotspot/share/runtime/objectMonitor.hpp
@@ -144,7 +144,7 @@ class ObjectMonitor : public CHeapObj<mtObjectMonitor> {
   // ParkEvent of unblocker thread.
   static ParkEvent* _vthread_unparker_ParkEvent;
 
-  // Because of frequent access, the the metadata field is at offset zero (0).
+  // Because of frequent access, the metadata field is at offset zero (0).
   // Enforced by the assert() in metadata_addr().
   // * LM_LIGHTWEIGHT with UseObjectMonitorTable:
   // Contains the _object's hashCode.

From 7c187b5d81a653b87fc498101ad9e2d99b72efc6 Mon Sep 17 00:00:00 2001
From: Xiaolong Peng <xpeng@openjdk.org>
Date: Mon, 3 Mar 2025 17:20:54 +0000
Subject: [PATCH 195/587] 8338737: Shenandoah: Reset marking bitmaps after the
 cycle

Reviewed-by: wkemper
---
 .../gc/shenandoah/shenandoahConcurrentGC.cpp  | 64 +++++++++++---
 .../gc/shenandoah/shenandoahConcurrentGC.hpp  |  5 ++
 .../share/gc/shenandoah/shenandoahFullGC.cpp  | 30 ++-----
 .../gc/shenandoah/shenandoahGeneration.cpp    | 85 +++++++++----------
 .../gc/shenandoah/shenandoahGeneration.hpp    |  1 +
 .../gc/shenandoah/shenandoahHeapRegion.cpp    |  5 +-
 .../gc/shenandoah/shenandoahHeapRegion.hpp    | 14 +++
 .../gc/shenandoah/shenandoahPhaseTimings.hpp  |  1 +
 8 files changed, 119 insertions(+), 86 deletions(-)

diff --git a/src/hotspot/share/gc/shenandoah/shenandoahConcurrentGC.cpp b/src/hotspot/share/gc/shenandoah/shenandoahConcurrentGC.cpp
index 5327c9d230e..316904f8bd0 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahConcurrentGC.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahConcurrentGC.cpp
@@ -241,6 +241,12 @@ bool ShenandoahConcurrentGC::collect(GCCause::Cause cause) {
   if (heap->mode()->is_generational()) {
     ShenandoahGenerationalHeap::heap()->complete_concurrent_cycle();
   }
+
+  // Instead of always resetting immediately before the start of a new GC, we can often reset at the end of the
+  // previous GC. This allows us to start the next GC cycle more quickly after a trigger condition is detected,
+  // reducing the likelihood that GC will degenerate.
+  entry_reset_after_collect();
+
   return true;
 }
 
@@ -363,17 +369,6 @@ void ShenandoahConcurrentGC::entry_reset() {
                                 msg);
     op_reset();
   }
-
-  if (_do_old_gc_bootstrap) {
-    static const char* msg = "Concurrent reset (Old)";
-    ShenandoahConcurrentPhase gc_phase(msg, ShenandoahPhaseTimings::conc_reset_old);
-    ShenandoahWorkerScope scope(ShenandoahHeap::heap()->workers(),
-                                ShenandoahWorkerPolicy::calc_workers_for_conc_reset(),
-                                msg);
-    EventMark em("%s", msg);
-
-    heap->old_generation()->prepare_gc();
-  }
 }
 
 void ShenandoahConcurrentGC::entry_scan_remembered_set() {
@@ -583,12 +578,29 @@ void ShenandoahConcurrentGC::entry_cleanup_complete() {
   op_cleanup_complete();
 }
 
+void ShenandoahConcurrentGC::entry_reset_after_collect() {
+  ShenandoahHeap* const heap = ShenandoahHeap::heap();
+  TraceCollectorStats tcs(heap->monitoring_support()->concurrent_collection_counters());
+  const char* msg = conc_reset_after_collect_event_message();
+  ShenandoahConcurrentPhase gc_phase(msg, ShenandoahPhaseTimings::conc_reset_after_collect);
+  EventMark em("%s", msg);
+
+  op_reset_after_collect();
+}
+
 void ShenandoahConcurrentGC::op_reset() {
   ShenandoahHeap* const heap = ShenandoahHeap::heap();
   if (ShenandoahPacing) {
     heap->pacer()->setup_for_reset();
   }
-  _generation->prepare_gc();
+  // If it is old GC bootstrap cycle, always clear bitmap for global gen
+  // to ensure bitmap for old gen is clear for old GC cycle after this.
+  if (_do_old_gc_bootstrap) {
+    assert(!heap->is_prepare_for_old_mark_in_progress(), "Cannot reset old without making it parsable");
+    heap->global_generation()->prepare_gc();
+  } else {
+    _generation->prepare_gc();
+  }
 }
 
 class ShenandoahInitMarkUpdateRegionStateClosure : public ShenandoahHeapRegionClosure {
@@ -1211,6 +1223,26 @@ void ShenandoahConcurrentGC::op_cleanup_complete() {
   ShenandoahHeap::heap()->recycle_trash();
 }
 
+void ShenandoahConcurrentGC::op_reset_after_collect() {
+  ShenandoahWorkerScope scope(ShenandoahHeap::heap()->workers(),
+                          ShenandoahWorkerPolicy::calc_workers_for_conc_reset(),
+                          "reset after collection.");
+
+  ShenandoahHeap* const heap = ShenandoahHeap::heap();
+  if (heap->mode()->is_generational()) {
+    // Resetting bitmaps of young gen when bootstrap old GC or there is preempted old GC
+    // causes crash due to remembered set violation, hence condition is added to fix the crash.
+    // Assuming bitmaps of young gen are not used at all after the cycle, the crash should not
+    // have happend, it seems to tickle a bug in remembered set scan. Root causing and fixing of the bug
+    // will be tracked via ticket https://bugs.openjdk.org/browse/JDK-8347371
+    if (!_do_old_gc_bootstrap && !heap->is_concurrent_old_mark_in_progress()) {
+      heap->young_generation()->reset_mark_bitmap<false>();
+    }
+  } else {
+    _generation->reset_mark_bitmap<false>();
+  }
+}
+
 bool ShenandoahConcurrentGC::check_cancellation_and_abort(ShenandoahDegenPoint point) {
   if (ShenandoahHeap::heap()->cancelled_gc()) {
     _degen_point = point;
@@ -1260,6 +1292,14 @@ const char* ShenandoahConcurrentGC::conc_reset_event_message() const {
   }
 }
 
+const char* ShenandoahConcurrentGC::conc_reset_after_collect_event_message() const {
+  if (ShenandoahHeap::heap()->unload_classes()) {
+    SHENANDOAH_RETURN_EVENT_MESSAGE(_generation->type(), "Concurrent reset after collect", " (unload classes)");
+  } else {
+    SHENANDOAH_RETURN_EVENT_MESSAGE(_generation->type(), "Concurrent reset after collect", "");
+  }
+}
+
 const char* ShenandoahConcurrentGC::final_roots_event_message() const {
   if (ShenandoahHeap::heap()->unload_classes()) {
     SHENANDOAH_RETURN_EVENT_MESSAGE(_generation->type(), "Pause Final Roots", " (unload classes)");
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahConcurrentGC.hpp b/src/hotspot/share/gc/shenandoah/shenandoahConcurrentGC.hpp
index b4c858bb245..81e7e943af3 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahConcurrentGC.hpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahConcurrentGC.hpp
@@ -118,10 +118,14 @@ protected:
   void op_final_update_refs();
   void op_final_roots();
   void op_cleanup_complete();
+  void op_reset_after_collect();
 
   // Check GC cancellation and abort concurrent GC
   bool check_cancellation_and_abort(ShenandoahDegenPoint point);
 
+  // Called when concurrent GC succeeds.
+  void entry_reset_after_collect();
+
 private:
   void start_mark();
 
@@ -134,6 +138,7 @@ private:
   const char* final_roots_event_message() const;
   const char* conc_mark_event_message() const;
   const char* conc_reset_event_message() const;
+  const char* conc_reset_after_collect_event_message() const;
   const char* conc_weak_refs_event_message() const;
   const char* conc_weak_roots_event_message() const;
   const char* conc_cleanup_event_message() const;
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahFullGC.cpp b/src/hotspot/share/gc/shenandoah/shenandoahFullGC.cpp
index 474838c3bb3..91a71adbe1c 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahFullGC.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahFullGC.cpp
@@ -197,16 +197,11 @@ void ShenandoahFullGC::do_it(GCCause::Cause gc_cause) {
       update_roots(true /*full_gc*/);
     }
 
-    // d. Reset the bitmaps for new marking
-    heap->global_generation()->reset_mark_bitmap();
-    assert(heap->marking_context()->is_bitmap_clear(), "sanity");
-    assert(!heap->global_generation()->is_mark_complete(), "sanity");
-
-    // e. Abandon reference discovery and clear all discovered references.
+    // d. Abandon reference discovery and clear all discovered references.
     ShenandoahReferenceProcessor* rp = heap->global_generation()->ref_processor();
     rp->abandon_partial_discovery();
 
-    // f. Sync pinned region status from the CP marks
+    // e. Sync pinned region status from the CP marks
     heap->sync_pinned_region_status();
 
     if (heap->mode()->is_generational()) {
@@ -287,30 +282,15 @@ void ShenandoahFullGC::do_it(GCCause::Cause gc_cause) {
   }
 }
 
-class ShenandoahPrepareForMarkClosure: public ShenandoahHeapRegionClosure {
-private:
-  ShenandoahMarkingContext* const _ctx;
-
-public:
-  ShenandoahPrepareForMarkClosure() : _ctx(ShenandoahHeap::heap()->marking_context()) {}
-
-  void heap_region_do(ShenandoahHeapRegion *r) override {
-    _ctx->capture_top_at_mark_start(r);
-    r->clear_live_data();
-  }
-
-  bool is_thread_safe() override { return true; }
-};
-
 void ShenandoahFullGC::phase1_mark_heap() {
   GCTraceTime(Info, gc, phases) time("Phase 1: Mark live objects", _gc_timer);
   ShenandoahGCPhase mark_phase(ShenandoahPhaseTimings::full_gc_mark);
 
   ShenandoahHeap* heap = ShenandoahHeap::heap();
 
-  ShenandoahPrepareForMarkClosure prepare_for_mark;
-  ShenandoahExcludeRegionClosure<FREE> cl(&prepare_for_mark);
-  heap->parallel_heap_region_iterate(&cl);
+  heap->global_generation()->reset_mark_bitmap<true, true>();
+  assert(heap->marking_context()->is_bitmap_clear(), "sanity");
+  assert(!heap->global_generation()->is_mark_complete(), "sanity");
 
   heap->set_unload_classes(heap->global_generation()->heuristics()->can_unload_classes());
 
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahGeneration.cpp b/src/hotspot/share/gc/shenandoah/shenandoahGeneration.cpp
index d00d5168ee7..a6f67b809d7 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahGeneration.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahGeneration.cpp
@@ -41,53 +41,44 @@
 
 #include "utilities/quickSort.hpp"
 
-
-class ShenandoahResetUpdateRegionStateClosure : public ShenandoahHeapRegionClosure {
+template <bool PREPARE_FOR_CURRENT_CYCLE, bool FULL_GC = false>
+class ShenandoahResetBitmapClosure final : public ShenandoahHeapRegionClosure {
 private:
-  ShenandoahHeap* _heap;
-  ShenandoahMarkingContext* const _ctx;
-public:
-  ShenandoahResetUpdateRegionStateClosure() :
-    _heap(ShenandoahHeap::heap()),
-    _ctx(_heap->marking_context()) {}
+  ShenandoahHeap*           _heap;
+  ShenandoahMarkingContext* _ctx;
 
-  void heap_region_do(ShenandoahHeapRegion* r) override {
-    if (r->is_active()) {
-      // Reset live data and set TAMS optimistically. We would recheck these under the pause
-      // anyway to capture any updates that happened since now.
-      _ctx->capture_top_at_mark_start(r);
-      r->clear_live_data();
+public:
+  explicit ShenandoahResetBitmapClosure() :
+    ShenandoahHeapRegionClosure(), _heap(ShenandoahHeap::heap()), _ctx(_heap->marking_context()) {}
+
+  void heap_region_do(ShenandoahHeapRegion* region) override {
+    assert(!_heap->is_uncommit_in_progress(), "Cannot uncommit bitmaps while resetting them.");
+    if (PREPARE_FOR_CURRENT_CYCLE) {
+      if (region->need_bitmap_reset() && _heap->is_bitmap_slice_committed(region)) {
+        _ctx->clear_bitmap(region);
+      } else {
+        region->set_needs_bitmap_reset();
+      }
+      // Capture Top At Mark Start for this generation.
+      if (FULL_GC || region->is_active()) {
+        // Reset live data and set TAMS optimistically. We would recheck these under the pause
+        // anyway to capture any updates that happened since now.
+        _ctx->capture_top_at_mark_start(region);
+        region->clear_live_data();
+      }
+    } else {
+      if (_heap->is_bitmap_slice_committed(region)) {
+        _ctx->clear_bitmap(region);
+        region->unset_needs_bitmap_reset();
+      } else {
+        region->set_needs_bitmap_reset();
+      }
     }
   }
 
   bool is_thread_safe() override { return true; }
 };
 
-class ShenandoahResetBitmapTask : public WorkerTask {
-private:
-  ShenandoahRegionIterator _regions;
-  ShenandoahGeneration* _generation;
-
-public:
-  ShenandoahResetBitmapTask(ShenandoahGeneration* generation) :
-    WorkerTask("Shenandoah Reset Bitmap"), _generation(generation) {}
-
-  void work(uint worker_id) {
-    ShenandoahHeap* heap = ShenandoahHeap::heap();
-    assert(!heap->is_uncommit_in_progress(), "Cannot uncommit bitmaps while resetting them.");
-    ShenandoahHeapRegion* region = _regions.next();
-    ShenandoahMarkingContext* const ctx = heap->marking_context();
-    while (region != nullptr) {
-      auto const affiliation = region->affiliation();
-      bool needs_reset = affiliation == FREE || _generation->contains(affiliation);
-      if (needs_reset && heap->is_bitmap_slice_committed(region)) {
-        ctx->clear_bitmap(region);
-      }
-      region = _regions.next();
-    }
-  }
-};
-
 // Copy the write-version of the card-table into the read-version, clearing the
 // write-copy.
 class ShenandoahMergeWriteTable: public ShenandoahHeapRegionClosure {
@@ -225,15 +216,20 @@ void ShenandoahGeneration::log_status(const char *msg) const {
               PROPERFMTARGS(v_soft_max_capacity), PROPERFMTARGS(v_max_capacity), PROPERFMTARGS(v_available));
 }
 
+template <bool PREPARE_FOR_CURRENT_CYCLE, bool FULL_GC>
 void ShenandoahGeneration::reset_mark_bitmap() {
   ShenandoahHeap* heap = ShenandoahHeap::heap();
   heap->assert_gc_workers(heap->workers()->active_workers());
 
   set_mark_incomplete();
 
-  ShenandoahResetBitmapTask task(this);
-  heap->workers()->run_task(&task);
+  ShenandoahResetBitmapClosure<PREPARE_FOR_CURRENT_CYCLE, FULL_GC> closure;
+  parallel_heap_region_iterate_free(&closure);
 }
+// Explicit specializations
+template void ShenandoahGeneration::reset_mark_bitmap<true, false>();
+template void ShenandoahGeneration::reset_mark_bitmap<true, true>();
+template void ShenandoahGeneration::reset_mark_bitmap<false, false>();
 
 // The ideal is to swap the remembered set so the safepoint effort is no more than a few pointer manipulations.
 // However, limitations in the implementation of the mutator write-barrier make it difficult to simply change the
@@ -265,12 +261,7 @@ void ShenandoahGeneration::merge_write_table() {
 }
 
 void ShenandoahGeneration::prepare_gc() {
-
-  reset_mark_bitmap();
-
-  // Capture Top At Mark Start for this generation (typically young) and reset mark bitmap.
-  ShenandoahResetUpdateRegionStateClosure cl;
-  parallel_heap_region_iterate_free(&cl);
+  reset_mark_bitmap<true>();
 }
 
 void ShenandoahGeneration::parallel_heap_region_iterate_free(ShenandoahHeapRegionClosure* cl) {
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahGeneration.hpp b/src/hotspot/share/gc/shenandoah/shenandoahGeneration.hpp
index 2f1102edbd7..1dc777777aa 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahGeneration.hpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahGeneration.hpp
@@ -159,6 +159,7 @@ private:
   void log_status(const char* msg) const;
 
   // Used directly by FullGC
+  template <bool FOR_CURRENT_CYCLE, bool FULL_GC = false>
   void reset_mark_bitmap();
 
   // Used by concurrent and degenerated GC to reset remembered set.
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahHeapRegion.cpp b/src/hotspot/share/gc/shenandoah/shenandoahHeapRegion.cpp
index 42237a0ab06..2c70cecf705 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahHeapRegion.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahHeapRegion.cpp
@@ -76,10 +76,11 @@ ShenandoahHeapRegion::ShenandoahHeapRegion(HeapWord* start, size_t index, bool c
   _live_data(0),
   _critical_pins(0),
   _update_watermark(start),
-  _age(0)
+  _age(0),
 #ifdef SHENANDOAH_CENSUS_NOISE
-  , _youth(0)
+  _youth(0),
 #endif // SHENANDOAH_CENSUS_NOISE
+  _needs_bitmap_reset(false)
   {
 
   assert(Universe::on_page_boundary(_bottom) && Universe::on_page_boundary(_end),
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahHeapRegion.hpp b/src/hotspot/share/gc/shenandoah/shenandoahHeapRegion.hpp
index 3dc8febbad4..4c99364bc6e 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahHeapRegion.hpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahHeapRegion.hpp
@@ -266,6 +266,8 @@ private:
 
   ShenandoahSharedFlag _recycling; // Used to indicate that the region is being recycled; see try_recycle*().
 
+  bool _needs_bitmap_reset;
+
 public:
   ShenandoahHeapRegion(HeapWord* start, size_t index, bool committed);
 
@@ -477,6 +479,18 @@ public:
 
   CENSUS_NOISE(void clear_youth() { _youth = 0; })
 
+  inline bool need_bitmap_reset() const {
+    return _needs_bitmap_reset;
+  }
+
+  inline void set_needs_bitmap_reset() {
+    _needs_bitmap_reset = true;
+  }
+
+  inline void unset_needs_bitmap_reset() {
+    _needs_bitmap_reset = false;
+  }
+
 private:
   void decrement_humongous_waste() const;
   void do_commit();
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahPhaseTimings.hpp b/src/hotspot/share/gc/shenandoah/shenandoahPhaseTimings.hpp
index eab1e279b0f..20c59cce69b 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahPhaseTimings.hpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahPhaseTimings.hpp
@@ -50,6 +50,7 @@ class outputStream;
 
 #define SHENANDOAH_PHASE_DO(f)                                                         \
   f(conc_reset,                                     "Concurrent Reset")                \
+  f(conc_reset_after_collect,                       "Concurrent Reset After Collect")  \
   f(conc_reset_old,                                 "Concurrent Reset (OLD)")          \
   f(init_mark_gross,                                "Pause Init Mark (G)")             \
   f(init_mark,                                      "Pause Init Mark (N)")             \

From bb70896e356536477cfb770096fb769485edc55b Mon Sep 17 00:00:00 2001
From: Jiangli Zhou <jiangli@openjdk.org>
Date: Mon, 3 Mar 2025 17:36:31 +0000
Subject: [PATCH 196/587] 8350903: Remove explicit libjvm.so dependency for
 libVThreadEventTest

Reviewed-by: dholmes, alanb
---
 make/test/JtregNativeHotspot.gmk                         | 2 --
 .../vthread/VThreadEventTest/libVThreadEventTest.cpp     | 9 +--------
 2 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/make/test/JtregNativeHotspot.gmk b/make/test/JtregNativeHotspot.gmk
index 2ee26b422e0..31d2c522387 100644
--- a/make/test/JtregNativeHotspot.gmk
+++ b/make/test/JtregNativeHotspot.gmk
@@ -882,7 +882,6 @@ ifeq ($(call isTargetOs, windows), true)
   BUILD_HOTSPOT_JTREG_EXECUTABLES_CFLAGS_exeFPRegs := -MT
   BUILD_HOTSPOT_JTREG_EXCLUDE += exesigtest.c libterminatedThread.c libTestJNI.c libCompleteExit.c libMonitorWithDeadObjectTest.c libTestPsig.c exeGetCreatedJavaVMs.c libTestUnloadedClass.cpp
   BUILD_HOTSPOT_JTREG_LIBRARIES_JDK_LIBS_libnativeStack := java.base:libjvm
-  BUILD_HOTSPOT_JTREG_LIBRARIES_JDK_LIBS_libVThreadEventTest := java.base:libjvm
 else
   BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libbootclssearch_agent += -lpthread
   BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libsystemclssearch_agent += -lpthread
@@ -1522,7 +1521,6 @@ else
   BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libMonitorWithDeadObjectTest += -lpthread
   BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libnativeStack += -lpthread
   BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libTestUnloadedClass += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_JDK_LIBS_libVThreadEventTest := java.base:libjvm
   BUILD_HOTSPOT_JTREG_EXECUTABLES_LIBS_exeGetCreatedJavaVMs := -lpthread
   BUILD_HOTSPOT_JTREG_EXECUTABLES_JDK_LIBS_exeGetCreatedJavaVMs := java.base:libjvm
 
diff --git a/test/hotspot/jtreg/serviceability/jvmti/vthread/VThreadEventTest/libVThreadEventTest.cpp b/test/hotspot/jtreg/serviceability/jvmti/vthread/VThreadEventTest/libVThreadEventTest.cpp
index 7d898bcab25..b9db8b9cc93 100644
--- a/test/hotspot/jtreg/serviceability/jvmti/vthread/VThreadEventTest/libVThreadEventTest.cpp
+++ b/test/hotspot/jtreg/serviceability/jvmti/vthread/VThreadEventTest/libVThreadEventTest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -127,7 +127,6 @@ Agent_OnAttach(JavaVM *vm, char *options, void *reserved) {
   jvmtiCapabilities caps;
   jvmtiError err;
   JNIEnv *env;
-  jsize nVMs;
   jint res;
   jclass clazz;
   jmethodID mid;
@@ -166,12 +165,6 @@ Agent_OnAttach(JavaVM *vm, char *options, void *reserved) {
 
   // call VThreadEventTest.agentStarted to notify test that agent has started
 
-  res = JNI_GetCreatedJavaVMs(&vm, 1, &nVMs);
-  if (res != JNI_OK) {
-      LOG("JNI_GetCreatedJavaVMs failed: %d\n", res);
-      return JNI_ERR;
-  }
-
   res = vm->GetEnv((void **) &env, JNI_VERSION_21);
   if (res != JNI_OK) {
     LOG("GetEnv failed: %d\n", res);

From 79880e56375a1c17ec6ad29bb0ab01868bc956ff Mon Sep 17 00:00:00 2001
From: Hamlin Li <mli@openjdk.org>
Date: Mon, 3 Mar 2025 18:28:28 +0000
Subject: [PATCH 197/587] 8351033: RISC-V: TestFloat16ScalarOperations asserts
 with offset (4210) is too large to be patched in one
 beq/bge/bgeu/blt/bltu/bne instruction!

Reviewed-by: fyang
---
 src/hotspot/cpu/riscv/c2_MacroAssembler_riscv.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/hotspot/cpu/riscv/c2_MacroAssembler_riscv.cpp b/src/hotspot/cpu/riscv/c2_MacroAssembler_riscv.cpp
index e52cf7565be..f145eb879df 100644
--- a/src/hotspot/cpu/riscv/c2_MacroAssembler_riscv.cpp
+++ b/src/hotspot/cpu/riscv/c2_MacroAssembler_riscv.cpp
@@ -2287,7 +2287,7 @@ void C2_MacroAssembler::float16_to_float(FloatRegister dst, Register src, Regist
   mv(t0, 0x7c00);
   andr(tmp, src, t0);
   // jump to stub processing NaN and Inf cases.
-  beq(t0, tmp, stub->entry());
+  beq(t0, tmp, stub->entry(), true);
 
   // non-NaN or non-Inf cases, just use built-in instructions.
   fmv_h_x(dst, src);
@@ -2330,7 +2330,7 @@ void C2_MacroAssembler::float_to_float16(Register dst, FloatRegister src, FloatR
   // replace fclass with feq as performance optimization.
   feq_s(t0, src, src);
   // jump to stub processing NaN cases.
-  beqz(t0, stub->entry());
+  beqz(t0, stub->entry(), true);
 
   // non-NaN cases, just use built-in instructions.
   fcvt_h_s(ftmp, src);
@@ -2391,7 +2391,7 @@ void C2_MacroAssembler::float16_to_float_v(VectorRegister dst, VectorRegister sr
   vfwcvt_f_f_v(dst, src);
 
   // jump to stub processing NaN and Inf cases if there is any of them in the vector-wide.
-  bnez(t0, stub->entry());
+  bnez(t0, stub->entry(), true);
 
   bind(stub->continuation());
 }
@@ -2445,7 +2445,7 @@ void C2_MacroAssembler::float_to_float16_v(VectorRegister dst, VectorRegister sr
   vfncvt_f_f_w(dst, src);
 
   // jump to stub processing NaN cases.
-  bnez(t0, stub->entry());
+  bnez(t0, stub->entry(), true);
 
   bind(stub->continuation());
 }

From e1fc14fa17e78fef712b5635ee53d10d6d2bb50e Mon Sep 17 00:00:00 2001
From: Hamlin Li <mli@openjdk.org>
Date: Mon, 3 Mar 2025 18:29:36 +0000
Subject: [PATCH 198/587] 8350940: RISC-V: remove unnecessary
 assert_different_registers in minmax_fp

Reviewed-by: fyang
---
 src/hotspot/cpu/riscv/c2_MacroAssembler_riscv.cpp | 3 ---
 src/hotspot/cpu/riscv/riscv.ad                    | 8 ++++----
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/src/hotspot/cpu/riscv/c2_MacroAssembler_riscv.cpp b/src/hotspot/cpu/riscv/c2_MacroAssembler_riscv.cpp
index f145eb879df..e6bb7c46624 100644
--- a/src/hotspot/cpu/riscv/c2_MacroAssembler_riscv.cpp
+++ b/src/hotspot/cpu/riscv/c2_MacroAssembler_riscv.cpp
@@ -2135,9 +2135,6 @@ void C2_MacroAssembler::enc_cmove(int cmpFlag, Register op1, Register op2, Regis
 // Set dst to NaN if any NaN input.
 void C2_MacroAssembler::minmax_fp(FloatRegister dst, FloatRegister src1, FloatRegister src2,
                                   bool is_double, bool is_min) {
-  assert_different_registers(dst, src1);
-  assert_different_registers(dst, src2);
-
   Label Done, Compare;
 
   is_double ? fclass_d(t0, src1)
diff --git a/src/hotspot/cpu/riscv/riscv.ad b/src/hotspot/cpu/riscv/riscv.ad
index b8660afb5fd..a4da786f02e 100644
--- a/src/hotspot/cpu/riscv/riscv.ad
+++ b/src/hotspot/cpu/riscv/riscv.ad
@@ -7287,7 +7287,7 @@ instruct nmaddD_reg_reg(fRegD dst, fRegD src1, fRegD src2, fRegD src3) %{
 // Math.max(FF)F
 instruct maxF_reg_reg(fRegF dst, fRegF src1, fRegF src2, rFlagsReg cr) %{
   match(Set dst (MaxF src1 src2));
-  effect(TEMP_DEF dst, KILL cr);
+  effect(KILL cr);
 
   format %{ "maxF $dst, $src1, $src2" %}
 
@@ -7303,7 +7303,7 @@ instruct maxF_reg_reg(fRegF dst, fRegF src1, fRegF src2, rFlagsReg cr) %{
 // Math.min(FF)F
 instruct minF_reg_reg(fRegF dst, fRegF src1, fRegF src2, rFlagsReg cr) %{
   match(Set dst (MinF src1 src2));
-  effect(TEMP_DEF dst, KILL cr);
+  effect(KILL cr);
 
   format %{ "minF $dst, $src1, $src2" %}
 
@@ -7319,7 +7319,7 @@ instruct minF_reg_reg(fRegF dst, fRegF src1, fRegF src2, rFlagsReg cr) %{
 // Math.max(DD)D
 instruct maxD_reg_reg(fRegD dst, fRegD src1, fRegD src2, rFlagsReg cr) %{
   match(Set dst (MaxD src1 src2));
-  effect(TEMP_DEF dst, KILL cr);
+  effect(KILL cr);
 
   format %{ "maxD $dst, $src1, $src2" %}
 
@@ -7335,7 +7335,7 @@ instruct maxD_reg_reg(fRegD dst, fRegD src1, fRegD src2, rFlagsReg cr) %{
 // Math.min(DD)D
 instruct minD_reg_reg(fRegD dst, fRegD src1, fRegD src2, rFlagsReg cr) %{
   match(Set dst (MinD src1 src2));
-  effect(TEMP_DEF dst, KILL cr);
+  effect(KILL cr);
 
   format %{ "minD $dst, $src1, $src2" %}
 

From f53de9208cf5f841ddf80ef9c6073fa61f68fa59 Mon Sep 17 00:00:00 2001
From: Hamlin Li <mli@openjdk.org>
Date: Mon, 3 Mar 2025 18:30:43 +0000
Subject: [PATCH 199/587] 8350931: RISC-V: remove unnecessary src register for
 fp_sqrt_d/f

Reviewed-by: fyang
---
 src/hotspot/cpu/riscv/riscv.ad | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/hotspot/cpu/riscv/riscv.ad b/src/hotspot/cpu/riscv/riscv.ad
index a4da786f02e..00ebeabe3e2 100644
--- a/src/hotspot/cpu/riscv/riscv.ad
+++ b/src/hotspot/cpu/riscv/riscv.ad
@@ -4097,21 +4097,19 @@ pipe_class fp_div_d(fRegD dst, fRegD src1, fRegD src2)
   FPU    : S5;
 %}
 
-pipe_class fp_sqrt_s(fRegF dst, fRegF src1, fRegF src2)
+pipe_class fp_sqrt_s(fRegF dst, fRegF src)
 %{
   single_instruction;
-  src1   : S1(read);
-  src2   : S2(read);
+  src    : S1(read);
   dst    : S5(write);
   DECODE : ID;
   FPU    : S5;
 %}
 
-pipe_class fp_sqrt_d(fRegD dst, fRegD src1, fRegD src2)
+pipe_class fp_sqrt_d(fRegD dst, fRegD src)
 %{
   single_instruction;
-  src1   : S1(read);
-  src2   : S2(read);
+  src    : S1(read);
   dst    : S5(write);
   DECODE : ID;
   FPU    : S5;

From e470f474ee2176eecc211ec8e99cccc941104c68 Mon Sep 17 00:00:00 2001
From: Hamlin Li <mli@openjdk.org>
Date: Mon, 3 Mar 2025 18:31:56 +0000
Subject: [PATCH 200/587] 8350095: RISC-V: Refactor string_compare

Reviewed-by: fyang
---
 .../cpu/riscv/c2_MacroAssembler_riscv.cpp     | 335 ++++++++++--------
 .../cpu/riscv/c2_MacroAssembler_riscv.hpp     |   9 +
 src/hotspot/cpu/riscv/stubGenerator_riscv.cpp |  32 +-
 .../string/TestStringIntrinsics.java          |   1 +
 4 files changed, 207 insertions(+), 170 deletions(-)

diff --git a/src/hotspot/cpu/riscv/c2_MacroAssembler_riscv.cpp b/src/hotspot/cpu/riscv/c2_MacroAssembler_riscv.cpp
index e6bb7c46624..dc33691586b 100644
--- a/src/hotspot/cpu/riscv/c2_MacroAssembler_riscv.cpp
+++ b/src/hotspot/cpu/riscv/c2_MacroAssembler_riscv.cpp
@@ -1382,15 +1382,183 @@ void C2_MacroAssembler::string_indexof_linearscan(Register haystack, Register ne
   bind(DONE);
 }
 
+// Compare longwords
+void C2_MacroAssembler::string_compare_long_same_encoding(Register result, Register str1, Register str2,
+                                                  const bool isLL, Register cnt1, Register cnt2,
+                                                  Register tmp1, Register tmp2, Register tmp3,
+                                                  const int STUB_THRESHOLD, Label *STUB, Label *SHORT_STRING, Label *DONE) {
+  Label TAIL_CHECK, TAIL, NEXT_WORD, DIFFERENCE;
+
+  const int base_offset = isLL ? arrayOopDesc::base_offset_in_bytes(T_BYTE)
+                               : arrayOopDesc::base_offset_in_bytes(T_CHAR);
+  assert((base_offset % (UseCompactObjectHeaders ? 4 :
+                        (UseCompressedClassPointers ? 8 : 4))) == 0, "Must be");
+
+  const int minCharsInWord = isLL ? wordSize : wordSize / 2;
+
+  // load first parts of strings and finish initialization while loading
+  beq(str1, str2, *DONE);
+  // Alignment
+  if (AvoidUnalignedAccesses && (base_offset % 8) != 0) {
+    lwu(tmp1, Address(str1));
+    lwu(tmp2, Address(str2));
+    bne(tmp1, tmp2, DIFFERENCE);
+    addi(str1, str1, 4);
+    addi(str2, str2, 4);
+    subi(cnt2, cnt2, minCharsInWord / 2);
+
+    // A very short string
+    mv(t0, minCharsInWord);
+    ble(cnt2, t0, *SHORT_STRING);
+  }
+#ifdef ASSERT
+  if (AvoidUnalignedAccesses) {
+    Label align_ok;
+    orr(t0, str1, str2);
+    andi(t0, t0, 0x7);
+    beqz(t0, align_ok);
+    stop("bad alignment");
+    bind(align_ok);
+  }
+#endif
+  // load 8 bytes once to compare
+  ld(tmp1, Address(str1));
+  ld(tmp2, Address(str2));
+  mv(t0, STUB_THRESHOLD);
+  bge(cnt2, t0, *STUB);
+  subi(cnt2, cnt2, minCharsInWord);
+  beqz(cnt2, TAIL_CHECK);
+  // convert cnt2 from characters to bytes
+  if (!isLL) {
+    slli(cnt2, cnt2, 1);
+  }
+  add(str2, str2, cnt2);
+  add(str1, str1, cnt2);
+  sub(cnt2, zr, cnt2);
+  addi(cnt2, cnt2, 8);
+  bne(tmp1, tmp2, DIFFERENCE);
+  bgez(cnt2, TAIL);
+
+  // main loop
+  bind(NEXT_WORD);
+    // 8-byte aligned loads when AvoidUnalignedAccesses is enabled
+    add(t0, str1, cnt2);
+    ld(tmp1, Address(t0));
+    add(t0, str2, cnt2);
+    ld(tmp2, Address(t0));
+    addi(cnt2, cnt2, 8);
+    bne(tmp1, tmp2, DIFFERENCE);
+    bltz(cnt2, NEXT_WORD);
+
+  bind(TAIL);
+  load_long_misaligned(tmp1, Address(str1), tmp3, isLL ? 1 : 2);
+  load_long_misaligned(tmp2, Address(str2), tmp3, isLL ? 1 : 2);
+
+  bind(TAIL_CHECK);
+  beq(tmp1, tmp2, *DONE);
+
+  // Find the first different characters in the longwords and
+  // compute their difference.
+  bind(DIFFERENCE);
+  xorr(tmp3, tmp1, tmp2);
+  // count bits of trailing zero chars
+  ctzc_bits(result, tmp3, isLL);
+  srl(tmp1, tmp1, result);
+  srl(tmp2, tmp2, result);
+  if (isLL) {
+    zext(tmp1, tmp1, 8);
+    zext(tmp2, tmp2, 8);
+  } else {
+    zext(tmp1, tmp1, 16);
+    zext(tmp2, tmp2, 16);
+  }
+  sub(result, tmp1, tmp2);
+
+  j(*DONE);
+}
+
+// Compare longwords
+void C2_MacroAssembler::string_compare_long_different_encoding(Register result, Register str1, Register str2,
+                                               bool isLU, Register cnt1, Register cnt2,
+                                               Register tmp1, Register tmp2, Register tmp3,
+                                               const int STUB_THRESHOLD, Label *STUB, Label *DONE) {
+  Label TAIL, NEXT_WORD, DIFFERENCE;
+
+  const int base_offset = arrayOopDesc::base_offset_in_bytes(T_CHAR);
+  assert((base_offset % (UseCompactObjectHeaders ? 4 :
+                          (UseCompressedClassPointers ? 8 : 4))) == 0, "Must be");
+
+  Register strL = isLU ? str1 : str2;
+  Register strU = isLU ? str2 : str1;
+  Register tmpL = tmp1, tmpU = tmp2;
+
+  // load first parts of strings and finish initialization while loading
+  mv(t0, STUB_THRESHOLD);
+  bge(cnt2, t0, *STUB);
+  lwu(tmpL, Address(strL));
+  load_long_misaligned(tmpU, Address(strU), tmp3, (base_offset % 8) != 0 ? 4 : 8);
+  subi(cnt2, cnt2, 4);
+  add(strL, strL, cnt2);
+  sub(cnt1, zr, cnt2);
+  slli(cnt2, cnt2, 1);
+  add(strU, strU, cnt2);
+  inflate_lo32(tmp3, tmpL);
+  mv(tmpL, tmp3);
+  sub(cnt2, zr, cnt2);
+  addi(cnt1, cnt1, 4);
+  addi(cnt2, cnt2, 8);
+  bne(tmpL, tmpU, DIFFERENCE);
+  bgez(cnt2, TAIL);
+
+  // main loop
+  bind(NEXT_WORD);
+    add(t0, strL, cnt1);
+    lwu(tmpL, Address(t0));
+    add(t0, strU, cnt2);
+    load_long_misaligned(tmpU, Address(t0), tmp3, (base_offset % 8) != 0 ? 4 : 8);
+    addi(cnt1, cnt1, 4);
+    inflate_lo32(tmp3, tmpL);
+    mv(tmpL, tmp3);
+    addi(cnt2, cnt2, 8);
+    bne(tmpL, tmpU, DIFFERENCE);
+    bltz(cnt2, NEXT_WORD);
+
+  bind(TAIL);
+  load_int_misaligned(tmpL, Address(strL), tmp3, false);
+  load_long_misaligned(tmpU, Address(strU), tmp3, 2);
+  inflate_lo32(tmp3, tmpL);
+  mv(tmpL, tmp3);
+
+  beq(tmpL, tmpU, *DONE);
+
+  // Find the first different characters in the longwords and
+  // compute their difference.
+  bind(DIFFERENCE);
+  xorr(tmp3, tmpL, tmpU);
+  // count bits of trailing zero chars
+  ctzc_bits(result, tmp3);
+  srl(tmpL, tmpL, result);
+  srl(tmpU, tmpU, result);
+  zext(tmpL, tmpL, 16);
+  zext(tmpU, tmpU, 16);
+  if (isLU) {
+    sub(result, tmpL, tmpU);
+  } else {
+    sub(result, tmpU, tmpL);
+  }
+
+  j(*DONE);
+}
+
 // Compare strings.
 void C2_MacroAssembler::string_compare(Register str1, Register str2,
                                        Register cnt1, Register cnt2, Register result,
                                        Register tmp1, Register tmp2, Register tmp3,
                                        int ae)
 {
-  Label DONE, SHORT_LOOP, SHORT_STRING, SHORT_LAST, TAIL, STUB,
-        DIFFERENCE, NEXT_WORD, SHORT_LOOP_TAIL, SHORT_LAST2, SHORT_LAST_INIT,
-        SHORT_LOOP_START, TAIL_CHECK, L;
+  Label DONE, SHORT_LOOP, SHORT_STRING, SHORT_LAST, STUB,
+        SHORT_LOOP_TAIL, SHORT_LAST2, SHORT_LAST_INIT,
+        SHORT_LOOP_START, L;
 
   const int STUB_THRESHOLD = 64 + 8;
   bool isLL = ae == StrIntrinsicNode::LL;
@@ -1409,14 +1577,6 @@ void C2_MacroAssembler::string_compare(Register str1, Register str2,
   load_chr_insn str1_load_chr = str1_isL ? (load_chr_insn)&MacroAssembler::lbu : (load_chr_insn)&MacroAssembler::lhu;
   load_chr_insn str2_load_chr = str2_isL ? (load_chr_insn)&MacroAssembler::lbu : (load_chr_insn)&MacroAssembler::lhu;
 
-  int base_offset1 = arrayOopDesc::base_offset_in_bytes(T_BYTE);
-  int base_offset2 = arrayOopDesc::base_offset_in_bytes(T_CHAR);
-
-  assert((base_offset1 % (UseCompactObjectHeaders ? 4 :
-                          (UseCompressedClassPointers ? 8 : 4))) == 0, "Must be");
-  assert((base_offset2 % (UseCompactObjectHeaders ? 4 :
-                          (UseCompressedClassPointers ? 8 : 4))) == 0, "Must be");
-
   BLOCK_COMMENT("string_compare {");
 
   // Bizarrely, the counts are passed in bytes, regardless of whether they
@@ -1434,154 +1594,23 @@ void C2_MacroAssembler::string_compare(Register str1, Register str2,
   mv(cnt2, cnt1);
   bind(L);
 
-  // Load 4 bytes once to compare for alignment before main loop. Note that this
-  // is only possible for LL/UU case. We need to resort to load_long_misaligned
-  // for both LU and UL cases.
-  if (str1_isL == str2_isL) { // LL or UU
-    beq(str1, str2, DONE);
-    int base_offset = isLL ? base_offset1 : base_offset2;
-    if (AvoidUnalignedAccesses && (base_offset % 8) != 0) {
-      mv(t0, minCharsInWord / 2);
-      ble(cnt2, t0, SHORT_STRING);
-      lwu(tmp1, Address(str1));
-      lwu(tmp2, Address(str2));
-      bne(tmp1, tmp2, DIFFERENCE);
-      addi(str1, str1, 4);
-      addi(str2, str2, 4);
-      subi(cnt2, cnt2, minCharsInWord / 2);
-    }
-  }
-
   // A very short string
   mv(t0, minCharsInWord);
   ble(cnt2, t0, SHORT_STRING);
 
   // Compare longwords
-  // load first parts of strings and finish initialization while loading
   {
     if (str1_isL == str2_isL) { // LL or UU
-#ifdef ASSERT
-      if (AvoidUnalignedAccesses) {
-        Label align_ok;
-        orr(t0, str1, str2);
-        andi(t0, t0, 0x7);
-        beqz(t0, align_ok);
-        stop("bad alignment");
-        bind(align_ok);
-      }
-#endif
-      // load 8 bytes once to compare
-      ld(tmp1, Address(str1));
-      ld(tmp2, Address(str2));
-      mv(t0, STUB_THRESHOLD);
-      bge(cnt2, t0, STUB);
-      subi(cnt2, cnt2, minCharsInWord);
-      beqz(cnt2, TAIL_CHECK);
-      // convert cnt2 from characters to bytes
-      if (!str1_isL) {
-        slli(cnt2, cnt2, 1);
-      }
-      add(str2, str2, cnt2);
-      add(str1, str1, cnt2);
-      sub(cnt2, zr, cnt2);
-    } else if (isLU) { // LU case
-      mv(t0, STUB_THRESHOLD);
-      bge(cnt2, t0, STUB);
-      lwu(tmp1, Address(str1));
-      load_long_misaligned(tmp2, Address(str2), tmp3, (base_offset2 % 8) != 0 ? 4 : 8);
-      subi(cnt2, cnt2, 4);
-      add(str1, str1, cnt2);
-      sub(cnt1, zr, cnt2);
-      slli(cnt2, cnt2, 1);
-      add(str2, str2, cnt2);
-      inflate_lo32(tmp3, tmp1);
-      mv(tmp1, tmp3);
-      sub(cnt2, zr, cnt2);
-      addi(cnt1, cnt1, 4);
-    } else { // UL case
-      mv(t0, STUB_THRESHOLD);
-      bge(cnt2, t0, STUB);
-      load_long_misaligned(tmp1, Address(str1), tmp3, (base_offset2 % 8) != 0 ? 4 : 8);
-      lwu(tmp2, Address(str2));
-      subi(cnt2, cnt2, 4);
-      slli(t0, cnt2, 1);
-      sub(cnt1, zr, t0);
-      add(str1, str1, t0);
-      add(str2, str2, cnt2);
-      inflate_lo32(tmp3, tmp2);
-      mv(tmp2, tmp3);
-      sub(cnt2, zr, cnt2);
-      addi(cnt1, cnt1, 8);
+      string_compare_long_same_encoding(result,
+                                str1, str2, isLL,
+                                cnt1, cnt2, tmp1, tmp2, tmp3,
+                                STUB_THRESHOLD, &STUB, &SHORT_STRING, &DONE);
+    } else { // LU or UL
+      string_compare_long_different_encoding(result,
+                                str1, str2, isLU,
+                                cnt1, cnt2, tmp1, tmp2, tmp3,
+                                STUB_THRESHOLD, &STUB, &DONE);
     }
-    addi(cnt2, cnt2, isUL ? 4 : 8);
-    bne(tmp1, tmp2, DIFFERENCE);
-    bgez(cnt2, TAIL);
-
-    // main loop
-    bind(NEXT_WORD);
-    if (str1_isL == str2_isL) { // LL or UU
-      // 8-byte aligned loads when AvoidUnalignedAccesses is enabled
-      add(t0, str1, cnt2);
-      ld(tmp1, Address(t0));
-      add(t0, str2, cnt2);
-      ld(tmp2, Address(t0));
-      addi(cnt2, cnt2, 8);
-    } else if (isLU) { // LU case
-      add(t0, str1, cnt1);
-      lwu(tmp1, Address(t0));
-      add(t0, str2, cnt2);
-      load_long_misaligned(tmp2, Address(t0), tmp3, (base_offset2 % 8) != 0 ? 4 : 8);
-      addi(cnt1, cnt1, 4);
-      inflate_lo32(tmp3, tmp1);
-      mv(tmp1, tmp3);
-      addi(cnt2, cnt2, 8);
-    } else { // UL case
-      add(t0, str2, cnt2);
-      lwu(tmp2, Address(t0));
-      add(t0, str1, cnt1);
-      load_long_misaligned(tmp1, Address(t0), tmp3, (base_offset2 % 8) != 0 ? 4 : 8);
-      inflate_lo32(tmp3, tmp2);
-      mv(tmp2, tmp3);
-      addi(cnt1, cnt1, 8);
-      addi(cnt2, cnt2, 4);
-    }
-    bne(tmp1, tmp2, DIFFERENCE);
-    bltz(cnt2, NEXT_WORD);
-    bind(TAIL);
-    if (str1_isL == str2_isL) { // LL or UU
-      load_long_misaligned(tmp1, Address(str1), tmp3, isLL ? 1 : 2);
-      load_long_misaligned(tmp2, Address(str2), tmp3, isLL ? 1 : 2);
-    } else if (isLU) { // LU case
-      load_int_misaligned(tmp1, Address(str1), tmp3, false);
-      load_long_misaligned(tmp2, Address(str2), tmp3, 2);
-      inflate_lo32(tmp3, tmp1);
-      mv(tmp1, tmp3);
-    } else { // UL case
-      load_int_misaligned(tmp2, Address(str2), tmp3, false);
-      load_long_misaligned(tmp1, Address(str1), tmp3, 2);
-      inflate_lo32(tmp3, tmp2);
-      mv(tmp2, tmp3);
-    }
-    bind(TAIL_CHECK);
-    beq(tmp1, tmp2, DONE);
-
-    // Find the first different characters in the longwords and
-    // compute their difference.
-    bind(DIFFERENCE);
-    xorr(tmp3, tmp1, tmp2);
-    // count bits of trailing zero chars
-    ctzc_bits(result, tmp3, isLL);
-    srl(tmp1, tmp1, result);
-    srl(tmp2, tmp2, result);
-    if (isLL) {
-      zext(tmp1, tmp1, 8);
-      zext(tmp2, tmp2, 8);
-    } else {
-      zext(tmp1, tmp1, 16);
-      zext(tmp2, tmp2, 16);
-    }
-    sub(result, tmp1, tmp2);
-    j(DONE);
   }
 
   bind(STUB);
@@ -2636,7 +2665,7 @@ void C2_MacroAssembler::string_compare_v(Register str1, Register str2, Register
 
   int minCharsInWord = encLL ? wordSize : wordSize / 2;
 
-  BLOCK_COMMENT("string_compare {");
+  BLOCK_COMMENT("string_compare_v {");
 
   // for Latin strings, 1 byte for 1 character
   // for UTF16 strings, 2 bytes for 1 character
@@ -2696,6 +2725,8 @@ void C2_MacroAssembler::string_compare_v(Register str1, Register str2, Register
   sub(result, tmp1, tmp2);
 
   bind(DONE);
+
+  BLOCK_COMMENT("} string_compare_v");
 }
 
 void C2_MacroAssembler::byte_array_inflate_v(Register src, Register dst, Register len, Register tmp) {
diff --git a/src/hotspot/cpu/riscv/c2_MacroAssembler_riscv.hpp b/src/hotspot/cpu/riscv/c2_MacroAssembler_riscv.hpp
index c79c360d2eb..72f3c1460f3 100644
--- a/src/hotspot/cpu/riscv/c2_MacroAssembler_riscv.hpp
+++ b/src/hotspot/cpu/riscv/c2_MacroAssembler_riscv.hpp
@@ -39,6 +39,15 @@
                        VectorRegister vrs,
                        bool is_latin, Label& DONE, Assembler::LMUL lmul);
 
+  void string_compare_long_same_encoding(Register result, Register str1, Register str2,
+                                  const bool isLL, Register cnt1, Register cnt2,
+                                  Register tmp1, Register tmp2, Register tmp3,
+                                  const int STUB_THRESHOLD, Label *STUB, Label *SHORT_STRING, Label *DONE);
+  void string_compare_long_different_encoding(Register result, Register str1, Register str2,
+                                  bool isLU, Register cnt1, Register cnt2,
+                                  Register tmp1, Register tmp2, Register tmp3,
+                                  const int STUB_THRESHOLD, Label *STUB, Label *DONE);
+
  public:
   // Code used by cmpFastLock and cmpFastUnlock mach instructions in .ad file.
   void fast_lock(Register object, Register box,
diff --git a/src/hotspot/cpu/riscv/stubGenerator_riscv.cpp b/src/hotspot/cpu/riscv/stubGenerator_riscv.cpp
index 01ed7fcac9f..249b871bd00 100644
--- a/src/hotspot/cpu/riscv/stubGenerator_riscv.cpp
+++ b/src/hotspot/cpu/riscv/stubGenerator_riscv.cpp
@@ -2431,23 +2431,6 @@ class StubGenerator: public StubCodeGenerator {
     return start;
   }
 
-  // code for comparing 16 bytes of strings with same encoding
-  void compare_string_16_bytes_same(Label &DIFF1, Label &DIFF2) {
-    const Register result = x10, str1 = x11, cnt1 = x12, str2 = x13, tmp1 = x28, tmp2 = x29, tmp4 = x7, tmp5 = x31;
-    __ ld(tmp5, Address(str1));
-    __ addi(str1, str1, 8);
-    __ xorr(tmp4, tmp1, tmp2);
-    __ ld(cnt1, Address(str2));
-    __ addi(str2, str2, 8);
-    __ bnez(tmp4, DIFF1);
-    __ ld(tmp1, Address(str1));
-    __ addi(str1, str1, 8);
-    __ xorr(tmp4, tmp5, cnt1);
-    __ ld(tmp2, Address(str2));
-    __ addi(str2, str2, 8);
-    __ bnez(tmp4, DIFF2);
-  }
-
   // code for comparing 8 characters of strings with Latin1 and Utf16 encoding
   void compare_string_8_x_LU(Register tmpL, Register tmpU,
                              Register strL, Register strU, Label& DIFF) {
@@ -2702,7 +2685,20 @@ class StubGenerator: public StubCodeGenerator {
     __ push_reg(spilled_regs, sp);
     __ bltz(cnt2, TAIL);
     __ bind(SMALL_LOOP);
-      compare_string_16_bytes_same(DIFF, DIFF2);
+      // compare 16 bytes of strings with same encoding
+      __ ld(tmp5, Address(str1));
+      __ addi(str1, str1, 8);
+      __ xorr(tmp4, tmp1, tmp2);
+      __ ld(cnt1, Address(str2));
+      __ addi(str2, str2, 8);
+      __ bnez(tmp4, DIFF);
+      __ ld(tmp1, Address(str1));
+      __ addi(str1, str1, 8);
+      __ xorr(tmp4, tmp5, cnt1);
+      __ ld(tmp2, Address(str2));
+      __ addi(str2, str2, 8);
+      __ bnez(tmp4, DIFF2);
+
       __ subi(cnt2, cnt2, isLL ? 16 : 8);
       __ bgez(cnt2, SMALL_LOOP);
     __ bind(TAIL);
diff --git a/test/hotspot/jtreg/compiler/intrinsics/string/TestStringIntrinsics.java b/test/hotspot/jtreg/compiler/intrinsics/string/TestStringIntrinsics.java
index 062866d657f..f82a4899d97 100644
--- a/test/hotspot/jtreg/compiler/intrinsics/string/TestStringIntrinsics.java
+++ b/test/hotspot/jtreg/compiler/intrinsics/string/TestStringIntrinsics.java
@@ -160,6 +160,7 @@ public class TestStringIntrinsics {
 
                 // Different lengths
                 invokeAndCheck(m, 1, "ABCD", "ABC");
+                invokeAndCheck(m, '\uff21' - 'A', "ABCEFGHIJKLMNOPQRSTUVWXY\uff21Z", "ABCEFGHIJKLMNOPQRSTUVWXYAZ");
                 invokeAndCheck(m, -1, "\uff21\uff22\uff23", "\uff21\uff22\uff23\uff24");
                 invokeAndCheck(m, 1, "ABC\uff24", "ABC");
                 invokeAndCheck(m, 3, "ABC\uff24\uff25\uff26", "ABC");

From c4b516dfe7c5a5fddd4d9c97a21f5f36bf845646 Mon Sep 17 00:00:00 2001
From: Calvin Cheung <ccheung@openjdk.org>
Date: Mon, 3 Mar 2025 18:49:11 +0000
Subject: [PATCH 201/587] 8348322: AOT cache creation crashes with "All cached
 hidden classes must be aot-linkable" when AOTInvokeDynamicLinking is disabled

Co-authored-by: Ioi Lam <iklam@openjdk.org>
Reviewed-by: iklam, matsaave
---
 src/hotspot/share/cds/aotClassInitializer.cpp         |  4 ++--
 src/hotspot/share/cds/aotClassLinker.cpp              |  2 +-
 src/hotspot/share/cds/archiveBuilder.cpp              | 11 ++++++++---
 src/hotspot/share/cds/cdsConfig.cpp                   | 10 +++++++---
 src/hotspot/share/cds/cdsConfig.hpp                   |  4 +---
 src/hotspot/share/cds/cdsHeapVerifier.cpp             |  4 +++-
 src/hotspot/share/cds/classListParser.cpp             |  2 +-
 src/hotspot/share/cds/filemap.cpp                     |  6 ------
 src/hotspot/share/cds/filemap.hpp                     |  1 -
 src/hotspot/share/cds/heapShared.cpp                  |  8 ++++----
 src/hotspot/share/cds/lambdaFormInvokers.cpp          |  2 +-
 src/hotspot/share/cds/metaspaceShared.cpp             |  7 +++++--
 src/hotspot/share/classfile/javaClasses.cpp           |  2 +-
 .../share/classfile/systemDictionaryShared.cpp        |  4 ++--
 src/hotspot/share/oops/constantPool.cpp               |  2 +-
 src/hotspot/share/oops/cpCache.cpp                    |  2 +-
 .../aotClassLinking/AOTClassLinkingVMOptions.java     | 11 ++++++++++-
 17 files changed, 48 insertions(+), 34 deletions(-)

diff --git a/src/hotspot/share/cds/aotClassInitializer.cpp b/src/hotspot/share/cds/aotClassInitializer.cpp
index 5b022cae244..c5ad36ac315 100644
--- a/src/hotspot/share/cds/aotClassInitializer.cpp
+++ b/src/hotspot/share/cds/aotClassInitializer.cpp
@@ -107,7 +107,7 @@ bool AOTClassInitializer::can_archive_initialized_mirror(InstanceKlass* ik) {
   // Automatic selection for aot-inited classes
   // ==========================================
   //
-  // When CDSConfig::is_initing_classes_at_dump_time() is enabled,
+  // When CDSConfig::is_initing_classes_at_dump_time is enabled,
   // AOTArtifactFinder::find_artifacts() finds the classes of all
   // heap objects that are reachable from HeapShared::_run_time_special_subgraph,
   // and mark these classes as aot-inited. This preserves the initialized
@@ -266,7 +266,7 @@ bool AOTClassInitializer::can_archive_initialized_mirror(InstanceKlass* ik) {
     }
   }
 
-  if (CDSConfig::is_dumping_invokedynamic()) {
+  if (CDSConfig::is_dumping_method_handles()) {
     // This table was created with the help of CDSHeapVerifier.
     // Also, some $Holder classes are needed. E.g., Invokers.<clinit> explicitly
     // initializes Invokers$Holder. Since Invokers.<clinit> won't be executed
diff --git a/src/hotspot/share/cds/aotClassLinker.cpp b/src/hotspot/share/cds/aotClassLinker.cpp
index a1cacd735dd..dc539eb3d55 100644
--- a/src/hotspot/share/cds/aotClassLinker.cpp
+++ b/src/hotspot/share/cds/aotClassLinker.cpp
@@ -142,7 +142,7 @@ bool AOTClassLinker::try_add_candidate(InstanceKlass* ik) {
 
   if (ik->is_hidden()) {
     assert(ik->shared_class_loader_type() != ClassLoader::OTHER, "must have been set");
-    if (!CDSConfig::is_dumping_invokedynamic()) {
+    if (!CDSConfig::is_dumping_method_handles()) {
       return false;
     }
     if (HeapShared::is_lambda_proxy_klass(ik)) {
diff --git a/src/hotspot/share/cds/archiveBuilder.cpp b/src/hotspot/share/cds/archiveBuilder.cpp
index 21e97457a87..48e843e473f 100644
--- a/src/hotspot/share/cds/archiveBuilder.cpp
+++ b/src/hotspot/share/cds/archiveBuilder.cpp
@@ -786,6 +786,7 @@ void ArchiveBuilder::make_klasses_shareable() {
     const char* aotlinked_msg = "";
     const char* inited_msg = "";
     Klass* k = get_buffered_addr(klasses()->at(i));
+    bool inited = false;
     k->remove_java_mirror();
 #ifdef _LP64
     if (UseCompactObjectHeaders) {
@@ -810,7 +811,7 @@ void ArchiveBuilder::make_klasses_shareable() {
       InstanceKlass* ik = InstanceKlass::cast(k);
       InstanceKlass* src_ik = get_source_addr(ik);
       bool aotlinked = AOTClassLinker::is_candidate(src_ik);
-      bool inited = ik->has_aot_initialized_mirror();
+      inited = ik->has_aot_initialized_mirror();
       ADD_COUNT(num_instance_klasses);
       if (CDSConfig::is_dumping_dynamic_archive()) {
         // For static dump, class loader type are already set.
@@ -833,7 +834,7 @@ void ArchiveBuilder::make_klasses_shareable() {
           type = "bad";
           assert(0, "shouldn't happen");
         }
-        if (CDSConfig::is_dumping_invokedynamic()) {
+        if (CDSConfig::is_dumping_method_handles()) {
           assert(HeapShared::is_archivable_hidden_klass(ik), "sanity");
         } else {
           // Legacy CDS support for lambda proxies
@@ -891,7 +892,11 @@ void ArchiveBuilder::make_klasses_shareable() {
         aotlinked_msg = " aot-linked";
       }
       if (inited) {
-        inited_msg = " inited";
+        if (InstanceKlass::cast(k)->static_field_size() == 0) {
+          inited_msg = " inited (no static fields)";
+        } else {
+          inited_msg = " inited";
+        }
       }
 
       MetaspaceShared::rewrite_nofast_bytecodes_and_calculate_fingerprints(Thread::current(), ik);
diff --git a/src/hotspot/share/cds/cdsConfig.cpp b/src/hotspot/share/cds/cdsConfig.cpp
index ff11b807910..f50ae446363 100644
--- a/src/hotspot/share/cds/cdsConfig.cpp
+++ b/src/hotspot/share/cds/cdsConfig.cpp
@@ -47,7 +47,6 @@ bool CDSConfig::_is_using_optimized_module_handling = true;
 bool CDSConfig::_is_dumping_full_module_graph = true;
 bool CDSConfig::_is_using_full_module_graph = true;
 bool CDSConfig::_has_aot_linked_classes = false;
-bool CDSConfig::_has_archived_invokedynamic = false;
 bool CDSConfig::_old_cds_flags_used = false;
 bool CDSConfig::_new_aot_flags_used = false;
 bool CDSConfig::_disable_heap_dumping = false;
@@ -738,8 +737,13 @@ bool CDSConfig::is_dumping_invokedynamic() {
   return AOTInvokeDynamicLinking && is_dumping_aot_linked_classes() && is_dumping_heap();
 }
 
-bool CDSConfig::is_loading_invokedynamic() {
-  return UseSharedSpaces && is_using_full_module_graph() && _has_archived_invokedynamic;
+// When we are dumping aot-linked classes and we are able to write archived heap objects, we automatically
+// enable the archiving of MethodHandles. This will in turn enable the archiving of MethodTypes and hidden
+// classes that are used in the implementation of MethodHandles.
+// Archived MethodHandles are required for higher-level optimizations such as AOT resolution of invokedynamic
+// and dynamic proxies.
+bool CDSConfig::is_dumping_method_handles() {
+  return is_initing_classes_at_dump_time();
 }
 
 #endif // INCLUDE_CDS_JAVA_HEAP
diff --git a/src/hotspot/share/cds/cdsConfig.hpp b/src/hotspot/share/cds/cdsConfig.hpp
index d9f5a593098..753ed6b746a 100644
--- a/src/hotspot/share/cds/cdsConfig.hpp
+++ b/src/hotspot/share/cds/cdsConfig.hpp
@@ -41,7 +41,6 @@ class CDSConfig : public AllStatic {
   static bool _is_dumping_full_module_graph;
   static bool _is_using_full_module_graph;
   static bool _has_aot_linked_classes;
-  static bool _has_archived_invokedynamic;
 
   static char* _default_archive_path;
   static char* _static_archive_path;
@@ -160,8 +159,7 @@ public:
   static bool is_initing_classes_at_dump_time()              NOT_CDS_JAVA_HEAP_RETURN_(false);
 
   static bool is_dumping_invokedynamic()                     NOT_CDS_JAVA_HEAP_RETURN_(false);
-  static bool is_loading_invokedynamic()                     NOT_CDS_JAVA_HEAP_RETURN_(false);
-  static void set_has_archived_invokedynamic()               { CDS_JAVA_HEAP_ONLY(_has_archived_invokedynamic = true); }
+  static bool is_dumping_method_handles()                    NOT_CDS_JAVA_HEAP_RETURN_(false);
 
   // full_module_graph (requires optimized_module_handling)
   static bool is_dumping_full_module_graph()                 { return CDS_ONLY(_is_dumping_full_module_graph) NOT_CDS(false); }
diff --git a/src/hotspot/share/cds/cdsHeapVerifier.cpp b/src/hotspot/share/cds/cdsHeapVerifier.cpp
index f9e613a74ce..729637f47c2 100644
--- a/src/hotspot/share/cds/cdsHeapVerifier.cpp
+++ b/src/hotspot/share/cds/cdsHeapVerifier.cpp
@@ -106,6 +106,8 @@ CDSHeapVerifier::CDSHeapVerifier() : _archived_objs(0), _problems(0)
 
   ADD_EXCL("java/lang/System",                           "bootLayer");             // A
 
+  ADD_EXCL("java/util/Collections",                      "EMPTY_LIST");           // E
+
   // A dummy object used by HashSet. The value doesn't matter and it's never
   // tested for equality.
   ADD_EXCL("java/util/HashSet",                          "PRESENT");               // E
@@ -127,7 +129,7 @@ CDSHeapVerifier::CDSHeapVerifier() : _archived_objs(0), _problems(0)
   ADD_EXCL("sun/invoke/util/ValueConversions",           "ONE_INT",                // E
                                                          "ZERO_INT");              // E
 
-  if (CDSConfig::is_dumping_invokedynamic()) {
+  if (CDSConfig::is_dumping_method_handles()) {
     ADD_EXCL("java/lang/invoke/InvokerBytecodeGenerator", "MEMBERNAME_FACTORY",    // D
                                                           "CD_Object_array",       // E same as <...>ConstantUtils.CD_Object_array::CD_Object
                                                           "INVOKER_SUPER_DESC");   // E same as java.lang.constant.ConstantDescs::CD_Object
diff --git a/src/hotspot/share/cds/classListParser.cpp b/src/hotspot/share/cds/classListParser.cpp
index e0c008678ca..133cfcc8738 100644
--- a/src/hotspot/share/cds/classListParser.cpp
+++ b/src/hotspot/share/cds/classListParser.cpp
@@ -627,7 +627,7 @@ void ClassListParser::resolve_indy(JavaThread* current, Symbol* class_name_symbo
 }
 
 void ClassListParser::resolve_indy_impl(Symbol* class_name_symbol, TRAPS) {
-  if (CDSConfig::is_dumping_invokedynamic()) {
+  if (CDSConfig::is_dumping_method_handles()) {
     // The CP entry for the invokedynamic instruction will be resolved.
     // No need to do the following.
     return;
diff --git a/src/hotspot/share/cds/filemap.cpp b/src/hotspot/share/cds/filemap.cpp
index 8a7e66c19e4..ebcd33f8bd5 100644
--- a/src/hotspot/share/cds/filemap.cpp
+++ b/src/hotspot/share/cds/filemap.cpp
@@ -234,7 +234,6 @@ void FileMapHeader::populate(FileMapInfo *info, size_t core_region_alignment,
   _use_optimized_module_handling = CDSConfig::is_using_optimized_module_handling();
   _has_aot_linked_classes = CDSConfig::is_dumping_aot_linked_classes();
   _has_full_module_graph = CDSConfig::is_dumping_full_module_graph();
-  _has_archived_invokedynamic = CDSConfig::is_dumping_invokedynamic();
 
   // The following fields are for sanity checks for whether this archive
   // will function correctly with this JVM and the bootclasspath it's
@@ -309,7 +308,6 @@ void FileMapHeader::print(outputStream* st) {
   st->print_cr("- use_optimized_module_handling:  %d", _use_optimized_module_handling);
   st->print_cr("- has_full_module_graph           %d", _has_full_module_graph);
   st->print_cr("- has_aot_linked_classes          %d", _has_aot_linked_classes);
-  st->print_cr("- has_archived_invokedynamic      %d", _has_archived_invokedynamic);
 }
 
 bool FileMapInfo::validate_class_location() {
@@ -1950,10 +1948,6 @@ bool FileMapHeader::validate() {
     if (!_has_full_module_graph) {
       CDSConfig::stop_using_full_module_graph("archive was created without full module graph");
     }
-
-    if (_has_archived_invokedynamic) {
-      CDSConfig::set_has_archived_invokedynamic();
-    }
   }
 
   return true;
diff --git a/src/hotspot/share/cds/filemap.hpp b/src/hotspot/share/cds/filemap.hpp
index 25550d76d2a..095faba69f3 100644
--- a/src/hotspot/share/cds/filemap.hpp
+++ b/src/hotspot/share/cds/filemap.hpp
@@ -140,7 +140,6 @@ private:
                                         // some expensive operations.
   bool   _has_aot_linked_classes;       // Was the CDS archive created with -XX:+AOTClassLinking
   bool   _has_full_module_graph;        // Does this CDS archive contain the full archived module graph?
-  bool   _has_archived_invokedynamic;   // Does the archive have aot-linked invokedynamic CP entries?
   HeapRootSegments _heap_root_segments; // Heap root segments info
   size_t _heap_oopmap_start_pos;        // The first bit in the oopmap corresponds to this position in the heap.
   size_t _heap_ptrmap_start_pos;        // The first bit in the ptrmap corresponds to this position in the heap.
diff --git a/src/hotspot/share/cds/heapShared.cpp b/src/hotspot/share/cds/heapShared.cpp
index c95a358de5f..7bd5d5a6267 100644
--- a/src/hotspot/share/cds/heapShared.cpp
+++ b/src/hotspot/share/cds/heapShared.cpp
@@ -492,7 +492,7 @@ bool HeapShared::is_string_concat_klass(InstanceKlass* ik) {
 }
 
 bool HeapShared::is_archivable_hidden_klass(InstanceKlass* ik) {
-  return CDSConfig::is_dumping_invokedynamic() &&
+  return CDSConfig::is_dumping_method_handles() &&
     (is_lambda_form_klass(ik) || is_lambda_proxy_klass(ik) || is_string_concat_klass(ik));
 }
 
@@ -782,7 +782,7 @@ void KlassSubGraphInfo::add_subgraph_object_klass(Klass* orig_k) {
   if (orig_k->is_instance_klass()) {
 #ifdef ASSERT
     InstanceKlass* ik = InstanceKlass::cast(orig_k);
-    if (CDSConfig::is_dumping_invokedynamic()) {
+    if (CDSConfig::is_dumping_method_handles()) {
       assert(ik->class_loader() == nullptr ||
              HeapShared::is_lambda_proxy_klass(ik),
             "we can archive only instances of boot classes or lambda proxy classes");
@@ -835,7 +835,7 @@ void KlassSubGraphInfo::check_allowed_klass(InstanceKlass* ik) {
   }
 
   const char* lambda_msg = "";
-  if (CDSConfig::is_dumping_invokedynamic()) {
+  if (CDSConfig::is_dumping_method_handles()) {
     lambda_msg = ", or a lambda proxy class";
     if (HeapShared::is_lambda_proxy_klass(ik) &&
         (ik->class_loader() == nullptr ||
@@ -1108,7 +1108,7 @@ void HeapShared::resolve_classes_for_subgraph_of(JavaThread* current, Klass* k)
 }
 
 void HeapShared::initialize_java_lang_invoke(TRAPS) {
-  if (CDSConfig::is_loading_invokedynamic() || CDSConfig::is_dumping_invokedynamic()) {
+  if (CDSConfig::is_using_aot_linked_classes() || CDSConfig::is_dumping_method_handles()) {
     resolve_or_init("java/lang/invoke/Invokers$Holder", true, CHECK);
     resolve_or_init("java/lang/invoke/MethodHandle", true, CHECK);
     resolve_or_init("java/lang/invoke/MethodHandleNatives", true, CHECK);
diff --git a/src/hotspot/share/cds/lambdaFormInvokers.cpp b/src/hotspot/share/cds/lambdaFormInvokers.cpp
index fc1917086f3..ab22b4775b7 100644
--- a/src/hotspot/share/cds/lambdaFormInvokers.cpp
+++ b/src/hotspot/share/cds/lambdaFormInvokers.cpp
@@ -95,7 +95,7 @@ void LambdaFormInvokers::regenerate_holder_classes(TRAPS) {
     return;
   }
 
-  if (CDSConfig::is_dumping_static_archive() && CDSConfig::is_dumping_invokedynamic()) {
+  if (CDSConfig::is_dumping_static_archive() && CDSConfig::is_dumping_method_handles()) {
     // Work around JDK-8310831, as some methods in lambda form holder classes may not get generated.
     log_info(cds)("Archived MethodHandles may refer to lambda form holder classes. Cannot regenerate.");
     return;
diff --git a/src/hotspot/share/cds/metaspaceShared.cpp b/src/hotspot/share/cds/metaspaceShared.cpp
index 9e9f9fd1d9e..ee877c474b9 100644
--- a/src/hotspot/share/cds/metaspaceShared.cpp
+++ b/src/hotspot/share/cds/metaspaceShared.cpp
@@ -636,7 +636,7 @@ void VM_PopulateDumpSharedSpace::doit() {
   DEBUG_ONLY(SystemDictionaryShared::NoClassLoadingMark nclm);
 
   _pending_method_handle_intrinsics = new (mtClassShared) GrowableArray<Method*>(256, mtClassShared);
-  if (CDSConfig::is_dumping_aot_linked_classes()) {
+  if (CDSConfig::is_dumping_method_handles()) {
     // When dumping AOT-linked classes, some classes may have direct references to a method handle
     // intrinsic. The easiest thing is to save all of them into the AOT cache.
     SystemDictionary::get_all_method_handle_intrinsics(_pending_method_handle_intrinsics);
@@ -985,7 +985,7 @@ void MetaspaceShared::preload_and_dump_impl(StaticArchiveBuilder& builder, TRAPS
       HeapShared::reset_archived_object_states(CHECK);
     }
 
-    if (CDSConfig::is_dumping_invokedynamic()) {
+    if (CDSConfig::is_dumping_method_handles()) {
       // This assert means that the MethodType and MethodTypeForm tables won't be
       // updated concurrently when we are saving their contents into a side table.
       assert(CDSConfig::allow_only_single_java_thread(), "Required");
@@ -995,12 +995,15 @@ void MetaspaceShared::preload_and_dump_impl(StaticArchiveBuilder& builder, TRAPS
                              vmSymbols::createArchivedObjects(),
                              vmSymbols::void_method_signature(),
                              CHECK);
+    }
 
+    if (CDSConfig::is_initing_classes_at_dump_time()) {
       // java.lang.Class::reflectionFactory cannot be archived yet. We set this field
       // to null, and it will be initialized again at runtime.
       log_debug(cds)("Resetting Class::reflectionFactory");
       TempNewSymbol method_name = SymbolTable::new_symbol("resetArchivedStates");
       Symbol* method_sig = vmSymbols::void_method_signature();
+      JavaValue result(T_VOID);
       JavaCalls::call_static(&result, vmClasses::Class_klass(),
                              method_name, method_sig, CHECK);
 
diff --git a/src/hotspot/share/classfile/javaClasses.cpp b/src/hotspot/share/classfile/javaClasses.cpp
index a224ef481b0..fa97888360a 100644
--- a/src/hotspot/share/classfile/javaClasses.cpp
+++ b/src/hotspot/share/classfile/javaClasses.cpp
@@ -5452,7 +5452,7 @@ void JavaClasses::serialize_offsets(SerializeClosure* soc) {
 bool JavaClasses::is_supported_for_archiving(oop obj) {
   Klass* klass = obj->klass();
 
-  if (!CDSConfig::is_dumping_invokedynamic()) {
+  if (!CDSConfig::is_dumping_method_handles()) {
     // These are supported by CDS only when CDSConfig::is_dumping_invokedynamic() is enabled.
     if (klass == vmClasses::ResolvedMethodName_klass() ||
         klass == vmClasses::MemberName_klass()) {
diff --git a/src/hotspot/share/classfile/systemDictionaryShared.cpp b/src/hotspot/share/classfile/systemDictionaryShared.cpp
index 2f7887c2d46..6bd573ea465 100644
--- a/src/hotspot/share/classfile/systemDictionaryShared.cpp
+++ b/src/hotspot/share/classfile/systemDictionaryShared.cpp
@@ -295,7 +295,7 @@ bool SystemDictionaryShared::check_for_exclusion_impl(InstanceKlass* k) {
   if (!k->is_hidden() && k->shared_classpath_index() < 0 && is_builtin(k)) {
     if (k->name()->starts_with("java/lang/invoke/BoundMethodHandle$Species_")) {
       // This class is dynamically generated by the JDK
-      if (CDSConfig::is_dumping_aot_linked_classes()) {
+      if (CDSConfig::is_dumping_method_handles()) {
         k->set_shared_classpath_index(0);
       } else {
         ResourceMark rm;
@@ -587,7 +587,7 @@ void SystemDictionaryShared::validate_before_archiving(InstanceKlass* k) {
   guarantee(!info->is_excluded(), "Should not attempt to archive excluded class %s", name);
   if (is_builtin(k)) {
     if (k->is_hidden()) {
-      if (!CDSConfig::is_dumping_invokedynamic()) {
+      if (!CDSConfig::is_dumping_method_handles()) {
         assert(is_registered_lambda_proxy_class(k), "unexpected hidden class %s", name);
       }
     }
diff --git a/src/hotspot/share/oops/constantPool.cpp b/src/hotspot/share/oops/constantPool.cpp
index ee53e43c327..23e1bc14d38 100644
--- a/src/hotspot/share/oops/constantPool.cpp
+++ b/src/hotspot/share/oops/constantPool.cpp
@@ -288,7 +288,7 @@ void ConstantPool::klass_at_put(int class_index, Klass* k) {
 template <typename Function>
 void ConstantPool::iterate_archivable_resolved_references(Function function) {
   objArrayOop rr = resolved_references();
-  if (rr != nullptr && cache() != nullptr && CDSConfig::is_dumping_invokedynamic()) {
+  if (rr != nullptr && cache() != nullptr && CDSConfig::is_dumping_method_handles()) {
     Array<ResolvedIndyEntry>* indy_entries = cache()->resolved_indy_entries();
     if (indy_entries != nullptr) {
       for (int i = 0; i < indy_entries->length(); i++) {
diff --git a/src/hotspot/share/oops/cpCache.cpp b/src/hotspot/share/oops/cpCache.cpp
index f4c53c0089e..a354e0b07a6 100644
--- a/src/hotspot/share/oops/cpCache.cpp
+++ b/src/hotspot/share/oops/cpCache.cpp
@@ -572,7 +572,7 @@ bool ConstantPoolCache::can_archive_resolved_method(ConstantPool* src_cp, Resolv
       method_entry->is_resolved(Bytecodes::_invokespecial)) {
     return true;
   } else if (method_entry->is_resolved(Bytecodes::_invokehandle)) {
-    if (CDSConfig::is_dumping_invokedynamic()) {
+    if (CDSConfig::is_dumping_method_handles()) {
       // invokehandle depends on archived MethodType and LambdaForms.
       return true;
     } else {
diff --git a/test/hotspot/jtreg/runtime/cds/appcds/aotClassLinking/AOTClassLinkingVMOptions.java b/test/hotspot/jtreg/runtime/cds/appcds/aotClassLinking/AOTClassLinkingVMOptions.java
index 0d75d16d2b0..af5c619d767 100644
--- a/test/hotspot/jtreg/runtime/cds/appcds/aotClassLinking/AOTClassLinkingVMOptions.java
+++ b/test/hotspot/jtreg/runtime/cds/appcds/aotClassLinking/AOTClassLinkingVMOptions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2024, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -80,6 +80,15 @@ public class AOTClassLinkingVMOptions {
             .assertAbnormalExit("CDS archive has aot-linked classes." +
                                 " It cannot be used with -Djava.security.manager=default.");
 
+        // Dumping with AOTInvokeDynamicLinking disabled
+        TestCommon.testDump(appJar, TestCommon.list("Hello"),
+                            "-XX:+AOTClassLinking", "-XX:-AOTInvokeDynamicLinking");
+
+        testCase("Archived full module graph must be enabled at runtime (with -XX:-AOTInvokeDynamicLinking)");
+        TestCommon.run("-cp", appJar, "-Djdk.module.validation=1", "Hello")
+            .assertAbnormalExit("CDS archive has aot-linked classes." +
+                                " It cannot be used when archived full module graph is not used");
+
         // NOTE: tests for ClassFileLoadHook + AOTClassLinking is in
         // ../jvmti/ClassFileLoadHookTest.java
 

From 768b02410f1b53ac95d6014f152be84c89eb33ab Mon Sep 17 00:00:00 2001
From: Vladimir Ivanov <vaivanov@openjdk.org>
Date: Mon, 3 Mar 2025 21:05:19 +0000
Subject: [PATCH 202/587] 8350682: [JMH] vector.IndexInRangeBenchmark failed
 with IndexOutOfBoundsException for size=1024

Reviewed-by: xgong, drwhite, sviswanathan
---
 .../bench/jdk/incubator/vector/IndexInRangeBenchmark.java       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/micro/org/openjdk/bench/jdk/incubator/vector/IndexInRangeBenchmark.java b/test/micro/org/openjdk/bench/jdk/incubator/vector/IndexInRangeBenchmark.java
index 1875ea00feb..6a068bc4346 100644
--- a/test/micro/org/openjdk/bench/jdk/incubator/vector/IndexInRangeBenchmark.java
+++ b/test/micro/org/openjdk/bench/jdk/incubator/vector/IndexInRangeBenchmark.java
@@ -48,7 +48,7 @@ public class IndexInRangeBenchmark {
 
     @Setup(Level.Trial)
     public void Setup() {
-        mask = new boolean[512];
+        mask = new boolean[size + 64];
     }
 
     @Benchmark

From 99fb350bf65f9469c8097ddebcc6742255435a88 Mon Sep 17 00:00:00 2001
From: Brian Burkhalter <bpb@openjdk.org>
Date: Mon, 3 Mar 2025 21:25:11 +0000
Subject: [PATCH 203/587] 8350654: (fs) Files.createTempDirectory should say
 something about the default file permissions when no file attributes
 specified

Reviewed-by: alanb
---
 src/java.base/share/classes/java/nio/file/Files.java | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

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 17d6eebbcb8..44a0a8e164c 100644
--- a/src/java.base/share/classes/java/nio/file/Files.java
+++ b/src/java.base/share/classes/java/nio/file/Files.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -860,7 +860,10 @@ public final class Files {
      * file-attributes} to set atomically when creating the directory. Each
      * attribute is identified by its {@link FileAttribute#name name}. If more
      * than one attribute of the same name is included in the array then all but
-     * the last occurrence is ignored.
+     * the last occurrence is ignored. When no file attributes are specified,
+     * then the resulting directory may have more restrictive access
+     * permissions to directories created by the
+     * {@linkplain Files#createDirectory(Path, FileAttribute<?>...)} method.
      *
      * @param   dir
      *          the path to directory in which to create the directory

From 3a8a432c05999fe478b94de75b416404b5a515d2 Mon Sep 17 00:00:00 2001
From: William Kemper <wkemper@openjdk.org>
Date: Tue, 4 Mar 2025 00:41:39 +0000
Subject: [PATCH 204/587] 8349094: GenShen: Race between control and regulator
 threads may violate assertions

Reviewed-by: ysr, kdnilsen
---
 src/hotspot/share/gc/shared/gcCause.hpp       |   1 +
 .../heuristics/shenandoahOldHeuristics.cpp    |  42 +-
 .../heuristics/shenandoahOldHeuristics.hpp    |   4 +-
 .../gc/shenandoah/shenandoahBarrierSet.cpp    |   2 +-
 .../shenandoah/shenandoahCollectorPolicy.cpp  |  29 +-
 .../shenandoah/shenandoahCollectorPolicy.hpp  |  11 +-
 .../gc/shenandoah/shenandoahControlThread.cpp |  35 +-
 .../gc/shenandoah/shenandoahController.cpp    |  59 +-
 .../gc/shenandoah/shenandoahController.hpp    |  33 +-
 .../shenandoahGenerationalControlThread.cpp   | 910 +++++++++---------
 .../shenandoahGenerationalControlThread.hpp   | 107 +-
 .../share/gc/shenandoah/shenandoahHeap.cpp    |  38 +-
 .../share/gc/shenandoah/shenandoahHeap.hpp    |  34 +-
 .../gc/shenandoah/shenandoahHeap.inline.hpp   |   8 +-
 .../gc/shenandoah/shenandoahOldGeneration.cpp |   2 +-
 .../shenandoah/shenandoahRegulatorThread.cpp  |  31 +-
 .../shenandoah/shenandoahRegulatorThread.hpp  |  15 +-
 .../shenandoah/shenandoahScanRemembered.cpp   |   4 +-
 18 files changed, 699 insertions(+), 666 deletions(-)

diff --git a/src/hotspot/share/gc/shared/gcCause.hpp b/src/hotspot/share/gc/shared/gcCause.hpp
index bd819e8f5c9..ef96bf21567 100644
--- a/src/hotspot/share/gc/shared/gcCause.hpp
+++ b/src/hotspot/share/gc/shared/gcCause.hpp
@@ -74,6 +74,7 @@ class GCCause : public AllStatic {
 
     _shenandoah_stop_vm,
     _shenandoah_allocation_failure_evac,
+    _shenandoah_humongous_allocation_failure,
     _shenandoah_concurrent_gc,
     _shenandoah_upgrade_to_full_gc,
 
diff --git a/src/hotspot/share/gc/shenandoah/heuristics/shenandoahOldHeuristics.cpp b/src/hotspot/share/gc/shenandoah/heuristics/shenandoahOldHeuristics.cpp
index 0393a2bb366..cf1a76ff4ff 100644
--- a/src/hotspot/share/gc/shenandoah/heuristics/shenandoahOldHeuristics.cpp
+++ b/src/hotspot/share/gc/shenandoah/heuristics/shenandoahOldHeuristics.cpp
@@ -60,7 +60,6 @@ int ShenandoahOldHeuristics::compare_by_index(RegionData a, RegionData b) {
 ShenandoahOldHeuristics::ShenandoahOldHeuristics(ShenandoahOldGeneration* generation, ShenandoahGenerationalHeap* gen_heap) :
   ShenandoahHeuristics(generation),
   _heap(gen_heap),
-  _old_gen(generation),
   _first_pinned_candidate(NOT_FOUND),
   _last_old_collection_candidate(0),
   _next_old_collection_candidate(0),
@@ -567,9 +566,9 @@ void ShenandoahOldHeuristics::set_trigger_if_old_is_fragmented(size_t first_old_
     // allocation request will require a STW full GC.
     size_t allowed_old_gen_span = num_regions - (ShenandoahGenerationalHumongousReserve * num_regions) / 100;
 
-    size_t old_available = _old_gen->available() / HeapWordSize;
+    size_t old_available = _old_generation->available() / HeapWordSize;
     size_t region_size_words = ShenandoahHeapRegion::region_size_words();
-    size_t old_unaffiliated_available = _old_gen->free_unaffiliated_regions() * region_size_words;
+    size_t old_unaffiliated_available = _old_generation->free_unaffiliated_regions() * region_size_words;
     assert(old_available >= old_unaffiliated_available, "sanity");
     size_t old_fragmented_available = old_available - old_unaffiliated_available;
 
@@ -603,12 +602,12 @@ void ShenandoahOldHeuristics::set_trigger_if_old_is_fragmented(size_t first_old_
 }
 
 void ShenandoahOldHeuristics::set_trigger_if_old_is_overgrown() {
-  size_t old_used = _old_gen->used() + _old_gen->get_humongous_waste();
-  size_t trigger_threshold = _old_gen->usage_trigger_threshold();
+  size_t old_used = _old_generation->used() + _old_generation->get_humongous_waste();
+  size_t trigger_threshold = _old_generation->usage_trigger_threshold();
   // Detects unsigned arithmetic underflow
   assert(old_used <= _heap->capacity(),
          "Old used (%zu, %zu) must not be more than heap capacity (%zu)",
-         _old_gen->used(), _old_gen->get_humongous_waste(), _heap->capacity());
+         _old_generation->used(), _old_generation->get_humongous_waste(), _heap->capacity());
   if (old_used > trigger_threshold) {
     _growth_trigger = true;
   }
@@ -620,13 +619,32 @@ void ShenandoahOldHeuristics::evaluate_triggers(size_t first_old_region, size_t
   set_trigger_if_old_is_overgrown();
 }
 
+bool ShenandoahOldHeuristics::should_resume_old_cycle() {
+  // If we are preparing to mark old, or if we are already marking old, then try to continue that work.
+  if (_old_generation->is_concurrent_mark_in_progress()) {
+    assert(_old_generation->state() == ShenandoahOldGeneration::MARKING, "Unexpected old gen state: %s", _old_generation->state_name());
+    log_trigger("Resume marking old");
+    return true;
+  }
+
+  if (_old_generation->is_preparing_for_mark()) {
+    assert(_old_generation->state() == ShenandoahOldGeneration::FILLING, "Unexpected old gen state: %s", _old_generation->state_name());
+    log_trigger("Resume preparing to mark old");
+    return true;
+  }
+
+  return false;
+}
+
 bool ShenandoahOldHeuristics::should_start_gc() {
-  // Cannot start a new old-gen GC until previous one has finished.
-  //
-  // Future refinement: under certain circumstances, we might be more sophisticated about this choice.
-  // For example, we could choose to abandon the previous old collection before it has completed evacuations.
-  ShenandoahHeap* heap = ShenandoahHeap::heap();
-  if (!_old_generation->can_start_gc() || heap->collection_set()->has_old_regions()) {
+
+  const ShenandoahHeap* heap = ShenandoahHeap::heap();
+  if (_old_generation->is_doing_mixed_evacuations()) {
+    // Do not try to start an old cycle if we are waiting for old regions to be evacuated (we need
+    // a young cycle for this). Note that the young heuristic has a feature to expedite old evacuations.
+    // Future refinement: under certain circumstances, we might be more sophisticated about this choice.
+    // For example, we could choose to abandon the previous old collection before it has completed evacuations.
+    log_debug(gc)("Not starting an old cycle because we are waiting for mixed evacuations");
     return false;
   }
 
diff --git a/src/hotspot/share/gc/shenandoah/heuristics/shenandoahOldHeuristics.hpp b/src/hotspot/share/gc/shenandoah/heuristics/shenandoahOldHeuristics.hpp
index d77380926b6..8d3fec746ba 100644
--- a/src/hotspot/share/gc/shenandoah/heuristics/shenandoahOldHeuristics.hpp
+++ b/src/hotspot/share/gc/shenandoah/heuristics/shenandoahOldHeuristics.hpp
@@ -53,7 +53,6 @@ private:
   static uint NOT_FOUND;
 
   ShenandoahGenerationalHeap* _heap;
-  ShenandoahOldGeneration* _old_gen;
 
   // After final marking of the old generation, this heuristic will select
   // a set of candidate regions to be included in subsequent mixed collections.
@@ -186,6 +185,9 @@ public:
 
   bool should_start_gc() override;
 
+  // Returns true if the old generation needs to prepare for marking, or continue marking.
+  bool should_resume_old_cycle();
+
   void record_success_concurrent() override;
 
   void record_success_degenerated() override;
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahBarrierSet.cpp b/src/hotspot/share/gc/shenandoah/shenandoahBarrierSet.cpp
index 37470067ed9..17a89f631c6 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahBarrierSet.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahBarrierSet.cpp
@@ -90,7 +90,7 @@ bool ShenandoahBarrierSet::need_keep_alive_barrier(DecoratorSet decorators, Basi
 void ShenandoahBarrierSet::on_slowpath_allocation_exit(JavaThread* thread, oop new_obj) {
 #if COMPILER2_OR_JVMCI
   assert(!ReduceInitialCardMarks || !ShenandoahCardBarrier || ShenandoahGenerationalHeap::heap()->is_in_young(new_obj),
-         "Error: losing card mark on initialzing store to old gen");
+         "Allocating new object outside of young generation: " INTPTR_FORMAT, p2i(new_obj));
 #endif // COMPILER2_OR_JVMCI
   assert(thread->deferred_card_mark().is_empty(), "We don't use this");
 }
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahCollectorPolicy.cpp b/src/hotspot/share/gc/shenandoah/shenandoahCollectorPolicy.cpp
index 782db285c2a..0169795d6f6 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahCollectorPolicy.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahCollectorPolicy.cpp
@@ -123,25 +123,28 @@ void ShenandoahCollectorPolicy::record_shutdown() {
   _in_shutdown.set();
 }
 
-bool ShenandoahCollectorPolicy::is_at_shutdown() {
+bool ShenandoahCollectorPolicy::is_at_shutdown() const {
   return _in_shutdown.is_set();
 }
 
-bool is_explicit_gc(GCCause::Cause cause) {
+bool ShenandoahCollectorPolicy::is_explicit_gc(GCCause::Cause cause) {
   return GCCause::is_user_requested_gc(cause)
-      || GCCause::is_serviceability_requested_gc(cause);
+      || GCCause::is_serviceability_requested_gc(cause)
+      || cause == GCCause::_wb_full_gc
+      || cause == GCCause::_wb_young_gc;
 }
 
 bool is_implicit_gc(GCCause::Cause cause) {
   return cause != GCCause::_no_gc
       && cause != GCCause::_shenandoah_concurrent_gc
       && cause != GCCause::_allocation_failure
-      && !is_explicit_gc(cause);
+      && !ShenandoahCollectorPolicy::is_explicit_gc(cause);
 }
 
 #ifdef ASSERT
 bool is_valid_request(GCCause::Cause cause) {
-  return is_explicit_gc(cause)
+  return ShenandoahCollectorPolicy::is_explicit_gc(cause)
+      || ShenandoahCollectorPolicy::is_shenandoah_gc(cause)
       || cause == GCCause::_metadata_GC_clear_soft_refs
       || cause == GCCause::_codecache_GC_aggressive
       || cause == GCCause::_codecache_GC_threshold
@@ -153,6 +156,22 @@ bool is_valid_request(GCCause::Cause cause) {
 }
 #endif
 
+bool ShenandoahCollectorPolicy::is_shenandoah_gc(GCCause::Cause cause) {
+  return cause == GCCause::_allocation_failure
+      || cause == GCCause::_shenandoah_stop_vm
+      || cause == GCCause::_shenandoah_allocation_failure_evac
+      || cause == GCCause::_shenandoah_humongous_allocation_failure
+      || cause == GCCause::_shenandoah_concurrent_gc
+      || cause == GCCause::_shenandoah_upgrade_to_full_gc;
+}
+
+
+bool ShenandoahCollectorPolicy::is_allocation_failure(GCCause::Cause cause) {
+  return cause == GCCause::_allocation_failure
+      || cause == GCCause::_shenandoah_allocation_failure_evac
+      || cause == GCCause::_shenandoah_humongous_allocation_failure;
+}
+
 bool ShenandoahCollectorPolicy::is_requested_gc(GCCause::Cause cause) {
   return is_explicit_gc(cause) || is_implicit_gc(cause);
 }
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahCollectorPolicy.hpp b/src/hotspot/share/gc/shenandoah/shenandoahCollectorPolicy.hpp
index 2c92d91ac99..68579508de5 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahCollectorPolicy.hpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahCollectorPolicy.hpp
@@ -77,9 +77,9 @@ public:
   void record_collection_cause(GCCause::Cause cause);
 
   void record_shutdown();
-  bool is_at_shutdown();
+  bool is_at_shutdown() const;
 
-  ShenandoahTracer* tracer() {return _tracer;}
+  ShenandoahTracer* tracer() const {return _tracer;}
 
   void print_gc_stats(outputStream* out) const;
 
@@ -90,15 +90,18 @@ public:
   // If the heuristics find that the number of consecutive degenerated cycles is above
   // ShenandoahFullGCThreshold, then they will initiate a Full GC upon an allocation
   // failure.
-  inline size_t consecutive_degenerated_gc_count() const {
+  size_t consecutive_degenerated_gc_count() const {
     return _consecutive_degenerated_gcs;
   }
 
+  static bool is_allocation_failure(GCCause::Cause cause);
+  static bool is_shenandoah_gc(GCCause::Cause cause);
   static bool is_requested_gc(GCCause::Cause cause);
+  static bool is_explicit_gc(GCCause::Cause cause);
   static bool should_run_full_gc(GCCause::Cause cause);
   static bool should_handle_requested_gc(GCCause::Cause cause);
 
-  inline size_t consecutive_young_gc_count() const {
+  size_t consecutive_young_gc_count() const {
     return _consecutive_young_gcs;
   }
 
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahControlThread.cpp b/src/hotspot/share/gc/shenandoah/shenandoahControlThread.cpp
index 1ddfb6b7054..4848a69a6f3 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahControlThread.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahControlThread.cpp
@@ -50,7 +50,6 @@ ShenandoahControlThread::ShenandoahControlThread() :
 
 void ShenandoahControlThread::run_service() {
   ShenandoahHeap* const heap = ShenandoahHeap::heap();
-
   const GCMode default_mode = concurrent_normal;
   const GCCause::Cause default_cause = GCCause::_shenandoah_concurrent_gc;
   int sleep = ShenandoahControlIntervalMin;
@@ -59,9 +58,14 @@ void ShenandoahControlThread::run_service() {
 
   ShenandoahCollectorPolicy* const policy = heap->shenandoah_policy();
   ShenandoahHeuristics* const heuristics = heap->heuristics();
-  while (!in_graceful_shutdown() && !should_terminate()) {
+  while (!should_terminate()) {
+    const GCCause::Cause cancelled_cause = heap->cancelled_cause();
+    if (cancelled_cause == GCCause::_shenandoah_stop_vm) {
+      break;
+    }
+
     // Figure out if we have pending requests.
-    const bool alloc_failure_pending = _alloc_failure_gc.is_set();
+    const bool alloc_failure_pending = ShenandoahCollectorPolicy::is_allocation_failure(cancelled_cause);
     const bool is_gc_requested = _gc_requested.is_set();
     const GCCause::Cause requested_gc_cause = _requested_gc_cause;
 
@@ -254,11 +258,6 @@ void ShenandoahControlThread::run_service() {
     }
     os::naked_short_sleep(sleep);
   }
-
-  // Wait for the actual stop(), can't leave run_service() earlier.
-  while (!should_terminate()) {
-    os::naked_short_sleep(ShenandoahControlIntervalMin);
-  }
 }
 
 void ShenandoahControlThread::service_concurrent_normal_cycle(GCCause::Cause cause) {
@@ -322,19 +321,24 @@ void ShenandoahControlThread::service_concurrent_normal_cycle(GCCause::Cause cau
 bool ShenandoahControlThread::check_cancellation_or_degen(ShenandoahGC::ShenandoahDegenPoint point) {
   ShenandoahHeap* heap = ShenandoahHeap::heap();
   if (heap->cancelled_gc()) {
-    assert (is_alloc_failure_gc() || in_graceful_shutdown(), "Cancel GC either for alloc failure GC, or gracefully exiting");
-    if (!in_graceful_shutdown()) {
+    if (heap->cancelled_cause() == GCCause::_shenandoah_stop_vm) {
+      return true;
+    }
+
+    if (ShenandoahCollectorPolicy::is_allocation_failure(heap->cancelled_cause())) {
       assert (_degen_point == ShenandoahGC::_degenerated_outside_cycle,
               "Should not be set yet: %s", ShenandoahGC::degen_point_to_string(_degen_point));
       _degen_point = point;
+      return true;
     }
-    return true;
+
+    fatal("Unexpected reason for cancellation: %s", GCCause::to_string(heap->cancelled_cause()));
   }
   return false;
 }
 
 void ShenandoahControlThread::stop_service() {
-  // Nothing to do here.
+  ShenandoahHeap::heap()->cancel_gc(GCCause::_shenandoah_stop_vm);
 }
 
 void ShenandoahControlThread::service_stw_full_cycle(GCCause::Cause cause) {
@@ -363,6 +367,11 @@ void ShenandoahControlThread::request_gc(GCCause::Cause cause) {
 }
 
 void ShenandoahControlThread::handle_requested_gc(GCCause::Cause cause) {
+  if (should_terminate()) {
+    log_info(gc)("Control thread is terminating, no more GCs");
+    return;
+  }
+
   // For normal requested GCs (System.gc) we want to block the caller. However,
   // for whitebox requested GC, we want to initiate the GC and return immediately.
   // The whitebox caller thread will arrange for itself to wait until the GC notifies
@@ -385,7 +394,7 @@ void ShenandoahControlThread::handle_requested_gc(GCCause::Cause cause) {
   MonitorLocker ml(&_gc_waiters_lock);
   size_t current_gc_id = get_gc_id();
   size_t required_gc_id = current_gc_id + 1;
-  while (current_gc_id < required_gc_id) {
+  while (current_gc_id < required_gc_id && !should_terminate()) {
     // Although setting gc request is under _gc_waiters_lock, but read side (run_service())
     // does not take the lock. We need to enforce following order, so that read side sees
     // latest requested gc cause when the flag is set.
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahController.cpp b/src/hotspot/share/gc/shenandoah/shenandoahController.cpp
index a4d5a572349..c430981bfe6 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahController.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahController.cpp
@@ -25,6 +25,8 @@
 
 #include "gc/shared/gc_globals.hpp"
 #include "gc/shenandoah/shenandoahController.hpp"
+
+#include "shenandoahCollectorPolicy.hpp"
 #include "gc/shenandoah/shenandoahHeap.hpp"
 #include "gc/shenandoah/shenandoahHeapRegion.inline.hpp"
 
@@ -37,14 +39,6 @@ size_t ShenandoahController::reset_allocs_seen() {
   return Atomic::xchg(&_allocs_seen, (size_t)0, memory_order_relaxed);
 }
 
-void ShenandoahController::prepare_for_graceful_shutdown() {
-  _graceful_shutdown.set();
-}
-
-bool ShenandoahController::in_graceful_shutdown() {
-  return _graceful_shutdown.is_set();
-}
-
 void ShenandoahController::update_gc_id() {
   Atomic::inc(&_gc_id);
 }
@@ -53,59 +47,38 @@ size_t ShenandoahController::get_gc_id() {
   return Atomic::load(&_gc_id);
 }
 
-void ShenandoahController::handle_alloc_failure(ShenandoahAllocRequest& req, bool block) {
-  ShenandoahHeap* heap = ShenandoahHeap::heap();
-
+void ShenandoahController::handle_alloc_failure(const ShenandoahAllocRequest& req, bool block) {
   assert(current()->is_Java_thread(), "expect Java thread here");
-  bool is_humongous = ShenandoahHeapRegion::requires_humongous(req.size());
 
-  if (try_set_alloc_failure_gc(is_humongous)) {
-    // Only report the first allocation failure
-    log_info(gc)("Failed to allocate %s, %zu%s",
-                 req.type_string(),
-                 byte_size_in_proper_unit(req.size() * HeapWordSize), proper_unit_for_byte_size(req.size() * HeapWordSize));
+  const bool is_humongous = ShenandoahHeapRegion::requires_humongous(req.size());
+  const GCCause::Cause cause = is_humongous ? GCCause::_shenandoah_humongous_allocation_failure : GCCause::_allocation_failure;
 
-    // Now that alloc failure GC is scheduled, we can abort everything else
-    heap->cancel_gc(GCCause::_allocation_failure);
+  ShenandoahHeap* const heap = ShenandoahHeap::heap();
+  if (heap->cancel_gc(cause)) {
+    log_info(gc)("Failed to allocate %s, " PROPERFMT, req.type_string(), PROPERFMTARGS(req.size() * HeapWordSize));
+    request_gc(cause);
   }
 
-
   if (block) {
     MonitorLocker ml(&_alloc_failure_waiters_lock);
-    while (is_alloc_failure_gc()) {
+    while (!should_terminate() && ShenandoahCollectorPolicy::is_allocation_failure(heap->cancelled_cause())) {
       ml.wait();
     }
   }
 }
 
 void ShenandoahController::handle_alloc_failure_evac(size_t words) {
-  ShenandoahHeap* heap = ShenandoahHeap::heap();
-  bool is_humongous = ShenandoahHeapRegion::requires_humongous(words);
 
-  if (try_set_alloc_failure_gc(is_humongous)) {
-    // Only report the first allocation failure
-    log_info(gc)("Failed to allocate %zu%s for evacuation",
-                 byte_size_in_proper_unit(words * HeapWordSize), proper_unit_for_byte_size(words * HeapWordSize));
+  ShenandoahHeap* const heap = ShenandoahHeap::heap();
+  const bool is_humongous = ShenandoahHeapRegion::requires_humongous(words);
+  const GCCause::Cause cause = is_humongous ? GCCause::_shenandoah_humongous_allocation_failure : GCCause::_shenandoah_allocation_failure_evac;
+
+  if (heap->cancel_gc(cause)) {
+    log_info(gc)("Failed to allocate " PROPERFMT " for evacuation", PROPERFMTARGS(words * HeapWordSize));
   }
-
-  // Forcefully report allocation failure
-  heap->cancel_gc(GCCause::_shenandoah_allocation_failure_evac);
 }
 
 void ShenandoahController::notify_alloc_failure_waiters() {
-  _alloc_failure_gc.unset();
-  _humongous_alloc_failure_gc.unset();
   MonitorLocker ml(&_alloc_failure_waiters_lock);
   ml.notify_all();
 }
-
-bool ShenandoahController::try_set_alloc_failure_gc(bool is_humongous) {
-  if (is_humongous) {
-    _humongous_alloc_failure_gc.try_set();
-  }
-  return _alloc_failure_gc.try_set();
-}
-
-bool ShenandoahController::is_alloc_failure_gc() {
-  return _alloc_failure_gc.is_set();
-}
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahController.hpp b/src/hotspot/share/gc/shenandoah/shenandoahController.hpp
index 6c28ff4e969..83cde94f509 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahController.hpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahController.hpp
@@ -36,27 +36,25 @@
  */
 class ShenandoahController: public ConcurrentGCThread {
 private:
-  ShenandoahSharedFlag _graceful_shutdown;
-
   shenandoah_padding(0);
   volatile size_t _allocs_seen;
   shenandoah_padding(1);
+  // A monotonically increasing GC count.
   volatile size_t _gc_id;
   shenandoah_padding(2);
 
 protected:
-  ShenandoahSharedFlag _alloc_failure_gc;
-  ShenandoahSharedFlag _humongous_alloc_failure_gc;
-
   // While we could have a single lock for these, it may risk unblocking
   // GC waiters when alloc failure GC cycle finishes. We want instead
   // to make complete explicit cycle for demanding customers.
   Monitor _alloc_failure_waiters_lock;
   Monitor _gc_waiters_lock;
 
+  // Increments the internal GC count.
+  void update_gc_id();
+
 public:
   ShenandoahController():
-    ConcurrentGCThread(),
     _allocs_seen(0),
     _gc_id(0),
     _alloc_failure_waiters_lock(Mutex::safepoint-2, "ShenandoahAllocFailureGC_lock", true),
@@ -68,38 +66,25 @@ public:
   virtual void request_gc(GCCause::Cause cause) = 0;
 
   // This cancels the collection cycle and has an option to block
-  // until another cycle runs and clears the alloc failure gc flag.
-  void handle_alloc_failure(ShenandoahAllocRequest& req, bool block);
+  // until another cycle completes successfully.
+  void handle_alloc_failure(const ShenandoahAllocRequest& req, bool block);
 
   // Invoked for allocation failures during evacuation. This cancels
   // the collection cycle without blocking.
   void handle_alloc_failure_evac(size_t words);
 
-  // Return true if setting the flag which indicates allocation failure succeeds.
-  bool try_set_alloc_failure_gc(bool is_humongous);
-
   // Notify threads waiting for GC to complete.
   void notify_alloc_failure_waiters();
 
-  // True if allocation failure flag has been set.
-  bool is_alloc_failure_gc();
-
   // This is called for every allocation. The control thread accumulates
   // this value when idle. During the gc cycle, the control resets it
   // and reports it to the pacer.
   void pacing_notify_alloc(size_t words);
+
+  // Zeros out the number of allocations seen since the last GC cycle.
   size_t reset_allocs_seen();
 
-  // These essentially allows to cancel a collection cycle for the
-  // purpose of shutting down the JVM, without trying to start a degenerated
-  // cycle.
-  void prepare_for_graceful_shutdown();
-  bool in_graceful_shutdown();
-
-
-  // Returns the internal gc count used by the control thread. Probably
-  // doesn't need to be exposed.
+  // Return the value of a monotonic increasing GC count, maintained by the control thread.
   size_t get_gc_id();
-  void update_gc_id();
 };
 #endif // SHARE_GC_SHENANDOAH_SHENANDOAHCONTROLLER_HPP
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahGenerationalControlThread.cpp b/src/hotspot/share/gc/shenandoah/shenandoahGenerationalControlThread.cpp
index db4b517a1f5..cabe51edc51 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahGenerationalControlThread.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahGenerationalControlThread.cpp
@@ -24,7 +24,6 @@
  *
  */
 
-#include "gc/shenandoah/mode/shenandoahMode.hpp"
 #include "gc/shenandoah/shenandoahAsserts.hpp"
 #include "gc/shenandoah/shenandoahCollectorPolicy.hpp"
 #include "gc/shenandoah/shenandoahConcurrentGC.hpp"
@@ -45,294 +44,301 @@
 #include "memory/metaspaceUtils.hpp"
 #include "memory/metaspaceStats.hpp"
 #include "runtime/atomic.hpp"
+#include "utilities/events.hpp"
 
 ShenandoahGenerationalControlThread::ShenandoahGenerationalControlThread() :
-  ShenandoahController(),
-  _control_lock(Mutex::nosafepoint - 2, "ShenandoahControlGC_lock", true),
-  _regulator_lock(Mutex::nosafepoint - 2, "ShenandoahRegulatorGC_lock", true),
+  _control_lock(Mutex::nosafepoint - 2, "ShenandoahGCRequest_lock", true),
   _requested_gc_cause(GCCause::_no_gc),
-  _requested_generation(GLOBAL),
-  _degen_point(ShenandoahGC::_degenerated_outside_cycle),
-  _degen_generation(nullptr),
-  _mode(none) {
+  _requested_generation(nullptr),
+  _gc_mode(none),
+  _degen_point(ShenandoahGC::_degenerated_unset),
+  _heap(ShenandoahGenerationalHeap::heap()),
+  _age_period(0) {
   shenandoah_assert_generational();
   set_name("Shenandoah Control Thread");
   create_and_start();
 }
 
 void ShenandoahGenerationalControlThread::run_service() {
-  ShenandoahGenerationalHeap* const heap = ShenandoahGenerationalHeap::heap();
 
-  const GCMode default_mode = concurrent_normal;
-  ShenandoahGenerationType generation = GLOBAL;
-
-  uint age_period = 0;
-
-  ShenandoahCollectorPolicy* const policy = heap->shenandoah_policy();
-
-  // Heuristics are notified of allocation failures here and other outcomes
-  // of the cycle. They're also used here to control whether the Nth consecutive
-  // degenerated cycle should be 'promoted' to a full cycle. The decision to
-  // trigger a cycle or not is evaluated on the regulator thread.
-  ShenandoahHeuristics* global_heuristics = heap->global_generation()->heuristics();
-  while (!in_graceful_shutdown() && !should_terminate()) {
-    // Figure out if we have pending requests.
-    const bool alloc_failure_pending = _alloc_failure_gc.is_set();
-    const bool humongous_alloc_failure_pending = _humongous_alloc_failure_gc.is_set();
-
-    GCCause::Cause cause = Atomic::xchg(&_requested_gc_cause, GCCause::_no_gc);
-
-    const bool is_gc_requested = ShenandoahCollectorPolicy::is_requested_gc(cause);
+  const int64_t wait_ms = ShenandoahPacing ? ShenandoahControlIntervalMin : 0;
+  ShenandoahGCRequest request;
+  while (!should_terminate()) {
 
     // This control loop iteration has seen this much allocation.
     const size_t allocs_seen = reset_allocs_seen();
 
-    // Check if we have seen a new target for soft max heap size.
-    const bool soft_max_changed = heap->check_soft_max_changed();
+    // Figure out if we have pending requests.
+    check_for_request(request);
 
-    // Choose which GC mode to run in. The block below should select a single mode.
-    set_gc_mode(none);
-    ShenandoahGC::ShenandoahDegenPoint degen_point = ShenandoahGC::_degenerated_unset;
-
-    if (alloc_failure_pending) {
-      // Allocation failure takes precedence: we have to deal with it first thing
-      cause = GCCause::_allocation_failure;
-
-      // Consume the degen point, and seed it with default value
-      degen_point = _degen_point;
-      _degen_point = ShenandoahGC::_degenerated_outside_cycle;
-
-      if (degen_point == ShenandoahGC::_degenerated_outside_cycle) {
-        _degen_generation = heap->young_generation();
-      } else {
-        assert(_degen_generation != nullptr, "Need to know which generation to resume");
-      }
-
-      ShenandoahHeuristics* heuristics = _degen_generation->heuristics();
-      generation = _degen_generation->type();
-      bool old_gen_evacuation_failed = heap->old_generation()->clear_failed_evacuation();
-
-      heuristics->log_trigger("Handle Allocation Failure");
-
-      // Do not bother with degenerated cycle if old generation evacuation failed or if humongous allocation failed
-      if (ShenandoahDegeneratedGC && heuristics->should_degenerate_cycle() &&
-          !old_gen_evacuation_failed && !humongous_alloc_failure_pending) {
-        heuristics->record_allocation_failure_gc();
-        policy->record_alloc_failure_to_degenerated(degen_point);
-        set_gc_mode(stw_degenerated);
-      } else {
-        heuristics->record_allocation_failure_gc();
-        policy->record_alloc_failure_to_full();
-        generation = GLOBAL;
-        set_gc_mode(stw_full);
-      }
-    } else if (is_gc_requested) {
-      generation = GLOBAL;
-      global_heuristics->log_trigger("GC request (%s)", GCCause::to_string(cause));
-      global_heuristics->record_requested_gc();
-
-      if (ShenandoahCollectorPolicy::should_run_full_gc(cause)) {
-        set_gc_mode(stw_full);
-      } else {
-        set_gc_mode(default_mode);
-        // Unload and clean up everything
-        heap->set_unload_classes(global_heuristics->can_unload_classes());
-      }
-    } else {
-      // We should only be here if the regulator requested a cycle or if
-      // there is an old generation mark in progress.
-      if (cause == GCCause::_shenandoah_concurrent_gc) {
-        if (_requested_generation == OLD && heap->old_generation()->is_doing_mixed_evacuations()) {
-          // If a request to start an old cycle arrived while an old cycle was running, but _before_
-          // it chose any regions for evacuation we don't want to start a new old cycle. Rather, we want
-          // the heuristic to run a young collection so that we can evacuate some old regions.
-          assert(!heap->is_concurrent_old_mark_in_progress(), "Should not be running mixed collections and concurrent marking");
-          generation = YOUNG;
-        } else {
-          generation = _requested_generation;
-        }
-
-        // preemption was requested or this is a regular cycle
-        set_gc_mode(default_mode);
-
-        // Don't start a new old marking if there is one already in progress
-        if (generation == OLD && heap->is_concurrent_old_mark_in_progress()) {
-          set_gc_mode(servicing_old);
-        }
-
-        if (generation == GLOBAL) {
-          heap->set_unload_classes(global_heuristics->should_unload_classes());
-        } else {
-          heap->set_unload_classes(false);
-        }
-      } else if (heap->is_concurrent_old_mark_in_progress() || heap->is_prepare_for_old_mark_in_progress()) {
-        // Nobody asked us to do anything, but we have an old-generation mark or old-generation preparation for
-        // mixed evacuation in progress, so resume working on that.
-        log_info(gc)("Resume old GC: marking is%s in progress, preparing is%s in progress",
-                     heap->is_concurrent_old_mark_in_progress() ? "" : " NOT",
-                     heap->is_prepare_for_old_mark_in_progress() ? "" : " NOT");
-
-        cause = GCCause::_shenandoah_concurrent_gc;
-        generation = OLD;
-        set_gc_mode(servicing_old);
-        heap->set_unload_classes(false);
-      }
+    if (request.cause == GCCause::_shenandoah_stop_vm) {
+      break;
     }
 
-    const bool gc_requested = (gc_mode() != none);
-    assert (!gc_requested || cause != GCCause::_no_gc, "GC cause should be set");
-
-    if (gc_requested) {
-      // Cannot uncommit bitmap slices during concurrent reset
-      ShenandoahNoUncommitMark forbid_region_uncommit(heap);
-
-      // Blow away all soft references on this cycle, if handling allocation failure,
-      // either implicit or explicit GC request, or we are requested to do so unconditionally.
-      if (generation == GLOBAL && (alloc_failure_pending || is_gc_requested || ShenandoahAlwaysClearSoftRefs)) {
-        heap->soft_ref_policy()->set_should_clear_all_soft_refs(true);
-      }
-
-      // GC is starting, bump the internal ID
-      update_gc_id();
-
-      heap->reset_bytes_allocated_since_gc_start();
-
-      MetaspaceCombinedStats meta_sizes = MetaspaceUtils::get_combined_statistics();
-
-      // If GC was requested, we are sampling the counters even without actual triggers
-      // from allocation machinery. This captures GC phases more accurately.
-      heap->set_forced_counters_update(true);
-
-      // If GC was requested, we better dump freeset data for performance debugging
-      heap->free_set()->log_status_under_lock();
-
-      // In case this is a degenerated cycle, remember whether original cycle was aging.
-      const bool was_aging_cycle = heap->is_aging_cycle();
-      heap->set_aging_cycle(false);
-
-      switch (gc_mode()) {
-        case concurrent_normal: {
-          // At this point:
-          //  if (generation == YOUNG), this is a normal YOUNG cycle
-          //  if (generation == OLD), this is a bootstrap OLD cycle
-          //  if (generation == GLOBAL), this is a GLOBAL cycle triggered by System.gc()
-          // In all three cases, we want to age old objects if this is an aging cycle
-          if (age_period-- == 0) {
-             heap->set_aging_cycle(true);
-             age_period = ShenandoahAgingCyclePeriod - 1;
-          }
-          service_concurrent_normal_cycle(heap, generation, cause);
-          break;
-        }
-        case stw_degenerated: {
-          heap->set_aging_cycle(was_aging_cycle);
-          service_stw_degenerated_cycle(cause, degen_point);
-          break;
-        }
-        case stw_full: {
-          if (age_period-- == 0) {
-            heap->set_aging_cycle(true);
-            age_period = ShenandoahAgingCyclePeriod - 1;
-          }
-          service_stw_full_cycle(cause);
-          break;
-        }
-        case servicing_old: {
-          assert(generation == OLD, "Expected old generation here");
-          GCIdMark gc_id_mark;
-          service_concurrent_old_cycle(heap, cause);
-          break;
-        }
-        default:
-          ShouldNotReachHere();
-      }
-
-      // If this was the requested GC cycle, notify waiters about it
-      if (is_gc_requested) {
-        notify_gc_waiters();
-      }
-
-      // If this was the allocation failure GC cycle, notify waiters about it
-      if (alloc_failure_pending) {
-        notify_alloc_failure_waiters();
-      }
-
-      // Report current free set state at the end of cycle, whether
-      // it is a normal completion, or the abort.
-      heap->free_set()->log_status_under_lock();
-
-      // Notify Universe about new heap usage. This has implications for
-      // global soft refs policy, and we better report it every time heap
-      // usage goes down.
-      heap->update_capacity_and_used_at_gc();
-
-      // Signal that we have completed a visit to all live objects.
-      heap->record_whole_heap_examined_timestamp();
-
-      // Disable forced counters update, and update counters one more time
-      // to capture the state at the end of GC session.
-      heap->handle_force_counters_update();
-      heap->set_forced_counters_update(false);
-
-      // Retract forceful part of soft refs policy
-      heap->soft_ref_policy()->set_should_clear_all_soft_refs(false);
-
-      // Clear metaspace oom flag, if current cycle unloaded classes
-      if (heap->unload_classes()) {
-        global_heuristics->clear_metaspace_oom();
-      }
-
-      process_phase_timings(heap);
-
-      // Print Metaspace change following GC (if logging is enabled).
-      MetaspaceUtils::print_metaspace_change(meta_sizes);
-
-      // GC is over, we are at idle now
-      if (ShenandoahPacing) {
-        heap->pacer()->setup_for_idle();
-      }
+    if (request.cause != GCCause::_no_gc) {
+      run_gc_cycle(request);
     } else {
       // Report to pacer that we have seen this many words allocated
       if (ShenandoahPacing && (allocs_seen > 0)) {
-        heap->pacer()->report_alloc(allocs_seen);
+        _heap->pacer()->report_alloc(allocs_seen);
       }
     }
 
-    // Check if we have seen a new target for soft max heap size or if a gc was requested.
-    // Either of these conditions will attempt to uncommit regions.
-    if (ShenandoahUncommit) {
-      if (heap->check_soft_max_changed()) {
-        heap->notify_soft_max_changed();
-      } else if (is_gc_requested) {
-        heap->notify_explicit_gc_requested();
+    // If the cycle was cancelled, continue the next iteration to deal with it. Otherwise,
+    // if there was no other cycle requested, cleanup and wait for the next request.
+    if (!_heap->cancelled_gc()) {
+      MonitorLocker ml(&_control_lock, Mutex::_no_safepoint_check_flag);
+      if (_requested_gc_cause == GCCause::_no_gc) {
+        set_gc_mode(ml, none);
+        ml.wait(wait_ms);
       }
     }
-
-    // Wait for ShenandoahControlIntervalMax unless there was an allocation failure or another request was made mid-cycle.
-    if (!is_alloc_failure_gc() && _requested_gc_cause == GCCause::_no_gc) {
-      // The timed wait is necessary because this thread has a responsibility to send
-      // 'alloc_words' to the pacer when it does not perform a GC.
-      MonitorLocker lock(&_control_lock, Mutex::_no_safepoint_check_flag);
-      lock.wait(ShenandoahControlIntervalMax);
-    }
   }
 
+  // In case any threads are waiting for a cycle to happen, notify them so they observe the shutdown.
+  notify_gc_waiters();
+  notify_alloc_failure_waiters();
   set_gc_mode(stopped);
+}
 
-  // Wait for the actual stop(), can't leave run_service() earlier.
-  while (!should_terminate()) {
-    os::naked_short_sleep(ShenandoahControlIntervalMin);
+void ShenandoahGenerationalControlThread::stop_service() {
+  log_debug(gc, thread)("Stopping control thread");
+  MonitorLocker ml(&_control_lock, Mutex::_no_safepoint_check_flag);
+  _heap->cancel_gc(GCCause::_shenandoah_stop_vm);
+  _requested_gc_cause = GCCause::_shenandoah_stop_vm;
+  notify_cancellation(ml, GCCause::_shenandoah_stop_vm);
+  // We can't wait here because it may interfere with the active cycle's ability
+  // to reach a safepoint (this runs on a java thread).
+}
+
+void ShenandoahGenerationalControlThread::check_for_request(ShenandoahGCRequest& request) {
+  // Hold the lock while we read request cause and generation
+  MonitorLocker ml(&_control_lock, Mutex::_no_safepoint_check_flag);
+  if (_heap->cancelled_gc()) {
+    // The previous request was cancelled. Either it was cancelled for an allocation
+    // failure (degenerated cycle), or old marking was cancelled to run a young collection.
+    // In either case, the correct generation for the next cycle can be determined by
+    // the cancellation cause.
+    request.cause = _heap->cancelled_cause();
+    if (request.cause == GCCause::_shenandoah_concurrent_gc) {
+      request.generation = _heap->young_generation();
+      _heap->clear_cancelled_gc(false);
+    }
+  } else {
+    request.cause = _requested_gc_cause;
+    request.generation = _requested_generation;
+
+    // Only clear these if we made a request from them. In the case of a cancelled gc,
+    // we do not want to inadvertently lose this pending request.
+    _requested_gc_cause = GCCause::_no_gc;
+    _requested_generation = nullptr;
+  }
+
+  if (request.cause == GCCause::_no_gc || request.cause == GCCause::_shenandoah_stop_vm) {
+    return;
+  }
+
+  GCMode mode;
+  if (ShenandoahCollectorPolicy::is_allocation_failure(request.cause)) {
+    mode = prepare_for_allocation_failure_gc(request);
+  } else if (ShenandoahCollectorPolicy::is_explicit_gc(request.cause)) {
+    mode = prepare_for_explicit_gc(request);
+  } else {
+    mode = prepare_for_concurrent_gc(request);
+  }
+  set_gc_mode(ml, mode);
+}
+
+ShenandoahGenerationalControlThread::GCMode ShenandoahGenerationalControlThread::prepare_for_allocation_failure_gc(ShenandoahGCRequest &request) {
+
+  if (_degen_point == ShenandoahGC::_degenerated_unset) {
+    _degen_point = ShenandoahGC::_degenerated_outside_cycle;
+    request.generation = _heap->young_generation();
+  } else if (request.generation->is_old()) {
+    // This means we degenerated during the young bootstrap for the old generation
+    // cycle. The following degenerated cycle should therefore also be young.
+    request.generation = _heap->young_generation();
+  }
+
+  ShenandoahHeuristics* heuristics = request.generation->heuristics();
+  bool old_gen_evacuation_failed = _heap->old_generation()->clear_failed_evacuation();
+
+  heuristics->log_trigger("Handle Allocation Failure");
+
+  // Do not bother with degenerated cycle if old generation evacuation failed or if humongous allocation failed
+  if (ShenandoahDegeneratedGC && heuristics->should_degenerate_cycle() &&
+      !old_gen_evacuation_failed && request.cause != GCCause::_shenandoah_humongous_allocation_failure) {
+    heuristics->record_allocation_failure_gc();
+    _heap->shenandoah_policy()->record_alloc_failure_to_degenerated(_degen_point);
+    return stw_degenerated;
+  } else {
+    heuristics->record_allocation_failure_gc();
+    _heap->shenandoah_policy()->record_alloc_failure_to_full();
+    request.generation = _heap->global_generation();
+    return stw_full;
   }
 }
 
-void ShenandoahGenerationalControlThread::process_phase_timings(const ShenandoahGenerationalHeap* heap) {
-  // Commit worker statistics to cycle data
-  heap->phase_timings()->flush_par_workers_to_cycle();
-  if (ShenandoahPacing) {
-    heap->pacer()->flush_stats_to_cycle();
+ShenandoahGenerationalControlThread::GCMode ShenandoahGenerationalControlThread::prepare_for_explicit_gc(ShenandoahGCRequest &request) const {
+  ShenandoahHeuristics* global_heuristics = _heap->global_generation()->heuristics();
+  request.generation = _heap->global_generation();
+  global_heuristics->log_trigger("GC request (%s)", GCCause::to_string(request.cause));
+  global_heuristics->record_requested_gc();
+
+  if (ShenandoahCollectorPolicy::should_run_full_gc(request.cause)) {
+    return stw_full;;
+  } else {
+    // Unload and clean up everything. Note that this is an _explicit_ request and so does not use
+    // the same `should_unload_classes` call as the regulator's concurrent gc request.
+    _heap->set_unload_classes(global_heuristics->can_unload_classes());
+    return concurrent_normal;
+  }
+}
+
+ShenandoahGenerationalControlThread::GCMode ShenandoahGenerationalControlThread::prepare_for_concurrent_gc(const ShenandoahGCRequest &request) const {
+  assert(!(request.generation->is_old() && _heap->old_generation()->is_doing_mixed_evacuations()),
+             "Old heuristic should not request cycles while it waits for mixed evacuations");
+
+  if (request.generation->is_global()) {
+    ShenandoahHeuristics* global_heuristics = _heap->global_generation()->heuristics();
+    _heap->set_unload_classes(global_heuristics->should_unload_classes());
+  } else {
+    _heap->set_unload_classes(false);
   }
 
-  ShenandoahEvacuationTracker* evac_tracker = heap->evac_tracker();
+  // preemption was requested or this is a regular cycle
+  return request.generation->is_old() ? servicing_old : concurrent_normal;
+}
+
+void ShenandoahGenerationalControlThread::maybe_set_aging_cycle() {
+  if (_age_period-- == 0) {
+    _heap->set_aging_cycle(true);
+    _age_period = ShenandoahAgingCyclePeriod - 1;
+  } else {
+    _heap->set_aging_cycle(false);
+  }
+}
+
+void ShenandoahGenerationalControlThread::run_gc_cycle(const ShenandoahGCRequest& request) {
+
+  log_debug(gc, thread)("Starting GC (%s): %s, %s", gc_mode_name(gc_mode()), GCCause::to_string(request.cause), request.generation->name());
+  assert(gc_mode() != none, "GC mode cannot be none here");
+
+  // Blow away all soft references on this cycle, if handling allocation failure,
+  // either implicit or explicit GC request, or we are requested to do so unconditionally.
+  if (request.generation->is_global() && (ShenandoahCollectorPolicy::is_allocation_failure(request.cause) || ShenandoahCollectorPolicy::is_explicit_gc(request.cause) || ShenandoahAlwaysClearSoftRefs)) {
+    _heap->soft_ref_policy()->set_should_clear_all_soft_refs(true);
+  }
+
+  // GC is starting, bump the internal ID
+  update_gc_id();
+
+  _heap->reset_bytes_allocated_since_gc_start();
+
+  MetaspaceCombinedStats meta_sizes = MetaspaceUtils::get_combined_statistics();
+
+  // If GC was requested, we are sampling the counters even without actual triggers
+  // from allocation machinery. This captures GC phases more accurately.
+  _heap->set_forced_counters_update(true);
+
+  // If GC was requested, we better dump freeset data for performance debugging
+  _heap->free_set()->log_status_under_lock();
+
+  {
+    // Cannot uncommit bitmap slices during concurrent reset
+    ShenandoahNoUncommitMark forbid_region_uncommit(_heap);
+
+    switch (gc_mode()) {
+      case concurrent_normal: {
+        service_concurrent_normal_cycle(request);
+        break;
+      }
+      case stw_degenerated: {
+        service_stw_degenerated_cycle(request);
+        break;
+      }
+      case stw_full: {
+        service_stw_full_cycle(request.cause);
+        break;
+      }
+      case servicing_old: {
+        assert(request.generation->is_old(), "Expected old generation here");
+        GCIdMark gc_id_mark;
+        service_concurrent_old_cycle(request);
+        break;
+      }
+      default:
+        ShouldNotReachHere();
+    }
+  }
+
+  // If this was the requested GC cycle, notify waiters about it
+  if (ShenandoahCollectorPolicy::is_explicit_gc(request.cause)) {
+    notify_gc_waiters();
+  }
+
+  // If this was an allocation failure GC cycle, notify waiters about it
+  if (ShenandoahCollectorPolicy::is_allocation_failure(request.cause)) {
+    notify_alloc_failure_waiters();
+  }
+
+  // Report current free set state at the end of cycle, whether
+  // it is a normal completion, or the abort.
+  _heap->free_set()->log_status_under_lock();
+
+  // Notify Universe about new heap usage. This has implications for
+  // global soft refs policy, and we better report it every time heap
+  // usage goes down.
+  _heap->update_capacity_and_used_at_gc();
+
+  // Signal that we have completed a visit to all live objects.
+  _heap->record_whole_heap_examined_timestamp();
+
+  // Disable forced counters update, and update counters one more time
+  // to capture the state at the end of GC session.
+  _heap->handle_force_counters_update();
+  _heap->set_forced_counters_update(false);
+
+  // Retract forceful part of soft refs policy
+  _heap->soft_ref_policy()->set_should_clear_all_soft_refs(false);
+
+  // Clear metaspace oom flag, if current cycle unloaded classes
+  if (_heap->unload_classes()) {
+    _heap->global_generation()->heuristics()->clear_metaspace_oom();
+  }
+
+  process_phase_timings();
+
+  // Print Metaspace change following GC (if logging is enabled).
+  MetaspaceUtils::print_metaspace_change(meta_sizes);
+
+  // GC is over, we are at idle now
+  if (ShenandoahPacing) {
+    _heap->pacer()->setup_for_idle();
+  }
+
+  // Check if we have seen a new target for soft max heap size or if a gc was requested.
+  // Either of these conditions will attempt to uncommit regions.
+  if (ShenandoahUncommit) {
+    if (_heap->check_soft_max_changed()) {
+      _heap->notify_soft_max_changed();
+    } else if (ShenandoahCollectorPolicy::is_explicit_gc(request.cause)) {
+      _heap->notify_explicit_gc_requested();
+    }
+  }
+
+  log_debug(gc, thread)("Completed GC (%s): %s, %s, cancelled: %s",
+    gc_mode_name(gc_mode()), GCCause::to_string(request.cause), request.generation->name(), GCCause::to_string(_heap->cancelled_cause()));
+}
+
+void ShenandoahGenerationalControlThread::process_phase_timings() const {
+  // Commit worker statistics to cycle data
+  _heap->phase_timings()->flush_par_workers_to_cycle();
+  if (ShenandoahPacing) {
+    _heap->pacer()->flush_stats_to_cycle();
+  }
+
+  ShenandoahEvacuationTracker* evac_tracker = _heap->evac_tracker();
   ShenandoahCycleStats         evac_stats   = evac_tracker->flush_cycle_to_global();
 
   // Print GC stats for current cycle
@@ -341,17 +347,17 @@ void ShenandoahGenerationalControlThread::process_phase_timings(const Shenandoah
     if (lt.is_enabled()) {
       ResourceMark rm;
       LogStream ls(lt);
-      heap->phase_timings()->print_cycle_on(&ls);
+      _heap->phase_timings()->print_cycle_on(&ls);
       evac_tracker->print_evacuations_on(&ls, &evac_stats.workers,
                                               &evac_stats.mutators);
       if (ShenandoahPacing) {
-        heap->pacer()->print_cycle_on(&ls);
+        _heap->pacer()->print_cycle_on(&ls);
       }
     }
   }
 
   // Commit statistics to globals
-  heap->phase_timings()->flush_cycle_to_global();
+  _heap->phase_timings()->flush_cycle_to_global();
 }
 
 // Young and old concurrent cycles are initiated by the regulator. Implicit
@@ -379,46 +385,27 @@ void ShenandoahGenerationalControlThread::process_phase_timings(const Shenandoah
 //      |        v                                   v       |
 //      +--->  Global Degen +--------------------> Full <----+
 //
-void ShenandoahGenerationalControlThread::service_concurrent_normal_cycle(ShenandoahGenerationalHeap* heap,
-                                                                          const ShenandoahGenerationType generation,
-                                                                          GCCause::Cause cause) {
+void ShenandoahGenerationalControlThread::service_concurrent_normal_cycle(const ShenandoahGCRequest& request) {
   GCIdMark gc_id_mark;
-  switch (generation) {
-    case YOUNG: {
-      // Run a young cycle. This might or might not, have interrupted an ongoing
-      // concurrent mark in the old generation. We need to think about promotions
-      // in this case. Promoted objects should be above the TAMS in the old regions
-      // they end up in, but we have to be sure we don't promote into any regions
-      // that are in the cset.
-      log_info(gc, ergo)("Start GC cycle (Young)");
-      service_concurrent_cycle(heap->young_generation(), cause, false);
-      break;
-    }
-    case OLD: {
-      log_info(gc, ergo)("Start GC cycle (Old)");
-      service_concurrent_old_cycle(heap, cause);
-      break;
-    }
-    case GLOBAL: {
-      log_info(gc, ergo)("Start GC cycle (Global)");
-      service_concurrent_cycle(heap->global_generation(), cause, false);
-      break;
-    }
-    default:
-      ShouldNotReachHere();
+  log_info(gc, ergo)("Start GC cycle (%s)", request.generation->name());
+  if (request.generation->is_old()) {
+    service_concurrent_old_cycle(request);
+  } else {
+    service_concurrent_cycle(request.generation, request.cause, false);
   }
 }
 
-void ShenandoahGenerationalControlThread::service_concurrent_old_cycle(ShenandoahGenerationalHeap* heap, GCCause::Cause &cause) {
-  ShenandoahOldGeneration* old_generation = heap->old_generation();
-  ShenandoahYoungGeneration* young_generation = heap->young_generation();
+void ShenandoahGenerationalControlThread::service_concurrent_old_cycle(const ShenandoahGCRequest& request) {
+  ShenandoahOldGeneration* old_generation = _heap->old_generation();
+  ShenandoahYoungGeneration* young_generation = _heap->young_generation();
   ShenandoahOldGeneration::State original_state = old_generation->state();
 
-  TraceCollectorStats tcs(heap->monitoring_support()->concurrent_collection_counters());
+  TraceCollectorStats tcs(_heap->monitoring_support()->concurrent_collection_counters());
 
   switch (original_state) {
     case ShenandoahOldGeneration::FILLING: {
-      ShenandoahGCSession session(cause, old_generation);
+      ShenandoahGCSession session(request.cause, old_generation);
+      assert(gc_mode() == servicing_old, "Filling should be servicing old");
       _allow_old_preemption.set();
       old_generation->entry_coalesce_and_fill();
       _allow_old_preemption.unset();
@@ -430,7 +417,7 @@ void ShenandoahGenerationalControlThread::service_concurrent_old_cycle(Shenandoa
       // acknowledge the cancellation request, the subsequent young cycle will observe
       // the request and essentially cancel itself.
       if (check_cancellation_or_degen(ShenandoahGC::_degenerated_outside_cycle)) {
-        log_info(gc)("Preparation for old generation cycle was cancelled");
+        log_info(gc, thread)("Preparation for old generation cycle was cancelled");
         return;
       }
 
@@ -448,20 +435,16 @@ void ShenandoahGenerationalControlThread::service_concurrent_old_cycle(Shenandoa
       // task queues but it will not traverse them.
       set_gc_mode(bootstrapping_old);
       young_generation->set_old_gen_task_queues(old_generation->task_queues());
-      ShenandoahGCSession session(cause, young_generation);
-      service_concurrent_cycle(heap, young_generation, cause, true);
-      process_phase_timings(heap);
-      if (heap->cancelled_gc()) {
+      service_concurrent_cycle(young_generation, request.cause, true);
+      process_phase_timings();
+      if (_heap->cancelled_gc()) {
         // Young generation bootstrap cycle has failed. Concurrent mark for old generation
         // is going to resume after degenerated bootstrap cycle completes.
         log_info(gc)("Bootstrap cycle for old generation was cancelled");
         return;
       }
 
-      // Reset the degenerated point. Normally this would happen at the top
-      // of the control loop, but here we have just completed a young cycle
-      // which has bootstrapped the old concurrent marking.
-      _degen_point = ShenandoahGC::_degenerated_outside_cycle;
+      assert(_degen_point == ShenandoahGC::_degenerated_unset, "Degen point should not be set if gc wasn't cancelled");
 
       // From here we will 'resume' the old concurrent mark. This will skip reset
       // and init mark for the concurrent mark. All of that work will have been
@@ -470,17 +453,17 @@ void ShenandoahGenerationalControlThread::service_concurrent_old_cycle(Shenandoa
       old_generation->transition_to(ShenandoahOldGeneration::MARKING);
     }
     case ShenandoahOldGeneration::MARKING: {
-      ShenandoahGCSession session(cause, old_generation);
-      bool marking_complete = resume_concurrent_old_cycle(old_generation, cause);
+      ShenandoahGCSession session(request.cause, old_generation);
+      bool marking_complete = resume_concurrent_old_cycle(old_generation, request.cause);
       if (marking_complete) {
         assert(old_generation->state() != ShenandoahOldGeneration::MARKING, "Should not still be marking");
         if (original_state == ShenandoahOldGeneration::MARKING) {
-          heap->mmu_tracker()->record_old_marking_increment(true);
-          heap->log_heap_status("At end of Concurrent Old Marking finishing increment");
+          _heap->mmu_tracker()->record_old_marking_increment(true);
+          _heap->log_heap_status("At end of Concurrent Old Marking finishing increment");
         }
       } else if (original_state == ShenandoahOldGeneration::MARKING) {
-        heap->mmu_tracker()->record_old_marking_increment(false);
-        heap->log_heap_status("At end of Concurrent Old Marking increment");
+        _heap->mmu_tracker()->record_old_marking_increment(false);
+        _heap->log_heap_status("At end of Concurrent Old Marking increment");
       }
       break;
     }
@@ -490,21 +473,19 @@ void ShenandoahGenerationalControlThread::service_concurrent_old_cycle(Shenandoa
 }
 
 bool ShenandoahGenerationalControlThread::resume_concurrent_old_cycle(ShenandoahOldGeneration* generation, GCCause::Cause cause) {
-  assert(ShenandoahHeap::heap()->is_concurrent_old_mark_in_progress(), "Old mark should be in progress");
+  assert(_heap->is_concurrent_old_mark_in_progress(), "Old mark should be in progress");
   log_debug(gc)("Resuming old generation with " UINT32_FORMAT " marking tasks queued", generation->task_queues()->tasks());
 
-  ShenandoahHeap* heap = ShenandoahHeap::heap();
-
   // We can only tolerate being cancelled during concurrent marking or during preparation for mixed
   // evacuation. This flag here (passed by reference) is used to control precisely where the regulator
   // is allowed to cancel a GC.
   ShenandoahOldGC gc(generation, _allow_old_preemption);
   if (gc.collect(cause)) {
-    heap->notify_gc_progress();
+    _heap->notify_gc_progress();
     generation->record_success_concurrent(false);
   }
 
-  if (heap->cancelled_gc()) {
+  if (_heap->cancelled_gc()) {
     // It's possible the gc cycle was cancelled after the last time
     // the collection checked for cancellation. In which case, the
     // old gc cycle is still completed, and we have to deal with this
@@ -515,89 +496,84 @@ bool ShenandoahGenerationalControlThread::resume_concurrent_old_cycle(Shenandoah
     // cycle, then we are not actually going to a degenerated cycle,
     // so the degenerated point doesn't matter here.
     check_cancellation_or_degen(ShenandoahGC::_degenerated_outside_cycle);
-    if (_requested_gc_cause == GCCause::_shenandoah_concurrent_gc) {
-      heap->shenandoah_policy()->record_interrupted_old();
+    if (cause == GCCause::_shenandoah_concurrent_gc) {
+      _heap->shenandoah_policy()->record_interrupted_old();
     }
     return false;
   }
   return true;
 }
 
-void ShenandoahGenerationalControlThread::service_concurrent_cycle(ShenandoahGeneration* generation, GCCause::Cause cause, bool do_old_gc_bootstrap) {
-  // Normal cycle goes via all concurrent phases. If allocation failure (af) happens during
-  // any of the concurrent phases, it first degrades to Degenerated GC and completes GC there.
-  // If second allocation failure happens during Degenerated GC cycle (for example, when GC
-  // tries to evac something and no memory is available), cycle degrades to Full GC.
-  //
-  // There are also a shortcut through the normal cycle: immediate garbage shortcut, when
-  // heuristics says there are no regions to compact, and all the collection comes from immediately
-  // reclaimable regions.
-  //
-  // ................................................................................................
-  //
-  //                                    (immediate garbage shortcut)                Concurrent GC
-  //                             /-------------------------------------------\
-  //                             |                                           |
-  //                             |                                           |
-  //                             |                                           |
-  //                             |                                           v
-  // [START] ----> Conc Mark ----o----> Conc Evac --o--> Conc Update-Refs ---o----> [END]
-  //                   |                    |                 |              ^
-  //                   | (af)               | (af)            | (af)         |
-  // ..................|....................|.................|..............|.......................
-  //                   |                    |                 |              |
-  //                   |                    |                 |              |      Degenerated GC
-  //                   v                    v                 v              |
-  //               STW Mark ----------> STW Evac ----> STW Update-Refs ----->o
-  //                   |                    |                 |              ^
-  //                   | (af)               | (af)            | (af)         |
-  // ..................|....................|.................|..............|.......................
-  //                   |                    |                 |              |
-  //                   |                    v                 |              |      Full GC
-  //                   \------------------->o<----------------/              |
-  //                                        |                                |
-  //                                        v                                |
-  //                                      Full GC  --------------------------/
-  //
-  if (check_cancellation_or_degen(ShenandoahGC::_degenerated_outside_cycle)) return;
+// Normal cycle goes via all concurrent phases. If allocation failure (af) happens during
+// any of the concurrent phases, it first degrades to Degenerated GC and completes GC there.
+// If second allocation failure happens during Degenerated GC cycle (for example, when GC
+// tries to evac something and no memory is available), cycle degrades to Full GC.
+//
+// There are also a shortcut through the normal cycle: immediate garbage shortcut, when
+// heuristics says there are no regions to compact, and all the collection comes from immediately
+// reclaimable regions.
+//
+// ................................................................................................
+//
+//                                    (immediate garbage shortcut)                Concurrent GC
+//                             /-------------------------------------------\
+//                             |                                           |
+//                             |                                           |
+//                             |                                           |
+//                             |                                           v
+// [START] ----> Conc Mark ----o----> Conc Evac --o--> Conc Update-Refs ---o----> [END]
+//                   |                    |                 |              ^
+//                   | (af)               | (af)            | (af)         |
+// ..................|....................|.................|..............|.......................
+//                   |                    |                 |              |
+//                   |                    |                 |              |      Degenerated GC
+//                   v                    v                 v              |
+//               STW Mark ----------> STW Evac ----> STW Update-Refs ----->o
+//                   |                    |                 |              ^
+//                   | (af)               | (af)            | (af)         |
+// ..................|....................|.................|..............|.......................
+//                   |                    |                 |              |
+//                   |                    v                 |              |      Full GC
+//                   \------------------->o<----------------/              |
+//                                        |                                |
+//                                        v                                |
+//                                      Full GC  --------------------------/
+//
+void ShenandoahGenerationalControlThread::service_concurrent_cycle(ShenandoahGeneration* generation,
+                                                                   GCCause::Cause cause,
+                                                                   bool do_old_gc_bootstrap) {
+  // At this point:
+  //  if (generation == YOUNG), this is a normal young cycle or a bootstrap cycle
+  //  if (generation == GLOBAL), this is a GLOBAL cycle
+  // In either case, we want to age old objects if this is an aging cycle
+  maybe_set_aging_cycle();
 
-  ShenandoahHeap* heap = ShenandoahHeap::heap();
   ShenandoahGCSession session(cause, generation);
-  TraceCollectorStats tcs(heap->monitoring_support()->concurrent_collection_counters());
+  TraceCollectorStats tcs(_heap->monitoring_support()->concurrent_collection_counters());
 
-  service_concurrent_cycle(heap, generation, cause, do_old_gc_bootstrap);
-}
-
-void ShenandoahGenerationalControlThread::service_concurrent_cycle(ShenandoahHeap* heap,
-                                                       ShenandoahGeneration* generation,
-                                                       GCCause::Cause& cause,
-                                                       bool do_old_gc_bootstrap) {
   assert(!generation->is_old(), "Old GC takes a different control path");
 
   ShenandoahConcurrentGC gc(generation, do_old_gc_bootstrap);
   if (gc.collect(cause)) {
     // Cycle is complete
-    heap->notify_gc_progress();
+    _heap->notify_gc_progress();
     generation->record_success_concurrent(gc.abbreviated());
   } else {
-    assert(heap->cancelled_gc(), "Must have been cancelled");
+    assert(_heap->cancelled_gc(), "Must have been cancelled");
     check_cancellation_or_degen(gc.degen_point());
-
-    // Concurrent young-gen collection degenerates to young
-    // collection.  Same for global collections.
-    _degen_generation = generation;
   }
+
   const char* msg;
-  ShenandoahMmuTracker* mmu_tracker = heap->mmu_tracker();
+  ShenandoahMmuTracker* mmu_tracker = _heap->mmu_tracker();
   if (generation->is_young()) {
-    if (heap->cancelled_gc()) {
+    if (_heap->cancelled_gc()) {
       msg = (do_old_gc_bootstrap) ? "At end of Interrupted Concurrent Bootstrap GC" :
             "At end of Interrupted Concurrent Young GC";
     } else {
       // We only record GC results if GC was successful
       msg = (do_old_gc_bootstrap) ? "At end of Concurrent Bootstrap GC" :
             "At end of Concurrent Young GC";
-      if (heap->collection_set()->has_old_regions()) {
+      if (_heap->collection_set()->has_old_regions()) {
         mmu_tracker->record_mixed(get_gc_id());
       } else if (do_old_gc_bootstrap) {
         mmu_tracker->record_bootstrap(get_gc_id());
@@ -608,7 +584,7 @@ void ShenandoahGenerationalControlThread::service_concurrent_cycle(ShenandoahHea
   } else {
     assert(generation->is_global(), "If not young, must be GLOBAL");
     assert(!do_old_gc_bootstrap, "Do not bootstrap with GLOBAL GC");
-    if (heap->cancelled_gc()) {
+    if (_heap->cancelled_gc()) {
       msg = "At end of Interrupted Concurrent GLOBAL GC";
     } else {
       // We only record GC results if GC was successful
@@ -616,39 +592,27 @@ void ShenandoahGenerationalControlThread::service_concurrent_cycle(ShenandoahHea
       mmu_tracker->record_global(get_gc_id());
     }
   }
-  heap->log_heap_status(msg);
+  _heap->log_heap_status(msg);
 }
 
 bool ShenandoahGenerationalControlThread::check_cancellation_or_degen(ShenandoahGC::ShenandoahDegenPoint point) {
-  ShenandoahHeap* heap = ShenandoahHeap::heap();
-  if (!heap->cancelled_gc()) {
+  if (!_heap->cancelled_gc()) {
     return false;
   }
 
-  if (in_graceful_shutdown()) {
+  if (_heap->cancelled_cause() == GCCause::_shenandoah_stop_vm
+    || _heap->cancelled_cause() == GCCause::_shenandoah_concurrent_gc) {
+    log_debug(gc, thread)("Cancellation detected, reason: %s", GCCause::to_string(_heap->cancelled_cause()));
     return true;
   }
 
-  assert(_degen_point == ShenandoahGC::_degenerated_outside_cycle,
-         "Should not be set yet: %s", ShenandoahGC::degen_point_to_string(_degen_point));
-
-  if (is_alloc_failure_gc()) {
+  if (ShenandoahCollectorPolicy::is_allocation_failure(_heap->cancelled_cause())) {
+    assert(_degen_point == ShenandoahGC::_degenerated_unset,
+           "Should not be set yet: %s", ShenandoahGC::degen_point_to_string(_degen_point));
     _degen_point = point;
-    _preemption_requested.unset();
-    return true;
-  }
-
-  if (_preemption_requested.is_set()) {
-    assert(_requested_generation == YOUNG, "Only young GCs may preempt old.");
-    _preemption_requested.unset();
-
-    // Old generation marking is only cancellable during concurrent marking.
-    // Once final mark is complete, the code does not check again for cancellation.
-    // If old generation was cancelled for an allocation failure, we wouldn't
-    // make it to this case. The calling code is responsible for forcing a
-    // cancellation due to allocation failure into a degenerated cycle.
-    _degen_point = point;
-    heap->clear_cancelled_gc(false /* clear oom handler */);
+    log_debug(gc, thread)("Cancellation detected:, reason: %s, degen point: %s",
+                          GCCause::to_string(_heap->cancelled_cause()),
+                          ShenandoahGC::degen_point_to_string(_degen_point));
     return true;
   }
 
@@ -656,38 +620,32 @@ bool ShenandoahGenerationalControlThread::check_cancellation_or_degen(Shenandoah
   return false;
 }
 
-void ShenandoahGenerationalControlThread::stop_service() {
-  // Nothing to do here.
-}
-
 void ShenandoahGenerationalControlThread::service_stw_full_cycle(GCCause::Cause cause) {
-  ShenandoahHeap* const heap = ShenandoahHeap::heap();
-
   GCIdMark gc_id_mark;
-  ShenandoahGCSession session(cause, heap->global_generation());
-
+  ShenandoahGCSession session(cause, _heap->global_generation());
+  maybe_set_aging_cycle();
   ShenandoahFullGC gc;
   gc.collect(cause);
+  _degen_point = ShenandoahGC::_degenerated_unset;
 }
 
-void ShenandoahGenerationalControlThread::service_stw_degenerated_cycle(GCCause::Cause cause,
-                                                            ShenandoahGC::ShenandoahDegenPoint point) {
-  assert(point != ShenandoahGC::_degenerated_unset, "Degenerated point should be set");
-  ShenandoahHeap* const heap = ShenandoahHeap::heap();
+void ShenandoahGenerationalControlThread::service_stw_degenerated_cycle(const ShenandoahGCRequest& request) {
+  assert(_degen_point != ShenandoahGC::_degenerated_unset, "Degenerated point should be set");
 
   GCIdMark gc_id_mark;
-  ShenandoahGCSession session(cause, _degen_generation);
+  ShenandoahGCSession session(request.cause, request.generation);
 
-  ShenandoahDegenGC gc(point, _degen_generation);
-  gc.collect(cause);
+  ShenandoahDegenGC gc(_degen_point, request.generation);
+  gc.collect(request.cause);
+  _degen_point = ShenandoahGC::_degenerated_unset;
 
-  assert(heap->young_generation()->task_queues()->is_empty(), "Unexpected young generation marking tasks");
-  if (_degen_generation->is_global()) {
-    assert(heap->old_generation()->task_queues()->is_empty(), "Unexpected old generation marking tasks");
-    assert(heap->global_generation()->task_queues()->is_empty(), "Unexpected global generation marking tasks");
+  assert(_heap->young_generation()->task_queues()->is_empty(), "Unexpected young generation marking tasks");
+  if (request.generation->is_global()) {
+    assert(_heap->old_generation()->task_queues()->is_empty(), "Unexpected old generation marking tasks");
+    assert(_heap->global_generation()->task_queues()->is_empty(), "Unexpected global generation marking tasks");
   } else {
-    assert(_degen_generation->is_young(), "Expected degenerated young cycle, if not global.");
-    ShenandoahOldGeneration* old = heap->old_generation();
+    assert(request.generation->is_young(), "Expected degenerated young cycle, if not global.");
+    ShenandoahOldGeneration* old = _heap->old_generation();
     if (old->is_bootstrapping()) {
       old->transition_to(ShenandoahOldGeneration::MARKING);
     }
@@ -695,72 +653,87 @@ void ShenandoahGenerationalControlThread::service_stw_degenerated_cycle(GCCause:
 }
 
 void ShenandoahGenerationalControlThread::request_gc(GCCause::Cause cause) {
-  if (ShenandoahCollectorPolicy::should_handle_requested_gc(cause)) {
+  if (ShenandoahCollectorPolicy::is_allocation_failure(cause)) {
+    // GC should already be cancelled. Here we are just notifying the control thread to
+    // wake up and handle the cancellation request, so we don't need to set _requested_gc_cause.
+    notify_cancellation(cause);
+  } else if (ShenandoahCollectorPolicy::should_handle_requested_gc(cause)) {
     handle_requested_gc(cause);
   }
 }
 
-bool ShenandoahGenerationalControlThread::request_concurrent_gc(ShenandoahGenerationType generation) {
-  if (_preemption_requested.is_set() || _requested_gc_cause != GCCause::_no_gc || ShenandoahHeap::heap()->cancelled_gc()) {
+bool ShenandoahGenerationalControlThread::request_concurrent_gc(ShenandoahGeneration* generation) {
+  if (_heap->cancelled_gc()) {
     // Ignore subsequent requests from the heuristics
-    log_debug(gc, thread)("Reject request for concurrent gc: preemption_requested: %s, gc_requested: %s, gc_cancelled: %s",
-                          BOOL_TO_STR(_preemption_requested.is_set()),
+    log_debug(gc, thread)("Reject request for concurrent gc: gc_requested: %s, gc_cancelled: %s",
                           GCCause::to_string(_requested_gc_cause),
-                          BOOL_TO_STR(ShenandoahHeap::heap()->cancelled_gc()));
+                          BOOL_TO_STR(_heap->cancelled_gc()));
     return false;
   }
 
-  if (gc_mode() == none) {
-    GCCause::Cause existing = Atomic::cmpxchg(&_requested_gc_cause, GCCause::_no_gc, GCCause::_shenandoah_concurrent_gc);
-    if (existing != GCCause::_no_gc) {
-      log_debug(gc, thread)("Reject request for concurrent gc because another gc is pending: %s", GCCause::to_string(existing));
+  MonitorLocker ml(&_control_lock, Mutex::_no_safepoint_check_flag);
+  if (gc_mode() == servicing_old) {
+    if (!preempt_old_marking(generation)) {
+      log_debug(gc, thread)("Cannot start young, old collection is not preemptible");
       return false;
     }
 
-    _requested_generation = generation;
-    notify_control_thread();
-
-    MonitorLocker ml(&_regulator_lock, Mutex::_no_safepoint_check_flag);
-    while (gc_mode() == none) {
-      ml.wait();
-    }
-    return true;
-  }
-
-  if (preempt_old_marking(generation)) {
-    assert(gc_mode() == servicing_old, "Expected to be servicing old, but was: %s.", gc_mode_name(gc_mode()));
-    GCCause::Cause existing = Atomic::cmpxchg(&_requested_gc_cause, GCCause::_no_gc, GCCause::_shenandoah_concurrent_gc);
-    if (existing != GCCause::_no_gc) {
-      log_debug(gc, thread)("Reject request to interrupt old gc because another gc is pending: %s", GCCause::to_string(existing));
-      return false;
-    }
-
-    log_info(gc)("Preempting old generation mark to allow %s GC", shenandoah_generation_name(generation));
-    _requested_generation = generation;
-    _preemption_requested.set();
-    ShenandoahHeap::heap()->cancel_gc(GCCause::_shenandoah_concurrent_gc);
-    notify_control_thread();
-
-    MonitorLocker ml(&_regulator_lock, Mutex::_no_safepoint_check_flag);
+    // Cancel the old GC and wait for the control thread to start servicing the new request.
+    log_info(gc)("Preempting old generation mark to allow %s GC", generation->name());
     while (gc_mode() == servicing_old) {
+      ShenandoahHeap::heap()->cancel_gc(GCCause::_shenandoah_concurrent_gc);
+      notify_cancellation(ml, GCCause::_shenandoah_concurrent_gc);
       ml.wait();
     }
     return true;
   }
 
+  if (gc_mode() == none) {
+    while (gc_mode() == none) {
+      if (_requested_gc_cause != GCCause::_no_gc) {
+        log_debug(gc, thread)("Reject request for concurrent gc because another gc is pending: %s", GCCause::to_string(_requested_gc_cause));
+        return false;
+      }
+
+      notify_control_thread(ml, GCCause::_shenandoah_concurrent_gc, generation);
+      ml.wait();
+    }
+    return true;
+  }
+
+
   log_debug(gc, thread)("Reject request for concurrent gc: mode: %s, allow_old_preemption: %s",
                         gc_mode_name(gc_mode()),
                         BOOL_TO_STR(_allow_old_preemption.is_set()));
   return false;
 }
 
-void ShenandoahGenerationalControlThread::notify_control_thread() {
-  MonitorLocker locker(&_control_lock, Mutex::_no_safepoint_check_flag);
-  _control_lock.notify();
+void ShenandoahGenerationalControlThread::notify_control_thread(GCCause::Cause cause, ShenandoahGeneration* generation) {
+  MonitorLocker ml(&_control_lock, Mutex::_no_safepoint_check_flag);
+  notify_control_thread(ml, cause, generation);
 }
 
-bool ShenandoahGenerationalControlThread::preempt_old_marking(ShenandoahGenerationType generation) {
-  return (generation == YOUNG) && _allow_old_preemption.try_unset();
+void ShenandoahGenerationalControlThread::notify_control_thread(MonitorLocker& ml, GCCause::Cause cause, ShenandoahGeneration* generation) {
+  assert(_control_lock.is_locked(), "Request lock must be held here");
+  log_debug(gc, thread)("Notify control (%s): %s, %s", gc_mode_name(gc_mode()), GCCause::to_string(cause), generation->name());
+  _requested_gc_cause = cause;
+  _requested_generation = generation;
+  ml.notify();
+}
+
+void ShenandoahGenerationalControlThread::notify_cancellation(GCCause::Cause cause) {
+  MonitorLocker ml(&_control_lock, Mutex::_no_safepoint_check_flag);
+  notify_cancellation(ml, cause);
+}
+
+void ShenandoahGenerationalControlThread::notify_cancellation(MonitorLocker& ml, GCCause::Cause cause) {
+  assert(_heap->cancelled_gc(), "GC should already be cancelled");
+  log_debug(gc,thread)("Notify control (%s): %s", gc_mode_name(gc_mode()), GCCause::to_string(cause));
+  ml.notify();
+}
+
+bool ShenandoahGenerationalControlThread::preempt_old_marking(ShenandoahGeneration* generation) {
+  return generation->is_young() && _allow_old_preemption.try_unset();
 }
 
 void ShenandoahGenerationalControlThread::handle_requested_gc(GCCause::Cause cause) {
@@ -769,8 +742,7 @@ void ShenandoahGenerationalControlThread::handle_requested_gc(GCCause::Cause cau
   // The whitebox caller thread will arrange for itself to wait until the GC notifies
   // it that has reached the requested breakpoint (phase in the GC).
   if (cause == GCCause::_wb_breakpoint) {
-    Atomic::xchg(&_requested_gc_cause, cause);
-    notify_control_thread();
+    notify_control_thread(cause, ShenandoahHeap::heap()->global_generation());
     return;
   }
 
@@ -785,17 +757,10 @@ void ShenandoahGenerationalControlThread::handle_requested_gc(GCCause::Cause cau
 
   MonitorLocker ml(&_gc_waiters_lock);
   size_t current_gc_id = get_gc_id();
-  size_t required_gc_id = current_gc_id + 1;
-  while (current_gc_id < required_gc_id) {
-    // This races with the regulator thread to start a concurrent gc and the
-    // control thread to clear it at the start of a cycle. Threads here are
-    // allowed to escalate a heuristic's request for concurrent gc.
-    GCCause::Cause existing = Atomic::xchg(&_requested_gc_cause, cause);
-    if (existing != GCCause::_no_gc) {
-      log_debug(gc, thread)("GC request supersedes existing request: %s", GCCause::to_string(existing));
-    }
-
-    notify_control_thread();
+  const size_t required_gc_id = current_gc_id + 1;
+  while (current_gc_id < required_gc_id && !should_terminate()) {
+    // Make requests to run a global cycle until at least one is completed
+    notify_control_thread(cause, ShenandoahHeap::heap()->global_generation());
     ml.wait();
     current_gc_id = get_gc_id();
   }
@@ -806,7 +771,7 @@ void ShenandoahGenerationalControlThread::notify_gc_waiters() {
   ml.notify_all();
 }
 
-const char* ShenandoahGenerationalControlThread::gc_mode_name(ShenandoahGenerationalControlThread::GCMode mode) {
+const char* ShenandoahGenerationalControlThread::gc_mode_name(GCMode mode) {
   switch (mode) {
     case none:              return "idle";
     case concurrent_normal: return "normal";
@@ -819,11 +784,16 @@ const char* ShenandoahGenerationalControlThread::gc_mode_name(ShenandoahGenerati
   }
 }
 
-void ShenandoahGenerationalControlThread::set_gc_mode(ShenandoahGenerationalControlThread::GCMode new_mode) {
-  if (_mode != new_mode) {
-    log_debug(gc)("Transition from: %s to: %s", gc_mode_name(_mode), gc_mode_name(new_mode));
-    MonitorLocker ml(&_regulator_lock, Mutex::_no_safepoint_check_flag);
-    _mode = new_mode;
+void ShenandoahGenerationalControlThread::set_gc_mode(GCMode new_mode) {
+  MonitorLocker ml(&_control_lock, Mutex::_no_safepoint_check_flag);
+  set_gc_mode(ml, new_mode);
+}
+
+void ShenandoahGenerationalControlThread::set_gc_mode(MonitorLocker& ml, GCMode new_mode) {
+  if (_gc_mode != new_mode) {
+    log_debug(gc, thread)("Transition from: %s to: %s", gc_mode_name(_gc_mode), gc_mode_name(new_mode));
+    EventMark event("Control thread transition from: %s, to %s", gc_mode_name(_gc_mode), gc_mode_name(new_mode));
+    _gc_mode = new_mode;
     ml.notify_all();
   }
 }
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahGenerationalControlThread.hpp b/src/hotspot/share/gc/shenandoah/shenandoahGenerationalControlThread.hpp
index 46072b98255..1586205742a 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahGenerationalControlThread.hpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahGenerationalControlThread.hpp
@@ -28,10 +28,9 @@
 
 #include "gc/shared/gcCause.hpp"
 #include "gc/shenandoah/shenandoahController.hpp"
-#include "gc/shenandoah/shenandoahGenerationType.hpp"
 #include "gc/shenandoah/shenandoahGC.hpp"
-#include "gc/shenandoah/shenandoahPadding.hpp"
 #include "gc/shenandoah/shenandoahSharedVariables.hpp"
+#include "runtime/mutexLocker.hpp"
 
 class ShenandoahOldGeneration;
 class ShenandoahGeneration;
@@ -52,21 +51,43 @@ public:
     stopped
   } GCMode;
 
+  class ShenandoahGCRequest {
+  public:
+    ShenandoahGCRequest() : generation(nullptr), cause(GCCause::_no_gc) {}
+    ShenandoahGeneration* generation;
+    GCCause::Cause cause;
+  };
+
 private:
+  // This lock is used to coordinate setting the _requested_gc_cause, _requested generation
+  // and _gc_mode. It is important that these be changed together and have a consistent view.
   Monitor _control_lock;
-  Monitor _regulator_lock;
-
-  ShenandoahSharedFlag _allow_old_preemption;
-  ShenandoahSharedFlag _preemption_requested;
 
+  // Represents a normal (non cancellation) gc request. This can be set by mutators (System.gc,
+  // whitebox gc, etc.) or by the regulator thread when the heuristics want to start a cycle.
   GCCause::Cause  _requested_gc_cause;
-  volatile ShenandoahGenerationType _requested_generation;
-  ShenandoahGC::ShenandoahDegenPoint _degen_point;
-  ShenandoahGeneration* _degen_generation;
 
-  shenandoah_padding(0);
-  volatile GCMode _mode;
-  shenandoah_padding(1);
+  // This is the generation the request should operate on.
+  ShenandoahGeneration* _requested_generation;
+
+  // The mode is read frequently by requesting threads and only ever written by the control thread.
+  // This may be read without taking the _control_lock, but should be read again under the lock
+  // before making any state changes (double-checked locking idiom).
+  volatile GCMode _gc_mode;
+
+  // Only the control thread knows the correct degeneration point. This is used to have the
+  // control thread resume a STW cycle from the point where the concurrent cycle was cancelled.
+  ShenandoahGC::ShenandoahDegenPoint _degen_point;
+
+  // A reference to the heap
+  ShenandoahGenerationalHeap* _heap;
+
+  // This is used to keep track of whether to age objects during the current cycle.
+  uint _age_period;
+
+  // This is true when the old generation cycle is in an interruptible phase (i.e., marking or
+  // preparing for mark).
+  ShenandoahSharedFlag _allow_old_preemption;
 
 public:
   ShenandoahGenerationalControlThread();
@@ -77,54 +98,68 @@ public:
   void request_gc(GCCause::Cause cause) override;
 
   // Return true if the request to start a concurrent GC for the given generation succeeded.
-  bool request_concurrent_gc(ShenandoahGenerationType generation);
+  bool request_concurrent_gc(ShenandoahGeneration* generation);
 
-  GCMode gc_mode() {
-    return _mode;
+  // Returns the current state of the control thread
+  GCMode gc_mode() const {
+    return _gc_mode;
   }
 private:
-
   // Returns true if the cycle has been cancelled or degenerated.
   bool check_cancellation_or_degen(ShenandoahGC::ShenandoahDegenPoint point);
 
+  // Executes one GC cycle
+  void run_gc_cycle(const ShenandoahGCRequest& request);
+
   // Returns true if the old generation marking completed (i.e., final mark executed for old generation).
   bool resume_concurrent_old_cycle(ShenandoahOldGeneration* generation, GCCause::Cause cause);
+
+  // Various service methods handle different gc cycle types
   void service_concurrent_cycle(ShenandoahGeneration* generation, GCCause::Cause cause, bool reset_old_bitmap_specially);
   void service_stw_full_cycle(GCCause::Cause cause);
-  void service_stw_degenerated_cycle(GCCause::Cause cause, ShenandoahGC::ShenandoahDegenPoint point);
+  void service_stw_degenerated_cycle(const ShenandoahGCRequest& request);
+  void service_concurrent_normal_cycle(const ShenandoahGCRequest& request);
+  void service_concurrent_old_cycle(const ShenandoahGCRequest& request);
 
   void notify_gc_waiters();
 
-  // Handle GC request.
-  // Blocks until GC is over.
+  // Blocks until at least one global GC cycle is complete.
   void handle_requested_gc(GCCause::Cause cause);
 
-  bool is_explicit_gc(GCCause::Cause cause) const;
-  bool is_implicit_gc(GCCause::Cause cause) const;
-
   // Returns true if the old generation marking was interrupted to allow a young cycle.
-  bool preempt_old_marking(ShenandoahGenerationType generation);
+  bool preempt_old_marking(ShenandoahGeneration* generation);
 
-  void process_phase_timings(const ShenandoahGenerationalHeap* heap);
-
-  void service_concurrent_normal_cycle(ShenandoahGenerationalHeap* heap,
-                                       ShenandoahGenerationType generation,
-                                       GCCause::Cause cause);
-
-  void service_concurrent_old_cycle(ShenandoahGenerationalHeap* heap,
-                                    GCCause::Cause &cause);
+  // Flushes cycle timings to global timings and prints the phase timings for the last completed cycle.
+  void process_phase_timings() const;
 
+  // Set the gc mode and post a notification if it has changed. The overloaded variant should be used
+  // when the _control_lock is already held.
   void set_gc_mode(GCMode new_mode);
+  void set_gc_mode(MonitorLocker& ml, GCMode new_mode);
 
+  // Return printable name for the given gc mode.
   static const char* gc_mode_name(GCMode mode);
 
-  void notify_control_thread();
+  // Takes the request lock and updates the requested cause and generation, then notifies the control thread.
+  // The overloaded variant should be used when the _control_lock is already held.
+  void notify_control_thread(GCCause::Cause cause, ShenandoahGeneration* generation);
+  void notify_control_thread(MonitorLocker& ml, GCCause::Cause cause, ShenandoahGeneration* generation);
 
-  void service_concurrent_cycle(ShenandoahHeap* heap,
-                                ShenandoahGeneration* generation,
-                                GCCause::Cause &cause,
-                                bool do_old_gc_bootstrap);
+  // Notifies the control thread, but does not update the requested cause or generation.
+  // The overloaded variant should be used when the _control_lock is already held.
+  void notify_cancellation(GCCause::Cause cause);
+  void notify_cancellation(MonitorLocker& ml, GCCause::Cause cause);
 
+  // Configure the heap to age objects and regions if the aging period has elapsed.
+  void maybe_set_aging_cycle();
+
+  // Take the _control_lock and check for a request to run a gc cycle. If a request is found,
+  // the `prepare` methods are used to configure the heap and update heuristics accordingly.
+  void check_for_request(ShenandoahGCRequest& request);
+
+  GCMode prepare_for_allocation_failure_gc(ShenandoahGCRequest &request);
+  GCMode prepare_for_explicit_gc(ShenandoahGCRequest &request) const;
+  GCMode prepare_for_concurrent_gc(const ShenandoahGCRequest &request) const;
 };
 
 #endif // SHARE_GC_SHENANDOAH_SHENANDOAHGENERATIONALCONTROLTHREAD_HPP
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahHeap.cpp b/src/hotspot/share/gc/shenandoah/shenandoahHeap.cpp
index 68b83cbf75a..fc1ff230688 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahHeap.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahHeap.cpp
@@ -583,6 +583,7 @@ ShenandoahHeap::ShenandoahHeap(ShenandoahCollectorPolicy* policy) :
 {
   // Initialize GC mode early, many subsequent initialization procedures depend on it
   initialize_mode();
+  _cancelled_gc.set(GCCause::_no_gc);
 }
 
 #ifdef _MSC_VER
@@ -993,13 +994,13 @@ HeapWord* ShenandoahHeap::allocate_memory(ShenandoahAllocRequest& req) {
       //   a) We experienced a GC that had good progress, or
       //   b) We experienced at least one Full GC (whether or not it had good progress)
 
-      size_t original_count = shenandoah_policy()->full_gc_count();
-      while ((result == nullptr) && (original_count == shenandoah_policy()->full_gc_count())) {
+      const size_t original_count = shenandoah_policy()->full_gc_count();
+      while (result == nullptr && should_retry_allocation(original_count)) {
         control_thread()->handle_alloc_failure(req, true);
         result = allocate_memory_under_lock(req, in_new_region);
       }
       if (result != nullptr) {
-        // If our allocation request has been satisifed after it initially failed, we count this as good gc progress
+        // If our allocation request has been satisfied after it initially failed, we count this as good gc progress
         notify_gc_progress();
       }
       if (log_develop_is_enabled(Debug, gc, alloc)) {
@@ -1050,6 +1051,11 @@ HeapWord* ShenandoahHeap::allocate_memory(ShenandoahAllocRequest& req) {
   return result;
 }
 
+inline bool ShenandoahHeap::should_retry_allocation(size_t original_full_gc_count) const {
+  return shenandoah_policy()->full_gc_count() == original_full_gc_count
+      && !shenandoah_policy()->is_at_shutdown();
+}
+
 HeapWord* ShenandoahHeap::allocate_memory_under_lock(ShenandoahAllocRequest& req, bool& in_new_region) {
   // If we are dealing with mutator allocation, then we may need to block for safepoint.
   // We cannot block for safepoint for GC allocations, because there is a high chance
@@ -2120,9 +2126,9 @@ size_t ShenandoahHeap::tlab_used(Thread* thread) const {
   return _free_set->used();
 }
 
-bool ShenandoahHeap::try_cancel_gc() {
-  jbyte prev = _cancelled_gc.cmpxchg(CANCELLED, CANCELLABLE);
-  return prev == CANCELLABLE;
+bool ShenandoahHeap::try_cancel_gc(GCCause::Cause cause) {
+  jbyte prev = _cancelled_gc.cmpxchg(cause, GCCause::_no_gc);
+  return prev == GCCause::_no_gc;
 }
 
 void ShenandoahHeap::cancel_concurrent_mark() {
@@ -2136,13 +2142,15 @@ void ShenandoahHeap::cancel_concurrent_mark() {
   ShenandoahBarrierSet::satb_mark_queue_set().abandon_partial_marking();
 }
 
-void ShenandoahHeap::cancel_gc(GCCause::Cause cause) {
-  if (try_cancel_gc()) {
+bool ShenandoahHeap::cancel_gc(GCCause::Cause cause) {
+  if (try_cancel_gc(cause)) {
     FormatBuffer<> msg("Cancelling GC: %s", GCCause::to_string(cause));
-    log_info(gc)("%s", msg.buffer());
+    log_info(gc,thread)("%s", msg.buffer());
     Events::log(Thread::current(), "%s", msg.buffer());
     _cancel_requested_time = os::elapsedTime();
+    return true;
   }
+  return false;
 }
 
 uint ShenandoahHeap::max_workers() {
@@ -2155,18 +2163,10 @@ void ShenandoahHeap::stop() {
   // Step 0. Notify policy to disable event recording and prevent visiting gc threads during shutdown
   _shenandoah_policy->record_shutdown();
 
-  // Step 0a. Stop reporting on gc thread cpu utilization
+  // Step 1. Stop reporting on gc thread cpu utilization
   mmu_tracker()->stop();
 
-  // Step 1. Notify control thread that we are in shutdown.
-  // Note that we cannot do that with stop(), because stop() is blocking and waits for the actual shutdown.
-  // Doing stop() here would wait for the normal GC cycle to complete, never falling through to cancel below.
-  control_thread()->prepare_for_graceful_shutdown();
-
-  // Step 2. Notify GC workers that we are cancelling GC.
-  cancel_gc(GCCause::_shenandoah_stop_vm);
-
-  // Step 3. Wait until GC worker exits normally.
+  // Step 2. Wait until GC worker exits normally (this will cancel any ongoing GC).
   control_thread()->stop();
 
   // Stop 4. Shutdown uncommit thread.
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahHeap.hpp b/src/hotspot/share/gc/shenandoah/shenandoahHeap.hpp
index 785e1742b0c..33d2db0b2f1 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahHeap.hpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahHeap.hpp
@@ -430,35 +430,38 @@ public:
 private:
   void manage_satb_barrier(bool active);
 
-  enum CancelState {
-    // Normal state. GC has not been cancelled and is open for cancellation.
-    // Worker threads can suspend for safepoint.
-    CANCELLABLE,
-
-    // GC has been cancelled. Worker threads can not suspend for
-    // safepoint but must finish their work as soon as possible.
-    CANCELLED
-  };
-
+  // Records the time of the first successful cancellation request. This is used to measure
+  // the responsiveness of the heuristic when starting a cycle.
   double _cancel_requested_time;
-  ShenandoahSharedEnumFlag<CancelState> _cancelled_gc;
+
+  // Indicates the reason the current GC has been cancelled (GCCause::_no_gc means the gc is not cancelled).
+  ShenandoahSharedEnumFlag<GCCause::Cause> _cancelled_gc;
 
   // Returns true if cancel request was successfully communicated.
   // Returns false if some other thread already communicated cancel
   // request.  A true return value does not mean GC has been
   // cancelled, only that the process of cancelling GC has begun.
-  bool try_cancel_gc();
+  bool try_cancel_gc(GCCause::Cause cause);
 
 public:
+  // True if gc has been cancelled
   inline bool cancelled_gc() const;
+
+  // Used by workers in the GC cycle to detect cancellation and honor STS requirements
   inline bool check_cancelled_gc_and_yield(bool sts_active = true);
 
+  // This indicates the reason the last GC cycle was cancelled.
+  inline GCCause::Cause cancelled_cause() const;
+
+  // Clears the cancellation cause and optionally resets the oom handler (cancelling an
+  // old mark does _not_ touch the oom handler).
   inline void clear_cancelled_gc(bool clear_oom_handler = true);
 
   void cancel_concurrent_mark();
-  void cancel_gc(GCCause::Cause cause);
 
-public:
+  // Returns true if and only if this call caused a gc to be cancelled.
+  bool cancel_gc(GCCause::Cause cause);
+
   // Returns true if the soft maximum heap has been changed using management APIs.
   bool check_soft_max_changed();
 
@@ -690,6 +693,9 @@ private:
   HeapWord* allocate_from_gclab_slow(Thread* thread, size_t size);
   HeapWord* allocate_new_gclab(size_t min_size, size_t word_size, size_t* actual_size);
 
+  // We want to retry an unsuccessful attempt at allocation until at least a full gc.
+  bool should_retry_allocation(size_t original_full_gc_count) const;
+
 public:
   HeapWord* allocate_memory(ShenandoahAllocRequest& request);
   HeapWord* mem_allocate(size_t size, bool* what) override;
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahHeap.inline.hpp b/src/hotspot/share/gc/shenandoah/shenandoahHeap.inline.hpp
index 461447cf9ba..13c203d423c 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahHeap.inline.hpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahHeap.inline.hpp
@@ -252,7 +252,7 @@ inline void ShenandoahHeap::atomic_clear_oop(narrowOop* addr, narrowOop compare)
 }
 
 inline bool ShenandoahHeap::cancelled_gc() const {
-  return _cancelled_gc.get() == CANCELLED;
+  return _cancelled_gc.get() != GCCause::_no_gc;
 }
 
 inline bool ShenandoahHeap::check_cancelled_gc_and_yield(bool sts_active) {
@@ -264,8 +264,12 @@ inline bool ShenandoahHeap::check_cancelled_gc_and_yield(bool sts_active) {
   return cancelled_gc();
 }
 
+inline GCCause::Cause ShenandoahHeap::cancelled_cause() const {
+  return _cancelled_gc.get();
+}
+
 inline void ShenandoahHeap::clear_cancelled_gc(bool clear_oom_handler) {
-  _cancelled_gc.set(CANCELLABLE);
+  _cancelled_gc.set(GCCause::_no_gc);
   if (_cancel_requested_time > 0) {
     log_debug(gc)("GC cancellation took %.3fs", (os::elapsedTime() - _cancel_requested_time));
     _cancel_requested_time = 0;
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahOldGeneration.cpp b/src/hotspot/share/gc/shenandoah/shenandoahOldGeneration.cpp
index 38887217255..9b030905b6d 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahOldGeneration.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahOldGeneration.cpp
@@ -495,7 +495,7 @@ const char* ShenandoahOldGeneration::state_name(State state) {
 
 void ShenandoahOldGeneration::transition_to(State new_state) {
   if (_state != new_state) {
-    log_debug(gc)("Old generation transition from %s to %s", state_name(_state), state_name(new_state));
+    log_debug(gc, thread)("Old generation transition from %s to %s", state_name(_state), state_name(new_state));
     EventMark event("Old was %s, now is %s", state_name(_state), state_name(new_state));
     validate_transition(new_state);
     _state = new_state;
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahRegulatorThread.cpp b/src/hotspot/share/gc/shenandoah/shenandoahRegulatorThread.cpp
index 752ad743520..f9e6f714c7f 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahRegulatorThread.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahRegulatorThread.cpp
@@ -33,15 +33,14 @@
 #include "logging/log.hpp"
 
 ShenandoahRegulatorThread::ShenandoahRegulatorThread(ShenandoahGenerationalControlThread* control_thread) :
-  ConcurrentGCThread(),
+  _heap(ShenandoahHeap::heap()),
   _control_thread(control_thread),
   _sleep(ShenandoahControlIntervalMin),
   _last_sleep_adjust_time(os::elapsedTime()) {
   shenandoah_assert_generational();
-  ShenandoahHeap* heap = ShenandoahHeap::heap();
-  _old_heuristics = heap->old_generation()->heuristics();
-  _young_heuristics = heap->young_generation()->heuristics();
-  _global_heuristics = heap->global_generation()->heuristics();
+  _old_heuristics = _heap->old_generation()->heuristics();
+  _young_heuristics = _heap->young_generation()->heuristics();
+  _global_heuristics = _heap->global_generation()->heuristics();
 
   set_name("Shenandoah Regulator Thread");
   create_and_start();
@@ -62,7 +61,7 @@ void ShenandoahRegulatorThread::regulate_young_and_old_cycles() {
     ShenandoahGenerationalControlThread::GCMode mode = _control_thread->gc_mode();
     if (mode == ShenandoahGenerationalControlThread::none) {
       if (should_start_metaspace_gc()) {
-        if (request_concurrent_gc(GLOBAL)) {
+        if (request_concurrent_gc(_heap->global_generation())) {
           // Some of vmTestbase/metaspace tests depend on following line to count GC cycles
           _global_heuristics->log_trigger("%s", GCCause::to_string(GCCause::_metadata_GC_threshold));
           _global_heuristics->cancel_trigger_request();
@@ -75,10 +74,14 @@ void ShenandoahRegulatorThread::regulate_young_and_old_cycles() {
             log_debug(gc)("Heuristics request for old collection accepted");
             _young_heuristics->cancel_trigger_request();
             _old_heuristics->cancel_trigger_request();
-          } else if (request_concurrent_gc(YOUNG)) {
+          } else if (request_concurrent_gc(_heap->young_generation())) {
             log_debug(gc)("Heuristics request for young collection accepted");
             _young_heuristics->cancel_trigger_request();
           }
+        } else if (_old_heuristics->should_resume_old_cycle() || _old_heuristics->should_start_gc()) {
+          if (request_concurrent_gc(_heap->old_generation())) {
+            log_debug(gc)("Heuristics request to resume old collection accepted");
+          }
         }
       }
     } else if (mode == ShenandoahGenerationalControlThread::servicing_old) {
@@ -132,19 +135,19 @@ void ShenandoahRegulatorThread::regulator_sleep() {
   }
 }
 
-bool ShenandoahRegulatorThread::start_old_cycle() {
-  return _old_heuristics->should_start_gc() && request_concurrent_gc(OLD);
+bool ShenandoahRegulatorThread::start_old_cycle() const {
+  return _old_heuristics->should_start_gc() && request_concurrent_gc(_heap->old_generation());
 }
 
-bool ShenandoahRegulatorThread::start_young_cycle() {
-  return _young_heuristics->should_start_gc() && request_concurrent_gc(YOUNG);
+bool ShenandoahRegulatorThread::start_young_cycle() const {
+  return _young_heuristics->should_start_gc() && request_concurrent_gc(_heap->young_generation());
 }
 
-bool ShenandoahRegulatorThread::start_global_cycle() {
-  return _global_heuristics->should_start_gc() && request_concurrent_gc(GLOBAL);
+bool ShenandoahRegulatorThread::start_global_cycle() const {
+  return _global_heuristics->should_start_gc() && request_concurrent_gc(_heap->global_generation());
 }
 
-bool ShenandoahRegulatorThread::request_concurrent_gc(ShenandoahGenerationType generation) {
+bool ShenandoahRegulatorThread::request_concurrent_gc(ShenandoahGeneration* generation) const {
   double now = os::elapsedTime();
   bool accepted = _control_thread->request_concurrent_gc(generation);
   if (LogTarget(Debug, gc, thread)::is_enabled() && accepted) {
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahRegulatorThread.hpp b/src/hotspot/share/gc/shenandoah/shenandoahRegulatorThread.hpp
index f9f7e25f97c..a72d6004beb 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahRegulatorThread.hpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahRegulatorThread.hpp
@@ -26,8 +26,11 @@
 
 #include "gc/shared/concurrentGCThread.hpp"
 
+class ShenandoahHeap;
 class ShenandoahHeuristics;
+class ShenandoahGeneration;
 class ShenandoahGenerationalControlThread;
+class ShenandoahOldHeuristics;
 
 /*
  * The purpose of this class (and thread) is to allow us to continue
@@ -58,9 +61,10 @@ class ShenandoahRegulatorThread: public ConcurrentGCThread {
   void regulate_young_and_global_cycles();
 
   // These return true if a cycle was started.
-  bool start_old_cycle();
-  bool start_young_cycle();
-  bool start_global_cycle();
+  bool start_old_cycle() const;
+  bool start_young_cycle() const;
+  bool start_global_cycle() const;
+  bool resume_old_cycle();
 
   // The generational mode can only unload classes in a global cycle. The regulator
   // thread itself will trigger a global cycle if metaspace is out of memory.
@@ -70,11 +74,12 @@ class ShenandoahRegulatorThread: public ConcurrentGCThread {
   void regulator_sleep();
 
   // Provides instrumentation to track how long it takes to acknowledge a request.
-  bool request_concurrent_gc(ShenandoahGenerationType generation);
+  bool request_concurrent_gc(ShenandoahGeneration* generation) const;
 
+  ShenandoahHeap* _heap;
   ShenandoahGenerationalControlThread* _control_thread;
   ShenandoahHeuristics* _young_heuristics;
-  ShenandoahHeuristics* _old_heuristics;
+  ShenandoahOldHeuristics* _old_heuristics;
   ShenandoahHeuristics* _global_heuristics;
 
   uint _sleep;
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahScanRemembered.cpp b/src/hotspot/share/gc/shenandoah/shenandoahScanRemembered.cpp
index 9bbb76b3e48..109e940e2bd 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahScanRemembered.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahScanRemembered.cpp
@@ -475,7 +475,7 @@ HeapWord* ShenandoahScanRemembered::addr_for_cluster(size_t cluster_no) {
 void ShenandoahScanRemembered::roots_do(OopIterateClosure* cl) {
   ShenandoahHeap* heap = ShenandoahHeap::heap();
   bool old_bitmap_stable = heap->old_generation()->is_mark_complete();
-  log_info(gc, remset)("Scan remembered set using bitmap: %s", BOOL_TO_STR(old_bitmap_stable));
+  log_debug(gc, remset)("Scan remembered set using bitmap: %s", BOOL_TO_STR(old_bitmap_stable));
   for (size_t i = 0, n = heap->num_regions(); i < n; ++i) {
     ShenandoahHeapRegion* region = heap->get_region(i);
     if (region->is_old() && region->is_active() && !region->is_cset()) {
@@ -653,7 +653,7 @@ ShenandoahScanRememberedTask::ShenandoahScanRememberedTask(ShenandoahObjToScanQu
   WorkerTask("Scan Remembered Set"),
   _queue_set(queue_set), _old_queue_set(old_queue_set), _rp(rp), _work_list(work_list), _is_concurrent(is_concurrent) {
   bool old_bitmap_stable = ShenandoahHeap::heap()->old_generation()->is_mark_complete();
-  log_info(gc, remset)("Scan remembered set using bitmap: %s", BOOL_TO_STR(old_bitmap_stable));
+  log_debug(gc, remset)("Scan remembered set using bitmap: %s", BOOL_TO_STR(old_bitmap_stable));
 }
 
 void ShenandoahScanRememberedTask::work(uint worker_id) {

From 96613cc53842bc744e220e5bf7d91e92d0769a8e Mon Sep 17 00:00:00 2001
From: Joe Wang <joehw@openjdk.org>
Date: Tue, 4 Mar 2025 03:49:17 +0000
Subject: [PATCH 205/587] 8349516: StAXStream2SAX.handleCharacters() fails on
 empty CDATA

Reviewed-by: naoto
---
 .../internal/xsltc/trax/StAXStream2SAX.java   | 22 ++------
 .../unittest/validation/ValidationTest.java   | 54 ++++++++++++++++++-
 2 files changed, 57 insertions(+), 19 deletions(-)

diff --git a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/StAXStream2SAX.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/StAXStream2SAX.java
index 4667226f1bc..6746ede9d9b 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/StAXStream2SAX.java
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/StAXStream2SAX.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -275,32 +275,18 @@ public class StAXStream2SAX implements XMLReader, Locator {
     }
 
     private void handleCharacters() throws XMLStreamException {
-
-        // workaround for bugid 5046319 - switch over to commented section
-        // below when it is fixed.
         int textLength = staxStreamReader.getTextLength();
         char[] chars = new char[textLength];
 
-        staxStreamReader.getTextCharacters(0, chars, 0, textLength);
+        if (textLength > 0) {
+            staxStreamReader.getTextCharacters(0, chars, 0, textLength);
+        }
 
         try {
             _sax.characters(chars, 0, chars.length);
         } catch (SAXException e) {
             throw new XMLStreamException(e);
         }
-
-
-//        int start = 0;
-//        int len;
-//        do {
-//            len = staxStreamReader.getTextCharacters(start, buf, 0, buf.length);
-//            start += len;
-//            try {
-//                _sax.characters(buf, 0, len);
-//            } catch (SAXException e) {
-//                throw new XMLStreamException(e);
-//            }
-//        } while (len == buf.length);
     }
 
     private void handleEndElement() throws XMLStreamException {
diff --git a/test/jaxp/javax/xml/jaxp/unittest/validation/ValidationTest.java b/test/jaxp/javax/xml/jaxp/unittest/validation/ValidationTest.java
index a4538bcf5b5..198196a6d13 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/validation/ValidationTest.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/validation/ValidationTest.java
@@ -26,6 +26,8 @@ package validation;
 
 import java.io.File;
 import java.io.FileInputStream;
+import java.io.Reader;
+import java.io.StringReader;
 import javax.xml.XMLConstants;
 import javax.xml.parsers.SAXParserFactory;
 import javax.xml.stream.XMLInputFactory;
@@ -33,6 +35,7 @@ import javax.xml.stream.XMLStreamReader;
 import javax.xml.stream.events.XMLEvent;
 import javax.xml.transform.Source;
 import javax.xml.transform.sax.SAXSource;
+import javax.xml.transform.stax.StAXSource;
 import javax.xml.transform.stream.StreamSource;
 import javax.xml.validation.Schema;
 import javax.xml.validation.SchemaFactory;
@@ -48,7 +51,7 @@ import org.xml.sax.helpers.XMLFilterImpl;
 
 /*
  * @test
- * @bug 8220818 8176447
+ * @bug 8220818 8176447 8349516
  * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
  * @run testng/othervm validation.ValidationTest
  * @summary Runs validations with schemas and sources
@@ -139,6 +142,55 @@ public class ValidationTest {
 
     }
 
+    /**
+     * Verifies the bug fix for 8349516, which adds a guard against empty text.
+     * Prior to the fix, calling {@link XMLStreamReader#getTextCharacters() XMLStreamReader#getTextCharacters()}
+     * with {@code length = 0} resulted in an {@code IndexOutOfBoundsException}.
+     *
+     * This test ensures that the fix prevents such an exception.
+     *
+     * @throws Exception if the test fails due to unexpected issues, such as errors
+     * in creating the schema or reader, or validation errors other than the
+     * {@code IndexOutOfBoundsException}.
+     */
+    @Test
+    public void testValidationWithStAX() throws Exception {
+        String schema = """
+            <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
+                targetNamespace="http://xxxx.com/schema/test"
+                attributeFormDefault="unqualified"
+                elementFormDefault="qualified"
+            >
+
+                <xs:element name="test">
+                    <xs:complexType>
+                    <xs:choice>
+                        <xs:element name="tag" type="xs:string" />
+                    </xs:choice>
+                    </xs:complexType>
+                </xs:element>
+
+            </xs:schema>
+            """;
+
+        String xml = """
+            <test xmlns="http://xxxx.com/schema/test">
+                <tag><![CDATA[]]></tag>
+            </test>
+            """;
+
+        Reader schemaReader = new StringReader(schema);
+        Reader xmlReader = new StringReader(xml);
+
+        Source source = new StreamSource(schemaReader);
+
+        Validator validator =
+                SchemaFactory.newInstance(XMLConstants.W3C_XML_SCHEMA_NS_URI).newSchema(source).newValidator();
+
+        XMLStreamReader xmlStreamReader = XMLInputFactory.newInstance().createXMLStreamReader(xmlReader);
+        validator.validate(new StAXSource(xmlStreamReader));
+    }
+
     private static String getTargetNamespace(String xsdFile) throws Exception {
         XMLStreamReader reader = XMLInputFactory.newInstance().createXMLStreamReader(new FileInputStream(xsdFile));
         while (reader.hasNext()) {

From 7c173fde4274a798f299876492a2cd833eee9fdd Mon Sep 17 00:00:00 2001
From: Xiaolong Peng <xpeng@openjdk.org>
Date: Tue, 4 Mar 2025 03:56:16 +0000
Subject: [PATCH 206/587] 8351077: Shenandoah: Update comments in
 ShenandoahConcurrentGC::op_reset_after_collect

Reviewed-by: wkemper, ysr
---
 .../share/gc/shenandoah/shenandoahConcurrentGC.cpp        | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/hotspot/share/gc/shenandoah/shenandoahConcurrentGC.cpp b/src/hotspot/share/gc/shenandoah/shenandoahConcurrentGC.cpp
index 316904f8bd0..49aa4b3610d 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahConcurrentGC.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahConcurrentGC.cpp
@@ -1230,11 +1230,9 @@ void ShenandoahConcurrentGC::op_reset_after_collect() {
 
   ShenandoahHeap* const heap = ShenandoahHeap::heap();
   if (heap->mode()->is_generational()) {
-    // Resetting bitmaps of young gen when bootstrap old GC or there is preempted old GC
-    // causes crash due to remembered set violation, hence condition is added to fix the crash.
-    // Assuming bitmaps of young gen are not used at all after the cycle, the crash should not
-    // have happend, it seems to tickle a bug in remembered set scan. Root causing and fixing of the bug
-    // will be tracked via ticket https://bugs.openjdk.org/browse/JDK-8347371
+    // If we are in the midst of an old gc bootstrap or an old marking, we want to leave the mark bit map of
+    // the young generation intact. In particular, reference processing in the old generation may potentially
+    // need the reachability of a young generation referent of a Reference object in the old generation.
     if (!_do_old_gc_bootstrap && !heap->is_concurrent_old_mark_in_progress()) {
       heap->young_generation()->reset_mark_bitmap<false>();
     }

From d9b98f72c29f9cf8828fbd33799378bc6b9bfc08 Mon Sep 17 00:00:00 2001
From: Kim Barrett <kbarrett@openjdk.org>
Date: Tue, 4 Mar 2025 04:27:24 +0000
Subject: [PATCH 207/587] 8350771: Fix -Wzero-as-null-pointer-constant warning
 in nsk/monitoring ThreadController utility

Reviewed-by: dholmes
---
 .../vmTestbase/nsk/monitoring/share/ThreadController.cpp    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/test/hotspot/jtreg/vmTestbase/nsk/monitoring/share/ThreadController.cpp b/test/hotspot/jtreg/vmTestbase/nsk/monitoring/share/ThreadController.cpp
index 90fd4df97e6..247705d9b9a 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/monitoring/share/ThreadController.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/monitoring/share/ThreadController.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -465,8 +465,8 @@ extern "C" {
                 return env->NewStringUTF("TIMED_WAITING");
             }
         // should never reach
-        assert(0);
-        return 0;
+        assert(false);
+        return nullptr;
     }
 
     /*

From b6e2d66cc4c100d6604ce3edd25e04d459ed1ef1 Mon Sep 17 00:00:00 2001
From: Ioi Lam <iklam@openjdk.org>
Date: Tue, 4 Mar 2025 05:23:16 +0000
Subject: [PATCH 208/587] 8351087: Combine scratch object tables in
 heapShared.cpp

Reviewed-by: ccheung
---
 src/hotspot/share/cds/heapShared.cpp  | 22 ++++++++++------------
 src/hotspot/share/cds/heapShared.hpp  |  5 ++---
 src/hotspot/share/memory/universe.cpp |  2 +-
 3 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/src/hotspot/share/cds/heapShared.cpp b/src/hotspot/share/cds/heapShared.cpp
index 7bd5d5a6267..0dc1d255da7 100644
--- a/src/hotspot/share/cds/heapShared.cpp
+++ b/src/hotspot/share/cds/heapShared.cpp
@@ -141,8 +141,7 @@ GrowableArrayCHeap<oop, mtClassShared>* HeapShared::_pending_roots = nullptr;
 GrowableArrayCHeap<OopHandle, mtClassShared>* HeapShared::_root_segments;
 int HeapShared::_root_segment_max_size_elems;
 OopHandle HeapShared::_scratch_basic_type_mirrors[T_VOID+1];
-MetaspaceObjToOopHandleTable* HeapShared::_scratch_java_mirror_table = nullptr;
-MetaspaceObjToOopHandleTable* HeapShared::_scratch_references_table = nullptr;
+MetaspaceObjToOopHandleTable* HeapShared::_scratch_objects_table = nullptr;
 
 static bool is_subgraph_root_class_of(ArchivableStaticFieldInfo fields[], InstanceKlass* ik) {
   for (int i = 0; fields[i].valid(); i++) {
@@ -393,20 +392,19 @@ public:
 
 void HeapShared::add_scratch_resolved_references(ConstantPool* src, objArrayOop dest) {
   if (SystemDictionaryShared::is_builtin_loader(src->pool_holder()->class_loader_data())) {
-    _scratch_references_table->set_oop(src, dest);
+    _scratch_objects_table->set_oop(src, dest);
   }
 }
 
 objArrayOop HeapShared::scratch_resolved_references(ConstantPool* src) {
-  return (objArrayOop)_scratch_references_table->get_oop(src);
+  return (objArrayOop)_scratch_objects_table->get_oop(src);
 }
 
 void HeapShared::init_dumping() {
-  _scratch_java_mirror_table = new (mtClass)MetaspaceObjToOopHandleTable();
-  _scratch_references_table = new (mtClass)MetaspaceObjToOopHandleTable();
+  _scratch_objects_table = new (mtClass)MetaspaceObjToOopHandleTable();
 }
 
-void HeapShared::init_scratch_objects(TRAPS) {
+void HeapShared::init_scratch_objects_for_basic_type_mirrors(TRAPS) {
   for (int i = T_BOOLEAN; i < T_VOID+1; i++) {
     BasicType bt = (BasicType)i;
     if (!is_reference_type(bt)) {
@@ -448,24 +446,24 @@ oop HeapShared::scratch_java_mirror(BasicType t) {
 }
 
 oop HeapShared::scratch_java_mirror(Klass* k) {
-  return _scratch_java_mirror_table->get_oop(k);
+  return _scratch_objects_table->get_oop(k);
 }
 
 void HeapShared::set_scratch_java_mirror(Klass* k, oop mirror) {
-  _scratch_java_mirror_table->set_oop(k, mirror);
+  _scratch_objects_table->set_oop(k, mirror);
 }
 
 void HeapShared::remove_scratch_objects(Klass* k) {
   // Klass is being deallocated. Java mirror can still be alive, and it should not
   // point to dead klass. We need to break the link from mirror to the Klass.
   // See how InstanceKlass::deallocate_contents does it for normal mirrors.
-  oop mirror = _scratch_java_mirror_table->get_oop(k);
+  oop mirror = _scratch_objects_table->get_oop(k);
   if (mirror != nullptr) {
     java_lang_Class::set_klass(mirror, nullptr);
   }
-  _scratch_java_mirror_table->remove_oop(k);
+  _scratch_objects_table->remove_oop(k);
   if (k->is_instance_klass()) {
-    _scratch_references_table->remove(InstanceKlass::cast(k)->constants());
+    _scratch_objects_table->remove(InstanceKlass::cast(k)->constants());
   }
 }
 
diff --git a/src/hotspot/share/cds/heapShared.hpp b/src/hotspot/share/cds/heapShared.hpp
index ba2fe5be775..9ad09882410 100644
--- a/src/hotspot/share/cds/heapShared.hpp
+++ b/src/hotspot/share/cds/heapShared.hpp
@@ -284,8 +284,7 @@ private:
   static GrowableArrayCHeap<OopHandle, mtClassShared>* _root_segments;
   static int _root_segment_max_size_elems;
   static OopHandle _scratch_basic_type_mirrors[T_VOID+1];
-  static MetaspaceObjToOopHandleTable* _scratch_java_mirror_table;
-  static MetaspaceObjToOopHandleTable* _scratch_references_table;
+  static MetaspaceObjToOopHandleTable* _scratch_objects_table;
 
   static void init_seen_objects_table() {
     assert(_seen_objects_table == nullptr, "must be");
@@ -406,7 +405,7 @@ private:
   static objArrayOop scratch_resolved_references(ConstantPool* src);
   static void add_scratch_resolved_references(ConstantPool* src, objArrayOop dest) NOT_CDS_JAVA_HEAP_RETURN;
   static void init_dumping() NOT_CDS_JAVA_HEAP_RETURN;
-  static void init_scratch_objects(TRAPS) NOT_CDS_JAVA_HEAP_RETURN;
+  static void init_scratch_objects_for_basic_type_mirrors(TRAPS) NOT_CDS_JAVA_HEAP_RETURN;
   static void init_box_classes(TRAPS) NOT_CDS_JAVA_HEAP_RETURN;
   static bool is_heap_region(int idx) {
     CDS_JAVA_HEAP_ONLY(return (idx == MetaspaceShared::hp);)
diff --git a/src/hotspot/share/memory/universe.cpp b/src/hotspot/share/memory/universe.cpp
index 3097ad1be10..fe9c960b7f2 100644
--- a/src/hotspot/share/memory/universe.cpp
+++ b/src/hotspot/share/memory/universe.cpp
@@ -572,7 +572,7 @@ void Universe::initialize_basic_type_mirrors(TRAPS) {
       }
     }
     if (CDSConfig::is_dumping_heap()) {
-      HeapShared::init_scratch_objects(CHECK);
+      HeapShared::init_scratch_objects_for_basic_type_mirrors(CHECK);
     }
 }
 

From 4fc72b8e4b22db2aa3217afb5b8c30d496589eb8 Mon Sep 17 00:00:00 2001
From: Ioi Lam <iklam@openjdk.org>
Date: Tue, 4 Mar 2025 05:23:30 +0000
Subject: [PATCH 209/587] 8351082: Remove dead code for estimating CDS archive
 size

Reviewed-by: ccheung
---
 .../share/classfile/compactHashtable.cpp      | 13 -------
 .../share/classfile/compactHashtable.hpp      |  2 -
 src/hotspot/share/classfile/moduleEntry.hpp   |  3 +-
 src/hotspot/share/classfile/symbolTable.cpp   |  7 ----
 src/hotspot/share/classfile/symbolTable.hpp   |  1 -
 .../classfile/systemDictionaryShared.cpp      | 39 -------------------
 .../classfile/systemDictionaryShared.hpp      |  1 -
 7 files changed, 1 insertion(+), 65 deletions(-)

diff --git a/src/hotspot/share/classfile/compactHashtable.cpp b/src/hotspot/share/classfile/compactHashtable.cpp
index 5a3c6998904..8d50e8136a3 100644
--- a/src/hotspot/share/classfile/compactHashtable.cpp
+++ b/src/hotspot/share/classfile/compactHashtable.cpp
@@ -72,19 +72,6 @@ CompactHashtableWriter::~CompactHashtableWriter() {
   FREE_C_HEAP_ARRAY(GrowableArray<Entry>*, _buckets);
 }
 
-size_t CompactHashtableWriter::estimate_size(int num_entries) {
-  int num_buckets = calculate_num_buckets(num_entries);
-  size_t bucket_bytes = ArchiveBuilder::ro_array_bytesize<u4>(num_buckets + 1);
-
-  // In worst case, we have no VALUE_ONLY_BUCKET_TYPE, so each entry takes 2 slots
-  int entries_space = 2 * num_entries;
-  size_t entry_bytes = ArchiveBuilder::ro_array_bytesize<u4>(entries_space);
-
-  return bucket_bytes
-       + entry_bytes
-       + SimpleCompactHashtable::calculate_header_size();
-}
-
 // Add a symbol entry to the temporary hash table
 void CompactHashtableWriter::add(unsigned int hash, u4 value) {
   int index = hash % _num_buckets;
diff --git a/src/hotspot/share/classfile/compactHashtable.hpp b/src/hotspot/share/classfile/compactHashtable.hpp
index 73e9f7fc092..161f21eac99 100644
--- a/src/hotspot/share/classfile/compactHashtable.hpp
+++ b/src/hotspot/share/classfile/compactHashtable.hpp
@@ -134,8 +134,6 @@ private:
 
 public:
   void dump(SimpleCompactHashtable *cht, const char* table_name);
-
-  static size_t estimate_size(int num_entries);
 };
 #endif // INCLUDE_CDS
 
diff --git a/src/hotspot/share/classfile/moduleEntry.hpp b/src/hotspot/share/classfile/moduleEntry.hpp
index 9ad7bde8954..c2d07a78512 100644
--- a/src/hotspot/share/classfile/moduleEntry.hpp
+++ b/src/hotspot/share/classfile/moduleEntry.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -207,7 +207,6 @@ public:
   void load_from_archive(ClassLoaderData* loader_data);
   void restore_archived_oops(ClassLoaderData* loader_data);
   void clear_archived_oops();
-  void update_oops_in_archived_module(int root_oop_index);
   static void verify_archived_module_entries() PRODUCT_RETURN;
 #endif
 };
diff --git a/src/hotspot/share/classfile/symbolTable.cpp b/src/hotspot/share/classfile/symbolTable.cpp
index 3cb453aaecb..04640b672f6 100644
--- a/src/hotspot/share/classfile/symbolTable.cpp
+++ b/src/hotspot/share/classfile/symbolTable.cpp
@@ -705,13 +705,6 @@ void SymbolTable::copy_shared_symbol_table(GrowableArray<Symbol*>* symbols,
   }
 }
 
-size_t SymbolTable::estimate_size_for_archive() {
-  if (_items_count > (size_t)max_jint) {
-    fatal("Too many symbols to be archived: %zu", _items_count);
-  }
-  return CompactHashtableWriter::estimate_size(int(_items_count));
-}
-
 void SymbolTable::write_to_archive(GrowableArray<Symbol*>* symbols) {
   CompactHashtableWriter writer(int(_items_count), ArchiveBuilder::symbol_stats());
   copy_shared_symbol_table(symbols, &writer);
diff --git a/src/hotspot/share/classfile/symbolTable.hpp b/src/hotspot/share/classfile/symbolTable.hpp
index a1e585e97de..ee2cfe19d8e 100644
--- a/src/hotspot/share/classfile/symbolTable.hpp
+++ b/src/hotspot/share/classfile/symbolTable.hpp
@@ -161,7 +161,6 @@ private:
   static void copy_shared_symbol_table(GrowableArray<Symbol*>* symbols,
                                        CompactHashtableWriter* ch_table);
 public:
-  static size_t estimate_size_for_archive() NOT_CDS_RETURN_(0);
   static void write_to_archive(GrowableArray<Symbol*>* symbols) NOT_CDS_RETURN;
   static void serialize_shared_table_header(SerializeClosure* soc,
                                             bool is_static_archive = true) NOT_CDS_RETURN;
diff --git a/src/hotspot/share/classfile/systemDictionaryShared.cpp b/src/hotspot/share/classfile/systemDictionaryShared.cpp
index 6bd573ea465..8b815cf9cb7 100644
--- a/src/hotspot/share/classfile/systemDictionaryShared.cpp
+++ b/src/hotspot/share/classfile/systemDictionaryShared.cpp
@@ -1223,45 +1223,6 @@ bool SystemDictionaryShared::is_supported_invokedynamic(BootstrapInfo* bsi) {
   return false;
 }
 
-class EstimateSizeForArchive : StackObj {
-  size_t _shared_class_info_size;
-  int _num_builtin_klasses;
-  int _num_unregistered_klasses;
-
-public:
-  EstimateSizeForArchive() {
-    _shared_class_info_size = 0;
-    _num_builtin_klasses = 0;
-    _num_unregistered_klasses = 0;
-  }
-
-  void do_entry(InstanceKlass* k, DumpTimeClassInfo& info) {
-    if (!info.is_excluded()) {
-      size_t byte_size = info.runtime_info_bytesize();
-      _shared_class_info_size += align_up(byte_size, SharedSpaceObjectAlignment);
-    }
-  }
-
-  size_t total() {
-    return _shared_class_info_size;
-  }
-};
-
-size_t SystemDictionaryShared::estimate_size_for_archive() {
-  EstimateSizeForArchive est;
-  _dumptime_table->iterate_all_live_classes(&est);
-  size_t total_size = est.total() +
-    CompactHashtableWriter::estimate_size(_dumptime_table->count_of(true)) +
-    CompactHashtableWriter::estimate_size(_dumptime_table->count_of(false));
-
-  size_t bytesize = align_up(sizeof(RunTimeLambdaProxyClassInfo), SharedSpaceObjectAlignment);
-  total_size +=
-      (bytesize * _dumptime_lambda_proxy_class_dictionary->_count) +
-      CompactHashtableWriter::estimate_size(_dumptime_lambda_proxy_class_dictionary->_count);
-
-  return total_size;
-}
-
 unsigned int SystemDictionaryShared::hash_for_shared_dictionary(address ptr) {
   if (ArchiveBuilder::is_active()) {
     uintx offset = ArchiveBuilder::current()->any_to_offset(ptr);
diff --git a/src/hotspot/share/classfile/systemDictionaryShared.hpp b/src/hotspot/share/classfile/systemDictionaryShared.hpp
index 7286bdad3fd..c7f38880837 100644
--- a/src/hotspot/share/classfile/systemDictionaryShared.hpp
+++ b/src/hotspot/share/classfile/systemDictionaryShared.hpp
@@ -294,7 +294,6 @@ public:
   static void set_excluded_locked(InstanceKlass* k);
   static bool warn_excluded(InstanceKlass* k, const char* reason);
   static void dumptime_classes_do(class MetaspaceClosure* it);
-  static size_t estimate_size_for_archive();
   static void write_to_archive(bool is_static_archive = true);
   static void adjust_lambda_proxy_class_dictionary();
   static void serialize_dictionary_headers(class SerializeClosure* soc,

From 1f10ffba88119caab169b1fc43ccfd143e3b85a6 Mon Sep 17 00:00:00 2001
From: Axel Boldt-Christmas <aboldtch@openjdk.org>
Date: Tue, 4 Mar 2025 07:30:10 +0000
Subject: [PATCH 210/587] 8350851: ZGC: Reduce size of ZAddressOffsetMax
 scaling data structures

Reviewed-by: eosterlund, jsikstro
---
 src/hotspot/share/gc/z/zIndexDistributor.hpp  |  6 +++
 .../share/gc/z/zIndexDistributor.inline.hpp   | 39 +++++++++++++++----
 src/hotspot/share/gc/z/zMemory.cpp            | 12 ++++++
 src/hotspot/share/gc/z/zMemory.hpp            |  1 +
 src/hotspot/share/gc/z/zPageTable.cpp         | 11 +++++-
 src/hotspot/share/gc/z/zPageTable.hpp         |  2 +
 src/hotspot/share/gc/z/zPageTable.inline.hpp  | 11 +++++-
 src/hotspot/share/gc/z/zVirtualMemory.cpp     |  3 ++
 src/hotspot/share/gc/z/zVirtualMemory.hpp     |  1 +
 .../share/gc/z/zVirtualMemory.inline.hpp      |  4 ++
 10 files changed, 81 insertions(+), 9 deletions(-)

diff --git a/src/hotspot/share/gc/z/zIndexDistributor.hpp b/src/hotspot/share/gc/z/zIndexDistributor.hpp
index 94f146176d6..d4b9edcb5b4 100644
--- a/src/hotspot/share/gc/z/zIndexDistributor.hpp
+++ b/src/hotspot/share/gc/z/zIndexDistributor.hpp
@@ -24,6 +24,8 @@
 #ifndef SHARE_GC_Z_ZINDEXDISTRIBUTOR_HPP
 #define SHARE_GC_Z_ZINDEXDISTRIBUTOR_HPP
 
+#include <utilities/globalDefinitions.hpp>
+
 class ZIndexDistributor {
 private:
   void* _strategy;
@@ -39,6 +41,10 @@ public:
 
   template <typename Function>
   void do_indices(Function function);
+
+  // Returns a count that is max_count or larger and upholds the requirements
+  // for using the ZIndexDistributor strategy specfied by ZIndexDistributorStrategy
+  static size_t get_count(size_t max_count);
 };
 
 #endif // SHARE_GC_Z_ZINDEXDISTRIBUTOR_HPP
diff --git a/src/hotspot/share/gc/z/zIndexDistributor.inline.hpp b/src/hotspot/share/gc/z/zIndexDistributor.inline.hpp
index c582be8fcee..163dd2ad685 100644
--- a/src/hotspot/share/gc/z/zIndexDistributor.inline.hpp
+++ b/src/hotspot/share/gc/z/zIndexDistributor.inline.hpp
@@ -32,11 +32,13 @@
 #include "runtime/os.hpp"
 #include "runtime/thread.hpp"
 #include "utilities/align.hpp"
+#include "utilities/powerOfTwo.hpp"
 
 class ZIndexDistributorStriped : public CHeapObj<mtGC> {
   static const int MemSize = 4096;
+  static const int StripeCount = MemSize / ZCacheLineSize;
 
-  const int _max_index;
+  const int _count;
   // For claiming a stripe
   volatile int _claim_stripe;
   // For claiming inside a stripe
@@ -51,8 +53,8 @@ class ZIndexDistributorStriped : public CHeapObj<mtGC> {
   }
 
 public:
-  ZIndexDistributorStriped(int max_index)
-    : _max_index(max_index),
+  ZIndexDistributorStriped(int count)
+    : _count(count),
       _claim_stripe(0),
       _mem() {
     memset(_mem, 0, MemSize + ZCacheLineSize);
@@ -60,11 +62,10 @@ public:
 
   template <typename Function>
   void do_indices(Function function) {
-    const int count = MemSize / ZCacheLineSize;
-    const int stripe_max = _max_index / count;
+    const int stripe_max = _count / StripeCount;
 
     // Use claiming
-    for (int i; (i = claim_stripe()) < count;) {
+    for (int i; (i = claim_stripe()) < StripeCount;) {
       for (int index; (index = Atomic::fetch_then_add(claim_addr(i), 1, memory_order_relaxed)) < stripe_max;) {
         if (!function(i * stripe_max + index)) {
           return;
@@ -73,7 +74,7 @@ public:
     }
 
     // Use stealing
-    for (int i = 0; i < count; i++) {
+    for (int i = 0; i < StripeCount; i++) {
       for (int index; (index = Atomic::fetch_then_add(claim_addr(i), 1, memory_order_relaxed)) < stripe_max;) {
         if (!function(i * stripe_max + index)) {
           return;
@@ -81,6 +82,11 @@ public:
       }
     }
   }
+
+  static size_t get_count(size_t max_count) {
+    // Must be multiple of the StripeCount
+    return align_up(max_count, StripeCount);
+  }
 };
 
 class ZIndexDistributorClaimTree : public CHeapObj<mtGC> {
@@ -290,6 +296,12 @@ public:
     claim_and_do(function, indices, 0 /* level */);
     steal_and_do(function, indices, 0 /* level */);
   }
+
+  static size_t get_count(size_t max_count) {
+    // Must be at least claim_level_size(ClaimLevels) and a power of two
+    const size_t min_count = claim_level_size(ClaimLevels);
+    return round_up_power_of_2(MAX2(max_count, min_count));
+  }
 };
 
 // Using dynamically allocated objects just to be able to evaluate
@@ -328,4 +340,17 @@ inline void ZIndexDistributor::do_indices(Function function) {
   };
 }
 
+inline size_t ZIndexDistributor::get_count(size_t max_count) {
+  size_t required_count;
+  switch (ZIndexDistributorStrategy) {
+  case 0: required_count = ZIndexDistributorClaimTree::get_count(max_count); break;
+  case 1: required_count = ZIndexDistributorStriped::get_count(max_count); break;
+  default: fatal("Unknown ZIndexDistributorStrategy");
+  };
+
+  assert(max_count <= required_count, "unsupported max_count: %zu", max_count);
+
+  return required_count;
+}
+
 #endif // SHARE_GC_Z_ZINDEXDISTRIBUTOR_INLINE_HPP
diff --git a/src/hotspot/share/gc/z/zMemory.cpp b/src/hotspot/share/gc/z/zMemory.cpp
index 14578c2db8a..8ccde9f45a2 100644
--- a/src/hotspot/share/gc/z/zMemory.cpp
+++ b/src/hotspot/share/gc/z/zMemory.cpp
@@ -100,6 +100,18 @@ zoffset ZMemoryManager::peek_low_address() const {
   return zoffset(UINTPTR_MAX);
 }
 
+zoffset_end ZMemoryManager::peak_high_address_end() const {
+  ZLocker<ZLock> locker(&_lock);
+
+  const ZMemory* const area = _freelist.last();
+  if (area != nullptr) {
+    return area->end();
+  }
+
+  // Out of memory
+  return zoffset_end(UINTPTR_MAX);
+}
+
 zoffset ZMemoryManager::alloc_low_address(size_t size) {
   ZLocker<ZLock> locker(&_lock);
 
diff --git a/src/hotspot/share/gc/z/zMemory.hpp b/src/hotspot/share/gc/z/zMemory.hpp
index ce9100f8026..229d5a7c50c 100644
--- a/src/hotspot/share/gc/z/zMemory.hpp
+++ b/src/hotspot/share/gc/z/zMemory.hpp
@@ -86,6 +86,7 @@ public:
   void register_callbacks(const Callbacks& callbacks);
 
   zoffset peek_low_address() const;
+  zoffset_end peak_high_address_end() const;
   zoffset alloc_low_address(size_t size);
   zoffset alloc_low_address_at_most(size_t size, size_t* allocated);
   zoffset alloc_high_address(size_t size);
diff --git a/src/hotspot/share/gc/z/zPageTable.cpp b/src/hotspot/share/gc/z/zPageTable.cpp
index 9a4bbc85d04..d960270c451 100644
--- a/src/hotspot/share/gc/z/zPageTable.cpp
+++ b/src/hotspot/share/gc/z/zPageTable.cpp
@@ -23,13 +23,22 @@
 
 #include "gc/z/zAddress.hpp"
 #include "gc/z/zGranuleMap.inline.hpp"
+#include "gc/z/zIndexDistributor.inline.hpp"
 #include "gc/z/zPage.inline.hpp"
 #include "gc/z/zPageTable.inline.hpp"
 #include "runtime/orderAccess.hpp"
 #include "utilities/debug.hpp"
 
+static size_t get_max_offset_for_map() {
+  // The page table has (ZAddressOffsetMax >> ZGranuleSizeShift) slots
+  const size_t max_count = ZAddressOffsetMax >> ZGranuleSizeShift;
+  const size_t required_count = ZIndexDistributor::get_count(max_count);
+
+  return required_count << ZGranuleSizeShift;
+}
+
 ZPageTable::ZPageTable()
-  : _map(ZAddressOffsetMax) {}
+  : _map(get_max_offset_for_map()) {}
 
 void ZPageTable::insert(ZPage* page) {
   const zoffset offset = page->start();
diff --git a/src/hotspot/share/gc/z/zPageTable.hpp b/src/hotspot/share/gc/z/zPageTable.hpp
index e809a0ac0ca..fadf550d996 100644
--- a/src/hotspot/share/gc/z/zPageTable.hpp
+++ b/src/hotspot/share/gc/z/zPageTable.hpp
@@ -45,6 +45,8 @@ private:
 public:
   ZPageTable();
 
+  int count() const;
+
   ZPage* get(zaddress addr) const;
   ZPage* get(volatile zpointer* p) const;
 
diff --git a/src/hotspot/share/gc/z/zPageTable.inline.hpp b/src/hotspot/share/gc/z/zPageTable.inline.hpp
index 79a2d297df8..583017d5c9c 100644
--- a/src/hotspot/share/gc/z/zPageTable.inline.hpp
+++ b/src/hotspot/share/gc/z/zPageTable.inline.hpp
@@ -32,6 +32,15 @@
 #include "gc/z/zPage.inline.hpp"
 #include "gc/z/zPageAllocator.inline.hpp"
 
+#include <limits>
+
+inline int ZPageTable::count() const {
+  const size_t size = _map._size;
+  assert(size <= std::numeric_limits<int>::max(), "Invalid page table size");
+
+  return static_cast<int>(size);
+}
+
 inline ZPage* ZPageTable::get(zaddress addr) const {
   assert(!is_null(addr), "Invalid address");
   return _map.get(ZAddress::offset(addr));
@@ -64,7 +73,7 @@ inline bool ZPageTableIterator::next(ZPage** page) {
 
 inline ZPageTableParallelIterator::ZPageTableParallelIterator(const ZPageTable* table)
   : _table(table),
-    _index_distributor(int(ZAddressOffsetMax >> ZGranuleSizeShift)) {}
+    _index_distributor(table->count()) {}
 
 template <typename Function>
 inline void ZPageTableParallelIterator::do_pages(Function function) {
diff --git a/src/hotspot/share/gc/z/zVirtualMemory.cpp b/src/hotspot/share/gc/z/zVirtualMemory.cpp
index ccc30626a3f..21152cf4db6 100644
--- a/src/hotspot/share/gc/z/zVirtualMemory.cpp
+++ b/src/hotspot/share/gc/z/zVirtualMemory.cpp
@@ -48,6 +48,9 @@ ZVirtualMemoryManager::ZVirtualMemoryManager(size_t max_capacity)
     return;
   }
 
+  // Set ZAddressOffsetMax to the highest address end available after reservation
+  ZAddressOffsetMax = untype(highest_available_address_end());
+
   // Initialize platform specific parts after reserving address space
   pd_initialize_after_reserve();
 
diff --git a/src/hotspot/share/gc/z/zVirtualMemory.hpp b/src/hotspot/share/gc/z/zVirtualMemory.hpp
index a2df86262ea..57a377ab61b 100644
--- a/src/hotspot/share/gc/z/zVirtualMemory.hpp
+++ b/src/hotspot/share/gc/z/zVirtualMemory.hpp
@@ -77,6 +77,7 @@ public:
 
   size_t reserved() const;
   zoffset lowest_available_address() const;
+  zoffset_end highest_available_address_end() const;
 
   ZVirtualMemory alloc(size_t size, bool force_low_address);
   void free(const ZVirtualMemory& vmem);
diff --git a/src/hotspot/share/gc/z/zVirtualMemory.inline.hpp b/src/hotspot/share/gc/z/zVirtualMemory.inline.hpp
index 972e51a143b..9d5fe7dd57a 100644
--- a/src/hotspot/share/gc/z/zVirtualMemory.inline.hpp
+++ b/src/hotspot/share/gc/z/zVirtualMemory.inline.hpp
@@ -65,4 +65,8 @@ inline zoffset ZVirtualMemoryManager::lowest_available_address() const {
   return _manager.peek_low_address();
 }
 
+inline zoffset_end ZVirtualMemoryManager::highest_available_address_end() const {
+  return _manager.peak_high_address_end();
+}
+
 #endif // SHARE_GC_Z_ZVIRTUALMEMORY_INLINE_HPP

From fae37aaae8b36fd74309b84fa1fdf017c7d932ed Mon Sep 17 00:00:00 2001
From: Magnus Ihse Bursie <ihse@openjdk.org>
Date: Tue, 4 Mar 2025 10:27:52 +0000
Subject: [PATCH 211/587] 8345627: [REDO] Use gcc12
 -ftrivial-auto-var-init=pattern in debug builds

Reviewed-by: erikj, kbarrett
---
 make/autoconf/flags-cflags.m4                | 10 ++++++++++
 make/hotspot/lib/CompileGtest.gmk            |  1 +
 make/modules/jdk.incubator.vector/Lib.gmk    |  2 ++
 test/lib/jdk/test/lib/jvmti/jvmti_common.hpp |  2 +-
 4 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/make/autoconf/flags-cflags.m4 b/make/autoconf/flags-cflags.m4
index 857e2b65e57..238c9752fd1 100644
--- a/make/autoconf/flags-cflags.m4
+++ b/make/autoconf/flags-cflags.m4
@@ -482,6 +482,16 @@ AC_DEFUN([FLAGS_SETUP_CFLAGS_HELPER],
   else
     DEBUG_CFLAGS_JDK="-DDEBUG"
 
+    if test "x$TOOLCHAIN_TYPE" = xgcc; then
+      INIT_PATTERN_FLAG="-ftrivial-auto-var-init=pattern"
+      FLAGS_COMPILER_CHECK_ARGUMENTS(ARGUMENT: [$INIT_PATTERN_FLAG],
+          IF_TRUE: [
+            DEBUG_CFLAGS_JDK="$DEBUG_CFLAGS_JDK $INIT_PATTERN_FLAG"
+            DEBUG_CFLAGS_JVM="$INIT_PATTERN_FLAG"
+          ]
+      )
+    fi
+
     if test "x$TOOLCHAIN_TYPE" = xclang && test "x$OPENJDK_TARGET_OS" = xaix; then
       DEBUG_CFLAGS_JVM="-fpic -mcmodel=large"
     fi
diff --git a/make/hotspot/lib/CompileGtest.gmk b/make/hotspot/lib/CompileGtest.gmk
index 5c576cbbf0d..d2cdc7685c9 100644
--- a/make/hotspot/lib/CompileGtest.gmk
+++ b/make/hotspot/lib/CompileGtest.gmk
@@ -104,6 +104,7 @@ $(eval $(call SetupJdkLibrary, BUILD_GTEST_LIBJVM, \
         undef stringop-overflow, \
     DISABLED_WARNINGS_gcc_test_metaspace_misc.cpp := unused-const-variable, \
     DISABLED_WARNINGS_gcc_test_threadCpuLoad.cpp := address, \
+    DISABLED_WARNINGS_gcc_test_tribool.cpp := uninitialized, \
     DISABLED_WARNINGS_clang := $(DISABLED_WARNINGS_clang) \
         undef switch format-nonliteral tautological-undefined-compare \
         self-assign-overloaded, \
diff --git a/make/modules/jdk.incubator.vector/Lib.gmk b/make/modules/jdk.incubator.vector/Lib.gmk
index 6d1259cfe60..5c979ae8191 100644
--- a/make/modules/jdk.incubator.vector/Lib.gmk
+++ b/make/modules/jdk.incubator.vector/Lib.gmk
@@ -53,6 +53,7 @@ ifeq ($(call isTargetOs, linux)+$(call isTargetCpu, riscv64)+$(INCLUDE_COMPILER2
       DISABLED_WARNINGS_gcc := unused-function sign-compare tautological-compare ignored-qualifiers, \
       DISABLED_WARNINGS_clang := unused-function sign-compare tautological-compare ignored-qualifiers, \
       CFLAGS := -march=rv64gcv, \
+      CFLAGS_FILTER_OUT := -ftrivial-auto-var-init=pattern, \
   ))
 
   TARGETS += $(BUILD_LIBSLEEF)
@@ -67,6 +68,7 @@ ifeq ($(call isTargetOs, linux)+$(call isTargetCpu, aarch64)+$(INCLUDE_COMPILER2
       DISABLED_WARNINGS_gcc := unused-function sign-compare tautological-compare ignored-qualifiers, \
       DISABLED_WARNINGS_clang := unused-function sign-compare tautological-compare ignored-qualifiers, \
       vector_math_sve.c_CFLAGS := $(SVE_CFLAGS), \
+      CFLAGS_FILTER_OUT := -ftrivial-auto-var-init=pattern, \
   ))
 
   TARGETS += $(BUILD_LIBSLEEF)
diff --git a/test/lib/jdk/test/lib/jvmti/jvmti_common.hpp b/test/lib/jdk/test/lib/jvmti/jvmti_common.hpp
index f16b9fefb99..5efd58e7773 100644
--- a/test/lib/jdk/test/lib/jvmti/jvmti_common.hpp
+++ b/test/lib/jdk/test/lib/jvmti/jvmti_common.hpp
@@ -283,7 +283,7 @@ get_thread_info(jvmtiEnv *jvmti, JNIEnv* jni, jthread thread) {
 
 static jint
 get_thread_state(jvmtiEnv *jvmti, JNIEnv* jni, jthread thread) {
-  jint thread_state;
+  jint thread_state = 0;
   jvmtiError err = jvmti->GetThreadState(thread, &thread_state);
   check_jvmti_status(jni, err, "get_thread_state: error in JVMTI GetThreadState call");
   return thread_state;

From 7ee89a53014bc3509271a81c62c91646f891e546 Mon Sep 17 00:00:00 2001
From: Andrew Dinn <adinn@openjdk.org>
Date: Tue, 4 Mar 2025 12:18:56 +0000
Subject: [PATCH 212/587] 8350893: Use generated names for hand generated opto
 runtime blobs

Reviewed-by: kvn
---
 src/hotspot/cpu/aarch64/runtime_aarch64.cpp | 6 ++++--
 src/hotspot/cpu/arm/runtime_arm.cpp         | 8 +++++---
 src/hotspot/cpu/ppc/runtime_ppc.cpp         | 3 ++-
 src/hotspot/cpu/ppc/sharedRuntime_ppc.cpp   | 3 ++-
 src/hotspot/cpu/riscv/runtime_riscv.cpp     | 6 ++++--
 src/hotspot/cpu/s390/runtime_s390.cpp       | 3 ++-
 src/hotspot/cpu/s390/sharedRuntime_s390.cpp | 3 ++-
 src/hotspot/cpu/x86/runtime_x86_32.cpp      | 6 ++++--
 src/hotspot/cpu/x86/runtime_x86_64.cpp      | 6 ++++--
 9 files changed, 29 insertions(+), 15 deletions(-)

diff --git a/src/hotspot/cpu/aarch64/runtime_aarch64.cpp b/src/hotspot/cpu/aarch64/runtime_aarch64.cpp
index 635c074eadc..ba676573f39 100644
--- a/src/hotspot/cpu/aarch64/runtime_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/runtime_aarch64.cpp
@@ -63,7 +63,8 @@ void OptoRuntime::generate_uncommon_trap_blob() {
   // Allocate space for the code
   ResourceMark rm;
   // Setup code generation tools
-  CodeBuffer buffer("uncommon_trap_blob", 2048, 1024);
+  const char* name = OptoRuntime::stub_name(OptoStubId::uncommon_trap_id);
+  CodeBuffer buffer(name, 2048, 1024);
   MacroAssembler* masm = new MacroAssembler(&buffer);
 
   assert(SimpleRuntimeFrame::framesize % 4 == 0, "sp not 16-byte aligned");
@@ -282,7 +283,8 @@ void OptoRuntime::generate_exception_blob() {
   // Allocate space for the code
   ResourceMark rm;
   // Setup code generation tools
-  CodeBuffer buffer("exception_blob", 2048, 1024);
+  const char* name = OptoRuntime::stub_name(OptoStubId::exception_id);
+  CodeBuffer buffer(name, 2048, 1024);
   MacroAssembler* masm = new MacroAssembler(&buffer);
 
   // TODO check various assumptions made here
diff --git a/src/hotspot/cpu/arm/runtime_arm.cpp b/src/hotspot/cpu/arm/runtime_arm.cpp
index cf4b398cf1f..ac6e1be0395 100644
--- a/src/hotspot/cpu/arm/runtime_arm.cpp
+++ b/src/hotspot/cpu/arm/runtime_arm.cpp
@@ -47,11 +47,12 @@ void OptoRuntime::generate_uncommon_trap_blob() {
   ResourceMark rm;
 
   // setup code generation tools
+  const char* name = OptoRuntime::stub_name(OptoStubId::uncommon_trap_id);
 #ifdef _LP64
-  CodeBuffer buffer("uncommon_trap_blob", 2700, 512);
+  CodeBuffer buffer(name, 2700, 512);
 #else
   // Measured 8/7/03 at 660 in 32bit debug build
-  CodeBuffer buffer("uncommon_trap_blob", 2000, 512);
+  CodeBuffer buffer(name, 2000, 512);
 #endif
   // bypassed when code generation useless
   MacroAssembler* masm               = new MacroAssembler(&buffer);
@@ -206,7 +207,8 @@ void OptoRuntime::generate_exception_blob() {
 
   // setup code generation tools
   // Measured 8/7/03 at 256 in 32bit debug build
-  CodeBuffer buffer("exception_blob", 600, 512);
+  const char* name = OptoRuntime::stub_name(OptoStubId::exception_id);
+  CodeBuffer buffer(name, 600, 512);
   MacroAssembler* masm     = new MacroAssembler(&buffer);
 
   int framesize_in_words = 2; // FP + LR
diff --git a/src/hotspot/cpu/ppc/runtime_ppc.cpp b/src/hotspot/cpu/ppc/runtime_ppc.cpp
index c5990e01e0d..6ab29ac98b2 100644
--- a/src/hotspot/cpu/ppc/runtime_ppc.cpp
+++ b/src/hotspot/cpu/ppc/runtime_ppc.cpp
@@ -71,7 +71,8 @@ void OptoRuntime::generate_exception_blob() {
   // Allocate space for the code.
   ResourceMark rm;
   // Setup code generation tools.
-  CodeBuffer buffer("exception_blob", 2048, 1024);
+  const char* name = OptoRuntime::stub_name(OptoStubId::exception_id);
+  CodeBuffer buffer(name, 2048, 1024);
   InterpreterMacroAssembler* masm = new InterpreterMacroAssembler(&buffer);
 
   address start = __ pc();
diff --git a/src/hotspot/cpu/ppc/sharedRuntime_ppc.cpp b/src/hotspot/cpu/ppc/sharedRuntime_ppc.cpp
index f7e1410d10f..4bdd8667c62 100644
--- a/src/hotspot/cpu/ppc/sharedRuntime_ppc.cpp
+++ b/src/hotspot/cpu/ppc/sharedRuntime_ppc.cpp
@@ -3104,7 +3104,8 @@ void OptoRuntime::generate_uncommon_trap_blob() {
   // Allocate space for the code.
   ResourceMark rm;
   // Setup code generation tools.
-  CodeBuffer buffer("uncommon_trap_blob", 2048, 1024);
+  const char* name = OptoRuntime::stub_name(OptoStubId::uncommon_trap_id);
+  CodeBuffer buffer(name, 2048, 1024);
   InterpreterMacroAssembler* masm = new InterpreterMacroAssembler(&buffer);
   address start = __ pc();
 
diff --git a/src/hotspot/cpu/riscv/runtime_riscv.cpp b/src/hotspot/cpu/riscv/runtime_riscv.cpp
index a0879b68053..0a838896a02 100644
--- a/src/hotspot/cpu/riscv/runtime_riscv.cpp
+++ b/src/hotspot/cpu/riscv/runtime_riscv.cpp
@@ -61,7 +61,8 @@ void OptoRuntime::generate_uncommon_trap_blob() {
   // Allocate space for the code
   ResourceMark rm;
   // Setup code generation tools
-  CodeBuffer buffer("uncommon_trap_blob", 2048, 1024);
+  const char* name = OptoRuntime::stub_name(OptoStubId::uncommon_trap_id);
+  CodeBuffer buffer(name, 2048, 1024);
   MacroAssembler* masm = new MacroAssembler(&buffer);
   assert_cond(masm != nullptr);
 
@@ -279,7 +280,8 @@ void OptoRuntime::generate_exception_blob() {
   // Allocate space for the code
   ResourceMark rm;
   // Setup code generation tools
-  CodeBuffer buffer("exception_blob", 2048, 1024);
+  const char* name = OptoRuntime::stub_name(OptoStubId::exception_id);
+  CodeBuffer buffer(name, 2048, 1024);
   MacroAssembler* masm = new MacroAssembler(&buffer);
   assert_cond(masm != nullptr);
 
diff --git a/src/hotspot/cpu/s390/runtime_s390.cpp b/src/hotspot/cpu/s390/runtime_s390.cpp
index dfaf73b9a7c..a0714619d87 100644
--- a/src/hotspot/cpu/s390/runtime_s390.cpp
+++ b/src/hotspot/cpu/s390/runtime_s390.cpp
@@ -70,7 +70,8 @@ void OptoRuntime::generate_exception_blob() {
   // Allocate space for the code
   ResourceMark rm;
   // Setup code generation tools
-  CodeBuffer buffer("exception_blob", 2048, 1024);
+  const char* name = OptoRuntime::stub_name(OptoStubId::exception_id);
+  CodeBuffer buffer(name, 2048, 1024);
   MacroAssembler* masm = new MacroAssembler(&buffer);
 
   Register handle_exception = Z_ARG5;
diff --git a/src/hotspot/cpu/s390/sharedRuntime_s390.cpp b/src/hotspot/cpu/s390/sharedRuntime_s390.cpp
index 9716a5d71b3..69a9b22778d 100644
--- a/src/hotspot/cpu/s390/sharedRuntime_s390.cpp
+++ b/src/hotspot/cpu/s390/sharedRuntime_s390.cpp
@@ -2766,7 +2766,8 @@ void OptoRuntime::generate_uncommon_trap_blob() {
   // Allocate space for the code
   ResourceMark rm;
   // Setup code generation tools
-  CodeBuffer buffer("uncommon_trap_blob", 2048, 1024);
+  const char* name = OptoRuntime::stub_name(OptoStubId::uncommon_trap_id);
+  CodeBuffer buffer(name, 2048, 1024);
   InterpreterMacroAssembler* masm = new InterpreterMacroAssembler(&buffer);
 
   Register unroll_block_reg = Z_tmp_1;
diff --git a/src/hotspot/cpu/x86/runtime_x86_32.cpp b/src/hotspot/cpu/x86/runtime_x86_32.cpp
index bcba6093871..4148f98f81c 100644
--- a/src/hotspot/cpu/x86/runtime_x86_32.cpp
+++ b/src/hotspot/cpu/x86/runtime_x86_32.cpp
@@ -45,7 +45,8 @@ void OptoRuntime::generate_uncommon_trap_blob() {
   // allocate space for the code
   ResourceMark rm;
   // setup code generation tools
-  CodeBuffer   buffer("uncommon_trap_blob", 512, 512);
+  const char* name = OptoRuntime::stub_name(OptoStubId::uncommon_trap_id);
+  CodeBuffer   buffer(name, 512, 512);
   MacroAssembler* masm = new MacroAssembler(&buffer);
 
   enum frame_layout {
@@ -255,7 +256,8 @@ void OptoRuntime::generate_exception_blob() {
   // allocate space for the code
   ResourceMark rm;
   // setup code generation tools
-  CodeBuffer   buffer("exception_blob", 512, 512);
+  const char* name = OptoRuntime::stub_name(OptoStubId::exception_id);
+  CodeBuffer   buffer(name, 512, 512);
   MacroAssembler* masm = new MacroAssembler(&buffer);
 
   OopMapSet *oop_maps = new OopMapSet();
diff --git a/src/hotspot/cpu/x86/runtime_x86_64.cpp b/src/hotspot/cpu/x86/runtime_x86_64.cpp
index d7d8fc1895b..464b0eeac6c 100644
--- a/src/hotspot/cpu/x86/runtime_x86_64.cpp
+++ b/src/hotspot/cpu/x86/runtime_x86_64.cpp
@@ -59,7 +59,8 @@ void OptoRuntime::generate_uncommon_trap_blob() {
   // Allocate space for the code
   ResourceMark rm;
   // Setup code generation tools
-  CodeBuffer buffer("uncommon_trap_blob", 2048, 1024);
+  const char* name = OptoRuntime::stub_name(OptoStubId::uncommon_trap_id);
+  CodeBuffer buffer(name, 2048, 1024);
   MacroAssembler* masm = new MacroAssembler(&buffer);
 
   assert(SimpleRuntimeFrame::framesize % 4 == 0, "sp not 16-byte aligned");
@@ -264,7 +265,8 @@ void OptoRuntime::generate_exception_blob() {
   // Allocate space for the code
   ResourceMark rm;
   // Setup code generation tools
-  CodeBuffer buffer("exception_blob", 2048, 1024);
+  const char* name = OptoRuntime::stub_name(OptoStubId::exception_id);
+  CodeBuffer buffer(name, 2048, 1024);
   MacroAssembler* masm = new MacroAssembler(&buffer);
 
 

From 8073914af7d4ddd7bbd93d75104c7637e38a7ad9 Mon Sep 17 00:00:00 2001
From: Coleen Phillimore <coleenp@openjdk.org>
Date: Tue, 4 Mar 2025 12:32:23 +0000
Subject: [PATCH 213/587] 8350974: The os_cpu VM_STRUCTS, VM_TYPES, etc have no
 declarations and should be removed

Reviewed-by: kvn, dholmes
---
 .../os_cpu/aix_ppc/vmStructs_aix_ppc.hpp      | 41 ------------------
 .../bsd_aarch64/vmStructs_bsd_aarch64.hpp     | 42 -------------------
 .../os_cpu/bsd_x86/vmStructs_bsd_x86.hpp      | 40 ------------------
 .../os_cpu/bsd_zero/vmStructs_bsd_zero.hpp    | 41 ------------------
 .../linux_aarch64/vmStructs_linux_aarch64.hpp | 41 ------------------
 .../os_cpu/linux_arm/vmStructs_linux_arm.hpp  | 40 ------------------
 .../os_cpu/linux_ppc/vmStructs_linux_ppc.hpp  | 41 ------------------
 .../linux_riscv/vmStructs_linux_riscv.hpp     | 41 ------------------
 .../linux_s390/vmStructs_linux_s390.hpp       | 41 ------------------
 .../os_cpu/linux_x86/vmStructs_linux_x86.hpp  | 40 ------------------
 .../linux_zero/vmStructs_linux_zero.hpp       | 41 ------------------
 .../vmStructs_windows_aarch64.hpp             | 40 ------------------
 .../windows_x86/vmStructs_windows_x86.hpp     | 40 ------------------
 src/hotspot/share/runtime/vmStructs.cpp       | 35 ----------------
 14 files changed, 564 deletions(-)
 delete mode 100644 src/hotspot/os_cpu/aix_ppc/vmStructs_aix_ppc.hpp
 delete mode 100644 src/hotspot/os_cpu/bsd_aarch64/vmStructs_bsd_aarch64.hpp
 delete mode 100644 src/hotspot/os_cpu/bsd_x86/vmStructs_bsd_x86.hpp
 delete mode 100644 src/hotspot/os_cpu/bsd_zero/vmStructs_bsd_zero.hpp
 delete mode 100644 src/hotspot/os_cpu/linux_aarch64/vmStructs_linux_aarch64.hpp
 delete mode 100644 src/hotspot/os_cpu/linux_arm/vmStructs_linux_arm.hpp
 delete mode 100644 src/hotspot/os_cpu/linux_ppc/vmStructs_linux_ppc.hpp
 delete mode 100644 src/hotspot/os_cpu/linux_riscv/vmStructs_linux_riscv.hpp
 delete mode 100644 src/hotspot/os_cpu/linux_s390/vmStructs_linux_s390.hpp
 delete mode 100644 src/hotspot/os_cpu/linux_x86/vmStructs_linux_x86.hpp
 delete mode 100644 src/hotspot/os_cpu/linux_zero/vmStructs_linux_zero.hpp
 delete mode 100644 src/hotspot/os_cpu/windows_aarch64/vmStructs_windows_aarch64.hpp
 delete mode 100644 src/hotspot/os_cpu/windows_x86/vmStructs_windows_x86.hpp

diff --git a/src/hotspot/os_cpu/aix_ppc/vmStructs_aix_ppc.hpp b/src/hotspot/os_cpu/aix_ppc/vmStructs_aix_ppc.hpp
deleted file mode 100644
index df8857a5b84..00000000000
--- a/src/hotspot/os_cpu/aix_ppc/vmStructs_aix_ppc.hpp
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright (c) 2000, 2025, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2012, 2013 SAP SE. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- *
- */
-
-#ifndef OS_CPU_AIX_PPC_VMSTRUCTS_AIX_PPC_HPP
-#define OS_CPU_AIX_PPC_VMSTRUCTS_AIX_PPC_HPP
-
-// These are the OS and CPU-specific fields, types and integer
-// constants required by the Serviceability Agent. This file is
-// referenced by vmStructs.cpp.
-
-#define VM_STRUCTS_OS_CPU(nonstatic_field, static_field, unchecked_nonstatic_field, volatile_nonstatic_field, nonproduct_nonstatic_field)
-
-#define VM_TYPES_OS_CPU(declare_type, declare_toplevel_type, declare_oop_type, declare_integer_type, declare_unsigned_integer_type)
-
-#define VM_INT_CONSTANTS_OS_CPU(declare_constant, declare_preprocessor_constant)
-
-#define VM_LONG_CONSTANTS_OS_CPU(declare_constant, declare_preprocessor_constant)
-
-#endif // OS_CPU_AIX_PPC_VMSTRUCTS_AIX_PPC_HPP
diff --git a/src/hotspot/os_cpu/bsd_aarch64/vmStructs_bsd_aarch64.hpp b/src/hotspot/os_cpu/bsd_aarch64/vmStructs_bsd_aarch64.hpp
deleted file mode 100644
index fc98519eb82..00000000000
--- a/src/hotspot/os_cpu/bsd_aarch64/vmStructs_bsd_aarch64.hpp
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright (c) 2000, 2025, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2014, Red Hat Inc. All rights reserved.
- * Copyright (c) 2021, Azul Systems, 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.
- *
- */
-
-#ifndef OS_CPU_BSD_AARCH64_VMSTRUCTS_BSD_AARCH64_HPP
-#define OS_CPU_BSD_AARCH64_VMSTRUCTS_BSD_AARCH64_HPP
-
-// These are the OS and CPU-specific fields, types and integer
-// constants required by the Serviceability Agent. This file is
-// referenced by vmStructs.cpp.
-
-#define VM_STRUCTS_OS_CPU(nonstatic_field, static_field, unchecked_nonstatic_field, volatile_nonstatic_field, nonproduct_nonstatic_field)
-
-#define VM_TYPES_OS_CPU(declare_type, declare_toplevel_type, declare_oop_type, declare_integer_type, declare_unsigned_integer_type)
-
-#define VM_INT_CONSTANTS_OS_CPU(declare_constant, declare_preprocessor_constant)
-
-#define VM_LONG_CONSTANTS_OS_CPU(declare_constant, declare_preprocessor_constant)
-
-#endif // OS_CPU_BSD_AARCH64_VMSTRUCTS_BSD_AARCH64_HPP
diff --git a/src/hotspot/os_cpu/bsd_x86/vmStructs_bsd_x86.hpp b/src/hotspot/os_cpu/bsd_x86/vmStructs_bsd_x86.hpp
deleted file mode 100644
index d26921e25ba..00000000000
--- a/src/hotspot/os_cpu/bsd_x86/vmStructs_bsd_x86.hpp
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (c) 2000, 2025, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please 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 OS_CPU_BSD_X86_VMSTRUCTS_BSD_X86_HPP
-#define OS_CPU_BSD_X86_VMSTRUCTS_BSD_X86_HPP
-
-// These are the OS and CPU-specific fields, types and integer
-// constants required by the Serviceability Agent. This file is
-// referenced by vmStructs.cpp.
-
-#define VM_STRUCTS_OS_CPU(nonstatic_field, static_field, unchecked_nonstatic_field, volatile_nonstatic_field, nonproduct_nonstatic_field)
-
-#define VM_TYPES_OS_CPU(declare_type, declare_toplevel_type, declare_oop_type, declare_integer_type, declare_unsigned_integer_type)
-
-#define VM_INT_CONSTANTS_OS_CPU(declare_constant, declare_preprocessor_constant)
-
-#define VM_LONG_CONSTANTS_OS_CPU(declare_constant, declare_preprocessor_constant)
-
-#endif // OS_CPU_BSD_X86_VMSTRUCTS_BSD_X86_HPP
diff --git a/src/hotspot/os_cpu/bsd_zero/vmStructs_bsd_zero.hpp b/src/hotspot/os_cpu/bsd_zero/vmStructs_bsd_zero.hpp
deleted file mode 100644
index b5b523cd0ac..00000000000
--- a/src/hotspot/os_cpu/bsd_zero/vmStructs_bsd_zero.hpp
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
- * Copyright 2007 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.
- *
- */
-
-#ifndef OS_CPU_BSD_ZERO_VMSTRUCTS_BSD_ZERO_HPP
-#define OS_CPU_BSD_ZERO_VMSTRUCTS_BSD_ZERO_HPP
-
-// These are the OS and CPU-specific fields, types and integer
-// constants required by the Serviceability Agent. This file is
-// referenced by vmStructs.cpp.
-
-#define VM_STRUCTS_OS_CPU(nonstatic_field, static_field, unchecked_nonstatic_field, volatile_nonstatic_field, nonproduct_nonstatic_field)
-
-#define VM_TYPES_OS_CPU(declare_type, declare_toplevel_type, declare_oop_type, declare_integer_type, declare_unsigned_integer_type)
-
-#define VM_INT_CONSTANTS_OS_CPU(declare_constant, declare_preprocessor_constant)
-
-#define VM_LONG_CONSTANTS_OS_CPU(declare_constant, declare_preprocessor_constant)
-
-#endif // OS_CPU_BSD_ZERO_VMSTRUCTS_BSD_ZERO_HPP
diff --git a/src/hotspot/os_cpu/linux_aarch64/vmStructs_linux_aarch64.hpp b/src/hotspot/os_cpu/linux_aarch64/vmStructs_linux_aarch64.hpp
deleted file mode 100644
index cf44ce0ca74..00000000000
--- a/src/hotspot/os_cpu/linux_aarch64/vmStructs_linux_aarch64.hpp
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright (c) 2000, 2025, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2014, Red Hat Inc. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please 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 OS_CPU_LINUX_AARCH64_VMSTRUCTS_LINUX_AARCH64_HPP
-#define OS_CPU_LINUX_AARCH64_VMSTRUCTS_LINUX_AARCH64_HPP
-
-// These are the OS and CPU-specific fields, types and integer
-// constants required by the Serviceability Agent. This file is
-// referenced by vmStructs.cpp.
-
-#define VM_STRUCTS_OS_CPU(nonstatic_field, static_field, unchecked_nonstatic_field, volatile_nonstatic_field, nonproduct_nonstatic_field)
-
-#define VM_TYPES_OS_CPU(declare_type, declare_toplevel_type, declare_oop_type, declare_integer_type, declare_unsigned_integer_type)
-
-#define VM_INT_CONSTANTS_OS_CPU(declare_constant, declare_preprocessor_constant)
-
-#define VM_LONG_CONSTANTS_OS_CPU(declare_constant, declare_preprocessor_constant)
-
-#endif // OS_CPU_LINUX_AARCH64_VMSTRUCTS_LINUX_AARCH64_HPP
diff --git a/src/hotspot/os_cpu/linux_arm/vmStructs_linux_arm.hpp b/src/hotspot/os_cpu/linux_arm/vmStructs_linux_arm.hpp
deleted file mode 100644
index 9d4c610b45a..00000000000
--- a/src/hotspot/os_cpu/linux_arm/vmStructs_linux_arm.hpp
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (c) 2008, 2025, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please 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 OS_CPU_LINUX_ARM_VMSTRUCTS_LINUX_ARM_HPP
-#define OS_CPU_LINUX_ARM_VMSTRUCTS_LINUX_ARM_HPP
-
-// These are the OS and CPU-specific fields, types and integer
-// constants required by the Serviceability Agent. This file is
-// referenced by vmStructs.cpp.
-
-#define VM_STRUCTS_OS_CPU(nonstatic_field, static_field, unchecked_nonstatic_field, volatile_nonstatic_field, nonproduct_nonstatic_field)
-
-#define VM_TYPES_OS_CPU(declare_type, declare_toplevel_type, declare_oop_type, declare_integer_type, declare_unsigned_integer_type)
-
-#define VM_INT_CONSTANTS_OS_CPU(declare_constant, declare_preprocessor_constant)
-
-#define VM_LONG_CONSTANTS_OS_CPU(declare_constant, declare_preprocessor_constant)
-
-#endif // OS_CPU_LINUX_ARM_VMSTRUCTS_LINUX_ARM_HPP
diff --git a/src/hotspot/os_cpu/linux_ppc/vmStructs_linux_ppc.hpp b/src/hotspot/os_cpu/linux_ppc/vmStructs_linux_ppc.hpp
deleted file mode 100644
index e52dc525e64..00000000000
--- a/src/hotspot/os_cpu/linux_ppc/vmStructs_linux_ppc.hpp
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright (c) 2000, 2025, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2012, 2013 SAP SE. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- *
- */
-
-#ifndef OS_CPU_LINUX_PPC_VMSTRUCTS_LINUX_PPC_HPP
-#define OS_CPU_LINUX_PPC_VMSTRUCTS_LINUX_PPC_HPP
-
-// These are the OS and CPU-specific fields, types and integer
-// constants required by the Serviceability Agent. This file is
-// referenced by vmStructs.cpp.
-
-#define VM_STRUCTS_OS_CPU(nonstatic_field, static_field, unchecked_nonstatic_field, volatile_nonstatic_field, nonproduct_nonstatic_field)
-
-#define VM_TYPES_OS_CPU(declare_type, declare_toplevel_type, declare_oop_type, declare_integer_type, declare_unsigned_integer_type)
-
-#define VM_INT_CONSTANTS_OS_CPU(declare_constant, declare_preprocessor_constant)
-
-#define VM_LONG_CONSTANTS_OS_CPU(declare_constant, declare_preprocessor_constant)
-
-#endif // OS_CPU_LINUX_PPC_VMSTRUCTS_LINUX_PPC_HPP
diff --git a/src/hotspot/os_cpu/linux_riscv/vmStructs_linux_riscv.hpp b/src/hotspot/os_cpu/linux_riscv/vmStructs_linux_riscv.hpp
deleted file mode 100644
index 02bcf429d42..00000000000
--- a/src/hotspot/os_cpu/linux_riscv/vmStructs_linux_riscv.hpp
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright (c) 2000, 2025, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2020, 2021, Huawei Technologies Co., Ltd. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please 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 OS_CPU_LINUX_RISCV_VM_VMSTRUCTS_LINUX_RISCV_HPP
-#define OS_CPU_LINUX_RISCV_VM_VMSTRUCTS_LINUX_RISCV_HPP
-
-// These are the OS and CPU-specific fields, types and integer
-// constants required by the Serviceability Agent. This file is
-// referenced by vmStructs.cpp.
-
-#define VM_STRUCTS_OS_CPU(nonstatic_field, static_field, unchecked_nonstatic_field, volatile_nonstatic_field, nonproduct_nonstatic_field)
-
-#define VM_TYPES_OS_CPU(declare_type, declare_toplevel_type, declare_oop_type, declare_integer_type, declare_unsigned_integer_type)
-
-#define VM_INT_CONSTANTS_OS_CPU(declare_constant, declare_preprocessor_constant)
-
-#define VM_LONG_CONSTANTS_OS_CPU(declare_constant, declare_preprocessor_constant)
-
-#endif // OS_CPU_LINUX_RISCV_VM_VMSTRUCTS_LINUX_RISCV_HPP
diff --git a/src/hotspot/os_cpu/linux_s390/vmStructs_linux_s390.hpp b/src/hotspot/os_cpu/linux_s390/vmStructs_linux_s390.hpp
deleted file mode 100644
index 0a75e6d4b92..00000000000
--- a/src/hotspot/os_cpu/linux_s390/vmStructs_linux_s390.hpp
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright (c) 2016, 2025, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2016 SAP SE. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- *
- */
-
-#ifndef OS_CPU_LINUX_S390_VMSTRUCTS_LINUX_S390_HPP
-#define OS_CPU_LINUX_S390_VMSTRUCTS_LINUX_S390_HPP
-
-// These are the OS and CPU-specific fields, types and integer
-// constants required by the Serviceability Agent. This file is
-// referenced by vmStructs.cpp.
-
-#define VM_STRUCTS_OS_CPU(nonstatic_field, static_field, unchecked_nonstatic_field, volatile_nonstatic_field, nonproduct_nonstatic_field)
-
-#define VM_TYPES_OS_CPU(declare_type, declare_toplevel_type, declare_oop_type, declare_integer_type, declare_unsigned_integer_type)
-
-#define VM_INT_CONSTANTS_OS_CPU(declare_constant, declare_preprocessor_constant)
-
-#define VM_LONG_CONSTANTS_OS_CPU(declare_constant, declare_preprocessor_constant)
-
-#endif // OS_CPU_LINUX_S390_VMSTRUCTS_LINUX_S390_HPP
diff --git a/src/hotspot/os_cpu/linux_x86/vmStructs_linux_x86.hpp b/src/hotspot/os_cpu/linux_x86/vmStructs_linux_x86.hpp
deleted file mode 100644
index 290e30dff68..00000000000
--- a/src/hotspot/os_cpu/linux_x86/vmStructs_linux_x86.hpp
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (c) 2000, 2025, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please 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 OS_CPU_LINUX_X86_VMSTRUCTS_LINUX_X86_HPP
-#define OS_CPU_LINUX_X86_VMSTRUCTS_LINUX_X86_HPP
-
-// These are the OS and CPU-specific fields, types and integer
-// constants required by the Serviceability Agent. This file is
-// referenced by vmStructs.cpp.
-
-#define VM_STRUCTS_OS_CPU(nonstatic_field, static_field, unchecked_nonstatic_field, volatile_nonstatic_field, nonproduct_nonstatic_field)
-
-#define VM_TYPES_OS_CPU(declare_type, declare_toplevel_type, declare_oop_type, declare_integer_type, declare_unsigned_integer_type)
-
-#define VM_INT_CONSTANTS_OS_CPU(declare_constant, declare_preprocessor_constant)
-
-#define VM_LONG_CONSTANTS_OS_CPU(declare_constant, declare_preprocessor_constant)
-
-#endif // OS_CPU_LINUX_X86_VMSTRUCTS_LINUX_X86_HPP
diff --git a/src/hotspot/os_cpu/linux_zero/vmStructs_linux_zero.hpp b/src/hotspot/os_cpu/linux_zero/vmStructs_linux_zero.hpp
deleted file mode 100644
index 651846c4b36..00000000000
--- a/src/hotspot/os_cpu/linux_zero/vmStructs_linux_zero.hpp
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
- * Copyright 2007 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.
- *
- */
-
-#ifndef OS_CPU_LINUX_ZERO_VMSTRUCTS_LINUX_ZERO_HPP
-#define OS_CPU_LINUX_ZERO_VMSTRUCTS_LINUX_ZERO_HPP
-
-// These are the OS and CPU-specific fields, types and integer
-// constants required by the Serviceability Agent. This file is
-// referenced by vmStructs.cpp.
-
-#define VM_STRUCTS_OS_CPU(nonstatic_field, static_field, unchecked_nonstatic_field, volatile_nonstatic_field, nonproduct_nonstatic_field)
-
-#define VM_TYPES_OS_CPU(declare_type, declare_toplevel_type, declare_oop_type, declare_integer_type, declare_unsigned_integer_type)
-
-#define VM_INT_CONSTANTS_OS_CPU(declare_constant, declare_preprocessor_constant)
-
-#define VM_LONG_CONSTANTS_OS_CPU(declare_constant, declare_preprocessor_constant)
-
-#endif // OS_CPU_LINUX_ZERO_VMSTRUCTS_LINUX_ZERO_HPP
diff --git a/src/hotspot/os_cpu/windows_aarch64/vmStructs_windows_aarch64.hpp b/src/hotspot/os_cpu/windows_aarch64/vmStructs_windows_aarch64.hpp
deleted file mode 100644
index 2462a20568d..00000000000
--- a/src/hotspot/os_cpu/windows_aarch64/vmStructs_windows_aarch64.hpp
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (c) 2020, Microsoft Corporation. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- *
- */
-
-#ifndef OS_CPU_WINDOWS_AARCH64_VMSTRUCTS_WINDOWS_AARCH64_HPP
-#define OS_CPU_WINDOWS_AARCH64_VMSTRUCTS_WINDOWS_AARCH64_HPP
-
-// These are the OS and CPU-specific fields, types and integer
-// constants required by the Serviceability Agent. This file is
-// referenced by vmStructs.cpp.
-
-#define VM_STRUCTS_OS_CPU(nonstatic_field, static_field, unchecked_nonstatic_field, volatile_nonstatic_field, nonproduct_nonstatic_field)
-
-#define VM_TYPES_OS_CPU(declare_type, declare_toplevel_type, declare_oop_type, declare_integer_type, declare_unsigned_integer_type)
-
-#define VM_INT_CONSTANTS_OS_CPU(declare_constant, declare_preprocessor_constant)
-
-#define VM_LONG_CONSTANTS_OS_CPU(declare_constant, declare_preprocessor_constant)
-
-#endif // OS_CPU_WINDOWS_AARCH64_VMSTRUCTS_WINDOWS_AARCH64_HPP
diff --git a/src/hotspot/os_cpu/windows_x86/vmStructs_windows_x86.hpp b/src/hotspot/os_cpu/windows_x86/vmStructs_windows_x86.hpp
deleted file mode 100644
index 0ac47bdbd80..00000000000
--- a/src/hotspot/os_cpu/windows_x86/vmStructs_windows_x86.hpp
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (c) 2000, 2025, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please 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 OS_CPU_WINDOWS_X86_VMSTRUCTS_WINDOWS_X86_HPP
-#define OS_CPU_WINDOWS_X86_VMSTRUCTS_WINDOWS_X86_HPP
-
-// These are the OS and CPU-specific fields, types and integer
-// constants required by the Serviceability Agent. This file is
-// referenced by vmStructs.cpp.
-
-#define VM_STRUCTS_OS_CPU(nonstatic_field, static_field, unchecked_nonstatic_field, volatile_nonstatic_field, nonproduct_nonstatic_field)
-
-#define VM_TYPES_OS_CPU(declare_type, declare_toplevel_type, declare_oop_type, declare_integer_type, declare_unsigned_integer_type)
-
-#define VM_INT_CONSTANTS_OS_CPU(declare_constant, declare_preprocessor_constant)
-
-#define VM_LONG_CONSTANTS_OS_CPU(declare_constant, declare_preprocessor_constant)
-
-#endif // OS_CPU_WINDOWS_X86_VMSTRUCTS_WINDOWS_X86_HPP
diff --git a/src/hotspot/share/runtime/vmStructs.cpp b/src/hotspot/share/runtime/vmStructs.cpp
index 5184440499a..53bdfe522d0 100644
--- a/src/hotspot/share/runtime/vmStructs.cpp
+++ b/src/hotspot/share/runtime/vmStructs.cpp
@@ -120,7 +120,6 @@
 
 #include CPU_HEADER(vmStructs)
 #include OS_HEADER(vmStructs)
-#include OS_CPU_HEADER(vmStructs)
 
 // Note: the cross-product of (c1, c2, product, nonproduct, ...),
 // (nonstatic, static), and (unchecked, checked) has not been taken.
@@ -1913,12 +1912,6 @@ VMStructEntry VMStructs::localHotSpotVMStructs[] = {
                  GENERATE_NONSTATIC_VM_STRUCT_ENTRY,
                  GENERATE_NONPRODUCT_NONSTATIC_VM_STRUCT_ENTRY)
 
-  VM_STRUCTS_OS_CPU(GENERATE_NONSTATIC_VM_STRUCT_ENTRY,
-                    GENERATE_STATIC_VM_STRUCT_ENTRY,
-                    GENERATE_UNCHECKED_NONSTATIC_VM_STRUCT_ENTRY,
-                    GENERATE_NONSTATIC_VM_STRUCT_ENTRY,
-                    GENERATE_NONPRODUCT_NONSTATIC_VM_STRUCT_ENTRY)
-
   GENERATE_VM_STRUCT_LAST_ENTRY()
 };
 
@@ -1946,12 +1939,6 @@ VMTypeEntry VMStructs::localHotSpotVMTypes[] = {
                GENERATE_INTEGER_VM_TYPE_ENTRY,
                GENERATE_UNSIGNED_INTEGER_VM_TYPE_ENTRY)
 
-  VM_TYPES_OS_CPU(GENERATE_VM_TYPE_ENTRY,
-                  GENERATE_TOPLEVEL_VM_TYPE_ENTRY,
-                  GENERATE_OOP_VM_TYPE_ENTRY,
-                  GENERATE_INTEGER_VM_TYPE_ENTRY,
-                  GENERATE_UNSIGNED_INTEGER_VM_TYPE_ENTRY)
-
   GENERATE_VM_TYPE_LAST_ENTRY()
 };
 
@@ -1971,8 +1958,6 @@ VMIntConstantEntry VMStructs::localHotSpotVMIntConstants[] = {
   VM_INT_CONSTANTS_CPU(GENERATE_VM_INT_CONSTANT_ENTRY,
                        GENERATE_PREPROCESSOR_VM_INT_CONSTANT_ENTRY)
 
-  VM_INT_CONSTANTS_OS_CPU(GENERATE_VM_INT_CONSTANT_ENTRY,
-                          GENERATE_PREPROCESSOR_VM_INT_CONSTANT_ENTRY)
 #ifdef VM_INT_CPU_FEATURE_CONSTANTS
   VM_INT_CPU_FEATURE_CONSTANTS
 #endif
@@ -1995,8 +1980,6 @@ VMLongConstantEntry VMStructs::localHotSpotVMLongConstants[] = {
   VM_LONG_CONSTANTS_CPU(GENERATE_VM_LONG_CONSTANT_ENTRY,
                         GENERATE_PREPROCESSOR_VM_LONG_CONSTANT_ENTRY)
 
-  VM_LONG_CONSTANTS_OS_CPU(GENERATE_VM_LONG_CONSTANT_ENTRY,
-                           GENERATE_PREPROCESSOR_VM_LONG_CONSTANT_ENTRY)
 #ifdef VM_LONG_CPU_FEATURE_CONSTANTS
   VM_LONG_CPU_FEATURE_CONSTANTS
 #endif
@@ -2058,12 +2041,6 @@ void VMStructs::init() {
                  CHECK_VOLATILE_NONSTATIC_VM_STRUCT_ENTRY,
                  CHECK_NONPRODUCT_NONSTATIC_VM_STRUCT_ENTRY)
 
-  VM_STRUCTS_OS_CPU(CHECK_NONSTATIC_VM_STRUCT_ENTRY,
-                    CHECK_STATIC_VM_STRUCT_ENTRY,
-                    CHECK_NO_OP,
-                    CHECK_VOLATILE_NONSTATIC_VM_STRUCT_ENTRY,
-                    CHECK_NONPRODUCT_NONSTATIC_VM_STRUCT_ENTRY)
-
   VM_TYPES(CHECK_VM_TYPE_ENTRY,
            CHECK_SINGLE_ARG_VM_TYPE_NO_OP,
            CHECK_SINGLE_ARG_VM_TYPE_NO_OP,
@@ -2077,12 +2054,6 @@ void VMStructs::init() {
                CHECK_SINGLE_ARG_VM_TYPE_NO_OP,
                CHECK_SINGLE_ARG_VM_TYPE_NO_OP)
 
-  VM_TYPES_OS_CPU(CHECK_VM_TYPE_ENTRY,
-                  CHECK_SINGLE_ARG_VM_TYPE_NO_OP,
-                  CHECK_SINGLE_ARG_VM_TYPE_NO_OP,
-                  CHECK_SINGLE_ARG_VM_TYPE_NO_OP,
-                  CHECK_SINGLE_ARG_VM_TYPE_NO_OP)
-
   //
   // Split VM_STRUCTS() invocation into two parts to allow MS VC++ 6.0
   // to build with the source mounted over SNC3.2. Symptom was that
@@ -2119,12 +2090,6 @@ void VMStructs::init() {
                  CHECK_NO_OP,
                  ENSURE_FIELD_TYPE_PRESENT,
                  ENSURE_NONPRODUCT_FIELD_TYPE_PRESENT)
-
-  VM_STRUCTS_OS_CPU(ENSURE_FIELD_TYPE_PRESENT,
-                    ENSURE_FIELD_TYPE_PRESENT,
-                    CHECK_NO_OP,
-                    ENSURE_FIELD_TYPE_PRESENT,
-                    ENSURE_NONPRODUCT_FIELD_TYPE_PRESENT)
 #endif // !_WINDOWS
 }
 

From 3230894bdd8ab4183b83ad4c942eb6acad4acce6 Mon Sep 17 00:00:00 2001
From: Ferenc Rakoczi <ferenc.r.rakoczi@oracle.com>
Date: Tue, 4 Mar 2025 14:41:35 +0000
Subject: [PATCH 214/587] 8348561: Add aarch64 intrinsics for ML-DSA

Reviewed-by: adinn
---
 src/hotspot/cpu/aarch64/assembler_aarch64.hpp |   10 +-
 .../cpu/aarch64/stubDeclarations_aarch64.hpp  |    2 +-
 .../cpu/aarch64/stubGenerator_aarch64.cpp     | 1223 +++++++++++++++--
 .../cpu/aarch64/stubRoutines_aarch64.cpp      |    9 +
 .../cpu/aarch64/stubRoutines_aarch64.hpp      |    3 +-
 .../cpu/aarch64/vm_version_aarch64.cpp        |   11 +
 src/hotspot/share/classfile/vmIntrinsics.cpp  |    8 +
 src/hotspot/share/classfile/vmIntrinsics.hpp  |   26 +
 src/hotspot/share/jvmci/vmStructs_jvmci.cpp   |    6 +
 src/hotspot/share/opto/c2compiler.cpp         |    6 +
 src/hotspot/share/opto/escape.cpp             |    6 +
 src/hotspot/share/opto/library_call.cpp       |  214 +++
 src/hotspot/share/opto/library_call.hpp       |    6 +
 src/hotspot/share/opto/runtime.cpp            |  137 ++
 src/hotspot/share/opto/runtime.hpp            |   36 +
 src/hotspot/share/runtime/globals.hpp         |    3 +
 .../share/runtime/stubDeclarations.hpp        |   21 +-
 src/hotspot/share/runtime/stubRoutines.cpp    |    1 +
 .../classes/sun/security/provider/ML_DSA.java |  512 +++++--
 .../sun/security/provider/SHA3Parallel.java   |   16 +-
 test/hotspot/gtest/aarch64/aarch64-asmtest.py |    5 +
 test/hotspot/gtest/aarch64/asmtest.out.h      |  837 +++++------
 22 files changed, 2518 insertions(+), 580 deletions(-)

diff --git a/src/hotspot/cpu/aarch64/assembler_aarch64.hpp b/src/hotspot/cpu/aarch64/assembler_aarch64.hpp
index a5e0e2665af..c91a136e7d5 100644
--- a/src/hotspot/cpu/aarch64/assembler_aarch64.hpp
+++ b/src/hotspot/cpu/aarch64/assembler_aarch64.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2014, 2024, Red Hat Inc. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -2552,6 +2552,11 @@ template<typename R, typename... Rx>
     ldst_sstr(T, index, a, op1, op2, Vt, Vt2, Vt3, Vt4);                \
   }
 
+  INSN1(ld1, 0b001101010, 0b0000);
+  INSN2(ld2, 0b001101011, 0b0000);
+  INSN3(ld3, 0b001101010, 0b0010);
+  INSN4(ld4, 0b001101011, 0b0010);
+
   INSN1(st1, 0b001101000, 0b0000);
   INSN2(st2, 0b001101001, 0b0000);
   INSN3(st3, 0b001101000, 0b0010);
@@ -2586,6 +2591,7 @@ template<typename R, typename... Rx>
   void NAME(FloatRegister Vd, SIMD_Arrangement T, FloatRegister Vn, FloatRegister Vm) { \
     guarantee(T != T1Q && T != T1D, "incorrect arrangement");                           \
     if (!acceptT2D) guarantee(T != T2D, "incorrect arrangement");                       \
+    if (opc2 ==  0b101101) guarantee(T != T8B && T != T16B, "incorrect arrangement");   \
     starti;                                                                             \
     f(0, 31), f((int)T & 1, 30), f(opc, 29), f(0b01110, 28, 24);                        \
     f((int)T >> 1, 23, 22), f(1, 21), rf(Vm, 16), f(opc2, 15, 10);                      \
@@ -2609,6 +2615,8 @@ template<typename R, typename... Rx>
   INSN(minv,   0, 0b011011, false); // accepted arrangements: T8B, T16B, T4H, T8H, T2S, T4S
   INSN(smaxp,  0, 0b101001, false); // accepted arrangements: T8B, T16B, T4H, T8H, T2S, T4S
   INSN(sminp,  0, 0b101011, false); // accepted arrangements: T8B, T16B, T4H, T8H, T2S, T4S
+  INSN(sqdmulh,0, 0b101101, false); // accepted arrangements: T4H, T8H, T2S, T4S
+  INSN(shsubv, 0, 0b001001, false); // accepted arrangements: T8B, T16B, T4H, T8H, T2S, T4S
 
 #undef INSN
 
diff --git a/src/hotspot/cpu/aarch64/stubDeclarations_aarch64.hpp b/src/hotspot/cpu/aarch64/stubDeclarations_aarch64.hpp
index 3b5d0640ea4..a893aacaaf2 100644
--- a/src/hotspot/cpu/aarch64/stubDeclarations_aarch64.hpp
+++ b/src/hotspot/cpu/aarch64/stubDeclarations_aarch64.hpp
@@ -44,7 +44,7 @@
                                        do_arch_blob,                    \
                                        do_arch_entry,                   \
                                        do_arch_entry_init)              \
-  do_arch_blob(compiler, 35000 ZGC_ONLY(+5000))                         \
+  do_arch_blob(compiler, 55000 ZGC_ONLY(+5000))                         \
   do_stub(compiler, vector_iota_indices)                                \
   do_arch_entry(aarch64, compiler, vector_iota_indices,                 \
                 vector_iota_indices, vector_iota_indices)               \
diff --git a/src/hotspot/cpu/aarch64/stubGenerator_aarch64.cpp b/src/hotspot/cpu/aarch64/stubGenerator_aarch64.cpp
index 5f901a5e9ea..d5b23dc6843 100644
--- a/src/hotspot/cpu/aarch64/stubGenerator_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/stubGenerator_aarch64.cpp
@@ -4063,6 +4063,95 @@ class StubGenerator: public StubCodeGenerator {
     return start;
   }
 
+  // Execute one round of keccak of two computations in parallel.
+  // One of the states should be loaded into the lower halves of
+  // the vector registers v0-v24, the other should be loaded into
+  // the upper halves of those registers. The ld1r instruction loads
+  // the round constant into both halves of register v31.
+  // Intermediate results c0...c5 and d0...d5 are computed
+  // in registers v25...v30.
+  // All vector instructions that are used operate on both register
+  // halves in parallel.
+  // If only a single computation is needed, one can only load the lower halves.
+  void keccak_round(Register rscratch1) {
+  __ eor3(v29, __ T16B, v4, v9, v14);       // c4 = a4 ^ a9 ^ a14
+  __ eor3(v26, __ T16B, v1, v6, v11);       // c1 = a1 ^ a16 ^ a11
+  __ eor3(v28, __ T16B, v3, v8, v13);       // c3 = a3 ^ a8 ^a13
+  __ eor3(v25, __ T16B, v0, v5, v10);       // c0 = a0 ^ a5 ^ a10
+  __ eor3(v27, __ T16B, v2, v7, v12);       // c2 = a2 ^ a7 ^ a12
+  __ eor3(v29, __ T16B, v29, v19, v24);     // c4 ^= a19 ^ a24
+  __ eor3(v26, __ T16B, v26, v16, v21);     // c1 ^= a16 ^ a21
+  __ eor3(v28, __ T16B, v28, v18, v23);     // c3 ^= a18 ^ a23
+  __ eor3(v25, __ T16B, v25, v15, v20);     // c0 ^= a15 ^ a20
+  __ eor3(v27, __ T16B, v27, v17, v22);     // c2 ^= a17 ^ a22
+
+  __ rax1(v30, __ T2D, v29, v26);           // d0 = c4 ^ rol(c1, 1)
+  __ rax1(v26, __ T2D, v26, v28);           // d2 = c1 ^ rol(c3, 1)
+  __ rax1(v28, __ T2D, v28, v25);           // d4 = c3 ^ rol(c0, 1)
+  __ rax1(v25, __ T2D, v25, v27);           // d1 = c0 ^ rol(c2, 1)
+  __ rax1(v27, __ T2D, v27, v29);           // d3 = c2 ^ rol(c4, 1)
+
+  __ eor(v0, __ T16B, v0, v30);             // a0 = a0 ^ d0
+  __ xar(v29, __ T2D, v1,  v25, (64 - 1));  // a10' = rol((a1^d1), 1)
+  __ xar(v1,  __ T2D, v6,  v25, (64 - 44)); // a1 = rol(a6^d1), 44)
+  __ xar(v6,  __ T2D, v9,  v28, (64 - 20)); // a6 = rol((a9^d4), 20)
+  __ xar(v9,  __ T2D, v22, v26, (64 - 61)); // a9 = rol((a22^d2), 61)
+  __ xar(v22, __ T2D, v14, v28, (64 - 39)); // a22 = rol((a14^d4), 39)
+  __ xar(v14, __ T2D, v20, v30, (64 - 18)); // a14 = rol((a20^d0), 18)
+  __ xar(v31, __ T2D, v2,  v26, (64 - 62)); // a20' = rol((a2^d2), 62)
+  __ xar(v2,  __ T2D, v12, v26, (64 - 43)); // a2 = rol((a12^d2), 43)
+  __ xar(v12, __ T2D, v13, v27, (64 - 25)); // a12 = rol((a13^d3), 25)
+  __ xar(v13, __ T2D, v19, v28, (64 - 8));  // a13 = rol((a19^d4), 8)
+  __ xar(v19, __ T2D, v23, v27, (64 - 56)); // a19 = rol((a23^d3), 56)
+  __ xar(v23, __ T2D, v15, v30, (64 - 41)); // a23 = rol((a15^d0), 41)
+  __ xar(v15, __ T2D, v4,  v28, (64 - 27)); // a15 = rol((a4^d4), 27)
+  __ xar(v28, __ T2D, v24, v28, (64 - 14)); // a4' = rol((a24^d4), 14)
+  __ xar(v24, __ T2D, v21, v25, (64 - 2));  // a24 = rol((a21^d1), 2)
+  __ xar(v8,  __ T2D, v8,  v27, (64 - 55)); // a21' = rol((a8^d3), 55)
+  __ xar(v4,  __ T2D, v16, v25, (64 - 45)); // a8' = rol((a16^d1), 45)
+  __ xar(v16, __ T2D, v5,  v30, (64 - 36)); // a16 = rol((a5^d0), 36)
+  __ xar(v5,  __ T2D, v3,  v27, (64 - 28)); // a5 = rol((a3^d3), 28)
+  __ xar(v27, __ T2D, v18, v27, (64 - 21)); // a3' = rol((a18^d3), 21)
+  __ xar(v3,  __ T2D, v17, v26, (64 - 15)); // a18' = rol((a17^d2), 15)
+  __ xar(v25, __ T2D, v11, v25, (64 - 10)); // a17' = rol((a11^d1), 10)
+  __ xar(v26, __ T2D, v7,  v26, (64 - 6));  // a11' = rol((a7^d2), 6)
+  __ xar(v30, __ T2D, v10, v30, (64 - 3));  // a7' = rol((a10^d0), 3)
+
+  __ bcax(v20, __ T16B, v31, v22, v8);      // a20 = a20' ^ (~a21 & a22')
+  __ bcax(v21, __ T16B, v8,  v23, v22);     // a21 = a21' ^ (~a22 & a23)
+  __ bcax(v22, __ T16B, v22, v24, v23);     // a22 = a22 ^ (~a23 & a24)
+  __ bcax(v23, __ T16B, v23, v31, v24);     // a23 = a23 ^ (~a24 & a20')
+  __ bcax(v24, __ T16B, v24, v8,  v31);     // a24 = a24 ^ (~a20' & a21')
+
+  __ ld1r(v31, __ T2D, __ post(rscratch1, 8)); // rc = round_constants[i]
+
+  __ bcax(v17, __ T16B, v25, v19, v3);      // a17 = a17' ^ (~a18' & a19)
+  __ bcax(v18, __ T16B, v3,  v15, v19);     // a18 = a18' ^ (~a19 & a15')
+  __ bcax(v19, __ T16B, v19, v16, v15);     // a19 = a19 ^ (~a15 & a16)
+  __ bcax(v15, __ T16B, v15, v25, v16);     // a15 = a15 ^ (~a16 & a17')
+  __ bcax(v16, __ T16B, v16, v3,  v25);     // a16 = a16 ^ (~a17' & a18')
+
+  __ bcax(v10, __ T16B, v29, v12, v26);     // a10 = a10' ^ (~a11' & a12)
+  __ bcax(v11, __ T16B, v26, v13, v12);     // a11 = a11' ^ (~a12 & a13)
+  __ bcax(v12, __ T16B, v12, v14, v13);     // a12 = a12 ^ (~a13 & a14)
+  __ bcax(v13, __ T16B, v13, v29, v14);     // a13 = a13 ^ (~a14 & a10')
+  __ bcax(v14, __ T16B, v14, v26, v29);     // a14 = a14 ^ (~a10' & a11')
+
+  __ bcax(v7, __ T16B, v30, v9,  v4);       // a7 = a7' ^ (~a8' & a9)
+  __ bcax(v8, __ T16B, v4,  v5,  v9);       // a8 = a8' ^ (~a9 & a5)
+  __ bcax(v9, __ T16B, v9,  v6,  v5);       // a9 = a9 ^ (~a5 & a6)
+  __ bcax(v5, __ T16B, v5,  v30, v6);       // a5 = a5 ^ (~a6 & a7)
+  __ bcax(v6, __ T16B, v6,  v4,  v30);      // a6 = a6 ^ (~a7 & a8')
+
+  __ bcax(v3, __ T16B, v27, v0,  v28);      // a3 = a3' ^ (~a4' & a0)
+  __ bcax(v4, __ T16B, v28, v1,  v0);       // a4 = a4' ^ (~a0 & a1)
+  __ bcax(v0, __ T16B, v0,  v2,  v1);       // a0 = a0 ^ (~a1 & a2)
+  __ bcax(v1, __ T16B, v1,  v27, v2);       // a1 = a1 ^ (~a2 & a3)
+  __ bcax(v2, __ T16B, v2,  v28, v27);      // a2 = a2 ^ (~a3 & a4')
+
+  __ eor(v0, __ T16B, v0, v31);             // a0 = a0 ^ rc
+  }
+
   // Arguments:
   //
   // Inputs:
@@ -4167,7 +4256,7 @@ class StubGenerator: public StubCodeGenerator {
     __ cbzw(c_rarg5, rounds24_loop);
 
     __ tbnz(block_size, 5, shake128);
-    // block_size == 144, bit5 == 0, SHA3-244
+    // block_size == 144, bit5 == 0, SHA3-224
     __ ldrd(v28, __ post(buf, 8));
     __ eor(v17, __ T8B, v17, v28);
     __ b(rounds24_loop);
@@ -4196,82 +4285,7 @@ class StubGenerator: public StubCodeGenerator {
     __ BIND(rounds24_loop);
     __ subw(rscratch2, rscratch2, 1);
 
-    __ eor3(v29, __ T16B, v4, v9, v14);
-    __ eor3(v26, __ T16B, v1, v6, v11);
-    __ eor3(v28, __ T16B, v3, v8, v13);
-    __ eor3(v25, __ T16B, v0, v5, v10);
-    __ eor3(v27, __ T16B, v2, v7, v12);
-    __ eor3(v29, __ T16B, v29, v19, v24);
-    __ eor3(v26, __ T16B, v26, v16, v21);
-    __ eor3(v28, __ T16B, v28, v18, v23);
-    __ eor3(v25, __ T16B, v25, v15, v20);
-    __ eor3(v27, __ T16B, v27, v17, v22);
-
-    __ rax1(v30, __ T2D, v29, v26);
-    __ rax1(v26, __ T2D, v26, v28);
-    __ rax1(v28, __ T2D, v28, v25);
-    __ rax1(v25, __ T2D, v25, v27);
-    __ rax1(v27, __ T2D, v27, v29);
-
-    __ eor(v0, __ T16B, v0, v30);
-    __ xar(v29, __ T2D, v1,  v25, (64 - 1));
-    __ xar(v1,  __ T2D, v6,  v25, (64 - 44));
-    __ xar(v6,  __ T2D, v9,  v28, (64 - 20));
-    __ xar(v9,  __ T2D, v22, v26, (64 - 61));
-    __ xar(v22, __ T2D, v14, v28, (64 - 39));
-    __ xar(v14, __ T2D, v20, v30, (64 - 18));
-    __ xar(v31, __ T2D, v2,  v26, (64 - 62));
-    __ xar(v2,  __ T2D, v12, v26, (64 - 43));
-    __ xar(v12, __ T2D, v13, v27, (64 - 25));
-    __ xar(v13, __ T2D, v19, v28, (64 - 8));
-    __ xar(v19, __ T2D, v23, v27, (64 - 56));
-    __ xar(v23, __ T2D, v15, v30, (64 - 41));
-    __ xar(v15, __ T2D, v4,  v28, (64 - 27));
-    __ xar(v28, __ T2D, v24, v28, (64 - 14));
-    __ xar(v24, __ T2D, v21, v25, (64 - 2));
-    __ xar(v8,  __ T2D, v8,  v27, (64 - 55));
-    __ xar(v4,  __ T2D, v16, v25, (64 - 45));
-    __ xar(v16, __ T2D, v5,  v30, (64 - 36));
-    __ xar(v5,  __ T2D, v3,  v27, (64 - 28));
-    __ xar(v27, __ T2D, v18, v27, (64 - 21));
-    __ xar(v3,  __ T2D, v17, v26, (64 - 15));
-    __ xar(v25, __ T2D, v11, v25, (64 - 10));
-    __ xar(v26, __ T2D, v7,  v26, (64 - 6));
-    __ xar(v30, __ T2D, v10, v30, (64 - 3));
-
-    __ bcax(v20, __ T16B, v31, v22, v8);
-    __ bcax(v21, __ T16B, v8,  v23, v22);
-    __ bcax(v22, __ T16B, v22, v24, v23);
-    __ bcax(v23, __ T16B, v23, v31, v24);
-    __ bcax(v24, __ T16B, v24, v8,  v31);
-
-    __ ld1r(v31, __ T2D, __ post(rscratch1, 8));
-
-    __ bcax(v17, __ T16B, v25, v19, v3);
-    __ bcax(v18, __ T16B, v3,  v15, v19);
-    __ bcax(v19, __ T16B, v19, v16, v15);
-    __ bcax(v15, __ T16B, v15, v25, v16);
-    __ bcax(v16, __ T16B, v16, v3,  v25);
-
-    __ bcax(v10, __ T16B, v29, v12, v26);
-    __ bcax(v11, __ T16B, v26, v13, v12);
-    __ bcax(v12, __ T16B, v12, v14, v13);
-    __ bcax(v13, __ T16B, v13, v29, v14);
-    __ bcax(v14, __ T16B, v14, v26, v29);
-
-    __ bcax(v7, __ T16B, v30, v9,  v4);
-    __ bcax(v8, __ T16B, v4,  v5,  v9);
-    __ bcax(v9, __ T16B, v9,  v6,  v5);
-    __ bcax(v5, __ T16B, v5,  v30, v6);
-    __ bcax(v6, __ T16B, v6,  v4,  v30);
-
-    __ bcax(v3, __ T16B, v27, v0,  v28);
-    __ bcax(v4, __ T16B, v28, v1,  v0);
-    __ bcax(v0, __ T16B, v0,  v2,  v1);
-    __ bcax(v1, __ T16B, v1,  v27, v2);
-    __ bcax(v2, __ T16B, v2,  v28, v27);
-
-    __ eor(v0, __ T16B, v0, v31);
+    keccak_round(rscratch1);
 
     __ cbnzw(rscratch2, rounds24_loop);
 
@@ -4290,6 +4304,7 @@ class StubGenerator: public StubCodeGenerator {
     __ st1(v20, v21, v22, v23, __ T1D, __ post(state, 32));
     __ st1(v24, __ T1D, state);
 
+    // restore callee-saved registers
     __ ldpd(v14, v15, Address(sp, 48));
     __ ldpd(v12, v13, Address(sp, 32));
     __ ldpd(v10, v11, Address(sp, 16));
@@ -4300,6 +4315,96 @@ class StubGenerator: public StubCodeGenerator {
     return start;
   }
 
+  // Inputs:
+  //   c_rarg0   - long[]  state0
+  //   c_rarg1   - long[]  state1
+  address generate_double_keccak() {
+    static const uint64_t round_consts[24] = {
+      0x0000000000000001L, 0x0000000000008082L, 0x800000000000808AL,
+      0x8000000080008000L, 0x000000000000808BL, 0x0000000080000001L,
+      0x8000000080008081L, 0x8000000000008009L, 0x000000000000008AL,
+      0x0000000000000088L, 0x0000000080008009L, 0x000000008000000AL,
+      0x000000008000808BL, 0x800000000000008BL, 0x8000000000008089L,
+      0x8000000000008003L, 0x8000000000008002L, 0x8000000000000080L,
+      0x000000000000800AL, 0x800000008000000AL, 0x8000000080008081L,
+      0x8000000000008080L, 0x0000000080000001L, 0x8000000080008008L
+    };
+
+    // Implements the double_keccak() method of the
+    // sun.secyrity.provider.SHA3Parallel class
+    __ align(CodeEntryAlignment);
+    StubCodeMark mark(this, "StubRoutines", "double_keccak");
+    address start = __ pc();
+    __ enter();
+
+    Register state0        = c_rarg0;
+    Register state1        = c_rarg1;
+
+    Label rounds24_loop;
+
+    // save callee-saved registers
+    __ stpd(v8, v9, __ pre(sp, -64));
+    __ stpd(v10, v11, Address(sp, 16));
+    __ stpd(v12, v13, Address(sp, 32));
+    __ stpd(v14, v15, Address(sp, 48));
+
+    // load states
+    __ add(rscratch1, state0, 32);
+    __ ld4(v0, v1, v2,  v3, __ D, 0,  state0);
+    __ ld4(v4, v5, v6,  v7, __ D, 0, __ post(rscratch1, 32));
+    __ ld4(v8, v9, v10, v11, __ D, 0, __ post(rscratch1, 32));
+    __ ld4(v12, v13, v14, v15, __ D, 0, __ post(rscratch1, 32));
+    __ ld4(v16, v17, v18, v19, __ D, 0, __ post(rscratch1, 32));
+    __ ld4(v20, v21, v22, v23, __ D, 0, __ post(rscratch1, 32));
+    __ ld1(v24, __ D, 0, rscratch1);
+    __ add(rscratch1, state1, 32);
+    __ ld4(v0, v1, v2,  v3,  __ D, 1, state1);
+    __ ld4(v4, v5, v6,  v7, __ D, 1, __ post(rscratch1, 32));
+    __ ld4(v8, v9, v10, v11, __ D, 1, __ post(rscratch1, 32));
+    __ ld4(v12, v13, v14, v15, __ D, 1, __ post(rscratch1, 32));
+    __ ld4(v16, v17, v18, v19, __ D, 1, __ post(rscratch1, 32));
+    __ ld4(v20, v21, v22, v23, __ D, 1, __ post(rscratch1, 32));
+    __ ld1(v24, __ D, 1, rscratch1);
+
+    // 24 keccak rounds
+    __ movw(rscratch2, 24);
+
+    // load round_constants base
+    __ lea(rscratch1, ExternalAddress((address) round_consts));
+
+    __ BIND(rounds24_loop);
+    __ subw(rscratch2, rscratch2, 1);
+    keccak_round(rscratch1);
+    __ cbnzw(rscratch2, rounds24_loop);
+
+    __ st4(v0, v1, v2,  v3,  __ D, 0, __ post(state0, 32));
+    __ st4(v4, v5, v6,  v7,  __ D, 0, __ post(state0, 32));
+    __ st4(v8, v9, v10, v11, __ D, 0, __ post(state0, 32));
+    __ st4(v12, v13, v14, v15, __ D, 0, __ post(state0, 32));
+    __ st4(v16, v17, v18, v19, __ D, 0, __ post(state0, 32));
+    __ st4(v20, v21, v22, v23, __ D, 0, __ post(state0, 32));
+    __ st1(v24, __ D, 0, state0);
+    __ st4(v0, v1, v2,  v3,  __ D, 1, __ post(state1, 32));
+    __ st4(v4, v5, v6,  v7, __ D, 1, __ post(state1, 32));
+    __ st4(v8, v9, v10, v11, __ D, 1, __ post(state1, 32));
+    __ st4(v12, v13, v14, v15, __ D, 1, __ post(state1, 32));
+    __ st4(v16, v17, v18, v19, __ D, 1, __ post(state1, 32));
+    __ st4(v20, v21, v22, v23, __ D, 1, __ post(state1, 32));
+    __ st1(v24, __ D, 1, state1);
+
+    // restore callee-saved vector registers
+    __ ldpd(v14, v15, Address(sp, 48));
+    __ ldpd(v12, v13, Address(sp, 32));
+    __ ldpd(v10, v11, Address(sp, 16));
+    __ ldpd(v8, v9, __ post(sp, 64));
+
+    __ leave(); // required for proper stackwalking of RuntimeStub frame
+    __ mov(r0, zr); // return 0
+    __ ret(lr);
+
+    return start;
+  }
+
   /**
    *  Arguments:
    *
@@ -4538,6 +4643,961 @@ class StubGenerator: public StubCodeGenerator {
     return start;
   }
 
+  void dilithium_load16zetas(int o0, Register zetas) {
+    __ ldpq(as_FloatRegister(o0), as_FloatRegister(o0 + 1), __ post (zetas, 32));
+    __ ldpq(as_FloatRegister(o0 + 2), as_FloatRegister(o0 + 3), __ post (zetas, 32));
+
+  }
+
+  void dilithium_load32zetas(Register zetas) {
+    dilithium_load16zetas(16, zetas);
+    dilithium_load16zetas(20, zetas);
+  }
+
+  // 2x16 32-bit Montgomery multiplications in parallel
+  // See the montMul() method of the sun.security.provider.ML_DSA class.
+  // Here MONT_R_BITS is 32, so the right shift by it is implicit.
+  // The constants qInv = MONT_Q_INV_MOD_R and q = MONT_Q are loaded in
+  // (all 32-bit chunks of) vector registers v30 and v31, resp.
+  // The inputs are b[i]s in v0-v7 and c[i]s v16-v23 and
+  // the results are a[i]s in v16-v23, four 32-bit values in each register
+  // and we do a_i = b_i * c_i * 2^-32 mod MONT_Q for all
+  void dilithium_montmul32(bool by_constant) {
+    FloatRegister vr0 = by_constant ? v29 : v0;
+    FloatRegister vr1 = by_constant ? v29 : v1;
+    FloatRegister vr2 = by_constant ? v29 : v2;
+    FloatRegister vr3 = by_constant ? v29 : v3;
+    FloatRegister vr4 = by_constant ? v29 : v4;
+    FloatRegister vr5 = by_constant ? v29 : v5;
+    FloatRegister vr6 = by_constant ? v29 : v6;
+    FloatRegister vr7 = by_constant ? v29 : v7;
+
+    __ sqdmulh(v24, __ T4S, vr0, v16); // aHigh = hi32(2 * b * c)
+    __ mulv(v16, __ T4S, vr0, v16);    // aLow = lo32(b * c)
+    __ sqdmulh(v25, __ T4S, vr1, v17);
+    __ mulv(v17, __ T4S, vr1, v17);
+    __ sqdmulh(v26, __ T4S, vr2, v18);
+    __ mulv(v18, __ T4S, vr2, v18);
+    __ sqdmulh(v27, __ T4S, vr3, v19);
+    __ mulv(v19, __ T4S, vr3, v19);
+
+    __ mulv(v16, __ T4S, v16, v30);     // m = aLow * qinv
+    __ mulv(v17, __ T4S, v17, v30);
+    __ mulv(v18, __ T4S, v18, v30);
+    __ mulv(v19, __ T4S, v19, v30);
+
+    __ sqdmulh(v16, __ T4S, v16, v31);  // n = hi32(2 * m * q)
+    __ sqdmulh(v17, __ T4S, v17, v31);
+    __ sqdmulh(v18, __ T4S, v18, v31);
+    __ sqdmulh(v19, __ T4S, v19, v31);
+
+    __ shsubv(v16, __ T4S, v24, v16);   // a = (aHigh - n) / 2
+    __ shsubv(v17, __ T4S, v25, v17);
+    __ shsubv(v18, __ T4S, v26, v18);
+    __ shsubv(v19, __ T4S, v27, v19);
+
+    __ sqdmulh(v24, __ T4S, vr4, v20);
+    __ mulv(v20, __ T4S, vr4, v20);
+    __ sqdmulh(v25, __ T4S, vr5, v21);
+    __ mulv(v21, __ T4S, vr5, v21);
+    __ sqdmulh(v26, __ T4S, vr6, v22);
+    __ mulv(v22, __ T4S, vr6, v22);
+    __ sqdmulh(v27, __ T4S, vr7, v23);
+    __ mulv(v23, __ T4S, vr7, v23);
+
+    __ mulv(v20, __ T4S, v20, v30);
+    __ mulv(v21, __ T4S, v21, v30);
+    __ mulv(v22, __ T4S, v22, v30);
+    __ mulv(v23, __ T4S, v23, v30);
+
+    __ sqdmulh(v20, __ T4S, v20, v31);
+    __ sqdmulh(v21, __ T4S, v21, v31);
+    __ sqdmulh(v22, __ T4S, v22, v31);
+    __ sqdmulh(v23, __ T4S, v23, v31);
+
+    __ shsubv(v20, __ T4S, v24, v20);
+    __ shsubv(v21, __ T4S, v25, v21);
+    __ shsubv(v22, __ T4S, v26, v22);
+    __ shsubv(v23, __ T4S, v27, v23);
+  }
+
+ // Do the addition and subtraction done in the ntt algorithm.
+ // See sun.security.provider.ML_DSA.implDilithiumAlmostNttJava()
+  void dilithium_add_sub32() {
+    __ addv(v24, __ T4S, v0, v16); // coeffs[j] = coeffs[j] + tmp;
+    __ addv(v25, __ T4S, v1, v17);
+    __ addv(v26, __ T4S, v2, v18);
+    __ addv(v27, __ T4S, v3, v19);
+    __ addv(v28, __ T4S, v4, v20);
+    __ addv(v29, __ T4S, v5, v21);
+    __ addv(v30, __ T4S, v6, v22);
+    __ addv(v31, __ T4S, v7, v23);
+
+    __ subv(v0, __ T4S, v0, v16);  // coeffs[j + l] = coeffs[j] - tmp;
+    __ subv(v1, __ T4S, v1, v17);
+    __ subv(v2, __ T4S, v2, v18);
+    __ subv(v3, __ T4S, v3, v19);
+    __ subv(v4, __ T4S, v4, v20);
+    __ subv(v5, __ T4S, v5, v21);
+    __ subv(v6, __ T4S, v6, v22);
+    __ subv(v7, __ T4S, v7, v23);
+  }
+
+  // Do the same computation that
+  // dilithium_montmul32() and dilithium_add_sub32() does,
+  // except for only 4x4 32-bit vector elements and with
+  // different register usage.
+  void dilithium_montmul_sub_add16() {
+    __ sqdmulh(v24, __ T4S, v1, v16);
+    __ mulv(v16, __ T4S, v1, v16);
+    __ sqdmulh(v25, __ T4S, v3, v17);
+    __ mulv(v17, __ T4S, v3, v17);
+    __ sqdmulh(v26, __ T4S, v5, v18);
+    __ mulv(v18, __ T4S, v5, v18);
+    __ sqdmulh(v27, __ T4S, v7, v19);
+    __ mulv(v19, __ T4S, v7, v19);
+
+    __ mulv(v16, __ T4S, v16, v30);
+    __ mulv(v17, __ T4S, v17, v30);
+    __ mulv(v18, __ T4S, v18, v30);
+    __ mulv(v19, __ T4S, v19, v30);
+
+    __ sqdmulh(v16, __ T4S, v16, v31);
+    __ sqdmulh(v17, __ T4S, v17, v31);
+    __ sqdmulh(v18, __ T4S, v18, v31);
+    __ sqdmulh(v19, __ T4S, v19, v31);
+
+    __ shsubv(v16, __ T4S, v24, v16);
+    __ shsubv(v17, __ T4S, v25, v17);
+    __ shsubv(v18, __ T4S, v26, v18);
+    __ shsubv(v19, __ T4S, v27, v19);
+
+    __ subv(v1, __ T4S, v0, v16);
+    __ subv(v3, __ T4S, v2, v17);
+    __ subv(v5, __ T4S, v4, v18);
+    __ subv(v7, __ T4S, v6, v19);
+
+    __ addv(v0, __ T4S, v0, v16);
+    __ addv(v2, __ T4S, v2, v17);
+    __ addv(v4, __ T4S, v4, v18);
+    __ addv(v6, __ T4S, v6, v19);
+  }
+
+  // At these levels, the indices that correspond to the 'j's (and 'j+l's)
+  // in the Java implementation come in sequences of at least 8, so we
+  // can use ldpq to collect the corresponding data into pairs of vector
+  // registers.
+  // We collect the coefficients corresponding to the 'j+l' indexes into
+  // the vector registers v0-v7, the zetas into the vector registers v16-v23
+  // then we do the (Montgomery) multiplications by the zetas in parallel
+  // into v16-v23, load the coeffs corresponding to the 'j' indexes into
+  // v0-v7, then do the additions into v24-v31 and the subtractions into
+  // v0-v7 and finally save the results back to the coeffs array.
+  void dilithiumNttLevel0_4(const Register dilithiumConsts,
+    const Register coeffs, const Register zetas) {
+    int c1 = 0;
+    int c2 = 512;
+    int startIncr;
+    int incr1 = 32;
+    int incr2 = 64;
+    int incr3 = 96;
+
+    for (int level = 0; level < 5; level++) {
+      int c1Start = c1;
+      int c2Start = c2;
+      if (level == 3) {
+        incr1 = 32;
+        incr2 = 128;
+        incr3 = 160;
+      } else if (level == 4) {
+        incr1 = 64;
+        incr2 = 128;
+        incr3 = 192;
+      }
+
+      for (int i = 0; i < 4; i++) {
+        __ ldpq(v30, v31, Address(dilithiumConsts, 0)); // qInv, q
+        __ ldpq(v0, v1, Address(coeffs, c2Start));
+        __ ldpq(v2, v3, Address(coeffs, c2Start + incr1));
+        __ ldpq(v4, v5, Address(coeffs, c2Start + incr2));
+        __ ldpq(v6, v7, Address(coeffs, c2Start + incr3));
+        dilithium_load32zetas(zetas);
+        dilithium_montmul32(false);
+        __ ldpq(v0, v1, Address(coeffs, c1Start));
+        __ ldpq(v2, v3, Address(coeffs, c1Start + incr1));
+        __ ldpq(v4, v5, Address(coeffs, c1Start + incr2));
+        __ ldpq(v6, v7, Address(coeffs, c1Start + incr3));
+        dilithium_add_sub32();
+        __ stpq(v24, v25, Address(coeffs, c1Start));
+        __ stpq(v26, v27, Address(coeffs, c1Start + incr1));
+        __ stpq(v28, v29, Address(coeffs, c1Start + incr2));
+        __ stpq(v30, v31, Address(coeffs, c1Start + incr3));
+        __ stpq(v0, v1, Address(coeffs, c2Start));
+        __ stpq(v2, v3, Address(coeffs, c2Start + incr1));
+        __ stpq(v4, v5, Address(coeffs, c2Start + incr2));
+        __ stpq(v6, v7, Address(coeffs, c2Start + incr3));
+
+        int k = 4 * level + i;
+
+        if (k > 7) {
+          startIncr = 256;
+        } else if (k == 5) {
+          startIncr = 384;
+        } else {
+          startIncr = 128;
+        }
+
+        c1Start += startIncr;
+        c2Start += startIncr;
+      }
+
+      c2 /= 2;
+    }
+  }
+
+  // Dilithium NTT function except for the final "normalization" to |coeff| < Q.
+  // Implements the method
+  // static int implDilithiumAlmostNtt(int[] coeffs, int zetas[]) {}
+  // of the Java class sun.security.provider
+  //
+  // coeffs (int[256]) = c_rarg0
+  // zetas (int[256]) = c_rarg1
+  address generate_dilithiumAlmostNtt() {
+
+    __ align(CodeEntryAlignment);
+    StubGenStubId stub_id = StubGenStubId::dilithiumAlmostNtt_id;
+    StubCodeMark mark(this, stub_id);
+    address start = __ pc();
+    __ enter();
+
+    const Register coeffs = c_rarg0;
+    const Register zetas = c_rarg1;
+
+    const Register tmpAddr = r9;
+    const Register dilithiumConsts = r10;
+    const Register result = r11;
+
+    __ add(result, coeffs, 0);
+    __ lea(dilithiumConsts, ExternalAddress((address) StubRoutines::aarch64::_dilithiumConsts));
+
+    // Each level represents one iteration of the outer for loop of the Java version
+
+    // level 0-4
+    dilithiumNttLevel0_4(dilithiumConsts, coeffs, zetas);
+
+    // level 5
+    for (int i = 0; i < 1024; i += 256) {
+      __ ldpq(v30, v31, Address(dilithiumConsts, 0));  // qInv, q
+      __ ldr(v0, __ Q, Address(coeffs, i + 16));
+      __ ldr(v1, __ Q, Address(coeffs, i + 48));
+      __ ldr(v2, __ Q, Address(coeffs, i + 80));
+      __ ldr(v3, __ Q, Address(coeffs, i + 112));
+      __ ldr(v4, __ Q, Address(coeffs, i + 144));
+      __ ldr(v5, __ Q, Address(coeffs, i + 176));
+      __ ldr(v6, __ Q, Address(coeffs, i + 208));
+      __ ldr(v7, __ Q, Address(coeffs, i + 240));
+      dilithium_load32zetas(zetas);
+      dilithium_montmul32(false);
+      __ ldr(v0, __ Q, Address(coeffs, i));
+      __ ldr(v1, __ Q, Address(coeffs, i + 32));
+      __ ldr(v2, __ Q, Address(coeffs, i + 64));
+      __ ldr(v3, __ Q, Address(coeffs, i + 96));
+      __ ldr(v4, __ Q, Address(coeffs, i + 128));
+      __ ldr(v5, __ Q, Address(coeffs, i + 160));
+      __ ldr(v6, __ Q, Address(coeffs, i + 192));
+      __ ldr(v7, __ Q, Address(coeffs, i + 224));
+      dilithium_add_sub32();
+      __ str(v24, __ Q, Address(coeffs, i));
+      __ str(v25, __ Q, Address(coeffs, i + 32));
+      __ str(v26, __ Q, Address(coeffs, i + 64));
+      __ str(v27, __ Q, Address(coeffs, i + 96));
+      __ str(v28, __ Q, Address(coeffs, i + 128));
+      __ str(v29, __ Q, Address(coeffs, i + 160));
+      __ str(v30, __ Q, Address(coeffs, i + 192));
+      __ str(v31, __ Q, Address(coeffs, i + 224));
+      __ str(v0, __ Q, Address(coeffs, i + 16));
+      __ str(v1, __ Q, Address(coeffs, i + 48));
+      __ str(v2, __ Q, Address(coeffs, i + 80));
+      __ str(v3, __ Q, Address(coeffs, i + 112));
+      __ str(v4, __ Q, Address(coeffs, i + 144));
+      __ str(v5, __ Q, Address(coeffs, i + 176));
+      __ str(v6, __ Q, Address(coeffs, i + 208));
+      __ str(v7, __ Q, Address(coeffs, i + 240));
+    }
+
+    // level 6
+    for (int i = 0; i < 1024; i += 128) {
+      __ ldpq(v30, v31, Address(dilithiumConsts, 0));  // qInv, q
+      __ add(tmpAddr, coeffs, i);
+      __ ld2(v0, v1, __ T2D, tmpAddr);
+      __ add(tmpAddr, coeffs, i + 32);
+      __ ld2(v2, v3, __ T2D, tmpAddr);
+      __ add(tmpAddr, coeffs, i + 64);
+      __ ld2(v4, v5, __ T2D, tmpAddr);
+      __ add(tmpAddr, coeffs, i + 96);
+      __ ld2(v6, v7, __ T2D, tmpAddr);
+      dilithium_load16zetas(16, zetas);
+      dilithium_montmul_sub_add16();
+      __ add(tmpAddr, coeffs, i);
+      __ st2(v0, v1, __ T2D, tmpAddr);
+      __ add(tmpAddr, coeffs, i + 32);
+      __ st2(v2, v3, __ T2D, tmpAddr);
+      __ add(tmpAddr, coeffs, i + 64);
+      __ st2(v4, v5, __ T2D, tmpAddr);
+      __ add(tmpAddr, coeffs, i + 96);
+      __ st2(v6, v7, __ T2D, tmpAddr);
+    }
+
+    // level 7
+    for (int i = 0; i < 1024; i += 128) {
+      __ ldpq(v30, v31, Address(dilithiumConsts, 0));  // qInv, q
+      __ add(tmpAddr, coeffs, i);
+      __ ld2(v0, v1, __ T4S, tmpAddr);
+      __ add(tmpAddr, coeffs, i + 32);
+      __ ld2(v2, v3, __ T4S, tmpAddr);
+      __ add(tmpAddr, coeffs, i + 64);
+      __ ld2(v4, v5, __ T4S, tmpAddr);
+      __ add(tmpAddr, coeffs, i + 96);
+      __ ld2(v6, v7, __ T4S, tmpAddr);
+      dilithium_load16zetas(16, zetas);
+      dilithium_montmul_sub_add16();
+      __ add(tmpAddr, coeffs, i);
+      __ st2(v0, v1, __ T4S, tmpAddr);
+      __ add(tmpAddr, coeffs, i + 32);
+      __ st2(v2, v3, __ T4S, tmpAddr);
+      __ add(tmpAddr, coeffs, i + 64);
+      __ st2(v4, v5, __ T4S, tmpAddr);
+      __ add(tmpAddr, coeffs, i + 96);
+      __ st2(v6, v7, __ T4S, tmpAddr);
+    }
+    __ leave(); // required for proper stackwalking of RuntimeStub frame
+    __ mov(r0, zr); // return 0
+    __ ret(lr);
+
+    return start;
+
+  }
+
+  // Do the computations that can be found in the body of the loop in
+  // sun.security.provider.ML_DSA.implDilithiumAlmostInverseNttJava()
+  // for 16 coefficients in parallel:
+  // tmp = coeffs[j];
+  // coeffs[j] = (tmp + coeffs[j + l]);
+  // coeffs[j + l] = montMul(tmp - coeffs[j + l], -MONT_ZETAS_FOR_NTT[m]);
+  // coefss[j]s are loaded in v0, v2, v4 and v6,
+  // coeffs[j + l]s in v1, v3, v5 and v7,
+  // the corresponding zetas in v16, v17, v18 and v19.
+  void dilithium_sub_add_montmul16() {
+    __ subv(v20, __ T4S, v0, v1);
+    __ subv(v21, __ T4S, v2, v3);
+    __ subv(v22, __ T4S, v4, v5);
+    __ subv(v23, __ T4S, v6, v7);
+
+    __ addv(v0, __ T4S, v0, v1);
+    __ addv(v2, __ T4S, v2, v3);
+    __ addv(v4, __ T4S, v4, v5);
+    __ addv(v6, __ T4S, v6, v7);
+
+    __ sqdmulh(v24, __ T4S, v20, v16); // aHigh = hi32(2 * b * c)
+    __ mulv(v1, __ T4S, v20, v16);     // aLow = lo32(b * c)
+    __ sqdmulh(v25, __ T4S, v21, v17);
+    __ mulv(v3, __ T4S, v21, v17);
+    __ sqdmulh(v26, __ T4S, v22, v18);
+    __ mulv(v5, __ T4S, v22, v18);
+    __ sqdmulh(v27, __ T4S, v23, v19);
+    __ mulv(v7, __ T4S, v23, v19);
+
+    __ mulv(v1, __ T4S, v1, v30);      // m = (aLow * q)
+    __ mulv(v3, __ T4S, v3, v30);
+    __ mulv(v5, __ T4S, v5, v30);
+    __ mulv(v7, __ T4S, v7, v30);
+
+    __ sqdmulh(v1, __ T4S, v1, v31);  // n = hi32(2 * m * q)
+    __ sqdmulh(v3, __ T4S, v3, v31);
+    __ sqdmulh(v5, __ T4S, v5, v31);
+    __ sqdmulh(v7, __ T4S, v7, v31);
+
+    __ shsubv(v1, __ T4S, v24, v1);  // a = (aHigh  - n) / 2
+    __ shsubv(v3, __ T4S, v25, v3);
+    __ shsubv(v5, __ T4S, v26, v5);
+    __ shsubv(v7, __ T4S, v27, v7);
+  }
+
+  // At these levels, the indices that correspond to the 'j's (and 'j+l's)
+  // in the Java implementation come in sequences of at least 8, so we
+  // can use ldpq to collect the corresponding data into pairs of vector
+  // registers
+  // We collect the coefficients that correspond to the 'j's into v0-v7
+  // the coefficiets that correspond to the 'j+l's into v16-v23 then
+  // do the additions into v24-v31 and the subtractions into v0-v7 then
+  // save the result of the additions, load the zetas into v16-v23
+  // do the (Montgomery) multiplications by zeta in parallel into v16-v23
+  // finally save the results back to the coeffs array
+  void dilithiumInverseNttLevel3_7(const Register dilithiumConsts,
+    const Register coeffs, const Register zetas) {
+    int c1 = 0;
+    int c2 = 32;
+    int startIncr;
+    int incr1;
+    int incr2;
+    int incr3;
+
+    for (int level = 3; level < 8; level++) {
+      int c1Start = c1;
+      int c2Start = c2;
+      if (level == 3) {
+        incr1 = 64;
+        incr2 = 128;
+        incr3 = 192;
+      } else if (level == 4) {
+        incr1 = 32;
+        incr2 = 128;
+        incr3 = 160;
+      } else {
+        incr1 = 32;
+        incr2 = 64;
+        incr3 = 96;
+      }
+
+      for (int i = 0; i < 4; i++) {
+        __ ldpq(v0, v1, Address(coeffs, c1Start));
+        __ ldpq(v2, v3, Address(coeffs, c1Start + incr1));
+        __ ldpq(v4, v5, Address(coeffs, c1Start + incr2));
+        __ ldpq(v6, v7, Address(coeffs, c1Start + incr3));
+        __ ldpq(v16, v17, Address(coeffs, c2Start));
+        __ ldpq(v18, v19, Address(coeffs, c2Start + incr1));
+        __ ldpq(v20, v21, Address(coeffs, c2Start + incr2));
+        __ ldpq(v22, v23, Address(coeffs, c2Start + incr3));
+        dilithium_add_sub32();
+        __ stpq(v24, v25, Address(coeffs, c1Start));
+        __ stpq(v26, v27, Address(coeffs, c1Start + incr1));
+        __ stpq(v28, v29, Address(coeffs, c1Start + incr2));
+        __ stpq(v30, v31, Address(coeffs, c1Start + incr3));
+        __ ldpq(v30, v31, Address(dilithiumConsts, 0));   // qInv, q
+        dilithium_load32zetas(zetas);
+        dilithium_montmul32(false);
+        __ stpq(v16, v17, Address(coeffs, c2Start));
+        __ stpq(v18, v19, Address(coeffs, c2Start + incr1));
+        __ stpq(v20, v21, Address(coeffs, c2Start + incr2));
+        __ stpq(v22, v23, Address(coeffs, c2Start + incr3));
+
+        int k = 4 * level + i;
+
+        if (k < 24) {
+          startIncr = 256;
+        } else if (k == 25) {
+          startIncr = 384;
+        } else {
+          startIncr = 128;
+        }
+
+        c1Start += startIncr;
+        c2Start += startIncr;
+      }
+
+      c2 *= 2;
+    }
+  }
+
+  // Dilithium Inverse NTT function except the final mod Q division by 2^256.
+  // Implements the method
+  // static int implDilithiumAlmostInverseNtt(int[] coeffs, int[] zetas) {} of
+  // the sun.security.provider.ML_DSA class.
+  //
+  // coeffs (int[256]) = c_rarg0
+  // zetas (int[256]) = c_rarg1
+  address generate_dilithiumAlmostInverseNtt() {
+
+    __ align(CodeEntryAlignment);
+    StubGenStubId stub_id = StubGenStubId::dilithiumAlmostInverseNtt_id;
+    StubCodeMark mark(this, stub_id);
+    address start = __ pc();
+    __ enter();
+
+    const Register coeffs = c_rarg0;
+    const Register zetas = c_rarg1;
+
+    const Register tmpAddr = r9;
+    const Register dilithiumConsts = r10;
+    const Register result = r11;
+
+    __ add(result, coeffs, 0);
+    __ lea(dilithiumConsts, ExternalAddress((address) StubRoutines::aarch64::_dilithiumConsts));
+
+    // Each level represents one iteration of the outer for loop of the Java version
+    // level0
+    for (int i = 0; i < 1024; i += 128) {
+      __ ldpq(v30, v31, Address(dilithiumConsts, 0));  // qInv, q
+      __ add(tmpAddr, coeffs, i);
+      __ ld2(v0, v1, __ T4S, tmpAddr);
+      __ add(tmpAddr, coeffs, i + 32);
+      __ ld2(v2, v3, __ T4S, tmpAddr);
+      __ add(tmpAddr, coeffs, i + 64);
+      __ ld2(v4, v5, __ T4S, tmpAddr);
+      __ add(tmpAddr, coeffs, i + 96);
+      __ ld2(v6, v7, __ T4S, tmpAddr);
+      dilithium_load16zetas(16, zetas);
+      dilithium_sub_add_montmul16();
+      __ add(tmpAddr, coeffs, i);
+      __ st2(v0, v1, __ T4S, tmpAddr);
+      __ add(tmpAddr, coeffs, i + 32);
+      __ st2(v2, v3, __ T4S, tmpAddr);
+      __ add(tmpAddr, coeffs, i + 64);
+      __ st2(v4, v5, __ T4S, tmpAddr);
+      __ add(tmpAddr, coeffs, i + 96);
+      __ st2(v6, v7, __ T4S, tmpAddr);
+    }
+
+    // level 1
+    for (int i = 0; i < 1024; i += 128) {
+      __ add(tmpAddr, coeffs, i);
+      __ ld2(v0, v1, __ T2D, tmpAddr);
+      __ add(tmpAddr, coeffs, i + 32);
+      __ ld2(v2, v3, __ T2D, tmpAddr);
+      __ add(tmpAddr, coeffs, i + 64);
+      __ ld2(v4, v5, __ T2D, tmpAddr);
+      __ add(tmpAddr, coeffs, i + 96);
+      __ ld2(v6, v7, __ T2D, tmpAddr);
+      dilithium_load16zetas(16, zetas);
+      dilithium_sub_add_montmul16();
+      __ add(tmpAddr, coeffs, i);
+      __ st2(v0, v1, __ T2D, tmpAddr);
+      __ add(tmpAddr, coeffs, i + 32);
+      __ st2(v2, v3, __ T2D, tmpAddr);
+      __ add(tmpAddr, coeffs, i + 64);
+      __ st2(v4, v5, __ T2D, tmpAddr);
+      __ add(tmpAddr, coeffs, i + 96);
+      __ st2(v6, v7, __ T2D, tmpAddr);
+    }
+
+    //level 2
+    for (int i = 0; i < 1024; i += 256) {
+      __ ldr(v0, __ Q, Address(coeffs, i));
+      __ ldr(v1, __ Q, Address(coeffs, i + 32));
+      __ ldr(v2, __ Q, Address(coeffs, i + 64));
+      __ ldr(v3, __ Q, Address(coeffs, i + 96));
+      __ ldr(v4, __ Q, Address(coeffs, i + 128));
+      __ ldr(v5, __ Q, Address(coeffs, i + 160));
+      __ ldr(v6, __ Q, Address(coeffs, i + 192));
+      __ ldr(v7, __ Q, Address(coeffs, i + 224));
+      __ ldr(v16, __ Q, Address(coeffs, i + 16));
+      __ ldr(v17, __ Q, Address(coeffs, i + 48));
+      __ ldr(v18, __ Q, Address(coeffs, i + 80));
+      __ ldr(v19, __ Q, Address(coeffs, i + 112));
+      __ ldr(v20, __ Q, Address(coeffs, i + 144));
+      __ ldr(v21, __ Q, Address(coeffs, i + 176));
+      __ ldr(v22, __ Q, Address(coeffs, i + 208));
+      __ ldr(v23, __ Q, Address(coeffs, i + 240));
+      dilithium_add_sub32();
+      __ str(v24, __ Q, Address(coeffs, i));
+      __ str(v25, __ Q, Address(coeffs, i + 32));
+      __ str(v26, __ Q, Address(coeffs, i + 64));
+      __ str(v27, __ Q, Address(coeffs, i + 96));
+      __ str(v28, __ Q, Address(coeffs, i + 128));
+      __ str(v29, __ Q, Address(coeffs, i + 160));
+      __ str(v30, __ Q, Address(coeffs, i + 192));
+      __ str(v31, __ Q, Address(coeffs, i + 224));
+      dilithium_load32zetas(zetas);
+      __ ldpq(v30, v31, Address(dilithiumConsts, 0));  // qInv, q
+      dilithium_montmul32(false);
+      __ str(v16, __ Q, Address(coeffs, i + 16));
+      __ str(v17, __ Q, Address(coeffs, i + 48));
+      __ str(v18, __ Q, Address(coeffs, i + 80));
+      __ str(v19, __ Q, Address(coeffs, i + 112));
+      __ str(v20, __ Q, Address(coeffs, i + 144));
+      __ str(v21, __ Q, Address(coeffs, i + 176));
+      __ str(v22, __ Q, Address(coeffs, i + 208));
+      __ str(v23, __ Q, Address(coeffs, i + 240));
+    }
+
+    // level 3-7
+    dilithiumInverseNttLevel3_7(dilithiumConsts, coeffs, zetas);
+
+    __ leave(); // required for proper stackwalking of RuntimeStub frame
+    __ mov(r0, zr); // return 0
+    __ ret(lr);
+
+    return start;
+
+  }
+
+  // Dilithium multiply polynomials in the NTT domain.
+  // Straightforward implementation of the method
+  // static int implDilithiumNttMult(
+  //              int[] result, int[] ntta, int[] nttb {} of
+  // the sun.security.provider.ML_DSA class.
+  //
+  // result (int[256]) = c_rarg0
+  // poly1 (int[256]) = c_rarg1
+  // poly2 (int[256]) = c_rarg2
+  address generate_dilithiumNttMult() {
+
+    __ align(CodeEntryAlignment);
+    StubGenStubId stub_id = StubGenStubId::dilithiumNttMult_id;
+    StubCodeMark mark(this, stub_id);
+    address start = __ pc();
+    __ enter();
+
+    Label L_loop;
+
+    const Register result = c_rarg0;
+    const Register poly1 = c_rarg1;
+    const Register poly2 = c_rarg2;
+
+    const Register dilithiumConsts = r10;
+    const Register len = r11;
+
+    __ lea(dilithiumConsts, ExternalAddress((address) StubRoutines::aarch64::_dilithiumConsts));
+
+    __ ldpq(v30, v31, Address(dilithiumConsts, 0));   // qInv, q
+    __ ldr(v29, __ Q, Address(dilithiumConsts, 48));  // rSquare
+
+    __ mov(len, zr);
+    __ add(len, len, 1024);
+
+    __ BIND(L_loop);
+
+    __ ldpq(v0, v1, __ post(poly1, 32));
+    __ ldpq(v2, v3, __ post(poly1, 32));
+    __ ldpq(v4, v5, __ post(poly1, 32));
+    __ ldpq(v6, v7, __ post(poly1, 32));
+    __ ldpq(v16, v17, __ post(poly2, 32));
+    __ ldpq(v18, v19, __ post(poly2, 32));
+    __ ldpq(v20, v21, __ post(poly2, 32));
+    __ ldpq(v22, v23, __ post(poly2, 32));
+    dilithium_montmul32(false);
+    dilithium_montmul32(true);
+    __ stpq(v16, v17, __ post(result, 32));
+    __ stpq(v18, v19, __ post(result, 32));
+    __ stpq(v20, v21, __ post(result, 32));
+    __ stpq(v22, v23, __ post(result, 32));
+
+    __ sub(len, len, 128);
+    __ cmp(len, (u1)128);
+    __ br(Assembler::GE, L_loop);
+
+    __ leave(); // required for proper stackwalking of RuntimeStub frame
+    __ mov(r0, zr); // return 0
+    __ ret(lr);
+
+    return start;
+
+  }
+
+  // Dilithium Motgomery multiply an array by a constant.
+  // A straightforward implementation of the method
+  // static int implDilithiumMontMulByConstant(int[] coeffs, int constant) {}
+  // of the sun.security.provider.MLDSA class
+  //
+  // coeffs (int[256]) = c_rarg0
+  // constant (int) = c_rarg1
+  address generate_dilithiumMontMulByConstant() {
+
+    __ align(CodeEntryAlignment);
+    StubGenStubId stub_id = StubGenStubId::dilithiumMontMulByConstant_id;
+    StubCodeMark mark(this, stub_id);
+    address start = __ pc();
+    __ enter();
+
+    Label L_loop;
+
+    const Register coeffs = c_rarg0;
+    const Register constant = c_rarg1;
+
+    const Register dilithiumConsts = r10;
+    const Register result = r11;
+    const Register len = r12;
+
+    __ add(result, coeffs, 0);
+    __ lea(dilithiumConsts, ExternalAddress((address) StubRoutines::aarch64::_dilithiumConsts));
+
+    __ ldpq(v30, v31, Address(dilithiumConsts, 0));   // qInv, q
+    __ dup(v29, __ T4S, constant);
+    __ mov(len, zr);
+    __ add(len, len, 1024);
+
+    __ BIND(L_loop);
+
+    __ ldpq(v16, v17, __ post(coeffs, 32));
+    __ ldpq(v18, v19, __ post(coeffs, 32));
+    __ ldpq(v20, v21, __ post(coeffs, 32));
+    __ ldpq(v22, v23, __ post(coeffs, 32));
+    dilithium_montmul32(true);
+    __ stpq(v16, v17, __ post(result, 32));
+    __ stpq(v18, v19, __ post(result, 32));
+    __ stpq(v20, v21, __ post(result, 32));
+    __ stpq(v22, v23, __ post(result, 32));
+
+    __ sub(len, len, 128);
+    __ cmp(len, (u1)128);
+    __ br(Assembler::GE, L_loop);
+
+    __ leave(); // required for proper stackwalking of RuntimeStub frame
+    __ mov(r0, zr); // return 0
+    __ ret(lr);
+
+    return start;
+  }
+
+  // Dilithium decompose poly.
+  // Implements the method
+  // static int implDilithiumDecomposePoly(int[] coeffs, int constant) {}
+  // of the sun.security.provider.ML_DSA class
+  //
+  // input (int[256]) = c_rarg0
+  // lowPart (int[256]) = c_rarg1
+  // highPart (int[256]) = c_rarg2
+  // twoGamma2  (int) = c_rarg3
+  // multiplier (int) = c_rarg4
+  address generate_dilithiumDecomposePoly() {
+
+    __ align(CodeEntryAlignment);
+    StubGenStubId stub_id = StubGenStubId::dilithiumDecomposePoly_id;
+    StubCodeMark mark(this, stub_id);
+    address start = __ pc();
+    __ enter();
+
+    Label L_loop;
+
+    const Register input = c_rarg0;
+    const Register lowPart = c_rarg1;
+    const Register highPart = c_rarg2;
+    const Register twoGamma2 = c_rarg3;
+    const Register multiplier = c_rarg4;
+
+    const Register len = r9;
+    const Register dilithiumConsts = r10;
+    const Register tmp = r11;
+
+    __ lea(dilithiumConsts, ExternalAddress((address) StubRoutines::aarch64::_dilithiumConsts));
+
+    // save callee-saved registers
+    __ stpd(v8, v9, __ pre(sp, -64));
+    __ stpd(v10, v11, Address(sp, 16));
+    __ stpd(v12, v13, Address(sp, 32));
+    __ stpd(v14, v15, Address(sp, 48));
+
+
+    __ mov(tmp, zr);
+    __ add(tmp, tmp, 1);
+    __ dup(v25, __ T4S, tmp); // 1
+    __ ldr(v30, __ Q, Address(dilithiumConsts, 16)); // q
+    __ ldr(v31, __ Q, Address(dilithiumConsts, 64)); // addend for mod q reduce
+    __ dup(v28, __ T4S, twoGamma2); // 2 * gamma2
+    __ dup(v29, __ T4S, multiplier); // multiplier for mod 2 * gamma reduce
+    __ subv(v26, __ T4S, v30, v25); // q - 1
+    __ sshr(v27, __ T4S, v28, 1); // gamma2
+
+    __ mov(len, zr);
+    __ add(len, len, 1024);
+
+    __ BIND(L_loop);
+
+    __ ld4(v0, v1, v2, v3, __ T4S, __ post(input, 64));
+
+    // rplus in v0
+    //  rplus = rplus - ((rplus + 5373807) >> 23) * dilithium_q;
+    __ addv(v4, __ T4S, v0, v31);
+    __ addv(v5, __ T4S, v1, v31);
+    __ addv(v6, __ T4S, v2, v31);
+    __ addv(v7, __ T4S, v3, v31);
+
+    __ sshr(v4, __ T4S, v4, 23);
+    __ sshr(v5, __ T4S, v5, 23);
+    __ sshr(v6, __ T4S, v6, 23);
+    __ sshr(v7, __ T4S, v7, 23);
+
+    __ mulv(v4, __ T4S, v4, v30);
+    __ mulv(v5, __ T4S, v5, v30);
+    __ mulv(v6, __ T4S, v6, v30);
+    __ mulv(v7, __ T4S, v7, v30);
+
+    __ subv(v0, __ T4S, v0, v4);
+    __ subv(v1, __ T4S, v1, v5);
+    __ subv(v2, __ T4S, v2, v6);
+    __ subv(v3, __ T4S, v3, v7);
+
+    // rplus in v0
+    // rplus = rplus + ((rplus >> 31) & dilithium_q);
+    __ sshr(v4, __ T4S, v0, 31);
+    __ sshr(v5, __ T4S, v1, 31);
+    __ sshr(v6, __ T4S, v2, 31);
+    __ sshr(v7, __ T4S, v3, 31);
+
+    __ andr(v4, __ T16B, v4, v30);
+    __ andr(v5, __ T16B, v5, v30);
+    __ andr(v6, __ T16B, v6, v30);
+    __ andr(v7, __ T16B, v7, v30);
+
+    __ addv(v0, __ T4S, v0, v4);
+    __ addv(v1, __ T4S, v1, v5);
+    __ addv(v2, __ T4S, v2, v6);
+    __ addv(v3, __ T4S, v3, v7);
+
+    // rplus in v0
+    // int quotient = (rplus * multiplier) >> 22;
+    __ mulv(v4, __ T4S, v0, v29);
+    __ mulv(v5, __ T4S, v1, v29);
+    __ mulv(v6, __ T4S, v2, v29);
+    __ mulv(v7, __ T4S, v3, v29);
+
+    __ sshr(v4, __ T4S, v4, 22);
+    __ sshr(v5, __ T4S, v5, 22);
+    __ sshr(v6, __ T4S, v6, 22);
+    __ sshr(v7, __ T4S, v7, 22);
+
+    // quotient in v4
+    // int r0 = rplus - quotient * twoGamma2;
+    __ mulv(v8, __ T4S, v4, v28);
+    __ mulv(v9, __ T4S, v5, v28);
+    __ mulv(v10, __ T4S, v6, v28);
+    __ mulv(v11, __ T4S, v7, v28);
+
+    __ subv(v8, __ T4S, v0, v8);
+    __ subv(v9, __ T4S, v1, v9);
+    __ subv(v10, __ T4S, v2, v10);
+    __ subv(v11, __ T4S, v3, v11);
+
+    // r0 in v8
+    // int mask = (twoGamma2 - r0) >> 22;
+    __ subv(v12, __ T4S, v28, v8);
+    __ subv(v13, __ T4S, v28, v9);
+    __ subv(v14, __ T4S, v28, v10);
+    __ subv(v15, __ T4S, v28, v11);
+
+    __ sshr(v12, __ T4S, v12, 22);
+    __ sshr(v13, __ T4S, v13, 22);
+    __ sshr(v14, __ T4S, v14, 22);
+    __ sshr(v15, __ T4S, v15, 22);
+
+    // mask in v12
+    // r0 -= (mask & twoGamma2);
+    __ andr(v16, __ T16B, v12, v28);
+    __ andr(v17, __ T16B, v13, v28);
+    __ andr(v18, __ T16B, v14, v28);
+    __ andr(v19, __ T16B, v15, v28);
+
+    __ subv(v8, __ T4S, v8, v16);
+    __ subv(v9, __ T4S, v9, v17);
+    __ subv(v10, __ T4S, v10, v18);
+    __ subv(v11, __ T4S, v11, v19);
+
+    // r0 in v8
+    //  quotient += (mask & 1);
+    __ andr(v16, __ T16B, v12, v25);
+    __ andr(v17, __ T16B, v13, v25);
+    __ andr(v18, __ T16B, v14, v25);
+    __ andr(v19, __ T16B, v15, v25);
+
+    __ addv(v4, __ T4S, v4, v16);
+    __ addv(v5, __ T4S, v5, v17);
+    __ addv(v6, __ T4S, v6, v18);
+    __ addv(v7, __ T4S, v7, v19);
+
+    // mask = (twoGamma2 / 2 - r0) >> 31;
+    __ subv(v12, __ T4S, v27, v8);
+    __ subv(v13, __ T4S, v27, v9);
+    __ subv(v14, __ T4S, v27, v10);
+    __ subv(v15, __ T4S, v27, v11);
+
+    __ sshr(v12, __ T4S, v12, 31);
+    __ sshr(v13, __ T4S, v13, 31);
+    __ sshr(v14, __ T4S, v14, 31);
+    __ sshr(v15, __ T4S, v15, 31);
+
+    // r0 -= (mask & twoGamma2);
+    __ andr(v16, __ T16B, v12, v28);
+    __ andr(v17, __ T16B, v13, v28);
+    __ andr(v18, __ T16B, v14, v28);
+    __ andr(v19, __ T16B, v15, v28);
+
+    __ subv(v8, __ T4S, v8, v16);
+    __ subv(v9, __ T4S, v9, v17);
+    __ subv(v10, __ T4S, v10, v18);
+    __ subv(v11, __ T4S, v11, v19);
+
+    // quotient += (mask & 1);
+    __ andr(v16, __ T16B, v12, v25);
+    __ andr(v17, __ T16B, v13, v25);
+    __ andr(v18, __ T16B, v14, v25);
+    __ andr(v19, __ T16B, v15, v25);
+
+    __ addv(v4, __ T4S, v4, v16);
+    __ addv(v5, __ T4S, v5, v17);
+    __ addv(v6, __ T4S, v6, v18);
+    __ addv(v7, __ T4S, v7, v19);
+
+    // int r1 = rplus - r0 - (dilithium_q - 1);
+    __ subv(v16, __ T4S, v0, v8);
+    __ subv(v17, __ T4S, v1, v9);
+    __ subv(v18, __ T4S, v2, v10);
+    __ subv(v19, __ T4S, v3, v11);
+
+    __ subv(v16, __ T4S, v16, v26);
+    __ subv(v17, __ T4S, v17, v26);
+    __ subv(v18, __ T4S, v18, v26);
+    __ subv(v19, __ T4S, v19, v26);
+
+    // r1 in v16
+    // r1 = (r1 | (-r1)) >> 31; // 0 if rplus - r0 == (dilithium_q - 1), -1 otherwise
+    __ negr(v20, __ T4S, v16);
+    __ negr(v21, __ T4S, v17);
+    __ negr(v22, __ T4S, v18);
+    __ negr(v23, __ T4S, v19);
+
+    __ orr(v16, __ T16B, v16, v20);
+    __ orr(v17, __ T16B, v17, v21);
+    __ orr(v18, __ T16B, v18, v22);
+    __ orr(v19, __ T16B, v19, v23);
+
+    __ sshr(v0, __ T4S, v16, 31);
+    __ sshr(v1, __ T4S, v17, 31);
+    __ sshr(v2, __ T4S, v18, 31);
+    __ sshr(v3, __ T4S, v19, 31);
+
+    // r1 in v0
+    // r0 += ~r1;
+    __ notr(v20, __ T16B, v0);
+    __ notr(v21, __ T16B, v1);
+    __ notr(v22, __ T16B, v2);
+    __ notr(v23, __ T16B, v3);
+
+    __ addv(v8, __ T4S, v8, v20);
+    __ addv(v9, __ T4S, v9, v21);
+    __ addv(v10, __ T4S, v10, v22);
+    __ addv(v11, __ T4S, v11, v23);
+
+    // r0 in v8
+    // r1 = r1 & quotient;
+    __ andr(v0, __ T16B, v4, v0);
+    __ andr(v1, __ T16B, v5, v1);
+    __ andr(v2, __ T16B, v6, v2);
+    __ andr(v3, __ T16B, v7, v3);
+
+    // r1 in v0
+    // lowPart[m] = r0;
+    // highPart[m] = r1;
+    __ st4(v8, v9, v10, v11, __ T4S, __ post(lowPart, 64));
+    __ st4(v0, v1, v2, v3, __ T4S, __ post(highPart, 64));
+
+
+    __ sub(len, len, 64);
+    __ cmp(len, (u1)64);
+    __ br(Assembler::GE, L_loop);
+
+    // restore callee-saved vector registers
+    __ ldpd(v14, v15, Address(sp, 48));
+    __ ldpd(v12, v13, Address(sp, 32));
+    __ ldpd(v10, v11, Address(sp, 16));
+    __ ldpd(v8, v9, __ post(sp, 64));
+
+    __ leave(); // required for proper stackwalking of RuntimeStub frame
+    __ mov(r0, zr); // return 0
+    __ ret(lr);
+
+    return start;
+  }
+
   /**
    *  Arguments:
    *
@@ -8939,6 +9999,14 @@ class StubGenerator: public StubCodeGenerator {
       StubRoutines::_chacha20Block = generate_chacha20Block_qrpar();
     }
 
+    if (UseDilithiumIntrinsics) {
+      StubRoutines::_dilithiumAlmostNtt = generate_dilithiumAlmostNtt();
+      StubRoutines::_dilithiumAlmostInverseNtt = generate_dilithiumAlmostInverseNtt();
+      StubRoutines::_dilithiumNttMult = generate_dilithiumNttMult();
+      StubRoutines::_dilithiumMontMulByConstant = generate_dilithiumMontMulByConstant();
+      StubRoutines::_dilithiumDecomposePoly = generate_dilithiumDecomposePoly();
+    }
+
     if (UseBASE64Intrinsics) {
         StubRoutines::_base64_encodeBlock = generate_base64_encodeBlock();
         StubRoutines::_base64_decodeBlock = generate_base64_decodeBlock();
@@ -8981,6 +10049,7 @@ class StubGenerator: public StubCodeGenerator {
     }
     if (UseSHA3Intrinsics) {
       StubRoutines::_sha3_implCompress     = generate_sha3_implCompress(StubGenStubId::sha3_implCompress_id);
+      StubRoutines::_double_keccak         = generate_double_keccak();
       StubRoutines::_sha3_implCompressMB   = generate_sha3_implCompress(StubGenStubId::sha3_implCompressMB_id);
     }
 
diff --git a/src/hotspot/cpu/aarch64/stubRoutines_aarch64.cpp b/src/hotspot/cpu/aarch64/stubRoutines_aarch64.cpp
index 3fa1616bf65..536583ff40c 100644
--- a/src/hotspot/cpu/aarch64/stubRoutines_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/stubRoutines_aarch64.cpp
@@ -48,6 +48,15 @@ STUBGEN_ARCH_ENTRIES_DO(DEFINE_ARCH_ENTRY, DEFINE_ARCH_ENTRY_INIT)
 
 bool StubRoutines::aarch64::_completed = false;
 
+ATTRIBUTE_ALIGNED(64) uint32_t StubRoutines::aarch64::_dilithiumConsts[] =
+{
+    58728449, 58728449, 58728449, 58728449, // montQInvModR
+    8380417, 8380417, 8380417, 8380417, // dilithium_q
+    16382, 16382, 16382, 16382, // toMont((dilithium_n)^-1 (mod dilithium_q))
+    2365951, 2365951, 2365951, 2365951, // montRSquareModQ
+    5373807, 5373807, 5373807, 5373807 // addend for modular reduce
+};
+
 /**
  *  crc_table[] from jdk/src/share/native/java/util/zip/zlib-1.2.5/crc32.h
  */
diff --git a/src/hotspot/cpu/aarch64/stubRoutines_aarch64.hpp b/src/hotspot/cpu/aarch64/stubRoutines_aarch64.hpp
index a5ed87cdca4..857bb2ff10a 100644
--- a/src/hotspot/cpu/aarch64/stubRoutines_aarch64.hpp
+++ b/src/hotspot/cpu/aarch64/stubRoutines_aarch64.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2014, Red Hat Inc. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -110,6 +110,7 @@ private:
   }
 
 private:
+  static uint32_t _dilithiumConsts[];
   static juint    _crc_table[];
   static jubyte   _adler_table[];
   // begin trigonometric tables block. See comments in .cpp file
diff --git a/src/hotspot/cpu/aarch64/vm_version_aarch64.cpp b/src/hotspot/cpu/aarch64/vm_version_aarch64.cpp
index bca39ae9db2..91930f6bc26 100644
--- a/src/hotspot/cpu/aarch64/vm_version_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/vm_version_aarch64.cpp
@@ -417,6 +417,17 @@ void VM_Version::initialize() {
     FLAG_SET_DEFAULT(UseChaCha20Intrinsics, false);
   }
 
+  if (_features & CPU_ASIMD) {
+      if (FLAG_IS_DEFAULT(UseDilithiumIntrinsics)) {
+          UseDilithiumIntrinsics = true;
+      }
+  } else if (UseDilithiumIntrinsics) {
+      if (!FLAG_IS_DEFAULT(UseDilithiumIntrinsics)) {
+          warning("Dilithium intrinsic requires ASIMD instructions");
+      }
+      FLAG_SET_DEFAULT(UseDilithiumIntrinsics, false);
+  }
+
   if (FLAG_IS_DEFAULT(UseBASE64Intrinsics)) {
     UseBASE64Intrinsics = true;
   }
diff --git a/src/hotspot/share/classfile/vmIntrinsics.cpp b/src/hotspot/share/classfile/vmIntrinsics.cpp
index 2943f9d4af3..8011b059697 100644
--- a/src/hotspot/share/classfile/vmIntrinsics.cpp
+++ b/src/hotspot/share/classfile/vmIntrinsics.cpp
@@ -475,6 +475,7 @@ bool vmIntrinsics::disabled_by_jvm_flags(vmIntrinsics::ID id) {
   case vmIntrinsics::_sha5_implCompress:
     if (!UseSHA512Intrinsics) return true;
     break;
+  case vmIntrinsics::_double_keccak:
   case vmIntrinsics::_sha3_implCompress:
     if (!UseSHA3Intrinsics) return true;
     break;
@@ -487,6 +488,13 @@ bool vmIntrinsics::disabled_by_jvm_flags(vmIntrinsics::ID id) {
   case vmIntrinsics::_chacha20Block:
     if (!UseChaCha20Intrinsics) return true;
     break;
+  case vmIntrinsics::_dilithiumAlmostNtt:
+  case vmIntrinsics::_dilithiumAlmostInverseNtt:
+  case vmIntrinsics::_dilithiumNttMult:
+  case vmIntrinsics::_dilithiumMontMulByConstant:
+  case vmIntrinsics::_dilithiumDecomposePoly:
+    if (!UseDilithiumIntrinsics) return true;
+    break;
   case vmIntrinsics::_base64_encodeBlock:
   case vmIntrinsics::_base64_decodeBlock:
     if (!UseBASE64Intrinsics) return true;
diff --git a/src/hotspot/share/classfile/vmIntrinsics.hpp b/src/hotspot/share/classfile/vmIntrinsics.hpp
index 0c95f6ab410..7dbfb862ac2 100644
--- a/src/hotspot/share/classfile/vmIntrinsics.hpp
+++ b/src/hotspot/share/classfile/vmIntrinsics.hpp
@@ -516,6 +516,12 @@ class methodHandle;
   do_class(sun_security_provider_sha3,                             "sun/security/provider/SHA3")                        \
   do_intrinsic(_sha3_implCompress, sun_security_provider_sha3, implCompress_name, implCompress_signature, F_R)          \
                                                                                                                         \
+  /* support for sun.security.provider.SHAKE128Parallel */                                                              \
+  do_class(sun_security_provider_sha3_parallel,                "sun/security/provider/SHA3Parallel")                    \
+   do_intrinsic(_double_keccak, sun_security_provider_sha3_parallel, double_keccak_name, double_keccak_signature, F_S)   \
+   do_name(     double_keccak_name,                                 "doubleKeccak")                                     \
+   do_signature(double_keccak_signature,                            "([J[J)I")                                          \
+                                                                                                                        \
   /* support for sun.security.provider.DigestBase */                                                                    \
   do_class(sun_security_provider_digestbase,                       "sun/security/provider/DigestBase")                  \
   do_intrinsic(_digestBase_implCompressMB, sun_security_provider_digestbase, implCompressMB_name, countPositives_signature, F_R)   \
@@ -561,6 +567,26 @@ class methodHandle;
    do_name(chacha20Block_name,                                 "implChaCha20Block")                                         \
    do_signature(chacha20Block_signature, "([I[B)I")                                                                    \
                                                                                                                         \
+  /* support for sun.security.provider.ML_DSA */                                                                        \
+ do_class(sun_security_provider_ML_DSA,      "sun/security/provider/ML_DSA")                                            \
+   do_signature(IaII_signature, "([II)I")                                                                               \
+   do_signature(IaIaI_signature, "([I[I)I")                                                                             \
+   do_signature(IaIaIaI_signature, "([I[I[I)I")                                                                         \
+   do_signature(IaIaIaIII_signature, "([I[I[III)I")                                                                     \
+  do_intrinsic(_dilithiumAlmostNtt, sun_security_provider_ML_DSA, dilithiumAlmostNtt_name, IaIaI_signature, F_S)        \
+   do_name(dilithiumAlmostNtt_name,                            "implDilithiumAlmostNtt")                                \
+  do_intrinsic(_dilithiumAlmostInverseNtt, sun_security_provider_ML_DSA,                                                \
+                dilithiumAlmostInverseNtt_name, IaIaI_signature, F_S)                                                   \
+   do_name(dilithiumAlmostInverseNtt_name,                     "implDilithiumAlmostInverseNtt")                         \
+  do_intrinsic(_dilithiumNttMult, sun_security_provider_ML_DSA, dilithiumNttMult_name, IaIaIaI_signature, F_S)          \
+   do_name(dilithiumNttMult_name,                              "implDilithiumNttMult")                                  \
+  do_intrinsic(_dilithiumMontMulByConstant, sun_security_provider_ML_DSA,                                               \
+                dilithiumMontMulByConstant_name, IaII_signature, F_S)                                                   \
+   do_name(dilithiumMontMulByConstant_name,                    "implDilithiumMontMulByConstant")                        \
+  do_intrinsic(_dilithiumDecomposePoly, sun_security_provider_ML_DSA,                                                   \
+                dilithiumDecomposePoly_name, IaIaIaIII_signature, F_S)                                                  \
+   do_name(dilithiumDecomposePoly_name,                    "implDilithiumDecomposePoly")                                \
+                                                                                                                        \
   /* support for java.util.zip */                                                                                       \
   do_class(java_util_zip_CRC32,           "java/util/zip/CRC32")                                                        \
   do_intrinsic(_updateCRC32,               java_util_zip_CRC32,   update_name, int2_int_signature,               F_SN)  \
diff --git a/src/hotspot/share/jvmci/vmStructs_jvmci.cpp b/src/hotspot/share/jvmci/vmStructs_jvmci.cpp
index 48c9f8a64dc..7567caad712 100644
--- a/src/hotspot/share/jvmci/vmStructs_jvmci.cpp
+++ b/src/hotspot/share/jvmci/vmStructs_jvmci.cpp
@@ -394,7 +394,13 @@
   static_field(StubRoutines,                _sha512_implCompress,                             address)                               \
   static_field(StubRoutines,                _sha512_implCompressMB,                           address)                               \
   static_field(StubRoutines,                _sha3_implCompress,                               address)                               \
+  static_field(StubRoutines,                _double_keccak,                                   address)                               \
   static_field(StubRoutines,                _sha3_implCompressMB,                             address)                               \
+  static_field(StubRoutines,                _dilithiumAlmostNtt,                              address)                               \
+  static_field(StubRoutines,                _dilithiumAlmostInverseNtt,                       address)                               \
+  static_field(StubRoutines,                _dilithiumNttMult,                                address)                               \
+  static_field(StubRoutines,                _dilithiumMontMulByConstant,                      address)                               \
+  static_field(StubRoutines,                _dilithiumDecomposePoly,                          address)                               \
   static_field(StubRoutines,                _updateBytesCRC32,                                address)                               \
   static_field(StubRoutines,                _crc_table_adr,                                   address)                               \
   static_field(StubRoutines,                _crc32c_table_addr,                               address)                               \
diff --git a/src/hotspot/share/opto/c2compiler.cpp b/src/hotspot/share/opto/c2compiler.cpp
index 0a769211c82..790512d310d 100644
--- a/src/hotspot/share/opto/c2compiler.cpp
+++ b/src/hotspot/share/opto/c2compiler.cpp
@@ -780,6 +780,7 @@ bool C2Compiler::is_intrinsic_supported(vmIntrinsics::ID id) {
   case vmIntrinsics::_sha2_implCompress:
   case vmIntrinsics::_sha5_implCompress:
   case vmIntrinsics::_sha3_implCompress:
+  case vmIntrinsics::_double_keccak:
   case vmIntrinsics::_digestBase_implCompressMB:
   case vmIntrinsics::_multiplyToLen:
   case vmIntrinsics::_squareToLen:
@@ -789,6 +790,11 @@ bool C2Compiler::is_intrinsic_supported(vmIntrinsics::ID id) {
   case vmIntrinsics::_vectorizedMismatch:
   case vmIntrinsics::_ghash_processBlocks:
   case vmIntrinsics::_chacha20Block:
+  case vmIntrinsics::_dilithiumAlmostNtt:
+  case vmIntrinsics::_dilithiumAlmostInverseNtt:
+  case vmIntrinsics::_dilithiumNttMult:
+  case vmIntrinsics::_dilithiumMontMulByConstant:
+  case vmIntrinsics::_dilithiumDecomposePoly:
   case vmIntrinsics::_base64_encodeBlock:
   case vmIntrinsics::_base64_decodeBlock:
   case vmIntrinsics::_poly1305_processBlocks:
diff --git a/src/hotspot/share/opto/escape.cpp b/src/hotspot/share/opto/escape.cpp
index a90c27861c1..068a2c0b100 100644
--- a/src/hotspot/share/opto/escape.cpp
+++ b/src/hotspot/share/opto/escape.cpp
@@ -2192,6 +2192,11 @@ void ConnectionGraph::process_call_arguments(CallNode *call) {
                   strcmp(call->as_CallLeaf()->_name, "intpoly_assign") == 0 ||
                   strcmp(call->as_CallLeaf()->_name, "ghash_processBlocks") == 0 ||
                   strcmp(call->as_CallLeaf()->_name, "chacha20Block") == 0 ||
+                  strcmp(call->as_CallLeaf()->_name, "dilithiumAlmostNtt") == 0 ||
+                  strcmp(call->as_CallLeaf()->_name, "dilithiumAlmostInverseNtt") == 0 ||
+                  strcmp(call->as_CallLeaf()->_name, "dilithiumNttMult") == 0 ||
+                  strcmp(call->as_CallLeaf()->_name, "dilithiumMontMulByConstant") == 0 ||
+                  strcmp(call->as_CallLeaf()->_name, "dilithiumDecomposePoly") == 0 ||
                   strcmp(call->as_CallLeaf()->_name, "encodeBlock") == 0 ||
                   strcmp(call->as_CallLeaf()->_name, "decodeBlock") == 0 ||
                   strcmp(call->as_CallLeaf()->_name, "md5_implCompress") == 0 ||
@@ -2203,6 +2208,7 @@ void ConnectionGraph::process_call_arguments(CallNode *call) {
                   strcmp(call->as_CallLeaf()->_name, "sha512_implCompress") == 0 ||
                   strcmp(call->as_CallLeaf()->_name, "sha512_implCompressMB") == 0 ||
                   strcmp(call->as_CallLeaf()->_name, "sha3_implCompress") == 0 ||
+                  strcmp(call->as_CallLeaf()->_name, "double_keccak") == 0 ||
                   strcmp(call->as_CallLeaf()->_name, "sha3_implCompressMB") == 0 ||
                   strcmp(call->as_CallLeaf()->_name, "multiplyToLen") == 0 ||
                   strcmp(call->as_CallLeaf()->_name, "squareToLen") == 0 ||
diff --git a/src/hotspot/share/opto/library_call.cpp b/src/hotspot/share/opto/library_call.cpp
index 6f651db58ce..05efda3c64b 100644
--- a/src/hotspot/share/opto/library_call.cpp
+++ b/src/hotspot/share/opto/library_call.cpp
@@ -594,6 +594,8 @@ bool LibraryCallKit::try_to_inline(int predicate) {
   case vmIntrinsics::_sha5_implCompress:
   case vmIntrinsics::_sha3_implCompress:
     return inline_digestBase_implCompress(intrinsic_id());
+  case vmIntrinsics::_double_keccak:
+    return inline_double_keccak();
 
   case vmIntrinsics::_digestBase_implCompressMB:
     return inline_digestBase_implCompressMB(predicate);
@@ -624,6 +626,16 @@ bool LibraryCallKit::try_to_inline(int predicate) {
     return inline_ghash_processBlocks();
   case vmIntrinsics::_chacha20Block:
     return inline_chacha20Block();
+  case vmIntrinsics::_dilithiumAlmostNtt:
+    return inline_dilithiumAlmostNtt();
+  case vmIntrinsics::_dilithiumAlmostInverseNtt:
+    return inline_dilithiumAlmostInverseNtt();
+  case vmIntrinsics::_dilithiumNttMult:
+    return inline_dilithiumNttMult();
+  case vmIntrinsics::_dilithiumMontMulByConstant:
+    return inline_dilithiumMontMulByConstant();
+  case vmIntrinsics::_dilithiumDecomposePoly:
+    return inline_dilithiumDecomposePoly();
   case vmIntrinsics::_base64_encodeBlock:
     return inline_base64_encodeBlock();
   case vmIntrinsics::_base64_decodeBlock:
@@ -7588,6 +7600,176 @@ bool LibraryCallKit::inline_chacha20Block() {
   return true;
 }
 
+//------------------------------inline_dilithiumAlmostNtt
+bool LibraryCallKit::inline_dilithiumAlmostNtt() {
+  address stubAddr;
+  const char *stubName;
+  assert(UseDilithiumIntrinsics, "need Dilithium intrinsics support");
+  assert(callee()->signature()->size() == 2, "dilithiumAlmostNtt has 2 parameters");
+
+  stubAddr = StubRoutines::dilithiumAlmostNtt();
+  stubName = "dilithiumAlmostNtt";
+  if (!stubAddr) return false;
+
+  Node* coeffs          = argument(0);
+  Node* ntt_zetas        = argument(1);
+
+  coeffs = must_be_not_null(coeffs, true);
+  ntt_zetas = must_be_not_null(ntt_zetas, true);
+
+  Node* coeffs_start  = array_element_address(coeffs, intcon(0), T_INT);
+  assert(coeffs_start, "coeffs is null");
+  Node* ntt_zetas_start  = array_element_address(ntt_zetas, intcon(0), T_INT);
+  assert(ntt_zetas_start, "ntt_zetas is null");
+  Node* dilithiumAlmostNtt = make_runtime_call(RC_LEAF|RC_NO_FP,
+                                  OptoRuntime::dilithiumAlmostNtt_Type(),
+                                  stubAddr, stubName, TypePtr::BOTTOM,
+                                  coeffs_start, ntt_zetas_start);
+  // return an int
+  Node* retvalue = _gvn.transform(new ProjNode(dilithiumAlmostNtt, TypeFunc::Parms));
+  set_result(retvalue);
+  return true;
+}
+
+//------------------------------inline_dilithiumAlmostInverseNtt
+bool LibraryCallKit::inline_dilithiumAlmostInverseNtt() {
+  address stubAddr;
+  const char *stubName;
+  assert(UseDilithiumIntrinsics, "need Dilithium intrinsics support");
+  assert(callee()->signature()->size() == 2, "dilithiumAlmostInverseNtt has 2 parameters");
+
+  stubAddr = StubRoutines::dilithiumAlmostInverseNtt();
+  stubName = "dilithiumAlmostInverseNtt";
+  if (!stubAddr) return false;
+
+  Node* coeffs          = argument(0);
+  Node* zetas           = argument(1);
+
+  coeffs = must_be_not_null(coeffs, true);
+  zetas = must_be_not_null(zetas, true);
+
+  Node* coeffs_start  = array_element_address(coeffs, intcon(0), T_INT);
+  assert(coeffs_start, "coeffs is null");
+  Node* zetas_start  = array_element_address(zetas, intcon(0), T_INT);
+  assert(zetas_start, "inverseNtt_zetas is null");
+  Node* dilithiumAlmostInverseNtt = make_runtime_call(RC_LEAF|RC_NO_FP,
+                                  OptoRuntime::dilithiumAlmostInverseNtt_Type(),
+                                  stubAddr, stubName, TypePtr::BOTTOM,
+                                  coeffs_start, zetas_start);
+
+  // return an int
+  Node* retvalue = _gvn.transform(new ProjNode(dilithiumAlmostInverseNtt, TypeFunc::Parms));
+  set_result(retvalue);
+  return true;
+}
+
+//------------------------------inline_dilithiumNttMult
+bool LibraryCallKit::inline_dilithiumNttMult() {
+  address stubAddr;
+  const char *stubName;
+  assert(UseDilithiumIntrinsics, "need Dilithium intrinsics support");
+  assert(callee()->signature()->size() == 3, "dilithiumNttMult has 3 parameters");
+
+  stubAddr = StubRoutines::dilithiumNttMult();
+  stubName = "dilithiumNttMult";
+  if (!stubAddr) return false;
+
+  Node* result          = argument(0);
+  Node* ntta            = argument(1);
+  Node* nttb            = argument(2);
+
+  result = must_be_not_null(result, true);
+  ntta = must_be_not_null(ntta, true);
+  nttb = must_be_not_null(nttb, true);
+
+  Node* result_start  = array_element_address(result, intcon(0), T_INT);
+  assert(result_start, "result is null");
+  Node* ntta_start  = array_element_address(ntta, intcon(0), T_INT);
+  assert(ntta_start, "ntta is null");
+  Node* nttb_start  = array_element_address(nttb, intcon(0), T_INT);
+  assert(nttb_start, "nttb is null");
+  Node* dilithiumNttMult = make_runtime_call(RC_LEAF|RC_NO_FP,
+                                  OptoRuntime::dilithiumNttMult_Type(),
+                                  stubAddr, stubName, TypePtr::BOTTOM,
+                                  result_start, ntta_start, nttb_start);
+
+  // return an int
+  Node* retvalue = _gvn.transform(new ProjNode(dilithiumNttMult, TypeFunc::Parms));
+  set_result(retvalue);
+
+  return true;
+}
+
+//------------------------------inline_dilithiumMontMulByConstant
+bool LibraryCallKit::inline_dilithiumMontMulByConstant() {
+  address stubAddr;
+  const char *stubName;
+  assert(UseDilithiumIntrinsics, "need Dilithium intrinsics support");
+  assert(callee()->signature()->size() == 2, "dilithiumMontMulByConstant has 2 parameters");
+
+  stubAddr = StubRoutines::dilithiumMontMulByConstant();
+  stubName = "dilithiumMontMulByConstant";
+  if (!stubAddr) return false;
+
+  Node* coeffs          = argument(0);
+  Node* constant        = argument(1);
+
+  coeffs = must_be_not_null(coeffs, true);
+
+  Node* coeffs_start  = array_element_address(coeffs, intcon(0), T_INT);
+  assert(coeffs_start, "coeffs is null");
+  Node* dilithiumMontMulByConstant = make_runtime_call(RC_LEAF|RC_NO_FP,
+                                  OptoRuntime::dilithiumMontMulByConstant_Type(),
+                                  stubAddr, stubName, TypePtr::BOTTOM,
+                                  coeffs_start, constant);
+
+  // return an int
+  Node* retvalue = _gvn.transform(new ProjNode(dilithiumMontMulByConstant, TypeFunc::Parms));
+  set_result(retvalue);
+  return true;
+}
+
+
+//------------------------------inline_dilithiumDecomposePoly
+bool LibraryCallKit::inline_dilithiumDecomposePoly() {
+  address stubAddr;
+  const char *stubName;
+  assert(UseDilithiumIntrinsics, "need Dilithium intrinsics support");
+  assert(callee()->signature()->size() == 5, "dilithiumDecomposePoly has 5 parameters");
+
+  stubAddr = StubRoutines::dilithiumDecomposePoly();
+  stubName = "dilithiumDecomposePoly";
+  if (!stubAddr) return false;
+
+  Node* input          = argument(0);
+  Node* lowPart        = argument(1);
+  Node* highPart       = argument(2);
+  Node* twoGamma2      = argument(3);
+  Node* multiplier     = argument(4);
+
+  input = must_be_not_null(input, true);
+  lowPart = must_be_not_null(lowPart, true);
+  highPart = must_be_not_null(highPart, true);
+
+  Node* input_start  = array_element_address(input, intcon(0), T_INT);
+  assert(input_start, "input is null");
+  Node* lowPart_start  = array_element_address(lowPart, intcon(0), T_INT);
+  assert(lowPart_start, "lowPart is null");
+  Node* highPart_start  = array_element_address(highPart, intcon(0), T_INT);
+  assert(highPart_start, "highPart is null");
+
+  Node* dilithiumDecomposePoly = make_runtime_call(RC_LEAF|RC_NO_FP,
+                                  OptoRuntime::dilithiumDecomposePoly_Type(),
+                                  stubAddr, stubName, TypePtr::BOTTOM,
+                                  input_start, lowPart_start, highPart_start,
+                                  twoGamma2, multiplier);
+
+  // return an int
+  Node* retvalue = _gvn.transform(new ProjNode(dilithiumDecomposePoly, TypeFunc::Parms));
+  set_result(retvalue);
+  return true;
+}
+
 bool LibraryCallKit::inline_base64_encodeBlock() {
   address stubAddr;
   const char *stubName;
@@ -7851,6 +8033,38 @@ bool LibraryCallKit::inline_digestBase_implCompress(vmIntrinsics::ID id) {
   return true;
 }
 
+//------------------------------inline_double_keccak
+bool LibraryCallKit::inline_double_keccak() {
+  address stubAddr;
+  const char *stubName;
+  assert(UseSHA3Intrinsics, "need SHA3 intrinsics support");
+  assert(callee()->signature()->size() == 2, "double_keccak has 2 parameters");
+
+  stubAddr = StubRoutines::double_keccak();
+  stubName = "double_keccak";
+  if (!stubAddr) return false;
+
+  Node* status0        = argument(0);
+  Node* status1        = argument(1);
+
+  status0 = must_be_not_null(status0, true);
+  status1 = must_be_not_null(status1, true);
+
+  Node* status0_start  = array_element_address(status0, intcon(0), T_LONG);
+  assert(status0_start, "status0 is null");
+  Node* status1_start  = array_element_address(status1, intcon(0), T_LONG);
+  assert(status1_start, "status1 is null");
+  Node* double_keccak = make_runtime_call(RC_LEAF|RC_NO_FP,
+                                  OptoRuntime::double_keccak_Type(),
+                                  stubAddr, stubName, TypePtr::BOTTOM,
+                                  status0_start, status1_start);
+  // return an int
+  Node* retvalue = _gvn.transform(new ProjNode(double_keccak, TypeFunc::Parms));
+  set_result(retvalue);
+  return true;
+}
+
+
 //------------------------------inline_digestBase_implCompressMB-----------------------
 //
 // Calculate MD5/SHA/SHA2/SHA5/SHA3 for multi-block byte[] array.
diff --git a/src/hotspot/share/opto/library_call.hpp b/src/hotspot/share/opto/library_call.hpp
index 51dda136bc1..afc8d329228 100644
--- a/src/hotspot/share/opto/library_call.hpp
+++ b/src/hotspot/share/opto/library_call.hpp
@@ -316,12 +316,18 @@ class LibraryCallKit : public GraphKit {
   Node* get_key_start_from_aescrypt_object(Node* aescrypt_object);
   bool inline_ghash_processBlocks();
   bool inline_chacha20Block();
+  bool inline_dilithiumAlmostNtt();
+  bool inline_dilithiumAlmostInverseNtt();
+  bool inline_dilithiumNttMult();
+  bool inline_dilithiumMontMulByConstant();
+  bool inline_dilithiumDecomposePoly();
   bool inline_base64_encodeBlock();
   bool inline_base64_decodeBlock();
   bool inline_poly1305_processBlocks();
   bool inline_intpoly_montgomeryMult_P256();
   bool inline_intpoly_assign();
   bool inline_digestBase_implCompress(vmIntrinsics::ID id);
+  bool inline_double_keccak();
   bool inline_digestBase_implCompressMB(int predicate);
   bool inline_digestBase_implCompressMB(Node* digestBaseObj, ciInstanceKlass* instklass,
                                         BasicType elem_type, address stubAddr, const char *stubName,
diff --git a/src/hotspot/share/opto/runtime.cpp b/src/hotspot/share/opto/runtime.cpp
index b288f21f99e..7774c8a49c9 100644
--- a/src/hotspot/share/opto/runtime.cpp
+++ b/src/hotspot/share/opto/runtime.cpp
@@ -230,6 +230,7 @@ const TypeFunc* OptoRuntime::_digestBase_implCompress_with_sha3_Type      = null
 const TypeFunc* OptoRuntime::_digestBase_implCompress_without_sha3_Type   = nullptr;
 const TypeFunc* OptoRuntime::_digestBase_implCompressMB_with_sha3_Type    = nullptr;
 const TypeFunc* OptoRuntime::_digestBase_implCompressMB_without_sha3_Type = nullptr;
+const TypeFunc* OptoRuntime::_double_keccak_Type                  = nullptr;
 const TypeFunc* OptoRuntime::_multiplyToLen_Type                  = nullptr;
 const TypeFunc* OptoRuntime::_montgomeryMultiply_Type             = nullptr;
 const TypeFunc* OptoRuntime::_montgomerySquare_Type               = nullptr;
@@ -239,6 +240,13 @@ const TypeFunc* OptoRuntime::_bigIntegerShift_Type                = nullptr;
 const TypeFunc* OptoRuntime::_vectorizedMismatch_Type             = nullptr;
 const TypeFunc* OptoRuntime::_ghash_processBlocks_Type            = nullptr;
 const TypeFunc* OptoRuntime::_chacha20Block_Type                  = nullptr;
+
+const TypeFunc* OptoRuntime::_dilithiumAlmostNtt_Type             = nullptr;
+const TypeFunc* OptoRuntime::_dilithiumAlmostInverseNtt_Type      = nullptr;
+const TypeFunc* OptoRuntime::_dilithiumNttMult_Type               = nullptr;
+const TypeFunc* OptoRuntime::_dilithiumMontMulByConstant_Type     = nullptr;
+const TypeFunc* OptoRuntime::_dilithiumDecomposePoly_Type         = nullptr;
+
 const TypeFunc* OptoRuntime::_base64_encodeBlock_Type             = nullptr;
 const TypeFunc* OptoRuntime::_base64_decodeBlock_Type             = nullptr;
 const TypeFunc* OptoRuntime::_string_IndexOf_Type                 = nullptr;
@@ -1171,6 +1179,9 @@ static const TypeFunc* make_digestBase_implCompress_Type(bool is_sha3) {
   return TypeFunc::make(domain, range);
 }
 
+/*
+ * int implCompressMultiBlock(byte[] b, int ofs, int limit)
+ */
 static const TypeFunc* make_digestBase_implCompressMB_Type(bool is_sha3) {
   // create input type (domain)
   int num_args = is_sha3 ? 5 : 4;
@@ -1192,6 +1203,25 @@ static const TypeFunc* make_digestBase_implCompressMB_Type(bool is_sha3) {
   return TypeFunc::make(domain, range);
 }
 
+// SHAKE128Parallel doubleKeccak function
+static const TypeFunc* make_double_keccak_Type() {
+    int argcnt = 2;
+
+    const Type** fields = TypeTuple::fields(argcnt);
+    int argp = TypeFunc::Parms;
+    fields[argp++] = TypePtr::NOTNULL;      // status0
+    fields[argp++] = TypePtr::NOTNULL;      // status1
+
+    assert(argp == TypeFunc::Parms + argcnt, "correct decoding");
+    const TypeTuple* domain = TypeTuple::make(TypeFunc::Parms + argcnt, fields);
+
+    // result type needed
+    fields = TypeTuple::fields(1);
+    fields[TypeFunc::Parms + 0] = TypeInt::INT;
+    const TypeTuple* range = TypeTuple::make(TypeFunc::Parms + 1, fields);
+    return TypeFunc::make(domain, range);
+}
+
 static const TypeFunc* make_multiplyToLen_Type() {
   // create input type (domain)
   int num_args      = 5;
@@ -1377,6 +1407,105 @@ static const TypeFunc* make_chacha20Block_Type() {
   return TypeFunc::make(domain, range);
 }
 
+// Dilithium NTT function except for the final "normalization" to |coeff| < Q
+static const TypeFunc* make_dilithiumAlmostNtt_Type() {
+    int argcnt = 2;
+
+    const Type** fields = TypeTuple::fields(argcnt);
+    int argp = TypeFunc::Parms;
+    fields[argp++] = TypePtr::NOTNULL;      // coeffs
+    fields[argp++] = TypePtr::NOTNULL;      // NTT zetas
+
+    assert(argp == TypeFunc::Parms + argcnt, "correct decoding");
+    const TypeTuple* domain = TypeTuple::make(TypeFunc::Parms + argcnt, fields);
+
+    // result type needed
+    fields = TypeTuple::fields(1);
+    fields[TypeFunc::Parms + 0] = TypeInt::INT;
+    const TypeTuple* range = TypeTuple::make(TypeFunc::Parms + 1, fields);
+    return TypeFunc::make(domain, range);
+}
+
+// Dilithium inverse NTT function except the final mod Q division by 2^256
+static const TypeFunc* make_dilithiumAlmostInverseNtt_Type() {
+    int argcnt = 2;
+
+    const Type** fields = TypeTuple::fields(argcnt);
+    int argp = TypeFunc::Parms;
+    fields[argp++] = TypePtr::NOTNULL;      // coeffs
+    fields[argp++] = TypePtr::NOTNULL;      // inverse NTT zetas
+
+    assert(argp == TypeFunc::Parms + argcnt, "correct decoding");
+    const TypeTuple* domain = TypeTuple::make(TypeFunc::Parms + argcnt, fields);
+
+    // result type needed
+    fields = TypeTuple::fields(1);
+    fields[TypeFunc::Parms + 0] = TypeInt::INT;
+    const TypeTuple* range = TypeTuple::make(TypeFunc::Parms + 1, fields);
+    return TypeFunc::make(domain, range);
+}
+
+// Dilithium NTT multiply function
+static const TypeFunc* make_dilithiumNttMult_Type() {
+    int argcnt = 3;
+
+    const Type** fields = TypeTuple::fields(argcnt);
+    int argp = TypeFunc::Parms;
+    fields[argp++] = TypePtr::NOTNULL;      // result
+    fields[argp++] = TypePtr::NOTNULL;      // ntta
+    fields[argp++] = TypePtr::NOTNULL;      // nttb
+
+    assert(argp == TypeFunc::Parms + argcnt, "correct decoding");
+    const TypeTuple* domain = TypeTuple::make(TypeFunc::Parms + argcnt, fields);
+
+    // result type needed
+    fields = TypeTuple::fields(1);
+    fields[TypeFunc::Parms + 0] = TypeInt::INT;
+    const TypeTuple* range = TypeTuple::make(TypeFunc::Parms + 1, fields);
+    return TypeFunc::make(domain, range);
+}
+
+// Dilithium Montgomery multiply a polynome coefficient array by a constant
+static const TypeFunc* make_dilithiumMontMulByConstant_Type() {
+    int argcnt = 2;
+
+    const Type** fields = TypeTuple::fields(argcnt);
+    int argp = TypeFunc::Parms;
+    fields[argp++] = TypePtr::NOTNULL;      // coeffs
+    fields[argp++] = TypeInt::INT;          // constant multiplier
+
+    assert(argp == TypeFunc::Parms + argcnt, "correct decoding");
+    const TypeTuple* domain = TypeTuple::make(TypeFunc::Parms + argcnt, fields);
+
+    // result type needed
+    fields = TypeTuple::fields(1);
+    fields[TypeFunc::Parms + 0] = TypeInt::INT;
+    const TypeTuple* range = TypeTuple::make(TypeFunc::Parms + 1, fields);
+    return TypeFunc::make(domain, range);
+}
+
+// Dilithium decompose polynomial
+static const TypeFunc* make_dilithiumDecomposePoly_Type() {
+    int argcnt = 5;
+
+    const Type** fields = TypeTuple::fields(argcnt);
+    int argp = TypeFunc::Parms;
+    fields[argp++] = TypePtr::NOTNULL;      // input
+    fields[argp++] = TypePtr::NOTNULL;      // lowPart
+    fields[argp++] = TypePtr::NOTNULL;      // highPart
+    fields[argp++] = TypeInt::INT;          // 2 * gamma2
+    fields[argp++] = TypeInt::INT;          // multiplier
+
+    assert(argp == TypeFunc::Parms + argcnt, "correct decoding");
+    const TypeTuple* domain = TypeTuple::make(TypeFunc::Parms + argcnt, fields);
+
+    // result type needed
+    fields = TypeTuple::fields(1);
+    fields[TypeFunc::Parms + 0] = TypeInt::INT;
+    const TypeTuple* range = TypeTuple::make(TypeFunc::Parms + 1, fields);
+    return TypeFunc::make(domain, range);
+}
+
 static const TypeFunc* make_base64_encodeBlock_Type() {
   int argcnt = 6;
 
@@ -1980,6 +2109,7 @@ void OptoRuntime::initialize_types() {
   _digestBase_implCompress_without_sha3_Type   = make_digestBase_implCompress_Type(  /* is_sha3= */ false);;
   _digestBase_implCompressMB_with_sha3_Type    = make_digestBase_implCompressMB_Type(/* is_sha3= */ true);
   _digestBase_implCompressMB_without_sha3_Type = make_digestBase_implCompressMB_Type(/* is_sha3= */ false);
+  _double_keccak_Type                 = make_double_keccak_Type();
   _multiplyToLen_Type                 = make_multiplyToLen_Type();
   _montgomeryMultiply_Type            = make_montgomeryMultiply_Type();
   _montgomerySquare_Type              = make_montgomerySquare_Type();
@@ -1989,6 +2119,13 @@ void OptoRuntime::initialize_types() {
   _vectorizedMismatch_Type            = make_vectorizedMismatch_Type();
   _ghash_processBlocks_Type           = make_ghash_processBlocks_Type();
   _chacha20Block_Type                 = make_chacha20Block_Type();
+
+  _dilithiumAlmostNtt_Type            = make_dilithiumAlmostNtt_Type();
+  _dilithiumAlmostInverseNtt_Type     = make_dilithiumAlmostInverseNtt_Type();
+  _dilithiumNttMult_Type              = make_dilithiumNttMult_Type();
+  _dilithiumMontMulByConstant_Type    = make_dilithiumMontMulByConstant_Type();
+  _dilithiumDecomposePoly_Type        = make_dilithiumDecomposePoly_Type();
+
   _base64_encodeBlock_Type            = make_base64_encodeBlock_Type();
   _base64_decodeBlock_Type            = make_base64_decodeBlock_Type();
   _string_IndexOf_Type                = make_string_IndexOf_Type();
diff --git a/src/hotspot/share/opto/runtime.hpp b/src/hotspot/share/opto/runtime.hpp
index fceece73f66..dab8fb724fc 100644
--- a/src/hotspot/share/opto/runtime.hpp
+++ b/src/hotspot/share/opto/runtime.hpp
@@ -170,6 +170,7 @@ class OptoRuntime : public AllStatic {
   static const TypeFunc* _digestBase_implCompress_without_sha3_Type;
   static const TypeFunc* _digestBase_implCompressMB_with_sha3_Type;
   static const TypeFunc* _digestBase_implCompressMB_without_sha3_Type;
+  static const TypeFunc* _double_keccak_Type;
   static const TypeFunc* _multiplyToLen_Type;
   static const TypeFunc* _montgomeryMultiply_Type;
   static const TypeFunc* _montgomerySquare_Type;
@@ -179,6 +180,11 @@ class OptoRuntime : public AllStatic {
   static const TypeFunc* _vectorizedMismatch_Type;
   static const TypeFunc* _ghash_processBlocks_Type;
   static const TypeFunc* _chacha20Block_Type;
+  static const TypeFunc* _dilithiumAlmostNtt_Type;
+  static const TypeFunc* _dilithiumAlmostInverseNtt_Type;
+  static const TypeFunc* _dilithiumNttMult_Type;
+  static const TypeFunc* _dilithiumMontMulByConstant_Type;
+  static const TypeFunc* _dilithiumDecomposePoly_Type;
   static const TypeFunc* _base64_encodeBlock_Type;
   static const TypeFunc* _base64_decodeBlock_Type;
   static const TypeFunc* _string_IndexOf_Type;
@@ -525,6 +531,11 @@ private:
     return is_sha3 ? _digestBase_implCompressMB_with_sha3_Type : _digestBase_implCompressMB_without_sha3_Type;
   }
 
+  static inline const TypeFunc* double_keccak_Type() {
+    assert(_double_keccak_Type != nullptr, "should be initialized");
+    return _double_keccak_Type;
+  }
+
   static inline const TypeFunc* multiplyToLen_Type() {
     assert(_multiplyToLen_Type != nullptr, "should be initialized");
     return _multiplyToLen_Type;
@@ -573,6 +584,31 @@ private:
     return _chacha20Block_Type;
   }
 
+  static inline const TypeFunc* dilithiumAlmostNtt_Type() {
+    assert(_dilithiumAlmostNtt_Type != nullptr, "should be initialized");
+    return _dilithiumAlmostNtt_Type;
+  }
+
+  static inline const TypeFunc* dilithiumAlmostInverseNtt_Type() {
+    assert(_dilithiumAlmostInverseNtt_Type != nullptr, "should be initialized");
+    return _dilithiumAlmostInverseNtt_Type;
+  }
+
+  static inline const TypeFunc* dilithiumNttMult_Type() {
+    assert(_dilithiumNttMult_Type != nullptr, "should be initialized");
+    return _dilithiumNttMult_Type;
+  }
+
+  static inline const TypeFunc* dilithiumMontMulByConstant_Type() {
+    assert(_dilithiumMontMulByConstant_Type != nullptr, "should be initialized");
+    return _dilithiumMontMulByConstant_Type;
+  }
+
+  static inline const TypeFunc* dilithiumDecomposePoly_Type() {
+    assert(_dilithiumDecomposePoly_Type != nullptr, "should be initialized");
+    return _dilithiumDecomposePoly_Type;
+  }
+
   // Base64 encode function
   static inline const TypeFunc* base64_encodeBlock_Type() {
     assert(_base64_encodeBlock_Type != nullptr, "should be initialized");
diff --git a/src/hotspot/share/runtime/globals.hpp b/src/hotspot/share/runtime/globals.hpp
index e7aa034612b..e58d8c2b5b1 100644
--- a/src/hotspot/share/runtime/globals.hpp
+++ b/src/hotspot/share/runtime/globals.hpp
@@ -325,6 +325,9 @@ const int ObjectAlignmentInBytes = 8;
   product(bool, UseChaCha20Intrinsics, false, DIAGNOSTIC,                   \
           "Use intrinsics for the vectorized version of ChaCha20")          \
                                                                             \
+  product(bool, UseDilithiumIntrinsics, false, DIAGNOSTIC,                  \
+          "Use intrinsics for the vectorized version of Dilithium")         \
+                                                                            \
   product(bool, UseMD5Intrinsics, false, DIAGNOSTIC,                        \
           "Use intrinsics for MD5 crypto hash function")                    \
                                                                             \
diff --git a/src/hotspot/share/runtime/stubDeclarations.hpp b/src/hotspot/share/runtime/stubDeclarations.hpp
index 804bdc579b1..fd86f2ced3f 100644
--- a/src/hotspot/share/runtime/stubDeclarations.hpp
+++ b/src/hotspot/share/runtime/stubDeclarations.hpp
@@ -497,7 +497,7 @@
 // Currently there is no support for a do_arch_array_entry template.
 
 // Include arch-specific stub and entry declarations and make sure the
-// relevant template macros ahve been defined
+// relevant template macros have been defined
 
 #include CPU_HEADER(stubDeclarations)
 
@@ -678,6 +678,21 @@
            ghash_processBlocks)                                         \
   do_stub(compiler, chacha20Block)                                      \
   do_entry(compiler, chacha20Block, chacha20Block, chacha20Block)       \
+  do_stub(compiler, dilithiumAlmostNtt)                                 \
+  do_entry(compiler, dilithiumAlmostNtt,                                \
+           dilithiumAlmostNtt, dilithiumAlmostNtt)                      \
+  do_stub(compiler, dilithiumAlmostInverseNtt)                          \
+  do_entry(compiler, dilithiumAlmostInverseNtt,                         \
+           dilithiumAlmostInverseNtt, dilithiumAlmostInverseNtt)        \
+  do_stub(compiler, dilithiumNttMult)                                   \
+  do_entry(compiler, dilithiumNttMult,                                  \
+           dilithiumNttMult, dilithiumNttMult)                          \
+  do_stub(compiler, dilithiumMontMulByConstant)                         \
+  do_entry(compiler, dilithiumMontMulByConstant,                        \
+           dilithiumMontMulByConstant, dilithiumMontMulByConstant)      \
+  do_stub(compiler, dilithiumDecomposePoly)                             \
+  do_entry(compiler, dilithiumDecomposePoly,                            \
+           dilithiumDecomposePoly, dilithiumDecomposePoly)              \
   do_stub(compiler, data_cache_writeback)                               \
   do_entry(compiler, data_cache_writeback, data_cache_writeback,        \
            data_cache_writeback)                                        \
@@ -728,6 +743,8 @@
   do_stub(compiler, sha3_implCompressMB)                                \
   do_entry(compiler, sha3_implCompressMB, sha3_implCompressMB,          \
            sha3_implCompressMB)                                         \
+  do_stub(compiler, double_keccak)                                      \
+  do_entry(compiler, double_keccak, double_keccak, double_keccak)       \
   do_stub(compiler, updateBytesAdler32)                                 \
   do_entry(compiler, updateBytesAdler32, updateBytesAdler32,            \
            updateBytesAdler32)                                          \
@@ -1043,7 +1060,6 @@
                  DO_ARCH_BLOB_EMPTY2,                                   \
                  DO_ARCH_ENTRY_EMPTY5, DO_ARCH_ENTRY_EMPTY6)            \
 
-
 // client macro to operate only on StubGenerator arch blobs
 
 #define STUBGEN_ARCH_BLOBS_DO(do_arch_blob)                             \
@@ -1065,4 +1081,3 @@
                  do_arch_entry, do_arch_entry_init)                     \
 
 #endif // SHARE_RUNTIME_STUBDECLARATIONS_HPP
-
diff --git a/src/hotspot/share/runtime/stubRoutines.cpp b/src/hotspot/share/runtime/stubRoutines.cpp
index dd1da2c9e66..b1b1f1d6056 100644
--- a/src/hotspot/share/runtime/stubRoutines.cpp
+++ b/src/hotspot/share/runtime/stubRoutines.cpp
@@ -99,6 +99,7 @@ STUBGEN_ENTRIES_DO(DEFINE_ENTRY_FIELD, DEFINE_ENTRY_FIELD_INIT, DEFINE_ENTRY_FIE
 
 jint    StubRoutines::_verify_oop_count                         = 0;
 
+
 address StubRoutines::_string_indexof_array[4]   =    { nullptr };
 address StubRoutines::_vector_f_math[VectorSupport::NUM_VEC_SIZES][VectorSupport::NUM_VECTOR_OP_MATH] = {{nullptr}, {nullptr}};
 address StubRoutines::_vector_d_math[VectorSupport::NUM_VEC_SIZES][VectorSupport::NUM_VECTOR_OP_MATH] = {{nullptr}, {nullptr}};
diff --git a/src/java.base/share/classes/sun/security/provider/ML_DSA.java b/src/java.base/share/classes/sun/security/provider/ML_DSA.java
index f3b72f53a32..969b8fffa39 100644
--- a/src/java.base/share/classes/sun/security/provider/ML_DSA.java
+++ b/src/java.base/share/classes/sun/security/provider/ML_DSA.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
  * 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 sun.security.provider;
 
+import jdk.internal.vm.annotation.IntrinsicCandidate;
 import sun.security.provider.SHA3.SHAKE128;
 import sun.security.provider.SHA3.SHAKE256;
+import sun.security.provider.SHA3Parallel.Shake128Parallel;
 
+import java.security.InvalidAlgorithmParameterException;
 import java.security.MessageDigest;
 import java.security.InvalidKeyException;
 import java.security.SignatureException;
@@ -44,7 +47,7 @@ public class ML_DSA {
     private static final int ML_DSA_Q = 8380417;
     private static final int ML_DSA_N = 256;
     private static final int SHAKE256_BLOCK_SIZE = 136; // the block length for SHAKE256
-
+    private static final int SHAKE128_BLOCK_SIZE = 168; // the block length for SHAKE128
     private final int A_SEED_LEN = 32;
     private final int S1S2_SEED_LEN = 64;
     private final int K_LEN = 32;
@@ -98,39 +101,280 @@ public class ML_DSA {
         -2235985, -420899, -2286327, 183443, -976891, 1612842, -3545687, -554416,
         3919660, -48306, -1362209, 3937738, 1400424, -846154, 1976782
     };
-    private static final int[] MONT_ZETAS_FOR_INVERSE_NTT = new int[]{
-        -1976782, 846154, -1400424, -3937738, 1362209, 48306, -3919660, 554416,
-        3545687, -1612842, 976891, -183443, 2286327, 420899, 2235985, 2939036,
-        3833893, 260646, 1104333, 1667432, -1910376, 1803090, -1723600, 426683,
-        -472078, -1717735, 975884, -2213111, -269760, -3866901, -3523897, 3038916,
-        1799107, 3694233, -1652634, -810149, -3014001, -1616392, -162844, 3183426,
-        1207385, -185531, -3369112, -1957272, 164721, -2454455, -2432395, 2013608,
-        3776993, -594136, 3724270, 2584293, 1846953, 1671176, 2831860, 542412,
-        -3406031, -2235880, -777191, -1500165, 1374803, 2546312, -1917081, 1279661,
-        1962642, -3306115, -1312455, 451100, 1430225, 3318210, -1237275, 1333058,
-        1050970, -1903435, -1869119, 2994039, 3548272, -2635921, -1250494, 3767016,
-        -1595974, -2486353, -1247620, -4055324, -1265009, 2590150, -2691481, -2842341,
-        -203044, -1735879, 3342277, -3437287, -4108315, 2437823, -286988, -342297,
-        3595838, 768622, 525098, 3556995, -3207046, -2031748, 3122442, 655327,
-        522500, 43260, 1613174, -495491, -819034, -909542, -1859098, -900702,
-        3193378, 1197226, 3759364, 3520352, -3513181, 1235728, -2434439, -266997,
-        3562462, 2446433, -2244091, 3342478, -3817976, -2316500, -3407706, -2091667,
-        -3839961, 3628969, 3881060, 3019102, 1439742, 812732, 1584928, -1285669,
-        -1341330, -1315589, 177440, 2409325, 1851402, -3159746, 3553272, -189548,
-        1316856, -759969, 210977, -2389356, 3249728, -1653064, 8578, 3724342,
-        -3958618, -904516, 1100098, -44288, -3097992, -508951, -264944, 3343383,
-        1430430, -1852771, -1349076, 381987, 1308169, 22981, 1228525, 671102,
-        2477047, 411027, 3693493, 2967645, -2715295, -2147896, 983419, -3412210,
-        -126922, 3632928, 3157330, 3190144, 1000202, 4083598, -1939314, 1257611,
-        1585221, -2176455, -3475950, 1452451, 3041255, 3677745, 1528703, 3930395,
-        2797779, -2071892, 2556880, -3900724, -3881043, -954230, -531354, -811944,
-        -3699596, 1600420, 2140649, -3507263, 3821735, -3505694, 1643818, 1699267,
-        539299, -2348700, 300467, -3539968, 2867647, -3574422, 3043716, 3861115,
-        -3915439, 2537516, 3592148, 1661693, -3530437, -3077325, -95776, -2706023,
-        -280005, -4010497, 19422, -1757237, 3277672, 1399561, 3859737, 2118186,
-        2108549, -2619752, 1119584, 549488, -3585928, 1079900, -1024112, -2725464,
-        -2680103, -3111497, 2884855, -3119733, 2091905, 359251, -2353451, -1826347,
-        -466468, 876248, 777960, -237124, 518909, 2608894, -25847
+    private static final int[] MONT_ZETAS_FOR_VECTOR_NTT = new int[]{
+            25847, 25847, 25847, 25847, 25847, 25847, 25847, 25847,
+            25847, 25847, 25847, 25847, 25847, 25847, 25847, 25847,
+            25847, 25847, 25847, 25847, 25847, 25847, 25847, 25847,
+            25847, 25847, 25847, 25847, 25847, 25847, 25847, 25847,
+            25847, 25847, 25847, 25847, 25847, 25847, 25847, 25847,
+            25847, 25847, 25847, 25847, 25847, 25847, 25847, 25847,
+            25847, 25847, 25847, 25847, 25847, 25847, 25847, 25847,
+            25847, 25847, 25847, 25847, 25847, 25847, 25847, 25847,
+            25847, 25847, 25847, 25847, 25847, 25847, 25847, 25847,
+            25847, 25847, 25847, 25847, 25847, 25847, 25847, 25847,
+            25847, 25847, 25847, 25847, 25847, 25847, 25847, 25847,
+            25847, 25847, 25847, 25847, 25847, 25847, 25847, 25847,
+            25847, 25847, 25847, 25847, 25847, 25847, 25847, 25847,
+            25847, 25847, 25847, 25847, 25847, 25847, 25847, 25847,
+            25847, 25847, 25847, 25847, 25847, 25847, 25847, 25847,
+            25847, 25847, 25847, 25847, 25847, 25847, 25847, 25847,
+
+            -2608894, -2608894, -2608894, -2608894, -2608894, -2608894, -2608894, -2608894,
+            -2608894, -2608894, -2608894, -2608894, -2608894, -2608894, -2608894, -2608894,
+            -2608894, -2608894, -2608894, -2608894, -2608894, -2608894, -2608894, -2608894,
+            -2608894, -2608894, -2608894, -2608894, -2608894, -2608894, -2608894, -2608894,
+            -2608894, -2608894, -2608894, -2608894, -2608894, -2608894, -2608894, -2608894,
+            -2608894, -2608894, -2608894, -2608894, -2608894, -2608894, -2608894, -2608894,
+            -2608894, -2608894, -2608894, -2608894, -2608894, -2608894, -2608894, -2608894,
+            -2608894, -2608894, -2608894, -2608894, -2608894, -2608894, -2608894, -2608894,
+            -518909, -518909, -518909, -518909, -518909, -518909, -518909, -518909,
+            -518909, -518909, -518909, -518909, -518909, -518909, -518909, -518909,
+            -518909, -518909, -518909, -518909, -518909, -518909, -518909, -518909,
+            -518909, -518909, -518909, -518909, -518909, -518909, -518909, -518909,
+            -518909, -518909, -518909, -518909, -518909, -518909, -518909, -518909,
+            -518909, -518909, -518909, -518909, -518909, -518909, -518909, -518909,
+            -518909, -518909, -518909, -518909, -518909, -518909, -518909, -518909,
+            -518909, -518909, -518909, -518909, -518909, -518909, -518909, -518909,
+
+            237124, 237124, 237124, 237124, 237124, 237124, 237124, 237124,
+            237124, 237124, 237124, 237124, 237124, 237124, 237124, 237124,
+            237124, 237124, 237124, 237124, 237124, 237124, 237124, 237124,
+            237124, 237124, 237124, 237124, 237124, 237124, 237124, 237124,
+            -777960, -777960, -777960, -777960, -777960, -777960, -777960, -777960,
+            -777960, -777960, -777960, -777960, -777960, -777960, -777960, -777960,
+            -777960, -777960, -777960, -777960, -777960, -777960, -777960, -777960,
+            -777960, -777960, -777960, -777960, -777960, -777960, -777960, -777960,
+            -876248, -876248, -876248, -876248, -876248, -876248, -876248, -876248,
+            -876248, -876248, -876248, -876248, -876248, -876248, -876248, -876248,
+            -876248, -876248, -876248, -876248, -876248, -876248, -876248, -876248,
+            -876248, -876248, -876248, -876248, -876248, -876248, -876248, -876248,
+            466468, 466468, 466468, 466468, 466468, 466468, 466468, 466468,
+            466468, 466468, 466468, 466468, 466468, 466468, 466468, 466468,
+            466468, 466468, 466468, 466468, 466468, 466468, 466468, 466468,
+            466468, 466468, 466468, 466468, 466468, 466468, 466468, 466468,
+
+            1826347, 1826347, 1826347, 1826347, 1826347, 1826347, 1826347, 1826347,
+            1826347, 1826347, 1826347, 1826347, 1826347, 1826347, 1826347, 1826347,
+            2353451, 2353451, 2353451, 2353451, 2353451, 2353451, 2353451, 2353451,
+            2353451, 2353451, 2353451, 2353451, 2353451, 2353451, 2353451, 2353451,
+            -359251, -359251, -359251, -359251, -359251, -359251, -359251, -359251,
+            -359251, -359251, -359251, -359251, -359251, -359251, -359251, -359251,
+            -2091905, -2091905, -2091905, -2091905, -2091905, -2091905, -2091905, -2091905,
+            -2091905, -2091905, -2091905, -2091905, -2091905, -2091905, -2091905, -2091905,
+            3119733, 3119733, 3119733, 3119733, 3119733, 3119733, 3119733, 3119733,
+            3119733, 3119733, 3119733, 3119733, 3119733, 3119733, 3119733, 3119733,
+            -2884855, -2884855, -2884855, -2884855, -2884855, -2884855, -2884855, -2884855,
+            -2884855, -2884855, -2884855, -2884855, -2884855, -2884855, -2884855, -2884855,
+            3111497, 3111497, 3111497, 3111497, 3111497, 3111497, 3111497, 3111497,
+            3111497, 3111497, 3111497, 3111497, 3111497, 3111497, 3111497, 3111497,
+            2680103, 2680103, 2680103, 2680103, 2680103, 2680103, 2680103, 2680103,
+            2680103, 2680103, 2680103, 2680103, 2680103, 2680103, 2680103, 2680103,
+
+            2725464, 2725464, 2725464, 2725464, 2725464, 2725464, 2725464, 2725464,
+            1024112, 1024112, 1024112, 1024112, 1024112, 1024112, 1024112, 1024112,
+            -1079900, -1079900, -1079900, -1079900, -1079900, -1079900, -1079900, -1079900,
+            3585928, 3585928, 3585928, 3585928, 3585928, 3585928, 3585928, 3585928,
+            -549488, -549488, -549488, -549488, -549488, -549488, -549488, -549488,
+            -1119584, -1119584, -1119584, -1119584, -1119584, -1119584, -1119584, -1119584,
+            2619752, 2619752, 2619752, 2619752, 2619752, 2619752, 2619752, 2619752,
+            -2108549, -2108549, -2108549, -2108549, -2108549, -2108549, -2108549, -2108549,
+            -2118186, -2118186, -2118186, -2118186, -2118186, -2118186, -2118186, -2118186,
+            -3859737, -3859737, -3859737, -3859737, -3859737, -3859737, -3859737, -3859737,
+            -1399561, -1399561, -1399561, -1399561, -1399561, -1399561, -1399561, -1399561,
+            -3277672, -3277672, -3277672, -3277672, -3277672, -3277672, -3277672, -3277672,
+            1757237, 1757237, 1757237, 1757237, 1757237, 1757237, 1757237, 1757237,
+            -19422, -19422, -19422, -19422, -19422, -19422, -19422, -19422,
+            4010497, 4010497, 4010497, 4010497, 4010497, 4010497, 4010497, 4010497,
+            280005, 280005, 280005, 280005, 280005, 280005, 280005, 280005,
+
+            2706023, 2706023, 2706023, 2706023, 95776, 95776, 95776, 95776,
+            3077325, 3077325, 3077325, 3077325, 3530437, 3530437, 3530437, 3530437,
+            -1661693, -1661693, -1661693, -1661693, -3592148, -3592148, -3592148, -3592148,
+            -2537516, -2537516, -2537516, -2537516, 3915439, 3915439, 3915439, 3915439,
+            -3861115, -3861115, -3861115, -3861115, -3043716, -3043716, -3043716, -3043716,
+            3574422, 3574422, 3574422, 3574422, -2867647, -2867647, -2867647, -2867647,
+            3539968, 3539968, 3539968, 3539968, -300467, -300467, -300467, -300467,
+            2348700, 2348700, 2348700, 2348700, -539299, -539299, -539299, -539299,
+            -1699267, -1699267, -1699267, -1699267, -1643818, -1643818, -1643818, -1643818,
+            3505694, 3505694, 3505694, 3505694, -3821735, -3821735, -3821735, -3821735,
+            3507263, 3507263, 3507263, 3507263, -2140649, -2140649, -2140649, -2140649,
+            -1600420, -1600420, -1600420, -1600420, 3699596, 3699596, 3699596, 3699596,
+            811944, 811944, 811944, 811944, 531354, 531354, 531354, 531354,
+            954230, 954230, 954230, 954230, 3881043, 3881043, 3881043, 3881043,
+            3900724, 3900724, 3900724, 3900724, -2556880, -2556880, -2556880, -2556880,
+            2071892, 2071892, 2071892, 2071892, -2797779, -2797779, -2797779, -2797779,
+
+            -3930395, -3930395, -1528703, -1528703, -3677745, -3677745, -3041255, -3041255,
+            -1452451, -1452451, 3475950, 3475950, 2176455, 2176455, -1585221, -1585221,
+            -1257611, -1257611, 1939314, 1939314, -4083598, -4083598, -1000202, -1000202,
+            -3190144, -3190144, -3157330, -3157330, -3632928, -3632928, 126922, 126922,
+            3412210, 3412210, -983419, -983419, 2147896, 2147896, 2715295, 2715295,
+            -2967645, -2967645, -3693493, -3693493, -411027, -411027, -2477047, -2477047,
+            -671102, -671102, -1228525, -1228525, -22981, -22981, -1308169, -1308169,
+            -381987, -381987, 1349076, 1349076, 1852771, 1852771, -1430430, -1430430,
+            -3343383, -3343383, 264944, 264944, 508951, 508951, 3097992, 3097992,
+            44288, 44288, -1100098, -1100098, 904516, 904516, 3958618, 3958618,
+            -3724342, -3724342, -8578, -8578, 1653064, 1653064, -3249728, -3249728,
+            2389356, 2389356, -210977, -210977, 759969, 759969, -1316856, -1316856,
+            189548, 189548, -3553272, -3553272, 3159746, 3159746, -1851402, -1851402,
+            -2409325, -2409325, -177440, -177440, 1315589, 1315589, 1341330, 1341330,
+            1285669, 1285669, -1584928, -1584928, -812732, -812732, -1439742, -1439742,
+            -3019102, -3019102, -3881060, -3881060, -3628969, -3628969, 3839961, 3839961,
+
+            2091667, 3407706, 2316500, 3817976, -3342478, 2244091, -2446433, -3562462,
+            266997, 2434439, -1235728, 3513181, -3520352, -3759364, -1197226, -3193378,
+            900702, 1859098, 909542, 819034, 495491, -1613174, -43260, -522500,
+            -655327, -3122442, 2031748, 3207046, -3556995, -525098, -768622, -3595838,
+            342297, 286988, -2437823, 4108315, 3437287, -3342277, 1735879, 203044,
+            2842341, 2691481, -2590150, 1265009, 4055324, 1247620, 2486353, 1595974,
+            -3767016, 1250494, 2635921, -3548272, -2994039, 1869119, 1903435, -1050970,
+            -1333058, 1237275, -3318210, -1430225, -451100, 1312455, 3306115, -1962642,
+            -1279661, 1917081, -2546312, -1374803, 1500165, 777191, 2235880, 3406031,
+            -542412, -2831860, -1671176, -1846953, -2584293, -3724270, 594136, -3776993,
+            -2013608, 2432395, 2454455, -164721, 1957272, 3369112, 185531, -1207385,
+            -3183426, 162844, 1616392, 3014001, 810149, 1652634, -3694233, -1799107,
+            -3038916, 3523897, 3866901, 269760, 2213111, -975884, 1717735, 472078,
+            -426683, 1723600, -1803090, 1910376, -1667432, -1104333, -260646, -3833893,
+            -2939036, -2235985, -420899, -2286327, 183443, -976891, 1612842, -3545687,
+            -554416, 3919660, -48306, -1362209, 3937738, 1400424, -846154, 1976782
+    };
+
+    private static final int[] MONT_ZETAS_FOR_VECTOR_INVERSE_NTT = new int[]{
+            -1976782, 846154, -1400424, -3937738, 1362209, 48306, -3919660, 554416,
+            3545687, -1612842, 976891, -183443, 2286327, 420899, 2235985, 2939036,
+            3833893, 260646, 1104333, 1667432, -1910376, 1803090, -1723600, 426683,
+            -472078, -1717735, 975884, -2213111, -269760, -3866901, -3523897, 3038916,
+            1799107, 3694233, -1652634, -810149, -3014001, -1616392, -162844, 3183426,
+            1207385, -185531, -3369112, -1957272, 164721, -2454455, -2432395, 2013608,
+            3776993, -594136, 3724270, 2584293, 1846953, 1671176, 2831860, 542412,
+            -3406031, -2235880, -777191, -1500165, 1374803, 2546312, -1917081, 1279661,
+            1962642, -3306115, -1312455, 451100, 1430225, 3318210, -1237275, 1333058,
+            1050970, -1903435, -1869119, 2994039, 3548272, -2635921, -1250494, 3767016,
+            -1595974, -2486353, -1247620, -4055324, -1265009, 2590150, -2691481, -2842341,
+            -203044, -1735879, 3342277, -3437287, -4108315, 2437823, -286988, -342297,
+            3595838, 768622, 525098, 3556995, -3207046, -2031748, 3122442, 655327,
+            522500, 43260, 1613174, -495491, -819034, -909542, -1859098, -900702,
+            3193378, 1197226, 3759364, 3520352, -3513181, 1235728, -2434439, -266997,
+            3562462, 2446433, -2244091, 3342478, -3817976, -2316500, -3407706, -2091667,
+
+            -3839961, -3839961, 3628969, 3628969, 3881060, 3881060, 3019102, 3019102,
+            1439742, 1439742, 812732, 812732, 1584928, 1584928, -1285669, -1285669,
+            -1341330, - 1341330, -1315589, -1315589, 177440, 177440, 2409325, 2409325,
+            1851402, 1851402, -3159746, -3159746, 3553272, 3553272, -189548, -189548,
+            1316856, 1316856, -759969, -759969, 210977, 210977, -2389356, -2389356,
+            3249728, 3249728, -1653064, -1653064, 8578, 8578, 3724342, 3724342,
+            -3958618, -3958618, -904516, -904516, 1100098, 1100098, -44288, -44288,
+            -3097992, -3097992, -508951, -508951, -264944, -264944, 3343383, 3343383,
+            1430430, 1430430, -1852771, -1852771, -1349076, -1349076, 381987, 381987,
+            1308169, 1308169, 22981, 22981, 1228525, 1228525, 671102, 671102,
+            2477047, 2477047, 411027, 411027, 3693493, 3693493, 2967645, 2967645,
+            -2715295, -2715295, -2147896, -2147896, 983419, 983419, -3412210, -3412210,
+            -126922, -126922, 3632928, 3632928, 3157330, 3157330, 3190144, 3190144,
+            1000202, 1000202, 4083598, 4083598, -1939314, -1939314, 1257611, 1257611,
+            1585221, 1585221, -2176455, -2176455, -3475950, -3475950, 1452451, 1452451,
+            3041255, 3041255, 3677745, 3677745, 1528703, 1528703, 3930395, 3930395,
+
+            2797779, 2797779, 2797779, 2797779, -2071892, -2071892, -2071892, -2071892,
+            2556880, 2556880, 2556880, 2556880, -3900724, -3900724, -3900724, -3900724,
+            -3881043, -3881043, -3881043, -3881043, -954230, -954230, -954230, -954230,
+            -531354, -531354, -531354, -531354, -811944, -811944, -811944, -811944,
+            -3699596, -3699596, -3699596, -3699596, 1600420, 1600420, 1600420, 1600420,
+            2140649, 2140649, 2140649, 2140649, -3507263, -3507263, -3507263, -3507263,
+            3821735, 3821735, 3821735, 3821735, -3505694, -3505694, -3505694, -3505694,
+            1643818, 1643818, 1643818, 1643818, 1699267, 1699267, 1699267, 1699267,
+            539299, 539299, 539299, 539299, -2348700, -2348700, -2348700, -2348700,
+            300467, 300467, 300467, 300467, -3539968, -3539968, -3539968, -3539968,
+            2867647, 2867647, 2867647, 2867647, -3574422, -3574422, -3574422, -3574422,
+            3043716, 3043716, 3043716, 3043716, 3861115, 3861115, 3861115, 3861115,
+            -3915439, -3915439, -3915439, -3915439, 2537516, 2537516, 2537516, 2537516,
+            3592148, 3592148, 3592148, 3592148, 1661693, 1661693, 1661693, 1661693,
+            -3530437, -3530437, -3530437, -3530437, -3077325, -3077325, -3077325, -3077325,
+            -95776, -95776, -95776, -95776, -2706023, -2706023, -2706023, -2706023,
+
+            -280005, -280005, -280005, -280005, -280005, -280005, -280005, -280005,
+            -4010497, -4010497, -4010497, -4010497, -4010497, -4010497, -4010497, -4010497,
+            19422, 19422, 19422, 19422, 19422, 19422, 19422, 19422,
+            -1757237, -1757237, -1757237, -1757237, -1757237, -1757237, -1757237, -1757237,
+            3277672, 3277672, 3277672, 3277672, 3277672, 3277672, 3277672, 3277672,
+            1399561, 1399561, 1399561, 1399561, 1399561, 1399561, 1399561, 1399561,
+            3859737, 3859737, 3859737, 3859737, 3859737, 3859737, 3859737, 3859737,
+            2118186, 2118186, 2118186, 2118186, 2118186, 2118186, 2118186, 2118186,
+            2108549, 2108549, 2108549, 2108549, 2108549, 2108549, 2108549, 2108549,
+            -2619752, -2619752, -2619752, -2619752, -2619752, -2619752, -2619752, -2619752,
+            1119584, 1119584, 1119584, 1119584, 1119584, 1119584, 1119584, 1119584,
+            549488, 549488, 549488, 549488, 549488, 549488, 549488, 549488,
+            -3585928, -3585928, -3585928, -3585928, -3585928, -3585928, -3585928, -3585928,
+            1079900, 1079900, 1079900, 1079900, 1079900, 1079900, 1079900, 1079900,
+            -1024112, -1024112, -1024112, -1024112, -1024112, -1024112, -1024112, -1024112,
+            -2725464, -2725464, -2725464, -2725464, -2725464, -2725464, -2725464, -2725464,
+
+            -2680103, -2680103, -2680103, -2680103, -2680103, -2680103, -2680103, -2680103,
+            -2680103, -2680103, -2680103, -2680103, -2680103, -2680103, -2680103, -2680103,
+            -3111497, -3111497, -3111497, -3111497, -3111497, -3111497, -3111497, -3111497,
+            -3111497, -3111497, -3111497, -3111497, -3111497, -3111497, -3111497, -3111497,
+            2884855, 2884855, 2884855, 2884855, 2884855, 2884855, 2884855, 2884855,
+            2884855, 2884855, 2884855, 2884855, 2884855, 2884855, 2884855, 2884855,
+            -3119733, -3119733, -3119733, -3119733, -3119733, -3119733, -3119733, -3119733,
+            -3119733, -3119733, -3119733, -3119733, -3119733, -3119733, -3119733, -3119733,
+            2091905, 2091905, 2091905, 2091905, 2091905, 2091905, 2091905, 2091905,
+            2091905, 2091905, 2091905, 2091905, 2091905, 2091905, 2091905, 2091905,
+            359251, 359251, 359251, 359251, 359251, 359251, 359251, 359251,
+            359251, 359251, 359251, 359251, 359251, 359251, 359251, 359251,
+            -2353451, -2353451, -2353451, -2353451, -2353451, -2353451, -2353451, -2353451,
+            -2353451, -2353451, -2353451, -2353451, -2353451, -2353451, -2353451, -2353451,
+            -1826347, -1826347, -1826347, -1826347, -1826347, -1826347, -1826347, -1826347,
+            -1826347, -1826347, -1826347, -1826347, -1826347, -1826347, -1826347, -1826347,
+
+            -466468, -466468, -466468, -466468, -466468, -466468, -466468, -466468,
+            -466468, -466468, -466468, -466468, -466468, -466468, -466468, -466468,
+            -466468, -466468, -466468, -466468, -466468, -466468, -466468, -466468,
+            -466468, -466468, -466468, -466468, -466468, -466468, -466468, -466468,
+            876248, 876248, 876248, 876248, 876248, 876248, 876248, 876248,
+            876248, 876248, 876248, 876248, 876248, 876248, 876248, 876248,
+            876248, 876248, 876248, 876248, 876248, 876248, 876248, 876248,
+            876248, 876248, 876248, 876248, 876248, 876248, 876248, 876248,
+            777960, 777960, 777960, 777960, 777960, 777960, 777960, 777960,
+            777960, 777960, 777960, 777960, 777960, 777960, 777960, 777960,
+            777960, 777960, 777960, 777960, 777960, 777960, 777960, 777960,
+            777960, 777960, 777960, 777960, 777960, 777960, 777960, 777960,
+            -237124, -237124, -237124, -237124, -237124, -237124, -237124, -237124,
+            -237124, -237124, -237124, -237124, -237124, -237124, -237124, -237124,
+            -237124, -237124, -237124, -237124, -237124, -237124, -237124, -237124,
+            -237124, -237124, -237124, -237124, -237124, -237124, -237124, -237124,
+
+            518909, 518909, 518909, 518909, 518909, 518909, 518909, 518909,
+            518909, 518909, 518909, 518909, 518909, 518909, 518909, 518909,
+            518909, 518909, 518909, 518909, 518909, 518909, 518909, 518909,
+            518909, 518909, 518909, 518909, 518909, 518909, 518909, 518909,
+            518909, 518909, 518909, 518909, 518909, 518909, 518909, 518909,
+            518909, 518909, 518909, 518909, 518909, 518909, 518909, 518909,
+            518909, 518909, 518909, 518909, 518909, 518909, 518909, 518909,
+            518909, 518909, 518909, 518909, 518909, 518909, 518909, 518909,
+            2608894, 2608894, 2608894, 2608894, 2608894, 2608894, 2608894, 2608894,
+            2608894, 2608894, 2608894, 2608894, 2608894, 2608894, 2608894, 2608894,
+            2608894, 2608894, 2608894, 2608894, 2608894, 2608894, 2608894, 2608894,
+            2608894, 2608894, 2608894, 2608894, 2608894, 2608894, 2608894, 2608894,
+            2608894, 2608894, 2608894, 2608894, 2608894, 2608894, 2608894, 2608894,
+            2608894, 2608894, 2608894, 2608894, 2608894, 2608894, 2608894, 2608894,
+            2608894, 2608894, 2608894, 2608894, 2608894, 2608894, 2608894, 2608894,
+            2608894, 2608894, 2608894, 2608894, 2608894, 2608894, 2608894, 2608894,
+
+            -25847, -25847, -25847, -25847, -25847, -25847, -25847, -25847,
+            -25847, -25847, -25847, -25847, -25847, -25847, -25847, -25847,
+            -25847, -25847, -25847, -25847, -25847, -25847, -25847, -25847,
+            -25847, -25847, -25847, -25847, -25847, -25847, -25847, -25847,
+            -25847, -25847, -25847, -25847, -25847, -25847, -25847, -25847,
+            -25847, -25847, -25847, -25847, -25847, -25847, -25847, -25847,
+            -25847, -25847, -25847, -25847, -25847, -25847, -25847, -25847,
+            -25847, -25847, -25847, -25847, -25847, -25847, -25847, -25847,
+            -25847, -25847, -25847, -25847, -25847, -25847, -25847, -25847,
+            -25847, -25847, -25847, -25847, -25847, -25847, -25847, -25847,
+            -25847, -25847, -25847, -25847, -25847, -25847, -25847, -25847,
+            -25847, -25847, -25847, -25847, -25847, -25847, -25847, -25847,
+            -25847, -25847, -25847, -25847, -25847, -25847, -25847, -25847,
+            -25847, -25847, -25847, -25847, -25847, -25847, -25847, -25847,
+            -25847, -25847, -25847, -25847, -25847, -25847, -25847, -25847,
+            -25847, -25847, -25847, -25847, -25847, -25847, -25847, -25847
     };
 
     // Constants defined for each security level
@@ -848,43 +1092,85 @@ public class ML_DSA {
         }
     }
 
-    int[][][] generateA(byte[] seed) {
-        int blockSize = 168;  // the size of one block of SHAKE128 output
-        var xof = new SHAKE128(0);
-        byte[] xofSeed = new byte[A_SEED_LEN + 2];
-        System.arraycopy(seed, 0, xofSeed, 0, A_SEED_LEN);
+    private int[][][] generateA(byte[] seed) {
         int[][][] a = new int[mlDsa_k][mlDsa_l][];
 
-        for (int i = 0; i < mlDsa_k; i++) {
-            for (int j = 0; j < mlDsa_l; j++) {
-                xofSeed[A_SEED_LEN] = (byte) j;
-                xofSeed[A_SEED_LEN + 1] = (byte) i;
-                xof.reset();
-                xof.update(xofSeed);
+        int nrPar = 2;
+        int rhoLen = seed.length;
+        byte[] seedBuf = new byte[SHAKE128_BLOCK_SIZE];
+        System.arraycopy(seed, 0, seedBuf, 0, seed.length);
+        seedBuf[rhoLen + 2] = 0x1F;
+        seedBuf[SHAKE128_BLOCK_SIZE - 1] = (byte)0x80;
+        byte[][] xofBufArr = new byte[nrPar][SHAKE128_BLOCK_SIZE];
+        int[] iIndex = new int[nrPar];
+        int[] jIndex = new int[nrPar];
 
-                byte[] rawAij = new byte[blockSize];
-                int[] aij = new int[ML_DSA_N];
-                int ofs = 0;
-                int rawOfs = blockSize;
-                int tmp;
-                while (ofs < ML_DSA_N) {
-                    if (rawOfs == blockSize) {
-                        // works because 3 divides blockSize (=168)
-                        xof.squeeze(rawAij, 0, blockSize);
-                        rawOfs = 0;
-                    }
-                    tmp = (rawAij[rawOfs] & 0xFF) +
-                            ((rawAij[rawOfs + 1] & 0xFF) << 8) +
-                            ((rawAij[rawOfs + 2] & 0x7F) << 16);
-                    rawOfs += 3;
-                    if (tmp < ML_DSA_Q) {
-                        aij[ofs] = tmp;
-                        ofs++;
+        int[] parsedBuf = new int[SHAKE128_BLOCK_SIZE / 3];
+
+        int parInd = 0;
+        boolean allDone;
+        int[] ofs = new int[nrPar];
+        Arrays.fill(ofs, 0);
+        int[][] aij = new int[nrPar][];
+        try {
+            Shake128Parallel parXof = new Shake128Parallel(xofBufArr);
+
+            for (int i = 0; i < mlDsa_k; i++) {
+                for (int j = 0; j < mlDsa_l; j++) {
+                    xofBufArr[parInd] = seedBuf.clone();
+                    xofBufArr[parInd][rhoLen] = (byte) j;
+                    xofBufArr[parInd][rhoLen + 1] = (byte) i;
+                    iIndex[parInd] = i;
+                    jIndex[parInd] = j;
+                    ofs[parInd] = 0;
+                    aij[parInd] = new int[ML_DSA_N];
+                    parInd++;
+
+                    if ((parInd == nrPar) ||
+                            ((i == mlDsa_k - 1) && (j == mlDsa_l - 1))) {
+                        parXof.reset(xofBufArr);
+
+                        allDone = false;
+                        while (!allDone) {
+                            allDone = true;
+                            parXof.squeezeBlock();
+                            for (int k = 0; k < parInd; k++) {
+                                int parsedOfs = 0;
+                                int tmp;
+                                if (ofs[k] < ML_DSA_N) {
+                                    for (int l = 0; l < SHAKE128_BLOCK_SIZE; l += 3) {
+                                        byte[] rawBuf = xofBufArr[k];
+                                        parsedBuf[l / 3] = (rawBuf[l] & 0xFF) +
+                                                ((rawBuf[l + 1] & 0xFF) << 8) +
+                                                ((rawBuf[l + 2] & 0x7F) << 16);
+                                    }
+                                }
+                                while ((ofs[k] < ML_DSA_N) &&
+                                        (parsedOfs < SHAKE128_BLOCK_SIZE / 3)) {
+                                    tmp = parsedBuf[parsedOfs++];
+                                    if (tmp < ML_DSA_Q) {
+                                        aij[k][ofs[k]] = tmp;
+                                        ofs[k]++;
+                                    }
+                                }
+                                if (ofs[k] < ML_DSA_N) {
+                                    allDone = false;
+                                }
+                            }
+                        }
+
+                        for (int k = 0; k < parInd; k++) {
+                            a[iIndex[k]][jIndex[k]] = aij[k];
+                        }
+                        parInd = 0;
                     }
                 }
-                a[i][j] = aij;
             }
+        } catch (InvalidAlgorithmParameterException e) {
+            // This should never happen since xofBufArr is of the correct size
+            throw new RuntimeException("Internal error.");
         }
+
         return a;
     }
 
@@ -979,7 +1265,7 @@ public class ML_DSA {
     private void decompose(int[][] input, int[][] lowPart, int[][] highPart) {
         int multiplier = (gamma2 == 95232 ? 22 : 8);
         for (int i = 0; i < mlDsa_k; i++) {
-            ML_DSA.mlDsaDecomposePoly(input[i], lowPart[i],
+            mlDsaDecomposePoly(input[i], lowPart[i],
                     highPart[i], gamma2 * 2, multiplier);
         }
     }
@@ -1011,7 +1297,7 @@ public class ML_DSA {
 
     private int[][] useHint(boolean[][] h, int[][] r) {
         int m = (ML_DSA_Q - 1) / (2*gamma2);
-        int[][] lowPart = new int[mlDsa_k][ML_DSA_N];
+        int[][] lowPart = r;
         int[][] highPart = new int[mlDsa_k][ML_DSA_N];
         decompose(r, lowPart, highPart);
 
@@ -1030,7 +1316,18 @@ public class ML_DSA {
     NTT functions as specified in Section 7.5 of specification
     */
 
-    public static int[] mlDsaNtt(int[] coeffs) {
+    public static void mlDsaNtt(int[] coeffs) {
+        implDilithiumAlmostNtt(coeffs, MONT_ZETAS_FOR_VECTOR_NTT);
+        implDilithiumMontMulByConstant(coeffs,  MONT_R_MOD_Q);
+    }
+
+    @IntrinsicCandidate
+    static int implDilithiumAlmostNtt(int[] coeffs, int[] zetas) {
+        implDilithiumAlmostNttJava(coeffs);
+        return 1;
+    }
+
+    static void implDilithiumAlmostNttJava(int[] coeffs) {
         int dimension = ML_DSA_N;
         int m = 0;
         for (int l = dimension / 2; l > 0; l /= 2) {
@@ -1043,26 +1340,33 @@ public class ML_DSA {
                 m++;
             }
         }
-        montMulByConstant(coeffs,  MONT_R_MOD_Q);
-        return coeffs;
     }
 
-    public static int[] mlDsaInverseNtt(int[] coeffs) {
+    public static void mlDsaInverseNtt(int[] coeffs) {
+        implDilithiumAlmostInverseNtt(coeffs, MONT_ZETAS_FOR_VECTOR_INVERSE_NTT);
+        implDilithiumMontMulByConstant(coeffs, MONT_DIM_INVERSE);
+    }
+
+    @IntrinsicCandidate
+    static int implDilithiumAlmostInverseNtt(int[] coeffs, int[] zetas) {
+        implDilithiumAlmostInverseNttJava(coeffs);
+        return 1;
+    }
+
+    static void implDilithiumAlmostInverseNttJava(int[] coeffs) {
         int dimension = ML_DSA_N;
-        int m = 0;
+        int m = MONT_ZETAS_FOR_NTT.length - 1;
         for (int l = 1; l < dimension; l *= 2) {
             for (int s = 0; s < dimension; s += 2 * l) {
                 for (int j = s; j < s + l; j++) {
                     int tmp = coeffs[j];
                     coeffs[j] = (tmp + coeffs[j + l]);
                     coeffs[j + l] = montMul(tmp - coeffs[j + l],
-                            MONT_ZETAS_FOR_INVERSE_NTT[m]);
+                            -MONT_ZETAS_FOR_NTT[m]);
                 }
-                m++;
+                m--;
             }
         }
-        montMulByConstant(coeffs, MONT_DIM_INVERSE);
-        return coeffs;
     }
 
     void mlDsaVectorNtt(int[][] vector) {
@@ -1078,12 +1382,29 @@ public class ML_DSA {
     }
 
     public static void mlDsaNttMultiply(int[] product, int[] coeffs1, int[] coeffs2) {
+        implDilithiumNttMult(product, coeffs1, coeffs2);
+    }
+
+
+    @IntrinsicCandidate
+    static int implDilithiumNttMult(int[] product, int[] coeffs1, int[] coeffs2) {
+        implDilithiumNttMultJava(product, coeffs1, coeffs2);
+        return 1;
+    }
+
+    static void implDilithiumNttMultJava(int[] product, int[] coeffs1, int[] coeffs2) {
         for (int i = 0; i < ML_DSA_N; i++) {
             product[i] = montMul(coeffs1[i], toMont(coeffs2[i]));
         }
     }
 
-    public static void montMulByConstant(int[] coeffs, int constant) {
+    @IntrinsicCandidate
+    static int implDilithiumMontMulByConstant(int[] coeffs, int constant) {
+        implDilithiumMontMulByConstantJava(coeffs, constant);
+        return 1;
+    }
+
+    static void implDilithiumMontMulByConstantJava(int[] coeffs, int constant) {
         for (int i = 0; i < ML_DSA_N; i++) {
             coeffs[i] = montMul((coeffs[i]), constant);
         }
@@ -1091,17 +1412,39 @@ public class ML_DSA {
 
     public static void mlDsaDecomposePoly(int[] input, int[] lowPart, int[] highPart,
                                          int twoGamma2, int multiplier) {
+        implDilithiumDecomposePoly(input, lowPart, highPart,twoGamma2, multiplier);
+    }
+
+    @IntrinsicCandidate
+    static int implDilithiumDecomposePoly(int[] input, int[] lowPart, int[] highPart,
+                                          int twoGamma2, int multiplier) {
+        decomposePolyJava(input, lowPart, highPart, twoGamma2, multiplier);
+        return 1;
+    }
+
+    static void decomposePolyJava(int[] input, int[] lowPart, int[] highPart,
+                                 int twoGamma2, int multiplier) {
+        int dilithiumBarrettAddend = 5373807;
         for (int m = 0; m < ML_DSA_N; m++) {
             int rplus = input[m];
-            rplus = rplus - ((rplus + 5373807) >> 23) * ML_DSA_Q;
-            rplus = rplus + ((rplus >> 31) & ML_DSA_Q);
-            int r0 = rplus - ((rplus * multiplier) >> 22) * twoGamma2;
-            r0 -= (((twoGamma2 - r0) >> 22) & twoGamma2);
-            r0 -= (((twoGamma2 / 2 - r0) >> 31) & twoGamma2);
+            rplus -= ((rplus + dilithiumBarrettAddend) >> 23) * ML_DSA_Q;
+            rplus += ((rplus >> 31) & ML_DSA_Q);
+
+            int quotient = (rplus * multiplier) >> 22;
+            int r0 = rplus - quotient * twoGamma2;
+            int mask = (twoGamma2 - r0) >> 22;
+            r0 -= (mask & twoGamma2);
+            quotient += (mask & 1);
+            mask = (twoGamma2 / 2 - r0) >> 31;
+            r0 -= (mask & twoGamma2);
+            quotient += (mask & 1);
+
             int r1 = rplus - r0 - (ML_DSA_Q - 1);
-            r1 = (r1 | (-r1)) >> 31;
+            r1 = (r1 | (-r1)) >> 31; // 0 if rplus - r0 == (dilithium_q - 1), -1 otherwise
             r0 += ~r1;
-            r1 = r1 & ((rplus - r0) / twoGamma2);
+            // quotient = (rplus - r0) / twoGamma2;
+            r1 = r1 & quotient;
+
             lowPart[m] = r0;
             highPart[m] = r1;
         }
@@ -1207,6 +1550,7 @@ public class ML_DSA {
     // precondition: -2^31 * MONT_Q <= a, b < 2^31, -2^31 < a * b < 2^31 * MONT_Q
     // computes a * b * 2^-32 mod MONT_Q
     // the result is greater than -MONT_Q and less than MONT_Q
+    // see e.g. Algorithm 3 in https://eprint.iacr.org/2018/039.pdf
     private static int montMul(int b, int c) {
         long a = (long) b * (long) c;
         int aHigh = (int) (a >> MONT_R_BITS);
diff --git a/src/java.base/share/classes/sun/security/provider/SHA3Parallel.java b/src/java.base/share/classes/sun/security/provider/SHA3Parallel.java
index d9abfbe413f..0851d4a9216 100644
--- a/src/java.base/share/classes/sun/security/provider/SHA3Parallel.java
+++ b/src/java.base/share/classes/sun/security/provider/SHA3Parallel.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -35,6 +35,20 @@ import static sun.security.provider.ByteArrayAccess.l2bLittle;
 
 import static sun.security.provider.SHA3.keccak;
 
+/*
+ * This class is for making it possible that NRPAR (= 2) (rather restricted)
+ * SHAKE computations execute in parallel.
+ * The restrictions are:
+ *  1. The messages processed should be such that the absorb phase should
+ * execute a single keccak() call and the byte arrays passed to the constructor
+ * (or reset() method) of this class should be the message padded with the
+ * appropriate padding described in
+ * https://nvlpubs.nist.gov/nistpubs/fips/nist.fips.202.pdf.
+ *  2. The only available way for extracting data is the squeeze() method
+ * that extracts exactly 1 block of data of each computation, delivering it
+ * in the arrays that were passed to the class in the constructor (or the
+ * reset() call).
+ */
 public class SHA3Parallel {
     private int blockSize = 0;
     private static final int DM = 5; // dimension of lanesArr
diff --git a/test/hotspot/gtest/aarch64/aarch64-asmtest.py b/test/hotspot/gtest/aarch64/aarch64-asmtest.py
index 64f3e787356..45ecf57e971 100644
--- a/test/hotspot/gtest/aarch64/aarch64-asmtest.py
+++ b/test/hotspot/gtest/aarch64/aarch64-asmtest.py
@@ -1833,6 +1833,11 @@ generate(ThreeRegNEONOp,
           ["sminp", "sminp", "8B"], ["sminp", "sminp", "16B"],
           ["sminp", "sminp", "4H"], ["sminp", "sminp", "8H"],
           ["sminp", "sminp", "2S"], ["sminp", "sminp", "4S"],
+          ["sqdmulh", "sqdmulh", "4H"], ["sqdmulh", "sqdmulh", "8H"],
+          ["sqdmulh", "sqdmulh", "2S"], ["sqdmulh", "sqdmulh", "4S"],
+          ["shsubv", "shsub", "8B"], ["shsubv", "shsub", "16B"],
+          ["shsubv", "shsub", "4H"], ["shsubv", "shsub", "8H"],
+          ["shsubv", "shsub", "2S"], ["shsubv", "shsub", "4S"],
           ["fmin", "fmin", "2S"], ["fmin", "fmin", "4S"],
           ["fmin", "fmin", "2D"],
           ["facgt", "facgt", "2S"], ["facgt", "facgt", "4S"],
diff --git a/test/hotspot/gtest/aarch64/asmtest.out.h b/test/hotspot/gtest/aarch64/asmtest.out.h
index 9805a05c5c1..3bcd40ba2aa 100644
--- a/test/hotspot/gtest/aarch64/asmtest.out.h
+++ b/test/hotspot/gtest/aarch64/asmtest.out.h
@@ -745,93 +745,103 @@
     __ sminp(v2, __ T8H, v3, v4);                      //       sminp   v2.8H, v3.8H, v4.8H
     __ sminp(v0, __ T2S, v1, v2);                      //       sminp   v0.2S, v1.2S, v2.2S
     __ sminp(v9, __ T4S, v10, v11);                    //       sminp   v9.4S, v10.4S, v11.4S
-    __ fmin(v24, __ T2S, v25, v26);                    //       fmin    v24.2S, v25.2S, v26.2S
-    __ fmin(v26, __ T4S, v27, v28);                    //       fmin    v26.4S, v27.4S, v28.4S
-    __ fmin(v16, __ T2D, v17, v18);                    //       fmin    v16.2D, v17.2D, v18.2D
-    __ facgt(v30, __ T2S, v31, v0);                    //       facgt   v30.2S, v31.2S, v0.2S
-    __ facgt(v3, __ T4S, v4, v5);                      //       facgt   v3.4S, v4.4S, v5.4S
-    __ facgt(v10, __ T2D, v11, v12);                   //       facgt   v10.2D, v11.2D, v12.2D
+    __ sqdmulh(v24, __ T4H, v25, v26);                 //       sqdmulh v24.4H, v25.4H, v26.4H
+    __ sqdmulh(v26, __ T8H, v27, v28);                 //       sqdmulh v26.8H, v27.8H, v28.8H
+    __ sqdmulh(v16, __ T2S, v17, v18);                 //       sqdmulh v16.2S, v17.2S, v18.2S
+    __ sqdmulh(v30, __ T4S, v31, v0);                  //       sqdmulh v30.4S, v31.4S, v0.4S
+    __ shsubv(v3, __ T8B, v4, v5);                     //       shsub   v3.8B, v4.8B, v5.8B
+    __ shsubv(v10, __ T16B, v11, v12);                 //       shsub   v10.16B, v11.16B, v12.16B
+    __ shsubv(v23, __ T4H, v24, v25);                  //       shsub   v23.4H, v24.4H, v25.4H
+    __ shsubv(v10, __ T8H, v11, v12);                  //       shsub   v10.8H, v11.8H, v12.8H
+    __ shsubv(v4, __ T2S, v5, v6);                     //       shsub   v4.2S, v5.2S, v6.2S
+    __ shsubv(v18, __ T4S, v19, v20);                  //       shsub   v18.4S, v19.4S, v20.4S
+    __ fmin(v2, __ T2S, v3, v4);                       //       fmin    v2.2S, v3.2S, v4.2S
+    __ fmin(v11, __ T4S, v12, v13);                    //       fmin    v11.4S, v12.4S, v13.4S
+    __ fmin(v8, __ T2D, v9, v10);                      //       fmin    v8.2D, v9.2D, v10.2D
+    __ facgt(v10, __ T2S, v11, v12);                   //       facgt   v10.2S, v11.2S, v12.2S
+    __ facgt(v15, __ T4S, v16, v17);                   //       facgt   v15.4S, v16.4S, v17.4S
+    __ facgt(v17, __ T2D, v18, v19);                   //       facgt   v17.2D, v18.2D, v19.2D
 
 // VectorScalarNEONInstruction
-    __ fmlavs(v5, __ T2S, v6, v7, 1);                  //       fmla    v5.2S, v6.2S, v7.S[1]
-    __ mulvs(v9, __ T4S, v10, v11, 0);                 //       mul     v9.4S, v10.4S, v11.S[0]
-    __ fmlavs(v5, __ T2D, v6, v7, 0);                  //       fmla    v5.2D, v6.2D, v7.D[0]
-    __ fmlsvs(v5, __ T2S, v6, v7, 0);                  //       fmls    v5.2S, v6.2S, v7.S[0]
-    __ mulvs(v8, __ T4S, v9, v10, 1);                  //       mul     v8.4S, v9.4S, v10.S[1]
-    __ fmlsvs(v5, __ T2D, v6, v7, 0);                  //       fmls    v5.2D, v6.2D, v7.D[0]
-    __ fmulxvs(v6, __ T2S, v7, v8, 0);                 //       fmulx   v6.2S, v7.2S, v8.S[0]
+    __ fmlavs(v5, __ T2S, v6, v7, 0);                  //       fmla    v5.2S, v6.2S, v7.S[0]
     __ mulvs(v6, __ T4S, v7, v8, 1);                   //       mul     v6.4S, v7.4S, v8.S[1]
-    __ fmulxvs(v3, __ T2D, v4, v5, 0);                 //       fmulx   v3.2D, v4.2D, v5.D[0]
-    __ mulvs(v13, __ T4H, v14, v15, 2);                //       mul     v13.4H, v14.4H, v15.H[2]
-    __ mulvs(v2, __ T8H, v3, v4, 4);                   //       mul     v2.8H, v3.8H, v4.H[4]
-    __ mulvs(v2, __ T2S, v3, v4, 0);                   //       mul     v2.2S, v3.2S, v4.S[0]
+    __ fmlavs(v6, __ T2D, v7, v8, 0);                  //       fmla    v6.2D, v7.2D, v8.D[0]
+    __ fmlsvs(v3, __ T2S, v4, v5, 0);                  //       fmls    v3.2S, v4.2S, v5.S[0]
+    __ mulvs(v13, __ T4S, v14, v15, 2);                //       mul     v13.4S, v14.4S, v15.S[2]
+    __ fmlsvs(v2, __ T2D, v3, v4, 1);                  //       fmls    v2.2D, v3.2D, v4.D[1]
+    __ fmulxvs(v2, __ T2S, v3, v4, 0);                 //       fmulx   v2.2S, v3.2S, v4.S[0]
     __ mulvs(v9, __ T4S, v10, v11, 1);                 //       mul     v9.4S, v10.4S, v11.S[1]
+    __ fmulxvs(v8, __ T2D, v9, v10, 1);                //       fmulx   v8.2D, v9.2D, v10.D[1]
+    __ mulvs(v5, __ T4H, v6, v7, 2);                   //       mul     v5.4H, v6.4H, v7.H[2]
+    __ mulvs(v11, __ T8H, v12, v13, 5);                //       mul     v11.8H, v12.8H, v13.H[5]
+    __ mulvs(v13, __ T2S, v14, v15, 0);                //       mul     v13.2S, v14.2S, v15.S[0]
+    __ mulvs(v14, __ T4S, v15, v16, 2);                //       mul     v14.4S, v15.4S, v16.S[2]
 
 // NEONVectorCompare
-    __ cm(Assembler::GT, v21, __ T8B, v22, v23);       //       cmgt    v21.8B, v22.8B, v23.8B
-    __ cm(Assembler::GT, v16, __ T16B, v17, v18);      //       cmgt    v16.16B, v17.16B, v18.16B
-    __ cm(Assembler::GT, v18, __ T4H, v19, v20);       //       cmgt    v18.4H, v19.4H, v20.4H
-    __ cm(Assembler::GT, v11, __ T8H, v12, v13);       //       cmgt    v11.8H, v12.8H, v13.8H
-    __ cm(Assembler::GT, v21, __ T2S, v22, v23);       //       cmgt    v21.2S, v22.2S, v23.2S
-    __ cm(Assembler::GT, v23, __ T4S, v24, v25);       //       cmgt    v23.4S, v24.4S, v25.4S
-    __ cm(Assembler::GT, v12, __ T2D, v13, v14);       //       cmgt    v12.2D, v13.2D, v14.2D
-    __ cm(Assembler::GE, v26, __ T8B, v27, v28);       //       cmge    v26.8B, v27.8B, v28.8B
-    __ cm(Assembler::GE, v23, __ T16B, v24, v25);      //       cmge    v23.16B, v24.16B, v25.16B
-    __ cm(Assembler::GE, v28, __ T4H, v29, v30);       //       cmge    v28.4H, v29.4H, v30.4H
-    __ cm(Assembler::GE, v14, __ T8H, v15, v16);       //       cmge    v14.8H, v15.8H, v16.8H
-    __ cm(Assembler::GE, v11, __ T2S, v12, v13);       //       cmge    v11.2S, v12.2S, v13.2S
-    __ cm(Assembler::GE, v24, __ T4S, v25, v26);       //       cmge    v24.4S, v25.4S, v26.4S
-    __ cm(Assembler::GE, v1, __ T2D, v2, v3);          //       cmge    v1.2D, v2.2D, v3.2D
-    __ cm(Assembler::EQ, v12, __ T8B, v13, v14);       //       cmeq    v12.8B, v13.8B, v14.8B
-    __ cm(Assembler::EQ, v31, __ T16B, v0, v1);        //       cmeq    v31.16B, v0.16B, v1.16B
-    __ cm(Assembler::EQ, v10, __ T4H, v11, v12);       //       cmeq    v10.4H, v11.4H, v12.4H
-    __ cm(Assembler::EQ, v16, __ T8H, v17, v18);       //       cmeq    v16.8H, v17.8H, v18.8H
-    __ cm(Assembler::EQ, v7, __ T2S, v8, v9);          //       cmeq    v7.2S, v8.2S, v9.2S
-    __ cm(Assembler::EQ, v2, __ T4S, v3, v4);          //       cmeq    v2.4S, v3.4S, v4.4S
-    __ cm(Assembler::EQ, v3, __ T2D, v4, v5);          //       cmeq    v3.2D, v4.2D, v5.2D
-    __ cm(Assembler::HI, v13, __ T8B, v14, v15);       //       cmhi    v13.8B, v14.8B, v15.8B
-    __ cm(Assembler::HI, v19, __ T16B, v20, v21);      //       cmhi    v19.16B, v20.16B, v21.16B
-    __ cm(Assembler::HI, v17, __ T4H, v18, v19);       //       cmhi    v17.4H, v18.4H, v19.4H
-    __ cm(Assembler::HI, v16, __ T8H, v17, v18);       //       cmhi    v16.8H, v17.8H, v18.8H
-    __ cm(Assembler::HI, v3, __ T2S, v4, v5);          //       cmhi    v3.2S, v4.2S, v5.2S
-    __ cm(Assembler::HI, v1, __ T4S, v2, v3);          //       cmhi    v1.4S, v2.4S, v3.4S
-    __ cm(Assembler::HI, v11, __ T2D, v12, v13);       //       cmhi    v11.2D, v12.2D, v13.2D
-    __ cm(Assembler::HS, v30, __ T8B, v31, v0);        //       cmhs    v30.8B, v31.8B, v0.8B
-    __ cm(Assembler::HS, v5, __ T16B, v6, v7);         //       cmhs    v5.16B, v6.16B, v7.16B
-    __ cm(Assembler::HS, v8, __ T4H, v9, v10);         //       cmhs    v8.4H, v9.4H, v10.4H
-    __ cm(Assembler::HS, v15, __ T8H, v16, v17);       //       cmhs    v15.8H, v16.8H, v17.8H
-    __ cm(Assembler::HS, v29, __ T2S, v30, v31);       //       cmhs    v29.2S, v30.2S, v31.2S
-    __ cm(Assembler::HS, v30, __ T4S, v31, v0);        //       cmhs    v30.4S, v31.4S, v0.4S
-    __ cm(Assembler::HS, v0, __ T2D, v1, v2);          //       cmhs    v0.2D, v1.2D, v2.2D
-    __ fcm(Assembler::EQ, v20, __ T2S, v21, v22);      //       fcmeq   v20.2S, v21.2S, v22.2S
-    __ fcm(Assembler::EQ, v7, __ T4S, v8, v9);         //       fcmeq   v7.4S, v8.4S, v9.4S
-    __ fcm(Assembler::EQ, v20, __ T2D, v21, v22);      //       fcmeq   v20.2D, v21.2D, v22.2D
-    __ fcm(Assembler::GT, v23, __ T2S, v24, v25);      //       fcmgt   v23.2S, v24.2S, v25.2S
-    __ fcm(Assembler::GT, v28, __ T4S, v29, v30);      //       fcmgt   v28.4S, v29.4S, v30.4S
-    __ fcm(Assembler::GT, v21, __ T2D, v22, v23);      //       fcmgt   v21.2D, v22.2D, v23.2D
-    __ fcm(Assembler::GE, v27, __ T2S, v28, v29);      //       fcmge   v27.2S, v28.2S, v29.2S
-    __ fcm(Assembler::GE, v25, __ T4S, v26, v27);      //       fcmge   v25.4S, v26.4S, v27.4S
-    __ fcm(Assembler::GE, v5, __ T2D, v6, v7);         //       fcmge   v5.2D, v6.2D, v7.2D
+    __ cm(Assembler::GT, v14, __ T8B, v15, v16);       //       cmgt    v14.8B, v15.8B, v16.8B
+    __ cm(Assembler::GT, v11, __ T16B, v12, v13);      //       cmgt    v11.16B, v12.16B, v13.16B
+    __ cm(Assembler::GT, v24, __ T4H, v25, v26);       //       cmgt    v24.4H, v25.4H, v26.4H
+    __ cm(Assembler::GT, v1, __ T8H, v2, v3);          //       cmgt    v1.8H, v2.8H, v3.8H
+    __ cm(Assembler::GT, v12, __ T2S, v13, v14);       //       cmgt    v12.2S, v13.2S, v14.2S
+    __ cm(Assembler::GT, v31, __ T4S, v0, v1);         //       cmgt    v31.4S, v0.4S, v1.4S
+    __ cm(Assembler::GT, v10, __ T2D, v11, v12);       //       cmgt    v10.2D, v11.2D, v12.2D
+    __ cm(Assembler::GE, v16, __ T8B, v17, v18);       //       cmge    v16.8B, v17.8B, v18.8B
+    __ cm(Assembler::GE, v7, __ T16B, v8, v9);         //       cmge    v7.16B, v8.16B, v9.16B
+    __ cm(Assembler::GE, v2, __ T4H, v3, v4);          //       cmge    v2.4H, v3.4H, v4.4H
+    __ cm(Assembler::GE, v3, __ T8H, v4, v5);          //       cmge    v3.8H, v4.8H, v5.8H
+    __ cm(Assembler::GE, v13, __ T2S, v14, v15);       //       cmge    v13.2S, v14.2S, v15.2S
+    __ cm(Assembler::GE, v19, __ T4S, v20, v21);       //       cmge    v19.4S, v20.4S, v21.4S
+    __ cm(Assembler::GE, v17, __ T2D, v18, v19);       //       cmge    v17.2D, v18.2D, v19.2D
+    __ cm(Assembler::EQ, v16, __ T8B, v17, v18);       //       cmeq    v16.8B, v17.8B, v18.8B
+    __ cm(Assembler::EQ, v3, __ T16B, v4, v5);         //       cmeq    v3.16B, v4.16B, v5.16B
+    __ cm(Assembler::EQ, v1, __ T4H, v2, v3);          //       cmeq    v1.4H, v2.4H, v3.4H
+    __ cm(Assembler::EQ, v11, __ T8H, v12, v13);       //       cmeq    v11.8H, v12.8H, v13.8H
+    __ cm(Assembler::EQ, v30, __ T2S, v31, v0);        //       cmeq    v30.2S, v31.2S, v0.2S
+    __ cm(Assembler::EQ, v5, __ T4S, v6, v7);          //       cmeq    v5.4S, v6.4S, v7.4S
+    __ cm(Assembler::EQ, v8, __ T2D, v9, v10);         //       cmeq    v8.2D, v9.2D, v10.2D
+    __ cm(Assembler::HI, v15, __ T8B, v16, v17);       //       cmhi    v15.8B, v16.8B, v17.8B
+    __ cm(Assembler::HI, v29, __ T16B, v30, v31);      //       cmhi    v29.16B, v30.16B, v31.16B
+    __ cm(Assembler::HI, v30, __ T4H, v31, v0);        //       cmhi    v30.4H, v31.4H, v0.4H
+    __ cm(Assembler::HI, v0, __ T8H, v1, v2);          //       cmhi    v0.8H, v1.8H, v2.8H
+    __ cm(Assembler::HI, v20, __ T2S, v21, v22);       //       cmhi    v20.2S, v21.2S, v22.2S
+    __ cm(Assembler::HI, v7, __ T4S, v8, v9);          //       cmhi    v7.4S, v8.4S, v9.4S
+    __ cm(Assembler::HI, v20, __ T2D, v21, v22);       //       cmhi    v20.2D, v21.2D, v22.2D
+    __ cm(Assembler::HS, v23, __ T8B, v24, v25);       //       cmhs    v23.8B, v24.8B, v25.8B
+    __ cm(Assembler::HS, v28, __ T16B, v29, v30);      //       cmhs    v28.16B, v29.16B, v30.16B
+    __ cm(Assembler::HS, v21, __ T4H, v22, v23);       //       cmhs    v21.4H, v22.4H, v23.4H
+    __ cm(Assembler::HS, v27, __ T8H, v28, v29);       //       cmhs    v27.8H, v28.8H, v29.8H
+    __ cm(Assembler::HS, v25, __ T2S, v26, v27);       //       cmhs    v25.2S, v26.2S, v27.2S
+    __ cm(Assembler::HS, v5, __ T4S, v6, v7);          //       cmhs    v5.4S, v6.4S, v7.4S
+    __ cm(Assembler::HS, v1, __ T2D, v2, v3);          //       cmhs    v1.2D, v2.2D, v3.2D
+    __ fcm(Assembler::EQ, v23, __ T2S, v24, v25);      //       fcmeq   v23.2S, v24.2S, v25.2S
+    __ fcm(Assembler::EQ, v16, __ T4S, v17, v18);      //       fcmeq   v16.4S, v17.4S, v18.4S
+    __ fcm(Assembler::EQ, v31, __ T2D, v0, v1);        //       fcmeq   v31.2D, v0.2D, v1.2D
+    __ fcm(Assembler::GT, v5, __ T2S, v6, v7);         //       fcmgt   v5.2S, v6.2S, v7.2S
+    __ fcm(Assembler::GT, v12, __ T4S, v13, v14);      //       fcmgt   v12.4S, v13.4S, v14.4S
+    __ fcm(Assembler::GT, v9, __ T2D, v10, v11);       //       fcmgt   v9.2D, v10.2D, v11.2D
+    __ fcm(Assembler::GE, v28, __ T2S, v29, v30);      //       fcmge   v28.2S, v29.2S, v30.2S
+    __ fcm(Assembler::GE, v15, __ T4S, v16, v17);      //       fcmge   v15.4S, v16.4S, v17.4S
+    __ fcm(Assembler::GE, v29, __ T2D, v30, v31);      //       fcmge   v29.2D, v30.2D, v31.2D
 
 // SVEComparisonWithZero
-    __ sve_fcm(Assembler::EQ, p0, __ D, p7, z23, 0.0); //       fcmeq   p0.d, p7/z, z23.d, #0.0
-    __ sve_fcm(Assembler::GT, p2, __ S, p7, z12, 0.0); //       fcmgt   p2.s, p7/z, z12.s, #0.0
-    __ sve_fcm(Assembler::GE, p7, __ D, p7, z29, 0.0); //       fcmge   p7.d, p7/z, z29.d, #0.0
-    __ sve_fcm(Assembler::LT, p9, __ S, p3, z31, 0.0); //       fcmlt   p9.s, p3/z, z31.s, #0.0
-    __ sve_fcm(Assembler::LE, p9, __ D, p6, z31, 0.0); //       fcmle   p9.d, p6/z, z31.d, #0.0
-    __ sve_fcm(Assembler::NE, p10, __ S, p2, z16, 0.0); //      fcmne   p10.s, p2/z, z16.s, #0.0
+    __ sve_fcm(Assembler::EQ, p11, __ D, p7, z31, 0.0); //      fcmeq   p11.d, p7/z, z31.d, #0.0
+    __ sve_fcm(Assembler::GT, p2, __ D, p7, z14, 0.0); //       fcmgt   p2.d, p7/z, z14.d, #0.0
+    __ sve_fcm(Assembler::GE, p9, __ D, p4, z27, 0.0); //       fcmge   p9.d, p4/z, z27.d, #0.0
+    __ sve_fcm(Assembler::LT, p6, __ S, p1, z11, 0.0); //       fcmlt   p6.s, p1/z, z11.s, #0.0
+    __ sve_fcm(Assembler::LE, p15, __ D, p7, z17, 0.0); //      fcmle   p15.d, p7/z, z17.d, #0.0
+    __ sve_fcm(Assembler::NE, p15, __ S, p5, z7, 0.0); //       fcmne   p15.s, p5/z, z7.s, #0.0
 
 // SVEComparisonWithImm
-    __ sve_cmp(Assembler::EQ, p4, __ D, p4, z6, 11);   //       cmpeq   p4.d, p4/z, z6.d, #11
-    __ sve_cmp(Assembler::GT, p14, __ B, p2, z30, 4);  //       cmpgt   p14.b, p2/z, z30.b, #4
-    __ sve_cmp(Assembler::GE, p5, __ D, p4, z4, 1);    //       cmpge   p5.d, p4/z, z4.d, #1
-    __ sve_cmp(Assembler::LT, p11, __ D, p3, z3, 6);   //       cmplt   p11.d, p3/z, z3.d, #6
-    __ sve_cmp(Assembler::LE, p9, __ S, p0, z19, -1);  //       cmple   p9.s, p0/z, z19.s, #-1
-    __ sve_cmp(Assembler::NE, p3, __ S, p2, z12, -3);  //       cmpne   p3.s, p2/z, z12.s, #-3
-    __ sve_cmp(Assembler::HS, p11, __ D, p4, z1, 20);  //       cmphs   p11.d, p4/z, z1.d, #20
-    __ sve_cmp(Assembler::HI, p8, __ S, p5, z2, 53);   //       cmphi   p8.s, p5/z, z2.s, #53
-    __ sve_cmp(Assembler::LS, p5, __ D, p6, z21, 49);  //       cmpls   p5.d, p6/z, z21.d, #49
-    __ sve_cmp(Assembler::LO, p13, __ B, p7, z3, 97);  //       cmplo   p13.b, p7/z, z3.b, #97
+    __ sve_cmp(Assembler::EQ, p5, __ D, p4, z4, 1);    //       cmpeq   p5.d, p4/z, z4.d, #1
+    __ sve_cmp(Assembler::GT, p11, __ D, p3, z3, 6);   //       cmpgt   p11.d, p3/z, z3.d, #6
+    __ sve_cmp(Assembler::GE, p9, __ S, p0, z19, -1);  //       cmpge   p9.s, p0/z, z19.s, #-1
+    __ sve_cmp(Assembler::LT, p3, __ S, p2, z12, -3);  //       cmplt   p3.s, p2/z, z12.s, #-3
+    __ sve_cmp(Assembler::LE, p11, __ D, p4, z1, -11); //       cmple   p11.d, p4/z, z1.d, #-11
+    __ sve_cmp(Assembler::NE, p8, __ S, p5, z2, -3);   //       cmpne   p8.s, p5/z, z2.s, #-3
+    __ sve_cmp(Assembler::HS, p5, __ D, p6, z21, 49);  //       cmphs   p5.d, p6/z, z21.d, #49
+    __ sve_cmp(Assembler::HI, p13, __ B, p7, z3, 97);  //       cmphi   p13.b, p7/z, z3.b, #97
+    __ sve_cmp(Assembler::LS, p9, __ H, p7, z17, 109); //       cmpls   p9.h, p7/z, z17.h, #109
+    __ sve_cmp(Assembler::LO, p7, __ S, p5, z7, 127);  //       cmplo   p7.s, p5/z, z7.s, #127
 
 // SpecialCases
     __ ccmn(zr, zr, 3u, Assembler::LE);                //       ccmn    xzr, xzr, #3, LE
@@ -1086,229 +1096,229 @@
     __ fmovd(v0, -1.0625);                             //       fmov d0, #-1.0625
 
 // LSEOp
-    __ swp(Assembler::xword, r19, r17, r9);            //       swp     x19, x17, [x9]
-    __ ldadd(Assembler::xword, r28, r27, r15);         //       ldadd   x28, x27, [x15]
-    __ ldbic(Assembler::xword, r7, r21, r23);          //       ldclr   x7, x21, [x23]
-    __ ldeor(Assembler::xword, zr, r25, r2);           //       ldeor   xzr, x25, [x2]
-    __ ldorr(Assembler::xword, zr, r27, r15);          //       ldset   xzr, x27, [x15]
-    __ ldsmin(Assembler::xword, r10, r23, r19);        //       ldsmin  x10, x23, [x19]
-    __ ldsmax(Assembler::xword, r3, r16, r0);          //       ldsmax  x3, x16, [x0]
-    __ ldumin(Assembler::xword, r25, r26, r23);        //       ldumin  x25, x26, [x23]
-    __ ldumax(Assembler::xword, r2, r16, r12);         //       ldumax  x2, x16, [x12]
+    __ swp(Assembler::xword, r25, r2, sp);             //       swp     x25, x2, [sp]
+    __ ldadd(Assembler::xword, r27, r16, r10);         //       ldadd   x27, x16, [x10]
+    __ ldbic(Assembler::xword, r23, r19, r3);          //       ldclr   x23, x19, [x3]
+    __ ldeor(Assembler::xword, r16, r0, r25);          //       ldeor   x16, x0, [x25]
+    __ ldorr(Assembler::xword, r26, r23, r2);          //       ldset   x26, x23, [x2]
+    __ ldsmin(Assembler::xword, r16, r12, r4);         //       ldsmin  x16, x12, [x4]
+    __ ldsmax(Assembler::xword, r28, r30, r29);        //       ldsmax  x28, x30, [x29]
+    __ ldumin(Assembler::xword, r16, r27, r6);         //       ldumin  x16, x27, [x6]
+    __ ldumax(Assembler::xword, r9, r29, r15);         //       ldumax  x9, x29, [x15]
 
 // LSEOp
-    __ swpa(Assembler::xword, r4, r28, r30);           //       swpa    x4, x28, [x30]
-    __ ldadda(Assembler::xword, r29, r16, r27);        //       ldadda  x29, x16, [x27]
-    __ ldbica(Assembler::xword, r6, r9, r29);          //       ldclra  x6, x9, [x29]
-    __ ldeora(Assembler::xword, r16, r7, r4);          //       ldeora  x16, x7, [x4]
-    __ ldorra(Assembler::xword, r7, r15, r9);          //       ldseta  x7, x15, [x9]
-    __ ldsmina(Assembler::xword, r23, r8, r2);         //       ldsmina x23, x8, [x2]
-    __ ldsmaxa(Assembler::xword, r28, r21, sp);        //       ldsmaxa x28, x21, [sp]
-    __ ldumina(Assembler::xword, r5, r27, r0);         //       ldumina x5, x27, [x0]
-    __ ldumaxa(Assembler::xword, r17, r15, r4);        //       ldumaxa x17, x15, [x4]
+    __ swpa(Assembler::xword, r7, r4, r7);             //       swpa    x7, x4, [x7]
+    __ ldadda(Assembler::xword, r15, r9, r23);         //       ldadda  x15, x9, [x23]
+    __ ldbica(Assembler::xword, r8, r2, r28);          //       ldclra  x8, x2, [x28]
+    __ ldeora(Assembler::xword, r21, zr, r5);          //       ldeora  x21, xzr, [x5]
+    __ ldorra(Assembler::xword, r27, r0, r17);         //       ldseta  x27, x0, [x17]
+    __ ldsmina(Assembler::xword, r15, r4, r26);        //       ldsmina x15, x4, [x26]
+    __ ldsmaxa(Assembler::xword, r8, r28, r22);        //       ldsmaxa x8, x28, [x22]
+    __ ldumina(Assembler::xword, r27, r27, r25);       //       ldumina x27, x27, [x25]
+    __ ldumaxa(Assembler::xword, r23, r0, r4);         //       ldumaxa x23, x0, [x4]
 
 // LSEOp
-    __ swpal(Assembler::xword, r26, r8, r28);          //       swpal   x26, x8, [x28]
-    __ ldaddal(Assembler::xword, r22, r27, r27);       //       ldaddal x22, x27, [x27]
-    __ ldbical(Assembler::xword, r25, r23, r0);        //       ldclral x25, x23, [x0]
-    __ ldeoral(Assembler::xword, r4, r6, r15);         //       ldeoral x4, x6, [x15]
-    __ ldorral(Assembler::xword, r0, r4, r15);         //       ldsetal x0, x4, [x15]
-    __ ldsminal(Assembler::xword, r1, r10, r7);        //       ldsminal        x1, x10, [x7]
-    __ ldsmaxal(Assembler::xword, r5, r10, r28);       //       ldsmaxal        x5, x10, [x28]
-    __ lduminal(Assembler::xword, r7, r20, r23);       //       lduminal        x7, x20, [x23]
-    __ ldumaxal(Assembler::xword, r21, r6, r11);       //       ldumaxal        x21, x6, [x11]
+    __ swpal(Assembler::xword, r6, r16, r0);           //       swpal   x6, x16, [x0]
+    __ ldaddal(Assembler::xword, r4, r15, r1);         //       ldaddal x4, x15, [x1]
+    __ ldbical(Assembler::xword, r10, r7, r5);         //       ldclral x10, x7, [x5]
+    __ ldeoral(Assembler::xword, r10, r28, r7);        //       ldeoral x10, x28, [x7]
+    __ ldorral(Assembler::xword, r20, r23, r21);       //       ldsetal x20, x23, [x21]
+    __ ldsminal(Assembler::xword, r6, r11, r8);        //       ldsminal        x6, x11, [x8]
+    __ ldsmaxal(Assembler::xword, r17, zr, r6);        //       ldsmaxal        x17, xzr, [x6]
+    __ lduminal(Assembler::xword, r17, r2, r12);       //       lduminal        x17, x2, [x12]
+    __ ldumaxal(Assembler::xword, r30, r29, r3);       //       ldumaxal        x30, x29, [x3]
 
 // LSEOp
-    __ swpl(Assembler::xword, r8, r17, sp);            //       swpl    x8, x17, [sp]
-    __ ldaddl(Assembler::xword, r6, r17, r2);          //       ldaddl  x6, x17, [x2]
-    __ ldbicl(Assembler::xword, r12, r30, r29);        //       ldclrl  x12, x30, [x29]
-    __ ldeorl(Assembler::xword, r3, r27, r22);         //       ldeorl  x3, x27, [x22]
-    __ ldorrl(Assembler::xword, r29, r14, r13);        //       ldsetl  x29, x14, [x13]
-    __ ldsminl(Assembler::xword, r28, r17, r24);       //       ldsminl x28, x17, [x24]
-    __ ldsmaxl(Assembler::xword, r5, r2, r14);         //       ldsmaxl x5, x2, [x14]
-    __ lduminl(Assembler::xword, r10, r16, r11);       //       lduminl x10, x16, [x11]
-    __ ldumaxl(Assembler::xword, r27, r23, r12);       //       ldumaxl x27, x23, [x12]
+    __ swpl(Assembler::xword, r27, r22, r29);          //       swpl    x27, x22, [x29]
+    __ ldaddl(Assembler::xword, r14, r13, r28);        //       ldaddl  x14, x13, [x28]
+    __ ldbicl(Assembler::xword, r17, r24, r5);         //       ldclrl  x17, x24, [x5]
+    __ ldeorl(Assembler::xword, r2, r14, r10);         //       ldeorl  x2, x14, [x10]
+    __ ldorrl(Assembler::xword, r16, r11, r27);        //       ldsetl  x16, x11, [x27]
+    __ ldsminl(Assembler::xword, r23, r12, r4);        //       ldsminl x23, x12, [x4]
+    __ ldsmaxl(Assembler::xword, r22, r17, r4);        //       ldsmaxl x22, x17, [x4]
+    __ lduminl(Assembler::xword, r1, r19, r16);        //       lduminl x1, x19, [x16]
+    __ ldumaxl(Assembler::xword, r16, r13, r14);       //       ldumaxl x16, x13, [x14]
 
 // LSEOp
-    __ swp(Assembler::word, r4, r22, r17);             //       swp     w4, w22, [x17]
-    __ ldadd(Assembler::word, r4, r1, r19);            //       ldadd   w4, w1, [x19]
-    __ ldbic(Assembler::word, r16, r16, r13);          //       ldclr   w16, w16, [x13]
-    __ ldeor(Assembler::word, r14, r12, r2);           //       ldeor   w14, w12, [x2]
-    __ ldorr(Assembler::word, r17, r3, r21);           //       ldset   w17, w3, [x21]
-    __ ldsmin(Assembler::word, r23, r5, r6);           //       ldsmin  w23, w5, [x6]
-    __ ldsmax(Assembler::word, r7, r19, r13);          //       ldsmax  w7, w19, [x13]
-    __ ldumin(Assembler::word, r28, r17, r16);         //       ldumin  w28, w17, [x16]
-    __ ldumax(Assembler::word, r6, r2, r29);           //       ldumax  w6, w2, [x29]
+    __ swp(Assembler::word, r12, r2, r17);             //       swp     w12, w2, [x17]
+    __ ldadd(Assembler::word, r3, r21, r23);           //       ldadd   w3, w21, [x23]
+    __ ldbic(Assembler::word, r5, r6, r7);             //       ldclr   w5, w6, [x7]
+    __ ldeor(Assembler::word, r19, r13, r28);          //       ldeor   w19, w13, [x28]
+    __ ldorr(Assembler::word, r17, r16, r6);           //       ldset   w17, w16, [x6]
+    __ ldsmin(Assembler::word, r2, r29, r3);           //       ldsmin  w2, w29, [x3]
+    __ ldsmax(Assembler::word, r4, r6, r15);           //       ldsmax  w4, w6, [x15]
+    __ ldumin(Assembler::word, r20, r13, r12);         //       ldumin  w20, w13, [x12]
+    __ ldumax(Assembler::word, r20, r8, r25);          //       ldumax  w20, w8, [x25]
 
 // LSEOp
-    __ swpa(Assembler::word, r3, r4, r6);              //       swpa    w3, w4, [x6]
-    __ ldadda(Assembler::word, r16, r20, r13);         //       ldadda  w16, w20, [x13]
-    __ ldbica(Assembler::word, r12, r20, r8);          //       ldclra  w12, w20, [x8]
-    __ ldeora(Assembler::word, r25, r20, r19);         //       ldeora  w25, w20, [x19]
-    __ ldorra(Assembler::word, r0, r11, r24);          //       ldseta  w0, w11, [x24]
-    __ ldsmina(Assembler::word, r6, r20, sp);          //       ldsmina w6, w20, [sp]
-    __ ldsmaxa(Assembler::word, r14, r16, r6);         //       ldsmaxa w14, w16, [x6]
-    __ ldumina(Assembler::word, r0, r7, r15);          //       ldumina w0, w7, [x15]
-    __ ldumaxa(Assembler::word, r19, r26, r9);         //       ldumaxa w19, w26, [x9]
+    __ swpa(Assembler::word, r20, r19, r0);            //       swpa    w20, w19, [x0]
+    __ ldadda(Assembler::word, r11, r24, r6);          //       ldadda  w11, w24, [x6]
+    __ ldbica(Assembler::word, r20, zr, r14);          //       ldclra  w20, wzr, [x14]
+    __ ldeora(Assembler::word, r16, r6, r0);           //       ldeora  w16, w6, [x0]
+    __ ldorra(Assembler::word, r7, r15, r19);          //       ldseta  w7, w15, [x19]
+    __ ldsmina(Assembler::word, r26, r9, r10);         //       ldsmina w26, w9, [x10]
+    __ ldsmaxa(Assembler::word, r23, r21, r22);        //       ldsmaxa w23, w21, [x22]
+    __ ldumina(Assembler::word, r28, r2, r3);          //       ldumina w28, w2, [x3]
+    __ ldumaxa(Assembler::word, r15, r19, r20);        //       ldumaxa w15, w19, [x20]
 
 // LSEOp
-    __ swpal(Assembler::word, r10, r23, r21);          //       swpal   w10, w23, [x21]
-    __ ldaddal(Assembler::word, r22, r28, r2);         //       ldaddal w22, w28, [x2]
-    __ ldbical(Assembler::word, r3, r15, r19);         //       ldclral w3, w15, [x19]
-    __ ldeoral(Assembler::word, r20, r7, r4);          //       ldeoral w20, w7, [x4]
-    __ ldorral(Assembler::word, r29, r7, r0);          //       ldsetal w29, w7, [x0]
-    __ ldsminal(Assembler::word, r9, r16, r20);        //       ldsminal        w9, w16, [x20]
-    __ ldsmaxal(Assembler::word, r23, r4, r16);        //       ldsmaxal        w23, w4, [x16]
-    __ lduminal(Assembler::word, r10, r23, r11);       //       lduminal        w10, w23, [x11]
-    __ ldumaxal(Assembler::word, r25, r6, sp);         //       ldumaxal        w25, w6, [sp]
+    __ swpal(Assembler::word, r7, r4, r29);            //       swpal   w7, w4, [x29]
+    __ ldaddal(Assembler::word, r7, r0, r9);           //       ldaddal w7, w0, [x9]
+    __ ldbical(Assembler::word, r16, r20, r23);        //       ldclral w16, w20, [x23]
+    __ ldeoral(Assembler::word, r4, r16, r10);         //       ldeoral w4, w16, [x10]
+    __ ldorral(Assembler::word, r23, r11, r25);        //       ldsetal w23, w11, [x25]
+    __ ldsminal(Assembler::word, r6, zr, r16);         //       ldsminal        w6, wzr, [x16]
+    __ ldsmaxal(Assembler::word, r13, r23, r12);       //       ldsmaxal        w13, w23, [x12]
+    __ lduminal(Assembler::word, r1, r14, r9);         //       lduminal        w1, w14, [x9]
+    __ ldumaxal(Assembler::word, r21, r16, r26);       //       ldumaxal        w21, w16, [x26]
 
 // LSEOp
-    __ swpl(Assembler::word, r16, r13, r23);           //       swpl    w16, w13, [x23]
-    __ ldaddl(Assembler::word, r12, r1, r14);          //       ldaddl  w12, w1, [x14]
-    __ ldbicl(Assembler::word, r9, r21, r16);          //       ldclrl  w9, w21, [x16]
-    __ ldeorl(Assembler::word, r26, r15, r4);          //       ldeorl  w26, w15, [x4]
-    __ ldorrl(Assembler::word, r4, r16, r8);           //       ldsetl  w4, w16, [x8]
-    __ ldsminl(Assembler::word, r6, r30, r4);          //       ldsminl w6, w30, [x4]
-    __ ldsmaxl(Assembler::word, r29, r17, r29);        //       ldsmaxl w29, w17, [x29]
-    __ lduminl(Assembler::word, r26, r9, r15);         //       lduminl w26, w9, [x15]
-    __ ldumaxl(Assembler::word, r2, r11, r29);         //       ldumaxl w2, w11, [x29]
+    __ swpl(Assembler::word, r15, r4, r4);             //       swpl    w15, w4, [x4]
+    __ ldaddl(Assembler::word, r16, r8, r6);           //       ldaddl  w16, w8, [x6]
+    __ ldbicl(Assembler::word, r30, r4, r29);          //       ldclrl  w30, w4, [x29]
+    __ ldeorl(Assembler::word, r17, r29, r26);         //       ldeorl  w17, w29, [x26]
+    __ ldorrl(Assembler::word, r9, r15, r2);           //       ldsetl  w9, w15, [x2]
+    __ ldsminl(Assembler::word, r11, r29, r3);         //       ldsminl w11, w29, [x3]
+    __ ldsmaxl(Assembler::word, r7, r1, r27);          //       ldsmaxl w7, w1, [x27]
+    __ lduminl(Assembler::word, r21, r16, r14);        //       lduminl w21, w16, [x14]
+    __ ldumaxl(Assembler::word, r8, r16, r22);         //       ldumaxl w8, w16, [x22]
 
 // SHA3SIMDOp
-    __ bcax(v3, __ T16B, v7, v1, v27);                 //       bcax            v3.16B, v7.16B, v1.16B, v27.16B
-    __ eor3(v21, __ T16B, v18, v14, v8);               //       eor3            v21.16B, v18.16B, v14.16B, v8.16B
-    __ rax1(v18, __ T2D, v22, v25);                    //       rax1            v18.2D, v22.2D, v25.2D
-    __ xar(v5, __ T2D, v20, v21, 37);                  //       xar             v5.2D, v20.2D, v21.2D, #37
+    __ bcax(v25, __ T16B, v5, v20, v21);               //       bcax            v25.16B, v5.16B, v20.16B, v21.16B
+    __ eor3(v18, __ T16B, v23, v16, v30);              //       eor3            v18.16B, v23.16B, v16.16B, v30.16B
+    __ rax1(v20, __ T2D, v20, v0);                     //       rax1            v20.2D, v20.2D, v0.2D
+    __ xar(v4, __ T2D, v19, v24, 9);                   //       xar             v4.2D, v19.2D, v24.2D, #9
 
 // SHA512SIMDOp
-    __ sha512h(v23, __ T2D, v16, v30);                 //       sha512h         q23, q16, v30.2D
-    __ sha512h2(v20, __ T2D, v20, v0);                 //       sha512h2                q20, q20, v0.2D
-    __ sha512su0(v4, __ T2D, v19);                     //       sha512su0               v4.2D, v19.2D
-    __ sha512su1(v24, __ T2D, v4, v20);                //       sha512su1               v24.2D, v4.2D, v20.2D
+    __ sha512h(v20, __ T2D, v4, v24);                  //       sha512h         q20, q4, v24.2D
+    __ sha512h2(v26, __ T2D, v19, v2);                 //       sha512h2                q26, q19, v2.2D
+    __ sha512su0(v8, __ T2D, v8);                      //       sha512su0               v8.2D, v8.2D
+    __ sha512su1(v14, __ T2D, v24, v18);               //       sha512su1               v14.2D, v24.2D, v18.2D
 
 // SVEBinaryImmOp
-    __ sve_add(z4, __ D, 210u);                        //       add     z4.d, z4.d, #0xd2
-    __ sve_sub(z19, __ B, 71u);                        //       sub     z19.b, z19.b, #0x47
-    __ sve_and(z8, __ H, 49663u);                      //       and     z8.h, z8.h, #0xc1ff
-    __ sve_eor(z31, __ S, 4294967231u);                //       eor     z31.s, z31.s, #0xffffffbf
-    __ sve_orr(z1, __ H, 16368u);                      //       orr     z1.h, z1.h, #0x3ff0
+    __ sve_add(z31, __ S, 36u);                        //       add     z31.s, z31.s, #0x24
+    __ sve_sub(z31, __ B, 85u);                        //       sub     z31.b, z31.b, #0x55
+    __ sve_and(z20, __ H, 4032u);                      //       and     z20.h, z20.h, #0xfc0
+    __ sve_eor(z7, __ D, 274877904896u);               //       eor     z7.d, z7.d, #0x3ffffff800
+    __ sve_orr(z27, __ B, 243u);                       //       orr     z27.b, z27.b, #0xf3
 
 // SVEBinaryImmOp
-    __ sve_add(z0, __ H, 61u);                         //       add     z0.h, z0.h, #0x3d
-    __ sve_sub(z24, __ S, 36u);                        //       sub     z24.s, z24.s, #0x24
-    __ sve_and(z27, __ B, 243u);                       //       and     z27.b, z27.b, #0xf3
-    __ sve_eor(z24, __ H, 65534u);                     //       eor     z24.h, z24.h, #0xfffe
-    __ sve_orr(z22, __ S, 4294967293u);                //       orr     z22.s, z22.s, #0xfffffffd
+    __ sve_add(z24, __ H, 132u);                       //       add     z24.h, z24.h, #0x84
+    __ sve_sub(z31, __ S, 183u);                       //       sub     z31.s, z31.s, #0xb7
+    __ sve_and(z20, __ D, 4503599627354112u);          //       and     z20.d, z20.d, #0xfffffffffc000
+    __ sve_eor(z14, __ S, 4042322160u);                //       eor     z14.s, z14.s, #0xf0f0f0f0
+    __ sve_orr(z28, __ H, 32256u);                     //       orr     z28.h, z28.h, #0x7e00
 
 // SVEBinaryImmOp
-    __ sve_add(z29, __ H, 113u);                       //       add     z29.h, z29.h, #0x71
-    __ sve_sub(z20, __ B, 165u);                       //       sub     z20.b, z20.b, #0xa5
-    __ sve_and(z28, __ H, 32256u);                     //       and     z28.h, z28.h, #0x7e00
-    __ sve_eor(z12, __ S, 4287102855u);                //       eor     z12.s, z12.s, #0xff87ff87
-    __ sve_orr(z9, __ S, 3825205247u);                 //       orr     z9.s, z9.s, #0xe3ffffff
+    __ sve_add(z12, __ S, 13u);                        //       add     z12.s, z12.s, #0xd
+    __ sve_sub(z24, __ H, 159u);                       //       sub     z24.h, z24.h, #0x9f
+    __ sve_and(z13, __ S, 2151677951u);                //       and     z13.s, z13.s, #0x803fffff
+    __ sve_eor(z5, __ B, 124u);                        //       eor     z5.b, z5.b, #0x7c
+    __ sve_orr(z8, __ H, 32768u);                      //       orr     z8.h, z8.h, #0x8000
 
 // SVEBinaryImmOp
-    __ sve_add(z18, __ S, 41u);                        //       add     z18.s, z18.s, #0x29
-    __ sve_sub(z0, __ B, 98u);                         //       sub     z0.b, z0.b, #0x62
-    __ sve_and(z8, __ H, 32768u);                      //       and     z8.h, z8.h, #0x8000
-    __ sve_eor(z4, __ H, 508u);                        //       eor     z4.h, z4.h, #0x1fc
-    __ sve_orr(z0, __ H, 64512u);                      //       orr     z0.h, z0.h, #0xfc00
+    __ sve_add(z4, __ H, 243u);                        //       add     z4.h, z4.h, #0xf3
+    __ sve_sub(z5, __ B, 86u);                         //       sub     z5.b, z5.b, #0x56
+    __ sve_and(z22, __ D, 8064u);                      //       and     z22.d, z22.d, #0x1f80
+    __ sve_eor(z9, __ S, 130023424u);                  //       eor     z9.s, z9.s, #0x7c00000
+    __ sve_orr(z24, __ B, 62u);                        //       orr     z24.b, z24.b, #0x3e
 
 // SVEBinaryImmOp
-    __ sve_add(z3, __ B, 79u);                         //       add     z3.b, z3.b, #0x4f
-    __ sve_sub(z19, __ D, 84u);                        //       sub     z19.d, z19.d, #0x54
-    __ sve_and(z24, __ B, 62u);                        //       and     z24.b, z24.b, #0x3e
-    __ sve_eor(z24, __ D, 18428729675200069887u);      //       eor     z24.d, z24.d, #0xffc00000000000ff
-    __ sve_orr(z11, __ D, 17296056810822168583u);      //       orr     z11.d, z11.d, #0xf007f007f007f007
+    __ sve_add(z24, __ D, 113u);                       //       add     z24.d, z24.d, #0x71
+    __ sve_sub(z21, __ H, 217u);                       //       sub     z21.h, z21.h, #0xd9
+    __ sve_and(z13, __ S, 3221229567u);                //       and     z13.s, z13.s, #0xc0000fff
+    __ sve_eor(z14, __ B, 131u);                       //       eor     z14.b, z14.b, #0x83
+    __ sve_orr(z22, __ S, 4042322160u);                //       orr     z22.s, z22.s, #0xf0f0f0f0
 
 // SVEBinaryImmOp
-    __ sve_add(z31, __ S, 115u);                       //       add     z31.s, z31.s, #0x73
-    __ sve_sub(z3, __ D, 134u);                        //       sub     z3.d, z3.d, #0x86
-    __ sve_and(z22, __ S, 4042322160u);                //       and     z22.s, z22.s, #0xf0f0f0f0
-    __ sve_eor(z3, __ B, 225u);                        //       eor     z3.b, z3.b, #0xe1
-    __ sve_orr(z9, __ S, 4164941887u);                 //       orr     z9.s, z9.s, #0xf83ff83f
+    __ sve_add(z3, __ B, 215u);                        //       add     z3.b, z3.b, #0xd7
+    __ sve_sub(z19, __ H, 134u);                       //       sub     z19.h, z19.h, #0x86
+    __ sve_and(z17, __ S, 491520u);                    //       and     z17.s, z17.s, #0x78000
+    __ sve_eor(z2, __ D, 8796093020160u);              //       eor     z2.d, z2.d, #0x7fffffff800
+    __ sve_orr(z11, __ S, 3221229567u);                //       orr     z11.s, z11.s, #0xc0000fff
 
 // SVEVectorOp
-    __ sve_add(z0, __ D, z4, z2);                      //       add     z0.d, z4.d, z2.d
-    __ sve_sub(z14, __ S, z6, z11);                    //       sub     z14.s, z6.s, z11.s
-    __ sve_fadd(z14, __ S, z17, z30);                  //       fadd    z14.s, z17.s, z30.s
-    __ sve_fmul(z3, __ S, z3, z23);                    //       fmul    z3.s, z3.s, z23.s
-    __ sve_fsub(z3, __ S, z24, z28);                   //       fsub    z3.s, z24.s, z28.s
-    __ sve_abs(z19, __ D, p5, z7);                     //       abs     z19.d, p5/m, z7.d
-    __ sve_add(z21, __ H, p3, z5);                     //       add     z21.h, p3/m, z21.h, z5.h
-    __ sve_and(z26, __ S, p1, z22);                    //       and     z26.s, p1/m, z26.s, z22.s
-    __ sve_asr(z17, __ H, p0, z3);                     //       asr     z17.h, p0/m, z17.h, z3.h
-    __ sve_bic(z20, __ H, p3, z8);                     //       bic     z20.h, p3/m, z20.h, z8.h
-    __ sve_clz(z14, __ H, p4, z17);                    //       clz     z14.h, p4/m, z17.h
-    __ sve_cnt(z13, __ D, p6, z18);                    //       cnt     z13.d, p6/m, z18.d
-    __ sve_eor(z19, __ H, p2, z16);                    //       eor     z19.h, p2/m, z19.h, z16.h
-    __ sve_lsl(z27, __ S, p5, z28);                    //       lsl     z27.s, p5/m, z27.s, z28.s
-    __ sve_lsr(z8, __ D, p2, z5);                      //       lsr     z8.d, p2/m, z8.d, z5.d
-    __ sve_mul(z28, __ H, p2, z0);                     //       mul     z28.h, p2/m, z28.h, z0.h
-    __ sve_neg(z25, __ B, p5, z21);                    //       neg     z25.b, p5/m, z21.b
-    __ sve_not(z3, __ B, p5, z26);                     //       not     z3.b, p5/m, z26.b
-    __ sve_orr(z26, __ S, p7, z19);                    //       orr     z26.s, p7/m, z26.s, z19.s
-    __ sve_rbit(z1, __ D, p3, z14);                    //       rbit    z1.d, p3/m, z14.d
-    __ sve_revb(z14, __ H, p0, z18);                   //       revb    z14.h, p0/m, z18.h
-    __ sve_smax(z31, __ S, p5, z23);                   //       smax    z31.s, p5/m, z31.s, z23.s
-    __ sve_smin(z30, __ B, p3, z8);                    //       smin    z30.b, p3/m, z30.b, z8.b
-    __ sve_sub(z0, __ S, p3, z23);                     //       sub     z0.s, p3/m, z0.s, z23.s
-    __ sve_fabs(z0, __ D, p4, z26);                    //       fabs    z0.d, p4/m, z26.d
-    __ sve_fadd(z24, __ D, p3, z22);                   //       fadd    z24.d, p3/m, z24.d, z22.d
-    __ sve_fdiv(z2, __ D, p0, z11);                    //       fdiv    z2.d, p0/m, z2.d, z11.d
-    __ sve_fmax(z12, __ D, p5, z24);                   //       fmax    z12.d, p5/m, z12.d, z24.d
-    __ sve_fmin(z9, __ D, p7, z17);                    //       fmin    z9.d, p7/m, z9.d, z17.d
-    __ sve_fmul(z20, __ D, p5, z4);                    //       fmul    z20.d, p5/m, z20.d, z4.d
-    __ sve_fneg(z13, __ D, p7, z22);                   //       fneg    z13.d, p7/m, z22.d
-    __ sve_frintm(z31, __ D, p6, z18);                 //       frintm  z31.d, p6/m, z18.d
-    __ sve_frintn(z15, __ D, p2, z13);                 //       frintn  z15.d, p2/m, z13.d
-    __ sve_frintp(z20, __ S, p1, z1);                  //       frintp  z20.s, p1/m, z1.s
-    __ sve_fsqrt(z14, __ S, p0, z7);                   //       fsqrt   z14.s, p0/m, z7.s
-    __ sve_fsub(z12, __ D, p4, z4);                    //       fsub    z12.d, p4/m, z12.d, z4.d
-    __ sve_fmad(z15, __ S, p0, z3, z30);               //       fmad    z15.s, p0/m, z3.s, z30.s
-    __ sve_fmla(z20, __ D, p1, z20, z31);              //       fmla    z20.d, p1/m, z20.d, z31.d
-    __ sve_fmls(z13, __ D, p3, z9, z14);               //       fmls    z13.d, p3/m, z9.d, z14.d
-    __ sve_fmsb(z1, __ S, p3, z28, z3);                //       fmsb    z1.s, p3/m, z28.s, z3.s
-    __ sve_fnmad(z26, __ S, p2, z25, z9);              //       fnmad   z26.s, p2/m, z25.s, z9.s
-    __ sve_fnmsb(z26, __ D, p2, z14, z1);              //       fnmsb   z26.d, p2/m, z14.d, z1.d
-    __ sve_fnmla(z26, __ D, p1, z29, z20);             //       fnmla   z26.d, p1/m, z29.d, z20.d
-    __ sve_fnmls(z6, __ D, p7, z13, z1);               //       fnmls   z6.d, p7/m, z13.d, z1.d
-    __ sve_mla(z11, __ B, p2, z1, z1);                 //       mla     z11.b, p2/m, z1.b, z1.b
-    __ sve_mls(z27, __ B, p6, z15, z2);                //       mls     z27.b, p6/m, z15.b, z2.b
-    __ sve_and(z30, z17, z25);                         //       and     z30.d, z17.d, z25.d
-    __ sve_eor(z2, z24, z3);                           //       eor     z2.d, z24.d, z3.d
-    __ sve_orr(z29, z13, z3);                          //       orr     z29.d, z13.d, z3.d
-    __ sve_bic(z14, z16, z28);                         //       bic     z14.d, z16.d, z28.d
-    __ sve_uzp1(z4, __ S, z11, z27);                   //       uzp1    z4.s, z11.s, z27.s
-    __ sve_uzp2(z2, __ D, z16, z1);                    //       uzp2    z2.d, z16.d, z1.d
-    __ sve_fabd(z7, __ D, p5, z31);                    //       fabd    z7.d, p5/m, z7.d, z31.d
-    __ sve_bext(z16, __ S, z10, z22);                  //       bext    z16.s, z10.s, z22.s
-    __ sve_bdep(z29, __ B, z7, z22);                   //       bdep    z29.b, z7.b, z22.b
-    __ sve_eor3(z12, z24, z11);                        //       eor3    z12.d, z12.d, z24.d, z11.d
+    __ sve_add(z30, __ B, z12, z3);                    //       add     z30.b, z12.b, z3.b
+    __ sve_sub(z23, __ D, z9, z3);                     //       sub     z23.d, z9.d, z3.d
+    __ sve_fadd(z28, __ D, z3, z19);                   //       fadd    z28.d, z3.d, z19.d
+    __ sve_fmul(z7, __ S, z26, z21);                   //       fmul    z7.s, z26.s, z21.s
+    __ sve_fsub(z5, __ S, z8, z26);                    //       fsub    z5.s, z8.s, z26.s
+    __ sve_abs(z22, __ B, p4, z17);                    //       abs     z22.b, p4/m, z17.b
+    __ sve_add(z3, __ H, p2, z20);                     //       add     z3.h, p2/m, z3.h, z20.h
+    __ sve_and(z8, __ S, p3, z14);                     //       and     z8.s, p3/m, z8.s, z14.s
+    __ sve_asr(z17, __ D, p2, z13);                    //       asr     z17.d, p2/m, z17.d, z13.d
+    __ sve_bic(z18, __ H, p7, z19);                    //       bic     z18.h, p7/m, z18.h, z19.h
+    __ sve_clz(z16, __ S, p3, z27);                    //       clz     z16.s, p3/m, z27.s
+    __ sve_cnt(z28, __ H, p5, z8);                     //       cnt     z28.h, p5/m, z8.h
+    __ sve_eor(z5, __ H, p7, z28);                     //       eor     z5.h, p7/m, z5.h, z28.h
+    __ sve_lsl(z0, __ S, p3, z25);                     //       lsl     z0.s, p3/m, z0.s, z25.s
+    __ sve_lsr(z21, __ S, p0, z3);                     //       lsr     z21.s, p0/m, z21.s, z3.s
+    __ sve_mul(z26, __ D, p1, z26);                    //       mul     z26.d, p1/m, z26.d, z26.d
+    __ sve_neg(z19, __ H, p4, z1);                     //       neg     z19.h, p4/m, z1.h
+    __ sve_not(z14, __ B, p7, z14);                    //       not     z14.b, p7/m, z14.b
+    __ sve_orr(z18, __ S, p0, z31);                    //       orr     z18.s, p0/m, z18.s, z31.s
+    __ sve_rbit(z23, __ H, p5, z30);                   //       rbit    z23.h, p5/m, z30.h
+    __ sve_revb(z8, __ S, p0, z0);                     //       revb    z8.s, p0/m, z0.s
+    __ sve_smax(z23, __ S, p5, z0);                    //       smax    z23.s, p5/m, z23.s, z0.s
+    __ sve_smin(z26, __ H, p6, z24);                   //       smin    z26.h, p6/m, z26.h, z24.h
+    __ sve_sub(z22, __ B, p5, z2);                     //       sub     z22.b, p5/m, z22.b, z2.b
+    __ sve_fabs(z11, __ D, p5, z12);                   //       fabs    z11.d, p5/m, z12.d
+    __ sve_fadd(z24, __ D, p6, z9);                    //       fadd    z24.d, p6/m, z24.d, z9.d
+    __ sve_fdiv(z17, __ D, p5, z20);                   //       fdiv    z17.d, p5/m, z17.d, z20.d
+    __ sve_fmax(z4, __ D, p5, z13);                    //       fmax    z4.d, p5/m, z4.d, z13.d
+    __ sve_fmin(z22, __ D, p7, z31);                   //       fmin    z22.d, p7/m, z22.d, z31.d
+    __ sve_fmul(z18, __ S, p4, z15);                   //       fmul    z18.s, p4/m, z18.s, z15.s
+    __ sve_fneg(z13, __ S, p7, z20);                   //       fneg    z13.s, p7/m, z20.s
+    __ sve_frintm(z1, __ S, p3, z14);                  //       frintm  z1.s, p3/m, z14.s
+    __ sve_frintn(z7, __ D, p2, z12);                  //       frintn  z7.d, p2/m, z12.d
+    __ sve_frintp(z4, __ S, p6, z15);                  //       frintp  z4.s, p6/m, z15.s
+    __ sve_fsqrt(z3, __ D, p7, z1);                    //       fsqrt   z3.d, p7/m, z1.d
+    __ sve_fsub(z5, __ D, p5, z31);                    //       fsub    z5.d, p5/m, z5.d, z31.d
+    __ sve_fmad(z13, __ D, p3, z9, z14);               //       fmad    z13.d, p3/m, z9.d, z14.d
+    __ sve_fmla(z1, __ S, p3, z28, z3);                //       fmla    z1.s, p3/m, z28.s, z3.s
+    __ sve_fmls(z26, __ S, p2, z25, z9);               //       fmls    z26.s, p2/m, z25.s, z9.s
+    __ sve_fmsb(z26, __ D, p2, z14, z1);               //       fmsb    z26.d, p2/m, z14.d, z1.d
+    __ sve_fnmad(z26, __ D, p1, z29, z20);             //       fnmad   z26.d, p1/m, z29.d, z20.d
+    __ sve_fnmsb(z6, __ D, p7, z13, z1);               //       fnmsb   z6.d, p7/m, z13.d, z1.d
+    __ sve_fnmla(z11, __ S, p2, z1, z1);               //       fnmla   z11.s, p2/m, z1.s, z1.s
+    __ sve_fnmls(z27, __ S, p6, z15, z2);              //       fnmls   z27.s, p6/m, z15.s, z2.s
+    __ sve_mla(z30, __ B, p4, z25, z2);                //       mla     z30.b, p4/m, z25.b, z2.b
+    __ sve_mls(z24, __ H, p0, z26, z29);               //       mls     z24.h, p0/m, z26.h, z29.h
+    __ sve_and(z3, z22, z14);                          //       and     z3.d, z22.d, z14.d
+    __ sve_eor(z28, z17, z4);                          //       eor     z28.d, z17.d, z4.d
+    __ sve_orr(z27, z16, z2);                          //       orr     z27.d, z16.d, z2.d
+    __ sve_bic(z1, z28, z7);                           //       bic     z1.d, z28.d, z7.d
+    __ sve_uzp1(z31, __ H, z28, z16);                  //       uzp1    z31.h, z28.h, z16.h
+    __ sve_uzp2(z22, __ B, z17, z29);                  //       uzp2    z22.b, z17.b, z29.b
+    __ sve_fabd(z22, __ D, p1, z12);                   //       fabd    z22.d, p1/m, z22.d, z12.d
+    __ sve_bext(z11, __ H, z9, z11);                   //       bext    z11.h, z9.h, z11.h
+    __ sve_bdep(z0, __ S, z4, z23);                    //       bdep    z0.s, z4.s, z23.s
+    __ sve_eor3(z20, z4, z3);                          //       eor3    z20.d, z20.d, z4.d, z3.d
 
 // SVEReductionOp
-    __ sve_andv(v11, __ B, p2, z0);                    //       andv b11, p2, z0.b
-    __ sve_orv(v23, __ B, p5, z20);                    //       orv b23, p5, z20.b
-    __ sve_eorv(v3, __ B, p3, z15);                    //       eorv b3, p3, z15.b
-    __ sve_smaxv(v30, __ B, p6, z27);                  //       smaxv b30, p6, z27.b
-    __ sve_sminv(v21, __ D, p6, z10);                  //       sminv d21, p6, z10.d
-    __ sve_fminv(v3, __ S, p6, z4);                    //       fminv s3, p6, z4.s
-    __ sve_fmaxv(v6, __ S, p0, z21);                   //       fmaxv s6, p0, z21.s
-    __ sve_fadda(v25, __ D, p6, z30);                  //       fadda d25, p6, d25, z30.d
-    __ sve_uaddv(v31, __ H, p4, z1);                   //       uaddv d31, p4, z1.h
+    __ sve_andv(v15, __ D, p1, z30);                   //       andv d15, p1, z30.d
+    __ sve_orv(v27, __ D, p1, z21);                    //       orv d27, p1, z21.d
+    __ sve_eorv(v10, __ D, p7, z3);                    //       eorv d10, p7, z3.d
+    __ sve_smaxv(v4, __ B, p2, z6);                    //       smaxv b4, p2, z6.b
+    __ sve_sminv(v21, __ D, p1, z25);                  //       sminv d21, p1, z25.d
+    __ sve_fminv(v30, __ D, p6, z31);                  //       fminv d30, p6, z31.d
+    __ sve_fmaxv(v1, __ D, p2, z12);                   //       fmaxv d1, p2, z12.d
+    __ sve_fadda(v13, __ D, p2, z25);                  //       fadda d13, p2, d13, z25.d
+    __ sve_uaddv(v1, __ D, p7, z23);                   //       uaddv d1, p7, z23.d
 
 // AddWideNEONOp
-    __ saddwv(v12, v13, __ T8H, v14, __ T8B);          //       saddw   v12.8H, v13.8H, v14.8B
-    __ saddwv2(v30, v31, __ T8H, v0, __ T16B);         //       saddw2  v30.8H, v31.8H, v0.16B
-    __ saddwv(v13, v14, __ T4S, v15, __ T4H);          //       saddw   v13.4S, v14.4S, v15.4H
-    __ saddwv2(v8, v9, __ T4S, v10, __ T8H);           //       saddw2  v8.4S, v9.4S, v10.8H
-    __ saddwv(v25, v26, __ T2D, v27, __ T2S);          //       saddw   v25.2D, v26.2D, v27.2S
+    __ saddwv(v20, v21, __ T8H, v22, __ T8B);          //       saddw   v20.8H, v21.8H, v22.8B
+    __ saddwv2(v0, v1, __ T8H, v2, __ T16B);           //       saddw2  v0.8H, v1.8H, v2.16B
+    __ saddwv(v21, v22, __ T4S, v23, __ T4H);          //       saddw   v21.4S, v22.4S, v23.4H
+    __ saddwv2(v7, v8, __ T4S, v9, __ T8H);            //       saddw2  v7.4S, v8.4S, v9.8H
+    __ saddwv(v31, v0, __ T2D, v1, __ T2S);            //       saddw   v31.2D, v0.2D, v1.2S
     __ saddwv2(v29, v30, __ T2D, v31, __ T4S);         //       saddw2  v29.2D, v30.2D, v31.4S
-    __ uaddwv(v1, v2, __ T8H, v3, __ T8B);             //       uaddw   v1.8H, v2.8H, v3.8B
-    __ uaddwv2(v31, v0, __ T8H, v1, __ T16B);          //       uaddw2  v31.8H, v0.8H, v1.16B
-    __ uaddwv(v23, v24, __ T4S, v25, __ T4H);          //       uaddw   v23.4S, v24.4S, v25.4H
-    __ uaddwv2(v31, v0, __ T4S, v1, __ T8H);           //       uaddw2  v31.4S, v0.4S, v1.8H
-    __ uaddwv(v20, v21, __ T2D, v22, __ T2S);          //       uaddw   v20.2D, v21.2D, v22.2S
-    __ uaddwv2(v0, v1, __ T2D, v2, __ T4S);            //       uaddw2  v0.2D, v1.2D, v2.4S
+    __ uaddwv(v27, v28, __ T8H, v29, __ T8B);          //       uaddw   v27.8H, v28.8H, v29.8B
+    __ uaddwv2(v22, v23, __ T8H, v24, __ T16B);        //       uaddw2  v22.8H, v23.8H, v24.16B
+    __ uaddwv(v8, v9, __ T4S, v10, __ T4H);            //       uaddw   v8.4S, v9.4S, v10.4H
+    __ uaddwv2(v29, v30, __ T4S, v31, __ T8H);         //       uaddw2  v29.4S, v30.4S, v31.8H
+    __ uaddwv(v26, v27, __ T2D, v28, __ T2S);          //       uaddw   v26.2D, v27.2D, v28.2S
+    __ uaddwv2(v20, v21, __ T2D, v22, __ T4S);         //       uaddw2  v20.2D, v21.2D, v22.4S
 
     __ bind(forth);
 
@@ -1327,30 +1337,30 @@
     0x9101a1a0,     0xb10a5cc8,     0xd10810aa,     0xf10fd061,
     0x120cb166,     0x321764bc,     0x52174681,     0x720c0227,
     0x9241018e,     0xb25a2969,     0xd278b411,     0xf26aad01,
-    0x14000000,     0x17ffffd7,     0x14000441,     0x94000000,
-    0x97ffffd4,     0x9400043e,     0x3400000a,     0x34fffa2a,
-    0x3400876a,     0x35000008,     0x35fff9c8,     0x35008708,
-    0xb400000b,     0xb4fff96b,     0xb40086ab,     0xb500001d,
-    0xb5fff91d,     0xb500865d,     0x10000013,     0x10fff8b3,
-    0x100085f3,     0x90000013,     0x36300016,     0x3637f836,
-    0x36308576,     0x3758000c,     0x375ff7cc,     0x3758850c,
+    0x14000000,     0x17ffffd7,     0x1400044b,     0x94000000,
+    0x97ffffd4,     0x94000448,     0x3400000a,     0x34fffa2a,
+    0x340088aa,     0x35000008,     0x35fff9c8,     0x35008848,
+    0xb400000b,     0xb4fff96b,     0xb40087eb,     0xb500001d,
+    0xb5fff91d,     0xb500879d,     0x10000013,     0x10fff8b3,
+    0x10008733,     0x90000013,     0x36300016,     0x3637f836,
+    0x363086b6,     0x3758000c,     0x375ff7cc,     0x3758864c,
     0x128313a0,     0x528a32c7,     0x7289173b,     0x92ab3acc,
     0xd2a0bf94,     0xf2c285e8,     0x9358722f,     0x330e652f,
     0x53067f3b,     0x93577c53,     0xb34a1aac,     0xd35a4016,
     0x13946c63,     0x93c3dbc8,     0x54000000,     0x54fff5a0,
-    0x540082e0,     0x54000001,     0x54fff541,     0x54008281,
-    0x54000002,     0x54fff4e2,     0x54008222,     0x54000002,
-    0x54fff482,     0x540081c2,     0x54000003,     0x54fff423,
-    0x54008163,     0x54000003,     0x54fff3c3,     0x54008103,
-    0x54000004,     0x54fff364,     0x540080a4,     0x54000005,
-    0x54fff305,     0x54008045,     0x54000006,     0x54fff2a6,
-    0x54007fe6,     0x54000007,     0x54fff247,     0x54007f87,
-    0x54000008,     0x54fff1e8,     0x54007f28,     0x54000009,
-    0x54fff189,     0x54007ec9,     0x5400000a,     0x54fff12a,
-    0x54007e6a,     0x5400000b,     0x54fff0cb,     0x54007e0b,
-    0x5400000c,     0x54fff06c,     0x54007dac,     0x5400000d,
-    0x54fff00d,     0x54007d4d,     0x5400000e,     0x54ffefae,
-    0x54007cee,     0x5400000f,     0x54ffef4f,     0x54007c8f,
+    0x54008420,     0x54000001,     0x54fff541,     0x540083c1,
+    0x54000002,     0x54fff4e2,     0x54008362,     0x54000002,
+    0x54fff482,     0x54008302,     0x54000003,     0x54fff423,
+    0x540082a3,     0x54000003,     0x54fff3c3,     0x54008243,
+    0x54000004,     0x54fff364,     0x540081e4,     0x54000005,
+    0x54fff305,     0x54008185,     0x54000006,     0x54fff2a6,
+    0x54008126,     0x54000007,     0x54fff247,     0x540080c7,
+    0x54000008,     0x54fff1e8,     0x54008068,     0x54000009,
+    0x54fff189,     0x54008009,     0x5400000a,     0x54fff12a,
+    0x54007faa,     0x5400000b,     0x54fff0cb,     0x54007f4b,
+    0x5400000c,     0x54fff06c,     0x54007eec,     0x5400000d,
+    0x54fff00d,     0x54007e8d,     0x5400000e,     0x54ffefae,
+    0x54007e2e,     0x5400000f,     0x54ffef4f,     0x54007dcf,
     0xd40658e1,     0xd4014d22,     0xd4046543,     0xd4273f60,
     0xd44cad80,     0xd503201f,     0xd503203f,     0xd503205f,
     0xd503209f,     0xd50320bf,     0xd503219f,     0xd50323bf,
@@ -1471,134 +1481,137 @@
     0x4e60f7fe,     0x0e3c6f7a,     0x4e346e72,     0x0e6b6d49,
     0x4e6a6d28,     0x0eae6dac,     0x4ea26c20,     0x0e36aeb4,
     0x4e23ac41,     0x0e7aaf38,     0x4e64ac62,     0x0ea2ac20,
-    0x4eabad49,     0x0ebaf738,     0x4ebcf77a,     0x4ef2f630,
-    0x2ea0effe,     0x6ea5ec83,     0x6eeced6a,     0x0fa710c5,
-    0x4f8b8149,     0x4fc710c5,     0x0f8750c5,     0x4faa8128,
-    0x4fc750c5,     0x2f8890e6,     0x4fa880e6,     0x6fc59083,
-    0x0f6f81cd,     0x4f448862,     0x0f848062,     0x4fab8149,
-    0x0e3736d5,     0x4e323630,     0x0e743672,     0x4e6d358b,
-    0x0eb736d5,     0x4eb93717,     0x4eee35ac,     0x0e3c3f7a,
-    0x4e393f17,     0x0e7e3fbc,     0x4e703dee,     0x0ead3d8b,
-    0x4eba3f38,     0x4ee33c41,     0x2e2e8dac,     0x6e218c1f,
-    0x2e6c8d6a,     0x6e728e30,     0x2ea98d07,     0x6ea48c62,
-    0x6ee58c83,     0x2e2f35cd,     0x6e353693,     0x2e733651,
-    0x6e723630,     0x2ea53483,     0x6ea33441,     0x6eed358b,
-    0x2e203ffe,     0x6e273cc5,     0x2e6a3d28,     0x6e713e0f,
-    0x2ebf3fdd,     0x6ea03ffe,     0x6ee23c20,     0x0e36e6b4,
-    0x4e29e507,     0x4e76e6b4,     0x2eb9e717,     0x6ebee7bc,
-    0x6ef7e6d5,     0x2e3de79b,     0x6e3be759,     0x6e67e4c5,
-    0x65d23ee0,     0x65903d92,     0x65d03fa7,     0x65912fe9,
-    0x65d13bf9,     0x65932a0a,     0x25cb90c4,     0x25040bde,
-    0x25c11085,     0x25c62c6b,     0x259f2279,     0x259d8993,
-    0x24e5102b,     0x24ad5458,     0x24ec7ab5,     0x24387c6d,
-    0xba5fd3e3,     0x3a5f03e5,     0xfa411be4,     0x7a42cbe2,
-    0x93df03ff,     0xc820ffff,     0x8822fc7f,     0xc8247cbf,
-    0x88267fff,     0x4e010fe0,     0x5e040420,     0x4e081fe1,
-    0x4e0c1fe1,     0x4e0a1fe1,     0x4e071fe1,     0x4e042c20,
-    0x4e062c20,     0x4e052c20,     0x4e083c20,     0x0e0c3c20,
-    0x0e0a3c20,     0x0e073c20,     0x9eae0020,     0x0f03f409,
-    0x6f03f40e,     0x4cc0ac3f,     0x0ea1b820,     0x4e21c862,
-    0x4e61b8a4,     0x05a08020,     0x05104fe0,     0x05505001,
-    0x05906fe2,     0x05d03005,     0x05101fea,     0x05901feb,
-    0x04b0e3e0,     0x0470e7e1,     0x042f9c20,     0x043f9c35,
-    0x047f9c20,     0x04ff9c20,     0x04299420,     0x04319160,
-    0x0461943e,     0x04a19020,     0x04038100,     0x040381a0,
-    0x040387e1,     0x04438be2,     0x04c38fe3,     0x040181e0,
-    0x04018100,     0x04018621,     0x04418b22,     0x04418822,
-    0x04818c23,     0x040081e0,     0x04008120,     0x04008761,
-    0x04008621,     0x04408822,     0x04808c23,     0x042053ff,
-    0x047f5401,     0x25208028,     0x2538cfe0,     0x2578d001,
-    0x25b8efe2,     0x25f8f007,     0x2538dfea,     0x25b8dfeb,
-    0xa400a3e0,     0xa420a7e0,     0xa4484be0,     0xa467afe0,
-    0xa4a8a7ea,     0xa547a814,     0xa4084ffe,     0xa55c53e0,
-    0xa5e1540b,     0xe400fbf6,     0xe408ffff,     0xe420e7e0,
-    0xe4484be0,     0xe460efe0,     0xe547e400,     0xe4014be0,
-    0xe4a84fe0,     0xe5f15000,     0x858043e0,     0x85a043ff,
-    0xe59f5d08,     0x0420e3e9,     0x0460e3ea,     0x04a0e3eb,
-    0x04e0e3ec,     0x25104042,     0x25104871,     0x25904861,
-    0x25904c92,     0x05344020,     0x05744041,     0x05b44062,
-    0x05f44083,     0x252c8840,     0x253c1420,     0x25681572,
-    0x25a21ce3,     0x25ea1e34,     0x253c0421,     0x25680572,
-    0x25a20ce3,     0x25ea0e34,     0x0522c020,     0x05e6c0a4,
-    0x2401a001,     0x2443a051,     0x24858881,     0x24c78cd1,
-    0x24850891,     0x24c70cc1,     0x250f9001,     0x25508051,
-    0x25802491,     0x25df28c1,     0x25850c81,     0x251e10d1,
-    0x65816001,     0x65c36051,     0x65854891,     0x65c74cc1,
-    0x05733820,     0x05b238a4,     0x05f138e6,     0x0570396a,
-    0x65d0a001,     0x65d6a443,     0x65d4a826,     0x6594ac26,
-    0x6554ac26,     0x6556ac26,     0x6552ac26,     0x65cbac85,
-    0x65caac01,     0x6589ac85,     0x6588ac01,     0x65c9ac85,
-    0x65c8ac01,     0x65dea833,     0x659ca509,     0x65d8a801,
-    0x65dcac01,     0x655cb241,     0x0520a1e0,     0x0521a601,
-    0x052281e0,     0x05238601,     0x04a14026,     0x042244a6,
-    0x046344a6,     0x04a444a6,     0x04e544a7,     0x0568aca7,
-    0x05b23230,     0x853040af,     0xc5b040af,     0xe57080af,
-    0xe5b080af,     0x25034440,     0x254054c4,     0x25034640,
-    0x25415a05,     0x25834440,     0x25c54489,     0x250b5d3a,
-    0x2550dc20,     0x2518e3e1,     0x2518e021,     0x2518e0a1,
-    0x2518e121,     0x2518e1a1,     0x2558e3e2,     0x2558e042,
-    0x2558e0c2,     0x2558e142,     0x2598e3e3,     0x2598e063,
-    0x2598e0e3,     0x2598e163,     0x25d8e3e4,     0x25d8e084,
-    0x25d8e104,     0x25d8e184,     0x2518e407,     0x05214800,
-    0x05614800,     0x05a14800,     0x05e14800,     0x05214c00,
-    0x05614c00,     0x05a14c00,     0x05e14c00,     0x05304001,
-    0x05314001,     0x05a18610,     0x05e18610,     0x05271e11,
-    0x6545e891,     0x6585e891,     0x65c5e891,     0x6545c891,
-    0x6585c891,     0x65c5c891,     0x45b0c210,     0x45f1c231,
-    0x1e601000,     0x1e603000,     0x1e621000,     0x1e623000,
-    0x1e641000,     0x1e643000,     0x1e661000,     0x1e663000,
-    0x1e681000,     0x1e683000,     0x1e6a1000,     0x1e6a3000,
-    0x1e6c1000,     0x1e6c3000,     0x1e6e1000,     0x1e6e3000,
-    0x1e701000,     0x1e703000,     0x1e721000,     0x1e723000,
-    0x1e741000,     0x1e743000,     0x1e761000,     0x1e763000,
-    0x1e781000,     0x1e783000,     0x1e7a1000,     0x1e7a3000,
-    0x1e7c1000,     0x1e7c3000,     0x1e7e1000,     0x1e7e3000,
-    0xf8338131,     0xf83c01fb,     0xf82712f5,     0xf83f2059,
-    0xf83f31fb,     0xf82a5277,     0xf8234010,     0xf83972fa,
-    0xf8226190,     0xf8a483dc,     0xf8bd0370,     0xf8a613a9,
-    0xf8b02087,     0xf8a7312f,     0xf8b75048,     0xf8bc43f5,
-    0xf8a5701b,     0xf8b1608f,     0xf8fa8388,     0xf8f6037b,
-    0xf8f91017,     0xf8e421e6,     0xf8e031e4,     0xf8e150ea,
-    0xf8e5438a,     0xf8e772f4,     0xf8f56166,     0xf86883f1,
-    0xf8660051,     0xf86c13be,     0xf86322db,     0xf87d31ae,
-    0xf87c5311,     0xf86541c2,     0xf86a7170,     0xf87b6197,
-    0xb8248236,     0xb8240261,     0xb83011b0,     0xb82e204c,
-    0xb83132a3,     0xb83750c5,     0xb82741b3,     0xb83c7211,
-    0xb82663a2,     0xb8a380c4,     0xb8b001b4,     0xb8ac1114,
-    0xb8b92274,     0xb8a0330b,     0xb8a653f4,     0xb8ae40d0,
-    0xb8a071e7,     0xb8b3613a,     0xb8ea82b7,     0xb8f6005c,
-    0xb8e3126f,     0xb8f42087,     0xb8fd3007,     0xb8e95290,
-    0xb8f74204,     0xb8ea7177,     0xb8f963e6,     0xb87082ed,
-    0xb86c01c1,     0xb8691215,     0xb87a208f,     0xb8643110,
-    0xb866509e,     0xb87d43b1,     0xb87a71e9,     0xb86263ab,
-    0xce216ce3,     0xce0e2255,     0xce798ed2,     0xce959685,
-    0xce7e8217,     0xce608694,     0xcec08264,     0xce748898,
-    0x25e0da44,     0x2521c8f3,     0x05801548,     0x0540cbdf,
-    0x05006521,     0x2560c7a0,     0x25a1c498,     0x058026bb,
-    0x05407dd8,     0x0500f3d6,     0x2560ce3d,     0x2521d4b4,
-    0x05803cbc,     0x05404d6c,     0x05001b89,     0x25a0c532,
-    0x2521cc40,     0x05800c08,     0x054074c4,     0x050034a0,
-    0x2520c9e3,     0x25e1ca93,     0x05803e98,     0x05425238,
-    0x050024cb,     0x25a0ce7f,     0x25e1d0c3,     0x05802676,
-    0x05401e63,     0x05002d49,     0x04e20080,     0x04ab04ce,
-    0x659e022e,     0x65970863,     0x659c0703,     0x04d6b4f3,
-    0x04400cb5,     0x049a06da,     0x04508071,     0x045b0d14,
-    0x0459b22e,     0x04daba4d,     0x04590a13,     0x0493979b,
-    0x04d188a8,     0x0450081c,     0x0417b6b9,     0x041eb743,
-    0x04981e7a,     0x05e78dc1,     0x0564824e,     0x048816ff,
-    0x040a0d1e,     0x04810ee0,     0x04dcb340,     0x65c08ed8,
-    0x65cd8162,     0x65c6970c,     0x65c79e29,     0x65c29494,
-    0x04ddbecd,     0x65c2ba5f,     0x65c0a9af,     0x6581a434,
-    0x658da0ee,     0x65c1908c,     0x65be806f,     0x65ff0694,
-    0x65ee2d2d,     0x65a3af81,     0x65a9cb3a,     0x65e1e9da,
-    0x65f447ba,     0x65e17da6,     0x0401482b,     0x040279fb,
-    0x0439323e,     0x04a33302,     0x046331bd,     0x04fc320e,
-    0x05bb6964,     0x05e16e02,     0x65c897e7,     0x4596b150,
-    0x4516b4fd,     0x0438396c,     0x041a280b,     0x04183697,
-    0x04192de3,     0x04083b7e,     0x04ca3955,     0x65873883,
-    0x658622a6,     0x65d83bd9,     0x0441303f,     0x0e2e11ac,
-    0x4e2013fe,     0x0e6f11cd,     0x4e6a1128,     0x0ebb1359,
-    0x4ebf13dd,     0x2e231041,     0x6e21101f,     0x2e791317,
-    0x6e61101f,     0x2eb612b4,     0x6ea21020,
+    0x4eabad49,     0x0e7ab738,     0x4e7cb77a,     0x0eb2b630,
+    0x4ea0b7fe,     0x0e252483,     0x4e2c256a,     0x0e792717,
+    0x4e6c256a,     0x0ea624a4,     0x4eb42672,     0x0ea4f462,
+    0x4eadf58b,     0x4eeaf528,     0x2eaced6a,     0x6eb1ee0f,
+    0x6ef3ee51,     0x0f8710c5,     0x4fa880e6,     0x4fc810e6,
+    0x0f855083,     0x4f8f89cd,     0x4fc45862,     0x2f849062,
+    0x4fab8149,     0x6fca9928,     0x0f6780c5,     0x4f5d898b,
+    0x0f8f81cd,     0x4f9089ee,     0x0e3035ee,     0x4e2d358b,
+    0x0e7a3738,     0x4e633441,     0x0eae35ac,     0x4ea1341f,
+    0x4eec356a,     0x0e323e30,     0x4e293d07,     0x0e643c62,
+    0x4e653c83,     0x0eaf3dcd,     0x4eb53e93,     0x4ef33e51,
+    0x2e328e30,     0x6e258c83,     0x2e638c41,     0x6e6d8d8b,
+    0x2ea08ffe,     0x6ea78cc5,     0x6eea8d28,     0x2e31360f,
+    0x6e3f37dd,     0x2e6037fe,     0x6e623420,     0x2eb636b4,
+    0x6ea93507,     0x6ef636b4,     0x2e393f17,     0x6e3e3fbc,
+    0x2e773ed5,     0x6e7d3f9b,     0x2ebb3f59,     0x6ea73cc5,
+    0x6ee33c41,     0x0e39e717,     0x4e32e630,     0x4e61e41f,
+    0x2ea7e4c5,     0x6eaee5ac,     0x6eebe549,     0x2e3ee7bc,
+    0x6e31e60f,     0x6e7fe7dd,     0x65d23feb,     0x65d03dd2,
+    0x65d03369,     0x65912566,     0x65d13e3f,     0x659334ef,
+    0x25c19085,     0x25c60c7b,     0x259f0269,     0x259d2983,
+    0x25d5303b,     0x259d9458,     0x24ec5aa5,     0x24385c7d,
+    0x247b7e39,     0x24bff4e7,     0xba5fd3e3,     0x3a5f03e5,
+    0xfa411be4,     0x7a42cbe2,     0x93df03ff,     0xc820ffff,
+    0x8822fc7f,     0xc8247cbf,     0x88267fff,     0x4e010fe0,
+    0x5e040420,     0x4e081fe1,     0x4e0c1fe1,     0x4e0a1fe1,
+    0x4e071fe1,     0x4e042c20,     0x4e062c20,     0x4e052c20,
+    0x4e083c20,     0x0e0c3c20,     0x0e0a3c20,     0x0e073c20,
+    0x9eae0020,     0x0f03f409,     0x6f03f40e,     0x4cc0ac3f,
+    0x0ea1b820,     0x4e21c862,     0x4e61b8a4,     0x05a08020,
+    0x05104fe0,     0x05505001,     0x05906fe2,     0x05d03005,
+    0x05101fea,     0x05901feb,     0x04b0e3e0,     0x0470e7e1,
+    0x042f9c20,     0x043f9c35,     0x047f9c20,     0x04ff9c20,
+    0x04299420,     0x04319160,     0x0461943e,     0x04a19020,
+    0x04038100,     0x040381a0,     0x040387e1,     0x04438be2,
+    0x04c38fe3,     0x040181e0,     0x04018100,     0x04018621,
+    0x04418b22,     0x04418822,     0x04818c23,     0x040081e0,
+    0x04008120,     0x04008761,     0x04008621,     0x04408822,
+    0x04808c23,     0x042053ff,     0x047f5401,     0x25208028,
+    0x2538cfe0,     0x2578d001,     0x25b8efe2,     0x25f8f007,
+    0x2538dfea,     0x25b8dfeb,     0xa400a3e0,     0xa420a7e0,
+    0xa4484be0,     0xa467afe0,     0xa4a8a7ea,     0xa547a814,
+    0xa4084ffe,     0xa55c53e0,     0xa5e1540b,     0xe400fbf6,
+    0xe408ffff,     0xe420e7e0,     0xe4484be0,     0xe460efe0,
+    0xe547e400,     0xe4014be0,     0xe4a84fe0,     0xe5f15000,
+    0x858043e0,     0x85a043ff,     0xe59f5d08,     0x0420e3e9,
+    0x0460e3ea,     0x04a0e3eb,     0x04e0e3ec,     0x25104042,
+    0x25104871,     0x25904861,     0x25904c92,     0x05344020,
+    0x05744041,     0x05b44062,     0x05f44083,     0x252c8840,
+    0x253c1420,     0x25681572,     0x25a21ce3,     0x25ea1e34,
+    0x253c0421,     0x25680572,     0x25a20ce3,     0x25ea0e34,
+    0x0522c020,     0x05e6c0a4,     0x2401a001,     0x2443a051,
+    0x24858881,     0x24c78cd1,     0x24850891,     0x24c70cc1,
+    0x250f9001,     0x25508051,     0x25802491,     0x25df28c1,
+    0x25850c81,     0x251e10d1,     0x65816001,     0x65c36051,
+    0x65854891,     0x65c74cc1,     0x05733820,     0x05b238a4,
+    0x05f138e6,     0x0570396a,     0x65d0a001,     0x65d6a443,
+    0x65d4a826,     0x6594ac26,     0x6554ac26,     0x6556ac26,
+    0x6552ac26,     0x65cbac85,     0x65caac01,     0x6589ac85,
+    0x6588ac01,     0x65c9ac85,     0x65c8ac01,     0x65dea833,
+    0x659ca509,     0x65d8a801,     0x65dcac01,     0x655cb241,
+    0x0520a1e0,     0x0521a601,     0x052281e0,     0x05238601,
+    0x04a14026,     0x042244a6,     0x046344a6,     0x04a444a6,
+    0x04e544a7,     0x0568aca7,     0x05b23230,     0x853040af,
+    0xc5b040af,     0xe57080af,     0xe5b080af,     0x25034440,
+    0x254054c4,     0x25034640,     0x25415a05,     0x25834440,
+    0x25c54489,     0x250b5d3a,     0x2550dc20,     0x2518e3e1,
+    0x2518e021,     0x2518e0a1,     0x2518e121,     0x2518e1a1,
+    0x2558e3e2,     0x2558e042,     0x2558e0c2,     0x2558e142,
+    0x2598e3e3,     0x2598e063,     0x2598e0e3,     0x2598e163,
+    0x25d8e3e4,     0x25d8e084,     0x25d8e104,     0x25d8e184,
+    0x2518e407,     0x05214800,     0x05614800,     0x05a14800,
+    0x05e14800,     0x05214c00,     0x05614c00,     0x05a14c00,
+    0x05e14c00,     0x05304001,     0x05314001,     0x05a18610,
+    0x05e18610,     0x05271e11,     0x6545e891,     0x6585e891,
+    0x65c5e891,     0x6545c891,     0x6585c891,     0x65c5c891,
+    0x45b0c210,     0x45f1c231,     0x1e601000,     0x1e603000,
+    0x1e621000,     0x1e623000,     0x1e641000,     0x1e643000,
+    0x1e661000,     0x1e663000,     0x1e681000,     0x1e683000,
+    0x1e6a1000,     0x1e6a3000,     0x1e6c1000,     0x1e6c3000,
+    0x1e6e1000,     0x1e6e3000,     0x1e701000,     0x1e703000,
+    0x1e721000,     0x1e723000,     0x1e741000,     0x1e743000,
+    0x1e761000,     0x1e763000,     0x1e781000,     0x1e783000,
+    0x1e7a1000,     0x1e7a3000,     0x1e7c1000,     0x1e7c3000,
+    0x1e7e1000,     0x1e7e3000,     0xf83983e2,     0xf83b0150,
+    0xf8371073,     0xf8302320,     0xf83a3057,     0xf830508c,
+    0xf83c43be,     0xf83070db,     0xf82961fd,     0xf8a780e4,
+    0xf8af02e9,     0xf8a81382,     0xf8b520bf,     0xf8bb3220,
+    0xf8af5344,     0xf8a842dc,     0xf8bb733b,     0xf8b76080,
+    0xf8e68010,     0xf8e4002f,     0xf8ea10a7,     0xf8ea20fc,
+    0xf8f432b7,     0xf8e6510b,     0xf8f140df,     0xf8f17182,
+    0xf8fe607d,     0xf87b83b6,     0xf86e038d,     0xf87110b8,
+    0xf862214e,     0xf870336b,     0xf877508c,     0xf8764091,
+    0xf8617213,     0xf87061cd,     0xb82c8222,     0xb82302f5,
+    0xb82510e6,     0xb833238d,     0xb83130d0,     0xb822507d,
+    0xb82441e6,     0xb834718d,     0xb8346328,     0xb8b48013,
+    0xb8ab00d8,     0xb8b411df,     0xb8b02006,     0xb8a7326f,
+    0xb8ba5149,     0xb8b742d5,     0xb8bc7062,     0xb8af6293,
+    0xb8e783a4,     0xb8e70120,     0xb8f012f4,     0xb8e42150,
+    0xb8f7332b,     0xb8e6521f,     0xb8ed4197,     0xb8e1712e,
+    0xb8f56350,     0xb86f8084,     0xb87000c8,     0xb87e13a4,
+    0xb871235d,     0xb869304f,     0xb86b507d,     0xb8674361,
+    0xb87571d0,     0xb86862d0,     0xce3454b9,     0xce107af2,
+    0xce608e94,     0xce982664,     0xce788094,     0xce62867a,
+    0xcec08108,     0xce728b0e,     0x25a0c49f,     0x2521cabf,
+    0x058054b4,     0x0543ab47,     0x050026bb,     0x2560d098,
+    0x25a1d6ff,     0x058394b4,     0x0540266e,     0x05003cbc,
+    0x25a0c1ac,     0x2561d3f8,     0x05800acd,     0x05403685,
+    0x05000c08,     0x2560de64,     0x2521cac5,     0x0583c8b6,
+    0x05405089,     0x05003e98,     0x25e0ce38,     0x2561db35,
+    0x058011ad,     0x05400e4e,     0x05002676,     0x2520dae3,
+    0x2561d0d3,     0x05808871,     0x0543abe2,     0x050011ab,
+    0x0423019e,     0x04e30537,     0x65d3007c,     0x65950b47,
+    0x659a0505,     0x0416b236,     0x04400a83,     0x049a0dc8,
+    0x04d089b1,     0x045b1e72,     0x0499af70,     0x045ab51c,
+    0x04591f85,     0x04938f20,     0x04918075,     0x04d0075a,
+    0x0457b033,     0x041ebdce,     0x049803f2,     0x056797d7,
+    0x05a48008,     0x04881417,     0x044a1b1a,     0x04011456,
+    0x04dcb58b,     0x65c09938,     0x65cd9691,     0x65c695a4,
+    0x65c79ff6,     0x658291f2,     0x049dbe8d,     0x6582adc1,
+    0x65c0a987,     0x6581b9e4,     0x65cdbc23,     0x65c197e5,
+    0x65ee8d2d,     0x65a30f81,     0x65a92b3a,     0x65e1a9da,
+    0x65f4c7ba,     0x65e1fda6,     0x65a1482b,     0x65a279fb,
+    0x0402533e,     0x045d6358,     0x042e32c3,     0x04a4323c,
+    0x0462321b,     0x04e73381,     0x05706b9f,     0x053d6e36,
+    0x65c88596,     0x454bb12b,     0x4597b480,     0x04243874,
+    0x04da27cf,     0x04d826bb,     0x04d93c6a,     0x040828c4,
+    0x04ca2735,     0x65c73bfe,     0x65c62981,     0x65d82b2d,
+    0x04c13ee1,     0x0e3612b4,     0x4e221020,     0x0e7712d5,
+    0x4e691107,     0x0ea1101f,     0x4ebf13dd,     0x2e3d139b,
+    0x6e3812f6,     0x2e6a1128,     0x6e7f13dd,     0x2ebc137a,
+    0x6eb612b4,
   };
 // END  Generated code -- do not edit

From 216f113f8b377054bcfccf875ab29e967164d8ab Mon Sep 17 00:00:00 2001
From: Alexander Zvegintsev <azvegint@openjdk.org>
Date: Tue, 4 Mar 2025 15:42:03 +0000
Subject: [PATCH 215/587] 8344892: beans/finder/MethodFinder.findMethod
 incorrectly returns null

Reviewed-by: aivanov, serb
---
 .../share/classes/com/sun/beans/finder/MethodFinder.java     | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/java.desktop/share/classes/com/sun/beans/finder/MethodFinder.java b/src/java.desktop/share/classes/com/sun/beans/finder/MethodFinder.java
index 5283cbfce0d..d05e2f81cf5 100644
--- a/src/java.desktop/share/classes/com/sun/beans/finder/MethodFinder.java
+++ b/src/java.desktop/share/classes/com/sun/beans/finder/MethodFinder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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,8 +77,7 @@ public final class MethodFinder extends AbstractFinder<Method> {
         Signature signature = new Signature(type, name, args);
 
         try {
-            Method method = CACHE.get(signature);
-            return (method == null) ? method : CACHE.create(signature);
+            return CACHE.get(signature);
         }
         catch (SignatureException exception) {
             throw exception.toNoSuchMethodException("Method '" + name + "' is not found");

From 6a31aaeb00b6c37e2e19c5f2759c4aa9ed87f25a Mon Sep 17 00:00:00 2001
From: Alexey Semenyuk <asemenyuk@openjdk.org>
Date: Tue, 4 Mar 2025 16:22:28 +0000
Subject: [PATCH 216/587] 8350594: Misleading warning about install dir for DMG
 packaging

Reviewed-by: almatvee
---
 .../internal/MacBaseInstallerBundler.java     |  20 ++-
 .../resources/MacResources.properties         |   4 +-
 .../jdk/jpackage/test/JPackageCommand.java    |   9 +-
 .../helpers/jdk/jpackage/test/MacHelper.java  |  26 +++-
 .../tools/jpackage/share/InstallDirTest.java  | 140 ++++++++++++++++--
 5 files changed, 167 insertions(+), 32 deletions(-)

diff --git a/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacBaseInstallerBundler.java b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacBaseInstallerBundler.java
index 69ecce068e7..beb8072ea37 100644
--- a/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacBaseInstallerBundler.java
+++ b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacBaseInstallerBundler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -102,16 +102,20 @@ public abstract class MacBaseInstallerBundler extends AbstractBundler {
      static String getInstallDir(
             Map<String, ? super Object>  params, boolean defaultOnly) {
         String returnValue = INSTALL_DIR.fetchFrom(params);
-        if (defaultOnly && returnValue != null) {
-            Log.info(I18N.getString("message.install-dir-ignored"));
+
+        final String defaultInstallDir;
+        if (StandardBundlerParam.isRuntimeInstaller(params)) {
+            defaultInstallDir = "/Library/Java/JavaVirtualMachines";
+        } else {
+            defaultInstallDir = "/Applications";
+        }
+
+        if (defaultOnly && returnValue != null && !Path.of(returnValue).equals(Path.of(defaultInstallDir))) {
+            Log.info(MessageFormat.format(I18N.getString("message.install-dir-ignored"), defaultInstallDir));
             returnValue = null;
         }
         if (returnValue == null) {
-            if (StandardBundlerParam.isRuntimeInstaller(params)) {
-                returnValue = "/Library/Java/JavaVirtualMachines";
-            } else {
-               returnValue = "/Applications";
-            }
+            returnValue = defaultInstallDir;
         }
         return returnValue;
     }
diff --git a/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/resources/MacResources.properties b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/resources/MacResources.properties
index e0a555b3698..2f6d5b02bb6 100644
--- a/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/resources/MacResources.properties
+++ b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/resources/MacResources.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved.
 # 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 @@ message.preparing-scripts=Preparing package scripts.
 message.preparing-distribution-dist=Preparing distribution.dist: {0}.
 message.signing.pkg=Warning: For signing PKG, you might need to set "Always Trust" for your certificate using "Keychain Access" tool.
 message.setfile.dmg=Setting custom icon on DMG file skipped because 'SetFile' utility was not found. Installing Xcode with Command Line Tools should resolve this issue.
-message.install-dir-ignored=Warning: "--install-dir" is not supported by DMG and will be default to /Applications.
+message.install-dir-ignored=Warning: "--install-dir" option is ignored for DMG packaging. The installation directory will default to {0}.
 message.codesign.failed.reason.app.content="codesign" failed and additional application content was supplied via the "--app-content" parameter. Probably the additional content broke the integrity of the application bundle and caused the failure. Ensure content supplied via the "--app-content" parameter does not break the integrity of the application bundle, or add it in the post-processing step.
 message.codesign.failed.reason.xcode.tools=Possible reason for "codesign" failure is missing Xcode with command line developer tools. Install Xcode with command line developer tools to see if it resolves the problem.
 warning.unsigned.app.image=Warning: Using unsigned app-image to build signed {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 6fc5cfad3f9..2d5d035512b 100644
--- a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/JPackageCommand.java
+++ b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/JPackageCommand.java
@@ -71,6 +71,7 @@ public class JPackageCommand extends CommandArguments<JPackageCommand> {
         ignoreDefaultRuntime = cmd.ignoreDefaultRuntime;
         ignoreDefaultVerbose = cmd.ignoreDefaultVerbose;
         immutable = cmd.immutable;
+        dmgInstallDir = cmd.dmgInstallDir;
         prerequisiteActions = new Actions(cmd.prerequisiteActions);
         verifyActions = new Actions(cmd.verifyActions);
         appLayoutAsserts = cmd.appLayoutAsserts;
@@ -497,7 +498,11 @@ public class JPackageCommand extends CommandArguments<JPackageCommand> {
         }
 
         if (TKit.isOSX()) {
-            return MacHelper.getInstallationDirectory(this);
+            if (packageType() == PackageType.MAC_DMG && dmgInstallDir != null) {
+                return dmgInstallDir;
+            } else {
+                return MacHelper.getInstallationDirectory(this);
+            }
         }
 
         throw TKit.throwUnknownPlatformError();
@@ -868,6 +873,7 @@ public class JPackageCommand extends CommandArguments<JPackageCommand> {
             var copy = new JPackageCommand(cmd);
             copy.immutable = false;
             copy.removeArgumentWithValue("--runtime-image");
+            copy.dmgInstallDir = cmd.appInstallationDirectory();
             return copy;
         }
 
@@ -1165,6 +1171,7 @@ public class JPackageCommand extends CommandArguments<JPackageCommand> {
     private boolean ignoreDefaultRuntime;
     private boolean ignoreDefaultVerbose;
     private boolean immutable;
+    private Path dmgInstallDir;
     private final Actions prerequisiteActions;
     private final Actions verifyActions;
     private Path executeInDirectory;
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 2256963999a..72706129213 100644
--- a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/MacHelper.java
+++ b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/MacHelper.java
@@ -22,6 +22,8 @@
  */
 package jdk.jpackage.test;
 
+import static java.util.stream.Collectors.toSet;
+
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.lang.reflect.InvocationTargetException;
@@ -29,13 +31,12 @@ import java.lang.reflect.Method;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.util.List;
 import java.util.ArrayList;
+import java.util.List;
 import java.util.Optional;
 import java.util.Set;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
-import static java.util.stream.Collectors.toSet;
 import java.util.stream.Stream;
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
@@ -43,13 +44,13 @@ import javax.xml.parsers.ParserConfigurationException;
 import javax.xml.xpath.XPath;
 import javax.xml.xpath.XPathConstants;
 import javax.xml.xpath.XPathFactory;
+import jdk.jpackage.internal.RetryExecutor;
+import jdk.jpackage.internal.util.PathUtils;
 import jdk.jpackage.internal.util.function.ThrowingConsumer;
 import jdk.jpackage.internal.util.function.ThrowingSupplier;
 import jdk.jpackage.test.PackageTest.PackageHandlers;
-import jdk.jpackage.internal.RetryExecutor;
-import jdk.jpackage.internal.util.PathUtils;
-import org.xml.sax.SAXException;
 import org.w3c.dom.NodeList;
+import org.xml.sax.SAXException;
 
 public final class MacHelper {
 
@@ -298,9 +299,18 @@ public final class MacHelper {
 
     static Path getInstallationDirectory(JPackageCommand cmd) {
         cmd.verifyIsOfType(PackageType.MAC);
-        return Path.of(cmd.getArgumentValue("--install-dir",
-                () -> cmd.isRuntime() ? "/Library/Java/JavaVirtualMachines" : "/Applications")).resolve(
-                        cmd.name() + (cmd.isRuntime() ? "" : ".app"));
+
+        final var defaultInstallLocation = Path.of(
+                cmd.isRuntime() ? "/Library/Java/JavaVirtualMachines" : "/Applications");
+
+        final Path installLocation;
+        if (cmd.packageType() == PackageType.MAC_DMG) {
+            installLocation = defaultInstallLocation;
+        } else {
+            installLocation = cmd.getArgumentValue("--install-dir", () -> defaultInstallLocation, Path::of);
+        }
+
+        return installLocation.resolve(cmd.name() + (cmd.isRuntime() ? "" : ".app"));
     }
 
     static Path getUninstallCommand(JPackageCommand cmd) {
diff --git a/test/jdk/tools/jpackage/share/InstallDirTest.java b/test/jdk/tools/jpackage/share/InstallDirTest.java
index 672a435d220..2c14e863910 100644
--- a/test/jdk/tools/jpackage/share/InstallDirTest.java
+++ b/test/jdk/tools/jpackage/share/InstallDirTest.java
@@ -22,12 +22,20 @@
  */
 
 import java.nio.file.Path;
+import java.util.List;
+import java.util.Objects;
+import java.util.stream.Stream;
 import jdk.internal.util.OperatingSystem;
-import jdk.jpackage.test.TKit;
+import jdk.jpackage.test.Annotations.Parameter;
+import jdk.jpackage.test.Annotations.ParameterSupplier;
+import jdk.jpackage.test.Annotations.Test;
+import jdk.jpackage.test.JPackageCommand;
+import jdk.jpackage.test.JPackageStringBundle;
 import jdk.jpackage.test.PackageTest;
 import jdk.jpackage.test.PackageType;
-import jdk.jpackage.test.Annotations.Parameter;
-import jdk.jpackage.test.Annotations.Test;
+import jdk.jpackage.test.RunnablePackageTest.Action;
+import jdk.jpackage.test.TKit;
+import jdk.jpackage.test.TKit.TextStreamVerifier;
 
 /**
  * Test --install-dir parameter. Output of the test should be
@@ -57,6 +65,7 @@ import jdk.jpackage.test.Annotations.Test;
  * @key jpackagePlatformPackage
  * @build jdk.jpackage.test.*
  * @compile -Xlint:all -Werror InstallDirTest.java
+ * @requires (jpackage.test.SQETest != null)
  * @run main/othervm/timeout=540 -Xmx512m jdk.jpackage.test.Main
  *  --jpt-run=InstallDirTest.testCommon
  */
@@ -68,10 +77,9 @@ import jdk.jpackage.test.Annotations.Test;
  * @key jpackagePlatformPackage
  * @build jdk.jpackage.test.*
  * @compile -Xlint:all -Werror InstallDirTest.java
- * @requires (os.family == "linux")
  * @requires (jpackage.test.SQETest == null)
- * @run main/othervm/timeout=360 -Xmx512m jdk.jpackage.test.Main
- *  --jpt-run=InstallDirTest.testLinuxInvalid
+ * @run main/othervm/timeout=720 -Xmx512m jdk.jpackage.test.Main
+ *  --jpt-run=InstallDirTest
  */
 public class InstallDirTest {
 
@@ -92,11 +100,6 @@ public class InstallDirTest {
     @Parameter("foo")
     @Parameter("/opt/foo/.././.")
     public static void testLinuxInvalid(String installDir) {
-        testLinuxBad(installDir, "Invalid installation directory");
-    }
-
-    private static void testLinuxBad(String installDir,
-            String errorMessageSubstring) {
         new PackageTest().configureHelloApp()
         .setExpectedExitCode(1)
         .forTypes(PackageType.LINUX)
@@ -105,9 +108,120 @@ public class InstallDirTest {
             cmd.saveConsoleOutput(true);
         })
         .addBundleVerifier((cmd, result) -> {
-            TKit.assertTextStream(errorMessageSubstring).apply(
-                    result.getOutput().stream());
+            cmd.validateOutput(JPackageStringBundle.MAIN.cannedFormattedString("error.invalid-install-dir"));
         })
         .run();
     }
+
+    record DmgTestSpec(Path installDir, boolean installDirIgnored, boolean runtimeInstaller) {
+
+        DmgTestSpec {
+            Objects.requireNonNull(installDir);
+        }
+
+        static Builder build() {
+            return new Builder();
+        }
+
+        static final class Builder {
+
+            Builder ignoredInstallDir(String v) {
+                installDir = Path.of(v);
+                installDirIgnored = true;
+                return this;
+            }
+
+            Builder acceptedInstallDir(String v) {
+                installDir = Path.of(v);
+                installDirIgnored = false;
+                return this;
+            }
+
+            Builder runtimeInstaller() {
+                runtimeInstaller = true;
+                return this;
+            }
+
+            DmgTestSpec create() {
+                return new DmgTestSpec(installDir, installDirIgnored, runtimeInstaller);
+            }
+
+            private Path installDir;
+            private boolean installDirIgnored;
+            private boolean runtimeInstaller;
+        }
+
+        @Override
+        public String toString() {
+            final var sb = new StringBuilder();
+            sb.append(installDir);
+            if (installDirIgnored) {
+                sb.append(", ignore");
+            }
+            if (runtimeInstaller) {
+                sb.append(", runtime");
+            }
+            return sb.toString();
+        }
+
+        void run() {
+            final var test = new PackageTest().forTypes(PackageType.MAC_DMG).ignoreBundleOutputDir();
+            if (runtimeInstaller) {
+                test.addInitializer(cmd -> {
+                    cmd.removeArgumentWithValue("--input");
+                });
+            } else {
+                test.configureHelloApp();
+            }
+
+            test.addInitializer(JPackageCommand::setFakeRuntime).addInitializer(cmd -> {
+                cmd.addArguments("--install-dir", installDir);
+                cmd.validateOutput(createInstallDirWarningVerifier());
+            }).run(Action.CREATE_AND_UNPACK);
+        }
+
+        private TextStreamVerifier createInstallDirWarningVerifier() {
+            final var verifier = TKit.assertTextStream(
+                    JPackageStringBundle.MAIN.cannedFormattedString("message.install-dir-ignored", defaultDmgInstallDir()).getValue());
+            if (installDirIgnored) {
+                return verifier;
+            } else {
+                return verifier.negate();
+            }
+        }
+
+        private String defaultDmgInstallDir() {
+            if (runtimeInstaller) {
+                return "/Library/Java/JavaVirtualMachines";
+            } else {
+                return "/Applications";
+            }
+        }
+    }
+
+    @Test(ifOS = OperatingSystem.MACOS)
+    @ParameterSupplier
+    public static void testDmg(DmgTestSpec testSpec) {
+        testSpec.run();
+    }
+
+    public static List<Object[]> testDmg() {
+        return Stream.of(
+                DmgTestSpec.build().ignoredInstallDir("/foo"),
+                DmgTestSpec.build().ignoredInstallDir("/foo/bar"),
+                DmgTestSpec.build().ignoredInstallDir("/foo").runtimeInstaller(),
+                DmgTestSpec.build().ignoredInstallDir("/foo/bar").runtimeInstaller(),
+
+                DmgTestSpec.build().ignoredInstallDir("/Library/Java/JavaVirtualMachines"),
+                DmgTestSpec.build().ignoredInstallDir("/Applications").runtimeInstaller(),
+
+                DmgTestSpec.build().acceptedInstallDir("/Applications"),
+                DmgTestSpec.build().ignoredInstallDir("/Applications/foo/bar/buz"),
+
+                DmgTestSpec.build().runtimeInstaller().acceptedInstallDir("/Library/Java/JavaVirtualMachines"),
+                DmgTestSpec.build().runtimeInstaller().ignoredInstallDir("/Library/Java/JavaVirtualMachines/foo/bar/buz")
+        ).map(DmgTestSpec.Builder::create).map(testSpec -> {
+            return new Object[] { testSpec };
+        }).toList();
+    }
 }

From daf0213abc2c860246564b361061dbda9bd9982f Mon Sep 17 00:00:00 2001
From: Prasanta Sadhukhan <psadhukhan@openjdk.org>
Date: Tue, 4 Mar 2025 16:58:15 +0000
Subject: [PATCH 217/587] 8350924: javax/swing/JMenu/4213634/bug4213634.java
 fails

Reviewed-by: aivanov, tr
---
 .../javax/swing/JMenu/4213634/bug4213634.java | 90 ++++++++-----------
 1 file changed, 39 insertions(+), 51 deletions(-)

diff --git a/test/jdk/javax/swing/JMenu/4213634/bug4213634.java b/test/jdk/javax/swing/JMenu/4213634/bug4213634.java
index dd699b7e5bc..ad26ff2bc59 100644
--- a/test/jdk/javax/swing/JMenu/4213634/bug4213634.java
+++ b/test/jdk/javax/swing/JMenu/4213634/bug4213634.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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,103 +21,91 @@
  * questions.
  */
 
-import java.awt.AWTException;
 import java.awt.Robot;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
 import java.awt.event.KeyEvent;
-import java.lang.reflect.InvocationTargetException;
 import javax.swing.JButton;
 import javax.swing.JFrame;
 import javax.swing.JMenu;
 import javax.swing.JMenuBar;
 import javax.swing.JMenuItem;
-import javax.swing.JTextArea;
 import javax.swing.SwingUtilities;
 
 /*
  * @test
  * @key headful
  * @bug 4213634 8017187
- * @author Scott Violet
  * @library ../../regtesthelpers
  * @build Util
+ * @summary Verifies if Alt+mnemonic char works when
+ *          menu & menuitem have same mnemonic char
  * @run main bug4213634
  */
 
-
 public class bug4213634 {
 
-    private JMenu menu;
+    private static JMenu menu;
+    private static JFrame frame;
+    private static Robot robot;
 
-    private JFrame frame;
+    public static void main(String[] args) throws Exception {
+        try {
+            robot = new Robot();
+            SwingUtilities.invokeAndWait(bug4213634::createAndShowGUI);
 
-    public static void main(String[] args) throws Throwable {
-        new bug4213634();
+            robot.waitForIdle();
+            robot.delay(1000);
+            test();
+        } finally {
+            SwingUtilities.invokeAndWait(() -> {
+                if (frame != null) {
+                    frame.dispose();
+                }
+            });
+        }
     }
 
-    bug4213634() throws AWTException, InterruptedException, InvocationTargetException {
-        SwingUtilities.invokeAndWait(new Runnable() {
-            @Override
-            public void run() {
-                createAndShowGUI();
-            }
-        });
-
-        test();
-    }
-
-    public  void createAndShowGUI() {
-        frame = new JFrame("TEST");
+    public static void createAndShowGUI() {
+        frame = new JFrame("bug4213634");
         JMenuBar mb = new JMenuBar();
         menu = mb.add(createMenu("1 - First Menu", true));
         mb.add(createMenu("2 - Second Menu", false));
         frame.setJMenuBar(mb);
-        JTextArea ta = new JTextArea("This test dedicated to Nancy and Kathleen, testers and bowlers extraordinaire\n\n\nNo exception means pass.");
-        frame.getContentPane().add("Center", ta);
         JButton button = new JButton("Test");
         frame.getContentPane().add("South", button);
-        frame.setBounds(100, 100, 400, 400);
+        frame.setSize(300, 300);
+        frame.setLocationRelativeTo(null);
         frame.setVisible(true);
         button.requestFocusInWindow();
     }
 
-    private void test() throws AWTException, InterruptedException, InvocationTargetException {
-        Robot robot = new Robot();
-        robot.setAutoDelay(50);
-        robot.waitForIdle();
-
+    private static void test() throws Exception {
         Util.hitMnemonics(robot, KeyEvent.VK_1);
         robot.waitForIdle();
+        robot.delay(100);
 
-        SwingUtilities.invokeAndWait(new Runnable() {
-            @Override
-            public void run() {
-                if (!menu.isSelected()) {
-                    throw new RuntimeException(
-                        "Failed: Menu didn't remain posted at end of test");
-                } else {
-                    System.out.println("Test passed!");
-                    frame.dispose();
-                }
+        SwingUtilities.invokeAndWait(() -> {
+            if (!menu.isSelected()) {
+                throw new RuntimeException(
+                    "Failed: Menu didn't remain posted at end of test");
+            } else {
+                System.out.println("Test passed!");
             }
         });
     }
-    private JMenu createMenu(String str, boolean bFlag) {
+
+    private static JMenu createMenu(String str, boolean bFlag) {
         JMenuItem menuitem;
         JMenu menu = new JMenu(str);
         menu.setMnemonic(str.charAt(0));
 
-        for(int i = 0; i < 10; i ++) {
+        for (int i = 0; i < 10; i++) {
             menuitem = new JMenuItem("JMenuItem" + i);
-            menuitem.addActionListener(new ActionListener() {
-                public void actionPerformed(ActionEvent e) {
-                    throw new RuntimeException(
-                        "Failed: Mnemonic activated");
-                }
+            menuitem.addActionListener(e -> {
+                throw new RuntimeException("Failed: Mnemonic activated");
             });
-            if(bFlag)
+            if (bFlag) {
                 menuitem.setMnemonic('0' + i);
+            }
             menu.add(menuitem);
         }
         return menu;

From 4aa4b46440dcdb0c7707cc145171a45a9f895c07 Mon Sep 17 00:00:00 2001
From: Magnus Ihse Bursie <ihse@openjdk.org>
Date: Tue, 4 Mar 2025 16:59:19 +0000
Subject: [PATCH 218/587] 8351154: Use -ftrivial-auto-var-init=pattern for
 clang too

Reviewed-by: kbarrett, erikj
---
 make/autoconf/flags-cflags.m4 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/make/autoconf/flags-cflags.m4 b/make/autoconf/flags-cflags.m4
index 238c9752fd1..73786587735 100644
--- a/make/autoconf/flags-cflags.m4
+++ b/make/autoconf/flags-cflags.m4
@@ -482,7 +482,7 @@ AC_DEFUN([FLAGS_SETUP_CFLAGS_HELPER],
   else
     DEBUG_CFLAGS_JDK="-DDEBUG"
 
-    if test "x$TOOLCHAIN_TYPE" = xgcc; then
+    if test "x$TOOLCHAIN_TYPE" = xgcc || test "x$TOOLCHAIN_TYPE" = xclang ; then
       INIT_PATTERN_FLAG="-ftrivial-auto-var-init=pattern"
       FLAGS_COMPILER_CHECK_ARGUMENTS(ARGUMENT: [$INIT_PATTERN_FLAG],
           IF_TRUE: [

From 5b8d3491bf685a64b72b0ae763697353d09f61a1 Mon Sep 17 00:00:00 2001
From: Justin Lu <jlu@openjdk.org>
Date: Tue, 4 Mar 2025 17:08:54 +0000
Subject: [PATCH 219/587] 4745837: Make grouping usage during parsing apparent
 in relevant NumberFormat methods

Reviewed-by: naoto
---
 .../share/classes/java/text/NumberFormat.java | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/src/java.base/share/classes/java/text/NumberFormat.java b/src/java.base/share/classes/java/text/NumberFormat.java
index e397d4ba15d..710c4e771ff 100644
--- a/src/java.base/share/classes/java/text/NumberFormat.java
+++ b/src/java.base/share/classes/java/text/NumberFormat.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -883,14 +883,22 @@ public abstract class NumberFormat extends Format  {
     }
 
     /**
-     * Returns true if grouping is used in this format. For example, in the
-     * English locale, with grouping on, the number 1234567 might be formatted
-     * as "1,234,567". The grouping separator as well as the size of each group
-     * is locale dependent and is determined by sub-classes of NumberFormat.
+     * Returns true if grouping is used in this format. This applies to both
+     * formatting and parsing. The grouping separator as well as the size of each
+     * group is locale dependent and is determined by sub-classes of NumberFormat.
+     * For example, consider a {@code NumberFormat} that expects a "{@code ,}"
+     * grouping separator symbol with a grouping size of 3.
+     * <ul>
+     *   <li> Formatting {@code 1234567} with grouping on returns {@code "1,234,567"}
+     *   <li> Parsing {@code "1,234,567"} with grouping off returns {@code 1}
+     *   <li> Parsing {@code "1,234,567"} with grouping off when {@link #isStrict()}
+     *        returns {@code true} throws {@code ParseException}
+     * </ul>
      *
      * @return {@code true} if grouping is used;
      *         {@code false} otherwise
      * @see #setGroupingUsed
+     * @see ##leniency Leniency Section
      */
     public boolean isGroupingUsed() {
         return groupingUsed;
@@ -898,6 +906,7 @@ public abstract class NumberFormat extends Format  {
 
     /**
      * Set whether or not grouping will be used in this format.
+     * This applies to both formatting and parsing.
      *
      * @param newValue {@code true} if grouping is used;
      *                 {@code false} otherwise

From fe806caa160b2d550db273af17dc08270f143819 Mon Sep 17 00:00:00 2001
From: William Kemper <wkemper@openjdk.org>
Date: Tue, 4 Mar 2025 17:11:59 +0000
Subject: [PATCH 220/587] 8350605: assert(!heap->is_uncommit_in_progress())
 failed: Cannot uncommit bitmaps while resetting them

Reviewed-by: kdnilsen, ysr
---
 .../shenandoah/shenandoahUncommitThread.cpp   | 79 +++++++++++--------
 .../shenandoah/shenandoahUncommitThread.hpp   | 14 ++--
 2 files changed, 55 insertions(+), 38 deletions(-)

diff --git a/src/hotspot/share/gc/shenandoah/shenandoahUncommitThread.cpp b/src/hotspot/share/gc/shenandoah/shenandoahUncommitThread.cpp
index 5f9bc7c9b91..ec708b198e7 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahUncommitThread.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahUncommitThread.cpp
@@ -31,8 +31,7 @@
 
 ShenandoahUncommitThread::ShenandoahUncommitThread(ShenandoahHeap* heap)
   : _heap(heap),
-    _stop_lock(Mutex::safepoint - 2, "ShenandoahUncommitStop_lock", true),
-    _uncommit_lock(Mutex::safepoint - 2, "ShenandoahUncommitCancel_lock", true) {
+    _uncommit_lock(Mutex::safepoint - 2, "ShenandoahUncommit_lock", true) {
   set_name("Shenandoah Uncommit Thread");
   create_and_start();
 
@@ -68,11 +67,10 @@ void ShenandoahUncommitThread::run_service() {
         uncommit(shrink_before, shrink_until);
       }
     }
-    {
-      MonitorLocker locker(&_stop_lock, Mutex::_no_safepoint_check_flag);
-      if (!_stop_requested.is_set()) {
-        timed_out = locker.wait(poll_interval);
-      }
+
+    if (!should_terminate()) {
+      MonitorLocker locker(&_uncommit_lock, Mutex::_no_safepoint_check_flag);
+      timed_out = locker.wait(poll_interval);
     }
   }
 }
@@ -104,7 +102,7 @@ bool ShenandoahUncommitThread::has_work(double shrink_before, size_t shrink_unti
 void ShenandoahUncommitThread::notify_soft_max_changed() {
   assert(is_uncommit_allowed(), "Only notify if uncommit is allowed");
   if (_soft_max_changed.try_set()) {
-    MonitorLocker locker(&_stop_lock, Mutex::_no_safepoint_check_flag);
+    MonitorLocker locker(&_uncommit_lock, Mutex::_no_safepoint_check_flag);
     locker.notify_all();
   }
 }
@@ -112,7 +110,7 @@ void ShenandoahUncommitThread::notify_soft_max_changed() {
 void ShenandoahUncommitThread::notify_explicit_gc_requested() {
   assert(is_uncommit_allowed(), "Only notify if uncommit is allowed");
   if (_explicit_gc_requested.try_set()) {
-    MonitorLocker locker(&_stop_lock, Mutex::_no_safepoint_check_flag);
+    MonitorLocker locker(&_uncommit_lock, Mutex::_no_safepoint_check_flag);
     locker.notify_all();
   }
 }
@@ -125,33 +123,64 @@ void ShenandoahUncommitThread::uncommit(double shrink_before, size_t shrink_unti
   assert(ShenandoahUncommit, "should be enabled");
   assert(_uncommit_in_progress.is_unset(), "Uncommit should not be in progress");
 
-  if (!is_uncommit_allowed()) {
+  {
+    // Final check, under the lock, if uncommit is allowed.
+    MonitorLocker locker(&_uncommit_lock, Mutex::_no_safepoint_check_flag);
+    if (is_uncommit_allowed()) {
+      _uncommit_in_progress.set();
+    }
+  }
+
+  // If not allowed to start, do nothing.
+  if (!_uncommit_in_progress.is_set()) {
     return;
   }
 
+  // From here on, uncommit is in progress. Attempts to stop the uncommit must wait
+  // until the cancellation request is acknowledged and uncommit is no longer in progress.
   const char* msg = "Concurrent uncommit";
+  const double start = os::elapsedTime();
   EventMark em("%s", msg);
-  double start = os::elapsedTime();
   log_info(gc, start)("%s", msg);
 
-  _uncommit_in_progress.set();
+  // This is the number of regions uncommitted during this increment of uncommit work.
+  const size_t uncommitted_region_count = do_uncommit_work(shrink_before, shrink_until);
 
+  {
+    MonitorLocker locker(&_uncommit_lock, Mutex::_no_safepoint_check_flag);
+    _uncommit_in_progress.unset();
+    locker.notify_all();
+  }
+
+  if (uncommitted_region_count > 0) {
+    _heap->notify_heap_changed();
+  }
+
+  const double elapsed = os::elapsedTime() - start;
+  log_info(gc)("%s " PROPERFMT " (" PROPERFMT ") %.3fms",
+               msg, PROPERFMTARGS(uncommitted_region_count * ShenandoahHeapRegion::region_size_bytes()), PROPERFMTARGS(_heap->capacity()),
+               elapsed * MILLIUNITS);
+}
+
+size_t ShenandoahUncommitThread::do_uncommit_work(double shrink_before, size_t shrink_until) const {
+  size_t count = 0;
   // Application allocates from the beginning of the heap, and GC allocates at
   // the end of it. It is more efficient to uncommit from the end, so that applications
   // could enjoy the near committed regions. GC allocations are much less frequent,
   // and therefore can accept the committing costs.
-  size_t count = 0;
   for (size_t i = _heap->num_regions(); i > 0; i--) {
     if (!is_uncommit_allowed()) {
+      // GC wants to start, so the uncommit operation must stop
       break;
     }
 
     ShenandoahHeapRegion* r = _heap->get_region(i - 1);
     if (r->is_empty_committed() && (r->empty_time() < shrink_before)) {
       SuspendibleThreadSetJoiner sts_joiner;
-      ShenandoahHeapLocker locker(_heap->lock());
+      ShenandoahHeapLocker heap_locker(_heap->lock());
       if (r->is_empty_committed()) {
         if (_heap->committed() < shrink_until + ShenandoahHeapRegion::region_size_bytes()) {
+          // We have uncommitted enough regions to hit the target heap committed size
           break;
         }
 
@@ -161,26 +190,13 @@ void ShenandoahUncommitThread::uncommit(double shrink_before, size_t shrink_unti
     }
     SpinPause(); // allow allocators to take the lock
   }
-
-  {
-    MonitorLocker locker(&_uncommit_lock, Mutex::_no_safepoint_check_flag);
-    _uncommit_in_progress.unset();
-    locker.notify_all();
-  }
-
-  if (count > 0) {
-    _heap->notify_heap_changed();
-  }
-
-  double elapsed = os::elapsedTime() - start;
-  log_info(gc)("%s " PROPERFMT " (" PROPERFMT ") %.3fms",
-               msg, PROPERFMTARGS(count * ShenandoahHeapRegion::region_size_bytes()), PROPERFMTARGS(_heap->capacity()),
-               elapsed * MILLIUNITS);
+  return count;
 }
 
+
 void ShenandoahUncommitThread::stop_service() {
-  MonitorLocker locker(&_stop_lock, Mutex::_safepoint_check_flag);
-  _stop_requested.set();
+  MonitorLocker locker(&_uncommit_lock, Mutex::_safepoint_check_flag);
+  _uncommit_allowed.unset();
   locker.notify_all();
 }
 
@@ -193,5 +209,6 @@ void ShenandoahUncommitThread::forbid_uncommit() {
 }
 
 void ShenandoahUncommitThread::allow_uncommit() {
+  MonitorLocker locker(&_uncommit_lock, Mutex::_no_safepoint_check_flag);
   _uncommit_allowed.set();
 }
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahUncommitThread.hpp b/src/hotspot/share/gc/shenandoah/shenandoahUncommitThread.hpp
index 6c4e26e4e0f..caffd2ef87b 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahUncommitThread.hpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahUncommitThread.hpp
@@ -38,18 +38,12 @@ class ShenandoahUncommitThread : public ConcurrentGCThread {
   // Indicates that an explicit gc has been requested
   ShenandoahSharedFlag _explicit_gc_requested;
 
-  // Indicates that the thread should stop and terminate
-  ShenandoahSharedFlag _stop_requested;
-
   // Indicates whether it is safe to uncommit regions
   ShenandoahSharedFlag _uncommit_allowed;
 
   // Indicates that regions are being actively uncommitted
   ShenandoahSharedFlag _uncommit_in_progress;
 
-  // This lock is used to coordinate stopping and terminating this thread
-  Monitor _stop_lock;
-
   // This lock is used to coordinate allowing or forbidding regions to be uncommitted
   Monitor _uncommit_lock;
 
@@ -66,6 +60,12 @@ class ShenandoahUncommitThread : public ConcurrentGCThread {
   // True if the control thread has allowed this thread to uncommit regions
   bool is_uncommit_allowed() const;
 
+  // Iterate over and uncommit eligible regions until committed heap falls below
+  // `shrink_until` bytes. A region is eligible for uncommit if the timestamp at which
+  // it was last made empty is before `shrink_before` seconds since jvm start.
+  // Returns the number of regions uncommitted. May be interrupted by `forbid_uncommit`.
+  size_t do_uncommit_work(double shrink_before, size_t shrink_until) const;
+
 public:
   explicit ShenandoahUncommitThread(ShenandoahHeap* heap);
 
@@ -85,7 +85,7 @@ public:
   void allow_uncommit();
 
   // True if uncommit is in progress
-  bool is_uncommit_in_progress() {
+  bool is_uncommit_in_progress() const {
     return _uncommit_in_progress.is_set();
   }
 protected:

From 55987925fd8ba5d7782934194141fe425a9041be Mon Sep 17 00:00:00 2001
From: Erik Gahlin <egahlin@openjdk.org>
Date: Tue, 4 Mar 2025 17:39:55 +0000
Subject: [PATCH 221/587] 8351064: JFR: Consistent timestamps

Reviewed-by: mgronlun
---
 .../classes/jdk/jfr/internal/consumer/ChunkParser.java      | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/consumer/ChunkParser.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/consumer/ChunkParser.java
index e664f2c728b..67143ee1265 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/consumer/ChunkParser.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/consumer/ChunkParser.java
@@ -127,7 +127,11 @@ public final class ChunkParser {
             this.configuration = previous.configuration;
         }
         this.metadata = header.readMetadata(previousMetadata);
-        this.timeConverter = new TimeConverter(chunkHeader, metadata.getGMTOffset() + metadata.getDST());
+        if (previous == null) {
+            this.timeConverter = new TimeConverter(chunkHeader, metadata.getGMTOffset() + metadata.getDST());
+        } else {
+            this.timeConverter = previous.timeConverter;
+        }
         if (metadata != previousMetadata) {
             ParserFactory factory = new ParserFactory(metadata, constantLookups, timeConverter);
             parsers = factory.getParsers();

From 0753376b0c3d0d98e3db14d26020b23822176557 Mon Sep 17 00:00:00 2001
From: Weijun Wang <weijun@openjdk.org>
Date: Tue, 4 Mar 2025 19:32:33 +0000
Subject: [PATCH 222/587] 8297531: sun/security/krb5/MicroTime.java fails with
 "Exception: What? only 100 musec precision?"

Reviewed-by: mullan, abarashev
---
 test/jdk/sun/security/krb5/MicroTime.java | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/test/jdk/sun/security/krb5/MicroTime.java b/test/jdk/sun/security/krb5/MicroTime.java
index 8b6b9232415..84a88cedf83 100644
--- a/test/jdk/sun/security/krb5/MicroTime.java
+++ b/test/jdk/sun/security/krb5/MicroTime.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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,9 +44,10 @@ public class MicroTime {
                 count++;
             }
         }
-        // We believe a nice KerberosTime can at least tell the
-        // difference of 100 musec.
-        if (count < 10000) {
+        // Before JDK-6882687, KerberosTime was measured in milliseconds.
+        // Now it's in microseconds. We should be able to record more than
+        // 1000 distinct KerberosTime values within one second.
+        if (count < 1001) {
             throw new Exception("What? only " + (1000000/count) +
                     " musec precision?");
         }

From a21302bb3244b85dd9809c42d1c0fd502bd677cc Mon Sep 17 00:00:00 2001
From: Doug Simon <dnsimon@openjdk.org>
Date: Tue, 4 Mar 2025 20:10:57 +0000
Subject: [PATCH 223/587] 8351036: [JVMCI] value not an s2: -32776

Reviewed-by: yzheng, dlong
---
 .../share/jvmci/jvmciCodeInstaller.cpp        | 11 +++++--
 .../share/jvmci/jvmciCodeInstaller.hpp        |  4 +++
 src/hotspot/share/jvmci/vmStructs_jvmci.cpp   |  4 +++
 .../ci/hotspot/HotSpotCompiledCodeStream.java | 33 +++++++++++++++----
 4 files changed, 44 insertions(+), 8 deletions(-)

diff --git a/src/hotspot/share/jvmci/jvmciCodeInstaller.cpp b/src/hotspot/share/jvmci/jvmciCodeInstaller.cpp
index 1732719d64c..79aaacec809 100644
--- a/src/hotspot/share/jvmci/jvmciCodeInstaller.cpp
+++ b/src/hotspot/share/jvmci/jvmciCodeInstaller.cpp
@@ -388,6 +388,7 @@ Handle CodeInstaller::read_oop(HotSpotCompiledCodeStream* stream, u1 tag, JVMCI_
 
 ScopeValue* CodeInstaller::get_scope_value(HotSpotCompiledCodeStream* stream, u1 tag, BasicType type, ScopeValue* &second, JVMCI_TRAPS) {
   second = nullptr;
+  bool stack_slot_is_s2 = true;
   switch (tag) {
     case ILLEGAL: {
       if (type != T_ILLEGAL) {
@@ -436,11 +437,17 @@ ScopeValue* CodeInstaller::get_scope_value(HotSpotCompiledCodeStream* stream, u1
         return value;
       }
     }
+    case STACK_SLOT4_PRIMITIVE:
+    case STACK_SLOT4_NARROW_OOP:
+    case STACK_SLOT4_OOP:
+    case STACK_SLOT4_VECTOR:
+      stack_slot_is_s2 = false;
+      // fall through
     case STACK_SLOT_PRIMITIVE:
     case STACK_SLOT_NARROW_OOP:
     case STACK_SLOT_OOP:
     case STACK_SLOT_VECTOR: {
-      jint offset = (jshort) stream->read_s2("offset");
+      jint offset = stack_slot_is_s2 ? (jshort) stream->read_s2("offset") : stream->read_s4("offset4");
       if (stream->read_bool("addRawFrameSize")) {
         offset += _total_frame_size;
       }
@@ -854,7 +861,7 @@ void CodeInstaller::initialize_fields(HotSpotCompiledCodeStream* stream, u1 code
   if (!is_set(code_flags, HCC_HAS_DEOPT_RESCUE_SLOT)) {
     _orig_pc_offset = -1;
   } else {
-    _orig_pc_offset = stream->read_s2("offset");
+    _orig_pc_offset = stream->read_s4("offset");
     if (stream->read_bool("addRawFrameSize")) {
       _orig_pc_offset += _total_frame_size;
     }
diff --git a/src/hotspot/share/jvmci/jvmciCodeInstaller.hpp b/src/hotspot/share/jvmci/jvmciCodeInstaller.hpp
index b493c48e348..a8279e99dc2 100644
--- a/src/hotspot/share/jvmci/jvmciCodeInstaller.hpp
+++ b/src/hotspot/share/jvmci/jvmciCodeInstaller.hpp
@@ -207,6 +207,10 @@ private:
     STACK_SLOT_OOP,
     STACK_SLOT_NARROW_OOP,
     STACK_SLOT_VECTOR,
+    STACK_SLOT4_PRIMITIVE,
+    STACK_SLOT4_OOP,
+    STACK_SLOT4_NARROW_OOP,
+    STACK_SLOT4_VECTOR,
     VIRTUAL_OBJECT_ID,
     VIRTUAL_OBJECT_ID2,
     NULL_CONSTANT,
diff --git a/src/hotspot/share/jvmci/vmStructs_jvmci.cpp b/src/hotspot/share/jvmci/vmStructs_jvmci.cpp
index 7567caad712..e574fa780f4 100644
--- a/src/hotspot/share/jvmci/vmStructs_jvmci.cpp
+++ b/src/hotspot/share/jvmci/vmStructs_jvmci.cpp
@@ -585,6 +585,10 @@
   declare_constant(CodeInstaller::STACK_SLOT_OOP)                         \
   declare_constant(CodeInstaller::STACK_SLOT_NARROW_OOP)                  \
   declare_constant(CodeInstaller::STACK_SLOT_VECTOR)                      \
+  declare_constant(CodeInstaller::STACK_SLOT4_PRIMITIVE)                  \
+  declare_constant(CodeInstaller::STACK_SLOT4_OOP)                        \
+  declare_constant(CodeInstaller::STACK_SLOT4_NARROW_OOP)                 \
+  declare_constant(CodeInstaller::STACK_SLOT4_VECTOR)                     \
   declare_constant(CodeInstaller::VIRTUAL_OBJECT_ID)                      \
   declare_constant(CodeInstaller::VIRTUAL_OBJECT_ID2)                     \
   declare_constant(CodeInstaller::NULL_CONSTANT)                          \
diff --git a/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/HotSpotCompiledCodeStream.java b/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/HotSpotCompiledCodeStream.java
index 49dfdcea5a2..2cd5e839ee8 100644
--- a/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/HotSpotCompiledCodeStream.java
+++ b/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/HotSpotCompiledCodeStream.java
@@ -63,6 +63,10 @@ import static jdk.vm.ci.hotspot.HotSpotCompiledCodeStream.Tag.STACK_SLOT_NARROW_
 import static jdk.vm.ci.hotspot.HotSpotCompiledCodeStream.Tag.STACK_SLOT_OOP;
 import static jdk.vm.ci.hotspot.HotSpotCompiledCodeStream.Tag.STACK_SLOT_PRIMITIVE;
 import static jdk.vm.ci.hotspot.HotSpotCompiledCodeStream.Tag.STACK_SLOT_VECTOR;
+import static jdk.vm.ci.hotspot.HotSpotCompiledCodeStream.Tag.STACK_SLOT4_NARROW_OOP;
+import static jdk.vm.ci.hotspot.HotSpotCompiledCodeStream.Tag.STACK_SLOT4_OOP;
+import static jdk.vm.ci.hotspot.HotSpotCompiledCodeStream.Tag.STACK_SLOT4_PRIMITIVE;
+import static jdk.vm.ci.hotspot.HotSpotCompiledCodeStream.Tag.STACK_SLOT4_VECTOR;
 import static jdk.vm.ci.hotspot.HotSpotCompiledCodeStream.Tag.VIRTUAL_OBJECT_ID;
 import static jdk.vm.ci.hotspot.HotSpotCompiledCodeStream.Tag.VIRTUAL_OBJECT_ID2;
 
@@ -178,6 +182,10 @@ final class HotSpotCompiledCodeStream implements AutoCloseable {
         STACK_SLOT_OOP,
         STACK_SLOT_NARROW_OOP,
         STACK_SLOT_VECTOR,
+        STACK_SLOT4_PRIMITIVE,
+        STACK_SLOT4_OOP,
+        STACK_SLOT4_NARROW_OOP,
+        STACK_SLOT4_VECTOR,
         VIRTUAL_OBJECT_ID,
         VIRTUAL_OBJECT_ID2,
         NULL_CONSTANT,
@@ -457,8 +465,12 @@ final class HotSpotCompiledCodeStream implements AutoCloseable {
         rawWriteU2(name, value);
     }
 
+    private static boolean isS2(int value) {
+        return value >= Short.MIN_VALUE && value <= Short.MAX_VALUE;
+    }
+
     private void writeS2(String name, int value) {
-        if (value < Short.MIN_VALUE || value > Short.MAX_VALUE) {
+        if (!isS2(value)) {
             throw error("value not an s2: " + value);
         }
         rawWriteU2(name, value);
@@ -581,7 +593,8 @@ final class HotSpotCompiledCodeStream implements AutoCloseable {
         writeInt("targetCodeSize", code.targetCodeSize);
         writeInt("totalFrameSize", code.totalFrameSize);
         if (isSet(flags, HAS_DEOPT_RESCUE_SLOT)) {
-            writeS2("offset", deoptRescueSlot.getRawOffset());
+            int offset = deoptRescueSlot.getRawOffset();
+            writeInt("offset", offset);
             writeBoolean("addRawFrameSize", deoptRescueSlot.getRawAddFrameSize());
         }
         writeInt("dataSectionSize", code.dataSection.length);
@@ -1063,17 +1076,25 @@ final class HotSpotCompiledCodeStream implements AutoCloseable {
         } else if (value instanceof StackSlot) {
             StackSlot slot = (StackSlot) value;
             Tag tag;
+            int offset = slot.getRawOffset();
+            boolean s2 = isS2(offset);
             if (kind == JavaKind.Object) {
                 if (isVector(slot)) {
-                    tag = STACK_SLOT_VECTOR;
+                    tag = s2 ? STACK_SLOT_VECTOR : STACK_SLOT4_VECTOR;
+                } else if (isNarrowOop(slot)) {
+                    tag = s2 ? STACK_SLOT_NARROW_OOP : STACK_SLOT4_NARROW_OOP;
                 } else {
-                    tag = isNarrowOop(slot) ? STACK_SLOT_NARROW_OOP : STACK_SLOT_OOP;
+                    tag = s2 ? STACK_SLOT_OOP : STACK_SLOT4_OOP;
                 }
             } else {
-                tag = STACK_SLOT_PRIMITIVE;
+                tag = s2 ? STACK_SLOT_PRIMITIVE : STACK_SLOT4_PRIMITIVE;
             }
             writeTag(tag);
-            writeS2("offset", slot.getRawOffset());
+            if (s2) {
+                writeS2("offset", slot.getRawOffset());
+            } else {
+                writeInt("offset4", slot.getRawOffset());
+            }
             writeBoolean("addRawFrameSize", slot.getRawAddFrameSize());
         } else if (value instanceof VirtualObject) {
             VirtualObject vo = (VirtualObject) value;

From 3e86b3a879c7a425e7c689142cb1f0fdd4f679ed Mon Sep 17 00:00:00 2001
From: Alexey Semenyuk <asemenyuk@openjdk.org>
Date: Tue, 4 Mar 2025 20:30:52 +0000
Subject: [PATCH 224/587] 8350013: Add a test for JDK-8150442

Reviewed-by: almatvee
---
 .../jdk/jpackage/test/PackageTestTest.java    | 894 ++++++++++++++++++
 .../jdk/jpackage/test/JPackageCommand.java    |  19 +
 .../jdk/jpackage/test/LinuxHelper.java        |  99 +-
 .../helpers/jdk/jpackage/test/MacHelper.java  | 178 ++--
 .../jdk/jpackage/test/PackageTest.java        | 603 +++++++-----
 .../jdk/jpackage/test/WindowsHelper.java      | 298 +++---
 .../jpackage/resources/fail-os-condition.wxf  |  32 +
 .../jpackage/windows/WinOSConditionTest.java  |  77 ++
 8 files changed, 1719 insertions(+), 481 deletions(-)
 create mode 100644 test/jdk/tools/jpackage/helpers-test/jdk/jpackage/test/PackageTestTest.java
 create mode 100644 test/jdk/tools/jpackage/resources/fail-os-condition.wxf
 create mode 100644 test/jdk/tools/jpackage/windows/WinOSConditionTest.java

diff --git a/test/jdk/tools/jpackage/helpers-test/jdk/jpackage/test/PackageTestTest.java b/test/jdk/tools/jpackage/helpers-test/jdk/jpackage/test/PackageTestTest.java
new file mode 100644
index 00000000000..433db6fc6f6
--- /dev/null
+++ b/test/jdk/tools/jpackage/helpers-test/jdk/jpackage/test/PackageTestTest.java
@@ -0,0 +1,894 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please 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.IOException;
+import java.io.UncheckedIOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.Set;
+import java.util.function.BiFunction;
+import java.util.function.Consumer;
+import java.util.function.Function;
+import java.util.function.Supplier;
+import jdk.jpackage.internal.util.function.ThrowingBiConsumer;
+import jdk.jpackage.internal.util.function.ThrowingConsumer;
+import jdk.jpackage.internal.util.function.ThrowingRunnable;
+import jdk.jpackage.test.Annotations.Parameter;
+import jdk.jpackage.test.Annotations.ParameterSupplier;
+import jdk.jpackage.test.Annotations.Test;
+import jdk.jpackage.test.PackageTest.PackageHandlers;
+import jdk.jpackage.test.RunnablePackageTest.Action;
+
+public class PackageTestTest extends JUnitAdapter {
+
+    private interface Verifiable {
+        void verify();
+    }
+
+    private static class CallbackFactory {
+
+        CallbackFactory(int tickCount) {
+            this.tickCount = tickCount;
+        }
+
+        CountingInstaller createInstaller(int exitCode) {
+            return new CountingInstaller(tickCount, exitCode);
+        }
+
+        CountingConsumer createUninstaller() {
+            return new CountingConsumer(tickCount, "uninstall");
+        }
+
+        CountingUnpacker createUnpacker() {
+            return new CountingUnpacker(tickCount);
+        }
+
+        CountingConsumer createInitializer() {
+            return new CountingConsumer(tickCount, "init");
+        }
+
+        CountingRunnable createRunOnceInitializer() {
+            return new CountingRunnable(tickCount, "once-init");
+        }
+
+        CountingConsumer createInstallVerifier() {
+            return new CountingConsumer(tickCount, "on-install");
+        }
+
+        CountingConsumer createUninstallVerifier() {
+            return new CountingConsumer(tickCount, "on-uninstall");
+        }
+
+        CountingConsumer createBundleVerifier() {
+            return new CountingConsumer(tickCount, "on-bundle");
+        }
+
+        CountingBundleVerifier createBundleVerifier(int jpackageExitCode) {
+            return new CountingBundleVerifier(tickCount, jpackageExitCode);
+        }
+
+        private final int tickCount;
+    }
+
+    private final static int ERROR_EXIT_CODE_JPACKAGE = 35;
+    private final static int ERROR_EXIT_CODE_INSTALL = 27;
+
+    private final static CallbackFactory NEVER = new CallbackFactory(0);
+    private final static CallbackFactory ONCE = new CallbackFactory(1);
+    private final static CallbackFactory TWICE = new CallbackFactory(2);
+
+    enum BundleVerifier {
+        ONCE_SUCCESS(ONCE),
+        ONCE_FAIL(ONCE),
+        NEVER(PackageTestTest.NEVER),
+        ONCE_SUCCESS_EXIT_CODE(ONCE, 0),
+        ONCE_FAIL_EXIT_CODE(ONCE, ERROR_EXIT_CODE_JPACKAGE),
+        NEVER_EXIT_CODE(PackageTestTest.NEVER, 0);
+
+        BundleVerifier(CallbackFactory factory) {
+            specSupplier = () -> new BundleVerifierSpec(Optional.of(factory.createBundleVerifier()), Optional.empty());
+        }
+
+        BundleVerifier(CallbackFactory factory, int jpackageExitCode) {
+            specSupplier = () -> new BundleVerifierSpec(Optional.empty(),
+                    Optional.of(factory.createBundleVerifier(jpackageExitCode)));
+        }
+
+        BundleVerifierSpec spec() {
+            return specSupplier.get();
+        }
+
+        private final Supplier<BundleVerifierSpec> specSupplier;
+    }
+
+    private static class TickCounter implements Verifiable {
+
+        TickCounter(int expectedTicks) {
+            this.expectedTicks = expectedTicks;
+        }
+
+        void tick() {
+            ticks++;
+        }
+
+        @Override
+        public void verify() {
+            switch (expectedTicks) {
+                case 0 -> {
+                    TKit.assertEquals(expectedTicks, ticks, String.format("%s: never called", this));
+                }
+                case 1 -> {
+                    TKit.assertEquals(expectedTicks, ticks, String.format("%s: called once", this));
+                }
+                case 2 -> {
+                    TKit.assertEquals(expectedTicks, ticks, String.format("%s: called twice", this));
+                }
+                default -> {
+                    TKit.assertEquals(expectedTicks, ticks, toString());
+                }
+            }
+        }
+
+        protected int tickCount() {
+            return ticks;
+        }
+
+        protected static String getDescription(TickCounter o) {
+            return "tk=" + o.expectedTicks;
+        }
+
+        private int ticks;
+        protected final int expectedTicks;
+    }
+
+    private static class CountingConsumer extends TickCounter implements ThrowingConsumer<JPackageCommand> {
+
+        @Override
+        public void accept(JPackageCommand cmd) {
+            tick();
+        }
+
+        @Override
+        public String toString() {
+            return String.format("%s(%s)", label, TickCounter.getDescription(this));
+        }
+
+        CountingConsumer(int expectedTicks, String label) {
+            super(expectedTicks);
+            this.label = Objects.requireNonNull(label);
+        }
+
+        private final String label;
+    }
+
+    private static class CountingRunnable extends TickCounter implements ThrowingRunnable {
+
+        @Override
+        public void run() {
+            tick();
+        }
+
+        @Override
+        public String toString() {
+            return String.format("%s(%s)", label, TickCounter.getDescription(this));
+        }
+
+        CountingRunnable(int expectedTicks, String label) {
+            super(expectedTicks);
+            this.label = Objects.requireNonNull(label);
+        }
+
+        private final String label;
+    }
+
+    private static class CountingBundleVerifier extends TickCounter implements ThrowingBiConsumer<JPackageCommand, Executor.Result> {
+
+        @Override
+        public void accept(JPackageCommand cmd, Executor.Result result) {
+            tick();
+            jpackageExitCode = result.exitCode();
+        }
+
+        @Override
+        public void verify() {
+            super.verify();
+            if (expectedTicks > 0) {
+                TKit.assertEquals(expectedJPackageExitCode, jpackageExitCode, String.format("%s: run jpackage", this));
+            }
+        }
+
+        @Override
+        public String toString() {
+            return String.format("on-bundle-ex(exit=%d, %s)", expectedJPackageExitCode, TickCounter.getDescription(this));
+        }
+
+        CountingBundleVerifier(int expectedTicks, int expectedJPackageExitCode) {
+            super(expectedTicks);
+            this.expectedJPackageExitCode = expectedJPackageExitCode;
+        }
+
+        private int jpackageExitCode;
+        private final int expectedJPackageExitCode;
+    }
+
+    private final static class CountingInstaller extends TickCounter implements Function<JPackageCommand, Integer> {
+
+        @Override
+        public Integer apply(JPackageCommand cmd) {
+            tick();
+            return exitCode;
+        }
+
+        @Override
+        public String toString() {
+            return String.format("install(exit=%d, %s)", exitCode, TickCounter.getDescription(this));
+        }
+
+        CountingInstaller(int expectedTicks, int exitCode) {
+            super(expectedTicks);
+            this.exitCode = exitCode;
+        }
+
+        private final int exitCode;
+    }
+
+    private static class CountingUnpacker extends TickCounter implements BiFunction<JPackageCommand, Path, Path> {
+
+        @Override
+        public Path apply(JPackageCommand cmd, Path path) {
+            tick();
+            try {
+                Files.createDirectories(path.resolve("mockup-installdir"));
+            } catch (IOException ex) {
+                throw new UncheckedIOException(ex);
+            }
+            unpackPaths.add(path);
+            return path;
+        }
+
+        @Override
+        public String toString() {
+            return String.format("unpack(%s)", TickCounter.getDescription(this));
+        }
+
+        CountingUnpacker(int expectedTicks) {
+            super(expectedTicks);
+        }
+
+        List<Path> unpackPaths() {
+            return unpackPaths;
+        }
+
+        private final List<Path> unpackPaths = new ArrayList<>();
+    }
+
+    record BundleVerifierSpec(Optional<CountingConsumer> verifier, Optional<CountingBundleVerifier> verifierWithExitCode) {
+        BundleVerifierSpec {
+            if (verifier.isPresent() == verifierWithExitCode.isPresent()) {
+                throw new IllegalArgumentException();
+            }
+        }
+
+        Verifiable apply(PackageTest test) {
+            verifier.ifPresent(test::addBundleVerifier);
+            verifierWithExitCode.ifPresent(test::addBundleVerifier);
+            return verifier.map(Verifiable.class::cast).orElseGet(verifierWithExitCode::orElseThrow);
+        }
+
+        @Override
+        public String toString() {
+            return verifier.map(Verifiable.class::cast).orElseGet(verifierWithExitCode::orElseThrow).toString();
+        }
+    }
+
+    record PackageHandlersSpec(CountingInstaller installer, CountingConsumer uninstaller,
+            Optional<CountingUnpacker> unpacker, int installExitCode) {
+
+        PackageHandlers createPackageHandlers(Consumer<Verifiable> verifiableAccumulator) {
+            List.of(installer, uninstaller).forEach(verifiableAccumulator::accept);
+            unpacker.ifPresent(verifiableAccumulator::accept);
+            return new PackageHandlers(installer, uninstaller::accept, unpacker);
+        }
+    }
+
+    record TestSpec(PackageType type, PackageHandlersSpec handlersSpec,
+            List<CountingConsumer> initializers, List<BundleVerifierSpec> bundleVerifierSpecs,
+            List<CountingConsumer> installVerifiers, List<CountingConsumer> uninstallVerifiers,
+            int expectedJPackageExitCode, int actualJPackageExitCode, List<Action> actions) {
+
+        PackageTest createTest(Consumer<Verifiable> verifiableAccumulator) {
+            return createTest(handlersSpec.createPackageHandlers(verifiableAccumulator));
+        }
+
+        PackageTest createTest(PackageHandlers handlers) {
+            return new PackageTest().jpackageFactory(() -> {
+                return new JPackageCommand() {
+                    @Override
+                    public Path outputBundle() {
+                        return outputDir().resolve("mockup-bundle" + super.packageType().getSuffix());
+                    }
+
+                    @Override
+                    public PackageType packageType() {
+                        return null;
+                    }
+
+                    @Override
+                    JPackageCommand assertAppLayout() {
+                        return this;
+                    }
+
+                    @Override
+                    JPackageCommand createImmutableCopy() {
+                        return this;
+                    }
+
+                    @Override
+                    public void verifyIsOfType(PackageType ... types) {
+                    }
+
+                    @Override
+                    public String getPrintableCommandLine() {
+                        return "'mockup jpackage'";
+                    }
+
+                    @Override
+                    public Executor.Result execute(int expectedExitCode) {
+                        final var outputBundle = outputBundle();
+                        try {
+                            Files.createDirectories(outputBundle.getParent());
+                            if (actualJPackageExitCode == 0) {
+                                Files.createFile(outputBundle);
+                            }
+                        } catch (IOException ex) {
+                            throw new UncheckedIOException(ex);
+                        }
+                        return new Executor.Result(actualJPackageExitCode, null,
+                                this::getPrintableCommandLine).assertExitCodeIs(expectedExitCode);
+                    }
+                };
+            }).setExpectedExitCode(expectedJPackageExitCode)
+                    .setExpectedInstallExitCode(handlersSpec.installExitCode)
+                    .isPackageTypeSupported(type -> true)
+                    .forTypes().packageHandlers(handlers);
+        }
+
+        void configureInitializers(PackageTest test, Consumer<Verifiable> verifiableAccumulator) {
+            for (final var initializer : initializers) {
+                verifiableAccumulator.accept(initializer);
+                test.addInitializer(initializer);
+            }
+        }
+
+        void configureBundleVerifiers(PackageTest test, Consumer<Verifiable> verifiableAccumulator) {
+            for (final var verifierSpec : bundleVerifierSpecs) {
+                verifiableAccumulator.accept(verifierSpec.apply(test));
+            }
+        }
+
+        void configureInstallVerifiers(PackageTest test, Consumer<Verifiable> verifiableAccumulator) {
+            for (final var verifier : installVerifiers) {
+                verifiableAccumulator.accept(verifier);
+                test.addInstallVerifier(verifier);
+            }
+        }
+
+        void configureUninstallVerifiers(PackageTest test, Consumer<Verifiable> verifiableAccumulator) {
+            for (final var verifier : uninstallVerifiers) {
+                verifiableAccumulator.accept(verifier);
+                test.addUninstallVerifier(verifier);
+            }
+        }
+
+        void run(PackageTest test) {
+            final boolean expectedSuccess = (expectedJPackageExitCode == actualJPackageExitCode);
+
+            TKit.assertAssert(expectedSuccess, () -> {
+                test.run(actions.toArray(Action[]::new));
+            });
+        }
+
+        List<Verifiable> run() {
+            return run(Optional.empty());
+        }
+
+        List<Verifiable> run(Consumer<PackageTest> customConfigure) {
+            return run(Optional.of(customConfigure));
+        }
+
+        private List<Verifiable> run(Optional<Consumer<PackageTest>> customConfigure) {
+            final List<Verifiable> verifiers = new ArrayList<>();
+
+            final var test = createTest(verifiers::add);
+            test.forTypes(type);
+            configureInitializers(test, verifiers::add);
+            configureBundleVerifiers(test, verifiers::add);
+            configureInstallVerifiers(test, verifiers::add);
+            configureUninstallVerifiers(test, verifiers::add);
+            customConfigure.ifPresent(callback -> callback.accept(test));
+            run(test);
+            verifiers.forEach(Verifiable::verify);
+            return verifiers;
+        }
+    }
+
+    private final static class TestSpecBuilder {
+
+        TestSpecBuilder type(PackageType v) {
+            type = Objects.requireNonNull(v);
+            return this;
+        }
+
+        TestSpecBuilder install(CallbackFactory v) {
+            install = Objects.requireNonNull(v);
+            return this;
+        }
+
+        TestSpecBuilder uninstall(CallbackFactory v) {
+            uninstall = Objects.requireNonNull(v);
+            return this;
+        }
+
+        TestSpecBuilder unpack(CallbackFactory v) {
+            unpack = v;
+            return this;
+        }
+
+        TestSpecBuilder installExitCode(int v) {
+            installExitCode = v;
+            return this;
+        }
+
+        TestSpecBuilder jpackageExitCode(int v) {
+            return expectedJPackageExitCode(v).actualJPackageExitCode(v);
+        }
+
+        TestSpecBuilder expectedJPackageExitCode(int v) {
+            expectedJPackageExitCode = v;
+            return this;
+        }
+
+        TestSpecBuilder actualJPackageExitCode(int v) {
+            actualJPackageExitCode = v;
+            return this;
+        }
+
+        TestSpecBuilder addActions(Action... v) {
+            actions.addAll(List.of(v));
+            return this;
+        }
+
+        TestSpecBuilder actions(Action... v) {
+            actions.clear();
+            return addActions(v);
+        }
+
+        TestSpecBuilder doCreateAndUnpack() {
+            actions(Action.CREATE_AND_UNPACK);
+            install(NEVER);
+            uninstall(NEVER);
+            if (willHaveBundle()) {
+                overrideNonNullUnpack(ONCE);
+            } else {
+                overrideNonNullUnpack(NEVER);
+            }
+            initializers(ONCE);
+            if (expectedJPackageExitCode != actualJPackageExitCode) {
+                bundleVerifiers(BundleVerifier.NEVER.spec());
+            } else if (expectedJPackageExitCode == 0) {
+                bundleVerifiers(BundleVerifier.ONCE_SUCCESS.spec());
+                bundleVerifiers(BundleVerifier.ONCE_SUCCESS_EXIT_CODE.spec());
+            } else {
+                bundleVerifiers(BundleVerifier.ONCE_FAIL.spec());
+                if (expectedJPackageExitCode == ERROR_EXIT_CODE_JPACKAGE) {
+                    bundleVerifiers(BundleVerifier.ONCE_FAIL_EXIT_CODE.spec());
+                }
+            }
+            uninstallVerifiers(NEVER);
+            if (willVerifyUnpack()) {
+                installVerifiers(ONCE);
+            } else {
+                installVerifiers(NEVER);
+            }
+            return this;
+        }
+
+        TestSpecBuilder doCreateUnpackInstallUninstall() {
+            actions(Action.CREATE, Action.UNPACK, Action.VERIFY_INSTALL, Action.INSTALL,
+                    Action.VERIFY_INSTALL, Action.UNINSTALL, Action.VERIFY_UNINSTALL);
+            initializers(ONCE);
+            uninstallVerifiers(NEVER);
+            if (willHaveBundle()) {
+                overrideNonNullUnpack(ONCE);
+                install(ONCE);
+                if (installExitCode == 0) {
+                    uninstall(ONCE);
+                    uninstallVerifiers(ONCE);
+                } else {
+                    uninstall(NEVER);
+                }
+            } else {
+                overrideNonNullUnpack(NEVER);
+                install(NEVER);
+                uninstall(NEVER);
+            }
+
+            if (expectedJPackageExitCode != actualJPackageExitCode) {
+                bundleVerifiers(BundleVerifier.NEVER.spec());
+                installVerifiers(NEVER);
+            } else if (expectedJPackageExitCode == 0) {
+                bundleVerifiers(BundleVerifier.ONCE_SUCCESS.spec());
+                bundleVerifiers(BundleVerifier.ONCE_SUCCESS_EXIT_CODE.spec());
+                if (installExitCode == 0) {
+                    if (willVerifyUnpack()) {
+                        installVerifiers(TWICE);
+                    } else {
+                        installVerifiers(ONCE);
+                    }
+                } else {
+                    if (willVerifyUnpack()) {
+                        installVerifiers(ONCE);
+                    } else {
+                        installVerifiers(NEVER);
+                    }
+                }
+            } else {
+                bundleVerifiers(BundleVerifier.ONCE_FAIL.spec());
+                if (expectedJPackageExitCode == ERROR_EXIT_CODE_JPACKAGE) {
+                    bundleVerifiers(BundleVerifier.ONCE_FAIL_EXIT_CODE.spec());
+                }
+                installVerifiers(NEVER);
+            }
+            return this;
+        }
+
+        TestSpecBuilder addInitializers(CallbackFactory... v) {
+            initializers.addAll(List.of(v));
+            return this;
+        }
+
+        TestSpecBuilder addBundleVerifiers(BundleVerifierSpec... v) {
+            bundleVerifiers.addAll(List.of(v));
+            return this;
+        }
+
+        TestSpecBuilder addInstallVerifiers(CallbackFactory... v) {
+            installVerifiers.addAll(List.of(v));
+            return this;
+        }
+
+        TestSpecBuilder addUninstallVerifiers(CallbackFactory... v) {
+            uninstallVerifiers.addAll(List.of(v));
+            return this;
+        }
+
+        TestSpecBuilder initializers(CallbackFactory... v) {
+            initializers.clear();
+            return addInitializers(v);
+        }
+
+        TestSpecBuilder bundleVerifiers(BundleVerifierSpec... v) {
+            bundleVerifiers.clear();
+            return addBundleVerifiers(v);
+        }
+
+        TestSpecBuilder installVerifiers(CallbackFactory... v) {
+            installVerifiers.clear();
+            return addInstallVerifiers(v);
+        }
+
+        TestSpecBuilder uninstallVerifiers(CallbackFactory... v) {
+            uninstallVerifiers.clear();
+            return addUninstallVerifiers(v);
+        }
+
+        TestSpec create() {
+            final var handlersSpec = new PackageHandlersSpec(
+                    install.createInstaller(installExitCode), uninstall.createUninstaller(),
+                    Optional.ofNullable(unpack).map(CallbackFactory::createUnpacker), installExitCode);
+            return new TestSpec(type, handlersSpec,
+                    initializers.stream().map(CallbackFactory::createInitializer).toList(),
+                    bundleVerifiers,
+                    installVerifiers.stream().map(CallbackFactory::createInstallVerifier).toList(),
+                    uninstallVerifiers.stream().map(CallbackFactory::createUninstallVerifier).toList(),
+                    expectedJPackageExitCode,
+                    actualJPackageExitCode, actions);
+        }
+
+        boolean willVerifyCreate() {
+            return actions.contains(Action.CREATE) && actualJPackageExitCode == 0 && expectedJPackageExitCode == actualJPackageExitCode;
+        }
+
+        boolean willHaveBundle() {
+            return !actions.contains(Action.CREATE) || willVerifyCreate();
+        }
+
+        boolean willVerifyUnpack() {
+            return actions.contains(Action.UNPACK) && willHaveBundle() && unpack != null;
+        }
+
+        boolean willVerifyInstall() {
+            return (actions.contains(Action.INSTALL) && installExitCode == 0) && willHaveBundle();
+        }
+
+        private void overrideNonNullUnpack(CallbackFactory v) {
+            if (unpack != null) {
+                unpack(v);
+            }
+        }
+
+        private PackageType type = PackageType.LINUX_RPM;
+        private CallbackFactory install = NEVER;
+        private CallbackFactory uninstall = NEVER;
+        private CallbackFactory unpack = NEVER;
+        private int installExitCode;
+        private final List<CallbackFactory> initializers = new ArrayList<>();
+        private final List<BundleVerifierSpec> bundleVerifiers = new ArrayList<>();
+        private final List<CallbackFactory> installVerifiers = new ArrayList<>();
+        private final List<CallbackFactory> uninstallVerifiers = new ArrayList<>();
+        private int expectedJPackageExitCode;
+        private int actualJPackageExitCode;
+        private final List<Action> actions = new ArrayList<>();
+    }
+
+    @Test
+    @ParameterSupplier
+    public void test(TestSpec spec) {
+        spec.run();
+    }
+
+    public static List<Object[]> test() {
+        List<TestSpec> data = new ArrayList<>();
+
+        for (boolean withUnpack : List.of(false, true)) {
+            for (int actualJPackageExitCode : List.of(0, 1, ERROR_EXIT_CODE_INSTALL)) {
+                for (int expectedJPackageExitCode : List.of(0, 1, ERROR_EXIT_CODE_INSTALL)) {
+                    data.add(new TestSpecBuilder()
+                            .unpack(withUnpack ? ONCE : null)
+                            .actualJPackageExitCode(actualJPackageExitCode)
+                            .expectedJPackageExitCode(expectedJPackageExitCode)
+                            .doCreateAndUnpack().create());
+                }
+            }
+        }
+
+        for (boolean withUnpack : List.of(false, true)) {
+            for (int installExitCode : List.of(0, 1, ERROR_EXIT_CODE_INSTALL)) {
+                for (int actualJPackageExitCode : List.of(0, 1, ERROR_EXIT_CODE_JPACKAGE)) {
+                    for (int expectedJPackageExitCode : List.of(0, 1, ERROR_EXIT_CODE_JPACKAGE)) {
+                        data.add(new TestSpecBuilder()
+                                .unpack(withUnpack ? ONCE : null)
+                                .installExitCode(installExitCode)
+                                .actualJPackageExitCode(actualJPackageExitCode)
+                                .expectedJPackageExitCode(expectedJPackageExitCode)
+                                .doCreateUnpackInstallUninstall().create());
+                    }
+                }
+            }
+        }
+
+        data.add(new TestSpecBuilder()
+                .actions(Action.VERIFY_INSTALL, Action.UNINSTALL, Action.VERIFY_INSTALL, Action.VERIFY_UNINSTALL)
+                .uninstall(ONCE)
+                .initializers(ONCE)
+                .bundleVerifiers(BundleVerifier.NEVER.spec())
+                .installVerifiers(TWICE)
+                .uninstallVerifiers(ONCE)
+                .create());
+
+        return data.stream().map(v -> {
+            return new Object[] {v};
+        }).toList();
+    }
+
+    @Test
+    @ParameterSupplier
+    public void testDisableInstallerUninstaller(TestSpec spec, boolean disableInstaller, boolean disableUninstaller) {
+        spec.run(test -> {
+            if (disableInstaller) {
+                test.disablePackageInstaller();
+            }
+            if (disableUninstaller) {
+                test.disablePackageUninstaller();
+            }
+        });
+    }
+
+    public static List<Object[]> testDisableInstallerUninstaller() {
+        List<Object[]> data = new ArrayList<>();
+
+        for (boolean disableInstaller : List.of(true, false)) {
+            for (boolean disableUninstaller : List.of(true, false)) {
+                if (disableInstaller || disableUninstaller) {
+                    final var builder = new TestSpecBuilder().doCreateUnpackInstallUninstall();
+                    if (disableInstaller) {
+                        builder.install(NEVER);
+                    }
+                    if (disableUninstaller) {
+                        builder.uninstall(NEVER);
+                    }
+                    data.add(new Object[] { builder.create(), disableInstaller, disableUninstaller });
+                }
+            }
+        }
+
+        return data;
+    }
+
+    private static List<Path> getUnpackPaths(Collection<Verifiable> verifiers) {
+        return verifiers.stream()
+                .filter(CountingUnpacker.class::isInstance)
+                .map(CountingUnpacker.class::cast)
+                .map(CountingUnpacker::unpackPaths)
+                .reduce((x , y) -> {
+                    throw new UnsupportedOperationException();
+                }).orElseThrow();
+    }
+
+    @Test
+    public void testUnpackTwice() {
+        final var testSpec = new TestSpecBuilder()
+                .actions(Action.CREATE, Action.UNPACK, Action.VERIFY_INSTALL, Action.UNPACK, Action.VERIFY_INSTALL)
+                .unpack(TWICE)
+                .initializers(ONCE)
+                .installVerifiers(TWICE)
+                .create();
+
+        final var unpackPaths = getUnpackPaths(testSpec.run());
+
+        TKit.assertEquals(2, unpackPaths.size(), "Check the bundle was unpacked in different directories");
+
+        unpackPaths.forEach(dir -> {
+            TKit.assertTrue(dir.startsWith(TKit.workDir()), "Check unpack directory is inside of the test work directory");
+        });
+    }
+
+    @Test
+    public void testDeleteUnpackDirs() {
+        final int unpackActionCount = 4;
+        final var testSpec = new TestSpecBuilder()
+                .actions(Action.UNPACK, Action.UNPACK, Action.UNPACK, Action.UNPACK)
+                .unpack(new CallbackFactory(unpackActionCount) {
+                    @Override
+                    CountingUnpacker createUnpacker() {
+                        return new CountingUnpacker(unpackActionCount) {
+                            @Override
+                            public Path apply(JPackageCommand cmd, Path path) {
+                                switch (tickCount()) {
+                                    case 0 -> {
+                                    }
+
+                                    case 2 -> {
+                                        path = path.resolve("foo");
+                                    }
+
+                                    case 1, 3 -> {
+                                        try {
+                                            path = Files.createTempDirectory("jpackage-test");
+                                        } catch (IOException ex) {
+                                            throw new UncheckedIOException(ex);
+                                        }
+                                    }
+
+                                    default -> {
+                                        throw new IllegalStateException();
+                                    }
+                                }
+                                return super.apply(cmd, path);
+                            }
+                        };
+                    }
+                })
+                .initializers(ONCE)
+                .create();
+
+        final var unpackPaths = getUnpackPaths(testSpec.run());
+
+        TKit.assertEquals(unpackActionCount, unpackPaths.size(), "Check the bundle was unpacked in different directories");
+
+        // Unpack directories within the test work directory must exist.
+        TKit.assertDirectoryExists(unpackPaths.get(0));
+        TKit.assertDirectoryExists(unpackPaths.get(2));
+
+        // Unpack directories outside of the test work directory must be deleted.
+        TKit.assertPathExists(unpackPaths.get(1), false);
+        TKit.assertPathExists(unpackPaths.get(3), false);
+    }
+
+    @Test
+    public void testRunOnceInitializer() {
+        final var testSpec = new TestSpecBuilder().doCreateAndUnpack().unpack(TWICE).create();
+
+        final var initializer = TWICE.createInitializer();
+        final var runOnceInitializer = ONCE.createRunOnceInitializer();
+        testSpec.run(test -> {
+            test.forTypes(PackageType.LINUX_RPM, PackageType.WIN_MSI)
+                    .addRunOnceInitializer(runOnceInitializer)
+                    .addInitializer(initializer);
+        });
+
+        initializer.verify();
+        runOnceInitializer.verify();
+    }
+
+    @Test
+    @Parameter("0")
+    @Parameter("1")
+    public void testPurge(int jpackageExitCode) {
+
+        Path[] outputBundle = new Path[1];
+
+        final var builder = new TestSpecBuilder();
+
+        builder.actions(Action.CREATE).initializers(new CallbackFactory(1) {
+            @Override
+            CountingConsumer createInitializer() {
+                    return new CountingConsumer(1, "custom-init") {
+                        @Override
+                        public void accept(JPackageCommand cmd) {
+                            outputBundle[0] = cmd.outputBundle();
+                            super.accept(cmd);
+                        }
+                    };
+                }
+            }).create().run();
+        TKit.assertFileExists(outputBundle[0]);
+
+        builder.actions(Action.PURGE).initializers(ONCE).jpackageExitCode(jpackageExitCode).create().run();
+        TKit.assertPathExists(outputBundle[0], false);
+    }
+
+    @Test
+    public void testPackageTestOrder() {
+
+        Set<PackageType> packageTypes = new LinkedHashSet<>();
+
+        final var initializer = new CountingConsumer(PackageType.NATIVE.size(), "custom-init") {
+            @Override
+            public void accept(JPackageCommand cmd) {
+                packageTypes.add(new JPackageCommand().setArgumentValue(
+                        "--type", cmd.getArgumentValue("--type")).packageType());
+                super.accept(cmd);
+            }
+        };
+
+        new TestSpecBuilder().actions(Action.CREATE).create().run(test -> {
+            test.forTypes().addInitializer(initializer);
+        });
+
+        initializer.verify();
+
+        final var expectedOrder = PackageType.NATIVE.stream()
+                .sorted().map(PackageType::name).toList();
+        final var actualOrder = packageTypes.stream().map(PackageType::name).toList();
+
+        TKit.assertStringListEquals(expectedOrder, actualOrder, "Check the order or packaging");
+    }
+}
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 2d5d035512b..efcd0041579 100644
--- a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/JPackageCommand.java
+++ b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/JPackageCommand.java
@@ -25,6 +25,7 @@ package jdk.jpackage.test;
 
 import java.io.FileOutputStream;
 import java.io.IOException;
+import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.security.SecureRandom;
@@ -77,6 +78,7 @@ public class JPackageCommand extends CommandArguments<JPackageCommand> {
         appLayoutAsserts = cmd.appLayoutAsserts;
         outputValidator = cmd.outputValidator;
         executeInDirectory = cmd.executeInDirectory;
+        winMsiLogFile = cmd.winMsiLogFile;
     }
 
     JPackageCommand createImmutableCopy() {
@@ -998,6 +1000,22 @@ public class JPackageCommand extends CommandArguments<JPackageCommand> {
         return this;
     }
 
+    JPackageCommand winMsiLogFile(Path v) {
+        this.winMsiLogFile = v;
+        return this;
+    }
+
+    public Optional<Path> winMsiLogFile() {
+        return Optional.ofNullable(winMsiLogFile);
+    }
+
+    public Optional<Stream<String>> winMsiLogFileContents() {
+        return winMsiLogFile().map(ThrowingFunction.toFunction(msiLog -> {
+            // MSI log files are UTF16LE-encoded
+            return Files.lines(msiLog, StandardCharsets.UTF_16LE);
+        }));
+    }
+
     private JPackageCommand adjustArgumentsBeforeExecution() {
         if (!isWithToolProvider()) {
             // if jpackage is launched as a process then set the jlink.debug system property
@@ -1175,6 +1193,7 @@ public class JPackageCommand extends CommandArguments<JPackageCommand> {
     private final Actions prerequisiteActions;
     private final Actions verifyActions;
     private Path executeInDirectory;
+    private Path winMsiLogFile;
     private Set<AppLayoutAssert> appLayoutAsserts = Set.of(AppLayoutAssert.values());
     private Consumer<Stream<String>> outputValidator;
     private static boolean defaultWithToolProvider;
diff --git a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/LinuxHelper.java b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/LinuxHelper.java
index f97b695d98f..d94b8aee8ac 100644
--- a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/LinuxHelper.java
+++ b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/LinuxHelper.java
@@ -195,58 +195,61 @@ public final class LinuxHelper {
     }
 
     static PackageHandlers createDebPackageHandlers() {
-        PackageHandlers deb = new PackageHandlers();
-        deb.installHandler = cmd -> {
-            cmd.verifyIsOfType(PackageType.LINUX_DEB);
-            Executor.of("sudo", "dpkg", "-i")
-            .addArgument(cmd.outputBundle())
-            .execute();
-        };
-        deb.uninstallHandler = cmd -> {
-            cmd.verifyIsOfType(PackageType.LINUX_DEB);
-            var packageName = getPackageName(cmd);
-            String script = String.format("! dpkg -s %s || sudo dpkg -r %s",
-                    packageName, packageName);
-            Executor.of("sh", "-c", script).execute();
-        };
-        deb.unpackHandler = (cmd, destinationDir) -> {
-            cmd.verifyIsOfType(PackageType.LINUX_DEB);
-            Executor.of("dpkg", "-x")
-            .addArgument(cmd.outputBundle())
-            .addArgument(destinationDir)
-            .execute();
-            return destinationDir;
-        };
-        return deb;
+        return new PackageHandlers(LinuxHelper::installDeb, LinuxHelper::uninstallDeb, LinuxHelper::unpackDeb);
+    }
+
+    private static int installDeb(JPackageCommand cmd) {
+        cmd.verifyIsOfType(PackageType.LINUX_DEB);
+        return Executor.of("sudo", "dpkg", "-i")
+                .addArgument(cmd.outputBundle())
+                .execute().getExitCode();
+    }
+
+    private static void uninstallDeb(JPackageCommand cmd) {
+        cmd.verifyIsOfType(PackageType.LINUX_DEB);
+        var packageName = getPackageName(cmd);
+        String script = String.format("! dpkg -s %s || sudo dpkg -r %s",
+                packageName, packageName);
+        Executor.of("sh", "-c", script).execute();
+    }
+
+    private static Path unpackDeb(JPackageCommand cmd, Path destinationDir) {
+        cmd.verifyIsOfType(PackageType.LINUX_DEB);
+        Executor.of("dpkg", "-x")
+        .addArgument(cmd.outputBundle())
+        .addArgument(destinationDir)
+        .execute(0);
+        return destinationDir;
     }
 
     static PackageHandlers createRpmPackageHandlers() {
-        PackageHandlers rpm = new PackageHandlers();
-        rpm.installHandler = cmd -> {
-            cmd.verifyIsOfType(PackageType.LINUX_RPM);
-            Executor.of("sudo", "rpm", "-U")
-            .addArgument(cmd.outputBundle())
-            .execute();
-        };
-        rpm.uninstallHandler = cmd -> {
-            cmd.verifyIsOfType(PackageType.LINUX_RPM);
-            var packageName = getPackageName(cmd);
-            String script = String.format("! rpm -q %s || sudo rpm -e %s",
-                    packageName, packageName);
-            Executor.of("sh", "-c", script).execute();
-        };
-        rpm.unpackHandler = (cmd, destinationDir) -> {
-            cmd.verifyIsOfType(PackageType.LINUX_RPM);
-            Executor.of("sh", "-c", String.format(
-                    "rpm2cpio '%s' | cpio -idm --quiet",
-                    JPackageCommand.escapeAndJoin(
-                            cmd.outputBundle().toAbsolutePath().toString())))
-            .setDirectory(destinationDir)
-            .execute();
-            return destinationDir;
-        };
+        return new PackageHandlers(LinuxHelper::installRpm, LinuxHelper::uninstallRpm, LinuxHelper::unpackRpm);
+    }
 
-        return rpm;
+    private static int installRpm(JPackageCommand cmd) {
+        cmd.verifyIsOfType(PackageType.LINUX_RPM);
+        return Executor.of("sudo", "rpm", "-U")
+                .addArgument(cmd.outputBundle())
+                .execute().getExitCode();
+    }
+
+    private static void uninstallRpm(JPackageCommand cmd) {
+        cmd.verifyIsOfType(PackageType.LINUX_RPM);
+        var packageName = getPackageName(cmd);
+        String script = String.format("! rpm -q %s || sudo rpm -e %s",
+                packageName, packageName);
+        Executor.of("sh", "-c", script).execute();
+    }
+
+    private static Path unpackRpm(JPackageCommand cmd, Path destinationDir) {
+        cmd.verifyIsOfType(PackageType.LINUX_RPM);
+        Executor.of("sh", "-c", String.format(
+                "rpm2cpio '%s' | cpio -idm --quiet",
+                JPackageCommand.escapeAndJoin(
+                        cmd.outputBundle().toAbsolutePath().toString())))
+        .setDirectory(destinationDir)
+        .execute(0);
+        return destinationDir;
     }
 
     static Path getLauncherPath(JPackageCommand cmd) {
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 72706129213..8d245fb4d96 100644
--- a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/MacHelper.java
+++ b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/MacHelper.java
@@ -150,113 +150,115 @@ public final class MacHelper {
     }
 
     static PackageHandlers createDmgPackageHandlers() {
-        PackageHandlers dmg = new PackageHandlers();
+        return new PackageHandlers(MacHelper::installDmg, MacHelper::uninstallDmg, MacHelper::unpackDmg);
+    }
 
-        dmg.installHandler = cmd -> {
-            withExplodedDmg(cmd, dmgImage -> {
-                Executor.of("sudo", "cp", "-r")
-                .addArgument(dmgImage)
-                .addArgument(getInstallationDirectory(cmd).getParent())
-                .execute();
-            });
-        };
-        dmg.unpackHandler = (cmd, destinationDir) -> {
-            Path unpackDir = destinationDir.resolve(
-                    TKit.removeRootFromAbsolutePath(
-                            getInstallationDirectory(cmd)).getParent());
-            try {
-                Files.createDirectories(unpackDir);
-            } catch (IOException ex) {
-                throw new RuntimeException(ex);
-            }
+    private static int installDmg(JPackageCommand cmd) {
+        cmd.verifyIsOfType(PackageType.MAC_DMG);
+        withExplodedDmg(cmd, dmgImage -> {
+            Executor.of("sudo", "cp", "-r")
+                    .addArgument(dmgImage)
+                    .addArgument(getInstallationDirectory(cmd).getParent())
+                    .execute(0);
+        });
+        return 0;
+    }
 
-            withExplodedDmg(cmd, dmgImage -> {
-                Executor.of("cp", "-r")
-                .addArgument(dmgImage)
-                .addArgument(unpackDir)
-                .execute();
-            });
-            return destinationDir;
-        };
-        dmg.uninstallHandler = cmd -> {
-            cmd.verifyIsOfType(PackageType.MAC_DMG);
-            Executor.of("sudo", "rm", "-rf")
-            .addArgument(cmd.appInstallationDirectory())
+    private static void uninstallDmg(JPackageCommand cmd) {
+        cmd.verifyIsOfType(PackageType.MAC_DMG);
+        Executor.of("sudo", "rm", "-rf")
+        .addArgument(cmd.appInstallationDirectory())
+        .execute();
+    }
+
+    private static Path unpackDmg(JPackageCommand cmd, Path destinationDir) {
+        cmd.verifyIsOfType(PackageType.MAC_DMG);
+        Path unpackDir = destinationDir.resolve(
+                TKit.removeRootFromAbsolutePath(
+                        getInstallationDirectory(cmd)).getParent());
+        try {
+            Files.createDirectories(unpackDir);
+        } catch (IOException ex) {
+            throw new RuntimeException(ex);
+        }
+
+        withExplodedDmg(cmd, dmgImage -> {
+            Executor.of("cp", "-r")
+            .addArgument(dmgImage)
+            .addArgument(unpackDir)
             .execute();
-        };
-
-        return dmg;
+        });
+        return destinationDir;
     }
 
     static PackageHandlers createPkgPackageHandlers() {
-        PackageHandlers pkg = new PackageHandlers();
+        return new PackageHandlers(MacHelper::installPkg, MacHelper::uninstallPkg, MacHelper::unpackPkg);
+    }
 
-        pkg.installHandler = cmd -> {
-            cmd.verifyIsOfType(PackageType.MAC_PKG);
-            Executor.of("sudo", "/usr/sbin/installer", "-allowUntrusted", "-pkg")
-                    .addArgument(cmd.outputBundle())
-                    .addArguments("-target", "/")
+    private static int installPkg(JPackageCommand cmd) {
+        cmd.verifyIsOfType(PackageType.MAC_PKG);
+        return Executor.of("sudo", "/usr/sbin/installer", "-allowUntrusted", "-pkg")
+                .addArgument(cmd.outputBundle())
+                .addArguments("-target", "/")
+                .execute().getExitCode();
+    }
+
+    private static void uninstallPkg(JPackageCommand cmd) {
+        cmd.verifyIsOfType(PackageType.MAC_PKG);
+        if (Files.exists(getUninstallCommand(cmd))) {
+            Executor.of("sudo", "/bin/sh",
+                    getUninstallCommand(cmd).toString()).execute();
+        } else {
+            Executor.of("sudo", "rm", "-rf")
+                    .addArgument(cmd.appInstallationDirectory())
                     .execute();
-        };
-        pkg.unpackHandler = (cmd, destinationDir) -> {
-            cmd.verifyIsOfType(PackageType.MAC_PKG);
+        }
+    }
 
-            var dataDir = destinationDir.resolve("data");
+    private static Path unpackPkg(JPackageCommand cmd, Path destinationDir) {
+        cmd.verifyIsOfType(PackageType.MAC_PKG);
 
-            Executor.of("pkgutil", "--expand")
-                    .addArgument(cmd.outputBundle())
-                    .addArgument(dataDir) // We need non-existing folder
-                    .execute();
+        var dataDir = destinationDir.resolve("data");
 
-            final Path unpackRoot = destinationDir.resolve("unpacked");
+        Executor.of("pkgutil", "--expand")
+                .addArgument(cmd.outputBundle())
+                .addArgument(dataDir) // We need non-existing folder
+                .execute();
 
-            // Unpack all ".pkg" files from $dataDir folder in $unpackDir folder
-            try (var dataListing = Files.list(dataDir)) {
-                dataListing.filter(file -> {
-                    return ".pkg".equals(PathUtils.getSuffix(file.getFileName()));
-                }).forEach(ThrowingConsumer.toConsumer(pkgDir -> {
-                    // Installation root of the package is stored in
-                    // /pkg-info@install-location attribute in $pkgDir/PackageInfo xml file
-                    var doc = createDocumentBuilder().parse(
-                            new ByteArrayInputStream(Files.readAllBytes(
-                                    pkgDir.resolve("PackageInfo"))));
-                    var xPath = XPathFactory.newInstance().newXPath();
+        final Path unpackRoot = destinationDir.resolve("unpacked");
 
-                    final String installRoot = (String) xPath.evaluate(
-                            "/pkg-info/@install-location", doc,
-                            XPathConstants.STRING);
+        // Unpack all ".pkg" files from $dataDir folder in $unpackDir folder
+        try (var dataListing = Files.list(dataDir)) {
+            dataListing.filter(file -> {
+                return ".pkg".equals(PathUtils.getSuffix(file.getFileName()));
+            }).forEach(ThrowingConsumer.toConsumer(pkgDir -> {
+                // Installation root of the package is stored in
+                // /pkg-info@install-location attribute in $pkgDir/PackageInfo xml file
+                var doc = createDocumentBuilder().parse(
+                        new ByteArrayInputStream(Files.readAllBytes(
+                                pkgDir.resolve("PackageInfo"))));
+                var xPath = XPathFactory.newInstance().newXPath();
 
-                    final Path unpackDir = unpackRoot.resolve(
-                            TKit.removeRootFromAbsolutePath(Path.of(installRoot)));
+                final String installRoot = (String) xPath.evaluate(
+                        "/pkg-info/@install-location", doc,
+                        XPathConstants.STRING);
 
-                    Files.createDirectories(unpackDir);
+                final Path unpackDir = unpackRoot.resolve(
+                        TKit.removeRootFromAbsolutePath(Path.of(installRoot)));
 
-                    Executor.of("tar", "-C")
-                            .addArgument(unpackDir)
-                            .addArgument("-xvf")
-                            .addArgument(pkgDir.resolve("Payload"))
-                            .execute();
-                }));
-            } catch (IOException ex) {
-                throw new RuntimeException(ex);
-            }
+                Files.createDirectories(unpackDir);
 
-            return unpackRoot;
-        };
-        pkg.uninstallHandler = cmd -> {
-            cmd.verifyIsOfType(PackageType.MAC_PKG);
-
-            if (Files.exists(getUninstallCommand(cmd))) {
-                Executor.of("sudo", "/bin/sh",
-                        getUninstallCommand(cmd).toString()).execute();
-            } else {
-                Executor.of("sudo", "rm", "-rf")
-                        .addArgument(cmd.appInstallationDirectory())
+                Executor.of("tar", "-C")
+                        .addArgument(unpackDir)
+                        .addArgument("-xvf")
+                        .addArgument(pkgDir.resolve("Payload"))
                         .execute();
-            }
-        };
+            }));
+        } catch (IOException ex) {
+            throw new RuntimeException(ex);
+        }
 
-        return pkg;
+        return unpackRoot;
     }
 
     static void verifyBundleStructure(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 f89bd0a60c8..e7b3f3e3a44 100644
--- a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/PackageTest.java
+++ b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/PackageTest.java
@@ -22,6 +22,15 @@
  */
 package jdk.jpackage.test;
 
+import static jdk.jpackage.internal.util.function.ExceptionBox.rethrowUnchecked;
+import static jdk.jpackage.internal.util.function.ThrowingBiConsumer.toBiConsumer;
+import static jdk.jpackage.internal.util.function.ThrowingConsumer.toConsumer;
+import static jdk.jpackage.internal.util.function.ThrowingSupplier.toSupplier;
+import static jdk.jpackage.test.PackageType.LINUX;
+import static jdk.jpackage.test.PackageType.MAC_PKG;
+import static jdk.jpackage.test.PackageType.NATIVE;
+import static jdk.jpackage.test.PackageType.WINDOWS;
+
 import java.awt.GraphicsEnvironment;
 import java.io.IOException;
 import java.nio.file.Files;
@@ -29,6 +38,7 @@ import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
+import java.util.Comparator;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
@@ -40,27 +50,15 @@ import java.util.Set;
 import java.util.function.BiConsumer;
 import java.util.function.BiFunction;
 import java.util.function.Consumer;
+import java.util.function.Function;
 import java.util.function.Predicate;
 import java.util.function.Supplier;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 import java.util.stream.StreamSupport;
 import jdk.jpackage.internal.util.function.ThrowingBiConsumer;
-import static jdk.jpackage.internal.util.function.ThrowingBiConsumer.toBiConsumer;
 import jdk.jpackage.internal.util.function.ThrowingConsumer;
-import static jdk.jpackage.internal.util.function.ThrowingConsumer.toConsumer;
 import jdk.jpackage.internal.util.function.ThrowingRunnable;
-import static jdk.jpackage.internal.util.function.ThrowingSupplier.toSupplier;
-import static jdk.jpackage.internal.util.function.ExceptionBox.rethrowUnchecked;
-import static jdk.jpackage.test.PackageType.LINUX;
-import static jdk.jpackage.test.PackageType.LINUX_DEB;
-import static jdk.jpackage.test.PackageType.LINUX_RPM;
-import static jdk.jpackage.test.PackageType.MAC_DMG;
-import static jdk.jpackage.test.PackageType.MAC_PKG;
-import static jdk.jpackage.test.PackageType.NATIVE;
-import static jdk.jpackage.test.PackageType.WINDOWS;
-import static jdk.jpackage.test.PackageType.WIN_EXE;
-import static jdk.jpackage.test.PackageType.WIN_MSI;
 
 
 /**
@@ -73,13 +71,18 @@ import static jdk.jpackage.test.PackageType.WIN_MSI;
 public final class PackageTest extends RunnablePackageTest {
 
     public PackageTest() {
+        isPackageTypeSupported = PackageType::isSupported;
+        jpackageFactory = JPackageCommand::new;
+        packageHandlers = new HashMap<>();
+        disabledInstallers = new HashSet<>();
+        disabledUninstallers = new HashSet<>();
         excludeTypes = new HashSet<>();
         forTypes();
         setExpectedExitCode(0);
+        setExpectedInstallExitCode(0);
         namedInitializers = new HashSet<>();
-        handlers = currentTypes.stream()
+        handlers = NATIVE.stream()
                 .collect(Collectors.toMap(v -> v, v -> new Handler()));
-        packageHandlers = createDefaultPackageHandlers();
     }
 
     public PackageTest excludeTypes(PackageType... types) {
@@ -93,13 +96,13 @@ public final class PackageTest extends RunnablePackageTest {
 
     public PackageTest forTypes(PackageType... types) {
         Collection<PackageType> newTypes;
-        if (types == null || types.length == 0) {
+        if (types.length == 0) {
             newTypes = NATIVE;
         } else {
             newTypes = Stream.of(types).collect(Collectors.toSet());
         }
         currentTypes = newTypes.stream()
-                .filter(PackageType::isSupported)
+                .filter(isPackageTypeSupported)
                 .filter(Predicate.not(excludeTypes::contains))
                 .collect(Collectors.toUnmodifiableSet());
         return this;
@@ -124,6 +127,11 @@ public final class PackageTest extends RunnablePackageTest {
         return this;
     }
 
+    public PackageTest setExpectedInstallExitCode(int v) {
+        expectedInstallExitCode = v;
+        return this;
+    }
+
     public PackageTest ignoreBundleOutputDir() {
         return ignoreBundleOutputDir(true);
     }
@@ -133,8 +141,8 @@ public final class PackageTest extends RunnablePackageTest {
         return this;
     }
 
-    private PackageTest addInitializer(ThrowingConsumer<JPackageCommand> v,
-            String id) {
+    private PackageTest addInitializer(ThrowingConsumer<JPackageCommand> v, String id) {
+        Objects.requireNonNull(v);
         if (id != null) {
             if (namedInitializers.contains(id)) {
                 return this;
@@ -142,12 +150,12 @@ public final class PackageTest extends RunnablePackageTest {
 
             namedInitializers.add(id);
         }
-        currentTypes.forEach(type -> handlers.get(type).addInitializer(
-                toConsumer(v)));
+        currentTypes.forEach(type -> handlers.get(type).addInitializer(toConsumer(v)));
         return this;
     }
 
     private PackageTest addRunOnceInitializer(ThrowingRunnable v, String id) {
+        Objects.requireNonNull(v);
         return addInitializer(new ThrowingConsumer<JPackageCommand>() {
             @Override
             public void accept(JPackageCommand unused) throws Throwable {
@@ -169,24 +177,26 @@ public final class PackageTest extends RunnablePackageTest {
         return addRunOnceInitializer(v, null);
     }
 
-    public PackageTest addBundleVerifier(
-            ThrowingBiConsumer<JPackageCommand, Executor.Result> v) {
-        currentTypes.forEach(type -> handlers.get(type).addBundleVerifier(
-                toBiConsumer(v)));
+    public PackageTest addBundleVerifier(ThrowingBiConsumer<JPackageCommand, Executor.Result> v) {
+        Objects.requireNonNull(v);
+        currentTypes.forEach(type -> handlers.get(type).addBundleVerifier(toBiConsumer(v)));
         return this;
     }
 
     public PackageTest addBundleVerifier(ThrowingConsumer<JPackageCommand> v) {
+        Objects.requireNonNull(v);
         return addBundleVerifier((cmd, unused) -> toConsumer(v).accept(cmd));
     }
 
     public PackageTest addBundlePropertyVerifier(String propertyName,
             Predicate<String> pred, String predLabel) {
+        Objects.requireNonNull(propertyName);
+        Objects.requireNonNull(pred);
         return addBundleVerifier(cmd -> {
             final String value;
-            if (TKit.isLinux()) {
+            if (isOfType(cmd, LINUX)) {
                 value = LinuxHelper.getBundleProperty(cmd, propertyName);
-            } else if (TKit.isWindows()) {
+            } else if (isOfType(cmd, WINDOWS)) {
                 value = WindowsHelper.getMsiProperty(cmd, propertyName);
             } else {
                 throw new IllegalStateException();
@@ -223,19 +233,23 @@ public final class PackageTest extends RunnablePackageTest {
     }
 
     public PackageTest disablePackageInstaller() {
-        currentTypes.forEach(
-                type -> packageHandlers.get(type).installHandler = cmd -> {});
+        currentTypes.forEach(disabledInstallers::add);
         return this;
     }
 
     public PackageTest disablePackageUninstaller() {
-        currentTypes.forEach(
-                type -> packageHandlers.get(type).uninstallHandler = cmd -> {});
+        currentTypes.forEach(disabledUninstallers::add);
+        return this;
+    }
+
+    public PackageTest createMsiLog(boolean v) {
+        createMsiLog = v;
         return this;
     }
 
     static void withFileAssociationsTestRuns(FileAssociations fa,
             ThrowingBiConsumer<FileAssociations.TestRun, List<Path>> consumer) {
+        Objects.requireNonNull(consumer);
         for (var testRun : fa.getTestRuns()) {
             TKit.withTempDirectory("fa-test-files", tempDir -> {
                 List<Path> testFiles = StreamSupport.stream(testRun.getFileNames().spliterator(), false).map(fname -> {
@@ -254,6 +268,7 @@ public final class PackageTest extends RunnablePackageTest {
     }
 
     PackageTest addHelloAppFileAssociationsVerifier(FileAssociations fa) {
+        Objects.requireNonNull(fa);
 
         // Setup test app to have valid jpackage command line before
         // running check of type of environment.
@@ -290,7 +305,7 @@ public final class PackageTest extends RunnablePackageTest {
                         Collections.emptyMap());
             });
 
-            if (TKit.isWindows()) {
+            if (isOfType(cmd, WINDOWS)) {
                 // Verify context menu label in registry.
                 String progId = WindowsHelper.queryRegistryValue(
                         String.format("HKEY_LOCAL_MACHINE\\SOFTWARE\\Classes\\%s", fa.getSuffix()), "");
@@ -307,8 +322,7 @@ public final class PackageTest extends RunnablePackageTest {
     }
 
     public PackageTest forTypes(Collection<PackageType> types, Runnable action) {
-        Set<PackageType> oldTypes = Set.of(currentTypes.toArray(
-                PackageType[]::new));
+        final var oldTypes = Set.of(currentTypes.toArray(PackageType[]::new));
         try {
             forTypes(types);
             action.run();
@@ -374,10 +388,59 @@ public final class PackageTest extends RunnablePackageTest {
         private final List<Consumer<Action>> handlers;
     }
 
-    static final class PackageHandlers {
-        Consumer<JPackageCommand> installHandler;
-        Consumer<JPackageCommand> uninstallHandler;
-        BiFunction<JPackageCommand, Path, Path> unpackHandler;
+    PackageTest packageHandlers(PackageHandlers v) {
+        Objects.requireNonNull(v);
+        currentTypes.forEach(type -> packageHandlers.put(type, v));
+        return this;
+    }
+
+    PackageTest isPackageTypeSupported(Predicate<PackageType> v) {
+        Objects.requireNonNull(v);
+        isPackageTypeSupported = v;
+        return this;
+    }
+
+    PackageTest jpackageFactory(Supplier<JPackageCommand> v) {
+        Objects.requireNonNull(v);
+        jpackageFactory = v;
+        return this;
+    }
+
+    record PackageHandlers(Function<JPackageCommand, Integer> installHandler,
+            Consumer<JPackageCommand> uninstallHandler,
+            Optional<? extends BiFunction<JPackageCommand, Path, Path>> unpackHandler) {
+
+        PackageHandlers(Function<JPackageCommand, Integer> installHandler,
+                Consumer<JPackageCommand> uninstallHandler,
+                BiFunction<JPackageCommand, Path, Path> unpackHandler) {
+            this(installHandler, uninstallHandler, Optional.of(unpackHandler));
+        }
+
+        PackageHandlers {
+            Objects.requireNonNull(installHandler);
+            Objects.requireNonNull(uninstallHandler);
+            Objects.requireNonNull(unpackHandler);
+        }
+
+        PackageHandlers copyWithNopInstaller() {
+            return new PackageHandlers(cmd -> 0, uninstallHandler, unpackHandler);
+        }
+
+        PackageHandlers copyWithNopUninstaller() {
+            return new PackageHandlers(installHandler, cmd -> {}, unpackHandler);
+        }
+
+        int install(JPackageCommand cmd) {
+            return installHandler.apply(cmd);
+        }
+
+        Path unpack(JPackageCommand cmd, Path unpackDir) {
+            return unpackHandler.orElseThrow().apply(cmd, unpackDir);
+        }
+
+        void uninstall(JPackageCommand cmd) {
+            uninstallHandler.accept(cmd);
+        }
     }
 
     @Override
@@ -393,164 +456,197 @@ public final class PackageTest extends RunnablePackageTest {
     }
 
     private List<Consumer<Action>> createPackageTypeHandlers() {
-        return NATIVE.stream()
-                .map(type -> {
-                    Handler handler = handlers.entrySet().stream()
-                        .filter(entry -> !entry.getValue().isVoid())
-                        .filter(entry -> entry.getKey() == type)
-                        .map(entry -> entry.getValue())
-                        .findAny().orElse(null);
-                    Map.Entry<PackageType, Handler> result = null;
-                    if (handler != null) {
-                        result = Map.entry(type, handler);
-                    }
-                    return result;
-                })
-                .filter(Objects::nonNull)
-                .map(entry -> createPackageTypeHandler(
-                        entry.getKey(), entry.getValue()))
-                .collect(Collectors.toList());
+        return handlers.entrySet().stream()
+                .filter(entry -> !entry.getValue().isVoid())
+                .filter(entry -> NATIVE.contains(entry.getKey()))
+                .sorted(Comparator.comparing(Map.Entry::getKey))
+                .map(entry -> {
+                    return  createPackageTypeHandler(entry.getKey(), entry.getValue());
+                }).toList();
     }
 
-    private Consumer<Action> createPackageTypeHandler(
-            PackageType type, Handler handler) {
-        return toConsumer(new ThrowingConsumer<Action>() {
-            @Override
-            public void accept(Action action) throws Throwable {
-                if (terminated) {
-                    throw new IllegalStateException();
+    private record PackageTypePipeline(PackageType type, int expectedJPackageExitCode,
+            int expectedInstallExitCode, PackageHandlers packageHandlers, Handler handler,
+            JPackageCommand cmd, State state) implements Consumer<Action> {
+
+        PackageTypePipeline {
+            Objects.requireNonNull(type);
+            Objects.requireNonNull(packageHandlers);
+            Objects.requireNonNull(handler);
+            Objects.requireNonNull(cmd);
+            Objects.requireNonNull(state);
+        }
+
+        PackageTypePipeline(PackageType type, int expectedJPackageExitCode,
+                int expectedInstallExitCode, PackageHandlers packageHandlers,
+                Handler handler, JPackageCommand cmd) {
+            this(type, expectedJPackageExitCode, expectedInstallExitCode,
+                    packageHandlers, handler, cmd, new State());
+        }
+
+        @Override
+        public void accept(Action action) {
+            switch(analizeAction(action)) {
+                case SKIP_NO_PACKAGE_HANDLER -> {
+                    TKit.trace(String.format("No handler of [%s] action for %s command",
+                            action, cmd.getPrintableCommandLine()));
+                    return;
                 }
-
-                if (action == Action.FINALIZE) {
-                    if (unpackDir != null) {
-                        if (Files.isDirectory(unpackDir)
-                                && !unpackDir.startsWith(TKit.workDir())) {
-                            TKit.deleteDirectoryRecursive(unpackDir);
-                        }
-                        unpackDir = null;
-                    }
-                    terminated = true;
-                }
-
-                boolean skip = false;
-
-                if (unhandledAction != null) {
-                    switch (unhandledAction) {
-                        case CREATE:
-                            skip = true;
-                            break;
-                        case UNPACK:
-                        case INSTALL:
-                            skip = (action == Action.VERIFY_INSTALL);
-                            break;
-                        case UNINSTALL:
-                            skip = (action == Action.VERIFY_UNINSTALL);
-                            break;
-                        default: // NOP
-                    }
-                }
-
-                if (skip) {
+                case SKIP -> {
                     TKit.trace(String.format("Skip [%s] action of %s command",
                             action, cmd.getPrintableCommandLine()));
                     return;
                 }
-
-                final Supplier<JPackageCommand> curCmd = () -> {
-                    if (Set.of(Action.INITIALIZE, Action.CREATE).contains(action)) {
-                        return cmd;
-                    } else {
-                        return cmd.createImmutableCopy();
-                    }
-                };
-
-                switch (action) {
-                    case UNPACK: {
-                        cmd.setUnpackedPackageLocation(null);
-                        handleAction(action,
-                                packageHandlers.get(type).unpackHandler,
-                                handler -> {
-                                    unpackDir = TKit.createTempDirectory(
-                                            String.format("unpacked-%s",
-                                                    type.getName()));
-                                    unpackDir = handler.apply(cmd, unpackDir);
-                                    cmd.setUnpackedPackageLocation(unpackDir);
-                                });
-                        break;
-                    }
-
-                    case INSTALL: {
-                        cmd.setUnpackedPackageLocation(null);
-                        handleAction(action,
-                                packageHandlers.get(type).installHandler,
-                                handler -> {
-                                    handler.accept(curCmd.get());
-                                });
-                        break;
-                    }
-
-                    case UNINSTALL: {
-                        handleAction(action,
-                                packageHandlers.get(type).uninstallHandler,
-                                handler -> {
-                                    handler.accept(curCmd.get());
-                                });
-                        break;
-                    }
-
-                    case CREATE:
-                        cmd.setUnpackedPackageLocation(null);
-                        handler.accept(action, curCmd.get());
-                        handleAction(action,
-                                (expectedJPackageExitCode == 0) ? Boolean.TRUE : null,
-                                handler -> {
-                                });
-                        return;
-
-                    default:
-                        handler.accept(action, curCmd.get());
-                        break;
-                }
-
-                Optional.ofNullable(unhandledAction).ifPresent(v -> {
-                    TKit.trace(String.format(
-                            "No handler of [%s] action for %s command", v,
-                            cmd.getPrintableCommandLine()));
-                });
-            }
-
-            private <T> void handleAction(Action action, T handler,
-                    ThrowingConsumer<T> consumer) throws Throwable {
-                if (handler == null) {
-                    unhandledAction = action;
-                } else {
-                    unhandledAction = null;
-                    consumer.accept(handler);
+                case PROCESS -> {
                 }
             }
 
-            private Path unpackDir;
-            private Action unhandledAction;
-            private boolean terminated;
-            private final JPackageCommand cmd = Functional.identity(() -> {
-                JPackageCommand result = new JPackageCommand();
-                result.setDefaultInputOutput().setDefaultAppName();
-                if (BUNDLE_OUTPUT_DIR != null && !ignoreBundleOutputDir) {
-                    result.setArgumentValue("--dest", BUNDLE_OUTPUT_DIR.toString());
+            switch (action) {
+                case UNPACK -> {
+                    cmd.setUnpackedPackageLocation(null);
+                    final var unpackRootDir = TKit.createTempDirectory(
+                            String.format("unpacked-%s", type.getName()));
+                    final Path unpackDir = packageHandlers.unpack(cmd, unpackRootDir);
+                    if (!unpackDir.startsWith(TKit.workDir())) {
+                        state.deleteUnpackDirs.add(unpackDir);
+                    }
+                    cmd.setUnpackedPackageLocation(unpackDir);
                 }
-                type.applyTo(result);
-                return result;
-            }).get();
-        });
+
+                case INSTALL -> {
+                    cmd.setUnpackedPackageLocation(null);
+                    final int installExitCode = packageHandlers.install(cmd);
+                    TKit.assertEquals(expectedInstallExitCode, installExitCode,
+                            String.format("Check installer exited with %d code", expectedInstallExitCode));
+                }
+
+                case UNINSTALL -> {
+                    cmd.setUnpackedPackageLocation(null);
+                    packageHandlers.uninstall(cmd);
+                }
+
+                case CREATE -> {
+                    cmd.setUnpackedPackageLocation(null);
+                    handler.processAction(action, cmd, expectedJPackageExitCode);
+                }
+
+                case INITIALIZE -> {
+                    handler.processAction(action, cmd, expectedJPackageExitCode);
+                }
+
+                case FINALIZE -> {
+                    state.deleteUnpackDirs.forEach(TKit::deleteDirectoryRecursive);
+                    state.deleteUnpackDirs.clear();
+                }
+
+                default -> {
+                    handler.processAction(action, cmd.createImmutableCopy(), expectedJPackageExitCode);
+                }
+            }
+        }
+
+        private enum ActionAction {
+            PROCESS,
+            SKIP,
+            SKIP_NO_PACKAGE_HANDLER
+        }
+
+        private ActionAction analizeAction(Action action) {
+            Objects.requireNonNull(action);
+
+            if (jpackageFailed()) {
+                return ActionAction.SKIP;
+            }
+
+            switch (action) {
+                case CREATE -> {
+                    state.packageActions.add(action);
+                }
+                case INSTALL -> {
+                    state.packageActions.add(action);
+                    state.packageActions.remove(Action.UNPACK);
+                }
+                case UNINSTALL -> {
+                    state.packageActions.add(action);
+                    if (installFailed()) {
+                        return ActionAction.SKIP;
+                    }
+                }
+                case UNPACK -> {
+                    state.packageActions.add(action);
+                    state.packageActions.remove(Action.INSTALL);
+                    if (unpackNotSupported()) {
+                        return ActionAction.SKIP_NO_PACKAGE_HANDLER;
+                    }
+                }
+                case VERIFY_INSTALL -> {
+                    if (unpackNotSupported()) {
+                        return ActionAction.SKIP;
+                    }
+
+                    if (installFailed()) {
+                        return ActionAction.SKIP;
+                    }
+                }
+                case VERIFY_UNINSTALL -> {
+                    if (installFailed() && processed(Action.UNINSTALL)) {
+                        return ActionAction.SKIP;
+                    }
+                }
+                default -> {
+                    // NOP
+                }
+            }
+
+            return ActionAction.PROCESS;
+        }
+
+        private boolean processed(Action action) {
+            Objects.requireNonNull(action);
+            return state.packageActions.contains(action);
+        }
+
+        private boolean installFailed() {
+            return processed(Action.INSTALL) && expectedInstallExitCode != 0;
+        }
+
+        private boolean jpackageFailed() {
+            return processed(Action.CREATE) && expectedJPackageExitCode != 0;
+        }
+
+        private boolean unpackNotSupported() {
+            return processed(Action.UNPACK) && packageHandlers.unpackHandler().isEmpty();
+        }
+
+        private final static class State {
+            private final Set<Action> packageActions = new HashSet<>();
+            private final List<Path> deleteUnpackDirs = new ArrayList<>();
+        }
     }
 
-    private class Handler implements BiConsumer<Action, JPackageCommand> {
+    private Consumer<Action> createPackageTypeHandler(PackageType type, Handler handler) {
+        final var cmd = jpackageFactory.get();
+        cmd.setDefaultInputOutput().setDefaultAppName();
+        if (BUNDLE_OUTPUT_DIR != null && !ignoreBundleOutputDir) {
+            cmd.setArgumentValue("--dest", BUNDLE_OUTPUT_DIR.toString());
+        }
+        type.applyTo(cmd);
+        return new PackageTypePipeline(type, expectedJPackageExitCode,
+                expectedInstallExitCode, getPackageHandlers(type), handler.copy(), cmd);
+    }
+
+    private record Handler(List<Consumer<JPackageCommand>> initializers,
+            List<BiConsumer<JPackageCommand, Executor.Result>> bundleVerifiers,
+            List<Consumer<JPackageCommand>> installVerifiers,
+            List<Consumer<JPackageCommand>> uninstallVerifiers) {
 
         Handler() {
-            initializers = new ArrayList<>();
-            bundleVerifiers = new ArrayList<>();
-            installVerifiers = new ArrayList<>();
-            uninstallVerifiers = new ArrayList<>();
+            this(new ArrayList<>(), new ArrayList<>(), new ArrayList<>(), new ArrayList<>());
+        }
+
+        Handler copy() {
+            return new Handler(List.copyOf(initializers), List.copyOf(bundleVerifiers),
+                    List.copyOf(installVerifiers), List.copyOf(uninstallVerifiers));
         }
 
         boolean isVoid() {
@@ -573,18 +669,17 @@ public final class PackageTest extends RunnablePackageTest {
             uninstallVerifiers.add(v);
         }
 
-        @Override
-        public void accept(Action action, JPackageCommand cmd) {
+        public void processAction(Action action, JPackageCommand cmd, int expectedJPackageExitCode) {
             switch (action) {
-                case INITIALIZE:
+                case INITIALIZE -> {
                     initializers.forEach(v -> v.accept(cmd));
                     if (cmd.isImagePackageType()) {
                         throw new UnsupportedOperationException();
                     }
                     cmd.executePrerequisiteActions();
-                    break;
+                }
 
-                case CREATE:
+                case CREATE -> {
                     Executor.Result result = cmd.execute(expectedJPackageExitCode);
                     if (expectedJPackageExitCode == 0) {
                         TKit.assertFileExists(cmd.outputBundle());
@@ -593,39 +688,38 @@ public final class PackageTest extends RunnablePackageTest {
                             TKit.assertPathExists(outputBundle, false);
                         });
                     }
-                    verifyPackageBundle(cmd, result);
-                    break;
+                    verifyPackageBundle(cmd, result, expectedJPackageExitCode);
+                }
 
-                case VERIFY_INSTALL:
+                case VERIFY_INSTALL -> {
                     if (expectedJPackageExitCode == 0) {
                         verifyPackageInstalled(cmd);
                     }
-                    break;
+                }
 
-                case VERIFY_UNINSTALL:
+                case VERIFY_UNINSTALL -> {
                     if (expectedJPackageExitCode == 0) {
                         verifyPackageUninstalled(cmd);
                     }
-                    break;
+                }
 
-                case PURGE:
-                    if (expectedJPackageExitCode == 0) {
-                        var bundle = cmd.outputBundle();
-                        if (toSupplier(() -> TKit.deleteIfExists(bundle)).get()) {
-                            TKit.trace(String.format("Deleted [%s] package",
-                                    bundle));
-                        }
+                case PURGE -> {
+                    var bundle = cmd.outputBundle();
+                    if (toSupplier(() -> TKit.deleteIfExists(bundle)).get()) {
+                        TKit.trace(String.format("Deleted [%s] package", bundle));
                     }
-                    break;
+                }
 
-                default: // NOP
+                default -> {
+                    // NOP
+                }
             }
         }
 
         private void verifyPackageBundle(JPackageCommand cmd,
-                Executor.Result result) {
+                Executor.Result result, int expectedJPackageExitCode) {
             if (expectedJPackageExitCode == 0) {
-                if (LINUX.contains(cmd.packageType())) {
+                if (isOfType(cmd, LINUX)) {
                     LinuxHelper.verifyPackageBundleEssential(cmd);
                 }
             }
@@ -647,9 +741,7 @@ public final class PackageTest extends RunnablePackageTest {
                     });
 
             if (!cmd.isRuntime()) {
-                if (WINDOWS.contains(cmd.packageType())
-                        && !cmd.isPackageUnpacked(
-                                "Not verifying desktop integration")) {
+                if (isOfType(cmd, WINDOWS) && !cmd.isPackageUnpacked("Not verifying desktop integration")) {
                     // Check main launcher
                     WindowsHelper.verifyDesktopIntegration(cmd, null);
                     // Check additional launchers
@@ -659,8 +751,7 @@ public final class PackageTest extends RunnablePackageTest {
                 }
             }
 
-            if (LauncherAsServiceVerifier.SUPPORTED_PACKAGES.contains(
-                    cmd.packageType())) {
+            if (isOfType(cmd, LauncherAsServiceVerifier.SUPPORTED_PACKAGES)) {
                 LauncherAsServiceVerifier.verify(cmd);
             }
 
@@ -676,13 +767,13 @@ public final class PackageTest extends RunnablePackageTest {
                     && !LauncherAsServiceVerifier.getLaunchersAsServices(cmd).isEmpty();
 
             final long expectedRootCount;
-            if (WINDOWS.contains(cmd.packageType())) {
+            if (isOfType(cmd, WINDOWS)) {
                 // On Windows it is always two entries:
                 // installation home directory and MSI file
                 expectedRootCount = 2;
-            } else if (withServices && MAC_PKG.equals(cmd.packageType())) {
+            } else if (withServices && isOfType(cmd, MAC_PKG)) {
                 expectedRootCount = 2;
-            } else if (LINUX.contains(cmd.packageType())) {
+            } else if (isOfType(cmd, LINUX)) {
                 Set<Path> roots = new HashSet<>();
                 roots.add(Path.of("/").resolve(Path.of(cmd.getArgumentValue(
                         "--install-dir", () -> "/opt")).getName(0)));
@@ -732,7 +823,7 @@ public final class PackageTest extends RunnablePackageTest {
             if (!cmd.isRuntime()) {
                 TKit.assertPathExists(cmd.appLauncherPath(), false);
 
-                if (WINDOWS.contains(cmd.packageType())) {
+                if (isOfType(cmd, WINDOWS)) {
                     // Check main launcher
                     WindowsHelper.verifyDesktopIntegration(cmd, null);
                     // Check additional launchers
@@ -743,54 +834,94 @@ public final class PackageTest extends RunnablePackageTest {
             }
 
             Path appInstallDir = cmd.appInstallationDirectory();
-            if (TKit.isLinux() && Path.of("/").equals(appInstallDir)) {
+            if (isOfType(cmd, LINUX) && Path.of("/").equals(appInstallDir)) {
                 ApplicationLayout appLayout = cmd.appLayout();
                 TKit.assertPathExists(appLayout.runtimeDirectory(), false);
             } else {
                 TKit.assertPathExists(appInstallDir, false);
             }
 
-            if (LauncherAsServiceVerifier.SUPPORTED_PACKAGES.contains(
-                    cmd.packageType())) {
+            if (isOfType(cmd, LauncherAsServiceVerifier.SUPPORTED_PACKAGES)) {
                 LauncherAsServiceVerifier.verifyUninstalled(cmd);
             }
 
             uninstallVerifiers.forEach(v -> v.accept(cmd));
         }
-
-        private final List<Consumer<JPackageCommand>> initializers;
-        private final List<BiConsumer<JPackageCommand, Executor.Result>> bundleVerifiers;
-        private final List<Consumer<JPackageCommand>> installVerifiers;
-        private final List<Consumer<JPackageCommand>> uninstallVerifiers;
     }
 
-    private static Map<PackageType, PackageHandlers> createDefaultPackageHandlers() {
-        HashMap<PackageType, PackageHandlers> handlers = new HashMap<>();
-        if (TKit.isLinux()) {
-            handlers.put(LINUX_DEB, LinuxHelper.createDebPackageHandlers());
-            handlers.put(LINUX_RPM, LinuxHelper.createRpmPackageHandlers());
+    private PackageHandlers getDefaultPackageHandlers(PackageType type) {
+        switch (type) {
+            case LINUX_DEB -> {
+                return LinuxHelper.createDebPackageHandlers();
+            }
+            case LINUX_RPM -> {
+                return LinuxHelper.createRpmPackageHandlers();
+            }
+            case WIN_MSI -> {
+                return WindowsHelper.createMsiPackageHandlers(createMsiLog);
+            }
+            case WIN_EXE -> {
+                return WindowsHelper.createExePackageHandlers(createMsiLog);
+            }
+            case MAC_DMG -> {
+                return MacHelper.createDmgPackageHandlers();
+            }
+            case MAC_PKG -> {
+                return MacHelper.createPkgPackageHandlers();
+            }
+            default -> {
+                throw new IllegalArgumentException();
+            }
+        }
+    }
+
+    private PackageHandlers getPackageHandlers(PackageType type) {
+        Objects.requireNonNull(type);
+
+        var reply = Optional.ofNullable(packageHandlers.get(type)).orElseGet(() -> {
+            if (TKit.isLinux() && !PackageType.LINUX.contains(type)) {
+                throw new IllegalArgumentException();
+            } else if (TKit.isWindows() && !PackageType.WINDOWS.contains(type)) {
+                throw new IllegalArgumentException();
+            } else if (TKit.isOSX() && !PackageType.MAC.contains(type)) {
+                throw new IllegalArgumentException();
+            } else {
+                return getDefaultPackageHandlers(type);
+            }
+        });
+
+        if (disabledInstallers.contains(type)) {
+            reply = reply.copyWithNopInstaller();
         }
 
-        if (TKit.isWindows()) {
-            handlers.put(WIN_MSI, WindowsHelper.createMsiPackageHandlers());
-            handlers.put(WIN_EXE, WindowsHelper.createExePackageHandlers());
+        if (disabledUninstallers.contains(type)) {
+            reply = reply.copyWithNopUninstaller();
         }
 
-        if (TKit.isOSX()) {
-            handlers.put(MAC_DMG,  MacHelper.createDmgPackageHandlers());
-            handlers.put(MAC_PKG,  MacHelper.createPkgPackageHandlers());
-        }
+        return reply;
+    }
 
-        return handlers;
+    private static boolean isOfType(JPackageCommand cmd, PackageType packageTypes) {
+        return isOfType(cmd, Set.of(packageTypes));
+    }
+
+    private static boolean isOfType(JPackageCommand cmd, Set<PackageType> packageTypes) {
+        return Optional.ofNullable(cmd.packageType()).map(packageTypes::contains).orElse(false);
     }
 
     private Collection<PackageType> currentTypes;
     private Set<PackageType> excludeTypes;
     private int expectedJPackageExitCode;
-    private Map<PackageType, Handler> handlers;
-    private Set<String> namedInitializers;
-    private Map<PackageType, PackageHandlers> packageHandlers;
+    private int expectedInstallExitCode;
+    private final Map<PackageType, Handler> handlers;
+    private final Set<String> namedInitializers;
+    private final Map<PackageType, PackageHandlers> packageHandlers;
+    private final Set<PackageType> disabledInstallers;
+    private final Set<PackageType> disabledUninstallers;
+    private Predicate<PackageType> isPackageTypeSupported;
+    private Supplier<JPackageCommand> jpackageFactory;
     private boolean ignoreBundleOutputDir;
+    private boolean createMsiLog;
 
     private static final Path BUNDLE_OUTPUT_DIR;
 
diff --git a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/WindowsHelper.java b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/WindowsHelper.java
index 48643463e0b..91705afd5fe 100644
--- a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/WindowsHelper.java
+++ b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/WindowsHelper.java
@@ -22,24 +22,25 @@
  */
 package jdk.jpackage.test;
 
+import static jdk.jpackage.internal.util.function.ExceptionBox.rethrowUnchecked;
+import static jdk.jpackage.internal.util.function.ThrowingSupplier.toSupplier;
+
 import java.io.IOException;
 import java.lang.reflect.Method;
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.NoSuchElementException;
 import java.util.Objects;
 import java.util.Optional;
 import java.util.Set;
-import java.util.function.BiConsumer;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
-import static jdk.jpackage.internal.util.function.ExceptionBox.rethrowUnchecked;
 import jdk.jpackage.internal.util.function.ThrowingRunnable;
-import static jdk.jpackage.internal.util.function.ThrowingSupplier.toSupplier;
 import jdk.jpackage.test.PackageTest.PackageHandlers;
 
 public class WindowsHelper {
@@ -67,21 +68,24 @@ public class WindowsHelper {
         return Path.of(cmd.getArgumentValue("--install-dir", cmd::name));
     }
 
-    private static void runMsiexecWithRetries(Executor misexec) {
+    private static int runMsiexecWithRetries(Executor misexec, Optional<Path> msiLog) {
         Executor.Result result = null;
+        final boolean isUnpack = misexec.getExecutable().orElseThrow().equals(Path.of("cmd"));
+        final List<String> origArgs = msiLog.isPresent() ? misexec.getAllArguments() : null;
         for (int attempt = 0; attempt < 8; ++attempt) {
+            msiLog.ifPresent(v -> misexec.clearArguments().addArguments(origArgs).addArgument("/L*v").addArgument(v));
             result = misexec.executeWithoutExitCodeCheck();
 
             if (result.exitCode() == 1605) {
                 // ERROR_UNKNOWN_PRODUCT, attempt to uninstall not installed
                 // package
-                return;
+                return result.exitCode();
             }
 
             // The given Executor may either be of an msiexec command or an
             // unpack.bat script containing the msiexec command. In the later
             // case, when misexec returns 1618, the unpack.bat may return 1603
-            if ((result.exitCode() == 1618) || (result.exitCode() == 1603)) {
+            if ((result.exitCode() == 1618) || (result.exitCode() == 1603 && isUnpack)) {
                 // Another installation is already in progress.
                 // Wait a little and try again.
                 Long timeout = 1000L * (attempt + 3); // from 3 to 10 seconds
@@ -91,74 +95,123 @@ public class WindowsHelper {
             break;
         }
 
-        result.assertExitCodeIsZero();
+        return result.exitCode();
     }
 
-    static PackageHandlers createMsiPackageHandlers() {
-        BiConsumer<JPackageCommand, Boolean> installMsi = (cmd, install) -> {
-            cmd.verifyIsOfType(PackageType.WIN_MSI);
-            var msiPath = TransientMsi.create(cmd).path();
-            runMsiexecWithRetries(Executor.of("msiexec", "/qn", "/norestart",
-                    install ? "/i" : "/x").addArgument(msiPath));
-        };
+    static PackageHandlers createMsiPackageHandlers(boolean createMsiLog) {
+        return new PackageHandlers(cmd -> installMsi(cmd, createMsiLog),
+                cmd -> uninstallMsi(cmd, createMsiLog), WindowsHelper::unpackMsi);
+    }
 
-        PackageHandlers msi = new PackageHandlers();
-        msi.installHandler = cmd -> installMsi.accept(cmd, true);
-        msi.uninstallHandler = cmd -> {
-            if (Files.exists(cmd.outputBundle())) {
-                installMsi.accept(cmd, false);
+    private static Optional<Path> configureMsiLogFile(JPackageCommand cmd, boolean createMsiLog) {
+        final Optional<Path> msiLogFile;
+        if (createMsiLog) {
+            msiLogFile = Optional.of(TKit.createTempFile(String.format("logs\\%s-msi.log",
+                    cmd.packageType().getName())));
+        } else {
+            msiLogFile = Optional.empty();
+        }
+
+        cmd.winMsiLogFile(msiLogFile.orElse(null));
+
+        return msiLogFile;
+    }
+
+    private static int runMsiInstaller(JPackageCommand cmd, boolean createMsiLog, boolean install) {
+        cmd.verifyIsOfType(PackageType.WIN_MSI);
+        final var msiPath = TransientMsi.create(cmd).path();
+        return runMsiexecWithRetries(Executor.of("msiexec", "/qn", "/norestart",
+                install ? "/i" : "/x").addArgument(msiPath), configureMsiLogFile(cmd, createMsiLog));
+    }
+
+    private static int installMsi(JPackageCommand cmd, boolean createMsiLog) {
+        return runMsiInstaller(cmd, createMsiLog, true);
+    }
+
+    private static void uninstallMsi(JPackageCommand cmd, boolean createMsiLog) {
+        if (Files.exists(cmd.outputBundle())) {
+            runMsiInstaller(cmd, createMsiLog, false);
+        } else {
+            configureMsiLogFile(cmd, false);
+        }
+    }
+
+    private static Path unpackMsi(JPackageCommand cmd, Path destinationDir) {
+        cmd.verifyIsOfType(PackageType.WIN_MSI);
+        configureMsiLogFile(cmd, false);
+        final Path unpackBat = destinationDir.resolve("unpack.bat");
+        final Path unpackDir = destinationDir.resolve(
+                TKit.removeRootFromAbsolutePath(
+                        getInstallationRootDirectory(cmd)));
+
+        final Path msiPath = TransientMsi.create(cmd).path();
+
+        // Put msiexec in .bat file because can't pass value of TARGETDIR
+        // property containing spaces through ProcessBuilder properly.
+        // Set folder permissions to allow msiexec unpack msi bundle.
+        TKit.createTextFile(unpackBat, List.of(
+                String.format("icacls \"%s\" /inheritance:e /grant Users:M",
+                        destinationDir),
+                String.join(" ", List.of(
+                "msiexec",
+                "/a",
+                String.format("\"%s\"", msiPath),
+                "/qn",
+                String.format("TARGETDIR=\"%s\"",
+                        unpackDir.toAbsolutePath().normalize())))));
+        runMsiexecWithRetries(Executor.of("cmd", "/c", unpackBat.toString()), Optional.empty());
+
+        //
+        // WiX3 uses "." as the value of "DefaultDir" field for "ProgramFiles64Folder" folder in msi's Directory table
+        // WiX4 uses "PFiles64" as the value of "DefaultDir" field for "ProgramFiles64Folder" folder in msi's Directory table
+        // msiexec creates "Program Files/./<App Installation Directory>" from WiX3 msi which translates to "Program Files/<App Installation Directory>"
+        // msiexec creates "Program Files/PFiles64/<App Installation Directory>" from WiX4 msi
+        // So for WiX4 msi we need to transform "Program Files/PFiles64/<App Installation Directory>" into "Program Files/<App Installation Directory>"
+        //
+        // WiX4 does the same thing for %LocalAppData%.
+        //
+        for (var extraPathComponent : List.of("PFiles64", "LocalApp")) {
+            if (Files.isDirectory(unpackDir.resolve(extraPathComponent))) {
+                Path installationSubDirectory = getInstallationSubDirectory(cmd);
+                Path from = Path.of(extraPathComponent).resolve(installationSubDirectory);
+                Path to = installationSubDirectory;
+                TKit.trace(String.format("Convert [%s] into [%s] in [%s] directory", from, to,
+                        unpackDir));
+                ThrowingRunnable.toRunnable(() -> {
+                    Files.createDirectories(unpackDir.resolve(to).getParent());
+                    Files.move(unpackDir.resolve(from), unpackDir.resolve(to));
+                    TKit.deleteDirectoryRecursive(unpackDir.resolve(extraPathComponent));
+                }).run();
             }
-        };
-        msi.unpackHandler = (cmd, destinationDir) -> {
-            cmd.verifyIsOfType(PackageType.WIN_MSI);
-            final Path unpackBat = destinationDir.resolve("unpack.bat");
-            final Path unpackDir = destinationDir.resolve(
-                    TKit.removeRootFromAbsolutePath(
-                            getInstallationRootDirectory(cmd)));
+        }
+        return destinationDir;
+    }
 
-            final Path msiPath = TransientMsi.create(cmd).path();
+    static PackageHandlers createExePackageHandlers(boolean createMsiLog) {
+        return new PackageHandlers(cmd -> installExe(cmd, createMsiLog), WindowsHelper::uninstallExe, Optional.empty());
+    }
 
-            // Put msiexec in .bat file because can't pass value of TARGETDIR
-            // property containing spaces through ProcessBuilder properly.
-            // Set folder permissions to allow msiexec unpack msi bundle.
-            TKit.createTextFile(unpackBat, List.of(
-                    String.format("icacls \"%s\" /inheritance:e /grant Users:M",
-                            destinationDir),
-                    String.join(" ", List.of(
-                    "msiexec",
-                    "/a",
-                    String.format("\"%s\"", msiPath),
-                    "/qn",
-                    String.format("TARGETDIR=\"%s\"",
-                            unpackDir.toAbsolutePath().normalize())))));
-            runMsiexecWithRetries(Executor.of("cmd", "/c", unpackBat.toString()));
+    private static int runExeInstaller(JPackageCommand cmd, boolean createMsiLog, boolean install) {
+        cmd.verifyIsOfType(PackageType.WIN_EXE);
+        Executor exec = new Executor().setExecutable(cmd.outputBundle());
+        if (install) {
+            exec.addArgument("/qn").addArgument("/norestart");
+        } else {
+            exec.addArgument("uninstall");
+        }
+        return runMsiexecWithRetries(exec, configureMsiLogFile(cmd, createMsiLog));
+    }
 
-            //
-            // WiX3 uses "." as the value of "DefaultDir" field for "ProgramFiles64Folder" folder in msi's Directory table
-            // WiX4 uses "PFiles64" as the value of "DefaultDir" field for "ProgramFiles64Folder" folder in msi's Directory table
-            // msiexec creates "Program Files/./<App Installation Directory>" from WiX3 msi which translates to "Program Files/<App Installation Directory>"
-            // msiexec creates "Program Files/PFiles64/<App Installation Directory>" from WiX4 msi
-            // So for WiX4 msi we need to transform "Program Files/PFiles64/<App Installation Directory>" into "Program Files/<App Installation Directory>"
-            //
-            // WiX4 does the same thing for %LocalAppData%.
-            //
-            for (var extraPathComponent : List.of("PFiles64", "LocalApp")) {
-                if (Files.isDirectory(unpackDir.resolve(extraPathComponent))) {
-                    Path installationSubDirectory = getInstallationSubDirectory(cmd);
-                    Path from = Path.of(extraPathComponent).resolve(installationSubDirectory);
-                    Path to = installationSubDirectory;
-                    TKit.trace(String.format("Convert [%s] into [%s] in [%s] directory", from, to,
-                            unpackDir));
-                    ThrowingRunnable.toRunnable(() -> {
-                        Files.createDirectories(unpackDir.resolve(to).getParent());
-                        Files.move(unpackDir.resolve(from), unpackDir.resolve(to));
-                        TKit.deleteDirectoryRecursive(unpackDir.resolve(extraPathComponent));
-                    }).run();
-                }
-            }
-            return destinationDir;
-        };
-        return msi;
+    private static int installExe(JPackageCommand cmd, boolean createMsiLog) {
+        return runExeInstaller(cmd, createMsiLog, true);
+    }
+
+    private static void uninstallExe(JPackageCommand cmd) {
+        if (Files.exists(cmd.outputBundle())) {
+            runExeInstaller(cmd, false, false);
+        } else {
+            configureMsiLogFile(cmd, false);
+        }
     }
 
     record TransientMsi(Path path) {
@@ -204,28 +257,6 @@ public class WindowsHelper {
         }
     }
 
-    static PackageHandlers createExePackageHandlers() {
-        BiConsumer<JPackageCommand, Boolean> installExe = (cmd, install) -> {
-            cmd.verifyIsOfType(PackageType.WIN_EXE);
-            Executor exec = new Executor().setExecutable(cmd.outputBundle());
-            if (install) {
-                exec.addArgument("/qn").addArgument("/norestart");
-            } else {
-                exec.addArgument("uninstall");
-            }
-            runMsiexecWithRetries(exec);
-        };
-
-        PackageHandlers exe = new PackageHandlers();
-        exe.installHandler = cmd -> installExe.accept(cmd, true);
-        exe.uninstallHandler = cmd -> {
-            if (Files.exists(cmd.outputBundle())) {
-                installExe.accept(cmd, false);
-            }
-        };
-        return exe;
-    }
-
     static void verifyDesktopIntegration(JPackageCommand cmd,
             String launcherName) {
         new DesktopIntegrationVerifier(cmd, launcherName);
@@ -415,14 +446,12 @@ public class WindowsHelper {
         }
 
         private void verifySystemDesktopShortcut(boolean exists) {
-            Path dir = Path.of(queryRegistryValueCache(
-                    SYSTEM_SHELL_FOLDERS_REGKEY, "Common Desktop"));
+            Path dir = SpecialFolder.COMMON_DESKTOP.getPath();
             verifyShortcut(dir.resolve(desktopShortcutPath), exists);
         }
 
         private void verifyUserLocalDesktopShortcut(boolean exists) {
-            Path dir = Path.of(
-                    queryRegistryValueCache(USER_SHELL_FOLDERS_REGKEY, "Desktop"));
+            Path dir = SpecialFolder.USER_DESKTOP.getPath();
             verifyShortcut(dir.resolve(desktopShortcutPath), exists);
         }
 
@@ -445,19 +474,22 @@ public class WindowsHelper {
             Path shortcutPath = shortcutsRoot.resolve(startMenuShortcutPath);
             verifyShortcut(shortcutPath, exists);
             if (!exists) {
-                TKit.assertDirectoryNotEmpty(shortcutPath.getParent());
+                final var parentDir = shortcutPath.getParent();
+                if (Files.isDirectory(parentDir)) {
+                    TKit.assertDirectoryNotEmpty(parentDir);
+                } else {
+                    TKit.assertPathExists(parentDir, false);
+                }
             }
         }
 
         private void verifySystemStartMenuShortcut(boolean exists) {
-            verifyStartMenuShortcut(Path.of(queryRegistryValueCache(
-                    SYSTEM_SHELL_FOLDERS_REGKEY, "Common Programs")), exists);
+            verifyStartMenuShortcut(SpecialFolder.COMMON_START_MENU_PROGRAMS.getPath(), exists);
 
         }
 
         private void verifyUserLocalStartMenuShortcut(boolean exists) {
-            verifyStartMenuShortcut(Path.of(queryRegistryValueCache(
-                    USER_SHELL_FOLDERS_REGKEY, "Programs")), exists);
+            verifyStartMenuShortcut(SpecialFolder.USER_START_MENU_PROGRAMS.getPath(), exists);
         }
 
         private void verifyFileAssociationsRegistry(Path faFile) {
@@ -565,16 +597,66 @@ public class WindowsHelper {
         return value;
     }
 
-    private static String queryRegistryValueCache(String keyPath,
-            String valueName) {
-        String key = String.format("[%s][%s]", keyPath, valueName);
-        String value = REGISTRY_VALUES.get(key);
-        if (value == null) {
-            value = queryRegistryValue(keyPath, valueName);
-            REGISTRY_VALUES.put(key, value);
+    // See .NET special folders
+    private enum SpecialFolderDotNet {
+        Desktop,
+        CommonDesktop,
+
+        Programs,
+        CommonPrograms;
+
+        Path getPath() {
+            final var str = Executor.of("powershell", "-NoLogo", "-NoProfile",
+                    "-NonInteractive", "-Command",
+                    String.format("[Environment]::GetFolderPath('%s')", name())
+                    ).saveFirstLineOfOutput().execute().getFirstLineOfOutput();
+
+            TKit.trace(String.format("Value of .NET special folder '%s' is [%s]", name(), str));
+
+            return Path.of(str);
+        }
+    }
+
+    private record RegValuePath(String keyPath, String valueName) {
+        RegValuePath {
+            Objects.requireNonNull(keyPath);
+            Objects.requireNonNull(valueName);
         }
 
-        return value;
+        Optional<String> findValue() {
+            return Optional.ofNullable(queryRegistryValue(keyPath, valueName));
+        }
+    }
+
+    private enum SpecialFolder {
+        COMMON_START_MENU_PROGRAMS(SYSTEM_SHELL_FOLDERS_REGKEY, "Common Programs", SpecialFolderDotNet.CommonPrograms),
+        USER_START_MENU_PROGRAMS(USER_SHELL_FOLDERS_REGKEY, "Programs", SpecialFolderDotNet.Programs),
+
+        COMMON_DESKTOP(SYSTEM_SHELL_FOLDERS_REGKEY, "Common Desktop", SpecialFolderDotNet.CommonDesktop),
+        USER_DESKTOP(USER_SHELL_FOLDERS_REGKEY, "Desktop", SpecialFolderDotNet.Desktop);
+
+        SpecialFolder(String keyPath, String valueName) {
+            reg = new RegValuePath(keyPath, valueName);
+            alt = Optional.empty();
+        }
+
+        SpecialFolder(String keyPath, String valueName, SpecialFolderDotNet alt) {
+            reg = new RegValuePath(keyPath, valueName);
+            this.alt = Optional.of(alt);
+        }
+
+        Path getPath() {
+            return CACHE.computeIfAbsent(this, k -> reg.findValue().map(Path::of).orElseGet(() -> {
+                return alt.map(SpecialFolderDotNet::getPath).orElseThrow(() -> {
+                    return new NoSuchElementException(String.format("Failed to find path to %s folder", name()));
+                });
+            }));
+        }
+
+        private final RegValuePath reg;
+        private final Optional<SpecialFolderDotNet> alt;
+
+        private final static Map<SpecialFolder, Path> CACHE = new ConcurrentHashMap<>();
     }
 
     private static final class ShortPathUtils {
@@ -617,7 +699,5 @@ public class WindowsHelper {
     private static final String SYSTEM_SHELL_FOLDERS_REGKEY = "HKLM\\Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\Shell Folders";
     private static final String USER_SHELL_FOLDERS_REGKEY = "HKCU\\Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\Shell Folders";
 
-    private static final Map<String, String> REGISTRY_VALUES = new HashMap<>();
-
     private static final int WIN_MAX_PATH = 260;
 }
diff --git a/test/jdk/tools/jpackage/resources/fail-os-condition.wxf b/test/jdk/tools/jpackage/resources/fail-os-condition.wxf
new file mode 100644
index 00000000000..3b3a79ff2ae
--- /dev/null
+++ b/test/jdk/tools/jpackage/resources/fail-os-condition.wxf
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+-->
+
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
+  <Fragment>
+    <Condition Message="Not supported on this version of Windows">0</Condition>
+    <ComponentGroup Id="FragmentOsCondition"/>
+  </Fragment>
+</Wix>
diff --git a/test/jdk/tools/jpackage/windows/WinOSConditionTest.java b/test/jdk/tools/jpackage/windows/WinOSConditionTest.java
new file mode 100644
index 00000000000..3cf4fdd541c
--- /dev/null
+++ b/test/jdk/tools/jpackage/windows/WinOSConditionTest.java
@@ -0,0 +1,77 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.io.IOException;
+import java.nio.file.Files;
+import jdk.jpackage.test.Annotations.Test;
+import jdk.jpackage.test.JPackageCommand;
+import jdk.jpackage.test.PackageTest;
+import jdk.jpackage.test.PackageType;
+import jdk.jpackage.test.RunnablePackageTest.Action;
+import jdk.jpackage.test.TKit;
+
+/*
+ * @test
+ * @summary jpackage test that installer blocks on Windows of older version
+ * @library /test/jdk/tools/jpackage/helpers
+ * @key jpackagePlatformPackage
+ * @build jdk.jpackage.test.*
+ * @compile -Xlint:all -Werror WinOSConditionTest.java
+ * @requires (os.family == "windows")
+ * @requires (jpackage.test.SQETest == null)
+ * @run main/othervm/timeout=360 -Xmx512m jdk.jpackage.test.Main
+ *  --jpt-run=WinOSConditionTest
+ */
+public class WinOSConditionTest {
+
+    @Test
+    public static void test() throws IOException {
+        // Use custom always failing condition. Installation is expected to fail.
+        // This way the test covers:
+        //  1. If jpackage picks custom OS version condition from the resource directory;
+        //  2. If the installer created by jpackage uses OS version condition.
+        new PackageTest().ignoreBundleOutputDir()
+        .forTypes(PackageType.WINDOWS)
+        .configureHelloApp()
+        .addInitializer(JPackageCommand::setFakeRuntime)
+        .addInitializer(cmd -> {
+            final var resourceDir = TKit.createTempDirectory("resource-dir");
+            Files.copy(TKit.TEST_SRC_ROOT.resolve("resources/fail-os-condition.wxf"), resourceDir.resolve("os-condition.wxf"));
+            // Create a per-user installer to let user without admin privileges install it.
+            cmd.addArguments("--win-per-user-install",
+                    "--resource-dir", resourceDir.toString()).setFakeRuntime();
+        })
+        .addUninstallVerifier(cmd -> {
+            // MSI error code 1603 is generic.
+            // Dig into the last msi log file for log messages specific to failed condition.
+            try (final var lines = cmd.winMsiLogFileContents().orElseThrow()) {
+                TKit.assertTextStream("Doing action: LaunchConditions").predicate(String::endsWith)
+                    .andThen(TKit.assertTextStream("Not supported on this version of Windows").predicate(String::endsWith)).apply(lines);
+            }
+        })
+        .createMsiLog(true)
+        .setExpectedInstallExitCode(1603)
+        // Create, try install the package (installation should fail) and verify it is not installed.
+        .run(Action.CREATE, Action.INSTALL, Action.VERIFY_UNINSTALL);
+    }
+}

From 29de20dbc22e0b68698a1b9cb1241ae5861a6b9a Mon Sep 17 00:00:00 2001
From: Alexander Zvegintsev <azvegint@openjdk.org>
Date: Tue, 4 Mar 2025 20:55:45 +0000
Subject: [PATCH 225/587] 8280991: [XWayland] No displayChanged event after
 setDisplayMode call

Reviewed-by: honkar, prr
---
 .../classes/sun/awt/X11GraphicsDevice.java    | 38 ++++++++++++++-
 test/jdk/ProblemList.txt                      |  1 -
 .../FullscreenWindowProps.java                |  6 ++-
 .../NoResizeEventOnDMChangeTest.java          | 46 ++++++++++++++++++-
 4 files changed, 87 insertions(+), 4 deletions(-)

diff --git a/src/java.desktop/unix/classes/sun/awt/X11GraphicsDevice.java b/src/java.desktop/unix/classes/sun/awt/X11GraphicsDevice.java
index b17b4c45644..39ecb13c6a4 100644
--- a/src/java.desktop/unix/classes/sun/awt/X11GraphicsDevice.java
+++ b/src/java.desktop/unix/classes/sun/awt/X11GraphicsDevice.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -72,6 +72,15 @@ public final class X11GraphicsDevice extends GraphicsDevice
     private boolean shutdownHookRegistered;
     private int scale;
 
+    // Wayland clients are by design not allowed to change the resolution in Wayland.
+    // XRandR in Xwayland is just an emulation, it doesn't actually change the resolution.
+    // This emulation is per window/x11 client, so different clients can have
+    // different emulated resolutions at the same time.
+    // So any request to get the current display mode will always return
+    // the original screen resolution, even if we are in emulated resolution.
+    // To handle this situation, we store the last set display mode in this variable.
+    private volatile DisplayMode xwlCurrentDisplayMode;
+
     public X11GraphicsDevice(int screennum) {
         this.screen = screennum;
         this.scale = initScaleFactor();
@@ -117,6 +126,20 @@ public final class X11GraphicsDevice extends GraphicsDevice
 
     private Rectangle getBoundsImpl() {
         Rectangle rect = pGetBounds(getScreen());
+
+        if (XToolkit.isOnWayland() && xwlCurrentDisplayMode != null) {
+            // XRandR resolution change in Xwayland is an emulation,
+            // and implemented in such a way that multiple display modes
+            // for a device are only available in a single screen scenario,
+            // if we have multiple screens they will each have a single display mode
+            // (no emulated resolution change is available).
+            // So we don't have to worry about x and y for a screen here.
+            rect.setSize(
+                    xwlCurrentDisplayMode.getWidth(),
+                    xwlCurrentDisplayMode.getHeight()
+            );
+        }
+
         if (getScaleFactor() != 1) {
             rect.x = scaleDown(rect.x);
             rect.y = scaleDown(rect.y);
@@ -400,10 +423,19 @@ public final class X11GraphicsDevice extends GraphicsDevice
     @Override
     public synchronized DisplayMode getDisplayMode() {
         if (isFullScreenSupported()) {
+            if (XToolkit.isOnWayland() && xwlCurrentDisplayMode != null) {
+                return xwlCurrentDisplayMode;
+            }
+
             DisplayMode mode = getCurrentDisplayMode(screen);
             if (mode == null) {
                 mode = getDefaultDisplayMode();
             }
+
+            if (XToolkit.isOnWayland()) {
+                xwlCurrentDisplayMode = mode;
+            }
+
             return mode;
         } else {
             if (origDisplayMode == null) {
@@ -474,6 +506,10 @@ public final class X11GraphicsDevice extends GraphicsDevice
                           dm.getWidth(), dm.getHeight(),
                           dm.getRefreshRate());
 
+        if (XToolkit.isOnWayland()) {
+            xwlCurrentDisplayMode = dm;
+        }
+
         // update bounds of the fullscreen window
         w.setBounds(0, 0, dm.getWidth(), dm.getHeight());
 
diff --git a/test/jdk/ProblemList.txt b/test/jdk/ProblemList.txt
index 37401913840..5ba6b33433c 100644
--- a/test/jdk/ProblemList.txt
+++ b/test/jdk/ProblemList.txt
@@ -499,7 +499,6 @@ java/awt/image/multiresolution/MultiResolutionJOptionPaneIconTest.java 8274106 m
 
 # Wayland related
 
-java/awt/FullScreen/FullscreenWindowProps/FullscreenWindowProps.java 8280991 linux-x64
 java/awt/FullScreen/SetFullScreenTest.java 8332155 linux-x64
 
 ############################################################################
diff --git a/test/jdk/java/awt/FullScreen/FullscreenWindowProps/FullscreenWindowProps.java b/test/jdk/java/awt/FullScreen/FullscreenWindowProps/FullscreenWindowProps.java
index f5f77d47319..66f358d64ce 100644
--- a/test/jdk/java/awt/FullScreen/FullscreenWindowProps/FullscreenWindowProps.java
+++ b/test/jdk/java/awt/FullScreen/FullscreenWindowProps/FullscreenWindowProps.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -52,6 +52,10 @@ public final class FullscreenWindowProps {
                 super.paint(g);
                 g.setColor(Color.GREEN);
                 g.fillRect(0, 0, getWidth(), getHeight());
+                g.setColor(Color.RED);
+                DisplayMode displayMode =
+                        getGraphicsConfiguration().getDevice().getDisplayMode();
+                g.drawString(displayMode.toString(), 100, 100);
             }
         };
         try {
diff --git a/test/jdk/java/awt/FullScreen/NoResizeEventOnDMChangeTest/NoResizeEventOnDMChangeTest.java b/test/jdk/java/awt/FullScreen/NoResizeEventOnDMChangeTest/NoResizeEventOnDMChangeTest.java
index 455ad2f2b0a..c7277e8b96c 100644
--- a/test/jdk/java/awt/FullScreen/NoResizeEventOnDMChangeTest/NoResizeEventOnDMChangeTest.java
+++ b/test/jdk/java/awt/FullScreen/NoResizeEventOnDMChangeTest/NoResizeEventOnDMChangeTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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 @@
  * @bug 6646411
  * @summary Tests that full screen window and its children receive resize
             event when display mode changes
+ * @library /test/lib
+ * @build   jdk.test.lib.Platform jtreg.SkippedException
  * @run main/othervm NoResizeEventOnDMChangeTest
  * @run main/othervm -Dsun.java2d.d3d=false NoResizeEventOnDMChangeTest
  */
@@ -44,9 +46,21 @@ import java.awt.event.ComponentAdapter;
 import java.awt.event.ComponentEvent;
 import java.awt.event.WindowAdapter;
 import java.awt.event.WindowEvent;
+import java.io.BufferedReader;
+import java.io.IOException;
+
+import static java.util.concurrent.TimeUnit.SECONDS;
+import jdk.test.lib.Platform;
+import jtreg.SkippedException;
 
 public class NoResizeEventOnDMChangeTest {
+
     public static void main(String[] args) {
+        if (Platform.isOnWayland() && !isFixDelivered()) {
+            throw new SkippedException("Test skipped because fix was not" +
+                    "delivered in current GnomeShell version");
+        }
+
         final GraphicsDevice gd = GraphicsEnvironment.
             getLocalGraphicsEnvironment().getDefaultScreenDevice();
 
@@ -231,4 +245,34 @@ public class NoResizeEventOnDMChangeTest {
             return dmChanges;
         }
     }
+
+    private static boolean isFixDelivered() {
+        try {
+            Process process =
+                    new ProcessBuilder("/usr/bin/gnome-shell", "--version")
+                            .start();
+
+            try (BufferedReader reader = process.inputReader()) {
+                if (process.waitFor(2, SECONDS) &&  process.exitValue() == 0) {
+                    String line = reader.readLine();
+                    if (line != null) {
+                        System.out.println("Gnome shell version: " + line);
+                        String[] versionComponents = line
+                                .replaceAll("[^\\d.]", "")
+                                .split("\\.");
+
+                        if (versionComponents.length >= 1) {
+                            return Integer.parseInt(versionComponents[0]) > 42;
+                        }
+                    }
+                }
+            }
+        } catch (IOException
+                 | InterruptedException
+                 | IllegalThreadStateException
+                 | NumberFormatException ignored) {
+        }
+
+        return false;
+    }
 }

From 38b4d46c1ff3701d75ff8347e5edbb01acd9b512 Mon Sep 17 00:00:00 2001
From: Cesar Soares Lucas <cslucas@openjdk.org>
Date: Tue, 4 Mar 2025 21:44:40 +0000
Subject: [PATCH 226/587] 8351081: Off-by-one error in ShenandoahCardCluster

Reviewed-by: wkemper
---
 src/hotspot/share/gc/shenandoah/shenandoahScanRemembered.hpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/hotspot/share/gc/shenandoah/shenandoahScanRemembered.hpp b/src/hotspot/share/gc/shenandoah/shenandoahScanRemembered.hpp
index f5acb4f10ed..e28f2f03052 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahScanRemembered.hpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahScanRemembered.hpp
@@ -402,7 +402,7 @@ public:
 
   ShenandoahCardCluster(ShenandoahDirectCardMarkRememberedSet* rs) {
     _rs = rs;
-    _object_starts = NEW_C_HEAP_ARRAY(crossing_info, rs->total_cards(), mtGC);
+    _object_starts = NEW_C_HEAP_ARRAY(crossing_info, rs->total_cards() + 1, mtGC); // the +1 is to account for card table guarding entry
     for (size_t i = 0; i < rs->total_cards(); i++) {
       _object_starts[i].short_word = 0;
     }

From 20ea218ce52f79704445acfe2d4a3dc9d04e86d2 Mon Sep 17 00:00:00 2001
From: Dean Long <dlong@openjdk.org>
Date: Tue, 4 Mar 2025 23:10:52 +0000
Subject: [PATCH 227/587] 8336042: Caller/callee param size mismatch in
 deoptimization causes crash

Co-authored-by: Richard Reingruber <rrich@openjdk.org>
Reviewed-by: pchilanomate, rrich, vlivanov, never
---
 .../aarch64/abstractInterpreter_aarch64.cpp   |  3 +-
 .../cpu/arm/abstractInterpreter_arm.cpp       |  9 ++
 .../cpu/ppc/abstractInterpreter_ppc.cpp       |  9 ++
 .../cpu/riscv/abstractInterpreter_riscv.cpp   |  3 +-
 .../cpu/s390/abstractInterpreter_s390.cpp     |  7 ++
 .../cpu/x86/abstractInterpreter_x86.cpp       |  5 +-
 src/hotspot/share/interpreter/bytecode.hpp    |  2 +
 .../share/interpreter/bytecode.inline.hpp     | 10 ++
 src/hotspot/share/runtime/deoptimization.cpp  | 21 ++--
 src/hotspot/share/runtime/vframeArray.cpp     |  6 +-
 .../jtreg/compiler/jsr292/MHDeoptTest.java    | 97 +++++++++++++++++++
 11 files changed, 158 insertions(+), 14 deletions(-)
 create mode 100644 test/hotspot/jtreg/compiler/jsr292/MHDeoptTest.java

diff --git a/src/hotspot/cpu/aarch64/abstractInterpreter_aarch64.cpp b/src/hotspot/cpu/aarch64/abstractInterpreter_aarch64.cpp
index a3c729fdd56..b543c96f3b8 100644
--- a/src/hotspot/cpu/aarch64/abstractInterpreter_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/abstractInterpreter_aarch64.cpp
@@ -149,7 +149,8 @@ void AbstractInterpreter::layout_activation(Method* method,
 
 #ifdef ASSERT
   if (caller->is_interpreted_frame()) {
-    assert(locals < caller->fp() + frame::interpreter_frame_initial_sp_offset, "bad placement");
+    assert(locals <= caller->interpreter_frame_expression_stack(), "bad placement");
+    assert(locals >= interpreter_frame->sender_sp() + max_locals - 1, "bad placement");
   }
 #endif
 
diff --git a/src/hotspot/cpu/arm/abstractInterpreter_arm.cpp b/src/hotspot/cpu/arm/abstractInterpreter_arm.cpp
index 075db4736f1..978011491a0 100644
--- a/src/hotspot/cpu/arm/abstractInterpreter_arm.cpp
+++ b/src/hotspot/cpu/arm/abstractInterpreter_arm.cpp
@@ -131,6 +131,15 @@ void AbstractInterpreter::layout_activation(Method* method,
 
   intptr_t* locals = interpreter_frame->sender_sp() + max_locals - 1;
 
+#ifdef ASSERT
+  if (caller->is_interpreted_frame()) {
+    // Test exact placement on top of caller args
+    intptr_t* l2 = caller->interpreter_frame_last_sp() + caller_actual_parameters - 1;
+    assert(l2 <= caller->interpreter_frame_expression_stack(), "bad placement");
+    assert(l2 >= locals, "bad placement");
+  }
+#endif
+
   interpreter_frame->interpreter_frame_set_locals(locals);
   BasicObjectLock* montop = interpreter_frame->interpreter_frame_monitor_begin();
   BasicObjectLock* monbot = montop - moncount;
diff --git a/src/hotspot/cpu/ppc/abstractInterpreter_ppc.cpp b/src/hotspot/cpu/ppc/abstractInterpreter_ppc.cpp
index cc094ad4f99..beadce33637 100644
--- a/src/hotspot/cpu/ppc/abstractInterpreter_ppc.cpp
+++ b/src/hotspot/cpu/ppc/abstractInterpreter_ppc.cpp
@@ -128,6 +128,15 @@ void AbstractInterpreter::layout_activation(Method* method,
     caller->interpreter_frame_esp() + caller_actual_parameters :
     caller->sp() + method->max_locals() - 1 + (frame::java_abi_size / Interpreter::stackElementSize);
 
+#ifdef ASSERT
+  if (caller->is_interpreted_frame()) {
+    assert(locals_base <= caller->interpreter_frame_expression_stack(), "bad placement");
+    const int caller_abi_bytesize = (is_bottom_frame ? frame::top_ijava_frame_abi_size : frame::parent_ijava_frame_abi_size);
+    intptr_t* l2 = caller->sp() + method->max_locals() - 1 + (caller_abi_bytesize / Interpreter::stackElementSize);
+    assert(locals_base >= l2, "bad placement");
+  }
+#endif
+
   intptr_t* monitor_base = caller->sp() - frame::ijava_state_size / Interpreter::stackElementSize;
   intptr_t* monitor      = monitor_base - (moncount * frame::interpreter_frame_monitor_size());
   intptr_t* esp_base     = monitor - 1;
diff --git a/src/hotspot/cpu/riscv/abstractInterpreter_riscv.cpp b/src/hotspot/cpu/riscv/abstractInterpreter_riscv.cpp
index 843a58e28d7..00a6877684a 100644
--- a/src/hotspot/cpu/riscv/abstractInterpreter_riscv.cpp
+++ b/src/hotspot/cpu/riscv/abstractInterpreter_riscv.cpp
@@ -141,7 +141,8 @@ void AbstractInterpreter::layout_activation(Method* method,
 
 #ifdef ASSERT
   if (caller->is_interpreted_frame()) {
-    assert(locals < caller->fp() + frame::interpreter_frame_initial_sp_offset, "bad placement");
+    assert(locals <= caller->interpreter_frame_expression_stack(), "bad placement");
+    assert(locals >= interpreter_frame->sender_sp() + max_locals - 1, "bad placement");
   }
 #endif
 
diff --git a/src/hotspot/cpu/s390/abstractInterpreter_s390.cpp b/src/hotspot/cpu/s390/abstractInterpreter_s390.cpp
index 37aa9d9a0e8..e815542a51e 100644
--- a/src/hotspot/cpu/s390/abstractInterpreter_s390.cpp
+++ b/src/hotspot/cpu/s390/abstractInterpreter_s390.cpp
@@ -182,6 +182,13 @@ void AbstractInterpreter::layout_activation(Method* method,
   intptr_t* sender_sp;
   if (caller->is_interpreted_frame()) {
     sender_sp = caller->interpreter_frame_top_frame_sp();
+#ifdef ASSERT
+    assert(locals_base <= caller->interpreter_frame_expression_stack(), "bad placement");
+    // Test caller-aligned placement vs callee-aligned
+    intptr_t* l2 = (caller->sp() + method->max_locals() - 1 +
+      frame::z_parent_ijava_frame_abi_size / Interpreter::stackElementSize);
+    assert(locals_base >= l2, "bad placement");
+#endif
   } else if (caller->is_compiled_frame()) {
     sender_sp = caller->fp() - caller->cb()->frame_size();
     // The bottom frame's sender_sp is its caller's unextended_sp.
diff --git a/src/hotspot/cpu/x86/abstractInterpreter_x86.cpp b/src/hotspot/cpu/x86/abstractInterpreter_x86.cpp
index 68ac5b6ca9a..6680b8c4c03 100644
--- a/src/hotspot/cpu/x86/abstractInterpreter_x86.cpp
+++ b/src/hotspot/cpu/x86/abstractInterpreter_x86.cpp
@@ -87,7 +87,10 @@ void AbstractInterpreter::layout_activation(Method* method,
 
 #ifdef ASSERT
   if (caller->is_interpreted_frame()) {
-    assert(locals < caller->fp() + frame::interpreter_frame_initial_sp_offset, "bad placement");
+    // Test exact placement on top of caller args
+    intptr_t* l2 = caller->interpreter_frame_last_sp() + caller_actual_parameters - 1;
+    assert(l2 <= caller->interpreter_frame_expression_stack(), "bad placement");
+    assert(l2 >= locals, "bad placement");
   }
 #endif
 
diff --git a/src/hotspot/share/interpreter/bytecode.hpp b/src/hotspot/share/interpreter/bytecode.hpp
index 870fcb7784e..de83cfe5d71 100644
--- a/src/hotspot/share/interpreter/bytecode.hpp
+++ b/src/hotspot/share/interpreter/bytecode.hpp
@@ -226,6 +226,8 @@ class Bytecode_invoke: public Bytecode_member_ref {
 
   bool has_appendix();
 
+  bool has_member_arg() const;
+
   int size_of_parameters() const;
 
  private:
diff --git a/src/hotspot/share/interpreter/bytecode.inline.hpp b/src/hotspot/share/interpreter/bytecode.inline.hpp
index 43e0cf2991d..139f477d397 100644
--- a/src/hotspot/share/interpreter/bytecode.inline.hpp
+++ b/src/hotspot/share/interpreter/bytecode.inline.hpp
@@ -28,6 +28,7 @@
 #include "interpreter/bytecode.hpp"
 
 #include "oops/cpCache.inline.hpp"
+#include "prims/methodHandles.hpp"
 
 inline bool Bytecode_invoke::has_appendix() {
   if (invoke_code() == Bytecodes::_invokedynamic) {
@@ -37,4 +38,13 @@ inline bool Bytecode_invoke::has_appendix() {
   }
 }
 
+inline bool Bytecode_invoke::has_member_arg() const {
+  // NOTE: We could resolve the call and use the resolved adapter method here, but this function
+  // is used by deoptimization, where resolving could lead to problems, so we avoid that here
+  // by doing things symbolically.
+  //
+  // invokedynamic instructions don't have a class but obviously don't have a MemberName appendix.
+  return !is_invokedynamic() && MethodHandles::has_member_arg(klass(), name());
+}
+
 #endif // SHARE_INTERPRETER_BYTECODE_INLINE_HPP
diff --git a/src/hotspot/share/runtime/deoptimization.cpp b/src/hotspot/share/runtime/deoptimization.cpp
index 4a51e2cbd92..167b3095fa9 100644
--- a/src/hotspot/share/runtime/deoptimization.cpp
+++ b/src/hotspot/share/runtime/deoptimization.cpp
@@ -36,6 +36,7 @@
 #include "gc/shared/collectedHeap.hpp"
 #include "gc/shared/memAllocator.hpp"
 #include "interpreter/bytecode.hpp"
+#include "interpreter/bytecode.inline.hpp"
 #include "interpreter/bytecodeStream.hpp"
 #include "interpreter/interpreter.hpp"
 #include "interpreter/oopMapCache.hpp"
@@ -641,11 +642,12 @@ Deoptimization::UnrollBlock* Deoptimization::fetch_unroll_info_helper(JavaThread
   bool caller_was_method_handle = false;
   if (deopt_sender.is_interpreted_frame()) {
     methodHandle method(current, deopt_sender.interpreter_frame_method());
-    Bytecode_invoke cur = Bytecode_invoke_check(method, deopt_sender.interpreter_frame_bci());
-    if (cur.is_invokedynamic() || cur.is_invokehandle()) {
-      // Method handle invokes may involve fairly arbitrary chains of
-      // calls so it's impossible to know how much actual space the
-      // caller has for locals.
+    Bytecode_invoke cur(method, deopt_sender.interpreter_frame_bci());
+    if (cur.has_member_arg()) {
+      // This should cover all real-world cases.  One exception is a pathological chain of
+      // MH.linkToXXX() linker calls, which only trusted code could do anyway.  To handle that case, we
+      // would need to get the size from the resolved method entry.  Another exception would
+      // be an invokedynamic with an adapter that is really a MethodHandle linker.
       caller_was_method_handle = true;
     }
   }
@@ -748,9 +750,14 @@ Deoptimization::UnrollBlock* Deoptimization::fetch_unroll_info_helper(JavaThread
   }
 #endif
 
+  int caller_actual_parameters = -1; // value not used except for interpreted frames, see below
+  if (deopt_sender.is_interpreted_frame()) {
+    caller_actual_parameters = callee_parameters + (caller_was_method_handle ? 1 : 0);
+  }
+
   UnrollBlock* info = new UnrollBlock(array->frame_size() * BytesPerWord,
                                       caller_adjustment * BytesPerWord,
-                                      caller_was_method_handle ? 0 : callee_parameters,
+                                      caller_actual_parameters,
                                       number_of_frames,
                                       frame_sizes,
                                       frame_pcs,
@@ -939,7 +946,7 @@ JRT_LEAF(BasicType, Deoptimization::unpack_frames(JavaThread* thread, int exec_m
       if (Bytecodes::is_invoke(cur_code)) {
         Bytecode_invoke invoke(mh, iframe->interpreter_frame_bci());
         cur_invoke_parameter_size = invoke.size_of_parameters();
-        if (i != 0 && !invoke.is_invokedynamic() && MethodHandles::has_member_arg(invoke.klass(), invoke.name())) {
+        if (i != 0 && invoke.has_member_arg()) {
           callee_size_of_parameters++;
         }
       }
diff --git a/src/hotspot/share/runtime/vframeArray.cpp b/src/hotspot/share/runtime/vframeArray.cpp
index 1640b08c479..e17961fc424 100644
--- a/src/hotspot/share/runtime/vframeArray.cpp
+++ b/src/hotspot/share/runtime/vframeArray.cpp
@@ -25,6 +25,7 @@
 #include "classfile/vmSymbols.hpp"
 #include "code/vmreg.inline.hpp"
 #include "interpreter/bytecode.hpp"
+#include "interpreter/bytecode.inline.hpp"
 #include "interpreter/interpreter.hpp"
 #include "memory/allocation.inline.hpp"
 #include "memory/resourceArea.hpp"
@@ -610,10 +611,7 @@ void vframeArray::unpack_to_stack(frame &unpack_frame, int exec_mode, int caller
       methodHandle caller(current, elem->method());
       methodHandle callee(current, element(index - 1)->method());
       Bytecode_invoke inv(caller, elem->bci());
-      // invokedynamic instructions don't have a class but obviously don't have a MemberName appendix.
-      // NOTE:  Use machinery here that avoids resolving of any kind.
-      const bool has_member_arg =
-          !inv.is_invokedynamic() && MethodHandles::has_member_arg(inv.klass(), inv.name());
+      const bool has_member_arg = inv.has_member_arg();
       callee_parameters = callee->size_of_parameters() + (has_member_arg ? 1 : 0);
       callee_locals     = callee->max_locals();
     }
diff --git a/test/hotspot/jtreg/compiler/jsr292/MHDeoptTest.java b/test/hotspot/jtreg/compiler/jsr292/MHDeoptTest.java
new file mode 100644
index 00000000000..61dd330cfdd
--- /dev/null
+++ b/test/hotspot/jtreg/compiler/jsr292/MHDeoptTest.java
@@ -0,0 +1,97 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package compiler.jsr292;
+
+import java.lang.invoke.MethodHandle;
+import java.lang.invoke.MethodHandles;
+import java.lang.invoke.MethodHandles.Lookup;
+import java.lang.invoke.MethodType;
+import java.lang.reflect.Method;
+
+/*
+ * @test
+ * @bug 8336042
+ * @library /test/lib /
+ *
+ * @run main/bootclasspath/othervm -Xbatch -XX:-TieredCompilation compiler.jsr292.MHDeoptTest
+ *
+ */
+public class MHDeoptTest {
+
+    static int xx = 0;
+
+    public static void main(String[] args) throws Throwable {
+        MethodHandle mh1 = MethodHandles.lookup().findStatic(MHDeoptTest.class, "body1", MethodType.methodType(int.class));
+        MethodHandle mh2 = MethodHandles.lookup().findStatic(MHDeoptTest.class, "body2", MethodType.methodType(int.class));
+        MethodHandle[] arr = new MethodHandle[] {mh2, mh1};
+
+        for (MethodHandle mh : arr) {
+            for (int i = 1; i < 50_000; i++) {
+                xx = i;
+                mainLink(mh);
+            }
+        }
+
+    }
+
+    static int mainLink(MethodHandle mh) throws Throwable {
+        return (int)mh.invokeExact();
+    }
+
+    static int cnt = 1000;
+
+    static int body1() {
+        int limit = 0x7fff;
+        // uncommon trap
+        if (xx == limit) {
+            // OSR
+            for (int i = 0; i < 50_000; i++) {
+            }
+            ++cnt;
+            ++xx;
+        }
+        if (xx == limit + 1) {
+            return cnt + 1;
+        }
+        return cnt;
+    }
+
+    static int body2() {
+        int limit = 0x7fff;
+        int dummy = 0;
+        // uncommon trap
+        if (xx == limit) {
+            // OSR
+            for (int i = 0; i < 50_000; i++) {
+            }
+            ++cnt;
+            ++xx;
+        }
+        if (xx == limit + 1) {
+            return cnt + 1;
+        }
+        return cnt;
+    }
+
+}

From 62fa33a8704aef9fd08a8221f4fde217ab749dfc Mon Sep 17 00:00:00 2001
From: Jatin Bhateja <jbhateja@openjdk.org>
Date: Wed, 5 Mar 2025 01:34:15 +0000
Subject: [PATCH 228/587] 8351158: Incorrect APX EGPR register save ordering

Reviewed-by: kvn, sviswanathan
---
 src/hotspot/cpu/x86/sharedRuntime_x86_64.cpp | 35 ++++++++++----------
 1 file changed, 17 insertions(+), 18 deletions(-)

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

From b1a21b563e3ae13fa5c409a4f0c04686c3f5b34a Mon Sep 17 00:00:00 2001
From: Fei Yang <fyang@openjdk.org>
Date: Wed, 5 Mar 2025 02:17:22 +0000
Subject: [PATCH 229/587] 8351101: RISC-V: C2: Small improvement to
 MacroAssembler::revb

Reviewed-by: fjiang, mli
---
 src/hotspot/cpu/riscv/macroAssembler_riscv.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/hotspot/cpu/riscv/macroAssembler_riscv.cpp b/src/hotspot/cpu/riscv/macroAssembler_riscv.cpp
index f2bdd20890b..d3daef7664d 100644
--- a/src/hotspot/cpu/riscv/macroAssembler_riscv.cpp
+++ b/src/hotspot/cpu/riscv/macroAssembler_riscv.cpp
@@ -2892,7 +2892,6 @@ void MacroAssembler::revb(Register Rd, Register Rs, Register tmp1, Register tmp2
     slli(tmp1, tmp1, 8);
   }
   srli(Rd, Rs, 56);
-  zext(Rd, Rd, 8);
   orr(Rd, tmp1, Rd);
 }
 

From 75f028b46b245bdcbde8391af69020befda66b7d Mon Sep 17 00:00:00 2001
From: Emanuel Peter <epeter@openjdk.org>
Date: Wed, 5 Mar 2025 10:01:26 +0000
Subject: [PATCH 230/587] 8348657:
 compiler/loopopts/superword/TestEquivalentInvariants.java timed out

Reviewed-by: thartmann
---
 .../compiler/loopopts/superword/TestEquivalentInvariants.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/hotspot/jtreg/compiler/loopopts/superword/TestEquivalentInvariants.java b/test/hotspot/jtreg/compiler/loopopts/superword/TestEquivalentInvariants.java
index 09b087bee54..b3032b1fa4e 100644
--- a/test/hotspot/jtreg/compiler/loopopts/superword/TestEquivalentInvariants.java
+++ b/test/hotspot/jtreg/compiler/loopopts/superword/TestEquivalentInvariants.java
@@ -39,7 +39,7 @@ import java.lang.foreign.*;
  *          i.e. where the invariants have the same summands, but in a different order.
  * @modules java.base/jdk.internal.misc
  * @library /test/lib /
- * @run driver compiler.loopopts.superword.TestEquivalentInvariants
+ * @run driver/timeout=1200 compiler.loopopts.superword.TestEquivalentInvariants
  */
 
 public class TestEquivalentInvariants {

From de29ef3bf3a029f99f340de9f093cd20544217fd Mon Sep 17 00:00:00 2001
From: Sergey Chernyshev <schernyshev@openjdk.org>
Date: Wed, 5 Mar 2025 10:32:36 +0000
Subject: [PATCH 231/587] 8343191: Cgroup v1 subsystem fails to set subsystem
 path

Co-authored-by: Severin Gehwolf <sgehwolf@openjdk.org>
Reviewed-by: sgehwolf, mbaesken
---
 src/hotspot/os/linux/cgroupUtil_linux.cpp     |  30 ++++-
 .../os/linux/cgroupV1Subsystem_linux.cpp      |  77 +++++++++--
 .../os/linux/cgroupV2Subsystem_linux.cpp      |   6 +-
 .../cgroupv1/CgroupV1SubsystemController.java |  42 +++---
 .../runtime/test_cgroupSubsystem_linux.cpp    |  78 ++++++++++-
 .../docker/TestMemoryWithSubgroups.java       | 126 ++++++++++++++++++
 .../CgroupV1SubsystemControllerTest.java      |  17 ++-
 .../cgroup/TestCgroupSubsystemFactory.java    |  34 ++++-
 .../TestDockerMemoryMetricsSubgroup.java      | 120 +++++++++++++++++
 9 files changed, 488 insertions(+), 42 deletions(-)
 create mode 100644 test/hotspot/jtreg/containers/docker/TestMemoryWithSubgroups.java
 create mode 100644 test/jdk/jdk/internal/platform/docker/TestDockerMemoryMetricsSubgroup.java

diff --git a/src/hotspot/os/linux/cgroupUtil_linux.cpp b/src/hotspot/os/linux/cgroupUtil_linux.cpp
index bc0e018d6be..b52ef87dcae 100644
--- a/src/hotspot/os/linux/cgroupUtil_linux.cpp
+++ b/src/hotspot/os/linux/cgroupUtil_linux.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024, Red Hat, Inc.
+ * Copyright (c) 2024, 2025, Red Hat, Inc.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -49,12 +49,18 @@ int CgroupUtil::processor_count(CgroupCpuController* cpu_ctrl, int host_cpus) {
 }
 
 void CgroupUtil::adjust_controller(CgroupMemoryController* mem) {
+  assert(mem->cgroup_path() != nullptr, "invariant");
+  if (strstr(mem->cgroup_path(), "../") != nullptr) {
+    log_warning(os, container)("Cgroup memory controller path at '%s' seems to have moved to '%s', detected limits won't be accurate",
+      mem->mount_point(), mem->cgroup_path());
+    mem->set_subsystem_path("/");
+    return;
+  }
   if (!mem->needs_hierarchy_adjustment()) {
     // nothing to do
     return;
   }
   log_trace(os, container)("Adjusting controller path for memory: %s", mem->subsystem_path());
-  assert(mem->cgroup_path() != nullptr, "invariant");
   char* orig = os::strdup(mem->cgroup_path());
   char* cg_path = os::strdup(orig);
   char* last_slash;
@@ -62,7 +68,8 @@ void CgroupUtil::adjust_controller(CgroupMemoryController* mem) {
   julong phys_mem = os::Linux::physical_memory();
   char* limit_cg_path = nullptr;
   jlong limit = mem->read_memory_limit_in_bytes(phys_mem);
-  jlong lowest_limit = phys_mem;
+  jlong lowest_limit = limit < 0 ? phys_mem : limit;
+  julong orig_limit = ((julong)lowest_limit) != phys_mem ? lowest_limit : phys_mem;
   while ((last_slash = strrchr(cg_path, '/')) != cg_path) {
     *last_slash = '\0'; // strip path
     // update to shortened path and try again
@@ -83,7 +90,7 @@ void CgroupUtil::adjust_controller(CgroupMemoryController* mem) {
     limit_cg_path = os::strdup("/");
   }
   assert(lowest_limit >= 0, "limit must be positive");
-  if ((julong)lowest_limit != phys_mem) {
+  if ((julong)lowest_limit != orig_limit) {
     // we've found a lower limit anywhere in the hierarchy,
     // set the path to the limit path
     assert(limit_cg_path != nullptr, "limit path must be set");
@@ -93,6 +100,7 @@ void CgroupUtil::adjust_controller(CgroupMemoryController* mem) {
                              mem->subsystem_path(),
                              lowest_limit);
   } else {
+    log_trace(os, container)("Lowest limit was: " JLONG_FORMAT, lowest_limit);
     log_trace(os, container)("No lower limit found for memory in hierarchy %s, "
                              "adjusting to original path %s",
                               mem->mount_point(), orig);
@@ -104,19 +112,26 @@ void CgroupUtil::adjust_controller(CgroupMemoryController* mem) {
 }
 
 void CgroupUtil::adjust_controller(CgroupCpuController* cpu) {
+  assert(cpu->cgroup_path() != nullptr, "invariant");
+  if (strstr(cpu->cgroup_path(), "../") != nullptr) {
+    log_warning(os, container)("Cgroup cpu controller path at '%s' seems to have moved to '%s', detected limits won't be accurate",
+      cpu->mount_point(), cpu->cgroup_path());
+    cpu->set_subsystem_path("/");
+    return;
+  }
   if (!cpu->needs_hierarchy_adjustment()) {
     // nothing to do
     return;
   }
   log_trace(os, container)("Adjusting controller path for cpu: %s", cpu->subsystem_path());
-  assert(cpu->cgroup_path() != nullptr, "invariant");
   char* orig = os::strdup(cpu->cgroup_path());
   char* cg_path = os::strdup(orig);
   char* last_slash;
   assert(cg_path[0] == '/', "cgroup path must start with '/'");
   int host_cpus = os::Linux::active_processor_count();
   int cpus = CgroupUtil::processor_count(cpu, host_cpus);
-  int lowest_limit = host_cpus;
+  int lowest_limit = cpus < host_cpus ? cpus: host_cpus;
+  int orig_limit = lowest_limit != host_cpus ? lowest_limit : host_cpus;
   char* limit_cg_path = nullptr;
   while ((last_slash = strrchr(cg_path, '/')) != cg_path) {
     *last_slash = '\0'; // strip path
@@ -138,7 +153,7 @@ void CgroupUtil::adjust_controller(CgroupCpuController* cpu) {
     limit_cg_path = os::strdup(cg_path);
   }
   assert(lowest_limit >= 0, "limit must be positive");
-  if (lowest_limit != host_cpus) {
+  if (lowest_limit != orig_limit) {
     // we've found a lower limit anywhere in the hierarchy,
     // set the path to the limit path
     assert(limit_cg_path != nullptr, "limit path must be set");
@@ -148,6 +163,7 @@ void CgroupUtil::adjust_controller(CgroupCpuController* cpu) {
                              cpu->subsystem_path(),
                              lowest_limit);
   } else {
+    log_trace(os, container)("Lowest limit was: %d", lowest_limit);
     log_trace(os, container)("No lower limit found for cpu in hierarchy %s, "
                              "adjusting to original path %s",
                               cpu->mount_point(), orig);
diff --git a/src/hotspot/os/linux/cgroupV1Subsystem_linux.cpp b/src/hotspot/os/linux/cgroupV1Subsystem_linux.cpp
index a6ac2822b25..8d9c3edb72a 100644
--- a/src/hotspot/os/linux/cgroupV1Subsystem_linux.cpp
+++ b/src/hotspot/os/linux/cgroupV1Subsystem_linux.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -37,6 +37,47 @@
 /*
  * Set directory to subsystem specific files based
  * on the contents of the mountinfo and cgroup files.
+ *
+ * The method determines whether it runs in
+ * - host mode
+ * - container mode
+ *
+ * In the host mode, _root is equal to "/" and
+ * the subsystem path is equal to the _mount_point path
+ * joined with cgroup_path.
+ *
+ * In the container mode, it can be two possibilities:
+ * - private namespace (cgroupns=private)
+ * - host namespace (cgroupns=host, default mode in cgroup V1 hosts)
+ *
+ * Private namespace is equivalent to the host mode, i.e.
+ * the subsystem path is set by concatenating
+ * _mount_point and cgroup_path.
+ *
+ * In the host namespace, _root is equal to host's cgroup path
+ * of the control group to which the containerized process
+ * belongs to at the moment of creation. The mountinfo and
+ * cgroup files are mirrored from the host, while the subsystem
+ * specific files are mapped directly at _mount_point, i.e.
+ * at /sys/fs/cgroup/<controller>/, the subsystem path is
+ * then set equal to _mount_point.
+ *
+ * A special case of the subsystem path is when a cgroup path
+ * includes a subgroup, when a containerized process was associated
+ * with an existing cgroup, that is different from cgroup
+ * in which the process has been created.
+ * Here, the _root is equal to the host's initial cgroup path,
+ * cgroup_path will be equal to host's new cgroup path.
+ * As host cgroup hierarchies are not accessible in the container,
+ * it needs to be determined which part of cgroup path
+ * is accessible inside container, i.e. mapped under
+ * /sys/fs/cgroup/<controller>/<subgroup>.
+ * In Docker default setup, host's cgroup path can be
+ * of the form: /docker/<CONTAINER_ID>/<subgroup>,
+ * from which only <subgroup> is mapped.
+ * The method trims cgroup path from left, until the subgroup
+ * component is found. The subsystem path will be set to
+ * the _mount_point joined with the subgroup path.
  */
 void CgroupV1Controller::set_subsystem_path(const char* cgroup_path) {
   if (_cgroup_path != nullptr) {
@@ -49,28 +90,36 @@ void CgroupV1Controller::set_subsystem_path(const char* cgroup_path) {
   _cgroup_path = os::strdup(cgroup_path);
   stringStream ss;
   if (_root != nullptr && cgroup_path != nullptr) {
+    ss.print_raw(_mount_point);
     if (strcmp(_root, "/") == 0) {
-      ss.print_raw(_mount_point);
+      // host processes and containers with cgroupns=private
       if (strcmp(cgroup_path,"/") != 0) {
         ss.print_raw(cgroup_path);
       }
-      _path = os::strdup(ss.base());
     } else {
-      if (strcmp(_root, cgroup_path) == 0) {
-        ss.print_raw(_mount_point);
-        _path = os::strdup(ss.base());
-      } else {
-        char *p = strstr((char*)cgroup_path, _root);
-        if (p != nullptr && p == _root) {
-          if (strlen(cgroup_path) > strlen(_root)) {
-            ss.print_raw(_mount_point);
-            const char* cg_path_sub = cgroup_path + strlen(_root);
-            ss.print_raw(cg_path_sub);
-            _path = os::strdup(ss.base());
+      // containers with cgroupns=host, default setting is _root==cgroup_path
+      if (strcmp(_root, cgroup_path) != 0) {
+        if (*cgroup_path != '\0' && strcmp(cgroup_path, "/") != 0) {
+          // When moved to a subgroup, between subgroups, the path suffix will change.
+          const char *suffix = cgroup_path;
+          while (suffix != nullptr) {
+            stringStream pp;
+            pp.print_raw(_mount_point);
+            pp.print_raw(suffix);
+            if (os::file_exists(pp.base())) {
+              ss.print_raw(suffix);
+              if (suffix != cgroup_path) {
+                log_trace(os, container)("set_subsystem_path: cgroup v1 path reduced to: %s.", suffix);
+              }
+              break;
+            }
+            log_trace(os, container)("set_subsystem_path: skipped non-existent directory: %s.", suffix);
+            suffix = strchr(suffix + 1, '/');
           }
         }
       }
     }
+    _path = os::strdup(ss.base());
   }
 }
 
diff --git a/src/hotspot/os/linux/cgroupV2Subsystem_linux.cpp b/src/hotspot/os/linux/cgroupV2Subsystem_linux.cpp
index 62e8cac3a62..cbadbb9db02 100644
--- a/src/hotspot/os/linux/cgroupV2Subsystem_linux.cpp
+++ b/src/hotspot/os/linux/cgroupV2Subsystem_linux.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2022, Red Hat Inc.
+ * Copyright (c) 2020, 2025, Red Hat Inc.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -292,6 +292,10 @@ jlong memory_swap_limit_value(CgroupV2Controller* ctrl) {
 }
 
 void CgroupV2Controller::set_subsystem_path(const char* cgroup_path) {
+  if (_cgroup_path != nullptr) {
+    os::free(_cgroup_path);
+  }
+  _cgroup_path = os::strdup(cgroup_path);
   if (_path != nullptr) {
     os::free(_path);
   }
diff --git a/src/java.base/linux/classes/jdk/internal/platform/cgroupv1/CgroupV1SubsystemController.java b/src/java.base/linux/classes/jdk/internal/platform/cgroupv1/CgroupV1SubsystemController.java
index 051b4da5f78..fd325a8f8b4 100644
--- a/src/java.base/linux/classes/jdk/internal/platform/cgroupv1/CgroupV1SubsystemController.java
+++ b/src/java.base/linux/classes/jdk/internal/platform/cgroupv1/CgroupV1SubsystemController.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,9 @@
 
 package jdk.internal.platform.cgroupv1;
 
+import java.lang.System.Logger.Level;
+import java.nio.file.Path;
+import java.nio.file.Files;
 import jdk.internal.platform.CgroupSubsystem;
 import jdk.internal.platform.CgroupSubsystemController;
 
@@ -44,27 +47,36 @@ public class CgroupV1SubsystemController implements CgroupSubsystemController {
 
     public void setPath(String cgroupPath) {
         if (root != null && cgroupPath != null) {
+            String path = mountPoint;
             if (root.equals("/")) {
+                // host processes and containers with cgroupns=private
                 if (!cgroupPath.equals("/")) {
-                    path = mountPoint + cgroupPath;
+                    path += cgroupPath;
                 }
-                else {
-                    path = mountPoint;
-                }
-            }
-            else {
-                if (root.equals(cgroupPath)) {
-                    path = mountPoint;
-                }
-                else {
-                    if (cgroupPath.startsWith(root)) {
-                        if (cgroupPath.length() > root.length()) {
-                            String cgroupSubstr = cgroupPath.substring(root.length());
-                            path = mountPoint + cgroupSubstr;
+            } else {
+                // containers with cgroupns=host, default setting is _root==cgroup_path
+                if (!cgroupPath.equals(root)) {
+                    if (!cgroupPath.equals("") && !cgroupPath.equals("/")) {
+                        // When moved to a subgroup, between subgroups, the path suffix will change.
+                        Path cgp = Path.of(cgroupPath);
+                        int nameCount = cgp.getNameCount();
+                        for (int i=0; i < nameCount; i++) {
+                            Path dir = Path.of(mountPoint, cgp.toString());
+                            if (Files.isDirectory(dir)) {
+                                path = dir.toString();
+                                if (i > 0) {
+                                    System.getLogger("jdk.internal.platform").log(Level.DEBUG, String.format(
+                                            "Cgroup v1 path reduced to: %s.", cgp));
+                                }
+                                break;
+                            }
+                            int currentNameCount = cgp.getNameCount();
+                            cgp = (currentNameCount > 1) ? cgp.subpath(1, currentNameCount) : Path.of("");
                         }
                     }
                 }
             }
+            this.path = path;
         }
     }
 
diff --git a/test/hotspot/gtest/runtime/test_cgroupSubsystem_linux.cpp b/test/hotspot/gtest/runtime/test_cgroupSubsystem_linux.cpp
index c8e2beff52b..c090aa28e9a 100644
--- a/test/hotspot/gtest/runtime/test_cgroupSubsystem_linux.cpp
+++ b/test/hotspot/gtest/runtime/test_cgroupSubsystem_linux.cpp
@@ -25,6 +25,7 @@
 
 #include "runtime/os.hpp"
 #include "cgroupSubsystem_linux.hpp"
+#include "cgroupUtil_linux.hpp"
 #include "cgroupV1Subsystem_linux.hpp"
 #include "cgroupV2Subsystem_linux.hpp"
 #include "unittest.hpp"
@@ -432,9 +433,16 @@ TEST(cgroupTest, set_cgroupv1_subsystem_path) {
     "/user.slice/user-1000.slice/user@1000.service", // cgroup_path
     "/sys/fs/cgroup/mem"                             // expected_path
   };
-  int length = 2;
+  TestCase container_moving_cgroup = {
+    "/sys/fs/cgroup/cpu,cpuacct",                                            // mount_path
+    "/system.slice/garden.service/garden/good/2f57368b-0eda-4e52-64d8-af5c", // root_path
+    "/system.slice/garden.service/garden/bad/2f57368b-0eda-4e52-64d8-af5c",  // cgroup_path
+    "/sys/fs/cgroup/cpu,cpuacct"                                             // expected_path
+  };
+  int length = 3;
   TestCase* testCases[] = { &host,
-                            &container_engine };
+                            &container_engine,
+                            &container_moving_cgroup };
   for (int i = 0; i < length; i++) {
     CgroupV1Controller* ctrl = new CgroupV1Controller( (char*)testCases[i]->root_path,
                                                        (char*)testCases[i]->mount_path,
@@ -444,6 +452,72 @@ TEST(cgroupTest, set_cgroupv1_subsystem_path) {
   }
 }
 
+TEST(cgroupTest, set_cgroupv1_subsystem_path_adjusted) {
+  TestCase memory = {
+    "/sys/fs/cgroup/memory", // mount_path
+    "/",                     // root_path
+    "../test1",              // cgroup_path
+    "/sys/fs/cgroup/memory"  // expected_path
+  };
+  TestCase cpu = {
+    "/sys/fs/cgroup/cpu", // mount_path
+    "/",                  // root_path
+    "../../test2",        // cgroup_path
+    "/sys/fs/cgroup/cpu"  // expected_path
+  };
+  CgroupCpuController* ccc = new CgroupV1CpuController(CgroupV1Controller((char*)cpu.root_path,
+                                                                          (char*)cpu.mount_path,
+                                                                          true /* read-only mount */));
+  ccc->set_subsystem_path((char*)cpu.cgroup_path);
+  EXPECT_TRUE(ccc->needs_hierarchy_adjustment());
+
+  CgroupUtil::adjust_controller(ccc);
+  ASSERT_STREQ(cpu.expected_path, ccc->subsystem_path());
+  EXPECT_FALSE(ccc->needs_hierarchy_adjustment());
+
+  CgroupMemoryController* cmc = new CgroupV1MemoryController(CgroupV1Controller((char*)memory.root_path,
+                                                                                (char*)memory.mount_path,
+                                                                                true /* read-only mount */));
+  cmc->set_subsystem_path((char*)memory.cgroup_path);
+  EXPECT_TRUE(cmc->needs_hierarchy_adjustment());
+
+  CgroupUtil::adjust_controller(cmc);
+  ASSERT_STREQ(memory.expected_path, cmc->subsystem_path());
+  EXPECT_FALSE(cmc->needs_hierarchy_adjustment());
+}
+
+TEST(cgroupTest, set_cgroupv2_subsystem_path_adjusted) {
+  TestCase memory = {
+    "/sys/fs/cgroup", // mount_path
+    "/",              // root_path
+    "../test1",       // cgroup_path
+    "/sys/fs/cgroup"  // expected_path
+  };
+  TestCase cpu = {
+    "/sys/fs/cgroup", // mount_path
+    "/",              // root_path
+    "../../test2",    // cgroup_path
+    "/sys/fs/cgroup"  // expected_path
+  };
+  CgroupCpuController* ccc = new CgroupV2CpuController(CgroupV2Controller((char*)cpu.mount_path,
+                                                                          (char*)cpu.cgroup_path,
+                                                                          true /* read-only mount */));
+  EXPECT_TRUE(ccc->needs_hierarchy_adjustment());
+
+  CgroupUtil::adjust_controller(ccc);
+  ASSERT_STREQ(cpu.expected_path, ccc->subsystem_path());
+  EXPECT_FALSE(ccc->needs_hierarchy_adjustment());
+
+  CgroupMemoryController* cmc = new CgroupV2MemoryController(CgroupV2Controller((char*)memory.mount_path,
+                                                                                (char*)memory.cgroup_path,
+                                                                                true /* read-only mount */));
+  EXPECT_TRUE(cmc->needs_hierarchy_adjustment());
+
+  CgroupUtil::adjust_controller(cmc);
+  ASSERT_STREQ(memory.expected_path, cmc->subsystem_path());
+  EXPECT_FALSE(cmc->needs_hierarchy_adjustment());
+}
+
 TEST(cgroupTest, set_cgroupv2_subsystem_path) {
   TestCase at_mount_root = {
     "/sys/fs/cgroup",       // mount_path
diff --git a/test/hotspot/jtreg/containers/docker/TestMemoryWithSubgroups.java b/test/hotspot/jtreg/containers/docker/TestMemoryWithSubgroups.java
new file mode 100644
index 00000000000..e7989874d7a
--- /dev/null
+++ b/test/hotspot/jtreg/containers/docker/TestMemoryWithSubgroups.java
@@ -0,0 +1,126 @@
+/*
+ * Copyright (C) 2025, BELLSOFT. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please 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.containers.docker.Common;
+import jdk.test.lib.containers.docker.DockerTestUtils;
+import jdk.test.lib.containers.docker.DockerRunOptions;
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.process.ProcessTools;
+import jdk.internal.platform.Metrics;
+
+import java.util.ArrayList;
+
+import jtreg.SkippedException;
+
+/*
+ * @test
+ * @bug 8343191
+ * @requires os.family == "linux"
+ * @modules java.base/jdk.internal.platform
+ * @library /test/lib
+ * @build jdk.test.whitebox.WhiteBox
+ * @run driver jdk.test.lib.helpers.ClassFileInstaller -jar whitebox.jar jdk.test.whitebox.WhiteBox
+ * @run main TestMemoryWithSubgroups
+ */
+public class TestMemoryWithSubgroups {
+
+    private static final String imageName = Common.imageName("subgroup");
+
+    public static void main(String[] args) throws Exception {
+        Metrics metrics = Metrics.systemMetrics();
+        if (metrics == null) {
+            System.out.println("Cgroup not configured.");
+            return;
+        }
+        if (!DockerTestUtils.canTestDocker()) {
+            System.out.println("Unable to run docker tests.");
+            return;
+        }
+        Common.prepareWhiteBox();
+        DockerTestUtils.buildJdkContainerImage(imageName);
+
+        if ("cgroupv1".equals(metrics.getProvider())) {
+            try {
+                testMemoryLimitSubgroupV1("200m", "100m", "104857600", false);
+                testMemoryLimitSubgroupV1("1g", "500m", "524288000", false);
+                testMemoryLimitSubgroupV1("200m", "100m", "104857600", true);
+                testMemoryLimitSubgroupV1("1g", "500m", "524288000", true);
+            } finally {
+                DockerTestUtils.removeDockerImage(imageName);
+            }
+        } else if ("cgroupv2".equals(metrics.getProvider())) {
+            try {
+                testMemoryLimitSubgroupV2("200m", "100m", "104857600", false);
+                testMemoryLimitSubgroupV2("1g", "500m", "524288000", false);
+                testMemoryLimitSubgroupV2("200m", "100m", "104857600", true);
+                testMemoryLimitSubgroupV2("1g", "500m", "524288000", true);
+            } finally {
+                DockerTestUtils.removeDockerImage(imageName);
+            }
+        } else {
+            throw new SkippedException("Metrics are from neither cgroup v1 nor v2, skipped for now.");
+        }
+    }
+
+    private static void testMemoryLimitSubgroupV1(String containerMemorySize, String valueToSet, String expectedValue, boolean privateNamespace)
+            throws Exception {
+
+        Common.logNewTestCase("Cgroup V1 subgroup memory limit: " + valueToSet);
+
+        DockerRunOptions opts = new DockerRunOptions(imageName, "sh", "-c");
+        opts.javaOpts = new ArrayList<>();
+        opts.appendTestJavaOptions = false;
+        opts.addDockerOpts("--privileged")
+            .addDockerOpts("--cgroupns=" + (privateNamespace ? "private" : "host"))
+            .addDockerOpts("--memory", containerMemorySize);
+        opts.addClassOptions("mkdir -p /sys/fs/cgroup/memory/test ; " +
+            "echo " + valueToSet + " > /sys/fs/cgroup/memory/test/memory.limit_in_bytes ; " +
+            "echo $$ > /sys/fs/cgroup/memory/test/cgroup.procs ; " +
+            "/jdk/bin/java -Xlog:os+container=trace -version");
+
+        Common.run(opts)
+            .shouldMatch("Lowest limit was:.*" + expectedValue);
+    }
+
+    private static void testMemoryLimitSubgroupV2(String containerMemorySize, String valueToSet, String expectedValue, boolean privateNamespace)
+            throws Exception {
+
+        Common.logNewTestCase("Cgroup V2 subgroup memory limit: " + valueToSet);
+
+        DockerRunOptions opts = new DockerRunOptions(imageName, "sh", "-c");
+        opts.javaOpts = new ArrayList<>();
+        opts.appendTestJavaOptions = false;
+        opts.addDockerOpts("--privileged")
+            .addDockerOpts("--cgroupns=" + (privateNamespace ? "private" : "host"))
+            .addDockerOpts("--memory", containerMemorySize);
+        opts.addClassOptions("mkdir -p /sys/fs/cgroup/memory/test ; " +
+            "echo $$ > /sys/fs/cgroup/memory/test/cgroup.procs ; " +
+            "echo '+memory' > /sys/fs/cgroup/cgroup.subtree_control ; " +
+            "echo '+memory' > /sys/fs/cgroup/memory/cgroup.subtree_control ; " +
+            "echo " + valueToSet + " > /sys/fs/cgroup/memory/test/memory.max ; " +
+            "/jdk/bin/java -Xlog:os+container=trace -version");
+
+        Common.run(opts)
+            .shouldMatch("Lowest limit was:.*" + expectedValue);
+    }
+}
diff --git a/test/jdk/jdk/internal/platform/cgroup/CgroupV1SubsystemControllerTest.java b/test/jdk/jdk/internal/platform/cgroup/CgroupV1SubsystemControllerTest.java
index a97edd581fe..3ab8b35ae0a 100644
--- a/test/jdk/jdk/internal/platform/cgroup/CgroupV1SubsystemControllerTest.java
+++ b/test/jdk/jdk/internal/platform/cgroup/CgroupV1SubsystemControllerTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, Red Hat, Inc.
+ * Copyright (c) 2022, 2025, 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
@@ -64,6 +64,9 @@ public class CgroupV1SubsystemControllerTest {
         assertEquals(expectedPath, ctrl.path());
     }
 
+    /*
+     * Less common cases: Containers
+     */
     @Test
     public void testCgPathSubstring() {
         String root = "/foo/bar/baz";
@@ -71,8 +74,18 @@ public class CgroupV1SubsystemControllerTest {
         CgroupV1SubsystemController ctrl = new CgroupV1SubsystemController(root, mountPoint);
         String cgroupPath = "/foo/bar/baz/some";
         ctrl.setPath(cgroupPath);
-        String expectedPath = mountPoint + "/some";
+        String expectedPath = mountPoint;
         assertEquals(expectedPath, ctrl.path());
     }
 
+    @Test
+    public void testCgPathToMovedPath() {
+        String root = "/system.slice/garden.service/garden/good/2f57368b-0eda-4e52-64d8-af5c";
+        String mountPoint = "/sys/fs/cgroup/cpu,cpuacct";
+        CgroupV1SubsystemController ctrl = new CgroupV1SubsystemController(root, mountPoint);
+        String cgroupPath = "/system.slice/garden.service/garden/bad/2f57368b-0eda-4e52-64d8-af5c";
+        ctrl.setPath(cgroupPath);
+        String expectedPath = mountPoint;
+        assertEquals(expectedPath, ctrl.path());
+    }
 }
diff --git a/test/jdk/jdk/internal/platform/cgroup/TestCgroupSubsystemFactory.java b/test/jdk/jdk/internal/platform/cgroup/TestCgroupSubsystemFactory.java
index ede74b5011e..8cf53c66e8a 100644
--- a/test/jdk/jdk/internal/platform/cgroup/TestCgroupSubsystemFactory.java
+++ b/test/jdk/jdk/internal/platform/cgroup/TestCgroupSubsystemFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2022, Red Hat Inc.
+ * Copyright (c) 2020, 2025, 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
@@ -44,6 +44,7 @@ import jdk.internal.platform.CgroupSubsystemFactory;
 import jdk.internal.platform.CgroupSubsystemFactory.CgroupTypeResult;
 import jdk.internal.platform.CgroupV1MetricsImpl;
 import jdk.internal.platform.cgroupv1.CgroupV1Subsystem;
+import jdk.internal.platform.cgroupv1.CgroupV1SubsystemController;
 import jdk.internal.platform.Metrics;
 import jdk.test.lib.Utils;
 import jdk.test.lib.util.FileUtils;
@@ -75,8 +76,10 @@ public class TestCgroupSubsystemFactory {
     private Path cgroupv1MntInfoDoubleControllers;
     private Path cgroupv1MntInfoDoubleControllers2;
     private Path cgroupv1MntInfoColonsHierarchy;
+    private Path cgroupv1MntInfoNonTrivialRoot;
     private Path cgroupv1SelfCgroup;
     private Path cgroupv1SelfColons;
+    private Path cgroupv1SelfNonTrivialRoot;
     private Path cgroupv2SelfCgroup;
     private Path cgroupv1SelfCgroupJoinCtrl;
     private Path cgroupv1CgroupsOnlyCPUCtrl;
@@ -175,6 +178,7 @@ public class TestCgroupSubsystemFactory {
             "42 30 0:38 / /sys/fs/cgroup/cpuset rw,nosuid,nodev,noexec,relatime shared:14 - cgroup none rw,seclabel,cpuset\n" +
             "43 30 0:39 / /sys/fs/cgroup/blkio rw,nosuid,nodev,noexec,relatime shared:15 - cgroup none rw,seclabel,blkio\n" +
             "44 30 0:40 / /sys/fs/cgroup/freezer rw,nosuid,nodev,noexec,relatime shared:16 - cgroup none rw,seclabel,freezer\n";
+    private String mntInfoNonTrivialRoot = "2207 2196 0:43 /system.slice/garden.service/garden/good/2f57368b-0eda-4e52-64d8-af5c /sys/fs/cgroup/cpu,cpuacct ro,nosuid,nodev,noexec,relatime master:25 - cgroup cgroup rw,cpu,cpuacct\n";
     private String cgroupsNonZeroHierarchy =
             "#subsys_name hierarchy   num_cgroups enabled\n" +
             "cpuset  9   1   1\n" +
@@ -230,6 +234,7 @@ public class TestCgroupSubsystemFactory {
             "2:cpu,cpuacct:/\n" +
             "1:name=systemd:/user.slice/user-1000.slice/user@1000.service/apps.slice/apps-org.gnome.Terminal.slice/vte-spawn-3c00b338-5b65-439f-8e97-135e183d135d.scope\n" +
             "0::/user.slice/user-1000.slice/user@1000.service/apps.slice/apps-org.gnome.Terminal.slice/vte-spawn-3c00b338-5b65-439f-8e97-135e183d135d.scope\n";
+    private String cgroupv1SelfNTRoot = "11:cpu,cpuacct:/system.slice/garden.service/garden/bad/2f57368b-0eda-4e52-64d8-af5c\n";
     private String cgroupv2SelfCgroupContent = "0::/user.slice/user-1000.slice/session-2.scope";
 
     // We have a mix of V1 and V2 controllers, but none of the V1 controllers
@@ -294,12 +299,18 @@ public class TestCgroupSubsystemFactory {
             cgroupv1MntInfoColonsHierarchy = Paths.get(existingDirectory.toString(), "mountinfo_colons");
             Files.writeString(cgroupv1MntInfoColonsHierarchy, mntInfoColons);
 
+            cgroupv1MntInfoNonTrivialRoot = Paths.get(existingDirectory.toString(), "mountinfo_nt_root");
+            Files.writeString(cgroupv1MntInfoNonTrivialRoot, mntInfoNonTrivialRoot);
+
             cgroupv1SelfCgroup = Paths.get(existingDirectory.toString(), "self_cgroup_cgv1");
             Files.writeString(cgroupv1SelfCgroup, cgroupv1SelfCgroupContent);
 
             cgroupv1SelfColons = Paths.get(existingDirectory.toString(), "self_colons_cgv1");
             Files.writeString(cgroupv1SelfColons, cgroupv1SelfColonsContent);
 
+            cgroupv1SelfNonTrivialRoot = Paths.get(existingDirectory.toString(), "self_nt_root_cgv1");
+            Files.writeString(cgroupv1SelfNonTrivialRoot, cgroupv1SelfNTRoot);
+
             cgroupv2SelfCgroup = Paths.get(existingDirectory.toString(), "self_cgroup_cgv2");
             Files.writeString(cgroupv2SelfCgroup, cgroupv2SelfCgroupContent);
 
@@ -449,6 +460,27 @@ public class TestCgroupSubsystemFactory {
         assertEquals(memoryInfo.getMountRoot(), memoryInfo.getCgroupPath());
     }
 
+    @Test
+    public void testMountPrefixCgroupsV1() throws IOException {
+        String cgroups = cgroupv1CgInfoNonZeroHierarchy.toString();
+        String mountInfo = cgroupv1MntInfoNonTrivialRoot.toString();
+        String selfCgroup = cgroupv1SelfNonTrivialRoot.toString();
+        Optional<CgroupTypeResult> result = CgroupSubsystemFactory.determineType(mountInfo, cgroups, selfCgroup);
+
+        assertTrue("Expected non-empty cgroup result", result.isPresent());
+        CgroupTypeResult res = result.get();
+        CgroupInfo cpuInfo = res.getInfos().get("cpu");
+        assertEquals(cpuInfo.getCgroupPath(), "/system.slice/garden.service/garden/bad/2f57368b-0eda-4e52-64d8-af5c");
+        String expectedMountPoint = "/sys/fs/cgroup/cpu,cpuacct";
+        assertEquals(expectedMountPoint, cpuInfo.getMountPoint());
+        CgroupV1SubsystemController cgroupv1MemoryController = new CgroupV1SubsystemController(cpuInfo.getMountRoot(), cpuInfo.getMountPoint());
+        cgroupv1MemoryController.setPath(cpuInfo.getCgroupPath());
+        String actualPath = cgroupv1MemoryController.path();
+        assertNotNull(actualPath);
+        String expectedPath = expectedMountPoint;
+        assertEquals("Should be equal to the mount point path", expectedPath, actualPath);
+    }
+
     @Test
     public void testZeroHierarchyCgroupsV1() throws IOException {
         String cgroups = cgroupv1CgInfoZeroHierarchy.toString();
diff --git a/test/jdk/jdk/internal/platform/docker/TestDockerMemoryMetricsSubgroup.java b/test/jdk/jdk/internal/platform/docker/TestDockerMemoryMetricsSubgroup.java
new file mode 100644
index 00000000000..2ac79c173ef
--- /dev/null
+++ b/test/jdk/jdk/internal/platform/docker/TestDockerMemoryMetricsSubgroup.java
@@ -0,0 +1,120 @@
+/*
+ * Copyright (c) 2025, BELLSOFT. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import jdk.internal.platform.Metrics;
+import jdk.test.lib.Utils;
+import jdk.test.lib.containers.docker.Common;
+import jdk.test.lib.containers.docker.DockerfileConfig;
+import jdk.test.lib.containers.docker.DockerRunOptions;
+import jdk.test.lib.containers.docker.DockerTestUtils;
+
+import java.util.ArrayList;
+
+import jtreg.SkippedException;
+
+/*
+ * @test
+ * @bug 8343191
+ * @key cgroups
+ * @summary Cgroup v1 subsystem fails to set subsystem path
+ * @requires container.support
+ * @library /test/lib
+ * @modules java.base/jdk.internal.platform
+ * @build MetricsMemoryTester
+ * @run main TestDockerMemoryMetricsSubgroup
+ */
+
+public class TestDockerMemoryMetricsSubgroup {
+    private static final String imageName =
+            DockerfileConfig.getBaseImageName() + ":" +
+            DockerfileConfig.getBaseImageVersion();
+
+    public static void main(String[] args) throws Exception {
+        Metrics metrics = Metrics.systemMetrics();
+        if (metrics == null) {
+            System.out.println("Cgroup not configured.");
+            return;
+        }
+        if (!DockerTestUtils.canTestDocker()) {
+            System.out.println("Unable to run docker tests.");
+            return;
+        }
+        if ("cgroupv1".equals(metrics.getProvider())) {
+            testMemoryLimitSubgroupV1("200m", "400m", false);
+            testMemoryLimitSubgroupV1("500m", "1G", false);
+            testMemoryLimitSubgroupV1("200m", "400m", true);
+            testMemoryLimitSubgroupV1("500m", "1G", true);
+        } else if ("cgroupv2".equals(metrics.getProvider())) {
+            testMemoryLimitSubgroupV2("200m", "400m", false);
+            testMemoryLimitSubgroupV2("500m", "1G", false);
+            testMemoryLimitSubgroupV2("200m", "400m", true);
+            testMemoryLimitSubgroupV2("500m", "1G", true);
+        } else {
+            throw new SkippedException("Metrics are from neither cgroup v1 nor v2, skipped for now.");
+        }
+    }
+
+    private static void testMemoryLimitSubgroupV1(String innerSize, String outerGroupMemorySize, boolean privateNamespace) throws Exception {
+        Common.logNewTestCase("testMemoryLimitSubgroup, innerSize = " + innerSize);
+        DockerRunOptions opts =
+            new DockerRunOptions(imageName, "sh", "-c");
+        opts.javaOpts = new ArrayList<>();
+        opts.appendTestJavaOptions = false;
+        opts.addDockerOpts("--volume", Utils.TEST_CLASSES + ":/test-classes/")
+            .addDockerOpts("--volume", Utils.TEST_JDK + ":/jdk")
+            .addDockerOpts("--privileged")
+            .addDockerOpts("--cgroupns=" + (privateNamespace ? "private" : "host"))
+            .addDockerOpts("--memory", outerGroupMemorySize);
+        opts.addClassOptions("mkdir -p /sys/fs/cgroup/memory/test ; " +
+            "echo " + innerSize + " > /sys/fs/cgroup/memory/test/memory.limit_in_bytes ; " +
+            "echo $$ > /sys/fs/cgroup/memory/test/cgroup.procs ; " +
+            "/jdk/bin/java -cp /test-classes/ " +
+            "--add-exports java.base/jdk.internal.platform=ALL-UNNAMED " +
+            "MetricsMemoryTester memory " + innerSize);
+
+        DockerTestUtils.dockerRunJava(opts).shouldHaveExitValue(0).shouldContain("TEST PASSED!!!");
+    }
+
+    private static void testMemoryLimitSubgroupV2(String innerSize, String outerGroupMemorySize, boolean privateNamespace) throws Exception {
+        Common.logNewTestCase("testMemoryLimitSubgroup, innerSize = " + innerSize);
+        DockerRunOptions opts =
+            new DockerRunOptions(imageName, "sh", "-c");
+        opts.javaOpts = new ArrayList<>();
+        opts.appendTestJavaOptions = false;
+        opts.addDockerOpts("--volume", Utils.TEST_CLASSES + ":/test-classes/")
+            .addDockerOpts("--volume", Utils.TEST_JDK + ":/jdk")
+            .addDockerOpts("--privileged")
+            .addDockerOpts("--cgroupns=" + (privateNamespace ? "private" : "host"))
+            .addDockerOpts("--memory", outerGroupMemorySize);
+        opts.addClassOptions("mkdir -p /sys/fs/cgroup/memory/test ; " +
+            "echo $$ > /sys/fs/cgroup/memory/test/cgroup.procs ; " +
+            "echo '+memory' > /sys/fs/cgroup/cgroup.subtree_control ; " +
+            "echo '+memory' > /sys/fs/cgroup/memory/cgroup.subtree_control ; " +
+            "echo " + innerSize + " > /sys/fs/cgroup/memory/test/memory.max ; " +
+            "/jdk/bin/java -cp /test-classes/ " +
+            "--add-exports java.base/jdk.internal.platform=ALL-UNNAMED " +
+            "MetricsMemoryTester memory " + innerSize);
+
+        DockerTestUtils.dockerRunJava(opts).shouldHaveExitValue(0).shouldContain("TEST PASSED!!!");
+    }
+}

From a88e8cd0d2a444187208b41875b9da45daadad6a Mon Sep 17 00:00:00 2001
From: Matthias Baesken <mbaesken@openjdk.org>
Date: Wed, 5 Mar 2025 12:30:09 +0000
Subject: [PATCH 232/587] 8350952: Remove some non present files from
 OPT_SPEED_SRC list

Reviewed-by: dholmes, clanger
---
 make/hotspot/lib/JvmFeatures.gmk | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/make/hotspot/lib/JvmFeatures.gmk b/make/hotspot/lib/JvmFeatures.gmk
index 0efb8671da8..0a897230f83 100644
--- a/make/hotspot/lib/JvmFeatures.gmk
+++ b/make/hotspot/lib/JvmFeatures.gmk
@@ -224,11 +224,9 @@ ifeq ($(call check-jvm-feature, opt-size), true)
       frame_ppc.cpp \
       frame_s390.cpp \
       frame_x86.cpp \
-      genCollectedHeap.cpp \
       generation.cpp \
       growableArray.cpp \
       handles.cpp \
-      hashtable.cpp \
       heap.cpp \
       icache.cpp \
       icache_arm.cpp \
@@ -246,7 +244,6 @@ ifeq ($(call check-jvm-feature, opt-size), true)
       linkResolver.cpp \
       klass.cpp \
       klassVtable.cpp \
-      markSweep.cpp \
       memRegion.cpp \
       memoryPool.cpp \
       method.cpp \

From 062b7c7348453e6a96c311082b112291913dc1d9 Mon Sep 17 00:00:00 2001
From: SendaoYan <syan@openjdk.org>
Date: Wed, 5 Mar 2025 12:55:33 +0000
Subject: [PATCH 233/587] 8351115: Test AOTClassLinkingVMOptions.java fails
 after JDK-8348322

Reviewed-by: dholmes, iklam
---
 .../cds/appcds/aotClassLinking/AOTClassLinkingVMOptions.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/hotspot/jtreg/runtime/cds/appcds/aotClassLinking/AOTClassLinkingVMOptions.java b/test/hotspot/jtreg/runtime/cds/appcds/aotClassLinking/AOTClassLinkingVMOptions.java
index af5c619d767..470bb699bc3 100644
--- a/test/hotspot/jtreg/runtime/cds/appcds/aotClassLinking/AOTClassLinkingVMOptions.java
+++ b/test/hotspot/jtreg/runtime/cds/appcds/aotClassLinking/AOTClassLinkingVMOptions.java
@@ -82,7 +82,7 @@ public class AOTClassLinkingVMOptions {
 
         // Dumping with AOTInvokeDynamicLinking disabled
         TestCommon.testDump(appJar, TestCommon.list("Hello"),
-                            "-XX:+AOTClassLinking", "-XX:-AOTInvokeDynamicLinking");
+                            "-XX:+UnlockDiagnosticVMOptions", "-XX:+AOTClassLinking", "-XX:-AOTInvokeDynamicLinking");
 
         testCase("Archived full module graph must be enabled at runtime (with -XX:-AOTInvokeDynamicLinking)");
         TestCommon.run("-cp", appJar, "-Djdk.module.validation=1", "Hello")

From caaf4098452476d981183ad4302b76b9c883a72b Mon Sep 17 00:00:00 2001
From: SendaoYan <syan@openjdk.org>
Date: Wed, 5 Mar 2025 12:57:56 +0000
Subject: [PATCH 234/587] 8350546: Several java/net/InetAddress tests fails
 UnknownHostException

Reviewed-by: dfuchs, myankelevich
---
 .../InetAddress/IsReachableViaLoopbackTest.java   | 15 ++++++++-------
 .../java/net/InetAddress/getOriginalHostName.java | 14 ++++++++++++--
 2 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/test/jdk/java/net/InetAddress/IsReachableViaLoopbackTest.java b/test/jdk/java/net/InetAddress/IsReachableViaLoopbackTest.java
index 4d340a72fba..2f2ad0ac7dd 100644
--- a/test/jdk/java/net/InetAddress/IsReachableViaLoopbackTest.java
+++ b/test/jdk/java/net/InetAddress/IsReachableViaLoopbackTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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,22 +21,24 @@
  * questions.
  */
 
-import java.io.*;
-import java.net.*;
-import java.util.*;
+import java.io.IOException;
+import java.net.InetAddress;
+import java.net.NetworkInterface;
 
 /**
  * @test
  * @bug 8135305
  * @key intermittent
+ * @library /test/lib
  * @summary ensure we can't ping external hosts via loopback if
+ * @run main IsReachableViaLoopbackTest
  */
 
 public class IsReachableViaLoopbackTest {
     public static void main(String[] args) {
         try {
-            InetAddress addr = InetAddress.getByName("localhost");
-            InetAddress remoteAddr = InetAddress.getByName("bugs.openjdk.org");
+            InetAddress addr = InetAddress.getLoopbackAddress();
+            InetAddress remoteAddr = InetAddress.getByName("23.197.138.208");  // use literal address to avoid DNS checks
             if (!addr.isReachable(10000))
                 throw new RuntimeException("Localhost should always be reachable");
             NetworkInterface inf = NetworkInterface.getByInetAddress(addr);
@@ -54,7 +56,6 @@ public class IsReachableViaLoopbackTest {
             } else {
                 System.out.println("inf == null");
             }
-
         } catch (IOException e) {
             throw new RuntimeException("Unexpected exception:" + e);
         }
diff --git a/test/jdk/java/net/InetAddress/getOriginalHostName.java b/test/jdk/java/net/InetAddress/getOriginalHostName.java
index 9f1e6e965d1..71567a7915d 100644
--- a/test/jdk/java/net/InetAddress/getOriginalHostName.java
+++ b/test/jdk/java/net/InetAddress/getOriginalHostName.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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,9 @@ public class getOriginalHostName {
     public static void main(String[] args) throws Exception {
         final String HOST = "dummyserver.java.net";
         InetAddress ia = null;
-        ia = InetAddress.getByName(HOST);
+        ia = getInetAddress(HOST);
+        if (ia != null) testInetAddress(ia, HOST);
+        ia = InetAddress.getByAddress(HOST, new byte[] { 1, 2, 3, 4});
         testInetAddress(ia, HOST);
         ia = InetAddress.getByName("255.255.255.0");
         testInetAddress(ia, null);
@@ -53,6 +55,14 @@ public class getOriginalHostName {
         testInetAddress(ia, ia.getHostName());
     }
 
+    private static InetAddress getInetAddress(String host) {
+        try {
+            return InetAddress.getByName(host);
+        } catch (java.net.UnknownHostException uhe) {
+            System.out.println("Skipping " + host + " due to " + uhe);
+            return null;
+        }
+    }
 
     private static void testInetAddress(InetAddress ia, String expected)
         throws Exception {

From ea9e3cfe03b5284ef0edc6f0eb92fcb6ffd62725 Mon Sep 17 00:00:00 2001
From: Serhiy Sachkov <serhiy.sachkov@oracle.com>
Date: Wed, 5 Mar 2025 16:16:58 +0000
Subject: [PATCH 235/587] 8281511: java/net/ipv6tests/UdpTest.java fails with
 checkTime failed

Reviewed-by: dfuchs
---
 test/jdk/java/net/ipv6tests/TcpTest.java | 10 ++++++----
 test/jdk/java/net/ipv6tests/Tests.java   | 21 ++++++++-------------
 test/jdk/java/net/ipv6tests/UdpTest.java | 17 ++++++++++-------
 3 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/test/jdk/java/net/ipv6tests/TcpTest.java b/test/jdk/java/net/ipv6tests/TcpTest.java
index e0ee7e49dc5..0ca35737a76 100644
--- a/test/jdk/java/net/ipv6tests/TcpTest.java
+++ b/test/jdk/java/net/ipv6tests/TcpTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -36,6 +36,7 @@
 
 import java.net.*;
 import java.io.*;
+import java.util.concurrent.TimeUnit;
 
 public class TcpTest extends Tests {
     static ServerSocket server, server1, server2;
@@ -193,13 +194,14 @@ public class TcpTest extends Tests {
         server = new ServerSocket (0);
         server.setSoTimeout (5000);
         int port = server.getLocalPort();
-        long t1 = System.currentTimeMillis();
+        long t1 = System.nanoTime();
         try {
             server.accept ();
             throw new RuntimeException ("accept should not have returned");
         } catch (SocketTimeoutException e) {}
-        t1 = System.currentTimeMillis() - t1;
-        checkTime (t1, 5000);
+        t1 = TimeUnit.NANOSECONDS.toMillis(System.nanoTime() - t1);
+        final long expectedTime = TimeUnit.SECONDS.toMillis(5);
+        checkIfTimeOut(TimeUnit.NANOSECONDS.toMillis(System.nanoTime() - t1), expectedTime);
 
         c1 = new Socket ();
         c1.connect (new InetSocketAddress (ia4addr, port), 1000);
diff --git a/test/jdk/java/net/ipv6tests/Tests.java b/test/jdk/java/net/ipv6tests/Tests.java
index 7a6917a6038..21cc83571ae 100644
--- a/test/jdk/java/net/ipv6tests/Tests.java
+++ b/test/jdk/java/net/ipv6tests/Tests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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,19 +151,14 @@ public class Tests {
         }
     }
 
-    /* check the time got is within 50% of the time expected */
-    public static void checkTime (long got, long expected) {
-        checkTime(got, expected, expected);
-    }
 
-    /* check the time got is between start and end, given 50% tolerance */
-    public static void checkTime(long got, long start, long end) {
-        dprintln("checkTime: got = " + got + " start = " + start + " end = " + end);
-        long upper = end + (end / 2);
-        long lower = start - (start / 2);
-        if (got > upper || got < lower) {
-            throw new RuntimeException("checkTime failed: got " + got
-                    + ", expected between " + start + " and " + end);
+    /* check the timeout breached lower bound time rule */
+    public static void checkIfTimeOut(long got, long expected) {
+        dprintln("checkIfTimeOut: got = " + got + " lower bound = " + expected);
+
+        if (got < expected) {
+            throw new RuntimeException("checkIfTimeOut failed: got " + got
+                    + ", expected at least " + expected );
         }
     }
 
diff --git a/test/jdk/java/net/ipv6tests/UdpTest.java b/test/jdk/java/net/ipv6tests/UdpTest.java
index 8986af74ff4..6139db85407 100644
--- a/test/jdk/java/net/ipv6tests/UdpTest.java
+++ b/test/jdk/java/net/ipv6tests/UdpTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -41,6 +41,7 @@ import java.net.Inet6Address;
 import java.net.InetAddress;
 import java.net.PortUnreachableException;
 import java.net.SocketTimeoutException;
+import java.util.concurrent.TimeUnit;
 
 public class UdpTest extends Tests {
     static DatagramSocket c3, s1, s2, s3;
@@ -138,26 +139,27 @@ public class UdpTest extends Tests {
         s1 = new DatagramSocket ();
         s2 = new DatagramSocket ();
         s1.setSoTimeout (4000);
-        long t1 = System.currentTimeMillis();
+        long t1 = System.nanoTime();
         try {
             s1.receive (new DatagramPacket (new byte [128], 128));
             throw new Exception ("expected receive timeout ");
         } catch (SocketTimeoutException e) {
         }
-        checkTime (System.currentTimeMillis() - t1, 4000);
+        final long expectedTime = TimeUnit.SECONDS.toMillis(4);
+        checkIfTimeOut(TimeUnit.NANOSECONDS.toMillis(System.nanoTime() - t1), expectedTime);
 
         /* check data can be exchanged now */
 
         simpleDataExchange (s1, ia6addr, s2, ia4addr);
 
         /* double check timeout still works */
-        t1 = System.currentTimeMillis();
+        t1 = System.nanoTime();
         try {
             s1.receive (new DatagramPacket (new byte [128], 128));
             throw new Exception ("expected receive timeout ");
         } catch (SocketTimeoutException e) {
         }
-        checkTime (System.currentTimeMillis() - t1, 4000);
+        checkIfTimeOut(TimeUnit.NANOSECONDS.toMillis(System.nanoTime() - t1), expectedTime);
 
         /* check receive works after a delay < timeout */
 
@@ -174,9 +176,10 @@ public class UdpTest extends Tests {
                 } catch (Exception e) {}
             }
         });
-        t1 = System.currentTimeMillis();
+        t1 = System.nanoTime();
         s1.receive (new DatagramPacket (new byte [128], 128));
-        checkTime (System.currentTimeMillis() - t1, 2000, 10000);
+        final long startTime = TimeUnit.SECONDS.toMillis(2);
+        checkIfTimeOut(TimeUnit.NANOSECONDS.toMillis(System.nanoTime() - t1), startTime);
         s1.close ();
         s2.close ();
         System.out.println ("Test2: OK");

From 61d9ab9717783e5bb0faa555f794499d0e5b3fdb Mon Sep 17 00:00:00 2001
From: Xiaolong Peng <xpeng@openjdk.org>
Date: Wed, 5 Mar 2025 16:35:46 +0000
Subject: [PATCH 236/587] 8350854: Include thread counts in safepoint logging

Reviewed-by: shade, dholmes
---
 src/hotspot/share/runtime/safepoint.cpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/hotspot/share/runtime/safepoint.cpp b/src/hotspot/share/runtime/safepoint.cpp
index 6f86aa09d95..b2bc8364eb5 100644
--- a/src/hotspot/share/runtime/safepoint.cpp
+++ b/src/hotspot/share/runtime/safepoint.cpp
@@ -989,13 +989,16 @@ void SafepointTracing::end() {
      "Reaching safepoint: " JLONG_FORMAT " ns, "
      "At safepoint: " JLONG_FORMAT " ns, "
      "Leaving safepoint: " JLONG_FORMAT " ns, "
-     "Total: " JLONG_FORMAT " ns",
+     "Total: " JLONG_FORMAT " ns, "
+     "Threads: %d runnable, %d total",
       VM_Operation::name(_current_type),
       _last_app_time_ns,
       _last_safepoint_sync_time_ns  - _last_safepoint_begin_time_ns,
       _last_safepoint_leave_time_ns - _last_safepoint_sync_time_ns,
       _last_safepoint_end_time_ns   - _last_safepoint_leave_time_ns,
-      _last_safepoint_end_time_ns   - _last_safepoint_begin_time_ns
+      _last_safepoint_end_time_ns   - _last_safepoint_begin_time_ns,
+      _nof_running,
+      _nof_threads
      );
 
   RuntimeService::record_safepoint_end(_last_safepoint_end_time_ns - _last_safepoint_sync_time_ns);

From 661bd5bfe883a7449c6949c9f4bd6b5d82d20e10 Mon Sep 17 00:00:00 2001
From: Archie Cobbs <acobbs@openjdk.org>
Date: Wed, 5 Mar 2025 17:32:59 +0000
Subject: [PATCH 237/587] 8343478: Remove unnecessary @SuppressWarnings
 annotations (core-libs)

Reviewed-by: darcy, asemenyuk, joehw
---
 .../src/classes/build/tools/cldrconverter/Bundle.java  |  3 +--
 .../build/tools/cldrconverter/LDMLParseHandler.java    |  3 +--
 src/java.base/share/classes/java/io/File.java          |  1 -
 .../share/classes/java/io/FileDescriptor.java          |  3 +--
 src/java.base/share/classes/java/lang/Package.java     |  1 -
 .../classes/java/lang/invoke/LambdaFormEditor.java     |  4 ++--
 .../share/classes/java/lang/invoke/MemberName.java     |  4 ++--
 .../share/classes/java/lang/invoke/MethodTypeForm.java |  7 +++----
 .../share/classes/java/lang/reflect/Constructor.java   |  4 ++--
 .../share/classes/java/lang/reflect/Method.java        |  4 ++--
 .../classes/java/lang/reflect/ProxyGenerator.java      |  3 +--
 .../classes/java/time/chrono/ChronoLocalDate.java      |  3 +--
 .../java/time/chrono/ChronoLocalDateTimeImpl.java      |  3 +--
 src/java.base/share/classes/java/util/Arrays.java      |  2 +-
 src/java.base/share/classes/java/util/Collections.java |  3 ---
 .../share/classes/java/util/ComparableTimSort.java     | 10 +++++-----
 src/java.base/share/classes/java/util/HashMap.java     |  4 ++--
 .../share/classes/java/util/LinkedHashSet.java         |  3 +--
 src/java.base/share/classes/java/util/List.java        |  4 ++--
 src/java.base/share/classes/java/util/Map.java         |  3 +--
 .../share/classes/java/util/PrimitiveIterator.java     |  3 +--
 .../classes/java/util/PropertyResourceBundle.java      |  3 +--
 .../share/classes/java/util/ResourceBundle.java        |  3 +--
 .../share/classes/java/util/ReverseOrderDequeView.java |  3 +--
 .../share/classes/java/util/ReverseOrderListView.java  |  3 +--
 .../classes/java/util/ReverseOrderSortedMapView.java   |  3 +--
 .../classes/java/util/ReverseOrderSortedSetView.java   |  3 +--
 .../share/classes/java/util/ServiceLoader.java         |  4 ++--
 src/java.base/share/classes/java/util/Spliterator.java |  4 +---
 src/java.base/share/classes/java/util/TreeMap.java     |  4 ++--
 .../java/util/concurrent/ConcurrentHashMap.java        |  2 +-
 .../java/util/concurrent/CopyOnWriteArrayList.java     |  1 -
 .../share/classes/java/util/concurrent/Executors.java  |  4 ----
 .../classes/java/util/concurrent/ForkJoinTask.java     |  1 -
 .../java/util/concurrent/LinkedBlockingDeque.java      |  1 -
 .../java/util/concurrent/SubmissionPublisher.java      |  1 -
 .../share/classes/java/util/regex/Pattern.java         |  3 +--
 .../classes/java/util/stream/AbstractPipeline.java     |  6 ++----
 .../share/classes/java/util/stream/DoublePipeline.java |  3 +--
 .../share/classes/java/util/stream/IntPipeline.java    |  3 +--
 .../share/classes/java/util/stream/LongPipeline.java   |  3 +--
 src/java.base/share/classes/java/util/stream/Node.java |  3 +--
 .../share/classes/java/util/stream/Nodes.java          |  4 +---
 .../classes/java/util/stream/ReferencePipeline.java    |  6 +-----
 .../share/classes/java/util/stream/SpinedBuffer.java   |  3 +--
 .../jdk/internal/classfile/impl/ClassFileImpl.java     |  3 +--
 .../classes/jdk/internal/classfile/impl/CodeImpl.java  |  3 +--
 .../classes/jdk/internal/jimage/BasicImageReader.java  |  6 +++---
 .../classes/jdk/internal/jimage/NativeImageBuffer.java |  4 ++--
 .../share/classes/jdk/internal/jrtfs/JrtFileStore.java |  3 +--
 .../jdk/internal/jrtfs/JrtFileSystemProvider.java      |  9 ++++-----
 .../share/classes/jdk/internal/jrtfs/SystemImage.java  |  4 ++--
 .../classes/jdk/internal/logger/BootstrapLogger.java   |  7 +------
 .../classes/jdk/internal/util/xml/impl/Parser.java     |  3 +--
 .../share/classes/jdk/internal/vm/VMSupport.java       |  4 ++--
 .../share/classes/sun/launcher/LauncherHelper.java     |  4 +---
 .../sun/net/www/protocol/http/HttpURLConnection.java   |  3 +--
 .../classes/sun/text/DictionaryBasedBreakIterator.java |  3 +--
 .../share/classes/com/sun/jndi/ldap/LdapCtx.java       |  4 +---
 .../classes/com/sun/jndi/toolkit/ctx/Continuation.java |  3 +--
 src/java.naming/share/classes/javax/naming/Name.java   |  3 +--
 .../classes/javax/naming/directory/Attribute.java      |  3 +--
 .../classes/java/util/prefs/FileSystemPreferences.java |  3 +--
 .../share/classes/java/rmi/server/RemoteRef.java       |  3 +--
 .../share/classes/java/rmi/server/ServerRef.java       |  3 +--
 .../classes/sun/rmi/registry/RegistryImpl_Skel.java    |  4 ++--
 .../share/classes/sun/rmi/transport/DGCImpl_Skel.java  |  4 ++--
 .../classes/javax/sql/rowset/spi/SyncFactory.java      |  3 +--
 src/java.sql/share/classes/java/sql/Date.java          |  3 +--
 src/java.sql/share/classes/java/sql/Time.java          |  3 +--
 src/java.sql/share/classes/java/sql/Timestamp.java     |  3 +--
 .../xalan/internal/xsltc/dom/NodeSortRecord.java       |  6 +++---
 .../xalan/internal/xsltc/trax/SAX2StAXEventWriter.java |  4 ++--
 .../xalan/internal/xsltc/trax/TemplatesImpl.java       |  5 ++---
 .../apache/xalan/internal/xsltc/trax/TrAXFilter.java   |  5 ++---
 .../xalan/internal/xsltc/trax/TransformerImpl.java     |  5 ++---
 .../sun/org/apache/xalan/internal/xsltc/trax/Util.java |  5 ++---
 .../org/apache/xerces/internal/dom/DocumentImpl.java   |  6 +++---
 .../apache/xerces/internal/dom/NamedNodeMapImpl.java   |  5 ++---
 .../xerces/internal/impl/xs/traversers/XSDHandler.java |  6 ++----
 .../apache/xml/internal/utils/StringComparable.java    |  6 +++---
 .../share/classes/javax/xml/catalog/CatalogReader.java |  3 +--
 src/jdk.jartool/share/classes/sun/tools/jar/Main.java  |  4 +---
 .../share/classes/com/sun/tools/jdeps/Analyzer.java    |  3 +--
 .../classes/com/sun/tools/jdeps/Dependencies.java      |  4 +---
 .../jlink/internal/plugins/VersionPropsPlugin.java     |  3 +--
 .../jdk/jpackage/internal/BundlerParamInfo.java        |  3 +--
 .../jdk/jpackage/internal/StandardBundlerParam.java    |  3 +--
 .../sun/jndi/rmi/registry/ReferenceWrapper_Stub.java   |  4 ++--
 .../com/sun/jndi/rmi/registry/RegistryContext.java     |  2 +-
 .../testlibrary/asm/org/objectweb/asm/ClassReader.java |  1 -
 .../testlibrary/asm/org/objectweb/asm/ClassWriter.java |  1 -
 .../asm/org/objectweb/asm/tree/MethodNode.java         |  1 -
 93 files changed, 121 insertions(+), 211 deletions(-)

diff --git a/make/jdk/src/classes/build/tools/cldrconverter/Bundle.java b/make/jdk/src/classes/build/tools/cldrconverter/Bundle.java
index 61395f982b2..d8752bca142 100644
--- a/make/jdk/src/classes/build/tools/cldrconverter/Bundle.java
+++ b/make/jdk/src/classes/build/tools/cldrconverter/Bundle.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -198,7 +198,6 @@ class Bundle {
         String[] cldrBundles = getCLDRPath().split(",");
 
         // myMap contains resources for id.
-        @SuppressWarnings("unchecked")
         Map<String, Object> myMap = new HashMap<>();
         int index;
         for (index = 0; index < cldrBundles.length; index++) {
diff --git a/make/jdk/src/classes/build/tools/cldrconverter/LDMLParseHandler.java b/make/jdk/src/classes/build/tools/cldrconverter/LDMLParseHandler.java
index d2d7e94fc98..6d5dde0d181 100644
--- a/make/jdk/src/classes/build/tools/cldrconverter/LDMLParseHandler.java
+++ b/make/jdk/src/classes/build/tools/cldrconverter/LDMLParseHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -1079,7 +1079,6 @@ class LDMLParseHandler extends AbstractLDMLHandler<Object> {
     }
 
     @Override
-    @SuppressWarnings("fallthrough")
     public void endElement(String uri, String localName, String qName) throws SAXException {
         assert qName.equals(currentContainer.getqName()) : "current=" + currentContainer.getqName() + ", param=" + qName;
         switch (qName) {
diff --git a/src/java.base/share/classes/java/io/File.java b/src/java.base/share/classes/java/io/File.java
index 15e687ebf06..9c9fbc837db 100644
--- a/src/java.base/share/classes/java/io/File.java
+++ b/src/java.base/share/classes/java/io/File.java
@@ -681,7 +681,6 @@ public class File
         if (isInvalid()) {
             throw new MalformedURLException("Invalid file path");
         }
-        @SuppressWarnings("deprecation")
         var result = new URL("file", "", slashify(getAbsolutePath(), isDirectory()));
         return result;
     }
diff --git a/src/java.base/share/classes/java/io/FileDescriptor.java b/src/java.base/share/classes/java/io/FileDescriptor.java
index bdab57c0996..f6466f56eab 100644
--- a/src/java.base/share/classes/java/io/FileDescriptor.java
+++ b/src/java.base/share/classes/java/io/FileDescriptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -340,7 +340,6 @@ public final class FileDescriptor {
      *
      * The caller closeable gets to call close0().
      */
-    @SuppressWarnings("try")
     synchronized void closeAll(Closeable releaser) throws IOException {
         if (!closed) {
             closed = true;
diff --git a/src/java.base/share/classes/java/lang/Package.java b/src/java.base/share/classes/java/lang/Package.java
index 82f40ce373b..14f5682ab0b 100644
--- a/src/java.base/share/classes/java/lang/Package.java
+++ b/src/java.base/share/classes/java/lang/Package.java
@@ -353,7 +353,6 @@ public final class Package extends NamedPackage implements java.lang.reflect.Ann
      */
     @CallerSensitive
     @Deprecated(since="9")
-    @SuppressWarnings("deprecation")
     public static Package getPackage(String name) {
         ClassLoader l = ClassLoader.getClassLoader(Reflection.getCallerClass());
         return l != null ? l.getPackage(name) : BootLoader.getDefinedPackage(name);
diff --git a/src/java.base/share/classes/java/lang/invoke/LambdaFormEditor.java b/src/java.base/share/classes/java/lang/invoke/LambdaFormEditor.java
index 8d84c5f8096..0994071a79e 100644
--- a/src/java.base/share/classes/java/lang/invoke/LambdaFormEditor.java
+++ b/src/java.base/share/classes/java/lang/invoke/LambdaFormEditor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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,7 +142,7 @@ class LambdaFormEditor {
             return buf.toString();
         }
 
-        @SuppressWarnings({"rawtypes", "unchecked"})
+        @SuppressWarnings("unchecked")
         public LambdaForm get() {
             if (cache instanceof LambdaForm lf) {
                 return lf;
diff --git a/src/java.base/share/classes/java/lang/invoke/MemberName.java b/src/java.base/share/classes/java/lang/invoke/MemberName.java
index 696772c39d5..35fd26331b1 100644
--- a/src/java.base/share/classes/java/lang/invoke/MemberName.java
+++ b/src/java.base/share/classes/java/lang/invoke/MemberName.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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,7 +711,7 @@ final class MemberName implements Member, Cloneable {
     }
 
     @Override
-    @SuppressWarnings({"deprecation", "removal"})
+    @SuppressWarnings("removal")
     public int hashCode() {
         // Avoid autoboxing getReferenceKind(), since this is used early and will force
         // early initialization of Byte$ByteCache
diff --git a/src/java.base/share/classes/java/lang/invoke/MethodTypeForm.java b/src/java.base/share/classes/java/lang/invoke/MethodTypeForm.java
index 69545478ec4..c344cd034c7 100644
--- a/src/java.base/share/classes/java/lang/invoke/MethodTypeForm.java
+++ b/src/java.base/share/classes/java/lang/invoke/MethodTypeForm.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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,7 +110,7 @@ final class MethodTypeForm {
         return basicType;
     }
 
-    @SuppressWarnings({"rawtypes", "unchecked"})
+    @SuppressWarnings("unchecked")
     public MethodHandle cachedMethodHandle(int which) {
         Object entry = methodHandles[which];
         if (entry == null) {
@@ -136,7 +136,7 @@ final class MethodTypeForm {
         return mh;
     }
 
-    @SuppressWarnings({"rawtypes", "unchecked"})
+    @SuppressWarnings("unchecked")
     public LambdaForm cachedLambdaForm(int which) {
         Object entry = lambdaForms[which];
         if (entry == null) {
@@ -167,7 +167,6 @@ final class MethodTypeForm {
      * This MTF will stand for that type and all un-erased variations.
      * Eagerly compute some basic properties of the type, common to all variations.
      */
-    @SuppressWarnings({"rawtypes", "unchecked"})
     protected MethodTypeForm(MethodType erasedType) {
         this.erasedType = erasedType;
 
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 30445307369..d072971307c 100644
--- a/src/java.base/share/classes/java/lang/reflect/Constructor.java
+++ b/src/java.base/share/classes/java/lang/reflect/Constructor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -240,7 +240,7 @@ public final class Constructor<T> extends Executable {
      * @since 1.5
      */
     @Override
-    @SuppressWarnings({"rawtypes", "unchecked"})
+    @SuppressWarnings("unchecked")
     public TypeVariable<Constructor<T>>[] getTypeParameters() {
       if (getSignature() != null) {
         return (TypeVariable<Constructor<T>>[])getGenericInfo().getTypeParameters();
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 f1d5ee63919..07616206075 100644
--- a/src/java.base/share/classes/java/lang/reflect/Method.java
+++ b/src/java.base/share/classes/java/lang/reflect/Method.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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 @@ public final class Method extends Executable {
      * @jls 8.4.4 Generic Methods
      */
     @Override
-    @SuppressWarnings({"rawtypes", "unchecked"})
+    @SuppressWarnings("unchecked")
     public TypeVariable<Method>[] getTypeParameters() {
         if (getGenericSignature() != null)
             return (TypeVariable<Method>[])getGenericInfo().getTypeParameters();
diff --git a/src/java.base/share/classes/java/lang/reflect/ProxyGenerator.java b/src/java.base/share/classes/java/lang/reflect/ProxyGenerator.java
index 3b34453bc3f..0d90cedd5c5 100644
--- a/src/java.base/share/classes/java/lang/reflect/ProxyGenerator.java
+++ b/src/java.base/share/classes/java/lang/reflect/ProxyGenerator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -202,7 +202,6 @@ final class ProxyGenerator {
      * @param interfaces  proxy interfaces
      * @param accessFlags access flags of the proxy class
      */
-    @SuppressWarnings("removal")
     static byte[] generateProxyClass(ClassLoader loader,
                                      final String name,
                                      List<Class<?>> interfaces,
diff --git a/src/java.base/share/classes/java/time/chrono/ChronoLocalDate.java b/src/java.base/share/classes/java/time/chrono/ChronoLocalDate.java
index 5543c8a73bc..3aae065715a 100644
--- a/src/java.base/share/classes/java/time/chrono/ChronoLocalDate.java
+++ b/src/java.base/share/classes/java/time/chrono/ChronoLocalDate.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -652,7 +652,6 @@ public interface ChronoLocalDate
      * @param localTime  the local time to use, not null
      * @return the local date-time formed from this date and the specified time, not null
      */
-    @SuppressWarnings("unchecked")
     default ChronoLocalDateTime<?> atTime(LocalTime localTime) {
         return ChronoLocalDateTimeImpl.of(this, localTime);
     }
diff --git a/src/java.base/share/classes/java/time/chrono/ChronoLocalDateTimeImpl.java b/src/java.base/share/classes/java/time/chrono/ChronoLocalDateTimeImpl.java
index 412d4845456..5fcde7b2aad 100644
--- a/src/java.base/share/classes/java/time/chrono/ChronoLocalDateTimeImpl.java
+++ b/src/java.base/share/classes/java/time/chrono/ChronoLocalDateTimeImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -269,7 +269,6 @@ final class ChronoLocalDateTimeImpl<D extends ChronoLocalDate>
     }
 
     //-----------------------------------------------------------------------
-    @SuppressWarnings("unchecked")
     @Override
     public ChronoLocalDateTimeImpl<D> with(TemporalAdjuster adjuster) {
         if (adjuster instanceof ChronoLocalDate) {
diff --git a/src/java.base/share/classes/java/util/Arrays.java b/src/java.base/share/classes/java/util/Arrays.java
index 657b8123ec5..1bba844f791 100644
--- a/src/java.base/share/classes/java/util/Arrays.java
+++ b/src/java.base/share/classes/java/util/Arrays.java
@@ -1126,7 +1126,7 @@ public final class Arrays {
      * off is the offset to generate corresponding low, high in src
      * To be removed in a future release.
      */
-    @SuppressWarnings({"unchecked", "rawtypes"})
+    @SuppressWarnings("unchecked")
     private static void mergeSort(Object[] src,
                                   Object[] dest,
                                   int low,
diff --git a/src/java.base/share/classes/java/util/Collections.java b/src/java.base/share/classes/java/util/Collections.java
index ec08168e2a2..4dc7edeb852 100644
--- a/src/java.base/share/classes/java/util/Collections.java
+++ b/src/java.base/share/classes/java/util/Collections.java
@@ -3363,7 +3363,6 @@ public final class Collections {
         @SuppressWarnings("serial") // Conditionally serializable
         final Collection<E> c;
         /** @serial */
-        @SuppressWarnings("serial") // Conditionally serializable
         final Class<E> type;
 
         @SuppressWarnings("unchecked")
@@ -3926,10 +3925,8 @@ public final class Collections {
         @SuppressWarnings("serial") // Conditionally serializable
         private final Map<K, V> m;
         /** @serial */
-        @SuppressWarnings("serial") // Conditionally serializable
         final Class<K> keyType;
         /** @serial */
-        @SuppressWarnings("serial") // Conditionally serializable
         final Class<V> valueType;
 
         private void typeCheck(Object key, Object value) {
diff --git a/src/java.base/share/classes/java/util/ComparableTimSort.java b/src/java.base/share/classes/java/util/ComparableTimSort.java
index 7b908077224..ac2b1573152 100644
--- a/src/java.base/share/classes/java/util/ComparableTimSort.java
+++ b/src/java.base/share/classes/java/util/ComparableTimSort.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2025, Oracle and/or its affiliates. All rights reserved.
  * Copyright 2009 Google Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -309,7 +309,7 @@ class ComparableTimSort {
      * @return  the length of the run beginning at the specified position in
      *          the specified array
      */
-    @SuppressWarnings({"unchecked", "rawtypes"})
+    @SuppressWarnings("unchecked")
     private static int countRunAndMakeAscending(Object[] a, int lo, int hi) {
         assert lo < hi;
         int runHi = lo + 1;
@@ -648,7 +648,7 @@ class ComparableTimSort {
      *        (must be aBase + aLen)
      * @param len2  length of second run to be merged (must be > 0)
      */
-    @SuppressWarnings({"unchecked", "rawtypes"})
+    @SuppressWarnings("unchecked")
     private void mergeLo(int base1, int len1, int base2, int len2) {
         assert len1 > 0 && len2 > 0 && base1 + len1 == base2;
 
@@ -765,7 +765,7 @@ class ComparableTimSort {
      *        (must be aBase + aLen)
      * @param len2  length of second run to be merged (must be > 0)
      */
-    @SuppressWarnings({"unchecked", "rawtypes"})
+    @SuppressWarnings("unchecked")
     private void mergeHi(int base1, int len1, int base2, int len2) {
         assert len1 > 0 && len2 > 0 && base1 + len1 == base2;
 
@@ -895,7 +895,7 @@ class ComparableTimSort {
             else
                 newSize = Math.min(newSize, a.length >>> 1);
 
-            @SuppressWarnings({"unchecked", "UnnecessaryLocalVariable"})
+            @SuppressWarnings("UnnecessaryLocalVariable")
             Object[] newArray = new Object[newSize];
             tmp = newArray;
             tmpLen = newSize;
diff --git a/src/java.base/share/classes/java/util/HashMap.java b/src/java.base/share/classes/java/util/HashMap.java
index 46c89984be8..3320b394e6c 100644
--- a/src/java.base/share/classes/java/util/HashMap.java
+++ b/src/java.base/share/classes/java/util/HashMap.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -365,7 +365,7 @@ public class HashMap<K,V> extends AbstractMap<K,V>
      * Returns k.compareTo(x) if x matches kc (k's screened comparable
      * class), else 0.
      */
-    @SuppressWarnings({"rawtypes","unchecked"}) // for cast to Comparable
+    @SuppressWarnings("unchecked") // for cast to Comparable
     static int compareComparables(Class<?> kc, Object k, Object x) {
         return (x == null || x.getClass() != kc ? 0 :
                 ((Comparable)k).compareTo(x));
diff --git a/src/java.base/share/classes/java/util/LinkedHashSet.java b/src/java.base/share/classes/java/util/LinkedHashSet.java
index bec2733dae3..1ec8214208d 100644
--- a/src/java.base/share/classes/java/util/LinkedHashSet.java
+++ b/src/java.base/share/classes/java/util/LinkedHashSet.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -226,7 +226,6 @@ public class LinkedHashSet<E>
         return new LinkedHashSet<>(HashMap.calculateHashMapCapacity(numElements));
     }
 
-    @SuppressWarnings("unchecked")
     LinkedHashMap<E, Object> map() {
         return (LinkedHashMap<E, Object>) map;
     }
diff --git a/src/java.base/share/classes/java/util/List.java b/src/java.base/share/classes/java/util/List.java
index 86cf4267312..32430298363 100644
--- a/src/java.base/share/classes/java/util/List.java
+++ b/src/java.base/share/classes/java/util/List.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -501,7 +501,7 @@ public interface List<E> extends SequencedCollection<E> {
      *         contract
      * @since 1.8
      */
-    @SuppressWarnings({"unchecked", "rawtypes"})
+    @SuppressWarnings("unchecked")
     default void sort(Comparator<? super E> c) {
         Object[] a = this.toArray();
         Arrays.sort(a, (Comparator) c);
diff --git a/src/java.base/share/classes/java/util/Map.java b/src/java.base/share/classes/java/util/Map.java
index ea2fd4e1807..fbb41be5073 100644
--- a/src/java.base/share/classes/java/util/Map.java
+++ b/src/java.base/share/classes/java/util/Map.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -1658,7 +1658,6 @@ public interface Map<K, V> {
      * @since 9
      */
     @SafeVarargs
-    @SuppressWarnings("varargs")
     static <K, V> Map<K, V> ofEntries(Entry<? extends K, ? extends V>... entries) {
         if (entries.length == 0) { // implicit null check of entries array
             @SuppressWarnings("unchecked")
diff --git a/src/java.base/share/classes/java/util/PrimitiveIterator.java b/src/java.base/share/classes/java/util/PrimitiveIterator.java
index b0e07ef6e5a..db6f1bcf483 100644
--- a/src/java.base/share/classes/java/util/PrimitiveIterator.java
+++ b/src/java.base/share/classes/java/util/PrimitiveIterator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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,6 @@ public interface PrimitiveIterator<T, T_CONS> extends Iterator<T> {
      * @param action The action to be performed for each element
      * @throws NullPointerException if the specified action is null
      */
-    @SuppressWarnings("overloads")
     void forEachRemaining(T_CONS action);
 
     /**
diff --git a/src/java.base/share/classes/java/util/PropertyResourceBundle.java b/src/java.base/share/classes/java/util/PropertyResourceBundle.java
index aba65cbcd88..d8cc1fac198 100644
--- a/src/java.base/share/classes/java/util/PropertyResourceBundle.java
+++ b/src/java.base/share/classes/java/util/PropertyResourceBundle.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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,7 +163,6 @@ public class PropertyResourceBundle extends ResourceBundle {
      *     {@code java.util.PropertyResourceBundle.encoding} is set to "UTF-8"
      *     and {@code stream} contains an unmappable UTF-8 byte sequence.
      */
-    @SuppressWarnings({"unchecked", "rawtypes"})
     public PropertyResourceBundle (InputStream stream) throws IOException {
         this(new InputStreamReader(stream,
             "ISO-8859-1".equals(encoding) ?
diff --git a/src/java.base/share/classes/java/util/ResourceBundle.java b/src/java.base/share/classes/java/util/ResourceBundle.java
index 4206dda6a3a..fb88a38903a 100644
--- a/src/java.base/share/classes/java/util/ResourceBundle.java
+++ b/src/java.base/share/classes/java/util/ResourceBundle.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -3511,7 +3511,6 @@ public abstract class ResourceBundle {
          */
         static ResourceBundle newResourceBundle(Class<? extends ResourceBundle> bundleClass) {
             try {
-                @SuppressWarnings("unchecked")
                 Constructor<? extends ResourceBundle> ctor =
                     bundleClass.getConstructor();
                 if (!Modifier.isPublic(ctor.getModifiers())) {
diff --git a/src/java.base/share/classes/java/util/ReverseOrderDequeView.java b/src/java.base/share/classes/java/util/ReverseOrderDequeView.java
index 695db6a74dc..35e34c4d80b 100644
--- a/src/java.base/share/classes/java/util/ReverseOrderDequeView.java
+++ b/src/java.base/share/classes/java/util/ReverseOrderDequeView.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -161,7 +161,6 @@ class ReverseOrderDequeView<E> implements Deque<E> {
         return ArraysSupport.reverse(base.toArray());
     }
 
-    @SuppressWarnings("unchecked")
     public <T> T[] toArray(T[] a) {
         return ArraysSupport.toArrayReversed(base, a);
     }
diff --git a/src/java.base/share/classes/java/util/ReverseOrderListView.java b/src/java.base/share/classes/java/util/ReverseOrderListView.java
index 42b57e2d8b9..f48b41920c9 100644
--- a/src/java.base/share/classes/java/util/ReverseOrderListView.java
+++ b/src/java.base/share/classes/java/util/ReverseOrderListView.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -286,7 +286,6 @@ class ReverseOrderListView<E> implements List<E> {
         return ArraysSupport.reverse(base.toArray());
     }
 
-    @SuppressWarnings("unchecked")
     public <T> T[] toArray(T[] a) {
         return ArraysSupport.toArrayReversed(base, a);
     }
diff --git a/src/java.base/share/classes/java/util/ReverseOrderSortedMapView.java b/src/java.base/share/classes/java/util/ReverseOrderSortedMapView.java
index 404950e8fd5..74703f3a866 100644
--- a/src/java.base/share/classes/java/util/ReverseOrderSortedMapView.java
+++ b/src/java.base/share/classes/java/util/ReverseOrderSortedMapView.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -314,7 +314,6 @@ class ReverseOrderSortedMapView<K, V> extends AbstractMap<K, V> implements Sorte
         final K head; // head key, or negative infinity if null
         final K tail; // tail key, or positive infinity if null
 
-        @SuppressWarnings("unchecked")
         Submap(K head, K tail) {
             this.head = head;
             this.tail = tail;
diff --git a/src/java.base/share/classes/java/util/ReverseOrderSortedSetView.java b/src/java.base/share/classes/java/util/ReverseOrderSortedSetView.java
index 3719852e2a5..70511c8ae86 100644
--- a/src/java.base/share/classes/java/util/ReverseOrderSortedSetView.java
+++ b/src/java.base/share/classes/java/util/ReverseOrderSortedSetView.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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,7 +170,6 @@ class ReverseOrderSortedSetView<E> implements SortedSet<E> {
         return ArraysSupport.reverse(base.toArray());
     }
 
-    @SuppressWarnings("unchecked")
     public <T> T[] toArray(T[] a) {
         return ArraysSupport.toArrayReversed(base, a);
     }
diff --git a/src/java.base/share/classes/java/util/ServiceLoader.java b/src/java.base/share/classes/java/util/ServiceLoader.java
index c634d6321c0..5137adc1c08 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, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -726,7 +726,7 @@ public final class ServiceLoader<S>
 
         @Override
         public boolean equals(Object ob) {
-            return ob instanceof @SuppressWarnings("unchecked")ProviderImpl<?> that
+            return ob instanceof ProviderImpl<?> that
                     && this.service == that.service
                     && this.type == that.type;
         }
diff --git a/src/java.base/share/classes/java/util/Spliterator.java b/src/java.base/share/classes/java/util/Spliterator.java
index 517d71c191b..6873bca6568 100644
--- a/src/java.base/share/classes/java/util/Spliterator.java
+++ b/src/java.base/share/classes/java/util/Spliterator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -628,7 +628,6 @@ public interface Spliterator<T> {
          * upon entry to this method, else {@code true}.
          * @throws NullPointerException if the specified action is null
          */
-        @SuppressWarnings("overloads")
         boolean tryAdvance(T_CONS action);
 
         /**
@@ -649,7 +648,6 @@ public interface Spliterator<T> {
          * @param action The action
          * @throws NullPointerException if the specified action is null
          */
-        @SuppressWarnings("overloads")
         default void forEachRemaining(T_CONS action) {
             do { } while (tryAdvance(action));
         }
diff --git a/src/java.base/share/classes/java/util/TreeMap.java b/src/java.base/share/classes/java/util/TreeMap.java
index ab565f371a9..f8eea8c8d8f 100644
--- a/src/java.base/share/classes/java/util/TreeMap.java
+++ b/src/java.base/share/classes/java/util/TreeMap.java
@@ -2982,7 +2982,7 @@ public class TreeMap<K,V>
             return t.keySpliterator();
         }
         if (m instanceof DescendingSubMap) {
-            @SuppressWarnings("unchecked") DescendingSubMap<K,?> dm =
+            DescendingSubMap<K,?> dm =
                 (DescendingSubMap<K,?>) m;
             TreeMap<K,?> tm = dm.m;
             if (dm == tm.descendingMap) {
@@ -2991,7 +2991,7 @@ public class TreeMap<K,V>
                 return t.descendingKeySpliterator();
             }
         }
-        @SuppressWarnings("unchecked") NavigableSubMap<K,?> sm =
+        NavigableSubMap<K,?> sm =
             (NavigableSubMap<K,?>) m;
         return sm.keySpliterator();
     }
diff --git a/src/java.base/share/classes/java/util/concurrent/ConcurrentHashMap.java b/src/java.base/share/classes/java/util/concurrent/ConcurrentHashMap.java
index b0818d3da6e..8734980cf80 100644
--- a/src/java.base/share/classes/java/util/concurrent/ConcurrentHashMap.java
+++ b/src/java.base/share/classes/java/util/concurrent/ConcurrentHashMap.java
@@ -744,7 +744,7 @@ public class ConcurrentHashMap<K,V> extends AbstractMap<K,V>
      * Returns k.compareTo(x) if x matches kc (k's screened comparable
      * class), else 0.
      */
-    @SuppressWarnings({"rawtypes","unchecked"}) // for cast to Comparable
+    @SuppressWarnings("unchecked") // for cast to Comparable
     static int compareComparables(Class<?> kc, Object k, Object x) {
         return (x == null || x.getClass() != kc ? 0 :
                 ((Comparable)k).compareTo(x));
diff --git a/src/java.base/share/classes/java/util/concurrent/CopyOnWriteArrayList.java b/src/java.base/share/classes/java/util/concurrent/CopyOnWriteArrayList.java
index f5069c61d45..2d3bdb429e9 100644
--- a/src/java.base/share/classes/java/util/concurrent/CopyOnWriteArrayList.java
+++ b/src/java.base/share/classes/java/util/concurrent/CopyOnWriteArrayList.java
@@ -1727,7 +1727,6 @@ public class CopyOnWriteArrayList<E>
         }
 
         @Override
-        @SuppressWarnings("unchecked")
         public void forEachRemaining(Consumer<? super E> action) {
             Objects.requireNonNull(action);
             while (hasNext()) {
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 49cf497c20b..ba7c2e1efee 100644
--- a/src/java.base/share/classes/java/util/concurrent/Executors.java
+++ b/src/java.base/share/classes/java/util/concurrent/Executors.java
@@ -576,10 +576,8 @@ public final class Executors {
     private static final class PrivilegedCallableUsingCurrentClassLoader<T>
             implements Callable<T> {
         final Callable<T> task;
-        @SuppressWarnings("removal")
         final ClassLoader ccl;
 
-        @SuppressWarnings("removal")
         PrivilegedCallableUsingCurrentClassLoader(Callable<T> task) {
             this.task = task;
             this.ccl = Thread.currentThread().getContextClassLoader();
@@ -637,7 +635,6 @@ public final class Executors {
      * Thread factory capturing the current class loader.
      */
     private static class PrivilegedThreadFactory extends DefaultThreadFactory {
-        @SuppressWarnings("removal")
         final ClassLoader ccl;
 
         PrivilegedThreadFactory() {
@@ -647,7 +644,6 @@ public final class Executors {
 
         public Thread newThread(final Runnable r) {
             return super.newThread(new Runnable() {
-                @SuppressWarnings("removal")
                 public void run() {
                     Thread.currentThread().setContextClassLoader(ccl);
                     r.run();
diff --git a/src/java.base/share/classes/java/util/concurrent/ForkJoinTask.java b/src/java.base/share/classes/java/util/concurrent/ForkJoinTask.java
index 6062a0f6455..ec91e33975d 100644
--- a/src/java.base/share/classes/java/util/concurrent/ForkJoinTask.java
+++ b/src/java.base/share/classes/java/util/concurrent/ForkJoinTask.java
@@ -787,7 +787,6 @@ public abstract class ForkJoinTask<V> implements Future<V>, Serializable {
             invokeAll(tasks.toArray(new ForkJoinTask<?>[0]));
             return tasks;
         }
-        @SuppressWarnings("unchecked")
         List<? extends ForkJoinTask<?>> ts =
             (List<? extends ForkJoinTask<?>>) tasks;
         Throwable ex = null;
diff --git a/src/java.base/share/classes/java/util/concurrent/LinkedBlockingDeque.java b/src/java.base/share/classes/java/util/concurrent/LinkedBlockingDeque.java
index b22786a09f6..7c112eb8008 100644
--- a/src/java.base/share/classes/java/util/concurrent/LinkedBlockingDeque.java
+++ b/src/java.base/share/classes/java/util/concurrent/LinkedBlockingDeque.java
@@ -910,7 +910,6 @@ public class LinkedBlockingDeque<E>
      *
      * @return an array containing all of the elements in this deque
      */
-    @SuppressWarnings("unchecked")
     public Object[] toArray() {
         final ReentrantLock lock = this.lock;
         lock.lock();
diff --git a/src/java.base/share/classes/java/util/concurrent/SubmissionPublisher.java b/src/java.base/share/classes/java/util/concurrent/SubmissionPublisher.java
index a2fc3ac92bd..388241b115d 100644
--- a/src/java.base/share/classes/java/util/concurrent/SubmissionPublisher.java
+++ b/src/java.base/share/classes/java/util/concurrent/SubmissionPublisher.java
@@ -1048,7 +1048,6 @@ public class SubmissionPublisher<T> implements Publisher<T>,
      * assignment coding style. Also, all methods and fields have
      * default visibility to simplify usage by callers.
      */
-    @SuppressWarnings("serial")
     @jdk.internal.vm.annotation.Contended
     static final class BufferedSubscription<T>
         implements Subscription, ForkJoinPool.ManagedBlocker {
diff --git a/src/java.base/share/classes/java/util/regex/Pattern.java b/src/java.base/share/classes/java/util/regex/Pattern.java
index 654adb5376f..b7f03c1b0af 100644
--- a/src/java.base/share/classes/java/util/regex/Pattern.java
+++ b/src/java.base/share/classes/java/util/regex/Pattern.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -3369,7 +3369,6 @@ loop:   for(int x=0, offset=0; x<nCodePoints; x++, offset+=len) {
      * Parses the second part of inlined match flags and turns off
      * flags appropriately.
      */
-    @SuppressWarnings("fallthrough")
     private void subFlag() {
         int ch = peek();
         for (;;) {
diff --git a/src/java.base/share/classes/java/util/stream/AbstractPipeline.java b/src/java.base/share/classes/java/util/stream/AbstractPipeline.java
index 8afe5083cc7..68d127e511a 100644
--- a/src/java.base/share/classes/java/util/stream/AbstractPipeline.java
+++ b/src/java.base/share/classes/java/util/stream/AbstractPipeline.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -578,7 +578,7 @@ abstract class AbstractPipeline<E_IN, E_OUT, S extends BaseStream<E_OUT, S>>
     @Override
     @SuppressWarnings("unchecked")
     final <P_IN> boolean copyIntoWithCancel(Sink<P_IN> wrappedSink, Spliterator<P_IN> spliterator) {
-        @SuppressWarnings({"rawtypes","unchecked"})
+        @SuppressWarnings("rawtypes")
         AbstractPipeline p = AbstractPipeline.this;
         while (p.depth > 0) {
             p = p.previousStage;
@@ -622,7 +622,6 @@ abstract class AbstractPipeline<E_IN, E_OUT, S extends BaseStream<E_OUT, S>>
     }
 
     @Override
-    @SuppressWarnings("unchecked")
     final <P_IN> Node<E_OUT> evaluate(Spliterator<P_IN> spliterator,
                                       boolean flatten,
                                       IntFunction<E_OUT[]> generator) {
@@ -790,7 +789,6 @@ abstract class AbstractPipeline<E_IN, E_OUT, S extends BaseStream<E_OUT, S>>
      * @param spliterator the source {@code Spliterator}
      * @return a {@code Spliterator} describing the result of the evaluation
      */
-    @SuppressWarnings("unchecked")
     <P_IN> Spliterator<E_OUT> opEvaluateParallelLazy(PipelineHelper<E_OUT> helper,
                                                      Spliterator<P_IN> spliterator) {
         return opEvaluateParallel(helper, spliterator, Nodes.castingArray()).spliterator();
diff --git a/src/java.base/share/classes/java/util/stream/DoublePipeline.java b/src/java.base/share/classes/java/util/stream/DoublePipeline.java
index 22b3bf67ef4..ea561d8507f 100644
--- a/src/java.base/share/classes/java/util/stream/DoublePipeline.java
+++ b/src/java.base/share/classes/java/util/stream/DoublePipeline.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -324,7 +324,6 @@ abstract class DoublePipeline<E_IN>
                     }
 
                     @Override
-                    @SuppressWarnings("unchecked")
                     public void accept(double t) {
                             mapper.accept(t, (DoubleConsumer) downstream);
                     }
diff --git a/src/java.base/share/classes/java/util/stream/IntPipeline.java b/src/java.base/share/classes/java/util/stream/IntPipeline.java
index e78bc9fecc9..5c624e2fc42 100644
--- a/src/java.base/share/classes/java/util/stream/IntPipeline.java
+++ b/src/java.base/share/classes/java/util/stream/IntPipeline.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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,7 +356,6 @@ abstract class IntPipeline<E_IN>
                     }
 
                     @Override
-                    @SuppressWarnings("unchecked")
                     public void accept(int t) {
                         mapper.accept(t, (IntConsumer) downstream);
                     }
diff --git a/src/java.base/share/classes/java/util/stream/LongPipeline.java b/src/java.base/share/classes/java/util/stream/LongPipeline.java
index c8c296824ed..05d6d506bea 100644
--- a/src/java.base/share/classes/java/util/stream/LongPipeline.java
+++ b/src/java.base/share/classes/java/util/stream/LongPipeline.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -339,7 +339,6 @@ abstract class LongPipeline<E_IN>
                     }
 
                     @Override
-                    @SuppressWarnings("unchecked")
                     public void accept(long t) {
                         mapper.accept(t, (LongConsumer) downstream);
                     }
diff --git a/src/java.base/share/classes/java/util/stream/Node.java b/src/java.base/share/classes/java/util/stream/Node.java
index 0f88850cfc5..d8308d778d9 100644
--- a/src/java.base/share/classes/java/util/stream/Node.java
+++ b/src/java.base/share/classes/java/util/stream/Node.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -245,7 +245,6 @@ interface Node<T> {
          * @param action a consumer that is to be invoked with each
          *        element in this {@code Node.OfPrimitive}
          */
-        @SuppressWarnings("overloads")
         void forEach(T_CONS action);
 
         @Override
diff --git a/src/java.base/share/classes/java/util/stream/Nodes.java b/src/java.base/share/classes/java/util/stream/Nodes.java
index 77d70091717..d2627434f36 100644
--- a/src/java.base/share/classes/java/util/stream/Nodes.java
+++ b/src/java.base/share/classes/java/util/stream/Nodes.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -643,7 +643,6 @@ final class Nodes {
         final T[] array;
         int curSize;
 
-        @SuppressWarnings("unchecked")
         ArrayNode(long size, IntFunction<T[]> generator) {
             if (size >= MAX_ARRAY_SIZE)
                 throw new IllegalArgumentException(BAD_SIZE);
@@ -720,7 +719,6 @@ final class Nodes {
         }
 
         @Override
-        @SuppressWarnings("unchecked")
         public T[] asArray(IntFunction<T[]> generator) {
             return c.toArray(generator.apply(c.size()));
         }
diff --git a/src/java.base/share/classes/java/util/stream/ReferencePipeline.java b/src/java.base/share/classes/java/util/stream/ReferencePipeline.java
index 3133b20b03d..3699990a326 100644
--- a/src/java.base/share/classes/java/util/stream/ReferencePipeline.java
+++ b/src/java.base/share/classes/java/util/stream/ReferencePipeline.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -202,7 +202,6 @@ abstract class ReferencePipeline<P_IN, P_OUT>
     }
 
     @Override
-    @SuppressWarnings("unchecked")
     public final <R> Stream<R> map(Function<? super P_OUT, ? extends R> mapper) {
         Objects.requireNonNull(mapper);
         return new StatelessOp<>(this, StreamShape.REFERENCE,
@@ -509,7 +508,6 @@ abstract class ReferencePipeline<P_IN, P_OUT>
                     }
 
                     @Override
-                    @SuppressWarnings("unchecked")
                     public void accept(P_OUT u) {
                         mapper.accept(u, (IntConsumer)downstream);
                     }
@@ -533,7 +531,6 @@ abstract class ReferencePipeline<P_IN, P_OUT>
                     }
 
                     @Override
-                    @SuppressWarnings("unchecked")
                     public void accept(P_OUT u) {
                         mapper.accept(u, (LongConsumer) downstream);
                     }
@@ -558,7 +555,6 @@ abstract class ReferencePipeline<P_IN, P_OUT>
                     }
 
                     @Override
-                    @SuppressWarnings("unchecked")
                     public void accept(P_OUT u) {
                         mapper.accept(u, (DoubleConsumer) downstream);
                     }
diff --git a/src/java.base/share/classes/java/util/stream/SpinedBuffer.java b/src/java.base/share/classes/java/util/stream/SpinedBuffer.java
index 98bbc040a7b..cb9eb24d635 100644
--- a/src/java.base/share/classes/java/util/stream/SpinedBuffer.java
+++ b/src/java.base/share/classes/java/util/stream/SpinedBuffer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -583,7 +583,6 @@ class SpinedBuffer<E>
             spineIndex = 0;
         }
 
-        @SuppressWarnings("overloads")
         public void forEach(T_CONS consumer) {
             // completed chunks, if any
             for (int j = 0; j < spineIndex; j++)
diff --git a/src/java.base/share/classes/jdk/internal/classfile/impl/ClassFileImpl.java b/src/java.base/share/classes/jdk/internal/classfile/impl/ClassFileImpl.java
index 3ab5d24f09c..152569683ba 100644
--- a/src/java.base/share/classes/jdk/internal/classfile/impl/ClassFileImpl.java
+++ b/src/java.base/share/classes/jdk/internal/classfile/impl/ClassFileImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -90,7 +90,6 @@ public final class ClassFileImpl implements ClassFile {
             null  // _ -> null
         );
 
-    @SuppressWarnings("unchecked")
     @Override
     public ClassFileImpl withOptions(Option... options) {
         var smo = stackMapsOption;
diff --git a/src/java.base/share/classes/jdk/internal/classfile/impl/CodeImpl.java b/src/java.base/share/classes/jdk/internal/classfile/impl/CodeImpl.java
index 47908b99f44..609411f2e06 100644
--- a/src/java.base/share/classes/jdk/internal/classfile/impl/CodeImpl.java
+++ b/src/java.base/share/classes/jdk/internal/classfile/impl/CodeImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -272,7 +272,6 @@ public final class CodeImpl
             }
             return;
         }
-        @SuppressWarnings("unchecked")
         int stackMapPos = ((BoundAttribute<StackMapTableAttribute>) a.get()).payloadStart;
 
         int bci = -1; //compensate for offsetDelta + 1
diff --git a/src/java.base/share/classes/jdk/internal/jimage/BasicImageReader.java b/src/java.base/share/classes/jdk/internal/jimage/BasicImageReader.java
index 07879353d90..c06c62488db 100644
--- a/src/java.base/share/classes/jdk/internal/jimage/BasicImageReader.java
+++ b/src/java.base/share/classes/jdk/internal/jimage/BasicImageReader.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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 @@ import jdk.internal.jimage.decompressor.Decompressor;
  * to the jimage file provided by the shipped JDK by tools running on JDK 8.
  */
 public class BasicImageReader implements AutoCloseable {
-    @SuppressWarnings("removal")
+    @SuppressWarnings({ "removal", "suppression" })
     private static boolean isSystemProperty(String key, String value, String def) {
         // No lambdas during bootstrap
         return AccessController.doPrivileged(
@@ -82,7 +82,7 @@ public class BasicImageReader implements AutoCloseable {
     private final ImageStringsReader stringsReader;
     private final Decompressor decompressor;
 
-    @SuppressWarnings({ "removal", "this-escape" })
+    @SuppressWarnings({ "removal", "this-escape", "suppression" })
     protected BasicImageReader(Path path, ByteOrder byteOrder)
             throws IOException {
         this.imagePath = Objects.requireNonNull(path);
diff --git a/src/java.base/share/classes/jdk/internal/jimage/NativeImageBuffer.java b/src/java.base/share/classes/jdk/internal/jimage/NativeImageBuffer.java
index 9ef02364195..b55080eb192 100644
--- a/src/java.base/share/classes/jdk/internal/jimage/NativeImageBuffer.java
+++ b/src/java.base/share/classes/jdk/internal/jimage/NativeImageBuffer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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 @@ import java.nio.ByteBuffer;
  * but also compiled and delivered as part of the jrtfs.jar to support access
  * to the jimage file provided by the shipped JDK by tools running on JDK 8.
  */
-@SuppressWarnings("removal")
+@SuppressWarnings({ "removal", "suppression"} )
 class NativeImageBuffer {
     static {
         java.security.AccessController.doPrivileged(
diff --git a/src/java.base/share/classes/jdk/internal/jrtfs/JrtFileStore.java b/src/java.base/share/classes/jdk/internal/jrtfs/JrtFileStore.java
index 7d4b0a18822..7846b740544 100644
--- a/src/java.base/share/classes/jdk/internal/jrtfs/JrtFileStore.java
+++ b/src/java.base/share/classes/jdk/internal/jrtfs/JrtFileStore.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -70,7 +70,6 @@ final class JrtFileStore extends FileStore {
     }
 
     @Override
-    @SuppressWarnings("unchecked")
     public <V extends FileStoreAttributeView> V getFileStoreAttributeView(Class<V> type) {
         Objects.requireNonNull(type, "type");
         return (V) null;
diff --git a/src/java.base/share/classes/jdk/internal/jrtfs/JrtFileSystemProvider.java b/src/java.base/share/classes/jdk/internal/jrtfs/JrtFileSystemProvider.java
index 4d3e0ed9d2c..c0d3eeab6bd 100644
--- a/src/java.base/share/classes/jdk/internal/jrtfs/JrtFileSystemProvider.java
+++ b/src/java.base/share/classes/jdk/internal/jrtfs/JrtFileSystemProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -68,7 +68,7 @@ public final class JrtFileSystemProvider extends FileSystemProvider {
      * Need RuntimePermission "accessSystemModules" to create or get jrt:/
      */
     private void checkPermission() {
-        @SuppressWarnings("removal")
+        @SuppressWarnings({ "removal", "suppression" })
         SecurityManager sm = System.getSecurityManager();
         if (sm != null) {
             RuntimePermission perm = new RuntimePermission("accessSystemModules");
@@ -123,7 +123,7 @@ public final class JrtFileSystemProvider extends FileSystemProvider {
         ClassLoader cl = newJrtFsLoader(jrtfs);
         try {
             Class<?> c = Class.forName(JrtFileSystemProvider.class.getName(), false, cl);
-            @SuppressWarnings("deprecation")
+            @SuppressWarnings({ "deprecation", "suppression" })
             Object tmp = c.newInstance();
             return ((FileSystemProvider)tmp).newFileSystem(uri, newEnv);
         } catch (ClassNotFoundException |
@@ -156,7 +156,7 @@ public final class JrtFileSystemProvider extends FileSystemProvider {
         }
     }
 
-    @SuppressWarnings("removal")
+    @SuppressWarnings({ "removal", "suppression" })
     private static URLClassLoader newJrtFsLoader(Path jrtfs) {
         final URL url;
         try {
@@ -261,7 +261,6 @@ public final class JrtFileSystemProvider extends FileSystemProvider {
     }
 
     @Override
-    @SuppressWarnings("unchecked")
     public <V extends FileAttributeView> V
             getFileAttributeView(Path path, Class<V> type, LinkOption... options) {
         return JrtFileAttributeView.get(toJrtPath(path), type, options);
diff --git a/src/java.base/share/classes/jdk/internal/jrtfs/SystemImage.java b/src/java.base/share/classes/jdk/internal/jrtfs/SystemImage.java
index e1770d9c55b..88cdf724e7d 100644
--- a/src/java.base/share/classes/jdk/internal/jrtfs/SystemImage.java
+++ b/src/java.base/share/classes/jdk/internal/jrtfs/SystemImage.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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 @@ import jdk.internal.jimage.ImageReader.Node;
  * but also compiled and delivered as part of the jrtfs.jar to support access
  * to the jimage file provided by the shipped JDK by tools running on JDK 8.
  */
-@SuppressWarnings("removal")
+@SuppressWarnings({ "removal", "suppression"} )
 abstract class SystemImage {
 
     abstract Node findNode(String path) throws IOException;
diff --git a/src/java.base/share/classes/jdk/internal/logger/BootstrapLogger.java b/src/java.base/share/classes/jdk/internal/logger/BootstrapLogger.java
index a4c9e4baf63..01d8fedb0aa 100644
--- a/src/java.base/share/classes/jdk/internal/logger/BootstrapLogger.java
+++ b/src/java.base/share/classes/jdk/internal/logger/BootstrapLogger.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -263,7 +263,6 @@ public final class BootstrapLogger implements Logger, PlatformLogger.Bridge,
         // The next event in the queue
         LogEvent next;
 
-        @SuppressWarnings("removal")
         private LogEvent(BootstrapLogger bootstrap, Level level,
                 ResourceBundle bundle, String msg,
                 Throwable thrown, Object[] params) {
@@ -281,7 +280,6 @@ public final class BootstrapLogger implements Logger, PlatformLogger.Bridge,
             this.bootstrap = bootstrap;
         }
 
-        @SuppressWarnings("removal")
         private LogEvent(BootstrapLogger bootstrap, Level level,
                 Supplier<String> msgSupplier,
                 Throwable thrown, Object[] params) {
@@ -299,7 +297,6 @@ public final class BootstrapLogger implements Logger, PlatformLogger.Bridge,
             this.bootstrap = bootstrap;
         }
 
-        @SuppressWarnings("removal")
         private LogEvent(BootstrapLogger bootstrap,
                 PlatformLogger.Level platformLevel,
                 String sourceClass, String sourceMethod,
@@ -319,7 +316,6 @@ public final class BootstrapLogger implements Logger, PlatformLogger.Bridge,
             this.bootstrap = bootstrap;
         }
 
-        @SuppressWarnings("removal")
         private LogEvent(BootstrapLogger bootstrap,
                 PlatformLogger.Level platformLevel,
                 String sourceClass, String sourceMethod,
@@ -860,7 +856,6 @@ public final class BootstrapLogger implements Logger, PlatformLogger.Bridge,
     // The purpose of this class is to delay the initialization of
     // the detectedBackend field until it is actually read.
     // We do not want this field to get initialized if VM.isBooted() is false.
-    @SuppressWarnings("removal")
     private static final class DetectBackend {
         static final LoggingBackend detectedBackend = detectBackend();
 
diff --git a/src/java.base/share/classes/jdk/internal/util/xml/impl/Parser.java b/src/java.base/share/classes/jdk/internal/util/xml/impl/Parser.java
index 8ff4742a59d..4e8f0070a7c 100644
--- a/src/java.base/share/classes/jdk/internal/util/xml/impl/Parser.java
+++ b/src/java.base/share/classes/jdk/internal/util/xml/impl/Parser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -2086,7 +2086,6 @@ public abstract class Parser {
      * @exception Exception is parser specific exception form panic method.
      * @exception IOException
      */
-    @SuppressWarnings("fallthrough")
     private void pent(char flag) throws Exception {
         char ch;
         int idx = mBuffIdx + 1;
diff --git a/src/java.base/share/classes/jdk/internal/vm/VMSupport.java b/src/java.base/share/classes/jdk/internal/vm/VMSupport.java
index c31fa4d441f..197da0d456c 100644
--- a/src/java.base/share/classes/jdk/internal/vm/VMSupport.java
+++ b/src/java.base/share/classes/jdk/internal/vm/VMSupport.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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,7 +459,7 @@ public class VMSupport {
      * @param <X> type of the object representing a decoded error
      * @return an immutable list of {@code A} objects
      */
-    @SuppressWarnings({"rawtypes", "unchecked"})
+    @SuppressWarnings("unchecked")
     public static <T, A, E, X> List<A> decodeAnnotations(byte[] encoded, AnnotationDecoder<T, A, E, X> decoder) {
         try {
             ByteArrayInputStream bais = new ByteArrayInputStream(encoded);
diff --git a/src/java.base/share/classes/sun/launcher/LauncherHelper.java b/src/java.base/share/classes/sun/launcher/LauncherHelper.java
index 3ba0758585e..8fbf76851cc 100644
--- a/src/java.base/share/classes/sun/launcher/LauncherHelper.java
+++ b/src/java.base/share/classes/sun/launcher/LauncherHelper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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,7 +156,6 @@ public final class LauncherHelper {
      *    this code determine this value, using a suitable method or omit the
      *    line entirely.
      */
-    @SuppressWarnings("fallthrough")
     static void showSettings(boolean printToStderr, String optionFlag,
             long initialHeapSize, long maxHeapSize, long stackSize) {
 
@@ -733,7 +732,6 @@ public final class LauncherHelper {
      *
      * @return the application's main class
      */
-    @SuppressWarnings("fallthrough")
     public static Class<?> checkAndLoadMain(boolean printToStderr,
                                             int mode,
                                             String what) {
diff --git a/src/java.base/share/classes/sun/net/www/protocol/http/HttpURLConnection.java b/src/java.base/share/classes/sun/net/www/protocol/http/HttpURLConnection.java
index 602f798448c..5d8e6f467aa 100644
--- a/src/java.base/share/classes/sun/net/www/protocol/http/HttpURLConnection.java
+++ b/src/java.base/share/classes/sun/net/www/protocol/http/HttpURLConnection.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1995, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1995, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -2069,7 +2069,6 @@ public class HttpURLConnection extends java.net.HttpURLConnection {
      * Gets the authentication for an HTTP proxy, and applies it to
      * the connection.
      */
-    @SuppressWarnings("fallthrough")
     private AuthenticationInfo getHttpProxyAuthentication(AuthenticationHeader authhdr)
         throws IOException {
 
diff --git a/src/java.base/share/classes/sun/text/DictionaryBasedBreakIterator.java b/src/java.base/share/classes/sun/text/DictionaryBasedBreakIterator.java
index fb072ae402f..7978b83cbde 100644
--- a/src/java.base/share/classes/sun/text/DictionaryBasedBreakIterator.java
+++ b/src/java.base/share/classes/sun/text/DictionaryBasedBreakIterator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -338,7 +338,6 @@ public class DictionaryBasedBreakIterator extends RuleBasedBreakIterator {
      * cachedBreakPositions so that we only have to do this work once
      * for each time we enter the range.
      */
-    @SuppressWarnings("unchecked")
     private void divideUpDictionaryRange(int startPos, int endPos) {
         CharacterIterator text = getText();
 
diff --git a/src/java.naming/share/classes/com/sun/jndi/ldap/LdapCtx.java b/src/java.naming/share/classes/com/sun/jndi/ldap/LdapCtx.java
index 0695894f300..636d8f5fe2b 100644
--- a/src/java.naming/share/classes/com/sun/jndi/ldap/LdapCtx.java
+++ b/src/java.naming/share/classes/com/sun/jndi/ldap/LdapCtx.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -1227,7 +1227,6 @@ public final class LdapCtx extends ComponentDirContext
 
             // process the referrals sequentially
             while (true) {
-                @SuppressWarnings("unchecked")
                 LdapReferralContext refCtx =
                     (LdapReferralContext)e.getReferralContext(envprops, bindCtls);
 
@@ -1886,7 +1885,6 @@ public final class LdapCtx extends ComponentDirContext
             // process the referrals sequentially
             while (true) {
 
-                @SuppressWarnings("unchecked")
                 LdapReferralContext refCtx = (LdapReferralContext)
                         e.getReferralContext(envprops, bindCtls);
 
diff --git a/src/java.naming/share/classes/com/sun/jndi/toolkit/ctx/Continuation.java b/src/java.naming/share/classes/com/sun/jndi/toolkit/ctx/Continuation.java
index 1a6d930460e..aa63bd1a738 100644
--- a/src/java.naming/share/classes/com/sun/jndi/toolkit/ctx/Continuation.java
+++ b/src/java.naming/share/classes/com/sun/jndi/toolkit/ctx/Continuation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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,6 @@ public class Continuation extends ResolveResult {
      * @param environment The environment used by the caller. It is used
      *          when setting the "environment" of a CannotProceedException.
      */
-    @SuppressWarnings("unchecked")  // For Hashtable clone: environment.clone()
     public Continuation(Name top, Hashtable<?,?> environment) {
         super();
         starter = top;
diff --git a/src/java.naming/share/classes/javax/naming/Name.java b/src/java.naming/share/classes/javax/naming/Name.java
index 24865fb64e4..b4466a02f2f 100644
--- a/src/java.naming/share/classes/javax/naming/Name.java
+++ b/src/java.naming/share/classes/javax/naming/Name.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -68,7 +68,6 @@ public interface Name
     * ineffectual. Do not use; no replacement.
     */
     @Deprecated
-    @SuppressWarnings("serial")
     static final long serialVersionUID = -3617482732056931635L;
 
     /**
diff --git a/src/java.naming/share/classes/javax/naming/directory/Attribute.java b/src/java.naming/share/classes/javax/naming/directory/Attribute.java
index 4a0b51ba812..f1bd438457a 100644
--- a/src/java.naming/share/classes/javax/naming/directory/Attribute.java
+++ b/src/java.naming/share/classes/javax/naming/directory/Attribute.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -340,6 +340,5 @@ public interface Attribute extends Cloneable, java.io.Serializable {
      * ineffectual. Do not use; no replacement.
      */
     @Deprecated
-    @SuppressWarnings("serial")
     static final long serialVersionUID = 8707690322213556804L;
 }
diff --git a/src/java.prefs/unix/classes/java/util/prefs/FileSystemPreferences.java b/src/java.prefs/unix/classes/java/util/prefs/FileSystemPreferences.java
index 4f75f434745..681abec46c3 100644
--- a/src/java.prefs/unix/classes/java/util/prefs/FileSystemPreferences.java
+++ b/src/java.prefs/unix/classes/java/util/prefs/FileSystemPreferences.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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 @@ class FileSystemPreferences extends AbstractPreferences {
     /**
      * Sync interval in seconds.
      */
-    @SuppressWarnings("removal")
     private static final int SYNC_INTERVAL = Math.max(1,
             Integer.getInteger("java.util.prefs.syncInterval", 30));
 
diff --git a/src/java.rmi/share/classes/java/rmi/server/RemoteRef.java b/src/java.rmi/share/classes/java/rmi/server/RemoteRef.java
index 57201cd8dc3..a32f56dabc1 100644
--- a/src/java.rmi/share/classes/java/rmi/server/RemoteRef.java
+++ b/src/java.rmi/share/classes/java/rmi/server/RemoteRef.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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 @@ public interface RemoteRef extends java.io.Externalizable {
      * ineffectual. Do not use; no replacement.
      */
     @Deprecated
-    @SuppressWarnings("serial")
     static final long serialVersionUID = 3632638527362204081L;
 
     /**
diff --git a/src/java.rmi/share/classes/java/rmi/server/ServerRef.java b/src/java.rmi/share/classes/java/rmi/server/ServerRef.java
index 1562f67fe7a..9ffb208640a 100644
--- a/src/java.rmi/share/classes/java/rmi/server/ServerRef.java
+++ b/src/java.rmi/share/classes/java/rmi/server/ServerRef.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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 @@ public interface ServerRef extends RemoteRef {
      * ineffectual. Do not use; no replacement.
      */
     @Deprecated
-    @SuppressWarnings("serial")
     static final long serialVersionUID = -4557750989390278438L;
 
     /**
diff --git a/src/java.rmi/share/classes/sun/rmi/registry/RegistryImpl_Skel.java b/src/java.rmi/share/classes/sun/rmi/registry/RegistryImpl_Skel.java
index 22cfee5e0a7..95b94c57e1c 100644
--- a/src/java.rmi/share/classes/sun/rmi/registry/RegistryImpl_Skel.java
+++ b/src/java.rmi/share/classes/sun/rmi/registry/RegistryImpl_Skel.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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 @@ import sun.rmi.transport.StreamRemoteCall;
  * Skeleton to dispatch RegistryImpl methods.
  * Originally generated by RMIC but frozen to match the stubs.
  */
-@SuppressWarnings({"deprecation", "serial"})
+@SuppressWarnings("deprecation")
 public final class RegistryImpl_Skel
         implements java.rmi.server.Skeleton {
     private static final java.rmi.server.Operation[] operations = {
diff --git a/src/java.rmi/share/classes/sun/rmi/transport/DGCImpl_Skel.java b/src/java.rmi/share/classes/sun/rmi/transport/DGCImpl_Skel.java
index 1b413cffc19..20485dcd1e3 100644
--- a/src/java.rmi/share/classes/sun/rmi/transport/DGCImpl_Skel.java
+++ b/src/java.rmi/share/classes/sun/rmi/transport/DGCImpl_Skel.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -31,7 +31,7 @@ import java.io.IOException;
  * Skeleton to dispatch DGC methods.
  * Originally generated by RMIC but frozen to match the stubs.
  */
-@SuppressWarnings({"deprecation", "serial"})
+@SuppressWarnings("deprecation")
 public final class DGCImpl_Skel
         implements java.rmi.server.Skeleton {
     private static final java.rmi.server.Operation[] operations = {
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 9cc7a5b2da8..9bc730569cd 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, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -318,7 +318,6 @@ public class SyncFactory {
     private static String colon = ":";
     private static String strFileSep = "/";
 
-    @SuppressWarnings("removal")
     private static synchronized void initMapIfNecessary() throws SyncFactoryException {
 
         // Local implementation class names and keys from Properties
diff --git a/src/java.sql/share/classes/java/sql/Date.java b/src/java.sql/share/classes/java/sql/Date.java
index c1d4fed3023..56d138afdce 100644
--- a/src/java.sql/share/classes/java/sql/Date.java
+++ b/src/java.sql/share/classes/java/sql/Date.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -286,7 +286,6 @@ public class Date extends java.util.Date {
      * @throws NullPointerException if {@code date} is null
      * @since 1.8
      */
-    @SuppressWarnings("deprecation")
     public static Date valueOf(LocalDate date) {
         return new Date(date.getYear() - 1900, date.getMonthValue() -1,
                         date.getDayOfMonth());
diff --git a/src/java.sql/share/classes/java/sql/Time.java b/src/java.sql/share/classes/java/sql/Time.java
index 32df3644354..802a7433162 100644
--- a/src/java.sql/share/classes/java/sql/Time.java
+++ b/src/java.sql/share/classes/java/sql/Time.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -249,7 +249,6 @@ public class Time extends java.util.Date {
      * @throws NullPointerException if {@code time} is null
      * @since 1.8
      */
-    @SuppressWarnings("deprecation")
     public static Time valueOf(LocalTime time) {
         return new Time(time.getHour(), time.getMinute(), time.getSecond());
     }
diff --git a/src/java.sql/share/classes/java/sql/Timestamp.java b/src/java.sql/share/classes/java/sql/Timestamp.java
index 8fb85f73c7e..a91ab7210c5 100644
--- a/src/java.sql/share/classes/java/sql/Timestamp.java
+++ b/src/java.sql/share/classes/java/sql/Timestamp.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -493,7 +493,6 @@ public class Timestamp extends java.util.Date {
      * @throws NullPointerException if {@code dateTime} is null.
      * @since 1.8
      */
-    @SuppressWarnings("deprecation")
     public static Timestamp valueOf(LocalDateTime dateTime) {
         return new Timestamp(dateTime.getYear() - 1900,
                              dateTime.getMonthValue() - 1,
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/NodeSortRecord.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/NodeSortRecord.java
index 83071b62347..bd0b0355ee6 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/NodeSortRecord.java
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/NodeSortRecord.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved.
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -30,7 +30,7 @@ import java.util.Locale;
 /**
  * Base class for sort records containing application specific sort keys
  *
- * @LastModified: May 2019
+ * @LastModified: Jan 2025
  */
 public abstract class NodeSortRecord {
     public static final int COMPARE_STRING     = 0;
@@ -127,7 +127,7 @@ public abstract class NodeSortRecord {
      * element. The value is extracted from the DOM if it is not already in
      * our sort key vector.
      */
-    @SuppressWarnings({"rawtypes", "unchecked"})
+    @SuppressWarnings("rawtypes")
     private final Comparable stringValue(int level) {
         // Get value from our array if possible
         if (_scanned <= level) {
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/SAX2StAXEventWriter.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/SAX2StAXEventWriter.java
index fbe41a17028..a34f4fe3e8a 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/SAX2StAXEventWriter.java
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/SAX2StAXEventWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -250,7 +250,7 @@ public class SAX2StAXEventWriter extends SAX2StAXBaseWriter {
         super.endCDATA();
     }
 
-    @SuppressWarnings({"rawtypes", "unchecked"})
+    @SuppressWarnings("unchecked")
     protected void createStartEvents(Attributes attributes, Collection<Attribute>[] events) {
 
         Map<String, Attribute> nsMap = null;
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/TemplatesImpl.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/TemplatesImpl.java
index f167cf78d5a..24f10e69853 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/TemplatesImpl.java
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/TemplatesImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2025, Oracle and/or its affiliates. All rights reserved.
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -65,7 +65,7 @@ import jdk.xml.internal.JdkConstants;
  * @author G. Todd Millerj
  * @author Jochen Cordes <Jochen.Cordes@t-online.de>
  * @author Santiago Pericas-Geertsen
- * @LastModified: Nov 2024
+ * @LastModified: Jan 2025
  */
 public final class TemplatesImpl implements Templates, Serializable {
     static final long serialVersionUID = 673094361519270707L;
@@ -255,7 +255,6 @@ public final class TemplatesImpl implements Templates, Serializable {
      *  if yes then we need to deserialize the URIResolver
      *  Fix for bugzilla bug 22438
      */
-    @SuppressWarnings("unchecked")
     private void  readObject(ObjectInputStream is)
       throws IOException, ClassNotFoundException
     {
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/TrAXFilter.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/TrAXFilter.java
index 95c8540ca28..2cecf112bd3 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/TrAXFilter.java
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/TrAXFilter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -43,9 +43,8 @@ import org.xml.sax.helpers.XMLFilterImpl;
  * @author Santiago Pericas-Geertsen
  * @author G. Todd Miller
  *
- * @LastModified: July 2023
+ * @LastModified: Jan 2025
  */
-@SuppressWarnings("deprecation") //org.xml.sax.helpers.XMLReaderFactory
 public class TrAXFilter extends XMLFilterImpl {
     private Templates              _templates;
     private TransformerImpl        _transformer;
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/TransformerImpl.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/TransformerImpl.java
index 32eaec026bf..b48b9d2a657 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/TransformerImpl.java
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/TransformerImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2025, Oracle and/or its affiliates. All rights reserved.
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -100,7 +100,7 @@ import org.xml.sax.ext.LexicalHandler;
  * @author Morten Jorgensen
  * @author G. Todd Miller
  * @author Santiago Pericas-Geertsen
- * @LastModified: Dec 2024
+ * @LastModified: Jan 2025
  */
 public final class TransformerImpl extends Transformer
     implements DOMCache
@@ -1355,7 +1355,6 @@ public final class TransformerImpl extends Transformer
                  * Performs the access check without any interface changes
                  * (e.g. Translet and DOMCache).
                  */
-                @SuppressWarnings("unchecked") //AbstractTranslet is the sole impl.
                 AbstractTranslet t = (AbstractTranslet)translet;
                 String systemId = SystemIDResolver.getAbsoluteURI(href, baseURI);
                 String errMsg = null;
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/Util.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/Util.java
index b4dd0ef6b97..fe685dcf5a6 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/Util.java
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/Util.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2025, Oracle and/or its affiliates. All rights reserved.
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -50,9 +50,8 @@ import org.xml.sax.XMLReader;
  *
  * Added Catalog Support for URI resolution
  *
- * @LastModified: Nov 2024
+ * @LastModified: Jan 2025
  */
-@SuppressWarnings("deprecation") //org.xml.sax.helpers.XMLReaderFactory
 public final class Util {
     private static final String property = "org.xml.sax.driver";
 
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DocumentImpl.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DocumentImpl.java
index 9b7938ca5b2..decd9943850 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DocumentImpl.java
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DocumentImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -84,7 +84,7 @@ import org.w3c.dom.traversal.TreeWalker;
  * @author Andy Clark, IBM
  * @author Ralf Pfeiffer, IBM
  * @since  PR-DOM-Level-1-19980818.
- * @LastModified: Nov 2017
+ * @LastModified: Jan 2025
  */
 public class DocumentImpl
     extends CoreDocumentImpl
@@ -681,7 +681,7 @@ public class DocumentImpl
      *              method was invoked by an EventListener; otherwise false.
     */
     @Override
-    @SuppressWarnings({"rawtypes", "unchecked"})
+    @SuppressWarnings("unchecked")
     protected boolean dispatchEvent(NodeImpl node, Event event) {
         if (event == null) return false;
 
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/NamedNodeMapImpl.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/NamedNodeMapImpl.java
index a2b3e3269a5..c95dfd2fd87 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/NamedNodeMapImpl.java
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/NamedNodeMapImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved.
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -56,7 +56,7 @@ import org.w3c.dom.Node;
  * @xerces.internal
  *
  * @since  PR-DOM-Level-1-19980818.
- * @LastModified: June 2022
+ * @LastModified: Jan 2025
  */
 public class NamedNodeMapImpl
     implements NamedNodeMap, Serializable {
@@ -596,7 +596,6 @@ public class NamedNodeMapImpl
         }
     }
 
-    @SuppressWarnings("unchecked")
     private void readObject(ObjectInputStream in)
         throws IOException, ClassNotFoundException {
         in.defaultReadObject();
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDHandler.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDHandler.java
index bd11ac73c60..9ebaf895c5c 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDHandler.java
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2025, Oracle and/or its affiliates. All rights reserved.
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -131,9 +131,8 @@ import org.xml.sax.XMLReader;
  * @author Neil Graham, IBM
  * @author Pavani Mukthipudi, Sun Microsystems
  *
- * @LastModified: July 2023
+ * @LastModified: Jan 2025
  */
-@SuppressWarnings("deprecation") //org.xml.sax.helpers.XMLReaderFactory
 public class XSDHandler {
 
     /** Feature identifier: validation. */
@@ -2768,7 +2767,6 @@ public class XSDHandler {
         }
     }
 
-    @SuppressWarnings("unchecked")
     private void addNewImportedGrammars(SchemaGrammar srcGrammar, SchemaGrammar dstGrammar) {
         final ArrayList<SchemaGrammar> src = (ArrayList<SchemaGrammar>)srcGrammar.getImportedGrammars();
         if (src != null) {
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/StringComparable.java b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/StringComparable.java
index db6fe80824a..1b950591bac 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/StringComparable.java
+++ b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/StringComparable.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved.
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -29,7 +29,7 @@ import java.util.Locale;
 /**
 * International friendly string comparison with case-order
  * @author Igor Hersht, igorh@ca.ibm.com
- * @LastModified: Oct 2017
+ * @LastModified: Jan 2025
 */
 public class StringComparable implements Comparable<StringComparable>  {
 
@@ -52,7 +52,7 @@ public class StringComparable implements Comparable<StringComparable>  {
          m_mask = getMask(m_collator.getStrength());
     }
 
-    @SuppressWarnings({"rawtypes", "unchecked"})
+    @SuppressWarnings("rawtypes")
     public final static Comparable getComparator( final String text, final Locale locale,
             final Collator collator, final String caseOrder){
         if((caseOrder == null) ||(caseOrder.length() == 0)){// no case-order specified
diff --git a/src/java.xml/share/classes/javax/xml/catalog/CatalogReader.java b/src/java.xml/share/classes/javax/xml/catalog/CatalogReader.java
index 1305beeceaa..0cee5cfa41d 100644
--- a/src/java.xml/share/classes/javax/xml/catalog/CatalogReader.java
+++ b/src/java.xml/share/classes/javax/xml/catalog/CatalogReader.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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,6 @@ class CatalogReader extends DefaultHandler implements EntityResolver, URIResolve
      *
      * @param catalog The Catalog object that represents a catalog
      */
-    @SuppressWarnings("unchecked")
     public CatalogReader(Catalog catalog, SAXParser parser) {
         this.catalog = (CatalogImpl) catalog;
         this.parser = parser;
diff --git a/src/jdk.jartool/share/classes/sun/tools/jar/Main.java b/src/jdk.jartool/share/classes/sun/tools/jar/Main.java
index ae6893c021b..baedbf85205 100644
--- a/src/jdk.jartool/share/classes/sun/tools/jar/Main.java
+++ b/src/jdk.jartool/share/classes/sun/tools/jar/Main.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -243,7 +243,6 @@ public class Main {
     /**
      * Starts main program with the specified arguments.
      */
-    @SuppressWarnings({"removal"})
     public synchronized boolean run(String[] args) {
         ok = true;
         if (!parseArgs(args)) {
@@ -1364,7 +1363,6 @@ public class Main {
         });
     }
 
-    @SuppressWarnings("serial")
     Set<ZipEntry> newDirSet() {
         return new HashSet<ZipEntry>() {
             public boolean add(ZipEntry e) {
diff --git a/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/Analyzer.java b/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/Analyzer.java
index 22377715a1e..ea61d79a6c0 100644
--- a/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/Analyzer.java
+++ b/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/Analyzer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -336,7 +336,6 @@ public class Analyzer {
         }
 
         @Override
-        @SuppressWarnings("unchecked")
         public boolean equals(Object o) {
             if (o instanceof Dep) {
                 Dep d = (Dep) o;
diff --git a/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/Dependencies.java b/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/Dependencies.java
index c0ac835f4b6..90682c478c7 100644
--- a/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/Dependencies.java
+++ b/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/Dependencies.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -56,7 +56,6 @@ public class Dependencies {
     /**
      * Thrown when a class file cannot be found.
      */
-    @SuppressWarnings("this-escape")
     public static class ClassFileNotFoundException extends Exception {
         private static final long serialVersionUID = 3632265927794475048L;
 
@@ -76,7 +75,6 @@ public class Dependencies {
     /**
      * Thrown when an exception is found processing a class file.
      */
-    @SuppressWarnings("this-escape")
     public static class ClassFileError extends Error {
         private static final long serialVersionUID = 4111110813961313203L;
 
diff --git a/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/VersionPropsPlugin.java b/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/VersionPropsPlugin.java
index 86f68098453..a07661fd339 100644
--- a/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/VersionPropsPlugin.java
+++ b/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/VersionPropsPlugin.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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,7 +99,6 @@ abstract class VersionPropsPlugin extends AbstractPlugin {
 
     private boolean redefined = false;
 
-    @SuppressWarnings("deprecation")
     private byte[] redefine(String path, byte[] classFile) {
         return ClassFile.of().transformClass(newClassReader(path, classFile),
             ClassTransform.transformingMethodBodies(
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/BundlerParamInfo.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/BundlerParamInfo.java
index fa99073ff7f..48499dcf29c 100644
--- a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/BundlerParamInfo.java
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/BundlerParamInfo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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,6 @@ class BundlerParamInfo<T> {
         return stringConverter;
     }
 
-    @SuppressWarnings("unchecked")
     final T fetchFrom(Map<String, ? super Object> params) {
         return fetchFrom(params, true);
     }
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/StandardBundlerParam.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/StandardBundlerParam.java
index 0209eea584a..ec5b1aceaab 100644
--- a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/StandardBundlerParam.java
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/StandardBundlerParam.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -276,7 +276,6 @@ class StandardBundlerParam<T> extends BundlerParamInfo<T> {
                     (s, p) -> s
             );
 
-    @SuppressWarnings("unchecked")
     public static final StandardBundlerParam<String> LICENSE_FILE =
             new StandardBundlerParam<>(
                     Arguments.CLIOptions.LICENSE_FILE.getId(),
diff --git a/src/jdk.naming.rmi/share/classes/com/sun/jndi/rmi/registry/ReferenceWrapper_Stub.java b/src/jdk.naming.rmi/share/classes/com/sun/jndi/rmi/registry/ReferenceWrapper_Stub.java
index 211da640e20..6cac42e63f2 100644
--- a/src/jdk.naming.rmi/share/classes/com/sun/jndi/rmi/registry/ReferenceWrapper_Stub.java
+++ b/src/jdk.naming.rmi/share/classes/com/sun/jndi/rmi/registry/ReferenceWrapper_Stub.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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 @@ package com.sun.jndi.rmi.registry;
 /**
  * ReferenceWrapper_Stub.
  */
-@SuppressWarnings({"deprecation", "rawtypes", "unchecked"})
+@SuppressWarnings({"deprecation", "rawtypes"})
 public final class ReferenceWrapper_Stub
         extends java.rmi.server.RemoteStub
         implements com.sun.jndi.rmi.registry.RemoteReference, java.rmi.Remote {
diff --git a/src/jdk.naming.rmi/share/classes/com/sun/jndi/rmi/registry/RegistryContext.java b/src/jdk.naming.rmi/share/classes/com/sun/jndi/rmi/registry/RegistryContext.java
index 2f77c383bd6..337f00fd7c7 100644
--- a/src/jdk.naming.rmi/share/classes/com/sun/jndi/rmi/registry/RegistryContext.java
+++ b/src/jdk.naming.rmi/share/classes/com/sun/jndi/rmi/registry/RegistryContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/ClassReader.java b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/ClassReader.java
index 643a6501470..7e499412dc2 100644
--- a/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/ClassReader.java
+++ b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/ClassReader.java
@@ -205,7 +205,6 @@ public class ClassReader {
       * @param classFileOffset the offset in byteBuffer of the first byte of the ClassFile to be read.
       * @param classFileLength the length in bytes of the ClassFile to be read.
       */
-    @SuppressWarnings("this-escape")
     public ClassReader(
             final byte[] classFileBuffer,
             final int classFileOffset,
diff --git a/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/ClassWriter.java b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/ClassWriter.java
index ea28726914f..e3c0ad707a0 100644
--- a/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/ClassWriter.java
+++ b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/ClassWriter.java
@@ -292,7 +292,6 @@ public class ClassWriter extends ClassVisitor {
       *     do not affect methods that are copied as is in the new class. This means that neither the
       *     maximum stack size nor the stack frames will be computed for these methods</i>.
       */
-    @SuppressWarnings("this-escape")
     public ClassWriter(final ClassReader classReader, final int flags) {
         super(/* latest api = */ Opcodes.ASM9);
         this.flags = flags;
diff --git a/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/tree/MethodNode.java b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/tree/MethodNode.java
index 4c265d44290..31da5e5c5ef 100644
--- a/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/tree/MethodNode.java
+++ b/test/hotspot/jtreg/testlibrary/asm/org/objectweb/asm/tree/MethodNode.java
@@ -275,7 +275,6 @@ public class MethodNode extends MethodVisitor {
     }
 
     @Override
-    @SuppressWarnings("serial")
     public AnnotationVisitor visitAnnotationDefault() {
         return new AnnotationNode(
                 new ArrayList<Object>(0) {

From 6012e8d2505af786bd4f17cf56b1e81a102485d4 Mon Sep 17 00:00:00 2001
From: Archie Cobbs <acobbs@openjdk.org>
Date: Wed, 5 Mar 2025 17:33:54 +0000
Subject: [PATCH 238/587] 8350808: Small typos in JShell method
 SnippetEvent.toString()

Reviewed-by: jlahoda
---
 .../classes/jdk/jshell/SnippetEvent.java      |  8 +--
 .../jdk/jshell/SnippetEventToStringTest.java  | 63 +++++++++++++++++++
 2 files changed, 67 insertions(+), 4 deletions(-)
 create mode 100644 test/langtools/jdk/jshell/SnippetEventToStringTest.java

diff --git a/src/jdk.jshell/share/classes/jdk/jshell/SnippetEvent.java b/src/jdk.jshell/share/classes/jdk/jshell/SnippetEvent.java
index f18fa429339..0c80b6d4388 100644
--- a/src/jdk.jshell/share/classes/jdk/jshell/SnippetEvent.java
+++ b/src/jdk.jshell/share/classes/jdk/jshell/SnippetEvent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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,9 +148,9 @@ public class SnippetEvent {
                 ",previousStatus=" + previousStatus +
                 ",status=" + status +
                 ",isSignatureChange=" + isSignatureChange +
-                ",causeSnippet" + causeSnippet +
-                (value == null? "" : "value=" + value) +
-                (exception == null? "" : "exception=" + exception) +
+                ",causeSnippet=" + causeSnippet +
+                (value == null? "" : ",value=" + value) +
+                (exception == null? "" : ",exception=" + exception) +
                 ")";
     }
 }
diff --git a/test/langtools/jdk/jshell/SnippetEventToStringTest.java b/test/langtools/jdk/jshell/SnippetEventToStringTest.java
new file mode 100644
index 00000000000..7d2de387951
--- /dev/null
+++ b/test/langtools/jdk/jshell/SnippetEventToStringTest.java
@@ -0,0 +1,63 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact 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 8350808
+ * @summary Check for proper formatting of SnippetEvent.toString()
+ * @run testng SnippetEventToStringTest
+ */
+
+import java.util.Map;
+import java.util.List;
+
+import jdk.jshell.JShell;
+import jdk.jshell.SnippetEvent;
+import jdk.jshell.execution.LocalExecutionControlProvider;
+
+import org.testng.annotations.DataProvider;
+import org.testng.annotations.Test;
+import static org.testng.Assert.assertEquals;
+
+public class SnippetEventToStringTest {
+
+    @DataProvider(name = "cases")
+    public String[][] sourceLevels() {
+        return new String[][] {
+            { "*",                              ",causeSnippet=null" },
+            { "123",                            ",value=123" },
+            { "throw new Exception(\"foo\");",  ",exception=jdk.jshell.EvalException: foo" }
+        };
+    }
+
+    @Test(dataProvider = "cases")
+    private void verifySnippetEvent(String source, String match) {
+        try (JShell jsh = JShell.builder().executionEngine(new LocalExecutionControlProvider(), Map.of()).build()) {
+            List<SnippetEvent> result = jsh.eval(source);
+            assertEquals(result.size(), 1);
+            String string = result.get(0).toString();
+            if (!string.contains(match))
+                throw new AssertionError(String.format("\"%s\" not found in \"%s\"", match, string));
+        }
+    }
+}

From c3b48196af40356a8251b42db13e02ed905c2139 Mon Sep 17 00:00:00 2001
From: Justin Lu <jlu@openjdk.org>
Date: Wed, 5 Mar 2025 18:12:26 +0000
Subject: [PATCH 239/587] 8351074: Disallow null prefix and suffix in
 DecimalFormat

Reviewed-by: naoto
---
 .../classes/java/text/DecimalFormat.java      | 19 +++++--
 .../text/Format/DecimalFormat/AffixTest.java  | 50 +++++++++++++++++++
 2 files changed, 64 insertions(+), 5 deletions(-)
 create mode 100644 test/jdk/java/text/Format/DecimalFormat/AffixTest.java

diff --git a/src/java.base/share/classes/java/text/DecimalFormat.java b/src/java.base/share/classes/java/text/DecimalFormat.java
index b23c5f360bf..ce2ecfb23a2 100644
--- a/src/java.base/share/classes/java/text/DecimalFormat.java
+++ b/src/java.base/share/classes/java/text/DecimalFormat.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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,7 @@ import java.text.spi.NumberFormatProvider;
 import java.util.ArrayList;
 import java.util.Currency;
 import java.util.Locale;
+import java.util.Objects;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicLong;
 
@@ -2811,9 +2812,11 @@ public class DecimalFormat extends NumberFormat {
      * Set the positive prefix.
      * <P>Examples: +123, $123, sFr123
      *
-     * @param newValue the new positive prefix
+     * @param newValue the new positive prefix. Non-null.
+     * @throws NullPointerException if {@code newValue} is {@code null}
      */
     public void setPositivePrefix (String newValue) {
+        Objects.requireNonNull(newValue, "prefix must not be null");
         positivePrefix = newValue;
         posPrefixPattern = null;
         positivePrefixFieldPositions = null;
@@ -2853,9 +2856,11 @@ public class DecimalFormat extends NumberFormat {
      * Set the negative prefix.
      * <P>Examples: -123, ($123) (with negative suffix), sFr-123
      *
-     * @param newValue the new negative prefix
+     * @param newValue the new negative prefix. Non-null.
+     * @throws NullPointerException if {@code newValue} is {@code null}
      */
     public void setNegativePrefix (String newValue) {
+        Objects.requireNonNull(newValue, "prefix must not be null");
         negativePrefix = newValue;
         negPrefixPattern = null;
         fastPathCheckNeeded = true;
@@ -2894,9 +2899,11 @@ public class DecimalFormat extends NumberFormat {
      * Set the positive suffix.
      * <P>Example: 123%
      *
-     * @param newValue the new positive suffix
+     * @param newValue the new positive suffix. Non-null.
+     * @throws NullPointerException if {@code newValue} is {@code null}
      */
     public void setPositiveSuffix (String newValue) {
+        Objects.requireNonNull(newValue, "suffix must not be null");
         positiveSuffix = newValue;
         posSuffixPattern = null;
         fastPathCheckNeeded = true;
@@ -2935,9 +2942,11 @@ public class DecimalFormat extends NumberFormat {
      * Set the negative suffix.
      * <P>Examples: 123%
      *
-     * @param newValue the new negative suffix
+     * @param newValue the new negative suffix. Non-null.
+     * @throws NullPointerException if {@code newValue} is {@code null}
      */
     public void setNegativeSuffix (String newValue) {
+        Objects.requireNonNull(newValue, "suffix must not be null");
         negativeSuffix = newValue;
         negSuffixPattern = null;
         fastPathCheckNeeded = true;
diff --git a/test/jdk/java/text/Format/DecimalFormat/AffixTest.java b/test/jdk/java/text/Format/DecimalFormat/AffixTest.java
new file mode 100644
index 00000000000..28b14e750a2
--- /dev/null
+++ b/test/jdk/java/text/Format/DecimalFormat/AffixTest.java
@@ -0,0 +1,50 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact 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 8351074
+ * @summary Test input value check for DecimalFormat affix setter methods
+ * @run junit AffixTest
+ */
+
+import org.junit.jupiter.api.Test;
+
+import java.text.DecimalFormat;
+
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
+public class AffixTest {
+
+    @Test
+    public void nullPrefixTest() {
+        assertThrows(NullPointerException.class, () -> new DecimalFormat().setPositivePrefix(null));
+        assertThrows(NullPointerException.class, () -> new DecimalFormat().setNegativePrefix(null));
+    }
+
+    @Test
+    public void nullSuffixTest() {
+        assertThrows(NullPointerException.class, () -> new DecimalFormat().setPositiveSuffix(null));
+        assertThrows(NullPointerException.class, () -> new DecimalFormat().setNegativeSuffix(null));
+    }
+}

From 11a37c829c12d064874416a7b242596cf23972e5 Mon Sep 17 00:00:00 2001
From: Coleen Phillimore <coleenp@openjdk.org>
Date: Wed, 5 Mar 2025 19:28:39 +0000
Subject: [PATCH 240/587] 8351165: Remove unused includes from vmStructs

Reviewed-by: kbarrett
---
 .../share/classfile/compactHashtable.hpp      |  3 +--
 src/hotspot/share/classfile/stringTable.hpp   |  1 -
 src/hotspot/share/classfile/symbolTable.hpp   |  3 +--
 .../share/classfile/systemDictionary.hpp      |  1 -
 src/hotspot/share/memory/arena.hpp            |  1 -
 src/hotspot/share/memory/resourceArea.hpp     |  2 --
 src/hotspot/share/runtime/sharedRuntime.hpp   |  4 +--
 src/hotspot/share/runtime/vmStructs.cpp       | 27 ++-----------------
 .../serviceability/sa/ClhsdbPrintStatics.java |  4 +--
 9 files changed, 7 insertions(+), 39 deletions(-)

diff --git a/src/hotspot/share/classfile/compactHashtable.hpp b/src/hotspot/share/classfile/compactHashtable.hpp
index 161f21eac99..2985f0f9a1a 100644
--- a/src/hotspot/share/classfile/compactHashtable.hpp
+++ b/src/hotspot/share/classfile/compactHashtable.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -241,7 +241,6 @@ template <
   bool (*EQUALS)(V value, K key, int len)
   >
 class CompactHashtable : public SimpleCompactHashtable {
-  friend class VMStructs;
 
   V decode(u4 offset) const {
     return DECODE(_base_address, offset);
diff --git a/src/hotspot/share/classfile/stringTable.hpp b/src/hotspot/share/classfile/stringTable.hpp
index 0d58e09f208..15539009f66 100644
--- a/src/hotspot/share/classfile/stringTable.hpp
+++ b/src/hotspot/share/classfile/stringTable.hpp
@@ -40,7 +40,6 @@ class SerializeClosure;
 class StringTableConfig;
 
 class StringTable : AllStatic {
-  friend class VMStructs;
   friend class StringTableConfig;
 
   static volatile bool _has_work;
diff --git a/src/hotspot/share/classfile/symbolTable.hpp b/src/hotspot/share/classfile/symbolTable.hpp
index ee2cfe19d8e..cc861812dc3 100644
--- a/src/hotspot/share/classfile/symbolTable.hpp
+++ b/src/hotspot/share/classfile/symbolTable.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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 @@ class constantPoolHandle;
 class SymbolClosure;
 
 class SymbolTable : public AllStatic {
-  friend class VMStructs;
   friend class Symbol;
   friend class ClassFileParser;
   friend class SymbolTableConfig;
diff --git a/src/hotspot/share/classfile/systemDictionary.hpp b/src/hotspot/share/classfile/systemDictionary.hpp
index 7432166ba4e..1ba5d70af9e 100644
--- a/src/hotspot/share/classfile/systemDictionary.hpp
+++ b/src/hotspot/share/classfile/systemDictionary.hpp
@@ -79,7 +79,6 @@ class SystemDictionary : AllStatic {
   friend class AOTLinkedClassBulkLoader;
   friend class BootstrapInfo;
   friend class vmClasses;
-  friend class VMStructs;
 
  public:
 
diff --git a/src/hotspot/share/memory/arena.hpp b/src/hotspot/share/memory/arena.hpp
index dfa12209f40..01b1ae382db 100644
--- a/src/hotspot/share/memory/arena.hpp
+++ b/src/hotspot/share/memory/arena.hpp
@@ -129,7 +129,6 @@ private:
 protected:
   friend class HandleMark;
   friend class NoHandleMark;
-  friend class VMStructs;
 
   Chunk* _first;                // First chunk
   Chunk* _chunk;                // current chunk
diff --git a/src/hotspot/share/memory/resourceArea.hpp b/src/hotspot/share/memory/resourceArea.hpp
index 85ad6590d69..557a3c0a24e 100644
--- a/src/hotspot/share/memory/resourceArea.hpp
+++ b/src/hotspot/share/memory/resourceArea.hpp
@@ -43,8 +43,6 @@
 //------------------------------ResourceArea-----------------------------------
 // A ResourceArea is an Arena that supports safe usage of ResourceMark.
 class ResourceArea: public Arena {
-  friend class VMStructs;
-
 #ifdef ASSERT
   int _nesting;                 // current # of nested ResourceMarks
   void verify_has_resource_mark();
diff --git a/src/hotspot/share/runtime/sharedRuntime.hpp b/src/hotspot/share/runtime/sharedRuntime.hpp
index 854d4dcf1ad..94cbc460cad 100644
--- a/src/hotspot/share/runtime/sharedRuntime.hpp
+++ b/src/hotspot/share/runtime/sharedRuntime.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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,8 +54,6 @@ enum class SharedStubId :int {
 #undef SHARED_STUB_ID_ENUM_DECLARE
 
 class SharedRuntime: AllStatic {
-  friend class VMStructs;
-
  private:
   // Declare shared stub fields
 #define SHARED_STUB_FIELD_DECLARE(name, type) \
diff --git a/src/hotspot/share/runtime/vmStructs.cpp b/src/hotspot/share/runtime/vmStructs.cpp
index 53bdfe522d0..3daec6d8d06 100644
--- a/src/hotspot/share/runtime/vmStructs.cpp
+++ b/src/hotspot/share/runtime/vmStructs.cpp
@@ -23,18 +23,9 @@
  */
 
 #include "cds/filemap.hpp"
-#include "ci/ciField.hpp"
-#include "ci/ciInstance.hpp"
-#include "ci/ciMethodData.hpp"
-#include "ci/ciObjArrayKlass.hpp"
-#include "ci/ciSymbol.hpp"
 #include "classfile/classLoaderDataGraph.hpp"
-#include "classfile/dictionary.hpp"
 #include "classfile/javaClasses.hpp"
 #include "classfile/javaThreadStatus.hpp"
-#include "classfile/stringTable.hpp"
-#include "classfile/symbolTable.hpp"
-#include "classfile/systemDictionary.hpp"
 #include "classfile/vmClasses.hpp"
 #include "classfile/vmSymbols.hpp"
 #include "code/codeBlob.hpp"
@@ -103,10 +94,8 @@
 #include "runtime/osThread.hpp"
 #include "runtime/perfMemory.hpp"
 #include "runtime/serviceThread.hpp"
-#include "runtime/sharedRuntime.hpp"
 #include "runtime/stubRoutines.hpp"
 #include "runtime/synchronizer.hpp"
-#include "runtime/threadSMR.hpp"
 #include "runtime/vframeArray.hpp"
 #include "runtime/vmStructs.hpp"
 #include "runtime/vm_version.hpp"
@@ -411,7 +400,7 @@
      volatile_static_field(PerfMemory,         _initialized,                                  int)                                   \
                                                                                                                                      \
   /********************/                                                                                                             \
-  /* SystemDictionary */                                                                                                             \
+  /* VM Classes       */                                                                                                             \
   /********************/                                                                                                             \
                                                                                                                                      \
      static_field(vmClasses,                   VM_CLASS_AT(Object_klass),                        InstanceKlass*)                     \
@@ -635,7 +624,6 @@
   nonstatic_field(JavaThread,                  _monitor_owner_id,                             int64_t)                               \
   volatile_nonstatic_field(JavaThread,         _terminated,                                   JavaThread::TerminatedTypes)           \
   nonstatic_field(Thread,                      _osthread,                                     OSThread*)                             \
-  nonstatic_field(Thread,                      _resource_area,                                ResourceArea*)                         \
                                                                                                                                      \
   /************/                                                                                                                     \
   /* OSThread */                                                                                                                     \
@@ -1009,17 +997,14 @@
   declare_type(PerfData, CHeapObj<mtInternal>)                            \
                                                                           \
   /********************/                                                  \
-  /* SystemDictionary */                                                  \
+  /* VM Classes       */                                                  \
   /********************/                                                  \
                                                                           \
-  declare_toplevel_type(SystemDictionary)                                 \
   declare_toplevel_type(vmClasses)                                        \
   declare_toplevel_type(vmSymbols)                                        \
                                                                           \
   declare_toplevel_type(GrowableArrayBase)                                \
   declare_toplevel_type(GrowableArray<int>)                               \
-  declare_toplevel_type(Arena)                                            \
-    declare_type(ResourceArea, Arena)                                     \
                                                                           \
   /***********************************************************/           \
   /* Thread hierarchy (needed for run-time type information) */           \
@@ -1090,8 +1075,6 @@
   /* CodeBlob hierarchy (needed for run-time type information) */         \
   /*************************************************************/         \
                                                                           \
-  declare_toplevel_type(SharedRuntime)                                    \
-                                                                          \
   declare_toplevel_type(CodeBlob)                                         \
   declare_type(RuntimeBlob,              CodeBlob)                        \
   declare_type(BufferBlob,               RuntimeBlob)                     \
@@ -1163,12 +1146,6 @@
   declare_toplevel_type(BasicLock)                                        \
   declare_toplevel_type(BasicObjectLock)                                  \
                                                                           \
-  /*********************/                                                 \
-  /* Adapter Blob Entries */                                              \
-  /*********************/                                                 \
-  declare_toplevel_type(AdapterHandlerEntry)                              \
-  declare_toplevel_type(AdapterHandlerEntry*)                             \
-                                                                          \
   /********************/                                                  \
   /* -XX flags        */                                                  \
   /********************/                                                  \
diff --git a/test/hotspot/jtreg/serviceability/sa/ClhsdbPrintStatics.java b/test/hotspot/jtreg/serviceability/sa/ClhsdbPrintStatics.java
index d53e5e47f26..abbcb552876 100644
--- a/test/hotspot/jtreg/serviceability/sa/ClhsdbPrintStatics.java
+++ b/test/hotspot/jtreg/serviceability/sa/ClhsdbPrintStatics.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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 @@ public class ClhsdbPrintStatics {
             System.out.println("Started LingeredApp with pid " + theApp.getPid());
 
             List<String> cmds = List.of(
-                    "printstatics", "printstatics SystemDictionary",
+                    "printstatics",
                     "printstatics Threads", "printstatics Universe",
                     "printstatics JvmtiExport");
 

From 107ee878d66f4006f102c1fd12af3bf156a25757 Mon Sep 17 00:00:00 2001
From: Nicole Xu <yuyangx@nvidia.com>
Date: Thu, 6 Mar 2025 01:40:24 +0000
Subject: [PATCH 241/587] 8346954: [JMH] jdk.incubator.vector.MaskedLogicOpts
 fails due to IndexOutOfBoundsException

Co-authored-by: Jatin Bhateja <jbhateja@openjdk.org>
Reviewed-by: jbhateja, xgong
---
 .../jdk/incubator/vector/MaskedLogicOpts.java | 256 ++++++++----------
 1 file changed, 116 insertions(+), 140 deletions(-)

diff --git a/test/micro/org/openjdk/bench/jdk/incubator/vector/MaskedLogicOpts.java b/test/micro/org/openjdk/bench/jdk/incubator/vector/MaskedLogicOpts.java
index 55a3c9d6b75..7fc1fbce2e4 100644
--- a/test/micro/org/openjdk/bench/jdk/incubator/vector/MaskedLogicOpts.java
+++ b/test/micro/org/openjdk/bench/jdk/incubator/vector/MaskedLogicOpts.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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,19 +37,9 @@ public class MaskedLogicOpts {
     @Param({"256","512","1024"})
     private int ARRAYLEN;
 
-    boolean [] mask_arr = {
-        false, false, false, true, false, false, false, false,
-        false, false, false, true, false, false, false, false,
-        false, false, false, true, false, false, false, false,
-        true, true, true, true, true, true, true, true,
-        true, true, true, true, true, true, true, true,
-        false, false, false, true, false, false, false, false,
-        false, false, false, true, false, false, false, false,
-        false, false, false, true, false, false, false, false
-    };
-
     int INVOC_COUNTER = 4096;
 
+    boolean [] mask_arr = new boolean[ARRAYLEN];
     int [] i1 = new int[ARRAYLEN];
     int [] i2 = new int[ARRAYLEN];
     int [] i3 = new int[ARRAYLEN];
@@ -62,39 +52,23 @@ public class MaskedLogicOpts {
     long [] l4 = new long[ARRAYLEN];
     long [] l5 = new long[ARRAYLEN];
 
-    Vector<Integer> iv1;
-    Vector<Integer> iv2;
-    Vector<Integer> iv3;
-    Vector<Integer> iv4;
-    Vector<Integer> iv5;
-
-    Vector<Long> lv1;
-    Vector<Long> lv2;
-    Vector<Long> lv3;
-    Vector<Long> lv4;
-    Vector<Long> lv5;
-
-    VectorMask<Integer> imask;
-    VectorMask<Long> lmask;
-
-    VectorSpecies<Integer> ispecies;
-    VectorSpecies<Long> lspecies;
-
     int int512_arr_idx;
     int int256_arr_idx;
     int int128_arr_idx;
     int long256_arr_idx;
     int long512_arr_idx;
 
-    private Random r = new Random();
+    private Random r = new Random(1024);
 
     @Setup(Level.Trial)
     public void init() {
-        int512_arr_idx = 0;
-        int256_arr_idx = 0;
-        int128_arr_idx = 0;
-        long256_arr_idx = 0;
-        long512_arr_idx = 0;
+        int512_arr_idx = -16;
+        int256_arr_idx = -8;
+        int128_arr_idx = -4;
+        long256_arr_idx = -4;
+        long512_arr_idx = -8;
+
+        mask_arr = new boolean[ARRAYLEN];
         i1 = new int[ARRAYLEN];
         i2 = new int[ARRAYLEN];
         i3 = new int[ARRAYLEN];
@@ -108,6 +82,8 @@ public class MaskedLogicOpts {
         l5 = new long[ARRAYLEN];
 
         for (int i=0; i<ARRAYLEN; i++) {
+            mask_arr[i] = r.nextBoolean();
+
             i1[i] = r.nextInt();
             i2[i] = r.nextInt();
             i3[i] = r.nextInt();
@@ -125,22 +101,22 @@ public class MaskedLogicOpts {
 
     @Setup(Level.Invocation)
     public void init_per_invoc() {
-        int512_arr_idx = (int512_arr_idx + 16) & (ARRAYLEN-1);
-        int256_arr_idx = (int256_arr_idx + 8) & (ARRAYLEN-1);
-        int128_arr_idx = (int128_arr_idx + 4) & (ARRAYLEN-1);
-        long512_arr_idx = (long512_arr_idx + 8) & (ARRAYLEN-1);
-        long256_arr_idx = (long256_arr_idx + 4) & (ARRAYLEN-1);
+        int512_arr_idx = (((ARRAYLEN & ~15) - int512_arr_idx) <= 16) ? 0 : int512_arr_idx + 16;
+        int256_arr_idx = (((ARRAYLEN & ~7) - int256_arr_idx) <= 8)  ? 0 : int256_arr_idx + 8;
+        int128_arr_idx = (((ARRAYLEN & ~3) - int128_arr_idx) <= 4)  ? 0 : int128_arr_idx + 4;
+        long512_arr_idx = (((ARRAYLEN & ~7) - long512_arr_idx) <= 8) ? 0 : long512_arr_idx + 8;
+        long256_arr_idx = (((ARRAYLEN & ~3) - long256_arr_idx) <= 4) ? 0 : long256_arr_idx + 4;
     }
 
     @CompilerControl(CompilerControl.Mode.INLINE)
-    public void maskedLogicKernel(VectorSpecies<Integer> SPECIES) {
-        imask = VectorMask.fromArray(SPECIES, mask_arr, 0);
-        iv2 = IntVector.fromArray(SPECIES, i2, int512_arr_idx);
-        iv3 = IntVector.fromArray(SPECIES, i3, int512_arr_idx);
-        iv4 = IntVector.fromArray(SPECIES, i4, int512_arr_idx);
-        iv5 = IntVector.fromArray(SPECIES, i5, int512_arr_idx);
+    public void maskedLogicKernel(VectorSpecies<Integer> SPECIES, int index) {
+        VectorMask<Integer> imask = VectorMask.fromArray(SPECIES, mask_arr, index);
+        IntVector iv2 = IntVector.fromArray(SPECIES, i2, index);
+        IntVector iv3 = IntVector.fromArray(SPECIES, i3, index);
+        IntVector iv4 = IntVector.fromArray(SPECIES, i4, index);
+        IntVector iv5 = IntVector.fromArray(SPECIES, i5, index);
         for(int i = 0; i < INVOC_COUNTER; i++) {
-            for(int j = 0 ; j < ARRAYLEN; j+= SPECIES.length()) {
+            for(int j = 0 ; j < SPECIES.loopBound(ARRAYLEN); j+= SPECIES.length()) {
                 IntVector.fromArray(SPECIES, i1, j)
                     .lanewise(VectorOperators.AND, iv2, imask)
                     .lanewise(VectorOperators.OR,  iv2, imask)
@@ -157,65 +133,65 @@ public class MaskedLogicOpts {
 
     @Benchmark
     public void maskedLogicOperationsInt512() {
-       maskedLogicKernel(IntVector.SPECIES_512);
+        maskedLogicKernel(IntVector.SPECIES_512, int512_arr_idx);
     }
 
     @Benchmark
     public void maskedLogicOperationsInt256() {
-       maskedLogicKernel(IntVector.SPECIES_256);
+        maskedLogicKernel(IntVector.SPECIES_256, int256_arr_idx);
     }
 
     @Benchmark
     public void maskedLogicOperationsInt128() {
-       maskedLogicKernel(IntVector.SPECIES_128);
+        maskedLogicKernel(IntVector.SPECIES_128, int128_arr_idx);
     }
 
     @CompilerControl(CompilerControl.Mode.INLINE)
-    public void partiallyMaskedLogicOperationsIntKernel(VectorSpecies<Integer> SPECIES) {
-       imask = VectorMask.fromArray(SPECIES, mask_arr, 0);
-       iv2 = IntVector.fromArray(SPECIES, i2, int512_arr_idx);
-       iv3 = IntVector.fromArray(SPECIES, i3, int512_arr_idx);
-       iv4 = IntVector.fromArray(SPECIES, i4, int512_arr_idx);
-       iv5 = IntVector.fromArray(SPECIES, i5, int512_arr_idx);
-       for(int i = 0; i < INVOC_COUNTER; i++) {
-           for(int j = 0 ; j < ARRAYLEN; j+= SPECIES.length()) {
-               IntVector.fromArray(SPECIES, i1, j)
-                   .lanewise(VectorOperators.AND, iv2, imask)
-                   .lanewise(VectorOperators.OR,  iv2, imask)
-                   .lanewise(VectorOperators.AND, iv3)
-                   .lanewise(VectorOperators.OR,  iv3)
-                   .lanewise(VectorOperators.OR,  iv4, imask)
-                   .lanewise(VectorOperators.AND, iv4, imask)
-                   .lanewise(VectorOperators.XOR, iv5, imask)
-                   .intoArray(i1, j);
-           }
-       }
+    public void partiallyMaskedLogicOperationsIntKernel(VectorSpecies<Integer> SPECIES, int index) {
+        VectorMask<Integer> imask = VectorMask.fromArray(SPECIES, mask_arr, index);
+        IntVector iv2 = IntVector.fromArray(SPECIES, i2, index);
+        IntVector iv3 = IntVector.fromArray(SPECIES, i3, index);
+        IntVector iv4 = IntVector.fromArray(SPECIES, i4, index);
+        IntVector iv5 = IntVector.fromArray(SPECIES, i5, index);
+        for (int i = 0; i < INVOC_COUNTER; i++) {
+            for (int j = 0 ; j < SPECIES.loopBound(ARRAYLEN); j+= SPECIES.length()) {
+                IntVector.fromArray(SPECIES, i1, j)
+                    .lanewise(VectorOperators.AND, iv2, imask)
+                    .lanewise(VectorOperators.OR,  iv2, imask)
+                    .lanewise(VectorOperators.AND, iv3)
+                    .lanewise(VectorOperators.OR,  iv3)
+                    .lanewise(VectorOperators.OR,  iv4, imask)
+                    .lanewise(VectorOperators.AND, iv4, imask)
+                    .lanewise(VectorOperators.XOR, iv5, imask)
+                    .intoArray(i1, j);
+            }
+        }
     }
 
     @Benchmark
     public void partiallyMaskedLogicOperationsInt512() {
-        partiallyMaskedLogicOperationsIntKernel(IntVector.SPECIES_512);
+        partiallyMaskedLogicOperationsIntKernel(IntVector.SPECIES_512, int512_arr_idx);
     }
 
     @Benchmark
     public void partiallyMaskedLogicOperationsInt256() {
-        partiallyMaskedLogicOperationsIntKernel(IntVector.SPECIES_256);
+        partiallyMaskedLogicOperationsIntKernel(IntVector.SPECIES_256, int256_arr_idx);
     }
 
     @Benchmark
     public void partiallyMaskedLogicOperationsInt128() {
-        partiallyMaskedLogicOperationsIntKernel(IntVector.SPECIES_128);
+        partiallyMaskedLogicOperationsIntKernel(IntVector.SPECIES_128, int128_arr_idx);
     }
 
     @CompilerControl(CompilerControl.Mode.INLINE)
-    public void bitwiseBlendOperationIntKernel(VectorSpecies<Integer> SPECIES) {
-       imask = VectorMask.fromArray(SPECIES, mask_arr, 0);
-       iv2 = IntVector.fromArray(SPECIES, i2, int512_arr_idx);
-       iv3 = IntVector.fromArray(SPECIES, i3, int512_arr_idx);
-       iv4 = IntVector.fromArray(SPECIES, i4, int512_arr_idx);
-       iv5 = IntVector.fromArray(SPECIES, i5, int512_arr_idx);
-       for(int i = 0; i < INVOC_COUNTER; i++) {
-           for(int j = 0 ; j < ARRAYLEN; j+= SPECIES.length()) {
+    public void bitwiseBlendOperationIntKernel(VectorSpecies<Integer> SPECIES, int index) {
+       VectorMask<Integer> imask = VectorMask.fromArray(SPECIES, mask_arr, index);
+       IntVector iv2 = IntVector.fromArray(SPECIES, i2, index);
+       IntVector iv3 = IntVector.fromArray(SPECIES, i3, index);
+       IntVector iv4 = IntVector.fromArray(SPECIES, i4, index);
+       IntVector iv5 = IntVector.fromArray(SPECIES, i5, index);
+       for (int i = 0; i < INVOC_COUNTER; i++) {
+           for (int j = 0 ; j < SPECIES.loopBound(ARRAYLEN); j+= SPECIES.length()) {
                IntVector.fromArray(SPECIES, i1, j)
                    .lanewise(VectorOperators.BITWISE_BLEND, iv2, iv3, imask)
                    .lanewise(VectorOperators.BITWISE_BLEND, iv3, iv4, imask)
@@ -227,106 +203,106 @@ public class MaskedLogicOpts {
 
     @Benchmark
     public void bitwiseBlendOperationInt512() {
-       bitwiseBlendOperationIntKernel(IntVector.SPECIES_512);
+        bitwiseBlendOperationIntKernel(IntVector.SPECIES_512, int512_arr_idx);
     }
 
     @Benchmark
     public void bitwiseBlendOperationInt256() {
-       bitwiseBlendOperationIntKernel(IntVector.SPECIES_256);
+        bitwiseBlendOperationIntKernel(IntVector.SPECIES_256, int256_arr_idx);
     }
 
     @Benchmark
     public void bitwiseBlendOperationInt128() {
-       bitwiseBlendOperationIntKernel(IntVector.SPECIES_128);
+        bitwiseBlendOperationIntKernel(IntVector.SPECIES_128, int128_arr_idx);
     }
 
     @CompilerControl(CompilerControl.Mode.INLINE)
-    public void maskedLogicOperationsLongKernel(VectorSpecies<Long> SPECIES) {
-       lmask = VectorMask.fromArray(SPECIES, mask_arr, 0);
-       lv2 = LongVector.fromArray(SPECIES, l2, long256_arr_idx);
-       lv3 = LongVector.fromArray(SPECIES, l3, long256_arr_idx);
-       lv4 = LongVector.fromArray(SPECIES, l4, long256_arr_idx);
-       lv5 = LongVector.fromArray(SPECIES, l5, long256_arr_idx);
-       for(int i = 0; i < INVOC_COUNTER; i++) {
-           for(int j = 0 ; j < ARRAYLEN; j+= SPECIES.length()) {
-               LongVector.fromArray(SPECIES, l1, j)
-                   .lanewise(VectorOperators.AND, lv2, lmask)
-                   .lanewise(VectorOperators.OR,  lv3, lmask)
-                   .lanewise(VectorOperators.AND, lv3, lmask)
-                   .lanewise(VectorOperators.OR,  lv4, lmask)
-                   .lanewise(VectorOperators.AND, lv4, lmask)
-                   .lanewise(VectorOperators.XOR, lv5, lmask)
-                   .intoArray(l1, j);
-           }
-       }
+    public void maskedLogicOperationsLongKernel(VectorSpecies<Long> SPECIES, int index) {
+        VectorMask<Long> lmask = VectorMask.fromArray(SPECIES, mask_arr, index);
+        LongVector lv2 = LongVector.fromArray(SPECIES, l2, index);
+        LongVector lv3 = LongVector.fromArray(SPECIES, l3, index);
+        LongVector lv4 = LongVector.fromArray(SPECIES, l4, index);
+        LongVector lv5 = LongVector.fromArray(SPECIES, l5, index);
+        for (int i = 0; i < INVOC_COUNTER; i++) {
+            for (int j = 0 ; j < SPECIES.loopBound(ARRAYLEN); j+= SPECIES.length()) {
+                LongVector.fromArray(SPECIES, l1, j)
+                    .lanewise(VectorOperators.AND, lv2, lmask)
+                    .lanewise(VectorOperators.OR,  lv3, lmask)
+                    .lanewise(VectorOperators.AND, lv3, lmask)
+                    .lanewise(VectorOperators.OR,  lv4, lmask)
+                    .lanewise(VectorOperators.AND, lv4, lmask)
+                    .lanewise(VectorOperators.XOR, lv5, lmask)
+                    .intoArray(l1, j);
+            }
+        }
     }
 
     @Benchmark
     public void maskedLogicOperationsLong512() {
-       maskedLogicOperationsLongKernel(LongVector.SPECIES_512);
+        maskedLogicOperationsLongKernel(LongVector.SPECIES_512, long512_arr_idx);
     }
     @Benchmark
     public void maskedLogicOperationsLong256() {
-       maskedLogicOperationsLongKernel(LongVector.SPECIES_256);
+        maskedLogicOperationsLongKernel(LongVector.SPECIES_256, long256_arr_idx);
     }
 
     @CompilerControl(CompilerControl.Mode.INLINE)
-    public void partiallyMaskedLogicOperationsLongKernel(VectorSpecies<Long> SPECIES) {
-       lmask = VectorMask.fromArray(SPECIES, mask_arr, 0);
-       lv2 = LongVector.fromArray(SPECIES, l2, long512_arr_idx);
-       lv3 = LongVector.fromArray(SPECIES, l3, long512_arr_idx);
-       lv4 = LongVector.fromArray(SPECIES, l4, long512_arr_idx);
-       lv5 = LongVector.fromArray(SPECIES, l5, long512_arr_idx);
-       for(int i = 0; i < INVOC_COUNTER; i++) {
-           for(int j = 0 ; j < ARRAYLEN; j+= SPECIES.length()) {
-               LongVector.fromArray(SPECIES, l1, j)
-                   .lanewise(VectorOperators.AND, lv2, lmask)
-                   .lanewise(VectorOperators.OR,  lv2, lmask)
-                   .lanewise(VectorOperators.AND, lv3)
-                   .lanewise(VectorOperators.OR,  lv3)
-                   .lanewise(VectorOperators.AND, lv4)
-                   .lanewise(VectorOperators.OR,  lv4, lmask)
-                   .lanewise(VectorOperators.XOR, lv5, lmask)
-                   .intoArray(l1, j);
-           }
-       }
+    public void partiallyMaskedLogicOperationsLongKernel(VectorSpecies<Long> SPECIES, int index) {
+        VectorMask<Long> lmask = VectorMask.fromArray(SPECIES, mask_arr, index);
+        LongVector lv2 = LongVector.fromArray(SPECIES, l2, index);
+        LongVector lv3 = LongVector.fromArray(SPECIES, l3, index);
+        LongVector lv4 = LongVector.fromArray(SPECIES, l4, index);
+        LongVector lv5 = LongVector.fromArray(SPECIES, l5, index);
+        for (int i = 0; i < INVOC_COUNTER; i++) {
+            for (int j = 0 ; j < SPECIES.loopBound(ARRAYLEN); j+= SPECIES.length()) {
+                LongVector.fromArray(SPECIES, l1, j)
+                    .lanewise(VectorOperators.AND, lv2, lmask)
+                    .lanewise(VectorOperators.OR,  lv2, lmask)
+                    .lanewise(VectorOperators.AND, lv3)
+                    .lanewise(VectorOperators.OR,  lv3)
+                    .lanewise(VectorOperators.AND, lv4)
+                    .lanewise(VectorOperators.OR,  lv4, lmask)
+                    .lanewise(VectorOperators.XOR, lv5, lmask)
+                    .intoArray(l1, j);
+            }
+        }
     }
 
     @Benchmark
     public void partiallyMaskedLogicOperationsLong512() {
-       partiallyMaskedLogicOperationsLongKernel(LongVector.SPECIES_512);
+        partiallyMaskedLogicOperationsLongKernel(LongVector.SPECIES_512, long512_arr_idx);
     }
 
     @Benchmark
     public void partiallyMaskedLogicOperationsLong256() {
-       partiallyMaskedLogicOperationsLongKernel(LongVector.SPECIES_256);
+        partiallyMaskedLogicOperationsLongKernel(LongVector.SPECIES_256, long256_arr_idx);
     }
 
     @CompilerControl(CompilerControl.Mode.INLINE)
-    public void bitwiseBlendOperationLongKernel(VectorSpecies<Long> SPECIES) {
-       lmask = VectorMask.fromArray(SPECIES, mask_arr, 0);
-       lv2 = LongVector.fromArray(SPECIES, l2, long512_arr_idx);
-       lv3 = LongVector.fromArray(SPECIES, l3, long512_arr_idx);
-       lv4 = LongVector.fromArray(SPECIES, l4, long512_arr_idx);
-       lv5 = LongVector.fromArray(SPECIES, l5, long512_arr_idx);
-       for(int i = 0; i < INVOC_COUNTER; i++) {
-           for(int j = 0 ; j < ARRAYLEN; j+= SPECIES.length()) {
-               LongVector.fromArray(SPECIES, l1, j)
-                   .lanewise(VectorOperators.BITWISE_BLEND, lv2, lv3, lmask)
-                   .lanewise(VectorOperators.BITWISE_BLEND, lv3, lv4, lmask)
-                   .lanewise(VectorOperators.BITWISE_BLEND, lv4, lv5, lmask)
-                   .intoArray(l1, j);
+    public void bitwiseBlendOperationLongKernel(VectorSpecies<Long> SPECIES, int index) {
+        VectorMask<Long> lmask = VectorMask.fromArray(SPECIES, mask_arr, index);
+        LongVector lv2 = LongVector.fromArray(SPECIES, l2, index);
+        LongVector lv3 = LongVector.fromArray(SPECIES, l3, index);
+        LongVector lv4 = LongVector.fromArray(SPECIES, l4, index);
+        LongVector lv5 = LongVector.fromArray(SPECIES, l5, index);
+        for (int i = 0; i < INVOC_COUNTER; i++) {
+            for (int j = 0 ; j < SPECIES.loopBound(ARRAYLEN); j+= SPECIES.length()) {
+                LongVector.fromArray(SPECIES, l1, j)
+                    .lanewise(VectorOperators.BITWISE_BLEND, lv2, lv3, lmask)
+                    .lanewise(VectorOperators.BITWISE_BLEND, lv3, lv4, lmask)
+                    .lanewise(VectorOperators.BITWISE_BLEND, lv4, lv5, lmask)
+                    .intoArray(l1, j);
            }
        }
     }
 
     @Benchmark
     public void bitwiseBlendOperationLong512() {
-       bitwiseBlendOperationLongKernel(LongVector.SPECIES_512);
+        bitwiseBlendOperationLongKernel(LongVector.SPECIES_512, long512_arr_idx);
     }
 
     @Benchmark
     public void bitwiseBlendOperationLong256() {
-       bitwiseBlendOperationLongKernel(LongVector.SPECIES_256);
+        bitwiseBlendOperationLongKernel(LongVector.SPECIES_256, long256_arr_idx);
     }
 }

From 4bb3d81479c1bbe2c6fc7b5234d0f1b6897be117 Mon Sep 17 00:00:00 2001
From: SendaoYan <syan@openjdk.org>
Date: Thu, 6 Mar 2025 01:41:22 +0000
Subject: [PATCH 242/587] 8351138: Running subset of gtests gets error printing
 result information

Reviewed-by: erikj
---
 make/RunTests.gmk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/make/RunTests.gmk b/make/RunTests.gmk
index 44d387080df..37193fb8171 100644
--- a/make/RunTests.gmk
+++ b/make/RunTests.gmk
@@ -543,8 +543,8 @@ define SetupRunGtestTestBody
 	            print arr[0]; \
 	            found=1; \
 	          } \
-	          if (!found) { print 0; } \
-	      }' \
+	       } \
+	       END { if (!found) print 0; }' \
 	      $$($1_RESULT_FILE))) \
 	  $$(eval $1_FAILED := $$(shell $$(AWK) '/\[  FAILED  \] .* tests?, \
 	      listed below/ { print $$$$4 }' $$($1_RESULT_FILE))) \

From 3626ac35b34650dc64938af63ea21f9f4e011fe4 Mon Sep 17 00:00:00 2001
From: Jaikiran Pai <jpai@openjdk.org>
Date: Thu, 6 Mar 2025 06:22:18 +0000
Subject: [PATCH 243/587] 8204868: java/util/zip/ZipFile/TestCleaner.java still
 fails with "cleaner failed to clean zipfile."

Reviewed-by: lancea
---
 .../java/util/zip/ZipFile/TestCleaner.java    | 56 +++++++++++--------
 1 file changed, 33 insertions(+), 23 deletions(-)

diff --git a/test/jdk/java/util/zip/ZipFile/TestCleaner.java b/test/jdk/java/util/zip/ZipFile/TestCleaner.java
index d24aa5045fd..103191c96dd 100644
--- a/test/jdk/java/util/zip/ZipFile/TestCleaner.java
+++ b/test/jdk/java/util/zip/ZipFile/TestCleaner.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,16 +23,24 @@
 
 /* @test
  * @bug 8185582 8197989
- * @modules java.base/java.util.zip:open java.base/jdk.internal.vm.annotation
  * @summary Check the resources of Inflater, Deflater and ZipFile are always
  *          cleaned/released when the instance is not unreachable
+ * @modules java.base/java.util.zip:open java.base/jdk.internal.vm.annotation
+ * @library /test/lib
+ * @comment The test relies on the Cleaner to invoke the cleaning actions. So
+ *          we use "othervm" to prevent any Cleaner delays that could be contributed by any
+ *          other tests or code that might have executed on the agentvm prior to this test
+ *          execution
+ * @run main/othervm TestCleaner
  */
 
 import java.io.*;
 import java.lang.reflect.*;
 import java.util.*;
+import java.util.concurrent.atomic.AtomicLong;
 import java.util.zip.*;
 import jdk.internal.vm.annotation.DontInline;
+import jdk.test.lib.util.ForceGC;
 import static java.nio.charset.StandardCharsets.US_ASCII;
 
 public class TestCleaner {
@@ -59,11 +67,11 @@ public class TestCleaner {
         Field zsRefDef = Deflater.class.getDeclaredField("zsRef");
         Field zsRefInf = Inflater.class.getDeclaredField("zsRef");
         if (!zsRefDef.trySetAccessible() || !zsRefInf.trySetAccessible()) {
-            throw new RuntimeException("'zsRef' is not accesible");
+            throw new RuntimeException("'zsRef' is not accessible");
         }
         if (addrOf(zsRefDef.get(new Deflater())) == -1 ||
             addrOf(zsRefInf.get(new Inflater())) == -1) {
-            throw new RuntimeException("'addr' is not accesible");
+            throw new RuntimeException("'addr' is not accessible");
         }
         List<Object> list = new ArrayList<>();
         byte[] buf1 = new byte[1024];
@@ -84,16 +92,17 @@ public class TestCleaner {
             }
         }
 
-        int n = 10;
-        long cnt = list.size();
-        while (n-- > 0 && cnt != 0) {
-            Thread.sleep(100);
-            System.gc();
-            cnt = list.stream().filter(o -> addrOf(o) != 0).count();
+        final AtomicLong numNotYetCleaned = new AtomicLong();
+        // trigger GC
+        final boolean resourcesCleaned = ForceGC.wait(() -> {
+            final long remaining = list.stream().filter(o -> addrOf(o) != 0).count();
+            numNotYetCleaned.set(remaining);
+            return remaining == 0;
+        });
+        if (!resourcesCleaned) {
+            throw new RuntimeException(numNotYetCleaned.get()
+                    + " resources haven't yet been cleaned");
         }
-        if (cnt != 0)
-            throw new RuntimeException("cleaner failed to clean : " + cnt);
-
     }
 
     @DontInline
@@ -139,17 +148,18 @@ public class TestCleaner {
         if (zsrc != null) {
             Field zfileField = zsrc.getClass().getDeclaredField("zfile");
             if (!zfileField.trySetAccessible()) {
-                throw new RuntimeException("'ZipFile.Source.zfile' is not accesible");
+                throw new RuntimeException("'ZipFile.Source.zfile' is not accessible");
             }
-            //System.out.println("zffile: " +  zfileField.get(zsrc));
-            int n = 10;
-            while (n-- > 0 && zfileField.get(zsrc) != null) {
-                System.out.println("waiting gc ... " + n);
-                System.gc();
-                Thread.sleep(100);
-            }
-            if (zfileField.get(zsrc) != null) {
-                throw new RuntimeException("cleaner failed to clean zipfile.");
+            final boolean resourceCleaned = ForceGC.wait(() -> {
+                try {
+                    return zfileField.get(zsrc) == null;
+                } catch (IllegalAccessException e) {
+                    // shouldn't happen
+                    throw new RuntimeException(e);
+                }
+            });
+            if (!resourceCleaned) {
+                throw new RuntimeException("cleaner failed to clean zipfile " + zip);
             }
         }
     }

From e82031ec1a8ae2478f83d009594d512a13fdb77e Mon Sep 17 00:00:00 2001
From: Emanuel Peter <epeter@openjdk.org>
Date: Thu, 6 Mar 2025 06:48:42 +0000
Subject: [PATCH 244/587] 8350756: C2 SuperWord Multiversioning: remove useless
 slow loop when the fast loop disappears

Reviewed-by: kvn, chagedorn
---
 src/hotspot/share/opto/loopnode.cpp           |  62 +++++++++
 src/hotspot/share/opto/loopnode.hpp           |   4 +
 src/hotspot/share/opto/loopopts.cpp           |   5 +-
 src/hotspot/share/opto/opaquenode.cpp         |  20 +++
 src/hotspot/share/opto/opaquenode.hpp         |  17 ++-
 .../compiler/lib/ir_framework/IRNode.java     |   5 +
 ...TestMultiversionRemoveUselessSlowLoop.java | 124 ++++++++++++++++++
 7 files changed, 234 insertions(+), 3 deletions(-)
 create mode 100644 test/hotspot/jtreg/compiler/loopopts/superword/TestMultiversionRemoveUselessSlowLoop.java

diff --git a/src/hotspot/share/opto/loopnode.cpp b/src/hotspot/share/opto/loopnode.cpp
index 8be412412ea..1ccc132fd38 100644
--- a/src/hotspot/share/opto/loopnode.cpp
+++ b/src/hotspot/share/opto/loopnode.cpp
@@ -41,6 +41,7 @@
 #include "opto/movenode.hpp"
 #include "opto/mulnode.hpp"
 #include "opto/opaquenode.hpp"
+#include "opto/opcodes.hpp"
 #include "opto/predicates.hpp"
 #include "opto/rootnode.hpp"
 #include "opto/runtime.hpp"
@@ -2731,6 +2732,20 @@ Node* CountedLoopNode::match_incr_with_optional_truncation(Node* expr, Node** tr
   return nullptr;
 }
 
+IfNode* CountedLoopNode::find_multiversion_if_from_multiversion_fast_main_loop() {
+  assert(is_main_loop() && is_multiversion_fast_loop(), "must be multiversion fast main loop");
+  CountedLoopEndNode* pre_end = find_pre_loop_end();
+  if (pre_end == nullptr) { return nullptr; }
+  Node* pre_entry = pre_end->loopnode()->in(LoopNode::EntryControl);
+  const Predicates predicates(pre_entry);
+  IfTrueNode* before_predicates = predicates.entry()->isa_IfTrue();
+  if (before_predicates != nullptr &&
+      before_predicates->in(0)->in(1)->is_OpaqueMultiversioning()) {
+    return before_predicates->in(0)->as_If();
+  }
+  return nullptr;
+}
+
 LoopNode* CountedLoopNode::skip_strip_mined(int expect_skeleton) {
   if (is_strip_mined() && in(EntryControl) != nullptr && in(EntryControl)->is_OuterStripMinedLoop()) {
     verify_strip_mined(expect_skeleton);
@@ -4536,6 +4551,49 @@ void PhaseIdealLoop::eliminate_useless_zero_trip_guard() {
   }
 }
 
+void PhaseIdealLoop::eliminate_useless_multiversion_if() {
+  if (_multiversion_opaque_nodes.size() == 0) {
+    return;
+  }
+
+  ResourceMark rm;
+  Unique_Node_List useful_multiversioning_opaque_nodes;
+
+  // The OpaqueMultiversioning is only used from the fast main loop in AutoVectorization, to add
+  // speculative runtime-checks to the multiversion_if. Thus, a OpaqueMultiversioning is only
+  // useful if it can be found from a fast main loop. If it can not be found from a fast main loop,
+  // then we cannot ever use that multiversion_if to add more speculative runtime-checks, and hence
+  // it is useless. If it is still in delayed mode, i.e. has not yet had any runtime-checks added,
+  // then we can let it constant fold towards the fast loop.
+  for (LoopTreeIterator iter(_ltree_root); !iter.done(); iter.next()) {
+    IdealLoopTree* lpt = iter.current();
+    if (lpt->_child == nullptr && lpt->is_counted()) {
+      CountedLoopNode* head = lpt->_head->as_CountedLoop();
+      if (head->is_main_loop() && head->is_multiversion_fast_loop()) {
+        // There are fast_loop pre/main/post loops, but the finding traversal starts at the main
+        // loop, and traverses via the fast pre loop to the multiversion_if.
+        IfNode* multiversion_if = head->find_multiversion_if_from_multiversion_fast_main_loop();
+        if (multiversion_if != nullptr) {
+            useful_multiversioning_opaque_nodes.push(multiversion_if->in(1)->as_OpaqueMultiversioning());
+        }
+      }
+    }
+  }
+
+  for (uint i = 0; i < _multiversion_opaque_nodes.size(); i++) {
+    OpaqueMultiversioningNode* opaque = _multiversion_opaque_nodes.at(i)->as_OpaqueMultiversioning();
+    if (!useful_multiversioning_opaque_nodes.member(opaque)) {
+      if (opaque->is_delayed_slow_loop()) {
+        // We cannot hack the node directly, otherwise the slow_loop will complain that it cannot
+        // find the multiversioning opaque node. Instead, we mark the opaque node as useless, and
+        // it can be constant folded during IGVN.
+        opaque->mark_useless();
+        _igvn._worklist.push(opaque);
+      }
+    }
+  }
+}
+
 //------------------------process_expensive_nodes-----------------------------
 // Expensive nodes have their control input set to prevent the GVN
 // from commoning them and as a result forcing the resulting node to
@@ -4805,6 +4863,7 @@ void PhaseIdealLoop::build_and_optimize() {
   }
 
   eliminate_useless_zero_trip_guard();
+  eliminate_useless_multiversion_if();
 
   if (stop_early) {
     assert(do_expensive_nodes, "why are we here?");
@@ -6596,6 +6655,9 @@ void PhaseIdealLoop::build_loop_late_post_work(Node *n, bool pinned) {
     _zero_trip_guard_opaque_nodes.push(n);
   }
 
+  if (!_verify_only && n->Opcode() == Op_OpaqueMultiversioning) {
+    _multiversion_opaque_nodes.push(n);
+  }
 }
 
 #ifdef ASSERT
diff --git a/src/hotspot/share/opto/loopnode.hpp b/src/hotspot/share/opto/loopnode.hpp
index a9c5d697c6b..dd310e769d6 100644
--- a/src/hotspot/share/opto/loopnode.hpp
+++ b/src/hotspot/share/opto/loopnode.hpp
@@ -290,6 +290,8 @@ public:
   bool has_atomic_post_loop  () const { return (_loop_flags & HasAtomicPostLoop) == HasAtomicPostLoop; }
   void set_main_no_pre_loop() { _loop_flags |= MainHasNoPreLoop; }
 
+  IfNode* find_multiversion_if_from_multiversion_fast_main_loop();
+
   int main_idx() const { return _main_idx; }
 
 
@@ -932,6 +934,7 @@ private:
   // clear out dead code after build_loop_late
   Node_List _deadlist;
   Node_List _zero_trip_guard_opaque_nodes;
+  Node_List _multiversion_opaque_nodes;
 
   // Support for faster execution of get_late_ctrl()/dom_lca()
   // when a node has many uses and dominator depth is deep.
@@ -1453,6 +1456,7 @@ public:
   void eliminate_useless_template_assertion_predicates(Unique_Node_List& useful_predicates);
 
   void eliminate_useless_zero_trip_guard();
+  void eliminate_useless_multiversion_if();
 
  public:
   // Change the control input of expensive nodes to allow commoning by
diff --git a/src/hotspot/share/opto/loopopts.cpp b/src/hotspot/share/opto/loopopts.cpp
index 2d564c3c8cf..125399ea11a 100644
--- a/src/hotspot/share/opto/loopopts.cpp
+++ b/src/hotspot/share/opto/loopopts.cpp
@@ -791,7 +791,10 @@ Node *PhaseIdealLoop::conditional_move( Node *region ) {
     // Ignore Template Assertion Predicates with OpaqueTemplateAssertionPredicate nodes.
     return nullptr;
   }
-  assert(bol->Opcode() == Op_Bool, "Unexpected node");
+  if (!bol->is_Bool()) {
+    assert(false, "Expected Bool, but got %s", NodeClassNames[bol->Opcode()]);
+    return nullptr;
+  }
   int cmp_op = bol->in(1)->Opcode();
   if (cmp_op == Op_SubTypeCheck) { // SubTypeCheck expansion expects an IfNode
     return nullptr;
diff --git a/src/hotspot/share/opto/opaquenode.cpp b/src/hotspot/share/opto/opaquenode.cpp
index 672ea13e507..949bdfbc839 100644
--- a/src/hotspot/share/opto/opaquenode.cpp
+++ b/src/hotspot/share/opto/opaquenode.cpp
@@ -82,6 +82,26 @@ IfNode* OpaqueZeroTripGuardNode::if_node() const {
   return iff->as_If();
 }
 
+Node* OpaqueMultiversioningNode::Identity(PhaseGVN* phase) {
+  // Constant fold the multiversion_if. Since the slow_loop is still delayed,
+  // i.e. we have not yet added any possibly failing condition, we can just
+  // take the true branch in all cases.
+  if (_useless) {
+    assert(_is_delayed_slow_loop, "the slow_loop should still be delayed");
+    return in(1);
+  }
+  return Opaque1Node::Identity(phase);
+}
+
+#ifndef PRODUCT
+void OpaqueMultiversioningNode::dump_spec(outputStream *st) const {
+  Opaque1Node::dump_spec(st);
+  if (_useless) {
+    st->print(" #useless");
+  }
+}
+#endif
+
 const Type* OpaqueNotNullNode::Value(PhaseGVN* phase) const {
   return phase->type(in(1));
 }
diff --git a/src/hotspot/share/opto/opaquenode.hpp b/src/hotspot/share/opto/opaquenode.hpp
index 0e8a53efd34..80d5ae6cd3e 100644
--- a/src/hotspot/share/opto/opaquenode.hpp
+++ b/src/hotspot/share/opto/opaquenode.hpp
@@ -101,17 +101,30 @@ public:
 class OpaqueMultiversioningNode : public Opaque1Node {
 private:
   bool _is_delayed_slow_loop;
+  bool _useless;
 
 public:
   OpaqueMultiversioningNode(Compile* C, Node* n) :
-      Opaque1Node(C, n), _is_delayed_slow_loop(true)
+      Opaque1Node(C, n), _is_delayed_slow_loop(true), _useless(false)
   {
     init_class_id(Class_OpaqueMultiversioning);
   }
   virtual int Opcode() const;
   virtual const Type* bottom_type() const { return TypeInt::BOOL; }
   bool is_delayed_slow_loop() const { return _is_delayed_slow_loop; }
-  void notify_slow_loop_that_it_can_resume_optimizations() { _is_delayed_slow_loop = false; }
+
+  void notify_slow_loop_that_it_can_resume_optimizations() {
+    assert(!_useless, "must still be useful");
+    _is_delayed_slow_loop = false;
+  }
+
+  void mark_useless() {
+    assert(_is_delayed_slow_loop, "must still be delayed");
+    _useless = true;
+  }
+
+  virtual Node* Identity(PhaseGVN* phase);
+  NOT_PRODUCT(virtual void dump_spec(outputStream* st) const;)
 };
 
 // This node is used in the context of intrinsics. We sometimes implicitly know that an object is non-null even though
diff --git a/test/hotspot/jtreg/compiler/lib/ir_framework/IRNode.java b/test/hotspot/jtreg/compiler/lib/ir_framework/IRNode.java
index 6e373207d9c..20a0af1f111 100644
--- a/test/hotspot/jtreg/compiler/lib/ir_framework/IRNode.java
+++ b/test/hotspot/jtreg/compiler/lib/ir_framework/IRNode.java
@@ -329,6 +329,11 @@ public class IRNode {
         superWordNodes(ADD_REDUCTION_VL, "AddReductionVL");
     }
 
+    public static final String OPAQUE_MULTIVERSIONING = PREFIX + "OPAQUE_MULTIVERSIONING" + POSTFIX;
+    static {
+        beforeMatchingNameRegex(OPAQUE_MULTIVERSIONING, "OpaqueMultiversioning");
+    }
+
     public static final String ADD_P_OF = COMPOSITE_PREFIX + "ADD_P_OF" + POSTFIX;
     static {
         String regex = START + "addP_" + IS_REPLACED + MID + ".*" + END;
diff --git a/test/hotspot/jtreg/compiler/loopopts/superword/TestMultiversionRemoveUselessSlowLoop.java b/test/hotspot/jtreg/compiler/loopopts/superword/TestMultiversionRemoveUselessSlowLoop.java
new file mode 100644
index 00000000000..7d2f56c66f3
--- /dev/null
+++ b/test/hotspot/jtreg/compiler/loopopts/superword/TestMultiversionRemoveUselessSlowLoop.java
@@ -0,0 +1,124 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package compiler.loopopts.superword;
+
+import compiler.lib.ir_framework.*;
+
+/*
+ * @test
+ * @bug 8350756
+ * @summary Test case where the multiversion fast_loop disappears, and we should
+ *          constant fold the multiversion_if, to remove the slow_loop.
+ * @library /test/lib /
+ * @run driver compiler.loopopts.superword.TestMultiversionRemoveUselessSlowLoop
+ */
+
+public class TestMultiversionRemoveUselessSlowLoop {
+
+    public static void main(String[] args) {
+        TestFramework framework = new TestFramework(TestMultiversionRemoveUselessSlowLoop.class);
+        // No traps means we cannot use the predicates version for SuperWord / AutoVectorization,
+        // and instead use multiversioning directly.
+        framework.addFlags("-XX:-TieredCompilation", "-XX:PerMethodTrapLimit=0");
+        framework.setDefaultWarmup(0); // simulates Xcomp
+        framework.start();
+    }
+
+    public static final int SIZE = 20;
+    public static final int[] a = new int[SIZE];
+    public static final int[] b = new int[SIZE];
+    public static final int SIZE2 = 10_000;
+    public static final int[] a2 = new int[SIZE2];
+    public static final int[] b2 = new int[SIZE2];
+
+    @Test
+    @IR(counts = {"pre .* multiversion_fast",  "= 2", // regular pre-main-post for both loops
+                  "main .* multiversion_fast", "= 2",
+                  "post .* multiversion_fast", "= 2",
+                  "multiversion_delayed_slow", "= 2", // both have the delayed slow_loop
+                  "multiversion",              "= 8", // nothing unexpected
+                  IRNode.OPAQUE_MULTIVERSIONING, "= 2"}, // Both multiversion_if are still here
+        applyIfPlatform = {"64-bit", "true"},
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"},
+        phase = CompilePhase.PHASEIDEALLOOP1)
+    @IR(counts = {"pre .* multiversion_fast",  "= 2",
+                  "main .* multiversion_fast", "= 1", // The first main loop is fully unrolled
+                  "post .* multiversion_fast", "= 3", // the second loop is vectorized, and has a vectorized post loop
+                  "multiversion_delayed_slow", "= 1", // As a consequence of the first main loop being removed, we constant fold the multiversion_if
+                  "multiversion",              "= 7", // nothing unexpected
+                  IRNode.OPAQUE_MULTIVERSIONING, "= 1"}, // The multiversion_if of the first loop was constant folded, because the main loop disappeared.
+        applyIfPlatform = {"64-bit", "true"},
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"},
+        phase = CompilePhase.PHASEIDEALLOOP_ITERATIONS)
+    @IR(counts = {"pre .* multiversion_fast.*", ">= 1", // In some cases, the pre loop of the first loop also disappears because it only has a single iteration
+                  "pre .* multiversion_fast.*", "<= 2", // but not in other cases the pre loop of the first loop remains.
+                  "main .* multiversion_fast", "= 1",
+                  "post .* multiversion_fast", "= 3",
+                  "multiversion_delayed_slow", "= 0", // The second loop's multiversion_if was also not used, so it is constant folded after loop opts.
+                  "multiversion",              ">= 5", // nothing unexpected
+                  "multiversion",              "<= 6", // nothing unexpected
+                  IRNode.OPAQUE_MULTIVERSIONING, "= 0"}, // After loop-opts, we also constant fold the multiversion_if of the second loop, as it is unused.
+        applyIfPlatform = {"64-bit", "true"},
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"},
+        phase = CompilePhase.PRINT_IDEAL)
+    public static void testIR() {
+        // This loop is short, and the multiversion_fast main loop eventuall is fully unrolled.
+        for (int i = 0; i < SIZE; i++) {
+            a[i] = b[i];
+        }
+        // We take this second loop with a larger limit so that loop opts keeps going once the loop
+        // above is fully optimized. It also gives us a reference where the main loop of the
+        // multiverion fast_loop does not disappear.
+        for (int i = 0; i < SIZE2; i++) {
+            a2[i] = b2[i];
+        }
+    }
+
+    static long instanceCount;
+    static int iFld;
+    static int iFld1;
+
+    // The inner loop is Multiversioned, then PreMainPost and Unroll.
+    // Eventually, both the fast and slow loops (pre main and post) disappear,
+    // and leave us with a simple if-diamond using the multiversion_if.
+    //
+    // Verification code in PhaseIdealLoop::conditional_move finds this diamond
+    // and expects a Bool but gets an OpaqueMultiversioning instead.
+    //
+    // If we let the multiversion_if constant fold soon after the main fast loop
+    // disappears, then this issue does not occur any more.
+    @Test
+    public static void testCrash() {
+        boolean b2 = true;
+        for (int i = 0; i < 1000; i++) {
+            for (int i21 = 82; i21 > 9; --i21) {
+                if (b2)
+                    break;
+                iFld1 = iFld;
+                b2 = true;
+            }
+            instanceCount = iFld1;
+        }
+    }
+}

From 5c552a9d64c8116161cb9ef4c777e75a2602a75b Mon Sep 17 00:00:00 2001
From: SendaoYan <syan@openjdk.org>
Date: Thu, 6 Mar 2025 07:00:44 +0000
Subject: [PATCH 245/587] 8349358: [JMH] Cannot access class
 jdk.internal.vm.ContinuationScope

Reviewed-by: alanb
---
 .../bench/loom/obsolete/FreezeAndThaw.java    | 149 -----------
 .../openjdk/bench/loom/obsolete/OneShot.java  | 252 ------------------
 .../bench/loom/obsolete/Oscillation.java      | 104 --------
 3 files changed, 505 deletions(-)
 delete mode 100644 test/micro/org/openjdk/bench/loom/obsolete/FreezeAndThaw.java
 delete mode 100644 test/micro/org/openjdk/bench/loom/obsolete/OneShot.java
 delete mode 100644 test/micro/org/openjdk/bench/loom/obsolete/Oscillation.java

diff --git a/test/micro/org/openjdk/bench/loom/obsolete/FreezeAndThaw.java b/test/micro/org/openjdk/bench/loom/obsolete/FreezeAndThaw.java
deleted file mode 100644
index dd011f2033a..00000000000
--- a/test/micro/org/openjdk/bench/loom/obsolete/FreezeAndThaw.java
+++ /dev/null
@@ -1,149 +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 org.openjdk.bench.loom.obsolete;
-
-import jdk.internal.vm.Continuation;
-import jdk.internal.vm.ContinuationScope;
-
-import java.util.concurrent.TimeUnit;
-import org.openjdk.jmh.annotations.*;
-
-@BenchmarkMode(Mode.AverageTime)
-@OutputTimeUnit(TimeUnit.NANOSECONDS)
-@State(Scope.Thread)
-@Warmup(iterations = 5, time = 1, timeUnit = TimeUnit.SECONDS)
-@Measurement(iterations = 5, time = 1, timeUnit = TimeUnit.SECONDS)
-@Fork(1)
-public class FreezeAndThaw {
-    static final ContinuationScope SCOPE = new ContinuationScope() { };
-
-    static class Arg {
-        volatile int field;
-    }
-
-    /**
-     * A recursive task that optionally yields when the stack gets to a specific
-     * depth. If continued after yielding, it runs to completion.
-     */
-    static class Yielder implements Runnable {
-        private final int paramCount;
-        private final int maxDepth;
-        private final boolean yieldAtLimit;
-
-        private Yielder(int paramCount, int maxDepth, boolean yieldAtLimit) {
-            if (paramCount < 1 || paramCount > 3)
-                throw new IllegalArgumentException();
-            this.paramCount = paramCount;
-            this.maxDepth = maxDepth;
-            this.yieldAtLimit = yieldAtLimit;
-        }
-
-        @Override
-        public void run() {
-            switch (paramCount) {
-                case 1: run1(maxDepth); break;
-                case 2: run2(maxDepth, new Arg()); break;
-                case 3: run3(maxDepth, new Arg(), new Arg()); break;
-                default: throw new Error("should not happen");
-            }
-        }
-
-        private void run1(int depth) {
-            if (depth > 0) {
-                run1(depth - 1);
-            } if (depth == 0) {
-                if (yieldAtLimit) Continuation.yield(SCOPE);
-            }
-        }
-
-        private void run2(int depth, Arg arg2) {
-            if (depth > 0) {
-                run2(depth - 1, arg2);
-            } if (depth == 0) {
-                if (yieldAtLimit) Continuation.yield(SCOPE);
-            } else {
-                // never executed
-                arg2.field = 0;
-            }
-        }
-
-        private void run3(int depth, Arg arg2, Arg arg3) {
-            if (depth > 0) {
-                run3(depth - 1, arg2, arg3);
-            } if (depth == 0) {
-                if (yieldAtLimit) {
-                    Continuation.yield(SCOPE);
-                }
-            } else {
-                // never executed
-                arg2.field = 0;
-                arg3.field = 0;
-            }
-        }
-
-        static Continuation continuation(int paramCount, int maxDepth,
-                                         boolean yieldAtLimit) {
-            Runnable task = new Yielder(paramCount, maxDepth, yieldAtLimit);
-            return new Continuation(SCOPE, task);
-        }
-    }
-
-    @Param({"1", "2", "3"})
-    public int paramCount;
-
-    @Param({"5", "10", "20", "100"})
-    public int stackDepth;
-
-    Continuation cont;
-    Continuation cont0;
-
-    @Setup(Level.Invocation)
-    public void setup() {
-        // System.out.println("pc = " + paramCount + " sd = " + stackDepth);
-        cont = Yielder.continuation(paramCount, stackDepth, true);
-        cont0 = Yielder.continuation(paramCount, stackDepth, false);
-    }
-
-    /**
-     * Creates and runs a continuation that yields at a given stack depth.
-     */
-    @Benchmark
-    public void baseline() {
-        // Continuation cont0 = Yielder.continuation(paramCount, stackDepth, false);
-        cont0.run();
-        assert cont0.isDone();
-    }
-
-    /**
-     * Creates and runs a continuation that yields at a given stack depth.
-     */
-    @Benchmark
-    public void yieldAndContinue() {
-        // Continuation cont = Yielder.continuation(paramCount, stackDepth, true);
-        cont.run();
-        assert !cont.isDone();
-        cont.run();
-        assert cont.isDone();
-    }
-}
diff --git a/test/micro/org/openjdk/bench/loom/obsolete/OneShot.java b/test/micro/org/openjdk/bench/loom/obsolete/OneShot.java
deleted file mode 100644
index bd96153315b..00000000000
--- a/test/micro/org/openjdk/bench/loom/obsolete/OneShot.java
+++ /dev/null
@@ -1,252 +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 org.openjdk.bench.loom.obsolete;
-
-import jdk.internal.vm.Continuation;
-import jdk.internal.vm.ContinuationScope;
-
-import java.util.concurrent.TimeUnit;
-import org.openjdk.jmh.annotations.*;
-
-@BenchmarkMode(Mode.AverageTime)
-@OutputTimeUnit(TimeUnit.NANOSECONDS)
-@State(Scope.Thread)
-@Warmup(iterations = 5, time = 1, timeUnit = TimeUnit.SECONDS)
-@Measurement(iterations = 5, time = 1, timeUnit = TimeUnit.SECONDS)
-@Fork(1)
-public class OneShot {
-    static final ContinuationScope SCOPE = new ContinuationScope() { };
-
-    static class Arg {
-        volatile int field;
-    }
-
-    /**
-     * A recursive task that optionally yields when the stack gets to a specific
-     * depth. If continued after yielding, it runs to completion.
-     */
-    static class Yielder implements Runnable {
-        private final int paramCount;
-        private final int maxDepth;
-        private final boolean yieldAtLimit;
-
-        private Yielder(int paramCount, int maxDepth, boolean yieldAtLimit) {
-            if (paramCount < 1 || paramCount > 3)
-                throw new IllegalArgumentException();
-            this.paramCount = paramCount;
-            this.maxDepth = maxDepth;
-            this.yieldAtLimit = yieldAtLimit;
-        }
-
-        @Override
-        public void run() {
-            switch (paramCount) {
-                case 1: run1(maxDepth); break;
-                case 2: run2(maxDepth, new Arg()); break;
-                case 3: run3(maxDepth, new Arg(), new Arg()); break;
-                default: throw new Error("should not happen");
-            }
-        }
-
-        private void run1(int depth) {
-            if (depth > 0) {
-                run1(depth - 1);
-            } if (depth == 0) {
-                if (yieldAtLimit) Continuation.yield(SCOPE);
-            }
-        }
-
-        private void run2(int depth, Arg arg2) {
-            if (depth > 0) {
-                run2(depth - 1, arg2);
-            } if (depth == 0) {
-                if (yieldAtLimit) Continuation.yield(SCOPE);
-            } else {
-                // never executed
-                arg2.field = 0;
-            }
-        }
-
-        private void run3(int depth, Arg arg2, Arg arg3) {
-            if (depth > 0) {
-                run3(depth - 1, arg2, arg3);
-            } if (depth == 0) {
-                if (yieldAtLimit) Continuation.yield(SCOPE);
-            } else {
-                // never executed
-                arg2.field = 0;
-                arg3.field = 0;
-            }
-        }
-
-        static Continuation continuation(int paramCount, int maxDepth,
-                                         boolean yieldAtLimit) {
-            Runnable task = new Yielder(paramCount, maxDepth, yieldAtLimit);
-            return new Continuation(SCOPE, task);
-        }
-    }
-
-    /**
-     * A recursive task that optionally yields before and/or after each call.
-     */
-    static class Stepper implements Runnable {
-        private final int paramCount;
-        private final int maxDepth;
-        private final boolean yieldBefore;
-        private final boolean yieldAfter;
-
-        private Stepper(int paramCount,
-                        int maxDepth,
-                        boolean yieldBefore,
-                        boolean yieldAfter) {
-            this.paramCount = paramCount;
-            this.maxDepth = maxDepth;
-            this.yieldBefore = yieldBefore;
-            this.yieldAfter = yieldAfter;
-        }
-
-        public void run() {
-            switch (paramCount) {
-                case 1: run1(maxDepth); break;
-                case 2: run2(maxDepth, new Arg()); break;
-                case 3: run3(maxDepth, new Arg(), new Arg()); break;
-                default: throw new Error("should not happen");
-            }
-        }
-
-        private void run1(int depth) {
-            if (depth > 0) {
-                if (yieldBefore) Continuation.yield(SCOPE);
-                run1(depth - 1);
-                if (yieldAfter) Continuation.yield(SCOPE);
-            }
-        }
-
-        private void run2(int depth, Arg arg2) {
-            if (depth > 0) {
-                if (yieldBefore) Continuation.yield(SCOPE);
-                run2(depth - 1, arg2);
-                if (yieldAfter) Continuation.yield(SCOPE);
-            } else if (depth < 0) {
-                // never executed
-                arg2.field = 0;
-            }
-        }
-
-        private void run3(int depth, Arg arg2, Arg arg3) {
-            if (depth > 0) {
-                if (yieldBefore) Continuation.yield(SCOPE);
-                run3(depth - 1, arg2, arg3);
-                if (yieldAfter) Continuation.yield(SCOPE);
-            } else if (depth < 0) {
-                // never executed
-                arg2.field = 0;
-                arg3.field = 0;
-            }
-        }
-
-        static Continuation continuation(int paramCount, int maxDepth,
-                                         boolean yieldBefore, boolean yieldAfter) {
-            Runnable task = new Stepper(paramCount, maxDepth, yieldBefore, yieldAfter);
-            return new Continuation(SCOPE, task);
-        }
-    }
-
-    @Param({"1", "2", "3"})
-    public int paramCount;
-
-    @Param({"5", "10", "20", "100"})
-    public int stackDepth;
-
-    /**
-     * Creates and run continuation that does not yield.
-     */
-    @Benchmark
-    public void noYield() {
-        Continuation cont = Yielder.continuation(paramCount, stackDepth, false);
-        cont.run();
-        if (!cont.isDone())
-            throw new RuntimeException("continuation not done???");
-    }
-
-    /**
-     * Creates and runs a continuation that yields at a given stack depth.
-     */
-    @Benchmark
-    public void yield() {
-        Continuation cont = Yielder.continuation(paramCount, stackDepth, true);
-        cont.run();
-        if (cont.isDone())
-            throw new RuntimeException("continuation done???");
-    }
-
-    /**
-     * Creates and runs a continuation that yields at a given stack depth, it is
-     * then continued to run to completion.
-     */
-    @Benchmark
-    public void yieldThenContinue() {
-        Continuation cont = Yielder.continuation(paramCount, stackDepth, true);
-        cont.run();
-        cont.run();  // continue
-        if (!cont.isDone())
-            throw new RuntimeException("continuation not done???");
-    }
-
-    /**
-     * Creates and runs a continuation to the given stack depth, yielding before
-     * each call.
-     */
-    @Benchmark
-    public void yieldBeforeEachCall() {
-        Continuation cont = Stepper.continuation(paramCount, stackDepth, true, false);
-        while (!cont.isDone()) {
-            cont.run();
-        }
-    }
-
-    /**
-     * Creates and runs a continuation to the given stack depth, yielding after
-     * each call.
-     */
-    @Benchmark
-    public void yieldAfterEachCall() {
-        Continuation cont = Stepper.continuation(paramCount, stackDepth, false, true);
-        while (!cont.isDone()) {
-            cont.run();
-        }
-    }
-
-    /**
-     * Creates and runs a continuation to the given stack depth, yielding before
-     * and after each call.
-     */
-    @Benchmark
-    public void yieldBeforeAndAfterEachCall() {
-        Continuation cont = Stepper.continuation(paramCount, stackDepth, true, true);
-        while (!cont.isDone()) {
-            cont.run();
-        }
-    }
-}
diff --git a/test/micro/org/openjdk/bench/loom/obsolete/Oscillation.java b/test/micro/org/openjdk/bench/loom/obsolete/Oscillation.java
deleted file mode 100644
index 0117508bd8d..00000000000
--- a/test/micro/org/openjdk/bench/loom/obsolete/Oscillation.java
+++ /dev/null
@@ -1,104 +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 org.openjdk.bench.loom.obsolete;
-
-import jdk.internal.vm.Continuation;
-import jdk.internal.vm.ContinuationScope;
-
-import java.util.concurrent.TimeUnit;
-import org.openjdk.jmh.annotations.*;
-
-@BenchmarkMode(Mode.AverageTime)
-@OutputTimeUnit(TimeUnit.NANOSECONDS)
-@State(Scope.Benchmark)
-@Warmup(iterations = 5, time = 1, timeUnit = TimeUnit.SECONDS)
-@Measurement(iterations = 5, time = 1, timeUnit = TimeUnit.SECONDS)
-@Fork(1)
-public class Oscillation {
-    static final ContinuationScope SCOPE = new ContinuationScope() { };
-
-    /**
-     * A task that oscillates between a minimum and maximum stack depth, yielding
-     * at the maximum stack until continued.
-     */
-    static class Wave implements Runnable {
-        private final int min;
-        private final int max;
-
-        private enum Mode { GROW, SHRINK }
-        private Mode mode;
-
-        Wave(int min, int max) {
-            if (min < 0)
-                throw new IllegalArgumentException("negative min");
-            if (max <= min)
-                throw new IllegalArgumentException("max must be greater than min");
-            this.min = min;
-            this.max = max;
-            this.mode = Mode.GROW;
-        }
-
-        private void run(int depth) {
-            if (depth == max) {
-                Continuation.yield(SCOPE);
-                mode = Mode.SHRINK;
-            } else if (depth == min) {
-                while (true) {
-                    mode = Mode.GROW;
-                    run(depth + 1);
-                }
-            } else if (mode == Mode.GROW) {
-                run(depth + 1);
-            }
-        }
-
-        @Override
-        public void run() {
-            run(0);
-        }
-    }
-
-    @Param({"2", "3", "4"})
-    public int minDepth;
-
-    @Param({"5", "6", "7", "8"})
-    public int maxDepth;
-
-    @Param({"10", "100", "1000"})
-    public int repeat;
-
-    /**
-     * Creates and runs a continuation that oscillates between a minimum and
-     * maximum stack depth, yielding at the maximum stack until continued.
-     *
-     * Useful to measure freeze and thaw, also to compare full stack vs. lazy copy.
-     */
-    @Benchmark
-    public void oscillate() {
-        Continuation cont = new Continuation(SCOPE, new Wave(minDepth, maxDepth));
-        for (int i=0; i<repeat; i++) {
-            cont.run();
-        }
-    }
-}

From 649ef77951d420512e385ee3c792ced80276a30a Mon Sep 17 00:00:00 2001
From: Stefan Karlsson <stefank@openjdk.org>
Date: Thu, 6 Mar 2025 07:42:16 +0000
Subject: [PATCH 246/587] 8323158: HotSpot Style Guide should specify more
 include ordering

Reviewed-by: kbarrett, stuefe, dholmes, kvn
---
 doc/hotspot-style.html | 28 ++++++++++++++++++----------
 doc/hotspot-style.md   | 29 +++++++++++++++++++++--------
 2 files changed, 39 insertions(+), 18 deletions(-)

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

From 40f150d3e50caf44fa4a31b79fbcd234142803ce Mon Sep 17 00:00:00 2001
From: Matthias Baesken <mbaesken@openjdk.org>
Date: Thu, 6 Mar 2025 08:10:23 +0000
Subject: [PATCH 247/587] 8330936: [ubsan] exclude function BilinearInterp and
 ShapeSINextSpan in libawt java2d from ubsan checks

Reviewed-by: clanger, prr
---
 .../share/native/libawt/java2d/loops/TransformHelper.c       | 5 ++++-
 .../share/native/libawt/java2d/pipe/ShapeSpanIterator.c      | 5 ++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/java.desktop/share/native/libawt/java2d/loops/TransformHelper.c b/src/java.desktop/share/native/libawt/java2d/loops/TransformHelper.c
index 02c99ea9ada..cad849961d1 100644
--- a/src/java.desktop/share/native/libawt/java2d/loops/TransformHelper.c
+++ b/src/java.desktop/share/native/libawt/java2d/loops/TransformHelper.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -33,6 +33,8 @@
 #include "sun_java2d_loops_TransformHelper.h"
 #include "java_awt_image_AffineTransformOp.h"
 
+#include "ub.h"
+
 /*
  * The stub functions replace the bilinear and bicubic interpolation
  * functions with NOP versions so that the performance of the helper
@@ -661,6 +663,7 @@ Transform_SafeHelper(JNIEnv *env,
         ((jubyte *)pRes)[comp] = (jubyte) ((cR + (1<<15)) >> 16); \
     } while (0)
 
+ATTRIBUTE_NO_UBSAN
 static void
 BilinearInterp(jint *pRGB, jint numpix,
                jint xfract, jint dxfract,
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 4f973a7037d..5b34ac9fbaa 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, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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,8 @@
 #include "sun_java2d_pipe_ShapeSpanIterator.h"
 #include "java_awt_geom_PathIterator.h"
 
+#include "ub.h"
+
 /*
  * This structure holds all of the information needed to trace and
  * manage a single line segment of the shape's outline.
@@ -1233,6 +1235,7 @@ ShapeSIIntersectClipBox(JNIEnv *env, void *private,
     }
 }
 
+ATTRIBUTE_NO_UBSAN
 static jboolean
 ShapeSINextSpan(void *state, jint spanbox[])
 {

From 7a5acb9be17cd54bbd0abf2524386b981dd5ac04 Mon Sep 17 00:00:00 2001
From: Fredrik Bredberg <fbredberg@openjdk.org>
Date: Thu, 6 Mar 2025 09:08:32 +0000
Subject: [PATCH 248/587] 8343840: Rewrite the ObjectMonitor lists

Reviewed-by: dholmes, coleenp, pchilanomate, yzheng
---
 .../cpu/aarch64/c2_MacroAssembler_aarch64.cpp |  12 +-
 src/hotspot/cpu/ppc/macroAssembler_ppc.cpp    |  14 +-
 .../cpu/riscv/c2_MacroAssembler_riscv.cpp     |  12 +-
 src/hotspot/cpu/s390/macroAssembler_s390.cpp  |  23 +-
 src/hotspot/cpu/x86/c2_MacroAssembler_x86.cpp |  15 +-
 src/hotspot/share/jvmci/vmStructs_jvmci.cpp   |   3 +-
 src/hotspot/share/prims/jvm.cpp               |   2 +-
 src/hotspot/share/runtime/objectMonitor.cpp   | 657 +++++++++---------
 src/hotspot/share/runtime/objectMonitor.hpp   |  44 +-
 src/hotspot/share/runtime/synchronizer.cpp    |   2 +-
 10 files changed, 385 insertions(+), 399 deletions(-)

diff --git a/src/hotspot/cpu/aarch64/c2_MacroAssembler_aarch64.cpp b/src/hotspot/cpu/aarch64/c2_MacroAssembler_aarch64.cpp
index e3d197a4572..97cd00e6522 100644
--- a/src/hotspot/cpu/aarch64/c2_MacroAssembler_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/c2_MacroAssembler_aarch64.cpp
@@ -312,10 +312,8 @@ void C2_MacroAssembler::fast_unlock(Register objectReg, Register boxReg, Registe
   // StoreLoad achieves this.
   membar(StoreLoad);
 
-  // Check if the entry lists are empty (EntryList first - by convention).
-  ldr(rscratch1, Address(tmp, ObjectMonitor::EntryList_offset()));
-  ldr(tmpReg, Address(tmp, ObjectMonitor::cxq_offset()));
-  orr(rscratch1, rscratch1, tmpReg);
+  // Check if the entry_list is empty.
+  ldr(rscratch1, Address(tmp, ObjectMonitor::entry_list_offset()));
   cmp(rscratch1, zr);
   br(Assembler::EQ, cont);     // If so we are done.
 
@@ -635,10 +633,8 @@ void C2_MacroAssembler::fast_unlock_lightweight(Register obj, Register box, Regi
     // StoreLoad achieves this.
     membar(StoreLoad);
 
-    // Check if the entry lists are empty (EntryList first - by convention).
-    ldr(rscratch1, Address(t1_monitor, ObjectMonitor::EntryList_offset()));
-    ldr(t3_t, Address(t1_monitor, ObjectMonitor::cxq_offset()));
-    orr(rscratch1, rscratch1, t3_t);
+    // Check if the entry_list is empty.
+    ldr(rscratch1, Address(t1_monitor, ObjectMonitor::entry_list_offset()));
     cmp(rscratch1, zr);
     br(Assembler::EQ, unlocked);  // If so we are done.
 
diff --git a/src/hotspot/cpu/ppc/macroAssembler_ppc.cpp b/src/hotspot/cpu/ppc/macroAssembler_ppc.cpp
index 6bdb4f80266..1786b13d332 100644
--- a/src/hotspot/cpu/ppc/macroAssembler_ppc.cpp
+++ b/src/hotspot/cpu/ppc/macroAssembler_ppc.cpp
@@ -2958,10 +2958,8 @@ void MacroAssembler::compiler_fast_unlock_object(ConditionRegister flag, Registe
   // StoreLoad achieves this.
   membar(StoreLoad);
 
-  // Check if the entry lists are empty (EntryList first - by convention).
-  ld(temp,             in_bytes(ObjectMonitor::EntryList_offset()), current_header);
-  ld(displaced_header, in_bytes(ObjectMonitor::cxq_offset()), current_header);
-  orr(temp, temp, displaced_header); // Will be 0 if both are 0.
+  // Check if the entry_list is empty.
+  ld(temp, in_bytes(ObjectMonitor::entry_list_offset()), current_header);
   cmpdi(flag, temp, 0);
   beq(flag, success);  // If so we are done.
 
@@ -3299,8 +3297,6 @@ void MacroAssembler::compiler_fast_unlock_lightweight_object(ConditionRegister f
 
     bind(not_recursive);
 
-    const Register t2 = tmp2;
-
     // Set owner to null.
     // Release to satisfy the JMM
     release();
@@ -3310,10 +3306,8 @@ void MacroAssembler::compiler_fast_unlock_lightweight_object(ConditionRegister f
     // StoreLoad achieves this.
     membar(StoreLoad);
 
-    // Check if the entry lists are empty (EntryList first - by convention).
-    ld(t, in_bytes(ObjectMonitor::EntryList_offset()), monitor);
-    ld(t2, in_bytes(ObjectMonitor::cxq_offset()), monitor);
-    orr(t, t, t2);
+    // Check if the entry_list is empty.
+    ld(t, in_bytes(ObjectMonitor::entry_list_offset()), monitor);
     cmpdi(CR0, t, 0);
     beq(CR0, unlocked); // If so we are done.
 
diff --git a/src/hotspot/cpu/riscv/c2_MacroAssembler_riscv.cpp b/src/hotspot/cpu/riscv/c2_MacroAssembler_riscv.cpp
index dc33691586b..c7427a91527 100644
--- a/src/hotspot/cpu/riscv/c2_MacroAssembler_riscv.cpp
+++ b/src/hotspot/cpu/riscv/c2_MacroAssembler_riscv.cpp
@@ -233,10 +233,8 @@ void C2_MacroAssembler::fast_unlock(Register objectReg, Register boxReg,
   // StoreLoad achieves this.
   membar(StoreLoad);
 
-  // Check if the entry lists are empty (EntryList first - by convention).
-  ld(t0, Address(tmp, ObjectMonitor::EntryList_offset()));
-  ld(tmp1Reg, Address(tmp, ObjectMonitor::cxq_offset()));
-  orr(t0, t0, tmp1Reg);
+  // Check if the entry_list is empty.
+  ld(t0, Address(tmp, ObjectMonitor::entry_list_offset()));
   beqz(t0, unlocked); // If so we are done.
 
   // Check if there is a successor.
@@ -569,10 +567,8 @@ void C2_MacroAssembler::fast_unlock_lightweight(Register obj, Register box,
     // StoreLoad achieves this.
     membar(StoreLoad);
 
-    // Check if the entry lists are empty (EntryList first - by convention).
-    ld(t0, Address(tmp1_monitor, ObjectMonitor::EntryList_offset()));
-    ld(tmp3_t, Address(tmp1_monitor, ObjectMonitor::cxq_offset()));
-    orr(t0, t0, tmp3_t);
+    // Check if the entry_list is empty.
+    ld(t0, Address(tmp1_monitor, ObjectMonitor::entry_list_offset()));
     beqz(t0, unlocked); // If so we are done.
 
     // Check if there is a successor.
diff --git a/src/hotspot/cpu/s390/macroAssembler_s390.cpp b/src/hotspot/cpu/s390/macroAssembler_s390.cpp
index 83a5c61bfc6..3f61561f5b8 100644
--- a/src/hotspot/cpu/s390/macroAssembler_s390.cpp
+++ b/src/hotspot/cpu/s390/macroAssembler_s390.cpp
@@ -3931,7 +3931,7 @@ void MacroAssembler::compiler_fast_unlock_object(Register oop, Register box, Reg
 
   bind(not_recursive);
 
-  NearLabel check_succ, set_eq_unlocked;
+  NearLabel set_eq_unlocked;
 
   // Set owner to null.
   // Release to satisfy the JMM
@@ -3941,14 +3941,10 @@ void MacroAssembler::compiler_fast_unlock_object(Register oop, Register box, Reg
   // We need a full fence after clearing owner to avoid stranding.
   z_fence();
 
-  // Check if the entry lists are empty (EntryList first - by convention).
-  load_and_test_long(temp, Address(currentHeader, OM_OFFSET_NO_MONITOR_VALUE_TAG(EntryList)));
-  z_brne(check_succ);
-  load_and_test_long(temp, Address(currentHeader, OM_OFFSET_NO_MONITOR_VALUE_TAG(cxq)));
+  // Check if the entry_list is empty.
+  load_and_test_long(temp, Address(currentHeader, OM_OFFSET_NO_MONITOR_VALUE_TAG(entry_list)));
   z_bre(done); // If so we are done.
 
-  bind(check_succ);
-
   // Check if there is a successor.
   load_and_test_long(temp, Address(currentHeader, OM_OFFSET_NO_MONITOR_VALUE_TAG(succ)));
   z_brne(set_eq_unlocked); // If so we are done.
@@ -6794,9 +6790,8 @@ void MacroAssembler::compiler_fast_unlock_lightweight_object(Register obj, Regis
 
     const ByteSize monitor_tag = in_ByteSize(UseObjectMonitorTable ? 0 : checked_cast<int>(markWord::monitor_value));
     const Address recursions_address{monitor, ObjectMonitor::recursions_offset() - monitor_tag};
-    const Address cxq_address{monitor, ObjectMonitor::cxq_offset() - monitor_tag};
     const Address succ_address{monitor, ObjectMonitor::succ_offset() - monitor_tag};
-    const Address EntryList_address{monitor, ObjectMonitor::EntryList_offset() - monitor_tag};
+    const Address entry_list_address{monitor, ObjectMonitor::entry_list_offset() - monitor_tag};
     const Address owner_address{monitor, ObjectMonitor::owner_offset() - monitor_tag};
 
     NearLabel not_recursive;
@@ -6813,7 +6808,7 @@ void MacroAssembler::compiler_fast_unlock_lightweight_object(Register obj, Regis
 
     bind(not_recursive);
 
-    NearLabel check_succ, set_eq_unlocked;
+    NearLabel set_eq_unlocked;
 
     // Set owner to null.
     // Release to satisfy the JMM
@@ -6823,14 +6818,10 @@ void MacroAssembler::compiler_fast_unlock_lightweight_object(Register obj, Regis
     // We need a full fence after clearing owner to avoid stranding.
     z_fence();
 
-    // Check if the entry lists are empty (EntryList first - by convention).
-    load_and_test_long(tmp2, EntryList_address);
-    z_brne(check_succ);
-    load_and_test_long(tmp2, cxq_address);
+    // Check if the entry_list is empty.
+    load_and_test_long(tmp2, entry_list_address);
     z_bre(unlocked); // If so we are done.
 
-    bind(check_succ);
-
     // Check if there is a successor.
     load_and_test_long(tmp2, succ_address);
     z_brne(set_eq_unlocked); // If so we are done.
diff --git a/src/hotspot/cpu/x86/c2_MacroAssembler_x86.cpp b/src/hotspot/cpu/x86/c2_MacroAssembler_x86.cpp
index b8ddbfe5120..d63f230b970 100644
--- a/src/hotspot/cpu/x86/c2_MacroAssembler_x86.cpp
+++ b/src/hotspot/cpu/x86/c2_MacroAssembler_x86.cpp
@@ -414,8 +414,6 @@ void C2_MacroAssembler::fast_unlock(Register objReg, Register boxReg, Register t
   // Despite our balanced locking property we still check that m->_owner == Self
   // as java routines or native JNI code called by this thread might
   // have released the lock.
-  // Refer to the comments in synchronizer.cpp for how we might encode extra
-  // state in _succ so we can avoid fetching EntryList|cxq.
   //
   // If there's no contention try a 1-0 exit.  That is, exit without
   // a costly MEMBAR or CAS.  See synchronizer.cpp for details on how
@@ -447,9 +445,8 @@ void C2_MacroAssembler::fast_unlock(Register objReg, Register boxReg, Register t
   // StoreLoad achieves this.
   membar(StoreLoad);
 
-  // Check if the entry lists are empty (EntryList first - by convention).
-  movptr(boxReg, Address(tmpReg, OM_OFFSET_NO_MONITOR_VALUE_TAG(EntryList)));
-  orptr(boxReg, Address(tmpReg, OM_OFFSET_NO_MONITOR_VALUE_TAG(cxq)));
+  // Check if the entry_list is empty.
+  cmpptr(Address(tmpReg, OM_OFFSET_NO_MONITOR_VALUE_TAG(entry_list)), NULL_WORD);
   jccb(Assembler::zero, LSuccess);    // If so we are done.
 
   // Check if there is a successor.
@@ -767,9 +764,8 @@ void C2_MacroAssembler::fast_unlock_lightweight(Register obj, Register reg_rax,
     }
     const ByteSize monitor_tag = in_ByteSize(UseObjectMonitorTable ? 0 : checked_cast<int>(markWord::monitor_value));
     const Address recursions_address{monitor, ObjectMonitor::recursions_offset() - monitor_tag};
-    const Address cxq_address{monitor, ObjectMonitor::cxq_offset() - monitor_tag};
     const Address succ_address{monitor, ObjectMonitor::succ_offset() - monitor_tag};
-    const Address EntryList_address{monitor, ObjectMonitor::EntryList_offset() - monitor_tag};
+    const Address entry_list_address{monitor, ObjectMonitor::entry_list_offset() - monitor_tag};
     const Address owner_address{monitor, ObjectMonitor::owner_offset() - monitor_tag};
 
     Label recursive;
@@ -785,9 +781,8 @@ void C2_MacroAssembler::fast_unlock_lightweight(Register obj, Register reg_rax,
     // StoreLoad achieves this.
     membar(StoreLoad);
 
-    // Check if the entry lists are empty (EntryList first - by convention).
-    movptr(reg_rax, EntryList_address);
-    orptr(reg_rax, cxq_address);
+    // Check if the entry_list is empty.
+    cmpptr(entry_list_address, NULL_WORD);
     jccb(Assembler::zero, unlocked);    // If so we are done.
 
     // Check if there is a successor.
diff --git a/src/hotspot/share/jvmci/vmStructs_jvmci.cpp b/src/hotspot/share/jvmci/vmStructs_jvmci.cpp
index e574fa780f4..3cbb1512cd0 100644
--- a/src/hotspot/share/jvmci/vmStructs_jvmci.cpp
+++ b/src/hotspot/share/jvmci/vmStructs_jvmci.cpp
@@ -328,8 +328,7 @@
                                                                                                                                      \
   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,      _entry_list,                                   ObjectWaiter*)                         \
   volatile_nonstatic_field(ObjectMonitor,      _succ,                                         int64_t)                               \
   volatile_nonstatic_field(ObjectMonitor,      _stack_locker,                                 BasicLock*)                            \
                                                                                                                                      \
diff --git a/src/hotspot/share/prims/jvm.cpp b/src/hotspot/share/prims/jvm.cpp
index ccb15485b07..343940f086d 100644
--- a/src/hotspot/share/prims/jvm.cpp
+++ b/src/hotspot/share/prims/jvm.cpp
@@ -3766,7 +3766,7 @@ JVM_ENTRY(jobject, JVM_TakeVirtualThreadListToUnblock(JNIEnv* env, jclass ignore
   ParkEvent* parkEvent = ObjectMonitor::vthread_unparker_ParkEvent();
   assert(parkEvent != nullptr, "not initialized");
 
-  OopHandle& list_head = ObjectMonitor::vthread_cxq_head();
+  OopHandle& list_head = ObjectMonitor::vthread_list_head();
   oop vthread_head = nullptr;
   while (true) {
     if (list_head.peek() != nullptr) {
diff --git a/src/hotspot/share/runtime/objectMonitor.cpp b/src/hotspot/share/runtime/objectMonitor.cpp
index 42b20b27d28..6885220c979 100644
--- a/src/hotspot/share/runtime/objectMonitor.cpp
+++ b/src/hotspot/share/runtime/objectMonitor.cpp
@@ -116,7 +116,7 @@ DEBUG_ONLY(static volatile bool InitDone = false;)
 
 OopStorage* ObjectMonitor::_oop_storage = nullptr;
 
-OopHandle ObjectMonitor::_vthread_cxq_head;
+OopHandle ObjectMonitor::_vthread_list_head;
 ParkEvent* ObjectMonitor::_vthread_unparker_ParkEvent = nullptr;
 
 // -----------------------------------------------------------------------------
@@ -127,103 +127,139 @@ ParkEvent* ObjectMonitor::_vthread_unparker_ParkEvent = nullptr;
 //   its owner_id (return value from owner_id_from()).
 //
 // * Invariant: A thread appears on at most one monitor list --
-//   cxq, EntryList or WaitSet -- at any one time.
+//   entry_list or WaitSet -- at any one time.
 //
-// * Contending threads "push" themselves onto the cxq with CAS
+// * Contending threads "push" themselves onto the entry_list 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
+//   succeeds, it will push itself onto the entry_list 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.
+//   dequeue itself from the entry_list.
 //
 // * The exiting thread identifies and unparks an "heir presumptive"
-//   tentative successor thread on the EntryList. In case the successor
+//   tentative successor thread on the entry_list. 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,
+//   thread from the entry_list. 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
-//   successor thread.  (This is also referred to as "handoff" succession").
+//   successor thread.  (This is also referred to as "handoff succession").
 //   Instead the exiting thread releases ownership and possibly wakes
 //   a successor, so the successor can (re)compete for ownership of the lock.
-//   If the EntryList is empty but the cxq is populated the exiting
-//   thread will drain the cxq into the EntryList.  It does so by
-//   by detaching the cxq (installing null with CAS) and folding
-//   the threads from the cxq into the EntryList.  The EntryList is
-//   doubly linked, while the cxq is singly linked because of the
-//   CAS-based "push" used to enqueue recently arrived threads (RATs).
 //
-// * Concurrency invariants:
+// * The entry_list forms a queue of threads stalled trying to acquire
+//   the lock. Within the entry_list the next pointers always form a
+//   consistent singly linked list. At unlock-time when the unlocking
+//   thread notices that the tail of the entry_list is not known, we
+//   convert the singly linked entry_list into a doubly linked list by
+//   assigning the prev pointers and the entry_list_tail pointer.
 //
-//   -- only the monitor owner may access or mutate the EntryList.
-//      The mutex property of the monitor itself protects the EntryList
-//      from concurrent interference.
-//   -- Only the monitor owner may detach the cxq.
+//   Example:
+//
+//   The first contending thread that "pushed" itself onto entry_list,
+//   will be the last thread in the list. Each newly pushed thread in
+//   entry_list will be linked through its next pointer, and have its
+//   prev pointer set to null. Thus pushing six threads A-F (in that
+//   order) onto entry_list, will form a singly linked list, see 1)
+//   below.
+//
+//      1)  entry_list       ->F->E->D->C->B->A->null
+//          entry_list_tail  ->null
+//
+//   Since the successor is chosen in FIFO order, the exiting thread
+//   needs to find the tail of the entry_list. This is done by walking
+//   from the entry_list head. While walking the list we also assign
+//   the prev pointers of each thread, essentially forming a doubly
+//   linked list, see 2) below.
+//
+//      2)  entry_list       ->F<=>E<=>D<=>C<=>B<=>A->null
+//          entry_list_tail  ----------------------^
+//
+//   Once we have formed a doubly linked list it's easy to find the
+//   successor (A), wake it up, have it remove itself, and update the
+//   tail pointer, as seen in and 3) below.
+//
+//      3)  entry_list       ->F<=>E<=>D<=>C<=>B->null
+//          entry_list_tail  ------------------^
+//
+//   At any time new threads can add themselves to the entry_list, see
+//   4) below.
+//
+//      4)  entry_list       ->I->H->G->F<=>E<=>D->null
+//          entry_list_tail  -------------------^
+//
+//   At some point in time the thread (F) that wants to remove itself
+//   from the end of the list, will not have any prev pointer, see 5)
+//   below.
+//
+//      5)  entry_list       ->I->H->G->F->null
+//          entry_list_tail  -----------^
+//
+//   To resolve this we just start walking from the entry_list head
+//   again, forming a new doubly linked list, before removing the
+//   thread (F), see 6) and 7) below.
+//
+//      6)  entry_list       ->I<=>H<=>G<=>F->null
+//          entry_list_tail  --------------^
+//
+//      7)  entry_list       ->I<=>H<=>G->null
+//          entry_list_tail  ----------^
+//
+// * The monitor itself protects all of the operations on the
+//   entry_list except for the CAS of a new arrival to the head. Only
+//   the monitor owner can read or write the prev links (e.g. to
+//   remove itself) or update the tail.
 //
 // * The monitor entry list operations avoid locks, but strictly speaking
 //   they're not lock-free.  Enter is lock-free, exit is not.
 //   For a description of 'Methods and apparatus providing non-blocking access
 //   to a resource,' see U.S. Pat. No. 7844973.
 //
-// * The cxq can have multiple concurrent "pushers" but only one concurrent
-//   detaching thread.  This mechanism is immune from the ABA corruption.
-//   More precisely, the CAS-based "push" onto cxq is ABA-oblivious.
+// * The entry_list can have multiple concurrent "pushers" but only
+//   one concurrent detaching thread. There is no ABA-problem with
+//   this usage of CAS.
 //
-// * Taken together, the cxq and the EntryList constitute or form a
-//   single logical queue of threads stalled trying to acquire the lock.
-//   We use two distinct lists to improve the odds of a constant-time
-//   dequeue operation after acquisition (in the ::enter() epilogue) and
-//   to reduce heat on the list ends.  (c.f. Michael Scott's "2Q" algorithm).
-//   A key desideratum is to minimize queue & monitor metadata manipulation
-//   that occurs while holding the monitor lock -- that is, we want to
-//   minimize monitor lock holds times.  Note that even a small amount of
-//   fixed spinning will greatly reduce the # of enqueue-dequeue operations
-//   on EntryList|cxq.  That is, spinning relieves contention on the "inner"
-//   locks and monitor metadata.
+// * As long as the entry_list_tail is known the odds are good that we
+//   should be able to dequeue after acquisition (in the ::enter()
+//   epilogue) in constant-time. This is good since a key desideratum
+//   is to minimize queue & monitor metadata manipulation that occurs
+//   while holding the monitor lock -- that is, we want to minimize
+//   monitor lock holds times. Note that even a small amount of fixed
+//   spinning will greatly reduce the # of enqueue-dequeue operations
+//   on entry_list. That is, spinning relieves contention on the
+//   "inner" locks and monitor metadata.
 //
-//   Cxq points to the set of Recently Arrived Threads attempting entry.
-//   Because we push threads onto _cxq with CAS, the RATs must take the form of
-//   a singly-linked LIFO.  We drain _cxq into EntryList at unlock-time when
-//   the unlocking thread notices that EntryList is null but _cxq is != null.
-//
-//   The EntryList is ordered by the prevailing queue discipline and
-//   can be organized in any convenient fashion, such as a doubly-linked list or
-//   a circular doubly-linked list.  Critically, we want insert and delete operations
-//   to operate in constant-time.  If we need a priority queue then something akin
-//   to Solaris' sleepq would work nicely.  Viz.,
-//   http://agg.eng/ws/on10_nightly/source/usr/src/uts/common/os/sleepq.c.
-//   Queue discipline is enforced at ::exit() time, when the unlocking thread
-//   drains the cxq into the EntryList, and orders or reorders the threads on the
-//   EntryList accordingly.
-//
-//   Barring "lock barging", this mechanism provides fair cyclic ordering,
-//   somewhat similar to an elevator-scan.
+//   Insert and delete operations may not operate in constant-time if
+//   we have interference because some other thread is adding or
+//   removing the head element of entry_list or if we need to convert
+//   the singly linked entry_list into a doubly linked list to find the
+//   tail.
 //
 // * 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_posix.cpp regarding
-//   the semantics of park-unpark.  Put another way, this monitor implementation
+//   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.
 //
 // * 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/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.
+// * notify() or notifyAll() simply transfers threads from the WaitSet
+//   to the entry_list. Subsequent exit() operations will
+//   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() {
@@ -255,8 +291,8 @@ ObjectMonitor::ObjectMonitor(oop object) :
   _previous_owner_tid(0),
   _next_om(nullptr),
   _recursions(0),
-  _EntryList(nullptr),
-  _cxq(nullptr),
+  _entry_list(nullptr),
+  _entry_list_tail(nullptr),
   _succ(NO_OWNER),
   _SpinDuration(ObjectMonitor::Knob_SpinLimit),
   _contentions(0),
@@ -473,7 +509,7 @@ bool ObjectMonitor::enter(JavaThread* current) {
   return true;
 }
 
-void ObjectMonitor::notify_contended_enter(JavaThread *current) {
+void ObjectMonitor::notify_contended_enter(JavaThread* current) {
   current->set_current_pending_monitor(this);
 
   DTRACE_MONITOR_PROBE(contended__enter, this, object(), current);
@@ -488,7 +524,7 @@ void ObjectMonitor::notify_contended_enter(JavaThread *current) {
   }
 }
 
-void ObjectMonitor::enter_with_contention_mark(JavaThread *current, ObjectMonitorContentionMark &cm) {
+void ObjectMonitor::enter_with_contention_mark(JavaThread* current, ObjectMonitorContentionMark &cm) {
   assert(current == JavaThread::current(), "must be");
   assert(!has_owner(current), "must be");
   assert(cm._monitor == this, "must be");
@@ -518,7 +554,7 @@ void ObjectMonitor::enter_with_contention_mark(JavaThread *current, ObjectMonito
       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
+        // _entry_list 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()) {
@@ -657,6 +693,47 @@ ObjectMonitor::TryLockResult ObjectMonitor::TryLock(JavaThread* current) {
   return first_own == own ? TryLockResult::HasOwner : TryLockResult::Interference;
 }
 
+// Push "current" onto the head of the _entry_list. Once on _entry_list,
+// current stays on-queue until it acquires the lock.
+void ObjectMonitor::add_to_entry_list(JavaThread* current, ObjectWaiter* node) {
+  node->_prev   = nullptr;
+  node->TState  = ObjectWaiter::TS_ENTER;
+
+  for (;;) {
+    ObjectWaiter* head = Atomic::load(&_entry_list);
+    node->_next = head;
+    if (Atomic::cmpxchg(&_entry_list, head, node) == head) {
+      return;
+    }
+  }
+}
+
+// Push "current" onto the head of the entry_list.
+// If the _entry_list was changed during our push operation, we try to
+// lock the monitor. Returns true if we locked the monitor, and false
+// if we added current to _entry_list. Once on _entry_list, current
+// stays on-queue until it acquires the lock.
+bool ObjectMonitor::try_lock_or_add_to_entry_list(JavaThread* current, ObjectWaiter* node) {
+  node->_prev   = nullptr;
+  node->TState  = ObjectWaiter::TS_ENTER;
+
+  for (;;) {
+    ObjectWaiter* head = Atomic::load(&_entry_list);
+    node->_next = head;
+    if (Atomic::cmpxchg(&_entry_list, head, node) == head) {
+      return false;
+    }
+
+    // Interference - the CAS failed because _entry_list changed.  Before
+    // retrying the CAS retry taking the lock as it may now be free.
+    if (TryLock(current) == TryLockResult::Success) {
+      assert(!has_successor(current), "invariant");
+      assert(has_owner(current), "invariant");
+      return true;
+    }
+  }
+}
+
 // Deflate the specified ObjectMonitor if not in-use. Returns true if it
 // was deflated and false otherwise.
 //
@@ -727,11 +804,10 @@ bool ObjectMonitor::deflate_monitor(Thread* current) {
   guarantee(contentions() < 0, "must be negative: contentions=%d",
             contentions());
   guarantee(_waiters == 0, "must be 0: waiters=%d", _waiters);
-  guarantee(_cxq == nullptr, "must be no contending threads: cxq="
-            INTPTR_FORMAT, p2i(_cxq));
-  guarantee(_EntryList == nullptr,
-            "must be no entering threads: EntryList=" INTPTR_FORMAT,
-            p2i(_EntryList));
+  ObjectWaiter* w = Atomic::load(&_entry_list);
+  guarantee(w == nullptr,
+            "must be no entering threads: entry_list=" INTPTR_FORMAT,
+            p2i(w));
 
   if (obj != nullptr) {
     if (log_is_enabled(Trace, monitorinflation)) {
@@ -816,8 +892,7 @@ const char* ObjectMonitor::is_busy_to_string(stringStream* ss) {
   ss->print("is_busy: waiters=%d"
             ", contentions=%d"
             ", owner=" INT64_FORMAT
-            ", cxq=" PTR_FORMAT
-            ", EntryList=" PTR_FORMAT,
+            ", entry_list=" PTR_FORMAT,
             _waiters,
             (contentions() > 0 ? contentions() : 0),
             owner_is_DEFLATER_MARKER()
@@ -825,8 +900,7 @@ const char* ObjectMonitor::is_busy_to_string(stringStream* ss) {
                 // ignores DEFLATER_MARKER values.
                 ? NO_OWNER
                 : owner_raw(),
-            p2i(_cxq),
-            p2i(_EntryList));
+            p2i(_entry_list));
   return ss->base();
 }
 
@@ -859,7 +933,7 @@ void ObjectMonitor::EnterI(JavaThread* current) {
   assert(!has_successor(current), "invariant");
   assert(!has_owner(current), "invariant");
 
-  // Enqueue "current" on ObjectMonitor's _cxq.
+  // Enqueue "current" on ObjectMonitor's _entry_list.
   //
   // Node acts as a proxy for current.
   // As an aside, if were to ever rewrite the synchronization code mostly
@@ -870,31 +944,16 @@ void ObjectMonitor::EnterI(JavaThread* current) {
 
   ObjectWaiter node(current);
   current->_ParkEvent->reset();
-  node._prev   = (ObjectWaiter*) 0xBAD;
-  node.TState  = ObjectWaiter::TS_CXQ;
 
-  // Push "current" onto the front of the _cxq.
-  // Once on cxq/EntryList, current stays on-queue until it acquires the lock.
-  // Note that spinning tends to reduce the rate at which threads
-  // enqueue and dequeue on EntryList|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_successor(current), "invariant");
-      assert(has_owner(current), "invariant");
-      return;
-    }
+  if (try_lock_or_add_to_entry_list(current, &node)) {
+    return; // We got the lock.
   }
+  // This thread is now added to the _entry_list.
 
   // The lock might have been released while this thread was occupied queueing
-  // itself onto _cxq.  To close the race and avoid "stranding" and
+  // itself onto _entry_list.  To close the race and avoid "stranding" and
   // progress-liveness failure we must resample-retry _owner before parking.
-  // Note the Dekker/Lamport duality: ST cxq; MEMBAR; LD Owner.
+  // Note the Dekker/Lamport duality: ST _entry_list; MEMBAR; LD Owner.
   // In this case the ST-MEMBAR is accomplished with CAS().
   //
   // TODO: Defer all thread state transitions until park-time.
@@ -970,15 +1029,7 @@ void ObjectMonitor::EnterI(JavaThread* current) {
   }
 
   // Egress :
-  // current has acquired the lock -- Unlink current from the cxq or EntryList.
-  // Normally we'll find current on the EntryList .
-  // From the perspective of the lock owner (this thread), the
-  // EntryList is stable and cxq is prepend-only.
-  // The head of cxq is volatile but the interior is stable.
-  // In addition, current.TState is stable.
-
-  assert(has_owner(current), "invariant");
-
+  // Current has acquired the lock -- Unlink current from the _entry_list.
   UnlinkAfterAcquire(current, &node);
   if (has_successor(current)) {
     clear_successor();
@@ -988,9 +1039,9 @@ void ObjectMonitor::EnterI(JavaThread* current) {
 
   // We've acquired ownership with CAS().
   // CAS is serializing -- it has MEMBAR/FENCE-equivalent semantics.
-  // But since the CAS() this thread may have also stored into _succ,
-  // EntryList or cxq.  These meta-data updates must be
-  // visible __before this thread subsequently drops the lock.
+  // But since the CAS() this thread may have also stored into _succ
+  // or entry_list.  These meta-data updates must be visible __before
+  // this thread subsequently drops the lock.
   // Consider what could occur if we didn't enforce this constraint --
   // STs to monitor meta-data and user-data could reorder with (become
   // visible after) the ST in exit that drops ownership of the lock.
@@ -1004,7 +1055,7 @@ void ObjectMonitor::EnterI(JavaThread* current) {
   // therefore before some other thread (CPU) has a chance to acquire the lock.
   // See also: http://gee.cs.oswego.edu/dl/jmm/cookbook.html.
   //
-  // Critically, any prior STs to _succ or EntryList must be visible before
+  // Critically, any prior STs to _succ or entry_list must be visible before
   // the ST of null into _owner in the *subsequent* (following) corresponding
   // monitorexit.
 
@@ -1027,7 +1078,7 @@ void ObjectMonitor::ReenterI(JavaThread* current, ObjectWaiter* currentNode) {
 
   for (;;) {
     ObjectWaiter::TStates v = currentNode->TState;
-    guarantee(v == ObjectWaiter::TS_ENTER || v == ObjectWaiter::TS_CXQ, "invariant");
+    guarantee(v == ObjectWaiter::TS_ENTER, "invariant");
     assert(!has_owner(current), "invariant");
 
     // This thread has been notified so try to reacquire the lock.
@@ -1077,14 +1128,7 @@ void ObjectMonitor::ReenterI(JavaThread* current, ObjectWaiter* currentNode) {
     OM_PERFDATA_OP(FutileWakeups, inc());
   }
 
-  // current has acquired the lock -- Unlink current from the cxq or EntryList .
-  // Normally we'll find current on the EntryList.
-  // Unlinking from the EntryList is constant-time and atomic-free.
-  // From the perspective of the lock owner (this thread), the
-  // EntryList is stable and cxq is prepend-only.
-  // The head of cxq is volatile but the interior is stable.
-  // In addition, current.TState is stable.
-
+  // Current has acquired the lock -- Unlink current from the _entry_list.
   assert(has_owner(current), "invariant");
   assert_mark_word_consistency();
   UnlinkAfterAcquire(current, currentNode);
@@ -1109,27 +1153,15 @@ bool ObjectMonitor::VThreadMonitorEnter(JavaThread* current, ObjectWaiter* waite
 
   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;
-    }
+  if (try_lock_or_add_to_entry_list(current, node)) {
+    // We got the lock.
+    if (waiter == nullptr) delete node;  // for Object.wait() don't delete yet
+    return true;
   }
+  // This thread is now added to the entry_list.
 
   // We have to try once more since owner could have exited monitor and checked
-  // _cxq before we added the node to the queue.
+  // _entry_list before we added the node to the queue.
   if (TryLock(current) == TryLockResult::Success) {
     assert(has_owner(current), "invariant");
     UnlinkAfterAcquire(current, node);
@@ -1163,7 +1195,7 @@ bool ObjectMonitor::resume_operation(JavaThread* current, ObjectWaiter* node, Co
   // Retry acquiring monitor...
 
   int state = node->TState;
-  guarantee(state == ObjectWaiter::TS_ENTER || state == ObjectWaiter::TS_CXQ, "invariant");
+  guarantee(state == ObjectWaiter::TS_ENTER, "invariant");
 
   if (TryLock(current) == TryLockResult::Success) {
     VThreadEpilog(current, node);
@@ -1218,71 +1250,131 @@ void ObjectMonitor::VThreadEpilog(JavaThread* current, ObjectWaiter* node) {
   }
 }
 
-// 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.
+// Return the tail of the _entry_list. If the tail is currently not
+// known, find it by walking from the head of _entry_list, and while
+// doing so assign the _prev pointers to create a doubly linked list.
+ObjectWaiter* ObjectMonitor::entry_list_tail(JavaThread* current) {
+  assert(has_owner(current), "invariant");
+  ObjectWaiter* w = _entry_list_tail;
+  if (w != nullptr) {
+    return w;
+  }
+  // Need acquire here to match the implicit release of the cmpxchg
+  // that updated _entry_list, so we can access w->_next.
+  w = Atomic::load_acquire(&_entry_list);
+  assert(w != nullptr, "invariant");
+  if (w->next() == nullptr) {
+    _entry_list_tail = w;
+    return w;
+  }
+  ObjectWaiter* prev = nullptr;
+  while (w != nullptr) {
+    assert(w->TState == ObjectWaiter::TS_ENTER, "invariant");
+    w->_prev = prev;
+    prev = w;
+    w = w->next();
+  }
+  _entry_list_tail = prev;
+  return prev;
+}
+
+// By convention we unlink a contending thread from _entry_list
+// immediately after the thread acquires the lock in ::enter().
+// The head of _entry_list is volatile but the interior is stable.
+// In addition, current.TState is stable.
 
 void ObjectMonitor::UnlinkAfterAcquire(JavaThread* current, ObjectWaiter* currentNode) {
   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 .
-    // This is a constant-time operation.
-    ObjectWaiter* nxt = currentNode->_next;
-    ObjectWaiter* prv = currentNode->_prev;
-    if (nxt != nullptr) nxt->_prev = prv;
-    if (prv != nullptr) prv->_next = nxt;
-    if (currentNode == _EntryList) _EntryList = nxt;
-    assert(nxt == nullptr || nxt->TState == ObjectWaiter::TS_ENTER, "invariant");
-    assert(prv == nullptr || prv->TState == ObjectWaiter::TS_ENTER, "invariant");
-  } else {
-    assert(currentNode->TState == ObjectWaiter::TS_CXQ, "invariant");
-    // Inopportune interleaving -- current is still on the cxq.
-    // This usually means the enqueue of self raced an exiting thread.
-    // Normally we'll find current near the front of the cxq, so
-    // dequeueing is typically fast.  If needbe we can accelerate
-    // this with some MCS/CHL-like bidirectional list hints and advisory
-    // back-links so dequeueing from the interior will normally operate
-    // in constant-time.
-    // Dequeue current from either the head (with CAS) or from the interior
-    // with a linear-time scan and normal non-atomic memory operations.
-    // CONSIDER: if current is on the cxq then simply drain cxq into EntryList
-    // and then unlink current from EntryList.  We have to drain eventually,
-    // so it might as well be now.
+  // Check if we are unlinking the last element in the _entry_list.
+  // This is by far the most common case.
+  if (currentNode->next() == nullptr) {
+    assert(_entry_list_tail == nullptr || _entry_list_tail == currentNode, "invariant");
 
-    ObjectWaiter* v = _cxq;
-    assert(v != nullptr, "invariant");
-    if (v != currentNode || Atomic::cmpxchg(&_cxq, v, currentNode->_next) != v) {
-      // The CAS above can fail from interference IFF a "RAT" arrived.
-      // In that case current must be in the interior and can no longer be
-      // at the head of cxq.
-      if (v == currentNode) {
-        assert(_cxq != v, "invariant");
-        v = _cxq;          // CAS above failed - start scan at head of list
+    ObjectWaiter* w = Atomic::load(&_entry_list);
+    if (w == currentNode) {
+      // The currentNode is the only element in _entry_list.
+      if (Atomic::cmpxchg(&_entry_list, w, (ObjectWaiter*)nullptr) == w) {
+        _entry_list_tail = nullptr;
+        currentNode->set_bad_pointers();
+        return;
       }
-      ObjectWaiter* p;
-      ObjectWaiter* q = nullptr;
-      for (p = v; p != nullptr && p != currentNode; p = p->_next) {
-        q = p;
-        assert(p->TState == ObjectWaiter::TS_CXQ, "invariant");
-      }
-      assert(v != currentNode, "invariant");
-      assert(p == currentNode, "Node not found on cxq");
-      assert(p != _cxq, "invariant");
-      assert(q != nullptr, "invariant");
-      assert(q->_next == p, "invariant");
-      q->_next = p->_next;
+      // The CAS above can fail from interference IFF a contending
+      // thread "pushed" itself onto entry_list. So fall-through to
+      // building the doubly linked list.
+      assert(currentNode->prev() == nullptr, "invariant");
     }
+    if (currentNode->prev() == nullptr) {
+      // Build the doubly linked list to get hold of
+      // currentNode->prev().
+      _entry_list_tail = nullptr;
+      entry_list_tail(current);
+      assert(currentNode->prev() != nullptr, "must be");
+    }
+    // The currentNode is the last element in _entry_list and we know
+    // which element is the previous one.
+    assert(_entry_list != currentNode, "invariant");
+    _entry_list_tail = currentNode->prev();
+    _entry_list_tail->_next = nullptr;
+    currentNode->set_bad_pointers();
+    return;
   }
 
-#ifdef ASSERT
-  // Diagnostic hygiene ...
-  currentNode->_prev  = (ObjectWaiter*) 0xBAD;
-  currentNode->_next  = (ObjectWaiter*) 0xBAD;
-  currentNode->TState = ObjectWaiter::TS_RUN;
-#endif
+  // If we get here it means the current thread enqueued itself on the
+  // _entry_list but was then able to "steal" the lock before the
+  // chosen successor was able to. Consequently currentNode must be an
+  // interior node in the _entry_list, or the head.
+  assert(currentNode->next() != nullptr, "invariant");
+  assert(currentNode != _entry_list_tail, "invariant");
+
+  // Check if we are in the singly linked portion of the
+  // _entry_list. If we are the head then we try to remove ourselves,
+  // else we convert to the doubly linked list.
+  if (currentNode->prev() == nullptr) {
+    ObjectWaiter* w = Atomic::load(&_entry_list);
+
+    assert(w != nullptr, "invariant");
+    if (w == currentNode) {
+      ObjectWaiter* next = currentNode->next();
+      // currentNode is at the head of _entry_list.
+      if (Atomic::cmpxchg(&_entry_list, w, next) == w) {
+        // The CAS above sucsessfully unlinked currentNode from the
+        // head of the _entry_list.
+        assert(_entry_list != w, "invariant");
+        next->_prev = nullptr;
+        currentNode->set_bad_pointers();
+        return;
+      } else {
+        // The CAS above can fail from interference IFF a contending
+        // thread "pushed" itself onto _entry_list, in which case
+        // currentNode must now be in the interior of the
+        // list. Fall-through to building the doubly linked list.
+        assert(_entry_list != currentNode, "invariant");
+      }
+    }
+    // Build the doubly linked list to get hold of currentNode->prev().
+    _entry_list_tail = nullptr;
+    entry_list_tail(current);
+    assert(currentNode->prev() != nullptr, "must be");
+  }
+
+  // We now know we are unlinking currentNode from the interior of a
+  // doubly linked list.
+  assert(currentNode->next() != nullptr, "");
+  assert(currentNode->prev() != nullptr, "");
+  assert(currentNode != _entry_list, "");
+  assert(currentNode != _entry_list_tail, "");
+
+  ObjectWaiter* nxt = currentNode->next();
+  ObjectWaiter* prv = currentNode->prev();
+  assert(nxt->TState == ObjectWaiter::TS_ENTER, "invariant");
+  assert(prv->TState == ObjectWaiter::TS_ENTER, "invariant");
+
+  nxt->_prev = prv;
+  prv->_next = nxt;
+  currentNode->set_bad_pointers();
 }
 
 // -----------------------------------------------------------------------------
@@ -1306,33 +1398,25 @@ void ObjectMonitor::UnlinkAfterAcquire(JavaThread* current, ObjectWaiter* curren
 // C2_MacroAssembler::fast_unlock()
 //
 //   1. A release barrier ensures that changes to monitor meta-data
-//      (_succ, _EntryList, _cxq) and data protected by the lock will be
+//      (_succ, _entry_list) and data protected by the lock will be
 //      visible before we release the lock.
 //   2. Release the lock by clearing the owner.
 //   3. A storeload MEMBAR is needed between releasing the owner and
 //      subsequently reading meta-data to safely determine if the lock is
 //      contended (step 4) without an elected successor (step 5).
-//   4. If both _EntryList and _cxq are null, we are done, since there is no
+//   4. If _entry_list is null, we are done, since there is no
 //      other thread waiting on the lock to wake up. I.e. there is no
 //      contention.
 //   5. If there is a successor (_succ is non-null), we are done. The
 //      responsibility for guaranteeing progress-liveness has now implicitly
 //      been moved from the exiting thread to the successor.
-//   6. There are waiters in the entry list (_EntryList and/or cxq are
-//      non-null), but there is no successor (_succ is null), so we need to
+//   6. There are waiters in the entry list (_entry_list is non-null),
+//      but there is no successor (_succ is null), so we need to
 //      wake up (unpark) a waiting thread to avoid stranding.
 //
-// Note that since only the current lock owner can manipulate the _EntryList
-// or drain _cxq, we need to reacquire the lock before we can wake up
-// (unpark) a waiting thread.
-//
-// Note that we read the EntryList and then the cxq after dropping the
-// lock, so the values need not form a stable snapshot. In particular,
-// after reading the (empty) EntryList, another thread could acquire
-// and release the lock, moving any entries in the cxq to the
-// EntryList, causing the current thread to see an empty cxq and
-// conclude there are no waiters. But this is okay as the thread that
-// moved the cxq is responsible for waking the successor.
+// Note that since only the current lock owner can manipulate the
+// _entry_list (except for pushing new threads to the head), we need to
+// reacquire the lock before we can wake up (unpark) a waiting thread.
 //
 // The CAS() in enter provides for safety and exclusion, while the
 // MEMBAR in exit provides for progress and avoids stranding.
@@ -1390,11 +1474,6 @@ void ObjectMonitor::exit(JavaThread* current, bool not_suspended) {
     release_clear_owner(current);
     OrderAccess::storeload();
 
-    if ((intptr_t(_EntryList)|intptr_t(_cxq)) == 0 || has_successor()) {
-      return;
-    }
-    // Other threads are blocked trying to acquire the lock.
-
     // Normally the exiting thread is responsible for ensuring succession,
     // but if this thread observes other successors are ready or other
     // entering threads are spinning after it has stored null into _owner
@@ -1420,11 +1499,16 @@ void ObjectMonitor::exit(JavaThread* current, bool not_suspended) {
     // the lock.  Note that the dropped lock needs to become visible to the
     // spinner.
 
-    // It appears that an heir-presumptive (successor) must be made ready.
-    // Only the current lock owner can manipulate the EntryList or
-    // drain _cxq, so we need to reacquire the lock.  If we fail
-    // to reacquire the lock the responsibility for ensuring succession
-    // falls to the new owner.
+    if (_entry_list == nullptr || has_successor()) {
+      return;
+    }
+
+    // Other threads are blocked trying to acquire the lock and there
+    // is no successor, so it appears that an heir-presumptive
+    // (successor) must be made ready. Only the current lock owner can
+    // detach threads from the entry_list, therefore we need to
+    // reacquire the lock. If we fail to reacquire the lock the
+    // responsibility for ensuring succession falls to the new owner.
 
     if (TryLock(current) != TryLockResult::Success) {
       // Some other thread acquired the lock (or the monitor was
@@ -1436,75 +1520,24 @@ void ObjectMonitor::exit(JavaThread* current, bool not_suspended) {
 
     ObjectWaiter* w = nullptr;
 
-    w = _EntryList;
+    w = Atomic::load(&_entry_list);
     if (w != nullptr) {
+      w = entry_list_tail(current);
       // I'd like to write: guarantee (w->_thread != current).
-      // But in practice an exiting thread may find itself on the EntryList.
+      // But in practice an exiting thread may find itself on the entry_list.
       // Let's say thread T1 calls O.wait().  Wait() enqueues T1 on O's waitset and
       // then calls exit().  Exit release the lock by setting O._owner to null.
       // Let's say T1 then stalls.  T2 acquires O and calls O.notify().  The
-      // notify() operation moves T1 from O's waitset to O's EntryList. T2 then
-      // release the lock "O".  T2 resumes immediately after the ST of null into
-      // _owner, above.  T2 notices that the EntryList is populated, so it
-      // reacquires the lock and then finds itself on the EntryList.
+      // notify() operation moves T1 from O's waitset to O's entry_list. T2 then
+      // release the lock "O".  T1 resumes immediately after the ST of null into
+      // _owner, above.  T1 notices that the entry_list is populated, so it
+      // reacquires the lock and then finds itself on the entry_list.
       // Given all that, we have to tolerate the circumstance where "w" is
       // associated with current.
       assert(w->TState == ObjectWaiter::TS_ENTER, "invariant");
       ExitEpilog(current, w);
       return;
     }
-
-    // If we find that both _cxq and EntryList are null then just
-    // re-run the exit protocol from the top.
-    w = _cxq;
-    if (w == nullptr) continue;
-
-    // Drain _cxq into EntryList - bulk transfer.
-    // First, detach _cxq.
-    // The following loop is tantamount to: w = swap(&cxq, nullptr)
-    for (;;) {
-      assert(w != nullptr, "Invariant");
-      ObjectWaiter* u = Atomic::cmpxchg(&_cxq, w, (ObjectWaiter*)nullptr);
-      if (u == w) break;
-      w = u;
-    }
-
-    assert(w != nullptr, "invariant");
-    assert(_EntryList == nullptr, "invariant");
-
-    // Convert the LIFO SLL anchored by _cxq into a DLL.
-    // The list reorganization step operates in O(LENGTH(w)) time.
-    // It's critical that this step operate quickly as
-    // "current" still holds the outer-lock, restricting parallelism
-    // and effectively lengthening the critical section.
-    // Invariant: s chases t chases u.
-    // TODO-FIXME: consider changing EntryList from a DLL to a CDLL so
-    // we have faster access to the tail.
-
-    _EntryList = w;
-    ObjectWaiter* q = nullptr;
-    ObjectWaiter* p;
-    for (p = w; p != nullptr; p = p->_next) {
-      guarantee(p->TState == ObjectWaiter::TS_CXQ, "Invariant");
-      p->TState = ObjectWaiter::TS_ENTER;
-      p->_prev = q;
-      q = p;
-    }
-
-    // We need to: ST EntryList; MEMBAR #storestore; ST _owner = nullptr
-    // The MEMBAR is satisfied by the release_store() operation in ExitEpilog().
-
-    // 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 (has_successor()) continue;
-
-    w = _EntryList;
-    if (w != nullptr) {
-      guarantee(w->TState == ObjectWaiter::TS_ENTER, "invariant");
-      ExitEpilog(current, w);
-      return;
-    }
   }
 }
 
@@ -1546,7 +1579,7 @@ void ObjectMonitor::ExitEpilog(JavaThread* current, ObjectWaiter* Wakee) {
   if (vthread == nullptr) {
     // Platform thread case.
     Trigger->unpark();
-  } else if (java_lang_VirtualThread::set_onWaitingList(vthread, vthread_cxq_head())) {
+  } else if (java_lang_VirtualThread::set_onWaitingList(vthread, vthread_list_head())) {
     // Virtual thread case.
     Trigger->unpark();
   }
@@ -1623,7 +1656,7 @@ 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) {
+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();
@@ -1780,8 +1813,8 @@ void ObjectMonitor::wait(jlong millis, bool interruptible, TRAPS) {
       }
     }
 
-    // Node may be on the WaitSet, the EntryList (or cxq), or in transition
-    // from the WaitSet to the EntryList.
+    // Node may be on the WaitSet, or on the entry_list, or in transition
+    // from the WaitSet to the entry_list.
     // See if we need to remove Node from the WaitSet.
     // We use double-checked locking to avoid grabbing _WaitSetLock
     // if the thread is not on the wait queue.
@@ -1806,7 +1839,7 @@ void ObjectMonitor::wait(jlong millis, bool interruptible, TRAPS) {
     }
 
     // The thread is now either on off-list (TS_RUN),
-    // on the EntryList (TS_ENTER), or on the cxq (TS_CXQ).
+    // or on the entry_list (TS_ENTER).
     // The Node's TState variable is stable from the perspective of this thread.
     // No other threads will asynchronously modify TState.
     guarantee(node.TState != ObjectWaiter::TS_WAIT, "invariant");
@@ -1860,7 +1893,7 @@ void ObjectMonitor::wait(jlong millis, bool interruptible, TRAPS) {
       NoPreemptMark npm(current);
       enter(current);
     } else {
-      guarantee(v == ObjectWaiter::TS_ENTER || v == ObjectWaiter::TS_CXQ, "invariant");
+      guarantee(v == ObjectWaiter::TS_ENTER, "invariant");
       ReenterI(current, &node);
       node.wait_reenter_end(this);
     }
@@ -1906,8 +1939,8 @@ void ObjectMonitor::wait(jlong millis, bool interruptible, TRAPS) {
 }
 
 // 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
+// If the lock is cool (entry_list == null && succ == null) and we're on an MP system
+// then instead of transferring a thread from the WaitSet to the entry_list
 // we might just dequeue a thread from the WaitSet and directly unpark() it.
 
 void ObjectMonitor::INotify(JavaThread* current) {
@@ -1916,11 +1949,6 @@ void ObjectMonitor::INotify(JavaThread* current) {
   if (iterator != nullptr) {
     guarantee(iterator->TState == ObjectWaiter::TS_WAIT, "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();
@@ -1938,35 +1966,12 @@ void ObjectMonitor::INotify(JavaThread* current) {
       }
     }
 
-    iterator->TState = ObjectWaiter::TS_ENTER;
-
     iterator->_notified = true;
     iterator->_notifier_tid = JFR_THREAD_ID(current);
+    add_to_entry_list(current, iterator);
 
-    ObjectWaiter* list = _EntryList;
-    if (list != nullptr) {
-      assert(list->_prev == nullptr, "invariant");
-      assert(list->TState == ObjectWaiter::TS_ENTER, "invariant");
-      assert(list != iterator, "invariant");
-    }
-
-    // prepend to cxq
-    if (list == nullptr) {
-      iterator->_next = iterator->_prev = nullptr;
-      _EntryList = iterator;
-    } else {
-      iterator->TState = ObjectWaiter::TS_CXQ;
-      for (;;) {
-        ObjectWaiter* front = _cxq;
-        iterator->_next = front;
-        if (Atomic::cmpxchg(&_cxq, front, iterator) == front) {
-          break;
-        }
-      }
-    }
-
-    // _WaitSetLock protects the wait queue, not the EntryList.  We could
-    // move the add-to-EntryList operation, above, outside the critical section
+    // _WaitSetLock protects the wait queue, not the entry_list.  We could
+    // move the add-to-entry_list operation, above, outside the critical section
     // protected by _WaitSetLock.  In practice that's not useful.  With the
     // exception of  wait() timeouts and interrupts the monitor owner
     // is the only thread that grabs _WaitSetLock.  There's almost no contention
@@ -2001,13 +2006,11 @@ void ObjectMonitor::notify(TRAPS) {
   OM_PERFDATA_OP(Notifications, inc(1));
 }
 
-
-// The current implementation of notifyAll() transfers the waiters one-at-a-time
-// from the waitset to the EntryList. This could be done more efficiently with a
-// single bulk transfer but in practice it's not time-critical. Beware too,
-// that in prepend-mode we invert the order of the waiters. Let's say that the
-// waitset is "ABCD" and the EntryList is "XYZ". After a notifyAll() in prepend
-// mode the waitset will be empty and the EntryList will be "DCBAXYZ".
+// notifyAll() transfers the waiters one-at-a-time from the waitset to
+// the entry_list. If the waitset is "ABCD" (where A was added first
+// and D last) and the entry_list is ->X->Y->Z. After a notifyAll()
+// the waitset will be empty and the entry_list will be
+// ->D->C->B->A->X->Y->Z, and the next choosen successor will be Z.
 
 void ObjectMonitor::notifyAll(TRAPS) {
   JavaThread* current = THREAD;
@@ -2075,7 +2078,7 @@ bool ObjectMonitor::VThreadWaitReenter(JavaThread* current, ObjectWaiter* node,
   // 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;
+  bool was_notified = state == ObjectWaiter::TS_ENTER;
   assert(was_notified || state == ObjectWaiter::TS_RUN, "");
   node->_interrupted = !was_notified && current->is_interrupted(false);
 
@@ -2106,7 +2109,7 @@ bool ObjectMonitor::VThreadWaitReenter(JavaThread* current, ObjectWaiter* node,
       return true;
     }
   } else {
-    // Already moved to _cxq or _EntryList by notifier, so just add to contentions.
+    // Already moved to _entry_list by notifier, so just add to contentions.
     add_to_contentions(1);
   }
   return false;
@@ -2118,13 +2121,7 @@ bool ObjectMonitor::VThreadWaitReenter(JavaThread* current, ObjectWaiter* node,
 // Adaptive spin-then-block - rational spinning
 //
 // Note that we spin "globally" on _owner with a classic SMP-polite TATAS
-// algorithm.  On high order SMP systems it would be better to start with
-// a brief global spin and then revert to spinning locally.  In the spirit of MCS/CLH,
-// a contending thread could enqueue itself on the cxq and then spin locally
-// on a thread-specific variable such as its ParkEvent._Event flag.
-// That's left as an exercise for the reader.  Note that global spinning is
-// not problematic on Niagara, as the L2 cache serves the interconnect and
-// has both low latency and massive bandwidth.
+// algorithm.
 //
 // Broadly, we can fix the spin frequency -- that is, the % of contended lock
 // acquisition attempts where we opt to spin --  at 100% and vary the spin count
@@ -2519,7 +2516,7 @@ void ObjectMonitor::Initialize() {
 
 // 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_list_head = OopHandle(JavaThread::thread_oop_storage(), nullptr);
   _vthread_unparker_ParkEvent = ParkEvent::Allocate(nullptr);
 }
 
@@ -2552,8 +2549,8 @@ void ObjectMonitor::print() const { print_on(tty); }
 //   }
 //   _next_om = 0x0000000000000000
 //   _recursions = 0
-//   _EntryList = 0x0000000000000000
-//   _cxq = 0x0000000000000000
+//   _entry_list = 0x0000000000000000
+//   _entry_list_tail = 0x0000000000000000
 //   _succ = 0x0000000000000000
 //   _SpinDuration = 5000
 //   _contentions = 0
@@ -2580,8 +2577,8 @@ void ObjectMonitor::print_debug_style_on(outputStream* st) const {
   st->print_cr("  }");
   st->print_cr("  _next_om = " INTPTR_FORMAT, p2i(next_om()));
   st->print_cr("  _recursions = %zd", _recursions);
-  st->print_cr("  _EntryList = " INTPTR_FORMAT, p2i(_EntryList));
-  st->print_cr("  _cxq = " INTPTR_FORMAT, p2i(_cxq));
+  st->print_cr("  _entry_list = " INTPTR_FORMAT, p2i(_entry_list));
+  st->print_cr("  _entry_list_tail = " INTPTR_FORMAT, p2i(_entry_list_tail));
   st->print_cr("  _succ = " INT64_FORMAT, successor());
   st->print_cr("  _SpinDuration = %d", _SpinDuration);
   st->print_cr("  _contentions = %d", contentions());
diff --git a/src/hotspot/share/runtime/objectMonitor.hpp b/src/hotspot/share/runtime/objectMonitor.hpp
index 29971d7b4f8..c080ffd236c 100644
--- a/src/hotspot/share/runtime/objectMonitor.hpp
+++ b/src/hotspot/share/runtime/objectMonitor.hpp
@@ -43,7 +43,7 @@ class ContinuationWrapper;
 
 class ObjectWaiter : public CHeapObj<mtThread> {
  public:
-  enum TStates : uint8_t { 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 };
   ObjectWaiter* volatile _next;
   ObjectWaiter* volatile _prev;
   JavaThread*     _thread;
@@ -72,6 +72,23 @@ class ObjectWaiter : public CHeapObj<mtThread> {
   oop vthread() const;
   void wait_reenter_begin(ObjectMonitor *mon);
   void wait_reenter_end(ObjectMonitor *mon);
+
+  ObjectWaiter* const badObjectWaiterPtr = (ObjectWaiter*) 0xBAD;
+  void set_bad_pointers() {
+#ifdef ASSERT
+    this->_prev  = badObjectWaiterPtr;
+    this->_next  = badObjectWaiterPtr;
+    this->TState = ObjectWaiter::TS_RUN;
+#endif
+  }
+  ObjectWaiter* next() {
+    assert (_next != badObjectWaiterPtr, "corrupted list!");
+    return _next;
+  }
+  ObjectWaiter* prev() {
+    assert (_prev != badObjectWaiterPtr, "corrupted list!");
+    return _prev;
+  }
 };
 
 // The ObjectMonitor class implements the heavyweight version of a
@@ -120,7 +137,7 @@ class ObjectWaiter : public CHeapObj<mtThread> {
 //   monitorenter will invalidate the line underlying _owner. We want
 //   to avoid an L1 data cache miss on that same line for monitorexit.
 //   Putting these <remaining_fields>:
-//   _recursions, _EntryList, _cxq, and _succ, all of which may be
+//   _recursions, _entry_list and _succ, all of which may be
 //   fetched in the inflated unlock path, on a different cache line
 //   would make them immune to CAS-based invalidation from the _owner
 //   field.
@@ -140,7 +157,7 @@ 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;
+  static OopHandle _vthread_list_head;
   // ParkEvent of unblocker thread.
   static ParkEvent* _vthread_unparker_ParkEvent;
 
@@ -173,11 +190,10 @@ class ObjectMonitor : public CHeapObj<mtObjectMonitor> {
                         sizeof(volatile uint64_t));
   ObjectMonitor* _next_om;          // Next ObjectMonitor* linkage
   volatile intx _recursions;        // recursion count, 0 for first entry
-  ObjectWaiter* volatile _EntryList;  // Threads blocked on entry or reentry.
-                                      // The list is actually composed of WaitNodes,
-                                      // acting as proxies for Threads.
-
-  ObjectWaiter* volatile _cxq;      // LL of recently-arrived threads blocked on entry.
+  ObjectWaiter* volatile _entry_list;  // Threads blocked on entry or reentry.
+                                       // The list is actually composed of wait-nodes,
+                                       // acting as proxies for Threads.
+  ObjectWaiter* volatile _entry_list_tail; // _entry_list is the head, this is the tail.
   int64_t volatile _succ;           // Heir presumptive thread - used for futile wakeup throttling
 
   volatile int _SpinDuration;
@@ -199,7 +215,7 @@ class ObjectMonitor : public CHeapObj<mtObjectMonitor> {
   static void Initialize();
   static void Initialize2();
 
-  static OopHandle& vthread_cxq_head() { return _vthread_cxq_head; }
+  static OopHandle& vthread_list_head() { return _vthread_list_head; }
   static ParkEvent* vthread_unparker_ParkEvent() { return _vthread_unparker_ParkEvent; }
 
   // Only perform a PerfData operation if the PerfData object has been
@@ -245,9 +261,8 @@ class ObjectMonitor : public CHeapObj<mtObjectMonitor> {
   static ByteSize metadata_offset()    { return byte_offset_of(ObjectMonitor, _metadata); }
   static ByteSize owner_offset()       { return byte_offset_of(ObjectMonitor, _owner); }
   static ByteSize recursions_offset()  { return byte_offset_of(ObjectMonitor, _recursions); }
-  static ByteSize cxq_offset()         { return byte_offset_of(ObjectMonitor, _cxq); }
   static ByteSize succ_offset()        { return byte_offset_of(ObjectMonitor, _succ); }
-  static ByteSize EntryList_offset()   { return byte_offset_of(ObjectMonitor, _EntryList); }
+  static ByteSize entry_list_offset()  { return byte_offset_of(ObjectMonitor, _entry_list); }
 
   // ObjectMonitor references can be ORed with markWord::monitor_value
   // as part of the ObjectMonitor tagging mechanism. When we combine an
@@ -275,7 +290,7 @@ class ObjectMonitor : public CHeapObj<mtObjectMonitor> {
 
   bool is_busy() const {
     // TODO-FIXME: assert _owner == NO_OWNER implies _recursions = 0
-    intptr_t ret_code = intptr_t(_waiters) | intptr_t(_cxq) | intptr_t(_EntryList);
+    intptr_t ret_code = intptr_t(_waiters) | intptr_t(_entry_list);
     int cnts = contentions(); // read once
     if (cnts > 0) {
       ret_code |= intptr_t(cnts);
@@ -317,7 +332,7 @@ class ObjectMonitor : public CHeapObj<mtObjectMonitor> {
   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,
+  // from _entry_list 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;
@@ -419,6 +434,7 @@ class ObjectMonitor : public CHeapObj<mtObjectMonitor> {
   intx      complete_exit(JavaThread* current);
 
  private:
+  void      add_to_entry_list(JavaThread* current, ObjectWaiter* node);
   void      AddWaiter(ObjectWaiter* waiter);
   void      INotify(JavaThread* current);
   ObjectWaiter* DequeueWaiter();
@@ -426,6 +442,7 @@ class ObjectMonitor : public CHeapObj<mtObjectMonitor> {
   void      EnterI(JavaThread* current);
   void      ReenterI(JavaThread* current, ObjectWaiter* current_node);
   void      UnlinkAfterAcquire(JavaThread* current, ObjectWaiter* current_node);
+  ObjectWaiter* entry_list_tail(JavaThread* current);
 
   bool      VThreadMonitorEnter(JavaThread* current, ObjectWaiter* node = nullptr);
   void      VThreadWait(JavaThread* current, jlong millis);
@@ -435,6 +452,7 @@ class ObjectMonitor : public CHeapObj<mtObjectMonitor> {
   enum class TryLockResult { Interference = -1, HasOwner = 0, Success = 1 };
 
   bool           TryLockWithContentionMark(JavaThread* locking_thread, ObjectMonitorContentionMark& contention_mark);
+  bool           try_lock_or_add_to_entry_list(JavaThread* current, ObjectWaiter* node);
   TryLockResult  TryLock(JavaThread* current);
 
   bool      TrySpin(JavaThread* current);
diff --git a/src/hotspot/share/runtime/synchronizer.cpp b/src/hotspot/share/runtime/synchronizer.cpp
index 0ee3e24760d..f48035db2e8 100644
--- a/src/hotspot/share/runtime/synchronizer.cpp
+++ b/src/hotspot/share/runtime/synchronizer.cpp
@@ -366,7 +366,7 @@ bool ObjectSynchronizer::quick_notify(oopDesc* obj, JavaThread* current, bool al
     if (mon->first_waiter() != nullptr) {
       // We have one or more waiters. Since this is an inflated monitor
       // that we own, we can transfer one or more threads from the waitset
-      // to the entrylist here and now, avoiding the slow-path.
+      // to the entry_list here and now, avoiding the slow-path.
       if (all) {
         DTRACE_MONITOR_PROBE(notifyAll, mon, obj, current);
       } else {

From cfab88b1a2351a187bc1be153be96ca983a7776c Mon Sep 17 00:00:00 2001
From: Andrew Dinn <adinn@openjdk.org>
Date: Thu, 6 Mar 2025 10:11:44 +0000
Subject: [PATCH 249/587] 8351256: Improve printing of runtime call stub names
 in disassember output

Reviewed-by: kvn
---
 src/hotspot/share/code/nmethod.cpp   | 15 ++++++++++-
 src/hotspot/share/code/relocInfo.cpp | 40 +++++++++++++++++++++++++++-
 2 files changed, 53 insertions(+), 2 deletions(-)

diff --git a/src/hotspot/share/code/nmethod.cpp b/src/hotspot/share/code/nmethod.cpp
index 4f72c193d7f..3381a7cb726 100644
--- a/src/hotspot/share/code/nmethod.cpp
+++ b/src/hotspot/share/code/nmethod.cpp
@@ -3550,7 +3550,10 @@ const char* nmethod::reloc_string_for(u_char* begin, u_char* end) {
   while (iter.next()) {
     have_one = true;
     switch (iter.type()) {
-        case relocInfo::none:                  return "no_reloc";
+        case relocInfo::none: {
+          // Skip it and check next
+          break;
+        }
         case relocInfo::oop_type: {
           // Get a non-resizable resource-allocated stringStream.
           // Our callees make use of (nested) ResourceMarks.
@@ -3579,6 +3582,16 @@ const char* nmethod::reloc_string_for(u_char* begin, u_char* end) {
           st.print("runtime_call");
           CallRelocation* r = (CallRelocation*)iter.reloc();
           address dest = r->destination();
+          if (StubRoutines::contains(dest)) {
+            StubCodeDesc* desc = StubCodeDesc::desc_for(dest);
+            if (desc == nullptr) {
+              desc = StubCodeDesc::desc_for(dest + frame::pc_return_offset);
+            }
+            if (desc != nullptr) {
+              st.print(" Stub::%s", desc->name());
+              return st.as_string();
+            }
+          }
           CodeBlob* cb = CodeCache::find_blob(dest);
           if (cb != nullptr) {
             st.print(" %s", cb->name());
diff --git a/src/hotspot/share/code/relocInfo.cpp b/src/hotspot/share/code/relocInfo.cpp
index 9dc4eced966..7aae32759dd 100644
--- a/src/hotspot/share/code/relocInfo.cpp
+++ b/src/hotspot/share/code/relocInfo.cpp
@@ -869,13 +869,43 @@ void RelocIterator::print_current() {
       static_call_Relocation* r = (static_call_Relocation*) reloc();
       tty->print(" | [destination=" INTPTR_FORMAT " metadata=" INTPTR_FORMAT "]",
                  p2i(r->destination()), p2i(r->method_value()));
+      CodeBlob* cb = CodeCache::find_blob(r->destination());
+      if (cb != nullptr) {
+        tty->print(" Blob::%s", cb->name());
+      }
       break;
     }
   case relocInfo::runtime_call_type:
   case relocInfo::runtime_call_w_cp_type:
     {
       CallRelocation* r = (CallRelocation*) reloc();
-      tty->print(" | [destination=" INTPTR_FORMAT "]", p2i(r->destination()));
+      address dest = r->destination();
+      tty->print(" | [destination=" INTPTR_FORMAT "]", p2i(dest));
+      if (StubRoutines::contains(dest)) {
+        StubCodeDesc* desc = StubCodeDesc::desc_for(dest);
+        if (desc == nullptr) {
+          desc = StubCodeDesc::desc_for(dest + frame::pc_return_offset);
+        }
+        if (desc != nullptr) {
+          tty->print(" Stub::%s", desc->name());
+        }
+      } else {
+        CodeBlob* cb = CodeCache::find_blob(dest);
+        if (cb != nullptr) {
+          tty->print(" %s", cb->name());
+        } else {
+          ResourceMark rm;
+          const int buflen = 1024;
+          char* buf = NEW_RESOURCE_ARRAY(char, buflen);
+          int offset;
+          if (os::dll_address_to_function_name(dest, buf, buflen, &offset)) {
+            tty->print(" %s", buf);
+            if (offset != 0) {
+              tty->print("+%d", offset);
+            }
+          }
+        }
+      }
       break;
     }
   case relocInfo::virtual_call_type:
@@ -883,6 +913,10 @@ void RelocIterator::print_current() {
       virtual_call_Relocation* r = (virtual_call_Relocation*) reloc();
       tty->print(" | [destination=" INTPTR_FORMAT " cached_value=" INTPTR_FORMAT " metadata=" INTPTR_FORMAT "]",
                  p2i(r->destination()), p2i(r->cached_value()), p2i(r->method_value()));
+      CodeBlob* cb = CodeCache::find_blob(r->destination());
+      if (cb != nullptr) {
+        tty->print(" Blob::%s", cb->name());
+      }
       break;
     }
   case relocInfo::static_stub_type:
@@ -902,6 +936,10 @@ void RelocIterator::print_current() {
       opt_virtual_call_Relocation* r = (opt_virtual_call_Relocation*) reloc();
       tty->print(" | [destination=" INTPTR_FORMAT " metadata=" INTPTR_FORMAT "]",
                  p2i(r->destination()), p2i(r->method_value()));
+      CodeBlob* cb = CodeCache::find_blob(r->destination());
+      if (cb != nullptr) {
+        tty->print(" Blob::%s", cb->name());
+      }
       break;
     }
   default:

From 8f8a879de03add68e385f2610863d3b4ddd86df7 Mon Sep 17 00:00:00 2001
From: Kevin Walls <kevinw@openjdk.org>
Date: Thu, 6 Mar 2025 12:26:53 +0000
Subject: [PATCH 250/587] 8350939: Revisit Windows PDH buffer size calculation
 for OperatingSystemMXBean

Reviewed-by: dholmes, lmesnik, sspitsyn
---
 .../libmanagement_ext/OperatingSystemImpl.c   | 77 +++++++++----------
 1 file changed, 36 insertions(+), 41 deletions(-)

diff --git a/src/jdk.management/windows/native/libmanagement_ext/OperatingSystemImpl.c b/src/jdk.management/windows/native/libmanagement_ext/OperatingSystemImpl.c
index 37c30bbc898..c53d949cb64 100644
--- a/src/jdk.management/windows/native/libmanagement_ext/OperatingSystemImpl.c
+++ b/src/jdk.management/windows/native/libmanagement_ext/OperatingSystemImpl.c
@@ -291,7 +291,7 @@ static const DWORD PDH_PROCESSOR_TIME_IDX = 6;
 static const DWORD PDH_PROCESS_IDX = 230;
 static const DWORD PDH_ID_PROCESS_IDX = 784;
 
-/* useful pdh fmt's */
+/* PDH format patterns, and lengths of their constant component. */
 static const char* const OBJECT_COUNTER_FMT = "\\%s\\%s";
 static const size_t OBJECT_COUNTER_FMT_LEN = 2;
 static const char* const OBJECT_WITH_INSTANCES_COUNTER_FMT = "\\%s(%s)\\%s";
@@ -405,8 +405,8 @@ makeFullCounterPath(const char* const objectName,
     assert(objectName);
     assert(counterName);
 
-    fullCounterPathLen = strlen(objectName);
-    fullCounterPathLen += strlen(counterName);
+    // Always include space for null terminator:
+    fullCounterPathLen = strlen(objectName) + strlen(counterName) + 1;
 
     if (imageName) {
         /*
@@ -429,20 +429,19 @@ makeFullCounterPath(const char* const objectName,
         assert(instance);
 
         fullCounterPathLen += strlen(instance);
-
-        fullCounterPath = malloc(fullCounterPathLen + 1);
+        fullCounterPath = malloc(fullCounterPathLen);
 
         if (!fullCounterPath) {
             return NULL;
         }
 
-        _snprintf(fullCounterPath,
-                  fullCounterPathLen,
-                  PROCESS_OBJECT_INSTANCE_COUNTER_FMT,
-                  objectName,
-                  imageName,
-                  instance,
-                  counterName);
+        snprintf(fullCounterPath,
+                 fullCounterPathLen,
+                 PROCESS_OBJECT_INSTANCE_COUNTER_FMT,
+                 objectName,
+                 imageName,
+                 instance,
+                 counterName);
     } else {
         if (instance) {
             /*
@@ -465,30 +464,28 @@ makeFullCounterPath(const char* const objectName,
             fullCounterPathLen += OBJECT_COUNTER_FMT_LEN;
         }
 
-        fullCounterPath = malloc(fullCounterPathLen + 1);
+        fullCounterPath = malloc(fullCounterPathLen);
 
         if (!fullCounterPath) {
             return NULL;
         }
 
         if (instance) {
-            _snprintf(fullCounterPath,
-                      fullCounterPathLen,
-                      OBJECT_WITH_INSTANCES_COUNTER_FMT,
-                      objectName,
-                      instance,
-                      counterName);
+            snprintf(fullCounterPath,
+                     fullCounterPathLen,
+                     OBJECT_WITH_INSTANCES_COUNTER_FMT,
+                     objectName,
+                     instance,
+                     counterName);
         } else {
-            _snprintf(fullCounterPath,
-                      fullCounterPathLen,
-                      OBJECT_COUNTER_FMT,
-                      objectName,
-                      counterName);
+            snprintf(fullCounterPath,
+                     fullCounterPathLen,
+                     OBJECT_COUNTER_FMT,
+                     objectName,
+                     counterName);
         }
     }
 
-    fullCounterPath[fullCounterPathLen] = '\0';
-
     return fullCounterPath;
 }
 
@@ -719,10 +716,10 @@ currentQueryIndexForProcess(void) {
             PDH_FMT_COUNTERVALUE counterValue;
             PDH_STATUS res;
 
-            _snprintf(fullIDProcessCounterPath,
-                      MAX_PATH,
-                      pdhIDProcessCounterFmt,
-                      index);
+            snprintf(fullIDProcessCounterPath,
+                     MAX_PATH,
+                     pdhIDProcessCounterFmt,
+                     index);
 
             if (addCounter(tmpQuery, fullIDProcessCounterPath, &handleCounter) != 0) {
                 break;
@@ -1050,24 +1047,22 @@ allocateAndInitializePdhConstants() {
     pdhIDProcessCounterFmtLen += strlen(pdhLocalizedProcessObject);
     pdhIDProcessCounterFmtLen += strlen(pdhLocalizedIDProcessCounter);
     pdhIDProcessCounterFmtLen += PROCESS_OBJECT_INSTANCE_COUNTER_FMT_LEN;
-    pdhIDProcessCounterFmtLen += 2; // "%d"
+    pdhIDProcessCounterFmtLen += 3; // "%d" and '\0'
 
     assert(pdhIDProcessCounterFmtLen < MAX_PATH);
-    pdhIDProcessCounterFmt = malloc(pdhIDProcessCounterFmtLen + 1);
+    pdhIDProcessCounterFmt = malloc(pdhIDProcessCounterFmtLen);
     if (!pdhIDProcessCounterFmt) {
         goto end;
     }
 
     /* "\Process(java#%d)\ID Process" */
-    _snprintf(pdhIDProcessCounterFmt,
-              pdhIDProcessCounterFmtLen,
-              PROCESS_OBJECT_INSTANCE_COUNTER_FMT,
-              pdhLocalizedProcessObject,
-              pdhProcessImageName,
-              "%d",
-              pdhLocalizedIDProcessCounter);
-
-    pdhIDProcessCounterFmt[pdhIDProcessCounterFmtLen] = '\0';
+    snprintf(pdhIDProcessCounterFmt,
+             pdhIDProcessCounterFmtLen,
+             PROCESS_OBJECT_INSTANCE_COUNTER_FMT,
+             pdhLocalizedProcessObject,
+             pdhProcessImageName,
+             "%d",
+             pdhLocalizedIDProcessCounter);
 
     assert(0 == numberOfJavaProcessesAtInitialization);
     currentQueryIndex = currentQueryIndexForProcess();

From 93f226078e1e1cee5f17b4866f4712326bffa5b2 Mon Sep 17 00:00:00 2001
From: Brian Burkhalter <bpb@openjdk.org>
Date: Thu, 6 Mar 2025 17:11:40 +0000
Subject: [PATCH 251/587] 8351294: (fs) Minor verbiage correction for
 Files.createTemp{Directory,File}

Reviewed-by: alanb
---
 src/java.base/share/classes/java/nio/file/Files.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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 44a0a8e164c..2f83f79d4bd 100644
--- a/src/java.base/share/classes/java/nio/file/Files.java
+++ b/src/java.base/share/classes/java/nio/file/Files.java
@@ -764,7 +764,7 @@ public final class Files {
      * is identified by its {@link FileAttribute#name name}. If more than one
      * attribute of the same name is included in the array then all but the last
      * occurrence is ignored. When no file attributes are specified, then the
-     * resulting file may have more restrictive access permissions to files
+     * resulting file may have more restrictive access permissions than files
      * created by the {@link java.io.File#createTempFile(String,String,File)}
      * method.
      *
@@ -862,7 +862,7 @@ public final class Files {
      * than one attribute of the same name is included in the array then all but
      * the last occurrence is ignored. When no file attributes are specified,
      * then the resulting directory may have more restrictive access
-     * permissions to directories created by the
+     * permissions than directories created by the
      * {@linkplain Files#createDirectory(Path, FileAttribute<?>...)} method.
      *
      * @param   dir

From 08929134b3533362133139c4e964b1b28de6ebfb Mon Sep 17 00:00:00 2001
From: Brian Burkhalter <bpb@openjdk.org>
Date: Thu, 6 Mar 2025 17:11:53 +0000
Subject: [PATCH 252/587] 8351086: (fc) Make
 java/nio/channels/FileChannel/BlockDeviceSize.java test manual

Reviewed-by: msheppar
---
 test/jdk/java/nio/channels/FileChannel/BlockDeviceSize.java | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/test/jdk/java/nio/channels/FileChannel/BlockDeviceSize.java b/test/jdk/java/nio/channels/FileChannel/BlockDeviceSize.java
index 415e1e52aad..8597f9a02af 100644
--- a/test/jdk/java/nio/channels/FileChannel/BlockDeviceSize.java
+++ b/test/jdk/java/nio/channels/FileChannel/BlockDeviceSize.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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,10 @@
  * @bug 8054029 8313368
  * @requires (os.family == "linux")
  * @summary FileChannel.size() should be equal to RandomAccessFile.size() and > 0 for block devs on Linux
+ * @comment The test must be launched with sudo or the block devices listed in
+ * the BLK_FNAMES array must be readable by the user running the test.
  * @library /test/lib
+ * @run main/manual BlockDeviceSize
  */
 
 import java.io.RandomAccessFile;

From a23fb0af65f491ef655ba114fcc8032a09a55213 Mon Sep 17 00:00:00 2001
From: Alisen Chung <achung@openjdk.org>
Date: Thu, 6 Mar 2025 21:24:44 +0000
Subject: [PATCH 253/587] 8348110: Update LCMS to 2.17

Reviewed-by: honkar, prr, dnguyen
---
 src/java.desktop/share/legal/lcms.md          |  12 +-
 .../share/native/liblcms/cmsalpha.c           |  10 +-
 .../share/native/liblcms/cmscam02.c           |  11 +-
 .../share/native/liblcms/cmscgats.c           | 147 +++++++++-----
 .../share/native/liblcms/cmscnvrt.c           |   3 +-
 .../share/native/liblcms/cmserr.c             |   2 +-
 .../share/native/liblcms/cmsgamma.c           |   2 +-
 .../share/native/liblcms/cmsgmt.c             |  11 +-
 .../share/native/liblcms/cmshalf.c            |   2 +-
 .../share/native/liblcms/cmsintrp.c           |   4 +-
 .../share/native/liblcms/cmsio0.c             |   7 +-
 .../share/native/liblcms/cmsio1.c             |   2 +-
 .../share/native/liblcms/cmslut.c             |   4 +-
 .../share/native/liblcms/cmsmd5.c             |  10 +-
 .../share/native/liblcms/cmsmtrx.c            |   2 +-
 .../share/native/liblcms/cmsnamed.c           |   4 +-
 .../share/native/liblcms/cmsopt.c             |   2 +-
 .../share/native/liblcms/cmspack.c            |  28 ++-
 .../share/native/liblcms/cmspcs.c             |   2 +-
 .../share/native/liblcms/cmsplugin.c          |   7 +-
 .../share/native/liblcms/cmsps2.c             |  62 ++++--
 .../share/native/liblcms/cmssamp.c            |   2 +-
 src/java.desktop/share/native/liblcms/cmssm.c |   2 +-
 .../share/native/liblcms/cmstypes.c           | 188 +++++++++++++++++-
 .../share/native/liblcms/cmsvirt.c            |  10 +-
 .../share/native/liblcms/cmswtpnt.c           |   2 +-
 .../share/native/liblcms/cmsxform.c           |  68 ++++---
 src/java.desktop/share/native/liblcms/lcms2.h |  12 +-
 .../share/native/liblcms/lcms2_internal.h     |   7 +-
 .../share/native/liblcms/lcms2_plugin.h       |   2 +-
 30 files changed, 451 insertions(+), 176 deletions(-)

diff --git a/src/java.desktop/share/legal/lcms.md b/src/java.desktop/share/legal/lcms.md
index 02af4fff000..83c47d3acdb 100644
--- a/src/java.desktop/share/legal/lcms.md
+++ b/src/java.desktop/share/legal/lcms.md
@@ -1,11 +1,11 @@
-## Little Color Management System (LCMS) v2.16
+## Little Color Management System (LCMS) v2.17
 
 ### LCMS License
 <pre>
 
 MIT License
 
-Copyright (C) 1998-2023 Marti Maria Saguer
+Copyright (C) 1998-2025 Marti Maria Saguer
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the "Software"),
@@ -26,10 +26,10 @@ OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 ---------------------------------
-The below license applies to the following files:
+The below applies to the following file(s):
 liblcms/cmssm.c
 
-Copyright 2001, softSurfer (www.softsurfer.com)
+Copyright (C) 2001, softSurfer (www.softsurfer.com)
 
 This code may be freely used and modified for any purpose
 providing that this copyright notice is included with it.
@@ -99,5 +99,5 @@ Christian Albrecht
 Dimitrios Anastassakis
 Lemke Software
 Tim Zaman
-
-```
+Amir Montazery and Open Source Technology Improvement Fund (ostif.org), Google, for fuzzer fundings.
+```
\ No newline at end of file
diff --git a/src/java.desktop/share/native/liblcms/cmsalpha.c b/src/java.desktop/share/native/liblcms/cmsalpha.c
index 78d3ca6b671..2e50b65be24 100644
--- a/src/java.desktop/share/native/liblcms/cmsalpha.c
+++ b/src/java.desktop/share/native/liblcms/cmsalpha.c
@@ -30,7 +30,7 @@
 //---------------------------------------------------------------------------------
 //
 //  Little Color Management System
-//  Copyright (c) 1998-2023 Marti Maria Saguer
+//  Copyright (c) 1998-2024 Marti Maria Saguer
 //
 // Permission is hereby granted, free of charge, to any person obtaining
 // a copy of this software and associated documentation files (the "Software"),
@@ -612,8 +612,8 @@ void _cmsHandleExtraChannels(_cmsTRANSFORM* p, const void* in,
         cmsUInt8Number* SourcePtr;
         cmsUInt8Number* DestPtr;
 
-        cmsUInt32Number SourceStrideIncrement = 0;
-        cmsUInt32Number DestStrideIncrement = 0;
+        size_t SourceStrideIncrement = 0;
+        size_t DestStrideIncrement = 0;
 
         // The loop itself
         for (i = 0; i < LineCount; i++) {
@@ -640,8 +640,8 @@ void _cmsHandleExtraChannels(_cmsTRANSFORM* p, const void* in,
         cmsUInt8Number* SourcePtr[cmsMAXCHANNELS];
         cmsUInt8Number* DestPtr[cmsMAXCHANNELS];
 
-        cmsUInt32Number SourceStrideIncrements[cmsMAXCHANNELS];
-        cmsUInt32Number DestStrideIncrements[cmsMAXCHANNELS];
+        size_t SourceStrideIncrements[cmsMAXCHANNELS];
+        size_t DestStrideIncrements[cmsMAXCHANNELS];
 
         memset(SourceStrideIncrements, 0, sizeof(SourceStrideIncrements));
         memset(DestStrideIncrements, 0, sizeof(DestStrideIncrements));
diff --git a/src/java.desktop/share/native/liblcms/cmscam02.c b/src/java.desktop/share/native/liblcms/cmscam02.c
index 71a48d43de4..45ef4eef970 100644
--- a/src/java.desktop/share/native/liblcms/cmscam02.c
+++ b/src/java.desktop/share/native/liblcms/cmscam02.c
@@ -30,7 +30,7 @@
 //---------------------------------------------------------------------------------
 //
 //  Little Color Management System
-//  Copyright (c) 1998-2023 Marti Maria Saguer
+//  Copyright (c) 1998-2024 Marti Maria Saguer
 //
 // Permission is hereby granted, free of charge, to any person obtaining
 // a copy of this software and associated documentation files (the "Software"),
@@ -117,17 +117,16 @@ cmsFloat64Number computeFL(cmsCIECAM02* pMod)
     return FL;
 }
 
-static
-cmsFloat64Number computeD(cmsCIECAM02* pMod)
+static cmsFloat64Number computeD(cmsCIECAM02* pMod)
 {
-    cmsFloat64Number D;
+    cmsFloat64Number D, temp;
 
-    D = pMod->F - (1.0/3.6)*(exp(((-pMod ->LA-42) / 92.0)));
+    temp = 1.0 - ((1.0 / 3.6) * exp((-pMod->LA - 42) / 92.0));
 
+    D = pMod->F * temp;
     return D;
 }
 
-
 static
 CAM02COLOR XYZtoCAT02(CAM02COLOR clr)
 {
diff --git a/src/java.desktop/share/native/liblcms/cmscgats.c b/src/java.desktop/share/native/liblcms/cmscgats.c
index 57725ae4731..3e62d064c3f 100644
--- a/src/java.desktop/share/native/liblcms/cmscgats.c
+++ b/src/java.desktop/share/native/liblcms/cmscgats.c
@@ -30,7 +30,7 @@
 //---------------------------------------------------------------------------------
 //
 //  Little Color Management System
-//  Copyright (c) 1998-2023 Marti Maria Saguer
+//  Copyright (c) 1998-2024 Marti Maria Saguer
 //
 // Permission is hereby granted, free of charge, to any person obtaining
 // a copy of this software and associated documentation files (the "Software"),
@@ -444,10 +444,11 @@ static
 void StringClear(string* s)
 {
     s->len = 0;
+    s->begin[0] = 0;
 }
 
 static
-void StringAppend(string* s, char c)
+cmsBool StringAppend(string* s, char c)
 {
     if (s->len + 1 >= s->max)
     {
@@ -455,6 +456,8 @@ void StringAppend(string* s, char c)
 
         s->max *= 10;
         new_ptr = (char*) AllocChunk(s->it8, s->max);
+        if (new_ptr == NULL) return FALSE;
+
         if (new_ptr != NULL && s->begin != NULL)
             memcpy(new_ptr, s->begin, s->len);
 
@@ -466,6 +469,8 @@ void StringAppend(string* s, char c)
         s->begin[s->len++] = c;
         s->begin[s->len] = 0;
     }
+
+    return TRUE;
 }
 
 static
@@ -475,13 +480,15 @@ char* StringPtr(string* s)
 }
 
 static
-void StringCat(string* s, const char* c)
+cmsBool StringCat(string* s, const char* c)
 {
     while (*c)
     {
-        StringAppend(s, *c);
+        if (!StringAppend(s, *c)) return FALSE;
         c++;
     }
+
+    return TRUE;
 }
 
 
@@ -830,7 +837,12 @@ void InStringSymbol(cmsIT8* it8)
 
             if (it8->ch == '\n' || it8->ch == '\r' || it8->ch == 0) break;
             else {
-                StringAppend(it8->str, (char)it8->ch);
+                if (!StringAppend(it8->str, (char)it8->ch)) {
+
+                    SynError(it8, "Out of memory");
+                    return;
+                }
+
                 NextCh(it8);
             }
         }
@@ -860,7 +872,11 @@ void InSymbol(cmsIT8* it8)
 
             do {
 
-                StringAppend(it8->id, (char) it8->ch);
+                if (!StringAppend(it8->id, (char)it8->ch)) {
+
+                    SynError(it8, "Out of memory");
+                    return;
+                }
 
                 NextCh(it8);
 
@@ -904,7 +920,6 @@ void InSymbol(cmsIT8* it8)
                             if ((cmsFloat64Number) it8->inum * 16.0 + (cmsFloat64Number) j > (cmsFloat64Number)+2147483647.0)
                             {
                                 SynError(it8, "Invalid hexadecimal number");
-                                it8->sy = SEOF;
                                 return;
                             }
 
@@ -926,7 +941,6 @@ void InSymbol(cmsIT8* it8)
                             if ((cmsFloat64Number) it8->inum * 2.0 + j > (cmsFloat64Number)+2147483647.0)
                             {
                                 SynError(it8, "Invalid binary number");
-                                it8->sy = SEOF;
                                 return;
                             }
 
@@ -979,11 +993,19 @@ void InSymbol(cmsIT8* it8)
                     }
 
                     StringClear(it8->id);
-                    StringCat(it8->id, buffer);
+                    if (!StringCat(it8->id, buffer)) {
+
+                        SynError(it8, "Out of memory");
+                        return;
+                    }
 
                     do {
 
-                        StringAppend(it8->id, (char) it8->ch);
+                        if (!StringAppend(it8->id, (char)it8->ch)) {
+
+                            SynError(it8, "Out of memory");
+                            return;
+                        }
 
                         NextCh(it8);
 
@@ -1038,7 +1060,6 @@ void InSymbol(cmsIT8* it8)
 
         default:
             SynError(it8, "Unrecognized character: 0x%x", it8 ->ch);
-            it8->sy = SEOF;
             return;
             }
 
@@ -1053,24 +1074,21 @@ void InSymbol(cmsIT8* it8)
                 if(it8 -> IncludeSP >= (MAXINCLUDE-1)) {
 
                     SynError(it8, "Too many recursion levels");
-                    it8->sy = SEOF;
                     return;
                 }
 
                 InStringSymbol(it8);
                 if (!Check(it8, SSTRING, "Filename expected"))
-                {
-                    it8->sy = SEOF;
                     return;
-                }
+
 
                 FileNest = it8 -> FileStack[it8 -> IncludeSP + 1];
                 if(FileNest == NULL) {
 
                     FileNest = it8 ->FileStack[it8 -> IncludeSP + 1] = (FILECTX*)AllocChunk(it8, sizeof(FILECTX));
                     if (FileNest == NULL) {
+
                         SynError(it8, "Out of memory");
-                        it8->sy = SEOF;
                         return;
                     }
                 }
@@ -1078,8 +1096,8 @@ void InSymbol(cmsIT8* it8)
                 if (BuildAbsolutePath(StringPtr(it8->str),
                                       it8->FileStack[it8->IncludeSP]->FileName,
                                       FileNest->FileName, cmsMAX_PATH-1) == FALSE) {
+
                     SynError(it8, "File path too long");
-                    it8->sy = SEOF;
                     return;
                 }
 
@@ -1087,7 +1105,6 @@ void InSymbol(cmsIT8* it8)
                 if (FileNest->Stream == NULL) {
 
                         SynError(it8, "File %s not found", FileNest->FileName);
-                        it8->sy = SEOF;
                         return;
                 }
                 it8->IncludeSP++;
@@ -1102,10 +1119,10 @@ void InSymbol(cmsIT8* it8)
 static
 cmsBool CheckEOLN(cmsIT8* it8)
 {
-        if (!Check(it8, SEOLN, "Expected separator")) return FALSE;
-        while (it8 -> sy == SEOLN)
-                        InSymbol(it8);
-        return TRUE;
+    if (!Check(it8, SEOLN, "Expected separator")) return FALSE;
+    while (it8->sy == SEOLN)
+        InSymbol(it8);
+    return TRUE;
 
 }
 
@@ -1114,8 +1131,8 @@ cmsBool CheckEOLN(cmsIT8* it8)
 static
 void Skip(cmsIT8* it8, SYMBOL sy)
 {
-        if (it8->sy == sy && it8->sy != SEOF)
-                        InSymbol(it8);
+    if (it8->sy == sy && it8->sy != SEOF && it8->sy != SSYNERROR)
+        InSymbol(it8);
 }
 
 
@@ -1124,7 +1141,7 @@ static
 void SkipEOLN(cmsIT8* it8)
 {
     while (it8->sy == SEOLN) {
-             InSymbol(it8);
+        InSymbol(it8);
     }
 }
 
@@ -1235,9 +1252,12 @@ void* AllocChunk(cmsIT8* it8, cmsUInt32Number size)
     cmsUInt8Number* ptr;
 
     size = _cmsALIGNMEM(size);
+    if (size == 0) return NULL;
 
     if (size > Free) {
 
+        cmsUInt8Number* new_block;
+
         if (it8 -> Allocator.BlockSize == 0)
 
                 it8 -> Allocator.BlockSize = 20*1024;
@@ -1248,7 +1268,11 @@ void* AllocChunk(cmsIT8* it8, cmsUInt32Number size)
                 it8 ->Allocator.BlockSize = size;
 
         it8 ->Allocator.Used = 0;
-        it8 ->Allocator.Block = (cmsUInt8Number*) AllocBigBlock(it8, it8 ->Allocator.BlockSize);
+        new_block = (cmsUInt8Number*)AllocBigBlock(it8, it8->Allocator.BlockSize);
+        if (new_block == NULL)
+            return NULL;
+
+        it8->Allocator.Block = new_block;
     }
 
     if (it8->Allocator.Block == NULL)
@@ -1258,7 +1282,6 @@ void* AllocChunk(cmsIT8* it8, cmsUInt32Number size)
     it8 ->Allocator.Used += size;
 
     return (void*) ptr;
-
 }
 
 
@@ -1266,9 +1289,12 @@ void* AllocChunk(cmsIT8* it8, cmsUInt32Number size)
 static
 char *AllocString(cmsIT8* it8, const char* str)
 {
-    cmsUInt32Number Size = (cmsUInt32Number) strlen(str)+1;
+    cmsUInt32Number Size;
     char *ptr;
 
+    if (str == NULL) return NULL;
+
+    Size = (cmsUInt32Number)strlen(str) + 1;
 
     ptr = (char *) AllocChunk(it8, Size);
     if (ptr) memcpy(ptr, str, Size-1);
@@ -1404,10 +1430,13 @@ KEYVALUE* AddAvailableSampleID(cmsIT8* it8, const char* Key)
 
 
 static
-void AllocTable(cmsIT8* it8)
+cmsBool AllocTable(cmsIT8* it8)
 {
     TABLE* t;
 
+    if (it8->TablesCount >= (MAXTABLES-1))
+        return FALSE;
+
     t = it8 ->Tab + it8 ->TablesCount;
 
     t->HeaderList = NULL;
@@ -1415,6 +1444,7 @@ void AllocTable(cmsIT8* it8)
     t->Data       = NULL;
 
     it8 ->TablesCount++;
+    return TRUE;
 }
 
 
@@ -1426,7 +1456,10 @@ cmsInt32Number CMSEXPORT cmsIT8SetTable(cmsHANDLE  IT8, cmsUInt32Number nTable)
 
          if (nTable == it8 ->TablesCount) {
 
-             AllocTable(it8);
+             if (!AllocTable(it8)) {
+                 SynError(it8, "Too many tables");
+                 return -1;
+             }
          }
          else {
              SynError(it8, "Table %d is out of sequence", nTable);
@@ -1610,8 +1643,8 @@ cmsInt32Number satoi(const char* b)
     if (b == NULL) return 0;
 
     n = atoi(b);
-    if (n > 0x7fffffffL) return 0x7fffffffL;
-    if (n < -0x7ffffffeL) return -0x7ffffffeL;
+    if (n > 0x7ffffff0L) return 0x7ffffff0L;
+    if (n < -0x7ffffff0L) return -0x7ffffff0L;
 
     return (cmsInt32Number)n;
 }
@@ -1620,22 +1653,26 @@ cmsInt32Number satoi(const char* b)
 static
 cmsBool AllocateDataFormat(cmsIT8* it8)
 {
+    cmsUInt32Number size;
+
     TABLE* t = GetTable(it8);
 
-    if (t -> DataFormat) return TRUE;    // Already allocated
+    if (t->DataFormat) return TRUE;    // Already allocated
 
-    t -> nSamples  = satoi(cmsIT8GetProperty(it8, "NUMBER_OF_FIELDS"));
+    t->nSamples = satoi(cmsIT8GetProperty(it8, "NUMBER_OF_FIELDS"));
 
-    if (t -> nSamples <= 0) {
+    if (t->nSamples <= 0 || t->nSamples > 0x7ffe) {
 
-        SynError(it8, "AllocateDataFormat: Unknown NUMBER_OF_FIELDS");
+        SynError(it8, "Wrong NUMBER_OF_FIELDS");
         return FALSE;
-        }
+    }
 
-    t -> DataFormat = (char**) AllocChunk (it8, ((cmsUInt32Number) t->nSamples + 1) * sizeof(char *));
+    size = ((cmsUInt32Number)t->nSamples + 1) * sizeof(char*);
+
+    t->DataFormat = (char**)AllocChunk(it8, size);
     if (t->DataFormat == NULL) {
 
-        SynError(it8, "AllocateDataFormat: Unable to allocate dataFormat array");
+        SynError(it8, "Unable to allocate dataFormat array");
         return FALSE;
     }
 
@@ -1664,7 +1701,7 @@ cmsBool SetDataFormat(cmsIT8* it8, int n, const char *label)
             return FALSE;
     }
 
-    if (n > t -> nSamples) {
+    if (n >= t -> nSamples) {
         SynError(it8, "More than NUMBER_OF_FIELDS fields.");
         return FALSE;
     }
@@ -1713,13 +1750,14 @@ cmsBool AllocateDataSet(cmsIT8* it8)
     t-> nSamples   = satoi(cmsIT8GetProperty(it8, "NUMBER_OF_FIELDS"));
     t-> nPatches   = satoi(cmsIT8GetProperty(it8, "NUMBER_OF_SETS"));
 
-    if (t -> nSamples < 0 || t->nSamples > 0x7ffe || t->nPatches < 0 || t->nPatches > 0x7ffe)
+    if (t -> nSamples < 0 || t->nSamples > 0x7ffe || t->nPatches < 0 || t->nPatches > 0x7ffe ||
+        (t->nPatches * t->nSamples) > 200000)
     {
         SynError(it8, "AllocateDataSet: too much data");
         return FALSE;
     }
     else {
-        // Some dumb analizers warns of possible overflow here, just take a look couple of lines above.
+        // Some dumb analyzers warns of possible overflow here, just take a look couple of lines above.
         t->Data = (char**)AllocChunk(it8, ((cmsUInt32Number)t->nSamples + 1) * ((cmsUInt32Number)t->nPatches + 1) * sizeof(char*));
         if (t->Data == NULL) {
 
@@ -1748,8 +1786,11 @@ char* GetData(cmsIT8* it8, int nSet, int nField)
 static
 cmsBool SetData(cmsIT8* it8, int nSet, int nField, const char *Val)
 {
+    char* ptr;
+
     TABLE* t = GetTable(it8);
 
+
     if (!t->Data) {
         if (!AllocateDataSet(it8)) return FALSE;
     }
@@ -1766,7 +1807,11 @@ cmsBool SetData(cmsIT8* it8, int nSet, int nField, const char *Val)
 
     }
 
-    t->Data [nSet * t -> nSamples + nField] = AllocString(it8, Val);
+    ptr = AllocString(it8, Val);
+    if (ptr == NULL)
+        return FALSE;
+
+    t->Data [nSet * t -> nSamples + nField] = ptr;
     return TRUE;
 }
 
@@ -2121,7 +2166,7 @@ cmsBool DataSection (cmsIT8* it8)
         if (!AllocateDataSet(it8)) return FALSE;
     }
 
-    while (it8->sy != SEND_DATA && it8->sy != SEOF)
+    while (it8->sy != SEND_DATA && it8->sy != SEOF && it8->sy != SSYNERROR)
     {
         if (iField >= t -> nSamples) {
             iField = 0;
@@ -2129,7 +2174,7 @@ cmsBool DataSection (cmsIT8* it8)
 
         }
 
-        if (it8->sy != SEND_DATA && it8->sy != SEOF) {
+        if (it8->sy != SEND_DATA && it8->sy != SEOF && it8->sy != SSYNERROR) {
 
             switch (it8->sy)
             {
@@ -2225,8 +2270,8 @@ cmsBool HeaderSection(cmsIT8* it8)
             if (!GetVal(it8, Buffer, MAXSTR - 1, "Property data expected")) return FALSE;
 
             if (Key->WriteAs != WRITE_PAIR) {
-                AddToList(it8, &GetTable(it8)->HeaderList, VarName, NULL, Buffer,
-                    (it8->sy == SSTRING) ? WRITE_STRINGIFY : WRITE_UNCOOKED);
+                if (AddToList(it8, &GetTable(it8)->HeaderList, VarName, NULL, Buffer,
+                    (it8->sy == SSTRING) ? WRITE_STRINGIFY : WRITE_UNCOOKED) == NULL) return FALSE;
             }
             else {
                 const char *Subkey;
@@ -2332,9 +2377,10 @@ cmsBool ParseIT8(cmsIT8* it8, cmsBool nosheet)
 
                     if (!DataSection(it8)) return FALSE;
 
-                    if (it8 -> sy != SEOF) {
+                    if (it8 -> sy != SEOF && it8->sy != SSYNERROR) {
+
+                            if (!AllocTable(it8)) return FALSE;
 
-                            AllocTable(it8);
                             it8 ->nTable = it8 ->TablesCount - 1;
 
                             // Read sheet type if present. We only support identifier and string.
@@ -3064,7 +3110,8 @@ cmsBool ParseCube(cmsIT8* cube, cmsStage** Shaper, cmsStage** CLUT, char title[]
 
     InSymbol(cube);
 
-    while (cube->sy != SEOF) {
+    while (cube->sy != SEOF && cube->sy != SSYNERROR) {
+
         switch (cube->sy)
         {
         // Set profile description
diff --git a/src/java.desktop/share/native/liblcms/cmscnvrt.c b/src/java.desktop/share/native/liblcms/cmscnvrt.c
index d18865b15b9..9f8619cb9da 100644
--- a/src/java.desktop/share/native/liblcms/cmscnvrt.c
+++ b/src/java.desktop/share/native/liblcms/cmscnvrt.c
@@ -30,7 +30,7 @@
 //---------------------------------------------------------------------------------
 //
 //  Little Color Management System
-//  Copyright (c) 1998-2023 Marti Maria Saguer
+//  Copyright (c) 1998-2024 Marti Maria Saguer
 //
 // Permission is hereby granted, free of charge, to any person obtaining
 // a copy of this software and associated documentation files (the "Software"),
@@ -750,7 +750,6 @@ static
 cmsBool is_cmyk_devicelink(cmsHPROFILE hProfile)
 {
     return cmsGetDeviceClass(hProfile) == cmsSigLinkClass &&
-            cmsGetColorSpace(hProfile) == cmsSigCmykData &&
             cmsGetColorSpace(hProfile) == cmsSigCmykData;
 }
 
diff --git a/src/java.desktop/share/native/liblcms/cmserr.c b/src/java.desktop/share/native/liblcms/cmserr.c
index 9fb7db89c9a..d421c550d32 100644
--- a/src/java.desktop/share/native/liblcms/cmserr.c
+++ b/src/java.desktop/share/native/liblcms/cmserr.c
@@ -30,7 +30,7 @@
 //---------------------------------------------------------------------------------
 //
 //  Little Color Management System
-//  Copyright (c) 1998-2023 Marti Maria Saguer
+//  Copyright (c) 1998-2024 Marti Maria Saguer
 //
 // Permission is hereby granted, free of charge, to any person obtaining
 // a copy of this software and associated documentation files (the "Software"),
diff --git a/src/java.desktop/share/native/liblcms/cmsgamma.c b/src/java.desktop/share/native/liblcms/cmsgamma.c
index 8e489a43c55..773858b0c1f 100644
--- a/src/java.desktop/share/native/liblcms/cmsgamma.c
+++ b/src/java.desktop/share/native/liblcms/cmsgamma.c
@@ -30,7 +30,7 @@
 //---------------------------------------------------------------------------------
 //
 //  Little Color Management System
-//  Copyright (c) 1998-2023 Marti Maria Saguer
+//  Copyright (c) 1998-2024 Marti Maria Saguer
 //
 // Permission is hereby granted, free of charge, to any person obtaining
 // a copy of this software and associated documentation files (the "Software"),
diff --git a/src/java.desktop/share/native/liblcms/cmsgmt.c b/src/java.desktop/share/native/liblcms/cmsgmt.c
index e9ee73b52cd..03ac70202a5 100644
--- a/src/java.desktop/share/native/liblcms/cmsgmt.c
+++ b/src/java.desktop/share/native/liblcms/cmsgmt.c
@@ -30,7 +30,7 @@
 //---------------------------------------------------------------------------------
 //
 //  Little Color Management System
-//  Copyright (c) 1998-2021 Marti Maria Saguer
+//  Copyright (c) 1998-2024 Marti Maria Saguer
 //
 // Permission is hereby granted, free of charge, to any person obtaining
 // a copy of this software and associated documentation files (the "Software"),
@@ -327,8 +327,9 @@ cmsPipeline* _cmsCreateGamutCheckPipeline(cmsContext ContextID,
     cmsUInt32Number dwFormat;
     GAMUTCHAIN Chain;
     cmsUInt32Number nGridpoints;
-    cmsInt32Number nChannels;
+    cmsInt32Number nChannels, nInputChannels;
     cmsColorSpaceSignature ColorSpace;
+    cmsColorSpaceSignature InputColorSpace;
     cmsUInt32Number i;
     cmsHPROFILE ProfileList[256];
     cmsBool     BPCList[256];
@@ -374,11 +375,13 @@ cmsPipeline* _cmsCreateGamutCheckPipeline(cmsContext ContextID,
     AdaptationList[nGamutPCSposition] = 1.0;
     IntentList[nGamutPCSposition] = INTENT_RELATIVE_COLORIMETRIC;
 
-
     ColorSpace  = cmsGetColorSpace(hGamut);
     nChannels   = cmsChannelsOfColorSpace(ColorSpace);
     nGridpoints = _cmsReasonableGridpointsByColorspace(ColorSpace, cmsFLAGS_HIGHRESPRECALC);
-    dwFormat    = (CHANNELS_SH(nChannels)|BYTES_SH(2));
+
+    InputColorSpace = cmsGetColorSpace(ProfileList[0]);
+    nInputChannels  = cmsChannelsOfColorSpace(InputColorSpace);
+    dwFormat        = (CHANNELS_SH(nInputChannels)|BYTES_SH(2));
 
     // 16 bits to Lab double
     Chain.hInput = cmsCreateExtendedTransform(ContextID,
diff --git a/src/java.desktop/share/native/liblcms/cmshalf.c b/src/java.desktop/share/native/liblcms/cmshalf.c
index 5babb063eb0..7e5f7a3c7e0 100644
--- a/src/java.desktop/share/native/liblcms/cmshalf.c
+++ b/src/java.desktop/share/native/liblcms/cmshalf.c
@@ -30,7 +30,7 @@
 //---------------------------------------------------------------------------------
 //
 //  Little Color Management System
-//  Copyright (c) 1998-2023 Marti Maria Saguer
+//  Copyright (c) 1998-2024 Marti Maria Saguer
 //
 // Permission is hereby granted, free of charge, to any person obtaining
 // a copy of this software and associated documentation files (the "Software"),
diff --git a/src/java.desktop/share/native/liblcms/cmsintrp.c b/src/java.desktop/share/native/liblcms/cmsintrp.c
index 9837454df0b..43c47429c3c 100644
--- a/src/java.desktop/share/native/liblcms/cmsintrp.c
+++ b/src/java.desktop/share/native/liblcms/cmsintrp.c
@@ -30,7 +30,7 @@
 //---------------------------------------------------------------------------------
 //
 //  Little Color Management System
-//  Copyright (c) 1998-2023 Marti Maria Saguer
+//  Copyright (c) 1998-2024 Marti Maria Saguer
 //
 // Permission is hereby granted, free of charge, to any person obtaining
 // a copy of this software and associated documentation files (the "Software"),
@@ -524,7 +524,7 @@ void TrilinearInterpFloat(const cmsFloat32Number Input[],
     py = fclamp(Input[1]) * p->Domain[1];
     pz = fclamp(Input[2]) * p->Domain[2];
 
-    x0 = (int) floor(px); fx = px - (cmsFloat32Number) x0;  // We need full floor funcionality here
+    x0 = (int) floor(px); fx = px - (cmsFloat32Number) x0;  // We need full floor functionality here
     y0 = (int) floor(py); fy = py - (cmsFloat32Number) y0;
     z0 = (int) floor(pz); fz = pz - (cmsFloat32Number) z0;
 
diff --git a/src/java.desktop/share/native/liblcms/cmsio0.c b/src/java.desktop/share/native/liblcms/cmsio0.c
index 05baa9392e2..5258b7939d2 100644
--- a/src/java.desktop/share/native/liblcms/cmsio0.c
+++ b/src/java.desktop/share/native/liblcms/cmsio0.c
@@ -30,7 +30,7 @@
 //---------------------------------------------------------------------------------
 //
 //  Little Color Management System
-//  Copyright (c) 1998-2023 Marti Maria Saguer
+//  Copyright (c) 1998-2024 Marti Maria Saguer
 //
 // Permission is hereby granted, free of charge, to any person obtaining
 // a copy of this software and associated documentation files (the "Software"),
@@ -306,6 +306,11 @@ cmsIOHANDLER* CMSEXPORT cmsOpenIOhandlerFromMem(cmsContext ContextID, void *Buff
         fm = (FILEMEM*) _cmsMallocZero(ContextID, sizeof(FILEMEM));
         if (fm == NULL) goto Error;
 
+        if (Buffer == NULL) {
+            cmsSignalError(ContextID, cmsERROR_WRITE, "Couldn't write profile to NULL pointer");
+            goto Error;
+        }
+
         fm ->Block = (cmsUInt8Number*) Buffer;
         fm ->FreeBlockOnClose = FALSE;
         fm ->Size    = size;
diff --git a/src/java.desktop/share/native/liblcms/cmsio1.c b/src/java.desktop/share/native/liblcms/cmsio1.c
index e42d4d38987..48772c7cbde 100644
--- a/src/java.desktop/share/native/liblcms/cmsio1.c
+++ b/src/java.desktop/share/native/liblcms/cmsio1.c
@@ -30,7 +30,7 @@
 //---------------------------------------------------------------------------------
 //
 //  Little Color Management System
-//  Copyright (c) 1998-2023 Marti Maria Saguer
+//  Copyright (c) 1998-2024 Marti Maria Saguer
 //
 // Permission is hereby granted, free of charge, to any person obtaining
 // a copy of this software and associated documentation files (the "Software"),
diff --git a/src/java.desktop/share/native/liblcms/cmslut.c b/src/java.desktop/share/native/liblcms/cmslut.c
index b544c948625..3cf4e8cac5a 100644
--- a/src/java.desktop/share/native/liblcms/cmslut.c
+++ b/src/java.desktop/share/native/liblcms/cmslut.c
@@ -30,7 +30,7 @@
 //---------------------------------------------------------------------------------
 //
 //  Little Color Management System
-//  Copyright (c) 1998-2023 Marti Maria Saguer
+//  Copyright (c) 1998-2024 Marti Maria Saguer
 //
 // Permission is hereby granted, free of charge, to any person obtaining
 // a copy of this software and associated documentation files (the "Software"),
@@ -1109,7 +1109,7 @@ cmsStage* _cmsStageNormalizeFromLabFloat(cmsContext ContextID)
     return mpe;
 }
 
-// Fom XYZ to floating point PCS
+// From XYZ to floating point PCS
 cmsStage* _cmsStageNormalizeFromXyzFloat(cmsContext ContextID)
 {
 #define n (32768.0/65535.0)
diff --git a/src/java.desktop/share/native/liblcms/cmsmd5.c b/src/java.desktop/share/native/liblcms/cmsmd5.c
index 01aa44de85a..d9b9a4e5260 100644
--- a/src/java.desktop/share/native/liblcms/cmsmd5.c
+++ b/src/java.desktop/share/native/liblcms/cmsmd5.c
@@ -30,7 +30,7 @@
 //---------------------------------------------------------------------------------
 //
 //  Little Color Management System
-//  Copyright (c) 1998-2023 Marti Maria Saguer
+//  Copyright (c) 1998-2024 Marti Maria Saguer
 //
 // Permission is hereby granted, free of charge, to any person obtaining
 // a copy of this software and associated documentation files (the "Software"),
@@ -280,8 +280,8 @@ void CMSEXPORT cmsMD5finish(cmsProfileID* ProfileID,  cmsHANDLE Handle)
 
 
 // Assuming io points to an ICC profile, compute and store MD5 checksum
-// In the header, rendering intentent, attributes and ID should be set to zero
-// before computing MD5 checksum (per 6.1.13 in ICC spec)
+// In the header, rendering intentent, flags and ID should be set to zero
+// before computing MD5 checksum (per 7.2.18 of ICC spec 4.4)
 
 cmsBool CMSEXPORT cmsMD5computeID(cmsHPROFILE hProfile)
 {
@@ -299,8 +299,8 @@ cmsBool CMSEXPORT cmsMD5computeID(cmsHPROFILE hProfile)
     // Save a copy of the profile header
     memmove(&Keep, Icc, sizeof(_cmsICCPROFILE));
 
-    // Set RI, attributes and ID
-    memset(&Icc ->attributes, 0, sizeof(Icc ->attributes));
+    // Set RI, flags and ID
+    Icc ->flags = 0;
     Icc ->RenderingIntent = 0;
     memset(&Icc ->ProfileID, 0, sizeof(Icc ->ProfileID));
 
diff --git a/src/java.desktop/share/native/liblcms/cmsmtrx.c b/src/java.desktop/share/native/liblcms/cmsmtrx.c
index 599c290bd70..841da662a10 100644
--- a/src/java.desktop/share/native/liblcms/cmsmtrx.c
+++ b/src/java.desktop/share/native/liblcms/cmsmtrx.c
@@ -30,7 +30,7 @@
 //---------------------------------------------------------------------------------
 //
 //  Little Color Management System
-//  Copyright (c) 1998-2023 Marti Maria Saguer
+//  Copyright (c) 1998-2024 Marti Maria Saguer
 //
 // Permission is hereby granted, free of charge, to any person obtaining
 // a copy of this software and associated documentation files (the "Software"),
diff --git a/src/java.desktop/share/native/liblcms/cmsnamed.c b/src/java.desktop/share/native/liblcms/cmsnamed.c
index d3cd97d4aea..451bfe9f34d 100644
--- a/src/java.desktop/share/native/liblcms/cmsnamed.c
+++ b/src/java.desktop/share/native/liblcms/cmsnamed.c
@@ -30,7 +30,7 @@
 //---------------------------------------------------------------------------------
 //
 //  Little Color Management System
-//  Copyright (c) 1998-2023 Marti Maria Saguer
+//  Copyright (c) 1998-2024 Marti Maria Saguer
 //
 // Permission is hereby granted, free of charge, to any person obtaining
 // a copy of this software and associated documentation files (the "Software"),
@@ -598,7 +598,7 @@ cmsUInt32Number CMSEXPORT cmsMLUgetASCII(const cmsMLU* mlu,
     if (BufferSize < ASCIIlen + 1)
         ASCIIlen = BufferSize - 1;
 
-    // Precess each character
+    // Process each character
     for (i=0; i < ASCIIlen; i++) {
 
         wchar_t wc = Wide[i];
diff --git a/src/java.desktop/share/native/liblcms/cmsopt.c b/src/java.desktop/share/native/liblcms/cmsopt.c
index 421a4f4a701..767008e68c5 100644
--- a/src/java.desktop/share/native/liblcms/cmsopt.c
+++ b/src/java.desktop/share/native/liblcms/cmsopt.c
@@ -30,7 +30,7 @@
 //---------------------------------------------------------------------------------
 //
 //  Little Color Management System
-//  Copyright (c) 1998-2023 Marti Maria Saguer
+//  Copyright (c) 1998-2024 Marti Maria Saguer
 //
 // Permission is hereby granted, free of charge, to any person obtaining
 // a copy of this software and associated documentation files (the "Software"),
diff --git a/src/java.desktop/share/native/liblcms/cmspack.c b/src/java.desktop/share/native/liblcms/cmspack.c
index fc875995a80..d430e73051d 100644
--- a/src/java.desktop/share/native/liblcms/cmspack.c
+++ b/src/java.desktop/share/native/liblcms/cmspack.c
@@ -30,7 +30,7 @@
 //---------------------------------------------------------------------------------
 //
 //  Little Color Management System
-//  Copyright (c) 1998-2023 Marti Maria Saguer
+//  Copyright (c) 1998-2024 Marti Maria Saguer
 //
 // Permission is hereby granted, free of charge, to any person obtaining
 // a copy of this software and associated documentation files (the "Software"),
@@ -217,7 +217,7 @@ cmsUInt8Number* UnrollPlanarBytes(CMSREGISTER _cmsTRANSFORM* info,
     else
     {
         if (Premul && Extra)
-            alpha_factor = _cmsToFixedDomain(FROM_8_TO_16(accum[(nChan) * Stride]));
+            alpha_factor = _cmsToFixedDomain(FROM_8_TO_16(accum[nChan * Stride]));
     }
 
     for (i=0; i < nChan; i++) {
@@ -606,8 +606,8 @@ cmsUInt8Number* UnrollAnyWordsPremul(CMSREGISTER _cmsTRANSFORM* info,
    cmsUInt32Number ExtraFirst  = DoSwap ^ SwapFirst;
    cmsUInt32Number i;
 
-   cmsUInt16Number alpha = (ExtraFirst ? accum[0] : accum[nChan - 1]);
-   cmsUInt32Number alpha_factor = _cmsToFixedDomain(FROM_8_TO_16(alpha));
+   cmsUInt16Number alpha = (ExtraFirst ? ((cmsUInt16Number*)accum)[0] : ((cmsUInt16Number*)accum)[nChan]);
+   cmsUInt32Number alpha_factor = _cmsToFixedDomain(alpha);
 
     if (ExtraFirst) {
         accum += sizeof(cmsUInt16Number);
@@ -691,8 +691,8 @@ cmsUInt8Number* UnrollPlanarWordsPremul(CMSREGISTER _cmsTRANSFORM* info,
     cmsUInt32Number ExtraFirst = DoSwap ^ SwapFirst;
     cmsUInt8Number* Init = accum;
 
-    cmsUInt16Number  alpha = (ExtraFirst ? accum[0] : accum[(nChan - 1) * Stride]);
-    cmsUInt32Number alpha_factor = _cmsToFixedDomain(FROM_8_TO_16(alpha));
+    cmsUInt16Number alpha = (ExtraFirst ? ((cmsUInt16Number*)accum)[0] : ((cmsUInt16Number*)accum)[nChan * Stride / 2]);
+    cmsUInt32Number alpha_factor = _cmsToFixedDomain(alpha);
 
     if (ExtraFirst) {
         accum += Stride;
@@ -1107,8 +1107,7 @@ cmsINLINE cmsBool IsInkSpace(cmsUInt32Number Type)
 }
 
 // Return the size in bytes of a given formatter
-static
-cmsUInt32Number PixelSize(cmsUInt32Number Format)
+cmsINLINE cmsUInt32Number PixelSize(cmsUInt32Number Format)
 {
     cmsUInt32Number fmt_bytes = T_BYTES(Format);
 
@@ -1454,7 +1453,7 @@ cmsUInt8Number* UnrollDoublesToFloat(_cmsTRANSFORM* info,
     if (Premul && Extra)
     {
         if (Planar)
-            alpha_factor = (ExtraFirst ? ptr[0] : ptr[(nChan) * Stride]) / maximum;
+            alpha_factor = (ExtraFirst ? ptr[0] : ptr[nChan * Stride]) / maximum;
         else
             alpha_factor = (ExtraFirst ? ptr[0] : ptr[nChan]) / maximum;
     }
@@ -3052,6 +3051,7 @@ cmsUInt8Number* PackWordsFromFloat(_cmsTRANSFORM* info,
     if (ExtraFirst)
         start = Extra;
 
+    Stride /= 2;
     for (i = 0; i < nChan; i++) {
 
         cmsUInt32Number index = DoSwap ? (nChan - i - 1) : i;
@@ -3115,7 +3115,7 @@ cmsUInt8Number* PackFloatsFromFloat(_cmsTRANSFORM* info,
                      v = maximum - v;
 
               if (Planar)
-                     ((cmsFloat32Number*)output)[(i + start)* Stride] = (cmsFloat32Number)v;
+                     ((cmsFloat32Number*)output)[(i + start) * Stride] = (cmsFloat32Number)v;
               else
                      ((cmsFloat32Number*)output)[i + start] = (cmsFloat32Number)v;
        }
@@ -3455,7 +3455,7 @@ cmsUInt8Number* UnrollHalfToFloat(_cmsTRANSFORM* info,
     cmsUInt32Number i, start = 0;
     cmsFloat32Number maximum = IsInkSpace(info ->InputFormat) ? 100.0F : 1.0F;
 
-    Stride /= PixelSize(info->OutputFormat);
+    Stride /= PixelSize(info->InputFormat);
 
     if (ExtraFirst)
             start = Extra;
@@ -4062,6 +4062,9 @@ cmsUInt32Number CMSEXPORT cmsFormatterForColorspaceOfProfile(cmsHPROFILE hProfil
     // Unsupported color space?
     if (nOutputChans < 0) return 0;
 
+    // Fix float spaces
+    nBytes &= 7;
+
     // Create a fake formatter for result
     return FLOAT_SH(Float) | COLORSPACE_SH(ColorSpaceBits) | BYTES_SH(nBytes) | CHANNELS_SH(nOutputChans);
 }
@@ -4079,6 +4082,9 @@ cmsUInt32Number CMSEXPORT cmsFormatterForPCSOfProfile(cmsHPROFILE hProfile, cmsU
     // Unsupported color space?
     if (nOutputChans < 0) return 0;
 
+    // Fix float spaces
+    nBytes &= 7;
+
     // Create a fake formatter for result
     return FLOAT_SH(Float) | COLORSPACE_SH(ColorSpaceBits) | BYTES_SH(nBytes) | CHANNELS_SH(nOutputChans);
 }
diff --git a/src/java.desktop/share/native/liblcms/cmspcs.c b/src/java.desktop/share/native/liblcms/cmspcs.c
index c4739840053..5f1b1f0d8e6 100644
--- a/src/java.desktop/share/native/liblcms/cmspcs.c
+++ b/src/java.desktop/share/native/liblcms/cmspcs.c
@@ -30,7 +30,7 @@
 //---------------------------------------------------------------------------------
 //
 //  Little Color Management System
-//  Copyright (c) 1998-2023 Marti Maria Saguer
+//  Copyright (c) 1998-2024 Marti Maria Saguer
 //
 // Permission is hereby granted, free of charge, to any person obtaining
 // a copy of this software and associated documentation files (the "Software"),
diff --git a/src/java.desktop/share/native/liblcms/cmsplugin.c b/src/java.desktop/share/native/liblcms/cmsplugin.c
index f84e0172c81..aaad39f52b0 100644
--- a/src/java.desktop/share/native/liblcms/cmsplugin.c
+++ b/src/java.desktop/share/native/liblcms/cmsplugin.c
@@ -30,7 +30,7 @@
 //---------------------------------------------------------------------------------
 //
 //  Little Color Management System
-//  Copyright (c) 1998-2023 Marti Maria Saguer
+//  Copyright (c) 1998-2024 Marti Maria Saguer
 //
 // Permission is hereby granted, free of charge, to any person obtaining
 // a copy of this software and associated documentation files (the "Software"),
@@ -935,7 +935,10 @@ cmsContext CMSEXPORT cmsDupContext(cmsContext ContextID, void* NewUserData)
     if (!InitContextMutex()) return NULL;
 
     // Setup default memory allocators
-    memcpy(&ctx->DefaultMemoryManager, &src->DefaultMemoryManager, sizeof(ctx->DefaultMemoryManager));
+    if (ContextID == NULL)
+        _cmsInstallAllocFunctions(NULL, &ctx->DefaultMemoryManager);
+    else
+        memcpy(&ctx->DefaultMemoryManager, &src->DefaultMemoryManager, sizeof(ctx->DefaultMemoryManager));
 
     // Maintain the linked list
     _cmsEnterCriticalSectionPrimitive(&_cmsContextPoolHeadMutex);
diff --git a/src/java.desktop/share/native/liblcms/cmsps2.c b/src/java.desktop/share/native/liblcms/cmsps2.c
index 9a2ab464f31..476817e9c1a 100644
--- a/src/java.desktop/share/native/liblcms/cmsps2.c
+++ b/src/java.desktop/share/native/liblcms/cmsps2.c
@@ -30,7 +30,7 @@
 //---------------------------------------------------------------------------------
 //
 //  Little Color Management System
-//  Copyright (c) 1998-2023 Marti Maria Saguer
+//  Copyright (c) 1998-2024 Marti Maria Saguer
 //
 // Permission is hereby granted, free of charge, to any person obtaining
 // a copy of this software and associated documentation files (the "Software"),
@@ -494,7 +494,7 @@ void Emit1Gamma(cmsIOHANDLER* m, cmsToneCurve* Table)
     // Bounds check
     EmitRangeCheck(m);
 
-    // Emit intepolation code
+    // Emit interpolation code
 
     // PostScript code                      Stack
     // ===============                      ========================
@@ -618,7 +618,7 @@ int OutputValueSampler(CMSREGISTER const cmsUInt16Number In[], CMSREGISTER cmsUI
     }
 
 
-    // Hadle the parenthesis on rows
+    // Handle the parenthesis on rows
 
     if (In[0] != sc ->FirstComponent) {
 
@@ -694,8 +694,10 @@ void WriteCLUT(cmsIOHANDLER* m, cmsStage* mpe, const char* PreMaj,
 
         _cmsIOPrintf(m, "[");
 
-        for (i = 0; i < sc.Pipeline->Params->nInputs; i++)
-            _cmsIOPrintf(m, " %d ", sc.Pipeline->Params->nSamples[i]);
+        for (i = 0; i < sc.Pipeline->Params->nInputs; i++) {
+            if (i < MAX_INPUT_DIMENSIONS)
+                _cmsIOPrintf(m, " %d ", sc.Pipeline->Params->nSamples[i]);
+        }
 
         _cmsIOPrintf(m, " [\n");
 
@@ -869,13 +871,13 @@ cmsToneCurve* ExtractGray2Y(cmsContext ContextID, cmsHPROFILE hProfile, cmsUInt3
 // a more perceptually uniform space... I do choose Lab.
 
 static
-int WriteInputLUT(cmsIOHANDLER* m, cmsHPROFILE hProfile, cmsUInt32Number Intent, cmsUInt32Number dwFlags)
+cmsBool WriteInputLUT(cmsIOHANDLER* m, cmsHPROFILE hProfile, cmsUInt32Number Intent, cmsUInt32Number dwFlags)
 {
     cmsHPROFILE hLab;
     cmsHTRANSFORM xform;
     cmsUInt32Number nChannels;
     cmsUInt32Number InputFormat;
-    int rc;
+
     cmsHPROFILE Profiles[2];
     cmsCIEXYZ BlackPointAdaptedToD50;
 
@@ -900,7 +902,7 @@ int WriteInputLUT(cmsIOHANDLER* m, cmsHPROFILE hProfile, cmsUInt32Number Intent,
     if (xform == NULL) {
 
         cmsSignalError(m ->ContextID, cmsERROR_COLORSPACE_CHECK, "Cannot create transform Profile -> Lab");
-        return 0;
+        return FALSE;
     }
 
     // Only 1, 3 and 4 channels are allowed
@@ -919,29 +921,35 @@ int WriteInputLUT(cmsIOHANDLER* m, cmsHPROFILE hProfile, cmsUInt32Number Intent,
             cmsUInt32Number OutFrm = TYPE_Lab_16;
             cmsPipeline* DeviceLink;
             _cmsTRANSFORM* v = (_cmsTRANSFORM*) xform;
+            cmsBool rc;
 
             DeviceLink = cmsPipelineDup(v ->Lut);
-            if (DeviceLink == NULL) return 0;
+            if (DeviceLink == NULL) {
+                cmsDeleteTransform(xform);
+                return FALSE;
+            }
 
             dwFlags |= cmsFLAGS_FORCE_CLUT;
             _cmsOptimizePipeline(m->ContextID, &DeviceLink, Intent, &InputFormat, &OutFrm, &dwFlags);
 
             rc = EmitCIEBasedDEF(m, DeviceLink, Intent, &BlackPointAdaptedToD50);
             cmsPipelineFree(DeviceLink);
-            if (rc == 0) return 0;
+            if (!rc) {
+                cmsDeleteTransform(xform);
+                return FALSE;
+            }
             }
             break;
 
     default:
 
+        cmsDeleteTransform(xform);
         cmsSignalError(m ->ContextID, cmsERROR_COLORSPACE_CHECK, "Only 3, 4 channels are supported for CSA. This profile has %d channels.", nChannels);
-        return 0;
+        return FALSE;
     }
 
-
     cmsDeleteTransform(xform);
-
-    return 1;
+    return TRUE;
 }
 
 static
@@ -1284,7 +1292,7 @@ void EmitXYZ2Lab(cmsIOHANDLER* m)
 // 8 bits.
 
 static
-int WriteOutputLUT(cmsIOHANDLER* m, cmsHPROFILE hProfile, cmsUInt32Number Intent, cmsUInt32Number dwFlags)
+cmsBool WriteOutputLUT(cmsIOHANDLER* m, cmsHPROFILE hProfile, cmsUInt32Number Intent, cmsUInt32Number dwFlags)
 {
     cmsHPROFILE hLab;
     cmsHTRANSFORM xform;
@@ -1302,7 +1310,7 @@ int WriteOutputLUT(cmsIOHANDLER* m, cmsHPROFILE hProfile, cmsUInt32Number Intent
     cmsStage* first;
 
     hLab = cmsCreateLab4ProfileTHR(m ->ContextID, NULL);
-    if (hLab == NULL) return 0;
+    if (hLab == NULL) return FALSE;
 
     OutputFormat = cmsFormatterForColorspaceOfProfile(hProfile, 2, FALSE);
     nChannels    = T_CHANNELS(OutputFormat);
@@ -1327,7 +1335,7 @@ int WriteOutputLUT(cmsIOHANDLER* m, cmsHPROFILE hProfile, cmsUInt32Number Intent
 
     if (xform == NULL) {
         cmsSignalError(m ->ContextID, cmsERROR_COLORSPACE_CHECK, "Cannot create transform Lab -> Profile in CRD creation");
-        return 0;
+        return FALSE;
     }
 
     // Get a copy of the internal devicelink
@@ -1335,17 +1343,22 @@ int WriteOutputLUT(cmsIOHANDLER* m, cmsHPROFILE hProfile, cmsUInt32Number Intent
     DeviceLink = cmsPipelineDup(v ->Lut);
     if (DeviceLink == NULL) {
         cmsDeleteTransform(xform);
-        return 0;
+        cmsSignalError(m->ContextID, cmsERROR_CORRUPTION_DETECTED, "Cannot access link for CRD");
+        return FALSE;
     }
 
      // We need a CLUT
     dwFlags |= cmsFLAGS_FORCE_CLUT;
-    _cmsOptimizePipeline(m->ContextID, &DeviceLink, RelativeEncodingIntent, &InFrm, &OutputFormat, &dwFlags);
+    if (!_cmsOptimizePipeline(m->ContextID, &DeviceLink, RelativeEncodingIntent, &InFrm, &OutputFormat, &dwFlags)) {
+        cmsPipelineFree(DeviceLink);
+        cmsDeleteTransform(xform);
+        cmsSignalError(m->ContextID, cmsERROR_CORRUPTION_DETECTED, "Cannot create CLUT table for CRD");
+        return FALSE;
+    }
 
     _cmsIOPrintf(m, "<<\n");
     _cmsIOPrintf(m, "/ColorRenderingType 1\n");
 
-
     cmsDetectBlackPoint(&BlackPointAdaptedToD50, hProfile, Intent, 0);
 
     // Emit headers, etc.
@@ -1367,6 +1380,13 @@ int WriteOutputLUT(cmsIOHANDLER* m, cmsHPROFILE hProfile, cmsUInt32Number Intent
 
     first = cmsPipelineGetPtrToFirstStage(DeviceLink);
     if (first != NULL) {
+        if (first->Type != cmsSigCLutElemType) {
+            cmsPipelineFree(DeviceLink);
+            cmsDeleteTransform(xform);
+            cmsSignalError(m->ContextID, cmsERROR_CORRUPTION_DETECTED, "Cannot create CLUT, revise your flags!");
+            return FALSE;
+        }
+
         WriteCLUT(m, first, "<", ">\n", "", "", lFixWhite, ColorSpace);
     }
 
@@ -1389,7 +1409,7 @@ int WriteOutputLUT(cmsIOHANDLER* m, cmsHPROFILE hProfile, cmsUInt32Number Intent
     cmsPipelineFree(DeviceLink);
     cmsDeleteTransform(xform);
 
-    return 1;
+    return TRUE;
 }
 
 
diff --git a/src/java.desktop/share/native/liblcms/cmssamp.c b/src/java.desktop/share/native/liblcms/cmssamp.c
index 74f5f4bff29..ca5c4a9d693 100644
--- a/src/java.desktop/share/native/liblcms/cmssamp.c
+++ b/src/java.desktop/share/native/liblcms/cmssamp.c
@@ -30,7 +30,7 @@
 //---------------------------------------------------------------------------------
 //
 //  Little Color Management System
-//  Copyright (c) 1998-2023 Marti Maria Saguer
+//  Copyright (c) 1998-2024 Marti Maria Saguer
 //
 // Permission is hereby granted, free of charge, to any person obtaining
 // a copy of this software and associated documentation files (the "Software"),
diff --git a/src/java.desktop/share/native/liblcms/cmssm.c b/src/java.desktop/share/native/liblcms/cmssm.c
index 3e1486ae3ae..e2a810a2669 100644
--- a/src/java.desktop/share/native/liblcms/cmssm.c
+++ b/src/java.desktop/share/native/liblcms/cmssm.c
@@ -30,7 +30,7 @@
 //---------------------------------------------------------------------------------
 //
 //  Little Color Management System
-//  Copyright (c) 1998-2023 Marti Maria Saguer
+//  Copyright (c) 1998-2024 Marti Maria Saguer
 //
 // Permission is hereby granted, free of charge, to any person obtaining
 // a copy of this software and associated documentation files (the "Software"),
diff --git a/src/java.desktop/share/native/liblcms/cmstypes.c b/src/java.desktop/share/native/liblcms/cmstypes.c
index 862f393497a..22514f88226 100644
--- a/src/java.desktop/share/native/liblcms/cmstypes.c
+++ b/src/java.desktop/share/native/liblcms/cmstypes.c
@@ -30,7 +30,7 @@
 //---------------------------------------------------------------------------------
 //
 //  Little Color Management System
-//  Copyright (c) 1998-2023 Marti Maria Saguer
+//  Copyright (c) 1998-2024 Marti Maria Saguer
 //
 // Permission is hereby granted, free of charge, to any person obtaining
 // a copy of this software and associated documentation files (the "Software"),
@@ -599,6 +599,178 @@ void Type_ColorantOrderType_Free(struct _cms_typehandler_struct* self, void* Ptr
     _cmsFree(self ->ContextID, Ptr);
 }
 
+// ********************************************************************************
+// Type cmsSigUInt8ArrayType
+// ********************************************************************************
+// This type represents an array of generic 1-byte/8-bit quantity.
+
+static
+void* Type_UInt8_Read(struct _cms_typehandler_struct* self, cmsIOHANDLER* io, cmsUInt32Number* nItems, cmsUInt32Number SizeOfTag)
+{
+    cmsUInt8Number* array;
+    cmsUInt32Number i, n;
+
+    *nItems = 0;
+    n = SizeOfTag / sizeof(cmsUInt8Number);
+    array = (cmsUInt8Number*)_cmsCalloc(self->ContextID, n, sizeof(cmsUInt8Number));
+    if (array == NULL) return NULL;
+
+    for (i = 0; i < n; i++) {
+
+        if (!_cmsReadUInt8Number(io, &array[i])) {
+
+            _cmsFree(self->ContextID, array);
+            return NULL;
+        }
+    }
+
+    *nItems = n;
+    return (void*)array;
+}
+
+static
+cmsBool Type_UInt8_Write(struct _cms_typehandler_struct* self, cmsIOHANDLER* io, void* Ptr, cmsUInt32Number nItems)
+{
+    cmsUInt8Number* Value = (cmsUInt8Number*)Ptr;
+    cmsUInt32Number i;
+
+    for (i = 0; i < nItems; i++) {
+
+        if (!_cmsWriteUInt8Number(io, Value[i])) return FALSE;
+    }
+
+    return TRUE;
+
+    cmsUNUSED_PARAMETER(self);
+}
+
+static
+void* Type_UInt8_Dup(struct _cms_typehandler_struct* self, const void* Ptr, cmsUInt32Number n)
+{
+    return _cmsDupMem(self->ContextID, Ptr, n * sizeof(cmsUInt8Number));
+}
+
+
+static
+void Type_UInt8_Free(struct _cms_typehandler_struct* self, void* Ptr)
+{
+    _cmsFree(self->ContextID, Ptr);
+}
+
+// ********************************************************************************
+// Type cmsSigUInt32ArrayType
+// ********************************************************************************
+// This type represents an array of generic 4-byte/32-bit quantity.
+static
+void* Type_UInt32_Read(struct _cms_typehandler_struct* self, cmsIOHANDLER* io, cmsUInt32Number* nItems, cmsUInt32Number SizeOfTag)
+{
+    cmsUInt32Number* array;
+    cmsUInt32Number i, n;
+
+    *nItems = 0;
+    n = SizeOfTag / sizeof(cmsUInt32Number);
+    array = (cmsUInt32Number*)_cmsCalloc(self->ContextID, n, sizeof(cmsUInt32Number));
+    if (array == NULL) return NULL;
+
+    for (i = 0; i < n; i++) {
+
+        if (!_cmsReadUInt32Number(io, &array[i])) {
+
+            _cmsFree(self->ContextID, array);
+            return NULL;
+        }
+    }
+
+    *nItems = n;
+    return (void*)array;
+}
+
+static
+cmsBool Type_UInt32_Write(struct _cms_typehandler_struct* self, cmsIOHANDLER* io, void* Ptr, cmsUInt32Number nItems)
+{
+    cmsUInt32Number* Value = (cmsUInt32Number*)Ptr;
+    cmsUInt32Number i;
+
+    for (i = 0; i < nItems; i++) {
+
+        if (!_cmsWriteUInt32Number(io, Value[i])) return FALSE;
+    }
+
+    return TRUE;
+
+    cmsUNUSED_PARAMETER(self);
+}
+
+static
+void* Type_UInt32_Dup(struct _cms_typehandler_struct* self, const void* Ptr, cmsUInt32Number n)
+{
+    return _cmsDupMem(self->ContextID, Ptr, n * sizeof(cmsUInt32Number));
+}
+
+
+static
+void Type_UInt32_Free(struct _cms_typehandler_struct* self, void* Ptr)
+{
+    _cmsFree(self->ContextID, Ptr);
+}
+
+// ********************************************************************************
+// Type cmsSigUInt64ArrayType
+// ********************************************************************************
+// This type represents an array of generic 8-byte/64-bit quantity.
+static
+void* Type_UInt64_Read(struct _cms_typehandler_struct* self, cmsIOHANDLER* io, cmsUInt32Number* nItems, cmsUInt32Number SizeOfTag)
+{
+    cmsUInt64Number* array;
+    cmsUInt32Number i, n;
+
+    *nItems = 0;
+    n = SizeOfTag / sizeof(cmsUInt64Number);
+    array = (cmsUInt64Number*)_cmsCalloc(self->ContextID, n, sizeof(cmsUInt64Number));
+    if (array == NULL) return NULL;
+
+    for (i = 0; i < n; i++) {
+
+        if (!_cmsReadUInt64Number(io, &array[i])) {
+
+            _cmsFree(self->ContextID, array);
+            return NULL;
+        }
+    }
+
+    *nItems = n;
+    return (void*)array;
+}
+
+static
+cmsBool Type_UInt64_Write(struct _cms_typehandler_struct* self, cmsIOHANDLER* io, void* Ptr, cmsUInt32Number nItems)
+{
+    cmsUInt64Number* Value = (cmsUInt64Number*)Ptr;
+    cmsUInt32Number i;
+
+    for (i = 0; i < nItems; i++) {
+
+        if (!_cmsWriteUInt64Number(io, &Value[i])) return FALSE;
+    }
+
+    return TRUE;
+
+    cmsUNUSED_PARAMETER(self);
+}
+
+static
+void* Type_UInt64_Dup(struct _cms_typehandler_struct* self, const void* Ptr, cmsUInt32Number n)
+{
+    return _cmsDupMem(self->ContextID, Ptr, n * sizeof(cmsUInt64Number));
+}
+
+
+static
+void Type_UInt64_Free(struct _cms_typehandler_struct* self, void* Ptr)
+{
+    _cmsFree(self->ContextID, Ptr);
+}
+
 // ********************************************************************************
 // Type cmsSigS15Fixed16ArrayType
 // ********************************************************************************
@@ -968,6 +1140,8 @@ void *Type_Text_Description_Read(struct _cms_typehandler_struct* self, cmsIOHAND
 
     // Read len of ASCII
     if (!_cmsReadUInt32Number(io, &AsciiCount)) return NULL;
+    if (AsciiCount > 0x7ffff) return NULL;
+
     SizeOfTag -= sizeof(cmsUInt32Number);
 
     // Check for size
@@ -999,7 +1173,8 @@ void *Type_Text_Description_Read(struct _cms_typehandler_struct* self, cmsIOHAND
     if (!_cmsReadUInt32Number(io, &UnicodeCount)) goto Done;
     SizeOfTag -= 2* sizeof(cmsUInt32Number);
 
-    if (UnicodeCount == 0 || SizeOfTag < UnicodeCount*sizeof(cmsUInt16Number)) goto Done;
+    if (UnicodeCount == 0 || UnicodeCount > 0x7ffff ||
+        SizeOfTag < UnicodeCount*sizeof(cmsUInt16Number)) goto Done;
 
     UnicodeString = (wchar_t*)_cmsMallocZero(self->ContextID, (UnicodeCount + 1) * sizeof(wchar_t));
     if (UnicodeString == NULL) goto Done;
@@ -1129,7 +1304,7 @@ cmsBool  Type_Text_Description_Write(struct _cms_typehandler_struct* self, cmsIO
     if (!io ->Write(io, 67, Filler)) goto Error;
 
     // possibly add pad at the end of tag
-    if(len_aligned - len_tag_requirement > 0)
+    if (len_aligned > len_tag_requirement)
       if (!io ->Write(io, len_aligned - len_tag_requirement, Filler)) goto Error;
 
     rc = TRUE;
@@ -5191,7 +5366,7 @@ cmsBool ReadOneWChar(cmsIOHANDLER* io,  _cmsDICelem* e, cmsUInt32Number i, wchar
       if (!io -> Seek(io, e -> Offsets[i])) return FALSE;
 
       nChars = e ->Sizes[i] / sizeof(cmsUInt16Number);
-
+      if (nChars > 0x7ffff) return FALSE;
 
       *wcstr = (wchar_t*) _cmsMallocZero(e ->ContextID, (nChars + 1) * sizeof(wchar_t));
       if (*wcstr == NULL) return FALSE;
@@ -5772,7 +5947,10 @@ static const _cmsTagTypeLinkedList SupportedTagTypes[] = {
 {TYPE_HANDLER(cmsSigDictType,                  Dictionary),         (_cmsTagTypeLinkedList*) &SupportedTagTypes[30] },
 {TYPE_HANDLER(cmsSigcicpType,                  VideoSignal),        (_cmsTagTypeLinkedList*) &SupportedTagTypes[31] },
 {TYPE_HANDLER(cmsSigVcgtType,                  vcgt),               (_cmsTagTypeLinkedList*) &SupportedTagTypes[32] },
-{TYPE_HANDLER(cmsSigMHC2Type,                  MHC2),                NULL }
+{TYPE_HANDLER(cmsSigMHC2Type,                  MHC2),               (_cmsTagTypeLinkedList*) &SupportedTagTypes[33] },
+{TYPE_HANDLER(cmsSigUInt8ArrayType,            UInt8),              (_cmsTagTypeLinkedList*) &SupportedTagTypes[34] },
+{TYPE_HANDLER(cmsSigUInt32ArrayType,           UInt32),             (_cmsTagTypeLinkedList*) &SupportedTagTypes[35] },
+{TYPE_HANDLER(cmsSigUInt64ArrayType,           UInt64),             NULL }
 };
 
 
diff --git a/src/java.desktop/share/native/liblcms/cmsvirt.c b/src/java.desktop/share/native/liblcms/cmsvirt.c
index e8d18d4ca9f..1ef86dae054 100644
--- a/src/java.desktop/share/native/liblcms/cmsvirt.c
+++ b/src/java.desktop/share/native/liblcms/cmsvirt.c
@@ -30,7 +30,7 @@
 //---------------------------------------------------------------------------------
 //
 //  Little Color Management System
-//  Copyright (c) 1998-2023 Marti Maria Saguer
+//  Copyright (c) 1998-2024 Marti Maria Saguer
 //
 // Permission is hereby granted, free of charge, to any person obtaining
 // a copy of this software and associated documentation files (the "Software"),
@@ -412,7 +412,7 @@ int InkLimitingSampler(CMSREGISTER const cmsUInt16Number In[], CMSREGISTER cmsUI
     Out[1] = _cmsQuickSaturateWord(In[1] * Ratio);     // M
     Out[2] = _cmsQuickSaturateWord(In[2] * Ratio);     // Y
 
-    Out[3] = In[3];                                 // K (untouched)
+    Out[3] = In[3];                                    // K (untouched)
 
     return TRUE;
 }
@@ -433,7 +433,7 @@ cmsHPROFILE CMSEXPORT cmsCreateInkLimitingDeviceLinkTHR(cmsContext ContextID,
         return NULL;
     }
 
-    if (Limit < 0.0 || Limit > 400) {
+    if (Limit < 1.0 || Limit > 400) {
 
         cmsSignalError(ContextID, cmsERROR_RANGE, "InkLimiting: Limit should be between 1..400");
         if (Limit < 1) Limit = 1;
@@ -705,7 +705,7 @@ cmsHPROFILE CMSEXPORT cmsCreate_sRGBProfile(void)
 *
 * This virtual profile cannot be saved as an ICC file
 */
-cmsHPROFILE cmsCreate_OkLabProfile(cmsContext ctx)
+cmsHPROFILE CMSEXPORT cmsCreate_OkLabProfile(cmsContext ctx)
 {
     cmsStage* XYZPCS = _cmsStageNormalizeFromXyzFloat(ctx);
     cmsStage* PCSXYZ = _cmsStageNormalizeToXyzFloat(ctx);
@@ -774,6 +774,8 @@ cmsHPROFILE cmsCreate_OkLabProfile(cmsContext ctx)
     cmsPipeline* BToA = cmsPipelineAlloc(ctx, 3, 3);
 
     cmsHPROFILE hProfile = cmsCreateProfilePlaceholder(ctx);
+    if (!hProfile)            // can't allocate
+        goto error;
 
     cmsSetProfileVersion(hProfile, 4.4);
 
diff --git a/src/java.desktop/share/native/liblcms/cmswtpnt.c b/src/java.desktop/share/native/liblcms/cmswtpnt.c
index 27d71803531..ebba2cd6a97 100644
--- a/src/java.desktop/share/native/liblcms/cmswtpnt.c
+++ b/src/java.desktop/share/native/liblcms/cmswtpnt.c
@@ -30,7 +30,7 @@
 //---------------------------------------------------------------------------------
 //
 //  Little Color Management System
-//  Copyright (c) 1998-2023 Marti Maria Saguer
+//  Copyright (c) 1998-2024 Marti Maria Saguer
 //
 // Permission is hereby granted, free of charge, to any person obtaining
 // a copy of this software and associated documentation files (the "Software"),
diff --git a/src/java.desktop/share/native/liblcms/cmsxform.c b/src/java.desktop/share/native/liblcms/cmsxform.c
index 86afd7202fd..1eb3eecbf18 100644
--- a/src/java.desktop/share/native/liblcms/cmsxform.c
+++ b/src/java.desktop/share/native/liblcms/cmsxform.c
@@ -30,7 +30,7 @@
 //---------------------------------------------------------------------------------
 //
 //  Little Color Management System
-//  Copyright (c) 1998-2023 Marti Maria Saguer
+//  Copyright (c) 1998-2024 Marti Maria Saguer
 //
 // Permission is hereby granted, free of charge, to any person obtaining
 // a copy of this software and associated documentation files (the "Software"),
@@ -295,7 +295,7 @@ void FloatXFORM(_cmsTRANSFORM* p,
     cmsUInt8Number* output;
     cmsFloat32Number fIn[cmsMAXCHANNELS], fOut[cmsMAXCHANNELS];
     cmsFloat32Number OutOfGamut;
-    cmsUInt32Number i, j, c, strideIn, strideOut;
+    size_t i, j, c, strideIn, strideOut;
 
     _cmsHandleExtraChannels(p, in, out, PixelsPerLine, LineCount, Stride);
 
@@ -322,9 +322,11 @@ void FloatXFORM(_cmsTRANSFORM* p,
                 // Is current color out of gamut?
                 if (OutOfGamut > 0.0) {
 
+                    _cmsAlarmCodesChunkType* ContextAlarmCodes = (_cmsAlarmCodesChunkType*)_cmsContextGetClientChunk(p->ContextID, AlarmCodesContext);
+
                     // Certainly, out of gamut
                     for (c = 0; c < cmsMAXCHANNELS; c++)
-                        fOut[c] = -1.0;
+                        fOut[c] = ContextAlarmCodes->AlarmCodes[c] / 65535.0F;
 
                 }
                 else {
@@ -361,7 +363,7 @@ void NullFloatXFORM(_cmsTRANSFORM* p,
     cmsUInt8Number* accum;
     cmsUInt8Number* output;
     cmsFloat32Number fIn[cmsMAXCHANNELS];
-    cmsUInt32Number i, j, strideIn, strideOut;
+    size_t i, j, strideIn, strideOut;
 
     _cmsHandleExtraChannels(p, in, out, PixelsPerLine, LineCount, Stride);
 
@@ -399,7 +401,7 @@ void NullXFORM(_cmsTRANSFORM* p,
     cmsUInt8Number* accum;
     cmsUInt8Number* output;
     cmsUInt16Number wIn[cmsMAXCHANNELS];
-    cmsUInt32Number i, j, strideIn, strideOut;
+    size_t i, j, strideIn, strideOut;
 
     _cmsHandleExtraChannels(p, in, out, PixelsPerLine, LineCount, Stride);
 
@@ -409,17 +411,17 @@ void NullXFORM(_cmsTRANSFORM* p,
 
     for (i = 0; i < LineCount; i++) {
 
-           accum = (cmsUInt8Number*)in + strideIn;
-           output = (cmsUInt8Number*)out + strideOut;
+        accum = (cmsUInt8Number*)in + strideIn;
+        output = (cmsUInt8Number*)out + strideOut;
 
-           for (j = 0; j < PixelsPerLine; j++) {
+        for (j = 0; j < PixelsPerLine; j++) {
 
-                  accum = p->FromInput(p, wIn, accum, Stride->BytesPerPlaneIn);
-                  output = p->ToOutput(p, wIn, output, Stride->BytesPerPlaneOut);
-    }
+            accum = p->FromInput(p, wIn, accum, Stride->BytesPerPlaneIn);
+            output = p->ToOutput(p, wIn, output, Stride->BytesPerPlaneOut);
+        }
 
-           strideIn += Stride->BytesPerLineIn;
-           strideOut += Stride->BytesPerLineOut;
+        strideIn += Stride->BytesPerLineIn;
+        strideOut += Stride->BytesPerLineOut;
     }
 
 }
@@ -437,7 +439,7 @@ void PrecalculatedXFORM(_cmsTRANSFORM* p,
     CMSREGISTER cmsUInt8Number* accum;
     CMSREGISTER cmsUInt8Number* output;
     cmsUInt16Number wIn[cmsMAXCHANNELS], wOut[cmsMAXCHANNELS];
-    cmsUInt32Number i, j, strideIn, strideOut;
+    size_t i, j, strideIn, strideOut;
 
     _cmsHandleExtraChannels(p, in, out, PixelsPerLine, LineCount, Stride);
 
@@ -500,7 +502,7 @@ void PrecalculatedXFORMGamutCheck(_cmsTRANSFORM* p,
     cmsUInt8Number* accum;
     cmsUInt8Number* output;
     cmsUInt16Number wIn[cmsMAXCHANNELS], wOut[cmsMAXCHANNELS];
-    cmsUInt32Number i, j, strideIn, strideOut;
+    size_t i, j, strideIn, strideOut;
 
     _cmsHandleExtraChannels(p, in, out, PixelsPerLine, LineCount, Stride);
 
@@ -511,18 +513,18 @@ void PrecalculatedXFORMGamutCheck(_cmsTRANSFORM* p,
 
     for (i = 0; i < LineCount; i++) {
 
-           accum = (cmsUInt8Number*)in + strideIn;
-           output = (cmsUInt8Number*)out + strideOut;
+        accum = (cmsUInt8Number*)in + strideIn;
+        output = (cmsUInt8Number*)out + strideOut;
 
-           for (j = 0; j < PixelsPerLine; j++) {
+        for (j = 0; j < PixelsPerLine; j++) {
 
-                  accum = p->FromInput(p, wIn, accum, Stride->BytesPerPlaneIn);
-                  TransformOnePixelWithGamutCheck(p, wIn, wOut);
-                  output = p->ToOutput(p, wOut, output, Stride->BytesPerPlaneOut);
-           }
+            accum = p->FromInput(p, wIn, accum, Stride->BytesPerPlaneIn);
+            TransformOnePixelWithGamutCheck(p, wIn, wOut);
+            output = p->ToOutput(p, wOut, output, Stride->BytesPerPlaneOut);
+        }
 
-           strideIn += Stride->BytesPerLineIn;
-           strideOut += Stride->BytesPerLineOut;
+        strideIn += Stride->BytesPerLineIn;
+        strideOut += Stride->BytesPerLineOut;
     }
 }
 
@@ -540,7 +542,7 @@ void CachedXFORM(_cmsTRANSFORM* p,
     cmsUInt8Number* output;
     cmsUInt16Number wIn[cmsMAXCHANNELS], wOut[cmsMAXCHANNELS];
     _cmsCACHE Cache;
-    cmsUInt32Number i, j, strideIn, strideOut;
+    size_t i, j, strideIn, strideOut;
 
     _cmsHandleExtraChannels(p, in, out, PixelsPerLine, LineCount, Stride);
 
@@ -595,7 +597,7 @@ void CachedXFORMGamutCheck(_cmsTRANSFORM* p,
     cmsUInt8Number* output;
     cmsUInt16Number wIn[cmsMAXCHANNELS], wOut[cmsMAXCHANNELS];
     _cmsCACHE Cache;
-    cmsUInt32Number i, j, strideIn, strideOut;
+    size_t i, j, strideIn, strideOut;
 
     _cmsHandleExtraChannels(p, in, out, PixelsPerLine, LineCount, Stride);
 
@@ -712,7 +714,7 @@ void _cmsTransform2toTransformAdaptor(struct _cmstransform_struct *CMMcargo,
                                       const cmsStride* Stride)
 {
 
-       cmsUInt32Number i, strideIn, strideOut;
+       size_t i, strideIn, strideOut;
 
        _cmsHandleExtraChannels(CMMcargo, InputBuffer, OutputBuffer, PixelsPerLine, LineCount, Stride);
 
@@ -1099,7 +1101,7 @@ cmsBool  IsProperColorSpace(cmsColorSpaceSignature Check, cmsUInt32Number dwForm
     int Space1 = (int) T_COLORSPACE(dwFormat);
     int Space2 = _cmsLCMScolorSpace(Check);
 
-    if (Space1 == PT_ANY) return TRUE;
+    if (Space1 == PT_ANY) return (T_CHANNELS(dwFormat) == cmsChannelsOf(Check));
     if (Space1 == Space2) return TRUE;
 
     if (Space1 == PT_LabV2 && Space2 == PT_Lab) return TRUE;
@@ -1160,7 +1162,15 @@ cmsHTRANSFORM CMSEXPORT cmsCreateExtendedTransform(cmsContext ContextID,
     cmsColorSpaceSignature EntryColorSpace;
     cmsColorSpaceSignature ExitColorSpace;
     cmsPipeline* Lut;
-    cmsUInt32Number LastIntent = Intents[nProfiles-1];
+    cmsUInt32Number LastIntent;
+
+    // Safeguard
+    if (nProfiles <= 0 || nProfiles > 255) {
+        cmsSignalError(ContextID, cmsERROR_RANGE, "Wrong number of profiles. 1..255 expected, %d found.", nProfiles);
+        return NULL;
+    }
+
+    LastIntent = Intents[nProfiles - 1];
 
     // If it is a fake transform
     if (dwFlags & cmsFLAGS_NULLTRANSFORM)
diff --git a/src/java.desktop/share/native/liblcms/lcms2.h b/src/java.desktop/share/native/liblcms/lcms2.h
index 2d9a8b1248f..5ba09661308 100644
--- a/src/java.desktop/share/native/liblcms/lcms2.h
+++ b/src/java.desktop/share/native/liblcms/lcms2.h
@@ -30,7 +30,7 @@
 //---------------------------------------------------------------------------------
 //
 //  Little Color Management System
-//  Copyright (c) 1998-2023 Marti Maria Saguer
+//  Copyright (c) 1998-2025 Marti Maria Saguer
 //
 // Permission is hereby granted, free of charge, to any person obtaining
 // a copy of this software and associated documentation files (the "Software"),
@@ -52,7 +52,7 @@
 //
 //---------------------------------------------------------------------------------
 //
-// Version 2.16
+// Version 2.17
 //
 
 #ifndef _lcms2_H
@@ -93,6 +93,9 @@
 // Uncomment this to remove the "register" storage class
 // #define CMS_NO_REGISTER_KEYWORD 1
 
+// Uncomment this to remove visibility attribute when building shared objects
+// #define CMS_NO_VISIBILITY 1
+
 // ********** End of configuration toggles ******************************
 
 // Needed for streams
@@ -113,7 +116,7 @@ extern "C" {
 #endif
 
 // Version/release
-#define LCMS_VERSION        2160
+#define LCMS_VERSION        2170
 
 // I will give the chance of redefining basic types for compilers that are not fully C99 compliant
 #ifndef CMS_BASIC_TYPES_ALREADY_DEFINED
@@ -277,7 +280,7 @@ typedef int                  cmsBool;
 #     define CMSAPI
 #  endif
 #else  // not Windows
-#  ifdef HAVE_FUNC_ATTRIBUTE_VISIBILITY
+#  if defined(HAVE_FUNC_ATTRIBUTE_VISIBILITY) && !defined(CMS_NO_VISIBILITY)
 #     define CMSEXPORT
 #     define CMSAPI    __attribute__((visibility("default")))
 #  else
@@ -987,7 +990,6 @@ typedef void* cmsHTRANSFORM;
 // IEEE 754-2008 "half"
 #define TYPE_GRAY_HALF_FLT    (FLOAT_SH(1)|COLORSPACE_SH(PT_GRAY)|CHANNELS_SH(1)|BYTES_SH(2))
 #define TYPE_RGB_HALF_FLT     (FLOAT_SH(1)|COLORSPACE_SH(PT_RGB)|CHANNELS_SH(3)|BYTES_SH(2))
-#define TYPE_RGBA_HALF_FLT    (FLOAT_SH(1)|COLORSPACE_SH(PT_RGB)|EXTRA_SH(1)|CHANNELS_SH(3)|BYTES_SH(2))
 #define TYPE_CMYK_HALF_FLT    (FLOAT_SH(1)|COLORSPACE_SH(PT_CMYK)|CHANNELS_SH(4)|BYTES_SH(2))
 
 #define TYPE_RGBA_HALF_FLT    (FLOAT_SH(1)|COLORSPACE_SH(PT_RGB)|EXTRA_SH(1)|CHANNELS_SH(3)|BYTES_SH(2))
diff --git a/src/java.desktop/share/native/liblcms/lcms2_internal.h b/src/java.desktop/share/native/liblcms/lcms2_internal.h
index 75973edad0d..d14c0dd823e 100644
--- a/src/java.desktop/share/native/liblcms/lcms2_internal.h
+++ b/src/java.desktop/share/native/liblcms/lcms2_internal.h
@@ -27,9 +27,10 @@
 // However, the following notice accompanied the original version of this
 // file:
 //
+
 //
 //  Little Color Management System
-//  Copyright (c) 1998-2023 Marti Maria Saguer
+//  Copyright (c) 1998-2024 Marti Maria Saguer
 //
 // Permission is hereby granted, free of charge, to any person obtaining
 // a copy of this software and associated documentation files (the "Software"),
@@ -467,7 +468,7 @@ cmsBool  _cmsRegisterTransformPlugin(cmsContext ContextID, cmsPluginBase* Plugin
 // Mutex
 cmsBool _cmsRegisterMutexPlugin(cmsContext ContextID, cmsPluginBase* Plugin);
 
-// Paralellization
+// Parallelization
 cmsBool _cmsRegisterParallelizationPlugin(cmsContext ContextID, cmsPluginBase* Plugin);
 
 // ---------------------------------------------------------------------------------------------------------
@@ -1000,7 +1001,7 @@ cmsBool           _cmsReadCHAD(cmsMAT3* Dest, cmsHPROFILE hProfile);
 
 // Link several profiles to obtain a single LUT modelling the whole color transform. Intents, Black point
 // compensation and Adaptation parameters may vary across profiles. BPC and Adaptation refers to the PCS
-// after the profile. I.e, BPC[0] refers to connexion between profile(0) and profile(1)
+// after the profile. I.e, BPC[0] refers to connetion between profile(0) and profile(1)
 cmsPipeline* _cmsLinkProfiles(cmsContext         ContextID,
                               cmsUInt32Number    nProfiles,
                               cmsUInt32Number    TheIntents[],
diff --git a/src/java.desktop/share/native/liblcms/lcms2_plugin.h b/src/java.desktop/share/native/liblcms/lcms2_plugin.h
index e7e7bd1f0ce..bdfc76f6bf5 100644
--- a/src/java.desktop/share/native/liblcms/lcms2_plugin.h
+++ b/src/java.desktop/share/native/liblcms/lcms2_plugin.h
@@ -30,7 +30,7 @@
 //---------------------------------------------------------------------------------
 //
 //  Little Color Management System
-//  Copyright (c) 1998-2023 Marti Maria Saguer
+//  Copyright (c) 1998-2024 Marti Maria Saguer
 //
 // Permission is hereby granted, free of charge, to any person obtaining
 // a copy of this software and associated documentation files (the "Software"),

From 7c9a7840ea75a9a7df3f240d063e9833f535e6ec Mon Sep 17 00:00:00 2001
From: Justin Lu <jlu@openjdk.org>
Date: Thu, 6 Mar 2025 22:54:24 +0000
Subject: [PATCH 254/587] 8351223: Update localized resources in keytool and
 jarsigner

Reviewed-by: weijun
---
 .../security/tools/keytool/Resources_de.java  | 21 ++++++++++---------
 .../security/tools/keytool/Resources_ja.java  | 21 ++++++++++---------
 .../tools/keytool/Resources_zh_CN.java        | 21 ++++++++++---------
 .../tools/jarsigner/Resources_de.java         | 21 +++++++++----------
 .../tools/jarsigner/Resources_ja.java         | 21 +++++++++----------
 .../tools/jarsigner/Resources_zh_CN.java      | 21 +++++++++----------
 6 files changed, 63 insertions(+), 63 deletions(-)

diff --git a/src/java.base/share/classes/sun/security/tools/keytool/Resources_de.java b/src/java.base/share/classes/sun/security/tools/keytool/Resources_de.java
index 0ca86491dc4..722c6b77b20 100644
--- a/src/java.base/share/classes/sun/security/tools/keytool/Resources_de.java
+++ b/src/java.base/share/classes/sun/security/tools/keytool/Resources_de.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -304,10 +304,12 @@ public class Resources_de extends java.util.ListResourceBundle {
                 "Das Angeben von -keysize zum Generieren von EC-Schl\u00FCsseln ist veraltet. Verwenden Sie stattdessen \"-groupname %s\"."},
         {"Key.pair.not.generated.alias.alias.already.exists",
                 "Schl\u00FCsselpaar wurde nicht generiert. Alias <{0}> ist bereits vorhanden"},
-        {"Generating.keysize.bit.keyAlgName.key.pair.and.self.signed.certificate.sigAlgName.with.a.validity.of.validality.days.for",
-                "Generieren von Schl\u00FCsselpaar (Typ {1}, {0} Bit) und selbst signiertem Zertifikat ({2}) mit einer G\u00FCltigkeit von {3} Tagen\n\tf\u00FCr: {4}"},
-        {"Generating.keysize.bit.keyAlgName.key.pair.and.a.certificate.sigAlgName.issued.by.signerAlias.with.a.validity.of.validality.days.for",
-                "Generieren von Schl\u00FCsselpaar (Typ {1}, {0} Bit) und Zertifikat ({2}), ausgestellt von <{3}>, mit einer G\u00FCltigkeit von {4} Tagen\n\tf\u00FCr: {5}"},
+        {"size.bit.alg",
+                "%1$d-Bit %2$s"},
+        {"Generating.full.keyAlgName.key.pair.and.self.signed.certificate.sigAlgName.with.a.validity.of.days.for",
+                "Schl\u00FCsselpaar {0} und selbstsigniertes Zertifikat ({1}) werden mit einer G\u00FCltigkeit von {2} Tagen generiert\n\tf\u00FCr: {3}"},
+        {"Generating.full.keyAlgName.key.pair.and.a.certificate.sigAlgName.issued.by.signerAlias.with.a.validity.of.days.for",
+                "Schl\u00FCsselpaar {0} und Zertifikat ({1}) werden generiert, das von <{2}> mit einer G\u00FCltigkeit von {3} Tagen ausgestellt wurde\n\tf\u00FCr: {4}"},
         {"Enter.key.password.for.alias.", "Schl\u00FCsselkennwort f\u00FCr <{0}> eingeben"},
         {".RETURN.if.same.as.keystore.password.",
                 "\t(RETURN, wenn identisch mit Keystore-Kennwort):  "},
@@ -472,10 +474,9 @@ public class Resources_de extends java.util.ListResourceBundle {
         {"alias.in.keystore", "Aussteller <%s>"},
         {"with.weak", "%s (schwach)"},
         {"with.disabled", "%s (deaktiviert)"},
-        {"key.bit", "%1$d-Bit-%2$s-Schl\u00FCssel"},
-        {"key.bit.weak", "%1$d-Bit-%2$s-Schl\u00FCssel (schwach)"},
-        {"key.bit.disabled", "%1$d-Bit-%2$s-Schl\u00FCssel (deaktiviert)"},
-        {"unknown.size.1", "%s-Schl\u00FCssel mit unbekannter Gr\u00F6\u00DFe"},
+        {"key.bit", "%s-Schl\u00FCssel"},
+        {"key.bit.weak", "%s Schl\u00FCssel (schwach)"},
+        {"key.bit.disabled", "%s Schl\u00FCssel (deaktiviert)"},
         {".PATTERN.printX509Cert.with.weak",
                 "Eigent\u00FCmer: {0}\nAussteller: {1}\nSeriennummer: {2}\nG\u00FCltig von: {3} bis: {4}\nZertifikatsfingerprints:\n\t SHA1: {5}\n\t SHA256: {6}\nSignaturalgorithmusname: {7}\nPublic-Key-Algorithmus von Subject: {8}\nVersion: {9}"},
         {"PKCS.10.with.weak",
@@ -486,7 +487,7 @@ public class Resources_de extends java.util.ListResourceBundle {
         {"Unable.to.parse.denyAfter.string.in.exception.message", "denyAfter-Datumszeichenfolge in Ausnahmemeldung kann nicht geparst werden"},
         {"whose.sigalg.weak", "%1$s verwendet den Signaturalgorithmus %2$s. Dies gilt als Sicherheitsrisiko."},
         {"whose.key.disabled", "%1$s verwendet %2$s. Dies gilt als Sicherheitsrisiko und ist deaktiviert."},
-        {"whose.key.weak", "%1$s verwendet %2$s. Dies gilt als Sicherheitsrisiko. Diese Schl\u00FCsselgr\u00F6\u00DFe wird in einem zuk\u00FCnftigen Update deaktiviert."},
+        {"whose.key.weak", "%1$s verwendet %2$s. Dies gilt als Sicherheitsrisiko. Wird in einem zuk\u00FCnftigen Update deaktiviert."},
         {"jks.storetype.warning", "Der %1$s-Keystore verwendet ein propriet\u00E4res Format. Es wird empfohlen, auf PKCS12 zu migrieren, das ein Industriestandardformat mit \"keytool -importkeystore -srckeystore %2$s -destkeystore %2$s -deststoretype pkcs12\" ist."},
         {"migrate.keystore.warning", "\"%1$s\" zu %4$s migriert. Der %2$s-Keystore wurde als \"%3$s\" gesichert."},
         {"backup.keystore.warning", "Der urspr\u00FCngliche Keystore \"%1$s\" wird als \"%3$s\" gesichert..."},
diff --git a/src/java.base/share/classes/sun/security/tools/keytool/Resources_ja.java b/src/java.base/share/classes/sun/security/tools/keytool/Resources_ja.java
index 371aed4f127..225b6eabd71 100644
--- a/src/java.base/share/classes/sun/security/tools/keytool/Resources_ja.java
+++ b/src/java.base/share/classes/sun/security/tools/keytool/Resources_ja.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -304,10 +304,12 @@ public class Resources_ja extends java.util.ListResourceBundle {
                 "-keysize\u306E\u6307\u5B9A\u306B\u3088\u308BEC\u30AD\u30FC\u306E\u751F\u6210\u306F\u975E\u63A8\u5968\u3067\u3059\u3002\u304B\u308F\u308A\u306B\"-groupname %s\"\u3092\u4F7F\u7528\u3057\u3066\u304F\u3060\u3055\u3044\u3002"},
         {"Key.pair.not.generated.alias.alias.already.exists",
                 "\u30AD\u30FC\u30FB\u30DA\u30A2\u306F\u751F\u6210\u3055\u308C\u307E\u305B\u3093\u3067\u3057\u305F\u3002\u5225\u540D<{0}>\u306F\u3059\u3067\u306B\u5B58\u5728\u3057\u307E\u3059"},
-        {"Generating.keysize.bit.keyAlgName.key.pair.and.self.signed.certificate.sigAlgName.with.a.validity.of.validality.days.for",
-                "{3}\u65E5\u9593\u6709\u52B9\u306A{0}\u30D3\u30C3\u30C8\u306E{1}\u306E\u30AD\u30FC\u30FB\u30DA\u30A2\u3068\u81EA\u5DF1\u7F72\u540D\u578B\u8A3C\u660E\u66F8({2})\u3092\u751F\u6210\u3057\u3066\u3044\u307E\u3059\n\t\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u540D: {4}"},
-        {"Generating.keysize.bit.keyAlgName.key.pair.and.a.certificate.sigAlgName.issued.by.signerAlias.with.a.validity.of.validality.days.for",
-                "{4}\u65E5\u9593\u6709\u52B9\u306A{0}\u30D3\u30C3\u30C8\u306E{1}\u30AD\u30FC\u30FB\u30DA\u30A2\u3068<{3}>\u306B\u3088\u3063\u3066\u767A\u884C\u3055\u308C\u308B\u8A3C\u660E\u66F8({2})\u3092\u751F\u6210\u3057\u3066\u3044\u307E\u3059\n\t\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u540D: {5}"},
+        {"size.bit.alg",
+                "%1$d\u30D3\u30C3\u30C8%2$s"},
+        {"Generating.full.keyAlgName.key.pair.and.self.signed.certificate.sigAlgName.with.a.validity.of.days.for",
+                "{0}\u30AD\u30FC\u30FB\u30DA\u30A2\u304A\u3088\u3073\u81EA\u5DF1\u7F72\u540D\u8A3C\u660E\u66F8({1})\u3092{2}\u65E5\u306E\u6709\u52B9\u6027\u3067\u751F\u6210\u3057\u3066\u3044\u307E\u3059\n\t\u5BFE\u8C61: {3}"},
+        {"Generating.full.keyAlgName.key.pair.and.a.certificate.sigAlgName.issued.by.signerAlias.with.a.validity.of.days.for",
+                "{0}\u30AD\u30FC\u30FB\u30DA\u30A2\u3068\u003C\u007B\u0032\u007D\u003E\u306B\u3088\u3063\u3066\u767A\u884C\u3055\u308C\u305F\u8A3C\u660E\u66F8({1})\u3092{3}\u65E5\u9593\u306E\u6709\u52B9\u6027\u3067\u751F\u6210\u3057\u3066\u3044\u307E\u3059\n\t\u5BFE\u8C61: {4}"},
         {"Enter.key.password.for.alias.", "<{0}>\u306E\u30AD\u30FC\u30FB\u30D1\u30B9\u30EF\u30FC\u30C9\u3092\u5165\u529B\u3057\u3066\u304F\u3060\u3055\u3044"},
         {".RETURN.if.same.as.keystore.password.",
                 "\t(\u30AD\u30FC\u30B9\u30C8\u30A2\u306E\u30D1\u30B9\u30EF\u30FC\u30C9\u3068\u540C\u3058\u5834\u5408\u306FRETURN\u3092\u62BC\u3057\u3066\u304F\u3060\u3055\u3044):  "},
@@ -472,10 +474,9 @@ public class Resources_ja extends java.util.ListResourceBundle {
         {"alias.in.keystore", "\u767A\u884C\u8005<%s>"},
         {"with.weak", "%s (\u5F31)"},
         {"with.disabled", "%s (\u7121\u52B9)"},
-        {"key.bit", "%1$d\u30D3\u30C3\u30C8%2$s\u30AD\u30FC"},
-        {"key.bit.weak", "%1$d\u30D3\u30C3\u30C8%2$s\u30AD\u30FC(\u5F31)"},
-        {"key.bit.disabled", "%1$d-bit %2$s key (\u7121\u52B9)"},
-        {"unknown.size.1", "\u4E0D\u660E\u306A\u30B5\u30A4\u30BA\u306E%s\u30AD\u30FC"},
+        {"key.bit", "%s\u30AD\u30FC"},
+        {"key.bit.weak", "%s\u30AD\u30FC(\u5F31\u3044)"},
+        {"key.bit.disabled", "%s\u30AD\u30FC(\u7121\u52B9)"},
         {".PATTERN.printX509Cert.with.weak",
                 "\u6240\u6709\u8005: {0}\n\u767A\u884C\u8005: {1}\n\u30B7\u30EA\u30A2\u30EB\u756A\u53F7: {2}\n\u6709\u52B9\u671F\u9593\u306E\u958B\u59CB\u65E5: {3}\u7D42\u4E86\u65E5: {4}\n\u8A3C\u660E\u66F8\u306E\u30D5\u30A3\u30F3\u30AC\u30D7\u30EA\u30F3\u30C8:\n\t SHA1: {5}\n\t SHA256: {6}\n\u7F72\u540D\u30A2\u30EB\u30B4\u30EA\u30BA\u30E0\u540D: {7}\n\u30B5\u30D6\u30B8\u30A7\u30AF\u30C8\u516C\u958B\u30AD\u30FC\u30FB\u30A2\u30EB\u30B4\u30EA\u30BA\u30E0: {8}\n\u30D0\u30FC\u30B8\u30E7\u30F3: {9}"},
         {"PKCS.10.with.weak",
@@ -486,7 +487,7 @@ public class Resources_ja extends java.util.ListResourceBundle {
         {"Unable.to.parse.denyAfter.string.in.exception.message", "\u4F8B\u5916\u30E1\u30C3\u30BB\u30FC\u30B8\u306EdenyAfter\u65E5\u4ED8\u6587\u5B57\u5217\u3092\u89E3\u6790\u3067\u304D\u307E\u305B\u3093"},
         {"whose.sigalg.weak", "%1$s\u306F%2$s\u7F72\u540D\u30A2\u30EB\u30B4\u30EA\u30BA\u30E0\u3092\u4F7F\u7528\u3057\u3066\u304A\u308A\u3001\u3053\u308C\u306F\u30BB\u30AD\u30E5\u30EA\u30C6\u30A3\u30FB\u30EA\u30B9\u30AF\u3068\u307F\u306A\u3055\u308C\u307E\u3059\u3002"},
         {"whose.key.disabled", "%1$s\u306F%2$s\u3092\u4F7F\u7528\u3057\u3066\u304A\u308A\u3001\u3053\u308C\u306F\u30BB\u30AD\u30E5\u30EA\u30C6\u30A3\u30FB\u30EA\u30B9\u30AF\u3068\u307F\u306A\u3055\u308C\u3001\u7121\u52B9\u5316\u3055\u308C\u3066\u3044\u307E\u3059\u3002"},
-        {"whose.key.weak", "%1$s\u306F%2$s\u3092\u4F7F\u7528\u3057\u3066\u304A\u308A\u3001\u3053\u308C\u306F\u30BB\u30AD\u30E5\u30EA\u30C6\u30A3\u30FB\u30EA\u30B9\u30AF\u3068\u307F\u306A\u3055\u308C\u307E\u3059\u3002\u3053\u306E\u30AD\u30FC\u30FB\u30B5\u30A4\u30BA\u306F\u5C06\u6765\u306E\u66F4\u65B0\u3067\u7121\u52B9\u5316\u3055\u308C\u307E\u3059\u3002"},
+        {"whose.key.weak", "%1$s\u306F%2$s\u3092\u4F7F\u7528\u3057\u3066\u304A\u308A\u3001\u3053\u308C\u306F\u30BB\u30AD\u30E5\u30EA\u30C6\u30A3\u30FB\u30EA\u30B9\u30AF\u3068\u307F\u306A\u3055\u308C\u307E\u3059\u3002\u4ECA\u5F8C\u306E\u66F4\u65B0\u3067\u306F\u7121\u52B9\u306B\u306A\u308A\u307E\u3059\u3002"},
         {"jks.storetype.warning", "%1$s\u30AD\u30FC\u30B9\u30C8\u30A2\u306F\u72EC\u81EA\u306E\u5F62\u5F0F\u3092\u4F7F\u7528\u3057\u3066\u3044\u307E\u3059\u3002\"keytool -importkeystore -srckeystore %2$s -destkeystore %2$s -deststoretype pkcs12\"\u3092\u4F7F\u7528\u3059\u308B\u696D\u754C\u6A19\u6E96\u306E\u5F62\u5F0F\u3067\u3042\u308BPKCS12\u306B\u79FB\u884C\u3059\u308B\u3053\u3068\u3092\u304A\u85A6\u3081\u3057\u307E\u3059\u3002"},
         {"migrate.keystore.warning", "\"%1$s\"\u304C%4$s\u306B\u79FB\u884C\u3055\u308C\u307E\u3057\u305F\u3002%2$s\u30AD\u30FC\u30B9\u30C8\u30A2\u306F\"%3$s\"\u3068\u3057\u3066\u30D0\u30C3\u30AF\u30A2\u30C3\u30D7\u3055\u308C\u307E\u3059\u3002"},
         {"backup.keystore.warning", "\u5143\u306E\u30AD\u30FC\u30B9\u30C8\u30A2\"%1$s\"\u306F\"%3$s\"\u3068\u3057\u3066\u30D0\u30C3\u30AF\u30A2\u30C3\u30D7\u3055\u308C\u307E\u3059..."},
diff --git a/src/java.base/share/classes/sun/security/tools/keytool/Resources_zh_CN.java b/src/java.base/share/classes/sun/security/tools/keytool/Resources_zh_CN.java
index e916499dc1f..cb697082242 100644
--- a/src/java.base/share/classes/sun/security/tools/keytool/Resources_zh_CN.java
+++ b/src/java.base/share/classes/sun/security/tools/keytool/Resources_zh_CN.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -304,10 +304,12 @@ public class Resources_zh_CN extends java.util.ListResourceBundle {
                 "\u4E3A\u751F\u6210 EC \u5BC6\u94A5\u6307\u5B9A -keysize \u5DF2\u8FC7\u65F6\uFF0C\u8BF7\u6539\u4E3A\u4F7F\u7528 \"-groupname %s\"\u3002"},
         {"Key.pair.not.generated.alias.alias.already.exists",
                 "\u672A\u751F\u6210\u5BC6\u94A5\u5BF9, \u522B\u540D <{0}> \u5DF2\u7ECF\u5B58\u5728"},
-        {"Generating.keysize.bit.keyAlgName.key.pair.and.self.signed.certificate.sigAlgName.with.a.validity.of.validality.days.for",
-                "\u6B63\u5728\u4E3A\u4EE5\u4E0B\u5BF9\u8C61\u751F\u6210 {0} \u4F4D{1}\u5BC6\u94A5\u5BF9\u548C\u81EA\u7B7E\u540D\u8BC1\u4E66 ({2}) (\u6709\u6548\u671F\u4E3A {3} \u5929):\n\t {4}"},
-        {"Generating.keysize.bit.keyAlgName.key.pair.and.a.certificate.sigAlgName.issued.by.signerAlias.with.a.validity.of.validality.days.for",
-                "\u6B63\u5728\u4E3A\u4EE5\u4E0B\u5BF9\u8C61\u751F\u6210 {0} \u4F4D {1} \u5BC6\u94A5\u5BF9\u548C\u7531 <{3}> \u9881\u53D1\u7684\u8BC1\u4E66 ({2})\uFF08\u6709\u6548\u671F\u4E3A {4} \u5929\uFF09\uFF1A\n\t {5}"},
+        {"size.bit.alg",
+                "%1$d \u4F4D %2$s"},
+        {"Generating.full.keyAlgName.key.pair.and.self.signed.certificate.sigAlgName.with.a.validity.of.days.for",
+                "\u6B63\u5728\u4E3A {3} \u751F\u6210\u6709\u6548\u671F\u4E3A {2} \u5929\u7684 {0} \u5BC6\u94A5\u5BF9\u548C\u81EA\u7B7E\u540D\u8BC1\u4E66 ({1})\n"},
+        {"Generating.full.keyAlgName.key.pair.and.a.certificate.sigAlgName.issued.by.signerAlias.with.a.validity.of.days.for",
+                "\u751F\u6210 {0} \u5BC6\u94A5\u5BF9\u548C <{2}> \u9881\u53D1\u7684\u8BC1\u4E66 ({1})\uFF0C\u6709\u6548\u671F\u4E3A {3} \u5929 \n\t \u5BF9\u4E8E\uFF1A{4}"},
         {"Enter.key.password.for.alias.", "\u8F93\u5165 <{0}> \u7684\u5BC6\u94A5\u53E3\u4EE4"},
         {".RETURN.if.same.as.keystore.password.",
                 "\t(\u5982\u679C\u548C\u5BC6\u94A5\u5E93\u53E3\u4EE4\u76F8\u540C, \u6309\u56DE\u8F66):  "},
@@ -472,10 +474,9 @@ public class Resources_zh_CN extends java.util.ListResourceBundle {
         {"alias.in.keystore", "\u53D1\u5E03\u8005 <%s>"},
         {"with.weak", "%s (\u5F31)"},
         {"with.disabled", "%s\uFF08\u7981\u7528\uFF09"},
-        {"key.bit", "%1$d \u4F4D %2$s \u5BC6\u94A5"},
-        {"key.bit.weak", "%1$d \u4F4D %2$s \u5BC6\u94A5 (\u5F31)"},
-        {"key.bit.disabled", "%1$d \u4F4D %2$s \u5BC6\u94A5\uFF08\u7981\u7528\uFF09"},
-        {"unknown.size.1", "\u672A\u77E5\u5927\u5C0F\u7684 %s \u5BC6\u94A5"},
+        {"key.bit", "%s \u5BC6\u94A5"},
+        {"key.bit.weak", "%s \u5BC6\u94A5\uFF08\u5F31\uFF09"},
+        {"key.bit.disabled", "%s \u5BC6\u94A5\uFF08\u5DF2\u7981\u7528\uFF09"},
         {".PATTERN.printX509Cert.with.weak",
                 "\u6240\u6709\u8005: {0}\n\u53D1\u5E03\u8005: {1}\n\u5E8F\u5217\u53F7: {2}\n\u751F\u6548\u65F6\u95F4: {3}, \u5931\u6548\u65F6\u95F4: {4}\n\u8BC1\u4E66\u6307\u7EB9:\n\t SHA1: {5}\n\t SHA256: {6}\n\u7B7E\u540D\u7B97\u6CD5\u540D\u79F0: {7}\n\u4E3B\u4F53\u516C\u5171\u5BC6\u94A5\u7B97\u6CD5: {8}\n\u7248\u672C: {9}"},
         {"PKCS.10.with.weak",
@@ -486,7 +487,7 @@ public class Resources_zh_CN extends java.util.ListResourceBundle {
         {"Unable.to.parse.denyAfter.string.in.exception.message", "\u65E0\u6CD5\u89E3\u6790\u5F02\u5E38\u9519\u8BEF\u6D88\u606F\u4E2D\u7684 denyAfter \u65E5\u671F\u5B57\u7B26\u4E32"},
         {"whose.sigalg.weak", "%1$s \u4F7F\u7528\u7684 %2$s \u7B7E\u540D\u7B97\u6CD5\u5B58\u5728\u5B89\u5168\u98CE\u9669\u3002"},
         {"whose.key.disabled", "%1$s \u4F7F\u7528\u7684 %2$s \u88AB\u89C6\u4E3A\u5B58\u5728\u5B89\u5168\u98CE\u9669\u800C\u4E14\u88AB\u7981\u7528\u3002"},
-        {"whose.key.weak", "%1$s \u4F7F\u7528\u7684 %2$s \u88AB\u89C6\u4E3A\u5B58\u5728\u5B89\u5168\u98CE\u9669\u3002\u6B64\u5BC6\u94A5\u5927\u5C0F\u5C06\u5728\u672A\u6765\u7684\u66F4\u65B0\u4E2D\u88AB\u7981\u7528\u3002"},
+        {"whose.key.weak", "%1$s \u4F7F\u7528\u7684 %2$s \u88AB\u89C6\u4E3A\u5B58\u5728\u5B89\u5168\u98CE\u9669\u3002\u5728\u5C06\u6765\u7684\u66F4\u65B0\u4E2D\u5C06\u7981\u7528\u5B83\u3002"},
         {"jks.storetype.warning", "%1$s \u5BC6\u94A5\u5E93\u4F7F\u7528\u4E13\u7528\u683C\u5F0F\u3002\u5EFA\u8BAE\u4F7F\u7528 \"keytool -importkeystore -srckeystore %2$s -destkeystore %2$s -deststoretype pkcs12\" \u8FC1\u79FB\u5230\u884C\u4E1A\u6807\u51C6\u683C\u5F0F PKCS12\u3002"},
         {"migrate.keystore.warning", "\u5DF2\u5C06 \"%1$s\" \u8FC1\u79FB\u5230 %4$s\u3002\u5C06 %2$s \u5BC6\u94A5\u5E93\u4F5C\u4E3A \"%3$s\" \u8FDB\u884C\u4E86\u5907\u4EFD\u3002"},
         {"backup.keystore.warning", "\u5DF2\u5C06\u539F\u59CB\u5BC6\u94A5\u5E93 \"%1$s\" \u5907\u4EFD\u4E3A \"%3$s\"..."},
diff --git a/src/jdk.jartool/share/classes/sun/security/tools/jarsigner/Resources_de.java b/src/jdk.jartool/share/classes/sun/security/tools/jarsigner/Resources_de.java
index 9e7e0c81b21..ec3f3b1cce5 100644
--- a/src/jdk.jartool/share/classes/sun/security/tools/jarsigner/Resources_de.java
+++ b/src/jdk.jartool/share/classes/sun/security/tools/jarsigner/Resources_de.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -173,12 +173,9 @@ public class Resources_de extends java.util.ListResourceBundle {
         {"with.algparams.weak", "%1$s mit %2$s (schwach)"},
         {"with.disabled", "%s (deaktiviert)"},
         {"with.algparams.disabled", "%1$s mit %2$s (deaktiviert)"},
-        {"key.bit", "%d-Bit-Schl\u00FCssel"},
-        {"key.bit.weak", "%d-Bit-Schl\u00FCssel (schwach)"},
-        {"key.bit.eccurve.weak", "%1$d-Bit-%2$s-Schl\u00FCssel (schwach)"},
-        {"key.bit.disabled", "%d-Bit-Schl\u00FCssel (deaktiviert)"},
-        {"key.bit.eccurve.disabled", "%1$d-Bit-%2$s-Schl\u00FCssel (deaktiviert)"},
-        {"unknown.size", "unbekannte Gr\u00F6\u00DFe"},
+        {"key.bit", "%s-Schl\u00FCssel"},
+        {"key.bit.weak", "%s Schl\u00FCssel (schwach)"},
+        {"key.bit.disabled", "%s Schl\u00FCssel (deaktiviert)"},
         {"nonexistent.entries.found", "Diese JAR-Datei enth\u00E4lt signierte Eintr\u00E4ge f\u00FCr Dateien, die nicht vorhanden sind. Weitere Details finden Sie in der Verbose-Ausgabe (-verbose)."},
         {"external.file.attributes.detected", "POSIX-Dateiberechtigung und/oder Symlink-Attribute erkannt. Diese Attribute werden bei der Signatur ignoriert und sind nicht durch die Signatur gesch\u00FCtzt."},
 
@@ -295,10 +292,12 @@ public class Resources_de extends java.util.ListResourceBundle {
                 "Der %1$s-Digestalgorithmus gilt als Sicherheitsrisiko. Dieser Algorithmus wird in einem zuk\u00FCnftigen Update deaktiviert."},
         {"The.signature.algorithm.1.is.considered.a.security.risk..This.algorithm.will.be.disabled.in.a.future.update.",
                 "Der %1$s-Signaturalgorithmus gilt als Sicherheitsrisiko. Dieser Algorithmus wird in einem zuk\u00FCnftigen Update deaktiviert."},
-        {"The.1.signing.key.has.a.keysize.of.2.which.is.considered.a.security.risk..This.key.size.will.be.disabled.in.a.future.update.",
-                "Der %1$s-Signaturschl\u00FCssel hat eine Schl\u00FCsselgr\u00F6\u00DFe von %2$d. Das gilt als Sicherheitsrisiko. Diese Schl\u00FCsselgr\u00F6\u00DFe wird in einem zuk\u00FCnftigen Update deaktiviert."},
-        {"The.1.signing.key.has.a.keysize.of.2.which.is.considered.a.security.risk.and.is.disabled.",
-                "Der %1$s-Signaturschl\u00FCssel hat eine Schl\u00FCsselgr\u00F6\u00DFe von %2$d. Das gilt als Sicherheitsrisiko und ist deaktiviert."},
+        {"size.bit.alg",
+                "%1$d-Bit %2$s"},
+        {"The.full.keyAlgName.signing.key.is.considered.a.security.risk..It.will.be.disabled.in.a.future.update.",
+                "Der %s Signaturschl\u00FCssel wird als Sicherheitsrisiko betrachtet. Wird in einem zuk\u00FCnftigen Update deaktiviert."},
+        {"The.full.keyAlgName.signing.key.is.considered.a.security.risk.and.is.disabled.",
+                "Der %s Signaturschl\u00FCssel wird als Sicherheitsrisiko betrachtet und ist deaktiviert."},
         {"This.jar.contains.entries.whose.certificate.chain.is.invalid.reason.1",
                  "Diese JAR-Datei enth\u00E4lt Eintr\u00E4ge, deren Zertifikatskette ung\u00FCltig ist. Grund: %s"},
         {"This.jar.contains.entries.whose.tsa.certificate.chain.is.invalid.reason.1",
diff --git a/src/jdk.jartool/share/classes/sun/security/tools/jarsigner/Resources_ja.java b/src/jdk.jartool/share/classes/sun/security/tools/jarsigner/Resources_ja.java
index 315180339b2..e8f63ea5566 100644
--- a/src/jdk.jartool/share/classes/sun/security/tools/jarsigner/Resources_ja.java
+++ b/src/jdk.jartool/share/classes/sun/security/tools/jarsigner/Resources_ja.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -173,12 +173,9 @@ public class Resources_ja extends java.util.ListResourceBundle {
         {"with.algparams.weak", "%2$s\u3092\u4F7F\u7528\u3057\u305F%1$s (\u5F31)"},
         {"with.disabled", "%s (\u7121\u52B9)"},
         {"with.algparams.disabled", "%2$s\u3092\u4F7F\u7528\u3057\u305F%1$s (\u7121\u52B9)"},
-        {"key.bit", "%d\u30D3\u30C3\u30C8\u30FB\u30AD\u30FC"},
-        {"key.bit.weak", "%d\u30D3\u30C3\u30C8\u30FB\u30AD\u30FC(\u5F31)"},
-        {"key.bit.eccurve.weak", "%1$d\u30D3\u30C3\u30C8%2$s\u30AD\u30FC(\u5F31)"},
-        {"key.bit.disabled", "%d\u30D3\u30C3\u30C8\u30FB\u30AD\u30FC (\u7121\u52B9)"},
-        {"key.bit.eccurve.disabled", "%1$d\u30D3\u30C3\u30C8%2$s\u30AD\u30FC(\u7121\u52B9)"},
-        {"unknown.size", "\u4E0D\u660E\u30B5\u30A4\u30BA"},
+        {"key.bit", "%s\u30AD\u30FC"},
+        {"key.bit.weak", "%s\u30AD\u30FC(\u5F31\u3044)"},
+        {"key.bit.disabled", "%s\u30AD\u30FC(\u7121\u52B9)"},
         {"nonexistent.entries.found", "\u3053\u306Ejar\u306B\u306F\u3001\u5B58\u5728\u3057\u306A\u3044\u30D5\u30A1\u30A4\u30EB\u306E\u7F72\u540D\u6E08\u30A8\u30F3\u30C8\u30EA\u304C\u542B\u307E\u308C\u307E\u3059\u3002\u8A73\u7D30\u306F\u3001-verbose\u51FA\u529B\u3092\u53C2\u7167\u3057\u3066\u304F\u3060\u3055\u3044\u3002"},
         {"external.file.attributes.detected", "POSIX\u30D5\u30A1\u30A4\u30EB\u6A29\u9650\u307E\u305F\u306Fsymlink(\u3042\u308B\u3044\u306F\u305D\u306E\u4E21\u65B9)\u306E\u5C5E\u6027\u304C\u691C\u51FA\u3055\u308C\u307E\u3057\u305F\u3002\u7F72\u540D\u4E2D\u306F\u3053\u308C\u3089\u306E\u5C5E\u6027\u306F\u7121\u8996\u3055\u308C\u3001\u7F72\u540D\u306B\u3088\u3063\u3066\u4FDD\u8B77\u3055\u308C\u307E\u305B\u3093\u3002"},
 
@@ -295,10 +292,12 @@ public class Resources_ja extends java.util.ListResourceBundle {
                 "%1$s\u30C0\u30A4\u30B8\u30A7\u30B9\u30C8\u30FB\u30A2\u30EB\u30B4\u30EA\u30BA\u30E0\u306F\u3001\u30BB\u30AD\u30E5\u30EA\u30C6\u30A3\u30FB\u30EA\u30B9\u30AF\u3068\u307F\u306A\u3055\u308C\u307E\u3059\u3002\u3053\u306E\u30A2\u30EB\u30B4\u30EA\u30BA\u30E0\u306F\u5C06\u6765\u306E\u66F4\u65B0\u3067\u7121\u52B9\u5316\u3055\u308C\u307E\u3059\u3002"},
         {"The.signature.algorithm.1.is.considered.a.security.risk..This.algorithm.will.be.disabled.in.a.future.update.",
                 "%1$s\u7F72\u540D\u30A2\u30EB\u30B4\u30EA\u30BA\u30E0\u306F\u3001\u30BB\u30AD\u30E5\u30EA\u30C6\u30A3\u30FB\u30EA\u30B9\u30AF\u3068\u307F\u306A\u3055\u308C\u307E\u3059\u3002\u3053\u306E\u30A2\u30EB\u30B4\u30EA\u30BA\u30E0\u306F\u5C06\u6765\u306E\u66F4\u65B0\u3067\u7121\u52B9\u5316\u3055\u308C\u307E\u3059\u3002"},
-        {"The.1.signing.key.has.a.keysize.of.2.which.is.considered.a.security.risk..This.key.size.will.be.disabled.in.a.future.update.",
-                "%1$s\u7F72\u540D\u30AD\u30FC\u306B\u306F%2$d\u306E\u30AD\u30FC\u30FB\u30B5\u30A4\u30BA\u304C\u3042\u308A\u3001\u3053\u308C\u306F\u30BB\u30AD\u30E5\u30EA\u30C6\u30A3\u30FB\u30EA\u30B9\u30AF\u3068\u307F\u306A\u3055\u308C\u307E\u3059\u3002\u3053\u306E\u30AD\u30FC\u30FB\u30B5\u30A4\u30BA\u306F\u5C06\u6765\u306E\u66F4\u65B0\u3067\u7121\u52B9\u5316\u3055\u308C\u307E\u3059\u3002"},
-        {"The.1.signing.key.has.a.keysize.of.2.which.is.considered.a.security.risk.and.is.disabled.",
-                "%1$s\u7F72\u540D\u30AD\u30FC\u306B\u306F%2$d\u306E\u30AD\u30FC\u30FB\u30B5\u30A4\u30BA\u304C\u3042\u308A\u3001\u3053\u308C\u306F\u30BB\u30AD\u30E5\u30EA\u30C6\u30A3\u30FB\u30EA\u30B9\u30AF\u3068\u307F\u306A\u3055\u308C\u307E\u3059\u3002"},
+        {"size.bit.alg",
+                "%1$d\u30D3\u30C3\u30C8%2$s"},
+        {"The.full.keyAlgName.signing.key.is.considered.a.security.risk..It.will.be.disabled.in.a.future.update.",
+                "%s\u7F72\u540D\u30AD\u30FC\u306F\u30BB\u30AD\u30E5\u30EA\u30C6\u30A3\u30FB\u30EA\u30B9\u30AF\u3068\u307F\u306A\u3055\u308C\u307E\u3059\u3002\u4ECA\u5F8C\u306E\u66F4\u65B0\u3067\u306F\u7121\u52B9\u306B\u306A\u308A\u307E\u3059\u3002"},
+        {"The.full.keyAlgName.signing.key.is.considered.a.security.risk.and.is.disabled.",
+                "%s\u7F72\u540D\u30AD\u30FC\u306F\u30BB\u30AD\u30E5\u30EA\u30C6\u30A3\u30FB\u30EA\u30B9\u30AF\u3068\u307F\u306A\u3055\u308C\u3001\u7121\u52B9\u306B\u306A\u3063\u3066\u3044\u307E\u3059\u3002"},
         {"This.jar.contains.entries.whose.certificate.chain.is.invalid.reason.1",
                  "\u3053\u306Ejar\u306B\u306F\u3001\u8A3C\u660E\u66F8\u30C1\u30A7\u30FC\u30F3\u304C\u7121\u52B9\u306A\u30A8\u30F3\u30C8\u30EA\u304C\u542B\u307E\u308C\u3066\u3044\u307E\u3059\u3002\u7406\u7531: %s"},
         {"This.jar.contains.entries.whose.tsa.certificate.chain.is.invalid.reason.1",
diff --git a/src/jdk.jartool/share/classes/sun/security/tools/jarsigner/Resources_zh_CN.java b/src/jdk.jartool/share/classes/sun/security/tools/jarsigner/Resources_zh_CN.java
index 843ac92f6a7..44fa18f3541 100644
--- a/src/jdk.jartool/share/classes/sun/security/tools/jarsigner/Resources_zh_CN.java
+++ b/src/jdk.jartool/share/classes/sun/security/tools/jarsigner/Resources_zh_CN.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -173,12 +173,9 @@ public class Resources_zh_CN extends java.util.ListResourceBundle {
         {"with.algparams.weak", "%1$s \u4F7F\u7528 %2$s\uFF08\u5F31\uFF09"},
         {"with.disabled", "%s\uFF08\u7981\u7528\uFF09"},
         {"with.algparams.disabled", "%1$s \u4F7F\u7528 %2$s\uFF08\u7981\u7528\uFF09"},
-        {"key.bit", "%d \u4F4D\u5BC6\u94A5"},
-        {"key.bit.weak", "%d \u4F4D\u5BC6\u94A5 (\u5F31)"},
-        {"key.bit.eccurve.weak", "%1$d \u4F4D %2$s \u5BC6\u94A5 (\u5F31)"},
-        {"key.bit.disabled", "%d \u4F4D\u5BC6\u94A5\uFF08\u7981\u7528\uFF09"},
-        {"key.bit.eccurve.disabled", "%1$d \u4F4D %2$s \u5BC6\u94A5\uFF08\u7981\u7528\uFF09"},
-        {"unknown.size", "\u672A\u77E5\u5927\u5C0F"},
+        {"key.bit", "%s \u5BC6\u94A5"},
+        {"key.bit.weak", "%s \u5BC6\u94A5\uFF08\u5F31\uFF09"},
+        {"key.bit.disabled", "%s \u5BC6\u94A5\uFF08\u5DF2\u7981\u7528\uFF09"},
         {"nonexistent.entries.found", "\u6B64 jar \u7684\u6587\u4EF6\u5305\u542B\u4E0D\u5B58\u5728\u7684\u7B7E\u540D\u6761\u76EE\u3002\u6709\u5173\u66F4\u591A\u8BE6\u7EC6\u4FE1\u606F\uFF0C\u8BF7\u53C2\u89C1 -verbose \u8F93\u51FA\u3002"},
         {"external.file.attributes.detected", "\u68C0\u6D4B\u5230 POSIX \u6587\u4EF6\u6743\u9650\u548C/\u6216 symlink \u5C5E\u6027\u3002\u8FD9\u4E9B\u5C5E\u6027\u5728\u8FDB\u884C\u7B7E\u540D\u65F6\u4F1A\u88AB\u5FFD\u7565\uFF0C\u4E0D\u53D7\u8BE5\u7B7E\u540D\u7684\u4FDD\u62A4\u3002"},
 
@@ -295,10 +292,12 @@ public class Resources_zh_CN extends java.util.ListResourceBundle {
                 "%1$s \u6458\u8981\u7B97\u6CD5\u88AB\u89C6\u4E3A\u5B58\u5728\u5B89\u5168\u98CE\u9669\u3002\u6B64\u7B97\u6CD5\u5C06\u5728\u672A\u6765\u7684\u66F4\u65B0\u4E2D\u88AB\u7981\u7528\u3002"},
         {"The.signature.algorithm.1.is.considered.a.security.risk..This.algorithm.will.be.disabled.in.a.future.update.",
                 "%1$s \u7B7E\u540D\u7B97\u6CD5\u88AB\u89C6\u4E3A\u5B58\u5728\u5B89\u5168\u98CE\u9669\u3002\u6B64\u7B97\u6CD5\u5C06\u5728\u672A\u6765\u7684\u66F4\u65B0\u4E2D\u88AB\u7981\u7528\u3002"},
-        {"The.1.signing.key.has.a.keysize.of.2.which.is.considered.a.security.risk..This.key.size.will.be.disabled.in.a.future.update.",
-                "%1$s \u7B7E\u540D\u5BC6\u94A5\u7684\u5BC6\u94A5\u5927\u5C0F %2$d \u88AB\u89C6\u4E3A\u5B58\u5728\u5B89\u5168\u98CE\u9669\u3002\u6B64\u5BC6\u94A5\u5927\u5C0F\u5C06\u5728\u672A\u6765\u7684\u66F4\u65B0\u4E2D\u88AB\u7981\u7528\u3002"},
-        {"The.1.signing.key.has.a.keysize.of.2.which.is.considered.a.security.risk.and.is.disabled.",
-                "%1$s \u7B7E\u540D\u5BC6\u94A5\u7684\u5BC6\u94A5\u5927\u5C0F %2$d \u88AB\u89C6\u4E3A\u5B58\u5728\u5B89\u5168\u98CE\u9669\u800C\u4E14\u88AB\u7981\u7528\u3002"},
+        {"size.bit.alg",
+                "%1$d \u4F4D %2$s"},
+        {"The.full.keyAlgName.signing.key.is.considered.a.security.risk..It.will.be.disabled.in.a.future.update.",
+                "%s \u7B7E\u540D\u5BC6\u94A5\u88AB\u89C6\u4E3A\u5B89\u5168\u98CE\u9669\u3002\u5728\u5C06\u6765\u7684\u66F4\u65B0\u4E2D\u5C06\u7981\u7528\u5B83\u3002"},
+        {"The.full.keyAlgName.signing.key.is.considered.a.security.risk.and.is.disabled.",
+                "%s \u7B7E\u540D\u5BC6\u94A5\u88AB\u89C6\u4E3A\u5B89\u5168\u98CE\u9669\u5E76\u88AB\u7981\u7528\u3002"},
         {"This.jar.contains.entries.whose.certificate.chain.is.invalid.reason.1",
                  "\u6B64 jar \u5305\u542B\u5176\u8BC1\u4E66\u94FE\u65E0\u6548\u7684\u6761\u76EE\u3002\u539F\u56E0: %s"},
         {"This.jar.contains.entries.whose.tsa.certificate.chain.is.invalid.reason.1",

From 7314efc9483c5db6ecccd9215c04d78818e6a9a2 Mon Sep 17 00:00:00 2001
From: David Holmes <dholmes@openjdk.org>
Date: Fri, 7 Mar 2025 03:48:49 +0000
Subject: [PATCH 255/587] 8351377: Fix the ProblemList for
 com/sun/management/OperatingSystemMXBean cpuLoad tests on AIX

Reviewed-by: darcy
---
 test/jdk/ProblemList.txt | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/test/jdk/ProblemList.txt b/test/jdk/ProblemList.txt
index 5ba6b33433c..65037b644c8 100644
--- a/test/jdk/ProblemList.txt
+++ b/test/jdk/ProblemList.txt
@@ -537,11 +537,9 @@ java/io/IO/IO.java                                              8337935 linux-pp
 
 # jdk_management
 
-com/sun/management/OperatingSystemMXBean/GetProcessCpuLoad.java 8030957 aix-all
-com/sun/management/OperatingSystemMXBean/GetSystemCpuLoad.java  8030957 aix-all
-
-com/sun/management/OperatingSystemMXBean/GetProcessCpuLoad.java 8351002 windows-all
-com/sun/management/OperatingSystemMXBean/GetSystemCpuLoad.java  8351002 windows-all
+# First bug for AIX, second for Windows
+com/sun/management/OperatingSystemMXBean/GetProcessCpuLoad.java 8030957,8351002 aix-all,windows-all
+com/sun/management/OperatingSystemMXBean/GetSystemCpuLoad.java  8030957,8351002 aix-all,windows-all
 
 java/lang/management/MemoryMXBean/Pending.java                  8158837 generic-all
 java/lang/management/MemoryMXBean/PendingAllGC.sh               8158837 generic-all

From 4066f33a0b9a080d87acd60056b3dbfc9348ab5e Mon Sep 17 00:00:00 2001
From: Afshin Zafari <azafari@openjdk.org>
Date: Fri, 7 Mar 2025 09:06:12 +0000
Subject: [PATCH 256/587] 8350565: NMT: remaining memory flag/type to be
 replaced with memory tag

Reviewed-by: gziemski, jsjolen
---
 src/hotspot/share/nmt/mallocTracker.hpp       | 18 ++++++-------
 .../share/nmt/mallocTracker.inline.hpp        |  4 +--
 src/hotspot/share/nmt/memBaseline.cpp         | 16 ++++++------
 src/hotspot/share/nmt/memBaseline.hpp         | 10 +++----
 src/hotspot/share/nmt/memReporter.cpp         | 24 ++++++++---------
 src/hotspot/share/nmt/memReporter.hpp         |  6 ++---
 src/hotspot/share/nmt/memTracker.cpp          |  2 +-
 src/hotspot/share/nmt/memTracker.hpp          |  6 ++---
 src/hotspot/share/nmt/memoryFileTracker.cpp   |  6 ++---
 src/hotspot/share/nmt/memoryFileTracker.hpp   |  4 +--
 src/hotspot/share/nmt/nmtCommon.cpp           |  4 +--
 src/hotspot/share/nmt/nmtCommon.hpp           |  6 ++---
 src/hotspot/share/nmt/nmtUsage.cpp            |  4 +--
 .../share/nmt/virtualMemoryTracker.cpp        |  2 +-
 .../share/nmt/virtualMemoryTracker.hpp        | 26 +++++++++----------
 src/hotspot/share/nmt/vmatree.hpp             |  4 +--
 .../gtest/nmt/test_nmt_memoryfiletracker.cpp  | 12 ++++-----
 17 files changed, 77 insertions(+), 77 deletions(-)

diff --git a/src/hotspot/share/nmt/mallocTracker.hpp b/src/hotspot/share/nmt/mallocTracker.hpp
index de30f32373e..dacec5c6dbf 100644
--- a/src/hotspot/share/nmt/mallocTracker.hpp
+++ b/src/hotspot/share/nmt/mallocTracker.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2025, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2021, 2023 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -145,7 +145,7 @@ class MallocMemory {
 class MallocMemorySummary;
 
 // A snapshot of malloc'd memory, includes malloc memory
-// usage by types and memory used by tracking itself.
+// usage by tags and memory used by tracking itself.
 class MallocMemorySnapshot {
   friend class MallocMemorySummary;
 
@@ -155,12 +155,12 @@ class MallocMemorySnapshot {
 
 
  public:
-  inline MallocMemory* by_type(MemTag mem_tag) {
+  inline MallocMemory* by_tag(MemTag mem_tag) {
     int index = NMTUtil::tag_to_index(mem_tag);
     return &_malloc[index];
   }
 
-  inline const MallocMemory* by_type(MemTag mem_tag) const {
+  inline const MallocMemory* by_tag(MemTag mem_tag) const {
     int index = NMTUtil::tag_to_index(mem_tag);
     return &_malloc[index];
   }
@@ -220,25 +220,25 @@ class MallocMemorySummary : AllStatic {
    static void initialize();
 
    static inline void record_malloc(size_t size, MemTag mem_tag) {
-     as_snapshot()->by_type(mem_tag)->record_malloc(size);
+     as_snapshot()->by_tag(mem_tag)->record_malloc(size);
      as_snapshot()->_all_mallocs.allocate(size);
    }
 
    static inline void record_free(size_t size, MemTag mem_tag) {
-     as_snapshot()->by_type(mem_tag)->record_free(size);
+     as_snapshot()->by_tag(mem_tag)->record_free(size);
      as_snapshot()->_all_mallocs.deallocate(size);
    }
 
    static inline void record_new_arena(MemTag mem_tag) {
-     as_snapshot()->by_type(mem_tag)->record_new_arena();
+     as_snapshot()->by_tag(mem_tag)->record_new_arena();
    }
 
    static inline void record_arena_free(MemTag mem_tag) {
-     as_snapshot()->by_type(mem_tag)->record_arena_free();
+     as_snapshot()->by_tag(mem_tag)->record_arena_free();
    }
 
    static inline void record_arena_size_change(ssize_t size, MemTag mem_tag) {
-     as_snapshot()->by_type(mem_tag)->record_arena_size_change(size);
+     as_snapshot()->by_tag(mem_tag)->record_arena_size_change(size);
    }
 
    static void snapshot(MallocMemorySnapshot* s) {
diff --git a/src/hotspot/share/nmt/mallocTracker.inline.hpp b/src/hotspot/share/nmt/mallocTracker.inline.hpp
index 19d3775ed77..b2aec345eff 100644
--- a/src/hotspot/share/nmt/mallocTracker.inline.hpp
+++ b/src/hotspot/share/nmt/mallocTracker.inline.hpp
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2023 SAP SE. All rights reserved.
- * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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 @@ inline bool MallocMemorySummary::check_exceeds_limit(size_t s, MemTag mem_tag) {
       // Category Limit?
       l = MallocLimitHandler::category_limit(mem_tag);
       if (l->sz > 0) {
-        const MallocMemory* mm = as_snapshot()->by_type(mem_tag);
+        const MallocMemory* mm = as_snapshot()->by_tag(mem_tag);
         size_t so_far = mm->malloc_size() + mm->arena_size();
         if ((so_far + s) > l->sz) {
           return category_limit_reached(mem_tag, s, so_far, l);
diff --git a/src/hotspot/share/nmt/memBaseline.cpp b/src/hotspot/share/nmt/memBaseline.cpp
index 6b18dad21bd..5f5431b765f 100644
--- a/src/hotspot/share/nmt/memBaseline.cpp
+++ b/src/hotspot/share/nmt/memBaseline.cpp
@@ -61,7 +61,7 @@ int compare_malloc_site(const MallocSite& s1, const MallocSite& s2) {
 }
 
 // Sort into allocation site addresses and memory tag order for baseline comparison
-int compare_malloc_site_and_type(const MallocSite& s1, const MallocSite& s2) {
+int compare_malloc_site_and_tag(const MallocSite& s1, const MallocSite& s2) {
   int res = compare_malloc_site(s1, s2);
   if (res == 0) {
     res = (int)(NMTUtil::tag_to_index(s1.mem_tag()) - NMTUtil::tag_to_index(s2.mem_tag()));
@@ -231,8 +231,8 @@ MallocSiteIterator MemBaseline::malloc_sites(SortingOrder order) {
     case by_site:
       malloc_sites_to_allocation_site_order();
       break;
-    case by_site_and_type:
-      malloc_sites_to_allocation_site_and_type_order();
+    case by_site_and_tag:
+      malloc_sites_to_allocation_site_and_tag_order();
       break;
     case by_address:
     default:
@@ -272,7 +272,7 @@ void MemBaseline::malloc_sites_to_size_order() {
 }
 
 void MemBaseline::malloc_sites_to_allocation_site_order() {
-  if (_malloc_sites_order != by_site && _malloc_sites_order != by_site_and_type) {
+  if (_malloc_sites_order != by_site && _malloc_sites_order != by_site_and_tag) {
     SortedLinkedList<MallocSite, compare_malloc_site> tmp;
     // Add malloc sites to sorted linked list to sort into site (address) order
     tmp.move(&_malloc_sites);
@@ -282,14 +282,14 @@ void MemBaseline::malloc_sites_to_allocation_site_order() {
   }
 }
 
-void MemBaseline::malloc_sites_to_allocation_site_and_type_order() {
-  if (_malloc_sites_order != by_site_and_type) {
-    SortedLinkedList<MallocSite, compare_malloc_site_and_type> tmp;
+void MemBaseline::malloc_sites_to_allocation_site_and_tag_order() {
+  if (_malloc_sites_order != by_site_and_tag) {
+    SortedLinkedList<MallocSite, compare_malloc_site_and_tag> tmp;
     // Add malloc sites to sorted linked list to sort into site (address) order
     tmp.move(&_malloc_sites);
     _malloc_sites.set_head(tmp.head());
     tmp.set_head(nullptr);
-    _malloc_sites_order = by_site_and_type;
+    _malloc_sites_order = by_site_and_tag;
   }
 }
 
diff --git a/src/hotspot/share/nmt/memBaseline.hpp b/src/hotspot/share/nmt/memBaseline.hpp
index be389e375e3..2fff4cc666c 100644
--- a/src/hotspot/share/nmt/memBaseline.hpp
+++ b/src/hotspot/share/nmt/memBaseline.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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 @@ class MemBaseline {
     by_address,      // by memory address
     by_size,         // by memory size
     by_site,         // by call site where the memory is allocated from
-    by_site_and_type // by call site and memory tag
+    by_site_and_tag  // by call site and memory tag
   };
 
  private:
@@ -146,12 +146,12 @@ class MemBaseline {
 
   MallocMemory* malloc_memory(MemTag mem_tag) {
     assert(baseline_type() != Not_baselined, "Not yet baselined");
-    return _malloc_memory_snapshot.by_type(mem_tag);
+    return _malloc_memory_snapshot.by_tag(mem_tag);
   }
 
   VirtualMemory* virtual_memory(MemTag mem_tag) {
     assert(baseline_type() != Not_baselined, "Not yet baselined");
-    return _virtual_memory_snapshot.by_type(mem_tag);
+    return _virtual_memory_snapshot.by_tag(mem_tag);
   }
 
 
@@ -204,7 +204,7 @@ class MemBaseline {
   // Sort allocation sites in call site address order
   void malloc_sites_to_allocation_site_order();
   // Sort allocation sites in call site address and memory tag order
-  void malloc_sites_to_allocation_site_and_type_order();
+  void malloc_sites_to_allocation_site_and_tag_order();
 
   // Sort allocation sites in reserved size order
   void virtual_memory_sites_to_size_order();
diff --git a/src/hotspot/share/nmt/memReporter.cpp b/src/hotspot/share/nmt/memReporter.cpp
index 38c1ab5a667..c7327782a4a 100644
--- a/src/hotspot/share/nmt/memReporter.cpp
+++ b/src/hotspot/share/nmt/memReporter.cpp
@@ -79,7 +79,7 @@ void MemReporterBase::print_malloc(const MemoryCounter* c, MemTag mem_tag) const
   const size_t count = c->count();
 
   if (mem_tag != mtNone) {
-    out->print("(%s%zu%s type=%s", alloc_type,
+    out->print("(%s%zu%s tag=%s", alloc_type,
       amount_in_current_scale(amount), scale, NMTUtil::tag_to_name(mem_tag));
   } else {
     out->print("(%s%zu%s", alloc_type,
@@ -181,14 +181,14 @@ void MemSummaryReporter::report() {
     MemTag mem_tag = NMTUtil::index_to_tag(index);
     // thread stack is reported as part of thread category
     if (mem_tag == mtThreadStack) continue;
-    MallocMemory* malloc_memory = _malloc_snapshot->by_type(mem_tag);
-    VirtualMemory* virtual_memory = _vm_snapshot->by_type(mem_tag);
+    MallocMemory* malloc_memory = _malloc_snapshot->by_tag(mem_tag);
+    VirtualMemory* virtual_memory = _vm_snapshot->by_tag(mem_tag);
 
-    report_summary_of_type(mem_tag, malloc_memory, virtual_memory);
+    report_summary_of_tag(mem_tag, malloc_memory, virtual_memory);
   }
 }
 
-void MemSummaryReporter::report_summary_of_type(MemTag mem_tag,
+void MemSummaryReporter::report_summary_of_tag(MemTag mem_tag,
   MallocMemory*  malloc_memory, VirtualMemory* virtual_memory) {
 
   size_t reserved_amount  = reserved_total (malloc_memory, virtual_memory);
@@ -197,7 +197,7 @@ void MemSummaryReporter::report_summary_of_type(MemTag mem_tag,
   // Count thread's native stack in "Thread" category
   if (mem_tag == mtThread) {
     const VirtualMemory* thread_stack_usage =
-      (const VirtualMemory*)_vm_snapshot->by_type(mtThreadStack);
+      (const VirtualMemory*)_vm_snapshot->by_tag(mtThreadStack);
     reserved_amount  += thread_stack_usage->reserved();
     committed_amount += thread_stack_usage->committed();
   } else if (mem_tag == mtNMT) {
@@ -239,7 +239,7 @@ void MemSummaryReporter::report_summary_of_type(MemTag mem_tag,
                   _instance_class_count, _array_class_count);
   } else if (mem_tag == mtThread) {
     const VirtualMemory* thread_stack_usage =
-     _vm_snapshot->by_type(mtThreadStack);
+     _vm_snapshot->by_tag(mtThreadStack);
     // report thread count
     out->print_cr("(threads #%zu)", ThreadStackTracker::thread_count());
     out->print("(stack: ");
@@ -380,7 +380,7 @@ int MemDetailReporter::report_virtual_memory_allocation_sites()  {
       print_total(virtual_memory_site->reserved(), virtual_memory_site->committed());
       const MemTag mem_tag = virtual_memory_site->mem_tag();
       if (mem_tag != mtNone) {
-        out->print(" Type=%s", NMTUtil::tag_to_name(mem_tag));
+        out->print(" Tag=%s", NMTUtil::tag_to_name(mem_tag));
       }
       out->print_cr(")");
     )
@@ -524,7 +524,7 @@ void MemSummaryDiffReporter::report_diff() {
     MemTag mem_tag = NMTUtil::index_to_tag(index);
     // thread stack is reported as part of thread category
     if (mem_tag == mtThreadStack) continue;
-    diff_summary_of_type(mem_tag,
+    diff_summary_of_tag(mem_tag,
       _early_baseline.malloc_memory(mem_tag),
       _early_baseline.virtual_memory(mem_tag),
       _early_baseline.metaspace_stats(),
@@ -594,7 +594,7 @@ void MemSummaryDiffReporter::print_virtual_memory_diff(size_t current_reserved,
 }
 
 
-void MemSummaryDiffReporter::diff_summary_of_type(MemTag mem_tag,
+void MemSummaryDiffReporter::diff_summary_of_tag(MemTag mem_tag,
   const MallocMemory* early_malloc, const VirtualMemory* early_vm,
   const MetaspaceCombinedStats& early_ms,
   const MallocMemory* current_malloc, const VirtualMemory* current_vm,
@@ -795,8 +795,8 @@ void MemDetailDiffReporter::report_diff() {
 }
 
 void MemDetailDiffReporter::diff_malloc_sites() const {
-  MallocSiteIterator early_itr = _early_baseline.malloc_sites(MemBaseline::by_site_and_type);
-  MallocSiteIterator current_itr = _current_baseline.malloc_sites(MemBaseline::by_site_and_type);
+  MallocSiteIterator early_itr = _early_baseline.malloc_sites(MemBaseline::by_site_and_tag);
+  MallocSiteIterator current_itr = _current_baseline.malloc_sites(MemBaseline::by_site_and_tag);
 
   const MallocSite* early_site   = early_itr.next();
   const MallocSite* current_site = current_itr.next();
diff --git a/src/hotspot/share/nmt/memReporter.hpp b/src/hotspot/share/nmt/memReporter.hpp
index 773377b5e20..05b1588f38b 100644
--- a/src/hotspot/share/nmt/memReporter.hpp
+++ b/src/hotspot/share/nmt/memReporter.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -139,7 +139,7 @@ class MemSummaryReporter : public MemReporterBase {
   virtual void report();
  private:
   // Report summary for each memory tag
-  void report_summary_of_type(MemTag mem_tag, MallocMemory* malloc_memory,
+  void report_summary_of_tag(MemTag mem_tag, MallocMemory* malloc_memory,
     VirtualMemory* virtual_memory);
 
   void report_metadata(Metaspace::MetadataType type) const;
@@ -204,7 +204,7 @@ class MemSummaryDiffReporter : public MemReporterBase {
 
  private:
   // report the comparison of each mem_tag
-  void diff_summary_of_type(MemTag mem_tag,
+  void diff_summary_of_tag(MemTag mem_tag,
     const MallocMemory* early_malloc, const VirtualMemory* early_vm,
     const MetaspaceCombinedStats& early_ms,
     const MallocMemory* current_malloc, const VirtualMemory* current_vm,
diff --git a/src/hotspot/share/nmt/memTracker.cpp b/src/hotspot/share/nmt/memTracker.cpp
index 8f84948fa5c..1821f7bd10d 100644
--- a/src/hotspot/share/nmt/memTracker.cpp
+++ b/src/hotspot/share/nmt/memTracker.cpp
@@ -62,7 +62,7 @@ void MemTracker::initialize() {
   assert(level == NMT_off || level == NMT_summary || level == NMT_detail,
          "Invalid setting for NativeMemoryTracking (%s)", NativeMemoryTracking);
 
-  // Memory type is encoded into tracking header as a byte field,
+  // Memory tag is encoded into tracking header as a byte field,
   // make sure that we don't overflow it.
   STATIC_ASSERT(mt_number_of_tags <= max_jubyte);
 
diff --git a/src/hotspot/share/nmt/memTracker.hpp b/src/hotspot/share/nmt/memTracker.hpp
index 70125a1a019..38b97dba69c 100644
--- a/src/hotspot/share/nmt/memTracker.hpp
+++ b/src/hotspot/share/nmt/memTracker.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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,7 +210,7 @@ class MemTracker : AllStatic {
   //  be fully uncommitted.
   //
   // The two new memory regions will be both registered under stack and
-  //  memory flags of the original region.
+  //  memory tags of the original region.
   static inline void record_virtual_memory_split_reserved(void* addr, size_t size, size_t split, MemTag mem_tag, MemTag split_tag) {
     assert_post_init();
     if (!enabled()) return;
@@ -225,7 +225,7 @@ class MemTracker : AllStatic {
     if (!enabled()) return;
     if (addr != nullptr) {
       NmtVirtualMemoryLocker nvml;
-      VirtualMemoryTracker::set_reserved_region_type((address)addr, mem_tag);
+      VirtualMemoryTracker::set_reserved_region_tag((address)addr, mem_tag);
     }
   }
 
diff --git a/src/hotspot/share/nmt/memoryFileTracker.cpp b/src/hotspot/share/nmt/memoryFileTracker.cpp
index f4dac97d2da..2b354161408 100644
--- a/src/hotspot/share/nmt/memoryFileTracker.cpp
+++ b/src/hotspot/share/nmt/memoryFileTracker.cpp
@@ -44,7 +44,7 @@ void MemoryFileTracker::allocate_memory(MemoryFile* file, size_t offset,
   VMATree::RegionData regiondata(sidx, mem_tag);
   VMATree::SummaryDiff diff = file->_tree.commit_mapping(offset, size, regiondata);
   for (int i = 0; i < mt_number_of_tags; i++) {
-    VirtualMemory* summary = file->_summary.by_type(NMTUtil::index_to_tag(i));
+    VirtualMemory* summary = file->_summary.by_tag(NMTUtil::index_to_tag(i));
     summary->reserve_memory(diff.tag[i].commit);
     summary->commit_memory(diff.tag[i].commit);
   }
@@ -53,7 +53,7 @@ void MemoryFileTracker::allocate_memory(MemoryFile* file, size_t offset,
 void MemoryFileTracker::free_memory(MemoryFile* file, size_t offset, size_t size) {
   VMATree::SummaryDiff diff = file->_tree.release_mapping(offset, size);
   for (int i = 0; i < mt_number_of_tags; i++) {
-    VirtualMemory* summary = file->_summary.by_type(NMTUtil::index_to_tag(i));
+    VirtualMemory* summary = file->_summary.by_tag(NMTUtil::index_to_tag(i));
     summary->reserve_memory(diff.tag[i].commit);
     summary->commit_memory(diff.tag[i].commit);
   }
@@ -176,7 +176,7 @@ const GrowableArrayCHeap<MemoryFileTracker::MemoryFile*, mtNMT>& MemoryFileTrack
 
 void MemoryFileTracker::summary_snapshot(VirtualMemorySnapshot* snapshot) const {
   iterate_summary([&](MemTag tag, const VirtualMemory* current) {
-    VirtualMemory* snap = snapshot->by_type(tag);
+    VirtualMemory* snap = snapshot->by_tag(tag);
     // Only account the committed memory.
     snap->commit_memory(current->committed());
   });
diff --git a/src/hotspot/share/nmt/memoryFileTracker.hpp b/src/hotspot/share/nmt/memoryFileTracker.hpp
index 035e9b466e2..cda5614b59e 100644
--- a/src/hotspot/share/nmt/memoryFileTracker.hpp
+++ b/src/hotspot/share/nmt/memoryFileTracker.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2024, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -78,7 +78,7 @@ public:
     for (int d = 0; d < _files.length(); d++) {
       const MemoryFile* file = _files.at(d);
       for (int i = 0; i < mt_number_of_tags; i++) {
-        f(NMTUtil::index_to_tag(i), file->_summary.by_type(NMTUtil::index_to_tag(i)));
+        f(NMTUtil::index_to_tag(i), file->_summary.by_tag(NMTUtil::index_to_tag(i)));
       }
     }
   }
diff --git a/src/hotspot/share/nmt/nmtCommon.cpp b/src/hotspot/share/nmt/nmtCommon.cpp
index 318762a7ce7..834f27152ee 100644
--- a/src/hotspot/share/nmt/nmtCommon.cpp
+++ b/src/hotspot/share/nmt/nmtCommon.cpp
@@ -29,8 +29,8 @@ STATIC_ASSERT(NMT_off > NMT_unknown);
 STATIC_ASSERT(NMT_summary > NMT_off);
 STATIC_ASSERT(NMT_detail > NMT_summary);
 
-#define MEMORY_TAG_DECLARE_NAME(type, human_readable) \
-  { #type, human_readable },
+#define MEMORY_TAG_DECLARE_NAME(tag, human_readable) \
+  { #tag, human_readable },
 
 NMTUtil::S NMTUtil::_strings[] = {
   MEMORY_TAG_DO(MEMORY_TAG_DECLARE_NAME)
diff --git a/src/hotspot/share/nmt/nmtCommon.hpp b/src/hotspot/share/nmt/nmtCommon.hpp
index 3f72960f21f..5ba066a29d1 100644
--- a/src/hotspot/share/nmt/nmtCommon.hpp
+++ b/src/hotspot/share/nmt/nmtCommon.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2025, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2021, 2023 SAP SE. All rights reserved.
 
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -88,7 +88,7 @@ class NMTUtil : AllStatic {
 
   // Map memory tag to index
   static inline int tag_to_index(MemTag mem_tag) {
-    assert(tag_is_valid(mem_tag), "Invalid type (%u)", (unsigned)mem_tag);
+    assert(tag_is_valid(mem_tag), "Invalid tag (%u)", (unsigned)mem_tag);
     return static_cast<int>(mem_tag);
   }
 
@@ -104,7 +104,7 @@ class NMTUtil : AllStatic {
 
   // Map an index to memory tag
   static MemTag index_to_tag(int index) {
-    assert(tag_index_is_valid(index), "Invalid type index (%d)", index);
+    assert(tag_index_is_valid(index), "Invalid tag index (%d)", index);
     return static_cast<MemTag>(index);
   }
 
diff --git a/src/hotspot/share/nmt/nmtUsage.cpp b/src/hotspot/share/nmt/nmtUsage.cpp
index 771f5076160..b3be01116a5 100644
--- a/src/hotspot/share/nmt/nmtUsage.cpp
+++ b/src/hotspot/share/nmt/nmtUsage.cpp
@@ -60,7 +60,7 @@ void NMTUsage::update_malloc_usage() {
   size_t total_arena_size = 0;
   for (int i = 0; i < mt_number_of_tags; i++) {
     MemTag mem_tag = NMTUtil::index_to_tag(i);
-    const MallocMemory* mm = ms->by_type(mem_tag);
+    const MallocMemory* mm = ms->by_tag(mem_tag);
     _malloc_by_type[i] = mm->malloc_size() + mm->arena_size();
     total_arena_size +=  mm->arena_size();
   }
@@ -84,7 +84,7 @@ void NMTUsage::update_vm_usage() {
   _vm_total.reserved = 0;
   for (int i = 0; i < mt_number_of_tags; i++) {
     MemTag mem_tag = NMTUtil::index_to_tag(i);
-    const VirtualMemory* vm = vms->by_type(mem_tag);
+    const VirtualMemory* vm = vms->by_tag(mem_tag);
 
     _vm_by_type[i].reserved = vm->reserved();
     _vm_by_type[i].committed = vm->committed();
diff --git a/src/hotspot/share/nmt/virtualMemoryTracker.cpp b/src/hotspot/share/nmt/virtualMemoryTracker.cpp
index 231ca6f8875..d5cba7ad82d 100644
--- a/src/hotspot/share/nmt/virtualMemoryTracker.cpp
+++ b/src/hotspot/share/nmt/virtualMemoryTracker.cpp
@@ -413,7 +413,7 @@ bool VirtualMemoryTracker::add_reserved_region(address base_addr, size_t size,
   }
 }
 
-void VirtualMemoryTracker::set_reserved_region_type(address addr, MemTag mem_tag) {
+void VirtualMemoryTracker::set_reserved_region_tag(address addr, MemTag mem_tag) {
   assert(addr != nullptr, "Invalid address");
   assert(_reserved_regions != nullptr, "Sanity check");
   MemTracker::assert_locked();
diff --git a/src/hotspot/share/nmt/virtualMemoryTracker.hpp b/src/hotspot/share/nmt/virtualMemoryTracker.hpp
index 6e36d3a858a..0b31bf5daa3 100644
--- a/src/hotspot/share/nmt/virtualMemoryTracker.hpp
+++ b/src/hotspot/share/nmt/virtualMemoryTracker.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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,12 +98,12 @@ class VirtualMemorySnapshot : public ResourceObj {
   VirtualMemory  _virtual_memory[mt_number_of_tags];
 
  public:
-  inline VirtualMemory* by_type(MemTag mem_tag) {
+  inline VirtualMemory* by_tag(MemTag mem_tag) {
     int index = NMTUtil::tag_to_index(mem_tag);
     return &_virtual_memory[index];
   }
 
-  inline const VirtualMemory* by_type(MemTag mem_tag) const {
+  inline const VirtualMemory* by_tag(MemTag mem_tag) const {
     int index = NMTUtil::tag_to_index(mem_tag);
     return &_virtual_memory[index];
   }
@@ -135,33 +135,33 @@ class VirtualMemorySummary : AllStatic {
  public:
 
   static inline void record_reserved_memory(size_t size, MemTag mem_tag) {
-    as_snapshot()->by_type(mem_tag)->reserve_memory(size);
+    as_snapshot()->by_tag(mem_tag)->reserve_memory(size);
   }
 
   static inline void record_committed_memory(size_t size, MemTag mem_tag) {
-    as_snapshot()->by_type(mem_tag)->commit_memory(size);
+    as_snapshot()->by_tag(mem_tag)->commit_memory(size);
   }
 
   static inline void record_uncommitted_memory(size_t size, MemTag mem_tag) {
-    as_snapshot()->by_type(mem_tag)->uncommit_memory(size);
+    as_snapshot()->by_tag(mem_tag)->uncommit_memory(size);
   }
 
   static inline void record_released_memory(size_t size, MemTag mem_tag) {
-    as_snapshot()->by_type(mem_tag)->release_memory(size);
+    as_snapshot()->by_tag(mem_tag)->release_memory(size);
   }
 
   // Move virtual memory from one memory tag to another.
   // Virtual memory can be reserved before it is associated with a memory tag, and tagged
   // as 'unknown'. Once the memory is tagged, the virtual memory will be moved from 'unknown'
-  // type to specified memory tag.
+  // tag to specified memory tag.
   static inline void move_reserved_memory(MemTag from, MemTag to, size_t size) {
-    as_snapshot()->by_type(from)->release_memory(size);
-    as_snapshot()->by_type(to)->reserve_memory(size);
+    as_snapshot()->by_tag(from)->release_memory(size);
+    as_snapshot()->by_tag(to)->reserve_memory(size);
   }
 
   static inline void move_committed_memory(MemTag from, MemTag to, size_t size) {
-    as_snapshot()->by_type(from)->uncommit_memory(size);
-    as_snapshot()->by_type(to)->commit_memory(size);
+    as_snapshot()->by_tag(from)->uncommit_memory(size);
+    as_snapshot()->by_tag(to)->commit_memory(size);
   }
 
   static void snapshot(VirtualMemorySnapshot* s);
@@ -386,7 +386,7 @@ class VirtualMemoryTracker : AllStatic {
   static bool remove_uncommitted_region (address base_addr, size_t size);
   static bool remove_released_region    (address base_addr, size_t size);
   static bool remove_released_region    (ReservedMemoryRegion* rgn);
-  static void set_reserved_region_type  (address addr, MemTag mem_tag);
+  static void set_reserved_region_tag   (address addr, MemTag mem_tag);
 
   // Given an existing memory mapping registered with NMT, split the mapping in
   //  two. The newly created two mappings will be registered under the call
diff --git a/src/hotspot/share/nmt/vmatree.hpp b/src/hotspot/share/nmt/vmatree.hpp
index 75f814c81c0..0c639e929b7 100644
--- a/src/hotspot/share/nmt/vmatree.hpp
+++ b/src/hotspot/share/nmt/vmatree.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2024, 2025, 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.
  *
@@ -96,7 +96,7 @@ private:
   public:
     IntervalState() : type_tag{0,0}, sidx() {}
     IntervalState(const StateType type, const RegionData data) {
-      assert(!(type == StateType::Released) || data.mem_tag == mtNone, "Released type must have memory tag mtNone");
+      assert(!(type == StateType::Released) || data.mem_tag == mtNone, "Released state-type must have memory tag mtNone");
       type_tag[0] = static_cast<uint8_t>(type);
       type_tag[1] = static_cast<uint8_t>(data.mem_tag);
       sidx = data.stack_idx;
diff --git a/test/hotspot/gtest/nmt/test_nmt_memoryfiletracker.cpp b/test/hotspot/gtest/nmt/test_nmt_memoryfiletracker.cpp
index 880b80348df..26c94345125 100644
--- a/test/hotspot/gtest/nmt/test_nmt_memoryfiletracker.cpp
+++ b/test/hotspot/gtest/nmt/test_nmt_memoryfiletracker.cpp
@@ -33,17 +33,17 @@ public:
     MemoryFileTracker tracker(false);
     MemoryFileTracker::MemoryFile* file = tracker.make_file("test");
     tracker.allocate_memory(file, 0, 100, CALLER_PC, mtTest);
-    EXPECT_EQ(file->_summary.by_type(mtTest)->committed(), sz(100));
+    EXPECT_EQ(file->_summary.by_tag(mtTest)->committed(), sz(100));
     tracker.allocate_memory(file, 100, 100, CALLER_PC, mtTest);
-    EXPECT_EQ(file->_summary.by_type(mtTest)->committed(), sz(200));
+    EXPECT_EQ(file->_summary.by_tag(mtTest)->committed(), sz(200));
     tracker.allocate_memory(file, 200, 100, CALLER_PC, mtTest);
-    EXPECT_EQ(file->_summary.by_type(mtTest)->committed(), sz(300));
+    EXPECT_EQ(file->_summary.by_tag(mtTest)->committed(), sz(300));
     tracker.free_memory(file, 0, 300);
-    EXPECT_EQ(file->_summary.by_type(mtTest)->committed(), sz(0));
+    EXPECT_EQ(file->_summary.by_tag(mtTest)->committed(), sz(0));
     tracker.allocate_memory(file, 0, 100, CALLER_PC, mtTest);
-    EXPECT_EQ(file->_summary.by_type(mtTest)->committed(), sz(100));
+    EXPECT_EQ(file->_summary.by_tag(mtTest)->committed(), sz(100));
     tracker.free_memory(file, 50, 10);
-    EXPECT_EQ(file->_summary.by_type(mtTest)->committed(), sz(90));
+    EXPECT_EQ(file->_summary.by_tag(mtTest)->committed(), sz(90));
   };
 };
 

From 155697fc0ed69f1b4f871b00fe67685177bad59a Mon Sep 17 00:00:00 2001
From: SendaoYan <syan@openjdk.org>
Date: Fri, 7 Mar 2025 09:13:06 +0000
Subject: [PATCH 257/587] 8349623: [ASAN] Gtest
 os_linux.glibc_mallinfo_wrapper_vm fails

Reviewed-by: stuefe
---
 test/hotspot/gtest/runtime/test_os_linux.cpp | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/test/hotspot/gtest/runtime/test_os_linux.cpp b/test/hotspot/gtest/runtime/test_os_linux.cpp
index ebb4e53c80f..caa227c5e35 100644
--- a/test/hotspot/gtest/runtime/test_os_linux.cpp
+++ b/test/hotspot/gtest/runtime/test_os_linux.cpp
@@ -444,26 +444,28 @@ TEST_VM(os_linux, decoder_get_source_info_valid_overflow_minimal) {
 #endif // clang
 
 #ifdef __GLIBC__
+#ifndef ADDRESS_SANITIZER
 TEST_VM(os_linux, glibc_mallinfo_wrapper) {
   // Very basic test. Call it. That proves that resolution and invocation works.
   os::Linux::glibc_mallinfo mi;
   bool did_wrap = false;
 
-  os::Linux::get_mallinfo(&mi, &did_wrap);
-
   void* p = os::malloc(2 * K, mtTest);
   ASSERT_NOT_NULL(p);
 
+  os::Linux::get_mallinfo(&mi, &did_wrap);
+
   // We should see total allocation values > 0
   ASSERT_GE((mi.uordblks + mi.hblkhd), 2 * K);
 
-  // These values also should exceed some reasonable size.
+  // These values also should less than some reasonable size.
   ASSERT_LT(mi.fordblks, 2 * G);
   ASSERT_LT(mi.uordblks, 2 * G);
   ASSERT_LT(mi.hblkhd, 2 * G);
 
   os::free(p);
 }
+#endif // ADDRESS_SANITIZER
 #endif // __GLIBC__
 
 #endif // LINUX

From 54fe643e783befb4d215c68e4b1fed351d470435 Mon Sep 17 00:00:00 2001
From: Kevin Walls <kevinw@openjdk.org>
Date: Fri, 7 Mar 2025 13:56:23 +0000
Subject: [PATCH 258/587] 8347433: Deprecate XML interchange in
 java.management/javax/management/modelmbean/DescriptorSupport for removal

Reviewed-by: sspitsyn, dfuchs
---
 .../modelmbean/DescriptorSupport.java         | 23 +++++++++++++++----
 .../modelmbean/RequiredModelMBean.java        |  7 ++----
 .../modelmbean/XMLParseException.java         |  6 ++++-
 3 files changed, 26 insertions(+), 10 deletions(-)

diff --git a/src/java.management/share/classes/javax/management/modelmbean/DescriptorSupport.java b/src/java.management/share/classes/javax/management/modelmbean/DescriptorSupport.java
index ebf08d6f1d9..d003cd9d9d6 100644
--- a/src/java.management/share/classes/javax/management/modelmbean/DescriptorSupport.java
+++ b/src/java.management/share/classes/javax/management/modelmbean/DescriptorSupport.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -201,12 +201,16 @@ public class DescriptorSupport
      * @exception XMLParseException XML parsing problem while parsing
      * the input String
      * @exception MBeanException Wraps a distributed communication Exception.
+     * @deprecated This constructor exists for historical reasons.  If
+     * reading from XML is required, it should be implemented externally.
      */
     /* At some stage we should rewrite this code to be cleverer.  Using
        a StringTokenizer as we do means, first, that we accept a lot of
        bogus strings without noticing they are bogus, and second, that we
        split the string being parsed at characters like > even if they
        occur in the middle of a field value. */
+    @Deprecated(since="25", forRemoval=true)
+    @SuppressWarnings("removal")
     public DescriptorSupport(String inStr)
             throws MBeanException, RuntimeOperationsException,
                    XMLParseException {
@@ -230,6 +234,7 @@ public class DescriptorSupport
         if (!lowerInStr.startsWith("<descriptor>")
             || !lowerInStr.endsWith("</descriptor>")) {
             throw new XMLParseException("No <descriptor>, </descriptor> pair");
+            // XMLParseException is deprecated for removal.
         }
 
         // parse xmlstring into structures
@@ -284,11 +289,13 @@ public class DescriptorSupport
                         final String msg =
                             "Expected `name' or `value', got `" + tok + "'";
                         throw new XMLParseException(msg);
+                        // XMLParseException is deprecated for removal.
                     }
                 } else { // xml parse exception
                     final String msg =
                         "Expected `keyword=value', got `" + tok + "'";
                     throw new XMLParseException(msg);
+                    // XMLParseException is deprecated for removal.
                 }
             }
         }  // while tokens
@@ -967,7 +974,10 @@ public class DescriptorSupport
      * field Names or field Values.  If the XML formatted string
      * construction fails for any reason, this exception will be
      * thrown.
+     * @deprecated This method exists for historical reasons.  If
+     * writing to XML is required, it should be implemented externally.
      */
+    @Deprecated(since="25", forRemoval=true)
     public synchronized String toXMLString() {
         final StringBuilder buf = new StringBuilder("<Descriptor>");
         Set<Map.Entry<String, Object>> returnedSet = descriptorMap.entrySet();
@@ -1057,9 +1067,12 @@ public class DescriptorSupport
         return buf.toString();
     }
 
+    @SuppressWarnings("removal")
     private static String unquote(String s) throws XMLParseException {
-        if (!s.startsWith("\"") || !s.endsWith("\""))
+        if (!s.startsWith("\"") || !s.endsWith("\"")) {
             throw new XMLParseException("Value must be quoted: <" + s + ">");
+            // XMLParseException is deprecated for removal.
+        }
         final StringBuilder buf = new StringBuilder();
         final int len = s.length() - 1;
         for (int i = 1; i < len; i++) {
@@ -1120,6 +1133,7 @@ public class DescriptorSupport
      * - some other string, in which case the result is that string,
      * without the parentheses.
      */
+    @SuppressWarnings("removal")
     private static Object parseQuotedFieldValue(String s)
             throws XMLParseException {
         s = unquote(s);
@@ -1142,8 +1156,8 @@ public class DescriptorSupport
                 Class.forName(className, false, contextClassLoader);
             constr = c.getConstructor(new Class<?>[] {String.class});
         } catch (Exception e) {
-            throw new XMLParseException(e,
-                                        "Cannot parse value: <" + s + ">");
+            throw new XMLParseException(e, "Cannot parse value: <" + s + ">");
+            // XMLParseException is deprecated for removal.
         }
         final String arg = s.substring(slash + 1, s.length() - 1);
         try {
@@ -1153,6 +1167,7 @@ public class DescriptorSupport
                 "Cannot construct instance of " + className +
                 " with arg: <" + s + ">";
             throw new XMLParseException(e, msg);
+            // XMLParseException is deprecated for removal.
         }
     }
 
diff --git a/src/java.management/share/classes/javax/management/modelmbean/RequiredModelMBean.java b/src/java.management/share/classes/javax/management/modelmbean/RequiredModelMBean.java
index f15a8bee2b3..c29ddf60213 100644
--- a/src/java.management/share/classes/javax/management/modelmbean/RequiredModelMBean.java
+++ b/src/java.management/share/classes/javax/management/modelmbean/RequiredModelMBean.java
@@ -91,8 +91,7 @@ import sun.reflect.misc.MethodUtil;
  * from MBeans, connectors/adaptors like other MBeans. Through the
  * Descriptors, values and methods in the managed application can be
  * defined and mapped to attributes and operations of the ModelMBean.
- * This mapping can be defined in an XML formatted file or dynamically and
- * programmatically at runtime.
+ * This mapping can be defined dynamically and programmatically at runtime.
  * <P>
  * Every RequiredModelMBean which is instantiated in the MBeanServer
  * becomes manageable:<br>
@@ -129,7 +128,6 @@ public class RequiredModelMBean
      * and operations will be executed */
     private Object managedResource = null;
 
-
     /* records the registering in MBeanServer */
     private boolean registered = false;
     private transient MBeanServer server = null;
@@ -367,7 +365,7 @@ public class RequiredModelMBean
         throw new MBeanException(x, x.getMessage());
     }
 
-        /**
+    /**
      * <p>Captures the current state of this MBean instance and writes
      * it out to the persistent store.  The state stored could include
      * attribute and operation values.</p>
@@ -651,7 +649,6 @@ public class RequiredModelMBean
         retStr.append("\nCLASSNAME: \t").append(info.getClassName());
         retStr.append("\nDESCRIPTION: \t").append(info.getDescription());
 
-
         try {
             retStr.append("\nMBEAN DESCRIPTOR: \t").append(info.getMBeanDescriptor());
         } catch (Exception e) {
diff --git a/src/java.management/share/classes/javax/management/modelmbean/XMLParseException.java b/src/java.management/share/classes/javax/management/modelmbean/XMLParseException.java
index 7d4773a49ea..efcfdf54d67 100644
--- a/src/java.management/share/classes/javax/management/modelmbean/XMLParseException.java
+++ b/src/java.management/share/classes/javax/management/modelmbean/XMLParseException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -44,8 +44,12 @@ import java.io.ObjectStreamField;
 *
 * <p>The <b>serialVersionUID</b> of this class is <code>3176664577895105181L</code>.
 *
+* @deprecated This class exists only to support XML parsing implemented privately in this module,
+* in DescriptorSupport.  That feature is deprecated for removal.
+*
 * @since 1.5
 */
+@Deprecated(since="25", forRemoval=true)
 public class XMLParseException
 extends Exception
 {

From 7c22b814d670deda6c2bb93b1e150975c27a165f Mon Sep 17 00:00:00 2001
From: Vladimir Ivanov <vaivanov@openjdk.org>
Date: Fri, 7 Mar 2025 16:12:55 +0000
Subject: [PATCH 259/587] 8350811: [JMH] test foreign.StrLenTest failed with
 StringIndexOutOfBoundsException for size=451

Reviewed-by: jbhateja, vpaprotski, mcimadamore
---
 .../bench/java/lang/foreign/StrLenTest.java   | 23 +++++++++++++------
 .../java/lang/foreign/ToCStringTest.java      |  7 ++++--
 .../java/lang/foreign/ToJavaStringTest.java   |  7 ++++--
 3 files changed, 26 insertions(+), 11 deletions(-)

diff --git a/test/micro/org/openjdk/bench/java/lang/foreign/StrLenTest.java b/test/micro/org/openjdk/bench/java/lang/foreign/StrLenTest.java
index c825b8144b6..b54d5377377 100644
--- a/test/micro/org/openjdk/bench/java/lang/foreign/StrLenTest.java
+++ b/test/micro/org/openjdk/bench/java/lang/foreign/StrLenTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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,10 +54,10 @@ public class StrLenTest extends CLayouts {
     Arena arena = Arena.ofConfined();
 
     SegmentAllocator segmentAllocator;
-    SegmentAllocator arenaAllocator = new RingAllocator(arena);
-    SlicingPool pool = new SlicingPool();
+    SegmentAllocator arenaAllocator;
+    SlicingPool pool;
 
-    @Param({"5", "20", "100"})
+    @Param({"5", "20", "100", "451"})
     public int size;
     public String str;
 
@@ -76,6 +76,8 @@ public class StrLenTest extends CLayouts {
     @Setup
     public void setup() {
         str = makeString(size);
+        arenaAllocator = new RingAllocator(arena, size + 1);
+        pool = new SlicingPool(size + 1);
         segmentAllocator = SegmentAllocator.prefixAllocator(arena.allocate(size + 1, 1));
     }
 
@@ -142,6 +144,9 @@ public class StrLenTest extends CLayouts {
                  fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt
                  mollit anim id est laborum.
                 """;
+        while (lorem.length() < size) {
+            lorem += lorem;
+        }
         return lorem.substring(0, size);
     }
 
@@ -150,8 +155,8 @@ public class StrLenTest extends CLayouts {
         SegmentAllocator current;
         long rem;
 
-        public RingAllocator(Arena session) {
-            this.segment = session.allocate(1024, 1);
+        public RingAllocator(Arena session, int size) {
+            this.segment = session.allocate(size, 1);
             reset();
         }
 
@@ -173,9 +178,13 @@ public class StrLenTest extends CLayouts {
     }
 
     static class SlicingPool {
-        final MemorySegment pool = Arena.ofAuto().allocate(1024);
+        final MemorySegment pool;
         boolean isAcquired = false;
 
+        public SlicingPool(int size) {
+            this.pool = Arena.ofAuto().allocate(size);
+        }
+
         public Arena acquire() {
             if (isAcquired) {
                 throw new IllegalStateException("An allocator is already in use");
diff --git a/test/micro/org/openjdk/bench/java/lang/foreign/ToCStringTest.java b/test/micro/org/openjdk/bench/java/lang/foreign/ToCStringTest.java
index af4a8bdad99..8f403b3cabe 100644
--- a/test/micro/org/openjdk/bench/java/lang/foreign/ToCStringTest.java
+++ b/test/micro/org/openjdk/bench/java/lang/foreign/ToCStringTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -54,7 +54,7 @@ import static java.lang.foreign.ValueLayout.JAVA_BYTE;
 @Fork(value = 3, jvmArgs = { "--enable-native-access=ALL-UNNAMED", "-Djava.library.path=micro/native" })
 public class ToCStringTest extends CLayouts {
 
-    @Param({"5", "20", "100", "200"})
+    @Param({"5", "20", "100", "200", "451"})
     public int size;
     public String str;
 
@@ -97,6 +97,9 @@ public class ToCStringTest extends CLayouts {
                  fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt
                  mollit anim id est laborum.
                 """;
+        while (lorem.length() < size) {
+            lorem += lorem;
+        }
         return lorem.substring(0, size);
     }
 }
diff --git a/test/micro/org/openjdk/bench/java/lang/foreign/ToJavaStringTest.java b/test/micro/org/openjdk/bench/java/lang/foreign/ToJavaStringTest.java
index f38a1481158..901f4c7097f 100644
--- a/test/micro/org/openjdk/bench/java/lang/foreign/ToJavaStringTest.java
+++ b/test/micro/org/openjdk/bench/java/lang/foreign/ToJavaStringTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -48,7 +48,7 @@ public class ToJavaStringTest {
 
     private MemorySegment strSegment;
 
-    @Param({"5", "20", "100", "200"})
+    @Param({"5", "20", "100", "200", "451"})
     int size;
 
     static {
@@ -58,6 +58,9 @@ public class ToJavaStringTest {
     @Setup
     public void setup() {
         var arena = Arena.ofAuto();
+        while (LOREM.length() < size) {
+            LOREM += LOREM;
+        }
         strSegment = arena.allocateFrom(LOREM.substring(0, size));
     }
 

From 5cd4fe63768715ec7be32e248e05e611ea9b557d Mon Sep 17 00:00:00 2001
From: Anthony Scarpino <ascarpino@openjdk.org>
Date: Fri, 7 Mar 2025 17:14:03 +0000
Subject: [PATCH 260/587] 8348309: MultiNST tests need more debugging and
 timing

Reviewed-by: hchao, mullan
---
 test/jdk/javax/net/ssl/templates/TLSBase.java | 52 +++++++++----------
 .../ssl/SSLSessionImpl/MultiNSTClient.java    | 11 ++--
 .../MultiNSTNoSessionCreation.java            |  4 +-
 .../ssl/SSLSessionImpl/MultiNSTParallel.java  | 31 ++++++-----
 .../ssl/SSLSessionImpl/MultiNSTSequence.java  |  7 ++-
 5 files changed, 56 insertions(+), 49 deletions(-)

diff --git a/test/jdk/javax/net/ssl/templates/TLSBase.java b/test/jdk/javax/net/ssl/templates/TLSBase.java
index 8ec4e4e3db4..73951ce9422 100644
--- a/test/jdk/javax/net/ssl/templates/TLSBase.java
+++ b/test/jdk/javax/net/ssl/templates/TLSBase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -31,10 +31,7 @@ import java.security.cert.PKIXBuilderParameters;
 import java.security.cert.X509CertSelector;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.TimeUnit;
+import java.util.concurrent.*;
 
 /**
  * This is a base setup for creating a server and clients.  All clients will
@@ -84,14 +81,16 @@ abstract public class TLSBase {
     byte[] read(SSLSocket sock) throws Exception {
         BufferedInputStream is = new BufferedInputStream(sock.getInputStream());
         byte[] b = is.readNBytes(5);
-        System.err.println("(read) " + Thread.currentThread().getName() + ": " + new String(b));
+        System.err.println("(read) " + Thread.currentThread().getName() + ": " +
+            new String(b));
         return b;
     }
 
     // Base write operation
     public void write(SSLSocket sock, byte[] data) throws Exception {
         sock.getOutputStream().write(data);
-        System.err.println("(write)" + Thread.currentThread().getName() + ": " + new String(data));
+        System.err.println("(write)" + Thread.currentThread().getName() + ": " +
+            new String(data));
     }
 
     private static KeyManager[] getKeyManager(boolean empty) throws Exception {
@@ -148,14 +147,9 @@ abstract public class TLSBase {
         // Clients sockets are kept in a hash table with the port as the key.
         ConcurrentHashMap<Integer, SSLSocket> clientMap =
                 new ConcurrentHashMap<>();
-        Thread t;
         List<Exception> exceptionList = new ArrayList<>();
-        ExecutorService threadPool = Executors.newFixedThreadPool(1,
-            r -> {
-                Thread t = Executors.defaultThreadFactory().newThread(r);
-                return t;
-            });
-
+        ExecutorService threadPool = Executors.newFixedThreadPool(1);
+        CountDownLatch serverLatch = new CountDownLatch(1);
         Server(ServerBuilder builder) {
             super();
             name = "server";
@@ -168,27 +162,28 @@ abstract public class TLSBase {
                 ssock.setReuseAddress(true);
                 ssock.setNeedClientAuth(builder.clientauth);
                 serverPort = ssock.getLocalPort();
-                System.out.println("Server Port: " + serverPort);
+                System.err.println("Server Port: " + serverPort);
             } catch (Exception e) {
                 System.err.println("Failure during server initialization");
                 e.printStackTrace();
             }
 
             // Thread to allow multiple clients to connect
-            t = new Thread(() -> {
+            new Thread(() -> {
                 try {
-                    while (true) {
+                    System.err.println("Server starting to accept");
+                    serverLatch.countDown();
+                    do {
                         SSLSocket sock = (SSLSocket)ssock.accept();
                         threadPool.submit(new ServerThread(sock));
-                    }
+                    } while (true);
                 } catch (Exception ex) {
                     System.err.println("Server Down");
                     ex.printStackTrace();
                 } finally {
                     threadPool.close();
                 }
-            });
-            t.start();
+            }).start();
         }
 
         class ServerThread extends Thread {
@@ -196,7 +191,8 @@ abstract public class TLSBase {
 
             ServerThread(SSLSocket s) {
                 this.sock = s;
-                System.err.println("ServerThread("+sock.getPort()+")");
+                System.err.println("(Server) client connection on port " +
+                    sock.getPort());
                 clientMap.put(sock.getPort(), sock);
             }
 
@@ -204,7 +200,7 @@ abstract public class TLSBase {
                 try {
                     write(sock, read(sock));
                 } catch (Exception e) {
-                    System.out.println("Caught " + e.getMessage());
+                    System.err.println("Caught " + e.getMessage());
                     e.printStackTrace();
                     exceptionList.add(e);
                 }
@@ -289,7 +285,8 @@ abstract public class TLSBase {
             this.tm = tm;
             try {
                 sslContext = SSLContext.getInstance("TLS");
-                sslContext.init(TLSBase.getKeyManager(km), TLSBase.getTrustManager(tm), null);
+                sslContext.init(TLSBase.getKeyManager(km),
+                    TLSBase.getTrustManager(tm), null);
                 socket = createSocket();
             } catch (Exception ex) {
                 ex.printStackTrace();
@@ -312,9 +309,12 @@ abstract public class TLSBase {
 
         public SSLSocket connect() {
             try {
-                socket.connect(new InetSocketAddress(InetAddress.getLoopbackAddress(), serverPort));
-                System.err.println("Client (" + Thread.currentThread().getName() + ") connected using port " +
-                    socket.getLocalPort() + " to " + socket.getPort());
+                socket.connect(new InetSocketAddress(
+                    InetAddress.getLoopbackAddress(), serverPort));
+                System.err.println("Client (" +
+                    Thread.currentThread().getName() +
+                    ") connected using port " + socket.getLocalPort() + " to " +
+                    socket.getPort());
                 writeRead();
             } catch (Exception ex) {
                 ex.printStackTrace();
diff --git a/test/jdk/sun/security/ssl/SSLSessionImpl/MultiNSTClient.java b/test/jdk/sun/security/ssl/SSLSessionImpl/MultiNSTClient.java
index ff086e35a07..d6cdbf2e015 100644
--- a/test/jdk/sun/security/ssl/SSLSessionImpl/MultiNSTClient.java
+++ b/test/jdk/sun/security/ssl/SSLSessionImpl/MultiNSTClient.java
@@ -81,7 +81,6 @@ public class MultiNSTClient {
                 Utils.addTestJavaOpts("MultiNSTClient", "p"));
 
             OutputAnalyzer output = ProcessTools.executeProcess(pb);
-            System.out.println("I'm here");
             boolean pass = true;
             try {
                 List<String> list = output.stderrShouldContain("MultiNST PSK").
@@ -99,10 +98,12 @@ public class MultiNSTClient {
                 for (int i = 0; i < 2; i++) {
                     String svr = serverPSK.getFirst();
                     String cli = clientPSK.getFirst();
-                    if (svr.regionMatches(svr.length() - 16, cli, cli.length() - 16, 16)) {
+                    if (svr.regionMatches(svr.length() - 16, cli,
+                        cli.length() - 16, 16)) {
                         System.out.println("entry " + (i + 1) + " match.");
                     } else {
-                        System.out.println("entry " + (i + 1) + " server and client PSK didn't match:");
+                        System.out.println("entry " + (i + 1) +
+                            " server and client PSK didn't match:");
                         System.out.println("  server: " + svr);
                         System.out.println("  client: " + cli);
                         pass = false;
@@ -127,8 +128,8 @@ public class MultiNSTClient {
         }
 
         TLSBase.Server server = new TLSBase.Server();
-
-        System.out.println("------  Start connection");
+        server.serverLatch.await();
+        System.out.println("------  Server ready, starting original client.");
         TLSBase.Client initial = new TLSBase.Client();
         SSLSession initialSession = initial.connect().getSession();
         System.out.println("id = " + hex.formatHex(initialSession.getId()));
diff --git a/test/jdk/sun/security/ssl/SSLSessionImpl/MultiNSTNoSessionCreation.java b/test/jdk/sun/security/ssl/SSLSessionImpl/MultiNSTNoSessionCreation.java
index 9a615f9b884..41f6ec0ada4 100644
--- a/test/jdk/sun/security/ssl/SSLSessionImpl/MultiNSTNoSessionCreation.java
+++ b/test/jdk/sun/security/ssl/SSLSessionImpl/MultiNSTNoSessionCreation.java
@@ -76,8 +76,8 @@ public class MultiNSTNoSessionCreation {
         }
 
         TLSBase.Server server = new TLSBase.Server();
-
-        System.out.println("------  Initial connection");
+        server.serverLatch.await();
+        System.out.println("------  Server ready, starting initial client.");
         TLSBase.Client initial = new TLSBase.Client();
         initial.connect();
         System.out.println(
diff --git a/test/jdk/sun/security/ssl/SSLSessionImpl/MultiNSTParallel.java b/test/jdk/sun/security/ssl/SSLSessionImpl/MultiNSTParallel.java
index 34c9cc940d5..32ee7db7b4b 100644
--- a/test/jdk/sun/security/ssl/SSLSessionImpl/MultiNSTParallel.java
+++ b/test/jdk/sun/security/ssl/SSLSessionImpl/MultiNSTParallel.java
@@ -73,7 +73,7 @@ public class MultiNSTParallel {
         public void run() {
             String name = Thread.currentThread().getName();
             SSLSession r;
-            System.err.println("waiting " + Thread.currentThread().getName());
+            System.err.println(name + " is ready");
             try {
                 wait.await();
                 r = new TLSBase.Client(client).connect().getSession();
@@ -84,6 +84,7 @@ public class MultiNSTParallel {
             sb.append("(").append(name).append(") id = ");
             sb.append(hex.formatHex(r.getId()));
             sb.append("\n(").append(name).append(") session = ").append(r);
+            System.err.println(sb);
             if (!client.getSession().toString().equalsIgnoreCase(r.toString())) {
                 throw new RuntimeException("(" + name +
                     ") Resumed session did not match");
@@ -133,7 +134,14 @@ public class MultiNSTParallel {
                 serverPSK.stream().forEach(s -> System.out.println("\t" + s));
                 System.out.println("found client: " + clientPSK.size());
                 clientPSK.stream().forEach(s -> System.out.println("\t" + s));
-
+                if (list.size() == 0 || serverPSK.size() == 0) {
+                    throw new Exception("Error setting up test.  No server " +
+                        "PSKs found in debug log.");
+                }
+                if (clientPSK.size() == 0) {
+                        throw new Exception("Error setting up test.  No " +
+                            "client PSKs found in debug log.");
+                }
                 // Must search all results as order is not guaranteed.
                 clientPSK.stream().forEach(cli -> {
                     for (int i = 0; i < serverPSK.size(); i++) {
@@ -171,21 +179,20 @@ public class MultiNSTParallel {
             System.getProperty("jdk.tls.server.newSessionTicketCount"));
 
         TLSBase.Server server = new TLSBase.Server();
-
-        System.out.println("------  Start connection");
-        TLSBase.Client initial = new TLSBase.Client();
-        SSLSession initialSession = initial.getSession();
+        server.serverLatch.await();
+        System.out.println("------  Server ready, starting initial client.");
+        TLSBase.Client initialClient = new TLSBase.Client();
+        SSLSession initialSession = initialClient.connect().getSession();
         System.out.println("id = " + hex.formatHex(initialSession.getId()));
         System.out.println("session = " + initialSession);
-
-        System.out.println("------  getNewSession from original client");
+        System.out.println("------  Initial client context ready.");
 
         ArrayList<Thread> slist = new ArrayList<>(ticketCount);
 
-        System.out.println("tx " + ticketCount);
+        System.out.println("Client count = " + ticketCount);
         for (int i = 0; ticketCount > i; i++) {
-            Thread t = new ClientThread(initial);
-            t.setName("Iteration " + i);
+            Thread t = new ClientThread(initialClient);
+            t.setName("client " + i);
             slist.add(t);
             t.start();
         }
@@ -197,7 +204,7 @@ public class MultiNSTParallel {
         }
 
         System.out.println("------  Closing connections");
-        initial.close();
+        initialClient.close();
         server.close();
         System.out.println("------  End");
         System.exit(0);
diff --git a/test/jdk/sun/security/ssl/SSLSessionImpl/MultiNSTSequence.java b/test/jdk/sun/security/ssl/SSLSessionImpl/MultiNSTSequence.java
index 645650674ea..125b006055b 100644
--- a/test/jdk/sun/security/ssl/SSLSessionImpl/MultiNSTSequence.java
+++ b/test/jdk/sun/security/ssl/SSLSessionImpl/MultiNSTSequence.java
@@ -64,8 +64,7 @@ public class MultiNSTSequence {
                 " -Dtest.src=" + System.getProperty("test.src") +
                     " -Dtest.jdk=" + System.getProperty("test.jdk") +
                     " -Dtest.root=" + System.getProperty("test.root") +
-                    " -Djavax.net.debug=ssl,handshake " + params
-                              );
+                    " -Djavax.net.debug=ssl,handshake " + params);
 
             System.out.println("test.java.opts: " +
                 System.getProperty("test.java.opts"));
@@ -115,8 +114,8 @@ public class MultiNSTSequence {
         }
 
         TLSBase.Server server = new TLSBase.Server();
-
-        System.out.println("------  Initial connection");
+        server.serverLatch.await();
+        System.out.println("------  Server ready, starting initial client.");
         TLSBase.Client initial = new TLSBase.Client();
 
         SSLSession initialSession = initial.connect().getSession();

From f6a8db289e5366845f9518fce7a98538017e9570 Mon Sep 17 00:00:00 2001
From: Vladimir Kozlov <kvn@openjdk.org>
Date: Fri, 7 Mar 2025 19:19:03 +0000
Subject: [PATCH 261/587] 8348261: assert(n->is_Mem()) failed: memory node
 required

Reviewed-by: chagedorn, epeter
---
 src/hotspot/share/opto/escape.cpp | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/hotspot/share/opto/escape.cpp b/src/hotspot/share/opto/escape.cpp
index 068a2c0b100..23cf8a67be7 100644
--- a/src/hotspot/share/opto/escape.cpp
+++ b/src/hotspot/share/opto/escape.cpp
@@ -4712,13 +4712,21 @@ void ConnectionGraph::split_unique_types(GrowableArray<Node *>  &alloc_worklist,
       if (n == nullptr) {
         continue;
       }
+    } else if (n->Opcode() == Op_StrInflatedCopy) {
+      // Check direct uses of StrInflatedCopy.
+      // It is memory type Node - no special SCMemProj node.
     } else if (n->Opcode() == Op_StrCompressedCopy ||
                n->Opcode() == Op_EncodeISOArray) {
       // get the memory projection
       n = n->find_out_with(Op_SCMemProj);
       assert(n != nullptr && n->Opcode() == Op_SCMemProj, "memory projection required");
     } else {
+#ifdef ASSERT
+      if (!n->is_Mem()) {
+        n->dump();
+      }
       assert(n->is_Mem(), "memory node required.");
+#endif
       Node *addr = n->in(MemNode::Address);
       const Type *addr_t = igvn->type(addr);
       if (addr_t == Type::TOP) {

From 8ed6c1d7ee3c9914092e7d45087ef61553371b70 Mon Sep 17 00:00:00 2001
From: Chen Liang <liach@openjdk.org>
Date: Fri, 7 Mar 2025 20:35:36 +0000
Subject: [PATCH 262/587] 8350607: Consolidate MethodHandles::zero into
 MethodHandles::constant

Reviewed-by: jrose, redestad, jvernee
---
 .../java/lang/invoke/BoundMethodHandle.java   |  36 +++++-
 .../lang/invoke/GenerateJLIClassesHelper.java |  20 +--
 .../lang/invoke/InvokerBytecodeGenerator.java |  10 +-
 .../classes/java/lang/invoke/Invokers.java    |   6 +-
 .../classes/java/lang/invoke/LambdaForm.java  | 122 ++++--------------
 .../java/lang/invoke/LambdaFormEditor.java    |   2 +-
 .../java/lang/invoke/MethodHandleImpl.java    |  24 +++-
 .../java/lang/invoke/MethodHandles.java       |  60 ++++-----
 .../java/lang/invoke/SimpleMethodHandle.java  |  34 ++---
 .../TestDynamicRegenerateHolderClasses.java   |   3 +-
 10 files changed, 143 insertions(+), 174 deletions(-)

diff --git a/src/java.base/share/classes/java/lang/invoke/BoundMethodHandle.java b/src/java.base/share/classes/java/lang/invoke/BoundMethodHandle.java
index c45c930c2bd..e1152e99b68 100644
--- a/src/java.base/share/classes/java/lang/invoke/BoundMethodHandle.java
+++ b/src/java.base/share/classes/java/lang/invoke/BoundMethodHandle.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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,42 @@ abstract non-sealed class BoundMethodHandle extends MethodHandle {
         return form.editor();
     }
 
-    static BoundMethodHandle bindSingle(MethodType type, LambdaForm form, Object x) {
+    static BoundMethodHandle bindSingleL(MethodType type, LambdaForm form, Object x) {
         return Species_L.make(type, form, x);
     }
 
+    static BoundMethodHandle bindSingleI(MethodType type, LambdaForm form, int x) {
+        try {
+            return (BoundMethodHandle) SimpleMethodHandle.BMH_SPECIES.extendWith(I_TYPE).factory().invokeBasic(type, form, x);
+        } catch (Throwable ex) {
+            throw uncaughtException(ex);
+        }
+    }
+
+    static BoundMethodHandle bindSingleJ(MethodType type, LambdaForm form, long x) {
+        try {
+            return (BoundMethodHandle) SimpleMethodHandle.BMH_SPECIES.extendWith(J_TYPE).factory().invokeBasic(type, form, x);
+        } catch (Throwable ex) {
+            throw uncaughtException(ex);
+        }
+    }
+
+    static BoundMethodHandle bindSingleF(MethodType type, LambdaForm form, float x) {
+        try {
+            return (BoundMethodHandle) SimpleMethodHandle.BMH_SPECIES.extendWith(F_TYPE).factory().invokeBasic(type, form, x);
+        } catch (Throwable ex) {
+            throw uncaughtException(ex);
+        }
+    }
+
+    static BoundMethodHandle bindSingleD(MethodType type, LambdaForm form, double x) {
+        try {
+            return (BoundMethodHandle) SimpleMethodHandle.BMH_SPECIES.extendWith(D_TYPE).factory().invokeBasic(type, form, x);
+        } catch (Throwable ex) {
+            throw uncaughtException(ex);
+        }
+    }
+
     @Override // there is a default binder in the super class, for 'L' types only
     /*non-public*/
     BoundMethodHandle bindArgumentL(int pos, Object value) {
diff --git a/src/java.base/share/classes/java/lang/invoke/GenerateJLIClassesHelper.java b/src/java.base/share/classes/java/lang/invoke/GenerateJLIClassesHelper.java
index a9497502ec6..e52438544ae 100644
--- a/src/java.base/share/classes/java/lang/invoke/GenerateJLIClassesHelper.java
+++ b/src/java.base/share/classes/java/lang/invoke/GenerateJLIClassesHelper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -378,13 +378,7 @@ class GenerateJLIClassesHelper {
         ArrayList<String> names = new ArrayList<>();
         HashSet<String> dedupSet = new HashSet<>();
         for (LambdaForm.BasicType type : LambdaForm.BasicType.values()) {
-            LambdaForm zero = LambdaForm.zeroForm(type);
-            String name = zero.kind.defaultLambdaName
-                   + "_" + zero.returnType().basicTypeChar();
-            if (dedupSet.add(name)) {
-                names.add(name);
-                forms.add(zero);
-            }
+            String name;
 
             LambdaForm identity = LambdaForm.identityForm(type);
             name = identity.kind.defaultLambdaName
@@ -393,6 +387,16 @@ class GenerateJLIClassesHelper {
                 names.add(name);
                 forms.add(identity);
             }
+
+            if (type != V_TYPE) {
+                LambdaForm constant = LambdaForm.constantForm(type);
+                name = constant.kind.defaultLambdaName
+                        + "_" + constant.returnType().basicTypeChar();
+                if (dedupSet.add(name)) {
+                    names.add(name);
+                    forms.add(constant);
+                }
+            }
         }
         return generateCodeBytesForLFs(className,
                 names.toArray(new String[0]),
diff --git a/src/java.base/share/classes/java/lang/invoke/InvokerBytecodeGenerator.java b/src/java.base/share/classes/java/lang/invoke/InvokerBytecodeGenerator.java
index cbcd4a7b433..f5998c46aa1 100644
--- a/src/java.base/share/classes/java/lang/invoke/InvokerBytecodeGenerator.java
+++ b/src/java.base/share/classes/java/lang/invoke/InvokerBytecodeGenerator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -457,8 +457,8 @@ class InvokerBytecodeGenerator {
                 return resolveFrom(name, invokerType, DelegatingMethodHandle.Holder.class);
             }
             case DELEGATE:                  return resolveFrom(name, invokerType, DelegatingMethodHandle.Holder.class);
-            case ZERO:                      // fall-through
-            case IDENTITY: {
+            case IDENTITY:                  // fall-through
+            case CONSTANT: {
                 name = name + "_" + form.returnType().basicTypeChar();
                 return resolveFrom(name, invokerType, LambdaForm.Holder.class);
             }
@@ -631,10 +631,6 @@ class InvokerBytecodeGenerator {
                                     assert(name.arguments.length == 1);
                                     emitPushArguments(cob, name, 0);
                                     continue;
-                                case ZERO:
-                                    assert(name.arguments.length == 0);
-                                    cob.loadConstant((ConstantDesc)name.type.basicTypeWrapper().zero());
-                                    continue;
                                 case NONE:
                                     // no intrinsic associated
                                     break;
diff --git a/src/java.base/share/classes/java/lang/invoke/Invokers.java b/src/java.base/share/classes/java/lang/invoke/Invokers.java
index 9990370ae25..cbe406c5dc0 100644
--- a/src/java.base/share/classes/java/lang/invoke/Invokers.java
+++ b/src/java.base/share/classes/java/lang/invoke/Invokers.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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 Invokers {
         MethodType invokerType = mtype.invokerType();
         int which = (isExact ? MethodTypeForm.LF_EX_INVOKER : MethodTypeForm.LF_GEN_INVOKER);
         LambdaForm lform = invokeHandleForm(mtype, false, which);
-        MethodHandle invoker = BoundMethodHandle.bindSingle(invokerType, lform, mtype);
+        MethodHandle invoker = BoundMethodHandle.bindSingleL(invokerType, lform, mtype);
         String whichName = (isExact ? "invokeExact" : "invoke");
         invoker = invoker.withInternalMemberName(MemberName.makeMethodHandleInvoke(whichName, mtype), false);
         assert(checkInvoker(invoker));
@@ -159,7 +159,7 @@ class Invokers {
 
         LambdaForm lform = varHandleMethodInvokerHandleForm(mtype, isExact);
         VarHandle.AccessDescriptor ad = new VarHandle.AccessDescriptor(mtype, ak.at.ordinal(), ak.ordinal());
-        MethodHandle invoker = BoundMethodHandle.bindSingle(invokerType, lform, ad);
+        MethodHandle invoker = BoundMethodHandle.bindSingleL(invokerType, lform, ad);
 
         invoker = invoker.withInternalMemberName(MemberName.makeVarHandleMethodInvoke(ak.methodName(), mtype), false);
         assert(checkVarHandleInvoker(invoker));
diff --git a/src/java.base/share/classes/java/lang/invoke/LambdaForm.java b/src/java.base/share/classes/java/lang/invoke/LambdaForm.java
index b3983b8bd7e..1c782e1cbc5 100644
--- a/src/java.base/share/classes/java/lang/invoke/LambdaForm.java
+++ b/src/java.base/share/classes/java/lang/invoke/LambdaForm.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -245,8 +245,8 @@ class LambdaForm {
 
     enum Kind {
         GENERIC("invoke"),
-        ZERO("zero"),
         IDENTITY("identity"),
+        CONSTANT("constant"),
         BOUND_REINVOKER("BMH.reinvoke", "reinvoke"),
         REINVOKER("MH.reinvoke", "reinvoke"),
         DELEGATE("MH.delegate", "delegate"),
@@ -372,31 +372,13 @@ class LambdaForm {
     }
 
     private static LambdaForm createBlankForType(MethodType mt) {
-        // Make a blank lambda form, which returns a constant zero or null.
+        // Make a dummy blank lambda form.
         // It is used as a template for managing the invocation of similar forms that are non-empty.
         // Called only from getPreparedForm.
-        int arity = mt.parameterCount();
-        int result = (mt.returnType() == void.class || mt.returnType() == Void.class) ? VOID_RESULT : arity;
-        Name[] names = buildEmptyNames(arity, mt, result == VOID_RESULT);
-        boolean canInterpret = normalizeNames(arity, names);
-        LambdaForm form = new LambdaForm(arity, result, DEFAULT_FORCE_INLINE, DEFAULT_CUSTOMIZED, names, Kind.ZERO);
-        assert(form.nameRefsAreLegal() && form.isEmpty() && isValidSignature(form.basicTypeSignature()));
-        if (!canInterpret) {
-            form.compileToBytecode();
-        }
+        LambdaForm form = new LambdaForm(0, 0, DEFAULT_FORCE_INLINE, DEFAULT_CUSTOMIZED, new Name[0], Kind.GENERIC);
         return form;
     }
 
-    private static Name[] buildEmptyNames(int arity, MethodType mt, boolean isVoid) {
-        Name[] names = arguments(isVoid ? 0 : 1, mt);
-        if (!isVoid) {
-            Name zero = new Name(constantZero(basicType(mt.returnType())));
-            names[arity] = zero.withIndex(arity);
-        }
-        assert(namesOK(arity, names));
-        return names;
-    }
-
     private static int fixResult(int result, Name[] names) {
         if (result == LAST_RESULT)
             result = names.length - 1;  // might still be void
@@ -1011,15 +993,6 @@ class LambdaForm {
         return true;
     }
 
-    private boolean isEmpty() {
-        if (result < 0)
-            return (names.length == arity);
-        else if (result == arity && names.length == arity + 1)
-            return names[arity].isConstantZero();
-        else
-            return false;
-    }
-
     public String toString() {
         return debugString(-1);
     }
@@ -1251,10 +1224,6 @@ class LambdaForm {
             return this.equals(identity(returnType()));
         }
 
-        public boolean isConstantZero() {
-            return this.equals(constantZero(returnType()));
-        }
-
         public MethodHandleImpl.Intrinsic intrinsicName() {
             return resolvedHandle != null
                 ? resolvedHandle.intrinsicName()
@@ -1453,9 +1422,6 @@ class LambdaForm {
         boolean isParam() {
             return function == null;
         }
-        boolean isConstantZero() {
-            return !isParam() && arguments.length == 0 && function.isConstantZero();
-        }
 
         boolean refersTo(Class<?> declaringClass, String methodName) {
             return function != null &&
@@ -1662,50 +1628,45 @@ class LambdaForm {
         if (form != null) {
             return form;
         }
-        createFormsFor(type);
+        createIdentityForm(type);
         return LF_identity[ord];
     }
 
-    static LambdaForm zeroForm(BasicType type) {
-        int ord = type.ordinal();
-        LambdaForm form = LF_zero[ord];
-        if (form != null) {
-            return form;
-        }
-        createFormsFor(type);
-        return LF_zero[ord];
-    }
-
     static NamedFunction identity(BasicType type) {
         int ord = type.ordinal();
         NamedFunction function = NF_identity[ord];
         if (function != null) {
             return function;
         }
-        createFormsFor(type);
+        createIdentityForm(type);
         return NF_identity[ord];
     }
 
-    static NamedFunction constantZero(BasicType type) {
-        int ord = type.ordinal();
-        NamedFunction function = NF_zero[ord];
-        if (function != null) {
-            return function;
-        }
-        createFormsFor(type);
-        return NF_zero[ord];
+    static LambdaForm constantForm(BasicType type) {
+        assert type != null && type != V_TYPE : type;
+        var cached = LF_constant[type.ordinal()];
+        if (cached != null)
+            return cached;
+        return createConstantForm(type);
+    }
+
+    private static LambdaForm createConstantForm(BasicType type) {
+        UNSAFE.ensureClassInitialized(BoundMethodHandle.class); // defend access to SimpleMethodHandle
+        var species = SimpleMethodHandle.BMH_SPECIES.extendWith(type);
+        var carrier = argument(0, L_TYPE).withConstraint(species); // BMH bound with data
+        Name[] constNames = new Name[] { carrier, new Name(species.getterFunction(0), carrier) };
+        return LF_constant[type.ordinal()] = create(1, constNames, Kind.CONSTANT);
     }
 
     private static final @Stable LambdaForm[] LF_identity = new LambdaForm[TYPE_LIMIT];
-    private static final @Stable LambdaForm[] LF_zero = new LambdaForm[TYPE_LIMIT];
     private static final @Stable NamedFunction[] NF_identity = new NamedFunction[TYPE_LIMIT];
-    private static final @Stable NamedFunction[] NF_zero = new NamedFunction[TYPE_LIMIT];
+    private static final @Stable LambdaForm[] LF_constant = new LambdaForm[ARG_TYPE_LIMIT]; // no void
 
-    private static final Object createFormsLock = new Object();
-    private static void createFormsFor(BasicType type) {
+    private static final Object createIdentityFormLock = new Object();
+    private static void createIdentityForm(BasicType type) {
         // Avoid racy initialization during bootstrap
         UNSAFE.ensureClassInitialized(BoundMethodHandle.class);
-        synchronized (createFormsLock) {
+        synchronized (createIdentityFormLock) {
             final int ord = type.ordinal();
             LambdaForm idForm = LF_identity[ord];
             if (idForm != null) {
@@ -1714,27 +1675,18 @@ class LambdaForm {
             char btChar = type.basicTypeChar();
             boolean isVoid = (type == V_TYPE);
             Class<?> btClass = type.btClass;
-            MethodType zeType = MethodType.methodType(btClass);
-            MethodType idType = (isVoid) ? zeType : MethodType.methodType(btClass, btClass);
+            MethodType idType = (isVoid) ? MethodType.methodType(btClass) : MethodType.methodType(btClass, btClass);
 
             // Look up symbolic names.  It might not be necessary to have these,
             // but if we need to emit direct references to bytecodes, it helps.
-            // Zero is built from a call to an identity function with a constant zero input.
             MemberName idMem = new MemberName(LambdaForm.class, "identity_"+btChar, idType, REF_invokeStatic);
-            MemberName zeMem = null;
             try {
                 idMem = IMPL_NAMES.resolveOrFail(REF_invokeStatic, idMem, null, LM_TRUSTED, NoSuchMethodException.class);
-                if (!isVoid) {
-                    zeMem = new MemberName(LambdaForm.class, "zero_"+btChar, zeType, REF_invokeStatic);
-                    zeMem = IMPL_NAMES.resolveOrFail(REF_invokeStatic, zeMem, null, LM_TRUSTED, NoSuchMethodException.class);
-                }
             } catch (IllegalAccessException|NoSuchMethodException ex) {
                 throw newInternalError(ex);
             }
 
             NamedFunction idFun;
-            LambdaForm zeForm;
-            NamedFunction zeFun;
 
             // Create the LFs and NamedFunctions. Precompiling LFs to byte code is needed to break circular
             // bootstrap dependency on this method in case we're interpreting LFs
@@ -1743,32 +1695,18 @@ class LambdaForm {
                 idForm = LambdaForm.create(1, idNames, VOID_RESULT, Kind.IDENTITY);
                 idForm.compileToBytecode();
                 idFun = new NamedFunction(idMem, SimpleMethodHandle.make(idMem.getInvocationType(), idForm));
-
-                zeForm = idForm;
-                zeFun = idFun;
             } else {
                 Name[] idNames = new Name[] { argument(0, L_TYPE), argument(1, type) };
                 idForm = LambdaForm.create(2, idNames, 1, Kind.IDENTITY);
                 idForm.compileToBytecode();
-                idFun = new NamedFunction(idMem, MethodHandleImpl.makeIntrinsic(SimpleMethodHandle.make(idMem.getInvocationType(), idForm),
+                idFun = new NamedFunction(idMem, MethodHandleImpl.makeIntrinsic(idMem.getInvocationType(), idForm,
                             MethodHandleImpl.Intrinsic.IDENTITY));
-
-                Object zeValue = Wrapper.forBasicType(btChar).zero();
-                Name[] zeNames = new Name[] { argument(0, L_TYPE), new Name(idFun, zeValue) };
-                zeForm = LambdaForm.create(1, zeNames, 1, Kind.ZERO);
-                zeForm.compileToBytecode();
-                zeFun = new NamedFunction(zeMem, MethodHandleImpl.makeIntrinsic(SimpleMethodHandle.make(zeMem.getInvocationType(), zeForm),
-                        MethodHandleImpl.Intrinsic.ZERO));
             }
 
-            LF_zero[ord] = zeForm;
-            NF_zero[ord] = zeFun;
             LF_identity[ord] = idForm;
             NF_identity[ord] = idFun;
 
             assert(idFun.isIdentity());
-            assert(zeFun.isConstantZero());
-            assert(new Name(zeFun).isConstantZero());
         }
     }
 
@@ -1779,12 +1717,6 @@ class LambdaForm {
     private static double identity_D(double x) { return x; }
     private static Object identity_L(Object x) { return x; }
     private static void identity_V() { return; }
-    private static int zero_I() { return 0; }
-    private static long zero_J() { return 0; }
-    private static float zero_F() { return 0; }
-    private static double zero_D() { return 0; }
-    private static Object zero_L() { return null; }
-
     /**
      * Internal marker for byte-compiled LambdaForms.
      */
@@ -1814,7 +1746,7 @@ class LambdaForm {
         UNSAFE.ensureClassInitialized(Holder.class);
     }
 
-    /* Placeholder class for zero and identity forms generated ahead of time */
+    /* Placeholder class for identity and constant forms generated ahead of time */
     final class Holder {}
 
     // The following hack is necessary in order to suppress TRACE_INTERPRETER
diff --git a/src/java.base/share/classes/java/lang/invoke/LambdaFormEditor.java b/src/java.base/share/classes/java/lang/invoke/LambdaFormEditor.java
index 0994071a79e..6a25bf9c0a8 100644
--- a/src/java.base/share/classes/java/lang/invoke/LambdaFormEditor.java
+++ b/src/java.base/share/classes/java/lang/invoke/LambdaFormEditor.java
@@ -969,7 +969,7 @@ class LambdaFormEditor {
             if (newType == V_TYPE)
                 callFilter = null;
             else
-                callFilter = new Name(constantZero(newType));
+                callFilter = new Name(LambdaForm.identity(newType), newType.btWrapper.zero());
         } else {
             BoundMethodHandle.SpeciesData oldData = oldSpeciesData();
             BoundMethodHandle.SpeciesData newData = newSpeciesData(L_TYPE);
diff --git a/src/java.base/share/classes/java/lang/invoke/MethodHandleImpl.java b/src/java.base/share/classes/java/lang/invoke/MethodHandleImpl.java
index d57a932c4dd..cd97413182b 100644
--- a/src/java.base/share/classes/java/lang/invoke/MethodHandleImpl.java
+++ b/src/java.base/share/classes/java/lang/invoke/MethodHandleImpl.java
@@ -1344,7 +1344,6 @@ abstract class MethodHandleImpl {
         ARRAY_STORE,
         ARRAY_LENGTH,
         IDENTITY,
-        ZERO,
         NONE // no intrinsic associated
     }
 
@@ -2234,6 +2233,29 @@ abstract class MethodHandleImpl {
         return selectedCase.invokeWithArguments(args);
     }
 
+    // type is validated, value is not
+    static MethodHandle makeConstantReturning(Class<?> type, Object value) {
+        var callType = MethodType.methodType(type);
+        var basicType = BasicType.basicType(type);
+        var form = constantForm(basicType);
+
+        if (type.isPrimitive()) {
+            assert type != void.class;
+            var wrapper = Wrapper.forPrimitiveType(type);
+            var v = wrapper.convert(value, type); // throws CCE
+            return switch (wrapper) {
+                case INT    -> BoundMethodHandle.bindSingleI(callType, form, (int) v);
+                case LONG   -> BoundMethodHandle.bindSingleJ(callType, form, (long) v);
+                case FLOAT  -> BoundMethodHandle.bindSingleF(callType, form, (float) v);
+                case DOUBLE -> BoundMethodHandle.bindSingleD(callType, form, (double) v);
+                default -> BoundMethodHandle.bindSingleI(callType, form, ValueConversions.widenSubword(v));
+            };
+        }
+
+        var v = type.cast(value); // throws CCE
+        return BoundMethodHandle.bindSingleL(callType, form, v);
+    }
+
     // Indexes into constant method handles:
     static final int
             MH_cast                  =              0,
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 79370df3f3b..3251de9bc4b 100644
--- a/src/java.base/share/classes/java/lang/invoke/MethodHandles.java
+++ b/src/java.base/share/classes/java/lang/invoke/MethodHandles.java
@@ -33,6 +33,7 @@ import jdk.internal.reflect.CallerSensitiveAdapter;
 import jdk.internal.reflect.Reflection;
 import jdk.internal.util.ClassFileDumper;
 import jdk.internal.vm.annotation.ForceInline;
+import jdk.internal.vm.annotation.Stable;
 import sun.invoke.util.ValueConversions;
 import sun.invoke.util.VerifyAccess;
 import sun.invoke.util.Wrapper;
@@ -64,9 +65,7 @@ import java.util.stream.Stream;
 import static java.lang.classfile.ClassFile.*;
 import static java.lang.invoke.LambdaForm.BasicType.V_TYPE;
 import static java.lang.invoke.MethodHandleNatives.Constants.*;
-import static java.lang.invoke.MethodHandleStatics.UNSAFE;
-import static java.lang.invoke.MethodHandleStatics.newIllegalArgumentException;
-import static java.lang.invoke.MethodHandleStatics.newInternalError;
+import static java.lang.invoke.MethodHandleStatics.*;
 import static java.lang.invoke.MethodType.methodType;
 
 /**
@@ -4827,19 +4826,9 @@ assert((int)twice.invokeExact(21) == 42);
      * @throws IllegalArgumentException if the given type is {@code void.class}
      */
     public static MethodHandle constant(Class<?> type, Object value) {
-        if (type.isPrimitive()) {
-            if (type == void.class)
-                throw newIllegalArgumentException("void type");
-            Wrapper w = Wrapper.forPrimitiveType(type);
-            value = w.convert(value, type);
-            if (w.zero().equals(value))
-                return zero(w, type);
-            return insertArguments(identity(type), 0, value);
-        } else {
-            if (value == null)
-                return zero(Wrapper.OBJECT, type);
-            return identity(type).bindTo(value);
-        }
+        if (Objects.requireNonNull(type) == void.class)
+            throw newIllegalArgumentException("void type");
+        return MethodHandleImpl.makeConstantReturning(type, value);
     }
 
     /**
@@ -4881,7 +4870,8 @@ assert((int)twice.invokeExact(21) == 42);
      */
     public static MethodHandle zero(Class<?> type) {
         Objects.requireNonNull(type);
-        return type.isPrimitive() ?  zero(Wrapper.forPrimitiveType(type), type) : zero(Wrapper.OBJECT, type);
+        return type.isPrimitive() ? primitiveZero(Wrapper.forPrimitiveType(type))
+                : MethodHandleImpl.makeConstantReturning(type, null);
     }
 
     private static MethodHandle identityOrVoid(Class<?> type) {
@@ -4900,7 +4890,7 @@ assert((int)twice.invokeExact(21) == 42);
      * @param type the type of the desired method handle
      * @return a constant method handle of the given type, which returns a default value of the given return type
      * @throws NullPointerException if the argument is null
-     * @see MethodHandles#zero
+     * @see MethodHandles#primitiveZero
      * @see MethodHandles#constant
      * @since 9
      */
@@ -4911,29 +4901,33 @@ assert((int)twice.invokeExact(21) == 42);
 
     private static final MethodHandle[] IDENTITY_MHS = new MethodHandle[Wrapper.COUNT];
     private static MethodHandle makeIdentity(Class<?> ptype) {
-        MethodType mtype = methodType(ptype, ptype);
+        MethodType mtype = methodType(ptype, ptype); // throws IAE for void
         LambdaForm lform = LambdaForm.identityForm(BasicType.basicType(ptype));
         return MethodHandleImpl.makeIntrinsic(mtype, lform, Intrinsic.IDENTITY);
     }
 
-    private static MethodHandle zero(Wrapper btw, Class<?> rtype) {
-        int pos = btw.ordinal();
-        MethodHandle zero = ZERO_MHS[pos];
-        if (zero == null) {
-            zero = setCachedMethodHandle(ZERO_MHS, pos, makeZero(btw.primitiveType()));
+    private static MethodHandle primitiveZero(Wrapper w) {
+        assert w != Wrapper.OBJECT : w;
+        int pos = w.ordinal();
+        MethodHandle mh = PRIMITIVE_ZERO_MHS[pos];
+        if (mh == null) {
+            mh = setCachedMethodHandle(PRIMITIVE_ZERO_MHS, pos, makePrimitiveZero(w));
         }
-        if (zero.type().returnType() == rtype)
-            return zero;
-        assert(btw == Wrapper.OBJECT);
-        return makeZero(rtype);
+        assert (mh.type().returnType() == w.primitiveType()) : mh;
+        return mh;
     }
-    private static final MethodHandle[] ZERO_MHS = new MethodHandle[Wrapper.COUNT];
-    private static MethodHandle makeZero(Class<?> rtype) {
-        MethodType mtype = methodType(rtype);
-        LambdaForm lform = LambdaForm.zeroForm(BasicType.basicType(rtype));
-        return MethodHandleImpl.makeIntrinsic(mtype, lform, Intrinsic.ZERO);
+
+    private static MethodHandle makePrimitiveZero(Wrapper w) {
+        if (w == Wrapper.VOID) {
+            var lf = LambdaForm.identityForm(V_TYPE); // ensures BMH & SimpleMH are initialized
+            return SimpleMethodHandle.make(MethodType.methodType(void.class), lf);
+        } else {
+            return MethodHandleImpl.makeConstantReturning(w.primitiveType(), w.zero());
+        }
     }
 
+    private static final @Stable MethodHandle[] PRIMITIVE_ZERO_MHS = new MethodHandle[Wrapper.COUNT];
+
     private static synchronized MethodHandle setCachedMethodHandle(MethodHandle[] cache, int pos, MethodHandle value) {
         // Simulate a CAS, to avoid racy duplication of results.
         MethodHandle prev = cache[pos];
diff --git a/src/java.base/share/classes/java/lang/invoke/SimpleMethodHandle.java b/src/java.base/share/classes/java/lang/invoke/SimpleMethodHandle.java
index 6621acb84db..70b09589207 100644
--- a/src/java.base/share/classes/java/lang/invoke/SimpleMethodHandle.java
+++ b/src/java.base/share/classes/java/lang/invoke/SimpleMethodHandle.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -32,6 +32,8 @@ import static java.lang.invoke.MethodHandleStatics.*;
 
 /**
  * A method handle whose behavior is determined only by its LambdaForm.
+ * Access to SimpleMethodHandle should ensure BoundMethodHandle is initialized
+ * first.
  * @author jrose
  */
 final class SimpleMethodHandle extends BoundMethodHandle {
@@ -68,42 +70,30 @@ final class SimpleMethodHandle extends BoundMethodHandle {
     @Override
     /*non-public*/
     final BoundMethodHandle copyWithExtendL(MethodType mt, LambdaForm lf, Object narg) {
-        return BoundMethodHandle.bindSingle(mt, lf, narg); // Use known fast path.
+        return BoundMethodHandle.bindSingleL(mt, lf, narg); // Use known fast path.
     }
+
     @Override
     /*non-public*/
     final BoundMethodHandle copyWithExtendI(MethodType mt, LambdaForm lf, int narg) {
-        try {
-            return (BoundMethodHandle) BMH_SPECIES.extendWith(I_TYPE).factory().invokeBasic(mt, lf, narg);
-        } catch (Throwable ex) {
-            throw uncaughtException(ex);
-        }
+        return BoundMethodHandle.bindSingleI(mt, lf, narg);
     }
+
     @Override
     /*non-public*/
     final BoundMethodHandle copyWithExtendJ(MethodType mt, LambdaForm lf, long narg) {
-        try {
-            return (BoundMethodHandle) BMH_SPECIES.extendWith(J_TYPE).factory().invokeBasic(mt, lf, narg);
-        } catch (Throwable ex) {
-            throw uncaughtException(ex);
-        }
+        return BoundMethodHandle.bindSingleJ(mt, lf, narg);
     }
+
     @Override
     /*non-public*/
     final BoundMethodHandle copyWithExtendF(MethodType mt, LambdaForm lf, float narg) {
-        try {
-            return (BoundMethodHandle) BMH_SPECIES.extendWith(F_TYPE).factory().invokeBasic(mt, lf, narg);
-        } catch (Throwable ex) {
-            throw uncaughtException(ex);
-        }
+        return BoundMethodHandle.bindSingleF(mt, lf, narg);
     }
+
     @Override
     /*non-public*/
     final BoundMethodHandle copyWithExtendD(MethodType mt, LambdaForm lf, double narg) {
-        try {
-            return (BoundMethodHandle) BMH_SPECIES.extendWith(D_TYPE).factory().invokeBasic(mt, lf, narg);
-        } catch (Throwable ex) {
-            throw uncaughtException(ex);
-        }
+        return BoundMethodHandle.bindSingleD(mt, lf, narg);
     }
 }
diff --git a/test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/TestDynamicRegenerateHolderClasses.java b/test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/TestDynamicRegenerateHolderClasses.java
index ccf4e970b9e..30febb08287 100644
--- a/test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/TestDynamicRegenerateHolderClasses.java
+++ b/test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/TestDynamicRegenerateHolderClasses.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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 jdk.test.lib.helpers.ClassFileInstaller;
 public class TestDynamicRegenerateHolderClasses extends DynamicArchiveTestBase {
     static String CHECK_MESSAGES[] = {"java.lang.invoke.Invokers$Holder source: shared objects file (top)",
                                       "java.lang.invoke.DirectMethodHandle$Holder source: shared objects file (top)",
-                                      "java.lang.invoke.DelegatingMethodHandle$Holder source: shared objects file (top)",
                                       "java.lang.invoke.LambdaForm$Holder source: shared objects file (top)"};
     public static void main(String[] args) throws Exception {
         runTest(TestDynamicRegenerateHolderClasses::testDefaultBase);

From 4e67ac41365ecd0c7e919d77e359f77ea602feb9 Mon Sep 17 00:00:00 2001
From: Vladimir Ivanov <vaivanov@openjdk.org>
Date: Fri, 7 Mar 2025 20:38:25 +0000
Subject: [PATCH 263/587] 8350909: [JMH] test ThreadOnSpinWaitShared failed for
 2 threads config

Reviewed-by: jbhateja, drwhite
---
 .../openjdk/bench/java/lang/ThreadOnSpinWaitSharedCounter.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/micro/org/openjdk/bench/java/lang/ThreadOnSpinWaitSharedCounter.java b/test/micro/org/openjdk/bench/java/lang/ThreadOnSpinWaitSharedCounter.java
index b85a2374cf0..20c921b75b4 100644
--- a/test/micro/org/openjdk/bench/java/lang/ThreadOnSpinWaitSharedCounter.java
+++ b/test/micro/org/openjdk/bench/java/lang/ThreadOnSpinWaitSharedCounter.java
@@ -40,7 +40,7 @@ import java.util.concurrent.atomic.AtomicInteger;
 
 @BenchmarkMode(Mode.AverageTime)
 @OutputTimeUnit(TimeUnit.MILLISECONDS)
-@State(Scope.Benchmark)
+@State(Scope.Thread)
 @Warmup(iterations = 5, time = 1)
 @Measurement(iterations = 5, time = 1)
 @Fork(value = 3)

From 76e0f30b15efda86cbb974bbc764ac3fb3f0f054 Mon Sep 17 00:00:00 2001
From: Eric Caspole <ecaspole@openjdk.org>
Date: Fri, 7 Mar 2025 21:30:11 +0000
Subject: [PATCH 264/587] 8350460: org.openjdk.bench.vm.floatingpoint.DremFrem
 JMH fails with -ea

Reviewed-by: liach, darcy
---
 .../bench/vm/floatingpoint/DremFrem.java      | 159 +-----------------
 1 file changed, 3 insertions(+), 156 deletions(-)

diff --git a/test/micro/org/openjdk/bench/vm/floatingpoint/DremFrem.java b/test/micro/org/openjdk/bench/vm/floatingpoint/DremFrem.java
index 674326363d2..c90ead881fd 100644
--- a/test/micro/org/openjdk/bench/vm/floatingpoint/DremFrem.java
+++ b/test/micro/org/openjdk/bench/vm/floatingpoint/DremFrem.java
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2023, Azul Systems, Inc. All rights reserved.
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
  * 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 +31,6 @@ import org.openjdk.jmh.annotations.OutputTimeUnit;
 import org.openjdk.jmh.annotations.Scope;
 import org.openjdk.jmh.annotations.Setup;
 import org.openjdk.jmh.annotations.State;
-import org.openjdk.jmh.infra.Blackhole;
 
 import java.util.Random;
 import java.util.concurrent.TimeUnit;
@@ -50,7 +50,7 @@ public class DremFrem {
 
     @Benchmark
     @OperationsPerInvocation(DEFAULT_X_RANGE * DEFAULT_Y_RANGE)
-    public void calcFloatJava(Blackhole bh) {
+    public void calcFloatJava() {
         for (int i = 0; i < DEFAULT_X_RANGE; i++) {
             for (int j = DEFAULT_Y_RANGE; j > 0; j--) {
                 float x = i;
@@ -63,7 +63,7 @@ public class DremFrem {
 
     @Benchmark
     @OperationsPerInvocation(DEFAULT_X_RANGE * DEFAULT_Y_RANGE)
-    public void calcDoubleJava(Blackhole bh) {
+    public void calcDoubleJava() {
         for (int i = 0; i < DEFAULT_X_RANGE; i++) {
             for (int j = DEFAULT_Y_RANGE; j > 0; j--) {
                 double x = i;
@@ -73,157 +73,4 @@ public class DremFrem {
             }
         }
     }
-
-    @SuppressWarnings("divzero")
-    public void cornercaseFloatJava_divzero(Blackhole bh) {
-            assert Float.isNaN(10 / 0);
-            assert Float.isNaN(10 / 0);
-    }
-
-    @Benchmark
-    @OperationsPerInvocation(DEFAULT_X_RANGE * DEFAULT_Y_RANGE)
-    public void cornercaseFloatJava(Blackhole bh) {
-        for (int i = 0; i < DEFAULT_X_RANGE * DEFAULT_Y_RANGE; i++) {
-            // Generate some NaNs.
-            float nan            = Float.NaN;
-            float zero_div_zero  = 0.0f / 0.0f;
-            float sqrt_negative  = (float)Math.sqrt(-1.0);
-            float log_negative   = (float)Math.log(-1.0);
-            float inf_minus_inf  = Float.POSITIVE_INFINITY - Float.POSITIVE_INFINITY;
-            float inf_times_zero = Float.POSITIVE_INFINITY * 0.0f;
-            float quiet_nan1     = Float.intBitsToFloat(0x7fc00001);
-            float quiet_nan2     = Float.intBitsToFloat(0x7fc00002);
-            float signaling_nan1 = Float.intBitsToFloat(0x7fa00001);
-            float signaling_nan2 = Float.intBitsToFloat(0x7fa00002);
-            float nan_minus      = -nan;
-
-            // Generate some infinities.
-            float positive_inf   = Float.POSITIVE_INFINITY;
-            float negative_inf   = Float.NEGATIVE_INFINITY;
-            float one_div_zero   = 1.0f / 0.0f;
-            float log_zero       = (float)Math.log(0.0);
-
-            // Double check that they are actually NaNs.
-            assert  Float.isNaN(nan);
-            assert  Float.isNaN(zero_div_zero);
-            assert  Float.isNaN(sqrt_negative);
-            assert  Float.isNaN(inf_minus_inf);
-            assert  Float.isNaN(inf_times_zero);
-            assert  Float.isNaN(quiet_nan1);
-            assert  Float.isNaN(quiet_nan2);
-            assert  Float.isNaN(signaling_nan1);
-            assert  Float.isNaN(signaling_nan2);
-            assert  Float.isNaN(nan_minus);
-            assert  Float.isNaN(log_negative);
-
-            // Double check that they are infinities.
-            assert  Float.isInfinite(positive_inf);
-            assert  Float.isInfinite(negative_inf);
-            assert !Float.isNaN(positive_inf);
-            assert !Float.isNaN(negative_inf);
-            assert one_div_zero == positive_inf;
-            assert log_zero == negative_inf;
-                // Double check infinities.
-
-            assert Float.isNaN(positive_inf / 10);
-            assert Float.isNaN(negative_inf / 10);
-            cornercaseFloatJava_divzero(bh);
-            assert (+10 / positive_inf) == +10;
-            assert (+10 / negative_inf) == +10;
-            assert (-10 / positive_inf) == -10;
-            assert (-10 / negative_inf) == -10;
-
-            // NaN comparisons always fail.
-            // Therefore, all tests that we will do afterwards will be just isNaN.
-            assert !(1.0f < nan);
-            assert !(1.0f == nan);
-            assert !(1.0f > nan);
-            assert !(nan == nan);
-
-            // NaN propagate through most operations.
-            assert Float.isNaN(nan + 1.0f);
-            assert Float.isNaN(1.0f + nan);
-            assert Float.isNaN(nan + nan);
-            assert Float.isNaN(nan / 1.0f);
-            assert Float.isNaN(1.0f / nan);
-            assert Float.isNaN((float)Math.sqrt((double)nan));
-        }
-    }
-
-    @SuppressWarnings("divzero")
-    public void cornercaseDoubleJava_divzero(Blackhole bh) {
-            assert Double.isNaN(10 / 0);
-            assert Double.isNaN(10 / 0);
-    }
-
-    @Benchmark
-    @OperationsPerInvocation(DEFAULT_X_RANGE * DEFAULT_Y_RANGE)
-    public void cornercaseDoubleJava(Blackhole bh) {
-        for (int i = 0; i < DEFAULT_X_RANGE * DEFAULT_Y_RANGE; i++) {
-            // Generate some NaNs.
-            double nan            = Double.NaN;
-            double zero_div_zero  = 0.0f / 0.0f;
-            double sqrt_negative  = (double)Math.sqrt(-1.0);
-            double log_negative   = (double)Math.log(-1.0);
-            double inf_minus_inf  = Double.POSITIVE_INFINITY - Double.POSITIVE_INFINITY;
-            double inf_times_zero = Double.POSITIVE_INFINITY * 0.0f;
-            double quiet_nan1     = Double.longBitsToDouble(0x7ffc000000000001L);
-            double quiet_nan2     = Double.longBitsToDouble(0x7ffc000000000002L);
-            double signaling_nan1 = Double.longBitsToDouble(0x7ffa000000000001L);
-            double signaling_nan2 = Double.longBitsToDouble(0x7ffa000000000002L);
-            double nan_minus      = -nan;
-
-            // Generate some infinities.
-            double positive_inf   = Double.POSITIVE_INFINITY;
-            double negative_inf   = Double.NEGATIVE_INFINITY;
-            double one_div_zero   = 1.0d / 0.0f;
-            double log_zero       = (double)Math.log(0.0);
-
-            // Double check that they are actually NaNs.
-            assert  Double.isNaN(nan);
-            assert  Double.isNaN(zero_div_zero);
-            assert  Double.isNaN(sqrt_negative);
-            assert  Double.isNaN(inf_minus_inf);
-            assert  Double.isNaN(inf_times_zero);
-            assert  Double.isNaN(quiet_nan1);
-            assert  Double.isNaN(quiet_nan2);
-            assert  Double.isNaN(signaling_nan1);
-            assert  Double.isNaN(signaling_nan2);
-            assert  Double.isNaN(nan_minus);
-            assert  Double.isNaN(log_negative);
-
-            // Double check that they are infinities.
-            assert  Double.isInfinite(positive_inf);
-            assert  Double.isInfinite(negative_inf);
-            assert !Double.isNaN(positive_inf);
-            assert !Double.isNaN(negative_inf);
-            assert one_div_zero == positive_inf;
-            assert log_zero == negative_inf;
-                // Double check infinities.
-
-            assert Double.isNaN(positive_inf / 10);
-            assert Double.isNaN(negative_inf / 10);
-            cornercaseDoubleJava_divzero(bh);
-            assert (+10 / positive_inf) == +10;
-            assert (+10 / negative_inf) == +10;
-            assert (-10 / positive_inf) == -10;
-            assert (-10 / negative_inf) == -10;
-
-            // NaN comparisons always fail.
-            // Therefore, all tests that we will do afterwards will be just isNaN.
-            assert !(1.0d < nan);
-            assert !(1.0d == nan);
-            assert !(1.0d > nan);
-            assert !(nan == nan);
-
-            // NaN propagate through most operations.
-            assert Double.isNaN(nan + 1.0d);
-            assert Double.isNaN(1.0d + nan);
-            assert Double.isNaN(nan + nan);
-            assert Double.isNaN(nan / 1.0d);
-            assert Double.isNaN(1.0d / nan);
-            assert Double.isNaN((double)Math.sqrt((double)nan));
-        }
-    }
-
 }

From 7ec2e14897e6dea0c7864a617ded0e33adf792f7 Mon Sep 17 00:00:00 2001
From: Daniel Gredler <dgredler@openjdk.org>
Date: Sat, 8 Mar 2025 12:26:46 +0000
Subject: [PATCH 265/587] 8349932: PSPrinterJob sometimes generates unnecessary
 PostScript commands

Reviewed-by: achung, prr
---
 .../share/classes/sun/print/PSPrinterJob.java | 211 +++++++++---------
 test/jdk/javax/print/PostScriptLeanTest.java  | 140 ++++++++++++
 2 files changed, 247 insertions(+), 104 deletions(-)
 create mode 100644 test/jdk/javax/print/PostScriptLeanTest.java

diff --git a/src/java.desktop/share/classes/sun/print/PSPrinterJob.java b/src/java.desktop/share/classes/sun/print/PSPrinterJob.java
index eb981c92a12..61af64a3d58 100644
--- a/src/java.desktop/share/classes/sun/print/PSPrinterJob.java
+++ b/src/java.desktop/share/classes/sun/print/PSPrinterJob.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -1224,120 +1224,123 @@ public class PSPrinterJob extends RasterPrinterJob {
         return (psFonts == null) ? 0 : psFonts.length;
     }
 
-     protected boolean textOut(Graphics g, String str, float x, float y,
-                               Font mLastFont, FontRenderContext frc,
-                               float width) {
-        boolean didText = true;
-
+    protected boolean textOut(Graphics g, String str, float x, float y,
+                              Font mLastFont, FontRenderContext frc,
+                              float width) {
+        /* If we don't have fonts, use 2D path instead. */
         if (mFontProps == null) {
             return false;
-        } else {
-            prepDrawing();
+        }
 
-            /* On-screen drawString renders most control chars as the missing
-             * glyph and have the non-zero advance of that glyph.
-             * Exceptions are \t, \n and \r which are considered zero-width.
-             * Postscript handles control chars mostly as a missing glyph.
-             * But we use 'ashow' specifying a width for the string which
-             * assumes zero-width for those three exceptions, and Postscript
-             * tries to squeeze the extra char in, with the result that the
-             * glyphs look compressed or even overlap.
-             * So exclude those control chars from the string sent to PS.
+        /* On-screen drawString renders most control chars as the missing
+         * glyph and have the non-zero advance of that glyph.
+         * Exceptions are \t, \n and \r which are considered zero-width.
+         * Postscript handles control chars mostly as a missing glyph.
+         * But we use 'ashow' specifying a width for the string which
+         * assumes zero-width for those three exceptions, and Postscript
+         * tries to squeeze the extra char in, with the result that the
+         * glyphs look compressed or even overlap.
+         * So exclude those control chars from the string sent to PS.
+         */
+        str = removeControlChars(str);
+        if (str.isEmpty()) {
+            return true;
+        }
+
+        /* If AWT can't convert all chars, use 2D path instead. */
+        FontAccess access = FontAccess.getFontAccess();
+        PlatformFont peer = (PlatformFont) access.getFontPeer(mLastFont);
+        CharsetString[] acs = peer.makeMultiCharsetString(str, false);
+        if (acs == null) {
+            return false;
+        }
+
+        /* Get an array of indices into our PostScript name
+         * table. If all of the runs can not be converted
+         * to PostScript fonts then null is returned and
+         * we'll want to fall back to printing the text
+         * as shapes.
+         */
+        int[] psFonts = getPSFontIndexArray(mLastFont, acs);
+        if (psFonts == null) {
+            return false;
+        }
+
+        /* Prepare graphics context, now that we know we can handle the text. */
+        prepDrawing();
+
+        /* Draw each string segment. */
+        for (int i = 0; i < acs.length; i++){
+            CharsetString cs = acs[i];
+            CharsetEncoder fontCS = cs.fontDescriptor.encoder;
+
+            StringBuilder nativeStr = new StringBuilder();
+            byte[] strSeg = new byte[cs.length * 2];
+            int len = 0;
+            try {
+                ByteBuffer bb = ByteBuffer.wrap(strSeg);
+                fontCS.encode(CharBuffer.wrap(cs.charsetChars,
+                                              cs.offset,
+                                              cs.length),
+                                              bb, true);
+                bb.flip();
+                len = bb.limit();
+            } catch (IllegalStateException | CoderMalfunctionError xx){
+                continue;
+            }
+            /* The width to fit to may either be specified,
+             * or calculated. Specifying by the caller is only
+             * valid if the text does not need to be decomposed
+             * into multiple calls.
              */
-            str = removeControlChars(str);
-            if (str.length() == 0) {
+            float desiredWidth;
+            if (acs.length == 1 && width != 0f) {
+                desiredWidth = width;
+            } else {
+                Rectangle2D r2d =
+                    mLastFont.getStringBounds(cs.charsetChars,
+                                              cs.offset,
+                                              cs.offset+cs.length,
+                                              frc);
+                desiredWidth = (float)r2d.getWidth();
+            }
+            /* unprintable chars had width of 0, causing a PS error
+             */
+            if (desiredWidth == 0) {
                 return true;
             }
-            PlatformFont peer = (PlatformFont) FontAccess.getFontAccess()
-                                                         .getFontPeer(mLastFont);
-            CharsetString[] acs = peer.makeMultiCharsetString(str, false);
-            if (acs == null) {
-                /* AWT can't convert all chars so use 2D path */
-                return false;
+            nativeStr.append('<');
+            for (int j = 0; j < len; j++){
+                byte b = strSeg[j];
+                // to avoid encoding conversion with println()
+                String hexS = Integer.toHexString(b);
+                int length = hexS.length();
+                if (length > 2) {
+                    hexS = hexS.substring(length - 2, length);
+                } else if (length == 1) {
+                    hexS = "0" + hexS;
+                } else if (length == 0) {
+                    hexS = "00";
+                }
+                nativeStr.append(hexS);
             }
-            /* Get an array of indices into our PostScript name
-             * table. If all of the runs can not be converted
-             * to PostScript fonts then null is returned and
-             * we'll want to fall back to printing the text
-             * as shapes.
-             */
-            int[] psFonts = getPSFontIndexArray(mLastFont, acs);
-            if (psFonts != null) {
-
-                for (int i = 0; i < acs.length; i++){
-                    CharsetString cs = acs[i];
-                    CharsetEncoder fontCS = cs.fontDescriptor.encoder;
-
-                    StringBuilder nativeStr = new StringBuilder();
-                    byte[] strSeg = new byte[cs.length * 2];
-                    int len = 0;
-                    try {
-                        ByteBuffer bb = ByteBuffer.wrap(strSeg);
-                        fontCS.encode(CharBuffer.wrap(cs.charsetChars,
-                                                      cs.offset,
-                                                      cs.length),
-                                      bb, true);
-                        bb.flip();
-                        len = bb.limit();
-                    } catch (IllegalStateException | CoderMalfunctionError xx){
-                        continue;
-                    }
-                    /* The width to fit to may either be specified,
-                     * or calculated. Specifying by the caller is only
-                     * valid if the text does not need to be decomposed
-                     * into multiple calls.
-                     */
-                    float desiredWidth;
-                    if (acs.length == 1 && width != 0f) {
-                        desiredWidth = width;
-                    } else {
-                        Rectangle2D r2d =
-                            mLastFont.getStringBounds(cs.charsetChars,
-                                                      cs.offset,
-                                                      cs.offset+cs.length,
-                                                      frc);
-                        desiredWidth = (float)r2d.getWidth();
-                    }
-                    /* unprintable chars had width of 0, causing a PS error
-                     */
-                    if (desiredWidth == 0) {
-                        return didText;
-                    }
-                    nativeStr.append('<');
-                    for (int j = 0; j < len; j++){
-                        byte b = strSeg[j];
-                        // to avoid encoding conversion with println()
-                        String hexS = Integer.toHexString(b);
-                        int length = hexS.length();
-                        if (length > 2) {
-                            hexS = hexS.substring(length - 2, length);
-                        } else if (length == 1) {
-                            hexS = "0" + hexS;
-                        } else if (length == 0) {
-                            hexS = "00";
-                        }
-                        nativeStr.append(hexS);
-                    }
-                    nativeStr.append('>');
-                    /* This comment costs too much in output file size */
+            nativeStr.append('>');
+            /* This comment costs too much in output file size */
 //                  mPSStream.println("% Font[" + mLastFont.getName() + ", " +
 //                             FontConfiguration.getStyleString(mLastFont.getStyle()) + ", "
 //                             + mLastFont.getSize2D() + "]");
-                    getGState().emitPSFont(psFonts[i], mLastFont.getSize2D());
+            getGState().emitPSFont(psFonts[i], mLastFont.getSize2D());
 
-                    // out String
-                    mPSStream.println(nativeStr.toString() + " " +
-                                      desiredWidth + " " + x + " " + y + " " +
-                                      DrawStringName);
-                    x += desiredWidth;
-                }
-            } else {
-                didText = false;
-            }
+            // out String
+            mPSStream.println(nativeStr.toString() + " " +
+                              desiredWidth + " " + x + " " + y + " " +
+                              DrawStringName);
+            x += desiredWidth;
         }
 
-        return didText;
-     }
+        return true;
+    }
+
     /**
      * Set the current path rule to be either
      * {@code FILL_EVEN_ODD} (using the
@@ -1802,7 +1805,6 @@ public class PSPrinterJob extends RasterPrinterJob {
             return mClip == null || mClip.equals(clip);
         }
 
-
         void emitPSClip(Shape clip) {
             if (clip != null
                 && (mClip == null || mClip.equals(clip) == false)) {
@@ -1937,7 +1939,8 @@ public class PSPrinterJob extends RasterPrinterJob {
     protected void deviceFill(PathIterator pathIter, Color color,
                               AffineTransform tx, Shape clip) {
 
-        if (Double.isNaN(tx.getScaleX()) ||
+        if (pathIter.isDone() ||
+            Double.isNaN(tx.getScaleX()) ||
             Double.isNaN(tx.getScaleY()) ||
             Double.isNaN(tx.getShearX()) ||
             Double.isNaN(tx.getShearY()) ||
diff --git a/test/jdk/javax/print/PostScriptLeanTest.java b/test/jdk/javax/print/PostScriptLeanTest.java
new file mode 100644
index 00000000000..7a02cfb2c7a
--- /dev/null
+++ b/test/jdk/javax/print/PostScriptLeanTest.java
@@ -0,0 +1,140 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please 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.Graphics;
+import java.awt.Polygon;
+import java.awt.geom.AffineTransform;
+import java.awt.print.PageFormat;
+import java.awt.print.Printable;
+import java.awt.print.PrinterException;
+import java.io.ByteArrayOutputStream;
+import java.nio.charset.StandardCharsets;
+
+import javax.print.Doc;
+import javax.print.DocFlavor;
+import javax.print.DocPrintJob;
+import javax.print.SimpleDoc;
+import javax.print.StreamPrintService;
+import javax.print.StreamPrintServiceFactory;
+import javax.print.event.PrintJobAdapter;
+import javax.print.event.PrintJobEvent;
+
+/*
+ * @test
+ * @bug 8349932
+ * @summary Verifies that generated PostScript omits unnecessary graphics state commands.
+ */
+public class PostScriptLeanTest {
+
+    public static void main(String[] args) throws Exception {
+
+        DocFlavor flavor = DocFlavor.SERVICE_FORMATTED.PRINTABLE;
+        String mime = "application/postscript";
+        StreamPrintServiceFactory[] factories = StreamPrintServiceFactory.lookupStreamPrintServiceFactories(flavor, mime);
+        if (factories.length == 0) {
+            throw new RuntimeException("Unable to find PostScript print service factory");
+        }
+
+        StreamPrintServiceFactory factory = factories[0];
+        ByteArrayOutputStream output = new ByteArrayOutputStream();
+        StreamPrintService service = factory.getPrintService(output);
+        DocPrintJob job = service.createPrintJob();
+
+        PrintJobMonitor monitor = new PrintJobMonitor();
+        job.addPrintJobListener(monitor);
+
+        Printable printable = new TestPrintable();
+        Doc doc = new SimpleDoc(printable, flavor, null);
+        job.print(doc, null);
+        monitor.waitForJobToFinish();
+
+        byte[] separator = System.lineSeparator().getBytes(StandardCharsets.UTF_8);
+        byte prefix = separator[separator.length - 1];
+        byte postfix = separator[0];
+
+        int paths = 0;
+        byte[] ps = output.toByteArray();
+        for (int i = 1; i + 1 < ps.length; i++) {
+            if (ps[i - 1] == prefix && ps[i] == 'N' && ps[i + 1] == postfix) {
+                paths++; // found a "newpath" command (aliased to "N")
+            }
+        }
+
+        if (paths != 1) {
+            throw new RuntimeException("Expected 1 path, but found " + paths + " paths");
+        }
+    }
+
+    private static final class TestPrintable implements Printable {
+        @Override
+        public int print(Graphics graphics, PageFormat pageFormat, int pageIndex) throws PrinterException {
+            if (pageIndex > 0) {
+                return NO_SUCH_PAGE;
+            }
+            Font font1 = new Font("SansSerif", Font.PLAIN, 20);
+            Font font2 = font1.deriveFont(AffineTransform.getQuadrantRotateInstance(1));
+            graphics.setFont(font1);
+            graphics.drawString("XX", 300, 300); // not ignored, adds a path
+            graphics.setFont(font2);
+            graphics.drawString("\r", 300, 350); // ignored, nothing to draw, no path added
+            graphics.drawString("\n", 300, 400); // ignored, nothing to draw, no path added
+            graphics.drawString("\t", 300, 450); // ignored, nothing to draw, no path added
+            graphics.drawPolygon(new Polygon()); // empty polygon, nothing to draw, no path added
+            return PAGE_EXISTS;
+        }
+    }
+
+    private static class PrintJobMonitor extends PrintJobAdapter {
+        private boolean finished;
+        @Override
+        public void printJobCanceled(PrintJobEvent pje) {
+            finished();
+        }
+        @Override
+        public void printJobCompleted(PrintJobEvent pje) {
+            finished();
+        }
+        @Override
+        public void printJobFailed(PrintJobEvent pje) {
+            finished();
+        }
+        @Override
+        public void printJobNoMoreEvents(PrintJobEvent pje) {
+            finished();
+        }
+        private synchronized void finished() {
+            finished = true;
+            notify();
+        }
+        public synchronized void waitForJobToFinish() {
+            try {
+                while (!finished) {
+                    wait();
+                }
+            } catch (InterruptedException e) {
+                throw new RuntimeException(e);
+            }
+        }
+    }
+}

From a90f323d05f1c90767823b8729b124de0bead265 Mon Sep 17 00:00:00 2001
From: Xiaolong Peng <xpeng@openjdk.org>
Date: Sat, 8 Mar 2025 12:28:34 +0000
Subject: [PATCH 266/587] 8349705: java.net.URI.scanIPv4Address throws
 unnecessary URISyntaxException

Reviewed-by: dfuchs
---
 src/java.base/share/classes/java/net/URI.java | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/java.base/share/classes/java/net/URI.java b/src/java.base/share/classes/java/net/URI.java
index 3aa2a18ccf8..2e6f2409bf4 100644
--- a/src/java.base/share/classes/java/net/URI.java
+++ b/src/java.base/share/classes/java/net/URI.java
@@ -3466,7 +3466,7 @@ public final class URI
                 if (q < m) break;
                 return q;
             }
-            fail("Malformed IPv4 address", q);
+            if (strict) fail("Malformed IPv4 address", q);
             return -1;
         }
 
@@ -3495,12 +3495,16 @@ public final class URI
                 return -1;
             }
 
+            if (p == -1) {
+                return p;
+            }
+
             if (p > start && p < n) {
                 // IPv4 address is followed by something - check that
                 // it's a ":" as this is the only valid character to
                 // follow an address.
                 if (input.charAt(p) != ':') {
-                    p = -1;
+                    return -1;
                 }
             }
 

From 4e1367e34be724a0f84069100854c38333610714 Mon Sep 17 00:00:00 2001
From: Cesar Soares Lucas <cslucas@openjdk.org>
Date: Sat, 8 Mar 2025 14:01:28 +0000
Subject: [PATCH 267/587] 8343468: GenShen: Enable relocation of remembered set
 card tables

Reviewed-by: shade, kdnilsen, wkemper
---
 src/hotspot/cpu/aarch64/aarch64.ad            |  1 +
 .../shenandoahBarrierSetAssembler_aarch64.cpp |  6 +-
 .../shenandoahBarrierSetAssembler_ppc.cpp     |  8 +-
 .../shenandoahBarrierSetAssembler_riscv.cpp   |  6 +-
 src/hotspot/cpu/riscv/riscv.ad                |  1 +
 .../cardTableBarrierSetAssembler_x86.cpp      |  1 +
 .../shenandoahBarrierSetAssembler_x86.cpp     | 66 ++++++++------
 src/hotspot/share/ci/ciUtilities.cpp          |  2 +
 .../gc/shared/c1/cardTableBarrierSetC1.cpp    |  2 +
 .../shenandoah/c1/shenandoahBarrierSetC1.cpp  | 18 ++--
 .../shenandoah/c2/shenandoahBarrierSetC2.cpp  | 19 ++--
 .../shenandoah/c2/shenandoahBarrierSetC2.hpp  |  2 -
 .../gc/shenandoah/shenandoahBarrierSet.cpp    |  5 ++
 .../gc/shenandoah/shenandoahCardTable.hpp     | 14 +++
 .../gc/shenandoah/shenandoahConcurrentGC.cpp  |  8 +-
 .../gc/shenandoah/shenandoahConcurrentGC.hpp  |  2 +-
 .../gc/shenandoah/shenandoahDegeneratedGC.cpp |  4 +-
 .../gc/shenandoah/shenandoahGeneration.cpp    | 27 ++----
 .../gc/shenandoah/shenandoahGeneration.hpp    |  2 +-
 .../shenandoahGenerationalFullGC.cpp          |  5 ++
 .../shenandoah/shenandoahScanRemembered.cpp   | 87 +++++++++----------
 .../shenandoah/shenandoahScanRemembered.hpp   | 20 +++--
 .../shenandoah/shenandoahThreadLocalData.cpp  |  1 +
 .../shenandoah/shenandoahThreadLocalData.hpp  | 18 ++++
 .../gc/shenandoah/shenandoahVerifier.cpp      |  2 +-
 25 files changed, 186 insertions(+), 141 deletions(-)

diff --git a/src/hotspot/cpu/aarch64/aarch64.ad b/src/hotspot/cpu/aarch64/aarch64.ad
index 017dc0ed85f..33e81d01932 100644
--- a/src/hotspot/cpu/aarch64/aarch64.ad
+++ b/src/hotspot/cpu/aarch64/aarch64.ad
@@ -4541,6 +4541,7 @@ operand immByteMapBase()
 %{
   // Get base of card map
   predicate(BarrierSet::barrier_set()->is_a(BarrierSet::CardTableBarrierSet) &&
+            !BarrierSet::barrier_set()->is_a(BarrierSet::ShenandoahBarrierSet) &&
             (CardTable::CardValue*)n->get_ptr() == ((CardTableBarrierSet*)(BarrierSet::barrier_set()))->card_table()->byte_map_base());
   match(ConP);
 
diff --git a/src/hotspot/cpu/aarch64/gc/shenandoah/shenandoahBarrierSetAssembler_aarch64.cpp b/src/hotspot/cpu/aarch64/gc/shenandoah/shenandoahBarrierSetAssembler_aarch64.cpp
index 19270d9fecf..ac22b43faaf 100644
--- a/src/hotspot/cpu/aarch64/gc/shenandoah/shenandoahBarrierSetAssembler_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/gc/shenandoah/shenandoahBarrierSetAssembler_aarch64.cpp
@@ -377,7 +377,8 @@ void ShenandoahBarrierSetAssembler::store_check(MacroAssembler* masm, Register o
 
   assert(CardTable::dirty_card_val() == 0, "must be");
 
-  __ load_byte_map_base(rscratch1);
+  Address curr_ct_holder_addr(rthread, in_bytes(ShenandoahThreadLocalData::card_table_offset()));
+  __ ldr(rscratch1, curr_ct_holder_addr);
 
   if (UseCondCardMark) {
     Label L_already_dirty;
@@ -624,7 +625,8 @@ void ShenandoahBarrierSetAssembler::gen_write_ref_array_post_barrier(MacroAssemb
   // number of bytes to copy
   __ sub(count, end, start);
 
-  __ load_byte_map_base(scratch);
+  Address curr_ct_holder_addr(rthread, in_bytes(ShenandoahThreadLocalData::card_table_offset()));
+  __ ldr(scratch, curr_ct_holder_addr);
   __ add(start, start, scratch);
   __ bind(L_loop);
   __ strb(zr, Address(start, count));
diff --git a/src/hotspot/cpu/ppc/gc/shenandoah/shenandoahBarrierSetAssembler_ppc.cpp b/src/hotspot/cpu/ppc/gc/shenandoah/shenandoahBarrierSetAssembler_ppc.cpp
index f7e3072f081..842201e1584 100644
--- a/src/hotspot/cpu/ppc/gc/shenandoah/shenandoahBarrierSetAssembler_ppc.cpp
+++ b/src/hotspot/cpu/ppc/gc/shenandoah/shenandoahBarrierSetAssembler_ppc.cpp
@@ -587,9 +587,6 @@ void ShenandoahBarrierSetAssembler::load_at(
 
 void ShenandoahBarrierSetAssembler::store_check(MacroAssembler* masm, Register base, RegisterOrConstant ind_or_offs, Register tmp) {
   assert(ShenandoahCardBarrier, "Should have been checked by caller");
-
-  ShenandoahBarrierSet* ctbs = ShenandoahBarrierSet::barrier_set();
-  CardTable* ct = ctbs->card_table();
   assert_different_registers(base, tmp, R0);
 
   if (ind_or_offs.is_constant()) {
@@ -598,7 +595,7 @@ void ShenandoahBarrierSetAssembler::store_check(MacroAssembler* masm, Register b
     __ add(base, ind_or_offs.as_register(), base);
   }
 
-  __ load_const_optimized(tmp, (address)ct->byte_map_base(), R0);
+  __ ld(tmp, in_bytes(ShenandoahThreadLocalData::card_table_offset()), R16_thread); /* tmp = *[R16_thread + card_table_offset] */
   __ srdi(base, base, CardTable::card_shift());
   __ li(R0, CardTable::dirty_card_val());
   __ stbx(R0, tmp, base);
@@ -797,7 +794,8 @@ void ShenandoahBarrierSetAssembler::gen_write_ref_array_post_barrier(MacroAssemb
   __ srdi(addr, addr, CardTable::card_shift());
   __ srdi(count, count, CardTable::card_shift());
   __ subf(count, addr, count);
-  __ add_const_optimized(addr, addr, (address)ct->byte_map_base(), R0);
+  __ ld(R0, in_bytes(ShenandoahThreadLocalData::card_table_offset()), R16_thread);
+  __ add(addr, addr, R0);
   __ addi(count, count, 1);
   __ li(R0, 0);
   __ mtctr(count);
diff --git a/src/hotspot/cpu/riscv/gc/shenandoah/shenandoahBarrierSetAssembler_riscv.cpp b/src/hotspot/cpu/riscv/gc/shenandoah/shenandoahBarrierSetAssembler_riscv.cpp
index 97b83d78811..3021351cca8 100644
--- a/src/hotspot/cpu/riscv/gc/shenandoah/shenandoahBarrierSetAssembler_riscv.cpp
+++ b/src/hotspot/cpu/riscv/gc/shenandoah/shenandoahBarrierSetAssembler_riscv.cpp
@@ -396,7 +396,8 @@ void ShenandoahBarrierSetAssembler::store_check(MacroAssembler* masm, Register o
 
   assert(CardTable::dirty_card_val() == 0, "must be");
 
-  __ load_byte_map_base(t1);
+  Address curr_ct_holder_addr(xthread, in_bytes(ShenandoahThreadLocalData::card_table_offset()));
+  __ ld(t1, curr_ct_holder_addr);
   __ add(t1, obj, t1);
 
   if (UseCondCardMark) {
@@ -568,7 +569,8 @@ void ShenandoahBarrierSetAssembler::gen_write_ref_array_post_barrier(MacroAssemb
   // number of bytes to copy
   __ sub(count, end, start);
 
-  __ load_byte_map_base(tmp);
+  Address curr_ct_holder_addr(xthread, in_bytes(ShenandoahThreadLocalData::card_table_offset()));
+  __ ld(tmp, curr_ct_holder_addr);
   __ add(start, start, tmp);
 
   __ bind(L_loop);
diff --git a/src/hotspot/cpu/riscv/riscv.ad b/src/hotspot/cpu/riscv/riscv.ad
index 00ebeabe3e2..031baf2ef9c 100644
--- a/src/hotspot/cpu/riscv/riscv.ad
+++ b/src/hotspot/cpu/riscv/riscv.ad
@@ -2916,6 +2916,7 @@ operand immByteMapBase()
 %{
   // Get base of card map
   predicate(BarrierSet::barrier_set()->is_a(BarrierSet::CardTableBarrierSet) &&
+            !BarrierSet::barrier_set()->is_a(BarrierSet::ShenandoahBarrierSet) &&
             (CardTable::CardValue*)n->get_ptr() ==
              ((CardTableBarrierSet*)(BarrierSet::barrier_set()))->card_table()->byte_map_base());
   match(ConP);
diff --git a/src/hotspot/cpu/x86/gc/shared/cardTableBarrierSetAssembler_x86.cpp b/src/hotspot/cpu/x86/gc/shared/cardTableBarrierSetAssembler_x86.cpp
index 7954ce38d03..81284323e39 100644
--- a/src/hotspot/cpu/x86/gc/shared/cardTableBarrierSetAssembler_x86.cpp
+++ b/src/hotspot/cpu/x86/gc/shared/cardTableBarrierSetAssembler_x86.cpp
@@ -47,6 +47,7 @@ void CardTableBarrierSetAssembler::gen_write_ref_array_post_barrier(MacroAssembl
   CardTableBarrierSet* ctbs = barrier_set_cast<CardTableBarrierSet>(bs);
   CardTable* ct = ctbs->card_table();
   intptr_t disp = (intptr_t) ct->byte_map_base();
+  SHENANDOAHGC_ONLY(assert(!UseShenandoahGC, "Shenandoah byte_map_base is not constant.");)
 
   Label L_loop, L_done;
   const Register end = count;
diff --git a/src/hotspot/cpu/x86/gc/shenandoah/shenandoahBarrierSetAssembler_x86.cpp b/src/hotspot/cpu/x86/gc/shenandoah/shenandoahBarrierSetAssembler_x86.cpp
index 75ab8fca051..a33ec611f55 100644
--- a/src/hotspot/cpu/x86/gc/shenandoah/shenandoahBarrierSetAssembler_x86.cpp
+++ b/src/hotspot/cpu/x86/gc/shenandoah/shenandoahBarrierSetAssembler_x86.cpp
@@ -614,31 +614,31 @@ void ShenandoahBarrierSetAssembler::store_check(MacroAssembler* masm, Register o
 
   // Does a store check for the oop in register obj. The content of
   // register obj is destroyed afterwards.
-
-  ShenandoahBarrierSet* ctbs = ShenandoahBarrierSet::barrier_set();
-  CardTable* ct = ctbs->card_table();
-
   __ shrptr(obj, CardTable::card_shift());
 
-  Address card_addr;
+  // We'll use this register as the TLS base address and also later on
+  // to hold the byte_map_base.
+  Register thread = LP64_ONLY(r15_thread) NOT_LP64(rcx);
+  Register tmp = LP64_ONLY(rscratch1) NOT_LP64(rdx);
 
-  // The calculation for byte_map_base is as follows:
-  // byte_map_base = _byte_map - (uintptr_t(low_bound) >> card_shift);
-  // So this essentially converts an address to a displacement and it will
-  // never need to be relocated. On 64-bit however the value may be too
-  // large for a 32-bit displacement.
-  intptr_t byte_map_base = (intptr_t)ct->byte_map_base();
-  if (__ is_simm32(byte_map_base)) {
-    card_addr = Address(noreg, obj, Address::times_1, byte_map_base);
-  } else {
-    // By doing it as an ExternalAddress 'byte_map_base' could be converted to a rip-relative
-    // displacement and done in a single instruction given favorable mapping and a
-    // smarter version of as_Address. However, 'ExternalAddress' generates a relocation
-    // entry and that entry is not properly handled by the relocation code.
-    AddressLiteral cardtable((address)byte_map_base, relocInfo::none);
-    Address index(noreg, obj, Address::times_1);
-    card_addr = __ as_Address(ArrayAddress(cardtable, index), rscratch1);
+#ifndef _LP64
+  // The next two ifs are just to get temporary registers to use for TLS and card table base.
+  if (thread == obj) {
+    thread = rdx;
+    tmp = rsi;
   }
+  if (tmp == obj) {
+    tmp = rsi;
+  }
+
+  __ push(thread);
+  __ push(tmp);
+  __ get_thread(thread);
+#endif
+
+  Address curr_ct_holder_addr(thread, in_bytes(ShenandoahThreadLocalData::card_table_offset()));
+  __ movptr(tmp, curr_ct_holder_addr);
+  Address card_addr(tmp, obj, Address::times_1);
 
   int dirty = CardTable::dirty_card_val();
   if (UseCondCardMark) {
@@ -650,6 +650,11 @@ void ShenandoahBarrierSetAssembler::store_check(MacroAssembler* masm, Register o
   } else {
     __ movb(card_addr, dirty);
   }
+
+#ifndef _LP64
+  __ pop(tmp);
+  __ pop(thread);
+#endif
 }
 
 void ShenandoahBarrierSetAssembler::store_at(MacroAssembler* masm, DecoratorSet decorators, BasicType type,
@@ -905,10 +910,6 @@ void ShenandoahBarrierSetAssembler::gen_write_ref_array_post_barrier(MacroAssemb
                                                                      Register tmp) {
   assert(ShenandoahCardBarrier, "Should have been checked by caller");
 
-  ShenandoahBarrierSet* bs = ShenandoahBarrierSet::barrier_set();
-  CardTable* ct = bs->card_table();
-  intptr_t disp = (intptr_t) ct->byte_map_base();
-
   Label L_loop, L_done;
   const Register end = count;
   assert_different_registers(addr, end);
@@ -918,13 +919,16 @@ void ShenandoahBarrierSetAssembler::gen_write_ref_array_post_barrier(MacroAssemb
   __ jccb(Assembler::zero, L_done);
 
 #ifdef _LP64
+  const Register thread = r15_thread;
+  Address curr_ct_holder_addr(thread, in_bytes(ShenandoahThreadLocalData::card_table_offset()));
+  __ movptr(tmp, curr_ct_holder_addr);
+
   __ leaq(end, Address(addr, count, TIMES_OOP, 0));  // end == addr+count*oop_size
   __ subptr(end, BytesPerHeapOop); // end - 1 to make inclusive
   __ shrptr(addr, CardTable::card_shift());
   __ shrptr(end, CardTable::card_shift());
   __ subptr(end, addr); // end --> cards count
 
-  __ mov64(tmp, disp);
   __ addptr(addr, tmp);
 
   __ BIND(L_loop);
@@ -932,13 +936,21 @@ void ShenandoahBarrierSetAssembler::gen_write_ref_array_post_barrier(MacroAssemb
   __ decrement(count);
   __ jccb(Assembler::greaterEqual, L_loop);
 #else
+  const Register thread = tmp;
+  __ get_thread(thread);
+
+  Address curr_ct_holder_addr(thread, in_bytes(ShenandoahThreadLocalData::byte_map_base_offset()));
+  __ movptr(tmp, curr_ct_holder_addr);
+
   __ lea(end, Address(addr, count, Address::times_ptr, -wordSize));
   __ shrptr(addr, CardTable::card_shift());
   __ shrptr(end,  CardTable::card_shift());
   __ subptr(end, addr); // end --> count
 
+  __ addptr(addr, tmp);
+
   __ BIND(L_loop);
-  Address cardtable(addr, count, Address::times_1, disp);
+  Address cardtable(addr, count, Address::times_1, 0);
   __ movb(cardtable, 0);
   __ decrement(count);
   __ jccb(Assembler::greaterEqual, L_loop);
diff --git a/src/hotspot/share/ci/ciUtilities.cpp b/src/hotspot/share/ci/ciUtilities.cpp
index 1a91ded9371..203099bcf3f 100644
--- a/src/hotspot/share/ci/ciUtilities.cpp
+++ b/src/hotspot/share/ci/ciUtilities.cpp
@@ -26,6 +26,7 @@
 #include "gc/shared/cardTableBarrierSet.hpp"
 #include "gc/shared/cardTable.hpp"
 #include "gc/shared/collectedHeap.hpp"
+#include "gc/shared/gc_globals.hpp"
 
 // ciUtilities
 //
@@ -45,5 +46,6 @@ CardTable::CardValue* ci_card_table_address() {
   BarrierSet* bs = BarrierSet::barrier_set();
   CardTableBarrierSet* ctbs = barrier_set_cast<CardTableBarrierSet>(bs);
   CardTable* ct = ctbs->card_table();
+  assert(!UseShenandoahGC, "Shenandoah byte_map_base is not constant.");
   return ct->byte_map_base();
 }
diff --git a/src/hotspot/share/gc/shared/c1/cardTableBarrierSetC1.cpp b/src/hotspot/share/gc/shared/c1/cardTableBarrierSetC1.cpp
index 1cf629ca6b2..278b1b158aa 100644
--- a/src/hotspot/share/gc/shared/c1/cardTableBarrierSetC1.cpp
+++ b/src/hotspot/share/gc/shared/c1/cardTableBarrierSetC1.cpp
@@ -46,6 +46,8 @@ void CardTableBarrierSetC1::post_barrier(LIRAccess& access, LIR_Opr addr, LIR_Op
   CardTableBarrierSet* ctbs = barrier_set_cast<CardTableBarrierSet>(bs);
   CardTable* ct = ctbs->card_table();
   LIR_Const* card_table_base = new LIR_Const(ct->byte_map_base());
+  SHENANDOAHGC_ONLY(assert(!UseShenandoahGC, "Shenandoah byte_map_base is not constant.");)
+
   if (addr->is_address()) {
     LIR_Address* address = addr->as_address_ptr();
     // ptr cannot be an object because we use this barrier for array card marks
diff --git a/src/hotspot/share/gc/shenandoah/c1/shenandoahBarrierSetC1.cpp b/src/hotspot/share/gc/shenandoah/c1/shenandoahBarrierSetC1.cpp
index d27b98adc9f..1796e8ef197 100644
--- a/src/hotspot/share/gc/shenandoah/c1/shenandoahBarrierSetC1.cpp
+++ b/src/hotspot/share/gc/shenandoah/c1/shenandoahBarrierSetC1.cpp
@@ -309,10 +309,12 @@ void ShenandoahBarrierSetC1::post_barrier(LIRAccess& access, LIR_Opr addr, LIR_O
     return;
   }
 
-  BarrierSet* bs = BarrierSet::barrier_set();
-  ShenandoahBarrierSet* ctbs = barrier_set_cast<ShenandoahBarrierSet>(bs);
-  CardTable* ct = ctbs->card_table();
-  LIR_Const* card_table_base = new LIR_Const(ct->byte_map_base());
+  LIR_Opr thrd = gen->getThreadPointer();
+  const int curr_ct_holder_offset = in_bytes(ShenandoahThreadLocalData::card_table_offset());
+  LIR_Address* curr_ct_holder_addr = new LIR_Address(thrd, curr_ct_holder_offset, T_ADDRESS);
+  LIR_Opr curr_ct_holder_ptr_reg = gen->new_register(T_ADDRESS);
+  __ move(curr_ct_holder_addr, curr_ct_holder_ptr_reg);
+
   if (addr->is_address()) {
     LIR_Address* address = addr->as_address_ptr();
     // ptr cannot be an object because we use this barrier for array card marks
@@ -336,13 +338,7 @@ void ShenandoahBarrierSetC1::post_barrier(LIRAccess& access, LIR_Opr addr, LIR_O
     __ unsigned_shift_right(addr, CardTable::card_shift(), tmp);
   }
 
-  LIR_Address* card_addr;
-  if (gen->can_inline_as_constant(card_table_base)) {
-    card_addr = new LIR_Address(tmp, card_table_base->as_jint(), T_BYTE);
-  } else {
-    card_addr = new LIR_Address(tmp, gen->load_constant(card_table_base), T_BYTE);
-  }
-
+  LIR_Address* card_addr = new LIR_Address(curr_ct_holder_ptr_reg, tmp, T_BYTE);
   LIR_Opr dirty = LIR_OprFact::intConst(CardTable::dirty_card_val());
   if (UseCondCardMark) {
     LIR_Opr cur_value = gen->new_register(T_INT);
diff --git a/src/hotspot/share/gc/shenandoah/c2/shenandoahBarrierSetC2.cpp b/src/hotspot/share/gc/shenandoah/c2/shenandoahBarrierSetC2.cpp
index 514cc8fd839..a7e854aaf83 100644
--- a/src/hotspot/share/gc/shenandoah/c2/shenandoahBarrierSetC2.cpp
+++ b/src/hotspot/share/gc/shenandoah/c2/shenandoahBarrierSetC2.cpp
@@ -433,17 +433,6 @@ void ShenandoahBarrierSetC2::insert_pre_barrier(GraphKit* kit, Node* base_oop, N
   kit->final_sync(ideal);
 }
 
-Node* ShenandoahBarrierSetC2::byte_map_base_node(GraphKit* kit) const {
-  BarrierSet* bs = BarrierSet::barrier_set();
-  ShenandoahBarrierSet* ctbs = barrier_set_cast<ShenandoahBarrierSet>(bs);
-  CardTable::CardValue* card_table_base = ctbs->card_table()->byte_map_base();
-  if (card_table_base != nullptr) {
-    return kit->makecon(TypeRawPtr::make((address)card_table_base));
-  } else {
-    return kit->null();
-  }
-}
-
 void ShenandoahBarrierSetC2::post_barrier(GraphKit* kit,
                                           Node* ctl,
                                           Node* oop_store,
@@ -487,14 +476,20 @@ void ShenandoahBarrierSetC2::post_barrier(GraphKit* kit,
 
   IdealKit ideal(kit, true);
 
+  Node* tls = __ thread(); // ThreadLocalStorage
+
   // Convert the pointer to an int prior to doing math on it
   Node* cast = __ CastPX(__ ctrl(), adr);
 
+  Node* curr_ct_holder_offset = __ ConX(in_bytes(ShenandoahThreadLocalData::card_table_offset()));
+  Node* curr_ct_holder_addr  = __ AddP(__ top(), tls, curr_ct_holder_offset);
+  Node* curr_ct_base_addr = __ load( __ ctrl(), curr_ct_holder_addr, TypeRawPtr::NOTNULL, T_ADDRESS, Compile::AliasIdxRaw);
+
   // Divide by card size
   Node* card_offset = __ URShiftX( cast, __ ConI(CardTable::card_shift()) );
 
   // Combine card table base and card offset
-  Node* card_adr = __ AddP(__ top(), byte_map_base_node(kit), card_offset );
+  Node* card_adr = __ AddP(__ top(), curr_ct_base_addr, card_offset);
 
   // Get the alias_index for raw card-mark memory
   int adr_type = Compile::AliasIdxRaw;
diff --git a/src/hotspot/share/gc/shenandoah/c2/shenandoahBarrierSetC2.hpp b/src/hotspot/share/gc/shenandoah/c2/shenandoahBarrierSetC2.hpp
index c1acde2118e..61f8bfb1140 100644
--- a/src/hotspot/share/gc/shenandoah/c2/shenandoahBarrierSetC2.hpp
+++ b/src/hotspot/share/gc/shenandoah/c2/shenandoahBarrierSetC2.hpp
@@ -67,8 +67,6 @@ private:
                                     Node* pre_val,
                                     BasicType bt) const;
 
-  Node* byte_map_base_node(GraphKit* kit) const;
-
   void post_barrier(GraphKit* kit,
                     Node* ctl,
                     Node* store,
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahBarrierSet.cpp b/src/hotspot/share/gc/shenandoah/shenandoahBarrierSet.cpp
index 17a89f631c6..7241869de56 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahBarrierSet.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahBarrierSet.cpp
@@ -114,6 +114,11 @@ void ShenandoahBarrierSet::on_thread_attach(Thread *thread) {
   assert(queue.index() == 0, "SATB queue index should be zero");
   queue.set_active(_satb_mark_queue_set.is_active());
 
+  if (ShenandoahCardBarrier) {
+    // Every thread always have a pointer to the _current_ _write_ version of the card table.
+    // The JIT'ed code will use this address (+card entry offset) to mark the card as dirty.
+    ShenandoahThreadLocalData::set_card_table(thread, _card_table->write_byte_map_base());
+  }
   ShenandoahThreadLocalData::set_gc_state(thread, _heap->gc_state());
 
   if (thread->is_Java_thread()) {
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahCardTable.hpp b/src/hotspot/share/gc/shenandoah/shenandoahCardTable.hpp
index b012da09c7a..33a4705b8d2 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahCardTable.hpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahCardTable.hpp
@@ -70,10 +70,24 @@ public:
 
   size_t last_valid_index();
 
+  CardValue* swap_read_and_write_tables() {
+    swap(_read_byte_map, _write_byte_map);
+    swap(_read_byte_map_base, _write_byte_map_base);
+
+    _byte_map = _write_byte_map;
+    _byte_map_base = _write_byte_map_base;
+
+    return _byte_map_base;
+  }
+
   CardValue* read_byte_map() {
     return _read_byte_map;
   }
 
+  CardValue* read_byte_map_base() {
+    return _read_byte_map_base;
+  }
+
   CardValue* write_byte_map() {
     return _write_byte_map;
   }
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahConcurrentGC.cpp b/src/hotspot/share/gc/shenandoah/shenandoahConcurrentGC.cpp
index 49aa4b3610d..62150a20db8 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahConcurrentGC.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahConcurrentGC.cpp
@@ -369,6 +369,10 @@ void ShenandoahConcurrentGC::entry_reset() {
                                 msg);
     op_reset();
   }
+
+  if (heap->mode()->is_generational()) {
+    heap->old_generation()->card_scan()->mark_read_table_as_clean();
+  }
 }
 
 void ShenandoahConcurrentGC::entry_scan_remembered_set() {
@@ -640,12 +644,10 @@ void ShenandoahConcurrentGC::op_init_mark() {
   assert(!_generation->is_mark_complete(), "should not be complete");
   assert(!heap->has_forwarded_objects(), "No forwarded objects on this path");
 
-
   if (heap->mode()->is_generational()) {
     if (_generation->is_young()) {
-      // The current implementation of swap_remembered_set() copies the write-card-table to the read-card-table.
       ShenandoahGCPhase phase(ShenandoahPhaseTimings::init_swap_rset);
-      _generation->swap_remembered_set();
+      _generation->swap_card_tables();
     }
 
     if (_generation->is_global()) {
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahConcurrentGC.hpp b/src/hotspot/share/gc/shenandoah/shenandoahConcurrentGC.hpp
index 81e7e943af3..0b2e42fb6c6 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahConcurrentGC.hpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahConcurrentGC.hpp
@@ -72,7 +72,7 @@ protected:
   void vmop_entry_final_roots();
 
   // Entry methods to normally STW GC operations. These set up logging, monitoring
-  // and workers for net VM operation
+  // and workers for next VM operation
   void entry_init_mark();
   void entry_final_mark();
   void entry_init_update_refs();
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahDegeneratedGC.cpp b/src/hotspot/share/gc/shenandoah/shenandoahDegeneratedGC.cpp
index 4d250a98fe6..436ba154e5a 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahDegeneratedGC.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahDegeneratedGC.cpp
@@ -138,7 +138,7 @@ void ShenandoahDegenGC::op_degenerated() {
 
       if (heap->mode()->is_generational() && _generation->is_young()) {
         // Swap remembered sets for young
-        _generation->swap_remembered_set();
+        _generation->swap_card_tables();
       }
 
     case _degenerated_roots:
@@ -170,7 +170,7 @@ void ShenandoahDegenGC::op_degenerated() {
           // We only need this if the concurrent cycle has already swapped the card tables.
           // Marking will use the 'read' table, but interesting pointers may have been
           // recorded in the 'write' table in the time between the cancelled concurrent cycle
-          // and this degenerated cycle. These pointers need to be included the 'read' table
+          // and this degenerated cycle. These pointers need to be included in the 'read' table
           // used to scan the remembered set during the STW mark which follows here.
           _generation->merge_write_table();
         }
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahGeneration.cpp b/src/hotspot/share/gc/shenandoah/shenandoahGeneration.cpp
index a6f67b809d7..48e30ed585f 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahGeneration.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahGeneration.cpp
@@ -97,20 +97,6 @@ public:
   }
 };
 
-class ShenandoahCopyWriteCardTableToRead: public ShenandoahHeapRegionClosure {
-private:
-  ShenandoahScanRemembered* _scanner;
-public:
-  ShenandoahCopyWriteCardTableToRead(ShenandoahScanRemembered* scanner) : _scanner(scanner) {}
-
-  void heap_region_do(ShenandoahHeapRegion* region) override {
-    assert(region->is_old(), "Don't waste time doing this for non-old regions");
-    _scanner->reset_remset(region->bottom(), ShenandoahHeapRegion::region_size_words());
-  }
-
-  bool is_thread_safe() override { return true; }
-};
-
 // Add [TAMS, top) volume over young regions. Used to correct age 0 cohort census
 // for adaptive tenuring when census is taken during marking.
 // In non-product builds, for the purposes of verification, we also collect the total
@@ -231,19 +217,18 @@ template void ShenandoahGeneration::reset_mark_bitmap<true, false>();
 template void ShenandoahGeneration::reset_mark_bitmap<true, true>();
 template void ShenandoahGeneration::reset_mark_bitmap<false, false>();
 
-// The ideal is to swap the remembered set so the safepoint effort is no more than a few pointer manipulations.
-// However, limitations in the implementation of the mutator write-barrier make it difficult to simply change the
-// location of the card table.  So the interim implementation of swap_remembered_set will copy the write-table
-// onto the read-table and will then clear the write-table.
-void ShenandoahGeneration::swap_remembered_set() {
+// Swap the read and write card table pointers prior to the next remset scan.
+// This avoids the need to synchronize reads of the table by the GC workers
+// doing remset scanning, on the one hand, with the dirtying of the table by
+// mutators on the other.
+void ShenandoahGeneration::swap_card_tables() {
   // Must be sure that marking is complete before we swap remembered set.
   ShenandoahGenerationalHeap* heap = ShenandoahGenerationalHeap::heap();
   heap->assert_gc_workers(heap->workers()->active_workers());
   shenandoah_assert_safepoint();
 
   ShenandoahOldGeneration* old_generation = heap->old_generation();
-  ShenandoahCopyWriteCardTableToRead task(old_generation->card_scan());
-  old_generation->parallel_heap_region_iterate(&task);
+  old_generation->card_scan()->swap_card_tables();
 }
 
 // Copy the write-version of the card-table into the read-version, clearing the
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahGeneration.hpp b/src/hotspot/share/gc/shenandoah/shenandoahGeneration.hpp
index 1dc777777aa..fddc71d153e 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahGeneration.hpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahGeneration.hpp
@@ -163,7 +163,7 @@ private:
   void reset_mark_bitmap();
 
   // Used by concurrent and degenerated GC to reset remembered set.
-  void swap_remembered_set();
+  void swap_card_tables();
 
   // Update the read cards with the state of the write table (write table is not cleared).
   void merge_write_table();
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahGenerationalFullGC.cpp b/src/hotspot/share/gc/shenandoah/shenandoahGenerationalFullGC.cpp
index a54f219faef..98028b67c7b 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahGenerationalFullGC.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahGenerationalFullGC.cpp
@@ -89,6 +89,11 @@ void ShenandoahGenerationalFullGC::handle_completion(ShenandoahHeap* heap) {
 
 void ShenandoahGenerationalFullGC::rebuild_remembered_set(ShenandoahHeap* heap) {
   ShenandoahGCPhase phase(ShenandoahPhaseTimings::full_gc_reconstruct_remembered_set);
+
+  ShenandoahScanRemembered* scanner = heap->old_generation()->card_scan();
+  scanner->mark_read_table_as_clean();
+  scanner->swap_card_tables();
+
   ShenandoahRegionIterator regions;
   ShenandoahReconstructRememberedSetTask task(&regions);
   heap->workers()->run_task(&task);
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahScanRemembered.cpp b/src/hotspot/share/gc/shenandoah/shenandoahScanRemembered.cpp
index 109e940e2bd..0634cba91d8 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahScanRemembered.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahScanRemembered.cpp
@@ -29,6 +29,7 @@
 #include "gc/shenandoah/shenandoahReferenceProcessor.hpp"
 #include "gc/shenandoah/shenandoahScanRemembered.inline.hpp"
 #include "logging/log.hpp"
+#include "runtime/threads.hpp"
 
 size_t ShenandoahDirectCardMarkRememberedSet::last_valid_index() const {
   return _card_table->last_valid_index();
@@ -68,18 +69,6 @@ void ShenandoahDirectCardMarkRememberedSet::mark_range_as_dirty(size_t card_inde
   }
 }
 
-void ShenandoahDirectCardMarkRememberedSet::mark_card_as_clean(size_t card_index) {
-  CardValue* bp = &(_card_table->write_byte_map())[card_index];
-  bp[0] = CardTable::clean_card_val();
-}
-
-void ShenandoahDirectCardMarkRememberedSet::mark_range_as_clean(size_t card_index, size_t num_cards) {
-  CardValue* bp = &(_card_table->write_byte_map())[card_index];
-  while (num_cards-- > 0) {
-    *bp++ = CardTable::clean_card_val();
-  }
-}
-
 bool ShenandoahDirectCardMarkRememberedSet::is_card_dirty(HeapWord* p) const {
   size_t index = card_index_for_addr(p);
   CardValue* bp = &(_card_table->read_byte_map())[index];
@@ -110,12 +99,6 @@ void ShenandoahDirectCardMarkRememberedSet::mark_range_as_dirty(HeapWord* p, siz
   }
 }
 
-void ShenandoahDirectCardMarkRememberedSet::mark_card_as_clean(HeapWord* p) {
-  size_t index = card_index_for_addr(p);
-  CardValue* bp = &(_card_table->write_byte_map())[index];
-  bp[0] = CardTable::clean_card_val();
-}
-
 void ShenandoahDirectCardMarkRememberedSet::mark_range_as_clean(HeapWord* p, size_t num_heap_words) {
   CardValue* bp = &(_card_table->write_byte_map_base())[uintptr_t(p) >> _card_shift];
   CardValue* end_bp = &(_card_table->write_byte_map_base())[uintptr_t(p + num_heap_words) >> _card_shift];
@@ -128,6 +111,18 @@ void ShenandoahDirectCardMarkRememberedSet::mark_range_as_clean(HeapWord* p, siz
   }
 }
 
+void ShenandoahDirectCardMarkRememberedSet::mark_read_table_as_clean() {
+  CardValue* read_table = _card_table->read_byte_map();
+  CardValue* bp = &(read_table)[0];
+  CardValue* end_bp = &(read_table)[_card_table->last_valid_index()];
+
+  while (bp <= end_bp) {
+    *bp++ = CardTable::clean_card_val();
+  }
+
+  log_info(gc, barrier)("Cleaned read_table from " PTR_FORMAT " to " PTR_FORMAT, p2i(&(read_table)[0]), p2i(end_bp));
+}
+
 // No lock required because arguments align with card boundaries.
 void ShenandoahCardCluster::reset_object_range(HeapWord* from, HeapWord* to) {
   assert(((((unsigned long long) from) & (CardTable::card_size() - 1)) == 0) &&
@@ -327,12 +322,12 @@ void ShenandoahScanRemembered::mark_range_as_dirty(HeapWord* p, size_t num_heap_
   _rs->mark_range_as_dirty(p, num_heap_words);
 }
 
-void ShenandoahScanRemembered::mark_card_as_clean(HeapWord* p) {
-  _rs->mark_card_as_clean(p);
+void ShenandoahScanRemembered::mark_range_as_clean(HeapWord* p, size_t num_heap_words) {
+  _rs->mark_range_as_clean(p, num_heap_words);
 }
 
-void ShenandoahScanRemembered:: mark_range_as_clean(HeapWord* p, size_t num_heap_words) {
-  _rs->mark_range_as_clean(p, num_heap_words);
+void ShenandoahScanRemembered::mark_read_table_as_clean() {
+  _rs->mark_read_table_as_clean();
 }
 
 void ShenandoahScanRemembered::reset_object_range(HeapWord* from, HeapWord* to) {
@@ -620,30 +615,35 @@ void ShenandoahDirectCardMarkRememberedSet::merge_write_table(HeapWord* start, s
   for (size_t i = 0; i < num; i++) {
     read_table[i] &= write_table[i];
   }
+
+  log_info(gc, remset)("Finished merging write_table into read_table.");
 }
 
-// Destructively copy the write table to the read table, and clean the write table.
-void ShenandoahDirectCardMarkRememberedSet::reset_remset(HeapWord* start, size_t word_count) {
-  size_t start_index = card_index_for_addr(start);
+void ShenandoahDirectCardMarkRememberedSet::swap_card_tables() {
+  CardTable::CardValue* new_ptr = _card_table->swap_read_and_write_tables();
+
 #ifdef ASSERT
-  // avoid querying card_index_for_addr() for an address past end of heap
-  size_t end_index = card_index_for_addr(start + word_count - 1) + 1;
-#endif
-  assert(start_index % ((size_t)1 << LogCardValsPerIntPtr) == 0, "Expected a multiple of CardValsPerIntPtr");
-  assert(end_index % ((size_t)1 << LogCardValsPerIntPtr) == 0, "Expected a multiple of CardValsPerIntPtr");
+  CardValue* start_bp = &(_card_table->write_byte_map())[0];
+  CardValue* end_bp = &(new_ptr)[_card_table->last_valid_index()];
 
-  // We'll access in groups of intptr_t worth of card entries
-  intptr_t* const read_table  = (intptr_t*) &(_card_table->read_byte_map())[start_index];
-  intptr_t* const write_table = (intptr_t*) &(_card_table->write_byte_map())[start_index];
-
-  // Avoid division, use shift instead
-  assert(word_count % ((size_t)1 << (LogCardSizeInWords + LogCardValsPerIntPtr)) == 0, "Expected a multiple of CardSizeInWords*CardValsPerIntPtr");
-  size_t const num = word_count >> (LogCardSizeInWords + LogCardValsPerIntPtr);
-
-  for (size_t i = 0; i < num; i++) {
-    read_table[i]  = write_table[i];
-    write_table[i] = CardTable::clean_card_row_val();
+  while (start_bp <= end_bp) {
+    assert(*start_bp == CardTable::clean_card_val(), "Should be clean: " PTR_FORMAT, p2i(start_bp));
+    start_bp++;
   }
+#endif
+
+  struct SwapTLSCardTable : public ThreadClosure {
+    CardTable::CardValue* _new_ptr;
+    SwapTLSCardTable(CardTable::CardValue* np) : _new_ptr(np) {}
+    virtual void do_thread(Thread* t) {
+      ShenandoahThreadLocalData::set_card_table(t, _new_ptr);
+    }
+  } swap_it(new_ptr);
+
+  // Iterate on threads and adjust thread local data
+  Threads::threads_do(&swap_it);
+
+  log_info(gc, barrier)("Current write_card_table: " PTR_FORMAT, p2i(swap_it._new_ptr));
 }
 
 ShenandoahScanRememberedTask::ShenandoahScanRememberedTask(ShenandoahObjToScanQueueSet* queue_set,
@@ -947,10 +947,7 @@ void ShenandoahReconstructRememberedSetTask::work(uint worker_id) {
         oop obj = cast_to_oop(obj_addr);
         size_t size = obj->size();
 
-        // First, clear the remembered set for all spanned humongous regions
         size_t num_regions = ShenandoahHeapRegion::required_regions(size * HeapWordSize);
-        size_t region_span = num_regions * ShenandoahHeapRegion::region_size_words();
-        scanner->reset_remset(r->bottom(), region_span);
         size_t region_index = r->index();
         ShenandoahHeapRegion* humongous_region = heap->get_region(region_index);
         while (num_regions-- != 0) {
@@ -963,8 +960,6 @@ void ShenandoahReconstructRememberedSetTask::work(uint worker_id) {
         scanner->register_object_without_lock(obj_addr);
         obj->oop_iterate(&dirty_cards_for_cross_generational_pointers);
       } else if (!r->is_humongous()) {
-        // First, clear the remembered set
-        scanner->reset_remset(r->bottom(), ShenandoahHeapRegion::region_size_words());
         scanner->reset_object_range(r->bottom(), r->end());
 
         // Then iterate over all objects, registering object and DIRTYing relevant remembered set cards
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahScanRemembered.hpp b/src/hotspot/share/gc/shenandoah/shenandoahScanRemembered.hpp
index e28f2f03052..5df34159c0f 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahScanRemembered.hpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahScanRemembered.hpp
@@ -239,15 +239,17 @@ public:
   inline bool is_write_card_dirty(HeapWord* p) const;
   inline void mark_card_as_dirty(HeapWord* p);
   inline void mark_range_as_dirty(HeapWord* p, size_t num_heap_words);
-  inline void mark_card_as_clean(HeapWord* p);
   inline void mark_range_as_clean(HeapWord* p, size_t num_heap_words);
 
+  // See comment in ShenandoahScanRemembered
+  inline void mark_read_table_as_clean();
+
   // Merge any dirty values from write table into the read table, while leaving
   // the write table unchanged.
   void merge_write_table(HeapWord* start, size_t word_count);
 
-  // Destructively copy the write table to the read table, and clean the write table.
-  void reset_remset(HeapWord* start, size_t word_count);
+  // See comment in ShenandoahScanRemembered
+  void swap_card_tables();
 };
 
 // A ShenandoahCardCluster represents the minimal unit of work
@@ -758,10 +760,18 @@ public:
   bool is_write_card_dirty(HeapWord* p);
   void mark_card_as_dirty(HeapWord* p);
   void mark_range_as_dirty(HeapWord* p, size_t num_heap_words);
-  void mark_card_as_clean(HeapWord* p);
   void mark_range_as_clean(HeapWord* p, size_t num_heap_words);
 
-  void reset_remset(HeapWord* start, size_t word_count) { _rs->reset_remset(start, word_count); }
+  // This method is used to concurrently clean the "read" card table -
+  // currently, as part of the reset phase. Later on the pointers to the "read"
+  // and "write" card tables are swapped everywhere to enable the GC to
+  // concurrently operate on the "read" table while mutators effect changes on
+  // the "write" table.
+  void mark_read_table_as_clean();
+
+  // Swaps read and write card tables pointers in effect setting a clean card
+  // table for the next GC cycle.
+  void swap_card_tables() { _rs->swap_card_tables(); }
 
   void merge_write_table(HeapWord* start, size_t word_count) { _rs->merge_write_table(start, word_count); }
 
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahThreadLocalData.cpp b/src/hotspot/share/gc/shenandoah/shenandoahThreadLocalData.cpp
index afeba3dbbf7..c444a0ba86a 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahThreadLocalData.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahThreadLocalData.cpp
@@ -34,6 +34,7 @@ ShenandoahThreadLocalData::ShenandoahThreadLocalData() :
   _oom_scope_nesting_level(0),
   _oom_during_evac(false),
   _satb_mark_queue(&ShenandoahBarrierSet::satb_mark_queue_set()),
+  _card_table(nullptr),
   _gclab(nullptr),
   _gclab_size(0),
   _paced_time(0),
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahThreadLocalData.hpp b/src/hotspot/share/gc/shenandoah/shenandoahThreadLocalData.hpp
index 9e1777dd82c..933cc501562 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahThreadLocalData.hpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahThreadLocalData.hpp
@@ -49,6 +49,9 @@ private:
 
   SATBMarkQueue           _satb_mark_queue;
 
+  // Current active CardTable's byte_map_base for this thread.
+  CardTable::CardValue*   _card_table;
+
   // Thread-local allocation buffer for object evacuations.
   // In generational mode, it is exclusive to the young generation.
   PLAB* _gclab;
@@ -122,6 +125,17 @@ public:
     return is_gc_state(Thread::current(), state);
   }
 
+  static void set_card_table(Thread* thread, CardTable::CardValue* ct) {
+    assert(ct != nullptr, "trying to set thread local card_table pointer to nullptr.");
+    data(thread)->_card_table = ct;
+  }
+
+  static CardTable::CardValue* card_table(Thread* thread) {
+    CardTable::CardValue* ct = data(thread)->_card_table;
+    assert(ct != nullptr, "returning a null thread local card_table pointer.");
+    return ct;
+  }
+
   static void initialize_gclab(Thread* thread) {
     assert(data(thread)->_gclab == nullptr, "Only initialize once");
     data(thread)->_gclab = new PLAB(PLAB::min_size());
@@ -280,6 +294,10 @@ public:
   static ByteSize gc_state_offset() {
     return Thread::gc_data_offset() + byte_offset_of(ShenandoahThreadLocalData, _gc_state);
   }
+
+  static ByteSize card_table_offset() {
+    return Thread::gc_data_offset() + byte_offset_of(ShenandoahThreadLocalData, _card_table);
+  }
 };
 
 STATIC_ASSERT(sizeof(ShenandoahThreadLocalData) <= sizeof(GCThreadLocalData));
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahVerifier.cpp b/src/hotspot/share/gc/shenandoah/shenandoahVerifier.cpp
index db752395c1b..a5772e1e52d 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahVerifier.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahVerifier.cpp
@@ -1267,7 +1267,7 @@ public:
       oop obj = CompressedOops::decode_not_null(o);
       if (_heap->is_in_young(obj) && !_scanner->is_card_dirty((HeapWord*) p)) {
         ShenandoahAsserts::print_failure(ShenandoahAsserts::_safe_all, obj, p, nullptr,
-                                         _message, "clean card should be dirty", __FILE__, __LINE__);
+                                         _message, "clean card, it should be dirty.", __FILE__, __LINE__);
       }
     }
   }

From 857c53718957283766f6566e5519ab5911cf9f3c Mon Sep 17 00:00:00 2001
From: Martin Doerr <mdoerr@openjdk.org>
Date: Sun, 9 Mar 2025 16:15:26 +0000
Subject: [PATCH 268/587] 8351456: Build failure with
 --disable-jvm-feature-shenandoahgc after 8343468

Reviewed-by: kvn, syan
---
 src/hotspot/cpu/aarch64/aarch64.ad | 2 +-
 src/hotspot/cpu/riscv/riscv.ad     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/hotspot/cpu/aarch64/aarch64.ad b/src/hotspot/cpu/aarch64/aarch64.ad
index 33e81d01932..b81fc82c3a4 100644
--- a/src/hotspot/cpu/aarch64/aarch64.ad
+++ b/src/hotspot/cpu/aarch64/aarch64.ad
@@ -4541,7 +4541,7 @@ operand immByteMapBase()
 %{
   // Get base of card map
   predicate(BarrierSet::barrier_set()->is_a(BarrierSet::CardTableBarrierSet) &&
-            !BarrierSet::barrier_set()->is_a(BarrierSet::ShenandoahBarrierSet) &&
+            SHENANDOAHGC_ONLY(!BarrierSet::barrier_set()->is_a(BarrierSet::ShenandoahBarrierSet) &&)
             (CardTable::CardValue*)n->get_ptr() == ((CardTableBarrierSet*)(BarrierSet::barrier_set()))->card_table()->byte_map_base());
   match(ConP);
 
diff --git a/src/hotspot/cpu/riscv/riscv.ad b/src/hotspot/cpu/riscv/riscv.ad
index 031baf2ef9c..b380e00999c 100644
--- a/src/hotspot/cpu/riscv/riscv.ad
+++ b/src/hotspot/cpu/riscv/riscv.ad
@@ -2916,7 +2916,7 @@ operand immByteMapBase()
 %{
   // Get base of card map
   predicate(BarrierSet::barrier_set()->is_a(BarrierSet::CardTableBarrierSet) &&
-            !BarrierSet::barrier_set()->is_a(BarrierSet::ShenandoahBarrierSet) &&
+            SHENANDOAHGC_ONLY(!BarrierSet::barrier_set()->is_a(BarrierSet::ShenandoahBarrierSet) &&)
             (CardTable::CardValue*)n->get_ptr() ==
              ((CardTableBarrierSet*)(BarrierSet::barrier_set()))->card_table()->byte_map_base());
   match(ConP);

From 84f71dd6247bbaca508e0a6f04c5b201a1974266 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Jeli=C5=84ski?= <djelinski@openjdk.org>
Date: Mon, 10 Mar 2025 07:52:11 +0000
Subject: [PATCH 269/587] 8349849: PKCS11 SunTlsKeyMaterial crashes when used
 with TLS1.2 TlsKeyMaterialParameterSpec

Reviewed-by: wetmore, valeriep
---
 .../pkcs11/P11TlsKeyMaterialGenerator.java    |  4 +-
 .../pkcs11/tls/TestKeyMaterialMisuse.java     | 87 +++++++++++++++++++
 2 files changed, 90 insertions(+), 1 deletion(-)
 create mode 100644 test/jdk/sun/security/pkcs11/tls/TestKeyMaterialMisuse.java

diff --git a/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11TlsKeyMaterialGenerator.java b/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11TlsKeyMaterialGenerator.java
index 269bf489359..5e79028a01b 100644
--- a/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11TlsKeyMaterialGenerator.java
+++ b/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11TlsKeyMaterialGenerator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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,6 +119,8 @@ public final class P11TlsKeyMaterialGenerator extends KeyGeneratorSpi {
             mechanism = CKM_SSL3_KEY_AND_MAC_DERIVE;
         } else if (tlsVersion == 0x0301 || tlsVersion == 0x0302) {
             mechanism = CKM_TLS_KEY_AND_MAC_DERIVE;
+        } else if (tlsVersion == 0x0303) {
+            mechanism = CKM_TLS12_KEY_AND_MAC_DERIVE;
         }
     }
 
diff --git a/test/jdk/sun/security/pkcs11/tls/TestKeyMaterialMisuse.java b/test/jdk/sun/security/pkcs11/tls/TestKeyMaterialMisuse.java
new file mode 100644
index 00000000000..aa02913cf7a
--- /dev/null
+++ b/test/jdk/sun/security/pkcs11/tls/TestKeyMaterialMisuse.java
@@ -0,0 +1,87 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact 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 8349849
+ * @summary Verify that SunTlsKeyMaterial doesn't crash on TLS 1.2 parameters
+ * @library /test/lib ..
+ * @modules java.base/sun.security.internal.spec
+ * @run main/othervm TestKeyMaterialMisuse
+ */
+
+import sun.security.internal.spec.TlsKeyMaterialParameterSpec;
+import sun.security.internal.spec.TlsKeyMaterialSpec;
+
+import javax.crypto.KeyGenerator;
+import javax.crypto.SecretKey;
+import javax.crypto.spec.SecretKeySpec;
+import java.security.Provider;
+import java.security.ProviderException;
+import java.util.Arrays;
+import java.util.List;
+
+public class TestKeyMaterialMisuse extends PKCS11Test {
+
+    public static void main(String[] args) throws Exception {
+        System.out.println("NSS Version: " + getNSSVersion());
+        main(new TestKeyMaterialMisuse(), args);
+    }
+
+    @Override
+    public void main(Provider provider) throws Exception {
+        byte[] keyBytes = new byte[48];
+        Arrays.fill(keyBytes, (byte)1);
+        SecretKey master = new SecretKeySpec(keyBytes, "TlsMasterSecret");
+        byte[] cr = "clientRandom".getBytes();
+        byte[] sr = "serverRandom".getBytes();
+        for (int minor : List.of(1, 3)) {
+            try {
+                // the algorithms below are deliberately reversed:
+                // - SunTls12KeyMaterial is used with TLS 1.0,
+                // - SunTlsKeyMaterial is used with TLS 1.2
+                String algorithm = minor != 3 ?
+                        "SunTls12KeyMaterial" :
+                        "SunTlsKeyMaterial";
+                System.out.println("Generating key material for version: " +
+                        minor + " using algorithm: " + algorithm);
+
+                KeyGenerator g = KeyGenerator.getInstance(algorithm, provider);
+                TlsKeyMaterialParameterSpec spec =
+                        new TlsKeyMaterialParameterSpec(
+                                master, 3, minor, cr, sr,
+                                "AES", 32, 0,
+                                12, 32,
+                                "SHA-256", 32, 128);
+                g.init(spec);
+                // generateKey crashed the JVM:
+                TlsKeyMaterialSpec km = (TlsKeyMaterialSpec) g.generateKey();
+                System.out.println("Success!");
+            } catch (ProviderException e) {
+                System.out.println("Got exception, not crash:");
+                e.printStackTrace();
+            }
+        }
+    }
+
+}

From 088726238664985ebf2bc60deca96f22245e9ce3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hannes=20Walln=C3=B6fer?= <hannesw@openjdk.org>
Date: Mon, 10 Mar 2025 07:54:17 +0000
Subject: [PATCH 270/587] 8344301: Refine stylesheet for API docs

Reviewed-by: liach, nbenalla
---
 .../doclets/formats/html/resources/link.svg   |   4 +-
 .../formats/html/resources/script.js.template |  16 +-
 .../formats/html/resources/search-page.js     |   2 +-
 .../formats/html/resources/stylesheet.css     | 451 +++++++++++-------
 .../jdk/javadoc/doclet/AccessH1/AccessH1.java |   6 +-
 .../CheckStylesheetClasses.java               |  10 +-
 .../doclet/testStylesheet/TestStylesheet.java |  63 +--
 7 files changed, 284 insertions(+), 268 deletions(-)

diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/link.svg b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/link.svg
index 8013f4f7fd9..88760b0efc3 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/link.svg
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/link.svg
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <!--
- Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2023, 2025, Oracle and/or its affiliates. All rights reserved.
  DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 
  Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl/
 -->
 
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 256 256" fill="#505050">
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 256 256" fill="#404040">
     <path d="M32 239.3c18.2 16.7 57.1 15.4 74.5-1.7l30.9-32c8.3-8.8 4.8-15.1.7-19.9-4.7-3-12-8.1-20.4.5l-29.4 29.6a29.4 29.4 0 0 1-39.4.9l-8-7c-8.8-9.4-11-28.3-.8-38.8l49.8-51.3c7.2-6.6 21.3-10 36.1-2.4 6.9 5.4 15.6 15.7 26 6.2 9.9-11.2 2.9-20.4-10-29.3-18.7-12.6-52-14.8-70.4 3.8L17 154.2c-20 20.2-11.3 58 1.7 71.5a69 69 0 0 0 13.2 13.6z"/>
     <path d="M223.2 17.5c-18.4-16.6-57.3-15.3-74.6 2l-30.8 31.9c-8.3 9-4.8 15.2-.7 20 4.8 3 12.1 8 20.5-.6 4.8-5 29.3-29.6 29.3-29.6a29.4 29.4 0 0 1 39.4-1l8 6.8c8.8 9.5 11 28.3.9 38.9l-49.6 51.4c-7.2 6.7-21.3 10.1-36.1 2.6-7-5.4-15.7-15.7-26.1-6.2-9.8 11.2-2.8 20.4 10.2 29.3 18.7 12.5 52 14.7 70.3-4l54.4-56.5c20-20.3 11.2-58-1.9-71.5a69 69 0 0 0-13.2-13.5Z"/>
 </svg>
\ No newline at end of file
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/script.js.template b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/script.js.template
index 2185b1c951f..f9119833175 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/script.js.template
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/script.js.template
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl/
@@ -232,20 +232,6 @@ document.addEventListener("readystatechange", (e) => {
 });
 document.addEventListener("DOMContentLoaded", function(e) {
     setTopMargin();
-    // Reset animation for type parameter target highlight
-    document.querySelectorAll("a").forEach((link) => {
-        link.addEventListener("click", (e) => {
-            const href = e.currentTarget.getAttribute("href");
-            if (href && href.startsWith("#") && href.indexOf("type-param-") > -1) {
-                const target = document.getElementById(decodeURI(href.substring(1)));
-                if (target) {
-                    target.style.animation = "none";
-                    void target.offsetHeight;
-                    target.style.removeProperty("animation");
-                }
-            }
-        })
-    });
     // Make sure current element is visible in breadcrumb navigation on small displays
     const subnav = document.querySelector("ol.sub-nav-list");
     if (subnav && subnav.lastElementChild) {
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/search-page.js b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/search-page.js
index bcbd9b59f31..dbfb00a1a1a 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/search-page.js
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/search-page.js
@@ -114,7 +114,7 @@ $(window).on("load", function() {
                     });
                     visibleTabs.push(key);
                 } else {
-                    $("<span class='page-search-header active-table-tab'>" + categories[key]
+                    $("<span class='page-search-header'>" + categories[key]
                         + "<span style='font-weight: normal'> (" + count + ")</span></span>").appendTo(tabContainer);
                     renderTable(key, r[key]).appendTo(resultContainer);
                     tabContainer = $("<div class='table-tabs'></div>").appendTo(resultContainer);
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/stylesheet.css b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/stylesheet.css
index bdf84dc0f97..dafe74dab0d 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/stylesheet.css
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/stylesheet.css
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl/
@@ -21,47 +21,58 @@
     --block-font-family: 'DejaVu Serif', Georgia, "Times New Roman", Times, serif;
     --code-font-family: 'DejaVu Sans Mono', monospace;
     /* Base font sizes for body and code elements */
-    --body-font-size: 14px;
-    --block-font-size: 14px;
+    --body-font-size: 14.2px;
+    --block-font-size: 14.4px;
     --code-font-size: 14px;
-    --nav-font-size: 13.2px;
+    --nav-font-size: 13.4px;
     /* Line height for continuous text blocks */
-    --block-line-height: 1.4em;
+    --block-line-height: 1.5;
+    --code-line-height: 1.55;
     /* Text colors for body and block elements */
     --body-text-color: #282828;
     --block-text-color: #282828;
     /* Background colors for various elements */
     --body-background-color: #ffffff;
-    --section-background-color: #f8f8f8;
+    --section-background-color: var(--body-background-color);
     --detail-background-color: #ffffff;
+    --code-background-color: #f5f5f5;
     --mark-background-color: #f7f7f7;
+    --detail-block-color: #f4f4f4;
     /* Colors for navigation bar and table captions */
     --navbar-background-color: #4D7A97;
     --navbar-text-color: #ffffff;
     /* Background color for subnavigation and various headers */
     --subnav-background-color: #dee3e9;
+    --subnav-link-color: #47688a;
+    --member-heading-background-color: var(--subnav-background-color);
     /* Background and text colors for selected tabs and navigation items */
     --selected-background-color: #f8981d;
     --selected-text-color: #253441;
-    --selected-link-color: #1f389c;
+    --selected-link-color: #4a698a;
     /* Background colors for generated tables */
+    --table-header-color: #ebeff4;
     --even-row-color: #ffffff;
-    --odd-row-color: #eeeeef;
+    --odd-row-color: #f0f0f2;
     /* Text color for page title */
     --title-color: #2c4557;
     /* Text colors for links */
     --link-color: #437291;
     --link-color-active: #bb7a2a;
     /* Table of contents */
-    --toc-background-color: var(--section-background-color);
-    --toc-link-color: #4a698a;
-    /* Snippet colors */
-    --snippet-background-color: #ebecee;
+    --toc-background-color: #f8f8f8;
+    --toc-highlight-color: var(--subnav-background-color);
+    --toc-hover-color: #e9ecf0;
+    /* Snippet and pre colors */
+    --snippet-background-color: #f0f0f2;
     --snippet-text-color: var(--block-text-color);
     --snippet-highlight-color: #f7c590;
+    --pre-background-color: #f3f3f5;
+    --pre-text-color: var(--snippet-text-color);
     /* Border colors for structural elements and user defined tables */
-    --border-color: #ededed;
+    --border-color: #e6e6e6;
     --table-border-color: #000000;
+    /* Styles for table tabs */
+    --tab-border-radius: 2px 2px 0 0;
     /* Search input colors */
     --search-input-background-color: #ffffff;
     --search-input-text-color: #000000;
@@ -76,9 +87,10 @@
     --invalid-tag-text-color: #000000;
     /* Navigation bar dimensions */
     --top-nav-height: 44px;
-    --sub-nav-height: 34px;
+    --sub-nav-height: 36px;
     --nav-height: calc(var(--top-nav-height) + var(--sub-nav-height));
-    scroll-behavior: smooth;
+    --max-content-width: 1500px;
+    --content-margin: 0 auto;
 }
 /*
  * Styles for individual HTML elements.
@@ -99,12 +111,16 @@ body {
 main [id] {
     scroll-margin-top: calc(var(--nav-height) + 6px);
 }
+div.main-grid {
+    max-width: var(--max-content-width);
+    margin: var(--content-margin);
+}
 a:link, a:visited {
     text-decoration:none;
     color:var(--link-color);
 }
 nav a:link, nav a:visited {
-    color: var(--toc-link-color);
+    color: var(--subnav-link-color);
 }
 a[href]:hover, a[href]:active {
     text-decoration:none;
@@ -113,12 +129,17 @@ a[href]:hover, a[href]:active {
 pre {
     font-family:var(--code-font-family);
     font-size:var(--code-font-size);
+    line-height: var(--code-line-height);
+    background-color: var(--pre-background-color);
+    color: var(--pre-text-color);
+    padding: 8px;
+    overflow-x:auto;
 }
 h1 {
-    font-size:1.428em;
+    font-size:1.425em;
 }
 h2 {
-    font-size:1.285em;
+    font-size:1.28em;
 }
 h3 {
     font-size:1.14em;
@@ -133,29 +154,21 @@ h6 {
     font-size:0.93em;
 }
 /* Disable font boosting for selected elements */
-h1, h2, h3, h4, h5, h6, div.member-signature {
+h1, h2, h3, h4, h5, h6, div.member-signature, div.member-signature > span {
     max-height: 1000em;
 }
 ul {
     list-style-type:disc;
 }
-code, tt {
+tt {
     font-family:var(--code-font-family);
 }
-:not(h1, h2, h3, h4, h5, h6, sup, sub, small, big) > :is(code, tt) {
+code {
+    font-family:var(--code-font-family);
     font-size:var(--code-font-size);
-    line-height:1.4em;
-}
-dt code {
-    font-family:var(--code-font-family);
-    font-size:1em;
-    padding-top:4px;
-}
-.summary-table dt code {
-    font-family:var(--code-font-family);
-    font-size:1em;
-    vertical-align:top;
-    padding-top:4px;
+    background-color: var(--code-background-color);
+    padding: 1px 2px;
+    border-radius: 3px;
 }
 button {
     font-family: var(--body-font-family);
@@ -182,6 +195,8 @@ hr {
     white-space: nowrap;
 }
 .legal-copy {
+    font-family: var(--body-font-family);
+    line-height: normal;
 }
 /*
  * Styles for navigation bar.
@@ -200,6 +215,8 @@ hr {
     align-items: center;
     width: 100%;
     height: 100%;
+    max-width: var(--max-content-width);
+    margin: var(--content-margin);
 }
 .top-nav {
     background-color:var(--navbar-background-color);
@@ -243,7 +260,7 @@ div.sub-nav {
 }
 ol.sub-nav-list {
     flex: 1 1 90%;
-    line-height: 1.8em;
+    line-height: 1.8;
     display: inline-flex;
     overflow: auto;
     scroll-snap-type: x mandatory;
@@ -261,20 +278,19 @@ ol.sub-nav-list li {
     scroll-snap-align: start;
 }
 ol.sub-nav-list li:not(:first-child) {
-    list-style-type: " > ";
-    margin-left: 20px;
+    list-style-type: "> ";
+    margin-left: 19px;
 }
 ol.sub-nav-list a {
     padding: 3px;
 }
 ol.sub-nav-list a.current-selection {
-    background-color: var(--section-background-color);
-    border-radius: 4px;
+    background-color: var(--toc-background-color);
+    border-radius: 3px;
 }
 .sub-nav .nav-list-search {
     flex: 1 1 10%;
-    margin:0;
-    padding:6px;
+    margin: 0 15px;
     position:relative;
     white-space: nowrap;
 }
@@ -290,6 +306,7 @@ ol.sub-nav-list a.current-selection {
     background-color:var(--selected-background-color);
     color:var(--selected-text-color);
     margin: 0 5px;
+    border-radius: 1px;
 }
 .skip-nav {
     position:absolute;
@@ -297,14 +314,6 @@ ol.sub-nav-list a.current-selection {
     left:-9999px;
     overflow:hidden;
 }
-/*
- * Hide navigation links and search box in print layout
- */
-@media print {
-    ul.nav-list, div.sub-nav  {
-        display:none;
-    }
-}
 /*
  * Styles for page header.
  */
@@ -335,13 +344,28 @@ body.module-declaration-page .block-list h2 {
     margin:15px 0;
     overflow-x:auto;
 }
-body.class-declaration-page .summary h3,
+body.class-use-page h2 {
+    margin-top: 20px;
+}
 body.class-declaration-page .details h3 {
-    background-color:var(--subnav-background-color);
+    background-color:var(--member-heading-background-color);
     border:1px solid var(--border-color);
-    margin:0 0 6px -8px;
-    padding:7px 5px;
+    margin:6px 0;
+    padding:7px;
     overflow-x:auto;
+    font-size: 1.08em;
+}
+body.class-declaration-page section.detail:target > h3,
+body.class-declaration-page section.detail > h3:target {
+    background-color: var(--navbar-background-color);
+    color: var(--navbar-text-color);
+}
+body.class-declaration-page section.detail:target > h3 > a.anchor-link > img,
+body.class-declaration-page section.detail > h3:target > a.anchor-link > img {
+    filter: invert(100%) sepia(4%) saturate(98%) hue-rotate(212deg) brightness(160%) contrast(160%);
+}
+h1 > sup {
+    font-size: small;
 }
 /*
  * Styles for page layout containers.
@@ -351,7 +375,7 @@ body.class-declaration-page .details h3 {
     flex-direction: row;
 }
 .main-grid main {
-    flex: 3 1 0;
+    flex: 3.2 1 0;
     min-width: 240px
 }
 .main-grid nav.toc {
@@ -359,8 +383,7 @@ body.class-declaration-page .details h3 {
     min-width: 240px;
 }
 main {
-    clear:both;
-    padding:10px 20px;
+    padding:10px 25px;
     position:relative;
 }
 /* Compensate for non-collapsing margins between element description and summary tables */
@@ -378,9 +401,10 @@ dl.notes > dt {
     color:var(--body-text-color);
 }
 dl.notes > dd {
-    margin:5px 10px 10px 15px;
+    margin:6px 10px 10px 15px;
     font-size:var(--block-font-size);
     font-family:var(--block-font-family);
+    line-height:var(--block-line-height);
 }
 dl.notes > dd > ul, dl.notes > dd > ol {
     margin-bottom: 1em;
@@ -402,7 +426,6 @@ dl.name-value > dd {
  */
 .main-grid nav.toc {
     background-color: var(--toc-background-color);
-    border-right: 1px solid var(--border-color);
     position: sticky;
     top: calc(var(--nav-height));
     max-height: calc(100vh - var(--nav-height));
@@ -424,7 +447,7 @@ dl.name-value > dd {
     position: absolute;
     bottom: 16px;
     z-index: 3;
-    background-color: var(--section-background-color);
+    background-color: var(--toc-background-color);
     color: #666666;
     font-size: 0.76rem;
     border: none;
@@ -459,7 +482,8 @@ dl.name-value > dd {
 }
 .main-grid nav.toc.hide-sidebar {
     min-width: revert;
-    max-width: 28px;
+    background-color: var(--body-background-color);
+    max-width: 20px;
 }
 .main-grid nav.toc.hide-sidebar div.toc-header,
 .main-grid nav.toc.hide-sidebar ol.toc-list,
@@ -487,16 +511,12 @@ nav.toc > ol.toc-list {
 }
 nav.toc ol.toc-list {
     list-style: none;
-    padding-left: 8px;
+    padding-left: 0;
     margin: 0;
 }
-nav.toc ol.toc-list ol.toc-list {
-    margin-left: 8px;
-}
 nav.toc ol.toc-list li {
     margin: 0;
     font-size: var(--nav-font-size);
-    overflow-x: hidden;
 }
 a.current-selection {
     font-weight: bold;
@@ -504,13 +524,25 @@ a.current-selection {
 nav.toc a {
     display: block;
     padding: 8px;
+    overflow: hidden;
+    text-overflow: ellipsis;
+}
+nav.toc ol.toc-list ol.toc-list a {
+    padding-left: 24px;
+}
+nav.toc a:hover {
+    background-color: var(--toc-hover-color);
 }
 nav.toc a.current-selection {
-    background-color: var(--subnav-background-color);
+    background-color: var(--toc-highlight-color);
 }
 /*
  * Styles for lists.
  */
+ul.details-list .block > ul,
+ul.details-list .notes dd > ul {
+    margin: 12px 0;
+}
 li.circle {
     list-style:circle;
 }
@@ -519,8 +551,7 @@ ul.horizontal li {
     font-size:0.9em;
 }
 div.inheritance {
-    margin:0;
-    padding:0;
+    font-size: 0.99em;
 }
 div.inheritance div.inheritance {
     margin-left:2em;
@@ -566,61 +597,75 @@ ul.tag-list li:not(:last-child):after,
 ul.tag-list-long li:not(:last-child):after
 {
     content: ", ";
-    white-space: pre-wrap;
 }
 ul.preview-feature-list {
     list-style: none;
     margin:0;
     padding:0.1em;
-    line-height: 1.6em;
+    line-height: 1.6;
 }
 /*
  * Styles for tables.
  */
 .summary-table, .details-table {
-    width:100%;
-    border-spacing:0;
     border:1px solid var(--border-color);
     border-top:0;
     padding:0;
+    margin-bottom: 14px;
 }
 .caption {
-    position:relative;
-    text-align:left;
-    background-repeat:no-repeat;
-    color:var(--selected-text-color);
-    clear:none;
-    overflow:hidden;
-    padding: 10px 0 0 1px;
-    margin:0;
+    overflow: auto hidden;
+    padding: 8px 0 0 1px;
 }
-.caption a:link, .caption a:visited {
-    color:var(--selected-link-color);
-}
-.caption a:hover,
-.caption a:active {
-    color:var(--navbar-text-color);
-}
-.caption span {
+.caption span,
+.inherited-list h3 {
+    font-size: 0.98em;
     font-weight:bold;
     white-space:nowrap;
-    padding:5px 12px 7px 12px;
-    display:inline-block;
-    float:left;
-    background-color:var(--selected-background-color);
-    border: none;
-    height:16px;
-}
-div.table-tabs {
-    padding: 10px 0 0 1px;
+    border-radius: var(--tab-border-radius);
     margin: 0;
 }
+.caption span {
+    background-color: var(--navbar-background-color);
+    padding:5px 12px 7px 12px;
+    height:16px;
+    color:var(--navbar-text-color);
+    display:inline-block;
+}
+.inherited-list h3 {
+    background-color: var(--subnav-background-color);
+    padding:6px 12px 7px 12px;
+    height:17px;
+    width: fit-content;
+    max-width: 93%;
+}
+/* Background required for captions with links */
+.class-use-page .caption span,
+.package-use-page .caption span,
+.constants-summary-page .caption span,
+.inherited-list.expanded h3 {
+    background-color: var(--subnav-background-color);
+    color: var(--block-text-color);
+}
+.caption a:link,
+.caption a:visited,
+.inherited-list.expanded h3 a:link,
+.inherited-list.expanded h3 a:visited {
+    color:var(--subnav-link-color);
+}
+div.table-tabs {
+    padding: 8px 0 0 1px;
+    white-space: nowrap;
+    overflow-x: auto;
+}
 div.table-tabs > button {
+    font-size: 0.98em;
     border: none;
     cursor: pointer;
-    padding: 5px 12px 7px 12px;
+    padding: 6px 12px;
     font-weight: bold;
     margin-right: 8px;
+    border-radius: var(--tab-border-radius);
 }
 div.table-tabs > .active-table-tab {
     background: var(--selected-background-color);
@@ -635,7 +680,7 @@ div.table-tabs > button.table-tab {
     grid-template-columns: minmax(400px, max-content) minmax(400px, auto);
 }
 div.checkboxes {
-    line-height: 2em;
+    line-height: 2;
 }
 div.checkboxes > span {
     margin-left: 10px;
@@ -694,20 +739,20 @@ div.checkboxes > label > input {
     }
 }
 .summary-table > div, .details-table > div {
-    text-align:left;
+    font-size: var(--nav-font-size);
+    line-height: 1.6;
     padding: 8px 3px 3px 7px;
     overflow: auto hidden;
-    scrollbar-width: thin;
 }
-.col-first, .col-second, .col-last, .col-constructor-name, .col-summary-item-name {
-    vertical-align:top;
-    padding-right:0;
-    padding-top:8px;
-    padding-bottom:3px;
+.summary-table > div.table-header, .details-table > div.table-header {
+    font-size: 0.92em;
+    line-height: 1.2;
+    height: 18px;
 }
 .table-header {
-    background:var(--subnav-background-color);
+    background: var(--table-header-color);
     font-weight: bold;
+    border-bottom: 1px solid var(--border-color);
 }
 /* Sortable table columns */
 .table-header[onclick] {
@@ -738,31 +783,17 @@ div.checkboxes > label > input {
     <path d="M10.101 57.059L63.019 4.142l52.917 52.917" style="opacity:.35;"/> \
     <path d="M10.101 86.392l52.917 52.917 52.917-52.917" style="opacity:.75;"/></svg>');
 }
-.col-first, .col-first {
-    font-size:0.93em;
-}
-.col-second, .col-second, .col-last, .col-constructor-name, .col-summary-item-name, .col-last {
-    font-size:0.93em;
-}
 .col-first, .col-second, .col-constructor-name {
-    vertical-align:top;
     overflow: auto;
 }
-.col-last {
-    white-space:normal;
-}
-.col-first a:link, .col-first a:visited,
-.col-second a:link, .col-second a:visited,
-.col-first a:link, .col-first a:visited,
-.col-second a:link, .col-second a:visited,
-.col-constructor-name a:link, .col-constructor-name a:visited,
-.col-summary-item-name a:link, .col-summary-item-name a:visited {
+body:not(.class-declaration-page) .col-first a:link,
+.col-summary-item-name a:link {
     font-weight:bold;
 }
-.even-row-color, .even-row-color .table-header {
+.even-row-color {
     background-color:var(--even-row-color);
 }
-.odd-row-color, .odd-row-color .table-header {
+.odd-row-color {
     background-color:var(--odd-row-color);
 }
 /*
@@ -773,18 +804,12 @@ div.block {
     font-family:var(--block-font-family);
     line-height:var(--block-line-height);
 }
-.col-last div {
-    padding-top:0;
-}
-.col-last a {
-    padding-bottom:3px;
-}
 .module-signature,
 .package-signature,
 .type-signature,
 .member-signature {
     font-family:var(--code-font-family);
-    font-size:1em;
+    font-size:var(--code-font-size);
     margin:8px 0 14px 0;
     white-space: pre-wrap;
 }
@@ -797,10 +822,33 @@ div.block {
 .member-signature .exceptions {
     display: inline-block;
     vertical-align: top;
-    white-space: pre;
+    white-space: pre-wrap;
 }
 .member-signature .type-parameters {
-    white-space: normal;
+    white-space: pre-wrap;
+}
+:is(h1, h2, h3, h4, h5, h6, sup, sub, small, big) code,
+[style*=font-size] code {
+    font-size: inherit;
+}
+:is(pre, table, sup, sub) code,
+section[id$=-description] > dl.notes code,
+div.summary-table code {
+    background-color: inherit;
+    padding: initial;
+}
+.doc-file-page main {
+    font-family: var(--block-font-family);
+    font-size: var(--block-font-size);
+    line-height: var(--block-line-height);
+}
+.doc-file-page main footer {
+    font-family: var(--body-font-family);
+    font-size: var(--body-font-size);
+}
+.tree-page .hierarchy,
+.package-tree-page .hierarchy {
+    line-height: 1.4;
 }
 /*
  * Styles for formatting effect.
@@ -816,7 +864,8 @@ div.block {
     color:var(--block-text-color);
 }
 .deprecated-label, .description-from-type-label, .implementation-label, .member-name-link,
-.package-hierarchy-label, .type-name-label, .type-name-link, .search-tag-link, .preview-label, .restricted-label {
+.package-hierarchy-label, .type-name-label, .type-name-link, .search-tag-link, .preview-label,
+.restricted-label {
     font-weight:bold;
 }
 sup.preview-mark,
@@ -840,12 +889,17 @@ sup.restricted-mark > a:link {
     font-family:var(--block-font-family);
     border-style:solid;
     border-width:thin;
-    border-radius:10px;
+    border-radius:6px;
     padding:10px;
     margin-bottom:10px;
     margin-right:10px;
     display:inline-block;
 }
+.deprecation-block code, .preview-block code, .restricted-block code {
+    font-size: 0.97em;
+    background-color: inherit;
+    padding: 0;
+}
 div.block div.deprecation-comment {
     font-style:normal;
 }
@@ -942,26 +996,26 @@ input[type="text"] {
     background-image:url('glass.png');
     background-size:13px;
     background-repeat:no-repeat;
-    background-position:2px 3px;
+    background-position:3px 5px;
     background-color: var(--search-input-background-color);
     color: var(--search-input-text-color);
     border-color: var(--border-color);
     border-radius: 4px;
     padding-left:20px;
     font-size: var(--nav-font-size);
-    height: 17px;
+    height: 19px;
 }
-input#search-input, input#page-search-input {
+input#page-search-input {
     width: calc(180px + 10vw);
     margin: 0;
 }
 input#search-input {
-    margin: 0 4px;
+    width: 270px;
     padding-right: 18px;
-    max-width: 340px;
+    margin: 0;
 }
 input.filter-input {
-    width: 40%;
+    width: 44%;
     max-width: 140px;
     margin: 0 4px;
     padding-right: 18px;
@@ -980,8 +1034,8 @@ input#reset-search, input.reset-filter {
 }
 input#reset-search {
     position:absolute;
-    right:15px;
-    top:11px;
+    right:5px;
+    top:7px;
 }
 input.reset-filter {
     position: relative;
@@ -1005,20 +1059,12 @@ input::placeholder {
 }
 dd > span:target,
 h1 > span:target {
-    animation: 2.4s ease-out highlight;
+    background-color: var(--search-tag-highlight-color);
 }
 section.class-description dd > span:target,
 section.class-description h1 > span:target {
     scroll-margin-top: 20em;
 }
-@keyframes highlight {
-    from {
-        background-color: var(--search-tag-highlight-color);
-    }
-    60% {
-        background-color: var(--search-tag-highlight-color);
-    }
-}
 details.page-search-details {
     display: inline-block;
 }
@@ -1070,25 +1116,45 @@ span#page-search-link {
     margin: -100px 0 0 100px;
     z-index: 5;
 }
-.inherited-list {
-    margin: 10px 0;
-}
 .horizontal-scroll {
     overflow: auto hidden;
 }
 section.class-description {
     line-height: 1.4;
 }
-.summary section[class$="-summary"], .details section[class$="-details"],
-.class-uses .detail, .serialized-class-details {
-    padding: 0 20px 5px 10px;
-    border: 1px solid var(--border-color);
+.summary section[class$="-summary"], .details section[class$="-details"] {
+    margin-bottom: 24px;
     background-color: var(--section-background-color);
 }
-.inherited-list, section[class$="-details"] .detail {
-    padding:0 0 5px 8px;
+body.class-uses section.detail {
+    padding: 0 25px 5px 10px;
+    margin: 25px 0;
+}
+section.serialized-class-details {
+    padding: 0 20px 5px 10px;
+    border: 1px solid var(--border-color);
+    background-color: var(--detail-block-color);
+}
+section.serialized-class-details .detail {
+    overflow: auto;
+    padding-left: 12px;
+}
+section[class$="-details"] .detail {
     background-color:var(--detail-background-color);
-    border:none;
+}
+section[class$="-details"] .detail > div {
+    padding-left: 8px;
+}
+.inherited-list {
+    margin: 20px 0;
+    background-color:var(--detail-background-color);
+}
+.inherited-list > code {
+    padding: 8px;
+    display: block;
+    background-color: var(--code-background-color);
+    border-radius: 0;
+    line-height: var(--code-line-height);
 }
 .vertical-separator {
     padding: 0 5px;
@@ -1142,10 +1208,10 @@ main a[href*="://"]:focus::after {
  */
 a.anchor-link {
     opacity: 0;
-    transition: opacity 0.1s;
+    transition: opacity 0.1s 0.1s;
 }
 :hover > a.anchor-link {
-    opacity: 80%;
+    opacity: 90%;
 }
 a.anchor-link:hover,
 a.anchor-link:focus-visible,
@@ -1160,7 +1226,7 @@ a.anchor-link > img {
  * Styles for copy-to-clipboard buttons
  */
 button.copy {
-    opacity: 70%;
+    opacity: 60%;
     border: none;
     border-radius: 3px;
     position: relative;
@@ -1169,7 +1235,7 @@ button.copy {
     cursor: pointer;
 }
 :hover > button.copy {
-    opacity: 80%;
+    opacity: 70%;
 }
 button.copy:hover,
 button.copy:active,
@@ -1191,7 +1257,7 @@ button.copy span {
     top: -0.1em;
     transition: all 0.1s;
     font-size: 0.76rem;
-    line-height: 1.2em;
+    line-height: 1.2;
     opacity: 0;
 }
 button.copy:hover span,
@@ -1213,7 +1279,7 @@ button#page-search-copy img {
 }
 button#page-search-copy span {
     color: var(--body-text-color);
-    line-height: 1.2em;
+    line-height: 1.2;
     padding: 0.2em;
     top: -0.18em;
 }
@@ -1234,12 +1300,12 @@ button.snippet-copy img {
     padding: 0.05em 0;
 }
 button.snippet-copy span {
-    line-height: 1.2em;
+    line-height: 1.2;
     padding: 0.2em;
     position: relative;
     top: -0.5em;
 }
-div.snippet-container:hover button.snippet-copy span {
+div.snippet-container button.snippet-copy:hover span {
     opacity: 100%;
 }
 /*
@@ -1321,18 +1387,19 @@ table.striped > tbody > tr > th {
     font-weight: normal;
 }
 /**
- * Tweak style for small screens.
+ * Media queries for responsive design
  */
-@media screen and (max-width: 1050px) {
-    .summary section[class$="-summary"], .details section[class$="-details"],
-    .class-uses .detail, .serialized-class-details {
-        padding: 0 10px 5px 8px;
-    }
-    input#search-input {
-        width: 22vw;
+@media (prefers-reduced-motion: reduce) {
+    :root {
+        scroll-behavior: auto;
     }
 }
-@media screen and (max-width: 920px) {
+@media screen and (max-width: 1200px) {
+    input#search-input {
+        width: 22.5vw;
+    }
+}
+@media screen and (max-width: 1000px) {
     .main-grid nav.toc {
         display: none;
     }
@@ -1343,13 +1410,13 @@ table.striped > tbody > tr > th {
         left: 40vw;
         width: 60vw;
         z-index: 7;
-        background-color: var(--section-background-color);
+        background-color: var(--toc-background-color);
         box-sizing: border-box;
     }
     .top-nav nav.toc div.toc-header {
         padding: 6px 15px;
         font-size: 0.94em;
-        background-color: var(--section-background-color);
+        background-color: var(--toc-background-color);
         top: calc(var(--top-nav-height) + 10px);
     }
     .top-nav nav.toc ol.toc-list li {
@@ -1435,7 +1502,7 @@ table.striped > tbody > tr > th {
 }
 @media screen and (max-width: 800px) {
     .about-language {
-        padding-right: 16px;
+        padding: 0 16px;
         max-width: 90%;
     }
     ul.nav-list li {
@@ -1452,9 +1519,18 @@ table.striped > tbody > tr > th {
     .nav-list-search > a {
         display: none;
     }
+    .member-signature {
+        white-space: pre-line;
+    }
+    .member-signature .annotations {
+        white-space: pre-wrap;
+    }
     input#search-input {
         width: 18vw;
     }
+    .inherited-list h3 {
+        overflow: auto clip;
+    }
     .summary section[class$="-summary"], .details section[class$="-details"],
     .class-uses .detail, .serialized-class-details {
         padding: 0;
@@ -1464,9 +1540,6 @@ pre.snippet {
     background-color: var(--snippet-background-color);
     color: var(--snippet-text-color);
     padding: 10px;
-    margin: 12px 0;
-    overflow: auto;
-    white-space: pre;
 }
 div.snippet-container {
     position: relative;
@@ -1490,3 +1563,11 @@ pre.snippet .highlighted {
     background-color: var(--snippet-highlight-color);
     border-radius: 10%;
 }
+/*
+ * Hide navigation links and search box in print layout
+ */
+@media print {
+    ul.nav-list, div.sub-nav, .main-grid nav.toc, button.copy {
+        display:none;
+    }
+}
diff --git a/test/langtools/jdk/javadoc/doclet/AccessH1/AccessH1.java b/test/langtools/jdk/javadoc/doclet/AccessH1/AccessH1.java
index 96a31e124c7..daf400f9fc6 100644
--- a/test/langtools/jdk/javadoc/doclet/AccessH1/AccessH1.java
+++ b/test/langtools/jdk/javadoc/doclet/AccessH1/AccessH1.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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 4636667 7052425 8016549 8196202
+ * @bug 4636667 7052425 8016549 8196202 8344301
  * @summary  Use <H1, <H2>, and <H3> in proper sequence for accessibility
  * @library ../../lib
  * @modules jdk.javadoc/jdk.javadoc.internal.tool
@@ -53,7 +53,7 @@ public class AccessH1 extends JavadocTester {
         checkOutput("resource-files/stylesheet.css", true,
                 """
                     h1 {
-                        font-size:1.428em;
+                        font-size:1.425em;
                     }""");
 
         // Test the doc title in the overview page
diff --git a/test/langtools/jdk/javadoc/doclet/checkStylesheetClasses/CheckStylesheetClasses.java b/test/langtools/jdk/javadoc/doclet/checkStylesheetClasses/CheckStylesheetClasses.java
index f103ef4e608..5d86e317b9f 100644
--- a/test/langtools/jdk/javadoc/doclet/checkStylesheetClasses/CheckStylesheetClasses.java
+++ b/test/langtools/jdk/javadoc/doclet/checkStylesheetClasses/CheckStylesheetClasses.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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,13 +118,13 @@ public class CheckStylesheetClasses {
         htmlStyleNames.removeIf(s -> s.endsWith("-summary") && !styleSheetNames.contains(s));
 
         // signature classes
-        removeAll(htmlStyleNames, "annotations", "element-name", "extends-implements",
+        removeAll(htmlStyleNames, "element-name", "extends-implements",
                 "modifiers", "permits", "return-type");
 
         // misc: these are defined in HtmlStyle, and used by the doclet
-        removeAll(htmlStyleNames, "col-plain", "external-link", "header",
-                "hierarchy", "index", "package-uses", "packages", "permits-note",
-                "serialized-package-container", "source-container");
+        removeAll(htmlStyleNames, "col-plain", "external-link", "header", "index",
+                "package-uses", "packages", "permits-note", "serialized-package-container",
+                "source-container");
 
         // Remove names from styleSheetNames if they are false positives,
         // or used by other code (i.e. not HtmlStyle),
diff --git a/test/langtools/jdk/javadoc/doclet/testStylesheet/TestStylesheet.java b/test/langtools/jdk/javadoc/doclet/testStylesheet/TestStylesheet.java
index a3dce5448f0..0ee5aafa063 100644
--- a/test/langtools/jdk/javadoc/doclet/testStylesheet/TestStylesheet.java
+++ b/test/langtools/jdk/javadoc/doclet/testStylesheet/TestStylesheet.java
@@ -25,7 +25,7 @@
  * @test
  * @bug      4494033 7028815 7052425 8007338 8023608 8008164 8016549 8072461 8154261 8162363 8160196 8151743 8177417
  *           8175218 8176452 8181215 8182263 8183511 8169819 8183037 8185369 8182765 8196201 8184205 8223378 8241544
- *           8253117 8263528 8289334 8292594 8347058
+ *           8253117 8263528 8289334 8292594 8347058 8344301
  * @summary  Run tests on doclet stylesheet.
  * @library  /tools/lib ../../lib
  * @modules jdk.javadoc/jdk.javadoc.internal.tool
@@ -81,56 +81,13 @@ public class TestStylesheet extends JavadocTester {
                     ul {
                         list-style-type:disc;
                     }""",
-                """
-                    .caption {
-                        position:relative;
-                        text-align:left;
-                        background-repeat:no-repeat;
-                        color:var(--selected-text-color);
-                        clear:none;
-                        overflow:hidden;
-                        padding: 10px 0 0 1px;
-                        margin:0;
-                    }""",
-                """
-                    .caption span {
-                        font-weight:bold;
-                        white-space:nowrap;
-                        padding:5px 12px 7px 12px;
-                        display:inline-block;
-                        float:left;
-                        background-color:var(--selected-background-color);
-                        border: none;
-                        height:16px;
-                    }""",
-                """
-                    div.table-tabs > button {
-                        border: none;
-                        cursor: pointer;
-                        padding: 5px 12px 7px 12px;
-                        font-weight: bold;
-                        margin-right: 8px;
-                    }
-                    div.table-tabs > .active-table-tab {
-                        background: var(--selected-background-color);
-                        color: var(--selected-text-color);
-                    }
-                    div.table-tabs > button.table-tab {
-                        background: var(--navbar-background-color);
-                        color: var(--navbar-text-color);
-                    }""",
                 // Test the formatting styles for proper content display in use and constant values pages.
-                """
-                    .col-first, .col-second, .col-constructor-name {
-                        vertical-align:top;
-                        overflow: auto;
-                    }""",
                 """
                     .summary-table > div, .details-table > div {
-                        text-align:left;
+                        font-size: var(--nav-font-size);
+                        line-height: 1.6;
                         padding: 8px 3px 3px 7px;
                         overflow: auto hidden;
-                        scrollbar-width: thin;
                     }""",
                 "@import url('fonts/dejavu.css');",
                 """
@@ -143,12 +100,8 @@ public class TestStylesheet extends JavadocTester {
                         color:var(--link-color-active);
                     }""",
                 """
-                    .col-first a:link, .col-first a:visited,
-                    .col-second a:link, .col-second a:visited,
-                    .col-first a:link, .col-first a:visited,
-                    .col-second a:link, .col-second a:visited,
-                    .col-constructor-name a:link, .col-constructor-name a:visited,
-                    .col-summary-item-name a:link, .col-summary-item-name a:visited {
+                    body:not(.class-declaration-page) .col-first a:link,
+                    .col-summary-item-name a:link {
                         font-weight:bold;
                     }""",
                 """
@@ -157,7 +110,7 @@ public class TestStylesheet extends JavadocTester {
                         font-family:var(--block-font-family);
                         border-style:solid;
                         border-width:thin;
-                        border-radius:10px;
+                        border-radius:6px;
                         padding:10px;
                         margin-bottom:10px;
                         margin-right:10px;
@@ -318,14 +271,11 @@ public class TestStylesheet extends JavadocTester {
                 // entries for <body> elements
                 "all-classes-index-page",
                 "all-packages-index-page",
-                "constants-summary-page",
                 "deprecated-list-page",
                 "help-page",
                 "index-redirect-page",
                 "package-declaration-page",
-                "package-tree-page",
                 "single-index-page",
-                "tree-page",
                 // the following names are matched by [class$='...'] in the stylesheet
                 "constructor-details",
                 "constructor-summary",
@@ -341,7 +291,6 @@ public class TestStylesheet extends JavadocTester {
                 "packages",
                 "return-type",
                 // and others...
-                "hierarchy",        // for the hierarchy on a tree page
                 "index"             // on the index page
         );
         Set<String> all = new TreeSet<>(styles);

From 18931d05877a69c9d35ac0706d61f9db03875afc Mon Sep 17 00:00:00 2001
From: Joachim Kern <jkern@openjdk.org>
Date: Mon, 10 Mar 2025 09:05:58 +0000
Subject: [PATCH 271/587] 8351399: AIX: clang pollutes the burned-in library
 search paths of the generated executables / Second try with a better solution
 than JDK8348663

Reviewed-by: stuefe, mdoerr, ihse
---
 make/autoconf/basic.m4         |  6 ------
 make/autoconf/flags-ldflags.m4 |  4 ++--
 make/scripts/aix/ld.sh         | 27 ---------------------------
 3 files changed, 2 insertions(+), 35 deletions(-)
 delete mode 100644 make/scripts/aix/ld.sh

diff --git a/make/autoconf/basic.m4 b/make/autoconf/basic.m4
index d897cbafba7..de3613e1cc2 100644
--- a/make/autoconf/basic.m4
+++ b/make/autoconf/basic.m4
@@ -624,10 +624,4 @@ AC_DEFUN_ONCE([BASIC_POST_CONFIG_OUTPUT],
 
   # Make the compare script executable
   $CHMOD +x $OUTPUTDIR/compare.sh
-
-  # Copy the linker wrapper script for clang on AIX and make it executable
-  if test "x$TOOLCHAIN_TYPE" = xclang && test "x$OPENJDK_TARGET_OS" = xaix; then
-    $CP -f "$TOPDIR/make/scripts/aix/ld.sh" "$OUTPUTDIR/ld.sh"
-    $CHMOD +x "$OUTPUTDIR/ld.sh"
-  fi
 ])
diff --git a/make/autoconf/flags-ldflags.m4 b/make/autoconf/flags-ldflags.m4
index 90947494ec8..ef9df055cb8 100644
--- a/make/autoconf/flags-ldflags.m4
+++ b/make/autoconf/flags-ldflags.m4
@@ -78,8 +78,8 @@ AC_DEFUN([FLAGS_SETUP_LDFLAGS_HELPER],
       fi
     fi
     if test "x$OPENJDK_TARGET_OS" = xaix; then
-      BASIC_LDFLAGS="-Wl,-b64 -Wl,-brtl -Wl,-bnorwexec -Wl,-bnolibpath -Wl,-bnoexpall \
-        -Wl,-bernotok -Wl,-bdatapsize:64k -Wl,-btextpsize:64k -Wl,-bstackpsize:64k -fuse-ld=$OUTPUTDIR/ld.sh"
+      BASIC_LDFLAGS="-Wl,-b64 -Wl,-brtl -Wl,-bnorwexec -Wl,-blibpath:/usr/lib:lib -Wl,-bnoexpall \
+        -Wl,-bernotok -Wl,-bdatapsize:64k -Wl,-btextpsize:64k -Wl,-bstackpsize:64k"
       BASIC_LDFLAGS_JVM_ONLY="$BASIC_LDFLAGS_JVM_ONLY -Wl,-lC_r -Wl,-bbigtoc"
     fi
 
diff --git a/make/scripts/aix/ld.sh b/make/scripts/aix/ld.sh
deleted file mode 100644
index faa77ce4ba5..00000000000
--- a/make/scripts/aix/ld.sh
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/bin/bash
-#
-# Copyright (c) 2025 SAP SE. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.  Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-unset LIBPATH
-exec /usr/bin/ld "$@"

From 19b9f11c2ec37ef115c14adcfc31161786d46e95 Mon Sep 17 00:00:00 2001
From: Emanuel Peter <epeter@openjdk.org>
Date: Mon, 10 Mar 2025 09:44:42 +0000
Subject: [PATCH 272/587] 8351392: C2 crash: failed: Expected Bool, but got
 OpaqueMultiversioning

Reviewed-by: thartmann, kvn, vlivanov, chagedorn
---
 src/hotspot/share/opto/loopopts.cpp           |  6 +++++
 src/hotspot/share/opto/opaquenode.hpp         |  1 +
 ...TestMultiversionRemoveUselessSlowLoop.java | 26 +++++++++++++++++++
 3 files changed, 33 insertions(+)

diff --git a/src/hotspot/share/opto/loopopts.cpp b/src/hotspot/share/opto/loopopts.cpp
index 125399ea11a..36545870ad8 100644
--- a/src/hotspot/share/opto/loopopts.cpp
+++ b/src/hotspot/share/opto/loopopts.cpp
@@ -791,6 +791,12 @@ Node *PhaseIdealLoop::conditional_move( Node *region ) {
     // Ignore Template Assertion Predicates with OpaqueTemplateAssertionPredicate nodes.
     return nullptr;
   }
+  if (bol->is_OpaqueMultiversioning()) {
+    assert(bol->as_OpaqueMultiversioning()->is_useless(), "Must be useless, i.e. fast main loop has already disappeared.");
+    // Ignore multiversion_if that just lost its loops. The OpaqueMultiversioning is marked useless,
+    // and will make the multiversion_if constant fold in the next IGVN round.
+    return nullptr;
+  }
   if (!bol->is_Bool()) {
     assert(false, "Expected Bool, but got %s", NodeClassNames[bol->Opcode()]);
     return nullptr;
diff --git a/src/hotspot/share/opto/opaquenode.hpp b/src/hotspot/share/opto/opaquenode.hpp
index 80d5ae6cd3e..e93c7e51544 100644
--- a/src/hotspot/share/opto/opaquenode.hpp
+++ b/src/hotspot/share/opto/opaquenode.hpp
@@ -112,6 +112,7 @@ public:
   virtual int Opcode() const;
   virtual const Type* bottom_type() const { return TypeInt::BOOL; }
   bool is_delayed_slow_loop() const { return _is_delayed_slow_loop; }
+  DEBUG_ONLY( bool is_useless() const { return _useless; } )
 
   void notify_slow_loop_that_it_can_resume_optimizations() {
     assert(!_useless, "must still be useful");
diff --git a/test/hotspot/jtreg/compiler/loopopts/superword/TestMultiversionRemoveUselessSlowLoop.java b/test/hotspot/jtreg/compiler/loopopts/superword/TestMultiversionRemoveUselessSlowLoop.java
index 7d2f56c66f3..de98cc2fb25 100644
--- a/test/hotspot/jtreg/compiler/loopopts/superword/TestMultiversionRemoveUselessSlowLoop.java
+++ b/test/hotspot/jtreg/compiler/loopopts/superword/TestMultiversionRemoveUselessSlowLoop.java
@@ -121,4 +121,30 @@ public class TestMultiversionRemoveUselessSlowLoop {
             instanceCount = iFld1;
         }
     }
+
+    class Unloaded {
+        static void unloaded() {}
+    }
+    static int f;
+
+    // The outer loop is eventually Multiversioned, then PreMainPost and Unroll.
+    // Then the loops disappear during IGVN, and in the next loop-opts phase, the
+    // OpaqueMultiversioning is marked useless, but then we already run
+    // PhaseIdealLoop::conditional_move before the next IGVN round, and find a
+    // useless OpaqueMultiversioning instead of a BoolNode.
+    @Test
+    @Arguments(values = { Argument.NUMBER_42 })
+    static void testCrash2(int y) {
+        int x = 53446;
+        for (int i = 12; i < 376; i++) {
+            if (x != 0) {
+                // Uncommon trap because the class is not yet loaded.
+                Unloaded.unloaded();
+            }
+            for (int k = 1; k < 4; k++) {
+                y += 1;
+            }
+            x += f;
+        }
+    }
 }

From 783eda9f54a6e17771c637ff5cac5e30d1facde9 Mon Sep 17 00:00:00 2001
From: David Linus Briemann <david.briemann@sap.com>
Date: Mon, 10 Mar 2025 10:21:54 +0000
Subject: [PATCH 273/587] 8350266: [PPC64] Interpreter: intrinsify
 Thread.currentThread()

Reviewed-by: mdoerr, rrich
---
 .../cpu/ppc/templateInterpreterGenerator_ppc.cpp   | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/hotspot/cpu/ppc/templateInterpreterGenerator_ppc.cpp b/src/hotspot/cpu/ppc/templateInterpreterGenerator_ppc.cpp
index 544de15d3f2..f3614894390 100644
--- a/src/hotspot/cpu/ppc/templateInterpreterGenerator_ppc.cpp
+++ b/src/hotspot/cpu/ppc/templateInterpreterGenerator_ppc.cpp
@@ -1996,8 +1996,20 @@ address TemplateInterpreterGenerator::generate_CRC32C_updateBytes_entry(Abstract
   return start;
 }
 
+address TemplateInterpreterGenerator::generate_currentThread() {
+  address entry_point = __ pc();
+
+  __ ld(R3_RET, JavaThread::vthread_offset(), R16_thread);
+  __ resolve_oop_handle(R3_RET, R11_scratch1, R12_scratch2, MacroAssembler::PRESERVATION_FRAME_LR);
+
+  // restore caller sp for c2i case (from compiled) and for resized sender frame (from interpreted).
+  __ resize_frame_absolute(R21_sender_SP, R11_scratch1, R0);
+  __ blr();
+
+  return entry_point;
+}
+
 // Not supported
-address TemplateInterpreterGenerator::generate_currentThread() { return nullptr; }
 address TemplateInterpreterGenerator::generate_Float_intBitsToFloat_entry() { return nullptr; }
 address TemplateInterpreterGenerator::generate_Float_floatToRawIntBits_entry() { return nullptr; }
 address TemplateInterpreterGenerator::generate_Double_longBitsToDouble_entry() { return nullptr; }

From f61f520e699e3eb5104c9467ec8269b837da74db Mon Sep 17 00:00:00 2001
From: David Linus Briemann <david.briemann@sap.com>
Date: Mon, 10 Mar 2025 10:22:17 +0000
Subject: [PATCH 274/587] 8350325: [PPC64] ConvF2HFIdealizationTests timeouts
 on Power8

Reviewed-by: mdoerr, clanger
---
 .../jtreg/compiler/c2/irTests/ConvF2HFIdealizationTests.java     | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/hotspot/jtreg/compiler/c2/irTests/ConvF2HFIdealizationTests.java b/test/hotspot/jtreg/compiler/c2/irTests/ConvF2HFIdealizationTests.java
index 1dbfcd44eb4..f24fca1d87e 100644
--- a/test/hotspot/jtreg/compiler/c2/irTests/ConvF2HFIdealizationTests.java
+++ b/test/hotspot/jtreg/compiler/c2/irTests/ConvF2HFIdealizationTests.java
@@ -31,6 +31,7 @@ import jdk.test.lib.Asserts;
  * @test
  * @bug 8338061
  * @summary Test that Ideal transformations of ConvF2HF are being performed as expected.
+ * @requires (os.arch != "ppc64" & os.arch != "ppc64le") | vm.cpu.features ~= ".*darn.*"
  * @modules jdk.incubator.vector
  * @library /test/lib /
  * @run driver compiler.c2.irTests.ConvF2HFIdealizationTests

From ec683a18bcd8a8282989ba97238899d6375f43c8 Mon Sep 17 00:00:00 2001
From: Daniel Fuchs <dfuchs@openjdk.org>
Date: Mon, 10 Mar 2025 10:41:47 +0000
Subject: [PATCH 275/587] 8351419: java.net.http: Cleanup links in HttpResponse
 and module-info API doc comments

Reviewed-by: michaelm, vyazici
---
 .../classes/java/net/http/HttpResponse.java      | 16 ++++++++--------
 src/java.net.http/share/classes/module-info.java | 11 ++++++-----
 2 files changed, 14 insertions(+), 13 deletions(-)

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 41a439d5519..5a274980fa3 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
@@ -383,7 +383,7 @@ public interface HttpResponse<T> {
          * BodySubscribers#fromLineSubscriber(Subscriber, Function, Charset, String)
          * BodySubscribers.fromLineSubscriber(subscriber, s -> null, charset, null)},
          * with the given {@code subscriber}.
-         * The {@link Charset charset} used to decode the response body bytes is
+         * The {@linkplain Charset charset} used to decode the response body bytes is
          * obtained from the HTTP response headers as specified by {@link #ofString()},
          * and lines are delimited in the manner of {@link BufferedReader#readLine()}.
          *
@@ -429,7 +429,7 @@ public interface HttpResponse<T> {
          * BodySubscribers#fromLineSubscriber(Subscriber, Function, Charset, String)
          * BodySubscribers.fromLineSubscriber(subscriber, finisher, charset, lineSeparator)},
          * with the given {@code subscriber}, {@code finisher} function, and line separator.
-         * The {@link Charset charset} used to decode the response body bytes is
+         * The {@linkplain Charset charset} used to decode the response body bytes is
          * obtained from the HTTP response headers as specified by {@link #ofString()}.
          *
          * <p> The given {@code finisher} function is applied after the given
@@ -619,7 +619,7 @@ public interface HttpResponse<T> {
          * Returns a {@code BodyHandler<Stream<String>>} that returns a
          * {@link BodySubscriber BodySubscriber}{@code <Stream<String>>} obtained
          * from {@link BodySubscribers#ofLines(Charset) BodySubscribers.ofLines(charset)}.
-         * The {@link Charset charset} used to decode the response body bytes is
+         * The {@linkplain Charset charset} used to decode the response body bytes is
          * obtained from the HTTP response headers as specified by {@link #ofString()},
          * and lines are delimited in the manner of {@link BufferedReader#readLine()}.
          *
@@ -715,7 +715,7 @@ public interface HttpResponse<T> {
          * To ensure that all resources associated with the
          * corresponding exchange are properly released the caller must
          * subscribe to the publisher and conform to the rules outlined in
-         * {@linkplain BodySubscribers#ofPublisher()}
+         * {@link BodySubscribers#ofPublisher()}
          *
          * @return a {@linkplain HttpClient##streaming publishing} response body handler
          *
@@ -896,7 +896,7 @@ public interface HttpResponse<T> {
      * BodySubscriber} should ensure to {@linkplain Flow.Subscription#request
      * request} more data until one of {@link #onComplete() onComplete} or
      * {@link #onError(Throwable) onError} are signalled, or {@link
-     * Flow.Subscription#request cancel} its {@linkplain
+     * Flow.Subscription#cancel cancel} its {@linkplain
      * #onSubscribe(Flow.Subscription) subscription} if unable or unwilling to
      * do so. Calling {@code cancel} before exhausting the response body data
      * may cause the underlying HTTP connection to be closed and prevent it
@@ -916,7 +916,7 @@ public interface HttpResponse<T> {
          * Returns a {@code CompletionStage} which when completed will return
          * the response body object. This method can be called at any time
          * relative to the other {@link Flow.Subscriber} methods and is invoked
-         * using the client's {@link HttpClient#executor() executor}.
+         * using the client's {@linkplain HttpClient#executor() executor}.
          *
          * @return a CompletionStage for the response body
          */
@@ -962,7 +962,7 @@ public interface HttpResponse<T> {
      *  the resources associated with the request and the client to be {@linkplain
      *  HttpClient##closing eventually reclaimed}.
      *  Some other implementations are {@linkplain  Publisher publishers} which need to be
-     *  {@link BodySubscribers#ofPublisher() subscribed} in order for their associated
+     *  {@linkplain BodySubscribers#ofPublisher() subscribed} in order for their associated
      *  resources to be released and for the associated request to {@linkplain
      *  HttpClient##closing run to completion}.
      *
@@ -1159,7 +1159,7 @@ public interface HttpResponse<T> {
          * Returns a {@code BodySubscriber} which provides the incoming body
          * data to the provided Consumer of {@code Optional<byte[]>}. Each
          * call to {@link Consumer#accept(java.lang.Object) Consumer.accept()}
-         * will contain a non empty {@code Optional}, except for the final
+         * will contain a non-empty {@code Optional}, except for the final
          * invocation after all body data has been read, when the {@code
          * Optional} will be empty.
          *
diff --git a/src/java.net.http/share/classes/module-info.java b/src/java.net.http/share/classes/module-info.java
index 5bd49792e38..7d7c3fb351a 100644
--- a/src/java.net.http/share/classes/module-info.java
+++ b/src/java.net.http/share/classes/module-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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,9 @@
  * simultaneously.
  * </li>
  * <li><p><b>{@systemProperty jdk.httpclient.receiveBufferSize}</b> (default: operating system
- * default)<br>The HTTP client <a href="../java.base/java/net/StandardSocketOptions.html#SO_RCVBUF">
- * socket receive buffer size</a> in bytes.
+ * default)<br>The HTTP client {@linkplain java.nio.channels.SocketChannel socket}
+ * {@linkplain java.net.StandardSocketOptions#SO_RCVBUF receive buffer size} in bytes.
+ * Values less than or equal to zero are ignored.
  * </li>
  * <li><p><b>{@systemProperty jdk.httpclient.redirects.retrylimit}</b> (default: 5)<br>
  * The maximum number of attempts to send a HTTP request when redirected or any failure occurs
@@ -158,8 +159,8 @@
  * authentication.
  * </li>
  * <li><p><b>{@systemProperty jdk.httpclient.sendBufferSize}</b> (default: operating system
- * default)<br>The HTTP client socket
- * <a href="../java.base/java/net/StandardSocketOptions.html#SO_SNDBUF">send buffer size</a>.
+ * default)<br>The HTTP client {@linkplain java.nio.channels.SocketChannel socket}
+ * {@linkplain java.net.StandardSocketOptions#SO_SNDBUF send buffer size} in bytes.
  * Values less than or equal to zero are ignored.
  * </li>
  * <li><p><b>{@systemProperty jdk.internal.httpclient.disableHostnameVerification}</b> (default:

From 99547c5b254807580e0a5238b95d55d38181f4fc Mon Sep 17 00:00:00 2001
From: Doug Simon <dnsimon@openjdk.org>
Date: Mon, 10 Mar 2025 11:03:28 +0000
Subject: [PATCH 276/587] 8346825: [JVMCI] Remove NativeImageReinitialize
 annotation

Reviewed-by: never
---
 .../classes/jdk/vm/ci/common/InitTimer.java   |  4 +--
 .../vm/ci/common/NativeImageReinitialize.java | 36 -------------------
 .../classes/jdk/vm/ci/hotspot/Cleaner.java    |  5 ++-
 .../vm/ci/hotspot/HotSpotConstantPool.java    |  5 ++-
 .../hotspot/HotSpotJVMCICompilerConfig.java   |  5 ++-
 .../vm/ci/hotspot/HotSpotJVMCIRuntime.java    | 17 +++++----
 .../jdk/vm/ci/hotspot/HotSpotMethodData.java  |  5 ++-
 .../HotSpotMethodHandleAccessProvider.java    |  5 ++-
 .../hotspot/HotSpotResolvedPrimitiveType.java |  5 ++-
 .../classes/jdk/vm/ci/runtime/JVMCI.java      |  7 ++--
 10 files changed, 25 insertions(+), 69 deletions(-)
 delete mode 100644 src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/common/NativeImageReinitialize.java

diff --git a/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/common/InitTimer.java b/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/common/InitTimer.java
index a75ba3874dd..94fb6f4e9b0 100644
--- a/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/common/InitTimer.java
+++ b/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/common/InitTimer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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,7 +82,7 @@ public final class InitTimer implements AutoCloseable {
     /**
      * Cache for value of {@code jvmci.InitTimer} system property.
      */
-    @NativeImageReinitialize private static Boolean enabledPropertyValue;
+    private static Boolean enabledPropertyValue;
 
     private static AtomicInteger nesting;
     private static final String SPACES = "                                            ";
diff --git a/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/common/NativeImageReinitialize.java b/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/common/NativeImageReinitialize.java
deleted file mode 100644
index 21981da7245..00000000000
--- a/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/common/NativeImageReinitialize.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please 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.vm.ci.common;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Denotes a field that should have the default value for its type in an ahead of time image.
- */
-@Retention(RetentionPolicy.RUNTIME)
-@Target({ElementType.FIELD})
-public @interface NativeImageReinitialize {
-}
diff --git a/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/Cleaner.java b/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/Cleaner.java
index 87760efb8a0..d9d82b413eb 100644
--- a/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/Cleaner.java
+++ b/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/Cleaner.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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 jdk.vm.ci.hotspot;
 import java.lang.ref.ReferenceQueue;
 import java.lang.ref.WeakReference;
 
-import jdk.vm.ci.common.NativeImageReinitialize;
 import jdk.vm.ci.meta.ResolvedJavaType;
 
 /**
@@ -41,7 +40,7 @@ public abstract class Cleaner extends WeakReference<Object> {
     /**
      * Head of linked list of cleaners.
      */
-    @NativeImageReinitialize private static Cleaner first;
+    private static Cleaner first;
 
     /**
      * Linked list pointers.
diff --git a/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/HotSpotConstantPool.java b/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/HotSpotConstantPool.java
index 93956a5a525..84fb21d1948 100644
--- a/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/HotSpotConstantPool.java
+++ b/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/HotSpotConstantPool.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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.List;
 import java.util.stream.Collectors;
 
 import jdk.vm.ci.common.JVMCIError;
-import jdk.vm.ci.common.NativeImageReinitialize;
 import static jdk.vm.ci.hotspot.CompilerToVM.compilerToVM;
 import static jdk.vm.ci.hotspot.HotSpotJVMCIRuntime.runtime;
 import static jdk.vm.ci.hotspot.HotSpotVMConfig.config;
@@ -182,7 +181,7 @@ public final class HotSpotConstantPool implements ConstantPool, MetaspaceHandleO
             throw new JVMCIError("Unknown JvmConstant tag %s", tag);
         }
 
-        @NativeImageReinitialize private static volatile JvmConstants instance;
+        private static volatile JvmConstants instance;
 
         static JvmConstants instance() {
             JvmConstants result = instance;
diff --git a/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/HotSpotJVMCICompilerConfig.java b/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/HotSpotJVMCICompilerConfig.java
index 6bff3ce58cf..d4c824f6a27 100644
--- a/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/HotSpotJVMCICompilerConfig.java
+++ b/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/HotSpotJVMCICompilerConfig.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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.util.List;
 import java.util.Set;
 
 import jdk.vm.ci.code.CompilationRequest;
-import jdk.vm.ci.common.NativeImageReinitialize;
 import jdk.vm.ci.hotspot.HotSpotJVMCIRuntime.Option;
 import jdk.vm.ci.runtime.JVMCICompiler;
 import jdk.vm.ci.runtime.JVMCICompilerFactory;
@@ -78,7 +77,7 @@ final class HotSpotJVMCICompilerConfig {
     /**
      * Factory of the selected system compiler.
      */
-    @NativeImageReinitialize private static JVMCICompilerFactory compilerFactory;
+    private static JVMCICompilerFactory compilerFactory;
 
     /**
      * Gets the selected system compiler factory.
diff --git a/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/HotSpotJVMCIRuntime.java b/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/HotSpotJVMCIRuntime.java
index 0943b0f8162..ebe2778ca3c 100644
--- a/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/HotSpotJVMCIRuntime.java
+++ b/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/HotSpotJVMCIRuntime.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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 @@ import jdk.vm.ci.code.CompiledCode;
 import jdk.vm.ci.code.InstalledCode;
 import jdk.vm.ci.common.InitTimer;
 import jdk.vm.ci.common.JVMCIError;
-import jdk.vm.ci.common.NativeImageReinitialize;
 import jdk.vm.ci.meta.JavaKind;
 import jdk.vm.ci.meta.JavaType;
 import jdk.vm.ci.meta.ResolvedJavaField;
@@ -84,7 +83,7 @@ public final class HotSpotJVMCIRuntime implements JVMCIRuntime {
     /**
      * Singleton instance lazily initialized via double-checked locking.
      */
-    @NativeImageReinitialize private static volatile HotSpotJVMCIRuntime instance;
+    private static volatile HotSpotJVMCIRuntime instance;
 
     private HotSpotResolvedObjectTypeImpl javaLangObject;
     private HotSpotResolvedObjectTypeImpl javaLangInvokeMethodHandle;
@@ -287,7 +286,7 @@ public final class HotSpotJVMCIRuntime implements JVMCIRuntime {
         private static final String NULL_VALUE = "NULL";
 
         private final Class<?> type;
-        @NativeImageReinitialize private Object value;
+        private Object value;
         private final Object defaultValue;
         boolean isDefault = true;
         private final String[] helpLines;
@@ -491,12 +490,12 @@ public final class HotSpotJVMCIRuntime implements JVMCIRuntime {
     private volatile JVMCICompiler compiler;
     protected final HotSpotJVMCIReflection reflection;
 
-    @NativeImageReinitialize private volatile boolean creatingCompiler;
+    private volatile boolean creatingCompiler;
 
     /**
      * Cache for speeding up {@link #fromClass(Class)}.
      */
-    @NativeImageReinitialize private volatile ClassValue<WeakReferenceHolder<HotSpotResolvedJavaType>> resolvedJavaType;
+    private volatile ClassValue<WeakReferenceHolder<HotSpotResolvedJavaType>> resolvedJavaType;
 
     /**
      * To avoid calling ClassValue.remove to refresh the weak reference, which under certain
@@ -538,20 +537,20 @@ public final class HotSpotJVMCIRuntime implements JVMCIRuntime {
      * A mapping from the {@code Klass*} to the corresponding {@link HotSpotResolvedObjectTypeImpl}.  The value is
      * held weakly through a {@link KlassWeakReference} so that unused types can be unloaded when the compiler no longer needs them.
      */
-    @NativeImageReinitialize private HashMap<Long, KlassWeakReference> resolvedJavaTypes;
+    private HashMap<Long, KlassWeakReference> resolvedJavaTypes;
 
     /**
      * A {@link ReferenceQueue} to track when {@link KlassWeakReference}s have been freed so that the corresponding
      * entry in {@link #resolvedJavaTypes} can be cleared.
      */
-    @NativeImageReinitialize private ReferenceQueue<HotSpotResolvedObjectTypeImpl> resolvedJavaTypesQueue;
+    private ReferenceQueue<HotSpotResolvedObjectTypeImpl> resolvedJavaTypesQueue;
 
     /**
      * Stores the value set by {@link #excludeFromJVMCICompilation(Module...)} so that it can be
      * read from the VM.
      */
     @SuppressWarnings("unused")//
-    @NativeImageReinitialize private Module[] excludeFromJVMCICompilation;
+    private Module[] excludeFromJVMCICompilation;
 
     private final Map<Class<? extends Architecture>, JVMCIBackend> backends = new HashMap<>();
 
diff --git a/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/HotSpotMethodData.java b/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/HotSpotMethodData.java
index bc76b7656fa..454949a2e25 100644
--- a/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/HotSpotMethodData.java
+++ b/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/HotSpotMethodData.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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 static jdk.vm.ci.hotspot.UnsafeAccess.UNSAFE;
 
 import java.util.Arrays;
 
-import jdk.vm.ci.common.NativeImageReinitialize;
 import jdk.internal.misc.Unsafe;
 import jdk.vm.ci.meta.DeoptimizationReason;
 import jdk.vm.ci.meta.JavaMethodProfile;
@@ -144,7 +143,7 @@ final class HotSpotMethodData implements MetaspaceObject {
         /**
          * Singleton instance lazily initialized via double-checked locking.
          */
-        @NativeImageReinitialize private static volatile VMState instance;
+        private static volatile VMState instance;
 
         static VMState instance() {
             VMState result = instance;
diff --git a/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/HotSpotMethodHandleAccessProvider.java b/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/HotSpotMethodHandleAccessProvider.java
index 4685ff4d1b4..6211bd5063a 100644
--- a/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/HotSpotMethodHandleAccessProvider.java
+++ b/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/HotSpotMethodHandleAccessProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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 static jdk.vm.ci.hotspot.HotSpotJVMCIRuntime.runtime;
 import java.lang.invoke.MethodHandle;
 
 import jdk.vm.ci.common.JVMCIError;
-import jdk.vm.ci.common.NativeImageReinitialize;
 import jdk.vm.ci.hotspot.HotSpotMethodData.VMState;
 import jdk.vm.ci.meta.ConstantReflectionProvider;
 import jdk.vm.ci.meta.JavaConstant;
@@ -107,7 +106,7 @@ public class HotSpotMethodHandleAccessProvider implements MethodHandleAccessProv
         /**
          * Singleton instance lazily initialized via double-checked locking.
          */
-        @NativeImageReinitialize private static volatile Internals instance;
+        private static volatile Internals instance;
 
         static Internals instance() {
             Internals result = instance;
diff --git a/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/HotSpotResolvedPrimitiveType.java b/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/HotSpotResolvedPrimitiveType.java
index d95824998bc..4425ade0880 100644
--- a/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/HotSpotResolvedPrimitiveType.java
+++ b/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/HotSpotResolvedPrimitiveType.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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 java.util.Collections;
 import java.util.List;
 
 import jdk.vm.ci.common.JVMCIError;
-import jdk.vm.ci.common.NativeImageReinitialize;
 import jdk.vm.ci.meta.AnnotationData;
 import jdk.vm.ci.meta.Assumptions.AssumptionResult;
 import jdk.vm.ci.meta.JavaConstant;
@@ -46,7 +45,7 @@ import jdk.vm.ci.meta.ResolvedJavaType;
  */
 public final class HotSpotResolvedPrimitiveType extends HotSpotResolvedJavaType {
 
-    @NativeImageReinitialize static HotSpotResolvedPrimitiveType[] primitives;
+    static HotSpotResolvedPrimitiveType[] primitives;
 
     private JavaKind kind;
     HotSpotObjectConstantImpl mirror;
diff --git a/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/runtime/JVMCI.java b/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/runtime/JVMCI.java
index 12ad2bb30d3..d07df2ba75d 100644
--- a/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/runtime/JVMCI.java
+++ b/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/runtime/JVMCI.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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 jdk.vm.ci.runtime;
 
 import java.util.Formatter;
 
-import jdk.vm.ci.common.NativeImageReinitialize;
 import jdk.vm.ci.services.Services;
 
 public class JVMCI {
@@ -32,9 +31,9 @@ public class JVMCI {
     /**
      * Singleton instance lazily initialized via double-checked locking.
      */
-    @NativeImageReinitialize private static volatile JVMCIRuntime runtime;
+    private static volatile JVMCIRuntime runtime;
 
-    @NativeImageReinitialize private static boolean initializing;
+    private static boolean initializing;
 
     public static void initialize() {
         // force static initializer

From fb0efbe87403fa2f1263c9b916db1a3a3b037eeb Mon Sep 17 00:00:00 2001
From: Axel Boldt-Christmas <aboldtch@openjdk.org>
Date: Mon, 10 Mar 2025 11:53:36 +0000
Subject: [PATCH 277/587] 8333578: Fix uses of overaligned types induced by
 ZCACHE_ALIGNED

Reviewed-by: stefank, kbarrett
---
 src/hotspot/share/gc/z/zArguments.cpp | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/src/hotspot/share/gc/z/zArguments.cpp b/src/hotspot/share/gc/z/zArguments.cpp
index ee761d03e18..f972e0718b4 100644
--- a/src/hotspot/share/gc/z/zArguments.cpp
+++ b/src/hotspot/share/gc/z/zArguments.cpp
@@ -21,12 +21,13 @@
  * questions.
  */
 
+#include "gc/shared/gcArguments.hpp"
 #include "gc/z/zAddressSpaceLimit.hpp"
 #include "gc/z/zArguments.hpp"
 #include "gc/z/zCollectedHeap.hpp"
 #include "gc/z/zGlobals.hpp"
 #include "gc/z/zHeuristics.hpp"
-#include "gc/shared/gcArguments.hpp"
+#include "gc/z/zUtils.inline.hpp"
 #include "runtime/globals.hpp"
 #include "runtime/globals_extension.hpp"
 #include "runtime/java.hpp"
@@ -219,7 +220,21 @@ size_t ZArguments::heap_virtual_to_physical_ratio() {
 }
 
 CollectedHeap* ZArguments::create_heap() {
-  return new ZCollectedHeap();
+  // ZCollectedHeap has an alignment greater than or equal to ZCacheLineSize,
+  // which may be larger than std::max_align_t. Instead of using operator new,
+  // align the storage manually and construct the ZCollectedHeap using operator
+  // placement new.
+
+  static_assert(alignof(ZCollectedHeap) >= ZCacheLineSize,
+                "ZCollectedHeap is no longer ZCacheLineSize aligned");
+
+  // Allocate aligned storage for ZCollectedHeap
+  const size_t alignment = alignof(ZCollectedHeap);
+  const size_t size = sizeof(ZCollectedHeap);
+  void* const addr = reinterpret_cast<void*>(ZUtils::alloc_aligned_unfreeable(alignment, size));
+
+  // Construct ZCollectedHeap in the aligned storage
+  return ::new (addr) ZCollectedHeap();
 }
 
 bool ZArguments::is_supported() const {

From 64caf085344dcd5fc5185ed5882439249e239d50 Mon Sep 17 00:00:00 2001
From: Axel Boldt-Christmas <aboldtch@openjdk.org>
Date: Mon, 10 Mar 2025 11:53:50 +0000
Subject: [PATCH 278/587] 8350572: ZGC: Enhance z_verify_safepoints_are_blocked
 interactions with VMError

Reviewed-by: eosterlund, stefank
---
 src/hotspot/share/gc/z/zVerify.cpp | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/hotspot/share/gc/z/zVerify.cpp b/src/hotspot/share/gc/z/zVerify.cpp
index 8e2022d781a..439a3710185 100644
--- a/src/hotspot/share/gc/z/zVerify.cpp
+++ b/src/hotspot/share/gc/z/zVerify.cpp
@@ -53,6 +53,7 @@
 #include "utilities/globalDefinitions.hpp"
 #include "utilities/preserveException.hpp"
 #include "utilities/resourceHash.hpp"
+#include "utilities/vmError.hpp"
 
 #ifdef ASSERT
 
@@ -60,6 +61,13 @@
 // with callers to this function. Typically used to verify that object oops
 // and headers are safe to access.
 void z_verify_safepoints_are_blocked() {
+  if (VMError::is_error_reported_in_current_thread()) {
+    // The current thread has crashed and is creating an error report.
+    // This may occur from any thread state, skip the safepoint_are_blocked
+    // verification.
+    return;
+  }
+
   Thread* current = Thread::current();
 
   if (current->is_ConcurrentGC_thread()) {

From 4867a4c89e99e3ba7fdd9f44e926c82216804167 Mon Sep 17 00:00:00 2001
From: Christian Hagedorn <chagedorn@openjdk.org>
Date: Mon, 10 Mar 2025 12:09:16 +0000
Subject: [PATCH 279/587] 8351280: Mark Assertion Predicates useless instead of
 replacing them by a constant directly

Reviewed-by: epeter, roland
---
 src/hotspot/share/opto/loopnode.cpp   |   8 +-
 src/hotspot/share/opto/loopnode.hpp   |   2 +-
 src/hotspot/share/opto/opaquenode.cpp |  54 +++++++++--
 src/hotspot/share/opto/opaquenode.hpp |  55 +++++++++--
 src/hotspot/share/opto/predicates.cpp |  27 ++++--
 src/hotspot/share/opto/predicates.hpp | 127 ++++++++++++++++----------
 6 files changed, 194 insertions(+), 79 deletions(-)

diff --git a/src/hotspot/share/opto/loopnode.cpp b/src/hotspot/share/opto/loopnode.cpp
index 1ccc132fd38..7d83d602ac9 100644
--- a/src/hotspot/share/opto/loopnode.cpp
+++ b/src/hotspot/share/opto/loopnode.cpp
@@ -4501,13 +4501,12 @@ void PhaseIdealLoop::collect_useful_template_assertion_predicates_for_loop(Ideal
   }
 }
 
-void PhaseIdealLoop::eliminate_useless_template_assertion_predicates(Unique_Node_List& useful_predicates) {
+void PhaseIdealLoop::eliminate_useless_template_assertion_predicates(Unique_Node_List& useful_predicates) const {
   for (int i = C->template_assertion_predicate_count(); i > 0; i--) {
     OpaqueTemplateAssertionPredicateNode* opaque_node =
         C->template_assertion_predicate_opaq_node(i - 1)->as_OpaqueTemplateAssertionPredicate();
     if (!useful_predicates.member(opaque_node)) { // not in the useful list
-      ConINode* one = intcon(1);
-      _igvn.replace_node(opaque_node, one);
+      opaque_node->mark_useless(_igvn);
     }
   }
 }
@@ -4587,8 +4586,7 @@ void PhaseIdealLoop::eliminate_useless_multiversion_if() {
         // We cannot hack the node directly, otherwise the slow_loop will complain that it cannot
         // find the multiversioning opaque node. Instead, we mark the opaque node as useless, and
         // it can be constant folded during IGVN.
-        opaque->mark_useless();
-        _igvn._worklist.push(opaque);
+        opaque->mark_useless(_igvn);
       }
     }
   }
diff --git a/src/hotspot/share/opto/loopnode.hpp b/src/hotspot/share/opto/loopnode.hpp
index dd310e769d6..f28ad41aad5 100644
--- a/src/hotspot/share/opto/loopnode.hpp
+++ b/src/hotspot/share/opto/loopnode.hpp
@@ -1453,7 +1453,7 @@ public:
   void eliminate_useless_template_assertion_predicates();
   void collect_useful_template_assertion_predicates(Unique_Node_List& useful_predicates);
   static void collect_useful_template_assertion_predicates_for_loop(IdealLoopTree* loop, Unique_Node_List& useful_predicates);
-  void eliminate_useless_template_assertion_predicates(Unique_Node_List& useful_predicates);
+  void eliminate_useless_template_assertion_predicates(Unique_Node_List& useful_predicates) const;
 
   void eliminate_useless_zero_trip_guard();
   void eliminate_useless_multiversion_if();
diff --git a/src/hotspot/share/opto/opaquenode.cpp b/src/hotspot/share/opto/opaquenode.cpp
index 949bdfbc839..f0730374045 100644
--- a/src/hotspot/share/opto/opaquenode.cpp
+++ b/src/hotspot/share/opto/opaquenode.cpp
@@ -82,6 +82,12 @@ IfNode* OpaqueZeroTripGuardNode::if_node() const {
   return iff->as_If();
 }
 
+void OpaqueMultiversioningNode::mark_useless(PhaseIterGVN& igvn) {
+  assert(_is_delayed_slow_loop, "must still be delayed");
+  _useless = true;
+  igvn._worklist.push(this);
+}
+
 Node* OpaqueMultiversioningNode::Identity(PhaseGVN* phase) {
   // Constant fold the multiversion_if. Since the slow_loop is still delayed,
   // i.e. we have not yet added any possibly failing condition, we can just
@@ -107,27 +113,59 @@ const Type* OpaqueNotNullNode::Value(PhaseGVN* phase) const {
 }
 
 Node* OpaqueTemplateAssertionPredicateNode::Identity(PhaseGVN* phase) {
-  if (phase->C->post_loop_opts_phase()) {
-    // Template Assertion Predicates only serve as templates to create Initialized Assertion Predicates when splitting
-    // a loop during loop opts. They are not used anymore once loop opts are over and can then be removed. They feed
-    // into the bool input of an If node and can thus be replaced by true to let the Template Assertion Predicate be
-    // folded away (the success path is always the true path by design).
-    return phase->intcon(1);
-  } else {
+  if (!phase->C->post_loop_opts_phase()) {
+    // Record Template Assertion Predicates for post loop opts IGVN. We can remove them when there is no more loop
+    // splitting possible. This also means that we do not create any new Initialized Assertion Predicates created from
+    // these templates.
     phase->C->record_for_post_loop_opts_igvn(this);
   }
   return this;
 }
 
 const Type* OpaqueTemplateAssertionPredicateNode::Value(PhaseGVN* phase) const {
+  if (_useless || phase->C->post_loop_opts_phase()) {
+    // Template Assertion Predicates only serve as templates to create Initialized Assertion Predicates when splitting
+    // a loop during loop opts. They are not used anymore once loop opts are over and can then be removed. They feed
+    // into the bool input of an If node and can thus be replaced by the success path to let the Template Assertion
+    // Predicate be folded away (the success path is always the true path by design). We can also fold the Template
+    // Assertion Predicate away when it's found to be useless and not used anymore.
+    return TypeInt::ONE;
+  }
   return phase->type(in(1));
 }
 
+void OpaqueTemplateAssertionPredicateNode::mark_useless(PhaseIterGVN& igvn) {
+  _useless = true;
+  igvn._worklist.push(this);
+}
+
+#ifndef PRODUCT
+void OpaqueTemplateAssertionPredicateNode::dump_spec(outputStream* st) const {
+  if (_useless) {
+    st->print("#useless ");
+  }
+}
+#endif // NOT PRODUCT
+
 const Type* OpaqueInitializedAssertionPredicateNode::Value(PhaseGVN* phase) const {
+  if (_useless) {
+    return TypeInt::ONE;
+  }
   return phase->type(in(1));
 }
 
-//=============================================================================
+void OpaqueInitializedAssertionPredicateNode::mark_useless(PhaseIterGVN& igvn) {
+  _useless = true;
+  igvn._worklist.push(this);
+}
+
+#ifndef PRODUCT
+void OpaqueInitializedAssertionPredicateNode::dump_spec(outputStream* st) const {
+  if (_useless) {
+    st->print("#useless ");
+  }
+}
+#endif // NOT PRODUCT
 
 uint ProfileBooleanNode::hash() const { return NO_HASH; }
 bool ProfileBooleanNode::cmp( const Node &n ) const {
diff --git a/src/hotspot/share/opto/opaquenode.hpp b/src/hotspot/share/opto/opaquenode.hpp
index e93c7e51544..a8a0781f0cc 100644
--- a/src/hotspot/share/opto/opaquenode.hpp
+++ b/src/hotspot/share/opto/opaquenode.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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,6 +110,7 @@ public:
     init_class_id(Class_OpaqueMultiversioning);
   }
   virtual int Opcode() const;
+  virtual Node* Identity(PhaseGVN* phase);
   virtual const Type* bottom_type() const { return TypeInt::BOOL; }
   bool is_delayed_slow_loop() const { return _is_delayed_slow_loop; }
   DEBUG_ONLY( bool is_useless() const { return _useless; } )
@@ -119,12 +120,7 @@ public:
     _is_delayed_slow_loop = false;
   }
 
-  void mark_useless() {
-    assert(_is_delayed_slow_loop, "must still be delayed");
-    _useless = true;
-  }
-
-  virtual Node* Identity(PhaseGVN* phase);
+  void mark_useless(PhaseIterGVN& igvn);
   NOT_PRODUCT(virtual void dump_spec(outputStream* st) const;)
 };
 
@@ -153,33 +149,72 @@ class OpaqueNotNullNode : public Node {
 // after loop opts and thus is never converted to actual code. In the post loop opts IGVN phase, the
 // OpaqueTemplateAssertionPredicateNode is replaced by true in order to fold the Template Assertion Predicate away.
 class OpaqueTemplateAssertionPredicateNode : public Node {
+  // When splitting a loop or when the associated loop dies, the Template Assertion Predicate with this
+  // OpaqueTemplateAssertionPredicateNode also needs to be removed. We set this flag and then clean this node up in the
+  // next IGVN phase by checking this flag in Value().
+  bool _useless;
+
+  // OpaqueTemplateAssertionPredicateNodes are unique to a Template Assertion Predicate expression and should never
+  // common up. We still make sure of that by returning NO_HASH here.
+  virtual uint hash() const {
+    return NO_HASH;
+  }
+
  public:
-  OpaqueTemplateAssertionPredicateNode(BoolNode* bol) : Node(nullptr, bol) {
+  OpaqueTemplateAssertionPredicateNode(BoolNode* bol) : Node(nullptr, bol),
+      _useless(false) {
     init_class_id(Class_OpaqueTemplateAssertionPredicate);
   }
 
   virtual int Opcode() const;
+  virtual uint size_of() const { return sizeof(*this); }
   virtual Node* Identity(PhaseGVN* phase);
   virtual const Type* Value(PhaseGVN* phase) const;
   virtual const Type* bottom_type() const { return TypeInt::BOOL; }
+
+  bool is_useless() const {
+    return _useless;
+  }
+
+  void mark_useless(PhaseIterGVN& igvn);
+  NOT_PRODUCT(void dump_spec(outputStream* st) const);
 };
 
 // This node is used for Initialized Assertion Predicate BoolNodes. Initialized Assertion Predicates must always evaluate
-// to true. During  macro expansion, we replace the OpaqueInitializedAssertionPredicateNodes with true in product builds
+// to true. During macro expansion, we replace the OpaqueInitializedAssertionPredicateNodes with true in product builds
 // such that the actually unneeded checks are folded and do not end up in the emitted code. In debug builds, we keep the
 // actual checks as additional verification code (i.e. removing OpaqueInitializedAssertionPredicateNodes and use the
 // BoolNode inputs instead).
 class OpaqueInitializedAssertionPredicateNode : public Node {
+  // When updating a loop in Loop Unrolling, we forcefully kill old Initialized Assertion Predicates. We set this flag
+  // and then clean this node up in the next IGVN phase by checking this flag in Value().
+  bool _useless;
+
+  // OpaqueInitializedAssertionPredicateNode are unique to an Initialized Assertion Predicate expression and should never
+  // common up. Thus, we return NO_HASH here.
+  virtual uint hash() const {
+    return NO_HASH;
+  }
+
  public:
-  OpaqueInitializedAssertionPredicateNode(BoolNode* bol, Compile* C) : Node(nullptr, bol) {
+  OpaqueInitializedAssertionPredicateNode(BoolNode* bol, Compile* C) : Node(nullptr, bol),
+      _useless(false) {
     init_class_id(Class_OpaqueInitializedAssertionPredicate);
     init_flags(Flag_is_macro);
     C->add_macro_node(this);
   }
 
   virtual int Opcode() const;
+  virtual uint size_of() const { return sizeof(*this); }
   virtual const Type* Value(PhaseGVN* phase) const;
   virtual const Type* bottom_type() const { return TypeInt::BOOL; }
+
+  bool is_useless() const {
+    return _useless;
+  }
+
+  void mark_useless(PhaseIterGVN& igvn);
+  NOT_PRODUCT(void dump_spec(outputStream* st) const);
 };
 
 //------------------------------ProfileBooleanNode-------------------------------
diff --git a/src/hotspot/share/opto/predicates.cpp b/src/hotspot/share/opto/predicates.cpp
index be4e0067c10..69559edefb0 100644
--- a/src/hotspot/share/opto/predicates.cpp
+++ b/src/hotspot/share/opto/predicates.cpp
@@ -220,10 +220,10 @@ InitializedAssertionPredicate TemplateAssertionPredicate::initialize(PhaseIdealL
   return initialized_assertion_predicate;
 }
 
-// Kills the Template Assertion Predicate by setting the condition to true. Will be folded away in the next IGVN round.
-void TemplateAssertionPredicate::kill(PhaseIdealLoop* phase) const {
-  ConINode* true_con = phase->intcon(1);
-  phase->igvn().replace_input_of(_if_node, 1, true_con);
+// Kills this Template Assertion Predicate by marking the associated OpaqueTemplateAssertionPredicate node useless.
+// It will then be folded away in the next IGVN round.
+void TemplateAssertionPredicate::kill(PhaseIterGVN& igvn) const {
+  opaque_node()->mark_useless(igvn);
 }
 
 #ifdef ASSERT
@@ -303,9 +303,10 @@ bool InitializedAssertionPredicate::is_predicate(const Node* node) {
   return if_node->in(1)->is_OpaqueInitializedAssertionPredicate();
 }
 
-void InitializedAssertionPredicate::kill(PhaseIdealLoop* phase) const {
-  Node* true_con = phase->intcon(1);
-  phase->igvn().replace_input_of(_if_node, 1, true_con);
+// Kills this Initialized Assertion Predicate by marking the associated OpaqueInitializedAssertionPredicate node useless.
+// It will then be folded away in the next IGVN round.
+void InitializedAssertionPredicate::kill(PhaseIterGVN& igvn) const {
+  opaque_node()->mark_useless(igvn);
 }
 
 #ifdef ASSERT
@@ -1084,7 +1085,7 @@ void CloneUnswitchedLoopPredicatesVisitor::visit(const TemplateAssertionPredicat
 
   _clone_predicate_to_true_path_loop.clone_template_assertion_predicate(template_assertion_predicate);
   _clone_predicate_to_false_path_loop.clone_template_assertion_predicate(template_assertion_predicate);
-  template_assertion_predicate.kill(_phase);
+  template_assertion_predicate.kill(_phase->igvn());
 }
 
 // Update the Template Assertion Predicate by setting a new input for the OpaqueLoopStrideNode. Create a new
@@ -1101,6 +1102,16 @@ void UpdateStrideForAssertionPredicates::visit(const TemplateAssertionPredicate&
   connect_initialized_assertion_predicate(template_tail_control_out, initialized_assertion_predicate);
 }
 
+// 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 UpdateStrideForAssertionPredicates::visit(const InitializedAssertionPredicate& initialized_assertion_predicate) {
+  if (initialized_assertion_predicate.is_last_value()) {
+    // Only Last Value Initialized Assertion Predicates need to be killed and updated.
+    initialized_assertion_predicate.kill(_phase->igvn());
+  }
+}
+
 // 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 {
diff --git a/src/hotspot/share/opto/predicates.hpp b/src/hotspot/share/opto/predicates.hpp
index ceb8fe7e317..aff72d38831 100644
--- a/src/hotspot/share/opto/predicates.hpp
+++ b/src/hotspot/share/opto/predicates.hpp
@@ -403,6 +403,10 @@ class TemplateAssertionPredicate : public Predicate {
     return _if_node->assertion_predicate_type() == AssertionPredicateType::LastValue;
   }
 
+  bool is_useless() const {
+    return opaque_node()->is_useless();
+  }
+
   TemplateAssertionPredicate clone(Node* new_control, PhaseIdealLoop* phase) const;
   TemplateAssertionPredicate clone_and_replace_opaque_input(Node* new_control, Node* new_opaque_input,
                                                             PhaseIdealLoop* phase) const;
@@ -410,8 +414,8 @@ class TemplateAssertionPredicate : public Predicate {
   InitializedAssertionPredicate initialize(PhaseIdealLoop* phase) const;
   void rewire_loop_data_dependencies(IfTrueNode* target_predicate, const NodeInLoopBody& data_in_loop_body,
                                      const PhaseIdealLoop* phase) const;
-  void kill(PhaseIdealLoop* phase) const;
-  static bool is_predicate(const Node* node);
+  void kill(PhaseIterGVN& igvn) const;
+  static bool is_predicate(const Node* maybe_success_proj);
 
 #ifdef ASSERT
   static void verify(IfTrueNode* template_assertion_predicate_success_proj) {
@@ -456,8 +460,12 @@ class InitializedAssertionPredicate : public Predicate {
     return _if_node->assertion_predicate_type() == AssertionPredicateType::LastValue;
   }
 
-  void kill(PhaseIdealLoop* phase) const;
-  static bool is_predicate(const Node* node);
+  bool is_useless() const {
+    return opaque_node()->is_useless();
+  }
+
+  void kill(PhaseIterGVN& igvn) const;
+  static bool is_predicate(const Node* maybe_success_proj);
 
 #ifdef ASSERT
   static void verify(IfTrueNode* initialized_assertion_predicate_success_proj) {
@@ -652,44 +660,78 @@ class InitializedAssertionPredicateCreator : public StackObj {
 
 // This class iterates through all predicates of a Regular Predicate Block and applies the given visitor to each.
 class RegularPredicateBlockIterator : public StackObj {
-  Node* const _start_node;
+  Node* _current_node;
   const Deoptimization::DeoptReason _deopt_reason;
 
  public:
   RegularPredicateBlockIterator(Node* start_node, Deoptimization::DeoptReason deopt_reason)
-      : _start_node(start_node),
+      : _current_node(start_node),
         _deopt_reason(deopt_reason) {}
   NONCOPYABLE(RegularPredicateBlockIterator);
 
   // Skip all predicates by just following the inputs. We do not call any user provided visitor.
-  Node* skip_all() const {
+  Node* skip_all() {
     PredicateVisitor do_nothing; // No real visits, just do nothing.
     return for_each(do_nothing);
   }
 
   // Walk over all predicates of this block (if any) and apply the given 'predicate_visitor' to each predicate.
   // Returns the entry to the earliest predicate.
-  Node* for_each(PredicateVisitor& predicate_visitor) const {
-    Node* current = _start_node;
+  Node* for_each(PredicateVisitor& predicate_visitor) {
     while (predicate_visitor.should_continue()) {
-      if (TemplateAssertionPredicate::is_predicate(current)) {
-        TemplateAssertionPredicate template_assertion_predicate(current->as_IfTrue());
-        predicate_visitor.visit(template_assertion_predicate);
-        current = template_assertion_predicate.entry();
-      } else if (RuntimePredicate::is_predicate(current, _deopt_reason)) {
-        RuntimePredicate runtime_predicate(current->as_IfProj());
-        predicate_visitor.visit(runtime_predicate);
-        current = runtime_predicate.entry();
-      } else if (InitializedAssertionPredicate::is_predicate(current)) {
-        InitializedAssertionPredicate initialized_assertion_predicate(current->as_IfTrue());
-        predicate_visitor.visit(initialized_assertion_predicate);
-        current = initialized_assertion_predicate.entry();
-      } else {
-        // Either a Parse Predicate or not a Regular Predicate. In both cases, the node does not belong to this block.
-        break;
+      if (process_template_assertion_predicate(predicate_visitor)) {
+        continue;
       }
+
+      if (process_runtime_predicate(predicate_visitor)) {
+        continue;
+      }
+
+      if (process_initialized_assertion_predicate(predicate_visitor)) {
+        continue;
+      }
+      // Either a Parse Predicate or not a Regular Predicate. In both cases, the node does not belong to this block.
+      break;
     }
-    return current;
+    return _current_node;
+  }
+
+  bool process_template_assertion_predicate(PredicateVisitor& predicate_visitor) {
+    if (!TemplateAssertionPredicate::is_predicate(_current_node)) {
+      return false;
+    }
+
+    TemplateAssertionPredicate template_assertion_predicate(_current_node->as_IfTrue());
+    if (!template_assertion_predicate.is_useless()) {
+      // Only visit if not useless. Otherwise, just skip over it to possibly process other predicates above.
+      predicate_visitor.visit(template_assertion_predicate);
+    }
+    _current_node = template_assertion_predicate.entry();
+    return true;
+  }
+
+  bool process_runtime_predicate(PredicateVisitor& predicate_visitor) {
+    if (!RuntimePredicate::is_predicate(_current_node, _deopt_reason)) {
+      return false;
+    }
+    RuntimePredicate runtime_predicate(_current_node->as_IfProj());
+    predicate_visitor.visit(runtime_predicate);
+    _current_node = runtime_predicate.entry();
+    return true;
+  }
+
+  bool process_initialized_assertion_predicate(PredicateVisitor& predicate_visitor) {
+    if (!InitializedAssertionPredicate::is_predicate(_current_node)) {
+      return false;
+    }
+
+    InitializedAssertionPredicate initialized_assertion_predicate(_current_node->as_IfTrue());
+    if (!initialized_assertion_predicate.is_useless()) {
+      // Only visit if not useless. Otherwise, just skip over it to possibly process other predicates above.
+      predicate_visitor.visit(initialized_assertion_predicate);
+    }
+    _current_node = initialized_assertion_predicate.entry();
+    return true;
   }
 };
 
@@ -697,7 +739,7 @@ class RegularPredicateBlockIterator : public StackObj {
 class PredicateBlockIterator : public StackObj {
   Node* const _start_node;
   const ParsePredicate _parse_predicate; // Could be missing.
-  const RegularPredicateBlockIterator _regular_predicate_block_iterator;
+  RegularPredicateBlockIterator _regular_predicate_block_iterator;
 
  public:
   PredicateBlockIterator(Node* start_node, Deoptimization::DeoptReason deopt_reason)
@@ -707,7 +749,7 @@ class PredicateBlockIterator : public StackObj {
 
   // Walk over all predicates of this block (if any) and apply the given 'predicate_visitor' to each predicate.
   // Returns the entry to the earliest predicate.
-  Node* for_each(PredicateVisitor& predicate_visitor) const {
+  Node* for_each(PredicateVisitor& predicate_visitor) {
     if (!predicate_visitor.should_continue()) {
       return _start_node;
     }
@@ -731,20 +773,20 @@ class PredicateIterator : public StackObj {
   // Apply the 'predicate_visitor' for each predicate found in the predicate chain started at the provided node.
   // Returns the entry to the earliest predicate.
   Node* for_each(PredicateVisitor& predicate_visitor) const {
-    Node* current = _start_node;
-    PredicateBlockIterator loop_limit_check_predicate_iterator(current, Deoptimization::Reason_loop_limit_check);
-    current = loop_limit_check_predicate_iterator.for_each(predicate_visitor);
-    PredicateBlockIterator auto_vectorization_check_iterator(current, Deoptimization::Reason_auto_vectorization_check);
-    current = auto_vectorization_check_iterator.for_each(predicate_visitor);
+    Node* current_node = _start_node;
+    PredicateBlockIterator loop_limit_check_predicate_iterator(current_node, Deoptimization::Reason_loop_limit_check);
+    current_node = loop_limit_check_predicate_iterator.for_each(predicate_visitor);
+    PredicateBlockIterator auto_vectorization_check_iterator(current_node, Deoptimization::Reason_auto_vectorization_check);
+    current_node = auto_vectorization_check_iterator.for_each(predicate_visitor);
     if (UseLoopPredicate) {
       if (UseProfiledLoopPredicate) {
-        PredicateBlockIterator profiled_loop_predicate_iterator(current, Deoptimization::Reason_profile_predicate);
-        current = profiled_loop_predicate_iterator.for_each(predicate_visitor);
+        PredicateBlockIterator profiled_loop_predicate_iterator(current_node, Deoptimization::Reason_profile_predicate);
+        current_node = profiled_loop_predicate_iterator.for_each(predicate_visitor);
       }
-      PredicateBlockIterator loop_predicate_iterator(current, Deoptimization::Reason_predicate);
-      current = loop_predicate_iterator.for_each(predicate_visitor);
+      PredicateBlockIterator loop_predicate_iterator(current_node, Deoptimization::Reason_predicate);
+      current_node = loop_predicate_iterator.for_each(predicate_visitor);
     }
-    return current;
+    return current_node;
   }
 };
 
@@ -1193,15 +1235,6 @@ class UpdateStrideForAssertionPredicates : public PredicateVisitor {
   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);
-    }
-  }
+  void visit(const InitializedAssertionPredicate& initialized_assertion_predicate) override;
 };
 #endif // SHARE_OPTO_PREDICATES_HPP

From e90b6bdb875315de6b962e2c7d36606d9a593eb9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hannes=20Walln=C3=B6fer?= <hannesw@openjdk.org>
Date: Mon, 10 Mar 2025 13:28:42 +0000
Subject: [PATCH 280/587] 8350638: Make keyboard navigation more usable in API
 docs

Reviewed-by: liach, nbenalla
---
 .../doclets/formats/html/HelpWriter.java      |  22 ++
 .../doclets/formats/html/HtmlIds.java         |   1 +
 .../doclets/formats/html/Navigation.java      |   3 +-
 .../doclets/formats/html/SearchWriter.java    |  11 +-
 .../doclets/formats/html/TableOfContents.java |  10 +-
 .../formats/html/resources/script.js.template | 238 +++++++++++++-----
 .../formats/html/resources/search.js.template |  13 +-
 .../html/resources/standard.properties        |  17 +-
 .../formats/html/resources/stylesheet.css     |  42 +++-
 .../toolkit/resources/doclets.properties      |   4 +-
 .../jdk/javadoc/internal/html/HtmlTree.java   |  11 +
 .../TestAnnotationTypes.java                  |   4 +-
 .../TestConstantValuesPage.java               |  14 +-
 .../testMarkdown/TestMarkdownHeadings.java    |   9 +-
 .../testModules/TestModuleServicesLink.java   |  10 +-
 .../doclet/testModules/TestModules.java       |  14 +-
 .../doclet/testNavigation/TestNavigation.java |  14 +-
 .../TestPackageSummary.java                   |  10 +-
 .../javadoc/doclet/testSearch/TestSearch.java |   6 +-
 .../doclet/testSpecTag/TestSpecTag.java       |   6 +-
 .../doclet/testStylesheet/TestStylesheet.java |   4 +-
 21 files changed, 320 insertions(+), 143 deletions(-)

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 8e5920eef63..bc10c223a15 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
@@ -35,6 +35,7 @@ import jdk.javadoc.internal.doclets.toolkit.util.DocPath;
 import jdk.javadoc.internal.doclets.toolkit.util.DocPaths;
 import jdk.javadoc.internal.html.Content;
 import jdk.javadoc.internal.html.ContentBuilder;
+import jdk.javadoc.internal.html.Entity;
 import jdk.javadoc.internal.html.HtmlId;
 import jdk.javadoc.internal.html.HtmlTree;
 import jdk.javadoc.internal.html.Text;
@@ -172,6 +173,27 @@ public class HelpWriter extends HtmlDocletWriter {
                     .add(searchRefer);
             navSection.add(section);
         }
+
+        // Keyboard Navigation
+        section = newHelpSection(contents.getContent("doclet.help.keyboard_navigation.title"),
+                HtmlIds.HELP_KEYBOARD_NAVIGATION);
+        var  keyboardPara = HtmlTree.P(contents.getContent("doclet.help.keyboard_navigation.intro"));
+        var keyboardList = HtmlTree.UL();
+        if (options.createIndex()) {
+            keyboardList.add(HtmlTree.LI(contents.getContent("doclet.help.keyboard_navigation.index",
+                    HtmlTree.KBD(Text.of("/")))));
+        }
+        keyboardList.add(HtmlTree.LI(contents.getContent("doclet.help.keyboard_navigation.filter",
+                HtmlTree.KBD(Text.of(".")))));
+        keyboardList.add(HtmlTree.LI(contents.getContent("doclet.help.keyboard_navigation.escape",
+                HtmlTree.KBD(Text.of("Esc")))));
+        keyboardList.add(HtmlTree.LI(contents.getContent("doclet.help.keyboard_navigation.search",
+                HtmlTree.KBD(Text.of("Tab")), HtmlTree.KBD(Entity.of("downarrow")),
+                HtmlTree.KBD(Entity.of("uparrow")))));
+        keyboardList.add(HtmlTree.LI(contents.getContent("doclet.help.keyboard_navigation.tabs",
+                HtmlTree.KBD(Entity.of("leftarrow")), HtmlTree.KBD(Entity.of("rightarrow")))));
+        navSection.add(section.add(keyboardPara.add(keyboardList)));
+
         tableOfContents.popNestedList();
 
         return content;
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlIds.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlIds.java
index 53dd622b2b0..42d93c41e11 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlIds.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlIds.java
@@ -92,6 +92,7 @@ public class HtmlIds {
     static final HtmlId FIELD_SUMMARY = HtmlId.of("field-summary");
     static final HtmlId FOR_REMOVAL = HtmlId.of("for-removal");
     static final HtmlId HELP_NAVIGATION = HtmlId.of("help-navigation");
+    static final HtmlId HELP_KEYBOARD_NAVIGATION = HtmlId.of("help-keyboard-navigation");
     static final HtmlId HELP_PAGES = HtmlId.of("help-pages");
     static final HtmlId HELP_RELEASES = HtmlId.of("help-releases");
     static final HtmlId METHOD_DETAIL = HtmlId.of("method-detail");
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 7c63a581a4f..045eeb0f7a7 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
@@ -498,7 +498,8 @@ public class Navigation {
         var inputText = HtmlTree.INPUT(HtmlAttr.InputType.TEXT, HtmlIds.SEARCH_INPUT)
                 .put(HtmlAttr.PLACEHOLDER, resources.getText("doclet.search_placeholder"))
                 .put(HtmlAttr.ARIA_LABEL, resources.getText("doclet.search_in_documentation"))
-                .put(HtmlAttr.AUTOCOMPLETE, "off");
+                .put(HtmlAttr.AUTOCOMPLETE, "off")
+                .put(HtmlAttr.SPELLCHECK, "false");
         var inputReset = HtmlTree.INPUT(HtmlAttr.InputType.RESET, HtmlIds.RESET_SEARCH)
                 .put(HtmlAttr.VALUE, resources.getText("doclet.search_reset"));
         var searchDiv = HtmlTree.DIV(HtmlStyles.navListSearch)
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/SearchWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/SearchWriter.java
index c30dae6bc65..673bd35049f 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/SearchWriter.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/SearchWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -32,6 +32,7 @@ import jdk.javadoc.internal.doclets.toolkit.util.DocFileIOException;
 import jdk.javadoc.internal.doclets.toolkit.util.DocPaths;
 import jdk.javadoc.internal.html.Content;
 import jdk.javadoc.internal.html.ContentBuilder;
+import jdk.javadoc.internal.html.Entity;
 import jdk.javadoc.internal.html.HtmlAttr;
 import jdk.javadoc.internal.html.HtmlId;
 import jdk.javadoc.internal.html.HtmlTag;
@@ -85,7 +86,8 @@ public class SearchWriter extends HtmlDocletWriter {
                 .add(HtmlTree.DIV(HtmlTree.INPUT(HtmlAttr.InputType.TEXT, HtmlId.of("page-search-input"))
                                 .put(HtmlAttr.PLACEHOLDER, resources.getText("doclet.search_placeholder"))
                                 .put(HtmlAttr.ARIA_LABEL, resources.getText("doclet.search_in_documentation"))
-                                .put(HtmlAttr.AUTOCOMPLETE, "off"))
+                                .put(HtmlAttr.AUTOCOMPLETE, "off")
+                                .put(HtmlAttr.SPELLCHECK, "false"))
                         .add(HtmlTree.INPUT(HtmlAttr.InputType.RESET, HtmlId.of("page-search-reset"))
                                 .put(HtmlAttr.VALUE, resources.getText("doclet.search_reset"))
                                 .put(HtmlAttr.STYLE, "margin: 6px;"))
@@ -93,7 +95,10 @@ public class SearchWriter extends HtmlDocletWriter {
                                 .add(HtmlTree.SUMMARY(contents.getContent("doclet.search.show_more"))
                                         .setId(HtmlId.of("page-search-expand")))))
                 .add(HtmlTree.DIV(HtmlStyles.pageSearchInfo, helpSection)
-                        .add(HtmlTree.P(contents.getContent("doclet.search.keyboard_info")))
+                        .add(HtmlTree.P(contents.getContent("doclet.search.keyboard_info",
+                                HtmlTree.KBD(Text.of("Ctrl")), HtmlTree.KBD(Text.of("Cmd")),
+                                new ContentBuilder(HtmlTree.KBD(Entity.of("leftarrow")), Text.of("/"),
+                                        HtmlTree.KBD(Entity.of("rightarrow"))))))
                         .add(HtmlTree.P(contents.getContent("doclet.search.browser_info")))
                         .add(HtmlTree.SPAN(Text.of("link"))
                                 .setId(HtmlId.of("page-search-link")))
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/TableOfContents.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/TableOfContents.java
index cfb8f7260d0..6bb1961c232 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/TableOfContents.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/TableOfContents.java
@@ -47,7 +47,8 @@ public class TableOfContents {
      */
     public TableOfContents(HtmlDocletWriter writer) {
         this.writer = writer;
-        listBuilder = new ListBuilder(HtmlTree.OL(HtmlStyles.tocList));
+        listBuilder = new ListBuilder(HtmlTree.OL(HtmlStyles.tocList)
+                .put(HtmlAttr.TABINDEX, "-1"));
     }
 
     /**
@@ -96,18 +97,21 @@ public class TableOfContents {
                     .add(HtmlTree.INPUT(HtmlAttr.InputType.TEXT, HtmlStyles.filterInput)
                             .put(HtmlAttr.PLACEHOLDER, writer.resources.getText("doclet.filter_label"))
                             .put(HtmlAttr.ARIA_LABEL, writer.resources.getText("doclet.filter_table_of_contents"))
-                            .put(HtmlAttr.AUTOCOMPLETE, "off"))
+                            .put(HtmlAttr.AUTOCOMPLETE, "off")
+                            .put(HtmlAttr.SPELLCHECK, "false"))
                     .add(HtmlTree.INPUT(HtmlAttr.InputType.RESET, HtmlStyles.resetFilter)
+                            .put(HtmlAttr.TABINDEX, "-1")
                             .put(HtmlAttr.VALUE, writer.resources.getText("doclet.filter_reset")));
         }
         content.add(header);
+        content.add(listBuilder);
         content.add(HtmlTree.BUTTON(HtmlStyles.hideSidebar)
                 .add(HtmlTree.SPAN(writer.contents.hideSidebar).add(Entity.NO_BREAK_SPACE))
                 .add(Entity.LEFT_POINTING_ANGLE));
         content.add(HtmlTree.BUTTON(HtmlStyles.showSidebar)
                 .add(Entity.RIGHT_POINTING_ANGLE)
                 .add(HtmlTree.SPAN(Entity.NO_BREAK_SPACE).add(writer.contents.showSidebar)));
-        return content.add(listBuilder);
+        return content;
     }
 
 }
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/script.js.template b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/script.js.template
index f9119833175..01b26c4ad06 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/script.js.template
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/script.js.template
@@ -201,6 +201,18 @@ function copyToClipboard(content) {
     document.execCommand("copy");
     document.body.removeChild(textarea);
 }
+function resetInput(input, event, blur) {
+    if (input.value) {
+        input.value = "";
+        input.dispatchEvent(new InputEvent("input"));
+    } else if (blur) {
+        input.blur();
+    }
+    event.preventDefault();
+}
+function isInput(elem) {
+    return elem instanceof HTMLInputElement && elem.type === "text";
+}
 function switchCopyLabel(button, span) {
     var copied = span.getAttribute("data-copied");
     button.classList.add("visible");
@@ -215,6 +227,82 @@ function switchCopyLabel(button, span) {
         }, 100);
     }, 1900);
 }
+function makeFilterWidget(sidebar, updateToc) {
+    if (!sidebar) {
+        return null;
+    }
+    const filterInput = sidebar.querySelector("input.filter-input");
+    const resetInput = sidebar.querySelector("input.reset-filter");
+    sidebar.addEventListener("keydown", e => {
+        if (e.ctrlKey || e.altKey || e.metaKey) {
+            return;
+        }
+        if (e.key === "ArrowUp" || e.key === "ArrowDown") {
+            handleTocFocus(e);
+        } else if (filterInput && e.target !== filterInput) {
+            if (e.key === "Enter" && isTocLink(sidebar, e.target)) {
+                filterInput.value = "";
+                filterInput.dispatchEvent(new InputEvent("input"));
+            } else if (e.key.length === 1 || e.key === "Backspace") {
+                filterInput.focus();
+            }
+        }
+    });
+    if (filterInput) {
+        filterInput.removeAttribute("disabled");
+        filterInput.setAttribute("autocapitalize", "off");
+        filterInput.value = "";
+        filterInput.addEventListener("input", function(e) {
+            resetInput.style.visibility = filterInput.value ? "visible" : "hidden";
+            const pattern = filterInput.value ? filterInput.value.trim()
+                .replace(/[\[\]{}()*+?.\\^$|]/g, '\\$&')
+                .replace(/\s+/g, ".*") : "";
+            const filter = new RegExp(pattern, "i");
+            sidebar.querySelectorAll("ol.toc-list li").forEach((li) => {
+                if (filter.test(li.innerText)) {
+                    // li.removeAttribute("style");
+                    const selfMatch = filter.test(li.firstElementChild.innerText);
+                    li.style.display = "block";
+                    li.firstElementChild.style.opacity =  selfMatch ? "100%" : "70%";
+                    li.firstElementChild.tabIndex = selfMatch ? 0 : -1;
+                } else {
+                    li.style.display = "none";
+                }
+            });
+            updateToc();
+        });
+    }
+    if (resetInput) {
+        resetInput.removeAttribute("disabled");
+        resetInput.addEventListener("click", (e) => {
+            filterInput.value = "";
+            filterInput.focus();
+            filterInput.dispatchEvent(new InputEvent("input"));
+        });
+    }
+    function handleTocFocus(event) {
+        let links = Array.from(sidebar.querySelectorAll("ol > li > a"))
+            .filter(link => link.offsetParent && link.tabIndex === 0);
+        let current = links.indexOf(document.activeElement);
+        if (event.key === "ArrowUp") {
+            if (current > 0) {
+                links[current - 1].focus({focusVisible: true});
+            } else if (filterInput) {
+                filterInput.focus();
+            }
+        } else if (event.key === "ArrowDown" && current < links.length - 1) {
+            links[current + 1].focus({focusVisible: true});
+        }
+        event.preventDefault();
+    }
+    function isTocLink(sidebar, elem) {
+        let links = Array.from(sidebar.querySelectorAll("ol > li > a"))
+            .filter(link => link.offsetParent && link.tabIndex === 0);
+        return links.indexOf(elem) > -1;
+    }
+    return sidebar;
+}
+
 function setTopMargin() {
     // Dynamically set scroll margin to accomodate for draft header
     var headerHeight = Math.ceil(document.querySelector("header").offsetHeight);
@@ -237,61 +325,69 @@ document.addEventListener("DOMContentLoaded", function(e) {
     if (subnav && subnav.lastElementChild) {
         subnav.lastElementChild.scrollIntoView({ behavior: "instant", inline: "start", block: "nearest" });
     }
+    const keymap = new Map();
+    const searchInput = document.getElementById("search-input")
+                   || document.getElementById("page-search-input");
+    if (searchInput) {
+        searchInput.addEventListener("focus", collapse);
+        keymap.set("/", searchInput);
+    }
+    const filterInput = document.querySelector("input.filter-input");
+    if (filterInput) {
+        keymap.set(".", filterInput);
+    }
     // Clone TOC sidebar to header for mobile navigation
     const navbar = document.querySelector("div#navbar-top");
     const sidebar = document.querySelector(".main-grid nav.toc");
     const main = document.querySelector(".main-grid main");
     const mainnav = navbar.querySelector("ul.nav-list");
     const toggleButton = document.querySelector("button#navbar-toggle-button");
-    const toc = sidebar ? sidebar.cloneNode(true) : null;
-    if (toc) {
-        navbar.appendChild(toc);
+    const tocMenu = sidebar ? sidebar.cloneNode(true) : null;
+    makeFilterWidget(sidebar, updateToc);
+    if (tocMenu) {
+        navbar.appendChild(tocMenu);
+        makeFilterWidget(tocMenu, updateToc);
+        var menuInput = tocMenu.querySelector("input.filter-input");
     }
-    document.querySelectorAll("input.filter-input").forEach(function(input) {
-        input.removeAttribute("disabled");
-        input.setAttribute("autocapitalize", "off");
-        input.value = "";
-        input.addEventListener("input", function(e) {
-            const pattern = input.value ? input.value.trim()
-                .replace(/[\[\]{}()*+?.\\^$|]/g, '\\$&')
-                .replace(/\s+/g, ".*") : "";
-            input.nextElementSibling.style.display = pattern ? "inline" : "none";
-            const filter = new RegExp(pattern, "i");
-            input.parentNode.parentNode.querySelectorAll("ol.toc-list li").forEach((li) => {
-                if (filter.test(li.innerText)) {
-                    li.removeAttribute("style");
-                } else {
-                    li.style.display = "none";
-                }
-            });
-            if (expanded) {
-                expand();
+    document.addEventListener("keydown", (e) => {
+        if (e.ctrlKey || e.altKey || e.metaKey) {
+            return;
+        }
+        if (!isInput(e.target) && keymap.has(e.key)) {
+            var elem = keymap.get(e.key);
+            if (elem === filterInput && !elem.offsetParent) {
+                elem = getVisibleFilterInput(true);
             }
-        });
-    });
-    document.querySelectorAll("input.reset-filter").forEach((button) => {
-        button.removeAttribute("disabled");
-        button.addEventListener("click", (e) => {
-            const input = button.previousElementSibling;
-            input.value = "";
-            input.dispatchEvent(new InputEvent("input"));
-            input.focus();
+            elem.focus();
+            elem.select();
+            e.preventDefault();
+        } else if (e.key === "Escape") {
             if (expanded) {
-                expand();
+                collapse();
+                e.preventDefault();
+            } else if (e.target.id === "page-search-input") {
+                resetInput(e.target, e, false);
+            } else if (isInput(e.target)) {
+                resetInput(e.target, e, true);
             } else {
-                prevHash = null;
-                handleScroll();
+                var filter = getVisibleFilterInput(false);
+                if (filter && filter.value) {
+                    resetInput(filterInput, e, true);
+                }
             }
-        })
+        }
     });
     var expanded = false;
     var windowWidth;
     var bodyHeight;
-    function collapse(e) {
+    function collapse() {
         if (expanded) {
             mainnav.removeAttribute("style");
-            if (toc) {
-                toc.removeAttribute("style");
+            if (tocMenu) {
+                tocMenu.removeAttribute("style");
+                if (filterInput) {
+                    keymap.set(".", filterInput);
+                }
             }
             toggleButton.classList.remove("expanded")
             toggleButton.setAttribute("aria-expanded", "false");
@@ -304,18 +400,42 @@ document.addEventListener("DOMContentLoaded", function(e) {
         mainnav.style.removeProperty("height");
         var maxHeight = window.innerHeight - subnav.offsetTop + 4;
         var expandedHeight = Math.min(maxHeight, mainnav.scrollHeight + 10);
-        if (toc) {
-            toc.style.display = "flex";
+        if (tocMenu) {
+            tocMenu.style.display = "flex";
             expandedHeight = Math.min(maxHeight,
-                Math.max(expandedHeight, toc.querySelector("div.toc-header").offsetHeight
-                                       + toc.querySelector("ol.toc-list").scrollHeight + 10));
-            toc.style.height = expandedHeight + "px";
+                Math.max(expandedHeight, tocMenu.querySelector("div.toc-header").offsetHeight
+                                       + tocMenu.querySelector("ol.toc-list").scrollHeight + 10));
+            tocMenu.style.height = expandedHeight + "px";
+            if (menuInput) {
+                keymap.set(".", menuInput);
+            }
         }
         mainnav.style.height = expandedHeight + "px";
         toggleButton.classList.add("expanded");
         toggleButton.setAttribute("aria-expanded", "true");
         windowWidth = window.innerWidth;
     }
+    function updateToc() {
+        if (expanded) {
+            expand();
+        } else {
+            prevHash = null;
+            handleScroll();
+        }
+    }
+    function getVisibleFilterInput(show) {
+        if (sidebar && sidebar.offsetParent) {
+            if (show) {
+                showSidebar();
+            }
+            return filterInput;
+        } else {
+            if (show) {
+                expand();
+            }
+            return menuInput;
+        }
+    }
     toggleButton.addEventListener("click", (e) => {
         if (expanded) {
             collapse();
@@ -323,17 +443,12 @@ document.addEventListener("DOMContentLoaded", function(e) {
             expand();
         }
     });
-    if (toc) {
-        toc.querySelectorAll("a").forEach((link) => {
+    if (tocMenu) {
+        tocMenu.querySelectorAll("a").forEach((link) => {
             link.addEventListener("click", collapse);
         });
     }
-    document.addEventListener('keydown', (e) => {
-        if (e.key === "Escape") collapse();
-    });
     document.querySelector("main").addEventListener("click", collapse);
-    const searchInput = document.getElementById("search-input");
-    if (searchInput) searchInput.addEventListener("focus", collapse);
     document.querySelectorAll("h1, h2, h3, h4, h5, h6")
         .forEach((hdr, idx) => {
             // Create anchor links for headers with an associated id attribute
@@ -412,24 +527,27 @@ document.addEventListener("DOMContentLoaded", function(e) {
             }
         }
     }
+    function hideSidebar() {
+        sidebar.classList.add("hide-sidebar");
+        sessionStorage.setItem("sidebar", "hidden");
+    }
+    function showSidebar() {
+        sidebar.classList.remove("hide-sidebar");
+        sessionStorage.removeItem("sidebar");
+        initSectionData();
+        handleScroll();
+    }
     if (sidebar) {
         initSectionData();
         document.querySelectorAll("a[href^='#']").forEach((link) => {
             link.addEventListener("click", (e) => {
+                link.blur();
                 scrollTimeoutNeeded = true;
                 setSelected(link.getAttribute("href"));
             })
         });
-        sidebar.querySelector("button.hide-sidebar").addEventListener("click", () => {
-            sidebar.classList.add("hide-sidebar");
-            sessionStorage.setItem("sidebar", "hidden");
-        });
-        sidebar.querySelector("button.show-sidebar").addEventListener("click", () => {
-            sidebar.classList.remove("hide-sidebar");
-            sessionStorage.removeItem("sidebar");
-            initSectionData();
-            handleScroll();
-        });
+        sidebar.querySelector("button.hide-sidebar").addEventListener("click", hideSidebar);
+        sidebar.querySelector("button.show-sidebar").addEventListener("click", showSidebar);
         window.addEventListener("hashchange", (e) => {
             scrollTimeoutNeeded = true;
         });
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/search.js.template b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/search.js.template
index c82964fa685..a84fadf90d7 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/search.js.template
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/search.js.template
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl/
@@ -390,7 +390,6 @@ $(function() {
         minLength: 1,
         delay: 200,
         source: function(request, response) {
-            reset.css("display", "inline");
             if (request.term.trim() === "") {
                 return this.close();
             }
@@ -403,12 +402,6 @@ $(function() {
                 $("#search-input").empty();
             }
         },
-        close: function(event, ui) {
-            reset.css("display", search.val() ? "inline" : "none");
-        },
-        change: function(event, ui) {
-            reset.css("display", search.val() ? "inline" : "none");
-        },
         autoFocus: true,
         focus: function(event, ui) {
             return false;
@@ -420,17 +413,15 @@ $(function() {
             if (ui.item.indexItem) {
                 var url = getURL(ui.item.indexItem, ui.item.category);
                 window.location.href = pathtoroot + url;
-                $("#search-input").focus();
             }
         }
     });
     search.val('');
+    search.on("input", () => reset.css("visibility", search.val() ? "visible" : "hidden"))
     search.prop("disabled", false);
     search.attr("autocapitalize", "off");
     reset.prop("disabled", false);
     reset.click(function() {
         search.val('').focus();
-        reset.css("display", "none");
     });
-    search.focus();
 });
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 66302785ee6..18c16894e56 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
@@ -198,9 +198,10 @@ doclet.search.help_page_link=help page
 # 0: a link to the help page with text above
 doclet.search.help_page_info= \
     The {0} provides an introduction to the scope and syntax of JavaDoc search.
+# 0: [Ctrl] 1: [Cmd] 2: [<]/[>] (left and right arrow keys)
 doclet.search.keyboard_info= \
-    You can use the <ctrl> or <cmd> keys in combination with the left and right arrow \
-    keys to switch between result tabs in this page.
+    You can use the {0} or {1} key in combination with the {2} arrow \
+    keys to switch between result tabs in this page while searching.
 doclet.search.browser_info= \
     The URL template below may be used to configure this page as a search engine \
     in browsers that support this feature. It has been tested to work in Google \
@@ -385,6 +386,18 @@ doclet.help.search.refer=Refer to the {0} for a full description of search featu
 doclet.help.search.spec.url=https://docs.oracle.com/en/java/javase/{0}/docs/specs/javadoc/javadoc-search-spec.html
 # The title for the Javadoc Search Specification
 doclet.help.search.spec.title=Javadoc Search Specification
+doclet.help.keyboard_navigation.title=Keyboard Navigation
+doclet.help.keyboard_navigation.intro=Documentation pages provide keyboard shortcuts to facilitate \
+    access to common navigation tasks.
+# Arguments in the messages below are <kbd> elements representing various keyboard keys
+doclet.help.keyboard_navigation.index=Type {0} to access the search input field in any page.
+doclet.help.keyboard_navigation.filter=Type {0} to access the filter input field in the sidebar \
+    of class  pages.
+doclet.help.keyboard_navigation.escape=Type {0} to clear the input and release keyboard focus in \
+    any input field.
+doclet.help.keyboard_navigation.search=Type {0}/{1}/{2} to select list items after entering a \
+    search term in a search or filter input field.
+doclet.help.keyboard_navigation.tabs=Type {0}/{1} to switch between tabs in tabbed summary tables.
 doclet.help.releases.head=Release Details
 doclet.help.releases.body.specify.top-level=\
     The details for each module, package, class or interface \
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/stylesheet.css b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/stylesheet.css
index dafe74dab0d..725de35ec28 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/stylesheet.css
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/stylesheet.css
@@ -465,7 +465,8 @@ dl.name-value > dd {
 .main-grid nav.toc button span {
     display: none;
 }
-.main-grid nav.toc button:hover {
+.main-grid nav.toc button:hover,
+.main-grid nav.toc button:focus {
     color: var(--body-text-color);
     border: 1px solid var(--subnav-background-color);
 }
@@ -474,10 +475,11 @@ dl.name-value > dd {
     color: var(--link-color-active);
 }
 .main-grid nav.toc button:hover span,
-.main-grid nav.toc button:active span  {
+.main-grid nav.toc button:focus span  {
     display: inline;
 }
-.main-grid nav.toc button:hover {
+.main-grid nav.toc button:hover,
+.main-grid nav.toc button:focus {
     box-shadow: 1px 1px 5px rgba(0,0,0,0.2);
 }
 .main-grid nav.toc.hide-sidebar {
@@ -511,13 +513,10 @@ nav.toc > ol.toc-list {
 }
 nav.toc ol.toc-list {
     list-style: none;
+    font-size: var(--nav-font-size);
     padding-left: 0;
     margin: 0;
 }
-nav.toc ol.toc-list li {
-    margin: 0;
-    font-size: var(--nav-font-size);
-}
 a.current-selection {
     font-weight: bold;
 }
@@ -536,6 +535,11 @@ nav.toc a:hover {
 nav.toc a.current-selection {
     background-color: var(--toc-highlight-color);
 }
+nav.toc a:focus-visible {
+    background-color: var(--selected-background-color);
+    color: var(--selected-text-color);
+    outline: none;
+}
 /*
  * Styles for lists.
  */
@@ -1015,9 +1019,9 @@ input#search-input {
     margin: 0;
 }
 input.filter-input {
-    width: 44%;
-    max-width: 140px;
-    margin: 0 4px;
+    min-width: 40px;
+    width: 180px;
+    margin: 0 -8px 0 5px;
     padding-right: 18px;
 }
 input#reset-search, input.reset-filter {
@@ -1029,8 +1033,10 @@ input#reset-search, input.reset-filter {
     border-radius:0;
     width:12px;
     height:12px;
+    min-width:12px;
+    min-height:12px;
     font-size:0;
-    display:none;
+    visibility:hidden;
 }
 input#reset-search {
     position:absolute;
@@ -1039,13 +1045,25 @@ input#reset-search {
 }
 input.reset-filter {
     position: relative;
-    right: 20px;
+    right: 10px;
     top: 0;
 }
 input::placeholder {
     color:var(--search-input-placeholder-color);
     opacity: 1;
 }
+input:focus::placeholder {
+    color: transparent;
+}
+kbd {
+    background-color: #eeeeee;
+    border: 1px solid #b0b0b0;
+    border-radius: 3px;
+    padding: 0 4px;
+    box-shadow: 0 1px 1px rgba(0, 0, 0, 0.2), 0 2px 0 0 rgba(255, 255, 255, 0.6) inset;
+    font-size: 0.9em;
+    font-weight: bold;
+}
 .search-tag-desc-result {
     font-style:italic;
     font-size:11px;
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/doclets.properties b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/doclets.properties
index 6b1cd9b0fc8..8ce2c9c6125 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/doclets.properties
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/doclets.properties
@@ -233,7 +233,7 @@ doclet.Type=Type
 doclet.Modifier_and_Type=Modifier and Type
 doclet.Implementation=Implementation(s):
 doclet.search=Search
-doclet.search_placeholder=Search
+doclet.search_placeholder=Search documentation (type /)
 doclet.search_in_documentation=Search in documentation
 doclet.search_reset=Reset
 doclet.Field=Field
@@ -251,7 +251,7 @@ doclet.Value=Value
 doclet.table_of_contents=Table of contents
 doclet.hide_sidebar=Hide sidebar
 doclet.show_sidebar=Show sidebar
-doclet.filter_label=Filter
+doclet.filter_label=Filter contents (type .)
 doclet.filter_table_of_contents=Filter table of contents
 doclet.filter_reset=Reset
 doclet.linkMismatch_PackagedLinkedtoModule=The code being documented uses packages in the unnamed module, \
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/html/HtmlTree.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/html/HtmlTree.java
index d6642390335..2cdafcd9c5e 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/html/HtmlTree.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/html/HtmlTree.java
@@ -716,6 +716,17 @@ public class HtmlTree extends Content {
                 .setStyle(style)
                 .put(HtmlAttr.DISABLED, "");
     }
+
+    /**
+     * Creates a {@code KBD} element with the given content.
+     *
+     * @param body the content
+     * @return the element
+     */
+    public static HtmlTree KBD(Content body) {
+        return new HtmlTree(HtmlTag.KBD).add(body);
+    }
+
     /**
      * Creates an HTML {@code LABEL} element with the given content.
      *
diff --git a/test/langtools/jdk/javadoc/doclet/testAnnotationTypes/TestAnnotationTypes.java b/test/langtools/jdk/javadoc/doclet/testAnnotationTypes/TestAnnotationTypes.java
index 9235fcd8215..fd17f8d7f50 100644
--- a/test/langtools/jdk/javadoc/doclet/testAnnotationTypes/TestAnnotationTypes.java
+++ b/test/langtools/jdk/javadoc/doclet/testAnnotationTypes/TestAnnotationTypes.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -73,7 +73,7 @@ public class TestAnnotationTypes extends JavadocTester {
 
         checkOutput("pkg/AnnotationType.html", true,
                 """
-                    <ol class="toc-list">
+                    <ol class="toc-list" tabindex="-1">
                     <li><a href="#" tabindex="0">Description</a></li>
                     <li><a href="#annotation-interface-required-element-summary" tabindex="0">Required Element Summary</a></li>
                     <li><a href="#annotation-interface-optional-element-summary" tabindex="0">Optional Element Summary</a></li>
diff --git a/test/langtools/jdk/javadoc/doclet/testConstantValuesPage/TestConstantValuesPage.java b/test/langtools/jdk/javadoc/doclet/testConstantValuesPage/TestConstantValuesPage.java
index d078c19644a..db93ce1d623 100644
--- a/test/langtools/jdk/javadoc/doclet/testConstantValuesPage/TestConstantValuesPage.java
+++ b/test/langtools/jdk/javadoc/doclet/testConstantValuesPage/TestConstantValuesPage.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -116,8 +116,7 @@ public class TestConstantValuesPage extends JavadocTester {
                     <li><a href="#p1.p2b" tabindex="0">p1.p2b.*</a></li>
                     </ol>
                     </li>
-                    </ol>
-                    </nav>""");
+                    </ol>""");
     }
 
     /**
@@ -152,8 +151,7 @@ public class TestConstantValuesPage extends JavadocTester {
                     <li><a href="#unnamed-package" tabindex="0">Unnamed Package</a></li>
                     </ol>
                     </li>
-                    </ol>
-                    </nav>""");
+                    </ol>""");
     }
 
     /**
@@ -196,8 +194,7 @@ public class TestConstantValuesPage extends JavadocTester {
                    <li><a href="#p1.p2a" tabindex="0">p1.p2a.*</a></li>
                    </ol>
                    </li>
-                   </ol>
-                   </nav>""");
+                   </ol>""");
     }
 
     /**
@@ -267,7 +264,6 @@ public class TestConstantValuesPage extends JavadocTester {
                     <li><a href="#p.q" tabindex="0">p.q.*</a></li>
                     </ol>
                     </li>
-                    </ol>
-                    </nav>""");
+                    </ol>""");
     }
 }
diff --git a/test/langtools/jdk/javadoc/doclet/testMarkdown/TestMarkdownHeadings.java b/test/langtools/jdk/javadoc/doclet/testMarkdown/TestMarkdownHeadings.java
index 8d5c782a66b..b10db5d5619 100644
--- a/test/langtools/jdk/javadoc/doclet/testMarkdown/TestMarkdownHeadings.java
+++ b/test/langtools/jdk/javadoc/doclet/testMarkdown/TestMarkdownHeadings.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -314,12 +314,7 @@ public class TestMarkdownHeadings extends JavadocTester {
         checkOutput("p/C.html", true,
                 // note only the level 1 headings in the class description
                 """
-                    <div class="toc-header">Contents&nbsp;
-                    <input type="text" class="filter-input" disabled placeholder="Filter" aria-label="Filter table of contents" autocomplete="off">
-                    <input type="reset" class="reset-filter" disabled value="Reset">
-                    </div>
-                    <button class="hide-sidebar"><span>Hide sidebar&nbsp;</span>&#10094;</button><button class="show-sidebar">&#10095;<span>&nbsp;Show sidebar</span></button>
-                    <ol class="toc-list">
+                    <ol class="toc-list" tabindex="-1">
                     <li><a href="#" tabindex="0">Description</a>
                     <ol class="toc-list">
                     <li><a href="#atx-heading-code-underline-text-heading" tabindex="0">ATX heading code underline text</a></li>
diff --git a/test/langtools/jdk/javadoc/doclet/testModules/TestModuleServicesLink.java b/test/langtools/jdk/javadoc/doclet/testModules/TestModuleServicesLink.java
index 04745e93d0e..5fd6480f680 100644
--- a/test/langtools/jdk/javadoc/doclet/testModules/TestModuleServicesLink.java
+++ b/test/langtools/jdk/javadoc/doclet/testModules/TestModuleServicesLink.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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 8185151 8196200 8261976
+ * @bug 8185151 8196200 8261976 8350638
  * @summary test that navigation summary links are not linked when there are no dependencies
  * @modules jdk.compiler/com.sun.tools.javac.api
  *          jdk.compiler/com.sun.tools.javac.main
@@ -72,7 +72,7 @@ public class TestModuleServicesLink extends JavadocTester {
 
         checkOutput("m/module-summary.html", true,
                 """
-                    <ol class="toc-list">
+                    <ol class="toc-list" tabindex="-1">
                     <li><a href="#" tabindex="0">Description</a></li>
                     <li><a href="#packages-summary" tabindex="0">Packages</a></li>
                     <li><a href="#services-summary" tabindex="0">Services</a></li>
@@ -98,7 +98,7 @@ public class TestModuleServicesLink extends JavadocTester {
 
         checkOutput("m/module-summary.html", true,
                 """
-                    <ol class="toc-list">
+                    <ol class="toc-list" tabindex="-1">
                     <li><a href="#" tabindex="0">Description</a></li>
                     <li><a href="#packages-summary" tabindex="0">Packages</a></li>
                     <li><a href="#services-summary" tabindex="0">Services</a></li>
@@ -122,7 +122,7 @@ public class TestModuleServicesLink extends JavadocTester {
 
         checkOutput("m/module-summary.html", true,
                 """
-                    <ol class="toc-list">
+                    <ol class="toc-list" tabindex="-1">
                     <li><a href="#" tabindex="0">Description</a></li>
                     <li><a href="#packages-summary" tabindex="0">Packages</a></li>
                     </ol>""");
diff --git a/test/langtools/jdk/javadoc/doclet/testModules/TestModules.java b/test/langtools/jdk/javadoc/doclet/testModules/TestModules.java
index 88ccac31580..73afa9839f4 100644
--- a/test/langtools/jdk/javadoc/doclet/testModules/TestModules.java
+++ b/test/langtools/jdk/javadoc/doclet/testModules/TestModules.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -722,7 +722,7 @@ public class TestModules extends JavadocTester {
     void checkModuleSummary() {
         checkOutput("moduleA/module-summary.html", true,
                 """
-                    <ol class="toc-list">
+                    <ol class="toc-list" tabindex="-1">
                     <li><a href="#" tabindex="0">Description</a></li>
                     <li><a href="#packages-summary" tabindex="0">Packages</a></li>
                     <li><a href="#modules-summary" tabindex="0">Modules</a></li>
@@ -748,7 +748,7 @@ public class TestModules extends JavadocTester {
                     """);
         checkOutput("moduleB/module-summary.html", true,
                 """
-                    <ol class="toc-list">
+                    <ol class="toc-list" tabindex="-1">
                     <li><a href="#" tabindex="0">Description</a></li>
                     <li><a href="#packages-summary" tabindex="0">Packages</a></li>
                     <li><a href="#services-summary" tabindex="0">Services</a></li>
@@ -897,7 +897,7 @@ public class TestModules extends JavadocTester {
                     </div>""");
         checkOutput("moduleA/module-summary.html", true,
                 """
-                    <ol class="toc-list">
+                    <ol class="toc-list" tabindex="-1">
                     <li><a href="#" tabindex="0">Description</a></li>
                     <li><a href="#packages-summary" tabindex="0">Packages</a></li>
                     <li><a href="#modules-summary" tabindex="0">Modules</a></li>
@@ -912,7 +912,7 @@ public class TestModules extends JavadocTester {
                     -tab1"><a href="testpkgmdltags/package-summary.html">testpkgmdltags</a></div>
                     <div class="col-last even-row-color package-summary-table package-summary-table-tab1">&nbsp;</div>""",
                 """
-                    <ol class="toc-list">
+                    <ol class="toc-list" tabindex="-1">
                     <li><a href="#" tabindex="0">Description</a></li>
                     <li><a href="#packages-summary" tabindex="0">Packages</a></li>
                     <li><a href="#modules-summary" tabindex="0">Modules</a></li>
@@ -960,7 +960,7 @@ public class TestModules extends JavadocTester {
                     <div class="col-last even-row-color package-summary-table package-summary-table-tab1">&nbsp;</div>""");
         checkOutput("moduleB/module-summary.html", found,
                 """
-                    <ol class="toc-list">
+                    <ol class="toc-list" tabindex="-1">
                     <li><a href="#" tabindex="0">Description</a></li>
                     <li><a href="#packages-summary" tabindex="0">Packages</a></li>
                     <li><a href="#services-summary" tabindex="0">Services</a></li>
@@ -1037,7 +1037,7 @@ public class TestModules extends JavadocTester {
                     <div class="col-last even-row-color package-summary-table package-summary-table-tab3">&nbsp;</div>""");
         checkOutput("moduleB/module-summary.html", found,
                 """
-                    <ol class="toc-list">
+                    <ol class="toc-list" tabindex="-1">
                     <li><a href="#" tabindex="0">Description</a></li>
                     <li><a href="#packages-summary" tabindex="0">Packages</a></li>
                     <li><a href="#modules-summary" tabindex="0">Modules</a></li>
diff --git a/test/langtools/jdk/javadoc/doclet/testNavigation/TestNavigation.java b/test/langtools/jdk/javadoc/doclet/testNavigation/TestNavigation.java
index cbda0bc5c3c..f7cbb78fbeb 100644
--- a/test/langtools/jdk/javadoc/doclet/testNavigation/TestNavigation.java
+++ b/test/langtools/jdk/javadoc/doclet/testNavigation/TestNavigation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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      7025314 8023700 7198273 8025633 8026567 8081854 8196027 8182765
- *           8196200 8196202 8223378 8258659 8261976 8320458 8329537
+ *           8196200 8196202 8223378 8258659 8261976 8320458 8329537 8350638
  * @summary  Make sure the Next/Prev Class links iterate through all types.
  *           Make sure the navagation is 2 columns, not 3.
  * @library  /tools/lib ../../lib
@@ -185,7 +185,7 @@ public class TestNavigation extends JavadocTester {
                     <li><a href="A.X.html" class="current-selection">X</a></li>
                     </ol>""",
                 """
-                    <ol class="toc-list">
+                    <ol class="toc-list" tabindex="-1">
                     <li><a href="#" tabindex="0">Description</a></li>
                     <li><a href="#nested-class-summary" tabindex="0">Nested Class Summary</a></li>
                     <li><a href="#field-summary" tabindex="0">Field Summary</a></li>
@@ -216,7 +216,7 @@ public class TestNavigation extends JavadocTester {
                     <li><a href="A.Y.html" class="current-selection">Y</a></li>
                     </ol>""",
                 """
-                    <ol class="toc-list">
+                    <ol class="toc-list" tabindex="-1">
                     <li><a href="#" tabindex="0">Description</a></li>
                     <li><a href="#nested-class-summary" tabindex="0">Nested Class Summary</a></li>
                     <li><a href="#field-summary" tabindex="0">Field Summary</a></li>
@@ -238,7 +238,7 @@ public class TestNavigation extends JavadocTester {
                     <li><a href="A.X.IC.html" class="current-selection">IC</a></li>
                     </ol>""",
                 """
-                    <ol class="toc-list">
+                    <ol class="toc-list" tabindex="-1">
                     <li><a href="#" tabindex="0">Description</a></li>
                     <li><a href="#constructor-summary" tabindex="0">Constructor Summary</a></li>
                     <li><a href="#method-summary" tabindex="0">Method Summary</a></li>
@@ -251,7 +251,7 @@ public class TestNavigation extends JavadocTester {
 
         checkOrder("pkg1/C.html",
                 """
-                    <ol class="toc-list">
+                    <ol class="toc-list" tabindex="-1">
                     <li><a href="#" tabindex="0">Description</a></li>
                     <li><a href="#constructor-summary" tabindex="0">Constructor Summary</a></li>
                     <li><a href="#method-summary" tabindex="0">Method Summary</a></li>
@@ -264,7 +264,7 @@ public class TestNavigation extends JavadocTester {
 
         checkOrder("pkg1/InterfaceWithNoMembers.html",
                 """
-                    <ol class="toc-list">
+                    <ol class="toc-list" tabindex="-1">
                     <li><a href="#" tabindex="0">Description</a></li>
                     </ol>""");
     }
diff --git a/test/langtools/jdk/javadoc/doclet/testPackageSummary/TestPackageSummary.java b/test/langtools/jdk/javadoc/doclet/testPackageSummary/TestPackageSummary.java
index 47db4c22d07..8f077f78912 100644
--- a/test/langtools/jdk/javadoc/doclet/testPackageSummary/TestPackageSummary.java
+++ b/test/langtools/jdk/javadoc/doclet/testPackageSummary/TestPackageSummary.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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 8189841 8253117 8263507 8320458
+ * @bug 8189841 8253117 8263507 8320458 8350638
  * @summary Error in alternate row coloring in package-summary files
  * @summary Improve structure of package summary pages
  * @library  ../../lib/
@@ -51,14 +51,14 @@ public class TestPackageSummary extends JavadocTester {
 
         checkOutput("pkg/package-summary.html", true,
                 """
-                    <ol class="toc-list">
+                    <ol class="toc-list" tabindex="-1">
                     <li><a href="#" tabindex="0">Description</a></li>
                     <li><a href="#class-summary" tabindex="0">Classes and Interfaces</a></li>
                     </ol>
                     """);
         checkOutput("pkg1/package-summary.html", true,
                 """
-                    <ol class="toc-list">
+                    <ol class="toc-list" tabindex="-1">
                     <li><a href="#" tabindex="0">Description</a></li>
                     <li><a href="#related-package-summary" tabindex="0">Related Packages</a></li>
                     <li><a href="#class-summary" tabindex="0">Classes and Interfaces</a></li>
@@ -66,7 +66,7 @@ public class TestPackageSummary extends JavadocTester {
                     """);
         checkOutput("pkg1/sub/package-summary.html", true,
                 """
-                    <ol class="toc-list">
+                    <ol class="toc-list" tabindex="-1">
                     <li><a href="#" tabindex="0">Description</a></li>
                     <li><a href="#related-package-summary" tabindex="0">Related Packages</a></li>
                     <li><a href="#class-summary" tabindex="0">Classes and Interfaces</a></li>
diff --git a/test/langtools/jdk/javadoc/doclet/testSearch/TestSearch.java b/test/langtools/jdk/javadoc/doclet/testSearch/TestSearch.java
index ba3f64cd8b2..9a2bddb3cc4 100644
--- a/test/langtools/jdk/javadoc/doclet/testSearch/TestSearch.java
+++ b/test/langtools/jdk/javadoc/doclet/testSearch/TestSearch.java
@@ -26,7 +26,7 @@
  * @bug 8141492 8071982 8141636 8147890 8166175 8168965 8176794 8175218 8147881
  *      8181622 8182263 8074407 8187521 8198522 8182765 8199278 8196201 8196202
  *      8184205 8214468 8222548 8223378 8234746 8241219 8254627 8247994 8263528
- *      8266808 8248863 8305710 8318082 8347058
+ *      8266808 8248863 8305710 8318082 8347058 8350638
  * @summary Test the search feature of javadoc.
  * @library ../../lib
  * @modules jdk.javadoc/jdk.javadoc.internal.tool
@@ -433,8 +433,8 @@ public class TestSearch extends JavadocTester {
                     <li><a href="search.html">Search</a></li>""",
                 """
                     <div class="nav-list-search">
-                    <input type="text" id="search-input" disabled placeholder="Search" aria-label="S\
-                    earch in documentation" autocomplete="off">
+                    <input type="text" id="search-input" disabled placeholder="Search documentation \
+                    (type /)" aria-label="Search in documentation" autocomplete="off" spellcheck="false">
                     <input type="reset" id="reset-search" disabled value="Reset">
                     </div>""");
     }
diff --git a/test/langtools/jdk/javadoc/doclet/testSpecTag/TestSpecTag.java b/test/langtools/jdk/javadoc/doclet/testSpecTag/TestSpecTag.java
index cd92bbe0364..491f8a5d8aa 100644
--- a/test/langtools/jdk/javadoc/doclet/testSpecTag/TestSpecTag.java
+++ b/test/langtools/jdk/javadoc/doclet/testSpecTag/TestSpecTag.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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,8 +133,8 @@ public class TestSpecTag extends JavadocTester {
                     <div class="nav-content">
                     <ol class="sub-nav-list"></ol>
                     <div class="nav-list-search">
-                    <input type="text" id="search-input" disabled placeholder="Search" aria-label="S\
-                    earch in documentation" autocomplete="off">
+                    <input type="text" id="search-input" disabled placeholder="Search documentation \
+                    (type /)" aria-label="Search in documentation" autocomplete="off" spellcheck="false">
                     <input type="reset" id="reset-search" disabled value="Reset">
                     </div>
                     </div>
diff --git a/test/langtools/jdk/javadoc/doclet/testStylesheet/TestStylesheet.java b/test/langtools/jdk/javadoc/doclet/testStylesheet/TestStylesheet.java
index 0ee5aafa063..c2dd0d92b0b 100644
--- a/test/langtools/jdk/javadoc/doclet/testStylesheet/TestStylesheet.java
+++ b/test/langtools/jdk/javadoc/doclet/testStylesheet/TestStylesheet.java
@@ -126,8 +126,10 @@ public class TestStylesheet extends JavadocTester {
                         border-radius:0;
                         width:12px;
                         height:12px;
+                        min-width:12px;
+                        min-height:12px;
                         font-size:0;
-                        display:none;
+                        visibility:hidden;
                     }""",
                 """
                     ::placeholder {

From d90b79a2bd2f8bb6e50aa32aafe47748ef6ebeff Mon Sep 17 00:00:00 2001
From: Coleen Phillimore <coleenp@openjdk.org>
Date: Mon, 10 Mar 2025 14:54:50 +0000
Subject: [PATCH 281/587] 8351046: Rename ObjectMonitor functions

Reviewed-by: stefank, fbredberg
---
 src/hotspot/share/runtime/objectMonitor.cpp   | 226 +++++++++---------
 src/hotspot/share/runtime/objectMonitor.hpp   |  36 +--
 .../share/runtime/objectMonitor.inline.hpp    |   6 +-
 src/hotspot/share/runtime/synchronizer.cpp    |   2 +-
 4 files changed, 135 insertions(+), 135 deletions(-)

diff --git a/src/hotspot/share/runtime/objectMonitor.cpp b/src/hotspot/share/runtime/objectMonitor.cpp
index 6885220c979..7f09a1cea32 100644
--- a/src/hotspot/share/runtime/objectMonitor.cpp
+++ b/src/hotspot/share/runtime/objectMonitor.cpp
@@ -127,7 +127,7 @@ ParkEvent* ObjectMonitor::_vthread_unparker_ParkEvent = nullptr;
 //   its owner_id (return value from owner_id_from()).
 //
 // * Invariant: A thread appears on at most one monitor list --
-//   entry_list or WaitSet -- at any one time.
+//   entry_list or wait_set -- at any one time.
 //
 // * Contending threads "push" themselves onto the entry_list with CAS
 //   and then spin/park.
@@ -252,10 +252,10 @@ ParkEvent* ObjectMonitor::_vthread_unparker_ParkEvent = nullptr;
 //   the semantics of park-unpark. Put another way, this monitor implementation
 //   depends only on atomic operations and park-unpark.
 //
-// * Waiting threads reside on the WaitSet list -- wait() puts
-//   the caller onto the WaitSet.
+// * Waiting threads reside on the wait_set list -- wait() puts
+//   the caller onto the wait_set.
 //
-// * notify() or notifyAll() simply transfers threads from the WaitSet
+// * notify() or notifyAll() simply transfers threads from the wait_set
 //   to the entry_list. Subsequent exit() operations will
 //   unpark/re-schedule the notifyee. Unparking/re-scheduling a
 //   notifyee in notify() is inefficient - it's likely the notifyee
@@ -296,9 +296,9 @@ ObjectMonitor::ObjectMonitor(oop object) :
   _succ(NO_OWNER),
   _SpinDuration(ObjectMonitor::Knob_SpinLimit),
   _contentions(0),
-  _WaitSet(nullptr),
+  _wait_set(nullptr),
   _waiters(0),
-  _WaitSetLock(0),
+  _wait_set_lock(0),
   _stack_locker(nullptr)
 { }
 
@@ -357,7 +357,7 @@ bool ObjectMonitor::enter_is_async_deflating() {
   return false;
 }
 
-bool ObjectMonitor::TryLockWithContentionMark(JavaThread* locking_thread, ObjectMonitorContentionMark& contention_mark) {
+bool ObjectMonitor::try_lock_with_contention_mark(JavaThread* locking_thread, ObjectMonitorContentionMark& contention_mark) {
   assert(contention_mark._monitor == this, "must be");
   assert(!is_being_async_deflated(), "must be");
 
@@ -404,7 +404,7 @@ void ObjectMonitor::enter_for_with_contention_mark(JavaThread* locking_thread, O
   // The monitor is private to or already owned by locking_thread which must be suspended.
   // So this code may only contend with deflation.
   assert(locking_thread == Thread::current() || locking_thread->is_obj_deopt_suspend(), "must be");
-  bool success = TryLockWithContentionMark(locking_thread, contention_mark);
+  bool success = try_lock_with_contention_mark(locking_thread, contention_mark);
 
   assert(success, "Failed to enter_for: locking_thread=" INTPTR_FORMAT
          ", this=" INTPTR_FORMAT "{owner=" INT64_FORMAT "}",
@@ -425,7 +425,7 @@ bool ObjectMonitor::enter_for(JavaThread* locking_thread) {
     return false;
   }
 
-  bool success = TryLockWithContentionMark(locking_thread, contention_mark);
+  bool success = try_lock_with_contention_mark(locking_thread, contention_mark);
 
   assert(success, "Failed to enter_for: locking_thread=" INTPTR_FORMAT
          ", this=" INTPTR_FORMAT "{owner=" INT64_FORMAT "}",
@@ -436,7 +436,7 @@ bool ObjectMonitor::enter_for(JavaThread* locking_thread) {
 
 bool ObjectMonitor::try_enter(JavaThread* current, bool check_for_recursion) {
   // TryLock avoids the CAS and handles deflation.
-  TryLockResult r = TryLock(current);
+  TryLockResult r = try_lock(current);
   if (r == TryLockResult::Success) {
     assert(_recursions == 0, "invariant");
     return true;
@@ -474,7 +474,7 @@ bool ObjectMonitor::spin_enter(JavaThread* current) {
   // Do one round of spinning.
   // Note that if we acquire the monitor from an initial spin
   // we forgo posting JVMTI events and firing DTRACE probes.
-  if (TrySpin(current)) {
+  if (try_spin(current)) {
     assert(has_owner(current), "must be current: owner=" INT64_FORMAT, owner_raw());
     assert(_recursions == 0, "must be 0: recursions=%zd", _recursions);
     assert_mark_word_consistency();
@@ -551,7 +551,7 @@ void ObjectMonitor::enter_with_contention_mark(JavaThread* current, ObjectMonito
     notify_contended_enter(current);
     result = Continuation::try_preempt(current, ce->cont_oop(current));
     if (result == freeze_ok) {
-      bool acquired = VThreadMonitorEnter(current);
+      bool acquired = vthread_monitor_enter(current);
       if (acquired) {
         // We actually acquired the monitor while trying to add the vthread to the
         // _entry_list so cancel preemption. We will still go through the preempt stub
@@ -586,7 +586,7 @@ void ObjectMonitor::enter_with_contention_mark(JavaThread* current, ObjectMonito
       ExitOnSuspend eos(this);
       {
         ThreadBlockInVMPreprocess<ExitOnSuspend> tbivs(current, eos, true /* allow_suspend */);
-        EnterI(current);
+        enter_internal(current);
         current->set_current_pending_monitor(nullptr);
         // We can go to a safepoint at the end of this block. If we
         // do a thread dump during that safepoint, then this thread will show
@@ -652,10 +652,10 @@ void ObjectMonitor::enter_with_contention_mark(JavaThread* current, ObjectMonito
   OM_PERFDATA_OP(ContendedLockAttempts, inc());
 }
 
-// Caveat: TryLock() is not necessarily serializing if it returns failure.
+// Caveat: try_lock() is not necessarily serializing if it returns failure.
 // Callers must compensate as needed.
 
-ObjectMonitor::TryLockResult ObjectMonitor::TryLock(JavaThread* current) {
+ObjectMonitor::TryLockResult ObjectMonitor::try_lock(JavaThread* current) {
   int64_t own = owner_raw();
   int64_t first_own = own;
 
@@ -669,7 +669,7 @@ ObjectMonitor::TryLockResult ObjectMonitor::TryLock(JavaThread* current) {
         // Treat deflation as interference.
         return TryLockResult::Interference;
       }
-      if (TryLockWithContentionMark(current, contention_mark)) {
+      if (try_lock_with_contention_mark(current, contention_mark)) {
         assert(_recursions == 0, "invariant");
         return TryLockResult::Success;
       } else {
@@ -726,7 +726,7 @@ bool ObjectMonitor::try_lock_or_add_to_entry_list(JavaThread* current, ObjectWai
 
     // Interference - the CAS failed because _entry_list changed.  Before
     // retrying the CAS retry taking the lock as it may now be free.
-    if (TryLock(current) == TryLockResult::Success) {
+    if (try_lock(current) == TryLockResult::Success) {
       assert(!has_successor(current), "invariant");
       assert(has_owner(current), "invariant");
       return true;
@@ -779,7 +779,7 @@ bool ObjectMonitor::deflate_monitor(Thread* current) {
       // it which makes it busy so no deflation. Restore owner to
       // null if it is still 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.
+        // Deferred decrement for the JT enter_internal() that cancelled the async deflation.
         add_to_contentions(-1);
       }
       return false;
@@ -792,7 +792,7 @@ bool ObjectMonitor::deflate_monitor(Thread* current) {
       // ObjectMonitor is now busy. Restore owner to null if it is
       // still 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.
+        // Deferred decrement for the JT enter_internal() that cancelled the async deflation.
         add_to_contentions(-1);
       }
       return false;
@@ -904,11 +904,11 @@ const char* ObjectMonitor::is_busy_to_string(stringStream* ss) {
   return ss->base();
 }
 
-void ObjectMonitor::EnterI(JavaThread* current) {
+void ObjectMonitor::enter_internal(JavaThread* current) {
   assert(current->thread_state() == _thread_blocked, "invariant");
 
   // Try the lock - TATAS
-  if (TryLock(current) == TryLockResult::Success) {
+  if (try_lock(current) == TryLockResult::Success) {
     assert(!has_successor(current), "invariant");
     assert(has_owner(current), "invariant");
     return;
@@ -923,7 +923,7 @@ void ObjectMonitor::EnterI(JavaThread* current) {
   // to the owner.  This has subtle but beneficial affinity
   // effects.
 
-  if (TrySpin(current)) {
+  if (try_spin(current)) {
     assert(has_owner(current), "invariant");
     assert(!has_successor(current), "invariant");
     return;
@@ -977,7 +977,7 @@ void ObjectMonitor::EnterI(JavaThread* current) {
 
   for (;;) {
 
-    if (TryLock(current) == TryLockResult::Success) {
+    if (try_lock(current) == TryLockResult::Success) {
       break;
     }
     assert(!has_owner(current), "invariant");
@@ -994,7 +994,7 @@ void ObjectMonitor::EnterI(JavaThread* current) {
       current->_ParkEvent->park();
     }
 
-    if (TryLock(current) == TryLockResult::Success) {
+    if (try_lock(current) == TryLockResult::Success) {
       break;
     }
 
@@ -1010,9 +1010,9 @@ void ObjectMonitor::EnterI(JavaThread* current) {
 
     // Assuming this is not a spurious wakeup we'll normally find _succ == current.
     // We can defer clearing _succ until after the spin completes
-    // TrySpin() must tolerate being called with _succ == current.
+    // try_spin() must tolerate being called with _succ == current.
     // Try yet another round of adaptive spinning.
-    if (TrySpin(current)) {
+    if (try_spin(current)) {
       break;
     }
 
@@ -1030,7 +1030,7 @@ void ObjectMonitor::EnterI(JavaThread* current) {
 
   // Egress :
   // Current has acquired the lock -- Unlink current from the _entry_list.
-  UnlinkAfterAcquire(current, &node);
+  unlink_after_acquire(current, &node);
   if (has_successor(current)) {
     clear_successor();
     // Note that we don't need to do OrderAccess::fence() after clearing
@@ -1062,13 +1062,13 @@ void ObjectMonitor::EnterI(JavaThread* current) {
   return;
 }
 
-// ReenterI() is a specialized inline form of the latter half of the
-// contended slow-path from EnterI().  We use ReenterI() only for
+// reenter_internal() is a specialized inline form of the latter half of the
+// contended slow-path from enter_internal().  We use reenter_internal() only for
 // monitor reentry in wait().
 //
-// In the future we should reconcile EnterI() and ReenterI().
+// In the future we should reconcile enter_internal() and reenter_internal().
 
-void ObjectMonitor::ReenterI(JavaThread* current, ObjectWaiter* currentNode) {
+void ObjectMonitor::reenter_internal(JavaThread* current, ObjectWaiter* currentNode) {
   assert(current != nullptr, "invariant");
   assert(current->thread_state() != _thread_blocked, "invariant");
   assert(currentNode != nullptr, "invariant");
@@ -1082,13 +1082,13 @@ void ObjectMonitor::ReenterI(JavaThread* current, ObjectWaiter* currentNode) {
     assert(!has_owner(current), "invariant");
 
     // This thread has been notified so try to reacquire the lock.
-    if (TryLock(current) == TryLockResult::Success) {
+    if (try_lock(current) == TryLockResult::Success) {
       break;
     }
 
     // If that fails, spin again.  Note that spin count may be zero so the above TryLock
     // is necessary.
-    if (TrySpin(current)) {
+    if (try_spin(current)) {
         break;
     }
 
@@ -1107,7 +1107,7 @@ void ObjectMonitor::ReenterI(JavaThread* current, ObjectWaiter* currentNode) {
     // Try again, but just so we distinguish between futile wakeups and
     // successful wakeups.  The following test isn't algorithmically
     // necessary, but it helps us maintain sensible statistics.
-    if (TryLock(current) == TryLockResult::Success) {
+    if (try_lock(current) == TryLockResult::Success) {
       break;
     }
 
@@ -1131,11 +1131,11 @@ void ObjectMonitor::ReenterI(JavaThread* current, ObjectWaiter* currentNode) {
   // Current has acquired the lock -- Unlink current from the _entry_list.
   assert(has_owner(current), "invariant");
   assert_mark_word_consistency();
-  UnlinkAfterAcquire(current, currentNode);
+  unlink_after_acquire(current, currentNode);
   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()
+  OrderAccess::fence();      // see comments at the end of enter_internal()
 }
 
 // This method is called from two places:
@@ -1144,8 +1144,8 @@ void ObjectMonitor::ReenterI(JavaThread* current, ObjectWaiter* currentNode) {
 //   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) {
+bool ObjectMonitor::vthread_monitor_enter(JavaThread* current, ObjectWaiter* waiter) {
+  if (try_lock(current) == TryLockResult::Success) {
     assert(has_owner(current), "invariant");
     assert(!has_successor(current), "invariant");
     return true;
@@ -1162,9 +1162,9 @@ bool ObjectMonitor::VThreadMonitorEnter(JavaThread* current, ObjectWaiter* waite
 
   // We have to try once more since owner could have exited monitor and checked
   // _entry_list before we added the node to the queue.
-  if (TryLock(current) == TryLockResult::Success) {
+  if (try_lock(current) == TryLockResult::Success) {
     assert(has_owner(current), "invariant");
-    UnlinkAfterAcquire(current, node);
+    unlink_after_acquire(current, node);
     if (has_successor(current)) clear_successor();
     if (waiter == nullptr) delete node;  // for Object.wait() don't delete yet
     return true;
@@ -1188,7 +1188,7 @@ bool ObjectMonitor::resume_operation(JavaThread* current, ObjectWaiter* node, Co
   assert(!has_owner(current), "");
 
   if (node->is_wait() && !node->at_reenter()) {
-    bool acquired_monitor = VThreadWaitReenter(current, node, cont);
+    bool acquired_monitor = vthread_wait_reenter(current, node, cont);
     if (acquired_monitor) return true;
   }
 
@@ -1197,8 +1197,8 @@ bool ObjectMonitor::resume_operation(JavaThread* current, ObjectWaiter* node, Co
   int state = node->TState;
   guarantee(state == ObjectWaiter::TS_ENTER, "invariant");
 
-  if (TryLock(current) == TryLockResult::Success) {
-    VThreadEpilog(current, node);
+  if (try_lock(current) == TryLockResult::Success) {
+    vthread_epilog(current, node);
     return true;
   }
 
@@ -1208,8 +1208,8 @@ bool ObjectMonitor::resume_operation(JavaThread* current, ObjectWaiter* node, Co
   // Invariant: after clearing _succ a thread *must* retry acquiring the monitor.
   OrderAccess::fence();
 
-  if (TryLock(current) == TryLockResult::Success) {
-    VThreadEpilog(current, node);
+  if (try_lock(current) == TryLockResult::Success) {
+    vthread_epilog(current, node);
     return true;
   }
 
@@ -1219,7 +1219,7 @@ bool ObjectMonitor::resume_operation(JavaThread* current, ObjectWaiter* node, Co
   return false;
 }
 
-void ObjectMonitor::VThreadEpilog(JavaThread* current, ObjectWaiter* node) {
+void ObjectMonitor::vthread_epilog(JavaThread* current, ObjectWaiter* node) {
   assert(has_owner(current), "invariant");
   add_to_contentions(-1);
 
@@ -1237,7 +1237,7 @@ void ObjectMonitor::VThreadEpilog(JavaThread* current, ObjectWaiter* node) {
     }
   }
 
-  UnlinkAfterAcquire(current, node);
+  unlink_after_acquire(current, node);
   delete node;
 
   // Clear the ObjectWaiter* from the vthread.
@@ -1283,7 +1283,7 @@ ObjectWaiter* ObjectMonitor::entry_list_tail(JavaThread* current) {
 // The head of _entry_list is volatile but the interior is stable.
 // In addition, current.TState is stable.
 
-void ObjectMonitor::UnlinkAfterAcquire(JavaThread* current, ObjectWaiter* currentNode) {
+void ObjectMonitor::unlink_after_acquire(JavaThread* current, ObjectWaiter* currentNode) {
   assert(has_owner(current), "invariant");
   assert((!currentNode->is_vthread() && currentNode->thread() == current) ||
          (currentNode->is_vthread() && currentNode->vthread() == current->vthread()), "invariant");
@@ -1389,7 +1389,7 @@ void ObjectMonitor::UnlinkAfterAcquire(JavaThread* current, ObjectWaiter* curren
 // inopportune) reclamation of "this".
 //
 // We'd like to assert that: (THREAD->thread_state() != _thread_blocked) ;
-// There's one exception to the claim above, however.  EnterI() can call
+// There's one exception to the claim above, however.  enter_internal() can call
 // exit() to drop a lock if the acquirer has been externally suspended.
 // In that case exit() is called with _thread_state == _thread_blocked,
 // but the monitor's _contentions field is > 0, which inhibits reclamation.
@@ -1510,7 +1510,7 @@ void ObjectMonitor::exit(JavaThread* current, bool not_suspended) {
     // reacquire the lock. If we fail to reacquire the lock the
     // responsibility for ensuring succession falls to the new owner.
 
-    if (TryLock(current) != TryLockResult::Success) {
+    if (try_lock(current) != TryLockResult::Success) {
       // Some other thread acquired the lock (or the monitor was
       // deflated). Either way we are done.
       return;
@@ -1535,13 +1535,13 @@ void ObjectMonitor::exit(JavaThread* current, bool not_suspended) {
       // Given all that, we have to tolerate the circumstance where "w" is
       // associated with current.
       assert(w->TState == ObjectWaiter::TS_ENTER, "invariant");
-      ExitEpilog(current, w);
+      exit_epilog(current, w);
       return;
     }
   }
 }
 
-void ObjectMonitor::ExitEpilog(JavaThread* current, ObjectWaiter* Wakee) {
+void ObjectMonitor::exit_epilog(JavaThread* current, ObjectWaiter* Wakee) {
   assert(has_owner(current), "invariant");
 
   // Exit protocol:
@@ -1735,7 +1735,7 @@ void ObjectMonitor::wait(jlong millis, bool interruptible, TRAPS) {
     current->set_current_waiting_monitor(this);
     result = Continuation::try_preempt(current, ce->cont_oop(current));
     if (result == freeze_ok) {
-      VThreadWait(current, millis);
+      vthread_wait(current, millis);
       current->set_current_waiting_monitor(nullptr);
       return;
     }
@@ -1765,14 +1765,14 @@ void ObjectMonitor::wait(jlong millis, bool interruptible, TRAPS) {
 
   // 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
+  // _wait_set_lock 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 of 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);
+  Thread::SpinAcquire(&_wait_set_lock, "wait_set - add");
+  add_waiter(&node);
+  Thread::SpinRelease(&_wait_set_lock);
 
   intx save = _recursions;     // record the old recursion count
   _waiters++;                  // increment the number of waiters
@@ -1780,7 +1780,7 @@ void ObjectMonitor::wait(jlong millis, bool interruptible, TRAPS) {
   exit(current);               // exit the monitor
   guarantee(!has_owner(current), "invariant");
 
-  // The thread is on the WaitSet list - now park() it.
+  // The thread is on the wait_set list - now park() it.
   // On MP systems it's conceivable that a brief spin before we park
   // could be profitable.
   //
@@ -1813,10 +1813,10 @@ void ObjectMonitor::wait(jlong millis, bool interruptible, TRAPS) {
       }
     }
 
-    // Node may be on the WaitSet, or on the entry_list, or in transition
-    // from the WaitSet to the entry_list.
-    // See if we need to remove Node from the WaitSet.
-    // We use double-checked locking to avoid grabbing _WaitSetLock
+    // Node may be on the wait_set, or on the entry_list, or in transition
+    // from the wait_set to the entry_list.
+    // See if we need to remove Node from the wait_set.
+    // We use double-checked locking to avoid grabbing _wait_set_lock
     // if the thread is not on the wait queue.
     //
     // Note that we don't need a fence before the fetch of TState.
@@ -1829,13 +1829,13 @@ void ObjectMonitor::wait(jlong millis, bool interruptible, TRAPS) {
     // That is, we fail toward safety.
 
     if (node.TState == ObjectWaiter::TS_WAIT) {
-      Thread::SpinAcquire(&_WaitSetLock, "WaitSet - unlink");
+      Thread::SpinAcquire(&_wait_set_lock, "wait_set - unlink");
       if (node.TState == ObjectWaiter::TS_WAIT) {
-        DequeueSpecificWaiter(&node);       // unlink from WaitSet
+        dequeue_specific_waiter(&node);       // unlink from wait_set
         assert(!node._notified, "invariant");
         node.TState = ObjectWaiter::TS_RUN;
       }
-      Thread::SpinRelease(&_WaitSetLock);
+      Thread::SpinRelease(&_wait_set_lock);
     }
 
     // The thread is now either on off-list (TS_RUN),
@@ -1894,7 +1894,7 @@ void ObjectMonitor::wait(jlong millis, bool interruptible, TRAPS) {
       enter(current);
     } else {
       guarantee(v == ObjectWaiter::TS_ENTER, "invariant");
-      ReenterI(current, &node);
+      reenter_internal(current, &node);
       node.wait_reenter_end(this);
     }
 
@@ -1940,12 +1940,12 @@ void ObjectMonitor::wait(jlong millis, bool interruptible, TRAPS) {
 
 // Consider:
 // If the lock is cool (entry_list == null && succ == null) and we're on an MP system
-// then instead of transferring a thread from the WaitSet to the entry_list
-// we might just dequeue a thread from the WaitSet and directly unpark() it.
+// then instead of transferring a thread from the wait_set to the entry_list
+// we might just dequeue a thread from the wait_set and directly unpark() it.
 
-void ObjectMonitor::INotify(JavaThread* current) {
-  Thread::SpinAcquire(&_WaitSetLock, "WaitSet - notify");
-  ObjectWaiter* iterator = DequeueWaiter();
+void ObjectMonitor::notify_internal(JavaThread* current) {
+  Thread::SpinAcquire(&_wait_set_lock, "wait_set - notify");
+  ObjectWaiter* iterator = dequeue_waiter();
   if (iterator != nullptr) {
     guarantee(iterator->TState == ObjectWaiter::TS_WAIT, "invariant");
     guarantee(!iterator->_notified, "invariant");
@@ -1970,19 +1970,19 @@ void ObjectMonitor::INotify(JavaThread* current) {
     iterator->_notifier_tid = JFR_THREAD_ID(current);
     add_to_entry_list(current, iterator);
 
-    // _WaitSetLock protects the wait queue, not the entry_list.  We could
+    // _wait_set_lock protects the wait queue, not the entry_list.  We could
     // move the add-to-entry_list operation, above, outside the critical section
-    // protected by _WaitSetLock.  In practice that's not useful.  With the
+    // protected by _wait_set_lock.  In practice that's not useful.  With the
     // exception of  wait() timeouts and interrupts the monitor owner
-    // is the only thread that grabs _WaitSetLock.  There's almost no contention
-    // on _WaitSetLock so it's not profitable to reduce the length of the
+    // is the only thread that grabs _wait_set_lock.  There's almost no contention
+    // on _wait_set_lock so it's not profitable to reduce the length of the
     // critical section.
 
     if (!iterator->is_vthread()) {
       iterator->wait_reenter_begin(this);
     }
   }
-  Thread::SpinRelease(&_WaitSetLock);
+  Thread::SpinRelease(&_wait_set_lock);
 }
 
 // Consider: a not-uncommon synchronization bug is to use notify() when
@@ -1998,11 +1998,11 @@ void ObjectMonitor::INotify(JavaThread* current) {
 void ObjectMonitor::notify(TRAPS) {
   JavaThread* current = THREAD;
   CHECK_OWNER();  // Throws IMSE if not owner.
-  if (_WaitSet == nullptr) {
+  if (_wait_set == nullptr) {
     return;
   }
   DTRACE_MONITOR_PROBE(notify, this, object(), current);
-  INotify(current);
+  notify_internal(current);
   OM_PERFDATA_OP(Notifications, inc(1));
 }
 
@@ -2015,21 +2015,21 @@ void ObjectMonitor::notify(TRAPS) {
 void ObjectMonitor::notifyAll(TRAPS) {
   JavaThread* current = THREAD;
   CHECK_OWNER();  // Throws IMSE if not owner.
-  if (_WaitSet == nullptr) {
+  if (_wait_set == nullptr) {
     return;
   }
 
   DTRACE_MONITOR_PROBE(notifyAll, this, object(), current);
   int tally = 0;
-  while (_WaitSet != nullptr) {
+  while (_wait_set != nullptr) {
     tally++;
-    INotify(current);
+    notify_internal(current);
   }
 
   OM_PERFDATA_OP(Notifications, inc(tally));
 }
 
-void ObjectMonitor::VThreadWait(JavaThread* current, jlong millis) {
+void ObjectMonitor::vthread_wait(JavaThread* current, jlong millis) {
   oop vthread = current->vthread();
   ObjectWaiter* node = new ObjectWaiter(vthread, this);
   node->_is_wait = true;
@@ -2038,14 +2038,14 @@ void ObjectMonitor::VThreadWait(JavaThread* current, jlong millis) {
 
   // 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
+  // _wait_set_lock 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);
+  Thread::SpinAcquire(&_wait_set_lock, "wait_set - add");
+  add_waiter(node);
+  Thread::SpinRelease(&_wait_set_lock);
 
   node->_recursions = _recursions;   // record the old recursion count
   _recursions = 0;                   // set the recursion level to be 0
@@ -2061,18 +2061,18 @@ void ObjectMonitor::VThreadWait(JavaThread* current, jlong millis) {
   java_lang_VirtualThread::set_objectWaiter(vthread, node);
 }
 
-bool ObjectMonitor::VThreadWaitReenter(JavaThread* current, ObjectWaiter* node, ContinuationWrapper& cont) {
+bool ObjectMonitor::vthread_wait_reenter(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.
+  // in that case remove ourselves from the _wait_set queue.
   if (node->TState == ObjectWaiter::TS_WAIT) {
-    Thread::SpinAcquire(&_WaitSetLock, "WaitSet - unlink");
+    Thread::SpinAcquire(&_wait_set_lock, "wait_set - unlink");
     if (node->TState == ObjectWaiter::TS_WAIT) {
-      DequeueSpecificWaiter(node);       // unlink from WaitSet
+      dequeue_specific_waiter(node);       // unlink from wait_set
       assert(!node->_notified, "invariant");
       node->TState = ObjectWaiter::TS_RUN;
     }
-    Thread::SpinRelease(&_WaitSetLock);
+    Thread::SpinRelease(&_wait_set_lock);
   }
 
   // If this was an interrupted case, set the _interrupted boolean so that
@@ -2092,7 +2092,7 @@ bool ObjectMonitor::VThreadWaitReenter(JavaThread* current, ObjectWaiter* node,
   node->_at_reenter = true;
 
   if (!was_notified) {
-    bool acquired = VThreadMonitorEnter(current, node);
+    bool acquired = vthread_monitor_enter(current, node);
     if (acquired) {
       guarantee(_recursions == 0, "invariant");
       _recursions = node->_recursions;   // restore the old recursion count
@@ -2212,7 +2212,7 @@ inline static int adjust_down(int spin_duration) {
 
 bool ObjectMonitor::short_fixed_spin(JavaThread* current, int spin_count, bool adapt) {
   for (int ctr = 0; ctr < spin_count; ctr++) {
-    TryLockResult status = TryLock(current);
+    TryLockResult status = try_lock(current);
     if (status == TryLockResult::Success) {
       if (adapt) {
         _SpinDuration = adjust_up(_SpinDuration);
@@ -2227,7 +2227,7 @@ bool ObjectMonitor::short_fixed_spin(JavaThread* current, int spin_count, bool a
 }
 
 // Spinning: Fixed frequency (100%), vary duration
-bool ObjectMonitor::TrySpin(JavaThread* current) {
+bool ObjectMonitor::try_spin(JavaThread* current) {
 
   // Dumb, brutal spin.  Good for comparative measurements against adaptive spinning.
   int knob_fixed_spin = Knob_FixedSpin;  // 0 (don't spin: default), 2000 good test
@@ -2352,10 +2352,10 @@ bool ObjectMonitor::TrySpin(JavaThread* 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
-    // to make TrySpin() as foolproof as possible.
+    // in the normal usage of try_spin(), but it's safest
+    // to make try_spin() as foolproof as possible.
     OrderAccess::fence();
-    if (TryLock(current) == TryLockResult::Success) {
+    if (try_lock(current) == TryLockResult::Success) {
       return true;
     }
   }
@@ -2365,7 +2365,7 @@ bool ObjectMonitor::TrySpin(JavaThread* current) {
 
 
 // -----------------------------------------------------------------------------
-// WaitSet management ...
+// wait_set management ...
 
 ObjectWaiter::ObjectWaiter(JavaThread* current) {
   _next     = nullptr;
@@ -2407,17 +2407,17 @@ void ObjectWaiter::wait_reenter_end(ObjectMonitor * const mon) {
   JavaThreadBlockedOnMonitorEnterState::wait_reenter_end(_thread, _active);
 }
 
-inline void ObjectMonitor::AddWaiter(ObjectWaiter* node) {
+inline void ObjectMonitor::add_waiter(ObjectWaiter* node) {
   assert(node != nullptr, "should not add null node");
   assert(node->_prev == nullptr, "node already in list");
   assert(node->_next == nullptr, "node already in list");
   // put node at end of queue (circular doubly linked list)
-  if (_WaitSet == nullptr) {
-    _WaitSet = node;
+  if (_wait_set == nullptr) {
+    _wait_set = node;
     node->_prev = node;
     node->_next = node;
   } else {
-    ObjectWaiter* head = _WaitSet;
+    ObjectWaiter* head = _wait_set;
     ObjectWaiter* tail = head->_prev;
     assert(tail->_next == head, "invariant check");
     tail->_next = node;
@@ -2427,16 +2427,16 @@ inline void ObjectMonitor::AddWaiter(ObjectWaiter* node) {
   }
 }
 
-inline ObjectWaiter* ObjectMonitor::DequeueWaiter() {
+inline ObjectWaiter* ObjectMonitor::dequeue_waiter() {
   // dequeue the very first waiter
-  ObjectWaiter* waiter = _WaitSet;
+  ObjectWaiter* waiter = _wait_set;
   if (waiter) {
-    DequeueSpecificWaiter(waiter);
+    dequeue_specific_waiter(waiter);
   }
   return waiter;
 }
 
-inline void ObjectMonitor::DequeueSpecificWaiter(ObjectWaiter* node) {
+inline void ObjectMonitor::dequeue_specific_waiter(ObjectWaiter* node) {
   assert(node != nullptr, "should not dequeue nullptr node");
   assert(node->_prev != nullptr, "node already removed from list");
   assert(node->_next != nullptr, "node already removed from list");
@@ -2446,15 +2446,15 @@ inline void ObjectMonitor::DequeueSpecificWaiter(ObjectWaiter* node) {
   ObjectWaiter* next = node->_next;
   if (next == node) {
     assert(node->_prev == node, "invariant check");
-    _WaitSet = nullptr;
+    _wait_set = nullptr;
   } else {
     ObjectWaiter* prev = node->_prev;
     assert(prev->_next == node, "invariant check");
     assert(next->_prev == node, "invariant check");
     next->_prev = prev;
     prev->_next = next;
-    if (_WaitSet == node) {
-      _WaitSet = next;
+    if (_wait_set == node) {
+      _wait_set = next;
     }
   }
   node->_next = nullptr;
@@ -2554,9 +2554,9 @@ void ObjectMonitor::print() const { print_on(tty); }
 //   _succ = 0x0000000000000000
 //   _SpinDuration = 5000
 //   _contentions = 0
-//   _WaitSet = 0x0000700009756248
+//   _wait_set = 0x0000700009756248
 //   _waiters = 1
-//   _WaitSetLock = 0
+//   _wait_set_lock = 0
 // }
 //
 void ObjectMonitor::print_debug_style_on(outputStream* st) const {
@@ -2582,9 +2582,9 @@ void ObjectMonitor::print_debug_style_on(outputStream* st) const {
   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));
+  st->print_cr("  _wait_set = " INTPTR_FORMAT, p2i(_wait_set));
   st->print_cr("  _waiters = %d", _waiters);
-  st->print_cr("  _WaitSetLock = %d", _WaitSetLock);
+  st->print_cr("  _wait_set_lock = %d", _wait_set_lock);
   st->print_cr("}");
 }
 #endif
diff --git a/src/hotspot/share/runtime/objectMonitor.hpp b/src/hotspot/share/runtime/objectMonitor.hpp
index c080ffd236c..b8409f2a054 100644
--- a/src/hotspot/share/runtime/objectMonitor.hpp
+++ b/src/hotspot/share/runtime/objectMonitor.hpp
@@ -203,9 +203,9 @@ class ObjectMonitor : public CHeapObj<mtObjectMonitor> {
                                     // deflated. It is also used by the async deflation protocol. See
                                     // ObjectMonitor::deflate_monitor().
 
-  ObjectWaiter* volatile _WaitSet;  // LL of threads wait()ing on the monitor
+  ObjectWaiter* volatile _wait_set; // LL of threads waiting on the monitor - wait()
   volatile int  _waiters;           // number of waiting threads
-  volatile int _WaitSetLock;        // protects Wait Queue - simple spinlock
+  volatile int _wait_set_lock;      // protects wait set queue - simple spinlock
 
   // Used in LM_LEGACY mode to store BasicLock* in case of inflation by contending thread.
   BasicLock* volatile _stack_locker;
@@ -375,7 +375,7 @@ class ObjectMonitor : public CHeapObj<mtObjectMonitor> {
 
   // JVM/TI GetObjectMonitorUsage() needs this:
   int waiters() const;
-  ObjectWaiter* first_waiter()                                         { return _WaitSet; }
+  ObjectWaiter* first_waiter()                                         { return _wait_set; }
   ObjectWaiter* next_waiter(ObjectWaiter* o)                           { return o->_next; }
   JavaThread* thread_of_waiter(ObjectWaiter* o)                        { return o->_thread; }
 
@@ -435,29 +435,29 @@ class ObjectMonitor : public CHeapObj<mtObjectMonitor> {
 
  private:
   void      add_to_entry_list(JavaThread* current, ObjectWaiter* node);
-  void      AddWaiter(ObjectWaiter* waiter);
-  void      INotify(JavaThread* current);
-  ObjectWaiter* DequeueWaiter();
-  void      DequeueSpecificWaiter(ObjectWaiter* waiter);
-  void      EnterI(JavaThread* current);
-  void      ReenterI(JavaThread* current, ObjectWaiter* current_node);
-  void      UnlinkAfterAcquire(JavaThread* current, ObjectWaiter* current_node);
+  void      add_waiter(ObjectWaiter* waiter);
+  void      notify_internal(JavaThread* current);
+  ObjectWaiter* dequeue_waiter();
+  void      dequeue_specific_waiter(ObjectWaiter* waiter);
+  void      enter_internal(JavaThread* current);
+  void      reenter_internal(JavaThread* current, ObjectWaiter* current_node);
+  void      unlink_after_acquire(JavaThread* current, ObjectWaiter* current_node);
   ObjectWaiter* entry_list_tail(JavaThread* current);
 
-  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);
+  bool      vthread_monitor_enter(JavaThread* current, ObjectWaiter* node = nullptr);
+  void      vthread_wait(JavaThread* current, jlong millis);
+  bool      vthread_wait_reenter(JavaThread* current, ObjectWaiter* node, ContinuationWrapper& cont);
+  void      vthread_epilog(JavaThread* current, ObjectWaiter* node);
 
   enum class TryLockResult { Interference = -1, HasOwner = 0, Success = 1 };
 
-  bool           TryLockWithContentionMark(JavaThread* locking_thread, ObjectMonitorContentionMark& contention_mark);
+  bool           try_lock_with_contention_mark(JavaThread* locking_thread, ObjectMonitorContentionMark& contention_mark);
   bool           try_lock_or_add_to_entry_list(JavaThread* current, ObjectWaiter* node);
-  TryLockResult  TryLock(JavaThread* current);
+  TryLockResult  try_lock(JavaThread* current);
 
-  bool      TrySpin(JavaThread* current);
+  bool      try_spin(JavaThread* current);
   bool      short_fixed_spin(JavaThread* current, int spin_count, bool adapt);
-  void      ExitEpilog(JavaThread* current, ObjectWaiter* Wakee);
+  void      exit_epilog(JavaThread* current, ObjectWaiter* Wakee);
 
   // Deflation support
   bool      deflate_monitor(Thread* current);
diff --git a/src/hotspot/share/runtime/objectMonitor.inline.hpp b/src/hotspot/share/runtime/objectMonitor.inline.hpp
index ed34af8dca3..d8d7b3f7633 100644
--- a/src/hotspot/share/runtime/objectMonitor.inline.hpp
+++ b/src/hotspot/share/runtime/objectMonitor.inline.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -249,7 +249,7 @@ inline ObjectMonitorContentionMark::ObjectMonitorContentionMark(ObjectMonitor* m
   // contended enter protocol, which prevents the deflater thread from
   // winning the last part of the 2-part async deflation
   // protocol. See: ObjectMonitor::deflate_monitor() and
-  // ObjectMonitor::TryLockWithContentionMark().
+  // ObjectMonitor::try_lock_with_contention_mark().
   _monitor->add_to_contentions(1);
 }
 
@@ -261,7 +261,7 @@ inline ObjectMonitorContentionMark::~ObjectMonitorContentionMark() {
 }
 
 inline void ObjectMonitorContentionMark::extend() {
-  // Used by ObjectMonitor::TryLockWithContentionMark() to "extend the
+  // Used by ObjectMonitor::try_lock_with_contention_mark() to "extend the
   // lifetime" of the contention mark.
   assert(!_extended, "extending twice is probably a bad design");
   _monitor->add_to_contentions(1);
diff --git a/src/hotspot/share/runtime/synchronizer.cpp b/src/hotspot/share/runtime/synchronizer.cpp
index f48035db2e8..90d857e1669 100644
--- a/src/hotspot/share/runtime/synchronizer.cpp
+++ b/src/hotspot/share/runtime/synchronizer.cpp
@@ -374,7 +374,7 @@ bool ObjectSynchronizer::quick_notify(oopDesc* obj, JavaThread* current, bool al
       }
       int free_count = 0;
       do {
-        mon->INotify(current);
+        mon->notify_internal(current);
         ++free_count;
       } while (mon->first_waiter() != nullptr && all);
       OM_PERFDATA_OP(Notifications, inc(free_count));

From 32f2c2d80894552b8c5329cfa51c7e836314901f Mon Sep 17 00:00:00 2001
From: Naoto Sato <naoto@openjdk.org>
Date: Mon, 10 Mar 2025 16:13:50 +0000
Subject: [PATCH 282/587] 8351017: ChronoUnit.MONTHS.between() not giving
 correct result when date is in February

Reviewed-by: scolebourne, rriggs
---
 .../classes/java/time/temporal/TemporalUnit.java     | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/java.base/share/classes/java/time/temporal/TemporalUnit.java b/src/java.base/share/classes/java/time/temporal/TemporalUnit.java
index 1904bd2642d..9638e30c6dd 100644
--- a/src/java.base/share/classes/java/time/temporal/TemporalUnit.java
+++ b/src/java.base/share/classes/java/time/temporal/TemporalUnit.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -239,9 +239,15 @@ public interface TemporalUnit {
      * calculated using {@code HOURS.between(startTime, endTime)}.
      * <p>
      * The calculation returns a whole number, representing the number of
-     * complete units between the two temporals.
+     * complete units between the two temporals. If there are smaller unit
+     * fields, their values are considered when determining the final
+     * whole number.
+     *
      * For example, the amount in hours between the times 11:30 and 13:29
-     * will only be one hour as it is one minute short of two hours.
+     * will only be one hour as it is one minute short of two hours, or
+     * the amount in months between the dates 2024-09-29 and 2025-02-28
+     * (the last day in February) will be 4 months as it is one day short
+     * of 5 months.
      * <p>
      * There are two equivalent ways of using this method.
      * The first is to invoke this method directly.

From 6b84bdef3b203e62cebd77705ef5b3e081302c28 Mon Sep 17 00:00:00 2001
From: Nizar Benalla <nbenalla@openjdk.org>
Date: Mon, 10 Mar 2025 16:15:23 +0000
Subject: [PATCH 283/587] 8350007: Add usage message to the javadoc executable

Reviewed-by: hannesw
---
 .../share/classes/jdk/javadoc/internal/tool/Start.java       | 5 ++++-
 .../jdk/javadoc/internal/tool/resources/javadoc.properties   | 5 ++++-
 .../tools/javac/options/JavadocIgnoreSymbolFile.java         | 5 ++---
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/Start.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/Start.java
index 2a695d876a2..3d7db566ff1 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/Start.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/Start.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -555,6 +555,9 @@ public class Start {
         if (options.modules().isEmpty()) {
             if (options.subpackages().isEmpty()) {
                 if (javaNames.isEmpty() && isEmpty(fileObjects)) {
+                    showLinesUsingKey("main.usage.short");
+                    showLinesUsingKey("main.for-more-details-see-usage");
+                    log.flush();
                     String text = log.getText("main.No_modules_packages_or_classes_specified");
                     throw new ToolException(CMDERR, text);
                 }
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/resources/javadoc.properties b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/resources/javadoc.properties
index 81783809725..0b347bbb0a4 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/resources/javadoc.properties
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/resources/javadoc.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -34,6 +34,9 @@ main.usage=Usage:\n\
 \    javadoc [options] [packagenames] [sourcefiles] [@files]\n\
 where options include:
 
+main.usage.short=Usage:\n\
+\    javadoc [options] [packagenames] [sourcefiles] [@files]
+
 main.did-you-mean=\
     Did you mean: {0}
 
diff --git a/test/langtools/tools/javac/options/JavadocIgnoreSymbolFile.java b/test/langtools/tools/javac/options/JavadocIgnoreSymbolFile.java
index 24c24bc3eee..759975676c9 100644
--- a/test/langtools/tools/javac/options/JavadocIgnoreSymbolFile.java
+++ b/test/langtools/tools/javac/options/JavadocIgnoreSymbolFile.java
@@ -23,12 +23,11 @@
 
 /*
  * @test
- * @bug 8348038
+ * @bug 8348038 8350007
  * @summary Verify use of "-XDignore.symbol.file=true" doesn't cause assertion failure
  * @modules jdk.javadoc/jdk.javadoc.internal.tool
  */
 
-import java.io.File;
 import java.io.PrintWriter;
 import java.io.StringWriter;
 
@@ -42,7 +41,7 @@ public class JavadocIgnoreSymbolFile {
         try (PrintWriter pw = new PrintWriter(buf)) {
             jdk.javadoc.internal.tool.Main.execute(javadocArgs, pw);
         }
-        String expected = "error: No modules, packages or classes specified. 1 error";
+        String expected = "Usage: javadoc [options] [packagenames] [sourcefiles] [@files] For more details on available options, use --help or --help-extra error: No modules, packages or classes specified. 1 error";
         String actual = buf.toString().trim().replaceAll("\\s+", " ");
         if (!actual.equals(expected))
             throw new AssertionError("unexpected output:\n" + actual);

From b40be22512a8d3b3350fef8d6668d80134a6f1a6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Lund=C3=A9n?= <dlunden@openjdk.org>
Date: Mon, 10 Mar 2025 16:18:02 +0000
Subject: [PATCH 284/587] 8333393: PhaseCFG::insert_anti_dependences can fail
 to raise LCAs and to add necessary anti-dependence edges
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Roberto Castañeda Lozano <rcastanedalo@openjdk.org>
Co-authored-by: Christian Hagedorn <chagedorn@openjdk.org>
Co-authored-by: Tobias Hartmann <thartmann@openjdk.org>
Co-authored-by: Emanuel Peter <epeter@openjdk.org>
Co-authored-by: Quan Anh Mai <qamai@openjdk.org>
Reviewed-by: rcastanedalo, chagedorn, epeter
---
 src/hotspot/share/opto/cfgnode.cpp            | 111 +++++++-
 src/hotspot/share/opto/cfgnode.hpp            |   4 +-
 .../codegen/TestGCMLoadPlacement.java         | 260 ++++++++++++++++++
 3 files changed, 365 insertions(+), 10 deletions(-)
 create mode 100644 test/hotspot/jtreg/compiler/codegen/TestGCMLoadPlacement.java

diff --git a/src/hotspot/share/opto/cfgnode.cpp b/src/hotspot/share/opto/cfgnode.cpp
index 01cbacd72f3..4cf080a2e19 100644
--- a/src/hotspot/share/opto/cfgnode.cpp
+++ b/src/hotspot/share/opto/cfgnode.cpp
@@ -1117,6 +1117,7 @@ PhiNode* PhiNode::split_out_instance(const TypePtr* at, PhaseIterGVN *igvn) cons
     }
   }
   Compile *C = igvn->C;
+  ResourceMark rm;
   Node_Array node_map;
   Node_Stack stack(C->live_nodes() >> 4);
   PhiNode *nphi = slice_memory(at);
@@ -2054,6 +2055,46 @@ bool PhiNode::must_wait_for_region_in_irreducible_loop(PhaseGVN* phase) const {
   return false;
 }
 
+// Check if splitting a bot memory Phi through a parent MergeMem may lead to
+// non-termination. For more details, see comments at the call site in
+// PhiNode::Ideal.
+bool PhiNode::is_split_through_mergemem_terminating() const {
+  ResourceMark rm;
+  VectorSet visited;
+  GrowableArray<const Node*> worklist;
+  worklist.push(this);
+  visited.set(this->_idx);
+  auto maybe_add_to_worklist = [&](Node* input) {
+    if (input != nullptr &&
+        (input->is_MergeMem() || input->is_memory_phi()) &&
+        !visited.test_set(input->_idx)) {
+      worklist.push(input);
+      assert(input->adr_type() == TypePtr::BOTTOM,
+          "should only visit bottom memory");
+    }
+  };
+  while (worklist.length() > 0) {
+    const Node* n = worklist.pop();
+    if (n->is_MergeMem()) {
+      Node* input = n->as_MergeMem()->base_memory();
+      if (input == this) {
+        return false;
+      }
+      maybe_add_to_worklist(input);
+    } else {
+      assert(n->is_memory_phi(), "invariant");
+      for (uint i = PhiNode::Input; i < n->req(); i++) {
+        Node* input = n->in(i);
+        if (input == this) {
+          return false;
+        }
+        maybe_add_to_worklist(input);
+      }
+    }
+  }
+  return true;
+}
+
 //------------------------------Ideal------------------------------------------
 // Return a node which is more "ideal" than the current node.  Must preserve
 // the CFG, but we can still strip out dead paths.
@@ -2358,9 +2399,38 @@ Node *PhiNode::Ideal(PhaseGVN *phase, bool can_reshape) {
   // It would make the parser's memory-merge logic sick.)
   // (MergeMemNode is not dead_loop_safe - need to check for dead loop.)
   if (progress == nullptr && can_reshape && type() == Type::MEMORY) {
-    // see if this phi should be sliced
+
+    // See if this Phi should be sliced. Determine the merge width of input
+    // MergeMems and check if there is a direct loop to self, as illustrated
+    // below.
+    //
+    //               +-------------+
+    //               |             |
+    // (base_memory) v             |
+    //              MergeMem       |
+    //                 |           |
+    //                 v           |
+    //                Phi (this)   |
+    //                 |           |
+    //                 +-----------+
+    //
+    // Generally, there are issues with non-termination with such circularity
+    // (see comment further below). However, if there is a direct loop to self,
+    // splitting the Phi through the MergeMem will result in the below.
+    //
+    //               +---+
+    //               |   |
+    //               v   |
+    //              Phi  |
+    //               |\  |
+    //               | +-+
+    // (base_memory) v
+    //              MergeMem
+    //
+    // This split breaks the circularity and consequently does not lead to
+    // non-termination.
     uint merge_width = 0;
-    bool saw_self = false;
+    bool split_always_terminates = false; // Is splitting guaranteed to terminate?
     for( uint i=1; i<req(); ++i ) {// For all paths in
       Node *ii = in(i);
       // TOP inputs should not be counted as safe inputs because if the
@@ -2372,12 +2442,36 @@ Node *PhiNode::Ideal(PhaseGVN *phase, bool can_reshape) {
       if (ii->is_MergeMem()) {
         MergeMemNode* n = ii->as_MergeMem();
         merge_width = MAX2(merge_width, n->req());
-        saw_self = saw_self || (n->base_memory() == this);
+        if (n->base_memory() == this) {
+          split_always_terminates = true;
+        }
       }
     }
 
-    // This restriction is temporarily necessary to ensure termination:
-    if (!saw_self && adr_type() == TypePtr::BOTTOM)  merge_width = 0;
+    // There are cases with circular dependencies between bottom Phis
+    // and MergeMems. Below is a minimal example.
+    //
+    //               +------------+
+    //               |            |
+    // (base_memory) v            |
+    //              MergeMem      |
+    //                 |          |
+    //                 v          |
+    //                Phi (this)  |
+    //                 |          |
+    //                 v          |
+    //                Phi         |
+    //                 |          |
+    //                 +----------+
+    //
+    // Here, we cannot break the circularity through a self-loop as there
+    // are two Phis involved. Repeatedly splitting the Phis through the
+    // MergeMem leads to non-termination. We check for non-termination below.
+    // Only check for non-termination if necessary.
+    if (!split_always_terminates && adr_type() == TypePtr::BOTTOM &&
+        merge_width > Compile::AliasIdxRaw) {
+      split_always_terminates = is_split_through_mergemem_terminating();
+    }
 
     if (merge_width > Compile::AliasIdxRaw) {
       // found at least one non-empty MergeMem
@@ -2409,10 +2503,9 @@ Node *PhiNode::Ideal(PhaseGVN *phase, bool can_reshape) {
             }
           }
         }
-      } else {
-        // We know that at least one MergeMem->base_memory() == this
-        // (saw_self == true). If all other inputs also references this phi
-        // (directly or through data nodes) - it is a dead loop.
+      } else if (split_always_terminates) {
+        // If all inputs reference this phi (directly or through data nodes) -
+        // it is a dead loop.
         bool saw_safe_input = false;
         for (uint j = 1; j < req(); ++j) {
           Node* n = in(j);
diff --git a/src/hotspot/share/opto/cfgnode.hpp b/src/hotspot/share/opto/cfgnode.hpp
index c2cc0161df1..7e117dbd88d 100644
--- a/src/hotspot/share/opto/cfgnode.hpp
+++ b/src/hotspot/share/opto/cfgnode.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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,6 +182,8 @@ class PhiNode : public TypeNode {
 
   bool must_wait_for_region_in_irreducible_loop(PhaseGVN* phase) const;
 
+  bool is_split_through_mergemem_terminating() const;
+
 public:
   // Node layout (parallels RegionNode):
   enum { Region,                // Control input is the Phi's region.
diff --git a/test/hotspot/jtreg/compiler/codegen/TestGCMLoadPlacement.java b/test/hotspot/jtreg/compiler/codegen/TestGCMLoadPlacement.java
new file mode 100644
index 00000000000..cbee6a28529
--- /dev/null
+++ b/test/hotspot/jtreg/compiler/codegen/TestGCMLoadPlacement.java
@@ -0,0 +1,260 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package compiler.codegen;
+
+/**
+ * @test
+ * @bug 8333393
+ * @summary Test that loads are not scheduled too late.
+ * @run main/othervm -XX:CompileCommand=compileonly,*Test*::test
+ *                   -XX:-TieredCompilation -Xbatch
+ *                   -XX:PerMethodTrapLimit=0
+ *                   -XX:CompileCommand=dontinline,*::dontInline
+ *                   compiler.codegen.TestGCMLoadPlacement
+ * @run main/othervm -XX:CompileCommand=compileonly,*Test*::test
+ *                   -XX:-TieredCompilation -Xbatch
+ *                   -XX:PerMethodTrapLimit=0
+ *                   -XX:CompileCommand=dontinline,*::dontInline
+ *                   -XX:+UnlockDiagnosticVMOptions
+ *                   -XX:+StressGCM -XX:+StressLCM
+ *                   compiler.codegen.TestGCMLoadPlacement
+ * @run main/othervm -XX:LoopMaxUnroll=0
+ *                   -XX:CompileCommand=compileonly,*Test*::test
+ *                   -XX:-TieredCompilation -Xbatch
+ *                   -XX:PerMethodTrapLimit=0
+ *                   compiler.codegen.TestGCMLoadPlacement
+ * @run main/othervm -XX:LoopMaxUnroll=0
+ *                   -XX:CompileCommand=compileonly,*Test*::test
+ *                   -XX:-TieredCompilation -Xbatch
+ *                   -XX:PerMethodTrapLimit=0
+ *                   -XX:+UnlockDiagnosticVMOptions
+ *                   -XX:+StressGCM -XX:+StressLCM
+ *                   compiler.codegen.TestGCMLoadPlacement
+ * @run main compiler.codegen.TestGCMLoadPlacement
+ */
+
+public class TestGCMLoadPlacement {
+
+    public static void main(String[] args) {
+        int c = 0;
+        try {
+            Test1.run();
+        } catch (Exception e) {
+            c++; System.out.println("Test1 failure");
+        }
+        try {
+            Test2.run();
+        } catch (Exception e) {
+            c++; System.out.println("Test2 failure");
+        }
+        try {
+            Test3.run();
+        } catch (Exception e) {
+            c++; System.out.println("Test3 failure");
+        }
+        try {
+            Test4.run();
+        } catch (Exception e) {
+            c++; System.out.println("Test4 failure");
+        }
+        try {
+            Test5.run();
+        } catch (Exception e) {
+            c++; System.out.println("Test5 failure");
+        }
+        if (c > 0) {
+            throw new RuntimeException("Test failures: " + c);
+        }
+    }
+
+    static class Test1 {
+        static boolean flag;
+        volatile byte volFld;
+        int iFld;
+
+        int test() {
+            for (int i = 0; i < 50; ++i) {
+                for (int j = 0; j < 50; ++j) {
+                    if (flag) { return 0; } // Forces peeling
+                    iFld = 0;
+                    for (int k = 0; k < 1; ++k) {
+                    }
+                }
+            }
+            int res = iFld; // This load needs to schedule before the loop below ...
+            for (int i = 0; i < 50; ++i) {
+                volFld = 0;
+                iFld -= 42;
+            }
+            // ... and was incorrectly scheduled here.
+            return res;
+        }
+
+        static void run() {
+            Test1 t = new Test1();
+            for (int i = 0; i < 10; i++) {
+                int res = t.test();
+                if (res != 0) {
+                    throw new RuntimeException("Unexpected result: " + res);
+                }
+            }
+        }
+    }
+
+    static class Test2 {
+        static void run() {
+            for (int i = 0; i < 500; i++) {
+                int res = test();
+                if (res != 0) {
+                    throw new RuntimeException("res = " + res);
+                }
+            }
+        }
+
+        static int test() {
+            int res = 0;
+            int array[] = new int[50];
+            for (int j = 0; j < array.length; j++) {
+                array[j] = 0;
+            }
+            int x = array[0];
+            for (int i = 5; i < 10; i++) {
+                array[0] = 42;
+                for (int j = 0; j < 10; j++) {
+                    dontInline();
+                    res = x;
+                }
+            }
+            return res;
+        }
+
+        static void dontInline() {}
+    }
+
+    static class Test3 {
+        static boolean flag;
+        static int N = 400;
+        long instanceCount;
+        float fFld = 2.957F;
+        volatile short sFld;
+        int iArrFld[] = new int[N];
+
+        int test() {
+            int i22 = 7, i25, i27, i28 = 5, i29, i31, i33;
+            for (i25 = 229; i25 > 2; --i25) {
+                if (flag) { return 9; }
+                iArrFld[1] *= instanceCount;
+                for (i27 = 4; i27 < 116; ++i27) {
+                }
+            }
+            i22 += fFld;
+            for (i29 = 23; 8 < i29; i29--) {
+                for (i31 = 2; i31 < 17; i31++) {
+                    if (flag) { return 9; }
+                    i28 = sFld;
+                }
+                for (i33 = 1; 7 > i33; ++i33) {
+                    if (flag) { return 9; }
+                    fFld = instanceCount;
+                }
+            }
+            return i22;
+        }
+
+        static void run() {
+            Test3 r = new Test3();
+            int result = r.test();
+            if (result != 9) {
+                throw new RuntimeException("Expected 9 but found " + result);
+            }
+        }
+    }
+
+    static class Test4 {
+        static boolean flag;
+        volatile byte volFld;
+        int iFld;
+
+        int test() {
+            for (int j = 0; j < 50; ++j) {
+                iFld = 0;
+                if (flag) { return 0; }
+
+                for (int k = 0; k < 2000; ++k) {
+                }
+            }
+
+            int res = iFld;
+            for (int i = 0; i < 50; ++i) {
+                volFld = 0;
+                iFld -= 1;
+            }
+            return res;
+        }
+
+        static void run() {
+            Test4 t = new Test4();
+            for (int i = 0; i < 10; i++) {
+                int res = t.test();
+                if (res != 0) {
+                    throw new RuntimeException("Unexpected result: " + res);
+                }
+            }
+        }
+    }
+
+    static class Test5 {
+        static boolean flag;
+        volatile byte volFld;
+        int iFld, iFld2;
+
+        int test() {
+            for (int j = 0; j < 50; ++j) {
+                iFld2 = 0;
+                if (flag) { return 0; }
+
+                for (int k = 0; k < 2000; ++k) {
+                }
+            }
+
+            int res = iFld;
+            for (int i = 0; i < 50; ++i) {
+                volFld = 0;
+                iFld -= 1;
+            }
+            return res;
+        }
+
+        static void run() {
+            Test5 t = new Test5();
+            for (int i = 0; i < 10; i++) {
+                t.iFld = 0;
+                int res = t.test();
+                if (res != 0) {
+                    throw new RuntimeException("Unexpected result: " + res);
+                }
+            }
+        }
+    }
+}

From 8450ae902ee012b6447015b24369eee85c091ec5 Mon Sep 17 00:00:00 2001
From: Mikael Vidstedt <mikael@openjdk.org>
Date: Mon, 10 Mar 2025 16:31:39 +0000
Subject: [PATCH 285/587] 8351440: Link with -reproducible on macOS

Reviewed-by: erikj, ihse
---
 make/autoconf/flags-ldflags.m4 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/make/autoconf/flags-ldflags.m4 b/make/autoconf/flags-ldflags.m4
index ef9df055cb8..509e0dd825f 100644
--- a/make/autoconf/flags-ldflags.m4
+++ b/make/autoconf/flags-ldflags.m4
@@ -100,7 +100,7 @@ AC_DEFUN([FLAGS_SETUP_LDFLAGS_HELPER],
   if test "x$OPENJDK_TARGET_OS" = xmacosx && test "x$TOOLCHAIN_TYPE" = xclang; then
     # FIXME: We should really generalize SET_SHARED_LIBRARY_ORIGIN instead.
     OS_LDFLAGS_JVM_ONLY="-Wl,-rpath,@loader_path/. -Wl,-rpath,@loader_path/.."
-    OS_LDFLAGS="-mmacosx-version-min=$MACOSX_VERSION_MIN"
+    OS_LDFLAGS="-mmacosx-version-min=$MACOSX_VERSION_MIN -Wl,-reproducible"
   fi
 
   # Setup debug level-dependent LDFLAGS

From 7999091e3e976fe62d859d508bf649b6ec7bc94e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hannes=20Walln=C3=B6fer?= <hannesw@openjdk.org>
Date: Mon, 10 Mar 2025 17:22:26 +0000
Subject: [PATCH 286/587] 8351555: Help section added in JDK-8350638 uses
 invalid HTML

Reviewed-by: liach, jjg
---
 .../jdk/javadoc/internal/doclets/formats/html/HelpWriter.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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 bc10c223a15..1973f62faad 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
@@ -177,7 +177,7 @@ public class HelpWriter extends HtmlDocletWriter {
         // Keyboard Navigation
         section = newHelpSection(contents.getContent("doclet.help.keyboard_navigation.title"),
                 HtmlIds.HELP_KEYBOARD_NAVIGATION);
-        var  keyboardPara = HtmlTree.P(contents.getContent("doclet.help.keyboard_navigation.intro"));
+        section.add(HtmlTree.P(contents.getContent("doclet.help.keyboard_navigation.intro")));
         var keyboardList = HtmlTree.UL();
         if (options.createIndex()) {
             keyboardList.add(HtmlTree.LI(contents.getContent("doclet.help.keyboard_navigation.index",
@@ -192,7 +192,7 @@ public class HelpWriter extends HtmlDocletWriter {
                 HtmlTree.KBD(Entity.of("uparrow")))));
         keyboardList.add(HtmlTree.LI(contents.getContent("doclet.help.keyboard_navigation.tabs",
                 HtmlTree.KBD(Entity.of("leftarrow")), HtmlTree.KBD(Entity.of("rightarrow")))));
-        navSection.add(section.add(keyboardPara.add(keyboardList)));
+        navSection.add(section.add(keyboardList));
 
         tableOfContents.popNestedList();
 

From dbdbbd473061d7e8077ed07ccc6b03065a8c2ffc Mon Sep 17 00:00:00 2001
From: Harshitha Onkar <honkar@openjdk.org>
Date: Mon, 10 Mar 2025 17:47:54 +0000
Subject: [PATCH 287/587] 8348597: Update HarfBuzz to 10.4.0

Reviewed-by: erikj, prr
---
 .../java.desktop/lib/ClientLibraries.gmk      |    2 +-
 src/java.desktop/share/legal/harfbuzz.md      |   15 +-
 .../native/libharfbuzz/OT/Color/CBDT/CBDT.hh  |   10 +-
 .../native/libharfbuzz/OT/Color/COLR/COLR.hh  |  513 +-
 .../OT/Color/COLR/colrv1-closure.hh           |   50 +-
 .../native/libharfbuzz/OT/Color/CPAL/CPAL.hh  |   16 +
 .../native/libharfbuzz/OT/Color/sbix/sbix.hh  |    1 +
 .../native/libharfbuzz/OT/Color/svg/svg.hh    |    1 +
 .../libharfbuzz/OT/Layout/Common/Coverage.hh  |   23 +
 .../OT/Layout/Common/CoverageFormat1.hh       |    2 +
 .../OT/Layout/Common/CoverageFormat2.hh       |    2 +
 .../native/libharfbuzz/OT/Layout/GDEF/GDEF.hh |  166 +-
 .../libharfbuzz/OT/Layout/GPOS/Anchor.hh      |    1 +
 .../OT/Layout/GPOS/AnchorFormat3.hh           |    6 +
 .../OT/Layout/GPOS/AnchorMatrix.hh            |   10 +-
 .../libharfbuzz/OT/Layout/GPOS/Common.hh      |    2 +-
 .../OT/Layout/GPOS/CursivePosFormat1.hh       |   14 +-
 .../OT/Layout/GPOS/MarkMarkPosFormat1.hh      |    1 +
 .../OT/Layout/GPOS/PairPosFormat1.hh          |   86 +-
 .../OT/Layout/GPOS/PairPosFormat2.hh          |  118 +-
 .../libharfbuzz/OT/Layout/GPOS/PairSet.hh     |    8 +-
 .../OT/Layout/GPOS/PairValueRecord.hh         |    4 +-
 .../libharfbuzz/OT/Layout/GPOS/SinglePos.hh   |   12 +-
 .../OT/Layout/GPOS/SinglePosFormat1.hh        |   31 +-
 .../OT/Layout/GPOS/SinglePosFormat2.hh        |   42 +-
 .../libharfbuzz/OT/Layout/GPOS/ValueFormat.hh |   85 +-
 .../OT/Layout/GSUB/AlternateSubstFormat1.hh   |    2 +-
 .../libharfbuzz/OT/Layout/GSUB/Ligature.hh    |   15 +-
 .../OT/Layout/GSUB/LigatureSubstFormat1.hh    |   43 +-
 .../OT/Layout/GSUB/MultipleSubstFormat1.hh    |    2 +-
 .../GSUB/ReverseChainSingleSubstFormat1.hh    |    8 +-
 .../OT/Layout/GSUB/SingleSubstFormat1.hh      |    2 +-
 .../OT/Layout/GSUB/SingleSubstFormat2.hh      |    2 +-
 .../native/libharfbuzz/OT/Layout/types.hh     |   11 +-
 .../native/libharfbuzz/OT/Var/VARC/VARC.hh    |  218 +
 .../libharfbuzz/OT/Var/VARC/coord-setter.hh   |   63 +
 .../libharfbuzz/OT/glyf/CompositeGlyph.hh     |    5 +-
 .../share/native/libharfbuzz/OT/glyf/Glyph.hh |  202 +-
 .../native/libharfbuzz/OT/glyf/SimpleGlyph.hh |   18 +-
 .../native/libharfbuzz/OT/glyf/SubsetGlyph.hh |   13 +-
 .../libharfbuzz/OT/glyf/VarCompositeGlyph.hh  |  401 --
 .../libharfbuzz/OT/glyf/coord-setter.hh       |   36 -
 .../libharfbuzz/OT/glyf/glyf-helpers.hh       |    2 +-
 .../share/native/libharfbuzz/OT/glyf/glyf.hh  |  162 +-
 .../libharfbuzz/OT/glyf/path-builder.hh       |  106 +-
 .../share/native/libharfbuzz/OT/name/name.hh  |    7 +-
 .../share/native/libharfbuzz/UPDATING.txt     |    4 +-
 .../libharfbuzz/graph/classdef-graph.hh       |   83 +-
 .../libharfbuzz/graph/coverage-graph.hh       |    3 +
 .../share/native/libharfbuzz/graph/graph.hh   |  100 +-
 .../libharfbuzz/graph/gsubgpos-graph.hh       |    4 +
 .../libharfbuzz/graph/markbasepos-graph.hh    |    3 +
 .../native/libharfbuzz/graph/pairpos-graph.hh |   13 +-
 .../libharfbuzz/hb-aat-layout-ankr-table.hh   |    1 +
 .../libharfbuzz/hb-aat-layout-bsln-table.hh   |    1 +
 .../libharfbuzz/hb-aat-layout-common.hh       |  412 +-
 .../libharfbuzz/hb-aat-layout-feat-table.hh   |    2 +
 .../libharfbuzz/hb-aat-layout-just-table.hh   |   15 +-
 .../libharfbuzz/hb-aat-layout-kerx-table.hh   |  274 +-
 .../libharfbuzz/hb-aat-layout-morx-table.hh   |  650 +-
 .../libharfbuzz/hb-aat-layout-opbd-table.hh   |    9 +-
 .../libharfbuzz/hb-aat-layout-trak-table.hh   |  180 +-
 .../share/native/libharfbuzz/hb-aat-layout.cc |   99 +-
 .../share/native/libharfbuzz/hb-aat-layout.h  |    4 +-
 .../share/native/libharfbuzz/hb-aat-layout.hh |    8 +-
 .../native/libharfbuzz/hb-aat-ltag-table.hh   |    5 +-
 .../share/native/libharfbuzz/hb-aat-map.cc    |   15 +-
 .../share/native/libharfbuzz/hb-algs.hh       |   28 +-
 .../share/native/libharfbuzz/hb-array.hh      |    5 +-
 .../share/native/libharfbuzz/hb-atomic.hh     |   11 +-
 .../share/native/libharfbuzz/hb-bit-page.hh   |   55 +-
 .../libharfbuzz/hb-bit-set-invertible.hh      |   14 +-
 .../share/native/libharfbuzz/hb-bit-set.hh    |   71 +-
 .../share/native/libharfbuzz/hb-blob.cc       |   26 +-
 .../libharfbuzz/hb-buffer-deserialize-json.hh |  508 +-
 .../native/libharfbuzz/hb-buffer-verify.cc    |    6 +-
 .../share/native/libharfbuzz/hb-buffer.cc     |   89 +-
 .../share/native/libharfbuzz/hb-buffer.h      |   13 +
 .../share/native/libharfbuzz/hb-buffer.hh     |   20 +-
 .../libharfbuzz/hb-cff-interp-common.hh       |    3 +-
 .../libharfbuzz/hb-cff-interp-dict-common.hh  |   10 +-
 .../native/libharfbuzz/hb-cff2-interp-cs.hh   |   10 +-
 .../share/native/libharfbuzz/hb-common.cc     |    5 +-
 .../share/native/libharfbuzz/hb-common.h      |   33 +-
 .../share/native/libharfbuzz/hb-config.hh     |    8 +-
 .../share/native/libharfbuzz/hb-cplusplus.hh  |   19 +-
 .../share/native/libharfbuzz/hb-decycler.hh   |  164 +
 .../share/native/libharfbuzz/hb-deprecated.h  |   11 +-
 .../share/native/libharfbuzz/hb-draw.h        |    2 +-
 .../share/native/libharfbuzz/hb-draw.hh       |    2 +-
 .../native/libharfbuzz/hb-face-builder.cc     |   61 +-
 .../share/native/libharfbuzz/hb-face.cc       |  176 +-
 .../share/native/libharfbuzz/hb-face.h        |   45 +-
 .../share/native/libharfbuzz/hb-face.hh       |   10 +-
 .../share/native/libharfbuzz/hb-font.cc       |    2 +-
 .../share/native/libharfbuzz/hb-font.hh       |    2 +-
 .../share/native/libharfbuzz/hb-ft.cc         |  264 +-
 .../share/native/libharfbuzz/hb-ft.h          |   12 +-
 .../share/native/libharfbuzz/hb-geometry.hh   |  293 +
 .../share/native/libharfbuzz/hb-iter.hh       |   10 +
 .../share/native/libharfbuzz/hb-limits.hh     |   19 +-
 .../share/native/libharfbuzz/hb-map.hh        |   56 +-
 .../share/native/libharfbuzz/hb-null.hh       |    2 +-
 .../share/native/libharfbuzz/hb-object.hh     |    2 +-
 .../share/native/libharfbuzz/hb-open-file.hh  |   12 +-
 .../share/native/libharfbuzz/hb-open-type.hh  |  986 ++-
 .../native/libharfbuzz/hb-ot-cff-common.hh    |  287 +-
 .../native/libharfbuzz/hb-ot-cff1-table.cc    |    9 -
 .../native/libharfbuzz/hb-ot-cff1-table.hh    |  138 +-
 .../native/libharfbuzz/hb-ot-cff2-table.cc    |   16 +-
 .../native/libharfbuzz/hb-ot-cff2-table.hh    |   84 +-
 .../native/libharfbuzz/hb-ot-cmap-table.hh    |  315 +-
 .../libharfbuzz/hb-ot-face-table-list.hh      |   14 +-
 .../share/native/libharfbuzz/hb-ot-face.cc    |    3 +
 .../share/native/libharfbuzz/hb-ot-font.cc    |   82 +-
 .../native/libharfbuzz/hb-ot-hdmx-table.hh    |    4 +-
 .../native/libharfbuzz/hb-ot-head-table.hh    |    1 +
 .../native/libharfbuzz/hb-ot-hhea-table.hh    |    4 +-
 .../native/libharfbuzz/hb-ot-hmtx-table.hh    |   31 +-
 .../native/libharfbuzz/hb-ot-kern-table.hh    |   94 +-
 .../libharfbuzz/hb-ot-layout-base-table.hh    |  355 +-
 .../native/libharfbuzz/hb-ot-layout-common.hh | 1080 ++-
 .../libharfbuzz/hb-ot-layout-gsubgpos.hh      |  375 +-
 .../libharfbuzz/hb-ot-layout-jstf-table.hh    |    1 +
 .../share/native/libharfbuzz/hb-ot-layout.cc  |   46 +-
 .../share/native/libharfbuzz/hb-ot-layout.hh  |   60 +-
 .../share/native/libharfbuzz/hb-ot-map.cc     |   14 +
 .../share/native/libharfbuzz/hb-ot-map.hh     |    3 +
 .../native/libharfbuzz/hb-ot-math-table.hh    |   36 +-
 .../native/libharfbuzz/hb-ot-maxp-table.hh    |    3 +-
 .../native/libharfbuzz/hb-ot-meta-table.hh    |    2 +
 .../native/libharfbuzz/hb-ot-os2-table.hh     |   32 +-
 .../libharfbuzz/hb-ot-post-table-v2subset.hh  |   21 +-
 .../native/libharfbuzz/hb-ot-post-table.hh    |   22 +-
 .../libharfbuzz/hb-ot-shape-normalize.cc      |   35 +-
 .../libharfbuzz/hb-ot-shape-normalize.hh      |   34 +-
 .../share/native/libharfbuzz/hb-ot-shape.cc   |   85 +-
 .../share/native/libharfbuzz/hb-ot-shape.h    |    6 +
 .../share/native/libharfbuzz/hb-ot-shape.hh   |   15 +-
 .../hb-ot-shaper-arabic-fallback.hh           |    2 +
 .../hb-ot-shaper-arabic-joining-list.hh       |    8 +-
 .../libharfbuzz/hb-ot-shaper-arabic-table.hh  |   23 +-
 .../native/libharfbuzz/hb-ot-shaper-arabic.cc |   11 +-
 .../native/libharfbuzz/hb-ot-shaper-hebrew.cc |    2 +-
 .../libharfbuzz/hb-ot-shaper-indic-machine.hh | 1279 +++-
 .../libharfbuzz/hb-ot-shaper-indic-table.cc   |   39 +-
 .../hb-ot-shaper-myanmar-machine.hh           |  694 +-
 .../libharfbuzz/hb-ot-shaper-use-machine.hh   | 1377 ++--
 .../libharfbuzz/hb-ot-shaper-use-table.hh     |  396 +-
 .../hb-ot-shaper-vowel-constraints.cc         |    6 +-
 .../share/native/libharfbuzz/hb-ot-shaper.hh  |   36 +-
 .../native/libharfbuzz/hb-ot-stat-table.hh    |   58 +-
 .../native/libharfbuzz/hb-ot-tag-table.hh     |  328 +-
 .../share/native/libharfbuzz/hb-ot-tag.cc     |    2 +-
 .../libharfbuzz/hb-ot-var-avar-table.hh       |   17 +-
 .../native/libharfbuzz/hb-ot-var-common.hh    | 1039 ++-
 .../libharfbuzz/hb-ot-var-cvar-table.hh       |   29 +-
 .../libharfbuzz/hb-ot-var-fvar-table.hh       |   10 +-
 .../libharfbuzz/hb-ot-var-gvar-table.hh       |  191 +-
 .../libharfbuzz/hb-ot-var-hvar-table.hh       |   11 +-
 .../libharfbuzz/hb-ot-var-mvar-table.hh       |    8 +-
 .../libharfbuzz/hb-ot-var-varc-table.hh       |   32 +
 .../native/libharfbuzz/hb-ot-vorg-table.hh    |    1 +
 .../native/libharfbuzz/hb-paint-extents.hh    |  168 +-
 .../share/native/libharfbuzz/hb-paint.h       |    2 +-
 .../native/libharfbuzz/hb-priority-queue.hh   |    5 +-
 .../share/native/libharfbuzz/hb-repacker.hh   |   70 +-
 .../share/native/libharfbuzz/hb-sanitize.hh   |    9 +-
 .../share/native/libharfbuzz/hb-serialize.hh  |   91 +-
 .../share/native/libharfbuzz/hb-set-digest.hh |  165 +-
 .../share/native/libharfbuzz/hb-set.hh        |   16 +-
 .../share/native/libharfbuzz/hb-shape-plan.cc |    2 +-
 .../share/native/libharfbuzz/hb-shape.h       |    2 +
 .../share/native/libharfbuzz/hb-style.cc      |    4 +-
 .../libharfbuzz/hb-subset-cff-common.hh       |   59 +-
 .../native/libharfbuzz/hb-subset-cff1.cc      |   57 +-
 .../native/libharfbuzz/hb-subset-cff2.cc      |   68 +-
 .../native/libharfbuzz/hb-subset-input.cc     |  264 +-
 .../libharfbuzz/hb-subset-instancer-iup.hh    |   37 +
 .../libharfbuzz/hb-subset-instancer-solver.cc |  109 +-
 .../libharfbuzz/hb-subset-instancer-solver.hh |   32 +-
 .../libharfbuzz/hb-subset-plan-member-list.hh |   27 +
 .../native/libharfbuzz/hb-subset-plan.cc      |  413 +-
 .../native/libharfbuzz/hb-subset-plan.hh      |   40 +-
 .../native/libharfbuzz/hb-subset-serialize.h  |   83 +
 .../share/native/libharfbuzz/hb-subset.cc     |   20 +-
 .../share/native/libharfbuzz/hb-subset.h      |   37 +-
 .../share/native/libharfbuzz/hb-ucd-table.hh  | 5976 +++++++++--------
 .../libharfbuzz/hb-unicode-emoji-table.hh     |    8 +-
 .../share/native/libharfbuzz/hb-utf.hh        |    6 +-
 .../share/native/libharfbuzz/hb-vector.hh     |  112 +-
 .../share/native/libharfbuzz/hb-version.h     |    8 +-
 .../share/native/libharfbuzz/hb.hh            |   18 +-
 193 files changed, 15663 insertions(+), 8640 deletions(-)
 create mode 100644 src/java.desktop/share/native/libharfbuzz/OT/Var/VARC/VARC.hh
 create mode 100644 src/java.desktop/share/native/libharfbuzz/OT/Var/VARC/coord-setter.hh
 delete mode 100644 src/java.desktop/share/native/libharfbuzz/OT/glyf/VarCompositeGlyph.hh
 delete mode 100644 src/java.desktop/share/native/libharfbuzz/OT/glyf/coord-setter.hh
 create mode 100644 src/java.desktop/share/native/libharfbuzz/hb-decycler.hh
 create mode 100644 src/java.desktop/share/native/libharfbuzz/hb-geometry.hh
 create mode 100644 src/java.desktop/share/native/libharfbuzz/hb-ot-var-varc-table.hh
 create mode 100644 src/java.desktop/share/native/libharfbuzz/hb-subset-instancer-iup.hh
 create mode 100644 src/java.desktop/share/native/libharfbuzz/hb-subset-serialize.h

diff --git a/make/modules/java.desktop/lib/ClientLibraries.gmk b/make/modules/java.desktop/lib/ClientLibraries.gmk
index 6599f655c10..520e108bced 100644
--- a/make/modules/java.desktop/lib/ClientLibraries.gmk
+++ b/make/modules/java.desktop/lib/ClientLibraries.gmk
@@ -331,7 +331,7 @@ else
 
   HARFBUZZ_DISABLED_WARNINGS_gcc := missing-field-initializers \
       strict-aliasing unused-result array-bounds parentheses \
-       unused-variable
+       unused-variable dangling-pointer
   # noexcept-type required for GCC 7 builds. Not required for GCC 8+.
   # expansion-to-defined required for GCC 9 builds. Not required for GCC 10+.
   # maybe-uninitialized required for GCC 8 builds. Not required for GCC 9+.
diff --git a/src/java.desktop/share/legal/harfbuzz.md b/src/java.desktop/share/legal/harfbuzz.md
index 3ae73d215b0..2d0a28ed310 100644
--- a/src/java.desktop/share/legal/harfbuzz.md
+++ b/src/java.desktop/share/legal/harfbuzz.md
@@ -1,4 +1,4 @@
-## Harfbuzz v8.2.2
+## Harfbuzz v10.4.0
 
 ### Harfbuzz License
 
@@ -8,14 +8,14 @@ HarfBuzz is licensed under the so-called "Old MIT" license.  Details follow.
 For parts of HarfBuzz that are licensed under different licenses see individual
 files names COPYING in subdirectories where applicable.
 
-Copyright © 2010-2023  Google, Inc.
+Copyright © 2010-2024  Google, Inc.
 Copyright © 2018-2020  Ebrahim Byagowi
 Copyright © 2004-2013  Red Hat, Inc.
 Copyright © 2019  Facebook, Inc.
 Copyright (C) 2012 Zilong Tan (eric.zltan@gmail.com)
 Copyright © 2007  Chris Wilson
 Copyright © 2018-2019 Adobe Inc.
-Copyright © 2006-2023 Behdad Esfahbod
+Copyright © 2006-2025 Behdad Esfahbod
 Copyright © 1998-2004  David Turner and Werner Lemberg
 Copyright © 2009  Keith Stribley
 Copyright © 2018  Khaled Hosny
@@ -54,7 +54,7 @@ exception is licensed with a slightly different MIT variant:
 The contents of this directory are licensed under the following terms:
 
 ---------------------------------
-The below license applies to the following files:
+The below applies to the following file(s):
 libharfbuzz/hb-ucd.cc
 
 Copyright (C) 2012 Grigori Goronzy <greg@kinoho.net>
@@ -72,13 +72,14 @@ ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 ---------------------------------
-The below license applies to the following files:
+The below applies to the following file(s):
 libharfbuzz/hb-unicode-emoji-table.hh
 
-© 2023 Unicode®, Inc.
+© 2024 Unicode®, Inc.
+
 Unicode and the Unicode Logo are registered trademarks of Unicode, Inc.
 in the U.S. and other countries.
-For terms of use, see https://www.unicode.org/terms_of_use.html
+For terms of use and license, see https://www.unicode.org/terms_of_use.html
 
 </pre>
 
diff --git a/src/java.desktop/share/native/libharfbuzz/OT/Color/CBDT/CBDT.hh b/src/java.desktop/share/native/libharfbuzz/OT/Color/CBDT/CBDT.hh
index d7b2b13e4d3..43a611a0058 100644
--- a/src/java.desktop/share/native/libharfbuzz/OT/Color/CBDT/CBDT.hh
+++ b/src/java.desktop/share/native/libharfbuzz/OT/Color/CBDT/CBDT.hh
@@ -204,6 +204,7 @@ struct IndexSubtable
   {
     TRACE_SANITIZE (this);
     if (!u.header.sanitize (c)) return_trace (false);
+    hb_barrier ();
     switch (u.header.indexFormat)
     {
     case 1: return_trace (u.format1.sanitize (c, glyph_count));
@@ -378,6 +379,7 @@ struct IndexSubtableRecord
   {
     TRACE_SANITIZE (this);
     return_trace (c->check_struct (this) &&
+                  hb_barrier () &&
                   firstGlyphIndex <= lastGlyphIndex &&
                   offsetToSubtable.sanitize (c, base, lastGlyphIndex - firstGlyphIndex + 1));
   }
@@ -635,6 +637,7 @@ struct BitmapSizeTable
   {
     TRACE_SANITIZE (this);
     return_trace (c->check_struct (this) &&
+                  hb_barrier () &&
                   indexSubtableArrayOffset.sanitize (c, base, numberOfIndexSubtables) &&
                   horizontal.sanitize (c) &&
                   vertical.sanitize (c));
@@ -738,7 +741,9 @@ struct CBLC
   {
     TRACE_SANITIZE (this);
     return_trace (c->check_struct (this) &&
+                  hb_barrier () &&
                   likely (version.major == 2 || version.major == 3) &&
+                  hb_barrier () &&
                   sizeTables.sanitize (c, this));
   }
 
@@ -936,10 +941,12 @@ struct CBDT
       }
     }
 
-    bool has_data () const { return cbdt.get_length (); }
+    bool has_data () const { return cbdt->version.major; }
 
     bool paint_glyph (hb_font_t *font, hb_codepoint_t glyph, hb_paint_funcs_t *funcs, void *data) const
     {
+      if (!has_data ()) return false;
+
       hb_glyph_extents_t extents;
       hb_glyph_extents_t pixel_extents;
       hb_blob_t *blob = reference_png (font, glyph);
@@ -975,6 +982,7 @@ struct CBDT
   {
     TRACE_SANITIZE (this);
     return_trace (c->check_struct (this) &&
+                  hb_barrier () &&
                   likely (version.major == 2 || version.major == 3));
   }
 
diff --git a/src/java.desktop/share/native/libharfbuzz/OT/Color/COLR/COLR.hh b/src/java.desktop/share/native/libharfbuzz/OT/Color/COLR/COLR.hh
index fb2c42a88f0..4d6272d05cb 100644
--- a/src/java.desktop/share/native/libharfbuzz/OT/Color/COLR/COLR.hh
+++ b/src/java.desktop/share/native/libharfbuzz/OT/Color/COLR/COLR.hh
@@ -29,11 +29,14 @@
 #define OT_COLOR_COLR_COLR_HH
 
 #include "../../../hb.hh"
+#include "../../../hb-decycler.hh"
 #include "../../../hb-open-type.hh"
 #include "../../../hb-ot-var-common.hh"
 #include "../../../hb-paint.hh"
 #include "../../../hb-paint-extents.hh"
 
+#include "../CPAL/CPAL.hh"
+
 /*
  * COLR -- Color
  * https://docs.microsoft.com/en-us/typography/opentype/spec/colr
@@ -66,13 +69,13 @@ public:
   hb_paint_funcs_t *funcs;
   void *data;
   hb_font_t *font;
-  unsigned int palette_index;
+  hb_array_t<const BGRAColor> palette;
   hb_color_t foreground;
-  VarStoreInstancer &instancer;
-  hb_map_t current_glyphs;
-  hb_map_t current_layers;
+  ItemVarStoreInstancer &instancer;
+  hb_decycler_t glyphs_decycler;
+  hb_decycler_t layers_decycler;
   int depth_left = HB_MAX_NESTING_LEVEL;
-  int edge_count = HB_COLRV1_MAX_EDGE_COUNT;
+  int edge_count = HB_MAX_GRAPH_EDGE_COUNT;
 
   hb_paint_context_t (const void *base_,
                       hb_paint_funcs_t *funcs_,
@@ -80,12 +83,16 @@ public:
                       hb_font_t *font_,
                       unsigned int palette_,
                       hb_color_t foreground_,
-                      VarStoreInstancer &instancer_) :
+                      ItemVarStoreInstancer &instancer_) :
     base (base_),
     funcs (funcs_),
     data (data_),
     font (font_),
-    palette_index (palette_),
+    palette (
+#ifndef HB_NO_COLOR
+             font->face->table.CPAL->get_palette_colors (palette_)
+#endif
+    ),
     foreground (foreground_),
     instancer (instancer_)
   { }
@@ -99,12 +106,7 @@ public:
     if (color_index != 0xffff)
     {
       if (!funcs->custom_palette_color (data, color_index, &color))
-      {
-        unsigned int clen = 1;
-        hb_face_t *face = hb_font_get_face (font);
-
-        hb_ot_color_palette_get_colors (face, palette_index, color_index, &clen, &color);
-      }
+        color = palette[color_index];
 
       *is_foreground = false;
     }
@@ -159,23 +161,35 @@ struct hb_colrv1_closure_context_t :
   void add_palette_index (unsigned palette_index)
   { palette_indices->add (palette_index); }
 
+  void add_var_idxes (unsigned first_var_idx, unsigned num_idxes)
+  {
+    if (!num_idxes || first_var_idx == VarIdx::NO_VARIATION) return;
+    variation_indices->add_range (first_var_idx, first_var_idx + num_idxes - 1);
+  }
+
   public:
   const void *base;
   hb_set_t visited_paint;
   hb_set_t *glyphs;
   hb_set_t *layer_indices;
   hb_set_t *palette_indices;
+  hb_set_t *variation_indices;
+  unsigned num_var_idxes;
   unsigned nesting_level_left;
 
   hb_colrv1_closure_context_t (const void *base_,
                                hb_set_t *glyphs_,
                                hb_set_t *layer_indices_,
                                hb_set_t *palette_indices_,
+                               hb_set_t *variation_indices_,
+                               unsigned num_var_idxes_ = 1,
                                unsigned nesting_level_left_ = HB_MAX_NESTING_LEVEL) :
                           base (base_),
                           glyphs (glyphs_),
                           layer_indices (layer_indices_),
                           palette_indices (palette_indices_),
+                          variation_indices (variation_indices_),
+                          num_var_idxes (num_var_idxes_),
                           nesting_level_left (nesting_level_left_)
   {}
 };
@@ -242,18 +256,33 @@ struct Variable
   }
 
   void closurev1 (hb_colrv1_closure_context_t* c) const
-  { value.closurev1 (c); }
+  {
+    c->num_var_idxes = 0;
+    // update c->num_var_idxes during value closure
+    value.closurev1 (c);
+    c->add_var_idxes (varIdxBase, c->num_var_idxes);
+  }
 
   bool subset (hb_subset_context_t *c,
-               const VarStoreInstancer &instancer) const
+               const ItemVarStoreInstancer &instancer) const
   {
     TRACE_SUBSET (this);
     if (!value.subset (c, instancer, varIdxBase)) return_trace (false);
     if (c->plan->all_axes_pinned)
       return_trace (true);
 
-    //TODO: update varIdxBase for partial-instancing
-    return_trace (c->serializer->embed (varIdxBase));
+    VarIdx new_varidx;
+    new_varidx = varIdxBase;
+    if (varIdxBase != VarIdx::NO_VARIATION)
+    {
+      hb_pair_t<unsigned, int> *new_varidx_delta;
+      if (!c->plan->colrv1_variation_idx_delta_map.has (varIdxBase, &new_varidx_delta))
+        return_trace (false);
+
+      new_varidx = hb_first (*new_varidx_delta);
+    }
+
+    return_trace (c->serializer->embed (new_varidx));
   }
 
   bool sanitize (hb_sanitize_context_t *c) const
@@ -270,7 +299,7 @@ struct Variable
 
   void get_color_stop (hb_paint_context_t *c,
                        hb_color_stop_t *stop,
-                       const VarStoreInstancer &instancer) const
+                       const ItemVarStoreInstancer &instancer) const
   {
     value.get_color_stop (c, stop, varIdxBase, instancer);
   }
@@ -305,7 +334,7 @@ struct NoVariable
   { value.closurev1 (c); }
 
   bool subset (hb_subset_context_t *c,
-               const VarStoreInstancer &instancer) const
+               const ItemVarStoreInstancer &instancer) const
   {
     TRACE_SUBSET (this);
     return_trace (value.subset (c, instancer, varIdxBase));
@@ -325,7 +354,7 @@ struct NoVariable
 
   void get_color_stop (hb_paint_context_t *c,
                        hb_color_stop_t *stop,
-                       const VarStoreInstancer &instancer) const
+                       const ItemVarStoreInstancer &instancer) const
   {
     value.get_color_stop (c, stop, VarIdx::NO_VARIATION, instancer);
   }
@@ -345,10 +374,13 @@ struct NoVariable
 struct ColorStop
 {
   void closurev1 (hb_colrv1_closure_context_t* c) const
-  { c->add_palette_index (paletteIndex); }
+  {
+    c->add_palette_index (paletteIndex);
+    c->num_var_idxes = 2;
+  }
 
   bool subset (hb_subset_context_t *c,
-               const VarStoreInstancer &instancer,
+               const ItemVarStoreInstancer &instancer,
                uint32_t varIdxBase) const
   {
     TRACE_SUBSET (this);
@@ -374,7 +406,7 @@ struct ColorStop
   void get_color_stop (hb_paint_context_t *c,
                        hb_color_stop_t *out,
                        uint32_t varIdx,
-                       const VarStoreInstancer &instancer) const
+                       const ItemVarStoreInstancer &instancer) const
   {
     out->offset = stopOffset.to_float(instancer (varIdx, 0));
     out->color = c->get_color (paletteIndex,
@@ -410,7 +442,7 @@ struct ColorLine
   }
 
   bool subset (hb_subset_context_t *c,
-               const VarStoreInstancer &instancer) const
+               const ItemVarStoreInstancer &instancer) const
   {
     TRACE_SUBSET (this);
     auto *out = c->serializer->start_embed (this);
@@ -439,7 +471,7 @@ struct ColorLine
                    unsigned int start,
                    unsigned int *count,
                    hb_color_stop_t *color_stops,
-                   const VarStoreInstancer &instancer) const
+                   const ItemVarStoreInstancer &instancer) const
   {
     unsigned int len = stops.len;
 
@@ -542,8 +574,11 @@ struct Affine2x3
     return_trace (c->check_struct (this));
   }
 
+  void closurev1 (hb_colrv1_closure_context_t* c) const
+  { c->num_var_idxes = 6; }
+
   bool subset (hb_subset_context_t *c,
-               const VarStoreInstancer &instancer,
+               const ItemVarStoreInstancer &instancer,
                uint32_t varIdxBase) const
   {
     TRACE_SUBSET (this);
@@ -588,7 +623,7 @@ struct PaintColrLayers
   void closurev1 (hb_colrv1_closure_context_t* c) const;
 
   bool subset (hb_subset_context_t *c,
-               const VarStoreInstancer &instancer HB_UNUSED) const
+               const ItemVarStoreInstancer &instancer HB_UNUSED) const
   {
     TRACE_SUBSET (this);
     auto *out = c->serializer->embed (this);
@@ -617,10 +652,13 @@ struct PaintColrLayers
 struct PaintSolid
 {
   void closurev1 (hb_colrv1_closure_context_t* c) const
-  { c->add_palette_index (paletteIndex); }
+  {
+    c->add_palette_index (paletteIndex);
+    c->num_var_idxes = 1;
+  }
 
   bool subset (hb_subset_context_t *c,
-               const VarStoreInstancer &instancer,
+               const ItemVarStoreInstancer &instancer,
                uint32_t varIdxBase) const
   {
     TRACE_SUBSET (this);
@@ -666,10 +704,13 @@ template <template<typename> class Var>
 struct PaintLinearGradient
 {
   void closurev1 (hb_colrv1_closure_context_t* c) const
-  { (this+colorLine).closurev1 (c); }
+  {
+    (this+colorLine).closurev1 (c);
+    c->num_var_idxes = 6;
+  }
 
   bool subset (hb_subset_context_t *c,
-               const VarStoreInstancer &instancer,
+               const ItemVarStoreInstancer &instancer,
                uint32_t varIdxBase) const
   {
     TRACE_SUBSET (this);
@@ -733,10 +774,13 @@ template <template<typename> class Var>
 struct PaintRadialGradient
 {
   void closurev1 (hb_colrv1_closure_context_t* c) const
-  { (this+colorLine).closurev1 (c); }
+  {
+    (this+colorLine).closurev1 (c);
+    c->num_var_idxes = 6;
+  }
 
   bool subset (hb_subset_context_t *c,
-               const VarStoreInstancer &instancer,
+               const ItemVarStoreInstancer &instancer,
                uint32_t varIdxBase) const
   {
     TRACE_SUBSET (this);
@@ -800,10 +844,13 @@ template <template<typename> class Var>
 struct PaintSweepGradient
 {
   void closurev1 (hb_colrv1_closure_context_t* c) const
-  { (this+colorLine).closurev1 (c); }
+  {
+    (this+colorLine).closurev1 (c);
+    c->num_var_idxes = 4;
+  }
 
   bool subset (hb_subset_context_t *c,
-               const VarStoreInstancer &instancer,
+               const ItemVarStoreInstancer &instancer,
                uint32_t varIdxBase) const
   {
     TRACE_SUBSET (this);
@@ -863,7 +910,7 @@ struct PaintGlyph
   void closurev1 (hb_colrv1_closure_context_t* c) const;
 
   bool subset (hb_subset_context_t *c,
-               const VarStoreInstancer &instancer) const
+               const ItemVarStoreInstancer &instancer) const
   {
     TRACE_SUBSET (this);
     auto *out = c->serializer->embed (this);
@@ -906,7 +953,7 @@ struct PaintColrGlyph
   void closurev1 (hb_colrv1_closure_context_t* c) const;
 
   bool subset (hb_subset_context_t *c,
-               const VarStoreInstancer &instancer HB_UNUSED) const
+               const ItemVarStoreInstancer &instancer HB_UNUSED) const
   {
     TRACE_SUBSET (this);
     auto *out = c->serializer->embed (this);
@@ -936,7 +983,7 @@ struct PaintTransform
   HB_INTERNAL void closurev1 (hb_colrv1_closure_context_t* c) const;
 
   bool subset (hb_subset_context_t *c,
-               const VarStoreInstancer &instancer) const
+               const ItemVarStoreInstancer &instancer) const
   {
     TRACE_SUBSET (this);
     auto *out = c->serializer->embed (this);
@@ -958,7 +1005,7 @@ struct PaintTransform
   void paint_glyph (hb_paint_context_t *c) const
   {
     TRACE_PAINT (this);
-    (this+transform).paint_glyph (c);
+    (this+transform).paint_glyph (c); // This does a push_transform()
     c->recurse (this+src);
     c->funcs->pop_transform (c->data);
   }
@@ -975,7 +1022,7 @@ struct PaintTranslate
   HB_INTERNAL void closurev1 (hb_colrv1_closure_context_t* c) const;
 
   bool subset (hb_subset_context_t *c,
-               const VarStoreInstancer &instancer,
+               const ItemVarStoreInstancer &instancer,
                uint32_t varIdxBase) const
   {
     TRACE_SUBSET (this);
@@ -1024,7 +1071,7 @@ struct PaintScale
   HB_INTERNAL void closurev1 (hb_colrv1_closure_context_t* c) const;
 
   bool subset (hb_subset_context_t *c,
-               const VarStoreInstancer &instancer,
+               const ItemVarStoreInstancer &instancer,
                uint32_t varIdxBase) const
   {
     TRACE_SUBSET (this);
@@ -1073,7 +1120,7 @@ struct PaintScaleAroundCenter
   HB_INTERNAL void closurev1 (hb_colrv1_closure_context_t* c) const;
 
   bool subset (hb_subset_context_t *c,
-               const VarStoreInstancer &instancer,
+               const ItemVarStoreInstancer &instancer,
                uint32_t varIdxBase) const
   {
     TRACE_SUBSET (this);
@@ -1132,7 +1179,7 @@ struct PaintScaleUniform
   HB_INTERNAL void closurev1 (hb_colrv1_closure_context_t* c) const;
 
   bool subset (hb_subset_context_t *c,
-               const VarStoreInstancer &instancer,
+               const ItemVarStoreInstancer &instancer,
                uint32_t varIdxBase) const
   {
     TRACE_SUBSET (this);
@@ -1176,7 +1223,7 @@ struct PaintScaleUniformAroundCenter
   HB_INTERNAL void closurev1 (hb_colrv1_closure_context_t* c) const;
 
   bool subset (hb_subset_context_t *c,
-               const VarStoreInstancer &instancer,
+               const ItemVarStoreInstancer &instancer,
                uint32_t varIdxBase) const
   {
     TRACE_SUBSET (this);
@@ -1232,7 +1279,7 @@ struct PaintRotate
   HB_INTERNAL void closurev1 (hb_colrv1_closure_context_t* c) const;
 
   bool subset (hb_subset_context_t *c,
-               const VarStoreInstancer &instancer,
+               const ItemVarStoreInstancer &instancer,
                uint32_t varIdxBase) const
   {
     TRACE_SUBSET (this);
@@ -1276,7 +1323,7 @@ struct PaintRotateAroundCenter
   HB_INTERNAL void closurev1 (hb_colrv1_closure_context_t* c) const;
 
   bool subset (hb_subset_context_t *c,
-               const VarStoreInstancer &instancer,
+               const ItemVarStoreInstancer &instancer,
                uint32_t varIdxBase) const
   {
     TRACE_SUBSET (this);
@@ -1332,7 +1379,7 @@ struct PaintSkew
   HB_INTERNAL void closurev1 (hb_colrv1_closure_context_t* c) const;
 
   bool subset (hb_subset_context_t *c,
-               const VarStoreInstancer &instancer,
+               const ItemVarStoreInstancer &instancer,
                uint32_t varIdxBase) const
   {
     TRACE_SUBSET (this);
@@ -1381,7 +1428,7 @@ struct PaintSkewAroundCenter
   HB_INTERNAL void closurev1 (hb_colrv1_closure_context_t* c) const;
 
   bool subset (hb_subset_context_t *c,
-               const VarStoreInstancer &instancer,
+               const ItemVarStoreInstancer &instancer,
                uint32_t varIdxBase) const
   {
     TRACE_SUBSET (this);
@@ -1440,7 +1487,7 @@ struct PaintComposite
   void closurev1 (hb_colrv1_closure_context_t* c) const;
 
   bool subset (hb_subset_context_t *c,
-               const VarStoreInstancer &instancer) const
+               const ItemVarStoreInstancer &instancer) const
   {
     TRACE_SUBSET (this);
     auto *out = c->serializer->embed (this);
@@ -1491,7 +1538,7 @@ struct ClipBoxFormat1
     return_trace (c->check_struct (this));
   }
 
-  void get_clip_box (ClipBoxData &clip_box, const VarStoreInstancer &instancer HB_UNUSED) const
+  void get_clip_box (ClipBoxData &clip_box, const ItemVarStoreInstancer &instancer HB_UNUSED) const
   {
     clip_box.xMin = xMin;
     clip_box.yMin = yMin;
@@ -1500,7 +1547,7 @@ struct ClipBoxFormat1
   }
 
   bool subset (hb_subset_context_t *c,
-               const VarStoreInstancer &instancer,
+               const ItemVarStoreInstancer &instancer,
                uint32_t varIdxBase) const
   {
     TRACE_SUBSET (this);
@@ -1533,7 +1580,7 @@ struct ClipBoxFormat1
 
 struct ClipBoxFormat2 : Variable<ClipBoxFormat1>
 {
-  void get_clip_box (ClipBoxData &clip_box, const VarStoreInstancer &instancer) const
+  void get_clip_box (ClipBoxData &clip_box, const ItemVarStoreInstancer &instancer) const
   {
     value.get_clip_box(clip_box, instancer);
     if (instancer)
@@ -1544,12 +1591,15 @@ struct ClipBoxFormat2 : Variable<ClipBoxFormat1>
       clip_box.yMax += roundf (instancer (varIdxBase, 3));
     }
   }
+
+  void closurev1 (hb_colrv1_closure_context_t* c) const
+  { c->variation_indices->add_range (varIdxBase, varIdxBase + 3); }
 };
 
 struct ClipBox
 {
   bool subset (hb_subset_context_t *c,
-               const VarStoreInstancer &instancer) const
+               const ItemVarStoreInstancer &instancer) const
   {
     TRACE_SUBSET (this);
     switch (u.format) {
@@ -1559,6 +1609,14 @@ struct ClipBox
     }
   }
 
+  void closurev1 (hb_colrv1_closure_context_t* c) const
+  {
+    switch (u.format) {
+    case 2: u.format2.closurev1 (c);
+    default:return;
+    }
+  }
+
   template <typename context_t, typename ...Ts>
   typename context_t::return_t dispatch (context_t *c, Ts&&... ds) const
   {
@@ -1572,7 +1630,7 @@ struct ClipBox
   }
 
   bool get_extents (hb_glyph_extents_t *extents,
-                    const VarStoreInstancer &instancer) const
+                    const ItemVarStoreInstancer &instancer) const
   {
     ClipBoxData clip_box;
     switch (u.format) {
@@ -1606,9 +1664,15 @@ struct ClipRecord
   int cmp (hb_codepoint_t g) const
   { return g < startGlyphID ? -1 : g <= endGlyphID ? 0 : +1; }
 
+  void closurev1 (hb_colrv1_closure_context_t* c, const void *base) const
+  {
+    if (!c->glyphs->intersects (startGlyphID, endGlyphID)) return;
+    (base+clipBox).closurev1 (c);
+  }
+
   bool subset (hb_subset_context_t *c,
                const void *base,
-               const VarStoreInstancer &instancer) const
+               const ItemVarStoreInstancer &instancer) const
   {
     TRACE_SUBSET (this);
     auto *out = c->serializer->embed (*this);
@@ -1625,7 +1689,7 @@ struct ClipRecord
 
   bool get_extents (hb_glyph_extents_t *extents,
                     const void *base,
-                    const VarStoreInstancer &instancer) const
+                    const ItemVarStoreInstancer &instancer) const
   {
     return (base+clipBox).get_extents (extents, instancer);
   }
@@ -1642,7 +1706,7 @@ DECLARE_NULL_NAMESPACE_BYTES (OT, ClipRecord);
 struct ClipList
 {
   unsigned serialize_clip_records (hb_subset_context_t *c,
-                                   const VarStoreInstancer &instancer,
+                                   const ItemVarStoreInstancer &instancer,
                                    const hb_set_t& gids,
                                    const hb_map_t& gid_offset_map) const
   {
@@ -1695,7 +1759,7 @@ struct ClipList
   }
 
   bool subset (hb_subset_context_t *c,
-               const VarStoreInstancer &instancer) const
+               const ItemVarStoreInstancer &instancer) const
   {
     TRACE_SUBSET (this);
     auto *out = c->serializer->start_embed (*this);
@@ -1735,7 +1799,7 @@ struct ClipList
   bool
   get_extents (hb_codepoint_t gid,
                hb_glyph_extents_t *extents,
-               const VarStoreInstancer &instancer) const
+               const ItemVarStoreInstancer &instancer) const
   {
     auto *rec = clips.as_array ().bsearch (gid);
     if (rec)
@@ -1855,7 +1919,7 @@ struct BaseGlyphPaintRecord
 
   bool serialize (hb_serialize_context_t *s, const hb_map_t* glyph_map,
                   const void* src_base, hb_subset_context_t *c,
-                  const VarStoreInstancer &instancer) const
+                  const ItemVarStoreInstancer &instancer) const
   {
     TRACE_SERIALIZE (this);
     auto *out = s->embed (this);
@@ -1884,7 +1948,7 @@ struct BaseGlyphPaintRecord
 struct BaseGlyphList : SortedArray32Of<BaseGlyphPaintRecord>
 {
   bool subset (hb_subset_context_t *c,
-               const VarStoreInstancer &instancer) const
+               const ItemVarStoreInstancer &instancer) const
   {
     TRACE_SUBSET (this);
     auto *out = c->serializer->start_embed (this);
@@ -1916,7 +1980,7 @@ struct LayerList : Array32OfOffset32To<Paint>
   { return this+(*this)[i]; }
 
   bool subset (hb_subset_context_t *c,
-               const VarStoreInstancer &instancer) const
+               const ItemVarStoreInstancer &instancer) const
   {
     TRACE_SUBSET (this);
     auto *out = c->serializer->start_embed (this);
@@ -1941,6 +2005,76 @@ struct LayerList : Array32OfOffset32To<Paint>
   }
 };
 
+struct delta_set_index_map_subset_plan_t
+{
+  unsigned get_inner_bit_count () const { return inner_bit_count; }
+  unsigned get_width ()           const { return ((outer_bit_count + inner_bit_count + 7) / 8); }
+  hb_array_t<const uint32_t> get_output_map () const { return output_map.as_array (); }
+
+  delta_set_index_map_subset_plan_t (const hb_map_t &new_deltaset_idx_varidx_map)
+  {
+    map_count = 0;
+    outer_bit_count = 0;
+    inner_bit_count = 1;
+    output_map.init ();
+
+    /* search backwards */
+    unsigned count = new_deltaset_idx_varidx_map.get_population ();
+    if (!count) return;
+
+    unsigned last_idx = (unsigned)-1;
+    unsigned last_varidx = (unsigned)-1;
+
+    for (unsigned i = count; i; i--)
+    {
+      unsigned delta_set_idx = i - 1;
+      unsigned var_idx = new_deltaset_idx_varidx_map.get (delta_set_idx);
+      if (i == count)
+      {
+        last_idx = delta_set_idx;
+        last_varidx = var_idx;
+        continue;
+      }
+      if (var_idx != last_varidx)
+        break;
+      last_idx = delta_set_idx;
+    }
+
+    map_count = last_idx + 1;
+  }
+
+  bool remap (const hb_map_t &new_deltaset_idx_varidx_map)
+  {
+    /* recalculate bit_count */
+    outer_bit_count = 1;
+    inner_bit_count = 1;
+
+    if (unlikely (!output_map.resize (map_count, false))) return false;
+
+    for (unsigned idx = 0; idx < map_count; idx++)
+    {
+      uint32_t *var_idx;
+      if (!new_deltaset_idx_varidx_map.has (idx, &var_idx)) return false;
+      output_map.arrayZ[idx] = *var_idx;
+
+      unsigned outer = (*var_idx) >> 16;
+      unsigned bit_count = (outer == 0) ? 1 : hb_bit_storage (outer);
+      outer_bit_count = hb_max (bit_count, outer_bit_count);
+
+      unsigned inner = (*var_idx) & 0xFFFF;
+      bit_count = (inner == 0) ? 1 : hb_bit_storage (inner);
+      inner_bit_count = hb_max (bit_count, inner_bit_count);
+    }
+    return true;
+  }
+
+  private:
+  unsigned map_count;
+  unsigned outer_bit_count;
+  unsigned inner_bit_count;
+  hb_vector_t<uint32_t> output_map;
+};
+
 struct COLR
 {
   static constexpr hb_tag_t tableTag = HB_OT_TAG_COLR;
@@ -1948,10 +2082,11 @@ struct COLR
   bool has_v0_data () const { return numBaseGlyphs; }
   bool has_v1_data () const
   {
-    if (version == 1)
-      return (this+baseGlyphList).len > 0;
+    if (version < 1)
+      return false;
+    hb_barrier ();
 
-    return false;
+    return (this+baseGlyphList).len > 0;
   }
 
   unsigned int get_glyph_layers (hb_codepoint_t       glyph,
@@ -1991,8 +2126,26 @@ struct COLR
 
     void closure_forV1 (hb_set_t *glyphset,
                         hb_set_t *layer_indices,
-                        hb_set_t *palette_indices) const
-    { colr->closure_forV1 (glyphset, layer_indices, palette_indices); }
+                        hb_set_t *palette_indices,
+                        hb_set_t *variation_indices,
+                        hb_set_t *delta_set_indices) const
+    { colr->closure_forV1 (glyphset, layer_indices, palette_indices, variation_indices, delta_set_indices); }
+
+    bool has_var_store () const
+    { return colr->has_var_store (); }
+
+    const ItemVariationStore &get_var_store () const
+    { return colr->get_var_store (); }
+    const ItemVariationStore *get_var_store_ptr () const
+    { return colr->get_var_store_ptr (); }
+
+    bool has_delta_set_index_map () const
+    { return colr->has_delta_set_index_map (); }
+
+    const DeltaSetIndexMap &get_delta_set_index_map () const
+    { return colr->get_delta_set_index_map (); }
+    const DeltaSetIndexMap *get_delta_set_index_map_ptr () const
+    { return colr->get_delta_set_index_map_ptr (); }
 
     private:
     hb_blob_ptr_t<COLR> colr;
@@ -2029,12 +2182,16 @@ struct COLR
 
   void closure_forV1 (hb_set_t *glyphset,
                       hb_set_t *layer_indices,
-                      hb_set_t *palette_indices) const
+                      hb_set_t *palette_indices,
+                      hb_set_t *variation_indices,
+                      hb_set_t *delta_set_indices) const
   {
-    if (version != 1) return;
+    if (version < 1) return;
+    hb_barrier ();
+
     hb_set_t visited_glyphs;
 
-    hb_colrv1_closure_context_t c (this, &visited_glyphs, layer_indices, palette_indices);
+    hb_colrv1_closure_context_t c (this, &visited_glyphs, layer_indices, palette_indices, variation_indices);
     const BaseGlyphList &baseglyph_paintrecords = this+baseGlyphList;
 
     for (const BaseGlyphPaintRecord &baseglyph_paintrecord: baseglyph_paintrecords.iter ())
@@ -2046,6 +2203,22 @@ struct COLR
       paint.dispatch (&c);
     }
     hb_set_union (glyphset, &visited_glyphs);
+
+    const ClipList &cliplist = this+clipList;
+    c.glyphs = glyphset;
+    for (const ClipRecord &clip_record : cliplist.clips.iter())
+      clip_record.closurev1 (&c, &cliplist);
+
+    // if a DeltaSetIndexMap is included, collected variation indices are
+    // actually delta set indices, we need to map them into variation indices
+    if (has_delta_set_index_map ())
+    {
+      const DeltaSetIndexMap &var_idx_map = this+varIdxMap;
+      delta_set_indices->set (*variation_indices);
+      variation_indices->clear ();
+      for (unsigned delta_set_idx : *delta_set_indices)
+        variation_indices->add (var_idx_map.map (delta_set_idx));
+    }
   }
 
   const LayerList& get_layerList () const
@@ -2054,14 +2227,37 @@ struct COLR
   const BaseGlyphList& get_baseglyphList () const
   { return (this+baseGlyphList); }
 
+  bool has_var_store () const
+  { return version >= 1 && hb_barrier () && varStore != 0; }
+
+  bool has_delta_set_index_map () const
+  { return version >= 1 && hb_barrier () && varIdxMap != 0; }
+
+  bool has_clip_list () const
+  { return version >= 1 && hb_barrier () && clipList != 0; }
+
+  const DeltaSetIndexMap &get_delta_set_index_map () const
+  { return has_delta_set_index_map () && hb_barrier () ? this+varIdxMap : Null (DeltaSetIndexMap); }
+  const DeltaSetIndexMap *get_delta_set_index_map_ptr () const
+  { return has_delta_set_index_map () && hb_barrier () ? &(this+varIdxMap) : nullptr; }
+
+  const ItemVariationStore &get_var_store () const
+  { return has_var_store () && hb_barrier () ? this+varStore : Null (ItemVariationStore); }
+  const ItemVariationStore *get_var_store_ptr () const
+  { return has_var_store () && hb_barrier () ? &(this+varStore) : nullptr; }
+
+  const ClipList &get_clip_list () const
+  { return has_clip_list () && hb_barrier () ? this+clipList : Null (ClipList); }
+
   bool sanitize (hb_sanitize_context_t *c) const
   {
     TRACE_SANITIZE (this);
     return_trace (c->check_struct (this) &&
+                  hb_barrier () &&
                   (this+baseGlyphsZ).sanitize (c, numBaseGlyphs) &&
                   (this+layersZ).sanitize (c, numLayers) &&
                   (version == 0 ||
-                   (version == 1 &&
+                   (hb_barrier () &&
                     baseGlyphList.sanitize (c, this) &&
                     layerList.sanitize (c, this) &&
                     clipList.sanitize (c, this) &&
@@ -2127,6 +2323,94 @@ struct COLR
     return record;
   }
 
+  bool downgrade_to_V0 (const hb_set_t &glyphset) const
+  {
+    //no more COLRv1 glyphs, downgrade to version 0
+    for (const BaseGlyphPaintRecord& _ : get_baseglyphList ())
+      if (glyphset.has (_.glyphId))
+        return false;
+
+    return true;
+  }
+
+  bool subset_varstore (hb_subset_context_t *c,
+                        COLR* out /* OUT */) const
+  {
+    TRACE_SUBSET (this);
+    if (!varStore || c->plan->all_axes_pinned ||
+        !c->plan->colrv1_variation_idx_delta_map)
+      return_trace (true);
+
+    const ItemVariationStore& var_store = this+varStore;
+    if (c->plan->normalized_coords)
+    {
+      item_variations_t item_vars;
+      /* turn off varstore optimization when varIdxMap is null, so we maintain
+       * original var_idx sequence */
+      bool optimize = (varIdxMap != 0) ? true : false;
+      if (!item_vars.instantiate (var_store, c->plan,
+                                  optimize, /* optimization */
+                                  optimize, /* use_no_variation_idx = false */
+                                  c->plan->colrv1_varstore_inner_maps.as_array ()))
+        return_trace (false);
+
+      /* do not serialize varStore if there's no variation data after
+       * instancing: region_list or var_data is empty */
+      if (item_vars.get_region_list () &&
+          item_vars.get_vardata_encodings () &&
+          !out->varStore.serialize_serialize (c->serializer,
+                                              item_vars.has_long_word (),
+                                              c->plan->axis_tags,
+                                              item_vars.get_region_list (),
+                                              item_vars.get_vardata_encodings ()))
+        return_trace (false);
+
+      /* if varstore is optimized, update colrv1_new_deltaset_idx_varidx_map in
+       * subset plan.
+       * If varstore is empty after instancing, varidx_map would be empty and
+       * all var_idxes will be updated to VarIdx::NO_VARIATION */
+      if (optimize)
+      {
+        const hb_map_t &varidx_map = item_vars.get_varidx_map ();
+        for (auto _ : c->plan->colrv1_new_deltaset_idx_varidx_map.iter_ref ())
+        {
+          uint32_t varidx = _.second;
+          uint32_t *new_varidx;
+          if (varidx_map.has (varidx, &new_varidx))
+            _.second = *new_varidx;
+          else
+            _.second = VarIdx::NO_VARIATION;
+        }
+      }
+    }
+    else
+    {
+      if (unlikely (!out->varStore.serialize_serialize (c->serializer,
+                                                        &var_store,
+                                                        c->plan->colrv1_varstore_inner_maps.as_array ())))
+        return_trace (false);
+    }
+
+    return_trace (true);
+  }
+
+  bool subset_delta_set_index_map (hb_subset_context_t *c,
+                                   COLR* out /* OUT */) const
+  {
+    TRACE_SUBSET (this);
+    if (!varIdxMap || c->plan->all_axes_pinned ||
+        !c->plan->colrv1_new_deltaset_idx_varidx_map)
+      return_trace (true);
+
+    const hb_map_t &deltaset_idx_varidx_map = c->plan->colrv1_new_deltaset_idx_varidx_map;
+    delta_set_index_map_subset_plan_t index_map_plan (deltaset_idx_varidx_map);
+
+    if (unlikely (!index_map_plan.remap (deltaset_idx_varidx_map)))
+      return_trace (false);
+
+    return_trace (out->varIdxMap.serialize_serialize (c->serializer, index_map_plan));
+  }
+
   bool subset (hb_subset_context_t *c) const
   {
     TRACE_SUBSET (this);
@@ -2195,34 +2479,30 @@ struct COLR
     auto *colr_prime = c->serializer->start_embed<COLR> ();
     if (unlikely (!c->serializer->extend_min (colr_prime)))  return_trace (false);
 
-    if (version == 0)
-    return_trace (colr_prime->serialize_V0 (c->serializer, version, base_it, layer_it));
+    if (version == 0 || downgrade_to_V0 (glyphset))
+      return_trace (colr_prime->serialize_V0 (c->serializer, 0, base_it, layer_it));
 
-    auto snap = c->serializer->snapshot ();
+    hb_barrier ();
+
+    //start version 1
     if (!c->serializer->allocate_size<void> (5 * HBUINT32::static_size)) return_trace (false);
+    if (!colr_prime->serialize_V0 (c->serializer, version, base_it, layer_it)) return_trace (false);
 
-    VarStoreInstancer instancer (varStore ? &(this+varStore) : nullptr,
-                                 varIdxMap ? &(this+varIdxMap) : nullptr,
-                                 c->plan->normalized_coords.as_array ());
+    /* subset ItemVariationStore first, cause varidx_map needs to be updated
+     * after instancing */
+    if (!subset_varstore (c, colr_prime)) return_trace (false);
+
+    ItemVarStoreInstancer instancer (get_var_store_ptr (),
+                                     get_delta_set_index_map_ptr (),
+                                     c->plan->normalized_coords.as_array ());
 
     if (!colr_prime->baseGlyphList.serialize_subset (c, baseGlyphList, this, instancer))
-    {
-      if (c->serializer->in_error ()) return_trace (false);
-      //no more COLRv1 glyphs: downgrade to version 0
-      c->serializer->revert (snap);
-      return_trace (colr_prime->serialize_V0 (c->serializer, 0, base_it, layer_it));
-    }
-
-    if (!colr_prime->serialize_V0 (c->serializer, version, base_it, layer_it)) return_trace (false);
+      return_trace (false);
 
     colr_prime->layerList.serialize_subset (c, layerList, this, instancer);
     colr_prime->clipList.serialize_subset (c, clipList, this, instancer);
-    if (!varStore || c->plan->all_axes_pinned)
-      return_trace (true);
 
-    colr_prime->varIdxMap.serialize_copy (c->serializer, varIdxMap, this);
-    colr_prime->varStore.serialize_copy (c->serializer, varStore, this);
-    return_trace (true);
+    return_trace (subset_delta_set_index_map (c, colr_prime));
   }
 
   const Paint *get_base_glyph_paint (hb_codepoint_t glyph) const
@@ -2242,12 +2522,10 @@ struct COLR
   bool
   get_extents (hb_font_t *font, hb_codepoint_t glyph, hb_glyph_extents_t *extents) const
   {
-    if (version != 1)
-      return false;
 
-    VarStoreInstancer instancer (&(this+varStore),
-                                 &(this+varIdxMap),
-                                 hb_array (font->coords, font->num_coords));
+    ItemVarStoreInstancer instancer (get_var_store_ptr (),
+                                     get_delta_set_index_map_ptr (),
+                                     hb_array (font->coords, font->num_coords));
 
     if (get_clip (glyph, extents, instancer))
     {
@@ -2282,8 +2560,10 @@ struct COLR
   bool
   has_paint_for_glyph (hb_codepoint_t glyph) const
   {
-    if (version == 1)
+    if (version >= 1)
     {
+      hb_barrier ();
+
       const Paint *paint = get_base_glyph_paint (glyph);
 
       return paint != nullptr;
@@ -2294,9 +2574,9 @@ struct COLR
 
   bool get_clip (hb_codepoint_t glyph,
                  hb_glyph_extents_t *extents,
-                 const VarStoreInstancer instancer) const
+                 const ItemVarStoreInstancer instancer) const
   {
-    return (this+clipList).get_extents (glyph,
+    return get_clip_list ().get_extents (glyph,
                                         extents,
                                         instancer);
   }
@@ -2305,23 +2585,23 @@ struct COLR
   bool
   paint_glyph (hb_font_t *font, hb_codepoint_t glyph, hb_paint_funcs_t *funcs, void *data, unsigned int palette_index, hb_color_t foreground, bool clip = true) const
   {
-    VarStoreInstancer instancer (&(this+varStore),
-                                 &(this+varIdxMap),
-                                 hb_array (font->coords, font->num_coords));
+    ItemVarStoreInstancer instancer (get_var_store_ptr (),
+                                     get_delta_set_index_map_ptr (),
+                                     hb_array (font->coords, font->num_coords));
     hb_paint_context_t c (this, funcs, data, font, palette_index, foreground, instancer);
-    c.current_glyphs.add (glyph);
 
-    if (version == 1)
+    hb_decycler_node_t node (c.glyphs_decycler);
+    node.visit (glyph);
+
+    if (version >= 1)
     {
+      hb_barrier ();
+
       const Paint *paint = get_base_glyph_paint (glyph);
       if (paint)
       {
         // COLRv1 glyph
 
-        VarStoreInstancer instancer (&(this+varStore),
-                                     &(this+varIdxMap),
-                                     hb_array (font->coords, font->num_coords));
-
         bool is_bounded = true;
         if (clip)
         {
@@ -2404,7 +2684,7 @@ struct COLR
   Offset32To<LayerList>                 layerList;
   Offset32To<ClipList>                  clipList;   // Offset to ClipList table (may be NULL)
   Offset32To<DeltaSetIndexMap>          varIdxMap;  // Offset to DeltaSetIndexMap table (may be NULL)
-  Offset32To<VariationStore>            varStore;
+  Offset32To<ItemVariationStore>        varStore;
   public:
   DEFINE_SIZE_MIN (14);
 };
@@ -2427,19 +2707,16 @@ void PaintColrLayers::paint_glyph (hb_paint_context_t *c) const
 {
   TRACE_PAINT (this);
   const LayerList &paint_offset_lists = c->get_colr_table ()->get_layerList ();
+  hb_decycler_node_t node (c->layers_decycler);
   for (unsigned i = firstLayerIndex; i < firstLayerIndex + numLayers; i++)
   {
-    if (unlikely (c->current_layers.has (i)))
-      continue;
-
-    c->current_layers.add (i);
+    if (unlikely (!node.visit (i)))
+      return;
 
     const Paint &paint = paint_offset_lists.get_paint (i);
     c->funcs->push_group (c->data);
     c->recurse (paint);
     c->funcs->pop_group (c->data, HB_PAINT_COMPOSITE_MODE_SRC_OVER);
-
-    c->current_layers.del (i);
   }
 }
 
@@ -2447,16 +2724,14 @@ void PaintColrGlyph::paint_glyph (hb_paint_context_t *c) const
 {
   TRACE_PAINT (this);
 
-  if (unlikely (c->current_glyphs.has (gid)))
+  hb_decycler_node_t node (c->glyphs_decycler);
+  if (unlikely (!node.visit (gid)))
     return;
 
-  c->current_glyphs.add (gid);
-
   c->funcs->push_inverse_root_transform (c->data, c->font);
   if (c->funcs->color_glyph (c->data, gid, c->font))
   {
     c->funcs->pop_transform (c->data);
-    c->current_glyphs.del (gid);
     return;
   }
   c->funcs->pop_transform (c->data);
@@ -2479,8 +2754,6 @@ void PaintColrGlyph::paint_glyph (hb_paint_context_t *c) const
 
   if (has_clip_box)
     c->funcs->pop_clip (c->data);
-
-  c->current_glyphs.del (gid);
 }
 
 } /* namespace OT */
diff --git a/src/java.desktop/share/native/libharfbuzz/OT/Color/COLR/colrv1-closure.hh b/src/java.desktop/share/native/libharfbuzz/OT/Color/COLR/colrv1-closure.hh
index 705863d4ade..9ed0aa5632a 100644
--- a/src/java.desktop/share/native/libharfbuzz/OT/Color/COLR/colrv1-closure.hh
+++ b/src/java.desktop/share/native/libharfbuzz/OT/Color/COLR/colrv1-closure.hh
@@ -66,34 +66,64 @@ HB_INTERNAL void PaintColrGlyph::closurev1 (hb_colrv1_closure_context_t* c) cons
 
 template <template<typename> class Var>
 HB_INTERNAL void PaintTransform<Var>::closurev1 (hb_colrv1_closure_context_t* c) const
-{ (this+src).dispatch (c); }
+{
+  (this+src).dispatch (c);
+  (this+transform).closurev1 (c);
+}
 
 HB_INTERNAL void PaintTranslate::closurev1 (hb_colrv1_closure_context_t* c) const
-{ (this+src).dispatch (c); }
+{
+  (this+src).dispatch (c);
+  c->num_var_idxes = 2;
+}
 
 HB_INTERNAL void PaintScale::closurev1 (hb_colrv1_closure_context_t* c) const
-{ (this+src).dispatch (c); }
+{
+  (this+src).dispatch (c);
+  c->num_var_idxes = 2;
+}
 
 HB_INTERNAL void PaintScaleAroundCenter::closurev1 (hb_colrv1_closure_context_t* c) const
-{ (this+src).dispatch (c); }
+{
+  (this+src).dispatch (c);
+  c->num_var_idxes = 4;
+}
 
 HB_INTERNAL void PaintScaleUniform::closurev1 (hb_colrv1_closure_context_t* c) const
-{ (this+src).dispatch (c); }
+{
+  (this+src).dispatch (c);
+  c->num_var_idxes = 1;
+}
 
 HB_INTERNAL void PaintScaleUniformAroundCenter::closurev1 (hb_colrv1_closure_context_t* c) const
-{ (this+src).dispatch (c); }
+{
+  (this+src).dispatch (c);
+  c->num_var_idxes = 3;
+}
 
 HB_INTERNAL void PaintRotate::closurev1 (hb_colrv1_closure_context_t* c) const
-{ (this+src).dispatch (c); }
+{
+  (this+src).dispatch (c);
+  c->num_var_idxes = 1;
+}
 
 HB_INTERNAL void PaintRotateAroundCenter::closurev1 (hb_colrv1_closure_context_t* c) const
-{ (this+src).dispatch (c); }
+{
+  (this+src).dispatch (c);
+  c->num_var_idxes = 3;
+}
 
 HB_INTERNAL void PaintSkew::closurev1 (hb_colrv1_closure_context_t* c) const
-{ (this+src).dispatch (c); }
+{
+  (this+src).dispatch (c);
+  c->num_var_idxes = 2;
+}
 
 HB_INTERNAL void PaintSkewAroundCenter::closurev1 (hb_colrv1_closure_context_t* c) const
-{ (this+src).dispatch (c); }
+{
+  (this+src).dispatch (c);
+  c->num_var_idxes = 4;
+}
 
 HB_INTERNAL void PaintComposite::closurev1 (hb_colrv1_closure_context_t* c) const
 {
diff --git a/src/java.desktop/share/native/libharfbuzz/OT/Color/CPAL/CPAL.hh b/src/java.desktop/share/native/libharfbuzz/OT/Color/CPAL/CPAL.hh
index ed8f5957e96..51fc1b52af4 100644
--- a/src/java.desktop/share/native/libharfbuzz/OT/Color/CPAL/CPAL.hh
+++ b/src/java.desktop/share/native/libharfbuzz/OT/Color/CPAL/CPAL.hh
@@ -187,6 +187,14 @@ struct CPAL
   hb_ot_name_id_t get_color_name_id (unsigned int color_index) const
   { return v1 ().get_color_name_id (this, color_index, numColors); }
 
+  hb_array_t<const BGRAColor> get_palette_colors (unsigned int palette_index) const
+  {
+    if (unlikely (palette_index >= numPalettes))
+      return hb_array_t<const BGRAColor> ();
+    unsigned int start_index = colorRecordIndicesZ[palette_index];
+    hb_array_t<const BGRAColor> all_colors ((this+colorRecordsZ).arrayZ, numColorRecords);
+    return all_colors.sub_array (start_index, numColors);
+  }
   unsigned int get_palette_colors (unsigned int  palette_index,
                                    unsigned int  start_offset,
                                    unsigned int *color_count, /* IN/OUT.  May be NULL. */
@@ -214,13 +222,17 @@ struct CPAL
                          hb_set_t *nameids_to_retain /* OUT */) const
   {
     if (version == 1)
+    {
+      hb_barrier ();
       v1 ().collect_name_ids (this, numPalettes, numColors, color_index_map, nameids_to_retain);
+    }
   }
 
   private:
   const CPALV1Tail& v1 () const
   {
     if (version == 0) return Null (CPALV1Tail);
+    hb_barrier ();
     return StructAfter<CPALV1Tail> (*this);
   }
 
@@ -312,7 +324,10 @@ struct CPAL
       return_trace (false);
 
     if (version == 1)
+    {
+      hb_barrier ();
       return_trace (v1 ().serialize (c->serializer, numPalettes, numColors, this, color_index_map));
+    }
 
     return_trace (true);
   }
@@ -321,6 +336,7 @@ struct CPAL
   {
     TRACE_SANITIZE (this);
     return_trace (c->check_struct (this) &&
+                  hb_barrier () &&
                   (this+colorRecordsZ).sanitize (c, numColorRecords) &&
                   colorRecordIndicesZ.sanitize (c, numPalettes) &&
                   (version == 0 || v1 ().sanitize (c, this, numPalettes, numColors)));
diff --git a/src/java.desktop/share/native/libharfbuzz/OT/Color/sbix/sbix.hh b/src/java.desktop/share/native/libharfbuzz/OT/Color/sbix/sbix.hh
index 20b06ab13e3..e95d8c13a44 100644
--- a/src/java.desktop/share/native/libharfbuzz/OT/Color/sbix/sbix.hh
+++ b/src/java.desktop/share/native/libharfbuzz/OT/Color/sbix/sbix.hh
@@ -368,6 +368,7 @@ struct sbix
   {
     TRACE_SANITIZE (this);
     return_trace (likely (c->check_struct (this) &&
+                          hb_barrier () &&
                           version >= 1 &&
                           strikes.sanitize (c, this)));
   }
diff --git a/src/java.desktop/share/native/libharfbuzz/OT/Color/svg/svg.hh b/src/java.desktop/share/native/libharfbuzz/OT/Color/svg/svg.hh
index c8ff6ab743e..9f676f9689e 100644
--- a/src/java.desktop/share/native/libharfbuzz/OT/Color/svg/svg.hh
+++ b/src/java.desktop/share/native/libharfbuzz/OT/Color/svg/svg.hh
@@ -56,6 +56,7 @@ struct SVGDocumentIndexEntry
   {
     TRACE_SANITIZE (this);
     return_trace (c->check_struct (this) &&
+                  hb_barrier () &&
                   svgDoc.sanitize (c, base, svgDocLength));
   }
 
diff --git a/src/java.desktop/share/native/libharfbuzz/OT/Layout/Common/Coverage.hh b/src/java.desktop/share/native/libharfbuzz/OT/Layout/Common/Coverage.hh
index 257b2a3361a..35d73c7b858 100644
--- a/src/java.desktop/share/native/libharfbuzz/OT/Layout/Common/Coverage.hh
+++ b/src/java.desktop/share/native/libharfbuzz/OT/Layout/Common/Coverage.hh
@@ -64,6 +64,7 @@ struct Coverage
   {
     TRACE_SANITIZE (this);
     if (!u.format.sanitize (c)) return_trace (false);
+    hb_barrier ();
     switch (u.format)
     {
     case 1: return_trace (u.format1.sanitize (c));
@@ -95,6 +96,15 @@ struct Coverage
     default:return NOT_COVERED;
     }
   }
+  unsigned int get_coverage (hb_codepoint_t glyph_id,
+                             hb_ot_lookup_cache_t *cache) const
+  {
+    unsigned coverage;
+    if (cache && cache->get (glyph_id, &coverage)) return coverage;
+    coverage = get_coverage (glyph_id);
+    if (cache) cache->set (glyph_id, coverage);
+    return coverage;
+  }
 
   unsigned get_population () const
   {
@@ -200,6 +210,19 @@ struct Coverage
     }
   }
 
+  unsigned cost () const
+  {
+    switch (u.format) {
+    case 1: hb_barrier (); return u.format1.cost ();
+    case 2: hb_barrier (); return u.format2.cost ();
+#ifndef HB_NO_BEYOND_64K
+    case 3: hb_barrier (); return u.format3.cost ();
+    case 4: hb_barrier (); return u.format4.cost ();
+#endif
+    default:return 0u;
+    }
+  }
+
   /* Might return false if array looks unsorted.
    * Used for faster rejection of corrupt data. */
   template <typename set_t>
diff --git a/src/java.desktop/share/native/libharfbuzz/OT/Layout/Common/CoverageFormat1.hh b/src/java.desktop/share/native/libharfbuzz/OT/Layout/Common/CoverageFormat1.hh
index 995f1ebdbda..4a925763bd7 100644
--- a/src/java.desktop/share/native/libharfbuzz/OT/Layout/Common/CoverageFormat1.hh
+++ b/src/java.desktop/share/native/libharfbuzz/OT/Layout/Common/CoverageFormat1.hh
@@ -103,6 +103,8 @@ struct CoverageFormat1_3
         intersect_glyphs << glyphArray[i];
   }
 
+  unsigned cost () const { return hb_bit_storage ((unsigned) glyphArray.len); /* bsearch cost */ }
+
   template <typename set_t>
   bool collect_coverage (set_t *glyphs) const
   { return glyphs->add_sorted_array (glyphArray.as_array ()); }
diff --git a/src/java.desktop/share/native/libharfbuzz/OT/Layout/Common/CoverageFormat2.hh b/src/java.desktop/share/native/libharfbuzz/OT/Layout/Common/CoverageFormat2.hh
index d47c7eea992..247b7274b14 100644
--- a/src/java.desktop/share/native/libharfbuzz/OT/Layout/Common/CoverageFormat2.hh
+++ b/src/java.desktop/share/native/libharfbuzz/OT/Layout/Common/CoverageFormat2.hh
@@ -157,6 +157,8 @@ struct CoverageFormat2_4
     }
   }
 
+  unsigned cost () const { return hb_bit_storage ((unsigned) rangeRecord.len); /* bsearch cost */ }
+
   template <typename set_t>
   bool collect_coverage (set_t *glyphs) const
   {
diff --git a/src/java.desktop/share/native/libharfbuzz/OT/Layout/GDEF/GDEF.hh b/src/java.desktop/share/native/libharfbuzz/OT/Layout/GDEF/GDEF.hh
index 98543f56c3b..542480d2dd0 100644
--- a/src/java.desktop/share/native/libharfbuzz/OT/Layout/GDEF/GDEF.hh
+++ b/src/java.desktop/share/native/libharfbuzz/OT/Layout/GDEF/GDEF.hh
@@ -189,7 +189,7 @@ struct CaretValueFormat3
   friend struct CaretValue;
 
   hb_position_t get_caret_value (hb_font_t *font, hb_direction_t direction,
-                                 const VariationStore &var_store) const
+                                 const ItemVariationStore &var_store) const
   {
     return HB_DIRECTION_IS_HORIZONTAL (direction) ?
            font->em_scale_x (coordinate) + (this+deviceTable).get_x_delta (font, var_store) :
@@ -251,7 +251,7 @@ struct CaretValue
   hb_position_t get_caret_value (hb_font_t *font,
                                  hb_direction_t direction,
                                  hb_codepoint_t glyph_id,
-                                 const VariationStore &var_store) const
+                                 const ItemVariationStore &var_store) const
   {
     switch (u.format) {
     case 1: return u.format1.get_caret_value (font, direction);
@@ -291,6 +291,7 @@ struct CaretValue
   {
     TRACE_SANITIZE (this);
     if (!u.format.sanitize (c)) return_trace (false);
+    hb_barrier ();
     switch (u.format) {
     case 1: return_trace (u.format1.sanitize (c));
     case 2: return_trace (u.format2.sanitize (c));
@@ -315,7 +316,7 @@ struct LigGlyph
   unsigned get_lig_carets (hb_font_t            *font,
                            hb_direction_t        direction,
                            hb_codepoint_t        glyph_id,
-                           const VariationStore &var_store,
+                           const ItemVariationStore &var_store,
                            unsigned              start_offset,
                            unsigned             *caret_count /* IN/OUT */,
                            hb_position_t        *caret_array /* OUT */) const
@@ -371,7 +372,7 @@ struct LigCaretList
   unsigned int get_lig_carets (hb_font_t *font,
                                hb_direction_t direction,
                                hb_codepoint_t glyph_id,
-                               const VariationStore &var_store,
+                               const ItemVariationStore &var_store,
                                unsigned int start_offset,
                                unsigned int *caret_count /* IN/OUT */,
                                hb_position_t *caret_array /* OUT */) const
@@ -441,6 +442,20 @@ struct MarkGlyphSetsFormat1
   bool covers (unsigned int set_index, hb_codepoint_t glyph_id) const
   { return (this+coverage[set_index]).get_coverage (glyph_id) != NOT_COVERED; }
 
+  void collect_used_mark_sets (const hb_set_t& glyph_set,
+                               hb_set_t& used_mark_sets /* OUT */) const
+  {
+    unsigned i = 0;
+    for (const auto &offset : coverage)
+     {
+       const auto &cov = this+offset;
+       if (cov.intersects (&glyph_set))
+         used_mark_sets.add (i);
+
+       i++;
+     }
+  }
+
   template <typename set_t>
   void collect_coverage (hb_vector_t<set_t> &sets) const
   {
@@ -461,6 +476,7 @@ struct MarkGlyphSetsFormat1
     bool ret = true;
     for (const Offset32To<Coverage>& offset : coverage.iter ())
     {
+      auto snap = c->serializer->snapshot ();
       auto *o = out->coverage.serialize_append (c->serializer);
       if (unlikely (!o))
       {
@@ -468,11 +484,17 @@ struct MarkGlyphSetsFormat1
         break;
       }
 
-      //not using o->serialize_subset (c, offset, this, out) here because
-      //OTS doesn't allow null offset.
-      //See issue: https://github.com/khaledhosny/ots/issues/172
+      //skip empty coverage
       c->serializer->push ();
-      c->dispatch (this+offset);
+      bool res = false;
+      if (offset) res = c->dispatch (this+offset);
+      if (!res)
+      {
+        c->serializer->pop_discard ();
+        c->serializer->revert (snap);
+        (out->coverage.len)--;
+        continue;
+      }
       c->serializer->add_link (*o, c->serializer->pop_pack ());
     }
 
@@ -513,6 +535,15 @@ struct MarkGlyphSets
     }
   }
 
+  void collect_used_mark_sets (const hb_set_t& glyph_set,
+                               hb_set_t& used_mark_sets /* OUT */) const
+  {
+    switch (u.format) {
+    case 1: u.format1.collect_used_mark_sets (glyph_set, used_mark_sets); return;
+    default:return;
+    }
+  }
+
   bool subset (hb_subset_context_t *c) const
   {
     TRACE_SUBSET (this);
@@ -526,6 +557,7 @@ struct MarkGlyphSets
   {
     TRACE_SANITIZE (this);
     if (!u.format.sanitize (c)) return_trace (false);
+    hb_barrier ();
     switch (u.format) {
     case 1: return_trace (u.format1.sanitize (c));
     default:return_trace (true);
@@ -577,7 +609,7 @@ struct GDEFVersion1_2
                                          * definitions--from beginning of GDEF
                                          * header (may be NULL).  Introduced
                                          * in version 0x00010002. */
-  Offset32To<VariationStore>
+  Offset32To<ItemVariationStore>
                 varStore;               /* Offset to the table of Item Variation
                                          * Store--from beginning of GDEF
                                          * header (may be NULL).  Introduced
@@ -600,8 +632,9 @@ struct GDEFVersion1_2
                   attachList.sanitize (c, this) &&
                   ligCaretList.sanitize (c, this) &&
                   markAttachClassDef.sanitize (c, this) &&
-                  (version.to_int () < 0x00010002u || markGlyphSetsDef.sanitize (c, this)) &&
-                  (version.to_int () < 0x00010003u || varStore.sanitize (c, this)));
+                  hb_barrier () &&
+                  ((version.to_int () < 0x00010002u && hb_barrier ()) || markGlyphSetsDef.sanitize (c, this)) &&
+                  ((version.to_int () < 0x00010003u && hb_barrier ()) || varStore.sanitize (c, this)));
   }
 
   static void remap_varidx_after_instantiation (const hb_map_t& varidx_map,
@@ -627,23 +660,23 @@ struct GDEFVersion1_2
   bool subset (hb_subset_context_t *c) const
   {
     TRACE_SUBSET (this);
-    auto *out = c->serializer->embed (*this);
-    if (unlikely (!out)) return_trace (false);
+    auto *out = c->serializer->start_embed (*this);
+    if (unlikely (!c->serializer->extend_min (out))) return_trace (false);
 
-    bool subset_glyphclassdef = out->glyphClassDef.serialize_subset (c, glyphClassDef, this, nullptr, false, true);
-    bool subset_attachlist = out->attachList.serialize_subset (c, attachList, this);
-    bool subset_ligcaretlist = out->ligCaretList.serialize_subset (c, ligCaretList, this);
-    bool subset_markattachclassdef = out->markAttachClassDef.serialize_subset (c, markAttachClassDef, this, nullptr, false, true);
-
-    bool subset_markglyphsetsdef = false;
-    if (version.to_int () >= 0x00010002u)
-    {
-      subset_markglyphsetsdef = out->markGlyphSetsDef.serialize_subset (c, markGlyphSetsDef, this);
-    }
+    // Push var store first (if it's needed) so that it's last in the
+    // serialization order. Some font consumers assume that varstore runs to
+    // the end of the GDEF table.
+    // See: https://github.com/harfbuzz/harfbuzz/issues/4636
+    auto snapshot_version0 = c->serializer->snapshot ();
+    if (unlikely (version.to_int () >= 0x00010002u && hb_barrier () && !c->serializer->embed (markGlyphSetsDef)))
+      return_trace (false);
 
     bool subset_varstore = false;
-    if (version.to_int () >= 0x00010003u)
+    unsigned varstore_index = (unsigned) -1;
+    auto snapshot_version2 = c->serializer->snapshot ();
+    if (version.to_int () >= 0x00010003u && hb_barrier ())
     {
+      if (unlikely (!c->serializer->embed (varStore))) return_trace (false);
       if (c->plan->all_axes_pinned)
         out->varStore = 0;
       else if (c->plan->normalized_coords)
@@ -652,27 +685,56 @@ struct GDEFVersion1_2
         {
           item_variations_t item_vars;
           if (item_vars.instantiate (this+varStore, c->plan, true, true,
-                                     c->plan->gdef_varstore_inner_maps.as_array ()))
+                                     c->plan->gdef_varstore_inner_maps.as_array ())) {
             subset_varstore = out->varStore.serialize_serialize (c->serializer,
                                                                  item_vars.has_long_word (),
                                                                  c->plan->axis_tags,
                                                                  item_vars.get_region_list (),
                                                                  item_vars.get_vardata_encodings ());
+            varstore_index = c->serializer->last_added_child_index();
+          }
           remap_varidx_after_instantiation (item_vars.get_varidx_map (),
                                             c->plan->layout_variation_idx_delta_map);
         }
       }
       else
+      {
         subset_varstore = out->varStore.serialize_subset (c, varStore, this, c->plan->gdef_varstore_inner_maps.as_array ());
+        varstore_index = c->serializer->last_added_child_index();
+      }
+    }
+
+    out->version.major = version.major;
+    out->version.minor = version.minor;
+
+    if (!subset_varstore && version.to_int () >= 0x00010002u) {
+      c->serializer->revert (snapshot_version2);
+    }
+
+    bool subset_markglyphsetsdef = false;
+    if (version.to_int () >= 0x00010002u && hb_barrier ())
+    {
+      subset_markglyphsetsdef = out->markGlyphSetsDef.serialize_subset (c, markGlyphSetsDef, this);
     }
 
     if (subset_varstore)
     {
       out->version.minor = 3;
+      c->plan->has_gdef_varstore = true;
     } else if (subset_markglyphsetsdef) {
       out->version.minor = 2;
     } else  {
       out->version.minor = 0;
+      c->serializer->revert (snapshot_version0);
+    }
+
+    bool subset_glyphclassdef = out->glyphClassDef.serialize_subset (c, glyphClassDef, this, nullptr, false, true);
+    bool subset_attachlist = out->attachList.serialize_subset (c, attachList, this);
+    bool subset_markattachclassdef = out->markAttachClassDef.serialize_subset (c, markAttachClassDef, this, nullptr, false, true);
+    bool subset_ligcaretlist = out->ligCaretList.serialize_subset (c, ligCaretList, this);
+
+    if (subset_varstore && varstore_index != (unsigned) -1) {
+      c->serializer->repack_last(varstore_index);
     }
 
     return_trace (subset_glyphclassdef || subset_attachlist ||
@@ -709,6 +771,7 @@ struct GDEF
   {
     TRACE_SANITIZE (this);
     if (unlikely (!u.version.sanitize (c))) return_trace (false);
+    hb_barrier ();
     switch (u.version.major) {
     case 1: return_trace (u.version1.sanitize (c));
 #ifndef HB_NO_BEYOND_64K
@@ -812,7 +875,7 @@ struct GDEF
   bool has_mark_glyph_sets () const
   {
     switch (u.version.major) {
-    case 1: return u.version.to_int () >= 0x00010002u && u.version1.markGlyphSetsDef != 0;
+    case 1: return u.version.to_int () >= 0x00010002u && hb_barrier () && u.version1.markGlyphSetsDef != 0;
 #ifndef HB_NO_BEYOND_64K
     case 2: return u.version2.markGlyphSetsDef != 0;
 #endif
@@ -822,7 +885,7 @@ struct GDEF
   const MarkGlyphSets &get_mark_glyph_sets () const
   {
     switch (u.version.major) {
-    case 1: return u.version.to_int () >= 0x00010002u ? this+u.version1.markGlyphSetsDef : Null(MarkGlyphSets);
+    case 1: return u.version.to_int () >= 0x00010002u && hb_barrier () ? this+u.version1.markGlyphSetsDef : Null(MarkGlyphSets);
 #ifndef HB_NO_BEYOND_64K
     case 2: return this+u.version2.markGlyphSetsDef;
 #endif
@@ -832,21 +895,21 @@ struct GDEF
   bool has_var_store () const
   {
     switch (u.version.major) {
-    case 1: return u.version.to_int () >= 0x00010003u && u.version1.varStore != 0;
+    case 1: return u.version.to_int () >= 0x00010003u && hb_barrier () && u.version1.varStore != 0;
 #ifndef HB_NO_BEYOND_64K
     case 2: return u.version2.varStore != 0;
 #endif
     default: return false;
     }
   }
-  const VariationStore &get_var_store () const
+  const ItemVariationStore &get_var_store () const
   {
     switch (u.version.major) {
-    case 1: return u.version.to_int () >= 0x00010003u ? this+u.version1.varStore : Null(VariationStore);
+    case 1: return u.version.to_int () >= 0x00010003u && hb_barrier () ? this+u.version1.varStore : Null(ItemVariationStore);
 #ifndef HB_NO_BEYOND_64K
     case 2: return this+u.version2.varStore;
 #endif
-    default: return Null(VariationStore);
+    default: return Null(ItemVariationStore);
     }
   }
 
@@ -959,47 +1022,6 @@ struct GDEF
   void collect_variation_indices (hb_collect_variation_indices_context_t *c) const
   { get_lig_caret_list ().collect_variation_indices (c); }
 
-  void remap_layout_variation_indices (const hb_set_t *layout_variation_indices,
-                                       const hb_vector_t<int>& normalized_coords,
-                                       bool calculate_delta, /* not pinned at default */
-                                       bool no_variations, /* all axes pinned */
-                                       hb_hashmap_t<unsigned, hb_pair_t<unsigned, int>> *layout_variation_idx_delta_map /* OUT */) const
-  {
-    if (!has_var_store ()) return;
-    const VariationStore &var_store = get_var_store ();
-    float *store_cache = var_store.create_cache ();
-
-    unsigned new_major = 0, new_minor = 0;
-    unsigned last_major = (layout_variation_indices->get_min ()) >> 16;
-    for (unsigned idx : layout_variation_indices->iter ())
-    {
-      int delta = 0;
-      if (calculate_delta)
-        delta = roundf (var_store.get_delta (idx, normalized_coords.arrayZ,
-                                             normalized_coords.length, store_cache));
-
-      if (no_variations)
-      {
-        layout_variation_idx_delta_map->set (idx, hb_pair_t<unsigned, int> (HB_OT_LAYOUT_NO_VARIATIONS_INDEX, delta));
-        continue;
-      }
-
-      uint16_t major = idx >> 16;
-      if (major >= var_store.get_sub_table_count ()) break;
-      if (major != last_major)
-      {
-        new_minor = 0;
-        ++new_major;
-      }
-
-      unsigned new_idx = (new_major << 16) + new_minor;
-      layout_variation_idx_delta_map->set (idx, hb_pair_t<unsigned, int> (new_idx, delta));
-      ++new_minor;
-      last_major = major;
-    }
-    var_store.destroy_cache (store_cache);
-  }
-
   protected:
   union {
   FixedVersion<>                version;        /* Version identifier */
diff --git a/src/java.desktop/share/native/libharfbuzz/OT/Layout/GPOS/Anchor.hh b/src/java.desktop/share/native/libharfbuzz/OT/Layout/GPOS/Anchor.hh
index 49e76e77509..7802e397f4c 100644
--- a/src/java.desktop/share/native/libharfbuzz/OT/Layout/GPOS/Anchor.hh
+++ b/src/java.desktop/share/native/libharfbuzz/OT/Layout/GPOS/Anchor.hh
@@ -25,6 +25,7 @@ struct Anchor
   {
     TRACE_SANITIZE (this);
     if (!u.format.sanitize (c)) return_trace (false);
+    hb_barrier ();
     switch (u.format) {
     case 1: return_trace (u.format1.sanitize (c));
     case 2: return_trace (u.format2.sanitize (c));
diff --git a/src/java.desktop/share/native/libharfbuzz/OT/Layout/GPOS/AnchorFormat3.hh b/src/java.desktop/share/native/libharfbuzz/OT/Layout/GPOS/AnchorFormat3.hh
index 23821a49c77..61bd90310a5 100644
--- a/src/java.desktop/share/native/libharfbuzz/OT/Layout/GPOS/AnchorFormat3.hh
+++ b/src/java.desktop/share/native/libharfbuzz/OT/Layout/GPOS/AnchorFormat3.hh
@@ -38,9 +38,15 @@ struct AnchorFormat3
     *y = font->em_fscale_y (yCoordinate);
 
     if ((font->x_ppem || font->num_coords) && xDeviceTable.sanitize (&c->sanitizer, this))
+    {
+      hb_barrier ();
       *x += (this+xDeviceTable).get_x_delta (font, c->var_store, c->var_store_cache);
+    }
     if ((font->y_ppem || font->num_coords) && yDeviceTable.sanitize (&c->sanitizer, this))
+    {
+      hb_barrier ();
       *y += (this+yDeviceTable).get_y_delta (font, c->var_store, c->var_store_cache);
+    }
   }
 
   bool subset (hb_subset_context_t *c) const
diff --git a/src/java.desktop/share/native/libharfbuzz/OT/Layout/GPOS/AnchorMatrix.hh b/src/java.desktop/share/native/libharfbuzz/OT/Layout/GPOS/AnchorMatrix.hh
index b61f1413ea5..9da9fff50ba 100644
--- a/src/java.desktop/share/native/libharfbuzz/OT/Layout/GPOS/AnchorMatrix.hh
+++ b/src/java.desktop/share/native/libharfbuzz/OT/Layout/GPOS/AnchorMatrix.hh
@@ -8,7 +8,7 @@ namespace GPOS_impl {
 struct AnchorMatrix
 {
   HBUINT16      rows;                   /* Number of rows */
-  UnsizedArrayOf<Offset16To<Anchor>>
+  UnsizedArrayOf<Offset16To<Anchor, AnchorMatrix>>
                 matrixZ;                /* Matrix of offsets to Anchor tables--
                                          * from beginning of AnchorMatrix table */
   public:
@@ -18,6 +18,7 @@ struct AnchorMatrix
   {
     TRACE_SANITIZE (this);
     if (!c->check_struct (this)) return_trace (false);
+    hb_barrier ();
     if (unlikely (hb_unsigned_mul_overflows (rows, cols))) return_trace (false);
     unsigned int count = rows * cols;
     if (!c->check_array (matrixZ.arrayZ, count)) return_trace (false);
@@ -25,6 +26,7 @@ struct AnchorMatrix
     if (c->lazy_some_gpos)
       return_trace (true);
 
+    hb_barrier ();
     for (unsigned int i = 0; i < count; i++)
       if (!matrixZ[i].sanitize (c, this)) return_trace (false);
     return_trace (true);
@@ -38,6 +40,7 @@ struct AnchorMatrix
     if (unlikely (row >= rows || col >= cols)) return Null (Anchor);
     auto &offset = matrixZ[row * cols + col];
     if (unlikely (!offset.sanitize (&c->sanitizer, this))) return Null (Anchor);
+    hb_barrier ();
     *found = !offset.is_null ();
     return this+offset;
   }
@@ -65,15 +68,14 @@ struct AnchorMatrix
     if (unlikely (!c->serializer->extend_min (out)))  return_trace (false);
 
     out->rows = num_rows;
-    bool ret = false;
     for (const unsigned i : index_iter)
     {
       auto *offset = c->serializer->embed (matrixZ[i]);
       if (!offset) return_trace (false);
-      ret |= offset->serialize_subset (c, matrixZ[i], this);
+      offset->serialize_subset (c, matrixZ[i], this);
     }
 
-    return_trace (ret);
+    return_trace (true);
   }
 };
 
diff --git a/src/java.desktop/share/native/libharfbuzz/OT/Layout/GPOS/Common.hh b/src/java.desktop/share/native/libharfbuzz/OT/Layout/GPOS/Common.hh
index 408197454f1..696d25d75c8 100644
--- a/src/java.desktop/share/native/libharfbuzz/OT/Layout/GPOS/Common.hh
+++ b/src/java.desktop/share/native/libharfbuzz/OT/Layout/GPOS/Common.hh
@@ -23,7 +23,7 @@ static void SinglePos_serialize (hb_serialize_context_t *c,
                                  const SrcLookup *src,
                                  Iterator it,
                                  const hb_hashmap_t<unsigned, hb_pair_t<unsigned, int>> *layout_variation_idx_delta_map,
-                                 bool all_axes_pinned);
+                                 unsigned new_format);
 
 
 }
diff --git a/src/java.desktop/share/native/libharfbuzz/OT/Layout/GPOS/CursivePosFormat1.hh b/src/java.desktop/share/native/libharfbuzz/OT/Layout/GPOS/CursivePosFormat1.hh
index 3a2957af1a5..361aaed658a 100644
--- a/src/java.desktop/share/native/libharfbuzz/OT/Layout/GPOS/CursivePosFormat1.hh
+++ b/src/java.desktop/share/native/libharfbuzz/OT/Layout/GPOS/CursivePosFormat1.hh
@@ -11,21 +11,21 @@ struct EntryExitRecord
 {
   friend struct CursivePosFormat1;
 
-  bool sanitize (hb_sanitize_context_t *c, const void *base) const
+  bool sanitize (hb_sanitize_context_t *c, const struct CursivePosFormat1 *base) const
   {
     TRACE_SANITIZE (this);
     return_trace (entryAnchor.sanitize (c, base) && exitAnchor.sanitize (c, base));
   }
 
   void collect_variation_indices (hb_collect_variation_indices_context_t *c,
-                                  const void *src_base) const
+                                  const struct CursivePosFormat1 *src_base) const
   {
     (src_base+entryAnchor).collect_variation_indices (c);
     (src_base+exitAnchor).collect_variation_indices (c);
   }
 
   bool subset (hb_subset_context_t *c,
-               const void *src_base) const
+               const struct CursivePosFormat1 *src_base) const
   {
     TRACE_SERIALIZE (this);
     auto *out = c->serializer->embed (this);
@@ -38,11 +38,11 @@ struct EntryExitRecord
   }
 
   protected:
-  Offset16To<Anchor>
+  Offset16To<Anchor, struct CursivePosFormat1>
                 entryAnchor;            /* Offset to EntryAnchor table--from
                                          * beginning of CursivePos
                                          * subtable--may be NULL */
-  Offset16To<Anchor>
+  Offset16To<Anchor, struct CursivePosFormat1>
                 exitAnchor;             /* Offset to ExitAnchor table--from
                                          * beginning of CursivePos
                                          * subtable--may be NULL */
@@ -128,6 +128,7 @@ struct CursivePosFormat1
     const EntryExitRecord &this_record = entryExitRecord[(this+coverage).get_coverage  (buffer->cur().codepoint)];
     if (!this_record.entryAnchor ||
         unlikely (!this_record.entryAnchor.sanitize (&c->sanitizer, this))) return_trace (false);
+    hb_barrier ();
 
     hb_ot_apply_context_t::skipping_iterator_t &skippy_iter = c->iter_input;
     skippy_iter.reset_fast (buffer->idx);
@@ -145,6 +146,7 @@ struct CursivePosFormat1
       buffer->unsafe_to_concat_from_outbuffer (skippy_iter.idx, buffer->idx + 1);
       return_trace (false);
     }
+    hb_barrier ();
 
     unsigned int i = skippy_iter.idx;
     unsigned int j = buffer->idx;
@@ -262,7 +264,7 @@ struct CursivePosFormat1
             hb_requires (hb_is_iterator (Iterator))>
   void serialize (hb_subset_context_t *c,
                   Iterator it,
-                  const void *src_base)
+                  const struct CursivePosFormat1 *src_base)
   {
     if (unlikely (!c->serializer->extend_min ((*this)))) return;
     this->format = 1;
diff --git a/src/java.desktop/share/native/libharfbuzz/OT/Layout/GPOS/MarkMarkPosFormat1.hh b/src/java.desktop/share/native/libharfbuzz/OT/Layout/GPOS/MarkMarkPosFormat1.hh
index ea196581aff..6519e79b443 100644
--- a/src/java.desktop/share/native/libharfbuzz/OT/Layout/GPOS/MarkMarkPosFormat1.hh
+++ b/src/java.desktop/share/native/libharfbuzz/OT/Layout/GPOS/MarkMarkPosFormat1.hh
@@ -42,6 +42,7 @@ struct MarkMarkPosFormat1_2
                   mark1Coverage.sanitize (c, this) &&
                   mark2Coverage.sanitize (c, this) &&
                   mark1Array.sanitize (c, this) &&
+                  hb_barrier () &&
                   mark2Array.sanitize (c, this, (unsigned int) classCount));
   }
 
diff --git a/src/java.desktop/share/native/libharfbuzz/OT/Layout/GPOS/PairPosFormat1.hh b/src/java.desktop/share/native/libharfbuzz/OT/Layout/GPOS/PairPosFormat1.hh
index 478c72df750..597ff4c088a 100644
--- a/src/java.desktop/share/native/libharfbuzz/OT/Layout/GPOS/PairPosFormat1.hh
+++ b/src/java.desktop/share/native/libharfbuzz/OT/Layout/GPOS/PairPosFormat1.hh
@@ -36,6 +36,7 @@ struct PairPosFormat1_3
     TRACE_SANITIZE (this);
 
     if (!c->check_struct (this)) return_trace (false);
+    hb_barrier ();
 
     unsigned int len1 = valueFormat[0].get_len ();
     unsigned int len2 = valueFormat[1].get_len ();
@@ -102,12 +103,50 @@ struct PairPosFormat1_3
 
   const Coverage &get_coverage () const { return this+coverage; }
 
-  bool apply (hb_ot_apply_context_t *c) const
+  unsigned cache_cost () const
+  {
+    return (this+coverage).cost ();
+  }
+  static void * cache_func (void *p, hb_ot_lookup_cache_op_t op)
+  {
+    switch (op)
+    {
+      case hb_ot_lookup_cache_op_t::CREATE:
+      {
+        hb_ot_lookup_cache_t *cache = (hb_ot_lookup_cache_t *) hb_malloc (sizeof (hb_ot_lookup_cache_t));
+        if (likely (cache))
+          cache->clear ();
+        return cache;
+      }
+      case hb_ot_lookup_cache_op_t::ENTER:
+        return (void *) true;
+      case hb_ot_lookup_cache_op_t::LEAVE:
+        return nullptr;
+      case hb_ot_lookup_cache_op_t::DESTROY:
+      {
+        hb_ot_lookup_cache_t *cache = (hb_ot_lookup_cache_t *) p;
+        hb_free (cache);
+        return nullptr;
+      }
+    }
+    return nullptr;
+  }
+
+  bool apply_cached (hb_ot_apply_context_t *c) const { return _apply (c, true); }
+  bool apply (hb_ot_apply_context_t *c) const { return _apply (c, false); }
+  bool _apply (hb_ot_apply_context_t *c, bool cached) const
   {
     TRACE_APPLY (this);
+
     hb_buffer_t *buffer = c->buffer;
+
+#ifndef HB_NO_OT_LAYOUT_LOOKUP_CACHE
+    hb_ot_lookup_cache_t *cache = cached ? (hb_ot_lookup_cache_t *) c->lookup_accel->cache : nullptr;
+    unsigned int index = (this+coverage).get_coverage  (buffer->cur().codepoint, cache);
+#else
     unsigned int index = (this+coverage).get_coverage  (buffer->cur().codepoint);
-    if (likely (index == NOT_COVERED)) return_trace (false);
+#endif
+    if (index == NOT_COVERED) return_trace (false);
 
     hb_ot_apply_context_t::skipping_iterator_t &skippy_iter = c->iter_input;
     skippy_iter.reset_fast (buffer->idx);
@@ -131,20 +170,33 @@ struct PairPosFormat1_3
     auto *out = c->serializer->start_embed (*this);
     if (unlikely (!c->serializer->extend_min (out))) return_trace (false);
     out->format = format;
-    out->valueFormat[0] = valueFormat[0];
-    out->valueFormat[1] = valueFormat[1];
-    if (c->plan->flags & HB_SUBSET_FLAGS_NO_HINTING)
+
+    hb_pair_t<unsigned, unsigned> newFormats = hb_pair (valueFormat[0], valueFormat[1]);
+
+    if (c->plan->normalized_coords)
     {
-      hb_pair_t<unsigned, unsigned> newFormats = compute_effective_value_formats (glyphset);
-      out->valueFormat[0] = newFormats.first;
-      out->valueFormat[1] = newFormats.second;
+      /* all device flags will be dropped when full instancing, no need to strip
+       * hints, also do not strip emtpy cause we don't compute the new default
+       * value during stripping */
+      newFormats = compute_effective_value_formats (glyphset, false, false, &c->plan->layout_variation_idx_delta_map);
+    }
+    /* do not strip hints for VF */
+    else if (c->plan->flags & HB_SUBSET_FLAGS_NO_HINTING)
+    {
+      hb_blob_t* blob = hb_face_reference_table (c->plan->source, HB_TAG ('f','v','a','r'));
+      bool has_fvar = (blob != hb_blob_get_empty ());
+      hb_blob_destroy (blob);
+
+      bool strip = !has_fvar;
+      /* special case: strip hints when a VF has no GDEF varstore after
+       * subsetting*/
+      if (has_fvar && !c->plan->has_gdef_varstore)
+        strip = true;
+      newFormats = compute_effective_value_formats (glyphset, strip, true);
     }
 
-    if (c->plan->all_axes_pinned)
-    {
-      out->valueFormat[0] = out->valueFormat[0].drop_device_table_flags ();
-      out->valueFormat[1] = out->valueFormat[1].drop_device_table_flags ();
-    }
+    out->valueFormat[0] = newFormats.first;
+    out->valueFormat[1] = newFormats.second;
 
     hb_sorted_vector_t<hb_codepoint_t> new_coverage;
 
@@ -175,7 +227,9 @@ struct PairPosFormat1_3
   }
 
 
-  hb_pair_t<unsigned, unsigned> compute_effective_value_formats (const hb_set_t& glyphset) const
+  hb_pair_t<unsigned, unsigned> compute_effective_value_formats (const hb_set_t& glyphset,
+                                                                 bool strip_hints, bool strip_empty,
+                                                                 const hb_hashmap_t<unsigned, hb_pair_t<unsigned, int>> *varidx_delta_map = nullptr) const
   {
     unsigned record_size = PairSet::get_size (valueFormat);
 
@@ -195,8 +249,8 @@ struct PairPosFormat1_3
       {
         if (record->intersects (glyphset))
         {
-          format1 = format1 | valueFormat[0].get_effective_format (record->get_values_1 ());
-          format2 = format2 | valueFormat[1].get_effective_format (record->get_values_2 (valueFormat[0]));
+          format1 = format1 | valueFormat[0].get_effective_format (record->get_values_1 (), strip_hints, strip_empty, &set, varidx_delta_map);
+          format2 = format2 | valueFormat[1].get_effective_format (record->get_values_2 (valueFormat[0]), strip_hints, strip_empty, &set, varidx_delta_map);
         }
         record = &StructAtOffset<const PairValueRecord> (record, record_size);
       }
diff --git a/src/java.desktop/share/native/libharfbuzz/OT/Layout/GPOS/PairPosFormat2.hh b/src/java.desktop/share/native/libharfbuzz/OT/Layout/GPOS/PairPosFormat2.hh
index ce6eec4f206..d85b1ac2c17 100644
--- a/src/java.desktop/share/native/libharfbuzz/OT/Layout/GPOS/PairPosFormat2.hh
+++ b/src/java.desktop/share/native/libharfbuzz/OT/Layout/GPOS/PairPosFormat2.hh
@@ -8,7 +8,7 @@ namespace Layout {
 namespace GPOS_impl {
 
 template <typename Types>
-struct PairPosFormat2_4
+struct PairPosFormat2_4 : ValueBase
 {
   protected:
   HBUINT16      format;                 /* Format identifier--format = 2 */
@@ -123,12 +123,61 @@ struct PairPosFormat2_4
 
   const Coverage &get_coverage () const { return this+coverage; }
 
-  bool apply (hb_ot_apply_context_t *c) const
+  struct pair_pos_cache_t
+  {
+    hb_ot_lookup_cache_t coverage;
+    hb_ot_lookup_cache_t first;
+    hb_ot_lookup_cache_t second;
+  };
+
+  unsigned cache_cost () const
+  {
+    return (this+coverage).cost () + (this+classDef1).cost () + (this+classDef2).cost ();
+  }
+  static void * cache_func (void *p, hb_ot_lookup_cache_op_t op)
+  {
+    switch (op)
+    {
+      case hb_ot_lookup_cache_op_t::CREATE:
+      {
+        pair_pos_cache_t *cache = (pair_pos_cache_t *) hb_malloc (sizeof (pair_pos_cache_t));
+        if (likely (cache))
+        {
+          cache->coverage.clear ();
+          cache->first.clear ();
+          cache->second.clear ();
+        }
+        return cache;
+      }
+      case hb_ot_lookup_cache_op_t::ENTER:
+        return (void *) true;
+      case hb_ot_lookup_cache_op_t::LEAVE:
+        return nullptr;
+      case hb_ot_lookup_cache_op_t::DESTROY:
+        {
+          pair_pos_cache_t *cache = (pair_pos_cache_t *) p;
+          hb_free (cache);
+          return nullptr;
+        }
+    }
+    return nullptr;
+  }
+
+  bool apply_cached (hb_ot_apply_context_t *c) const { return _apply (c, true); }
+  bool apply (hb_ot_apply_context_t *c) const { return _apply (c, false); }
+  bool _apply (hb_ot_apply_context_t *c, bool cached) const
   {
     TRACE_APPLY (this);
+
     hb_buffer_t *buffer = c->buffer;
+
+#ifndef HB_NO_OT_LAYOUT_LOOKUP_CACHE
+    pair_pos_cache_t *cache = cached ? (pair_pos_cache_t *) c->lookup_accel->cache : nullptr;
+    unsigned int index = (this+coverage).get_coverage  (buffer->cur().codepoint, cache ? &cache->coverage : nullptr);
+#else
     unsigned int index = (this+coverage).get_coverage  (buffer->cur().codepoint);
-    if (likely (index == NOT_COVERED)) return_trace (false);
+#endif
+    if (index == NOT_COVERED) return_trace (false);
 
     hb_ot_apply_context_t::skipping_iterator_t &skippy_iter = c->iter_input;
     skippy_iter.reset_fast (buffer->idx);
@@ -139,14 +188,13 @@ struct PairPosFormat2_4
       return_trace (false);
     }
 
-    unsigned int klass2 = (this+classDef2).get_class (buffer->info[skippy_iter.idx].codepoint);
-    if (!klass2)
-    {
-      buffer->unsafe_to_concat (buffer->idx, skippy_iter.idx + 1);
-      return_trace (false);
-    }
-
+#ifndef HB_NO_OT_LAYOUT_LOOKUP_CACHE
+    unsigned int klass1 = (this+classDef1).get_class (buffer->cur().codepoint, cache ? &cache->first : nullptr);
+    unsigned int klass2 = (this+classDef2).get_class (buffer->info[skippy_iter.idx].codepoint, cache ? &cache->second : nullptr);
+#else
     unsigned int klass1 = (this+classDef1).get_class (buffer->cur().codepoint);
+    unsigned int klass2 = (this+classDef2).get_class (buffer->info[skippy_iter.idx].codepoint);
+#endif
     if (unlikely (klass1 >= class1Count || klass2 >= class2Count))
     {
       buffer->unsafe_to_concat (buffer->idx, skippy_iter.idx + 1);
@@ -287,18 +335,31 @@ struct PairPosFormat2_4
     unsigned len2 = valueFormat2.get_len ();
 
     hb_pair_t<unsigned, unsigned> newFormats = hb_pair (valueFormat1, valueFormat2);
-    if (c->plan->flags & HB_SUBSET_FLAGS_NO_HINTING)
-      newFormats = compute_effective_value_formats (klass1_map, klass2_map);
+
+    if (c->plan->normalized_coords)
+    {
+      /* in case of full instancing, all var device flags will be dropped so no
+       * need to strip hints here */
+      newFormats = compute_effective_value_formats (klass1_map, klass2_map, false, false, &c->plan->layout_variation_idx_delta_map);
+    }
+    /* do not strip hints for VF */
+    else if (c->plan->flags & HB_SUBSET_FLAGS_NO_HINTING)
+    {
+      hb_blob_t* blob = hb_face_reference_table (c->plan->source, HB_TAG ('f','v','a','r'));
+      bool has_fvar = (blob != hb_blob_get_empty ());
+      hb_blob_destroy (blob);
+
+      bool strip = !has_fvar;
+      /* special case: strip hints when a VF has no GDEF varstore after
+       * subsetting*/
+      if (has_fvar && !c->plan->has_gdef_varstore)
+        strip = true;
+      newFormats = compute_effective_value_formats (klass1_map, klass2_map, strip, true);
+    }
 
     out->valueFormat1 = newFormats.first;
     out->valueFormat2 = newFormats.second;
 
-    if (c->plan->all_axes_pinned)
-    {
-      out->valueFormat1 = out->valueFormat1.drop_device_table_flags ();
-      out->valueFormat2 = out->valueFormat2.drop_device_table_flags ();
-    }
-
     unsigned total_len = len1 + len2;
     hb_vector_t<unsigned> class2_idxs (+ hb_range ((unsigned) class2Count) | hb_filter (klass2_map));
     for (unsigned class1_idx : + hb_range ((unsigned) class1Count) | hb_filter (klass1_map))
@@ -311,22 +372,15 @@ struct PairPosFormat2_4
       }
     }
 
-    const hb_set_t &glyphset = *c->plan->glyphset_gsub ();
-    const hb_map_t &glyph_map = *c->plan->glyph_map;
-
-    auto it =
-    + hb_iter (this+coverage)
-    | hb_filter (glyphset)
-    | hb_map_retains_sorting (glyph_map)
-    ;
-
-    out->coverage.serialize_serialize (c->serializer, it);
-    return_trace (out->class1Count && out->class2Count && bool (it));
+    bool ret = out->coverage.serialize_subset(c, coverage, this);
+    return_trace (out->class1Count && out->class2Count && ret);
   }
 
 
   hb_pair_t<unsigned, unsigned> compute_effective_value_formats (const hb_map_t& klass1_map,
-                                                                 const hb_map_t& klass2_map) const
+                                                                 const hb_map_t& klass2_map,
+                                                                 bool strip_hints, bool strip_empty,
+                                                                 const hb_hashmap_t<unsigned, hb_pair_t<unsigned, int>> *varidx_delta_map = nullptr) const
   {
     unsigned len1 = valueFormat1.get_len ();
     unsigned len2 = valueFormat2.get_len ();
@@ -340,8 +394,8 @@ struct PairPosFormat2_4
       for (unsigned class2_idx : + hb_range ((unsigned) class2Count) | hb_filter (klass2_map))
       {
         unsigned idx = (class1_idx * (unsigned) class2Count + class2_idx) * record_size;
-        format1 = format1 | valueFormat1.get_effective_format (&values[idx]);
-        format2 = format2 | valueFormat2.get_effective_format (&values[idx + len1]);
+        format1 = format1 | valueFormat1.get_effective_format (&values[idx], strip_hints, strip_empty, this, varidx_delta_map);
+        format2 = format2 | valueFormat2.get_effective_format (&values[idx + len1], strip_hints, strip_empty, this, varidx_delta_map);
       }
 
       if (format1 == valueFormat1 && format2 == valueFormat2)
diff --git a/src/java.desktop/share/native/libharfbuzz/OT/Layout/GPOS/PairSet.hh b/src/java.desktop/share/native/libharfbuzz/OT/Layout/GPOS/PairSet.hh
index 7ccec1df841..e610fcd7517 100644
--- a/src/java.desktop/share/native/libharfbuzz/OT/Layout/GPOS/PairSet.hh
+++ b/src/java.desktop/share/native/libharfbuzz/OT/Layout/GPOS/PairSet.hh
@@ -9,7 +9,7 @@ namespace GPOS_impl {
 
 
 template <typename Types>
-struct PairSet
+struct PairSet : ValueBase
 {
   template <typename Types2>
   friend struct PairPosFormat1_3;
@@ -45,10 +45,12 @@ struct PairSet
   bool sanitize (hb_sanitize_context_t *c, const sanitize_closure_t *closure) const
   {
     TRACE_SANITIZE (this);
-    if (!(c->check_struct (this)
-       && c->check_range (&firstPairValueRecord,
+    if (!(c->check_struct (this) &&
+          hb_barrier () &&
+          c->check_range (&firstPairValueRecord,
                           len,
                           closure->stride))) return_trace (false);
+    hb_barrier ();
 
     unsigned int count = len;
     const PairValueRecord *record = &firstPairValueRecord;
diff --git a/src/java.desktop/share/native/libharfbuzz/OT/Layout/GPOS/PairValueRecord.hh b/src/java.desktop/share/native/libharfbuzz/OT/Layout/GPOS/PairValueRecord.hh
index b32abe46d21..fe9595f1266 100644
--- a/src/java.desktop/share/native/libharfbuzz/OT/Layout/GPOS/PairValueRecord.hh
+++ b/src/java.desktop/share/native/libharfbuzz/OT/Layout/GPOS/PairValueRecord.hh
@@ -29,7 +29,7 @@ struct PairValueRecord
 
   struct context_t
   {
-    const void          *base;
+    const ValueBase     *base;
     const ValueFormat   *valueFormats;
     const ValueFormat   *newFormats;
     unsigned            len1; /* valueFormats[0].get_len() */
@@ -62,7 +62,7 @@ struct PairValueRecord
 
   void collect_variation_indices (hb_collect_variation_indices_context_t *c,
                                   const ValueFormat *valueFormats,
-                                  const void *base) const
+                                  const ValueBase *base) const
   {
     unsigned record1_len = valueFormats[0].get_len ();
     unsigned record2_len = valueFormats[1].get_len ();
diff --git a/src/java.desktop/share/native/libharfbuzz/OT/Layout/GPOS/SinglePos.hh b/src/java.desktop/share/native/libharfbuzz/OT/Layout/GPOS/SinglePos.hh
index 3af6c499659..a0243a218c5 100644
--- a/src/java.desktop/share/native/libharfbuzz/OT/Layout/GPOS/SinglePos.hh
+++ b/src/java.desktop/share/native/libharfbuzz/OT/Layout/GPOS/SinglePos.hh
@@ -39,14 +39,12 @@ struct SinglePos
                   const SrcLookup* src,
                   Iterator glyph_val_iter_pairs,
                   const hb_hashmap_t<unsigned, hb_pair_t<unsigned, int>> *layout_variation_idx_delta_map,
-                  bool all_axes_pinned)
+                  unsigned newFormat)
   {
     if (unlikely (!c->extend_min (u.format))) return;
     unsigned format = 2;
-    ValueFormat new_format = src->get_value_format ();
-
-    if (all_axes_pinned)
-      new_format = new_format.drop_device_table_flags ();
+    ValueFormat new_format;
+    new_format = newFormat;
 
     if (glyph_val_iter_pairs)
       format = get_format (glyph_val_iter_pairs);
@@ -89,8 +87,8 @@ SinglePos_serialize (hb_serialize_context_t *c,
                      const SrcLookup *src,
                      Iterator it,
                      const hb_hashmap_t<unsigned, hb_pair_t<unsigned, int>> *layout_variation_idx_delta_map,
-                     bool all_axes_pinned)
-{ c->start_embed<SinglePos> ()->serialize (c, src, it, layout_variation_idx_delta_map, all_axes_pinned); }
+                     unsigned new_format)
+{ c->start_embed<SinglePos> ()->serialize (c, src, it, layout_variation_idx_delta_map, new_format); }
 
 
 }
diff --git a/src/java.desktop/share/native/libharfbuzz/OT/Layout/GPOS/SinglePosFormat1.hh b/src/java.desktop/share/native/libharfbuzz/OT/Layout/GPOS/SinglePosFormat1.hh
index 8e21c5f8e71..1a14be020f9 100644
--- a/src/java.desktop/share/native/libharfbuzz/OT/Layout/GPOS/SinglePosFormat1.hh
+++ b/src/java.desktop/share/native/libharfbuzz/OT/Layout/GPOS/SinglePosFormat1.hh
@@ -8,7 +8,7 @@ namespace OT {
 namespace Layout {
 namespace GPOS_impl {
 
-struct SinglePosFormat1
+struct SinglePosFormat1 : ValueBase
 {
   protected:
   HBUINT16      format;                 /* Format identifier--format = 1 */
@@ -28,6 +28,7 @@ struct SinglePosFormat1
     TRACE_SANITIZE (this);
     return_trace (c->check_struct (this) &&
                   coverage.sanitize (c, this) &&
+                  hb_barrier () &&
                   /* The coverage  table may use a range to represent a set
                    * of glyphs, which means a small number of bytes can
                    * generate a large glyph set. Manually modify the
@@ -66,7 +67,7 @@ struct SinglePosFormat1
     TRACE_APPLY (this);
     hb_buffer_t *buffer = c->buffer;
     unsigned int index = (this+coverage).get_coverage  (buffer->cur().codepoint);
-    if (likely (index == NOT_COVERED)) return_trace (false);
+    if (index == NOT_COVERED) return_trace (false);
 
     if (HB_BUFFER_MESSAGE_MORE && c->buffer->messaging ())
     {
@@ -146,6 +147,30 @@ struct SinglePosFormat1
     hb_set_t intersection;
     (this+coverage).intersect_set (glyphset, intersection);
 
+    unsigned new_format = valueFormat;
+
+    if (c->plan->normalized_coords)
+    {
+      new_format = valueFormat.get_effective_format (values.arrayZ, false, false, this, &c->plan->layout_variation_idx_delta_map);
+    }
+    /* do not strip hints for VF */
+    else if (c->plan->flags & HB_SUBSET_FLAGS_NO_HINTING)
+    {
+      hb_blob_t* blob = hb_face_reference_table (c->plan->source, HB_TAG ('f','v','a','r'));
+      bool has_fvar = (blob != hb_blob_get_empty ());
+      hb_blob_destroy (blob);
+
+      bool strip = !has_fvar;
+      /* special case: strip hints when a VF has no GDEF varstore after
+       * subsetting*/
+      if (has_fvar && !c->plan->has_gdef_varstore)
+        strip = true;
+      new_format = valueFormat.get_effective_format (values.arrayZ,
+                                                     strip, /* strip hints */
+                                                     true, /* strip empty */
+                                                     this, nullptr);
+    }
+
     auto it =
     + hb_iter (intersection)
     | hb_map_retains_sorting (glyph_map)
@@ -153,7 +178,7 @@ struct SinglePosFormat1
     ;
 
     bool ret = bool (it);
-    SinglePos_serialize (c->serializer, this, it, &c->plan->layout_variation_idx_delta_map, c->plan->all_axes_pinned);
+    SinglePos_serialize (c->serializer, this, it, &c->plan->layout_variation_idx_delta_map, new_format);
     return_trace (ret);
   }
 };
diff --git a/src/java.desktop/share/native/libharfbuzz/OT/Layout/GPOS/SinglePosFormat2.hh b/src/java.desktop/share/native/libharfbuzz/OT/Layout/GPOS/SinglePosFormat2.hh
index ddc4c18ec1c..455796b4b27 100644
--- a/src/java.desktop/share/native/libharfbuzz/OT/Layout/GPOS/SinglePosFormat2.hh
+++ b/src/java.desktop/share/native/libharfbuzz/OT/Layout/GPOS/SinglePosFormat2.hh
@@ -7,7 +7,7 @@ namespace OT {
 namespace Layout {
 namespace GPOS_impl {
 
-struct SinglePosFormat2
+struct SinglePosFormat2 : ValueBase
 {
   protected:
   HBUINT16      format;                 /* Format identifier--format = 2 */
@@ -66,7 +66,7 @@ struct SinglePosFormat2
     TRACE_APPLY (this);
     hb_buffer_t *buffer = c->buffer;
     unsigned int index = (this+coverage).get_coverage  (buffer->cur().codepoint);
-    if (likely (index == NOT_COVERED)) return_trace (false);
+    if (index == NOT_COVERED) return_trace (false);
 
     if (unlikely (index >= valueCount)) return_trace (false);
 
@@ -143,6 +143,37 @@ struct SinglePosFormat2
     coverage.serialize_serialize (c, glyphs);
   }
 
+  template<typename Iterator,
+      hb_requires (hb_is_iterator (Iterator))>
+  unsigned compute_effective_format (const hb_face_t *face,
+                                     Iterator it,
+                                     bool is_instancing, bool strip_hints,
+                                     bool has_gdef_varstore,
+                                     const hb_hashmap_t<unsigned, hb_pair_t<unsigned, int>> *varidx_delta_map) const
+  {
+    hb_blob_t* blob = hb_face_reference_table (face, HB_TAG ('f','v','a','r'));
+    bool has_fvar = (blob != hb_blob_get_empty ());
+    hb_blob_destroy (blob);
+
+    unsigned new_format = 0;
+    if (is_instancing)
+    {
+      new_format = new_format | valueFormat.get_effective_format (+ it | hb_map (hb_second), false, false, this, varidx_delta_map);
+    }
+    /* do not strip hints for VF */
+    else if (strip_hints)
+    {
+      bool strip = !has_fvar;
+      if (has_fvar && !has_gdef_varstore)
+        strip = true;
+      new_format = new_format | valueFormat.get_effective_format (+ it | hb_map (hb_second), strip, true, this, nullptr);
+    }
+    else
+      new_format = valueFormat;
+
+    return new_format;
+  }
+
   bool subset (hb_subset_context_t *c) const
   {
     TRACE_SUBSET (this);
@@ -163,8 +194,13 @@ struct SinglePosFormat2
                               })
     ;
 
+    unsigned new_format = compute_effective_format (c->plan->source, it,
+                                                    bool (c->plan->normalized_coords),
+                                                    bool (c->plan->flags & HB_SUBSET_FLAGS_NO_HINTING),
+                                                    c->plan->has_gdef_varstore,
+                                                    &c->plan->layout_variation_idx_delta_map);
     bool ret = bool (it);
-    SinglePos_serialize (c->serializer, this, it, &c->plan->layout_variation_idx_delta_map, c->plan->all_axes_pinned);
+    SinglePos_serialize (c->serializer, this, it, &c->plan->layout_variation_idx_delta_map, new_format);
     return_trace (ret);
   }
 };
diff --git a/src/java.desktop/share/native/libharfbuzz/OT/Layout/GPOS/ValueFormat.hh b/src/java.desktop/share/native/libharfbuzz/OT/Layout/GPOS/ValueFormat.hh
index 8618cddad1c..731d1ffca1a 100644
--- a/src/java.desktop/share/native/libharfbuzz/OT/Layout/GPOS/ValueFormat.hh
+++ b/src/java.desktop/share/native/libharfbuzz/OT/Layout/GPOS/ValueFormat.hh
@@ -9,6 +9,8 @@ namespace GPOS_impl {
 
 typedef HBUINT16 Value;
 
+struct ValueBase {}; // Dummy base class tag for OffsetTo<Value> bases.
+
 typedef UnsizedArrayOf<Value> ValueRecord;
 
 struct ValueFormat : HBUINT16
@@ -78,7 +80,7 @@ struct ValueFormat : HBUINT16
   }
 
   bool apply_value (hb_ot_apply_context_t *c,
-                    const void            *base,
+                    const ValueBase       *base,
                     const Value           *values,
                     hb_glyph_position_t   &glyph_pos) const
   {
@@ -114,7 +116,7 @@ struct ValueFormat : HBUINT16
 
     if (!use_x_device && !use_y_device) return ret;
 
-    const VariationStore &store = c->var_store;
+    const ItemVariationStore &store = c->var_store;
     auto *cache = c->var_store_cache;
 
     /* pixel -> fractional pixel */
@@ -142,11 +144,29 @@ struct ValueFormat : HBUINT16
     return ret;
   }
 
-  unsigned int get_effective_format (const Value *values) const
+  unsigned int get_effective_format (const Value *values, bool strip_hints, bool strip_empty, const ValueBase *base,
+                                     const hb_hashmap_t<unsigned, hb_pair_t<unsigned, int>> *varidx_delta_map) const
   {
     unsigned int format = *this;
     for (unsigned flag = xPlacement; flag <= yAdvDevice; flag = flag << 1) {
-      if (format & flag) should_drop (*values++, (Flags) flag, &format);
+      if (format & flag)
+      {
+        if (strip_hints && flag >= xPlaDevice)
+        {
+          format = format & ~flag;
+          values++;
+          continue;
+        }
+        if (varidx_delta_map && flag >= xPlaDevice)
+        {
+          update_var_flag (values++, (Flags) flag, &format, base, varidx_delta_map);
+          continue;
+        }
+        /* do not strip empty when instancing, cause we don't know whether the new
+         * default value is 0 or not */
+        if (strip_empty) should_drop (*values, (Flags) flag, &format);
+        values++;
+      }
     }
 
     return format;
@@ -154,18 +174,19 @@ struct ValueFormat : HBUINT16
 
   template<typename Iterator,
       hb_requires (hb_is_iterator (Iterator))>
-  unsigned int get_effective_format (Iterator it) const {
+  unsigned int get_effective_format (Iterator it, bool strip_hints, bool strip_empty, const ValueBase *base,
+                                     const hb_hashmap_t<unsigned, hb_pair_t<unsigned, int>> *varidx_delta_map) const {
     unsigned int new_format = 0;
 
     for (const hb_array_t<const Value>& values : it)
-      new_format = new_format | get_effective_format (&values);
+      new_format = new_format | get_effective_format (&values, strip_hints, strip_empty, base, varidx_delta_map);
 
     return new_format;
   }
 
   void copy_values (hb_serialize_context_t *c,
                     unsigned int new_format,
-                    const void *base,
+                    const ValueBase *base,
                     const Value *values,
                     const hb_hashmap_t<unsigned, hb_pair_t<unsigned, int>> *layout_variation_idx_delta_map) const
   {
@@ -217,7 +238,7 @@ struct ValueFormat : HBUINT16
   }
 
   void collect_variation_indices (hb_collect_variation_indices_context_t *c,
-                                  const void *base,
+                                  const ValueBase *base,
                                   const hb_array_t<const Value>& values) const
   {
     unsigned format = *this;
@@ -251,17 +272,8 @@ struct ValueFormat : HBUINT16
     }
   }
 
-  unsigned drop_device_table_flags () const
-  {
-    unsigned format = *this;
-    for (unsigned flag = xPlaDevice; flag <= yAdvDevice; flag = flag << 1)
-      format = format & ~flag;
-
-    return format;
-  }
-
   private:
-  bool sanitize_value_devices (hb_sanitize_context_t *c, const void *base, const Value *values) const
+  bool sanitize_value_devices (hb_sanitize_context_t *c, const ValueBase *base, const Value *values) const
   {
     unsigned int format = *this;
 
@@ -278,17 +290,17 @@ struct ValueFormat : HBUINT16
     return true;
   }
 
-  static inline Offset16To<Device>& get_device (Value* value)
+  static inline Offset16To<Device, ValueBase>& get_device (Value* value)
   {
-    return *static_cast<Offset16To<Device> *> (value);
+    return *static_cast<Offset16To<Device, ValueBase> *> (value);
   }
-  static inline const Offset16To<Device>& get_device (const Value* value)
+  static inline const Offset16To<Device, ValueBase>& get_device (const Value* value)
   {
-    return *static_cast<const Offset16To<Device> *> (value);
+    return *static_cast<const Offset16To<Device, ValueBase> *> (value);
   }
   static inline const Device& get_device (const Value* value,
                                           bool *worked,
-                                          const void *base,
+                                          const ValueBase *base,
                                           hb_sanitize_context_t &c)
   {
     if (worked) *worked |= bool (*value);
@@ -296,12 +308,13 @@ struct ValueFormat : HBUINT16
 
     if (unlikely (!offset.sanitize (&c, base)))
       return Null(Device);
+    hb_barrier ();
 
     return base + offset;
   }
 
   void add_delta_to_value (HBINT16 *value,
-                           const void *base,
+                           const ValueBase *base,
                            const Value *src_value,
                            const hb_hashmap_t<unsigned, hb_pair_t<unsigned, int>> *layout_variation_idx_delta_map) const
   {
@@ -313,7 +326,8 @@ struct ValueFormat : HBUINT16
     *value += hb_second (*varidx_delta);
   }
 
-  bool copy_device (hb_serialize_context_t *c, const void *base,
+  bool copy_device (hb_serialize_context_t *c,
+                    const ValueBase *base,
                     const Value *src_value,
                     const hb_hashmap_t<unsigned, hb_pair_t<unsigned, int>> *layout_variation_idx_delta_map,
                     unsigned int new_format, Flags flag) const
@@ -354,7 +368,7 @@ struct ValueFormat : HBUINT16
     return (format & devices) != 0;
   }
 
-  bool sanitize_value (hb_sanitize_context_t *c, const void *base, const Value *values) const
+  bool sanitize_value (hb_sanitize_context_t *c, const ValueBase *base, const Value *values) const
   {
     TRACE_SANITIZE (this);
 
@@ -366,7 +380,7 @@ struct ValueFormat : HBUINT16
     return_trace (!has_device () || sanitize_value_devices (c, base, values));
   }
 
-  bool sanitize_values (hb_sanitize_context_t *c, const void *base, const Value *values, unsigned int count) const
+  bool sanitize_values (hb_sanitize_context_t *c, const ValueBase *base, const Value *values, unsigned int count) const
   {
     TRACE_SANITIZE (this);
     unsigned size = get_size ();
@@ -376,11 +390,12 @@ struct ValueFormat : HBUINT16
     if (c->lazy_some_gpos)
       return_trace (true);
 
+    hb_barrier ();
     return_trace (sanitize_values_stride_unsafe (c, base, values, count, size));
   }
 
   /* Just sanitize referenced Device tables.  Doesn't check the values themselves. */
-  bool sanitize_values_stride_unsafe (hb_sanitize_context_t *c, const void *base, const Value *values, unsigned int count, unsigned int stride) const
+  bool sanitize_values_stride_unsafe (hb_sanitize_context_t *c, const ValueBase *base, const Value *values, unsigned int count, unsigned int stride) const
   {
     TRACE_SANITIZE (this);
 
@@ -403,6 +418,20 @@ struct ValueFormat : HBUINT16
     *format = *format & ~flag;
   }
 
+  void update_var_flag (const Value* value, Flags flag,
+                        unsigned int* format, const ValueBase *base,
+                        const hb_hashmap_t<unsigned, hb_pair_t<unsigned, int>> *varidx_delta_map) const
+  {
+    if (*value)
+    {
+      unsigned varidx = (base + get_device (value)).get_variation_index ();
+      hb_pair_t<unsigned, int> *varidx_delta;
+      if (varidx_delta_map->has (varidx, &varidx_delta) &&
+          varidx_delta->first != HB_OT_LAYOUT_NO_VARIATIONS_INDEX)
+        return;
+    }
+    *format = *format & ~flag;
+  }
 };
 
 }
diff --git a/src/java.desktop/share/native/libharfbuzz/OT/Layout/GSUB/AlternateSubstFormat1.hh b/src/java.desktop/share/native/libharfbuzz/OT/Layout/GSUB/AlternateSubstFormat1.hh
index adec65d5864..421a6e06627 100644
--- a/src/java.desktop/share/native/libharfbuzz/OT/Layout/GSUB/AlternateSubstFormat1.hh
+++ b/src/java.desktop/share/native/libharfbuzz/OT/Layout/GSUB/AlternateSubstFormat1.hh
@@ -74,7 +74,7 @@ struct AlternateSubstFormat1_2
     TRACE_APPLY (this);
 
     unsigned int index = (this+coverage).get_coverage (c->buffer->cur().codepoint);
-    if (likely (index == NOT_COVERED)) return_trace (false);
+    if (index == NOT_COVERED) return_trace (false);
 
     return_trace ((this+alternateSet[index]).apply (c));
   }
diff --git a/src/java.desktop/share/native/libharfbuzz/OT/Layout/GSUB/Ligature.hh b/src/java.desktop/share/native/libharfbuzz/OT/Layout/GSUB/Ligature.hh
index de4a111b46c..726da458fac 100644
--- a/src/java.desktop/share/native/libharfbuzz/OT/Layout/GSUB/Ligature.hh
+++ b/src/java.desktop/share/native/libharfbuzz/OT/Layout/GSUB/Ligature.hh
@@ -90,8 +90,17 @@ struct Ligature
 
     unsigned int total_component_count = 0;
 
+    if (unlikely (count > HB_MAX_CONTEXT_LENGTH)) return false;
+    unsigned match_positions_stack[4];
+    unsigned *match_positions = match_positions_stack;
+    if (unlikely (count > ARRAY_LENGTH (match_positions_stack)))
+    {
+      match_positions = (unsigned *) hb_malloc (hb_max (count, 1u) * sizeof (unsigned));
+      if (unlikely (!match_positions))
+        return_trace (false);
+    }
+
     unsigned int match_end = 0;
-    unsigned int match_positions[HB_MAX_CONTEXT_LENGTH];
 
     if (likely (!match_input (c, count,
                               &component[1],
@@ -102,6 +111,8 @@ struct Ligature
                               &total_component_count)))
     {
       c->buffer->unsafe_to_concat (c->buffer->idx, match_end);
+      if (match_positions != match_positions_stack)
+        hb_free (match_positions);
       return_trace (false);
     }
 
@@ -145,6 +156,8 @@ struct Ligature
                           pos);
     }
 
+    if (match_positions != match_positions_stack)
+      hb_free (match_positions);
     return_trace (true);
   }
 
diff --git a/src/java.desktop/share/native/libharfbuzz/OT/Layout/GSUB/LigatureSubstFormat1.hh b/src/java.desktop/share/native/libharfbuzz/OT/Layout/GSUB/LigatureSubstFormat1.hh
index 5c7df97d13a..6ae24b33754 100644
--- a/src/java.desktop/share/native/libharfbuzz/OT/Layout/GSUB/LigatureSubstFormat1.hh
+++ b/src/java.desktop/share/native/libharfbuzz/OT/Layout/GSUB/LigatureSubstFormat1.hh
@@ -78,12 +78,49 @@ struct LigatureSubstFormat1_2
     return lig_set.would_apply (c);
   }
 
-  bool apply (hb_ot_apply_context_t *c) const
+  unsigned cache_cost () const
+  {
+    return (this+coverage).cost ();
+  }
+  static void * cache_func (void *p, hb_ot_lookup_cache_op_t op)
+  {
+    switch (op)
+    {
+      case hb_ot_lookup_cache_op_t::CREATE:
+      {
+        hb_ot_lookup_cache_t *cache = (hb_ot_lookup_cache_t *) hb_malloc (sizeof (hb_ot_lookup_cache_t));
+        if (likely (cache))
+          cache->clear ();
+        return cache;
+      }
+      case hb_ot_lookup_cache_op_t::ENTER:
+        return (void *) true;
+      case hb_ot_lookup_cache_op_t::LEAVE:
+        return nullptr;
+      case hb_ot_lookup_cache_op_t::DESTROY:
+      {
+        hb_ot_lookup_cache_t *cache = (hb_ot_lookup_cache_t *) p;
+        hb_free (cache);
+        return nullptr;
+      }
+    }
+    return nullptr;
+  }
+
+  bool apply_cached (hb_ot_apply_context_t *c) const { return _apply (c, true); }
+  bool apply (hb_ot_apply_context_t *c) const { return _apply (c, false); }
+  bool _apply (hb_ot_apply_context_t *c, bool cached) const
   {
     TRACE_APPLY (this);
+    hb_buffer_t *buffer = c->buffer;
 
-    unsigned int index = (this+coverage).get_coverage (c->buffer->cur ().codepoint);
-    if (likely (index == NOT_COVERED)) return_trace (false);
+#ifndef HB_NO_OT_LAYOUT_LOOKUP_CACHE
+    hb_ot_lookup_cache_t *cache = cached ? (hb_ot_lookup_cache_t *) c->lookup_accel->cache : nullptr;
+    unsigned int index = (this+coverage).get_coverage  (buffer->cur().codepoint, cache);
+#else
+    unsigned int index = (this+coverage).get_coverage  (buffer->cur().codepoint);
+#endif
+    if (index == NOT_COVERED) return_trace (false);
 
     const auto &lig_set = this+ligatureSet[index];
     return_trace (lig_set.apply (c));
diff --git a/src/java.desktop/share/native/libharfbuzz/OT/Layout/GSUB/MultipleSubstFormat1.hh b/src/java.desktop/share/native/libharfbuzz/OT/Layout/GSUB/MultipleSubstFormat1.hh
index 4a9972c29cc..aec8d0f2c07 100644
--- a/src/java.desktop/share/native/libharfbuzz/OT/Layout/GSUB/MultipleSubstFormat1.hh
+++ b/src/java.desktop/share/native/libharfbuzz/OT/Layout/GSUB/MultipleSubstFormat1.hh
@@ -66,7 +66,7 @@ struct MultipleSubstFormat1_2
     TRACE_APPLY (this);
 
     unsigned int index = (this+coverage).get_coverage (c->buffer->cur().codepoint);
-    if (likely (index == NOT_COVERED)) return_trace (false);
+    if (index == NOT_COVERED) return_trace (false);
 
     return_trace ((this+sequence[index]).apply (c));
   }
diff --git a/src/java.desktop/share/native/libharfbuzz/OT/Layout/GSUB/ReverseChainSingleSubstFormat1.hh b/src/java.desktop/share/native/libharfbuzz/OT/Layout/GSUB/ReverseChainSingleSubstFormat1.hh
index ec6dfa47647..400a9e73791 100644
--- a/src/java.desktop/share/native/libharfbuzz/OT/Layout/GSUB/ReverseChainSingleSubstFormat1.hh
+++ b/src/java.desktop/share/native/libharfbuzz/OT/Layout/GSUB/ReverseChainSingleSubstFormat1.hh
@@ -33,9 +33,11 @@ struct ReverseChainSingleSubstFormat1
     TRACE_SANITIZE (this);
     if (!(coverage.sanitize (c, this) && backtrack.sanitize (c, this)))
       return_trace (false);
+    hb_barrier ();
     const auto &lookahead = StructAfter<decltype (lookaheadX)> (backtrack);
     if (!lookahead.sanitize (c, this))
       return_trace (false);
+    hb_barrier ();
     const auto &substitute = StructAfter<decltype (substituteX)> (lookahead);
     return_trace (substitute.sanitize (c));
   }
@@ -109,12 +111,12 @@ struct ReverseChainSingleSubstFormat1
   bool apply (hb_ot_apply_context_t *c) const
   {
     TRACE_APPLY (this);
+    unsigned int index = (this+coverage).get_coverage (c->buffer->cur ().codepoint);
+    if (index == NOT_COVERED) return_trace (false);
+
     if (unlikely (c->nesting_level_left != HB_MAX_NESTING_LEVEL))
       return_trace (false); /* No chaining to this type */
 
-    unsigned int index = (this+coverage).get_coverage (c->buffer->cur ().codepoint);
-    if (likely (index == NOT_COVERED)) return_trace (false);
-
     const auto &lookahead = StructAfter<decltype (lookaheadX)> (backtrack);
     const auto &substitute = StructAfter<decltype (substituteX)> (lookahead);
 
diff --git a/src/java.desktop/share/native/libharfbuzz/OT/Layout/GSUB/SingleSubstFormat1.hh b/src/java.desktop/share/native/libharfbuzz/OT/Layout/GSUB/SingleSubstFormat1.hh
index 268487c5ae7..be6cd820d28 100644
--- a/src/java.desktop/share/native/libharfbuzz/OT/Layout/GSUB/SingleSubstFormat1.hh
+++ b/src/java.desktop/share/native/libharfbuzz/OT/Layout/GSUB/SingleSubstFormat1.hh
@@ -128,7 +128,7 @@ struct SingleSubstFormat1_3
     TRACE_APPLY (this);
     hb_codepoint_t glyph_id = c->buffer->cur().codepoint;
     unsigned int index = (this+coverage).get_coverage (glyph_id);
-    if (likely (index == NOT_COVERED)) return_trace (false);
+    if (index == NOT_COVERED) return_trace (false);
 
     hb_codepoint_t d = deltaGlyphID;
     hb_codepoint_t mask = get_mask ();
diff --git a/src/java.desktop/share/native/libharfbuzz/OT/Layout/GSUB/SingleSubstFormat2.hh b/src/java.desktop/share/native/libharfbuzz/OT/Layout/GSUB/SingleSubstFormat2.hh
index 51890011671..e9096460451 100644
--- a/src/java.desktop/share/native/libharfbuzz/OT/Layout/GSUB/SingleSubstFormat2.hh
+++ b/src/java.desktop/share/native/libharfbuzz/OT/Layout/GSUB/SingleSubstFormat2.hh
@@ -104,7 +104,7 @@ struct SingleSubstFormat2_4
   {
     TRACE_APPLY (this);
     unsigned int index = (this+coverage).get_coverage (c->buffer->cur().codepoint);
-    if (likely (index == NOT_COVERED)) return_trace (false);
+    if (index == NOT_COVERED) return_trace (false);
 
     if (unlikely (index >= substitute.len)) return_trace (false);
 
diff --git a/src/java.desktop/share/native/libharfbuzz/OT/Layout/types.hh b/src/java.desktop/share/native/libharfbuzz/OT/Layout/types.hh
index 6a43403e94b..527f64114b4 100644
--- a/src/java.desktop/share/native/libharfbuzz/OT/Layout/types.hh
+++ b/src/java.desktop/share/native/libharfbuzz/OT/Layout/types.hh
@@ -29,6 +29,9 @@
 #ifndef OT_LAYOUT_TYPES_HH
 #define OT_LAYOUT_TYPES_HH
 
+using hb_ot_lookup_cache_t = hb_cache_t<15, 8, 7>;
+static_assert (sizeof (hb_ot_lookup_cache_t) == 256, "");
+
 namespace OT {
 namespace Layout {
 
@@ -38,8 +41,8 @@ struct SmallTypes {
   using HBUINT = HBUINT16;
   using HBGlyphID = HBGlyphID16;
   using Offset = Offset16;
-  template <typename Type, bool has_null=true>
-  using OffsetTo = OT::Offset16To<Type, has_null>;
+  template <typename Type, typename BaseType=void, bool has_null=true>
+  using OffsetTo = OT::Offset16To<Type, BaseType, has_null>;
   template <typename Type>
   using ArrayOf = OT::Array16Of<Type>;
   template <typename Type>
@@ -52,8 +55,8 @@ struct MediumTypes {
   using HBUINT = HBUINT24;
   using HBGlyphID = HBGlyphID24;
   using Offset = Offset24;
-  template <typename Type, bool has_null=true>
-  using OffsetTo = OT::Offset24To<Type, has_null>;
+  template <typename Type, typename BaseType=void, bool has_null=true>
+  using OffsetTo = OT::Offset24To<Type, BaseType, has_null>;
   template <typename Type>
   using ArrayOf = OT::Array24Of<Type>;
   template <typename Type>
diff --git a/src/java.desktop/share/native/libharfbuzz/OT/Var/VARC/VARC.hh b/src/java.desktop/share/native/libharfbuzz/OT/Var/VARC/VARC.hh
new file mode 100644
index 00000000000..dbbbec9eee0
--- /dev/null
+++ b/src/java.desktop/share/native/libharfbuzz/OT/Var/VARC/VARC.hh
@@ -0,0 +1,218 @@
+#ifndef OT_VAR_VARC_VARC_HH
+#define OT_VAR_VARC_VARC_HH
+
+#include "../../../hb-decycler.hh"
+#include "../../../hb-geometry.hh"
+#include "../../../hb-ot-layout-common.hh"
+#include "../../../hb-ot-glyf-table.hh"
+#include "../../../hb-ot-cff2-table.hh"
+#include "../../../hb-ot-cff1-table.hh"
+
+#include "coord-setter.hh"
+
+namespace OT {
+
+//namespace Var {
+
+/*
+ * VARC -- Variable Composites
+ * https://github.com/harfbuzz/boring-expansion-spec/blob/main/VARC.md
+ */
+
+#ifndef HB_NO_VAR_COMPOSITES
+
+struct VarComponent
+{
+  enum class flags_t : uint32_t
+  {
+    RESET_UNSPECIFIED_AXES      = 1u << 0,
+    HAVE_AXES                   = 1u << 1,
+    AXIS_VALUES_HAVE_VARIATION  = 1u << 2,
+    TRANSFORM_HAS_VARIATION     = 1u << 3,
+    HAVE_TRANSLATE_X            = 1u << 4,
+    HAVE_TRANSLATE_Y            = 1u << 5,
+    HAVE_ROTATION               = 1u << 6,
+    HAVE_CONDITION              = 1u << 7,
+    HAVE_SCALE_X                = 1u << 8,
+    HAVE_SCALE_Y                = 1u << 9,
+    HAVE_TCENTER_X              = 1u << 10,
+    HAVE_TCENTER_Y              = 1u << 11,
+    GID_IS_24BIT                = 1u << 12,
+    HAVE_SKEW_X                 = 1u << 13,
+    HAVE_SKEW_Y                 = 1u << 14,
+    RESERVED_MASK               = ~((1u << 15) - 1),
+  };
+
+  HB_INTERNAL hb_ubytes_t
+  get_path_at (hb_font_t *font,
+               hb_codepoint_t parent_gid,
+               hb_draw_session_t &draw_session,
+               hb_array_t<const int> coords,
+               hb_transform_t transform,
+               hb_ubytes_t record,
+               hb_decycler_t *decycler,
+               signed *edges_left,
+               signed depth_left,
+               hb_glyf_scratch_t &scratch,
+               VarRegionList::cache_t *cache = nullptr) const;
+};
+
+struct VarCompositeGlyph
+{
+  static void
+  get_path_at (hb_font_t *font,
+               hb_codepoint_t glyph,
+               hb_draw_session_t &draw_session,
+               hb_array_t<const int> coords,
+               hb_transform_t transform,
+               hb_ubytes_t record,
+               hb_decycler_t *decycler,
+               signed *edges_left,
+               signed depth_left,
+               hb_glyf_scratch_t &scratch,
+               VarRegionList::cache_t *cache = nullptr)
+  {
+    while (record)
+    {
+      const VarComponent &comp = * (const VarComponent *) (record.arrayZ);
+      record = comp.get_path_at (font, glyph,
+                                 draw_session, coords, transform,
+                                 record,
+                                 decycler, edges_left, depth_left, scratch, cache);
+    }
+  }
+};
+
+HB_MARK_AS_FLAG_T (VarComponent::flags_t);
+
+struct VARC
+{
+  friend struct VarComponent;
+
+  static constexpr hb_tag_t tableTag = HB_TAG ('V', 'A', 'R', 'C');
+
+  HB_INTERNAL bool
+  get_path_at (hb_font_t *font,
+               hb_codepoint_t glyph,
+               hb_draw_session_t &draw_session,
+               hb_array_t<const int> coords,
+               hb_transform_t transform,
+               hb_codepoint_t parent_glyph,
+               hb_decycler_t *decycler,
+               signed *edges_left,
+               signed depth_left,
+               hb_glyf_scratch_t &scratch) const;
+
+  bool
+  get_path (hb_font_t *font,
+            hb_codepoint_t gid,
+            hb_draw_session_t &draw_session,
+            hb_glyf_scratch_t &scratch) const
+  {
+    hb_decycler_t decycler;
+    signed edges = HB_MAX_GRAPH_EDGE_COUNT;
+
+    return get_path_at (font,
+                        gid,
+                        draw_session,
+                        hb_array (font->coords, font->num_coords),
+                        HB_TRANSFORM_IDENTITY,
+                        HB_CODEPOINT_INVALID,
+                        &decycler,
+                        &edges,
+                        HB_MAX_NESTING_LEVEL,
+                        scratch);
+  }
+
+  bool sanitize (hb_sanitize_context_t *c) const
+  {
+    TRACE_SANITIZE (this);
+    return_trace (version.sanitize (c) &&
+                  hb_barrier () &&
+                  version.major == 1 &&
+                  coverage.sanitize (c, this) &&
+                  varStore.sanitize (c, this) &&
+                  conditionList.sanitize (c, this) &&
+                  axisIndicesList.sanitize (c, this) &&
+                  glyphRecords.sanitize (c, this));
+  }
+
+  struct accelerator_t
+  {
+    friend struct VarComponent;
+
+    accelerator_t (hb_face_t *face)
+    {
+      table = hb_sanitize_context_t ().reference_table<VARC> (face);
+    }
+    ~accelerator_t ()
+    {
+      auto *scratch = cached_scratch.get_relaxed ();
+      if (scratch)
+      {
+        scratch->~hb_glyf_scratch_t ();
+        hb_free (scratch);
+      }
+
+      table.destroy ();
+    }
+
+    bool
+    get_path (hb_font_t *font, hb_codepoint_t gid, hb_draw_session_t &draw_session) const
+    {
+      if (!table->has_data ()) return false;
+
+      hb_glyf_scratch_t *scratch;
+
+      // Borrow the cached strach buffer.
+      {
+        scratch = cached_scratch.get_acquire ();
+        if (!scratch || unlikely (!cached_scratch.cmpexch (scratch, nullptr)))
+        {
+          scratch = (hb_glyf_scratch_t *) hb_calloc (1, sizeof (hb_glyf_scratch_t));
+          if (unlikely (!scratch))
+            return true;
+        }
+      }
+
+      bool ret = table->get_path (font, gid, draw_session, *scratch);
+
+      // Put it back.
+      if (!cached_scratch.cmpexch (nullptr, scratch))
+      {
+        scratch->~hb_glyf_scratch_t ();
+        hb_free (scratch);
+      }
+
+      return ret;
+    }
+
+    private:
+    hb_blob_ptr_t<VARC> table;
+    hb_atomic_ptr_t<hb_glyf_scratch_t> cached_scratch;
+  };
+
+  bool has_data () const { return version.major != 0; }
+
+  protected:
+  FixedVersion<> version; /* Version identifier */
+  Offset32To<Coverage> coverage;
+  Offset32To<MultiItemVariationStore> varStore;
+  Offset32To<ConditionList> conditionList;
+  Offset32To<TupleList> axisIndicesList;
+  Offset32To<CFF2Index/*Of<VarCompositeGlyph>*/> glyphRecords;
+  public:
+  DEFINE_SIZE_STATIC (24);
+};
+
+struct VARC_accelerator_t : VARC::accelerator_t {
+  VARC_accelerator_t (hb_face_t *face) : VARC::accelerator_t (face) {}
+};
+
+#endif
+
+//}
+
+}
+
+#endif  /* OT_VAR_VARC_VARC_HH */
diff --git a/src/java.desktop/share/native/libharfbuzz/OT/Var/VARC/coord-setter.hh b/src/java.desktop/share/native/libharfbuzz/OT/Var/VARC/coord-setter.hh
new file mode 100644
index 00000000000..70c0968e1e4
--- /dev/null
+++ b/src/java.desktop/share/native/libharfbuzz/OT/Var/VARC/coord-setter.hh
@@ -0,0 +1,63 @@
+#ifndef OT_VAR_VARC_COORD_SETTER_HH
+#define OT_VAR_VARC_COORD_SETTER_HH
+
+
+#include "../../../hb.hh"
+
+
+namespace OT {
+//namespace Var {
+
+
+struct coord_setter_t
+{
+  coord_setter_t (hb_array_t<const int> coords_)
+  {
+    length = coords_.length;
+    if (length <= ARRAY_LENGTH (static_coords))
+      hb_memcpy (static_coords, coords_.arrayZ, length * sizeof (int));
+    else
+      dynamic_coords.extend (coords_);
+  }
+
+  int& operator [] (unsigned idx)
+  {
+    if (unlikely (idx >= HB_VAR_COMPOSITE_MAX_AXES))
+      return Crap(int);
+
+    if (length <= ARRAY_LENGTH (static_coords))
+    {
+      if (idx < ARRAY_LENGTH (static_coords))
+      {
+        while (length <= idx)
+          static_coords[length++] = 0;
+        return static_coords[idx];
+      }
+      else
+        dynamic_coords.extend (hb_array (static_coords, length));
+    }
+
+    if (dynamic_coords.length <= idx)
+    {
+      if (unlikely (!dynamic_coords.resize (idx + 1)))
+        return Crap(int);
+      length = idx + 1;
+    }
+    return dynamic_coords.arrayZ[idx];
+  }
+
+  hb_array_t<int> get_coords ()
+  { return length <= ARRAY_LENGTH (static_coords) ? hb_array (static_coords, length) : dynamic_coords.as_array (); }
+
+  private:
+  hb_vector_t<int> dynamic_coords;
+  unsigned length;
+  int static_coords[sizeof (void *) * 8];
+};
+
+
+//} // namespace Var
+
+} // namespace OT
+
+#endif /* OT_VAR_VARC_COORD_SETTER_HH */
diff --git a/src/java.desktop/share/native/libharfbuzz/OT/glyf/CompositeGlyph.hh b/src/java.desktop/share/native/libharfbuzz/OT/glyf/CompositeGlyph.hh
index 151c1ac48cb..fb347770e6f 100644
--- a/src/java.desktop/share/native/libharfbuzz/OT/glyf/CompositeGlyph.hh
+++ b/src/java.desktop/share/native/libharfbuzz/OT/glyf/CompositeGlyph.hh
@@ -143,7 +143,7 @@ struct CompositeGlyphRecord
     float matrix[4];
     contour_point_t trans;
     get_transformation (matrix, trans);
-    if (unlikely (!points.alloc (points.length + 4))) return false; // For phantom points
+    if (unlikely (!points.alloc (points.length + 1 + 4))) return false; // For phantom points
     points.push (trans);
     return true;
   }
@@ -240,7 +240,8 @@ struct CompositeGlyphRecord
     }
     if (is_anchored ()) tx = ty = 0;
 
-    trans.init ((float) tx, (float) ty);
+    /* set is_end_point flag to true, used by IUP delta optimization */
+    trans.init ((float) tx, (float) ty, true);
 
     {
       const F2DOT14 *points = (const F2DOT14 *) p;
diff --git a/src/java.desktop/share/native/libharfbuzz/OT/glyf/Glyph.hh b/src/java.desktop/share/native/libharfbuzz/OT/glyf/Glyph.hh
index b295e41510f..1805df262aa 100644
--- a/src/java.desktop/share/native/libharfbuzz/OT/glyf/Glyph.hh
+++ b/src/java.desktop/share/native/libharfbuzz/OT/glyf/Glyph.hh
@@ -7,8 +7,6 @@
 #include "GlyphHeader.hh"
 #include "SimpleGlyph.hh"
 #include "CompositeGlyph.hh"
-#include "VarCompositeGlyph.hh"
-#include "coord-setter.hh"
 
 
 namespace OT {
@@ -33,9 +31,6 @@ struct Glyph
     EMPTY,
     SIMPLE,
     COMPOSITE,
-#ifndef HB_NO_VAR_COMPOSITES
-    VAR_COMPOSITE,
-#endif
   };
 
   public:
@@ -44,22 +39,10 @@ struct Glyph
     if (type != COMPOSITE) return composite_iter_t ();
     return CompositeGlyph (*header, bytes).iter ();
   }
-  var_composite_iter_t get_var_composite_iterator () const
-  {
-#ifndef HB_NO_VAR_COMPOSITES
-    if (type != VAR_COMPOSITE) return var_composite_iter_t ();
-    return VarCompositeGlyph (*header, bytes).iter ();
-#else
-    return var_composite_iter_t ();
-#endif
-  }
 
   const hb_bytes_t trim_padding () const
   {
     switch (type) {
-#ifndef HB_NO_VAR_COMPOSITES
-    case VAR_COMPOSITE: return VarCompositeGlyph (*header, bytes).trim_padding ();
-#endif
     case COMPOSITE: return CompositeGlyph (*header, bytes).trim_padding ();
     case SIMPLE:    return SimpleGlyph (*header, bytes).trim_padding ();
     case EMPTY:     return bytes;
@@ -70,9 +53,6 @@ struct Glyph
   void drop_hints ()
   {
     switch (type) {
-#ifndef HB_NO_VAR_COMPOSITES
-    case VAR_COMPOSITE: return; // No hinting
-#endif
     case COMPOSITE: CompositeGlyph (*header, bytes).drop_hints (); return;
     case SIMPLE:    SimpleGlyph (*header, bytes).drop_hints (); return;
     case EMPTY:     return;
@@ -82,9 +62,6 @@ struct Glyph
   void set_overlaps_flag ()
   {
     switch (type) {
-#ifndef HB_NO_VAR_COMPOSITES
-    case VAR_COMPOSITE: return; // No overlaps flag
-#endif
     case COMPOSITE: CompositeGlyph (*header, bytes).set_overlaps_flag (); return;
     case SIMPLE:    SimpleGlyph (*header, bytes).set_overlaps_flag (); return;
     case EMPTY:     return;
@@ -94,15 +71,15 @@ struct Glyph
   void drop_hints_bytes (hb_bytes_t &dest_start, hb_bytes_t &dest_end) const
   {
     switch (type) {
-#ifndef HB_NO_VAR_COMPOSITES
-    case VAR_COMPOSITE: return; // No hinting
-#endif
     case COMPOSITE: CompositeGlyph (*header, bytes).drop_hints_bytes (dest_start); return;
     case SIMPLE:    SimpleGlyph (*header, bytes).drop_hints_bytes (dest_start, dest_end); return;
     case EMPTY:     return;
     }
   }
 
+  bool is_composite () const
+  { return type == COMPOSITE; }
+
   bool get_all_points_without_var (const hb_face_t *face,
                                    contour_point_vector_t &points /* OUT */) const
   {
@@ -117,14 +94,6 @@ struct Glyph
         if (unlikely (!item.get_points (points))) return false;
       break;
     }
-#ifndef HB_NO_VAR_COMPOSITES
-    case VAR_COMPOSITE:
-    {
-      for (auto &item : get_var_composite_iterator ())
-        if (unlikely (!item.get_points (points))) return false;
-      break;
-    }
-#endif
     case EMPTY:
       break;
     }
@@ -282,7 +251,8 @@ struct Glyph
       composite_contours_p = nullptr;
     }
 
-    if (!get_points (font, glyf, all_points, &points_with_deltas, head_maxp_info_p, composite_contours_p, false, false))
+    hb_glyf_scratch_t scratch;
+    if (!get_points (font, glyf, all_points, scratch, &points_with_deltas, head_maxp_info_p, composite_contours_p, false, false))
       return false;
 
     // .notdef, set type to empty so we only update metrics and don't compile bytes for
@@ -300,13 +270,6 @@ struct Glyph
     {
       switch (type)
       {
-#ifndef HB_NO_VAR_COMPOSITES
-      case VAR_COMPOSITE:
-        // TODO
-        dest_end = hb_bytes_t ();
-        break;
-#endif
-
       case COMPOSITE:
         if (!CompositeGlyph (*header, bytes).compile_bytes_with_deltas (dest_start,
                                                                         points_with_deltas,
@@ -343,27 +306,23 @@ struct Glyph
   template <typename accelerator_t>
   bool get_points (hb_font_t *font, const accelerator_t &glyf_accelerator,
                    contour_point_vector_t &all_points /* OUT */,
+                   hb_glyf_scratch_t &scratch,
                    contour_point_vector_t *points_with_deltas = nullptr, /* OUT */
                    head_maxp_info_t * head_maxp_info = nullptr, /* OUT */
                    unsigned *composite_contours = nullptr, /* OUT */
                    bool shift_points_hori = true,
                    bool use_my_metrics = true,
                    bool phantom_only = false,
-                   hb_array_t<int> coords = hb_array_t<int> (),
-                   hb_map_t *current_glyphs = nullptr,
+                   hb_array_t<const int> coords = hb_array_t<const int> (),
                    unsigned int depth = 0,
                    unsigned *edge_count = nullptr) const
   {
     if (unlikely (depth > HB_MAX_NESTING_LEVEL)) return false;
     unsigned stack_edge_count = 0;
     if (!edge_count) edge_count = &stack_edge_count;
-    if (unlikely (*edge_count > HB_GLYF_MAX_EDGE_COUNT)) return false;
+    if (unlikely (*edge_count > HB_MAX_GRAPH_EDGE_COUNT)) return false;
     (*edge_count)++;
 
-    hb_map_t current_glyphs_stack;
-    if (current_glyphs == nullptr)
-      current_glyphs = &current_glyphs_stack;
-
     if (head_maxp_info)
     {
       head_maxp_info->maxComponentDepth = hb_max (head_maxp_info->maxComponentDepth, depth);
@@ -372,8 +331,7 @@ struct Glyph
     if (!coords)
       coords = hb_array (font->coords, font->num_coords);
 
-    contour_point_vector_t stack_points;
-    contour_point_vector_t &points = type == SIMPLE ? all_points : stack_points;
+    contour_point_vector_t &points = type == SIMPLE ? all_points : scratch.comp_points;
     unsigned old_length = points.length;
 
     switch (type) {
@@ -391,14 +349,6 @@ struct Glyph
         if (unlikely (!item.get_points (points))) return false;
       break;
     }
-#ifndef HB_NO_VAR_COMPOSITES
-    case VAR_COMPOSITE:
-    {
-      for (auto &item : get_var_composite_iterator ())
-        if (unlikely (!item.get_points (points))) return false;
-      break;
-    }
-#endif
     case EMPTY:
       break;
     }
@@ -434,36 +384,53 @@ struct Glyph
 
 #ifndef HB_NO_VAR
     if (coords)
-      glyf_accelerator.gvar->apply_deltas_to_points (gid,
-                                                     coords,
-                                                     points.as_array ().sub_array (old_length),
-                                                     phantom_only && type == SIMPLE);
+    {
+#ifndef HB_NO_BEYOND_64K
+      if (glyf_accelerator.GVAR->has_data ())
+        glyf_accelerator.GVAR->apply_deltas_to_points (gid,
+                                                       coords,
+                                                       points.as_array ().sub_array (old_length),
+                                                       scratch,
+                                                       phantom_only && type == SIMPLE);
+      else
+#endif
+        glyf_accelerator.gvar->apply_deltas_to_points (gid,
+                                                       coords,
+                                                       points.as_array ().sub_array (old_length),
+                                                       scratch,
+                                                       phantom_only && type == SIMPLE);
+    }
 #endif
 
     // mainly used by CompositeGlyph calculating new X/Y offset value so no need to extend it
     // with child glyphs' points
     if (points_with_deltas != nullptr && depth == 0 && type == COMPOSITE)
     {
-      if (unlikely (!points_with_deltas->resize (points.length))) return false;
+      assert (old_length == 0);
       *points_with_deltas = points;
     }
 
+    float shift = 0;
     switch (type) {
     case SIMPLE:
       if (depth == 0 && head_maxp_info)
         head_maxp_info->maxPoints = hb_max (head_maxp_info->maxPoints, all_points.length - old_length - 4);
+      shift = phantoms[PHANTOM_LEFT].x;
       break;
     case COMPOSITE:
     {
+      hb_decycler_node_t decycler_node (scratch.decycler);
+
       unsigned int comp_index = 0;
       for (auto &item : get_composite_iterator ())
       {
         hb_codepoint_t item_gid = item.get_gid ();
 
-        if (unlikely (current_glyphs->has (item_gid)))
+        if (unlikely (!decycler_node.visit (item_gid)))
+        {
+          comp_index++;
           continue;
-
-        current_glyphs->add (item_gid);
+        }
 
         unsigned old_count = all_points.length;
 
@@ -472,6 +439,7 @@ struct Glyph
                                        .get_points (font,
                                                     glyf_accelerator,
                                                     all_points,
+                                                    scratch,
                                                     points_with_deltas,
                                                     head_maxp_info,
                                                     composite_contours,
@@ -479,14 +447,16 @@ struct Glyph
                                                     use_my_metrics,
                                                     phantom_only,
                                                     coords,
-                                                    current_glyphs,
                                                     depth + 1,
                                                     edge_count)))
         {
-          current_glyphs->del (item_gid);
+          points.resize (old_length);
           return false;
         }
 
+        // points might have been reallocated. Relocate phantoms.
+        phantoms = points.as_array ().sub_array (points.length - PHANTOM_COUNT, PHANTOM_COUNT);
+
         auto comp_points = all_points.as_array ().sub_array (old_count);
 
         /* Copy phantom points from component if USE_MY_METRICS flag set */
@@ -501,7 +471,7 @@ struct Glyph
           item.get_transformation (matrix, default_trans);
 
           /* Apply component transformation & translation (with deltas applied) */
-          item.transform_points (comp_points, matrix, points[comp_index]);
+          item.transform_points (comp_points, matrix, points[old_length + comp_index]);
         }
 
         if (item.is_anchored () && !phantom_only)
@@ -522,12 +492,11 @@ struct Glyph
 
         if (all_points.length > HB_GLYF_MAX_POINTS)
         {
-          current_glyphs->del (item_gid);
+          points.resize (old_length);
           return false;
         }
 
         comp_index++;
-        current_glyphs->del (item_gid);
       }
 
       if (head_maxp_info && depth == 0)
@@ -538,84 +507,13 @@ struct Glyph
         head_maxp_info->maxComponentElements = hb_max (head_maxp_info->maxComponentElements, comp_index);
       }
       all_points.extend (phantoms);
+      shift = phantoms[PHANTOM_LEFT].x;
+      points.resize (old_length);
     } break;
-#ifndef HB_NO_VAR_COMPOSITES
-    case VAR_COMPOSITE:
-    {
-      hb_array_t<contour_point_t> points_left = points.as_array ();
-      for (auto &item : get_var_composite_iterator ())
-      {
-        hb_codepoint_t item_gid = item.get_gid ();
-
-        if (unlikely (current_glyphs->has (item_gid)))
-          continue;
-
-        current_glyphs->add (item_gid);
-
-        unsigned item_num_points = item.get_num_points ();
-        hb_array_t<contour_point_t> record_points = points_left.sub_array (0, item_num_points);
-        assert (record_points.length == item_num_points);
-
-        auto component_coords = coords;
-        /* Copying coords is expensive; so we have put an arbitrary
-         * limit on the max number of coords for now. */
-        if (item.is_reset_unspecified_axes () ||
-            coords.length > HB_GLYF_VAR_COMPOSITE_MAX_AXES)
-          component_coords = hb_array<int> ();
-
-        coord_setter_t coord_setter (component_coords);
-        item.set_variations (coord_setter, record_points);
-
-        unsigned old_count = all_points.length;
-
-        if (unlikely ((!phantom_only || (use_my_metrics && item.is_use_my_metrics ())) &&
-                      !glyf_accelerator.glyph_for_gid (item_gid)
-                                       .get_points (font,
-                                                    glyf_accelerator,
-                                                    all_points,
-                                                    points_with_deltas,
-                                                    head_maxp_info,
-                                                    nullptr,
-                                                    shift_points_hori,
-                                                    use_my_metrics,
-                                                    phantom_only,
-                                                    coord_setter.get_coords (),
-                                                    current_glyphs,
-                                                    depth + 1,
-                                                    edge_count)))
-        {
-          current_glyphs->del (item_gid);
-          return false;
-        }
-
-        auto comp_points = all_points.as_array ().sub_array (old_count);
-
-        /* Apply component transformation */
-        if (comp_points) // Empty in case of phantom_only
-          item.transform_points (record_points, comp_points);
-
-        /* Copy phantom points from component if USE_MY_METRICS flag set */
-        if (use_my_metrics && item.is_use_my_metrics ())
-          for (unsigned int i = 0; i < PHANTOM_COUNT; i++)
-            phantoms[i] = comp_points[comp_points.length - PHANTOM_COUNT + i];
-
-        all_points.resize (all_points.length - PHANTOM_COUNT);
-
-        if (all_points.length > HB_GLYF_MAX_POINTS)
-        {
-          current_glyphs->del (item_gid);
-          return false;
-        }
-
-        points_left += item_num_points;
-
-        current_glyphs->del (item_gid);
-      }
-      all_points.extend (phantoms);
-    } break;
-#endif
     case EMPTY:
       all_points.extend (phantoms);
+      shift = phantoms[PHANTOM_LEFT].x;
+      points.resize (old_length);
       break;
     }
 
@@ -624,10 +522,9 @@ struct Glyph
       /* Undocumented rasterizer behavior:
        * Shift points horizontally by the updated left side bearing
        */
-      int v = -phantoms[PHANTOM_LEFT].x;
-      if (v)
+      if (shift)
         for (auto &point : all_points)
-          point.x += v;
+          point.x -= shift;
     }
 
     return !all_points.in_error ();
@@ -658,10 +555,7 @@ struct Glyph
     int num_contours = header->numberOfContours;
     if (unlikely (num_contours == 0)) type = EMPTY;
     else if (num_contours > 0) type = SIMPLE;
-    else if (num_contours == -1) type = COMPOSITE;
-#ifndef HB_NO_VAR_COMPOSITES
-    else if (num_contours == -2) type = VAR_COMPOSITE;
-#endif
+    else if (num_contours <= -1) type = COMPOSITE;
     else type = EMPTY; // Spec deviation; Spec says COMPOSITE, but not seen in the wild.
   }
 
diff --git a/src/java.desktop/share/native/libharfbuzz/OT/glyf/SimpleGlyph.hh b/src/java.desktop/share/native/libharfbuzz/OT/glyf/SimpleGlyph.hh
index 5088397266d..601e1303792 100644
--- a/src/java.desktop/share/native/libharfbuzz/OT/glyf/SimpleGlyph.hh
+++ b/src/java.desktop/share/native/libharfbuzz/OT/glyf/SimpleGlyph.hh
@@ -127,19 +127,20 @@ struct SimpleGlyph
                           hb_array_t<contour_point_t> points_ /* IN/OUT */,
                           const HBUINT8 *end)
   {
+    auto *points = points_.arrayZ;
     unsigned count = points_.length;
     for (unsigned int i = 0; i < count;)
     {
       if (unlikely (p + 1 > end)) return false;
       uint8_t flag = *p++;
-      points_.arrayZ[i++].flag = flag;
+      points[i++].flag = flag;
       if (flag & FLAG_REPEAT)
       {
         if (unlikely (p + 1 > end)) return false;
         unsigned int repeat_count = *p++;
         unsigned stop = hb_min (i + repeat_count, count);
         for (; i < stop; i++)
-          points_.arrayZ[i].flag = flag;
+          points[i].flag = flag;
       }
     }
     return true;
@@ -160,10 +161,7 @@ struct SimpleGlyph
       if (flag & short_flag)
       {
         if (unlikely (p + 1 > end)) return false;
-        if (flag & same_flag)
-          v += *p++;
-        else
-          v -= *p++;
+        v += (bool(flag & same_flag) * 2 - 1) * *p++;
       }
       else
       {
@@ -190,7 +188,7 @@ struct SimpleGlyph
     unsigned int num_points = endPtsOfContours[num_contours - 1] + 1;
 
     unsigned old_length = points.length;
-    points.alloc (points.length + num_points + 4, true); // Allocate for phantom points, to avoid a possible copy
+    points.alloc (points.length + num_points + 4); // Allocate for phantom points, to avoid a possible copy
     if (unlikely (!points.resize (points.length + num_points, false))) return false;
     auto points_ = points.as_array ().sub_array (old_length);
     if (!phantom_only)
@@ -281,9 +279,9 @@ struct SimpleGlyph
     unsigned num_points = all_points.length - 4;
 
     hb_vector_t<uint8_t> flags, x_coords, y_coords;
-    if (unlikely (!flags.alloc (num_points, true))) return false;
-    if (unlikely (!x_coords.alloc (2*num_points, true))) return false;
-    if (unlikely (!y_coords.alloc (2*num_points, true))) return false;
+    if (unlikely (!flags.alloc_exact (num_points))) return false;
+    if (unlikely (!x_coords.alloc_exact (2*num_points))) return false;
+    if (unlikely (!y_coords.alloc_exact (2*num_points))) return false;
 
     unsigned lastflag = 255, repeat = 0;
     int prev_x = 0, prev_y = 0;
diff --git a/src/java.desktop/share/native/libharfbuzz/OT/glyf/SubsetGlyph.hh b/src/java.desktop/share/native/libharfbuzz/OT/glyf/SubsetGlyph.hh
index 9c04d890d1a..643b0226492 100644
--- a/src/java.desktop/share/native/libharfbuzz/OT/glyf/SubsetGlyph.hh
+++ b/src/java.desktop/share/native/libharfbuzz/OT/glyf/SubsetGlyph.hh
@@ -53,23 +53,12 @@ struct SubsetGlyph
       if (plan->new_gid_for_old_gid (_.get_gid(), &new_gid))
         const_cast<CompositeGlyphRecord &> (_).set_gid (new_gid);
     }
-#ifndef HB_NO_VAR_COMPOSITES
-    for (auto &_ : Glyph (dest_glyph).get_var_composite_iterator ())
-    {
-      hb_codepoint_t new_gid;
-      if (plan->new_gid_for_old_gid (_.get_gid(), &new_gid))
-        const_cast<VarCompositeGlyphRecord &> (_).set_gid (new_gid);
-    }
-#endif
 
 #ifndef HB_NO_BEYOND_64K
     auto it = Glyph (dest_glyph).get_composite_iterator ();
     if (it)
     {
-      /* lower GID24 to GID16 in components if possible.
-       *
-       * TODO: VarComposite. Not as critical, since VarComposite supports
-       * gid24 from the first version. */
+      /* lower GID24 to GID16 in components if possible. */
       char *p = it ? (char *) &*it : nullptr;
       char *q = p;
       const char *end = dest_glyph.arrayZ + dest_glyph.length;
diff --git a/src/java.desktop/share/native/libharfbuzz/OT/glyf/VarCompositeGlyph.hh b/src/java.desktop/share/native/libharfbuzz/OT/glyf/VarCompositeGlyph.hh
deleted file mode 100644
index 4f29f0aab37..00000000000
--- a/src/java.desktop/share/native/libharfbuzz/OT/glyf/VarCompositeGlyph.hh
+++ /dev/null
@@ -1,401 +0,0 @@
-#ifndef OT_GLYF_VARCOMPOSITEGLYPH_HH
-#define OT_GLYF_VARCOMPOSITEGLYPH_HH
-
-
-#include "../../hb-open-type.hh"
-#include "coord-setter.hh"
-
-
-namespace OT {
-namespace glyf_impl {
-
-
-struct VarCompositeGlyphRecord
-{
-  protected:
-  enum var_composite_glyph_flag_t
-  {
-    USE_MY_METRICS              = 0x0001,
-    AXIS_INDICES_ARE_SHORT      = 0x0002,
-    UNIFORM_SCALE               = 0x0004,
-    HAVE_TRANSLATE_X            = 0x0008,
-    HAVE_TRANSLATE_Y            = 0x0010,
-    HAVE_ROTATION               = 0x0020,
-    HAVE_SCALE_X                = 0x0040,
-    HAVE_SCALE_Y                = 0x0080,
-    HAVE_SKEW_X                 = 0x0100,
-    HAVE_SKEW_Y                 = 0x0200,
-    HAVE_TCENTER_X              = 0x0400,
-    HAVE_TCENTER_Y              = 0x0800,
-    GID_IS_24BIT                = 0x1000,
-    AXES_HAVE_VARIATION         = 0x2000,
-    RESET_UNSPECIFIED_AXES      = 0x4000,
-  };
-
-  public:
-
-  unsigned int get_size () const
-  {
-    unsigned fl = flags;
-    unsigned int size = min_size;
-
-    unsigned axis_width = (fl & AXIS_INDICES_ARE_SHORT) ? 4 : 3;
-    size += numAxes * axis_width;
-
-    if (fl & GID_IS_24BIT)      size += 1;
-
-    // 2 bytes each for the following flags
-    fl = fl & (HAVE_TRANSLATE_X | HAVE_TRANSLATE_Y |
-               HAVE_ROTATION |
-               HAVE_SCALE_X | HAVE_SCALE_Y |
-               HAVE_SKEW_X | HAVE_SKEW_Y |
-               HAVE_TCENTER_X | HAVE_TCENTER_Y);
-    size += hb_popcount (fl) * 2;
-
-    return size;
-  }
-
-  bool has_more () const { return true; }
-
-  bool is_use_my_metrics () const { return flags & USE_MY_METRICS; }
-  bool is_reset_unspecified_axes () const { return flags & RESET_UNSPECIFIED_AXES; }
-
-  hb_codepoint_t get_gid () const
-  {
-    if (flags & GID_IS_24BIT)
-      return * (const HBGlyphID24 *) &pad;
-    else
-      return * (const HBGlyphID16 *) &pad;
-  }
-
-  void set_gid (hb_codepoint_t gid)
-  {
-    if (flags & GID_IS_24BIT)
-      * (HBGlyphID24 *) &pad = gid;
-    else
-      * (HBGlyphID16 *) &pad = gid;
-  }
-
-  unsigned get_numAxes () const
-  {
-    return numAxes;
-  }
-
-  unsigned get_num_points () const
-  {
-    unsigned fl = flags;
-    unsigned num = 0;
-    if (fl & AXES_HAVE_VARIATION)                       num += numAxes;
-
-    /* Hopefully faster code, relying on the value of the flags. */
-    fl = (((fl & (HAVE_TRANSLATE_Y | HAVE_SCALE_Y | HAVE_SKEW_Y | HAVE_TCENTER_Y)) >> 1) | fl) &
-         (HAVE_TRANSLATE_X | HAVE_ROTATION | HAVE_SCALE_X | HAVE_SKEW_X | HAVE_TCENTER_X);
-    num += hb_popcount (fl);
-    return num;
-
-    /* Slower but more readable code. */
-    if (fl & (HAVE_TRANSLATE_X | HAVE_TRANSLATE_Y))     num++;
-    if (fl & HAVE_ROTATION)                             num++;
-    if (fl & (HAVE_SCALE_X | HAVE_SCALE_Y))             num++;
-    if (fl & (HAVE_SKEW_X | HAVE_SKEW_Y))               num++;
-    if (fl & (HAVE_TCENTER_X | HAVE_TCENTER_Y))         num++;
-    return num;
-  }
-
-  void transform_points (hb_array_t<const contour_point_t> record_points,
-                         hb_array_t<contour_point_t> points) const
-  {
-    float matrix[4];
-    contour_point_t trans;
-
-    get_transformation_from_points (record_points.arrayZ, matrix, trans);
-
-    auto arrayZ = points.arrayZ;
-    unsigned count = points.length;
-
-    if (matrix[0] != 1.f || matrix[1] != 0.f ||
-        matrix[2] != 0.f || matrix[3] != 1.f)
-      for (unsigned i = 0; i < count; i++)
-        arrayZ[i].transform (matrix);
-
-    if (trans.x != 0.f || trans.y != 0.f)
-      for (unsigned i = 0; i < count; i++)
-        arrayZ[i].translate (trans);
-  }
-
-  static inline void transform (float (&matrix)[4], contour_point_t &trans,
-                                float (other)[6])
-  {
-    // https://github.com/fonttools/fonttools/blob/f66ee05f71c8b57b5f519ee975e95edcd1466e14/Lib/fontTools/misc/transform.py#L268
-    float xx1 = other[0];
-    float xy1 = other[1];
-    float yx1 = other[2];
-    float yy1 = other[3];
-    float dx1 = other[4];
-    float dy1 = other[5];
-    float xx2 = matrix[0];
-    float xy2 = matrix[1];
-    float yx2 = matrix[2];
-    float yy2 = matrix[3];
-    float dx2 = trans.x;
-    float dy2 = trans.y;
-
-    matrix[0] = xx1*xx2 + xy1*yx2;
-    matrix[1] = xx1*xy2 + xy1*yy2;
-    matrix[2] = yx1*xx2 + yy1*yx2;
-    matrix[3] = yx1*xy2 + yy1*yy2;
-    trans.x = xx2*dx1 + yx2*dy1 + dx2;
-    trans.y = xy2*dx1 + yy2*dy1 + dy2;
-  }
-
-  static void translate (float (&matrix)[4], contour_point_t &trans,
-                         float translateX, float translateY)
-  {
-    if (!translateX && !translateY)
-      return;
-
-    trans.x += matrix[0] * translateX + matrix[2] * translateY;
-    trans.y += matrix[1] * translateX + matrix[3] * translateY;
-  }
-
-  static void scale (float (&matrix)[4], contour_point_t &trans,
-                     float scaleX, float scaleY)
-  {
-    if (scaleX == 1.f && scaleY == 1.f)
-      return;
-
-    matrix[0] *= scaleX;
-    matrix[1] *= scaleX;
-    matrix[2] *= scaleY;
-    matrix[3] *= scaleY;
-  }
-
-  static void rotate (float (&matrix)[4], contour_point_t &trans,
-                      float rotation)
-  {
-    if (!rotation)
-      return;
-
-    // https://github.com/fonttools/fonttools/blob/f66ee05f71c8b57b5f519ee975e95edcd1466e14/Lib/fontTools/misc/transform.py#L240
-    rotation = rotation * HB_PI;
-    float c;
-    float s;
-#ifdef HAVE_SINCOSF
-    sincosf (rotation, &s, &c);
-#else
-    c = cosf (rotation);
-    s = sinf (rotation);
-#endif
-    float other[6] = {c, s, -s, c, 0.f, 0.f};
-    transform (matrix, trans, other);
-  }
-
-  static void skew (float (&matrix)[4], contour_point_t &trans,
-                    float skewX, float skewY)
-  {
-    if (!skewX && !skewY)
-      return;
-
-    // https://github.com/fonttools/fonttools/blob/f66ee05f71c8b57b5f519ee975e95edcd1466e14/Lib/fontTools/misc/transform.py#L255
-    skewX = skewX * HB_PI;
-    skewY = skewY * HB_PI;
-    float other[6] = {1.f,
-                      skewY ? tanf (skewY) : 0.f,
-                      skewX ? tanf (skewX) : 0.f,
-                      1.f,
-                      0.f, 0.f};
-    transform (matrix, trans, other);
-  }
-
-  bool get_points (contour_point_vector_t &points) const
-  {
-    unsigned num_points = get_num_points ();
-
-    points.alloc (points.length + num_points + 4); // For phantom points
-    if (unlikely (!points.resize (points.length + num_points, false))) return false;
-    contour_point_t *rec_points = points.arrayZ + (points.length - num_points);
-    hb_memset (rec_points, 0, num_points * sizeof (rec_points[0]));
-
-    unsigned fl = flags;
-
-    unsigned num_axes = numAxes;
-    unsigned axis_width = (fl & AXIS_INDICES_ARE_SHORT) ? 2 : 1;
-    unsigned axes_size = num_axes * axis_width;
-
-    const F2DOT14 *q = (const F2DOT14 *) (axes_size +
-                                          (fl & GID_IS_24BIT ? 3 : 2) +
-                                          (const HBUINT8 *) &pad);
-
-    unsigned count = num_axes;
-    if (fl & AXES_HAVE_VARIATION)
-    {
-      for (unsigned i = 0; i < count; i++)
-        rec_points++->x = q++->to_int ();
-    }
-    else
-      q += count;
-
-    const HBUINT16 *p = (const HBUINT16 *) q;
-
-    if (fl & (HAVE_TRANSLATE_X | HAVE_TRANSLATE_Y))
-    {
-      int translateX = (fl & HAVE_TRANSLATE_X) ? * (const FWORD *) p++ : 0;
-      int translateY = (fl & HAVE_TRANSLATE_Y) ? * (const FWORD *) p++ : 0;
-      rec_points->x = translateX;
-      rec_points->y = translateY;
-      rec_points++;
-    }
-    if (fl & HAVE_ROTATION)
-    {
-      int rotation = (fl & HAVE_ROTATION) ? ((const F4DOT12 *) p++)->to_int () : 0;
-      rec_points->x = rotation;
-      rec_points++;
-    }
-    if (fl & (HAVE_SCALE_X | HAVE_SCALE_Y))
-    {
-      int scaleX = (fl & HAVE_SCALE_X) ? ((const F6DOT10 *) p++)->to_int () : 1 << 10;
-      int scaleY = (fl & HAVE_SCALE_Y) ? ((const F6DOT10 *) p++)->to_int () : 1 << 10;
-      if ((fl & UNIFORM_SCALE) && !(fl & HAVE_SCALE_Y))
-        scaleY = scaleX;
-      rec_points->x = scaleX;
-      rec_points->y = scaleY;
-      rec_points++;
-    }
-    if (fl & (HAVE_SKEW_X | HAVE_SKEW_Y))
-    {
-      int skewX = (fl & HAVE_SKEW_X) ? ((const F4DOT12 *) p++)->to_int () : 0;
-      int skewY = (fl & HAVE_SKEW_Y) ? ((const F4DOT12 *) p++)->to_int () : 0;
-      rec_points->x = skewX;
-      rec_points->y = skewY;
-      rec_points++;
-    }
-    if (fl & (HAVE_TCENTER_X | HAVE_TCENTER_Y))
-    {
-      int tCenterX = (fl & HAVE_TCENTER_X) ? * (const FWORD *) p++ : 0;
-      int tCenterY = (fl & HAVE_TCENTER_Y) ? * (const FWORD *) p++ : 0;
-      rec_points->x = tCenterX;
-      rec_points->y = tCenterY;
-      rec_points++;
-    }
-
-    return true;
-  }
-
-  void get_transformation_from_points (const contour_point_t *rec_points,
-                                       float (&matrix)[4], contour_point_t &trans) const
-  {
-    unsigned fl = flags;
-
-    if (fl & AXES_HAVE_VARIATION)
-      rec_points += numAxes;
-
-    matrix[0] = matrix[3] = 1.f;
-    matrix[1] = matrix[2] = 0.f;
-    trans.init (0.f, 0.f);
-
-    float translateX = 0.f;
-    float translateY = 0.f;
-    float rotation = 0.f;
-    float scaleX = 1.f;
-    float scaleY = 1.f;
-    float skewX = 0.f;
-    float skewY = 0.f;
-    float tCenterX = 0.f;
-    float tCenterY = 0.f;
-
-    if (fl & (HAVE_TRANSLATE_X | HAVE_TRANSLATE_Y))
-    {
-      translateX = rec_points->x;
-      translateY = rec_points->y;
-      rec_points++;
-    }
-    if (fl & HAVE_ROTATION)
-    {
-      rotation = rec_points->x / (1 << 12);
-      rec_points++;
-    }
-    if (fl & (HAVE_SCALE_X | HAVE_SCALE_Y))
-    {
-      scaleX = rec_points->x / (1 << 10);
-      scaleY = rec_points->y / (1 << 10);
-      rec_points++;
-    }
-    if (fl & (HAVE_SKEW_X | HAVE_SKEW_Y))
-    {
-      skewX = rec_points->x / (1 << 12);
-      skewY = rec_points->y / (1 << 12);
-      rec_points++;
-    }
-    if (fl & (HAVE_TCENTER_X | HAVE_TCENTER_Y))
-    {
-      tCenterX = rec_points->x;
-      tCenterY = rec_points->y;
-      rec_points++;
-    }
-
-    translate (matrix, trans, translateX + tCenterX, translateY + tCenterY);
-    rotate (matrix, trans, rotation);
-    scale (matrix, trans, scaleX, scaleY);
-    skew (matrix, trans, -skewX, skewY);
-    translate (matrix, trans, -tCenterX, -tCenterY);
-  }
-
-  void set_variations (coord_setter_t &setter,
-                       hb_array_t<contour_point_t> rec_points) const
-  {
-    bool have_variations = flags & AXES_HAVE_VARIATION;
-    unsigned axis_width = (flags & AXIS_INDICES_ARE_SHORT) ? 2 : 1;
-    unsigned num_axes = numAxes;
-
-    const HBUINT8  *p = (const HBUINT8 *)  (((HBUINT8 *) &numAxes) + numAxes.static_size + (flags & GID_IS_24BIT ? 3 : 2));
-    const HBUINT16 *q = (const HBUINT16 *) (((HBUINT8 *) &numAxes) + numAxes.static_size + (flags & GID_IS_24BIT ? 3 : 2));
-
-    const F2DOT14 *a = (const F2DOT14 *) ((HBUINT8 *) (axis_width == 1 ? (p + num_axes) : (HBUINT8 *) (q + num_axes)));
-
-    unsigned count = num_axes;
-    for (unsigned i = 0; i < count; i++)
-    {
-      unsigned axis_index = axis_width == 1 ? (unsigned) *p++ : (unsigned) *q++;
-
-      signed v = have_variations ? rec_points.arrayZ[i].x : a++->to_int ();
-
-      v = hb_clamp (v, -(1<<14), (1<<14));
-      setter[axis_index] = v;
-    }
-  }
-
-  protected:
-  HBUINT16      flags;
-  HBUINT8       numAxes;
-  HBUINT16      pad;
-  public:
-  DEFINE_SIZE_MIN (5);
-};
-
-using var_composite_iter_t = composite_iter_tmpl<VarCompositeGlyphRecord>;
-
-struct VarCompositeGlyph
-{
-  const GlyphHeader &header;
-  hb_bytes_t bytes;
-  VarCompositeGlyph (const GlyphHeader &header_, hb_bytes_t bytes_) :
-    header (header_), bytes (bytes_) {}
-
-  var_composite_iter_t iter () const
-  { return var_composite_iter_t (bytes, &StructAfter<VarCompositeGlyphRecord, GlyphHeader> (header)); }
-
-  const hb_bytes_t trim_padding () const
-  {
-    unsigned length = GlyphHeader::static_size;
-    for (auto &comp : iter ())
-      length += comp.get_size ();
-    return bytes.sub_array (0, length);
-  }
-};
-
-
-} /* namespace glyf_impl */
-} /* namespace OT */
-
-
-#endif /* OT_GLYF_VARCOMPOSITEGLYPH_HH */
diff --git a/src/java.desktop/share/native/libharfbuzz/OT/glyf/coord-setter.hh b/src/java.desktop/share/native/libharfbuzz/OT/glyf/coord-setter.hh
deleted file mode 100644
index cf05929362f..00000000000
--- a/src/java.desktop/share/native/libharfbuzz/OT/glyf/coord-setter.hh
+++ /dev/null
@@ -1,36 +0,0 @@
-#ifndef OT_GLYF_COORD_SETTER_HH
-#define OT_GLYF_COORD_SETTER_HH
-
-
-#include "../../hb.hh"
-
-
-namespace OT {
-namespace glyf_impl {
-
-
-struct coord_setter_t
-{
-  coord_setter_t (hb_array_t<int> coords) :
-    coords (coords) {}
-
-  int& operator [] (unsigned idx)
-  {
-    if (unlikely (idx >= HB_GLYF_VAR_COMPOSITE_MAX_AXES))
-      return Crap(int);
-    if (coords.length < idx + 1)
-      coords.resize (idx + 1);
-    return coords[idx];
-  }
-
-  hb_array_t<int> get_coords ()
-  { return coords.as_array (); }
-
-  hb_vector_t<int> coords;
-};
-
-
-} /* namespace glyf_impl */
-} /* namespace OT */
-
-#endif /* OT_GLYF_COORD_SETTER_HH */
diff --git a/src/java.desktop/share/native/libharfbuzz/OT/glyf/glyf-helpers.hh b/src/java.desktop/share/native/libharfbuzz/OT/glyf/glyf-helpers.hh
index 3462e4d1ea5..bd07e941393 100644
--- a/src/java.desktop/share/native/libharfbuzz/OT/glyf/glyf-helpers.hh
+++ b/src/java.desktop/share/native/libharfbuzz/OT/glyf/glyf-helpers.hh
@@ -38,7 +38,7 @@ _write_loca (IteratorIn&& it,
 
     unsigned padded_size = *it++;
     offset += padded_size;
-    DEBUG_MSG (SUBSET, nullptr, "loca entry gid %u offset %u padded-size %u", gid, offset, padded_size);
+    DEBUG_MSG (SUBSET, nullptr, "loca entry gid %" PRIu32 " offset %u padded-size %u", gid, offset, padded_size);
     value = offset >> right_shift;
     *dest++ = value;
 
diff --git a/src/java.desktop/share/native/libharfbuzz/OT/glyf/glyf.hh b/src/java.desktop/share/native/libharfbuzz/OT/glyf/glyf.hh
index 175e1de308c..681c3b9a007 100644
--- a/src/java.desktop/share/native/libharfbuzz/OT/glyf/glyf.hh
+++ b/src/java.desktop/share/native/libharfbuzz/OT/glyf/glyf.hh
@@ -94,7 +94,7 @@ struct glyf
     }
 
     hb_vector_t<unsigned> padded_offsets;
-    if (unlikely (!padded_offsets.alloc (c->plan->new_to_old_gid_list.length, true)))
+    if (unlikely (!padded_offsets.alloc_exact (c->plan->new_to_old_gid_list.length)))
       return_trace (false);
 
     hb_vector_t<glyf_impl::SubsetGlyph> glyphs;
@@ -172,6 +172,9 @@ struct glyf_accelerator_t
     glyf_table = nullptr;
 #ifndef HB_NO_VAR
     gvar = nullptr;
+#ifndef HB_NO_BEYOND_64K
+    GVAR = nullptr;
+#endif
 #endif
     hmtx = nullptr;
 #ifndef HB_NO_VERTICAL
@@ -187,6 +190,9 @@ struct glyf_accelerator_t
     glyf_table = hb_sanitize_context_t ().reference_table<glyf> (face);
 #ifndef HB_NO_VAR
     gvar = face->table.gvar;
+#ifndef HB_NO_BEYOND_64K
+    GVAR = face->table.GVAR;
+#endif
 #endif
     hmtx = face->table.hmtx;
 #ifndef HB_NO_VERTICAL
@@ -198,6 +204,13 @@ struct glyf_accelerator_t
   }
   ~glyf_accelerator_t ()
   {
+    auto *scratch = cached_scratch.get_relaxed ();
+    if (scratch)
+    {
+      scratch->~hb_glyf_scratch_t ();
+      hb_free (scratch);
+    }
+
     glyf_table.destroy ();
   }
 
@@ -205,18 +218,17 @@ struct glyf_accelerator_t
 
   protected:
   template<typename T>
-  bool get_points (hb_font_t *font, hb_codepoint_t gid, T consumer) const
+  bool get_points (hb_font_t *font, hb_codepoint_t gid, T consumer,
+                   hb_array_t<const int> coords,
+                   hb_glyf_scratch_t &scratch) const
   {
     if (gid >= num_glyphs) return false;
 
-    /* Making this allocfree is not that easy
-       https://github.com/harfbuzz/harfbuzz/issues/2095
-       mostly because of gvar handling in VF fonts,
-       perhaps a separate path for non-VF fonts can be considered */
-    contour_point_vector_t all_points;
+    auto &all_points = scratch.all_points;
+    all_points.resize (0);
 
     bool phantom_only = !consumer.is_consuming_contour_points ();
-    if (unlikely (!glyph_for_gid (gid).get_points (font, *this, all_points, nullptr, nullptr, nullptr, true, true, phantom_only)))
+    if (unlikely (!glyph_for_gid (gid).get_points (font, *this, all_points, scratch, nullptr, nullptr, nullptr, true, true, phantom_only, coords)))
       return false;
 
     unsigned count = all_points.length;
@@ -225,8 +237,61 @@ struct glyf_accelerator_t
 
     if (consumer.is_consuming_contour_points ())
     {
-      for (auto &point : all_points.as_array ().sub_array (0, count))
-        consumer.consume_point (point);
+      auto *points = all_points.arrayZ;
+
+      if (false)
+      {
+        /* Our path-builder was designed to work with this simple loop.
+         * But FreeType and CoreText do it differently, so we match those
+         * with the other, more complicated, code branch below. */
+        for (unsigned i = 0; i < count; i++)
+        {
+          consumer.consume_point (points[i]);
+          if (points[i].is_end_point)
+            consumer.contour_end ();
+        }
+      }
+      else
+      {
+        for (unsigned i = 0; i < count; i++)
+        {
+          // Start of a contour.
+          if (points[i].flag & glyf_impl::SimpleGlyph::FLAG_ON_CURVE)
+          {
+            // First point is on-curve. Draw the contour.
+            for (; i < count; i++)
+            {
+              consumer.consume_point (points[i]);
+              if (points[i].is_end_point)
+              {
+                consumer.contour_end ();
+                break;
+              }
+            }
+          }
+          else
+          {
+            unsigned start = i;
+
+            // Find end of the contour.
+            for (; i < count; i++)
+              if (points[i].is_end_point)
+                break;
+
+            unsigned end = i;
+
+            // Enough to start from the end. Our path-builder takes care of the rest.
+            if (likely (end < count)) // Can only fail in case of alloc failure *maybe*.
+              consumer.consume_point (points[end]);
+
+            for (i = start; i < end; i++)
+              consumer.consume_point (points[i]);
+
+            consumer.contour_end ();
+          }
+        }
+      }
+
       consumer.points_end ();
     }
 
@@ -299,6 +364,7 @@ struct glyf_accelerator_t
 
     HB_ALWAYS_INLINE
     void consume_point (const contour_point_t &point) { bounds.add (point); }
+    void contour_end () {}
     void points_end () { bounds.get_extents (font, extents, scaled); }
 
     bool is_consuming_contour_points () { return extents; }
@@ -314,7 +380,12 @@ struct glyf_accelerator_t
 
     contour_point_t phantoms[glyf_impl::PHANTOM_COUNT];
     if (font->num_coords)
-      success = get_points (font, gid, points_aggregator_t (font, nullptr, phantoms, false));
+    {
+      hb_glyf_scratch_t scratch;
+      success = get_points (font, gid, points_aggregator_t (font, nullptr, phantoms, false),
+                            hb_array (font->coords, font->num_coords),
+                            scratch);
+    }
 
     if (unlikely (!success))
       return
@@ -334,9 +405,11 @@ struct glyf_accelerator_t
     if (unlikely (gid >= num_glyphs)) return false;
 
     hb_glyph_extents_t extents;
-
+    hb_glyf_scratch_t scratch;
     contour_point_t phantoms[glyf_impl::PHANTOM_COUNT];
-    if (unlikely (!get_points (font, gid, points_aggregator_t (font, &extents, phantoms, false))))
+    if (unlikely (!get_points (font, gid, points_aggregator_t (font, &extents, phantoms, false),
+                               hb_array (font->coords, font->num_coords),
+                               scratch)))
       return false;
 
     *lsb = is_vertical
@@ -362,20 +435,16 @@ struct glyf_accelerator_t
 
 #ifndef HB_NO_VAR
     if (font->num_coords)
-      return get_points (font, gid, points_aggregator_t (font, extents, nullptr, true));
+    {
+      hb_glyf_scratch_t scratch;
+      return get_points (font, gid, points_aggregator_t (font, extents, nullptr, true),
+                         hb_array (font->coords, font->num_coords),
+                         scratch);
+    }
 #endif
     return glyph_for_gid (gid).get_extents_without_var_scaled (font, *this, extents);
   }
 
-  bool paint_glyph (hb_font_t *font, hb_codepoint_t gid, hb_paint_funcs_t *funcs, void *data, hb_color_t foreground) const
-  {
-    funcs->push_clip_glyph (data, gid, font);
-    funcs->color (data, true, foreground);
-    funcs->pop_clip (data);
-
-    return true;
-  }
-
   const glyf_impl::Glyph
   glyph_for_gid (hb_codepoint_t gid, bool needs_padding_removal = false) const
   {
@@ -406,10 +475,52 @@ struct glyf_accelerator_t
 
   bool
   get_path (hb_font_t *font, hb_codepoint_t gid, hb_draw_session_t &draw_session) const
-  { return get_points (font, gid, glyf_impl::path_builder_t (font, draw_session)); }
+  {
+    if (!has_data ()) return false;
+
+    hb_glyf_scratch_t *scratch;
+
+    // Borrow the cached strach buffer.
+    {
+      scratch = cached_scratch.get_acquire ();
+      if (!scratch || unlikely (!cached_scratch.cmpexch (scratch, nullptr)))
+      {
+        scratch = (hb_glyf_scratch_t *) hb_calloc (1, sizeof (hb_glyf_scratch_t));
+        if (unlikely (!scratch))
+          return true;
+      }
+    }
+
+    bool ret = get_points (font, gid, glyf_impl::path_builder_t (font, draw_session),
+                           hb_array (font->coords, font->num_coords),
+                           *scratch);
+
+    // Put it back.
+    if (!cached_scratch.cmpexch (nullptr, scratch))
+    {
+      scratch->~hb_glyf_scratch_t ();
+      hb_free (scratch);
+    }
+
+    return ret;
+  }
+
+  bool
+  get_path_at (hb_font_t *font, hb_codepoint_t gid, hb_draw_session_t &draw_session,
+               hb_array_t<const int> coords,
+               hb_glyf_scratch_t &scratch) const
+  {
+    if (!has_data ()) return false;
+    return get_points (font, gid, glyf_impl::path_builder_t (font, draw_session),
+                       coords,
+                       scratch);
+  }
 
 #ifndef HB_NO_VAR
   const gvar_accelerator_t *gvar;
+#ifndef HB_NO_BEYOND_64K
+  const GVAR_accelerator_t *GVAR;
+#endif
 #endif
   const hmtx_accelerator_t *hmtx;
 #ifndef HB_NO_VERTICAL
@@ -421,6 +532,7 @@ struct glyf_accelerator_t
   unsigned int num_glyphs;
   hb_blob_ptr_t<loca> loca_table;
   hb_blob_ptr_t<glyf> glyf_table;
+  hb_atomic_ptr_t<hb_glyf_scratch_t> cached_scratch;
 };
 
 
@@ -430,7 +542,7 @@ glyf::_populate_subset_glyphs (const hb_subset_plan_t   *plan,
                                hb_vector_t<glyf_impl::SubsetGlyph>& glyphs /* OUT */) const
 {
   OT::glyf_accelerator_t glyf (plan->source);
-  if (!glyphs.alloc (plan->new_to_old_gid_list.length, true)) return false;
+  if (!glyphs.alloc_exact (plan->new_to_old_gid_list.length)) return false;
 
   for (const auto &pair : plan->new_to_old_gid_list)
   {
diff --git a/src/java.desktop/share/native/libharfbuzz/OT/glyf/path-builder.hh b/src/java.desktop/share/native/libharfbuzz/OT/glyf/path-builder.hh
index d56ea3e45ff..f5495f92332 100644
--- a/src/java.desktop/share/native/libharfbuzz/OT/glyf/path-builder.hh
+++ b/src/java.desktop/share/native/libharfbuzz/OT/glyf/path-builder.hh
@@ -42,7 +42,7 @@ struct path_builder_t
   {
     bool is_on_curve = point.flag & glyf_impl::SimpleGlyph::FLAG_ON_CURVE;
 #ifdef HB_NO_CUBIC_GLYF
-    bool is_cubic = false;
+    constexpr bool is_cubic = false;
 #else
     bool is_cubic = !is_on_curve && (point.flag & glyf_impl::SimpleGlyph::FLAG_CUBIC);
 #endif
@@ -124,58 +124,60 @@ struct path_builder_t
       }
     }
 
-    if (unlikely (point.is_end_point))
-    {
-      if (first_offcurve && last_offcurve)
-      {
-        optional_point_t mid = last_offcurve.mid (first_offcurve2 ?
-                                                  first_offcurve2 :
-                                                  first_offcurve);
-        if (last_offcurve2)
-          draw_session->cubic_to (last_offcurve2.x, last_offcurve2.y,
-                                  last_offcurve.x, last_offcurve.y,
-                                  mid.x, mid.y);
-        else
-          draw_session->quadratic_to (last_offcurve.x, last_offcurve.y,
-                                     mid.x, mid.y);
-        last_offcurve = optional_point_t ();
-      }
-      /* now check the rest */
-
-      if (first_offcurve && first_oncurve)
-      {
-        if (first_offcurve2)
-          draw_session->cubic_to (first_offcurve2.x, first_offcurve2.y,
-                                  first_offcurve.x, first_offcurve.y,
-                                  first_oncurve.x, first_oncurve.y);
-        else
-          draw_session->quadratic_to (first_offcurve.x, first_offcurve.y,
-                                     first_oncurve.x, first_oncurve.y);
-      }
-      else if (last_offcurve && first_oncurve)
-      {
-        if (last_offcurve2)
-          draw_session->cubic_to (last_offcurve2.x, last_offcurve2.y,
-                                  last_offcurve.x, last_offcurve.y,
-                                  first_oncurve.x, first_oncurve.y);
-        else
-          draw_session->quadratic_to (last_offcurve.x, last_offcurve.y,
-                                     first_oncurve.x, first_oncurve.y);
-      }
-      else if (first_oncurve)
-        draw_session->line_to (first_oncurve.x, first_oncurve.y);
-      else if (first_offcurve)
-      {
-        float x = first_offcurve.x, y = first_offcurve.y;
-        draw_session->move_to (x, y);
-        draw_session->quadratic_to (x, y, x, y);
-      }
-
-      /* Getting ready for the next contour */
-      first_oncurve = first_offcurve = last_offcurve = last_offcurve2 = optional_point_t ();
-      draw_session->close_path ();
-    }
   }
+
+  void contour_end ()
+  {
+    if (first_offcurve && last_offcurve)
+    {
+      optional_point_t mid = last_offcurve.mid (first_offcurve2 ?
+                                                first_offcurve2 :
+                                                first_offcurve);
+      if (last_offcurve2)
+        draw_session->cubic_to (last_offcurve2.x, last_offcurve2.y,
+                                last_offcurve.x, last_offcurve.y,
+                                mid.x, mid.y);
+      else
+        draw_session->quadratic_to (last_offcurve.x, last_offcurve.y,
+                                   mid.x, mid.y);
+      last_offcurve = optional_point_t ();
+    }
+    /* now check the rest */
+
+    if (first_offcurve && first_oncurve)
+    {
+      if (first_offcurve2)
+        draw_session->cubic_to (first_offcurve2.x, first_offcurve2.y,
+                                first_offcurve.x, first_offcurve.y,
+                                first_oncurve.x, first_oncurve.y);
+      else
+        draw_session->quadratic_to (first_offcurve.x, first_offcurve.y,
+                                   first_oncurve.x, first_oncurve.y);
+    }
+    else if (last_offcurve && first_oncurve)
+    {
+      if (last_offcurve2)
+        draw_session->cubic_to (last_offcurve2.x, last_offcurve2.y,
+                                last_offcurve.x, last_offcurve.y,
+                                first_oncurve.x, first_oncurve.y);
+      else
+        draw_session->quadratic_to (last_offcurve.x, last_offcurve.y,
+                                   first_oncurve.x, first_oncurve.y);
+    }
+    else if (first_oncurve)
+      draw_session->line_to (first_oncurve.x, first_oncurve.y);
+    else if (first_offcurve)
+    {
+      float x = first_offcurve.x, y = first_offcurve.y;
+      draw_session->move_to (x, y);
+      draw_session->quadratic_to (x, y, x, y);
+    }
+
+    /* Getting ready for the next contour */
+    first_oncurve = first_offcurve = last_offcurve = last_offcurve2 = optional_point_t ();
+    draw_session->close_path ();
+  }
+
   void points_end () {}
 
   bool is_consuming_contour_points () { return true; }
diff --git a/src/java.desktop/share/native/libharfbuzz/OT/name/name.hh b/src/java.desktop/share/native/libharfbuzz/OT/name/name.hh
index f14c2da2de6..b440379afbe 100644
--- a/src/java.desktop/share/native/libharfbuzz/OT/name/name.hh
+++ b/src/java.desktop/share/native/libharfbuzz/OT/name/name.hh
@@ -242,7 +242,9 @@ struct NameRecord
   bool sanitize (hb_sanitize_context_t *c, const void *base) const
   {
     TRACE_SANITIZE (this);
-    return_trace (c->check_struct (this) && offset.sanitize (c, base, length));
+    return_trace (c->check_struct (this) &&
+                  hb_barrier () &&
+                  offset.sanitize (c, base, length));
   }
 
   HBUINT16      platformID;     /* Platform ID. */
@@ -465,6 +467,7 @@ struct name
   {
     TRACE_SANITIZE (this);
     return_trace (c->check_struct (this) &&
+                  hb_barrier () &&
                   likely (format == 0 || format == 1) &&
                   c->check_array (nameRecordZ.arrayZ, count) &&
                   c->check_range (this, stringOffset) &&
@@ -482,7 +485,7 @@ struct name
       const hb_array_t<const NameRecord> all_names (this->table->nameRecordZ.arrayZ,
                                                     this->table->count);
 
-      this->names.alloc (all_names.length, true);
+      this->names.alloc_exact (all_names.length);
 
       for (unsigned int i = 0; i < all_names.length; i++)
       {
diff --git a/src/java.desktop/share/native/libharfbuzz/UPDATING.txt b/src/java.desktop/share/native/libharfbuzz/UPDATING.txt
index 3f72983a455..d536fad05ac 100644
--- a/src/java.desktop/share/native/libharfbuzz/UPDATING.txt
+++ b/src/java.desktop/share/native/libharfbuzz/UPDATING.txt
@@ -53,9 +53,9 @@ STEP 2: BUILD CHANGES INCREMENTALLY
 
 STEP 3: COMPILER WARNINGS AND SETTING FLAGS
 -------------------------------------------
-- Update make parameters in Awt2DLibraries.gmk
+- Update make parameters in make/modules/java.desktop/lib/ClientLibraries.gmk
   Since we don't use configure we need to manually specify the options
-  we need in the Harfbuzz section of Awt2DLibraries.gmk.
+  we need in the Harfbuzz section of ClientLibraries.gmk.
   As well as adding new options, we may need to clean up obsolete options.
   Note there may be platform variations in the flags.
 
diff --git a/src/java.desktop/share/native/libharfbuzz/graph/classdef-graph.hh b/src/java.desktop/share/native/libharfbuzz/graph/classdef-graph.hh
index c1432883ffa..da6378820bb 100644
--- a/src/java.desktop/share/native/libharfbuzz/graph/classdef-graph.hh
+++ b/src/java.desktop/share/native/libharfbuzz/graph/classdef-graph.hh
@@ -39,6 +39,7 @@ struct ClassDefFormat1 : public OT::ClassDefFormat1_3<SmallTypes>
     int64_t vertex_len = vertex.obj.tail - vertex.obj.head;
     constexpr unsigned min_size = OT::ClassDefFormat1_3<SmallTypes>::min_size;
     if (vertex_len < min_size) return false;
+    hb_barrier ();
     return vertex_len >= min_size + classValue.get_size () - classValue.len.get_size ();
   }
 };
@@ -50,6 +51,7 @@ struct ClassDefFormat2 : public OT::ClassDefFormat2_4<SmallTypes>
     int64_t vertex_len = vertex.obj.tail - vertex.obj.head;
     constexpr unsigned min_size = OT::ClassDefFormat2_4<SmallTypes>::min_size;
     if (vertex_len < min_size) return false;
+    hb_barrier ();
     return vertex_len >= min_size + rangeRecord.get_size () - rangeRecord.len.get_size ();
   }
 };
@@ -114,6 +116,7 @@ struct ClassDef : public OT::ClassDef
   {
     int64_t vertex_len = vertex.obj.tail - vertex.obj.head;
     if (vertex_len < OT::ClassDef::min_size) return false;
+    hb_barrier ();
     switch (u.format)
     {
     case 1: return ((ClassDefFormat1*)this)->sanitize (vertex);
@@ -131,20 +134,23 @@ struct ClassDef : public OT::ClassDef
 
 struct class_def_size_estimator_t
 {
+  // TODO(garretrieger): update to support beyond64k coverage/classdef tables.
+  constexpr static unsigned class_def_format1_base_size = 6;
+  constexpr static unsigned class_def_format2_base_size = 4;
+  constexpr static unsigned coverage_base_size = 4;
+  constexpr static unsigned bytes_per_range = 6;
+  constexpr static unsigned bytes_per_glyph = 2;
+
   template<typename It>
   class_def_size_estimator_t (It glyph_and_class)
-      : gids_consecutive (true), num_ranges_per_class (), glyphs_per_class ()
+      : num_ranges_per_class (), glyphs_per_class ()
   {
-    unsigned last_gid = (unsigned) -1;
+    reset();
     for (auto p : + glyph_and_class)
     {
       unsigned gid = p.first;
       unsigned klass = p.second;
 
-      if (last_gid != (unsigned) -1 && gid != last_gid + 1)
-        gids_consecutive = false;
-      last_gid = gid;
-
       hb_set_t* glyphs;
       if (glyphs_per_class.has (klass, &glyphs) && glyphs) {
         glyphs->add (gid);
@@ -174,28 +180,54 @@ struct class_def_size_estimator_t
     }
   }
 
-  // Incremental increase in the Coverage and ClassDef table size
-  // (worst case) if all glyphs associated with 'klass' were added.
-  unsigned incremental_coverage_size (unsigned klass) const
-  {
-    // Coverage takes 2 bytes per glyph worst case,
-    return 2 * glyphs_per_class.get (klass).get_population ();
+  void reset() {
+    class_def_1_size = class_def_format1_base_size;
+    class_def_2_size = class_def_format2_base_size;
+    included_glyphs.clear();
+    included_classes.clear();
   }
 
-  // Incremental increase in the Coverage and ClassDef table size
-  // (worst case) if all glyphs associated with 'klass' were added.
-  unsigned incremental_class_def_size (unsigned klass) const
+  // Compute the size of coverage for all glyphs added via 'add_class_def_size'.
+  unsigned coverage_size () const
   {
-    // ClassDef takes 6 bytes per range
-    unsigned class_def_2_size = 6 * num_ranges_per_class.get (klass);
-    if (gids_consecutive)
-    {
-      // ClassDef1 takes 2 bytes per glyph, but only can be used
-      // when gids are consecutive.
-      return hb_min (2 * glyphs_per_class.get (klass).get_population (), class_def_2_size);
+    unsigned format1_size = coverage_base_size + bytes_per_glyph * included_glyphs.get_population();
+    unsigned format2_size = coverage_base_size + bytes_per_range * num_glyph_ranges();
+    return hb_min(format1_size, format2_size);
+  }
+
+  // Compute the new size of the ClassDef table if all glyphs associated with 'klass' were added.
+  unsigned add_class_def_size (unsigned klass)
+  {
+    if (!included_classes.has(klass)) {
+      hb_set_t* glyphs = nullptr;
+      if (glyphs_per_class.has(klass, &glyphs)) {
+        included_glyphs.union_(*glyphs);
+      }
+
+      class_def_1_size = class_def_format1_base_size;
+      if (!included_glyphs.is_empty()) {
+        unsigned min_glyph = included_glyphs.get_min();
+        unsigned max_glyph = included_glyphs.get_max();
+        class_def_1_size += bytes_per_glyph * (max_glyph - min_glyph + 1);
+      }
+
+      class_def_2_size += bytes_per_range * num_ranges_per_class.get (klass);
+
+      included_classes.add(klass);
     }
 
-    return class_def_2_size;
+    return hb_min (class_def_1_size, class_def_2_size);
+  }
+
+  unsigned num_glyph_ranges() const {
+    hb_codepoint_t start = HB_SET_VALUE_INVALID;
+    hb_codepoint_t end = HB_SET_VALUE_INVALID;
+
+    unsigned count = 0;
+    while (included_glyphs.next_range (&start, &end)) {
+        count++;
+    }
+    return count;
   }
 
   bool in_error ()
@@ -211,9 +243,12 @@ struct class_def_size_estimator_t
   }
 
  private:
-  bool gids_consecutive;
   hb_hashmap_t<unsigned, unsigned> num_ranges_per_class;
   hb_hashmap_t<unsigned, hb_set_t> glyphs_per_class;
+  hb_set_t included_classes;
+  hb_set_t included_glyphs;
+  unsigned class_def_1_size;
+  unsigned class_def_2_size;
 };
 
 
diff --git a/src/java.desktop/share/native/libharfbuzz/graph/coverage-graph.hh b/src/java.desktop/share/native/libharfbuzz/graph/coverage-graph.hh
index 4f44e076d1f..61ca063e345 100644
--- a/src/java.desktop/share/native/libharfbuzz/graph/coverage-graph.hh
+++ b/src/java.desktop/share/native/libharfbuzz/graph/coverage-graph.hh
@@ -39,6 +39,7 @@ struct CoverageFormat1 : public OT::Layout::Common::CoverageFormat1_3<SmallTypes
     int64_t vertex_len = vertex.obj.tail - vertex.obj.head;
     constexpr unsigned min_size = OT::Layout::Common::CoverageFormat1_3<SmallTypes>::min_size;
     if (vertex_len < min_size) return false;
+    hb_barrier ();
     return vertex_len >= min_size + glyphArray.get_size () - glyphArray.len.get_size ();
   }
 };
@@ -50,6 +51,7 @@ struct CoverageFormat2 : public OT::Layout::Common::CoverageFormat2_4<SmallTypes
     int64_t vertex_len = vertex.obj.tail - vertex.obj.head;
     constexpr unsigned min_size = OT::Layout::Common::CoverageFormat2_4<SmallTypes>::min_size;
     if (vertex_len < min_size) return false;
+    hb_barrier ();
     return vertex_len >= min_size + rangeRecord.get_size () - rangeRecord.len.get_size ();
   }
 };
@@ -138,6 +140,7 @@ struct Coverage : public OT::Layout::Common::Coverage
   {
     int64_t vertex_len = vertex.obj.tail - vertex.obj.head;
     if (vertex_len < OT::Layout::Common::Coverage::min_size) return false;
+    hb_barrier ();
     switch (u.format)
     {
     case 1: return ((CoverageFormat1*)this)->sanitize (vertex);
diff --git a/src/java.desktop/share/native/libharfbuzz/graph/graph.hh b/src/java.desktop/share/native/libharfbuzz/graph/graph.hh
index 4a1f7ebf5a5..ed1026f5866 100644
--- a/src/java.desktop/share/native/libharfbuzz/graph/graph.hh
+++ b/src/java.desktop/share/native/libharfbuzz/graph/graph.hh
@@ -195,6 +195,15 @@ struct graph_t
       return incoming_edges_;
     }
 
+    unsigned incoming_edges_from_parent (unsigned parent_index) const {
+      if (single_parent != (unsigned) -1) {
+        return single_parent == parent_index ? 1 : 0;
+      }
+
+      unsigned* count;
+      return  parents.has(parent_index, &count) ? *count : 0;
+    }
+
     void reset_parents ()
     {
       incoming_edges_ = 0;
@@ -334,6 +343,16 @@ struct graph_t
       return true;
     }
 
+    bool give_max_priority ()
+    {
+      bool result = false;
+      while (!has_max_priority()) {
+        result = true;
+        priority++;
+      }
+      return result;
+    }
+
     bool has_max_priority () const {
       return priority >= 3;
     }
@@ -349,7 +368,7 @@ struct graph_t
       // it's parent where possible.
 
       int64_t modified_distance =
-          hb_min (hb_max(distance + distance_modifier (), 0), 0x7FFFFFFFFFF);
+          hb_clamp (distance + distance_modifier (), (int64_t) 0, 0x7FFFFFFFFFF);
       if (has_max_priority ()) {
         modified_distance = 0;
       }
@@ -567,6 +586,7 @@ struct graph_t
     update_distances ();
 
     hb_priority_queue_t<int64_t> queue;
+    queue.alloc (vertices_.length);
     hb_vector_t<vertex_t> &sorted_graph = vertices_scratch_;
     if (unlikely (!check_success (sorted_graph.resize (vertices_.length)))) return;
     hb_vector_t<unsigned> id_map;
@@ -1022,6 +1042,11 @@ struct graph_t
    * Creates a copy of child and re-assigns the link from
    * parent to the clone. The copy is a shallow copy, objects
    * linked from child are not duplicated.
+   *
+   * Returns the index of the newly created duplicate.
+   *
+   * If the child_idx only has incoming edges from parent_idx, this
+   * will do nothing and return the original child_idx.
    */
   unsigned duplicate_if_shared (unsigned parent_idx, unsigned child_idx)
   {
@@ -1035,18 +1060,20 @@ struct graph_t
    * Creates a copy of child and re-assigns the link from
    * parent to the clone. The copy is a shallow copy, objects
    * linked from child are not duplicated.
+   *
+   * Returns the index of the newly created duplicate.
+   *
+   * If the child_idx only has incoming edges from parent_idx,
+   * duplication isn't possible and this will return -1.
    */
   unsigned duplicate (unsigned parent_idx, unsigned child_idx)
   {
     update_parents ();
 
-    unsigned links_to_child = 0;
-    for (const auto& l : vertices_[parent_idx].obj.all_links ())
-    {
-      if (l.objidx == child_idx) links_to_child++;
-    }
+    const auto& child = vertices_[child_idx];
+    unsigned links_to_child = child.incoming_edges_from_parent(parent_idx);
 
-    if (vertices_[child_idx].incoming_edges () <= links_to_child)
+    if (child.incoming_edges () <= links_to_child)
     {
       // Can't duplicate this node, doing so would orphan the original one as all remaining links
       // to child are from parent.
@@ -1059,7 +1086,7 @@ struct graph_t
                parent_idx, child_idx);
 
     unsigned clone_idx = duplicate (child_idx);
-    if (clone_idx == (unsigned) -1) return false;
+    if (clone_idx == (unsigned) -1) return -1;
     // duplicate shifts the root node idx, so if parent_idx was root update it.
     if (parent_idx == clone_idx) parent_idx++;
 
@@ -1075,6 +1102,62 @@ struct graph_t
     return clone_idx;
   }
 
+  /*
+   * Creates a copy of child and re-assigns the links from
+   * parents to the clone. The copy is a shallow copy, objects
+   * linked from child are not duplicated.
+   *
+   * Returns the index of the newly created duplicate.
+   *
+   * If the child_idx only has incoming edges from parents,
+   * duplication isn't possible or duplication fails and this will
+   * return -1.
+   */
+  unsigned duplicate (const hb_set_t* parents, unsigned child_idx)
+  {
+    if (parents->is_empty()) {
+      return -1;
+    }
+
+    update_parents ();
+
+    const auto& child = vertices_[child_idx];
+    unsigned links_to_child = 0;
+    unsigned last_parent = parents->get_max();
+    unsigned first_parent = parents->get_min();
+    for (unsigned parent_idx : *parents) {
+      links_to_child += child.incoming_edges_from_parent(parent_idx);
+    }
+
+    if (child.incoming_edges () <= links_to_child)
+    {
+      // Can't duplicate this node, doing so would orphan the original one as all remaining links
+      // to child are from parent.
+      DEBUG_MSG (SUBSET_REPACK, nullptr, "  Not duplicating %u, ..., %u => %u", first_parent, last_parent, child_idx);
+      return -1;
+    }
+
+    DEBUG_MSG (SUBSET_REPACK, nullptr, "  Duplicating %u, ..., %u => %u", first_parent, last_parent, child_idx);
+
+    unsigned clone_idx = duplicate (child_idx);
+    if (clone_idx == (unsigned) -1) return false;
+
+    for (unsigned parent_idx : *parents) {
+      // duplicate shifts the root node idx, so if parent_idx was root update it.
+      if (parent_idx == clone_idx) parent_idx++;
+      auto& parent = vertices_[parent_idx];
+      for (auto& l : parent.obj.all_links_writer ())
+      {
+        if (l.objidx != child_idx)
+          continue;
+
+        reassign_link (l, parent_idx, clone_idx);
+      }
+    }
+
+    return clone_idx;
+  }
+
 
   /*
    * Adds a new node to the graph, not connected to anything.
@@ -1370,6 +1453,7 @@ struct graph_t
     vertices_.tail ().distance = 0;
 
     hb_priority_queue_t<int64_t> queue;
+    queue.alloc (count);
     queue.insert (0, vertices_.length - 1);
 
     hb_vector_t<bool> visited;
diff --git a/src/java.desktop/share/native/libharfbuzz/graph/gsubgpos-graph.hh b/src/java.desktop/share/native/libharfbuzz/graph/gsubgpos-graph.hh
index a5f9223e605..7ad2ba430b7 100644
--- a/src/java.desktop/share/native/libharfbuzz/graph/gsubgpos-graph.hh
+++ b/src/java.desktop/share/native/libharfbuzz/graph/gsubgpos-graph.hh
@@ -76,6 +76,7 @@ struct Lookup : public OT::Lookup
   {
     int64_t vertex_len = vertex.obj.tail - vertex.obj.head;
     if (vertex_len < OT::Lookup::min_size) return false;
+    hb_barrier ();
     return vertex_len >= this->get_size ();
   }
 
@@ -351,6 +352,7 @@ struct LookupList : public OT::LookupList<T>
   {
     int64_t vertex_len = vertex.obj.tail - vertex.obj.head;
     if (vertex_len < OT::LookupList<T>::min_size) return false;
+    hb_barrier ();
     return vertex_len >= OT::LookupList<T>::item_size * this->len;
   }
 };
@@ -364,6 +366,7 @@ struct GSTAR : public OT::GSUBGPOS
     GSTAR* gstar = (GSTAR*) r.obj.head;
     if (!gstar || !gstar->sanitize (r))
       return nullptr;
+    hb_barrier ();
 
     return gstar;
   }
@@ -383,6 +386,7 @@ struct GSTAR : public OT::GSUBGPOS
   {
     int64_t len = vertex.obj.tail - vertex.obj.head;
     if (len < OT::GSUBGPOS::min_size) return false;
+    hb_barrier ();
     return len >= get_size ();
   }
 
diff --git a/src/java.desktop/share/native/libharfbuzz/graph/markbasepos-graph.hh b/src/java.desktop/share/native/libharfbuzz/graph/markbasepos-graph.hh
index ae5ebd0d167..fb4166128a9 100644
--- a/src/java.desktop/share/native/libharfbuzz/graph/markbasepos-graph.hh
+++ b/src/java.desktop/share/native/libharfbuzz/graph/markbasepos-graph.hh
@@ -40,6 +40,7 @@ struct AnchorMatrix : public OT::Layout::GPOS_impl::AnchorMatrix
   {
     int64_t vertex_len = vertex.obj.tail - vertex.obj.head;
     if (vertex_len < AnchorMatrix::min_size) return false;
+    hb_barrier ();
 
     return vertex_len >= AnchorMatrix::min_size +
         OT::Offset16::static_size * class_count * this->rows;
@@ -128,6 +129,7 @@ struct MarkArray : public OT::Layout::GPOS_impl::MarkArray
     int64_t vertex_len = vertex.obj.tail - vertex.obj.head;
     unsigned min_size = MarkArray::min_size;
     if (vertex_len < min_size) return false;
+    hb_barrier ();
 
     return vertex_len >= get_size ();
   }
@@ -495,6 +497,7 @@ struct MarkBasePos : public OT::Layout::GPOS_impl::MarkBasePos
   {
     int64_t vertex_len = vertex.obj.tail - vertex.obj.head;
     if (vertex_len < u.format.get_size ()) return false;
+    hb_barrier ();
 
     switch (u.format) {
     case 1:
diff --git a/src/java.desktop/share/native/libharfbuzz/graph/pairpos-graph.hh b/src/java.desktop/share/native/libharfbuzz/graph/pairpos-graph.hh
index ad158cc9e8f..fd46861de46 100644
--- a/src/java.desktop/share/native/libharfbuzz/graph/pairpos-graph.hh
+++ b/src/java.desktop/share/native/libharfbuzz/graph/pairpos-graph.hh
@@ -42,6 +42,7 @@ struct PairPosFormat1 : public OT::Layout::GPOS_impl::PairPosFormat1_3<SmallType
     int64_t vertex_len = vertex.obj.tail - vertex.obj.head;
     unsigned min_size = OT::Layout::GPOS_impl::PairPosFormat1_3<SmallTypes>::min_size;
     if (vertex_len < min_size) return false;
+    hb_barrier ();
 
     return vertex_len >=
         min_size + pairSet.get_size () - pairSet.len.get_size();
@@ -198,6 +199,7 @@ struct PairPosFormat2 : public OT::Layout::GPOS_impl::PairPosFormat2_4<SmallType
     size_t vertex_len = vertex.table_size ();
     unsigned min_size = OT::Layout::GPOS_impl::PairPosFormat2_4<SmallTypes>::min_size;
     if (vertex_len < min_size) return false;
+    hb_barrier ();
 
     const unsigned class1_count = class1Count;
     return vertex_len >=
@@ -245,8 +247,8 @@ struct PairPosFormat2 : public OT::Layout::GPOS_impl::PairPosFormat2_4<SmallType
     for (unsigned i = 0; i < class1_count; i++)
     {
       unsigned accumulated_delta = class1_record_size;
-      coverage_size += estimator.incremental_coverage_size (i);
-      class_def_1_size += estimator.incremental_class_def_size (i);
+      class_def_1_size = estimator.add_class_def_size (i);
+      coverage_size = estimator.coverage_size ();
       max_coverage_size = hb_max (max_coverage_size, coverage_size);
       max_class_def_1_size = hb_max (max_class_def_1_size, class_def_1_size);
 
@@ -278,8 +280,10 @@ struct PairPosFormat2 : public OT::Layout::GPOS_impl::PairPosFormat2_4<SmallType
         split_points.push (i);
         // split does not include i, so add the size for i when we reset the size counters.
         accumulated = base_size + accumulated_delta;
-        coverage_size = 4 + estimator.incremental_coverage_size (i);
-        class_def_1_size = 4 + estimator.incremental_class_def_size (i);
+
+        estimator.reset();
+        class_def_1_size = estimator.add_class_def_size(i);
+        coverage_size = estimator.coverage_size();
         visited.clear (); // node sharing isn't allowed between splits.
       }
     }
@@ -625,6 +629,7 @@ struct PairPos : public OT::Layout::GPOS_impl::PairPos
   {
     int64_t vertex_len = vertex.obj.tail - vertex.obj.head;
     if (vertex_len < u.format.get_size ()) return false;
+    hb_barrier ();
 
     switch (u.format) {
     case 1:
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-aat-layout-ankr-table.hh b/src/java.desktop/share/native/libharfbuzz/hb-aat-layout-ankr-table.hh
index 41372b6d88b..f4282fef1e4 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-aat-layout-ankr-table.hh
+++ b/src/java.desktop/share/native/libharfbuzz/hb-aat-layout-ankr-table.hh
@@ -75,6 +75,7 @@ struct ankr
   {
     TRACE_SANITIZE (this);
     return_trace (likely (c->check_struct (this) &&
+                          hb_barrier () &&
                           version == 0 &&
                           c->check_range (this, anchorData) &&
                           lookupTable.sanitize (c, this, &(this+anchorData))));
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-aat-layout-bsln-table.hh b/src/java.desktop/share/native/libharfbuzz/hb-aat-layout-bsln-table.hh
index 24d53e224c7..b14540f3a71 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-aat-layout-bsln-table.hh
+++ b/src/java.desktop/share/native/libharfbuzz/hb-aat-layout-bsln-table.hh
@@ -123,6 +123,7 @@ struct bsln
     TRACE_SANITIZE (this);
     if (unlikely (!(c->check_struct (this) && defaultBaseline < 32)))
       return_trace (false);
+    hb_barrier ();
 
     switch (format)
     {
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-aat-layout-common.hh b/src/java.desktop/share/native/libharfbuzz/hb-aat-layout-common.hh
index b2d1b7b67e0..673c7fbe945 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-aat-layout-common.hh
+++ b/src/java.desktop/share/native/libharfbuzz/hb-aat-layout-common.hh
@@ -30,6 +30,10 @@
 #include "hb-aat-layout.hh"
 #include "hb-aat-map.hh"
 #include "hb-open-type.hh"
+#include "hb-cache.hh"
+#include "hb-bit-set.hh"
+#include "hb-bit-page.hh"
+
 
 namespace OT {
 struct GDEF;
@@ -39,15 +43,18 @@ namespace AAT {
 
 using namespace OT;
 
-
 struct ankr;
 
+using hb_aat_class_cache_t = hb_cache_t<15, 8, 7>;
+static_assert (sizeof (hb_aat_class_cache_t) == 256, "");
+
 struct hb_aat_apply_context_t :
        hb_dispatch_context_t<hb_aat_apply_context_t, bool, HB_DEBUG_APPLY>
 {
   const char *get_name () { return "APPLY"; }
-  template <typename T>
-  return_t dispatch (const T &obj) { return obj.apply (this); }
+  template <typename T, typename ...Ts>
+  return_t dispatch (const T &obj, Ts&&... ds)
+  { return obj.apply (this, std::forward<Ts> (ds)...); }
   static return_t default_return_value () { return false; }
   bool stop_sublookup_iteration (return_t r) const { return r; }
 
@@ -59,6 +66,12 @@ struct hb_aat_apply_context_t :
   const ankr *ankr_table;
   const OT::GDEF *gdef_table;
   const hb_sorted_vector_t<hb_aat_map_t::range_flags_t> *range_flags = nullptr;
+  bool using_buffer_glyph_set = false;
+  hb_bit_set_t buffer_glyph_set;
+  const hb_bit_set_t *left_set = nullptr;
+  const hb_bit_set_t *right_set = nullptr;
+  const hb_bit_set_t *machine_glyph_set = nullptr;
+  hb_aat_class_cache_t *machine_class_cache = nullptr;
   hb_mask_t subtable_flags = 0;
 
   /* Unused. For debug tracing only. */
@@ -74,6 +87,25 @@ struct hb_aat_apply_context_t :
   HB_INTERNAL void set_ankr_table (const AAT::ankr *ankr_table_);
 
   void set_lookup_index (unsigned int i) { lookup_index = i; }
+
+  void setup_buffer_glyph_set ()
+  {
+    using_buffer_glyph_set = buffer->len >= 4;
+
+    if (using_buffer_glyph_set)
+      buffer->collect_codepoints (buffer_glyph_set);
+  }
+  bool buffer_intersects_machine () const
+  {
+    if (using_buffer_glyph_set)
+      return buffer_glyph_set.intersects (*machine_glyph_set);
+
+    // Faster for shorter buffers.
+    for (unsigned i = 0; i < buffer->len; i++)
+      if (machine_glyph_set->has (buffer->info[i].codepoint))
+        return true;
+    return false;
+  }
 };
 
 
@@ -81,6 +113,8 @@ struct hb_aat_apply_context_t :
  * Lookup Table
  */
 
+enum { DELETED_GLYPH = 0xFFFF };
+
 template <typename T> struct Lookup;
 
 template <typename T>
@@ -95,6 +129,19 @@ struct LookupFormat0
     return &arrayZ[glyph_id];
   }
 
+  template <typename set_t>
+  void collect_glyphs (set_t &glyphs, unsigned num_glyphs) const
+  {
+    glyphs.add_range (0, num_glyphs - 1);
+  }
+  template <typename set_t, typename filter_t>
+  void collect_glyphs_filtered (set_t &glyphs, unsigned num_glyphs, const filter_t &filter) const
+  {
+    for (unsigned i = 0; i < num_glyphs; i++)
+      if (filter (arrayZ[i]))
+        glyphs.add (i);
+  }
+
   bool sanitize (hb_sanitize_context_t *c) const
   {
     TRACE_SANITIZE (this);
@@ -123,6 +170,19 @@ struct LookupSegmentSingle
   int cmp (hb_codepoint_t g) const
   { return g < first ? -1 : g <= last ? 0 : +1 ; }
 
+  template <typename set_t>
+  void collect_glyphs (set_t &glyphs) const
+  {
+    if (first == DELETED_GLYPH) return;
+    glyphs.add_range (first, last);
+  }
+  template <typename set_t, typename filter_t>
+  void collect_glyphs_filtered (set_t &glyphs, const filter_t &filter) const
+  {
+    if (!filter (value)) return;
+    glyphs.add_range (first, last);
+  }
+
   bool sanitize (hb_sanitize_context_t *c) const
   {
     TRACE_SANITIZE (this);
@@ -153,6 +213,21 @@ struct LookupFormat2
     return v ? &v->value : nullptr;
   }
 
+  template <typename set_t>
+  void collect_glyphs (set_t &glyphs) const
+  {
+    unsigned count = segments.get_length ();
+    for (unsigned int i = 0; i < count; i++)
+      segments[i].collect_glyphs (glyphs);
+  }
+  template <typename set_t, typename filter_t>
+  void collect_glyphs_filtered (set_t &glyphs, const filter_t &filter) const
+  {
+    unsigned count = segments.get_length ();
+    for (unsigned int i = 0; i < count; i++)
+      segments[i].collect_glyphs_filtered (glyphs, filter);
+  }
+
   bool sanitize (hb_sanitize_context_t *c) const
   {
     TRACE_SANITIZE (this);
@@ -184,6 +259,21 @@ struct LookupSegmentArray
     return first <= glyph_id && glyph_id <= last ? &(base+valuesZ)[glyph_id - first] : nullptr;
   }
 
+  template <typename set_t>
+  void collect_glyphs (set_t &glyphs) const
+  {
+    if (first == DELETED_GLYPH) return;
+    glyphs.add_range (first, last);
+  }
+  template <typename set_t, typename filter_t>
+  void collect_glyphs_filtered (set_t &glyphs, const void *base, const filter_t &filter) const
+  {
+    const auto &values = base+valuesZ;
+    for (hb_codepoint_t i = first; i <= last; i++)
+      if (filter (values[i - first]))
+        glyphs.add (i);
+  }
+
   int cmp (hb_codepoint_t g) const
   { return g < first ? -1 : g <= last ? 0 : +1; }
 
@@ -191,6 +281,7 @@ struct LookupSegmentArray
   {
     TRACE_SANITIZE (this);
     return_trace (c->check_struct (this) &&
+                  hb_barrier () &&
                   first <= last &&
                   valuesZ.sanitize (c, base, last - first + 1));
   }
@@ -199,6 +290,7 @@ struct LookupSegmentArray
   {
     TRACE_SANITIZE (this);
     return_trace (c->check_struct (this) &&
+                  hb_barrier () &&
                   first <= last &&
                   valuesZ.sanitize (c, base, last - first + 1, std::forward<Ts> (ds)...));
   }
@@ -224,6 +316,21 @@ struct LookupFormat4
     return v ? v->get_value (glyph_id, this) : nullptr;
   }
 
+  template <typename set_t>
+  void collect_glyphs (set_t &glyphs) const
+  {
+    unsigned count = segments.get_length ();
+    for (unsigned i = 0; i < count; i++)
+      segments[i].collect_glyphs (glyphs);
+  }
+  template <typename set_t, typename filter_t>
+  void collect_glyphs_filtered (set_t &glyphs, const filter_t &filter) const
+  {
+    unsigned count = segments.get_length ();
+    for (unsigned i = 0; i < count; i++)
+      segments[i].collect_glyphs_filtered (glyphs, this, filter);
+  }
+
   bool sanitize (hb_sanitize_context_t *c) const
   {
     TRACE_SANITIZE (this);
@@ -252,6 +359,19 @@ struct LookupSingle
 
   int cmp (hb_codepoint_t g) const { return glyph.cmp (g); }
 
+  template <typename set_t>
+  void collect_glyphs (set_t &glyphs) const
+  {
+    if (glyph == DELETED_GLYPH) return;
+    glyphs.add (glyph);
+  }
+  template <typename set_t, typename filter_t>
+  void collect_glyphs_filtered (set_t &glyphs, const filter_t &filter) const
+  {
+    if (!filter (value)) return;
+    glyphs.add (glyph);
+  }
+
   bool sanitize (hb_sanitize_context_t *c) const
   {
     TRACE_SANITIZE (this);
@@ -281,6 +401,21 @@ struct LookupFormat6
     return v ? &v->value : nullptr;
   }
 
+  template <typename set_t>
+  void collect_glyphs (set_t &glyphs) const
+  {
+    unsigned count = entries.get_length ();
+    for (unsigned i = 0; i < count; i++)
+      entries[i].collect_glyphs (glyphs);
+  }
+  template <typename set_t, typename filter_t>
+  void collect_glyphs_filtered (set_t &glyphs, const filter_t &filter) const
+  {
+    unsigned count = entries.get_length ();
+    for (unsigned i = 0; i < count; i++)
+      entries[i].collect_glyphs_filtered (glyphs, filter);
+  }
+
   bool sanitize (hb_sanitize_context_t *c) const
   {
     TRACE_SANITIZE (this);
@@ -312,6 +447,24 @@ struct LookupFormat8
            &valueArrayZ[glyph_id - firstGlyph] : nullptr;
   }
 
+  template <typename set_t>
+  void collect_glyphs (set_t &glyphs) const
+  {
+    if (unlikely (!glyphCount)) return;
+    if (firstGlyph == DELETED_GLYPH) return;
+    glyphs.add_range (firstGlyph, firstGlyph + glyphCount - 1);
+  }
+  template <typename set_t, typename filter_t>
+  void collect_glyphs_filtered (set_t &glyphs, const filter_t &filter) const
+  {
+    if (unlikely (!glyphCount)) return;
+    if (firstGlyph == DELETED_GLYPH) return;
+    const T *p = valueArrayZ.arrayZ;
+    for (unsigned i = 0; i < glyphCount; i++)
+      if (filter (p[i]))
+        glyphs.add (firstGlyph + i);
+  }
+
   bool sanitize (hb_sanitize_context_t *c) const
   {
     TRACE_SANITIZE (this);
@@ -356,10 +509,19 @@ struct LookupFormat10
     return v;
   }
 
+  template <typename set_t>
+  void collect_glyphs (set_t &glyphs) const
+  {
+    if (unlikely (!glyphCount)) return;
+    if (firstGlyph == DELETED_GLYPH) return;
+    glyphs.add_range (firstGlyph, firstGlyph + glyphCount - 1);
+  }
+
   bool sanitize (hb_sanitize_context_t *c) const
   {
     TRACE_SANITIZE (this);
     return_trace (c->check_struct (this) &&
+                  hb_barrier () &&
                   valueSize <= 4 &&
                   valueArrayZ.sanitize (c, glyphCount * valueSize));
   }
@@ -383,11 +545,11 @@ struct Lookup
   const T* get_value (hb_codepoint_t glyph_id, unsigned int num_glyphs) const
   {
     switch (u.format) {
-    case 0: return u.format0.get_value (glyph_id, num_glyphs);
-    case 2: return u.format2.get_value (glyph_id);
-    case 4: return u.format4.get_value (glyph_id);
-    case 6: return u.format6.get_value (glyph_id);
-    case 8: return u.format8.get_value (glyph_id);
+    case 0: hb_barrier (); return u.format0.get_value (glyph_id, num_glyphs);
+    case 2: hb_barrier (); return u.format2.get_value (glyph_id);
+    case 4: hb_barrier (); return u.format4.get_value (glyph_id);
+    case 6: hb_barrier (); return u.format6.get_value (glyph_id);
+    case 8: hb_barrier (); return u.format8.get_value (glyph_id);
     default:return nullptr;
     }
   }
@@ -396,13 +558,39 @@ struct Lookup
   {
     switch (u.format) {
       /* Format 10 cannot return a pointer. */
-      case 10: return u.format10.get_value_or_null (glyph_id);
+      case 10: hb_barrier (); return u.format10.get_value_or_null (glyph_id);
       default:
       const T *v = get_value (glyph_id, num_glyphs);
       return v ? *v : Null (T);
     }
   }
 
+  template <typename set_t>
+  void collect_glyphs (set_t &glyphs, unsigned int num_glyphs) const
+  {
+    switch (u.format) {
+    case 0: hb_barrier (); u.format0.collect_glyphs (glyphs, num_glyphs); return;
+    case 2: hb_barrier (); u.format2.collect_glyphs (glyphs); return;
+    case 4: hb_barrier (); u.format4.collect_glyphs (glyphs); return;
+    case 6: hb_barrier (); u.format6.collect_glyphs (glyphs); return;
+    case 8: hb_barrier (); u.format8.collect_glyphs (glyphs); return;
+    case 10: hb_barrier (); u.format10.collect_glyphs (glyphs); return;
+    default:return;
+    }
+  }
+  template <typename set_t, typename filter_t>
+  void collect_glyphs_filtered (set_t &glyphs, unsigned num_glyphs, const filter_t &filter) const
+  {
+    switch (u.format) {
+    case 0: hb_barrier (); u.format0.collect_glyphs_filtered (glyphs, num_glyphs, filter); return;
+    case 2: hb_barrier (); u.format2.collect_glyphs_filtered (glyphs, filter); return;
+    case 4: hb_barrier (); u.format4.collect_glyphs_filtered (glyphs, filter); return;
+    case 6: hb_barrier (); u.format6.collect_glyphs_filtered (glyphs, filter); return;
+    case 8: hb_barrier (); u.format8.collect_glyphs_filtered (glyphs, filter); return;
+    default:return;
+    }
+  }
+
   typename T::type get_class (hb_codepoint_t glyph_id,
                               unsigned int num_glyphs,
                               unsigned int outOfRange) const
@@ -415,13 +603,14 @@ struct Lookup
   {
     TRACE_SANITIZE (this);
     if (!u.format.sanitize (c)) return_trace (false);
+    hb_barrier ();
     switch (u.format) {
-    case 0: return_trace (u.format0.sanitize (c));
-    case 2: return_trace (u.format2.sanitize (c));
-    case 4: return_trace (u.format4.sanitize (c));
-    case 6: return_trace (u.format6.sanitize (c));
-    case 8: return_trace (u.format8.sanitize (c));
-    case 10: return_trace (u.format10.sanitize (c));
+    case 0: hb_barrier (); return_trace (u.format0.sanitize (c));
+    case 2: hb_barrier (); return_trace (u.format2.sanitize (c));
+    case 4: hb_barrier (); return_trace (u.format4.sanitize (c));
+    case 6: hb_barrier (); return_trace (u.format6.sanitize (c));
+    case 8: hb_barrier (); return_trace (u.format8.sanitize (c));
+    case 10: hb_barrier (); return_trace (u.format10.sanitize (c));
     default:return_trace (true);
     }
   }
@@ -429,12 +618,13 @@ struct Lookup
   {
     TRACE_SANITIZE (this);
     if (!u.format.sanitize (c)) return_trace (false);
+    hb_barrier ();
     switch (u.format) {
-    case 0: return_trace (u.format0.sanitize (c, base));
-    case 2: return_trace (u.format2.sanitize (c, base));
-    case 4: return_trace (u.format4.sanitize (c, base));
-    case 6: return_trace (u.format6.sanitize (c, base));
-    case 8: return_trace (u.format8.sanitize (c, base));
+    case 0: hb_barrier (); return_trace (u.format0.sanitize (c, base));
+    case 2: hb_barrier (); return_trace (u.format2.sanitize (c, base));
+    case 4: hb_barrier (); return_trace (u.format4.sanitize (c, base));
+    case 6: hb_barrier (); return_trace (u.format6.sanitize (c, base));
+    case 8: hb_barrier (); return_trace (u.format8.sanitize (c, base));
     case 10: return_trace (false); /* We don't support format10 here currently. */
     default:return_trace (true);
     }
@@ -455,8 +645,6 @@ struct Lookup
 };
 DECLARE_NULL_NAMESPACE_BYTES_TEMPLATE1 (AAT, Lookup, 2);
 
-enum { DELETED_GLYPH = 0xFFFF };
-
 /*
  * (Extended) State Table
  */
@@ -464,7 +652,7 @@ enum { DELETED_GLYPH = 0xFFFF };
 template <typename T>
 struct Entry
 {
-  // This does seem like it's ever called.
+  // This doesn't seem like it's ever called.
   bool sanitize (hb_sanitize_context_t *c) const
   {
     TRACE_SANITIZE (this);
@@ -507,6 +695,14 @@ struct Entry<void>
   DEFINE_SIZE_STATIC (4);
 };
 
+enum Class
+{
+  CLASS_END_OF_TEXT = 0,
+  CLASS_OUT_OF_BOUNDS = 1,
+  CLASS_DELETED_GLYPH = 2,
+  CLASS_END_OF_LINE = 3,
+};
+
 template <typename Types, typename Extra>
 struct StateTable
 {
@@ -519,21 +715,53 @@ struct StateTable
     STATE_START_OF_TEXT = 0,
     STATE_START_OF_LINE = 1,
   };
-  enum Class
+
+  template <typename set_t>
+  void collect_glyphs (set_t &glyphs, unsigned num_glyphs) const
   {
-    CLASS_END_OF_TEXT = 0,
-    CLASS_OUT_OF_BOUNDS = 1,
-    CLASS_DELETED_GLYPH = 2,
-    CLASS_END_OF_LINE = 3,
-  };
+    (this+classTable).collect_glyphs (glyphs, num_glyphs);
+  }
+  template <typename set_t, typename table_t>
+  void collect_initial_glyphs (set_t &glyphs, unsigned num_glyphs, const table_t &table) const
+  {
+    unsigned num_classes = nClasses;
+
+    if (unlikely (num_classes > hb_bit_page_t::BITS))
+    {
+      (this+classTable).collect_glyphs (glyphs, num_glyphs);
+      return;
+    }
+
+    // Collect all classes going out from the start state.
+    hb_bit_page_t filter;
+
+    for (unsigned i = 0; i < num_classes; i++)
+    {
+      const auto &entry = get_entry (STATE_START_OF_TEXT, i);
+      if (new_state (entry.newState) == STATE_START_OF_TEXT &&
+          !table.is_action_initiable (entry) && !table.is_actionable (entry))
+        continue;
+
+      filter.add (i);
+    }
+
+    // And glyphs in those classes.
+    (this+classTable).collect_glyphs_filtered (glyphs, num_glyphs, filter);
+  }
 
   int new_state (unsigned int newState) const
   { return Types::extended ? newState : ((int) newState - (int) stateArrayTable) / (int) nClasses; }
 
-  unsigned int get_class (hb_codepoint_t glyph_id, unsigned int num_glyphs) const
+  unsigned int get_class (hb_codepoint_t glyph_id,
+                          unsigned int num_glyphs,
+                          hb_aat_class_cache_t *cache = nullptr) const
   {
+    unsigned klass;
+    if (cache && cache->get (glyph_id, &klass)) return klass;
     if (unlikely (glyph_id == DELETED_GLYPH)) return CLASS_DELETED_GLYPH;
-    return (this+classTable).get_class (glyph_id, num_glyphs, 1);
+    klass = (this+classTable).get_class (glyph_id, num_glyphs, CLASS_OUT_OF_BOUNDS);
+    if (cache) cache->set (glyph_id, klass);
+    return klass;
   }
 
   const Entry<Extra> *get_entries () const
@@ -541,13 +769,14 @@ struct StateTable
 
   const Entry<Extra> &get_entry (int state, unsigned int klass) const
   {
-    if (unlikely (klass >= nClasses))
-      klass = StateTable::CLASS_OUT_OF_BOUNDS;
+    unsigned n_classes = nClasses;
+    if (unlikely (klass >= n_classes))
+      klass = CLASS_OUT_OF_BOUNDS;
 
     const HBUSHORT *states = (this+stateArrayTable).arrayZ;
     const Entry<Extra> *entries = (this+entryTable).arrayZ;
 
-    unsigned int entry = states[state * nClasses + klass];
+    unsigned int entry = states[state * n_classes + klass];
     DEBUG_MSG (APPLY, nullptr, "e%u", entry);
 
     return entries[entry];
@@ -558,6 +787,7 @@ struct StateTable
   {
     TRACE_SANITIZE (this);
     if (unlikely (!(c->check_struct (this) &&
+                    hb_barrier () &&
                     nClasses >= 4 /* Ensure pre-defined classes fit.  */ &&
                     classTable.sanitize (c, this)))) return_trace (false);
 
@@ -684,6 +914,22 @@ struct ClassTable
   {
     return get_class (glyph_id, outOfRange);
   }
+
+  template <typename set_t>
+  void collect_glyphs (set_t &glyphs, unsigned num_glyphs) const
+  {
+    for (unsigned i = 0; i < classArray.len; i++)
+      if (classArray.arrayZ[i] != CLASS_OUT_OF_BOUNDS)
+        glyphs.add (firstGlyph + i);
+  }
+  template <typename set_t, typename filter_t>
+  void collect_glyphs_filtered (set_t &glyphs, unsigned num_glyphs, const filter_t &filter) const
+  {
+    for (unsigned i = 0; i < classArray.len; i++)
+      if (filter (classArray.arrayZ[i]))
+        glyphs.add (firstGlyph + i);
+  }
+
   bool sanitize (hb_sanitize_context_t *c) const
   {
     TRACE_SANITIZE (this);
@@ -697,6 +943,38 @@ struct ClassTable
   DEFINE_SIZE_ARRAY (4, classArray);
 };
 
+struct SubtableGlyphCoverage
+{
+  bool sanitize (hb_sanitize_context_t *c, unsigned subtable_count) const
+  {
+    TRACE_SANITIZE (this);
+
+    if (unlikely (!c->check_array (&subtableOffsets, subtable_count)))
+      return_trace (false);
+
+    unsigned bytes = (c->get_num_glyphs () + CHAR_BIT - 1) / CHAR_BIT;
+    for (unsigned i = 0; i < subtable_count; i++)
+    {
+      uint32_t offset = (uint32_t) subtableOffsets[i];
+      if (offset == 0 || offset == 0xFFFFFFFF)
+        continue;
+      if (unlikely (!subtableOffsets[i].sanitize (c, this, bytes)))
+        return_trace (false);
+    }
+
+    return_trace (true);
+  }
+  protected:
+  UnsizedArrayOf<NNOffset32To<UnsizedArrayOf<HBUINT8>>> subtableOffsets;
+                                            /* Array of offsets from the beginning of the
+                                             * subtable glyph coverage table to the glyph
+                                             * coverage bitfield for a given subtable; there
+                                             * is one offset for each subtable in the chain */
+  /* UnsizedArrayOf<HBUINT8> coverageBitfields; *//* The individual coverage bitfields. */
+  public:
+  DEFINE_SIZE_ARRAY (0, subtableOffsets);
+};
+
 struct ObsoleteTypes
 {
   static constexpr bool extended = false;
@@ -766,22 +1044,22 @@ struct ExtendedTypes
   }
 };
 
-template <typename Types, typename EntryData>
+template <typename Types, typename EntryData, typename Flags>
 struct StateTableDriver
 {
   using StateTableT = StateTable<Types, EntryData>;
   using EntryT = Entry<EntryData>;
 
   StateTableDriver (const StateTableT &machine_,
-                    hb_buffer_t *buffer_,
                     hb_face_t *face_) :
               machine (machine_),
-              buffer (buffer_),
               num_glyphs (face_->get_num_glyphs ()) {}
 
   template <typename context_t>
   void drive (context_t *c, hb_aat_apply_context_t *ac)
   {
+    hb_buffer_t *buffer = ac->buffer;
+
     if (!c->in_place)
       buffer->clear_output ();
 
@@ -816,9 +1094,9 @@ struct StateTableDriver
         }
       }
 
-      unsigned int klass = buffer->idx < buffer->len ?
-                           machine.get_class (buffer->cur().codepoint, num_glyphs) :
-                           (unsigned) StateTableT::CLASS_END_OF_TEXT;
+      unsigned int klass = likely (buffer->idx < buffer->len) ?
+                           machine.get_class (buffer->cur().codepoint, num_glyphs, ac->machine_class_cache) :
+                           (unsigned) CLASS_END_OF_TEXT;
       DEBUG_MSG (APPLY, nullptr, "c%u at %u", klass, buffer->idx);
       const EntryT &entry = machine.get_entry (state, klass);
       const int next_state = machine.new_state (entry.newState);
@@ -851,44 +1129,39 @@ struct StateTableDriver
        *
        *   https://github.com/harfbuzz/harfbuzz/issues/2860
        */
-
-      const auto is_safe_to_break_extra = [&]()
-      {
-          /* 2c. */
-          const auto wouldbe_entry = machine.get_entry(StateTableT::STATE_START_OF_TEXT, klass);
-
-          /* 2c'. */
-          if (c->is_actionable (this, wouldbe_entry))
-              return false;
-
-          /* 2c". */
-          return next_state == machine.new_state(wouldbe_entry.newState)
-              && (entry.flags & context_t::DontAdvance) == (wouldbe_entry.flags & context_t::DontAdvance);
-      };
-
-      const auto is_safe_to_break = [&]()
-      {
+      const EntryT *wouldbe_entry;
+      bool is_safe_to_break =
+      (
           /* 1. */
-          if (c->is_actionable (this, entry))
-              return false;
+          !c->table->is_actionable (entry) &&
 
           /* 2. */
           // This one is meh, I know...
-          const auto ok =
+          (
                  state == StateTableT::STATE_START_OF_TEXT
-              || ((entry.flags & context_t::DontAdvance) && next_state == StateTableT::STATE_START_OF_TEXT)
-              || is_safe_to_break_extra();
-          if (!ok)
-              return false;
+              || ((entry.flags & Flags::DontAdvance) && next_state == StateTableT::STATE_START_OF_TEXT)
+              || (
+                    /* 2c. */
+                    wouldbe_entry = &machine.get_entry(StateTableT::STATE_START_OF_TEXT, klass)
+                    ,
+                    /* 2c'. */
+                    !c->table->is_actionable (*wouldbe_entry) &&
+                    /* 2c". */
+                    (
+                      next_state == machine.new_state(wouldbe_entry->newState) &&
+                      (entry.flags & Flags::DontAdvance) == (wouldbe_entry->flags & Flags::DontAdvance)
+                    )
+                 )
+          ) &&
 
           /* 3. */
-          return !c->is_actionable (this, machine.get_entry (state, StateTableT::CLASS_END_OF_TEXT));
-      };
+          !c->table->is_actionable (machine.get_entry (state, CLASS_END_OF_TEXT))
+      );
 
-      if (!is_safe_to_break () && buffer->backtrack_len () && buffer->idx < buffer->len)
+      if (!is_safe_to_break && buffer->backtrack_len () && buffer->idx < buffer->len)
         buffer->unsafe_to_break_from_outbuffer (buffer->backtrack_len () - 1, buffer->idx + 1);
 
-      c->transition (this, entry);
+      c->transition (buffer, this, entry);
 
       state = next_state;
       DEBUG_MSG (APPLY, nullptr, "s%d", state);
@@ -896,7 +1169,7 @@ struct StateTableDriver
       if (buffer->idx == buffer->len || unlikely (!buffer->successful))
         break;
 
-      if (!(entry.flags & context_t::DontAdvance) || buffer->max_ops-- <= 0)
+      if (!(entry.flags & Flags::DontAdvance) || buffer->max_ops-- <= 0)
         (void) buffer->next_glyph ();
     }
 
@@ -906,7 +1179,6 @@ struct StateTableDriver
 
   public:
   const StateTableT &machine;
-  hb_buffer_t *buffer;
   unsigned int num_glyphs;
 };
 
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-aat-layout-feat-table.hh b/src/java.desktop/share/native/libharfbuzz/hb-aat-layout-feat-table.hh
index 04260a94616..7b68a932c3f 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-aat-layout-feat-table.hh
+++ b/src/java.desktop/share/native/libharfbuzz/hb-aat-layout-feat-table.hh
@@ -138,6 +138,7 @@ struct FeatureName
   {
     TRACE_SANITIZE (this);
     return_trace (likely (c->check_struct (this) &&
+                          hb_barrier () &&
                           (base+settingTableZ).sanitize (c, nSettings)));
   }
 
@@ -200,6 +201,7 @@ struct feat
   {
     TRACE_SANITIZE (this);
     return_trace (likely (c->check_struct (this) &&
+                          hb_barrier () &&
                           version.major == 1 &&
                           namesZ.sanitize (c, featureNameCount, this)));
   }
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-aat-layout-just-table.hh b/src/java.desktop/share/native/libharfbuzz/hb-aat-layout-just-table.hh
index 0588310b53b..193d14d94d0 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-aat-layout-just-table.hh
+++ b/src/java.desktop/share/native/libharfbuzz/hb-aat-layout-just-table.hh
@@ -185,15 +185,16 @@ struct ActionSubrecord
     TRACE_SANITIZE (this);
     if (unlikely (!c->check_struct (this)))
       return_trace (false);
+    hb_barrier ();
 
     switch (u.header.actionType)
     {
-    case 0:  return_trace (u.decompositionAction.sanitize (c));
-    case 1:  return_trace (u.unconditionalAddGlyphAction.sanitize (c));
-    case 2:  return_trace (u.conditionalAddGlyphAction.sanitize (c));
-    // case 3: return_trace (u.stretchGlyphAction.sanitize (c));
-    case 4:  return_trace (u.decompositionAction.sanitize (c));
-    case 5:  return_trace (u.decompositionAction.sanitize (c));
+    case 0: hb_barrier ();  return_trace (u.decompositionAction.sanitize (c));
+    case 1: hb_barrier ();  return_trace (u.unconditionalAddGlyphAction.sanitize (c));
+    case 2: hb_barrier ();  return_trace (u.conditionalAddGlyphAction.sanitize (c));
+    // case 3: hb_barrier (); return_trace (u.stretchGlyphAction.sanitize (c));
+    case 4: hb_barrier ();  return_trace (u.decompositionAction.sanitize (c));
+    case 5: hb_barrier ();  return_trace (u.decompositionAction.sanitize (c));
     default: return_trace (true);
     }
   }
@@ -220,6 +221,7 @@ struct PostcompensationActionChain
     TRACE_SANITIZE (this);
     if (unlikely (!c->check_struct (this)))
       return_trace (false);
+    hb_barrier ();
 
     unsigned int offset = min_size;
     for (unsigned int i = 0; i < count; i++)
@@ -389,6 +391,7 @@ struct just
     TRACE_SANITIZE (this);
 
     return_trace (likely (c->check_struct (this) &&
+                          hb_barrier () &&
                           version.major == 1 &&
                           horizData.sanitize (c, this, this) &&
                           vertData.sanitize (c, this, this)));
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-aat-layout-kerx-table.hh b/src/java.desktop/share/native/libharfbuzz/hb-aat-layout-kerx-table.hh
index 2bc7b03ce89..a091b05660c 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-aat-layout-kerx-table.hh
+++ b/src/java.desktop/share/native/libharfbuzz/hb-aat-layout-kerx-table.hh
@@ -30,6 +30,7 @@
 
 #include "hb-kern.hh"
 #include "hb-aat-layout-ankr-table.hh"
+#include "hb-set-digest.hh"
 
 /*
  * kerx -- Extended Kerning
@@ -54,6 +55,7 @@ kerxTupleKern (int value,
   unsigned int offset = value;
   const FWORD *pv = &StructAtOffset<FWORD> (base, offset);
   if (unlikely (!c->sanitizer.check_array (pv, tupleCount))) return 0;
+  hb_barrier ();
   return *pv;
 }
 
@@ -81,7 +83,7 @@ struct KernPair
     return_trace (c->check_struct (this));
   }
 
-  protected:
+  public:
   HBGlyphID16   left;
   HBGlyphID16   right;
   FWORD         value;
@@ -105,10 +107,10 @@ struct KerxSubTableFormat0
     TRACE_APPLY (this);
 
     if (!c->plan->requested_kerning)
-      return false;
+      return_trace (false);
 
     if (header.coverage & header.Backwards)
-      return false;
+      return_trace (false);
 
     accelerator_t accel (*this, c);
     hb_kern_machine_t<accelerator_t> machine (accel, header.coverage & header.CrossStream);
@@ -117,6 +119,16 @@ struct KerxSubTableFormat0
     return_trace (true);
   }
 
+  template <typename set_t>
+  void collect_glyphs (set_t &left_set, set_t &right_set, unsigned num_glyphs) const
+  {
+    for (const KernPair& pair : pairs)
+    {
+      left_set.add (pair.left);
+      right_set.add (pair.right);
+    }
+  }
+
   struct accelerator_t
   {
     const KerxSubTableFormat0 &table;
@@ -127,7 +139,10 @@ struct KerxSubTableFormat0
                      table (table_), c (c_) {}
 
     int get_kerning (hb_codepoint_t left, hb_codepoint_t right) const
-    { return table.get_kerning (left, right, c); }
+    {
+      if (!(*c->left_set)[left] || !(*c->right_set)[right]) return 0;
+      return table.get_kerning (left, right, c);
+    }
   };
 
 
@@ -192,6 +207,9 @@ struct Format1Entry<false>
 
   typedef void EntryData;
 
+  static bool initiateAction (const Entry<EntryData> &entry)
+  { return entry.flags & Push; }
+
   static bool performAction (const Entry<EntryData> &entry)
   { return entry.flags & Offset; }
 
@@ -208,13 +226,23 @@ struct KerxSubTableFormat1
   typedef Format1Entry<Types::extended> Format1EntryT;
   typedef typename Format1EntryT::EntryData EntryData;
 
+  enum Flags
+  {
+    DontAdvance = Format1EntryT::DontAdvance,
+  };
+
+  bool is_action_initiable (const Entry<EntryData> &entry) const
+  {
+    return Format1EntryT::initiateAction (entry);
+  }
+  bool is_actionable (const Entry<EntryData> &entry) const
+  {
+    return Format1EntryT::performAction (entry);
+  }
+
   struct driver_context_t
   {
     static constexpr bool in_place = true;
-    enum
-    {
-      DontAdvance       = Format1EntryT::DontAdvance,
-    };
 
     driver_context_t (const KerxSubTableFormat1 *table_,
                       hb_aat_apply_context_t *c_) :
@@ -227,13 +255,10 @@ struct KerxSubTableFormat1
         depth (0),
         crossStream (table->header.coverage & table->header.CrossStream) {}
 
-    bool is_actionable (StateTableDriver<Types, EntryData> *driver HB_UNUSED,
-                        const Entry<EntryData> &entry)
-    { return Format1EntryT::performAction (entry); }
-    void transition (StateTableDriver<Types, EntryData> *driver,
+    void transition (hb_buffer_t *buffer,
+                     StateTableDriver<Types, EntryData, Flags> *driver,
                      const Entry<EntryData> &entry)
     {
-      hb_buffer_t *buffer = driver->buffer;
       unsigned int flags = entry.flags;
 
       if (flags & Format1EntryT::Reset)
@@ -259,6 +284,7 @@ struct KerxSubTableFormat1
           depth = 0;
           return;
         }
+        hb_barrier ();
 
         hb_mask_t kern_mask = c->plan->kern_mask;
 
@@ -330,9 +356,10 @@ struct KerxSubTableFormat1
       }
     }
 
-    private:
+    public:
     hb_aat_apply_context_t *c;
     const KerxSubTableFormat1 *table;
+    private:
     const UnsizedArrayOf<FWORD> &kernAction;
     unsigned int stack[8];
     unsigned int depth;
@@ -349,7 +376,8 @@ struct KerxSubTableFormat1
 
     driver_context_t dc (this, c);
 
-    StateTableDriver<Types, EntryData> driver (machine, c->buffer, c->font->face);
+    StateTableDriver<Types, EntryData, Flags> driver (machine, c->font->face);
+
     driver.drive (&dc, c);
 
     return_trace (true);
@@ -363,12 +391,21 @@ struct KerxSubTableFormat1
                           machine.sanitize (c)));
   }
 
+  template <typename set_t>
+  void collect_glyphs (set_t &left_set, set_t &right_set, unsigned num_glyphs) const
+  {
+    set_t set;
+    machine.collect_glyphs (set, num_glyphs);
+    left_set.union_ (set);
+    right_set.union_ (set);
+  }
+
   protected:
   KernSubTableHeader                            header;
   StateTable<Types, EntryData>                  machine;
   NNOffsetTo<UnsizedArrayOf<FWORD>, HBUINT>     kernAction;
   public:
-  DEFINE_SIZE_STATIC (KernSubTableHeader::static_size + 5 * sizeof (HBUINT));
+  DEFINE_SIZE_STATIC (KernSubTableHeader::static_size + (StateTable<Types, EntryData>::static_size + HBUINT::static_size));
 };
 
 template <typename KernSubTableHeader>
@@ -389,6 +426,7 @@ struct KerxSubTableFormat2
     kern_idx = Types::offsetToIndex (kern_idx, this, arrayZ.arrayZ);
     const FWORD *v = &arrayZ[kern_idx];
     if (unlikely (!v->sanitize (&c->sanitizer))) return 0;
+    hb_barrier ();
 
     return kerxTupleKern (*v, header.tuple_count (), this, c);
   }
@@ -398,10 +436,10 @@ struct KerxSubTableFormat2
     TRACE_APPLY (this);
 
     if (!c->plan->requested_kerning)
-      return false;
+      return_trace (false);
 
     if (header.coverage & header.Backwards)
-      return false;
+      return_trace (false);
 
     accelerator_t accel (*this, c);
     hb_kern_machine_t<accelerator_t> machine (accel, header.coverage & header.CrossStream);
@@ -410,6 +448,13 @@ struct KerxSubTableFormat2
     return_trace (true);
   }
 
+  template <typename set_t>
+  void collect_glyphs (set_t &left_set, set_t &right_set, unsigned num_glyphs) const
+  {
+    (this+leftClassTable).collect_glyphs (left_set, num_glyphs);
+    (this+rightClassTable).collect_glyphs (right_set, num_glyphs);
+  }
+
   struct accelerator_t
   {
     const KerxSubTableFormat2 &table;
@@ -420,7 +465,10 @@ struct KerxSubTableFormat2
                      table (table_), c (c_) {}
 
     int get_kerning (hb_codepoint_t left, hb_codepoint_t right) const
-    { return table.get_kerning (left, right, c); }
+    {
+      if (!(*c->left_set)[left] || !(*c->right_set)[right]) return 0;
+      return table.get_kerning (left, right, c);
+    }
   };
 
   bool sanitize (hb_sanitize_context_t *c) const
@@ -429,6 +477,7 @@ struct KerxSubTableFormat2
     return_trace (likely (c->check_struct (this) &&
                           leftClassTable.sanitize (c, this) &&
                           rightClassTable.sanitize (c, this) &&
+                          hb_barrier () &&
                           c->check_range (this, array)));
   }
 
@@ -461,17 +510,26 @@ struct KerxSubTableFormat4
     DEFINE_SIZE_STATIC (2);
   };
 
+  enum Flags
+  {
+    Mark                = 0x8000,       /* If set, remember this glyph as the marked glyph. */
+    DontAdvance         = 0x4000,       /* If set, don't advance to the next glyph before
+                                         * going to the new state. */
+    Reserved            = 0x3FFF,       /* Not used; set to 0. */
+  };
+
+  bool is_action_initiable (const Entry<EntryData> &entry) const
+  {
+    return (entry.flags & Mark);
+  }
+  bool is_actionable (const Entry<EntryData> &entry) const
+  {
+    return entry.data.ankrActionIndex != 0xFFFF;
+  }
+
   struct driver_context_t
   {
     static constexpr bool in_place = true;
-    enum Flags
-    {
-      Mark              = 0x8000,       /* If set, remember this glyph as the marked glyph. */
-      DontAdvance       = 0x4000,       /* If set, don't advance to the next glyph before
-                                         * going to the new state. */
-      Reserved          = 0x3FFF,       /* Not used; set to 0. */
-    };
-
     enum SubTableFlags
     {
       ActionType        = 0xC0000000,   /* A two-bit field containing the action type. */
@@ -481,22 +539,19 @@ struct KerxSubTableFormat4
                                          * point table. */
     };
 
-    driver_context_t (const KerxSubTableFormat4 *table,
+    driver_context_t (const KerxSubTableFormat4 *table_,
                       hb_aat_apply_context_t *c_) :
         c (c_),
+        table (table_),
         action_type ((table->flags & ActionType) >> 30),
         ankrData ((HBUINT16 *) ((const char *) &table->machine + (table->flags & Offset))),
         mark_set (false),
         mark (0) {}
 
-    bool is_actionable (StateTableDriver<Types, EntryData> *driver HB_UNUSED,
-                        const Entry<EntryData> &entry)
-    { return entry.data.ankrActionIndex != 0xFFFF; }
-    void transition (StateTableDriver<Types, EntryData> *driver,
+    void transition (hb_buffer_t *buffer,
+                     StateTableDriver<Types, EntryData, Flags> *driver,
                      const Entry<EntryData> &entry)
     {
-      hb_buffer_t *buffer = driver->buffer;
-
       if (mark_set && entry.data.ankrActionIndex != 0xFFFF && buffer->idx < buffer->len)
       {
         hb_glyph_position_t &o = buffer->cur_pos();
@@ -509,6 +564,7 @@ struct KerxSubTableFormat4
                double the ankrActionIndex to get the correct offset here. */
             const HBUINT16 *data = &ankrData[entry.data.ankrActionIndex * 2];
             if (!c->sanitizer.check_array (data, 2)) return;
+            hb_barrier ();
             unsigned int markControlPoint = *data++;
             unsigned int currControlPoint = *data++;
             hb_position_t markX = 0;
@@ -537,6 +593,7 @@ struct KerxSubTableFormat4
                double the ankrActionIndex to get the correct offset here. */
             const HBUINT16 *data = &ankrData[entry.data.ankrActionIndex * 2];
             if (!c->sanitizer.check_array (data, 2)) return;
+            hb_barrier ();
             unsigned int markAnchorPoint = *data++;
             unsigned int currAnchorPoint = *data++;
             const Anchor &markAnchor = c->ankr_table->get_anchor (c->buffer->info[mark].codepoint,
@@ -557,6 +614,7 @@ struct KerxSubTableFormat4
                by 4 to get the correct offset for the given action. */
             const FWORD *data = (const FWORD *) &ankrData[entry.data.ankrActionIndex * 4];
             if (!c->sanitizer.check_array (data, 4)) return;
+            hb_barrier ();
             int markX = *data++;
             int markY = *data++;
             int currX = *data++;
@@ -579,8 +637,10 @@ struct KerxSubTableFormat4
       }
     }
 
-    private:
+    public:
     hb_aat_apply_context_t *c;
+    const KerxSubTableFormat4 *table;
+    private:
     unsigned int action_type;
     const HBUINT16 *ankrData;
     bool mark_set;
@@ -593,7 +653,8 @@ struct KerxSubTableFormat4
 
     driver_context_t dc (this, c);
 
-    StateTableDriver<Types, EntryData> driver (machine, c->buffer, c->font->face);
+    StateTableDriver<Types, EntryData, Flags> driver (machine, c->font->face);
+
     driver.drive (&dc, c);
 
     return_trace (true);
@@ -607,12 +668,21 @@ struct KerxSubTableFormat4
                           machine.sanitize (c)));
   }
 
+  template <typename set_t>
+  void collect_glyphs (set_t &left_set, set_t &right_set, unsigned num_glyphs) const
+  {
+    set_t set;
+    machine.collect_glyphs (set, num_glyphs);
+    left_set.union_ (set);
+    right_set.union_ (set);
+  }
+
   protected:
   KernSubTableHeader            header;
   StateTable<Types, EntryData>  machine;
   HBUINT32                      flags;
   public:
-  DEFINE_SIZE_STATIC (KernSubTableHeader::static_size + 20);
+  DEFINE_SIZE_STATIC (KernSubTableHeader::static_size + (StateTable<Types, EntryData>::static_size + HBUINT32::static_size));
 };
 
 template <typename KernSubTableHeader>
@@ -631,7 +701,7 @@ struct KerxSubTableFormat6
     unsigned int num_glyphs = c->sanitizer.get_num_glyphs ();
     if (is_long ())
     {
-      const typename U::Long &t = u.l;
+      const auto &t = u.l;
       unsigned int l = (this+t.rowIndexTable).get_value_or_null (left, num_glyphs);
       unsigned int r = (this+t.columnIndexTable).get_value_or_null (right, num_glyphs);
       unsigned int offset = l + r;
@@ -639,16 +709,18 @@ struct KerxSubTableFormat6
       if (unlikely (hb_unsigned_mul_overflows (offset, sizeof (FWORD32)))) return 0;
       const FWORD32 *v = &StructAtOffset<FWORD32> (&(this+t.array), offset * sizeof (FWORD32));
       if (unlikely (!v->sanitize (&c->sanitizer))) return 0;
+      hb_barrier ();
       return kerxTupleKern (*v, header.tuple_count (), &(this+vector), c);
     }
     else
     {
-      const typename U::Short &t = u.s;
+      const auto &t = u.s;
       unsigned int l = (this+t.rowIndexTable).get_value_or_null (left, num_glyphs);
       unsigned int r = (this+t.columnIndexTable).get_value_or_null (right, num_glyphs);
       unsigned int offset = l + r;
       const FWORD *v = &StructAtOffset<FWORD> (&(this+t.array), offset * sizeof (FWORD));
       if (unlikely (!v->sanitize (&c->sanitizer))) return 0;
+      hb_barrier ();
       return kerxTupleKern (*v, header.tuple_count (), &(this+vector), c);
     }
   }
@@ -658,10 +730,10 @@ struct KerxSubTableFormat6
     TRACE_APPLY (this);
 
     if (!c->plan->requested_kerning)
-      return false;
+      return_trace (false);
 
     if (header.coverage & header.Backwards)
-      return false;
+      return_trace (false);
 
     accelerator_t accel (*this, c);
     hb_kern_machine_t<accelerator_t> machine (accel, header.coverage & header.CrossStream);
@@ -674,6 +746,7 @@ struct KerxSubTableFormat6
   {
     TRACE_SANITIZE (this);
     return_trace (likely (c->check_struct (this) &&
+                          hb_barrier () &&
                           (is_long () ?
                            (
                              u.l.rowIndexTable.sanitize (c, this) &&
@@ -688,6 +761,23 @@ struct KerxSubTableFormat6
                            c->check_range (this, vector))));
   }
 
+  template <typename set_t>
+  void collect_glyphs (set_t &left_set, set_t &right_set, unsigned num_glyphs) const
+  {
+    if (is_long ())
+    {
+      const auto &t = u.l;
+      (this+t.rowIndexTable).collect_glyphs (left_set, num_glyphs);
+      (this+t.columnIndexTable).collect_glyphs (right_set, num_glyphs);
+    }
+    else
+    {
+      const auto &t = u.s;
+      (this+t.rowIndexTable).collect_glyphs (left_set, num_glyphs);
+      (this+t.columnIndexTable).collect_glyphs (right_set, num_glyphs);
+    }
+  }
+
   struct accelerator_t
   {
     const KerxSubTableFormat6 &table;
@@ -698,7 +788,10 @@ struct KerxSubTableFormat6
                      table (table_), c (c_) {}
 
     int get_kerning (hb_codepoint_t left, hb_codepoint_t right) const
-    { return table.get_kerning (left, right, c); }
+    {
+      if (!(*c->left_set)[left] || !(*c->right_set)[right]) return 0;
+      return table.get_kerning (left, right, c);
+    }
   };
 
   protected:
@@ -784,12 +877,27 @@ struct KerxSubTable
     }
   }
 
+  template <typename set_t>
+  void collect_glyphs (set_t &left_set, set_t &right_set, unsigned num_glyphs) const
+  {
+    unsigned int subtable_type = get_type ();
+    switch (subtable_type) {
+    case 0:     u.format0.collect_glyphs (left_set, right_set, num_glyphs); return;
+    case 1:     u.format1.collect_glyphs (left_set, right_set, num_glyphs); return;
+    case 2:     u.format2.collect_glyphs (left_set, right_set, num_glyphs); return;
+    case 4:     u.format4.collect_glyphs (left_set, right_set, num_glyphs); return;
+    case 6:     u.format6.collect_glyphs (left_set, right_set, num_glyphs); return;
+    default:    return;
+    }
+  }
+
   bool sanitize (hb_sanitize_context_t *c) const
   {
     TRACE_SANITIZE (this);
-    if (!u.header.sanitize (c) ||
-        u.header.length <= u.header.static_size ||
-        !c->check_range (this, u.header.length))
+    if (!(u.header.sanitize (c) &&
+          hb_barrier () &&
+          u.header.length >= u.header.static_size &&
+          c->check_range (this, u.header.length)))
       return_trace (false);
 
     return_trace (dispatch (c));
@@ -813,6 +921,8 @@ struct KerxSubTable
  * The 'kerx' Table
  */
 
+using kern_accelerator_data_t = hb_vector_t<hb_pair_t<hb_bit_set_t, hb_bit_set_t>>;
+
 template <typename T>
 struct KerxTable
 {
@@ -829,6 +939,9 @@ struct KerxTable
     {
       if (st->get_type () == 1)
         return true;
+
+      // TODO: What about format 4? What's this API used for anyway?
+
       st = &StructAfter<SubTable> (*st);
     }
     return false;
@@ -867,7 +980,8 @@ struct KerxTable
     return v;
   }
 
-  bool apply (AAT::hb_aat_apply_context_t *c) const
+  bool apply (AAT::hb_aat_apply_context_t *c,
+              const kern_accelerator_data_t &accel_data) const
   {
     c->buffer->unsafe_to_concat ();
 
@@ -914,6 +1028,9 @@ struct KerxTable
       if (reverse)
         c->buffer->reverse ();
 
+      c->left_set = &accel_data[i].first;
+      c->right_set = &accel_data[i].second;
+
       {
         /* See comment in sanitize() for conditional here. */
         hb_sanitize_with_object_t with (&c->sanitizer, i < count - 1 ? st : (const SubTable *) nullptr);
@@ -936,9 +1053,10 @@ struct KerxTable
   bool sanitize (hb_sanitize_context_t *c) const
   {
     TRACE_SANITIZE (this);
-    if (unlikely (!thiz()->version.sanitize (c) ||
-                  (unsigned) thiz()->version < (unsigned) T::minVersion ||
-                  !thiz()->tableCount.sanitize (c)))
+    if (unlikely (!(thiz()->version.sanitize (c) &&
+                    hb_barrier () &&
+                    (unsigned) thiz()->version >= (unsigned) T::minVersion &&
+                    thiz()->tableCount.sanitize (c))))
       return_trace (false);
 
     typedef typename T::SubTable SubTable;
@@ -949,6 +1067,7 @@ struct KerxTable
     {
       if (unlikely (!st->u.header.sanitize (c)))
         return_trace (false);
+      hb_barrier ();
       /* OpenType kern table has 2-byte subtable lengths.  That's limiting.
        * MS implementation also only supports one subtable, of format 0,
        * anyway.  Certain versions of some fonts, like Calibry, contain
@@ -964,8 +1083,61 @@ struct KerxTable
       st = &StructAfter<SubTable> (*st);
     }
 
+    unsigned majorVersion = thiz()->version;
+    if (sizeof (thiz()->version) == 4)
+      majorVersion = majorVersion >> 16;
+    if (majorVersion >= 3)
+    {
+      const SubtableGlyphCoverage *coverage = (const SubtableGlyphCoverage *) st;
+      if (!coverage->sanitize (c, count))
+        return_trace (false);
+    }
+
     return_trace (true);
   }
+
+  kern_accelerator_data_t create_accelerator_data (unsigned num_glyphs) const
+  {
+    kern_accelerator_data_t accel_data;
+
+    typedef typename T::SubTable SubTable;
+
+    const SubTable *st = &thiz()->firstSubTable;
+    unsigned int count = thiz()->tableCount;
+    for (unsigned int i = 0; i < count; i++)
+    {
+      hb_bit_set_t left_set, right_set;
+      st->collect_glyphs (left_set, right_set, num_glyphs);
+      accel_data.push (hb_pair (left_set, right_set));
+      st = &StructAfter<SubTable> (*st);
+    }
+
+    return accel_data;
+  }
+
+  struct accelerator_t
+  {
+    accelerator_t (hb_face_t *face)
+    {
+      hb_sanitize_context_t sc;
+      this->table = sc.reference_table<T> (face);
+      this->accel_data = this->table->create_accelerator_data (face->get_num_glyphs ());
+    }
+    ~accelerator_t ()
+    {
+      this->table.destroy ();
+    }
+
+    hb_blob_t *get_blob () const { return table.get_blob (); }
+
+    bool apply (AAT::hb_aat_apply_context_t *c) const
+    {
+      return table->apply (c, accel_data);
+    }
+
+    hb_blob_ptr_t<T> table;
+    kern_accelerator_data_t accel_data;
+  };
 };
 
 struct kerx : KerxTable<kerx>
@@ -994,8 +1166,10 @@ struct kerx : KerxTable<kerx>
   DEFINE_SIZE_MIN (8);
 };
 
+struct kerx_accelerator_t : kerx::accelerator_t {
+  kerx_accelerator_t (hb_face_t *face) : kerx::accelerator_t (face) {}
+};
 
 } /* namespace AAT */
 
-
 #endif /* HB_AAT_LAYOUT_KERX_TABLE_HH */
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-aat-layout-morx-table.hh b/src/java.desktop/share/native/libharfbuzz/hb-aat-layout-morx-table.hh
index 81e126d5eb1..cabdc0eb555 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-aat-layout-morx-table.hh
+++ b/src/java.desktop/share/native/libharfbuzz/hb-aat-layout-morx-table.hh
@@ -29,6 +29,7 @@
 
 #include "hb-open-type.hh"
 #include "hb-aat-layout-common.hh"
+#include "hb-ot-layout.hh"
 #include "hb-ot-layout-common.hh"
 #include "hb-ot-layout-gdef-table.hh"
 #include "hb-aat-map.hh"
@@ -53,36 +54,42 @@ struct RearrangementSubtable
 
   typedef void EntryData;
 
-  struct driver_context_t
+  enum Flags
   {
-    static constexpr bool in_place = true;
-    enum Flags
-    {
-      MarkFirst         = 0x8000,       /* If set, make the current glyph the first
+    MarkFirst           = 0x8000,       /* If set, make the current glyph the first
                                          * glyph to be rearranged. */
-      DontAdvance       = 0x4000,       /* If set, don't advance to the next glyph
+    DontAdvance         = 0x4000,       /* If set, don't advance to the next glyph
                                          * before going to the new state. This means
                                          * that the glyph index doesn't change, even
                                          * if the glyph at that index has changed. */
-      MarkLast          = 0x2000,       /* If set, make the current glyph the last
+    MarkLast            = 0x2000,       /* If set, make the current glyph the last
                                          * glyph to be rearranged. */
-      Reserved          = 0x1FF0,       /* These bits are reserved and should be set to 0. */
-      Verb              = 0x000F,       /* The type of rearrangement specified. */
-    };
+    Reserved            = 0x1FF0,       /* These bits are reserved and should be set to 0. */
+    Verb                = 0x000F,       /* The type of rearrangement specified. */
+  };
 
-    driver_context_t (const RearrangementSubtable *table HB_UNUSED) :
+  bool is_action_initiable (const Entry<EntryData> &entry) const
+  {
+    return (entry.flags & MarkFirst);
+  }
+  bool is_actionable (const Entry<EntryData> &entry) const
+  {
+    return (entry.flags & Verb);
+  }
+
+  struct driver_context_t
+  {
+    static constexpr bool in_place = true;
+
+    driver_context_t (const RearrangementSubtable *table_) :
         ret (false),
+        table (table_),
         start (0), end (0) {}
 
-    bool is_actionable (StateTableDriver<Types, EntryData> *driver HB_UNUSED,
-                        const Entry<EntryData> &entry)
-    {
-      return (entry.flags & Verb) && start < end;
-    }
-    void transition (StateTableDriver<Types, EntryData> *driver,
+    void transition (hb_buffer_t *buffer,
+                     StateTableDriver<Types, EntryData, Flags> *driver,
                      const Entry<EntryData> &entry)
     {
-      hb_buffer_t *buffer = driver->buffer;
       unsigned int flags = entry.flags;
 
       if (flags & MarkFirst)
@@ -157,6 +164,7 @@ struct RearrangementSubtable
 
     public:
     bool ret;
+    const RearrangementSubtable *table;
     private:
     unsigned int start;
     unsigned int end;
@@ -168,7 +176,14 @@ struct RearrangementSubtable
 
     driver_context_t dc (this);
 
-    StateTableDriver<Types, EntryData> driver (machine, c->buffer, c->face);
+    StateTableDriver<Types, EntryData, Flags> driver (machine, c->face);
+
+    if (!c->buffer_intersects_machine ())
+    {
+      (void) c->buffer->message (c->font, "skipped chainsubtable because no glyph matches");
+      return_trace (false);
+    }
+
     driver.drive (&dc, c);
 
     return_trace (dc.ret);
@@ -180,10 +195,10 @@ struct RearrangementSubtable
     return_trace (machine.sanitize (c));
   }
 
-  protected:
+  public:
   StateTable<Types, EntryData>  machine;
   public:
-  DEFINE_SIZE_STATIC (16);
+  DEFINE_SIZE_STATIC ((StateTable<Types, EntryData>::static_size));
 };
 
 template <typename Types>
@@ -201,43 +216,42 @@ struct ContextualSubtable
     DEFINE_SIZE_STATIC (4);
   };
 
+  enum Flags
+  {
+    SetMark             = 0x8000,       /* If set, make the current glyph the marked glyph. */
+    DontAdvance         = 0x4000,       /* If set, don't advance to the next glyph before
+                                         * going to the new state. */
+    Reserved            = 0x3FFF,       /* These bits are reserved and should be set to 0. */
+  };
+
+  bool is_action_initiable (const Entry<EntryData> &entry) const
+  {
+    return (entry.flags & SetMark);
+  }
+  bool is_actionable (const Entry<EntryData> &entry) const
+  {
+    return entry.data.markIndex != 0xFFFF || entry.data.currentIndex != 0xFFFF;
+  }
+
   struct driver_context_t
   {
     static constexpr bool in_place = true;
-    enum Flags
-    {
-      SetMark           = 0x8000,       /* If set, make the current glyph the marked glyph. */
-      DontAdvance       = 0x4000,       /* If set, don't advance to the next glyph before
-                                         * going to the new state. */
-      Reserved          = 0x3FFF,       /* These bits are reserved and should be set to 0. */
-    };
 
     driver_context_t (const ContextualSubtable *table_,
                              hb_aat_apply_context_t *c_) :
         ret (false),
         c (c_),
+        table (table_),
         gdef (*c->gdef_table),
         mark_set (false),
         has_glyph_classes (gdef.has_glyph_classes ()),
         mark (0),
-        table (table_),
         subs (table+table->substitutionTables) {}
 
-    bool is_actionable (StateTableDriver<Types, EntryData> *driver,
-                        const Entry<EntryData> &entry)
-    {
-      hb_buffer_t *buffer = driver->buffer;
-
-      if (buffer->idx == buffer->len && !mark_set)
-        return false;
-
-      return entry.data.markIndex != 0xFFFF || entry.data.currentIndex != 0xFFFF;
-    }
-    void transition (StateTableDriver<Types, EntryData> *driver,
+    void transition (hb_buffer_t *buffer,
+                     StateTableDriver<Types, EntryData, Flags> *driver,
                      const Entry<EntryData> &entry)
     {
-      hb_buffer_t *buffer = driver->buffer;
-
       /* Looks like CoreText applies neither mark nor current substitution for
        * end-of-text if mark was not explicitly set. */
       if (buffer->idx == buffer->len && !mark_set)
@@ -259,13 +273,17 @@ struct ContextualSubtable
         unsigned int offset = entry.data.markIndex + buffer->info[mark].codepoint;
         const UnsizedArrayOf<HBGlyphID16> &subs_old = (const UnsizedArrayOf<HBGlyphID16> &) subs;
         replacement = &subs_old[Types::wordOffsetToIndex (offset, table, subs_old.arrayZ)];
-        if (!replacement->sanitize (&c->sanitizer) || !*replacement)
+        if (!(replacement->sanitize (&c->sanitizer) &&
+              hb_barrier () &&
+              *replacement))
           replacement = nullptr;
       }
       if (replacement)
       {
         buffer->unsafe_to_break (mark, hb_min (buffer->idx + 1, buffer->len));
-        buffer->info[mark].codepoint = *replacement;
+        hb_codepoint_t glyph = *replacement;
+        buffer->info[mark].codepoint = glyph;
+        c->buffer_glyph_set.add (glyph);
         if (has_glyph_classes)
           _hb_glyph_info_set_glyph_props (&buffer->info[mark],
                                           gdef.get_glyph_props (*replacement));
@@ -287,12 +305,16 @@ struct ContextualSubtable
         unsigned int offset = entry.data.currentIndex + buffer->info[idx].codepoint;
         const UnsizedArrayOf<HBGlyphID16> &subs_old = (const UnsizedArrayOf<HBGlyphID16> &) subs;
         replacement = &subs_old[Types::wordOffsetToIndex (offset, table, subs_old.arrayZ)];
-        if (!replacement->sanitize (&c->sanitizer) || !*replacement)
+        if (!(replacement->sanitize (&c->sanitizer) &&
+              hb_barrier () &&
+              *replacement))
           replacement = nullptr;
       }
       if (replacement)
       {
-        buffer->info[idx].codepoint = *replacement;
+        hb_codepoint_t glyph = *replacement;
+        buffer->info[idx].codepoint = glyph;
+        c->buffer_glyph_set.add (glyph);
         if (has_glyph_classes)
           _hb_glyph_info_set_glyph_props (&buffer->info[idx],
                                           gdef.get_glyph_props (*replacement));
@@ -308,14 +330,14 @@ struct ContextualSubtable
 
     public:
     bool ret;
-    private:
     hb_aat_apply_context_t *c;
+    const ContextualSubtable *table;
+    private:
     const OT::GDEF &gdef;
     bool mark_set;
     bool has_glyph_classes;
     unsigned int mark;
-    const ContextualSubtable *table;
-    const UnsizedListOfOffset16To<Lookup<HBGlyphID16>, HBUINT, false> &subs;
+    const UnsizedListOfOffset16To<Lookup<HBGlyphID16>, HBUINT, void, false> &subs;
   };
 
   bool apply (hb_aat_apply_context_t *c) const
@@ -324,7 +346,14 @@ struct ContextualSubtable
 
     driver_context_t dc (this, c);
 
-    StateTableDriver<Types, EntryData> driver (machine, c->buffer, c->face);
+    StateTableDriver<Types, EntryData, Flags> driver (machine, c->face);
+
+    if (!c->buffer_intersects_machine ())
+    {
+      (void) c->buffer->message (c->font, "skipped chainsubtable because no glyph matches");
+      return_trace (false);
+    }
+
     driver.drive (&dc, c);
 
     return_trace (dc.ret);
@@ -336,6 +365,7 @@ struct ContextualSubtable
 
     unsigned int num_entries = 0;
     if (unlikely (!machine.sanitize (c, &num_entries))) return_trace (false);
+    hb_barrier ();
 
     if (!Types::extended)
       return_trace (substitutionTables.sanitize (c, this, 0));
@@ -356,13 +386,14 @@ struct ContextualSubtable
     return_trace (substitutionTables.sanitize (c, this, num_lookups));
   }
 
-  protected:
+  public:
   StateTable<Types, EntryData>
                 machine;
-  NNOffsetTo<UnsizedListOfOffset16To<Lookup<HBGlyphID16>, HBUINT, false>, HBUINT>
+  protected:
+  NNOffsetTo<UnsizedListOfOffset16To<Lookup<HBGlyphID16>, HBUINT, void, false>, HBUINT>
                 substitutionTables;
   public:
-  DEFINE_SIZE_STATIC (20);
+  DEFINE_SIZE_STATIC ((StateTable<Types, EntryData>::static_size + HBUINT::static_size));
 };
 
 
@@ -372,6 +403,16 @@ struct LigatureEntry;
 template <>
 struct LigatureEntry<true>
 {
+
+  struct EntryData
+  {
+    HBUINT16    ligActionIndex; /* Index to the first ligActionTable entry
+                                 * for processing this group, if indicated
+                                 * by the flags. */
+    public:
+    DEFINE_SIZE_STATIC (2);
+  };
+
   enum Flags
   {
     SetComponent        = 0x8000,       /* Push this glyph onto the component stack for
@@ -383,14 +424,8 @@ struct LigatureEntry<true>
     Reserved            = 0x1FFF,       /* These bits are reserved and should be set to 0. */
   };
 
-  struct EntryData
-  {
-    HBUINT16    ligActionIndex; /* Index to the first ligActionTable entry
-                                 * for processing this group, if indicated
-                                 * by the flags. */
-    public:
-    DEFINE_SIZE_STATIC (2);
-  };
+  static bool initiateAction (const Entry<EntryData> &entry)
+  { return entry.flags & SetComponent; }
 
   static bool performAction (const Entry<EntryData> &entry)
   { return entry.flags & PerformAction; }
@@ -401,6 +436,8 @@ struct LigatureEntry<true>
 template <>
 struct LigatureEntry<false>
 {
+  typedef void EntryData;
+
   enum Flags
   {
     SetComponent        = 0x8000,       /* Push this glyph onto the component stack for
@@ -412,7 +449,8 @@ struct LigatureEntry<false>
                                          * multiple of 4. */
   };
 
-  typedef void EntryData;
+  static bool initiateAction (const Entry<EntryData> &entry)
+  { return entry.flags & SetComponent; }
 
   static bool performAction (const Entry<EntryData> &entry)
   { return entry.flags & Offset; }
@@ -430,13 +468,23 @@ struct LigatureSubtable
   typedef LigatureEntry<Types::extended> LigatureEntryT;
   typedef typename LigatureEntryT::EntryData EntryData;
 
+  enum Flags
+  {
+    DontAdvance = LigatureEntryT::DontAdvance,
+  };
+
+  bool is_action_initiable (const Entry<EntryData> &entry) const
+  {
+    return LigatureEntryT::initiateAction (entry);
+  }
+  bool is_actionable (const Entry<EntryData> &entry) const
+  {
+    return LigatureEntryT::performAction (entry);
+  }
+
   struct driver_context_t
   {
     static constexpr bool in_place = false;
-    enum
-    {
-      DontAdvance       = LigatureEntryT::DontAdvance,
-    };
     enum LigActionFlags
     {
       LigActionLast     = 0x80000000,   /* This is the last action in the list. This also
@@ -459,16 +507,10 @@ struct LigatureSubtable
         ligature (table+table->ligature),
         match_length (0) {}
 
-    bool is_actionable (StateTableDriver<Types, EntryData> *driver HB_UNUSED,
-                        const Entry<EntryData> &entry)
-    {
-      return LigatureEntryT::performAction (entry);
-    }
-    void transition (StateTableDriver<Types, EntryData> *driver,
+    void transition (hb_buffer_t *buffer,
+                     StateTableDriver<Types, EntryData, Flags> *driver,
                      const Entry<EntryData> &entry)
     {
-      hb_buffer_t *buffer = driver->buffer;
-
       DEBUG_MSG (APPLY, nullptr, "Ligature transition at %u", buffer->idx);
       if (entry.flags & LigatureEntryT::SetComponent)
       {
@@ -513,6 +555,7 @@ struct LigatureSubtable
           if (unlikely (!buffer->move_to (match_positions[--cursor % ARRAY_LENGTH (match_positions)]))) return;
 
           if (unlikely (!actionData->sanitize (&c->sanitizer))) break;
+          hb_barrier ();
           action = *actionData;
 
           uint32_t uoffset = action & LigActionOffset;
@@ -523,6 +566,7 @@ struct LigatureSubtable
           component_idx = Types::wordOffsetToIndex (component_idx, table, component.arrayZ);
           const HBUINT16 &componentData = component[component_idx];
           if (unlikely (!componentData.sanitize (&c->sanitizer))) break;
+          hb_barrier ();
           ligature_idx += componentData;
 
           DEBUG_MSG (APPLY, nullptr, "Action store %d last %d",
@@ -533,6 +577,7 @@ struct LigatureSubtable
             ligature_idx = Types::offsetToIndex (ligature_idx, table, ligature.arrayZ);
             const HBGlyphID16 &ligatureData = ligature[ligature_idx];
             if (unlikely (!ligatureData.sanitize (&c->sanitizer))) break;
+            hb_barrier ();
             hb_codepoint_t lig = ligatureData;
 
             DEBUG_MSG (APPLY, nullptr, "Produced ligature %u", lig);
@@ -544,6 +589,7 @@ struct LigatureSubtable
             {
               DEBUG_MSG (APPLY, nullptr, "Skipping ligature component");
               if (unlikely (!buffer->move_to (match_positions[--match_length % ARRAY_LENGTH (match_positions)]))) return;
+              _hb_glyph_info_set_default_ignorable (&buffer->cur());
               if (unlikely (!buffer->replace_glyph (DELETED_GLYPH))) return;
             }
 
@@ -560,9 +606,9 @@ struct LigatureSubtable
 
     public:
     bool ret;
-    private:
     hb_aat_apply_context_t *c;
     const LigatureSubtable *table;
+    private:
     const UnsizedArrayOf<HBUINT32> &ligAction;
     const UnsizedArrayOf<HBUINT16> &component;
     const UnsizedArrayOf<HBGlyphID16> &ligature;
@@ -576,7 +622,14 @@ struct LigatureSubtable
 
     driver_context_t dc (this, c);
 
-    StateTableDriver<Types, EntryData> driver (machine, c->buffer, c->face);
+    StateTableDriver<Types, EntryData, Flags> driver (machine, c->face);
+
+    if (!c->buffer_intersects_machine ())
+    {
+      (void) c->buffer->message (c->font, "skipped chainsubtable because no glyph matches");
+      return_trace (false);
+    }
+
     driver.drive (&dc, c);
 
     return_trace (dc.ret);
@@ -587,12 +640,14 @@ struct LigatureSubtable
     TRACE_SANITIZE (this);
     /* The rest of array sanitizations are done at run-time. */
     return_trace (c->check_struct (this) && machine.sanitize (c) &&
+                  hb_barrier () &&
                   ligAction && component && ligature);
   }
 
-  protected:
+  public:
   StateTable<Types, EntryData>
                 machine;
+  protected:
   NNOffsetTo<UnsizedArrayOf<HBUINT32>, HBUINT>
                 ligAction;      /* Offset to the ligature action table. */
   NNOffsetTo<UnsizedArrayOf<HBUINT16>, HBUINT>
@@ -600,7 +655,7 @@ struct LigatureSubtable
   NNOffsetTo<UnsizedArrayOf<HBGlyphID16>, HBUINT>
                 ligature;       /* Offset to the actual ligature lists. */
   public:
-  DEFINE_SIZE_STATIC (28);
+  DEFINE_SIZE_STATIC ((StateTable<Types, EntryData>::static_size + 3 * HBUINT::static_size));
 };
 
 template <typename Types>
@@ -610,6 +665,12 @@ struct NoncontextualSubtable
   {
     TRACE_APPLY (this);
 
+    if (!c->buffer_intersects_machine ())
+    {
+      (void) c->buffer->message (c->font, "skipped chainsubtable because no glyph matches");
+      return_trace (false);
+    }
+
     const OT::GDEF &gdef (*c->gdef_table);
     bool has_glyph_classes = gdef.has_glyph_classes ();
 
@@ -642,7 +703,9 @@ struct NoncontextualSubtable
       const HBGlyphID16 *replacement = substitute.get_value (info[i].codepoint, num_glyphs);
       if (replacement)
       {
-        info[i].codepoint = *replacement;
+        hb_codepoint_t glyph = *replacement;
+        info[i].codepoint = glyph;
+        c->buffer_glyph_set.add (glyph);
         if (has_glyph_classes)
           _hb_glyph_info_set_glyph_props (&info[i],
                                           gdef.get_glyph_props (*replacement));
@@ -653,6 +716,12 @@ struct NoncontextualSubtable
     return_trace (ret);
   }
 
+  template <typename set_t>
+  void collect_initial_glyphs (set_t &glyphs, unsigned num_glyphs) const
+  {
+    substitute.collect_glyphs (glyphs, num_glyphs);
+  }
+
   bool sanitize (hb_sanitize_context_t *c) const
   {
     TRACE_SANITIZE (this);
@@ -686,74 +755,80 @@ struct InsertionSubtable
     DEFINE_SIZE_STATIC (4);
   };
 
+  enum Flags
+  {
+    SetMark             = 0x8000,     /* If set, mark the current glyph. */
+    DontAdvance         = 0x4000,     /* If set, don't advance to the next glyph before
+                                       * going to the new state.  This does not mean
+                                       * that the glyph pointed to is the same one as
+                                       * before. If you've made insertions immediately
+                                       * downstream of the current glyph, the next glyph
+                                       * processed would in fact be the first one
+                                       * inserted. */
+    CurrentIsKashidaLike= 0x2000,     /* If set, and the currentInsertList is nonzero,
+                                       * then the specified glyph list will be inserted
+                                       * as a kashida-like insertion, either before or
+                                       * after the current glyph (depending on the state
+                                       * of the currentInsertBefore flag). If clear, and
+                                       * the currentInsertList is nonzero, then the
+                                       * specified glyph list will be inserted as a
+                                       * split-vowel-like insertion, either before or
+                                       * after the current glyph (depending on the state
+                                       * of the currentInsertBefore flag). */
+    MarkedIsKashidaLike= 0x1000,      /* If set, and the markedInsertList is nonzero,
+                                       * then the specified glyph list will be inserted
+                                       * as a kashida-like insertion, either before or
+                                       * after the marked glyph (depending on the state
+                                       * of the markedInsertBefore flag). If clear, and
+                                       * the markedInsertList is nonzero, then the
+                                       * specified glyph list will be inserted as a
+                                       * split-vowel-like insertion, either before or
+                                       * after the marked glyph (depending on the state
+                                       * of the markedInsertBefore flag). */
+    CurrentInsertBefore= 0x0800,      /* If set, specifies that insertions are to be made
+                                       * to the left of the current glyph. If clear,
+                                       * they're made to the right of the current glyph. */
+    MarkedInsertBefore= 0x0400,       /* If set, specifies that insertions are to be
+                                       * made to the left of the marked glyph. If clear,
+                                       * they're made to the right of the marked glyph. */
+    CurrentInsertCount= 0x3E0,        /* This 5-bit field is treated as a count of the
+                                       * number of glyphs to insert at the current
+                                       * position. Since zero means no insertions, the
+                                       * largest number of insertions at any given
+                                       * current location is 31 glyphs. */
+    MarkedInsertCount= 0x001F,        /* This 5-bit field is treated as a count of the
+                                       * number of glyphs to insert at the marked
+                                       * position. Since zero means no insertions, the
+                                       * largest number of insertions at any given
+                                       * marked location is 31 glyphs. */
+  };
+
+  bool is_action_initiable (const Entry<EntryData> &entry) const
+  {
+    return (entry.flags & SetMark);
+  }
+  bool is_actionable (const Entry<EntryData> &entry) const
+  {
+    return (entry.flags & (CurrentInsertCount | MarkedInsertCount)) &&
+           (entry.data.currentInsertIndex != 0xFFFF ||entry.data.markedInsertIndex != 0xFFFF);
+  }
+
   struct driver_context_t
   {
     static constexpr bool in_place = false;
-    enum Flags
-    {
-      SetMark           = 0x8000,       /* If set, mark the current glyph. */
-      DontAdvance       = 0x4000,       /* If set, don't advance to the next glyph before
-                                         * going to the new state.  This does not mean
-                                         * that the glyph pointed to is the same one as
-                                         * before. If you've made insertions immediately
-                                         * downstream of the current glyph, the next glyph
-                                         * processed would in fact be the first one
-                                         * inserted. */
-      CurrentIsKashidaLike= 0x2000,     /* If set, and the currentInsertList is nonzero,
-                                         * then the specified glyph list will be inserted
-                                         * as a kashida-like insertion, either before or
-                                         * after the current glyph (depending on the state
-                                         * of the currentInsertBefore flag). If clear, and
-                                         * the currentInsertList is nonzero, then the
-                                         * specified glyph list will be inserted as a
-                                         * split-vowel-like insertion, either before or
-                                         * after the current glyph (depending on the state
-                                         * of the currentInsertBefore flag). */
-      MarkedIsKashidaLike= 0x1000,      /* If set, and the markedInsertList is nonzero,
-                                         * then the specified glyph list will be inserted
-                                         * as a kashida-like insertion, either before or
-                                         * after the marked glyph (depending on the state
-                                         * of the markedInsertBefore flag). If clear, and
-                                         * the markedInsertList is nonzero, then the
-                                         * specified glyph list will be inserted as a
-                                         * split-vowel-like insertion, either before or
-                                         * after the marked glyph (depending on the state
-                                         * of the markedInsertBefore flag). */
-      CurrentInsertBefore= 0x0800,      /* If set, specifies that insertions are to be made
-                                         * to the left of the current glyph. If clear,
-                                         * they're made to the right of the current glyph. */
-      MarkedInsertBefore= 0x0400,       /* If set, specifies that insertions are to be
-                                         * made to the left of the marked glyph. If clear,
-                                         * they're made to the right of the marked glyph. */
-      CurrentInsertCount= 0x3E0,        /* This 5-bit field is treated as a count of the
-                                         * number of glyphs to insert at the current
-                                         * position. Since zero means no insertions, the
-                                         * largest number of insertions at any given
-                                         * current location is 31 glyphs. */
-      MarkedInsertCount= 0x001F,        /* This 5-bit field is treated as a count of the
-                                         * number of glyphs to insert at the marked
-                                         * position. Since zero means no insertions, the
-                                         * largest number of insertions at any given
-                                         * marked location is 31 glyphs. */
-    };
 
-    driver_context_t (const InsertionSubtable *table,
+    driver_context_t (const InsertionSubtable *table_,
                       hb_aat_apply_context_t *c_) :
         ret (false),
         c (c_),
+        table (table_),
         mark (0),
         insertionAction (table+table->insertionAction) {}
 
-    bool is_actionable (StateTableDriver<Types, EntryData> *driver HB_UNUSED,
-                        const Entry<EntryData> &entry)
-    {
-      return (entry.flags & (CurrentInsertCount | MarkedInsertCount)) &&
-             (entry.data.currentInsertIndex != 0xFFFF ||entry.data.markedInsertIndex != 0xFFFF);
-    }
-    void transition (StateTableDriver<Types, EntryData> *driver,
+    void transition (hb_buffer_t *buffer,
+                     StateTableDriver<Types, EntryData, Flags> *driver,
                      const Entry<EntryData> &entry)
     {
-      hb_buffer_t *buffer = driver->buffer;
       unsigned int flags = entry.flags;
 
       unsigned mark_loc = buffer->out_len;
@@ -765,6 +840,7 @@ struct InsertionSubtable
         unsigned int start = entry.data.markedInsertIndex;
         const HBGlyphID16 *glyphs = &insertionAction[start];
         if (unlikely (!c->sanitizer.check_array (glyphs, count))) count = 0;
+        hb_barrier ();
 
         bool before = flags & MarkedInsertBefore;
 
@@ -775,6 +851,9 @@ struct InsertionSubtable
           if (unlikely (!buffer->copy_glyph ())) return;
         /* TODO We ignore KashidaLike setting. */
         if (unlikely (!buffer->replace_glyphs (0, count, glyphs))) return;
+        for (unsigned int i = 0; i < count; i++)
+          c->buffer_glyph_set.add (glyphs[i]);
+        ret = true;
         if (buffer->idx < buffer->len && !before)
           buffer->skip_glyph ();
 
@@ -793,6 +872,7 @@ struct InsertionSubtable
         unsigned int start = entry.data.currentInsertIndex;
         const HBGlyphID16 *glyphs = &insertionAction[start];
         if (unlikely (!c->sanitizer.check_array (glyphs, count))) count = 0;
+        hb_barrier ();
 
         bool before = flags & CurrentInsertBefore;
 
@@ -826,8 +906,9 @@ struct InsertionSubtable
 
     public:
     bool ret;
-    private:
     hb_aat_apply_context_t *c;
+    const InsertionSubtable *table;
+    private:
     unsigned int mark;
     const UnsizedArrayOf<HBGlyphID16> &insertionAction;
   };
@@ -838,7 +919,14 @@ struct InsertionSubtable
 
     driver_context_t dc (this, c);
 
-    StateTableDriver<Types, EntryData> driver (machine, c->buffer, c->face);
+    StateTableDriver<Types, EntryData, Flags> driver (machine, c->face);
+
+    if (!c->buffer_intersects_machine ())
+    {
+      (void) c->buffer->message (c->font, "skipped chainsubtable because no glyph matches");
+      return_trace (false);
+    }
+
     driver.drive (&dc, c);
 
     return_trace (dc.ret);
@@ -849,17 +937,19 @@ struct InsertionSubtable
     TRACE_SANITIZE (this);
     /* The rest of array sanitizations are done at run-time. */
     return_trace (c->check_struct (this) && machine.sanitize (c) &&
+                  hb_barrier () &&
                   insertionAction);
   }
 
-  protected:
+  public:
   StateTable<Types, EntryData>
                 machine;
+  protected:
   NNOffsetTo<UnsizedArrayOf<HBGlyphID16>, HBUINT>
                 insertionAction;        /* Byte offset from stateHeader to the start of
                                          * the insertion glyph table. */
   public:
-  DEFINE_SIZE_STATIC (20);
+  DEFINE_SIZE_STATIC ((StateTable<Types, EntryData>::static_size + HBUINT::static_size));
 };
 
 
@@ -883,6 +973,107 @@ struct Feature
   DEFINE_SIZE_STATIC (12);
 };
 
+
+struct hb_accelerate_subtables_context_t :
+       hb_dispatch_context_t<hb_accelerate_subtables_context_t>
+{
+  struct hb_applicable_t
+  {
+    friend struct hb_accelerate_subtables_context_t;
+    friend struct hb_aat_layout_lookup_accelerator_t;
+
+    public:
+    hb_bit_set_t glyph_set;
+    mutable hb_aat_class_cache_t class_cache;
+
+    template <typename T>
+    auto init_ (const T &obj_, unsigned num_glyphs, hb_priority<1>) HB_AUTO_RETURN
+    (
+      obj_.machine.collect_initial_glyphs (glyph_set, num_glyphs, obj_)
+    )
+
+    template <typename T>
+    void init_ (const T &obj_, unsigned num_glyphs, hb_priority<0>)
+    {
+      obj_.collect_initial_glyphs (glyph_set, num_glyphs);
+    }
+
+    template <typename T>
+    void init (const T &obj_, unsigned num_glyphs)
+    {
+      glyph_set.init ();
+      init_ (obj_, num_glyphs, hb_prioritize);
+      class_cache.clear ();
+    }
+
+    void
+    fini ()
+    {
+      glyph_set.fini ();
+    }
+  };
+
+  /* Dispatch interface. */
+  template <typename T>
+  return_t dispatch (const T &obj)
+  {
+    hb_applicable_t *entry = &array[i++];
+
+    entry->init (obj, num_glyphs);
+
+    return hb_empty_t ();
+  }
+  static return_t default_return_value () { return hb_empty_t (); }
+
+  bool stop_sublookup_iteration (return_t r) const { return false; }
+
+  hb_accelerate_subtables_context_t (hb_applicable_t *array_, unsigned num_glyphs_) :
+                                     hb_dispatch_context_t<hb_accelerate_subtables_context_t> (),
+                                     array (array_), num_glyphs (num_glyphs_) {}
+
+  hb_applicable_t *array;
+  unsigned num_glyphs;
+  unsigned i = 0;
+};
+
+struct hb_aat_layout_chain_accelerator_t
+{
+  template <typename TChain>
+  static hb_aat_layout_chain_accelerator_t *create (const TChain &chain, unsigned num_glyphs)
+  {
+    unsigned count = chain.get_subtable_count ();
+
+    unsigned size = sizeof (hb_aat_layout_chain_accelerator_t) -
+                    HB_VAR_ARRAY * sizeof (hb_accelerate_subtables_context_t::hb_applicable_t) +
+                    count * sizeof (hb_accelerate_subtables_context_t::hb_applicable_t);
+
+    /* The following is a calloc because when we are collecting subtables,
+     * some of them might be invalid and hence not collect; as a result,
+     * we might not fill in all the count entries of the subtables array.
+     * Zeroing it allows the set digest to gatekeep it without having to
+     * initialize it further. */
+    auto *thiz = (hb_aat_layout_chain_accelerator_t *) hb_calloc (1, size);
+    if (unlikely (!thiz))
+      return nullptr;
+
+    thiz->count = count;
+
+    hb_accelerate_subtables_context_t c_accelerate_subtables (thiz->subtables, num_glyphs);
+    chain.dispatch (&c_accelerate_subtables);
+
+    return thiz;
+  }
+
+  void destroy ()
+  {
+    for (unsigned i = 0; i < count; i++)
+      subtables[i].fini ();
+  }
+
+  unsigned count;
+  hb_accelerate_subtables_context_t::hb_applicable_t subtables[HB_VAR_ARRAY];
+};
+
 template <typename Types>
 struct ChainSubtable
 {
@@ -937,19 +1128,22 @@ struct ChainSubtable
   bool apply (hb_aat_apply_context_t *c) const
   {
     TRACE_APPLY (this);
-    hb_sanitize_with_object_t with (&c->sanitizer, this);
+    // Disabled for https://github.com/harfbuzz/harfbuzz/issues/4873
+    //hb_sanitize_with_object_t with (&c->sanitizer, this);
     return_trace (dispatch (c));
   }
 
   bool sanitize (hb_sanitize_context_t *c) const
   {
     TRACE_SANITIZE (this);
-    if (!length.sanitize (c) ||
-        length <= min_size ||
-        !c->check_range (this, length))
+    if (!(length.sanitize (c) &&
+          hb_barrier () &&
+          length >= min_size &&
+          c->check_range (this, length)))
       return_trace (false);
 
-    hb_sanitize_with_object_t with (c, this);
+    // Disabled for https://github.com/harfbuzz/harfbuzz/issues/4873
+    //hb_sanitize_with_object_t with (c, this);
     return_trace (dispatch (c));
   }
 
@@ -973,6 +1167,8 @@ struct Chain
 {
   typedef typename Types::HBUINT HBUINT;
 
+  unsigned get_subtable_count () const { return subtableCount; }
+
   hb_mask_t compile_flags (const hb_aat_map_builder_t *map) const
   {
     hb_mask_t flags = defaultFlags;
@@ -1013,7 +1209,8 @@ struct Chain
     return flags;
   }
 
-  void apply (hb_aat_apply_context_t *c) const
+  void apply (hb_aat_apply_context_t *c,
+              const hb_aat_layout_chain_accelerator_t *accel) const
   {
     const ChainSubtable<Types> *subtable = &StructAfter<ChainSubtable<Types>> (featureZ.as_array (featureCount));
     unsigned int count = subtableCount;
@@ -1021,14 +1218,19 @@ struct Chain
     {
       bool reverse;
 
-      if (hb_none (hb_iter (c->range_flags) |
-                   hb_map ([&subtable] (const hb_aat_map_t::range_flags_t _) -> bool { return subtable->subFeatureFlags & (_.flags); })))
-        goto skip;
-      c->subtable_flags = subtable->subFeatureFlags;
+      auto coverage = subtable->get_coverage ();
 
-      if (!(subtable->get_coverage() & ChainSubtable<Types>::AllDirections) &&
+      hb_mask_t subtable_flags = subtable->subFeatureFlags;
+      if (hb_none (hb_iter (c->range_flags) |
+                   hb_map ([subtable_flags] (const hb_aat_map_t::range_flags_t _) -> bool { return subtable_flags & (_.flags); })))
+        goto skip;
+      c->subtable_flags = subtable_flags;
+      c->machine_glyph_set = accel ? &accel->subtables[i].glyph_set : &Null(hb_bit_set_t);
+      c->machine_class_cache = accel ? &accel->subtables[i].class_cache : nullptr;
+
+      if (!(coverage & ChainSubtable<Types>::AllDirections) &&
           HB_DIRECTION_IS_VERTICAL (c->buffer->props.direction) !=
-          bool (subtable->get_coverage() & ChainSubtable<Types>::Vertical))
+          bool (coverage & ChainSubtable<Types>::Vertical))
         goto skip;
 
       /* Buffer contents is always in logical direction.  Determine if
@@ -1058,9 +1260,9 @@ struct Chain
                                 (the order opposite that of the characters, which
                                 may be right-to-left or left-to-right).
        */
-      reverse = subtable->get_coverage () & ChainSubtable<Types>::Logical ?
-                bool (subtable->get_coverage () & ChainSubtable<Types>::Backwards) :
-                bool (subtable->get_coverage () & ChainSubtable<Types>::Backwards) !=
+      reverse = coverage & ChainSubtable<Types>::Logical ?
+                bool (coverage & ChainSubtable<Types>::Backwards) :
+                bool (coverage & ChainSubtable<Types>::Backwards) !=
                 HB_DIRECTION_IS_BACKWARD (c->buffer->props.direction);
 
       if (!c->buffer->message (c->font, "start chainsubtable %u", c->lookup_index))
@@ -1086,12 +1288,28 @@ struct Chain
 
   unsigned int get_size () const { return length; }
 
-  bool sanitize (hb_sanitize_context_t *c, unsigned int version HB_UNUSED) const
+  template <typename context_t, typename ...Ts>
+  typename context_t::return_t dispatch (context_t *c, Ts&&... ds) const
+  {
+    const ChainSubtable<Types> *subtable = &StructAfter<ChainSubtable<Types>> (featureZ.as_array (featureCount));
+    unsigned int count = subtableCount;
+    for (unsigned int i = 0; i < count; i++)
+    {
+      typename context_t::return_t ret = subtable->dispatch (c, std::forward<Ts> (ds)...);
+      if (c->stop_sublookup_iteration (ret))
+        return ret;
+      subtable = &StructAfter<ChainSubtable<Types>> (*subtable);
+    }
+    return c->default_return_value ();
+  }
+
+  bool sanitize (hb_sanitize_context_t *c, unsigned int version) const
   {
     TRACE_SANITIZE (this);
-    if (!length.sanitize (c) ||
-        length < min_size ||
-        !c->check_range (this, length))
+    if (!(length.sanitize (c) &&
+          hb_barrier () &&
+          length >= min_size &&
+          c->check_range (this, length)))
       return_trace (false);
 
     if (!c->check_array (featureZ.arrayZ, featureCount))
@@ -1103,9 +1321,17 @@ struct Chain
     {
       if (!subtable->sanitize (c))
         return_trace (false);
+      hb_barrier ();
       subtable = &StructAfter<ChainSubtable<Types>> (*subtable);
     }
 
+    if (version >= 3)
+    {
+      const SubtableGlyphCoverage *coverage = (const SubtableGlyphCoverage *) subtable;
+      if (!coverage->sanitize (c, count))
+        return_trace (false);
+    }
+
     return_trace (true);
   }
 
@@ -1117,7 +1343,7 @@ struct Chain
 
   UnsizedArrayOf<Feature>       featureZ;       /* Features. */
 /*ChainSubtable firstSubtable;*//* Subtables. */
-/*subtableGlyphCoverageArray*/  /* Only if version >= 3. We don't use. */
+/*SubtableGlyphCoverage coverages*//* Only if version >= 3. */
 
   public:
   DEFINE_SIZE_MIN (8 + 2 * sizeof (HBUINT));
@@ -1128,13 +1354,79 @@ struct Chain
  * The 'mort'/'morx' Table
  */
 
-template <typename Types, hb_tag_t TAG>
+template <typename T, typename Types, hb_tag_t TAG>
 struct mortmorx
 {
   static constexpr hb_tag_t tableTag = TAG;
 
   bool has_data () const { return version != 0; }
 
+  struct accelerator_t
+  {
+    accelerator_t (hb_face_t *face)
+    {
+      hb_sanitize_context_t sc;
+      this->table = sc.reference_table<T> (face);
+
+      if (unlikely (this->table->is_blocklisted (this->table.get_blob (), face)))
+      {
+        hb_blob_destroy (this->table.get_blob ());
+        this->table = hb_blob_get_empty ();
+      }
+
+      this->chain_count = table->get_chain_count ();
+
+      this->accels = (hb_atomic_ptr_t<hb_aat_layout_chain_accelerator_t> *) hb_calloc (this->chain_count, sizeof (*accels));
+      if (unlikely (!this->accels))
+      {
+        this->chain_count = 0;
+        this->table.destroy ();
+        this->table = hb_blob_get_empty ();
+      }
+    }
+    ~accelerator_t ()
+    {
+      for (unsigned int i = 0; i < this->chain_count; i++)
+      {
+        if (this->accels[i])
+          this->accels[i]->destroy ();
+        hb_free (this->accels[i]);
+      }
+      hb_free (this->accels);
+      this->table.destroy ();
+    }
+
+    hb_blob_t *get_blob () const { return table.get_blob (); }
+
+    template <typename Chain>
+    hb_aat_layout_chain_accelerator_t *get_accel (unsigned chain_index, const Chain &chain, unsigned num_glyphs) const
+    {
+      if (unlikely (chain_index >= chain_count)) return nullptr;
+
+    retry:
+      auto *accel = accels[chain_index].get_acquire ();
+      if (unlikely (!accel))
+      {
+        accel = hb_aat_layout_chain_accelerator_t::create (chain, num_glyphs);
+        if (unlikely (!accel))
+          return nullptr;
+
+        if (unlikely (!accels[chain_index].cmpexch (nullptr, accel)))
+        {
+          hb_free (accel);
+          goto retry;
+        }
+      }
+
+      return accel;
+    }
+
+    hb_blob_ptr_t<T> table;
+    unsigned int chain_count;
+    hb_atomic_ptr_t<hb_aat_layout_chain_accelerator_t> *accels;
+  };
+
+
   void compile_flags (const hb_aat_map_builder_t *mapper,
                       hb_aat_map_t *map) const
   {
@@ -1151,20 +1443,28 @@ struct mortmorx
     }
   }
 
+  unsigned get_chain_count () const
+  {
+    return chainCount;
+  }
   void apply (hb_aat_apply_context_t *c,
-              const hb_aat_map_t &map) const
+              const hb_aat_map_t &map,
+              const accelerator_t &accel) const
   {
     if (unlikely (!c->buffer->successful)) return;
 
     c->buffer->unsafe_to_concat ();
 
+    c->setup_buffer_glyph_set ();
+
     c->set_lookup_index (0);
     const Chain<Types> *chain = &firstChain;
     unsigned int count = chainCount;
     for (unsigned int i = 0; i < count; i++)
     {
+      auto *chain_accel = accel.get_accel (i, *chain, c->face->get_num_glyphs ());
       c->range_flags = &map.chain_flags[i];
-      chain->apply (c);
+      chain->apply (c, chain_accel);
       if (unlikely (!c->buffer->successful)) return;
       chain = &StructAfter<Chain<Types>> (*chain);
     }
@@ -1173,7 +1473,10 @@ struct mortmorx
   bool sanitize (hb_sanitize_context_t *c) const
   {
     TRACE_SANITIZE (this);
-    if (!version.sanitize (c) || !version || !chainCount.sanitize (c))
+    if (!(version.sanitize (c) &&
+          hb_barrier () &&
+          version &&
+          chainCount.sanitize (c)))
       return_trace (false);
 
     const Chain<Types> *chain = &firstChain;
@@ -1182,6 +1485,7 @@ struct mortmorx
     {
       if (!chain->sanitize (c, version))
         return_trace (false);
+      hb_barrier ();
       chain = &StructAfter<Chain<Types>> (*chain);
     }
 
@@ -1200,8 +1504,24 @@ struct mortmorx
   DEFINE_SIZE_MIN (8);
 };
 
-struct morx : mortmorx<ExtendedTypes, HB_AAT_TAG_morx> {};
-struct mort : mortmorx<ObsoleteTypes, HB_AAT_TAG_mort> {};
+struct morx : mortmorx<morx, ExtendedTypes, HB_AAT_TAG_morx>
+{
+  HB_INTERNAL bool is_blocklisted (hb_blob_t *blob,
+                                   hb_face_t *face) const;
+};
+
+struct mort : mortmorx<mort, ObsoleteTypes, HB_AAT_TAG_mort>
+{
+  HB_INTERNAL bool is_blocklisted (hb_blob_t *blob,
+                                   hb_face_t *face) const;
+};
+
+struct morx_accelerator_t : morx::accelerator_t {
+  morx_accelerator_t (hb_face_t *face) : morx::accelerator_t (face) {}
+};
+struct mort_accelerator_t : mort::accelerator_t {
+  mort_accelerator_t (hb_face_t *face) : mort::accelerator_t (face) {}
+};
 
 
 } /* namespace AAT */
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-aat-layout-opbd-table.hh b/src/java.desktop/share/native/libharfbuzz/hb-aat-layout-opbd-table.hh
index 959382f356f..f28ec326b45 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-aat-layout-opbd-table.hh
+++ b/src/java.desktop/share/native/libharfbuzz/hb-aat-layout-opbd-table.hh
@@ -133,8 +133,8 @@ struct opbd
   {
     switch (format)
     {
-    case 0: return u.format0.get_bounds (font, glyph_id, extents, this);
-    case 1: return u.format1.get_bounds (font, glyph_id, extents, this);
+    case 0: hb_barrier (); return u.format0.get_bounds (font, glyph_id, extents, this);
+    case 1: hb_barrier (); return u.format1.get_bounds (font, glyph_id, extents, this);
     default:return false;
     }
   }
@@ -144,11 +144,12 @@ struct opbd
     TRACE_SANITIZE (this);
     if (unlikely (!c->check_struct (this) || version.major != 1))
       return_trace (false);
+    hb_barrier ();
 
     switch (format)
     {
-    case 0: return_trace (u.format0.sanitize (c, this));
-    case 1: return_trace (u.format1.sanitize (c, this));
+    case 0: hb_barrier (); return_trace (u.format0.sanitize (c, this));
+    case 1: hb_barrier (); return_trace (u.format1.sanitize (c, this));
     default:return_trace (true);
     }
   }
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-aat-layout-trak-table.hh b/src/java.desktop/share/native/libharfbuzz/hb-aat-layout-trak-table.hh
index 5c49d1f0562..0db4035fd8c 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-aat-layout-trak-table.hh
+++ b/src/java.desktop/share/native/libharfbuzz/hb-aat-layout-trak-table.hh
@@ -48,17 +48,69 @@ struct TrackTableEntry
 
   float get_track_value () const { return track.to_float (); }
 
-  int get_value (const void *base, unsigned int index,
-                 unsigned int table_size) const
-  { return (base+valuesZ).as_array (table_size)[index]; }
+  float interpolate_at (unsigned int idx,
+                        float ptem,
+                        const void *base,
+                        hb_array_t<const F16DOT16> size_table) const
+  {
+    const FWORD *values = (base+valuesZ).arrayZ;
+
+    float s0 = size_table[idx].to_float ();
+    float s1 = size_table[idx + 1].to_float ();
+    int v0 = values[idx];
+    int v1 = values[idx + 1];
+
+    // Deal with font bugs.
+    if (unlikely (s1 < s0))
+    { hb_swap (s0, s1); hb_swap (v0, v1); }
+    if (unlikely (ptem < s0)) return v0;
+    if (unlikely (ptem > s1)) return v1;
+    if (unlikely (s0 == s1)) return (v0 + v1) * 0.5f;
+
+    float t = (ptem - s0) / (s1 - s0);
+    return v0 + t * (v1 - v0);
+  }
+
+  float get_value (float ptem,
+                   const void *base,
+                   hb_array_t<const F16DOT16> size_table) const
+  {
+    const FWORD *values = (base+valuesZ).arrayZ;
+
+    unsigned int n_sizes = size_table.length;
+
+    /*
+     * Choose size.
+     */
+    if (!n_sizes) return 0.f;
+    if (n_sizes == 1) return values[0];
+
+    // At least two entries.
+
+    unsigned i;
+    for (i = 0; i < n_sizes; i++)
+      if (size_table[i].to_float () >= ptem)
+        break;
+
+    // Boundary conditions.
+    if (i == 0)       return values[0];
+    if (i == n_sizes) return values[n_sizes - 1];
+
+    // Exact match.
+    if (size_table[i].to_float () == ptem) return values[i];
+
+    // Interpolate.
+    return interpolate_at (i - 1, ptem, base, size_table);
+  }
 
   public:
-  bool sanitize (hb_sanitize_context_t *c, const void *base,
-                 unsigned int table_size) const
+  bool sanitize (hb_sanitize_context_t *c,
+                 const void *base,
+                 unsigned int n_sizes) const
   {
     TRACE_SANITIZE (this);
     return_trace (likely (c->check_struct (this) &&
-                          (valuesZ.sanitize (c, base, table_size))));
+                          (valuesZ.sanitize (c, base, n_sizes))));
   }
 
   protected:
@@ -76,64 +128,45 @@ struct TrackTableEntry
 
 struct TrackData
 {
-  float interpolate_at (unsigned int idx,
-                        float target_size,
-                        const TrackTableEntry &trackTableEntry,
-                        const void *base) const
+  float get_tracking (const void *base, float ptem, float track = 0.f) const
   {
-    unsigned int sizes = nSizes;
-    hb_array_t<const F16DOT16> size_table ((base+sizeTable).arrayZ, sizes);
+    unsigned count = nTracks;
+    hb_array_t<const F16DOT16> size_table = (base+sizeTable).as_array (nSizes);
 
-    float s0 = size_table[idx].to_float ();
-    float s1 = size_table[idx + 1].to_float ();
-    float t = unlikely (s0 == s1) ? 0.f : (target_size - s0) / (s1 - s0);
-    return t * trackTableEntry.get_value (base, idx + 1, sizes) +
-           (1.f - t) * trackTableEntry.get_value (base, idx, sizes);
-  }
+    if (!count) return 0.f;
+    if (count == 1) return trackTable[0].get_value (ptem, base, size_table);
 
-  int get_tracking (const void *base, float ptem) const
-  {
-    /*
-     * Choose track.
-     */
-    const TrackTableEntry *trackTableEntry = nullptr;
-    unsigned int count = nTracks;
-    for (unsigned int i = 0; i < count; i++)
-    {
-      /* Note: Seems like the track entries are sorted by values.  But the
-       * spec doesn't explicitly say that.  It just mentions it in the example. */
+    // At least two entries.
 
-      /* For now we only seek for track entries with zero tracking value */
+    unsigned i = 0;
+    unsigned j = count - 1;
 
-      if (trackTable[i].get_track_value () == 0.f)
-      {
-        trackTableEntry = &trackTable[i];
-        break;
-      }
-    }
-    if (!trackTableEntry) return 0;
+    // Find the two entries that track is between.
+    while (i + 1 < count && trackTable[i + 1].get_track_value () < track)
+      i++;
+    while (j > 0 && trackTable[j - 1].get_track_value () > track)
+      j--;
 
-    /*
-     * Choose size.
-     */
-    unsigned int sizes = nSizes;
-    if (!sizes) return 0;
-    if (sizes == 1) return trackTableEntry->get_value (base, 0, sizes);
+    // Exact match.
+    if (i == j) return trackTable[i].get_value (ptem, base, size_table);
 
-    hb_array_t<const F16DOT16> size_table ((base+sizeTable).arrayZ, sizes);
-    unsigned int size_index;
-    for (size_index = 0; size_index < sizes - 1; size_index++)
-      if (size_table[size_index].to_float () >= ptem)
-        break;
+    // Interpolate.
 
-    return roundf (interpolate_at (size_index ? size_index - 1 : 0, ptem,
-                                   *trackTableEntry, base));
+    float t0 = trackTable[i].get_track_value ();
+    float t1 = trackTable[j].get_track_value ();
+
+    float t = (track - t0) / (t1 - t0);
+
+    float a = trackTable[i].get_value (ptem, base, size_table);
+    float b = trackTable[j].get_value (ptem, base, size_table);
+    return a + t * (b - a);
   }
 
   bool sanitize (hb_sanitize_context_t *c, const void *base) const
   {
     TRACE_SANITIZE (this);
     return_trace (likely (c->check_struct (this) &&
+                          hb_barrier () &&
                           sizeTable.sanitize (c, base, nSizes) &&
                           trackTable.sanitize (c, nTracks, base, nSizes)));
   }
@@ -157,45 +190,15 @@ struct trak
 
   bool has_data () const { return version.to_int (); }
 
-  bool apply (hb_aat_apply_context_t *c) const
+  hb_position_t get_h_tracking (hb_font_t *font, float track = 0.f) const
   {
-    TRACE_APPLY (this);
-
-    hb_mask_t trak_mask = c->plan->trak_mask;
-
-    const float ptem = c->font->ptem;
-    if (unlikely (ptem <= 0.f))
-      return_trace (false);
-
-    hb_buffer_t *buffer = c->buffer;
-    if (HB_DIRECTION_IS_HORIZONTAL (buffer->props.direction))
-    {
-      const TrackData &trackData = this+horizData;
-      int tracking = trackData.get_tracking (this, ptem);
-      hb_position_t offset_to_add = c->font->em_scalef_x (tracking / 2);
-      hb_position_t advance_to_add = c->font->em_scalef_x (tracking);
-      foreach_grapheme (buffer, start, end)
-      {
-        if (!(buffer->info[start].mask & trak_mask)) continue;
-        buffer->pos[start].x_advance += advance_to_add;
-        buffer->pos[start].x_offset += offset_to_add;
-      }
-    }
-    else
-    {
-      const TrackData &trackData = this+vertData;
-      int tracking = trackData.get_tracking (this, ptem);
-      hb_position_t offset_to_add = c->font->em_scalef_y (tracking / 2);
-      hb_position_t advance_to_add = c->font->em_scalef_y (tracking);
-      foreach_grapheme (buffer, start, end)
-      {
-        if (!(buffer->info[start].mask & trak_mask)) continue;
-        buffer->pos[start].y_advance += advance_to_add;
-        buffer->pos[start].y_offset += offset_to_add;
-      }
-    }
-
-    return_trace (true);
+    float ptem = font->ptem > 0.f ? font->ptem : HB_CORETEXT_DEFAULT_FONT_SIZE;
+    return font->em_scalef_x ((this+horizData).get_tracking (this, ptem, track));
+  }
+  hb_position_t get_v_tracking (hb_font_t *font, float track = 0.f) const
+  {
+    float ptem = font->ptem > 0.f ? font->ptem : HB_CORETEXT_DEFAULT_FONT_SIZE;
+    return font->em_scalef_y ((this+vertData).get_tracking (this, ptem, track));
   }
 
   bool sanitize (hb_sanitize_context_t *c) const
@@ -203,6 +206,7 @@ struct trak
     TRACE_SANITIZE (this);
 
     return_trace (likely (c->check_struct (this) &&
+                          hb_barrier () &&
                           version.major == 1 &&
                           horizData.sanitize (c, this, this) &&
                           vertData.sanitize (c, this, this)));
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-aat-layout.cc b/src/java.desktop/share/native/libharfbuzz/hb-aat-layout.cc
index fc5834c7ca1..2cc94257aa7 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-aat-layout.cc
+++ b/src/java.desktop/share/native/libharfbuzz/hb-aat-layout.cc
@@ -34,9 +34,12 @@
 #include "hb-aat-layout-just-table.hh" // Just so we compile it; unused otherwise.
 #include "hb-aat-layout-kerx-table.hh"
 #include "hb-aat-layout-morx-table.hh"
-#include "hb-aat-layout-trak-table.hh"
+#include "hb-aat-layout-trak-table.hh" // Just so we compile it; unused otherwise.
 #include "hb-aat-ltag-table.hh"
 
+#include "hb-ot-layout-gsub-table.hh"
+#include "hb-ot-layout-gdef-table.hh"
+
 
 /*
  * hb_aat_apply_context_t
@@ -207,18 +210,48 @@ hb_aat_layout_find_feature_mapping (hb_tag_t tag)
  */
 
 
+bool
+AAT::morx::is_blocklisted (hb_blob_t *blob,
+                           hb_face_t *face) const
+{
+#ifdef HB_NO_AAT_LAYOUT_BLOCKLIST
+  return false;
+#endif
+
+  switch HB_CODEPOINT_ENCODE3 (blob->length,
+                               face->table.GSUB->table.get_length (),
+                               face->table.GDEF->table.get_length ())
+  {
+    /* https://github.com/harfbuzz/harfbuzz/issues/4108
+       sha1sum:a71ca6813b7e56a772cffff7c24a5166b087197c  AALMAGHRIBI.ttf */
+    case HB_CODEPOINT_ENCODE3 (19892, 2794, 340):
+      return true;
+  }
+  return false;
+}
+
+bool
+AAT::mort::is_blocklisted (hb_blob_t *blob,
+                           hb_face_t *face) const
+{
+#ifdef HB_NO_AAT_LAYOUT_BLOCKLIST
+  return false;
+#endif
+  return false;
+}
+
 void
 hb_aat_layout_compile_map (const hb_aat_map_builder_t *mapper,
                            hb_aat_map_t *map)
 {
-  const AAT::morx& morx = *mapper->face->table.morx;
+  const AAT::morx& morx = *mapper->face->table.morx->table;
   if (morx.has_data ())
   {
     morx.compile_flags (mapper, map);
     return;
   }
 
-  const AAT::mort& mort = *mapper->face->table.mort;
+  const AAT::mort& mort = *mapper->face->table.mort->table;
   if (mort.has_data ())
   {
     mort.compile_flags (mapper, map);
@@ -243,8 +276,8 @@ hb_aat_layout_compile_map (const hb_aat_map_builder_t *mapper,
 hb_bool_t
 hb_aat_layout_has_substitution (hb_face_t *face)
 {
-  return face->table.morx->has_data () ||
-         face->table.mort->has_data ();
+  return face->table.morx->table->has_data () ||
+         face->table.mort->table->has_data ();
 }
 
 void
@@ -260,26 +293,30 @@ hb_aat_layout_substitute (const hb_ot_shape_plan_t *plan,
   hb_aat_map_t map;
   builder.compile (map);
 
-  hb_blob_t *morx_blob = font->face->table.morx.get_blob ();
-  const AAT::morx& morx = *morx_blob->as<AAT::morx> ();
-  if (morx.has_data ())
   {
-    AAT::hb_aat_apply_context_t c (plan, font, buffer, morx_blob);
-    if (!buffer->message (font, "start table morx")) return;
-    morx.apply (&c, map);
-    (void) buffer->message (font, "end table morx");
-    return;
+    auto &accel = *font->face->table.morx;
+    const AAT::morx& morx = *accel.table;
+    if (morx.has_data ())
+    {
+      AAT::hb_aat_apply_context_t c (plan, font, buffer, accel.get_blob ());
+      if (!buffer->message (font, "start table morx")) return;
+      morx.apply (&c, map, accel);
+      (void) buffer->message (font, "end table morx");
+      return;
+    }
   }
 
-  hb_blob_t *mort_blob = font->face->table.mort.get_blob ();
-  const AAT::mort& mort = *mort_blob->as<AAT::mort> ();
-  if (mort.has_data ())
   {
-    AAT::hb_aat_apply_context_t c (plan, font, buffer, mort_blob);
-    if (!buffer->message (font, "start table mort")) return;
-    mort.apply (&c, map);
-    (void) buffer->message (font, "end table mort");
-    return;
+    auto &accel = *font->face->table.mort;
+    const AAT::mort& mort = *accel.table;
+    if (mort.has_data ())
+    {
+      AAT::hb_aat_apply_context_t c (plan, font, buffer, accel.get_blob ());
+      if (!buffer->message (font, "start table mort")) return;
+      mort.apply (&c, map, accel);
+      (void) buffer->message (font, "end table mort");
+      return;
+    }
   }
 }
 
@@ -322,7 +359,7 @@ hb_aat_layout_remove_deleted_glyphs (hb_buffer_t *buffer)
 hb_bool_t
 hb_aat_layout_has_positioning (hb_face_t *face)
 {
-  return face->table.kerx->has_data ();
+  return face->table.kerx->table->has_data ();
 }
 
 void
@@ -330,13 +367,12 @@ hb_aat_layout_position (const hb_ot_shape_plan_t *plan,
                         hb_font_t *font,
                         hb_buffer_t *buffer)
 {
-  hb_blob_t *kerx_blob = font->face->table.kerx.get_blob ();
-  const AAT::kerx& kerx = *kerx_blob->as<AAT::kerx> ();
+  auto &accel = *font->face->table.kerx;
 
-  AAT::hb_aat_apply_context_t c (plan, font, buffer, kerx_blob);
+  AAT::hb_aat_apply_context_t c (plan, font, buffer, accel.get_blob ());
   if (!buffer->message (font, "start table kerx")) return;
   c.set_ankr_table (font->face->table.ankr.get ());
-  kerx.apply (&c);
+  accel.apply (&c);
   (void) buffer->message (font, "end table kerx");
 }
 
@@ -358,17 +394,6 @@ hb_aat_layout_has_tracking (hb_face_t *face)
   return face->table.trak->has_data ();
 }
 
-void
-hb_aat_layout_track (const hb_ot_shape_plan_t *plan,
-                     hb_font_t *font,
-                     hb_buffer_t *buffer)
-{
-  const AAT::trak& trak = *font->face->table.trak;
-
-  AAT::hb_aat_apply_context_t c (plan, font, buffer);
-  trak.apply (&c);
-}
-
 /**
  * hb_aat_layout_get_feature_types:
  * @face: #hb_face_t to work upon
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-aat-layout.h b/src/java.desktop/share/native/libharfbuzz/hb-aat-layout.h
index c833ea8f623..88e040d7e2b 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-aat-layout.h
+++ b/src/java.desktop/share/native/libharfbuzz/hb-aat-layout.h
@@ -40,7 +40,7 @@ HB_BEGIN_DECLS
  * @HB_AAT_LAYOUT_FEATURE_TYPE_INVALID: Initial, unset feature type
  * @HB_AAT_LAYOUT_FEATURE_TYPE_ALL_TYPOGRAPHIC: [All Typographic Features](https://developer.apple.com/fonts/TrueType-Reference-Manual/RM09/AppendixF.html#Type0)
  * @HB_AAT_LAYOUT_FEATURE_TYPE_LIGATURES: [Ligatures](https://developer.apple.com/fonts/TrueType-Reference-Manual/RM09/AppendixF.html#Type1)
- * @HB_AAT_LAYOUT_FEATURE_TYPE_CURISVE_CONNECTION: [Cursive Connection](https://developer.apple.com/fonts/TrueType-Reference-Manual/RM09/AppendixF.html#Type2)
+ * @HB_AAT_LAYOUT_FEATURE_TYPE_CURSIVE_CONNECTION: [Cursive Connection](https://developer.apple.com/fonts/TrueType-Reference-Manual/RM09/AppendixF.html#Type2)
  * @HB_AAT_LAYOUT_FEATURE_TYPE_LETTER_CASE: [Letter Case](https://developer.apple.com/fonts/TrueType-Reference-Manual/RM09/AppendixF.html#Type3)
  * @HB_AAT_LAYOUT_FEATURE_TYPE_VERTICAL_SUBSTITUTION: [Vertical Substitution](https://developer.apple.com/fonts/TrueType-Reference-Manual/RM09/AppendixF.html#Type4)
  * @HB_AAT_LAYOUT_FEATURE_TYPE_LINGUISTIC_REARRANGEMENT: [Linguistic Rearrangement](https://developer.apple.com/fonts/TrueType-Reference-Manual/RM09/AppendixF.html#Type5)
@@ -88,7 +88,7 @@ typedef enum
 
   HB_AAT_LAYOUT_FEATURE_TYPE_ALL_TYPOGRAPHIC                    = 0,
   HB_AAT_LAYOUT_FEATURE_TYPE_LIGATURES                          = 1,
-  HB_AAT_LAYOUT_FEATURE_TYPE_CURISVE_CONNECTION                 = 2,
+  HB_AAT_LAYOUT_FEATURE_TYPE_CURSIVE_CONNECTION                 = 2,
   HB_AAT_LAYOUT_FEATURE_TYPE_LETTER_CASE                        = 3,
   HB_AAT_LAYOUT_FEATURE_TYPE_VERTICAL_SUBSTITUTION              = 4,
   HB_AAT_LAYOUT_FEATURE_TYPE_LINGUISTIC_REARRANGEMENT           = 5,
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-aat-layout.hh b/src/java.desktop/share/native/libharfbuzz/hb-aat-layout.hh
index 36bb0ef07dd..ee33223651a 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-aat-layout.hh
+++ b/src/java.desktop/share/native/libharfbuzz/hb-aat-layout.hh
@@ -32,6 +32,9 @@
 #include "hb-ot-shape.hh"
 #include "hb-aat-ltag-table.hh"
 
+/* https://developer.apple.com/documentation/coretext/1508745-ctfontcreatewithgraphicsfont */
+#define HB_CORETEXT_DEFAULT_FONT_SIZE 12.f
+
 struct hb_aat_feature_mapping_t
 {
   hb_tag_t otFeatureTag;
@@ -68,10 +71,5 @@ hb_aat_layout_position (const hb_ot_shape_plan_t *plan,
                         hb_font_t *font,
                         hb_buffer_t *buffer);
 
-HB_INTERNAL void
-hb_aat_layout_track (const hb_ot_shape_plan_t *plan,
-                     hb_font_t *font,
-                     hb_buffer_t *buffer);
-
 
 #endif /* HB_AAT_LAYOUT_HH */
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-aat-ltag-table.hh b/src/java.desktop/share/native/libharfbuzz/hb-aat-ltag-table.hh
index 17b341ef277..da4dcb1212f 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-aat-ltag-table.hh
+++ b/src/java.desktop/share/native/libharfbuzz/hb-aat-ltag-table.hh
@@ -46,7 +46,9 @@ struct FTStringRange
   bool sanitize (hb_sanitize_context_t *c, const void *base) const
   {
     TRACE_SANITIZE (this);
-    return_trace (c->check_struct (this) && (base+tag).sanitize (c, length));
+    return_trace (c->check_struct (this) &&
+                  hb_barrier () &&
+                  (base+tag).sanitize (c, length));
   }
 
   protected:
@@ -73,6 +75,7 @@ struct ltag
   {
     TRACE_SANITIZE (this);
     return_trace (likely (c->check_struct (this) &&
+                          hb_barrier () &&
                           version >= 1 &&
                           tagRanges.sanitize (c, this)));
   }
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-aat-map.cc b/src/java.desktop/share/native/libharfbuzz/hb-aat-map.cc
index 122f29dc681..e0e9d14d9b8 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-aat-map.cc
+++ b/src/java.desktop/share/native/libharfbuzz/hb-aat-map.cc
@@ -88,22 +88,23 @@ hb_aat_map_builder_t::compile (hb_aat_map_t  &m)
 
   /* Sort features by start/end events. */
   hb_vector_t<feature_event_t> feature_events;
+  feature_events.alloc_exact (features.length * 2 + 1);
   for (unsigned int i = 0; i < features.length; i++)
   {
-    auto &feature = features[i];
+    auto &feature = features.arrayZ[i];
 
-    if (features[i].start == features[i].end)
+    if (feature.start == feature.end)
       continue;
 
     feature_event_t *event;
 
     event = feature_events.push ();
-    event->index = features[i].start;
+    event->index = feature.start;
     event->start = true;
     event->feature = feature.info;
 
     event = feature_events.push ();
-    event->index = features[i].end;
+    event->index = feature.end;
     event->start = false;
     event->feature = feature.info;
   }
@@ -139,12 +140,12 @@ hb_aat_map_builder_t::compile (hb_aat_map_t  &m)
         current_features.qsort ();
         unsigned int j = 0;
         for (unsigned int i = 1; i < current_features.length; i++)
-          if (current_features[i].type != current_features[j].type ||
+          if (current_features.arrayZ[i].type != current_features.arrayZ[j].type ||
               /* Nonexclusive feature selectors come in even/odd pairs to turn a setting on/off
                * respectively, so we mask out the low-order bit when checking for "duplicates"
                * (selectors referring to the same feature setting) here. */
-              (!current_features[i].is_exclusive && ((current_features[i].setting & ~1) != (current_features[j].setting & ~1))))
-            current_features[++j] = current_features[i];
+              (!current_features.arrayZ[i].is_exclusive && ((current_features.arrayZ[i].setting & ~1) != (current_features.arrayZ[j].setting & ~1))))
+            current_features.arrayZ[++j] = current_features.arrayZ[i];
         current_features.shrink (j + 1);
       }
 
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-algs.hh b/src/java.desktop/share/native/libharfbuzz/hb-algs.hh
index b2b7c256739..6e250bfdef0 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-algs.hh
+++ b/src/java.desktop/share/native/libharfbuzz/hb-algs.hh
@@ -202,8 +202,12 @@ struct BEInt<Type, 4>
 /* Floats. */
 
 /* We want our rounding towards +infinity. */
+static inline double
+_hb_roundf (double x) { return floor (x + .5); }
+
 static inline float
 _hb_roundf (float x) { return floorf (x + .5f); }
+
 #define roundf(x) _hb_roundf(x)
 
 
@@ -282,7 +286,7 @@ HB_FUNCOBJ (hb_bool);
 
 // Compression function for Merkle-Damgard construction.
 // This function is generated using the framework provided.
-#define mix(h) (                                        \
+#define fasthash_mix(h) (                                       \
                         (void) ((h) ^= (h) >> 23),              \
                         (void) ((h) *= 0x2127599bf4325c37ULL),  \
                         (h) ^= (h) >> 47)
@@ -306,7 +310,7 @@ static inline uint64_t fasthash64(const void *buf, size_t len, uint64_t seed)
 #pragma GCC diagnostic ignored "-Wcast-align"
             v  = * (const uint64_t *) (pos++);
 #pragma GCC diagnostic pop
-            h ^= mix(v);
+            h ^= fasthash_mix(v);
             h *= m;
           }
         }
@@ -316,7 +320,7 @@ static inline uint64_t fasthash64(const void *buf, size_t len, uint64_t seed)
           while (pos != end)
           {
             v  = pos++->v;
-            h ^= mix(v);
+            h ^= fasthash_mix(v);
             h *= m;
           }
         }
@@ -332,11 +336,11 @@ static inline uint64_t fasthash64(const void *buf, size_t len, uint64_t seed)
         case 3: v ^= (uint64_t)pos2[2] << 16; HB_FALLTHROUGH;
         case 2: v ^= (uint64_t)pos2[1] <<  8; HB_FALLTHROUGH;
         case 1: v ^= (uint64_t)pos2[0];
-                h ^= mix(v);
+                h ^= fasthash_mix(v);
                 h *= m;
         }
 
-        return mix(h);
+        return fasthash_mix(h);
 }
 
 static inline uint32_t fasthash32(const void *buf, size_t len, uint32_t seed)
@@ -671,7 +675,7 @@ struct hb_pair_t
     return 0;
   }
 
-  friend void swap (hb_pair_t& a, hb_pair_t& b)
+  friend void swap (hb_pair_t& a, hb_pair_t& b) noexcept
   {
     hb_swap (a.first, b.first);
     hb_swap (a.second, b.second);
@@ -1053,6 +1057,18 @@ _hb_cmp_method (const void *pkey, const void *pval, Ts... ds)
   return val.cmp (key, ds...);
 }
 
+template <typename K, typename V>
+static int
+_hb_cmp_operator (const void *pkey, const void *pval)
+{
+  const K& key = * (const K*) pkey;
+  const V& val = * (const V*) pval;
+
+  if (key < val) return -1;
+  if (key > val) return  1;
+  return 0;
+}
+
 template <typename V, typename K, typename ...Ts>
 static inline bool
 hb_bsearch_impl (unsigned *pos, /* Out */
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-array.hh b/src/java.desktop/share/native/libharfbuzz/hb-array.hh
index 439f18259cf..d65bbc5c711 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-array.hh
+++ b/src/java.desktop/share/native/libharfbuzz/hb-array.hh
@@ -47,6 +47,8 @@ enum hb_not_found_t
 template <typename Type>
 struct hb_array_t : hb_iter_with_fallback_t<hb_array_t<Type>, Type&>
 {
+  static constexpr bool realloc_move = true;
+
   /*
    * Constructors.
    */
@@ -249,7 +251,8 @@ struct hb_array_t : hb_iter_with_fallback_t<hb_array_t<Type>, Type&>
     if (end < start + 2)
       return;
 
-    for (unsigned lhs = start, rhs = end - 1; lhs < rhs; lhs++, rhs--)
+    unsigned stop = start + (end - start) / 2;
+    for (unsigned lhs = start, rhs = end - 1; lhs < stop; lhs++, rhs--)
       hb_swap (arrayZ[rhs], arrayZ[lhs]);
   }
 
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-atomic.hh b/src/java.desktop/share/native/libharfbuzz/hb-atomic.hh
index 459d82e0f2e..d2de5f693f0 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-atomic.hh
+++ b/src/java.desktop/share/native/libharfbuzz/hb-atomic.hh
@@ -118,12 +118,12 @@ _hb_atomic_ptr_impl_cmplexch (const void **P, const void *O_, const void *N)
  */
 #ifndef _hb_compiler_memory_r_barrier
 #if defined(__ATOMIC_ACQUIRE) // gcc-like
-#define _hb_compiler_memory_r_barrier() asm volatile("": : :"memory")
+static inline void _hb_compiler_memory_r_barrier () { asm volatile("": : :"memory"); }
 #elif !defined(_MSC_VER)
 #include <atomic>
 #define _hb_compiler_memory_r_barrier() std::atomic_signal_fence (std::memory_order_acquire)
 #else
-#define _hb_compiler_memory_r_barrier() do {} while (0)
+static inline void _hb_compiler_memory_r_barrier () {}
 #endif
 #endif
 
@@ -212,11 +212,18 @@ struct hb_atomic_ptr_t
   T *get_acquire () const { return (T *) hb_atomic_ptr_impl_get ((void **) &v); }
   bool cmpexch (const T *old, T *new_) const { return hb_atomic_ptr_impl_cmpexch ((void **) &v, (void *) old, (void *) new_); }
 
+  operator bool () const { return get_acquire () != nullptr; }
   T * operator -> () const                    { return get_acquire (); }
   template <typename C> operator C * () const { return get_acquire (); }
 
   T *v = nullptr;
 };
 
+static inline bool hb_barrier ()
+{
+  _hb_compiler_memory_r_barrier ();
+  return true;
+}
+
 
 #endif /* HB_ATOMIC_HH */
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-bit-page.hh b/src/java.desktop/share/native/libharfbuzz/hb-bit-page.hh
index 404a19ce557..9562a9674a5 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-bit-page.hh
+++ b/src/java.desktop/share/native/libharfbuzz/hb-bit-page.hh
@@ -78,6 +78,28 @@ struct hb_vector_size_t
   hb_vector_size_t operator ~ () const
   { return process (hb_bitwise_neg); }
 
+  operator bool () const
+  {
+    for (unsigned int i = 0; i < ARRAY_LENGTH (v); i++)
+      if (v[i])
+        return true;
+    return false;
+  }
+  operator unsigned int () const
+  {
+    unsigned int r = 0;
+    for (unsigned int i = 0; i < ARRAY_LENGTH (v); i++)
+      r += hb_popcount (v[i]);
+    return r;
+  }
+  bool operator == (const hb_vector_size_t &o) const
+  {
+    for (unsigned int i = 0; i < ARRAY_LENGTH (v); i++)
+      if (v[i] != o.v[i])
+        return false;
+    return true;
+  }
+
   hb_array_t<const elt_t> iter () const
   { return hb_array (v); }
 
@@ -89,6 +111,8 @@ struct hb_vector_size_t
 
 struct hb_bit_page_t
 {
+  hb_bit_page_t () { init0 (); }
+
   void init0 () { v.init0 (); population = 0; }
   void init1 () { v.init1 (); population = PAGE_BITS; }
 
@@ -101,10 +125,9 @@ struct hb_bit_page_t
   bool is_empty () const
   {
     if (has_population ()) return !population;
-    return
-    + hb_iter (v)
-    | hb_none
-    ;
+    bool empty = !v;
+    if (empty) population = 0;
+    return empty;
   }
   uint32_t hash () const
   {
@@ -115,6 +138,10 @@ struct hb_bit_page_t
   void del (hb_codepoint_t g) { elt (g) &= ~mask (g); dirty (); }
   void set (hb_codepoint_t g, bool value) { if (value) add (g); else del (g); }
   bool get (hb_codepoint_t g) const { return elt (g) & mask (g); }
+  bool may_have (hb_codepoint_t g) const { return get (g); }
+
+  bool operator [] (hb_codepoint_t g) const { return get (g); }
+  bool operator () (hb_codepoint_t g) const { return get (g); }
 
   void add_range (hb_codepoint_t a, hb_codepoint_t b)
   {
@@ -220,13 +247,17 @@ struct hb_bit_page_t
   }
 
   bool operator == (const hb_bit_page_t &other) const { return is_equal (other); }
-  bool is_equal (const hb_bit_page_t &other) const
+  bool is_equal (const hb_bit_page_t &other) const { return v == other.v; }
+  bool intersects (const hb_bit_page_t &other) const
   {
     for (unsigned i = 0; i < len (); i++)
-      if (v[i] != other.v[i])
-        return false;
-    return true;
+      if (v[i] & other.v[i])
+        return true;
+    return false;
   }
+  bool may_intersect (const hb_bit_page_t &other) const
+  { return intersects (other); }
+
   bool operator <= (const hb_bit_page_t &larger_page) const { return is_subset (larger_page); }
   bool is_subset (const hb_bit_page_t &larger_page) const
   {
@@ -241,14 +272,10 @@ struct hb_bit_page_t
   }
 
   bool has_population () const { return population != UINT_MAX; }
-  unsigned int get_population () const
+  unsigned get_population () const
   {
     if (has_population ()) return population;
-    population =
-    + hb_iter (v)
-    | hb_reduce ([] (unsigned pop, const elt_t &_) { return pop + hb_popcount (_); }, 0u)
-    ;
-    return population;
+    return population = v;
   }
 
   bool next (hb_codepoint_t *codepoint) const
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-bit-set-invertible.hh b/src/java.desktop/share/native/libharfbuzz/hb-bit-set-invertible.hh
index 2e335549e26..740a2437671 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-bit-set-invertible.hh
+++ b/src/java.desktop/share/native/libharfbuzz/hb-bit-set-invertible.hh
@@ -39,10 +39,10 @@ struct hb_bit_set_invertible_t
 
   hb_bit_set_invertible_t () = default;
   hb_bit_set_invertible_t (const hb_bit_set_invertible_t& o) = default;
-  hb_bit_set_invertible_t (hb_bit_set_invertible_t&& other) : hb_bit_set_invertible_t () { hb_swap (*this, other); }
+  hb_bit_set_invertible_t (hb_bit_set_invertible_t&& other)  noexcept : hb_bit_set_invertible_t () { hb_swap (*this, other); }
   hb_bit_set_invertible_t& operator= (const hb_bit_set_invertible_t& o) = default;
-  hb_bit_set_invertible_t& operator= (hb_bit_set_invertible_t&& other) { hb_swap (*this, other); return *this; }
-  friend void swap (hb_bit_set_invertible_t &a, hb_bit_set_invertible_t &b)
+  hb_bit_set_invertible_t& operator= (hb_bit_set_invertible_t&& other)  noexcept { hb_swap (*this, other); return *this; }
+  friend void swap (hb_bit_set_invertible_t &a, hb_bit_set_invertible_t &b) noexcept
   {
     if (likely (!a.s.successful || !b.s.successful))
       return;
@@ -126,6 +126,7 @@ struct hb_bit_set_invertible_t
   { unlikely (inverted) ? (void) s.add_range (a, b) : s.del_range (a, b); }
 
   bool get (hb_codepoint_t g) const { return s.get (g) ^ inverted; }
+  bool may_have (hb_codepoint_t g) const { return get (g); }
 
   /* Has interface. */
   bool operator [] (hb_codepoint_t k) const { return get (k); }
@@ -139,6 +140,9 @@ struct hb_bit_set_invertible_t
   hb_bit_set_invertible_t& operator << (const hb_codepoint_pair_t& range)
   { add_range (range.first, range.second); return *this; }
 
+  bool may_intersect (const hb_bit_set_invertible_t &other) const
+  { return inverted || other.inverted || s.intersects (other.s); }
+
   bool intersects (hb_codepoint_t first, hb_codepoint_t last) const
   {
     hb_codepoint_t c = first - 1;
@@ -359,8 +363,8 @@ struct hb_bit_set_invertible_t
     typedef hb_codepoint_t __item_t__;
     hb_codepoint_t __item__ () const { return v; }
     bool __more__ () const { return v != INVALID; }
-    void __next__ () { s->next (&v); if (l) l--; }
-    void __prev__ () { s->previous (&v); }
+    void __next__ () { s->next (&v); if (likely (l)) l--; }
+    void __prev__ () { s->previous (&v); l++; }
     unsigned __len__ () const { return l; }
     iter_t end () const { return iter_t (*s, false); }
     bool operator != (const iter_t& o) const
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-bit-set.hh b/src/java.desktop/share/native/libharfbuzz/hb-bit-set.hh
index b900711a33a..c42e617f67a 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-bit-set.hh
+++ b/src/java.desktop/share/native/libharfbuzz/hb-bit-set.hh
@@ -38,10 +38,10 @@ struct hb_bit_set_t
   ~hb_bit_set_t () = default;
 
   hb_bit_set_t (const hb_bit_set_t& other) : hb_bit_set_t () { set (other, true); }
-  hb_bit_set_t ( hb_bit_set_t&& other) : hb_bit_set_t () { hb_swap (*this, other); }
+  hb_bit_set_t ( hb_bit_set_t&& other)  noexcept : hb_bit_set_t () { hb_swap (*this, other); }
   hb_bit_set_t& operator= (const hb_bit_set_t& other) { set (other); return *this; }
-  hb_bit_set_t& operator= (hb_bit_set_t&& other) { hb_swap (*this, other); return *this; }
-  friend void swap (hb_bit_set_t &a, hb_bit_set_t &b)
+  hb_bit_set_t& operator= (hb_bit_set_t&& other)  noexcept { hb_swap (*this, other); return *this; }
+  friend void swap (hb_bit_set_t &a, hb_bit_set_t &b) noexcept
   {
     if (likely (!a.successful || !b.successful))
       return;
@@ -88,10 +88,11 @@ struct hb_bit_set_t
   {
     if (unlikely (!successful)) return false;
 
-    if (pages.length == 0 && count == 1)
+    if (pages.length < count && count <= 2)
       exact_size = true; // Most sets are small and local
 
-    if (unlikely (!pages.resize (count, clear, exact_size) || !page_map.resize (count, clear, exact_size)))
+    if (unlikely (!pages.resize (count, clear, exact_size) ||
+        !page_map.resize (count, clear)))
     {
       pages.resize (page_map.length, clear, exact_size);
       successful = false;
@@ -297,9 +298,9 @@ struct hb_bit_set_t
       unsigned int write_index = 0;
       for (unsigned int i = 0; i < page_map.length; i++)
       {
-        int m = (int) page_map[i].major;
+        int m = (int) page_map.arrayZ[i].major;
         if (m < ds || de < m)
-          page_map[write_index++] = page_map[i];
+          page_map.arrayZ[write_index++] = page_map.arrayZ[i];
       }
       compact (compact_workspace, write_index);
       resize (write_index);
@@ -345,6 +346,7 @@ struct hb_bit_set_t
       return false;
     return page->get (g);
   }
+  bool may_have (hb_codepoint_t g) const { return get (g); }
 
   /* Has interface. */
   bool operator [] (hb_codepoint_t k) const { return get (k); }
@@ -358,6 +360,31 @@ struct hb_bit_set_t
   hb_bit_set_t& operator << (const hb_codepoint_pair_t& range)
   { add_range (range.first, range.second); return *this; }
 
+  bool intersects (const hb_bit_set_t &other) const
+  {
+    unsigned int na = pages.length;
+    unsigned int nb = other.pages.length;
+
+    unsigned int a = 0, b = 0;
+    for (; a < na && b < nb; )
+    {
+      if (page_map.arrayZ[a].major == other.page_map.arrayZ[b].major)
+      {
+        if (page_at (a).intersects (other.page_at (b)))
+          return true;
+        a++;
+        b++;
+      }
+      else if (page_map.arrayZ[a].major < other.page_map.arrayZ[b].major)
+        a++;
+      else
+        b++;
+    }
+    return false;
+  }
+  bool may_intersect (const hb_bit_set_t &other) const
+  { return intersects (other); }
+
   bool intersects (hb_codepoint_t first, hb_codepoint_t last) const
   {
     hb_codepoint_t c = first - 1;
@@ -389,7 +416,7 @@ struct hb_bit_set_t
     {
       if (page_at (a).is_empty ()) { a++; continue; }
       if (other.page_at (b).is_empty ()) { b++; continue; }
-      if (page_map[a].major != other.page_map[b].major ||
+      if (page_map.arrayZ[a].major != other.page_map.arrayZ[b].major ||
           !page_at (a).is_equal (other.page_at (b)))
         return false;
       a++;
@@ -412,8 +439,8 @@ struct hb_bit_set_t
     uint32_t spi = 0;
     for (uint32_t lpi = 0; spi < page_map.length && lpi < larger_set.page_map.length; lpi++)
     {
-      uint32_t spm = page_map[spi].major;
-      uint32_t lpm = larger_set.page_map[lpi].major;
+      uint32_t spm = page_map.arrayZ[spi].major;
+      uint32_t lpm = larger_set.page_map.arrayZ[lpi].major;
       auto sp = page_at (spi);
 
       if (spm < lpm && !sp.is_empty ())
@@ -503,7 +530,7 @@ struct hb_bit_set_t
 
     for (; a < na && b < nb; )
     {
-      if (page_map[a].major == other.page_map[b].major)
+      if (page_map.arrayZ[a].major == other.page_map.arrayZ[b].major)
       {
         if (!passthru_left)
         {
@@ -512,7 +539,7 @@ struct hb_bit_set_t
           // passthru_left is set since no left side pages will be removed
           // in that case.
           if (write_index < a)
-            page_map[write_index] = page_map[a];
+            page_map.arrayZ[write_index] = page_map.arrayZ[a];
           write_index++;
         }
 
@@ -520,7 +547,7 @@ struct hb_bit_set_t
         a++;
         b++;
       }
-      else if (page_map[a].major < other.page_map[b].major)
+      else if (page_map.arrayZ[a].major < other.page_map.arrayZ[b].major)
       {
         if (passthru_left)
           count++;
@@ -765,8 +792,8 @@ struct hb_bit_set_t
     unsigned int initial_size = size;
     for (unsigned int i = start_page; i < page_map.length && size; i++)
     {
-      uint32_t base = major_start (page_map[i].major);
-      unsigned int n = pages[page_map[i].index].write (base, start_page_value, out, size);
+      uint32_t base = major_start (page_map.arrayZ[i].major);
+      unsigned int n = pages[page_map.arrayZ[i].index].write (base, start_page_value, out, size);
       out += n;
       size -= n;
       start_page_value = 0;
@@ -814,8 +841,8 @@ struct hb_bit_set_t
     hb_codepoint_t next_value = codepoint + 1;
     for (unsigned int i=start_page; i<page_map.length && size; i++)
     {
-      uint32_t base = major_start (page_map[i].major);
-      unsigned int n = pages[page_map[i].index].write_inverted (base, start_page_value, out, size, &next_value);
+      uint32_t base = major_start (page_map.arrayZ[i].major);
+      unsigned int n = pages[page_map.arrayZ[i].index].write_inverted (base, start_page_value, out, size, &next_value);
       out += n;
       size -= n;
       start_page_value = 0;
@@ -846,8 +873,8 @@ struct hb_bit_set_t
     unsigned count = pages.length;
     for (unsigned i = 0; i < count; i++)
     {
-      const auto& map = page_map[i];
-      const auto& page = pages[map.index];
+      const auto& map = page_map.arrayZ[i];
+      const auto& page = pages.arrayZ[map.index];
 
       if (!page.is_empty ())
         return map.major * page_t::PAGE_BITS + page.get_min ();
@@ -859,8 +886,8 @@ struct hb_bit_set_t
     unsigned count = pages.length;
     for (signed i = count - 1; i >= 0; i--)
     {
-      const auto& map = page_map[(unsigned) i];
-      const auto& page = pages[map.index];
+      const auto& map = page_map.arrayZ[(unsigned) i];
+      const auto& page = pages.arrayZ[map.index];
 
       if (!page.is_empty ())
         return map.major * page_t::PAGE_BITS + page.get_max ();
@@ -961,7 +988,7 @@ struct hb_bit_set_t
       return nullptr;
 
     last_page_lookup = i;
-    return &pages.arrayZ[page_map[i].index];
+    return &pages.arrayZ[page_map.arrayZ[i].index];
   }
   page_t &page_at (unsigned int i)
   {
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-blob.cc b/src/java.desktop/share/native/libharfbuzz/hb-blob.cc
index 2a43afa1a43..a19599fac09 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-blob.cc
+++ b/src/java.desktop/share/native/libharfbuzz/hb-blob.cc
@@ -598,6 +598,11 @@ _open_resource_fork (const char *file_name, hb_mapped_file_t *file)
  * Creates a new blob containing the data from the
  * specified binary font file.
  *
+ * The filename is passed directly to the system on all platforms,
+ * except on Windows, where the filename is interpreted as UTF-8.
+ * Only if the filename is not valid UTF-8, it will be interpreted
+ * according to the system codepage.
+ *
  * Returns: An #hb_blob_t pointer with the content of the file,
  * or hb_blob_get_empty() if failed.
  *
@@ -612,10 +617,14 @@ hb_blob_create_from_file (const char *file_name)
 
 /**
  * hb_blob_create_from_file_or_fail:
- * @file_name: A font filename
+ * @file_name: A filename
  *
- * Creates a new blob containing the data from the
- * specified binary font file.
+ * Creates a new blob containing the data from the specified file.
+ *
+ * The filename is passed directly to the system on all platforms,
+ * except on Windows, where the filename is interpreted as UTF-8.
+ * Only if the filename is not valid UTF-8, it will be interpreted
+ * according to the system codepage.
  *
  * Returns: An #hb_blob_t pointer with the content of the file,
  * or `NULL` if failed.
@@ -672,10 +681,19 @@ fail_without_close:
   if (unlikely (!file)) return nullptr;
 
   HANDLE fd;
+  int conversion;
   unsigned int size = strlen (file_name) + 1;
   wchar_t * wchar_file_name = (wchar_t *) hb_malloc (sizeof (wchar_t) * size);
   if (unlikely (!wchar_file_name)) goto fail_without_close;
-  mbstowcs (wchar_file_name, file_name, size);
+
+  /* Assume file name is given in UTF-8 encoding */
+  conversion = MultiByteToWideChar(CP_UTF8, MB_ERR_INVALID_CHARS, file_name, -1, wchar_file_name, size);
+  if (conversion <= 0)
+  {
+    /* Conversion failed due to invalid UTF-8 characters,
+       Repeat conversion based on system code page */
+    mbstowcs(wchar_file_name, file_name, size);
+  }
 #if !WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) && WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP)
   {
     CREATEFILE2_EXTENDED_PARAMETERS ceparams = { 0 };
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-buffer-deserialize-json.hh b/src/java.desktop/share/native/libharfbuzz/hb-buffer-deserialize-json.hh
index 2a90cbfe3ea..69cc1640230 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-buffer-deserialize-json.hh
+++ b/src/java.desktop/share/native/libharfbuzz/hb-buffer-deserialize-json.hh
@@ -34,36 +34,36 @@
 
 #line 36 "hb-buffer-deserialize-json.hh"
 static const unsigned char _deserialize_json_trans_keys[] = {
-        0u, 0u, 9u, 123u, 9u, 34u, 97u, 117u, 120u, 121u, 34u, 34u, 9u, 58u, 9u, 57u,
-        48u, 57u, 9u, 125u, 9u, 125u, 9u, 93u, 9u, 125u, 34u, 34u, 9u, 58u, 9u, 57u,
+        0u, 0u, 9u, 123u, 9u, 123u, 9u, 34u, 97u, 117u, 120u, 121u, 34u, 34u, 9u, 58u,
+        9u, 57u, 48u, 57u, 9u, 125u, 9u, 125u, 9u, 125u, 34u, 34u, 9u, 58u, 9u, 57u,
         48u, 57u, 9u, 125u, 9u, 125u, 108u, 108u, 34u, 34u, 9u, 58u, 9u, 57u, 9u, 125u,
         9u, 125u, 120u, 121u, 34u, 34u, 9u, 58u, 9u, 57u, 48u, 57u, 9u, 125u, 9u, 125u,
         34u, 34u, 9u, 58u, 9u, 57u, 48u, 57u, 9u, 125u, 9u, 125u, 108u, 108u, 34u, 34u,
         9u, 58u, 9u, 57u, 9u, 125u, 9u, 125u, 34u, 34u, 9u, 58u, 9u, 57u, 34u, 92u,
         9u, 125u, 34u, 92u, 9u, 125u, 9u, 125u, 34u, 34u, 9u, 58u, 9u, 57u, 9u, 125u,
-        9u, 123u, 0u, 0u, 0
+        9u, 93u, 9u, 123u, 0u, 0u, 0
 };
 
 static const char _deserialize_json_key_spans[] = {
-        0, 115, 26, 21, 2, 1, 50, 49,
-        10, 117, 117, 85, 117, 1, 50, 49,
+        0, 115, 115, 26, 21, 2, 1, 50,
+        49, 10, 117, 117, 117, 1, 50, 49,
         10, 117, 117, 1, 1, 50, 49, 117,
         117, 2, 1, 50, 49, 10, 117, 117,
         1, 50, 49, 10, 117, 117, 1, 1,
         50, 49, 117, 117, 1, 50, 49, 59,
         117, 59, 117, 117, 1, 50, 49, 117,
-        115, 0
+        85, 115, 0
 };
 
 static const short _deserialize_json_index_offsets[] = {
-        0, 0, 116, 143, 165, 168, 170, 221,
-        271, 282, 400, 518, 604, 722, 724, 775,
-        825, 836, 954, 1072, 1074, 1076, 1127, 1177,
-        1295, 1413, 1416, 1418, 1469, 1519, 1530, 1648,
-        1766, 1768, 1819, 1869, 1880, 1998, 2116, 2118,
-        2120, 2171, 2221, 2339, 2457, 2459, 2510, 2560,
-        2620, 2738, 2798, 2916, 3034, 3036, 3087, 3137,
-        3255, 3371
+        0, 0, 116, 232, 259, 281, 284, 286,
+        337, 387, 398, 516, 634, 752, 754, 805,
+        855, 866, 984, 1102, 1104, 1106, 1157, 1207,
+        1325, 1443, 1446, 1448, 1499, 1549, 1560, 1678,
+        1796, 1798, 1849, 1899, 1910, 2028, 2146, 2148,
+        2150, 2201, 2251, 2369, 2487, 2489, 2540, 2590,
+        2650, 2768, 2828, 2946, 3064, 3066, 3117, 3167,
+        3285, 3371, 3487
 };
 
 static const char _deserialize_json_indicies[] = {
@@ -77,51 +77,51 @@ static const char _deserialize_json_indicies[] = {
         1, 1, 1, 1, 1, 1, 1, 1,
         1, 1, 1, 1, 1, 1, 1, 1,
         1, 1, 1, 1, 1, 1, 1, 1,
+        1, 1, 1, 2, 1, 1, 1, 1,
+        1, 1, 1, 1, 1, 1, 1, 1,
+        1, 1, 1, 1, 1, 1, 1, 1,
+        1, 1, 1, 1, 1, 1, 1, 1,
+        1, 1, 1, 3, 1, 2, 2, 2,
+        2, 2, 1, 1, 1, 1, 1, 1,
+        1, 1, 1, 1, 1, 1, 1, 1,
+        1, 1, 1, 1, 2, 1, 1, 1,
         1, 1, 1, 1, 1, 1, 1, 1,
         1, 1, 1, 1, 1, 1, 1, 1,
         1, 1, 1, 1, 1, 1, 1, 1,
         1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 2, 1, 3, 3, 3,
-        3, 3, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 3, 1, 4, 1,
-        5, 1, 6, 7, 1, 8, 9, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 10, 1, 11, 12,
-        1, 13, 1, 13, 13, 13, 13, 13,
         1, 1, 1, 1, 1, 1, 1, 1,
         1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 13, 1, 1, 1, 1, 1,
         1, 1, 1, 1, 1, 1, 1, 1,
         1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 14, 1, 14, 14,
-        14, 14, 14, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 14, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 15, 1, 1, 16, 17, 17,
-        17, 17, 17, 17, 17, 17, 17, 1,
-        18, 19, 19, 19, 19, 19, 19, 19,
-        19, 19, 1, 20, 20, 20, 20, 20,
         1, 1, 1, 1, 1, 1, 1, 1,
         1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 20, 1, 1, 1, 1, 1,
+        1, 1, 1, 1, 1, 1, 1, 3,
+        1, 4, 4, 4, 4, 4, 1, 1,
+        1, 1, 1, 1, 1, 1, 1, 1,
+        1, 1, 1, 1, 1, 1, 1, 1,
+        4, 1, 5, 1, 6, 1, 7, 8,
+        1, 9, 10, 1, 1, 1, 1, 1,
+        1, 1, 1, 1, 1, 1, 1, 1,
+        11, 1, 12, 13, 1, 14, 1, 14,
+        14, 14, 14, 14, 1, 1, 1, 1,
+        1, 1, 1, 1, 1, 1, 1, 1,
+        1, 1, 1, 1, 1, 1, 14, 1,
+        1, 1, 1, 1, 1, 1, 1, 1,
+        1, 1, 1, 1, 1, 1, 1, 1,
+        1, 1, 1, 1, 1, 1, 1, 1,
+        15, 1, 15, 15, 15, 15, 15, 1,
+        1, 1, 1, 1, 1, 1, 1, 1,
+        1, 1, 1, 1, 1, 1, 1, 1,
+        1, 15, 1, 1, 1, 1, 1, 1,
+        1, 1, 1, 1, 1, 1, 16, 1,
+        1, 17, 18, 18, 18, 18, 18, 18,
+        18, 18, 18, 1, 19, 20, 20, 20,
+        20, 20, 20, 20, 20, 20, 1, 21,
+        21, 21, 21, 21, 1, 1, 1, 1,
+        1, 1, 1, 1, 1, 1, 1, 1,
         1, 1, 1, 1, 1, 1, 21, 1,
         1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 22,
-        1, 23, 23, 23, 23, 23, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        23, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 3, 1, 1, 1,
+        1, 1, 22, 1, 1, 1, 1, 1,
         1, 1, 1, 1, 1, 1, 1, 1,
         1, 1, 1, 1, 1, 1, 1, 1,
         1, 1, 1, 1, 1, 1, 1, 1,
@@ -131,24 +131,55 @@ static const char _deserialize_json_indicies[] = {
         1, 1, 1, 1, 1, 1, 1, 1,
         1, 1, 1, 1, 1, 1, 1, 1,
         1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 24, 1, 25,
-        25, 25, 25, 25, 1, 1, 1, 1,
+        1, 1, 1, 23, 1, 24, 24, 24,
+        24, 24, 1, 1, 1, 1, 1, 1,
+        1, 1, 1, 1, 1, 1, 1, 1,
+        1, 1, 1, 1, 24, 1, 1, 1,
+        1, 1, 1, 1, 1, 1, 1, 1,
+        4, 1, 1, 1, 1, 1, 1, 1,
+        1, 1, 1, 1, 1, 1, 1, 1,
+        1, 1, 1, 1, 1, 1, 1, 1,
+        1, 1, 1, 1, 1, 1, 1, 1,
+        1, 1, 1, 1, 1, 1, 1, 1,
+        1, 1, 1, 1, 1, 1, 1, 1,
+        1, 1, 1, 1, 1, 1, 1, 1,
+        1, 1, 1, 1, 1, 1, 1, 1,
+        1, 1, 1, 1, 1, 1, 1, 1,
+        1, 1, 1, 1, 1, 1, 1, 1,
+        1, 25, 1, 21, 21, 21, 21, 21,
+        1, 1, 1, 1, 1, 1, 1, 1,
+        1, 1, 1, 1, 1, 1, 1, 1,
+        1, 1, 21, 1, 1, 1, 1, 1,
+        1, 1, 1, 1, 1, 1, 22, 1,
+        1, 1, 20, 20, 20, 20, 20, 20,
+        20, 20, 20, 20, 1, 1, 1, 1,
+        1, 1, 1, 1, 1, 1, 1, 1,
+        1, 1, 1, 1, 1, 1, 1, 1,
+        1, 1, 1, 1, 1, 1, 1, 1,
+        1, 1, 1, 1, 1, 1, 1, 1,
+        1, 1, 1, 1, 1, 1, 1, 1,
+        1, 1, 1, 1, 1, 1, 1, 1,
+        1, 1, 1, 1, 1, 1, 1, 1,
+        1, 1, 1, 1, 1, 1, 1, 23,
+        1, 26, 1, 26, 26, 26, 26, 26,
         1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 25, 1,
         1, 1, 1, 1, 1, 1, 1, 1,
         1, 1, 26, 1, 1, 1, 1, 1,
         1, 1, 1, 1, 1, 1, 1, 1,
         1, 1, 1, 1, 1, 1, 1, 1,
+        1, 1, 1, 1, 27, 1, 27, 27,
+        27, 27, 27, 1, 1, 1, 1, 1,
+        1, 1, 1, 1, 1, 1, 1, 1,
+        1, 1, 1, 1, 1, 27, 1, 1,
+        1, 1, 1, 1, 1, 1, 1, 1,
+        1, 1, 28, 1, 1, 29, 30, 30,
+        30, 30, 30, 30, 30, 30, 30, 1,
+        31, 32, 32, 32, 32, 32, 32, 32,
+        32, 32, 1, 33, 33, 33, 33, 33,
         1, 1, 1, 1, 1, 1, 1, 1,
         1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 27, 1, 20, 20, 20,
-        20, 20, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 20, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        21, 1, 1, 1, 19, 19, 19, 19,
-        19, 19, 19, 19, 19, 19, 1, 1,
+        1, 1, 33, 1, 1, 1, 1, 1,
+        1, 1, 1, 1, 1, 1, 34, 1,
         1, 1, 1, 1, 1, 1, 1, 1,
         1, 1, 1, 1, 1, 1, 1, 1,
         1, 1, 1, 1, 1, 1, 1, 1,
@@ -157,26 +188,15 @@ static const char _deserialize_json_indicies[] = {
         1, 1, 1, 1, 1, 1, 1, 1,
         1, 1, 1, 1, 1, 1, 1, 1,
         1, 1, 1, 1, 1, 1, 1, 1,
-        1, 22, 1, 28, 1, 28, 28, 28,
-        28, 28, 1, 1, 1, 1, 1, 1,
         1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 28, 1, 1, 1,
+        1, 1, 1, 1, 1, 1, 1, 35,
+        1, 33, 33, 33, 33, 33, 1, 1,
         1, 1, 1, 1, 1, 1, 1, 1,
         1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 29, 1,
-        29, 29, 29, 29, 29, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 29,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 30, 1, 1, 31,
+        33, 1, 1, 1, 1, 1, 1, 1,
+        1, 1, 1, 1, 34, 1, 1, 1,
         32, 32, 32, 32, 32, 32, 32, 32,
-        32, 1, 33, 34, 34, 34, 34, 34,
-        34, 34, 34, 34, 1, 35, 35, 35,
-        35, 35, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 35, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        36, 1, 1, 1, 1, 1, 1, 1,
+        32, 32, 1, 1, 1, 1, 1, 1,
         1, 1, 1, 1, 1, 1, 1, 1,
         1, 1, 1, 1, 1, 1, 1, 1,
         1, 1, 1, 1, 1, 1, 1, 1,
@@ -184,41 +204,25 @@ static const char _deserialize_json_indicies[] = {
         1, 1, 1, 1, 1, 1, 1, 1,
         1, 1, 1, 1, 1, 1, 1, 1,
         1, 1, 1, 1, 1, 1, 1, 1,
+        1, 1, 1, 1, 1, 35, 1, 36,
+        1, 37, 1, 37, 37, 37, 37, 37,
         1, 1, 1, 1, 1, 1, 1, 1,
         1, 1, 1, 1, 1, 1, 1, 1,
-        1, 37, 1, 35, 35, 35, 35, 35,
+        1, 1, 37, 1, 1, 1, 1, 1,
         1, 1, 1, 1, 1, 1, 1, 1,
         1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 35, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 36, 1,
-        1, 1, 34, 34, 34, 34, 34, 34,
-        34, 34, 34, 34, 1, 1, 1, 1,
+        1, 1, 1, 1, 38, 1, 38, 38,
+        38, 38, 38, 1, 1, 1, 1, 1,
         1, 1, 1, 1, 1, 1, 1, 1,
+        1, 1, 1, 1, 1, 38, 1, 1,
         1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 37,
-        1, 38, 1, 39, 1, 39, 39, 39,
-        39, 39, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 39, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 40, 1,
-        40, 40, 40, 40, 40, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 40,
+        1, 1, 1, 1, 1, 39, 40, 40,
+        40, 40, 40, 40, 40, 40, 40, 1,
+        41, 41, 41, 41, 41, 1, 1, 1,
         1, 1, 1, 1, 1, 1, 1, 1,
         1, 1, 1, 1, 1, 1, 1, 41,
-        42, 42, 42, 42, 42, 42, 42, 42,
-        42, 1, 43, 43, 43, 43, 43, 1,
         1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 43, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 44, 1, 1,
+        1, 1, 1, 42, 1, 1, 1, 1,
         1, 1, 1, 1, 1, 1, 1, 1,
         1, 1, 1, 1, 1, 1, 1, 1,
         1, 1, 1, 1, 1, 1, 1, 1,
@@ -228,14 +232,13 @@ static const char _deserialize_json_indicies[] = {
         1, 1, 1, 1, 1, 1, 1, 1,
         1, 1, 1, 1, 1, 1, 1, 1,
         1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 45, 1,
-        43, 43, 43, 43, 43, 1, 1, 1,
+        1, 1, 1, 1, 43, 1, 41, 41,
+        41, 41, 41, 1, 1, 1, 1, 1,
         1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 43,
+        1, 1, 1, 1, 1, 41, 1, 1,
         1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 44, 1, 1, 1, 46,
-        46, 46, 46, 46, 46, 46, 46, 46,
-        46, 1, 1, 1, 1, 1, 1, 1,
+        1, 42, 1, 1, 1, 44, 44, 44,
+        44, 44, 44, 44, 44, 44, 44, 1,
         1, 1, 1, 1, 1, 1, 1, 1,
         1, 1, 1, 1, 1, 1, 1, 1,
         1, 1, 1, 1, 1, 1, 1, 1,
@@ -243,86 +246,116 @@ static const char _deserialize_json_indicies[] = {
         1, 1, 1, 1, 1, 1, 1, 1,
         1, 1, 1, 1, 1, 1, 1, 1,
         1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 45, 1, 47, 48,
-        1, 49, 1, 49, 49, 49, 49, 49,
+        1, 1, 1, 1, 1, 1, 1, 1,
+        1, 1, 43, 1, 45, 46, 1, 47,
+        1, 47, 47, 47, 47, 47, 1, 1,
         1, 1, 1, 1, 1, 1, 1, 1,
         1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 49, 1, 1, 1, 1, 1,
+        47, 1, 1, 1, 1, 1, 1, 1,
         1, 1, 1, 1, 1, 1, 1, 1,
         1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 50, 1, 50, 50,
-        50, 50, 50, 1, 1, 1, 1, 1,
+        1, 1, 48, 1, 48, 48, 48, 48,
+        48, 1, 1, 1, 1, 1, 1, 1,
         1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 50, 1, 1,
+        1, 1, 1, 48, 1, 1, 1, 1,
         1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 51, 1, 1, 52, 53, 53,
-        53, 53, 53, 53, 53, 53, 53, 1,
-        54, 55, 55, 55, 55, 55, 55, 55,
-        55, 55, 1, 56, 56, 56, 56, 56,
+        49, 1, 1, 50, 51, 51, 51, 51,
+        51, 51, 51, 51, 51, 1, 52, 53,
+        53, 53, 53, 53, 53, 53, 53, 53,
+        1, 54, 54, 54, 54, 54, 1, 1,
         1, 1, 1, 1, 1, 1, 1, 1,
         1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 56, 1, 1, 1, 1, 1,
+        54, 1, 1, 1, 1, 1, 1, 1,
+        1, 1, 1, 1, 55, 1, 1, 1,
+        1, 1, 1, 1, 1, 1, 1, 1,
+        1, 1, 1, 1, 1, 1, 1, 1,
+        1, 1, 1, 1, 1, 1, 1, 1,
+        1, 1, 1, 1, 1, 1, 1, 1,
+        1, 1, 1, 1, 1, 1, 1, 1,
+        1, 1, 1, 1, 1, 1, 1, 1,
+        1, 1, 1, 1, 1, 1, 1, 1,
+        1, 1, 1, 1, 1, 1, 1, 1,
+        1, 1, 1, 1, 1, 1, 1, 1,
+        1, 1, 1, 1, 1, 56, 1, 54,
+        54, 54, 54, 54, 1, 1, 1, 1,
+        1, 1, 1, 1, 1, 1, 1, 1,
+        1, 1, 1, 1, 1, 1, 54, 1,
+        1, 1, 1, 1, 1, 1, 1, 1,
+        1, 1, 55, 1, 1, 1, 53, 53,
+        53, 53, 53, 53, 53, 53, 53, 53,
+        1, 1, 1, 1, 1, 1, 1, 1,
+        1, 1, 1, 1, 1, 1, 1, 1,
+        1, 1, 1, 1, 1, 1, 1, 1,
+        1, 1, 1, 1, 1, 1, 1, 1,
+        1, 1, 1, 1, 1, 1, 1, 1,
+        1, 1, 1, 1, 1, 1, 1, 1,
+        1, 1, 1, 1, 1, 1, 1, 1,
+        1, 1, 1, 1, 1, 1, 1, 1,
+        1, 1, 1, 56, 1, 57, 1, 57,
+        57, 57, 57, 57, 1, 1, 1, 1,
+        1, 1, 1, 1, 1, 1, 1, 1,
         1, 1, 1, 1, 1, 1, 57, 1,
         1, 1, 1, 1, 1, 1, 1, 1,
         1, 1, 1, 1, 1, 1, 1, 1,
         1, 1, 1, 1, 1, 1, 1, 1,
+        58, 1, 58, 58, 58, 58, 58, 1,
         1, 1, 1, 1, 1, 1, 1, 1,
         1, 1, 1, 1, 1, 1, 1, 1,
+        1, 58, 1, 1, 1, 1, 1, 1,
+        1, 1, 1, 1, 1, 1, 59, 1,
+        1, 60, 61, 61, 61, 61, 61, 61,
+        61, 61, 61, 1, 62, 63, 63, 63,
+        63, 63, 63, 63, 63, 63, 1, 64,
+        64, 64, 64, 64, 1, 1, 1, 1,
         1, 1, 1, 1, 1, 1, 1, 1,
+        1, 1, 1, 1, 1, 1, 64, 1,
         1, 1, 1, 1, 1, 1, 1, 1,
+        1, 1, 65, 1, 1, 1, 1, 1,
         1, 1, 1, 1, 1, 1, 1, 1,
         1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 58,
-        1, 56, 56, 56, 56, 56, 1, 1,
         1, 1, 1, 1, 1, 1, 1, 1,
         1, 1, 1, 1, 1, 1, 1, 1,
-        56, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 57, 1, 1, 1,
-        55, 55, 55, 55, 55, 55, 55, 55,
-        55, 55, 1, 1, 1, 1, 1, 1,
         1, 1, 1, 1, 1, 1, 1, 1,
         1, 1, 1, 1, 1, 1, 1, 1,
         1, 1, 1, 1, 1, 1, 1, 1,
         1, 1, 1, 1, 1, 1, 1, 1,
         1, 1, 1, 1, 1, 1, 1, 1,
+        1, 1, 1, 66, 1, 64, 64, 64,
+        64, 64, 1, 1, 1, 1, 1, 1,
         1, 1, 1, 1, 1, 1, 1, 1,
+        1, 1, 1, 1, 64, 1, 1, 1,
         1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 58, 1, 59,
-        1, 59, 59, 59, 59, 59, 1, 1,
+        65, 1, 1, 1, 63, 63, 63, 63,
+        63, 63, 63, 63, 63, 63, 1, 1,
         1, 1, 1, 1, 1, 1, 1, 1,
         1, 1, 1, 1, 1, 1, 1, 1,
-        59, 1, 1, 1, 1, 1, 1, 1,
         1, 1, 1, 1, 1, 1, 1, 1,
         1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 60, 1, 60, 60, 60, 60,
-        60, 1, 1, 1, 1, 1, 1, 1,
         1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 60, 1, 1, 1, 1,
         1, 1, 1, 1, 1, 1, 1, 1,
-        61, 1, 1, 62, 63, 63, 63, 63,
-        63, 63, 63, 63, 63, 1, 64, 65,
-        65, 65, 65, 65, 65, 65, 65, 65,
-        1, 66, 66, 66, 66, 66, 1, 1,
         1, 1, 1, 1, 1, 1, 1, 1,
         1, 1, 1, 1, 1, 1, 1, 1,
-        66, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 67, 1, 1, 1,
+        1, 66, 1, 67, 1, 68, 1, 68,
+        68, 68, 68, 68, 1, 1, 1, 1,
         1, 1, 1, 1, 1, 1, 1, 1,
+        1, 1, 1, 1, 1, 1, 68, 1,
         1, 1, 1, 1, 1, 1, 1, 1,
         1, 1, 1, 1, 1, 1, 1, 1,
         1, 1, 1, 1, 1, 1, 1, 1,
+        69, 1, 69, 69, 69, 69, 69, 1,
         1, 1, 1, 1, 1, 1, 1, 1,
         1, 1, 1, 1, 1, 1, 1, 1,
+        1, 69, 1, 1, 1, 1, 1, 1,
         1, 1, 1, 1, 1, 1, 1, 1,
+        1, 70, 71, 71, 71, 71, 71, 71,
+        71, 71, 71, 1, 72, 72, 72, 72,
+        72, 1, 1, 1, 1, 1, 1, 1,
         1, 1, 1, 1, 1, 1, 1, 1,
+        1, 1, 1, 72, 1, 1, 1, 1,
+        1, 1, 1, 1, 1, 1, 1, 73,
         1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 68, 1, 66,
-        66, 66, 66, 66, 1, 1, 1, 1,
         1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 66, 1,
         1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 67, 1, 1, 1, 65, 65,
-        65, 65, 65, 65, 65, 65, 65, 65,
         1, 1, 1, 1, 1, 1, 1, 1,
         1, 1, 1, 1, 1, 1, 1, 1,
         1, 1, 1, 1, 1, 1, 1, 1,
@@ -330,42 +363,48 @@ static const char _deserialize_json_indicies[] = {
         1, 1, 1, 1, 1, 1, 1, 1,
         1, 1, 1, 1, 1, 1, 1, 1,
         1, 1, 1, 1, 1, 1, 1, 1,
+        74, 1, 72, 72, 72, 72, 72, 1,
         1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 68, 1, 69, 1, 70,
-        1, 70, 70, 70, 70, 70, 1, 1,
         1, 1, 1, 1, 1, 1, 1, 1,
+        1, 72, 1, 1, 1, 1, 1, 1,
+        1, 1, 1, 1, 1, 73, 1, 1,
+        1, 75, 75, 75, 75, 75, 75, 75,
+        75, 75, 75, 1, 1, 1, 1, 1,
         1, 1, 1, 1, 1, 1, 1, 1,
-        70, 1, 1, 1, 1, 1, 1, 1,
         1, 1, 1, 1, 1, 1, 1, 1,
         1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 71, 1, 71, 71, 71, 71,
-        71, 1, 1, 1, 1, 1, 1, 1,
         1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 71, 1, 1, 1, 1,
         1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 72, 73, 73, 73, 73,
-        73, 73, 73, 73, 73, 1, 74, 74,
-        74, 74, 74, 1, 1, 1, 1, 1,
         1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 74, 1, 1,
         1, 1, 1, 1, 1, 1, 1, 1,
-        1, 75, 1, 1, 1, 1, 1, 1,
+        1, 1, 1, 1, 1, 1, 74, 1,
+        76, 1, 76, 76, 76, 76, 76, 1,
         1, 1, 1, 1, 1, 1, 1, 1,
         1, 1, 1, 1, 1, 1, 1, 1,
+        1, 76, 1, 1, 1, 1, 1, 1,
         1, 1, 1, 1, 1, 1, 1, 1,
         1, 1, 1, 1, 1, 1, 1, 1,
+        1, 1, 1, 77, 1, 77, 77, 77,
+        77, 77, 1, 1, 1, 1, 1, 1,
         1, 1, 1, 1, 1, 1, 1, 1,
+        1, 1, 1, 1, 77, 1, 78, 1,
         1, 1, 1, 1, 1, 1, 1, 1,
+        1, 1, 1, 1, 79, 80, 80, 80,
+        80, 80, 80, 80, 80, 80, 1, 82,
+        81, 81, 81, 81, 81, 81, 81, 81,
+        81, 81, 81, 81, 81, 81, 81, 81,
+        81, 81, 81, 81, 81, 81, 81, 81,
+        81, 81, 81, 81, 81, 81, 81, 81,
+        81, 81, 81, 81, 81, 81, 81, 81,
+        81, 81, 81, 81, 81, 81, 81, 81,
+        81, 81, 81, 81, 81, 81, 81, 81,
+        81, 83, 81, 84, 84, 84, 84, 84,
         1, 1, 1, 1, 1, 1, 1, 1,
         1, 1, 1, 1, 1, 1, 1, 1,
+        1, 1, 84, 1, 1, 1, 1, 1,
+        1, 1, 1, 1, 1, 1, 85, 1,
         1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 76, 1, 74, 74, 74, 74,
-        74, 1, 1, 1, 1, 1, 1, 1,
         1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 74, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 75,
-        1, 1, 1, 77, 77, 77, 77, 77,
-        77, 77, 77, 77, 77, 1, 1, 1,
         1, 1, 1, 1, 1, 1, 1, 1,
         1, 1, 1, 1, 1, 1, 1, 1,
         1, 1, 1, 1, 1, 1, 1, 1,
@@ -373,34 +412,20 @@ static const char _deserialize_json_indicies[] = {
         1, 1, 1, 1, 1, 1, 1, 1,
         1, 1, 1, 1, 1, 1, 1, 1,
         1, 1, 1, 1, 1, 1, 1, 1,
+        1, 1, 1, 1, 1, 1, 1, 86,
+        1, 81, 1, 1, 1, 1, 1, 1,
         1, 1, 1, 1, 1, 1, 1, 1,
-        76, 1, 78, 1, 78, 78, 78, 78,
-        78, 1, 1, 1, 1, 1, 1, 1,
         1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 78, 1, 1, 1, 1,
         1, 1, 1, 1, 1, 1, 1, 1,
         1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 79, 1, 79,
-        79, 79, 79, 79, 1, 1, 1, 1,
         1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 79, 1,
-        80, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 81, 82,
-        82, 82, 82, 82, 82, 82, 82, 82,
-        1, 84, 83, 83, 83, 83, 83, 83,
-        83, 83, 83, 83, 83, 83, 83, 83,
-        83, 83, 83, 83, 83, 83, 83, 83,
-        83, 83, 83, 83, 83, 83, 83, 83,
-        83, 83, 83, 83, 83, 83, 83, 83,
-        83, 83, 83, 83, 83, 83, 83, 83,
-        83, 83, 83, 83, 83, 83, 83, 83,
-        83, 83, 83, 85, 83, 86, 86, 86,
-        86, 86, 1, 1, 1, 1, 1, 1,
         1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 86, 1, 1, 1,
+        1, 1, 1, 81, 1, 87, 87, 87,
+        87, 87, 1, 1, 1, 1, 1, 1,
         1, 1, 1, 1, 1, 1, 1, 1,
-        87, 1, 1, 1, 1, 1, 1, 1,
+        1, 1, 1, 1, 87, 1, 1, 1,
         1, 1, 1, 1, 1, 1, 1, 1,
+        88, 1, 1, 1, 1, 1, 1, 1,
         1, 1, 1, 1, 1, 1, 1, 1,
         1, 1, 1, 1, 1, 1, 1, 1,
         1, 1, 1, 1, 1, 1, 1, 1,
@@ -409,63 +434,65 @@ static const char _deserialize_json_indicies[] = {
         1, 1, 1, 1, 1, 1, 1, 1,
         1, 1, 1, 1, 1, 1, 1, 1,
         1, 1, 1, 1, 1, 1, 1, 1,
-        1, 88, 1, 83, 1, 1, 1, 1,
         1, 1, 1, 1, 1, 1, 1, 1,
+        1, 89, 1, 87, 87, 87, 87, 87,
         1, 1, 1, 1, 1, 1, 1, 1,
         1, 1, 1, 1, 1, 1, 1, 1,
+        1, 1, 87, 1, 1, 1, 1, 1,
+        1, 1, 1, 1, 1, 1, 88, 1,
+        1, 1, 90, 90, 90, 90, 90, 90,
+        90, 90, 90, 90, 1, 1, 1, 1,
         1, 1, 1, 1, 1, 1, 1, 1,
         1, 1, 1, 1, 1, 1, 1, 1,
         1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 83, 1, 89,
-        89, 89, 89, 89, 1, 1, 1, 1,
         1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 89, 1,
         1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 90, 1, 1, 1, 1, 1,
         1, 1, 1, 1, 1, 1, 1, 1,
         1, 1, 1, 1, 1, 1, 1, 1,
+        1, 1, 1, 1, 1, 1, 1, 89,
+        1, 91, 1, 91, 91, 91, 91, 91,
         1, 1, 1, 1, 1, 1, 1, 1,
         1, 1, 1, 1, 1, 1, 1, 1,
+        1, 1, 91, 1, 1, 1, 1, 1,
         1, 1, 1, 1, 1, 1, 1, 1,
         1, 1, 1, 1, 1, 1, 1, 1,
+        1, 1, 1, 1, 92, 1, 92, 92,
+        92, 92, 92, 1, 1, 1, 1, 1,
         1, 1, 1, 1, 1, 1, 1, 1,
+        1, 1, 1, 1, 1, 92, 1, 1,
         1, 1, 1, 1, 1, 1, 1, 1,
+        1, 1, 1, 1, 1, 93, 94, 94,
+        94, 94, 94, 94, 94, 94, 94, 1,
+        87, 87, 87, 87, 87, 1, 1, 1,
         1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 91, 1, 89, 89, 89,
-        89, 89, 1, 1, 1, 1, 1, 1,
+        1, 1, 1, 1, 1, 1, 1, 87,
         1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 89, 1, 1, 1,
+        1, 1, 1, 88, 1, 1, 1, 95,
+        95, 95, 95, 95, 95, 95, 95, 95,
+        95, 1, 1, 1, 1, 1, 1, 1,
         1, 1, 1, 1, 1, 1, 1, 1,
-        90, 1, 1, 1, 92, 92, 92, 92,
-        92, 92, 92, 92, 92, 92, 1, 1,
         1, 1, 1, 1, 1, 1, 1, 1,
         1, 1, 1, 1, 1, 1, 1, 1,
         1, 1, 1, 1, 1, 1, 1, 1,
         1, 1, 1, 1, 1, 1, 1, 1,
         1, 1, 1, 1, 1, 1, 1, 1,
         1, 1, 1, 1, 1, 1, 1, 1,
+        1, 1, 1, 1, 89, 1, 96, 96,
+        96, 96, 96, 1, 1, 1, 1, 1,
         1, 1, 1, 1, 1, 1, 1, 1,
+        1, 1, 1, 1, 1, 96, 1, 1,
         1, 1, 1, 1, 1, 1, 1, 1,
-        1, 91, 1, 93, 1, 93, 93, 93,
-        93, 93, 1, 1, 1, 1, 1, 1,
+        1, 97, 1, 1, 1, 1, 1, 1,
         1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 93, 1, 1, 1,
         1, 1, 1, 1, 1, 1, 1, 1,
         1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 94, 1,
-        94, 94, 94, 94, 94, 1, 1, 1,
         1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 94,
         1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 95,
-        96, 96, 96, 96, 96, 96, 96, 96,
-        96, 1, 89, 89, 89, 89, 89, 1,
+        1, 1, 98, 1, 2, 2, 2, 2,
+        2, 1, 1, 1, 1, 1, 1, 1,
         1, 1, 1, 1, 1, 1, 1, 1,
+        1, 1, 1, 2, 1, 1, 1, 1,
         1, 1, 1, 1, 1, 1, 1, 1,
-        1, 89, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 90, 1, 1,
-        1, 97, 97, 97, 97, 97, 97, 97,
-        97, 97, 97, 1, 1, 1, 1, 1,
         1, 1, 1, 1, 1, 1, 1, 1,
         1, 1, 1, 1, 1, 1, 1, 1,
         1, 1, 1, 1, 1, 1, 1, 1,
@@ -473,54 +500,42 @@ static const char _deserialize_json_indicies[] = {
         1, 1, 1, 1, 1, 1, 1, 1,
         1, 1, 1, 1, 1, 1, 1, 1,
         1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 91, 1,
-        0, 0, 0, 0, 0, 1, 1, 1,
         1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 0,
         1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 2, 1, 1, 0
+        1, 1, 1, 1, 1, 1, 3, 1,
+        1, 0
 };
 
 static const char _deserialize_json_trans_targs[] = {
-        1, 0, 2, 2, 3, 4, 19, 25,
-        38, 44, 52, 5, 13, 6, 7, 8,
-        9, 12, 9, 12, 10, 2, 11, 10,
-        11, 11, 56, 57, 14, 15, 16, 17,
-        18, 17, 18, 10, 2, 11, 20, 21,
-        22, 23, 24, 10, 2, 11, 24, 26,
-        32, 27, 28, 29, 30, 31, 30, 31,
-        10, 2, 11, 33, 34, 35, 36, 37,
-        36, 37, 10, 2, 11, 39, 40, 41,
-        42, 43, 10, 2, 11, 43, 45, 46,
-        47, 50, 51, 47, 48, 49, 10, 2,
-        11, 10, 2, 11, 51, 53, 54, 50,
-        55, 55
+        1, 0, 2, 3, 3, 4, 5, 19,
+        25, 38, 44, 52, 6, 13, 7, 8,
+        9, 10, 12, 10, 12, 11, 3, 56,
+        11, 56, 14, 15, 16, 17, 18, 17,
+        18, 11, 3, 56, 20, 21, 22, 23,
+        24, 11, 3, 56, 24, 26, 32, 27,
+        28, 29, 30, 31, 30, 31, 11, 3,
+        56, 33, 34, 35, 36, 37, 36, 37,
+        11, 3, 56, 39, 40, 41, 42, 43,
+        11, 3, 56, 43, 45, 46, 47, 50,
+        51, 47, 48, 49, 11, 3, 56, 11,
+        3, 56, 51, 53, 54, 50, 55, 55,
+        56, 57, 58
 };
 
 static const char _deserialize_json_trans_actions[] = {
-        0, 0, 1, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 2,
-        2, 2, 0, 0, 3, 3, 4, 0,
-        5, 0, 0, 0, 0, 0, 2, 2,
-        2, 0, 0, 6, 6, 7, 0, 0,
-        0, 2, 2, 8, 8, 9, 0, 0,
-        0, 0, 0, 2, 2, 2, 0, 0,
-        10, 10, 11, 0, 0, 2, 2, 2,
-        0, 0, 12, 12, 13, 0, 0, 0,
-        2, 2, 14, 14, 15, 0, 0, 0,
-        2, 16, 16, 0, 17, 0, 18, 18,
-        19, 20, 20, 21, 17, 0, 0, 22,
-        22, 23
+        0, 0, 0, 1, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0,
+        2, 2, 2, 0, 0, 3, 3, 4,
+        0, 5, 0, 0, 2, 2, 2, 0,
+        0, 6, 6, 7, 0, 0, 0, 2,
+        2, 8, 8, 9, 0, 0, 0, 0,
+        0, 2, 2, 2, 0, 0, 10, 10,
+        11, 0, 0, 2, 2, 2, 0, 0,
+        12, 12, 13, 0, 0, 0, 2, 2,
+        14, 14, 15, 0, 0, 0, 2, 16,
+        16, 0, 17, 0, 18, 18, 19, 20,
+        20, 21, 17, 0, 0, 22, 22, 23,
+        0, 0, 0
 };
 
 static const int deserialize_json_start = 1;
@@ -545,22 +560,17 @@ _hb_buffer_deserialize_json (hb_buffer_t *buffer,
   /* Ensure we have positions. */
   (void) hb_buffer_get_glyph_positions (buffer, nullptr);
 
-  while (p < pe && ISSPACE (*p))
-    p++;
-  if (p < pe && *p == (buffer->len ? ',' : '['))
-    *end_ptr = ++p;
-
   const char *tok = nullptr;
   int cs;
   hb_glyph_info_t info = {0};
   hb_glyph_position_t pos = {0};
 
-#line 559 "hb-buffer-deserialize-json.hh"
+#line 569 "hb-buffer-deserialize-json.hh"
         {
         cs = deserialize_json_start;
         }
 
-#line 564 "hb-buffer-deserialize-json.hh"
+#line 574 "hb-buffer-deserialize-json.hh"
         {
         int _slen;
         int _trans;
@@ -772,7 +782,7 @@ _resume:
         *end_ptr = p;
 }
         break;
-#line 776 "hb-buffer-deserialize-json.hh"
+#line 786 "hb-buffer-deserialize-json.hh"
         }
 
 _again:
@@ -784,7 +794,7 @@ _again:
         _out: {}
         }
 
-#line 137 "hb-buffer-deserialize-json.rl"
+#line 132 "hb-buffer-deserialize-json.rl"
 
 
   *end_ptr = p;
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-buffer-verify.cc b/src/java.desktop/share/native/libharfbuzz/hb-buffer-verify.cc
index 3bdea30ed36..3a4c9c9f317 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-buffer-verify.cc
+++ b/src/java.desktop/share/native/libharfbuzz/hb-buffer-verify.cc
@@ -149,7 +149,7 @@ buffer_verify_unsafe_to_break (hb_buffer_t  *buffer,
     }
     assert (text_start < text_end);
 
-    if (0)
+    if (false)
       printf("start %u end %u text start %u end %u\n", start, end, text_start, text_end);
 
     hb_buffer_clear_contents (fragment);
@@ -288,7 +288,7 @@ buffer_verify_unsafe_to_concat (hb_buffer_t        *buffer,
       }
       assert (text_start < text_end);
 
-      if (0)
+      if (false)
         printf("start %u end %u text start %u end %u\n", start, end, text_start, text_end);
 
 #if 0
@@ -412,7 +412,7 @@ hb_buffer_t::verify (hb_buffer_t        *text_buffer,
                                    &len,
                                    HB_BUFFER_SERIALIZE_FORMAT_TEXT,
                                    HB_BUFFER_SERIALIZE_FLAG_NO_CLUSTERS);
-      buffer_verify_error (this, font, BUFFER_VERIFY_ERROR "text was: %s.", bytes.arrayZ);
+      buffer_verify_error (this, font, BUFFER_VERIFY_ERROR "text was: %s.", bytes.arrayZ ? bytes.arrayZ : "");
     }
 #endif
   }
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-buffer.cc b/src/java.desktop/share/native/libharfbuzz/hb-buffer.cc
index 5f9329e07ed..72970c9c2f7 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-buffer.cc
+++ b/src/java.desktop/share/native/libharfbuzz/hb-buffer.cc
@@ -271,6 +271,7 @@ hb_buffer_t::similar (const hb_buffer_t &src)
   replacement = src.replacement;
   invisible = src.invisible;
   not_found = src.not_found;
+  not_found_variation_selector = src.not_found_variation_selector;
 }
 
 void
@@ -283,6 +284,7 @@ hb_buffer_t::reset ()
   replacement = HB_BUFFER_REPLACEMENT_CODEPOINT_DEFAULT;
   invisible = 0;
   not_found = 0;
+  not_found_variation_selector = HB_CODEPOINT_INVALID;
 
   clear ();
 }
@@ -309,6 +311,7 @@ hb_buffer_t::clear ()
 
   deallocate_var_all ();
   serial = 0;
+  random_state = 1;
   scratch_flags = HB_BUFFER_SCRATCH_FLAG_DEFAULT;
 }
 
@@ -704,6 +707,7 @@ DEFINE_NULL_INSTANCE (hb_buffer_t) =
   HB_BUFFER_REPLACEMENT_CODEPOINT_DEFAULT,
   0, /* invisible */
   0, /* not_found */
+  HB_CODEPOINT_INVALID, /* not_found_variation_selector */
 
 
   HB_BUFFER_CONTENT_TYPE_INVALID,
@@ -1359,6 +1363,89 @@ hb_buffer_get_not_found_glyph (const hb_buffer_t *buffer)
   return buffer->not_found;
 }
 
+/**
+ * hb_buffer_set_not_found_variation_selector_glyph:
+ * @buffer: An #hb_buffer_t
+ * @not_found_variation_selector: the not-found-variation-selector #hb_codepoint_t
+ *
+ * Sets the #hb_codepoint_t that replaces variation-selector characters not resolved
+ * in the font during shaping.
+ *
+ * The not-found-variation-selector glyph defaults to #HB_CODEPOINT_INVALID,
+ * in which case an unresolved variation-selector will be removed from the glyph
+ * string during shaping. This API allows for changing that and retaining a glyph,
+ * such that the situation can be detected by the client and handled accordingly
+ * (e.g. by using a different font).
+ *
+ * Since: 10.0.0
+ **/
+void
+hb_buffer_set_not_found_variation_selector_glyph (hb_buffer_t    *buffer,
+                                                  hb_codepoint_t  not_found_variation_selector)
+{
+  buffer->not_found_variation_selector = not_found_variation_selector;
+}
+
+/**
+ * hb_buffer_get_not_found_variation_selector_glyph:
+ * @buffer: An #hb_buffer_t
+ *
+ * See hb_buffer_set_not_found_variation_selector_glyph().
+ *
+ * Return value:
+ * The @buffer not-found-variation-selector #hb_codepoint_t
+ *
+ * Since: 10.0.0
+ **/
+hb_codepoint_t
+hb_buffer_get_not_found_variation_selector_glyph (const hb_buffer_t *buffer)
+{
+  return buffer->not_found_variation_selector;
+}
+
+/**
+ * hb_buffer_set_random_state:
+ * @buffer: An #hb_buffer_t
+ * @state: the new random state
+ *
+ * Sets the random state of the buffer. The state changes
+ * every time a glyph uses randomness (eg. the `rand`
+ * OpenType feature). This function together with
+ * hb_buffer_get_random_state() allow for transferring
+ * the current random state to a subsequent buffer, to
+ * get better randomness distribution.
+ *
+ * Defaults to 1 and when buffer contents are cleared.
+ * A value of 0 disables randomness during shaping.
+ *
+ * Since: 8.4.0
+ **/
+void
+hb_buffer_set_random_state (hb_buffer_t    *buffer,
+                            unsigned        state)
+{
+  if (unlikely (hb_object_is_immutable (buffer)))
+    return;
+
+  buffer->random_state = state;
+}
+
+/**
+ * hb_buffer_get_random_state:
+ * @buffer: An #hb_buffer_t
+ *
+ * See hb_buffer_set_random_state().
+ *
+ * Return value:
+ * The @buffer random state
+ *
+ * Since: 8.4.0
+ **/
+unsigned
+hb_buffer_get_random_state (const hb_buffer_t *buffer)
+{
+  return buffer->random_state;
+}
 
 /**
  * hb_buffer_clear_contents:
@@ -1896,7 +1983,7 @@ hb_buffer_add_codepoints (hb_buffer_t          *buffer,
  * @buffer: An #hb_buffer_t
  * @source: source #hb_buffer_t
  * @start: start index into source buffer to copy.  Use 0 to copy from start of buffer.
- * @end: end index into source buffer to copy.  Use @HB_FEATURE_GLOBAL_END to copy to end of buffer.
+ * @end: end index into source buffer to copy.  Use @UINT_MAX (or ((unsigned int) -1)) to copy to end of buffer.
  *
  * Append (part of) contents of another buffer to this buffer.
  *
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-buffer.h b/src/java.desktop/share/native/libharfbuzz/hb-buffer.h
index 6fc215d1627..d2258634ff4 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-buffer.h
+++ b/src/java.desktop/share/native/libharfbuzz/hb-buffer.h
@@ -487,6 +487,19 @@ hb_buffer_set_not_found_glyph (hb_buffer_t    *buffer,
 HB_EXTERN hb_codepoint_t
 hb_buffer_get_not_found_glyph (const hb_buffer_t *buffer);
 
+HB_EXTERN void
+hb_buffer_set_not_found_variation_selector_glyph (hb_buffer_t    *buffer,
+                                                  hb_codepoint_t  not_found_variation_selector);
+
+HB_EXTERN hb_codepoint_t
+hb_buffer_get_not_found_variation_selector_glyph (const hb_buffer_t *buffer);
+
+HB_EXTERN void
+hb_buffer_set_random_state (hb_buffer_t    *buffer,
+                            unsigned        state);
+
+HB_EXTERN unsigned
+hb_buffer_get_random_state (const hb_buffer_t *buffer);
 
 /*
  * Content API.
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-buffer.hh b/src/java.desktop/share/native/libharfbuzz/hb-buffer.hh
index 7f8ce14e90d..c92e7df320e 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-buffer.hh
+++ b/src/java.desktop/share/native/libharfbuzz/hb-buffer.hh
@@ -32,7 +32,6 @@
 
 #include "hb.hh"
 #include "hb-unicode.hh"
-#include "hb-set-digest.hh"
 
 
 static_assert ((sizeof (hb_glyph_info_t) == 20), "");
@@ -52,6 +51,7 @@ enum hb_buffer_scratch_flags_t {
   HB_BUFFER_SCRATCH_FLAG_HAS_CGJ                        = 0x00000010u,
   HB_BUFFER_SCRATCH_FLAG_HAS_GLYPH_FLAGS                = 0x00000020u,
   HB_BUFFER_SCRATCH_FLAG_HAS_BROKEN_SYLLABLE            = 0x00000040u,
+  HB_BUFFER_SCRATCH_FLAG_HAS_VARIATION_SELECTOR_FALLBACK= 0x00000080u,
 
   /* Reserved for shapers' internal use. */
   HB_BUFFER_SCRATCH_FLAG_SHAPER0                        = 0x01000000u,
@@ -80,6 +80,7 @@ struct hb_buffer_t
   hb_codepoint_t replacement; /* U+FFFD or something else. */
   hb_codepoint_t invisible; /* 0 or something else. */
   hb_codepoint_t not_found; /* 0 or something else. */
+  hb_codepoint_t not_found_variation_selector; /* HB_CODEPOINT_INVALID or something else. */
 
   /*
    * Buffer contents
@@ -116,6 +117,7 @@ struct hb_buffer_t
 
   uint8_t allocated_var_bits;
   uint8_t serial;
+  uint32_t random_state;
   hb_buffer_scratch_flags_t scratch_flags; /* Have space-fallback, etc. */
   unsigned int max_len; /* Maximum allowed len. */
   int max_ops; /* Maximum allowed operations. */
@@ -179,22 +181,24 @@ struct hb_buffer_t
     allocated_var_bits = 0;
   }
 
+  HB_ALWAYS_INLINE
   hb_glyph_info_t &cur (unsigned int i = 0) { return info[idx + i]; }
+  HB_ALWAYS_INLINE
   hb_glyph_info_t cur (unsigned int i = 0) const { return info[idx + i]; }
 
+  HB_ALWAYS_INLINE
   hb_glyph_position_t &cur_pos (unsigned int i = 0) { return pos[idx + i]; }
+  HB_ALWAYS_INLINE
   hb_glyph_position_t cur_pos (unsigned int i = 0) const { return pos[idx + i]; }
 
+  HB_ALWAYS_INLINE
   hb_glyph_info_t &prev ()      { return out_info[out_len ? out_len - 1 : 0]; }
+  HB_ALWAYS_INLINE
   hb_glyph_info_t prev () const { return out_info[out_len ? out_len - 1 : 0]; }
 
-  hb_set_digest_t digest () const
-  {
-    hb_set_digest_t d;
-    d.init ();
-    d.add_array (&info[0].codepoint, len, sizeof (info[0]));
-    return d;
-  }
+  template <typename set_t>
+  void collect_codepoints (set_t &d) const
+  { d.clear (); d.add_array (&info[0].codepoint, len, sizeof (info[0])); }
 
   HB_INTERNAL void similar (const hb_buffer_t &src);
   HB_INTERNAL void reset ();
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-cff-interp-common.hh b/src/java.desktop/share/native/libharfbuzz/hb-cff-interp-common.hh
index 8d9ff5faf6d..79d7c4c7133 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-cff-interp-common.hh
+++ b/src/java.desktop/share/native/libharfbuzz/hb-cff-interp-common.hh
@@ -522,7 +522,7 @@ struct parsed_values_t
 
   void alloc (unsigned n)
   {
-    values.alloc (n, true);
+    values.alloc_exact (n);
   }
 
   void add_op (op_code_t op, const byte_str_ref_t& str_ref = byte_str_ref_t (), const VAL &v = VAL ())
@@ -624,7 +624,6 @@ struct opset_t
         } else {
           /* invalid unknown operator */
           env.clear_args ();
-          env.set_error ();
         }
         break;
     }
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-cff-interp-dict-common.hh b/src/java.desktop/share/native/libharfbuzz/hb-cff-interp-dict-common.hh
index 0c0cec9986a..6a227e5e81e 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-cff-interp-dict-common.hh
+++ b/src/java.desktop/share/native/libharfbuzz/hb-cff-interp-dict-common.hh
@@ -54,8 +54,8 @@ struct top_dict_values_t : dict_values_t<OPSTR>
   }
   void fini () { dict_values_t<OPSTR>::fini (); }
 
-  unsigned int  charStringsOffset;
-  unsigned int  FDArrayOffset;
+  int  charStringsOffset;
+  int  FDArrayOffset;
 };
 
 struct dict_opset_t : opset_t<number_t>
@@ -84,7 +84,7 @@ struct dict_opset_t : opset_t<number_t>
 
     enum Nibble { DECIMAL=10, EXP_POS, EXP_NEG, RESERVED, NEG, END };
 
-    char buf[32];
+    char buf[32] = {0};
     unsigned char byte = 0;
     for (unsigned i = 0, count = 0; count < ARRAY_LENGTH (buf); ++i, ++count)
     {
@@ -157,11 +157,11 @@ struct top_dict_opset_t : dict_opset_t
   {
     switch (op) {
       case OpCode_CharStrings:
-        dictval.charStringsOffset = env.argStack.pop_uint ();
+        dictval.charStringsOffset = env.argStack.pop_int ();
         env.clear_args ();
         break;
       case OpCode_FDArray:
-        dictval.FDArrayOffset = env.argStack.pop_uint ();
+        dictval.FDArrayOffset = env.argStack.pop_int ();
         env.clear_args ();
         break;
       case OpCode_FontMatrix:
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-cff2-interp-cs.hh b/src/java.desktop/share/native/libharfbuzz/hb-cff2-interp-cs.hh
index c970633e064..ab17d68318b 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-cff2-interp-cs.hh
+++ b/src/java.desktop/share/native/libharfbuzz/hb-cff2-interp-cs.hh
@@ -76,16 +76,12 @@ struct cff2_cs_interp_env_t : cs_interp_env_t<ELEM, CFF2Subrs>
     coords = coords_;
     num_coords = num_coords_;
     varStore = acc.varStore;
-    seen_blend = false;
-    seen_vsindex_ = false;
-    scalars.init ();
     do_blend = num_coords && coords && varStore->size;
     set_ivs (acc.privateDicts[fd].ivs);
   }
 
   void fini ()
   {
-    scalars.fini ();
     SUPER::fini ();
   }
 
@@ -168,13 +164,13 @@ struct cff2_cs_interp_env_t : cs_interp_env_t<ELEM, CFF2Subrs>
   protected:
   const int     *coords;
   unsigned int  num_coords;
-  const  CFF2VariationStore *varStore;
+  const  CFF2ItemVariationStore *varStore;
   unsigned int  region_count;
   unsigned int  ivs;
   hb_vector_t<float>  scalars;
   bool    do_blend;
-  bool    seen_vsindex_;
-  bool    seen_blend;
+  bool    seen_vsindex_ = false;
+  bool    seen_blend = false;
 
   typedef cs_interp_env_t<ELEM, CFF2Subrs> SUPER;
 };
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-common.cc b/src/java.desktop/share/native/libharfbuzz/hb-common.cc
index 3afab4284e6..bce0d09d20a 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-common.cc
+++ b/src/java.desktop/share/native/libharfbuzz/hb-common.cc
@@ -625,6 +625,9 @@ hb_script_get_horizontal_direction (hb_script_t script)
     /* Unicode-14.0 additions */
     case HB_SCRIPT_OLD_UYGHUR:
 
+    /* Unicode-16.0 additions */
+    case HB_SCRIPT_GARAY:
+
       return HB_DIRECTION_RTL;
 
 
@@ -996,7 +999,7 @@ hb_feature_to_string (hb_feature_t *feature,
   if (feature->value > 1)
   {
     s[len++] = '=';
-    len += hb_max (0, snprintf (s + len, ARRAY_LENGTH (s) - len, "%u", feature->value));
+    len += hb_max (0, snprintf (s + len, ARRAY_LENGTH (s) - len, "%" PRIu32, feature->value));
   }
   assert (len < ARRAY_LENGTH (s));
   len = hb_min (len, size - 1);
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-common.h b/src/java.desktop/share/native/libharfbuzz/hb-common.h
index 0d7956764cf..a8bae366f7e 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-common.h
+++ b/src/java.desktop/share/native/libharfbuzz/hb-common.h
@@ -47,14 +47,10 @@
 # endif /* !__cplusplus */
 #endif
 
-#if defined (_SVR4) || defined (SVR4) || defined (__OpenBSD__) || \
-    defined (_sgi) || defined (__sun) || defined (sun) || \
-    defined (__digital__) || defined (__HP_cc)
-#  include <inttypes.h>
-#elif defined (_AIX)
+#if defined (_AIX)
 #  include <sys/inttypes.h>
 #elif defined (_MSC_VER) && _MSC_VER < 1600
-/* VS 2010 (_MSC_VER 1600) has stdint.h */
+/* VS 2010 (_MSC_VER 1600) has stdint.h   */
 typedef __int8 int8_t;
 typedef unsigned __int8 uint8_t;
 typedef __int16 int16_t;
@@ -63,10 +59,11 @@ typedef __int32 int32_t;
 typedef unsigned __int32 uint32_t;
 typedef __int64 int64_t;
 typedef unsigned __int64 uint64_t;
-#elif defined (__KERNEL__)
-#  include <linux/types.h>
-#else
+#elif defined (_MSC_VER) && _MSC_VER < 1800
+/* VS 2013 (_MSC_VER 1800) has inttypes.h */
 #  include <stdint.h>
+#else
+#  include <inttypes.h>
 #endif
 
 #if defined(__GNUC__) && ((__GNUC__ > 3) || (__GNUC__ == 3 && __GNUC_MINOR__ >= 1))
@@ -507,6 +504,13 @@ hb_language_matches (hb_language_t language,
  * @HB_SCRIPT_MATH: `Zmth`, Since: 3.4.0
  * @HB_SCRIPT_KAWI: `Kawi`, Since: 5.2.0
  * @HB_SCRIPT_NAG_MUNDARI: `Nagm`, Since: 5.2.0
+ * @HB_SCRIPT_GARAY: `Gara`, Since: 10.0.0
+ * @HB_SCRIPT_GURUNG_KHEMA: `Gukh`, Since: 10.0.0
+ * @HB_SCRIPT_KIRAT_RAI: `Krai`, Since: 10.0.0
+ * @HB_SCRIPT_OL_ONAL: `Onao`, Since: 10.0.0
+ * @HB_SCRIPT_SUNUWAR: `Sunu`, Since: 10.0.0
+ * @HB_SCRIPT_TODHRI: `Todr`, Since: 10.0.0
+ * @HB_SCRIPT_TULU_TIGALARI: `Tutg`, Since: 10.0.0
  * @HB_SCRIPT_INVALID: No script set
  *
  * Data type for scripts. Each #hb_script_t's value is an #hb_tag_t corresponding
@@ -734,6 +738,17 @@ typedef enum
   HB_SCRIPT_KAWI                        = HB_TAG ('K','a','w','i'), /*15.0*/
   HB_SCRIPT_NAG_MUNDARI                 = HB_TAG ('N','a','g','m'), /*15.0*/
 
+  /*
+   * Since 10.0.0
+   */
+  HB_SCRIPT_GARAY                       = HB_TAG ('G','a','r','a'), /*16.0*/
+  HB_SCRIPT_GURUNG_KHEMA                = HB_TAG ('G','u','k','h'), /*16.0*/
+  HB_SCRIPT_KIRAT_RAI                   = HB_TAG ('K','r','a','i'), /*16.0*/
+  HB_SCRIPT_OL_ONAL                     = HB_TAG ('O','n','a','o'), /*16.0*/
+  HB_SCRIPT_SUNUWAR                     = HB_TAG ('S','u','n','u'), /*16.0*/
+  HB_SCRIPT_TODHRI                      = HB_TAG ('T','o','d','r'), /*16.0*/
+  HB_SCRIPT_TULU_TIGALARI               = HB_TAG ('T','u','t','g'), /*16.0*/
+
   /* No script set. */
   HB_SCRIPT_INVALID                     = HB_TAG_NONE,
 
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-config.hh b/src/java.desktop/share/native/libharfbuzz/hb-config.hh
index 816c55c7d36..40cc2403c18 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-config.hh
+++ b/src/java.desktop/share/native/libharfbuzz/hb-config.hh
@@ -56,7 +56,6 @@
 
 #ifdef HB_LEAN
 #define HB_DISABLE_DEPRECATED
-#define HB_NDEBUG
 #define HB_NO_ATEXIT
 #define HB_NO_BUFFER_MESSAGE
 #define HB_NO_BUFFER_SERIALIZE
@@ -69,8 +68,6 @@
 #define HB_NO_FACE_COLLECT_UNICODES
 #define HB_NO_GETENV
 #define HB_NO_HINTING
-#define HB_NO_LANGUAGE_LONG
-#define HB_NO_LANGUAGE_PRIVATE_SUBTAG
 #define HB_NO_LAYOUT_FEATURE_PARAMS
 #define HB_NO_LAYOUT_COLLECT_GLYPHS
 #define HB_NO_LAYOUT_RARELY_USED
@@ -118,6 +115,10 @@
 #define HB_NO_VAR_COMPOSITES
 #endif
 
+#ifdef HB_NO_VAR
+#define HB_NO_VAR_COMPOSITES
+#endif
+
 #ifdef HB_DISABLE_DEPRECATED
 #define HB_IF_NOT_DEPRECATED(x)
 #else
@@ -156,6 +157,7 @@
 #define HB_NO_FALLBACK_SHAPE
 #define HB_NO_OT_KERN
 #define HB_NO_OT_LAYOUT_BLOCKLIST
+#define HB_NO_AAT_LAYOUT_BLOCKLIST
 #define HB_NO_OT_SHAPE_FALLBACK
 #endif
 
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-cplusplus.hh b/src/java.desktop/share/native/libharfbuzz/hb-cplusplus.hh
index eac4ff03ed5..82d39741527 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-cplusplus.hh
+++ b/src/java.desktop/share/native/libharfbuzz/hb-cplusplus.hh
@@ -27,9 +27,6 @@
 
 #include "hb.h"
 
-HB_BEGIN_DECLS
-HB_END_DECLS
-
 #ifdef __cplusplus
 
 #include <functional>
@@ -56,15 +53,15 @@ struct shared_ptr
 
   explicit shared_ptr (T *p = nullptr) : p (p) {}
   shared_ptr (const shared_ptr &o) : p (v::reference (o.p)) {}
-  shared_ptr (shared_ptr &&o) : p (o.p) { o.p = nullptr; }
+  shared_ptr (shared_ptr &&o)  noexcept : p (o.p) { o.p = nullptr; }
   shared_ptr& operator = (const shared_ptr &o) { if (p != o.p) { destroy (); p = o.p; reference (); } return *this; }
-  shared_ptr& operator = (shared_ptr &&o) { v::destroy (p); p = o.p; o.p = nullptr; return *this; }
+  shared_ptr& operator = (shared_ptr &&o)  noexcept { v::destroy (p); p = o.p; o.p = nullptr; return *this; }
   ~shared_ptr () { v::destroy (p); p = nullptr; }
 
   T* get() const { return p; }
 
-  void swap (shared_ptr &o) { std::swap (p, o.p); }
-  friend void swap (shared_ptr &a, shared_ptr &b) { std::swap (a.p, b.p); }
+  void swap (shared_ptr &o)  noexcept { std::swap (p, o.p); }
+  friend void swap (shared_ptr &a, shared_ptr &b)  noexcept { std::swap (a.p, b.p); }
 
   operator T * () const { return p; }
   T& operator * () const { return *get (); }
@@ -98,16 +95,16 @@ struct unique_ptr
 
   explicit unique_ptr (T *p = nullptr) : p (p) {}
   unique_ptr (const unique_ptr &o) = delete;
-  unique_ptr (unique_ptr &&o) : p (o.p) { o.p = nullptr; }
+  unique_ptr (unique_ptr &&o)  noexcept : p (o.p) { o.p = nullptr; }
   unique_ptr& operator = (const unique_ptr &o) = delete;
-  unique_ptr& operator = (unique_ptr &&o) { v::destroy (p); p = o.p; o.p = nullptr; return *this; }
+  unique_ptr& operator = (unique_ptr &&o)  noexcept { v::destroy (p); p = o.p; o.p = nullptr; return *this; }
   ~unique_ptr () { v::destroy (p); p = nullptr; }
 
   T* get() const { return p; }
   T* release () { T* v = p; p = nullptr; return v; }
 
-  void swap (unique_ptr &o) { std::swap (p, o.p); }
-  friend void swap (unique_ptr &a, unique_ptr &b) { std::swap (a.p, b.p); }
+  void swap (unique_ptr &o)  noexcept { std::swap (p, o.p); }
+  friend void swap (unique_ptr &a, unique_ptr &b)  noexcept { std::swap (a.p, b.p); }
 
   operator T * () const { return p; }
   T& operator * () const { return *get (); }
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-decycler.hh b/src/java.desktop/share/native/libharfbuzz/hb-decycler.hh
new file mode 100644
index 00000000000..95b961027bf
--- /dev/null
+++ b/src/java.desktop/share/native/libharfbuzz/hb-decycler.hh
@@ -0,0 +1,164 @@
+/*
+ * Copyright © 2025 Behdad Esfahbod
+ *
+ *  This is part of HarfBuzz, a text shaping library.
+ *
+ * Permission is hereby granted, without written agreement and without
+ * license or royalty fees, to use, copy, modify, and distribute this
+ * software and its documentation for any purpose, provided that the
+ * above copyright notice and the following two paragraphs appear in
+ * all copies of this software.
+ *
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
+ * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
+ * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
+ * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+ * DAMAGE.
+ *
+ * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
+ * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ * FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
+ * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
+ * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
+ *
+ * Author(s): Behdad Esfahbod
+ */
+
+#ifndef HB_DECYCLER_HH
+#define HB_DECYCLER_HH
+
+#include "hb.hh"
+
+/*
+ * hb_decycler_t is an efficient cycle detector for graph traversal.
+ * It's a simple tortoise-and-hare algorithm with a twist: it's
+ * designed to detect cycles while traversing a graph in a DFS manner,
+ * instead of just a linked list.
+ *
+ * For Floyd's tortoise and hare algorithm, see:
+ * https://en.wikipedia.org/wiki/Cycle_detection#Floyd's_tortoise_and_hare
+ *
+ * hb_decycler_t is O(n) in the number of nodes in the DFS traversal
+ * if there are no cycles. Unlike Floyd's algorithm, hb_decycler_t
+ * can be used in a DFS traversal, where the graph is not a simple
+ * linked list, but a tree with possible cycles.  Like Floyd's algorithm,
+ * it is constant-memory (~three  pointers).
+ *
+ * The decycler works by creating an implicit linked-list on the stack,
+ * of the path from the root to the current node, and apply Floyd's
+ * algorithm on that list as it goes.
+ *
+ * The decycler is malloc-free, and as such, much faster to use than a
+ * hb_set_t or hb_map_t equivalent.
+ *
+ * The decycler detects cycles in the graph *eventually*, not *immediately*.
+ * That is, it may not detect a cycle until the cycle is fully traversed,
+ * even multiple times. See Floyd's algorithm analysis for details.
+ *
+ * The implementation saves a pointer storage on the stack by combining
+ * this->u.decycler and this->u.next into a union.  This is possible because
+ * at any point we only need one of those values. The invariant is that
+ * after construction, and before destruction, of a node, the u.decycler
+ * field is always valid. The u.next field is only valid when the node is
+ * in the traversal path, parent to another node.
+ *
+ * There are three method's:
+ *
+ *   - hb_decycler_node_t() constructor: Creates a new node in the traversal.
+ *     The constructor takes a reference to the decycler object and inserts
+ *     itself as the latest node in the traversal path, by advancing the hare
+ *     pointer, and for every other descent, advancing the tortoise pointer.
+ *
+ *   - ~hb_decycler_node_t() destructor: Restores the decycler object to its
+ *      previous state by removing the node from the traversal path.
+ *
+ *   - bool visit(uintptr_t value): Called on every node in the graph.  Returns
+ *     true if the node is not part of a cycle, and false if it is.  The value
+ *     parameter is used to detect cycles.  It's the caller's responsibility
+ *     to ensure that the value is unique for each node in the graph.
+ *     The cycle detection is as simple as comparing the value to the value
+ *     held by the tortoise pointer, which is the Floyd's algorithm.
+ *
+ * For usage examples see test-decycler.cc.
+ */
+
+struct hb_decycler_node_t;
+
+struct hb_decycler_t
+{
+  friend struct hb_decycler_node_t;
+
+  private:
+  bool tortoise_awake = false;
+  hb_decycler_node_t *tortoise = nullptr;
+  hb_decycler_node_t *hare = nullptr;
+};
+
+struct hb_decycler_node_t
+{
+  hb_decycler_node_t (hb_decycler_t &decycler)
+  {
+    u.decycler = &decycler;
+
+    decycler.tortoise_awake = !decycler.tortoise_awake;
+
+    if (!decycler.tortoise)
+    {
+      // First node.
+      assert (decycler.tortoise_awake);
+      assert (!decycler.hare);
+      decycler.tortoise = decycler.hare = this;
+      return;
+    }
+
+    if (decycler.tortoise_awake)
+      decycler.tortoise = decycler.tortoise->u.next; // Time to move.
+
+    this->prev = decycler.hare;
+    decycler.hare->u.next = this;
+    decycler.hare = this;
+  }
+
+  ~hb_decycler_node_t ()
+  {
+    hb_decycler_t &decycler = *u.decycler;
+
+    // Inverse of the constructor.
+
+    assert (decycler.hare == this);
+    decycler.hare = prev;
+    if (prev)
+      prev->u.decycler = &decycler;
+
+    assert (decycler.tortoise);
+    if (decycler.tortoise_awake)
+      decycler.tortoise = decycler.tortoise->prev;
+
+    decycler.tortoise_awake = !decycler.tortoise_awake;
+  }
+
+  bool visit (uintptr_t value_)
+  {
+    value = value_;
+
+    hb_decycler_t &decycler = *u.decycler;
+
+    if (decycler.tortoise == this)
+      return true; // First node; not a cycle.
+
+    if (decycler.tortoise->value == value)
+      return false; // Cycle detected.
+
+    return true;
+  }
+
+  private:
+  union {
+    hb_decycler_t *decycler;
+    hb_decycler_node_t *next;
+  } u = {nullptr};
+  hb_decycler_node_t *prev = nullptr;
+  uintptr_t value = 0;
+};
+
+#endif /* HB_DECYCLER_HH */
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-deprecated.h b/src/java.desktop/share/native/libharfbuzz/hb-deprecated.h
index 200e8ff4928..d854a2b16f5 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-deprecated.h
+++ b/src/java.desktop/share/native/libharfbuzz/hb-deprecated.h
@@ -56,7 +56,7 @@ HB_BEGIN_DECLS
 /**
  * HB_SCRIPT_CANADIAN_ABORIGINAL:
  *
- * Use #HB_SCRIPT_CANADIAN_SYLLABICS instead:
+ * Use #HB_SCRIPT_CANADIAN_SYLLABICS instead.
  *
  * Deprecated: 0.9.20
  */
@@ -301,6 +301,15 @@ hb_font_get_glyph_shape (hb_font_t *font,
                          hb_draw_funcs_t *dfuncs, void *draw_data);
 
 
+/**
+ * HB_AAT_LAYOUT_FEATURE_TYPE_CURISVE_CONNECTION:
+ *
+ * Use #HB_AAT_LAYOUT_FEATURE_TYPE_CURSIVE_CONNECTION instead.
+ *
+ * Deprecated: 8.3.0
+ */
+#define HB_AAT_LAYOUT_FEATURE_TYPE_CURISVE_CONNECTION HB_AAT_LAYOUT_FEATURE_TYPE_CURSIVE_CONNECTION
+
 #endif
 
 
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-draw.h b/src/java.desktop/share/native/libharfbuzz/hb-draw.h
index eba791d10c0..4556b082d60 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-draw.h
+++ b/src/java.desktop/share/native/libharfbuzz/hb-draw.h
@@ -70,7 +70,7 @@ typedef struct hb_draw_state_t {
  *
  * The default #hb_draw_state_t at the start of glyph drawing.
  */
-#define HB_DRAW_STATE_DEFAULT {0, 0.f, 0.f, 0.f, 0.f, {0.}, {0.}, {0.}}
+#define HB_DRAW_STATE_DEFAULT {0, 0.f, 0.f, 0.f, 0.f, {0.}, {0.}, {0.}, {0.}, {0.}, {0.}, {0.}}
 
 
 /**
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-draw.hh b/src/java.desktop/share/native/libharfbuzz/hb-draw.hh
index e1adf9ddc9f..2c30843de64 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-draw.hh
+++ b/src/java.desktop/share/native/libharfbuzz/hb-draw.hh
@@ -232,7 +232,7 @@ struct hb_draw_session_t
     funcs->close_path (draw_data, st);
   }
 
-  protected:
+  public:
   float slant;
   bool not_slanted;
   hb_draw_funcs_t *funcs;
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-face-builder.cc b/src/java.desktop/share/native/libharfbuzz/hb-face-builder.cc
index ff723ac7000..6b7e1913024 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-face-builder.cc
+++ b/src/java.desktop/share/native/libharfbuzz/hb-face-builder.cc
@@ -42,7 +42,7 @@
 struct face_table_info_t
 {
   hb_blob_t* data;
-  signed order;
+  unsigned order;
 };
 
 struct hb_face_builder_data_t
@@ -153,6 +153,50 @@ _hb_face_builder_reference_table (hb_face_t *face HB_UNUSED, hb_tag_t tag, void
   return hb_blob_reference (data->tables[tag].data);
 }
 
+static unsigned
+_hb_face_builder_get_table_tags (const hb_face_t *face HB_UNUSED,
+                                 unsigned int start_offset,
+                                 unsigned int *table_count,
+                                 hb_tag_t *table_tags,
+                                 void *user_data)
+{
+  hb_face_builder_data_t *data = (hb_face_builder_data_t *) user_data;
+
+  unsigned population = data->tables.get_population ();
+
+  if (!table_count)
+    return population;
+
+  if (unlikely (start_offset >= population))
+  {
+    if (table_count)
+      *table_count = 0;
+    return population;
+  }
+
+  // Sort the tags.
+  hb_vector_t<hb_tag_t> sorted_tags;
+  data->tables.keys () | hb_sink (sorted_tags);
+  if (unlikely (sorted_tags.in_error ()))
+  {
+    // Not much to do...
+  }
+  sorted_tags.qsort ([] (const void* a, const void* b) {
+    return * (hb_tag_t *) a <  * (hb_tag_t *) b ? -1 :
+           * (hb_tag_t *) a == * (hb_tag_t *) b ?  0 :
+                                                  +1;
+  });
+
+  auto array = sorted_tags.as_array ().sub_array (start_offset, table_count);
+  auto out = hb_array (table_tags, *table_count);
+
+  + array.iter ()
+  | hb_sink (out)
+  ;
+
+  return population;
+}
+
 
 /**
  * hb_face_builder_create:
@@ -171,9 +215,16 @@ hb_face_builder_create ()
   hb_face_builder_data_t *data = _hb_face_builder_data_create ();
   if (unlikely (!data)) return hb_face_get_empty ();
 
-  return hb_face_create_for_tables (_hb_face_builder_reference_table,
-                                    data,
-                                    _hb_face_builder_data_destroy);
+  hb_face_t *face = hb_face_create_for_tables (_hb_face_builder_reference_table,
+                                               data,
+                                               _hb_face_builder_data_destroy);
+
+  hb_face_set_get_table_tags_func (face,
+                                   _hb_face_builder_get_table_tags,
+                                   data,
+                                   nullptr);
+
+  return face;
 }
 
 /**
@@ -199,7 +250,7 @@ hb_face_builder_add_table (hb_face_t *face, hb_tag_t tag, hb_blob_t *blob)
   hb_face_builder_data_t *data = (hb_face_builder_data_t *) face->user_data;
 
   hb_blob_t* previous = data->tables.get (tag).data;
-  if (!data->tables.set (tag, face_table_info_t {hb_blob_reference (blob), -1}))
+  if (!data->tables.set (tag, face_table_info_t {hb_blob_reference (blob), (unsigned) -1}))
   {
     hb_blob_destroy (blob);
     return false;
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-face.cc b/src/java.desktop/share/native/libharfbuzz/hb-face.cc
index bc19bb9d5c9..7967ae3241b 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-face.cc
+++ b/src/java.desktop/share/native/libharfbuzz/hb-face.cc
@@ -90,10 +90,6 @@ DEFINE_NULL_INSTANCE (hb_face_t) =
 {
   HB_OBJECT_HEADER_STATIC,
 
-  nullptr, /* reference_table_func */
-  nullptr, /* user_data */
-  nullptr, /* destroy */
-
   0,    /* index */
   1000, /* upem */
   0,    /* num_glyphs */
@@ -110,8 +106,9 @@ DEFINE_NULL_INSTANCE (hb_face_t) =
  *
  * Variant of hb_face_create(), built for those cases where it is more
  * convenient to provide data for individual tables instead of the whole font
- * data. With the caveat that hb_face_get_table_tags() does not currently work
- * with faces created this way.
+ * data. With the caveat that hb_face_get_table_tags() would not work
+ * with faces created this way. You can address that by calling the
+ * hb_face_set_get_table_tags_func() function and setting the appropriate callback.
  *
  * Creates a new face object from the specified @user_data and @reference_table_func,
  * with the @destroy callback.
@@ -194,6 +191,22 @@ _hb_face_for_data_reference_table (hb_face_t *face HB_UNUSED, hb_tag_t tag, void
   return blob;
 }
 
+static unsigned
+_hb_face_for_data_get_table_tags (const hb_face_t *face HB_UNUSED,
+                                  unsigned int start_offset,
+                                  unsigned int *table_count,
+                                  hb_tag_t *table_tags,
+                                  void *user_data)
+{
+  hb_face_for_data_closure_t *data = (hb_face_for_data_closure_t *) user_data;
+
+  const OT::OpenTypeFontFile &ot_file = *data->blob->as<OT::OpenTypeFontFile> ();
+  const OT::OpenTypeFontFace &ot_face = ot_file.get_face (data->index);
+
+  return ot_face.get_table_tags (start_offset, table_count, table_tags);
+}
+
+
 /**
  * hb_face_create:
  * @blob: #hb_blob_t to work upon
@@ -240,12 +253,73 @@ hb_face_create (hb_blob_t    *blob,
   face = hb_face_create_for_tables (_hb_face_for_data_reference_table,
                                     closure,
                                     _hb_face_for_data_closure_destroy);
+  hb_face_set_get_table_tags_func (face,
+                                   _hb_face_for_data_get_table_tags,
+                                   closure,
+                                   nullptr);
 
   face->index = index;
 
   return face;
 }
 
+/**
+ * hb_face_create_or_fail:
+ * @blob: #hb_blob_t to work upon
+ * @index: The index of the face within @blob
+ *
+ * Like hb_face_create(), but returns `NULL` if the blob data
+ * contains no usable font face at the specified index.
+ *
+ * Return value: (transfer full): The new face object, or `NULL` if
+ * no face is found at the specified index.
+ *
+ * Since: 10.1.0
+ **/
+hb_face_t *
+hb_face_create_or_fail (hb_blob_t    *blob,
+                        unsigned int  index)
+{
+  unsigned num_faces = hb_face_count (blob);
+  if (index >= num_faces)
+    return nullptr;
+
+  hb_face_t *face = hb_face_create (blob, index);
+  if (hb_object_is_immutable (face))
+    return nullptr;
+
+  return face;
+}
+
+#ifndef HB_NO_OPEN
+/**
+ * hb_face_create_from_file_or_fail:
+ * @file_name: A font filename
+ * @index: The index of the face within the file
+ *
+ * A thin wrapper around hb_blob_create_from_file_or_fail()
+ * followed by hb_face_create_or_fail().
+ *
+ * Return value: (transfer full): The new face object, or `NULL` if
+ * no face is found at the specified index or the file cannot be read.
+ *
+ * Since: 10.1.0
+ **/
+HB_EXTERN hb_face_t *
+hb_face_create_from_file_or_fail (const char   *file_name,
+                                  unsigned int  index)
+{
+  hb_blob_t *blob = hb_blob_create_from_file_or_fail (file_name);
+  if (unlikely (!blob))
+    return nullptr;
+
+  hb_face_t *face = hb_face_create_or_fail (blob, index);
+  hb_blob_destroy (blob);
+
+  return face;
+}
+#endif
+
 /**
  * hb_face_get_empty:
  *
@@ -306,6 +380,9 @@ hb_face_destroy (hb_face_t *face)
   face->data.fini ();
   face->table.fini ();
 
+  if (face->get_table_tags_destroy)
+    face->get_table_tags_destroy (face->get_table_tags_user_data);
+
   if (face->destroy)
     face->destroy (face->user_data);
 
@@ -395,7 +472,8 @@ hb_face_is_immutable (const hb_face_t *face)
  * @tag: The #hb_tag_t of the table to query
  *
  * Fetches a reference to the specified table within
- * the specified face.
+ * the specified face. Returns an empty blob if referencing table data is not
+ * possible.
  *
  * Return value: (transfer full): A pointer to the @tag table within @face
  *
@@ -415,9 +493,10 @@ hb_face_reference_table (const hb_face_t *face,
  * hb_face_reference_blob:
  * @face: A face object
  *
- * Fetches a pointer to the binary blob that contains the
- * specified face. Returns an empty blob if referencing face data is not
- * possible.
+ * Fetches a pointer to the binary blob that contains the specified face.
+ * If referencing the face data is not possible, this function creates a blob
+ * out of individual table blobs if hb_face_get_table_tags() works with this
+ * face, otherwise it returns an empty blob.
  *
  * Return value: (transfer full): A pointer to the blob for @face
  *
@@ -426,7 +505,41 @@ hb_face_reference_table (const hb_face_t *face,
 hb_blob_t *
 hb_face_reference_blob (hb_face_t *face)
 {
-  return face->reference_table (HB_TAG_NONE);
+  hb_blob_t *blob = face->reference_table (HB_TAG_NONE);
+
+  if (blob == hb_blob_get_empty ())
+  {
+    // If referencing the face blob is not possible (e.g. not implemented by the
+    // font functions), use face builder to create a blob out of individual
+    // table blobs.
+    unsigned total_count = hb_face_get_table_tags (face, 0, nullptr, nullptr);
+    if (total_count)
+    {
+      hb_tag_t tags[64];
+      unsigned count = ARRAY_LENGTH (tags);
+      hb_face_t* builder = hb_face_builder_create ();
+
+      for (unsigned offset = 0; offset < total_count; offset += count)
+      {
+        hb_face_get_table_tags (face, offset, &count, tags);
+        if (unlikely (!count))
+          break; // Allocation error
+        for (unsigned i = 0; i < count; i++)
+        {
+          if (unlikely (!tags[i]))
+            continue;
+          hb_blob_t *table = hb_face_reference_table (face, tags[i]);
+          hb_face_builder_add_table (builder, tags[i], table);
+          hb_blob_destroy (table);
+        }
+      }
+
+      blob = hb_face_reference_blob (builder);
+      hb_face_destroy (builder);
+    }
+  }
+
+  return blob;
 }
 
 /**
@@ -547,6 +660,38 @@ hb_face_get_glyph_count (const hb_face_t *face)
   return face->get_num_glyphs ();
 }
 
+/**
+ * hb_face_set_get_table_tags_func:
+ * @face: A face object
+ * @func: (closure user_data) (destroy destroy) (scope notified): The table-tag-fetching function
+ * @user_data: A pointer to the user data, to be destroyed by @destroy when not needed anymore
+ * @destroy: (nullable): A callback to call when @func is not needed anymore
+ *
+ * Sets the table-tag-fetching function for the specified face object.
+ *
+ * Since: 10.0.0
+ */
+HB_EXTERN void
+hb_face_set_get_table_tags_func (hb_face_t *face,
+                                 hb_get_table_tags_func_t func,
+                                 void                    *user_data,
+                                 hb_destroy_func_t        destroy)
+{
+  if (hb_object_is_immutable (face))
+  {
+    if (destroy)
+      destroy (user_data);
+    return;
+  }
+
+  if (face->get_table_tags_destroy)
+    face->get_table_tags_destroy (face->get_table_tags_user_data);
+
+  face->get_table_tags_func = func;
+  face->get_table_tags_user_data = user_data;
+  face->get_table_tags_destroy = destroy;
+}
+
 /**
  * hb_face_get_table_tags:
  * @face: A face object
@@ -568,19 +713,14 @@ hb_face_get_table_tags (const hb_face_t *face,
                         unsigned int *table_count, /* IN/OUT */
                         hb_tag_t     *table_tags /* OUT */)
 {
-  if (face->destroy != (hb_destroy_func_t) _hb_face_for_data_closure_destroy)
+  if (!face->get_table_tags_func)
   {
     if (table_count)
       *table_count = 0;
     return 0;
   }
 
-  hb_face_for_data_closure_t *data = (hb_face_for_data_closure_t *) face->user_data;
-
-  const OT::OpenTypeFontFile &ot_file = *data->blob->as<OT::OpenTypeFontFile> ();
-  const OT::OpenTypeFontFace &ot_face = ot_file.get_face (data->index);
-
-  return ot_face.get_table_tags (start_offset, table_count, table_tags);
+  return face->get_table_tags_func (face, start_offset, table_count, table_tags, face->get_table_tags_user_data);
 }
 
 
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-face.h b/src/java.desktop/share/native/libharfbuzz/hb-face.h
index 2e5fb150927..953298fa50b 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-face.h
+++ b/src/java.desktop/share/native/libharfbuzz/hb-face.h
@@ -59,15 +59,28 @@ HB_EXTERN hb_face_t *
 hb_face_create (hb_blob_t    *blob,
                 unsigned int  index);
 
+HB_EXTERN hb_face_t *
+hb_face_create_or_fail (hb_blob_t    *blob,
+                        unsigned int  index);
+
+HB_EXTERN hb_face_t *
+hb_face_create_from_file_or_fail (const char   *file_name,
+                                  unsigned int  index);
+
 /**
  * hb_reference_table_func_t:
  * @face: an #hb_face_t to reference table for
  * @tag: the tag of the table to reference
  * @user_data: User data pointer passed by the caller
  *
- * Callback function for hb_face_create_for_tables().
+ * Callback function for hb_face_create_for_tables(). The @tag is the tag of the
+ * table to reference, and the special tag #HB_TAG_NONE is used to reference the
+ * blob of the face itself. If referencing the face blob is not possible, it is
+ * recommended to set hb_get_table_tags_func_t on the @face to allow
+ * hb_face_reference_blob() to create a face blob out of individual table blobs.
  *
- * Return value: (transfer full): A pointer to the @tag table within @face
+ * Return value: (transfer full): A pointer to the @tag table within @face or
+ * `NULL` if the table is not found or cannot be referenced.
  *
  * Since: 0.9.2
  */
@@ -135,6 +148,34 @@ hb_face_set_glyph_count (hb_face_t    *face,
 HB_EXTERN unsigned int
 hb_face_get_glyph_count (const hb_face_t *face);
 
+
+/**
+ * hb_get_table_tags_func_t:
+ * @face: A face object
+ * @start_offset: The index of first table tag to retrieve
+ * @table_count: (inout): Input = the maximum number of table tags to return;
+ *                Output = the actual number of table tags returned (may be zero)
+ * @table_tags: (out) (array length=table_count): The array of table tags found
+ * @user_data: User data pointer passed by the caller
+ *
+ * Callback function for hb_face_get_table_tags().
+ *
+ * Return value: Total number of tables, or zero if it is not possible to list
+ *
+ * Since: 10.0.0
+ */
+typedef unsigned int (*hb_get_table_tags_func_t) (const hb_face_t *face,
+                                                  unsigned int  start_offset,
+                                                  unsigned int *table_count, /* IN/OUT */
+                                                  hb_tag_t     *table_tags /* OUT */,
+                                                  void         *user_data);
+
+HB_EXTERN void
+hb_face_set_get_table_tags_func (hb_face_t *face,
+                                 hb_get_table_tags_func_t func,
+                                 void                    *user_data,
+                                 hb_destroy_func_t        destroy);
+
 HB_EXTERN unsigned int
 hb_face_get_table_tags (const hb_face_t *face,
                         unsigned int  start_offset,
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-face.hh b/src/java.desktop/share/native/libharfbuzz/hb-face.hh
index 4c6b252e88e..4d12030f187 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-face.hh
+++ b/src/java.desktop/share/native/libharfbuzz/hb-face.hh
@@ -48,13 +48,17 @@ struct hb_face_t
 {
   hb_object_header_t header;
 
+  unsigned int index;                   /* Face index in a collection, zero-based. */
+  mutable hb_atomic_int_t upem;         /* Units-per-EM. */
+  mutable hb_atomic_int_t num_glyphs;   /* Number of glyphs. */
+
   hb_reference_table_func_t  reference_table_func;
   void                      *user_data;
   hb_destroy_func_t          destroy;
 
-  unsigned int index;                   /* Face index in a collection, zero-based. */
-  mutable hb_atomic_int_t upem;         /* Units-per-EM. */
-  mutable hb_atomic_int_t num_glyphs;   /* Number of glyphs. */
+  hb_get_table_tags_func_t   get_table_tags_func;
+  void                      *get_table_tags_user_data;
+  hb_destroy_func_t          get_table_tags_destroy;
 
   hb_shaper_object_dataset_t<hb_face_t> data;/* Various shaper data. */
   hb_ot_face_t table;                   /* All the face's tables. */
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-font.cc b/src/java.desktop/share/native/libharfbuzz/hb-font.cc
index 9ce55bbeb89..0c9084c574f 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-font.cc
+++ b/src/java.desktop/share/native/libharfbuzz/hb-font.cc
@@ -231,7 +231,7 @@ hb_font_get_glyph_v_advance_nil (hb_font_t      *font,
                                  void           *user_data HB_UNUSED)
 {
   /* TODO use font_extents.ascender+descender */
-  return font->y_scale;
+  return -font->y_scale;
 }
 
 static hb_position_t
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-font.hh b/src/java.desktop/share/native/libharfbuzz/hb-font.hh
index c3198830cd3..8273f347562 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-font.hh
+++ b/src/java.desktop/share/native/libharfbuzz/hb-font.hh
@@ -651,7 +651,7 @@ struct hb_font_t
   {
     if (get_glyph_name (glyph, s, size)) return;
 
-    if (size && snprintf (s, size, "gid%u", glyph) < 0)
+    if (size && snprintf (s, size, "gid%" PRIu32, glyph) < 0)
       *s = '\0';
   }
 
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-ft.cc b/src/java.desktop/share/native/libharfbuzz/hb-ft.cc
index 32f5d3012da..b126d2022d1 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-ft.cc
+++ b/src/java.desktop/share/native/libharfbuzz/hb-ft.cc
@@ -37,10 +37,15 @@
 #include "hb-draw.hh"
 #include "hb-font.hh"
 #include "hb-machinery.hh"
+#ifndef HB_NO_AAT
+#include "hb-aat-layout-trak-table.hh"
+#endif
 #include "hb-ot-os2-table.hh"
+#include "hb-ot-stat-table.hh"
 #include "hb-ot-shaper-arabic-pua.hh"
 #include "hb-paint.hh"
 
+#include FT_MODULE_H
 #include FT_ADVANCES_H
 #include FT_MULTIPLE_MASTERS_H
 #include FT_OUTLINE_H
@@ -225,7 +230,7 @@ _hb_ft_hb_font_check_changed (hb_font_t *font,
  * Sets the FT_Load_Glyph load flags for the specified #hb_font_t.
  *
  * For more information, see
- * https://www.freetype.org/freetype2/docs/reference/ft2-base_interface.html#ft_load_xxx
+ * <https://freetype.org/freetype2/docs/reference/ft2-glyph_retrieval.html#ft_load_xxx>
  *
  * This function works with #hb_font_t objects created by
  * hb_ft_font_create() or hb_ft_font_create_referenced().
@@ -253,7 +258,7 @@ hb_ft_font_set_load_flags (hb_font_t *font, int load_flags)
  * Fetches the FT_Load_Glyph load flags of the specified #hb_font_t.
  *
  * For more information, see
- * https://www.freetype.org/freetype2/docs/reference/ft2-base_interface.html#ft_load_xxx
+ * <https://freetype.org/freetype2/docs/reference/ft2-glyph_retrieval.html#ft_load_xxx>
  *
  * This function works with #hb_font_t objects created by
  * hb_ft_font_create() or hb_ft_font_create_referenced().
@@ -273,6 +278,33 @@ hb_ft_font_get_load_flags (hb_font_t *font)
   return ft_font->load_flags;
 }
 
+/**
+ * hb_ft_font_get_ft_face: (skip)
+ * @font: #hb_font_t to work upon
+ *
+ * Fetches the FT_Face associated with the specified #hb_font_t
+ * font object.
+ *
+ * This function works with #hb_font_t objects created by
+ * hb_ft_font_create() or hb_ft_font_create_referenced().
+ *
+ * Return value: (nullable): the FT_Face found or `NULL`
+ *
+ * Since: 10.4.0
+ **/
+FT_Face
+hb_ft_font_get_ft_face (hb_font_t *font)
+{
+  if (unlikely (font->destroy != (hb_destroy_func_t) _hb_ft_font_destroy))
+    return nullptr;
+
+  const hb_ft_font_t *ft_font = (const hb_ft_font_t *) font->user_data;
+
+  return ft_font->ft_face;
+}
+
+#ifndef HB_DISABLE_DEPRECATED
+
 /**
  * hb_ft_font_get_face: (skip)
  * @font: #hb_font_t to work upon
@@ -286,18 +318,16 @@ hb_ft_font_get_load_flags (hb_font_t *font)
  * Return value: (nullable): the FT_Face found or `NULL`
  *
  * Since: 0.9.2
+ * Deprecated: 10.4.0: Use hb_ft_font_get_ft_face() instead.
  **/
 FT_Face
 hb_ft_font_get_face (hb_font_t *font)
 {
-  if (unlikely (font->destroy != (hb_destroy_func_t) _hb_ft_font_destroy))
-    return nullptr;
-
-  const hb_ft_font_t *ft_font = (const hb_ft_font_t *) font->user_data;
-
-  return ft_font->ft_face;
+  return hb_ft_font_get_ft_face (font);
 }
 
+#endif
+
 /**
  * hb_ft_font_lock_face: (skip)
  * @font: #hb_font_t to work upon
@@ -501,6 +531,26 @@ hb_ft_get_glyph_h_advances (hb_font_t* font, void* font_data,
       first_advance = &StructAtOffsetUnaligned<hb_position_t> (first_advance, advance_stride);
     }
   }
+
+#ifndef HB_NO_AAT
+  /* According to Ned, trak is applied by default for "modern fonts", as detected by presence of STAT table. */
+#ifndef HB_NO_STYLE
+  bool apply_trak = font->face->table.STAT->has_data () && font->face->table.trak->has_data ();
+#else
+  bool apply_trak = false;
+#endif
+  if (apply_trak)
+  {
+    hb_position_t tracking = font->face->table.trak->get_h_tracking (font);
+    first_advance = orig_first_advance;
+    for (unsigned int i = 0; i < count; i++)
+    {
+      *first_advance += tracking;
+      first_glyph = &StructAtOffsetUnaligned<hb_codepoint_t> (first_glyph, glyph_stride);
+      first_advance = &StructAtOffsetUnaligned<hb_position_t> (first_advance, advance_stride);
+    }
+  }
+#endif
 }
 
 #ifndef HB_NO_VERTICAL
@@ -537,7 +587,20 @@ hb_ft_get_glyph_v_advance (hb_font_t *font,
    * have a Y growing upward.  Hence the extra negation. */
 
   hb_position_t y_strength = font->y_scale >= 0 ? font->y_strength : -font->y_strength;
-  return ((-v + (1<<9)) >> 10) + (font->embolden_in_place ? 0 : y_strength);
+  v = ((-v + (1<<9)) >> 10) + (font->embolden_in_place ? 0 : y_strength);
+
+#ifndef HB_NO_AAT
+  /* According to Ned, trak is applied by default for "modern fonts", as detected by presence of STAT table. */
+#ifndef HB_NO_STYLE
+  bool apply_trak = font->face->table.STAT->has_data () && font->face->table.trak->has_data ();
+#else
+  bool apply_trak = false;
+#endif
+  if (apply_trak)
+    v += font->face->table.trak->get_v_tracking (font);
+#endif
+
+  return v;
 }
 #endif
 
@@ -930,11 +993,15 @@ hb_ft_paint_glyph (hb_font_t *font,
   hb_lock_t lock (ft_font->lock);
   FT_Face ft_face = ft_font->ft_face;
 
+  FT_Long load_flags = ft_font->load_flags | FT_LOAD_NO_BITMAP | FT_LOAD_COLOR;
+#if (FREETYPE_MAJOR*10000 + FREETYPE_MINOR*100 + FREETYPE_PATCH) >= 21301
+  load_flags |= FT_LOAD_NO_SVG;
+#endif
+
   /* We release the lock before calling into glyph callbacks, such that
    * eg. draw API can call back into the face.*/
 
-  if (unlikely (FT_Load_Glyph (ft_face, gid,
-                               ft_font->load_flags | FT_LOAD_COLOR)))
+  if (unlikely (FT_Load_Glyph (ft_face, gid, load_flags)))
     return;
 
   if (ft_face->glyph->format == FT_GLYPH_FORMAT_OUTLINE)
@@ -1104,6 +1171,45 @@ _hb_ft_reference_table (hb_face_t *face HB_UNUSED, hb_tag_t tag, void *user_data
                          buffer, hb_free);
 }
 
+static unsigned
+_hb_ft_get_table_tags (const hb_face_t *face HB_UNUSED,
+                       unsigned int start_offset,
+                       unsigned int *table_count,
+                       hb_tag_t *table_tags,
+                       void *user_data)
+{
+  FT_Face ft_face = (FT_Face) user_data;
+
+  FT_ULong population = 0;
+  FT_Sfnt_Table_Info (ft_face,
+                      0, // table_index; ignored
+                      nullptr,
+                      &population);
+
+  if (!table_count)
+    return population;
+  else
+    *table_count = 0;
+
+  if (unlikely (start_offset >= population))
+    return population;
+
+  unsigned end_offset = hb_min (start_offset + *table_count, (unsigned) population);
+  if (unlikely (end_offset < start_offset))
+    return population;
+
+  *table_count = end_offset - start_offset;
+  for (unsigned i = start_offset; i < end_offset; i++)
+  {
+    FT_ULong tag = 0, length;
+    FT_Sfnt_Table_Info (ft_face, i, &tag, &length);
+    table_tags[i - start_offset] = tag;
+  }
+
+  return population;
+}
+
+
 /**
  * hb_ft_face_create:
  * @ft_face: (destroy destroy) (scope notified): FT_Face to work upon
@@ -1145,6 +1251,7 @@ hb_ft_face_create (FT_Face           ft_face,
     hb_blob_destroy (blob);
   } else {
     face = hb_face_create_for_tables (_hb_ft_reference_table, ft_face, destroy);
+    hb_face_set_get_table_tags_func (face, _hb_ft_get_table_tags, ft_face, nullptr);
   }
 
   hb_face_set_index (face, ft_face->face_index);
@@ -1215,7 +1322,7 @@ hb_ft_face_finalize (void *arg)
 hb_face_t *
 hb_ft_face_create_cached (FT_Face ft_face)
 {
-  if (unlikely (!ft_face->generic.data || ft_face->generic.finalizer != (FT_Generic_Finalizer) hb_ft_face_finalize))
+  if (unlikely (!ft_face->generic.data || ft_face->generic.finalizer != hb_ft_face_finalize))
   {
     if (ft_face->generic.finalizer)
       ft_face->generic.finalizer (ft_face);
@@ -1245,7 +1352,7 @@ hb_ft_face_create_cached (FT_Face ft_face)
  *
  * If you know you have valid reasons not to use hb_ft_font_create_referenced(),
  * then it is the client program's responsibility to destroy @ft_face
- * after the #hb_font_t font object has been destroyed.
+ * only after the #hb_font_t font object has been destroyed.
  *
  * HarfBuzz will use the @destroy callback on the #hb_font_t font object
  * if it is supplied when you use this function. However, even if @destroy
@@ -1392,6 +1499,24 @@ hb_ft_font_create_referenced (FT_Face ft_face)
   return hb_ft_font_create (ft_face, _hb_ft_face_destroy);
 }
 
+
+static void * _hb_ft_alloc (FT_Memory memory, long size)
+{ return hb_malloc (size); }
+
+static void _hb_ft_free (FT_Memory memory, void *block)
+{ hb_free (block); }
+
+static void * _hb_ft_realloc (FT_Memory memory, long cur_size, long new_size, void *block)
+{ return hb_realloc (block, new_size); }
+
+static FT_MemoryRec_ m =
+{
+  nullptr,
+  _hb_ft_alloc,
+  _hb_ft_free,
+  _hb_ft_realloc
+};
+
 static inline void free_static_ft_library ();
 
 static struct hb_ft_library_lazy_loader_t : hb_lazy_loader_t<hb_remove_pointer<FT_Library>,
@@ -1400,16 +1525,19 @@ static struct hb_ft_library_lazy_loader_t : hb_lazy_loader_t<hb_remove_pointer<F
   static FT_Library create ()
   {
     FT_Library l;
-    if (FT_Init_FreeType (&l))
+    if (FT_New_Library (&m, &l))
       return nullptr;
 
+    FT_Add_Default_Modules (l);
+    FT_Set_Default_Properties (l);
+
     hb_atexit (free_static_ft_library);
 
     return l;
   }
   static void destroy (FT_Library l)
   {
-    FT_Done_FreeType (l);
+    FT_Done_Library (l);
   }
   static FT_Library get_null ()
   {
@@ -1424,9 +1552,76 @@ void free_static_ft_library ()
 }
 
 static FT_Library
-get_ft_library ()
+reference_ft_library ()
 {
-  return static_ft_library.get_unconst ();
+  FT_Library l = static_ft_library.get_unconst ();
+  if (unlikely (FT_Reference_Library (l)))
+  {
+    DEBUG_MSG (FT, l, "FT_Reference_Library() failed");
+    return nullptr;
+  }
+  return l;
+}
+
+static hb_user_data_key_t ft_library_key = {0};
+
+static void
+finalize_ft_library (void *arg)
+{
+  FT_Face ft_face = (FT_Face) arg;
+  FT_Done_Library ((FT_Library) ft_face->generic.data);
+}
+
+static void
+destroy_ft_library (void *arg)
+{
+  FT_Done_Library ((FT_Library) arg);
+}
+
+/**
+ * hb_ft_face_create_from_file_or_fail:
+ * @file_name: A font filename
+ * @index: The index of the face within the file
+ *
+ * Creates an #hb_face_t face object from the specified
+ * font file and face index.
+ *
+ * This is similar in functionality to hb_face_create_from_file_or_fail(),
+ * but uses the FreeType library for loading the font file.
+ *
+ * Return value: (transfer full): The new face object, or `NULL` if
+ * no face is found at the specified index or the file cannot be read.
+ *
+ * Since: 10.1.0
+ */
+hb_face_t *
+hb_ft_face_create_from_file_or_fail (const char   *file_name,
+                                     unsigned int  index)
+{
+  FT_Library ft_library = reference_ft_library ();
+  if (unlikely (!ft_library))
+  {
+    DEBUG_MSG (FT, ft_library, "reference_ft_library failed");
+    return nullptr;
+  }
+
+  FT_Face ft_face;
+  if (unlikely (FT_New_Face (ft_library,
+                             file_name,
+                             index,
+                             &ft_face)))
+    return nullptr;
+
+  hb_face_t *face = hb_ft_face_create_referenced (ft_face);
+  FT_Done_Face (ft_face);
+
+  ft_face->generic.data = ft_library;
+  ft_face->generic.finalizer = finalize_ft_library;
+
+  if (hb_face_is_immutable (face))
+    return nullptr;
+
+  return face;
 }
 
 static void
@@ -1465,32 +1660,47 @@ _release_blob (void *arg)
 void
 hb_ft_font_set_funcs (hb_font_t *font)
 {
+  // In case of failure...
+  hb_font_set_funcs (font,
+                     hb_font_funcs_get_empty (),
+                     nullptr, nullptr);
+
   hb_blob_t *blob = hb_face_reference_blob (font->face);
   unsigned int blob_length;
   const char *blob_data = hb_blob_get_data (blob, &blob_length);
   if (unlikely (!blob_length))
     DEBUG_MSG (FT, font, "Font face has empty blob");
 
-  FT_Face ft_face = nullptr;
-  FT_Error err = FT_New_Memory_Face (get_ft_library (),
-                                     (const FT_Byte *) blob_data,
-                                     blob_length,
-                                     hb_face_get_index (font->face),
-                                     &ft_face);
-
-  if (unlikely (err)) {
+  FT_Library ft_library = reference_ft_library ();
+  if (unlikely (!ft_library))
+  {
     hb_blob_destroy (blob);
-    DEBUG_MSG (FT, font, "Font face FT_New_Memory_Face() failed");
+    DEBUG_MSG (FT, font, "reference_ft_library failed");
+    return;
+  }
+
+  FT_Face ft_face = nullptr;
+  if (unlikely (FT_New_Memory_Face (ft_library,
+                                    (const FT_Byte *) blob_data,
+                                    blob_length,
+                                    hb_face_get_index (font->face),
+                                    &ft_face)))
+  {
+    hb_blob_destroy (blob);
+    DEBUG_MSG (FT, font, "FT_New_Memory_Face() failed");
     return;
   }
 
   if (FT_Select_Charmap (ft_face, FT_ENCODING_MS_SYMBOL))
     FT_Select_Charmap (ft_face, FT_ENCODING_UNICODE);
 
-
+  // Hook the blob to the FT_Face
   ft_face->generic.data = blob;
   ft_face->generic.finalizer = _release_blob;
 
+  // And the FT_Library to the blob
+  hb_blob_set_user_data (blob, &ft_library_key, ft_library, destroy_ft_library, true);
+
   _hb_ft_font_set_funcs (font, ft_face, true);
   hb_ft_font_set_load_flags (font, FT_LOAD_DEFAULT | FT_LOAD_NO_HINTING);
 
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-ft.h b/src/java.desktop/share/native/libharfbuzz/hb-ft.h
index b2d148014c0..94952f48a05 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-ft.h
+++ b/src/java.desktop/share/native/libharfbuzz/hb-ft.h
@@ -84,6 +84,9 @@ hb_ft_face_create_cached (FT_Face ft_face);
 HB_EXTERN hb_face_t *
 hb_ft_face_create_referenced (FT_Face ft_face);
 
+HB_EXTERN hb_face_t *
+hb_ft_face_create_from_file_or_fail (const char   *file_name,
+                                     unsigned int  index);
 
 /*
  * hb-font from ft-face.
@@ -108,7 +111,7 @@ HB_EXTERN hb_font_t *
 hb_ft_font_create_referenced (FT_Face ft_face);
 
 HB_EXTERN FT_Face
-hb_ft_font_get_face (hb_font_t *font);
+hb_ft_font_get_ft_face (hb_font_t *font);
 
 HB_EXTERN FT_Face
 hb_ft_font_lock_face (hb_font_t *font);
@@ -139,6 +142,13 @@ hb_ft_hb_font_changed (hb_font_t *font);
 HB_EXTERN void
 hb_ft_font_set_funcs (hb_font_t *font);
 
+#ifndef HB_DISABLE_DEPRECATED
+
+HB_DEPRECATED_FOR (hb_ft_font_get_ft_face)
+HB_EXTERN FT_Face
+hb_ft_font_get_face (hb_font_t *font);
+
+#endif
 
 HB_END_DECLS
 
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-geometry.hh b/src/java.desktop/share/native/libharfbuzz/hb-geometry.hh
new file mode 100644
index 00000000000..e91e371dc0c
--- /dev/null
+++ b/src/java.desktop/share/native/libharfbuzz/hb-geometry.hh
@@ -0,0 +1,293 @@
+/*
+ * Copyright © 2022 Behdad Esfahbod
+ *
+ *  This is part of HarfBuzz, a text shaping library.
+ *
+ * Permission is hereby granted, without written agreement and without
+ * license or royalty fees, to use, copy, modify, and distribute this
+ * software and its documentation for any purpose, provided that the
+ * above copyright notice and the following two paragraphs appear in
+ * all copies of this software.
+ *
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
+ * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
+ * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
+ * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+ * DAMAGE.
+ *
+ * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
+ * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ * FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
+ * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
+ * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
+ */
+#ifndef HB_GEOMETRY_HH
+#define HB_GEOMETRY_HH
+
+#include "hb.hh"
+
+
+struct hb_extents_t
+{
+  hb_extents_t () {}
+  hb_extents_t (float xmin, float ymin, float xmax, float ymax) :
+    xmin (xmin), ymin (ymin), xmax (xmax), ymax (ymax) {}
+
+  bool is_empty () const { return xmin >= xmax || ymin >= ymax; }
+  bool is_void () const { return xmin > xmax; }
+
+  void union_ (const hb_extents_t &o)
+  {
+    xmin = hb_min (xmin, o.xmin);
+    ymin = hb_min (ymin, o.ymin);
+    xmax = hb_max (xmax, o.xmax);
+    ymax = hb_max (ymax, o.ymax);
+  }
+
+  void intersect (const hb_extents_t &o)
+  {
+    xmin = hb_max (xmin, o.xmin);
+    ymin = hb_max (ymin, o.ymin);
+    xmax = hb_min (xmax, o.xmax);
+    ymax = hb_min (ymax, o.ymax);
+  }
+
+  void
+  add_point (float x, float y)
+  {
+    if (unlikely (is_void ()))
+    {
+      xmin = xmax = x;
+      ymin = ymax = y;
+    }
+    else
+    {
+      xmin = hb_min (xmin, x);
+      ymin = hb_min (ymin, y);
+      xmax = hb_max (xmax, x);
+      ymax = hb_max (ymax, y);
+    }
+  }
+
+  float xmin = 0.f;
+  float ymin = 0.f;
+  float xmax = -1.f;
+  float ymax = -1.f;
+};
+
+struct hb_transform_t
+{
+  hb_transform_t () {}
+  hb_transform_t (float xx, float yx,
+                  float xy, float yy,
+                  float x0, float y0) :
+    xx (xx), yx (yx), xy (xy), yy (yy), x0 (x0), y0 (y0) {}
+
+  bool is_identity () const
+  {
+    return xx == 1.f && yx == 0.f &&
+           xy == 0.f && yy == 1.f &&
+           x0 == 0.f && y0 == 0.f;
+  }
+
+  void multiply (const hb_transform_t &o)
+  {
+    /* Copied from cairo, with "o" being "a" there and "this" being "b" there. */
+    hb_transform_t r;
+
+    r.xx = o.xx * xx + o.yx * xy;
+    r.yx = o.xx * yx + o.yx * yy;
+
+    r.xy = o.xy * xx + o.yy * xy;
+    r.yy = o.xy * yx + o.yy * yy;
+
+    r.x0 = o.x0 * xx + o.y0 * xy + x0;
+    r.y0 = o.x0 * yx + o.y0 * yy + y0;
+
+    *this = r;
+  }
+
+  void transform_distance (float &dx, float &dy) const
+  {
+    float new_x = xx * dx + xy * dy;
+    float new_y = yx * dx + yy * dy;
+    dx = new_x;
+    dy = new_y;
+  }
+
+  void transform_point (float &x, float &y) const
+  {
+    transform_distance (x, y);
+    x += x0;
+    y += y0;
+  }
+
+  void transform_extents (hb_extents_t &extents) const
+  {
+    float quad_x[4], quad_y[4];
+
+    quad_x[0] = extents.xmin;
+    quad_y[0] = extents.ymin;
+    quad_x[1] = extents.xmin;
+    quad_y[1] = extents.ymax;
+    quad_x[2] = extents.xmax;
+    quad_y[2] = extents.ymin;
+    quad_x[3] = extents.xmax;
+    quad_y[3] = extents.ymax;
+
+    extents = hb_extents_t {};
+    for (unsigned i = 0; i < 4; i++)
+    {
+      transform_point (quad_x[i], quad_y[i]);
+      extents.add_point (quad_x[i], quad_y[i]);
+    }
+  }
+
+  void transform (const hb_transform_t &o) { multiply (o); }
+
+  void translate (float x, float y)
+  {
+    if (x == 0.f && y == 0.f)
+      return;
+
+    x0 += xx * x + xy * y;
+    y0 += yx * x + yy * y;
+  }
+
+  void scale (float scaleX, float scaleY)
+  {
+    if (scaleX == 1.f && scaleY == 1.f)
+      return;
+
+    xx *= scaleX;
+    yx *= scaleX;
+    xy *= scaleY;
+    yy *= scaleY;
+  }
+
+  void rotate (float rotation)
+  {
+    if (rotation == 0.f)
+      return;
+
+    // https://github.com/fonttools/fonttools/blob/f66ee05f71c8b57b5f519ee975e95edcd1466e14/Lib/fontTools/misc/transform.py#L240
+    rotation = rotation * HB_PI;
+    float c;
+    float s;
+#ifdef HAVE_SINCOSF
+    sincosf (rotation, &s, &c);
+#else
+    c = cosf (rotation);
+    s = sinf (rotation);
+#endif
+    auto other = hb_transform_t{c, s, -s, c, 0.f, 0.f};
+    transform (other);
+  }
+
+  void skew (float skewX, float skewY)
+  {
+    if (skewX == 0.f && skewY == 0.f)
+      return;
+
+    // https://github.com/fonttools/fonttools/blob/f66ee05f71c8b57b5f519ee975e95edcd1466e14/Lib/fontTools/misc/transform.py#L255
+    skewX = skewX * HB_PI;
+    skewY = skewY * HB_PI;
+    auto other = hb_transform_t{1.f,
+                                skewY ? tanf (skewY) : 0.f,
+                                skewX ? tanf (skewX) : 0.f,
+                                1.f,
+                                0.f, 0.f};
+    transform (other);
+  }
+
+  float xx = 1.f;
+  float yx = 0.f;
+  float xy = 0.f;
+  float yy = 1.f;
+  float x0 = 0.f;
+  float y0 = 0.f;
+};
+
+#define HB_TRANSFORM_IDENTITY hb_transform_t{1.f, 0.f, 0.f, 1.f, 0.f, 0.f}
+
+struct hb_bounds_t
+{
+  enum status_t {
+    UNBOUNDED,
+    BOUNDED,
+    EMPTY,
+  };
+
+  hb_bounds_t (status_t status) : status (status) {}
+  hb_bounds_t (const hb_extents_t &extents) :
+    status (extents.is_empty () ? EMPTY : BOUNDED), extents (extents) {}
+
+  void union_ (const hb_bounds_t &o)
+  {
+    if (o.status == UNBOUNDED)
+      status = UNBOUNDED;
+    else if (o.status == BOUNDED)
+    {
+      if (status == EMPTY)
+        *this = o;
+      else if (status == BOUNDED)
+        extents.union_ (o.extents);
+    }
+  }
+
+  void intersect (const hb_bounds_t &o)
+  {
+    if (o.status == EMPTY)
+      status = EMPTY;
+    else if (o.status == BOUNDED)
+    {
+      if (status == UNBOUNDED)
+        *this = o;
+      else if (status == BOUNDED)
+      {
+        extents.intersect (o.extents);
+        if (extents.is_empty ())
+          status = EMPTY;
+      }
+    }
+  }
+
+  status_t status;
+  hb_extents_t extents;
+};
+
+struct hb_transform_decomposed_t
+{
+  float translateX = 0;
+  float translateY = 0;
+  float rotation = 0;  // in degrees, counter-clockwise
+  float scaleX = 1;
+  float scaleY = 1;
+  float skewX = 0;  // in degrees, counter-clockwise
+  float skewY = 0;  // in degrees, counter-clockwise
+  float tCenterX = 0;
+  float tCenterY = 0;
+
+  operator bool () const
+  {
+    return translateX || translateY ||
+           rotation ||
+           scaleX != 1 || scaleY != 1 ||
+           skewX || skewY ||
+           tCenterX || tCenterY;
+  }
+
+  hb_transform_t to_transform () const
+  {
+    hb_transform_t t;
+    t.translate (translateX + tCenterX, translateY + tCenterY);
+    t.rotate (rotation);
+    t.scale (scaleX, scaleY);
+    t.skew (-skewX, skewY);
+    t.translate (-tCenterX, -tCenterY);
+    return t;
+  }
+};
+
+
+#endif /* HB_GEOMETRY_HH */
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-iter.hh b/src/java.desktop/share/native/libharfbuzz/hb-iter.hh
index ad45dcf2c1d..21d9544a74b 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-iter.hh
+++ b/src/java.desktop/share/native/libharfbuzz/hb-iter.hh
@@ -324,6 +324,16 @@ struct hb_is_sink_of
         (hb_is_source_of(Iter, Item) && Iter::is_sorted_iterator)
 
 
+struct
+{
+  template <typename Iterable,
+            hb_requires (hb_is_iterable (Iterable))>
+  unsigned operator () (const Iterable &_) const { return hb_len (hb_iter (_)); }
+
+  unsigned operator () (unsigned _) const { return _; }
+}
+HB_FUNCOBJ (hb_len_of);
+
 /* Range-based 'for' for iterables. */
 
 template <typename Iterable,
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-limits.hh b/src/java.desktop/share/native/libharfbuzz/hb-limits.hh
index 25c1e71e133..fbc7bbe764e 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-limits.hh
+++ b/src/java.desktop/share/native/libharfbuzz/hb-limits.hh
@@ -88,25 +88,24 @@
 #define HB_MAX_LOOKUP_VISIT_COUNT 35000
 #endif
 
+#ifndef HB_MAX_GRAPH_EDGE_COUNT
+#define HB_MAX_GRAPH_EDGE_COUNT 2048
+#endif
 
-#ifndef HB_GLYF_VAR_COMPOSITE_MAX_AXES
-#define HB_GLYF_VAR_COMPOSITE_MAX_AXES 4096
+#ifndef HB_VAR_COMPOSITE_MAX_AXES
+#define HB_VAR_COMPOSITE_MAX_AXES 4096
 #endif
 
 #ifndef HB_GLYF_MAX_POINTS
-#define HB_GLYF_MAX_POINTS 20000
-#endif
-
-#ifndef HB_GLYF_MAX_EDGE_COUNT
-#define HB_GLYF_MAX_EDGE_COUNT 1024
+#define HB_GLYF_MAX_POINTS 200000
 #endif
 
 #ifndef HB_CFF_MAX_OPS
-#define HB_CFF_MAX_OPS 10000
+#define HB_CFF_MAX_OPS 200000
 #endif
 
-#ifndef HB_COLRV1_MAX_EDGE_COUNT
-#define HB_COLRV1_MAX_EDGE_COUNT 65536
+#ifndef HB_MAX_COMPOSITE_OPERATIONS_PER_GLYPH
+#define HB_MAX_COMPOSITE_OPERATIONS_PER_GLYPH 64
 #endif
 
 
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-map.hh b/src/java.desktop/share/native/libharfbuzz/hb-map.hh
index d31323733cc..76206342f57 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-map.hh
+++ b/src/java.desktop/share/native/libharfbuzz/hb-map.hh
@@ -42,13 +42,37 @@ template <typename K, typename V,
           bool minus_one = false>
 struct hb_hashmap_t
 {
+  static constexpr bool realloc_move = true;
+
   hb_hashmap_t ()  { init (); }
   ~hb_hashmap_t () { fini (); }
 
-  hb_hashmap_t (const hb_hashmap_t& o) : hb_hashmap_t () { alloc (o.population); hb_copy (o, *this); }
-  hb_hashmap_t (hb_hashmap_t&& o) : hb_hashmap_t () { hb_swap (*this, o); }
+  hb_hashmap_t (const hb_hashmap_t& o) : hb_hashmap_t ()
+  {
+    if (unlikely (!o.mask)) return;
+
+    if (item_t::is_trivial)
+    {
+      items = (item_t *) hb_malloc (sizeof (item_t) * (o.mask + 1));
+      if (unlikely (!items))
+      {
+        successful = false;
+        return;
+      }
+      population = o.population;
+      occupancy = o.occupancy;
+      mask = o.mask;
+      prime = o.prime;
+      max_chain_length = o.max_chain_length;
+      memcpy (items, o.items, sizeof (item_t) * (mask + 1));
+      return;
+    }
+
+    alloc (o.population); hb_copy (o, *this);
+  }
+  hb_hashmap_t (hb_hashmap_t&& o)  noexcept : hb_hashmap_t () { hb_swap (*this, o); }
   hb_hashmap_t& operator= (const hb_hashmap_t& o)  { reset (); alloc (o.population); hb_copy (o, *this); return *this; }
-  hb_hashmap_t& operator= (hb_hashmap_t&& o)  { hb_swap (*this, o); return *this; }
+  hb_hashmap_t& operator= (hb_hashmap_t&& o)   noexcept { hb_swap (*this, o); return *this; }
 
   hb_hashmap_t (std::initializer_list<hb_pair_t<K, V>> lst) : hb_hashmap_t ()
   {
@@ -113,26 +137,23 @@ struct hb_hashmap_t
   };
 
   hb_object_header_t header;
-  unsigned int successful : 1; /* Allocations successful */
-  unsigned int population : 31; /* Not including tombstones. */
+  bool successful; /* Allocations successful */
+  unsigned short max_chain_length;
+  unsigned int population; /* Not including tombstones. */
   unsigned int occupancy; /* Including tombstones. */
   unsigned int mask;
   unsigned int prime;
-  unsigned int max_chain_length;
   item_t *items;
 
-  friend void swap (hb_hashmap_t& a, hb_hashmap_t& b)
+  friend void swap (hb_hashmap_t& a, hb_hashmap_t& b) noexcept
   {
     if (unlikely (!a.successful || !b.successful))
       return;
-    unsigned tmp = a.population;
-    a.population = b.population;
-    b.population = tmp;
-    //hb_swap (a.population, b.population);
+    hb_swap (a.max_chain_length, b.max_chain_length);
+    hb_swap (a.population, b.population);
     hb_swap (a.occupancy, b.occupancy);
     hb_swap (a.mask, b.mask);
     hb_swap (a.prime, b.prime);
-    hb_swap (a.max_chain_length, b.max_chain_length);
     hb_swap (a.items, b.items);
   }
   void init ()
@@ -140,10 +161,10 @@ struct hb_hashmap_t
     hb_object_init (this);
 
     successful = true;
+    max_chain_length = 0;
     population = occupancy = 0;
     mask = 0;
     prime = 0;
-    max_chain_length = 0;
     items = nullptr;
   }
   void fini ()
@@ -209,9 +230,10 @@ struct hb_hashmap_t
                        old_items[i].hash,
                        std::move (old_items[i].value));
       }
-      if (!item_t::is_trivial)
-        old_items[i].~item_t ();
     }
+    if (!item_t::is_trivial)
+      for (unsigned int i = 0; i < old_size; i++)
+        old_items[i].~item_t ();
 
     hb_free (old_items);
 
@@ -285,7 +307,7 @@ struct hb_hashmap_t
   const V& get_with_hash (const K &key, uint32_t hash) const
   {
     if (!items) return item_t::default_value ();
-    auto *item = fetch_item (key, hb_hash (key));
+    auto *item = fetch_item (key, hash);
     if (item)
       return item->value;
     return item_t::default_value ();
@@ -533,7 +555,7 @@ struct hb_map_t : hb_hashmap_t<hb_codepoint_t,
   ~hb_map_t () = default;
   hb_map_t () : hashmap () {}
   hb_map_t (const hb_map_t &o) : hashmap ((hashmap &) o) {}
-  hb_map_t (hb_map_t &&o) : hashmap (std::move ((hashmap &) o)) {}
+  hb_map_t (hb_map_t &&o)  noexcept : hashmap (std::move ((hashmap &) o)) {}
   hb_map_t& operator= (const hb_map_t&) = default;
   hb_map_t& operator= (hb_map_t&&) = default;
   hb_map_t (std::initializer_list<hb_codepoint_pair_t> lst) : hashmap (lst) {}
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-null.hh b/src/java.desktop/share/native/libharfbuzz/hb-null.hh
index 4a5270e3400..63ec9a7c64d 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-null.hh
+++ b/src/java.desktop/share/native/libharfbuzz/hb-null.hh
@@ -176,7 +176,7 @@ template <typename Type>
 static inline Type& Crap () {
   static_assert (hb_null_size (Type) <= HB_NULL_POOL_SIZE, "Increase HB_NULL_POOL_SIZE.");
   Type *obj = reinterpret_cast<Type *> (_hb_CrapPool);
-  memcpy (obj, std::addressof (Null (Type)), sizeof (*obj));
+  memcpy (reinterpret_cast<void*>(obj), std::addressof (Null (Type)), sizeof (*obj));
   return *obj;
 }
 template <typename QType>
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-object.hh b/src/java.desktop/share/native/libharfbuzz/hb-object.hh
index ef675f835f1..c02ec8bfacf 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-object.hh
+++ b/src/java.desktop/share/native/libharfbuzz/hb-object.hh
@@ -325,7 +325,7 @@ retry:
   hb_user_data_array_t *user_data = obj->header.user_data.get_acquire ();
   if (unlikely (!user_data))
   {
-    user_data = (hb_user_data_array_t *) hb_calloc (sizeof (hb_user_data_array_t), 1);
+    user_data = (hb_user_data_array_t *) hb_calloc (1, sizeof (hb_user_data_array_t));
     if (unlikely (!user_data))
       return false;
     user_data->init ();
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-open-file.hh b/src/java.desktop/share/native/libharfbuzz/hb-open-file.hh
index 387b1430ac1..382ee2ddaf2 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-open-file.hh
+++ b/src/java.desktop/share/native/libharfbuzz/hb-open-file.hh
@@ -250,7 +250,7 @@ struct TTCHeader
   {
     switch (u.header.version.major) {
     case 2: /* version 2 is compatible with version 1 */
-    case 1: return u.version1.get_face_count ();
+    case 1: hb_barrier (); return u.version1.get_face_count ();
     default:return 0;
     }
   }
@@ -258,7 +258,7 @@ struct TTCHeader
   {
     switch (u.header.version.major) {
     case 2: /* version 2 is compatible with version 1 */
-    case 1: return u.version1.get_face (i);
+    case 1: hb_barrier (); return u.version1.get_face (i);
     default:return Null (OpenTypeFontFace);
     }
   }
@@ -267,9 +267,10 @@ struct TTCHeader
   {
     TRACE_SANITIZE (this);
     if (unlikely (!u.header.version.sanitize (c))) return_trace (false);
+    hb_barrier ();
     switch (u.header.version.major) {
     case 2: /* version 2 is compatible with version 1 */
-    case 1: return_trace (u.version1.sanitize (c));
+    case 1: hb_barrier (); return_trace (u.version1.sanitize (c));
     default:return_trace (true);
     }
   }
@@ -302,6 +303,7 @@ struct ResourceRecord
     TRACE_SANITIZE (this);
     return_trace (c->check_struct (this) &&
                   offset.sanitize (c, data_base) &&
+                  hb_barrier () &&
                   get_face (data_base).sanitize (c));
   }
 
@@ -337,6 +339,7 @@ struct ResourceTypeRecord
   {
     TRACE_SANITIZE (this);
     return_trace (c->check_struct (this) &&
+                  hb_barrier () &&
                   resourcesZ.sanitize (c, type_base,
                                        get_resource_count (),
                                        data_base));
@@ -385,6 +388,7 @@ struct ResourceMap
   {
     TRACE_SANITIZE (this);
     return_trace (c->check_struct (this) &&
+                  hb_barrier () &&
                   typeList.sanitize (c, this,
                                      &(this+typeList),
                                      data_base));
@@ -428,6 +432,7 @@ struct ResourceForkHeader
   {
     TRACE_SANITIZE (this);
     return_trace (c->check_struct (this) &&
+                  hb_barrier () &&
                   data.sanitize (c, this, dataLen) &&
                   map.sanitize (c, this, &(this+data)));
   }
@@ -508,6 +513,7 @@ struct OpenTypeFontFile
   {
     TRACE_SANITIZE (this);
     if (unlikely (!u.tag.sanitize (c))) return_trace (false);
+    hb_barrier ();
     switch (u.tag) {
     case CFFTag:        /* All the non-collection tags */
     case TrueTag:
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-open-type.hh b/src/java.desktop/share/native/libharfbuzz/hb-open-type.hh
index 25142da44a6..89da9c7bc95 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-open-type.hh
+++ b/src/java.desktop/share/native/libharfbuzz/hb-open-type.hh
@@ -86,21 +86,12 @@ struct IntType
 
     return pb->cmp (*pa);
   }
-  template <typename Type2,
-            hb_enable_if (std::is_integral<Type2>::value &&
-                          sizeof (Type2) < sizeof (int) &&
-                          sizeof (Type) < sizeof (int))>
-  int cmp (Type2 a) const
-  {
-    Type b = v;
-    return (int) a - (int) b;
-  }
   template <typename Type2,
             hb_enable_if (hb_is_convertible (Type2, Type))>
   int cmp (Type2 a) const
   {
     Type b = v;
-    return a < b ? -1 : a == b ? 0 : +1;
+    return (a > b) - (a < b);
   }
   bool sanitize (hb_sanitize_context_t *c) const
   {
@@ -132,6 +123,89 @@ struct HBUINT15 : HBUINT16
   DEFINE_SIZE_STATIC (2);
 };
 
+/* 32-bit unsigned integer with variable encoding. */
+struct HBUINT32VAR
+{
+  unsigned get_size () const
+  {
+    unsigned b0 = v[0];
+    if (b0 < 0x80)
+      return 1;
+    else if (b0 < 0xC0)
+      return 2;
+    else if (b0 < 0xE0)
+      return 3;
+    else if (b0 < 0xF0)
+      return 4;
+    else
+      return 5;
+  }
+
+  static unsigned get_size (uint32_t v)
+  {
+    if (v < 0x80)
+      return 1;
+    else if (v < 0x4000)
+      return 2;
+    else if (v < 0x200000)
+      return 3;
+    else if (v < 0x10000000)
+      return 4;
+    else
+      return 5;
+  }
+
+  bool sanitize (hb_sanitize_context_t *c) const
+  {
+    TRACE_SANITIZE (this);
+    return_trace (c->check_range (v, 1) &&
+                  hb_barrier () &&
+                  c->check_range (v, get_size ()));
+  }
+
+  operator uint32_t () const
+  {
+    unsigned b0 = v[0];
+    if (b0 < 0x80)
+      return b0;
+    else if (b0 < 0xC0)
+      return ((b0 & 0x3F) << 8) | v[1];
+    else if (b0 < 0xE0)
+      return ((b0 & 0x1F) << 16) | (v[1] << 8) | v[2];
+    else if (b0 < 0xF0)
+      return ((b0 & 0x0F) << 24) | (v[1] << 16) | (v[2] << 8) | v[3];
+    else
+      return (v[1] << 24) | (v[2] << 16) | (v[3] << 8) | v[4];
+  }
+
+  static bool serialize (hb_serialize_context_t *c, uint32_t v)
+  {
+    unsigned len = get_size (v);
+
+    unsigned char *buf = c->allocate_size<unsigned char> (len, false);
+    if (unlikely (!buf))
+      return false;
+
+    unsigned char *p = buf + len;
+    for (unsigned i = 0; i < len; i++)
+    {
+      *--p = v & 0xFF;
+      v >>= 8;
+    }
+
+    if (len > 1)
+      buf[0] |= ((1 << (len - 1)) - 1) << (9 - len);
+
+    return true;
+  }
+
+  protected:
+  unsigned char v[5];
+
+  public:
+  DEFINE_SIZE_MIN (1);
+};
+
 /* 16-bit signed integer (HBINT16) that describes a quantity in FUnits. */
 typedef HBINT16 FWORD;
 
@@ -149,6 +223,7 @@ struct HBFixed : Type
 
   operator signed () const = delete;
   operator unsigned () const = delete;
+  explicit operator float () const { return to_float (); }
   typename Type::type to_int () const { return Type::v; }
   void set_int (typename Type::type i ) { Type::v = i; }
   float to_float (float offset = 0) const  { return ((int32_t) Type::v + offset) / shift; }
@@ -215,11 +290,6 @@ typedef Index NameID;
 struct VarIdx : HBUINT32 {
   static constexpr unsigned NO_VARIATION = 0xFFFFFFFFu;
   static_assert (NO_VARIATION == HB_OT_LAYOUT_NO_VARIATIONS_INDEX, "");
-  static uint32_t add (uint32_t i, unsigned short v)
-  {
-    if (i == NO_VARIATION) return i;
-    return i + v;
-  }
   VarIdx& operator = (uint32_t i) { HBUINT32::operator= (i); return *this; }
 };
 DECLARE_NULL_NAMESPACE_BYTES (OT, VarIdx);
@@ -309,7 +379,7 @@ struct _hb_has_null<Type, true>
   static       Type *get_crap () { return &Crap (Type); }
 };
 
-template <typename Type, typename OffsetType, bool has_null=true>
+template <typename Type, typename OffsetType, typename BaseType=void, bool has_null=true>
 struct OffsetTo : Offset<OffsetType, has_null>
 {
   using target_t = Type;
@@ -335,22 +405,22 @@ struct OffsetTo : Offset<OffsetType, has_null>
   }
 
   template <typename Base,
-            hb_enable_if (hb_is_convertible (const Base, const void *))>
+            hb_enable_if (hb_is_convertible (const Base, const BaseType *))>
   friend const Type& operator + (const Base &base, const OffsetTo &offset) { return offset ((const void *) base); }
   template <typename Base,
-            hb_enable_if (hb_is_convertible (const Base, const void *))>
+            hb_enable_if (hb_is_convertible (const Base, const BaseType *))>
   friend const Type& operator + (const OffsetTo &offset, const Base &base) { return offset ((const void *) base); }
   template <typename Base,
-            hb_enable_if (hb_is_convertible (Base, void *))>
+            hb_enable_if (hb_is_convertible (Base, BaseType *))>
   friend Type& operator + (Base &&base, OffsetTo &offset) { return offset ((void *) base); }
   template <typename Base,
-            hb_enable_if (hb_is_convertible (Base, void *))>
+            hb_enable_if (hb_is_convertible (Base, BaseType *))>
   friend Type& operator + (OffsetTo &offset, Base &&base) { return offset ((void *) base); }
 
 
-  template <typename ...Ts>
+  template <typename Base, typename ...Ts>
   bool serialize_subset (hb_subset_context_t *c, const OffsetTo& src,
-                         const void *src_base, Ts&&... ds)
+                         const Base *src_base, Ts&&... ds)
   {
     *this = 0;
     if (src.is_null ())
@@ -414,10 +484,11 @@ struct OffsetTo : Offset<OffsetType, has_null>
                        const void *src_base, unsigned dst_bias = 0)
   { return serialize_copy (c, src, src_base, dst_bias, hb_serialize_context_t::Head); }
 
-  bool sanitize_shallow (hb_sanitize_context_t *c, const void *base) const
+  bool sanitize_shallow (hb_sanitize_context_t *c, const BaseType *base) const
   {
     TRACE_SANITIZE (this);
     if (unlikely (!c->check_struct (this))) return_trace (false);
+    hb_barrier ();
     //if (unlikely (this->is_null ())) return_trace (true);
     if (unlikely ((const char *) base + (unsigned) *this < (const char *) base)) return_trace (false);
     return_trace (true);
@@ -427,10 +498,11 @@ struct OffsetTo : Offset<OffsetType, has_null>
 #ifndef HB_OPTIMIZE_SIZE
   HB_ALWAYS_INLINE
 #endif
-  bool sanitize (hb_sanitize_context_t *c, const void *base, Ts&&... ds) const
+  bool sanitize (hb_sanitize_context_t *c, const BaseType *base, Ts&&... ds) const
   {
     TRACE_SANITIZE (this);
     return_trace (sanitize_shallow (c, base) &&
+                  hb_barrier () &&
                   (this->is_null () ||
                    c->dispatch (StructAtOffset<Type> (base, *this), std::forward<Ts> (ds)...) ||
                    neuter (c)));
@@ -445,14 +517,14 @@ struct OffsetTo : Offset<OffsetType, has_null>
   DEFINE_SIZE_STATIC (sizeof (OffsetType));
 };
 /* Partial specializations. */
-template <typename Type, bool has_null=true> using Offset16To = OffsetTo<Type, HBUINT16, has_null>;
-template <typename Type, bool has_null=true> using Offset24To = OffsetTo<Type, HBUINT24, has_null>;
-template <typename Type, bool has_null=true> using Offset32To = OffsetTo<Type, HBUINT32, has_null>;
+template <typename Type, typename BaseType=void, bool has_null=true> using Offset16To = OffsetTo<Type, HBUINT16, BaseType, has_null>;
+template <typename Type, typename BaseType=void, bool has_null=true> using Offset24To = OffsetTo<Type, HBUINT24, BaseType, has_null>;
+template <typename Type, typename BaseType=void, bool has_null=true> using Offset32To = OffsetTo<Type, HBUINT32, BaseType, has_null>;
 
-template <typename Type, typename OffsetType> using NNOffsetTo = OffsetTo<Type, OffsetType, false>;
-template <typename Type> using NNOffset16To = Offset16To<Type, false>;
-template <typename Type> using NNOffset24To = Offset24To<Type, false>;
-template <typename Type> using NNOffset32To = Offset32To<Type, false>;
+template <typename Type, typename OffsetType, typename BaseType=void> using NNOffsetTo = OffsetTo<Type, OffsetType, BaseType, false>;
+template <typename Type, typename BaseType=void> using NNOffset16To = Offset16To<Type, BaseType, false>;
+template <typename Type, typename BaseType=void> using NNOffset24To = Offset24To<Type, BaseType, false>;
+template <typename Type, typename BaseType=void> using NNOffset32To = Offset32To<Type, BaseType, false>;
 
 
 /*
@@ -536,6 +608,7 @@ struct UnsizedArrayOf
     TRACE_SANITIZE (this);
     if (unlikely (!sanitize_shallow (c, count))) return_trace (false);
     if (!sizeof... (Ts) && hb_is_trivially_copyable(Type)) return_trace (true);
+    hb_barrier ();
     for (unsigned int i = 0; i < count; i++)
       if (unlikely (!c->dispatch (arrayZ[i], std::forward<Ts> (ds)...)))
         return_trace (false);
@@ -555,27 +628,27 @@ struct UnsizedArrayOf
 };
 
 /* Unsized array of offset's */
-template <typename Type, typename OffsetType, bool has_null=true>
-using UnsizedArray16OfOffsetTo = UnsizedArrayOf<OffsetTo<Type, OffsetType, has_null>>;
+template <typename Type, typename OffsetType, typename BaseType=void, bool has_null=true>
+using UnsizedArray16OfOffsetTo = UnsizedArrayOf<OffsetTo<Type, OffsetType, BaseType, has_null>>;
 
 /* Unsized array of offsets relative to the beginning of the array itself. */
-template <typename Type, typename OffsetType, bool has_null=true>
-struct UnsizedListOfOffset16To : UnsizedArray16OfOffsetTo<Type, OffsetType, has_null>
+template <typename Type, typename OffsetType, typename BaseType=void, bool has_null=true>
+struct UnsizedListOfOffset16To : UnsizedArray16OfOffsetTo<Type, OffsetType, BaseType, has_null>
 {
   const Type& operator [] (int i_) const
   {
     unsigned int i = (unsigned int) i_;
-    const OffsetTo<Type, OffsetType, has_null> *p = &this->arrayZ[i];
+    const OffsetTo<Type, OffsetType, BaseType, has_null> *p = &this->arrayZ[i];
     if (unlikely ((const void *) p < (const void *) this->arrayZ)) return Null (Type); /* Overflowed. */
-    _hb_compiler_memory_r_barrier ();
+    hb_barrier ();
     return this+*p;
   }
   Type& operator [] (int i_)
   {
     unsigned int i = (unsigned int) i_;
-    const OffsetTo<Type, OffsetType, has_null> *p = &this->arrayZ[i];
+    const OffsetTo<Type, OffsetType, BaseType, has_null> *p = &this->arrayZ[i];
     if (unlikely ((const void *) p < (const void *) this->arrayZ)) return Crap (Type); /* Overflowed. */
-    _hb_compiler_memory_r_barrier ();
+    hb_barrier ();
     return this+*p;
   }
 
@@ -583,7 +656,7 @@ struct UnsizedListOfOffset16To : UnsizedArray16OfOffsetTo<Type, OffsetType, has_
   bool sanitize (hb_sanitize_context_t *c, unsigned int count, Ts&&... ds) const
   {
     TRACE_SANITIZE (this);
-    return_trace ((UnsizedArray16OfOffsetTo<Type, OffsetType, has_null>
+    return_trace ((UnsizedArray16OfOffsetTo<Type, OffsetType, BaseType, has_null>
                    ::sanitize (c, count, this, std::forward<Ts> (ds)...)));
   }
 };
@@ -626,14 +699,14 @@ struct ArrayOf
   {
     unsigned int i = (unsigned int) i_;
     if (unlikely (i >= len)) return Null (Type);
-    _hb_compiler_memory_r_barrier ();
+    hb_barrier ();
     return arrayZ[i];
   }
   Type& operator [] (int i_)
   {
     unsigned int i = (unsigned int) i_;
     if (unlikely (i >= len)) return Crap (Type);
-    _hb_compiler_memory_r_barrier ();
+    hb_barrier ();
     return arrayZ[i];
   }
 
@@ -725,6 +798,7 @@ struct ArrayOf
     TRACE_SANITIZE (this);
     if (unlikely (!sanitize_shallow (c))) return_trace (false);
     if (!sizeof... (Ts) && hb_is_trivially_copyable(Type)) return_trace (true);
+    hb_barrier ();
     unsigned int count = len;
     for (unsigned int i = 0; i < count; i++)
       if (unlikely (!c->dispatch (arrayZ[i], std::forward<Ts> (ds)...)))
@@ -735,7 +809,9 @@ struct ArrayOf
   bool sanitize_shallow (hb_sanitize_context_t *c) const
   {
     TRACE_SANITIZE (this);
-    return_trace (len.sanitize (c) && c->check_array_sized (arrayZ, len, sizeof (LenType)));
+    return_trace (len.sanitize (c) &&
+                  hb_barrier () &&
+                  c->check_array_sized (arrayZ, len, sizeof (LenType)));
   }
 
   public:
@@ -750,6 +826,7 @@ template <typename Type> using Array32Of = ArrayOf<Type, HBUINT32>;
 using PString = ArrayOf<HBUINT8, HBUINT8>;
 
 /* Array of Offset's */
+template <typename Type> using Array8OfOffset24To = ArrayOf<OffsetTo<Type, HBUINT24>, HBUINT8>;
 template <typename Type> using Array16OfOffset16To = ArrayOf<OffsetTo<Type, HBUINT16>, HBUINT16>;
 template <typename Type> using Array16OfOffset32To = ArrayOf<OffsetTo<Type, HBUINT32>, HBUINT16>;
 template <typename Type> using Array32OfOffset32To = ArrayOf<OffsetTo<Type, HBUINT32>, HBUINT32>;
@@ -762,14 +839,14 @@ struct List16OfOffsetTo : ArrayOf<OffsetTo<Type, OffsetType>, HBUINT16>
   {
     unsigned int i = (unsigned int) i_;
     if (unlikely (i >= this->len)) return Null (Type);
-    _hb_compiler_memory_r_barrier ();
+    hb_barrier ();
     return this+this->arrayZ[i];
   }
   const Type& operator [] (int i_)
   {
     unsigned int i = (unsigned int) i_;
     if (unlikely (i >= this->len)) return Crap (Type);
-    _hb_compiler_memory_r_barrier ();
+    hb_barrier ();
     return this+this->arrayZ[i];
   }
 
@@ -807,14 +884,14 @@ struct HeadlessArrayOf
   {
     unsigned int i = (unsigned int) i_;
     if (unlikely (i >= lenP1 || !i)) return Null (Type);
-    _hb_compiler_memory_r_barrier ();
+    hb_barrier ();
     return arrayZ[i-1];
   }
   Type& operator [] (int i_)
   {
     unsigned int i = (unsigned int) i_;
     if (unlikely (i >= lenP1 || !i)) return Crap (Type);
-    _hb_compiler_memory_r_barrier ();
+    hb_barrier ();
     return arrayZ[i-1];
   }
   unsigned int get_size () const
@@ -866,6 +943,7 @@ struct HeadlessArrayOf
     TRACE_SANITIZE (this);
     if (unlikely (!sanitize_shallow (c))) return_trace (false);
     if (!sizeof... (Ts) && hb_is_trivially_copyable(Type)) return_trace (true);
+    hb_barrier ();
     unsigned int count = get_length ();
     for (unsigned int i = 0; i < count; i++)
       if (unlikely (!c->dispatch (arrayZ[i], std::forward<Ts> (ds)...)))
@@ -878,6 +956,7 @@ struct HeadlessArrayOf
   {
     TRACE_SANITIZE (this);
     return_trace (lenP1.sanitize (c) &&
+                  hb_barrier () &&
                   (!lenP1 || c->check_array_sized (arrayZ, lenP1 - 1, sizeof (LenType))));
   }
 
@@ -899,14 +978,14 @@ struct ArrayOfM1
   {
     unsigned int i = (unsigned int) i_;
     if (unlikely (i > lenM1)) return Null (Type);
-    _hb_compiler_memory_r_barrier ();
+    hb_barrier ();
     return arrayZ[i];
   }
   Type& operator [] (int i_)
   {
     unsigned int i = (unsigned int) i_;
     if (unlikely (i > lenM1)) return Crap (Type);
-    _hb_compiler_memory_r_barrier ();
+    hb_barrier ();
     return arrayZ[i];
   }
   unsigned int get_size () const
@@ -919,6 +998,7 @@ struct ArrayOfM1
     TRACE_SANITIZE (this);
     if (unlikely (!sanitize_shallow (c))) return_trace (false);
     if (!sizeof... (Ts) && hb_is_trivially_copyable(Type)) return_trace (true);
+    hb_barrier ();
     unsigned int count = lenM1 + 1;
     for (unsigned int i = 0; i < count; i++)
       if (unlikely (!c->dispatch (arrayZ[i], std::forward<Ts> (ds)...)))
@@ -931,6 +1011,7 @@ struct ArrayOfM1
   {
     TRACE_SANITIZE (this);
     return_trace (lenM1.sanitize (c) &&
+                  hb_barrier () &&
                   (c->check_array_sized (arrayZ, lenM1 + 1, sizeof (LenType))));
   }
 
@@ -975,6 +1056,13 @@ struct SortedArrayOf : ArrayOf<Type, LenType>
     return_trace (ret);
   }
 
+  SortedArrayOf* copy (hb_serialize_context_t *c) const
+  {
+    TRACE_SERIALIZE (this);
+    SortedArrayOf* out = reinterpret_cast<SortedArrayOf *> (ArrayOf<Type, LenType>::copy (c));
+    return_trace (out);
+  }
+
   template <typename T>
   Type &bsearch (const T &x, Type &not_found = Crap (Type))
   { return *as_array ().bsearch (x, &not_found); }
@@ -1082,14 +1170,14 @@ struct VarSizedBinSearchArrayOf
   {
     unsigned int i = (unsigned int) i_;
     if (unlikely (i >= get_length ())) return Null (Type);
-    _hb_compiler_memory_r_barrier ();
+    hb_barrier ();
     return StructAtOffset<Type> (&bytesZ, i * header.unitSize);
   }
   Type& operator [] (int i_)
   {
     unsigned int i = (unsigned int) i_;
     if (unlikely (i >= get_length ())) return Crap (Type);
-    _hb_compiler_memory_r_barrier ();
+    hb_barrier ();
     return StructAtOffset<Type> (&bytesZ, i * header.unitSize);
   }
   unsigned int get_length () const
@@ -1104,6 +1192,7 @@ struct VarSizedBinSearchArrayOf
     TRACE_SANITIZE (this);
     if (unlikely (!sanitize_shallow (c))) return_trace (false);
     if (!sizeof... (Ts) && hb_is_trivially_copyable(Type)) return_trace (true);
+    hb_barrier ();
     unsigned int count = get_length ();
     for (unsigned int i = 0; i < count; i++)
       if (unlikely (!(*this)[i].sanitize (c, std::forward<Ts> (ds)...)))
@@ -1130,6 +1219,7 @@ struct VarSizedBinSearchArrayOf
   {
     TRACE_SANITIZE (this);
     return_trace (header.sanitize (c) &&
+                  hb_barrier () &&
                   Type::static_size <= header.unitSize &&
                   c->check_range (bytesZ.arrayZ,
                                   header.nUnits,
@@ -1144,6 +1234,800 @@ struct VarSizedBinSearchArrayOf
 };
 
 
+/* CFF INDEX */
+
+template <typename COUNT>
+struct CFFIndex
+{
+  unsigned int offset_array_size () const
+  { return offSize * (count + 1); }
+
+  template <typename Iterable,
+            hb_requires (hb_is_iterable (Iterable))>
+  bool serialize (hb_serialize_context_t *c,
+                  const Iterable &iterable,
+                  const unsigned *p_data_size = nullptr,
+                  unsigned min_off_size = 0)
+  {
+    TRACE_SERIALIZE (this);
+    unsigned data_size;
+    if (p_data_size)
+      data_size = *p_data_size;
+    else
+      total_size (iterable, &data_size);
+
+    auto it = hb_iter (iterable);
+    if (unlikely (!serialize_header (c, +it, data_size, min_off_size))) return_trace (false);
+    unsigned char *ret = c->allocate_size<unsigned char> (data_size, false);
+    if (unlikely (!ret)) return_trace (false);
+    for (const auto &_ : +it)
+    {
+      unsigned len = _.length;
+      if (!len)
+        continue;
+      if (len <= 1)
+      {
+        *ret++ = *_.arrayZ;
+        continue;
+      }
+      hb_memcpy (ret, _.arrayZ, len);
+      ret += len;
+    }
+    return_trace (true);
+  }
+
+  template <typename Iterator,
+            hb_requires (hb_is_iterator (Iterator))>
+  bool serialize_header (hb_serialize_context_t *c,
+                         Iterator it,
+                         unsigned data_size,
+                         unsigned min_off_size = 0)
+  {
+    TRACE_SERIALIZE (this);
+
+    unsigned off_size = (hb_bit_storage (data_size + 1) + 7) / 8;
+    off_size = hb_max(min_off_size, off_size);
+
+    /* serialize CFFIndex header */
+    if (unlikely (!c->extend_min (this))) return_trace (false);
+    this->count = hb_len (it);
+    if (!this->count) return_trace (true);
+    if (unlikely (!c->extend (this->offSize))) return_trace (false);
+    this->offSize = off_size;
+    if (unlikely (!c->allocate_size<HBUINT8> (off_size * (this->count + 1), false)))
+      return_trace (false);
+
+    /* serialize indices */
+    unsigned int offset = 1;
+    if (HB_OPTIMIZE_SIZE_VAL)
+    {
+      unsigned int i = 0;
+      for (const auto &_ : +it)
+      {
+        set_offset_at (i++, offset);
+        offset += hb_len_of (_);
+      }
+      set_offset_at (i, offset);
+    }
+    else
+      switch (off_size)
+      {
+        case 1:
+        {
+          HBUINT8 *p = (HBUINT8 *) offsets;
+          for (const auto &_ : +it)
+          {
+            *p++ = offset;
+            offset += hb_len_of (_);
+          }
+          *p = offset;
+        }
+        break;
+        case 2:
+        {
+          HBUINT16 *p = (HBUINT16 *) offsets;
+          for (const auto &_ : +it)
+          {
+            *p++ = offset;
+            offset += hb_len_of (_);
+          }
+          *p = offset;
+        }
+        break;
+        case 3:
+        {
+          HBUINT24 *p = (HBUINT24 *) offsets;
+          for (const auto &_ : +it)
+          {
+            *p++ = offset;
+            offset += hb_len_of (_);
+          }
+          *p = offset;
+        }
+        break;
+        case 4:
+        {
+          HBUINT32 *p = (HBUINT32 *) offsets;
+          for (const auto &_ : +it)
+          {
+            *p++ = offset;
+            offset += hb_len_of (_);
+          }
+          *p = offset;
+        }
+        break;
+        default:
+        break;
+      }
+
+    assert (offset == data_size + 1);
+    return_trace (true);
+  }
+
+  template <typename Iterable,
+            hb_requires (hb_is_iterable (Iterable))>
+  static unsigned total_size (const Iterable &iterable, unsigned *data_size = nullptr, unsigned min_off_size = 0)
+  {
+    auto it = + hb_iter (iterable);
+    if (!it)
+    {
+      if (data_size) *data_size = 0;
+      return min_size;
+    }
+
+    unsigned total = 0;
+    for (const auto &_ : +it)
+      total += hb_len_of (_);
+
+    if (data_size) *data_size = total;
+
+    unsigned off_size = (hb_bit_storage (total + 1) + 7) / 8;
+    off_size = hb_max(min_off_size, off_size);
+
+    return min_size + HBUINT8::static_size + (hb_len (it) + 1) * off_size + total;
+  }
+
+  void set_offset_at (unsigned int index, unsigned int offset)
+  {
+    assert (index <= count);
+
+    unsigned int size = offSize;
+    const HBUINT8 *p = offsets;
+    switch (size)
+    {
+      case 1: ((HBUINT8  *) p)[index] = offset; break;
+      case 2: ((HBUINT16 *) p)[index] = offset; break;
+      case 3: ((HBUINT24 *) p)[index] = offset; break;
+      case 4: ((HBUINT32 *) p)[index] = offset; break;
+      default: return;
+    }
+  }
+
+  private:
+  unsigned int offset_at (unsigned int index) const
+  {
+    assert (index <= count);
+
+    unsigned int size = offSize;
+    const HBUINT8 *p = offsets;
+    switch (size)
+    {
+      case 1: return ((HBUINT8  *) p)[index];
+      case 2: return ((HBUINT16 *) p)[index];
+      case 3: return ((HBUINT24 *) p)[index];
+      case 4: return ((HBUINT32 *) p)[index];
+      default: return 0;
+    }
+  }
+
+  const unsigned char *data_base () const
+  { return (const unsigned char *) this + min_size + offSize.static_size - 1 + offset_array_size (); }
+  public:
+
+  hb_ubytes_t operator [] (unsigned int index) const
+  {
+    if (unlikely (index >= count)) return hb_ubytes_t ();
+    hb_barrier ();
+    unsigned offset0 = offset_at (index);
+    unsigned offset1 = offset_at (index + 1);
+    if (unlikely (offset1 < offset0 || offset1 > offset_at (count)))
+      return hb_ubytes_t ();
+    return hb_ubytes_t (data_base () + offset0, offset1 - offset0);
+  }
+
+  unsigned int get_size () const
+  {
+    if (count)
+      return min_size + offSize.static_size + offset_array_size () + (offset_at (count) - 1);
+    return min_size;  /* empty CFFIndex contains count only */
+  }
+
+  bool sanitize (hb_sanitize_context_t *c) const
+  {
+    TRACE_SANITIZE (this);
+    return_trace (likely (c->check_struct (this) &&
+                          hb_barrier () &&
+                          (count == 0 || /* empty INDEX */
+                           (count < count + 1u &&
+                            c->check_struct (&offSize) && offSize >= 1 && offSize <= 4 &&
+                            c->check_array (offsets, offSize, count + 1u) &&
+                            c->check_range (data_base (), offset_at (count))))));
+  }
+
+  public:
+  COUNT         count;          /* Number of object data. Note there are (count+1) offsets */
+  private:
+  HBUINT8       offSize;        /* The byte size of each offset in the offsets array. */
+  HBUINT8       offsets[HB_VAR_ARRAY];
+                                /* The array of (count + 1) offsets into objects array (1-base). */
+  /* HBUINT8 data[HB_VAR_ARRAY];        Object data */
+  public:
+  DEFINE_SIZE_MIN (COUNT::static_size);
+};
+typedef CFFIndex<HBUINT16> CFF1Index;
+typedef CFFIndex<HBUINT32> CFF2Index;
+
+
+/* TupleValues */
+struct TupleValues
+{
+  enum packed_value_flag_t
+  {
+    VALUES_ARE_ZEROS     = 0x80,
+    VALUES_ARE_BYTES     = 0x00,
+    VALUES_ARE_WORDS     = 0x40,
+    VALUES_ARE_LONGS     = 0xC0,
+    VALUES_SIZE_MASK     = 0xC0,
+    VALUE_RUN_COUNT_MASK = 0x3F
+  };
+
+  static unsigned compile (hb_array_t<const int> values, /* IN */
+                           hb_array_t<unsigned char> encoded_bytes /* OUT */)
+  {
+    unsigned num_values = values.length;
+    unsigned encoded_len = 0;
+    unsigned i = 0;
+    while (i < num_values)
+    {
+      int val = values.arrayZ[i];
+      if (val == 0)
+        encoded_len += encode_value_run_as_zeroes (i, encoded_bytes.sub_array (encoded_len), values);
+      else if (val >= -128 && val <= 127)
+        encoded_len += encode_value_run_as_bytes (i, encoded_bytes.sub_array (encoded_len), values);
+      else if (val >= -32768 && val <= 32767)
+        encoded_len += encode_value_run_as_words (i, encoded_bytes.sub_array (encoded_len), values);
+      else
+        encoded_len += encode_value_run_as_longs (i, encoded_bytes.sub_array (encoded_len), values);
+    }
+    return encoded_len;
+  }
+
+  static unsigned encode_value_run_as_zeroes (unsigned& i,
+                                              hb_array_t<unsigned char> encoded_bytes,
+                                              hb_array_t<const int> values)
+  {
+    unsigned num_values = values.length;
+    unsigned run_length = 0;
+    auto it = encoded_bytes.iter ();
+    unsigned encoded_len = 0;
+    while (i < num_values && values.arrayZ[i] == 0)
+    {
+      i++;
+      run_length++;
+    }
+
+    while (run_length >= 64)
+    {
+      *it++ = char (VALUES_ARE_ZEROS | 63);
+      run_length -= 64;
+      encoded_len++;
+    }
+
+    if (run_length)
+    {
+      *it++ = char (VALUES_ARE_ZEROS | (run_length - 1));
+      encoded_len++;
+    }
+    return encoded_len;
+  }
+
+  static unsigned encode_value_run_as_bytes (unsigned &i,
+                                             hb_array_t<unsigned char> encoded_bytes,
+                                             hb_array_t<const int> values)
+  {
+    unsigned start = i;
+    unsigned num_values = values.length;
+    while (i < num_values)
+    {
+      int val = values.arrayZ[i];
+      if (val > 127 || val < -128)
+        break;
+
+      /* from fonttools: if there're 2 or more zeros in a sequence,
+       * it is better to start a new run to save bytes. */
+      if (val == 0 && i + 1 < num_values && values.arrayZ[i+1] == 0)
+        break;
+
+      i++;
+    }
+    unsigned run_length = i - start;
+
+    unsigned encoded_len = 0;
+    auto it = encoded_bytes.iter ();
+
+    while (run_length >= 64)
+    {
+      *it++ = (VALUES_ARE_BYTES | 63);
+      encoded_len++;
+
+      for (unsigned j = 0; j < 64; j++)
+      {
+        *it++ = static_cast<char> (values.arrayZ[start + j]);
+        encoded_len++;
+      }
+
+      start += 64;
+      run_length -= 64;
+    }
+
+    if (run_length)
+    {
+      *it++ = (VALUES_ARE_BYTES | (run_length - 1));
+      encoded_len++;
+
+      while (start < i)
+      {
+        *it++ = static_cast<char> (values.arrayZ[start++]);
+        encoded_len++;
+      }
+    }
+
+    return encoded_len;
+  }
+
+  static unsigned encode_value_run_as_words (unsigned &i,
+                                             hb_array_t<unsigned char> encoded_bytes,
+                                             hb_array_t<const int> values)
+  {
+    unsigned start = i;
+    unsigned num_values = values.length;
+    while (i < num_values)
+    {
+      int val = values.arrayZ[i];
+
+      /* start a new run for a single zero value*/
+      if (val == 0) break;
+
+      /* from fonttools: continue word-encoded run if there's only one
+       * single value in the range [-128, 127] because it is more compact.
+       * Only start a new run when there're 2 continuous such values. */
+      if (val >= -128 && val <= 127 &&
+          i + 1 < num_values &&
+          values.arrayZ[i+1] >= -128 && values.arrayZ[i+1] <= 127)
+        break;
+
+      i++;
+    }
+
+    unsigned run_length = i - start;
+    auto it = encoded_bytes.iter ();
+    unsigned encoded_len = 0;
+    while (run_length >= 64)
+    {
+      *it++ = (VALUES_ARE_WORDS | 63);
+      encoded_len++;
+
+      for (unsigned j = 0; j < 64; j++)
+      {
+        int16_t value_val = values.arrayZ[start + j];
+        *it++ = static_cast<char> (value_val >> 8);
+        *it++ = static_cast<char> (value_val & 0xFF);
+
+        encoded_len += 2;
+      }
+
+      start += 64;
+      run_length -= 64;
+    }
+
+    if (run_length)
+    {
+      *it++ = (VALUES_ARE_WORDS | (run_length - 1));
+      encoded_len++;
+      while (start < i)
+      {
+        int16_t value_val = values.arrayZ[start++];
+        *it++ = static_cast<char> (value_val >> 8);
+        *it++ = static_cast<char> (value_val & 0xFF);
+
+        encoded_len += 2;
+      }
+    }
+    return encoded_len;
+  }
+
+  static unsigned encode_value_run_as_longs (unsigned &i,
+                                             hb_array_t<unsigned char> encoded_bytes,
+                                             hb_array_t<const int> values)
+  {
+    unsigned start = i;
+    unsigned num_values = values.length;
+    while (i < num_values)
+    {
+      int val = values.arrayZ[i];
+
+      if (val >= -32768 && val <= 32767)
+        break;
+
+      i++;
+    }
+
+    unsigned run_length = i - start;
+    auto it = encoded_bytes.iter ();
+    unsigned encoded_len = 0;
+    while (run_length >= 64)
+    {
+      *it++ = (VALUES_ARE_LONGS | 63);
+      encoded_len++;
+
+      for (unsigned j = 0; j < 64; j++)
+      {
+        int32_t value_val = values.arrayZ[start + j];
+        *it++ = static_cast<char> (value_val >> 24);
+        *it++ = static_cast<char> (value_val >> 16);
+        *it++ = static_cast<char> (value_val >> 8);
+        *it++ = static_cast<char> (value_val & 0xFF);
+
+        encoded_len += 4;
+      }
+
+      start += 64;
+      run_length -= 64;
+    }
+
+    if (run_length)
+    {
+      *it++ = (VALUES_ARE_LONGS | (run_length - 1));
+      encoded_len++;
+      while (start < i)
+      {
+        int32_t value_val = values.arrayZ[start++];
+        *it++ = static_cast<char> (value_val >> 24);
+        *it++ = static_cast<char> (value_val >> 16);
+        *it++ = static_cast<char> (value_val >> 8);
+        *it++ = static_cast<char> (value_val & 0xFF);
+
+        encoded_len += 4;
+      }
+    }
+    return encoded_len;
+  }
+
+  template <typename T>
+  static bool decompile (const HBUINT8 *&p /* IN/OUT */,
+                         hb_vector_t<T> &values /* IN/OUT */,
+                         const HBUINT8 *end,
+                         bool consume_all = false)
+  {
+    unsigned i = 0;
+    unsigned count = consume_all ? UINT_MAX : values.length;
+    if (consume_all)
+      values.alloc ((end - p) / 2);
+    while (i < count)
+    {
+      if (unlikely (p + 1 > end)) return consume_all;
+      unsigned control = *p++;
+      unsigned run_count = (control & VALUE_RUN_COUNT_MASK) + 1;
+      if (consume_all)
+      {
+        if (unlikely (!values.resize (values.length + run_count, false)))
+          return false;
+      }
+      unsigned stop = i + run_count;
+      if (unlikely (stop > count)) return false;
+      if ((control & VALUES_SIZE_MASK) == VALUES_ARE_ZEROS)
+      {
+        for (; i < stop; i++)
+          values.arrayZ[i] = 0;
+      }
+      else if ((control & VALUES_SIZE_MASK) ==  VALUES_ARE_WORDS)
+      {
+        if (unlikely (p + run_count * HBINT16::static_size > end)) return false;
+#ifndef HB_OPTIMIZE_SIZE
+        for (; i + 3 < stop; i += 4)
+        {
+          values.arrayZ[i] = * (const HBINT16 *) p;
+          p += HBINT16::static_size;
+          values.arrayZ[i + 1] = * (const HBINT16 *) p;
+          p += HBINT16::static_size;
+          values.arrayZ[i + 2] = * (const HBINT16 *) p;
+          p += HBINT16::static_size;
+          values.arrayZ[i + 3] = * (const HBINT16 *) p;
+          p += HBINT16::static_size;
+        }
+#endif
+        for (; i < stop; i++)
+        {
+          values.arrayZ[i] = * (const HBINT16 *) p;
+          p += HBINT16::static_size;
+        }
+      }
+      else if ((control & VALUES_SIZE_MASK) ==  VALUES_ARE_LONGS)
+      {
+        if (unlikely (p + run_count * HBINT32::static_size > end)) return false;
+        for (; i < stop; i++)
+        {
+          values.arrayZ[i] = * (const HBINT32 *) p;
+          p += HBINT32::static_size;
+        }
+      }
+      else if ((control & VALUES_SIZE_MASK) ==  VALUES_ARE_BYTES)
+      {
+        if (unlikely (p + run_count > end)) return false;
+#ifndef HB_OPTIMIZE_SIZE
+        for (; i + 3 < stop; i += 4)
+        {
+          values.arrayZ[i] = * (const HBINT8 *) p++;
+          values.arrayZ[i + 1] = * (const HBINT8 *) p++;
+          values.arrayZ[i + 2] = * (const HBINT8 *) p++;
+          values.arrayZ[i + 3] = * (const HBINT8 *) p++;
+        }
+#endif
+        for (; i < stop; i++)
+          values.arrayZ[i] = * (const HBINT8 *) p++;
+      }
+    }
+    return true;
+  }
+
+  struct iter_t : hb_iter_with_fallback_t<iter_t, int>
+  {
+    iter_t (const unsigned char *p_, unsigned len_)
+            : p (p_), endp (p_ + len_)
+    { if (ensure_run ()) read_value (); }
+
+    private:
+    const unsigned char *p;
+    const unsigned char * const endp;
+    int current_value = 0;
+    signed run_count = 0;
+    unsigned width = 0;
+
+    bool ensure_run ()
+    {
+      if (likely (run_count > 0)) return true;
+
+      if (unlikely (p >= endp))
+      {
+        run_count = 0;
+        current_value = 0;
+        return false;
+      }
+
+      unsigned control = *p++;
+      run_count = (control & VALUE_RUN_COUNT_MASK) + 1;
+      width = control & VALUES_SIZE_MASK;
+      switch (width)
+      {
+        case VALUES_ARE_ZEROS: width = 0; break;
+        case VALUES_ARE_BYTES: width = HBINT8::static_size;  break;
+        case VALUES_ARE_WORDS: width = HBINT16::static_size; break;
+        case VALUES_ARE_LONGS: width = HBINT32::static_size; break;
+        default: assert (false);
+      }
+
+      if (unlikely (p + run_count * width > endp))
+      {
+        run_count = 0;
+        current_value = 0;
+        return false;
+      }
+
+      return true;
+    }
+    void read_value ()
+    {
+      switch (width)
+      {
+        case 0: current_value = 0; break;
+        case 1: current_value = * (const HBINT8  *) p; break;
+        case 2: current_value = * (const HBINT16 *) p; break;
+        case 4: current_value = * (const HBINT32 *) p; break;
+      }
+      p += width;
+    }
+
+    public:
+
+    typedef int __item_t__;
+    __item_t__ __item__ () const
+    { return current_value; }
+
+    bool __more__ () const { return run_count || p < endp; }
+    void __next__ ()
+    {
+      run_count--;
+      if (unlikely (!ensure_run ()))
+        return;
+      read_value ();
+    }
+    void __forward__ (unsigned n)
+    {
+      if (unlikely (!ensure_run ()))
+        return;
+      while (n)
+      {
+        unsigned i = hb_min (n, (unsigned) run_count);
+        run_count -= i;
+        n -= i;
+        p += (i - 1) * width;
+        if (unlikely (!ensure_run ()))
+          return;
+        read_value ();
+      }
+    }
+    bool operator != (const iter_t& o) const
+    { return p != o.p || run_count != o.run_count; }
+    iter_t __end__ () const
+    {
+      iter_t it (endp, 0);
+      return it;
+    }
+  };
+
+  struct fetcher_t
+  {
+    fetcher_t (const unsigned char *p_, unsigned len_)
+              : p (p_), end (p_ + len_) {}
+
+    private:
+    const unsigned char *p;
+    const unsigned char * const end;
+    signed run_count = 0;
+    unsigned width = 0;
+
+    bool ensure_run ()
+    {
+      if (likely (run_count > 0)) return true;
+
+      if (unlikely (p >= end))
+      {
+        run_count = 0;
+        return false;
+      }
+
+      unsigned control = *p++;
+      run_count = (control & VALUE_RUN_COUNT_MASK) + 1;
+      width = control & VALUES_SIZE_MASK;
+      switch (width)
+      {
+        case VALUES_ARE_ZEROS: width = 0; break;
+        case VALUES_ARE_BYTES: width = HBINT8::static_size;  break;
+        case VALUES_ARE_WORDS: width = HBINT16::static_size; break;
+        case VALUES_ARE_LONGS: width = HBINT32::static_size; break;
+        default: assert (false);
+      }
+
+      if (unlikely (p + run_count * width > end))
+      {
+        run_count = 0;
+        return false;
+      }
+
+      return true;
+    }
+
+    void skip (unsigned n)
+    {
+      while (n)
+      {
+        if (unlikely (!ensure_run ()))
+          return;
+        unsigned i = hb_min (n, (unsigned) run_count);
+        run_count -= i;
+        n -= i;
+        p += i * width;
+      }
+    }
+
+    template <bool scaled>
+    void _add_to (hb_array_t<float> out, float scale = 1.0f)
+    {
+      unsigned n = out.length;
+      float *arrayZ = out.arrayZ;
+
+      for (unsigned i = 0; i < n;)
+      {
+        if (unlikely (!ensure_run ()))
+          break;
+        unsigned count = hb_min (n - i, (unsigned) run_count);
+        switch (width)
+        {
+          case 1:
+          {
+            const auto *pp = (const HBINT8 *) p;
+            unsigned j = 0;
+#ifndef HB_OPTIMIZE_SIZE
+            for (; j + 3 < count; j += 4)
+            {
+              *arrayZ++ += scaled ? *pp++ * scale : *pp++;
+              *arrayZ++ += scaled ? *pp++ * scale : *pp++;
+              *arrayZ++ += scaled ? *pp++ * scale : *pp++;
+              *arrayZ++ += scaled ? *pp++ * scale : *pp++;
+            }
+#endif
+            for (; j < count; j++)
+              *arrayZ++ += scaled ? *pp++ * scale : *pp++;
+          }
+          break;
+          case 2:
+          {
+            const auto *pp = (const HBINT16 *) p;
+            unsigned j = 0;
+#ifndef HB_OPTIMIZE_SIZE
+            for (; j + 3 < count; j += 4)
+            {
+              *arrayZ++ += scaled ? *pp++ * scale : *pp++;
+              *arrayZ++ += scaled ? *pp++ * scale : *pp++;
+              *arrayZ++ += scaled ? *pp++ * scale : *pp++;
+              *arrayZ++ += scaled ? *pp++ * scale : *pp++;
+            }
+#endif
+            for (; j < count; j++)
+              *arrayZ++ += scaled ? *pp++ * scale : *pp++;
+          }
+          break;
+          case 4:
+          {
+            const auto *pp = (const HBINT32 *) p;
+            for (unsigned j = 0; j < count; j++)
+              *arrayZ++ += scaled ? *pp++ * scale : *pp++;
+          }
+          break;
+        }
+        p += count * width;
+        run_count -= count;
+        i += count;
+      }
+    }
+
+    public:
+    void add_to (hb_array_t<float> out, float scale = 1.0f)
+    {
+      unsigned n = out.length;
+
+      if (scale == 0.0f)
+      {
+        skip (n);
+        return;
+      }
+
+#ifndef HB_OPTIMIZE_SIZE
+      if (scale == 1.0f)
+        _add_to<false> (out);
+      else
+#endif
+        _add_to<true> (out, scale);
+    }
+  };
+};
+
+struct TupleList : CFF2Index
+{
+  TupleValues::iter_t operator [] (unsigned i) const
+  {
+    auto bytes = CFF2Index::operator [] (i);
+    return TupleValues::iter_t (bytes.arrayZ, bytes.length);
+  }
+
+  TupleValues::fetcher_t fetcher (unsigned i) const
+  {
+    auto bytes = CFF2Index::operator [] (i);
+    return TupleValues::fetcher_t (bytes.arrayZ, bytes.length);
+  }
+};
+
+
 } /* namespace OT */
 
 
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-ot-cff-common.hh b/src/java.desktop/share/native/libharfbuzz/hb-ot-cff-common.hh
index 081c333f50f..1e3e0be5106 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-ot-cff-common.hh
+++ b/src/java.desktop/share/native/libharfbuzz/hb-ot-cff-common.hh
@@ -41,10 +41,21 @@ using namespace OT;
 using objidx_t = hb_serialize_context_t::objidx_t;
 using whence_t = hb_serialize_context_t::whence_t;
 
-/* utility macro */
-template<typename Type>
-static inline const Type& StructAtOffsetOrNull (const void *P, unsigned int offset)
-{ return offset ? StructAtOffset<Type> (P, offset) : Null (Type); }
+/* CFF offsets can technically be negative */
+template<typename Type, typename ...Ts>
+static inline const Type& StructAtOffsetOrNull (const void *P, int offset, hb_sanitize_context_t &sc, Ts&&... ds)
+{
+  if (!offset) return Null (Type);
+
+  const char *p = (const char *) P + offset;
+  if (!sc.check_point (p)) return Null (Type);
+
+  const Type &obj = *reinterpret_cast<const Type *> (p);
+  if (!obj.sanitize (&sc, std::forward<Ts> (ds)...)) return Null (Type);
+
+  return obj;
+}
+
 
 struct code_pair_t
 {
@@ -57,241 +68,6 @@ using str_buff_t = hb_vector_t<unsigned char>;
 using str_buff_vec_t = hb_vector_t<str_buff_t>;
 using glyph_to_sid_map_t = hb_vector_t<code_pair_t>;
 
-struct length_f_t
-{
-  template <typename Iterable,
-            hb_requires (hb_is_iterable (Iterable))>
-  unsigned operator () (const Iterable &_) const { return hb_len (hb_iter (_)); }
-
-  unsigned operator () (unsigned _) const { return _; }
-}
-HB_FUNCOBJ (length_f);
-
-/* CFF INDEX */
-template <typename COUNT>
-struct CFFIndex
-{
-  unsigned int offset_array_size () const
-  { return offSize * (count + 1); }
-
-  template <typename Iterable,
-            hb_requires (hb_is_iterable (Iterable))>
-  bool serialize (hb_serialize_context_t *c,
-                  const Iterable &iterable,
-                  const unsigned *p_data_size = nullptr)
-  {
-    TRACE_SERIALIZE (this);
-    unsigned data_size;
-    if (p_data_size)
-      data_size = *p_data_size;
-    else
-      total_size (iterable, &data_size);
-
-    auto it = hb_iter (iterable);
-    if (unlikely (!serialize_header (c, +it, data_size))) return_trace (false);
-    unsigned char *ret = c->allocate_size<unsigned char> (data_size, false);
-    if (unlikely (!ret)) return_trace (false);
-    for (const auto &_ : +it)
-    {
-      unsigned len = _.length;
-      if (!len)
-        continue;
-      if (len <= 1)
-      {
-        *ret++ = *_.arrayZ;
-        continue;
-      }
-      hb_memcpy (ret, _.arrayZ, len);
-      ret += len;
-    }
-    return_trace (true);
-  }
-
-  template <typename Iterator,
-            hb_requires (hb_is_iterator (Iterator))>
-  bool serialize_header (hb_serialize_context_t *c,
-                         Iterator it,
-                         unsigned data_size)
-  {
-    TRACE_SERIALIZE (this);
-
-    unsigned off_size = (hb_bit_storage (data_size + 1) + 7) / 8;
-
-    /* serialize CFFIndex header */
-    if (unlikely (!c->extend_min (this))) return_trace (false);
-    this->count = hb_len (it);
-    if (!this->count) return_trace (true);
-    if (unlikely (!c->extend (this->offSize))) return_trace (false);
-    this->offSize = off_size;
-    if (unlikely (!c->allocate_size<HBUINT8> (off_size * (this->count + 1), false)))
-      return_trace (false);
-
-    /* serialize indices */
-    unsigned int offset = 1;
-    if (HB_OPTIMIZE_SIZE_VAL)
-    {
-      unsigned int i = 0;
-      for (const auto &_ : +it)
-      {
-        set_offset_at (i++, offset);
-        offset += length_f (_);
-      }
-      set_offset_at (i, offset);
-    }
-    else
-      switch (off_size)
-      {
-        case 1:
-        {
-          HBUINT8 *p = (HBUINT8 *) offsets;
-          for (const auto &_ : +it)
-          {
-            *p++ = offset;
-            offset += length_f (_);
-          }
-          *p = offset;
-        }
-        break;
-        case 2:
-        {
-          HBUINT16 *p = (HBUINT16 *) offsets;
-          for (const auto &_ : +it)
-          {
-            *p++ = offset;
-            offset += length_f (_);
-          }
-          *p = offset;
-        }
-        break;
-        case 3:
-        {
-          HBUINT24 *p = (HBUINT24 *) offsets;
-          for (const auto &_ : +it)
-          {
-            *p++ = offset;
-            offset += length_f (_);
-          }
-          *p = offset;
-        }
-        break;
-        case 4:
-        {
-          HBUINT32 *p = (HBUINT32 *) offsets;
-          for (const auto &_ : +it)
-          {
-            *p++ = offset;
-            offset += length_f (_);
-          }
-          *p = offset;
-        }
-        break;
-        default:
-        break;
-      }
-
-    assert (offset == data_size + 1);
-    return_trace (true);
-  }
-
-  template <typename Iterable,
-            hb_requires (hb_is_iterable (Iterable))>
-  static unsigned total_size (const Iterable &iterable, unsigned *data_size = nullptr)
-  {
-    auto it = + hb_iter (iterable);
-    if (!it)
-    {
-      if (data_size) *data_size = 0;
-      return min_size;
-    }
-
-    unsigned total = 0;
-    for (const auto &_ : +it)
-      total += length_f (_);
-
-    if (data_size) *data_size = total;
-
-    unsigned off_size = (hb_bit_storage (total + 1) + 7) / 8;
-
-    return min_size + HBUINT8::static_size + (hb_len (it) + 1) * off_size + total;
-  }
-
-  void set_offset_at (unsigned int index, unsigned int offset)
-  {
-    assert (index <= count);
-
-    unsigned int size = offSize;
-    const HBUINT8 *p = offsets;
-    switch (size)
-    {
-      case 1: ((HBUINT8  *) p)[index] = offset; break;
-      case 2: ((HBUINT16 *) p)[index] = offset; break;
-      case 3: ((HBUINT24 *) p)[index] = offset; break;
-      case 4: ((HBUINT32 *) p)[index] = offset; break;
-      default: return;
-    }
-  }
-
-  private:
-  unsigned int offset_at (unsigned int index) const
-  {
-    assert (index <= count);
-
-    unsigned int size = offSize;
-    const HBUINT8 *p = offsets;
-    switch (size)
-    {
-      case 1: return ((HBUINT8  *) p)[index];
-      case 2: return ((HBUINT16 *) p)[index];
-      case 3: return ((HBUINT24 *) p)[index];
-      case 4: return ((HBUINT32 *) p)[index];
-      default: return 0;
-    }
-  }
-
-  const unsigned char *data_base () const
-  { return (const unsigned char *) this + min_size + offSize.static_size - 1 + offset_array_size (); }
-  public:
-
-  hb_ubytes_t operator [] (unsigned int index) const
-  {
-    if (unlikely (index >= count)) return hb_ubytes_t ();
-    _hb_compiler_memory_r_barrier ();
-    unsigned offset0 = offset_at (index);
-    unsigned offset1 = offset_at (index + 1);
-    if (unlikely (offset1 < offset0 || offset1 > offset_at (count)))
-      return hb_ubytes_t ();
-    return hb_ubytes_t (data_base () + offset0, offset1 - offset0);
-  }
-
-  unsigned int get_size () const
-  {
-    if (count)
-      return min_size + offSize.static_size + offset_array_size () + (offset_at (count) - 1);
-    return min_size;  /* empty CFFIndex contains count only */
-  }
-
-  bool sanitize (hb_sanitize_context_t *c) const
-  {
-    TRACE_SANITIZE (this);
-    return_trace (likely (c->check_struct (this) &&
-                          (count == 0 || /* empty INDEX */
-                           (count < count + 1u &&
-                            c->check_struct (&offSize) && offSize >= 1 && offSize <= 4 &&
-                            c->check_array (offsets, offSize, count + 1u) &&
-                            c->check_array ((const HBUINT8*) data_base (), 1, offset_at (count))))));
-  }
-
-  public:
-  COUNT         count;          /* Number of object data. Note there are (count+1) offsets */
-  private:
-  HBUINT8       offSize;        /* The byte size of each offset in the offsets array. */
-  HBUINT8       offsets[HB_VAR_ARRAY];
-                                /* The array of (count + 1) offsets into objects array (1-base). */
-  /* HBUINT8 data[HB_VAR_ARRAY];        Object data */
-  public:
-  DEFINE_SIZE_MIN (COUNT::static_size);
-};
-
 /* Top Dict, Font Dict, Private Dict */
 struct Dict : UnsizedByteStr
 {
@@ -412,6 +188,7 @@ struct FDSelect0 {
     TRACE_SANITIZE (this);
     if (unlikely (!(c->check_struct (this))))
       return_trace (false);
+    hb_barrier ();
     if (unlikely (!c->check_array (fds, c->get_num_glyphs ())))
       return_trace (false);
 
@@ -438,7 +215,9 @@ struct FDSelect3_4_Range
   bool sanitize (hb_sanitize_context_t *c, const void * /*nullptr*/, unsigned int fdcount) const
   {
     TRACE_SANITIZE (this);
-    return_trace (first < c->get_num_glyphs () && (fd < fdcount));
+    return_trace (c->check_struct (this) &&
+                  hb_barrier () &&
+                  first < c->get_num_glyphs () && (fd < fdcount));
   }
 
   GID_TYPE    first;
@@ -456,15 +235,20 @@ struct FDSelect3_4
   bool sanitize (hb_sanitize_context_t *c, unsigned int fdcount) const
   {
     TRACE_SANITIZE (this);
-    if (unlikely (!c->check_struct (this) || !ranges.sanitize (c, nullptr, fdcount) ||
-                  (nRanges () == 0) || ranges[0].first != 0))
+    if (unlikely (!(c->check_struct (this) &&
+                    ranges.sanitize (c, nullptr, fdcount) &&
+                    hb_barrier () &&
+                    (nRanges () != 0) &&
+                    ranges[0].first == 0)))
       return_trace (false);
 
     for (unsigned int i = 1; i < nRanges (); i++)
       if (unlikely (ranges[i - 1].first >= ranges[i].first))
         return_trace (false);
 
-    if (unlikely (!sentinel().sanitize (c) || (sentinel() != c->get_num_glyphs ())))
+    if (unlikely (!(sentinel().sanitize (c) &&
+                   hb_barrier () &&
+                   (sentinel() == c->get_num_glyphs ()))))
       return_trace (false);
 
     return_trace (true);
@@ -524,8 +308,8 @@ struct FDSelect
   {
     switch (format)
     {
-    case 0: return format.static_size + u.format0.get_size (num_glyphs);
-    case 3: return format.static_size + u.format3.get_size ();
+    case 0: hb_barrier (); return format.static_size + u.format0.get_size (num_glyphs);
+    case 3: hb_barrier (); return format.static_size + u.format3.get_size ();
     default:return 0;
     }
   }
@@ -536,8 +320,8 @@ struct FDSelect
 
     switch (format)
     {
-    case 0: return u.format0.get_fd (glyph);
-    case 3: return u.format3.get_fd (glyph);
+    case 0: hb_barrier (); return u.format0.get_fd (glyph);
+    case 3: hb_barrier (); return u.format3.get_fd (glyph);
     default:return 0;
     }
   }
@@ -548,8 +332,8 @@ struct FDSelect
 
     switch (format)
     {
-    case 0: return u.format0.get_fd_range (glyph);
-    case 3: return u.format3.get_fd_range (glyph);
+    case 0: hb_barrier (); return u.format0.get_fd_range (glyph);
+    case 3: hb_barrier (); return u.format3.get_fd_range (glyph);
     default:return {0, 1};
     }
   }
@@ -559,11 +343,12 @@ struct FDSelect
     TRACE_SANITIZE (this);
     if (unlikely (!c->check_struct (this)))
       return_trace (false);
+    hb_barrier ();
 
     switch (format)
     {
-    case 0: return_trace (u.format0.sanitize (c, fdcount));
-    case 3: return_trace (u.format3.sanitize (c, fdcount));
+    case 0: hb_barrier (); return_trace (u.format0.sanitize (c, fdcount));
+    case 3: hb_barrier (); return_trace (u.format3.sanitize (c, fdcount));
     default:return_trace (false);
     }
   }
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-ot-cff1-table.cc b/src/java.desktop/share/native/libharfbuzz/hb-ot-cff1-table.cc
index 6fcc8c46587..b06936f94c8 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-ot-cff1-table.cc
+++ b/src/java.desktop/share/native/libharfbuzz/hb-ot-cff1-table.cc
@@ -553,15 +553,6 @@ bool _get_path (const OT::cff1::accelerator_t *cff, hb_font_t *font, hb_codepoin
   return true;
 }
 
-bool OT::cff1::accelerator_t::paint_glyph (hb_font_t *font, hb_codepoint_t glyph, hb_paint_funcs_t *funcs, void *data, hb_color_t foreground) const
-{
-  funcs->push_clip_glyph (data, glyph, font);
-  funcs->color (data, true, foreground);
-  funcs->pop_clip (data);
-
-  return true;
-}
-
 bool OT::cff1::accelerator_t::get_path (hb_font_t *font, hb_codepoint_t glyph, hb_draw_session_t &draw_session) const
 {
 #ifdef HB_NO_OT_FONT_CFF
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-ot-cff1-table.hh b/src/java.desktop/share/native/libharfbuzz/hb-ot-cff1-table.hh
index d1310c66fde..0116a0c9192 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-ot-cff1-table.hh
+++ b/src/java.desktop/share/native/libharfbuzz/hb-ot-cff1-table.hh
@@ -51,9 +51,6 @@ namespace CFF {
 enum EncodingID { StandardEncoding = 0, ExpertEncoding = 1 };
 enum CharsetID { ISOAdobeCharset = 0, ExpertCharset = 1, ExpertSubsetCharset = 2 };
 
-typedef CFFIndex<HBUINT16>  CFF1Index;
-
-typedef CFFIndex<HBUINT16> CFF1Index;
 typedef CFF1Index          CFF1CharStrings;
 typedef Subrs<HBUINT16>    CFF1Subrs;
 
@@ -242,8 +239,8 @@ struct Encoding
     unsigned int size = min_size;
     switch (table_format ())
     {
-    case 0: size += u.format0.get_size (); break;
-    case 1: size += u.format1.get_size (); break;
+    case 0: hb_barrier (); size += u.format0.get_size (); break;
+    case 1: hb_barrier (); size += u.format1.get_size (); break;
     }
     if (has_supplement ())
       size += suppEncData ().get_size ();
@@ -254,8 +251,8 @@ struct Encoding
   {
     switch (table_format ())
     {
-    case 0: return u.format0.get_code (glyph);
-    case 1: return u.format1.get_code (glyph);
+    case 0: hb_barrier (); return u.format0.get_code (glyph);
+    case 1: hb_barrier (); return u.format1.get_code (glyph);
     default:return 0;
     }
   }
@@ -275,11 +272,12 @@ struct Encoding
     TRACE_SANITIZE (this);
     if (unlikely (!c->check_struct (this)))
       return_trace (false);
+    hb_barrier ();
 
     switch (table_format ())
     {
-    case 0: if (unlikely (!u.format0.sanitize (c))) { return_trace (false); } break;
-    case 1: if (unlikely (!u.format1.sanitize (c))) { return_trace (false); } break;
+    case 0: hb_barrier (); if (unlikely (!u.format0.sanitize (c))) { return_trace (false); } break;
+    case 1: hb_barrier (); if (unlikely (!u.format1.sanitize (c))) { return_trace (false); } break;
     default:return_trace (false);
     }
     return_trace (likely (!has_supplement () || suppEncData ().sanitize (c)));
@@ -290,8 +288,8 @@ struct Encoding
   {
     switch (table_format ())
     {
-    case 0: return StructAfter<CFF1SuppEncData> (u.format0.codes[u.format0.nCodes ()-1]);
-    case 1: return StructAfter<CFF1SuppEncData> (u.format1.ranges[u.format1.nRanges ()-1]);
+    case 0: hb_barrier (); return StructAfter<CFF1SuppEncData> (u.format0.codes[u.format0.nCodes ()-1]);
+    case 1: hb_barrier (); return StructAfter<CFF1SuppEncData> (u.format1.ranges[u.format1.nRanges ()-1]);
     default:return Null (CFF1SuppEncData);
     }
   }
@@ -376,13 +374,13 @@ struct Charset1_2 {
   bool sanitize (hb_sanitize_context_t *c, unsigned int num_glyphs, unsigned *num_charset_entries) const
   {
     TRACE_SANITIZE (this);
-    if (unlikely (!c->check_struct (this)))
-      return_trace (false);
     num_glyphs--;
     unsigned i;
     for (i = 0; num_glyphs > 0; i++)
     {
-      if (unlikely (!ranges[i].sanitize (c) || (num_glyphs < ranges[i].nLeft + 1)))
+      if (unlikely (!(ranges[i].sanitize (c) &&
+                      hb_barrier () &&
+                      (num_glyphs >= ranges[i].nLeft + 1))))
         return_trace (false);
       num_glyphs -= (ranges[i].nLeft + 1);
     }
@@ -569,9 +567,9 @@ struct Charset
   {
     switch (format)
     {
-    case 0: return min_size + u.format0.get_size (num_glyphs);
-    case 1: return min_size + u.format1.get_size (num_glyphs);
-    case 2: return min_size + u.format2.get_size (num_glyphs);
+    case 0: hb_barrier (); return min_size + u.format0.get_size (num_glyphs);
+    case 1: hb_barrier (); return min_size + u.format1.get_size (num_glyphs);
+    case 2: hb_barrier (); return min_size + u.format2.get_size (num_glyphs);
     default:return 0;
     }
   }
@@ -581,9 +579,9 @@ struct Charset
   {
     switch (format)
     {
-    case 0: return u.format0.get_sid (glyph, num_glyphs);
-    case 1: return u.format1.get_sid (glyph, num_glyphs, cache);
-    case 2: return u.format2.get_sid (glyph, num_glyphs, cache);
+    case 0: hb_barrier (); return u.format0.get_sid (glyph, num_glyphs);
+    case 1: hb_barrier (); return u.format1.get_sid (glyph, num_glyphs, cache);
+    case 2: hb_barrier (); return u.format2.get_sid (glyph, num_glyphs, cache);
     default:return 0;
     }
   }
@@ -592,9 +590,9 @@ struct Charset
   {
     switch (format)
     {
-    case 0: u.format0.collect_glyph_to_sid_map (mapping, num_glyphs); return;
-    case 1: u.format1.collect_glyph_to_sid_map (mapping, num_glyphs); return;
-    case 2: u.format2.collect_glyph_to_sid_map (mapping, num_glyphs); return;
+    case 0: hb_barrier (); u.format0.collect_glyph_to_sid_map (mapping, num_glyphs); return;
+    case 1: hb_barrier (); u.format1.collect_glyph_to_sid_map (mapping, num_glyphs); return;
+    case 2: hb_barrier (); u.format2.collect_glyph_to_sid_map (mapping, num_glyphs); return;
     default:return;
     }
   }
@@ -603,9 +601,9 @@ struct Charset
   {
     switch (format)
     {
-    case 0: return u.format0.get_glyph (sid, num_glyphs);
-    case 1: return u.format1.get_glyph (sid, num_glyphs);
-    case 2: return u.format2.get_glyph (sid, num_glyphs);
+    case 0: hb_barrier (); return u.format0.get_glyph (sid, num_glyphs);
+    case 1: hb_barrier (); return u.format1.get_glyph (sid, num_glyphs);
+    case 2: hb_barrier (); return u.format2.get_glyph (sid, num_glyphs);
     default:return 0;
     }
   }
@@ -615,12 +613,13 @@ struct Charset
     TRACE_SANITIZE (this);
     if (unlikely (!c->check_struct (this)))
       return_trace (false);
+    hb_barrier ();
 
     switch (format)
     {
-    case 0: return_trace (u.format0.sanitize (c, c->get_num_glyphs (), num_charset_entries));
-    case 1: return_trace (u.format1.sanitize (c, c->get_num_glyphs (), num_charset_entries));
-    case 2: return_trace (u.format2.sanitize (c, c->get_num_glyphs (), num_charset_entries));
+    case 0: hb_barrier (); return_trace (u.format0.sanitize (c, c->get_num_glyphs (), num_charset_entries));
+    case 1: hb_barrier (); return_trace (u.format1.sanitize (c, c->get_num_glyphs (), num_charset_entries));
+    case 2: hb_barrier (); return_trace (u.format2.sanitize (c, c->get_num_glyphs (), num_charset_entries));
     default:return_trace (false);
     }
   }
@@ -761,9 +760,9 @@ struct cff1_top_dict_values_t : top_dict_values_t<cff1_top_dict_val_t>
   unsigned int    ros_supplement;
   unsigned int    cidCount;
 
-  unsigned int    EncodingOffset;
-  unsigned int    CharsetOffset;
-  unsigned int    FDSelectOffset;
+  int             EncodingOffset;
+  int             CharsetOffset;
+  int             FDSelectOffset;
   table_info_t    privateDictInfo;
 };
 
@@ -819,24 +818,24 @@ struct cff1_top_dict_opset_t : top_dict_opset_t<cff1_top_dict_val_t>
         break;
 
       case OpCode_Encoding:
-        dictval.EncodingOffset = env.argStack.pop_uint ();
+        dictval.EncodingOffset = env.argStack.pop_int ();
         env.clear_args ();
         if (unlikely (dictval.EncodingOffset == 0)) return;
         break;
 
       case OpCode_charset:
-        dictval.CharsetOffset = env.argStack.pop_uint ();
+        dictval.CharsetOffset = env.argStack.pop_int ();
         env.clear_args ();
         if (unlikely (dictval.CharsetOffset == 0)) return;
         break;
 
       case OpCode_FDSelect:
-        dictval.FDSelectOffset = env.argStack.pop_uint ();
+        dictval.FDSelectOffset = env.argStack.pop_int ();
         env.clear_args ();
         break;
 
       case OpCode_Private:
-        dictval.privateDictInfo.offset = env.argStack.pop_uint ();
+        dictval.privateDictInfo.offset = env.argStack.pop_int ();
         dictval.privateDictInfo.size = env.argStack.pop_uint ();
         env.clear_args ();
         break;
@@ -911,7 +910,7 @@ struct cff1_private_dict_values_base_t : dict_values_t<VAL>
   }
   void fini () { dict_values_t<VAL>::fini (); }
 
-  unsigned int      subrsOffset;
+  int                 subrsOffset;
   const CFF1Subrs    *localSubrs;
 };
 
@@ -946,7 +945,7 @@ struct cff1_private_dict_opset_t : dict_opset_t
         env.clear_args ();
         break;
       case OpCode_Subrs:
-        dictval.subrsOffset = env.argStack.pop_uint ();
+        dictval.subrsOffset = env.argStack.pop_int ();
         env.clear_args ();
         break;
 
@@ -988,7 +987,7 @@ struct cff1_private_dict_opset_subset_t : dict_opset_t
         break;
 
       case OpCode_Subrs:
-        dictval.subrsOffset = env.argStack.pop_uint ();
+        dictval.subrsOffset = env.argStack.pop_int ();
         env.clear_args ();
         break;
 
@@ -1055,6 +1054,7 @@ struct cff1
   {
     TRACE_SANITIZE (this);
     return_trace (c->check_struct (this) &&
+                  hb_barrier () &&
                   likely (version.major == 1));
   }
 
@@ -1085,14 +1085,17 @@ struct cff1
       nameIndex = &cff->nameIndex (cff);
       if ((nameIndex == &Null (CFF1NameIndex)) || !nameIndex->sanitize (&sc))
         goto fail;
+      hb_barrier ();
 
-      topDictIndex = &StructAtOffset<CFF1TopDictIndex> (nameIndex, nameIndex->get_size ());
-      if ((topDictIndex == &Null (CFF1TopDictIndex)) || !topDictIndex->sanitize (&sc) || (topDictIndex->count == 0))
+      topDictIndex = &StructAtOffsetOrNull<CFF1TopDictIndex> (nameIndex, nameIndex->get_size (), sc);
+      if (topDictIndex == &Null (CFF1TopDictIndex) || (topDictIndex->count == 0))
         goto fail;
+      hb_barrier ();
 
       { /* parse top dict */
         const hb_ubytes_t topDictStr = (*topDictIndex)[0];
         if (unlikely (!topDictStr.sanitize (&sc)))   goto fail;
+        hb_barrier ();
         cff1_top_dict_interp_env_t env (topDictStr);
         cff1_top_dict_interpreter_t top_interp (env);
         if (unlikely (!top_interp.interpret (topDict)))   goto fail;
@@ -1102,17 +1105,17 @@ struct cff1
         charset = &Null (Charset);
       else
       {
-        charset = &StructAtOffsetOrNull<Charset> (cff, topDict.CharsetOffset);
-        if (unlikely ((charset == &Null (Charset)) || !charset->sanitize (&sc, &num_charset_entries)))   goto fail;
+        charset = &StructAtOffsetOrNull<Charset> (cff, topDict.CharsetOffset, sc, &num_charset_entries);
+        if (unlikely (charset == &Null (Charset)))   goto fail;
       }
 
       fdCount = 1;
       if (is_CID ())
       {
-        fdArray = &StructAtOffsetOrNull<CFF1FDArray> (cff, topDict.FDArrayOffset);
-        fdSelect = &StructAtOffsetOrNull<CFF1FDSelect> (cff, topDict.FDSelectOffset);
-        if (unlikely ((fdArray == &Null (CFF1FDArray)) || !fdArray->sanitize (&sc) ||
-            (fdSelect == &Null (CFF1FDSelect)) || !fdSelect->sanitize (&sc, fdArray->count)))
+        fdArray = &StructAtOffsetOrNull<CFF1FDArray> (cff, topDict.FDArrayOffset, sc);
+        fdSelect = &StructAtOffsetOrNull<CFF1FDSelect> (cff, topDict.FDSelectOffset, sc, fdArray->count);
+        if (unlikely (fdArray == &Null (CFF1FDArray) ||
+                      fdSelect == &Null (CFF1FDSelect)))
           goto fail;
 
         fdCount = fdArray->count;
@@ -1132,22 +1135,18 @@ struct cff1
       {
         if (!is_predef_encoding ())
         {
-          encoding = &StructAtOffsetOrNull<Encoding> (cff, topDict.EncodingOffset);
-          if (unlikely ((encoding == &Null (Encoding)) || !encoding->sanitize (&sc)))   goto fail;
+          encoding = &StructAtOffsetOrNull<Encoding> (cff, topDict.EncodingOffset, sc);
+          if (unlikely (encoding == &Null (Encoding)))   goto fail;
         }
       }
 
-      stringIndex = &StructAtOffset<CFF1StringIndex> (topDictIndex, topDictIndex->get_size ());
-      if ((stringIndex == &Null (CFF1StringIndex)) || !stringIndex->sanitize (&sc))
+      stringIndex = &StructAtOffsetOrNull<CFF1StringIndex> (topDictIndex, topDictIndex->get_size (), sc);
+      if (stringIndex == &Null (CFF1StringIndex))
         goto fail;
 
-      globalSubrs = &StructAtOffset<CFF1Subrs> (stringIndex, stringIndex->get_size ());
-      if ((globalSubrs != &Null (CFF1Subrs)) && !globalSubrs->sanitize (&sc))
-        goto fail;
-
-      charStrings = &StructAtOffsetOrNull<CFF1CharStrings> (cff, topDict.charStringsOffset);
-
-      if ((charStrings == &Null (CFF1CharStrings)) || unlikely (!charStrings->sanitize (&sc)))
+      globalSubrs = &StructAtOffsetOrNull<CFF1Subrs> (stringIndex, stringIndex->get_size (), sc);
+      charStrings = &StructAtOffsetOrNull<CFF1CharStrings> (cff, topDict.charStringsOffset, sc);
+      if (charStrings == &Null (CFF1CharStrings))
         goto fail;
 
       num_glyphs = charStrings->count;
@@ -1166,6 +1165,7 @@ struct cff1
         {
           hb_ubytes_t fontDictStr = (*fdArray)[i];
           if (unlikely (!fontDictStr.sanitize (&sc)))   goto fail;
+          hb_barrier ();
           cff1_font_dict_values_t *font;
           cff1_top_dict_interp_env_t env (fontDictStr);
           cff1_font_dict_interpreter_t font_interp (env);
@@ -1175,17 +1175,14 @@ struct cff1
           font->init ();
           if (unlikely (!font_interp.interpret (*font)))   goto fail;
           PRIVDICTVAL *priv = &privateDicts[i];
-          const hb_ubytes_t privDictStr = StructAtOffset<UnsizedByteStr> (cff, font->privateDictInfo.offset).as_ubytes (font->privateDictInfo.size);
-          if (unlikely (!privDictStr.sanitize (&sc)))   goto fail;
+          const hb_ubytes_t privDictStr = StructAtOffsetOrNull<UnsizedByteStr> (cff, font->privateDictInfo.offset, sc, font->privateDictInfo.size).as_ubytes (font->privateDictInfo.size);
+          if (unlikely (privDictStr == (const unsigned char *) &Null (UnsizedByteStr))) goto fail;
           num_interp_env_t env2 (privDictStr);
           dict_interpreter_t<PRIVOPSET, PRIVDICTVAL> priv_interp (env2);
           priv->init ();
           if (unlikely (!priv_interp.interpret (*priv)))   goto fail;
 
-          priv->localSubrs = &StructAtOffsetOrNull<CFF1Subrs> (&privDictStr, priv->subrsOffset);
-          if (priv->localSubrs != &Null (CFF1Subrs) &&
-              unlikely (!priv->localSubrs->sanitize (&sc)))
-            goto fail;
+          priv->localSubrs = &StructAtOffsetOrNull<CFF1Subrs> (&privDictStr, priv->subrsOffset, sc);
         }
       }
       else  /* non-CID */
@@ -1193,17 +1190,15 @@ struct cff1
         cff1_top_dict_values_t *font = &topDict;
         PRIVDICTVAL *priv = &privateDicts[0];
 
-        const hb_ubytes_t privDictStr = StructAtOffset<UnsizedByteStr> (cff, font->privateDictInfo.offset).as_ubytes (font->privateDictInfo.size);
-        if (unlikely (!privDictStr.sanitize (&sc)))   goto fail;
+        const hb_ubytes_t privDictStr = StructAtOffsetOrNull<UnsizedByteStr> (cff, font->privateDictInfo.offset, sc, font->privateDictInfo.size).as_ubytes (font->privateDictInfo.size);
+        if (unlikely (privDictStr == (const unsigned char *) &Null (UnsizedByteStr))) goto fail;
         num_interp_env_t env (privDictStr);
         dict_interpreter_t<PRIVOPSET, PRIVDICTVAL> priv_interp (env);
         priv->init ();
         if (unlikely (!priv_interp.interpret (*priv)))   goto fail;
 
-        priv->localSubrs = &StructAtOffsetOrNull<CFF1Subrs> (&privDictStr, priv->subrsOffset);
-        if (priv->localSubrs != &Null (CFF1Subrs) &&
-            unlikely (!priv->localSubrs->sanitize (&sc)))
-          goto fail;
+        priv->localSubrs = &StructAtOffsetOrNull<CFF1Subrs> (&privDictStr, priv->subrsOffset, sc);
+        hb_barrier ();
       }
 
       return;
@@ -1420,7 +1415,7 @@ struct cff1
       hb_sorted_vector_t<gname_t> *names = glyph_names.get_acquire ();
       if (unlikely (!names))
       {
-        names = (hb_sorted_vector_t<gname_t> *) hb_calloc (sizeof (hb_sorted_vector_t<gname_t>), 1);
+        names = (hb_sorted_vector_t<gname_t> *) hb_calloc (1, sizeof (hb_sorted_vector_t<gname_t>));
         if (likely (names))
         {
           names->init ();
@@ -1467,7 +1462,6 @@ struct cff1
     }
 
     HB_INTERNAL bool get_extents (hb_font_t *font, hb_codepoint_t glyph, hb_glyph_extents_t *extents) const;
-    HB_INTERNAL bool paint_glyph (hb_font_t *font, hb_codepoint_t glyph, hb_paint_funcs_t *funcs, void *data, hb_color_t foreground) const;
     HB_INTERNAL bool get_path (hb_font_t *font, hb_codepoint_t glyph, hb_draw_session_t &draw_session) const;
 
     private:
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-ot-cff2-table.cc b/src/java.desktop/share/native/libharfbuzz/hb-ot-cff2-table.cc
index ed430ee59d5..fce39da21ce 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-ot-cff2-table.cc
+++ b/src/java.desktop/share/native/libharfbuzz/hb-ot-cff2-table.cc
@@ -143,15 +143,6 @@ bool OT::cff2::accelerator_t::get_extents (hb_font_t *font,
   return true;
 }
 
-bool OT::cff2::accelerator_t::paint_glyph (hb_font_t *font, hb_codepoint_t glyph, hb_paint_funcs_t *funcs, void *data, hb_color_t foreground) const
-{
-  funcs->push_clip_glyph (data, glyph, font);
-  funcs->color (data, true, foreground);
-  funcs->pop_clip (data);
-
-  return true;
-}
-
 struct cff2_path_param_t
 {
   cff2_path_param_t (hb_font_t *font_, hb_draw_session_t &draw_session_)
@@ -202,6 +193,11 @@ struct cff2_path_procs_path_t : path_procs_t<cff2_path_procs_path_t, cff2_cs_int
 struct cff2_cs_opset_path_t : cff2_cs_opset_t<cff2_cs_opset_path_t, cff2_path_param_t, number_t, cff2_path_procs_path_t> {};
 
 bool OT::cff2::accelerator_t::get_path (hb_font_t *font, hb_codepoint_t glyph, hb_draw_session_t &draw_session) const
+{
+  return get_path_at (font, glyph, draw_session, hb_array (font->coords, font->num_coords));
+}
+
+bool OT::cff2::accelerator_t::get_path_at (hb_font_t *font, hb_codepoint_t glyph, hb_draw_session_t &draw_session, hb_array_t<const int> coords) const
 {
 #ifdef HB_NO_OT_FONT_CFF
   /* XXX Remove check when this code moves to .hh file. */
@@ -212,7 +208,7 @@ bool OT::cff2::accelerator_t::get_path (hb_font_t *font, hb_codepoint_t glyph, h
 
   unsigned int fd = fdSelect->get_fd (glyph);
   const hb_ubytes_t str = (*charStrings)[glyph];
-  cff2_cs_interp_env_t<number_t> env (str, *this, fd, font->coords, font->num_coords);
+  cff2_cs_interp_env_t<number_t> env (str, *this, fd, coords.arrayZ, coords.length);
   cff2_cs_interpreter_t<cff2_cs_opset_path_t, cff2_path_param_t, number_t> interp (env);
   cff2_path_param_t param (font, draw_session);
   if (unlikely (!interp.interpret (param))) return false;
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-ot-cff2-table.hh b/src/java.desktop/share/native/libharfbuzz/hb-ot-cff2-table.hh
index db10f22ec52..81d30f57a28 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-ot-cff2-table.hh
+++ b/src/java.desktop/share/native/libharfbuzz/hb-ot-cff2-table.hh
@@ -40,8 +40,6 @@ namespace CFF {
  */
 #define HB_OT_TAG_CFF2 HB_TAG('C','F','F','2')
 
-typedef CFFIndex<HBUINT32>  CFF2Index;
-
 typedef CFF2Index         CFF2CharStrings;
 typedef Subrs<HBUINT32>   CFF2Subrs;
 
@@ -64,9 +62,9 @@ struct CFF2FDSelect
   {
     switch (format)
     {
-    case 0: return format.static_size + u.format0.get_size (num_glyphs);
-    case 3: return format.static_size + u.format3.get_size ();
-    case 4: return format.static_size + u.format4.get_size ();
+    case 0: hb_barrier (); return format.static_size + u.format0.get_size (num_glyphs);
+    case 3: hb_barrier (); return format.static_size + u.format3.get_size ();
+    case 4: hb_barrier (); return format.static_size + u.format4.get_size ();
     default:return 0;
     }
   }
@@ -78,9 +76,9 @@ struct CFF2FDSelect
 
     switch (format)
     {
-    case 0: return u.format0.get_fd (glyph);
-    case 3: return u.format3.get_fd (glyph);
-    case 4: return u.format4.get_fd (glyph);
+    case 0: hb_barrier (); return u.format0.get_fd (glyph);
+    case 3: hb_barrier (); return u.format3.get_fd (glyph);
+    case 4: hb_barrier (); return u.format4.get_fd (glyph);
     default:return 0;
     }
   }
@@ -90,12 +88,13 @@ struct CFF2FDSelect
     TRACE_SANITIZE (this);
     if (unlikely (!c->check_struct (this)))
       return_trace (false);
+    hb_barrier ();
 
     switch (format)
     {
-    case 0: return_trace (u.format0.sanitize (c, fdcount));
-    case 3: return_trace (u.format3.sanitize (c, fdcount));
-    case 4: return_trace (u.format4.sanitize (c, fdcount));
+    case 0: hb_barrier (); return_trace (u.format0.sanitize (c, fdcount));
+    case 3: hb_barrier (); return_trace (u.format3.sanitize (c, fdcount));
+    case 4: hb_barrier (); return_trace (u.format4.sanitize (c, fdcount));
     default:return_trace (false);
     }
   }
@@ -110,19 +109,22 @@ struct CFF2FDSelect
   DEFINE_SIZE_MIN (2);
 };
 
-struct CFF2VariationStore
+struct CFF2ItemVariationStore
 {
   bool sanitize (hb_sanitize_context_t *c) const
   {
     TRACE_SANITIZE (this);
-    return_trace (likely (c->check_struct (this)) && c->check_range (&varStore, size) && varStore.sanitize (c));
+    return_trace (c->check_struct (this) &&
+                  hb_barrier () &&
+                  c->check_range (&varStore, size) &&
+                  varStore.sanitize (c));
   }
 
-  bool serialize (hb_serialize_context_t *c, const CFF2VariationStore *varStore)
+  bool serialize (hb_serialize_context_t *c, const CFF2ItemVariationStore *varStore)
   {
     TRACE_SERIALIZE (this);
     unsigned int size_ = varStore->get_size ();
-    CFF2VariationStore *dest = c->allocate_size<CFF2VariationStore> (size_);
+    CFF2ItemVariationStore *dest = c->allocate_size<CFF2ItemVariationStore> (size_);
     if (unlikely (!dest)) return_trace (false);
     hb_memcpy (dest, varStore, size_);
     return_trace (true);
@@ -131,9 +133,9 @@ struct CFF2VariationStore
   unsigned int get_size () const { return HBUINT16::static_size + size; }
 
   HBUINT16      size;
-  VariationStore  varStore;
+  ItemVariationStore  varStore;
 
-  DEFINE_SIZE_MIN (2 + VariationStore::min_size);
+  DEFINE_SIZE_MIN (2 + ItemVariationStore::min_size);
 };
 
 struct cff2_top_dict_values_t : top_dict_values_t<>
@@ -146,8 +148,8 @@ struct cff2_top_dict_values_t : top_dict_values_t<>
   }
   void fini () { top_dict_values_t<>::fini (); }
 
-  unsigned int  vstoreOffset;
-  unsigned int  FDSelectOffset;
+  int  vstoreOffset;
+  int  FDSelectOffset;
 };
 
 struct cff2_top_dict_opset_t : top_dict_opset_t<>
@@ -165,11 +167,11 @@ struct cff2_top_dict_opset_t : top_dict_opset_t<>
         break;
 
       case OpCode_vstore:
-        dictval.vstoreOffset = env.argStack.pop_uint ();
+        dictval.vstoreOffset = env.argStack.pop_int ();
         env.clear_args ();
         break;
       case OpCode_FDSelect:
-        dictval.FDSelectOffset = env.argStack.pop_uint ();
+        dictval.FDSelectOffset = env.argStack.pop_int ();
         env.clear_args ();
         break;
 
@@ -237,7 +239,7 @@ struct cff2_private_dict_values_base_t : dict_values_t<VAL>
   }
   void fini () { dict_values_t<VAL>::fini (); }
 
-  unsigned int      subrsOffset;
+  int                subrsOffset;
   const CFF2Subrs   *localSubrs;
   unsigned int      ivs;
 };
@@ -291,7 +293,7 @@ struct cff2_private_dict_opset_t : dict_opset_t
         env.clear_args ();
         break;
       case OpCode_Subrs:
-        dictval.subrsOffset = env.argStack.pop_uint ();
+        dictval.subrsOffset = env.argStack.pop_int ();
         env.clear_args ();
         break;
       case OpCode_vsindexdict:
@@ -340,7 +342,7 @@ struct cff2_private_dict_opset_subset_t : dict_opset_t
         return;
 
       case OpCode_Subrs:
-        dictval.subrsOffset = env.argStack.pop_uint ();
+        dictval.subrsOffset = env.argStack.pop_int ();
         env.clear_args ();
         break;
 
@@ -384,6 +386,7 @@ struct cff2
   {
     TRACE_SANITIZE (this);
     return_trace (c->check_struct (this) &&
+                  hb_barrier () &&
                   likely (version.major == 2));
   }
 
@@ -414,23 +417,22 @@ struct cff2
       { /* parse top dict */
         hb_ubytes_t topDictStr = (cff2 + cff2->topDict).as_ubytes (cff2->topDictSize);
         if (unlikely (!topDictStr.sanitize (&sc))) goto fail;
+        hb_barrier ();
         num_interp_env_t env (topDictStr);
         cff2_top_dict_interpreter_t top_interp (env);
         topDict.init ();
         if (unlikely (!top_interp.interpret (topDict))) goto fail;
       }
 
-      globalSubrs = &StructAtOffset<CFF2Subrs> (cff2, cff2->topDict + cff2->topDictSize);
-      varStore = &StructAtOffsetOrNull<CFF2VariationStore> (cff2, topDict.vstoreOffset);
-      charStrings = &StructAtOffsetOrNull<CFF2CharStrings> (cff2, topDict.charStringsOffset);
-      fdArray = &StructAtOffsetOrNull<CFF2FDArray> (cff2, topDict.FDArrayOffset);
-      fdSelect = &StructAtOffsetOrNull<CFF2FDSelect> (cff2, topDict.FDSelectOffset);
+      globalSubrs = &StructAtOffsetOrNull<CFF2Subrs> (cff2, cff2->topDict + cff2->topDictSize, sc);
+      varStore = &StructAtOffsetOrNull<CFF2ItemVariationStore> (cff2, topDict.vstoreOffset, sc);
+      charStrings = &StructAtOffsetOrNull<CFF2CharStrings> (cff2, topDict.charStringsOffset, sc);
+      fdArray = &StructAtOffsetOrNull<CFF2FDArray> (cff2, topDict.FDArrayOffset, sc);
+      fdSelect = &StructAtOffsetOrNull<CFF2FDSelect> (cff2, topDict.FDSelectOffset, sc, fdArray->count);
 
-      if (((varStore != &Null (CFF2VariationStore)) && unlikely (!varStore->sanitize (&sc))) ||
-          (charStrings == &Null (CFF2CharStrings)) || unlikely (!charStrings->sanitize (&sc)) ||
-          (globalSubrs == &Null (CFF2Subrs)) || unlikely (!globalSubrs->sanitize (&sc)) ||
-          (fdArray == &Null (CFF2FDArray)) || unlikely (!fdArray->sanitize (&sc)) ||
-          (((fdSelect != &Null (CFF2FDSelect)) && unlikely (!fdSelect->sanitize (&sc, fdArray->count)))))
+      if (charStrings == &Null (CFF2CharStrings) ||
+          globalSubrs == &Null (CFF2Subrs) ||
+          fdArray == &Null (CFF2FDArray))
         goto fail;
 
       num_glyphs = charStrings->count;
@@ -446,6 +448,7 @@ struct cff2
       {
         const hb_ubytes_t fontDictStr = (*fdArray)[i];
         if (unlikely (!fontDictStr.sanitize (&sc))) goto fail;
+        hb_barrier ();
         cff2_font_dict_values_t  *font;
         num_interp_env_t env (fontDictStr);
         cff2_font_dict_interpreter_t font_interp (env);
@@ -454,17 +457,14 @@ struct cff2
         font->init ();
         if (unlikely (!font_interp.interpret (*font))) goto fail;
 
-        const hb_ubytes_t privDictStr = StructAtOffsetOrNull<UnsizedByteStr> (cff2, font->privateDictInfo.offset).as_ubytes (font->privateDictInfo.size);
-        if (unlikely (!privDictStr.sanitize (&sc))) goto fail;
+        const hb_ubytes_t privDictStr = StructAtOffsetOrNull<UnsizedByteStr> (cff2, font->privateDictInfo.offset, sc, font->privateDictInfo.size).as_ubytes (font->privateDictInfo.size);
+        if (unlikely (privDictStr == (const unsigned char *) &Null (UnsizedByteStr))) goto fail;
         cff2_priv_dict_interp_env_t env2 (privDictStr);
         dict_interpreter_t<PRIVOPSET, PRIVDICTVAL, cff2_priv_dict_interp_env_t> priv_interp (env2);
         privateDicts[i].init ();
         if (unlikely (!priv_interp.interpret (privateDicts[i]))) goto fail;
 
-        privateDicts[i].localSubrs = &StructAtOffsetOrNull<CFF2Subrs> (&privDictStr[0], privateDicts[i].subrsOffset);
-        if (privateDicts[i].localSubrs != &Null (CFF2Subrs) &&
-          unlikely (!privateDicts[i].localSubrs->sanitize (&sc)))
-          goto fail;
+        privateDicts[i].localSubrs = &StructAtOffsetOrNull<CFF2Subrs> (&privDictStr[0], privateDicts[i].subrsOffset, sc);
       }
 
       return;
@@ -499,7 +499,7 @@ struct cff2
     hb_blob_t                   *blob = nullptr;
     cff2_top_dict_values_t      topDict;
     const CFF2Subrs             *globalSubrs = nullptr;
-    const CFF2VariationStore    *varStore = nullptr;
+    const CFF2ItemVariationStore        *varStore = nullptr;
     const CFF2CharStrings       *charStrings = nullptr;
     const CFF2FDArray           *fdArray = nullptr;
     const CFF2FDSelect          *fdSelect = nullptr;
@@ -518,8 +518,8 @@ struct cff2
     HB_INTERNAL bool get_extents (hb_font_t *font,
                                   hb_codepoint_t glyph,
                                   hb_glyph_extents_t *extents) const;
-    HB_INTERNAL bool paint_glyph (hb_font_t *font, hb_codepoint_t glyph, hb_paint_funcs_t *funcs, void *data, hb_color_t foreground) const;
     HB_INTERNAL bool get_path (hb_font_t *font, hb_codepoint_t glyph, hb_draw_session_t &draw_session) const;
+    HB_INTERNAL bool get_path_at (hb_font_t *font, hb_codepoint_t glyph, hb_draw_session_t &draw_session, hb_array_t<const int> coords) const;
   };
 
   struct accelerator_subset_t : accelerator_templ_t<cff2_private_dict_opset_subset_t, cff2_private_dict_values_subset_t>
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-ot-cmap-table.hh b/src/java.desktop/share/native/libharfbuzz/hb-ot-cmap-table.hh
index 7e6ced3df4c..249d4cac5db 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-ot-cmap-table.hh
+++ b/src/java.desktop/share/native/libharfbuzz/hb-ot-cmap-table.hh
@@ -41,6 +41,148 @@
 
 namespace OT {
 
+static inline uint8_t unicode_to_macroman (hb_codepoint_t u)
+{
+  static const struct unicode_to_macroman_t
+  {
+    uint16_t unicode;
+    uint8_t macroman;
+  }
+  mapping[] =
+  {
+    { 0x00A0, 0xCA },
+    { 0x00A1, 0xC1 },
+    { 0x00A2, 0xA2 },
+    { 0x00A3, 0xA3 },
+    { 0x00A5, 0xB4 },
+    { 0x00A7, 0xA4 },
+    { 0x00A8, 0xAC },
+    { 0x00A9, 0xA9 },
+    { 0x00AA, 0xBB },
+    { 0x00AB, 0xC7 },
+    { 0x00AC, 0xC2 },
+    { 0x00AE, 0xA8 },
+    { 0x00AF, 0xF8 },
+    { 0x00B0, 0xA1 },
+    { 0x00B1, 0xB1 },
+    { 0x00B4, 0xAB },
+    { 0x00B5, 0xB5 },
+    { 0x00B6, 0xA6 },
+    { 0x00B7, 0xE1 },
+    { 0x00B8, 0xFC },
+    { 0x00BA, 0xBC },
+    { 0x00BB, 0xC8 },
+    { 0x00BF, 0xC0 },
+    { 0x00C0, 0xCB },
+    { 0x00C1, 0xE7 },
+    { 0x00C2, 0xE5 },
+    { 0x00C3, 0xCC },
+    { 0x00C4, 0x80 },
+    { 0x00C5, 0x81 },
+    { 0x00C6, 0xAE },
+    { 0x00C7, 0x82 },
+    { 0x00C8, 0xE9 },
+    { 0x00C9, 0x83 },
+    { 0x00CA, 0xE6 },
+    { 0x00CB, 0xE8 },
+    { 0x00CC, 0xED },
+    { 0x00CD, 0xEA },
+    { 0x00CE, 0xEB },
+    { 0x00CF, 0xEC },
+    { 0x00D1, 0x84 },
+    { 0x00D2, 0xF1 },
+    { 0x00D3, 0xEE },
+    { 0x00D4, 0xEF },
+    { 0x00D5, 0xCD },
+    { 0x00D6, 0x85 },
+    { 0x00D8, 0xAF },
+    { 0x00D9, 0xF4 },
+    { 0x00DA, 0xF2 },
+    { 0x00DB, 0xF3 },
+    { 0x00DC, 0x86 },
+    { 0x00DF, 0xA7 },
+    { 0x00E0, 0x88 },
+    { 0x00E1, 0x87 },
+    { 0x00E2, 0x89 },
+    { 0x00E3, 0x8B },
+    { 0x00E4, 0x8A },
+    { 0x00E5, 0x8C },
+    { 0x00E6, 0xBE },
+    { 0x00E7, 0x8D },
+    { 0x00E8, 0x8F },
+    { 0x00E9, 0x8E },
+    { 0x00EA, 0x90 },
+    { 0x00EB, 0x91 },
+    { 0x00EC, 0x93 },
+    { 0x00ED, 0x92 },
+    { 0x00EE, 0x94 },
+    { 0x00EF, 0x95 },
+    { 0x00F1, 0x96 },
+    { 0x00F2, 0x98 },
+    { 0x00F3, 0x97 },
+    { 0x00F4, 0x99 },
+    { 0x00F5, 0x9B },
+    { 0x00F6, 0x9A },
+    { 0x00F7, 0xD6 },
+    { 0x00F8, 0xBF },
+    { 0x00F9, 0x9D },
+    { 0x00FA, 0x9C },
+    { 0x00FB, 0x9E },
+    { 0x00FC, 0x9F },
+    { 0x00FF, 0xD8 },
+    { 0x0131, 0xF5 },
+    { 0x0152, 0xCE },
+    { 0x0153, 0xCF },
+    { 0x0178, 0xD9 },
+    { 0x0192, 0xC4 },
+    { 0x02C6, 0xF6 },
+    { 0x02C7, 0xFF },
+    { 0x02D8, 0xF9 },
+    { 0x02D9, 0xFA },
+    { 0x02DA, 0xFB },
+    { 0x02DB, 0xFE },
+    { 0x02DC, 0xF7 },
+    { 0x02DD, 0xFD },
+    { 0x03A9, 0xBD },
+    { 0x03C0, 0xB9 },
+    { 0x2013, 0xD0 },
+    { 0x2014, 0xD1 },
+    { 0x2018, 0xD4 },
+    { 0x2019, 0xD5 },
+    { 0x201A, 0xE2 },
+    { 0x201C, 0xD2 },
+    { 0x201D, 0xD3 },
+    { 0x201E, 0xE3 },
+    { 0x2020, 0xA0 },
+    { 0x2021, 0xE0 },
+    { 0x2022, 0xA5 },
+    { 0x2026, 0xC9 },
+    { 0x2030, 0xE4 },
+    { 0x2039, 0xDC },
+    { 0x203A, 0xDD },
+    { 0x2044, 0xDA },
+    { 0x20AC, 0xDB },
+    { 0x2122, 0xAA },
+    { 0x2202, 0xB6 },
+    { 0x2206, 0xC6 },
+    { 0x220F, 0xB8 },
+    { 0x2211, 0xB7 },
+    { 0x221A, 0xC3 },
+    { 0x221E, 0xB0 },
+    { 0x222B, 0xBA },
+    { 0x2248, 0xC5 },
+    { 0x2260, 0xAD },
+    { 0x2264, 0xB2 },
+    { 0x2265, 0xB3 },
+    { 0x25CA, 0xD7 },
+    { 0xF8FF, 0xF0 },
+    { 0xFB01, 0xDE },
+    { 0xFB02, 0xDF },
+  };
+  auto *c = hb_bsearch (u, mapping, ARRAY_LENGTH (mapping), sizeof (mapping[0]),
+                        _hb_cmp_operator<uint16_t, uint16_t>);
+  return c ? c->macroman : 0;
+}
 
 struct CmapSubtableFormat0
 {
@@ -556,6 +698,7 @@ struct CmapSubtableFormat4
     TRACE_SANITIZE (this);
     if (unlikely (!c->check_struct (this)))
       return_trace (false);
+    hb_barrier ();
 
     if (unlikely (!c->check_range (this, length)))
     {
@@ -742,10 +885,11 @@ struct CmapSubtableLongSegmented
                         unsigned num_glyphs) const
   {
     hb_codepoint_t last_end = 0;
-    for (unsigned i = 0; i < this->groups.len; i++)
+    unsigned count = this->groups.len;
+    for (unsigned i = 0; i < count; i++)
     {
-      hb_codepoint_t start = this->groups[i].startCharCode;
-      hb_codepoint_t end = hb_min ((hb_codepoint_t) this->groups[i].endCharCode,
+      hb_codepoint_t start = this->groups.arrayZ[i].startCharCode;
+      hb_codepoint_t end = hb_min ((hb_codepoint_t) this->groups.arrayZ[i].endCharCode,
                                    (hb_codepoint_t) HB_UNICODE_MAX);
       if (unlikely (start > end || start < last_end)) {
         // Range is not in order and is invalid, skip it.
@@ -754,7 +898,7 @@ struct CmapSubtableLongSegmented
       last_end = end;
 
 
-      hb_codepoint_t gid = this->groups[i].glyphID;
+      hb_codepoint_t gid = this->groups.arrayZ[i].glyphID;
       if (!gid)
       {
         if (T::formatNumber == 13) continue;
@@ -767,9 +911,9 @@ struct CmapSubtableLongSegmented
 
       mapping->alloc (mapping->get_population () + end - start + 1);
 
+      unicodes->add_range (start, end);
       for (unsigned cp = start; cp <= end; cp++)
       {
-        unicodes->add (cp);
         mapping->set (cp, gid);
         gid += T::increment;
       }
@@ -1253,6 +1397,9 @@ struct CmapSubtableFormat14
     hb_vector_t<hb_pair_t<unsigned, unsigned>> obj_indices;
     for (int i = src_tbl->record.len - 1; i >= 0; i--)
     {
+      if (!unicodes->has(src_tbl->record[i].varSelector))
+        continue;
+
       hb_pair_t<unsigned, unsigned> result = src_tbl->record[i].copy (c, unicodes, glyphs_requested, glyph_map, base);
       if (result.first || result.second)
         obj_indices.push (result);
@@ -1309,6 +1456,7 @@ struct CmapSubtableFormat14
   {
     + hb_iter (record)
     | hb_filter (hb_bool, &VariationSelectorRecord::nonDefaultUVS)
+    | hb_filter (unicodes, &VariationSelectorRecord::varSelector)
     | hb_map (&VariationSelectorRecord::nonDefaultUVS)
     | hb_map (hb_add (this))
     | hb_apply ([=] (const NonDefaultUVS& _) { _.closure_glyphs (unicodes, glyphset); })
@@ -1353,12 +1501,12 @@ struct CmapSubtable
                   hb_codepoint_t *glyph) const
   {
     switch (u.format) {
-    case  0: return u.format0 .get_glyph (codepoint, glyph);
-    case  4: return u.format4 .get_glyph (codepoint, glyph);
-    case  6: return u.format6 .get_glyph (codepoint, glyph);
-    case 10: return u.format10.get_glyph (codepoint, glyph);
-    case 12: return u.format12.get_glyph (codepoint, glyph);
-    case 13: return u.format13.get_glyph (codepoint, glyph);
+    case  0: hb_barrier (); return u.format0 .get_glyph (codepoint, glyph);
+    case  4: hb_barrier (); return u.format4 .get_glyph (codepoint, glyph);
+    case  6: hb_barrier (); return u.format6 .get_glyph (codepoint, glyph);
+    case 10: hb_barrier (); return u.format10.get_glyph (codepoint, glyph);
+    case 12: hb_barrier (); return u.format12.get_glyph (codepoint, glyph);
+    case 13: hb_barrier (); return u.format13.get_glyph (codepoint, glyph);
     case 14:
     default: return false;
     }
@@ -1366,12 +1514,12 @@ struct CmapSubtable
   void collect_unicodes (hb_set_t *out, unsigned int num_glyphs = UINT_MAX) const
   {
     switch (u.format) {
-    case  0: u.format0 .collect_unicodes (out); return;
-    case  4: u.format4 .collect_unicodes (out); return;
-    case  6: u.format6 .collect_unicodes (out); return;
-    case 10: u.format10.collect_unicodes (out); return;
-    case 12: u.format12.collect_unicodes (out, num_glyphs); return;
-    case 13: u.format13.collect_unicodes (out, num_glyphs); return;
+    case  0: hb_barrier (); u.format0 .collect_unicodes (out); return;
+    case  4: hb_barrier (); u.format4 .collect_unicodes (out); return;
+    case  6: hb_barrier (); u.format6 .collect_unicodes (out); return;
+    case 10: hb_barrier (); u.format10.collect_unicodes (out); return;
+    case 12: hb_barrier (); u.format12.collect_unicodes (out, num_glyphs); return;
+    case 13: hb_barrier (); u.format13.collect_unicodes (out, num_glyphs); return;
     case 14:
     default: return;
     }
@@ -1382,12 +1530,12 @@ struct CmapSubtable
                         unsigned num_glyphs = UINT_MAX) const
   {
     switch (u.format) {
-    case  0: u.format0 .collect_mapping (unicodes, mapping); return;
-    case  4: u.format4 .collect_mapping (unicodes, mapping); return;
-    case  6: u.format6 .collect_mapping (unicodes, mapping); return;
-    case 10: u.format10.collect_mapping (unicodes, mapping); return;
-    case 12: u.format12.collect_mapping (unicodes, mapping, num_glyphs); return;
-    case 13: u.format13.collect_mapping (unicodes, mapping, num_glyphs); return;
+    case  0: hb_barrier (); u.format0 .collect_mapping (unicodes, mapping); return;
+    case  4: hb_barrier (); u.format4 .collect_mapping (unicodes, mapping); return;
+    case  6: hb_barrier (); u.format6 .collect_mapping (unicodes, mapping); return;
+    case 10: hb_barrier (); u.format10.collect_mapping (unicodes, mapping); return;
+    case 12: hb_barrier (); u.format12.collect_mapping (unicodes, mapping, num_glyphs); return;
+    case 13: hb_barrier (); u.format13.collect_mapping (unicodes, mapping, num_glyphs); return;
     case 14:
     default: return;
     }
@@ -1396,12 +1544,12 @@ struct CmapSubtable
   unsigned get_language () const
   {
     switch (u.format) {
-    case  0: return u.format0 .get_language ();
-    case  4: return u.format4 .get_language ();
-    case  6: return u.format6 .get_language ();
-    case 10: return u.format10.get_language ();
-    case 12: return u.format12.get_language ();
-    case 13: return u.format13.get_language ();
+    case  0: hb_barrier (); return u.format0 .get_language ();
+    case  4: hb_barrier (); return u.format4 .get_language ();
+    case  6: hb_barrier (); return u.format6 .get_language ();
+    case 10: hb_barrier (); return u.format10.get_language ();
+    case 12: hb_barrier (); return u.format12.get_language ();
+    case 13: hb_barrier (); return u.format13.get_language ();
     case 14:
     default: return 0;
     }
@@ -1416,9 +1564,9 @@ struct CmapSubtable
                   const void *base)
   {
     switch (format) {
-    case  4: return u.format4.serialize (c, it);
-    case 12: return u.format12.serialize (c, it);
-    case 14: return u.format14.serialize (c, &plan->unicodes, &plan->glyphs_requested, plan->glyph_map, base);
+    case  4: hb_barrier (); return u.format4.serialize (c, it);
+    case 12: hb_barrier (); return u.format12.serialize (c, it);
+    case 14: hb_barrier (); return u.format14.serialize (c, &plan->unicodes, &plan->glyphs_requested, plan->glyph_map, base);
     default: return;
     }
   }
@@ -1427,14 +1575,15 @@ struct CmapSubtable
   {
     TRACE_SANITIZE (this);
     if (!u.format.sanitize (c)) return_trace (false);
+    hb_barrier ();
     switch (u.format) {
-    case  0: return_trace (u.format0 .sanitize (c));
-    case  4: return_trace (u.format4 .sanitize (c));
-    case  6: return_trace (u.format6 .sanitize (c));
-    case 10: return_trace (u.format10.sanitize (c));
-    case 12: return_trace (u.format12.sanitize (c));
-    case 13: return_trace (u.format13.sanitize (c));
-    case 14: return_trace (u.format14.sanitize (c));
+    case  0: hb_barrier (); return_trace (u.format0 .sanitize (c));
+    case  4: hb_barrier (); return_trace (u.format4 .sanitize (c));
+    case  6: hb_barrier (); return_trace (u.format6 .sanitize (c));
+    case 10: hb_barrier (); return_trace (u.format10.sanitize (c));
+    case 12: hb_barrier (); return_trace (u.format12.sanitize (c));
+    case 13: hb_barrier (); return_trace (u.format13.sanitize (c));
+    case 14: hb_barrier (); return_trace (u.format14.sanitize (c));
     default:return_trace (true);
     }
   }
@@ -1462,8 +1611,11 @@ struct EncodingRecord
     int ret;
     ret = platformID.cmp (other.platformID);
     if (ret) return ret;
-    ret = encodingID.cmp (other.encodingID);
-    if (ret) return ret;
+    if (other.encodingID != 0xFFFF)
+    {
+      ret = encodingID.cmp (other.encodingID);
+      if (ret) return ret;
+    }
     return 0;
   }
 
@@ -1811,9 +1963,13 @@ struct cmap
                                          c->plan));
   }
 
-  const CmapSubtable *find_best_subtable (bool *symbol = nullptr) const
+  const CmapSubtable *find_best_subtable (bool *symbol = nullptr,
+                                          bool *mac = nullptr,
+                                          bool *macroman = nullptr) const
   {
     if (symbol) *symbol = false;
+    if (mac) *mac = false;
+    if (macroman) *macroman = false;
 
     const CmapSubtable *subtable;
 
@@ -1838,6 +1994,20 @@ struct cmap
     if ((subtable = this->find_subtable (0, 1))) return subtable;
     if ((subtable = this->find_subtable (0, 0))) return subtable;
 
+    /* MacRoman subtable. */
+    if ((subtable = this->find_subtable (1, 0)))
+    {
+      if (mac) *mac = true;
+      if (macroman) *macroman = true;
+      return subtable;
+    }
+    /* Any other Mac subtable; we just map ASCII for these. */
+    if ((subtable = this->find_subtable (1, 0xFFFF)))
+    {
+      if (mac) *mac = true;
+      return subtable;
+    }
+
     /* Meh. */
     return &Null (CmapSubtable);
   }
@@ -1849,8 +2019,8 @@ struct cmap
     accelerator_t (hb_face_t *face)
     {
       this->table = hb_sanitize_context_t ().reference_table<cmap> (face);
-      bool symbol;
-      this->subtable = table->find_best_subtable (&symbol);
+      bool symbol, mac, macroman;
+      this->subtable = table->find_best_subtable (&symbol, &mac, &macroman);
       this->subtable_uvs = &Null (CmapSubtableFormat14);
       {
         const CmapSubtable *st = table->find_subtable (0, 5);
@@ -1859,6 +2029,7 @@ struct cmap
       }
 
       this->get_glyph_data = subtable;
+#ifndef HB_NO_CMAP_LEGACY_SUBTABLES
       if (unlikely (symbol))
       {
         switch ((unsigned) face->table.OS2->get_font_page ()) {
@@ -1878,7 +2049,16 @@ struct cmap
           break;
         }
       }
+      else if (unlikely (macroman))
+      {
+        this->get_glyph_funcZ = get_glyph_from_macroman<CmapSubtable>;
+      }
+      else if (unlikely (mac))
+      {
+        this->get_glyph_funcZ = get_glyph_from_ascii<CmapSubtable>;
+      }
       else
+#endif
       {
         switch (subtable->u.format) {
         /* Accelerate format 4 and format 12. */
@@ -1921,7 +2101,7 @@ struct cmap
                             hb_codepoint_t *glyph,
                             cache_t *cache = nullptr) const
     {
-      if (unlikely (!this->get_glyph_funcZ)) return 0;
+      if (unlikely (!this->get_glyph_funcZ)) return false;
       return _cached_get (unicode, glyph, cache);
     }
 
@@ -2003,6 +2183,28 @@ struct cmap
       return false;
     }
 
+    template <typename Type>
+    HB_INTERNAL static bool get_glyph_from_ascii (const void *obj,
+                                                  hb_codepoint_t codepoint,
+                                                  hb_codepoint_t *glyph)
+    {
+      const Type *typed_obj = (const Type *) obj;
+      return codepoint < 0x80 && typed_obj->get_glyph (codepoint, glyph);
+    }
+
+    template <typename Type>
+    HB_INTERNAL static bool get_glyph_from_macroman (const void *obj,
+                                                     hb_codepoint_t codepoint,
+                                                     hb_codepoint_t *glyph)
+    {
+      if (get_glyph_from_ascii<Type> (obj, codepoint, glyph))
+        return true;
+
+      const Type *typed_obj = (const Type *) obj;
+      unsigned c = unicode_to_macroman (codepoint);
+      return c && typed_obj->get_glyph (c, glyph);
+    }
+
     private:
     hb_nonnull_ptr_t<const CmapSubtable> subtable;
     hb_nonnull_ptr_t<const CmapSubtableFormat14> subtable_uvs;
@@ -2032,34 +2234,13 @@ struct cmap
     return &(this+result.subtable);
   }
 
-  const EncodingRecord *find_encodingrec (unsigned int platform_id,
-                                          unsigned int encoding_id) const
-  {
-    EncodingRecord key;
-    key.platformID = platform_id;
-    key.encodingID = encoding_id;
-
-    return encodingRecord.as_array ().bsearch (key);
-  }
-
-  bool find_subtable (unsigned format) const
-  {
-    auto it =
-    + hb_iter (encodingRecord)
-    | hb_map (&EncodingRecord::subtable)
-    | hb_map (hb_add (this))
-    | hb_filter ([&] (const CmapSubtable& _) { return _.u.format == format; })
-    ;
-
-    return it.len ();
-  }
-
   public:
 
   bool sanitize (hb_sanitize_context_t *c) const
   {
     TRACE_SANITIZE (this);
     return_trace (c->check_struct (this) &&
+                  hb_barrier () &&
                   likely (version == 0) &&
                   encodingRecord.sanitize (c, this));
   }
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-ot-face-table-list.hh b/src/java.desktop/share/native/libharfbuzz/hb-ot-face-table-list.hh
index b552dfdd9da..97825f4d19c 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-ot-face-table-list.hh
+++ b/src/java.desktop/share/native/libharfbuzz/hb-ot-face-table-list.hh
@@ -95,12 +95,18 @@ HB_OT_CORE_TABLE (OT, fvar)
 HB_OT_CORE_TABLE (OT, avar)
 HB_OT_CORE_TABLE (OT, cvar)
 HB_OT_ACCELERATOR (OT, gvar)
+#ifndef HB_NO_BEYOND_64K
+HB_OT_ACCELERATOR (OT, GVAR)
+#endif
 HB_OT_CORE_TABLE (OT, MVAR)
+#ifndef HB_NO_VAR_COMPOSITES
+HB_OT_ACCELERATOR (OT, VARC)
+#endif
 #endif
 
 /* Legacy kern. */
 #ifndef HB_NO_OT_KERN
-HB_OT_CORE_TABLE (OT, kern)
+HB_OT_ACCELERATOR (OT, kern)
 #endif
 
 /* OpenType shaping. */
@@ -118,9 +124,9 @@ HB_OT_CORE_TABLE (OT, BASE)
 
 /* AAT shaping. */
 #ifndef HB_NO_AAT
-HB_OT_TABLE (AAT, morx)
-HB_OT_TABLE (AAT, mort)
-HB_OT_TABLE (AAT, kerx)
+HB_OT_ACCELERATOR (AAT, morx)
+HB_OT_ACCELERATOR (AAT, mort)
+HB_OT_ACCELERATOR (AAT, kerx)
 HB_OT_TABLE (AAT, ankr)
 HB_OT_TABLE (AAT, trak)
 HB_OT_TABLE (AAT, ltag)
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-ot-face.cc b/src/java.desktop/share/native/libharfbuzz/hb-ot-face.cc
index 2243ee02874..1cf14f3ebc6 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-ot-face.cc
+++ b/src/java.desktop/share/native/libharfbuzz/hb-ot-face.cc
@@ -41,6 +41,9 @@
 #include "hb-ot-layout-gdef-table.hh"
 #include "hb-ot-layout-gsub-table.hh"
 #include "hb-ot-layout-gpos-table.hh"
+#include "hb-ot-var-varc-table.hh"
+#include "hb-aat-layout-kerx-table.hh"
+#include "hb-aat-layout-morx-table.hh"
 
 
 void hb_ot_face_t::init0 (hb_face_t *face)
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-ot-font.cc b/src/java.desktop/share/native/libharfbuzz/hb-ot-font.cc
index deec909b22e..2a633c77816 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-ot-font.cc
+++ b/src/java.desktop/share/native/libharfbuzz/hb-ot-font.cc
@@ -36,13 +36,17 @@
 #include "hb-ot-face.hh"
 #include "hb-outline.hh"
 
+#ifndef HB_NO_AAT
+#include "hb-aat-layout-trak-table.hh"
+#endif
 #include "hb-ot-cmap-table.hh"
 #include "hb-ot-glyf-table.hh"
 #include "hb-ot-cff2-table.hh"
 #include "hb-ot-cff1-table.hh"
 #include "hb-ot-hmtx-table.hh"
 #include "hb-ot-post-table.hh"
-#include "hb-ot-stat-table.hh" // Just so we compile it; unused otherwise.
+#include "hb-ot-stat-table.hh"
+#include "hb-ot-var-varc-table.hh"
 #include "hb-ot-vorg-table.hh"
 #include "OT/Color/CBDT/CBDT.hh"
 #include "OT/Color/COLR/COLR.hh"
@@ -72,6 +76,10 @@ struct hb_ot_font_t
 {
   const hb_ot_face_t *ot_face;
 
+#ifndef HB_NO_AAT
+  bool apply_trak;
+#endif
+
 #ifndef HB_NO_OT_FONT_CMAP_CACHE
   hb_ot_font_cmap_cache_t *cmap_cache;
 #endif
@@ -90,6 +98,15 @@ _hb_ot_font_create (hb_font_t *font)
 
   ot_font->ot_face = &font->face->table;
 
+#ifndef HB_NO_AAT
+  /* According to Ned, trak is applied by default for "modern fonts", as detected by presence of STAT table. */
+#ifndef HB_NO_STYLE
+  ot_font->apply_trak = font->face->table.STAT->has_data () && font->face->table.trak->has_data ();
+#else
+  ot_font->apply_trak = false;
+#endif
+#endif
+
 #ifndef HB_NO_OT_FONT_CMAP_CACHE
   // retry:
   auto *cmap_cache  = (hb_ot_font_cmap_cache_t *) hb_face_get_user_data (font->face,
@@ -199,7 +216,6 @@ hb_ot_get_glyph_h_advances (hb_font_t* font, void* font_data,
                             unsigned advance_stride,
                             void *user_data HB_UNUSED)
 {
-
   const hb_ot_font_t *ot_font = (const hb_ot_font_t *) font_data;
   const hb_ot_face_t *ot_face = ot_font->ot_face;
   const OT::hmtx_accelerator_t &hmtx = *ot_face->hmtx;
@@ -208,12 +224,12 @@ hb_ot_get_glyph_h_advances (hb_font_t* font, void* font_data,
 
 #if !defined(HB_NO_VAR) && !defined(HB_NO_OT_FONT_ADVANCE_CACHE)
   const OT::HVAR &HVAR = *hmtx.var_table;
-  const OT::VariationStore &varStore = &HVAR + HVAR.varStore;
-  OT::VariationStore::cache_t *varStore_cache = font->num_coords * count >= 128 ? varStore.create_cache () : nullptr;
+  const OT::ItemVariationStore &varStore = &HVAR + HVAR.varStore;
+  OT::ItemVariationStore::cache_t *varStore_cache = font->num_coords * count >= 128 ? varStore.create_cache () : nullptr;
 
   bool use_cache = font->num_coords;
 #else
-  OT::VariationStore::cache_t *varStore_cache = nullptr;
+  OT::ItemVariationStore::cache_t *varStore_cache = nullptr;
   bool use_cache = false;
 #endif
 
@@ -277,7 +293,7 @@ hb_ot_get_glyph_h_advances (hb_font_t* font, void* font_data,
   }
 
 #if !defined(HB_NO_VAR) && !defined(HB_NO_OT_FONT_ADVANCE_CACHE)
-  OT::VariationStore::destroy_cache (varStore_cache);
+  OT::ItemVariationStore::destroy_cache (varStore_cache);
 #endif
 
   if (font->x_strength && !font->embolden_in_place)
@@ -291,6 +307,20 @@ hb_ot_get_glyph_h_advances (hb_font_t* font, void* font_data,
       first_advance = &StructAtOffsetUnaligned<hb_position_t> (first_advance, advance_stride);
     }
   }
+
+#ifndef HB_NO_AAT
+  if (ot_font->apply_trak)
+  {
+    hb_position_t tracking = font->face->table.trak->get_h_tracking (font);
+    first_advance = orig_first_advance;
+    for (unsigned int i = 0; i < count; i++)
+    {
+      *first_advance += tracking;
+      first_glyph = &StructAtOffsetUnaligned<hb_codepoint_t> (first_glyph, glyph_stride);
+      first_advance = &StructAtOffsetUnaligned<hb_position_t> (first_advance, advance_stride);
+    }
+  }
+#endif
 }
 
 #ifndef HB_NO_VERTICAL
@@ -313,10 +343,10 @@ hb_ot_get_glyph_v_advances (hb_font_t* font, void* font_data,
   {
 #if !defined(HB_NO_VAR) && !defined(HB_NO_OT_FONT_ADVANCE_CACHE)
     const OT::VVAR &VVAR = *vmtx.var_table;
-    const OT::VariationStore &varStore = &VVAR + VVAR.varStore;
-    OT::VariationStore::cache_t *varStore_cache = font->num_coords ? varStore.create_cache () : nullptr;
+    const OT::ItemVariationStore &varStore = &VVAR + VVAR.varStore;
+    OT::ItemVariationStore::cache_t *varStore_cache = font->num_coords ? varStore.create_cache () : nullptr;
 #else
-    OT::VariationStore::cache_t *varStore_cache = nullptr;
+    OT::ItemVariationStore::cache_t *varStore_cache = nullptr;
 #endif
 
     for (unsigned int i = 0; i < count; i++)
@@ -327,7 +357,7 @@ hb_ot_get_glyph_v_advances (hb_font_t* font, void* font_data,
     }
 
 #if !defined(HB_NO_VAR) && !defined(HB_NO_OT_FONT_ADVANCE_CACHE)
-    OT::VariationStore::destroy_cache (varStore_cache);
+    OT::ItemVariationStore::destroy_cache (varStore_cache);
 #endif
   }
   else
@@ -355,6 +385,20 @@ hb_ot_get_glyph_v_advances (hb_font_t* font, void* font_data,
       first_advance = &StructAtOffsetUnaligned<hb_position_t> (first_advance, advance_stride);
     }
   }
+
+#ifndef HB_NO_AAT
+  if (ot_font->apply_trak)
+  {
+    hb_position_t tracking = font->face->table.trak->get_v_tracking (font);
+    first_advance = orig_first_advance;
+    for (unsigned int i = 0; i < count; i++)
+    {
+      *first_advance += tracking;
+      first_glyph = &StructAtOffsetUnaligned<hb_codepoint_t> (first_glyph, glyph_stride);
+      first_advance = &StructAtOffsetUnaligned<hb_position_t> (first_advance, advance_stride);
+    }
+  }
+#endif
 }
 #endif
 
@@ -523,6 +567,10 @@ hb_ot_draw_glyph (hb_font_t *font,
   { // Need draw_session to be destructed before emboldening.
     hb_draw_session_t draw_session (embolden ? hb_outline_recording_pen_get_funcs () : draw_funcs,
                                     embolden ? &outline : draw_data, font->slant_xy);
+#ifndef HB_NO_VAR_COMPOSITES
+    if (!font->face->table.VARC->get_path (font, glyph, draw_session))
+#endif
+    // Keep the following in synch with VARC::get_path_at()
     if (!font->face->table.glyf->get_path (font, glyph, draw_session))
 #ifndef HB_NO_CFF
     if (!font->face->table.cff2->get_path (font, glyph, draw_session))
@@ -563,11 +611,11 @@ hb_ot_paint_glyph (hb_font_t *font,
   if (font->face->table.sbix->paint_glyph (font, glyph, paint_funcs, paint_data)) return;
 #endif
 #endif
-  if (font->face->table.glyf->paint_glyph (font, glyph, paint_funcs, paint_data, foreground)) return;
-#ifndef HB_NO_CFF
-  if (font->face->table.cff2->paint_glyph (font, glyph, paint_funcs, paint_data, foreground)) return;
-  if (font->face->table.cff1->paint_glyph (font, glyph, paint_funcs, paint_data, foreground)) return;
-#endif
+
+  // Outline glyph
+  paint_funcs->push_clip_glyph (paint_data, glyph, font);
+  paint_funcs->color (paint_data, true, foreground);
+  paint_funcs->pop_clip (paint_data);
 }
 #endif
 
@@ -634,7 +682,9 @@ _hb_ot_get_font_funcs ()
  * hb_ot_font_set_funcs:
  * @font: #hb_font_t to work upon
  *
- * Sets the font functions to use when working with @font.
+ * Sets the font functions to use when working with @font to
+ * the HarfBuzz's native implementation. This is the default
+ * for fonts newly created.
  *
  * Since: 0.9.28
  **/
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-ot-hdmx-table.hh b/src/java.desktop/share/native/libharfbuzz/hb-ot-hdmx-table.hh
index 77e68dbca42..918cf32dcb5 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-ot-hdmx-table.hh
+++ b/src/java.desktop/share/native/libharfbuzz/hb-ot-hdmx-table.hh
@@ -71,6 +71,7 @@ struct DeviceRecord
   {
     TRACE_SANITIZE (this);
     return_trace (likely (c->check_struct (this) &&
+                          hb_barrier () &&
                           c->check_range (this, sizeDeviceRecord)));
   }
 
@@ -94,7 +95,7 @@ struct hdmx
   bool serialize (hb_serialize_context_t *c,
                   unsigned version,
                   Iterator it,
-                  const hb_vector_t<hb_codepoint_pair_t> &new_to_old_gid_list,
+                  hb_array_t<const hb_codepoint_pair_t> new_to_old_gid_list,
                   unsigned num_glyphs)
   {
     TRACE_SERIALIZE (this);
@@ -152,6 +153,7 @@ struct hdmx
   {
     TRACE_SANITIZE (this);
     return_trace (c->check_struct (this) &&
+                  hb_barrier () &&
                   !hb_unsigned_mul_overflows (numRecords, sizeDeviceRecord) &&
                   min_size + numRecords * sizeDeviceRecord > numRecords * sizeDeviceRecord &&
                   sizeDeviceRecord >= DeviceRecord::min_size &&
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-ot-head-table.hh b/src/java.desktop/share/native/libharfbuzz/hb-ot-head-table.hh
index ab057fcfe4f..34535e2286d 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-ot-head-table.hh
+++ b/src/java.desktop/share/native/libharfbuzz/hb-ot-head-table.hh
@@ -103,6 +103,7 @@ struct head
   {
     TRACE_SANITIZE (this);
     return_trace (c->check_struct (this) &&
+                  hb_barrier () &&
                   version.major == 1 &&
                   magicNumber == 0x5F0F3CF5u);
   }
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-ot-hhea-table.hh b/src/java.desktop/share/native/libharfbuzz/hb-ot-hhea-table.hh
index 37ef8744572..5e3be5be525 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-ot-hhea-table.hh
+++ b/src/java.desktop/share/native/libharfbuzz/hb-ot-hhea-table.hh
@@ -50,7 +50,9 @@ struct _hea
   bool sanitize (hb_sanitize_context_t *c) const
   {
     TRACE_SANITIZE (this);
-    return_trace (c->check_struct (this) && likely (version.major == 1));
+    return_trace (c->check_struct (this) &&
+                  hb_barrier () &&
+                  likely (version.major == 1));
   }
 
   public:
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-ot-hmtx-table.hh b/src/java.desktop/share/native/libharfbuzz/hb-ot-hmtx-table.hh
index 39e1f4830a5..f7b4ca72198 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-ot-hmtx-table.hh
+++ b/src/java.desktop/share/native/libharfbuzz/hb-ot-hmtx-table.hh
@@ -30,6 +30,7 @@
 #include "hb-open-type.hh"
 #include "hb-ot-maxp-table.hh"
 #include "hb-ot-hhea-table.hh"
+#include "hb-ot-os2-table.hh"
 #include "hb-ot-var-hvar-table.hh"
 #include "hb-ot-var-mvar-table.hh"
 #include "hb-ot-metrics.hh"
@@ -145,6 +146,29 @@ struct hmtxvmtx
         table->minTrailingBearing = min_rsb;
         table->maxExtent = max_extent;
       }
+
+      if (T::is_horizontal)
+      {
+        const auto &OS2 = *c->plan->source->table.OS2;
+        if (OS2.has_data () &&
+            table->ascender == OS2.sTypoAscender &&
+            table->descender == OS2.sTypoDescender &&
+            table->lineGap == OS2.sTypoLineGap)
+        {
+          table->ascender = static_cast<int> (roundf (OS2.sTypoAscender +
+                                                      MVAR.get_var (HB_OT_METRICS_TAG_HORIZONTAL_ASCENDER,
+                                                                    c->plan->normalized_coords.arrayZ,
+                                                                    c->plan->normalized_coords.length)));
+          table->descender = static_cast<int> (roundf (OS2.sTypoDescender +
+                                                       MVAR.get_var (HB_OT_METRICS_TAG_HORIZONTAL_DESCENDER,
+                                                                     c->plan->normalized_coords.arrayZ,
+                                                                     c->plan->normalized_coords.length)));
+          table->lineGap = static_cast<int> (roundf (OS2.sTypoLineGap +
+                                                     MVAR.get_var (HB_OT_METRICS_TAG_HORIZONTAL_LINE_GAP,
+                                                                   c->plan->normalized_coords.arrayZ,
+                                                                   c->plan->normalized_coords.length)));
+        }
+      }
     }
 #endif
 
@@ -158,7 +182,7 @@ struct hmtxvmtx
            hb_requires (hb_is_iterator (Iterator))>
   void serialize (hb_serialize_context_t *c,
                   Iterator it,
-                  const hb_vector_t<hb_codepoint_pair_t> new_to_old_gid_list,
+                  hb_array_t<const hb_codepoint_pair_t> new_to_old_gid_list,
                   unsigned num_long_metrics,
                   unsigned total_num_metrics)
   {
@@ -374,7 +398,7 @@ struct hmtxvmtx
 
     unsigned get_advance_with_var_unscaled (hb_codepoint_t  glyph,
                                             hb_font_t      *font,
-                                            VariationStore::cache_t *store_cache = nullptr) const
+                                            ItemVariationStore::cache_t *store_cache = nullptr) const
     {
       unsigned int advance = get_advance_without_var_unscaled (glyph);
 
@@ -387,7 +411,8 @@ struct hmtxvmtx
                                                                         font->coords, font->num_coords,
                                                                         store_cache));
 
-      return _glyf_get_advance_with_var_unscaled (font, glyph, T::tableTag == HB_OT_TAG_vmtx);
+      unsigned glyf_advance = _glyf_get_advance_with_var_unscaled (font, glyph, T::tableTag == HB_OT_TAG_vmtx);
+      return glyf_advance ? glyf_advance : advance;
 #else
       return advance;
 #endif
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-ot-kern-table.hh b/src/java.desktop/share/native/libharfbuzz/hb-ot-kern-table.hh
index 291683369aa..bc90c345d05 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-ot-kern-table.hh
+++ b/src/java.desktop/share/native/libharfbuzz/hb-ot-kern-table.hh
@@ -79,12 +79,23 @@ struct KernSubTableFormat3
   {
     TRACE_SANITIZE (this);
     return_trace (c->check_struct (this) &&
+                  hb_barrier () &&
                   c->check_range (kernValueZ,
                                   kernValueCount * sizeof (FWORD) +
                                   glyphCount * 2 +
                                   leftClassCount * rightClassCount));
   }
 
+  template <typename set_t>
+  void collect_glyphs (set_t &left_set, set_t &right_set, unsigned num_glyphs) const
+  {
+    set_t set;
+    if (likely (glyphCount))
+      set.add_range (0, glyphCount - 1);
+    left_set.union_ (set);
+    right_set.union_ (set);
+  }
+
   protected:
   KernSubTableHeader
                 header;
@@ -121,7 +132,7 @@ struct KernSubTable
   {
     switch (get_type ()) {
     /* This method hooks up to hb_font_t's get_h_kerning.  Only support Format0. */
-    case 0: return u.format0.get_kerning (left, right);
+    case 0: hb_barrier (); return u.format0.get_kerning (left, right);
     default:return 0;
     }
   }
@@ -134,22 +145,36 @@ struct KernSubTable
     switch (subtable_type) {
     case 0:     return_trace (c->dispatch (u.format0));
 #ifndef HB_NO_AAT_SHAPE
-    case 1:     return_trace (u.header.apple ? c->dispatch (u.format1, std::forward<Ts> (ds)...) : c->default_return_value ());
+    case 1:     return_trace (c->dispatch (u.format1, std::forward<Ts> (ds)...));
 #endif
     case 2:     return_trace (c->dispatch (u.format2));
 #ifndef HB_NO_AAT_SHAPE
-    case 3:     return_trace (u.header.apple ? c->dispatch (u.format3, std::forward<Ts> (ds)...) : c->default_return_value ());
+    case 3:     return_trace (c->dispatch (u.format3, std::forward<Ts> (ds)...));
 #endif
     default:    return_trace (c->default_return_value ());
     }
   }
 
+  template <typename set_t>
+  void collect_glyphs (set_t &left_set, set_t &right_set, unsigned num_glyphs) const
+  {
+    unsigned int subtable_type = get_type ();
+    switch (subtable_type) {
+    case 0:     u.format0.collect_glyphs (left_set, right_set, num_glyphs); return;
+    case 1:     u.format1.collect_glyphs (left_set, right_set, num_glyphs); return;
+    case 2:     u.format2.collect_glyphs (left_set, right_set, num_glyphs); return;
+    case 3:     u.format3.collect_glyphs (left_set, right_set, num_glyphs); return;
+    default:    return;
+    }
+  }
+
   bool sanitize (hb_sanitize_context_t *c) const
   {
     TRACE_SANITIZE (this);
-    if (unlikely (!u.header.sanitize (c) ||
-                  u.header.length < u.header.min_size ||
-                  !c->check_range (this, u.header.length))) return_trace (false);
+    if (unlikely (!(u.header.sanitize (c) &&
+                    hb_barrier () &&
+                    u.header.length >= u.header.min_size &&
+                    c->check_range (this, u.header.length)))) return_trace (false);
 
     return_trace (dispatch (c));
   }
@@ -286,9 +311,9 @@ struct kern
   bool has_state_machine () const
   {
     switch (get_type ()) {
-    case 0: return u.ot.has_state_machine ();
+    case 0: hb_barrier (); return u.ot.has_state_machine ();
 #ifndef HB_NO_AAT_SHAPE
-    case 1: return u.aat.has_state_machine ();
+    case 1: hb_barrier (); return u.aat.has_state_machine ();
 #endif
     default:return false;
     }
@@ -297,9 +322,9 @@ struct kern
   bool has_cross_stream () const
   {
     switch (get_type ()) {
-    case 0: return u.ot.has_cross_stream ();
+    case 0: hb_barrier (); return u.ot.has_cross_stream ();
 #ifndef HB_NO_AAT_SHAPE
-    case 1: return u.aat.has_cross_stream ();
+    case 1: hb_barrier (); return u.aat.has_cross_stream ();
 #endif
     default:return false;
     }
@@ -308,16 +333,17 @@ struct kern
   int get_h_kerning (hb_codepoint_t left, hb_codepoint_t right) const
   {
     switch (get_type ()) {
-    case 0: return u.ot.get_h_kerning (left, right);
+    case 0: hb_barrier (); return u.ot.get_h_kerning (left, right);
 #ifndef HB_NO_AAT_SHAPE
-    case 1: return u.aat.get_h_kerning (left, right);
+    case 1: hb_barrier (); return u.aat.get_h_kerning (left, right);
 #endif
     default:return 0;
     }
   }
 
-  bool apply (AAT::hb_aat_apply_context_t *c) const
-  { return dispatch (c); }
+  bool apply (AAT::hb_aat_apply_context_t *c,
+              const AAT::kern_accelerator_data_t &accel_data) const
+  { return dispatch (c, accel_data); }
 
   template <typename context_t, typename ...Ts>
   typename context_t::return_t dispatch (context_t *c, Ts&&... ds) const
@@ -337,9 +363,45 @@ struct kern
   {
     TRACE_SANITIZE (this);
     if (!u.version32.sanitize (c)) return_trace (false);
+    hb_barrier ();
     return_trace (dispatch (c));
   }
 
+  AAT::kern_accelerator_data_t create_accelerator_data (unsigned num_glyphs) const
+  {
+    switch (get_type ()) {
+    case 0: hb_barrier (); return u.ot.create_accelerator_data (num_glyphs);
+#ifndef HB_NO_AAT_SHAPE
+    case 1: hb_barrier (); return u.aat.create_accelerator_data (num_glyphs);
+#endif
+    default:return AAT::kern_accelerator_data_t ();
+    }
+  }
+
+  struct accelerator_t
+  {
+    accelerator_t (hb_face_t *face)
+    {
+      hb_sanitize_context_t sc;
+      this->table = sc.reference_table<kern> (face);
+      this->accel_data = this->table->create_accelerator_data (face->get_num_glyphs ());
+    }
+    ~accelerator_t ()
+    {
+      this->table.destroy ();
+    }
+
+    hb_blob_t *get_blob () const { return table.get_blob (); }
+
+    bool apply (AAT::hb_aat_apply_context_t *c) const
+    {
+      return table->apply (c, accel_data);
+    }
+
+    hb_blob_ptr_t<kern> table;
+    AAT::kern_accelerator_data_t accel_data;
+  };
+
   protected:
   union {
   HBUINT32              version32;
@@ -353,6 +415,10 @@ struct kern
   DEFINE_SIZE_UNION (4, version32);
 };
 
+struct kern_accelerator_t : kern::accelerator_t {
+  kern_accelerator_t (hb_face_t *face) : kern::accelerator_t (face) {}
+};
+
 } /* namespace OT */
 
 
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-ot-layout-base-table.hh b/src/java.desktop/share/native/libharfbuzz/hb-ot-layout-base-table.hh
index 0e57a6c7909..5a3679e4bfa 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-ot-layout-base-table.hh
+++ b/src/java.desktop/share/native/libharfbuzz/hb-ot-layout-base-table.hh
@@ -46,6 +46,12 @@ struct BaseCoordFormat1
     return HB_DIRECTION_IS_HORIZONTAL (direction) ? font->em_scale_y (coordinate) : font->em_scale_x (coordinate);
   }
 
+  bool subset (hb_subset_context_t *c) const
+  {
+    TRACE_SUBSET (this);
+    return_trace ((bool) c->serializer->embed (*this));
+  }
+
   bool sanitize (hb_sanitize_context_t *c) const
   {
     TRACE_SANITIZE (this);
@@ -67,6 +73,17 @@ struct BaseCoordFormat2
     return HB_DIRECTION_IS_HORIZONTAL (direction) ? font->em_scale_y (coordinate) : font->em_scale_x (coordinate);
   }
 
+  bool subset (hb_subset_context_t *c) const
+  {
+    TRACE_SUBSET (this);
+    auto *out = c->serializer->embed (*this);
+    if (unlikely (!out)) return_trace (false);
+
+    return_trace (c->serializer->check_assign (out->referenceGlyph,
+                                               c->plan->glyph_map->get (referenceGlyph),
+                                               HB_SERIALIZE_ERROR_INT_OVERFLOW));
+  }
+
   bool sanitize (hb_sanitize_context_t *c) const
   {
     TRACE_SANITIZE (this);
@@ -86,7 +103,7 @@ struct BaseCoordFormat2
 struct BaseCoordFormat3
 {
   hb_position_t get_coord (hb_font_t *font,
-                           const VariationStore &var_store,
+                           const ItemVariationStore &var_store,
                            hb_direction_t direction) const
   {
     const Device &device = this+deviceTable;
@@ -96,6 +113,37 @@ struct BaseCoordFormat3
          : font->em_scale_x (coordinate) + device.get_x_delta (font, var_store);
   }
 
+  void collect_variation_indices (hb_set_t& varidx_set /* OUT */) const
+  {
+    unsigned varidx = (this+deviceTable).get_variation_index ();
+    varidx_set.add (varidx);
+  }
+
+  bool subset (hb_subset_context_t *c) const
+  {
+    TRACE_SUBSET (this);
+    auto *out = c->serializer->embed (*this);
+    if (unlikely (!out)) return_trace (false);
+
+    if (!c->plan->pinned_at_default)
+    {
+      unsigned var_idx = (this+deviceTable).get_variation_index ();
+      if (var_idx != VarIdx::NO_VARIATION)
+      {
+        hb_pair_t<unsigned, int> *v;
+        if (!c->plan->base_variation_idx_map.has (var_idx, &v))
+          return_trace (false);
+
+        if (unlikely (!c->serializer->check_assign (out->coordinate, coordinate + hb_second (*v),
+                                                    HB_SERIALIZE_ERROR_INT_OVERFLOW)))
+          return_trace (false);
+      }
+    }
+    return_trace (out->deviceTable.serialize_copy (c->serializer, deviceTable,
+                                                   this, 0,
+                                                   hb_serialize_context_t::Head,
+                                                   &c->plan->base_variation_idx_map));
+  }
 
   bool sanitize (hb_sanitize_context_t *c) const
   {
@@ -120,25 +168,47 @@ struct BaseCoord
   bool has_data () const { return u.format; }
 
   hb_position_t get_coord (hb_font_t            *font,
-                           const VariationStore &var_store,
+                           const ItemVariationStore &var_store,
                            hb_direction_t        direction) const
   {
     switch (u.format) {
-    case 1: return u.format1.get_coord (font, direction);
-    case 2: return u.format2.get_coord (font, direction);
-    case 3: return u.format3.get_coord (font, var_store, direction);
+    case 1: hb_barrier (); return u.format1.get_coord (font, direction);
+    case 2: hb_barrier (); return u.format2.get_coord (font, direction);
+    case 3: hb_barrier (); return u.format3.get_coord (font, var_store, direction);
     default:return 0;
     }
   }
 
+  void collect_variation_indices (hb_set_t& varidx_set /* OUT */) const
+  {
+    switch (u.format) {
+    case 3: hb_barrier (); u.format3.collect_variation_indices (varidx_set);
+    default:return;
+    }
+  }
+
+  template <typename context_t, typename ...Ts>
+  typename context_t::return_t dispatch (context_t *c, Ts&&... ds) const
+  {
+    if (unlikely (!c->may_dispatch (this, &u.format))) return c->no_dispatch_return_value ();
+    TRACE_DISPATCH (this, u.format);
+    switch (u.format) {
+    case 1: hb_barrier (); return_trace (c->dispatch (u.format1, std::forward<Ts> (ds)...));
+    case 2: hb_barrier (); return_trace (c->dispatch (u.format2, std::forward<Ts> (ds)...));
+    case 3: hb_barrier (); return_trace (c->dispatch (u.format3, std::forward<Ts> (ds)...));
+    default:return_trace (c->default_return_value ());
+    }
+  }
+
   bool sanitize (hb_sanitize_context_t *c) const
   {
     TRACE_SANITIZE (this);
     if (unlikely (!u.format.sanitize (c))) return_trace (false);
+    hb_barrier ();
     switch (u.format) {
-    case 1: return_trace (u.format1.sanitize (c));
-    case 2: return_trace (u.format2.sanitize (c));
-    case 3: return_trace (u.format3.sanitize (c));
+    case 1: hb_barrier (); return_trace (u.format1.sanitize (c));
+    case 2: hb_barrier (); return_trace (u.format2.sanitize (c));
+    case 3: hb_barrier (); return_trace (u.format3.sanitize (c));
     default:return_trace (false);
     }
   }
@@ -160,12 +230,37 @@ struct FeatMinMaxRecord
 
   bool has_data () const { return tag; }
 
+  hb_tag_t get_feature_tag () const { return tag; }
+
   void get_min_max (const BaseCoord **min, const BaseCoord **max) const
   {
     if (likely (min)) *min = &(this+minCoord);
     if (likely (max)) *max = &(this+maxCoord);
   }
 
+  void collect_variation_indices (const hb_subset_plan_t* plan,
+                                  const void *base,
+                                  hb_set_t& varidx_set /* OUT */) const
+  {
+    if (!plan->layout_features.has (tag))
+      return;
+
+    (base+minCoord).collect_variation_indices (varidx_set);
+    (base+maxCoord).collect_variation_indices (varidx_set);
+  }
+
+  bool subset (hb_subset_context_t *c,
+               const void *base) const
+  {
+    TRACE_SUBSET (this);
+    auto *out = c->serializer->embed (*this);
+    if (unlikely (!out)) return_trace (false);
+    if (!(out->minCoord.serialize_subset (c, minCoord, base)))
+      return_trace (false);
+
+    return_trace (out->maxCoord.serialize_subset (c, maxCoord, base));
+  }
+
   bool sanitize (hb_sanitize_context_t *c, const void *base) const
   {
     TRACE_SANITIZE (this);
@@ -205,6 +300,39 @@ struct MinMax
     }
   }
 
+  void collect_variation_indices (const hb_subset_plan_t* plan,
+                                  hb_set_t& varidx_set /* OUT */) const
+  {
+    (this+minCoord).collect_variation_indices (varidx_set);
+    (this+maxCoord).collect_variation_indices (varidx_set);
+    for (const FeatMinMaxRecord& record : featMinMaxRecords)
+      record.collect_variation_indices (plan, this, varidx_set);
+  }
+
+  bool subset (hb_subset_context_t *c) const
+  {
+    TRACE_SUBSET (this);
+    auto *out = c->serializer->start_embed (*this);
+    if (unlikely (!out || !c->serializer->extend_min (out))) return_trace (false);
+
+    if (!(out->minCoord.serialize_subset (c, minCoord, this)) ||
+        !(out->maxCoord.serialize_subset (c, maxCoord, this)))
+      return_trace (false);
+
+    unsigned len = 0;
+    for (const FeatMinMaxRecord& _ : featMinMaxRecords)
+    {
+      hb_tag_t feature_tag = _.get_feature_tag ();
+      if (!c->plan->layout_features.has (feature_tag))
+        continue;
+
+      if (!_.subset (c, this)) return false;
+      len++;
+    }
+    return_trace (c->serializer->check_assign (out->featMinMaxRecords.len, len,
+                                               HB_SERIALIZE_ERROR_INT_OVERFLOW));
+  }
+
   bool sanitize (hb_sanitize_context_t *c) const
   {
     TRACE_SANITIZE (this);
@@ -239,6 +367,26 @@ struct BaseValues
     return this+baseCoords[baseline_tag_index];
   }
 
+  void collect_variation_indices (hb_set_t& varidx_set /* OUT */) const
+  {
+    for (const auto& _ : baseCoords)
+      (this+_).collect_variation_indices (varidx_set);
+  }
+
+  bool subset (hb_subset_context_t *c) const
+  {
+    TRACE_SUBSET (this);
+    auto *out = c->serializer->start_embed (*this);
+    if (unlikely (!out || !c->serializer->extend_min (out))) return_trace (false);
+    out->defaultIndex = defaultIndex;
+
+    for (const auto& _ : baseCoords)
+      if (!subset_offset_array (c, out->baseCoords, this) (_))
+        return_trace (false);
+
+    return_trace (bool (out->baseCoords));
+  }
+
   bool sanitize (hb_sanitize_context_t *c) const
   {
     TRACE_SANITIZE (this);
@@ -267,7 +415,22 @@ struct BaseLangSysRecord
 
   bool has_data () const { return baseLangSysTag; }
 
-  const MinMax &get_min_max () const { return this+minMax; }
+  const MinMax &get_min_max (const void* base) const { return base+minMax; }
+
+  void collect_variation_indices (const void* base,
+                                  const hb_subset_plan_t* plan,
+                                  hb_set_t& varidx_set /* OUT */) const
+  { (base+minMax).collect_variation_indices (plan, varidx_set); }
+
+  bool subset (hb_subset_context_t *c,
+               const void *base) const
+  {
+    TRACE_SUBSET (this);
+    auto *out = c->serializer->embed (*this);
+    if (unlikely (!out)) return_trace (false);
+
+    return_trace (out->minMax.serialize_subset (c, minMax, base));
+  }
 
   bool sanitize (hb_sanitize_context_t *c, const void *base) const
   {
@@ -290,14 +453,43 @@ struct BaseScript
   const MinMax &get_min_max (hb_tag_t language_tag) const
   {
     const BaseLangSysRecord& record = baseLangSysRecords.bsearch (language_tag);
-    return record.has_data () ? record.get_min_max () : this+defaultMinMax;
+    return record.has_data () ? record.get_min_max (this) : this+defaultMinMax;
   }
 
   const BaseCoord &get_base_coord (int baseline_tag_index) const
   { return (this+baseValues).get_base_coord (baseline_tag_index); }
 
   bool has_values () const { return baseValues; }
-  bool has_min_max () const { return defaultMinMax; /* TODO What if only per-language is present? */ }
+  bool has_min_max () const { return defaultMinMax || baseLangSysRecords; }
+
+  void collect_variation_indices (const hb_subset_plan_t* plan,
+                                  hb_set_t& varidx_set /* OUT */) const
+  {
+    (this+baseValues).collect_variation_indices (varidx_set);
+    (this+defaultMinMax).collect_variation_indices (plan, varidx_set);
+
+    for (const BaseLangSysRecord& _ : baseLangSysRecords)
+      _.collect_variation_indices (this, plan, varidx_set);
+  }
+
+  bool subset (hb_subset_context_t *c) const
+  {
+    TRACE_SUBSET (this);
+    auto *out = c->serializer->start_embed (*this);
+    if (unlikely (!out || !c->serializer->extend_min (out))) return_trace (false);
+
+    if (baseValues && !out->baseValues.serialize_subset (c, baseValues, this))
+      return_trace (false);
+
+    if (defaultMinMax && !out->defaultMinMax.serialize_subset (c, defaultMinMax, this))
+      return_trace (false);
+
+    for (const auto& _ : baseLangSysRecords)
+      if (!_.subset (c, this)) return_trace (false);
+
+    return_trace (c->serializer->check_assign (out->baseLangSysRecords.len, baseLangSysRecords.len,
+                                               HB_SERIALIZE_ERROR_INT_OVERFLOW));
+  }
 
   bool sanitize (hb_sanitize_context_t *c) const
   {
@@ -331,9 +523,31 @@ struct BaseScriptRecord
 
   bool has_data () const { return baseScriptTag; }
 
+  hb_tag_t get_script_tag () const { return baseScriptTag; }
+
   const BaseScript &get_base_script (const BaseScriptList *list) const
   { return list+baseScript; }
 
+  void collect_variation_indices (const hb_subset_plan_t* plan,
+                                  const void* list,
+                                  hb_set_t& varidx_set /* OUT */) const
+  {
+    if (!plan->layout_scripts.has (baseScriptTag))
+      return;
+
+    (list+baseScript).collect_variation_indices (plan, varidx_set);
+  }
+
+  bool subset (hb_subset_context_t *c,
+               const void *base) const
+  {
+    TRACE_SUBSET (this);
+    auto *out = c->serializer->embed (*this);
+    if (unlikely (!out)) return_trace (false);
+
+    return_trace (out->baseScript.serialize_subset (c, baseScript, base));
+  }
+
   bool sanitize (hb_sanitize_context_t *c, const void *base) const
   {
     TRACE_SANITIZE (this);
@@ -360,6 +574,33 @@ struct BaseScriptList
     return record->has_data () ? record->get_base_script (this) : Null (BaseScript);
   }
 
+  void collect_variation_indices (const hb_subset_plan_t* plan,
+                                  hb_set_t& varidx_set /* OUT */) const
+  {
+    for (const BaseScriptRecord& _ : baseScriptRecords)
+      _.collect_variation_indices (plan, this, varidx_set);
+  }
+
+  bool subset (hb_subset_context_t *c) const
+  {
+    TRACE_SUBSET (this);
+    auto *out = c->serializer->start_embed (*this);
+    if (unlikely (!out || !c->serializer->extend_min (out))) return_trace (false);
+
+    unsigned len = 0;
+    for (const BaseScriptRecord& _ : baseScriptRecords)
+    {
+      hb_tag_t script_tag = _.get_script_tag ();
+      if (!c->plan->layout_scripts.has (script_tag))
+        continue;
+
+      if (!_.subset (c, this)) return false;
+      len++;
+    }
+    return_trace (c->serializer->check_assign (out->baseScriptRecords.len, len,
+                                               HB_SERIALIZE_ERROR_INT_OVERFLOW));
+  }
+
   bool sanitize (hb_sanitize_context_t *c) const
   {
     TRACE_SANITIZE (this);
@@ -421,6 +662,20 @@ struct Axis
     return true;
   }
 
+  void collect_variation_indices (const hb_subset_plan_t* plan,
+                                  hb_set_t& varidx_set /* OUT */) const
+  { (this+baseScriptList).collect_variation_indices (plan, varidx_set); }
+
+  bool subset (hb_subset_context_t *c) const
+  {
+    TRACE_SUBSET (this);
+    auto *out = c->serializer->embed (*this);
+    if (unlikely (!out)) return_trace (false);
+
+    out->baseTagList.serialize_copy (c->serializer, baseTagList, this);
+    return_trace (out->baseScriptList.serialize_subset (c, baseScriptList, this));
+  }
+
   bool sanitize (hb_sanitize_context_t *c) const
   {
     TRACE_SANITIZE (this);
@@ -452,8 +707,77 @@ struct BASE
   const Axis &get_axis (hb_direction_t direction) const
   { return HB_DIRECTION_IS_VERTICAL (direction) ? this+vAxis : this+hAxis; }
 
-  const VariationStore &get_var_store () const
-  { return version.to_int () < 0x00010001u ? Null (VariationStore) : this+varStore; }
+  bool has_var_store () const
+  { return version.to_int () >= 0x00010001u && varStore != 0; }
+
+  const ItemVariationStore &get_var_store () const
+  { return version.to_int () < 0x00010001u ? Null (ItemVariationStore) : this+varStore; }
+
+  void collect_variation_indices (const hb_subset_plan_t* plan,
+                                  hb_set_t& varidx_set /* OUT */) const
+  {
+    (this+hAxis).collect_variation_indices (plan, varidx_set);
+    (this+vAxis).collect_variation_indices (plan, varidx_set);
+  }
+
+  bool subset_varstore (hb_subset_context_t *c,
+                        BASE *out /* OUT */) const
+  {
+    TRACE_SUBSET (this);
+    if (!c->serializer->allocate_size<Offset32To<ItemVariationStore>> (Offset32To<ItemVariationStore>::static_size))
+        return_trace (false);
+    if (!c->plan->normalized_coords)
+      return_trace (out->varStore.serialize_subset (c, varStore, this, c->plan->base_varstore_inner_maps.as_array ()));
+
+    if (c->plan->all_axes_pinned)
+      return_trace (true);
+
+    item_variations_t item_vars;
+    if (!item_vars.instantiate (this+varStore, c->plan, true, true,
+                                c->plan->base_varstore_inner_maps.as_array ()))
+      return_trace (false);
+
+    if (!out->varStore.serialize_serialize (c->serializer,
+                                            item_vars.has_long_word (),
+                                            c->plan->axis_tags,
+                                            item_vars.get_region_list (),
+                                            item_vars.get_vardata_encodings ()))
+      return_trace (false);
+
+    const hb_map_t &varidx_map = item_vars.get_varidx_map ();
+    /* base_variation_idx_map in the plan is old_varidx->(varidx, delta)
+     * mapping, new varidx is generated for subsetting, we need to remap this
+     * after instancing */
+    for (auto _ : c->plan->base_variation_idx_map.iter_ref ())
+    {
+      uint32_t varidx = _.second.first;
+      uint32_t *new_varidx;
+      if (varidx_map.has (varidx, &new_varidx))
+        _.second.first = *new_varidx;
+      else
+        _.second.first = HB_OT_LAYOUT_NO_VARIATIONS_INDEX;
+    }
+    return_trace (true);
+  }
+
+  bool subset (hb_subset_context_t *c) const
+  {
+    TRACE_SUBSET (this);
+    auto *out = c->serializer->start_embed (*this);
+    if (unlikely (!out || !c->serializer->extend_min (out))) return_trace (false);
+
+    out->version = version;
+    if (has_var_store () && !subset_varstore (c, out))
+        return_trace (false);
+
+    if (hAxis && !out->hAxis.serialize_subset (c, hAxis, this))
+      return_trace (false);
+
+    if (vAxis && !out->vAxis.serialize_subset (c, vAxis, this))
+      return_trace (false);
+
+    return_trace (true);
+  }
 
   bool get_baseline (hb_font_t      *font,
                      hb_tag_t        baseline_tag,
@@ -486,7 +810,7 @@ struct BASE
                                            &min_coord, &max_coord))
       return false;
 
-    const VariationStore &var_store = get_var_store ();
+    const ItemVariationStore &var_store = get_var_store ();
     if (likely (min && min_coord)) *min = min_coord->get_coord (font, var_store, direction);
     if (likely (max && max_coord)) *max = max_coord->get_coord (font, var_store, direction);
     return true;
@@ -496,6 +820,7 @@ struct BASE
   {
     TRACE_SANITIZE (this);
     return_trace (likely (c->check_struct (this) &&
+                          hb_barrier () &&
                           likely (version.major == 1) &&
                           hAxis.sanitize (c, this) &&
                           vAxis.sanitize (c, this) &&
@@ -508,7 +833,7 @@ struct BASE
                                  * of BASE table (may be NULL) */
   Offset16To<Axis>vAxis;                /* Offset to vertical Axis table, from beginning
                                  * of BASE table (may be NULL) */
-  Offset32To<VariationStore>
+  Offset32To<ItemVariationStore>
                 varStore;       /* Offset to the table of Item Variation
                                  * Store--from beginning of BASE
                                  * header (may be NULL).  Introduced
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-ot-layout-common.hh b/src/java.desktop/share/native/libharfbuzz/hb-ot-layout-common.hh
index 9216a9a0fe7..f14675295f6 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-ot-layout-common.hh
+++ b/src/java.desktop/share/native/libharfbuzz/hb-ot-layout-common.hh
@@ -34,6 +34,7 @@
 #include "hb-open-type.hh"
 #include "hb-set.hh"
 #include "hb-bimap.hh"
+#include "hb-cache.hh"
 
 #include "OT/Layout/Common/Coverage.hh"
 #include "OT/Layout/types.hh"
@@ -64,7 +65,7 @@ struct hb_collect_feature_substitutes_with_var_context_t
   const hb_hashmap_t<hb_tag_t, Triple> *axes_location;
   hb_hashmap_t<unsigned, hb::shared_ptr<hb_set_t>> *record_cond_idx_map;
   hb_hashmap_t<unsigned, const Feature*> *feature_substitutes_map;
-  bool& insert_catch_all_feature_variation_record;
+  hb_set_t& catch_all_record_feature_idxes;
 
   // not stored in subset_plan
   hb_set_t *feature_indices;
@@ -142,6 +143,8 @@ struct hb_subset_layout_context_t :
   const hb_map_t *feature_index_map;
   const hb_hashmap_t<unsigned, const Feature*> *feature_substitutes_map;
   hb_hashmap_t<unsigned, hb::shared_ptr<hb_set_t>> *feature_record_cond_idx_map;
+  const hb_set_t *catch_all_record_feature_idxes;
+  const hb_hashmap_t<unsigned, hb_pair_t<const void*, const void*>> *feature_idx_tag_map;
 
   unsigned cur_script_index;
   unsigned cur_feature_var_record_idx;
@@ -164,6 +167,8 @@ struct hb_subset_layout_context_t :
       feature_index_map = &c_->plan->gsub_features;
       feature_substitutes_map = &c_->plan->gsub_feature_substitutes_map;
       feature_record_cond_idx_map = c_->plan->user_axes_location.is_empty () ? nullptr : &c_->plan->gsub_feature_record_cond_idx_map;
+      catch_all_record_feature_idxes = &c_->plan->gsub_old_features;
+      feature_idx_tag_map = &c_->plan->gsub_old_feature_idx_tag_map;
     }
     else
     {
@@ -172,6 +177,8 @@ struct hb_subset_layout_context_t :
       feature_index_map = &c_->plan->gpos_features;
       feature_substitutes_map = &c_->plan->gpos_feature_substitutes_map;
       feature_record_cond_idx_map = c_->plan->user_axes_location.is_empty () ? nullptr : &c_->plan->gpos_feature_record_cond_idx_map;
+      catch_all_record_feature_idxes = &c_->plan->gpos_old_features;
+      feature_idx_tag_map = &c_->plan->gpos_old_feature_idx_tag_map;
     }
   }
 
@@ -182,7 +189,7 @@ struct hb_subset_layout_context_t :
   unsigned lookup_index_count;
 };
 
-struct VariationStore;
+struct ItemVariationStore;
 struct hb_collect_variation_indices_context_t :
        hb_dispatch_context_t<hb_collect_variation_indices_context_t>
 {
@@ -454,6 +461,7 @@ struct FeatureParamsSize
   {
     TRACE_SANITIZE (this);
     if (unlikely (!c->check_struct (this))) return_trace (false);
+    hb_barrier ();
 
     /* This subtable has some "history", if you will.  Some earlier versions of
      * Adobe tools calculated the offset of the FeatureParams subtable from the
@@ -639,8 +647,7 @@ struct FeatureParamsCharacterVariants
       return;
 
     unsigned last_name_id = (unsigned) firstParamUILabelNameID + (unsigned) numNamedParameters - 1;
-    if (last_name_id >= 256 && last_name_id <= 32767)
-      nameids_to_retain->add_range (firstParamUILabelNameID, last_name_id);
+    nameids_to_retain->add_range (firstParamUILabelNameID, last_name_id);
   }
 
   bool subset (hb_subset_context_t *c) const
@@ -820,6 +827,7 @@ struct Feature
     TRACE_SANITIZE (this);
     if (unlikely (!(c->check_struct (this) && lookupIndex.sanitize (c))))
       return_trace (false);
+    hb_barrier ();
 
     /* Some earlier versions of Adobe tools calculated the offset of the
      * FeatureParams subtable from the beginning of the FeatureList table!
@@ -838,6 +846,7 @@ struct Feature
     unsigned int orig_offset = featureParams;
     if (unlikely (!featureParams.sanitize (c, this, closure ? closure->tag : HB_TAG_NONE)))
       return_trace (false);
+    hb_barrier ();
 
     if (featureParams == 0 && closure &&
         closure->tag == HB_TAG ('s','i','z','e') &&
@@ -900,7 +909,8 @@ struct Record
   {
     TRACE_SANITIZE (this);
     const Record_sanitize_closure_t closure = {tag, base};
-    return_trace (c->check_struct (this) && offset.sanitize (c, base, &closure));
+    return_trace (c->check_struct (this) &&
+                  offset.sanitize (c, base, &closure));
   }
 
   Tag           tag;            /* 4-byte Tag identifier */
@@ -1371,10 +1381,20 @@ struct Lookup
 
     if (lookupFlag & LookupFlag::UseMarkFilteringSet)
     {
-      if (unlikely (!c->serializer->extend (out))) return_trace (false);
       const HBUINT16 &markFilteringSet = StructAfter<HBUINT16> (subTable);
-      HBUINT16 &outMarkFilteringSet = StructAfter<HBUINT16> (out->subTable);
-      outMarkFilteringSet = markFilteringSet;
+      hb_codepoint_t *idx;
+      if (!c->plan->used_mark_sets_map.has (markFilteringSet, &idx))
+      {
+        unsigned new_flag = lookupFlag;
+        new_flag &= ~LookupFlag::UseMarkFilteringSet;
+        out->lookupFlag = new_flag;
+      }
+      else
+      {
+        if (unlikely (!c->serializer->extend (out))) return_trace (false);
+        HBUINT16 &outMarkFilteringSet = StructAfter<HBUINT16> (out->subTable);
+        outMarkFilteringSet = *idx;
+      }
     }
 
     // Always keep the lookup even if it's empty. The rest of layout subsetting depends on lookup
@@ -1391,6 +1411,7 @@ struct Lookup
   {
     TRACE_SANITIZE (this);
     if (!(c->check_struct (this) && subTable.sanitize (c))) return_trace (false);
+    hb_barrier ();
 
     unsigned subtables = get_subtable_count ();
     if (unlikely (!c->visit_subtables (subtables))) return_trace (false);
@@ -1406,6 +1427,8 @@ struct Lookup
 
     if (unlikely (get_type () == TSubTable::Extension && !c->get_edit_count ()))
     {
+      hb_barrier ();
+
       /* The spec says all subtables of an Extension lookup should
        * have the same type, which shall not be the Extension type
        * itself (but we already checked for that).
@@ -2045,24 +2068,33 @@ struct ClassDef
   unsigned int get_class (hb_codepoint_t glyph_id) const
   {
     switch (u.format) {
-    case 1: return u.format1.get_class (glyph_id);
-    case 2: return u.format2.get_class (glyph_id);
+    case 1: hb_barrier (); return u.format1.get_class (glyph_id);
+    case 2: hb_barrier (); return u.format2.get_class (glyph_id);
 #ifndef HB_NO_BEYOND_64K
-    case 3: return u.format3.get_class (glyph_id);
-    case 4: return u.format4.get_class (glyph_id);
+    case 3: hb_barrier (); return u.format3.get_class (glyph_id);
+    case 4: hb_barrier (); return u.format4.get_class (glyph_id);
 #endif
     default:return 0;
     }
   }
+  unsigned int get_class (hb_codepoint_t glyph_id,
+                          hb_ot_lookup_cache_t *cache) const
+  {
+    unsigned klass;
+    if (cache && cache->get (glyph_id, &klass)) return klass;
+    klass = get_class (glyph_id);
+    if (cache) cache->set (glyph_id, klass);
+    return klass;
+  }
 
   unsigned get_population () const
   {
     switch (u.format) {
-    case 1: return u.format1.get_population ();
-    case 2: return u.format2.get_population ();
+    case 1: hb_barrier (); return u.format1.get_population ();
+    case 2: hb_barrier (); return u.format2.get_population ();
 #ifndef HB_NO_BEYOND_64K
-    case 3: return u.format3.get_population ();
-    case 4: return u.format4.get_population ();
+    case 3: hb_barrier (); return u.format3.get_population ();
+    case 4: hb_barrier (); return u.format4.get_population ();
 #endif
     default:return NOT_COVERED;
     }
@@ -2124,11 +2156,11 @@ struct ClassDef
 
     switch (u.format)
     {
-    case 1: return_trace (u.format1.serialize (c, it));
-    case 2: return_trace (u.format2.serialize (c, it));
+    case 1: hb_barrier (); return_trace (u.format1.serialize (c, it));
+    case 2: hb_barrier (); return_trace (u.format2.serialize (c, it));
 #ifndef HB_NO_BEYOND_64K
-    case 3: return_trace (u.format3.serialize (c, it));
-    case 4: return_trace (u.format4.serialize (c, it));
+    case 3: hb_barrier (); return_trace (u.format3.serialize (c, it));
+    case 4: hb_barrier (); return_trace (u.format4.serialize (c, it));
 #endif
     default:return_trace (false);
     }
@@ -2142,11 +2174,11 @@ struct ClassDef
   {
     TRACE_SUBSET (this);
     switch (u.format) {
-    case 1: return_trace (u.format1.subset (c, klass_map, keep_empty_table, use_class_zero, glyph_filter));
-    case 2: return_trace (u.format2.subset (c, klass_map, keep_empty_table, use_class_zero, glyph_filter));
+    case 1: hb_barrier (); return_trace (u.format1.subset (c, klass_map, keep_empty_table, use_class_zero, glyph_filter));
+    case 2: hb_barrier (); return_trace (u.format2.subset (c, klass_map, keep_empty_table, use_class_zero, glyph_filter));
 #ifndef HB_NO_BEYOND_64K
-    case 3: return_trace (u.format3.subset (c, klass_map, keep_empty_table, use_class_zero, glyph_filter));
-    case 4: return_trace (u.format4.subset (c, klass_map, keep_empty_table, use_class_zero, glyph_filter));
+    case 3: hb_barrier (); return_trace (u.format3.subset (c, klass_map, keep_empty_table, use_class_zero, glyph_filter));
+    case 4: hb_barrier (); return_trace (u.format4.subset (c, klass_map, keep_empty_table, use_class_zero, glyph_filter));
 #endif
     default:return_trace (false);
     }
@@ -2156,12 +2188,13 @@ struct ClassDef
   {
     TRACE_SANITIZE (this);
     if (!u.format.sanitize (c)) return_trace (false);
+    hb_barrier ();
     switch (u.format) {
-    case 1: return_trace (u.format1.sanitize (c));
-    case 2: return_trace (u.format2.sanitize (c));
+    case 1: hb_barrier (); return_trace (u.format1.sanitize (c));
+    case 2: hb_barrier (); return_trace (u.format2.sanitize (c));
 #ifndef HB_NO_BEYOND_64K
-    case 3: return_trace (u.format3.sanitize (c));
-    case 4: return_trace (u.format4.sanitize (c));
+    case 3: hb_barrier (); return_trace (u.format3.sanitize (c));
+    case 4: hb_barrier (); return_trace (u.format4.sanitize (c));
 #endif
     default:return_trace (true);
     }
@@ -2170,11 +2203,11 @@ struct ClassDef
   unsigned cost () const
   {
     switch (u.format) {
-    case 1: return u.format1.cost ();
-    case 2: return u.format2.cost ();
+    case 1: hb_barrier (); return u.format1.cost ();
+    case 2: hb_barrier (); return u.format2.cost ();
 #ifndef HB_NO_BEYOND_64K
-    case 3: return u.format3.cost ();
-    case 4: return u.format4.cost ();
+    case 3: hb_barrier (); return u.format3.cost ();
+    case 4: hb_barrier (); return u.format4.cost ();
 #endif
     default:return 0u;
     }
@@ -2186,11 +2219,11 @@ struct ClassDef
   bool collect_coverage (set_t *glyphs) const
   {
     switch (u.format) {
-    case 1: return u.format1.collect_coverage (glyphs);
-    case 2: return u.format2.collect_coverage (glyphs);
+    case 1: hb_barrier (); return u.format1.collect_coverage (glyphs);
+    case 2: hb_barrier (); return u.format2.collect_coverage (glyphs);
 #ifndef HB_NO_BEYOND_64K
-    case 3: return u.format3.collect_coverage (glyphs);
-    case 4: return u.format4.collect_coverage (glyphs);
+    case 3: hb_barrier (); return u.format3.collect_coverage (glyphs);
+    case 4: hb_barrier (); return u.format4.collect_coverage (glyphs);
 #endif
     default:return false;
     }
@@ -2202,11 +2235,11 @@ struct ClassDef
   bool collect_class (set_t *glyphs, unsigned int klass) const
   {
     switch (u.format) {
-    case 1: return u.format1.collect_class (glyphs, klass);
-    case 2: return u.format2.collect_class (glyphs, klass);
+    case 1: hb_barrier (); return u.format1.collect_class (glyphs, klass);
+    case 2: hb_barrier (); return u.format2.collect_class (glyphs, klass);
 #ifndef HB_NO_BEYOND_64K
-    case 3: return u.format3.collect_class (glyphs, klass);
-    case 4: return u.format4.collect_class (glyphs, klass);
+    case 3: hb_barrier (); return u.format3.collect_class (glyphs, klass);
+    case 4: hb_barrier (); return u.format4.collect_class (glyphs, klass);
 #endif
     default:return false;
     }
@@ -2215,11 +2248,11 @@ struct ClassDef
   bool intersects (const hb_set_t *glyphs) const
   {
     switch (u.format) {
-    case 1: return u.format1.intersects (glyphs);
-    case 2: return u.format2.intersects (glyphs);
+    case 1: hb_barrier (); return u.format1.intersects (glyphs);
+    case 2: hb_barrier (); return u.format2.intersects (glyphs);
 #ifndef HB_NO_BEYOND_64K
-    case 3: return u.format3.intersects (glyphs);
-    case 4: return u.format4.intersects (glyphs);
+    case 3: hb_barrier (); return u.format3.intersects (glyphs);
+    case 4: hb_barrier (); return u.format4.intersects (glyphs);
 #endif
     default:return false;
     }
@@ -2227,11 +2260,11 @@ struct ClassDef
   bool intersects_class (const hb_set_t *glyphs, unsigned int klass) const
   {
     switch (u.format) {
-    case 1: return u.format1.intersects_class (glyphs, klass);
-    case 2: return u.format2.intersects_class (glyphs, klass);
+    case 1: hb_barrier (); return u.format1.intersects_class (glyphs, klass);
+    case 2: hb_barrier (); return u.format2.intersects_class (glyphs, klass);
 #ifndef HB_NO_BEYOND_64K
-    case 3: return u.format3.intersects_class (glyphs, klass);
-    case 4: return u.format4.intersects_class (glyphs, klass);
+    case 3: hb_barrier (); return u.format3.intersects_class (glyphs, klass);
+    case 4: hb_barrier (); return u.format4.intersects_class (glyphs, klass);
 #endif
     default:return false;
     }
@@ -2240,11 +2273,11 @@ struct ClassDef
   void intersected_class_glyphs (const hb_set_t *glyphs, unsigned klass, hb_set_t *intersect_glyphs) const
   {
     switch (u.format) {
-    case 1: return u.format1.intersected_class_glyphs (glyphs, klass, intersect_glyphs);
-    case 2: return u.format2.intersected_class_glyphs (glyphs, klass, intersect_glyphs);
+    case 1: hb_barrier (); return u.format1.intersected_class_glyphs (glyphs, klass, intersect_glyphs);
+    case 2: hb_barrier (); return u.format2.intersected_class_glyphs (glyphs, klass, intersect_glyphs);
 #ifndef HB_NO_BEYOND_64K
-    case 3: return u.format3.intersected_class_glyphs (glyphs, klass, intersect_glyphs);
-    case 4: return u.format4.intersected_class_glyphs (glyphs, klass, intersect_glyphs);
+    case 3: hb_barrier (); return u.format3.intersected_class_glyphs (glyphs, klass, intersect_glyphs);
+    case 4: hb_barrier (); return u.format4.intersected_class_glyphs (glyphs, klass, intersect_glyphs);
 #endif
     default:return;
     }
@@ -2253,11 +2286,11 @@ struct ClassDef
   void intersected_classes (const hb_set_t *glyphs, hb_set_t *intersect_classes) const
   {
     switch (u.format) {
-    case 1: return u.format1.intersected_classes (glyphs, intersect_classes);
-    case 2: return u.format2.intersected_classes (glyphs, intersect_classes);
+    case 1: hb_barrier (); return u.format1.intersected_classes (glyphs, intersect_classes);
+    case 2: hb_barrier (); return u.format2.intersected_classes (glyphs, intersect_classes);
 #ifndef HB_NO_BEYOND_64K
-    case 3: return u.format3.intersected_classes (glyphs, intersect_classes);
-    case 4: return u.format4.intersected_classes (glyphs, intersect_classes);
+    case 3: hb_barrier (); return u.format3.intersected_classes (glyphs, intersect_classes);
+    case 4: hb_barrier (); return u.format4.intersected_classes (glyphs, intersect_classes);
 #endif
     default:return;
     }
@@ -2447,6 +2480,8 @@ struct VarRegionAxis
     int peak = peakCoord.to_int ();
     if (peak == 0 || coord == peak)
       return 1.f;
+    else if (coord == 0) // Faster
+      return 0.f;
 
     int start = startCoord.to_int (), end = endCoord.to_int ();
 
@@ -2470,8 +2505,6 @@ struct VarRegionAxis
   {
     TRACE_SANITIZE (this);
     return_trace (c->check_struct (this));
-    /* TODO Handle invalid start/peak/end configs, so we don't
-     * have to do that at runtime. */
   }
 
   bool serialize (hb_serialize_context_t *c) const
@@ -2487,6 +2520,33 @@ struct VarRegionAxis
   public:
   DEFINE_SIZE_STATIC (6);
 };
+struct SparseVarRegionAxis
+{
+  float evaluate (const int *coords, unsigned int coord_len) const
+  {
+    unsigned i = axisIndex;
+    int coord = i < coord_len ? coords[i] : 0;
+    return axis.evaluate (coord);
+  }
+
+  bool sanitize (hb_sanitize_context_t *c) const
+  {
+    TRACE_SANITIZE (this);
+    return_trace (c->check_struct (this));
+  }
+
+  bool serialize (hb_serialize_context_t *c) const
+  {
+    TRACE_SERIALIZE (this);
+    return_trace (c->embed (this));
+  }
+
+  public:
+  HBUINT16 axisIndex;
+  VarRegionAxis axis;
+  public:
+  DEFINE_SIZE_STATIC (8);
+};
 
 #define REGION_CACHE_ITEM_CACHE_INVALID 2.f
 
@@ -2534,7 +2594,9 @@ struct VarRegionList
   bool sanitize (hb_sanitize_context_t *c) const
   {
     TRACE_SANITIZE (this);
-    return_trace (c->check_struct (this) && axesZ.sanitize (c, axisCount * regionCount));
+    return_trace (c->check_struct (this) &&
+                  hb_barrier () &&
+                  axesZ.sanitize (c, axisCount * regionCount));
   }
 
   bool serialize (hb_serialize_context_t *c,
@@ -2615,7 +2677,7 @@ struct VarRegionList
       float max_val = axis_region->endCoord.to_float ();
 
       if (def_val != 0.f)
-        axis_tuples.set (*axis_tag, Triple (min_val, def_val, max_val));
+        axis_tuples.set (*axis_tag, Triple ((double) min_val, (double) def_val, (double) max_val));
       axis_region++;
     }
     return !axis_tuples.in_error ();
@@ -2649,6 +2711,65 @@ struct VarRegionList
   DEFINE_SIZE_ARRAY (4, axesZ);
 };
 
+struct SparseVariationRegion : Array16Of<SparseVarRegionAxis>
+{
+  float evaluate (const int *coords, unsigned int coord_len) const
+  {
+    float v = 1.f;
+    unsigned int count = len;
+    for (unsigned int i = 0; i < count; i++)
+    {
+      float factor = arrayZ[i].evaluate (coords, coord_len);
+      if (factor == 0.f)
+        return 0.;
+      v *= factor;
+    }
+    return v;
+  }
+};
+
+struct SparseVarRegionList
+{
+  using cache_t = float;
+
+  float evaluate (unsigned int region_index,
+                  const int *coords, unsigned int coord_len,
+                  cache_t *cache = nullptr) const
+  {
+    if (unlikely (region_index >= regions.len))
+      return 0.;
+
+    float *cached_value = nullptr;
+    if (cache)
+    {
+      cached_value = &(cache[region_index]);
+      if (likely (*cached_value != REGION_CACHE_ITEM_CACHE_INVALID))
+        return *cached_value;
+    }
+
+    const SparseVariationRegion &region = this+regions[region_index];
+
+    float v = region.evaluate (coords, coord_len);
+
+    if (cache)
+      *cached_value = v;
+    return v;
+  }
+
+  bool sanitize (hb_sanitize_context_t *c) const
+  {
+    TRACE_SANITIZE (this);
+    return_trace (regions.sanitize (c, this));
+  }
+
+  public:
+  Array16Of<Offset32To<SparseVariationRegion>>
+                regions;
+  public:
+  DEFINE_SIZE_ARRAY (2, regions);
+};
+
+
 struct VarData
 {
   unsigned int get_item_count () const
@@ -2728,6 +2849,7 @@ struct VarData
     TRACE_SANITIZE (this);
     return_trace (c->check_struct (this) &&
                   regionIndices.sanitize (c) &&
+                  hb_barrier () &&
                   wordCount () <= regionIndices.len &&
                   c->check_range (get_delta_bytes (),
                                   itemCount,
@@ -3009,7 +3131,53 @@ struct VarData
   DEFINE_SIZE_ARRAY (6, regionIndices);
 };
 
-struct VariationStore
+struct MultiVarData
+{
+  unsigned int get_size () const
+  { return min_size
+         - regionIndices.min_size + regionIndices.get_size ()
+         + StructAfter<CFF2Index> (regionIndices).get_size ();
+  }
+
+  void get_delta (unsigned int inner,
+                  const int *coords, unsigned int coord_count,
+                  const SparseVarRegionList &regions,
+                  hb_array_t<float> out,
+                  SparseVarRegionList::cache_t *cache = nullptr) const
+  {
+    auto &deltaSets = StructAfter<decltype (deltaSetsX)> (regionIndices);
+
+    auto values_iter = deltaSets.fetcher (inner);
+    unsigned regionCount = regionIndices.len;
+    for (unsigned regionIndex = 0; regionIndex < regionCount; regionIndex++)
+    {
+      float scalar = regions.evaluate (regionIndices.arrayZ[regionIndex],
+                                       coords, coord_count,
+                                       cache);
+      values_iter.add_to (out, scalar);
+    }
+  }
+
+  bool sanitize (hb_sanitize_context_t *c) const
+  {
+    TRACE_SANITIZE (this);
+    return_trace (format.sanitize (c) &&
+                  hb_barrier () &&
+                  format == 1 &&
+                  regionIndices.sanitize (c) &&
+                  hb_barrier () &&
+                  StructAfter<decltype (deltaSetsX)> (regionIndices).sanitize (c));
+  }
+
+  protected:
+  HBUINT8             format; // 1
+  Array16Of<HBUINT16> regionIndices;
+  TupleList           deltaSetsX;
+  public:
+  DEFINE_SIZE_MIN (8);
+};
+
+struct ItemVariationStore
 {
   friend struct item_variations_t;
   using cache_t = VarRegionList::cache_t;
@@ -3061,7 +3229,7 @@ struct VariationStore
     return get_delta (outer, inner, coords, coord_count, cache);
   }
   float get_delta (unsigned int index,
-                   hb_array_t<int> coords,
+                   hb_array_t<const int> coords,
                    VarRegionList::cache_t *cache = nullptr) const
   {
     return get_delta (index,
@@ -3077,6 +3245,7 @@ struct VariationStore
 
     TRACE_SANITIZE (this);
     return_trace (c->check_struct (this) &&
+                  hb_barrier () &&
                   format == 1 &&
                   regions.sanitize (c, this) &&
                   dataSets.sanitize (c, this));
@@ -3113,7 +3282,7 @@ struct VariationStore
   }
 
   bool serialize (hb_serialize_context_t *c,
-                  const VariationStore *src,
+                  const ItemVariationStore *src,
                   const hb_array_t <const hb_inc_bimap_t> &inner_maps)
   {
     TRACE_SERIALIZE (this);
@@ -3169,7 +3338,7 @@ struct VariationStore
     return_trace (true);
   }
 
-  VariationStore *copy (hb_serialize_context_t *c) const
+  ItemVariationStore *copy (hb_serialize_context_t *c) const
   {
     TRACE_SERIALIZE (this);
     auto *out = c->start_embed (this);
@@ -3180,6 +3349,8 @@ struct VariationStore
     for (unsigned i = 0; i < count; i++)
     {
       hb_inc_bimap_t *map = inner_maps.push ();
+      if (!c->propagate_error(inner_maps))
+        return_trace(nullptr);
       auto &data = this+dataSets[i];
 
       unsigned itemCount = data.get_item_count ();
@@ -3199,7 +3370,7 @@ struct VariationStore
     return_trace (false);
 #endif
 
-    VariationStore *varstore_prime = c->serializer->start_embed<VariationStore> ();
+    ItemVariationStore *varstore_prime = c->serializer->start_embed<ItemVariationStore> ();
     if (unlikely (!varstore_prime)) return_trace (false);
 
     varstore_prime->serialize (c->serializer, this, inner_maps);
@@ -3265,8 +3436,370 @@ struct VariationStore
   DEFINE_SIZE_ARRAY_SIZED (8, dataSets);
 };
 
+struct MultiItemVariationStore
+{
+  using cache_t = SparseVarRegionList::cache_t;
+
+  cache_t *create_cache (hb_array_t<float> static_cache = hb_array_t<float> ()) const
+  {
+#ifdef HB_NO_VAR
+    return nullptr;
+#endif
+    auto &r = this+regions;
+    unsigned count = r.regions.len;
+
+    float *cache;
+    if (count <= static_cache.length)
+      cache = static_cache.arrayZ;
+    else
+    {
+      cache = (float *) hb_malloc (sizeof (float) * count);
+      if (unlikely (!cache)) return nullptr;
+    }
+
+    for (unsigned i = 0; i < count; i++)
+      cache[i] = REGION_CACHE_ITEM_CACHE_INVALID;
+
+    return cache;
+  }
+
+  static void destroy_cache (cache_t *cache,
+                             hb_array_t<float> static_cache = hb_array_t<float> ())
+  {
+    if (cache != static_cache.arrayZ)
+      hb_free (cache);
+  }
+
+  private:
+  void get_delta (unsigned int outer, unsigned int inner,
+                  const int *coords, unsigned int coord_count,
+                  hb_array_t<float> out,
+                  VarRegionList::cache_t *cache = nullptr) const
+  {
+#ifdef HB_NO_VAR
+    return;
+#endif
+
+    if (unlikely (outer >= dataSets.len))
+      return;
+
+    return (this+dataSets[outer]).get_delta (inner,
+                                             coords, coord_count,
+                                             this+regions,
+                                             out,
+                                             cache);
+  }
+
+  public:
+  void get_delta (unsigned int index,
+                  const int *coords, unsigned int coord_count,
+                  hb_array_t<float> out,
+                  VarRegionList::cache_t *cache = nullptr) const
+  {
+    unsigned int outer = index >> 16;
+    unsigned int inner = index & 0xFFFF;
+    get_delta (outer, inner, coords, coord_count, out, cache);
+  }
+  void get_delta (unsigned int index,
+                  hb_array_t<const int> coords,
+                  hb_array_t<float> out,
+                  VarRegionList::cache_t *cache = nullptr) const
+  {
+    return get_delta (index,
+                      coords.arrayZ, coords.length,
+                      out,
+                      cache);
+  }
+
+  bool sanitize (hb_sanitize_context_t *c) const
+  {
+#ifdef HB_NO_VAR
+    return true;
+#endif
+
+    TRACE_SANITIZE (this);
+    return_trace (c->check_struct (this) &&
+                  hb_barrier () &&
+                  format == 1 &&
+                  regions.sanitize (c, this) &&
+                  dataSets.sanitize (c, this));
+  }
+
+  protected:
+  HBUINT16                              format; // 1
+  Offset32To<SparseVarRegionList>       regions;
+  Array16OfOffset32To<MultiVarData>     dataSets;
+  public:
+  DEFINE_SIZE_ARRAY_SIZED (8, dataSets);
+};
+
 #undef REGION_CACHE_ITEM_CACHE_INVALID
 
+template <typename MapCountT>
+struct DeltaSetIndexMapFormat01
+{
+  friend struct DeltaSetIndexMap;
+
+  unsigned get_size () const
+  { return min_size + mapCount * get_width (); }
+
+  private:
+  DeltaSetIndexMapFormat01* copy (hb_serialize_context_t *c) const
+  {
+    TRACE_SERIALIZE (this);
+    return_trace (c->embed (this));
+  }
+
+  template <typename T>
+  bool serialize (hb_serialize_context_t *c, const T &plan)
+  {
+    unsigned int width = plan.get_width ();
+    unsigned int inner_bit_count = plan.get_inner_bit_count ();
+    const hb_array_t<const uint32_t> output_map = plan.get_output_map ();
+
+    TRACE_SERIALIZE (this);
+    if (unlikely (output_map.length && ((((inner_bit_count-1)&~0xF)!=0) || (((width-1)&~0x3)!=0))))
+      return_trace (false);
+    if (unlikely (!c->extend_min (this))) return_trace (false);
+
+    entryFormat = ((width-1)<<4)|(inner_bit_count-1);
+    mapCount = output_map.length;
+    HBUINT8 *p = c->allocate_size<HBUINT8> (width * output_map.length);
+    if (unlikely (!p)) return_trace (false);
+    for (unsigned int i = 0; i < output_map.length; i++)
+    {
+      unsigned int v = output_map.arrayZ[i];
+      if (v)
+      {
+        unsigned int outer = v >> 16;
+        unsigned int inner = v & 0xFFFF;
+        unsigned int u = (outer << inner_bit_count) | inner;
+        for (unsigned int w = width; w > 0;)
+        {
+          p[--w] = u;
+          u >>= 8;
+        }
+      }
+      p += width;
+    }
+    return_trace (true);
+  }
+
+  uint32_t map (unsigned int v) const /* Returns 16.16 outer.inner. */
+  {
+    /* If count is zero, pass value unchanged.  This takes
+     * care of direct mapping for advance map. */
+    if (!mapCount)
+      return v;
+
+    if (v >= mapCount)
+      v = mapCount - 1;
+
+    unsigned int u = 0;
+    { /* Fetch it. */
+      unsigned int w = get_width ();
+      const HBUINT8 *p = mapDataZ.arrayZ + w * v;
+      for (; w; w--)
+        u = (u << 8) + *p++;
+    }
+
+    { /* Repack it. */
+      unsigned int n = get_inner_bit_count ();
+      unsigned int outer = u >> n;
+      unsigned int inner = u & ((1 << n) - 1);
+      u = (outer<<16) | inner;
+    }
+
+    return u;
+  }
+
+  unsigned get_map_count () const       { return mapCount; }
+  unsigned get_width () const           { return ((entryFormat >> 4) & 3) + 1; }
+  unsigned get_inner_bit_count () const { return (entryFormat & 0xF) + 1; }
+
+
+  bool sanitize (hb_sanitize_context_t *c) const
+  {
+    TRACE_SANITIZE (this);
+    return_trace (c->check_struct (this) &&
+                  hb_barrier () &&
+                  c->check_range (mapDataZ.arrayZ,
+                                  mapCount,
+                                  get_width ()));
+  }
+
+  protected:
+  HBUINT8       format;         /* Format identifier--format = 0 */
+  HBUINT8       entryFormat;    /* A packed field that describes the compressed
+                                 * representation of delta-set indices. */
+  MapCountT     mapCount;       /* The number of mapping entries. */
+  UnsizedArrayOf<HBUINT8>
+                mapDataZ;       /* The delta-set index mapping data. */
+
+  public:
+  DEFINE_SIZE_ARRAY (2+MapCountT::static_size, mapDataZ);
+};
+
+struct DeltaSetIndexMap
+{
+  template <typename T>
+  bool serialize (hb_serialize_context_t *c, const T &plan)
+  {
+    TRACE_SERIALIZE (this);
+    unsigned length = plan.get_output_map ().length;
+    u.format = length <= 0xFFFF ? 0 : 1;
+    switch (u.format) {
+    case 0: hb_barrier (); return_trace (u.format0.serialize (c, plan));
+    case 1: hb_barrier (); return_trace (u.format1.serialize (c, plan));
+    default:return_trace (false);
+    }
+  }
+
+  uint32_t map (unsigned v) const
+  {
+    switch (u.format) {
+    case 0: hb_barrier (); return (u.format0.map (v));
+    case 1: hb_barrier (); return (u.format1.map (v));
+    default:return v;
+    }
+  }
+
+  unsigned get_map_count () const
+  {
+    switch (u.format) {
+    case 0: hb_barrier (); return u.format0.get_map_count ();
+    case 1: hb_barrier (); return u.format1.get_map_count ();
+    default:return 0;
+    }
+  }
+
+  unsigned get_width () const
+  {
+    switch (u.format) {
+    case 0: hb_barrier (); return u.format0.get_width ();
+    case 1: hb_barrier (); return u.format1.get_width ();
+    default:return 0;
+    }
+  }
+
+  unsigned get_inner_bit_count () const
+  {
+    switch (u.format) {
+    case 0: hb_barrier (); return u.format0.get_inner_bit_count ();
+    case 1: hb_barrier (); return u.format1.get_inner_bit_count ();
+    default:return 0;
+    }
+  }
+
+  bool sanitize (hb_sanitize_context_t *c) const
+  {
+    TRACE_SANITIZE (this);
+    if (!u.format.sanitize (c)) return_trace (false);
+    hb_barrier ();
+    switch (u.format) {
+    case 0: hb_barrier (); return_trace (u.format0.sanitize (c));
+    case 1: hb_barrier (); return_trace (u.format1.sanitize (c));
+    default:return_trace (true);
+    }
+  }
+
+  DeltaSetIndexMap* copy (hb_serialize_context_t *c) const
+  {
+    TRACE_SERIALIZE (this);
+    switch (u.format) {
+    case 0: hb_barrier (); return_trace (reinterpret_cast<DeltaSetIndexMap *> (u.format0.copy (c)));
+    case 1: hb_barrier (); return_trace (reinterpret_cast<DeltaSetIndexMap *> (u.format1.copy (c)));
+    default:return_trace (nullptr);
+    }
+  }
+
+  protected:
+  union {
+  HBUINT8                            format;         /* Format identifier */
+  DeltaSetIndexMapFormat01<HBUINT16> format0;
+  DeltaSetIndexMapFormat01<HBUINT32> format1;
+  } u;
+  public:
+  DEFINE_SIZE_UNION (1, format);
+};
+
+
+struct ItemVarStoreInstancer
+{
+  ItemVarStoreInstancer (const ItemVariationStore *varStore_,
+                         const DeltaSetIndexMap *varIdxMap,
+                         hb_array_t<const int> coords,
+                         VarRegionList::cache_t *cache = nullptr) :
+    varStore (varStore_), varIdxMap (varIdxMap), coords (coords), cache (cache)
+  {
+    if (!varStore)
+      varStore = &Null(ItemVariationStore);
+  }
+
+  operator bool () const { return varStore && bool (coords); }
+
+  float operator[] (uint32_t varIdx) const
+  { return (*this) (varIdx); }
+
+  float operator() (uint32_t varIdx, unsigned short offset = 0) const
+  {
+   if (!coords || varIdx == VarIdx::NO_VARIATION)
+     return 0.f;
+
+    varIdx += offset;
+    if (varIdxMap)
+      varIdx = varIdxMap->map (varIdx);
+    return varStore->get_delta (varIdx, coords, cache);
+  }
+
+  const ItemVariationStore *varStore;
+  const DeltaSetIndexMap *varIdxMap;
+  hb_array_t<const int> coords;
+  VarRegionList::cache_t *cache;
+};
+
+struct MultiItemVarStoreInstancer
+{
+  MultiItemVarStoreInstancer (const MultiItemVariationStore *varStore,
+                              const DeltaSetIndexMap *varIdxMap,
+                              hb_array_t<const int> coords,
+                              SparseVarRegionList::cache_t *cache = nullptr) :
+    varStore (varStore), varIdxMap (varIdxMap), coords (coords), cache (cache)
+  {
+    if (!varStore)
+      varStore = &Null(MultiItemVariationStore);
+  }
+
+  operator bool () const { return varStore && bool (coords); }
+
+  float operator[] (uint32_t varIdx) const
+  {
+    float v = 0;
+    (*this) (hb_array (&v, 1), varIdx);
+    return v;
+  }
+
+  void operator() (hb_array_t<float> out, uint32_t varIdx, unsigned short offset = 0) const
+  {
+    if (coords && varIdx != VarIdx::NO_VARIATION)
+    {
+      varIdx += offset;
+      if (varIdxMap)
+        varIdx = varIdxMap->map (varIdx);
+      varStore->get_delta (varIdx, coords, out, cache);
+    }
+    else
+      for (unsigned i = 0; i < out.length; i++)
+        out.arrayZ[i] = 0.f;
+  }
+
+  const MultiItemVariationStore *varStore;
+  const DeltaSetIndexMap *varIdxMap;
+  hb_array_t<const int> coords;
+  SparseVarRegionList::cache_t *cache;
+};
+
+
 /*
  * Feature Variations
  */
@@ -3278,7 +3811,16 @@ enum Cond_with_Var_flag_t
   DROP_RECORD_WITH_VAR = 3,
 };
 
-struct ConditionFormat1
+struct Condition;
+
+template <typename Instancer>
+static bool
+_hb_recurse_condition_evaluate (const struct Condition &condition,
+                                const int *coords,
+                                unsigned int coord_len,
+                                Instancer *instancer);
+
+struct ConditionAxisRange
 {
   friend struct Condition;
 
@@ -3298,19 +3840,19 @@ struct ConditionFormat1
       return_trace (false);
 
     const hb_hashmap_t<hb_tag_t, Triple>& normalized_axes_location = c->plan->axes_location;
-    Triple axis_limit{-1.f, 0.f, 1.f};
+    Triple axis_limit{-1.0, 0.0, 1.0};
     Triple *normalized_limit;
     if (normalized_axes_location.has (*axis_tag, &normalized_limit))
       axis_limit = *normalized_limit;
 
     const hb_hashmap_t<hb_tag_t, TripleDistances>& axes_triple_distances = c->plan->axes_triple_distances;
-    TripleDistances axis_triple_distances{1.f, 1.f};
+    TripleDistances axis_triple_distances{1.0, 1.0};
     TripleDistances *triple_dists;
     if (axes_triple_distances.has (*axis_tag, &triple_dists))
       axis_triple_distances = *triple_dists;
 
-    float normalized_min = renormalizeValue (filterRangeMinValue.to_float (), axis_limit, axis_triple_distances, false);
-    float normalized_max = renormalizeValue (filterRangeMaxValue.to_float (), axis_limit, axis_triple_distances, false);
+    float normalized_min = renormalizeValue ((double) filterRangeMinValue.to_float (), axis_limit, axis_triple_distances, false);
+    float normalized_max = renormalizeValue ((double) filterRangeMaxValue.to_float (), axis_limit, axis_triple_distances, false);
     out->filterRangeMinValue.set_float (normalized_min);
     out->filterRangeMaxValue.set_float (normalized_max);
 
@@ -3328,10 +3870,14 @@ struct ConditionFormat1
 
     hb_tag_t axis_tag = c->axes_index_tag_map->get (axisIndex);
 
-    Triple axis_range (-1.f, 0.f, 1.f);
+    Triple axis_range (-1.0, 0.0, 1.0);
     Triple *axis_limit;
+    bool axis_set_by_user = false;
     if (c->axes_location->has (axis_tag, &axis_limit))
+    {
       axis_range = *axis_limit;
+      axis_set_by_user = true;
+    }
 
     float axis_min_val = axis_range.minimum;
     float axis_default_val = axis_range.middle;
@@ -3350,26 +3896,26 @@ struct ConditionFormat1
       return DROP_RECORD_WITH_VAR;
 
     //condition met and axis pinned, drop the condition
-    if (c->axes_location->has (axis_tag) &&
-        c->axes_location->get (axis_tag).is_point ())
+    if (axis_set_by_user && axis_range.is_point ())
       return DROP_COND_WITH_VAR;
 
     if (filter_max_val != axis_max_val || filter_min_val != axis_min_val)
     {
       // add axisIndex->value into the hashmap so we can check if the record is
       // unique with variations
-      int16_t int_filter_max_val = filterRangeMaxValue.to_int ();
-      int16_t int_filter_min_val = filterRangeMinValue.to_int ();
+      uint16_t int_filter_max_val = (uint16_t) filterRangeMaxValue.to_int ();
+      uint16_t int_filter_min_val = (uint16_t) filterRangeMinValue.to_int ();
       hb_codepoint_t val = (int_filter_max_val << 16) + int_filter_min_val;
 
       condition_map->set (axisIndex, val);
       return KEEP_COND_WITH_VAR;
     }
-
     return KEEP_RECORD_WITH_VAR;
   }
 
-  bool evaluate (const int *coords, unsigned int coord_len) const
+  template <typename Instancer>
+  bool evaluate (const int *coords, unsigned int coord_len,
+                 Instancer *instancer HB_UNUSED) const
   {
     int coord = axisIndex < coord_len ? coords[axisIndex] : 0;
     return filterRangeMinValue.to_int () <= coord && coord <= filterRangeMaxValue.to_int ();
@@ -3390,12 +3936,199 @@ struct ConditionFormat1
   DEFINE_SIZE_STATIC (8);
 };
 
+struct ConditionValue
+{
+  friend struct Condition;
+
+  bool subset (hb_subset_context_t *c) const
+  {
+    TRACE_SUBSET (this);
+    // TODO(subset)
+    return_trace (false);
+  }
+
+  private:
+  template <typename Instancer>
+  bool evaluate (const int *coords, unsigned int coord_len,
+                 Instancer *instancer) const
+  {
+    signed value = defaultValue;
+    value += (*instancer)[varIdx];
+    return value > 0;
+  }
+
+  bool subset (hb_subset_context_t *c,
+               hb_subset_layout_context_t *l,
+               bool insert_catch_all) const
+  {
+    TRACE_SUBSET (this);
+    // TODO(subset)
+    return_trace (false);
+  }
+
+  bool sanitize (hb_sanitize_context_t *c) const
+  {
+    TRACE_SANITIZE (this);
+    return_trace (c->check_struct (this));
+  }
+
+  protected:
+  HBUINT16      format;         /* Format identifier--format = 2 */
+  HBINT16       defaultValue;   /* Value at default instance. */
+  VarIdx        varIdx;         /* Variation index */
+  public:
+  DEFINE_SIZE_STATIC (8);
+};
+
+struct ConditionAnd
+{
+  friend struct Condition;
+
+  bool subset (hb_subset_context_t *c) const
+  {
+    TRACE_SUBSET (this);
+    // TODO(subset)
+    return_trace (false);
+  }
+
+  private:
+  template <typename Instancer>
+  bool evaluate (const int *coords, unsigned int coord_len,
+                 Instancer *instancer) const
+  {
+    unsigned int count = conditions.len;
+    for (unsigned int i = 0; i < count; i++)
+      if (!_hb_recurse_condition_evaluate (this+conditions.arrayZ[i],
+                                           coords, coord_len,
+                                           instancer))
+        return false;
+    return true;
+  }
+
+  bool subset (hb_subset_context_t *c,
+               hb_subset_layout_context_t *l,
+               bool insert_catch_all) const
+  {
+    TRACE_SUBSET (this);
+    // TODO(subset)
+    return_trace (false);
+  }
+
+  bool sanitize (hb_sanitize_context_t *c) const
+  {
+    TRACE_SANITIZE (this);
+    return_trace (conditions.sanitize (c, this));
+  }
+
+  protected:
+  HBUINT16      format;         /* Format identifier--format = 3 */
+  Array8OfOffset24To<struct Condition>  conditions;
+  public:
+  DEFINE_SIZE_ARRAY (3, conditions);
+};
+
+struct ConditionOr
+{
+  friend struct Condition;
+
+  bool subset (hb_subset_context_t *c) const
+  {
+    TRACE_SUBSET (this);
+    // TODO(subset)
+    return_trace (false);
+  }
+
+  private:
+  template <typename Instancer>
+  bool evaluate (const int *coords, unsigned int coord_len,
+                 Instancer *instancer) const
+  {
+    unsigned int count = conditions.len;
+    for (unsigned int i = 0; i < count; i++)
+      if (_hb_recurse_condition_evaluate (this+conditions.arrayZ[i],
+                                          coords, coord_len,
+                                          instancer))
+        return true;
+    return false;
+  }
+
+  bool subset (hb_subset_context_t *c,
+               hb_subset_layout_context_t *l,
+               bool insert_catch_all) const
+  {
+    TRACE_SUBSET (this);
+    // TODO(subset)
+    return_trace (false);
+  }
+
+  bool sanitize (hb_sanitize_context_t *c) const
+  {
+    TRACE_SANITIZE (this);
+    return_trace (conditions.sanitize (c, this));
+  }
+
+  protected:
+  HBUINT16      format;         /* Format identifier--format = 4 */
+  Array8OfOffset24To<struct Condition>  conditions;
+  public:
+  DEFINE_SIZE_ARRAY (3, conditions);
+};
+
+struct ConditionNegate
+{
+  friend struct Condition;
+
+  bool subset (hb_subset_context_t *c) const
+  {
+    TRACE_SUBSET (this);
+    // TODO(subset)
+    return_trace (false);
+  }
+
+  private:
+  template <typename Instancer>
+  bool evaluate (const int *coords, unsigned int coord_len,
+                 Instancer *instancer) const
+  {
+    return !_hb_recurse_condition_evaluate (this+condition,
+                                            coords, coord_len,
+                                            instancer);
+  }
+
+  bool subset (hb_subset_context_t *c,
+               hb_subset_layout_context_t *l,
+               bool insert_catch_all) const
+  {
+    TRACE_SUBSET (this);
+    // TODO(subset)
+    return_trace (false);
+  }
+
+  bool sanitize (hb_sanitize_context_t *c) const
+  {
+    TRACE_SANITIZE (this);
+    return_trace (condition.sanitize (c, this));
+  }
+
+  protected:
+  HBUINT16      format;         /* Format identifier--format = 5 */
+  Offset24To<struct Condition>  condition;
+  public:
+  DEFINE_SIZE_STATIC (5);
+};
+
 struct Condition
 {
-  bool evaluate (const int *coords, unsigned int coord_len) const
+  template <typename Instancer>
+  bool evaluate (const int *coords, unsigned int coord_len,
+                 Instancer *instancer) const
   {
     switch (u.format) {
-    case 1: return u.format1.evaluate (coords, coord_len);
+    case 1: hb_barrier (); return u.format1.evaluate (coords, coord_len, instancer);
+    case 2: hb_barrier (); return u.format2.evaluate (coords, coord_len, instancer);
+    case 3: hb_barrier (); return u.format3.evaluate (coords, coord_len, instancer);
+    case 4: hb_barrier (); return u.format4.evaluate (coords, coord_len, instancer);
+    case 5: hb_barrier (); return u.format5.evaluate (coords, coord_len, instancer);
     default:return false;
     }
   }
@@ -3404,7 +4137,8 @@ struct Condition
                                              hb_map_t *condition_map /* OUT */) const
   {
     switch (u.format) {
-    case 1: return u.format1.keep_with_variations (c, condition_map);
+    case 1: hb_barrier (); return u.format1.keep_with_variations (c, condition_map);
+    // TODO(subset)
     default: c->apply = false; return KEEP_COND_WITH_VAR;
     }
   }
@@ -3415,7 +4149,11 @@ struct Condition
     if (unlikely (!c->may_dispatch (this, &u.format))) return c->no_dispatch_return_value ();
     TRACE_DISPATCH (this, u.format);
     switch (u.format) {
-    case 1: return_trace (c->dispatch (u.format1, std::forward<Ts> (ds)...));
+    case 1: hb_barrier (); return_trace (c->dispatch (u.format1, std::forward<Ts> (ds)...));
+    case 2: hb_barrier (); return_trace (c->dispatch (u.format2, std::forward<Ts> (ds)...));
+    case 3: hb_barrier (); return_trace (c->dispatch (u.format3, std::forward<Ts> (ds)...));
+    case 4: hb_barrier (); return_trace (c->dispatch (u.format4, std::forward<Ts> (ds)...));
+    case 5: hb_barrier (); return_trace (c->dispatch (u.format5, std::forward<Ts> (ds)...));
     default:return_trace (c->default_return_value ());
     }
   }
@@ -3424,8 +4162,13 @@ struct Condition
   {
     TRACE_SANITIZE (this);
     if (!u.format.sanitize (c)) return_trace (false);
+    hb_barrier ();
     switch (u.format) {
-    case 1: return_trace (u.format1.sanitize (c));
+    case 1: hb_barrier (); return_trace (u.format1.sanitize (c));
+    case 2: hb_barrier (); return_trace (u.format2.sanitize (c));
+    case 3: hb_barrier (); return_trace (u.format3.sanitize (c));
+    case 4: hb_barrier (); return_trace (u.format4.sanitize (c));
+    case 5: hb_barrier (); return_trace (u.format5.sanitize (c));
     default:return_trace (true);
     }
   }
@@ -3433,19 +4176,51 @@ struct Condition
   protected:
   union {
   HBUINT16              format;         /* Format identifier */
-  ConditionFormat1      format1;
+  ConditionAxisRange    format1;
+  ConditionValue        format2;
+  ConditionAnd          format3;
+  ConditionOr           format4;
+  ConditionNegate       format5;
   } u;
   public:
   DEFINE_SIZE_UNION (2, format);
 };
 
+template <typename Instancer>
+bool
+_hb_recurse_condition_evaluate (const struct Condition &condition,
+                                const int *coords,
+                                unsigned int coord_len,
+                                Instancer *instancer)
+{
+  return condition.evaluate (coords, coord_len, instancer);
+}
+
+struct ConditionList
+{
+  const Condition& operator[] (unsigned i) const
+  { return this+conditions[i]; }
+
+  bool sanitize (hb_sanitize_context_t *c) const
+  {
+    TRACE_SANITIZE (this);
+    return_trace (conditions.sanitize (c, this));
+  }
+
+  protected:
+  Array32OfOffset32To<Condition> conditions;
+  public:
+  DEFINE_SIZE_ARRAY (4, conditions);
+};
+
 struct ConditionSet
 {
-  bool evaluate (const int *coords, unsigned int coord_len) const
+  bool evaluate (const int *coords, unsigned int coord_len,
+                 ItemVarStoreInstancer *instancer) const
   {
     unsigned int count = conditions.len;
     for (unsigned int i = 0; i < count; i++)
-      if (!(this+conditions.arrayZ[i]).evaluate (coords, coord_len))
+      if (!(this+conditions.arrayZ[i]).evaluate (coords, coord_len, instancer))
         return false;
     return true;
   }
@@ -3497,12 +4272,15 @@ struct ConditionSet
   }
 
   bool subset (hb_subset_context_t *c,
-               hb_subset_layout_context_t *l) const
+               hb_subset_layout_context_t *l,
+               bool insert_catch_all) const
   {
     TRACE_SUBSET (this);
     auto *out = c->serializer->start_embed (this);
     if (unlikely (!out || !c->serializer->extend_min (out))) return_trace (false);
 
+    if (insert_catch_all) return_trace (true);
+
     hb_set_t *retained_cond_set = nullptr;
     if (l->feature_record_cond_idx_map != nullptr)
       retained_cond_set = l->feature_record_cond_idx_map->get (l->cur_feature_var_record_idx);
@@ -3548,27 +4326,51 @@ struct FeatureTableSubstitutionRecord
   }
 
   void collect_feature_substitutes_with_variations (hb_hashmap_t<unsigned, const Feature*> *feature_substitutes_map,
+                                                    hb_set_t& catch_all_record_feature_idxes,
                                                     const hb_set_t *feature_indices,
                                                     const void *base) const
   {
     if (feature_indices->has (featureIndex))
+    {
       feature_substitutes_map->set (featureIndex, &(base+feature));
+      catch_all_record_feature_idxes.add (featureIndex);
+    }
+  }
+
+  bool serialize (hb_subset_layout_context_t *c,
+                  unsigned feature_index,
+                  const Feature *f, const Tag *tag)
+  {
+    TRACE_SERIALIZE (this);
+    hb_serialize_context_t *s = c->subset_context->serializer;
+    if (unlikely (!s->extend_min (this))) return_trace (false);
+
+    uint32_t *new_feature_idx;
+    if (!c->feature_index_map->has (feature_index, &new_feature_idx))
+      return_trace (false);
+
+    if (!s->check_assign (featureIndex, *new_feature_idx, HB_SERIALIZE_ERROR_INT_OVERFLOW))
+      return_trace (false);
+
+    s->push ();
+    bool ret = f->subset (c->subset_context, c, tag);
+    if (ret) s->add_link (feature, s->pop_pack ());
+    else s->pop_discard ();
+
+    return_trace (ret);
   }
 
   bool subset (hb_subset_layout_context_t *c, const void *base) const
   {
     TRACE_SUBSET (this);
-    if (!c->feature_index_map->has (featureIndex) ||
-        c->feature_substitutes_map->has (featureIndex)) {
-      // Feature that is being substituted is not being retained, so we don't
-      // need this.
+    uint32_t *new_feature_index;
+    if (!c->feature_index_map->has (featureIndex, &new_feature_index))
       return_trace (false);
-    }
 
     auto *out = c->subset_context->serializer->embed (this);
     if (unlikely (!out)) return_trace (false);
 
-    out->featureIndex = c->feature_index_map->get (featureIndex);
+    out->featureIndex = *new_feature_index;
     return_trace (out->feature.serialize_subset (c->subset_context, feature, base, c));
   }
 
@@ -3600,16 +4402,10 @@ struct FeatureTableSubstitution
   }
 
   void collect_lookups (const hb_set_t *feature_indexes,
-                        const hb_hashmap_t<unsigned, const Feature*> *feature_substitutes_map,
                         hb_set_t       *lookup_indexes /* OUT */) const
   {
     + hb_iter (substitutions)
     | hb_filter (feature_indexes, &FeatureTableSubstitutionRecord::featureIndex)
-    | hb_filter ([feature_substitutes_map] (const FeatureTableSubstitutionRecord& record)
-                 {
-                   if (feature_substitutes_map == nullptr) return true;
-                   return !feature_substitutes_map->has (record.featureIndex);
-                 })
     | hb_apply ([this, lookup_indexes] (const FeatureTableSubstitutionRecord& r)
                 { r.collect_lookups (this, lookup_indexes); })
     ;
@@ -3634,11 +4430,14 @@ struct FeatureTableSubstitution
   void collect_feature_substitutes_with_variations (hb_collect_feature_substitutes_with_var_context_t *c) const
   {
     for (const FeatureTableSubstitutionRecord& record : substitutions)
-      record.collect_feature_substitutes_with_variations (c->feature_substitutes_map, c->feature_indices, this);
+      record.collect_feature_substitutes_with_variations (c->feature_substitutes_map,
+                                                          c->catch_all_record_feature_idxes,
+                                                          c->feature_indices, this);
   }
 
   bool subset (hb_subset_context_t        *c,
-               hb_subset_layout_context_t *l) const
+               hb_subset_layout_context_t *l,
+               bool insert_catch_all) const
   {
     TRACE_SUBSET (this);
     auto *out = c->serializer->start_embed (*this);
@@ -3647,6 +4446,22 @@ struct FeatureTableSubstitution
     out->version.major = version.major;
     out->version.minor = version.minor;
 
+    if (insert_catch_all)
+    {
+      for (unsigned feature_index : *(l->catch_all_record_feature_idxes))
+      {
+        hb_pair_t<const void*, const void*> *p;
+        if (!l->feature_idx_tag_map->has (feature_index, &p))
+          return_trace (false);
+        auto *o = out->substitutions.serialize_append (c->serializer);
+        if (!o->serialize (l, feature_index,
+                           reinterpret_cast<const Feature*> (p->first),
+                           reinterpret_cast<const Tag*> (p->second)))
+          return_trace (false);
+      }
+      return_trace (true);
+    }
+
     + substitutions.iter ()
     | hb_apply (subset_record_array (l, &(out->substitutions), this))
     ;
@@ -3658,6 +4473,7 @@ struct FeatureTableSubstitution
   {
     TRACE_SANITIZE (this);
     return_trace (version.sanitize (c) &&
+                  hb_barrier () &&
                   likely (version.major == 1) &&
                   substitutions.sanitize (c, this));
   }
@@ -3676,10 +4492,9 @@ struct FeatureVariationRecord
 
   void collect_lookups (const void     *base,
                         const hb_set_t *feature_indexes,
-                        const hb_hashmap_t<unsigned, const Feature*> *feature_substitutes_map,
                         hb_set_t       *lookup_indexes /* OUT */) const
   {
-    return (base+substitutions).collect_lookups (feature_indexes, feature_substitutes_map, lookup_indexes);
+    return (base+substitutions).collect_lookups (feature_indexes, lookup_indexes);
   }
 
   void closure_features (const void     *base,
@@ -3705,14 +4520,15 @@ struct FeatureVariationRecord
     }
   }
 
-  bool subset (hb_subset_layout_context_t *c, const void *base) const
+  bool subset (hb_subset_layout_context_t *c, const void *base,
+               bool insert_catch_all = false) const
   {
     TRACE_SUBSET (this);
     auto *out = c->subset_context->serializer->embed (this);
     if (unlikely (!out)) return_trace (false);
 
-    out->conditions.serialize_subset (c->subset_context, conditions, base, c);
-    out->substitutions.serialize_subset (c->subset_context, substitutions, base, c);
+    out->conditions.serialize_subset (c->subset_context, conditions, base, c, insert_catch_all);
+    out->substitutions.serialize_subset (c->subset_context, substitutions, base, c, insert_catch_all);
 
     return_trace (true);
   }
@@ -3738,13 +4554,14 @@ struct FeatureVariations
   static constexpr unsigned NOT_FOUND_INDEX = 0xFFFFFFFFu;
 
   bool find_index (const int *coords, unsigned int coord_len,
-                   unsigned int *index) const
+                   unsigned int *index,
+                   ItemVarStoreInstancer *instancer) const
   {
     unsigned int count = varRecords.len;
     for (unsigned int i = 0; i < count; i++)
     {
       const FeatureVariationRecord &record = varRecords.arrayZ[i];
-      if ((this+record.conditions).evaluate (coords, coord_len))
+      if ((this+record.conditions).evaluate (coords, coord_len, instancer))
       {
         *index = i;
         return true;
@@ -3771,9 +4588,8 @@ struct FeatureVariations
       if (c->universal)
         break;
     }
-    if (c->variation_applied && !c->universal &&
-        !c->record_cond_idx_map->is_empty ())
-      c->insert_catch_all_feature_variation_record = true;
+    if (c->universal || c->record_cond_idx_map->is_empty ())
+      c->catch_all_record_feature_idxes.reset ();
   }
 
   FeatureVariations* copy (hb_serialize_context_t *c) const
@@ -3783,11 +4599,17 @@ struct FeatureVariations
   }
 
   void collect_lookups (const hb_set_t *feature_indexes,
-                        const hb_hashmap_t<unsigned, const Feature*> *feature_substitutes_map,
+                        const hb_hashmap_t<unsigned, hb::shared_ptr<hb_set_t>> *feature_record_cond_idx_map,
                         hb_set_t       *lookup_indexes /* OUT */) const
   {
-    for (const FeatureVariationRecord& r : varRecords)
-      r.collect_lookups (this, feature_indexes, feature_substitutes_map, lookup_indexes);
+    unsigned count = varRecords.len;
+    for (unsigned int i = 0; i < count; i++)
+    {
+      if (feature_record_cond_idx_map &&
+          !feature_record_cond_idx_map->has (i))
+        continue;
+      varRecords[i].collect_lookups (this, feature_indexes, lookup_indexes);
+    }
   }
 
   void closure_features (const hb_map_t *lookup_indexes,
@@ -3832,6 +4654,13 @@ struct FeatureVariations
       l->cur_feature_var_record_idx = i;
       subset_record_array (l, &(out->varRecords), this) (varRecords[i]);
     }
+
+    if (out->varRecords.len && !l->catch_all_record_feature_idxes->is_empty ())
+    {
+      bool insert_catch_all_record = true;
+      subset_record_array (l, &(out->varRecords), this, insert_catch_all_record) (varRecords[0]);
+    }
+
     return_trace (bool (out->varRecords));
   }
 
@@ -3839,6 +4668,7 @@ struct FeatureVariations
   {
     TRACE_SANITIZE (this);
     return_trace (version.sanitize (c) &&
+                  hb_barrier () &&
                   likely (version.major == 1) &&
                   varRecords.sanitize (c, this));
   }
@@ -3945,13 +4775,13 @@ struct VariationDevice
   private:
 
   hb_position_t get_x_delta (hb_font_t *font,
-                             const VariationStore &store,
-                             VariationStore::cache_t *store_cache = nullptr) const
+                             const ItemVariationStore &store,
+                             ItemVariationStore::cache_t *store_cache = nullptr) const
   { return font->em_scalef_x (get_delta (font, store, store_cache)); }
 
   hb_position_t get_y_delta (hb_font_t *font,
-                             const VariationStore &store,
-                             VariationStore::cache_t *store_cache = nullptr) const
+                             const ItemVariationStore &store,
+                             ItemVariationStore::cache_t *store_cache = nullptr) const
   { return font->em_scalef_y (get_delta (font, store, store_cache)); }
 
   VariationDevice* copy (hb_serialize_context_t *c,
@@ -3985,14 +4815,14 @@ struct VariationDevice
   private:
 
   float get_delta (hb_font_t *font,
-                   const VariationStore &store,
-                   VariationStore::cache_t *store_cache = nullptr) const
+                   const ItemVariationStore &store,
+                   ItemVariationStore::cache_t *store_cache = nullptr) const
   {
-    return store.get_delta (varIdx, font->coords, font->num_coords, (VariationStore::cache_t *) store_cache);
+    return store.get_delta (varIdx, font->coords, font->num_coords, (ItemVariationStore::cache_t *) store_cache);
   }
 
   protected:
-  VarIdx        varIdx;
+  VarIdx        varIdx;         /* Variation index */
   HBUINT16      deltaFormat;    /* Format identifier for this table: 0x0x8000 */
   public:
   DEFINE_SIZE_STATIC (6);
@@ -4012,8 +4842,8 @@ struct DeviceHeader
 struct Device
 {
   hb_position_t get_x_delta (hb_font_t *font,
-                             const VariationStore &store=Null (VariationStore),
-                             VariationStore::cache_t *store_cache = nullptr) const
+                             const ItemVariationStore &store=Null (ItemVariationStore),
+                             ItemVariationStore::cache_t *store_cache = nullptr) const
   {
     switch (u.b.format)
     {
@@ -4030,8 +4860,8 @@ struct Device
     }
   }
   hb_position_t get_y_delta (hb_font_t *font,
-                             const VariationStore &store=Null (VariationStore),
-                             VariationStore::cache_t *store_cache = nullptr) const
+                             const ItemVariationStore &store=Null (ItemVariationStore),
+                             ItemVariationStore::cache_t *store_cache = nullptr) const
   {
     switch (u.b.format)
     {
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-ot-layout-gsubgpos.hh b/src/java.desktop/share/native/libharfbuzz/hb-ot-layout-gsubgpos.hh
index d5b5a488a26..1a719391b8e 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-ot-layout-gsubgpos.hh
+++ b/src/java.desktop/share/native/libharfbuzz/hb-ot-layout-gsubgpos.hh
@@ -406,6 +406,7 @@ struct hb_ot_apply_context_t :
 
     void set_ignore_zwnj (bool ignore_zwnj_) { ignore_zwnj = ignore_zwnj_; }
     void set_ignore_zwj (bool ignore_zwj_) { ignore_zwj = ignore_zwj_; }
+    void set_ignore_hidden (bool ignore_hidden_) { ignore_hidden = ignore_hidden_; }
     void set_lookup_props (unsigned int lookup_props_) { lookup_props = lookup_props_; }
     void set_mask (hb_mask_t mask_) { mask = mask_; }
     void set_per_syllable (bool per_syllable_) { per_syllable = per_syllable_; }
@@ -451,9 +452,10 @@ struct hb_ot_apply_context_t :
       if (!c->check_glyph_property (&info, lookup_props))
         return SKIP_YES;
 
-      if (unlikely (_hb_glyph_info_is_default_ignorable_and_not_hidden (&info) &&
+      if (unlikely (_hb_glyph_info_is_default_ignorable (&info) &&
                     (ignore_zwnj || !_hb_glyph_info_is_zwnj (&info)) &&
-                    (ignore_zwj || !_hb_glyph_info_is_zwj (&info))))
+                    (ignore_zwj || !_hb_glyph_info_is_zwj (&info)) &&
+                    (ignore_hidden || !_hb_glyph_info_is_hidden (&info))))
         return SKIP_MAYBE;
 
       return SKIP_NO;
@@ -464,6 +466,7 @@ struct hb_ot_apply_context_t :
     hb_mask_t mask = -1;
     bool ignore_zwnj = false;
     bool ignore_zwj = false;
+    bool ignore_hidden = false;
     bool per_syllable = false;
     uint8_t syllable = 0;
     match_func_t match_func = nullptr;
@@ -486,6 +489,8 @@ struct hb_ot_apply_context_t :
       matcher.set_ignore_zwnj (c->table_index == 1 || (context_match && c->auto_zwnj));
       /* Ignore ZWJ if we are matching context, or asked to. */
       matcher.set_ignore_zwj  (context_match || c->auto_zwj);
+      /* Ignore hidden glyphs (like CGJ) during GPOS. */
+      matcher.set_ignore_hidden (c->table_index == 1);
       matcher.set_mask (context_match ? -1 : c->lookup_mask);
       /* Per syllable matching is only for GSUB. */
       matcher.set_per_syllable (c->table_index == 0 && c->per_syllable);
@@ -708,8 +713,9 @@ struct hb_ot_apply_context_t :
   recurse_func_t recurse_func = nullptr;
   const GDEF &gdef;
   const GDEF::accelerator_t &gdef_accel;
-  const VariationStore &var_store;
-  VariationStore::cache_t *var_store_cache;
+  const hb_ot_layout_lookup_accelerator_t *lookup_accel = nullptr;
+  const ItemVariationStore &var_store;
+  ItemVariationStore::cache_t *var_store_cache;
   hb_set_digest_t digest;
 
   hb_direction_t direction;
@@ -723,7 +729,6 @@ struct hb_ot_apply_context_t :
   bool auto_zwj = true;
   bool per_syllable = false;
   bool random = false;
-  uint32_t random_state = 1;
   unsigned new_syllables = (unsigned) -1;
 
   signed last_base = -1; // GPOS uses
@@ -758,15 +763,17 @@ struct hb_ot_apply_context_t :
                                          nullptr
 #endif
                                         ),
-                        digest (buffer_->digest ()),
                         direction (buffer_->props.direction),
                         has_glyph_classes (gdef.has_glyph_classes ())
-  { init_iters (); }
+  {
+    init_iters ();
+    buffer->collect_codepoints (digest);
+  }
 
   ~hb_ot_apply_context_t ()
   {
 #ifndef HB_NO_VAR
-    VariationStore::destroy_cache (var_store_cache);
+    ItemVariationStore::destroy_cache (var_store_cache);
 #endif
   }
 
@@ -788,8 +795,8 @@ struct hb_ot_apply_context_t :
   uint32_t random_number ()
   {
     /* http://www.cplusplus.com/reference/random/minstd_rand/ */
-    random_state = random_state * 48271 % 2147483647;
-    return random_state;
+    buffer->random_state = buffer->random_state * 48271 % 2147483647;
+    return buffer->random_state;
   }
 
   bool match_properties_mark (hb_codepoint_t  glyph,
@@ -895,6 +902,13 @@ struct hb_ot_apply_context_t :
   }
 };
 
+enum class hb_ot_lookup_cache_op_t
+{
+  CREATE,
+  ENTER,
+  LEAVE,
+  DESTROY,
+};
 
 struct hb_accelerate_subtables_context_t :
        hb_dispatch_context_t<hb_accelerate_subtables_context_t>
@@ -919,19 +933,23 @@ struct hb_accelerate_subtables_context_t :
   }
 
   template <typename T>
-  static inline auto cache_func_ (const T *obj, hb_ot_apply_context_t *c, bool enter, hb_priority<1>) HB_RETURN (bool, obj->cache_func (c, enter) )
-  template <typename T>
-  static inline bool cache_func_ (const T *obj, hb_ot_apply_context_t *c, bool enter, hb_priority<0>) { return false; }
+  static inline auto cache_func_ (void *p,
+                                  hb_ot_lookup_cache_op_t op,
+                                  hb_priority<1>) HB_RETURN (void *, T::cache_func (p, op) )
+  template <typename T=void>
+  static inline void * cache_func_ (void *p,
+                                    hb_ot_lookup_cache_op_t op HB_UNUSED,
+                                    hb_priority<0>) { return (void *) false; }
   template <typename Type>
-  static inline bool cache_func_to (const void *obj, hb_ot_apply_context_t *c, bool enter)
+  static inline void * cache_func_to (void *p,
+                                      hb_ot_lookup_cache_op_t op)
   {
-    const Type *typed_obj = (const Type *) obj;
-    return cache_func_ (typed_obj, c, enter, hb_prioritize);
+    return cache_func_<Type> (p, op, hb_prioritize);
   }
 #endif
 
   typedef bool (*hb_apply_func_t) (const void *obj, hb_ot_apply_context_t *c);
-  typedef bool (*hb_cache_func_t) (const void *obj, hb_ot_apply_context_t *c, bool enter);
+  typedef void * (*hb_cache_func_t) (void *p, hb_ot_lookup_cache_op_t op);
 
   struct hb_applicable_t
   {
@@ -968,11 +986,11 @@ struct hb_accelerate_subtables_context_t :
     }
     bool cache_enter (hb_ot_apply_context_t *c) const
     {
-      return cache_func (obj, c, true);
+      return (bool) cache_func (c, hb_ot_lookup_cache_op_t::ENTER);
     }
     void cache_leave (hb_ot_apply_context_t *c) const
     {
-      cache_func (obj, c, false);
+      cache_func (c, hb_ot_lookup_cache_op_t::LEAVE);
     }
 #endif
 
@@ -1255,7 +1273,7 @@ static bool match_input (hb_ot_apply_context_t *c,
                          match_func_t match_func,
                          const void *match_data,
                          unsigned int *end_position,
-                         unsigned int match_positions[HB_MAX_CONTEXT_LENGTH],
+                         unsigned int *match_positions,
                          unsigned int *p_total_component_count = nullptr)
 {
   TRACE_APPLY (nullptr);
@@ -1379,7 +1397,7 @@ static bool match_input (hb_ot_apply_context_t *c,
 }
 static inline bool ligate_input (hb_ot_apply_context_t *c,
                                  unsigned int count, /* Including the first glyph */
-                                 const unsigned int match_positions[HB_MAX_CONTEXT_LENGTH], /* Including the first glyph */
+                                 const unsigned int *match_positions, /* Including the first glyph */
                                  unsigned int match_end,
                                  hb_codepoint_t lig_glyph,
                                  unsigned int total_component_count)
@@ -1458,6 +1476,7 @@ static inline bool ligate_input (hb_ot_apply_context_t *c,
         unsigned int this_comp = _hb_glyph_info_get_lig_comp (&buffer->cur());
         if (this_comp == 0)
           this_comp = last_num_components;
+        assert (components_so_far >= last_num_components);
         unsigned int new_lig_comp = components_so_far - last_num_components +
                                     hb_min (this_comp, last_num_components);
           _hb_glyph_info_set_lig_props_for_mark (&buffer->cur(), lig_id, new_lig_comp);
@@ -1483,6 +1502,7 @@ static inline bool ligate_input (hb_ot_apply_context_t *c,
       unsigned this_comp = _hb_glyph_info_get_lig_comp (&buffer->info[i]);
       if (!this_comp) break;
 
+      assert (components_so_far >= last_num_components);
       unsigned new_lig_comp = components_so_far - last_num_components +
                               hb_min (this_comp, last_num_components);
       _hb_glyph_info_set_lig_props_for_mark (&buffer->info[i], lig_id, new_lig_comp);
@@ -1538,6 +1558,7 @@ static bool match_lookahead (hb_ot_apply_context_t *c,
   TRACE_APPLY (nullptr);
 
   hb_ot_apply_context_t::skipping_iterator_t &skippy_iter = c->iter_context;
+  assert (start_index >= 1);
   skippy_iter.reset (start_index - 1);
   skippy_iter.set_match_func (match_func, match_data);
   skippy_iter.set_glyph_data (lookahead);
@@ -1687,7 +1708,7 @@ static inline void recurse_lookups (context_t *c,
 
 static inline void apply_lookup (hb_ot_apply_context_t *c,
                                  unsigned int count, /* Including the first glyph */
-                                 unsigned int match_positions[HB_MAX_CONTEXT_LENGTH], /* Including the first glyph */
+                                 unsigned int *match_positions, /* Including the first glyph */
                                  unsigned int lookupCount,
                                  const LookupRecord lookupRecord[], /* Array of LookupRecords--in design order */
                                  unsigned int match_end)
@@ -1695,6 +1716,9 @@ static inline void apply_lookup (hb_ot_apply_context_t *c,
   hb_buffer_t *buffer = c->buffer;
   int end;
 
+  unsigned int *match_positions_input = match_positions;
+  unsigned int match_positions_count = count;
+
   /* All positions are distance from beginning of *output* buffer.
    * Adjust. */
   {
@@ -1798,6 +1822,27 @@ static inline void apply_lookup (hb_ot_apply_context_t *c,
     {
       if (unlikely (delta + count > HB_MAX_CONTEXT_LENGTH))
         break;
+      if (unlikely (delta + count > match_positions_count))
+      {
+        unsigned new_match_positions_count = hb_max (delta + count, hb_max(match_positions_count, 4u) * 1.5);
+        if (match_positions == match_positions_input)
+        {
+          match_positions = (unsigned int *) hb_malloc (new_match_positions_count * sizeof (match_positions[0]));
+          if (unlikely (!match_positions))
+            break;
+          memcpy (match_positions, match_positions_input, count * sizeof (match_positions[0]));
+          match_positions_count = new_match_positions_count;
+        }
+        else
+        {
+          unsigned int *new_match_positions = (unsigned int *) hb_realloc (match_positions, new_match_positions_count * sizeof (match_positions[0]));
+          if (unlikely (!new_match_positions))
+            break;
+          match_positions = new_match_positions;
+          match_positions_count = new_match_positions_count;
+        }
+      }
+
     }
     else
     {
@@ -1821,6 +1866,10 @@ static inline void apply_lookup (hb_ot_apply_context_t *c,
       match_positions[next] += delta;
   }
 
+  if (match_positions != match_positions_input)
+    hb_free (match_positions);
+
+  assert (end >= 0);
   (void) buffer->move_to (end);
 }
 
@@ -1921,8 +1970,18 @@ static bool context_apply_lookup (hb_ot_apply_context_t *c,
                                   const LookupRecord lookupRecord[],
                                   const ContextApplyLookupContext &lookup_context)
 {
+  if (unlikely (inputCount > HB_MAX_CONTEXT_LENGTH)) return false;
+  unsigned match_positions_stack[4];
+  unsigned *match_positions = match_positions_stack;
+  if (unlikely (inputCount > ARRAY_LENGTH (match_positions_stack)))
+  {
+    match_positions = (unsigned *) hb_malloc (hb_max (inputCount, 1u) * sizeof (match_positions[0]));
+    if (unlikely (!match_positions))
+      return false;
+  }
+
   unsigned match_end = 0;
-  unsigned match_positions[HB_MAX_CONTEXT_LENGTH];
+  bool ret = false;
   if (match_input (c,
                    inputCount, input,
                    lookup_context.funcs.match, lookup_context.match_data,
@@ -1933,13 +1992,18 @@ static bool context_apply_lookup (hb_ot_apply_context_t *c,
                   inputCount, match_positions,
                   lookupCount, lookupRecord,
                   match_end);
-    return true;
+    ret = true;
   }
   else
   {
     c->buffer->unsafe_to_concat (c->buffer->idx, match_end);
-    return false;
+    ret = false;
   }
+
+  if (unlikely (match_positions != match_positions_stack))
+    hb_free (match_positions);
+
+  return ret;
 }
 
 template <typename Types>
@@ -2051,6 +2115,7 @@ struct Rule
   {
     TRACE_SANITIZE (this);
     return_trace (c->check_struct (this) &&
+                  hb_barrier () &&
                   c->check_range (inputZ.arrayZ,
                                   inputZ.item_size * (inputCount ? inputCount - 1 : 0) +
                                   LookupRecord::static_size * lookupCount));
@@ -2572,25 +2637,35 @@ struct ContextFormat2_5
     unsigned c = (this+classDef).cost () * ruleSet.len;
     return c >= 4 ? c : 0;
   }
-  bool cache_func (hb_ot_apply_context_t *c, bool enter) const
+  static void * cache_func (void *p, hb_ot_lookup_cache_op_t op)
   {
-    if (enter)
+    switch (op)
     {
-      if (!HB_BUFFER_TRY_ALLOCATE_VAR (c->buffer, syllable))
-        return false;
-      auto &info = c->buffer->info;
-      unsigned count = c->buffer->len;
-      for (unsigned i = 0; i < count; i++)
-        info[i].syllable() = 255;
-      c->new_syllables = 255;
-      return true;
-    }
-    else
-    {
-      c->new_syllables = (unsigned) -1;
-      HB_BUFFER_DEALLOCATE_VAR (c->buffer, syllable);
-      return true;
+      case hb_ot_lookup_cache_op_t::CREATE:
+        return (void *) true;
+      case hb_ot_lookup_cache_op_t::ENTER:
+      {
+        hb_ot_apply_context_t *c = (hb_ot_apply_context_t *) p;
+        if (!HB_BUFFER_TRY_ALLOCATE_VAR (c->buffer, syllable))
+          return (void *) false;
+        auto &info = c->buffer->info;
+        unsigned count = c->buffer->len;
+        for (unsigned i = 0; i < count; i++)
+          info[i].syllable() = 255;
+        c->new_syllables = 255;
+        return (void *) true;
+      }
+      case hb_ot_lookup_cache_op_t::LEAVE:
+      {
+        hb_ot_apply_context_t *c = (hb_ot_apply_context_t *) p;
+        c->new_syllables = (unsigned) -1;
+        HB_BUFFER_DEALLOCATE_VAR (c->buffer, syllable);
+        return nullptr;
+      }
+      case hb_ot_lookup_cache_op_t::DESTROY:
+        return nullptr;
     }
+    return nullptr;
   }
 
   bool apply_cached (hb_ot_apply_context_t *c) const { return _apply (c, true); }
@@ -2599,7 +2674,7 @@ struct ContextFormat2_5
   {
     TRACE_APPLY (this);
     unsigned int index = (this+coverage).get_coverage (c->buffer->cur().codepoint);
-    if (likely (index == NOT_COVERED)) return_trace (false);
+    if (index == NOT_COVERED) return_trace (false);
 
     const ClassDef &class_def = this+classDef;
 
@@ -2785,7 +2860,7 @@ struct ContextFormat3
   {
     TRACE_APPLY (this);
     unsigned int index = (this+coverageZ[0]).get_coverage (c->buffer->cur().codepoint);
-    if (likely (index == NOT_COVERED)) return_trace (false);
+    if (index == NOT_COVERED) return_trace (false);
 
     const LookupRecord *lookupRecord = &StructAfter<LookupRecord> (coverageZ.as_array (glyphCount));
     struct ContextApplyLookupContext lookup_context = {
@@ -2826,6 +2901,7 @@ struct ContextFormat3
   {
     TRACE_SANITIZE (this);
     if (unlikely (!c->check_struct (this))) return_trace (false);
+    hb_barrier ();
     unsigned int count = glyphCount;
     if (unlikely (!count)) return_trace (false); /* We want to access coverageZ[0] freely. */
     if (unlikely (!c->check_array (coverageZ.arrayZ, count))) return_trace (false);
@@ -2858,12 +2934,12 @@ struct Context
     if (unlikely (!c->may_dispatch (this, &u.format))) return c->no_dispatch_return_value ();
     TRACE_DISPATCH (this, u.format);
     switch (u.format) {
-    case 1: return_trace (c->dispatch (u.format1, std::forward<Ts> (ds)...));
-    case 2: return_trace (c->dispatch (u.format2, std::forward<Ts> (ds)...));
-    case 3: return_trace (c->dispatch (u.format3, std::forward<Ts> (ds)...));
+    case 1: hb_barrier (); return_trace (c->dispatch (u.format1, std::forward<Ts> (ds)...));
+    case 2: hb_barrier (); return_trace (c->dispatch (u.format2, std::forward<Ts> (ds)...));
+    case 3: hb_barrier (); return_trace (c->dispatch (u.format3, std::forward<Ts> (ds)...));
 #ifndef HB_NO_BEYOND_64K
-    case 4: return_trace (c->dispatch (u.format4, std::forward<Ts> (ds)...));
-    case 5: return_trace (c->dispatch (u.format5, std::forward<Ts> (ds)...));
+    case 4: hb_barrier (); return_trace (c->dispatch (u.format4, std::forward<Ts> (ds)...));
+    case 5: hb_barrier (); return_trace (c->dispatch (u.format5, std::forward<Ts> (ds)...));
 #endif
     default:return_trace (c->default_return_value ());
     }
@@ -3017,9 +3093,20 @@ static bool chain_context_apply_lookup (hb_ot_apply_context_t *c,
                                         const LookupRecord lookupRecord[],
                                         const ChainContextApplyLookupContext &lookup_context)
 {
+  if (unlikely (inputCount > HB_MAX_CONTEXT_LENGTH)) return false;
+  unsigned match_positions_stack[4];
+  unsigned *match_positions = match_positions_stack;
+  if (unlikely (inputCount > ARRAY_LENGTH (match_positions_stack)))
+  {
+    match_positions = (unsigned *) hb_malloc (hb_max (inputCount, 1u) * sizeof (match_positions[0]));
+    if (unlikely (!match_positions))
+      return false;
+  }
+
+  unsigned start_index = c->buffer->out_len;
   unsigned end_index = c->buffer->idx;
   unsigned match_end = 0;
-  unsigned match_positions[HB_MAX_CONTEXT_LENGTH];
+  bool ret = true;
   if (!(match_input (c,
                      inputCount, input,
                      lookup_context.funcs.match[1], lookup_context.match_data[1],
@@ -3030,17 +3117,18 @@ static bool chain_context_apply_lookup (hb_ot_apply_context_t *c,
                            match_end, &end_index)))
   {
     c->buffer->unsafe_to_concat (c->buffer->idx, end_index);
-    return false;
+    ret = false;
+    goto done;
   }
 
-  unsigned start_index = c->buffer->out_len;
   if (!match_backtrack (c,
                         backtrackCount, backtrack,
                         lookup_context.funcs.match[0], lookup_context.match_data[0],
                         &start_index))
   {
     c->buffer->unsafe_to_concat_from_outbuffer (start_index, end_index);
-    return false;
+    ret = false;
+    goto done;
   }
 
   c->buffer->unsafe_to_break_from_outbuffer (start_index, end_index);
@@ -3048,7 +3136,12 @@ static bool chain_context_apply_lookup (hb_ot_apply_context_t *c,
                 inputCount, match_positions,
                 lookupCount, lookupRecord,
                 match_end);
-  return true;
+  done:
+
+  if (unlikely (match_positions != match_positions_stack))
+    hb_free (match_positions);
+
+  return ret;
 }
 
 template <typename Types>
@@ -3219,10 +3312,13 @@ struct ChainRule
     TRACE_SANITIZE (this);
     /* Hyper-optimized sanitized because this is really hot. */
     if (unlikely (!backtrack.len.sanitize (c))) return_trace (false);
+    hb_barrier ();
     const auto &input = StructAfter<decltype (inputX)> (backtrack);
     if (unlikely (!input.lenP1.sanitize (c))) return_trace (false);
+    hb_barrier ();
     const auto &lookahead = StructAfter<decltype (lookaheadX)> (input);
     if (unlikely (!lookahead.len.sanitize (c))) return_trace (false);
+    hb_barrier ();
     const auto &lookup = StructAfter<decltype (lookupX)> (lookahead);
     return_trace (likely (lookup.sanitize (c)));
   }
@@ -3327,6 +3423,15 @@ struct ChainRuleSet
      *
      * Replicated from LigatureSet::apply(). */
 
+    /* If the input skippy has non-auto joiners behavior (as in Indic shapers),
+     * skip this fast path, as we don't distinguish between input & lookahead
+     * matching in the fast path.
+     *
+     * https://github.com/harfbuzz/harfbuzz/issues/4813
+     */
+    if (!c->auto_zwnj || !c->auto_zwj)
+      goto slow;
+
     hb_ot_apply_context_t::skipping_iterator_t &skippy_iter = c->iter_input;
     skippy_iter.reset (c->buffer->idx);
     skippy_iter.set_match_func (match_always, nullptr);
@@ -3366,10 +3471,10 @@ struct ChainRuleSet
     }
     matched = skippy_iter.next ();
     if (likely (matched && !skippy_iter.may_skip (c->buffer->info[skippy_iter.idx])))
-     {
+    {
       second = &c->buffer->info[skippy_iter.idx];
       unsafe_to2 = skippy_iter.idx + 1;
-     }
+    }
 
     auto match_input = lookup_context.funcs.match[1];
     auto match_lookahead = lookup_context.funcs.match[2];
@@ -3569,7 +3674,7 @@ struct ChainContextFormat1_4
   {
     TRACE_APPLY (this);
     unsigned int index = (this+coverage).get_coverage (c->buffer->cur().codepoint);
-    if (likely (index == NOT_COVERED)) return_trace (false);
+    if (index == NOT_COVERED) return_trace (false);
 
     const ChainRuleSet &rule_set = this+ruleSet[index];
     struct ChainContextApplyLookupContext lookup_context = {
@@ -3780,28 +3885,37 @@ struct ChainContextFormat2_5
 
   unsigned cache_cost () const
   {
-    unsigned c = (this+lookaheadClassDef).cost () * ruleSet.len;
-    return c >= 4 ? c : 0;
+    return (this+lookaheadClassDef).cost () * ruleSet.len;
   }
-  bool cache_func (hb_ot_apply_context_t *c, bool enter) const
+  static void * cache_func (void *p, hb_ot_lookup_cache_op_t op)
   {
-    if (enter)
+    switch (op)
     {
-      if (!HB_BUFFER_TRY_ALLOCATE_VAR (c->buffer, syllable))
-        return false;
-      auto &info = c->buffer->info;
-      unsigned count = c->buffer->len;
-      for (unsigned i = 0; i < count; i++)
-        info[i].syllable() = 255;
-      c->new_syllables = 255;
-      return true;
-    }
-    else
-    {
-      c->new_syllables = (unsigned) -1;
-      HB_BUFFER_DEALLOCATE_VAR (c->buffer, syllable);
-      return true;
+      case hb_ot_lookup_cache_op_t::CREATE:
+        return (void *) true;
+      case hb_ot_lookup_cache_op_t::ENTER:
+      {
+        hb_ot_apply_context_t *c = (hb_ot_apply_context_t *) p;
+        if (!HB_BUFFER_TRY_ALLOCATE_VAR (c->buffer, syllable))
+          return (void *) false;
+        auto &info = c->buffer->info;
+        unsigned count = c->buffer->len;
+        for (unsigned i = 0; i < count; i++)
+          info[i].syllable() = 255;
+        c->new_syllables = 255;
+        return (void *) true;
+      }
+      case hb_ot_lookup_cache_op_t::LEAVE:
+      {
+        hb_ot_apply_context_t *c = (hb_ot_apply_context_t *) p;
+        c->new_syllables = (unsigned) -1;
+        HB_BUFFER_DEALLOCATE_VAR (c->buffer, syllable);
+        return nullptr;
+      }
+      case hb_ot_lookup_cache_op_t::DESTROY:
+        return nullptr;
     }
+    return nullptr;
   }
 
   bool apply_cached (hb_ot_apply_context_t *c) const { return _apply (c, true); }
@@ -3810,7 +3924,7 @@ struct ChainContextFormat2_5
   {
     TRACE_APPLY (this);
     unsigned int index = (this+coverage).get_coverage (c->buffer->cur().codepoint);
-    if (likely (index == NOT_COVERED)) return_trace (false);
+    if (index == NOT_COVERED) return_trace (false);
 
     const ClassDef &backtrack_class_def = this+backtrackClassDef;
     const ClassDef &input_class_def = this+inputClassDef;
@@ -4056,7 +4170,7 @@ struct ChainContextFormat3
     const auto &input = StructAfter<decltype (inputX)> (backtrack);
 
     unsigned int index = (this+input[0]).get_coverage (c->buffer->cur().codepoint);
-    if (likely (index == NOT_COVERED)) return_trace (false);
+    if (index == NOT_COVERED) return_trace (false);
 
     const auto &lookahead = StructAfter<decltype (lookaheadX)> (input);
     const auto &lookup = StructAfter<decltype (lookupX)> (lookahead);
@@ -4121,11 +4235,14 @@ struct ChainContextFormat3
   {
     TRACE_SANITIZE (this);
     if (unlikely (!backtrack.sanitize (c, this))) return_trace (false);
+    hb_barrier ();
     const auto &input = StructAfter<decltype (inputX)> (backtrack);
     if (unlikely (!input.sanitize (c, this))) return_trace (false);
+    hb_barrier ();
     if (unlikely (!input.len)) return_trace (false); /* To be consistent with Context. */
     const auto &lookahead = StructAfter<decltype (lookaheadX)> (input);
     if (unlikely (!lookahead.sanitize (c, this))) return_trace (false);
+    hb_barrier ();
     const auto &lookup = StructAfter<decltype (lookupX)> (lookahead);
     return_trace (likely (lookup.sanitize (c)));
   }
@@ -4159,12 +4276,12 @@ struct ChainContext
     if (unlikely (!c->may_dispatch (this, &u.format))) return c->no_dispatch_return_value ();
     TRACE_DISPATCH (this, u.format);
     switch (u.format) {
-    case 1: return_trace (c->dispatch (u.format1, std::forward<Ts> (ds)...));
-    case 2: return_trace (c->dispatch (u.format2, std::forward<Ts> (ds)...));
-    case 3: return_trace (c->dispatch (u.format3, std::forward<Ts> (ds)...));
+    case 1: hb_barrier (); return_trace (c->dispatch (u.format1, std::forward<Ts> (ds)...));
+    case 2: hb_barrier (); return_trace (c->dispatch (u.format2, std::forward<Ts> (ds)...));
+    case 3: hb_barrier (); return_trace (c->dispatch (u.format3, std::forward<Ts> (ds)...));
 #ifndef HB_NO_BEYOND_64K
-    case 4: return_trace (c->dispatch (u.format4, std::forward<Ts> (ds)...));
-    case 5: return_trace (c->dispatch (u.format5, std::forward<Ts> (ds)...));
+    case 4: hb_barrier (); return_trace (c->dispatch (u.format4, std::forward<Ts> (ds)...));
+    case 5: hb_barrier (); return_trace (c->dispatch (u.format5, std::forward<Ts> (ds)...));
 #endif
     default:return_trace (c->default_return_value ());
     }
@@ -4209,6 +4326,7 @@ struct ExtensionFormat1
   {
     TRACE_SANITIZE (this);
     return_trace (c->check_struct (this) &&
+                  hb_barrier () &&
                   extensionLookupType != T::SubTable::Extension);
   }
 
@@ -4247,7 +4365,7 @@ struct Extension
   unsigned int get_type () const
   {
     switch (u.format) {
-    case 1: return u.format1.get_type ();
+    case 1: hb_barrier (); return u.format1.get_type ();
     default:return 0;
     }
   }
@@ -4255,7 +4373,7 @@ struct Extension
   const X& get_subtable () const
   {
     switch (u.format) {
-    case 1: return u.format1.template get_subtable<typename T::SubTable> ();
+    case 1: hb_barrier (); return u.format1.template get_subtable<typename T::SubTable> ();
     default:return Null (typename T::SubTable);
     }
   }
@@ -4267,7 +4385,7 @@ struct Extension
   typename hb_subset_context_t::return_t dispatch (hb_subset_context_t *c, Ts&&... ds) const
   {
     switch (u.format) {
-    case 1: return u.format1.subset (c);
+    case 1: hb_barrier (); return u.format1.subset (c);
     default: return c->default_return_value ();
     }
   }
@@ -4278,7 +4396,7 @@ struct Extension
     if (unlikely (!c->may_dispatch (this, &u.format))) return c->no_dispatch_return_value ();
     TRACE_DISPATCH (this, u.format);
     switch (u.format) {
-    case 1: return_trace (u.format1.dispatch (c, std::forward<Ts> (ds)...));
+    case 1: hb_barrier (); return_trace (u.format1.dispatch (c, std::forward<Ts> (ds)...));
     default:return_trace (c->default_return_value ());
     }
   }
@@ -4320,10 +4438,21 @@ struct hb_ot_layout_lookup_accelerator_t
 
     thiz->digest.init ();
     for (auto& subtable : hb_iter (thiz->subtables, count))
-      thiz->digest.add (subtable.digest);
+      thiz->digest.union_ (subtable.digest);
 
 #ifndef HB_NO_OT_LAYOUT_LOOKUP_CACHE
+    if (c_accelerate_subtables.cache_user_cost < 4)
+      c_accelerate_subtables.cache_user_idx = (unsigned) -1;
+
     thiz->cache_user_idx = c_accelerate_subtables.cache_user_idx;
+
+    if (thiz->cache_user_idx != (unsigned) -1)
+    {
+      thiz->cache = thiz->subtables[thiz->cache_user_idx].cache_func (nullptr, hb_ot_lookup_cache_op_t::CREATE);
+      if (!thiz->cache)
+        thiz->cache_user_idx = (unsigned) -1;
+    }
+
     for (unsigned i = 0; i < count; i++)
       if (i != thiz->cache_user_idx)
         thiz->subtables[i].apply_cached_func = thiz->subtables[i].apply_func;
@@ -4332,6 +4461,17 @@ struct hb_ot_layout_lookup_accelerator_t
     return thiz;
   }
 
+  void fini ()
+  {
+#ifndef HB_NO_OT_LAYOUT_LOOKUP_CACHE
+    if (cache)
+    {
+      assert (cache_user_idx != (unsigned) -1);
+      subtables[cache_user_idx].cache_func (cache, hb_ot_lookup_cache_op_t::DESTROY);
+    }
+#endif
+  }
+
   bool may_have (hb_codepoint_t g) const
   { return digest.may_have (g); }
 
@@ -4340,6 +4480,7 @@ struct hb_ot_layout_lookup_accelerator_t
 #endif
   bool apply (hb_ot_apply_context_t *c, unsigned subtables_count, bool use_cache) const
   {
+    c->lookup_accel = this;
 #ifndef HB_NO_OT_LAYOUT_LOOKUP_CACHE
     if (use_cache)
     {
@@ -4379,10 +4520,13 @@ struct hb_ot_layout_lookup_accelerator_t
 
 
   hb_set_digest_t digest;
-  private:
 #ifndef HB_NO_OT_LAYOUT_LOOKUP_CACHE
+  public:
+  void *cache = nullptr;
+  private:
   unsigned cache_user_idx = (unsigned) -1;
 #endif
+  private:
   hb_accelerate_subtables_context_t::hb_applicable_t subtables[HB_VAR_ARRAY];
 };
 
@@ -4472,13 +4616,6 @@ struct GSUBGPOSVersion1_2
       if (!c->subset_context->serializer->extend_min (&out->featureVars))
         return_trace (false);
 
-      // TODO(qxliu76): the current implementation doesn't correctly handle feature variations
-      //                that are dropped by instancing when the associated conditions don't trigger.
-      //                Since partial instancing isn't yet supported this isn't an issue yet but will
-      //                need to be fixed for partial instancing.
-
-
-
       // if all axes are pinned all feature vars are dropped.
       bool ret = !c->subset_context->plan->all_axes_pinned
                  && out->featureVars.serialize_subset (c->subset_context, featureVars, this, c);
@@ -4500,9 +4637,9 @@ struct GSUBGPOS
   unsigned int get_size () const
   {
     switch (u.version.major) {
-    case 1: return u.version1.get_size ();
+    case 1: hb_barrier (); return u.version1.get_size ();
 #ifndef HB_NO_BEYOND_64K
-    case 2: return u.version2.get_size ();
+    case 2: hb_barrier (); return u.version2.get_size ();
 #endif
     default: return u.version.static_size;
     }
@@ -4513,10 +4650,11 @@ struct GSUBGPOS
   {
     TRACE_SANITIZE (this);
     if (unlikely (!u.version.sanitize (c))) return_trace (false);
+    hb_barrier ();
     switch (u.version.major) {
-    case 1: return_trace (u.version1.sanitize<TLookup> (c));
+    case 1: hb_barrier (); return_trace (u.version1.sanitize<TLookup> (c));
 #ifndef HB_NO_BEYOND_64K
-    case 2: return_trace (u.version2.sanitize<TLookup> (c));
+    case 2: hb_barrier (); return_trace (u.version2.sanitize<TLookup> (c));
 #endif
     default: return_trace (true);
     }
@@ -4526,9 +4664,9 @@ struct GSUBGPOS
   bool subset (hb_subset_layout_context_t *c) const
   {
     switch (u.version.major) {
-    case 1: return u.version1.subset<TLookup> (c);
+    case 1: hb_barrier (); return u.version1.subset<TLookup> (c);
 #ifndef HB_NO_BEYOND_64K
-    case 2: return u.version2.subset<TLookup> (c);
+    case 2: hb_barrier (); return u.version2.subset<TLookup> (c);
 #endif
     default: return false;
     }
@@ -4537,9 +4675,9 @@ struct GSUBGPOS
   const ScriptList &get_script_list () const
   {
     switch (u.version.major) {
-    case 1: return this+u.version1.scriptList;
+    case 1: hb_barrier (); return this+u.version1.scriptList;
 #ifndef HB_NO_BEYOND_64K
-    case 2: return this+u.version2.scriptList;
+    case 2: hb_barrier (); return this+u.version2.scriptList;
 #endif
     default: return Null (ScriptList);
     }
@@ -4547,9 +4685,9 @@ struct GSUBGPOS
   const FeatureList &get_feature_list () const
   {
     switch (u.version.major) {
-    case 1: return this+u.version1.featureList;
+    case 1: hb_barrier (); return this+u.version1.featureList;
 #ifndef HB_NO_BEYOND_64K
-    case 2: return this+u.version2.featureList;
+    case 2: hb_barrier (); return this+u.version2.featureList;
 #endif
     default: return Null (FeatureList);
     }
@@ -4557,9 +4695,9 @@ struct GSUBGPOS
   unsigned int get_lookup_count () const
   {
     switch (u.version.major) {
-    case 1: return (this+u.version1.lookupList).len;
+    case 1: hb_barrier (); return (this+u.version1.lookupList).len;
 #ifndef HB_NO_BEYOND_64K
-    case 2: return (this+u.version2.lookupList).len;
+    case 2: hb_barrier (); return (this+u.version2.lookupList).len;
 #endif
     default: return 0;
     }
@@ -4567,9 +4705,9 @@ struct GSUBGPOS
   const Lookup& get_lookup (unsigned int i) const
   {
     switch (u.version.major) {
-    case 1: return (this+u.version1.lookupList)[i];
+    case 1: hb_barrier (); return (this+u.version1.lookupList)[i];
 #ifndef HB_NO_BEYOND_64K
-    case 2: return (this+u.version2.lookupList)[i];
+    case 2: hb_barrier (); return (this+u.version2.lookupList)[i];
 #endif
     default: return Null (Lookup);
     }
@@ -4577,9 +4715,9 @@ struct GSUBGPOS
   const FeatureVariations &get_feature_variations () const
   {
     switch (u.version.major) {
-    case 1: return (u.version.to_int () >= 0x00010001u ? this+u.version1.featureVars : Null (FeatureVariations));
+    case 1: hb_barrier (); return (u.version.to_int () >= 0x00010001u && hb_barrier () ? this+u.version1.featureVars : Null (FeatureVariations));
 #ifndef HB_NO_BEYOND_64K
-    case 2: return this+u.version2.featureVars;
+    case 2: hb_barrier (); return this+u.version2.featureVars;
 #endif
     default: return Null (FeatureVariations);
     }
@@ -4613,13 +4751,14 @@ struct GSUBGPOS
   { return get_feature_list ().find_index (tag, index); }
 
   bool find_variations_index (const int *coords, unsigned int num_coords,
-                              unsigned int *index) const
+                              unsigned int *index,
+                              ItemVarStoreInstancer *instancer) const
   {
 #ifdef HB_NO_VAR
     *index = FeatureVariations::NOT_FOUND_INDEX;
     return false;
 #endif
-    return get_feature_variations ().find_index (coords, num_coords, index);
+    return get_feature_variations ().find_index (coords, num_coords, index, instancer);
   }
   const Feature& get_feature_variation (unsigned int feature_index,
                                         unsigned int variations_index) const
@@ -4638,11 +4777,11 @@ struct GSUBGPOS
   }
 
   void feature_variation_collect_lookups (const hb_set_t *feature_indexes,
-                                          const hb_hashmap_t<unsigned, const Feature*> *feature_substitutes_map,
+                                          const hb_hashmap_t<unsigned, hb::shared_ptr<hb_set_t>> *feature_record_cond_idx_map,
                                           hb_set_t       *lookup_indexes /* OUT */) const
   {
 #ifndef HB_NO_VAR
-    get_feature_variations ().collect_lookups (feature_indexes, feature_substitutes_map, lookup_indexes);
+    get_feature_variations ().collect_lookups (feature_indexes, feature_record_cond_idx_map, lookup_indexes);
 #endif
   }
 
@@ -4772,7 +4911,12 @@ struct GSUBGPOS
     ~accelerator_t ()
     {
       for (unsigned int i = 0; i < this->lookup_count; i++)
-        hb_free (this->accels[i]);
+      {
+        auto *accel = this->accels[i].get_relaxed ();
+        if (accel)
+          accel->fini ();
+        hb_free (accel);
+      }
       hb_free (this->accels);
       this->table.destroy ();
     }
@@ -4793,6 +4937,7 @@ struct GSUBGPOS
 
         if (unlikely (!accels[lookup_index].cmpexch (nullptr, accel)))
         {
+          accel->fini ();
           hb_free (accel);
           goto retry;
         }
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-ot-layout-jstf-table.hh b/src/java.desktop/share/native/libharfbuzz/hb-ot-layout-jstf-table.hh
index 948c8826925..823520f7483 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-ot-layout-jstf-table.hh
+++ b/src/java.desktop/share/native/libharfbuzz/hb-ot-layout-jstf-table.hh
@@ -214,6 +214,7 @@ struct JSTF
   {
     TRACE_SANITIZE (this);
     return_trace (version.sanitize (c) &&
+                  hb_barrier () &&
                   likely (version.major == 1) &&
                   scriptList.sanitize (c, this));
   }
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-ot-layout.cc b/src/java.desktop/share/native/libharfbuzz/hb-ot-layout.cc
index 49465acb75e..787119dc62b 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-ot-layout.cc
+++ b/src/java.desktop/share/native/libharfbuzz/hb-ot-layout.cc
@@ -87,7 +87,7 @@ using OT::Layout::GPOS;
 bool
 hb_ot_layout_has_kerning (hb_face_t *face)
 {
-  return face->table.kern->has_data ();
+  return face->table.kern->table->has_data ();
 }
 
 /**
@@ -103,7 +103,7 @@ hb_ot_layout_has_kerning (hb_face_t *face)
 bool
 hb_ot_layout_has_machine_kerning (hb_face_t *face)
 {
-  return face->table.kern->has_state_machine ();
+  return face->table.kern->table->has_state_machine ();
 }
 
 /**
@@ -123,7 +123,7 @@ hb_ot_layout_has_machine_kerning (hb_face_t *face)
 bool
 hb_ot_layout_has_cross_kerning (hb_face_t *face)
 {
-  return face->table.kern->has_cross_stream ();
+  return face->table.kern->table->has_cross_stream ();
 }
 
 void
@@ -132,7 +132,7 @@ hb_ot_layout_kern (const hb_ot_shape_plan_t *plan,
                    hb_buffer_t  *buffer)
 {
   hb_blob_t *blob = font->face->table.kern.get_blob ();
-  const AAT::kern& kern = *blob->as<AAT::kern> ();
+  const auto& kern = *font->face->table.kern;
 
   AAT::hb_aat_apply_context_t c (plan, font, buffer, blob);
 
@@ -246,6 +246,18 @@ OT::GDEF::is_blocklisted (hb_blob_t *blob,
     /* sha1sum: c26e41d567ed821bed997e937bc0c41435689e85  Padauk.ttf
      *  "Padauk Regular" "Version 2.5", see https://crbug.com/681813 */
     case HB_CODEPOINT_ENCODE3 (1004, 59092, 14836):
+    /* 88d2006ca084f04af2df1954ed714a8c71e8400f  Courier New.ttf from macOS 15 */
+    case HB_CODEPOINT_ENCODE3 (588, 5078, 14418):
+    /* 608e3ebb6dd1aee521cff08eb07d500a2c59df68  Courier New Bold.ttf from macOS 15 */
+    case HB_CODEPOINT_ENCODE3 (588, 5078, 14238):
+    /* d13221044ff054efd78f1cd8631b853c3ce85676  cour.ttf from Windows 10 */
+    case HB_CODEPOINT_ENCODE3 (894, 17162, 33960):
+    /* 68ed4a22d8067fcf1622ac6f6e2f4d3a2e3ec394  courbd.ttf from Windows 10 */
+    case HB_CODEPOINT_ENCODE3 (894, 17154, 34472):
+    /* 4cdb0259c96b7fd7c103821bb8f08f7cc6b211d7  cour.ttf from Windows 8.1 */
+    case HB_CODEPOINT_ENCODE3 (816, 7868, 17052):
+    /* 920483d8a8ed37f7f0afdabbe7f679aece7c75d8  courbd.ttf from Windows 8.1 */
+    case HB_CODEPOINT_ENCODE3 (816, 7868, 17138):
       return true;
   }
   return false;
@@ -1443,8 +1455,12 @@ hb_ot_layout_table_find_feature_variations (hb_face_t    *face,
                                             unsigned int *variations_index /* out */)
 {
   const OT::GSUBGPOS &g = get_gsubgpos_table (face, table_tag);
+  const OT::GDEF &gdef = *face->table.GDEF->table;
 
-  return g.find_variations_index (coords, num_coords, variations_index);
+  auto instancer = OT::ItemVarStoreInstancer(&gdef.get_var_store(), nullptr,
+                                             hb_array (coords, num_coords));
+
+  return g.find_variations_index (coords, num_coords, variations_index, &instancer);
 }
 
 
@@ -1907,9 +1923,10 @@ apply_forward (OT::hb_ot_apply_context_t *c,
   while (buffer->idx < buffer->len && buffer->successful)
   {
     bool applied = false;
-    if (accel.digest.may_have (buffer->cur().codepoint) &&
-        (buffer->cur().mask & c->lookup_mask) &&
-        c->check_glyph_property (&buffer->cur(), c->lookup_props))
+    auto &cur = buffer->cur();
+    if (accel.digest.may_have (cur.codepoint) &&
+        (cur.mask & c->lookup_mask) &&
+        c->check_glyph_property (&cur, c->lookup_props))
      {
        applied = accel.apply (c, subtable_count, use_cache);
      }
@@ -1935,9 +1952,10 @@ apply_backward (OT::hb_ot_apply_context_t *c,
   hb_buffer_t *buffer = c->buffer;
   do
   {
-    if (accel.digest.may_have (buffer->cur().codepoint) &&
-        (buffer->cur().mask & c->lookup_mask) &&
-        c->check_glyph_property (&buffer->cur(), c->lookup_props))
+    auto &cur = buffer->cur();
+    if (accel.digest.may_have (cur.codepoint) &&
+        (cur.mask & c->lookup_mask) &&
+        c->check_glyph_property (&cur, c->lookup_props))
       ret |= accel.apply (c, subtable_count, false);
 
     /* The reverse lookup doesn't "advance" cursor (for good reason). */
@@ -2017,7 +2035,7 @@ inline void hb_ot_map_t::apply (const Proxy &proxy,
        * (plus some past glyphs).
        *
        * Only try applying the lookup if there is any overlap. */
-      if (accel->digest.may_have (c.digest))
+      if (accel->digest.may_intersect (c.digest))
       {
         c.set_lookup_index (lookup_index);
         c.set_lookup_mask (lookup.mask, false);
@@ -2043,7 +2061,7 @@ inline void hb_ot_map_t::apply (const Proxy &proxy,
       if (stage->pause_func (plan, font, buffer))
       {
         /* Refresh working buffer digest since buffer changed. */
-        c.digest = buffer->digest ();
+        buffer->collect_codepoints (c.digest);
       }
     }
   }
@@ -2127,7 +2145,7 @@ hb_ot_layout_get_font_extents (hb_font_t         *font,
                                hb_tag_t           language_tag,
                                hb_font_extents_t *extents)
 {
-  hb_position_t min, max;
+  hb_position_t min = 0, max = 0;
   if (font->face->table.BASE->get_min_max (font, direction, script_tag, language_tag, HB_TAG_NONE,
                                            &min, &max))
   {
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-ot-layout.hh b/src/java.desktop/share/native/libharfbuzz/hb-ot-layout.hh
index 2d9a184a893..71074a87401 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-ot-layout.hh
+++ b/src/java.desktop/share/native/libharfbuzz/hb-ot-layout.hh
@@ -173,12 +173,12 @@ _hb_next_syllable (hb_buffer_t *buffer, unsigned int start)
 
 /* Design:
  * unicode_props() is a two-byte number.  The low byte includes:
- * - General_Category: 5 bits.
+ * - Modified General_Category: 5 bits.
  * - A bit each for:
  *   * Is it Default_Ignorable(); we have a modified Default_Ignorable().
  *   * Whether it's one of the four Mongolian Free Variation Selectors,
  *     CGJ, or other characters that are hidden but should not be ignored
- *     like most other Default_Ignorable()s do during matching.
+ *     like most other Default_Ignorable()s do during GSUB matching.
  *   * Whether it's a grapheme continuation.
  *
  * The high-byte has different meanings, switched by the Gen-Cat:
@@ -186,17 +186,23 @@ _hb_next_syllable (hb_buffer_t *buffer, unsigned int start)
  * - For Cf: whether it's ZWJ, ZWNJ, or something else.
  * - For Ws: index of which space character this is, if space fallback
  *   is needed, ie. we don't set this by default, only if asked to.
+ *
+ * Above I said "modified" General_Category. This is because we need to
+ * remember Variation Selectors, and we don't have bits left. So we
+ * change their Gen_Cat from Mn to Cf, and use a bit of the high byte to
+ * remember them.
  */
 
 enum hb_unicode_props_flags_t {
   UPROPS_MASK_GEN_CAT   = 0x001Fu,
   UPROPS_MASK_IGNORABLE = 0x0020u,
-  UPROPS_MASK_HIDDEN    = 0x0040u, /* MONGOLIAN FREE VARIATION SELECTOR 1..4, or TAG characters */
+  UPROPS_MASK_HIDDEN    = 0x0040u, /* MONGOLIAN FREE VARIATION SELECTOR 1..4, or TAG characters, or CGJ sometimes */
   UPROPS_MASK_CONTINUATION=0x0080u,
 
   /* If GEN_CAT=FORMAT, top byte masks: */
   UPROPS_MASK_Cf_ZWJ    = 0x0100u,
-  UPROPS_MASK_Cf_ZWNJ   = 0x0200u
+  UPROPS_MASK_Cf_ZWNJ   = 0x0200u,
+  UPROPS_MASK_Cf_VS     = 0x0400u
 };
 HB_MARK_AS_FLAG_T (hb_unicode_props_flags_t);
 
@@ -229,7 +235,7 @@ _hb_glyph_info_set_unicode_props (hb_glyph_info_t *info, hb_buffer_t *buffer)
       /* TAG characters need similar treatment. Fixes:
        * https://github.com/harfbuzz/harfbuzz/issues/463 */
       else if (unlikely (hb_in_range<hb_codepoint_t> (u, 0xE0020u, 0xE007Fu))) props |= UPROPS_MASK_HIDDEN;
-      /* COMBINING GRAPHEME JOINER should not be skipped; at least some times.
+      /* COMBINING GRAPHEME JOINER should not be skipped during GSUB either.
        * https://github.com/harfbuzz/harfbuzz/issues/554 */
       else if (unlikely (u == 0x034Fu))
       {
@@ -302,6 +308,27 @@ _hb_glyph_info_get_unicode_space_fallback_type (const hb_glyph_info_t *info)
          (hb_unicode_funcs_t::space_t) (info->unicode_props()>>8) :
          hb_unicode_funcs_t::NOT_SPACE;
 }
+static inline bool
+_hb_glyph_info_is_variation_selector (const hb_glyph_info_t *info)
+{
+  return _hb_glyph_info_get_general_category (info) ==
+         HB_UNICODE_GENERAL_CATEGORY_FORMAT &&
+         (info->unicode_props() & UPROPS_MASK_Cf_VS);
+}
+static inline void
+_hb_glyph_info_set_variation_selector (hb_glyph_info_t *info, bool customize)
+{
+  if (customize)
+  {
+    _hb_glyph_info_set_general_category (info, HB_UNICODE_GENERAL_CATEGORY_FORMAT);
+    info->unicode_props() |= UPROPS_MASK_Cf_VS;
+  }
+  else
+  {
+    // Reset to their original condition
+    _hb_glyph_info_set_general_category (info, HB_UNICODE_GENERAL_CATEGORY_NON_SPACING_MARK);
+  }
+}
 
 static inline bool _hb_glyph_info_substituted (const hb_glyph_info_t *info);
 
@@ -311,12 +338,20 @@ _hb_glyph_info_is_default_ignorable (const hb_glyph_info_t *info)
   return (info->unicode_props() & UPROPS_MASK_IGNORABLE) &&
          !_hb_glyph_info_substituted (info);
 }
-static inline bool
-_hb_glyph_info_is_default_ignorable_and_not_hidden (const hb_glyph_info_t *info)
+static inline void
+_hb_glyph_info_set_default_ignorable (hb_glyph_info_t *info)
 {
-  return ((info->unicode_props() & (UPROPS_MASK_IGNORABLE|UPROPS_MASK_HIDDEN))
-          == UPROPS_MASK_IGNORABLE) &&
-         !_hb_glyph_info_substituted (info);
+  info->unicode_props() |= UPROPS_MASK_IGNORABLE;
+}
+static inline void
+_hb_glyph_info_clear_default_ignorable (hb_glyph_info_t *info)
+{
+  info->unicode_props() &= ~ UPROPS_MASK_IGNORABLE;
+}
+static inline bool
+_hb_glyph_info_is_hidden (const hb_glyph_info_t *info)
+{
+  return info->unicode_props() & UPROPS_MASK_HIDDEN;
 }
 static inline void
 _hb_glyph_info_unhide (hb_glyph_info_t *info)
@@ -330,7 +365,7 @@ _hb_glyph_info_set_continuation (hb_glyph_info_t *info)
   info->unicode_props() |= UPROPS_MASK_CONTINUATION;
 }
 static inline void
-_hb_glyph_info_reset_continuation (hb_glyph_info_t *info)
+_hb_glyph_info_clear_continuation (hb_glyph_info_t *info)
 {
   info->unicode_props() &= ~ UPROPS_MASK_CONTINUATION;
 }
@@ -603,8 +638,7 @@ _hb_buffer_assert_gsubgpos_vars (hb_buffer_t *buffer)
 }
 
 /* Make sure no one directly touches our props... */
-#undef unicode_props0
-#undef unicode_props1
+#undef unicode_props
 #undef lig_props
 #undef glyph_props
 
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-ot-map.cc b/src/java.desktop/share/native/libharfbuzz/hb-ot-map.cc
index 261ce43049c..a0cdfddfa63 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-ot-map.cc
+++ b/src/java.desktop/share/native/libharfbuzz/hb-ot-map.cc
@@ -390,5 +390,19 @@ hb_ot_map_builder_t::compile (hb_ot_map_t                  &m,
   }
 }
 
+unsigned int hb_ot_map_t::get_feature_tags (unsigned int start_offset, unsigned int *tag_count, hb_tag_t *tags) const
+{
+  if (tag_count)
+  {
+    auto sub_features = features.as_array ().sub_array (start_offset, tag_count);
+    if (tags)
+    {
+      for (unsigned int i = 0; i < sub_features.length; i++)
+        tags[i] = sub_features[i].tag;
+    }
+  }
+
+  return features.length;
+}
 
 #endif
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-ot-map.hh b/src/java.desktop/share/native/libharfbuzz/hb-ot-map.hh
index 110361552c0..68af9792439 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-ot-map.hh
+++ b/src/java.desktop/share/native/libharfbuzz/hb-ot-map.hh
@@ -166,6 +166,9 @@ struct hb_ot_map_t
                           const struct hb_ot_shape_plan_t *plan, hb_font_t *font, hb_buffer_t *buffer) const;
   HB_INTERNAL void substitute (const struct hb_ot_shape_plan_t *plan, hb_font_t *font, hb_buffer_t *buffer) const;
   HB_INTERNAL void position (const struct hb_ot_shape_plan_t *plan, hb_font_t *font, hb_buffer_t *buffer) const;
+  HB_INTERNAL unsigned int get_feature_tags (unsigned int  start_offset,
+                                             unsigned int *tag_count, /* IN/OUT */
+                                             hb_tag_t     *tags /* OUT */) const;
 
   public:
   hb_tag_t chosen_script[2];
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-ot-math-table.hh b/src/java.desktop/share/native/libharfbuzz/hb-ot-math-table.hh
index 63bcd132cf4..c1b2a27b21d 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-ot-math-table.hh
+++ b/src/java.desktop/share/native/libharfbuzz/hb-ot-math-table.hh
@@ -333,6 +333,7 @@ struct MathKern
   {
     TRACE_SANITIZE (this);
     return_trace (c->check_struct (this) &&
+                  hb_barrier () &&
                   c->check_array (mathValueRecordsZ.arrayZ, 2 * heightCount + 1) &&
                   sanitize_math_value_records (c));
   }
@@ -343,27 +344,20 @@ struct MathKern
     const MathValueRecord* kernValue = mathValueRecordsZ.arrayZ + heightCount;
     int sign = font->y_scale < 0 ? -1 : +1;
 
-    /* The description of the MathKern table is a ambiguous, but interpreting
-     * "between the two heights found at those indexes" for 0 < i < len as
-     *
-     *   correctionHeight[i-1] < correction_height <= correctionHeight[i]
-     *
-     * makes the result consistent with the limit cases and we can just use the
-     * binary search algorithm of std::upper_bound:
+    /* According to OpenType spec (v1.9), except for the boundary cases, the index
+     * chosen for kern value should be i such that
+     *    correctionHeight[i-1] <= correction_height < correctionHeight[i]
+     * We can use the binary search algorithm of std::upper_bound(). Or, we can
+     * use the internal hb_bsearch_impl.
      */
-    unsigned int i = 0;
-    unsigned int count = heightCount;
-    while (count > 0)
-    {
-      unsigned int half = count / 2;
-      hb_position_t height = correctionHeight[i + half].get_y_value (font, this);
-      if (sign * height < sign * correction_height)
-      {
-        i += half + 1;
-        count -= half + 1;
-      } else
-        count = half;
-    }
+    unsigned int pos;
+    auto cmp = +[](const void* key, const void* p,
+                   int sign, hb_font_t* font, const MathKern* mathKern) -> int {
+      return sign * *(hb_position_t*)key - sign * ((MathValueRecord*)p)->get_y_value(font, mathKern);
+    };
+    unsigned int i = hb_bsearch_impl(&pos, correction_height, correctionHeight,
+                                     heightCount, MathValueRecord::static_size,
+                                     cmp, sign, font, this) ? pos + 1 : pos;
     return kernValue[i].get_x_value (font, this);
   }
 
@@ -984,6 +978,7 @@ struct MathVariants
     return_trace (c->check_struct (this) &&
                   vertGlyphCoverage.sanitize (c, this) &&
                   horizGlyphCoverage.sanitize (c, this) &&
+                  hb_barrier () &&
                   c->check_array (glyphConstruction.arrayZ, vertGlyphCount + horizGlyphCount) &&
                   sanitize_offsets (c));
   }
@@ -1103,6 +1098,7 @@ struct MATH
     TRACE_SANITIZE (this);
     return_trace (version.sanitize (c) &&
                   likely (version.major == 1) &&
+                  hb_barrier () &&
                   mathConstants.sanitize (c, this) &&
                   mathGlyphInfo.sanitize (c, this) &&
                   mathVariants.sanitize (c, this));
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-ot-maxp-table.hh b/src/java.desktop/share/native/libharfbuzz/hb-ot-maxp-table.hh
index f7f2e860e4a..f6eeda40ed6 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-ot-maxp-table.hh
+++ b/src/java.desktop/share/native/libharfbuzz/hb-ot-maxp-table.hh
@@ -85,7 +85,7 @@ struct maxp
     TRACE_SANITIZE (this);
     if (unlikely (!c->check_struct (this)))
       return_trace (false);
-
+    hb_barrier ();
     if (version.major == 1)
     {
       const maxpV1Tail &v1 = StructAfter<maxpV1Tail> (*this);
@@ -103,6 +103,7 @@ struct maxp
     maxp_prime->numGlyphs = hb_min (c->plan->num_output_glyphs (), 0xFFFFu);
     if (maxp_prime->version.major == 1)
     {
+      hb_barrier ();
       const maxpV1Tail *src_v1 = &StructAfter<maxpV1Tail> (*this);
       maxpV1Tail *dest_v1 = c->serializer->embed<maxpV1Tail> (src_v1);
       if (unlikely (!dest_v1)) return_trace (false);
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-ot-meta-table.hh b/src/java.desktop/share/native/libharfbuzz/hb-ot-meta-table.hh
index 1f011882807..20c62b83edb 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-ot-meta-table.hh
+++ b/src/java.desktop/share/native/libharfbuzz/hb-ot-meta-table.hh
@@ -51,6 +51,7 @@ struct DataMap
   {
     TRACE_SANITIZE (this);
     return_trace (likely (c->check_struct (this) &&
+                          hb_barrier () &&
                           dataZ.sanitize (c, base, dataLength)));
   }
 
@@ -101,6 +102,7 @@ struct meta
   {
     TRACE_SANITIZE (this);
     return_trace (likely (c->check_struct (this) &&
+                          hb_barrier () &&
                           version == 1 &&
                           dataMaps.sanitize (c, this)));
   }
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-ot-os2-table.hh b/src/java.desktop/share/native/libharfbuzz/hb-ot-os2-table.hh
index 30ae335d703..24e9c970353 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-ot-os2-table.hh
+++ b/src/java.desktop/share/native/libharfbuzz/hb-ot-os2-table.hh
@@ -209,6 +209,23 @@ struct OS2
     return ret;
   }
 
+  static unsigned calc_avg_char_width (const hb_hashmap_t<hb_codepoint_t, hb_pair_t<unsigned, int>>& hmtx_map)
+  {
+    unsigned num = 0;
+    unsigned total_width = 0;
+    for (const auto& _ : hmtx_map.values_ref ())
+    {
+      unsigned width = _.first;
+      if (width)
+      {
+        total_width += width;
+        num++;
+      }
+    }
+
+    return num ? (unsigned) roundf ((double) total_width / (double) num) : 0;
+  }
+
   bool subset (hb_subset_context_t *c) const
   {
     TRACE_SUBSET (this);
@@ -239,17 +256,23 @@ struct OS2
 
       if (os2_prime->version >= 2)
       {
+        hb_barrier ();
         auto *table = & const_cast<OS2V2Tail &> (os2_prime->v2 ());
         HB_ADD_MVAR_VAR (HB_OT_METRICS_TAG_X_HEIGHT,                   sxHeight);
         HB_ADD_MVAR_VAR (HB_OT_METRICS_TAG_CAP_HEIGHT,                 sCapHeight);
       }
+
+      unsigned avg_char_width = calc_avg_char_width (c->plan->hmtx_map);
+      if (!c->serializer->check_assign (os2_prime->xAvgCharWidth, avg_char_width,
+                                        HB_SERIALIZE_ERROR_INT_OVERFLOW))
+        return_trace (false);
     }
 #endif
 
     Triple *axis_range;
     if (c->plan->user_axes_location.has (HB_TAG ('w','g','h','t'), &axis_range))
     {
-      unsigned weight_class = static_cast<unsigned> (roundf (hb_clamp (axis_range->middle, 1.0f, 1000.0f)));
+      unsigned weight_class = static_cast<unsigned> (roundf (hb_clamp (axis_range->middle, 1.0, 1000.0)));
       if (os2_prime->usWeightClass != weight_class)
         os2_prime->usWeightClass = weight_class;
     }
@@ -261,12 +284,12 @@ struct OS2
         os2_prime->usWidthClass = width_class;
     }
 
+    os2_prime->usFirstCharIndex = hb_min (0xFFFFu, c->plan->os2_info.min_cmap_codepoint);
+    os2_prime->usLastCharIndex  = hb_min (0xFFFFu, c->plan->os2_info.max_cmap_codepoint);
+
     if (c->plan->flags & HB_SUBSET_FLAGS_NO_PRUNE_UNICODE_RANGES)
       return_trace (true);
 
-    os2_prime->usFirstCharIndex = hb_min (0xFFFFu, c->plan->unicodes.get_min ());
-    os2_prime->usLastCharIndex  = hb_min (0xFFFFu, c->plan->unicodes.get_max ());
-
     _update_unicode_ranges (&c->plan->unicodes, os2_prime->ulUnicodeRange);
 
     return_trace (true);
@@ -334,6 +357,7 @@ struct OS2
   {
     TRACE_SANITIZE (this);
     if (unlikely (!c->check_struct (this))) return_trace (false);
+    hb_barrier ();
     if (unlikely (version >= 1 && !v1X.sanitize (c))) return_trace (false);
     if (unlikely (version >= 2 && !v2X.sanitize (c))) return_trace (false);
     if (unlikely (version >= 5 && !v5X.sanitize (c))) return_trace (false);
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-ot-post-table-v2subset.hh b/src/java.desktop/share/native/libharfbuzz/hb-ot-post-table-v2subset.hh
index d44233610a6..67d1b6aa713 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-ot-post-table-v2subset.hh
+++ b/src/java.desktop/share/native/libharfbuzz/hb-ot-post-table-v2subset.hh
@@ -84,9 +84,9 @@ HB_INTERNAL bool postV2Tail::subset (hb_subset_context_t *c) const
   old_gid_new_index_map.alloc (num_glyphs);
   glyph_name_to_new_index.alloc (num_glyphs);
 
-  for (hb_codepoint_t new_gid = 0; new_gid < num_glyphs; new_gid++)
+  for (auto _ : c->plan->new_to_old_gid_list)
   {
-    hb_codepoint_t old_gid = reverse_glyph_map.get (new_gid);
+    hb_codepoint_t old_gid = _.second;
     unsigned old_index = glyphNameIndex[old_gid];
 
     unsigned new_index;
@@ -125,13 +125,22 @@ HB_INTERNAL bool postV2Tail::subset (hb_subset_context_t *c) const
     old_gid_new_index_map.set (old_gid, new_index);
   }
 
+  if (old_gid_new_index_map.in_error())
+    return_trace (false);
+
   auto index_iter =
   + hb_range (num_glyphs)
-  | hb_map (reverse_glyph_map)
-  | hb_map_retains_sorting ([&](hb_codepoint_t old_gid)
+  | hb_map_retains_sorting ([&](hb_codepoint_t new_gid)
                             {
-                              unsigned new_index = old_gid_new_index_map.get (old_gid);
-                              return hb_pair_t<unsigned, unsigned> (old_gid, new_index);
+                              hb_codepoint_t *old_gid;
+                              /* use 0 for retain-gid holes, which refers to the name .notdef,
+                               * as the glyphNameIndex entry for that glyph ID."*/
+                              unsigned new_index = 0;
+                              if (reverse_glyph_map.has (new_gid, &old_gid)) {
+                                new_index = old_gid_new_index_map.get (*old_gid);
+                                return hb_pair_t<unsigned, unsigned> (*old_gid, new_index);
+                              }
+                              return hb_pair_t<unsigned, unsigned> (new_gid, new_index);
                             })
   ;
 
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-ot-post-table.hh b/src/java.desktop/share/native/libharfbuzz/hb-ot-post-table.hh
index d41c86f8bd3..83d310e16a0 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-ot-post-table.hh
+++ b/src/java.desktop/share/native/libharfbuzz/hb-ot-post-table.hh
@@ -116,13 +116,16 @@ struct post
     Triple *axis_range;
     if (c->plan->user_axes_location.has (HB_TAG ('s','l','n','t'), &axis_range))
     {
-      float italic_angle = hb_max (-90.f, hb_min (axis_range->middle, 90.f));
+      float italic_angle = hb_max (-90.0, hb_min (axis_range->middle, 90.0));
       if (post_prime->italicAngle.to_float () != italic_angle)
         post_prime->italicAngle.set_float (italic_angle);
     }
 
     if (glyph_names && version.major == 2)
+    {
+      hb_barrier ();
       return_trace (v2X.subset (c));
+    }
 
     return_trace (true);
   }
@@ -138,6 +141,7 @@ struct post
 
       version = table->version.to_int ();
       if (version != 0x00020000) return;
+      hb_barrier ();
 
       const postV2Tail &v2 = table->v2X;
 
@@ -217,10 +221,16 @@ struct post
     unsigned int get_glyph_count () const
     {
       if (version == 0x00010000)
+      {
+        hb_barrier ();
         return format1_names_length;
+      }
 
       if (version == 0x00020000)
+      {
+        hb_barrier ();
         return glyphNameIndex->len;
+      }
 
       return 0;
     }
@@ -245,13 +255,18 @@ struct post
     {
       if (version == 0x00010000)
       {
+        hb_barrier ();
         if (glyph >= format1_names_length)
           return hb_bytes_t ();
 
         return format1_names (glyph);
       }
 
-      if (version != 0x00020000 || glyph >= glyphNameIndex->len)
+      if (version != 0x00020000)
+        return hb_bytes_t ();
+      hb_barrier ();
+
+      if (glyph >= glyphNameIndex->len)
         return hb_bytes_t ();
 
       unsigned int index = glyphNameIndex->arrayZ[glyph];
@@ -284,8 +299,9 @@ struct post
   {
     TRACE_SANITIZE (this);
     return_trace (c->check_struct (this) &&
+                  hb_barrier () &&
                   (version.to_int () == 0x00010000 ||
-                   (version.to_int () == 0x00020000 && v2X.sanitize (c)) ||
+                   (version.to_int () == 0x00020000 && hb_barrier () && v2X.sanitize (c)) ||
                    version.to_int () == 0x00030000));
   }
 
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-ot-shape-normalize.cc b/src/java.desktop/share/native/libharfbuzz/hb-ot-shape-normalize.cc
index b1acc7e7db3..cb941bc7fbd 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-ot-shape-normalize.cc
+++ b/src/java.desktop/share/native/libharfbuzz/hb-ot-shape-normalize.cc
@@ -74,23 +74,6 @@
  *     Indic shaper may want to disallow recomposing of two matras.
  */
 
-static bool
-decompose_unicode (const hb_ot_shape_normalize_context_t *c,
-                   hb_codepoint_t  ab,
-                   hb_codepoint_t *a,
-                   hb_codepoint_t *b)
-{
-  return (bool) c->unicode->decompose (ab, a, b);
-}
-
-static bool
-compose_unicode (const hb_ot_shape_normalize_context_t *c,
-                 hb_codepoint_t  a,
-                 hb_codepoint_t  b,
-                 hb_codepoint_t *ab)
-{
-  return (bool) c->unicode->compose (a, b, ab);
-}
 
 static inline void
 set_glyph (hb_glyph_info_t &info, hb_font_t *font)
@@ -170,7 +153,7 @@ decompose_current_character (const hb_ot_shape_normalize_context_t *c, bool shor
   hb_codepoint_t u = buffer->cur().codepoint;
   hb_codepoint_t glyph = 0;
 
-  if (shortest && c->font->get_nominal_glyph (u, &glyph, c->not_found))
+  if (shortest && c->font->get_nominal_glyph (u, &glyph, buffer->not_found))
   {
     next_char (buffer, glyph);
     return;
@@ -182,7 +165,7 @@ decompose_current_character (const hb_ot_shape_normalize_context_t *c, bool shor
     return;
   }
 
-  if (!shortest && c->font->get_nominal_glyph (u, &glyph, c->not_found))
+  if (!shortest && c->font->get_nominal_glyph (u, &glyph, buffer->not_found))
   {
     next_char (buffer, glyph);
     return;
@@ -237,6 +220,12 @@ handle_variation_selector_cluster (const hb_ot_shape_normalize_context_t *c,
         /* Just pass on the two characters separately, let GSUB do its magic. */
         set_glyph (buffer->cur(), font);
         (void) buffer->next_glyph ();
+
+        buffer->scratch_flags |= HB_BUFFER_SCRATCH_FLAG_HAS_VARIATION_SELECTOR_FALLBACK;
+        _hb_glyph_info_set_variation_selector (&buffer->cur(), true);
+        if (buffer->not_found_variation_selector != HB_CODEPOINT_INVALID)
+          _hb_glyph_info_clear_default_ignorable (&buffer->cur());
+
         set_glyph (buffer->cur(), font);
         (void) buffer->next_glyph ();
       }
@@ -307,15 +296,15 @@ _hb_ot_shape_normalize (const hb_ot_shape_plan_t *plan,
       mode = HB_OT_SHAPE_NORMALIZATION_MODE_COMPOSED_DIACRITICS;
   }
 
-  const hb_ot_shape_normalize_context_t c = {
+  hb_ot_shape_normalize_context_t c = {
     plan,
     buffer,
     font,
     buffer->unicode,
-    buffer->not_found,
-    plan->shaper->decompose ? plan->shaper->decompose : decompose_unicode,
-    plan->shaper->compose   ? plan->shaper->compose   : compose_unicode
+    plan->shaper->decompose ? plan->shaper->decompose : hb_ot_shape_normalize_context_t::decompose_unicode,
+    plan->shaper->compose   ? plan->shaper->compose   : hb_ot_shape_normalize_context_t::compose_unicode
   };
+  c.override_decompose_and_compose (plan->shaper->decompose, plan->shaper->compose);
 
   bool always_short_circuit = mode == HB_OT_SHAPE_NORMALIZATION_MODE_NONE;
   bool might_short_circuit = always_short_circuit ||
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-ot-shape-normalize.hh b/src/java.desktop/share/native/libharfbuzz/hb-ot-shape-normalize.hh
index afd62dd4072..9f17bdbb243 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-ot-shape-normalize.hh
+++ b/src/java.desktop/share/native/libharfbuzz/hb-ot-shape-normalize.hh
@@ -28,6 +28,7 @@
 #define HB_OT_SHAPE_NORMALIZE_HH
 
 #include "hb.hh"
+#include "hb-unicode.hh"
 
 
 /* buffer var allocations, used during the normalization process */
@@ -52,11 +53,42 @@ HB_INTERNAL void _hb_ot_shape_normalize (const hb_ot_shape_plan_t *shaper,
 
 struct hb_ot_shape_normalize_context_t
 {
+  static bool
+  decompose_unicode (const hb_ot_shape_normalize_context_t *c,
+                     hb_codepoint_t  ab,
+                     hb_codepoint_t *a,
+                     hb_codepoint_t *b)
+  {
+    return (bool) c->unicode->decompose (ab, a, b);
+  }
+
+  static bool
+  compose_unicode (const hb_ot_shape_normalize_context_t *c,
+                   hb_codepoint_t  a,
+                   hb_codepoint_t  b,
+                   hb_codepoint_t *ab)
+  {
+    return (bool) c->unicode->compose (a, b, ab);
+  }
+
+  void
+  override_decompose_and_compose (bool (*decompose) (const hb_ot_shape_normalize_context_t *c,
+                                                      hb_codepoint_t  ab,
+                                                      hb_codepoint_t *a,
+                                                      hb_codepoint_t *b),
+                                  bool (*compose) (const hb_ot_shape_normalize_context_t *c,
+                                                   hb_codepoint_t  a,
+                                                   hb_codepoint_t  b,
+                                                   hb_codepoint_t *ab))
+  {
+    this->decompose = decompose ? decompose : decompose_unicode;
+    this->compose = compose ? compose : compose_unicode;
+  }
+
   const hb_ot_shape_plan_t *plan;
   hb_buffer_t *buffer;
   hb_font_t *font;
   hb_unicode_funcs_t *unicode;
-  const hb_codepoint_t not_found;
   bool (*decompose) (const hb_ot_shape_normalize_context_t *c,
                      hb_codepoint_t  ab,
                      hb_codepoint_t *a,
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-ot-shape.cc b/src/java.desktop/share/native/libharfbuzz/hb-ot-shape.cc
index f936ac45f37..6265f0eb17d 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-ot-shape.cc
+++ b/src/java.desktop/share/native/libharfbuzz/hb-ot-shape.cc
@@ -46,6 +46,8 @@
 #include "hb-set.hh"
 
 #include "hb-aat-layout.hh"
+#include "hb-ot-stat-table.hh"
+
 
 static inline bool
 _hb_codepoint_is_regional_indicator (hb_codepoint_t u)
@@ -85,7 +87,7 @@ hb_ot_shape_planner_t::hb_ot_shape_planner_t (hb_face_t                     *fac
                                                 , apply_morx (_hb_apply_morx (face, props))
 #endif
 {
-  shaper = hb_ot_shaper_categorize (this);
+  shaper = hb_ot_shaper_categorize (props.script, props.direction, map.chosen_script[0]);
 
   script_zero_marks = shaper->zero_width_marks != HB_OT_SHAPE_ZERO_WIDTH_MARKS_NONE;
   script_fallback_mark_positioning = shaper->fallback_position;
@@ -121,10 +123,6 @@ hb_ot_shape_planner_t::compile (hb_ot_shape_plan_t           &plan,
   plan.kern_mask = plan.map.get_mask (kern_tag);
   plan.requested_kerning = !!plan.kern_mask;
 #endif
-#ifndef HB_NO_AAT_SHAPE
-  plan.trak_mask = plan.map.get_mask (HB_TAG ('t','r','a','k'));
-  plan.requested_tracking = !!plan.trak_mask;
-#endif
 
   bool has_gpos_kern = plan.map.get_feature_index (1, kern_tag) != HB_OT_LAYOUT_NO_FEATURE_INDEX;
   bool disable_gpos = plan.shaper->gpos_tag &&
@@ -155,7 +153,7 @@ hb_ot_shape_planner_t::compile (hb_ot_shape_plan_t           &plan,
 #endif
   bool has_gpos = !disable_gpos && hb_ot_layout_has_positioning (face);
   if (false)
-    ;
+    {}
 #ifndef HB_NO_AAT_SHAPE
   /* Prefer GPOS over kerx if GSUB is present;
    * https://github.com/harfbuzz/harfbuzz/issues/3008 */
@@ -167,15 +165,16 @@ hb_ot_shape_planner_t::compile (hb_ot_shape_plan_t           &plan,
 
   if (!plan.apply_kerx && (!has_gpos_kern || !plan.apply_gpos))
   {
+    if (false) {}
 #ifndef HB_NO_AAT_SHAPE
-    if (has_kerx)
+    else if (has_kerx)
       plan.apply_kerx = true;
-    else
 #endif
 #ifndef HB_NO_OT_KERN
-    if (hb_ot_layout_has_kerning (face))
+    else if (hb_ot_layout_has_kerning (face))
       plan.apply_kern = true;
 #endif
+    else {}
   }
 
   plan.apply_fallback_kern = !(plan.apply_gpos || plan.apply_kerx || plan.apply_kern);
@@ -206,9 +205,6 @@ hb_ot_shape_planner_t::compile (hb_ot_shape_plan_t           &plan,
      https://github.com/harfbuzz/harfbuzz/issues/2967. */
   if (plan.apply_morx)
     plan.adjust_mark_positioning_when_zeroing = false;
-
-  /* Currently we always apply trak. */
-  plan.apply_trak = plan.requested_tracking && hb_aat_layout_has_tracking (face);
 #endif
 }
 
@@ -273,11 +269,6 @@ hb_ot_shape_plan_t::position (hb_font_t   *font,
 #endif
   else if (this->apply_fallback_kern)
     _hb_ot_shape_fallback_kern (this, font, buffer);
-
-#ifndef HB_NO_AAT_SHAPE
-  if (this->apply_trak)
-    hb_aat_layout_track (this, font, buffer);
-#endif
 }
 
 
@@ -345,13 +336,6 @@ hb_ot_shape_collect_features (hb_ot_shape_planner_t *planner,
   /* Random! */
   map->enable_feature (HB_TAG ('r','a','n','d'), F_RANDOM, HB_OT_MAP_MAX_VALUE);
 
-#ifndef HB_NO_AAT_SHAPE
-  /* Tracking.  We enable dummy feature here just to allow disabling
-   * AAT 'trak' table using features.
-   * https://github.com/harfbuzz/harfbuzz/issues/1303 */
-  map->enable_feature (HB_TAG ('t','r','a','k'), F_HAS_FALLBACK);
-#endif
-
   map->enable_feature (HB_TAG ('H','a','r','f')); /* Considered required. */
   map->enable_feature (HB_TAG ('H','A','R','F')); /* Considered discretionary. */
 
@@ -836,6 +820,28 @@ hb_ot_zero_width_default_ignorables (const hb_buffer_t *buffer)
       pos[i].x_advance = pos[i].y_advance = pos[i].x_offset = pos[i].y_offset = 0;
 }
 
+static void
+hb_ot_deal_with_variation_selectors (hb_buffer_t *buffer)
+{
+  if (!(buffer->scratch_flags & HB_BUFFER_SCRATCH_FLAG_HAS_VARIATION_SELECTOR_FALLBACK) ||
+        buffer->not_found_variation_selector == HB_CODEPOINT_INVALID)
+    return;
+
+  unsigned int count = buffer->len;
+  hb_glyph_info_t *info = buffer->info;
+  hb_glyph_position_t *pos = buffer->pos;
+
+  for (unsigned int i = 0; i < count; i++)
+  {
+    if (_hb_glyph_info_is_variation_selector (&info[i]))
+    {
+      info[i].codepoint = buffer->not_found_variation_selector;
+      pos[i].x_advance = pos[i].y_advance = pos[i].x_offset = pos[i].y_offset = 0;
+      _hb_glyph_info_set_variation_selector (&info[i], false);
+    }
+  }
+}
+
 static void
 hb_ot_hide_default_ignorables (hb_buffer_t *buffer,
                                hb_font_t   *font)
@@ -965,6 +971,7 @@ hb_ot_substitute_post (const hb_ot_shape_context_t *c)
     hb_aat_layout_remove_deleted_glyphs (c->buffer);
 #endif
 
+  hb_ot_deal_with_variation_selectors (c->buffer);
   hb_ot_hide_default_ignorables (c->buffer, c->font);
 
   if (c->plan->shaper->postprocess_glyphs &&
@@ -1253,6 +1260,36 @@ hb_ot_shape_plan_collect_lookups (hb_shape_plan_t *shape_plan,
 }
 
 
+/**
+ * hb_ot_shape_plan_get_feature_tags:
+ * @shape_plan: A shaping plan
+ * @start_offset: The index of first feature to retrieve
+ * @tag_count: (inout): Input = the maximum number of features to return;
+ *                      Output = the actual number of features returned (may be zero)
+ * @tags: (out) (array length=tag_count): The array of enabled feature
+ *
+ * Fetches the list of OpenType feature tags enabled for a shaping plan, if possible.
+ *
+ * Return value: Total number of feature tagss.
+ *
+ * Since: 10.3.0
+ */
+unsigned int
+hb_ot_shape_plan_get_feature_tags (hb_shape_plan_t *shape_plan,
+                                   unsigned int     start_offset,
+                                   unsigned int    *tag_count, /* IN/OUT */
+                                   hb_tag_t        *tags /* OUT */)
+{
+#ifndef HB_NO_OT_SHAPE
+  return shape_plan->ot.map.get_feature_tags (start_offset, tag_count, tags);
+#else
+  if (tag_count)
+        *tag_count = 0;
+  return 0;
+#endif
+}
+
+
 /* TODO Move this to hb-ot-shape-normalize, make it do decompose, and make it public. */
 static void
 add_char (hb_font_t          *font,
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-ot-shape.h b/src/java.desktop/share/native/libharfbuzz/hb-ot-shape.h
index 545e2c3f1b4..1732831b132 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-ot-shape.h
+++ b/src/java.desktop/share/native/libharfbuzz/hb-ot-shape.h
@@ -48,6 +48,12 @@ hb_ot_shape_plan_collect_lookups (hb_shape_plan_t *shape_plan,
                                   hb_tag_t         table_tag,
                                   hb_set_t        *lookup_indexes /* OUT */);
 
+HB_EXTERN unsigned int
+hb_ot_shape_plan_get_feature_tags (hb_shape_plan_t *shape_plan,
+                                   unsigned int     start_offset,
+                                   unsigned int    *tag_count, /* IN/OUT */
+                                   hb_tag_t        *tags /* OUT */);
+
 HB_END_DECLS
 
 #endif /* HB_OT_SHAPE_H */
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-ot-shape.hh b/src/java.desktop/share/native/libharfbuzz/hb-ot-shape.hh
index 2fa121ced81..d5ee82d4c0b 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-ot-shape.hh
+++ b/src/java.desktop/share/native/libharfbuzz/hb-ot-shape.hh
@@ -51,7 +51,8 @@ struct hb_ot_shape_plan_key_t
 
   bool equal (const hb_ot_shape_plan_key_t *other)
   {
-    return 0 == hb_memcmp (this, other, sizeof (*this));
+    return variations_index[0] == other->variations_index[0] &&
+           variations_index[1] == other->variations_index[1];
   }
 };
 
@@ -79,22 +80,12 @@ struct hb_ot_shape_plan_t
 #else
   static constexpr hb_mask_t kern_mask = 0;
 #endif
-#ifndef HB_NO_AAT_SHAPE
-  hb_mask_t trak_mask;
-#else
-  static constexpr hb_mask_t trak_mask = 0;
-#endif
 
 #ifndef HB_NO_OT_KERN
   bool requested_kerning : 1;
 #else
   static constexpr bool requested_kerning = false;
 #endif
-#ifndef HB_NO_AAT_SHAPE
-  bool requested_tracking : 1;
-#else
-  static constexpr bool requested_tracking = false;
-#endif
 #ifndef HB_NO_OT_SHAPE_FRACTIONS
   bool has_frac : 1;
 #else
@@ -117,11 +108,9 @@ struct hb_ot_shape_plan_t
 #ifndef HB_NO_AAT_SHAPE
   bool apply_kerx : 1;
   bool apply_morx : 1;
-  bool apply_trak : 1;
 #else
   static constexpr bool apply_kerx = false;
   static constexpr bool apply_morx = false;
-  static constexpr bool apply_trak = false;
 #endif
 
   void collect_lookups (hb_tag_t table_tag, hb_set_t *lookups) const
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-ot-shaper-arabic-fallback.hh b/src/java.desktop/share/native/libharfbuzz/hb-ot-shaper-arabic-fallback.hh
index 858a9872726..ff0b2acede1 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-ot-shaper-arabic-fallback.hh
+++ b/src/java.desktop/share/native/libharfbuzz/hb-ot-shaper-arabic-fallback.hh
@@ -355,6 +355,8 @@ arabic_fallback_plan_destroy (arabic_fallback_plan_t *fallback_plan)
   for (unsigned int i = 0; i < fallback_plan->num_lookups; i++)
     if (fallback_plan->lookup_array[i])
     {
+      if (fallback_plan->accel_array[i])
+        fallback_plan->accel_array[i]->fini ();
       hb_free (fallback_plan->accel_array[i]);
       if (fallback_plan->free_lookups)
         hb_free (fallback_plan->lookup_array[i]);
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-ot-shaper-arabic-joining-list.hh b/src/java.desktop/share/native/libharfbuzz/hb-ot-shaper-arabic-joining-list.hh
index a5a7b84af45..e38686e3ebb 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-ot-shaper-arabic-joining-list.hh
+++ b/src/java.desktop/share/native/libharfbuzz/hb-ot-shaper-arabic-joining-list.hh
@@ -6,10 +6,10 @@
  *
  * on files with these headers:
  *
- * # ArabicShaping-15.1.0.txt
- * # Date: 2023-01-05
- * # Scripts-15.1.0.txt
- * # Date: 2023-07-28, 16:01:07 GMT
+ * # ArabicShaping-16.0.0.txt
+ * # Date: 2024-07-30
+ * # Scripts-16.0.0.txt
+ * # Date: 2024-04-30, 21:48:40 GMT
  */
 
 #ifndef HB_OT_SHAPER_ARABIC_JOINING_LIST_HH
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-ot-shaper-arabic-table.hh b/src/java.desktop/share/native/libharfbuzz/hb-ot-shaper-arabic-table.hh
index 8c2504438d9..19bd72d4218 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-ot-shaper-arabic-table.hh
+++ b/src/java.desktop/share/native/libharfbuzz/hb-ot-shaper-arabic-table.hh
@@ -6,10 +6,10 @@
  *
  * on files with these headers:
  *
- * # ArabicShaping-15.1.0.txt
- * # Date: 2023-01-05
- * # Blocks-15.1.0.txt
- * # Date: 2023-07-28, 15:47:20 GMT
+ * # ArabicShaping-16.0.0.txt
+ * # Date: 2024-07-30
+ * # Blocks-16.0.0.txt
+ * # Date: 2024-02-02
  * UnicodeData.txt does not have a header.
  */
 
@@ -136,7 +136,13 @@ static const uint8_t joining_table[] =
   /* 10D00 */ L,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,
   /* 10D20 */ D,D,R,D,
 
-#define joining_offset_0x10f30u 1182
+#define joining_offset_0x10ec2u 1182
+
+  /* Arabic Extended-C */
+
+  /* 10EC0 */     R,D,D,
+
+#define joining_offset_0x10f30u 1185
 
   /* Sogdian */
 
@@ -155,14 +161,14 @@ static const uint8_t joining_table[] =
   /* 10FA0 */                                 D,U,D,D,R,R,R,U,D,R,R,D,D,R,D,D,
   /* 10FC0 */ U,D,R,R,D,U,U,U,U,R,D,L,
 
-#define joining_offset_0x110bdu 1338
+#define joining_offset_0x110bdu 1341
 
   /* Kaithi */
 
   /* 110A0 */                                                           U,X,X,
   /* 110C0 */ X,X,X,X,X,X,X,X,X,X,X,X,X,U,
 
-#define joining_offset_0x1e900u 1355
+#define joining_offset_0x1e900u 1358
 
   /* Adlam */
 
@@ -170,7 +176,7 @@ static const uint8_t joining_table[] =
   /* 1E920 */ D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,D,
   /* 1E940 */ D,D,D,D,X,X,X,X,X,X,X,T,
 
-}; /* Table items: 1431; occupancy: 57% */
+}; /* Table items: 1434; occupancy: 57% */
 
 
 static unsigned int
@@ -198,6 +204,7 @@ joining_type (hb_codepoint_t u)
       if (hb_in_range<hb_codepoint_t> (u, 0x10AC0u, 0x10AEFu)) return joining_table[u - 0x10AC0u + joining_offset_0x10ac0u];
       if (hb_in_range<hb_codepoint_t> (u, 0x10B80u, 0x10BAFu)) return joining_table[u - 0x10B80u + joining_offset_0x10b80u];
       if (hb_in_range<hb_codepoint_t> (u, 0x10D00u, 0x10D23u)) return joining_table[u - 0x10D00u + joining_offset_0x10d00u];
+      if (hb_in_range<hb_codepoint_t> (u, 0x10EC2u, 0x10EC4u)) return joining_table[u - 0x10EC2u + joining_offset_0x10ec2u];
       if (hb_in_range<hb_codepoint_t> (u, 0x10F30u, 0x10FCBu)) return joining_table[u - 0x10F30u + joining_offset_0x10f30u];
       break;
 
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-ot-shaper-arabic.cc b/src/java.desktop/share/native/libharfbuzz/hb-ot-shaper-arabic.cc
index 87d76e1a101..67db6cb26c4 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-ot-shaper-arabic.cc
+++ b/src/java.desktop/share/native/libharfbuzz/hb-ot-shaper-arabic.cc
@@ -233,10 +233,7 @@ collect_features_arabic (hb_ot_shape_planner_t *plan)
    map->enable_feature (HB_TAG('c','a','l','t'), F_MANUAL_ZWJ);
    /* https://github.com/harfbuzz/harfbuzz/issues/1573 */
    if (!map->has_feature (HB_TAG('r','c','l','t')))
-   {
      map->add_gsub_pause (nullptr);
-     map->enable_feature (HB_TAG('r','c','l','t'), F_MANUAL_ZWJ);
-   }
 
    map->enable_feature (HB_TAG('l','i','g','a'), F_MANUAL_ZWJ);
    map->enable_feature (HB_TAG('c','l','i','g'), F_MANUAL_ZWJ);
@@ -560,9 +557,9 @@ apply_stch (const hb_ot_shape_plan_t *plan HB_UNUSED,
 
       DEBUG_MSG (ARABIC, nullptr, "%s stretch at (%u,%u,%u)",
                  step == MEASURE ? "measuring" : "cutting", context, start, end);
-      DEBUG_MSG (ARABIC, nullptr, "rest of word:    count=%u width %d", start - context, w_total);
-      DEBUG_MSG (ARABIC, nullptr, "fixed tiles:     count=%d width=%d", n_fixed, w_fixed);
-      DEBUG_MSG (ARABIC, nullptr, "repeating tiles: count=%d width=%d", n_repeating, w_repeating);
+      DEBUG_MSG (ARABIC, nullptr, "rest of word:    count=%u width %" PRId32, start - context, w_total);
+      DEBUG_MSG (ARABIC, nullptr, "fixed tiles:     count=%d width=%" PRId32, n_fixed, w_fixed);
+      DEBUG_MSG (ARABIC, nullptr, "repeating tiles: count=%d width=%" PRId32, n_repeating, w_repeating);
 
       /* Number of additional times to repeat each repeating tile. */
       int n_copies = 0;
@@ -602,7 +599,7 @@ apply_stch (const hb_ot_shape_plan_t *plan HB_UNUSED,
           if (info[k - 1].arabic_shaping_action() == STCH_REPEATING)
             repeat += n_copies;
 
-          DEBUG_MSG (ARABIC, nullptr, "appending %u copies of glyph %u; j=%u",
+          DEBUG_MSG (ARABIC, nullptr, "appending %u copies of glyph %" PRIu32 "; j=%u",
                      repeat, info[k - 1].codepoint, j);
           pos[k - 1].x_advance = 0;
           for (unsigned int n = 0; n < repeat; n++)
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-ot-shaper-hebrew.cc b/src/java.desktop/share/native/libharfbuzz/hb-ot-shaper-hebrew.cc
index bb9950d02d2..0ad1cea9532 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-ot-shaper-hebrew.cc
+++ b/src/java.desktop/share/native/libharfbuzz/hb-ot-shaper-hebrew.cc
@@ -78,7 +78,7 @@ compose_hebrew (const hb_ot_shape_normalize_context_t *c,
   return found;
 #endif
 
-  if (!found && !c->plan->has_gpos_mark)
+  if (!found && (c->plan && !c->plan->has_gpos_mark))
   {
       /* Special-case Hebrew presentation forms that are excluded from
        * standard normalization, but wanted for old fonts. */
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-ot-shaper-indic-machine.hh b/src/java.desktop/share/native/libharfbuzz/hb-ot-shaper-indic-machine.hh
index 6a6db44840e..25e6d85ef80 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-ot-shaper-indic-machine.hh
+++ b/src/java.desktop/share/native/libharfbuzz/hb-ot-shaper-indic-machine.hh
@@ -68,6 +68,7 @@ enum indic_syllable_type_t {
 #define indic_syllable_machine_ex_Ra 15u
 #define indic_syllable_machine_ex_Repha 14u
 #define indic_syllable_machine_ex_SM 8u
+#define indic_syllable_machine_ex_SMPst 57u
 #define indic_syllable_machine_ex_Symbol 17u
 #define indic_syllable_machine_ex_V 2u
 #define indic_syllable_machine_ex_VD 9u
@@ -76,251 +77,916 @@ enum indic_syllable_type_t {
 #define indic_syllable_machine_ex_ZWNJ 5u
 
 
-#line 80 "hb-ot-shaper-indic-machine.hh"
+#line 81 "hb-ot-shaper-indic-machine.hh"
 static const unsigned char _indic_syllable_machine_trans_keys[] = {
-        8u, 8u, 4u, 13u, 5u, 13u, 5u, 13u, 13u, 13u, 4u, 13u, 4u, 13u, 4u, 13u,
-        8u, 8u, 5u, 13u, 5u, 13u, 13u, 13u, 4u, 13u, 4u, 13u, 4u, 13u, 4u, 13u,
-        8u, 8u, 5u, 13u, 5u, 13u, 13u, 13u, 4u, 13u, 4u, 13u, 4u, 13u, 8u, 8u,
-        5u, 13u, 5u, 13u, 13u, 13u, 4u, 13u, 4u, 13u, 5u, 13u, 8u, 8u, 1u, 18u,
-        3u, 16u, 3u, 16u, 4u, 16u, 1u, 15u, 5u, 9u, 5u, 9u, 9u, 9u, 5u, 9u,
-        1u, 15u, 1u, 15u, 1u, 15u, 3u, 13u, 4u, 13u, 5u, 13u, 5u, 13u, 4u, 13u,
-        5u, 9u, 3u, 9u, 5u, 9u, 3u, 16u, 3u, 16u, 3u, 16u, 3u, 16u, 4u, 16u,
-        1u, 15u, 3u, 16u, 3u, 16u, 4u, 16u, 1u, 15u, 5u, 9u, 9u, 9u, 5u, 9u,
-        1u, 15u, 1u, 15u, 3u, 13u, 4u, 13u, 5u, 13u, 5u, 13u, 4u, 13u, 5u, 9u,
-        5u, 9u, 3u, 9u, 5u, 9u, 3u, 16u, 3u, 16u, 4u, 13u, 3u, 16u, 3u, 16u,
-        4u, 16u, 1u, 15u, 3u, 16u, 1u, 15u, 5u, 9u, 9u, 9u, 5u, 9u, 1u, 15u,
-        1u, 15u, 3u, 13u, 4u, 13u, 5u, 13u, 5u, 13u, 3u, 16u, 4u, 13u, 5u, 9u,
-        5u, 9u, 3u, 9u, 5u, 9u, 3u, 16u, 4u, 13u, 4u, 13u, 3u, 16u, 3u, 16u,
-        4u, 16u, 1u, 15u, 3u, 16u, 1u, 15u, 5u, 9u, 9u, 9u, 5u, 9u, 1u, 15u,
-        1u, 15u, 3u, 13u, 4u, 13u, 5u, 13u, 5u, 13u, 3u, 16u, 4u, 13u, 5u, 9u,
-        5u, 9u, 3u, 9u, 5u, 9u, 1u, 16u, 3u, 16u, 1u, 16u, 4u, 13u, 5u, 13u,
-        5u, 13u, 9u, 9u, 5u, 9u, 1u, 15u, 3u, 9u, 5u, 9u, 5u, 9u, 9u, 9u,
+        8u, 57u, 4u, 57u, 5u, 57u, 5u, 57u, 13u, 13u, 4u, 57u, 4u, 57u, 4u, 57u,
+        8u, 57u, 5u, 57u, 5u, 57u, 13u, 13u, 4u, 57u, 4u, 57u, 4u, 57u, 4u, 57u,
+        8u, 57u, 5u, 57u, 5u, 57u, 13u, 13u, 4u, 57u, 4u, 57u, 4u, 57u, 8u, 57u,
+        5u, 57u, 5u, 57u, 13u, 13u, 4u, 57u, 4u, 57u, 5u, 57u, 8u, 57u, 1u, 57u,
+        3u, 57u, 3u, 57u, 4u, 57u, 1u, 57u, 5u, 57u, 5u, 57u, 9u, 9u, 5u, 9u,
+        1u, 57u, 1u, 57u, 1u, 57u, 3u, 57u, 4u, 57u, 5u, 57u, 5u, 57u, 4u, 57u,
+        5u, 57u, 3u, 57u, 5u, 57u, 3u, 57u, 3u, 57u, 3u, 57u, 3u, 57u, 4u, 57u,
+        1u, 57u, 3u, 57u, 3u, 57u, 4u, 57u, 1u, 57u, 5u, 57u, 9u, 9u, 5u, 9u,
+        1u, 57u, 1u, 57u, 3u, 57u, 4u, 57u, 5u, 57u, 5u, 57u, 4u, 57u, 5u, 57u,
+        5u, 57u, 3u, 57u, 5u, 57u, 3u, 57u, 3u, 57u, 4u, 57u, 3u, 57u, 3u, 57u,
+        4u, 57u, 1u, 57u, 3u, 57u, 1u, 57u, 5u, 57u, 9u, 9u, 5u, 9u, 1u, 57u,
+        1u, 57u, 3u, 57u, 4u, 57u, 5u, 57u, 5u, 57u, 3u, 57u, 4u, 57u, 5u, 57u,
+        5u, 57u, 3u, 57u, 5u, 57u, 3u, 57u, 4u, 57u, 4u, 57u, 3u, 57u, 3u, 57u,
+        4u, 57u, 1u, 57u, 3u, 57u, 1u, 57u, 5u, 57u, 9u, 9u, 5u, 9u, 1u, 57u,
+        1u, 57u, 3u, 57u, 4u, 57u, 5u, 57u, 5u, 57u, 3u, 57u, 4u, 57u, 5u, 57u,
+        5u, 57u, 3u, 57u, 5u, 57u, 1u, 57u, 3u, 57u, 1u, 57u, 4u, 57u, 5u, 57u,
+        5u, 57u, 9u, 9u, 5u, 9u, 1u, 57u, 3u, 57u, 5u, 57u, 5u, 57u, 9u, 9u,
         5u, 9u, 1u, 15u, 0
 };
 
 static const char _indic_syllable_machine_key_spans[] = {
-        1, 10, 9, 9, 1, 10, 10, 10,
-        1, 9, 9, 1, 10, 10, 10, 10,
-        1, 9, 9, 1, 10, 10, 10, 1,
-        9, 9, 1, 10, 10, 9, 1, 18,
-        14, 14, 13, 15, 5, 5, 1, 5,
-        15, 15, 15, 11, 10, 9, 9, 10,
-        5, 7, 5, 14, 14, 14, 14, 13,
-        15, 14, 14, 13, 15, 5, 1, 5,
-        15, 15, 11, 10, 9, 9, 10, 5,
-        5, 7, 5, 14, 14, 10, 14, 14,
-        13, 15, 14, 15, 5, 1, 5, 15,
-        15, 11, 10, 9, 9, 14, 10, 5,
-        5, 7, 5, 14, 10, 10, 14, 14,
-        13, 15, 14, 15, 5, 1, 5, 15,
-        15, 11, 10, 9, 9, 14, 10, 5,
-        5, 7, 5, 16, 14, 16, 10, 9,
-        9, 1, 5, 15, 7, 5, 5, 1,
+        50, 54, 53, 53, 1, 54, 54, 54,
+        50, 53, 53, 1, 54, 54, 54, 54,
+        50, 53, 53, 1, 54, 54, 54, 50,
+        53, 53, 1, 54, 54, 53, 50, 57,
+        55, 55, 54, 57, 53, 53, 1, 5,
+        57, 57, 57, 55, 54, 53, 53, 54,
+        53, 55, 53, 55, 55, 55, 55, 54,
+        57, 55, 55, 54, 57, 53, 1, 5,
+        57, 57, 55, 54, 53, 53, 54, 53,
+        53, 55, 53, 55, 55, 54, 55, 55,
+        54, 57, 55, 57, 53, 1, 5, 57,
+        57, 55, 54, 53, 53, 55, 54, 53,
+        53, 55, 53, 55, 54, 54, 55, 55,
+        54, 57, 55, 57, 53, 1, 5, 57,
+        57, 55, 54, 53, 53, 55, 54, 53,
+        53, 55, 53, 57, 55, 57, 54, 53,
+        53, 1, 5, 57, 55, 53, 53, 1,
         5, 15
 };
 
 static const short _indic_syllable_machine_index_offsets[] = {
-        0, 2, 13, 23, 33, 35, 46, 57,
-        68, 70, 80, 90, 92, 103, 114, 125,
-        136, 138, 148, 158, 160, 171, 182, 193,
-        195, 205, 215, 217, 228, 239, 249, 251,
-        270, 285, 300, 314, 330, 336, 342, 344,
-        350, 366, 382, 398, 410, 421, 431, 441,
-        452, 458, 466, 472, 487, 502, 517, 532,
-        546, 562, 577, 592, 606, 622, 628, 630,
-        636, 652, 668, 680, 691, 701, 711, 722,
-        728, 734, 742, 748, 763, 778, 789, 804,
-        819, 833, 849, 864, 880, 886, 888, 894,
-        910, 926, 938, 949, 959, 969, 984, 995,
-        1001, 1007, 1015, 1021, 1036, 1047, 1058, 1073,
-        1088, 1102, 1118, 1133, 1149, 1155, 1157, 1163,
-        1179, 1195, 1207, 1218, 1228, 1238, 1253, 1264,
-        1270, 1276, 1284, 1290, 1307, 1322, 1339, 1350,
-        1360, 1370, 1372, 1378, 1394, 1402, 1408, 1414,
-        1416, 1422
+        0, 51, 106, 160, 214, 216, 271, 326,
+        381, 432, 486, 540, 542, 597, 652, 707,
+        762, 813, 867, 921, 923, 978, 1033, 1088,
+        1139, 1193, 1247, 1249, 1304, 1359, 1413, 1464,
+        1522, 1578, 1634, 1689, 1747, 1801, 1855, 1857,
+        1863, 1921, 1979, 2037, 2093, 2148, 2202, 2256,
+        2311, 2365, 2421, 2475, 2531, 2587, 2643, 2699,
+        2754, 2812, 2868, 2924, 2979, 3037, 3091, 3093,
+        3099, 3157, 3215, 3271, 3326, 3380, 3434, 3489,
+        3543, 3597, 3653, 3707, 3763, 3819, 3874, 3930,
+        3986, 4041, 4099, 4155, 4213, 4267, 4269, 4275,
+        4333, 4391, 4447, 4502, 4556, 4610, 4666, 4721,
+        4775, 4829, 4885, 4939, 4995, 5050, 5105, 5161,
+        5217, 5272, 5330, 5386, 5444, 5498, 5500, 5506,
+        5564, 5622, 5678, 5733, 5787, 5841, 5897, 5952,
+        6006, 6060, 6116, 6170, 6228, 6284, 6342, 6397,
+        6451, 6505, 6507, 6513, 6571, 6627, 6681, 6735,
+        6737, 6743
 };
 
 static const unsigned char _indic_syllable_machine_indicies[] = {
-        1, 0, 2, 3, 3, 4, 5, 0,
-        0, 0, 0, 4, 0, 3, 3, 4,
-        6, 0, 0, 0, 0, 4, 0, 3,
-        3, 4, 5, 0, 0, 0, 0, 4,
-        0, 4, 0, 7, 3, 3, 4, 5,
-        0, 0, 0, 0, 4, 0, 2, 3,
-        3, 4, 5, 0, 0, 0, 8, 4,
-        0, 10, 11, 11, 12, 13, 9, 9,
-        9, 9, 12, 9, 14, 9, 11, 11,
-        12, 15, 9, 9, 9, 9, 12, 9,
-        11, 11, 12, 13, 9, 9, 9, 9,
-        12, 9, 12, 9, 16, 11, 11, 12,
-        13, 9, 9, 9, 9, 12, 9, 10,
-        11, 11, 12, 13, 9, 9, 9, 17,
-        12, 9, 10, 11, 11, 12, 13, 9,
-        9, 9, 18, 12, 9, 20, 21, 21,
-        22, 23, 19, 19, 19, 24, 22, 19,
-        25, 19, 21, 21, 22, 27, 26, 26,
-        26, 26, 22, 26, 21, 21, 22, 23,
-        19, 19, 19, 19, 22, 19, 22, 26,
-        20, 21, 21, 22, 23, 19, 19, 19,
-        19, 22, 19, 28, 21, 21, 22, 23,
-        19, 19, 19, 19, 22, 19, 30, 31,
-        31, 32, 33, 29, 29, 29, 34, 32,
+        1, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0,
+        0, 1, 0, 2, 3, 3, 4, 5,
+        0, 0, 0, 0, 4, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0,
+        5, 0, 3, 3, 4, 6, 0, 0,
+        0, 0, 4, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 6, 0,
+        3, 3, 4, 5, 0, 0, 0, 0,
+        4, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 5, 0, 4, 0,
+        7, 3, 3, 4, 5, 0, 0, 0,
+        0, 4, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 5, 0, 2,
+        3, 3, 4, 5, 0, 0, 0, 8,
+        4, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 5, 0, 10, 11,
+        11, 12, 13, 9, 9, 9, 9, 12,
+        9, 9, 9, 9, 9, 9, 9, 9,
+        9, 9, 9, 9, 9, 9, 9, 9,
+        9, 9, 9, 9, 9, 9, 9, 9,
+        9, 9, 9, 9, 9, 9, 9, 9,
+        9, 9, 9, 9, 9, 9, 9, 9,
+        9, 9, 9, 13, 9, 14, 9, 9,
+        9, 9, 9, 9, 9, 9, 9, 9,
+        9, 9, 9, 9, 9, 9, 9, 9,
+        9, 9, 9, 9, 9, 9, 9, 9,
+        9, 9, 9, 9, 9, 9, 9, 9,
+        9, 9, 9, 9, 9, 9, 9, 9,
+        9, 9, 9, 9, 9, 9, 14, 9,
+        11, 11, 12, 15, 9, 9, 9, 9,
+        12, 9, 9, 9, 9, 9, 9, 9,
+        9, 9, 9, 9, 9, 9, 9, 9,
+        9, 9, 9, 9, 9, 9, 9, 9,
+        9, 9, 9, 9, 9, 9, 9, 9,
+        9, 9, 9, 9, 9, 9, 9, 9,
+        9, 9, 9, 9, 15, 9, 11, 11,
+        12, 13, 9, 9, 9, 9, 12, 9,
+        9, 9, 9, 9, 9, 9, 9, 9,
+        9, 9, 9, 9, 9, 9, 9, 9,
+        9, 9, 9, 9, 9, 9, 9, 9,
+        9, 9, 9, 9, 9, 9, 9, 9,
+        9, 9, 9, 9, 9, 9, 9, 9,
+        9, 9, 13, 9, 12, 9, 16, 11,
+        11, 12, 13, 9, 9, 9, 9, 12,
+        9, 9, 9, 9, 9, 9, 9, 9,
+        9, 9, 9, 9, 9, 9, 9, 9,
+        9, 9, 9, 9, 9, 9, 9, 9,
+        9, 9, 9, 9, 9, 9, 9, 9,
+        9, 9, 9, 9, 9, 9, 9, 9,
+        9, 9, 9, 13, 9, 10, 11, 11,
+        12, 13, 9, 9, 9, 17, 12, 9,
+        9, 9, 9, 9, 9, 9, 9, 9,
+        9, 9, 9, 9, 9, 9, 9, 9,
+        9, 9, 9, 9, 9, 9, 9, 9,
+        9, 9, 9, 9, 9, 9, 9, 9,
+        9, 9, 9, 9, 9, 9, 9, 9,
+        9, 9, 13, 9, 10, 11, 11, 12,
+        13, 9, 9, 9, 18, 12, 9, 9,
+        9, 9, 9, 9, 9, 9, 9, 9,
+        9, 9, 9, 9, 9, 9, 9, 9,
+        9, 9, 9, 9, 9, 9, 9, 9,
+        9, 9, 9, 9, 9, 9, 9, 9,
+        9, 9, 9, 9, 9, 9, 9, 9,
+        9, 13, 9, 20, 21, 21, 22, 23,
+        19, 19, 19, 24, 22, 19, 19, 19,
+        19, 19, 19, 19, 19, 19, 19, 19,
+        19, 19, 19, 19, 19, 19, 19, 19,
+        19, 19, 19, 19, 19, 19, 19, 19,
+        19, 19, 19, 19, 19, 19, 19, 19,
+        19, 19, 19, 19, 19, 19, 19, 19,
+        23, 19, 25, 19, 19, 19, 19, 19,
+        19, 19, 19, 19, 19, 19, 19, 19,
+        19, 19, 19, 19, 19, 19, 19, 19,
+        19, 19, 19, 19, 19, 19, 19, 19,
+        19, 19, 19, 19, 19, 19, 19, 19,
+        19, 19, 19, 19, 19, 19, 19, 19,
+        19, 19, 19, 25, 19, 21, 21, 22,
+        27, 26, 26, 26, 26, 22, 26, 26,
+        26, 26, 26, 26, 26, 26, 26, 26,
+        26, 26, 26, 26, 26, 26, 26, 26,
+        26, 26, 26, 26, 26, 26, 26, 26,
+        26, 26, 26, 26, 26, 26, 26, 26,
+        26, 26, 26, 26, 26, 26, 26, 26,
+        26, 27, 26, 21, 21, 22, 23, 19,
+        19, 19, 19, 22, 19, 19, 19, 19,
+        19, 19, 19, 19, 19, 19, 19, 19,
+        19, 19, 19, 19, 19, 19, 19, 19,
+        19, 19, 19, 19, 19, 19, 19, 19,
+        19, 19, 19, 19, 19, 19, 19, 19,
+        19, 19, 19, 19, 19, 19, 19, 23,
+        19, 22, 26, 20, 21, 21, 22, 23,
+        19, 19, 19, 19, 22, 19, 19, 19,
+        19, 19, 19, 19, 19, 19, 19, 19,
+        19, 19, 19, 19, 19, 19, 19, 19,
+        19, 19, 19, 19, 19, 19, 19, 19,
+        19, 19, 19, 19, 19, 19, 19, 19,
+        19, 19, 19, 19, 19, 19, 19, 19,
+        23, 19, 28, 21, 21, 22, 23, 19,
+        19, 19, 19, 22, 19, 19, 19, 19,
+        19, 19, 19, 19, 19, 19, 19, 19,
+        19, 19, 19, 19, 19, 19, 19, 19,
+        19, 19, 19, 19, 19, 19, 19, 19,
+        19, 19, 19, 19, 19, 19, 19, 19,
+        19, 19, 19, 19, 19, 19, 19, 23,
+        19, 30, 31, 31, 32, 33, 29, 29,
+        29, 34, 32, 29, 29, 29, 29, 29,
+        29, 29, 29, 29, 29, 29, 29, 29,
+        29, 29, 29, 29, 29, 29, 29, 29,
+        29, 29, 29, 29, 29, 29, 29, 29,
+        29, 29, 29, 29, 29, 29, 29, 29,
+        29, 29, 29, 29, 29, 29, 33, 29,
+        35, 29, 29, 29, 29, 29, 29, 29,
+        29, 29, 29, 29, 29, 29, 29, 29,
+        29, 29, 29, 29, 29, 29, 29, 29,
+        29, 29, 29, 29, 29, 29, 29, 29,
+        29, 29, 29, 29, 29, 29, 29, 29,
+        29, 29, 29, 29, 29, 29, 29, 29,
         29, 35, 29, 31, 31, 32, 36, 29,
-        29, 29, 29, 32, 29, 31, 31, 32,
-        33, 29, 29, 29, 29, 32, 29, 32,
+        29, 29, 29, 32, 29, 29, 29, 29,
+        29, 29, 29, 29, 29, 29, 29, 29,
+        29, 29, 29, 29, 29, 29, 29, 29,
+        29, 29, 29, 29, 29, 29, 29, 29,
+        29, 29, 29, 29, 29, 29, 29, 29,
+        29, 29, 29, 29, 29, 29, 29, 36,
+        29, 31, 31, 32, 33, 29, 29, 29,
+        29, 32, 29, 29, 29, 29, 29, 29,
+        29, 29, 29, 29, 29, 29, 29, 29,
+        29, 29, 29, 29, 29, 29, 29, 29,
+        29, 29, 29, 29, 29, 29, 29, 29,
+        29, 29, 29, 29, 29, 29, 29, 29,
+        29, 29, 29, 29, 29, 33, 29, 32,
         29, 30, 31, 31, 32, 33, 29, 29,
-        29, 29, 32, 29, 37, 31, 31, 32,
-        33, 29, 29, 29, 29, 32, 29, 21,
+        29, 29, 32, 29, 29, 29, 29, 29,
+        29, 29, 29, 29, 29, 29, 29, 29,
+        29, 29, 29, 29, 29, 29, 29, 29,
+        29, 29, 29, 29, 29, 29, 29, 29,
+        29, 29, 29, 29, 29, 29, 29, 29,
+        29, 29, 29, 29, 29, 29, 33, 29,
+        37, 31, 31, 32, 33, 29, 29, 29,
+        29, 32, 29, 29, 29, 29, 29, 29,
+        29, 29, 29, 29, 29, 29, 29, 29,
+        29, 29, 29, 29, 29, 29, 29, 29,
+        29, 29, 29, 29, 29, 29, 29, 29,
+        29, 29, 29, 29, 29, 29, 29, 29,
+        29, 29, 29, 29, 29, 33, 29, 21,
         21, 22, 38, 0, 0, 0, 0, 22,
-        0, 40, 39, 42, 43, 44, 45, 46,
-        47, 22, 23, 48, 49, 49, 24, 22,
-        50, 51, 52, 53, 54, 41, 56, 57,
-        58, 59, 4, 5, 60, 55, 55, 8,
-        4, 55, 55, 61, 55, 62, 57, 63,
-        63, 4, 5, 60, 55, 55, 55, 4,
-        55, 55, 61, 55, 57, 63, 63, 4,
-        5, 60, 55, 55, 55, 4, 55, 55,
-        61, 55, 42, 55, 55, 55, 64, 65,
-        55, 1, 60, 55, 55, 55, 55, 55,
-        42, 55, 66, 66, 55, 1, 60, 55,
-        60, 55, 55, 67, 60, 55, 60, 55,
-        60, 55, 55, 55, 60, 55, 42, 55,
-        68, 55, 66, 66, 55, 1, 60, 55,
-        55, 55, 55, 55, 42, 55, 42, 55,
-        55, 55, 66, 66, 55, 1, 60, 55,
-        55, 55, 55, 55, 42, 55, 42, 55,
-        55, 55, 66, 65, 55, 1, 60, 55,
-        55, 55, 55, 55, 42, 55, 69, 70,
-        71, 71, 4, 5, 60, 55, 55, 55,
-        4, 55, 70, 71, 71, 4, 5, 60,
-        55, 55, 55, 4, 55, 71, 71, 4,
-        5, 60, 55, 55, 55, 4, 55, 60,
-        55, 55, 67, 60, 55, 55, 55, 4,
-        55, 72, 73, 73, 4, 5, 60, 55,
-        55, 55, 4, 55, 64, 74, 55, 1,
-        60, 55, 64, 55, 66, 66, 55, 1,
-        60, 55, 66, 74, 55, 1, 60, 55,
-        56, 57, 63, 63, 4, 5, 60, 55,
-        55, 55, 4, 55, 55, 61, 55, 56,
-        57, 58, 63, 4, 5, 60, 55, 55,
-        8, 4, 55, 55, 61, 55, 76, 77,
-        78, 79, 12, 13, 80, 75, 75, 18,
-        12, 75, 75, 81, 75, 82, 77, 83,
-        79, 12, 13, 80, 75, 75, 75, 12,
-        75, 75, 81, 75, 77, 83, 79, 12,
-        13, 80, 75, 75, 75, 12, 75, 75,
-        81, 75, 84, 75, 75, 75, 85, 86,
-        75, 14, 80, 75, 75, 75, 75, 75,
-        84, 75, 87, 77, 88, 89, 12, 13,
-        80, 75, 75, 17, 12, 75, 75, 81,
-        75, 90, 77, 83, 83, 12, 13, 80,
-        75, 75, 75, 12, 75, 75, 81, 75,
-        77, 83, 83, 12, 13, 80, 75, 75,
-        75, 12, 75, 75, 81, 75, 84, 75,
-        75, 75, 91, 86, 75, 14, 80, 75,
-        75, 75, 75, 75, 84, 75, 80, 75,
-        75, 92, 80, 75, 80, 75, 80, 75,
-        75, 75, 80, 75, 84, 75, 93, 75,
-        91, 91, 75, 14, 80, 75, 75, 75,
-        75, 75, 84, 75, 84, 75, 75, 75,
-        91, 91, 75, 14, 80, 75, 75, 75,
-        75, 75, 84, 75, 94, 95, 96, 96,
-        12, 13, 80, 75, 75, 75, 12, 75,
-        95, 96, 96, 12, 13, 80, 75, 75,
-        75, 12, 75, 96, 96, 12, 13, 80,
-        75, 75, 75, 12, 75, 80, 75, 75,
-        92, 80, 75, 75, 75, 12, 75, 97,
-        98, 98, 12, 13, 80, 75, 75, 75,
-        12, 75, 85, 99, 75, 14, 80, 75,
-        91, 91, 75, 14, 80, 75, 85, 75,
-        91, 91, 75, 14, 80, 75, 91, 99,
-        75, 14, 80, 75, 87, 77, 83, 83,
-        12, 13, 80, 75, 75, 75, 12, 75,
-        75, 81, 75, 87, 77, 88, 83, 12,
-        13, 80, 75, 75, 17, 12, 75, 75,
-        81, 75, 10, 11, 11, 12, 13, 75,
-        75, 75, 75, 12, 75, 76, 77, 83,
-        79, 12, 13, 80, 75, 75, 75, 12,
-        75, 75, 81, 75, 101, 45, 102, 102,
-        22, 23, 48, 100, 100, 100, 22, 100,
-        100, 52, 100, 45, 102, 102, 22, 23,
-        48, 100, 100, 100, 22, 100, 100, 52,
-        100, 103, 100, 100, 100, 104, 105, 100,
-        25, 48, 100, 100, 100, 100, 100, 103,
-        100, 44, 45, 106, 107, 22, 23, 48,
-        100, 100, 24, 22, 100, 100, 52, 100,
-        103, 100, 100, 100, 108, 105, 100, 25,
-        48, 100, 100, 100, 100, 100, 103, 100,
-        48, 100, 100, 109, 48, 100, 48, 100,
-        48, 100, 100, 100, 48, 100, 103, 100,
-        110, 100, 108, 108, 100, 25, 48, 100,
-        100, 100, 100, 100, 103, 100, 103, 100,
-        100, 100, 108, 108, 100, 25, 48, 100,
-        100, 100, 100, 100, 103, 100, 111, 112,
-        113, 113, 22, 23, 48, 100, 100, 100,
-        22, 100, 112, 113, 113, 22, 23, 48,
-        100, 100, 100, 22, 100, 113, 113, 22,
-        23, 48, 100, 100, 100, 22, 100, 48,
-        100, 100, 109, 48, 100, 100, 100, 22,
-        100, 44, 45, 102, 102, 22, 23, 48,
-        100, 100, 100, 22, 100, 100, 52, 100,
-        114, 115, 115, 22, 23, 48, 100, 100,
-        100, 22, 100, 104, 116, 100, 25, 48,
-        100, 108, 108, 100, 25, 48, 100, 104,
-        100, 108, 108, 100, 25, 48, 100, 108,
-        116, 100, 25, 48, 100, 44, 45, 106,
-        102, 22, 23, 48, 100, 100, 24, 22,
-        100, 100, 52, 100, 20, 21, 21, 22,
-        23, 117, 117, 117, 24, 22, 117, 20,
-        21, 21, 22, 23, 117, 117, 117, 117,
-        22, 117, 119, 120, 121, 122, 32, 33,
-        123, 118, 118, 34, 32, 118, 118, 124,
-        118, 125, 120, 122, 122, 32, 33, 123,
-        118, 118, 118, 32, 118, 118, 124, 118,
-        120, 122, 122, 32, 33, 123, 118, 118,
-        118, 32, 118, 118, 124, 118, 126, 118,
-        118, 118, 127, 128, 118, 35, 123, 118,
-        118, 118, 118, 118, 126, 118, 119, 120,
-        121, 49, 32, 33, 123, 118, 118, 34,
-        32, 118, 118, 124, 118, 126, 118, 118,
-        118, 129, 128, 118, 35, 123, 118, 118,
-        118, 118, 118, 126, 118, 123, 118, 118,
-        130, 123, 118, 123, 118, 123, 118, 118,
-        118, 123, 118, 126, 118, 131, 118, 129,
-        129, 118, 35, 123, 118, 118, 118, 118,
-        118, 126, 118, 126, 118, 118, 118, 129,
-        129, 118, 35, 123, 118, 118, 118, 118,
-        118, 126, 118, 132, 133, 134, 134, 32,
-        33, 123, 118, 118, 118, 32, 118, 133,
-        134, 134, 32, 33, 123, 118, 118, 118,
-        32, 118, 134, 134, 32, 33, 123, 118,
-        118, 118, 32, 118, 123, 118, 118, 130,
-        123, 118, 118, 118, 32, 118, 119, 120,
-        122, 122, 32, 33, 123, 118, 118, 118,
-        32, 118, 118, 124, 118, 135, 136, 136,
-        32, 33, 123, 118, 118, 118, 32, 118,
-        127, 137, 118, 35, 123, 118, 129, 129,
-        118, 35, 123, 118, 127, 118, 129, 129,
-        118, 35, 123, 118, 129, 137, 118, 35,
-        123, 118, 42, 43, 44, 45, 106, 102,
-        22, 23, 48, 49, 49, 24, 22, 100,
-        42, 52, 100, 56, 138, 58, 59, 4,
-        5, 60, 55, 55, 8, 4, 55, 55,
-        61, 55, 42, 43, 44, 45, 139, 140,
-        22, 141, 142, 55, 49, 24, 22, 55,
-        42, 52, 55, 20, 143, 143, 22, 141,
-        60, 55, 55, 24, 22, 55, 60, 55,
-        55, 67, 60, 55, 55, 55, 22, 55,
-        142, 55, 55, 144, 142, 55, 55, 55,
-        22, 55, 142, 55, 142, 55, 55, 55,
-        142, 55, 42, 55, 68, 20, 143, 143,
-        22, 141, 60, 55, 55, 55, 22, 55,
-        42, 55, 146, 145, 147, 147, 145, 40,
-        148, 145, 147, 147, 145, 40, 148, 145,
-        148, 145, 145, 149, 148, 145, 148, 145,
-        148, 145, 145, 145, 148, 145, 42, 117,
-        117, 117, 117, 117, 117, 117, 117, 49,
-        117, 117, 117, 117, 42, 117, 0
+        0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 38, 0, 40, 39, 39,
+        39, 39, 39, 39, 39, 39, 39, 39,
+        39, 39, 39, 39, 39, 39, 39, 39,
+        39, 39, 39, 39, 39, 39, 39, 39,
+        39, 39, 39, 39, 39, 39, 39, 39,
+        39, 39, 39, 39, 39, 39, 39, 39,
+        39, 39, 39, 39, 39, 39, 40, 39,
+        42, 43, 44, 45, 46, 47, 22, 23,
+        48, 49, 49, 24, 22, 50, 51, 52,
+        53, 54, 41, 41, 41, 41, 41, 41,
+        41, 41, 41, 41, 41, 41, 41, 41,
+        41, 41, 41, 41, 41, 41, 41, 41,
+        41, 41, 41, 41, 41, 41, 41, 41,
+        41, 41, 41, 41, 41, 41, 41, 41,
+        55, 41, 57, 58, 59, 60, 4, 5,
+        61, 56, 56, 8, 4, 56, 56, 62,
+        56, 56, 56, 56, 56, 56, 56, 56,
+        56, 56, 56, 56, 56, 56, 56, 56,
+        56, 56, 56, 56, 56, 56, 56, 56,
+        56, 56, 56, 56, 56, 56, 56, 56,
+        56, 56, 56, 56, 56, 56, 56, 56,
+        5, 56, 63, 58, 64, 64, 4, 5,
+        61, 56, 56, 56, 4, 56, 56, 62,
+        56, 56, 56, 56, 56, 56, 56, 56,
+        56, 56, 56, 56, 56, 56, 56, 56,
+        56, 56, 56, 56, 56, 56, 56, 56,
+        56, 56, 56, 56, 56, 56, 56, 56,
+        56, 56, 56, 56, 56, 56, 56, 56,
+        5, 56, 58, 64, 64, 4, 5, 61,
+        56, 56, 56, 4, 56, 56, 62, 56,
+        56, 56, 56, 56, 56, 56, 56, 56,
+        56, 56, 56, 56, 56, 56, 56, 56,
+        56, 56, 56, 56, 56, 56, 56, 56,
+        56, 56, 56, 56, 56, 56, 56, 56,
+        56, 56, 56, 56, 56, 56, 56, 5,
+        56, 42, 56, 56, 56, 65, 66, 56,
+        1, 61, 56, 56, 56, 56, 56, 42,
+        56, 56, 56, 56, 56, 56, 56, 56,
+        56, 56, 56, 56, 56, 56, 56, 56,
+        56, 56, 56, 56, 56, 56, 56, 56,
+        56, 56, 56, 56, 56, 56, 56, 56,
+        56, 56, 56, 56, 56, 56, 56, 56,
+        56, 1, 56, 67, 67, 56, 1, 61,
+        56, 56, 56, 56, 56, 56, 56, 56,
+        56, 56, 56, 56, 56, 56, 56, 56,
+        56, 56, 56, 56, 56, 56, 56, 56,
+        56, 56, 56, 56, 56, 56, 56, 56,
+        56, 56, 56, 56, 56, 56, 56, 56,
+        56, 56, 56, 56, 56, 56, 56, 1,
+        56, 61, 56, 56, 68, 61, 56, 56,
+        56, 56, 56, 56, 56, 56, 56, 56,
+        56, 56, 56, 56, 56, 56, 56, 56,
+        56, 56, 56, 56, 56, 56, 56, 56,
+        56, 56, 56, 56, 56, 56, 56, 56,
+        56, 56, 56, 56, 56, 56, 56, 56,
+        56, 56, 56, 56, 56, 68, 56, 61,
+        56, 61, 56, 56, 56, 61, 56, 42,
+        56, 69, 56, 67, 67, 56, 1, 61,
+        56, 56, 56, 56, 56, 42, 56, 56,
+        56, 56, 56, 56, 56, 56, 56, 56,
+        56, 56, 56, 56, 56, 56, 56, 56,
+        56, 56, 56, 56, 56, 56, 56, 56,
+        56, 56, 56, 56, 56, 56, 56, 56,
+        56, 56, 56, 56, 56, 56, 56, 1,
+        56, 42, 56, 56, 56, 67, 67, 56,
+        1, 61, 56, 56, 56, 56, 56, 42,
+        56, 56, 56, 56, 56, 56, 56, 56,
+        56, 56, 56, 56, 56, 56, 56, 56,
+        56, 56, 56, 56, 56, 56, 56, 56,
+        56, 56, 56, 56, 56, 56, 56, 56,
+        56, 56, 56, 56, 56, 56, 56, 56,
+        56, 1, 56, 42, 56, 56, 56, 67,
+        66, 56, 1, 61, 56, 56, 56, 56,
+        56, 42, 56, 56, 56, 56, 56, 56,
+        56, 56, 56, 56, 56, 56, 56, 56,
+        56, 56, 56, 56, 56, 56, 56, 56,
+        56, 56, 56, 56, 56, 56, 56, 56,
+        56, 56, 56, 56, 56, 56, 56, 56,
+        56, 56, 56, 1, 56, 70, 71, 72,
+        72, 4, 5, 61, 56, 56, 56, 4,
+        56, 56, 56, 56, 56, 56, 56, 56,
+        56, 56, 56, 56, 56, 56, 56, 56,
+        56, 56, 56, 56, 56, 56, 56, 56,
+        56, 56, 56, 56, 56, 56, 56, 56,
+        56, 56, 56, 56, 56, 56, 56, 56,
+        56, 56, 56, 5, 56, 71, 72, 72,
+        4, 5, 61, 56, 56, 56, 4, 56,
+        56, 56, 56, 56, 56, 56, 56, 56,
+        56, 56, 56, 56, 56, 56, 56, 56,
+        56, 56, 56, 56, 56, 56, 56, 56,
+        56, 56, 56, 56, 56, 56, 56, 56,
+        56, 56, 56, 56, 56, 56, 56, 56,
+        56, 56, 5, 56, 72, 72, 4, 5,
+        61, 56, 56, 56, 4, 56, 56, 56,
+        56, 56, 56, 56, 56, 56, 56, 56,
+        56, 56, 56, 56, 56, 56, 56, 56,
+        56, 56, 56, 56, 56, 56, 56, 56,
+        56, 56, 56, 56, 56, 56, 56, 56,
+        56, 56, 56, 56, 56, 56, 56, 56,
+        5, 56, 61, 56, 56, 68, 61, 56,
+        56, 56, 4, 56, 56, 56, 56, 56,
+        56, 56, 56, 56, 56, 56, 56, 56,
+        56, 56, 56, 56, 56, 56, 56, 56,
+        56, 56, 56, 56, 56, 56, 56, 56,
+        56, 56, 56, 56, 56, 56, 56, 56,
+        56, 56, 56, 56, 56, 56, 68, 56,
+        73, 74, 74, 4, 5, 61, 56, 56,
+        56, 4, 56, 56, 56, 56, 56, 56,
+        56, 56, 56, 56, 56, 56, 56, 56,
+        56, 56, 56, 56, 56, 56, 56, 56,
+        56, 56, 56, 56, 56, 56, 56, 56,
+        56, 56, 56, 56, 56, 56, 56, 56,
+        56, 56, 56, 56, 56, 5, 56, 65,
+        75, 56, 1, 61, 56, 56, 56, 56,
+        56, 56, 56, 56, 56, 56, 56, 56,
+        56, 56, 56, 56, 56, 56, 56, 56,
+        56, 56, 56, 56, 56, 56, 56, 56,
+        56, 56, 56, 56, 56, 56, 56, 56,
+        56, 56, 56, 56, 56, 56, 56, 56,
+        56, 56, 56, 1, 56, 65, 56, 67,
+        67, 56, 1, 61, 56, 56, 56, 56,
+        56, 56, 56, 56, 56, 56, 56, 56,
+        56, 56, 56, 56, 56, 56, 56, 56,
+        56, 56, 56, 56, 56, 56, 56, 56,
+        56, 56, 56, 56, 56, 56, 56, 56,
+        56, 56, 56, 56, 56, 56, 56, 56,
+        56, 56, 56, 1, 56, 67, 75, 56,
+        1, 61, 56, 56, 56, 56, 56, 56,
+        56, 56, 56, 56, 56, 56, 56, 56,
+        56, 56, 56, 56, 56, 56, 56, 56,
+        56, 56, 56, 56, 56, 56, 56, 56,
+        56, 56, 56, 56, 56, 56, 56, 56,
+        56, 56, 56, 56, 56, 56, 56, 56,
+        56, 1, 56, 57, 58, 64, 64, 4,
+        5, 61, 56, 56, 56, 4, 56, 56,
+        62, 56, 56, 56, 56, 56, 56, 56,
+        56, 56, 56, 56, 56, 56, 56, 56,
+        56, 56, 56, 56, 56, 56, 56, 56,
+        56, 56, 56, 56, 56, 56, 56, 56,
+        56, 56, 56, 56, 56, 56, 56, 56,
+        56, 5, 56, 57, 58, 59, 64, 4,
+        5, 61, 56, 56, 8, 4, 56, 56,
+        62, 56, 56, 56, 56, 56, 56, 56,
+        56, 56, 56, 56, 56, 56, 56, 56,
+        56, 56, 56, 56, 56, 56, 56, 56,
+        56, 56, 56, 56, 56, 56, 56, 56,
+        56, 56, 56, 56, 56, 56, 56, 56,
+        56, 5, 56, 77, 78, 79, 80, 12,
+        13, 81, 76, 76, 18, 12, 76, 76,
+        82, 76, 76, 76, 76, 76, 76, 76,
+        76, 76, 76, 76, 76, 76, 76, 76,
+        76, 76, 76, 76, 76, 76, 76, 76,
+        76, 76, 76, 76, 76, 76, 76, 76,
+        76, 76, 76, 76, 76, 76, 76, 76,
+        76, 13, 76, 83, 78, 84, 80, 12,
+        13, 81, 76, 76, 76, 12, 76, 76,
+        82, 76, 76, 76, 76, 76, 76, 76,
+        76, 76, 76, 76, 76, 76, 76, 76,
+        76, 76, 76, 76, 76, 76, 76, 76,
+        76, 76, 76, 76, 76, 76, 76, 76,
+        76, 76, 76, 76, 76, 76, 76, 76,
+        76, 13, 76, 78, 84, 80, 12, 13,
+        81, 76, 76, 76, 12, 76, 76, 82,
+        76, 76, 76, 76, 76, 76, 76, 76,
+        76, 76, 76, 76, 76, 76, 76, 76,
+        76, 76, 76, 76, 76, 76, 76, 76,
+        76, 76, 76, 76, 76, 76, 76, 76,
+        76, 76, 76, 76, 76, 76, 76, 76,
+        13, 76, 85, 76, 76, 76, 86, 87,
+        76, 14, 81, 76, 76, 76, 76, 76,
+        85, 76, 76, 76, 76, 76, 76, 76,
+        76, 76, 76, 76, 76, 76, 76, 76,
+        76, 76, 76, 76, 76, 76, 76, 76,
+        76, 76, 76, 76, 76, 76, 76, 76,
+        76, 76, 76, 76, 76, 76, 76, 76,
+        76, 76, 14, 76, 88, 78, 89, 90,
+        12, 13, 81, 76, 76, 17, 12, 76,
+        76, 82, 76, 76, 76, 76, 76, 76,
+        76, 76, 76, 76, 76, 76, 76, 76,
+        76, 76, 76, 76, 76, 76, 76, 76,
+        76, 76, 76, 76, 76, 76, 76, 76,
+        76, 76, 76, 76, 76, 76, 76, 76,
+        76, 76, 13, 76, 91, 78, 84, 84,
+        12, 13, 81, 76, 76, 76, 12, 76,
+        76, 82, 76, 76, 76, 76, 76, 76,
+        76, 76, 76, 76, 76, 76, 76, 76,
+        76, 76, 76, 76, 76, 76, 76, 76,
+        76, 76, 76, 76, 76, 76, 76, 76,
+        76, 76, 76, 76, 76, 76, 76, 76,
+        76, 76, 13, 76, 78, 84, 84, 12,
+        13, 81, 76, 76, 76, 12, 76, 76,
+        82, 76, 76, 76, 76, 76, 76, 76,
+        76, 76, 76, 76, 76, 76, 76, 76,
+        76, 76, 76, 76, 76, 76, 76, 76,
+        76, 76, 76, 76, 76, 76, 76, 76,
+        76, 76, 76, 76, 76, 76, 76, 76,
+        76, 13, 76, 85, 76, 76, 76, 92,
+        87, 76, 14, 81, 76, 76, 76, 76,
+        76, 85, 76, 76, 76, 76, 76, 76,
+        76, 76, 76, 76, 76, 76, 76, 76,
+        76, 76, 76, 76, 76, 76, 76, 76,
+        76, 76, 76, 76, 76, 76, 76, 76,
+        76, 76, 76, 76, 76, 76, 76, 76,
+        76, 76, 76, 14, 76, 81, 76, 76,
+        93, 81, 76, 76, 76, 76, 76, 76,
+        76, 76, 76, 76, 76, 76, 76, 76,
+        76, 76, 76, 76, 76, 76, 76, 76,
+        76, 76, 76, 76, 76, 76, 76, 76,
+        76, 76, 76, 76, 76, 76, 76, 76,
+        76, 76, 76, 76, 76, 76, 76, 76,
+        76, 93, 76, 81, 76, 81, 76, 76,
+        76, 81, 76, 85, 76, 94, 76, 92,
+        92, 76, 14, 81, 76, 76, 76, 76,
+        76, 85, 76, 76, 76, 76, 76, 76,
+        76, 76, 76, 76, 76, 76, 76, 76,
+        76, 76, 76, 76, 76, 76, 76, 76,
+        76, 76, 76, 76, 76, 76, 76, 76,
+        76, 76, 76, 76, 76, 76, 76, 76,
+        76, 76, 76, 14, 76, 85, 76, 76,
+        76, 92, 92, 76, 14, 81, 76, 76,
+        76, 76, 76, 85, 76, 76, 76, 76,
+        76, 76, 76, 76, 76, 76, 76, 76,
+        76, 76, 76, 76, 76, 76, 76, 76,
+        76, 76, 76, 76, 76, 76, 76, 76,
+        76, 76, 76, 76, 76, 76, 76, 76,
+        76, 76, 76, 76, 76, 14, 76, 95,
+        96, 97, 97, 12, 13, 81, 76, 76,
+        76, 12, 76, 76, 76, 76, 76, 76,
+        76, 76, 76, 76, 76, 76, 76, 76,
+        76, 76, 76, 76, 76, 76, 76, 76,
+        76, 76, 76, 76, 76, 76, 76, 76,
+        76, 76, 76, 76, 76, 76, 76, 76,
+        76, 76, 76, 76, 76, 13, 76, 96,
+        97, 97, 12, 13, 81, 76, 76, 76,
+        12, 76, 76, 76, 76, 76, 76, 76,
+        76, 76, 76, 76, 76, 76, 76, 76,
+        76, 76, 76, 76, 76, 76, 76, 76,
+        76, 76, 76, 76, 76, 76, 76, 76,
+        76, 76, 76, 76, 76, 76, 76, 76,
+        76, 76, 76, 76, 13, 76, 97, 97,
+        12, 13, 81, 76, 76, 76, 12, 76,
+        76, 76, 76, 76, 76, 76, 76, 76,
+        76, 76, 76, 76, 76, 76, 76, 76,
+        76, 76, 76, 76, 76, 76, 76, 76,
+        76, 76, 76, 76, 76, 76, 76, 76,
+        76, 76, 76, 76, 76, 76, 76, 76,
+        76, 76, 13, 76, 81, 76, 76, 93,
+        81, 76, 76, 76, 12, 76, 76, 76,
+        76, 76, 76, 76, 76, 76, 76, 76,
+        76, 76, 76, 76, 76, 76, 76, 76,
+        76, 76, 76, 76, 76, 76, 76, 76,
+        76, 76, 76, 76, 76, 76, 76, 76,
+        76, 76, 76, 76, 76, 76, 76, 76,
+        93, 76, 98, 99, 99, 12, 13, 81,
+        76, 76, 76, 12, 76, 76, 76, 76,
+        76, 76, 76, 76, 76, 76, 76, 76,
+        76, 76, 76, 76, 76, 76, 76, 76,
+        76, 76, 76, 76, 76, 76, 76, 76,
+        76, 76, 76, 76, 76, 76, 76, 76,
+        76, 76, 76, 76, 76, 76, 76, 13,
+        76, 86, 100, 76, 14, 81, 76, 76,
+        76, 76, 76, 76, 76, 76, 76, 76,
+        76, 76, 76, 76, 76, 76, 76, 76,
+        76, 76, 76, 76, 76, 76, 76, 76,
+        76, 76, 76, 76, 76, 76, 76, 76,
+        76, 76, 76, 76, 76, 76, 76, 76,
+        76, 76, 76, 76, 76, 14, 76, 92,
+        92, 76, 14, 81, 76, 76, 76, 76,
+        76, 76, 76, 76, 76, 76, 76, 76,
+        76, 76, 76, 76, 76, 76, 76, 76,
+        76, 76, 76, 76, 76, 76, 76, 76,
+        76, 76, 76, 76, 76, 76, 76, 76,
+        76, 76, 76, 76, 76, 76, 76, 76,
+        76, 76, 76, 14, 76, 86, 76, 92,
+        92, 76, 14, 81, 76, 76, 76, 76,
+        76, 76, 76, 76, 76, 76, 76, 76,
+        76, 76, 76, 76, 76, 76, 76, 76,
+        76, 76, 76, 76, 76, 76, 76, 76,
+        76, 76, 76, 76, 76, 76, 76, 76,
+        76, 76, 76, 76, 76, 76, 76, 76,
+        76, 76, 76, 14, 76, 92, 100, 76,
+        14, 81, 76, 76, 76, 76, 76, 76,
+        76, 76, 76, 76, 76, 76, 76, 76,
+        76, 76, 76, 76, 76, 76, 76, 76,
+        76, 76, 76, 76, 76, 76, 76, 76,
+        76, 76, 76, 76, 76, 76, 76, 76,
+        76, 76, 76, 76, 76, 76, 76, 76,
+        76, 14, 76, 88, 78, 84, 84, 12,
+        13, 81, 76, 76, 76, 12, 76, 76,
+        82, 76, 76, 76, 76, 76, 76, 76,
+        76, 76, 76, 76, 76, 76, 76, 76,
+        76, 76, 76, 76, 76, 76, 76, 76,
+        76, 76, 76, 76, 76, 76, 76, 76,
+        76, 76, 76, 76, 76, 76, 76, 76,
+        76, 13, 76, 88, 78, 89, 84, 12,
+        13, 81, 76, 76, 17, 12, 76, 76,
+        82, 76, 76, 76, 76, 76, 76, 76,
+        76, 76, 76, 76, 76, 76, 76, 76,
+        76, 76, 76, 76, 76, 76, 76, 76,
+        76, 76, 76, 76, 76, 76, 76, 76,
+        76, 76, 76, 76, 76, 76, 76, 76,
+        76, 13, 76, 10, 11, 11, 12, 13,
+        76, 76, 76, 76, 12, 76, 76, 76,
+        76, 76, 76, 76, 76, 76, 76, 76,
+        76, 76, 76, 76, 76, 76, 76, 76,
+        76, 76, 76, 76, 76, 76, 76, 76,
+        76, 76, 76, 76, 76, 76, 76, 76,
+        76, 76, 76, 76, 76, 76, 76, 76,
+        13, 76, 77, 78, 84, 80, 12, 13,
+        81, 76, 76, 76, 12, 76, 76, 82,
+        76, 76, 76, 76, 76, 76, 76, 76,
+        76, 76, 76, 76, 76, 76, 76, 76,
+        76, 76, 76, 76, 76, 76, 76, 76,
+        76, 76, 76, 76, 76, 76, 76, 76,
+        76, 76, 76, 76, 76, 76, 76, 76,
+        13, 76, 102, 45, 103, 103, 22, 23,
+        48, 101, 101, 101, 22, 101, 101, 52,
+        101, 101, 101, 101, 101, 101, 101, 101,
+        101, 101, 101, 101, 101, 101, 101, 101,
+        101, 101, 101, 101, 101, 101, 101, 101,
+        101, 101, 101, 101, 101, 101, 101, 101,
+        101, 101, 101, 101, 101, 101, 101, 101,
+        23, 101, 45, 103, 103, 22, 23, 48,
+        101, 101, 101, 22, 101, 101, 52, 101,
+        101, 101, 101, 101, 101, 101, 101, 101,
+        101, 101, 101, 101, 101, 101, 101, 101,
+        101, 101, 101, 101, 101, 101, 101, 101,
+        101, 101, 101, 101, 101, 101, 101, 101,
+        101, 101, 101, 101, 101, 101, 101, 23,
+        101, 104, 101, 101, 101, 105, 106, 101,
+        25, 48, 101, 101, 101, 101, 101, 104,
+        101, 101, 101, 101, 101, 101, 101, 101,
+        101, 101, 101, 101, 101, 101, 101, 101,
+        101, 101, 101, 101, 101, 101, 101, 101,
+        101, 101, 101, 101, 101, 101, 101, 101,
+        101, 101, 101, 101, 101, 101, 101, 101,
+        101, 25, 101, 44, 45, 107, 108, 22,
+        23, 48, 101, 101, 24, 22, 101, 101,
+        52, 101, 101, 101, 101, 101, 101, 101,
+        101, 101, 101, 101, 101, 101, 101, 101,
+        101, 101, 101, 101, 101, 101, 101, 101,
+        101, 101, 101, 101, 101, 101, 101, 101,
+        101, 101, 101, 101, 101, 101, 101, 101,
+        101, 23, 101, 104, 101, 101, 101, 109,
+        106, 101, 25, 48, 101, 101, 101, 101,
+        101, 104, 101, 101, 101, 101, 101, 101,
+        101, 101, 101, 101, 101, 101, 101, 101,
+        101, 101, 101, 101, 101, 101, 101, 101,
+        101, 101, 101, 101, 101, 101, 101, 101,
+        101, 101, 101, 101, 101, 101, 101, 101,
+        101, 101, 101, 25, 101, 48, 101, 101,
+        110, 48, 101, 101, 101, 101, 101, 101,
+        101, 101, 101, 101, 101, 101, 101, 101,
+        101, 101, 101, 101, 101, 101, 101, 101,
+        101, 101, 101, 101, 101, 101, 101, 101,
+        101, 101, 101, 101, 101, 101, 101, 101,
+        101, 101, 101, 101, 101, 101, 101, 101,
+        101, 110, 101, 48, 101, 48, 101, 101,
+        101, 48, 101, 104, 101, 111, 101, 109,
+        109, 101, 25, 48, 101, 101, 101, 101,
+        101, 104, 101, 101, 101, 101, 101, 101,
+        101, 101, 101, 101, 101, 101, 101, 101,
+        101, 101, 101, 101, 101, 101, 101, 101,
+        101, 101, 101, 101, 101, 101, 101, 101,
+        101, 101, 101, 101, 101, 101, 101, 101,
+        101, 101, 101, 25, 101, 104, 101, 101,
+        101, 109, 109, 101, 25, 48, 101, 101,
+        101, 101, 101, 104, 101, 101, 101, 101,
+        101, 101, 101, 101, 101, 101, 101, 101,
+        101, 101, 101, 101, 101, 101, 101, 101,
+        101, 101, 101, 101, 101, 101, 101, 101,
+        101, 101, 101, 101, 101, 101, 101, 101,
+        101, 101, 101, 101, 101, 25, 101, 112,
+        113, 114, 114, 22, 23, 48, 101, 101,
+        101, 22, 101, 101, 101, 101, 101, 101,
+        101, 101, 101, 101, 101, 101, 101, 101,
+        101, 101, 101, 101, 101, 101, 101, 101,
+        101, 101, 101, 101, 101, 101, 101, 101,
+        101, 101, 101, 101, 101, 101, 101, 101,
+        101, 101, 101, 101, 101, 23, 101, 113,
+        114, 114, 22, 23, 48, 101, 101, 101,
+        22, 101, 101, 101, 101, 101, 101, 101,
+        101, 101, 101, 101, 101, 101, 101, 101,
+        101, 101, 101, 101, 101, 101, 101, 101,
+        101, 101, 101, 101, 101, 101, 101, 101,
+        101, 101, 101, 101, 101, 101, 101, 101,
+        101, 101, 101, 101, 23, 101, 114, 114,
+        22, 23, 48, 101, 101, 101, 22, 101,
+        101, 101, 101, 101, 101, 101, 101, 101,
+        101, 101, 101, 101, 101, 101, 101, 101,
+        101, 101, 101, 101, 101, 101, 101, 101,
+        101, 101, 101, 101, 101, 101, 101, 101,
+        101, 101, 101, 101, 101, 101, 101, 101,
+        101, 101, 23, 101, 48, 26, 26, 110,
+        48, 26, 26, 26, 22, 26, 26, 26,
+        26, 26, 26, 26, 26, 26, 26, 26,
+        26, 26, 26, 26, 26, 26, 26, 26,
+        26, 26, 26, 26, 26, 26, 26, 26,
+        26, 26, 26, 26, 26, 26, 26, 26,
+        26, 26, 26, 26, 26, 26, 26, 26,
+        110, 26, 44, 45, 103, 103, 22, 23,
+        48, 101, 101, 101, 22, 101, 101, 52,
+        101, 101, 101, 101, 101, 101, 101, 101,
+        101, 101, 101, 101, 101, 101, 101, 101,
+        101, 101, 101, 101, 101, 101, 101, 101,
+        101, 101, 101, 101, 101, 101, 101, 101,
+        101, 101, 101, 101, 101, 101, 101, 101,
+        23, 101, 115, 116, 116, 22, 23, 48,
+        101, 101, 101, 22, 101, 101, 101, 101,
+        101, 101, 101, 101, 101, 101, 101, 101,
+        101, 101, 101, 101, 101, 101, 101, 101,
+        101, 101, 101, 101, 101, 101, 101, 101,
+        101, 101, 101, 101, 101, 101, 101, 101,
+        101, 101, 101, 101, 101, 101, 101, 23,
+        101, 105, 117, 101, 25, 48, 101, 101,
+        101, 101, 101, 101, 101, 101, 101, 101,
+        101, 101, 101, 101, 101, 101, 101, 101,
+        101, 101, 101, 101, 101, 101, 101, 101,
+        101, 101, 101, 101, 101, 101, 101, 101,
+        101, 101, 101, 101, 101, 101, 101, 101,
+        101, 101, 101, 101, 101, 25, 101, 109,
+        109, 101, 25, 48, 101, 101, 101, 101,
+        101, 101, 101, 101, 101, 101, 101, 101,
+        101, 101, 101, 101, 101, 101, 101, 101,
+        101, 101, 101, 101, 101, 101, 101, 101,
+        101, 101, 101, 101, 101, 101, 101, 101,
+        101, 101, 101, 101, 101, 101, 101, 101,
+        101, 101, 101, 25, 101, 105, 101, 109,
+        109, 101, 25, 48, 101, 101, 101, 101,
+        101, 101, 101, 101, 101, 101, 101, 101,
+        101, 101, 101, 101, 101, 101, 101, 101,
+        101, 101, 101, 101, 101, 101, 101, 101,
+        101, 101, 101, 101, 101, 101, 101, 101,
+        101, 101, 101, 101, 101, 101, 101, 101,
+        101, 101, 101, 25, 101, 109, 117, 101,
+        25, 48, 101, 101, 101, 101, 101, 101,
+        101, 101, 101, 101, 101, 101, 101, 101,
+        101, 101, 101, 101, 101, 101, 101, 101,
+        101, 101, 101, 101, 101, 101, 101, 101,
+        101, 101, 101, 101, 101, 101, 101, 101,
+        101, 101, 101, 101, 101, 101, 101, 101,
+        101, 25, 101, 44, 45, 107, 103, 22,
+        23, 48, 101, 101, 24, 22, 101, 101,
+        52, 101, 101, 101, 101, 101, 101, 101,
+        101, 101, 101, 101, 101, 101, 101, 101,
+        101, 101, 101, 101, 101, 101, 101, 101,
+        101, 101, 101, 101, 101, 101, 101, 101,
+        101, 101, 101, 101, 101, 101, 101, 101,
+        101, 23, 101, 20, 21, 21, 22, 23,
+        118, 118, 118, 24, 22, 118, 118, 118,
+        118, 118, 118, 118, 118, 118, 118, 118,
+        118, 118, 118, 118, 118, 118, 118, 118,
+        118, 118, 118, 118, 118, 118, 118, 118,
+        118, 118, 118, 118, 118, 118, 118, 118,
+        118, 118, 118, 118, 118, 118, 118, 118,
+        23, 118, 20, 21, 21, 22, 23, 118,
+        118, 118, 118, 22, 118, 118, 118, 118,
+        118, 118, 118, 118, 118, 118, 118, 118,
+        118, 118, 118, 118, 118, 118, 118, 118,
+        118, 118, 118, 118, 118, 118, 118, 118,
+        118, 118, 118, 118, 118, 118, 118, 118,
+        118, 118, 118, 118, 118, 118, 118, 23,
+        118, 120, 121, 122, 123, 32, 33, 124,
+        119, 119, 34, 32, 119, 119, 125, 119,
+        119, 119, 119, 119, 119, 119, 119, 119,
+        119, 119, 119, 119, 119, 119, 119, 119,
+        119, 119, 119, 119, 119, 119, 119, 119,
+        119, 119, 119, 119, 119, 119, 119, 119,
+        119, 119, 119, 119, 119, 119, 119, 33,
+        119, 126, 121, 123, 123, 32, 33, 124,
+        119, 119, 119, 32, 119, 119, 125, 119,
+        119, 119, 119, 119, 119, 119, 119, 119,
+        119, 119, 119, 119, 119, 119, 119, 119,
+        119, 119, 119, 119, 119, 119, 119, 119,
+        119, 119, 119, 119, 119, 119, 119, 119,
+        119, 119, 119, 119, 119, 119, 119, 33,
+        119, 121, 123, 123, 32, 33, 124, 119,
+        119, 119, 32, 119, 119, 125, 119, 119,
+        119, 119, 119, 119, 119, 119, 119, 119,
+        119, 119, 119, 119, 119, 119, 119, 119,
+        119, 119, 119, 119, 119, 119, 119, 119,
+        119, 119, 119, 119, 119, 119, 119, 119,
+        119, 119, 119, 119, 119, 119, 33, 119,
+        127, 119, 119, 119, 128, 129, 119, 35,
+        124, 119, 119, 119, 119, 119, 127, 119,
+        119, 119, 119, 119, 119, 119, 119, 119,
+        119, 119, 119, 119, 119, 119, 119, 119,
+        119, 119, 119, 119, 119, 119, 119, 119,
+        119, 119, 119, 119, 119, 119, 119, 119,
+        119, 119, 119, 119, 119, 119, 119, 119,
+        35, 119, 120, 121, 122, 49, 32, 33,
+        124, 119, 119, 34, 32, 119, 119, 125,
+        119, 119, 119, 119, 119, 119, 119, 119,
+        119, 119, 119, 119, 119, 119, 119, 119,
+        119, 119, 119, 119, 119, 119, 119, 119,
+        119, 119, 119, 119, 119, 119, 119, 119,
+        119, 119, 119, 119, 119, 119, 119, 119,
+        33, 119, 127, 119, 119, 119, 130, 129,
+        119, 35, 124, 119, 119, 119, 119, 119,
+        127, 119, 119, 119, 119, 119, 119, 119,
+        119, 119, 119, 119, 119, 119, 119, 119,
+        119, 119, 119, 119, 119, 119, 119, 119,
+        119, 119, 119, 119, 119, 119, 119, 119,
+        119, 119, 119, 119, 119, 119, 119, 119,
+        119, 119, 35, 119, 124, 119, 119, 131,
+        124, 119, 119, 119, 119, 119, 119, 119,
+        119, 119, 119, 119, 119, 119, 119, 119,
+        119, 119, 119, 119, 119, 119, 119, 119,
+        119, 119, 119, 119, 119, 119, 119, 119,
+        119, 119, 119, 119, 119, 119, 119, 119,
+        119, 119, 119, 119, 119, 119, 119, 119,
+        131, 119, 124, 119, 124, 119, 119, 119,
+        124, 119, 127, 119, 132, 119, 130, 130,
+        119, 35, 124, 119, 119, 119, 119, 119,
+        127, 119, 119, 119, 119, 119, 119, 119,
+        119, 119, 119, 119, 119, 119, 119, 119,
+        119, 119, 119, 119, 119, 119, 119, 119,
+        119, 119, 119, 119, 119, 119, 119, 119,
+        119, 119, 119, 119, 119, 119, 119, 119,
+        119, 119, 35, 119, 127, 119, 119, 119,
+        130, 130, 119, 35, 124, 119, 119, 119,
+        119, 119, 127, 119, 119, 119, 119, 119,
+        119, 119, 119, 119, 119, 119, 119, 119,
+        119, 119, 119, 119, 119, 119, 119, 119,
+        119, 119, 119, 119, 119, 119, 119, 119,
+        119, 119, 119, 119, 119, 119, 119, 119,
+        119, 119, 119, 119, 35, 119, 133, 134,
+        135, 135, 32, 33, 124, 119, 119, 119,
+        32, 119, 119, 119, 119, 119, 119, 119,
+        119, 119, 119, 119, 119, 119, 119, 119,
+        119, 119, 119, 119, 119, 119, 119, 119,
+        119, 119, 119, 119, 119, 119, 119, 119,
+        119, 119, 119, 119, 119, 119, 119, 119,
+        119, 119, 119, 119, 33, 119, 134, 135,
+        135, 32, 33, 124, 119, 119, 119, 32,
+        119, 119, 119, 119, 119, 119, 119, 119,
+        119, 119, 119, 119, 119, 119, 119, 119,
+        119, 119, 119, 119, 119, 119, 119, 119,
+        119, 119, 119, 119, 119, 119, 119, 119,
+        119, 119, 119, 119, 119, 119, 119, 119,
+        119, 119, 119, 33, 119, 135, 135, 32,
+        33, 124, 119, 119, 119, 32, 119, 119,
+        119, 119, 119, 119, 119, 119, 119, 119,
+        119, 119, 119, 119, 119, 119, 119, 119,
+        119, 119, 119, 119, 119, 119, 119, 119,
+        119, 119, 119, 119, 119, 119, 119, 119,
+        119, 119, 119, 119, 119, 119, 119, 119,
+        119, 33, 119, 124, 119, 119, 131, 124,
+        119, 119, 119, 32, 119, 119, 119, 119,
+        119, 119, 119, 119, 119, 119, 119, 119,
+        119, 119, 119, 119, 119, 119, 119, 119,
+        119, 119, 119, 119, 119, 119, 119, 119,
+        119, 119, 119, 119, 119, 119, 119, 119,
+        119, 119, 119, 119, 119, 119, 119, 131,
+        119, 120, 121, 123, 123, 32, 33, 124,
+        119, 119, 119, 32, 119, 119, 125, 119,
+        119, 119, 119, 119, 119, 119, 119, 119,
+        119, 119, 119, 119, 119, 119, 119, 119,
+        119, 119, 119, 119, 119, 119, 119, 119,
+        119, 119, 119, 119, 119, 119, 119, 119,
+        119, 119, 119, 119, 119, 119, 119, 33,
+        119, 136, 137, 137, 32, 33, 124, 119,
+        119, 119, 32, 119, 119, 119, 119, 119,
+        119, 119, 119, 119, 119, 119, 119, 119,
+        119, 119, 119, 119, 119, 119, 119, 119,
+        119, 119, 119, 119, 119, 119, 119, 119,
+        119, 119, 119, 119, 119, 119, 119, 119,
+        119, 119, 119, 119, 119, 119, 33, 119,
+        128, 138, 119, 35, 124, 119, 119, 119,
+        119, 119, 119, 119, 119, 119, 119, 119,
+        119, 119, 119, 119, 119, 119, 119, 119,
+        119, 119, 119, 119, 119, 119, 119, 119,
+        119, 119, 119, 119, 119, 119, 119, 119,
+        119, 119, 119, 119, 119, 119, 119, 119,
+        119, 119, 119, 119, 35, 119, 130, 130,
+        119, 35, 124, 119, 119, 119, 119, 119,
+        119, 119, 119, 119, 119, 119, 119, 119,
+        119, 119, 119, 119, 119, 119, 119, 119,
+        119, 119, 119, 119, 119, 119, 119, 119,
+        119, 119, 119, 119, 119, 119, 119, 119,
+        119, 119, 119, 119, 119, 119, 119, 119,
+        119, 119, 35, 119, 128, 119, 130, 130,
+        119, 35, 124, 119, 119, 119, 119, 119,
+        119, 119, 119, 119, 119, 119, 119, 119,
+        119, 119, 119, 119, 119, 119, 119, 119,
+        119, 119, 119, 119, 119, 119, 119, 119,
+        119, 119, 119, 119, 119, 119, 119, 119,
+        119, 119, 119, 119, 119, 119, 119, 119,
+        119, 119, 35, 119, 130, 138, 119, 35,
+        124, 119, 119, 119, 119, 119, 119, 119,
+        119, 119, 119, 119, 119, 119, 119, 119,
+        119, 119, 119, 119, 119, 119, 119, 119,
+        119, 119, 119, 119, 119, 119, 119, 119,
+        119, 119, 119, 119, 119, 119, 119, 119,
+        119, 119, 119, 119, 119, 119, 119, 119,
+        35, 119, 42, 43, 44, 45, 107, 103,
+        22, 23, 48, 49, 49, 24, 22, 101,
+        42, 52, 101, 101, 101, 101, 101, 101,
+        101, 101, 101, 101, 101, 101, 101, 101,
+        101, 101, 101, 101, 101, 101, 101, 101,
+        101, 101, 101, 101, 101, 101, 101, 101,
+        101, 101, 101, 101, 101, 101, 101, 101,
+        101, 101, 23, 101, 57, 139, 59, 60,
+        4, 5, 61, 56, 56, 8, 4, 56,
+        56, 62, 56, 56, 56, 56, 56, 56,
+        56, 56, 56, 56, 56, 56, 56, 56,
+        56, 56, 56, 56, 56, 56, 56, 56,
+        56, 56, 56, 56, 56, 56, 56, 56,
+        56, 56, 56, 56, 56, 56, 56, 56,
+        56, 56, 5, 56, 42, 43, 44, 45,
+        140, 141, 22, 142, 143, 56, 49, 24,
+        22, 56, 42, 52, 56, 56, 56, 56,
+        56, 56, 56, 56, 56, 56, 56, 56,
+        56, 56, 56, 56, 56, 56, 56, 56,
+        56, 56, 56, 56, 56, 56, 56, 56,
+        56, 56, 56, 56, 56, 56, 56, 56,
+        56, 56, 56, 56, 142, 56, 20, 144,
+        144, 22, 142, 61, 56, 56, 24, 22,
+        56, 56, 56, 56, 56, 56, 56, 56,
+        56, 56, 56, 56, 56, 56, 56, 56,
+        56, 56, 56, 56, 56, 56, 56, 56,
+        56, 56, 56, 56, 56, 56, 56, 56,
+        56, 56, 56, 56, 56, 56, 56, 56,
+        56, 56, 56, 142, 56, 61, 56, 56,
+        68, 61, 56, 56, 56, 22, 56, 56,
+        56, 56, 56, 56, 56, 56, 56, 56,
+        56, 56, 56, 56, 56, 56, 56, 56,
+        56, 56, 56, 56, 56, 56, 56, 56,
+        56, 56, 56, 56, 56, 56, 56, 56,
+        56, 56, 56, 56, 56, 56, 56, 56,
+        56, 68, 56, 143, 56, 56, 145, 143,
+        56, 56, 56, 22, 56, 56, 56, 56,
+        56, 56, 56, 56, 56, 56, 56, 56,
+        56, 56, 56, 56, 56, 56, 56, 56,
+        56, 56, 56, 56, 56, 56, 56, 56,
+        56, 56, 56, 56, 56, 56, 56, 56,
+        56, 56, 56, 56, 56, 56, 56, 145,
+        56, 143, 56, 143, 56, 56, 56, 143,
+        56, 42, 56, 69, 20, 144, 144, 22,
+        142, 61, 56, 56, 56, 22, 56, 42,
+        56, 56, 56, 56, 56, 56, 56, 56,
+        56, 56, 56, 56, 56, 56, 56, 56,
+        56, 56, 56, 56, 56, 56, 56, 56,
+        56, 56, 56, 56, 56, 56, 56, 56,
+        56, 56, 56, 56, 56, 56, 56, 56,
+        56, 142, 56, 147, 146, 148, 148, 146,
+        40, 149, 146, 146, 146, 146, 146, 146,
+        146, 146, 146, 146, 146, 146, 146, 146,
+        146, 146, 146, 146, 146, 146, 146, 146,
+        146, 146, 146, 146, 146, 146, 146, 146,
+        146, 146, 146, 146, 146, 146, 146, 146,
+        146, 146, 146, 146, 146, 146, 146, 146,
+        146, 40, 146, 148, 148, 146, 40, 149,
+        146, 146, 146, 146, 146, 146, 146, 146,
+        146, 146, 146, 146, 146, 146, 146, 146,
+        146, 146, 146, 146, 146, 146, 146, 146,
+        146, 146, 146, 146, 146, 146, 146, 146,
+        146, 146, 146, 146, 146, 146, 146, 146,
+        146, 146, 146, 146, 146, 146, 146, 40,
+        146, 149, 146, 146, 150, 149, 146, 146,
+        146, 146, 146, 146, 146, 146, 146, 146,
+        146, 146, 146, 146, 146, 146, 146, 146,
+        146, 146, 146, 146, 146, 146, 146, 146,
+        146, 146, 146, 146, 146, 146, 146, 146,
+        146, 146, 146, 146, 146, 146, 146, 146,
+        146, 146, 146, 146, 146, 150, 146, 149,
+        146, 149, 146, 146, 146, 149, 146, 42,
+        118, 118, 118, 118, 118, 118, 118, 118,
+        49, 118, 118, 118, 118, 42, 118, 0
 };
 
 static const unsigned char _indic_syllable_machine_trans_targs[] = {
@@ -330,41 +996,41 @@ static const unsigned char _indic_syllable_machine_trans_targs[] = {
         93, 84, 31, 19, 98, 31, 107, 24,
         113, 116, 117, 108, 26, 122, 127, 31,
         134, 31, 32, 53, 79, 81, 100, 101,
-        85, 102, 123, 124, 94, 132, 137, 31,
-        33, 35, 6, 52, 38, 47, 34, 1,
-        36, 40, 0, 39, 41, 44, 45, 3,
-        48, 5, 49, 31, 54, 56, 14, 77,
-        62, 70, 55, 7, 57, 72, 64, 58,
-        13, 76, 59, 8, 63, 65, 67, 68,
-        10, 71, 12, 73, 31, 80, 20, 82,
-        96, 87, 15, 99, 16, 86, 88, 90,
-        91, 18, 95, 21, 97, 31, 31, 103,
-        105, 22, 27, 109, 118, 104, 106, 120,
-        111, 23, 110, 112, 114, 115, 25, 119,
-        28, 121, 125, 126, 131, 128, 129, 29,
-        130, 31, 133, 30, 135, 136
+        85, 102, 123, 124, 94, 132, 137, 92,
+        31, 33, 35, 6, 52, 38, 47, 34,
+        1, 36, 40, 0, 39, 41, 44, 45,
+        3, 48, 5, 49, 31, 54, 56, 14,
+        77, 62, 70, 55, 7, 57, 72, 64,
+        58, 13, 76, 59, 8, 63, 65, 67,
+        68, 10, 71, 12, 73, 31, 80, 20,
+        82, 96, 87, 15, 99, 16, 86, 88,
+        90, 91, 18, 95, 21, 97, 31, 31,
+        103, 105, 22, 27, 109, 118, 104, 106,
+        120, 111, 23, 110, 112, 114, 115, 25,
+        119, 28, 121, 125, 126, 131, 128, 129,
+        29, 130, 31, 133, 30, 135, 136
 };
 
 static const char _indic_syllable_machine_trans_actions[] = {
         1, 0, 2, 0, 2, 0, 0, 2,
         2, 3, 2, 0, 2, 0, 0, 0,
-        2, 2, 2, 4, 2, 0, 5, 0,
+        2, 2, 2, 4, 2, 0, 5, 5,
         5, 0, 6, 0, 2, 7, 2, 0,
         2, 0, 2, 0, 0, 2, 0, 8,
         0, 11, 2, 2, 5, 0, 12, 12,
         0, 2, 5, 2, 5, 2, 0, 13,
-        2, 0, 0, 2, 0, 2, 2, 0,
-        2, 2, 0, 0, 2, 2, 2, 0,
-        0, 0, 2, 14, 2, 0, 0, 2,
-        0, 2, 2, 0, 2, 2, 2, 2,
+        14, 2, 0, 0, 2, 0, 2, 2,
         0, 2, 2, 0, 0, 2, 2, 2,
-        0, 0, 0, 2, 15, 5, 0, 5,
-        2, 2, 0, 5, 0, 0, 2, 5,
-        5, 0, 0, 0, 2, 16, 17, 2,
-        0, 0, 0, 0, 2, 2, 2, 2,
-        2, 0, 0, 2, 2, 2, 0, 0,
-        0, 2, 0, 18, 18, 0, 0, 0,
-        0, 19, 2, 0, 0, 0
+        0, 0, 0, 2, 15, 2, 0, 0,
+        2, 0, 2, 2, 0, 2, 2, 2,
+        2, 0, 2, 2, 0, 0, 2, 2,
+        2, 0, 0, 0, 2, 16, 5, 0,
+        5, 2, 2, 0, 5, 0, 0, 2,
+        5, 5, 0, 0, 0, 2, 17, 18,
+        2, 0, 0, 0, 0, 2, 2, 2,
+        2, 2, 0, 0, 2, 2, 2, 0,
+        0, 0, 2, 0, 19, 19, 0, 0,
+        0, 0, 20, 2, 0, 0, 0
 };
 
 static const char _indic_syllable_machine_to_state_actions[] = {
@@ -414,20 +1080,20 @@ static const short _indic_syllable_machine_eof_trans[] = {
         10, 10, 10, 10, 10, 10, 10, 20,
         20, 27, 20, 27, 20, 20, 30, 30,
         30, 30, 30, 30, 30, 1, 40, 0,
-        56, 56, 56, 56, 56, 56, 56, 56,
-        56, 56, 56, 56, 56, 56, 56, 56,
-        56, 56, 56, 56, 56, 76, 76, 76,
-        76, 76, 76, 76, 76, 76, 76, 76,
-        76, 76, 76, 76, 76, 76, 76, 76,
-        76, 76, 76, 76, 76, 76, 76, 101,
-        101, 101, 101, 101, 101, 101, 101, 101,
-        101, 101, 101, 101, 101, 101, 101, 101,
-        101, 101, 101, 101, 118, 118, 119, 119,
-        119, 119, 119, 119, 119, 119, 119, 119,
-        119, 119, 119, 119, 119, 119, 119, 119,
-        119, 119, 119, 101, 56, 56, 56, 56,
-        56, 56, 56, 56, 146, 146, 146, 146,
-        146, 118
+        57, 57, 57, 57, 57, 57, 57, 57,
+        57, 57, 57, 57, 57, 57, 57, 57,
+        57, 57, 57, 57, 57, 77, 77, 77,
+        77, 77, 77, 77, 77, 77, 77, 77,
+        77, 77, 77, 77, 77, 77, 77, 77,
+        77, 77, 77, 77, 77, 77, 77, 102,
+        102, 102, 102, 102, 102, 102, 102, 102,
+        102, 102, 102, 102, 27, 102, 102, 102,
+        102, 102, 102, 102, 119, 119, 120, 120,
+        120, 120, 120, 120, 120, 120, 120, 120,
+        120, 120, 120, 120, 120, 120, 120, 120,
+        120, 120, 120, 102, 57, 57, 57, 57,
+        57, 57, 57, 57, 147, 147, 147, 147,
+        147, 119
 };
 
 static const int indic_syllable_machine_start = 31;
@@ -441,7 +1107,7 @@ static const int indic_syllable_machine_en_main = 31;
 
 
 
-#line 118 "hb-ot-shaper-indic-machine.rl"
+#line 121 "hb-ot-shaper-indic-machine.rl"
 
 
 #define found_syllable(syllable_type) \
@@ -460,7 +1126,7 @@ find_syllables_indic (hb_buffer_t *buffer)
   int cs;
   hb_glyph_info_t *info = buffer->info;
 
-#line 464 "hb-ot-shaper-indic-machine.hh"
+#line 1130 "hb-ot-shaper-indic-machine.hh"
         {
         cs = indic_syllable_machine_start;
         ts = 0;
@@ -468,7 +1134,7 @@ find_syllables_indic (hb_buffer_t *buffer)
         act = 0;
         }
 
-#line 138 "hb-ot-shaper-indic-machine.rl"
+#line 141 "hb-ot-shaper-indic-machine.rl"
 
 
   p = 0;
@@ -476,7 +1142,7 @@ find_syllables_indic (hb_buffer_t *buffer)
 
   unsigned int syllable_serial = 1;
 
-#line 480 "hb-ot-shaper-indic-machine.hh"
+#line 1146 "hb-ot-shaper-indic-machine.hh"
         {
         int _slen;
         int _trans;
@@ -490,7 +1156,7 @@ _resume:
 #line 1 "NONE"
         {ts = p;}
         break;
-#line 494 "hb-ot-shaper-indic-machine.hh"
+#line 1160 "hb-ot-shaper-indic-machine.hh"
         }
 
         _keys = _indic_syllable_machine_trans_keys + (cs<<1);
@@ -513,51 +1179,51 @@ _eof_trans:
         {te = p+1;}
         break;
         case 11:
-#line 114 "hb-ot-shaper-indic-machine.rl"
+#line 117 "hb-ot-shaper-indic-machine.rl"
         {te = p+1;{ found_syllable (indic_non_indic_cluster); }}
         break;
-        case 13:
-#line 109 "hb-ot-shaper-indic-machine.rl"
+        case 14:
+#line 111 "hb-ot-shaper-indic-machine.rl"
         {te = p;p--;{ found_syllable (indic_consonant_syllable); }}
         break;
-        case 14:
-#line 110 "hb-ot-shaper-indic-machine.rl"
+        case 15:
+#line 112 "hb-ot-shaper-indic-machine.rl"
         {te = p;p--;{ found_syllable (indic_vowel_syllable); }}
         break;
-        case 17:
-#line 111 "hb-ot-shaper-indic-machine.rl"
+        case 18:
+#line 113 "hb-ot-shaper-indic-machine.rl"
         {te = p;p--;{ found_syllable (indic_standalone_cluster); }}
         break;
-        case 19:
-#line 112 "hb-ot-shaper-indic-machine.rl"
+        case 20:
+#line 114 "hb-ot-shaper-indic-machine.rl"
         {te = p;p--;{ found_syllable (indic_symbol_cluster); }}
         break;
-        case 15:
-#line 113 "hb-ot-shaper-indic-machine.rl"
+        case 16:
+#line 116 "hb-ot-shaper-indic-machine.rl"
         {te = p;p--;{ found_syllable (indic_broken_cluster); buffer->scratch_flags |= HB_BUFFER_SCRATCH_FLAG_HAS_BROKEN_SYLLABLE; }}
         break;
-        case 16:
-#line 114 "hb-ot-shaper-indic-machine.rl"
+        case 17:
+#line 117 "hb-ot-shaper-indic-machine.rl"
         {te = p;p--;{ found_syllable (indic_non_indic_cluster); }}
         break;
         case 1:
-#line 109 "hb-ot-shaper-indic-machine.rl"
+#line 111 "hb-ot-shaper-indic-machine.rl"
         {{p = ((te))-1;}{ found_syllable (indic_consonant_syllable); }}
         break;
         case 3:
-#line 110 "hb-ot-shaper-indic-machine.rl"
+#line 112 "hb-ot-shaper-indic-machine.rl"
         {{p = ((te))-1;}{ found_syllable (indic_vowel_syllable); }}
         break;
         case 7:
-#line 111 "hb-ot-shaper-indic-machine.rl"
+#line 113 "hb-ot-shaper-indic-machine.rl"
         {{p = ((te))-1;}{ found_syllable (indic_standalone_cluster); }}
         break;
         case 8:
-#line 112 "hb-ot-shaper-indic-machine.rl"
+#line 114 "hb-ot-shaper-indic-machine.rl"
         {{p = ((te))-1;}{ found_syllable (indic_symbol_cluster); }}
         break;
         case 4:
-#line 113 "hb-ot-shaper-indic-machine.rl"
+#line 116 "hb-ot-shaper-indic-machine.rl"
         {{p = ((te))-1;}{ found_syllable (indic_broken_cluster); buffer->scratch_flags |= HB_BUFFER_SCRATCH_FLAG_HAS_BROKEN_SYLLABLE; }}
         break;
         case 6:
@@ -567,33 +1233,42 @@ _eof_trans:
         {{p = ((te))-1;} found_syllable (indic_consonant_syllable); }
         break;
         case 5:
-        {{p = ((te))-1;} found_syllable (indic_broken_cluster); buffer->scratch_flags |= HB_BUFFER_SCRATCH_FLAG_HAS_BROKEN_SYLLABLE; }
+        {{p = ((te))-1;} found_syllable (indic_non_indic_cluster); }
         break;
         case 6:
+        {{p = ((te))-1;} found_syllable (indic_broken_cluster); buffer->scratch_flags |= HB_BUFFER_SCRATCH_FLAG_HAS_BROKEN_SYLLABLE; }
+        break;
+        case 7:
         {{p = ((te))-1;} found_syllable (indic_non_indic_cluster); }
         break;
         }
         }
         break;
-        case 18:
+        case 19:
 #line 1 "NONE"
         {te = p+1;}
-#line 109 "hb-ot-shaper-indic-machine.rl"
+#line 111 "hb-ot-shaper-indic-machine.rl"
         {act = 1;}
         break;
+        case 13:
+#line 1 "NONE"
+        {te = p+1;}
+#line 115 "hb-ot-shaper-indic-machine.rl"
+        {act = 5;}
+        break;
         case 5:
 #line 1 "NONE"
         {te = p+1;}
-#line 113 "hb-ot-shaper-indic-machine.rl"
-        {act = 5;}
+#line 116 "hb-ot-shaper-indic-machine.rl"
+        {act = 6;}
         break;
         case 12:
 #line 1 "NONE"
         {te = p+1;}
-#line 114 "hb-ot-shaper-indic-machine.rl"
-        {act = 6;}
+#line 117 "hb-ot-shaper-indic-machine.rl"
+        {act = 7;}
         break;
-#line 597 "hb-ot-shaper-indic-machine.hh"
+#line 1272 "hb-ot-shaper-indic-machine.hh"
         }
 
 _again:
@@ -602,7 +1277,7 @@ _again:
 #line 1 "NONE"
         {ts = 0;}
         break;
-#line 606 "hb-ot-shaper-indic-machine.hh"
+#line 1281 "hb-ot-shaper-indic-machine.hh"
         }
 
         if ( ++p != pe )
@@ -618,7 +1293,7 @@ _again:
 
         }
 
-#line 146 "hb-ot-shaper-indic-machine.rl"
+#line 149 "hb-ot-shaper-indic-machine.rl"
 
 }
 
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-ot-shaper-indic-table.cc b/src/java.desktop/share/native/libharfbuzz/hb-ot-shaper-indic-table.cc
index d9899a633c1..b87c530853b 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-ot-shaper-indic-table.cc
+++ b/src/java.desktop/share/native/libharfbuzz/hb-ot-shaper-indic-table.cc
@@ -6,12 +6,12 @@
  *
  * on files with these headers:
  *
- * # IndicSyllabicCategory-15.1.0.txt
- * # Date: 2023-01-05
- * # IndicPositionalCategory-15.1.0.txt
- * # Date: 2023-01-05
- * # Blocks-15.1.0.txt
- * # Date: 2023-07-28, 15:47:20 GMT
+ * # IndicSyllabicCategory-16.0.0.txt
+ * # Date: 2024-04-30, 21:48:21 GMT
+ * # IndicPositionalCategory-16.0.0.txt
+ * # Date: 2024-04-30, 21:48:21 GMT
+ * # Blocks-16.0.0.txt
+ * # Date: 2024-02-02
  */
 
 #include "hb.hh"
@@ -48,6 +48,7 @@
 #define OT_CM I_Cat(CM)
 #define OT_Symbol I_Cat(Symbol)
 #define OT_CS I_Cat(CS)
+#define OT_SMPst I_Cat(SMPst)
 /* khmer */
 #define OT_VAbv K_Cat(VAbv)
 #define OT_VBlw K_Cat(VBlw)
@@ -89,12 +90,13 @@ static_assert (OT_VPst == M_Cat(VPst), "");
 #define _OT_MW   OT_MW           /*   2 chars; MW */
 #define _OT_MY   OT_MY           /*   3 chars; MY */
 #define _OT_N    OT_N            /*  17 chars; N */
-#define _OT_GB   OT_PLACEHOLDER  /* 165 chars; PLACEHOLDER */
+#define _OT_GB   OT_PLACEHOLDER  /* 185 chars; PLACEHOLDER */
 #define _OT_PT   OT_PT           /*   8 chars; PT */
 #define _OT_R    OT_Ra           /*  14 chars; Ra */
 #define _OT_Rf   OT_Repha        /*   1 chars; Repha */
 #define _OT_Rt   OT_Robatic      /*   3 chars; Robatic */
-#define _OT_SM   OT_SM           /*  56 chars; SM */
+#define _OT_SM   OT_SM           /*  50 chars; SM */
+#define _OT_SP   OT_SMPst        /*   6 chars; SMPst */
 #define _OT_S    OT_Symbol       /*  22 chars; Symbol */
 #define _OT_V    OT_V            /* 172 chars; V */
 #define _OT_VA   OT_VAbv         /*  18 chars; VAbv */
@@ -112,7 +114,7 @@ static_assert (OT_VPst == M_Cat(VPst), "");
 #define _POS_A   POS_AFTER_MAIN  /*   3 chars; AFTER_MAIN */
 #define _POS_AP  POS_AFTER_POST  /*  50 chars; AFTER_POST */
 #define _POS_AS  POS_AFTER_SUB   /*  51 chars; AFTER_SUB */
-#define _POS_C   POS_BASE_C      /* 833 chars; BASE_C */
+#define _POS_C   POS_BASE_C      /* 853 chars; BASE_C */
 #define _POS_BS  POS_BEFORE_SUB  /*  25 chars; BEFORE_SUB */
 #define _POS_B   POS_BELOW_C     /*  13 chars; BELOW_C */
 #define _POS_X   POS_END         /*  71 chars; END */
@@ -145,7 +147,7 @@ static const uint16_t indic_table[] = {
 
   /* Latin-1 Supplement */
 
-  /* 00B0 */  _(X,X),  _(X,X),_(SM,SM),_(SM,SM),  _(X,X),  _(X,X),  _(X,X),  _(X,X),
+  /* 00B0 */  _(X,X),  _(X,X),_(SP,SM),_(SP,SM),  _(X,X),  _(X,X),  _(X,X),  _(X,X),
   /* 00B8 */  _(X,X),  _(X,X),  _(X,X),  _(X,X),  _(X,X),  _(X,X),  _(X,X),  _(X,X),
   /* 00C0 */  _(X,X),  _(X,X),  _(X,X),  _(X,X),  _(X,X),  _(X,X),  _(X,X),  _(X,X),
   /* 00C8 */  _(X,X),  _(X,X),  _(X,X),  _(X,X),  _(X,X),  _(X,X),  _(X,X),  _(X,X),
@@ -398,9 +400,9 @@ static const uint16_t indic_table[] = {
 
   /* Superscripts and Subscripts */
 
-  /* 2070 */  _(X,X),  _(X,X),  _(X,X),  _(X,X),_(SM,SM),  _(X,X),  _(X,X),  _(X,X),
+  /* 2070 */  _(X,X),  _(X,X),  _(X,X),  _(X,X),_(SP,SM),  _(X,X),  _(X,X),  _(X,X),
   /* 2078 */  _(X,X),  _(X,X),  _(X,X),  _(X,X),  _(X,X),  _(X,X),  _(X,X),  _(X,X),
-  /* 2080 */  _(X,X),  _(X,X),_(SM,SM),_(SM,SM),_(SM,SM),  _(X,X),  _(X,X),  _(X,X),
+  /* 2080 */  _(X,X),  _(X,X),_(SP,SM),_(SP,SM),_(SP,SM),  _(X,X),  _(X,X),  _(X,X),
 
 #define indic_offset_0x25f8u 1592
 
@@ -458,7 +460,16 @@ static const uint16_t indic_table[] = {
 
   /* 11338 */  _(X,X),  _(X,X),  _(X,X),  _(N,X),  _(N,X),  _(X,X),  _(X,X),  _(X,X),
 
-}; /* Table items: 1728; occupancy: 71% */
+#define indic_offset_0x116d0u 1728
+
+
+  /* Myanmar Extended-C */
+
+  /* 116D0 */ _(GB,C), _(GB,C), _(GB,C), _(GB,C), _(GB,C), _(GB,C), _(GB,C), _(GB,C),
+  /* 116D8 */ _(GB,C), _(GB,C), _(GB,C), _(GB,C), _(GB,C), _(GB,C), _(GB,C), _(GB,C),
+  /* 116E0 */ _(GB,C), _(GB,C), _(GB,C), _(GB,C),  _(X,X),  _(X,X),  _(X,X),  _(X,X),
+
+}; /* Table items: 1752; occupancy: 71% */
 
 uint16_t
 hb_indic_get_categories (hb_codepoint_t u)
@@ -498,6 +509,7 @@ hb_indic_get_categories (hb_codepoint_t u)
     case 0x11u:
       if (hb_in_range<hb_codepoint_t> (u, 0x11300u, 0x11307u)) return indic_table[u - 0x11300u + indic_offset_0x11300u];
       if (hb_in_range<hb_codepoint_t> (u, 0x11338u, 0x1133Fu)) return indic_table[u - 0x11338u + indic_offset_0x11338u];
+      if (hb_in_range<hb_codepoint_t> (u, 0x116D0u, 0x116E7u)) return indic_table[u - 0x116D0u + indic_offset_0x116d0u];
       break;
 
     default:
@@ -530,6 +542,7 @@ hb_indic_get_categories (hb_codepoint_t u)
 #undef _OT_Rf
 #undef _OT_Rt
 #undef _OT_SM
+#undef _OT_SP
 #undef _OT_S
 #undef _OT_V
 #undef _OT_VA
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-ot-shaper-myanmar-machine.hh b/src/java.desktop/share/native/libharfbuzz/hb-ot-shaper-myanmar-machine.hh
index 3dcf61b938f..64eb761b4ea 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-ot-shaper-myanmar-machine.hh
+++ b/src/java.desktop/share/native/libharfbuzz/hb-ot-shaper-myanmar-machine.hh
@@ -68,6 +68,7 @@ enum myanmar_syllable_type_t {
 #define myanmar_syllable_machine_ex_PT 39u
 #define myanmar_syllable_machine_ex_Ra 15u
 #define myanmar_syllable_machine_ex_SM 8u
+#define myanmar_syllable_machine_ex_SMPst 57u
 #define myanmar_syllable_machine_ex_VAbv 20u
 #define myanmar_syllable_machine_ex_VBlw 21u
 #define myanmar_syllable_machine_ex_VPre 22u
@@ -77,35 +78,35 @@ enum myanmar_syllable_type_t {
 #define myanmar_syllable_machine_ex_ZWNJ 5u
 
 
-#line 81 "hb-ot-shaper-myanmar-machine.hh"
+#line 82 "hb-ot-shaper-myanmar-machine.hh"
 static const unsigned char _myanmar_syllable_machine_trans_keys[] = {
-        1u, 41u, 3u, 41u, 5u, 39u, 5u, 8u, 3u, 41u, 3u, 39u, 3u, 39u, 5u, 39u,
-        5u, 39u, 3u, 39u, 3u, 39u, 3u, 41u, 5u, 39u, 1u, 15u, 3u, 39u, 3u, 39u,
-        3u, 40u, 3u, 39u, 3u, 41u, 3u, 41u, 3u, 39u, 3u, 41u, 3u, 41u, 3u, 41u,
-        3u, 41u, 3u, 41u, 5u, 39u, 5u, 8u, 3u, 41u, 3u, 39u, 3u, 39u, 5u, 39u,
-        5u, 39u, 3u, 39u, 3u, 39u, 3u, 41u, 5u, 39u, 1u, 15u, 3u, 41u, 3u, 39u,
-        3u, 39u, 3u, 40u, 3u, 39u, 3u, 41u, 3u, 41u, 3u, 39u, 3u, 41u, 3u, 41u,
-        3u, 41u, 3u, 41u, 3u, 41u, 3u, 41u, 3u, 41u, 1u, 41u, 1u, 15u, 0
+        1u, 57u, 3u, 57u, 5u, 57u, 5u, 57u, 3u, 57u, 5u, 57u, 3u, 57u, 3u, 57u,
+        3u, 57u, 3u, 57u, 3u, 57u, 5u, 57u, 1u, 15u, 3u, 57u, 3u, 57u, 3u, 57u,
+        3u, 57u, 3u, 57u, 3u, 57u, 3u, 57u, 3u, 57u, 3u, 57u, 3u, 57u, 3u, 57u,
+        3u, 57u, 5u, 57u, 5u, 57u, 3u, 57u, 5u, 57u, 3u, 57u, 3u, 57u, 3u, 57u,
+        3u, 57u, 3u, 57u, 5u, 57u, 1u, 15u, 3u, 57u, 3u, 57u, 3u, 57u, 3u, 57u,
+        3u, 57u, 3u, 57u, 3u, 57u, 3u, 57u, 3u, 57u, 3u, 57u, 3u, 57u, 3u, 57u,
+        3u, 57u, 3u, 57u, 3u, 57u, 1u, 57u, 1u, 15u, 0
 };
 
 static const char _myanmar_syllable_machine_key_spans[] = {
-        41, 39, 35, 4, 39, 37, 37, 35,
-        35, 37, 37, 39, 35, 15, 37, 37,
-        38, 37, 39, 39, 37, 39, 39, 39,
-        39, 39, 35, 4, 39, 37, 37, 35,
-        35, 37, 37, 39, 35, 15, 39, 37,
-        37, 38, 37, 39, 39, 37, 39, 39,
-        39, 39, 39, 39, 39, 41, 15
+        57, 55, 53, 53, 55, 53, 55, 55,
+        55, 55, 55, 53, 15, 55, 55, 55,
+        55, 55, 55, 55, 55, 55, 55, 55,
+        55, 53, 53, 55, 53, 55, 55, 55,
+        55, 55, 53, 15, 55, 55, 55, 55,
+        55, 55, 55, 55, 55, 55, 55, 55,
+        55, 55, 55, 57, 15
 };
 
 static const short _myanmar_syllable_machine_index_offsets[] = {
-        0, 42, 82, 118, 123, 163, 201, 239,
-        275, 311, 349, 387, 427, 463, 479, 517,
-        555, 594, 632, 672, 712, 750, 790, 830,
-        870, 910, 950, 986, 991, 1031, 1069, 1107,
-        1143, 1179, 1217, 1255, 1295, 1331, 1347, 1387,
-        1425, 1463, 1502, 1540, 1580, 1620, 1658, 1698,
-        1738, 1778, 1818, 1858, 1898, 1938, 1980
+        0, 58, 114, 168, 222, 278, 332, 388,
+        444, 500, 556, 612, 666, 682, 738, 794,
+        850, 906, 962, 1018, 1074, 1130, 1186, 1242,
+        1298, 1354, 1408, 1462, 1518, 1572, 1628, 1684,
+        1740, 1796, 1852, 1906, 1922, 1978, 2034, 2090,
+        2146, 2202, 2258, 2314, 2370, 2426, 2482, 2538,
+        2594, 2650, 2706, 2762, 2820
 };
 
 static const char _myanmar_syllable_machine_indicies[] = {
@@ -114,273 +115,378 @@ static const char _myanmar_syllable_machine_indicies[] = {
         0, 8, 0, 9, 10, 11, 12, 0,
         0, 0, 0, 0, 0, 0, 0, 13,
         0, 0, 14, 15, 16, 17, 18, 19,
-        20, 0, 22, 23, 24, 24, 21, 25,
-        26, 21, 21, 21, 21, 21, 21, 21,
-        21, 21, 21, 27, 28, 29, 30, 21,
-        21, 21, 21, 21, 21, 21, 21, 31,
-        21, 21, 32, 33, 34, 35, 36, 37,
-        38, 21, 24, 24, 21, 25, 21, 21,
-        21, 21, 21, 21, 21, 21, 21, 21,
-        21, 21, 21, 21, 30, 21, 21, 21,
-        21, 21, 21, 21, 21, 39, 21, 21,
-        21, 21, 21, 21, 36, 21, 24, 24,
-        21, 25, 21, 22, 21, 24, 24, 21,
-        25, 26, 21, 21, 21, 21, 21, 21,
-        21, 21, 21, 21, 40, 21, 21, 30,
-        21, 21, 21, 21, 21, 21, 21, 21,
-        41, 21, 21, 42, 21, 21, 21, 36,
-        21, 41, 21, 22, 21, 24, 24, 21,
-        25, 26, 21, 21, 21, 21, 21, 21,
-        21, 21, 21, 21, 21, 21, 21, 30,
-        21, 21, 21, 21, 21, 21, 21, 21,
-        21, 21, 21, 21, 21, 21, 21, 36,
-        21, 43, 21, 24, 24, 21, 25, 36,
-        21, 21, 21, 21, 21, 21, 21, 21,
-        21, 21, 21, 21, 21, 21, 21, 21,
-        21, 21, 21, 21, 21, 21, 44, 21,
-        21, 21, 21, 21, 21, 36, 21, 24,
-        24, 21, 25, 21, 21, 21, 21, 21,
-        21, 21, 21, 21, 21, 21, 21, 21,
-        21, 21, 21, 21, 21, 21, 21, 21,
-        21, 21, 44, 21, 21, 21, 21, 21,
-        21, 36, 21, 24, 24, 21, 25, 21,
-        21, 21, 21, 21, 21, 21, 21, 21,
-        21, 21, 21, 21, 21, 21, 21, 21,
-        21, 21, 21, 21, 21, 21, 21, 21,
-        21, 21, 21, 21, 21, 36, 21, 22,
-        21, 24, 24, 21, 25, 26, 21, 21,
-        21, 21, 21, 21, 21, 21, 21, 21,
-        40, 21, 21, 30, 21, 21, 21, 21,
-        21, 21, 21, 21, 21, 21, 21, 21,
-        21, 21, 21, 36, 21, 22, 21, 24,
-        24, 21, 25, 26, 21, 21, 21, 21,
-        21, 21, 21, 21, 21, 21, 40, 21,
-        21, 30, 21, 21, 21, 21, 21, 21,
-        21, 21, 41, 21, 21, 21, 21, 21,
-        21, 36, 21, 22, 21, 24, 24, 21,
-        25, 26, 21, 21, 21, 21, 21, 21,
-        21, 21, 21, 21, 40, 21, 21, 30,
-        21, 21, 21, 21, 21, 21, 21, 21,
-        41, 21, 21, 21, 21, 21, 21, 36,
-        21, 41, 21, 24, 24, 21, 25, 21,
-        21, 21, 21, 21, 21, 21, 21, 21,
-        21, 21, 21, 21, 21, 30, 21, 21,
-        21, 21, 21, 21, 21, 21, 21, 21,
-        21, 21, 21, 21, 21, 36, 21, 1,
-        1, 21, 21, 21, 21, 21, 21, 21,
-        21, 21, 21, 21, 21, 1, 21, 22,
-        21, 24, 24, 21, 25, 26, 21, 21,
-        21, 21, 21, 21, 21, 21, 21, 21,
-        27, 28, 21, 30, 21, 21, 21, 21,
-        21, 21, 21, 21, 21, 21, 21, 21,
-        21, 21, 21, 36, 21, 22, 21, 24,
-        24, 21, 25, 26, 21, 21, 21, 21,
-        21, 21, 21, 21, 21, 21, 21, 28,
-        21, 30, 21, 21, 21, 21, 21, 21,
-        21, 21, 21, 21, 21, 21, 21, 21,
-        21, 36, 21, 22, 21, 24, 24, 21,
-        25, 26, 21, 21, 21, 21, 21, 21,
-        21, 21, 21, 21, 27, 28, 29, 30,
-        21, 21, 21, 21, 21, 21, 21, 21,
-        21, 21, 21, 21, 21, 21, 21, 36,
-        45, 21, 22, 21, 24, 24, 21, 25,
-        26, 21, 21, 21, 21, 21, 21, 21,
-        21, 21, 21, 27, 28, 29, 30, 21,
-        21, 21, 21, 21, 21, 21, 21, 21,
-        21, 21, 21, 21, 21, 21, 36, 21,
-        22, 21, 24, 24, 21, 25, 26, 21,
-        21, 21, 21, 21, 21, 21, 21, 21,
-        21, 27, 28, 29, 30, 21, 21, 21,
-        21, 21, 21, 21, 21, 31, 21, 21,
-        32, 33, 34, 35, 36, 21, 38, 21,
-        22, 21, 24, 24, 21, 25, 26, 21,
-        21, 21, 21, 21, 21, 21, 21, 21,
-        21, 27, 28, 29, 30, 21, 21, 21,
-        21, 21, 21, 21, 21, 45, 21, 21,
-        21, 21, 21, 21, 36, 21, 38, 21,
-        22, 21, 24, 24, 21, 25, 26, 21,
-        21, 21, 21, 21, 21, 21, 21, 21,
-        21, 27, 28, 29, 30, 21, 21, 21,
-        21, 21, 21, 21, 21, 45, 21, 21,
-        21, 21, 21, 21, 36, 21, 22, 21,
-        24, 24, 21, 25, 26, 21, 21, 21,
-        21, 21, 21, 21, 21, 21, 21, 27,
-        28, 29, 30, 21, 21, 21, 21, 21,
-        21, 21, 21, 21, 21, 21, 32, 21,
-        34, 21, 36, 21, 38, 21, 22, 21,
-        24, 24, 21, 25, 26, 21, 21, 21,
-        21, 21, 21, 21, 21, 21, 21, 27,
-        28, 29, 30, 21, 21, 21, 21, 21,
-        21, 21, 21, 45, 21, 21, 32, 21,
-        21, 21, 36, 21, 38, 21, 22, 21,
-        24, 24, 21, 25, 26, 21, 21, 21,
-        21, 21, 21, 21, 21, 21, 21, 27,
-        28, 29, 30, 21, 21, 21, 21, 21,
-        21, 21, 21, 46, 21, 21, 32, 33,
-        34, 21, 36, 21, 38, 21, 22, 21,
-        24, 24, 21, 25, 26, 21, 21, 21,
-        21, 21, 21, 21, 21, 21, 21, 27,
-        28, 29, 30, 21, 21, 21, 21, 21,
-        21, 21, 21, 21, 21, 21, 32, 33,
-        34, 21, 36, 21, 38, 21, 22, 23,
-        24, 24, 21, 25, 26, 21, 21, 21,
-        21, 21, 21, 21, 21, 21, 21, 27,
-        28, 29, 30, 21, 21, 21, 21, 21,
-        21, 21, 21, 31, 21, 21, 32, 33,
-        34, 35, 36, 21, 38, 21, 48, 48,
+        20, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0,
+        21, 0, 23, 24, 25, 25, 22, 26,
+        27, 22, 22, 22, 22, 22, 22, 22,
+        22, 22, 22, 28, 29, 30, 31, 22,
+        22, 22, 22, 22, 22, 22, 22, 32,
+        22, 22, 33, 34, 35, 36, 37, 38,
+        39, 22, 22, 22, 22, 22, 22, 22,
+        22, 22, 22, 22, 22, 22, 22, 22,
+        26, 22, 25, 25, 22, 26, 22, 22,
+        22, 22, 22, 22, 22, 22, 22, 22,
+        22, 22, 22, 22, 31, 22, 22, 22,
+        22, 22, 22, 22, 22, 40, 22, 22,
+        22, 22, 22, 22, 37, 22, 22, 22,
+        22, 22, 22, 22, 22, 22, 22, 22,
+        22, 22, 22, 22, 22, 22, 26, 22,
+        25, 25, 22, 26, 22, 22, 22, 22,
+        22, 22, 22, 22, 22, 22, 22, 22,
+        22, 22, 22, 22, 22, 22, 22, 22,
+        22, 22, 22, 22, 22, 22, 22, 22,
+        22, 22, 37, 22, 22, 22, 22, 22,
+        22, 22, 22, 22, 22, 22, 22, 22,
+        22, 22, 22, 22, 26, 22, 41, 22,
+        25, 25, 22, 26, 37, 22, 22, 22,
+        22, 22, 22, 22, 22, 22, 22, 22,
+        22, 22, 22, 22, 22, 22, 22, 22,
+        22, 22, 22, 26, 22, 22, 22, 22,
+        22, 22, 37, 22, 22, 22, 22, 22,
+        22, 22, 22, 22, 22, 22, 22, 22,
+        22, 22, 22, 22, 26, 22, 25, 25,
+        22, 26, 22, 22, 22, 22, 22, 22,
+        22, 22, 22, 22, 22, 22, 22, 22,
+        22, 22, 22, 22, 22, 22, 22, 22,
+        22, 26, 22, 22, 22, 22, 22, 22,
+        37, 22, 22, 22, 22, 22, 22, 22,
+        22, 22, 22, 22, 22, 22, 22, 22,
+        22, 22, 26, 22, 23, 22, 25, 25,
+        22, 26, 27, 22, 22, 22, 22, 22,
+        22, 22, 22, 22, 22, 42, 22, 22,
+        31, 22, 22, 22, 22, 22, 22, 22,
+        22, 43, 22, 22, 44, 22, 22, 22,
+        37, 22, 43, 22, 22, 22, 22, 22,
+        22, 22, 22, 22, 22, 22, 22, 22,
+        22, 22, 26, 22, 23, 22, 25, 25,
+        22, 26, 27, 22, 22, 22, 22, 22,
+        22, 22, 22, 22, 22, 22, 22, 22,
+        31, 22, 22, 22, 22, 22, 22, 22,
+        22, 22, 22, 22, 22, 22, 22, 22,
+        37, 22, 22, 22, 22, 22, 22, 22,
+        22, 22, 22, 22, 22, 22, 22, 22,
+        22, 22, 26, 22, 23, 22, 25, 25,
+        22, 26, 27, 22, 22, 22, 22, 22,
+        22, 22, 22, 22, 22, 42, 22, 22,
+        31, 22, 22, 22, 22, 22, 22, 22,
+        22, 22, 22, 22, 22, 22, 22, 22,
+        37, 22, 22, 22, 22, 22, 22, 22,
+        22, 22, 22, 22, 22, 22, 22, 22,
+        22, 22, 26, 22, 23, 22, 25, 25,
+        22, 26, 27, 22, 22, 22, 22, 22,
+        22, 22, 22, 22, 22, 42, 22, 22,
+        31, 22, 22, 22, 22, 22, 22, 22,
+        22, 43, 22, 22, 22, 22, 22, 22,
+        37, 22, 22, 22, 22, 22, 22, 22,
+        22, 22, 22, 22, 22, 22, 22, 22,
+        22, 22, 26, 22, 23, 22, 25, 25,
+        22, 26, 27, 22, 22, 22, 22, 22,
+        22, 22, 22, 22, 22, 42, 22, 22,
+        31, 22, 22, 22, 22, 22, 22, 22,
+        22, 43, 22, 22, 22, 22, 22, 22,
+        37, 22, 43, 22, 22, 22, 22, 22,
+        22, 22, 22, 22, 22, 22, 22, 22,
+        22, 22, 26, 22, 25, 25, 22, 26,
+        22, 22, 22, 22, 22, 22, 22, 22,
+        22, 22, 22, 22, 22, 22, 31, 22,
+        22, 22, 22, 22, 22, 22, 22, 22,
+        22, 22, 22, 22, 22, 22, 37, 22,
+        22, 22, 22, 22, 22, 22, 22, 22,
+        22, 22, 22, 22, 22, 22, 22, 22,
+        26, 22, 1, 1, 22, 22, 22, 22,
+        22, 22, 22, 22, 22, 22, 22, 22,
+        1, 22, 23, 22, 25, 25, 22, 26,
+        27, 22, 22, 22, 22, 22, 22, 22,
+        22, 22, 22, 28, 29, 22, 31, 22,
+        22, 22, 22, 22, 22, 22, 22, 22,
+        22, 22, 22, 22, 22, 22, 37, 22,
+        22, 22, 22, 22, 22, 22, 22, 22,
+        22, 22, 22, 22, 22, 22, 22, 22,
+        26, 22, 23, 22, 25, 25, 22, 26,
+        27, 22, 22, 22, 22, 22, 22, 22,
+        22, 22, 22, 22, 29, 22, 31, 22,
+        22, 22, 22, 22, 22, 22, 22, 22,
+        22, 22, 22, 22, 22, 22, 37, 22,
+        22, 22, 22, 22, 22, 22, 22, 22,
+        22, 22, 22, 22, 22, 22, 22, 22,
+        26, 22, 23, 22, 25, 25, 22, 26,
+        27, 22, 22, 22, 22, 22, 22, 22,
+        22, 22, 22, 28, 29, 30, 31, 22,
+        22, 22, 22, 22, 22, 22, 22, 22,
+        22, 22, 22, 22, 22, 22, 37, 45,
+        22, 22, 22, 22, 22, 22, 22, 22,
+        22, 22, 22, 22, 22, 22, 22, 22,
+        26, 22, 23, 22, 25, 25, 22, 26,
+        27, 22, 22, 22, 22, 22, 22, 22,
+        22, 22, 22, 28, 29, 30, 31, 22,
+        22, 22, 22, 22, 22, 22, 22, 22,
+        22, 22, 22, 22, 22, 22, 37, 22,
+        22, 22, 22, 22, 22, 22, 22, 22,
+        22, 22, 22, 22, 22, 22, 22, 22,
+        26, 22, 23, 22, 25, 25, 22, 26,
+        27, 22, 22, 22, 22, 22, 22, 22,
+        22, 22, 22, 28, 29, 30, 31, 22,
+        22, 22, 22, 22, 22, 22, 22, 32,
+        22, 22, 33, 34, 35, 36, 37, 22,
+        39, 22, 22, 22, 22, 22, 22, 22,
+        22, 22, 22, 22, 22, 22, 22, 22,
+        26, 22, 23, 22, 25, 25, 22, 26,
+        27, 22, 22, 22, 22, 22, 22, 22,
+        22, 22, 22, 28, 29, 30, 31, 22,
+        22, 22, 22, 22, 22, 22, 22, 45,
+        22, 22, 22, 22, 22, 22, 37, 22,
+        39, 22, 22, 22, 22, 22, 22, 22,
+        22, 22, 22, 22, 22, 22, 22, 22,
+        26, 22, 23, 22, 25, 25, 22, 26,
+        27, 22, 22, 22, 22, 22, 22, 22,
+        22, 22, 22, 28, 29, 30, 31, 22,
+        22, 22, 22, 22, 22, 22, 22, 45,
+        22, 22, 22, 22, 22, 22, 37, 22,
+        22, 22, 22, 22, 22, 22, 22, 22,
+        22, 22, 22, 22, 22, 22, 22, 22,
+        26, 22, 23, 22, 25, 25, 22, 26,
+        27, 22, 22, 22, 22, 22, 22, 22,
+        22, 22, 22, 28, 29, 30, 31, 22,
+        22, 22, 22, 22, 22, 22, 22, 22,
+        22, 22, 33, 22, 35, 22, 37, 22,
+        39, 22, 22, 22, 22, 22, 22, 22,
+        22, 22, 22, 22, 22, 22, 22, 22,
+        26, 22, 23, 22, 25, 25, 22, 26,
+        27, 22, 22, 22, 22, 22, 22, 22,
+        22, 22, 22, 28, 29, 30, 31, 22,
+        22, 22, 22, 22, 22, 22, 22, 45,
+        22, 22, 33, 22, 22, 22, 37, 22,
+        39, 22, 22, 22, 22, 22, 22, 22,
+        22, 22, 22, 22, 22, 22, 22, 22,
+        26, 22, 23, 22, 25, 25, 22, 26,
+        27, 22, 22, 22, 22, 22, 22, 22,
+        22, 22, 22, 28, 29, 30, 31, 22,
+        22, 22, 22, 22, 22, 22, 22, 46,
+        22, 22, 33, 34, 35, 22, 37, 22,
+        39, 22, 22, 22, 22, 22, 22, 22,
+        22, 22, 22, 22, 22, 22, 22, 22,
+        26, 22, 23, 22, 25, 25, 22, 26,
+        27, 22, 22, 22, 22, 22, 22, 22,
+        22, 22, 22, 28, 29, 30, 31, 22,
+        22, 22, 22, 22, 22, 22, 22, 22,
+        22, 22, 33, 34, 35, 22, 37, 22,
+        39, 22, 22, 22, 22, 22, 22, 22,
+        22, 22, 22, 22, 22, 22, 22, 22,
+        26, 22, 23, 24, 25, 25, 22, 26,
+        27, 22, 22, 22, 22, 22, 22, 22,
+        22, 22, 22, 28, 29, 30, 31, 22,
+        22, 22, 22, 22, 22, 22, 22, 32,
+        22, 22, 33, 34, 35, 36, 37, 22,
+        39, 22, 22, 22, 22, 22, 22, 22,
+        22, 22, 22, 22, 22, 22, 22, 22,
+        26, 22, 48, 48, 47, 5, 47, 47,
+        47, 47, 47, 47, 47, 47, 47, 47,
+        47, 47, 47, 47, 12, 47, 47, 47,
+        47, 47, 47, 47, 47, 49, 47, 47,
+        47, 47, 47, 47, 18, 47, 47, 47,
+        47, 47, 47, 47, 47, 47, 47, 47,
+        47, 47, 47, 47, 47, 47, 5, 47,
+        48, 48, 50, 5, 50, 50, 50, 50,
+        50, 50, 50, 50, 50, 50, 50, 50,
+        50, 50, 50, 50, 50, 50, 50, 50,
+        50, 50, 50, 50, 50, 50, 50, 50,
+        50, 50, 18, 50, 50, 50, 50, 50,
+        50, 50, 50, 50, 50, 50, 50, 50,
+        50, 50, 50, 50, 5, 50, 51, 47,
+        48, 48, 47, 5, 18, 47, 47, 47,
+        47, 47, 47, 47, 47, 47, 47, 47,
+        47, 47, 47, 47, 47, 47, 47, 47,
+        47, 47, 47, 5, 47, 47, 47, 47,
+        47, 47, 18, 47, 47, 47, 47, 47,
+        47, 47, 47, 47, 47, 47, 47, 47,
+        47, 47, 47, 47, 5, 47, 48, 48,
         47, 5, 47, 47, 47, 47, 47, 47,
         47, 47, 47, 47, 47, 47, 47, 47,
-        12, 47, 47, 47, 47, 47, 47, 47,
-        47, 49, 47, 47, 47, 47, 47, 47,
-        18, 47, 48, 48, 47, 5, 47, 2,
-        47, 48, 48, 47, 5, 6, 47, 47,
         47, 47, 47, 47, 47, 47, 47, 47,
-        50, 47, 47, 12, 47, 47, 47, 47,
-        47, 47, 47, 47, 51, 47, 47, 52,
-        47, 47, 47, 18, 47, 51, 47, 2,
-        47, 48, 48, 47, 5, 6, 47, 47,
+        47, 5, 47, 47, 47, 47, 47, 47,
+        18, 47, 47, 47, 47, 47, 47, 47,
         47, 47, 47, 47, 47, 47, 47, 47,
-        47, 47, 47, 12, 47, 47, 47, 47,
-        47, 47, 47, 47, 47, 47, 47, 47,
-        47, 47, 47, 18, 47, 53, 47, 48,
-        48, 47, 5, 18, 47, 47, 47, 47,
-        47, 47, 47, 47, 47, 47, 47, 47,
-        47, 47, 47, 47, 47, 47, 47, 47,
-        47, 47, 54, 47, 47, 47, 47, 47,
-        47, 18, 47, 48, 48, 47, 5, 47,
-        47, 47, 47, 47, 47, 47, 47, 47,
-        47, 47, 47, 47, 47, 47, 47, 47,
-        47, 47, 47, 47, 47, 47, 54, 47,
-        47, 47, 47, 47, 47, 18, 47, 48,
-        48, 47, 5, 47, 47, 47, 47, 47,
-        47, 47, 47, 47, 47, 47, 47, 47,
-        47, 47, 47, 47, 47, 47, 47, 47,
-        47, 47, 47, 47, 47, 47, 47, 47,
-        47, 18, 47, 2, 47, 48, 48, 47,
-        5, 6, 47, 47, 47, 47, 47, 47,
-        47, 47, 47, 47, 50, 47, 47, 12,
-        47, 47, 47, 47, 47, 47, 47, 47,
-        47, 47, 47, 47, 47, 47, 47, 18,
-        47, 2, 47, 48, 48, 47, 5, 6,
-        47, 47, 47, 47, 47, 47, 47, 47,
-        47, 47, 50, 47, 47, 12, 47, 47,
-        47, 47, 47, 47, 47, 47, 51, 47,
-        47, 47, 47, 47, 47, 18, 47, 2,
-        47, 48, 48, 47, 5, 6, 47, 47,
-        47, 47, 47, 47, 47, 47, 47, 47,
-        50, 47, 47, 12, 47, 47, 47, 47,
-        47, 47, 47, 47, 51, 47, 47, 47,
-        47, 47, 47, 18, 47, 51, 47, 48,
-        48, 47, 5, 47, 47, 47, 47, 47,
-        47, 47, 47, 47, 47, 47, 47, 47,
-        47, 12, 47, 47, 47, 47, 47, 47,
-        47, 47, 47, 47, 47, 47, 47, 47,
-        47, 18, 47, 55, 55, 47, 47, 47,
-        47, 47, 47, 47, 47, 47, 47, 47,
-        47, 55, 47, 2, 3, 48, 48, 47,
-        5, 6, 47, 47, 47, 47, 47, 47,
-        47, 47, 47, 47, 9, 10, 11, 12,
-        47, 47, 47, 47, 47, 47, 47, 47,
-        13, 47, 47, 14, 15, 16, 17, 18,
-        19, 20, 47, 2, 47, 48, 48, 47,
-        5, 6, 47, 47, 47, 47, 47, 47,
-        47, 47, 47, 47, 9, 10, 47, 12,
-        47, 47, 47, 47, 47, 47, 47, 47,
-        47, 47, 47, 47, 47, 47, 47, 18,
-        47, 2, 47, 48, 48, 47, 5, 6,
-        47, 47, 47, 47, 47, 47, 47, 47,
-        47, 47, 47, 10, 47, 12, 47, 47,
-        47, 47, 47, 47, 47, 47, 47, 47,
-        47, 47, 47, 47, 47, 18, 47, 2,
-        47, 48, 48, 47, 5, 6, 47, 47,
-        47, 47, 47, 47, 47, 47, 47, 47,
-        9, 10, 11, 12, 47, 47, 47, 47,
-        47, 47, 47, 47, 47, 47, 47, 47,
-        47, 47, 47, 18, 56, 47, 2, 47,
-        48, 48, 47, 5, 6, 47, 47, 47,
-        47, 47, 47, 47, 47, 47, 47, 9,
-        10, 11, 12, 47, 47, 47, 47, 47,
-        47, 47, 47, 47, 47, 47, 47, 47,
-        47, 47, 18, 47, 2, 47, 48, 48,
+        47, 47, 5, 47, 2, 47, 48, 48,
         47, 5, 6, 47, 47, 47, 47, 47,
-        47, 47, 47, 47, 47, 9, 10, 11,
+        47, 47, 47, 47, 47, 52, 47, 47,
         12, 47, 47, 47, 47, 47, 47, 47,
-        47, 13, 47, 47, 14, 15, 16, 17,
-        18, 47, 20, 47, 2, 47, 48, 48,
+        47, 53, 47, 47, 54, 47, 47, 47,
+        18, 47, 53, 47, 47, 47, 47, 47,
+        47, 47, 47, 47, 47, 47, 47, 47,
+        47, 47, 5, 47, 2, 47, 48, 48,
         47, 5, 6, 47, 47, 47, 47, 47,
-        47, 47, 47, 47, 47, 9, 10, 11,
+        47, 47, 47, 47, 47, 47, 47, 47,
         12, 47, 47, 47, 47, 47, 47, 47,
-        47, 56, 47, 47, 47, 47, 47, 47,
-        18, 47, 20, 47, 2, 47, 48, 48,
+        47, 47, 47, 47, 47, 47, 47, 47,
+        18, 47, 47, 47, 47, 47, 47, 47,
+        47, 47, 47, 47, 47, 47, 47, 47,
+        47, 47, 5, 47, 2, 47, 48, 48,
         47, 5, 6, 47, 47, 47, 47, 47,
-        47, 47, 47, 47, 47, 9, 10, 11,
+        47, 47, 47, 47, 47, 52, 47, 47,
         12, 47, 47, 47, 47, 47, 47, 47,
-        47, 56, 47, 47, 47, 47, 47, 47,
-        18, 47, 2, 47, 48, 48, 47, 5,
+        47, 47, 47, 47, 47, 47, 47, 47,
+        18, 47, 47, 47, 47, 47, 47, 47,
+        47, 47, 47, 47, 47, 47, 47, 47,
+        47, 47, 5, 47, 2, 47, 48, 48,
+        47, 5, 6, 47, 47, 47, 47, 47,
+        47, 47, 47, 47, 47, 52, 47, 47,
+        12, 47, 47, 47, 47, 47, 47, 47,
+        47, 53, 47, 47, 47, 47, 47, 47,
+        18, 47, 47, 47, 47, 47, 47, 47,
+        47, 47, 47, 47, 47, 47, 47, 47,
+        47, 47, 5, 47, 2, 47, 48, 48,
+        47, 5, 6, 47, 47, 47, 47, 47,
+        47, 47, 47, 47, 47, 52, 47, 47,
+        12, 47, 47, 47, 47, 47, 47, 47,
+        47, 53, 47, 47, 47, 47, 47, 47,
+        18, 47, 53, 47, 47, 47, 47, 47,
+        47, 47, 47, 47, 47, 47, 47, 47,
+        47, 47, 5, 47, 48, 48, 47, 5,
+        47, 47, 47, 47, 47, 47, 47, 47,
+        47, 47, 47, 47, 47, 47, 12, 47,
+        47, 47, 47, 47, 47, 47, 47, 47,
+        47, 47, 47, 47, 47, 47, 18, 47,
+        47, 47, 47, 47, 47, 47, 47, 47,
+        47, 47, 47, 47, 47, 47, 47, 47,
+        5, 47, 55, 55, 47, 47, 47, 47,
+        47, 47, 47, 47, 47, 47, 47, 47,
+        55, 47, 2, 3, 48, 48, 47, 5,
+        6, 47, 47, 47, 47, 47, 47, 47,
+        47, 47, 47, 9, 10, 11, 12, 47,
+        47, 47, 47, 47, 47, 47, 47, 13,
+        47, 47, 14, 15, 16, 17, 18, 19,
+        20, 47, 47, 47, 47, 47, 47, 47,
+        47, 47, 47, 47, 47, 47, 47, 47,
+        5, 47, 2, 47, 48, 48, 47, 5,
+        6, 47, 47, 47, 47, 47, 47, 47,
+        47, 47, 47, 9, 10, 47, 12, 47,
+        47, 47, 47, 47, 47, 47, 47, 47,
+        47, 47, 47, 47, 47, 47, 18, 47,
+        47, 47, 47, 47, 47, 47, 47, 47,
+        47, 47, 47, 47, 47, 47, 47, 47,
+        5, 47, 2, 47, 48, 48, 47, 5,
+        6, 47, 47, 47, 47, 47, 47, 47,
+        47, 47, 47, 47, 10, 47, 12, 47,
+        47, 47, 47, 47, 47, 47, 47, 47,
+        47, 47, 47, 47, 47, 47, 18, 47,
+        47, 47, 47, 47, 47, 47, 47, 47,
+        47, 47, 47, 47, 47, 47, 47, 47,
+        5, 47, 2, 47, 48, 48, 47, 5,
         6, 47, 47, 47, 47, 47, 47, 47,
         47, 47, 47, 9, 10, 11, 12, 47,
         47, 47, 47, 47, 47, 47, 47, 47,
-        47, 47, 14, 47, 16, 47, 18, 47,
-        20, 47, 2, 47, 48, 48, 47, 5,
-        6, 47, 47, 47, 47, 47, 47, 47,
-        47, 47, 47, 9, 10, 11, 12, 47,
-        47, 47, 47, 47, 47, 47, 47, 56,
-        47, 47, 14, 47, 47, 47, 18, 47,
-        20, 47, 2, 47, 48, 48, 47, 5,
-        6, 47, 47, 47, 47, 47, 47, 47,
-        47, 47, 47, 9, 10, 11, 12, 47,
-        47, 47, 47, 47, 47, 47, 47, 57,
-        47, 47, 14, 15, 16, 47, 18, 47,
-        20, 47, 2, 47, 48, 48, 47, 5,
+        47, 47, 47, 47, 47, 47, 18, 56,
+        47, 47, 47, 47, 47, 47, 47, 47,
+        47, 47, 47, 47, 47, 47, 47, 47,
+        5, 47, 2, 47, 48, 48, 47, 5,
         6, 47, 47, 47, 47, 47, 47, 47,
         47, 47, 47, 9, 10, 11, 12, 47,
         47, 47, 47, 47, 47, 47, 47, 47,
-        47, 47, 14, 15, 16, 47, 18, 47,
-        20, 47, 2, 3, 48, 48, 47, 5,
+        47, 47, 47, 47, 47, 47, 18, 47,
+        47, 47, 47, 47, 47, 47, 47, 47,
+        47, 47, 47, 47, 47, 47, 47, 47,
+        5, 47, 2, 47, 48, 48, 47, 5,
         6, 47, 47, 47, 47, 47, 47, 47,
         47, 47, 47, 9, 10, 11, 12, 47,
         47, 47, 47, 47, 47, 47, 47, 13,
         47, 47, 14, 15, 16, 17, 18, 47,
-        20, 47, 22, 23, 24, 24, 21, 25,
-        26, 21, 21, 21, 21, 21, 21, 21,
-        21, 21, 21, 27, 28, 29, 30, 21,
-        21, 21, 21, 21, 21, 21, 21, 58,
-        21, 21, 32, 33, 34, 35, 36, 37,
-        38, 21, 22, 59, 24, 24, 21, 25,
-        26, 21, 21, 21, 21, 21, 21, 21,
-        21, 21, 21, 27, 28, 29, 30, 21,
-        21, 21, 21, 21, 21, 21, 21, 31,
-        21, 21, 32, 33, 34, 35, 36, 21,
-        38, 21, 1, 1, 2, 3, 48, 48,
+        20, 47, 47, 47, 47, 47, 47, 47,
+        47, 47, 47, 47, 47, 47, 47, 47,
+        5, 47, 2, 47, 48, 48, 47, 5,
+        6, 47, 47, 47, 47, 47, 47, 47,
+        47, 47, 47, 9, 10, 11, 12, 47,
+        47, 47, 47, 47, 47, 47, 47, 56,
+        47, 47, 47, 47, 47, 47, 18, 47,
+        20, 47, 47, 47, 47, 47, 47, 47,
+        47, 47, 47, 47, 47, 47, 47, 47,
+        5, 47, 2, 47, 48, 48, 47, 5,
+        6, 47, 47, 47, 47, 47, 47, 47,
+        47, 47, 47, 9, 10, 11, 12, 47,
+        47, 47, 47, 47, 47, 47, 47, 56,
+        47, 47, 47, 47, 47, 47, 18, 47,
+        47, 47, 47, 47, 47, 47, 47, 47,
+        47, 47, 47, 47, 47, 47, 47, 47,
+        5, 47, 2, 47, 48, 48, 47, 5,
+        6, 47, 47, 47, 47, 47, 47, 47,
+        47, 47, 47, 9, 10, 11, 12, 47,
+        47, 47, 47, 47, 47, 47, 47, 47,
+        47, 47, 14, 47, 16, 47, 18, 47,
+        20, 47, 47, 47, 47, 47, 47, 47,
+        47, 47, 47, 47, 47, 47, 47, 47,
+        5, 47, 2, 47, 48, 48, 47, 5,
+        6, 47, 47, 47, 47, 47, 47, 47,
+        47, 47, 47, 9, 10, 11, 12, 47,
+        47, 47, 47, 47, 47, 47, 47, 56,
+        47, 47, 14, 47, 47, 47, 18, 47,
+        20, 47, 47, 47, 47, 47, 47, 47,
+        47, 47, 47, 47, 47, 47, 47, 47,
+        5, 47, 2, 47, 48, 48, 47, 5,
+        6, 47, 47, 47, 47, 47, 47, 47,
+        47, 47, 47, 9, 10, 11, 12, 47,
+        47, 47, 47, 47, 47, 47, 47, 57,
+        47, 47, 14, 15, 16, 47, 18, 47,
+        20, 47, 47, 47, 47, 47, 47, 47,
+        47, 47, 47, 47, 47, 47, 47, 47,
+        5, 47, 2, 47, 48, 48, 47, 5,
+        6, 47, 47, 47, 47, 47, 47, 47,
+        47, 47, 47, 9, 10, 11, 12, 47,
+        47, 47, 47, 47, 47, 47, 47, 47,
+        47, 47, 14, 15, 16, 47, 18, 47,
+        20, 47, 47, 47, 47, 47, 47, 47,
+        47, 47, 47, 47, 47, 47, 47, 47,
+        5, 47, 2, 3, 48, 48, 47, 5,
+        6, 47, 47, 47, 47, 47, 47, 47,
+        47, 47, 47, 9, 10, 11, 12, 47,
+        47, 47, 47, 47, 47, 47, 47, 13,
+        47, 47, 14, 15, 16, 17, 18, 47,
+        20, 47, 47, 47, 47, 47, 47, 47,
+        47, 47, 47, 47, 47, 47, 47, 47,
+        5, 47, 23, 24, 25, 25, 22, 26,
+        27, 22, 22, 22, 22, 22, 22, 22,
+        22, 22, 22, 28, 29, 30, 31, 22,
+        22, 22, 22, 22, 22, 22, 22, 58,
+        22, 22, 33, 34, 35, 36, 37, 38,
+        39, 22, 22, 22, 22, 22, 22, 22,
+        22, 22, 22, 22, 22, 22, 22, 22,
+        26, 22, 23, 59, 25, 25, 22, 26,
+        27, 22, 22, 22, 22, 22, 22, 22,
+        22, 22, 22, 28, 29, 30, 31, 22,
+        22, 22, 22, 22, 22, 22, 22, 32,
+        22, 22, 33, 34, 35, 36, 37, 22,
+        39, 22, 22, 22, 22, 22, 22, 22,
+        22, 22, 22, 22, 22, 22, 22, 22,
+        26, 22, 1, 1, 2, 3, 48, 48,
         47, 5, 6, 1, 1, 47, 47, 47,
         1, 47, 47, 47, 47, 9, 10, 11,
         12, 47, 47, 47, 47, 47, 47, 47,
         47, 13, 47, 47, 14, 15, 16, 17,
-        18, 19, 20, 47, 1, 1, 60, 60,
+        18, 19, 20, 47, 47, 47, 47, 47,
+        47, 47, 47, 47, 47, 47, 47, 47,
+        47, 47, 5, 47, 1, 1, 60, 60,
         60, 60, 60, 60, 60, 1, 1, 60,
         60, 60, 1, 60, 0
 };
 
 static const char _myanmar_syllable_machine_trans_targs[] = {
-        0, 1, 26, 37, 0, 27, 29, 51,
-        54, 39, 40, 41, 28, 43, 44, 46,
-        47, 48, 30, 50, 45, 0, 2, 13,
-        0, 3, 5, 14, 15, 16, 4, 18,
-        19, 21, 22, 23, 6, 25, 20, 12,
-        9, 10, 11, 7, 8, 17, 24, 0,
-        0, 36, 33, 34, 35, 31, 32, 38,
-        42, 49, 52, 53, 0
+        0, 1, 25, 35, 0, 26, 30, 49,
+        52, 37, 38, 39, 29, 41, 42, 44,
+        45, 46, 27, 48, 43, 26, 0, 2,
+        12, 0, 3, 7, 13, 14, 15, 6,
+        17, 18, 20, 21, 22, 4, 24, 19,
+        11, 5, 8, 9, 10, 16, 23, 0,
+        0, 34, 0, 28, 31, 32, 33, 36,
+        40, 47, 50, 51, 0
 };
 
 static const char _myanmar_syllable_machine_trans_actions[] = {
-        3, 0, 0, 0, 4, 0, 0, 0,
+        3, 0, 0, 0, 4, 5, 0, 0,
         0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 5, 0, 0,
-        6, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 6, 7, 0,
+        0, 8, 0, 0, 0, 0, 0, 0,
         0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 7,
-        8, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 9
+        0, 0, 0, 0, 0, 0, 0, 9,
+        10, 0, 11, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 12
 };
 
 static const char _myanmar_syllable_machine_to_state_actions[] = {
@@ -390,7 +496,7 @@ static const char _myanmar_syllable_machine_to_state_actions[] = {
         0, 0, 0, 0, 0, 0, 0, 0,
         0, 0, 0, 0, 0, 0, 0, 0,
         0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0
+        0, 0, 0, 0, 0
 };
 
 static const char _myanmar_syllable_machine_from_state_actions[] = {
@@ -400,17 +506,17 @@ static const char _myanmar_syllable_machine_from_state_actions[] = {
         0, 0, 0, 0, 0, 0, 0, 0,
         0, 0, 0, 0, 0, 0, 0, 0,
         0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0
+        0, 0, 0, 0, 0
 };
 
 static const short _myanmar_syllable_machine_eof_trans[] = {
-        0, 22, 22, 22, 22, 22, 22, 22,
-        22, 22, 22, 22, 22, 22, 22, 22,
-        22, 22, 22, 22, 22, 22, 22, 22,
-        22, 22, 48, 48, 48, 48, 48, 48,
+        0, 23, 23, 23, 23, 23, 23, 23,
+        23, 23, 23, 23, 23, 23, 23, 23,
+        23, 23, 23, 23, 23, 23, 23, 23,
+        23, 48, 51, 48, 48, 48, 48, 48,
         48, 48, 48, 48, 48, 48, 48, 48,
         48, 48, 48, 48, 48, 48, 48, 48,
-        48, 48, 48, 22, 22, 48, 61
+        48, 23, 23, 48, 61
 };
 
 static const int myanmar_syllable_machine_start = 0;
@@ -424,7 +530,7 @@ static const int myanmar_syllable_machine_en_main = 0;
 
 
 
-#line 117 "hb-ot-shaper-myanmar-machine.rl"
+#line 118 "hb-ot-shaper-myanmar-machine.rl"
 
 
 #define found_syllable(syllable_type) \
@@ -443,7 +549,7 @@ find_syllables_myanmar (hb_buffer_t *buffer)
   int cs;
   hb_glyph_info_t *info = buffer->info;
 
-#line 447 "hb-ot-shaper-myanmar-machine.hh"
+#line 553 "hb-ot-shaper-myanmar-machine.hh"
         {
         cs = myanmar_syllable_machine_start;
         ts = 0;
@@ -451,7 +557,7 @@ find_syllables_myanmar (hb_buffer_t *buffer)
         act = 0;
         }
 
-#line 137 "hb-ot-shaper-myanmar-machine.rl"
+#line 138 "hb-ot-shaper-myanmar-machine.rl"
 
 
   p = 0;
@@ -459,7 +565,7 @@ find_syllables_myanmar (hb_buffer_t *buffer)
 
   unsigned int syllable_serial = 1;
 
-#line 463 "hb-ot-shaper-myanmar-machine.hh"
+#line 569 "hb-ot-shaper-myanmar-machine.hh"
         {
         int _slen;
         int _trans;
@@ -473,7 +579,7 @@ _resume:
 #line 1 "NONE"
         {ts = p;}
         break;
-#line 477 "hb-ot-shaper-myanmar-machine.hh"
+#line 583 "hb-ot-shaper-myanmar-machine.hh"
         }
 
         _keys = _myanmar_syllable_machine_trans_keys + (cs<<1);
@@ -491,35 +597,59 @@ _eof_trans:
                 goto _again;
 
         switch ( _myanmar_syllable_machine_trans_actions[_trans] ) {
-        case 6:
-#line 110 "hb-ot-shaper-myanmar-machine.rl"
+        case 8:
+#line 111 "hb-ot-shaper-myanmar-machine.rl"
         {te = p+1;{ found_syllable (myanmar_consonant_syllable); }}
         break;
         case 4:
-#line 111 "hb-ot-shaper-myanmar-machine.rl"
+#line 112 "hb-ot-shaper-myanmar-machine.rl"
         {te = p+1;{ found_syllable (myanmar_non_myanmar_cluster); }}
         break;
-        case 8:
-#line 112 "hb-ot-shaper-myanmar-machine.rl"
+        case 10:
+#line 113 "hb-ot-shaper-myanmar-machine.rl"
         {te = p+1;{ found_syllable (myanmar_broken_cluster); buffer->scratch_flags |= HB_BUFFER_SCRATCH_FLAG_HAS_BROKEN_SYLLABLE; }}
         break;
         case 3:
-#line 113 "hb-ot-shaper-myanmar-machine.rl"
+#line 114 "hb-ot-shaper-myanmar-machine.rl"
         {te = p+1;{ found_syllable (myanmar_non_myanmar_cluster); }}
         break;
-        case 5:
-#line 110 "hb-ot-shaper-myanmar-machine.rl"
-        {te = p;p--;{ found_syllable (myanmar_consonant_syllable); }}
-        break;
         case 7:
-#line 112 "hb-ot-shaper-myanmar-machine.rl"
-        {te = p;p--;{ found_syllable (myanmar_broken_cluster); buffer->scratch_flags |= HB_BUFFER_SCRATCH_FLAG_HAS_BROKEN_SYLLABLE; }}
+#line 111 "hb-ot-shaper-myanmar-machine.rl"
+        {te = p;p--;{ found_syllable (myanmar_consonant_syllable); }}
         break;
         case 9:
 #line 113 "hb-ot-shaper-myanmar-machine.rl"
+        {te = p;p--;{ found_syllable (myanmar_broken_cluster); buffer->scratch_flags |= HB_BUFFER_SCRATCH_FLAG_HAS_BROKEN_SYLLABLE; }}
+        break;
+        case 12:
+#line 114 "hb-ot-shaper-myanmar-machine.rl"
         {te = p;p--;{ found_syllable (myanmar_non_myanmar_cluster); }}
         break;
-#line 523 "hb-ot-shaper-myanmar-machine.hh"
+        case 11:
+#line 1 "NONE"
+        {       switch( act ) {
+        case 2:
+        {{p = ((te))-1;} found_syllable (myanmar_non_myanmar_cluster); }
+        break;
+        case 3:
+        {{p = ((te))-1;} found_syllable (myanmar_broken_cluster); buffer->scratch_flags |= HB_BUFFER_SCRATCH_FLAG_HAS_BROKEN_SYLLABLE; }
+        break;
+        }
+        }
+        break;
+        case 6:
+#line 1 "NONE"
+        {te = p+1;}
+#line 112 "hb-ot-shaper-myanmar-machine.rl"
+        {act = 2;}
+        break;
+        case 5:
+#line 1 "NONE"
+        {te = p+1;}
+#line 113 "hb-ot-shaper-myanmar-machine.rl"
+        {act = 3;}
+        break;
+#line 653 "hb-ot-shaper-myanmar-machine.hh"
         }
 
 _again:
@@ -528,7 +658,7 @@ _again:
 #line 1 "NONE"
         {ts = 0;}
         break;
-#line 532 "hb-ot-shaper-myanmar-machine.hh"
+#line 662 "hb-ot-shaper-myanmar-machine.hh"
         }
 
         if ( ++p != pe )
@@ -544,7 +674,7 @@ _again:
 
         }
 
-#line 145 "hb-ot-shaper-myanmar-machine.rl"
+#line 146 "hb-ot-shaper-myanmar-machine.rl"
 
 }
 
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-ot-shaper-use-machine.hh b/src/java.desktop/share/native/libharfbuzz/hb-ot-shaper-use-machine.hh
index 47b0e6bbdcc..46f66f7d285 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-ot-shaper-use-machine.hh
+++ b/src/java.desktop/share/native/libharfbuzz/hb-ot-shaper-use-machine.hh
@@ -81,6 +81,7 @@ enum use_syllable_type_t {
 #define use_syllable_machine_ex_N 4u
 #define use_syllable_machine_ex_O 0u
 #define use_syllable_machine_ex_R 18u
+#define use_syllable_machine_ex_RK 56u
 #define use_syllable_machine_ex_SB 51u
 #define use_syllable_machine_ex_SE 52u
 #define use_syllable_machine_ex_SMAbv 41u
@@ -99,62 +100,62 @@ enum use_syllable_type_t {
 #define use_syllable_machine_ex_ZWNJ 14u
 
 
-#line 103 "hb-ot-shaper-use-machine.hh"
+#line 104 "hb-ot-shaper-use-machine.hh"
 static const unsigned char _use_syllable_machine_trans_keys[] = {
-        49u, 51u, 0u, 53u, 11u, 53u, 11u, 53u, 1u, 53u, 14u, 48u, 14u, 47u, 14u, 47u,
+        49u, 51u, 0u, 56u, 11u, 56u, 11u, 56u, 1u, 53u, 14u, 48u, 14u, 47u, 14u, 47u,
         14u, 47u, 14u, 46u, 14u, 46u, 14u, 14u, 14u, 48u, 14u, 48u, 14u, 48u, 1u, 14u,
         14u, 48u, 14u, 53u, 14u, 53u, 14u, 53u, 14u, 53u, 12u, 53u, 14u, 53u, 12u, 53u,
-        12u, 53u, 12u, 53u, 11u, 53u, 1u, 14u, 1u, 48u, 14u, 42u, 14u, 42u, 11u, 53u,
+        12u, 53u, 12u, 53u, 11u, 56u, 1u, 14u, 1u, 48u, 14u, 42u, 14u, 42u, 11u, 56u,
         1u, 53u, 14u, 48u, 14u, 47u, 14u, 47u, 14u, 47u, 14u, 46u, 14u, 46u, 14u, 14u,
         14u, 48u, 14u, 48u, 14u, 48u, 1u, 14u, 14u, 48u, 14u, 53u, 14u, 53u, 14u, 53u,
-        14u, 53u, 12u, 53u, 14u, 53u, 12u, 53u, 12u, 53u, 12u, 53u, 11u, 53u, 1u, 14u,
-        1u, 14u, 1u, 48u, 13u, 14u, 4u, 14u, 11u, 53u, 11u, 53u, 1u, 53u, 14u, 48u,
-        14u, 47u, 14u, 47u, 14u, 47u, 14u, 46u, 14u, 46u, 14u, 14u, 14u, 48u, 14u, 48u,
-        14u, 48u, 1u, 14u, 14u, 48u, 14u, 53u, 14u, 53u, 14u, 53u, 14u, 53u, 12u, 53u,
-        14u, 53u, 12u, 53u, 12u, 53u, 12u, 53u, 11u, 53u, 1u, 14u, 1u, 14u, 1u, 48u,
-        11u, 53u, 1u, 53u, 14u, 48u, 14u, 47u, 14u, 47u, 14u, 47u, 14u, 46u, 14u, 46u,
-        14u, 14u, 14u, 48u, 14u, 48u, 14u, 48u, 1u, 14u, 14u, 48u, 14u, 53u, 14u, 53u,
-        14u, 53u, 14u, 53u, 12u, 53u, 14u, 53u, 12u, 53u, 12u, 53u, 12u, 53u, 11u, 53u,
-        1u, 14u, 1u, 48u, 4u, 14u, 13u, 14u, 1u, 53u, 14u, 42u, 14u, 42u, 1u, 5u,
-        14u, 55u, 14u, 51u, 14u, 52u, 14u, 54u, 11u, 53u, 0
+        14u, 53u, 12u, 53u, 14u, 53u, 12u, 53u, 12u, 53u, 12u, 53u, 11u, 56u, 1u, 14u,
+        1u, 14u, 1u, 48u, 14u, 14u, 13u, 14u, 4u, 14u, 11u, 56u, 11u, 56u, 1u, 53u,
+        14u, 48u, 14u, 47u, 14u, 47u, 14u, 47u, 14u, 46u, 14u, 46u, 14u, 14u, 14u, 48u,
+        14u, 48u, 14u, 48u, 1u, 14u, 14u, 48u, 14u, 53u, 14u, 53u, 14u, 53u, 14u, 53u,
+        12u, 53u, 14u, 53u, 12u, 53u, 12u, 53u, 12u, 53u, 11u, 56u, 1u, 14u, 1u, 14u,
+        1u, 48u, 14u, 14u, 11u, 56u, 1u, 53u, 14u, 48u, 14u, 47u, 14u, 47u, 14u, 47u,
+        14u, 46u, 14u, 46u, 14u, 14u, 14u, 48u, 14u, 48u, 14u, 48u, 1u, 14u, 14u, 48u,
+        14u, 53u, 14u, 53u, 14u, 53u, 14u, 53u, 12u, 53u, 14u, 53u, 12u, 53u, 12u, 53u,
+        12u, 53u, 11u, 56u, 1u, 14u, 1u, 48u, 4u, 14u, 13u, 14u, 1u, 56u, 14u, 42u,
+        14u, 42u, 1u, 5u, 14u, 55u, 14u, 51u, 14u, 52u, 14u, 54u, 11u, 56u, 0
 };
 
 static const char _use_syllable_machine_key_spans[] = {
-        3, 54, 43, 43, 53, 35, 34, 34,
+        3, 57, 46, 46, 53, 35, 34, 34,
         34, 33, 33, 1, 35, 35, 35, 14,
         35, 40, 40, 40, 40, 42, 40, 42,
-        42, 42, 43, 14, 48, 29, 29, 43,
+        42, 42, 46, 14, 48, 29, 29, 46,
         53, 35, 34, 34, 34, 33, 33, 1,
         35, 35, 35, 14, 35, 40, 40, 40,
-        40, 42, 40, 42, 42, 42, 43, 14,
-        14, 48, 2, 11, 43, 43, 53, 35,
-        34, 34, 34, 33, 33, 1, 35, 35,
-        35, 14, 35, 40, 40, 40, 40, 42,
-        40, 42, 42, 42, 43, 14, 14, 48,
-        43, 53, 35, 34, 34, 34, 33, 33,
-        1, 35, 35, 35, 14, 35, 40, 40,
-        40, 40, 42, 40, 42, 42, 42, 43,
-        14, 48, 11, 2, 53, 29, 29, 5,
-        42, 38, 39, 41, 43
+        40, 42, 40, 42, 42, 42, 46, 14,
+        14, 48, 1, 2, 11, 46, 46, 53,
+        35, 34, 34, 34, 33, 33, 1, 35,
+        35, 35, 14, 35, 40, 40, 40, 40,
+        42, 40, 42, 42, 42, 46, 14, 14,
+        48, 1, 46, 53, 35, 34, 34, 34,
+        33, 33, 1, 35, 35, 35, 14, 35,
+        40, 40, 40, 40, 42, 40, 42, 42,
+        42, 46, 14, 48, 11, 2, 56, 29,
+        29, 5, 42, 38, 39, 41, 46
 };
 
 static const short _use_syllable_machine_index_offsets[] = {
-        0, 4, 59, 103, 147, 201, 237, 272,
-        307, 342, 376, 410, 412, 448, 484, 520,
-        535, 571, 612, 653, 694, 735, 778, 819,
-        862, 905, 948, 992, 1007, 1056, 1086, 1116,
-        1160, 1214, 1250, 1285, 1320, 1355, 1389, 1423,
-        1425, 1461, 1497, 1533, 1548, 1584, 1625, 1666,
-        1707, 1748, 1791, 1832, 1875, 1918, 1961, 2005,
-        2020, 2035, 2084, 2087, 2099, 2143, 2187, 2241,
-        2277, 2312, 2347, 2382, 2416, 2450, 2452, 2488,
-        2524, 2560, 2575, 2611, 2652, 2693, 2734, 2775,
-        2818, 2859, 2902, 2945, 2988, 3032, 3047, 3062,
-        3111, 3155, 3209, 3245, 3280, 3315, 3350, 3384,
-        3418, 3420, 3456, 3492, 3528, 3543, 3579, 3620,
-        3661, 3702, 3743, 3786, 3827, 3870, 3913, 3956,
-        4000, 4015, 4064, 4076, 4079, 4133, 4163, 4193,
-        4199, 4242, 4281, 4321, 4363
+        0, 4, 62, 109, 156, 210, 246, 281,
+        316, 351, 385, 419, 421, 457, 493, 529,
+        544, 580, 621, 662, 703, 744, 787, 828,
+        871, 914, 957, 1004, 1019, 1068, 1098, 1128,
+        1175, 1229, 1265, 1300, 1335, 1370, 1404, 1438,
+        1440, 1476, 1512, 1548, 1563, 1599, 1640, 1681,
+        1722, 1763, 1806, 1847, 1890, 1933, 1976, 2023,
+        2038, 2053, 2102, 2104, 2107, 2119, 2166, 2213,
+        2267, 2303, 2338, 2373, 2408, 2442, 2476, 2478,
+        2514, 2550, 2586, 2601, 2637, 2678, 2719, 2760,
+        2801, 2844, 2885, 2928, 2971, 3014, 3061, 3076,
+        3091, 3140, 3142, 3189, 3243, 3279, 3314, 3349,
+        3384, 3418, 3452, 3454, 3490, 3526, 3562, 3577,
+        3613, 3654, 3695, 3736, 3777, 3820, 3861, 3904,
+        3947, 3990, 4037, 4052, 4101, 4113, 4116, 4173,
+        4203, 4233, 4239, 4282, 4321, 4361, 4403
 };
 
 static const unsigned char _use_syllable_machine_indicies[] = {
@@ -165,571 +166,578 @@ static const unsigned char _use_syllable_machine_indicies[] = {
         19, 20, 21, 8, 22, 23, 24, 25,
         5, 26, 27, 28, 5, 29, 30, 31,
         32, 33, 34, 35, 32, 1, 5, 36,
-        5, 37, 5, 39, 40, 38, 41, 38,
-        38, 38, 38, 38, 38, 38, 42, 43,
-        44, 45, 46, 47, 48, 49, 50, 39,
-        51, 52, 53, 54, 38, 55, 56, 57,
-        38, 58, 59, 38, 60, 61, 62, 63,
-        60, 38, 38, 38, 38, 64, 38, 39,
-        40, 38, 41, 38, 38, 38, 38, 38,
-        38, 38, 42, 43, 44, 45, 46, 47,
-        48, 49, 50, 39, 51, 52, 53, 54,
-        38, 55, 56, 57, 38, 38, 38, 38,
-        60, 61, 62, 63, 60, 38, 38, 38,
-        38, 64, 38, 39, 38, 38, 38, 38,
-        38, 38, 38, 38, 38, 38, 38, 38,
-        41, 38, 38, 38, 38, 38, 38, 38,
-        38, 43, 44, 45, 46, 38, 38, 38,
-        38, 38, 38, 38, 38, 38, 38, 55,
-        56, 57, 38, 38, 38, 38, 38, 61,
-        62, 63, 65, 38, 38, 38, 38, 43,
-        38, 41, 38, 38, 38, 38, 38, 38,
-        38, 38, 43, 44, 45, 46, 38, 38,
-        38, 38, 38, 38, 38, 38, 38, 38,
-        55, 56, 57, 38, 38, 38, 38, 38,
-        61, 62, 63, 65, 38, 41, 38, 38,
-        38, 38, 38, 38, 38, 38, 38, 44,
-        45, 46, 38, 38, 38, 38, 38, 38,
-        38, 38, 38, 38, 38, 38, 38, 38,
-        38, 38, 38, 38, 61, 62, 63, 38,
-        41, 38, 38, 38, 38, 38, 38, 38,
-        38, 38, 38, 45, 46, 38, 38, 38,
-        38, 38, 38, 38, 38, 38, 38, 38,
-        38, 38, 38, 38, 38, 38, 38, 61,
-        62, 63, 38, 41, 38, 38, 38, 38,
-        38, 38, 38, 38, 38, 38, 38, 46,
-        38, 38, 38, 38, 38, 38, 38, 38,
-        38, 38, 38, 38, 38, 38, 38, 38,
-        38, 38, 61, 62, 63, 38, 41, 38,
-        38, 38, 38, 38, 38, 38, 38, 38,
-        38, 38, 38, 38, 38, 38, 38, 38,
-        38, 38, 38, 38, 38, 38, 38, 38,
-        38, 38, 38, 38, 38, 61, 62, 38,
-        41, 38, 38, 38, 38, 38, 38, 38,
-        38, 38, 38, 38, 38, 38, 38, 38,
-        38, 38, 38, 38, 38, 38, 38, 38,
-        38, 38, 38, 38, 38, 38, 38, 38,
-        62, 38, 41, 38, 41, 38, 38, 38,
-        38, 38, 38, 38, 38, 38, 44, 45,
-        46, 38, 38, 38, 38, 38, 38, 38,
-        38, 38, 38, 55, 56, 57, 38, 38,
-        38, 38, 38, 61, 62, 63, 65, 38,
-        41, 38, 38, 38, 38, 38, 38, 38,
-        38, 38, 44, 45, 46, 38, 38, 38,
-        38, 38, 38, 38, 38, 38, 38, 38,
-        56, 57, 38, 38, 38, 38, 38, 61,
-        62, 63, 65, 38, 41, 38, 38, 38,
-        38, 38, 38, 38, 38, 38, 44, 45,
-        46, 38, 38, 38, 38, 38, 38, 38,
-        38, 38, 38, 38, 38, 57, 38, 38,
-        38, 38, 38, 61, 62, 63, 65, 38,
-        66, 38, 38, 38, 38, 38, 38, 38,
-        38, 38, 38, 38, 38, 41, 38, 41,
-        38, 38, 38, 38, 38, 38, 38, 38,
-        38, 44, 45, 46, 38, 38, 38, 38,
-        38, 38, 38, 38, 38, 38, 38, 38,
-        38, 38, 38, 38, 38, 38, 61, 62,
-        63, 65, 38, 41, 38, 38, 38, 38,
-        38, 38, 38, 42, 43, 44, 45, 46,
-        38, 38, 38, 38, 38, 38, 52, 53,
-        54, 38, 55, 56, 57, 38, 38, 38,
-        38, 38, 61, 62, 63, 65, 38, 38,
-        38, 38, 43, 38, 41, 38, 38, 38,
-        38, 38, 38, 38, 38, 43, 44, 45,
-        46, 38, 38, 38, 38, 38, 38, 52,
-        53, 54, 38, 55, 56, 57, 38, 38,
-        38, 38, 38, 61, 62, 63, 65, 38,
-        38, 38, 38, 43, 38, 41, 38, 38,
-        38, 38, 38, 38, 38, 38, 43, 44,
-        45, 46, 38, 38, 38, 38, 38, 38,
-        38, 53, 54, 38, 55, 56, 57, 38,
-        38, 38, 38, 38, 61, 62, 63, 65,
-        38, 38, 38, 38, 43, 38, 41, 38,
-        38, 38, 38, 38, 38, 38, 38, 43,
-        44, 45, 46, 38, 38, 38, 38, 38,
-        38, 38, 38, 54, 38, 55, 56, 57,
-        38, 38, 38, 38, 38, 61, 62, 63,
-        65, 38, 38, 38, 38, 43, 38, 67,
-        38, 41, 38, 38, 38, 38, 38, 38,
-        38, 42, 43, 44, 45, 46, 38, 48,
-        49, 38, 38, 38, 52, 53, 54, 38,
-        55, 56, 57, 38, 38, 38, 38, 38,
-        61, 62, 63, 65, 38, 38, 38, 38,
-        43, 38, 41, 38, 38, 38, 38, 38,
-        38, 38, 38, 43, 44, 45, 46, 38,
-        38, 38, 38, 38, 38, 38, 38, 38,
-        38, 55, 56, 57, 38, 38, 38, 38,
-        38, 61, 62, 63, 65, 38, 38, 38,
-        38, 43, 38, 67, 38, 41, 38, 38,
-        38, 38, 38, 38, 38, 42, 43, 44,
-        45, 46, 38, 38, 49, 38, 38, 38,
-        52, 53, 54, 38, 55, 56, 57, 38,
-        38, 38, 38, 38, 61, 62, 63, 65,
-        38, 38, 38, 38, 43, 38, 67, 38,
-        41, 38, 38, 38, 38, 38, 38, 38,
-        42, 43, 44, 45, 46, 38, 38, 38,
-        38, 38, 38, 52, 53, 54, 38, 55,
-        56, 57, 38, 38, 38, 38, 38, 61,
-        62, 63, 65, 38, 38, 38, 38, 43,
-        38, 67, 38, 41, 38, 38, 38, 38,
-        38, 38, 38, 42, 43, 44, 45, 46,
-        47, 48, 49, 38, 38, 38, 52, 53,
-        54, 38, 55, 56, 57, 38, 38, 38,
-        38, 38, 61, 62, 63, 65, 38, 38,
-        38, 38, 43, 38, 39, 40, 38, 41,
-        38, 38, 38, 38, 38, 38, 38, 42,
+        5, 37, 5, 5, 38, 5, 40, 41,
+        39, 42, 39, 39, 39, 39, 39, 39,
+        39, 43, 44, 45, 46, 47, 48, 49,
+        50, 51, 40, 52, 53, 54, 55, 39,
+        56, 57, 58, 39, 59, 60, 39, 61,
+        62, 63, 64, 61, 39, 39, 39, 39,
+        65, 39, 39, 64, 39, 40, 41, 39,
+        42, 39, 39, 39, 39, 39, 39, 39,
         43, 44, 45, 46, 47, 48, 49, 50,
-        38, 51, 52, 53, 54, 38, 55, 56,
-        57, 38, 38, 38, 38, 60, 61, 62,
-        63, 60, 38, 38, 38, 38, 64, 38,
-        39, 38, 38, 38, 38, 38, 38, 38,
-        38, 38, 38, 38, 38, 41, 38, 39,
-        38, 38, 38, 38, 38, 38, 38, 38,
-        38, 38, 38, 38, 41, 38, 38, 38,
-        38, 38, 38, 38, 38, 43, 44, 45,
-        46, 38, 38, 38, 38, 38, 38, 38,
-        38, 38, 38, 55, 56, 57, 38, 38,
-        38, 38, 38, 61, 62, 63, 65, 38,
-        41, 38, 38, 38, 38, 38, 38, 38,
-        38, 38, 38, 38, 38, 38, 38, 38,
-        38, 38, 38, 38, 38, 38, 38, 38,
-        38, 38, 38, 58, 59, 38, 41, 38,
-        38, 38, 38, 38, 38, 38, 38, 38,
-        38, 38, 38, 38, 38, 38, 38, 38,
-        38, 38, 38, 38, 38, 38, 38, 38,
-        38, 38, 59, 38, 4, 69, 68, 70,
-        68, 68, 68, 68, 68, 68, 68, 71,
-        72, 73, 74, 75, 76, 77, 78, 79,
-        4, 80, 81, 82, 83, 68, 84, 85,
-        86, 68, 68, 68, 68, 87, 88, 89,
-        90, 91, 68, 68, 68, 68, 92, 68,
-        4, 68, 68, 68, 68, 68, 68, 68,
-        68, 68, 68, 68, 68, 70, 68, 68,
-        68, 68, 68, 68, 68, 68, 72, 73,
-        74, 75, 68, 68, 68, 68, 68, 68,
-        68, 68, 68, 68, 84, 85, 86, 68,
-        68, 68, 68, 68, 88, 89, 90, 93,
-        68, 68, 68, 68, 72, 68, 70, 68,
-        68, 68, 68, 68, 68, 68, 68, 72,
-        73, 74, 75, 68, 68, 68, 68, 68,
-        68, 68, 68, 68, 68, 84, 85, 86,
-        68, 68, 68, 68, 68, 88, 89, 90,
-        93, 68, 70, 68, 68, 68, 68, 68,
-        68, 68, 68, 68, 73, 74, 75, 68,
-        68, 68, 68, 68, 68, 68, 68, 68,
-        68, 68, 68, 68, 68, 68, 68, 68,
-        68, 88, 89, 90, 68, 70, 68, 68,
-        68, 68, 68, 68, 68, 68, 68, 68,
-        74, 75, 68, 68, 68, 68, 68, 68,
-        68, 68, 68, 68, 68, 68, 68, 68,
-        68, 68, 68, 68, 88, 89, 90, 68,
-        70, 68, 68, 68, 68, 68, 68, 68,
-        68, 68, 68, 68, 75, 68, 68, 68,
-        68, 68, 68, 68, 68, 68, 68, 68,
-        68, 68, 68, 68, 68, 68, 68, 88,
-        89, 90, 68, 70, 68, 68, 68, 68,
-        68, 68, 68, 68, 68, 68, 68, 68,
-        68, 68, 68, 68, 68, 68, 68, 68,
-        68, 68, 68, 68, 68, 68, 68, 68,
-        68, 68, 88, 89, 68, 70, 68, 68,
-        68, 68, 68, 68, 68, 68, 68, 68,
-        68, 68, 68, 68, 68, 68, 68, 68,
-        68, 68, 68, 68, 68, 68, 68, 68,
-        68, 68, 68, 68, 68, 89, 68, 70,
-        68, 70, 68, 68, 68, 68, 68, 68,
-        68, 68, 68, 73, 74, 75, 68, 68,
-        68, 68, 68, 68, 68, 68, 68, 68,
-        84, 85, 86, 68, 68, 68, 68, 68,
-        88, 89, 90, 93, 68, 70, 68, 68,
-        68, 68, 68, 68, 68, 68, 68, 73,
-        74, 75, 68, 68, 68, 68, 68, 68,
-        68, 68, 68, 68, 68, 85, 86, 68,
-        68, 68, 68, 68, 88, 89, 90, 93,
-        68, 70, 68, 68, 68, 68, 68, 68,
-        68, 68, 68, 73, 74, 75, 68, 68,
-        68, 68, 68, 68, 68, 68, 68, 68,
-        68, 68, 86, 68, 68, 68, 68, 68,
-        88, 89, 90, 93, 68, 95, 94, 94,
-        94, 94, 94, 94, 94, 94, 94, 94,
-        94, 94, 96, 94, 70, 68, 68, 68,
-        68, 68, 68, 68, 68, 68, 73, 74,
-        75, 68, 68, 68, 68, 68, 68, 68,
-        68, 68, 68, 68, 68, 68, 68, 68,
-        68, 68, 68, 88, 89, 90, 93, 68,
-        70, 68, 68, 68, 68, 68, 68, 68,
-        71, 72, 73, 74, 75, 68, 68, 68,
-        68, 68, 68, 81, 82, 83, 68, 84,
-        85, 86, 68, 68, 68, 68, 68, 88,
-        89, 90, 93, 68, 68, 68, 68, 72,
-        68, 70, 68, 68, 68, 68, 68, 68,
-        68, 68, 72, 73, 74, 75, 68, 68,
-        68, 68, 68, 68, 81, 82, 83, 68,
-        84, 85, 86, 68, 68, 68, 68, 68,
-        88, 89, 90, 93, 68, 68, 68, 68,
-        72, 68, 70, 68, 68, 68, 68, 68,
-        68, 68, 68, 72, 73, 74, 75, 68,
-        68, 68, 68, 68, 68, 68, 82, 83,
-        68, 84, 85, 86, 68, 68, 68, 68,
-        68, 88, 89, 90, 93, 68, 68, 68,
-        68, 72, 68, 70, 68, 68, 68, 68,
-        68, 68, 68, 68, 72, 73, 74, 75,
-        68, 68, 68, 68, 68, 68, 68, 68,
-        83, 68, 84, 85, 86, 68, 68, 68,
-        68, 68, 88, 89, 90, 93, 68, 68,
-        68, 68, 72, 68, 97, 68, 70, 68,
-        68, 68, 68, 68, 68, 68, 71, 72,
-        73, 74, 75, 68, 77, 78, 68, 68,
-        68, 81, 82, 83, 68, 84, 85, 86,
-        68, 68, 68, 68, 68, 88, 89, 90,
-        93, 68, 68, 68, 68, 72, 68, 70,
-        68, 68, 68, 68, 68, 68, 68, 68,
-        72, 73, 74, 75, 68, 68, 68, 68,
-        68, 68, 68, 68, 68, 68, 84, 85,
-        86, 68, 68, 68, 68, 68, 88, 89,
-        90, 93, 68, 68, 68, 68, 72, 68,
-        97, 68, 70, 68, 68, 68, 68, 68,
-        68, 68, 71, 72, 73, 74, 75, 68,
-        68, 78, 68, 68, 68, 81, 82, 83,
-        68, 84, 85, 86, 68, 68, 68, 68,
-        68, 88, 89, 90, 93, 68, 68, 68,
-        68, 72, 68, 97, 68, 70, 68, 68,
-        68, 68, 68, 68, 68, 71, 72, 73,
-        74, 75, 68, 68, 68, 68, 68, 68,
-        81, 82, 83, 68, 84, 85, 86, 68,
-        68, 68, 68, 68, 88, 89, 90, 93,
-        68, 68, 68, 68, 72, 68, 97, 68,
-        70, 68, 68, 68, 68, 68, 68, 68,
-        71, 72, 73, 74, 75, 76, 77, 78,
-        68, 68, 68, 81, 82, 83, 68, 84,
-        85, 86, 68, 68, 68, 68, 68, 88,
-        89, 90, 93, 68, 68, 68, 68, 72,
-        68, 4, 69, 68, 70, 68, 68, 68,
-        68, 68, 68, 68, 71, 72, 73, 74,
-        75, 76, 77, 78, 79, 68, 80, 81,
-        82, 83, 68, 84, 85, 86, 68, 68,
-        68, 68, 87, 88, 89, 90, 91, 68,
-        68, 68, 68, 92, 68, 4, 98, 98,
-        98, 98, 98, 98, 98, 98, 98, 98,
-        98, 98, 99, 98, 4, 94, 94, 94,
-        94, 94, 94, 94, 94, 94, 94, 94,
-        94, 96, 94, 4, 68, 68, 68, 68,
-        68, 68, 68, 68, 68, 68, 68, 68,
-        70, 68, 68, 68, 68, 68, 68, 68,
-        68, 72, 73, 74, 75, 68, 68, 68,
-        68, 68, 68, 68, 68, 68, 68, 84,
-        85, 86, 68, 68, 68, 68, 68, 88,
-        89, 90, 93, 68, 101, 102, 100, 6,
-        103, 103, 103, 103, 103, 103, 103, 103,
-        103, 104, 103, 105, 106, 68, 70, 68,
-        68, 68, 68, 68, 68, 68, 107, 108,
-        109, 110, 111, 112, 113, 114, 115, 105,
-        116, 117, 118, 119, 68, 120, 121, 122,
-        68, 58, 59, 68, 123, 124, 125, 126,
-        127, 68, 68, 68, 68, 128, 68, 105,
-        106, 68, 70, 68, 68, 68, 68, 68,
-        68, 68, 107, 108, 109, 110, 111, 112,
-        113, 114, 115, 105, 116, 117, 118, 119,
-        68, 120, 121, 122, 68, 68, 68, 68,
-        123, 124, 125, 126, 127, 68, 68, 68,
-        68, 128, 68, 105, 68, 68, 68, 68,
-        68, 68, 68, 68, 68, 68, 68, 68,
-        70, 68, 68, 68, 68, 68, 68, 68,
-        68, 108, 109, 110, 111, 68, 68, 68,
-        68, 68, 68, 68, 68, 68, 68, 120,
-        121, 122, 68, 68, 68, 68, 68, 124,
-        125, 126, 129, 68, 68, 68, 68, 108,
-        68, 70, 68, 68, 68, 68, 68, 68,
-        68, 68, 108, 109, 110, 111, 68, 68,
-        68, 68, 68, 68, 68, 68, 68, 68,
-        120, 121, 122, 68, 68, 68, 68, 68,
-        124, 125, 126, 129, 68, 70, 68, 68,
-        68, 68, 68, 68, 68, 68, 68, 109,
-        110, 111, 68, 68, 68, 68, 68, 68,
-        68, 68, 68, 68, 68, 68, 68, 68,
-        68, 68, 68, 68, 124, 125, 126, 68,
-        70, 68, 68, 68, 68, 68, 68, 68,
-        68, 68, 68, 110, 111, 68, 68, 68,
-        68, 68, 68, 68, 68, 68, 68, 68,
-        68, 68, 68, 68, 68, 68, 68, 124,
-        125, 126, 68, 70, 68, 68, 68, 68,
-        68, 68, 68, 68, 68, 68, 68, 111,
-        68, 68, 68, 68, 68, 68, 68, 68,
-        68, 68, 68, 68, 68, 68, 68, 68,
-        68, 68, 124, 125, 126, 68, 70, 68,
-        68, 68, 68, 68, 68, 68, 68, 68,
-        68, 68, 68, 68, 68, 68, 68, 68,
-        68, 68, 68, 68, 68, 68, 68, 68,
-        68, 68, 68, 68, 68, 124, 125, 68,
-        70, 68, 68, 68, 68, 68, 68, 68,
-        68, 68, 68, 68, 68, 68, 68, 68,
-        68, 68, 68, 68, 68, 68, 68, 68,
-        68, 68, 68, 68, 68, 68, 68, 68,
-        125, 68, 70, 68, 70, 68, 68, 68,
-        68, 68, 68, 68, 68, 68, 109, 110,
-        111, 68, 68, 68, 68, 68, 68, 68,
-        68, 68, 68, 120, 121, 122, 68, 68,
-        68, 68, 68, 124, 125, 126, 129, 68,
-        70, 68, 68, 68, 68, 68, 68, 68,
-        68, 68, 109, 110, 111, 68, 68, 68,
-        68, 68, 68, 68, 68, 68, 68, 68,
-        121, 122, 68, 68, 68, 68, 68, 124,
-        125, 126, 129, 68, 70, 68, 68, 68,
-        68, 68, 68, 68, 68, 68, 109, 110,
-        111, 68, 68, 68, 68, 68, 68, 68,
-        68, 68, 68, 68, 68, 122, 68, 68,
-        68, 68, 68, 124, 125, 126, 129, 68,
-        130, 94, 94, 94, 94, 94, 94, 94,
-        94, 94, 94, 94, 94, 96, 94, 70,
-        68, 68, 68, 68, 68, 68, 68, 68,
-        68, 109, 110, 111, 68, 68, 68, 68,
-        68, 68, 68, 68, 68, 68, 68, 68,
-        68, 68, 68, 68, 68, 68, 124, 125,
-        126, 129, 68, 70, 68, 68, 68, 68,
-        68, 68, 68, 107, 108, 109, 110, 111,
-        68, 68, 68, 68, 68, 68, 117, 118,
-        119, 68, 120, 121, 122, 68, 68, 68,
-        68, 68, 124, 125, 126, 129, 68, 68,
-        68, 68, 108, 68, 70, 68, 68, 68,
-        68, 68, 68, 68, 68, 108, 109, 110,
-        111, 68, 68, 68, 68, 68, 68, 117,
-        118, 119, 68, 120, 121, 122, 68, 68,
-        68, 68, 68, 124, 125, 126, 129, 68,
-        68, 68, 68, 108, 68, 70, 68, 68,
-        68, 68, 68, 68, 68, 68, 108, 109,
-        110, 111, 68, 68, 68, 68, 68, 68,
-        68, 118, 119, 68, 120, 121, 122, 68,
-        68, 68, 68, 68, 124, 125, 126, 129,
-        68, 68, 68, 68, 108, 68, 70, 68,
-        68, 68, 68, 68, 68, 68, 68, 108,
-        109, 110, 111, 68, 68, 68, 68, 68,
-        68, 68, 68, 119, 68, 120, 121, 122,
-        68, 68, 68, 68, 68, 124, 125, 126,
-        129, 68, 68, 68, 68, 108, 68, 131,
-        68, 70, 68, 68, 68, 68, 68, 68,
-        68, 107, 108, 109, 110, 111, 68, 113,
-        114, 68, 68, 68, 117, 118, 119, 68,
-        120, 121, 122, 68, 68, 68, 68, 68,
-        124, 125, 126, 129, 68, 68, 68, 68,
-        108, 68, 70, 68, 68, 68, 68, 68,
-        68, 68, 68, 108, 109, 110, 111, 68,
-        68, 68, 68, 68, 68, 68, 68, 68,
-        68, 120, 121, 122, 68, 68, 68, 68,
-        68, 124, 125, 126, 129, 68, 68, 68,
-        68, 108, 68, 131, 68, 70, 68, 68,
-        68, 68, 68, 68, 68, 107, 108, 109,
-        110, 111, 68, 68, 114, 68, 68, 68,
-        117, 118, 119, 68, 120, 121, 122, 68,
-        68, 68, 68, 68, 124, 125, 126, 129,
-        68, 68, 68, 68, 108, 68, 131, 68,
-        70, 68, 68, 68, 68, 68, 68, 68,
-        107, 108, 109, 110, 111, 68, 68, 68,
-        68, 68, 68, 117, 118, 119, 68, 120,
-        121, 122, 68, 68, 68, 68, 68, 124,
-        125, 126, 129, 68, 68, 68, 68, 108,
-        68, 131, 68, 70, 68, 68, 68, 68,
-        68, 68, 68, 107, 108, 109, 110, 111,
-        112, 113, 114, 68, 68, 68, 117, 118,
-        119, 68, 120, 121, 122, 68, 68, 68,
-        68, 68, 124, 125, 126, 129, 68, 68,
-        68, 68, 108, 68, 105, 106, 68, 70,
-        68, 68, 68, 68, 68, 68, 68, 107,
-        108, 109, 110, 111, 112, 113, 114, 115,
-        68, 116, 117, 118, 119, 68, 120, 121,
-        122, 68, 68, 68, 68, 123, 124, 125,
-        126, 127, 68, 68, 68, 68, 128, 68,
-        105, 98, 98, 98, 98, 98, 98, 98,
-        98, 98, 98, 98, 98, 99, 98, 105,
-        94, 94, 94, 94, 94, 94, 94, 94,
-        94, 94, 94, 94, 96, 94, 105, 68,
-        68, 68, 68, 68, 68, 68, 68, 68,
-        68, 68, 68, 70, 68, 68, 68, 68,
-        68, 68, 68, 68, 108, 109, 110, 111,
-        68, 68, 68, 68, 68, 68, 68, 68,
-        68, 68, 120, 121, 122, 68, 68, 68,
-        68, 68, 124, 125, 126, 129, 68, 8,
-        9, 132, 11, 132, 132, 132, 132, 132,
-        132, 132, 13, 14, 15, 16, 17, 18,
-        19, 20, 21, 8, 22, 23, 24, 25,
-        132, 26, 27, 28, 132, 132, 132, 132,
-        32, 33, 34, 35, 32, 132, 132, 132,
-        132, 37, 132, 8, 132, 132, 132, 132,
-        132, 132, 132, 132, 132, 132, 132, 132,
-        11, 132, 132, 132, 132, 132, 132, 132,
-        132, 14, 15, 16, 17, 132, 132, 132,
-        132, 132, 132, 132, 132, 132, 132, 26,
-        27, 28, 132, 132, 132, 132, 132, 33,
-        34, 35, 133, 132, 132, 132, 132, 14,
-        132, 11, 132, 132, 132, 132, 132, 132,
-        132, 132, 14, 15, 16, 17, 132, 132,
-        132, 132, 132, 132, 132, 132, 132, 132,
-        26, 27, 28, 132, 132, 132, 132, 132,
-        33, 34, 35, 133, 132, 11, 132, 132,
-        132, 132, 132, 132, 132, 132, 132, 15,
-        16, 17, 132, 132, 132, 132, 132, 132,
-        132, 132, 132, 132, 132, 132, 132, 132,
-        132, 132, 132, 132, 33, 34, 35, 132,
-        11, 132, 132, 132, 132, 132, 132, 132,
-        132, 132, 132, 16, 17, 132, 132, 132,
-        132, 132, 132, 132, 132, 132, 132, 132,
-        132, 132, 132, 132, 132, 132, 132, 33,
-        34, 35, 132, 11, 132, 132, 132, 132,
-        132, 132, 132, 132, 132, 132, 132, 17,
-        132, 132, 132, 132, 132, 132, 132, 132,
-        132, 132, 132, 132, 132, 132, 132, 132,
-        132, 132, 33, 34, 35, 132, 11, 132,
-        132, 132, 132, 132, 132, 132, 132, 132,
-        132, 132, 132, 132, 132, 132, 132, 132,
-        132, 132, 132, 132, 132, 132, 132, 132,
-        132, 132, 132, 132, 132, 33, 34, 132,
-        11, 132, 132, 132, 132, 132, 132, 132,
-        132, 132, 132, 132, 132, 132, 132, 132,
-        132, 132, 132, 132, 132, 132, 132, 132,
-        132, 132, 132, 132, 132, 132, 132, 132,
-        34, 132, 11, 132, 11, 132, 132, 132,
-        132, 132, 132, 132, 132, 132, 15, 16,
-        17, 132, 132, 132, 132, 132, 132, 132,
-        132, 132, 132, 26, 27, 28, 132, 132,
-        132, 132, 132, 33, 34, 35, 133, 132,
-        11, 132, 132, 132, 132, 132, 132, 132,
-        132, 132, 15, 16, 17, 132, 132, 132,
-        132, 132, 132, 132, 132, 132, 132, 132,
-        27, 28, 132, 132, 132, 132, 132, 33,
-        34, 35, 133, 132, 11, 132, 132, 132,
-        132, 132, 132, 132, 132, 132, 15, 16,
-        17, 132, 132, 132, 132, 132, 132, 132,
-        132, 132, 132, 132, 132, 28, 132, 132,
-        132, 132, 132, 33, 34, 35, 133, 132,
-        134, 132, 132, 132, 132, 132, 132, 132,
-        132, 132, 132, 132, 132, 11, 132, 11,
-        132, 132, 132, 132, 132, 132, 132, 132,
-        132, 15, 16, 17, 132, 132, 132, 132,
-        132, 132, 132, 132, 132, 132, 132, 132,
-        132, 132, 132, 132, 132, 132, 33, 34,
-        35, 133, 132, 11, 132, 132, 132, 132,
-        132, 132, 132, 13, 14, 15, 16, 17,
-        132, 132, 132, 132, 132, 132, 23, 24,
-        25, 132, 26, 27, 28, 132, 132, 132,
-        132, 132, 33, 34, 35, 133, 132, 132,
-        132, 132, 14, 132, 11, 132, 132, 132,
-        132, 132, 132, 132, 132, 14, 15, 16,
-        17, 132, 132, 132, 132, 132, 132, 23,
-        24, 25, 132, 26, 27, 28, 132, 132,
-        132, 132, 132, 33, 34, 35, 133, 132,
-        132, 132, 132, 14, 132, 11, 132, 132,
-        132, 132, 132, 132, 132, 132, 14, 15,
-        16, 17, 132, 132, 132, 132, 132, 132,
-        132, 24, 25, 132, 26, 27, 28, 132,
-        132, 132, 132, 132, 33, 34, 35, 133,
-        132, 132, 132, 132, 14, 132, 11, 132,
-        132, 132, 132, 132, 132, 132, 132, 14,
-        15, 16, 17, 132, 132, 132, 132, 132,
-        132, 132, 132, 25, 132, 26, 27, 28,
-        132, 132, 132, 132, 132, 33, 34, 35,
-        133, 132, 132, 132, 132, 14, 132, 135,
-        132, 11, 132, 132, 132, 132, 132, 132,
-        132, 13, 14, 15, 16, 17, 132, 19,
-        20, 132, 132, 132, 23, 24, 25, 132,
-        26, 27, 28, 132, 132, 132, 132, 132,
-        33, 34, 35, 133, 132, 132, 132, 132,
-        14, 132, 11, 132, 132, 132, 132, 132,
-        132, 132, 132, 14, 15, 16, 17, 132,
-        132, 132, 132, 132, 132, 132, 132, 132,
-        132, 26, 27, 28, 132, 132, 132, 132,
-        132, 33, 34, 35, 133, 132, 132, 132,
-        132, 14, 132, 135, 132, 11, 132, 132,
-        132, 132, 132, 132, 132, 13, 14, 15,
-        16, 17, 132, 132, 20, 132, 132, 132,
-        23, 24, 25, 132, 26, 27, 28, 132,
-        132, 132, 132, 132, 33, 34, 35, 133,
-        132, 132, 132, 132, 14, 132, 135, 132,
-        11, 132, 132, 132, 132, 132, 132, 132,
-        13, 14, 15, 16, 17, 132, 132, 132,
-        132, 132, 132, 23, 24, 25, 132, 26,
-        27, 28, 132, 132, 132, 132, 132, 33,
-        34, 35, 133, 132, 132, 132, 132, 14,
-        132, 135, 132, 11, 132, 132, 132, 132,
-        132, 132, 132, 13, 14, 15, 16, 17,
-        18, 19, 20, 132, 132, 132, 23, 24,
-        25, 132, 26, 27, 28, 132, 132, 132,
-        132, 132, 33, 34, 35, 133, 132, 132,
-        132, 132, 14, 132, 8, 9, 132, 11,
-        132, 132, 132, 132, 132, 132, 132, 13,
-        14, 15, 16, 17, 18, 19, 20, 21,
-        132, 22, 23, 24, 25, 132, 26, 27,
-        28, 132, 132, 132, 132, 32, 33, 34,
-        35, 32, 132, 132, 132, 132, 37, 132,
-        8, 132, 132, 132, 132, 132, 132, 132,
-        132, 132, 132, 132, 132, 11, 132, 8,
-        132, 132, 132, 132, 132, 132, 132, 132,
-        132, 132, 132, 132, 11, 132, 132, 132,
-        132, 132, 132, 132, 132, 14, 15, 16,
-        17, 132, 132, 132, 132, 132, 132, 132,
-        132, 132, 132, 26, 27, 28, 132, 132,
-        132, 132, 132, 33, 34, 35, 133, 132,
-        136, 132, 132, 132, 132, 132, 132, 132,
-        132, 132, 11, 132, 10, 11, 132, 4,
-        132, 132, 132, 4, 132, 132, 132, 132,
-        132, 8, 9, 10, 11, 132, 132, 132,
-        132, 132, 132, 132, 13, 14, 15, 16,
-        17, 18, 19, 20, 21, 8, 22, 23,
-        24, 25, 132, 26, 27, 28, 132, 29,
-        30, 132, 32, 33, 34, 35, 32, 132,
-        132, 132, 132, 37, 132, 11, 132, 132,
-        132, 132, 132, 132, 132, 132, 132, 132,
-        132, 132, 132, 132, 132, 132, 132, 132,
-        132, 132, 132, 132, 132, 132, 132, 132,
-        29, 30, 132, 11, 132, 132, 132, 132,
-        132, 132, 132, 132, 132, 132, 132, 132,
-        132, 132, 132, 132, 132, 132, 132, 132,
-        132, 132, 132, 132, 132, 132, 132, 30,
-        132, 4, 137, 137, 137, 4, 137, 139,
-        138, 138, 138, 138, 138, 138, 138, 138,
-        138, 138, 138, 138, 138, 138, 138, 138,
-        138, 138, 138, 138, 138, 138, 138, 138,
-        138, 138, 138, 138, 138, 138, 138, 138,
-        138, 138, 138, 140, 138, 141, 138, 141,
-        142, 138, 139, 138, 138, 138, 138, 138,
-        138, 138, 138, 138, 138, 138, 138, 138,
-        138, 138, 138, 138, 138, 138, 138, 138,
-        138, 138, 138, 138, 138, 138, 138, 138,
-        138, 138, 138, 138, 138, 1, 140, 140,
-        138, 139, 138, 138, 138, 138, 138, 138,
-        138, 138, 138, 138, 138, 138, 138, 138,
-        138, 138, 138, 138, 138, 138, 138, 138,
-        138, 138, 138, 138, 138, 138, 138, 138,
-        138, 138, 138, 138, 138, 140, 138, 141,
-        138, 139, 138, 138, 138, 138, 138, 138,
-        138, 138, 138, 138, 138, 138, 138, 138,
-        138, 138, 138, 138, 138, 138, 138, 138,
-        138, 138, 138, 138, 138, 138, 138, 138,
-        138, 138, 138, 138, 138, 140, 138, 141,
-        138, 141, 138, 39, 40, 38, 41, 38,
-        38, 38, 38, 38, 38, 38, 42, 43,
-        44, 45, 46, 47, 48, 49, 50, 39,
-        51, 52, 53, 54, 38, 55, 56, 57,
-        38, 58, 59, 38, 60, 61, 62, 63,
-        60, 1, 38, 2, 38, 64, 38, 0
+        51, 40, 52, 53, 54, 55, 39, 56,
+        57, 58, 39, 39, 39, 39, 61, 62,
+        63, 64, 61, 39, 39, 39, 39, 65,
+        39, 39, 64, 39, 40, 39, 39, 39,
+        39, 39, 39, 39, 39, 39, 39, 39,
+        39, 42, 39, 39, 39, 39, 39, 39,
+        39, 39, 44, 45, 46, 47, 39, 39,
+        39, 39, 39, 39, 39, 39, 39, 39,
+        56, 57, 58, 39, 39, 39, 39, 39,
+        62, 63, 64, 66, 39, 39, 39, 39,
+        44, 39, 42, 39, 39, 39, 39, 39,
+        39, 39, 39, 44, 45, 46, 47, 39,
+        39, 39, 39, 39, 39, 39, 39, 39,
+        39, 56, 57, 58, 39, 39, 39, 39,
+        39, 62, 63, 64, 66, 39, 42, 39,
+        39, 39, 39, 39, 39, 39, 39, 39,
+        45, 46, 47, 39, 39, 39, 39, 39,
+        39, 39, 39, 39, 39, 39, 39, 39,
+        39, 39, 39, 39, 39, 62, 63, 64,
+        39, 42, 39, 39, 39, 39, 39, 39,
+        39, 39, 39, 39, 46, 47, 39, 39,
+        39, 39, 39, 39, 39, 39, 39, 39,
+        39, 39, 39, 39, 39, 39, 39, 39,
+        62, 63, 64, 39, 42, 39, 39, 39,
+        39, 39, 39, 39, 39, 39, 39, 39,
+        47, 39, 39, 39, 39, 39, 39, 39,
+        39, 39, 39, 39, 39, 39, 39, 39,
+        39, 39, 39, 62, 63, 64, 39, 42,
+        39, 39, 39, 39, 39, 39, 39, 39,
+        39, 39, 39, 39, 39, 39, 39, 39,
+        39, 39, 39, 39, 39, 39, 39, 39,
+        39, 39, 39, 39, 39, 39, 62, 63,
+        39, 42, 39, 39, 39, 39, 39, 39,
+        39, 39, 39, 39, 39, 39, 39, 39,
+        39, 39, 39, 39, 39, 39, 39, 39,
+        39, 39, 39, 39, 39, 39, 39, 39,
+        39, 63, 39, 42, 39, 42, 39, 39,
+        39, 39, 39, 39, 39, 39, 39, 45,
+        46, 47, 39, 39, 39, 39, 39, 39,
+        39, 39, 39, 39, 56, 57, 58, 39,
+        39, 39, 39, 39, 62, 63, 64, 66,
+        39, 42, 39, 39, 39, 39, 39, 39,
+        39, 39, 39, 45, 46, 47, 39, 39,
+        39, 39, 39, 39, 39, 39, 39, 39,
+        39, 57, 58, 39, 39, 39, 39, 39,
+        62, 63, 64, 66, 39, 42, 39, 39,
+        39, 39, 39, 39, 39, 39, 39, 45,
+        46, 47, 39, 39, 39, 39, 39, 39,
+        39, 39, 39, 39, 39, 39, 58, 39,
+        39, 39, 39, 39, 62, 63, 64, 66,
+        39, 67, 39, 39, 39, 39, 39, 39,
+        39, 39, 39, 39, 39, 39, 42, 39,
+        42, 39, 39, 39, 39, 39, 39, 39,
+        39, 39, 45, 46, 47, 39, 39, 39,
+        39, 39, 39, 39, 39, 39, 39, 39,
+        39, 39, 39, 39, 39, 39, 39, 62,
+        63, 64, 66, 39, 42, 39, 39, 39,
+        39, 39, 39, 39, 43, 44, 45, 46,
+        47, 39, 39, 39, 39, 39, 39, 53,
+        54, 55, 39, 56, 57, 58, 39, 39,
+        39, 39, 39, 62, 63, 64, 66, 39,
+        39, 39, 39, 44, 39, 42, 39, 39,
+        39, 39, 39, 39, 39, 39, 44, 45,
+        46, 47, 39, 39, 39, 39, 39, 39,
+        53, 54, 55, 39, 56, 57, 58, 39,
+        39, 39, 39, 39, 62, 63, 64, 66,
+        39, 39, 39, 39, 44, 39, 42, 39,
+        39, 39, 39, 39, 39, 39, 39, 44,
+        45, 46, 47, 39, 39, 39, 39, 39,
+        39, 39, 54, 55, 39, 56, 57, 58,
+        39, 39, 39, 39, 39, 62, 63, 64,
+        66, 39, 39, 39, 39, 44, 39, 42,
+        39, 39, 39, 39, 39, 39, 39, 39,
+        44, 45, 46, 47, 39, 39, 39, 39,
+        39, 39, 39, 39, 55, 39, 56, 57,
+        58, 39, 39, 39, 39, 39, 62, 63,
+        64, 66, 39, 39, 39, 39, 44, 39,
+        68, 39, 42, 39, 39, 39, 39, 39,
+        39, 39, 43, 44, 45, 46, 47, 39,
+        49, 50, 39, 39, 39, 53, 54, 55,
+        39, 56, 57, 58, 39, 39, 39, 39,
+        39, 62, 63, 64, 66, 39, 39, 39,
+        39, 44, 39, 42, 39, 39, 39, 39,
+        39, 39, 39, 39, 44, 45, 46, 47,
+        39, 39, 39, 39, 39, 39, 39, 39,
+        39, 39, 56, 57, 58, 39, 39, 39,
+        39, 39, 62, 63, 64, 66, 39, 39,
+        39, 39, 44, 39, 68, 39, 42, 39,
+        39, 39, 39, 39, 39, 39, 43, 44,
+        45, 46, 47, 39, 39, 50, 39, 39,
+        39, 53, 54, 55, 39, 56, 57, 58,
+        39, 39, 39, 39, 39, 62, 63, 64,
+        66, 39, 39, 39, 39, 44, 39, 68,
+        39, 42, 39, 39, 39, 39, 39, 39,
+        39, 43, 44, 45, 46, 47, 39, 39,
+        39, 39, 39, 39, 53, 54, 55, 39,
+        56, 57, 58, 39, 39, 39, 39, 39,
+        62, 63, 64, 66, 39, 39, 39, 39,
+        44, 39, 68, 39, 42, 39, 39, 39,
+        39, 39, 39, 39, 43, 44, 45, 46,
+        47, 48, 49, 50, 39, 39, 39, 53,
+        54, 55, 39, 56, 57, 58, 39, 39,
+        39, 39, 39, 62, 63, 64, 66, 39,
+        39, 39, 39, 44, 39, 40, 41, 39,
+        42, 39, 39, 39, 39, 39, 39, 39,
+        43, 44, 45, 46, 47, 48, 49, 50,
+        51, 39, 52, 53, 54, 55, 39, 56,
+        57, 58, 39, 39, 39, 39, 61, 62,
+        63, 64, 61, 39, 39, 39, 39, 65,
+        39, 39, 64, 39, 40, 39, 39, 39,
+        39, 39, 39, 39, 39, 39, 39, 39,
+        39, 42, 39, 40, 39, 39, 39, 39,
+        39, 39, 39, 39, 39, 39, 39, 39,
+        42, 39, 39, 39, 39, 39, 39, 39,
+        39, 44, 45, 46, 47, 39, 39, 39,
+        39, 39, 39, 39, 39, 39, 39, 56,
+        57, 58, 39, 39, 39, 39, 39, 62,
+        63, 64, 66, 39, 42, 39, 39, 39,
+        39, 39, 39, 39, 39, 39, 39, 39,
+        39, 39, 39, 39, 39, 39, 39, 39,
+        39, 39, 39, 39, 39, 39, 39, 59,
+        60, 39, 42, 39, 39, 39, 39, 39,
+        39, 39, 39, 39, 39, 39, 39, 39,
+        39, 39, 39, 39, 39, 39, 39, 39,
+        39, 39, 39, 39, 39, 39, 60, 39,
+        4, 70, 69, 71, 69, 69, 69, 69,
+        69, 69, 69, 72, 73, 74, 75, 76,
+        77, 78, 79, 80, 4, 81, 82, 83,
+        84, 69, 85, 86, 87, 69, 69, 69,
+        69, 88, 89, 90, 91, 92, 69, 69,
+        69, 69, 93, 69, 69, 94, 69, 4,
+        69, 69, 69, 69, 69, 69, 69, 69,
+        69, 69, 69, 69, 71, 69, 69, 69,
+        69, 69, 69, 69, 69, 73, 74, 75,
+        76, 69, 69, 69, 69, 69, 69, 69,
+        69, 69, 69, 85, 86, 87, 69, 69,
+        69, 69, 69, 89, 90, 91, 95, 69,
+        69, 69, 69, 73, 69, 71, 69, 69,
+        69, 69, 69, 69, 69, 69, 73, 74,
+        75, 76, 69, 69, 69, 69, 69, 69,
+        69, 69, 69, 69, 85, 86, 87, 69,
+        69, 69, 69, 69, 89, 90, 91, 95,
+        69, 71, 69, 69, 69, 69, 69, 69,
+        69, 69, 69, 74, 75, 76, 69, 69,
+        69, 69, 69, 69, 69, 69, 69, 69,
+        69, 69, 69, 69, 69, 69, 69, 69,
+        89, 90, 91, 69, 71, 69, 69, 69,
+        69, 69, 69, 69, 69, 69, 69, 75,
+        76, 69, 69, 69, 69, 69, 69, 69,
+        69, 69, 69, 69, 69, 69, 69, 69,
+        69, 69, 69, 89, 90, 91, 69, 71,
+        69, 69, 69, 69, 69, 69, 69, 69,
+        69, 69, 69, 76, 69, 69, 69, 69,
+        69, 69, 69, 69, 69, 69, 69, 69,
+        69, 69, 69, 69, 69, 69, 89, 90,
+        91, 69, 71, 69, 69, 69, 69, 69,
+        69, 69, 69, 69, 69, 69, 69, 69,
+        69, 69, 69, 69, 69, 69, 69, 69,
+        69, 69, 69, 69, 69, 69, 69, 69,
+        69, 89, 90, 69, 71, 69, 69, 69,
+        69, 69, 69, 69, 69, 69, 69, 69,
+        69, 69, 69, 69, 69, 69, 69, 69,
+        69, 69, 69, 69, 69, 69, 69, 69,
+        69, 69, 69, 69, 90, 69, 71, 69,
+        71, 69, 69, 69, 69, 69, 69, 69,
+        69, 69, 74, 75, 76, 69, 69, 69,
+        69, 69, 69, 69, 69, 69, 69, 85,
+        86, 87, 69, 69, 69, 69, 69, 89,
+        90, 91, 95, 69, 71, 69, 69, 69,
+        69, 69, 69, 69, 69, 69, 74, 75,
+        76, 69, 69, 69, 69, 69, 69, 69,
+        69, 69, 69, 69, 86, 87, 69, 69,
+        69, 69, 69, 89, 90, 91, 95, 69,
+        71, 69, 69, 69, 69, 69, 69, 69,
+        69, 69, 74, 75, 76, 69, 69, 69,
+        69, 69, 69, 69, 69, 69, 69, 69,
+        69, 87, 69, 69, 69, 69, 69, 89,
+        90, 91, 95, 69, 97, 96, 96, 96,
+        96, 96, 96, 96, 96, 96, 96, 96,
+        96, 98, 96, 71, 69, 69, 69, 69,
+        69, 69, 69, 69, 69, 74, 75, 76,
+        69, 69, 69, 69, 69, 69, 69, 69,
+        69, 69, 69, 69, 69, 69, 69, 69,
+        69, 69, 89, 90, 91, 95, 69, 71,
+        69, 69, 69, 69, 69, 69, 69, 72,
+        73, 74, 75, 76, 69, 69, 69, 69,
+        69, 69, 82, 83, 84, 69, 85, 86,
+        87, 69, 69, 69, 69, 69, 89, 90,
+        91, 95, 69, 69, 69, 69, 73, 69,
+        71, 69, 69, 69, 69, 69, 69, 69,
+        69, 73, 74, 75, 76, 69, 69, 69,
+        69, 69, 69, 82, 83, 84, 69, 85,
+        86, 87, 69, 69, 69, 69, 69, 89,
+        90, 91, 95, 69, 69, 69, 69, 73,
+        69, 71, 69, 69, 69, 69, 69, 69,
+        69, 69, 73, 74, 75, 76, 69, 69,
+        69, 69, 69, 69, 69, 83, 84, 69,
+        85, 86, 87, 69, 69, 69, 69, 69,
+        89, 90, 91, 95, 69, 69, 69, 69,
+        73, 69, 71, 69, 69, 69, 69, 69,
+        69, 69, 69, 73, 74, 75, 76, 69,
+        69, 69, 69, 69, 69, 69, 69, 84,
+        69, 85, 86, 87, 69, 69, 69, 69,
+        69, 89, 90, 91, 95, 69, 69, 69,
+        69, 73, 69, 99, 69, 71, 69, 69,
+        69, 69, 69, 69, 69, 72, 73, 74,
+        75, 76, 69, 78, 79, 69, 69, 69,
+        82, 83, 84, 69, 85, 86, 87, 69,
+        69, 69, 69, 69, 89, 90, 91, 95,
+        69, 69, 69, 69, 73, 69, 71, 69,
+        69, 69, 69, 69, 69, 69, 69, 73,
+        74, 75, 76, 69, 69, 69, 69, 69,
+        69, 69, 69, 69, 69, 85, 86, 87,
+        69, 69, 69, 69, 69, 89, 90, 91,
+        95, 69, 69, 69, 69, 73, 69, 99,
+        69, 71, 69, 69, 69, 69, 69, 69,
+        69, 72, 73, 74, 75, 76, 69, 69,
+        79, 69, 69, 69, 82, 83, 84, 69,
+        85, 86, 87, 69, 69, 69, 69, 69,
+        89, 90, 91, 95, 69, 69, 69, 69,
+        73, 69, 99, 69, 71, 69, 69, 69,
+        69, 69, 69, 69, 72, 73, 74, 75,
+        76, 69, 69, 69, 69, 69, 69, 82,
+        83, 84, 69, 85, 86, 87, 69, 69,
+        69, 69, 69, 89, 90, 91, 95, 69,
+        69, 69, 69, 73, 69, 99, 69, 71,
+        69, 69, 69, 69, 69, 69, 69, 72,
+        73, 74, 75, 76, 77, 78, 79, 69,
+        69, 69, 82, 83, 84, 69, 85, 86,
+        87, 69, 69, 69, 69, 69, 89, 90,
+        91, 95, 69, 69, 69, 69, 73, 69,
+        4, 70, 69, 71, 69, 69, 69, 69,
+        69, 69, 69, 72, 73, 74, 75, 76,
+        77, 78, 79, 80, 69, 81, 82, 83,
+        84, 69, 85, 86, 87, 69, 69, 69,
+        69, 88, 89, 90, 91, 92, 69, 69,
+        69, 69, 93, 69, 69, 94, 69, 4,
+        100, 100, 100, 100, 100, 100, 100, 100,
+        100, 100, 100, 100, 101, 100, 4, 96,
+        96, 96, 96, 96, 96, 96, 96, 96,
+        96, 96, 96, 98, 96, 4, 69, 69,
+        69, 69, 69, 69, 69, 69, 69, 69,
+        69, 69, 71, 69, 69, 69, 69, 69,
+        69, 69, 69, 73, 74, 75, 76, 69,
+        69, 69, 69, 69, 69, 69, 69, 69,
+        69, 85, 86, 87, 69, 69, 69, 69,
+        69, 89, 90, 91, 95, 69, 101, 100,
+        103, 104, 102, 6, 105, 105, 105, 105,
+        105, 105, 105, 105, 105, 106, 105, 107,
+        108, 69, 71, 69, 69, 69, 69, 69,
+        69, 69, 109, 110, 111, 112, 113, 114,
+        115, 116, 117, 107, 118, 119, 120, 121,
+        69, 122, 123, 124, 69, 59, 60, 69,
+        125, 126, 127, 128, 129, 69, 69, 69,
+        69, 130, 69, 69, 131, 69, 107, 108,
+        69, 71, 69, 69, 69, 69, 69, 69,
+        69, 109, 110, 111, 112, 113, 114, 115,
+        116, 117, 107, 118, 119, 120, 121, 69,
+        122, 123, 124, 69, 69, 69, 69, 125,
+        126, 127, 128, 129, 69, 69, 69, 69,
+        130, 69, 69, 131, 69, 107, 69, 69,
+        69, 69, 69, 69, 69, 69, 69, 69,
+        69, 69, 71, 69, 69, 69, 69, 69,
+        69, 69, 69, 110, 111, 112, 113, 69,
+        69, 69, 69, 69, 69, 69, 69, 69,
+        69, 122, 123, 124, 69, 69, 69, 69,
+        69, 126, 127, 128, 132, 69, 69, 69,
+        69, 110, 69, 71, 69, 69, 69, 69,
+        69, 69, 69, 69, 110, 111, 112, 113,
+        69, 69, 69, 69, 69, 69, 69, 69,
+        69, 69, 122, 123, 124, 69, 69, 69,
+        69, 69, 126, 127, 128, 132, 69, 71,
+        69, 69, 69, 69, 69, 69, 69, 69,
+        69, 111, 112, 113, 69, 69, 69, 69,
+        69, 69, 69, 69, 69, 69, 69, 69,
+        69, 69, 69, 69, 69, 69, 126, 127,
+        128, 69, 71, 69, 69, 69, 69, 69,
+        69, 69, 69, 69, 69, 112, 113, 69,
+        69, 69, 69, 69, 69, 69, 69, 69,
+        69, 69, 69, 69, 69, 69, 69, 69,
+        69, 126, 127, 128, 69, 71, 69, 69,
+        69, 69, 69, 69, 69, 69, 69, 69,
+        69, 113, 69, 69, 69, 69, 69, 69,
+        69, 69, 69, 69, 69, 69, 69, 69,
+        69, 69, 69, 69, 126, 127, 128, 69,
+        71, 69, 69, 69, 69, 69, 69, 69,
+        69, 69, 69, 69, 69, 69, 69, 69,
+        69, 69, 69, 69, 69, 69, 69, 69,
+        69, 69, 69, 69, 69, 69, 69, 126,
+        127, 69, 71, 69, 69, 69, 69, 69,
+        69, 69, 69, 69, 69, 69, 69, 69,
+        69, 69, 69, 69, 69, 69, 69, 69,
+        69, 69, 69, 69, 69, 69, 69, 69,
+        69, 69, 127, 69, 71, 69, 71, 69,
+        69, 69, 69, 69, 69, 69, 69, 69,
+        111, 112, 113, 69, 69, 69, 69, 69,
+        69, 69, 69, 69, 69, 122, 123, 124,
+        69, 69, 69, 69, 69, 126, 127, 128,
+        132, 69, 71, 69, 69, 69, 69, 69,
+        69, 69, 69, 69, 111, 112, 113, 69,
+        69, 69, 69, 69, 69, 69, 69, 69,
+        69, 69, 123, 124, 69, 69, 69, 69,
+        69, 126, 127, 128, 132, 69, 71, 69,
+        69, 69, 69, 69, 69, 69, 69, 69,
+        111, 112, 113, 69, 69, 69, 69, 69,
+        69, 69, 69, 69, 69, 69, 69, 124,
+        69, 69, 69, 69, 69, 126, 127, 128,
+        132, 69, 133, 96, 96, 96, 96, 96,
+        96, 96, 96, 96, 96, 96, 96, 98,
+        96, 71, 69, 69, 69, 69, 69, 69,
+        69, 69, 69, 111, 112, 113, 69, 69,
+        69, 69, 69, 69, 69, 69, 69, 69,
+        69, 69, 69, 69, 69, 69, 69, 69,
+        126, 127, 128, 132, 69, 71, 69, 69,
+        69, 69, 69, 69, 69, 109, 110, 111,
+        112, 113, 69, 69, 69, 69, 69, 69,
+        119, 120, 121, 69, 122, 123, 124, 69,
+        69, 69, 69, 69, 126, 127, 128, 132,
+        69, 69, 69, 69, 110, 69, 71, 69,
+        69, 69, 69, 69, 69, 69, 69, 110,
+        111, 112, 113, 69, 69, 69, 69, 69,
+        69, 119, 120, 121, 69, 122, 123, 124,
+        69, 69, 69, 69, 69, 126, 127, 128,
+        132, 69, 69, 69, 69, 110, 69, 71,
+        69, 69, 69, 69, 69, 69, 69, 69,
+        110, 111, 112, 113, 69, 69, 69, 69,
+        69, 69, 69, 120, 121, 69, 122, 123,
+        124, 69, 69, 69, 69, 69, 126, 127,
+        128, 132, 69, 69, 69, 69, 110, 69,
+        71, 69, 69, 69, 69, 69, 69, 69,
+        69, 110, 111, 112, 113, 69, 69, 69,
+        69, 69, 69, 69, 69, 121, 69, 122,
+        123, 124, 69, 69, 69, 69, 69, 126,
+        127, 128, 132, 69, 69, 69, 69, 110,
+        69, 134, 69, 71, 69, 69, 69, 69,
+        69, 69, 69, 109, 110, 111, 112, 113,
+        69, 115, 116, 69, 69, 69, 119, 120,
+        121, 69, 122, 123, 124, 69, 69, 69,
+        69, 69, 126, 127, 128, 132, 69, 69,
+        69, 69, 110, 69, 71, 69, 69, 69,
+        69, 69, 69, 69, 69, 110, 111, 112,
+        113, 69, 69, 69, 69, 69, 69, 69,
+        69, 69, 69, 122, 123, 124, 69, 69,
+        69, 69, 69, 126, 127, 128, 132, 69,
+        69, 69, 69, 110, 69, 134, 69, 71,
+        69, 69, 69, 69, 69, 69, 69, 109,
+        110, 111, 112, 113, 69, 69, 116, 69,
+        69, 69, 119, 120, 121, 69, 122, 123,
+        124, 69, 69, 69, 69, 69, 126, 127,
+        128, 132, 69, 69, 69, 69, 110, 69,
+        134, 69, 71, 69, 69, 69, 69, 69,
+        69, 69, 109, 110, 111, 112, 113, 69,
+        69, 69, 69, 69, 69, 119, 120, 121,
+        69, 122, 123, 124, 69, 69, 69, 69,
+        69, 126, 127, 128, 132, 69, 69, 69,
+        69, 110, 69, 134, 69, 71, 69, 69,
+        69, 69, 69, 69, 69, 109, 110, 111,
+        112, 113, 114, 115, 116, 69, 69, 69,
+        119, 120, 121, 69, 122, 123, 124, 69,
+        69, 69, 69, 69, 126, 127, 128, 132,
+        69, 69, 69, 69, 110, 69, 107, 108,
+        69, 71, 69, 69, 69, 69, 69, 69,
+        69, 109, 110, 111, 112, 113, 114, 115,
+        116, 117, 69, 118, 119, 120, 121, 69,
+        122, 123, 124, 69, 69, 69, 69, 125,
+        126, 127, 128, 129, 69, 69, 69, 69,
+        130, 69, 69, 131, 69, 107, 100, 100,
+        100, 100, 100, 100, 100, 100, 100, 100,
+        100, 100, 101, 100, 107, 96, 96, 96,
+        96, 96, 96, 96, 96, 96, 96, 96,
+        96, 98, 96, 107, 69, 69, 69, 69,
+        69, 69, 69, 69, 69, 69, 69, 69,
+        71, 69, 69, 69, 69, 69, 69, 69,
+        69, 110, 111, 112, 113, 69, 69, 69,
+        69, 69, 69, 69, 69, 69, 69, 122,
+        123, 124, 69, 69, 69, 69, 69, 126,
+        127, 128, 132, 69, 101, 100, 8, 9,
+        135, 11, 135, 135, 135, 135, 135, 135,
+        135, 13, 14, 15, 16, 17, 18, 19,
+        20, 21, 8, 22, 23, 24, 25, 135,
+        26, 27, 28, 135, 135, 135, 135, 32,
+        33, 34, 38, 32, 135, 135, 135, 135,
+        37, 135, 135, 38, 135, 8, 135, 135,
+        135, 135, 135, 135, 135, 135, 135, 135,
+        135, 135, 11, 135, 135, 135, 135, 135,
+        135, 135, 135, 14, 15, 16, 17, 135,
+        135, 135, 135, 135, 135, 135, 135, 135,
+        135, 26, 27, 28, 135, 135, 135, 135,
+        135, 33, 34, 38, 136, 135, 135, 135,
+        135, 14, 135, 11, 135, 135, 135, 135,
+        135, 135, 135, 135, 14, 15, 16, 17,
+        135, 135, 135, 135, 135, 135, 135, 135,
+        135, 135, 26, 27, 28, 135, 135, 135,
+        135, 135, 33, 34, 38, 136, 135, 11,
+        135, 135, 135, 135, 135, 135, 135, 135,
+        135, 15, 16, 17, 135, 135, 135, 135,
+        135, 135, 135, 135, 135, 135, 135, 135,
+        135, 135, 135, 135, 135, 135, 33, 34,
+        38, 135, 11, 135, 135, 135, 135, 135,
+        135, 135, 135, 135, 135, 16, 17, 135,
+        135, 135, 135, 135, 135, 135, 135, 135,
+        135, 135, 135, 135, 135, 135, 135, 135,
+        135, 33, 34, 38, 135, 11, 135, 135,
+        135, 135, 135, 135, 135, 135, 135, 135,
+        135, 17, 135, 135, 135, 135, 135, 135,
+        135, 135, 135, 135, 135, 135, 135, 135,
+        135, 135, 135, 135, 33, 34, 38, 135,
+        11, 135, 135, 135, 135, 135, 135, 135,
+        135, 135, 135, 135, 135, 135, 135, 135,
+        135, 135, 135, 135, 135, 135, 135, 135,
+        135, 135, 135, 135, 135, 135, 135, 33,
+        34, 135, 11, 135, 135, 135, 135, 135,
+        135, 135, 135, 135, 135, 135, 135, 135,
+        135, 135, 135, 135, 135, 135, 135, 135,
+        135, 135, 135, 135, 135, 135, 135, 135,
+        135, 135, 34, 135, 11, 137, 11, 135,
+        135, 135, 135, 135, 135, 135, 135, 135,
+        15, 16, 17, 135, 135, 135, 135, 135,
+        135, 135, 135, 135, 135, 26, 27, 28,
+        135, 135, 135, 135, 135, 33, 34, 38,
+        136, 135, 11, 135, 135, 135, 135, 135,
+        135, 135, 135, 135, 15, 16, 17, 135,
+        135, 135, 135, 135, 135, 135, 135, 135,
+        135, 135, 27, 28, 135, 135, 135, 135,
+        135, 33, 34, 38, 136, 135, 11, 135,
+        135, 135, 135, 135, 135, 135, 135, 135,
+        15, 16, 17, 135, 135, 135, 135, 135,
+        135, 135, 135, 135, 135, 135, 135, 28,
+        135, 135, 135, 135, 135, 33, 34, 38,
+        136, 135, 138, 135, 135, 135, 135, 135,
+        135, 135, 135, 135, 135, 135, 135, 11,
+        135, 11, 135, 135, 135, 135, 135, 135,
+        135, 135, 135, 15, 16, 17, 135, 135,
+        135, 135, 135, 135, 135, 135, 135, 135,
+        135, 135, 135, 135, 135, 135, 135, 135,
+        33, 34, 38, 136, 135, 11, 135, 135,
+        135, 135, 135, 135, 135, 13, 14, 15,
+        16, 17, 135, 135, 135, 135, 135, 135,
+        23, 24, 25, 135, 26, 27, 28, 135,
+        135, 135, 135, 135, 33, 34, 38, 136,
+        135, 135, 135, 135, 14, 135, 11, 135,
+        135, 135, 135, 135, 135, 135, 135, 14,
+        15, 16, 17, 135, 135, 135, 135, 135,
+        135, 23, 24, 25, 135, 26, 27, 28,
+        135, 135, 135, 135, 135, 33, 34, 38,
+        136, 135, 135, 135, 135, 14, 135, 11,
+        135, 135, 135, 135, 135, 135, 135, 135,
+        14, 15, 16, 17, 135, 135, 135, 135,
+        135, 135, 135, 24, 25, 135, 26, 27,
+        28, 135, 135, 135, 135, 135, 33, 34,
+        38, 136, 135, 135, 135, 135, 14, 135,
+        11, 135, 135, 135, 135, 135, 135, 135,
+        135, 14, 15, 16, 17, 135, 135, 135,
+        135, 135, 135, 135, 135, 25, 135, 26,
+        27, 28, 135, 135, 135, 135, 135, 33,
+        34, 38, 136, 135, 135, 135, 135, 14,
+        135, 139, 135, 11, 135, 135, 135, 135,
+        135, 135, 135, 13, 14, 15, 16, 17,
+        135, 19, 20, 135, 135, 135, 23, 24,
+        25, 135, 26, 27, 28, 135, 135, 135,
+        135, 135, 33, 34, 38, 136, 135, 135,
+        135, 135, 14, 135, 11, 135, 135, 135,
+        135, 135, 135, 135, 135, 14, 15, 16,
+        17, 135, 135, 135, 135, 135, 135, 135,
+        135, 135, 135, 26, 27, 28, 135, 135,
+        135, 135, 135, 33, 34, 38, 136, 135,
+        135, 135, 135, 14, 135, 139, 135, 11,
+        135, 135, 135, 135, 135, 135, 135, 13,
+        14, 15, 16, 17, 135, 135, 20, 135,
+        135, 135, 23, 24, 25, 135, 26, 27,
+        28, 135, 135, 135, 135, 135, 33, 34,
+        38, 136, 135, 135, 135, 135, 14, 135,
+        139, 135, 11, 135, 135, 135, 135, 135,
+        135, 135, 13, 14, 15, 16, 17, 135,
+        135, 135, 135, 135, 135, 23, 24, 25,
+        135, 26, 27, 28, 135, 135, 135, 135,
+        135, 33, 34, 38, 136, 135, 135, 135,
+        135, 14, 135, 139, 135, 11, 135, 135,
+        135, 135, 135, 135, 135, 13, 14, 15,
+        16, 17, 18, 19, 20, 135, 135, 135,
+        23, 24, 25, 135, 26, 27, 28, 135,
+        135, 135, 135, 135, 33, 34, 38, 136,
+        135, 135, 135, 135, 14, 135, 8, 9,
+        135, 11, 135, 135, 135, 135, 135, 135,
+        135, 13, 14, 15, 16, 17, 18, 19,
+        20, 21, 135, 22, 23, 24, 25, 135,
+        26, 27, 28, 135, 135, 135, 135, 32,
+        33, 34, 38, 32, 135, 135, 135, 135,
+        37, 135, 135, 38, 135, 8, 135, 135,
+        135, 135, 135, 135, 135, 135, 135, 135,
+        135, 135, 11, 135, 8, 135, 135, 135,
+        135, 135, 135, 135, 135, 135, 135, 135,
+        135, 11, 135, 135, 135, 135, 135, 135,
+        135, 135, 14, 15, 16, 17, 135, 135,
+        135, 135, 135, 135, 135, 135, 135, 135,
+        26, 27, 28, 135, 135, 135, 135, 135,
+        33, 34, 38, 136, 135, 140, 135, 135,
+        135, 135, 135, 135, 135, 135, 135, 11,
+        135, 10, 11, 135, 4, 135, 135, 135,
+        4, 135, 135, 135, 135, 135, 8, 9,
+        10, 11, 135, 135, 135, 135, 135, 135,
+        135, 13, 14, 15, 16, 17, 18, 19,
+        20, 21, 8, 22, 23, 24, 25, 135,
+        26, 27, 28, 135, 29, 30, 135, 32,
+        33, 34, 38, 32, 135, 135, 135, 135,
+        37, 135, 135, 38, 135, 11, 135, 135,
+        135, 135, 135, 135, 135, 135, 135, 135,
+        135, 135, 135, 135, 135, 135, 135, 135,
+        135, 135, 135, 135, 135, 135, 135, 135,
+        29, 30, 135, 11, 135, 135, 135, 135,
+        135, 135, 135, 135, 135, 135, 135, 135,
+        135, 135, 135, 135, 135, 135, 135, 135,
+        135, 135, 135, 135, 135, 135, 135, 30,
+        135, 4, 141, 141, 141, 4, 141, 143,
+        142, 142, 142, 142, 142, 142, 142, 142,
+        142, 142, 142, 142, 142, 142, 142, 142,
+        142, 142, 142, 142, 142, 142, 142, 142,
+        142, 142, 142, 142, 142, 142, 142, 142,
+        142, 142, 142, 144, 142, 145, 142, 145,
+        146, 142, 143, 142, 142, 142, 142, 142,
+        142, 142, 142, 142, 142, 142, 142, 142,
+        142, 142, 142, 142, 142, 142, 142, 142,
+        142, 142, 142, 142, 142, 142, 142, 142,
+        142, 142, 142, 142, 142, 1, 144, 144,
+        142, 143, 142, 142, 142, 142, 142, 142,
+        142, 142, 142, 142, 142, 142, 142, 142,
+        142, 142, 142, 142, 142, 142, 142, 142,
+        142, 142, 142, 142, 142, 142, 142, 142,
+        142, 142, 142, 142, 142, 144, 142, 145,
+        142, 143, 142, 142, 142, 142, 142, 142,
+        142, 142, 142, 142, 142, 142, 142, 142,
+        142, 142, 142, 142, 142, 142, 142, 142,
+        142, 142, 142, 142, 142, 142, 142, 142,
+        142, 142, 142, 142, 142, 144, 142, 145,
+        142, 145, 142, 40, 41, 39, 42, 39,
+        39, 39, 39, 39, 39, 39, 43, 44,
+        45, 46, 47, 48, 49, 50, 51, 40,
+        52, 53, 54, 55, 39, 56, 57, 58,
+        39, 59, 60, 39, 61, 62, 63, 64,
+        61, 1, 39, 2, 39, 65, 39, 39,
+        64, 39, 0
 };
 
 static const char _use_syllable_machine_trans_targs[] = {
-        1, 120, 0, 2, 31, 1, 58, 60,
-        88, 89, 114, 1, 116, 102, 90, 91,
-        92, 93, 106, 108, 109, 110, 111, 103,
-        104, 105, 97, 98, 99, 117, 118, 119,
-        112, 94, 95, 96, 124, 113, 1, 3,
-        4, 1, 17, 5, 6, 7, 8, 21,
-        23, 24, 25, 26, 18, 19, 20, 12,
-        13, 14, 29, 30, 27, 9, 10, 11,
-        28, 15, 16, 22, 1, 32, 1, 45,
-        33, 34, 35, 36, 49, 51, 52, 53,
-        54, 46, 47, 48, 40, 41, 42, 55,
-        37, 38, 39, 56, 57, 43, 1, 44,
-        1, 50, 1, 1, 1, 59, 1, 1,
-        1, 61, 62, 75, 63, 64, 65, 66,
-        79, 81, 82, 83, 84, 76, 77, 78,
-        70, 71, 72, 85, 67, 68, 69, 86,
-        87, 73, 74, 80, 1, 100, 101, 107,
-        115, 1, 1, 1, 121, 122, 123
+        1, 122, 0, 2, 31, 1, 59, 61,
+        90, 91, 116, 1, 118, 104, 92, 93,
+        94, 95, 108, 110, 111, 112, 113, 105,
+        106, 107, 99, 100, 101, 119, 120, 121,
+        114, 96, 97, 98, 126, 115, 98, 1,
+        3, 4, 1, 17, 5, 6, 7, 8,
+        21, 23, 24, 25, 26, 18, 19, 20,
+        12, 13, 14, 29, 30, 27, 9, 10,
+        11, 28, 15, 16, 22, 1, 32, 1,
+        45, 33, 34, 35, 36, 49, 51, 52,
+        53, 54, 46, 47, 48, 40, 41, 42,
+        55, 37, 38, 39, 56, 57, 58, 43,
+        1, 44, 1, 50, 1, 1, 1, 60,
+        1, 1, 1, 62, 63, 76, 64, 65,
+        66, 67, 80, 82, 83, 84, 85, 77,
+        78, 79, 71, 72, 73, 86, 68, 69,
+        70, 87, 88, 89, 74, 75, 81, 1,
+        102, 1, 103, 109, 117, 1, 1, 1,
+        123, 124, 125
 };
 
 static const char _use_syllable_machine_trans_actions[] = {
@@ -737,20 +745,21 @@ static const char _use_syllable_machine_trans_actions[] = {
         0, 0, 0, 5, 0, 0, 0, 0,
         0, 0, 0, 0, 0, 0, 0, 0,
         0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 6, 0, 7, 0,
-        0, 8, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 6, 7, 0, 8, 9,
+        0, 0, 10, 0, 0, 0, 0, 0,
         0, 0, 0, 0, 0, 0, 0, 0,
         0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 9, 0, 10, 0,
+        0, 0, 0, 0, 0, 11, 0, 12,
         0, 0, 0, 0, 0, 0, 0, 0,
         0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 11, 0,
-        12, 0, 13, 14, 15, 0, 16, 17,
-        18, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0,
+        13, 0, 14, 0, 15, 16, 17, 0,
+        18, 19, 20, 0, 0, 0, 0, 0,
         0, 0, 0, 0, 0, 0, 0, 0,
         0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 19, 0, 0, 0,
-        0, 20, 21, 22, 0, 0, 0
+        0, 0, 0, 0, 0, 0, 0, 21,
+        0, 22, 0, 0, 0, 23, 24, 25,
+        0, 0, 0
 };
 
 static const char _use_syllable_machine_to_state_actions[] = {
@@ -769,7 +778,7 @@ static const char _use_syllable_machine_to_state_actions[] = {
         0, 0, 0, 0, 0, 0, 0, 0,
         0, 0, 0, 0, 0, 0, 0, 0,
         0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0
+        0, 0, 0, 0, 0, 0, 0
 };
 
 static const char _use_syllable_machine_from_state_actions[] = {
@@ -788,26 +797,26 @@ static const char _use_syllable_machine_from_state_actions[] = {
         0, 0, 0, 0, 0, 0, 0, 0,
         0, 0, 0, 0, 0, 0, 0, 0,
         0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0
+        0, 0, 0, 0, 0, 0, 0
 };
 
 static const short _use_syllable_machine_eof_trans[] = {
-        1, 0, 39, 39, 39, 39, 39, 39,
-        39, 39, 39, 39, 39, 39, 39, 39,
-        39, 39, 39, 39, 39, 39, 39, 39,
-        39, 39, 39, 39, 39, 39, 39, 69,
-        69, 69, 69, 69, 69, 69, 69, 69,
-        69, 69, 69, 95, 69, 69, 69, 69,
-        69, 69, 69, 69, 69, 69, 69, 99,
-        95, 69, 101, 104, 69, 69, 69, 69,
-        69, 69, 69, 69, 69, 69, 69, 69,
-        69, 95, 69, 69, 69, 69, 69, 69,
-        69, 69, 69, 69, 69, 99, 95, 69,
-        133, 133, 133, 133, 133, 133, 133, 133,
-        133, 133, 133, 133, 133, 133, 133, 133,
-        133, 133, 133, 133, 133, 133, 133, 133,
-        133, 133, 133, 133, 133, 133, 133, 138,
-        139, 139, 139, 139, 39
+        1, 0, 40, 40, 40, 40, 40, 40,
+        40, 40, 40, 40, 40, 40, 40, 40,
+        40, 40, 40, 40, 40, 40, 40, 40,
+        40, 40, 40, 40, 40, 40, 40, 70,
+        70, 70, 70, 70, 70, 70, 70, 70,
+        70, 70, 70, 97, 70, 70, 70, 70,
+        70, 70, 70, 70, 70, 70, 70, 101,
+        97, 70, 101, 103, 106, 70, 70, 70,
+        70, 70, 70, 70, 70, 70, 70, 70,
+        70, 70, 97, 70, 70, 70, 70, 70,
+        70, 70, 70, 70, 70, 70, 101, 97,
+        70, 101, 136, 136, 136, 136, 136, 136,
+        136, 136, 138, 136, 136, 136, 136, 136,
+        136, 136, 136, 136, 136, 136, 136, 136,
+        136, 136, 136, 136, 136, 136, 136, 136,
+        136, 142, 143, 143, 143, 143, 40
 };
 
 static const int use_syllable_machine_start = 1;
@@ -821,7 +830,7 @@ static const int use_syllable_machine_en_main = 1;
 
 
 
-#line 184 "hb-ot-shaper-use-machine.rl"
+#line 186 "hb-ot-shaper-use-machine.rl"
 
 
 #define found_syllable(syllable_type) \
@@ -920,7 +929,7 @@ find_syllables_use (hb_buffer_t *buffer)
   unsigned int act HB_UNUSED;
   int cs;
 
-#line 924 "hb-ot-shaper-use-machine.hh"
+#line 933 "hb-ot-shaper-use-machine.hh"
         {
         cs = use_syllable_machine_start;
         ts = 0;
@@ -928,12 +937,12 @@ find_syllables_use (hb_buffer_t *buffer)
         act = 0;
         }
 
-#line 284 "hb-ot-shaper-use-machine.rl"
+#line 286 "hb-ot-shaper-use-machine.rl"
 
 
   unsigned int syllable_serial = 1;
 
-#line 937 "hb-ot-shaper-use-machine.hh"
+#line 946 "hb-ot-shaper-use-machine.hh"
         {
         int _slen;
         int _trans;
@@ -947,7 +956,7 @@ _resume:
 #line 1 "NONE"
         {ts = p;}
         break;
-#line 951 "hb-ot-shaper-use-machine.hh"
+#line 960 "hb-ot-shaper-use-machine.hh"
         }
 
         _keys = _use_syllable_machine_trans_keys + (cs<<1);
@@ -965,87 +974,111 @@ _eof_trans:
                 goto _again;
 
         switch ( _use_syllable_machine_trans_actions[_trans] ) {
-        case 6:
+        case 7:
 #line 1 "NONE"
         {te = p+1;}
         break;
-        case 14:
-#line 172 "hb-ot-shaper-use-machine.rl"
+        case 16:
+#line 173 "hb-ot-shaper-use-machine.rl"
         {te = p+1;{ found_syllable (use_virama_terminated_cluster); }}
         break;
-        case 12:
-#line 173 "hb-ot-shaper-use-machine.rl"
+        case 14:
+#line 174 "hb-ot-shaper-use-machine.rl"
         {te = p+1;{ found_syllable (use_sakot_terminated_cluster); }}
         break;
-        case 10:
-#line 174 "hb-ot-shaper-use-machine.rl"
+        case 12:
+#line 175 "hb-ot-shaper-use-machine.rl"
         {te = p+1;{ found_syllable (use_standard_cluster); }}
         break;
-        case 18:
-#line 175 "hb-ot-shaper-use-machine.rl"
+        case 20:
+#line 176 "hb-ot-shaper-use-machine.rl"
         {te = p+1;{ found_syllable (use_number_joiner_terminated_cluster); }}
         break;
-        case 16:
-#line 176 "hb-ot-shaper-use-machine.rl"
+        case 18:
+#line 177 "hb-ot-shaper-use-machine.rl"
         {te = p+1;{ found_syllable (use_numeral_cluster); }}
         break;
-        case 8:
-#line 177 "hb-ot-shaper-use-machine.rl"
+        case 10:
+#line 178 "hb-ot-shaper-use-machine.rl"
         {te = p+1;{ found_syllable (use_symbol_cluster); }}
         break;
-        case 22:
-#line 178 "hb-ot-shaper-use-machine.rl"
+        case 25:
+#line 179 "hb-ot-shaper-use-machine.rl"
         {te = p+1;{ found_syllable (use_hieroglyph_cluster); }}
         break;
         case 5:
-#line 179 "hb-ot-shaper-use-machine.rl"
+#line 181 "hb-ot-shaper-use-machine.rl"
         {te = p+1;{ found_syllable (use_broken_cluster); buffer->scratch_flags |= HB_BUFFER_SCRATCH_FLAG_HAS_BROKEN_SYLLABLE; }}
         break;
         case 4:
-#line 180 "hb-ot-shaper-use-machine.rl"
+#line 182 "hb-ot-shaper-use-machine.rl"
         {te = p+1;{ found_syllable (use_non_cluster); }}
         break;
-        case 13:
-#line 172 "hb-ot-shaper-use-machine.rl"
+        case 15:
+#line 173 "hb-ot-shaper-use-machine.rl"
         {te = p;p--;{ found_syllable (use_virama_terminated_cluster); }}
         break;
-        case 11:
-#line 173 "hb-ot-shaper-use-machine.rl"
+        case 13:
+#line 174 "hb-ot-shaper-use-machine.rl"
         {te = p;p--;{ found_syllable (use_sakot_terminated_cluster); }}
         break;
-        case 9:
-#line 174 "hb-ot-shaper-use-machine.rl"
+        case 11:
+#line 175 "hb-ot-shaper-use-machine.rl"
         {te = p;p--;{ found_syllable (use_standard_cluster); }}
         break;
-        case 17:
-#line 175 "hb-ot-shaper-use-machine.rl"
+        case 19:
+#line 176 "hb-ot-shaper-use-machine.rl"
         {te = p;p--;{ found_syllable (use_number_joiner_terminated_cluster); }}
         break;
-        case 15:
-#line 176 "hb-ot-shaper-use-machine.rl"
+        case 17:
+#line 177 "hb-ot-shaper-use-machine.rl"
         {te = p;p--;{ found_syllable (use_numeral_cluster); }}
         break;
-        case 7:
-#line 177 "hb-ot-shaper-use-machine.rl"
+        case 9:
+#line 178 "hb-ot-shaper-use-machine.rl"
         {te = p;p--;{ found_syllable (use_symbol_cluster); }}
         break;
-        case 21:
-#line 178 "hb-ot-shaper-use-machine.rl"
+        case 24:
+#line 179 "hb-ot-shaper-use-machine.rl"
         {te = p;p--;{ found_syllable (use_hieroglyph_cluster); }}
         break;
-        case 19:
-#line 179 "hb-ot-shaper-use-machine.rl"
+        case 21:
+#line 181 "hb-ot-shaper-use-machine.rl"
         {te = p;p--;{ found_syllable (use_broken_cluster); buffer->scratch_flags |= HB_BUFFER_SCRATCH_FLAG_HAS_BROKEN_SYLLABLE; }}
         break;
-        case 20:
-#line 180 "hb-ot-shaper-use-machine.rl"
+        case 23:
+#line 182 "hb-ot-shaper-use-machine.rl"
         {te = p;p--;{ found_syllable (use_non_cluster); }}
         break;
         case 1:
-#line 177 "hb-ot-shaper-use-machine.rl"
+#line 178 "hb-ot-shaper-use-machine.rl"
         {{p = ((te))-1;}{ found_syllable (use_symbol_cluster); }}
         break;
-#line 1049 "hb-ot-shaper-use-machine.hh"
+        case 22:
+#line 1 "NONE"
+        {       switch( act ) {
+        case 8:
+        {{p = ((te))-1;} found_syllable (use_non_cluster); }
+        break;
+        case 9:
+        {{p = ((te))-1;} found_syllable (use_broken_cluster); buffer->scratch_flags |= HB_BUFFER_SCRATCH_FLAG_HAS_BROKEN_SYLLABLE; }
+        break;
+        }
+        }
+        break;
+        case 6:
+#line 1 "NONE"
+        {te = p+1;}
+#line 180 "hb-ot-shaper-use-machine.rl"
+        {act = 8;}
+        break;
+        case 8:
+#line 1 "NONE"
+        {te = p+1;}
+#line 181 "hb-ot-shaper-use-machine.rl"
+        {act = 9;}
+        break;
+#line 1082 "hb-ot-shaper-use-machine.hh"
         }
 
 _again:
@@ -1054,7 +1087,7 @@ _again:
 #line 1 "NONE"
         {ts = 0;}
         break;
-#line 1058 "hb-ot-shaper-use-machine.hh"
+#line 1091 "hb-ot-shaper-use-machine.hh"
         }
 
         if ( ++p != pe )
@@ -1070,7 +1103,7 @@ _again:
 
         }
 
-#line 289 "hb-ot-shaper-use-machine.rl"
+#line 291 "hb-ot-shaper-use-machine.rl"
 
 }
 
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-ot-shaper-use-table.hh b/src/java.desktop/share/native/libharfbuzz/hb-ot-shaper-use-table.hh
index 491b2f940e1..d3c49949aa8 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-ot-shaper-use-table.hh
+++ b/src/java.desktop/share/native/libharfbuzz/hb-ot-shaper-use-table.hh
@@ -6,18 +6,18 @@
  *
  * on files with these headers:
  *
- * # IndicSyllabicCategory-15.1.0.txt
- * # Date: 2023-01-05
- * # IndicPositionalCategory-15.1.0.txt
- * # Date: 2023-01-05
- * # ArabicShaping-15.1.0.txt
- * # Date: 2023-01-05
- * # DerivedCoreProperties-15.1.0.txt
- * # Date: 2023-08-07, 15:21:24 GMT
- * # Blocks-15.1.0.txt
- * # Date: 2023-07-28, 15:47:20 GMT
- * # Scripts-15.1.0.txt
- * # Date: 2023-07-28, 16:01:07 GMT
+ * # IndicSyllabicCategory-16.0.0.txt
+ * # Date: 2024-04-30, 21:48:21 GMT
+ * # IndicPositionalCategory-16.0.0.txt
+ * # Date: 2024-04-30, 21:48:21 GMT
+ * # ArabicShaping-16.0.0.txt
+ * # Date: 2024-07-30
+ * # DerivedCoreProperties-16.0.0.txt
+ * # Date: 2024-05-31, 18:09:32 GMT
+ * # Blocks-16.0.0.txt
+ * # Date: 2024-02-02
+ * # Scripts-16.0.0.txt
+ * # Date: 2024-04-30, 21:48:40 GMT
  * # Override values For Indic_Syllabic_Category
  * # Not derivable
  * # Initial version based on Unicode 7.0 by Andrew Glass 2014-03-17
@@ -27,6 +27,7 @@
  * # Updated for Unicode 14.0 by Andrew Glass 2021-09-25
  * # Updated for Unicode 15.0 by Andrew Glass 2022-09-16
  * # Updated for Unicode 15.1 by Andrew Glass 2023-09-14
+ * # Updated for Unicode 16.0 by Andrew Glass 2024-09-11
  * # Override values For Indic_Positional_Category
  * # Not derivable
  * # Initial version based on Unicode 7.0 by Andrew Glass 2014-03-17
@@ -38,6 +39,7 @@
  * # Updated for Unicode 14.0 by Andrew Glass 2021-09-28
  * # Updated for Unicode 15.0 by Andrew Glass 2022-09-16
  * # Updated for Unicode 15.1 by Andrew Glass 2023-09-14
+ * # Updated for Unicode 16.0 by Andrew Glass 2024-09-11
  * UnicodeData.txt does not have a header.
  */
 
@@ -65,6 +67,7 @@
 #define N       USE(N)  /* BASE_NUM */
 #define O       USE(O)  /* OTHER */
 #define R       USE(R)  /* REPHA */
+#define RK      USE(RK) /* REORDERING_KILLER */
 #define SB      USE(SB) /* HIEROGLYPH_SEGMENT_BEGIN */
 #define SE      USE(SE) /* HIEROGLYPH_SEGMENT_END */
 #define SUB     USE(SUB)        /* CONS_SUB */
@@ -99,16 +102,16 @@
 #ifndef HB_OPTIMIZE_SIZE
 
 static const uint8_t
-hb_use_u8[3187] =
+hb_use_u8[3345] =
 {
-     16,   50,   51,   51,   51,   52,   51,   83,  118,  131,   51,   57,   58,  179,  195,   61,
+     16,   50,   51,   51,   51,   52,   51,   83,  118,  131,   57,   58,   59,  195,  211,   62,
      51,   51,   51,   51,   51,   51,   51,   51,   51,   51,   51,   51,   51,   51,   51,   51,
      51,   51,   51,   51,   51,   51,   51,   51,   51,   51,   51,   51,   51,   51,   51,   51,
      51,   51,   51,   51,   51,   51,   51,   51,   51,   51,   51,   51,   51,   51,   51,   51,
      51,   51,   51,   51,   51,   51,   51,   51,   51,   51,   51,   51,   51,   51,   51,   51,
      51,   51,   51,   51,   51,   51,   51,   51,   51,   51,   51,   51,   51,   51,   51,   51,
      51,   51,   51,   51,   51,   51,   51,   51,   51,   51,   51,   51,   51,   51,   51,   51,
-     14,    0,    1,    2,    2,    2,    2,    3,    2,    2,    2,    2,    2,    4,    2,    2,
+     15,    0,    1,    2,    2,    2,    2,    3,    2,    2,    2,    2,    2,    4,    2,    2,
       5,    6,    2,    7,    8,    9,   10,   11,   12,   13,   14,   15,   16,    2,    2,   17,
      18,   19,   20,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,   21,
      22,   23,   24,   25,   26,   27,   28,   29,   30,   31,   32,    2,   33,    2,    2,    2,
@@ -121,24 +124,26 @@ hb_use_u8[3187] =
       2,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,
       2,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,   47,   48,    2,
      49,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,   50,   51,    2,    2,    2,
-      2,    2,    2,    2,    2,   52,   53,    2,   54,    2,    2,   55,    2,    2,   56,   57,
-     58,   59,   60,   61,   62,   63,   64,   65,    2,   66,   67,    2,   68,   69,   70,   71,
-      2,   72,    2,   73,   74,   75,   76,    2,    2,   77,   78,   79,   80,    2,   81,   82,
-      2,   83,   83,   83,   83,   83,   83,   83,   83,   84,    2,    2,    2,    2,    2,    2,
+      2,    2,    2,    2,    2,   52,   53,    2,   54,    2,    2,   55,   56,    2,   57,   58,
+     59,   60,   61,   62,   63,   64,   65,   66,   67,   68,   69,    2,   70,   71,   72,   73,
+      2,   74,    2,   75,   76,   77,   78,    2,    2,   79,   80,   81,   82,    2,   83,   84,
+      2,   85,   85,   85,   85,   85,   85,   85,   85,   86,   85,   85,   85,   85,   85,   85,
+     85,   85,   85,   85,   85,   85,   85,   85,   85,   85,   85,   85,   85,   85,   85,   85,
+     85,   85,   85,   85,   85,   85,   85,   85,   87,    2,    2,    2,    2,    2,    2,    2,
       2,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,
+      2,    2,    2,   88,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,
+      2,    2,    2,    2,    2,    2,   89,   90,    2,    2,    2,   91,    2,    2,    2,   92,
+     93,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,
+      2,    2,    2,    2,    2,    2,    2,   94,   94,   94,   95,    2,    2,    2,    2,    2,
       2,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,
-      2,    2,    2,    2,    2,    2,   85,   86,    2,    2,    2,    2,    2,    2,    2,   87,
-     88,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,
-      2,    2,    2,    2,    2,    2,    2,   89,   89,   89,   90,    2,    2,    2,    2,    2,
+      2,    2,    2,    2,    2,    2,    2,    2,    2,   96,   97,    2,    2,    2,    2,    2,
+      2,    2,    2,   98,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,
       2,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,
-      2,    2,    2,    2,    2,    2,    2,    2,    2,   91,   92,    2,    2,    2,    2,    2,
-      2,    2,    2,   93,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,
-      2,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,
-      2,    2,    2,   94,    2,    2,   95,    2,    2,    2,   96,    2,    2,    2,    2,    2,
-      2,    2,    2,   97,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,
-      2,   98,   98,   99,  100,   98,   98,   98,   98,   98,   98,   98,   98,   98,   98,   98,
-     98,   98,   98,   98,   98,   98,   98,   98,   98,   98,   98,   98,   98,   98,   98,   98,
-     98,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    1,
+      2,    2,    2,   99,    2,    2,  100,    2,    2,    2,  101,    2,  102,    2,    2,    2,
+      2,    2,    2,  103,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,
+      2,  104,  104,  105,  106,  104,  104,  104,  104,  104,  104,  104,  104,  104,  104,  104,
+    104,  104,  104,  104,  104,  104,  104,  104,  104,  104,  104,  104,  104,  104,  104,  104,
+    104,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    1,
       0,    2,    2,    2,    2,    2,    0,    0,    0,    0,    0,    0,    0,    0,    3,    4,
       0,    5,    0,    0,    0,    0,    0,    6,    0,    0,    7,    0,    0,    0,    0,    0,
       0,    0,    0,    0,    1,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
@@ -167,7 +172,7 @@ hb_use_u8[3187] =
       0,    0,    0,   27,   31,    2,    9,    0,    0,   10,   29,   30,    2,    2,    2,    9,
       2,    2,    2,   30,    2,    2,    0,   17,   45,    0,    0,   35,   47,    0,    0,    0,
       9,   50,   51,    0,    0,    0,    0,    0,    0,   11,   29,    2,    2,    2,    2,    9,
-      2,    2,    2,    2,    2,    2,   52,   53,   23,   23,   19,   31,   48,   33,   48,   34,
+      2,    2,    2,    2,    2,    2,   52,   53,   23,   19,   20,   31,   48,   33,   48,   34,
      54,    0,    0,    0,   35,    0,    0,    0,   30,   12,   29,   30,    2,    2,    2,    2,
       2,    2,    2,    2,    9,    0,    2,    2,    2,    2,   30,    2,    2,    2,    2,   30,
       0,    2,    2,    2,    9,    0,   55,    0,   35,   23,   22,   31,   31,   18,   48,   48,
@@ -195,9 +200,9 @@ hb_use_u8[3187] =
       0,    2,    2,  100,  101,  102,  103,   61,   63,  104,   16,   45,   22,   59,   21,   80,
      48,   48,   76,   11,   11,   11,  105,   46,   40,   11,  106,   74,    2,    2,    2,    2,
       2,    2,    2,  107,   22,   20,   20,   22,   48,   48,   22,  108,    2,    2,    2,    9,
-      0,    0,    0,    0,    0,    0,  109,  110,  111,  111,  111,    0,    0,    0,    0,    0,
-      0,  106,   74,    2,    2,    2,    2,    2,    2,   60,   61,   59,   25,   22,  112,   61,
-      2,    2,    2,    2,  107,   22,   23,   45,   45,  102,   14,    0,    0,    0,    0,    0,
+      0,    0,    0,    0,    0,    0,  109,  110,  110,  110,  110,    0,    0,    0,    0,    0,
+      0,  106,   74,    2,    2,    2,    2,    2,    2,   60,   61,   59,   25,   22,  111,   61,
+      2,    2,    2,    2,  107,   22,   23,   45,   45,  102,  112,    0,    0,    0,    0,    0,
       0,    2,    2,   61,   18,   48,   23,  113,  102,  102,  102,  114,  115,    0,    0,    0,
       0,    2,    2,    2,    2,    2,    0,   30,    2,   11,   46,  116,  116,  116,   11,  116,
     116,   15,  116,  116,  116,   26,    0,   40,    0,    0,    0,  117,   51,   11,    5,    0,
@@ -226,6 +231,7 @@ hb_use_u8[3187] =
     146,    2,    2,   30,    2,   30,    2,    2,    2,    2,    2,    2,    0,   14,   37,    0,
     147,    2,    2,   13,   37,    0,   30,    2,    2,    2,    0,    0,    0,    0,    0,    0,
       0,    0,    0,    0,    0,   30,    2,    2,    9,    2,    2,   11,   41,    0,    0,    0,
+      0,    2,    2,    2,    0,   27,   22,   22,   30,    2,    2,    2,    0,    0,    0,    0,
       0,    2,    2,    2,    2,    2,   27,   38,    0,    2,    2,    2,  116,  116,  116,  116,
     116,  148,    2,    9,    0,    0,    0,    0,    0,    2,   14,   14,    0,    0,    0,    0,
       0,    9,    2,    2,    9,    2,    2,    2,    2,   30,    2,    9,    0,   30,    2,    0,
@@ -244,39 +250,45 @@ hb_use_u8[3187] =
       0,   11,   11,   30,    2,    2,    2,    9,   30,    9,    2,   30,    2,    2,   58,   17,
      23,   16,   23,   47,   32,   33,   32,   34,    0,    0,    0,    0,   35,    0,    0,    0,
       2,    2,   23,    0,   11,   11,   11,   46,    0,   11,   11,   46,    0,    0,    0,    0,
-      0,    2,    2,   65,   25,   20,   20,   20,   22,   23,  126,   15,   17,    0,    0,    0,
-      0,    2,    2,    2,    2,    2,    0,    0,  163,  164,    0,    0,    0,    0,    0,    0,
-      0,   18,   19,   20,   20,   66,   99,   25,  160,   11,  165,    9,    0,    0,    0,    0,
-      0,    2,    2,    2,    2,    2,    2,    2,   65,   25,   20,   20,    0,   48,   48,   11,
-    166,   37,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    2,    2,   20,
-      0,   23,   19,   20,   20,   21,   16,   82,  166,   38,    0,    0,    0,    0,    0,    0,
-      0,    2,    2,    2,    2,    2,   10,  167,   25,   20,   22,   22,  165,    9,    0,    0,
-      0,    2,    2,    2,    2,    2,    9,   43,  136,   23,   22,   20,   76,   21,   22,    0,
-      0,    2,    2,    2,    9,    0,    0,    0,    0,    2,    2,    2,    2,    2,    2,   18,
-     19,   20,   21,   22,  105,  166,   37,    0,    0,    2,    2,    2,    9,   30,    0,    2,
-      2,    2,    2,   30,    9,    2,    2,    2,    2,   23,   23,   18,   32,   33,   12,  168,
-    169,  170,  171,    0,    0,    0,    0,    0,    0,    2,    2,    2,    2,    0,    2,    2,
-      2,   65,   25,   20,   20,    0,   22,   23,   29,  108,    0,   33,    0,    0,    0,    0,
-      0,   52,   20,   22,   22,   22,  140,    2,    2,    2,  172,  173,   11,   15,  174,   72,
-    175,    0,    0,    1,  147,    0,    0,    0,    0,   52,   20,   22,   16,   19,   20,    2,
-      2,    2,    2,  158,  158,  158,  176,  176,  176,  176,  176,  176,   15,  177,    0,   30,
-      0,   22,   20,   20,   31,   22,   22,   11,  166,    0,   61,   61,   61,   61,   61,   61,
-     61,   66,   21,   82,   46,    0,    0,    0,    0,    2,    2,    2,    9,    2,   30,    2,
-      2,   52,   22,   22,   31,    0,   38,   22,   27,   11,  159,  178,  174,    0,    0,    0,
-      0,    2,    2,    2,   30,    9,    2,    2,    2,    2,    2,    2,    2,    2,   23,   23,
-     47,   22,   35,   82,   68,    0,    0,    0,    0,    2,  179,   66,   47,    0,    0,    0,
-      0,   11,  180,    2,    2,    2,    2,    2,    2,    2,    2,   23,   22,   20,   31,    0,
-     48,   16,  143,    0,    0,    0,    0,    0,    0,  181,  181,  181,  181,  181,  181,  181,
-    181,  182,  182,  182,  183,  184,  182,  181,  181,  185,  181,  181,  186,  187,  187,  187,
-    187,  187,  187,  187,    0,    0,    0,    0,    0,   11,   11,   11,   46,    0,    0,    0,
-      0,    2,    2,    2,    2,    2,    9,    0,   58,  188,   20,   20,   20,   20,   20,   20,
-     20,   20,   20,   20,   20,   20,   20,   20,   20,   20,   20,   20,   20,    0,    0,    0,
-     40,  116,   26,    0,    0,    0,    0,    0,    0,    0,    0,    9,    0,    0,    0,    0,
-      0,    2,    2,    2,    0,    0,    0,    0,    0,    2,    2,    2,    2,    2,    0,   58,
-     37,    0,    6,  120,  120,  120,  121,    0,    0,   11,   11,   11,   49,    2,    2,    2,
-      0,    2,    2,    2,    2,    2,    0,    0,    2,    2,    2,    2,    2,    2,    2,    2,
-     46,    2,    2,    2,    2,    2,    2,   11,   11,    2,    2,    2,    2,    2,    2,   22,
-     22,    2,    2,   44,   44,   44,   92,    0,    0,    O,    O,    O,   GB,    B,    B,    O,
+      0,    2,    2,    2,    2,    2,   30,    0,    9,    2,    2,    2,   30,   45,   59,   20,
+     20,   31,   33,   32,   32,   25,  163,   29,  164,  165,   37,    0,    0,    0,    0,    0,
+      0,   12,   26,    0,    0,    0,    0,    0,    0,    2,    2,   65,   25,   20,   20,   20,
+     22,   23,  126,   15,   17,    0,    0,    0,    0,    2,    2,    2,    2,    2,    0,    0,
+    166,  167,    0,    0,    0,    0,    0,    0,    0,   18,   19,   20,   20,   66,   99,   25,
+    160,   11,  168,    9,    0,    0,    0,    0,    0,    2,    2,    2,    2,    2,    2,    2,
+     65,   25,   20,   20,    0,   48,   48,   11,  169,   37,    0,    0,    0,    0,    0,    0,
+      0,    0,    0,    0,    0,    2,    2,   20,    0,   23,   19,   20,   20,   21,   16,   82,
+    169,   38,    0,    0,    0,    0,    0,    0,    0,    2,    2,    2,    2,    2,   10,  170,
+     25,   20,   22,   22,  168,    9,    0,    0,    0,    2,    2,    2,    2,    2,    9,   43,
+    136,   23,   22,   20,   76,   21,   22,    0,    0,    2,    2,    2,    9,    0,    0,    0,
+      0,    2,    2,    2,    2,    2,    2,   18,   19,   20,   21,   22,  105,  169,   37,    0,
+      0,    2,    2,    2,    9,   30,    0,    2,    2,    2,    2,   30,    9,    2,    2,    2,
+      2,   23,   23,   18,   32,   33,   12,  171,  165,  172,  173,    0,    0,    0,    0,    0,
+      0,    2,    2,    2,    2,    0,    2,    2,    2,   65,   25,   20,   20,    0,   22,   23,
+     29,  108,    0,   33,    0,    0,    0,    0,    0,   52,   20,   22,   22,   22,  140,    2,
+      2,    2,  174,  175,   11,   15,  176,   61,  177,    0,    0,    1,  147,    0,    0,    0,
+      0,   52,   20,   22,   16,   19,   20,    2,    2,    2,    2,  158,  158,  158,  178,  178,
+    178,  178,  178,  178,   15,  179,    0,   30,    0,   22,   20,   20,   31,   22,   22,   11,
+    169,    0,   61,   61,   61,   61,   61,   61,   61,   66,   21,   82,   46,    0,    0,    0,
+      0,    2,    2,    2,    9,    2,   30,    2,    2,   52,   22,   22,   31,    0,   38,   22,
+     27,   11,  159,  180,  181,    0,    0,    0,    0,    2,    2,    2,   30,    9,    2,    2,
+      2,    2,    2,    2,    2,    2,   23,   23,   47,   22,   35,   82,   68,    0,    0,    0,
+      0,    2,  182,   66,   47,    0,    0,    0,    0,   11,  183,    2,    2,    2,    2,    2,
+      2,    2,    2,   23,   22,   20,   31,    0,   48,   16,  143,    0,    0,    0,    0,    0,
+      0,    2,    2,    2,    2,    2,  156,    0,    0,  184,  184,  184,  184,  184,  184,  184,
+    184,  185,  185,  185,  186,  187,  185,  184,  184,  188,  184,  184,  189,  190,  190,  190,
+    190,  190,  190,  190,    0,    0,    0,    0,    0,  184,  184,  184,  184,  184,  191,    0,
+      0,    2,    2,    2,    2,    2,    2,    2,   22,   22,   22,   22,   22,   22,  192,  193,
+    194,   11,   11,   11,   46,    0,    0,    0,    0,   29,   74,    2,    2,    2,    2,    2,
+      2,    2,    2,    2,    2,    2,   65,   47,    0,    2,    2,    2,    2,    2,    9,    0,
+     58,  195,   20,   20,   20,   20,   20,   20,   20,   20,   20,   20,   20,   20,   20,   20,
+     20,   20,   20,   20,   20,    0,    0,    0,   40,  116,   26,    0,    0,    0,    0,    0,
+      0,    0,    0,    9,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+     30,    2,    2,    2,    2,    2,    0,   58,   37,    0,    6,  120,  120,  120,  121,    0,
+      0,   11,   11,   11,   49,    2,    2,    2,    0,    2,    2,    2,    2,    2,    0,    0,
+      2,    2,    2,    2,    2,    2,    2,    2,   46,    2,    2,    2,    2,    2,    2,   11,
+     11,    2,    2,    2,    2,    2,    2,   22,   22,    2,    2,    2,    2,    2,    2,    2,
+     20,    2,    2,   44,   44,   44,   92,    0,    0,    O,    O,    O,   GB,    B,    B,    O,
      SB,    O,   SE,   GB,    O,    O,   WJ,FMPst,FMPst,    O,  CGJ,    B,    O,    B,VMAbv,VMAbv,
   VMAbv,    O,VMAbv,    B,CMBlw,CMBlw,CMBlw,VMAbv,VMPst, VAbv, VPst,CMBlw,    B, VPst, VPre, VPst,
    VBlw, VBlw, VBlw, VBlw, VAbv, VAbv, VAbv, VPst, VPst, VPst,    H, VPre, VPst,VMBlw,    O,    O,
@@ -290,20 +302,21 @@ hb_use_u8[3187] =
   FMAbv, FAbv,CMAbv,FMAbv,VMAbv,FMAbv, VAbv,   IS,FMAbv,    B,FMAbv,    B,  CGJ,   WJ,  CGJ,   GB,
   CMAbv,CMAbv,    B,   GB,    B, VAbv,  SUB, FPst, FPst,VMBlw, FPst, FPst, FBlw,VMAbv,FMBlw, VAbv,
    VPre,    B, MPre, MBlw,  SUB, FAbv, FAbv, MAbv,  SUB,   Sk, VPst, VAbv,VMAbv,VMAbv, FAbv,CMAbv,
-   VPst,    H,    B,    O,SMAbv,SMBlw,SMAbv,SMAbv,SMAbv, VPst,   IS, VBlw, FAbv,VMPre,VMPre,FMAbv,
+   VPst,    H,    B,    O,SMAbv,SMAbv,SMAbv, VPst,   IS,   RK,   RK, VBlw, FAbv,VMPre,VMPre,FMAbv,
   CMBlw,VMBlw,VMBlw,VMAbv,   CS,    O,FMAbv, ZWNJ,  CGJ,   WJ,   WJ,   WJ,    O,FMPst,    O,   SB,
      SE,    O,    H, MPst, VPst,    H,VMAbv, VAbv,VMBlw,    B, VBlw, FPst, VPst, FAbv,VMPst,    B,
   CMAbv, VAbv, MBlw, MPst, MBlw,    H,    O, VBlw, MPst, MPre, MAbv, MBlw,    O,    B, FAbv, FAbv,
    FPst, VBlw,    B,    B, VPre,    O,VMPst,   IS,    O,VMPst, VBlw, VPst,VMBlw,VMBlw,VMAbv,    O,
      IS,VMBlw,    B,VMPst,VMAbv,VMPst,   CS,   CS,    B,    N,    N,    O,   HN, VPre, VBlw, VAbv,
-     IS,CMAbv,    O, VPst,    B,    R,    R,CMBlw, VAbv, VPre,VMAbv,VMAbv,    H, VAbv,CMBlw,FMAbv,
-      B,   CS,   CS,    H,CMBlw,VMPst,    H,VMPst, VAbv,VMAbv, VPst,   IS,    R, MPst,    R, MPst,
-  CMBlw,    B,FMBlw, VBlw,VMAbv,    R, MBlw, MBlw,   GB, FBlw, FBlw,CMAbv,   IS, VBlw,   IS,   GB,
-   VAbv,    R,VMPst,    G,    G,    J,    J,    J,   SB,   SE,    J,   HR,    G,    G,   HM,   HM,
-     HM,    O, VBlw,
+     IS,CMAbv,    O, VPst,    B,    R,    R,CMBlw, VAbv, VPre,VMAbv,VMAbv,    H, VAbv,CMBlw,VMPst,
+      O,VMAbv,CMBlw,   IS,    R,FMAbv,    B,   CS,   CS,    H,CMBlw,VMPst,    H,VMPst, VAbv,VMAbv,
+   VPst, MPst,    R, MPst,CMBlw,    B,FMBlw, VBlw,VMAbv,   CS,  SUB,  SUB,   GB, FBlw, FBlw,CMAbv,
+     IS, VBlw,   IS,    R, MBlw,   GB, VAbv,    R,VMPst,    G,    G,    J,    J,    J,   SB,   SE,
+      J,   HR,    G,    G,   HM,   HM,   HM,    G,    O, MPre, MPre, MPst,VMAbv, MBlw, VBlw,    O,
+   VBlw,
 };
 static const uint16_t
-hb_use_u16[808] =
+hb_use_u16[856] =
 {
     0,  0,  1,  2,  0,  3,  0,  3,  0,  0,  4,  5,  0,  6,  0,  0,
     0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  7,  0,  0,  0,
@@ -332,28 +345,31 @@ hb_use_u16[808] =
     0,  0,  0,  0,  0,  0,  0,164,  0,  0,  0,  0,  0,  0,  0,165,
     0,  0,  0,  0,  0,  0,  0,166,166,167, 34,168,  0,  0,  0,  0,
   169,170, 10,171, 95,  0,  0,  0,  0,  0,  0,  0, 70, 10,172,  0,
-   10,173,174,  0,  0,  0,  0,  0, 10, 10,175,  2,  0,  0,  0,  0,
-   10, 10,176,173,  0,  0,  0,  0,  0,  0,  0, 10,177,178,  0, 10,
-  179,  0,  0,180,181,  0,  0,  0,182, 10, 10,183,184,185,186,187,
-  188, 10, 10,189,190,  0,  0,  0,191, 10,192,193,194, 10, 10,195,
-  188, 10, 10,196,197,106,198,103, 10, 34,199,200,201,  0,  0,  0,
-  202,203, 95, 10, 10,204,205,  2,206, 21, 22,207,208,209,210,211,
-   10, 10, 10,212,213,214,215,  0,198, 10, 10,216,217,  2,  0,  0,
-   10, 10,218,219,220,221,  0,  0, 10, 10, 10,222,223,  2,  0,  0,
-   10, 10,224,225,  2,  0,  0,  0, 10,226,227,104,228,  0,  0,  0,
-   10, 10,229,230,  0,  0,  0,  0,231,232, 10,233,234,  2,  0,  0,
-    0,  0,235, 10, 10,236,237,  0,238, 10, 10,239,240,241, 10, 10,
-  242,243,  0,  0,  0,  0,  0,  0, 22, 10,218,244,  8, 10, 71, 19,
-   10,245, 74,246,  0,  0,  0,  0,247, 10, 10,248,249,  2,250, 10,
-  251,252,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 10,253,
-  254, 49, 10,255,256,  2,  0,  0,257,257,257,257,257,257,257,257,
-  257,257,257,258,259,260,  0,  0,  0,  0,  0,  0,  2,  0,  0,  0,
-   10, 10, 10,261,  0,  0,  0,  0, 10, 10, 10, 10,262,263,264,264,
-  265,266,  0,  0,  0,  0,267,  0, 10, 10, 10, 10, 10, 10, 10, 10,
-   10, 10, 10, 10, 10,268,  0,  0, 10, 10, 10, 10, 10, 10,106, 71,
-   95,269,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,270,
-   10, 10, 71,271,272,  0,  0,  0,  0, 10,273,  0, 10, 10,274,  2,
-    0,  0,  0,  0,  0, 10,275,  2, 10, 10, 10, 10,276,  2,  0,  0,
+   10,173,174,  0,  0,  0,  0,  0, 10, 10,175,  2,  9, 10,176, 10,
+  177,  0,  0,  0,  0,  0,  0,  0, 10, 10,178,173,  0,  0,  0,  0,
+    0,  0,  0, 10,179,180,  0, 10,181,  0,  0,182,183,  0,  0,  0,
+  184, 10, 10,185,186,187,188,189,190, 10, 10,191,192,  0,  0,  0,
+  193, 10,194,195,196, 10, 10,197,190, 10, 10,198,199,106,200,103,
+   10, 34,201,202,203,  0,  0,  0,204,205, 95, 10, 10,206,207,  2,
+  208, 21, 22,209,210,211,212,213,214, 10, 10,215,216,217,218,  0,
+   10, 10, 10,219,220,221,222,  0,200, 10, 10,223,224,  2,  0,  0,
+   10, 10,225,226,227,228,  0,  0, 10, 10, 10,229,230,  2,  0,  0,
+   10, 10,231,232,  2, 10,141,  0, 10,233,234,104,235,  0,  0,  0,
+   10, 10,236,237,  0,  0,  0,  0,238,239, 10,240,241,  2,  0,  0,
+    0,  0,242, 10, 10,243,244,  0,245, 10, 10,246,247,248, 10, 10,
+  249,250,  0,  0,  0,  0,  0,  0, 22, 10,225,251,  8, 10, 71, 19,
+   10,252, 74,253,  0,  0,  0,  0,254, 10, 10,255,256,  2,257, 10,
+  258,259,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 10,260,
+  261, 49, 10,262,263,264,  0,  0,265,265,265,265,265,265,265,265,
+  265,265,265,266,267,268,265,265,265,265,265,265,265,265,265,269,
+   10,270,271,  2,  0,  0,  0,  0,  0,  0,  0,  0,  2,  0,  0,  0,
+   10, 10, 10,272,  0,  0,  0,  0,  0,  0,  0,  0,273, 10,274,  2,
+   10, 10, 10, 10,275,276,277,277,278,279,  0,  0,  0,  0,280,  0,
+   10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10,177,  0,281,
+   10, 10, 10, 10, 10, 10,106, 71, 95,282,  0,  0,  0,  0,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,283, 10, 10, 71,284,285,  0,  0,  0,
+    0, 10,286,  0, 10, 10,287,  2,  0,  0,  0,  0,  0, 10,288,  2,
+    0,  0,  0,  0,  0, 10,289,106, 10, 10, 10, 10,290,  2,  0,  0,
   130,130,130,130,130,130,130,130,163,163,163,163,163,163,163,163,
   163,163,163,163,163,163,163,130,
 };
@@ -366,23 +382,23 @@ hb_use_b4 (const uint8_t* a, unsigned i)
 static inline uint_fast8_t
 hb_use_get_category (unsigned u)
 {
-  return u<921600u?hb_use_u8[2809+(((hb_use_u8[593+(((hb_use_u16[((hb_use_u8[113+(((hb_use_b4(hb_use_u8,u>>1>>3>>3>>5))<<5)+((u>>1>>3>>3)&31u))])<<3)+((u>>1>>3)&7u)])<<3)+((u>>1)&7u))])<<1)+((u)&1u))]:O;
+  return u<921600u?hb_use_u8[2953+(((hb_use_u8[625+(((hb_use_u16[((hb_use_u8[113+(((hb_use_b4(hb_use_u8,u>>1>>3>>3>>5))<<5)+((u>>1>>3>>3)&31u))])<<3)+((u>>1>>3)&7u)])<<3)+((u>>1)&7u))])<<1)+((u)&1u))]:O;
 }
 
 
 #else
 
 static const uint8_t
-hb_use_u8[3483] =
+hb_use_u8[3657] =
 {
-     16,   50,   51,   51,   51,   52,   51,   83,  118,  131,   51,   57,   58,  179,  195,   61,
+     16,   50,   51,   51,   51,   52,   51,   83,  118,  131,   57,   58,   59,  195,  211,   62,
      51,   51,   51,   51,   51,   51,   51,   51,   51,   51,   51,   51,   51,   51,   51,   51,
      51,   51,   51,   51,   51,   51,   51,   51,   51,   51,   51,   51,   51,   51,   51,   51,
      51,   51,   51,   51,   51,   51,   51,   51,   51,   51,   51,   51,   51,   51,   51,   51,
      51,   51,   51,   51,   51,   51,   51,   51,   51,   51,   51,   51,   51,   51,   51,   51,
      51,   51,   51,   51,   51,   51,   51,   51,   51,   51,   51,   51,   51,   51,   51,   51,
      51,   51,   51,   51,   51,   51,   51,   51,   51,   51,   51,   51,   51,   51,   51,   51,
-     14,    0,    1,    1,    2,    1,    1,    3,    4,    5,    6,    7,    8,    9,   10,    1,
+     15,    0,    1,    1,    2,    1,    1,    3,    4,    5,    6,    7,    8,    9,   10,    1,
      11,   12,    1,    1,    1,    1,    1,    1,   13,   14,   15,   16,   17,   18,   19,    1,
       1,   20,    1,    1,    1,    1,   21,    1,   22,    1,    1,    1,    1,    1,   23,   24,
       1,    1,    1,    1,    1,    1,    1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
@@ -390,14 +406,15 @@ hb_use_u8[3483] =
       1,    1,    1,    1,    1,    1,    1,    1,    1,    1,    1,    1,    1,    1,    1,   29,
      30,    1,    1,    1,    1,    1,   31,    1,    1,    1,    1,   32,   33,    1,   34,   35,
      36,   37,   38,   39,   40,   41,   42,   43,   44,   45,   46,   47,    1,   48,   49,   50,
-     51,   52,   52,   52,   52,   53,    1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-      1,    1,    1,    1,    1,    1,    1,    1,    1,    1,    1,   54,   55,    1,    1,    1,
-     56,    1,    1,    1,    1,    1,    1,    1,    1,    1,    1,    1,   57,   58,    1,    1,
-      1,    1,    1,    1,    1,    1,    1,    1,    1,    1,    1,    1,    1,   59,    1,    1,
-      1,    1,   60,    1,    1,    1,    1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-      1,    1,   61,   62,    1,   63,    1,    1,    1,    1,   64,    1,    1,    1,    1,    1,
-      1,   65,   66,   65,   65,   65,   65,   65,   65,   65,   65,   65,   65,   65,   65,   65,
-     65,    0,    1,    2,    2,    0,    3,    4,    0,    0,    0,    0,    0,    0,    0,    0,
+     51,   52,   52,   52,   52,   53,   52,   52,   52,   52,   52,   52,   52,   52,   52,   52,
+     52,   52,   52,   52,   54,    1,    1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+      1,    1,   55,    1,    1,    1,    1,    1,    1,    1,    1,   56,   57,    1,   58,    1,
+     59,    1,    1,    1,    1,    1,    1,    1,    1,    1,    1,    1,   60,   61,    1,    1,
+      1,    1,    1,    1,    1,    1,    1,    1,    1,    1,    1,    1,    1,   62,    1,    1,
+      1,    1,   63,    1,    1,    1,    1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+      1,    1,   64,   65,    1,   66,   67,    1,    1,    1,   68,    1,    1,    1,    1,    1,
+      1,   69,   70,   69,   69,   69,   69,   69,   69,   69,   69,   69,   69,   69,   69,   69,
+     69,    0,    1,    2,    2,    0,    3,    4,    0,    0,    0,    0,    0,    0,    0,    0,
       0,    0,    0,    5,    0,    0,    0,    0,    0,    0,    0,    6,    0,    0,    0,    0,
       0,    0,    0,    0,    0,    0,    0,    7,    8,    0,    0,    9,    0,    0,    0,    0,
       0,   10,   11,   12,   13,   14,   15,   16,   17,   18,   19,   20,   21,   22,   23,   24,
@@ -414,23 +431,25 @@ hb_use_u8[3483] =
     122,    0,    0,    0,    0,    0,    0,   56,  123,  124,    0,    0,    0,    0,    0,    0,
     125,    0,    0,    0,    0,    0,    0,    0,  126,    0,    0,    0,  127,  128,  129,    0,
       0,  130,  131,  132,    0,    0,    0,   51,  133,    0,    0,    0,    0,  134,  135,    0,
-      0,   56,  136,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,   56,  137,    0,
-      0,    0,  101,  138,  101,  139,  140,  141,    0,  142,  143,  144,  145,  146,  147,  148,
-      0,  149,  150,  151,  152,  146,  153,  154,  155,  156,  157,  158,    0,  159,  160,  161,
-    162,  163,  164,  165,  166,    0,    0,    0,    0,   56,  167,  168,  169,  170,  171,  172,
-      0,    0,    0,    0,    0,   56,  173,  174,    0,   56,  175,  176,    0,   56,  177,   67,
-      0,  178,  179,  180,    0,    0,    0,    0,    0,   56,  181,    0,    0,    0,    0,    0,
-      0,  182,  183,  184,    0,    0,  185,  186,  187,  188,  189,  190,   56,  191,    0,    0,
-      0,  192,  193,  194,  195,  196,  197,    0,    0,  198,  199,  200,  201,  202,   67,    0,
-      0,    0,    0,    0,    0,    0,    0,    0,  203,  204,  205,  206,    0,    0,    0,    0,
-      0,  207,  207,  207,  207,  207,  207,  207,  207,  207,  208,  209,    0,    0,    0,    0,
-      0,    0,    0,    0,    0,    0,    0,   67,    0,   56,  210,    0,    0,    0,    0,    0,
-      0,   56,   56,  211,  212,  213,    0,    0,  214,   56,   56,   56,   56,   56,   56,   56,
-     56,   56,   56,   56,   56,   56,   56,  215,    0,   56,   56,   56,  216,  217,    0,    0,
-      0,    0,    0,    0,  218,    0,    0,    0,    0,   56,  219,  220,    0,    0,    0,    0,
-      0,    0,    0,    0,    0,  101,  221,   56,  222,    0,    0,    0,    0,    0,    0,  101,
-    223,   56,   56,  224,    0,    0,    0,    0,    0,  225,  225,  225,  225,  225,  225,  225,
-    225,  226,  226,  226,  226,  226,  226,  226,  227,    0,    0,    0,    0,    0,    0,    0,
+      0,   56,  136,    7,  137,  138,    0,    0,    0,    0,    0,    0,    0,   56,  139,    0,
+      0,    0,  101,  140,  101,  141,  142,  143,    0,  144,  145,  146,  147,  148,  149,  150,
+      0,  151,  152,  153,  154,  148,  155,  156,  157,  158,  159,  160,    0,  161,  162,  163,
+    164,  165,  166,  167,  168,  169,  170,  171,  172,   56,  173,  174,  175,  176,  177,  178,
+      0,    0,    0,    0,    0,   56,  179,  180,    0,   56,  181,  182,    0,   56,  183,  184,
+    185,  186,  187,  188,    0,    0,    0,    0,    0,   56,  189,    0,    0,    0,    0,    0,
+      0,  190,  191,  192,    0,    0,  193,  194,  195,  196,  197,  198,   56,  199,    0,    0,
+      0,  200,  201,  202,  203,  204,  205,    0,    0,  206,  207,  208,  209,  210,   67,    0,
+      0,    0,    0,    0,    0,    0,    0,    0,  211,  212,  213,  214,    0,    0,    0,    0,
+      0,  215,  215,  215,  215,  215,  215,  215,  215,  215,  216,  217,  215,  215,  215,  215,
+    215,  215,  215,  215,  215,  215,  215,  215,  218,  219,  220,    0,    0,    0,    0,    0,
+      0,    0,    0,    0,    0,    0,    0,   67,    0,   56,  221,    0,    0,    0,    0,    0,
+      0,    0,    0,  222,  223,    0,    0,    0,    0,   56,   56,  224,  225,  226,    0,    0,
+    227,   56,   56,   56,   56,   56,   56,   56,   56,   56,   56,   56,   56,   56,   56,  228,
+    229,   56,   56,   56,  230,  231,    0,    0,    0,    0,    0,    0,  232,    0,    0,    0,
+      0,   56,  233,  234,    0,    0,    0,    0,    0,    0,    0,    0,    0,  101,  235,   56,
+    236,    0,    0,    0,    0,    0,    0,  101,  237,    0,    0,    0,    0,    0,    0,  101,
+    238,   56,   56,  239,    0,    0,    0,    0,    0,  240,  240,  240,  240,  240,  240,  240,
+    240,  241,  241,  241,  241,  241,  241,  241,  242,    0,    0,    0,    0,    0,    0,    0,
       0,    0,    0,    0,    0,    0,    0,    1,    0,    2,    2,    2,    2,    2,    0,    0,
       0,    0,    0,    0,    0,    0,    3,    4,    0,    5,    0,    0,    0,    0,    0,    6,
       0,    0,    7,    0,    0,    0,    0,    0,    0,    0,    0,    0,    1,    0,    0,    0,
@@ -460,7 +479,7 @@ hb_use_u8[3483] =
       0,   10,   29,   30,    2,    2,    2,    9,    2,    2,    2,   30,    2,    2,    0,   17,
      45,    0,    0,   35,   47,    0,    0,    0,    9,   50,   51,    0,    0,    0,    0,    0,
       0,   11,   29,    2,    2,    2,    2,    9,    2,    2,    2,    2,    2,    2,   52,   53,
-     23,   23,   19,   31,   48,   33,   48,   34,   54,    0,    0,    0,   35,    0,    0,    0,
+     23,   19,   20,   31,   48,   33,   48,   34,   54,    0,    0,    0,   35,    0,    0,    0,
      30,   12,   29,   30,    2,    2,    2,    2,    2,    2,    2,    2,    9,    0,    2,    2,
       2,    2,   30,    2,    2,    2,    2,   30,    0,    2,    2,    2,    9,    0,   55,    0,
      35,   23,   22,   31,   31,   18,   48,   48,   25,    0,   23,    0,    0,    0,    0,    0,
@@ -488,9 +507,9 @@ hb_use_u8[3483] =
      63,  104,   16,   45,   22,   59,   21,   80,   48,   48,   76,   11,   11,   11,  105,   46,
      40,   11,  106,   74,    2,    2,    2,    2,    2,    2,    2,  107,   22,   20,   20,   22,
      48,   48,   22,  108,    2,    2,    2,    9,    0,    0,    0,    0,    0,    0,  109,  110,
-    111,  111,  111,    0,    0,    0,    0,    0,    0,  106,   74,    2,    2,    2,    2,    2,
-      2,   60,   61,   59,   25,   22,  112,   61,    2,    2,    2,    2,  107,   22,   23,   45,
-     45,  102,   14,    0,    0,    0,    0,    0,    0,    2,    2,   61,   18,   48,   23,  113,
+    110,  110,  110,    0,    0,    0,    0,    0,    0,  106,   74,    2,    2,    2,    2,    2,
+      2,   60,   61,   59,   25,   22,  111,   61,    2,    2,    2,    2,  107,   22,   23,   45,
+     45,  102,  112,    0,    0,    0,    0,    0,    0,    2,    2,   61,   18,   48,   23,  113,
     102,  102,  102,  114,  115,    0,    0,    0,    0,    2,    2,    2,    2,    2,    0,   30,
       2,   11,   46,  116,  116,  116,   11,  116,  116,   15,  116,  116,  116,   26,    0,   40,
       0,    0,    0,  117,   51,   11,    5,    0,    0,    0,    0,    0,    0,    0,  118,    0,
@@ -518,7 +537,8 @@ hb_use_u8[3483] =
       0,  128,   20,   27,   31,    0,    0,  145,  146,    2,    2,   30,    2,   30,    2,    2,
       2,    2,    2,    2,    0,   14,   37,    0,  147,    2,    2,   13,   37,    0,   30,    2,
       2,    2,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,   30,    2,    2,
-      9,    2,    2,   11,   41,    0,    0,    0,    0,    2,    2,    2,    2,    2,   27,   38,
+      9,    2,    2,   11,   41,    0,    0,    0,    0,    2,    2,    2,    0,   27,   22,   22,
+     30,    2,    2,    2,    0,    0,    0,    0,    0,    2,    2,    2,    2,    2,   27,   38,
       0,    2,    2,    2,  116,  116,  116,  116,  116,  148,    2,    9,    0,    0,    0,    0,
       0,    2,   14,   14,    0,    0,    0,    0,    0,    9,    2,    2,    9,    2,    2,    2,
       2,   30,    2,    9,    0,   30,    2,    0,    0,  149,  150,  151,    2,    2,    2,    2,
@@ -536,39 +556,45 @@ hb_use_u8[3483] =
      10,   18,   19,   21,   22,  162,   31,    0,    0,   11,   11,   30,    2,    2,    2,    9,
      30,    9,    2,   30,    2,    2,   58,   17,   23,   16,   23,   47,   32,   33,   32,   34,
       0,    0,    0,    0,   35,    0,    0,    0,    2,    2,   23,    0,   11,   11,   11,   46,
-      0,   11,   11,   46,    0,    0,    0,    0,    0,    2,    2,   65,   25,   20,   20,   20,
-     22,   23,  126,   15,   17,    0,    0,    0,    0,    2,    2,    2,    2,    2,    0,    0,
-    163,  164,    0,    0,    0,    0,    0,    0,    0,   18,   19,   20,   20,   66,   99,   25,
-    160,   11,  165,    9,    0,    0,    0,    0,    0,    2,    2,    2,    2,    2,    2,    2,
-     65,   25,   20,   20,    0,   48,   48,   11,  166,   37,    0,    0,    0,    0,    0,    0,
-      0,    0,    0,    0,    0,    2,    2,   20,    0,   23,   19,   20,   20,   21,   16,   82,
-    166,   38,    0,    0,    0,    0,    0,    0,    0,    2,    2,    2,    2,    2,   10,  167,
-     25,   20,   22,   22,  165,    9,    0,    0,    0,    2,    2,    2,    2,    2,    9,   43,
-    136,   23,   22,   20,   76,   21,   22,    0,    0,    2,    2,    2,    9,    0,    0,    0,
-      0,    2,    2,    2,    2,    2,    2,   18,   19,   20,   21,   22,  105,  166,   37,    0,
-      0,    2,    2,    2,    9,   30,    0,    2,    2,    2,    2,   30,    9,    2,    2,    2,
-      2,   23,   23,   18,   32,   33,   12,  168,  169,  170,  171,    0,    0,    0,    0,    0,
-      0,    2,    2,    2,    2,    0,    2,    2,    2,   65,   25,   20,   20,    0,   22,   23,
-     29,  108,    0,   33,    0,    0,    0,    0,    0,   52,   20,   22,   22,   22,  140,    2,
-      2,    2,  172,  173,   11,   15,  174,   72,  175,    0,    0,    1,  147,    0,    0,    0,
-      0,   52,   20,   22,   16,   19,   20,    2,    2,    2,    2,  158,  158,  158,  176,  176,
-    176,  176,  176,  176,   15,  177,    0,   30,    0,   22,   20,   20,   31,   22,   22,   11,
-    166,    0,   61,   61,   61,   61,   61,   61,   61,   66,   21,   82,   46,    0,    0,    0,
-      0,    2,    2,    2,    9,    2,   30,    2,    2,   52,   22,   22,   31,    0,   38,   22,
-     27,   11,  159,  178,  174,    0,    0,    0,    0,    2,    2,    2,   30,    9,    2,    2,
-      2,    2,    2,    2,    2,    2,   23,   23,   47,   22,   35,   82,   68,    0,    0,    0,
-      0,    2,  179,   66,   47,    0,    0,    0,    0,   11,  180,    2,    2,    2,    2,    2,
-      2,    2,    2,   23,   22,   20,   31,    0,   48,   16,  143,    0,    0,    0,    0,    0,
-      0,  181,  181,  181,  181,  181,  181,  181,  181,  182,  182,  182,  183,  184,  182,  181,
-    181,  185,  181,  181,  186,  187,  187,  187,  187,  187,  187,  187,    0,    0,    0,    0,
-      0,   11,   11,   11,   46,    0,    0,    0,    0,    2,    2,    2,    2,    2,    9,    0,
-     58,  188,   20,   20,   20,   20,   20,   20,   20,   20,   20,   20,   20,   20,   20,   20,
-     20,   20,   20,   20,   20,    0,    0,    0,   40,  116,   26,    0,    0,    0,    0,    0,
-      0,    0,    0,    9,    0,    0,    0,    0,    0,    2,    2,    2,    0,    0,    0,    0,
-      0,    2,    2,    2,    2,    2,    0,   58,   37,    0,    6,  120,  120,  120,  121,    0,
-      0,   11,   11,   11,   49,    2,    2,    2,    0,    2,    2,    2,    2,    2,    0,    0,
-      2,    2,    2,    2,    2,    2,    2,    2,   46,    2,    2,    2,    2,    2,    2,   11,
-     11,    2,    2,    2,    2,    2,    2,   22,   22,    2,    2,   44,   44,   44,   92,    0,
+      0,   11,   11,   46,    0,    0,    0,    0,    0,    2,    2,    2,    2,    2,   30,    0,
+      9,    2,    2,    2,   30,   45,   59,   20,   20,   31,   33,   32,   32,   25,  163,   29,
+    164,  165,   37,    0,    0,    0,    0,    0,    0,   12,   26,    0,    0,    0,    0,    0,
+      0,    2,    2,   65,   25,   20,   20,   20,   22,   23,  126,   15,   17,    0,    0,    0,
+      0,    2,    2,    2,    2,    2,    0,    0,  166,  167,    0,    0,    0,    0,    0,    0,
+      0,   18,   19,   20,   20,   66,   99,   25,  160,   11,  168,    9,    0,    0,    0,    0,
+      0,    2,    2,    2,    2,    2,    2,    2,   65,   25,   20,   20,    0,   48,   48,   11,
+    169,   37,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    2,    2,   20,
+      0,   23,   19,   20,   20,   21,   16,   82,  169,   38,    0,    0,    0,    0,    0,    0,
+      0,    2,    2,    2,    2,    2,   10,  170,   25,   20,   22,   22,  168,    9,    0,    0,
+      0,    2,    2,    2,    2,    2,    9,   43,  136,   23,   22,   20,   76,   21,   22,    0,
+      0,    2,    2,    2,    9,    0,    0,    0,    0,    2,    2,    2,    2,    2,    2,   18,
+     19,   20,   21,   22,  105,  169,   37,    0,    0,    2,    2,    2,    9,   30,    0,    2,
+      2,    2,    2,   30,    9,    2,    2,    2,    2,   23,   23,   18,   32,   33,   12,  171,
+    165,  172,  173,    0,    0,    0,    0,    0,    0,    2,    2,    2,    2,    0,    2,    2,
+      2,   65,   25,   20,   20,    0,   22,   23,   29,  108,    0,   33,    0,    0,    0,    0,
+      0,   52,   20,   22,   22,   22,  140,    2,    2,    2,  174,  175,   11,   15,  176,   61,
+    177,    0,    0,    1,  147,    0,    0,    0,    0,   52,   20,   22,   16,   19,   20,    2,
+      2,    2,    2,  158,  158,  158,  178,  178,  178,  178,  178,  178,   15,  179,    0,   30,
+      0,   22,   20,   20,   31,   22,   22,   11,  169,    0,   61,   61,   61,   61,   61,   61,
+     61,   66,   21,   82,   46,    0,    0,    0,    0,    2,    2,    2,    9,    2,   30,    2,
+      2,   52,   22,   22,   31,    0,   38,   22,   27,   11,  159,  180,  181,    0,    0,    0,
+      0,    2,    2,    2,   30,    9,    2,    2,    2,    2,    2,    2,    2,    2,   23,   23,
+     47,   22,   35,   82,   68,    0,    0,    0,    0,    2,  182,   66,   47,    0,    0,    0,
+      0,   11,  183,    2,    2,    2,    2,    2,    2,    2,    2,   23,   22,   20,   31,    0,
+     48,   16,  143,    0,    0,    0,    0,    0,    0,    2,    2,    2,    2,    2,  156,    0,
+      0,  184,  184,  184,  184,  184,  184,  184,  184,  185,  185,  185,  186,  187,  185,  184,
+    184,  188,  184,  184,  189,  190,  190,  190,  190,  190,  190,  190,    0,    0,    0,    0,
+      0,  184,  184,  184,  184,  184,  191,    0,    0,    2,    2,    2,    2,    2,    2,    2,
+     22,   22,   22,   22,   22,   22,  192,  193,  194,   11,   11,   11,   46,    0,    0,    0,
+      0,   29,   74,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,   65,   47,
+      0,    2,    2,    2,    2,    2,    9,    0,   58,  195,   20,   20,   20,   20,   20,   20,
+     20,   20,   20,   20,   20,   20,   20,   20,   20,   20,   20,   20,   20,    0,    0,    0,
+     40,  116,   26,    0,    0,    0,    0,    0,    0,    0,    0,    9,    0,    0,    0,    0,
+      0,    0,    0,    0,    0,    0,    0,    0,   30,    2,    2,    2,    2,    2,    0,   58,
+     37,    0,    6,  120,  120,  120,  121,    0,    0,   11,   11,   11,   49,    2,    2,    2,
+      0,    2,    2,    2,    2,    2,    0,    0,    2,    2,    2,    2,    2,    2,    2,    2,
+     46,    2,    2,    2,    2,    2,    2,   11,   11,    2,    2,    2,    2,    2,    2,   22,
+     22,    2,    2,    2,    2,    2,    2,    2,   20,    2,    2,   44,   44,   44,   92,    0,
       0,    O,    O,    O,   GB,    B,    B,    O,   SB,    O,   SE,   GB,    O,    O,   WJ,FMPst,
   FMPst,    O,  CGJ,    B,    O,    B,VMAbv,VMAbv,VMAbv,    O,VMAbv,    B,CMBlw,CMBlw,CMBlw,VMAbv,
   VMPst, VAbv, VPst,CMBlw,    B, VPst, VPre, VPst, VBlw, VBlw, VBlw, VBlw, VAbv, VAbv, VAbv, VPst,
@@ -582,20 +608,21 @@ hb_use_u8[3483] =
   VMPst, VBlw, VPst,  CGJ,  CGJ, VPst,VMAbv,VMAbv,FMAbv, FAbv,CMAbv,FMAbv,VMAbv,FMAbv, VAbv,   IS,
   FMAbv,    B,FMAbv,    B,  CGJ,   WJ,  CGJ,   GB,CMAbv,CMAbv,    B,   GB,    B, VAbv,  SUB, FPst,
    FPst,VMBlw, FPst, FPst, FBlw,VMAbv,FMBlw, VAbv, VPre,    B, MPre, MBlw,  SUB, FAbv, FAbv, MAbv,
-    SUB,   Sk, VPst, VAbv,VMAbv,VMAbv, FAbv,CMAbv, VPst,    H,    B,    O,SMAbv,SMBlw,SMAbv,SMAbv,
-  SMAbv, VPst,   IS, VBlw, FAbv,VMPre,VMPre,FMAbv,CMBlw,VMBlw,VMBlw,VMAbv,   CS,    O,FMAbv, ZWNJ,
+    SUB,   Sk, VPst, VAbv,VMAbv,VMAbv, FAbv,CMAbv, VPst,    H,    B,    O,SMAbv,SMAbv,SMAbv, VPst,
+     IS,   RK,   RK, VBlw, FAbv,VMPre,VMPre,FMAbv,CMBlw,VMBlw,VMBlw,VMAbv,   CS,    O,FMAbv, ZWNJ,
     CGJ,   WJ,   WJ,   WJ,    O,FMPst,    O,   SB,   SE,    O,    H, MPst, VPst,    H,VMAbv, VAbv,
   VMBlw,    B, VBlw, FPst, VPst, FAbv,VMPst,    B,CMAbv, VAbv, MBlw, MPst, MBlw,    H,    O, VBlw,
    MPst, MPre, MAbv, MBlw,    O,    B, FAbv, FAbv, FPst, VBlw,    B,    B, VPre,    O,VMPst,   IS,
       O,VMPst, VBlw, VPst,VMBlw,VMBlw,VMAbv,    O,   IS,VMBlw,    B,VMPst,VMAbv,VMPst,   CS,   CS,
       B,    N,    N,    O,   HN, VPre, VBlw, VAbv,   IS,CMAbv,    O, VPst,    B,    R,    R,CMBlw,
-   VAbv, VPre,VMAbv,VMAbv,    H, VAbv,CMBlw,FMAbv,    B,   CS,   CS,    H,CMBlw,VMPst,    H,VMPst,
-   VAbv,VMAbv, VPst,   IS,    R, MPst,    R, MPst,CMBlw,    B,FMBlw, VBlw,VMAbv,    R, MBlw, MBlw,
-     GB, FBlw, FBlw,CMAbv,   IS, VBlw,   IS,   GB, VAbv,    R,VMPst,    G,    G,    J,    J,    J,
-     SB,   SE,    J,   HR,    G,    G,   HM,   HM,   HM,    O, VBlw,
+   VAbv, VPre,VMAbv,VMAbv,    H, VAbv,CMBlw,VMPst,    O,VMAbv,CMBlw,   IS,    R,FMAbv,    B,   CS,
+     CS,    H,CMBlw,VMPst,    H,VMPst, VAbv,VMAbv, VPst, MPst,    R, MPst,CMBlw,    B,FMBlw, VBlw,
+  VMAbv,   CS,  SUB,  SUB,   GB, FBlw, FBlw,CMAbv,   IS, VBlw,   IS,    R, MBlw,   GB, VAbv,    R,
+  VMPst,    G,    G,    J,    J,    J,   SB,   SE,    J,   HR,    G,    G,   HM,   HM,   HM,    G,
+      O, MPre, MPre, MPst,VMAbv, MBlw, VBlw,    O, VBlw,
 };
 static const uint16_t
-hb_use_u16[456] =
+hb_use_u16[486] =
 {
     0,  0,  1,  2,  0,  3,  4,  5,  0,  6,  7,  0,  8,  0,  9, 10,
    11, 12, 10, 13, 14, 10, 10, 15, 16, 17, 18, 19, 20, 21, 22, 23,
@@ -614,18 +641,20 @@ hb_use_u16[456] =
   148,149,150, 10, 10,151,152,  2,153, 99,154,155,156,  2, 10,157,
    10,158,159,  0,160,161,162,  2,163,  0,  0,164,  0,165,  0,166,
   166,167, 34,168,169,170, 10,171, 95,  0,172,  0, 10,173,174,  0,
-  175,  2,176,173,177,178,179,  0,  0,180,181,  0,182, 10, 10,183,
-  184,185,186,187,188, 10, 10,189,190,  0,191, 10,192,193,194, 10,
-   10,195, 10,196,197,106,198,103, 10, 34,199,200,201,  0,202,203,
-   95, 10, 10,204,205,  2,206, 21, 22,207,208,209,210,211, 10,212,
-  213,214,215,  0,198, 10, 10,216,217,  2,218,219,220,221, 10,222,
-  223,  2,224,225, 10,226,227,104,228,  0,229,230,231,232, 10,233,
-  234,  2,235, 10, 10,236,237,  0,238, 10, 10,239,240,241,242,243,
-   22, 10,218,244,  8, 10, 71, 19, 10,245, 74,246,247, 10, 10,248,
-  249,  2,250, 10,251,252, 10,253,254, 49, 10,255,256,  2,257,257,
-  257,258,259,260, 10,261,262,263,264,264,265,266,267,  0, 10,268,
-  106, 71, 95,269,  0,270, 71,271,272,  0,273,  0,274,  2,275,  2,
-  276,  2,130,130,163,163,163,130,
+  175,  2,176, 10,177,  0,178,173,179,180,181,  0,  0,182,183,  0,
+  184, 10, 10,185,186,187,188,189,190, 10, 10,191,192,  0,193, 10,
+  194,195,196, 10, 10,197, 10,198,199,106,200,103, 10, 34,201,202,
+  203,  0,204,205, 95, 10, 10,206,207,  2,208, 21, 22,209,210,211,
+  212,213,214, 10, 10,215,216,217,218,  0, 10,219,220,221,222,  0,
+  200, 10, 10,223,224,  2,225,226,227,228, 10,229,230,  2,231,232,
+    2, 10,141,  0, 10,233,234,104,235,  0,236,237,238,239, 10,240,
+  241,  2,242, 10, 10,243,244,  0,245, 10, 10,246,247,248,249,250,
+   22, 10,225,251,  8, 10, 71, 19, 10,252, 74,253,254, 10, 10,255,
+  256,  2,257, 10,258,259, 10,260,261, 49, 10,262,263,264,265,265,
+  265,266,267,268,265,269, 10,270,271,  2, 10,272,273, 10,274,  2,
+  275,276,277,277,278,279,280,  0, 10,177,  0,281,106, 71, 95,282,
+    0,283, 71,284,285,  0,286,  0,287,  2,288,  2,289,106,290,  2,
+  130,130,163,163,163,130,
 };
 
 static inline unsigned
@@ -636,7 +665,7 @@ hb_use_b4 (const uint8_t* a, unsigned i)
 static inline uint_fast8_t
 hb_use_get_category (unsigned u)
 {
-  return u<921600u?hb_use_u8[3105+(((hb_use_u8[889+(((hb_use_u16[((hb_use_u8[353+(((hb_use_u8[113+(((hb_use_b4(hb_use_u8,u>>1>>3>>1>>3>>4))<<4)+((u>>1>>3>>1>>3)&15u))])<<3)+((u>>1>>3>>1)&7u))])<<1)+((u>>1>>3)&1u)])<<3)+((u>>1)&7u))])<<1)+((u)&1u))]:O;
+  return u<921600u?hb_use_u8[3265+(((hb_use_u8[937+(((hb_use_u16[((hb_use_u8[369+(((hb_use_u8[113+(((hb_use_b4(hb_use_u8,u>>1>>3>>1>>3>>4))<<4)+((u>>1>>3>>1>>3)&15u))])<<3)+((u>>1>>3>>1)&7u))])<<1)+((u>>1>>3)&1u)])<<3)+((u>>1)&7u))])<<1)+((u)&1u))]:O;
 }
 
 #endif
@@ -656,6 +685,7 @@ hb_use_get_category (unsigned u)
 #undef N
 #undef O
 #undef R
+#undef RK
 #undef SB
 #undef SE
 #undef SUB
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-ot-shaper-vowel-constraints.cc b/src/java.desktop/share/native/libharfbuzz/hb-ot-shaper-vowel-constraints.cc
index 35693254ec0..4a112e1c289 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-ot-shaper-vowel-constraints.cc
+++ b/src/java.desktop/share/native/libharfbuzz/hb-ot-shaper-vowel-constraints.cc
@@ -10,8 +10,8 @@
  * # Date: 2015-03-12, 21:17:00 GMT [AG]
  * # Date: 2019-11-08, 23:22:00 GMT [AG]
  *
- * # Scripts-15.1.0.txt
- * # Date: 2023-07-28, 16:01:07 GMT
+ * # Scripts-16.0.0.txt
+ * # Date: 2024-04-30, 21:48:40 GMT
  */
 
 #include "hb.hh"
@@ -24,7 +24,7 @@ static void
 _output_dotted_circle (hb_buffer_t *buffer)
 {
   (void) buffer->output_glyph (0x25CCu);
-  _hb_glyph_info_reset_continuation (&buffer->prev());
+  _hb_glyph_info_clear_continuation (&buffer->prev());
 }
 
 static void
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-ot-shaper.hh b/src/java.desktop/share/native/libharfbuzz/hb-ot-shaper.hh
index 39a04ec2348..48cd5296ffd 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-ot-shaper.hh
+++ b/src/java.desktop/share/native/libharfbuzz/hb-ot-shaper.hh
@@ -174,9 +174,11 @@ HB_OT_SHAPERS_IMPLEMENT_SHAPERS
 
 
 static inline const hb_ot_shaper_t *
-hb_ot_shaper_categorize (const hb_ot_shape_planner_t *planner)
+hb_ot_shaper_categorize (hb_script_t script,
+                         hb_direction_t direction,
+                         hb_tag_t gsub_script)
 {
-  switch ((hb_tag_t) planner->props.script)
+  switch ((hb_tag_t) script)
   {
     default:
       return &_hb_ot_shaper_default;
@@ -192,9 +194,8 @@ hb_ot_shaper_categorize (const hb_ot_shape_planner_t *planner)
        * This is because we do fallback shaping for Arabic script (and not others).
        * But note that Arabic shaping is applicable only to horizontal layout; for
        * vertical text, just use the generic shaper instead. */
-      if ((planner->map.chosen_script[0] != HB_OT_TAG_DEFAULT_SCRIPT ||
-           planner->props.script == HB_SCRIPT_ARABIC) &&
-          HB_DIRECTION_IS_HORIZONTAL(planner->props.direction))
+      if ((gsub_script != HB_OT_TAG_DEFAULT_SCRIPT || script == HB_SCRIPT_ARABIC) &&
+          HB_DIRECTION_IS_HORIZONTAL (direction))
         return &_hb_ot_shaper_arabic;
       else
         return &_hb_ot_shaper_default;
@@ -235,10 +236,10 @@ hb_ot_shaper_categorize (const hb_ot_shape_planner_t *planner)
        * Otherwise, use the specific shaper.
        *
        * If it's indy3 tag, send to USE. */
-      if (planner->map.chosen_script[0] == HB_TAG ('D','F','L','T') ||
-          planner->map.chosen_script[0] == HB_TAG ('l','a','t','n'))
+      if (gsub_script == HB_TAG ('D','F','L','T') ||
+          gsub_script == HB_TAG ('l','a','t','n'))
         return &_hb_ot_shaper_default;
-      else if ((planner->map.chosen_script[0] & 0x000000FF) == '3')
+      else if ((gsub_script & 0x000000FF) == '3')
         return &_hb_ot_shaper_use;
       else
         return &_hb_ot_shaper_indic;
@@ -254,9 +255,9 @@ hb_ot_shaper_categorize (const hb_ot_shape_planner_t *planner)
        * If designer designed for 'mymr' tag, also send to default
        * shaper.  That's tag used from before Myanmar shaping spec
        * was developed.  The shaping spec uses 'mym2' tag. */
-      if (planner->map.chosen_script[0] == HB_TAG ('D','F','L','T') ||
-          planner->map.chosen_script[0] == HB_TAG ('l','a','t','n') ||
-          planner->map.chosen_script[0] == HB_TAG ('m','y','m','r'))
+      if (gsub_script == HB_TAG ('D','F','L','T') ||
+          gsub_script == HB_TAG ('l','a','t','n') ||
+          gsub_script == HB_TAG ('m','y','m','r'))
         return &_hb_ot_shaper_default;
       else
         return &_hb_ot_shaper_myanmar;
@@ -386,13 +387,22 @@ hb_ot_shaper_categorize (const hb_ot_shape_planner_t *planner)
     case HB_SCRIPT_KAWI:
     case HB_SCRIPT_NAG_MUNDARI:
 
+    /* Unicode-16.0 additions */
+    case HB_SCRIPT_GARAY:
+    case HB_SCRIPT_GURUNG_KHEMA:
+    case HB_SCRIPT_KIRAT_RAI:
+    case HB_SCRIPT_OL_ONAL:
+    case HB_SCRIPT_SUNUWAR:
+    case HB_SCRIPT_TODHRI:
+    case HB_SCRIPT_TULU_TIGALARI:
+
       /* If the designer designed the font for the 'DFLT' script,
        * (or we ended up arbitrarily pick 'latn'), use the default shaper.
        * Otherwise, use the specific shaper.
        * Note that for some simple scripts, there may not be *any*
        * GSUB/GPOS needed, so there may be no scripts found! */
-      if (planner->map.chosen_script[0] == HB_TAG ('D','F','L','T') ||
-          planner->map.chosen_script[0] == HB_TAG ('l','a','t','n'))
+      if (gsub_script == HB_TAG ('D','F','L','T') ||
+          gsub_script == HB_TAG ('l','a','t','n'))
         return &_hb_ot_shaper_default;
       else
         return &_hb_ot_shaper_use;
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-ot-stat-table.hh b/src/java.desktop/share/native/libharfbuzz/hb-ot-stat-table.hh
index 7f6b52d7977..10165f57b75 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-ot-stat-table.hh
+++ b/src/java.desktop/share/native/libharfbuzz/hb-ot-stat-table.hh
@@ -63,8 +63,9 @@ static bool axis_value_is_outside_axis_range (hb_tag_t axis_tag, float axis_valu
   if (!user_axes_location->has (axis_tag))
     return false;
 
+  double axis_value_double = static_cast<double>(axis_value);
   Triple axis_range = user_axes_location->get (axis_tag);
-  return (axis_value < axis_range.minimum || axis_value > axis_range.maximum);
+  return (axis_value_double < axis_range.minimum || axis_value_double > axis_range.maximum);
 }
 
 struct StatAxisRecord
@@ -327,6 +328,7 @@ struct AxisValueFormat4
   {
     TRACE_SANITIZE (this);
     return_trace (likely (c->check_struct (this) &&
+                          hb_barrier () &&
                           axisValues.sanitize (c, axisCount)));
   }
 
@@ -348,15 +350,15 @@ struct AxisValueFormat4
 
 struct AxisValue
 {
-  bool get_value (unsigned int axis_index) const
+  float get_value (unsigned int axis_index) const
   {
     switch (u.format)
     {
-    case 1: return u.format1.get_value ();
-    case 2: return u.format2.get_value ();
-    case 3: return u.format3.get_value ();
-    case 4: return u.format4.get_axis_record (axis_index).get_value ();
-    default:return 0;
+    case 1: hb_barrier (); return u.format1.get_value ();
+    case 2: hb_barrier (); return u.format2.get_value ();
+    case 3: hb_barrier (); return u.format3.get_value ();
+    case 4: hb_barrier (); return u.format4.get_axis_record (axis_index).get_value ();
+    default:return 0.f;
     }
   }
 
@@ -364,9 +366,9 @@ struct AxisValue
   {
     switch (u.format)
     {
-    case 1: return u.format1.get_axis_index ();
-    case 2: return u.format2.get_axis_index ();
-    case 3: return u.format3.get_axis_index ();
+    case 1: hb_barrier (); return u.format1.get_axis_index ();
+    case 2: hb_barrier (); return u.format2.get_axis_index ();
+    case 3: hb_barrier (); return u.format3.get_axis_index ();
     /* case 4: Makes more sense for variable fonts which are handled by fvar in hb-style */
     default:return -1;
     }
@@ -376,10 +378,10 @@ struct AxisValue
   {
     switch (u.format)
     {
-    case 1: return u.format1.get_value_name_id ();
-    case 2: return u.format2.get_value_name_id ();
-    case 3: return u.format3.get_value_name_id ();
-    case 4: return u.format4.get_value_name_id ();
+    case 1: hb_barrier (); return u.format1.get_value_name_id ();
+    case 2: hb_barrier (); return u.format2.get_value_name_id ();
+    case 3: hb_barrier (); return u.format3.get_value_name_id ();
+    case 4: hb_barrier (); return u.format4.get_value_name_id ();
     default:return HB_OT_NAME_ID_INVALID;
     }
   }
@@ -390,10 +392,10 @@ struct AxisValue
     if (unlikely (!c->may_dispatch (this, &u.format))) return c->no_dispatch_return_value ();
     TRACE_DISPATCH (this, u.format);
     switch (u.format) {
-    case 1: return_trace (c->dispatch (u.format1, std::forward<Ts> (ds)...));
-    case 2: return_trace (c->dispatch (u.format2, std::forward<Ts> (ds)...));
-    case 3: return_trace (c->dispatch (u.format3, std::forward<Ts> (ds)...));
-    case 4: return_trace (c->dispatch (u.format4, std::forward<Ts> (ds)...));
+    case 1: hb_barrier (); return_trace (c->dispatch (u.format1, std::forward<Ts> (ds)...));
+    case 2: hb_barrier (); return_trace (c->dispatch (u.format2, std::forward<Ts> (ds)...));
+    case 3: hb_barrier (); return_trace (c->dispatch (u.format3, std::forward<Ts> (ds)...));
+    case 4: hb_barrier (); return_trace (c->dispatch (u.format4, std::forward<Ts> (ds)...));
     default:return_trace (c->default_return_value ());
     }
   }
@@ -403,10 +405,10 @@ struct AxisValue
   {
     switch (u.format)
     {
-    case 1: return u.format1.keep_axis_value (axis_records, user_axes_location);
-    case 2: return u.format2.keep_axis_value (axis_records, user_axes_location);
-    case 3: return u.format3.keep_axis_value (axis_records, user_axes_location);
-    case 4: return u.format4.keep_axis_value (axis_records, user_axes_location);
+    case 1: hb_barrier (); return u.format1.keep_axis_value (axis_records, user_axes_location);
+    case 2: hb_barrier (); return u.format2.keep_axis_value (axis_records, user_axes_location);
+    case 3: hb_barrier (); return u.format3.keep_axis_value (axis_records, user_axes_location);
+    case 4: hb_barrier (); return u.format4.keep_axis_value (axis_records, user_axes_location);
     default:return false;
     }
   }
@@ -416,13 +418,14 @@ struct AxisValue
     TRACE_SANITIZE (this);
     if (unlikely (!c->check_struct (this)))
       return_trace (false);
+    hb_barrier ();
 
     switch (u.format)
     {
-    case 1: return_trace (u.format1.sanitize (c));
-    case 2: return_trace (u.format2.sanitize (c));
-    case 3: return_trace (u.format3.sanitize (c));
-    case 4: return_trace (u.format4.sanitize (c));
+    case 1: hb_barrier (); return_trace (u.format1.sanitize (c));
+    case 2: hb_barrier (); return_trace (u.format2.sanitize (c));
+    case 3: hb_barrier (); return_trace (u.format3.sanitize (c));
+    case 4: hb_barrier (); return_trace (u.format4.sanitize (c));
     default:return_trace (true);
     }
   }
@@ -483,7 +486,7 @@ struct STAT
     hb_array_t<const Offset16To<AxisValue>> axis_values = get_axis_value_offsets ();
     for (unsigned int i = 0; i < axis_values.length; i++)
     {
-      const AxisValue& axis_value = this+axis_values[i];
+      const AxisValue& axis_value = this+offsetToAxisValueOffsets+axis_values[i];
       if (axis_value.get_axis_index () == axis_index)
       {
         if (value)
@@ -560,6 +563,7 @@ struct STAT
   {
     TRACE_SANITIZE (this);
     return_trace (likely (c->check_struct (this) &&
+                          hb_barrier () &&
                           version.major == 1 &&
                           version.minor > 0 &&
                           designAxesOffset.sanitize (c, this, designAxisCount) &&
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-ot-tag-table.hh b/src/java.desktop/share/native/libharfbuzz/hb-ot-tag-table.hh
index 8ee42e638e0..50ddf5f6967 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-ot-tag-table.hh
+++ b/src/java.desktop/share/native/libharfbuzz/hb-ot-tag-table.hh
@@ -6,8 +6,8 @@
  *
  * on files with these headers:
  *
- * <meta name="updated_at" content="2022-09-30 11:47 PM" />
- * File-Date: 2023-08-02
+ * <meta name="updated_at" content="2024-12-06 06:35 AM" />
+ * File-Date: 2025-01-21
  */
 
 #ifndef HB_OT_TAG_TABLE_HH
@@ -26,12 +26,12 @@ static const LangTag ot_languages2[] = {
   {HB_TAG('a','y',' ',' '),     HB_TAG('A','Y','M',' ')},       /* Aymara [macrolanguage] */
   {HB_TAG('a','z',' ',' '),     HB_TAG('A','Z','E',' ')},       /* Azerbaijani [macrolanguage] */
   {HB_TAG('b','a',' ',' '),     HB_TAG('B','S','H',' ')},       /* Bashkir */
-  {HB_TAG('b','e',' ',' '),     HB_TAG('B','E','L',' ')},       /* Belarusian -> Belarussian */
+  {HB_TAG('b','e',' ',' '),     HB_TAG('B','E','L',' ')},       /* Belarusian */
   {HB_TAG('b','g',' ',' '),     HB_TAG('B','G','R',' ')},       /* Bulgarian */
   {HB_TAG('b','i',' ',' '),     HB_TAG('B','I','S',' ')},       /* Bislama */
   {HB_TAG('b','i',' ',' '),     HB_TAG('C','P','P',' ')},       /* Bislama -> Creoles */
   {HB_TAG('b','m',' ',' '),     HB_TAG('B','M','B',' ')},       /* Bambara (Bamanankan) */
-  {HB_TAG('b','n',' ',' '),     HB_TAG('B','E','N',' ')},       /* Bengali */
+  {HB_TAG('b','n',' ',' '),     HB_TAG('B','E','N',' ')},       /* Bangla */
   {HB_TAG('b','o',' ',' '),     HB_TAG('T','I','B',' ')},       /* Tibetan */
   {HB_TAG('b','r',' ',' '),     HB_TAG('B','R','E',' ')},       /* Breton */
   {HB_TAG('b','s',' ',' '),     HB_TAG('B','O','S',' ')},       /* Bosnian */
@@ -64,7 +64,8 @@ static const LangTag ot_languages2[] = {
   {HB_TAG('f','r',' ',' '),     HB_TAG('F','R','A',' ')},       /* French */
   {HB_TAG('f','y',' ',' '),     HB_TAG('F','R','I',' ')},       /* Western Frisian -> Frisian */
   {HB_TAG('g','a',' ',' '),     HB_TAG('I','R','I',' ')},       /* Irish */
-  {HB_TAG('g','d',' ',' '),     HB_TAG('G','A','E',' ')},       /* Scottish Gaelic (Gaelic) */
+  {HB_TAG('g','a',' ',' '),     HB_TAG('I','R','T',' ')},       /* Irish -> Irish Traditional */
+  {HB_TAG('g','d',' ',' '),     HB_TAG('G','A','E',' ')},       /* Scottish Gaelic */
   {HB_TAG('g','l',' ',' '),     HB_TAG('G','A','L',' ')},       /* Galician */
   {HB_TAG('g','n',' ',' '),     HB_TAG('G','U','A',' ')},       /* Guarani [macrolanguage] */
   {HB_TAG('g','u',' ',' '),     HB_TAG('G','U','J',' ')},       /* Gujarati */
@@ -153,7 +154,7 @@ static const LangTag ot_languages2[] = {
   {HB_TAG('o','c',' ',' '),     HB_TAG('O','C','I',' ')},       /* Occitan (post 1500) */
   {HB_TAG('o','j',' ',' '),     HB_TAG('O','J','B',' ')},       /* Ojibwa [macrolanguage] -> Ojibway */
   {HB_TAG('o','m',' ',' '),     HB_TAG('O','R','O',' ')},       /* Oromo [macrolanguage] */
-  {HB_TAG('o','r',' ',' '),     HB_TAG('O','R','I',' ')},       /* Odia (formerly Oriya) [macrolanguage] */
+  {HB_TAG('o','r',' ',' '),     HB_TAG('O','R','I',' ')},       /* Odia [macrolanguage] */
   {HB_TAG('o','s',' ',' '),     HB_TAG('O','S','S',' ')},       /* Ossetian */
   {HB_TAG('p','a',' ',' '),     HB_TAG('P','A','N',' ')},       /* Punjabi */
   {HB_TAG('p','i',' ',' '),     HB_TAG('P','A','L',' ')},       /* Pali */
@@ -166,7 +167,7 @@ static const LangTag ot_languages2[] = {
   {HB_TAG('r','o',' ',' '),     HB_TAG('R','O','M',' ')},       /* Romanian */
   {HB_TAG('r','u',' ',' '),     HB_TAG('R','U','S',' ')},       /* Russian */
   {HB_TAG('r','w',' ',' '),     HB_TAG('R','U','A',' ')},       /* Kinyarwanda */
-  {HB_TAG('s','a',' ',' '),     HB_TAG('S','A','N',' ')},       /* Sanskrit */
+  {HB_TAG('s','a',' ',' '),     HB_TAG('S','A','N',' ')},       /* Sanskrit [macrolanguage] */
   {HB_TAG('s','c',' ',' '),     HB_TAG('S','R','D',' ')},       /* Sardinian [macrolanguage] */
   {HB_TAG('s','d',' ',' '),     HB_TAG('S','N','D',' ')},       /* Sindhi */
   {HB_TAG('s','e',' ',' '),     HB_TAG('N','S','M',' ')},       /* Northern Sami */
@@ -223,6 +224,7 @@ static const LangTag ot_languages2[] = {
 static const LangTag ot_languages3[] = {
   {HB_TAG('a','a','e',' '),     HB_TAG('S','Q','I',' ')},       /* Arbëreshë Albanian -> Albanian */
   {HB_TAG('a','a','o',' '),     HB_TAG('A','R','A',' ')},       /* Algerian Saharan Arabic -> Arabic */
+/*{HB_TAG('a','a','q',' '),     HB_TAG('A','A','Q',' ')},*/     /* Eastern Abnaki -> Eastern Abenaki */
   {HB_TAG('a','a','t',' '),     HB_TAG('S','Q','I',' ')},       /* Arvanitika Albanian -> Albanian */
   {HB_TAG('a','b','a',' '),     HB_TAG_NONE            },       /* Abé != Abaza */
   {HB_TAG('a','b','h',' '),     HB_TAG('A','R','A',' ')},       /* Tajiki Arabic -> Arabic */
@@ -238,6 +240,7 @@ static const LangTag ot_languages3[] = {
   {HB_TAG('a','c','r',' '),     HB_TAG('M','Y','N',' ')},       /* Achi -> Mayan */
   {HB_TAG('a','c','w',' '),     HB_TAG('A','R','A',' ')},       /* Hijazi Arabic -> Arabic */
   {HB_TAG('a','c','x',' '),     HB_TAG('A','R','A',' ')},       /* Omani Arabic -> Arabic */
+  {HB_TAG('a','c','y',' '),     HB_TAG('A','C','Y',' ')},       /* Cypriot Arabic */
   {HB_TAG('a','c','y',' '),     HB_TAG('A','R','A',' ')},       /* Cypriot Arabic -> Arabic */
   {HB_TAG('a','d','a',' '),     HB_TAG('D','N','G',' ')},       /* Adangme -> Dangme */
   {HB_TAG('a','d','f',' '),     HB_TAG('A','R','A',' ')},       /* Dhofari Arabic -> Arabic */
@@ -288,6 +291,7 @@ static const LangTag ot_languages3[] = {
 /*{HB_TAG('a','s','t',' '),     HB_TAG('A','S','T',' ')},*/     /* Asturian */
 /*{HB_TAG('a','t','h',' '),     HB_TAG('A','T','H',' ')},*/     /* Athapascan [collection] -> Athapaskan */
   {HB_TAG('a','t','j',' '),     HB_TAG('R','C','R',' ')},       /* Atikamekw -> R-Cree */
+/*{HB_TAG('a','t','s',' '),     HB_TAG('A','T','S',' ')},*/     /* Gros Ventre (Atsina) */
   {HB_TAG('a','t','v',' '),     HB_TAG('A','L','T',' ')},       /* Northern Altai -> Altai */
   {HB_TAG('a','u','j',' '),     HB_TAG('B','B','R',' ')},       /* Awjilah -> Berber */
   {HB_TAG('a','u','z',' '),     HB_TAG('A','R','A',' ')},       /* Uzbeki Arabic -> Arabic */
@@ -326,6 +330,7 @@ static const LangTag ot_languages3[] = {
   {HB_TAG('b','c','l',' '),     HB_TAG('B','I','K',' ')},       /* Central Bikol -> Bikol */
   {HB_TAG('b','c','q',' '),     HB_TAG('B','C','H',' ')},       /* Bench */
   {HB_TAG('b','c','r',' '),     HB_TAG('A','T','H',' ')},       /* Babine -> Athapaskan */
+/*{HB_TAG('b','d','c',' '),     HB_TAG('B','D','C',' ')},*/     /* Emberá-Baudó */
 /*{HB_TAG('b','d','y',' '),     HB_TAG('B','D','Y',' ')},*/     /* Bandjalang */
   {HB_TAG('b','e','a',' '),     HB_TAG('A','T','H',' ')},       /* Beaver -> Athapaskan */
   {HB_TAG('b','e','b',' '),     HB_TAG('B','T','I',' ')},       /* Bebele -> Beti */
@@ -421,6 +426,8 @@ static const LangTag ot_languages3[] = {
   {HB_TAG('c','a','f',' '),     HB_TAG('A','T','H',' ')},       /* Southern Carrier -> Athapaskan */
   {HB_TAG('c','a','k',' '),     HB_TAG('C','A','K',' ')},       /* Kaqchikel */
   {HB_TAG('c','a','k',' '),     HB_TAG('M','Y','N',' ')},       /* Kaqchikel -> Mayan */
+/*{HB_TAG('c','a','y',' '),     HB_TAG('C','A','Y',' ')},*/     /* Cayuga */
+/*{HB_TAG('c','b','g',' '),     HB_TAG('C','B','G',' ')},*/     /* Chimila */
   {HB_TAG('c','b','k',' '),     HB_TAG('C','B','K',' ')},       /* Chavacano -> Zamboanga Chavacano */
   {HB_TAG('c','b','k',' '),     HB_TAG('C','P','P',' ')},       /* Chavacano -> Creoles */
   {HB_TAG('c','b','l',' '),     HB_TAG('Q','I','N',' ')},       /* Bualkhaw Chin -> Chin */
@@ -465,7 +472,9 @@ static const LangTag ot_languages3[] = {
   {HB_TAG('c','l','d',' '),     HB_TAG('S','Y','R',' ')},       /* Chaldean Neo-Aramaic -> Syriac */
   {HB_TAG('c','l','e',' '),     HB_TAG('C','C','H','N')},       /* Lealao Chinantec -> Chinantec */
   {HB_TAG('c','l','j',' '),     HB_TAG('Q','I','N',' ')},       /* Laitu Chin -> Chin */
+  {HB_TAG('c','l','s',' '),     HB_TAG('S','A','N',' ')},       /* Classical Sanskrit -> Sanskrit */
   {HB_TAG('c','l','t',' '),     HB_TAG('Q','I','N',' ')},       /* Lautu Chin -> Chin */
+/*{HB_TAG('c','m','i',' '),     HB_TAG('C','M','I',' ')},*/     /* Emberá-Chamí */
   {HB_TAG('c','m','n',' '),     HB_TAG('Z','H','S',' ')},       /* Mandarin Chinese -> Chinese, Simplified */
   {HB_TAG('c','m','r',' '),     HB_TAG('Q','I','N',' ')},       /* Mro-Khimi Chin -> Chin */
   {HB_TAG('c','n','b',' '),     HB_TAG('Q','I','N',' ')},       /* Chinbon Chin -> Chin */
@@ -479,6 +488,7 @@ static const LangTag ot_languages3[] = {
   {HB_TAG('c','n','w',' '),     HB_TAG('Q','I','N',' ')},       /* Ngawn Chin -> Chin */
   {HB_TAG('c','o','a',' '),     HB_TAG('M','L','Y',' ')},       /* Cocos Islands Malay -> Malay */
   {HB_TAG('c','o','b',' '),     HB_TAG('M','Y','N',' ')},       /* Chicomuceltec -> Mayan */
+/*{HB_TAG('c','o','o',' '),     HB_TAG('C','O','O',' ')},*/     /* Comox */
 /*{HB_TAG('c','o','p',' '),     HB_TAG('C','O','P',' ')},*/     /* Coptic */
   {HB_TAG('c','o','q',' '),     HB_TAG('A','T','H',' ')},       /* Coquille -> Athapaskan */
   {HB_TAG('c','p','a',' '),     HB_TAG('C','C','H','N')},       /* Palantla Chinantec -> Chinantec */
@@ -528,6 +538,7 @@ static const LangTag ot_languages3[] = {
 /*{HB_TAG('c','t','g',' '),     HB_TAG('C','T','G',' ')},*/     /* Chittagonian */
   {HB_TAG('c','t','h',' '),     HB_TAG('Q','I','N',' ')},       /* Thaiphum Chin -> Chin */
   {HB_TAG('c','t','l',' '),     HB_TAG('C','C','H','N')},       /* Tlacoatzintepec Chinantec -> Chinantec */
+/*{HB_TAG('c','t','o',' '),     HB_TAG('C','T','O',' ')},*/     /* Emberá-Catío */
   {HB_TAG('c','t','s',' '),     HB_TAG('B','I','K',' ')},       /* Northern Catanduanes Bikol -> Bikol */
 /*{HB_TAG('c','t','t',' '),     HB_TAG('C','T','T',' ')},*/     /* Wayanad Chetti */
   {HB_TAG('c','t','u',' '),     HB_TAG('M','Y','N',' ')},       /* Chol -> Mayan */
@@ -551,7 +562,7 @@ static const LangTag ot_languages3[] = {
   {HB_TAG('d','e','p',' '),     HB_TAG('C','P','P',' ')},       /* Pidgin Delaware -> Creoles */
   {HB_TAG('d','g','o',' '),     HB_TAG('D','G','O',' ')},       /* Dogri (individual language) */
   {HB_TAG('d','g','o',' '),     HB_TAG('D','G','R',' ')},       /* Dogri (macrolanguage) */
-  {HB_TAG('d','g','r',' '),     HB_TAG('A','T','H',' ')},       /* Dogrib -> Athapaskan */
+  {HB_TAG('d','g','r',' '),     HB_TAG('A','T','H',' ')},       /* Tlicho -> Athapaskan */
   {HB_TAG('d','h','d',' '),     HB_TAG('M','A','W',' ')},       /* Dhundari -> Marwari */
 /*{HB_TAG('d','h','g',' '),     HB_TAG('D','H','G',' ')},*/     /* Dhangu */
   {HB_TAG('d','h','v',' '),     HB_TAG_NONE            },       /* Dehu != Divehi (Dhivehi, Maldivian) (deprecated) */
@@ -590,6 +601,7 @@ static const LangTag ot_languages3[] = {
   {HB_TAG('e','k','y',' '),     HB_TAG('K','R','N',' ')},       /* Eastern Kayah -> Karen */
   {HB_TAG('e','m','k',' '),     HB_TAG('E','M','K',' ')},       /* Eastern Maninkakan */
   {HB_TAG('e','m','k',' '),     HB_TAG('M','N','K',' ')},       /* Eastern Maninkakan -> Maninka */
+/*{HB_TAG('e','m','p',' '),     HB_TAG('E','M','P',' ')},*/     /* Northern Emberá */
   {HB_TAG('e','m','y',' '),     HB_TAG('M','Y','N',' ')},       /* Epigraphic Mayan -> Mayan */
   {HB_TAG('e','n','b',' '),     HB_TAG('K','A','L',' ')},       /* Markweeta -> Kalenjin */
   {HB_TAG('e','n','f',' '),     HB_TAG('F','N','E',' ')},       /* Forest Enets */
@@ -637,7 +649,7 @@ static const LangTag ot_languages3[] = {
   {HB_TAG('g','a','a',' '),     HB_TAG('G','A','D',' ')},       /* Ga */
   {HB_TAG('g','a','c',' '),     HB_TAG('C','P','P',' ')},       /* Mixed Great Andamanese -> Creoles */
   {HB_TAG('g','a','d',' '),     HB_TAG_NONE            },       /* Gaddang != Ga */
-  {HB_TAG('g','a','e',' '),     HB_TAG_NONE            },       /* Guarequena != Scottish Gaelic (Gaelic) */
+  {HB_TAG('g','a','e',' '),     HB_TAG_NONE            },       /* Guarequena != Scottish Gaelic */
 /*{HB_TAG('g','a','g',' '),     HB_TAG('G','A','G',' ')},*/     /* Gagauz */
   {HB_TAG('g','a','l',' '),     HB_TAG_NONE            },       /* Galolen != Galician */
   {HB_TAG('g','a','n',' '),     HB_TAG('Z','H','S',' ')},       /* Gan Chinese -> Chinese, Simplified */
@@ -654,6 +666,7 @@ static const LangTag ot_languages3[] = {
 /*{HB_TAG('g','e','z',' '),     HB_TAG('G','E','Z',' ')},*/     /* Geez */
   {HB_TAG('g','g','o',' '),     HB_TAG('G','O','N',' ')},       /* Southern Gondi (retired code) -> Gondi */
   {HB_TAG('g','h','a',' '),     HB_TAG('B','B','R',' ')},       /* Ghadamès -> Berber */
+  {HB_TAG('g','h','c',' '),     HB_TAG('I','R','T',' ')},       /* Hiberno-Scottish Gaelic -> Irish Traditional */
   {HB_TAG('g','h','k',' '),     HB_TAG('K','R','N',' ')},       /* Geko Karen -> Karen */
   {HB_TAG('g','h','o',' '),     HB_TAG('B','B','R',' ')},       /* Ghomara -> Berber */
   {HB_TAG('g','i','b',' '),     HB_TAG('C','P','P',' ')},       /* Gibanawa -> Creoles */
@@ -732,6 +745,7 @@ static const LangTag ot_languages3[] = {
 /*{HB_TAG('h','n','d',' '),     HB_TAG('H','N','D',' ')},*/     /* Southern Hindko -> Hindko */
   {HB_TAG('h','n','e',' '),     HB_TAG('C','H','H',' ')},       /* Chhattisgarhi -> Chattisgarhi */
   {HB_TAG('h','n','j',' '),     HB_TAG('H','M','N',' ')},       /* Hmong Njua -> Hmong */
+  {HB_TAG('h','n','m',' '),     HB_TAG('Z','H','S',' ')},       /* Hainanese -> Chinese, Simplified */
   {HB_TAG('h','n','o',' '),     HB_TAG('H','N','D',' ')},       /* Northern Hindko -> Hindko */
   {HB_TAG('h','o','c',' '),     HB_TAG('H','O',' ',' ')},       /* Ho */
   {HB_TAG('h','o','i',' '),     HB_TAG('A','T','H',' ')},       /* Holikachuk -> Athapaskan */
@@ -743,6 +757,7 @@ static const LangTag ot_languages3[] = {
   {HB_TAG('h','s','n',' '),     HB_TAG('Z','H','S',' ')},       /* Xiang Chinese -> Chinese, Simplified */
   {HB_TAG('h','u','j',' '),     HB_TAG('H','M','N',' ')},       /* Northern Guiyang Hmong -> Hmong */
   {HB_TAG('h','u','p',' '),     HB_TAG('A','T','H',' ')},       /* Hupa -> Athapaskan */
+/*{HB_TAG('h','u','r',' '),     HB_TAG('H','U','R',' ')},*/     /* Halkomelem */
   {HB_TAG('h','u','s',' '),     HB_TAG('M','Y','N',' ')},       /* Huastec -> Mayan */
   {HB_TAG('h','w','c',' '),     HB_TAG('C','P','P',' ')},       /* Hawai'i Creole English -> Creoles */
   {HB_TAG('h','y','w',' '),     HB_TAG('H','Y','E',' ')},       /* Western Armenian -> Armenian */
@@ -780,6 +795,7 @@ static const LangTag ot_languages3[] = {
   {HB_TAG('j','b','n',' '),     HB_TAG('B','B','R',' ')},       /* Nafusi -> Berber */
 /*{HB_TAG('j','b','o',' '),     HB_TAG('J','B','O',' ')},*/     /* Lojban */
 /*{HB_TAG('j','c','t',' '),     HB_TAG('J','C','T',' ')},*/     /* Krymchak */
+/*{HB_TAG('j','d','t',' '),     HB_TAG('J','D','T',' ')},*/     /* Judeo-Tat */
   {HB_TAG('j','g','o',' '),     HB_TAG('B','M','L',' ')},       /* Ngomba -> Bamileke */
   {HB_TAG('j','i','i',' '),     HB_TAG_NONE            },       /* Jiiddu != Yiddish */
   {HB_TAG('j','k','m',' '),     HB_TAG('K','R','N',' ')},       /* Mobwa Karen -> Karen */
@@ -794,6 +810,7 @@ static const LangTag ot_languages3[] = {
   {HB_TAG('k','a','m',' '),     HB_TAG('K','M','B',' ')},       /* Kamba (Kenya) */
   {HB_TAG('k','a','r',' '),     HB_TAG('K','R','N',' ')},       /* Karen [collection] */
 /*{HB_TAG('k','a','w',' '),     HB_TAG('K','A','W',' ')},*/     /* Kawi (Old Javanese) */
+/*{HB_TAG('k','b','c',' '),     HB_TAG('K','B','C',' ')},*/     /* Kadiwéu */
   {HB_TAG('k','b','d',' '),     HB_TAG('K','A','B',' ')},       /* Kabardian */
   {HB_TAG('k','b','y',' '),     HB_TAG('K','N','R',' ')},       /* Manga Kanuri -> Kanuri */
   {HB_TAG('k','c','a',' '),     HB_TAG('K','H','K',' ')},       /* Khanty -> Khanty-Kazim */
@@ -814,6 +831,7 @@ static const LangTag ot_languages3[] = {
   {HB_TAG('k','f','x',' '),     HB_TAG('K','U','L',' ')},       /* Kullu Pahari -> Kulvi */
   {HB_TAG('k','f','y',' '),     HB_TAG('K','M','N',' ')},       /* Kumaoni */
   {HB_TAG('k','g','e',' '),     HB_TAG_NONE            },       /* Komering != Khutsuri Georgian */
+/*{HB_TAG('k','g','f',' '),     HB_TAG('K','G','F',' ')},*/     /* Kube */
   {HB_TAG('k','h','a',' '),     HB_TAG('K','S','I',' ')},       /* Khasi */
   {HB_TAG('k','h','b',' '),     HB_TAG('X','B','D',' ')},       /* Lü */
   {HB_TAG('k','h','k',' '),     HB_TAG('M','N','G',' ')},       /* Halh Mongolian -> Mongolian */
@@ -829,6 +847,7 @@ static const LangTag ot_languages3[] = {
   {HB_TAG('k','j','b',' '),     HB_TAG('M','Y','N',' ')},       /* Q'anjob'al -> Mayan */
 /*{HB_TAG('k','j','d',' '),     HB_TAG('K','J','D',' ')},*/     /* Southern Kiwai */
   {HB_TAG('k','j','h',' '),     HB_TAG('K','H','A',' ')},       /* Khakas -> Khakass */
+/*{HB_TAG('k','j','j',' '),     HB_TAG('K','J','J',' ')},*/     /* Khinalugh -> Khinalug */
   {HB_TAG('k','j','p',' '),     HB_TAG('K','J','P',' ')},       /* Pwo Eastern Karen -> Eastern Pwo Karen */
   {HB_TAG('k','j','p',' '),     HB_TAG('K','R','N',' ')},       /* Pwo Eastern Karen -> Karen */
   {HB_TAG('k','j','t',' '),     HB_TAG('K','R','N',' ')},       /* Phrae Pwo Karen -> Karen */
@@ -838,6 +857,7 @@ static const LangTag ot_languages3[] = {
   {HB_TAG('k','l','m',' '),     HB_TAG_NONE            },       /* Migum != Kalmyk */
   {HB_TAG('k','l','n',' '),     HB_TAG('K','A','L',' ')},       /* Kalenjin [macrolanguage] */
   {HB_TAG('k','m','b',' '),     HB_TAG('M','B','N',' ')},       /* Kimbundu -> Mbundu */
+/*{HB_TAG('k','m','g',' '),     HB_TAG('K','M','G',' ')},*/     /* Kâte */
   {HB_TAG('k','m','n',' '),     HB_TAG_NONE            },       /* Awtuw != Kumaoni */
   {HB_TAG('k','m','o',' '),     HB_TAG_NONE            },       /* Kwoma != Komo */
   {HB_TAG('k','m','r',' '),     HB_TAG('K','U','R',' ')},       /* Northern Kurdish -> Kurdish */
@@ -881,6 +901,7 @@ static const LangTag ot_languages3[] = {
   {HB_TAG('k','s','i',' '),     HB_TAG_NONE            },       /* Krisa != Khasi */
   {HB_TAG('k','s','m',' '),     HB_TAG_NONE            },       /* Kumba != Kildin Sami */
   {HB_TAG('k','s','s',' '),     HB_TAG('K','I','S',' ')},       /* Southern Kisi -> Kisii */
+/*{HB_TAG('k','s','u',' '),     HB_TAG('K','S','U',' ')},*/     /* Khamyang */
   {HB_TAG('k','s','w',' '),     HB_TAG('K','S','W',' ')},       /* S’gaw Karen */
   {HB_TAG('k','s','w',' '),     HB_TAG('K','R','N',' ')},       /* S'gaw Karen -> Karen */
   {HB_TAG('k','t','b',' '),     HB_TAG('K','E','B',' ')},       /* Kambaata -> Kebena */
@@ -894,6 +915,7 @@ static const LangTag ot_languages3[] = {
   {HB_TAG('k','u','y',' '),     HB_TAG_NONE            },       /* Kuuku-Ya'u != Kuy */
   {HB_TAG('k','v','b',' '),     HB_TAG('M','L','Y',' ')},       /* Kubu -> Malay */
   {HB_TAG('k','v','l',' '),     HB_TAG('K','R','N',' ')},       /* Kayaw -> Karen */
+  {HB_TAG('k','v','q',' '),     HB_TAG('K','V','Q',' ')},       /* Geba Karen */
   {HB_TAG('k','v','q',' '),     HB_TAG('K','R','N',' ')},       /* Geba Karen -> Karen */
   {HB_TAG('k','v','r',' '),     HB_TAG('M','L','Y',' ')},       /* Kerinci -> Malay */
   {HB_TAG('k','v','t',' '),     HB_TAG('K','R','N',' ')},       /* Lahta Karen -> Karen */
@@ -930,6 +952,7 @@ static const LangTag ot_languages3[] = {
 /*{HB_TAG('l','i','j',' '),     HB_TAG('L','I','J',' ')},*/     /* Ligurian */
   {HB_TAG('l','i','r',' '),     HB_TAG('C','P','P',' ')},       /* Liberian English -> Creoles */
 /*{HB_TAG('l','i','s',' '),     HB_TAG('L','I','S',' ')},*/     /* Lisu */
+/*{HB_TAG('l','i','v',' '),     HB_TAG('L','I','V',' ')},*/     /* Liv */
   {HB_TAG('l','i','w',' '),     HB_TAG('M','L','Y',' ')},       /* Col -> Malay */
   {HB_TAG('l','i','y',' '),     HB_TAG('B','A','D','0')},       /* Banda-Bambari -> Banda */
 /*{HB_TAG('l','j','p',' '),     HB_TAG('L','J','P',' ')},*/     /* Lampung Api -> Lampung */
@@ -959,9 +982,11 @@ static const LangTag ot_languages3[] = {
   {HB_TAG('l','t','o',' '),     HB_TAG('L','U','H',' ')},       /* Tsotso -> Luyia */
   {HB_TAG('l','t','s',' '),     HB_TAG('L','U','H',' ')},       /* Tachoni -> Luyia */
 /*{HB_TAG('l','u','a',' '),     HB_TAG('L','U','A',' ')},*/     /* Luba-Lulua */
+  {HB_TAG('l','u','h',' '),     HB_TAG('Z','H','S',' ')},       /* Leizhou Chinese -> Chinese, Simplified */
 /*{HB_TAG('l','u','o',' '),     HB_TAG('L','U','O',' ')},*/     /* Luo (Kenya and Tanzania) */
   {HB_TAG('l','u','s',' '),     HB_TAG('M','I','Z',' ')},       /* Lushai -> Mizo */
   {HB_TAG('l','u','s',' '),     HB_TAG('Q','I','N',' ')},       /* Lushai -> Chin */
+/*{HB_TAG('l','u','t',' '),     HB_TAG('L','U','T',' ')},*/     /* Lushootseed */
   {HB_TAG('l','u','y',' '),     HB_TAG('L','U','H',' ')},       /* Luyia [macrolanguage] */
   {HB_TAG('l','u','z',' '),     HB_TAG('L','R','C',' ')},       /* Southern Luri -> Luri */
   {HB_TAG('l','v','i',' '),     HB_TAG_NONE            },       /* Lavi != Latvian */
@@ -995,12 +1020,14 @@ static const LangTag ot_languages3[] = {
   {HB_TAG('m','e','n',' '),     HB_TAG('M','D','E',' ')},       /* Mende (Sierra Leone) */
   {HB_TAG('m','e','o',' '),     HB_TAG('M','L','Y',' ')},       /* Kedah Malay -> Malay */
 /*{HB_TAG('m','e','r',' '),     HB_TAG('M','E','R',' ')},*/     /* Meru */
+/*{HB_TAG('m','e','v',' '),     HB_TAG('M','E','V',' ')},*/     /* Mano */
   {HB_TAG('m','f','a',' '),     HB_TAG('M','F','A',' ')},       /* Pattani Malay */
   {HB_TAG('m','f','a',' '),     HB_TAG('M','L','Y',' ')},       /* Pattani Malay -> Malay */
   {HB_TAG('m','f','b',' '),     HB_TAG('M','L','Y',' ')},       /* Bangka -> Malay */
   {HB_TAG('m','f','e',' '),     HB_TAG('M','F','E',' ')},       /* Morisyen */
   {HB_TAG('m','f','e',' '),     HB_TAG('C','P','P',' ')},       /* Morisyen -> Creoles */
   {HB_TAG('m','f','p',' '),     HB_TAG('C','P','P',' ')},       /* Makassar Malay -> Creoles */
+  {HB_TAG('m','g','a',' '),     HB_TAG('S','G','A',' ')},       /* Middle Irish (900-1200) -> Old Irish */
   {HB_TAG('m','h','c',' '),     HB_TAG('M','Y','N',' ')},       /* Mocho -> Mayan */
   {HB_TAG('m','h','r',' '),     HB_TAG('L','M','A',' ')},       /* Eastern Mari -> Low Mari */
   {HB_TAG('m','h','v',' '),     HB_TAG('A','R','K',' ')},       /* Arakanese (retired code) -> Rakhine */
@@ -1126,6 +1153,7 @@ static const LangTag ot_languages3[] = {
   {HB_TAG('n','o','d',' '),     HB_TAG('N','T','A',' ')},       /* Northern Thai -> Northern Tai */
 /*{HB_TAG('n','o','e',' '),     HB_TAG('N','O','E',' ')},*/     /* Nimadi */
 /*{HB_TAG('n','o','g',' '),     HB_TAG('N','O','G',' ')},*/     /* Nogai */
+/*{HB_TAG('n','o','p',' '),     HB_TAG('N','O','P',' ')},*/     /* Numanggang */
 /*{HB_TAG('n','o','v',' '),     HB_TAG('N','O','V',' ')},*/     /* Novial */
   {HB_TAG('n','p','i',' '),     HB_TAG('N','E','P',' ')},       /* Nepali */
   {HB_TAG('n','p','l',' '),     HB_TAG('N','A','H',' ')},       /* Southeastern Puebla Nahuatl -> Nahuatl */
@@ -1136,6 +1164,7 @@ static const LangTag ot_languages3[] = {
   {HB_TAG('n','s','u',' '),     HB_TAG('N','A','H',' ')},       /* Sierra Negra Nahuatl -> Nahuatl */
   {HB_TAG('n','t','o',' '),     HB_TAG_NONE            },       /* Ntomba != Esperanto */
   {HB_TAG('n','u','e',' '),     HB_TAG('B','A','D','0')},       /* Ngundu -> Banda */
+/*{HB_TAG('n','u','k',' '),     HB_TAG('N','U','K',' ')},*/     /* Nuu-chah-nulth */
   {HB_TAG('n','u','u',' '),     HB_TAG('B','A','D','0')},       /* Ngbundu -> Banda */
   {HB_TAG('n','u','z',' '),     HB_TAG('N','A','H',' ')},       /* Tlamacazapa Nahuatl -> Nahuatl */
   {HB_TAG('n','w','e',' '),     HB_TAG('B','M','L',' ')},       /* Ngwe -> Bamileke */
@@ -1153,6 +1182,8 @@ static const LangTag ot_languages3[] = {
   {HB_TAG('o','k','i',' '),     HB_TAG('K','A','L',' ')},       /* Okiek -> Kalenjin */
   {HB_TAG('o','k','m',' '),     HB_TAG('K','O','H',' ')},       /* Middle Korean (10th-16th cent.) -> Korean Old Hangul */
   {HB_TAG('o','k','r',' '),     HB_TAG('I','J','O',' ')},       /* Kirike -> Ijo */
+/*{HB_TAG('o','n','e',' '),     HB_TAG('O','N','E',' ')},*/     /* Oneida */
+/*{HB_TAG('o','n','o',' '),     HB_TAG('O','N','O',' ')},*/     /* Onondaga */
   {HB_TAG('o','n','x',' '),     HB_TAG('C','P','P',' ')},       /* Onin Based Pidgin -> Creoles */
   {HB_TAG('o','o','r',' '),     HB_TAG('C','P','P',' ')},       /* Oorlams -> Creoles */
   {HB_TAG('o','r','c',' '),     HB_TAG('O','R','O',' ')},       /* Orma -> Oromo */
@@ -1160,7 +1191,7 @@ static const LangTag ot_languages3[] = {
   {HB_TAG('o','r','o',' '),     HB_TAG_NONE            },       /* Orokolo != Oromo */
   {HB_TAG('o','r','r',' '),     HB_TAG('I','J','O',' ')},       /* Oruma -> Ijo */
   {HB_TAG('o','r','s',' '),     HB_TAG('M','L','Y',' ')},       /* Orang Seletar -> Malay */
-  {HB_TAG('o','r','y',' '),     HB_TAG('O','R','I',' ')},       /* Odia (formerly Oriya) */
+  {HB_TAG('o','r','y',' '),     HB_TAG('O','R','I',' ')},       /* Odia */
   {HB_TAG('o','t','w',' '),     HB_TAG('O','J','B',' ')},       /* Ottawa -> Ojibway */
   {HB_TAG('o','u','a',' '),     HB_TAG('B','B','R',' ')},       /* Tagargrent -> Berber */
   {HB_TAG('p','a','a',' '),     HB_TAG_NONE            },       /* Papuan [collection] != Palestinian Aramaic */
@@ -1193,7 +1224,7 @@ static const LangTag ot_languages3[] = {
   {HB_TAG('p','i','s',' '),     HB_TAG('C','P','P',' ')},       /* Pijin -> Creoles */
   {HB_TAG('p','k','h',' '),     HB_TAG('Q','I','N',' ')},       /* Pankhu -> Chin */
   {HB_TAG('p','k','o',' '),     HB_TAG('K','A','L',' ')},       /* Pökoot -> Kalenjin */
-  {HB_TAG('p','l','g',' '),     HB_TAG_NONE            },       /* Pilagá != Palaung */
+  {HB_TAG('p','l','g',' '),     HB_TAG('P','L','G','0')},       /* Pilagá */
   {HB_TAG('p','l','k',' '),     HB_TAG_NONE            },       /* Kohistani Shina != Polish */
   {HB_TAG('p','l','l',' '),     HB_TAG('P','L','G',' ')},       /* Shwe Palaung -> Palaung */
   {HB_TAG('p','l','n',' '),     HB_TAG('C','P','P',' ')},       /* Palenquero -> Creoles */
@@ -1353,6 +1384,7 @@ static const LangTag ot_languages3[] = {
   {HB_TAG('s','d','h',' '),     HB_TAG('K','U','R',' ')},       /* Southern Kurdish -> Kurdish */
   {HB_TAG('s','d','n',' '),     HB_TAG('S','R','D',' ')},       /* Gallurese Sardinian -> Sardinian */
   {HB_TAG('s','d','s',' '),     HB_TAG('B','B','R',' ')},       /* Sened -> Berber */
+/*{HB_TAG('s','e','e',' '),     HB_TAG('S','E','E',' ')},*/     /* Seneca */
   {HB_TAG('s','e','h',' '),     HB_TAG('S','N','A',' ')},       /* Sena */
   {HB_TAG('s','e','k',' '),     HB_TAG('A','T','H',' ')},       /* Sekani -> Athapaskan */
 /*{HB_TAG('s','e','l',' '),     HB_TAG('S','E','L',' ')},*/     /* Selkup */
@@ -1374,9 +1406,13 @@ static const LangTag ot_languages3[] = {
 /*{HB_TAG('s','i','d',' '),     HB_TAG('S','I','D',' ')},*/     /* Sidamo */
   {HB_TAG('s','i','g',' '),     HB_TAG_NONE            },       /* Paasaal != Silte Gurage */
   {HB_TAG('s','i','z',' '),     HB_TAG('B','B','R',' ')},       /* Siwi -> Berber */
+/*{HB_TAG('s','j','a',' '),     HB_TAG('S','J','A',' ')},*/     /* Epena */
+  {HB_TAG('s','j','c',' '),     HB_TAG('Z','H','S',' ')},       /* Shaojiang Chinese -> Chinese, Simplified */
   {HB_TAG('s','j','d',' '),     HB_TAG('K','S','M',' ')},       /* Kildin Sami */
+/*{HB_TAG('s','j','e',' '),     HB_TAG('S','J','E',' ')},*/     /* Pite Sami */
   {HB_TAG('s','j','o',' '),     HB_TAG('S','I','B',' ')},       /* Xibe -> Sibe */
   {HB_TAG('s','j','s',' '),     HB_TAG('B','B','R',' ')},       /* Senhaja De Srair -> Berber */
+/*{HB_TAG('s','j','u',' '),     HB_TAG('S','J','U',' ')},*/     /* Ume Sami */
   {HB_TAG('s','k','g',' '),     HB_TAG('M','L','G',' ')},       /* Sakalava Malagasy -> Malagasy */
   {HB_TAG('s','k','r',' '),     HB_TAG('S','R','K',' ')},       /* Saraiki */
   {HB_TAG('s','k','s',' '),     HB_TAG_NONE            },       /* Maia != Skolt Sami */
@@ -1395,7 +1431,7 @@ static const LangTag ot_languages3[] = {
 /*{HB_TAG('s','n','k',' '),     HB_TAG('S','N','K',' ')},*/     /* Soninke */
   {HB_TAG('s','o','g',' '),     HB_TAG_NONE            },       /* Sogdian != Sodo Gurage */
 /*{HB_TAG('s','o','p',' '),     HB_TAG('S','O','P',' ')},*/     /* Songe */
-  {HB_TAG('s','p','v',' '),     HB_TAG('O','R','I',' ')},       /* Sambalpuri -> Odia (formerly Oriya) */
+  {HB_TAG('s','p','v',' '),     HB_TAG('O','R','I',' ')},       /* Sambalpuri -> Odia */
   {HB_TAG('s','p','y',' '),     HB_TAG('K','A','L',' ')},       /* Sabaot -> Kalenjin */
   {HB_TAG('s','r','b',' '),     HB_TAG_NONE            },       /* Sora != Serbian */
   {HB_TAG('s','r','c',' '),     HB_TAG('S','R','D',' ')},       /* Logudorese Sardinian -> Sardinian */
@@ -1410,6 +1446,7 @@ static const LangTag ot_languages3[] = {
   {HB_TAG('s','s','m',' '),     HB_TAG_NONE            },       /* Semnam != Southern Sami */
   {HB_TAG('s','t','a',' '),     HB_TAG('C','P','P',' ')},       /* Settla -> Creoles */
 /*{HB_TAG('s','t','q',' '),     HB_TAG('S','T','Q',' ')},*/     /* Saterfriesisch -> Saterland Frisian */
+/*{HB_TAG('s','t','r',' '),     HB_TAG('S','T','R',' ')},*/     /* Straits Salish */
   {HB_TAG('s','t','v',' '),     HB_TAG('S','I','G',' ')},       /* Silt'e -> Silte Gurage */
 /*{HB_TAG('s','u','k',' '),     HB_TAG('S','U','K',' ')},*/     /* Sukuma */
   {HB_TAG('s','u','q',' '),     HB_TAG('S','U','R',' ')},       /* Suri */
@@ -1431,10 +1468,12 @@ static const LangTag ot_languages3[] = {
   {HB_TAG('t','a','a',' '),     HB_TAG('A','T','H',' ')},       /* Lower Tanana -> Athapaskan */
 /*{HB_TAG('t','a','b',' '),     HB_TAG('T','A','B',' ')},*/     /* Tabassaran -> Tabasaran */
   {HB_TAG('t','a','j',' '),     HB_TAG_NONE            },       /* Eastern Tamang != Tajiki */
+  {HB_TAG('t','a','q',' '),     HB_TAG('T','A','Q',' ')},       /* Tamasheq */
   {HB_TAG('t','a','q',' '),     HB_TAG('T','M','H',' ')},       /* Tamasheq -> Tamashek */
   {HB_TAG('t','a','q',' '),     HB_TAG('B','B','R',' ')},       /* Tamasheq -> Berber */
   {HB_TAG('t','a','s',' '),     HB_TAG('C','P','P',' ')},       /* Tay Boi -> Creoles */
   {HB_TAG('t','a','u',' '),     HB_TAG('A','T','H',' ')},       /* Upper Tanana -> Athapaskan */
+/*{HB_TAG('t','b','v',' '),     HB_TAG('T','B','V',' ')},*/     /* Tobo */
   {HB_TAG('t','c','b',' '),     HB_TAG('A','T','H',' ')},       /* Tanacross -> Athapaskan */
   {HB_TAG('t','c','e',' '),     HB_TAG('A','T','H',' ')},       /* Southern Tutchone -> Athapaskan */
   {HB_TAG('t','c','h',' '),     HB_TAG('C','P','P',' ')},       /* Turks And Caicos Creole English -> Creoles */
@@ -1442,6 +1481,7 @@ static const LangTag ot_languages3[] = {
   {HB_TAG('t','c','s',' '),     HB_TAG('C','P','P',' ')},       /* Torres Strait Creole -> Creoles */
   {HB_TAG('t','c','y',' '),     HB_TAG('T','U','L',' ')},       /* Tulu */
   {HB_TAG('t','c','z',' '),     HB_TAG('Q','I','N',' ')},       /* Thado Chin -> Chin */
+/*{HB_TAG('t','d','c',' '),     HB_TAG('T','D','C',' ')},*/     /* Emberá-Tadó */
 /*{HB_TAG('t','d','d',' '),     HB_TAG('T','D','D',' ')},*/     /* Tai Nüa -> Dehong Dai */
   {HB_TAG('t','d','x',' '),     HB_TAG('M','L','G',' ')},       /* Tandroy-Mahafaly Malagasy -> Malagasy */
   {HB_TAG('t','e','c',' '),     HB_TAG('K','A','L',' ')},       /* Terik -> Kalenjin */
@@ -1455,9 +1495,12 @@ static const LangTag ot_languages3[] = {
   {HB_TAG('t','g','r',' '),     HB_TAG_NONE            },       /* Tareng != Tigre */
   {HB_TAG('t','g','x',' '),     HB_TAG('A','T','H',' ')},       /* Tagish -> Athapaskan */
   {HB_TAG('t','g','y',' '),     HB_TAG_NONE            },       /* Togoyo != Tigrinya */
+/*{HB_TAG('t','h','p',' '),     HB_TAG('T','H','P',' ')},*/     /* Thompson */
   {HB_TAG('t','h','t',' '),     HB_TAG('A','T','H',' ')},       /* Tahltan -> Athapaskan */
+  {HB_TAG('t','h','v',' '),     HB_TAG('T','H','V',' ')},       /* Tahaggart Tamahaq */
   {HB_TAG('t','h','v',' '),     HB_TAG('T','M','H',' ')},       /* Tahaggart Tamahaq -> Tamashek */
   {HB_TAG('t','h','v',' '),     HB_TAG('B','B','R',' ')},       /* Tahaggart Tamahaq -> Berber */
+  {HB_TAG('t','h','z',' '),     HB_TAG('T','H','Z',' ')},       /* Tayart Tamajeq */
   {HB_TAG('t','h','z',' '),     HB_TAG('T','M','H',' ')},       /* Tayart Tamajeq -> Tamashek */
   {HB_TAG('t','h','z',' '),     HB_TAG('B','B','R',' ')},       /* Tayart Tamajeq -> Berber */
   {HB_TAG('t','i','a',' '),     HB_TAG('B','B','R',' ')},       /* Tidikelt Tamazight -> Berber */
@@ -1468,6 +1511,7 @@ static const LangTag ot_languages3[] = {
   {HB_TAG('t','k','g',' '),     HB_TAG('M','L','G',' ')},       /* Tesaka Malagasy -> Malagasy */
   {HB_TAG('t','k','m',' '),     HB_TAG_NONE            },       /* Takelma != Turkmen */
 /*{HB_TAG('t','l','i',' '),     HB_TAG('T','L','I',' ')},*/     /* Tlingit */
+/*{HB_TAG('t','l','y',' '),     HB_TAG('T','L','Y',' ')},*/     /* Talysh */
   {HB_TAG('t','m','g',' '),     HB_TAG('C','P','P',' ')},       /* Ternateño -> Creoles */
   {HB_TAG('t','m','h',' '),     HB_TAG('T','M','H',' ')},       /* Tamashek [macrolanguage] */
   {HB_TAG('t','m','h',' '),     HB_TAG('B','B','R',' ')},       /* Tamashek [macrolanguage] -> Berber */
@@ -1493,11 +1537,13 @@ static const LangTag ot_languages3[] = {
 /*{HB_TAG('t','s','j',' '),     HB_TAG('T','S','J',' ')},*/     /* Tshangla */
   {HB_TAG('t','t','c',' '),     HB_TAG('M','Y','N',' ')},       /* Tektiteko -> Mayan */
   {HB_TAG('t','t','m',' '),     HB_TAG('A','T','H',' ')},       /* Northern Tutchone -> Athapaskan */
+  {HB_TAG('t','t','q',' '),     HB_TAG('T','T','Q',' ')},       /* Tawallammat Tamajaq */
   {HB_TAG('t','t','q',' '),     HB_TAG('T','M','H',' ')},       /* Tawallammat Tamajaq -> Tamashek */
   {HB_TAG('t','t','q',' '),     HB_TAG('B','B','R',' ')},       /* Tawallammat Tamajaq -> Berber */
   {HB_TAG('t','u','a',' '),     HB_TAG_NONE            },       /* Wiarumus != Turoyo Aramaic */
   {HB_TAG('t','u','l',' '),     HB_TAG_NONE            },       /* Tula != Tulu */
 /*{HB_TAG('t','u','m',' '),     HB_TAG('T','U','M',' ')},*/     /* Tumbuka */
+/*{HB_TAG('t','u','s',' '),     HB_TAG('T','U','S',' ')},*/     /* Tuscarora */
   {HB_TAG('t','u','u',' '),     HB_TAG('A','T','H',' ')},       /* Tututni -> Athapaskan */
   {HB_TAG('t','u','v',' '),     HB_TAG_NONE            },       /* Turkana != Tuvin */
   {HB_TAG('t','u','y',' '),     HB_TAG('K','A','L',' ')},       /* Tugen -> Kalenjin */
@@ -1514,6 +1560,7 @@ static const LangTag ot_languages3[] = {
   {HB_TAG('t','z','o',' '),     HB_TAG('T','Z','O',' ')},       /* Tzotzil */
   {HB_TAG('t','z','o',' '),     HB_TAG('M','Y','N',' ')},       /* Tzotzil -> Mayan */
   {HB_TAG('u','b','l',' '),     HB_TAG('B','I','K',' ')},       /* Buhi'non Bikol -> Bikol */
+/*{HB_TAG('u','d','i',' '),     HB_TAG('U','D','I',' ')},*/     /* Udi */
 /*{HB_TAG('u','d','m',' '),     HB_TAG('U','D','M',' ')},*/     /* Udmurt */
   {HB_TAG('u','k','i',' '),     HB_TAG('K','U','I',' ')},       /* Kui (India) */
   {HB_TAG('u','l','n',' '),     HB_TAG('C','P','P',' ')},       /* Unserdeutsch -> Creoles */
@@ -1532,13 +1579,17 @@ static const LangTag ot_languages3[] = {
   {HB_TAG('v','k','t',' '),     HB_TAG('M','L','Y',' ')},       /* Tenggarong Kutai Malay -> Malay */
   {HB_TAG('v','l','s',' '),     HB_TAG('F','L','E',' ')},       /* Vlaams -> Dutch (Flemish) */
   {HB_TAG('v','m','w',' '),     HB_TAG('M','A','K',' ')},       /* Makhuwa */
-/*{HB_TAG('v','r','o',' '),     HB_TAG('V','R','O',' ')},*/     /* Võro */
+  {HB_TAG('v','r','o',' '),     HB_TAG('V','R','O',' ')},       /* Võro */
+  {HB_TAG('v','r','o',' '),     HB_TAG('E','T','I',' ')},       /* Võro -> Estonian */
+  {HB_TAG('v','s','n',' '),     HB_TAG('S','A','N',' ')},       /* Vedic Sanskrit -> Sanskrit */
   {HB_TAG('w','a','g',' '),     HB_TAG_NONE            },       /* Wa'ema != Wagdi */
 /*{HB_TAG('w','a','r',' '),     HB_TAG('W','A','R',' ')},*/     /* Waray (Philippines) -> Waray-Waray */
+/*{HB_TAG('w','b','l',' '),     HB_TAG('W','B','L',' ')},*/     /* Wakhi */
   {HB_TAG('w','b','m',' '),     HB_TAG('W','A',' ',' ')},       /* Wa */
   {HB_TAG('w','b','r',' '),     HB_TAG('W','A','G',' ')},       /* Wagdi */
   {HB_TAG('w','b','r',' '),     HB_TAG('R','A','J',' ')},       /* Wagdi -> Rajasthani */
 /*{HB_TAG('w','c','i',' '),     HB_TAG('W','C','I',' ')},*/     /* Waci Gbe */
+/*{HB_TAG('w','d','t',' '),     HB_TAG('W','D','T',' ')},*/     /* Wendat */
   {HB_TAG('w','e','a',' '),     HB_TAG('K','R','N',' ')},       /* Wewaw -> Karen */
   {HB_TAG('w','e','s',' '),     HB_TAG('C','P','P',' ')},       /* Cameroon Pidgin -> Creoles */
   {HB_TAG('w','e','u',' '),     HB_TAG('Q','I','N',' ')},       /* Rawngtu Chin -> Chin */
@@ -1550,6 +1601,9 @@ static const LangTag ot_languages3[] = {
   {HB_TAG('w','s','g',' '),     HB_TAG('G','O','N',' ')},       /* Adilabad Gondi -> Gondi */
 /*{HB_TAG('w','t','m',' '),     HB_TAG('W','T','M',' ')},*/     /* Mewati */
   {HB_TAG('w','u','u',' '),     HB_TAG('Z','H','S',' ')},       /* Wu Chinese -> Chinese, Simplified */
+  {HB_TAG('w','y','a',' '),     HB_TAG('W','D','T',' ')},       /* Wyandot (retired code) -> Wendat */
+  {HB_TAG('w','y','a',' '),     HB_TAG('W','Y','N',' ')},       /* Wyandot (retired code) */
+/*{HB_TAG('w','y','n',' '),     HB_TAG('W','Y','N',' ')},*/     /* Wyandot */
   {HB_TAG('x','a','l',' '),     HB_TAG('K','L','M',' ')},       /* Kalmyk */
   {HB_TAG('x','a','l',' '),     HB_TAG('T','O','D',' ')},       /* Kalmyk -> Todo */
   {HB_TAG('x','a','n',' '),     HB_TAG('S','E','K',' ')},       /* Xamtanga -> Sekota */
@@ -1582,7 +1636,7 @@ static const LangTag ot_languages3[] = {
   {HB_TAG('y','b','a',' '),     HB_TAG_NONE            },       /* Yala != Yoruba */
   {HB_TAG('y','b','b',' '),     HB_TAG('B','M','L',' ')},       /* Yemba -> Bamileke */
   {HB_TAG('y','b','d',' '),     HB_TAG('A','R','K',' ')},       /* Yangbye (retired code) -> Rakhine */
-  {HB_TAG('y','c','r',' '),     HB_TAG_NONE            },       /* Yilan Creole != Y-Cree */
+  {HB_TAG('y','c','r',' '),     HB_TAG('C','P','P',' ')},       /* Yilan Creole -> Creoles */
   {HB_TAG('y','d','d',' '),     HB_TAG('J','I','I',' ')},       /* Eastern Yiddish -> Yiddish */
 /*{HB_TAG('y','g','p',' '),     HB_TAG('Y','G','P',' ')},*/     /* Gepo */
   {HB_TAG('y','i','h',' '),     HB_TAG('J','I','I',' ')},       /* Western Yiddish -> Yiddish */
@@ -1591,6 +1645,7 @@ static const LangTag ot_languages3[] = {
   {HB_TAG('y','o','s',' '),     HB_TAG('Q','I','N',' ')},       /* Yos (retired code) -> Chin */
   {HB_TAG('y','u','a',' '),     HB_TAG('M','Y','N',' ')},       /* Yucateco -> Mayan */
   {HB_TAG('y','u','e',' '),     HB_TAG('Z','H','H',' ')},       /* Yue Chinese -> Chinese, Traditional, Hong Kong SAR */
+/*{HB_TAG('y','u','f',' '),     HB_TAG('Y','U','F',' ')},*/     /* Havasupai-Walapai-Yavapai */
 /*{HB_TAG('y','w','q',' '),     HB_TAG('Y','W','Q',' ')},*/     /* Wuding-Luquan Yi */
   {HB_TAG('z','c','h',' '),     HB_TAG('Z','H','A',' ')},       /* Central Hongshuihe Zhuang -> Zhuang */
   {HB_TAG('z','d','j',' '),     HB_TAG('C','M','R',' ')},       /* Ngazidja Comorian -> Comorian */
@@ -2335,6 +2390,26 @@ out:
       *count = i;
       return true;
     }
+    if (lang_matches (&lang_str[1], limit, "nm-hant-hk", 10))
+    {
+      /* Hainanese; Han (Traditional variant); Hong Kong */
+      tags[0] = HB_TAG('Z','H','H',' ');  /* Chinese, Traditional, Hong Kong SAR */
+      *count = 1;
+      return true;
+    }
+    if (lang_matches (&lang_str[1], limit, "nm-hant-mo", 10))
+    {
+      /* Hainanese; Han (Traditional variant); Macao */
+      unsigned int i;
+      hb_tag_t possible_tags[] = {
+        HB_TAG('Z','H','T','M'),  /* Chinese, Traditional, Macao SAR */
+        HB_TAG('Z','H','H',' '),  /* Chinese, Traditional, Hong Kong SAR */
+      };
+      for (i = 0; i < 2 && i < *count; i++)
+        tags[i] = possible_tags[i];
+      *count = i;
+      return true;
+    }
     if (lang_matches (&lang_str[1], limit, "sn-hant-hk", 10))
     {
       /* Xiang Chinese; Han (Traditional variant); Hong Kong */
@@ -2369,6 +2444,20 @@ out:
       *count = 1;
       return true;
     }
+    if (lang_matches (&lang_str[1], limit, "nm-hans", 7))
+    {
+      /* Hainanese; Han (Simplified variant) */
+      tags[0] = HB_TAG('Z','H','S',' ');  /* Chinese, Simplified */
+      *count = 1;
+      return true;
+    }
+    if (lang_matches (&lang_str[1], limit, "nm-hant", 7))
+    {
+      /* Hainanese; Han (Traditional variant) */
+      tags[0] = HB_TAG('Z','H','T',' ');  /* Chinese, Traditional */
+      *count = 1;
+      return true;
+    }
     if (lang_matches (&lang_str[1], limit, "sn-hans", 7))
     {
       /* Xiang Chinese; Han (Simplified variant) */
@@ -2413,6 +2502,36 @@ out:
       *count = 1;
       return true;
     }
+    if (0 == strncmp (&lang_str[1], "nm-", 3)
+        && subtag_matches (lang_str, limit, "-hk", 3))
+    {
+      /* Hainanese; Hong Kong */
+      tags[0] = HB_TAG('Z','H','H',' ');  /* Chinese, Traditional, Hong Kong SAR */
+      *count = 1;
+      return true;
+    }
+    if (0 == strncmp (&lang_str[1], "nm-", 3)
+        && subtag_matches (lang_str, limit, "-mo", 3))
+    {
+      /* Hainanese; Macao */
+      unsigned int i;
+      hb_tag_t possible_tags[] = {
+        HB_TAG('Z','H','T','M'),  /* Chinese, Traditional, Macao SAR */
+        HB_TAG('Z','H','H',' '),  /* Chinese, Traditional, Hong Kong SAR */
+      };
+      for (i = 0; i < 2 && i < *count; i++)
+        tags[i] = possible_tags[i];
+      *count = i;
+      return true;
+    }
+    if (0 == strncmp (&lang_str[1], "nm-", 3)
+        && subtag_matches (lang_str, limit, "-tw", 3))
+    {
+      /* Hainanese; Taiwan, Province of China */
+      tags[0] = HB_TAG('Z','H','T',' ');  /* Chinese, Traditional */
+      *count = 1;
+      return true;
+    }
     if (0 == strncmp (&lang_str[1], "sn-", 3)
         && subtag_matches (lang_str, limit, "-hk", 3))
     {
@@ -2474,6 +2593,40 @@ out:
     }
     break;
   case 'l':
+    if (lang_matches (&lang_str[1], limit, "uh-hant-hk", 10))
+    {
+      /* Leizhou Chinese; Han (Traditional variant); Hong Kong */
+      tags[0] = HB_TAG('Z','H','H',' ');  /* Chinese, Traditional, Hong Kong SAR */
+      *count = 1;
+      return true;
+    }
+    if (lang_matches (&lang_str[1], limit, "uh-hant-mo", 10))
+    {
+      /* Leizhou Chinese; Han (Traditional variant); Macao */
+      unsigned int i;
+      hb_tag_t possible_tags[] = {
+        HB_TAG('Z','H','T','M'),  /* Chinese, Traditional, Macao SAR */
+        HB_TAG('Z','H','H',' '),  /* Chinese, Traditional, Hong Kong SAR */
+      };
+      for (i = 0; i < 2 && i < *count; i++)
+        tags[i] = possible_tags[i];
+      *count = i;
+      return true;
+    }
+    if (lang_matches (&lang_str[1], limit, "uh-hans", 7))
+    {
+      /* Leizhou Chinese; Han (Simplified variant) */
+      tags[0] = HB_TAG('Z','H','S',' ');  /* Chinese, Simplified */
+      *count = 1;
+      return true;
+    }
+    if (lang_matches (&lang_str[1], limit, "uh-hant", 7))
+    {
+      /* Leizhou Chinese; Han (Traditional variant) */
+      tags[0] = HB_TAG('Z','H','T',' ');  /* Chinese, Traditional */
+      *count = 1;
+      return true;
+    }
     if (lang_matches (&lang_str[1], limit, "zh-hans", 7))
     {
       /* Literary Chinese; Han (Simplified variant) */
@@ -2481,6 +2634,36 @@ out:
       *count = 1;
       return true;
     }
+    if (0 == strncmp (&lang_str[1], "uh-", 3)
+        && subtag_matches (lang_str, limit, "-hk", 3))
+    {
+      /* Leizhou Chinese; Hong Kong */
+      tags[0] = HB_TAG('Z','H','H',' ');  /* Chinese, Traditional, Hong Kong SAR */
+      *count = 1;
+      return true;
+    }
+    if (0 == strncmp (&lang_str[1], "uh-", 3)
+        && subtag_matches (lang_str, limit, "-mo", 3))
+    {
+      /* Leizhou Chinese; Macao */
+      unsigned int i;
+      hb_tag_t possible_tags[] = {
+        HB_TAG('Z','H','T','M'),  /* Chinese, Traditional, Macao SAR */
+        HB_TAG('Z','H','H',' '),  /* Chinese, Traditional, Hong Kong SAR */
+      };
+      for (i = 0; i < 2 && i < *count; i++)
+        tags[i] = possible_tags[i];
+      *count = i;
+      return true;
+    }
+    if (0 == strncmp (&lang_str[1], "uh-", 3)
+        && subtag_matches (lang_str, limit, "-tw", 3))
+    {
+      /* Leizhou Chinese; Taiwan, Province of China */
+      tags[0] = HB_TAG('Z','H','T',' ');  /* Chinese, Traditional */
+      *count = 1;
+      return true;
+    }
     break;
   case 'm':
     if (lang_matches (&lang_str[1], limit, "np-hant-hk", 10))
@@ -2652,6 +2835,72 @@ out:
       return true;
     }
     break;
+  case 's':
+    if (lang_matches (&lang_str[1], limit, "jc-hant-hk", 10))
+    {
+      /* Shaojiang Chinese; Han (Traditional variant); Hong Kong */
+      tags[0] = HB_TAG('Z','H','H',' ');  /* Chinese, Traditional, Hong Kong SAR */
+      *count = 1;
+      return true;
+    }
+    if (lang_matches (&lang_str[1], limit, "jc-hant-mo", 10))
+    {
+      /* Shaojiang Chinese; Han (Traditional variant); Macao */
+      unsigned int i;
+      hb_tag_t possible_tags[] = {
+        HB_TAG('Z','H','T','M'),  /* Chinese, Traditional, Macao SAR */
+        HB_TAG('Z','H','H',' '),  /* Chinese, Traditional, Hong Kong SAR */
+      };
+      for (i = 0; i < 2 && i < *count; i++)
+        tags[i] = possible_tags[i];
+      *count = i;
+      return true;
+    }
+    if (lang_matches (&lang_str[1], limit, "jc-hans", 7))
+    {
+      /* Shaojiang Chinese; Han (Simplified variant) */
+      tags[0] = HB_TAG('Z','H','S',' ');  /* Chinese, Simplified */
+      *count = 1;
+      return true;
+    }
+    if (lang_matches (&lang_str[1], limit, "jc-hant", 7))
+    {
+      /* Shaojiang Chinese; Han (Traditional variant) */
+      tags[0] = HB_TAG('Z','H','T',' ');  /* Chinese, Traditional */
+      *count = 1;
+      return true;
+    }
+    if (0 == strncmp (&lang_str[1], "jc-", 3)
+        && subtag_matches (lang_str, limit, "-hk", 3))
+    {
+      /* Shaojiang Chinese; Hong Kong */
+      tags[0] = HB_TAG('Z','H','H',' ');  /* Chinese, Traditional, Hong Kong SAR */
+      *count = 1;
+      return true;
+    }
+    if (0 == strncmp (&lang_str[1], "jc-", 3)
+        && subtag_matches (lang_str, limit, "-mo", 3))
+    {
+      /* Shaojiang Chinese; Macao */
+      unsigned int i;
+      hb_tag_t possible_tags[] = {
+        HB_TAG('Z','H','T','M'),  /* Chinese, Traditional, Macao SAR */
+        HB_TAG('Z','H','H',' '),  /* Chinese, Traditional, Hong Kong SAR */
+      };
+      for (i = 0; i < 2 && i < *count; i++)
+        tags[i] = possible_tags[i];
+      *count = i;
+      return true;
+    }
+    if (0 == strncmp (&lang_str[1], "jc-", 3)
+        && subtag_matches (lang_str, limit, "-tw", 3))
+    {
+      /* Shaojiang Chinese; Taiwan, Province of China */
+      tags[0] = HB_TAG('Z','H','T',' ');  /* Chinese, Traditional */
+      *count = 1;
+      return true;
+    }
+    break;
   case 'w':
     if (lang_matches (&lang_str[1], limit, "uu-hant-hk", 10))
     {
@@ -2816,9 +3065,10 @@ out:
  * @tag: A language tag.
  *
  * Converts @tag to a BCP 47 language tag if it is ambiguous (it corresponds to
- * many language tags) and the best tag is not the alphabetically first, or if
- * the best tag consists of multiple subtags, or if the best tag does not appear
- * in #ot_languages.
+ * many language tags) and the best tag is not the first (sorted alphabetically,
+ * with two-letter tags having priority over all three-letter tags), or if the
+ * best tag consists of multiple subtags, or if the best tag does not appear in
+ * #ot_languages2 or #ot_languages3.
  *
  * Return value: The #hb_language_t corresponding to the BCP 47 language tag,
  * or #HB_LANGUAGE_INVALID if @tag is not ambiguous.
@@ -2832,8 +3082,6 @@ hb_ot_ambiguous_tag_to_language (hb_tag_t tag)
     return hb_language_from_string ("alt", -1);  /* Southern Altai */
   case HB_TAG('A','P','P','H'):  /* Phonetic transcription—Americanist conventions */
     return hb_language_from_string ("und-fonnapa", -1);  /* Undetermined; North American Phonetic Alphabet */
-  case HB_TAG('A','R','A',' '):  /* Arabic */
-    return hb_language_from_string ("ar", -1);  /* Arabic [macrolanguage] */
   case HB_TAG('A','R','K',' '):  /* Rakhine */
     return hb_language_from_string ("rki", -1);  /* Rakhine */
   case HB_TAG('A','T','H',' '):  /* Athapaskan */
@@ -2854,12 +3102,6 @@ hb_ot_ambiguous_tag_to_language (hb_tag_t tag)
     return hb_language_from_string ("din", -1);  /* Dinka [macrolanguage] */
   case HB_TAG('D','R','I',' '):  /* Dari */
     return hb_language_from_string ("prs", -1);  /* Dari */
-  case HB_TAG('D','Z','N',' '):  /* Dzongkha */
-    return hb_language_from_string ("dz", -1);  /* Dzongkha */
-  case HB_TAG('E','T','I',' '):  /* Estonian */
-    return hb_language_from_string ("et", -1);  /* Estonian [macrolanguage] */
-  case HB_TAG('F','A','R',' '):  /* Persian */
-    return hb_language_from_string ("fa", -1);  /* Persian [macrolanguage] */
   case HB_TAG('G','O','N',' '):  /* Gondi */
     return hb_language_from_string ("gon", -1);  /* Gondi [macrolanguage] */
   case HB_TAG('H','M','A',' '):  /* High Mari */
@@ -2874,50 +3116,34 @@ hb_ot_ambiguous_tag_to_language (hb_tag_t tag)
     return hb_language_from_string ("iba", -1);  /* Iban */
   case HB_TAG('I','J','O',' '):  /* Ijo */
     return hb_language_from_string ("ijo", -1);  /* Ijo [collection] */
-  case HB_TAG('I','N','U',' '):  /* Inuktitut */
-    return hb_language_from_string ("iu", -1);  /* Inuktitut [macrolanguage] */
-  case HB_TAG('I','P','K',' '):  /* Inupiat */
-    return hb_language_from_string ("ik", -1);  /* Inupiaq [macrolanguage] */
   case HB_TAG('I','P','P','H'):  /* Phonetic transcription—IPA conventions */
     return hb_language_from_string ("und-fonipa", -1);  /* Undetermined; International Phonetic Alphabet */
   case HB_TAG('I','R','T',' '):  /* Irish Traditional */
-    return hb_language_from_string ("ga-Latg", -1);  /* Irish; Latin (Gaelic variant) */
+    return hb_language_from_string ("ghc", -1);  /* Hiberno-Scottish Gaelic */
   case HB_TAG('J','I','I',' '):  /* Yiddish */
     return hb_language_from_string ("yi", -1);  /* Yiddish [macrolanguage] */
   case HB_TAG('K','A','L',' '):  /* Kalenjin */
     return hb_language_from_string ("kln", -1);  /* Kalenjin [macrolanguage] */
   case HB_TAG('K','G','E',' '):  /* Khutsuri Georgian */
     return hb_language_from_string ("und-Geok", -1);  /* Undetermined; Khutsuri (Asomtavruli and Nuskhuri) */
-  case HB_TAG('K','N','R',' '):  /* Kanuri */
-    return hb_language_from_string ("kr", -1);  /* Kanuri [macrolanguage] */
   case HB_TAG('K','O','H',' '):  /* Korean Old Hangul */
     return hb_language_from_string ("okm", -1);  /* Middle Korean (10th-16th cent.) */
   case HB_TAG('K','O','K',' '):  /* Konkani */
     return hb_language_from_string ("kok", -1);  /* Konkani [macrolanguage] */
-  case HB_TAG('K','O','M',' '):  /* Komi */
-    return hb_language_from_string ("kv", -1);  /* Komi [macrolanguage] */
   case HB_TAG('K','P','L',' '):  /* Kpelle */
     return hb_language_from_string ("kpe", -1);  /* Kpelle [macrolanguage] */
   case HB_TAG('K','R','N',' '):  /* Karen */
     return hb_language_from_string ("kar", -1);  /* Karen [collection] */
   case HB_TAG('K','U','I',' '):  /* Kui */
     return hb_language_from_string ("uki", -1);  /* Kui (India) */
-  case HB_TAG('K','U','R',' '):  /* Kurdish */
-    return hb_language_from_string ("ku", -1);  /* Kurdish [macrolanguage] */
   case HB_TAG('L','M','A',' '):  /* Low Mari */
     return hb_language_from_string ("mhr", -1);  /* Eastern Mari */
   case HB_TAG('L','U','H',' '):  /* Luyia */
     return hb_language_from_string ("luy", -1);  /* Luyia [macrolanguage] */
-  case HB_TAG('L','V','I',' '):  /* Latvian */
-    return hb_language_from_string ("lv", -1);  /* Latvian [macrolanguage] */
   case HB_TAG('M','A','W',' '):  /* Marwari */
     return hb_language_from_string ("mwr", -1);  /* Marwari [macrolanguage] */
-  case HB_TAG('M','L','G',' '):  /* Malagasy */
-    return hb_language_from_string ("mg", -1);  /* Malagasy [macrolanguage] */
   case HB_TAG('M','L','Y',' '):  /* Malay */
     return hb_language_from_string ("ms", -1);  /* Malay [macrolanguage] */
-  case HB_TAG('M','N','G',' '):  /* Mongolian */
-    return hb_language_from_string ("mn", -1);  /* Mongolian [macrolanguage] */
   case HB_TAG('M','N','K',' '):  /* Maninka */
     return hb_language_from_string ("man", -1);  /* Mandingo [macrolanguage] */
   case HB_TAG('M','O','L',' '):  /* Moldavian */
@@ -2928,26 +3154,16 @@ hb_ot_ambiguous_tag_to_language (hb_tag_t tag)
     return hb_language_from_string ("myn", -1);  /* Mayan [collection] */
   case HB_TAG('N','A','H',' '):  /* Nahuatl */
     return hb_language_from_string ("nah", -1);  /* Nahuatl [collection] */
-  case HB_TAG('N','E','P',' '):  /* Nepali */
-    return hb_language_from_string ("ne", -1);  /* Nepali [macrolanguage] */
   case HB_TAG('N','I','S',' '):  /* Nisi */
     return hb_language_from_string ("njz", -1);  /* Nyishi */
   case HB_TAG('N','O','R',' '):  /* Norwegian */
     return hb_language_from_string ("no", -1);  /* Norwegian [macrolanguage] */
-  case HB_TAG('O','J','B',' '):  /* Ojibway */
-    return hb_language_from_string ("oj", -1);  /* Ojibwa [macrolanguage] */
-  case HB_TAG('O','R','O',' '):  /* Oromo */
-    return hb_language_from_string ("om", -1);  /* Oromo [macrolanguage] */
-  case HB_TAG('P','A','S',' '):  /* Pashto */
-    return hb_language_from_string ("ps", -1);  /* Pashto [macrolanguage] */
   case HB_TAG('P','G','R',' '):  /* Polytonic Greek */
     return hb_language_from_string ("el-polyton", -1);  /* Modern Greek (1453-); Polytonic Greek */
   case HB_TAG('P','R','O',' '):  /* Provençal / Old Provençal */
     return hb_language_from_string ("pro", -1);  /* Old Provençal (to 1500) */
   case HB_TAG('Q','U','H',' '):  /* Quechua (Bolivia) */
     return hb_language_from_string ("quh", -1);  /* South Bolivian Quechua */
-  case HB_TAG('Q','U','Z',' '):  /* Quechua */
-    return hb_language_from_string ("qu", -1);  /* Quechua [macrolanguage] */
   case HB_TAG('Q','V','I',' '):  /* Quechua (Ecuador) */
     return hb_language_from_string ("qvi", -1);  /* Imbabura Highland Quichua */
   case HB_TAG('Q','W','H',' '):  /* Quechua (Peru) */
@@ -2958,8 +3174,8 @@ hb_ot_ambiguous_tag_to_language (hb_tag_t tag)
     return hb_language_from_string ("ro", -1);  /* Romanian */
   case HB_TAG('R','O','Y',' '):  /* Romany */
     return hb_language_from_string ("rom", -1);  /* Romany [macrolanguage] */
-  case HB_TAG('S','Q','I',' '):  /* Albanian */
-    return hb_language_from_string ("sq", -1);  /* Albanian [macrolanguage] */
+  case HB_TAG('S','G','A',' '):  /* Old Irish */
+    return hb_language_from_string ("sga", -1);  /* Old Irish (to 900) */
   case HB_TAG('S','R','B',' '):  /* Serbian */
     return hb_language_from_string ("sr", -1);  /* Serbian */
   case HB_TAG('S','X','T',' '):  /* Sutu */
@@ -2976,6 +3192,10 @@ hb_ot_ambiguous_tag_to_language (hb_tag_t tag)
     return hb_language_from_string ("tmh", -1);  /* Tamashek [macrolanguage] */
   case HB_TAG('T','O','D',' '):  /* Todo */
     return hb_language_from_string ("xwo", -1);  /* Written Oirat */
+  case HB_TAG('W','D','T',' '):  /* Wendat */
+    return hb_language_from_string ("wdt", -1);  /* Wendat */
+  case HB_TAG('W','Y','N',' '):  /* Wyandot */
+    return hb_language_from_string ("wyn", -1);  /* Wyandot */
   case HB_TAG('Z','H','H',' '):  /* Chinese, Traditional, Hong Kong SAR */
     return hb_language_from_string ("zh-HK", -1);  /* Chinese [macrolanguage]; Hong Kong */
   case HB_TAG('Z','H','S',' '):  /* Chinese, Simplified */
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-ot-tag.cc b/src/java.desktop/share/native/libharfbuzz/hb-ot-tag.cc
index 9f0ae3b4dc1..3cdb703203b 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-ot-tag.cc
+++ b/src/java.desktop/share/native/libharfbuzz/hb-ot-tag.cc
@@ -547,7 +547,7 @@ hb_ot_tag_to_language (hb_tag_t tag)
       buf[3] = '-';
       str += 4;
     }
-    snprintf (str, 16, "x-hbot-%08x", tag);
+    snprintf (str, 16, "x-hbot-%08" PRIx32, tag);
     return hb_language_from_string (&*buf, -1);
   }
 }
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-ot-var-avar-table.hh b/src/java.desktop/share/native/libharfbuzz/hb-ot-var-avar-table.hh
index 0aaf68adb0b..e26687c34ed 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-ot-var-avar-table.hh
+++ b/src/java.desktop/share/native/libharfbuzz/hb-ot-var-avar-table.hh
@@ -57,7 +57,7 @@ struct avarV2Tail
 
   protected:
   Offset32To<DeltaSetIndexMap>  varIdxMap;      /* Offset from the beginning of 'avar' table. */
-  Offset32To<VariationStore>    varStore;       /* Offset from the beginning of 'avar' table. */
+  Offset32To<ItemVariationStore>        varStore;       /* Offset from the beginning of 'avar' table. */
 
   public:
   DEFINE_SIZE_STATIC (8);
@@ -80,7 +80,7 @@ struct AxisValueMap
 
   bool is_outside_axis_range (const Triple& axis_range) const
   {
-    float from_coord = coords[0].to_float ();
+    double from_coord = (double) coords[0].to_float ();
     return !axis_range.contains (from_coord);
   }
 
@@ -100,8 +100,8 @@ struct AxisValueMap
     float from_coord = coords[0].to_float ();
     float to_coord = coords[1].to_float ();
 
-    from_coord = renormalizeValue (from_coord, unmapped_range, triple_distances);
-    to_coord = renormalizeValue (to_coord, axis_range, triple_distances);
+    from_coord = renormalizeValue ((double) from_coord, unmapped_range, triple_distances);
+    to_coord = renormalizeValue ((double) to_coord, axis_range, triple_distances);
 
     coords[0].set_float (from_coord);
     coords[1].set_float (to_coord);
@@ -197,7 +197,7 @@ struct SegmentMaps : Array16Of<AxisValueMap>
     unmapped_val.set_int (unmap (val.to_int ()));
     float unmapped_max = unmapped_val.to_float ();
 
-    return Triple{unmapped_min, unmapped_middle, unmapped_max};
+    return Triple{(double) unmapped_min, (double) unmapped_middle, (double) unmapped_max};
   }
 
   bool subset (hb_subset_context_t *c, hb_tag_t axis_tag) const
@@ -230,7 +230,7 @@ struct SegmentMaps : Array16Of<AxisValueMap>
        * duplicates here */
       if (mapping.must_include ())
         continue;
-      value_mappings.push (std::move (mapping));
+      value_mappings.push (mapping);
     }
 
     AxisValueMap m;
@@ -273,6 +273,7 @@ struct avar
   {
     TRACE_SANITIZE (this);
     if (!(version.sanitize (c) &&
+          hb_barrier () &&
           (version.major == 1
 #ifndef HB_NO_AVAR2
            || version.major == 2
@@ -293,6 +294,7 @@ struct avar
 #ifndef HB_NO_AVAR2
     if (version.major < 2)
       return_trace (true);
+    hb_barrier ();
 
     const auto &v2 = * (const avarV2Tail *) map;
     if (unlikely (!v2.sanitize (c, this)))
@@ -316,6 +318,7 @@ struct avar
 #ifndef HB_NO_AVAR2
     if (version.major < 2)
       return;
+    hb_barrier ();
 
     for (; count < axisCount; count++)
       map = &StructAfter<SegmentMaps> (*map);
@@ -340,7 +343,7 @@ struct avar
     for (unsigned i = 0; i < coords_length; i++)
       coords[i] = out[i];
 
-    OT::VariationStore::destroy_cache (var_store_cache);
+    OT::ItemVariationStore::destroy_cache (var_store_cache);
 #endif
   }
 
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-ot-var-common.hh b/src/java.desktop/share/native/libharfbuzz/hb-ot-var-common.hh
index 271250f91c3..72deddef213 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-ot-var-common.hh
+++ b/src/java.desktop/share/native/libharfbuzz/hb-ot-var-common.hh
@@ -28,215 +28,11 @@
 
 #include "hb-ot-layout-common.hh"
 #include "hb-priority-queue.hh"
+#include "hb-subset-instancer-iup.hh"
 
 
 namespace OT {
 
-template <typename MapCountT>
-struct DeltaSetIndexMapFormat01
-{
-  friend struct DeltaSetIndexMap;
-
-  unsigned get_size () const
-  { return min_size + mapCount * get_width (); }
-
-  private:
-  DeltaSetIndexMapFormat01* copy (hb_serialize_context_t *c) const
-  {
-    TRACE_SERIALIZE (this);
-    return_trace (c->embed (this));
-  }
-
-  template <typename T>
-  bool serialize (hb_serialize_context_t *c, const T &plan)
-  {
-    unsigned int width = plan.get_width ();
-    unsigned int inner_bit_count = plan.get_inner_bit_count ();
-    const hb_array_t<const uint32_t> output_map = plan.get_output_map ();
-
-    TRACE_SERIALIZE (this);
-    if (unlikely (output_map.length && ((((inner_bit_count-1)&~0xF)!=0) || (((width-1)&~0x3)!=0))))
-      return_trace (false);
-    if (unlikely (!c->extend_min (this))) return_trace (false);
-
-    entryFormat = ((width-1)<<4)|(inner_bit_count-1);
-    mapCount = output_map.length;
-    HBUINT8 *p = c->allocate_size<HBUINT8> (width * output_map.length);
-    if (unlikely (!p)) return_trace (false);
-    for (unsigned int i = 0; i < output_map.length; i++)
-    {
-      unsigned int v = output_map.arrayZ[i];
-      if (v)
-      {
-        unsigned int outer = v >> 16;
-        unsigned int inner = v & 0xFFFF;
-        unsigned int u = (outer << inner_bit_count) | inner;
-        for (unsigned int w = width; w > 0;)
-        {
-          p[--w] = u;
-          u >>= 8;
-        }
-      }
-      p += width;
-    }
-    return_trace (true);
-  }
-
-  uint32_t map (unsigned int v) const /* Returns 16.16 outer.inner. */
-  {
-    /* If count is zero, pass value unchanged.  This takes
-     * care of direct mapping for advance map. */
-    if (!mapCount)
-      return v;
-
-    if (v >= mapCount)
-      v = mapCount - 1;
-
-    unsigned int u = 0;
-    { /* Fetch it. */
-      unsigned int w = get_width ();
-      const HBUINT8 *p = mapDataZ.arrayZ + w * v;
-      for (; w; w--)
-        u = (u << 8) + *p++;
-    }
-
-    { /* Repack it. */
-      unsigned int n = get_inner_bit_count ();
-      unsigned int outer = u >> n;
-      unsigned int inner = u & ((1 << n) - 1);
-      u = (outer<<16) | inner;
-    }
-
-    return u;
-  }
-
-  unsigned get_map_count () const       { return mapCount; }
-  unsigned get_width () const           { return ((entryFormat >> 4) & 3) + 1; }
-  unsigned get_inner_bit_count () const { return (entryFormat & 0xF) + 1; }
-
-
-  bool sanitize (hb_sanitize_context_t *c) const
-  {
-    TRACE_SANITIZE (this);
-    return_trace (c->check_struct (this) &&
-                  c->check_range (mapDataZ.arrayZ,
-                                  mapCount,
-                                  get_width ()));
-  }
-
-  protected:
-  HBUINT8       format;         /* Format identifier--format = 0 */
-  HBUINT8       entryFormat;    /* A packed field that describes the compressed
-                                 * representation of delta-set indices. */
-  MapCountT     mapCount;       /* The number of mapping entries. */
-  UnsizedArrayOf<HBUINT8>
-                mapDataZ;       /* The delta-set index mapping data. */
-
-  public:
-  DEFINE_SIZE_ARRAY (2+MapCountT::static_size, mapDataZ);
-};
-
-struct DeltaSetIndexMap
-{
-  template <typename T>
-  bool serialize (hb_serialize_context_t *c, const T &plan)
-  {
-    TRACE_SERIALIZE (this);
-    unsigned length = plan.get_output_map ().length;
-    u.format = length <= 0xFFFF ? 0 : 1;
-    switch (u.format) {
-    case 0: return_trace (u.format0.serialize (c, plan));
-    case 1: return_trace (u.format1.serialize (c, plan));
-    default:return_trace (false);
-    }
-  }
-
-  uint32_t map (unsigned v) const
-  {
-    switch (u.format) {
-    case 0: return (u.format0.map (v));
-    case 1: return (u.format1.map (v));
-    default:return v;
-    }
-  }
-
-  unsigned get_map_count () const
-  {
-    switch (u.format) {
-    case 0: return u.format0.get_map_count ();
-    case 1: return u.format1.get_map_count ();
-    default:return 0;
-    }
-  }
-
-  unsigned get_width () const
-  {
-    switch (u.format) {
-    case 0: return u.format0.get_width ();
-    case 1: return u.format1.get_width ();
-    default:return 0;
-    }
-  }
-
-  unsigned get_inner_bit_count () const
-  {
-    switch (u.format) {
-    case 0: return u.format0.get_inner_bit_count ();
-    case 1: return u.format1.get_inner_bit_count ();
-    default:return 0;
-    }
-  }
-
-  bool sanitize (hb_sanitize_context_t *c) const
-  {
-    TRACE_SANITIZE (this);
-    if (!u.format.sanitize (c)) return_trace (false);
-    switch (u.format) {
-    case 0: return_trace (u.format0.sanitize (c));
-    case 1: return_trace (u.format1.sanitize (c));
-    default:return_trace (true);
-    }
-  }
-
-  DeltaSetIndexMap* copy (hb_serialize_context_t *c) const
-  {
-    TRACE_SERIALIZE (this);
-    switch (u.format) {
-    case 0: return_trace (reinterpret_cast<DeltaSetIndexMap *> (u.format0.copy (c)));
-    case 1: return_trace (reinterpret_cast<DeltaSetIndexMap *> (u.format1.copy (c)));
-    default:return_trace (nullptr);
-    }
-  }
-
-  protected:
-  union {
-  HBUINT8                            format;         /* Format identifier */
-  DeltaSetIndexMapFormat01<HBUINT16> format0;
-  DeltaSetIndexMapFormat01<HBUINT32> format1;
-  } u;
-  public:
-  DEFINE_SIZE_UNION (1, format);
-};
-
-
-struct VarStoreInstancer
-{
-  VarStoreInstancer (const VariationStore *varStore,
-                     const DeltaSetIndexMap *varIdxMap,
-                     hb_array_t<int> coords) :
-    varStore (varStore), varIdxMap (varIdxMap), coords (coords) {}
-
-  operator bool () const { return varStore && bool (coords); }
-
-  /* according to the spec, if colr table has varStore but does not have
-   * varIdxMap, then an implicit identity mapping is used */
-  float operator() (uint32_t varIdx, unsigned short offset = 0) const
-  { return coords ? varStore->get_delta (varIdxMap ? varIdxMap->map (VarIdx::add (varIdx, offset)) : varIdx + offset, coords) : 0; }
-
-  const VariationStore *varStore;
-  const DeltaSetIndexMap *varIdxMap;
-  hb_array_t<int> coords;
-};
 
 /* https://docs.microsoft.com/en-us/typography/opentype/spec/otvarcommonformats#tuplevariationheader */
 struct TupleVariationHeader
@@ -296,15 +92,15 @@ struct TupleVariationHeader
         start = hb_min (peak, 0.f);
         end = hb_max (peak, 0.f);
       }
-      axis_tuples.set (*axis_tag, Triple (start, peak, end));
+      axis_tuples.set (*axis_tag, Triple ((double) start, (double) peak, (double) end));
     }
 
     return true;
   }
 
-  float calculate_scalar (hb_array_t<int> coords, unsigned int coord_count,
-                          const hb_array_t<const F2DOT14> shared_tuples,
-                          const hb_vector_t<hb_pair_t<int,int>> *shared_tuple_active_idx = nullptr) const
+  double calculate_scalar (hb_array_t<const int> coords, unsigned int coord_count,
+                           const hb_array_t<const F2DOT14> shared_tuples,
+                           const hb_vector_t<hb_pair_t<int,int>> *shared_tuple_active_idx = nullptr) const
   {
     const F2DOT14 *peak_tuple;
 
@@ -318,13 +114,13 @@ struct TupleVariationHeader
     {
       unsigned int index = get_index ();
       if (unlikely ((index + 1) * coord_count > shared_tuples.length))
-        return 0.f;
+        return 0.0;
       peak_tuple = shared_tuples.sub_array (coord_count * index, coord_count).arrayZ;
 
       if (shared_tuple_active_idx)
       {
         if (unlikely (index >= shared_tuple_active_idx->length))
-          return 0.f;
+          return 0.0;
         auto _ = (*shared_tuple_active_idx).arrayZ[index];
         if (_.second != -1)
         {
@@ -349,7 +145,7 @@ struct TupleVariationHeader
       end_tuple = get_end_tuple (coord_count).arrayZ;
     }
 
-    float scalar = 1.f;
+    double scalar = 1.0;
     for (unsigned int i = start_idx; i < end_idx; i += step)
     {
       int peak = peak_tuple[i].to_int ();
@@ -364,15 +160,15 @@ struct TupleVariationHeader
         int end = end_tuple[i].to_int ();
         if (unlikely (start > peak || peak > end ||
                       (start < 0 && end > 0 && peak))) continue;
-        if (v < start || v > end) return 0.f;
+        if (v < start || v > end) return 0.0;
         if (v < peak)
-        { if (peak != start) scalar *= (float) (v - start) / (peak - start); }
+        { if (peak != start) scalar *= (double) (v - start) / (peak - start); }
         else
-        { if (peak != end) scalar *= (float) (end - v) / (end - peak); }
+        { if (peak != end) scalar *= (double) (end - v) / (end - peak); }
       }
-      else if (!v || v < hb_min (0, peak) || v > hb_max (0, peak)) return 0.f;
+      else if (!v || v < hb_min (0, peak) || v > hb_max (0, peak)) return 0.0;
       else
-        scalar *= (float) v / peak;
+        scalar *= (double) v / peak;
     }
     return scalar;
   }
@@ -425,15 +221,10 @@ struct TupleVariationHeader
   DEFINE_SIZE_MIN (4);
 };
 
-enum packed_delta_flag_t
-{
-  DELTAS_ARE_ZERO      = 0x80,
-  DELTAS_ARE_WORDS     = 0x40,
-  DELTA_RUN_COUNT_MASK = 0x3F
-};
-
 struct tuple_delta_t
 {
+  static constexpr bool realloc_move = true;  // Watch out when adding new members!
+
   public:
   hb_hashmap_t<hb_tag_t, Triple> axis_tuples;
 
@@ -447,8 +238,8 @@ struct tuple_delta_t
   /* compiled data: header and deltas
    * compiled point data is saved in a hashmap within tuple_variations_t cause
    * some point sets might be reused by different tuple variations */
-  hb_vector_t<char> compiled_tuple_header;
-  hb_vector_t<char> compiled_deltas;
+  hb_vector_t<unsigned char> compiled_tuple_header;
+  hb_vector_t<unsigned char> compiled_deltas;
 
   /* compiled peak coords, empty for non-gvar tuples */
   hb_vector_t<char> compiled_peak_coords;
@@ -456,7 +247,7 @@ struct tuple_delta_t
   tuple_delta_t () = default;
   tuple_delta_t (const tuple_delta_t& o) = default;
 
-  friend void swap (tuple_delta_t& a, tuple_delta_t& b)
+  friend void swap (tuple_delta_t& a, tuple_delta_t& b) noexcept
   {
     hb_swap (a.axis_tuples, b.axis_tuples);
     hb_swap (a.indices, b.indices);
@@ -467,10 +258,10 @@ struct tuple_delta_t
     hb_swap (a.compiled_peak_coords, b.compiled_peak_coords);
   }
 
-  tuple_delta_t (tuple_delta_t&& o) : tuple_delta_t ()
+  tuple_delta_t (tuple_delta_t&& o)  noexcept : tuple_delta_t ()
   { hb_swap (*this, o); }
 
-  tuple_delta_t& operator = (tuple_delta_t&& o)
+  tuple_delta_t& operator = (tuple_delta_t&& o) noexcept
   {
     hb_swap (*this, o);
     return *this;
@@ -514,14 +305,19 @@ struct tuple_delta_t
       return *this;
 
     unsigned num = indices.length;
-    for (unsigned i = 0; i < num; i++)
-    {
-      if (!indices.arrayZ[i]) continue;
-
-      deltas_x[i] *= scalar;
-      if (deltas_y)
+    if (deltas_y)
+      for (unsigned i = 0; i < num; i++)
+      {
+        if (!indices.arrayZ[i]) continue;
+        deltas_x[i] *= scalar;
         deltas_y[i] *= scalar;
-    }
+      }
+    else
+      for (unsigned i = 0; i < num; i++)
+      {
+        if (!indices.arrayZ[i]) continue;
+        deltas_x[i] *= scalar;
+      }
     return *this;
   }
 
@@ -536,18 +332,18 @@ struct tuple_delta_t
       return out;
     }
 
-    if ((tent->minimum < 0.f && tent->maximum > 0.f) ||
+    if ((tent->minimum < 0.0 && tent->maximum > 0.0) ||
         !(tent->minimum <= tent->middle && tent->middle <= tent->maximum))
       return out;
 
-    if (tent->middle == 0.f)
+    if (tent->middle == 0.0)
     {
       out.push (*this);
       return out;
     }
 
-    result_t solutions = rebase_tent (*tent, axis_limit, axis_triple_distances);
-    for (auto t : solutions)
+    rebase_tent_result_t solutions = rebase_tent (*tent, axis_limit, axis_triple_distances);
+    for (auto &t : solutions)
     {
       tuple_delta_t new_var = *this;
       if (t.second == Triple ())
@@ -600,7 +396,9 @@ struct tuple_delta_t
                                  const hb_map_t& axes_old_index_tag_map,
                                  const hb_hashmap_t<const hb_vector_t<char>*, unsigned>* shared_tuples_idx_map)
   {
-    if (!compiled_deltas) return false;
+    /* compiled_deltas could be empty after iup delta optimization, we can skip
+     * compiling this tuple and return true */
+    if (!compiled_deltas) return true;
 
     unsigned cur_axis_count = axes_index_map.get_population ();
     /* allocate enough memory: 1 peak + 2 intermediate coords + fixed header size */
@@ -714,37 +512,42 @@ struct tuple_delta_t
   }
 
   bool compile_deltas ()
+  { return compile_deltas (indices, deltas_x, deltas_y, compiled_deltas); }
+
+  static bool compile_deltas (hb_array_t<const bool> point_indices,
+                              hb_array_t<const float> x_deltas,
+                              hb_array_t<const float> y_deltas,
+                              hb_vector_t<unsigned char> &compiled_deltas /* OUT */)
   {
     hb_vector_t<int> rounded_deltas;
-    if (unlikely (!rounded_deltas.alloc (indices.length)))
+    if (unlikely (!rounded_deltas.alloc (point_indices.length)))
       return false;
 
-    for (unsigned i = 0; i < indices.length; i++)
+    for (unsigned i = 0; i < point_indices.length; i++)
     {
-      if (!indices[i]) continue;
-      int rounded_delta = (int) roundf (deltas_x[i]);
+      if (!point_indices[i]) continue;
+      int rounded_delta = (int) roundf (x_deltas.arrayZ[i]);
       rounded_deltas.push (rounded_delta);
     }
 
-    if (!rounded_deltas) return false;
-    /* allocate enough memories 3 * num_deltas */
-    unsigned alloc_len = 3 * rounded_deltas.length;
-    if (deltas_y)
+    if (!rounded_deltas) return true;
+    /* allocate enough memories 5 * num_deltas */
+    unsigned alloc_len = 5 * rounded_deltas.length;
+    if (y_deltas)
       alloc_len *= 2;
 
     if (unlikely (!compiled_deltas.resize (alloc_len))) return false;
 
-    unsigned i = 0;
-    unsigned encoded_len = encode_delta_run (i, compiled_deltas.as_array (), rounded_deltas);
+    unsigned encoded_len = compile_deltas (compiled_deltas, rounded_deltas);
 
-    if (deltas_y)
+    if (y_deltas)
     {
-      /* reuse the rounded_deltas vector, check that deltas_y have the same num of deltas as deltas_x */
+      /* reuse the rounded_deltas vector, check that y_deltas have the same num of deltas as x_deltas */
       unsigned j = 0;
-      for (unsigned idx = 0; idx < indices.length; idx++)
+      for (unsigned idx = 0; idx < point_indices.length; idx++)
       {
-        if (!indices[idx]) continue;
-        int rounded_delta = (int) roundf (deltas_y[idx]);
+        if (!point_indices[idx]) continue;
+        int rounded_delta = (int) roundf (y_deltas.arrayZ[idx]);
 
         if (j >= rounded_deltas.length) return false;
 
@@ -752,174 +555,15 @@ struct tuple_delta_t
       }
 
       if (j != rounded_deltas.length) return false;
-      /* reset i because we reuse rounded_deltas for deltas_y */
-      i = 0;
-      encoded_len += encode_delta_run (i, compiled_deltas.as_array ().sub_array (encoded_len), rounded_deltas);
+      encoded_len += compile_deltas (compiled_deltas.as_array ().sub_array (encoded_len), rounded_deltas);
     }
     return compiled_deltas.resize (encoded_len);
   }
 
-  unsigned encode_delta_run (unsigned& i,
-                             hb_array_t<char> encoded_bytes,
-                             const hb_vector_t<int>& deltas) const
+  static unsigned compile_deltas (hb_array_t<unsigned char> encoded_bytes,
+                                  hb_array_t<const int> deltas)
   {
-    unsigned num_deltas = deltas.length;
-    unsigned encoded_len = 0;
-    while (i < num_deltas)
-    {
-      int val = deltas[i];
-      if (val == 0)
-        encoded_len += encode_delta_run_as_zeroes (i, encoded_bytes.sub_array (encoded_len), deltas);
-      else if (val >= -128 && val <= 127)
-        encoded_len += encode_delta_run_as_bytes (i, encoded_bytes.sub_array (encoded_len), deltas);
-      else
-        encoded_len += encode_delta_run_as_words (i, encoded_bytes.sub_array (encoded_len), deltas);
-    }
-    return encoded_len;
-  }
-
-  unsigned encode_delta_run_as_zeroes (unsigned& i,
-                                       hb_array_t<char> encoded_bytes,
-                                       const hb_vector_t<int>& deltas) const
-  {
-    unsigned num_deltas = deltas.length;
-    unsigned run_length = 0;
-    auto it = encoded_bytes.iter ();
-    unsigned encoded_len = 0;
-    while (i < num_deltas && deltas[i] == 0)
-    {
-      i++;
-      run_length++;
-    }
-
-    while (run_length >= 64)
-    {
-      *it++ = char (DELTAS_ARE_ZERO | 63);
-      run_length -= 64;
-      encoded_len++;
-    }
-
-    if (run_length)
-    {
-      *it++ = char (DELTAS_ARE_ZERO | (run_length - 1));
-      encoded_len++;
-    }
-    return encoded_len;
-  }
-
-  unsigned encode_delta_run_as_bytes (unsigned &i,
-                                      hb_array_t<char> encoded_bytes,
-                                      const hb_vector_t<int>& deltas) const
-  {
-    unsigned start = i;
-    unsigned num_deltas = deltas.length;
-    while (i < num_deltas)
-    {
-      int val = deltas[i];
-      if (val > 127 || val < -128)
-        break;
-
-      /* from fonttools: if there're 2 or more zeros in a sequence,
-       * it is better to start a new run to save bytes. */
-      if (val == 0 && i + 1 < num_deltas && deltas[i+1] == 0)
-        break;
-
-      i++;
-    }
-    unsigned run_length = i - start;
-
-    unsigned encoded_len = 0;
-    auto it = encoded_bytes.iter ();
-
-    while (run_length >= 64)
-    {
-      *it++ = 63;
-      encoded_len++;
-
-      for (unsigned j = 0; j < 64; j++)
-      {
-        *it++ = static_cast<char> (deltas[start + j]);
-        encoded_len++;
-      }
-
-      start += 64;
-      run_length -= 64;
-    }
-
-    if (run_length)
-    {
-      *it++ = run_length - 1;
-      encoded_len++;
-
-      while (start < i)
-      {
-        *it++ = static_cast<char> (deltas[start++]);
-        encoded_len++;
-      }
-    }
-
-    return encoded_len;
-  }
-
-  unsigned encode_delta_run_as_words (unsigned &i,
-                                      hb_array_t<char> encoded_bytes,
-                                      const hb_vector_t<int>& deltas) const
-  {
-    unsigned start = i;
-    unsigned num_deltas = deltas.length;
-    while (i < num_deltas)
-    {
-      int val = deltas[i];
-
-      /* start a new run for a single zero value*/
-      if (val == 0) break;
-
-      /* from fonttools: continue word-encoded run if there's only one
-       * single value in the range [-128, 127] because it is more compact.
-       * Only start a new run when there're 2 continuous such values. */
-      if (val >= -128 && val <= 127 &&
-          i + 1 < num_deltas &&
-          deltas[i+1] >= -128 && deltas[i+1] <= 127)
-        break;
-
-      i++;
-    }
-
-    unsigned run_length = i - start;
-    auto it = encoded_bytes.iter ();
-    unsigned encoded_len = 0;
-    while (run_length >= 64)
-    {
-      *it++ = (DELTAS_ARE_WORDS | 63);
-      encoded_len++;
-
-      for (unsigned j = 0; j < 64; j++)
-      {
-        int16_t delta_val = deltas[start + j];
-        *it++ = static_cast<char> (delta_val >> 8);
-        *it++ = static_cast<char> (delta_val & 0xFF);
-
-        encoded_len += 2;
-      }
-
-      start += 64;
-      run_length -= 64;
-    }
-
-    if (run_length)
-    {
-      *it++ = (DELTAS_ARE_WORDS | (run_length - 1));
-      encoded_len++;
-      while (start < i)
-      {
-        int16_t delta_val = deltas[start++];
-        *it++ = static_cast<char> (delta_val >> 8);
-        *it++ = static_cast<char> (delta_val & 0xFF);
-
-        encoded_len += 2;
-      }
-    }
-    return encoded_len;
+    return TupleValues::compile (deltas, encoded_bytes);
   }
 
   bool calc_inferred_deltas (const contour_point_vector_t& orig_points)
@@ -982,10 +626,14 @@ struct tuple_delta_t
         {
           i = next_index (i, start_point, end_point);
           if (i == next) break;
-          deltas_x.arrayZ[i] = infer_delta (orig_points.arrayZ[i].x, orig_points.arrayZ[prev].x, orig_points.arrayZ[next].x,
-                                            deltas_x.arrayZ[prev], deltas_x.arrayZ[next]);
-          deltas_y.arrayZ[i] = infer_delta (orig_points.arrayZ[i].y, orig_points.arrayZ[prev].y, orig_points.arrayZ[next].y,
-                                            deltas_y.arrayZ[prev], deltas_y.arrayZ[next]);
+          deltas_x.arrayZ[i] = infer_delta ((double) orig_points.arrayZ[i].x,
+                                            (double) orig_points.arrayZ[prev].x,
+                                            (double) orig_points.arrayZ[next].x,
+                                            (double) deltas_x.arrayZ[prev], (double) deltas_x.arrayZ[next]);
+          deltas_y.arrayZ[i] = infer_delta ((double) orig_points.arrayZ[i].y,
+                                            (double) orig_points.arrayZ[prev].y,
+                                            (double) orig_points.arrayZ[next].y,
+                                            (double) deltas_y.arrayZ[prev], (double) deltas_y.arrayZ[next]);
           inferred_idxes.add (i);
           if (--unref_count == 0) goto no_more_gaps;
         }
@@ -1002,8 +650,8 @@ struct tuple_delta_t
       {
         if (!inferred_idxes.has (i))
         {
-          deltas_x.arrayZ[i] = 0.f;
-          deltas_y.arrayZ[i] = 0.f;
+          deltas_x.arrayZ[i] = 0.0;
+          deltas_y.arrayZ[i] = 0.0;
         }
         indices[i] = true;
       }
@@ -1011,16 +659,181 @@ struct tuple_delta_t
     return true;
   }
 
-  static float infer_delta (float target_val, float prev_val, float next_val, float prev_delta, float next_delta)
+  bool optimize (const contour_point_vector_t& contour_points,
+                 bool is_composite,
+                 double tolerance = 0.5 + 1e-10)
+  {
+    unsigned count = contour_points.length;
+    if (deltas_x.length != count ||
+        deltas_y.length != count)
+      return false;
+
+    hb_vector_t<bool> opt_indices;
+    hb_vector_t<int> rounded_x_deltas, rounded_y_deltas;
+
+    if (unlikely (!rounded_x_deltas.alloc (count) ||
+                  !rounded_y_deltas.alloc (count)))
+      return false;
+
+    for (unsigned i = 0; i < count; i++)
+    {
+      int rounded_x_delta = (int) roundf (deltas_x.arrayZ[i]);
+      int rounded_y_delta = (int) roundf (deltas_y.arrayZ[i]);
+      rounded_x_deltas.push (rounded_x_delta);
+      rounded_y_deltas.push (rounded_y_delta);
+    }
+
+    if (!iup_delta_optimize (contour_points, rounded_x_deltas, rounded_y_deltas, opt_indices, tolerance))
+      return false;
+
+    unsigned ref_count = 0;
+    for (bool ref_flag : opt_indices)
+       ref_count += ref_flag;
+
+    if (ref_count == count) return true;
+
+    hb_vector_t<float> opt_deltas_x, opt_deltas_y;
+    bool is_comp_glyph_wo_deltas = (is_composite && ref_count == 0);
+    if (is_comp_glyph_wo_deltas)
+    {
+      if (unlikely (!opt_deltas_x.resize (count) ||
+                    !opt_deltas_y.resize (count)))
+        return false;
+
+      opt_indices.arrayZ[0] = true;
+      for (unsigned i = 1; i < count; i++)
+        opt_indices.arrayZ[i] = false;
+    }
+
+    hb_vector_t<unsigned char> opt_point_data;
+    if (!compile_point_set (opt_indices, opt_point_data))
+      return false;
+    hb_vector_t<unsigned char> opt_deltas_data;
+    if (!compile_deltas (opt_indices,
+                         is_comp_glyph_wo_deltas ? opt_deltas_x : deltas_x,
+                         is_comp_glyph_wo_deltas ? opt_deltas_y : deltas_y,
+                         opt_deltas_data))
+      return false;
+
+    hb_vector_t<unsigned char> point_data;
+    if (!compile_point_set (indices, point_data))
+      return false;
+    hb_vector_t<unsigned char> deltas_data;
+    if (!compile_deltas (indices, deltas_x, deltas_y, deltas_data))
+      return false;
+
+    if (opt_point_data.length + opt_deltas_data.length < point_data.length + deltas_data.length)
+    {
+      indices.fini ();
+      indices = std::move (opt_indices);
+
+      if (is_comp_glyph_wo_deltas)
+      {
+        deltas_x.fini ();
+        deltas_x = std::move (opt_deltas_x);
+
+        deltas_y.fini ();
+        deltas_y = std::move (opt_deltas_y);
+      }
+    }
+    return !indices.in_error () && !deltas_x.in_error () && !deltas_y.in_error ();
+  }
+
+  static bool compile_point_set (const hb_vector_t<bool> &point_indices,
+                                 hb_vector_t<unsigned char>& compiled_points /* OUT */)
+  {
+    unsigned num_points = 0;
+    for (bool i : point_indices)
+      if (i) num_points++;
+
+    /* when iup optimization is enabled, num of referenced points could be 0 */
+    if (!num_points) return true;
+
+    unsigned indices_length = point_indices.length;
+    /* If the points set consists of all points in the glyph, it's encoded with a
+     * single zero byte */
+    if (num_points == indices_length)
+      return compiled_points.resize (1);
+
+    /* allocate enough memories: 2 bytes for count + 3 bytes for each point */
+    unsigned num_bytes = 2 + 3 *num_points;
+    if (unlikely (!compiled_points.resize (num_bytes, false)))
+      return false;
+
+    unsigned pos = 0;
+    /* binary data starts with the total number of reference points */
+    if (num_points < 0x80)
+      compiled_points.arrayZ[pos++] = num_points;
+    else
+    {
+      compiled_points.arrayZ[pos++] = ((num_points >> 8) | 0x80);
+      compiled_points.arrayZ[pos++] = num_points & 0xFF;
+    }
+
+    const unsigned max_run_length = 0x7F;
+    unsigned i = 0;
+    unsigned last_value = 0;
+    unsigned num_encoded = 0;
+    while (i < indices_length && num_encoded < num_points)
+    {
+      unsigned run_length = 0;
+      unsigned header_pos = pos;
+      compiled_points.arrayZ[pos++] = 0;
+
+      bool use_byte_encoding = false;
+      bool new_run = true;
+      while (i < indices_length && num_encoded < num_points &&
+             run_length <= max_run_length)
+      {
+        // find out next referenced point index
+        while (i < indices_length && !point_indices[i])
+          i++;
+
+        if (i >= indices_length) break;
+
+        unsigned cur_value = i;
+        unsigned delta = cur_value - last_value;
+
+        if (new_run)
+        {
+          use_byte_encoding = (delta <= 0xFF);
+          new_run = false;
+        }
+
+        if (use_byte_encoding && delta > 0xFF)
+          break;
+
+        if (use_byte_encoding)
+          compiled_points.arrayZ[pos++] = delta;
+        else
+        {
+          compiled_points.arrayZ[pos++] = delta >> 8;
+          compiled_points.arrayZ[pos++] = delta & 0xFF;
+        }
+        i++;
+        last_value = cur_value;
+        run_length++;
+        num_encoded++;
+      }
+
+      if (use_byte_encoding)
+        compiled_points.arrayZ[header_pos] = run_length - 1;
+      else
+        compiled_points.arrayZ[header_pos] = (run_length - 1) | 0x80;
+    }
+    return compiled_points.resize (pos, false);
+  }
+
+  static double infer_delta (double target_val, double prev_val, double next_val, double prev_delta, double next_delta)
   {
     if (prev_val == next_val)
-      return (prev_delta == next_delta) ? prev_delta : 0.f;
+      return (prev_delta == next_delta) ? prev_delta : 0.0;
     else if (target_val <= hb_min (prev_val, next_val))
       return (prev_val < next_val) ? prev_delta : next_delta;
     else if (target_val >= hb_max (prev_val, next_val))
       return (prev_val > next_val) ? prev_delta : next_delta;
 
-    float r = (target_val - prev_val) / (next_val - prev_val);
+    double r = (target_val - prev_val) / (next_val - prev_val);
     return prev_delta + r * (next_delta - prev_delta);
   }
 
@@ -1028,6 +841,7 @@ struct tuple_delta_t
   { return (i >= end) ? start : (i + 1); }
 };
 
+template <typename OffType = HBUINT16>
 struct TupleVariationData
 {
   bool sanitize (hb_sanitize_context_t *c) const
@@ -1062,19 +876,22 @@ struct TupleVariationData
 
     private:
     /* referenced point set->compiled point data map */
-    hb_hashmap_t<const hb_vector_t<bool>*, hb_bytes_t> point_data_map;
+    hb_hashmap_t<const hb_vector_t<bool>*, hb_vector_t<unsigned char>> point_data_map;
     /* referenced point set-> count map, used in finding shared points */
     hb_hashmap_t<const hb_vector_t<bool>*, unsigned> point_set_count_map;
 
     /* empty for non-gvar tuples.
-     * shared_points_bytes is just a copy of some value in the point_data_map,
+     * shared_points_bytes is a pointer to some value in the point_data_map,
      * which will be freed during map destruction. Save it for serialization, so
      * no need to do find_shared_points () again */
-    hb_bytes_t shared_points_bytes;
+    hb_vector_t<unsigned char> *shared_points_bytes = nullptr;
 
-    /* total compiled byte size as TupleVariationData format, initialized to its
-     * min_size: 4 */
-    unsigned compiled_byte_size = 4;
+    /* total compiled byte size as TupleVariationData format, initialized to 0 */
+    unsigned compiled_byte_size = 0;
+    bool needs_padding = false;
+
+    /* for gvar iup delta optimization: whether this is a composite glyph */
+    bool is_composite = false;
 
     public:
     tuple_variations_t () = default;
@@ -1082,21 +899,18 @@ struct TupleVariationData
     tuple_variations_t& operator=(const tuple_variations_t&) = delete;
     tuple_variations_t (tuple_variations_t&&) = default;
     tuple_variations_t& operator=(tuple_variations_t&&) = default;
-    ~tuple_variations_t () { fini (); }
-    void fini ()
-    {
-      for (auto _ : point_data_map.values ())
-        _.fini ();
-
-      point_set_count_map.fini ();
-      tuple_vars.fini ();
-    }
+    ~tuple_variations_t () = default;
 
     explicit operator bool () const { return bool (tuple_vars); }
     unsigned get_var_count () const
     {
-      unsigned count = tuple_vars.length;
-      if (shared_points_bytes.length)
+      unsigned count = 0;
+      /* when iup delta opt is enabled, compiled_deltas could be empty and we
+       * should skip this tuple */
+      for (auto& tuple: tuple_vars)
+        if (tuple.compiled_deltas) count++;
+
+      if (shared_points_bytes && shared_points_bytes->length)
         count |= TupleVarCount::SharedPointNumbers;
       return count;
     }
@@ -1110,26 +924,27 @@ struct TupleVariationData
                                      bool is_gvar,
                                      const hb_map_t *axes_old_index_tag_map,
                                      const hb_vector_t<unsigned> &shared_indices,
-                                     const hb_array_t<const F2DOT14> shared_tuples)
+                                     const hb_array_t<const F2DOT14> shared_tuples,
+                                     bool is_composite_glyph)
     {
       do
       {
         const HBUINT8 *p = iterator.get_serialized_data ();
         unsigned int length = iterator.current_tuple->get_data_size ();
         if (unlikely (!iterator.var_data_bytes.check_range (p, length)))
-        { fini (); return false; }
+          return false;
 
         hb_hashmap_t<hb_tag_t, Triple> axis_tuples;
         if (!iterator.current_tuple->unpack_axis_tuples (iterator.get_axis_count (), shared_tuples, axes_old_index_tag_map, axis_tuples)
             || axis_tuples.is_empty ())
-        { fini (); return false; }
+          return false;
 
         hb_vector_t<unsigned> private_indices;
         bool has_private_points = iterator.current_tuple->has_private_points ();
         const HBUINT8 *end = p + length;
         if (has_private_points &&
-            !TupleVariationData::unpack_points (p, private_indices, end))
-        { fini (); return false; }
+            !TupleVariationData::decompile_points (p, private_indices, end))
+          return false;
 
         const hb_vector_t<unsigned> &indices = has_private_points ? private_indices : shared_indices;
         bool apply_to_all = (indices.length == 0);
@@ -1138,43 +953,46 @@ struct TupleVariationData
         hb_vector_t<int> deltas_x;
 
         if (unlikely (!deltas_x.resize (num_deltas, false) ||
-                      !TupleVariationData::unpack_deltas (p, deltas_x, end)))
-        { fini (); return false; }
+                      !TupleVariationData::decompile_deltas (p, deltas_x, end)))
+          return false;
 
         hb_vector_t<int> deltas_y;
         if (is_gvar)
         {
           if (unlikely (!deltas_y.resize (num_deltas, false) ||
-                        !TupleVariationData::unpack_deltas (p, deltas_y, end)))
-          { fini (); return false; }
+                        !TupleVariationData::decompile_deltas (p, deltas_y, end)))
+            return false;
         }
 
         tuple_delta_t var;
         var.axis_tuples = std::move (axis_tuples);
         if (unlikely (!var.indices.resize (point_count) ||
                       !var.deltas_x.resize (point_count, false)))
-        { fini (); return false; }
+          return false;
 
         if (is_gvar && unlikely (!var.deltas_y.resize (point_count, false)))
-        { fini (); return false; }
+          return false;
 
         for (unsigned i = 0; i < num_deltas; i++)
         {
           unsigned idx = apply_to_all ? i : indices[i];
           if (idx >= point_count) continue;
           var.indices[idx] = true;
-          var.deltas_x[idx] = static_cast<float> (deltas_x[i]);
+          var.deltas_x[idx] = deltas_x[i];
           if (is_gvar)
-            var.deltas_y[idx] = static_cast<float> (deltas_y[i]);
+            var.deltas_y[idx] = deltas_y[i];
         }
         tuple_vars.push (std::move (var));
       } while (iterator.move_to_next ());
+
+      is_composite = is_composite_glyph;
       return true;
     }
 
     bool create_from_item_var_data (const VarData &var_data,
                                     const hb_vector_t<hb_hashmap_t<hb_tag_t, Triple>>& regions,
                                     const hb_map_t& axes_old_index_tag_map,
+                                    unsigned& item_count,
                                     const hb_inc_bimap_t* inner_map = nullptr)
     {
       /* NULL offset, to keep original varidx valid, just return */
@@ -1184,7 +1002,8 @@ struct TupleVariationData
       unsigned num_regions = var_data.get_region_index_count ();
       if (!tuple_vars.alloc (num_regions)) return false;
 
-      unsigned item_count = inner_map ? inner_map->get_population () : var_data.get_item_count ();
+      item_count = inner_map ? inner_map->get_population () : var_data.get_item_count ();
+      if (!item_count) return true;
       unsigned row_size = var_data.get_row_size ();
       const HBUINT8 *delta_bytes = var_data.get_delta_bytes ();
 
@@ -1237,7 +1056,7 @@ struct TupleVariationData
         Triple *axis_limit;
         if (!normalized_axes_location.has (axis_tag, &axis_limit))
           return false;
-        TripleDistances axis_triple_distances{1.f, 1.f};
+        TripleDistances axis_triple_distances{1.0, 1.0};
         if (axes_triple_distances.has (axis_tag))
           axis_triple_distances = axes_triple_distances.get (axis_tag);
 
@@ -1250,7 +1069,7 @@ struct TupleVariationData
           unsigned new_len = new_vars.length + out.length;
 
           if (unlikely (!new_vars.alloc (new_len, false)))
-          { fini (); return false;}
+            return false;
 
           for (unsigned i = 0; i < out.length; i++)
             new_vars.push (std::move (out[i]));
@@ -1261,8 +1080,9 @@ struct TupleVariationData
       return true;
     }
 
-    /* merge tuple variations with overlapping tents */
-    void merge_tuple_variations ()
+    /* merge tuple variations with overlapping tents, if iup delta optimization
+     * is enabled, add default deltas to contour_points */
+    bool merge_tuple_variations (contour_point_vector_t* contour_points = nullptr)
     {
       hb_vector_t<tuple_delta_t> new_vars;
       hb_hashmap_t<const hb_hashmap_t<hb_tag_t, Triple>*, unsigned> m;
@@ -1270,7 +1090,15 @@ struct TupleVariationData
       for (const tuple_delta_t& var : tuple_vars)
       {
         /* if all axes are pinned, drop the tuple variation */
-        if (var.axis_tuples.is_empty ()) continue;
+        if (var.axis_tuples.is_empty ())
+        {
+          /* if iup_delta_optimize is enabled, add deltas to contour coords */
+          if (contour_points && !contour_points->add_deltas (var.deltas_x,
+                                                             var.deltas_y,
+                                                             var.indices))
+            return false;
+          continue;
+        }
 
         unsigned *idx;
         if (m.has (&(var.axis_tuples), &idx))
@@ -1280,98 +1108,14 @@ struct TupleVariationData
         else
         {
           new_vars.push (var);
-          m.set (&(var.axis_tuples), i);
+          if (!m.set (&(var.axis_tuples), i))
+            return false;
           i++;
         }
       }
       tuple_vars.fini ();
       tuple_vars = std::move (new_vars);
-    }
-
-    hb_bytes_t compile_point_set (const hb_vector_t<bool> &point_indices)
-    {
-      unsigned num_points = 0;
-      for (bool i : point_indices)
-        if (i) num_points++;
-
-      unsigned indices_length = point_indices.length;
-      /* If the points set consists of all points in the glyph, it's encoded with a
-       * single zero byte */
-      if (num_points == indices_length)
-      {
-        char *p = (char *) hb_calloc (1, sizeof (char));
-        if (unlikely (!p)) return hb_bytes_t ();
-
-        return hb_bytes_t (p, 1);
-      }
-
-      /* allocate enough memories: 2 bytes for count + 3 bytes for each point */
-      unsigned num_bytes = 2 + 3 *num_points;
-      char *p = (char *) hb_calloc (num_bytes, sizeof (char));
-      if (unlikely (!p)) return hb_bytes_t ();
-
-      unsigned pos = 0;
-      /* binary data starts with the total number of reference points */
-      if (num_points < 0x80)
-        p[pos++] = num_points;
-      else
-      {
-        p[pos++] = ((num_points >> 8) | 0x80);
-        p[pos++] = num_points & 0xFF;
-      }
-
-      const unsigned max_run_length = 0x7F;
-      unsigned i = 0;
-      unsigned last_value = 0;
-      unsigned num_encoded = 0;
-      while (i < indices_length && num_encoded < num_points)
-      {
-        unsigned run_length = 0;
-        unsigned header_pos = pos;
-        p[pos++] = 0;
-
-        bool use_byte_encoding = false;
-        bool new_run = true;
-        while (i < indices_length && num_encoded < num_points &&
-               run_length <= max_run_length)
-        {
-          // find out next referenced point index
-          while (i < indices_length && !point_indices[i])
-            i++;
-
-          if (i >= indices_length) break;
-
-          unsigned cur_value = i;
-          unsigned delta = cur_value - last_value;
-
-          if (new_run)
-          {
-            use_byte_encoding = (delta <= 0xFF);
-            new_run = false;
-          }
-
-          if (use_byte_encoding && delta > 0xFF)
-            break;
-
-          if (use_byte_encoding)
-            p[pos++] = delta;
-          else
-          {
-            p[pos++] = delta >> 8;
-            p[pos++] = delta & 0xFF;
-          }
-          i++;
-          last_value = cur_value;
-          run_length++;
-          num_encoded++;
-        }
-
-        if (use_byte_encoding)
-          p[header_pos] = run_length - 1;
-        else
-          p[header_pos] = (run_length - 1) | 0x80;
-      }
-      return hb_bytes_t (p, pos);
+      return true;
     }
 
     /* compile all point set and store byte data in a point_set->hb_bytes_t hashmap,
@@ -1391,11 +1135,11 @@ struct TupleVariationData
           continue;
         }
 
-        hb_bytes_t compiled_data = compile_point_set (*points_set);
-        if (unlikely (compiled_data == hb_bytes_t ()))
+        hb_vector_t<unsigned char> compiled_point_data;
+        if (!tuple_delta_t::compile_point_set (*points_set, compiled_point_data))
           return false;
 
-        if (!point_data_map.set (points_set, compiled_data) ||
+        if (!point_data_map.set (points_set, std::move (compiled_point_data)) ||
             !point_set_count_map.set (points_set, 1))
           return false;
       }
@@ -1403,31 +1147,33 @@ struct TupleVariationData
     }
 
     /* find shared points set which saves most bytes */
-    hb_bytes_t find_shared_points ()
+    void find_shared_points ()
     {
       unsigned max_saved_bytes = 0;
-      hb_bytes_t res{};
 
-      for (const auto& _ : point_data_map.iter ())
+      for (const auto& _ : point_data_map.iter_ref ())
       {
         const hb_vector_t<bool>* points_set = _.first;
         unsigned data_length = _.second.length;
+        if (!data_length) continue;
         unsigned *count;
         if (unlikely (!point_set_count_map.has (points_set, &count) ||
                       *count <= 1))
-          return hb_bytes_t ();
+        {
+          shared_points_bytes = nullptr;
+          return;
+        }
 
         unsigned saved_bytes = data_length * ((*count) -1);
         if (saved_bytes > max_saved_bytes)
         {
           max_saved_bytes = saved_bytes;
-          res = _.second;
+          shared_points_bytes = &(_.second);
         }
       }
-      return res;
     }
 
-    bool calc_inferred_deltas (contour_point_vector_t& contour_points)
+    bool calc_inferred_deltas (const contour_point_vector_t& contour_points)
     {
       for (tuple_delta_t& var : tuple_vars)
         if (!var.calc_inferred_deltas (contour_points))
@@ -1436,10 +1182,21 @@ struct TupleVariationData
       return true;
     }
 
+    bool iup_optimize (const contour_point_vector_t& contour_points)
+    {
+      for (tuple_delta_t& var : tuple_vars)
+      {
+        if (!var.optimize (contour_points, is_composite))
+          return false;
+      }
+      return true;
+    }
+
     public:
     bool instantiate (const hb_hashmap_t<hb_tag_t, Triple>& normalized_axes_location,
                       const hb_hashmap_t<hb_tag_t, TripleDistances>& axes_triple_distances,
-                      contour_point_vector_t* contour_points = nullptr)
+                      contour_point_vector_t* contour_points = nullptr,
+                      bool optimize = false)
     {
       if (!tuple_vars) return true;
       if (!change_tuple_variations_axis_limits (normalized_axes_location, axes_triple_distances))
@@ -1449,41 +1206,70 @@ struct TupleVariationData
         if (!calc_inferred_deltas (*contour_points))
           return false;
 
-      merge_tuple_variations ();
+      /* if iup delta opt is on, contour_points can't be null */
+      if (optimize && !contour_points)
+        return false;
+
+      if (!merge_tuple_variations (optimize ? contour_points : nullptr))
+        return false;
+
+      if (optimize && !iup_optimize (*contour_points)) return false;
       return !tuple_vars.in_error ();
     }
 
     bool compile_bytes (const hb_map_t& axes_index_map,
                         const hb_map_t& axes_old_index_tag_map,
                         bool use_shared_points,
+                        bool is_gvar = false,
                         const hb_hashmap_t<const hb_vector_t<char>*, unsigned>* shared_tuples_idx_map = nullptr)
     {
+      // return true for empty glyph
+      if (!tuple_vars)
+        return true;
+
       // compile points set and store data in hashmap
       if (!compile_all_point_sets ())
         return false;
 
+      /* total compiled byte size as TupleVariationData format, initialized to its
+       * min_size: 4 */
+      compiled_byte_size += 4;
+
       if (use_shared_points)
       {
-        shared_points_bytes = find_shared_points ();
-        compiled_byte_size += shared_points_bytes.length;
+        find_shared_points ();
+        if (shared_points_bytes)
+          compiled_byte_size += shared_points_bytes->length;
       }
       // compile delta and tuple var header for each tuple variation
       for (auto& tuple: tuple_vars)
       {
         const hb_vector_t<bool>* points_set = &(tuple.indices);
-        hb_bytes_t *points_data;
+        hb_vector_t<unsigned char> *points_data;
         if (unlikely (!point_data_map.has (points_set, &points_data)))
           return false;
 
+        /* when iup optimization is enabled, num of referenced points could be 0
+         * and thus the compiled points bytes is empty, we should skip compiling
+         * this tuple */
+        if (!points_data->length)
+          continue;
         if (!tuple.compile_deltas ())
           return false;
 
-        unsigned points_data_length = (*points_data != shared_points_bytes) ? points_data->length : 0;
+        unsigned points_data_length = (points_data != shared_points_bytes) ? points_data->length : 0;
         if (!tuple.compile_tuple_var_header (axes_index_map, points_data_length, axes_old_index_tag_map,
                                              shared_tuples_idx_map))
           return false;
         compiled_byte_size += tuple.compiled_tuple_header.length + points_data_length + tuple.compiled_deltas.length;
       }
+
+      if (is_gvar && (compiled_byte_size % 2))
+      {
+        needs_padding = true;
+        compiled_byte_size += 1;
+      }
+
       return true;
     }
 
@@ -1502,25 +1288,31 @@ struct TupleVariationData
     bool serialize_var_data (hb_serialize_context_t *c, bool is_gvar) const
     {
       TRACE_SERIALIZE (this);
-      if (is_gvar)
-        shared_points_bytes.copy (c);
+      if (is_gvar && shared_points_bytes)
+      {
+        hb_ubytes_t s (shared_points_bytes->arrayZ, shared_points_bytes->length);
+        s.copy (c);
+      }
 
       for (const auto& tuple: tuple_vars)
       {
         const hb_vector_t<bool>* points_set = &(tuple.indices);
-        hb_bytes_t *point_data;
+        hb_vector_t<unsigned char> *point_data;
         if (!point_data_map.has (points_set, &point_data))
           return_trace (false);
 
-        if (!is_gvar || *point_data != shared_points_bytes)
-          point_data->copy (c);
+        if (!is_gvar || point_data != shared_points_bytes)
+        {
+          hb_ubytes_t s (point_data->arrayZ, point_data->length);
+          s.copy (c);
+        }
 
         tuple.compiled_deltas.as_array ().copy (c);
         if (c->in_error ()) return_trace (false);
       }
 
       /* padding for gvar */
-      if (is_gvar && (compiled_byte_size % 2))
+      if (is_gvar && needs_padding)
       {
         HBUINT8 pad;
         pad = 0;
@@ -1551,7 +1343,7 @@ struct TupleVariationData
       {
         const HBUINT8 *base = &(table_base+var_data->data);
         const HBUINT8 *p = base;
-        if (!unpack_points (p, shared_indices, (const HBUINT8 *) (var_data_bytes.arrayZ + var_data_bytes.length))) return false;
+        if (!decompile_points (p, shared_indices, (const HBUINT8 *) (var_data_bytes.arrayZ + var_data_bytes.length))) return false;
         data_offset = p - base;
       }
       return true;
@@ -1601,9 +1393,9 @@ struct TupleVariationData
 
   bool has_shared_point_numbers () const { return tupleVarCount.has_shared_point_numbers (); }
 
-  static bool unpack_points (const HBUINT8 *&p /* IN/OUT */,
-                             hb_vector_t<unsigned int> &points /* OUT */,
-                             const HBUINT8 *end)
+  static bool decompile_points (const HBUINT8 *&p /* IN/OUT */,
+                                hb_vector_t<unsigned int> &points /* OUT */,
+                                const HBUINT8 *end)
   {
     enum packed_point_flag_t
     {
@@ -1653,43 +1445,13 @@ struct TupleVariationData
     return true;
   }
 
-  static bool unpack_deltas (const HBUINT8 *&p /* IN/OUT */,
-                             hb_vector_t<int> &deltas /* IN/OUT */,
-                             const HBUINT8 *end)
+  template <typename T>
+  static bool decompile_deltas (const HBUINT8 *&p /* IN/OUT */,
+                                hb_vector_t<T> &deltas /* IN/OUT */,
+                                const HBUINT8 *end,
+                                bool consume_all = false)
   {
-    unsigned i = 0;
-    unsigned count = deltas.length;
-    while (i < count)
-    {
-      if (unlikely (p + 1 > end)) return false;
-      unsigned control = *p++;
-      unsigned run_count = (control & DELTA_RUN_COUNT_MASK) + 1;
-      unsigned stop = i + run_count;
-      if (unlikely (stop > count)) return false;
-      if (control & DELTAS_ARE_ZERO)
-      {
-        for (; i < stop; i++)
-          deltas.arrayZ[i] = 0;
-      }
-      else if (control & DELTAS_ARE_WORDS)
-      {
-        if (unlikely (p + run_count * HBUINT16::static_size > end)) return false;
-        for (; i < stop; i++)
-        {
-          deltas.arrayZ[i] = * (const HBINT16 *) p;
-          p += HBUINT16::static_size;
-        }
-      }
-      else
-      {
-        if (unlikely (p + run_count > end)) return false;
-        for (; i < stop; i++)
-        {
-          deltas.arrayZ[i] = * (const HBINT8 *) p++;
-        }
-      }
-    }
-    return true;
+    return TupleValues::decompile (p, deltas, end, consume_all);
   }
 
   bool has_data () const { return tupleVarCount; }
@@ -1700,13 +1462,15 @@ struct TupleVariationData
                                    const hb_map_t *axes_old_index_tag_map,
                                    const hb_vector_t<unsigned> &shared_indices,
                                    const hb_array_t<const F2DOT14> shared_tuples,
-                                   tuple_variations_t& tuple_variations /* OUT */) const
+                                   tuple_variations_t& tuple_variations, /* OUT */
+                                   bool is_composite_glyph = false) const
   {
     return tuple_variations.create_from_tuple_var_data (iterator, tupleVarCount,
                                                         point_count, is_gvar,
                                                         axes_old_index_tag_map,
                                                         shared_indices,
-                                                        shared_tuples);
+                                                        shared_tuples,
+                                                        is_composite_glyph);
   }
 
   bool serialize (hb_serialize_context_t *c,
@@ -1758,15 +1522,16 @@ struct TupleVariationData
                                  * low 12 bits are the number of tuple variation tables
                                  * for this glyph. The number of tuple variation tables
                                  * can be any number between 1 and 4095. */
-  Offset16To<HBUINT8>
+  OffsetTo<HBUINT8, OffType>
                 data;           /* Offset from the start of the base table
                                  * to the serialized data. */
   /* TupleVariationHeader tupleVariationHeaders[] *//* Array of tuple variation headers. */
   public:
-  DEFINE_SIZE_MIN (4);
+  DEFINE_SIZE_MIN (2 + OffType::static_size);
 };
 
-using tuple_variations_t = TupleVariationData::tuple_variations_t;
+// TODO: Move tuple_variations_t to outside of TupleVariationData
+using tuple_variations_t = TupleVariationData<HBUINT16>::tuple_variations_t;
 struct item_variations_t
 {
   using region_t = const hb_hashmap_t<hb_tag_t, Triple>*;
@@ -1775,6 +1540,14 @@ struct item_variations_t
    * have the same num of deltas (rows) */
   hb_vector_t<tuple_variations_t> vars;
 
+  /* num of retained rows for each subtable, there're 2 cases when var_data is empty:
+   * 1. retained item_count is zero
+   * 2. regions is empty and item_count is non-zero.
+   * when converting to tuples, both will be dropped because the tuple is empty,
+   * however, we need to retain 2. as all-zero rows to keep original varidx
+   * valid, so we need a way to remember the num of rows for each subtable */
+  hb_vector_t<unsigned> var_data_num_rows;
+
   /* original region list, decompiled from item varstore, used when rebuilding
    * region list after instantiation */
   hb_vector_t<hb_hashmap_t<hb_tag_t, Triple>> orig_region_list;
@@ -1812,7 +1585,7 @@ struct item_variations_t
   const hb_map_t& get_varidx_map () const
   { return varidx_map; }
 
-  bool instantiate (const VariationStore& varStore,
+  bool instantiate (const ItemVariationStore& varStore,
                     const hb_subset_plan_t *plan,
                     bool optimize=true,
                     bool use_no_variation_idx=true,
@@ -1826,7 +1599,7 @@ struct item_variations_t
   }
 
   /* keep below APIs public only for unit test: test-item-varstore */
-  bool create_from_item_varstore (const VariationStore& varStore,
+  bool create_from_item_varstore (const ItemVariationStore& varStore,
                                   const hb_map_t& axes_old_index_tag_map,
                                   const hb_array_t <const hb_inc_bimap_t> inner_maps = hb_array_t<const hb_inc_bimap_t> ())
   {
@@ -1836,22 +1609,26 @@ struct item_variations_t
 
     unsigned num_var_data = varStore.get_sub_table_count ();
     if (inner_maps && inner_maps.length != num_var_data) return false;
-    if (!vars.alloc (num_var_data)) return false;
+    if (!vars.alloc (num_var_data) ||
+        !var_data_num_rows.alloc (num_var_data)) return false;
 
     for (unsigned i = 0; i < num_var_data; i++)
     {
       if (inner_maps && !inner_maps.arrayZ[i].get_population ())
           continue;
       tuple_variations_t var_data_tuples;
+      unsigned item_count = 0;
       if (!var_data_tuples.create_from_item_var_data (varStore.get_sub_table (i),
                                                       orig_region_list,
                                                       axes_old_index_tag_map,
+                                                      item_count,
                                                       inner_maps ? &(inner_maps.arrayZ[i]) : nullptr))
         return false;
 
+      var_data_num_rows.push (item_count);
       vars.push (std::move (var_data_tuples));
     }
-    return !vars.in_error ();
+    return !vars.in_error () && !var_data_num_rows.in_error () && vars.length == var_data_num_rows.length;
   }
 
   bool instantiate_tuple_vars (const hb_hashmap_t<hb_tag_t, Triple>& normalized_axes_location,
@@ -1904,7 +1681,9 @@ struct item_variations_t
       }
     }
 
-    if (!all_regions || !all_unique_regions) return false;
+    /* regions are empty means no variation data, return true */
+    if (!all_regions || !all_unique_regions) return true;
+
     if (!region_list.alloc (all_regions.get_population ()))
       return false;
 
@@ -1969,16 +1748,13 @@ struct item_variations_t
 
   bool as_item_varstore (bool optimize=true, bool use_no_variation_idx=true)
   {
-    if (!region_list) return false;
+    /* return true if no variation data */
+    if (!region_list) return true;
     unsigned num_cols = region_list.length;
     /* pre-alloc a 2D vector for all sub_table's VarData rows */
     unsigned total_rows = 0;
-    for (unsigned major = 0; major < vars.length; major++)
-    {
-      const tuple_variations_t& tuples = vars[major];
-      /* all tuples in each sub_table should have same num of deltas(num rows) */
-      total_rows += tuples.tuple_vars[0].deltas_x.length;
-    }
+    for (unsigned major = 0; major < var_data_num_rows.length; major++)
+      total_rows += var_data_num_rows[major];
 
     if (!delta_rows.resize (total_rows)) return false;
     /* init all rows to [0]*num_cols */
@@ -1998,7 +1774,7 @@ struct item_variations_t
       /* deltas are stored in tuples(column based), convert them back into items
        * (row based) delta */
       const tuple_variations_t& tuples = vars[major];
-      unsigned num_rows = tuples.tuple_vars[0].deltas_x.length;
+      unsigned num_rows = var_data_num_rows[major];
       for (const tuple_delta_t& tuple: tuples.tuple_vars)
       {
         if (tuple.deltas_x.length != num_rows)
@@ -2223,6 +1999,7 @@ struct item_variations_t
   }
 };
 
+
 } /* namespace OT */
 
 
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-ot-var-cvar-table.hh b/src/java.desktop/share/native/libharfbuzz/hb-ot-var-cvar-table.hh
index a44a8e99998..3dc4ebaebd8 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-ot-var-cvar-table.hh
+++ b/src/java.desktop/share/native/libharfbuzz/hb-ot-var-cvar-table.hh
@@ -45,11 +45,12 @@ struct cvar
   {
     TRACE_SANITIZE (this);
     return_trace (c->check_struct (this) &&
-                  version.sanitize (c) && likely (version.major == 1) &&
+                  hb_barrier () &&
+                  likely (version.major == 1) &&
                   tupleVariationData.sanitize (c));
   }
 
-  const TupleVariationData* get_tuple_var_data (void) const
+  const TupleVariationData<>* get_tuple_var_data (void) const
   { return &tupleVariationData; }
 
   bool decompile_tuple_variations (unsigned axis_count,
@@ -57,12 +58,12 @@ struct cvar
                                    hb_blob_t *blob,
                                    bool is_gvar,
                                    const hb_map_t *axes_old_index_tag_map,
-                                   TupleVariationData::tuple_variations_t& tuple_variations /* OUT */) const
+                                   TupleVariationData<>::tuple_variations_t& tuple_variations /* OUT */) const
   {
     hb_vector_t<unsigned> shared_indices;
-    TupleVariationData::tuple_iterator_t iterator;
+    TupleVariationData<>::tuple_iterator_t iterator;
     hb_bytes_t var_data_bytes = blob->as_bytes ().sub_array (4);
-    if (!TupleVariationData::get_tuple_iterator (var_data_bytes, axis_count, this,
+    if (!TupleVariationData<>::get_tuple_iterator (var_data_bytes, axis_count, this,
                                                  shared_indices, &iterator))
       return false;
 
@@ -76,16 +77,16 @@ struct cvar
   static bool calculate_cvt_deltas (unsigned axis_count,
                                     hb_array_t<int> coords,
                                     unsigned num_cvt_item,
-                                    const TupleVariationData *tuple_var_data,
+                                    const TupleVariationData<> *tuple_var_data,
                                     const void *base,
                                     hb_vector_t<float>& cvt_deltas /* OUT */)
   {
     if (!coords) return true;
     hb_vector_t<unsigned> shared_indices;
-    TupleVariationData::tuple_iterator_t iterator;
+    TupleVariationData<>::tuple_iterator_t iterator;
     unsigned var_data_length = tuple_var_data->get_size (axis_count);
     hb_bytes_t var_data_bytes = hb_bytes_t (reinterpret_cast<const char*> (tuple_var_data), var_data_length);
-    if (!TupleVariationData::get_tuple_iterator (var_data_bytes, axis_count, base,
+    if (!TupleVariationData<>::get_tuple_iterator (var_data_bytes, axis_count, base,
                                                  shared_indices, &iterator))
       return true; /* isn't applied at all */
 
@@ -106,14 +107,14 @@ struct cvar
 
       bool has_private_points = iterator.current_tuple->has_private_points ();
       if (has_private_points &&
-          !TupleVariationData::unpack_points (p, private_indices, end))
+          !TupleVariationData<>::decompile_points (p, private_indices, end))
         return false;
       const hb_vector_t<unsigned int> &indices = has_private_points ? private_indices : shared_indices;
 
       bool apply_to_all = (indices.length == 0);
       unsigned num_deltas = apply_to_all ? num_cvt_item : indices.length;
       if (unlikely (!unpacked_deltas.resize (num_deltas, false))) return false;
-      if (unlikely (!TupleVariationData::unpack_deltas (p, unpacked_deltas, end))) return false;
+      if (unlikely (!TupleVariationData<>::decompile_deltas (p, unpacked_deltas, end))) return false;
 
       for (unsigned int i = 0; i < num_deltas; i++)
       {
@@ -128,7 +129,7 @@ struct cvar
   }
 
   bool serialize (hb_serialize_context_t *c,
-                  TupleVariationData::tuple_variations_t& tuple_variations) const
+                  TupleVariationData<>::tuple_variations_t& tuple_variations) const
   {
     TRACE_SERIALIZE (this);
     if (!tuple_variations) return_trace (false);
@@ -143,7 +144,7 @@ struct cvar
     if (c->plan->all_axes_pinned)
       return_trace (false);
 
-    OT::TupleVariationData::tuple_variations_t tuple_variations;
+    OT::TupleVariationData<>::tuple_variations_t tuple_variations;
     unsigned axis_count = c->plan->axes_old_index_tag_map.get_population ();
 
     const hb_tag_t cvt = HB_TAG('c','v','t',' ');
@@ -168,7 +169,7 @@ struct cvar
   }
 
   static bool add_cvt_and_apply_deltas (hb_subset_plan_t *plan,
-                                        const TupleVariationData *tuple_var_data,
+                                        const TupleVariationData<> *tuple_var_data,
                                         const void *base)
   {
     const hb_tag_t cvt = HB_TAG('c','v','t',' ');
@@ -208,7 +209,7 @@ struct cvar
   protected:
   FixedVersion<>version;                /* Version of the CVT variation table
                                          * initially set to 0x00010000u */
-  TupleVariationData tupleVariationData; /* TupleVariationDate for cvar table */
+  TupleVariationData<> tupleVariationData; /* TupleVariationDate for cvar table */
   public:
   DEFINE_SIZE_MIN (8);
 };
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-ot-var-fvar-table.hh b/src/java.desktop/share/native/libharfbuzz/hb-ot-var-fvar-table.hh
index d60c3dbcf4e..f2725eaa282 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-ot-var-fvar-table.hh
+++ b/src/java.desktop/share/native/libharfbuzz/hb-ot-var-fvar-table.hh
@@ -43,7 +43,7 @@ static bool axis_coord_pinned_or_within_axis_range (const hb_array_t<const F16DO
                                                     unsigned axis_index,
                                                     Triple axis_limit)
 {
-  float axis_coord = coords[axis_index].to_float ();
+  double axis_coord = static_cast<double>(coords[axis_index].to_float ());
   if (axis_limit.is_point ())
   {
     if (axis_limit.minimum != axis_coord)
@@ -131,6 +131,7 @@ struct InstanceRecord
   {
     TRACE_SANITIZE (this);
     return_trace (c->check_struct (this) &&
+                  hb_barrier () &&
                   c->check_array (coordinatesZ.arrayZ, axis_count));
   }
 
@@ -232,7 +233,10 @@ struct AxisRecord
   {
     float min, default_, max;
     get_coordinates (min, default_, max);
-    return TripleDistances (min, default_, max);
+    return TripleDistances (
+      static_cast<double>(min),
+      static_cast<double>(default_),
+      static_cast<double>(max));
   }
 
   bool subset (hb_subset_context_t *c) const
@@ -277,8 +281,10 @@ struct fvar
   {
     TRACE_SANITIZE (this);
     return_trace (version.sanitize (c) &&
+                  hb_barrier () &&
                   likely (version.major == 1) &&
                   c->check_struct (this) &&
+                  hb_barrier () &&
                   axisSize == 20 && /* Assumed in our code. */
                   instanceSize >= axisCount * 4 + 4 &&
                   get_axes ().sanitize (c) &&
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-ot-var-gvar-table.hh b/src/java.desktop/share/native/libharfbuzz/hb-ot-var-gvar-table.hh
index fd32ef03f30..c3040187f6e 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-ot-var-gvar-table.hh
+++ b/src/java.desktop/share/native/libharfbuzz/hb-ot-var-gvar-table.hh
@@ -28,6 +28,7 @@
 #ifndef HB_OT_VAR_GVAR_TABLE_HH
 #define HB_OT_VAR_GVAR_TABLE_HH
 
+#include "hb-decycler.hh"
 #include "hb-open-type.hh"
 #include "hb-ot-var-common.hh"
 
@@ -36,15 +37,37 @@
  * https://docs.microsoft.com/en-us/typography/opentype/spec/gvar
  */
 #define HB_OT_TAG_gvar HB_TAG('g','v','a','r')
+#define HB_OT_TAG_GVAR HB_TAG('G','V','A','R')
+
+struct hb_glyf_scratch_t
+{
+  // glyf
+  contour_point_vector_t all_points;
+  contour_point_vector_t comp_points;
+  hb_decycler_t decycler;
+
+  // gvar
+  contour_point_vector_t orig_points;
+  hb_vector_t<int> x_deltas;
+  hb_vector_t<int> y_deltas;
+  contour_point_vector_t deltas;
+  hb_vector_t<unsigned int> shared_indices;
+  hb_vector_t<unsigned int> private_indices;
+
+  // VARC
+  hb_vector_t<unsigned> axisIndices;
+  hb_vector_t<float> axisValues;
+};
 
 namespace OT {
 
-struct GlyphVariationData : TupleVariationData
-{};
-
+template <typename OffsetType>
 struct glyph_variations_t
 {
-  using tuple_variations_t = TupleVariationData::tuple_variations_t;
+  // TODO: Move tuple_variations_t to outside of TupleVariationData
+  using tuple_variations_t = typename TupleVariationData<OffsetType>::tuple_variations_t;
+  using GlyphVariationData = TupleVariationData<OffsetType>;
+
   hb_vector_t<tuple_variations_t> glyph_variations;
 
   hb_vector_t<char> compiled_shared_tuples;
@@ -72,7 +95,7 @@ struct glyph_variations_t
                                     const hb_subset_plan_t *plan,
                                     const hb_hashmap_t<hb_codepoint_t, hb_bytes_t>& new_gid_var_data_map)
   {
-    if (unlikely (!glyph_variations.alloc (plan->new_to_old_gid_list.length, true)))
+    if (unlikely (!glyph_variations.alloc_exact (plan->new_to_old_gid_list.length)))
       return false;
 
     auto it = hb_iter (plan->new_to_old_gid_list);
@@ -86,10 +109,11 @@ struct glyph_variations_t
       hb_bytes_t var_data = new_gid_var_data_map.get (new_gid);
 
       const GlyphVariationData* p = reinterpret_cast<const GlyphVariationData*> (var_data.arrayZ);
-      hb_vector_t<unsigned> shared_indices;
-      GlyphVariationData::tuple_iterator_t iterator;
+      typename GlyphVariationData::tuple_iterator_t iterator;
       tuple_variations_t tuple_vars;
 
+      hb_vector_t<unsigned> shared_indices;
+
       /* in case variation data is empty, push an empty struct into the vector,
        * keep the vector in sync with the new_to_old_gid_list */
       if (!var_data || ! p->has_data () || !all_contour_points->length ||
@@ -101,10 +125,14 @@ struct glyph_variations_t
         continue;
       }
 
+      bool is_composite_glyph = false;
+      is_composite_glyph = plan->composite_new_gids.has (new_gid);
+
       if (!p->decompile_tuple_variations (all_contour_points->length, true /* is_gvar */,
                                           iterator, &(plan->axes_old_index_tag_map),
                                           shared_indices, shared_tuples,
-                                          tuple_vars /* OUT */))
+                                          tuple_vars, /* OUT */
+                                          is_composite_glyph))
         return false;
       glyph_variations.push (std::move (tuple_vars));
     }
@@ -114,13 +142,15 @@ struct glyph_variations_t
   bool instantiate (const hb_subset_plan_t *plan)
   {
     unsigned count = plan->new_to_old_gid_list.length;
+    bool iup_optimize = false;
+    iup_optimize = plan->flags & HB_SUBSET_FLAGS_OPTIMIZE_IUP_DELTAS;
     for (unsigned i = 0; i < count; i++)
     {
       hb_codepoint_t new_gid = plan->new_to_old_gid_list[i].first;
       contour_point_vector_t *all_points;
       if (!plan->new_gid_contour_points_map.has (new_gid, &all_points))
         return false;
-      if (!glyph_variations[i].instantiate (plan->axes_location, plan->axes_triple_distances, all_points))
+      if (!glyph_variations[i].instantiate (plan->axes_location, plan->axes_triple_distances, all_points, iup_optimize))
         return false;
     }
     return true;
@@ -134,6 +164,7 @@ struct glyph_variations_t
     for (tuple_variations_t& vars: glyph_variations)
       if (!vars.compile_bytes (axes_index_map, axes_old_index_tag_map,
                                true, /* use shared points*/
+                               true,
                                &shared_tuples_idx_map))
         return false;
 
@@ -252,7 +283,7 @@ struct glyph_variations_t
     hb_codepoint_t last_gid = 0;
     unsigned idx = 0;
 
-    TupleVariationData* cur_glyph = c->start_embed<TupleVariationData> ();
+    GlyphVariationData* cur_glyph = c->start_embed<GlyphVariationData> ();
     if (!cur_glyph) return_trace (false);
     for (auto &_ : it)
     {
@@ -266,7 +297,7 @@ struct glyph_variations_t
 
       if (idx >= glyph_variations.length) return_trace (false);
       if (!cur_glyph->serialize (c, true, glyph_variations[idx])) return_trace (false);
-      TupleVariationData* next_glyph = c->start_embed<TupleVariationData> ();
+      GlyphVariationData* next_glyph = c->start_embed<GlyphVariationData> ();
       glyph_offset += (char *) next_glyph - (char *) cur_glyph;
 
       if (long_offset)
@@ -289,14 +320,21 @@ struct glyph_variations_t
   }
 };
 
-struct gvar
+template <typename GidOffsetType, unsigned TableTag>
+struct gvar_GVAR
 {
-  static constexpr hb_tag_t tableTag = HB_OT_TAG_gvar;
+  static constexpr hb_tag_t tableTag = TableTag;
+
+  using GlyphVariationData = TupleVariationData<GidOffsetType>;
+
+  bool has_data () const { return version.to_int () != 0; }
 
   bool sanitize_shallow (hb_sanitize_context_t *c) const
   {
     TRACE_SANITIZE (this);
-    return_trace (c->check_struct (this) && (version.major == 1) &&
+    return_trace (c->check_struct (this) &&
+                  hb_barrier () &&
+                  (version.major == 1) &&
                   sharedTuples.sanitize (c, this, axisCount * sharedTupleCount) &&
                   (is_long_offset () ?
                      c->check_array (get_long_offset_array (), c->get_num_glyphs () + 1) :
@@ -308,7 +346,7 @@ struct gvar
   { return sanitize_shallow (c); }
 
   bool decompile_glyph_variations (hb_subset_context_t *c,
-                                   glyph_variations_t& glyph_vars /* OUT */) const
+                                   glyph_variations_t<GidOffsetType>& glyph_vars /* OUT */) const
   {
     hb_hashmap_t<hb_codepoint_t, hb_bytes_t> new_gid_var_data_map;
     auto it = hb_iter (c->plan->new_to_old_gid_list);
@@ -335,13 +373,14 @@ struct gvar
   template<typename Iterator,
            hb_requires (hb_is_iterator (Iterator))>
   bool serialize (hb_serialize_context_t *c,
-                  const glyph_variations_t& glyph_vars,
+                  const glyph_variations_t<GidOffsetType>& glyph_vars,
                   Iterator it,
                   unsigned axis_count,
-                  unsigned num_glyphs) const
+                  unsigned num_glyphs,
+                  bool force_long_offsets) const
   {
     TRACE_SERIALIZE (this);
-    gvar *out = c->allocate_min<gvar> ();
+    gvar_GVAR *out = c->allocate_min<gvar_GVAR> ();
     if (unlikely (!out)) return_trace (false);
 
     out->version.major = 1;
@@ -350,7 +389,10 @@ struct gvar
     out->glyphCountX = hb_min (0xFFFFu, num_glyphs);
 
     unsigned glyph_var_data_size = glyph_vars.compiled_byte_size ();
-    bool long_offset = glyph_var_data_size & ~0xFFFFu;
+    /* According to the spec: If the short format (Offset16) is used for offsets,
+     * the value stored is the offset divided by 2, so the maximum data size should
+     * be 2 * 0xFFFFu, which is 0x1FFFEu */
+    bool long_offset = glyph_var_data_size > 0x1FFFEu || force_long_offsets;
     out->flags = long_offset ? 1 : 0;
 
     HBUINT8 *glyph_var_data_offsets = c->allocate_size<HBUINT8> ((long_offset ? 4 : 2) * (num_glyphs + 1), false);
@@ -380,7 +422,7 @@ struct gvar
   bool instantiate (hb_subset_context_t *c) const
   {
     TRACE_SUBSET (this);
-    glyph_variations_t glyph_vars;
+    glyph_variations_t<GidOffsetType> glyph_vars;
     if (!decompile_glyph_variations (c, glyph_vars))
       return_trace (false);
 
@@ -391,7 +433,12 @@ struct gvar
     unsigned axis_count = c->plan->axes_index_map.get_population ();
     unsigned num_glyphs = c->plan->num_output_glyphs ();
     auto it = hb_iter (c->plan->new_to_old_gid_list);
-    return_trace (serialize (c->serializer, glyph_vars, it, axis_count, num_glyphs));
+
+    bool force_long_offsets = false;
+#ifdef HB_EXPERIMENTAL_API
+    force_long_offsets = c->plan->flags & HB_SUBSET_FLAGS_IFTB_REQUIREMENTS;
+#endif
+    return_trace (serialize (c->serializer, glyph_vars, it, axis_count, num_glyphs, force_long_offsets));
   }
 
   bool subset (hb_subset_context_t *c) const
@@ -405,7 +452,7 @@ struct gvar
 
     unsigned glyph_count = version.to_int () ? c->plan->source->get_num_glyphs () : 0;
 
-    gvar *out = c->serializer->allocate_min<gvar> ();
+    gvar_GVAR *out = c->serializer->allocate_min<gvar_GVAR> ();
     if (unlikely (!out)) return_trace (false);
 
     out->version.major = 1;
@@ -426,7 +473,13 @@ struct gvar
       subset_data_size += get_glyph_var_data_bytes (c->source_blob, glyph_count, old_gid).length;
     }
 
-    bool long_offset = subset_data_size & ~0xFFFFu;
+    /* According to the spec: If the short format (Offset16) is used for offsets,
+     * the value stored is the offset divided by 2, so the maximum data size should
+     * be 2 * 0xFFFFu, which is 0x1FFFEu */
+    bool long_offset = subset_data_size > 0x1FFFEu;
+#ifdef HB_EXPERIMENTAL_API
+    long_offset = long_offset || (c->plan->flags & HB_SUBSET_FLAGS_IFTB_REQUIREMENTS);
+#endif
     out->flags = long_offset ? 1 : 0;
 
     HBUINT8 *subset_offsets = c->serializer->allocate_size<HBUINT8> ((long_offset ? 4 : 2) * (num_glyphs + 1), false);
@@ -444,6 +497,8 @@ struct gvar
       hb_memcpy (tuples, this+sharedTuples, shared_tuple_size);
     }
 
+    /* This ordering relative to the shared tuples array, which puts the glyphVariationData
+       last in the table, is required when HB_SUBSET_FLAGS_IFTB_REQUIREMENTS is set */
     char *subset_data = c->serializer->allocate_size<char> (subset_data_size, false);
     if (!subset_data) return_trace (false);
     out->dataZ = subset_data - (char *) out;
@@ -521,7 +576,7 @@ struct gvar
   unsigned get_offset (unsigned glyph_count, unsigned i) const
   {
     if (unlikely (i > glyph_count)) return 0;
-    _hb_compiler_memory_r_barrier ();
+    hb_barrier ();
     return is_long_offset () ? get_long_offset_array ()[i] : get_short_offset_array ()[i] * 2;
   }
 
@@ -531,9 +586,11 @@ struct gvar
   public:
   struct accelerator_t
   {
+    bool has_data () const { return table->has_data (); }
+
     accelerator_t (hb_face_t *face)
     {
-      table = hb_sanitize_context_t ().reference_table<gvar> (face);
+      table = hb_sanitize_context_t ().reference_table<gvar_GVAR> (face);
       /* If sanitize failed, set glyphCount to 0. */
       glyphCount = table->version.to_int () ? face->get_num_glyphs () : 0;
 
@@ -599,37 +656,42 @@ struct gvar
 
     public:
     bool apply_deltas_to_points (hb_codepoint_t glyph,
-                                 hb_array_t<int> coords,
+                                 hb_array_t<const int> coords,
                                  const hb_array_t<contour_point_t> points,
+                                 hb_glyf_scratch_t &scratch,
                                  bool phantom_only = false) const
     {
       if (unlikely (glyph >= glyphCount)) return true;
 
       hb_bytes_t var_data_bytes = table->get_glyph_var_data_bytes (table.get_blob (), glyphCount, glyph);
       if (!var_data_bytes.as<GlyphVariationData> ()->has_data ()) return true;
-      hb_vector_t<unsigned int> shared_indices;
-      GlyphVariationData::tuple_iterator_t iterator;
+
+      auto &shared_indices = scratch.shared_indices;
+      shared_indices.clear ();
+
+      typename GlyphVariationData::tuple_iterator_t iterator;
       if (!GlyphVariationData::get_tuple_iterator (var_data_bytes, table->axisCount,
                                                    var_data_bytes.arrayZ,
                                                    shared_indices, &iterator))
         return true; /* so isn't applied at all */
 
       /* Save original points for inferred delta calculation */
-      contour_point_vector_t orig_points_vec; // Populated lazily
+      auto &orig_points_vec = scratch.orig_points;
+      orig_points_vec.clear (); // Populated lazily
       auto orig_points = orig_points_vec.as_array ();
 
       /* flag is used to indicate referenced point */
-      contour_point_vector_t deltas_vec; // Populated lazily
+      auto &deltas_vec = scratch.deltas;
+      deltas_vec.clear (); // Populated lazily
       auto deltas = deltas_vec.as_array ();
 
-      hb_vector_t<unsigned> end_points; // Populated lazily
-
       unsigned num_coords = table->axisCount;
       hb_array_t<const F2DOT14> shared_tuples = (table+table->sharedTuples).as_array (table->sharedTupleCount * num_coords);
 
-      hb_vector_t<unsigned int> private_indices;
-      hb_vector_t<int> x_deltas;
-      hb_vector_t<int> y_deltas;
+      auto &private_indices = scratch.private_indices;
+      auto &x_deltas = scratch.x_deltas;
+      auto &y_deltas = scratch.y_deltas;
+
       unsigned count = points.length;
       bool flush = false;
       do
@@ -654,16 +716,16 @@ struct gvar
 
         bool has_private_points = iterator.current_tuple->has_private_points ();
         if (has_private_points &&
-            !GlyphVariationData::unpack_points (p, private_indices, end))
+            !GlyphVariationData::decompile_points (p, private_indices, end))
           return false;
         const hb_array_t<unsigned int> &indices = has_private_points ? private_indices : shared_indices;
 
         bool apply_to_all = (indices.length == 0);
         unsigned int num_deltas = apply_to_all ? points.length : indices.length;
         if (unlikely (!x_deltas.resize (num_deltas, false))) return false;
-        if (unlikely (!GlyphVariationData::unpack_deltas (p, x_deltas, end))) return false;
+        if (unlikely (!GlyphVariationData::decompile_deltas (p, x_deltas, end))) return false;
         if (unlikely (!y_deltas.resize (num_deltas, false))) return false;
-        if (unlikely (!GlyphVariationData::unpack_deltas (p, y_deltas, end))) return false;
+        if (unlikely (!GlyphVariationData::decompile_deltas (p, y_deltas, end))) return false;
 
         if (!apply_to_all)
         {
@@ -700,8 +762,8 @@ struct gvar
             if (phantom_only && pt_index < count - 4) continue;
             auto &delta = deltas.arrayZ[pt_index];
             delta.flag = 1;     /* this point is referenced, i.e., explicit deltas specified */
-            delta.x += x_deltas.arrayZ[i] * scalar;
-            delta.y += y_deltas.arrayZ[i] * scalar;
+            delta.add_delta (x_deltas.arrayZ[i] * scalar,
+                             y_deltas.arrayZ[i] * scalar);
           }
         }
         else
@@ -712,10 +774,9 @@ struct gvar
             if (apply_to_all)
               for (unsigned int i = phantom_only ? count - 4 : 0; i < count; i++)
               {
-                unsigned int pt_index = i;
-                auto &delta = deltas.arrayZ[pt_index];
-                delta.x += x_deltas.arrayZ[i] * scalar;
-                delta.y += y_deltas.arrayZ[i] * scalar;
+                auto &delta = deltas.arrayZ[i];
+                delta.add_delta (x_deltas.arrayZ[i] * scalar,
+                                 y_deltas.arrayZ[i] * scalar);
               }
             else
               for (unsigned int i = 0; i < num_deltas; i++)
@@ -725,8 +786,8 @@ struct gvar
                 if (phantom_only && pt_index < count - 4) continue;
                 auto &delta = deltas.arrayZ[pt_index];
                 delta.flag = 1; /* this point is referenced, i.e., explicit deltas specified */
-                delta.x += x_deltas.arrayZ[i] * scalar;
-                delta.y += y_deltas.arrayZ[i] * scalar;
+                delta.add_delta (x_deltas.arrayZ[i] * scalar,
+                                 y_deltas.arrayZ[i] * scalar);
               }
           }
           else
@@ -734,10 +795,9 @@ struct gvar
             if (apply_to_all)
               for (unsigned int i = phantom_only ? count - 4 : 0; i < count; i++)
               {
-                unsigned int pt_index = i;
-                auto &delta = deltas.arrayZ[pt_index];
-                delta.x += x_deltas.arrayZ[i];
-                delta.y += y_deltas.arrayZ[i];
+                auto &delta = deltas.arrayZ[i];
+                delta.add_delta (x_deltas.arrayZ[i],
+                                 y_deltas.arrayZ[i]);
               }
             else
               for (unsigned int i = 0; i < num_deltas; i++)
@@ -747,8 +807,8 @@ struct gvar
                 if (phantom_only && pt_index < count - 4) continue;
                 auto &delta = deltas.arrayZ[pt_index];
                 delta.flag = 1; /* this point is referenced, i.e., explicit deltas specified */
-                delta.x += x_deltas.arrayZ[i];
-                delta.y += y_deltas.arrayZ[i];
+                delta.add_delta (x_deltas.arrayZ[i],
+                                 y_deltas.arrayZ[i]);
               }
           }
         }
@@ -756,17 +816,14 @@ struct gvar
         /* infer deltas for unreferenced points */
         if (!apply_to_all && !phantom_only)
         {
-          if (!end_points)
-          {
-            for (unsigned i = 0; i < count; ++i)
-              if (points.arrayZ[i].is_end_point)
-                end_points.push (i);
-            if (unlikely (end_points.in_error ())) return false;
-          }
-
           unsigned start_point = 0;
-          for (unsigned end_point : end_points)
+          unsigned end_point = 0;
+          while (true)
           {
+            while (end_point < count && !points.arrayZ[end_point].is_end_point)
+              end_point++;
+            if (unlikely (end_point == count)) break;
+
             /* Check the number of unreferenced points in a contour. If no unref points or no ref points, nothing to do. */
             unsigned unref_count = 0;
             for (unsigned i = start_point; i < end_point + 1; i++)
@@ -809,7 +866,7 @@ struct gvar
               }
             }
           no_more_gaps:
-            start_point = end_point + 1;
+            start_point = end_point = end_point + 1;
           }
         }
 
@@ -829,7 +886,7 @@ struct gvar
     unsigned int get_axis_count () const { return table->axisCount; }
 
     private:
-    hb_blob_ptr_t<gvar> table;
+    hb_blob_ptr_t<gvar_GVAR> table;
     unsigned glyphCount;
     hb_vector_t<hb_pair_t<int, int>> shared_tuple_active_idx;
   };
@@ -847,7 +904,7 @@ struct gvar
   NNOffset32To<UnsizedArrayOf<F2DOT14>>
                 sharedTuples;   /* Offset from the start of this table to the shared tuple records.
                                  * Array of tuple records shared across all glyph variation data tables. */
-  HBUINT16      glyphCountX;    /* The number of glyphs in this font. This must match the number of
+  GidOffsetType glyphCountX;    /* The number of glyphs in this font. This must match the number of
                                  * glyphs stored elsewhere in the font. */
   HBUINT16      flags;          /* Bit-field that gives the format of the offset array that follows.
                                  * If bit 0 is clear, the offsets are uint16; if bit 0 is set, the
@@ -862,9 +919,15 @@ struct gvar
   DEFINE_SIZE_ARRAY (20, offsetZ);
 };
 
+using gvar = gvar_GVAR<HBUINT16, HB_OT_TAG_gvar>;
+using GVAR = gvar_GVAR<HBUINT24, HB_OT_TAG_GVAR>;
+
 struct gvar_accelerator_t : gvar::accelerator_t {
   gvar_accelerator_t (hb_face_t *face) : gvar::accelerator_t (face) {}
 };
+struct GVAR_accelerator_t : GVAR::accelerator_t {
+  GVAR_accelerator_t (hb_face_t *face) : GVAR::accelerator_t (face) {}
+};
 
 } /* namespace OT */
 
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-ot-var-hvar-table.hh b/src/java.desktop/share/native/libharfbuzz/hb-ot-var-hvar-table.hh
index c1b40dcb49d..40a85a62b78 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-ot-var-hvar-table.hh
+++ b/src/java.desktop/share/native/libharfbuzz/hb-ot-var-hvar-table.hh
@@ -188,7 +188,7 @@ struct hvarvvar_subset_plan_t
   ~hvarvvar_subset_plan_t() { fini (); }
 
   void init (const hb_array_t<const DeltaSetIndexMap *> &index_maps,
-             const VariationStore &_var_store,
+             const ItemVariationStore &_var_store,
              const hb_subset_plan_t *plan)
   {
     index_map_plans.resize (index_maps.length);
@@ -263,7 +263,7 @@ struct hvarvvar_subset_plan_t
   hb_inc_bimap_t outer_map;
   hb_vector_t<hb_inc_bimap_t> inner_maps;
   hb_vector_t<index_map_subset_plan_t> index_map_plans;
-  const VariationStore *var_store;
+  const ItemVariationStore *var_store;
 
   protected:
   hb_vector_t<hb_set_t *> inner_sets;
@@ -288,6 +288,7 @@ struct HVARVVAR
   {
     TRACE_SANITIZE (this);
     return_trace (version.sanitize (c) &&
+                  hb_barrier () &&
                   likely (version.major == 1) &&
                   varStore.sanitize (c, this) &&
                   advMap.sanitize (c, this) &&
@@ -295,7 +296,7 @@ struct HVARVVAR
                   rsbMap.sanitize (c, this));
   }
 
-  const VariationStore& get_var_store () const
+  const ItemVariationStore& get_var_store () const
   { return this+varStore; }
 
   void listup_index_maps (hb_vector_t<const DeltaSetIndexMap *> &index_maps) const
@@ -383,7 +384,7 @@ struct HVARVVAR
 
   float get_advance_delta_unscaled (hb_codepoint_t  glyph,
                                     const int *coords, unsigned int coord_count,
-                                    VariationStore::cache_t *store_cache = nullptr) const
+                                    ItemVariationStore::cache_t *store_cache = nullptr) const
   {
     uint32_t varidx = (this+advMap).map (glyph);
     return (this+varStore).get_delta (varidx,
@@ -404,7 +405,7 @@ struct HVARVVAR
   public:
   FixedVersion<>version;        /* Version of the metrics variation table
                                  * initially set to 0x00010000u */
-  Offset32To<VariationStore>
+  Offset32To<ItemVariationStore>
                 varStore;       /* Offset to item variation store table. */
   Offset32To<DeltaSetIndexMap>
                 advMap;         /* Offset to advance var-idx mapping. */
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-ot-var-mvar-table.hh b/src/java.desktop/share/native/libharfbuzz/hb-ot-var-mvar-table.hh
index ced04d89da3..c5a58d6f6bf 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-ot-var-mvar-table.hh
+++ b/src/java.desktop/share/native/libharfbuzz/hb-ot-var-mvar-table.hh
@@ -56,7 +56,7 @@ struct VariationValueRecord
 
   public:
   Tag           valueTag;       /* Four-byte tag identifying a font-wide measure. */
-  VarIdx        varIdx;         /* Outer/inner index into VariationStore item. */
+  VarIdx        varIdx;         /* Outer/inner index into ItemVariationStore item. */
 
   public:
   DEFINE_SIZE_STATIC (8);
@@ -77,8 +77,10 @@ struct MVAR
   {
     TRACE_SANITIZE (this);
     return_trace (version.sanitize (c) &&
+                  hb_barrier () &&
                   likely (version.major == 1) &&
                   c->check_struct (this) &&
+                  hb_barrier () &&
                   valueRecordSize >= VariationValueRecord::static_size &&
                   varStore.sanitize (c, this) &&
                   c->check_range (valuesZ.arrayZ,
@@ -104,7 +106,7 @@ struct MVAR
     out->valueRecordCount = valueRecordCount;
 
     item_variations_t item_vars;
-    const VariationStore& src_var_store = this+varStore;
+    const ItemVariationStore& src_var_store = this+varStore;
 
     if (!item_vars.instantiate (src_var_store, c->plan))
       return_trace (false);
@@ -157,7 +159,7 @@ protected:
   HBUINT16      valueRecordSize;/* The size in bytes of each value record —
                                  * must be greater than zero. */
   HBUINT16      valueRecordCount;/* The number of value records — may be zero. */
-  Offset16To<VariationStore>
+  Offset16To<ItemVariationStore>
                 varStore;       /* Offset to item variation store table. */
   UnsizedArrayOf<HBUINT8>
                 valuesZ;        /* Array of value records. The records must be
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-ot-var-varc-table.hh b/src/java.desktop/share/native/libharfbuzz/hb-ot-var-varc-table.hh
new file mode 100644
index 00000000000..603aeb258cf
--- /dev/null
+++ b/src/java.desktop/share/native/libharfbuzz/hb-ot-var-varc-table.hh
@@ -0,0 +1,32 @@
+/*
+ * Copyright © 2024  Google, Inc.
+ *
+ *  This is part of HarfBuzz, a text shaping library.
+ *
+ * Permission is hereby granted, without written agreement and without
+ * license or royalty fees, to use, copy, modify, and distribute this
+ * software and its documentation for any purpose, provided that the
+ * above copyright notice and the following two paragraphs appear in
+ * all copies of this software.
+ *
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
+ * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
+ * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
+ * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+ * DAMAGE.
+ *
+ * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
+ * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ * FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
+ * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
+ * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
+ *
+ * Google Author(s): Behdad Esfahbod
+ */
+
+#ifndef HB_OT_VAR_VARC_TABLE_HH
+#define HB_OT_VAR_VARC_TABLE_HH
+
+#include "OT/Var/VARC/VARC.hh"
+
+#endif /* HB_OT_VAR_VARC_TABLE_HH */
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-ot-vorg-table.hh b/src/java.desktop/share/native/libharfbuzz/hb-ot-vorg-table.hh
index dd3039924ef..b2300a327da 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-ot-vorg-table.hh
+++ b/src/java.desktop/share/native/libharfbuzz/hb-ot-vorg-table.hh
@@ -117,6 +117,7 @@ struct VORG
   {
     TRACE_SANITIZE (this);
     return_trace (c->check_struct (this) &&
+                  hb_barrier () &&
                   version.major == 1 &&
                   vertYOrigins.sanitize (c));
   }
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-paint-extents.hh b/src/java.desktop/share/native/libharfbuzz/hb-paint-extents.hh
index 518228c414b..18aa638c7ad 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-paint-extents.hh
+++ b/src/java.desktop/share/native/libharfbuzz/hb-paint-extents.hh
@@ -28,169 +28,8 @@
 #include "hb.hh"
 #include "hb-paint.h"
 
+#include "hb-geometry.hh"
 
-typedef struct hb_extents_t
-{
-  hb_extents_t () {}
-  hb_extents_t (float xmin, float ymin, float xmax, float ymax) :
-    xmin (xmin), ymin (ymin), xmax (xmax), ymax (ymax) {}
-
-  bool is_empty () const { return xmin >= xmax || ymin >= ymax; }
-  bool is_void () const { return xmin > xmax; }
-
-  void union_ (const hb_extents_t &o)
-  {
-    xmin = hb_min (xmin, o.xmin);
-    ymin = hb_min (ymin, o.ymin);
-    xmax = hb_max (xmax, o.xmax);
-    ymax = hb_max (ymax, o.ymax);
-  }
-
-  void intersect (const hb_extents_t &o)
-  {
-    xmin = hb_max (xmin, o.xmin);
-    ymin = hb_max (ymin, o.ymin);
-    xmax = hb_min (xmax, o.xmax);
-    ymax = hb_min (ymax, o.ymax);
-  }
-
-  void
-  add_point (float x, float y)
-  {
-    if (unlikely (is_void ()))
-    {
-      xmin = xmax = x;
-      ymin = ymax = y;
-    }
-    else
-    {
-      xmin = hb_min (xmin, x);
-      ymin = hb_min (ymin, y);
-      xmax = hb_max (xmax, x);
-      ymax = hb_max (ymax, y);
-    }
-  }
-
-  float xmin = 0.f;
-  float ymin = 0.f;
-  float xmax = -1.f;
-  float ymax = -1.f;
-} hb_extents_t;
-
-typedef struct hb_transform_t
-{
-  hb_transform_t () {}
-  hb_transform_t (float xx, float yx,
-                  float xy, float yy,
-                  float x0, float y0) :
-    xx (xx), yx (yx), xy (xy), yy (yy), x0 (x0), y0 (y0) {}
-
-  void multiply (const hb_transform_t &o)
-  {
-    /* Copied from cairo, with "o" being "a" there and "this" being "b" there. */
-    hb_transform_t r;
-
-    r.xx = o.xx * xx + o.yx * xy;
-    r.yx = o.xx * yx + o.yx * yy;
-
-    r.xy = o.xy * xx + o.yy * xy;
-    r.yy = o.xy * yx + o.yy * yy;
-
-    r.x0 = o.x0 * xx + o.y0 * xy + x0;
-    r.y0 = o.x0 * yx + o.y0 * yy + y0;
-
-    *this = r;
-  }
-
-  void transform_distance (float &dx, float &dy) const
-  {
-    float new_x = xx * dx + xy * dy;
-    float new_y = yx * dx + yy * dy;
-    dx = new_x;
-    dy = new_y;
-  }
-
-  void transform_point (float &x, float &y) const
-  {
-    transform_distance (x, y);
-    x += x0;
-    y += y0;
-  }
-
-  void transform_extents (hb_extents_t &extents) const
-  {
-    float quad_x[4], quad_y[4];
-
-    quad_x[0] = extents.xmin;
-    quad_y[0] = extents.ymin;
-    quad_x[1] = extents.xmin;
-    quad_y[1] = extents.ymax;
-    quad_x[2] = extents.xmax;
-    quad_y[2] = extents.ymin;
-    quad_x[3] = extents.xmax;
-    quad_y[3] = extents.ymax;
-
-    extents = hb_extents_t {};
-    for (unsigned i = 0; i < 4; i++)
-    {
-      transform_point (quad_x[i], quad_y[i]);
-      extents.add_point (quad_x[i], quad_y[i]);
-    }
-  }
-
-  float xx = 1.f;
-  float yx = 0.f;
-  float xy = 0.f;
-  float yy = 1.f;
-  float x0 = 0.f;
-  float y0 = 0.f;
-} hb_transform_t;
-
-typedef struct hb_bounds_t
-{
-  enum status_t {
-    UNBOUNDED,
-    BOUNDED,
-    EMPTY,
-  };
-
-  hb_bounds_t (status_t status) : status (status) {}
-  hb_bounds_t (const hb_extents_t &extents) :
-    status (extents.is_empty () ? EMPTY : BOUNDED), extents (extents) {}
-
-  void union_ (const hb_bounds_t &o)
-  {
-    if (o.status == UNBOUNDED)
-      status = UNBOUNDED;
-    else if (o.status == BOUNDED)
-    {
-      if (status == EMPTY)
-        *this = o;
-      else if (status == BOUNDED)
-        extents.union_ (o.extents);
-    }
-  }
-
-  void intersect (const hb_bounds_t &o)
-  {
-    if (o.status == EMPTY)
-      status = EMPTY;
-    else if (o.status == BOUNDED)
-    {
-      if (status == UNBOUNDED)
-        *this = o;
-      else if (status == BOUNDED)
-      {
-        extents.intersect (o.extents);
-        if (extents.is_empty ())
-          status = EMPTY;
-      }
-    }
-  }
-
-  status_t status;
-  hb_extents_t extents;
-} hb_bounds_t;
 
 typedef struct  hb_paint_extents_context_t hb_paint_extents_context_t;
 
@@ -231,7 +70,10 @@ struct hb_paint_extents_context_t
     const hb_transform_t &t = transforms.tail ();
     t.transform_extents (extents);
 
-    clips.push (hb_bounds_t {extents});
+    auto bounds = hb_bounds_t {extents};
+    bounds.intersect (clips.tail ());
+
+    clips.push (bounds);
   }
 
   void pop_clip ()
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-paint.h b/src/java.desktop/share/native/libharfbuzz/hb-paint.h
index 6215488e2e7..f0d9438506d 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-paint.h
+++ b/src/java.desktop/share/native/libharfbuzz/hb-paint.h
@@ -146,7 +146,7 @@ typedef void (*hb_paint_pop_transform_func_t) (hb_paint_funcs_t *funcs,
  *
  * A virtual method for the #hb_paint_funcs_t to render a color glyph by glyph index.
  *
- * Return value: %true if the glyph was painted, %false otherwise.
+ * Return value: `true` if the glyph was painted, `false` otherwise.
  *
  * Since: 8.2.0
  */
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-priority-queue.hh b/src/java.desktop/share/native/libharfbuzz/hb-priority-queue.hh
index 2c8ccbfb688..274d5df4c54 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-priority-queue.hh
+++ b/src/java.desktop/share/native/libharfbuzz/hb-priority-queue.hh
@@ -55,6 +55,9 @@ struct hb_priority_queue_t
 
   bool in_error () const { return heap.in_error (); }
 
+  bool alloc (unsigned size)
+  { return heap.alloc (size); }
+
 #ifndef HB_OPTIMIZE_SIZE
   HB_ALWAYS_INLINE
 #endif
@@ -160,7 +163,7 @@ struct hb_priority_queue_t
     goto repeat;
   }
 
-  void swap (unsigned a, unsigned b)
+  void swap (unsigned a, unsigned b) noexcept
   {
     assert (a < heap.length);
     assert (b < heap.length);
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-repacker.hh b/src/java.desktop/share/native/libharfbuzz/hb-repacker.hh
index e9cd376ad37..cb4fdeead2e 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-repacker.hh
+++ b/src/java.desktop/share/native/libharfbuzz/hb-repacker.hh
@@ -238,6 +238,54 @@ bool _try_isolating_subgraphs (const hb_vector_t<graph::overflow_record_t>& over
   return true;
 }
 
+static inline
+bool _resolve_shared_overflow(const hb_vector_t<graph::overflow_record_t>& overflows,
+                              int overflow_index,
+                              graph_t& sorted_graph)
+{
+  const graph::overflow_record_t& r = overflows[overflow_index];
+
+  // Find all of the parents in overflowing links that link to this
+  // same child node. We will then try duplicating the child node and
+  // re-assigning all of these parents to the duplicate.
+  hb_set_t parents;
+  parents.add(r.parent);
+  for (int i = overflow_index - 1; i >= 0; i--) {
+    const graph::overflow_record_t& r2 = overflows[i];
+    if (r2.child == r.child) {
+      parents.add(r2.parent);
+    }
+  }
+
+  unsigned result = sorted_graph.duplicate(&parents, r.child);
+  if (result == (unsigned) -1 && parents.get_population() > 2) {
+    // All links to the child are overflowing, so we can't include all
+    // in the duplication. Remove one parent from the duplication.
+    // Remove the lowest index parent, which will be the closest to the child.
+    parents.del(parents.get_min());
+    result = sorted_graph.duplicate(&parents, r.child);
+  }
+
+  if (result == (unsigned) -1) return result;
+
+  if (parents.get_population() > 1) {
+    // If the duplicated node has more than one parent pre-emptively raise it's priority to the maximum.
+    // This will place it close to the parents. Node's with only one parent, don't need this as normal overflow
+    // resolution will raise priority if needed.
+    //
+    // Reasoning: most of the parents to this child are likely at the same layer in the graph. Duplicating
+    // the child will theoretically allow it to be placed closer to it's parents. However, due to the shortest
+    // distance sort by default it's placement will remain in the same layer, thus it will remain in roughly the
+    // same position (and distance from parents) as the original child node. The overflow resolution will attempt
+    // to move nodes closer, but only for non-shared nodes. Since this node is shared, it will simply be given
+    // further duplication which defeats the attempt to duplicate with multiple parents. To fix this we
+    // pre-emptively raise priority now which allows the duplicated node to pack into the same layer as it's parents.
+    sorted_graph.vertices_[result].give_max_priority();
+  }
+
+  return result;
+}
+
 static inline
 bool _process_overflows (const hb_vector_t<graph::overflow_record_t>& overflows,
                          hb_set_t& priority_bumped_parents,
@@ -254,7 +302,7 @@ bool _process_overflows (const hb_vector_t<graph::overflow_record_t>& overflows,
     {
       // The child object is shared, we may be able to eliminate the overflow
       // by duplicating it.
-      if (sorted_graph.duplicate (r.parent, r.child) == (unsigned) -1) continue;
+      if (!_resolve_shared_overflow(overflows, i, sorted_graph)) continue;
       return true;
     }
 
@@ -289,9 +337,10 @@ bool _process_overflows (const hb_vector_t<graph::overflow_record_t>& overflows,
 inline bool
 hb_resolve_graph_overflows (hb_tag_t table_tag,
                             unsigned max_rounds ,
-                            bool recalculate_extensions,
+                            bool always_recalculate_extensions,
                             graph_t& sorted_graph /* IN/OUT */)
 {
+  DEBUG_MSG (SUBSET_REPACK, nullptr, "Repacking %c%c%c%c.", HB_UNTAG(table_tag));
   sorted_graph.sort_shortest_distance ();
   if (sorted_graph.in_error ())
   {
@@ -303,12 +352,12 @@ hb_resolve_graph_overflows (hb_tag_t table_tag,
   if (!will_overflow)
     return true;
 
+  bool is_gsub_or_gpos = (table_tag == HB_OT_TAG_GPOS ||  table_tag == HB_OT_TAG_GSUB);
   graph::gsubgpos_graph_context_t ext_context (table_tag, sorted_graph);
-  if ((table_tag == HB_OT_TAG_GPOS
-       ||  table_tag == HB_OT_TAG_GSUB)
-      && will_overflow)
+  if (is_gsub_or_gpos && will_overflow)
   {
-    if (recalculate_extensions)
+    DEBUG_MSG (SUBSET_REPACK, nullptr, "Applying GSUB/GPOS repacking specializations.");
+    if (always_recalculate_extensions)
     {
       DEBUG_MSG (SUBSET_REPACK, nullptr, "Splitting subtables if needed.");
       if (!_presplit_subtables_if_needed (ext_context)) {
@@ -364,6 +413,13 @@ hb_resolve_graph_overflows (hb_tag_t table_tag,
 
   if (graph::will_overflow (sorted_graph))
   {
+    if (is_gsub_or_gpos && !always_recalculate_extensions) {
+      // If this a GSUB/GPOS table and we didn't try to extension promotion and table splitting then
+      // as a last ditch effort, re-run the repacker with it enabled.
+      DEBUG_MSG (SUBSET_REPACK, nullptr, "Failed to find a resolution. Re-running with extension promotion and table splitting enabled.");
+      return hb_resolve_graph_overflows (table_tag, max_rounds, true, sorted_graph);
+    }
+
     DEBUG_MSG (SUBSET_REPACK, nullptr, "Offset overflow resolution failed.");
     return false;
   }
@@ -388,7 +444,7 @@ template<typename T>
 inline hb_blob_t*
 hb_resolve_overflows (const T& packed,
                       hb_tag_t table_tag,
-                      unsigned max_rounds = 20,
+                      unsigned max_rounds = 32,
                       bool recalculate_extensions = false) {
   graph_t sorted_graph (packed);
   if (sorted_graph.in_error ())
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-sanitize.hh b/src/java.desktop/share/native/libharfbuzz/hb-sanitize.hh
index 3a6ec4fed9c..1f8ba32bae2 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-sanitize.hh
+++ b/src/java.desktop/share/native/libharfbuzz/hb-sanitize.hh
@@ -72,8 +72,8 @@
  *
  * === The sanitize() contract ===
  *
- * The sanitize() method of each object type shall return true if it's safe to
- * call other methods of the object, and %false otherwise.
+ * The sanitize() method of each object type shall return `true` if it's safe to
+ * call other methods of the object, and `false` otherwise.
  *
  * Note that what sanitize() checks for might align with what the specification
  * describes as valid table data, but does not have to be.  In particular, we
@@ -134,7 +134,10 @@ struct hb_sanitize_context_t :
   const char *get_name () { return "SANITIZE"; }
   template <typename T, typename F>
   bool may_dispatch (const T *obj HB_UNUSED, const F *format)
-  { return format->sanitize (this); }
+  {
+    return format->sanitize (this) &&
+           hb_barrier ();
+  }
   static return_t default_return_value () { return true; }
   static return_t no_dispatch_return_value () { return false; }
   bool stop_sublookup_iteration (const return_t r) const { return !r; }
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-serialize.hh b/src/java.desktop/share/native/libharfbuzz/hb-serialize.hh
index 675eb03cadf..704d0ffd12b 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-serialize.hh
+++ b/src/java.desktop/share/native/libharfbuzz/hb-serialize.hh
@@ -36,9 +36,7 @@
 #include "hb-map.hh"
 #include "hb-pool.hh"
 
-#ifdef HB_EXPERIMENTAL_API
-#include "hb-subset-repacker.h"
-#endif
+#include "hb-subset-serialize.h"
 
 /*
  * Serialize
@@ -75,23 +73,41 @@ struct hb_serialize_context_t
 
     object_t () = default;
 
-#ifdef HB_EXPERIMENTAL_API
-    object_t (const hb_object_t &o)
+    object_t (const hb_subset_serialize_object_t &o)
     {
       head = o.head;
       tail = o.tail;
       next = nullptr;
-      real_links.alloc (o.num_real_links, true);
+      real_links.alloc_exact (o.num_real_links);
       for (unsigned i = 0 ; i < o.num_real_links; i++)
         real_links.push (o.real_links[i]);
 
-      virtual_links.alloc (o.num_virtual_links, true);
+      virtual_links.alloc_exact (o.num_virtual_links);
       for (unsigned i = 0; i < o.num_virtual_links; i++)
         virtual_links.push (o.virtual_links[i]);
     }
-#endif
 
-    friend void swap (object_t& a, object_t& b)
+    bool add_virtual_link (objidx_t objidx)
+    {
+      if (!objidx)
+        return false;
+
+      auto& link = *virtual_links.push ();
+      if (virtual_links.in_error ())
+        return false;
+
+      link.objidx = objidx;
+      // Remaining fields were previously zero'd by push():
+      // link.width = 0;
+      // link.is_signed = 0;
+      // link.whence = 0;
+      // link.position = 0;
+      // link.bias = 0;
+
+      return true;
+    }
+
+    friend void swap (object_t& a, object_t& b) noexcept
     {
       hb_swap (a.head, b.head);
       hb_swap (a.tail, b.tail);
@@ -128,8 +144,7 @@ struct hb_serialize_context_t
 
       link_t () = default;
 
-#ifdef HB_EXPERIMENTAL_API
-      link_t (const hb_link_t &o)
+      link_t (const hb_subset_serialize_link_t &o)
       {
         width = o.width;
         is_signed = 0;
@@ -138,7 +153,6 @@ struct hb_serialize_context_t
         bias = 0;
         objidx = o.objidx;
       }
-#endif
 
       HB_INTERNAL static int cmp (const void* a, const void* b)
       {
@@ -156,9 +170,9 @@ struct hb_serialize_context_t
     object_t *next;
 
     auto all_links () const HB_AUTO_RETURN
-        (( hb_concat (this->real_links, this->virtual_links) ));
+        (( hb_concat (real_links, virtual_links) ));
     auto all_links_writer () HB_AUTO_RETURN
-        (( hb_concat (this->real_links.writer (), this->virtual_links.writer ()) ));
+        (( hb_concat (real_links.writer (), virtual_links.writer ()) ));
   };
 
   struct snapshot_t
@@ -380,6 +394,7 @@ struct hb_serialize_context_t
       {
         merge_virtual_links (obj, objidx);
         obj->fini ();
+        object_pool.release (obj);
         return objidx;
       }
     }
@@ -443,9 +458,11 @@ struct hb_serialize_context_t
     while (packed.length > 1 &&
            packed.tail ()->head < tail)
     {
-      packed_map.del (packed.tail ());
-      assert (!packed.tail ()->next);
-      packed.tail ()->fini ();
+      object_t *obj = packed.tail ();
+      packed_map.del (obj);
+      assert (!obj->next);
+      obj->fini ();
+      object_pool.release (obj);
       packed.pop ();
     }
     if (packed.length > 1)
@@ -469,16 +486,40 @@ struct hb_serialize_context_t
 
     assert (current);
 
-    auto& link = *current->virtual_links.push ();
-    if (current->virtual_links.in_error ())
+    if (!current->add_virtual_link(objidx))
       err (HB_SERIALIZE_ERROR_OTHER);
+  }
 
-    link.width = 0;
-    link.objidx = objidx;
-    link.is_signed = 0;
-    link.whence = 0;
-    link.position = 0;
-    link.bias = 0;
+  objidx_t last_added_child_index() const {
+    if (unlikely (in_error ())) return (objidx_t) -1;
+
+    assert (current);
+    if (!bool(current->real_links)) {
+      return (objidx_t) -1;
+    }
+
+    return current->real_links[current->real_links.length - 1].objidx;
+  }
+
+  // For the current object ensure that the sub-table bytes for child objidx are always placed
+  // after the subtable bytes for any other existing children. This only ensures that the
+  // repacker will not move the target subtable before the other children
+  // (by adding virtual links). It is up to the caller to ensure the initial serialization
+  // order is correct.
+  void repack_last(objidx_t objidx) {
+    if (unlikely (in_error ())) return;
+
+    if (!objidx)
+      return;
+
+    assert (current);
+    for (auto& l : current->real_links) {
+      if (l.objidx == objidx) {
+        continue;
+      }
+
+      packed[l.objidx]->add_virtual_link(objidx);
+    }
   }
 
   template <typename T>
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-set-digest.hh b/src/java.desktop/share/native/libharfbuzz/hb-set-digest.hh
index c1e107b4c29..7bd14a28193 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-set-digest.hh
+++ b/src/java.desktop/share/native/libharfbuzz/hb-set-digest.hh
@@ -56,7 +56,7 @@
  *   - For each glyph, if it doesn't match the subtable digest,
  *     skip it.
  *
- * The main filter we use is a combination of three bits-pattern
+ * The main filter we use is a combination of four bits-pattern
  * filters. A bits-pattern filter checks a number of bits (5 or 6)
  * of the input number (glyph-id in this case) and checks whether
  * its pattern is amongst the patterns of any of the accepted values.
@@ -64,43 +64,60 @@
  * check is done using four bitwise operations only.
  */
 
-template <typename mask_t, unsigned int shift>
-struct hb_set_digest_bits_pattern_t
+static constexpr unsigned hb_set_digest_shifts[] = {4, 0, 6};
+
+struct hb_set_digest_t
 {
+  // No science in these. Intuition and testing only.
+  using mask_t = uint64_t;
+
+  static constexpr unsigned n = ARRAY_LENGTH_CONST (hb_set_digest_shifts);
   static constexpr unsigned mask_bytes = sizeof (mask_t);
   static constexpr unsigned mask_bits = sizeof (mask_t) * 8;
-  static constexpr unsigned num_bits = 0
-                                     + (mask_bytes >= 1 ? 3 : 0)
-                                     + (mask_bytes >= 2 ? 1 : 0)
-                                     + (mask_bytes >= 4 ? 1 : 0)
-                                     + (mask_bytes >= 8 ? 1 : 0)
-                                     + (mask_bytes >= 16? 1 : 0)
-                                     + 0;
+  static constexpr hb_codepoint_t mb1 = mask_bits - 1;
+  static constexpr mask_t one = 1;
+  static constexpr mask_t all = (mask_t) -1;
 
-  static_assert ((shift < sizeof (hb_codepoint_t) * 8), "");
-  static_assert ((shift + num_bits <= sizeof (hb_codepoint_t) * 8), "");
+  void init ()
+  { for (unsigned i = 0; i < n; i++) masks[i] = 0; }
 
-  void init () { mask = 0; }
+  void clear () { init (); }
 
-  void add (const hb_set_digest_bits_pattern_t &o) { mask |= o.mask; }
+  static hb_set_digest_t full ()
+  {
+    hb_set_digest_t d;
+    for (unsigned i = 0; i < n; i++) d.masks[i] = all;
+    return d;
+  }
 
-  void add (hb_codepoint_t g) { mask |= mask_for (g); }
+  void union_ (const hb_set_digest_t &o)
+  { for (unsigned i = 0; i < n; i++) masks[i] |= o.masks[i]; }
 
   bool add_range (hb_codepoint_t a, hb_codepoint_t b)
   {
-    if (mask == (mask_t) -1) return false;
-    if ((b >> shift) - (a >> shift) >= mask_bits - 1)
+    bool ret;
+
+    ret = false;
+    for (unsigned i = 0; i < n; i++)
+      if (masks[i] != all)
+        ret = true;
+    if (!ret) return false;
+
+    ret = false;
+    for (unsigned i = 0; i < n; i++)
     {
-      mask = (mask_t) -1;
-      return false;
-    }
-    else
-    {
-      mask_t ma = mask_for (a);
-      mask_t mb = mask_for (b);
-      mask |= mb + (mb - ma) - (mb < ma);
-      return true;
+      mask_t shift = hb_set_digest_shifts[i];
+      if ((b >> shift) - (a >> shift) >= mb1)
+        masks[i] = all;
+      else
+      {
+        mask_t ma = one << ((a >> shift) & mb1);
+        mask_t mb = one << ((b >> shift) & mb1);
+        masks[i] |= mb + (mb - ma) - (mb < ma);
+        ret = true;
+      }
     }
+    return ret;
   }
 
   template <typename T>
@@ -123,95 +140,37 @@ struct hb_set_digest_bits_pattern_t
   template <typename T>
   bool add_sorted_array (const hb_sorted_array_t<const T>& arr) { return add_sorted_array (&arr, arr.len ()); }
 
-  bool may_have (const hb_set_digest_bits_pattern_t &o) const
-  { return mask & o.mask; }
+  bool operator [] (hb_codepoint_t g) const
+  { return may_have (g); }
 
-  bool may_have (hb_codepoint_t g) const
-  { return mask & mask_for (g); }
-
-  private:
-
-  static mask_t mask_for (hb_codepoint_t g)
-  { return ((mask_t) 1) << ((g >> shift) & (mask_bits - 1)); }
-  mask_t mask;
-};
-
-template <typename head_t, typename tail_t>
-struct hb_set_digest_combiner_t
-{
-  void init ()
-  {
-    head.init ();
-    tail.init ();
-  }
-
-  void add (const hb_set_digest_combiner_t &o)
-  {
-    head.add (o.head);
-    tail.add (o.tail);
-  }
 
   void add (hb_codepoint_t g)
   {
-    head.add (g);
-    tail.add (g);
-  }
-
-  bool add_range (hb_codepoint_t a, hb_codepoint_t b)
-  {
-    return (int) head.add_range (a, b) | (int) tail.add_range (a, b);
-  }
-  template <typename T>
-  void add_array (const T *array, unsigned int count, unsigned int stride=sizeof(T))
-  {
-    head.add_array (array, count, stride);
-    tail.add_array (array, count, stride);
-  }
-  template <typename T>
-  void add_array (const hb_array_t<const T>& arr) { add_array (&arr, arr.len ()); }
-  template <typename T>
-  bool add_sorted_array (const T *array, unsigned int count, unsigned int stride=sizeof(T))
-  {
-    return head.add_sorted_array (array, count, stride) &&
-           tail.add_sorted_array (array, count, stride);
-  }
-  template <typename T>
-  bool add_sorted_array (const hb_sorted_array_t<const T>& arr) { return add_sorted_array (&arr, arr.len ()); }
-
-  bool may_have (const hb_set_digest_combiner_t &o) const
-  {
-    return head.may_have (o.head) && tail.may_have (o.tail);
+    for (unsigned i = 0; i < n; i++)
+      masks[i] |= one << ((g >> hb_set_digest_shifts[i]) & mb1);
   }
 
+  HB_ALWAYS_INLINE
   bool may_have (hb_codepoint_t g) const
   {
-    return head.may_have (g) && tail.may_have (g);
+    for (unsigned i = 0; i < n; i++)
+      if (!(masks[i] & (one << ((g >> hb_set_digest_shifts[i]) & mb1))))
+        return false;
+    return true;
+  }
+
+  bool may_intersect (const hb_set_digest_t &o) const
+  {
+    for (unsigned i = 0; i < n; i++)
+      if (!(masks[i] & o.masks[i]))
+        return false;
+    return true;
   }
 
   private:
-  head_t head;
-  tail_t tail;
+
+  mask_t masks[n] = {};
 };
 
 
-/*
- * hb_set_digest_t
- *
- * This is a combination of digests that performs "best".
- * There is not much science to this: it's a result of intuition
- * and testing.
- */
-using hb_set_digest_t =
-  hb_set_digest_combiner_t
-  <
-    hb_set_digest_bits_pattern_t<unsigned long, 4>,
-    hb_set_digest_combiner_t
-    <
-      hb_set_digest_bits_pattern_t<unsigned long, 0>,
-      hb_set_digest_bits_pattern_t<unsigned long, 9>
-    >
-  >
-;
-
-
 #endif /* HB_SET_DIGEST_HH */
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-set.hh b/src/java.desktop/share/native/libharfbuzz/hb-set.hh
index 4aa682616a2..eaa892ab9f5 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-set.hh
+++ b/src/java.desktop/share/native/libharfbuzz/hb-set.hh
@@ -35,6 +35,8 @@
 template <typename impl_t>
 struct hb_sparseset_t
 {
+  static constexpr bool realloc_move = true;
+
   hb_object_header_t header;
   impl_t s;
 
@@ -42,10 +44,10 @@ struct hb_sparseset_t
   ~hb_sparseset_t () { fini (); }
 
   hb_sparseset_t (const hb_sparseset_t& other) : hb_sparseset_t () { set (other); }
-  hb_sparseset_t (hb_sparseset_t&& other) : hb_sparseset_t () { s = std::move (other.s); }
+  hb_sparseset_t (hb_sparseset_t&& other)  noexcept : hb_sparseset_t () { s = std::move (other.s); }
   hb_sparseset_t& operator = (const hb_sparseset_t& other) { set (other); return *this; }
-  hb_sparseset_t& operator = (hb_sparseset_t&& other) { s = std::move (other.s); return *this; }
-  friend void swap (hb_sparseset_t& a, hb_sparseset_t& b) { hb_swap (a.s, b.s); }
+  hb_sparseset_t& operator = (hb_sparseset_t&& other)  noexcept { s = std::move (other.s); return *this; }
+  friend void swap (hb_sparseset_t& a, hb_sparseset_t& b)  noexcept { hb_swap (a.s, b.s); }
 
   hb_sparseset_t (std::initializer_list<hb_codepoint_t> lst) : hb_sparseset_t ()
   {
@@ -84,7 +86,7 @@ struct hb_sparseset_t
   uint32_t hash () const { return s.hash (); }
 
   void add (hb_codepoint_t g) { s.add (g); }
-  bool add_range (hb_codepoint_t a, hb_codepoint_t b) { return s.add_range (a, b); }
+  bool add_range (hb_codepoint_t first, hb_codepoint_t last) { return s.add_range (first, last); }
 
   template <typename T>
   void add_array (const T *array, unsigned int count, unsigned int stride=sizeof(T))
@@ -104,6 +106,7 @@ struct hb_sparseset_t
   void del_range (hb_codepoint_t a, hb_codepoint_t b) { s.del_range (a, b); }
 
   bool get (hb_codepoint_t g) const { return s.get (g); }
+  bool may_have (hb_codepoint_t g) const { return get (g); }
 
   /* Has interface. */
   bool operator [] (hb_codepoint_t k) const { return get (k); }
@@ -118,6 +121,9 @@ struct hb_sparseset_t
   hb_sparseset_t& operator << (const hb_codepoint_pair_t& range)
   { add_range (range.first, range.second); return *this; }
 
+  bool may_intersect (const hb_sparseset_t &other) const
+  { return s.may_intersect (other.s); }
+
   bool intersects (hb_codepoint_t first, hb_codepoint_t last) const
   { return s.intersects (first, last); }
 
@@ -164,7 +170,7 @@ struct hb_set_t : hb_sparseset_t<hb_bit_set_invertible_t>
   ~hb_set_t () = default;
   hb_set_t () : sparseset () {};
   hb_set_t (const hb_set_t &o) : sparseset ((sparseset &) o) {};
-  hb_set_t (hb_set_t&& o) : sparseset (std::move ((sparseset &) o)) {}
+  hb_set_t (hb_set_t&& o)  noexcept : sparseset (std::move ((sparseset &) o)) {}
   hb_set_t& operator = (const hb_set_t&) = default;
   hb_set_t& operator = (hb_set_t&&) = default;
   hb_set_t (std::initializer_list<hb_codepoint_t> lst) : sparseset (lst) {}
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-shape-plan.cc b/src/java.desktop/share/native/libharfbuzz/hb-shape-plan.cc
index 970aaa0b40b..19188f8006a 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-shape-plan.cc
+++ b/src/java.desktop/share/native/libharfbuzz/hb-shape-plan.cc
@@ -233,7 +233,7 @@ hb_shape_plan_create2 (hb_face_t                     *face,
                   num_coords,
                   shaper_list);
 
-  if (unlikely (props->direction == HB_DIRECTION_INVALID))
+  if (unlikely (!HB_DIRECTION_IS_VALID (props->direction)))
     return hb_shape_plan_get_empty ();
 
   hb_shape_plan_t *shape_plan;
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-shape.h b/src/java.desktop/share/native/libharfbuzz/hb-shape.h
index bf7eafd2b4f..294105d3cb0 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-shape.h
+++ b/src/java.desktop/share/native/libharfbuzz/hb-shape.h
@@ -53,6 +53,7 @@ hb_shape_full (hb_font_t          *font,
                unsigned int        num_features,
                const char * const *shaper_list);
 
+#ifdef HB_EXPERIMENTAL_API
 HB_EXTERN hb_bool_t
 hb_shape_justify (hb_font_t          *font,
                   hb_buffer_t        *buffer,
@@ -64,6 +65,7 @@ hb_shape_justify (hb_font_t          *font,
                   float              *advance, /* IN/OUT */
                   hb_tag_t           *var_tag, /* OUT */
                   float              *var_value /* OUT */);
+#endif
 
 HB_EXTERN const char **
 hb_shape_list_shapers (void);
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-style.cc b/src/java.desktop/share/native/libharfbuzz/hb-style.cc
index 20d4696b926..7378a8895f4 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-style.cc
+++ b/src/java.desktop/share/native/libharfbuzz/hb-style.cc
@@ -61,8 +61,8 @@ _hb_ratio_to_angle (float r)
  * @style_tag: a style tag.
  *
  * Searches variation axes of a #hb_font_t object for a specific axis first,
- * if not set, then tries to get default style values from different
- * tables of the font.
+ * if not set, first tries to get default style values in `STAT` table
+ * then tries to polyfill from different tables of the font.
  *
  * Returns: Corresponding axis or default value to a style tag.
  *
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-subset-cff-common.hh b/src/java.desktop/share/native/libharfbuzz/hb-subset-cff-common.hh
index 4213f7e71c5..62206e0f5aa 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-subset-cff-common.hh
+++ b/src/java.desktop/share/native/libharfbuzz/hb-subset-cff-common.hh
@@ -115,7 +115,7 @@ struct str_encoder_t
       encode_byte (OpCode_BCD);
 
       // Based on:
-      // https://github.com/fonttools/fonttools/blob/97ed3a61cde03e17b8be36f866192fbd56f1d1a7/Lib/fontTools/misc/psCharStrings.py#L265-L294
+      // https://github.com/fonttools/fonttools/blob/0738c41dfbcbc213ab9263f486ef0cccc6eb5ce5/Lib/fontTools/misc/psCharStrings.py#L267-L316
 
       char buf[16];
       /* FontTools has the following comment:
@@ -133,6 +133,10 @@ struct str_encoder_t
       (void) hb_uselocale (((void) freelocale (clocale), oldlocale));
 
       char *s = buf;
+      size_t len;
+      char *comma = strchr (s, ',');
+      if (comma) // Comma for some European locales in case no uselocale available.
+        *comma = '.';
       if (s[0] == '0' && s[1] == '.')
         s++;
       else if (s[0] == '-' && s[1] == '0' && s[2] == '.')
@@ -140,6 +144,45 @@ struct str_encoder_t
         s[1] = '-';
         s++;
       }
+      else if ((len = strlen (s)) > 3 && !strcmp (s + len - 3, "000"))
+      {
+        unsigned exponent = len - 3;
+        char *s2 = s + exponent - 1;
+        while (*s2 == '0' && exponent > 1)
+        {
+          s2--;
+          exponent++;
+        }
+        snprintf (s2 + 1, sizeof (buf) - (s2 + 1 - buf), "E%u", exponent);
+      }
+      else
+      {
+        char *dot = strchr (s, '.');
+        char *e = strchr (s, 'E');
+        if (dot && e)
+        {
+          memmove (dot, dot + 1, e - (dot + 1));
+          int exponent = atoi (e + 1);
+          int new_exponent = exponent - (e - (dot + 1));
+          if (new_exponent == 1)
+          {
+            e[-1] = '0';
+            e[0] = '\0';
+          }
+          else
+            snprintf (e - 1, sizeof (buf) - (e - 1 - buf), "E%d", new_exponent);
+        }
+      }
+      if ((s[0] == '.' && s[1] == '0') || (s[0] == '-' && s[1] == '.' && s[2] == '0'))
+      {
+        int sign = s[0] == '-';
+        char *s2 = s + sign + 1;
+        while (*s2 == '0')
+          s2++;
+        len = strlen (s2);
+        memmove (s + sign, s2, len);
+        snprintf (s + sign + len, sizeof (buf) - (s + sign + len - buf), "E-%u", (unsigned) (strlen (s + sign) - 1));
+      }
       hb_vector_t<char> nibbles;
       while (*s)
       {
@@ -155,20 +198,22 @@ struct str_encoder_t
             {
               s++;
               nibbles.push (0x0C); // E-
-              continue;
+            } else {
+              if (c2 == '+')
+                s++;
+              nibbles.push (0x0B); // E
             }
-            if (c2 == '+')
+            if (*s == '0')
               s++;
-            nibbles.push (0x0B); // E
             continue;
           }
 
-          case '.': case ',': // Comma for some European locales in case no uselocale available.
+          case '.':
             nibbles.push (0x0A); // .
             continue;
 
           case '-':
-            nibbles.push (0x0E); // .
+            nibbles.push (0x0E); // -
             continue;
         }
 
@@ -1083,7 +1128,7 @@ struct subr_subsetter_t
       if (opstr.op == OpCode_callsubr || opstr.op == OpCode_callgsubr)
         size += 3;
     }
-    if (!buff.alloc (buff.length + size, true))
+    if (!buff.alloc_exact (buff.length + size))
       return false;
 
     for (auto &opstr : str.values)
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-subset-cff1.cc b/src/java.desktop/share/native/libharfbuzz/hb-subset-cff1.cc
index 780bf34efaf..4938c048d6d 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-subset-cff1.cc
+++ b/src/java.desktop/share/native/libharfbuzz/hb-subset-cff1.cc
@@ -45,7 +45,7 @@ struct remap_sid_t
   void alloc (unsigned size)
   {
     map.alloc (size);
-    vector.alloc (size, true);
+    vector.alloc_exact (size);
   }
 
   bool in_error () const
@@ -620,6 +620,12 @@ struct cff1_subset_plan
     drop_hints = plan->flags & HB_SUBSET_FLAGS_NO_HINTING;
     desubroutinize = plan->flags & HB_SUBSET_FLAGS_DESUBROUTINIZE;
 
+ #ifdef HB_EXPERIMENTAL_API
+    min_charstrings_off_size = (plan->flags & HB_SUBSET_FLAGS_IFTB_REQUIREMENTS) ? 4 : 0;
+ #else
+    min_charstrings_off_size = 0;
+ #endif
+
     subset_charset = !acc.is_predef_charset ();
     if (!subset_charset)
       /* check whether the subset renumbers any glyph IDs */
@@ -778,13 +784,43 @@ struct cff1_subset_plan
   unsigned int  topDictModSIDs[name_dict_values_t::ValCount];
 
   bool          desubroutinize = false;
+
+  unsigned      min_charstrings_off_size = 0;
 };
 } // namespace OT
 
+static bool _serialize_cff1_charstrings (hb_serialize_context_t *c,
+                                         struct OT::cff1_subset_plan &plan,
+                                         const OT::cff1::accelerator_subset_t  &acc)
+{
+  c->push<CFF1CharStrings> ();
+
+  unsigned data_size = 0;
+  unsigned total_size = CFF1CharStrings::total_size (plan.subset_charstrings, &data_size, plan.min_charstrings_off_size);
+  if (unlikely (!c->start_zerocopy (total_size)))
+    return false;
+
+  auto *cs = c->start_embed<CFF1CharStrings> ();
+  if (unlikely (!cs->serialize (c, plan.subset_charstrings, &data_size, plan.min_charstrings_off_size))) {
+    c->pop_discard ();
+    return false;
+  }
+
+  plan.info.char_strings_link = c->pop_pack (false);
+  return true;
+}
+
 bool
 OT::cff1::accelerator_subset_t::serialize (hb_serialize_context_t *c,
                                            struct OT::cff1_subset_plan &plan) const
 {
+  /* push charstrings onto the object stack first which will ensure it packs as the last
+     object in the table. Keeping the chastrings last satisfies the requirements for patching
+     via IFTB. If this ordering needs to be changed in the future, charstrings should be left
+     at the end whenever HB_SUBSET_FLAGS_ITFB_REQUIREMENTS is enabled. */
+  if (!_serialize_cff1_charstrings(c, plan, *this))
+    return false;
+
   /* private dicts & local subrs */
   for (int i = (int) privateDicts.length; --i >= 0 ;)
   {
@@ -823,25 +859,6 @@ OT::cff1::accelerator_subset_t::serialize (hb_serialize_context_t *c,
   if (!is_CID ())
     plan.info.privateDictInfo = plan.fontdicts_mod[0].privateDictInfo;
 
-  /* CharStrings */
-  {
-    c->push<CFF1CharStrings> ();
-
-    unsigned data_size = 0;
-    unsigned total_size = CFF1CharStrings::total_size (plan.subset_charstrings, &data_size);
-    if (unlikely (!c->start_zerocopy (total_size)))
-       return false;
-
-    auto *cs = c->start_embed<CFF1CharStrings> ();
-    if (likely (cs->serialize (c, plan.subset_charstrings, &data_size)))
-      plan.info.char_strings_link = c->pop_pack (false);
-    else
-    {
-      c->pop_discard ();
-      return false;
-    }
-  }
-
   /* FDArray (FD Index) */
   if (fdArray != &Null (CFF1FDArray))
   {
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-subset-cff2.cc b/src/java.desktop/share/native/libharfbuzz/hb-subset-cff2.cc
index 1f9bc209e88..1074d240386 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-subset-cff2.cc
+++ b/src/java.desktop/share/native/libharfbuzz/hb-subset-cff2.cc
@@ -248,7 +248,7 @@ struct cff2_subr_subsetter_t : subr_subsetter_t<cff2_subr_subsetter_t, CFF2Subrs
 struct cff2_private_blend_encoder_param_t
 {
   cff2_private_blend_encoder_param_t (hb_serialize_context_t *c,
-                                      const CFF2VariationStore *varStore,
+                                      const CFF2ItemVariationStore *varStore,
                                       hb_array_t<int> normalized_coords) :
     c (c), varStore (varStore), normalized_coords (normalized_coords) {}
 
@@ -284,7 +284,7 @@ struct cff2_private_blend_encoder_param_t
   unsigned ivs = 0;
   unsigned region_count = 0;
   hb_vector_t<float> scalars;
-  const  CFF2VariationStore *varStore = nullptr;
+  const  CFF2ItemVariationStore *varStore = nullptr;
   hb_array_t<int> normalized_coords;
 };
 
@@ -378,7 +378,7 @@ struct cff2_private_dict_blend_opset_t : dict_opset_t
 struct cff2_private_dict_op_serializer_t : op_serializer_t
 {
   cff2_private_dict_op_serializer_t (bool desubroutinize_, bool drop_hints_, bool pinned_,
-                                     const CFF::CFF2VariationStore* varStore_,
+                                     const CFF::CFF2ItemVariationStore* varStore_,
                                      hb_array_t<int> normalized_coords_)
     : desubroutinize (desubroutinize_), drop_hints (drop_hints_), pinned (pinned_),
       varStore (varStore_), normalized_coords (normalized_coords_) {}
@@ -416,7 +416,7 @@ struct cff2_private_dict_op_serializer_t : op_serializer_t
   const bool desubroutinize;
   const bool drop_hints;
   const bool pinned;
-  const CFF::CFF2VariationStore* varStore;
+  const CFF::CFF2ItemVariationStore* varStore;
   hb_array_t<int> normalized_coords;
 };
 
@@ -439,6 +439,12 @@ struct cff2_subset_plan
     desubroutinize = plan->flags & HB_SUBSET_FLAGS_DESUBROUTINIZE ||
                      pinned; // For instancing we need this path
 
+ #ifdef HB_EXPERIMENTAL_API
+    min_charstrings_off_size = (plan->flags & HB_SUBSET_FLAGS_IFTB_REQUIREMENTS) ? 4 : 0;
+ #else
+    min_charstrings_off_size = 0;
+ #endif
+
     if (desubroutinize)
     {
       /* Flatten global & local subrs */
@@ -510,14 +516,45 @@ struct cff2_subset_plan
 
   bool      drop_hints = false;
   bool      desubroutinize = false;
+
+  unsigned  min_charstrings_off_size = 0;
 };
 } // namespace OT
 
+static bool _serialize_cff2_charstrings (hb_serialize_context_t *c,
+                             cff2_subset_plan &plan,
+                             const OT::cff2::accelerator_subset_t  &acc)
+{
+  c->push ();
+
+  unsigned data_size = 0;
+  unsigned total_size = CFF2CharStrings::total_size (plan.subset_charstrings, &data_size, plan.min_charstrings_off_size);
+  if (unlikely (!c->start_zerocopy (total_size)))
+    return false;
+
+  auto *cs = c->start_embed<CFF2CharStrings> ();
+  if (unlikely (!cs->serialize (c, plan.subset_charstrings, &data_size, plan.min_charstrings_off_size)))
+  {
+    c->pop_discard ();
+    return false;
+  }
+
+  plan.info.char_strings_link = c->pop_pack (false);
+  return true;
+}
+
 bool
 OT::cff2::accelerator_subset_t::serialize (hb_serialize_context_t *c,
                                            struct cff2_subset_plan &plan,
                                            hb_array_t<int> normalized_coords) const
 {
+  /* push charstrings onto the object stack first which will ensure it packs as the last
+     object in the table. Keeping the chastrings last satisfies the requirements for patching
+     via IFTB. If this ordering needs to be changed in the future, charstrings should be left
+     at the end whenever HB_SUBSET_FLAGS_ITFB_REQUIREMENTS is enabled. */
+  if (!_serialize_cff2_charstrings(c, plan, *this))
+    return false;
+
   /* private dicts & local subrs */
   hb_vector_t<table_info_t>  private_dict_infos;
   if (unlikely (!private_dict_infos.resize (plan.subset_fdcount))) return false;
@@ -556,25 +593,6 @@ OT::cff2::accelerator_subset_t::serialize (hb_serialize_context_t *c,
     }
   }
 
-  /* CharStrings */
-  {
-    c->push ();
-
-    unsigned data_size = 0;
-    unsigned total_size = CFF2CharStrings::total_size (plan.subset_charstrings, &data_size);
-    if (unlikely (!c->start_zerocopy (total_size)))
-       return false;
-
-    auto *cs = c->start_embed<CFF2CharStrings> ();
-    if (likely (cs->serialize (c, plan.subset_charstrings, &data_size)))
-      plan.info.char_strings_link = c->pop_pack (false);
-    else
-    {
-      c->pop_discard ();
-      return false;
-    }
-  }
-
   /* FDSelect */
   if (fdSelect != &Null (CFF2FDSelect))
   {
@@ -610,10 +628,10 @@ OT::cff2::accelerator_subset_t::serialize (hb_serialize_context_t *c,
   }
 
   /* variation store */
-  if (varStore != &Null (CFF2VariationStore) &&
+  if (varStore != &Null (CFF2ItemVariationStore) &&
       !plan.pinned)
   {
-    auto *dest = c->push<CFF2VariationStore> ();
+    auto *dest = c->push<CFF2ItemVariationStore> ();
     if (unlikely (!dest->serialize (c, varStore)))
     {
       c->pop_discard ();
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-subset-input.cc b/src/java.desktop/share/native/libharfbuzz/hb-subset-input.cc
index 8c67f7f23f4..bbe50b1fb36 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-subset-input.cc
+++ b/src/java.desktop/share/native/libharfbuzz/hb-subset-input.cc
@@ -24,6 +24,7 @@
  * Google Author(s): Garret Rieger, Rod Sheeter, Behdad Esfahbod
  */
 
+#include "hb-subset-instancer-solver.hh"
 #include "hb-subset.hh"
 #include "hb-set.hh"
 #include "hb-utf.hh"
@@ -50,7 +51,6 @@ hb_subset_input_t::hb_subset_input_t ()
     HB_TAG ('k', 'e', 'r', 'n'),
 
     // Copied from fontTools:
-    HB_TAG ('B', 'A', 'S', 'E'),
     HB_TAG ('J', 'S', 'T', 'F'),
     HB_TAG ('D', 'S', 'I', 'G'),
     HB_TAG ('E', 'B', 'D', 'T'),
@@ -123,6 +123,12 @@ hb_subset_input_t::hb_subset_input_t ()
     //justify
     HB_TAG ('j', 'a', 'l', 't'), // HarfBuzz doesn't use; others might
 
+    //East Asian spacing
+    HB_TAG ('c', 'h', 'w', 's'),
+    HB_TAG ('v', 'c', 'h', 'w'),
+    HB_TAG ('h', 'a', 'l', 't'),
+    HB_TAG ('v', 'h', 'a', 'l'),
+
     //private
     HB_TAG ('H', 'a', 'r', 'f'),
     HB_TAG ('H', 'A', 'R', 'F'),
@@ -406,11 +412,52 @@ hb_subset_input_keep_everything (hb_subset_input_t *input)
   hb_subset_input_set_flags (input,
                              HB_SUBSET_FLAGS_NOTDEF_OUTLINE |
                              HB_SUBSET_FLAGS_GLYPH_NAMES |
+                             HB_SUBSET_FLAGS_NAME_LEGACY |
                              HB_SUBSET_FLAGS_NO_PRUNE_UNICODE_RANGES |
                              HB_SUBSET_FLAGS_PASSTHROUGH_UNRECOGNIZED);
 }
 
 #ifndef HB_NO_VAR
+/**
+ * hb_subset_input_pin_all_axes_to_default: (skip)
+ * @input: a #hb_subset_input_t object.
+ * @face: a #hb_face_t object.
+ *
+ * Pin all axes to default locations in the given subset input object.
+ *
+ * All axes in a font must be pinned. Additionally, `CFF2` table, if present,
+ * will be de-subroutinized.
+ *
+ * Return value: `true` if success, `false` otherwise
+ *
+ * Since: 8.3.1
+ **/
+HB_EXTERN hb_bool_t
+hb_subset_input_pin_all_axes_to_default (hb_subset_input_t  *input,
+                                         hb_face_t          *face)
+{
+  unsigned axis_count = hb_ot_var_get_axis_count (face);
+  if (!axis_count) return false;
+
+  hb_ot_var_axis_info_t *axis_infos = (hb_ot_var_axis_info_t *) hb_calloc (axis_count, sizeof (hb_ot_var_axis_info_t));
+  if (unlikely (!axis_infos)) return false;
+
+  (void) hb_ot_var_get_axis_infos (face, 0, &axis_count, axis_infos);
+
+  for (unsigned i = 0; i < axis_count; i++)
+  {
+    hb_tag_t axis_tag = axis_infos[i].tag;
+    double default_val = (double) axis_infos[i].default_value;
+    if (!input->axes_location.set (axis_tag, Triple (default_val, default_val, default_val)))
+    {
+      hb_free (axis_infos);
+      return false;
+    }
+  }
+  hb_free (axis_infos);
+  return true;
+}
+
 /**
  * hb_subset_input_pin_axis_to_default: (skip)
  * @input: a #hb_subset_input_t object.
@@ -435,7 +482,7 @@ hb_subset_input_pin_axis_to_default (hb_subset_input_t  *input,
   if (!hb_ot_var_find_axis_info (face, axis_tag, &axis_info))
     return false;
 
-  float default_val = axis_info.default_value;
+  double default_val = (double) axis_info.default_value;
   return input->axes_location.set (axis_tag, Triple (default_val, default_val, default_val));
 }
 
@@ -465,37 +512,32 @@ hb_subset_input_pin_axis_location (hb_subset_input_t  *input,
   if (!hb_ot_var_find_axis_info (face, axis_tag, &axis_info))
     return false;
 
-  float val = hb_clamp(axis_value, axis_info.min_value, axis_info.max_value);
+  double val = hb_clamp((double) axis_value, (double) axis_info.min_value, (double) axis_info.max_value);
   return input->axes_location.set (axis_tag, Triple (val, val, val));
 }
 
-#ifdef HB_EXPERIMENTAL_API
 /**
  * hb_subset_input_set_axis_range: (skip)
  * @input: a #hb_subset_input_t object.
  * @face: a #hb_face_t object.
  * @axis_tag: Tag of the axis
- * @axis_min_value: Minimum value of the axis variation range to set
- * @axis_max_value: Maximum value of the axis variation range to set
- * @axis_def_value: Default value of the axis variation range to set, in case of
- * null, it'll be determined automatically
+ * @axis_min_value: Minimum value of the axis variation range to set, if NaN the existing min will be used.
+ * @axis_max_value: Maximum value of the axis variation range to set  if NaN the existing max will be used.
+ * @axis_def_value: Default value of the axis variation range to set, if NaN the existing default will be used.
  *
  * Restricting the range of variation on an axis in the given subset input object.
  * New min/default/max values will be clamped if they're not within the fvar axis range.
- * If the new default value is null:
- * If the fvar axis default value is within the new range, then new default
- * value is the same as original default value.
+ *
  * If the fvar axis default value is not within the new range, the new default
  * value will be changed to the new min or max value, whichever is closer to the fvar
  * axis default.
  *
  * Note: input min value can not be bigger than input max value. If the input
  * default value is not within the new min/max range, it'll be clamped.
- * Note: currently it supports gvar and cvar tables only.
  *
  * Return value: `true` if success, `false` otherwise
  *
- * XSince: EXPERIMENTAL
+ * Since: 8.5.0
  **/
 HB_EXTERN hb_bool_t
 hb_subset_input_set_axis_range (hb_subset_input_t  *input,
@@ -503,22 +545,195 @@ hb_subset_input_set_axis_range (hb_subset_input_t  *input,
                                 hb_tag_t            axis_tag,
                                 float               axis_min_value,
                                 float               axis_max_value,
-                                float              *axis_def_value /* IN, maybe NULL */)
+                                float               axis_def_value)
 {
-  if (axis_min_value > axis_max_value)
-    return false;
-
   hb_ot_var_axis_info_t axis_info;
   if (!hb_ot_var_find_axis_info (face, axis_tag, &axis_info))
     return false;
 
-  float new_min_val = hb_clamp(axis_min_value, axis_info.min_value, axis_info.max_value);
-  float new_max_val = hb_clamp(axis_max_value, axis_info.min_value, axis_info.max_value);
-  float new_default_val = axis_def_value ? *axis_def_value : axis_info.default_value;
-  new_default_val = hb_clamp(new_default_val, new_min_val, new_max_val);
-  return input->axes_location.set (axis_tag, Triple (new_min_val, new_default_val, new_max_val));
+  float min = !std::isnan(axis_min_value) ? axis_min_value : axis_info.min_value;
+  float max = !std::isnan(axis_max_value) ? axis_max_value : axis_info.max_value;
+  float def = !std::isnan(axis_def_value) ? axis_def_value : axis_info.default_value;
+
+  if (min > max)
+    return false;
+
+  float new_min_val = hb_clamp(min, axis_info.min_value, axis_info.max_value);
+  float new_max_val = hb_clamp(max, axis_info.min_value, axis_info.max_value);
+  float new_default_val = hb_clamp(def, new_min_val, new_max_val);
+  return input->axes_location.set (axis_tag, Triple ((double) new_min_val, (double) new_default_val, (double) new_max_val));
+}
+
+/**
+ * hb_subset_input_get_axis_range: (skip)
+ * @input: a #hb_subset_input_t object.
+ * @axis_tag: Tag of the axis
+ * @axis_min_value: Set to the previously configured minimum value of the axis variation range.
+ * @axis_max_value: Set to the previously configured maximum value of the axis variation range.
+ * @axis_def_value: Set to the previously configured default value of the axis variation range.
+ *
+ * Gets the axis range assigned by previous calls to hb_subset_input_set_axis_range.
+ *
+ * Return value: `true` if a range has been set for this axis tag, `false` otherwise.
+ *
+ * Since: 8.5.0
+ **/
+HB_EXTERN hb_bool_t
+hb_subset_input_get_axis_range (hb_subset_input_t  *input,
+                                hb_tag_t            axis_tag,
+                                float              *axis_min_value,
+                                float              *axis_max_value,
+                                float              *axis_def_value)
+
+{
+  Triple* triple;
+  if (!input->axes_location.has(axis_tag, &triple)) {
+    return false;
+  }
+
+  *axis_min_value = triple->minimum;
+  *axis_def_value = triple->middle;
+  *axis_max_value = triple->maximum;
+  return true;
+}
+
+/**
+ * hb_subset_axis_range_from_string:
+ * @str: a string to parse
+ * @len: length of @str, or -1 if str is NULL terminated
+ * @axis_min_value: (out): the axis min value to initialize with the parsed value
+ * @axis_max_value: (out): the axis max value to initialize with the parsed value
+ * @axis_def_value: (out): the axis default value to initialize with the parse
+ * value
+ *
+ * Parses a string into a subset axis range(min, def, max).
+ * Axis positions string is in the format of min:def:max or min:max
+ * When parsing axis positions, empty values as meaning the existing value for that part
+ * E.g: :300:500
+ * Specifies min = existing, def = 300, max = 500
+ * In the output axis_range, if a value should be set to it's default value,
+ * then it will be set to NaN
+ *
+ * Return value:
+ * `true` if @str is successfully parsed, `false` otherwise
+ *
+ * Since: 10.2.0
+ */
+HB_EXTERN hb_bool_t
+hb_subset_axis_range_from_string (const char *str, int len,
+                                  float *axis_min_value,
+                                  float *axis_max_value,
+                                  float *axis_def_value)
+{
+  if (len < 0)
+    len = strlen (str);
+
+  const char *end = str + len;
+  const char* part = strpbrk (str, ":");
+  if (!part)
+  {
+    // Single value.
+    if (strcmp (str, "drop") == 0)
+    {
+      *axis_min_value = NAN;
+      *axis_def_value = NAN;
+      *axis_max_value = NAN;
+      return true;
+    }
+
+    double v;
+    if (!hb_parse_double (&str, end, &v)) return false;
+
+    *axis_min_value = v;
+    *axis_def_value = v;
+    *axis_max_value = v;
+    return true;
+  }
+
+  float values[3];
+  int count = 0;
+  for (int i = 0; i < 3; i++) {
+    count++;
+    if (!*str || part == str)
+    {
+      values[i] = NAN;
+
+      if (part == NULL) break;
+      str = part + 1;
+      part = strpbrk (str, ":");
+      continue;
+    }
+
+    double v;
+    if (!hb_parse_double (&str, part, &v)) return false;
+    values[i] = v;
+
+    if (part == NULL) break;
+    str = part + 1;
+    part = strpbrk (str, ":");
+  }
+
+  if (count == 2)
+  {
+    *axis_min_value = values[0];
+    *axis_def_value = NAN;
+    *axis_max_value = values[1];
+    return true;
+  }
+  else if (count == 3)
+  {
+    *axis_min_value = values[0];
+    *axis_def_value = values[1];
+    *axis_max_value = values[2];
+    return true;
+  }
+  return false;
+}
+
+/**
+ * hb_subset_axis_range_to_string:
+ * @input: a #hb_subset_input_t object.
+ * @axis_tag: an axis to convert
+ * @buf: (array length=size) (out caller-allocates): output string
+ * @size: the allocated size of @buf
+ *
+ * Converts an axis range into a `NULL`-terminated string in the format
+ * understood by hb_subset_axis_range_from_string(). The client in responsible for
+ * allocating big enough size for @buf, 128 bytes is more than enough.
+ *
+ * Since: 10.2.0
+ */
+HB_EXTERN void
+hb_subset_axis_range_to_string (hb_subset_input_t *input,
+                                hb_tag_t axis_tag,
+                                char *buf, unsigned size)
+{
+  if (unlikely (!size)) return;
+  Triple* triple;
+  if (!input->axes_location.has(axis_tag, &triple)) {
+    return;
+  }
+
+  char s[128];
+  unsigned len = 0;
+
+  hb_locale_t clocale HB_UNUSED;
+  hb_locale_t oldlocale HB_UNUSED;
+  oldlocale = hb_uselocale (clocale = newlocale (LC_ALL_MASK, "C", NULL));
+  len += hb_max (0, snprintf (s, ARRAY_LENGTH (s) - len, "%g", (double) triple->minimum));
+  s[len++] = ':';
+
+  len += hb_max (0, snprintf (s + len, ARRAY_LENGTH (s) - len, "%g", (double) triple->middle));
+  s[len++] = ':';
+
+  len += hb_max (0, snprintf (s + len, ARRAY_LENGTH (s) - len, "%g", (double) triple->maximum));
+  (void) hb_uselocale (((void) freelocale (clocale), oldlocale));
+
+  assert (len < ARRAY_LENGTH (s));
+  len = hb_min (len, size - 1);
+  hb_memcpy (buf, s, len);
+  buf[len] = '\0';
 }
-#endif
 #endif
 
 /**
@@ -653,7 +868,7 @@ hb_subset_input_override_name_table (hb_subset_input_t  *input,
         src = hb_utf8_t::next (src, src_end, &unicode, replacement);
         if (unicode >= 0x0080u)
         {
-          printf ("Non-ascii character detected, ignored...This API supports acsii characters only for mac platform\n");
+          printf ("Non-ascii character detected, ignored...This API supports ascii characters only for mac platform\n");
           return false;
         }
       }
@@ -667,5 +882,4 @@ hb_subset_input_override_name_table (hb_subset_input_t  *input,
   input->name_table_overrides.set (hb_ot_name_record_ids_t (platform_id, encoding_id, language_id, name_id), name_bytes);
   return true;
 }
-
 #endif
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-subset-instancer-iup.hh b/src/java.desktop/share/native/libharfbuzz/hb-subset-instancer-iup.hh
new file mode 100644
index 00000000000..01987bd258d
--- /dev/null
+++ b/src/java.desktop/share/native/libharfbuzz/hb-subset-instancer-iup.hh
@@ -0,0 +1,37 @@
+/*
+ * Copyright © 2024  Google, Inc.
+ *
+ *  This is part of HarfBuzz, a text shaping library.
+ *
+ * Permission is hereby granted, without written agreement and without
+ * license or royalty fees, to use, copy, modify, and distribute this
+ * software and its documentation for any purpose, provided that the
+ * above copyright notice and the following two paragraphs appear in
+ * all copies of this software.
+ *
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
+ * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
+ * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
+ * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+ * DAMAGE.
+ *
+ * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
+ * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ * FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
+ * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
+ * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
+ */
+
+#ifndef HB_SUBSET_INSTANCER_IUP_HH
+#define HB_SUBSET_INSTANCER_IUP_HH
+
+#include "hb-subset-plan.hh"
+/* given contour points and deltas, optimize a set of referenced points within error
+ * tolerance. Returns optimized referenced point indices */
+HB_INTERNAL bool iup_delta_optimize (const contour_point_vector_t& contour_points,
+                                     const hb_vector_t<int>& x_deltas,
+                                     const hb_vector_t<int>& y_deltas,
+                                     hb_vector_t<bool>& opt_indices, /* OUT */
+                                     double tolerance = 0.0);
+
+#endif /* HB_SUBSET_INSTANCER_IUP_HH */
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-subset-instancer-solver.cc b/src/java.desktop/share/native/libharfbuzz/hb-subset-instancer-solver.cc
index 8ec36e3e80d..c67fee421c2 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-subset-instancer-solver.cc
+++ b/src/java.desktop/share/native/libharfbuzz/hb-subset-instancer-solver.cc
@@ -32,17 +32,17 @@
  * This should be safe.
  */
 
-constexpr static float EPSILON = 1.f / (1 << 14);
-constexpr static float MAX_F2DOT14 = float (0x7FFF) / (1 << 14);
+constexpr static double EPSILON = 1.0 / (1 << 14);
+constexpr static double MAX_F2DOT14 = double (0x7FFF) / (1 << 14);
 
 static inline Triple _reverse_negate(const Triple &v)
 { return {-v.maximum, -v.middle, -v.minimum}; }
 
 
-static inline float supportScalar (float coord, const Triple &tent)
+static inline double supportScalar (double coord, const Triple &tent)
 {
   /* Copied from VarRegionAxis::evaluate() */
-  float start = tent.minimum, peak = tent.middle, end = tent.maximum;
+  double start = tent.minimum, peak = tent.middle, end = tent.maximum;
 
   if (unlikely (start > peak || peak > end))
     return 1.;
@@ -62,20 +62,20 @@ static inline float supportScalar (float coord, const Triple &tent)
     return  (end - coord) / (end - peak);
 }
 
-static inline result_t
+static inline rebase_tent_result_t
 _solve (Triple tent, Triple axisLimit, bool negative = false)
 {
-  float axisMin = axisLimit.minimum;
-  float axisDef = axisLimit.middle;
-  float axisMax = axisLimit.maximum;
-  float lower = tent.minimum;
-  float peak  = tent.middle;
-  float upper = tent.maximum;
+  double axisMin = axisLimit.minimum;
+  double axisDef = axisLimit.middle;
+  double axisMax = axisLimit.maximum;
+  double lower = tent.minimum;
+  double peak  = tent.middle;
+  double upper = tent.maximum;
 
   // Mirror the problem such that axisDef <= peak
   if (axisDef > peak)
   {
-    result_t vec = _solve (_reverse_negate (tent),
+    rebase_tent_result_t vec = _solve (_reverse_negate (tent),
                            _reverse_negate (axisLimit),
                            !negative);
 
@@ -98,7 +98,7 @@ _solve (Triple tent, Triple axisLimit, bool negative = false)
    *    axisMin     axisDef    axisMax   lower     upper
    */
   if (axisMax <= lower && axisMax < peak)
-      return result_t{};  // No overlap
+      return rebase_tent_result_t{};  // No overlap
 
   /* case 2: Only the peak and outermost bound fall outside the new limit;
    * we keep the deltaset, update peak and outermost bound and scale deltas
@@ -130,10 +130,10 @@ _solve (Triple tent, Triple axisLimit, bool negative = false)
    */
   if (axisMax < peak)
   {
-    float mult = supportScalar (axisMax, tent);
+    double mult = supportScalar (axisMax, tent);
     tent = Triple{lower, axisMax, axisMax};
 
-    result_t vec = _solve (tent, axisLimit);
+    rebase_tent_result_t vec = _solve (tent, axisLimit);
 
     for (auto &p : vec)
       p = hb_pair (p.first * mult, p.second);
@@ -143,13 +143,13 @@ _solve (Triple tent, Triple axisLimit, bool negative = false)
 
   // lower <= axisDef <= peak <= axisMax
 
-  float gain = supportScalar (axisDef, tent);
-  result_t out {hb_pair (gain, Triple{})};
+  double gain = supportScalar (axisDef, tent);
+  rebase_tent_result_t out {hb_pair (gain, Triple{})};
 
   // First, the positive side
 
   // outGain is the scalar of axisMax at the tent.
-  float outGain = supportScalar (axisMax, tent);
+  double outGain = supportScalar (axisMax, tent);
 
   /* Case 3a: Gain is more than outGain. The tent down-slope crosses
    * the axis into negative. We have to split it into multiples.
@@ -168,13 +168,15 @@ _solve (Triple tent, Triple axisLimit, bool negative = false)
    *                           |
    *                      crossing
    */
-  if (gain > outGain)
+  if (gain >= outGain)
   {
-    // Crossing point on the axis.
-    float crossing = peak + (1 - gain) * (upper - peak);
+    // Note that this is the branch taken if both gain and outGain are 0.
 
-    Triple loc{axisDef, peak, crossing};
-    float scalar = 1.f;
+    // Crossing point on the axis.
+    double crossing = peak + (1 - gain) * (upper - peak);
+
+    Triple loc{hb_max (lower, axisDef), peak, crossing};
+    double scalar = 1.0;
 
     // The part before the crossing point.
     out.push (hb_pair (scalar - gain, loc));
@@ -189,7 +191,7 @@ _solve (Triple tent, Triple axisLimit, bool negative = false)
     if (upper >= axisMax)
     {
       Triple loc {crossing, axisMax, axisMax};
-      float scalar = outGain;
+      double scalar = outGain;
 
       out.push (hb_pair (scalar - gain, loc));
     }
@@ -219,11 +221,11 @@ _solve (Triple tent, Triple axisLimit, bool negative = false)
 
       // Downslope.
       Triple loc1 {crossing, upper, axisMax};
-      float scalar1 = 0.f;
+      double scalar1 = 0.0;
 
       // Eternity justify.
       Triple loc2 {upper, axisMax, axisMax};
-      float scalar2 = 0.f;
+      double scalar2 = 0.0;
 
       out.push (hb_pair (scalar1 - gain, loc1));
       out.push (hb_pair (scalar2 - gain, loc2));
@@ -252,9 +254,12 @@ _solve (Triple tent, Triple axisLimit, bool negative = false)
      *                    |      |  newUpper
      *              axisDef      axisMax
      */
-    float newUpper = peak + (1 - gain) * (upper - peak);
-    assert (axisMax <= newUpper);  // Because outGain >= gain
-    if (newUpper <= axisDef + (axisMax - axisDef) * 2)
+    double newUpper = peak + (1 - gain) * (upper - peak);
+    assert (axisMax <= newUpper);  // Because outGain > gain
+    /* Disabled because ots doesn't like us:
+     * https://github.com/fonttools/fonttools/issues/3350 */
+
+    if (false && (newUpper <= axisDef + (axisMax - axisDef) * 2))
     {
       upper = newUpper;
       if (!negative && axisDef + (axisMax - axisDef) * MAX_F2DOT14 < upper)
@@ -265,7 +270,7 @@ _solve (Triple tent, Triple axisLimit, bool negative = false)
       }
 
       Triple loc {hb_max (axisDef, lower), peak, upper};
-      float scalar = 1.f;
+      double scalar = 1.0;
 
       out.push (hb_pair (scalar - gain, loc));
     }
@@ -289,10 +294,10 @@ _solve (Triple tent, Triple axisLimit, bool negative = false)
     else
     {
       Triple loc1 {hb_max (axisDef, lower), peak, axisMax};
-      float scalar1 = 1.f;
+      double scalar1 = 1.0;
 
       Triple loc2 {peak, axisMax, axisMax};
-      float scalar2 = outGain;
+      double scalar2 = outGain;
 
       out.push (hb_pair (scalar1 - gain, loc1));
       // Don't add a dirac delta!
@@ -320,7 +325,7 @@ _solve (Triple tent, Triple axisLimit, bool negative = false)
   if (lower <= axisMin)
   {
     Triple loc {axisMin, axisMin, axisDef};
-    float scalar = supportScalar (axisMin, tent);
+    double scalar = supportScalar (axisMin, tent);
 
     out.push (hb_pair (scalar - gain, loc));
   }
@@ -348,11 +353,11 @@ _solve (Triple tent, Triple axisLimit, bool negative = false)
 
     // Downslope.
     Triple loc1 {axisMin, lower, axisDef};
-    float scalar1 = 0.f;
+    double scalar1 = 0.0;
 
     // Eternity justify.
     Triple loc2 {axisMin, axisMin, lower};
-    float scalar2 = 0.f;
+    double scalar2 = 0.0;
 
     out.push (hb_pair (scalar1 - gain, loc1));
     out.push (hb_pair (scalar2 - gain, loc2));
@@ -364,19 +369,19 @@ _solve (Triple tent, Triple axisLimit, bool negative = false)
 static inline TripleDistances _reverse_triple_distances (const TripleDistances &v)
 { return TripleDistances (v.positive, v.negative); }
 
-float renormalizeValue (float v, const Triple &triple,
-                        const TripleDistances &triple_distances, bool extrapolate)
+double renormalizeValue (double v, const Triple &triple,
+                         const TripleDistances &triple_distances, bool extrapolate)
 {
-  float lower = triple.minimum, def = triple.middle, upper = triple.maximum;
+  double lower = triple.minimum, def = triple.middle, upper = triple.maximum;
   assert (lower <= def && def <= upper);
 
   if (!extrapolate)
-      v = hb_max (hb_min (v, upper), lower);
+    v = hb_clamp (v, lower, upper);
 
   if (v == def)
-    return 0.f;
+    return 0.0;
 
-  if (def < 0.f)
+  if (def < 0.0)
     return -renormalizeValue (-v, _reverse_negate (triple),
                               _reverse_triple_distances (triple_distances), extrapolate);
 
@@ -385,14 +390,14 @@ float renormalizeValue (float v, const Triple &triple,
     return (v - def) / (upper - def);
 
   /* v < def */
-  if (lower >= 0.f)
+  if (lower >= 0.0)
     return (v - def) / (def - lower);
 
   /* lower < 0 and v < default */
-  float total_distance = triple_distances.negative * (-lower) + triple_distances.positive * def;
+  double total_distance = triple_distances.negative * (-lower) + triple_distances.positive * def;
 
-  float v_distance;
-  if (v >= 0.f)
+  double v_distance;
+  if (v >= 0.0)
     v_distance = (def - v) * triple_distances.positive;
   else
     v_distance = (-v) * triple_distances.negative + triple_distances.positive * def;
@@ -400,18 +405,18 @@ float renormalizeValue (float v, const Triple &triple,
   return (-v_distance) /total_distance;
 }
 
-result_t
+rebase_tent_result_t
 rebase_tent (Triple tent, Triple axisLimit, TripleDistances axis_triple_distances)
 {
-  assert (-1.f <= axisLimit.minimum && axisLimit.minimum <= axisLimit.middle && axisLimit.middle <= axisLimit.maximum && axisLimit.maximum <= +1.f);
-  assert (-2.f <= tent.minimum && tent.minimum <= tent.middle && tent.middle <= tent.maximum && tent.maximum <= +2.f);
-  assert (tent.middle != 0.f);
+  assert (-1.0 <= axisLimit.minimum && axisLimit.minimum <= axisLimit.middle && axisLimit.middle <= axisLimit.maximum && axisLimit.maximum <= +1.0);
+  assert (-2.0 <= tent.minimum && tent.minimum <= tent.middle && tent.middle <= tent.maximum && tent.maximum <= +2.0);
+  assert (tent.middle != 0.0);
 
-  result_t sols = _solve (tent, axisLimit);
+  rebase_tent_result_t sols = _solve (tent, axisLimit);
 
-  auto n = [&axisLimit, &axis_triple_distances] (float v) { return renormalizeValue (v, axisLimit, axis_triple_distances); };
+  auto n = [&axisLimit, &axis_triple_distances] (double v) { return renormalizeValue (v, axisLimit, axis_triple_distances); };
 
-  result_t out;
+  rebase_tent_result_t out;
   for (auto &p : sols)
   {
     if (!p.first) continue;
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-subset-instancer-solver.hh b/src/java.desktop/share/native/libharfbuzz/hb-subset-instancer-solver.hh
index e8ca1dc4e63..9764dcc1725 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-subset-instancer-solver.hh
+++ b/src/java.desktop/share/native/libharfbuzz/hb-subset-instancer-solver.hh
@@ -30,24 +30,24 @@
 /* pre-normalized distances */
 struct TripleDistances
 {
-  TripleDistances (): negative (1.f), positive (1.f) {}
-  TripleDistances (float neg_, float pos_): negative (neg_), positive (pos_) {}
-  TripleDistances (float min, float default_, float max)
+  TripleDistances (): negative (1.0), positive (1.0) {}
+  TripleDistances (double neg_, double pos_): negative (neg_), positive (pos_) {}
+  TripleDistances (double min, double default_, double max)
   {
     negative = default_ - min;
     positive = max - default_;
   }
 
-  float negative;
-  float positive;
+  double negative;
+  double positive;
 };
 
 struct Triple {
 
   Triple () :
-    minimum (0.f), middle (0.f), maximum (0.f) {}
+    minimum (0.0), middle (0.0), maximum (0.0) {}
 
-  Triple (float minimum_, float middle_, float maximum_) :
+  Triple (double minimum_, double middle_, double maximum_) :
     minimum (minimum_), middle (middle_), maximum (maximum_) {}
 
   bool operator == (const Triple &o) const
@@ -63,7 +63,7 @@ struct Triple {
   bool is_point () const
   { return minimum == middle && middle == maximum; }
 
-  bool contains (float point) const
+  bool contains (double point) const
   { return minimum <= point && point <= maximum; }
 
   /* from hb_array_t hash ()*/
@@ -82,18 +82,18 @@ struct Triple {
   }
 
 
-  float minimum;
-  float middle;
-  float maximum;
+  double minimum;
+  double middle;
+  double maximum;
 };
 
-using result_item_t = hb_pair_t<float, Triple>;
-using result_t = hb_vector_t<result_item_t>;
+using rebase_tent_result_item_t = hb_pair_t<double, Triple>;
+using rebase_tent_result_t = hb_vector_t<rebase_tent_result_item_t>;
 
 /* renormalize a normalized value v to the range of an axis,
  * considering the prenormalized distances as well as the new axis limits.
  * Ported from fonttools */
-HB_INTERNAL float renormalizeValue (float v, const Triple &triple,
+HB_INTERNAL double renormalizeValue (double v, const Triple &triple,
                                     const TripleDistances &triple_distances,
                                     bool extrapolate = true);
 /* Given a tuple (lower,peak,upper) "tent" and new axis limits
@@ -107,6 +107,8 @@ HB_INTERNAL float renormalizeValue (float v, const Triple &triple,
  * If tent value is Triple{}, that is a special deltaset that should
  * be always-enabled (called "gain").
  */
-HB_INTERNAL result_t rebase_tent (Triple tent, Triple axisLimit, TripleDistances axis_triple_distances);
+HB_INTERNAL rebase_tent_result_t rebase_tent (Triple tent,
+                                              Triple axisLimit,
+                                              TripleDistances axis_triple_distances);
 
 #endif /* HB_SUBSET_INSTANCER_SOLVER_HH */
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-subset-plan-member-list.hh b/src/java.desktop/share/native/libharfbuzz/hb-subset-plan-member-list.hh
index 8bc1fcb5682..ade8278c40f 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-subset-plan-member-list.hh
+++ b/src/java.desktop/share/native/libharfbuzz/hb-subset-plan-member-list.hh
@@ -70,6 +70,9 @@ HB_SUBSET_PLAN_MEMBER (hb_set_t, _glyphset_colred)
 HB_SUBSET_PLAN_MEMBER (hb_map_t, gsub_lookups)
 HB_SUBSET_PLAN_MEMBER (hb_map_t, gpos_lookups)
 
+//use_mark_sets mapping: old->new
+HB_SUBSET_PLAN_MEMBER (hb_map_t, used_mark_sets_map)
+
 //active langsys we'd like to retain
 HB_SUBSET_PLAN_MEMBER (hb_hashmap_t E(<unsigned, hb::unique_ptr<hb_set_t>>), gsub_langsys)
 HB_SUBSET_PLAN_MEMBER (hb_hashmap_t E(<unsigned, hb::unique_ptr<hb_set_t>>), gpos_langsys)
@@ -87,9 +90,24 @@ HB_SUBSET_PLAN_MEMBER (hb_hashmap_t E(<unsigned, hb::shared_ptr<hb_set_t>>), gpo
 HB_SUBSET_PLAN_MEMBER (hb_hashmap_t E(<unsigned, const OT::Feature*>), gsub_feature_substitutes_map)
 HB_SUBSET_PLAN_MEMBER (hb_hashmap_t E(<unsigned, const OT::Feature*>), gpos_feature_substitutes_map)
 
+// old feature_indexes set, used to reinstate the old features
+HB_SUBSET_PLAN_MEMBER (hb_set_t, gsub_old_features)
+HB_SUBSET_PLAN_MEMBER (hb_set_t, gpos_old_features)
+
+//feature_index->pair of (address of old feature, feature tag), used for inserting a catch all record
+//if necessary
+HB_SUBSET_PLAN_MEMBER (hb_hashmap_t E(<unsigned, hb_pair_t E(<const void*, const void*>)>), gsub_old_feature_idx_tag_map)
+HB_SUBSET_PLAN_MEMBER (hb_hashmap_t E(<unsigned, hb_pair_t E(<const void*, const void*>)>), gpos_old_feature_idx_tag_map)
+
 //active layers/palettes we'd like to retain
 HB_SUBSET_PLAN_MEMBER (hb_map_t, colrv1_layers)
 HB_SUBSET_PLAN_MEMBER (hb_map_t, colr_palettes)
+//colrv1 varstore retained varidx mapping
+HB_SUBSET_PLAN_MEMBER (hb_vector_t<hb_inc_bimap_t>, colrv1_varstore_inner_maps)
+//colrv1 retained varidx -> (new varidx, delta) mapping
+HB_SUBSET_PLAN_MEMBER (mutable hb_hashmap_t E(<unsigned, hb_pair_t E(<unsigned, int>)>), colrv1_variation_idx_delta_map)
+//colrv1 retained new delta set index -> new varidx mapping
+HB_SUBSET_PLAN_MEMBER (hb_map_t, colrv1_new_deltaset_idx_varidx_map)
 
 //Old layout item variation index -> (New varidx, delta) mapping
 HB_SUBSET_PLAN_MEMBER (mutable hb_hashmap_t E(<unsigned, hb_pair_t E(<unsigned, int>)>), layout_variation_idx_delta_map)
@@ -128,6 +146,15 @@ HB_SUBSET_PLAN_MEMBER (mutable hb_vector_t<unsigned>, bounds_height_vec)
 //map: new_gid -> contour points vector
 HB_SUBSET_PLAN_MEMBER (mutable hb_hashmap_t E(<hb_codepoint_t, contour_point_vector_t>), new_gid_contour_points_map)
 
+//new gids set for composite glyphs
+HB_SUBSET_PLAN_MEMBER (hb_set_t, composite_new_gids)
+
+//Old BASE item variation index -> (New varidx, 0) mapping
+HB_SUBSET_PLAN_MEMBER (mutable hb_hashmap_t E(<unsigned, hb_pair_t E(<unsigned, int>)>), base_variation_idx_map)
+
+//BASE table varstore retained varidx mapping
+HB_SUBSET_PLAN_MEMBER (hb_vector_t<hb_inc_bimap_t>, base_varstore_inner_maps)
+
 #ifdef HB_EXPERIMENTAL_API
 // name table overrides map: hb_ot_name_record_ids_t-> name string new value or
 // None to indicate should remove
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-subset-plan.cc b/src/java.desktop/share/native/libharfbuzz/hb-subset-plan.cc
index b9cc4fd0bcd..fb5282916b9 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-subset-plan.cc
+++ b/src/java.desktop/share/native/libharfbuzz/hb-subset-plan.cc
@@ -32,6 +32,7 @@
 
 #include "hb-ot-cmap-table.hh"
 #include "hb-ot-glyf-table.hh"
+#include "hb-ot-layout-base-table.hh"
 #include "hb-ot-layout-gdef-table.hh"
 #include "hb-ot-layout-gpos-table.hh"
 #include "hb-ot-layout-gsub-table.hh"
@@ -150,7 +151,8 @@ static void _collect_layout_indices (hb_subset_plan_t     *plan,
                                      hb_set_t             *feature_indices, /* OUT */
                                      hb_hashmap_t<unsigned, hb::shared_ptr<hb_set_t>> *feature_record_cond_idx_map, /* OUT */
                                      hb_hashmap_t<unsigned, const OT::Feature*> *feature_substitutes_map, /* OUT */
-                                     bool& insert_catch_all_feature_variation_record)
+                                     hb_set_t& catch_all_record_feature_idxes, /* OUT */
+                                     hb_hashmap_t<unsigned, hb_pair_t<const void*, const void*>>& catch_all_record_idx_feature_map /* OUT */)
 {
   unsigned num_features = table.get_feature_count ();
   hb_vector_t<hb_tag_t> features;
@@ -186,7 +188,7 @@ static void _collect_layout_indices (hb_subset_plan_t     *plan,
       &plan->axes_location,
       feature_record_cond_idx_map,
       feature_substitutes_map,
-      insert_catch_all_feature_variation_record,
+      catch_all_record_feature_idxes,
       feature_indices,
       false,
       false,
@@ -208,17 +210,25 @@ static void _collect_layout_indices (hb_subset_plan_t     *plan,
     f->add_lookup_indexes_to (lookup_indices);
   }
 
+#ifndef HB_NO_VAR
+  if (catch_all_record_feature_idxes)
+  {
+    for (unsigned feature_index : catch_all_record_feature_idxes)
+    {
+      const OT::Feature& f = table.get_feature (feature_index);
+      f.add_lookup_indexes_to (lookup_indices);
+      const void *tag = reinterpret_cast<const void*> (&(table.get_feature_list ().get_tag (feature_index)));
+      catch_all_record_idx_feature_map.set (feature_index, hb_pair (&f, tag));
+    }
+  }
+
   // If all axes are pinned then all feature variations will be dropped so there's no need
   // to collect lookups from them.
   if (!plan->all_axes_pinned)
-  {
-    // TODO(qxliu76): this collection doesn't work correctly for feature variations that are dropped
-    //                but not applied. The collection will collect and retain the lookup indices
-    //                associated with those dropped but not activated rules. Since partial instancing
-    //                isn't yet supported this isn't an issue yet but will need to be fixed for
-    //                partial instancing.
-    table.feature_variation_collect_lookups (feature_indices, feature_substitutes_map, lookup_indices);
-  }
+    table.feature_variation_collect_lookups (feature_indices,
+                                             plan->user_axes_location.is_empty () ? nullptr: feature_record_cond_idx_map,
+                                             lookup_indices);
+#endif
 }
 
 
@@ -302,7 +312,8 @@ _closure_glyphs_lookups_features (hb_subset_plan_t   *plan,
                                   script_langsys_map *langsys_map,
                                   hb_hashmap_t<unsigned, hb::shared_ptr<hb_set_t>> *feature_record_cond_idx_map,
                                   hb_hashmap_t<unsigned, const OT::Feature*> *feature_substitutes_map,
-                                  bool& insert_catch_all_feature_variation_record)
+                                  hb_set_t &catch_all_record_feature_idxes,
+                                  hb_hashmap_t<unsigned, hb_pair_t<const void*, const void*>>& catch_all_record_idx_feature_map)
 {
   hb_blob_ptr_t<T> table = plan->source_table<T> ();
   hb_tag_t table_tag = table->tableTag;
@@ -313,7 +324,8 @@ _closure_glyphs_lookups_features (hb_subset_plan_t   *plan,
                               &feature_indices,
                               feature_record_cond_idx_map,
                               feature_substitutes_map,
-                              insert_catch_all_feature_variation_record);
+                              catch_all_record_feature_idxes,
+                              catch_all_record_idx_feature_map);
 
   if (table_tag == HB_OT_TAG_GSUB && !(plan->flags & HB_SUBSET_FLAGS_NO_LAYOUT_CLOSURE))
     hb_ot_layout_lookups_substitute_closure (plan->source,
@@ -386,13 +398,56 @@ _get_hb_font_with_variations (const hb_subset_plan_t *plan)
   return font;
 }
 
+static inline void
+_remap_variation_indices (const OT::ItemVariationStore &var_store,
+                          const hb_set_t &variation_indices,
+                          const hb_vector_t<int>& normalized_coords,
+                          bool calculate_delta, /* not pinned at default */
+                          bool no_variations, /* all axes pinned */
+                          hb_hashmap_t<unsigned, hb_pair_t<unsigned, int>> &variation_idx_delta_map /* OUT */)
+{
+  if (&var_store == &Null (OT::ItemVariationStore)) return;
+  unsigned subtable_count = var_store.get_sub_table_count ();
+  float *store_cache = var_store.create_cache ();
+
+  unsigned new_major = 0, new_minor = 0;
+  unsigned last_major = (variation_indices.get_min ()) >> 16;
+  for (unsigned idx : variation_indices)
+  {
+    int delta = 0;
+    if (calculate_delta)
+      delta = roundf (var_store.get_delta (idx, normalized_coords.arrayZ,
+                                           normalized_coords.length, store_cache));
+
+    if (no_variations)
+    {
+      variation_idx_delta_map.set (idx, hb_pair_t<unsigned, int> (HB_OT_LAYOUT_NO_VARIATIONS_INDEX, delta));
+      continue;
+    }
+
+    uint16_t major = idx >> 16;
+    if (major >= subtable_count) break;
+    if (major != last_major)
+    {
+      new_minor = 0;
+      ++new_major;
+    }
+
+    unsigned new_idx = (new_major << 16) + new_minor;
+    variation_idx_delta_map.set (idx, hb_pair_t<unsigned, int> (new_idx, delta));
+    ++new_minor;
+    last_major = major;
+  }
+  var_store.destroy_cache (store_cache);
+}
+
 static inline void
 _collect_layout_variation_indices (hb_subset_plan_t* plan)
 {
   hb_blob_ptr_t<OT::GDEF> gdef = plan->source_table<OT::GDEF> ();
   hb_blob_ptr_t<GPOS> gpos = plan->source_table<GPOS> ();
 
-  if (!gdef->has_data ())
+  if (!gdef->has_data () || !gdef->has_var_store ())
   {
     gdef.destroy ();
     gpos.destroy ();
@@ -408,18 +463,47 @@ _collect_layout_variation_indices (hb_subset_plan_t* plan)
   if (hb_ot_layout_has_positioning (plan->source))
     gpos->collect_variation_indices (&c);
 
-  gdef->remap_layout_variation_indices (&varidx_set,
-                                        plan->normalized_coords,
-                                        !plan->pinned_at_default,
-                                        plan->all_axes_pinned,
-                                        &plan->layout_variation_idx_delta_map);
+  _remap_variation_indices (gdef->get_var_store (),
+                            varidx_set, plan->normalized_coords,
+                            !plan->pinned_at_default,
+                            plan->all_axes_pinned,
+                            plan->layout_variation_idx_delta_map);
 
-  unsigned subtable_count = gdef->has_var_store () ? gdef->get_var_store ().get_sub_table_count () : 0;
+  unsigned subtable_count = gdef->get_var_store ().get_sub_table_count ();
   _generate_varstore_inner_maps (varidx_set, subtable_count, plan->gdef_varstore_inner_maps);
 
   gdef.destroy ();
   gpos.destroy ();
 }
+
+#ifndef HB_NO_BASE
+static inline void
+_collect_base_variation_indices (hb_subset_plan_t* plan)
+{
+  hb_blob_ptr_t<OT::BASE> base = plan->source_table<OT::BASE> ();
+  if (!base->has_var_store ())
+  {
+    base.destroy ();
+    return;
+  }
+
+  hb_set_t varidx_set;
+  base->collect_variation_indices (plan, varidx_set);
+  const OT::ItemVariationStore &var_store = base->get_var_store ();
+  unsigned subtable_count = var_store.get_sub_table_count ();
+
+
+  _remap_variation_indices (var_store, varidx_set,
+                            plan->normalized_coords,
+                            !plan->pinned_at_default,
+                            plan->all_axes_pinned,
+                            plan->base_variation_idx_map);
+  _generate_varstore_inner_maps (varidx_set, subtable_count, plan->base_varstore_inner_maps);
+
+  base.destroy ();
+}
+
+#endif
 #endif
 
 static inline void
@@ -431,12 +515,45 @@ _cmap_closure (hb_face_t           *face,
   cmap.table->closure_glyphs (unicodes, glyphset);
 }
 
-static void _colr_closure (hb_face_t *face,
-                           hb_map_t *layers_map,
-                           hb_map_t *palettes_map,
+#ifndef HB_NO_VAR
+static void
+_remap_colrv1_delta_set_index_indices (const OT::DeltaSetIndexMap &index_map,
+                                       const hb_set_t &delta_set_idxes,
+                                       hb_hashmap_t<unsigned, hb_pair_t<unsigned, int>> &variation_idx_delta_map, /* IN/OUT */
+                                       hb_map_t &new_deltaset_idx_varidx_map /* OUT */)
+{
+  if (!index_map.get_map_count ())
+    return;
+
+  hb_hashmap_t<unsigned, hb_pair_t<unsigned, int>> delta_set_idx_delta_map;
+  unsigned new_delta_set_idx = 0;
+  for (unsigned delta_set_idx : delta_set_idxes)
+  {
+    unsigned var_idx = index_map.map (delta_set_idx);
+    unsigned new_varidx = HB_OT_LAYOUT_NO_VARIATIONS_INDEX;
+    int delta = 0;
+
+    if (var_idx != HB_OT_LAYOUT_NO_VARIATIONS_INDEX)
+    {
+      hb_pair_t<unsigned, int> *new_varidx_delta;
+      if (!variation_idx_delta_map.has (var_idx, &new_varidx_delta)) continue;
+
+      new_varidx = hb_first (*new_varidx_delta);
+      delta = hb_second (*new_varidx_delta);
+    }
+
+    new_deltaset_idx_varidx_map.set (new_delta_set_idx, new_varidx);
+    delta_set_idx_delta_map.set (delta_set_idx, hb_pair_t<unsigned, int> (new_delta_set_idx, delta));
+    new_delta_set_idx++;
+  }
+  variation_idx_delta_map = std::move (delta_set_idx_delta_map);
+}
+#endif
+
+static void _colr_closure (hb_subset_plan_t* plan,
                            hb_set_t *glyphs_colred)
 {
-  OT::COLR::accelerator_t colr (face);
+  OT::COLR::accelerator_t colr (plan->source);
   if (!colr.is_valid ()) return;
 
   hb_set_t palette_indices, layer_indices;
@@ -448,11 +565,45 @@ static void _colr_closure (hb_face_t *face,
   glyphs_colred->union_ (glyphset_colrv0);
 
   //closure for COLRv1
-  colr.closure_forV1 (glyphs_colred, &layer_indices, &palette_indices);
+  hb_set_t variation_indices, delta_set_indices;
+  colr.closure_forV1 (glyphs_colred, &layer_indices, &palette_indices, &variation_indices, &delta_set_indices);
 
   colr.closure_V0palette_indices (glyphs_colred, &palette_indices);
-  _remap_indexes (&layer_indices, layers_map);
-  _remap_palette_indexes (&palette_indices, palettes_map);
+  _remap_indexes (&layer_indices, &plan->colrv1_layers);
+  _remap_palette_indexes (&palette_indices, &plan->colr_palettes);
+
+#ifndef HB_NO_VAR
+  if (!colr.has_var_store () || !variation_indices) return;
+
+  const OT::ItemVariationStore &var_store = colr.get_var_store ();
+  // generated inner_maps is used by ItemVariationStore serialize(), which is subset only
+  unsigned subtable_count = var_store.get_sub_table_count ();
+  _generate_varstore_inner_maps (variation_indices, subtable_count, plan->colrv1_varstore_inner_maps);
+
+  /* colr variation indices mapping during planning phase:
+   * generate colrv1_variation_idx_delta_map. When delta set index map is not
+   * included, it's a mapping from varIdx-> (new varIdx,delta). Otherwise, it's
+   * a mapping from old delta set idx-> (new delta set idx, delta). Mapping
+   * delta set indices is the same as gid mapping.
+   * Besides, we need to generate a delta set idx-> new var_idx map for updating
+   * delta set index map if exists. This map will be updated again after
+   * instancing. */
+  if (!plan->all_axes_pinned)
+  {
+    _remap_variation_indices (var_store,
+                              variation_indices,
+                              plan->normalized_coords,
+                              false, /* no need to calculate delta for COLR during planning */
+                              plan->all_axes_pinned,
+                              plan->colrv1_variation_idx_delta_map);
+
+    if (colr.has_delta_set_index_map ())
+      _remap_colrv1_delta_set_index_indices (colr.get_delta_set_index_map (),
+                                             delta_set_indices,
+                                             plan->colrv1_variation_idx_delta_map,
+                                             plan->colrv1_new_deltaset_idx_varidx_map);
+  }
+#endif
 }
 
 static inline void
@@ -465,6 +616,24 @@ _math_closure (hb_subset_plan_t *plan,
   math.destroy ();
 }
 
+static inline void
+_remap_used_mark_sets (hb_subset_plan_t *plan,
+                       hb_map_t& used_mark_sets_map)
+{
+  hb_blob_ptr_t<OT::GDEF> gdef = plan->source_table<OT::GDEF> ();
+
+  if (!gdef->has_data () || !gdef->has_mark_glyph_sets ())
+  {
+    gdef.destroy ();
+    return;
+  }
+
+  hb_set_t used_mark_sets;
+  gdef->get_mark_glyph_sets ().collect_used_mark_sets (plan->_glyphset_gsub, used_mark_sets);
+  gdef.destroy ();
+
+  _remap_indexes (&used_mark_sets, &used_mark_sets_map);
+}
 
 static inline void
 _remove_invalid_gids (hb_set_t *glyphs,
@@ -473,6 +642,36 @@ _remove_invalid_gids (hb_set_t *glyphs,
   glyphs->del_range (num_glyphs, HB_SET_VALUE_INVALID);
 }
 
+template<bool GID_ALWAYS_EXISTS = false, typename I, typename F, typename G, hb_requires (hb_is_iterator (I))>
+static void
+_fill_unicode_and_glyph_map(hb_subset_plan_t *plan,
+                            I unicode_iterator,
+                            F unicode_to_gid_for_iterator,
+                            G unicode_to_gid_general)
+{
+  for (hb_codepoint_t cp : unicode_iterator)
+  {
+    hb_codepoint_t gid = unicode_to_gid_for_iterator(cp);
+    if (!GID_ALWAYS_EXISTS && gid == HB_MAP_VALUE_INVALID)
+    {
+      DEBUG_MSG(SUBSET, nullptr, "Drop U+%04X; no gid", cp);
+      continue;
+    }
+
+    plan->codepoint_to_glyph->set (cp, gid);
+    plan->unicode_to_new_gid_list.push (hb_pair (cp, gid));
+  }
+}
+
+template<bool GID_ALWAYS_EXISTS = false, typename I, typename F, hb_requires (hb_is_iterator (I))>
+static void
+_fill_unicode_and_glyph_map(hb_subset_plan_t *plan,
+                            I unicode_iterator,
+                            F unicode_to_gid_for_iterator)
+{
+  _fill_unicode_and_glyph_map(plan, unicode_iterator, unicode_to_gid_for_iterator, unicode_to_gid_for_iterator);
+}
+
 static void
 _populate_unicodes_to_retain (const hb_set_t *unicodes,
                               const hb_set_t *glyphs,
@@ -480,6 +679,7 @@ _populate_unicodes_to_retain (const hb_set_t *unicodes,
 {
   OT::cmap::accelerator_t cmap (plan->source);
   unsigned size_threshold = plan->source->get_num_glyphs ();
+
   if (glyphs->is_empty () && unicodes->get_population () < size_threshold)
   {
 
@@ -492,35 +692,21 @@ _populate_unicodes_to_retain (const hb_set_t *unicodes,
     // not excessively large (eg. an inverted set).
     plan->unicode_to_new_gid_list.alloc (unicodes->get_population ());
     if (!unicode_to_gid) {
-      for (hb_codepoint_t cp : *unicodes)
-      {
+      _fill_unicode_and_glyph_map(plan, unicodes->iter(), [&] (hb_codepoint_t cp) {
         hb_codepoint_t gid;
-        if (!cmap.get_nominal_glyph (cp, &gid))
-        {
-          DEBUG_MSG(SUBSET, nullptr, "Drop U+%04X; no gid", cp);
-          continue;
+        if (!cmap.get_nominal_glyph (cp, &gid)) {
+          return HB_MAP_VALUE_INVALID;
         }
-
-        plan->codepoint_to_glyph->set (cp, gid);
-        plan->unicode_to_new_gid_list.push (hb_pair (cp, gid));
-      }
+        return gid;
+      });
     } else {
       // Use in memory unicode to gid map it's faster then looking up from
       // the map. This code is mostly duplicated from above to avoid doing
       // conditionals on the presence of the unicode_to_gid map each
       // iteration.
-      for (hb_codepoint_t cp : *unicodes)
-      {
-        hb_codepoint_t gid = unicode_to_gid->get (cp);
-        if (gid == HB_MAP_VALUE_INVALID)
-        {
-          DEBUG_MSG(SUBSET, nullptr, "Drop U+%04X; no gid", cp);
-          continue;
-        }
-
-        plan->codepoint_to_glyph->set (cp, gid);
-        plan->unicode_to_new_gid_list.push (hb_pair (cp, gid));
-      }
+      _fill_unicode_and_glyph_map(plan, unicodes->iter(), [&] (hb_codepoint_t cp) {
+        return unicode_to_gid->get (cp);
+      });
     }
   }
   else
@@ -550,42 +736,46 @@ _populate_unicodes_to_retain (const hb_set_t *unicodes,
       plan->codepoint_to_glyph->alloc (unicodes->get_population () + glyphs->get_population ());
 
       auto &gid_to_unicodes = plan->accelerator->gid_to_unicodes;
+
       for (hb_codepoint_t gid : *glyphs)
       {
         auto unicodes = gid_to_unicodes.get (gid);
-
-        for (hb_codepoint_t cp : unicodes)
-        {
-          plan->codepoint_to_glyph->set (cp, gid);
-          plan->unicode_to_new_gid_list.push (hb_pair (cp, gid));
-        }
+        _fill_unicode_and_glyph_map<true>(plan, unicodes, [&] (hb_codepoint_t cp) {
+          return gid;
+        },
+        [&] (hb_codepoint_t cp) {
+          return unicode_glyphid_map->get(cp);
+        });
       }
-      for (hb_codepoint_t cp : *unicodes)
-      {
-        /* Don't double-add entry. */
+
+      _fill_unicode_and_glyph_map(plan, unicodes->iter(), [&] (hb_codepoint_t cp) {
+          /* Don't double-add entry. */
         if (plan->codepoint_to_glyph->has (cp))
-          continue;
+          return HB_MAP_VALUE_INVALID;
 
-        hb_codepoint_t *gid;
-        if (!unicode_glyphid_map->has(cp, &gid))
-          continue;
+        return unicode_glyphid_map->get(cp);
+      },
+      [&] (hb_codepoint_t cp) {
+          return unicode_glyphid_map->get(cp);
+      });
 
-        plan->codepoint_to_glyph->set (cp, *gid);
-        plan->unicode_to_new_gid_list.push (hb_pair (cp, *gid));
-      }
       plan->unicode_to_new_gid_list.qsort ();
     }
     else
     {
       plan->codepoint_to_glyph->alloc (cmap_unicodes->get_population ());
-      for (hb_codepoint_t cp : *cmap_unicodes)
+      hb_codepoint_t first = HB_SET_VALUE_INVALID, last = HB_SET_VALUE_INVALID;
+      for (; cmap_unicodes->next_range (&first, &last); )
       {
-        hb_codepoint_t gid = (*unicode_glyphid_map)[cp];
-        if (!unicodes->has (cp) && !glyphs->has (gid))
-          continue;
-
-        plan->codepoint_to_glyph->set (cp, gid);
-        plan->unicode_to_new_gid_list.push (hb_pair (cp, gid));
+        _fill_unicode_and_glyph_map(plan, hb_range(first, last + 1), [&] (hb_codepoint_t cp) {
+          hb_codepoint_t gid = (*unicode_glyphid_map)[cp];
+          if (!unicodes->has (cp) && !glyphs->has (gid))
+            return HB_MAP_VALUE_INVALID;
+          return gid;
+        },
+        [&] (hb_codepoint_t cp) {
+          return unicode_glyphid_map->get(cp);
+        });
       }
     }
 
@@ -608,11 +798,22 @@ _populate_unicodes_to_retain (const hb_set_t *unicodes,
     plan->unicodes.add_sorted_array (&arr.arrayZ->first, arr.length, sizeof (*arr.arrayZ));
     plan->_glyphset_gsub.add_array (&arr.arrayZ->second, arr.length, sizeof (*arr.arrayZ));
   }
-}
 
-#ifndef HB_COMPOSITE_OPERATIONS_PER_GLYPH
-#define HB_COMPOSITE_OPERATIONS_PER_GLYPH 64
-#endif
+  // Variation selectors don't have glyphs associated with them in the cmap so they will have been filtered out above
+  // but should still be retained. Add them back here.
+
+  // However, the min and max codepoints for OS/2 should be calculated without considering variation selectors,
+  // so record those first.
+  plan->os2_info.min_cmap_codepoint = plan->unicodes.get_min();
+  plan->os2_info.max_cmap_codepoint = plan->unicodes.get_max();
+
+  hb_set_t variation_selectors_to_retain;
+  cmap.collect_variation_selectors(&variation_selectors_to_retain);
+  + variation_selectors_to_retain.iter()
+  | hb_filter(unicodes)
+  | hb_sink(&plan->unicodes)
+  ;
+}
 
 static unsigned
 _glyf_add_gid_and_children (const OT::glyf_accelerator_t &glyf,
@@ -639,18 +840,6 @@ _glyf_add_gid_and_children (const OT::glyf_accelerator_t &glyf,
                                   operation_count,
                                   depth);
 
-#ifndef HB_NO_VAR_COMPOSITES
-  for (auto &item : glyph.get_var_composite_iterator ())
-   {
-    operation_count =
-      _glyf_add_gid_and_children (glyf,
-                                  item.get_gid (),
-                                  gids_to_retain,
-                                  operation_count,
-                                  depth);
-   }
-#endif
-
   return operation_count;
 }
 
@@ -714,7 +903,8 @@ _populate_gids_to_retain (hb_subset_plan_t* plan,
         &plan->gsub_langsys,
         &plan->gsub_feature_record_cond_idx_map,
         &plan->gsub_feature_substitutes_map,
-        plan->gsub_insert_catch_all_feature_variation_rec);
+        plan->gsub_old_features,
+        plan->gsub_old_feature_idx_tag_map);
 
   if (!drop_tables->has (HB_OT_TAG_GPOS))
     _closure_glyphs_lookups_features<GPOS> (
@@ -725,7 +915,8 @@ _populate_gids_to_retain (hb_subset_plan_t* plan,
         &plan->gpos_langsys,
         &plan->gpos_feature_record_cond_idx_map,
         &plan->gpos_feature_substitutes_map,
-        plan->gpos_insert_catch_all_feature_variation_rec);
+        plan->gpos_old_features,
+        plan->gpos_old_feature_idx_tag_map);
 #endif
   _remove_invalid_gids (&plan->_glyphset_gsub, plan->source->get_num_glyphs ());
 
@@ -739,19 +930,21 @@ _populate_gids_to_retain (hb_subset_plan_t* plan,
   hb_set_t cur_glyphset = plan->_glyphset_mathed;
   if (!drop_tables->has (HB_OT_TAG_COLR))
   {
-    _colr_closure (plan->source, &plan->colrv1_layers, &plan->colr_palettes, &cur_glyphset);
+    _colr_closure (plan, &cur_glyphset);
     _remove_invalid_gids (&cur_glyphset, plan->source->get_num_glyphs ());
   }
 
   plan->_glyphset_colred = cur_glyphset;
 
+  // XXX TODO VARC closure / subset
+
   _nameid_closure (plan, drop_tables);
   /* Populate a full set of glyphs to retain by adding all referenced
    * composite glyphs. */
   if (glyf.has_data ())
     for (hb_codepoint_t gid : cur_glyphset)
       _glyf_add_gid_and_children (glyf, gid, &plan->_glyphset,
-                                  cur_glyphset.get_population () * HB_COMPOSITE_OPERATIONS_PER_GLYPH);
+                                  cur_glyphset.get_population () * HB_MAX_COMPOSITE_OPERATIONS_PER_GLYPH);
   else
     plan->_glyphset.union_ (cur_glyphset);
 #ifndef HB_NO_SUBSET_CFF
@@ -871,9 +1064,11 @@ _create_old_gid_to_new_gid_map (const hb_face_t *face,
     *num_glyphs = max_glyph + 1;
   }
 
+  reverse_glyph_map->alloc (reverse_glyph_map->get_population () + new_to_old_gid_list->length);
   + hb_iter (new_to_old_gid_list)
   | hb_sink (reverse_glyph_map)
   ;
+  glyph_map->alloc (glyph_map->get_population () + new_to_old_gid_list->length);
   + hb_iter (new_to_old_gid_list)
   | hb_map (&hb_codepoint_pair_t::reverse)
   | hb_sink (glyph_map)
@@ -932,9 +1127,9 @@ _normalize_axes_location (hb_face_t *face, hb_subset_plan_t *plan)
         normalized_default = seg_maps->map (normalized_default);
         normalized_max = seg_maps->map (normalized_max);
       }
-      plan->axes_location.set (axis_tag, Triple (static_cast<float> (normalized_min / 16384.f),
-                                                 static_cast<float> (normalized_default / 16384.f),
-                                                 static_cast<float> (normalized_max / 16384.f)));
+      plan->axes_location.set (axis_tag, Triple (static_cast<double> (normalized_min / 16384.0),
+                                                 static_cast<double> (normalized_default / 16384.0),
+                                                 static_cast<double> (normalized_max / 16384.0)));
 
       if (normalized_default != 0)
         plan->pinned_at_default = false;
@@ -957,8 +1152,8 @@ _update_instance_metrics_map_from_cff2 (hb_subset_plan_t *plan)
   OT::cff2::accelerator_t cff2 (plan->source);
   if (!cff2.is_valid ()) return;
 
-  hb_font_t *font = nullptr;
-  if (unlikely (!plan->check_success (font = _get_hb_font_with_variations (plan))))
+  hb_font_t *font = _get_hb_font_with_variations (plan);
+  if (unlikely (!plan->check_success (font != nullptr)))
   {
     hb_font_destroy (font);
     return;
@@ -1036,8 +1231,8 @@ _update_instance_metrics_map_from_cff2 (hb_subset_plan_t *plan)
 static bool
 _get_instance_glyphs_contour_points (hb_subset_plan_t *plan)
 {
-  /* contour_points vector only needed for updating gvar table (infer delta)
-   * during partial instancing */
+  /* contour_points vector only needed for updating gvar table (infer delta and
+   * iup delta optimization) during partial instancing */
   if (plan->user_axes_location.is_empty () || plan->all_axes_pinned)
     return true;
 
@@ -1055,10 +1250,15 @@ _get_instance_glyphs_contour_points (hb_subset_plan_t *plan)
     }
 
     hb_codepoint_t old_gid = _.second;
-    if (unlikely (!glyf.glyph_for_gid (old_gid).get_all_points_without_var (plan->source, all_points)))
+    auto glyph = glyf.glyph_for_gid (old_gid);
+    if (unlikely (!glyph.get_all_points_without_var (plan->source, all_points)))
       return false;
     if (unlikely (!plan->new_gid_contour_points_map.set (new_gid, all_points)))
       return false;
+
+    /* composite new gids are only needed by iup delta optimization */
+    if ((plan->flags & HB_SUBSET_FLAGS_OPTIMIZE_IUP_DELTAS) && glyph.is_composite ())
+      plan->composite_new_gids.add (new_gid);
   }
   return true;
 }
@@ -1093,6 +1293,7 @@ hb_subset_plan_t::hb_subset_plan_t (hb_face_t *face,
   user_axes_location = input->axes_location;
   all_axes_pinned = false;
   pinned_at_default = true;
+  has_gdef_varstore = false;
 
 #ifdef HB_EXPERIMENTAL_API
   for (auto _ : input->name_table_overrides)
@@ -1112,6 +1313,10 @@ hb_subset_plan_t::hb_subset_plan_t (hb_face_t *face,
 
   attach_accelerator_data = input->attach_accelerator_data;
   force_long_loca = input->force_long_loca;
+#ifdef HB_EXPERIMENTAL_API
+  force_long_loca = force_long_loca || (flags & HB_SUBSET_FLAGS_IFTB_REQUIREMENTS);
+#endif
+
   if (accel)
     accelerator = (hb_subset_accelerator_t*) accel;
 
@@ -1160,6 +1365,16 @@ hb_subset_plan_t::hb_subset_plan_t (hb_face_t *face,
   for (auto &v : bounds_height_vec)
     v = 0xFFFFFFFF;
 
+  if (!drop_tables.has (HB_OT_TAG_GDEF))
+    _remap_used_mark_sets (this, used_mark_sets_map);
+
+#ifndef HB_NO_VAR
+#ifndef HB_NO_BASE
+  if (!drop_tables.has (HB_OT_TAG_BASE))
+    _collect_base_variation_indices (this);
+#endif
+#endif
+
   if (unlikely (in_error ()))
     return;
 
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-subset-plan.hh b/src/java.desktop/share/native/libharfbuzz/hb-subset-plan.hh
index 40a6ff112af..a6bae23966a 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-subset-plan.hh
+++ b/src/java.desktop/share/native/libharfbuzz/hb-subset-plan.hh
@@ -41,6 +41,13 @@ namespace OT {
 struct Feature;
 }
 
+struct os2_info_t {
+  hb_codepoint_t min_cmap_codepoint;
+  hb_codepoint_t max_cmap_codepoint;
+};
+
+typedef struct os2_info_t os2_info_t;
+
 struct head_maxp_info_t
 {
   head_maxp_info_t ()
@@ -78,10 +85,16 @@ struct contour_point_t
           y  = x * matrix[1] + y * matrix[3];
     x  = x_;
   }
+
+  void add_delta (float delta_x, float delta_y)
+  {
+    x += delta_x;
+    y += delta_y;
+  }
+
   HB_ALWAYS_INLINE
   void translate (const contour_point_t &p) { x += p.x; y += p.y; }
 
-
   float x;
   float y;
   uint8_t flag;
@@ -90,14 +103,20 @@ struct contour_point_t
 
 struct contour_point_vector_t : hb_vector_t<contour_point_t>
 {
-  void extend (const hb_array_t<contour_point_t> &a)
+  bool add_deltas (hb_array_t<const float> deltas_x,
+                   hb_array_t<const float> deltas_y,
+                   hb_array_t<const bool> indices)
   {
-    unsigned int old_len = length;
-    if (unlikely (!resize (old_len + a.length, false)))
-      return;
-    auto arrayZ = this->arrayZ + old_len;
-    unsigned count = a.length;
-    hb_memcpy (arrayZ, a.arrayZ, count * sizeof (arrayZ[0]));
+    if (indices.length != deltas_x.length ||
+        indices.length != deltas_y.length)
+      return false;
+
+    for (unsigned i = 0; i < indices.length; i++)
+    {
+      if (!indices.arrayZ[i]) continue;
+      arrayZ[i].add_delta (deltas_x.arrayZ[i], deltas_y.arrayZ[i]);
+    }
+    return true;
   }
 };
 
@@ -147,6 +166,9 @@ struct hb_subset_plan_t
   bool gsub_insert_catch_all_feature_variation_rec;
   bool gpos_insert_catch_all_feature_variation_rec;
 
+  // whether GDEF ItemVariationStore is retained
+  mutable bool has_gdef_varstore;
+
 #define HB_SUBSET_PLAN_MEMBER(Type, Name) Type Name;
 #include "hb-subset-plan-member-list.hh"
 #undef HB_SUBSET_PLAN_MEMBER
@@ -154,6 +176,8 @@ struct hb_subset_plan_t
   //recalculated head/maxp table info after instancing
   mutable head_maxp_info_t head_maxp_info;
 
+  os2_info_t os2_info;
+
   const hb_subset_accelerator_t* accelerator;
   hb_subset_accelerator_t* inprogress_accelerator;
 
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-subset-serialize.h b/src/java.desktop/share/native/libharfbuzz/hb-subset-serialize.h
new file mode 100644
index 00000000000..9035d4ced7a
--- /dev/null
+++ b/src/java.desktop/share/native/libharfbuzz/hb-subset-serialize.h
@@ -0,0 +1,83 @@
+/*
+ * Copyright © 2022  Google, Inc.
+ *
+ *  This is part of HarfBuzz, a text shaping library.
+ *
+ * Permission is hereby granted, without written agreement and without
+ * license or royalty fees, to use, copy, modify, and distribute this
+ * software and its documentation for any purpose, provided that the
+ * above copyright notice and the following two paragraphs appear in
+ * all copies of this software.
+ *
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
+ * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
+ * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
+ * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+ * DAMAGE.
+ *
+ * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
+ * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ * FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
+ * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
+ * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
+ *
+ */
+
+#ifndef HB_SUBSET_SERIALIZE_H
+#define HB_SUBSET_SERIALIZE_H
+
+#include "hb.h"
+
+HB_BEGIN_DECLS
+
+/**
+ * hb_subset_serialize_link_t:
+ * @width: offsetSize in bytes
+ * @position: position of the offset field in bytes from
+ *            beginning of subtable
+ * @objidx: index of subtable
+ *
+ * Represents a link between two objects in the object graph
+ * to be serialized.
+ *
+ * Since: 10.2.0
+ */
+typedef struct hb_subset_serialize_link_t {
+  unsigned int width;
+  unsigned int position;
+  unsigned int objidx;
+} hb_subset_serialize_link_t;
+
+/**
+ * hb_subset_serialize_object_t:
+ * @head: start of object data
+ * @tail: end of object data
+ * @num_real_links: number of offset field in the object
+ * @real_links: array of offset info
+ * @num_virtual_links: number of objects that must be packed
+ *                     after current object in the final
+ *                     serialized order
+ * @virtual_links: array of virtual link info
+ *
+ * Represents an object in the object graph to be serialized.
+ *
+ * Since: 10.2.0
+ */
+typedef struct hb_subset_serialize_object_t {
+  char *head;
+  char *tail;
+  unsigned int num_real_links;
+  hb_subset_serialize_link_t *real_links;
+  unsigned int num_virtual_links;
+  hb_subset_serialize_link_t *virtual_links;
+} hb_subset_serialize_object_t;
+
+HB_EXTERN hb_blob_t *
+hb_subset_serialize_or_fail (hb_tag_t                      table_tag,
+                             hb_subset_serialize_object_t *hb_objects,
+                             unsigned                      num_hb_objs);
+
+
+HB_END_DECLS
+
+#endif /* HB_SUBSET_SERIALIZE_H */
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-subset.cc b/src/java.desktop/share/native/libharfbuzz/hb-subset.cc
index c125a435b2b..595cafc283e 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-subset.cc
+++ b/src/java.desktop/share/native/libharfbuzz/hb-subset.cc
@@ -48,6 +48,7 @@
 #include "hb-ot-cff2-table.hh"
 #include "hb-ot-vorg-table.hh"
 #include "hb-ot-name-table.hh"
+#include "hb-ot-layout-base-table.hh"
 #include "hb-ot-layout-gsub-table.hh"
 #include "hb-ot-layout-gpos-table.hh"
 #include "hb-ot-var-avar-table.hh"
@@ -294,8 +295,8 @@ _try_subset (const TableType *table,
   DEBUG_MSG (SUBSET, nullptr, "OT::%c%c%c%c ran out of room; reallocating to %u bytes.",
              HB_UNTAG (c->table_tag), buf_size);
 
-  if (unlikely (buf_size > c->source_blob->length * 16 ||
-                !buf->alloc (buf_size, true)))
+  if (unlikely (buf_size > c->source_blob->length * 256 ||
+                !buf->alloc_exact (buf_size)))
   {
     DEBUG_MSG (SUBSET, nullptr, "OT::%c%c%c%c failed to reallocate %u bytes.",
                HB_UNTAG (c->table_tag), buf_size);
@@ -460,9 +461,10 @@ _dependencies_satisfied (hb_subset_plan_t *plan, hb_tag_t tag,
   case HB_OT_TAG_hmtx:
   case HB_OT_TAG_vmtx:
   case HB_OT_TAG_maxp:
+  case HB_OT_TAG_OS2:
     return !plan->normalized_coords || !pending_subset_tags.has (HB_OT_TAG_glyf);
   case HB_OT_TAG_GPOS:
-    return !plan->normalized_coords || plan->all_axes_pinned || !pending_subset_tags.has (HB_OT_TAG_GDEF);
+    return plan->all_axes_pinned || !pending_subset_tags.has (HB_OT_TAG_GDEF);
   default:
     return true;
   }
@@ -502,6 +504,7 @@ _subset_table (hb_subset_plan_t *plan,
   case HB_OT_TAG_CBLC: return _subset<const OT::CBLC> (plan, buf);
   case HB_OT_TAG_CBDT: return true; /* skip CBDT, handled by CBLC */
   case HB_OT_TAG_MATH: return _subset<const OT::MATH> (plan, buf);
+  case HB_OT_TAG_BASE: return _subset<const OT::BASE> (plan, buf);
 
 #ifndef HB_NO_SUBSET_CFF
   case HB_OT_TAG_CFF1: return _subset<const OT::cff1> (plan, buf);
@@ -547,6 +550,7 @@ _subset_table (hb_subset_plan_t *plan,
     }
 #endif
     return _passthrough (plan, tag);
+
   default:
     if (plan->flags & HB_SUBSET_FLAGS_PASSTHROUGH_UNRECOGNIZED)
       return _passthrough (plan, tag);
@@ -590,14 +594,20 @@ static void _attach_accelerator_data (hb_subset_plan_t* plan,
  * @input: input to use for the subsetting.
  *
  * Subsets a font according to provided input. Returns nullptr
- * if the subset operation fails.
+ * if the subset operation fails or the face has no glyphs.
  *
  * Since: 2.9.0
  **/
 hb_face_t *
 hb_subset_or_fail (hb_face_t *source, const hb_subset_input_t *input)
 {
-  if (unlikely (!input || !source)) return hb_face_get_empty ();
+  if (unlikely (!input || !source)) return nullptr;
+
+  if (unlikely (!source->get_num_glyphs ()))
+  {
+    DEBUG_MSG (SUBSET, nullptr, "No glyphs in source font.");
+    return nullptr;
+  }
 
   hb_subset_plan_t *plan = hb_subset_plan_create_or_fail (source, input);
   if (unlikely (!plan)) {
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-subset.h b/src/java.desktop/share/native/libharfbuzz/hb-subset.h
index 8ea24da41b9..13fcd5332e6 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-subset.h
+++ b/src/java.desktop/share/native/libharfbuzz/hb-subset.h
@@ -73,6 +73,11 @@ typedef struct hb_subset_plan_t hb_subset_plan_t;
  * OS/2 will not be recalculated.
  * @HB_SUBSET_FLAGS_NO_LAYOUT_CLOSURE: If set don't perform glyph closure on layout
  * substitution rules (GSUB). Since: 7.2.0.
+ * @HB_SUBSET_FLAGS_OPTIMIZE_IUP_DELTAS: If set perform IUP delta optimization on the
+ * remaining gvar table's deltas. Since: 8.5.0
+ * @HB_SUBSET_FLAGS_IFTB_REQUIREMENTS: If set enforce requirements on the output subset
+ * to allow it to be used with incremental font transfer IFTB patches. Primarily,
+ * this forces all outline data to use long (32 bit) offsets. Since: EXPERIMENTAL
  *
  * List of boolean properties that can be configured on the subset input.
  *
@@ -90,6 +95,10 @@ typedef enum { /*< flags >*/
   HB_SUBSET_FLAGS_GLYPH_NAMES =              0x00000080u,
   HB_SUBSET_FLAGS_NO_PRUNE_UNICODE_RANGES =  0x00000100u,
   HB_SUBSET_FLAGS_NO_LAYOUT_CLOSURE =        0x00000200u,
+  HB_SUBSET_FLAGS_OPTIMIZE_IUP_DELTAS     =  0x00000400u,
+#ifdef HB_EXPERIMENTAL_API
+  HB_SUBSET_FLAGS_IFTB_REQUIREMENTS       =  0x00000800u,
+#endif
 } hb_subset_flags_t;
 
 /**
@@ -164,6 +173,10 @@ HB_EXTERN void
 hb_subset_input_set_flags (hb_subset_input_t *input,
                            unsigned value);
 
+HB_EXTERN hb_bool_t
+hb_subset_input_pin_all_axes_to_default (hb_subset_input_t  *input,
+                                         hb_face_t          *face);
+
 HB_EXTERN hb_bool_t
 hb_subset_input_pin_axis_to_default (hb_subset_input_t  *input,
                                      hb_face_t          *face,
@@ -175,15 +188,34 @@ hb_subset_input_pin_axis_location (hb_subset_input_t  *input,
                                    hb_tag_t            axis_tag,
                                    float               axis_value);
 
-#ifdef HB_EXPERIMENTAL_API
+HB_EXTERN hb_bool_t
+hb_subset_input_get_axis_range (hb_subset_input_t  *input,
+                                hb_tag_t            axis_tag,
+                                float              *axis_min_value,
+                                float              *axis_max_value,
+                                float              *axis_def_value);
+
 HB_EXTERN hb_bool_t
 hb_subset_input_set_axis_range (hb_subset_input_t  *input,
                                 hb_face_t          *face,
                                 hb_tag_t            axis_tag,
                                 float               axis_min_value,
                                 float               axis_max_value,
-                                float              *axis_def_value);
+                                float               axis_def_value);
 
+HB_EXTERN hb_bool_t
+hb_subset_axis_range_from_string (const char *str, int len,
+                                  float *axis_min_value,
+                                  float *axis_max_value,
+                                  float *axis_def_value);
+
+HB_EXTERN void
+hb_subset_axis_range_to_string (hb_subset_input_t *input,
+                                hb_tag_t axis_tag,
+                                char *buf,
+                                unsigned size);
+
+#ifdef HB_EXPERIMENTAL_API
 HB_EXTERN hb_bool_t
 hb_subset_input_override_name_table (hb_subset_input_t  *input,
                                      hb_ot_name_id_t     name_id,
@@ -192,7 +224,6 @@ hb_subset_input_override_name_table (hb_subset_input_t  *input,
                                      unsigned            language_id,
                                      const char         *name_str,
                                      int                 str_len);
-
 #endif
 
 HB_EXTERN hb_face_t *
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-ucd-table.hh b/src/java.desktop/share/native/libharfbuzz/hb-ucd-table.hh
index 8d3807a80f0..8731a0bcf8d 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-ucd-table.hh
+++ b/src/java.desktop/share/native/libharfbuzz/hb-ucd-table.hh
@@ -4,7 +4,7 @@
  *
  *   ./gen-ucd-table.py ucd.nounihan.grouped.xml
  *
- * on file with this description: Unicode 15.1.0
+ * on file with this description: Unicode 16.0.0
  */
 
 #ifndef HB_UCD_TABLE_HH
@@ -13,7 +13,7 @@
 #include "hb.hh"
 
 static const hb_script_t
-_hb_ucd_sc_map[165] =
+_hb_ucd_sc_map[172] =
 {
                    HB_SCRIPT_COMMON,              HB_SCRIPT_INHERITED,
                   HB_SCRIPT_UNKNOWN,                 HB_SCRIPT_ARABIC,
@@ -97,7 +97,10 @@ _hb_ucd_sc_map[165] =
                HB_SCRIPT_OLD_UYGHUR,                 HB_SCRIPT_TANGSA,
                      HB_SCRIPT_TOTO,               HB_SCRIPT_VITHKUQI,
                      HB_SCRIPT_MATH,                   HB_SCRIPT_KAWI,
-              HB_SCRIPT_NAG_MUNDARI,
+              HB_SCRIPT_NAG_MUNDARI,                  HB_SCRIPT_GARAY,
+             HB_SCRIPT_GURUNG_KHEMA,              HB_SCRIPT_KIRAT_RAI,
+                  HB_SCRIPT_OL_ONAL,                HB_SCRIPT_SUNUWAR,
+                   HB_SCRIPT_TODHRI,          HB_SCRIPT_TULU_TIGALARI,
 };
 static const uint16_t
 _hb_ucd_dm1_p0_map[825] =
@@ -868,7 +871,7 @@ _hb_ucd_dm2_u32_map[638] =
    HB_CODEPOINT_ENCODE3_11_7_14 (0x04E9u, 0x0308u, 0x04EBu),
 };
 static const uint64_t
-_hb_ucd_dm2_u64_map[388] =
+_hb_ucd_dm2_u64_map[408] =
 {
      HB_CODEPOINT_ENCODE3 (0x05D0u, 0x05B7u, 0x0000u),   HB_CODEPOINT_ENCODE3 (0x05D0u, 0x05B8u, 0x0000u),
      HB_CODEPOINT_ENCODE3 (0x05D0u, 0x05BCu, 0x0000u),   HB_CODEPOINT_ENCODE3 (0x05D1u, 0x05BCu, 0x0000u),
@@ -1051,13 +1054,23 @@ _hb_ucd_dm2_u64_map[388] =
      HB_CODEPOINT_ENCODE3 (0x30F0u, 0x3099u, 0x30F8u),   HB_CODEPOINT_ENCODE3 (0x30F1u, 0x3099u, 0x30F9u),
      HB_CODEPOINT_ENCODE3 (0x30F2u, 0x3099u, 0x30FAu),   HB_CODEPOINT_ENCODE3 (0x30FDu, 0x3099u, 0x30FEu),
      HB_CODEPOINT_ENCODE3 (0xFB49u, 0x05C1u, 0x0000u),   HB_CODEPOINT_ENCODE3 (0xFB49u, 0x05C2u, 0x0000u),
+   HB_CODEPOINT_ENCODE3 (0x105D2u, 0x0307u, 0x105C9u), HB_CODEPOINT_ENCODE3 (0x105DAu, 0x0307u, 0x105E4u),
   HB_CODEPOINT_ENCODE3 (0x11099u, 0x110BAu, 0x1109Au),HB_CODEPOINT_ENCODE3 (0x1109Bu, 0x110BAu, 0x1109Cu),
   HB_CODEPOINT_ENCODE3 (0x110A5u, 0x110BAu, 0x110ABu),HB_CODEPOINT_ENCODE3 (0x11131u, 0x11127u, 0x1112Eu),
   HB_CODEPOINT_ENCODE3 (0x11132u, 0x11127u, 0x1112Fu),HB_CODEPOINT_ENCODE3 (0x11347u, 0x1133Eu, 0x1134Bu),
-  HB_CODEPOINT_ENCODE3 (0x11347u, 0x11357u, 0x1134Cu),HB_CODEPOINT_ENCODE3 (0x114B9u, 0x114B0u, 0x114BCu),
-  HB_CODEPOINT_ENCODE3 (0x114B9u, 0x114BAu, 0x114BBu),HB_CODEPOINT_ENCODE3 (0x114B9u, 0x114BDu, 0x114BEu),
-  HB_CODEPOINT_ENCODE3 (0x115B8u, 0x115AFu, 0x115BAu),HB_CODEPOINT_ENCODE3 (0x115B9u, 0x115AFu, 0x115BBu),
-  HB_CODEPOINT_ENCODE3 (0x11935u, 0x11930u, 0x11938u), HB_CODEPOINT_ENCODE3 (0x1D157u, 0x1D165u, 0x0000u),
+  HB_CODEPOINT_ENCODE3 (0x11347u, 0x11357u, 0x1134Cu),HB_CODEPOINT_ENCODE3 (0x11382u, 0x113C9u, 0x11383u),
+  HB_CODEPOINT_ENCODE3 (0x11384u, 0x113BBu, 0x11385u),HB_CODEPOINT_ENCODE3 (0x1138Bu, 0x113C2u, 0x1138Eu),
+  HB_CODEPOINT_ENCODE3 (0x11390u, 0x113C9u, 0x11391u),HB_CODEPOINT_ENCODE3 (0x113C2u, 0x113B8u, 0x113C7u),
+  HB_CODEPOINT_ENCODE3 (0x113C2u, 0x113C2u, 0x113C5u),HB_CODEPOINT_ENCODE3 (0x113C2u, 0x113C9u, 0x113C8u),
+  HB_CODEPOINT_ENCODE3 (0x114B9u, 0x114B0u, 0x114BCu),HB_CODEPOINT_ENCODE3 (0x114B9u, 0x114BAu, 0x114BBu),
+  HB_CODEPOINT_ENCODE3 (0x114B9u, 0x114BDu, 0x114BEu),HB_CODEPOINT_ENCODE3 (0x115B8u, 0x115AFu, 0x115BAu),
+  HB_CODEPOINT_ENCODE3 (0x115B9u, 0x115AFu, 0x115BBu),HB_CODEPOINT_ENCODE3 (0x11935u, 0x11930u, 0x11938u),
+  HB_CODEPOINT_ENCODE3 (0x1611Eu, 0x1611Eu, 0x16121u),HB_CODEPOINT_ENCODE3 (0x1611Eu, 0x1611Fu, 0x16123u),
+  HB_CODEPOINT_ENCODE3 (0x1611Eu, 0x16120u, 0x16125u),HB_CODEPOINT_ENCODE3 (0x1611Eu, 0x16129u, 0x16122u),
+  HB_CODEPOINT_ENCODE3 (0x16121u, 0x1611Fu, 0x16126u),HB_CODEPOINT_ENCODE3 (0x16121u, 0x16120u, 0x16128u),
+  HB_CODEPOINT_ENCODE3 (0x16122u, 0x1611Fu, 0x16127u),HB_CODEPOINT_ENCODE3 (0x16129u, 0x1611Fu, 0x16124u),
+  HB_CODEPOINT_ENCODE3 (0x16D63u, 0x16D67u, 0x16D69u),HB_CODEPOINT_ENCODE3 (0x16D67u, 0x16D67u, 0x16D68u),
+  HB_CODEPOINT_ENCODE3 (0x16D69u, 0x16D67u, 0x16D6Au), HB_CODEPOINT_ENCODE3 (0x1D157u, 0x1D165u, 0x0000u),
    HB_CODEPOINT_ENCODE3 (0x1D158u, 0x1D165u, 0x0000u), HB_CODEPOINT_ENCODE3 (0x1D15Fu, 0x1D16Eu, 0x0000u),
    HB_CODEPOINT_ENCODE3 (0x1D15Fu, 0x1D16Fu, 0x0000u), HB_CODEPOINT_ENCODE3 (0x1D15Fu, 0x1D170u, 0x0000u),
    HB_CODEPOINT_ENCODE3 (0x1D15Fu, 0x1D171u, 0x0000u), HB_CODEPOINT_ENCODE3 (0x1D15Fu, 0x1D172u, 0x0000u),
@@ -1069,90 +1082,59 @@ _hb_ucd_dm2_u64_map[388] =
 #ifndef HB_OPTIMIZE_SIZE
 
 static const uint8_t
-_hb_ucd_u8[17884] =
+_hb_ucd_u8[17612] =
 {
-    0,  1,  2,  3,  4,  5,  6,  7,  7,  8,  7,  7,  7,  7,  7,  7,
-    7,  7,  7,  7,  9, 10,  7,  7,  7,  7, 11, 12, 13, 13, 13, 14,
-   15, 16, 17, 18, 19, 20, 21, 22, 23, 22, 22, 22, 22, 24,  7,  7,
-   25, 26, 22, 22, 22, 27, 28, 29, 22, 30, 31, 32, 33, 34, 35, 36,
-    7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,
-    7,  7,  7,  7, 37,  7, 38, 39,  7, 40,  7,  7,  7, 41, 22, 42,
-    7,  7, 43,  7, 44, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-   22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-   22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-   22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-   22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-   22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-   22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-   22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-   22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-   22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-   22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-   22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-   22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-   22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-   22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-   22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-   22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-   22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-   22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-   22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-   22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-   22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-   45, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-   22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-   13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
-   13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 46,
-   13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
-   13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 47,
+    0,  1,  2,  3,  4,  5,  5,  5,  5,  5,  6,  5,  5,  7,  8,  9,
+   10, 11, 12, 13, 14, 15, 16,  5, 17, 15, 18, 19, 20, 21, 22, 23,
+    5,  5,  5,  5,  5,  5,  5,  5,  5,  5, 24, 25, 26,  5, 27, 28,
+    5, 29, 30, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
+   15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
+   15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
+   15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
+   15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
+   15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
+   15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
+   15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
+   15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
+   15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
+   15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
+   31, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
+    8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8, 32,
+    8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8, 33,
     0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 14, 15,
-   16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
-   32, 33, 34, 34, 35, 36, 37, 38, 39, 34, 34, 34, 40, 41, 42, 43,
-   44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59,
-   60, 61, 62, 63, 64, 64, 65, 66, 67, 68, 69, 70, 71, 69, 72, 73,
-   69, 69, 64, 74, 64, 64, 75, 76, 77, 78, 79, 80, 81, 82, 69, 83,
-   84, 85, 86, 87, 88, 89, 69, 69, 34, 34, 34, 34, 34, 34, 34, 34,
-   34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-   34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 90, 34, 34, 34, 34,
-   91, 34, 34, 34, 34, 34, 34, 34, 34, 92, 34, 34, 93, 94, 95, 96,
-   97, 98, 99,100,101,102,103,104, 34, 34, 34, 34, 34, 34, 34, 34,
-   34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,105,
-  106,106,106,106,106,106,106,106,106,106,106,106,106,106,106,106,
-  107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,
-  107,107, 34, 34,108,109,110,111, 34, 34,112,113,114,115,116,117,
-  118,119,120,121,122,123,124,125,126,127,128,129, 34, 34,130,131,
-  132,133,134,135,136,137,138,139,140,141,142,122,143,144,145,146,
-  147,148,149,150,151,152,153,122,154,155,122,156,157,158,159,122,
-  160,161,162,163,164,165,166,122,167,168,169,170,122,171,172,173,
-   34, 34, 34, 34, 34, 34, 34,174,175, 34,176,122,122,122,122,122,
-  122,122,122,122,122,122,122,122,122,122,122,122,122,122,122,177,
-   34, 34, 34, 34, 34, 34, 34, 34,178,122,122,122,122,122,122,122,
-  122,122,122,122,122,122,122,122,122,122,122,122,122,122,122,122,
-  122,122,122,122,122,122,122,122, 34, 34, 34, 34,179,122,122,122,
-   34, 34, 34, 34,180,181,182,183,122,122,122,122,184,185,186,187,
-   34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,188,
-   34, 34, 34, 34, 34, 34, 34, 34, 34,189,190,122,122,122,122,122,
-  122,122,122,122,122,122,122,122,122,122,122,122,122,122,122,191,
-   34, 34,192, 34, 34,193,122,122,122,122,122,122,122,122,122,122,
-  122,122,122,122,122,122,122,122,194,195,122,122,122,122,122,122,
-  122,122,122,122,122,122,122,122,122,122,122,122,122,122,196,197,
-   69,198,199,200,201,202,203,122,204,205,206,207,208,209,210,211,
-   69, 69, 69, 69,212,213,122,122,122,122,122,122,122,122,214,122,
-  215,216,217,122,122,218,122,122,122,219,122,122,122,122,122,220,
-   34,221,222,122,122,122,122,122,223,224,225,122,226,227,122,122,
-  228,229,230,231,232,122, 69,233, 69, 69, 69, 69, 69,234,235,236,
-  237,238, 69, 69,239,240, 69,241,122,122,122,122,122,122,122,122,
-   34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,242, 34, 34,
-   34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,243, 34,
-  244, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-   34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,245, 34, 34,
-   34, 34, 34, 34, 34, 34, 34,246, 34, 34, 34, 34,247,122,122,122,
-   34, 34, 34, 34,248,122,122,122,122,122,122,122,122,122,122,122,
-   34, 34, 34, 34, 34, 34,249, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-   34, 34, 34, 34, 34, 34, 34,250,122,122,122,122,122,122,122,122,
-  251,122,252,253,122,122,122,122,122,122,122,122,122,122,122,122,
-  107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,254,
-  107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,255,
+   16, 17, 18, 19, 20, 17, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30,
+   31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 33, 41, 42, 43, 44, 45,
+   46, 47, 48, 39, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
+   17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 49, 17, 17,
+   17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
+   50, 17, 17, 17, 51, 17, 52, 53, 54, 55, 56, 57, 17, 17, 17, 17,
+   17, 17, 17, 17, 17, 17, 17, 58, 59, 59, 59, 59, 59, 59, 59, 59,
+   60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60,
+   60, 60, 60, 60, 60, 60, 60, 60, 60, 17, 61, 62, 17, 63, 64, 65,
+   66, 67, 68, 69, 70, 71, 17, 72, 73, 74, 75, 76, 77, 78, 79, 80,
+   81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96,
+   17, 17, 17, 97, 98, 99,100,100,100,100,100,100,100,100,100,101,
+   17, 17, 17, 17,102, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
+   17, 17, 17,103, 17, 17,104,100,100,100,100,100,100,100,100,100,
+  100,100,100,100,100,100,100,100,100,100,100,100,100,100,100,100,
+  100,105,100,100,100,100,100,100, 17, 17,106,107,100,108,109,110,
+   17, 17, 17, 17, 17, 17, 17,111, 17, 17, 17, 17,112,113,100,100,
+  100,100,100,100,100,100,100,100,100,100,100,100,100,100,100,114,
+   17,115,116,100,100,100,100,100,100,100,100,100,117,100,100,100,
+  100,100,100,100,100,100,100,100,100,100,100,100,118, 39,119,120,
+  121,122,123,124,125,126,127,128, 39, 39,129,100,100,100,100,130,
+  131,132,133,100,134,135,100,136,137,138,100,100,139,140,141,100,
+  142,143,144,145, 39, 39,146,147,148, 39,149,150,100,100,100,100,
+   17, 17, 17, 17, 17, 17,151, 17, 17, 17, 17, 17, 17, 17, 17, 17,
+   17, 17, 17, 17, 17, 17, 17,152,153, 17, 17, 17, 17, 17, 17, 17,
+   17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17,154, 17,
+   17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17,155, 17, 17,156,100,
+  100,100,100,100,100,100,100,100, 17, 17,157,100,100,100,100,100,
+   17, 17, 17,158, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
+   17, 17, 17,159,100,100,100,100,100,100,100,100,100,100,100,100,
+  160,161,100,100,100,100,100,100,100,100,100,100,100,100,100,100,
+   60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60,162,
+   60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60,163,
     0,  0,  0,  0,  0,  0,  0,  0,  1,  2,  3,  2,  4,  5,  6,  2,
     7,  7,  7,  7,  7,  2,  8,  9, 10, 11, 11, 11, 11, 11, 11, 11,
    11, 11, 11, 11, 11, 12, 13, 14, 15, 16, 16, 16, 16, 16, 16, 16,
@@ -1189,7 +1171,7 @@ _hb_ucd_u8[17884] =
    43, 43, 40, 21,  2, 81, 57, 20, 36, 36, 36, 43, 43, 75, 43, 43,
    43, 43, 75, 43, 75, 43, 43, 44,  2,  2,  2,  2,  2,  2,  2, 64,
    36, 36, 36, 36, 70, 43, 44, 64, 36, 36, 36, 36, 36, 61, 44, 44,
-   36, 36, 36, 36, 82, 36, 36, 61, 65, 44, 44, 44, 43, 43, 43, 43,
+   36, 36, 36, 36, 82, 36, 36, 61, 65, 44, 44, 57, 43, 43, 43, 43,
    36, 36, 36, 36, 83, 43, 43, 43, 43, 84, 43, 43, 43, 43, 43, 43,
    43, 85, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 85, 71, 86,
    87, 43, 43, 43, 85, 86, 87, 86, 70, 43, 43, 43, 36, 36, 36, 36,
@@ -1262,13 +1244,13 @@ _hb_ucd_u8[17884] =
    85, 85, 87, 43, 43, 43, 85, 86, 86, 87, 43, 43, 43, 43, 80, 57,
     2,  2,  2, 88,  2,  2,  2, 44, 43, 43, 43, 43, 43, 43, 43,109,
    43, 43, 43, 43, 43, 43, 43, 80, 43, 43, 98, 36, 36, 36, 36, 36,
-   36, 36, 85, 43, 43, 85, 85, 86, 86, 85, 98, 36, 36, 36, 61, 44,
-   97, 67, 67, 67, 67, 50, 43, 43, 43, 43, 67, 67, 67, 67, 21, 64,
+   36, 36, 85, 43, 43, 85, 85, 86, 86, 85, 98, 36, 36, 36, 61,  2,
+   97, 67, 67, 67, 67, 50, 43, 43, 43, 43, 67, 67, 67, 67, 21,  2,
    43, 98, 36, 36, 36, 36, 36, 36, 94, 43, 43, 86, 43, 87, 43, 36,
    36, 36, 36, 85, 43, 86, 87, 87, 43, 86, 44, 44, 44, 44,  2,  2,
    36, 36, 86, 86, 86, 86, 43, 43, 43, 43, 86, 43, 44, 93,  2,  2,
     7,  7,  7,  7,  7, 44, 62, 36, 36, 36, 36, 36, 40, 40, 40,  2,
-   16, 16, 16, 16,110, 44, 44, 44, 11, 11, 11, 11, 11, 47, 48, 11,
+   16, 16, 16, 16, 34,110, 44, 44, 11, 11, 11, 11, 11, 47, 48, 11,
     2,  2,  2,  2, 44, 44, 44, 44, 43, 60, 43, 43, 43, 43, 43, 43,
    85, 43, 43, 43, 71, 36, 70, 36, 36, 36, 71, 94, 43, 61, 44, 44,
    16, 16, 16, 16, 16, 16, 40, 40, 40, 40, 40, 40, 40, 45, 16, 16,
@@ -1296,33 +1278,33 @@ _hb_ucd_u8[17884] =
    67, 67, 67, 67,  4,  4, 67, 67,  8, 67, 67, 67,145,146, 67, 67,
    67, 67, 67, 67, 67, 67,144, 67, 67, 67, 67, 67, 67, 26,  8,  8,
     8,  8, 67, 67, 67, 67, 67, 67, 67, 67, 67, 67, 67, 67,  8,  8,
-    8, 67, 67, 67, 67, 67, 67, 67, 67, 67, 67, 92, 44, 44, 44, 44,
-   67, 67, 67, 67, 67, 92, 44, 44, 27, 27, 27, 27, 27, 27, 67, 67,
-   67, 67, 67, 67, 67, 27, 27, 27, 67, 67, 67, 26, 67, 67, 67, 67,
-   26, 67, 67, 67, 67, 67, 67, 67, 67, 67, 67, 67,  8,  8,  8,  8,
-   67, 67, 67, 67, 67, 67, 67, 26, 67, 67, 67, 67,  4,  4,  4,  4,
-    4,  4,  4, 27, 27, 27, 27, 27, 27, 27, 67, 67, 67, 67, 67, 67,
-    8,  8,129,147,  8,  8,  8,  8,  8,  8,  8,  4,  4,  4,  4,  4,
-    8,129,148,148,148,148,148,148,148,148,148,148,147,  8,  8,  8,
-    8,  8,  8,  8,  4,  4,  8,  8,  8,  8,  8,  8,  8,  8,  4,  8,
-    8,  8,144, 26,  8,  8,144, 67, 67, 67, 44, 67, 67, 67, 67, 67,
-   67, 67, 67, 55, 67, 67, 67, 67, 32, 11, 32, 34, 34, 34, 34, 11,
-   32, 32, 34, 16, 16, 16, 40, 11, 32, 32,140, 67, 67,138, 34,149,
-   43, 32, 44, 44, 93,  2, 99,  2, 16, 16, 16,150, 44, 44,150, 44,
-   36, 36, 36, 36, 44, 44, 44, 52, 64, 44, 44, 44, 44, 44, 44, 57,
-   36, 36, 36, 61, 44, 44, 44, 44, 36, 36, 36, 61, 36, 36, 36, 61,
-    2,121,121,  2,125,126,121,  2,  2,  2,  2,  6,  2,108,121,  2,
-  121,  4,  4,  4,  4,  2,  2, 88,  2,  2,  2,  2,  2,120,  2,  2,
-  108,151,  2,  2,  2,  2,  2,  2, 67,  2,152,148,148,148,153, 44,
-   67, 67, 67, 67, 67, 55, 67, 67, 67, 67, 44, 44, 44, 44, 44, 44,
-   67, 67, 67, 44, 44, 44, 44, 44,  1,  2,154,155,  4,  4,  4,  4,
-    4, 67,  4,  4,  4,  4,156,157,158,105,105,105,105, 43, 43, 86,
-  159, 40, 40, 67,105,160, 63, 67, 36, 36, 36, 61, 57,161,162, 69,
-   36, 36, 36, 36, 36, 63, 40, 69, 44, 44, 62, 36, 36, 36, 36, 36,
-   67, 27, 27, 67, 67, 67, 67, 67, 67, 67, 44, 44, 44, 44, 44, 55,
-   67, 67, 67, 67, 67, 67, 67, 92, 27, 27, 27, 27, 27, 67, 67, 67,
-   67, 67, 67, 67, 27, 27, 27, 27,163, 27, 27, 27, 27, 27, 27, 27,
-   36, 36, 83, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36,164,  2,
+    8, 67, 67, 67, 67, 67, 67, 67, 67, 67, 67, 67, 67, 92, 44, 44,
+   27, 27, 27, 27, 27, 27, 67, 67, 67, 67, 67, 67, 67, 27, 27, 27,
+   67, 67, 67, 26, 67, 67, 67, 67, 26, 67, 67, 67, 67, 67, 67, 67,
+   67, 67, 67, 67,  8,  8,  8,  8, 67, 67, 67, 67, 67, 67, 67, 26,
+   67, 67, 67, 67,  4,  4,  4,  4,  4,  4,  4, 27, 27, 27, 27, 27,
+   27, 27, 67, 67, 67, 67, 67, 67,  8,  8,129,147,  8,  8,  8,  8,
+    8,  8,  8,  4,  4,  4,  4,  4,  8,129,148,148,148,148,148,148,
+  148,148,148,148,147,  8,  8,  8,  8,  8,  8,  8,  4,  4,  8,  8,
+    8,  8,  8,  8,  8,  8,  4,  8,  8,  8,144, 26,  8,  8,144, 67,
+   67, 67, 44, 67, 67, 67, 67, 67, 67, 67, 67, 55, 67, 67, 67, 67,
+   32, 11, 32, 34, 34, 34, 34, 11, 32, 32, 34, 16, 16, 16, 40, 11,
+   32, 32,140, 67, 67,138, 34,149, 43, 32, 44, 44, 93,  2, 99,  2,
+   16, 16, 16,150, 44, 44,150, 44, 36, 36, 36, 36, 44, 44, 44, 52,
+   64, 44, 44, 44, 44, 44, 44, 57, 36, 36, 36, 61, 44, 44, 44, 44,
+   36, 36, 36, 61, 36, 36, 36, 61,  2,121,121,  2,125,126,121,  2,
+    2,  2,  2,  6,  2,108,121,  2,121,  4,  4,  4,  4,  2,  2, 88,
+    2,  2,  2,  2,  2,120,  2,  2,108,151,  2,  2,  2,  2,  2,  2,
+   67,  2,152,148,148,148,153, 44, 67, 67, 67, 67, 67, 55, 67, 67,
+   67, 67, 44, 44, 44, 44, 44, 44, 67, 67, 67, 44, 44, 44, 44, 44,
+    1,  2,154,155,  4,  4,  4,  4,  4, 67,  4,  4,  4,  4,156,157,
+  158,105,105,105,105, 43, 43, 86,159, 40, 40, 67,105,160, 63, 67,
+   36, 36, 36, 61, 57,161,162, 69, 36, 36, 36, 36, 36, 63, 40, 69,
+   44, 44, 62, 36, 36, 36, 36, 36, 67, 27, 27, 67, 67, 67, 67, 67,
+   67, 67, 67, 44, 44, 44, 44, 55, 67, 67, 67, 67, 67, 67, 67, 92,
+   27, 27, 27, 27, 27, 67, 67, 67, 67, 67, 67, 67, 27, 27, 27, 27,
+  163, 27, 27, 27, 27, 27, 27, 27, 36, 36, 83, 36, 36, 36, 36, 36,
+   67, 67, 67, 92, 44, 44, 44, 44, 36, 36, 36, 36, 36, 36,164,  2,
     7,  7,  7,  7,  7, 36, 44, 44, 32, 32, 32, 32, 32, 32, 32, 70,
    51,165, 43, 43, 43, 43, 43, 88, 32, 32, 32, 32, 32, 32, 40, 43,
    36, 36, 36,105,105,105,105,105, 43,  2,  2,  2, 44, 44, 44, 44,
@@ -1330,7 +1312,7 @@ _hb_ucd_u8[17884] =
    16, 32, 32, 32, 32, 32, 32, 32, 45, 16, 16, 16, 34, 34, 34, 32,
    32, 32, 32, 32, 42,166, 34, 35, 32, 32, 16, 32, 32, 32, 32, 32,
    32, 32, 32, 32, 32, 11, 11, 32, 11, 11, 32, 32, 32, 32, 32, 32,
-   32, 32, 11, 11, 34,110, 44, 44, 32,150,150, 32, 32, 44, 44, 44,
+   32, 32, 11, 11, 34, 34, 32, 44, 32,150,150, 32, 32, 32, 47, 44,
    44, 40,167, 35, 40, 35, 36, 36, 36, 71, 36, 71, 36, 70, 36, 36,
    36, 94, 87, 85, 67, 67, 80, 44, 27, 27, 27, 67,168, 44, 44, 44,
    36, 36,  2,  2, 44, 44, 44, 44, 86, 36, 36, 36, 36, 36, 36, 36,
@@ -1391,8 +1373,10 @@ _hb_ucd_u8[17884] =
    36, 61, 44, 44, 27, 27, 27, 27, 36, 44, 44, 44, 93,  2, 64, 44,
    44, 44, 44, 44,179, 27, 27, 27, 11, 47, 44, 44, 44, 44, 44, 44,
    16,110, 44, 44, 44, 27, 27, 27, 36, 36, 43, 43, 44, 44, 44, 44,
-   27, 27, 27, 27, 27, 27, 27,100, 36, 36, 36, 36, 36, 57,184, 44,
-   36, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 57, 43,
+    7,  7,  7,  7,  7, 36, 36, 69, 11, 11, 11, 44, 57, 43, 43,159,
+   16, 16, 16, 44, 44, 44, 44,  8, 27, 27, 27, 27, 27, 27, 27,100,
+   36, 36, 36, 36, 36, 57,184, 44, 36, 44, 44, 44, 44, 44, 44, 44,
+   44, 36, 61, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 43, 43,
    27, 27, 27, 95, 44, 44, 44, 44,180, 27, 30,  2,  2, 44, 44, 44,
    36, 43, 43,  2,  2, 44, 44, 44, 36, 36,183, 27, 27, 27, 44, 44,
    87, 98, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 43, 43, 43, 43,
@@ -1410,14 +1394,18 @@ _hb_ucd_u8[17884] =
    86, 87, 43, 43, 43, 80, 44, 44, 43, 86, 62, 36, 36, 36, 61, 62,
    61, 36, 62, 36, 36, 57, 71, 86, 85, 86, 90, 89, 90, 89, 86, 44,
    61, 44, 44, 89, 44, 44, 62, 36, 36, 86, 44, 43, 43, 43, 80, 44,
-   43, 43, 80, 44, 44, 44, 44, 44, 36, 36, 94, 86, 43, 43, 43, 43,
-   86, 43, 85, 71, 36, 63,  2,  2,  7,  7,  7,  7,  7,  2, 93, 71,
-   86, 87, 43, 43, 85, 85, 86, 87, 85, 43, 36, 72, 44, 44, 44, 44,
-   36, 36, 36, 36, 36, 36, 36, 94, 86, 43, 43, 44, 86, 86, 43, 87,
-   60,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2, 36, 36, 43, 44,
-   86, 87, 43, 43, 43, 85, 87, 87, 60,  2, 61, 44, 44, 44, 44, 44,
-    2,  2,  2,  2,  2,  2, 64, 44, 36, 36, 36, 36, 36, 70, 87, 86,
-   43, 43, 43, 87, 63, 44, 44, 44, 86, 43, 43, 87, 43, 43, 44, 44,
+   43, 43, 80, 44, 44, 44, 44, 44, 36, 36, 36, 36, 36, 62, 44, 61,
+   36, 36, 36, 62, 86, 87, 43, 43, 80, 90, 89, 89, 86, 90, 86, 85,
+   71, 71,  2, 93, 64, 44, 44, 44, 57, 80, 44, 44, 44, 44, 44, 44,
+   36, 36, 94, 86, 43, 43, 43, 43, 86, 43, 85, 71, 36, 63,  2,  2,
+    7,  7,  7,  7,  7,  2, 93, 71, 86, 87, 43, 43, 85, 85, 86, 87,
+   85, 43, 36, 72, 44, 44, 44, 44, 36, 36, 36, 36, 36, 36, 36, 94,
+   86, 43, 43, 44, 86, 86, 43, 87, 60,  2,  2,  2,  2,  2,  2,  2,
+    2,  2,  2,  2, 36, 36, 43, 44, 86, 87, 43, 43, 43, 85, 87, 87,
+   60,  2, 61, 44, 44, 44, 44, 44,  2,  2,  2,  2,  2,  2, 64, 44,
+   36, 36, 36, 36, 36, 70, 87, 86, 43, 43, 43, 87, 63, 44, 44, 44,
+    7,  7,  7,  7,  7,  7,  7,  7,  7,  7, 44, 44, 44, 44, 44, 44,
+   36, 36, 36, 36, 36, 61, 57, 87, 86, 43, 43, 87, 43, 43, 44, 44,
     7,  7,  7,  7,  7, 27,  2, 97, 43, 43, 43, 43, 87, 60, 44, 44,
    27,100, 44, 44, 44, 44, 44, 62, 36, 36, 36, 61, 62, 44, 36, 36,
    36, 36, 62, 61, 36, 36, 36, 36, 86, 86, 86, 89, 90, 57, 85, 71,
@@ -1427,49 +1415,52 @@ _hb_ucd_u8[17884] =
     2,  2,  2, 59, 44, 44, 44, 44, 70, 43, 43, 85, 87, 43, 36, 36,
    36, 36, 36, 36, 36, 43, 43, 43, 43, 43, 43, 85, 43,  2, 72,  2,
     2, 64, 44, 44, 44, 44, 44, 44,  2,  2,  2,  2,  2, 44, 44, 44,
-   43, 43, 43, 80, 43, 43, 43, 87, 63,  2,  2, 44, 44, 44, 44, 44,
-    2, 36, 36, 36, 36, 36, 36, 36, 44, 43, 43, 43, 43, 43, 43, 43,
-   43, 43, 43, 43, 89, 43, 43, 43, 85, 43, 87, 80, 44, 44, 44, 44,
-   36, 36, 36, 61, 36, 62, 36, 36, 70, 43, 43, 80, 44, 80, 43, 57,
-   43, 43, 43, 70, 44, 44, 44, 44, 36, 36, 36, 62, 61, 36, 36, 36,
-   36, 36, 36, 36, 36, 86, 86, 90, 43, 89, 87, 87, 61, 44, 44, 44,
-   36, 70, 85,107, 64, 44, 44, 44, 43, 94, 36, 36, 36, 36, 36, 36,
-   36, 36, 86, 43, 43, 80, 44, 86, 85, 60,  2,  2,  2,  2,  2,  2,
+   63, 44, 44, 44, 44, 44, 44, 44, 43, 43, 43, 80, 43, 43, 43, 87,
+   63,  2,  2, 44, 44, 44, 44, 44,  2, 36, 36, 36, 36, 36, 36, 36,
+   44, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 89, 43, 43, 43,
+   85, 43, 87, 80, 44, 44, 44, 44, 36, 36, 36, 61, 36, 62, 36, 36,
+   70, 43, 43, 80, 44, 80, 43, 57, 43, 43, 43, 70, 44, 44, 44, 44,
+   36, 36, 36, 62, 61, 36, 36, 36, 36, 36, 36, 36, 36, 86, 86, 90,
+   43, 89, 87, 87, 61, 44, 44, 44, 36, 70, 85,107, 64, 44, 44, 44,
+   43, 94, 36, 36, 36, 36, 36, 36, 36, 36, 86, 43, 43, 80, 44, 86,
+   85, 60,  2,  2,  2,  2,  2,  2,  7,  7,  7,  7,  7, 80, 44, 44,
    27, 27, 91, 67, 67, 67, 56, 20,168, 67, 67, 67, 67, 67, 67, 67,
    67, 44, 44, 44, 44, 44, 44, 93,105,105,105,105,105,105,105,181,
     2,  2, 64, 44, 44, 44, 44, 44, 63, 64, 44, 44, 44, 44, 44, 44,
    65, 65, 65, 65, 65, 65, 65, 65, 71, 36, 36, 70, 43, 43, 43, 43,
-   43, 43, 43, 44, 44, 44, 44, 44, 43, 43, 60, 44, 44, 44, 44, 44,
+   43, 43, 43, 44, 44, 44, 44, 44, 36, 36, 36, 36, 36, 36, 36, 43,
+   43, 43, 43, 43, 43, 86, 87, 43, 43, 43, 60, 44, 44, 44, 44, 44,
    43, 43, 43, 60,  2,  2, 67, 67, 40, 40, 97, 44, 44, 44, 44, 44,
     7,  7,  7,  7,  7,179, 27, 27, 27, 62, 36, 36, 36, 36, 36, 36,
-   36, 36, 36, 36, 44, 44, 62, 36, 27, 27, 27, 30,  2, 64, 44, 44,
+   36, 36, 36, 36, 44, 44, 62, 36, 40, 69, 36, 36, 36, 36, 36, 36,
+   36, 36, 36, 36, 36, 83,164,  2, 27, 27, 27, 30,  2, 64, 44, 44,
    36, 36, 36, 36, 36, 61, 44, 57, 94, 86, 86, 86, 86, 86, 86, 86,
    86, 86, 86, 86, 86, 86, 86, 86, 86, 86, 86, 86, 44, 44, 44, 57,
    43, 74, 40, 40, 40, 40, 40, 40, 40, 88, 80, 44, 44, 44, 44, 44,
-   86, 44, 44, 44, 44, 44, 44, 44, 40, 40, 52, 40, 40, 40, 52, 81,
-   36, 61, 44, 44, 44, 44, 44, 44, 44, 61, 44, 44, 44, 44, 44, 44,
-   36, 61, 62, 44, 44, 44, 44, 44, 44, 44, 36, 36, 44, 44, 44, 44,
-   36, 36, 36, 36, 36, 44, 50, 60, 65, 65, 44, 44, 44, 44, 44, 44,
-   43, 43, 43, 43, 43, 43, 43, 44, 43, 43, 43, 80, 44, 44, 44, 44,
-   67, 67, 67, 92, 55, 67, 67, 67, 67, 67,186, 87, 43, 67,186, 86,
-   86,187, 65, 65, 65, 84, 43, 43, 43, 76, 50, 43, 43, 43, 67, 67,
-   67, 67, 67, 67, 67, 43, 43, 67, 67, 43, 76, 44, 44, 44, 44, 44,
-   27, 27, 44, 44, 44, 44, 44, 44, 11, 11, 11, 11, 11, 16, 16, 16,
-   16, 16, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 16,
-   16, 16,110, 16, 16, 16, 16, 16, 11, 16, 16, 16, 16, 16, 16, 16,
-   16, 16, 16, 16, 16, 16, 47, 11, 44, 47, 48, 47, 48, 11, 47, 11,
-   11, 11, 11, 16, 16,150,150, 16, 16, 16,150, 16, 16, 16, 16, 16,
-   16, 16, 11, 48, 11, 47, 48, 11, 11, 11, 47, 11, 11, 11, 47, 16,
-   16, 16, 16, 16, 11, 48, 11, 47, 11, 11, 47, 47, 44, 11, 11, 11,
-   47, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 11, 11,
-   11, 11, 11, 16, 16, 16, 16, 16, 16, 16, 16, 44, 11, 11, 11, 11,
-   31, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 33, 16, 16,
-   16, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 31, 16, 16,
-   16, 16, 33, 16, 16, 16, 11, 11, 11, 11, 31, 16, 16, 16, 16, 16,
-   16, 16, 16, 16, 16, 16, 16, 33, 16, 16, 16, 11, 11, 11, 11, 11,
-   11, 11, 11, 11, 11, 11, 11, 31, 16, 16, 16, 16, 33, 16, 16, 16,
-   11, 11, 11, 11, 31, 16, 16, 16, 16, 33, 16, 16, 16, 32, 44,  7,
-    7,  7,  7,  7,  7,  7,  7,  7, 43, 43, 43, 76, 67, 50, 43, 43,
+   86, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 62,
+   40, 40, 52, 40, 40, 40, 52, 81, 36, 61, 44, 44, 44, 44, 44, 44,
+   44, 61, 44, 44, 44, 44, 44, 44, 36, 61, 62, 44, 44, 44, 44, 44,
+   44, 44, 36, 36, 44, 44, 44, 44, 36, 36, 36, 36, 36, 44, 50, 60,
+   65, 65, 44, 44, 44, 44, 44, 44, 43, 43, 43, 43, 43, 43, 43, 44,
+   43, 43, 43, 80, 44, 44, 44, 44, 67, 67, 67, 92, 55, 67, 67, 67,
+   67, 67,186, 87, 43, 67,186, 86, 86,187, 65, 65, 65, 84, 43, 43,
+   43, 76, 50, 43, 43, 43, 67, 67, 67, 67, 67, 67, 67, 43, 43, 67,
+   67, 43, 76, 44, 44, 44, 44, 44, 27, 27, 44, 44, 44, 44, 44, 44,
+   11, 11, 11, 11, 11, 16, 16, 16, 16, 16, 11, 11, 11, 11, 11, 11,
+   11, 11, 11, 11, 11, 11, 11, 16, 16, 16,110, 16, 16, 16, 16, 16,
+   11, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 47, 11,
+   44, 47, 48, 47, 48, 11, 47, 11, 11, 11, 11, 16, 16,150,150, 16,
+   16, 16,150, 16, 16, 16, 16, 16, 16, 16, 11, 48, 11, 47, 48, 11,
+   11, 11, 47, 11, 11, 11, 47, 16, 16, 16, 16, 16, 11, 48, 11, 47,
+   11, 11, 47, 47, 44, 11, 11, 11, 47, 16, 16, 16, 16, 16, 16, 16,
+   16, 16, 16, 16, 16, 16, 11, 11, 11, 11, 11, 16, 16, 16, 16, 16,
+   16, 16, 16, 44, 11, 11, 11, 11, 31, 16, 16, 16, 16, 16, 16, 16,
+   16, 16, 16, 16, 16, 33, 16, 16, 16, 11, 11, 11, 11, 11, 11, 11,
+   11, 11, 11, 11, 11, 31, 16, 16, 16, 16, 33, 16, 16, 16, 11, 11,
+   11, 11, 31, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 33,
+   16, 16, 16, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 31,
+   16, 16, 16, 16, 33, 16, 16, 16, 11, 11, 11, 11, 31, 16, 16, 16,
+   16, 33, 16, 16, 16, 32, 44,  7, 43, 43, 43, 76, 67, 50, 43, 43,
    43, 43, 43, 43, 43, 43, 76, 67, 67, 67, 50, 67, 67, 67, 67, 67,
    67, 67, 76, 21,  2,  2, 44, 44, 44, 44, 44, 44, 44, 57, 43, 43,
    16, 16, 16, 16, 16, 39, 16, 16, 16, 16, 16, 16, 16, 16, 16,110,
@@ -1479,22 +1470,23 @@ _hb_ucd_u8[17884] =
    43, 43, 43, 74, 40, 40, 40, 44,  7,  7,  7,  7,  7, 44, 44, 77,
    36, 36, 36, 36, 36, 36, 36, 80, 36, 36, 36, 36, 36, 36, 43, 43,
     7,  7,  7,  7,  7, 44, 44, 96, 36, 36, 36, 36, 36, 83, 43, 43,
-   36, 36, 36, 61, 36, 36, 62, 61, 36, 36, 61,179, 27, 27, 27, 27,
-   16, 16, 43, 43, 43, 74, 44, 44, 27, 27, 27, 27, 27, 27,163, 27,
-  188, 27,100, 44, 44, 44, 44, 44, 27, 27, 27, 27, 27, 27, 27,163,
-   27, 27, 27, 27, 27, 27, 27, 44, 36, 36, 62, 36, 36, 36, 36, 36,
-   62, 61, 61, 62, 62, 36, 36, 36, 36, 61, 36, 36, 62, 62, 44, 44,
-   44, 61, 44, 62, 62, 62, 62, 36, 62, 61, 61, 62, 62, 62, 62, 62,
-   62, 61, 61, 62, 36, 61, 36, 36, 36, 61, 36, 36, 62, 36, 61, 61,
-   36, 36, 36, 36, 36, 62, 36, 36, 62, 36, 62, 36, 36, 62, 36, 36,
-    8, 44, 44, 44, 44, 44, 44, 44, 67, 67, 67, 67, 67, 67, 44, 44,
-   55, 67, 67, 67, 67, 67, 67, 67, 27, 27, 27, 27, 27, 27, 91, 67,
-   67, 67, 67, 67, 67, 67, 67, 44, 44, 44, 44, 67, 67, 67, 67, 67,
-   67, 92, 44, 44, 44, 44, 44, 44, 67, 67, 67, 67, 92, 44, 44, 44,
-   67, 44, 44, 44, 44, 44, 44, 44, 67, 67, 67, 67, 67, 25, 41, 41,
-   67, 67, 67, 67, 44, 44, 67, 67, 67, 67, 67, 92, 44, 55, 67, 67,
-   67, 67, 67, 67, 44, 44, 44, 44, 67, 67, 67, 67, 67, 67, 67, 55,
-   67, 67, 67, 44, 44, 44, 44, 67, 67, 92, 67, 67, 67, 67, 67, 67,
+  188,  7,  7,  7,  7,189, 44, 93, 36, 36, 36, 61, 36, 36, 62, 61,
+   36, 36, 61,179, 27, 27, 27, 27, 16, 16, 43, 43, 43, 74, 44, 44,
+   27, 27, 27, 27, 27, 27,163, 27,190, 27,100, 44, 44, 44, 44, 44,
+   27, 27, 27, 27, 27, 27, 27,163, 27, 27, 27, 27, 27, 27, 27, 44,
+   36, 36, 62, 36, 36, 36, 36, 36, 62, 61, 61, 62, 62, 36, 36, 36,
+   36, 61, 36, 36, 62, 62, 44, 44, 44, 61, 44, 62, 62, 62, 62, 36,
+   62, 61, 61, 62, 62, 62, 62, 62, 62, 61, 61, 62, 36, 61, 36, 36,
+   36, 61, 36, 36, 62, 36, 61, 61, 36, 36, 36, 36, 36, 62, 36, 36,
+   62, 36, 62, 36, 36, 62, 36, 36,  8, 44, 44, 44, 44, 44, 44, 44,
+   67, 67, 67, 67, 67, 67, 44, 44, 55, 67, 67, 67, 67, 67, 67, 67,
+   27, 27, 27, 27, 27, 27, 91, 67, 67, 67, 67, 67, 67, 67, 67, 44,
+   44, 44, 44, 67, 67, 67, 67, 67, 67, 92, 44, 44, 44, 44, 44, 44,
+   67, 67, 67, 67, 92, 44, 44, 44, 67, 44, 44, 44, 44, 44, 44, 44,
+   67, 67, 67, 67, 67, 25, 41, 41, 67, 67, 67, 67, 44, 44, 67, 67,
+   67, 67, 67, 92, 44, 55, 67, 67, 67, 67, 67, 67, 44, 44, 44, 44,
+   67, 67, 67, 67, 67, 44, 44, 55, 67, 67, 67, 92, 44, 44, 44, 67,
+   67, 67, 67, 67, 67, 67, 92, 55, 67, 92, 67, 67, 67, 67, 67, 67,
    79, 44, 44, 44, 44, 44, 44, 44,171,171,171,171,171,171,171, 44,
   171,171,171,171,171,171,171,  0,  0,  0, 29, 21, 21, 21, 23, 21,
    22, 18, 21, 25, 21, 17, 13, 13, 25, 25, 25, 21, 21,  9,  9,  9,
@@ -1520,366 +1512,350 @@ _hb_ucd_u8[17884] =
     6, 21, 11, 21, 24,  9,  6,  9, 23, 26,  6, 10,  4,  4,  3,  3,
     7, 25, 17, 16, 16, 22, 16, 16, 25, 17, 25,  2, 25, 24,  2, 15,
    12, 15, 14,  2, 21, 14,  7, 15, 12, 17, 21,  1, 26, 10, 10,  1,
-   23, 15,  0,  1,  2,  3,  4,  5,  6,  7,  8,  9,  0, 10, 11, 12,
-   13,  0, 14,  0,  0,  0,  0,  0, 15,  0, 16,  0,  0,  0,  0,  0,
+    7, 13, 13,  2, 23, 15,  0,  1,  2,  3,  4,  5,  6,  7,  8,  9,
+    0, 10, 11, 12, 13,  0, 14,  0,  0,  0,  0,  0, 15,  0, 16,  0,
     0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
     0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
     0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0, 17, 18, 19,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 20,
-    0, 21, 22, 23,  0,  0,  0, 24, 25, 26, 27, 28, 29, 30, 31, 32,
-   33, 34,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0, 35,  0, 36,  0,  0,  0,  0,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0, 17, 18, 19,  0,  0,  0,  0,
     0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
     0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-   37,  0,  0,  0,  0,  0,  0,  0,  0,  0, 38, 39,  0,  0,  0,  0,
-    0,  0, 40, 41, 42,  0, 43,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  1,  2,  0,  0,  0,  0,  3,  0,  0,  0,  4,  5,
-    6,  7,  0,  8,  9, 10,  0, 11, 12, 13, 14, 15, 16, 17, 16, 18,
-   16, 19, 16, 19, 16, 19,  0, 19, 16, 20, 16, 19, 21, 19,  0, 22,
-   23, 24, 25, 26, 27, 28, 29, 30, 31,  0, 32,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0, 33,  0,  0,  0,  0,  0,  0, 34,  0,  0, 35,
-    0,  0, 36,  0, 37,  0,  0,  0, 38, 39, 40, 41, 42, 43, 44, 45,
-   46,  0,  0, 47,  0,  0,  0, 48,  0,  0,  0, 49,  0,  0,  0,  0,
-    0,  0,  0, 50,  0, 51,  0, 52, 53,  0, 54,  0,  0,  0,  0,  0,
-    0, 55, 56, 57,  0,  0,  0,  0, 58,  0,  0, 59, 60, 61, 62, 63,
-    0,  0, 64, 65,  0,  0,  0, 66,  0,  0,  0,  0, 67,  0,  0,  0,
-   68,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 69,
-    0,  0,  0, 70,  0, 71,  0,  0, 72,  0,  0, 73,  0,  0,  0,  0,
-    0,  0,  0,  0, 74,  0,  0,  0,  0,  0, 75, 76,  0, 77, 78,  0,
-    0, 79, 80,  0, 81, 62,  0, 82, 83,  0,  0, 84, 85, 86,  0,  0,
-    0, 87,  0, 88,  0,  0, 51, 89, 51,  0, 90,  0, 91,  0,  0,  0,
-   80,  0,  0,  0, 92, 93,  0, 94, 95, 96, 97,  0,  0,  0,  0,  0,
-   51,  0,  0,  0,  0, 98, 99,  0,  0,  0,  0,  0,  0,100,  0,  0,
-    0,  0,  0,101,102,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,103,
-    0,  0,104,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,105,106,  0,
-    0,107,  0,  0,  0,  0,  0,  0,108,  0,109,  0,102,  0,  0,  0,
-    0,  0,110,111,  0,  0,  0,  0,  0,  0,  0,112,  0,  0,  0,  0,
-    0,  0,  0,113,  0,114,  0,  0,  0,  0,  0,  0,  1,  2,  3,  4,
-    5,  6,  7,  0,  8,  0,  0,  0,  0,  9, 10, 11, 12,  0,  0,  0,
-    0, 13,  0,  0, 14, 15,  0, 16,  0, 17, 18,  0,  0, 19,  0, 20,
-   21,  0,  0,  0,  0,  0, 22, 23,  0, 24, 25,  0,  0, 26,  0,  0,
-    0, 27,  0,  0, 28, 29, 30, 31,  0,  0,  0, 32, 33, 34,  0,  0,
-   33,  0,  0, 35, 33,  0,  0,  0, 33, 36,  0,  0,  0,  0,  0, 37,
-   38,  0,  0,  0,  0,  0,  0, 39, 40,  0,  0,  0,  0,  0,  0, 41,
-   42,  0,  0,  0,  0, 43,  0, 44,  0,  0,  0, 45, 46,  0,  0,  0,
-   47,  0,  0,  0,  0,  0,  0, 48, 49,  0,  0,  0,  0, 50,  0,  0,
-    0, 51,  0, 52,  0, 53,  0,  0,  0,  0, 54,  0,  0,  0,  0, 55,
-    0, 56,  0,  0,  0,  0, 57, 58,  0,  0,  0, 59, 60,  0,  0,  0,
-    0,  0,  0, 61, 52,  0, 62, 63,  0,  0, 64,  0,  0,  0, 65, 66,
-    0,  0,  0, 67,  0, 68, 69, 70, 71, 72,  1, 73,  0, 74, 75, 76,
-    0,  0, 77, 78,  0,  0,  0, 79,  0,  0,  1,  1,  0,  0, 80,  0,
-    0, 81,  0,  0,  0,  0, 77, 82,  0, 83,  0,  0,  0,  0,  0, 78,
-   84,  0, 85,  0, 52,  0,  1, 78,  0,  0, 86,  0,  0, 87,  0,  0,
-    0,  0,  0, 88, 57,  0,  0,  0,  0,  0,  0, 89, 90,  0,  0, 84,
-    0,  0, 33,  0,  0, 91,  0,  0,  0,  0, 92,  0,  0,  0,  0, 49,
-    0,  0, 93,  0,  0,  0,  0, 94, 95,  0,  0, 96,  0,  0, 97,  0,
-    0,  0, 98,  0,  0,  0, 99,  0,  0,  0,  0,100,101, 93,  0,  0,
-  102,  0,  0,  0, 84,  0,  0,103,  0,  0,  0,104,105,  0,  0,106,
-  107,  0,  0,  0,  0,  0,  0,108,  0,  0,109,  0,  0,  0,  0,110,
-   33,  0,111,112,113, 35,  0,  0,114,  0,  0,  0,115,  0,  0,  0,
-    0,  0,  0,116,  0,  0,117,  0,  0,  0,  0,118, 88,  0,  0,  0,
-    0,  0, 57,  0,  0,  0,  0, 52,119,  0,  0,  0,  0,120,  0,  0,
-  121,  0,  0,  0,  0,119,  0,  0,122,  0,  0,  0,  0,  0,  0,123,
-    0,  0,  0,124,  0,  0,  0,125,  0,126,  0,  0,  0,  0,127,128,
-  129,  0,130,  0,131,  0,  0,  0,132,133,134,  0, 77,  0,  0,  0,
-    0,  0, 35,  0,  0,  0,135,  0,  0,  0,136,  0,  0,137,  0,  0,
-  138,  0,  0,  0,  0,  0,  0,  0,  1,  1,  1,  1,  1,  2,  3,  4,
-    5,  6,  7,  4,  4,  8,  9, 10,  1, 11, 12, 13, 14, 15, 16, 17,
-   18,  1,  1,  1, 19,  1,  0,  0, 20, 21, 22,  1, 23,  4, 21, 24,
-   25, 26, 27, 28, 29, 30,  0,  0,  1,  1, 31,  0,  0,  0, 32, 33,
-   34, 35,  1, 36, 37,  0,  0,  0,  0, 38,  1, 39, 14, 39, 40, 41,
-   42,  0,  0,  0, 43, 36, 44, 45, 21, 45, 46,  0,  0,  0, 19,  1,
-   21,  0,  0, 47,  0, 38, 48,  1,  1, 49, 49, 50,  0,  0, 51,  0,
-    0,  0, 52,  1,  0,  0, 38, 14,  4,  1,  1,  1, 53, 21, 43, 52,
-   54, 21, 35,  1,  0,  0,  0, 55,  0,  0,  0, 56, 57, 58,  0,  0,
-    0,  0,  0, 59,  0, 60,  0,  0,  0,  0, 61, 62,  0,  0, 63,  0,
-    0,  0, 64,  0,  0,  0, 65,  0,  0,  0, 66,  0,  0,  0, 67,  0,
-    0,  0, 68,  0,  0, 69, 70,  0, 71, 72, 73, 74, 75, 76,  0,  0,
-    0, 77,  0,  0,  0, 78, 79,  0,  0,  0,  0, 47,  0,  0,  0, 49,
-    0, 80,  0,  0,  0, 62,  0,  0, 63,  0,  0, 81,  0,  0, 82,  0,
-    0,  0, 83,  0,  0, 19, 84,  0, 62,  0,  0,  0,  0, 49,  1, 85,
-    1, 52, 15, 86, 36, 10, 21, 87,  0, 55,  0,  0,  0,  0, 19, 10,
-    1,  0,  0,  0,  0,  0, 88,  0,  0, 89,  0,  0, 88,  0,  0,  0,
-    0, 78,  0,  0, 87,  9, 12,  4, 90,  8, 91, 47,  0, 58, 50,  0,
-   21,  1, 21, 92, 93,  1,  1,  1,  1, 94, 95, 96, 97,  1, 98, 58,
-   81, 99,100,  4, 58,  0,  0,  0,  0,  0,  0, 19, 50,  0,  0,  0,
-    0,  0,  0, 61,  0,  0,101,102,  0,  0,103,  0,  0,  1,  1, 50,
-    0,  0,  0, 38,  0, 63,  0,  0,  0,  0,  0, 62,  0,  0,104, 68,
-   61,  0,  0,  0, 78,  0,  0,  0,105,106, 58, 38, 81,  0,  0,  0,
-    0,  0,  0,107,  1, 14,  4, 12, 84,  0,  0,  0,  0, 38, 87,  0,
-    0,  0,  0,108,  0,  0,109, 61,  0,110,  0,  0,  0,  1,  0,  0,
+    0,  0,  0, 20,  0, 21, 22, 23,  0,  0,  0, 24, 25, 26, 27, 28,
+   29, 30, 31, 32, 33, 34,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+    0,  0,  0,  0,  0,  0, 35,  0,  0,  0,  0, 36,  0, 37,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+    0,  0,  0,  0, 38,  0,  0,  0,  0,  0,  0,  0,  0,  0, 39, 40,
+    0,  0,  0,  0,  0,  0, 41, 42, 43,  0, 44,  0,  0,  0,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  1,  2,  0,  0,  0,  0,  3,  0,
+    0,  0,  4,  5,  6,  7,  0,  8,  9, 10,  0, 11, 12, 13, 14, 15,
+   16, 17, 16, 18, 16, 19, 16, 19, 16, 19,  0, 19, 16, 20, 16, 19,
+   21, 19,  0, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,  0, 32,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0, 33,  0,  0,  0,  0,  0,  0,
+   34,  0,  0, 35,  0,  0, 36,  0, 37,  0,  0,  0, 38, 39, 40, 41,
+   42, 43, 44, 45, 46,  0,  0, 47,  0,  0,  0, 48,  0,  0,  0, 49,
+    0,  0,  0,  0,  0,  0,  0, 50,  0, 51,  0, 52, 53,  0, 54,  0,
+    0,  0,  0,  0,  0, 55, 56, 57,  0,  0,  0,  0, 58,  0,  0, 59,
+   60, 61, 62, 63,  0,  0, 64, 65,  0,  0,  0, 66,  0,  0,  0,  0,
+   67,  0,  0,  0, 68,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+    0,  0,  0, 69,  0,  0,  0, 70,  0, 71,  0,  0, 72,  0,  0, 73,
+    0,  0,  0,  0,  0,  0,  0,  0, 74, 75,  0,  0,  0,  0, 76, 77,
+    0, 78, 79,  0,  0, 80, 81,  0, 82, 62,  0, 83, 84,  0,  0, 85,
+   86, 87,  0, 88,  0, 89,  0, 90,  0,  0, 51, 91, 51,  0, 92,  0,
+   93,  0,  0,  0, 81,  0,  0,  0, 94, 95,  0, 96, 97, 98, 99,  0,
+    0,  0,  0,  0, 51,  0,  0,  0,  0,100,101,  0,  0,  0,  0,  0,
+    0,102,  0,  0,  0,  0,  0,  0,103,  0,  0,  0,  0,  0,  0,104,
+  105,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,106,  0,  0,107,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,108,109,  0,  0,110,  0,  0,
+    0,  0,  0,  0,111,  0,112,  0,105,  0,  0,  0,  0,  0,113,114,
+    0,  0,  0,  0,  0,  0,  0,115,  0,  0,  0,116,  0,  0,  0,117,
+    0,118,  0,  0,  0,  0,  0,  0,  1,  2,  3,  4,  5,  6,  7,  0,
+    8,  0,  0,  0,  0,  9, 10, 11, 12,  0,  0,  0,  0, 13,  0,  0,
+   14, 15,  0, 16,  0, 17, 18,  0,  0, 19,  0, 20, 21,  0,  0,  0,
+    0,  0, 22, 23,  0, 24, 25,  0,  0, 26,  0,  0,  0, 27,  0,  0,
+   28, 29, 30, 31,  0,  0,  0, 32, 33, 34,  0,  0, 33,  0,  0, 35,
+   33,  0,  0,  0, 33, 36,  0,  0,  0,  0,  0, 37, 38,  0,  0,  0,
+    0,  0,  0, 39, 40,  0,  0,  0,  0,  0,  0, 41, 42,  0,  0,  0,
+    0, 43,  0, 44,  0,  0,  0, 45, 46,  0,  0,  0, 47,  0,  0,  0,
+    0,  0,  0, 48, 49,  0,  0,  0,  0, 50,  0,  0,  0, 51,  0, 52,
+    0, 53,  0,  0,  0,  0, 54,  0,  0,  0,  0, 55,  0, 56,  0,  0,
+    0,  0, 57, 58,  0,  0,  0, 59, 60,  0,  0,  0,  0,  0,  0, 61,
+   52,  0, 62, 63,  0,  0, 64,  0,  0,  0, 65, 66,  0,  0,  0, 67,
+    0, 68, 69, 70, 71, 72,  1, 73,  0, 74, 75, 76,  0,  0, 77, 78,
+    0,  0,  0, 79,  0,  0,  1,  1,  0,  0, 80,  0,  0, 81,  0,  0,
+    0,  0, 77, 82,  0, 83,  0,  0,  0,  0,  0, 78, 84,  0, 85,  0,
+   52,  0,  1, 78,  0,  0, 86,  0,  0, 87,  0,  0,  0,  0,  0, 88,
+   57,  0,  0,  0,  0,  0,  0, 89, 90,  0,  0, 84,  0,  0, 33,  0,
+    0, 91,  0,  0,  0,  0, 92,  0,  0,  0,  0, 49,  0,  0, 93,  0,
+    0,  0,  0, 94, 95,  0,  0, 96,  0,  0, 97,  0,  0,  0, 98,  0,
+    0,  0, 99,  0,  0,  0,100,  0,  0,  0,  0,101,102, 93,  0,  0,
+  103,  0,  0,  0, 84,  0,  0,104,  0,  0,  0,105,106,  0,  0,107,
+  108,  0,  0,  0,  0,  0,  0,109,  0,  0,110,  0,  0,  0,  0,111,
+   33,  0,112,113,114, 57,  0,  0,115, 35,  0,  0,116,  0,  0,  0,
+  117,  0,  0,  0,  0,  0,  0,118,  0,  0,119,  0,  0,  0,  0,120,
+   88,  0,  0,  0,  0,  0, 57,  0,  0,  0,  0, 52,121,  0,  0,  0,
+    0,122,  0,  0,123,  0,  0,  0,  0,121,  0,  0,124,  0,  0,  0,
+    0,  0, 79,  0,  0,  0,  0,125,  0,  0,  0,126,  0,  0,  0,127,
+    0,128,  0,  0,  0,  0,129,130,131,  0,132,  0,133,  0,  0,  0,
+  134,135,136,  0, 77,  0,  0,  0,  0,  0, 35,  0,  0,  0,137,  0,
+    0,  0,138,  0,  0,  0,139,  0,  0,140,  0,  0,141,  0,  0,  0,
+    0,  0,  0,  0,  1,  1,  1,  1,  1,  2,  3,  4,  5,  6,  7,  4,
+    4,  8,  9, 10,  1, 11, 12, 13, 14, 15, 16, 17, 18,  1,  1,  1,
+   19,  1,  0,  0, 20, 21, 22,  1, 23,  4, 21, 24, 25, 26, 27, 28,
+   29, 30,  0,  0,  1,  1, 31,  0,  0,  0, 32, 33, 34, 35,  1, 36,
+   37,  0,  0,  0,  0, 38,  1, 39, 14, 39, 40, 41, 42,  0,  0,  0,
+   43, 36, 44, 45, 21, 45, 46,  0,  0,  0, 19,  1, 21,  0,  0, 47,
+    0, 38, 48,  1,  1, 49, 49, 50,  0,  0, 51,  0,  0, 19, 52,  1,
+    0,  0, 38, 14,  4,  1,  1,  1, 53, 21, 43, 52, 54, 21, 35,  1,
+    0,  0,  0, 55,  0,  0,  0, 56, 57, 58,  0,  0,  0,  0,  0, 59,
+    0, 60,  0,  0,  0,  0, 61, 62,  0,  0, 63,  0,  0,  0, 64,  0,
+    0,  0, 65,  0,  0,  0, 66,  0,  0,  0, 67,  0,  0,  0, 68,  0,
+    0, 69, 70,  0, 71, 72, 73, 74, 75, 76,  0,  0,  0, 77,  0,  0,
+    0, 78, 79,  0,  0,  0,  0, 47,  0,  0,  0, 49,  0, 80,  0,  0,
+    0, 62,  0,  0, 63,  0,  0, 81,  0,  0, 82,  0,  0,  0, 83,  0,
+    0, 19, 84,  0, 62,  0,  0,  0,  0, 49,  1, 85,  1, 52, 15, 86,
+   36, 10, 21, 87,  0, 55,  0,  0,  0,  0, 19, 10,  1,  0,  0,  0,
+    0,  0, 88,  0,  0, 89,  0,  0, 88,  0,  0,  0,  0, 78,  0,  0,
+   87,  9, 12,  4, 90,  8, 91, 47,  0, 58, 50,  0, 21,  1, 21, 92,
+   93,  1,  1,  1,  1, 94, 95, 96, 97,  1, 98, 58, 81, 99,100,  4,
+   58,  0,  0,  0,  0,  0,  0, 19, 50,  0,  0,  0,  0,  0,  0, 61,
+    0,  0,101,102,  0,  0,103,  0,  0,  1,  1, 50,  0,  0,  0, 38,
+    0, 63,  0,  0,  0,  0,  0, 62,  0,  0,104, 68, 61,  0,  0,  0,
+   78,  0,  0,  0,105,106, 58, 38, 81,  0,  0,  0,  0,  0,  0,107,
+    1, 14,  4, 12, 84,  0,  0,  0,  0, 38, 87,  0,  0,  0,  0,108,
+    0,  0,109, 61,  0,110,  0,  0,  0,  1,  0,  0,  0,  0, 49, 50,
     0,  0, 19, 58,  0,  0,  0, 51,  0,111, 14, 52,112, 41,  0,  0,
    62,  0,  0, 61,  0,  0,113,  0, 87,  0,  0,  0, 61, 62,  0,  0,
    62,  0, 89,  0,  0,113,  0,  0,  0,  0,114,  0,  0,  0, 78, 55,
-    0, 38,  1, 58,  1, 58,  0,  0, 63, 89,  0,  0,115,  0,  0,  0,
-   55,  0,  0,  0,  0,115,  0,  0,  0,  0, 61,  0,  0,  0,  0, 79,
-    0, 61,  0,  0,  0,  0, 56,  0, 89, 80,  0,  0, 79,  0,  0,  0,
-    8, 91,  0,  0,  1, 87,  0,  0,116,  0,  0,  0,  0,  0,  0,117,
-    0,118,119,120,121,  0,104,  4,122, 49, 23,  0,  0,  0, 38, 50,
-   38, 58,  0,  0,  1, 87,  1,  1,  1,  1, 39,  1, 48,105, 87,  0,
-    0,  0,  0,  1,  0,  0,  0,123,  4,122,  0,  0,  0,  1,124,  0,
-    0,  0,  0,  0,230,230,230,230,230,232,220,220,220,220,232,216,
-  220,220,220,220,220,202,202,220,220,220,220,202,202,220,220,220,
-    1,  1,  1,  1,  1,220,220,220,220,230,230,230,230,240,230,220,
-  220,220,230,230,230,220,220,  0,230,230,230,220,220,220,220,230,
-  232,220,220,230,233,234,234,233,234,234,233,230,  0,  0,  0,230,
-    0,220,230,230,230,230,220,230,230,230,222,220,230,230,220,220,
-  230,222,228,230, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 19, 20,
-   21, 22,  0, 23,  0, 24, 25,  0,230,220,  0, 18, 30, 31, 32,  0,
-    0,  0,  0, 27, 28, 29, 30, 31, 32, 33, 34,230,230,220,220,230,
-  220,230,230,220, 35,  0,  0,  0,  0,  0,230,230,230,  0,  0,230,
-  230,  0,220,230,230,220,  0,  0,  0, 36,  0,  0,230,220,230,230,
-  220,220,230,220,220,230,220,230,220,230,230,  0,  0,220,  0,  0,
-  230,230,  0,230,  0,230,230,230,230,230,  0,  0,  0,220,220,220,
-  230,220,220,220,230,230,  0,220, 27, 28, 29,230,  7,  0,  0,  0,
-    0,  9,  0,  0,  0,230,220,230,230,  0,  0,  0,  0,  0,230,  0,
-    0, 84, 91,  0,  0,  0,  0,  9,  9,  0,  0,  0,  0,  0,  9,  0,
-  103,103,  9,  0,107,107,107,107,118,118,  9,  0,122,122,122,122,
-  220,220,  0,  0,  0,220,  0,220,  0,216,  0,  0,  0,129,130,  0,
-  132,  0,  0,  0,  0,  0,130,130,130,130,  0,  0,130,  0,230,230,
-    9,  0,230,230,  0,  0,220,  0,  0,  0,  0,  7,  0,  9,  9,  0,
-    9,  9,  0,  0,  0,230,  0,  0,  0,228,  0,  0,  0,222,230,220,
-  220,  0,  0,  0,230,  0,  0,220,230,220,  0,220,230,230,230,  0,
-    0,  0,  9,  9,  0,  0,  7,  0,230,  0,  1,  1,  1,  0,  0,  0,
-  230,234,214,220,202,230,230,230,230,230,232,228,228,220,218,230,
-  233,220,230,220,230,230,  1,  1,  1,  1,  1,230,  0,  1,  1,230,
-  220,230,  1,  1,  0,  0,218,228,232,222,224,224,  0,  8,  8,  0,
-    0,  0,  0,220,230,  0,230,230,220,  0,  0,230,  0,  0, 26,  0,
-    0,220,  0,230,230,  1,220,  0,  0,230,220,  0,  0,  0,220,220,
-    0,  0,230,220,  0,  9,  7,  0,  0,  7,  9,  0,  0,  0,  9,  7,
-    6,  6,  0,  0,  0,  0,  1,  0,  0,216,216,  1,  1,  1,  0,  0,
-    0,226,216,216,216,216,216,  0,220,220,220,  0,232,232,220,230,
-  230,230,  7,  0, 16, 17, 17, 17, 17, 17, 17, 33, 17, 17, 17, 19,
-   17, 17, 17, 17, 20,101, 17,113,129,169, 17, 27, 28, 17, 17, 17,
+    0, 38,  1, 58,  1, 58,  0,  0,  0,  0,  0, 88, 63, 89,  0,  0,
+  115,  0,  0,  0, 55,  0,  0,  0,  0,115,  0,  0,  0,  0, 61,  0,
+    0,  0,  0, 79,  0, 61,  0,  0,  0,  0, 56,  0, 89, 80,  0,  0,
+   79,  0,  0,  0,  8, 91,  0,  0,  1, 87,  0,  0,116,  0,  0,  0,
+    0,  0,  0,117,  0,118,119,120,121,  0,104,  4,122, 49, 23,  0,
+    0,  0, 38, 50, 38, 58,  0,  0,  1, 87,  1,  1,  1,  1, 39,  1,
+   48,105, 87,  0,  0,  0,  0,  1,  0,  0,  0,123,  0,  0,  0,112,
+    4,122,  0,  0,  0,  1,124,  0,  0,  0,  0,  0,230,230,230,230,
+  230,232,220,220,220,220,232,216,220,220,220,220,220,202,202,220,
+  220,220,220,202,202,220,220,220,  1,  1,  1,  1,  1,220,220,220,
+  220,230,230,230,230,240,230,220,220,220,230,230,230,220,220,  0,
+  230,230,230,220,220,220,220,230,232,220,220,230,233,234,234,233,
+  234,234,233,230,  0,  0,  0,230,  0,220,230,230,230,230,220,230,
+  230,230,222,220,230,230,220,220,230,222,228,230, 10, 11, 12, 13,
+   14, 15, 16, 17, 18, 19, 19, 20, 21, 22,  0, 23,  0, 24, 25,  0,
+  230,220,  0, 18, 30, 31, 32,  0,  0,  0,  0, 27, 28, 29, 30, 31,
+   32, 33, 34,230,230,220,220,230,220,230,230,220, 35,  0,  0,  0,
+    0,  0,230,230,230,  0,  0,230,230,  0,220,230,230,220,  0,  0,
+    0, 36,  0,  0,230,220,230,230,220,220,230,220,220,230,220,230,
+  220,230,230,  0,  0,220,  0,  0,230,230,  0,230,  0,230,230,230,
+  230,230,  0,  0,  0,220,220,220,230,220,220,220,230,230,  0,220,
+   27, 28, 29,230,  7,  0,  0,  0,  0,  9,  0,  0,  0,230,220,230,
+  230,  0,  0,  0,  0,  0,230,  0,  0, 84, 91,  0,  0,  0,  0,  9,
+    9,  0,  0,  0,  0,  0,  9,  0,103,103,  9,  0,107,107,107,107,
+  118,118,  9,  0,122,122,122,122,220,220,  0,  0,  0,220,  0,220,
+    0,216,  0,  0,  0,129,130,  0,132,  0,  0,  0,  0,  0,130,130,
+  130,130,  0,  0,130,  0,230,230,  9,  0,230,230,  0,  0,220,  0,
+    0,  0,  0,  7,  0,  9,  9,  0,  9,  9,  0,  0,  0,230,  0,  0,
+    0,228,  0,  0,  0,222,230,220,220,  0,  0,  0,230,  0,  0,220,
+  230,220,  0,220,230,230,230,  0,  0,  0,  9,  9,  0,  0,  7,  0,
+  230,  0,  1,  1,  1,  0,  0,  0,230,234,214,220,202,230,230,230,
+  230,230,232,228,228,220,218,230,233,220,230,220,230,230,  1,  1,
+    1,  1,  1,230,  0,  1,  1,230,220,230,  1,  1,  0,  0,218,228,
+  232,222,224,224,  0,  8,  8,  0,  0,  0,  0,220,230,  0,230,230,
+  220,  0,  0,230,  0,  0, 26,  0,  0,220,  0,230,230,  1,220,  0,
+    0,230,220,  0,  0,  0,220,220,  0,  0,230,220,  0,  9,  7,  0,
+    0,  7,  9,  0,  0,  0,  9,  7,  6,  6,  0,  0,  0,  0,  1,  0,
+    0,216,216,  1,  1,  1,  0,  0,  0,226,216,216,216,216,216,  0,
+  220,220,220,  0,232,232,220,230,230,230,  7,  0, 16, 17, 17, 17,
+   17, 17, 17, 33, 17, 17, 17, 19, 17, 17, 17, 17, 20,101, 17,113,
+  129,169, 17, 27, 28, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
    17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
    17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
    17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
    17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
    17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-   17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-   17, 17, 17,237,  0,  1,  2,  2,  0,  3,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  4,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    5,  0,  0,  0,  0,  6,  7,  8,  9,  0,  0,  0, 10, 11, 12, 13,
-   14, 15, 16, 17, 18, 19,  0,  0,  0,  0,  0,  0,  0,  0,  0, 20,
-    0,  0, 21, 22,  0,  0,  0,  0, 23, 24, 25, 26,  0, 27,  0, 28,
-   29, 30, 31, 32,  0,  0,  0,  0,  0,  0,  0, 33, 34, 35, 36,  0,
-    0,  0,  0,  0, 37,  0,  0,  0,  0,  0,  0,  0,  0,  0, 38, 39,
-    0,  0,  0,  0,  1,  2, 40, 41,  0,  1,  2,  2,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  1,  0,  0,  0,  0,  2,  0,  0,  0,  0,
-    0,  0,  3,  4,  0,  0,  5,  0,  0,  0,  6,  0,  0,  0,  0,  0,
-    0,  0,  7,  1,  0,  0,  0,  0,  0,  0,  8,  9,  0,  0,  0,  0,
-    0,  0, 10,  0,  0, 10,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0, 10,  0,  0,  0, 10,  0,  0,  0,  0,  0,  0, 11, 12,
-    0, 13,  0, 14, 15, 16,  0,  0,  0,  0,  0,  1, 17, 18,  0, 19,
-    7,  1,  0,  0,  0, 20, 20,  7, 20, 20, 20, 20, 20, 20, 20,  8,
-   21,  0, 22,  0,  7, 23, 24,  0, 20, 20, 25,  0,  0,  0, 26, 27,
-    1,  7, 20, 20, 20, 20, 20,  1, 28, 29, 30, 31,  0,  0, 20,  0,
-    0,  0,  0,  0,  0,  0, 10,  0,  0,  0,  0,  0,  0,  0, 20, 20,
-   20,  1,  0,  0,  8, 21, 32,  4,  0, 10,  0, 33,  7, 20, 20, 20,
-    0,  0,  0,  0,  8, 34, 34, 35, 36, 34, 37,  0, 38,  1, 20, 20,
-    0,  0, 39,  0,  1,  1,  0,  8, 21,  1, 20,  0,  0,  0,  1,  0,
-    0, 40,  1,  1,  0,  0,  8, 21,  0,  1,  0,  1,  0,  1,  0,  0,
-    0,  0, 26, 34, 34, 34, 34, 34, 34, 34, 34, 34, 21,  7, 20, 41,
-   34, 34, 34, 34, 34, 34, 34, 34, 34, 21,  0, 42, 43, 44,  0, 45,
-    0,  8, 21,  0,  0,  0,  0,  0,  0,  0,  0, 46,  7,  1, 10,  1,
-    0,  0,  0,  1, 20, 20,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0, 26, 34,  9,  0,  0, 20, 20,  1, 20, 20,  0,  0,  0,  0,  0,
-    0,  0, 26, 21,  0,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  3, 47, 48,  0,  0,  0,  0,  0,  0,  0,  0,  1,  2,  3,
-    4,  5,  6,  7,  7,  8,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,
-    9, 10, 11, 11, 11, 11, 12, 13, 13, 13, 13, 14, 15, 16, 17, 18,
-   19, 20, 21, 13, 22, 13, 13, 13, 13, 23, 24, 24, 25, 26, 13, 13,
-   13, 27, 28, 29, 13, 30, 31, 32, 33, 34, 35, 36,  7,  7,  7,  7,
-    7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,
-   37,  7, 38, 39,  7, 40,  7,  7,  7, 41, 13, 42,  7,  7, 43,  7,
-   44, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
+   17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17,237,  0,  1,  2,  2,
+    0,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  4,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  5,  0,  0,  0,  0,  6,  7,  8,
+    9,  0,  0,  0, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19,  0,  0,
+    0,  0,  0,  0,  0,  0,  0, 20,  0,  0, 21, 22,  0,  0,  0,  0,
+   23, 24, 25, 26,  0, 27,  0, 28, 29, 30, 31, 32,  0,  0,  0,  0,
+    0,  0,  0, 33, 34, 35, 36,  0,  0,  0,  0,  0, 37,  0,  0,  0,
+    0,  0,  0,  0,  0,  0, 38, 39,  0,  0,  0,  0,  1,  2, 40, 41,
+    0,  1,  2,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  0,
+    0,  0,  0,  2,  0,  0,  0,  0,  0,  0,  3,  4,  0,  0,  5,  0,
+    0,  0,  6,  0,  0,  0,  0,  0,  0,  0,  7,  1,  0,  0,  0,  0,
+    0,  0,  8,  9,  0,  0,  0,  0,  0,  0, 10,  0,  0, 10,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 10,  0,  0,  0, 10,
+    0,  0,  0,  0,  0,  0, 11, 12,  0, 13,  0, 14, 15, 16,  0,  0,
+    0,  0,  0,  1, 17, 18,  0, 19,  7,  1,  0,  0,  0, 20, 20,  7,
+   20, 20, 20, 20, 20, 20, 20,  8, 21,  0, 22,  0,  7, 23, 24,  0,
+   20, 20, 25,  0,  0,  0, 26, 27,  1,  7, 20, 20, 20, 20, 20,  1,
+   28, 29, 30, 31,  0,  0, 20,  0,  0,  0,  0,  0,  0,  0, 10,  0,
+    0,  0,  0,  0,  0,  0, 20, 20, 20,  1,  0,  0,  8, 21, 32,  4,
+    0, 10,  0, 33,  7, 20, 20, 20,  0,  0,  0,  0,  8, 34, 34, 35,
+   36, 34, 37,  0, 38,  1, 20, 20,  0,  0, 39,  0,  1,  1,  0,  8,
+   21,  1, 20,  0,  0,  0,  1,  0,  0, 40,  1,  1,  0,  0,  8, 21,
+    0,  1,  0,  1,  0,  1,  0,  0,  0,  0, 26, 34, 34, 34, 34, 34,
+   34, 34, 34, 34, 21,  7, 20, 41, 34, 34, 34, 34, 34, 34, 34, 34,
+   34, 21,  0, 42, 43, 44,  0, 45,  0,  8, 21,  0,  0,  0,  0,  0,
+    0,  0,  0, 46,  7,  1, 10,  1,  0,  0,  0,  1, 20, 20,  1,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0, 26, 34,  9,  0,  0, 20, 20,
+    1, 20, 20,  0,  0,  0,  0,  0,  0,  0, 26, 21,  0,  1,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  3, 47, 48,  0,  0,  0,
+    0,  0,  0,  0,  0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11,
+   12, 13, 13, 13, 13, 13, 13, 14, 13, 13, 13, 13, 13, 13, 13, 13,
+   13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 15, 16, 17, 18,
+   18, 18, 18, 18, 18, 18, 18, 18, 18, 19, 20, 20, 20, 20, 20, 20,
+   20, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 20, 33,
+   34, 35, 34, 34, 36, 37, 20, 20, 20, 20, 20, 20, 38, 20, 39, 40,
+   41, 41, 41, 41, 41, 42, 43, 44, 20, 20, 20, 20, 20, 20, 20, 45,
+   46, 20, 20, 47, 20, 20, 20, 48, 49, 50, 51, 52, 53, 54, 55, 56,
+   57, 58, 59, 20, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
    13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
-   13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
-   13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
-   13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
-   13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
-   13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
-   13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
-   13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
-   13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
-   13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
-   13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
-   13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
-   13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
-   13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
-   13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
-   13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
-   13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
-   13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
-   13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
-   13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
-   13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 45,  0,  0,  1,
-    2,  2,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 14, 15,
-   16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
-   32, 32, 33, 34, 35, 36, 37, 37, 37, 37, 37, 38, 39, 40, 41, 42,
-   43, 44, 45, 46, 47, 48, 49, 50, 51, 52,  2,  2, 53, 54, 55, 56,
-   57, 58, 59, 59, 59, 59, 60, 59, 59, 59, 59, 59, 59, 59, 61, 61,
-   59, 59, 59, 59, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73,
-   74, 75, 76, 77, 78, 59, 70, 70, 70, 70, 70, 70, 70, 70, 70, 70,
-   70, 70, 70, 70, 70, 70, 70, 70, 70, 70, 70, 70, 70, 70, 70, 70,
-   70, 70, 70, 70, 70, 70, 70, 70, 70, 79, 70, 70, 70, 70, 80, 80,
-   80, 80, 80, 80, 80, 80, 80, 81, 82, 82, 83, 84, 85, 86, 87, 88,
-   89, 90, 91, 92, 93, 94, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
-   32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
-   32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 95, 96, 96,
-   96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96,
-   70, 70, 97, 98, 99,100,101,101,102,103,104,105,106,107,108,109,
-  110,111, 96,112,113,114,115,116,117,118,119,119,120,121,122,123,
-  124,125,126,127,128,129,130,131,132, 96,133,134,135,136,137,138,
-  139,140,141,142,143, 96,144,145, 96,146,147,148,149, 96,150,151,
-  152,153,154,155,156, 96,157,158,159,160, 96,161,162,163,164,164,
-  164,164,164,164,164,165,166,164,167, 96, 96, 96, 96, 96, 96, 96,
-   96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96,168,169,169,
-  169,169,169,169,169,169,170, 96, 96, 96, 96, 96, 96, 96, 96, 96,
-   96, 96, 96, 96, 96, 96,171,171,171,171,172, 96, 96, 96,173,173,
-  173,173,174,175,176,177, 96, 96, 96, 96,178,179,180,181,182,182,
-  182,182,182,182,182,182,182,182,182,182,182,182,182,182,182,182,
-  182,182,182,182,182,182,182,182,182,182,182,182,182,183,182,182,
-  182,182,182,182,184,184,184,185,186, 96, 96, 96, 96, 96, 96, 96,
-   96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96,187,188,189,
-  190,191,191,192, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96,
-   96, 96, 96, 96, 96, 96,193,194, 96, 96, 96, 96, 96, 96, 96, 96,
-   96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96,195,196, 59,197,
-  198,199,200,201,202, 96,203,204,205, 59, 59,206, 59,207,208,208,
-  208,208,208,209, 96, 96, 96, 96, 96, 96, 96, 96,210, 96,211,212,
-  213, 96, 96,214, 96, 96, 96,215, 96, 96, 96, 96, 96,216,217,218,
-  219, 96, 96, 96, 96, 96,220,221,222, 96,223,224, 96, 96,225,226,
-   59,227,228, 96, 59, 59, 59, 59, 59, 59, 59,229,230,231,232,233,
-   59, 59,234,235, 59,236, 96, 96, 96, 96, 96, 96, 96, 96, 70, 70,
-   70, 70, 70, 70, 70, 70, 70, 70, 70, 70, 70,237, 70, 70, 70, 70,
-   70, 70, 70, 70, 70, 70, 70, 70, 70, 70, 70, 70,238, 70,239, 70,
-   70, 70, 70, 70, 70, 70, 70, 70, 70, 70, 70, 70, 70, 70, 70, 70,
-   70, 70, 70, 70, 70, 70, 70, 70, 70, 70, 70,240, 70, 70, 70, 70,
-   70, 70, 70, 70, 70,241, 70, 70, 70, 70,242, 96, 96, 96, 70, 70,
-   70, 70,243, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 70, 70,
-   70, 70, 70, 70,244, 70, 70, 70, 70, 70, 70, 70, 70, 70, 70, 70,
-   70, 70, 70, 70, 70,245, 96, 96, 96, 96, 96, 96, 96, 96,246, 96,
-  247,248,  0,  1,  2,  2,  0,  1,  2,  2,  2,  3,  4,  5,  0,  0,
-    0,  0,  0,  0,  0,  0,  0, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-   19, 19, 19, 19, 19, 19, 19, 19, 19,  0,  0,  0,  0,  0,  0,  0,
-   19,  0,  0,  0,  0,  0, 19, 19, 19, 19, 19, 19, 19,  0, 19,  0,
-    0,  0,  0,  0,  0,  0, 19, 19, 19, 19, 19,  0,  0,  0,  0,  0,
-   26, 26,  0,  0,  0,  0,  1,  1,  1,  1,  1,  1,  1,  1,  9,  9,
-    9,  9,  0,  9,  9,  9,  2,  2,  9,  9,  9,  9,  0,  9,  2,  2,
-    2,  2,  9,  0,  9,  0,  9,  9,  9,  2,  9,  2,  9,  9,  9,  9,
-    9,  9,  9,  9,  9,  9,  9,  9,  2,  9,  9,  9,  9,  9,  9,  9,
-   55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55,  6,  6,
-    6,  6,  6,  6,  6,  6,  6,  6,  6,  6,  6,  1,  1,  6,  2,  4,
-    4,  4,  4,  4,  4,  4,  4,  4,  4,  4,  4,  4,  4,  4,  4,  4,
-    4,  4,  4,  4,  4,  2,  4,  4,  4,  2,  2,  4,  4,  4,  2, 14,
-   14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14,  2,  2,
-    2,  2,  2,  2,  2,  2, 14, 14, 14,  2,  2,  2,  2, 14, 14, 14,
-   14, 14, 14,  2,  2,  2,  3,  3,  3,  3,  3,  0,  3,  3,  3,  3,
-    3,  3,  0,  3,  3,  3,  3,  3,  3,  3,  3,  3,  3,  3,  3,  3,
-    3,  0,  3,  3,  3,  0,  0,  3,  3,  3,  3,  3,  3,  3,  3,  3,
-    3,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  3,  3,  1,  3,
-    3,  3,  3,  3,  3,  3, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-   37, 37, 37, 37,  2, 37, 37, 37, 37,  2,  2, 37, 37, 37, 38, 38,
-   38, 38, 38, 38, 38, 38, 38, 38,  2,  2,  2,  2,  2,  2, 64, 64,
-   64, 64, 64, 64, 64, 64, 64, 64, 64,  2,  2, 64, 64, 64, 90, 90,
-   90, 90, 90, 90, 90, 90, 90, 90, 90, 90, 90, 90,  2,  2, 90, 90,
-   90, 90, 90, 90, 90,  2, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95,
-   95, 95,  2,  2, 95,  2, 37, 37, 37,  2,  2,  2,  2,  2,  3,  3,
-    3,  3,  3,  3,  3,  2,  3,  3,  2,  2,  2,  2,  2,  2,  3,  3,
-    0,  3,  3,  3,  3,  3,  7,  7,  7,  7,  7,  7,  7,  7,  7,  1,
-    1,  1,  1,  7,  7,  7,  7,  7,  7,  7,  0,  0,  7,  7,  5,  5,
-    5,  5,  2,  5,  5,  5,  5,  5,  5,  5,  5,  2,  2,  5,  5,  2,
-    2,  5,  5,  5,  5,  5,  5,  5,  5,  5,  5,  5,  5,  5,  5,  2,
-    5,  5,  5,  5,  5,  5,  5,  2,  5,  2,  2,  2,  5,  5,  5,  5,
-    2,  2,  5,  5,  5,  5,  5,  2,  2,  5,  5,  5,  5,  2,  2,  2,
-    2,  2,  2,  2,  2,  5,  2,  2,  2,  2,  5,  5,  2,  5,  5,  5,
-    5,  5,  2,  2,  5,  5,  5,  5,  5,  5,  5,  5,  5,  2,  2, 11,
-   11, 11,  2, 11, 11, 11, 11, 11, 11,  2,  2,  2,  2, 11, 11,  2,
-    2, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11,  2,
-   11, 11, 11, 11, 11, 11, 11,  2, 11, 11,  2, 11, 11,  2, 11, 11,
-    2,  2, 11,  2, 11, 11, 11,  2,  2, 11, 11, 11,  2,  2,  2, 11,
-    2,  2,  2,  2,  2,  2,  2, 11, 11, 11, 11,  2, 11,  2,  2,  2,
-    2,  2,  2,  2, 11, 11, 11, 11, 11, 11, 11, 11, 11,  2,  2, 10,
-   10, 10,  2, 10, 10, 10, 10, 10, 10, 10, 10, 10,  2, 10, 10, 10,
-    2, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10,  2,
-   10, 10, 10, 10, 10, 10, 10,  2, 10, 10,  2, 10, 10, 10, 10, 10,
-    2,  2, 10, 10, 10, 10, 10, 10,  2, 10, 10, 10,  2,  2, 10,  2,
-    2,  2,  2,  2,  2,  2, 10, 10, 10, 10,  2,  2, 10, 10, 10, 10,
-    2,  2,  2,  2,  2,  2,  2, 10, 10, 10, 10, 10, 10, 10,  2, 21,
-   21, 21,  2, 21, 21, 21, 21, 21, 21, 21, 21,  2,  2, 21, 21,  2,
-    2, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,  2,
-   21, 21, 21, 21, 21, 21, 21,  2, 21, 21,  2, 21, 21, 21, 21, 21,
-    2,  2, 21, 21, 21, 21, 21,  2,  2, 21, 21, 21,  2,  2,  2,  2,
-    2,  2,  2, 21, 21, 21,  2,  2,  2,  2, 21, 21,  2, 21, 21, 21,
-   21, 21,  2,  2, 21, 21,  2,  2, 22, 22,  2, 22, 22, 22, 22, 22,
-   22,  2,  2,  2, 22, 22, 22,  2, 22, 22, 22, 22,  2,  2,  2, 22,
-   22,  2, 22,  2, 22, 22,  2,  2,  2, 22, 22,  2,  2,  2, 22, 22,
-   22, 22, 22, 22, 22, 22, 22, 22,  2,  2,  2,  2, 22, 22, 22,  2,
-    2,  2,  2,  2,  2, 22,  2,  2,  2,  2,  2,  2, 22, 22, 22, 22,
-   22,  2,  2,  2,  2,  2, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23,
-   23, 23, 23,  2, 23, 23, 23,  2, 23, 23, 23, 23, 23, 23, 23, 23,
-    2,  2, 23, 23, 23, 23, 23,  2, 23, 23, 23, 23,  2,  2,  2,  2,
-    2,  2,  2, 23, 23,  2, 23, 23, 23,  2,  2, 23,  2,  2, 23, 23,
-   23, 23,  2,  2, 23, 23,  2,  2,  2,  2,  2,  2,  2, 23, 16, 16,
-   16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16,  2, 16, 16, 16,  2,
-   16, 16, 16, 16, 16, 16, 16, 16, 16, 16,  2, 16, 16, 16, 16, 16,
-    2,  2, 16, 16, 16, 16, 16,  2, 16, 16, 16, 16,  2,  2,  2,  2,
-    2,  2,  2, 16, 16,  2, 16, 16, 16, 16,  2,  2, 16, 16,  2, 16,
-   16, 16,  2,  2,  2,  2, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
-   20, 20, 20,  2, 20, 20, 20,  2, 20, 20, 20, 20, 20, 20,  2,  2,
-    2,  2, 20, 20, 20, 20, 20, 20, 20, 20,  2,  2, 20, 20,  2, 36,
-   36, 36,  2, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36,
-   36, 36, 36, 36, 36,  2,  2,  2, 36, 36, 36, 36, 36, 36, 36, 36,
-    2, 36, 36, 36, 36, 36, 36, 36, 36, 36,  2, 36,  2,  2,  2,  2,
-   36,  2,  2,  2,  2, 36, 36, 36, 36, 36, 36,  2, 36,  2,  2,  2,
-    2,  2,  2,  2, 36, 36,  2,  2, 36, 36, 36,  2,  2,  2,  2, 24,
-   24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-   24,  2,  2,  2,  2,  0, 24, 24, 24, 24,  2,  2,  2,  2,  2, 18,
-   18,  2, 18,  2, 18, 18, 18, 18, 18,  2, 18, 18, 18, 18, 18, 18,
-   18, 18, 18, 18, 18, 18, 18, 18, 18, 18,  2, 18,  2, 18, 18, 18,
-   18, 18, 18, 18,  2,  2, 18, 18, 18, 18, 18,  2, 18,  2, 18, 18,
-   18, 18, 18, 18, 18,  2, 18, 18,  2,  2, 18, 18, 18, 18, 25, 25,
-   25, 25, 25, 25, 25, 25,  2, 25, 25, 25, 25, 25, 25, 25, 25, 25,
-   25, 25, 25,  2,  2,  2, 25, 25, 25, 25, 25,  2, 25, 25, 25, 25,
-   25, 25, 25,  0,  0,  0,  0, 25, 25,  2,  2,  2,  2,  2, 33, 33,
-   33, 33, 33, 33, 33, 33,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,
-    8,  8,  8,  8,  2,  8,  2,  2,  2,  2,  2,  8,  2,  2,  8,  8,
-    8,  0,  8,  8,  8,  8, 12, 12, 12, 12, 12, 12, 12, 12, 30, 30,
-   30, 30, 30, 30, 30, 30, 30,  2, 30, 30, 30, 30,  2,  2, 30, 30,
-   30, 30, 30, 30, 30,  2, 30, 30, 30,  2,  2, 30, 30, 30, 30, 30,
-   30, 30, 30,  2,  2,  2, 30, 30,  2,  2,  2,  2,  2,  2, 29, 29,
-   29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29,  2,  2, 28, 28,
-   28, 28, 28, 28, 28, 28, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-   34, 34, 34,  2,  2,  2, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35,
-   35,  0,  0,  0, 35, 35, 35,  2,  2,  2,  2,  2,  2,  2, 45, 45,
-   45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45,  2,  2,  2,  2,
-    2,  2,  2,  2,  2, 45, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44,
-   44, 44, 44,  0,  0,  2, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43,
-   43, 43,  2,  2,  2,  2, 46, 46, 46, 46, 46, 46, 46, 46, 46, 46,
-   46, 46, 46,  2, 46, 46, 46,  2, 46, 46,  2,  2,  2,  2, 31, 31,
-   31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31,  2,  2, 31, 31,
-    2,  2,  2,  2,  2,  2, 32, 32,  0,  0, 32,  0, 32, 32, 32, 32,
-   32, 32, 32, 32, 32, 32, 32, 32,  2,  2,  2,  2,  2,  2, 32,  2,
-    2,  2,  2,  2,  2,  2, 32, 32, 32,  2,  2,  2,  2,  2, 28, 28,
-   28, 28, 28, 28,  2,  2, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48,
-   48, 48, 48, 48, 48,  2, 48, 48, 48, 48,  2,  2,  2,  2, 48,  2,
-    2,  2, 48, 48, 48, 48, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
-   52, 52, 52, 52,  2,  2, 52, 52, 52, 52, 52,  2,  2,  2, 58, 58,
-   58, 58, 58, 58, 58, 58, 58, 58, 58, 58,  2,  2,  2,  2, 58, 58,
-    2,  2,  2,  2,  2,  2, 58, 58, 58,  2,  2,  2, 58, 58, 54, 54,
-   54, 54, 54, 54, 54, 54, 54, 54, 54, 54,  2,  2, 54, 54, 91, 91,
-   91, 91, 91, 91, 91, 91, 91, 91, 91, 91, 91, 91, 91,  2, 91, 91,
-   91, 91, 91,  2,  2, 91, 91, 91,  2,  2,  2,  2,  2,  2, 91, 91,
-   91, 91, 91, 91,  2,  2,  1,  1,  1,  1,  1,  1,  1,  2, 62, 62,
-   62, 62, 62, 62, 62, 62, 62, 62, 62, 62, 62,  2,  2,  2, 62, 62,
-   62, 62, 62, 62, 62,  2, 76, 76, 76, 76, 76, 76, 76, 76, 93, 93,
+   13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 60, 13, 13,
+   13, 61, 62, 13, 13, 13, 13, 63, 13, 13, 13, 13, 13, 13, 64, 65,
+   20, 20, 66, 20, 13, 13, 13, 13, 67, 13, 13, 13, 68, 20, 20, 20,
+   20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
+   20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
+   20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
+   20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
+   20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
+   20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
+   20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
+   20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
+   20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
+   20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
+   20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
+   20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
+   20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
+   20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
+   20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
+   20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
+   20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
+   20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
+   20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
+   20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
+   20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
+   20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
+   20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
+   20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
+   20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
+   20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
+   20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
+   20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
+   20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
+   20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
+   20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
+   20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
+   20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
+   20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
+   20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
+   20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
+   20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
+   20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
+   20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
+   20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
+   20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
+   20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
+   20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
+   20, 20, 20, 20, 69,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 19,
+   19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
+   19,  0,  0,  0,  0,  0,  0,  0, 19,  0,  0,  0,  0,  0, 19, 19,
+   19, 19, 19, 19, 19,  0, 19,  0,  0,  0,  0,  0,  0,  0, 19, 19,
+   19, 19, 19,  0,  0,  0,  0,  0, 26, 26,  0,  0,  0,  0,  1,  1,
+    1,  1,  1,  1,  1,  1,  9,  9,  9,  9,  0,  9,  9,  9,  2,  2,
+    9,  9,  9,  9,  0,  9,  2,  2,  2,  2,  9,  0,  9,  0,  9,  9,
+    9,  2,  9,  2,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,
+    2,  9,  9,  9,  9,  9,  9,  9, 55, 55, 55, 55, 55, 55, 55, 55,
+   55, 55, 55, 55, 55, 55,  6,  6,  6,  6,  6,  6,  6,  6,  6,  6,
+    6,  6,  6,  1,  1,  6,  2,  4,  4,  4,  4,  4,  4,  4,  4,  4,
+    4,  4,  4,  4,  4,  4,  4,  4,  4,  4,  4,  4,  4,  2,  4,  4,
+    4,  2,  2,  4,  4,  4,  2, 14, 14, 14, 14, 14, 14, 14, 14, 14,
+   14, 14, 14, 14, 14, 14,  2,  2,  2,  2,  2,  2,  2,  2, 14, 14,
+   14,  2,  2,  2,  2, 14, 14, 14, 14, 14, 14,  2,  2,  2,  3,  3,
+    3,  3,  3,  0,  3,  3,  3,  3,  3,  3,  0,  3,  3,  3,  3,  3,
+    3,  3,  3,  3,  3,  3,  3,  3,  3,  0,  3,  3,  3,  0,  0,  3,
+    3,  3,  3,  3,  3,  3,  3,  3,  3,  1,  1,  1,  1,  1,  1,  1,
+    1,  1,  1,  1,  3,  3,  1,  3,  3,  3,  3,  3,  3,  3, 37, 37,
+   37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,  2, 37, 37, 37,
+   37,  2,  2, 37, 37, 37, 38, 38, 38, 38, 38, 38, 38, 38, 38, 38,
+    2,  2,  2,  2,  2,  2, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64,
+   64,  2,  2, 64, 64, 64, 90, 90, 90, 90, 90, 90, 90, 90, 90, 90,
+   90, 90, 90, 90,  2,  2, 90, 90, 90, 90, 90, 90, 90,  2, 95, 95,
+   95, 95, 95, 95, 95, 95, 95, 95, 95, 95,  2,  2, 95,  2, 37, 37,
+   37,  2,  2,  2,  2,  2,  3,  3,  3,  3,  3,  3,  3,  2,  3,  3,
+    2,  2,  2,  2,  2,  3,  3,  3,  0,  3,  3,  3,  3,  3,  7,  7,
+    7,  7,  7,  7,  7,  7,  7,  1,  1,  1,  1,  7,  7,  7,  7,  7,
+    7,  7,  0,  0,  7,  7,  5,  5,  5,  5,  2,  5,  5,  5,  5,  5,
+    5,  5,  5,  2,  2,  5,  5,  2,  2,  5,  5,  5,  5,  5,  5,  5,
+    5,  5,  5,  5,  5,  5,  5,  2,  5,  5,  5,  5,  5,  5,  5,  2,
+    5,  2,  2,  2,  5,  5,  5,  5,  2,  2,  5,  5,  5,  5,  5,  2,
+    2,  5,  5,  5,  5,  2,  2,  2,  2,  2,  2,  2,  2,  5,  2,  2,
+    2,  2,  5,  5,  2,  5,  5,  5,  5,  5,  2,  2,  5,  5,  5,  5,
+    5,  5,  5,  5,  5,  2,  2, 11, 11, 11,  2, 11, 11, 11, 11, 11,
+   11,  2,  2,  2,  2, 11, 11,  2,  2, 11, 11, 11, 11, 11, 11, 11,
+   11, 11, 11, 11, 11, 11, 11,  2, 11, 11, 11, 11, 11, 11, 11,  2,
+   11, 11,  2, 11, 11,  2, 11, 11,  2,  2, 11,  2, 11, 11, 11,  2,
+    2, 11, 11, 11,  2,  2,  2, 11,  2,  2,  2,  2,  2,  2,  2, 11,
+   11, 11, 11,  2, 11,  2,  2,  2,  2,  2,  2,  2, 11, 11, 11, 11,
+   11, 11, 11, 11, 11,  2,  2, 10, 10, 10,  2, 10, 10, 10, 10, 10,
+   10, 10, 10, 10,  2, 10, 10, 10,  2, 10, 10, 10, 10, 10, 10, 10,
+   10, 10, 10, 10, 10, 10, 10,  2, 10, 10, 10, 10, 10, 10, 10,  2,
+   10, 10,  2, 10, 10, 10, 10, 10,  2,  2, 10, 10, 10, 10, 10, 10,
+    2, 10, 10, 10,  2,  2, 10,  2,  2,  2,  2,  2,  2,  2, 10, 10,
+   10, 10,  2,  2, 10, 10, 10, 10,  2,  2,  2,  2,  2,  2,  2, 10,
+   10, 10, 10, 10, 10, 10,  2, 21, 21, 21,  2, 21, 21, 21, 21, 21,
+   21, 21, 21,  2,  2, 21, 21,  2,  2, 21, 21, 21, 21, 21, 21, 21,
+   21, 21, 21, 21, 21, 21, 21,  2, 21, 21, 21, 21, 21, 21, 21,  2,
+   21, 21,  2, 21, 21, 21, 21, 21,  2,  2, 21, 21, 21, 21, 21,  2,
+    2, 21, 21, 21,  2,  2,  2,  2,  2,  2,  2, 21, 21, 21,  2,  2,
+    2,  2, 21, 21,  2, 21, 21, 21, 21, 21,  2,  2, 21, 21,  2,  2,
+   22, 22,  2, 22, 22, 22, 22, 22, 22,  2,  2,  2, 22, 22, 22,  2,
+   22, 22, 22, 22,  2,  2,  2, 22, 22,  2, 22,  2, 22, 22,  2,  2,
+    2, 22, 22,  2,  2,  2, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+    2,  2,  2,  2, 22, 22, 22,  2,  2,  2,  2,  2,  2, 22,  2,  2,
+    2,  2,  2,  2, 22, 22, 22, 22, 22,  2,  2,  2,  2,  2, 23, 23,
+   23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23,  2, 23, 23, 23,  2,
+   23, 23, 23, 23, 23, 23, 23, 23,  2,  2, 23, 23, 23, 23, 23,  2,
+   23, 23, 23, 23,  2,  2,  2,  2,  2,  2,  2, 23, 23,  2, 23, 23,
+   23,  2,  2, 23,  2,  2, 23, 23, 23, 23,  2,  2, 23, 23,  2,  2,
+    2,  2,  2,  2,  2, 23, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
+   16, 16, 16,  2, 16, 16, 16,  2, 16, 16, 16, 16, 16, 16, 16, 16,
+   16, 16,  2, 16, 16, 16, 16, 16,  2,  2, 16, 16, 16, 16, 16,  2,
+   16, 16, 16, 16,  2,  2,  2,  2,  2,  2,  2, 16, 16,  2, 16, 16,
+   16, 16,  2,  2, 16, 16,  2, 16, 16, 16,  2,  2,  2,  2, 20, 20,
+   20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20,  2, 20, 20, 20,  2,
+   20, 20, 20, 20, 20, 20,  2,  2,  2,  2, 20, 20, 20, 20, 20, 20,
+   20, 20,  2,  2, 20, 20,  2, 36, 36, 36,  2, 36, 36, 36, 36, 36,
+   36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36,  2,  2,  2,
+   36, 36, 36, 36, 36, 36, 36, 36,  2, 36, 36, 36, 36, 36, 36, 36,
+   36, 36,  2, 36,  2,  2,  2,  2, 36,  2,  2,  2,  2, 36, 36, 36,
+   36, 36, 36,  2, 36,  2,  2,  2,  2,  2,  2,  2, 36, 36,  2,  2,
+   36, 36, 36,  2,  2,  2,  2, 24, 24, 24, 24, 24, 24, 24, 24, 24,
+   24, 24, 24, 24, 24, 24, 24, 24, 24,  2,  2,  2,  2,  0, 24, 24,
+   24, 24,  2,  2,  2,  2,  2, 18, 18,  2, 18,  2, 18, 18, 18, 18,
+   18,  2, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18,
+   18, 18,  2, 18,  2, 18, 18, 18, 18, 18, 18, 18,  2,  2, 18, 18,
+   18, 18, 18,  2, 18,  2, 18, 18, 18, 18, 18, 18, 18,  2, 18, 18,
+    2,  2, 18, 18, 18, 18, 25, 25, 25, 25, 25, 25, 25, 25,  2, 25,
+   25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25,  2,  2,  2, 25, 25,
+   25, 25, 25,  2, 25, 25, 25, 25, 25, 25, 25,  0,  0,  0,  0, 25,
+   25,  2,  2,  2,  2,  2, 33, 33, 33, 33, 33, 33, 33, 33,  8,  8,
+    8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  2,  8,  2,  2,
+    2,  2,  2,  8,  2,  2,  8,  8,  8,  0,  8,  8,  8,  8, 12, 12,
+   12, 12, 12, 12, 12, 12, 30, 30, 30, 30, 30, 30, 30, 30, 30,  2,
+   30, 30, 30, 30,  2,  2, 30, 30, 30, 30, 30, 30, 30,  2, 30, 30,
+   30,  2,  2, 30, 30, 30, 30, 30, 30, 30, 30,  2,  2,  2, 30, 30,
+    2,  2,  2,  2,  2,  2, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
+   29, 29, 29, 29,  2,  2, 28, 28, 28, 28, 28, 28, 28, 28, 34, 34,
+   34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,  2,  2,  2, 35, 35,
+   35, 35, 35, 35, 35, 35, 35, 35, 35,  0,  0,  0, 35, 35, 35,  2,
+    2,  2,  2,  2,  2,  2, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45,
+   45, 45, 45, 45,  2,  2,  2,  2,  2,  2,  2,  2,  2, 45, 44, 44,
+   44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44,  0,  0,  2, 43, 43,
+   43, 43, 43, 43, 43, 43, 43, 43, 43, 43,  2,  2,  2,  2, 46, 46,
+   46, 46, 46, 46, 46, 46, 46, 46, 46, 46, 46,  2, 46, 46, 46,  2,
+   46, 46,  2,  2,  2,  2, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31,
+   31, 31, 31, 31,  2,  2, 31, 31,  2,  2,  2,  2,  2,  2, 32, 32,
+    0,  0, 32,  0, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+    2,  2,  2,  2,  2,  2, 32,  2,  2,  2,  2,  2,  2,  2, 32, 32,
+   32,  2,  2,  2,  2,  2, 28, 28, 28, 28, 28, 28,  2,  2, 48, 48,
+   48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48,  2, 48, 48,
+   48, 48,  2,  2,  2,  2, 48,  2,  2,  2, 48, 48, 48, 48, 52, 52,
+   52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52,  2,  2, 52, 52,
+   52, 52, 52,  2,  2,  2, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
+   58, 58,  2,  2,  2,  2, 58, 58,  2,  2,  2,  2,  2,  2, 58, 58,
+   58,  2,  2,  2, 58, 58, 54, 54, 54, 54, 54, 54, 54, 54, 54, 54,
+   54, 54,  2,  2, 54, 54, 91, 91, 91, 91, 91, 91, 91, 91, 91, 91,
+   91, 91, 91, 91, 91,  2, 91, 91, 91, 91, 91,  2,  2, 91, 91, 91,
+    2,  2,  2,  2,  2,  2, 91, 91, 91, 91, 91, 91,  2,  2,  1,  1,
+    1,  1,  1,  1,  1,  2, 62, 62, 62, 62, 62, 62, 62, 62, 62, 62,
+   62, 62, 62,  2, 62, 62, 76, 76, 76, 76, 76, 76, 76, 76, 93, 93,
    93, 93, 93, 93, 93, 93, 93, 93, 93, 93,  2,  2,  2,  2,  2,  2,
     2,  2, 93, 93, 93, 93, 70, 70, 70, 70, 70, 70, 70, 70,  2,  2,
     2, 70, 70, 70, 70, 70, 70, 70,  2,  2,  2, 70, 70, 70, 73, 73,
-   73, 73, 73, 73, 73, 73,  6,  2,  2,  2,  2,  2,  2,  2,  8,  8,
+   73, 73, 73, 73, 73, 73,  6,  6,  6,  2,  2,  2,  2,  2,  8,  8,
     8,  2,  2,  8,  8,  8,  1,  1,  1,  0,  1,  1,  1,  1,  1,  0,
     1,  1,  1,  1,  1,  1,  1,  0,  0,  0,  0,  1,  0,  0,  0,  0,
     0,  0,  1,  0,  0,  0,  1,  1,  0,  2,  2,  2,  2,  2, 19, 19,
@@ -1896,31 +1872,30 @@ _hb_ucd_u8[17884] =
     2,  2,  2,  2,  2,  2,  1,  2,  2,  2,  2,  2,  2,  2,  0,  0,
     0,  0,  0,  0,  9,  0,  0,  0, 19, 19,  0,  0,  0,  0,  0,  0,
     0,  0,  0,  0, 19,  0, 19,  0,  0,  0,  2,  2,  2,  2,  0,  0,
-    0,  2,  2,  2,  2,  2, 27, 27, 27, 27, 27, 27, 27, 27,  0,  0,
-    0,  0,  2,  2,  0,  0,  0,  0,  0,  0,  0,  0,  2,  0, 56, 56,
-   56, 56, 56, 56, 56, 56, 55, 55, 55, 55,  2,  2,  2,  2,  2, 55,
-   55, 55, 55, 55, 55, 55, 61, 61, 61, 61, 61, 61, 61, 61,  2,  2,
-    2,  2,  2,  2,  2, 61, 61,  2,  2,  2,  2,  2,  2,  2,  0,  0,
-    0,  0,  0,  0,  2,  2, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
-    2, 13, 13, 13, 13, 13, 13, 13, 13, 13,  2,  2,  2,  2, 13, 13,
-   13, 13, 13, 13,  2,  2,  0,  0,  0,  0,  0, 13,  0, 13,  0, 13,
-   13, 13, 13, 13, 13, 13, 13, 13,  1,  1,  1,  1, 12, 12, 13, 13,
-   13, 13,  0,  0,  0,  0,  2, 15, 15, 15, 15, 15, 15, 15, 15, 15,
-   15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15,  2,  2,  1,
-    1,  0,  0, 15, 15, 15,  0, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-   17, 17, 17, 17, 17, 17, 17, 17, 17,  0,  0, 17, 17, 17,  2,  2,
-    2,  2,  2, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26,  2, 12,
-   12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12,  2,  0,  0,
-    0,  0,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  0, 12, 12,
+    2,  2,  2,  2,  2,  2,  0,  0,  0,  2,  2,  2,  2,  2, 27, 27,
+   27, 27, 27, 27, 27, 27,  0,  0,  0,  0,  2,  2,  0,  0,  0,  0,
+    0,  0,  0,  0,  2,  0, 56, 56, 56, 56, 56, 56, 56, 56, 55, 55,
+   55, 55,  2,  2,  2,  2,  2, 55, 55, 55, 55, 55, 55, 55, 61, 61,
+   61, 61, 61, 61, 61, 61,  2,  2,  2,  2,  2,  2,  2, 61, 61,  2,
+    2,  2,  2,  2,  2,  2,  0,  0,  0,  0,  0,  0,  2,  2, 13, 13,
+   13, 13, 13, 13, 13, 13, 13, 13,  2, 13, 13, 13, 13, 13, 13, 13,
+   13, 13,  2,  2,  2,  2, 13, 13, 13, 13, 13, 13,  2,  2,  0,  0,
+    0,  0,  0, 13,  0, 13,  0, 13, 13, 13, 13, 13, 13, 13, 13, 13,
+    1,  1,  1,  1, 12, 12, 13, 13, 13, 13,  0,  0,  0,  0,  2, 15,
+   15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
+   15, 15, 15, 15, 15,  2,  2,  1,  1,  0,  0, 15, 15, 15,  0, 17,
+   17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
+   17,  0,  0, 17, 17, 17,  2,  2,  2,  2,  2, 26, 26, 26, 26, 26,
+   26, 26, 26, 26, 26, 26,  2, 12, 12, 12, 12, 12, 12, 12, 12, 12,
+   12, 12, 12, 12, 12,  2,  2,  2,  2,  2,  2,  2,  2,  0, 12, 12,
    12, 12, 12, 12, 12,  0, 17, 17, 17, 17, 17, 17, 17,  0, 39, 39,
    39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39,  2,  2,  2, 39, 39,
    39, 39, 39, 39, 39,  2, 86, 86, 86, 86, 86, 86, 86, 86, 77, 77,
    77, 77, 77, 77, 77, 77, 77, 77, 77, 77,  2,  2,  2,  2, 79, 79,
    79, 79, 79, 79, 79, 79,  0,  0, 19, 19, 19, 19, 19, 19,  0,  0,
-    0, 19, 19, 19, 19, 19, 19, 19, 19,  2,  2,  2,  2,  2, 19, 19,
-    2, 19,  2, 19, 19, 19, 19, 19,  2,  2,  2,  2,  2,  2,  2,  2,
-   19, 19, 19, 19, 19, 19, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60,
-   60, 60, 60,  2,  2,  2,  0,  0,  2,  2,  2,  2,  2,  2, 65, 65,
+    0, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,  2,  2, 19, 19,
+    2, 19,  2, 19, 19, 19,  2,  2, 19, 19, 19, 19, 19, 19, 60, 60,
+   60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60,  2,  2,  2, 65, 65,
    65, 65, 65, 65, 65, 65, 75, 75, 75, 75, 75, 75, 75, 75, 75, 75,
    75, 75, 75, 75,  2,  2,  2,  2,  2,  2,  2,  2, 75, 75, 75, 75,
     2,  2,  2,  2,  2,  2, 69, 69, 69, 69, 69, 69, 69, 69, 69, 69,
@@ -1943,36 +1918,38 @@ _hb_ucd_u8[17884] =
     2, 14, 14,  2, 14, 14,  3,  3,  3,  2,  2,  2,  2,  2,  2,  2,
     2,  3,  3,  3,  3,  3,  3,  3,  3,  3,  3,  3,  0,  0,  2,  2,
     3,  3,  3,  3,  3,  3,  2,  2,  2,  2,  2,  2,  2,  3,  1,  1,
-    1,  1,  1,  1,  6,  6,  0,  0,  0,  2,  0,  0,  0,  0,  3,  3,
-    3,  3,  3,  2,  3,  3,  3,  3,  3,  3,  3,  2,  2,  0,  2,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 17, 17, 17, 17,
-   17, 17, 17, 17,  0,  0,  2,  2, 12, 12, 12, 12, 12, 12,  2,  2,
-   12, 12, 12,  2,  2,  2,  2,  0,  0,  0,  0,  0,  2,  2, 49, 49,
-   49, 49, 49, 49, 49, 49, 49, 49, 49, 49,  2, 49, 49, 49, 49, 49,
-   49, 49, 49, 49, 49,  2, 49, 49, 49,  2, 49, 49,  2, 49, 49, 49,
-   49, 49, 49, 49,  2,  2, 49, 49, 49,  2,  2,  2,  2,  2,  0,  0,
-    0,  2,  2,  2,  2,  0,  0,  0,  0,  0,  2,  2,  2,  0,  0,  0,
-    0,  0,  0,  2,  2,  2,  9,  2,  2,  2,  2,  2,  2,  2,  0,  0,
-    0,  0,  0,  1,  2,  2, 71, 71, 71, 71, 71, 71, 71, 71, 71, 71,
-   71, 71, 71,  2,  2,  2, 67, 67, 67, 67, 67, 67, 67, 67, 67,  2,
-    2,  2,  2,  2,  2,  2,  1,  0,  0,  0,  0,  0,  0,  0, 42, 42,
-   42, 42, 42, 42, 42, 42, 42, 42, 42, 42,  2,  2,  2,  2,  2,  2,
-    2,  2,  2, 42, 42, 42, 41, 41, 41, 41, 41, 41, 41, 41, 41, 41,
-   41,  2,  2,  2,  2,  2,118,118,118,118,118,118,118,118,118,118,
-  118,  2,  2,  2,  2,  2, 53, 53, 53, 53, 53, 53, 53, 53, 53, 53,
-   53, 53, 53, 53,  2, 53, 59, 59, 59, 59, 59, 59, 59, 59, 59, 59,
-   59, 59,  2,  2,  2,  2, 59, 59, 59, 59, 59, 59,  2,  2, 40, 40,
-   40, 40, 40, 40, 40, 40, 51, 51, 51, 51, 51, 51, 51, 51, 50, 50,
-   50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50,  2,  2, 50, 50,
-    2,  2,  2,  2,  2,  2,135,135,135,135,135,135,135,135,135,135,
-  135,135,  2,  2,  2,  2,106,106,106,106,106,106,106,106,104,104,
-  104,104,104,104,104,104,104,104,104,104,  2,  2,  2,  2,  2,  2,
-    2,  2,  2,  2,  2,104,161,161,161,161,161,161,161,161,161,161,
-  161,  2,161,161,161,161,161,161,161,  2,161,161,  2,161,161,161,
-    2,161,161,161,161,161,161,161,  2,161,161,  2,  2,  2,110,110,
-  110,110,110,110,110,110,110,110,110,110,110,110,110,  2,110,110,
-  110,110,110,110,  2,  2, 19, 19, 19, 19, 19, 19,  2, 19, 19,  2,
-   19, 19, 19, 19, 19, 19, 47, 47, 47, 47, 47, 47,  2,  2, 47,  2,
+    1,  1,  1,  1,  6,  6,  0,  0,  0,  2,  0,  0,  0,  0,  0,  0,
+    0,  0,  2,  2,  2,  2,  3,  3,  3,  3,  3,  2,  3,  3,  3,  3,
+    3,  3,  3,  2,  2,  0,  2,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+    0,  0,  0,  0, 17, 17, 17, 17, 17, 17, 17, 17,  0,  0,  2,  2,
+   12, 12, 12, 12, 12, 12,  2,  2, 12, 12, 12,  2,  2,  2,  2,  0,
+    0,  0,  0,  0,  2,  2, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49,
+   49, 49,  2, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49,  2, 49, 49,
+   49,  2, 49, 49,  2, 49, 49, 49, 49, 49, 49, 49,  2,  2, 49, 49,
+   49,  2,  2,  2,  2,  2,  0,  0,  0,  2,  2,  2,  2,  0,  0,  0,
+    0,  0,  2,  2,  2,  0,  0,  0,  0,  0,  0,  2,  2,  2,  9,  2,
+    2,  2,  2,  2,  2,  2,  0,  0,  0,  0,  0,  1,  2,  2, 71, 71,
+   71, 71, 71, 71, 71, 71, 71, 71, 71, 71, 71,  2,  2,  2, 67, 67,
+   67, 67, 67, 67, 67, 67, 67,  2,  2,  2,  2,  2,  2,  2,  1,  0,
+    0,  0,  0,  0,  0,  0, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42,
+   42, 42,  2,  2,  2,  2,  2,  2,  2,  2,  2, 42, 42, 42, 41, 41,
+   41, 41, 41, 41, 41, 41, 41, 41, 41,  2,  2,  2,  2,  2,118,118,
+  118,118,118,118,118,118,118,118,118,  2,  2,  2,  2,  2, 53, 53,
+   53, 53, 53, 53, 53, 53, 53, 53, 53, 53, 53, 53,  2, 53, 59, 59,
+   59, 59, 59, 59, 59, 59, 59, 59, 59, 59,  2,  2,  2,  2, 59, 59,
+   59, 59, 59, 59,  2,  2, 40, 40, 40, 40, 40, 40, 40, 40, 51, 51,
+   51, 51, 51, 51, 51, 51, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50,
+   50, 50, 50, 50,  2,  2, 50, 50,  2,  2,  2,  2,  2,  2,135,135,
+  135,135,135,135,135,135,135,135,135,135,  2,  2,  2,  2,106,106,
+  106,106,106,106,106,106,104,104,104,104,104,104,104,104,104,104,
+  104,104,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,104,161,161,
+  161,161,161,161,161,161,161,161,161,  2,161,161,161,161,161,161,
+  161,  2,161,161,  2,161,161,161,  2,161,161,161,161,161,161,161,
+    2,161,161,  2,  2,  2,170,170,170,170,170,170,170,170,170,170,
+  170,170,  2,  2,  2,  2,110,110,110,110,110,110,110,110,110,110,
+  110,110,110,110,110,  2,110,110,110,110,110,110,  2,  2, 19, 19,
+   19, 19, 19, 19,  2, 19, 19,  2, 19, 19, 19, 19, 19, 19, 19, 19,
+   19,  2,  2,  2,  2,  2, 47, 47, 47, 47, 47, 47,  2,  2, 47,  2,
    47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47,
    47, 47, 47, 47,  2, 47, 47,  2,  2,  2, 47,  2,  2, 47, 81, 81,
    81, 81, 81, 81, 81, 81, 81, 81, 81, 81, 81, 81,  2, 81,120,120,
@@ -1998,122 +1975,135 @@ _hb_ucd_u8[17884] =
   122,122,122,122,122,122, 89, 89, 89, 89, 89, 89, 89, 89, 89,  2,
     2,  2,  2,  2,  2,  2,130,130,130,130,130,130,130,130,130,130,
   130,  2,  2,  2,  2,  2,  2,  2,130,130,130,130,130,130,144,144,
-  144,144,144,144,144,144,144,144,  2,  2,  2,  2,  2,  2,156,156,
+  144,144,144,144,144,144,144,144,  2,  2,  2,  2,  2,  2,165,165,
+  165,165,165,165,165,165,165,165,165,165,165,165,  2,  2,  2,165,
+  165,165,165,165,165,165,  2,  2,  2,  2,  2,  2,165,165,156,156,
   156,156,156,156,156,156,156,156,  2,156,156,156,  2,  2,156,156,
-    2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  3,  3,  3,147,147,
-  147,147,147,147,147,147,148,148,148,148,148,148,148,148,148,148,
-    2,  2,  2,  2,  2,  2,158,158,158,158,158,158,158,158,158,158,
-    2,  2,  2,  2,  2,  2,153,153,153,153,153,153,153,153,153,153,
-  153,153,  2,  2,  2,  2,149,149,149,149,149,149,149,149,149,149,
-  149,149,149,149,149,  2, 94, 94, 94, 94, 94, 94, 94, 94, 94, 94,
-   94, 94, 94, 94,  2,  2,  2,  2, 94, 94, 94, 94, 94, 94,  2,  2,
-    2,  2,  2,  2,  2, 94, 85, 85, 85, 85, 85, 85, 85, 85, 85, 85,
-   85,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2, 85,  2,  2,101,101,
-  101,101,101,101,101,101,101,  2,  2,  2,  2,  2,  2,  2,101,101,
-    2,  2,  2,  2,  2,  2, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96,
-   96, 96, 96,  2, 96, 96,111,111,111,111,111,111,111,111,111,111,
-  111,111,111,111,111,  2,100,100,100,100,100,100,100,100,  2, 36,
-   36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36,  2,  2,  2,108,108,
-  108,108,108,108,108,108,108,108,  2,108,108,108,108,108,108,108,
-    2,  2,  2,  2,  2,  2,129,129,129,129,129,129,129,  2,129,  2,
-  129,129,129,129,  2,129,129,129,129,129,129,129,129,129,129,129,
-  129,129,129,129,  2,129,129,129,  2,  2,  2,  2,  2,  2,109,109,
-  109,109,109,109,109,109,109,109,109,  2,  2,  2,  2,  2,109,109,
-    2,  2,  2,  2,  2,  2,107,107,107,107,  2,107,107,107,107,107,
-  107,107,107,  2,  2,107,107,  2,  2,107,107,107,107,107,107,107,
-  107,107,107,107,107,107,107,  2,107,107,107,107,107,107,107,  2,
-  107,107,  2,107,107,107,107,107,  2,  1,107,107,107,107,107,  2,
-    2,107,107,107,  2,  2,107,  2,  2,  2,  2,  2,  2,107,  2,  2,
-    2,  2,  2,107,107,107,107,107,107,107,  2,  2,107,107,107,107,
-  107,107,107,  2,  2,  2,137,137,137,137,137,137,137,137,137,137,
+    2,  2,  2,  2,  2,  2,  2,  2,  3,  3,  3,  2,  2,  2,  2,  2,
+    2,  2,  3,  3,  3,  3,147,147,147,147,147,147,147,147,148,148,
+  148,148,148,148,148,148,148,148,  2,  2,  2,  2,  2,  2,158,158,
+  158,158,158,158,158,158,158,158,  2,  2,  2,  2,  2,  2,153,153,
+  153,153,153,153,153,153,153,153,153,153,  2,  2,  2,  2,149,149,
+  149,149,149,149,149,149,149,149,149,149,149,149,149,  2, 94, 94,
+   94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 94,  2,  2,  2,  2,
+   94, 94, 94, 94, 94, 94,  2,  2,  2,  2,  2,  2,  2, 94, 85, 85,
+   85, 85, 85, 85, 85, 85, 85, 85, 85,  2,  2,  2,  2,  2,  2,  2,
+    2,  2,  2, 85,  2,  2,101,101,101,101,101,101,101,101,101,  2,
+    2,  2,  2,  2,  2,  2,101,101,  2,  2,  2,  2,  2,  2, 96, 96,
+   96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96,  2, 96, 96,111,111,
+  111,111,111,111,111,111,111,111,111,111,111,111,111,  2,100,100,
+  100,100,100,100,100,100,  2, 36, 36, 36, 36, 36, 36, 36, 36, 36,
+   36, 36, 36,  2,  2,  2,108,108,108,108,108,108,108,108,108,108,
+    2,108,108,108,108,108,108,108,  2,  2,  2,  2,  2,  2,129,129,
+  129,129,129,129,129,  2,129,  2,129,129,129,129,  2,129,129,129,
+  129,129,129,129,129,129,129,129,129,129,129,129,  2,129,129,129,
+    2,  2,  2,  2,  2,  2,109,109,109,109,109,109,109,109,109,109,
+  109,  2,  2,  2,  2,  2,109,109,  2,  2,  2,  2,  2,  2,107,107,
+  107,107,  2,107,107,107,107,107,107,107,107,  2,  2,107,107,  2,
+    2,107,107,107,107,107,107,107,107,107,107,107,107,107,107,  2,
+  107,107,107,107,107,107,107,  2,107,107,  2,107,107,107,107,107,
+    2,  1,107,107,107,107,107,  2,  2,107,107,107,  2,  2,107,  2,
+    2,  2,  2,  2,  2,107,  2,  2,  2,  2,  2,107,107,107,107,107,
+  107,107,  2,  2,107,107,107,107,107,107,107,  2,  2,  2,171,171,
+  171,171,171,171,171,171,171,171,  2,171,  2,  2,171,  2,171,171,
+  171,171,171,171,  2,171,171,  2,171,  2,  2,171,  2,171,171,171,
+  171,  2,171,171,171,171,171,  2,  2,  2,  2,  2,  2,  2,  2,171,
+  171,  2,  2,  2,  2,  2,137,137,137,137,137,137,137,137,137,137,
   137,137,  2,137,137,137,137,137,  2,  2,  2,  2,  2,  2,124,124,
   124,124,124,124,124,124,124,124,  2,  2,  2,  2,  2,  2,123,123,
   123,123,123,123,123,123,123,123,123,123,123,123,  2,  2,114,114,
   114,114,114,114,114,114,114,114,114,114,114,  2,  2,  2,114,114,
     2,  2,  2,  2,  2,  2, 32, 32, 32, 32, 32,  2,  2,  2,102,102,
-  102,102,102,102,102,102,102,102,  2,  2,  2,  2,  2,  2,126,126,
-  126,126,126,126,126,126,126,126,126,  2,  2,126,126,126,126,126,
-  126,126,  2,  2,  2,  2,126,126,126,126,126,126,126,  2,142,142,
-  142,142,142,142,142,142,142,142,142,142,  2,  2,  2,  2,125,125,
-  125,125,125,125,125,125,125,125,125,  2,  2,  2,  2,  2,  2,  2,
-    2,  2,  2,  2,  2,125,154,154,154,154,154,154,154,  2,  2,154,
-    2,  2,154,154,154,154,154,154,154,154,  2,154,154,  2,154,154,
-  154,154,154,154,154,154,154,154,154,154,154,154,  2,154,154,  2,
-    2,154,154,154,154,154,154,154,  2,  2,  2,  2,  2,  2,150,150,
-  150,150,150,150,150,150,  2,  2,150,150,150,150,150,150,150,150,
-  150,150,150,  2,  2,  2,141,141,141,141,141,141,141,141,140,140,
-  140,140,140,140,140,140,140,140,140,  2,  2,  2,  2,  2,121,121,
-  121,121,121,121,121,121,121,  2,  2,  2,  2,  2,  2,  2,  7,  7,
-    2,  2,  2,  2,  2,  2,133,133,133,133,133,133,133,133,133,  2,
-  133,133,133,133,133,133,133,133,133,133,133,133,133,  2,133,133,
-  133,133,133,133,  2,  2,133,133,133,133,133,  2,  2,  2,134,134,
-  134,134,134,134,134,134,  2,  2,134,134,134,134,134,134,  2,134,
-  134,134,134,134,134,134,134,134,134,134,134,134,134,  2,138,138,
-  138,138,138,138,138,  2,138,138,  2,138,138,138,138,138,138,138,
-  138,138,138,138,138,138,  2,  2,138,  2,138,138,  2,138,138,138,
-    2,  2,  2,  2,  2,  2,143,143,143,143,143,143,  2,143,143,  2,
-  143,143,143,143,143,143,143,143,143,143,143,143,143,143,143,143,
-  143,143,143,143,143,  2,143,143,  2,143,143,143,143,143,143,  2,
-    2,  2,  2,  2,  2,  2,143,143,  2,  2,  2,  2,  2,  2,145,145,
-  145,145,145,145,145,145,145,  2,  2,  2,  2,  2,  2,  2,163,163,
-  163,163,163,163,163,163,163,  2,163,163,163,163,163,163,163,163,
-  163,  2,  2,  2,163,163,163,163,  2,  2,  2,  2,  2,  2, 86,  2,
-    2,  2,  2,  2,  2,  2, 22, 22,  2,  2,  2,  2,  2,  2,  2,  2,
-    2,  2,  2,  2,  2, 22, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
-    2,  2,  2,  2,  2,  2, 63, 63, 63, 63, 63, 63, 63,  2, 63, 63,
-   63, 63, 63,  2,  2,  2, 63, 63, 63, 63,  2,  2,  2,  2,157,157,
-  157,157,157,157,157,157,157,157,157,  2,  2,  2,  2,  2, 80, 80,
-   80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80,  2,  2,127,127,
-  127,127,127,127,127,127,127,127,127,127,127,127,127,  2, 79,  2,
+  102,102,102,102,102,102,102,102,  2,  2,  2,  2,  2,  2, 33, 33,
+   33, 33,  2,  2,  2,  2,126,126,126,126,126,126,126,126,126,126,
+  126,  2,  2,126,126,126,126,126,126,126,  2,  2,  2,  2,126,126,
+  126,126,126,126,126,  2,142,142,142,142,142,142,142,142,142,142,
+  142,142,  2,  2,  2,  2,125,125,125,125,125,125,125,125,125,125,
+  125,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,125,154,154,
+  154,154,154,154,154,  2,  2,154,  2,  2,154,154,154,154,154,154,
+  154,154,  2,154,154,  2,154,154,154,154,154,154,154,154,154,154,
+  154,154,154,154,  2,154,154,  2,  2,154,154,154,154,154,154,154,
+    2,  2,  2,  2,  2,  2,150,150,150,150,150,150,150,150,  2,  2,
+  150,150,150,150,150,150,150,150,150,150,150,  2,  2,  2,141,141,
+  141,141,141,141,141,141,140,140,140,140,140,140,140,140,140,140,
+  140,  2,  2,  2,  2,  2,121,121,121,121,121,121,121,121,121,  2,
+    2,  2,  2,  2,  2,  2,  7,  7,  2,  2,  2,  2,  2,  2,169,169,
+  169,169,169,169,169,169,169,169,  2,  2,  2,  2,  2,  2,133,133,
+  133,133,133,133,133,133,133,  2,133,133,133,133,133,133,133,133,
+  133,133,133,133,133,  2,133,133,133,133,133,133,  2,  2,133,133,
+  133,133,133,  2,  2,  2,134,134,134,134,134,134,134,134,  2,  2,
+  134,134,134,134,134,134,  2,134,134,134,134,134,134,134,134,134,
+  134,134,134,134,134,  2,138,138,138,138,138,138,138,  2,138,138,
+    2,138,138,138,138,138,138,138,138,138,138,138,138,138,  2,  2,
+  138,  2,138,138,  2,138,138,138,  2,  2,  2,  2,  2,  2,143,143,
+  143,143,143,143,  2,143,143,  2,143,143,143,143,143,143,143,143,
+  143,143,143,143,143,143,143,143,143,143,143,143,143,  2,143,143,
+    2,143,143,143,143,143,143,  2,  2,  2,  2,  2,  2,  2,143,143,
+    2,  2,  2,  2,  2,  2,145,145,145,145,145,145,145,145,145,  2,
+    2,  2,  2,  2,  2,  2,163,163,163,163,163,163,163,163,163,  2,
+  163,163,163,163,163,163,163,163,163,  2,  2,  2,163,163,163,163,
+  163,  2,  2,  2,  2,  2, 86,  2,  2,  2,  2,  2,  2,  2, 22, 22,
+    2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2, 22, 63, 63,
+   63, 63, 63, 63, 63, 63, 63, 63,  2,  2,  2,  2,  2,  2, 63, 63,
+   63, 63, 63, 63, 63,  2, 63, 63, 63, 63, 63,  2,  2,  2, 63, 63,
+   63, 63,  2,  2,  2,  2,157,157,157,157,157,157,157,157,157,157,
+  157,  2,  2,  2,  2,  2, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80,
+   80, 80, 80, 80,  2,  2, 80, 80, 80,  2,  2,  2,  2,  2,127,127,
+  127,127,127,127,127,127,127,127,127,127,127,127,127,  2,166,166,
+  166,166,166,166,166,166,166,166,  2,  2,  2,  2,  2,  2, 79,  2,
     2,  2,  2,  2,  2,  2,115,115,115,115,115,115,115,115,115,115,
   115,115,115,115,115,  2,115,115,  2,  2,  2,  2,115,115,159,159,
   159,159,159,159,159,159,159,159,159,159,159,159,159,  2,159,159,
     2,  2,  2,  2,  2,  2,103,103,103,103,103,103,103,103,103,103,
   103,103,103,103,  2,  2,119,119,119,119,119,119,119,119,119,119,
   119,119,119,119,  2,  2,119,119,  2,119,119,119,119,119,  2,  2,
-    2,  2,  2,119,119,119,146,146,146,146,146,146,146,146,146,146,
+    2,  2,  2,119,119,119,167,167,167,167,167,167,167,167,167,167,
+    2,  2,  2,  2,  2,  2,146,146,146,146,146,146,146,146,146,146,
   146,  2,  2,  2,  2,  2, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99,
    99,  2,  2,  2,  2, 99,  2,  2,  2,  2,  2,  2,  2, 99,136,139,
    13, 13,155,  2,  2,  2,136,136,136,136,136,136,136,136,155,155,
-  155,155,155,155,155,155,155,155,155,155,155,155,  2,  2,136,  2,
-    2,  2,  2,  2,  2,  2, 17, 17, 17, 17,  2, 17, 17, 17, 17, 17,
-   17, 17,  2, 17, 17,  2, 17, 15, 15, 15, 15, 15, 15, 15, 17, 17,
-   17,  2,  2,  2,  2,  2,  2,  2, 15,  2,  2,  2,  2,  2, 15, 15,
-   15,  2,  2, 17,  2,  2,  2,  2,  2,  2, 17, 17, 17, 17,139,139,
-  139,139,139,139,139,139,139,139,139,139,  2,  2,  2,  2,105,105,
-  105,105,105,105,105,105,105,105,105,  2,  2,  2,  2,  2,105,105,
-  105,105,105,  2,  2,  2,105,  2,  2,  2,  2,  2,  2,  2,105,105,
-    2,  2,105,105,105,105,  1,  1,  1,  1,  1,  1,  2,  2,  0,  0,
-    0,  0,  0,  0,  0,  1,  1,  1,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  1,  1,  1,  1,  1,  1,  1,  1,  0,  0,  1,  1,  1,  1,  1,
-    1,  1,  0,  0,  0,  0,  0,  0,  1,  1,  1,  1,  0,  0,  2,  2,
-    0,  2,  2,  0,  0,  2,  2,  0,  0,  0,  0,  2,  0,  0,  0,  0,
-    2,  0,  2,  0,  0,  0,  0,  0,  0,  0,  2,  0,  0,  0,  0,  0,
-    0,  2,  2,  0,  0,  0,  0,  0,  2,  0,  0,  0,  0,  2,  0,  0,
-    0,  0,  0,  2,  0,  2,  2,  2,  0,  0,  0,  0,  0,  0,  0,  2,
-    0,  0,  0,  0,  0,  0,131,131,131,131,131,131,131,131,131,131,
-  131,131,  2,  2,  2,  2,  2,  2,  2,131,131,131,131,131,  2,131,
-  131,131,131,131,131,131,  2,  2,  2,  2,  2, 19, 19, 19, 56, 56,
-   56, 56, 56, 56, 56,  2, 56,  2,  2, 56, 56, 56, 56, 56, 56, 56,
-    2, 56, 56,  2, 56, 56, 56, 56, 56,  2,  2,  2,  2,  2,  6,  6,
-    6,  6,  6,  6,  2,  2,  2,  2,  2,  2,  2,  2,  2,  6,151,151,
-  151,151,151,151,151,151,151,151,151,151,151,  2,  2,  2,151,151,
-  151,151,151,151,  2,  2,151,151,  2,  2,  2,  2,151,151,160,160,
-  160,160,160,160,160,160,160,160,160,160,160,160,160,  2,152,152,
-  152,152,152,152,152,152,152,152,  2,  2,  2,  2,  2,152,164,164,
-  164,164,164,164,164,164,164,164,  2,  2,  2,  2,  2,  2, 30, 30,
-   30, 30,  2, 30, 30,  2,113,113,113,113,113,113,113,113,113,113,
-  113,113,113,  2,  2,113,113,113,113,113,113,113,113,  2,132,132,
-  132,132,132,132,132,132,132,132,132,132,  2,  2,  2,  2,132,132,
-    2,  2,  2,  2,132,132,  3,  3,  3,  3,  2,  3,  3,  3,  2,  3,
-    3,  2,  3,  2,  2,  3,  2,  3,  3,  3,  3,  3,  3,  3,  3,  3,
-    3,  2,  3,  3,  3,  3,  2,  3,  2,  3,  2,  2,  2,  2,  2,  2,
-    3,  2,  2,  2,  2,  3,  2,  3,  2,  3,  2,  3,  3,  3,  2,  3,
-    2,  3,  2,  3,  2,  3,  2,  3,  3,  3,  3,  2,  3,  2,  3,  3,
-    2,  3,  3,  3,  3,  3,  3,  3,  3,  3,  2,  2,  2,  2,  2,  3,
-    3,  3,  2,  3,  3,  3,  2,  2,  2,  2,  2,  2,  0,  0, 15,  0,
+  155,155,155,155,155,155,155,155,155,155,155,155,  2,  2,  2,  2,
+    2,  2,  2,  2,  2,155,136,  2,  2,  2,  2,  2,  2,  2, 17, 17,
+   17, 17,  2, 17, 17, 17, 17, 17, 17, 17,  2, 17, 17,  2, 17, 15,
+   15, 15, 15, 15, 15, 15, 17, 17, 17,  2,  2,  2,  2,  2,  2,  2,
+   15,  2,  2,  2,  2,  2, 15, 15, 15,  2,  2, 17,  2,  2,  2,  2,
+    2,  2, 17, 17, 17, 17,139,139,139,139,139,139,139,139,139,139,
+  139,139,  2,  2,  2,  2,105,105,105,105,105,105,105,105,105,105,
+  105,  2,  2,  2,  2,  2,105,105,105,105,105,  2,  2,  2,105,  2,
+    2,  2,  2,  2,  2,  2,105,105,  2,  2,105,105,105,105,  1,  1,
+    1,  1,  1,  1,  2,  2,  0,  0,  0,  0,  0,  0,  0,  1,  1,  1,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  1,  1,  1,  1,  1,  1,
+    1,  0,  0,  1,  1,  1,  1,  1,  1,  1,  0,  0,  0,  0,  0,  0,
+    1,  1,  1,  1,  0,  0,  2,  2,  0,  2,  2,  0,  0,  2,  2,  0,
+    0,  0,  0,  2,  0,  0,  0,  0,  2,  0,  2,  0,  0,  0,  0,  0,
+    0,  0,  2,  0,  0,  0,  0,  0,  0,  2,  2,  0,  0,  0,  0,  0,
+    2,  0,  0,  0,  0,  2,  0,  0,  0,  0,  0,  2,  0,  2,  2,  2,
+    0,  0,  0,  0,  0,  0,  0,  2,  0,  0,  0,  0,  0,  0,131,131,
+  131,131,131,131,131,131,131,131,131,131,  2,  2,  2,  2,  2,  2,
+    2,131,131,131,131,131,  2,131,131,131,131,131,131,131,  2,  2,
+    2,  2,  2, 19, 19, 19, 56, 56, 56, 56, 56, 56, 56,  2, 56,  2,
+    2, 56, 56, 56, 56, 56, 56, 56,  2, 56, 56,  2, 56, 56, 56, 56,
+   56,  2,  2,  2,  2,  2,  6,  6,  6,  6,  6,  6,  2,  2,  2,  2,
+    2,  2,  2,  2,  2,  6,151,151,151,151,151,151,151,151,151,151,
+  151,151,151,  2,  2,  2,151,151,151,151,151,151,  2,  2,151,151,
+    2,  2,  2,  2,151,151,160,160,160,160,160,160,160,160,160,160,
+  160,160,160,160,160,  2,152,152,152,152,152,152,152,152,152,152,
+    2,  2,  2,  2,  2,152,164,164,164,164,164,164,164,164,164,164,
+    2,  2,  2,  2,  2,  2,168,168,168,168,168,168,168,168,168,168,
+  168,  2,  2,  2,  2,168, 30, 30, 30, 30,  2, 30, 30,  2,113,113,
+  113,113,113,113,113,113,113,113,113,113,113,  2,  2,113,113,113,
+  113,113,113,113,113,  2,132,132,132,132,132,132,132,132,132,132,
+  132,132,  2,  2,  2,  2,132,132,  2,  2,  2,  2,132,132,  3,  3,
+    3,  3,  2,  3,  3,  3,  2,  3,  3,  2,  3,  2,  2,  3,  2,  3,
+    3,  3,  3,  3,  3,  3,  3,  3,  3,  2,  3,  3,  3,  3,  2,  3,
+    2,  3,  2,  2,  2,  2,  2,  2,  3,  2,  2,  2,  2,  3,  2,  3,
+    2,  3,  2,  3,  3,  3,  2,  3,  2,  3,  2,  3,  2,  3,  2,  3,
+    3,  3,  3,  2,  3,  2,  3,  3,  2,  3,  3,  3,  3,  3,  3,  3,
+    3,  3,  2,  2,  2,  2,  2,  3,  3,  3,  2,  3,  3,  3,  3,  3,
+    2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  0,  0, 15,  0,
     0,  2,  2,  2,  2,  2,  2,  2,  2,  2,  0,  0,  0,  0,  2,  2,
-    2,  0,  0,  0,  0,  0, 13,  2,  2,  2,  2,  2,  2,  2, 13, 13,
+    2,  0,  0,  0,  0,  0,  0,  0,  2,  2,  2,  2,  2,  0,  0,  0,
+    0,  0,  0,  2,  2,  0, 13,  2,  2,  2,  2,  2,  2,  2, 13, 13,
    13,  2,  2,  2,  2,  2,  2,  0,  2,  2,  2,  2,  2,  2,  0,  1,
     2,  3,  4,  5,  6,  7,  8,  9,  9,  9,  9, 10,  9, 11, 12, 13,
     9,  9,  9, 14,  9,  9, 15,  9,  9,  9,  9,  9,  9,  9,  9,  9,
@@ -2123,13 +2113,13 @@ _hb_ucd_u8[17884] =
     9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,
     9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,
     9,  9,  9,  9,  9,  9,  9,  9,  9,  9, 16, 17,  9,  9,  9,  9,
-    9,  9,  9,  9,  9,  9, 18, 19, 20,  9, 21,  9,  9,  9,  9,  9,
+   18,  9,  9,  9,  9,  9, 19, 20, 21,  9, 22,  9,  9,  9,  9,  9,
+    9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,
+    9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9, 23,  9,
+    9,  9,  9,  9, 24,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,
     9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,
     9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,
-    9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,
-    9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,
-    9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,
-    9,  9,  9,  9,  9,  9, 22,  9,  9,  9,  9,  9,  9,  9,  9,  9,
+    9,  9,  9,  9,  9,  9, 25,  9,  9,  9,  9,  9,  9,  9,  9,  9,
     9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,
     9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,
     9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,
@@ -2138,7 +2128,7 @@ _hb_ucd_u8[17884] =
     9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,
     9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,
     9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,
-    9,  9,  9,  9,  9,  9,  9,  9,  9,  9, 23, 24,  0,  0,  0,  0,
+    9,  9,  9,  9,  9,  9,  9,  9,  9,  9, 26, 27,  0,  0,  0,  0,
     0,  0,  0,  0,  0,  0,  0,  0,  1,  2,  3,  4,  5,  6,  7,  8,
     9, 10, 11, 12,  0,  0, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22,
     0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
@@ -2175,23 +2165,29 @@ _hb_ucd_u8[17884] =
   132,133,134,135,136,137,138,139,140,141,142,143,144,145,146,147,
   148,149,150,151,152,153,154,155,156,157,  0,  0,  0,158,159,160,
   161,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,162,163,  0,  0,  0,  0,  0,  0,  0,164,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,162,  0,163,  0,  0,  0,  0,  0,
+    0,  0,  0,  0,  0,164,165,  0,  0,  0,  0,  0,  0,  0,166,  0,
     0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
     0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  165,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,166,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,167,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,168,
+  167,  0,  0,  0,168,169,  0,  0,170,  0,  0,  0,  0,  0,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,171,  0,  0,  0,  0,  0,  0,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,172,  0,  0,  0,  0,  0,  0,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,173,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,174,  0,
     0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
     0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,169,170,  0,  0,  0,  0,171,172,  0,  0,  0,173,174,175,176,
-  177,178,179,180,181,182,183,184,185,186,187,188,189,190,191,192,
-  193,194,195,196,197,198,199,200,201,202,203,204,205,206,  0,  0,
+    0,  0,175,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+    0,176,177,  0,  0,  0,  0,178,179,  0,  0,  0,180,181,182,183,
+  184,185,186,187,188,189,190,191,192,193,194,195,196,197,198,199,
+  200,201,202,203,204,205,206,207,208,209,210,211,212,213,  0,  0,
     0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
     0,  0,  0,  0,  0,  0,  0,  0,  1,  2,  3,  4,
 };
 static const uint16_t
-_hb_ucd_u16[9344] =
+_hb_ucd_u16[10400] =
 {
      0,   0,   1,   2,   3,   4,   5,   6,   0,   0,   7,   8,   9,  10,  11,  12,
     13,  13,  13,  14,  15,  13,  13,  16,  17,  18,  19,  20,  21,  22,  13,  23,
@@ -2210,9 +2206,10 @@ _hb_ucd_u16[9344] =
    136,  48,  48, 137, 138, 139, 140, 140, 141,  48, 142, 143, 144, 145, 140, 140,
    146, 147, 148, 149, 150,  48, 151, 152, 153, 154,  32, 155, 156, 157, 140, 140,
     48,  48, 158, 159, 160, 161, 162, 163, 164, 165,   9,   9, 166,  11,  11, 167,
-    48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48, 168, 169,  48,  48,
-   168,  48,  48, 170, 171, 172,  48,  48,  48, 171,  48,  48,  48, 173, 174, 175,
-    48, 176,   9,   9,   9,   9,   9, 177, 178,  48,  48,  48,  48,  48,  48,  48,
+    48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,
+    48,  48,  48,  48, 168, 169,  48,  48, 168,  48,  48, 170, 171, 172,  48,  48,
+    48, 171,  48,  48,  48, 173, 174, 175,  48, 176,   9,   9,   9,   9,   9, 177,
+   178,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,
     48,  48,  48,  48,  48,  48, 179,  48, 180, 181,  48,  48,  48,  48, 182, 183,
     48, 184,  48, 185,  48, 186, 187, 188,  48,  48,  48, 189, 190, 191, 192, 193,
    194, 192,  48,  48, 195,  48,  48, 196, 197,  48, 198,  48,  48,  48,  48, 199,
@@ -2225,28 +2222,34 @@ _hb_ucd_u16[9344] =
    241, 242, 241, 241, 242, 243, 241, 244, 245, 245, 245, 246, 247, 248, 249, 250,
    251, 252, 253, 254, 255, 256, 257, 258, 259, 260, 261, 261, 262, 263, 264, 265,
    266, 267, 268, 269, 270, 271, 272, 272, 273, 274, 275, 209, 276, 277, 209, 278,
-   279, 279, 279, 279, 279, 279, 279, 279, 280, 209, 281, 209, 209, 209, 209, 282,
-   209, 283, 279, 284, 209, 285, 286, 209, 209, 209, 287, 140, 288, 140, 271, 271,
-   271, 289, 209, 209, 209, 209, 290, 271, 209, 209, 209, 209, 209, 209, 209, 209,
-   209, 209, 209, 291, 292, 209, 209, 293, 209, 209, 209, 209, 209, 209, 294, 209,
-   209, 209, 209, 209, 209, 209, 295, 296, 271, 297, 209, 209, 298, 279, 299, 279,
-   300, 301, 279, 279, 279, 302, 279, 303, 209, 209, 209, 279, 304, 209, 209, 305,
-   209, 306, 209, 209, 209, 209, 209, 209,   9,   9,   9,  11,  11,  11, 307, 308,
-    13,  13,  13,  13,  13,  13, 309, 310,  11,  11, 311,  48,  48,  48, 312, 313,
-    48, 314, 315, 315, 315, 315,  32,  32, 316, 317, 318, 319, 320, 321, 140, 140,
-   209, 322, 209, 209, 209, 209, 209, 323, 209, 209, 209, 209, 209, 324, 140, 209,
-   325, 326, 327, 328, 136,  48,  48,  48,  48, 329, 178,  48,  48,  48,  48, 330,
-   331,  48,  48, 136,  48,  48,  48,  48, 200, 332,  48,  48, 209, 209, 333,  48,
-   209, 334, 335, 209, 336, 337, 209, 209, 335, 209, 209, 337, 209, 209, 209, 209,
-    48,  48,  48,  48, 209, 209, 209, 209,  48, 338,  48,  48,  48,  48,  48,  48,
-   151, 209, 209, 209, 287,  48,  48, 229, 339,  48, 340, 140,  13,  13, 341, 342,
-    13, 343,  48,  48,  48,  48, 344, 345,  31, 346, 347, 348,  13,  13,  13, 349,
-   350, 351, 352, 353, 354, 355, 140, 356, 357,  48, 358, 359,  48,  48,  48, 360,
-   361,  48,  48, 362, 363, 192,  32, 364,  64,  48, 365,  48, 366, 367,  48, 151,
-    76,  48,  48, 368, 369, 370, 371, 372,  48,  48, 373, 374, 375, 376,  48, 377,
-    48,  48,  48, 378, 379, 380, 381, 382, 383, 384, 315,  11,  11, 385, 386,  11,
-    11,  11,  11,  11,  48,  48, 387, 192,  48,  48, 388,  48, 389,  48,  48, 206,
-   390, 390, 390, 390, 390, 390, 390, 390, 391, 391, 391, 391, 391, 391, 391, 391,
+   279, 279, 279, 279, 279, 279, 279, 279, 279, 279, 279, 279, 279, 279, 279, 279,
+   280, 209, 281, 209, 209, 209, 209, 282, 209, 283, 279, 284, 209, 285, 286, 209,
+   209, 209, 176, 140, 287, 140, 271, 271, 271, 288, 209, 209, 209, 209, 289, 271,
+   209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 290, 291, 209, 209, 292,
+   209, 209, 209, 209, 209, 209, 293, 209, 209, 209, 209, 209, 209, 209, 209, 209,
+   209, 209, 209, 209, 209, 209, 294, 295, 271, 296, 209, 209, 297, 279, 298, 279,
+   209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209,
+   279, 279, 279, 279, 279, 279, 279, 279, 299, 300, 279, 279, 279, 301, 279, 302,
+   209, 209, 209, 279, 303, 209, 209, 304, 209, 305, 209, 209, 209, 209, 209, 209,
+     9,   9,   9,  11,  11,  11, 306, 307,  13,  13,  13,  13,  13,  13, 308, 309,
+    11,  11, 310,  48,  48,  48, 311, 312,  48, 313, 314, 314, 314, 314,  32,  32,
+   315, 316, 317, 318, 319, 320, 140, 140, 209, 321, 209, 209, 209, 209, 209, 322,
+   209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 323, 140, 209,
+   324, 325, 326, 327, 136,  48,  48,  48,  48, 328, 178,  48,  48,  48,  48, 329,
+   330,  48,  48, 136,  48,  48,  48,  48, 200, 331,  48,  48, 209, 209, 332,  48,
+   209, 333, 334, 209, 335, 336, 209, 209, 334, 209, 209, 336, 209, 209, 209, 209,
+    48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48, 209, 209, 209, 209,
+    48, 337,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,
+    48,  48,  48,  48,  48,  48,  48,  48, 151, 209, 209, 209, 338,  48,  48, 229,
+   339,  48, 340, 140,  13,  13, 341, 342,  13, 343,  48,  48,  48,  48, 344, 345,
+    31, 346, 347, 348,  13,  13,  13, 349, 350, 351, 352, 353, 354, 355, 140, 356,
+   357,  48, 358, 359,  48,  48,  48, 360, 361,  48,  48, 362, 363, 192,  32, 364,
+    64,  48, 365,  48, 366, 367,  48, 151,  76,  48,  48, 368, 369, 370, 371, 372,
+    48,  48, 373, 374, 375, 376,  48, 377,  48,  48,  48, 378, 379, 380, 381, 382,
+   383, 384, 314,  11,  11, 385, 386,  11,  11,  11,  11,  11,  48,  48, 387, 192,
+    48,  48,  48,  48,  48,  48,  48,  48,  48,  48, 388,  48, 389,  48,  48, 206,
+   390, 390, 390, 390, 390, 390, 390, 390, 390, 390, 390, 390, 390, 390, 390, 390,
+   391, 391, 391, 391, 391, 391, 391, 391, 391, 391, 391, 391, 391, 391, 391, 391,
     48,  48,  48,  48,  48,  48, 204,  48,  48,  48,  48,  48,  48, 207, 140, 140,
    392, 393, 394, 395, 396,  48,  48,  48,  48,  48,  48, 397, 398, 399,  48,  48,
     48,  48,  48, 400, 209,  48,  48,  48,  48, 401,  48,  48, 402, 140, 140, 403,
@@ -2257,108 +2260,204 @@ _hb_ucd_u16[9344] =
    140, 140, 140, 140, 140, 140, 140, 140,  48, 151,  48,  48,  48, 100, 429, 430,
     48,  48, 431,  48, 432,  48,  48, 433,  48, 434,  48,  48, 435, 436, 140, 140,
      9,   9, 437,  11,  11,  48,  48,  48,  48, 204, 192,   9,   9, 438,  11, 439,
-    48,  48, 440,  48,  48,  48, 441, 442, 442, 443, 444, 445, 140, 140, 140, 140,
-    48,  48,  48, 314,  48, 199, 440, 140, 446,  27,  27, 447, 140, 140, 140, 140,
+    48,  48, 440,  48,  48,  48, 441, 442, 442, 443, 444, 445,  48,  48,  48, 388,
+    48,  48,  48, 313,  48, 199, 440, 140, 446,  27,  27, 447, 140, 140, 140, 140,
    448,  48,  48, 449,  48, 450,  48, 451,  48, 200, 452, 140, 140, 140,  48, 453,
     48, 454,  48, 455, 140, 140, 140, 140,  48,  48,  48, 456, 271, 457, 271, 271,
    458, 459,  48, 460, 461, 462,  48, 463,  48, 464, 140, 140, 465,  48, 466, 467,
     48,  48,  48, 468,  48, 469,  48, 470,  48, 471, 472, 140, 140, 140, 140, 140,
     48,  48,  48,  48, 196, 140, 140, 140,   9,   9,   9, 473,  11,  11,  11, 474,
-    48,  48, 475, 192, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 271, 476,
-    48,  48, 477, 478, 140, 140, 140, 479,  48, 464, 480,  48,  62, 481, 140,  48,
-   482, 140, 140,  48, 483, 140,  48, 314, 484,  48,  48, 485, 486, 457, 487, 488,
-   222,  48,  48, 489, 490,  48, 196, 192, 491,  48, 492, 493, 494,  48,  48, 495,
-   222,  48,  48, 496, 497, 498, 499, 500,  48,  97, 501, 502, 503, 140, 140, 140,
-   504, 505, 506,  48,  48, 507, 508, 192, 509,  83,  84, 510, 511, 512, 513, 514,
-    48,  48,  48, 515, 516, 517, 478, 140,  48,  48,  48, 518, 519, 192, 140, 140,
-    48,  48, 520, 521, 522, 523, 140, 140,  48,  48,  48, 524, 525, 192, 526, 140,
-    48,  48, 527, 528, 192, 140, 140, 140,  48, 173, 529, 530, 314, 140, 140, 140,
-    48,  48, 501, 531, 140, 140, 140, 140, 140, 140,   9,   9,  11,  11, 148, 532,
-   533, 534,  48, 535, 536, 192, 140, 140, 140, 140, 537,  48,  48, 538, 539, 140,
-   540,  48,  48, 541, 542, 543,  48,  48, 544, 545, 546,  48,  48,  48,  48, 196,
-   547, 140, 140, 140, 140, 140, 140, 140,  84,  48, 520, 548, 549, 148, 175, 550,
-    48, 551, 552, 553, 140, 140, 140, 140, 554,  48,  48, 555, 556, 192, 557,  48,
-   558, 559, 192, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140,  48, 560,
-   561, 115,  48, 562, 563, 192, 140, 140, 140, 140, 140, 100, 271, 564, 565, 566,
-    48, 207, 140, 140, 140, 140, 140, 140, 272, 272, 272, 272, 272, 272, 567, 568,
-    48,  48,  48,  48, 388, 140, 140, 140, 140,  48,  48,  48,  48,  48,  48, 569,
-    48,  48,  48, 570, 571, 572, 140, 140,  48,  48,  48,  48, 314, 140, 140, 140,
-    48,  48,  48, 196,  48, 200, 370,  48,  48,  48,  48, 200, 192,  48, 204, 573,
-    48,  48,  48, 574, 575, 576, 577, 578,  48, 140, 140, 140, 140, 140, 140, 140,
-   140, 140, 140, 140,   9,   9,  11,  11, 271, 579, 140, 140, 140, 140, 140, 140,
-    48,  48,  48,  48, 580, 581, 582, 582, 583, 584, 140, 140, 140, 140, 585, 586,
-    48,  48,  48,  48,  48,  48,  48, 440,  48,  48,  48,  48,  48, 199, 140, 140,
-   196, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 587,
-    48,  48, 588, 589, 140, 590, 591,  48,  48,  48,  48,  48,  48,  48,  48, 206,
-    48,  48,  48,  48,  48,  48,  71, 151, 196, 592, 593, 140, 140, 140, 140, 140,
-    32,  32, 594,  32, 595, 209, 209, 209, 209, 209, 209, 209, 323, 140, 140, 140,
-   209, 209, 209, 209, 209, 209, 209, 324, 209, 209, 596, 209, 209, 209, 597, 598,
-   599, 209, 600, 209, 209, 209, 288, 140, 209, 209, 209, 209, 601, 140, 140, 140,
-   140, 140, 140, 140, 271, 602, 271, 602, 209, 209, 209, 209, 209, 287, 271, 461,
-     9, 603,  11, 604, 605, 606, 241,   9, 607, 608, 609, 610, 611,   9, 603,  11,
-   612, 613,  11, 614, 615, 616, 617,   9, 618,  11,   9, 603,  11, 604, 605,  11,
-   241,   9, 607, 617,   9, 618,  11,   9, 603,  11, 619,   9, 620, 621, 622, 623,
-    11, 624,   9, 625, 626, 627, 628,  11, 629,   9, 630,  11, 631, 632, 632, 632,
-    32,  32,  32, 633,  32,  32, 634, 635, 636, 637,  45, 140, 140, 140, 140, 140,
-   638, 639, 640, 140, 140, 140, 140, 140, 641, 642, 643,  27,  27,  27, 644, 140,
-   645, 140, 140, 140, 140, 140, 140, 140,  48,  48, 151, 646, 647, 140, 140, 140,
-   140,  48, 648, 140,  48,  48, 649, 650, 140, 140, 140, 140, 140,  48, 651, 192,
-   140, 140, 140, 140, 140, 140, 652, 200,  48,  48,  48,  48, 653, 595, 140, 140,
-     9,   9, 607,  11, 654, 370, 140, 140, 140, 140, 140, 140, 140, 140, 140, 499,
-   271, 271, 655, 656, 140, 140, 140, 140, 499, 271, 657, 658, 140, 140, 140, 140,
-   659,  48, 660, 661, 662, 663, 664, 665, 666, 206, 667, 206, 140, 140, 140, 668,
-   209, 209, 669, 209, 209, 209, 209, 209, 209, 323, 334, 670, 670, 670, 209, 324,
-   671, 209, 209, 209, 209, 209, 209, 209, 209, 209, 672, 140, 140, 140, 673, 209,
-   674, 209, 209, 669, 675, 676, 324, 140, 209, 209, 209, 209, 209, 209, 209, 677,
-   209, 209, 209, 209, 209, 678, 426, 426, 209, 209, 209, 209, 209, 209, 209, 679,
-   209, 209, 209, 209, 209, 176, 669, 427, 669, 209, 209, 209, 680, 176, 209, 209,
-   680, 209, 672, 676, 140, 140, 140, 140, 209, 209, 209, 209, 209, 323, 672, 426,
-   675, 209, 209, 681, 682, 669, 675, 675, 209, 683, 209, 209, 288, 140, 140, 192,
-    48,  48,  48,  48,  48,  48, 140, 140,  48,  48,  48, 207,  48,  48,  48,  48,
-    48, 204,  48,  48,  48,  48,  48,  48,  48,  48, 478,  48,  48,  48,  48,  48,
-    48,  48,  48,  48,  48,  48, 100,  48,  48,  48,  48,  48,  48, 204, 140, 140,
-    48, 204, 140, 140, 140, 140, 140, 140,  48,  48,  48,  48,  71,  48,  48,  48,
-    48,  48,  48, 140, 140, 140, 140, 140, 684, 140, 570, 570, 570, 570, 570, 570,
+    48,  48, 475, 192, 476,   9, 477,  11, 478, 140, 140, 140, 140, 140, 140, 140,
+   140, 140, 140, 140, 140, 140, 271, 479,  48,  48, 480, 481, 482, 140, 140, 483,
+    48, 464, 484,  48,  62, 485, 140,  48, 486, 140, 140,  48, 487, 140,  48, 313,
+   488,  48,  48, 489, 490, 457, 491, 492, 222,  48,  48, 493, 494,  48, 196, 192,
+   495,  48, 496, 497, 498,  48,  48, 499, 222,  48,  48, 500, 501, 502, 503, 504,
+    48,  97, 505, 506, 507, 140, 140, 140, 508, 509, 510,  48,  48, 511, 512, 192,
+   513,  83,  84, 514, 515, 516, 517, 518, 519,  48,  48, 520, 521, 522, 523, 140,
+    48,  48,  48, 524, 525, 526, 481, 140,  48,  48,  48, 527, 528, 192, 140, 140,
+   140, 140, 140, 140, 140, 140, 140, 140,  48,  48, 529, 530, 531, 532, 140, 140,
+    48,  48,  48, 533, 534, 192, 535, 140,  48,  48, 536, 537, 192, 538, 539, 140,
+    48, 540, 541, 542, 313, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140,
+    48,  48, 505, 543, 140, 140, 140, 140, 140, 140,   9,   9,  11,  11, 148, 544,
+   545, 546,  48, 547, 548, 192, 140, 140, 140, 140, 549,  48,  48, 550, 551, 140,
+   552,  48,  48, 553, 554, 555,  48,  48, 556, 557, 558,  48,  48,  48,  48, 196,
+   559, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140,  48,  48, 560, 192,
+    84,  48, 529, 561, 562, 148, 175, 563,  48, 564, 565, 566, 140, 140, 140, 140,
+   567,  48,  48, 568, 569, 192, 570,  48, 571, 572, 192, 140, 140, 140, 140, 140,
+   140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140,  48, 573,
+   574, 115,  48, 575, 576, 577, 140, 140, 140, 140, 140, 100, 271, 578, 579, 580,
+    48,  48,  48,  48,  48,  48,  48,  48,  48, 207, 140, 140, 140, 140, 140, 140,
+   272, 272, 272, 272, 272, 272, 581, 582,  48,  48,  48,  48,  48,  48,  48,  48,
+    48,  48,  48,  48, 388, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140,
+   140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140,
+   140, 140, 140, 140, 140, 140, 140, 140, 140,  48,  48,  48,  48,  48,  48, 583,
+    48,  48,  48, 584, 585, 586,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,
+    48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  71,
+    48,  48,  48,  48, 313, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140,
+    48, 587, 588, 192, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140,
+    48,  48,  48, 196,  48, 200, 370,  48,  48,  48,  48, 200, 192,  48, 204, 589,
+    48,  48,  48, 590, 591, 592, 593, 594,  48, 140, 140, 140, 140, 140, 140, 140,
+   140, 140, 140, 140, 595,  48, 596, 192, 140, 140, 140, 140, 140, 140, 140, 140,
+   140, 140, 140, 140,   9,   9,  11,  11, 271, 597, 140, 140, 140, 140, 140, 140,
+    48,  48,  48,  48, 598, 599, 600, 600, 601, 602, 140, 140, 140, 140, 603, 604,
+    48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48, 440,
+    48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48, 199, 140, 605,
+   196, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140,
+   140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 606,
+    48,  48, 607, 608, 140, 609, 610,  48,  48,  48,  48,  48,  48,  48,  48,  48,
+    48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48, 206,
+    48,  48,  48,  48,  48,  48,  71, 151, 196, 611, 612, 140, 140, 140, 140, 140,
+   209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 192,
+   209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 322, 140, 140, 140, 140,
+    32,  32, 613,  32, 614, 209, 209, 209, 209, 209, 209, 209, 322, 140, 140, 140,
+   209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 323,
+   209, 209, 615, 209, 209, 209, 616, 617, 618, 209, 619, 209, 209, 209, 287, 140,
+   209, 209, 209, 209, 620, 140, 140, 140, 140, 140, 140, 140, 271, 621, 271, 621,
+   209, 209, 209, 209, 209, 338, 271, 461, 140, 140, 140, 140, 140, 140, 140, 140,
+     9, 622,  11, 623, 624, 625, 241,   9, 626, 627, 628, 629, 630,   9, 622,  11,
+   631, 632,  11, 633, 634, 635, 636,   9, 637,  11,   9, 622,  11, 623, 624,  11,
+   241,   9, 626, 636,   9, 637,  11,   9, 622,  11, 638,   9, 639, 640, 641, 642,
+    11, 643,   9, 644, 645, 646, 647,  11, 648,   9, 649,  11, 650, 538, 538, 538,
+    32,  32,  32, 651,  32,  32, 652, 653, 654, 655,  45, 140, 140, 140, 140, 140,
+   656, 657, 658, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140,
+   659, 660, 661,  27,  27,  27, 662, 140, 663, 140, 140, 140, 140, 140, 140, 140,
+    48,  48, 151, 664, 665, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140,
+   140, 140, 140, 140, 140, 140, 140, 140, 140,  48, 666, 140,  48,  48, 667, 668,
+   140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140,  48, 669, 192,
+   140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140,  48, 587, 670,
+   140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 671, 200,
+    48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48, 672, 614, 140, 140,
+     9,   9, 626,  11, 673, 370, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140,
+   140, 140, 140, 140, 140, 140, 140, 503, 271, 271, 674, 675, 140, 140, 140, 140,
+   503, 271, 676, 677, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140,
+   678,  48, 679, 680, 681, 682, 683, 684, 685, 206, 686, 206, 140, 140, 140, 687,
+   209, 209, 688, 209, 209, 209, 209, 209, 209, 322, 333, 689, 689, 689, 209, 323,
+   690, 209, 209, 209, 209, 209, 209, 209, 209, 209, 691, 140, 140, 140, 692, 209,
+   693, 209, 209, 688, 694, 695, 323, 140, 140, 140, 140, 140, 140, 140, 140, 140,
+   209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 696,
+   209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 697, 426, 426,
+   209, 209, 209, 209, 209, 209, 209, 698, 209, 209, 209, 209, 209, 176, 688, 427,
+   688, 209, 209, 209, 699, 176, 209, 209, 699, 209, 691, 688, 695, 140, 140, 140,
+   209, 209, 209, 209, 209, 322, 691, 426, 700, 209, 209, 209, 701, 702, 176, 694,
+   209, 209, 209, 209, 209, 209, 209, 209, 209, 703, 209, 209, 209, 209, 209, 192,
+    48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48, 140, 140,
+    48,  48,  48, 207,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,
+    48, 204,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,
+    48,  48,  48,  48,  48,  48,  48,  48,  48,  48, 481,  48,  48,  48,  48,  48,
+    48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48, 100,  48,
+    48,  48,  48,  48,  48, 204, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140,
+    48, 204, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140,
+    48,  48,  48,  48,  71,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,
+    48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48, 140, 140, 140, 140, 140,
+   704, 140, 584, 584, 584, 584, 584, 584, 140, 140, 140, 140, 140, 140, 140, 140,
     32,  32,  32,  32,  32,  32,  32,  32,  32,  32,  32,  32,  32,  32,  32, 140,
-   391, 391, 391, 391, 391, 391, 391, 685, 391, 391, 391, 391, 391, 391, 391, 686,
+   391, 391, 391, 391, 391, 391, 391, 391, 391, 391, 391, 391, 391, 391, 391, 705,
+   391, 391, 391, 391, 391, 391, 391, 391, 391, 391, 391, 391, 391, 391, 391, 706,
+     0,   1,   2,   3,   4,   4,   4,   4,   4,   4,   5,   6,   7,   8,   9,  10,
+    11,  11,  12,  11,  13,  14,  15,  16,  17,  18,  19,  20,  21,  22,  23,  24,
+    25,  26,  27,  28,  29,  30,  31,  32,  33,  34,  35,  36,  37,  38,  39,  40,
+    41,  42,  43,  44,  45,  46,  47,  48,  49,  50,  51,  52,  53,  54,  55,  56,
+    57,  57,  58,  59,  60,  60,  60,  60,  61,  62,  63,  64,  65,  66,  67,  68,
+    69,  69,  69,  69,  69,  69,  69,  69,  69,  69,  70,  71,  72,  73,  74,  75,
+    76,  77,  78,  79,  80,  81,  82,  83,  84,  85,  86,  87,  88,  89,  90,  91,
+    92,  93,  94,  95,  96,  97,  98,   7,   4,   4,   4,   4,  99, 100, 101, 102,
+   103, 104, 105, 106, 107, 108, 109,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+   110, 111,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+   112, 112, 112, 112,   0,   0,   0,   0,   0,   0,   0,   0,   0, 113, 114,   0,
+   115, 116, 117, 118, 119, 120, 121, 122,   0, 123, 124, 125, 126, 126, 126, 127,
+   128, 129, 130, 131, 132,  60, 133, 134, 135, 136,   0, 137, 138, 139,   0,   0,
+   126, 126, 126, 126, 126, 126, 126, 126, 126, 126, 126, 126, 126, 126, 126, 126,
+   126, 126, 126, 126, 126, 126, 126,   0, 126, 126, 126, 126, 126, 126, 126, 126,
+   140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140,
+   140, 140, 141, 142, 143, 143, 143, 143, 144,  11, 145, 146, 147,   4, 148, 149,
+   150, 151, 152, 153, 154, 155, 156, 157, 158, 159, 160, 161, 162, 163, 164, 165,
+    60,  60,  60,  60,  60,  60,  60,  60,  60,  60,  60,  60,  60,  60,  60,  60,
+    60,  60,  60,  60,  60,  60,  60,  60,  60,  60,  60,  60,  60,  60, 166, 167,
+   168, 168, 168, 168, 168, 168, 168, 168, 168, 168, 168, 168, 168, 168, 168, 168,
+   168, 168, 168, 168, 126, 126, 126, 126, 126, 169, 126, 170, 171, 172,  19, 173,
+    19,  19,  19,  19, 174,  19, 175, 176, 177, 178,  19, 179, 180, 181, 182, 183,
+   184, 185, 186, 187, 188, 189, 190, 191, 168, 168, 192, 193, 194, 195, 196, 197,
+   198, 199, 200, 201, 202, 203, 204, 205, 206, 206, 206, 206, 207, 208, 209, 168,
+   210, 211, 212, 213, 214, 168, 215, 216, 217, 218, 219, 220, 221, 222, 223, 168,
+   224, 225, 226, 227, 228, 229, 230, 168, 168, 231, 232, 233, 234, 235, 236, 237,
+   238, 239, 240, 241, 242, 243, 244, 245, 246, 247, 248, 249, 250, 251, 252, 253,
+   254, 255, 256, 257, 168, 168, 258, 259, 260, 261, 262, 263, 264, 265, 168, 168,
+   266, 168, 267, 268, 269, 270, 271, 272, 273, 274, 275, 276, 277, 168, 168, 278,
+   279, 280, 281, 168, 282, 283, 284, 168, 168, 168, 168, 285, 286, 287, 288, 289,
+   290, 290, 290, 290, 290, 290, 290, 290, 290, 290, 290, 290, 290, 290, 291, 168,
+   290, 292, 290, 290, 290, 293, 168, 168, 168, 168, 168, 168, 168, 168, 168, 168,
+   168, 168, 168, 168, 168, 168, 168, 168, 168, 168, 168, 168, 168, 168, 294, 295,
+   296, 296, 296, 296, 296, 296, 296, 296, 296, 296, 296, 296, 296, 296, 296, 296,
+   296, 297, 296, 296, 296, 296, 296, 296, 296, 296, 296, 296, 296, 296, 296, 296,
+   296, 296, 296, 296, 296, 296, 296, 296, 296, 296, 296, 296, 296, 296, 296, 298,
+   299, 299, 299, 299, 299, 299, 299, 299, 299, 300, 168, 168, 168, 168, 168, 168,
+   168, 168, 168, 168, 301, 168, 168, 168, 168, 168, 168, 168, 168, 168, 168, 168,
+   302, 302, 302, 302, 302, 302, 302, 302, 303, 304, 305, 306, 307, 308, 309, 168,
+   168, 168, 168, 168, 168, 310, 168, 168, 168, 311, 312, 168, 313, 314, 315, 316,
+   317, 317, 317, 317, 317, 317, 317, 317, 317, 317, 317, 317, 317, 317, 317, 317,
+   317, 317, 317, 317, 317, 317, 317, 317, 317, 317, 317, 317, 317, 317, 317, 318,
+   317, 317, 317, 317, 317, 317, 317, 317, 317, 317, 317, 317, 319, 319, 319, 319,
+   319, 319, 319, 320, 321, 168, 168, 168, 168, 168, 168, 168, 168, 168, 168, 168,
+   168, 168, 168, 168, 168, 168, 168, 168, 168, 168, 168, 168, 168, 168, 168, 322,
+   323, 324, 324, 324, 325, 326, 327, 327, 327, 327, 327, 328, 168, 168, 168, 168,
+   329, 330, 331, 168, 168, 168, 168, 168, 168, 168, 168, 168, 168, 168, 168, 168,
+     0,   0,   0, 332,   0,   0,   0,   0,   0,   0, 333, 168, 334, 335,   0, 336,
+     0,   0,   0, 337, 338, 339, 340, 341, 189, 342, 168, 343,   0, 344, 168, 168,
+     0, 345, 346, 347, 348, 349,   0,   0,   0,   0, 350,   0,   0,   0,   0, 351,
+   352, 352, 352, 352, 352, 352, 352, 352, 352, 352, 353, 168, 168, 168, 168, 168,
+   168, 168, 168, 168, 168, 168, 168, 168, 168, 168, 168, 168, 354, 168, 168, 168,
+   355, 356, 357, 168, 358, 359, 168, 168, 168, 168, 360, 361, 168, 168, 168, 168,
+   168, 168, 168, 362, 168, 168, 168, 363, 168, 168, 168, 168, 168, 168, 168, 364,
+   365, 365, 365, 366, 367, 368, 168, 168, 168, 168, 168, 168, 168, 168, 168, 168,
+   168, 369, 370, 168, 371, 168, 168, 168, 372, 373, 374, 375, 168, 168, 168, 168,
+   376,   0, 377, 378,   0,   0, 379, 380, 381, 382, 168, 168,   0,   0,   0,   0,
+     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0, 383,   0, 384,   0, 385,
+   386, 387, 388, 389,   0,   0,   0,   0,   0, 390, 391, 392,   0,   0, 393, 332,
+   126, 126, 126, 126, 126, 126, 126, 126, 126, 126, 126, 394, 126, 126, 126, 126,
+   126, 126, 126, 126, 126, 126, 126, 126, 126, 126, 126, 126, 395, 126, 126, 126,
+   396, 126, 126, 126, 126, 126, 126, 126, 126, 126, 126, 126, 126, 126, 126, 126,
+   126, 126, 126, 126, 126, 126, 126, 126, 126, 126, 397, 126, 126, 126, 126, 126,
+   126, 126, 126, 126, 126, 126, 126, 126, 126, 126, 126, 126, 126, 126, 126, 398,
+   126, 126, 126, 126, 126, 126, 126, 126, 126, 399, 168, 168, 168, 168, 168, 168,
+   126, 126, 126, 126, 126, 126, 126, 126, 399, 168, 168, 168, 168, 168, 168, 168,
+   126, 126, 126, 126, 126, 126, 126, 126, 126, 126, 126, 126, 126, 400, 126, 126,
+   126, 126, 126, 126, 126, 126, 126, 126, 126, 126, 126, 126, 126, 126, 401, 168,
+   402,   0, 168, 168,   7,   7,   7, 403,   0,   1,   2,   3,   4,   4,   4,   4,
      0,   0,   0,   0,   0,   0,   0,   0,   1,   2,   2,   3,   1,   2,   2,   3,
      0,   0,   0,   0,   0,   4,   0,   4,   2,   2,   5,   2,   2,   2,   5,   2,
-     2,   2,   2,   2,   2,   2,   2,   2,   2,   2,   2,   2,   2,   2,   2,   2,
-     2,   2,   2,   2,   2,   2,   2,   6,   0,   0,   0,   0,   7,   8,   0,   0,
-     9,   9,   9,   9,   9,   9,   9,   9,   9,   9,   9,   9,   9,   9,  10,  11,
-    12,  13,  14,  14,  15,  14,  14,  14,  14,  14,  14,  14,  16,  17,  14,  14,
-    18,  18,  18,  18,  18,  18,  18,  18,  18,  18,  18,  18,  18,  18,  18,  18,
-    19,  18,  18,  18,  18,  18,  18,  18,  18,  18,  18,  18,  18,  18,  18,  18,
-    18,  18,  18,  18,  18,  18,  20,  21,  21,  21,  22,  20,  21,  21,  21,  21,
-    21,  23,  24,  25,  25,  25,  25,  25,  25,  26,  25,  25,  25,  27,  28,  26,
-    29,  30,  31,  32,  31,  31,  31,  31,  33,  34,  35,  31,  31,  31,  36,  31,
-    31,  31,  31,  31,  31,  31,  31,  31,  31,  31,  31,  29,  31,  31,  31,  31,
-    37,  38,  37,  37,  37,  37,  37,  37,  37,  39,  31,  31,  31,  31,  31,  31,
-    40,  40,  40,  40,  40,  40,  41,  26,  42,  42,  42,  42,  42,  42,  42,  43,
-    44,  44,  44,  44,  44,  45,  44,  46,  47,  47,  47,  48,  37,  49,  31,  31,
-    31,  50,  51,  31,  31,  31,  31,  31,  31,  31,  31,  31,  52,  31,  31,  31,
-    53,  53,  53,  53,  53,  53,  53,  53,  53,  53,  54,  53,  55,  53,  53,  53,
-    56,  57,  58,  59,  59,  60,  61,  62,  57,  63,  64,  65,  66,  59,  59,  67,
-    68,  69,  70,  71,  71,  72,  73,  74,  69,  75,  76,  77,  78,  71,  79,  26,
-    80,  81,  82,  83,  83,  84,  85,  86,  81,  87,  88,  26,  89,  83,  90,  91,
-    92,  93,  94,  95,  95,  96,  97,  98,  93,  99, 100, 101, 102,  95,  95,  26,
-   103, 104, 105, 106, 107, 104, 108, 109, 104, 105, 110,  26, 111, 108, 108, 112,
-   113, 114, 115, 113, 113, 115, 113, 116, 114, 117, 118, 119, 120, 113, 121, 113,
-   122, 123, 124, 122, 122, 124, 125, 126, 123, 127, 128, 128, 129, 122, 130,  26,
-   131, 132, 133, 131, 131, 131, 131, 131, 132, 133, 134, 131, 135, 131, 131, 131,
-   136, 137, 138, 139, 137, 137, 140, 141, 138, 142, 143, 137, 144, 137, 145,  26,
-   146, 147, 147, 147, 147, 147, 147, 148, 147, 147, 147, 149,  26,  26,  26,  26,
-   150, 151, 152, 152, 153, 152, 152, 154, 155, 156, 152, 157,  26,  26,  26,  26,
-   158, 158, 158, 158, 158, 158, 158, 158, 158, 159, 158, 158, 158, 160, 159, 158,
-   158, 158, 158, 159, 158, 158, 158, 161, 158, 161, 162, 163,  26,  26,  26,  26,
-   164, 164, 164, 164, 164, 164, 164, 164, 164, 164, 164, 164, 164, 164, 164, 164,
+     2,   2,   2,   2,   2,   2,   2,   2,   2,   2,   2,   2,   2,   2,   2,   6,
+     0,   0,   0,   0,   7,   8,   0,   0,   9,   9,   9,   9,   9,   9,   9,   9,
+     9,   9,   9,   9,   9,   9,  10,  11,  12,  13,  14,  14,  15,  14,  14,  14,
+    14,  14,  14,  14,  16,  17,  14,  14,  18,  18,  18,  18,  18,  18,  18,  18,
+    19,  18,  18,  18,  18,  18,  18,  18,  18,  18,  18,  18,  18,  18,  20,  21,
+    21,  21,  22,  20,  21,  21,  21,  21,  21,  23,  24,  25,  25,  25,  25,  25,
+    25,  26,  25,  25,  25,  27,  28,  26,  29,  30,  31,  32,  31,  31,  31,  31,
+    33,  34,  35,  31,  31,  31,  36,  31,  31,  31,  31,  31,  31,  31,  31,  31,
+    31,  31,  31,  29,  31,  31,  31,  31,  37,  38,  37,  37,  37,  37,  37,  37,
+    37,  39,  31,  31,  31,  31,  31,  31,  40,  40,  40,  40,  40,  40,  41,  26,
+    42,  42,  42,  42,  42,  42,  42,  43,  44,  44,  44,  44,  44,  45,  44,  46,
+    47,  47,  47,  48,  37,  49,  31,  31,  31,  50,  51,  31,  31,  31,  31,  31,
+    31,  31,  31,  31,  52,  31,  31,  31,  53,  53,  53,  53,  53,  53,  53,  53,
+    53,  53,  54,  53,  55,  53,  53,  53,  56,  57,  58,  59,  59,  60,  61,  62,
+    57,  63,  64,  65,  66,  59,  59,  67,  68,  69,  70,  71,  71,  72,  73,  74,
+    69,  75,  76,  77,  78,  71,  79,  26,  80,  81,  82,  83,  83,  84,  85,  86,
+    81,  87,  88,  26,  89,  83,  90,  91,  92,  93,  94,  95,  95,  96,  97,  98,
+    93,  99, 100, 101, 102,  95,  95,  26, 103, 104, 105, 106, 107, 104, 108, 109,
+   104, 105, 110,  26, 111, 108, 108, 112, 113, 114, 115, 113, 113, 115, 113, 116,
+   114, 117, 118, 119, 120, 113, 121, 113, 122, 123, 124, 122, 122, 124, 125, 126,
+   123, 127, 128, 128, 129, 122, 130,  26, 131, 132, 133, 131, 131, 131, 131, 131,
+   132, 133, 134, 131, 135, 131, 131, 131, 136, 137, 138, 139, 137, 137, 140, 141,
+   138, 142, 143, 137, 144, 137, 145,  26, 146, 147, 147, 147, 147, 147, 147, 148,
+   147, 147, 147, 149,  26,  26,  26,  26, 150, 151, 152, 152, 153, 152, 152, 154,
+   155, 156, 152, 157,  26,  26,  26,  26, 158, 158, 158, 158, 158, 158, 158, 158,
+   158, 159, 158, 158, 158, 160, 159, 158, 158, 158, 158, 159, 158, 158, 158, 161,
+   158, 161, 162, 163,  26,  26,  26,  26, 164, 164, 164, 164, 164, 164, 164, 164,
    164, 164, 164, 164, 165, 165, 165, 165, 166, 167, 165, 165, 165, 165, 165, 168,
-   169, 169, 169, 169, 169, 169, 169, 169, 169, 169, 169, 169, 169, 169, 169, 169,
-   170, 170, 170, 170, 170, 170, 170, 170, 170, 171, 172, 171, 170, 170, 170, 170,
-   170, 171, 170, 170, 170, 170, 171, 172, 171, 170, 172, 170, 170, 170, 170, 170,
-   170, 170, 171, 170, 170, 170, 170, 170, 170, 170, 170, 173, 170, 170, 170, 174,
-   170, 170, 170, 175, 176, 176, 176, 176, 176, 176, 176, 176, 176, 176, 177, 177,
-   178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178,
+   169, 169, 169, 169, 169, 169, 169, 169, 170, 170, 170, 170, 170, 170, 170, 170,
+   170, 171, 172, 171, 170, 170, 170, 170, 170, 171, 170, 170, 170, 170, 171, 172,
+   171, 170, 172, 170, 170, 170, 170, 170, 170, 170, 171, 170, 170, 170, 170, 170,
+   170, 170, 170, 173, 170, 170, 170, 174, 170, 170, 170, 175, 176, 176, 176, 176,
+   176, 176, 176, 176, 176, 176, 177, 177, 178, 178, 178, 178, 178, 178, 178, 178,
    179, 179, 179, 180, 181, 181, 181, 181, 181, 181, 181, 181, 181, 182, 181, 183,
    184, 184, 185, 186, 187, 187, 188,  26, 189, 189, 190,  26, 191, 192, 193,  26,
    194, 194, 194, 194, 194, 194, 194, 194, 194, 194, 194, 195, 194, 196, 194, 196,
@@ -2368,208 +2467,164 @@ _hb_ucd_u16[9344] =
    210, 210, 210, 210, 210, 211, 210, 210, 210, 212, 210, 213, 194, 194, 194, 194,
    214, 214, 214, 215, 216, 216, 216, 216, 216, 216, 216, 217, 216, 216, 216, 218,
    216, 219, 216, 219, 216, 220,   9,   9,   9, 221,  26,  26,  26,  26,  26,  26,
-   222, 222, 222, 222, 222, 222, 222, 222, 222, 223, 222, 222, 222, 222, 222, 224,
-   225, 225, 225, 225, 225, 225, 225, 225, 226, 226, 226, 226, 226, 226, 227, 228,
-   229, 229, 229, 229, 229, 229, 229, 230, 229, 231, 232, 232, 232, 232, 232, 232,
-    18, 233, 165, 165, 165, 165, 165, 234, 225,  26, 235,   9, 236, 237, 238, 239,
-     2,   2,   2,   2, 240, 241,   2,   2,   2,   2,   2, 242, 243, 244,   2, 245,
-     2,   2,   2,   2,   2,   2,   2, 246,   9,   9,   9,   9,   9,   9,   9,   9,
-    14,  14, 247, 247,  14,  14,  14,  14, 247, 247,  14, 248,  14,  14,  14, 247,
-    14,  14,  14,  14,  14,  14, 249,  14, 249,  14, 250, 251,  14,  14, 252, 253,
-     0, 254,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0, 255,   0, 256, 257,
-     0, 258,   2, 259,   0,   0,   0,   0, 260,  26,   9,   9,   9,   9, 261,  26,
-     0,   0,   0,   0, 262, 263,   4,   0,   0, 264,   0,   0,   2,   2,   2,   2,
-     2, 265,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0, 258,  26,  26,  26,   0, 266,  26,  26,   0,   0,   0,   0,
-   267, 267, 267, 267, 267, 267, 267, 267, 267, 267, 267, 267, 267, 267, 267, 267,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0, 268,   0,
-     0,   0, 269,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   270, 270, 270, 270, 270, 270, 270, 270, 270, 270, 270, 270,   2,   2,   2,   2,
-    17,  17,  17,  17,  17,  17,  17,  17,  17,  17,  17,  17,  17,  17, 271, 272,
-   165, 165, 165, 165, 166, 167, 273, 273, 273, 273, 273, 273, 273, 274, 275, 274,
-   170, 170, 172,  26, 172, 172, 172, 172, 172, 172, 172, 172,  18,  18,  18,  18,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0, 276,  26,  26,  26,  26,
+   222, 222, 222, 222, 222, 222, 222, 222, 222, 223, 222, 222, 222, 222, 222, 222,
+   224, 224, 224, 224, 224, 224, 224, 224, 225, 225, 225, 225, 225, 225, 226, 227,
+   228, 228, 228, 228, 228, 228, 228, 229, 228, 230, 231, 231, 231, 231, 231, 231,
+    18, 232, 165, 165, 165, 165, 165, 233, 224,  26, 234,   9, 235, 236, 237, 238,
+     2,   2,   2,   2, 239, 240,   2,   2,   2,   2,   2, 241, 242, 243,   2, 244,
+     2,   2,   2,   2,   2,   2,   2, 245,  14,  14, 246, 246,  14,  14,  14,  14,
+   246, 246,  14, 247,  14,  14,  14, 246,  14,  14,  14,  14,  14,  14, 248,  14,
+   248,  14, 249, 250,  14,  14, 251, 252,   0, 253,   0,   0,   0,   0,   0,   0,
+     0,   0,   0,   0, 254,   0, 255, 256,   0, 257,   2, 258,   0,   0,   0,   0,
+   259,  26,   9,   9,   9,   9, 260,  26,   0,   0,   0,   0, 261, 262,   4,   0,
+     0, 263,   0,   0,   2,   2,   2,   2,   2, 264,   0,   0,   0,   0,   0,   0,
+     0,   0,   0,   0,   0, 265,  26,  26,   0, 266,  26,  26,   0,   0,   0,   0,
+   267, 267, 267, 267, 267, 267, 267, 267,   0,   0,   0,   0,   0,   0, 268,   0,
+     0,   0, 269,   0,   0,   0,   0,   0, 270, 270, 270, 270, 270, 270, 270, 270,
+   270, 270, 270, 270,   2,   2,   2,   2,  17,  17,  17,  17,  17,  17,  17,  17,
+    17,  17,  17,  17,  17,  17, 271, 272, 165, 165, 165, 165, 166, 167, 273, 273,
+   273, 273, 273, 273, 273, 274, 275, 274, 170, 170, 172,  26, 172, 172, 172, 172,
+   172, 172, 172, 172,  18,  18,  18,  18,   0,   0,   0, 276,  26,  26,  26,  26,
    277, 277, 277, 278, 277, 277, 277, 277, 277, 277, 277, 277, 277, 277, 279,  26,
-   277, 277, 277, 277, 277, 277, 277, 277, 277, 277, 277, 277, 277, 277, 277, 277,
    277, 277, 277, 277, 277, 277, 277, 277, 277, 277, 280,  26,  26,  26,   0,   0,
    281,   0,   0,   0, 282, 283,   0, 284, 285, 286, 286, 286, 286, 286, 286, 286,
    286, 286, 287, 288, 289, 290, 290, 290, 290, 290, 290, 290, 290, 290, 290, 291,
-   292, 293, 293, 293, 293, 293, 294, 169, 169, 169, 169, 169, 169, 169, 169, 169,
-   169, 295,   0,   0, 293, 293, 293, 293,   0,   0,   0,   0, 296, 297, 290, 290,
-   169, 169, 169, 295,   0,   0,   0,   0,   0,   0,   0,   0, 169, 169, 169, 298,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,   0, 290, 290, 290, 290, 290, 299,
+   292, 293, 293, 293, 293, 293, 294, 169, 169, 295,   0,   0, 293, 293, 293, 293,
+     0,   0,   0,   0, 276, 296, 290, 290, 169, 169, 169, 295,   0,   0,   0,   0,
+     0,   0,   0,   0, 169, 169, 169, 297,   0,   0, 290, 290, 290, 290, 290, 298,
    290, 290, 290, 290, 290, 290, 290, 290, 290, 290, 290,   0,   0,   0,   0,   0,
-   277, 277, 277, 277, 277, 277, 277, 277,   0,   0,   0,   0,   0,   0,   0,   0,
-   300, 300, 300, 300, 300, 300, 300, 300, 300, 300, 300, 300, 300, 300, 300, 300,
-   300, 301, 300, 300, 300, 300, 300, 300, 302,  26, 303, 303, 303, 303, 303, 303,
-   304, 304, 304, 304, 304, 304, 304, 304, 304, 304, 304, 304, 304, 304, 304, 304,
-   304, 304, 304, 304, 304, 305,  26,  26,  18,  18,  18,  18,  18,  18,  18,  18,
-    18,  18,  18,  18, 306, 306, 306, 306, 306, 306, 306, 306, 306, 306, 306,  26,
-     0,   0,   0,   0, 307,   2,   2,   2,   2,   2,   2,   2,   2,   2,   2,   2,
-     2, 308,   2,   2,   2,   2,   2,   2,   2, 309, 310, 311,  26,  26, 312,   2,
-   313, 313, 313, 313, 313, 314,   0, 315, 316, 316, 316, 316, 316, 316, 316,  26,
-   317, 317, 317, 317, 317, 317, 317, 317, 318, 319, 317, 320,  53,  53,  53,  53,
-   321, 321, 321, 321, 321, 322, 323, 323, 323, 323, 324, 325, 169, 169, 169, 326,
-   327, 327, 327, 327, 327, 327, 327, 327, 327, 328, 327, 329, 164, 164, 164, 330,
-   331, 331, 331, 331, 331, 331, 332,  26, 331, 333, 331, 334, 164, 164, 164, 164,
-   335, 335, 335, 335, 335, 335, 335, 335, 336,  26,  26, 337, 338, 338, 339,  26,
-   340, 340, 340,  26, 172, 172,   2,   2,   2,   2,   2, 341, 342, 343, 176, 176,
-   176, 176, 176, 176, 176, 176, 176, 176, 338, 338, 338, 338, 338, 344, 338, 345,
-   169, 169, 169, 169, 346,  26, 169, 169, 295, 347, 169, 169, 169, 169, 169, 346,
-    26,  26,  26,  26,  26,  26,  26,  26,  26,  26,  26,  26,  26,  26,  26,  26,
-   277, 277, 277, 277, 277, 277, 277, 277, 277, 277, 277, 277, 277, 280, 277, 277,
-   277, 277, 277, 277, 277, 277, 277, 277, 277, 277, 277, 348,  26,  26,  26,  26,
-   349,  26, 350, 351,  25,  25, 352, 353, 354,  25,  31,  31,  31,  31,  31,  31,
-    31,  31,  31,  31,  31,  31,  31,  31, 355,  26, 356,  31,  31,  31,  31,  31,
-    31,  31,  31,  31,  31,  31,  31,  31,  31,  31,  31,  31,  31,  31,  31,  31,
-    31,  31,  31,  31,  31,  31,  31, 357,  31,  31,  31,  31,  31,  31,  31,  31,
-    31,  31, 358,  31,  31,  31,  31,  31,  31, 359,  26,  26,  26,  26,  31,  31,
-     9,   9,   0, 315,   9, 360,   0,   0,   0,   0, 361,   0, 258, 296, 362,  31,
-    31,  31,  31,  31,  31,  31,  31,  31,  31,  31,  31,  31,  31,  31,  31, 363,
-   364,   0,   0,   0,   1,   2,   2,   3,   1,   2,   2,   3, 365, 290, 289, 290,
-   290, 290, 290, 366, 169, 169, 169, 295, 367, 367, 367, 368, 258, 258,  26, 369,
-   370, 371, 370, 370, 372, 370, 370, 373, 370, 374, 370, 374,  26,  26,  26,  26,
-   370, 370, 370, 370, 370, 370, 370, 370, 370, 370, 370, 370, 370, 370, 370, 375,
-   376,   0,   0,   0,   0,   0, 377,   0,  14,  14,  14,  14,  14,  14,  14,  14,
-    14, 253,   0, 378, 379,  26,  26,  26,  26,  26,   0,   0,   0,   0,   0, 380,
-   381, 381, 381, 382, 383, 383, 383, 383, 383, 383, 384,  26, 385,   0,   0, 296,
-   386, 386, 386, 386, 387, 388, 389, 389, 389, 390, 391, 391, 391, 391, 391, 392,
-   393, 393, 393, 394, 395, 395, 395, 395, 396, 395, 397,  26,  26,  26,  26,  26,
-   398, 398, 398, 398, 398, 398, 398, 398, 398, 398, 399, 399, 399, 399, 399, 399,
-   400, 400, 400, 401, 400, 402, 403, 403, 403, 403, 404, 403, 403, 403, 403, 404,
-   405, 405, 405, 405, 405,  26, 406, 406, 406, 406, 406, 406, 407, 408, 409, 410,
-   409, 410, 411, 409, 412, 409, 412, 413,  26,  26,  26,  26,  26,  26,  26,  26,
-   414, 414, 414, 414, 414, 414, 414, 414, 414, 414, 414, 414, 414, 414, 414, 414,
-   414, 414, 414, 414, 414, 414, 415,  26, 414, 414, 416,  26, 414,  26,  26,  26,
-   417,   2,   2,   2,   2,   2, 418, 309,  26,  26,  26,  26,  26,  26,  26,  26,
-   419, 420, 421, 421, 421, 421, 422, 423, 424, 424, 425, 424, 426, 426, 426, 426,
-   427, 427, 427, 428, 429, 427,  26,  26,  26,  26,  26,  26, 430, 430, 431, 432,
-   433, 433, 433, 434, 435, 435, 435, 436,  26,  26,  26,  26,  26,  26,  26,  26,
-   437, 437, 437, 437, 438, 438, 438, 439, 438, 438, 440, 438, 438, 438, 438, 438,
-   441, 442, 443, 444, 445, 445, 446, 447, 445, 448, 445, 448, 449, 449, 449, 449,
-   450, 450, 450, 450,  26,  26,  26,  26, 451, 451, 451, 451, 452, 453, 452,  26,
-   454, 454, 454, 454, 454, 454, 455, 456, 457, 457, 458, 457, 459, 459, 460, 459,
-   461, 461, 462, 463,  26, 464,  26,  26,  26,  26,  26,  26,  26,  26,  26,  26,
-   465, 465, 465, 465, 465, 465, 465, 465, 465, 466,  26,  26,  26,  26,  26,  26,
-   467, 467, 467, 467, 467, 467, 468,  26, 467, 467, 467, 467, 467, 467, 468, 469,
-   470, 470, 470, 470, 470,  26, 470, 471,  26,  26,  26,  26,  26,  26,  26,  26,
-    26,  26,  26,  26,  26,  26,  26,  26,  26,  26,  26,  26,  31,  31,  31,  50,
-   472, 472, 472, 472, 472, 473, 474,  26,  26,  26,  26,  26,  26,  26,  26, 475,
-   476, 476, 476, 476, 476,  26, 477, 477, 477, 477, 477, 478,  26,  26, 479, 479,
-   479, 480,  26,  26,  26,  26, 481, 481, 481, 482,  26,  26, 483, 483, 484,  26,
-   485, 485, 485, 485, 485, 485, 485, 485, 485, 486, 487, 485, 485, 485, 486, 488,
-   489, 489, 489, 489, 489, 489, 489, 489, 490, 491, 492, 492, 492, 493, 492, 494,
-   495, 495, 495, 495, 495, 495, 496, 495, 495,  26, 497, 497, 497, 497, 498,  26,
-   499, 499, 499, 499, 499, 499, 499, 499, 499, 499, 499, 499, 500, 137, 501,  26,
-   502, 502, 503, 502, 502, 502, 502, 502, 504,  26,  26,  26,  26,  26,  26,  26,
-   505, 506, 507, 508, 507, 509, 510, 510, 510, 510, 510, 510, 510, 511, 510, 512,
-   513, 514, 515, 516, 516, 517, 518, 519, 514, 520, 521, 522, 523, 524, 524,  26,
-   525, 525, 525, 525, 525, 525, 525, 525, 525, 525, 525, 526, 527,  26,  26,  26,
-   528, 528, 528, 528, 528, 528, 528, 528, 528,  26, 528, 529,  26,  26,  26,  26,
-   530, 530, 530, 530, 530, 530, 531, 530, 530, 530, 530, 531,  26,  26,  26,  26,
-   532, 532, 532, 532, 532, 532, 532, 532, 533,  26, 532, 534, 198, 535,  26,  26,
-   536, 536, 536, 536, 536, 536, 536, 537, 536, 537,  26,  26,  26,  26,  26,  26,
-   538, 538, 538, 539, 538, 540, 538, 538, 541,  26,  26,  26,  26,  26,  26,  26,
-   542, 542, 542, 542, 542, 542, 542, 543,  26,  26,  26,  26,  26,  26,  26,  26,
-    26,  26,  26,  26, 544, 544, 544, 544, 544, 544, 544, 544, 544, 544, 545, 546,
-   547, 548, 549, 550, 550, 550, 551, 552, 547,  26, 550, 553,  26,  26,  26,  26,
-    26,  26,  26,  26, 554, 555, 554, 554, 554, 554, 554, 555, 556,  26,  26,  26,
-   557, 557, 557, 557, 557, 557, 557, 557, 557,  26, 558, 558, 558, 558, 558, 558,
-   558, 558, 558, 558, 559,  26, 178, 178, 560, 560, 560, 560, 560, 560, 560, 561,
-    53, 562,  26,  26,  26,  26,  26,  26,  26,  26,  26,  26,  26,  26,  26,  26,
-   563, 564, 563, 563, 563, 563, 565, 563, 566,  26, 563, 563, 563, 567, 568, 568,
-   568, 568, 569, 568, 568, 570, 571,  26,  26,  26,  26,  26,  26,  26,  26,  26,
-   572, 573, 574, 574, 574, 574, 572, 575, 574,  26, 574, 576, 577, 578, 579, 579,
-   579, 580, 581, 582, 579, 583,  26,  26,  26,  26,  26,  26,  26,  26,  26,  26,
-    26,  26,  26,  26,  26,  26,  26,  26,  26,  26,  26,  26, 584, 584, 584, 585,
-   586, 586, 587, 586, 586, 586, 586, 588, 586, 586, 586, 589,  26,  26,  26,  26,
-    26,  26,  26,  26,  26,  26, 590,  26, 108, 108, 108, 108, 108, 108, 591, 592,
-   593, 593, 593, 593, 593, 593, 593, 593, 593, 593, 593, 593, 593, 593, 593, 593,
-   593, 593, 593, 594,  26,  26,  26,  26,  26,  26,  26,  26,  26,  26,  26,  26,
-   593, 593, 593, 593, 593, 593, 593, 593, 593, 593, 593, 593, 593, 595, 596,  26,
-   593, 593, 593, 593, 593, 593, 593, 593, 597,  26,  26,  26,  26,  26,  26,  26,
-    26,  26, 598, 598, 598, 598, 598, 598, 598, 598, 598, 598, 598, 598, 599,  26,
-   600, 600, 600, 600, 600, 600, 600, 600, 600, 600, 600, 600, 600, 600, 600, 600,
-   600, 600, 600, 600, 600, 600, 600, 600, 600, 600, 601,  26,  26,  26,  26,  26,
-   602, 602, 602, 602, 602, 602, 602, 602, 602, 602, 602, 602, 602, 602, 602, 602,
-   602, 602, 602, 602, 602, 602, 602, 602, 603,  26,  26,  26,  26,  26,  26,  26,
-   306, 306, 306, 306, 306, 306, 306, 306, 306, 306, 306, 306, 306, 306, 306, 306,
-   306, 306, 306, 306, 306, 306, 306, 604, 605, 605, 605, 606, 605, 607, 608, 608,
-   608, 608, 608, 608, 608, 608, 608, 609, 608, 610, 611, 611, 611, 612, 612,  26,
-   613, 613, 613, 613, 613, 613, 613, 613, 614,  26, 613, 615, 615, 613, 613, 616,
-   613, 613,  26,  26,  26,  26,  26,  26,  26,  26,  26,  26,  26,  26,  26,  26,
-    26,  26,  26,  26,  26,  26,  26,  26, 617, 617, 617, 617, 617, 617, 617, 617,
-   617, 617, 617, 618,  26,  26,  26,  26,  26,  26,  26,  26,  26,  26,  26,  26,
-   619, 619, 619, 619, 619, 619, 619, 619, 619, 620, 619, 619, 619, 619, 619, 619,
-   619, 621, 619, 619,  26,  26,  26,  26,  26,  26,  26,  26, 622,  26, 348,  26,
-   623, 623, 623, 623, 623, 623, 623, 623, 623, 623, 623, 623, 623, 623, 623, 623,
-   623, 623, 623, 623, 623, 623, 623, 623, 623, 623, 623, 623, 623, 623, 623,  26,
-   624, 624, 624, 624, 624, 624, 624, 624, 624, 624, 624, 624, 624, 624, 624, 624,
-   624, 624, 624, 624, 624, 624, 624, 624, 624, 624, 625,  26,  26,  26,  26,  26,
-   623, 626,  26,  26,  26,  26,  26,  26,  26,  26,  26,  26,  26,  26,  26,  26,
-    26,  26,  26,  26,  26,  26,  26,  26,  26,  26,  26,  26,  26,  26, 627, 628,
-   629, 286, 286, 286, 286, 286, 286, 286, 286, 286, 286, 286, 286, 286, 286, 286,
-   286, 286, 286, 286, 286, 286, 286, 286, 286, 286, 286, 286, 286, 286, 286, 286,
-   286, 286, 286, 286, 630,  26, 631,  26,  26,  26, 632,  26, 633,  26, 634, 634,
-   634, 634, 634, 634, 634, 634, 634, 634, 634, 634, 634, 634, 634, 634, 634, 634,
-   634, 634, 634, 634, 634, 634, 634, 634, 634, 634, 634, 634, 634, 634, 634, 635,
-   636, 636, 636, 636, 636, 636, 636, 636, 636, 636, 636, 636, 636, 637, 636, 638,
-   636, 639, 636, 640, 296,  26,  26,  26,  26,  26,  26,  26,  26,  26,  26,  26,
-     9,   9,   9,   9,   9, 641,   9,   9, 221,  26,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0, 296,  26,  26,  26,  26,  26,  26,  26,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0, 276,  26,
-     0,   0,   0,   0, 258, 364,   0,   0,   0,   0,   0,   0, 642, 643,   0, 644,
-   645, 646,   0,   0,   0, 647,   0,   0,   0,   0,   0,   0,   0, 266,  26,  26,
-    14,  14,  14,  14,  14,  14,  14,  14, 247,  26,  26,  26,  26,  26,  26,  26,
-    26,  26,  26,  26,  26,  26,  26,  26,   0,   0, 296,  26,   0,   0, 296,  26,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,   0, 258,  26,   0,   0,   0, 260,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,   0, 255,   0,   0,   0,   0,   0,
-     0,   0,   0, 255, 648, 649,   0, 650, 651,   0,   0,   0,   0,   0,   0,   0,
-   269, 652, 255, 255,   0,   0,   0, 653, 654, 655, 656,   0,   0,   0,   0,   0,
-     0,   0,   0,   0, 276,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0, 268,   0,   0,   0,   0,   0,   0,
-   657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, 657,
-   657, 658,  26, 659, 660, 657,  26,  26,  26,  26,  26,  26,  26,  26,  26,  26,
-     2,   2,   2, 349, 661, 309,  26,  26,  26,  26,  26,  26,  26,  26,  26,  26,
-   662, 270, 270, 663, 664, 665,  18,  18,  18,  18,  18,  18,  18, 666,  26,  26,
-    26, 667,  26,  26,  26,  26,  26,  26,  26,  26,  26,  26,  26,  26,  26,  26,
-   668, 668, 668, 668, 668, 669, 668, 670, 668, 671,  26,  26,  26,  26,  26,  26,
-    26,  26, 672, 672, 672, 673,  26,  26, 674, 674, 674, 674, 674, 674, 674, 675,
-    26,  26,  26,  26,  26,  26,  26,  26,  26,  26, 676, 676, 676, 676, 676, 677,
-    26,  26,  26,  26,  26,  26,  26,  26,  26,  26,  26,  26, 172, 678, 170, 172,
-   679, 679, 679, 679, 679, 679, 679, 679, 679, 679, 679, 679, 679, 679, 679, 679,
-   679, 679, 679, 679, 679, 679, 679, 679, 680, 679, 681,  26,  26,  26,  26,  26,
-   682, 682, 682, 682, 682, 682, 682, 682, 682, 683, 682, 684,  26,  26,  26,  26,
-    26,  26,  26,  26,  26,  26,  26,  26,  26,  26,  26,  26,  26,  26, 364,   0,
-     0,   0,   0,   0,   0,   0, 378,  26,  26,  26,  26,  26,  26,  26,  26,  26,
-   364,   0,   0,   0,   0,   0,   0, 276,  26,  26,  26,  26,  26,  26,  26,  26,
-   685,  31,  31,  31, 686, 687, 688, 689, 690, 691, 686, 692, 686, 688, 688, 693,
-    31, 694,  31, 695, 696, 694,  31, 695,  26,  26,  26,  26,  26,  26,  51,  26,
-     0,   0,   0,   0,   0, 296,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0, 296,  26,   0, 258, 364,   0, 364,   0, 364,   0,   0,   0, 276,  26,
-     0,   0,   0,   0,   0, 276,  26,  26,  26,  26,  26,  26, 697,   0,   0,   0,
-   698,  26,   0,   0,   0,   0,   0, 296,   0, 260, 315,  26, 276,  26,  26,  26,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0, 699,   0, 378,   0, 378,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0, 258, 700,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0, 315,   0, 296, 260,  26,
-     0, 296,   0,   0,   0,   0,   0,   0,   0,  26,   0, 315,   0,   0,   0,   0,
-     0,  26,   0,   0,   0, 276, 315,  26,  26,  26,  26,  26,  26,  26,  26,  26,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,   0, 296,  26,   0, 276,   0, 378,
-     0, 260,   0,   0,   0,   0,   0, 269, 276, 697,   0, 296,   0, 260,   0, 260,
-     0,   0, 361,   0,   0,   0,   0,   0,   0, 266,  26,  26,  26,  26,   0, 315,
-   277, 277, 277, 277, 277, 277, 277, 277, 277, 277, 277, 277,  26,  26,  26,  26,
-   277, 277, 277, 277, 277, 277, 277, 348, 277, 277, 277, 277, 277, 277, 277, 277,
-   277, 277, 277, 280, 277, 277, 277, 277, 277, 277, 277, 277, 277, 277, 277, 277,
-   277, 277, 277, 277, 348,  26, 277, 277, 277, 277, 277, 277, 277, 277, 277, 277,
-   277, 277, 277, 277, 277, 277, 277, 277, 277, 277, 277, 277, 701,  26, 277, 277,
-   277, 277, 277, 277, 277, 277, 277, 277, 277, 277, 277, 280,  26,  26,  26,  26,
-   277, 277, 277, 280,  26,  26,  26,  26,  26,  26,  26,  26,  26,  26,  26,  26,
-   277, 277, 277, 277, 277, 277, 277, 277, 277, 702, 277, 277, 277, 277, 277, 277,
-   277, 277, 277, 277, 277, 277,  26,  26,  26,  26,  26,  26,  26,  26,  26,  26,
-   703,  26,  26,  26,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-     9,   9,   9,   9,   9,   9,   9,   9,   9,   9,   9,   9,   9,   9,   9,   9,
-     9,   9,   9,   9,   9,   9,   9,   9,   9,   9,   9,   9,   9,   9,   0,   0,
+   299, 299, 299, 299, 299, 299, 299, 299, 299, 300, 299, 299, 299, 299, 299, 299,
+   301,  26, 302, 302, 302, 302, 302, 302, 303, 303, 303, 303, 303, 303, 303, 303,
+   303, 303, 303, 303, 303, 304,  26,  26,  18,  18,  18,  18, 305, 305, 305, 305,
+   305, 305, 305, 305, 305, 305, 305,  26,   0,   0,   0,   0, 306,   2,   2,   2,
+     2, 307,   2,   2,   2,   2,   2,   2,   2, 308, 309, 258,  26,  26, 310,   2,
+   311, 311, 311, 311, 311, 312,   0, 265, 313, 313, 313, 313, 313, 313, 313,  26,
+   314, 314, 314, 314, 314, 314, 314, 314, 315, 316, 314, 317,  53,  53,  53,  53,
+   318, 318, 318, 318, 318, 319, 320, 320, 320, 320, 321, 322, 169, 169, 169, 323,
+   324, 324, 324, 324, 324, 324, 324, 324, 324, 325, 324, 326, 164, 164, 164, 327,
+   328, 328, 328, 328, 328, 328, 329,  26, 328, 330, 328, 331, 164, 164, 164, 164,
+   332, 332, 332, 332, 332, 332, 332, 332, 333,  26,  26, 334, 335, 335, 336,  26,
+   337, 337, 337,  26, 172, 172,   2,   2,   2,   2,   2, 338, 339, 340, 176, 176,
+   176, 176, 176, 176, 176, 176, 176, 176, 335, 335, 335, 335, 335, 341, 335, 342,
+   169, 169, 169, 169, 343,  26, 169, 169, 295, 344, 169, 169, 169, 169, 169, 343,
+    26,  26,  26,  26,  26,  26,  26,  26, 277, 277, 277, 277, 277, 280, 277, 277,
+   277, 277, 277, 345,  26,  26,  26,  26, 346,  26, 347, 348,  25,  25, 349, 350,
+   351,  25,  31,  31,  31,  31,  31,  31, 352,  26, 353,  31,  31,  31,  31,  31,
+    31,  31,  31,  31,  31,  31,  31, 354,  31,  31, 355,  31,  31,  31,  31,  31,
+    31, 356,  26,  26,  26,  26,  31,  31,   9,   9,   0, 265,   9, 357,   0,   0,
+     0,   0, 358,   0, 257, 359, 360,  31,  31,  31,  31,  31,  31,  31,  31, 361,
+   362,   0,   0,   0,   1,   2,   2,   3,   1,   2,   2,   3, 363, 290, 289, 290,
+   290, 290, 290, 364, 169, 169, 169, 295, 365, 365, 365, 366, 257, 257,  26, 367,
+   368, 369, 368, 368, 370, 368, 368, 371, 368, 372, 368, 372,  26,  26,  26,  26,
+   368, 368, 368, 368, 368, 368, 368, 368, 368, 368, 368, 368, 368, 368, 368, 373,
+   374,   0,   0,   0,   0,   0, 375,   0,  14,  14,  14,  14,  14,  14,  14,  14,
+    14, 252,   0, 376, 377,  26,  26,  26,  26,  26,   0,   0,   0,   0,   0, 378,
+   379, 379, 379, 380, 381, 381, 381, 381, 381, 381, 382,  26, 383,   0,   0, 359,
+   384, 384, 384, 384, 385, 386, 387, 387, 387, 388, 389, 389, 389, 389, 389, 390,
+   391, 391, 391, 392, 393, 393, 393, 393, 394, 393, 395,  26,  26,  26,  26,  26,
+   396, 396, 396, 396, 396, 396, 396, 396, 396, 396, 397, 397, 397, 397, 397, 397,
+   398, 398, 398, 399, 398, 400, 401, 401, 401, 401, 402, 401, 401, 401, 401, 402,
+   403, 403, 403, 403, 403,  26, 404, 404, 404, 404, 404, 404, 405, 406, 407, 408,
+   407, 408, 409, 407, 410, 407, 410, 411, 412, 412, 412, 412, 412, 412, 413,  26,
+   414, 414, 414, 414, 414, 414, 414, 414, 414, 414, 414, 414, 414, 414, 415,  26,
+   414, 414, 416,  26, 414,  26,  26,  26, 417,   2,   2,   2,   2,   2, 418, 419,
+   420, 421, 422, 422, 422, 422, 423, 424, 425, 425, 426, 425, 427, 427, 427, 427,
+   428, 428, 428, 429, 430, 428,  26,  26,  26,  26,  26,  26, 431, 431, 432, 433,
+   434, 434, 434, 435, 436, 436, 436, 437, 438, 438, 438, 438, 439, 439, 439, 440,
+   439, 439, 441, 439, 439, 439, 439, 439, 442, 443, 444, 445, 446, 446, 447, 448,
+   446, 449, 446, 449, 450, 450, 450, 450, 451, 451, 451, 451,  26,  26,  26,  26,
+   452, 452, 452, 452, 453, 454, 453,  26, 455, 455, 455, 455, 455, 455, 456, 457,
+   458, 458, 459, 458, 460, 460, 461, 460, 462, 462, 463, 464,  26, 465,  26,  26,
+   466, 466, 466, 466, 466, 466, 466, 466, 466, 467,  26,  26,  26,  26,  26,  26,
+   468, 468, 468, 468, 468, 468, 469,  26, 468, 468, 468, 468, 468, 468, 469, 470,
+   471, 471, 471, 471, 471,  26, 471, 472, 473, 473, 473, 473, 474, 475, 473, 473,
+   474, 476,  26,  26,  26,  26,  26,  26,  26,  26,  26,  26,  31,  31,  31,  50,
+   477, 477, 477, 477, 477, 478, 479,  26, 480,  26,  26,  26,  26,  26,  26, 481,
+   482, 482, 482, 482, 482,  26, 483, 483, 483, 483, 483, 484,  26,  26, 485, 485,
+   485, 486,  26,  26,  26,  26, 487, 487, 487, 488,  26,  26, 489, 489, 490,  26,
+   491, 491, 491, 491, 491, 491, 491, 491, 491, 492, 493, 491, 491, 491, 492, 494,
+   495, 495, 495, 495, 495, 495, 495, 495, 496, 497, 498, 498, 498, 499, 498, 500,
+   501, 501, 501, 501, 501, 501, 502, 501, 501,  26, 503, 503, 503, 503, 504,  26,
+   505, 505, 505, 505, 505, 505, 505, 505, 505, 505, 505, 505, 506, 137, 507,  26,
+   508, 508, 509, 508, 508, 508, 508, 508, 510,  26,  26,  26,  26,  26,  26,  26,
+   511, 512, 513, 514, 513, 515, 516, 516, 516, 516, 516, 516, 516, 517, 516, 518,
+   519, 520, 521, 522, 522, 523, 524, 525, 520, 526, 527, 528, 529, 530, 530,  26,
+   531, 532, 531, 531, 531, 531, 533, 531, 534, 535, 533, 536, 537,  26,  26,  26,
+   538, 538, 538, 538, 538, 538, 538, 538, 538, 538, 538, 539, 540,  26,  26,  26,
+   541, 541, 541, 541, 541, 541, 541, 541, 541,  26, 541, 542,  26,  26,  26,  26,
+   543, 543, 543, 543, 543, 543, 544, 543, 543, 543, 543, 544,  26,  26,  26,  26,
+   545, 545, 545, 545, 545, 545, 545, 545, 546,  26, 545, 547, 198, 548,  26,  26,
+   549, 549, 549, 549, 549, 549, 549, 550, 549, 550, 164, 164, 551,  26,  26,  26,
+   552, 552, 552, 553, 552, 554, 552, 552, 555,  26,  26,  26,  26,  26,  26,  26,
+   556, 556, 556, 556, 556, 556, 556, 557,  26,  26,  26,  26, 558, 558, 558, 558,
+   558, 558, 558, 558, 558, 558, 559, 560, 561, 562, 563, 564, 564, 564, 565, 566,
+   561,  26, 564, 567,  26,  26,  26,  26,  26,  26,  26,  26, 568, 569, 568, 568,
+   568, 568, 568, 569, 570,  26,  26,  26, 571, 571, 571, 571, 571, 571, 571, 571,
+   571,  26, 572, 572, 572, 572, 572, 572, 572, 572, 572, 572, 573,  26, 178, 178,
+   574, 574, 574, 574, 574, 574, 574, 575,  53, 576,  26,  26,  26,  26,  26,  26,
+   577, 577, 577, 577, 578,  26, 577, 578, 579, 580, 579, 579, 579, 579, 581, 579,
+   582,  26, 579, 579, 579, 583, 584, 584, 584, 584, 585, 584, 584, 586, 587,  26,
+   588, 589, 590, 590, 590, 590, 588, 591, 590,  26, 590, 592, 593, 594, 595, 595,
+   595, 596, 597, 598, 595, 599,  26,  26,  26,  26,  26,  26, 600, 600, 600, 601,
+   602, 602, 603, 602, 602, 602, 602, 604, 602, 602, 602, 605,  26,  26,  26,  26,
+    26,  26,  26,  26,  26,  26, 606,  26, 108, 108, 108, 108, 108, 108, 607, 608,
+   609, 609, 609, 609, 609, 609, 609, 609, 609, 609, 609, 610,  26,  26,  26,  26,
+   609, 609, 609, 609, 609, 611, 612,  26, 613,  26,  26,  26,  26,  26,  26,  26,
+    26,  26, 614, 614, 614, 614, 614, 614, 614, 614, 614, 614, 614, 614, 615,  26,
+   616, 616, 616, 616, 616, 616, 616, 616, 616, 616, 617,  26, 616, 616, 616, 616,
+   616, 616, 616, 616, 616, 616, 616, 618, 619, 619, 619, 619, 619, 619, 619, 619,
+   620,  26,  26,  26,  26,  26,  26,  26, 621, 621, 621, 621, 621, 621, 621, 622,
+   305, 305, 305, 305, 305, 305, 305, 305, 305, 305, 305, 305, 305, 305, 305, 623,
+   624, 624, 624, 625, 624, 626, 627, 627, 627, 627, 627, 627, 627, 627, 627, 628,
+   627, 629, 630, 630, 630, 631, 631,  26, 632, 632, 632, 632, 632, 632, 632, 632,
+   633,  26, 632, 634, 634, 632, 632, 635, 632, 632,  26,  26,  26,  26,  26,  26,
+   636, 636, 636, 636, 636, 636, 636, 637, 638, 638, 638, 638, 638, 638, 638, 638,
+   638, 638, 638, 639,  26,  26,  26,  26, 640, 640, 640, 640, 640, 640, 640, 640,
+   640, 641, 640, 640, 640, 640, 640, 640, 640, 642, 640, 640,  26,  26,  26,  26,
+    26,  26,  26,  26, 643,  26, 345,  26, 644, 644, 644, 644, 644, 644, 644, 644,
+   644, 644, 644, 644, 644, 644, 644,  26, 645, 645, 645, 645, 645, 645, 645, 645,
+   645, 645, 646,  26,  26,  26,  26, 647, 644, 648,  26,  26,  26,  26,  26,  26,
+    26,  26,  26,  26,  26,  26, 649, 650, 651, 286, 286, 286, 286, 286, 286, 286,
+   286, 286, 286, 286, 286, 286, 286, 286, 286, 286, 286, 286, 652,  26, 653,  26,
+    26,  26, 654,  26, 655,  26, 656, 656, 656, 656, 656, 656, 656, 656, 656, 656,
+   656, 656, 656, 656, 656, 656, 656, 657, 658, 658, 658, 658, 658, 658, 658, 658,
+   658, 658, 658, 658, 658, 659, 658, 660, 658, 661, 658, 662, 359,  26,  26,  26,
+     0,   0,   0,   0,   0,   0,   0, 265,   0,   0,   0,   0,   0,   0, 359,  26,
+     9,   9,   9,   9,   9, 663,   9,   9, 221,  26,   0,   0,   0,   0,   0,   0,
+   359,  26,  26,  26,  26,  26,  26,  26,   0,   0,   0,   0,   0,   0, 276,  26,
+     0,   0,   0,   0, 257, 362,   0,   0,   0,   0,   0,   0, 664, 665,   0, 666,
+   667, 668,   0,   0,   0, 669,   0,   0,   0,   0,   0,   0,   0, 266,  26,  26,
+   246,  26,  26,  26,  26,  26,  26,  26,   0,   0, 359,  26,   0,   0, 359,  26,
+     0,   0, 257,  26,   0,   0,   0, 259,   0,   0, 254,   0,   0,   0,   0,   0,
+     0,   0,   0, 254, 670, 671,   0, 672, 673,   0,   0,   0,   0,   0,   0,   0,
+   269, 674, 254, 254,   0,   0,   0, 675, 676, 677, 678,   0,   0,   0,   0,   0,
+     0,   0,   0,   0, 276,   0,   0,   0,   0, 268,   0,   0,   0,   0,   0,   0,
+   679, 679, 679, 679, 679, 679, 679, 679, 679, 680,  26, 681, 682, 679,  26,  26,
+     2,   2,   2, 346, 683, 419,  26,  26, 684, 270, 270, 685, 686, 687,  18,  18,
+    18,  18,  18,  18,  18, 688,  26,  26,  26, 689,  26,  26,  26,  26,  26,  26,
+   690, 690, 690, 690, 690, 691, 690, 692, 690, 693,  26,  26,  26,  26,  26,  26,
+    26,  26, 694, 694, 694, 695,  26,  26, 696, 696, 696, 696, 696, 696, 696, 697,
+    26,  26, 698, 698, 698, 698, 698, 699,  26,  26, 700, 700, 700, 700, 700, 701,
+    26,  26,  26,  26, 172, 702, 170, 172, 703, 703, 703, 703, 703, 703, 703, 703,
+   704, 703, 705,  26,  26,  26,  26,  26, 706, 706, 706, 706, 706, 706, 706, 706,
+   706, 707, 706, 708,  26,  26,  26,  26,  26,  26,  26,  26,  26,  26, 362,   0,
+     0,   0,   0,   0,   0,   0, 376,  26, 362,   0,   0,   0,   0,   0,   0, 276,
+   709,  31,  31,  31, 710, 711, 712, 713, 714, 715, 710, 716, 710, 712, 712, 717,
+    31, 718,  31, 719, 720, 718,  31, 719,  26,  26,  26,  26,  26,  26, 721,  26,
+     0,   0,   0,   0,   0, 359,   0,   0,   0,   0, 359,  26,   0, 257, 362,   0,
+   362,   0, 362,   0,   0,   0, 276,  26,   0,   0,   0,   0,   0, 276,  26,  26,
+    26,  26,  26,  26, 722,   0,   0,   0, 723,  26,   0,   0,   0,   0,   0, 359,
+     0, 259, 265,  26, 276,  26,  26,  26,   0,   0,   0, 724,   0, 376,   0, 376,
+     0,   0,   0,   0,   0,   0, 257, 725,   0,   0,   0, 265,   0, 359, 259,  26,
+     0, 359,   0,   0,   0,   0,   0,   0,   0,  26,   0, 265,   0,   0,   0,   0,
+     0,  26,   0,   0,   0, 276,   0, 359, 265,  26,  26,  26,  26,  26,  26,  26,
+     0,   0, 359,  26,   0, 276,   0, 376,   0, 726,   0,   0,   0,   0,   0,   0,
+   257, 722,   0, 727,   0, 265,   0, 259,   0,   0, 358,   0,   0,   0,   0,   0,
+   277, 277, 277, 277,  26,  26,  26,  26, 277, 277, 277, 277, 277, 277, 277, 345,
+   277, 277, 277, 280, 277, 277, 277, 277, 277, 277, 277, 277, 345,  26, 277, 277,
+   277, 277, 277, 277, 728,  26, 277, 277, 277, 277, 277, 280,  26,  26,  26,  26,
+   277, 729, 277, 277, 277, 277, 277, 277, 277, 277, 277, 277, 277, 277,  26,  26,
+   730,  26,  26,  26,   0,   0,   0,   0,   9,   9,   9,   9,   9,   9,   0,   0,
      0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    939, 940, 941, 942, 946, 948,   0, 962, 969, 970, 971, 976,1001,1002,1003,1008,
      0,1033,1040,1041,1042,1043,1047,   0,   0,1080,1081,1082,1086,1110,   0,   0,
@@ -2732,17 +2787,24 @@ _hb_ucd_u16[9344] =
      0,   0,   0,   0,   0,   0,   0,   0,   0,   0,1602,1603,1934,1935,1574,1575,
   1576,1577,1579,1580,1581,1583,1584,   0,1585,1587,1588,1589,1591,   0,1592,   0,
   1593,1594,   0,1595,1596,   0,1598,1599,1600,1601,1604,1582,1578,1590,1597,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,1936,   0,1937,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,1938,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,1939,1940,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,1941,1942,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,1944,1943,   0,1945,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,1946,1947,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,1948,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,1949,1950,
-  1951,1952,1953,1954,1955,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,1956,1957,1958,1960,1959,
-  1961,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+     0,   0,   0,   0,   0,   0,   0,   0,   0,1936,   0,   0,   0,   0,   0,   0,
+     0,   0,   0,   0,1937,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,1938,   0,1939,   0,   0,   0,
+     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,1940,   0,   0,   0,   0,
+     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,1941,1942,
+     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,1943,1944,   0,   0,   0,
+     0,   0,   0,1945,   0,1946,   0,   0,   0,   0,   0,   0,   0,   0,1947,   0,
+     0,1948,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+     0,   0,   0,   0,   0,1950,   0,1949,1951,   0,   0,   0,   0,   0,   0,   0,
+     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,1953,1952,   0,1954,   0,
+     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,1955,1956,   0,   0,   0,   0,
+     0,   0,   0,   0,   0,   0,   0,   0,1957,   0,   0,   0,   0,   0,   0,   0,
+     0,1958,1961,1959,1965,1960,1962,1964,1963,   0,   0,   0,   0,   0,   0,   0,
+     0,   0,   0,   0,   0,   0,   0,   0,1967,1966,1968,   0,   0,   0,   0,   0,
+     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,1969,1970,
+  1971,1972,1973,1974,1975,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,1976,1977,1978,1980,1979,
+  1981,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
    106, 104, 107, 826, 114, 118, 119, 121, 123, 124, 127, 125,  34, 830, 130, 131,
    132, 137, 827,  35, 133, 139, 829, 142, 143, 112, 144, 145, 924, 151, 152,  37,
    157, 158, 159, 160,  38, 165, 166, 169, 171, 172, 173, 174, 176, 177, 178, 179,
@@ -2799,12 +2861,12 @@ _hb_ucd_i16[196] =
 static inline uint_fast8_t
 _hb_ucd_gc (unsigned u)
 {
-  return u<1114110u?_hb_ucd_u8[6808+(((_hb_ucd_u8[1312+(((_hb_ucd_u16[((_hb_ucd_u8[544+(((_hb_ucd_u8[u>>1>>3>>3>>4])<<4)+((u>>1>>3>>3)&15u))])<<3)+((u>>1>>3)&7u)])<<3)+((u>>1)&7u))])<<1)+((u)&1u))]:2;
+  return u<1114110u?_hb_ucd_u8[6472+(((_hb_ucd_u8[816+(((_hb_ucd_u16[((_hb_ucd_u8[272+(((_hb_ucd_u8[u>>1>>3>>4>>4])<<4)+((u>>1>>3>>4)&15u))])<<4)+((u>>1>>3)&15u)])<<3)+((u>>1)&7u))])<<1)+((u)&1u))]:2;
 }
 static inline uint_fast8_t
 _hb_ucd_ccc (unsigned u)
 {
-  return u<125259u?_hb_ucd_u8[8800+(((_hb_ucd_u8[8244+(((_hb_ucd_u8[7784+(((_hb_ucd_u8[7432+(((_hb_ucd_u8[7186+(u>>2>>2>>2>>3)])<<3)+((u>>2>>2>>2)&7u))])<<2)+((u>>2>>2)&3u))])<<2)+((u>>2)&3u))])<<2)+((u)&3u))]:0;
+  return u<125259u?_hb_ucd_u8[8504+(((_hb_ucd_u8[7936+(((_hb_ucd_u8[7460+(((_hb_ucd_u8[7100+(((_hb_ucd_u8[6854+(u>>2>>2>>2>>3)])<<3)+((u>>2>>2>>2)&7u))])<<2)+((u>>2>>2)&3u))])<<2)+((u>>2)&3u))])<<2)+((u)&3u))]:0;
 }
 static inline unsigned
 _hb_ucd_b4 (const uint8_t* a, unsigned i)
@@ -2814,107 +2876,76 @@ _hb_ucd_b4 (const uint8_t* a, unsigned i)
 static inline int_fast16_t
 _hb_ucd_bmg (unsigned u)
 {
-  return u<65380u?_hb_ucd_i16[((_hb_ucd_u8[9548+(((_hb_ucd_u8[9428+(((_hb_ucd_b4(9300+_hb_ucd_u8,u>>2>>3>>3))<<3)+((u>>2>>3)&7u))])<<3)+((u>>2)&7u))])<<2)+((u)&3u)]:0;
+  return u<65380u?_hb_ucd_i16[((_hb_ucd_u8[9252+(((_hb_ucd_u8[9132+(((_hb_ucd_b4(9004+_hb_ucd_u8,u>>2>>3>>3))<<3)+((u>>2>>3)&7u))])<<3)+((u>>2)&7u))])<<2)+((u)&3u)]:0;
 }
 static inline uint_fast8_t
 _hb_ucd_sc (unsigned u)
 {
-  return u<918000u?_hb_ucd_u8[11070+(((_hb_ucd_u16[2048+(((_hb_ucd_u8[10334+(((_hb_ucd_u8[9884+(u>>3>>4>>4)])<<4)+((u>>3>>4)&15u))])<<4)+((u>>3)&15u))])<<3)+((u)&7u))]:2;
+  return u<918000u?_hb_ucd_u8[10486+(((_hb_ucd_u16[3744+(((_hb_ucd_u16[2624+(((_hb_ucd_u8[9588+(u>>3>>3>>4)])<<4)+((u>>3>>3)&15u))])<<3)+((u>>3)&7u))])<<3)+((u)&7u))]:2;
 }
 static inline uint_fast16_t
 _hb_ucd_dm (unsigned u)
 {
-  return u<195102u?_hb_ucd_u16[6032+(((_hb_ucd_u8[17084+(((_hb_ucd_u8[16702+(u>>4>>5)])<<5)+((u>>4)&31u))])<<4)+((u)&15u))]:0;
+  return u<195102u?_hb_ucd_u16[6976+(((_hb_ucd_u8[16716+(((_hb_ucd_u8[16334+(u>>4>>5)])<<5)+((u>>4)&31u))])<<4)+((u)&15u))]:0;
 }
 
 
 #elif !defined(HB_NO_UCD_UNASSIGNED)
 
 static const uint8_t
-_hb_ucd_u8[14752] =
+_hb_ucd_u8[17524] =
 {
-    0,  1,  2,  3,  4,  5,  6,  7,  7,  8,  7,  7,  7,  7,  7,  7,
-    7,  7,  7,  7,  9, 10,  7,  7,  7,  7, 11, 12, 13, 13, 13, 14,
-   15, 16, 17, 18, 19, 20, 21, 22, 23, 22, 22, 22, 22, 24,  7,  7,
-   25, 26, 22, 22, 22, 27, 28, 29, 22, 30, 31, 32, 33, 34, 35, 36,
-    7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,
-    7,  7,  7,  7, 37,  7, 38, 39,  7, 40,  7,  7,  7, 41, 22, 42,
-    7,  7, 43,  7, 44, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-   22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-   22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-   22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-   22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-   22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-   22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-   22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-   22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-   22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-   22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-   22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-   22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-   22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-   22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-   22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-   22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-   22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-   22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-   22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-   22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-   22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-   45, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-   22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-   13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
-   13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 46,
-   13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
-   13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 47,
+    0,  1,  2,  3,  4,  5,  5,  5,  5,  5,  6,  5,  5,  7,  8,  9,
+   10, 11, 12, 13, 14, 15, 16,  5, 17, 15, 18, 19, 20, 21, 22, 23,
+    5,  5,  5,  5,  5,  5,  5,  5,  5,  5, 24, 25, 26,  5, 27, 28,
+    5, 29, 30, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
+   15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
+   15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
+   15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
+   15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
+   15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
+   15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
+   15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
+   15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
+   15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
+   15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
+   31, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
+    8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8, 32,
+    8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8, 33,
     0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 14, 15,
-   16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
-   32, 33, 34, 34, 35, 36, 37, 38, 39, 34, 34, 34, 40, 41, 42, 43,
-   44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59,
-   60, 61, 62, 63, 64, 64, 65, 66, 67, 68, 69, 70, 71, 69, 72, 73,
-   69, 69, 64, 74, 64, 64, 75, 76, 77, 78, 79, 80, 81, 82, 69, 83,
-   84, 85, 86, 87, 88, 89, 69, 69, 34, 34, 34, 34, 34, 34, 34, 34,
-   34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-   34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 90, 34, 34, 34, 34,
-   91, 34, 34, 34, 34, 34, 34, 34, 34, 92, 34, 34, 93, 94, 95, 96,
-   97, 98, 99,100,101,102,103,104, 34, 34, 34, 34, 34, 34, 34, 34,
-   34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,105,
-  106,106,106,106,106,106,106,106,106,106,106,106,106,106,106,106,
-  107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,
-  107,107, 34, 34,108,109,110,111, 34, 34,112,113,114,115,116,117,
-  118,119,120,121,122,123,124,125,126,127,128,129, 34, 34,130,131,
-  132,133,134,135,136,137,138,139,140,141,142,122,143,144,145,146,
-  147,148,149,150,151,152,153,122,154,155,122,156,157,158,159,122,
-  160,161,162,163,164,165,166,122,167,168,169,170,122,171,172,173,
-   34, 34, 34, 34, 34, 34, 34,174,175, 34,176,122,122,122,122,122,
-  122,122,122,122,122,122,122,122,122,122,122,122,122,122,122,177,
-   34, 34, 34, 34, 34, 34, 34, 34,178,122,122,122,122,122,122,122,
-  122,122,122,122,122,122,122,122,122,122,122,122,122,122,122,122,
-  122,122,122,122,122,122,122,122, 34, 34, 34, 34,179,122,122,122,
-   34, 34, 34, 34,180,181,182,183,122,122,122,122,184,185,186,187,
-   34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,188,
-   34, 34, 34, 34, 34, 34, 34, 34, 34,189,190,122,122,122,122,122,
-  122,122,122,122,122,122,122,122,122,122,122,122,122,122,122,191,
-   34, 34,192, 34, 34,193,122,122,122,122,122,122,122,122,122,122,
-  122,122,122,122,122,122,122,122,194,195,122,122,122,122,122,122,
-  122,122,122,122,122,122,122,122,122,122,122,122,122,122,196,197,
-   69,198,199,200,201,202,203,122,204,205,206,207,208,209,210,211,
-   69, 69, 69, 69,212,213,122,122,122,122,122,122,122,122,214,122,
-  215,216,217,122,122,218,122,122,122,219,122,122,122,122,122,220,
-   34,221,222,122,122,122,122,122,223,224,225,122,226,227,122,122,
-  228,229,230,231,232,122, 69,233, 69, 69, 69, 69, 69,234,235,236,
-  237,238, 69, 69,239,240, 69,241,122,122,122,122,122,122,122,122,
-   34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,242, 34, 34,
-   34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,243, 34,
-  244, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-   34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,245, 34, 34,
-   34, 34, 34, 34, 34, 34, 34,246, 34, 34, 34, 34,247,122,122,122,
-   34, 34, 34, 34,248,122,122,122,122,122,122,122,122,122,122,122,
-   34, 34, 34, 34, 34, 34,249, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-   34, 34, 34, 34, 34, 34, 34,250,122,122,122,122,122,122,122,122,
-  251,122,252,253,122,122,122,122,122,122,122,122,122,122,122,122,
-  107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,254,
-  107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,255,
+   16, 17, 18, 19, 20, 17, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30,
+   31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 33, 41, 42, 43, 44, 45,
+   46, 47, 48, 39, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
+   17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 49, 17, 17,
+   17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
+   50, 17, 17, 17, 51, 17, 52, 53, 54, 55, 56, 57, 17, 17, 17, 17,
+   17, 17, 17, 17, 17, 17, 17, 58, 59, 59, 59, 59, 59, 59, 59, 59,
+   60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60,
+   60, 60, 60, 60, 60, 60, 60, 60, 60, 17, 61, 62, 17, 63, 64, 65,
+   66, 67, 68, 69, 70, 71, 17, 72, 73, 74, 75, 76, 77, 78, 79, 80,
+   81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96,
+   17, 17, 17, 97, 98, 99,100,100,100,100,100,100,100,100,100,101,
+   17, 17, 17, 17,102, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
+   17, 17, 17,103, 17, 17,104,100,100,100,100,100,100,100,100,100,
+  100,100,100,100,100,100,100,100,100,100,100,100,100,100,100,100,
+  100,105,100,100,100,100,100,100, 17, 17,106,107,100,108,109,110,
+   17, 17, 17, 17, 17, 17, 17,111, 17, 17, 17, 17,112,113,100,100,
+  100,100,100,100,100,100,100,100,100,100,100,100,100,100,100,114,
+   17,115,116,100,100,100,100,100,100,100,100,100,117,100,100,100,
+  100,100,100,100,100,100,100,100,100,100,100,100,118, 39,119,120,
+  121,122,123,124,125,126,127,128, 39, 39,129,100,100,100,100,130,
+  131,132,133,100,134,135,100,136,137,138,100,100,139,140,141,100,
+  142,143,144,145, 39, 39,146,147,148, 39,149,150,100,100,100,100,
+   17, 17, 17, 17, 17, 17,151, 17, 17, 17, 17, 17, 17, 17, 17, 17,
+   17, 17, 17, 17, 17, 17, 17,152,153, 17, 17, 17, 17, 17, 17, 17,
+   17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17,154, 17,
+   17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17,155, 17, 17,156,100,
+  100,100,100,100,100,100,100,100, 17, 17,157,100,100,100,100,100,
+   17, 17, 17,158, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
+   17, 17, 17,159,100,100,100,100,100,100,100,100,100,100,100,100,
+  160,161,100,100,100,100,100,100,100,100,100,100,100,100,100,100,
+   60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60,162,
+   60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60,163,
     0,  0,  0,  0,  0,  0,  0,  0,  1,  2,  3,  2,  4,  5,  6,  2,
     7,  7,  7,  7,  7,  2,  8,  9, 10, 11, 11, 11, 11, 11, 11, 11,
    11, 11, 11, 11, 11, 12, 13, 14, 15, 16, 16, 16, 16, 16, 16, 16,
@@ -2951,7 +2982,7 @@ _hb_ucd_u8[14752] =
    43, 43, 40, 21,  2, 81, 57, 20, 36, 36, 36, 43, 43, 75, 43, 43,
    43, 43, 75, 43, 75, 43, 43, 44,  2,  2,  2,  2,  2,  2,  2, 64,
    36, 36, 36, 36, 70, 43, 44, 64, 36, 36, 36, 36, 36, 61, 44, 44,
-   36, 36, 36, 36, 82, 36, 36, 61, 65, 44, 44, 44, 43, 43, 43, 43,
+   36, 36, 36, 36, 82, 36, 36, 61, 65, 44, 44, 57, 43, 43, 43, 43,
    36, 36, 36, 36, 83, 43, 43, 43, 43, 84, 43, 43, 43, 43, 43, 43,
    43, 85, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 85, 71, 86,
    87, 43, 43, 43, 85, 86, 87, 86, 70, 43, 43, 43, 36, 36, 36, 36,
@@ -3024,13 +3055,13 @@ _hb_ucd_u8[14752] =
    85, 85, 87, 43, 43, 43, 85, 86, 86, 87, 43, 43, 43, 43, 80, 57,
     2,  2,  2, 88,  2,  2,  2, 44, 43, 43, 43, 43, 43, 43, 43,109,
    43, 43, 43, 43, 43, 43, 43, 80, 43, 43, 98, 36, 36, 36, 36, 36,
-   36, 36, 85, 43, 43, 85, 85, 86, 86, 85, 98, 36, 36, 36, 61, 44,
-   97, 67, 67, 67, 67, 50, 43, 43, 43, 43, 67, 67, 67, 67, 21, 64,
+   36, 36, 85, 43, 43, 85, 85, 86, 86, 85, 98, 36, 36, 36, 61,  2,
+   97, 67, 67, 67, 67, 50, 43, 43, 43, 43, 67, 67, 67, 67, 21,  2,
    43, 98, 36, 36, 36, 36, 36, 36, 94, 43, 43, 86, 43, 87, 43, 36,
    36, 36, 36, 85, 43, 86, 87, 87, 43, 86, 44, 44, 44, 44,  2,  2,
    36, 36, 86, 86, 86, 86, 43, 43, 43, 43, 86, 43, 44, 93,  2,  2,
     7,  7,  7,  7,  7, 44, 62, 36, 36, 36, 36, 36, 40, 40, 40,  2,
-   16, 16, 16, 16,110, 44, 44, 44, 11, 11, 11, 11, 11, 47, 48, 11,
+   16, 16, 16, 16, 34,110, 44, 44, 11, 11, 11, 11, 11, 47, 48, 11,
     2,  2,  2,  2, 44, 44, 44, 44, 43, 60, 43, 43, 43, 43, 43, 43,
    85, 43, 43, 43, 71, 36, 70, 36, 36, 36, 71, 94, 43, 61, 44, 44,
    16, 16, 16, 16, 16, 16, 40, 40, 40, 40, 40, 40, 40, 45, 16, 16,
@@ -3058,33 +3089,33 @@ _hb_ucd_u8[14752] =
    67, 67, 67, 67,  4,  4, 67, 67,  8, 67, 67, 67,145,146, 67, 67,
    67, 67, 67, 67, 67, 67,144, 67, 67, 67, 67, 67, 67, 26,  8,  8,
     8,  8, 67, 67, 67, 67, 67, 67, 67, 67, 67, 67, 67, 67,  8,  8,
-    8, 67, 67, 67, 67, 67, 67, 67, 67, 67, 67, 92, 44, 44, 44, 44,
-   67, 67, 67, 67, 67, 92, 44, 44, 27, 27, 27, 27, 27, 27, 67, 67,
-   67, 67, 67, 67, 67, 27, 27, 27, 67, 67, 67, 26, 67, 67, 67, 67,
-   26, 67, 67, 67, 67, 67, 67, 67, 67, 67, 67, 67,  8,  8,  8,  8,
-   67, 67, 67, 67, 67, 67, 67, 26, 67, 67, 67, 67,  4,  4,  4,  4,
-    4,  4,  4, 27, 27, 27, 27, 27, 27, 27, 67, 67, 67, 67, 67, 67,
-    8,  8,129,147,  8,  8,  8,  8,  8,  8,  8,  4,  4,  4,  4,  4,
-    8,129,148,148,148,148,148,148,148,148,148,148,147,  8,  8,  8,
-    8,  8,  8,  8,  4,  4,  8,  8,  8,  8,  8,  8,  8,  8,  4,  8,
-    8,  8,144, 26,  8,  8,144, 67, 67, 67, 44, 67, 67, 67, 67, 67,
-   67, 67, 67, 55, 67, 67, 67, 67, 32, 11, 32, 34, 34, 34, 34, 11,
-   32, 32, 34, 16, 16, 16, 40, 11, 32, 32,140, 67, 67,138, 34,149,
-   43, 32, 44, 44, 93,  2, 99,  2, 16, 16, 16,150, 44, 44,150, 44,
-   36, 36, 36, 36, 44, 44, 44, 52, 64, 44, 44, 44, 44, 44, 44, 57,
-   36, 36, 36, 61, 44, 44, 44, 44, 36, 36, 36, 61, 36, 36, 36, 61,
-    2,121,121,  2,125,126,121,  2,  2,  2,  2,  6,  2,108,121,  2,
-  121,  4,  4,  4,  4,  2,  2, 88,  2,  2,  2,  2,  2,120,  2,  2,
-  108,151,  2,  2,  2,  2,  2,  2, 67,  2,152,148,148,148,153, 44,
-   67, 67, 67, 67, 67, 55, 67, 67, 67, 67, 44, 44, 44, 44, 44, 44,
-   67, 67, 67, 44, 44, 44, 44, 44,  1,  2,154,155,  4,  4,  4,  4,
-    4, 67,  4,  4,  4,  4,156,157,158,105,105,105,105, 43, 43, 86,
-  159, 40, 40, 67,105,160, 63, 67, 36, 36, 36, 61, 57,161,162, 69,
-   36, 36, 36, 36, 36, 63, 40, 69, 44, 44, 62, 36, 36, 36, 36, 36,
-   67, 27, 27, 67, 67, 67, 67, 67, 67, 67, 44, 44, 44, 44, 44, 55,
-   67, 67, 67, 67, 67, 67, 67, 92, 27, 27, 27, 27, 27, 67, 67, 67,
-   67, 67, 67, 67, 27, 27, 27, 27,163, 27, 27, 27, 27, 27, 27, 27,
-   36, 36, 83, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36,164,  2,
+    8, 67, 67, 67, 67, 67, 67, 67, 67, 67, 67, 67, 67, 92, 44, 44,
+   27, 27, 27, 27, 27, 27, 67, 67, 67, 67, 67, 67, 67, 27, 27, 27,
+   67, 67, 67, 26, 67, 67, 67, 67, 26, 67, 67, 67, 67, 67, 67, 67,
+   67, 67, 67, 67,  8,  8,  8,  8, 67, 67, 67, 67, 67, 67, 67, 26,
+   67, 67, 67, 67,  4,  4,  4,  4,  4,  4,  4, 27, 27, 27, 27, 27,
+   27, 27, 67, 67, 67, 67, 67, 67,  8,  8,129,147,  8,  8,  8,  8,
+    8,  8,  8,  4,  4,  4,  4,  4,  8,129,148,148,148,148,148,148,
+  148,148,148,148,147,  8,  8,  8,  8,  8,  8,  8,  4,  4,  8,  8,
+    8,  8,  8,  8,  8,  8,  4,  8,  8,  8,144, 26,  8,  8,144, 67,
+   67, 67, 44, 67, 67, 67, 67, 67, 67, 67, 67, 55, 67, 67, 67, 67,
+   32, 11, 32, 34, 34, 34, 34, 11, 32, 32, 34, 16, 16, 16, 40, 11,
+   32, 32,140, 67, 67,138, 34,149, 43, 32, 44, 44, 93,  2, 99,  2,
+   16, 16, 16,150, 44, 44,150, 44, 36, 36, 36, 36, 44, 44, 44, 52,
+   64, 44, 44, 44, 44, 44, 44, 57, 36, 36, 36, 61, 44, 44, 44, 44,
+   36, 36, 36, 61, 36, 36, 36, 61,  2,121,121,  2,125,126,121,  2,
+    2,  2,  2,  6,  2,108,121,  2,121,  4,  4,  4,  4,  2,  2, 88,
+    2,  2,  2,  2,  2,120,  2,  2,108,151,  2,  2,  2,  2,  2,  2,
+   67,  2,152,148,148,148,153, 44, 67, 67, 67, 67, 67, 55, 67, 67,
+   67, 67, 44, 44, 44, 44, 44, 44, 67, 67, 67, 44, 44, 44, 44, 44,
+    1,  2,154,155,  4,  4,  4,  4,  4, 67,  4,  4,  4,  4,156,157,
+  158,105,105,105,105, 43, 43, 86,159, 40, 40, 67,105,160, 63, 67,
+   36, 36, 36, 61, 57,161,162, 69, 36, 36, 36, 36, 36, 63, 40, 69,
+   44, 44, 62, 36, 36, 36, 36, 36, 67, 27, 27, 67, 67, 67, 67, 67,
+   67, 67, 67, 44, 44, 44, 44, 55, 67, 67, 67, 67, 67, 67, 67, 92,
+   27, 27, 27, 27, 27, 67, 67, 67, 67, 67, 67, 67, 27, 27, 27, 27,
+  163, 27, 27, 27, 27, 27, 27, 27, 36, 36, 83, 36, 36, 36, 36, 36,
+   67, 67, 67, 92, 44, 44, 44, 44, 36, 36, 36, 36, 36, 36,164,  2,
     7,  7,  7,  7,  7, 36, 44, 44, 32, 32, 32, 32, 32, 32, 32, 70,
    51,165, 43, 43, 43, 43, 43, 88, 32, 32, 32, 32, 32, 32, 40, 43,
    36, 36, 36,105,105,105,105,105, 43,  2,  2,  2, 44, 44, 44, 44,
@@ -3092,7 +3123,7 @@ _hb_ucd_u8[14752] =
    16, 32, 32, 32, 32, 32, 32, 32, 45, 16, 16, 16, 34, 34, 34, 32,
    32, 32, 32, 32, 42,166, 34, 35, 32, 32, 16, 32, 32, 32, 32, 32,
    32, 32, 32, 32, 32, 11, 11, 32, 11, 11, 32, 32, 32, 32, 32, 32,
-   32, 32, 11, 11, 34,110, 44, 44, 32,150,150, 32, 32, 44, 44, 44,
+   32, 32, 11, 11, 34, 34, 32, 44, 32,150,150, 32, 32, 32, 47, 44,
    44, 40,167, 35, 40, 35, 36, 36, 36, 71, 36, 71, 36, 70, 36, 36,
    36, 94, 87, 85, 67, 67, 80, 44, 27, 27, 27, 67,168, 44, 44, 44,
    36, 36,  2,  2, 44, 44, 44, 44, 86, 36, 36, 36, 36, 36, 36, 36,
@@ -3153,8 +3184,10 @@ _hb_ucd_u8[14752] =
    36, 61, 44, 44, 27, 27, 27, 27, 36, 44, 44, 44, 93,  2, 64, 44,
    44, 44, 44, 44,179, 27, 27, 27, 11, 47, 44, 44, 44, 44, 44, 44,
    16,110, 44, 44, 44, 27, 27, 27, 36, 36, 43, 43, 44, 44, 44, 44,
-   27, 27, 27, 27, 27, 27, 27,100, 36, 36, 36, 36, 36, 57,184, 44,
-   36, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 57, 43,
+    7,  7,  7,  7,  7, 36, 36, 69, 11, 11, 11, 44, 57, 43, 43,159,
+   16, 16, 16, 44, 44, 44, 44,  8, 27, 27, 27, 27, 27, 27, 27,100,
+   36, 36, 36, 36, 36, 57,184, 44, 36, 44, 44, 44, 44, 44, 44, 44,
+   44, 36, 61, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 43, 43,
    27, 27, 27, 95, 44, 44, 44, 44,180, 27, 30,  2,  2, 44, 44, 44,
    36, 43, 43,  2,  2, 44, 44, 44, 36, 36,183, 27, 27, 27, 44, 44,
    87, 98, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 43, 43, 43, 43,
@@ -3172,14 +3205,18 @@ _hb_ucd_u8[14752] =
    86, 87, 43, 43, 43, 80, 44, 44, 43, 86, 62, 36, 36, 36, 61, 62,
    61, 36, 62, 36, 36, 57, 71, 86, 85, 86, 90, 89, 90, 89, 86, 44,
    61, 44, 44, 89, 44, 44, 62, 36, 36, 86, 44, 43, 43, 43, 80, 44,
-   43, 43, 80, 44, 44, 44, 44, 44, 36, 36, 94, 86, 43, 43, 43, 43,
-   86, 43, 85, 71, 36, 63,  2,  2,  7,  7,  7,  7,  7,  2, 93, 71,
-   86, 87, 43, 43, 85, 85, 86, 87, 85, 43, 36, 72, 44, 44, 44, 44,
-   36, 36, 36, 36, 36, 36, 36, 94, 86, 43, 43, 44, 86, 86, 43, 87,
-   60,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2, 36, 36, 43, 44,
-   86, 87, 43, 43, 43, 85, 87, 87, 60,  2, 61, 44, 44, 44, 44, 44,
-    2,  2,  2,  2,  2,  2, 64, 44, 36, 36, 36, 36, 36, 70, 87, 86,
-   43, 43, 43, 87, 63, 44, 44, 44, 86, 43, 43, 87, 43, 43, 44, 44,
+   43, 43, 80, 44, 44, 44, 44, 44, 36, 36, 36, 36, 36, 62, 44, 61,
+   36, 36, 36, 62, 86, 87, 43, 43, 80, 90, 89, 89, 86, 90, 86, 85,
+   71, 71,  2, 93, 64, 44, 44, 44, 57, 80, 44, 44, 44, 44, 44, 44,
+   36, 36, 94, 86, 43, 43, 43, 43, 86, 43, 85, 71, 36, 63,  2,  2,
+    7,  7,  7,  7,  7,  2, 93, 71, 86, 87, 43, 43, 85, 85, 86, 87,
+   85, 43, 36, 72, 44, 44, 44, 44, 36, 36, 36, 36, 36, 36, 36, 94,
+   86, 43, 43, 44, 86, 86, 43, 87, 60,  2,  2,  2,  2,  2,  2,  2,
+    2,  2,  2,  2, 36, 36, 43, 44, 86, 87, 43, 43, 43, 85, 87, 87,
+   60,  2, 61, 44, 44, 44, 44, 44,  2,  2,  2,  2,  2,  2, 64, 44,
+   36, 36, 36, 36, 36, 70, 87, 86, 43, 43, 43, 87, 63, 44, 44, 44,
+    7,  7,  7,  7,  7,  7,  7,  7,  7,  7, 44, 44, 44, 44, 44, 44,
+   36, 36, 36, 36, 36, 61, 57, 87, 86, 43, 43, 87, 43, 43, 44, 44,
     7,  7,  7,  7,  7, 27,  2, 97, 43, 43, 43, 43, 87, 60, 44, 44,
    27,100, 44, 44, 44, 44, 44, 62, 36, 36, 36, 61, 62, 44, 36, 36,
    36, 36, 62, 61, 36, 36, 36, 36, 86, 86, 86, 89, 90, 57, 85, 71,
@@ -3189,49 +3226,52 @@ _hb_ucd_u8[14752] =
     2,  2,  2, 59, 44, 44, 44, 44, 70, 43, 43, 85, 87, 43, 36, 36,
    36, 36, 36, 36, 36, 43, 43, 43, 43, 43, 43, 85, 43,  2, 72,  2,
     2, 64, 44, 44, 44, 44, 44, 44,  2,  2,  2,  2,  2, 44, 44, 44,
-   43, 43, 43, 80, 43, 43, 43, 87, 63,  2,  2, 44, 44, 44, 44, 44,
-    2, 36, 36, 36, 36, 36, 36, 36, 44, 43, 43, 43, 43, 43, 43, 43,
-   43, 43, 43, 43, 89, 43, 43, 43, 85, 43, 87, 80, 44, 44, 44, 44,
-   36, 36, 36, 61, 36, 62, 36, 36, 70, 43, 43, 80, 44, 80, 43, 57,
-   43, 43, 43, 70, 44, 44, 44, 44, 36, 36, 36, 62, 61, 36, 36, 36,
-   36, 36, 36, 36, 36, 86, 86, 90, 43, 89, 87, 87, 61, 44, 44, 44,
-   36, 70, 85,107, 64, 44, 44, 44, 43, 94, 36, 36, 36, 36, 36, 36,
-   36, 36, 86, 43, 43, 80, 44, 86, 85, 60,  2,  2,  2,  2,  2,  2,
+   63, 44, 44, 44, 44, 44, 44, 44, 43, 43, 43, 80, 43, 43, 43, 87,
+   63,  2,  2, 44, 44, 44, 44, 44,  2, 36, 36, 36, 36, 36, 36, 36,
+   44, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, 89, 43, 43, 43,
+   85, 43, 87, 80, 44, 44, 44, 44, 36, 36, 36, 61, 36, 62, 36, 36,
+   70, 43, 43, 80, 44, 80, 43, 57, 43, 43, 43, 70, 44, 44, 44, 44,
+   36, 36, 36, 62, 61, 36, 36, 36, 36, 36, 36, 36, 36, 86, 86, 90,
+   43, 89, 87, 87, 61, 44, 44, 44, 36, 70, 85,107, 64, 44, 44, 44,
+   43, 94, 36, 36, 36, 36, 36, 36, 36, 36, 86, 43, 43, 80, 44, 86,
+   85, 60,  2,  2,  2,  2,  2,  2,  7,  7,  7,  7,  7, 80, 44, 44,
    27, 27, 91, 67, 67, 67, 56, 20,168, 67, 67, 67, 67, 67, 67, 67,
    67, 44, 44, 44, 44, 44, 44, 93,105,105,105,105,105,105,105,181,
     2,  2, 64, 44, 44, 44, 44, 44, 63, 64, 44, 44, 44, 44, 44, 44,
    65, 65, 65, 65, 65, 65, 65, 65, 71, 36, 36, 70, 43, 43, 43, 43,
-   43, 43, 43, 44, 44, 44, 44, 44, 43, 43, 60, 44, 44, 44, 44, 44,
+   43, 43, 43, 44, 44, 44, 44, 44, 36, 36, 36, 36, 36, 36, 36, 43,
+   43, 43, 43, 43, 43, 86, 87, 43, 43, 43, 60, 44, 44, 44, 44, 44,
    43, 43, 43, 60,  2,  2, 67, 67, 40, 40, 97, 44, 44, 44, 44, 44,
     7,  7,  7,  7,  7,179, 27, 27, 27, 62, 36, 36, 36, 36, 36, 36,
-   36, 36, 36, 36, 44, 44, 62, 36, 27, 27, 27, 30,  2, 64, 44, 44,
+   36, 36, 36, 36, 44, 44, 62, 36, 40, 69, 36, 36, 36, 36, 36, 36,
+   36, 36, 36, 36, 36, 83,164,  2, 27, 27, 27, 30,  2, 64, 44, 44,
    36, 36, 36, 36, 36, 61, 44, 57, 94, 86, 86, 86, 86, 86, 86, 86,
    86, 86, 86, 86, 86, 86, 86, 86, 86, 86, 86, 86, 44, 44, 44, 57,
    43, 74, 40, 40, 40, 40, 40, 40, 40, 88, 80, 44, 44, 44, 44, 44,
-   86, 44, 44, 44, 44, 44, 44, 44, 40, 40, 52, 40, 40, 40, 52, 81,
-   36, 61, 44, 44, 44, 44, 44, 44, 44, 61, 44, 44, 44, 44, 44, 44,
-   36, 61, 62, 44, 44, 44, 44, 44, 44, 44, 36, 36, 44, 44, 44, 44,
-   36, 36, 36, 36, 36, 44, 50, 60, 65, 65, 44, 44, 44, 44, 44, 44,
-   43, 43, 43, 43, 43, 43, 43, 44, 43, 43, 43, 80, 44, 44, 44, 44,
-   67, 67, 67, 92, 55, 67, 67, 67, 67, 67,186, 87, 43, 67,186, 86,
-   86,187, 65, 65, 65, 84, 43, 43, 43, 76, 50, 43, 43, 43, 67, 67,
-   67, 67, 67, 67, 67, 43, 43, 67, 67, 43, 76, 44, 44, 44, 44, 44,
-   27, 27, 44, 44, 44, 44, 44, 44, 11, 11, 11, 11, 11, 16, 16, 16,
-   16, 16, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 16,
-   16, 16,110, 16, 16, 16, 16, 16, 11, 16, 16, 16, 16, 16, 16, 16,
-   16, 16, 16, 16, 16, 16, 47, 11, 44, 47, 48, 47, 48, 11, 47, 11,
-   11, 11, 11, 16, 16,150,150, 16, 16, 16,150, 16, 16, 16, 16, 16,
-   16, 16, 11, 48, 11, 47, 48, 11, 11, 11, 47, 11, 11, 11, 47, 16,
-   16, 16, 16, 16, 11, 48, 11, 47, 11, 11, 47, 47, 44, 11, 11, 11,
-   47, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 11, 11,
-   11, 11, 11, 16, 16, 16, 16, 16, 16, 16, 16, 44, 11, 11, 11, 11,
-   31, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 33, 16, 16,
-   16, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 31, 16, 16,
-   16, 16, 33, 16, 16, 16, 11, 11, 11, 11, 31, 16, 16, 16, 16, 16,
-   16, 16, 16, 16, 16, 16, 16, 33, 16, 16, 16, 11, 11, 11, 11, 11,
-   11, 11, 11, 11, 11, 11, 11, 31, 16, 16, 16, 16, 33, 16, 16, 16,
-   11, 11, 11, 11, 31, 16, 16, 16, 16, 33, 16, 16, 16, 32, 44,  7,
-    7,  7,  7,  7,  7,  7,  7,  7, 43, 43, 43, 76, 67, 50, 43, 43,
+   86, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 62,
+   40, 40, 52, 40, 40, 40, 52, 81, 36, 61, 44, 44, 44, 44, 44, 44,
+   44, 61, 44, 44, 44, 44, 44, 44, 36, 61, 62, 44, 44, 44, 44, 44,
+   44, 44, 36, 36, 44, 44, 44, 44, 36, 36, 36, 36, 36, 44, 50, 60,
+   65, 65, 44, 44, 44, 44, 44, 44, 43, 43, 43, 43, 43, 43, 43, 44,
+   43, 43, 43, 80, 44, 44, 44, 44, 67, 67, 67, 92, 55, 67, 67, 67,
+   67, 67,186, 87, 43, 67,186, 86, 86,187, 65, 65, 65, 84, 43, 43,
+   43, 76, 50, 43, 43, 43, 67, 67, 67, 67, 67, 67, 67, 43, 43, 67,
+   67, 43, 76, 44, 44, 44, 44, 44, 27, 27, 44, 44, 44, 44, 44, 44,
+   11, 11, 11, 11, 11, 16, 16, 16, 16, 16, 11, 11, 11, 11, 11, 11,
+   11, 11, 11, 11, 11, 11, 11, 16, 16, 16,110, 16, 16, 16, 16, 16,
+   11, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 47, 11,
+   44, 47, 48, 47, 48, 11, 47, 11, 11, 11, 11, 16, 16,150,150, 16,
+   16, 16,150, 16, 16, 16, 16, 16, 16, 16, 11, 48, 11, 47, 48, 11,
+   11, 11, 47, 11, 11, 11, 47, 16, 16, 16, 16, 16, 11, 48, 11, 47,
+   11, 11, 47, 47, 44, 11, 11, 11, 47, 16, 16, 16, 16, 16, 16, 16,
+   16, 16, 16, 16, 16, 16, 11, 11, 11, 11, 11, 16, 16, 16, 16, 16,
+   16, 16, 16, 44, 11, 11, 11, 11, 31, 16, 16, 16, 16, 16, 16, 16,
+   16, 16, 16, 16, 16, 33, 16, 16, 16, 11, 11, 11, 11, 11, 11, 11,
+   11, 11, 11, 11, 11, 31, 16, 16, 16, 16, 33, 16, 16, 16, 11, 11,
+   11, 11, 31, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 33,
+   16, 16, 16, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 31,
+   16, 16, 16, 16, 33, 16, 16, 16, 11, 11, 11, 11, 31, 16, 16, 16,
+   16, 33, 16, 16, 16, 32, 44,  7, 43, 43, 43, 76, 67, 50, 43, 43,
    43, 43, 43, 43, 43, 43, 76, 67, 67, 67, 50, 67, 67, 67, 67, 67,
    67, 67, 76, 21,  2,  2, 44, 44, 44, 44, 44, 44, 44, 57, 43, 43,
    16, 16, 16, 16, 16, 39, 16, 16, 16, 16, 16, 16, 16, 16, 16,110,
@@ -3241,22 +3281,23 @@ _hb_ucd_u8[14752] =
    43, 43, 43, 74, 40, 40, 40, 44,  7,  7,  7,  7,  7, 44, 44, 77,
    36, 36, 36, 36, 36, 36, 36, 80, 36, 36, 36, 36, 36, 36, 43, 43,
     7,  7,  7,  7,  7, 44, 44, 96, 36, 36, 36, 36, 36, 83, 43, 43,
-   36, 36, 36, 61, 36, 36, 62, 61, 36, 36, 61,179, 27, 27, 27, 27,
-   16, 16, 43, 43, 43, 74, 44, 44, 27, 27, 27, 27, 27, 27,163, 27,
-  188, 27,100, 44, 44, 44, 44, 44, 27, 27, 27, 27, 27, 27, 27,163,
-   27, 27, 27, 27, 27, 27, 27, 44, 36, 36, 62, 36, 36, 36, 36, 36,
-   62, 61, 61, 62, 62, 36, 36, 36, 36, 61, 36, 36, 62, 62, 44, 44,
-   44, 61, 44, 62, 62, 62, 62, 36, 62, 61, 61, 62, 62, 62, 62, 62,
-   62, 61, 61, 62, 36, 61, 36, 36, 36, 61, 36, 36, 62, 36, 61, 61,
-   36, 36, 36, 36, 36, 62, 36, 36, 62, 36, 62, 36, 36, 62, 36, 36,
-    8, 44, 44, 44, 44, 44, 44, 44, 67, 67, 67, 67, 67, 67, 44, 44,
-   55, 67, 67, 67, 67, 67, 67, 67, 27, 27, 27, 27, 27, 27, 91, 67,
-   67, 67, 67, 67, 67, 67, 67, 44, 44, 44, 44, 67, 67, 67, 67, 67,
-   67, 92, 44, 44, 44, 44, 44, 44, 67, 67, 67, 67, 92, 44, 44, 44,
-   67, 44, 44, 44, 44, 44, 44, 44, 67, 67, 67, 67, 67, 25, 41, 41,
-   67, 67, 67, 67, 44, 44, 67, 67, 67, 67, 67, 92, 44, 55, 67, 67,
-   67, 67, 67, 67, 44, 44, 44, 44, 67, 67, 67, 67, 67, 67, 67, 55,
-   67, 67, 67, 44, 44, 44, 44, 67, 67, 92, 67, 67, 67, 67, 67, 67,
+  188,  7,  7,  7,  7,189, 44, 93, 36, 36, 36, 61, 36, 36, 62, 61,
+   36, 36, 61,179, 27, 27, 27, 27, 16, 16, 43, 43, 43, 74, 44, 44,
+   27, 27, 27, 27, 27, 27,163, 27,190, 27,100, 44, 44, 44, 44, 44,
+   27, 27, 27, 27, 27, 27, 27,163, 27, 27, 27, 27, 27, 27, 27, 44,
+   36, 36, 62, 36, 36, 36, 36, 36, 62, 61, 61, 62, 62, 36, 36, 36,
+   36, 61, 36, 36, 62, 62, 44, 44, 44, 61, 44, 62, 62, 62, 62, 36,
+   62, 61, 61, 62, 62, 62, 62, 62, 62, 61, 61, 62, 36, 61, 36, 36,
+   36, 61, 36, 36, 62, 36, 61, 61, 36, 36, 36, 36, 36, 62, 36, 36,
+   62, 36, 62, 36, 36, 62, 36, 36,  8, 44, 44, 44, 44, 44, 44, 44,
+   67, 67, 67, 67, 67, 67, 44, 44, 55, 67, 67, 67, 67, 67, 67, 67,
+   27, 27, 27, 27, 27, 27, 91, 67, 67, 67, 67, 67, 67, 67, 67, 44,
+   44, 44, 44, 67, 67, 67, 67, 67, 67, 92, 44, 44, 44, 44, 44, 44,
+   67, 67, 67, 67, 92, 44, 44, 44, 67, 44, 44, 44, 44, 44, 44, 44,
+   67, 67, 67, 67, 67, 25, 41, 41, 67, 67, 67, 67, 44, 44, 67, 67,
+   67, 67, 67, 92, 44, 55, 67, 67, 67, 67, 67, 67, 44, 44, 44, 44,
+   67, 67, 67, 67, 67, 44, 44, 55, 67, 67, 67, 92, 44, 44, 44, 67,
+   67, 67, 67, 67, 67, 67, 92, 55, 67, 92, 67, 67, 67, 67, 67, 67,
    79, 44, 44, 44, 44, 44, 44, 44,171,171,171,171,171,171,171, 44,
   171,171,171,171,171,171,171,  0,  0,  0, 29, 21, 21, 21, 23, 21,
    22, 18, 21, 25, 21, 17, 13, 13, 25, 25, 25, 21, 21,  9,  9,  9,
@@ -3282,420 +3323,184 @@ _hb_ucd_u8[14752] =
     6, 21, 11, 21, 24,  9,  6,  9, 23, 26,  6, 10,  4,  4,  3,  3,
     7, 25, 17, 16, 16, 22, 16, 16, 25, 17, 25,  2, 25, 24,  2, 15,
    12, 15, 14,  2, 21, 14,  7, 15, 12, 17, 21,  1, 26, 10, 10,  1,
-   23, 15,  0,  1,  2,  3,  4,  5,  6,  7,  8,  9,  0, 10, 11, 12,
-   13,  0, 14,  0,  0,  0,  0,  0, 15,  0, 16,  0,  0,  0,  0,  0,
+    7, 13, 13,  2, 23, 15,  0,  1,  2,  3,  4,  5,  6,  7,  8,  9,
+    0, 10, 11, 12, 13,  0, 14,  0,  0,  0,  0,  0, 15,  0, 16,  0,
     0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
     0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
     0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0, 17, 18, 19,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 20,
-    0, 21, 22, 23,  0,  0,  0, 24, 25, 26, 27, 28, 29, 30, 31, 32,
-   33, 34,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0, 35,  0, 36,  0,  0,  0,  0,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0, 17, 18, 19,  0,  0,  0,  0,
     0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
     0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-   37,  0,  0,  0,  0,  0,  0,  0,  0,  0, 38, 39,  0,  0,  0,  0,
-    0,  0, 40, 41, 42,  0, 43,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  1,  2,  0,  0,  0,  0,  3,  0,  0,  0,  4,  5,
-    6,  7,  0,  8,  9, 10,  0, 11, 12, 13, 14, 15, 16, 17, 16, 18,
-   16, 19, 16, 19, 16, 19,  0, 19, 16, 20, 16, 19, 21, 19,  0, 22,
-   23, 24, 25, 26, 27, 28, 29, 30, 31,  0, 32,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0, 33,  0,  0,  0,  0,  0,  0, 34,  0,  0, 35,
-    0,  0, 36,  0, 37,  0,  0,  0, 38, 39, 40, 41, 42, 43, 44, 45,
-   46,  0,  0, 47,  0,  0,  0, 48,  0,  0,  0, 49,  0,  0,  0,  0,
-    0,  0,  0, 50,  0, 51,  0, 52, 53,  0, 54,  0,  0,  0,  0,  0,
-    0, 55, 56, 57,  0,  0,  0,  0, 58,  0,  0, 59, 60, 61, 62, 63,
-    0,  0, 64, 65,  0,  0,  0, 66,  0,  0,  0,  0, 67,  0,  0,  0,
-   68,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 69,
-    0,  0,  0, 70,  0, 71,  0,  0, 72,  0,  0, 73,  0,  0,  0,  0,
-    0,  0,  0,  0, 74,  0,  0,  0,  0,  0, 75, 76,  0, 77, 78,  0,
-    0, 79, 80,  0, 81, 62,  0, 82, 83,  0,  0, 84, 85, 86,  0,  0,
-    0, 87,  0, 88,  0,  0, 51, 89, 51,  0, 90,  0, 91,  0,  0,  0,
-   80,  0,  0,  0, 92, 93,  0, 94, 95, 96, 97,  0,  0,  0,  0,  0,
-   51,  0,  0,  0,  0, 98, 99,  0,  0,  0,  0,  0,  0,100,  0,  0,
-    0,  0,  0,101,102,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,103,
-    0,  0,104,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,105,106,  0,
-    0,107,  0,  0,  0,  0,  0,  0,108,  0,109,  0,102,  0,  0,  0,
-    0,  0,110,111,  0,  0,  0,  0,  0,  0,  0,112,  0,  0,  0,  0,
-    0,  0,  0,113,  0,114,  0,  0,  0,  0,  0,  0,  1,  2,  3,  4,
-    5,  6,  7,  0,  8,  0,  0,  0,  0,  9, 10, 11, 12,  0,  0,  0,
-    0, 13,  0,  0, 14, 15,  0, 16,  0, 17, 18,  0,  0, 19,  0, 20,
-   21,  0,  0,  0,  0,  0, 22, 23,  0, 24, 25,  0,  0, 26,  0,  0,
-    0, 27,  0,  0, 28, 29, 30, 31,  0,  0,  0, 32, 33, 34,  0,  0,
-   33,  0,  0, 35, 33,  0,  0,  0, 33, 36,  0,  0,  0,  0,  0, 37,
-   38,  0,  0,  0,  0,  0,  0, 39, 40,  0,  0,  0,  0,  0,  0, 41,
-   42,  0,  0,  0,  0, 43,  0, 44,  0,  0,  0, 45, 46,  0,  0,  0,
-   47,  0,  0,  0,  0,  0,  0, 48, 49,  0,  0,  0,  0, 50,  0,  0,
-    0, 51,  0, 52,  0, 53,  0,  0,  0,  0, 54,  0,  0,  0,  0, 55,
-    0, 56,  0,  0,  0,  0, 57, 58,  0,  0,  0, 59, 60,  0,  0,  0,
-    0,  0,  0, 61, 52,  0, 62, 63,  0,  0, 64,  0,  0,  0, 65, 66,
-    0,  0,  0, 67,  0, 68, 69, 70, 71, 72,  1, 73,  0, 74, 75, 76,
-    0,  0, 77, 78,  0,  0,  0, 79,  0,  0,  1,  1,  0,  0, 80,  0,
-    0, 81,  0,  0,  0,  0, 77, 82,  0, 83,  0,  0,  0,  0,  0, 78,
-   84,  0, 85,  0, 52,  0,  1, 78,  0,  0, 86,  0,  0, 87,  0,  0,
-    0,  0,  0, 88, 57,  0,  0,  0,  0,  0,  0, 89, 90,  0,  0, 84,
-    0,  0, 33,  0,  0, 91,  0,  0,  0,  0, 92,  0,  0,  0,  0, 49,
-    0,  0, 93,  0,  0,  0,  0, 94, 95,  0,  0, 96,  0,  0, 97,  0,
-    0,  0, 98,  0,  0,  0, 99,  0,  0,  0,  0,100,101, 93,  0,  0,
-  102,  0,  0,  0, 84,  0,  0,103,  0,  0,  0,104,105,  0,  0,106,
-  107,  0,  0,  0,  0,  0,  0,108,  0,  0,109,  0,  0,  0,  0,110,
-   33,  0,111,112,113, 35,  0,  0,114,  0,  0,  0,115,  0,  0,  0,
-    0,  0,  0,116,  0,  0,117,  0,  0,  0,  0,118, 88,  0,  0,  0,
-    0,  0, 57,  0,  0,  0,  0, 52,119,  0,  0,  0,  0,120,  0,  0,
-  121,  0,  0,  0,  0,119,  0,  0,122,  0,  0,  0,  0,  0,  0,123,
-    0,  0,  0,124,  0,  0,  0,125,  0,126,  0,  0,  0,  0,127,128,
-  129,  0,130,  0,131,  0,  0,  0,132,133,134,  0, 77,  0,  0,  0,
-    0,  0, 35,  0,  0,  0,135,  0,  0,  0,136,  0,  0,137,  0,  0,
-  138,  0,  0,  0,  0,  0,  0,  0,  1,  1,  1,  1,  1,  2,  3,  4,
-    5,  6,  7,  4,  4,  8,  9, 10,  1, 11, 12, 13, 14, 15, 16, 17,
-   18,  1,  1,  1, 19,  1,  0,  0, 20, 21, 22,  1, 23,  4, 21, 24,
-   25, 26, 27, 28, 29, 30,  0,  0,  1,  1, 31,  0,  0,  0, 32, 33,
-   34, 35,  1, 36, 37,  0,  0,  0,  0, 38,  1, 39, 14, 39, 40, 41,
-   42,  0,  0,  0, 43, 36, 44, 45, 21, 45, 46,  0,  0,  0, 19,  1,
-   21,  0,  0, 47,  0, 38, 48,  1,  1, 49, 49, 50,  0,  0, 51,  0,
-    0,  0, 52,  1,  0,  0, 38, 14,  4,  1,  1,  1, 53, 21, 43, 52,
-   54, 21, 35,  1,  0,  0,  0, 55,  0,  0,  0, 56, 57, 58,  0,  0,
-    0,  0,  0, 59,  0, 60,  0,  0,  0,  0, 61, 62,  0,  0, 63,  0,
-    0,  0, 64,  0,  0,  0, 65,  0,  0,  0, 66,  0,  0,  0, 67,  0,
-    0,  0, 68,  0,  0, 69, 70,  0, 71, 72, 73, 74, 75, 76,  0,  0,
-    0, 77,  0,  0,  0, 78, 79,  0,  0,  0,  0, 47,  0,  0,  0, 49,
-    0, 80,  0,  0,  0, 62,  0,  0, 63,  0,  0, 81,  0,  0, 82,  0,
-    0,  0, 83,  0,  0, 19, 84,  0, 62,  0,  0,  0,  0, 49,  1, 85,
-    1, 52, 15, 86, 36, 10, 21, 87,  0, 55,  0,  0,  0,  0, 19, 10,
-    1,  0,  0,  0,  0,  0, 88,  0,  0, 89,  0,  0, 88,  0,  0,  0,
-    0, 78,  0,  0, 87,  9, 12,  4, 90,  8, 91, 47,  0, 58, 50,  0,
-   21,  1, 21, 92, 93,  1,  1,  1,  1, 94, 95, 96, 97,  1, 98, 58,
-   81, 99,100,  4, 58,  0,  0,  0,  0,  0,  0, 19, 50,  0,  0,  0,
-    0,  0,  0, 61,  0,  0,101,102,  0,  0,103,  0,  0,  1,  1, 50,
-    0,  0,  0, 38,  0, 63,  0,  0,  0,  0,  0, 62,  0,  0,104, 68,
-   61,  0,  0,  0, 78,  0,  0,  0,105,106, 58, 38, 81,  0,  0,  0,
-    0,  0,  0,107,  1, 14,  4, 12, 84,  0,  0,  0,  0, 38, 87,  0,
-    0,  0,  0,108,  0,  0,109, 61,  0,110,  0,  0,  0,  1,  0,  0,
+    0,  0,  0, 20,  0, 21, 22, 23,  0,  0,  0, 24, 25, 26, 27, 28,
+   29, 30, 31, 32, 33, 34,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+    0,  0,  0,  0,  0,  0, 35,  0,  0,  0,  0, 36,  0, 37,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+    0,  0,  0,  0, 38,  0,  0,  0,  0,  0,  0,  0,  0,  0, 39, 40,
+    0,  0,  0,  0,  0,  0, 41, 42, 43,  0, 44,  0,  0,  0,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  1,  2,  0,  0,  0,  0,  3,  0,
+    0,  0,  4,  5,  6,  7,  0,  8,  9, 10,  0, 11, 12, 13, 14, 15,
+   16, 17, 16, 18, 16, 19, 16, 19, 16, 19,  0, 19, 16, 20, 16, 19,
+   21, 19,  0, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,  0, 32,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0, 33,  0,  0,  0,  0,  0,  0,
+   34,  0,  0, 35,  0,  0, 36,  0, 37,  0,  0,  0, 38, 39, 40, 41,
+   42, 43, 44, 45, 46,  0,  0, 47,  0,  0,  0, 48,  0,  0,  0, 49,
+    0,  0,  0,  0,  0,  0,  0, 50,  0, 51,  0, 52, 53,  0, 54,  0,
+    0,  0,  0,  0,  0, 55, 56, 57,  0,  0,  0,  0, 58,  0,  0, 59,
+   60, 61, 62, 63,  0,  0, 64, 65,  0,  0,  0, 66,  0,  0,  0,  0,
+   67,  0,  0,  0, 68,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+    0,  0,  0, 69,  0,  0,  0, 70,  0, 71,  0,  0, 72,  0,  0, 73,
+    0,  0,  0,  0,  0,  0,  0,  0, 74, 75,  0,  0,  0,  0, 76, 77,
+    0, 78, 79,  0,  0, 80, 81,  0, 82, 62,  0, 83, 84,  0,  0, 85,
+   86, 87,  0, 88,  0, 89,  0, 90,  0,  0, 51, 91, 51,  0, 92,  0,
+   93,  0,  0,  0, 81,  0,  0,  0, 94, 95,  0, 96, 97, 98, 99,  0,
+    0,  0,  0,  0, 51,  0,  0,  0,  0,100,101,  0,  0,  0,  0,  0,
+    0,102,  0,  0,  0,  0,  0,  0,103,  0,  0,  0,  0,  0,  0,104,
+  105,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,106,  0,  0,107,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,108,109,  0,  0,110,  0,  0,
+    0,  0,  0,  0,111,  0,112,  0,105,  0,  0,  0,  0,  0,113,114,
+    0,  0,  0,  0,  0,  0,  0,115,  0,  0,  0,116,  0,  0,  0,117,
+    0,118,  0,  0,  0,  0,  0,  0,  1,  2,  3,  4,  5,  6,  7,  0,
+    8,  0,  0,  0,  0,  9, 10, 11, 12,  0,  0,  0,  0, 13,  0,  0,
+   14, 15,  0, 16,  0, 17, 18,  0,  0, 19,  0, 20, 21,  0,  0,  0,
+    0,  0, 22, 23,  0, 24, 25,  0,  0, 26,  0,  0,  0, 27,  0,  0,
+   28, 29, 30, 31,  0,  0,  0, 32, 33, 34,  0,  0, 33,  0,  0, 35,
+   33,  0,  0,  0, 33, 36,  0,  0,  0,  0,  0, 37, 38,  0,  0,  0,
+    0,  0,  0, 39, 40,  0,  0,  0,  0,  0,  0, 41, 42,  0,  0,  0,
+    0, 43,  0, 44,  0,  0,  0, 45, 46,  0,  0,  0, 47,  0,  0,  0,
+    0,  0,  0, 48, 49,  0,  0,  0,  0, 50,  0,  0,  0, 51,  0, 52,
+    0, 53,  0,  0,  0,  0, 54,  0,  0,  0,  0, 55,  0, 56,  0,  0,
+    0,  0, 57, 58,  0,  0,  0, 59, 60,  0,  0,  0,  0,  0,  0, 61,
+   52,  0, 62, 63,  0,  0, 64,  0,  0,  0, 65, 66,  0,  0,  0, 67,
+    0, 68, 69, 70, 71, 72,  1, 73,  0, 74, 75, 76,  0,  0, 77, 78,
+    0,  0,  0, 79,  0,  0,  1,  1,  0,  0, 80,  0,  0, 81,  0,  0,
+    0,  0, 77, 82,  0, 83,  0,  0,  0,  0,  0, 78, 84,  0, 85,  0,
+   52,  0,  1, 78,  0,  0, 86,  0,  0, 87,  0,  0,  0,  0,  0, 88,
+   57,  0,  0,  0,  0,  0,  0, 89, 90,  0,  0, 84,  0,  0, 33,  0,
+    0, 91,  0,  0,  0,  0, 92,  0,  0,  0,  0, 49,  0,  0, 93,  0,
+    0,  0,  0, 94, 95,  0,  0, 96,  0,  0, 97,  0,  0,  0, 98,  0,
+    0,  0, 99,  0,  0,  0,100,  0,  0,  0,  0,101,102, 93,  0,  0,
+  103,  0,  0,  0, 84,  0,  0,104,  0,  0,  0,105,106,  0,  0,107,
+  108,  0,  0,  0,  0,  0,  0,109,  0,  0,110,  0,  0,  0,  0,111,
+   33,  0,112,113,114, 57,  0,  0,115, 35,  0,  0,116,  0,  0,  0,
+  117,  0,  0,  0,  0,  0,  0,118,  0,  0,119,  0,  0,  0,  0,120,
+   88,  0,  0,  0,  0,  0, 57,  0,  0,  0,  0, 52,121,  0,  0,  0,
+    0,122,  0,  0,123,  0,  0,  0,  0,121,  0,  0,124,  0,  0,  0,
+    0,  0, 79,  0,  0,  0,  0,125,  0,  0,  0,126,  0,  0,  0,127,
+    0,128,  0,  0,  0,  0,129,130,131,  0,132,  0,133,  0,  0,  0,
+  134,135,136,  0, 77,  0,  0,  0,  0,  0, 35,  0,  0,  0,137,  0,
+    0,  0,138,  0,  0,  0,139,  0,  0,140,  0,  0,141,  0,  0,  0,
+    0,  0,  0,  0,  1,  1,  1,  1,  1,  2,  3,  4,  5,  6,  7,  4,
+    4,  8,  9, 10,  1, 11, 12, 13, 14, 15, 16, 17, 18,  1,  1,  1,
+   19,  1,  0,  0, 20, 21, 22,  1, 23,  4, 21, 24, 25, 26, 27, 28,
+   29, 30,  0,  0,  1,  1, 31,  0,  0,  0, 32, 33, 34, 35,  1, 36,
+   37,  0,  0,  0,  0, 38,  1, 39, 14, 39, 40, 41, 42,  0,  0,  0,
+   43, 36, 44, 45, 21, 45, 46,  0,  0,  0, 19,  1, 21,  0,  0, 47,
+    0, 38, 48,  1,  1, 49, 49, 50,  0,  0, 51,  0,  0, 19, 52,  1,
+    0,  0, 38, 14,  4,  1,  1,  1, 53, 21, 43, 52, 54, 21, 35,  1,
+    0,  0,  0, 55,  0,  0,  0, 56, 57, 58,  0,  0,  0,  0,  0, 59,
+    0, 60,  0,  0,  0,  0, 61, 62,  0,  0, 63,  0,  0,  0, 64,  0,
+    0,  0, 65,  0,  0,  0, 66,  0,  0,  0, 67,  0,  0,  0, 68,  0,
+    0, 69, 70,  0, 71, 72, 73, 74, 75, 76,  0,  0,  0, 77,  0,  0,
+    0, 78, 79,  0,  0,  0,  0, 47,  0,  0,  0, 49,  0, 80,  0,  0,
+    0, 62,  0,  0, 63,  0,  0, 81,  0,  0, 82,  0,  0,  0, 83,  0,
+    0, 19, 84,  0, 62,  0,  0,  0,  0, 49,  1, 85,  1, 52, 15, 86,
+   36, 10, 21, 87,  0, 55,  0,  0,  0,  0, 19, 10,  1,  0,  0,  0,
+    0,  0, 88,  0,  0, 89,  0,  0, 88,  0,  0,  0,  0, 78,  0,  0,
+   87,  9, 12,  4, 90,  8, 91, 47,  0, 58, 50,  0, 21,  1, 21, 92,
+   93,  1,  1,  1,  1, 94, 95, 96, 97,  1, 98, 58, 81, 99,100,  4,
+   58,  0,  0,  0,  0,  0,  0, 19, 50,  0,  0,  0,  0,  0,  0, 61,
+    0,  0,101,102,  0,  0,103,  0,  0,  1,  1, 50,  0,  0,  0, 38,
+    0, 63,  0,  0,  0,  0,  0, 62,  0,  0,104, 68, 61,  0,  0,  0,
+   78,  0,  0,  0,105,106, 58, 38, 81,  0,  0,  0,  0,  0,  0,107,
+    1, 14,  4, 12, 84,  0,  0,  0,  0, 38, 87,  0,  0,  0,  0,108,
+    0,  0,109, 61,  0,110,  0,  0,  0,  1,  0,  0,  0,  0, 49, 50,
     0,  0, 19, 58,  0,  0,  0, 51,  0,111, 14, 52,112, 41,  0,  0,
    62,  0,  0, 61,  0,  0,113,  0, 87,  0,  0,  0, 61, 62,  0,  0,
    62,  0, 89,  0,  0,113,  0,  0,  0,  0,114,  0,  0,  0, 78, 55,
-    0, 38,  1, 58,  1, 58,  0,  0, 63, 89,  0,  0,115,  0,  0,  0,
-   55,  0,  0,  0,  0,115,  0,  0,  0,  0, 61,  0,  0,  0,  0, 79,
-    0, 61,  0,  0,  0,  0, 56,  0, 89, 80,  0,  0, 79,  0,  0,  0,
-    8, 91,  0,  0,  1, 87,  0,  0,116,  0,  0,  0,  0,  0,  0,117,
-    0,118,119,120,121,  0,104,  4,122, 49, 23,  0,  0,  0, 38, 50,
-   38, 58,  0,  0,  1, 87,  1,  1,  1,  1, 39,  1, 48,105, 87,  0,
-    0,  0,  0,  1,  0,  0,  0,123,  4,122,  0,  0,  0,  1,124,  0,
-    0,  0,  0,  0,230,230,230,230,230,232,220,220,220,220,232,216,
-  220,220,220,220,220,202,202,220,220,220,220,202,202,220,220,220,
-    1,  1,  1,  1,  1,220,220,220,220,230,230,230,230,240,230,220,
-  220,220,230,230,230,220,220,  0,230,230,230,220,220,220,220,230,
-  232,220,220,230,233,234,234,233,234,234,233,230,  0,  0,  0,230,
-    0,220,230,230,230,230,220,230,230,230,222,220,230,230,220,220,
-  230,222,228,230, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 19, 20,
-   21, 22,  0, 23,  0, 24, 25,  0,230,220,  0, 18, 30, 31, 32,  0,
-    0,  0,  0, 27, 28, 29, 30, 31, 32, 33, 34,230,230,220,220,230,
-  220,230,230,220, 35,  0,  0,  0,  0,  0,230,230,230,  0,  0,230,
-  230,  0,220,230,230,220,  0,  0,  0, 36,  0,  0,230,220,230,230,
-  220,220,230,220,220,230,220,230,220,230,230,  0,  0,220,  0,  0,
-  230,230,  0,230,  0,230,230,230,230,230,  0,  0,  0,220,220,220,
-  230,220,220,220,230,230,  0,220, 27, 28, 29,230,  7,  0,  0,  0,
-    0,  9,  0,  0,  0,230,220,230,230,  0,  0,  0,  0,  0,230,  0,
-    0, 84, 91,  0,  0,  0,  0,  9,  9,  0,  0,  0,  0,  0,  9,  0,
-  103,103,  9,  0,107,107,107,107,118,118,  9,  0,122,122,122,122,
-  220,220,  0,  0,  0,220,  0,220,  0,216,  0,  0,  0,129,130,  0,
-  132,  0,  0,  0,  0,  0,130,130,130,130,  0,  0,130,  0,230,230,
-    9,  0,230,230,  0,  0,220,  0,  0,  0,  0,  7,  0,  9,  9,  0,
-    9,  9,  0,  0,  0,230,  0,  0,  0,228,  0,  0,  0,222,230,220,
-  220,  0,  0,  0,230,  0,  0,220,230,220,  0,220,230,230,230,  0,
-    0,  0,  9,  9,  0,  0,  7,  0,230,  0,  1,  1,  1,  0,  0,  0,
-  230,234,214,220,202,230,230,230,230,230,232,228,228,220,218,230,
-  233,220,230,220,230,230,  1,  1,  1,  1,  1,230,  0,  1,  1,230,
-  220,230,  1,  1,  0,  0,218,228,232,222,224,224,  0,  8,  8,  0,
-    0,  0,  0,220,230,  0,230,230,220,  0,  0,230,  0,  0, 26,  0,
-    0,220,  0,230,230,  1,220,  0,  0,230,220,  0,  0,  0,220,220,
-    0,  0,230,220,  0,  9,  7,  0,  0,  7,  9,  0,  0,  0,  9,  7,
-    6,  6,  0,  0,  0,  0,  1,  0,  0,216,216,  1,  1,  1,  0,  0,
-    0,226,216,216,216,216,216,  0,220,220,220,  0,232,232,220,230,
-  230,230,  7,  0, 16, 17, 17, 33, 17, 49, 17, 17, 84, 97,135,145,
-   26, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
+    0, 38,  1, 58,  1, 58,  0,  0,  0,  0,  0, 88, 63, 89,  0,  0,
+  115,  0,  0,  0, 55,  0,  0,  0,  0,115,  0,  0,  0,  0, 61,  0,
+    0,  0,  0, 79,  0, 61,  0,  0,  0,  0, 56,  0, 89, 80,  0,  0,
+   79,  0,  0,  0,  8, 91,  0,  0,  1, 87,  0,  0,116,  0,  0,  0,
+    0,  0,  0,117,  0,118,119,120,121,  0,104,  4,122, 49, 23,  0,
+    0,  0, 38, 50, 38, 58,  0,  0,  1, 87,  1,  1,  1,  1, 39,  1,
+   48,105, 87,  0,  0,  0,  0,  1,  0,  0,  0,123,  0,  0,  0,112,
+    4,122,  0,  0,  0,  1,124,  0,  0,  0,  0,  0,230,230,230,230,
+  230,232,220,220,220,220,232,216,220,220,220,220,220,202,202,220,
+  220,220,220,202,202,220,220,220,  1,  1,  1,  1,  1,220,220,220,
+  220,230,230,230,230,240,230,220,220,220,230,230,230,220,220,  0,
+  230,230,230,220,220,220,220,230,232,220,220,230,233,234,234,233,
+  234,234,233,230,  0,  0,  0,230,  0,220,230,230,230,230,220,230,
+  230,230,222,220,230,230,220,220,230,222,228,230, 10, 11, 12, 13,
+   14, 15, 16, 17, 18, 19, 19, 20, 21, 22,  0, 23,  0, 24, 25,  0,
+  230,220,  0, 18, 30, 31, 32,  0,  0,  0,  0, 27, 28, 29, 30, 31,
+   32, 33, 34,230,230,220,220,230,220,230,230,220, 35,  0,  0,  0,
+    0,  0,230,230,230,  0,  0,230,230,  0,220,230,230,220,  0,  0,
+    0, 36,  0,  0,230,220,230,230,220,220,230,220,220,230,220,230,
+  220,230,230,  0,  0,220,  0,  0,230,230,  0,230,  0,230,230,230,
+  230,230,  0,  0,  0,220,220,220,230,220,220,220,230,230,  0,220,
+   27, 28, 29,230,  7,  0,  0,  0,  0,  9,  0,  0,  0,230,220,230,
+  230,  0,  0,  0,  0,  0,230,  0,  0, 84, 91,  0,  0,  0,  0,  9,
+    9,  0,  0,  0,  0,  0,  9,  0,103,103,  9,  0,107,107,107,107,
+  118,118,  9,  0,122,122,122,122,220,220,  0,  0,  0,220,  0,220,
+    0,216,  0,  0,  0,129,130,  0,132,  0,  0,  0,  0,  0,130,130,
+  130,130,  0,  0,130,  0,230,230,  9,  0,230,230,  0,  0,220,  0,
+    0,  0,  0,  7,  0,  9,  9,  0,  9,  9,  0,  0,  0,230,  0,  0,
+    0,228,  0,  0,  0,222,230,220,220,  0,  0,  0,230,  0,  0,220,
+  230,220,  0,220,230,230,230,  0,  0,  0,  9,  9,  0,  0,  7,  0,
+  230,  0,  1,  1,  1,  0,  0,  0,230,234,214,220,202,230,230,230,
+  230,230,232,228,228,220,218,230,233,220,230,220,230,230,  1,  1,
+    1,  1,  1,230,  0,  1,  1,230,220,230,  1,  1,  0,  0,218,228,
+  232,222,224,224,  0,  8,  8,  0,  0,  0,  0,220,230,  0,230,230,
+  220,  0,  0,230,  0,  0, 26,  0,  0,220,  0,230,230,  1,220,  0,
+    0,230,220,  0,  0,  0,220,220,  0,  0,230,220,  0,  9,  7,  0,
+    0,  7,  9,  0,  0,  0,  9,  7,  6,  6,  0,  0,  0,  0,  1,  0,
+    0,216,216,  1,  1,  1,  0,  0,  0,226,216,216,216,216,216,  0,
+  220,220,220,  0,232,232,220,230,230,230,  7,  0, 16, 17, 17, 33,
+   17, 49, 17, 17, 84, 97,135,145, 26, 17, 17, 17, 17, 17, 17, 17,
    17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
    17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-   17, 17, 17,177,  0,  1,  2,  3,  3,  3,  3,  3,  3,  3,  3,  3,
-    3,  3,  3,  3,  3,  3,  3,  3,  4,  3,  3,  3,  3,  3,  5,  3,
-    3,  3,  3,  3,  6,  7,  8,  3,  3,  3,  3,  3,  9, 10, 11, 12,
-   13,  3,  3,  3,  3,  3,  3,  3,  3, 14,  3, 15,  3,  3,  3,  3,
-    3,  3, 16, 17, 18, 19, 20, 21,  3,  3,  3, 22, 23, 24,  3,  3,
-    3,  3,  3,  3, 25,  3,  3,  3,  3,  3,  3,  3,  3, 26,  3,  3,
-   27, 28,  0,  1,  0,  0,  0,  0,  0,  1,  0,  2,  0,  0,  0,  3,
-    0,  0,  0,  3,  0,  0,  0,  0,  0,  4,  0,  5,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  6,  0,  0,  0,  7,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  8,  9,  0,  0,  0,
-    0,  0,  0,  9,  0,  9,  0,  0,  0,  0,  0,  0,  0, 10, 11, 12,
-   13,  0,  0, 14, 15, 16,  6,  0, 17, 18, 19, 19, 19, 20, 21, 22,
-   23, 24, 19, 25,  0, 26, 27, 19, 19, 28, 29, 30,  0, 31,  0,  0,
-    0,  8,  0,  0,  0,  0,  0,  0,  0, 19, 28,  0, 32, 33,  9, 34,
-   35, 19,  0,  0, 36, 37, 38, 39, 40, 19,  0, 41, 42, 43, 44, 31,
-    0,  1, 45, 42,  0,  0,  0,  0,  0, 32, 14, 14,  0,  0,  0,  0,
-   14,  0,  0, 46, 47, 47, 47, 47, 48, 49, 47, 47, 47, 47, 50, 51,
-   52, 53, 43, 21,  0,  0,  0,  0,  0,  0,  0, 54,  6, 55,  0, 14,
-   19,  1,  0,  0,  0,  0, 56, 57,  0,  0,  0,  0,  0, 19, 58, 31,
-    0,  0,  0,  0,  0,  0,  0, 59, 14,  0,  0,  0,  0,  1,  0,  2,
-    0,  0,  0,  3,  0,  0,  0, 60, 61,  0,  0,  0,  0,  0,  0,  0,
-    1,  0,  0,  0,  0,  0,  2,  3,  0,  4,  5,  0,  0,  6,  0,  0,
-    0,  7,  0,  0,  0,  1,  1,  0,  0,  8,  9,  0,  8,  9,  0,  0,
-    0,  0,  8,  9, 10, 11, 12,  0,  0,  0, 13,  0,  0,  0,  0, 14,
-   15, 16, 17,  0,  0,  0,  1,  0,  0, 18, 19,  0,  0,  0, 20,  0,
-    0,  0,  1,  1,  1,  1,  0,  1,  1,  1,  1,  1,  1,  1,  0,  8,
-   21,  9,  0,  0, 22,  0,  0,  0,  0,  1,  0, 23, 24, 25,  0,  0,
-   26,  0,  0,  0,  8, 21, 27,  0,  1,  0,  0,  1,  1,  1,  1,  0,
-    1, 28, 29, 30,  0, 31, 32, 20,  1,  1,  0,  0,  0,  8, 21,  9,
-    1,  4,  5,  0,  0,  0, 33,  9,  0,  1,  1,  1,  0,  8, 21, 21,
-   21, 21, 34,  1, 35, 21, 21, 21,  9, 36,  0,  0, 37, 38,  1,  0,
-   39,  0,  0,  0,  1,  0,  1,  0,  0,  0,  0,  8, 21,  9,  1,  0,
-    0,  0, 40,  0,  8, 21, 21, 21, 21, 21, 21, 21, 21,  9,  0,  1,
-    1,  1,  1,  8, 21, 21, 21,  9,  0,  0,  0, 41,  0, 42, 43,  0,
-    0,  0,  1, 44,  0,  0,  0, 45,  8,  9,  1,  0,  0,  0,  8, 21,
-   21, 21,  9,  0,  1,  0,  1,  1,  8, 21, 21,  9,  0,  4,  5,  8,
-    9,  1,  0,  0,  0,  1,  2,  3,  4,  5,  6,  7,  7,  8,  7,  7,
-    7,  7,  7,  7,  7,  7,  7,  7,  9, 10, 11, 11, 11, 11, 12, 13,
-   13, 13, 13, 14, 15, 16, 17, 18, 19, 20, 21, 13, 22, 13, 13, 13,
-   13, 23, 24, 24, 25, 26, 13, 13, 13, 27, 28, 29, 13, 30, 31, 32,
-   33, 34, 35, 36,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,
-    7,  7,  7,  7,  7,  7,  7,  7, 37,  7, 38, 39,  7, 40,  7,  7,
-    7, 41, 13, 42,  7,  7, 43,  7, 44, 13, 13, 13, 13, 13, 13, 13,
-   13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
-   13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
-   13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
-   13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
-   13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
-   13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
-   13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
-   13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
-   13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
-   13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
-   13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
-   13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
-   13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
-   13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
-   13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
-   13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
-   13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
-   13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
-   13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
-   13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
-   13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
-   13, 13, 13, 13, 45,  0,  0,  1,  2,  2,  2,  3,  4,  5,  6,  7,
-    8,  9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23,
-   24, 25, 26, 27, 28, 29, 30, 31, 32, 32, 33, 34, 35, 36, 37, 37,
-   37, 37, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50,
-   51, 52,  2,  2, 53, 54, 55, 56, 57, 58, 59, 59, 59, 59, 60, 59,
-   59, 59, 59, 59, 59, 59, 61, 61, 59, 59, 59, 59, 62, 63, 64, 65,
-   66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 59, 70, 70,
-   70, 70, 70, 70, 70, 70, 70, 70, 70, 70, 70, 70, 70, 70, 70, 70,
-   70, 70, 70, 70, 70, 70, 70, 70, 70, 70, 70, 70, 70, 70, 70, 70,
-   70, 79, 70, 70, 70, 70, 80, 80, 80, 80, 80, 80, 80, 80, 80, 81,
-   82, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 32, 32,
-   32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
-   32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
-   32, 32, 32, 32, 32, 95, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96,
-   96, 96, 96, 96, 96, 96, 96, 96, 70, 70, 97, 98, 99,100,101,101,
-  102,103,104,105,106,107,108,109,110,111, 96,112,113,114,115,116,
-  117,118,119,119,120,121,122,123,124,125,126,127,128,129,130,131,
-  132, 96,133,134,135,136,137,138,139,140,141,142,143, 96,144,145,
-   96,146,147,148,149, 96,150,151,152,153,154,155,156, 96,157,158,
-  159,160, 96,161,162,163,164,164,164,164,164,164,164,165,166,164,
-  167, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96,
-   96, 96, 96, 96, 96,168,169,169,169,169,169,169,169,169,170, 96,
-   96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96,171,171,
-  171,171,172, 96, 96, 96,173,173,173,173,174,175,176,177, 96, 96,
-   96, 96,178,179,180,181,182,182,182,182,182,182,182,182,182,182,
-  182,182,182,182,182,182,182,182,182,182,182,182,182,182,182,182,
-  182,182,182,182,182,183,182,182,182,182,182,182,184,184,184,185,
-  186, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96,
-   96, 96, 96, 96, 96,187,188,189,190,191,191,192, 96, 96, 96, 96,
-   96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96,193,194,
-   96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96,
-   96, 96, 96, 96,195,196, 59,197,198,199,200,201,202, 96,203,204,
-  205, 59, 59,206, 59,207,208,208,208,208,208,209, 96, 96, 96, 96,
-   96, 96, 96, 96,210, 96,211,212,213, 96, 96,214, 96, 96, 96,215,
-   96, 96, 96, 96, 96,216,217,218,219, 96, 96, 96, 96, 96,220,221,
-  222, 96,223,224, 96, 96,225,226, 59,227,228, 96, 59, 59, 59, 59,
-   59, 59, 59,229,230,231,232,233, 59, 59,234,235, 59,236, 96, 96,
-   96, 96, 96, 96, 96, 96, 70, 70, 70, 70, 70, 70, 70, 70, 70, 70,
-   70, 70, 70,237, 70, 70, 70, 70, 70, 70, 70, 70, 70, 70, 70, 70,
-   70, 70, 70, 70,238, 70,239, 70, 70, 70, 70, 70, 70, 70, 70, 70,
-   70, 70, 70, 70, 70, 70, 70, 70, 70, 70, 70, 70, 70, 70, 70, 70,
-   70, 70, 70,240, 70, 70, 70, 70, 70, 70, 70, 70, 70,241, 70, 70,
-   70, 70,242, 96, 96, 96, 70, 70, 70, 70,243, 96, 96, 96, 96, 96,
-   96, 96, 96, 96, 96, 96, 70, 70, 70, 70, 70, 70,244, 70, 70, 70,
-   70, 70, 70, 70, 70, 70, 70, 70, 70, 70, 70, 70, 70,245, 96, 96,
-   96, 96, 96, 96, 96, 96,246, 96,247,248,  0,  1,  2,  2,  0,  1,
-    2,  2,  2,  3,  4,  5,  0,  0,  0,  0,  0, 19, 19, 19, 19, 19,
-   19, 19, 19, 19, 19,  0,  0,  0, 19,  0, 19,  0,  0,  0,  0,  0,
-   26, 26,  1,  1,  1,  1,  9,  9,  9,  9,  0,  9,  9,  9,  2,  2,
-    9,  9,  9,  9,  0,  9,  2,  2,  2,  2,  9,  0,  9,  0,  9,  9,
-    9,  2,  9,  2,  9,  9,  9,  9,  2,  9,  9,  9, 55, 55, 55, 55,
-   55, 55,  6,  6,  6,  6,  6,  1,  1,  6,  2,  4,  4,  4,  4,  4,
-    4,  4,  4,  4,  4,  2,  2, 14, 14, 14, 14, 14, 14, 14, 14, 14,
-   14,  2,  2,  2,  2, 14, 14,  2,  2,  2,  3,  3,  3,  3,  3,  0,
-    3,  3,  0,  3,  3,  3,  3,  3,  3,  0,  3,  3,  3,  1,  1,  1,
-    3,  3,  1,  3,  3,  3, 37, 37, 37, 37, 37, 37,  2, 37, 37, 37,
-   37,  2,  2, 37, 37, 37, 38, 38, 38, 38, 38, 38,  2,  2, 64, 64,
-   64, 64, 64, 64, 64,  2,  2, 64, 64, 64, 90, 90, 90, 90, 90, 90,
-    2,  2, 90, 90, 90,  2, 95, 95, 95, 95,  2,  2, 95,  2,  3,  3,
-    3,  2,  3,  3,  2,  2,  3,  3,  0,  3,  7,  7,  7,  7,  7,  1,
-    1,  1,  1,  7,  7,  7,  0,  0,  7,  7,  5,  5,  5,  5,  2,  5,
-    5,  5,  5,  2,  2,  5,  5,  2,  5,  5,  5,  2,  5,  2,  2,  2,
-    5,  5,  5,  5,  2,  2,  5,  5,  5,  2,  2,  2,  2,  5,  5,  5,
-    2,  5,  2, 11, 11, 11, 11, 11, 11,  2,  2,  2,  2, 11, 11,  2,
-    2, 11, 11, 11, 11, 11, 11,  2, 11, 11,  2, 11, 11,  2, 11, 11,
-    2,  2,  2, 11,  2,  2, 11,  2, 11,  2,  2,  2, 11, 11,  2, 10,
-   10, 10, 10, 10, 10, 10, 10, 10,  2, 10, 10,  2, 10, 10, 10, 10,
-    2,  2, 10,  2,  2,  2,  2,  2, 10, 10,  2, 21, 21, 21, 21, 21,
-   21, 21, 21,  2,  2, 21, 21,  2, 21, 21, 21, 21,  2,  2, 21, 21,
-    2, 21,  2,  2, 21, 21,  2,  2, 22, 22,  2, 22, 22, 22, 22, 22,
-   22,  2, 22,  2, 22, 22, 22, 22,  2,  2,  2, 22, 22,  2,  2,  2,
-    2, 22, 22,  2,  2,  2, 22, 22, 22, 22, 23, 23, 23, 23, 23,  2,
-   23, 23, 23, 23,  2,  2,  2, 23, 23,  2, 23, 23, 23,  2,  2, 23,
-    2,  2,  2,  2, 23, 23,  2,  2,  2, 23, 16, 16, 16, 16, 16,  2,
-   16, 16,  2, 16, 16, 16, 16, 16,  2,  2,  2, 16, 16,  2,  2,  2,
-   16, 16, 20, 20, 20, 20, 20,  2, 20, 20,  2,  2, 20, 20,  2, 36,
-   36, 36, 36, 36, 36, 36, 36, 36, 36,  2,  2,  2, 36, 36, 36, 36,
-    2, 36,  2, 36,  2,  2,  2,  2, 36,  2,  2,  2,  2, 36, 36,  2,
-   36,  2, 36,  2,  2,  2,  2, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-   24,  2,  2,  2,  2,  0,  2, 18, 18,  2, 18,  2, 18, 18, 18, 18,
-   18,  2, 18, 18, 18, 18,  2, 18,  2, 18, 18, 18,  2,  2, 18,  2,
-   18,  2, 25, 25, 25, 25,  2, 25, 25, 25, 25,  2,  2,  2, 25,  2,
-   25, 25, 25,  0,  0,  0,  0, 25, 25,  2, 33, 33, 33, 33,  8,  8,
-    8,  8,  8,  8,  2,  8,  2,  8,  2,  2,  8,  8,  8,  0, 12, 12,
-   12, 12, 30, 30, 30, 30, 30,  2, 30, 30, 30, 30,  2,  2, 30, 30,
-   30,  2,  2, 30, 30, 30, 30,  2,  2,  2, 29, 29, 29, 29, 29, 29,
-    2,  2, 28, 28, 28, 28, 34, 34, 34, 34, 34,  2,  2,  2, 35, 35,
-   35, 35, 35, 35, 35,  0,  0,  0, 35, 35, 35,  2,  2,  2, 45, 45,
-   45, 45, 45, 45,  2,  2,  2,  2,  2, 45, 44, 44, 44, 44, 44,  0,
-    0,  2, 43, 43, 43, 43, 46, 46, 46, 46, 46,  2, 46, 46, 31, 31,
-   31, 31, 31, 31,  2,  2, 32, 32,  0,  0, 32,  0, 32, 32, 32, 32,
-   32, 32, 32, 32,  2,  2, 32,  2,  2,  2, 32, 32, 32,  2, 28, 28,
-    2,  2, 48, 48, 48, 48, 48, 48, 48,  2, 48,  2,  2,  2, 52, 52,
-   52, 52, 52, 52,  2,  2, 52,  2,  2,  2, 58, 58, 58, 58, 58, 58,
-    2,  2, 58, 58, 58,  2,  2,  2, 58, 58, 54, 54, 54, 54,  2,  2,
-   54, 54, 91, 91, 91, 91, 91, 91, 91,  2, 91,  2,  2, 91, 91, 91,
-    2,  2,  1,  1,  1,  2, 62, 62, 62, 62, 62,  2,  2,  2, 62, 62,
-   62,  2, 76, 76, 76, 76, 93, 93, 93, 93, 70, 70, 70, 70,  2,  2,
-    2, 70, 70, 70,  2,  2,  2, 70, 70, 70, 73, 73, 73, 73,  6,  2,
-    2,  2,  8,  8,  8,  2,  2,  8,  8,  8,  1,  1,  1,  0,  1,  0,
-    1,  1,  1,  0,  0,  0,  0,  1,  0,  0,  1,  1,  0,  2, 19, 19,
-    9,  9,  9,  9,  9,  6, 19,  9,  9,  9,  9,  9, 19, 19,  9,  9,
-    9, 19,  6, 19, 19, 19, 19, 19, 19,  9,  9,  9,  2,  2,  2,  9,
-    2,  9,  2,  9,  9,  9,  1,  1,  0,  0,  0,  2,  0,  0,  0, 19,
-    2,  2,  0,  0,  0, 19,  0,  0,  0,  2, 19,  2,  2,  2,  0,  2,
-    2,  2,  1,  2,  2,  2,  0,  0,  9,  0,  0,  0, 19, 19, 27, 27,
-   27, 27,  2,  2,  0,  0,  0,  0,  2,  0, 56, 56, 56, 56,  2, 55,
-   55, 55, 61, 61, 61, 61,  2,  2,  2, 61, 61,  2,  2,  2,  0,  0,
-    2,  2, 13, 13, 13, 13, 13, 13,  2, 13, 13, 13,  2,  2,  0, 13,
-    0, 13,  0, 13, 13, 13, 13, 13,  1,  1,  1,  1, 12, 12,  2, 15,
-   15, 15, 15, 15, 15, 15, 15, 15, 15,  2,  2,  1,  1,  0,  0, 15,
-   15, 15,  0, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17,  0,  2, 26,
-   26, 26, 26, 26, 26, 26,  2, 12, 12, 12, 12, 12, 12,  2, 12, 12,
-   12,  0, 39, 39, 39, 39, 39,  2,  2,  2, 39, 39, 39,  2, 86, 86,
-   86, 86, 77, 77, 77, 77, 79, 79, 79, 79, 19, 19, 19,  2, 19, 19,
-    2, 19,  2, 19, 19, 19, 19, 19,  2,  2,  2,  2, 19, 19, 60, 60,
-   60, 60, 60,  2,  2,  2, 65, 65, 65, 65, 75, 75, 75, 75, 75, 75,
-    2,  2,  2,  2, 75, 75, 69, 69, 69, 69, 69, 69,  0, 69, 74, 74,
-   74, 74,  2,  2,  2, 74, 12,  2,  2,  2, 84, 84, 84, 84, 84, 84,
-    2,  0, 84, 84,  2,  2,  2,  2, 84, 84, 33, 33, 33,  2, 68, 68,
-   68, 68, 68, 68, 68,  2, 68, 68,  2,  2, 92, 92, 92, 92, 92, 92,
-   92,  2,  2,  2,  2, 92, 87, 87, 87, 87, 87, 87, 87,  2, 19,  9,
-   19, 19, 19, 19,  0,  0, 87, 87,  2,  2,  2,  2,  2, 12,  2,  2,
-    2,  4, 14,  2, 14,  2, 14, 14,  2, 14, 14,  2, 14, 14,  2,  2,
-    2,  3,  3,  3,  0,  0,  2,  2,  3,  3,  1,  1,  6,  6,  3,  2,
-    3,  3,  3,  2,  2,  0,  2,  0,  0,  0,  0,  0, 17, 17, 17, 17,
-    0,  0,  2,  2, 12, 12, 49, 49, 49, 49,  2, 49, 49, 49, 49, 49,
-   49,  2, 49, 49,  2, 49, 49, 49,  2,  2,  9,  2,  2,  2,  0,  1,
-    2,  2, 71, 71, 71, 71, 71,  2,  2,  2, 67, 67, 67, 67, 67,  2,
-    2,  2, 42, 42, 42, 42,  2, 42, 42, 42, 41, 41, 41, 41, 41, 41,
-   41,  2,118,118,118,118,118,118,118,  2, 53, 53, 53, 53, 53, 53,
-    2, 53, 59, 59, 59, 59, 59, 59,  2,  2, 40, 40, 40, 40, 51, 51,
-   51, 51, 50, 50, 50, 50, 50, 50,  2,  2,135,135,135,135,106,106,
-  106,106,104,104,104,104,  2,  2,  2,104,161,161,161,161,161,161,
-  161,  2,161,161,  2,161,161,  2,  2,  2,110,110,110,110,110,110,
-  110,  2,110,110,  2,  2, 19,  2, 19, 19, 47, 47, 47, 47, 47, 47,
-    2,  2, 47,  2, 47, 47, 47, 47,  2, 47, 47,  2,  2,  2, 47,  2,
-    2, 47, 81, 81, 81, 81, 81, 81,  2, 81,120,120,120,120,116,116,
-  116,116,116,116,116,  2,  2,  2,  2,116,128,128,128,128,128,128,
-  128,  2,128,128,  2,  2,  2,  2,  2,128, 66, 66, 66, 66,  2,  2,
-    2, 66, 72, 72, 72, 72, 72, 72,  2,  2,  2,  2,  2, 72, 98, 98,
-   98, 98, 97, 97, 97, 97,  2,  2, 97, 97, 57, 57, 57, 57,  2, 57,
-   57,  2,  2, 57, 57, 57, 57, 57,  2,  2, 57, 57, 57,  2,  2,  2,
-    2, 57, 57,  2,  2,  2, 88, 88, 88, 88,117,117,117,117,112,112,
-  112,112,112,112,112,  2,  2,  2,  2,112, 78, 78, 78, 78, 78, 78,
-    2,  2,  2, 78, 78, 78, 83, 83, 83, 83, 83, 83,  2,  2, 82, 82,
-   82, 82, 82, 82, 82,  2,122,122,122,122,122,122,  2,  2,  2,122,
-  122,122,122,  2,  2,  2, 89, 89, 89, 89, 89,  2,  2,  2,130,130,
-  130,130,130,130,130,  2,  2,  2,130,130,144,144,144,144,144,144,
-    2,  2,156,156,156,156,156,156,  2,156,156,156,  2,  2,  2,  3,
-    3,  3,147,147,147,147,148,148,148,148,148,148,  2,  2,158,158,
-  158,158,158,158,  2,  2,153,153,153,153,149,149,149,149,149,149,
-  149,  2, 94, 94, 94, 94, 94, 94,  2,  2,  2,  2, 94, 94,  2,  2,
-    2, 94, 85, 85, 85, 85, 85, 85, 85,  2,  2, 85,  2,  2,101,101,
-  101,101,101,  2,  2,  2,101,101,  2,  2, 96, 96, 96, 96, 96,  2,
-   96, 96,111,111,111,111,111,111,111,  2,100,100,100,100,108,108,
-  108,108,108,108,  2,108,108,108,  2,  2,129,129,129,129,129,129,
-  129,  2,129,  2,129,129,129,129,  2,129,129,129,  2,  2,109,109,
-  109,109,109,109,109,  2,109,109,  2,  2,107,107,107,107,  2,107,
-  107,107,107,  2,  2,107,107,  2,107,107,107,107,  2,  1,107,107,
-    2,  2,107,  2,  2,  2,  2,  2,  2,107,  2,  2,107,107,137,137,
-  137,137,  2,137,137,137,137,137,  2,  2,124,124,124,124,124,124,
-    2,  2,123,123,123,123,123,123,  2,  2,114,114,114,114,114,  2,
-    2,  2,114,114,  2,  2,102,102,102,102,102,102,  2,  2,126,126,
-  126,126,126,126,126,  2,  2,126,126,126,142,142,142,142,125,125,
-  125,125,125,125,125,  2,  2,  2,  2,125,154,154,154,154,154,154,
-  154,  2,  2,154,  2,  2,  2,154,154,  2,154,154,  2,154,154,  2,
-    2,154,154,154,  2,  2,150,150,150,150,  2,  2,150,150,150,  2,
-    2,  2,141,141,141,141,140,140,140,140,140,140,140,  2,121,121,
-  121,121,121,  2,  2,  2,  7,  7,  2,  2,133,133,133,133,133,  2,
-  133,133,133,133,133,  2,133,133,  2,  2,133,  2,  2,  2,134,134,
-  134,134,  2,  2,134,134,  2,134,134,134,134,134,134,  2,138,138,
-  138,138,138,138,138,  2,138,138,  2,138,  2,  2,138,  2,138,138,
-    2,  2,143,143,143,143,143,143,  2,143,143,  2,143,143,143,143,
-  143,  2,143,  2,  2,  2,143,143,  2,  2,145,145,145,145,145,  2,
-    2,  2,163,163,163,163,163,  2,163,163,163,163,163,  2,  2,  2,
-  163,163,163,163,  2,  2, 86,  2,  2,  2, 63, 63, 63, 63, 63, 63,
-    2,  2, 63, 63, 63,  2, 63,  2,  2,  2,157,157,157,157,157,157,
-  157,  2, 80, 80, 80, 80, 80, 80,  2,  2,127,127,127,127,127,127,
-  127,  2, 79,  2,  2,  2,115,115,115,115,115,115,115,  2,115,115,
-    2,  2,  2,  2,115,115,159,159,159,159,159,159,159,  2,159,159,
-    2,  2,103,103,103,103,103,103,  2,  2,119,119,119,119,119,119,
-    2,  2,119,119,  2,119,  2,119,119,119,146,146,146,146,146,146,
-  146,  2, 99, 99, 99, 99, 99, 99, 99,  2,  2,  2,  2, 99,136,139,
-   13, 13,155,  2,  2,  2,136,136,136,136,155,155,155,155,155,155,
-    2,  2,136,  2,  2,  2,  2, 17, 17, 17,  2, 17, 17,  2, 17, 15,
-   15, 15, 17, 17, 17,  2,  2,  2, 15,  2,  2, 17,  2,  2,139,139,
-  139,139,105,105,105,105,105,105,105,  2,105,  2,  2,  2,105,105,
-    2,  2,  1,  1,  2,  2,  0,  0,  0,  1,  0,  1,  1,  1,  0,  0,
-    1,  1,  2,  2,  0,  2,  2,  0,  0,  2,  0,  2,  0,  2,131,131,
-  131,131,  2,  2,  2,131,  2,131,131,131, 56, 56, 56,  2, 56,  2,
-    2, 56, 56, 56,  2, 56, 56,  2, 56, 56,  6,  6,  2,  2,  2,  2,
-    2,  6,151,151,151,151,151,  2,  2,  2,151,151,  2,  2,  2,  2,
-  151,151,160,160,160,160,160,160,160,  2,152,152,152,152,152,152,
-    2,  2,  2,  2,  2,152,164,164,164,164,164,164,  2,  2,  2, 30,
-   30,  2,113,113,113,113,113,  2,  2,113,113,113,113,  2,132,132,
-  132,132,132,132,  2,  2,  2,  2,132,132,  2,  3,  3,  2,  3,  2,
-    2,  3,  2,  3,  2,  3,  2,  2,  3,  2,  3,  2,  3,  2,  3,  3,
-    2,  3, 15,  0,  0,  2, 13,  2,  2,  2, 13, 13, 13,  2,  2,  0,
-    2,  2,  0,  1,  2,  3,  4,  5,  6,  7,  8,  9,  9,  9,  9, 10,
-    9, 11, 12, 13,  9,  9,  9, 14,  9,  9, 15,  9,  9,  9,  9,  9,
-    9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,
-    9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,
-    9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,
-    9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,
-    9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,
-    9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9, 16, 17,
-    9,  9,  9,  9,  9,  9,  9,  9,  9,  9, 18, 19, 20,  9, 21,  9,
-    9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,
-    9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,
-    9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,
-    9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,
-    9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,
-    9,  9,  9,  9,  9,  9,  9,  9,  9,  9, 22,  9,  9,  9,  9,  9,
+   17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17,177,  0,  1,  2,  3,
+    3,  3,  3,  3,  3,  3,  3,  3,  3,  3,  3,  3,  3,  3,  3,  3,
+    4,  3,  3,  3,  3,  3,  5,  3,  3,  3,  3,  3,  6,  7,  8,  3,
+    3,  3,  3,  3,  9, 10, 11, 12, 13,  3,  3,  3,  3,  3,  3,  3,
+    3, 14,  3, 15,  3,  3,  3,  3,  3,  3, 16, 17, 18, 19, 20, 21,
+    3,  3,  3, 22, 23, 24,  3,  3,  3,  3,  3,  3, 25,  3,  3,  3,
+    3,  3,  3,  3,  3, 26,  3,  3, 27, 28,  0,  1,  0,  0,  0,  0,
+    0,  1,  0,  2,  0,  0,  0,  3,  0,  0,  0,  3,  0,  0,  0,  0,
+    0,  4,  0,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+    0,  0,  0,  6,  0,  0,  0,  7,  0,  0,  0,  0,  0,  0,  0,  0,
+    0,  0,  0,  8,  9,  0,  0,  0,  0,  0,  0,  9,  0,  9,  0,  0,
+    0,  0,  0,  0,  0, 10, 11, 12, 13,  0,  0, 14, 15, 16,  6,  0,
+   17, 18, 19, 19, 19, 20, 21, 22, 23, 24, 19, 25,  0, 26, 27, 19,
+   19, 28, 29, 30,  0, 31,  0,  0,  0,  8,  0,  0,  0,  0,  0,  0,
+    0, 19, 28,  0, 32, 33,  9, 34, 35, 19,  0,  0, 36, 37, 38, 39,
+   40, 19,  0, 41, 42, 43, 44, 31,  0,  1, 45, 42,  0,  0,  0,  0,
+    0, 32, 14, 14,  0,  0,  0,  0, 14,  0,  0, 46, 47, 47, 47, 47,
+   48, 49, 47, 47, 47, 47, 50, 51, 52, 53, 43, 21,  0,  0,  0,  0,
+    0,  0,  0, 54,  6, 55,  0, 14, 19,  1,  0,  0,  0,  0, 56, 57,
+    0,  0,  0,  0,  0, 19, 58, 31,  0,  0,  0,  0,  0,  0,  0, 59,
+   14,  0,  0,  0,  0,  1,  0,  2,  0,  0,  0,  3,  0,  0,  0, 60,
+   61,  0,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0,  0,  0,  2,  3,
+    0,  4,  5,  0,  0,  6,  0,  0,  0,  7,  0,  0,  0,  1,  1,  0,
+    0,  8,  9,  0,  8,  9,  0,  0,  0,  0,  8,  9, 10, 11, 12,  0,
+    0,  0, 13,  0,  0,  0,  0, 14, 15, 16, 17,  0,  0,  0,  1,  0,
+    0, 18, 19,  0,  0,  0, 20,  0,  0,  0,  1,  1,  1,  1,  0,  1,
+    1,  1,  1,  1,  1,  1,  0,  8, 21,  9,  0,  0, 22,  0,  0,  0,
+    0,  1,  0, 23, 24, 25,  0,  0, 26,  0,  0,  0,  8, 21, 27,  0,
+    1,  0,  0,  1,  1,  1,  1,  0,  1, 28, 29, 30,  0, 31, 32, 20,
+    1,  1,  0,  0,  0,  8, 21,  9,  1,  4,  5,  0,  0,  0, 33,  9,
+    0,  1,  1,  1,  0,  8, 21, 21, 21, 21, 34,  1, 35, 21, 21, 21,
+    9, 36,  0,  0, 37, 38,  1,  0, 39,  0,  0,  0,  1,  0,  1,  0,
+    0,  0,  0,  8, 21,  9,  1,  0,  0,  0, 40,  0,  8, 21, 21, 21,
+   21, 21, 21, 21, 21,  9,  0,  1,  1,  1,  1,  8, 21, 21, 21,  9,
+    0,  0,  0, 41,  0, 42, 43,  0,  0,  0,  1, 44,  0,  0,  0, 45,
+    8,  9,  1,  0,  0,  0,  8, 21, 21, 21,  9,  0,  1,  0,  1,  1,
+    8, 21, 21,  9,  0,  4,  5,  8,  9,  1,  0,  0,  0,  1,  2,  3,
+    4,  5,  5,  5,  5,  5,  6,  7,  7,  8,  9, 10, 11, 12, 13, 14,
+   15,  9, 16, 17, 18,  9, 19, 20, 21, 22, 23, 24,  5,  5,  5,  5,
+    5,  5,  5,  5,  5,  5, 25, 26, 27,  5, 28, 29,  5, 30, 31,  9,
     9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,
     9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,
     9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,
@@ -3704,60 +3509,491 @@ _hb_ucd_u8[14752] =
     9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,
     9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,
     9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,
-    9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9, 23, 24,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  2,  3,  4,
-    5,  6,  7,  8,  9, 10, 11, 12,  0,  0, 13, 14, 15, 16, 17, 18,
-   19, 20, 21, 22,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0, 23,  0,  0, 24, 25, 26, 27, 28, 29, 30,  0,  0,
-   31, 32,  0, 33,  0, 34,  0, 35,  0,  0,  0,  0, 36, 37, 38, 39,
+    9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,
+    9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,
+    9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9, 32,  0,  0,  1,
+    2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 14, 15, 16, 17,
+   18, 19, 20, 20, 21, 22, 23, 24, 25, 26, 27, 28,  1, 29, 30, 31,
+   32, 32, 33, 32, 32, 32, 34, 32, 32, 35, 36, 37, 38, 39, 40, 41,
+   42, 43, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44,
+   44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 45, 44, 44, 44, 44,
+   44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 46, 46,
+   46, 46, 47, 48, 49, 50, 51, 52, 53, 54, 17, 17, 17, 17, 17, 17,
+   17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
+   17, 17, 17, 17, 17, 55, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56,
+   56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56,
+   56, 56, 56, 56, 56, 56, 56, 44, 57, 58, 59, 60, 61, 62, 63, 64,
+   65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80,
+   81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 95,
+   95, 96, 97, 98, 56, 56, 56, 56, 56, 56, 56, 56, 56, 99,100,100,
+  100,100,101,100,100,100,100,100,100,100,100,100,100,100,100,100,
+  100,102,103,103,104, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56,105,
+   56, 56, 56, 56, 56, 56,106,106,107,108, 56,109,110,111,112,112,
+  112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,112,
+  112,112,112,112,112,113,112,112,112,114,115,116, 56, 56, 56, 56,
+   56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56,117,118,119,
+  120, 56, 56, 56, 56, 56, 56, 56, 56, 56,121, 56, 56, 56, 56, 56,
+   56, 56, 56, 56, 56, 56, 56, 56, 56, 56,122, 32,123,124,125,126,
+  127,128,129,130,131,132,133,133,134, 56, 56, 56, 56,135,136,137,
+  138, 56,139,140, 56,141,142,143, 56, 56,144,145,146, 56,147,148,
+  149, 32, 32, 32,150,151,152, 32,153,154, 56, 56, 56, 56, 44, 44,
+   44, 44, 44, 44,155, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44,
+   44, 44, 44, 44, 44,156,157, 44, 44, 44, 44, 44, 44, 44, 44, 44,
+   44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44,158, 44, 44, 44,
+   44, 44, 44, 44, 44, 44, 44, 44, 44,159, 44, 44,160, 56, 56, 56,
+   56, 56, 56, 56, 56, 56, 44, 44,161, 56, 56, 56, 56, 56, 44, 44,
+   44,162, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44,
+   44,163, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56,164,165,
+    0,  1,  0,  1,  2,  3,  0,  1,  2,  3,  4,  5,  6,  7,  0,  0,
+    0,  0,  0,  0,  0,  0,  0, 19, 19, 19, 19, 19, 19, 19, 19, 19,
+   19, 19, 19, 19, 19, 19, 19, 19, 19,  0,  0,  0,  0,  0,  0,  0,
+   19,  0,  0,  0,  0,  0, 19, 19, 19, 19, 19, 19, 19,  0, 19,  0,
+    0,  0,  0,  0,  0,  0, 19, 19, 19, 19, 19,  0,  0,  0,  0,  0,
+   26, 26,  0,  0,  0,  0,  1,  1,  1,  1,  1,  1,  1,  1,  9,  9,
+    9,  9,  0,  9,  9,  9,  2,  2,  9,  9,  9,  9,  0,  9,  2,  2,
+    2,  2,  9,  0,  9,  0,  9,  9,  9,  2,  9,  2,  9,  9,  9,  9,
+    9,  9,  9,  9,  9,  9,  9,  9,  2,  9,  9,  9,  9,  9,  9,  9,
+   55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55,  6,  6,
+    6,  6,  6,  6,  6,  6,  6,  6,  6,  6,  6,  1,  1,  6,  2,  4,
+    4,  4,  4,  4,  4,  4,  4,  4,  4,  4,  4,  4,  4,  4,  4,  4,
+    4,  4,  4,  4,  4,  2,  4,  4,  4,  2,  2,  4,  4,  4,  2, 14,
+   14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14,  2,  2,
+    2,  2,  2,  2,  2,  2, 14, 14, 14,  2,  2,  2,  2, 14, 14, 14,
+   14, 14, 14,  2,  2,  2,  3,  3,  3,  3,  3,  0,  3,  3,  3,  3,
+    3,  3,  0,  3,  3,  3,  3,  3,  3,  3,  3,  3,  3,  3,  3,  3,
+    3,  0,  3,  3,  3,  0,  0,  3,  3,  3,  3,  3,  3,  3,  3,  3,
+    3,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  3,  3,  1,  3,
+    3,  3,  3,  3,  3,  3, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
+   37, 37, 37, 37,  2, 37, 37, 37, 37,  2,  2, 37, 37, 37, 38, 38,
+   38, 38, 38, 38, 38, 38, 38, 38,  2,  2,  2,  2,  2,  2, 64, 64,
+   64, 64, 64, 64, 64, 64, 64, 64, 64,  2,  2, 64, 64, 64, 90, 90,
+   90, 90, 90, 90, 90, 90, 90, 90, 90, 90, 90, 90,  2,  2, 90, 90,
+   90, 90, 90, 90, 90,  2, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95,
+   95, 95,  2,  2, 95,  2, 37, 37, 37,  2,  2,  2,  2,  2,  3,  3,
+    3,  3,  3,  3,  3,  2,  3,  3,  2,  2,  2,  2,  2,  3,  3,  3,
+    0,  3,  3,  3,  3,  3,  7,  7,  7,  7,  7,  7,  7,  7,  7,  1,
+    1,  1,  1,  7,  7,  7,  7,  7,  7,  7,  0,  0,  7,  7,  5,  5,
+    5,  5,  2,  5,  5,  5,  5,  5,  5,  5,  5,  2,  2,  5,  5,  2,
+    2,  5,  5,  5,  5,  5,  5,  5,  5,  5,  5,  5,  5,  5,  5,  2,
+    5,  5,  5,  5,  5,  5,  5,  2,  5,  2,  2,  2,  5,  5,  5,  5,
+    2,  2,  5,  5,  5,  5,  5,  2,  2,  5,  5,  5,  5,  2,  2,  2,
+    2,  2,  2,  2,  2,  5,  2,  2,  2,  2,  5,  5,  2,  5,  5,  5,
+    5,  5,  2,  2,  5,  5,  5,  5,  5,  5,  5,  5,  5,  2,  2, 11,
+   11, 11,  2, 11, 11, 11, 11, 11, 11,  2,  2,  2,  2, 11, 11,  2,
+    2, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11,  2,
+   11, 11, 11, 11, 11, 11, 11,  2, 11, 11,  2, 11, 11,  2, 11, 11,
+    2,  2, 11,  2, 11, 11, 11,  2,  2, 11, 11, 11,  2,  2,  2, 11,
+    2,  2,  2,  2,  2,  2,  2, 11, 11, 11, 11,  2, 11,  2,  2,  2,
+    2,  2,  2,  2, 11, 11, 11, 11, 11, 11, 11, 11, 11,  2,  2, 10,
+   10, 10,  2, 10, 10, 10, 10, 10, 10, 10, 10, 10,  2, 10, 10, 10,
+    2, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10,  2,
+   10, 10, 10, 10, 10, 10, 10,  2, 10, 10,  2, 10, 10, 10, 10, 10,
+    2,  2, 10, 10, 10, 10, 10, 10,  2, 10, 10, 10,  2,  2, 10,  2,
+    2,  2,  2,  2,  2,  2, 10, 10, 10, 10,  2,  2, 10, 10, 10, 10,
+    2,  2,  2,  2,  2,  2,  2, 10, 10, 10, 10, 10, 10, 10,  2, 21,
+   21, 21,  2, 21, 21, 21, 21, 21, 21, 21, 21,  2,  2, 21, 21,  2,
+    2, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,  2,
+   21, 21, 21, 21, 21, 21, 21,  2, 21, 21,  2, 21, 21, 21, 21, 21,
+    2,  2, 21, 21, 21, 21, 21,  2,  2, 21, 21, 21,  2,  2,  2,  2,
+    2,  2,  2, 21, 21, 21,  2,  2,  2,  2, 21, 21,  2, 21, 21, 21,
+   21, 21,  2,  2, 21, 21,  2,  2, 22, 22,  2, 22, 22, 22, 22, 22,
+   22,  2,  2,  2, 22, 22, 22,  2, 22, 22, 22, 22,  2,  2,  2, 22,
+   22,  2, 22,  2, 22, 22,  2,  2,  2, 22, 22,  2,  2,  2, 22, 22,
+   22, 22, 22, 22, 22, 22, 22, 22,  2,  2,  2,  2, 22, 22, 22,  2,
+    2,  2,  2,  2,  2, 22,  2,  2,  2,  2,  2,  2, 22, 22, 22, 22,
+   22,  2,  2,  2,  2,  2, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23,
+   23, 23, 23,  2, 23, 23, 23,  2, 23, 23, 23, 23, 23, 23, 23, 23,
+    2,  2, 23, 23, 23, 23, 23,  2, 23, 23, 23, 23,  2,  2,  2,  2,
+    2,  2,  2, 23, 23,  2, 23, 23, 23,  2,  2, 23,  2,  2, 23, 23,
+   23, 23,  2,  2, 23, 23,  2,  2,  2,  2,  2,  2,  2, 23, 16, 16,
+   16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16,  2, 16, 16, 16,  2,
+   16, 16, 16, 16, 16, 16, 16, 16, 16, 16,  2, 16, 16, 16, 16, 16,
+    2,  2, 16, 16, 16, 16, 16,  2, 16, 16, 16, 16,  2,  2,  2,  2,
+    2,  2,  2, 16, 16,  2, 16, 16, 16, 16,  2,  2, 16, 16,  2, 16,
+   16, 16,  2,  2,  2,  2, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
+   20, 20, 20,  2, 20, 20, 20,  2, 20, 20, 20, 20, 20, 20,  2,  2,
+    2,  2, 20, 20, 20, 20, 20, 20, 20, 20,  2,  2, 20, 20,  2, 36,
+   36, 36,  2, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36,
+   36, 36, 36, 36, 36,  2,  2,  2, 36, 36, 36, 36, 36, 36, 36, 36,
+    2, 36, 36, 36, 36, 36, 36, 36, 36, 36,  2, 36,  2,  2,  2,  2,
+   36,  2,  2,  2,  2, 36, 36, 36, 36, 36, 36,  2, 36,  2,  2,  2,
+    2,  2,  2,  2, 36, 36,  2,  2, 36, 36, 36,  2,  2,  2,  2, 24,
+   24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
+   24,  2,  2,  2,  2,  0, 24, 24, 24, 24,  2,  2,  2,  2,  2, 18,
+   18,  2, 18,  2, 18, 18, 18, 18, 18,  2, 18, 18, 18, 18, 18, 18,
+   18, 18, 18, 18, 18, 18, 18, 18, 18, 18,  2, 18,  2, 18, 18, 18,
+   18, 18, 18, 18,  2,  2, 18, 18, 18, 18, 18,  2, 18,  2, 18, 18,
+   18, 18, 18, 18, 18,  2, 18, 18,  2,  2, 18, 18, 18, 18, 25, 25,
+   25, 25, 25, 25, 25, 25,  2, 25, 25, 25, 25, 25, 25, 25, 25, 25,
+   25, 25, 25,  2,  2,  2, 25, 25, 25, 25, 25,  2, 25, 25, 25, 25,
+   25, 25, 25,  0,  0,  0,  0, 25, 25,  2,  2,  2,  2,  2, 33, 33,
+   33, 33, 33, 33, 33, 33,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,
+    8,  8,  8,  8,  2,  8,  2,  2,  2,  2,  2,  8,  2,  2,  8,  8,
+    8,  0,  8,  8,  8,  8, 12, 12, 12, 12, 12, 12, 12, 12, 30, 30,
+   30, 30, 30, 30, 30, 30, 30,  2, 30, 30, 30, 30,  2,  2, 30, 30,
+   30, 30, 30, 30, 30,  2, 30, 30, 30,  2,  2, 30, 30, 30, 30, 30,
+   30, 30, 30,  2,  2,  2, 30, 30,  2,  2,  2,  2,  2,  2, 29, 29,
+   29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29,  2,  2, 28, 28,
+   28, 28, 28, 28, 28, 28, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
+   34, 34, 34,  2,  2,  2, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35,
+   35,  0,  0,  0, 35, 35, 35,  2,  2,  2,  2,  2,  2,  2, 45, 45,
+   45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45,  2,  2,  2,  2,
+    2,  2,  2,  2,  2, 45, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44,
+   44, 44, 44,  0,  0,  2, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43,
+   43, 43,  2,  2,  2,  2, 46, 46, 46, 46, 46, 46, 46, 46, 46, 46,
+   46, 46, 46,  2, 46, 46, 46,  2, 46, 46,  2,  2,  2,  2, 31, 31,
+   31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31,  2,  2, 31, 31,
+    2,  2,  2,  2,  2,  2, 32, 32,  0,  0, 32,  0, 32, 32, 32, 32,
+   32, 32, 32, 32, 32, 32, 32, 32,  2,  2,  2,  2,  2,  2, 32,  2,
+    2,  2,  2,  2,  2,  2, 32, 32, 32,  2,  2,  2,  2,  2, 28, 28,
+   28, 28, 28, 28,  2,  2, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48,
+   48, 48, 48, 48, 48,  2, 48, 48, 48, 48,  2,  2,  2,  2, 48,  2,
+    2,  2, 48, 48, 48, 48, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
+   52, 52, 52, 52,  2,  2, 52, 52, 52, 52, 52,  2,  2,  2, 58, 58,
+   58, 58, 58, 58, 58, 58, 58, 58, 58, 58,  2,  2,  2,  2, 58, 58,
+    2,  2,  2,  2,  2,  2, 58, 58, 58,  2,  2,  2, 58, 58, 54, 54,
+   54, 54, 54, 54, 54, 54, 54, 54, 54, 54,  2,  2, 54, 54, 91, 91,
+   91, 91, 91, 91, 91, 91, 91, 91, 91, 91, 91, 91, 91,  2, 91, 91,
+   91, 91, 91,  2,  2, 91, 91, 91,  2,  2,  2,  2,  2,  2, 91, 91,
+   91, 91, 91, 91,  2,  2,  1,  1,  1,  1,  1,  1,  1,  2, 62, 62,
+   62, 62, 62, 62, 62, 62, 62, 62, 62, 62, 62,  2, 62, 62, 76, 76,
+   76, 76, 76, 76, 76, 76, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93,
+   93, 93,  2,  2,  2,  2,  2,  2,  2,  2, 93, 93, 93, 93, 70, 70,
+   70, 70, 70, 70, 70, 70,  2,  2,  2, 70, 70, 70, 70, 70, 70, 70,
+    2,  2,  2, 70, 70, 70, 73, 73, 73, 73, 73, 73, 73, 73,  6,  6,
+    6,  2,  2,  2,  2,  2,  8,  8,  8,  2,  2,  8,  8,  8,  1,  1,
+    1,  0,  1,  1,  1,  1,  1,  0,  1,  1,  1,  1,  1,  1,  1,  0,
+    0,  0,  0,  1,  0,  0,  0,  0,  0,  0,  1,  0,  0,  0,  1,  1,
+    0,  2,  2,  2,  2,  2, 19, 19, 19, 19, 19, 19,  9,  9,  9,  9,
+    9,  6, 19, 19, 19, 19, 19, 19, 19, 19, 19,  9,  9,  9,  9,  9,
+   19, 19, 19, 19,  9,  9,  9,  9,  9, 19, 19, 19, 19, 19,  6, 19,
+   19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,  9,  9,  9,
+    9,  9,  9,  9,  2,  2,  2,  9,  2,  9,  2,  9,  2,  9,  9,  9,
+    9,  9,  9,  2,  9,  9,  9,  9,  9,  9,  2,  2,  9,  9,  9,  9,
+    9,  9,  2,  9,  9,  9,  2,  2,  9,  9,  9,  2,  9,  9,  9,  9,
+    9,  9,  9,  9,  9,  2,  0,  0,  0,  0,  1,  1,  0,  0,  0,  0,
+    0,  0,  0,  2,  0,  0,  0, 19,  2,  2,  0,  0,  0,  0,  0,  0,
+    0,  0,  0,  0,  0, 19,  0,  0,  0,  0,  0,  0,  0,  2, 19, 19,
+   19, 19, 19,  2,  2,  2,  0,  2,  2,  2,  2,  2,  2,  2,  1,  2,
+    2,  2,  2,  2,  2,  2,  0,  0,  0,  0,  0,  0,  9,  0,  0,  0,
+   19, 19,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 19,  0, 19,  0,
+    0,  0,  2,  2,  2,  2,  0,  0,  2,  2,  2,  2,  2,  2,  0,  0,
+    0,  2,  2,  2,  2,  2, 27, 27, 27, 27, 27, 27, 27, 27,  0,  0,
+    0,  0,  2,  2,  0,  0,  0,  0,  0,  0,  0,  0,  2,  0, 56, 56,
+   56, 56, 56, 56, 56, 56, 55, 55, 55, 55,  2,  2,  2,  2,  2, 55,
+   55, 55, 55, 55, 55, 55, 61, 61, 61, 61, 61, 61, 61, 61,  2,  2,
+    2,  2,  2,  2,  2, 61, 61,  2,  2,  2,  2,  2,  2,  2,  0,  0,
+    0,  0,  0,  0,  2,  2, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
+    2, 13, 13, 13, 13, 13, 13, 13, 13, 13,  2,  2,  2,  2, 13, 13,
+   13, 13, 13, 13,  2,  2,  0,  0,  0,  0,  0, 13,  0, 13,  0, 13,
+   13, 13, 13, 13, 13, 13, 13, 13,  1,  1,  1,  1, 12, 12, 13, 13,
+   13, 13,  0,  0,  0,  0,  2, 15, 15, 15, 15, 15, 15, 15, 15, 15,
+   15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15,  2,  2,  1,
+    1,  0,  0, 15, 15, 15,  0, 17, 17, 17, 17, 17, 17, 17, 17, 17,
+   17, 17, 17, 17, 17, 17, 17, 17, 17,  0,  0, 17, 17, 17,  2,  2,
+    2,  2,  2, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26,  2, 12,
+   12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12,  2,  2,  2,
+    2,  2,  2,  2,  2,  0, 12, 12, 12, 12, 12, 12, 12,  0, 17, 17,
+   17, 17, 17, 17, 17,  0, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39,
+   39, 39, 39,  2,  2,  2, 39, 39, 39, 39, 39, 39, 39,  2, 86, 86,
+   86, 86, 86, 86, 86, 86, 77, 77, 77, 77, 77, 77, 77, 77, 77, 77,
+   77, 77,  2,  2,  2,  2, 79, 79, 79, 79, 79, 79, 79, 79,  0,  0,
+   19, 19, 19, 19, 19, 19,  0,  0,  0, 19, 19, 19, 19, 19, 19, 19,
+   19, 19, 19, 19,  2,  2, 19, 19,  2, 19,  2, 19, 19, 19,  2,  2,
+   19, 19, 19, 19, 19, 19, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60,
+   60, 60, 60,  2,  2,  2, 65, 65, 65, 65, 65, 65, 65, 65, 75, 75,
+   75, 75, 75, 75, 75, 75, 75, 75, 75, 75, 75, 75,  2,  2,  2,  2,
+    2,  2,  2,  2, 75, 75, 75, 75,  2,  2,  2,  2,  2,  2, 69, 69,
+   69, 69, 69, 69, 69, 69, 69, 69, 69, 69, 69, 69,  0, 69, 74, 74,
+   74, 74, 74, 74, 74, 74, 74, 74, 74, 74,  2,  2,  2,  2,  2,  2,
+    2,  2,  2,  2,  2, 74, 12, 12, 12, 12, 12,  2,  2,  2, 84, 84,
+   84, 84, 84, 84, 84, 84, 84, 84, 84, 84, 84, 84,  2,  0, 84, 84,
+    2,  2,  2,  2, 84, 84, 33, 33, 33, 33, 33, 33, 33,  2, 68, 68,
+   68, 68, 68, 68, 68, 68, 68, 68, 68, 68, 68, 68, 68,  2, 68, 68,
+   68, 68, 68, 68,  2,  2, 68, 68,  2,  2, 68, 68, 68, 68, 92, 92,
+   92, 92, 92, 92, 92, 92, 92, 92, 92,  2,  2,  2,  2,  2,  2,  2,
+    2, 92, 92, 92, 92, 92, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87,
+   87, 87, 87, 87, 87,  2,  2, 30, 30, 30, 30, 30, 30,  2, 19, 19,
+   19,  0, 19, 19, 19, 19, 19, 19, 19, 19, 19,  9, 19, 19, 19, 19,
+    0,  0,  2,  2,  2,  2, 87, 87, 87, 87, 87, 87,  2,  2, 87, 87,
+    2,  2,  2,  2,  2,  2, 12, 12, 12, 12,  2,  2,  2,  2,  2,  2,
+    2, 12, 12, 12, 12, 12, 13, 13,  2,  2,  2,  2,  2,  2, 19, 19,
+   19, 19, 19, 19, 19,  2,  2,  2,  2,  4,  4,  4,  4,  4,  2,  2,
+    2,  2,  2, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14,  2, 14, 14,
+   14, 14, 14,  2, 14,  2, 14, 14,  2, 14, 14,  2, 14, 14,  3,  3,
+    3,  2,  2,  2,  2,  2,  2,  2,  2,  3,  3,  3,  3,  3,  3,  3,
+    3,  3,  3,  3,  0,  0,  2,  2,  3,  3,  3,  3,  3,  3,  2,  2,
+    2,  2,  2,  2,  2,  3,  1,  1,  1,  1,  1,  1,  6,  6,  0,  0,
+    0,  2,  0,  0,  0,  0,  0,  0,  0,  0,  2,  2,  2,  2,  3,  3,
+    3,  3,  3,  2,  3,  3,  3,  3,  3,  3,  3,  2,  2,  0,  2,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 17, 17, 17, 17,
+   17, 17, 17, 17,  0,  0,  2,  2, 12, 12, 12, 12, 12, 12,  2,  2,
+   12, 12, 12,  2,  2,  2,  2,  0,  0,  0,  0,  0,  2,  2, 49, 49,
+   49, 49, 49, 49, 49, 49, 49, 49, 49, 49,  2, 49, 49, 49, 49, 49,
+   49, 49, 49, 49, 49,  2, 49, 49, 49,  2, 49, 49,  2, 49, 49, 49,
+   49, 49, 49, 49,  2,  2, 49, 49, 49,  2,  2,  2,  2,  2,  0,  0,
+    0,  2,  2,  2,  2,  0,  0,  0,  0,  0,  2,  2,  2,  0,  0,  0,
+    0,  0,  0,  2,  2,  2,  9,  2,  2,  2,  2,  2,  2,  2,  0,  0,
+    0,  0,  0,  1,  2,  2, 71, 71, 71, 71, 71, 71, 71, 71, 71, 71,
+   71, 71, 71,  2,  2,  2, 67, 67, 67, 67, 67, 67, 67, 67, 67,  2,
+    2,  2,  2,  2,  2,  2,  1,  0,  0,  0,  0,  0,  0,  0, 42, 42,
+   42, 42, 42, 42, 42, 42, 42, 42, 42, 42,  2,  2,  2,  2,  2,  2,
+    2,  2,  2, 42, 42, 42, 41, 41, 41, 41, 41, 41, 41, 41, 41, 41,
+   41,  2,  2,  2,  2,  2,118,118,118,118,118,118,118,118,118,118,
+  118,  2,  2,  2,  2,  2, 53, 53, 53, 53, 53, 53, 53, 53, 53, 53,
+   53, 53, 53, 53,  2, 53, 59, 59, 59, 59, 59, 59, 59, 59, 59, 59,
+   59, 59,  2,  2,  2,  2, 59, 59, 59, 59, 59, 59,  2,  2, 40, 40,
+   40, 40, 40, 40, 40, 40, 51, 51, 51, 51, 51, 51, 51, 51, 50, 50,
+   50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50,  2,  2, 50, 50,
+    2,  2,  2,  2,  2,  2,135,135,135,135,135,135,135,135,135,135,
+  135,135,  2,  2,  2,  2,106,106,106,106,106,106,106,106,104,104,
+  104,104,104,104,104,104,104,104,104,104,  2,  2,  2,  2,  2,  2,
+    2,  2,  2,  2,  2,104,161,161,161,161,161,161,161,161,161,161,
+  161,  2,161,161,161,161,161,161,161,  2,161,161,  2,161,161,161,
+    2,161,161,161,161,161,161,161,  2,161,161,  2,  2,  2,170,170,
+  170,170,170,170,170,170,170,170,170,170,  2,  2,  2,  2,110,110,
+  110,110,110,110,110,110,110,110,110,110,110,110,110,  2,110,110,
+  110,110,110,110,  2,  2, 19, 19, 19, 19, 19, 19,  2, 19, 19,  2,
+   19, 19, 19, 19, 19, 19, 19, 19, 19,  2,  2,  2,  2,  2, 47, 47,
+   47, 47, 47, 47,  2,  2, 47,  2, 47, 47, 47, 47, 47, 47, 47, 47,
+   47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47,  2, 47, 47,  2,
+    2,  2, 47,  2,  2, 47, 81, 81, 81, 81, 81, 81, 81, 81, 81, 81,
+   81, 81, 81, 81,  2, 81,120,120,120,120,120,120,120,120,116,116,
+  116,116,116,116,116,116,116,116,116,116,116,116,116,  2,  2,  2,
+    2,  2,  2,  2,  2,116,128,128,128,128,128,128,128,128,128,128,
+  128,  2,128,128,  2,  2,  2,  2,  2,128,128,128,128,128, 66, 66,
+   66, 66, 66, 66, 66, 66, 66, 66, 66, 66,  2,  2,  2, 66, 72, 72,
+   72, 72, 72, 72, 72, 72, 72, 72,  2,  2,  2,  2,  2, 72, 98, 98,
+   98, 98, 98, 98, 98, 98, 97, 97, 97, 97, 97, 97, 97, 97,  2,  2,
+    2,  2, 97, 97, 97, 97,  2,  2, 97, 97, 97, 97, 97, 97, 57, 57,
+   57, 57,  2, 57, 57,  2,  2,  2,  2,  2, 57, 57, 57, 57, 57, 57,
+   57, 57,  2, 57, 57, 57,  2, 57, 57, 57, 57, 57, 57, 57, 57, 57,
+   57, 57, 57, 57, 57, 57, 57, 57, 57, 57, 57, 57,  2,  2, 57, 57,
+   57,  2,  2,  2,  2, 57, 57,  2,  2,  2,  2,  2,  2,  2, 88, 88,
+   88, 88, 88, 88, 88, 88,117,117,117,117,117,117,117,117,112,112,
+  112,112,112,112,112,112,112,112,112,112,112,112,112,  2,  2,  2,
+    2,112,112,112,112,112, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78,
+   78, 78, 78, 78,  2,  2,  2, 78, 78, 78, 78, 78, 78, 78, 83, 83,
+   83, 83, 83, 83, 83, 83, 83, 83, 83, 83, 83, 83,  2,  2, 82, 82,
+   82, 82, 82, 82, 82, 82, 82, 82, 82,  2,  2,  2,  2,  2,122,122,
+  122,122,122,122,122,122,122,122,  2,  2,  2,  2,  2,  2,  2,122,
+  122,122,122,  2,  2,  2,  2,122,122,122,122,122,122,122, 89, 89,
+   89, 89, 89, 89, 89, 89, 89,  2,  2,  2,  2,  2,  2,  2,130,130,
+  130,130,130,130,130,130,130,130,130,  2,  2,  2,  2,  2,  2,  2,
+  130,130,130,130,130,130,144,144,144,144,144,144,144,144,144,144,
+    2,  2,  2,  2,  2,  2,165,165,165,165,165,165,165,165,165,165,
+  165,165,165,165,  2,  2,  2,165,165,165,165,165,165,165,  2,  2,
+    2,  2,  2,  2,165,165,156,156,156,156,156,156,156,156,156,156,
+    2,156,156,156,  2,  2,156,156,  2,  2,  2,  2,  2,  2,  2,  2,
+    3,  3,  3,  2,  2,  2,  2,  2,  2,  2,  3,  3,  3,  3,147,147,
+  147,147,147,147,147,147,148,148,148,148,148,148,148,148,148,148,
+    2,  2,  2,  2,  2,  2,158,158,158,158,158,158,158,158,158,158,
+    2,  2,  2,  2,  2,  2,153,153,153,153,153,153,153,153,153,153,
+  153,153,  2,  2,  2,  2,149,149,149,149,149,149,149,149,149,149,
+  149,149,149,149,149,  2, 94, 94, 94, 94, 94, 94, 94, 94, 94, 94,
+   94, 94, 94, 94,  2,  2,  2,  2, 94, 94, 94, 94, 94, 94,  2,  2,
+    2,  2,  2,  2,  2, 94, 85, 85, 85, 85, 85, 85, 85, 85, 85, 85,
+   85,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2, 85,  2,  2,101,101,
+  101,101,101,101,101,101,101,  2,  2,  2,  2,  2,  2,  2,101,101,
+    2,  2,  2,  2,  2,  2, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96,
+   96, 96, 96,  2, 96, 96,111,111,111,111,111,111,111,111,111,111,
+  111,111,111,111,111,  2,100,100,100,100,100,100,100,100,  2, 36,
+   36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36,  2,  2,  2,108,108,
+  108,108,108,108,108,108,108,108,  2,108,108,108,108,108,108,108,
+    2,  2,  2,  2,  2,  2,129,129,129,129,129,129,129,  2,129,  2,
+  129,129,129,129,  2,129,129,129,129,129,129,129,129,129,129,129,
+  129,129,129,129,  2,129,129,129,  2,  2,  2,  2,  2,  2,109,109,
+  109,109,109,109,109,109,109,109,109,  2,  2,  2,  2,  2,109,109,
+    2,  2,  2,  2,  2,  2,107,107,107,107,  2,107,107,107,107,107,
+  107,107,107,  2,  2,107,107,  2,  2,107,107,107,107,107,107,107,
+  107,107,107,107,107,107,107,  2,107,107,107,107,107,107,107,  2,
+  107,107,  2,107,107,107,107,107,  2,  1,107,107,107,107,107,  2,
+    2,107,107,107,  2,  2,107,  2,  2,  2,  2,  2,  2,107,  2,  2,
+    2,  2,  2,107,107,107,107,107,107,107,  2,  2,107,107,107,107,
+  107,107,107,  2,  2,  2,171,171,171,171,171,171,171,171,171,171,
+    2,171,  2,  2,171,  2,171,171,171,171,171,171,  2,171,171,  2,
+  171,  2,  2,171,  2,171,171,171,171,  2,171,171,171,171,171,  2,
+    2,  2,  2,  2,  2,  2,  2,171,171,  2,  2,  2,  2,  2,137,137,
+  137,137,137,137,137,137,137,137,137,137,  2,137,137,137,137,137,
+    2,  2,  2,  2,  2,  2,124,124,124,124,124,124,124,124,124,124,
+    2,  2,  2,  2,  2,  2,123,123,123,123,123,123,123,123,123,123,
+  123,123,123,123,  2,  2,114,114,114,114,114,114,114,114,114,114,
+  114,114,114,  2,  2,  2,114,114,  2,  2,  2,  2,  2,  2, 32, 32,
+   32, 32, 32,  2,  2,  2,102,102,102,102,102,102,102,102,102,102,
+    2,  2,  2,  2,  2,  2, 33, 33, 33, 33,  2,  2,  2,  2,126,126,
+  126,126,126,126,126,126,126,126,126,  2,  2,126,126,126,126,126,
+  126,126,  2,  2,  2,  2,126,126,126,126,126,126,126,  2,142,142,
+  142,142,142,142,142,142,142,142,142,142,  2,  2,  2,  2,125,125,
+  125,125,125,125,125,125,125,125,125,  2,  2,  2,  2,  2,  2,  2,
+    2,  2,  2,  2,  2,125,154,154,154,154,154,154,154,  2,  2,154,
+    2,  2,154,154,154,154,154,154,154,154,  2,154,154,  2,154,154,
+  154,154,154,154,154,154,154,154,154,154,154,154,  2,154,154,  2,
+    2,154,154,154,154,154,154,154,  2,  2,  2,  2,  2,  2,150,150,
+  150,150,150,150,150,150,  2,  2,150,150,150,150,150,150,150,150,
+  150,150,150,  2,  2,  2,141,141,141,141,141,141,141,141,140,140,
+  140,140,140,140,140,140,140,140,140,  2,  2,  2,  2,  2,121,121,
+  121,121,121,121,121,121,121,  2,  2,  2,  2,  2,  2,  2,  7,  7,
+    2,  2,  2,  2,  2,  2,169,169,169,169,169,169,169,169,169,169,
+    2,  2,  2,  2,  2,  2,133,133,133,133,133,133,133,133,133,  2,
+  133,133,133,133,133,133,133,133,133,133,133,133,133,  2,133,133,
+  133,133,133,133,  2,  2,133,133,133,133,133,  2,  2,  2,134,134,
+  134,134,134,134,134,134,  2,  2,134,134,134,134,134,134,  2,134,
+  134,134,134,134,134,134,134,134,134,134,134,134,134,  2,138,138,
+  138,138,138,138,138,  2,138,138,  2,138,138,138,138,138,138,138,
+  138,138,138,138,138,138,  2,  2,138,  2,138,138,  2,138,138,138,
+    2,  2,  2,  2,  2,  2,143,143,143,143,143,143,  2,143,143,  2,
+  143,143,143,143,143,143,143,143,143,143,143,143,143,143,143,143,
+  143,143,143,143,143,  2,143,143,  2,143,143,143,143,143,143,  2,
+    2,  2,  2,  2,  2,  2,143,143,  2,  2,  2,  2,  2,  2,145,145,
+  145,145,145,145,145,145,145,  2,  2,  2,  2,  2,  2,  2,163,163,
+  163,163,163,163,163,163,163,  2,163,163,163,163,163,163,163,163,
+  163,  2,  2,  2,163,163,163,163,163,  2,  2,  2,  2,  2, 86,  2,
+    2,  2,  2,  2,  2,  2, 22, 22,  2,  2,  2,  2,  2,  2,  2,  2,
+    2,  2,  2,  2,  2, 22, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+    2,  2,  2,  2,  2,  2, 63, 63, 63, 63, 63, 63, 63,  2, 63, 63,
+   63, 63, 63,  2,  2,  2, 63, 63, 63, 63,  2,  2,  2,  2,157,157,
+  157,157,157,157,157,157,157,157,157,  2,  2,  2,  2,  2, 80, 80,
+   80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80,  2,  2, 80, 80,
+   80,  2,  2,  2,  2,  2,127,127,127,127,127,127,127,127,127,127,
+  127,127,127,127,127,  2,166,166,166,166,166,166,166,166,166,166,
+    2,  2,  2,  2,  2,  2, 79,  2,  2,  2,  2,  2,  2,  2,115,115,
+  115,115,115,115,115,115,115,115,115,115,115,115,115,  2,115,115,
+    2,  2,  2,  2,115,115,159,159,159,159,159,159,159,159,159,159,
+  159,159,159,159,159,  2,159,159,  2,  2,  2,  2,  2,  2,103,103,
+  103,103,103,103,103,103,103,103,103,103,103,103,  2,  2,119,119,
+  119,119,119,119,119,119,119,119,119,119,119,119,  2,  2,119,119,
+    2,119,119,119,119,119,  2,  2,  2,  2,  2,119,119,119,167,167,
+  167,167,167,167,167,167,167,167,  2,  2,  2,  2,  2,  2,146,146,
+  146,146,146,146,146,146,146,146,146,  2,  2,  2,  2,  2, 99, 99,
+   99, 99, 99, 99, 99, 99, 99, 99, 99,  2,  2,  2,  2, 99,  2,  2,
+    2,  2,  2,  2,  2, 99,136,139, 13, 13,155,  2,  2,  2,136,136,
+  136,136,136,136,136,136,155,155,155,155,155,155,155,155,155,155,
+  155,155,155,155,  2,  2,  2,  2,  2,  2,  2,  2,  2,155,136,  2,
+    2,  2,  2,  2,  2,  2, 17, 17, 17, 17,  2, 17, 17, 17, 17, 17,
+   17, 17,  2, 17, 17,  2, 17, 15, 15, 15, 15, 15, 15, 15, 17, 17,
+   17,  2,  2,  2,  2,  2,  2,  2, 15,  2,  2,  2,  2,  2, 15, 15,
+   15,  2,  2, 17,  2,  2,  2,  2,  2,  2, 17, 17, 17, 17,139,139,
+  139,139,139,139,139,139,139,139,139,139,  2,  2,  2,  2,105,105,
+  105,105,105,105,105,105,105,105,105,  2,  2,  2,  2,  2,105,105,
+  105,105,105,  2,  2,  2,105,  2,  2,  2,  2,  2,  2,  2,105,105,
+    2,  2,105,105,105,105,  1,  1,  1,  1,  1,  1,  2,  2,  0,  0,
+    0,  0,  0,  0,  0,  1,  1,  1,  0,  0,  0,  0,  0,  0,  0,  0,
+    0,  1,  1,  1,  1,  1,  1,  1,  1,  0,  0,  1,  1,  1,  1,  1,
+    1,  1,  0,  0,  0,  0,  0,  0,  1,  1,  1,  1,  0,  0,  2,  2,
+    0,  2,  2,  0,  0,  2,  2,  0,  0,  0,  0,  2,  0,  0,  0,  0,
+    2,  0,  2,  0,  0,  0,  0,  0,  0,  0,  2,  0,  0,  0,  0,  0,
+    0,  2,  2,  0,  0,  0,  0,  0,  2,  0,  0,  0,  0,  2,  0,  0,
+    0,  0,  0,  2,  0,  2,  2,  2,  0,  0,  0,  0,  0,  0,  0,  2,
+    0,  0,  0,  0,  0,  0,131,131,131,131,131,131,131,131,131,131,
+  131,131,  2,  2,  2,  2,  2,  2,  2,131,131,131,131,131,  2,131,
+  131,131,131,131,131,131,  2,  2,  2,  2,  2, 19, 19, 19, 56, 56,
+   56, 56, 56, 56, 56,  2, 56,  2,  2, 56, 56, 56, 56, 56, 56, 56,
+    2, 56, 56,  2, 56, 56, 56, 56, 56,  2,  2,  2,  2,  2,  6,  6,
+    6,  6,  6,  6,  2,  2,  2,  2,  2,  2,  2,  2,  2,  6,151,151,
+  151,151,151,151,151,151,151,151,151,151,151,  2,  2,  2,151,151,
+  151,151,151,151,  2,  2,151,151,  2,  2,  2,  2,151,151,160,160,
+  160,160,160,160,160,160,160,160,160,160,160,160,160,  2,152,152,
+  152,152,152,152,152,152,152,152,  2,  2,  2,  2,  2,152,164,164,
+  164,164,164,164,164,164,164,164,  2,  2,  2,  2,  2,  2,168,168,
+  168,168,168,168,168,168,168,168,168,  2,  2,  2,  2,168, 30, 30,
+   30, 30,  2, 30, 30,  2,113,113,113,113,113,113,113,113,113,113,
+  113,113,113,  2,  2,113,113,113,113,113,113,113,113,  2,132,132,
+  132,132,132,132,132,132,132,132,132,132,  2,  2,  2,  2,132,132,
+    2,  2,  2,  2,132,132,  3,  3,  3,  3,  2,  3,  3,  3,  2,  3,
+    3,  2,  3,  2,  2,  3,  2,  3,  3,  3,  3,  3,  3,  3,  3,  3,
+    3,  2,  3,  3,  3,  3,  2,  3,  2,  3,  2,  2,  2,  2,  2,  2,
+    3,  2,  2,  2,  2,  3,  2,  3,  2,  3,  2,  3,  3,  3,  2,  3,
+    2,  3,  2,  3,  2,  3,  2,  3,  3,  3,  3,  2,  3,  2,  3,  3,
+    2,  3,  3,  3,  3,  3,  3,  3,  3,  3,  2,  2,  2,  2,  2,  3,
+    3,  3,  2,  3,  3,  3,  3,  3,  2,  2,  2,  2,  2,  2,  2,  2,
+    2,  2,  2,  2,  0,  0, 15,  0,  0,  2,  2,  2,  2,  2,  2,  2,
+    2,  2,  0,  0,  0,  0,  2,  2,  2,  0,  0,  0,  0,  0,  0,  0,
+    2,  2,  2,  2,  2,  0,  0,  0,  0,  0,  0,  2,  2,  0, 13,  2,
+    2,  2,  2,  2,  2,  2, 13, 13, 13,  2,  2,  2,  2,  2,  2,  0,
+    2,  2,  2,  2,  2,  2,  0,  1,  2,  3,  4,  5,  6,  7,  8,  9,
+    9,  9,  9, 10,  9, 11, 12, 13,  9,  9,  9, 14,  9,  9, 15,  9,
+    9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,
+    9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,
+    9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,
+    9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,
+    9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,
+    9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,
+    9,  9, 16, 17,  9,  9,  9,  9, 18,  9,  9,  9,  9,  9, 19, 20,
+   21,  9, 22,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,
+    9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,
+    9,  9,  9,  9,  9,  9, 23,  9,  9,  9,  9,  9, 24,  9,  9,  9,
+    9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,
+    9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,
+    9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9, 25,  9,
+    9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,
+    9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,
+    9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,
+    9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,
+    9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,
+    9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,
+    9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,
+    9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,
+    9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,
+    9,  9, 26, 27,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+    1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12,  0,  0, 13, 14,
+   15, 16, 17, 18, 19, 20, 21, 22,  0,  0,  0,  0,  0,  0,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,  0, 23,  0,  0, 24, 25, 26, 27, 28,
+   29, 30,  0,  0, 31, 32,  0, 33,  0, 34,  0, 35,  0,  0,  0,  0,
+   36, 37, 38, 39,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+    0,  0,  0,  0,  0,  0, 40,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+   41, 42,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
     0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0, 40,  0,  0,  0,  0,  0,  0,  0,  0,  0, 41, 42,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0, 43, 44,  0, 45,  0,  0,  0,  0,  0,  0, 46, 47,  0,  0,
-    0,  0,  0, 48,  0, 49,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0, 50, 51,  0,  0,  0, 52,  0,  0, 53,  0,  0,  0,
-    0,  0,  0,  0, 54,  0,  0,  0,  0,  0,  0,  0, 55,  0,  0,  0,
-    0,  0,  0,  0, 56,  0,  0,  0,  0,  0,  0,  0,  0, 57,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0, 58, 59, 60, 61, 62, 63, 64, 65,  0,  0,  0,  0,
-    0,  0, 66,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+    0,  0,  0,  0,  0,  0, 43, 44,  0, 45,  0,  0,  0,  0,  0,  0,
+   46, 47,  0,  0,  0,  0,  0, 48,  0, 49,  0,  0,  0,  0,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,  0, 50, 51,  0,  0,  0, 52,  0,  0,
+   53,  0,  0,  0,  0,  0,  0,  0, 54,  0,  0,  0,  0,  0,  0,  0,
+   55,  0,  0,  0,  0,  0,  0,  0, 56,  0,  0,  0,  0,  0,  0,  0,
+    0, 57,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,  0, 58, 59, 60, 61, 62, 63, 64, 65,
+    0,  0,  0,  0,  0,  0, 66,  0,  0,  0,  0,  0,  0,  0,  0,  0,
     0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
     0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
     0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
     0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-   67, 68,  0, 69, 70,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-   71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86,
-   87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99,100,101,102,
-  103,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,104,  0,  0,  0,  0,  0,  0,105,106,  0,107,  0,  0,  0,
-  108,  0,109,  0,110,  0,111,112,113,  0,114,  0,  0,  0,115,  0,
-    0,  0,116,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,117,  0,  0,
+    0,  0,  0,  0, 67, 68,  0, 69, 70,  0,  0,  0,  0,  0,  0,  0,
+    0,  0,  0,  0, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82,
+   83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98,
+   99,100,101,102,103,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+    0,  0,  0,  0,  0,  0,104,  0,  0,  0,  0,  0,  0,105,106,  0,
+  107,  0,  0,  0,108,  0,109,  0,110,  0,111,112,113,  0,114,  0,
+    0,  0,115,  0,  0,  0,116,  0,  0,  0,  0,  0,  0,  0,  0,  0,
     0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,118,119,120,121,  0,122,123,124,125,126,  0,127,
+    0,117,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,118,119,120,121,  0,122,123,124,
+  125,126,  0,127,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+    0,  0,  0,  0,128,129,130,131,132,133,134,135,136,137,138,139,
+  140,141,142,143,144,145,146,147,148,149,150,151,152,153,154,155,
+  156,157,  0,  0,  0,158,159,160,161,  0,  0,  0,  0,  0,  0,  0,
     0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
     0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-  128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,
-  144,145,146,147,148,149,150,151,152,153,154,155,156,157,  0,  0,
-    0,158,159,160,161,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,162,163,  0,  0,  0,  0,  0,
-    0,  0,164,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  162,  0,163,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,164,165,  0,
+    0,  0,  0,  0,  0,  0,166,  0,  0,  0,  0,  0,  0,  0,  0,  0,
     0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,165,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,166,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,167,  0,  0,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,167,  0,  0,  0,168,169,  0,  0,
+  170,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,171,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,172,
     0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,168,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,173,  0,  0,  0,  0,  0,  0,  0,  0,
     0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,169,170,  0,  0,  0,  0,171,172,  0,  0,  0,
-  173,174,175,176,177,178,179,180,181,182,183,184,185,186,187,188,
-  189,190,191,192,193,194,195,196,197,198,199,200,201,202,203,204,
-  205,206,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  2,  3,  4,
+    0,  0,  0,  0,  0,  0,174,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,175,  0,  0,  0,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,176,177,  0,  0,  0,  0,178,
+  179,  0,  0,  0,180,181,182,183,184,185,186,187,188,189,190,191,
+  192,193,194,195,196,197,198,199,200,201,202,203,204,205,206,207,
+  208,209,210,211,212,213,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+    1,  2,  3,  4,
 };
 static const uint16_t
-_hb_ucd_u16[10060] =
+_hb_ucd_u16[9668] =
 {
      0,   0,   1,   2,   3,   4,   5,   6,   0,   0,   7,   8,   9,  10,  11,  12,
     13,  13,  13,  14,  15,  13,  13,  16,  17,  18,  19,  20,  21,  22,  13,  23,
@@ -3776,9 +4012,10 @@ _hb_ucd_u16[10060] =
    136,  48,  48, 137, 138, 139, 140, 140, 141,  48, 142, 143, 144, 145, 140, 140,
    146, 147, 148, 149, 150,  48, 151, 152, 153, 154,  32, 155, 156, 157, 140, 140,
     48,  48, 158, 159, 160, 161, 162, 163, 164, 165,   9,   9, 166,  11,  11, 167,
-    48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48, 168, 169,  48,  48,
-   168,  48,  48, 170, 171, 172,  48,  48,  48, 171,  48,  48,  48, 173, 174, 175,
-    48, 176,   9,   9,   9,   9,   9, 177, 178,  48,  48,  48,  48,  48,  48,  48,
+    48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,
+    48,  48,  48,  48, 168, 169,  48,  48, 168,  48,  48, 170, 171, 172,  48,  48,
+    48, 171,  48,  48,  48, 173, 174, 175,  48, 176,   9,   9,   9,   9,   9, 177,
+   178,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,
     48,  48,  48,  48,  48,  48, 179,  48, 180, 181,  48,  48,  48,  48, 182, 183,
     48, 184,  48, 185,  48, 186, 187, 188,  48,  48,  48, 189, 190, 191, 192, 193,
    194, 192,  48,  48, 195,  48,  48, 196, 197,  48, 198,  48,  48,  48,  48, 199,
@@ -3791,28 +4028,34 @@ _hb_ucd_u16[10060] =
    241, 242, 241, 241, 242, 243, 241, 244, 245, 245, 245, 246, 247, 248, 249, 250,
    251, 252, 253, 254, 255, 256, 257, 258, 259, 260, 261, 261, 262, 263, 264, 265,
    266, 267, 268, 269, 270, 271, 272, 272, 273, 274, 275, 209, 276, 277, 209, 278,
-   279, 279, 279, 279, 279, 279, 279, 279, 280, 209, 281, 209, 209, 209, 209, 282,
-   209, 283, 279, 284, 209, 285, 286, 209, 209, 209, 287, 140, 288, 140, 271, 271,
-   271, 289, 209, 209, 209, 209, 290, 271, 209, 209, 209, 209, 209, 209, 209, 209,
-   209, 209, 209, 291, 292, 209, 209, 293, 209, 209, 209, 209, 209, 209, 294, 209,
-   209, 209, 209, 209, 209, 209, 295, 296, 271, 297, 209, 209, 298, 279, 299, 279,
-   300, 301, 279, 279, 279, 302, 279, 303, 209, 209, 209, 279, 304, 209, 209, 305,
-   209, 306, 209, 209, 209, 209, 209, 209,   9,   9,   9,  11,  11,  11, 307, 308,
-    13,  13,  13,  13,  13,  13, 309, 310,  11,  11, 311,  48,  48,  48, 312, 313,
-    48, 314, 315, 315, 315, 315,  32,  32, 316, 317, 318, 319, 320, 321, 140, 140,
-   209, 322, 209, 209, 209, 209, 209, 323, 209, 209, 209, 209, 209, 324, 140, 209,
-   325, 326, 327, 328, 136,  48,  48,  48,  48, 329, 178,  48,  48,  48,  48, 330,
-   331,  48,  48, 136,  48,  48,  48,  48, 200, 332,  48,  48, 209, 209, 333,  48,
-   209, 334, 335, 209, 336, 337, 209, 209, 335, 209, 209, 337, 209, 209, 209, 209,
-    48,  48,  48,  48, 209, 209, 209, 209,  48, 338,  48,  48,  48,  48,  48,  48,
-   151, 209, 209, 209, 287,  48,  48, 229, 339,  48, 340, 140,  13,  13, 341, 342,
-    13, 343,  48,  48,  48,  48, 344, 345,  31, 346, 347, 348,  13,  13,  13, 349,
-   350, 351, 352, 353, 354, 355, 140, 356, 357,  48, 358, 359,  48,  48,  48, 360,
-   361,  48,  48, 362, 363, 192,  32, 364,  64,  48, 365,  48, 366, 367,  48, 151,
-    76,  48,  48, 368, 369, 370, 371, 372,  48,  48, 373, 374, 375, 376,  48, 377,
-    48,  48,  48, 378, 379, 380, 381, 382, 383, 384, 315,  11,  11, 385, 386,  11,
-    11,  11,  11,  11,  48,  48, 387, 192,  48,  48, 388,  48, 389,  48,  48, 206,
-   390, 390, 390, 390, 390, 390, 390, 390, 391, 391, 391, 391, 391, 391, 391, 391,
+   279, 279, 279, 279, 279, 279, 279, 279, 279, 279, 279, 279, 279, 279, 279, 279,
+   280, 209, 281, 209, 209, 209, 209, 282, 209, 283, 279, 284, 209, 285, 286, 209,
+   209, 209, 176, 140, 287, 140, 271, 271, 271, 288, 209, 209, 209, 209, 289, 271,
+   209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 290, 291, 209, 209, 292,
+   209, 209, 209, 209, 209, 209, 293, 209, 209, 209, 209, 209, 209, 209, 209, 209,
+   209, 209, 209, 209, 209, 209, 294, 295, 271, 296, 209, 209, 297, 279, 298, 279,
+   209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209,
+   279, 279, 279, 279, 279, 279, 279, 279, 299, 300, 279, 279, 279, 301, 279, 302,
+   209, 209, 209, 279, 303, 209, 209, 304, 209, 305, 209, 209, 209, 209, 209, 209,
+     9,   9,   9,  11,  11,  11, 306, 307,  13,  13,  13,  13,  13,  13, 308, 309,
+    11,  11, 310,  48,  48,  48, 311, 312,  48, 313, 314, 314, 314, 314,  32,  32,
+   315, 316, 317, 318, 319, 320, 140, 140, 209, 321, 209, 209, 209, 209, 209, 322,
+   209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 323, 140, 209,
+   324, 325, 326, 327, 136,  48,  48,  48,  48, 328, 178,  48,  48,  48,  48, 329,
+   330,  48,  48, 136,  48,  48,  48,  48, 200, 331,  48,  48, 209, 209, 332,  48,
+   209, 333, 334, 209, 335, 336, 209, 209, 334, 209, 209, 336, 209, 209, 209, 209,
+    48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48, 209, 209, 209, 209,
+    48, 337,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,
+    48,  48,  48,  48,  48,  48,  48,  48, 151, 209, 209, 209, 338,  48,  48, 229,
+   339,  48, 340, 140,  13,  13, 341, 342,  13, 343,  48,  48,  48,  48, 344, 345,
+    31, 346, 347, 348,  13,  13,  13, 349, 350, 351, 352, 353, 354, 355, 140, 356,
+   357,  48, 358, 359,  48,  48,  48, 360, 361,  48,  48, 362, 363, 192,  32, 364,
+    64,  48, 365,  48, 366, 367,  48, 151,  76,  48,  48, 368, 369, 370, 371, 372,
+    48,  48, 373, 374, 375, 376,  48, 377,  48,  48,  48, 378, 379, 380, 381, 382,
+   383, 384, 314,  11,  11, 385, 386,  11,  11,  11,  11,  11,  48,  48, 387, 192,
+    48,  48,  48,  48,  48,  48,  48,  48,  48,  48, 388,  48, 389,  48,  48, 206,
+   390, 390, 390, 390, 390, 390, 390, 390, 390, 390, 390, 390, 390, 390, 390, 390,
+   391, 391, 391, 391, 391, 391, 391, 391, 391, 391, 391, 391, 391, 391, 391, 391,
     48,  48,  48,  48,  48,  48, 204,  48,  48,  48,  48,  48,  48, 207, 140, 140,
    392, 393, 394, 395, 396,  48,  48,  48,  48,  48,  48, 397, 398, 399,  48,  48,
     48,  48,  48, 400, 209,  48,  48,  48,  48, 401,  48,  48, 402, 140, 140, 403,
@@ -3823,571 +4066,540 @@ _hb_ucd_u16[10060] =
    140, 140, 140, 140, 140, 140, 140, 140,  48, 151,  48,  48,  48, 100, 429, 430,
     48,  48, 431,  48, 432,  48,  48, 433,  48, 434,  48,  48, 435, 436, 140, 140,
      9,   9, 437,  11,  11,  48,  48,  48,  48, 204, 192,   9,   9, 438,  11, 439,
-    48,  48, 440,  48,  48,  48, 441, 442, 442, 443, 444, 445, 140, 140, 140, 140,
-    48,  48,  48, 314,  48, 199, 440, 140, 446,  27,  27, 447, 140, 140, 140, 140,
+    48,  48, 440,  48,  48,  48, 441, 442, 442, 443, 444, 445,  48,  48,  48, 388,
+    48,  48,  48, 313,  48, 199, 440, 140, 446,  27,  27, 447, 140, 140, 140, 140,
    448,  48,  48, 449,  48, 450,  48, 451,  48, 200, 452, 140, 140, 140,  48, 453,
     48, 454,  48, 455, 140, 140, 140, 140,  48,  48,  48, 456, 271, 457, 271, 271,
    458, 459,  48, 460, 461, 462,  48, 463,  48, 464, 140, 140, 465,  48, 466, 467,
     48,  48,  48, 468,  48, 469,  48, 470,  48, 471, 472, 140, 140, 140, 140, 140,
     48,  48,  48,  48, 196, 140, 140, 140,   9,   9,   9, 473,  11,  11,  11, 474,
-    48,  48, 475, 192, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 271, 476,
-    48,  48, 477, 478, 140, 140, 140, 479,  48, 464, 480,  48,  62, 481, 140,  48,
-   482, 140, 140,  48, 483, 140,  48, 314, 484,  48,  48, 485, 486, 457, 487, 488,
-   222,  48,  48, 489, 490,  48, 196, 192, 491,  48, 492, 493, 494,  48,  48, 495,
-   222,  48,  48, 496, 497, 498, 499, 500,  48,  97, 501, 502, 503, 140, 140, 140,
-   504, 505, 506,  48,  48, 507, 508, 192, 509,  83,  84, 510, 511, 512, 513, 514,
-    48,  48,  48, 515, 516, 517, 478, 140,  48,  48,  48, 518, 519, 192, 140, 140,
-    48,  48, 520, 521, 522, 523, 140, 140,  48,  48,  48, 524, 525, 192, 526, 140,
-    48,  48, 527, 528, 192, 140, 140, 140,  48, 173, 529, 530, 314, 140, 140, 140,
-    48,  48, 501, 531, 140, 140, 140, 140, 140, 140,   9,   9,  11,  11, 148, 532,
-   533, 534,  48, 535, 536, 192, 140, 140, 140, 140, 537,  48,  48, 538, 539, 140,
-   540,  48,  48, 541, 542, 543,  48,  48, 544, 545, 546,  48,  48,  48,  48, 196,
-   547, 140, 140, 140, 140, 140, 140, 140,  84,  48, 520, 548, 549, 148, 175, 550,
-    48, 551, 552, 553, 140, 140, 140, 140, 554,  48,  48, 555, 556, 192, 557,  48,
-   558, 559, 192, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140,  48, 560,
-   561, 115,  48, 562, 563, 192, 140, 140, 140, 140, 140, 100, 271, 564, 565, 566,
-    48, 207, 140, 140, 140, 140, 140, 140, 272, 272, 272, 272, 272, 272, 567, 568,
-    48,  48,  48,  48, 388, 140, 140, 140, 140,  48,  48,  48,  48,  48,  48, 569,
-    48,  48,  48, 570, 571, 572, 140, 140,  48,  48,  48,  48, 314, 140, 140, 140,
-    48,  48,  48, 196,  48, 200, 370,  48,  48,  48,  48, 200, 192,  48, 204, 573,
-    48,  48,  48, 574, 575, 576, 577, 578,  48, 140, 140, 140, 140, 140, 140, 140,
-   140, 140, 140, 140,   9,   9,  11,  11, 271, 579, 140, 140, 140, 140, 140, 140,
-    48,  48,  48,  48, 580, 581, 582, 582, 583, 584, 140, 140, 140, 140, 585, 586,
-    48,  48,  48,  48,  48,  48,  48, 440,  48,  48,  48,  48,  48, 199, 140, 140,
-   196, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 587,
-    48,  48, 588, 589, 140, 590, 591,  48,  48,  48,  48,  48,  48,  48,  48, 206,
-    48,  48,  48,  48,  48,  48,  71, 151, 196, 592, 593, 140, 140, 140, 140, 140,
-    32,  32, 594,  32, 595, 209, 209, 209, 209, 209, 209, 209, 323, 140, 140, 140,
-   209, 209, 209, 209, 209, 209, 209, 324, 209, 209, 596, 209, 209, 209, 597, 598,
-   599, 209, 600, 209, 209, 209, 288, 140, 209, 209, 209, 209, 601, 140, 140, 140,
-   140, 140, 140, 140, 271, 602, 271, 602, 209, 209, 209, 209, 209, 287, 271, 461,
-     9, 603,  11, 604, 605, 606, 241,   9, 607, 608, 609, 610, 611,   9, 603,  11,
-   612, 613,  11, 614, 615, 616, 617,   9, 618,  11,   9, 603,  11, 604, 605,  11,
-   241,   9, 607, 617,   9, 618,  11,   9, 603,  11, 619,   9, 620, 621, 622, 623,
-    11, 624,   9, 625, 626, 627, 628,  11, 629,   9, 630,  11, 631, 632, 632, 632,
-    32,  32,  32, 633,  32,  32, 634, 635, 636, 637,  45, 140, 140, 140, 140, 140,
-   638, 639, 640, 140, 140, 140, 140, 140, 641, 642, 643,  27,  27,  27, 644, 140,
-   645, 140, 140, 140, 140, 140, 140, 140,  48,  48, 151, 646, 647, 140, 140, 140,
-   140,  48, 648, 140,  48,  48, 649, 650, 140, 140, 140, 140, 140,  48, 651, 192,
-   140, 140, 140, 140, 140, 140, 652, 200,  48,  48,  48,  48, 653, 595, 140, 140,
-     9,   9, 607,  11, 654, 370, 140, 140, 140, 140, 140, 140, 140, 140, 140, 499,
-   271, 271, 655, 656, 140, 140, 140, 140, 499, 271, 657, 658, 140, 140, 140, 140,
-   659,  48, 660, 661, 662, 663, 664, 665, 666, 206, 667, 206, 140, 140, 140, 668,
-   209, 209, 669, 209, 209, 209, 209, 209, 209, 323, 334, 670, 670, 670, 209, 324,
-   671, 209, 209, 209, 209, 209, 209, 209, 209, 209, 672, 140, 140, 140, 673, 209,
-   674, 209, 209, 669, 675, 676, 324, 140, 209, 209, 209, 209, 209, 209, 209, 677,
-   209, 209, 209, 209, 209, 678, 426, 426, 209, 209, 209, 209, 209, 209, 209, 679,
-   209, 209, 209, 209, 209, 176, 669, 427, 669, 209, 209, 209, 680, 176, 209, 209,
-   680, 209, 672, 676, 140, 140, 140, 140, 209, 209, 209, 209, 209, 323, 672, 426,
-   675, 209, 209, 681, 682, 669, 675, 675, 209, 683, 209, 209, 288, 140, 140, 192,
-    48,  48,  48,  48,  48,  48, 140, 140,  48,  48,  48, 207,  48,  48,  48,  48,
-    48, 204,  48,  48,  48,  48,  48,  48,  48,  48, 478,  48,  48,  48,  48,  48,
-    48,  48,  48,  48,  48,  48, 100,  48,  48,  48,  48,  48,  48, 204, 140, 140,
-    48, 204, 140, 140, 140, 140, 140, 140,  48,  48,  48,  48,  71,  48,  48,  48,
-    48,  48,  48, 140, 140, 140, 140, 140, 684, 140, 570, 570, 570, 570, 570, 570,
+    48,  48, 475, 192, 476,   9, 477,  11, 478, 140, 140, 140, 140, 140, 140, 140,
+   140, 140, 140, 140, 140, 140, 271, 479,  48,  48, 480, 481, 482, 140, 140, 483,
+    48, 464, 484,  48,  62, 485, 140,  48, 486, 140, 140,  48, 487, 140,  48, 313,
+   488,  48,  48, 489, 490, 457, 491, 492, 222,  48,  48, 493, 494,  48, 196, 192,
+   495,  48, 496, 497, 498,  48,  48, 499, 222,  48,  48, 500, 501, 502, 503, 504,
+    48,  97, 505, 506, 507, 140, 140, 140, 508, 509, 510,  48,  48, 511, 512, 192,
+   513,  83,  84, 514, 515, 516, 517, 518, 519,  48,  48, 520, 521, 522, 523, 140,
+    48,  48,  48, 524, 525, 526, 481, 140,  48,  48,  48, 527, 528, 192, 140, 140,
+   140, 140, 140, 140, 140, 140, 140, 140,  48,  48, 529, 530, 531, 532, 140, 140,
+    48,  48,  48, 533, 534, 192, 535, 140,  48,  48, 536, 537, 192, 538, 539, 140,
+    48, 540, 541, 542, 313, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140,
+    48,  48, 505, 543, 140, 140, 140, 140, 140, 140,   9,   9,  11,  11, 148, 544,
+   545, 546,  48, 547, 548, 192, 140, 140, 140, 140, 549,  48,  48, 550, 551, 140,
+   552,  48,  48, 553, 554, 555,  48,  48, 556, 557, 558,  48,  48,  48,  48, 196,
+   559, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140,  48,  48, 560, 192,
+    84,  48, 529, 561, 562, 148, 175, 563,  48, 564, 565, 566, 140, 140, 140, 140,
+   567,  48,  48, 568, 569, 192, 570,  48, 571, 572, 192, 140, 140, 140, 140, 140,
+   140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140,  48, 573,
+   574, 115,  48, 575, 576, 577, 140, 140, 140, 140, 140, 100, 271, 578, 579, 580,
+    48,  48,  48,  48,  48,  48,  48,  48,  48, 207, 140, 140, 140, 140, 140, 140,
+   272, 272, 272, 272, 272, 272, 581, 582,  48,  48,  48,  48,  48,  48,  48,  48,
+    48,  48,  48,  48, 388, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140,
+   140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140,
+   140, 140, 140, 140, 140, 140, 140, 140, 140,  48,  48,  48,  48,  48,  48, 583,
+    48,  48,  48, 584, 585, 586,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,
+    48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  71,
+    48,  48,  48,  48, 313, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140,
+    48, 587, 588, 192, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140,
+    48,  48,  48, 196,  48, 200, 370,  48,  48,  48,  48, 200, 192,  48, 204, 589,
+    48,  48,  48, 590, 591, 592, 593, 594,  48, 140, 140, 140, 140, 140, 140, 140,
+   140, 140, 140, 140, 595,  48, 596, 192, 140, 140, 140, 140, 140, 140, 140, 140,
+   140, 140, 140, 140,   9,   9,  11,  11, 271, 597, 140, 140, 140, 140, 140, 140,
+    48,  48,  48,  48, 598, 599, 600, 600, 601, 602, 140, 140, 140, 140, 603, 604,
+    48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48, 440,
+    48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48, 199, 140, 605,
+   196, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140,
+   140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 606,
+    48,  48, 607, 608, 140, 609, 610,  48,  48,  48,  48,  48,  48,  48,  48,  48,
+    48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48, 206,
+    48,  48,  48,  48,  48,  48,  71, 151, 196, 611, 612, 140, 140, 140, 140, 140,
+   209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 192,
+   209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 322, 140, 140, 140, 140,
+    32,  32, 613,  32, 614, 209, 209, 209, 209, 209, 209, 209, 322, 140, 140, 140,
+   209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 323,
+   209, 209, 615, 209, 209, 209, 616, 617, 618, 209, 619, 209, 209, 209, 287, 140,
+   209, 209, 209, 209, 620, 140, 140, 140, 140, 140, 140, 140, 271, 621, 271, 621,
+   209, 209, 209, 209, 209, 338, 271, 461, 140, 140, 140, 140, 140, 140, 140, 140,
+     9, 622,  11, 623, 624, 625, 241,   9, 626, 627, 628, 629, 630,   9, 622,  11,
+   631, 632,  11, 633, 634, 635, 636,   9, 637,  11,   9, 622,  11, 623, 624,  11,
+   241,   9, 626, 636,   9, 637,  11,   9, 622,  11, 638,   9, 639, 640, 641, 642,
+    11, 643,   9, 644, 645, 646, 647,  11, 648,   9, 649,  11, 650, 538, 538, 538,
+    32,  32,  32, 651,  32,  32, 652, 653, 654, 655,  45, 140, 140, 140, 140, 140,
+   656, 657, 658, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140,
+   659, 660, 661,  27,  27,  27, 662, 140, 663, 140, 140, 140, 140, 140, 140, 140,
+    48,  48, 151, 664, 665, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140,
+   140, 140, 140, 140, 140, 140, 140, 140, 140,  48, 666, 140,  48,  48, 667, 668,
+   140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140,  48, 669, 192,
+   140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140,  48, 587, 670,
+   140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 671, 200,
+    48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48, 672, 614, 140, 140,
+     9,   9, 626,  11, 673, 370, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140,
+   140, 140, 140, 140, 140, 140, 140, 503, 271, 271, 674, 675, 140, 140, 140, 140,
+   503, 271, 676, 677, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140,
+   678,  48, 679, 680, 681, 682, 683, 684, 685, 206, 686, 206, 140, 140, 140, 687,
+   209, 209, 688, 209, 209, 209, 209, 209, 209, 322, 333, 689, 689, 689, 209, 323,
+   690, 209, 209, 209, 209, 209, 209, 209, 209, 209, 691, 140, 140, 140, 692, 209,
+   693, 209, 209, 688, 694, 695, 323, 140, 140, 140, 140, 140, 140, 140, 140, 140,
+   209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 696,
+   209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, 697, 426, 426,
+   209, 209, 209, 209, 209, 209, 209, 698, 209, 209, 209, 209, 209, 176, 688, 427,
+   688, 209, 209, 209, 699, 176, 209, 209, 699, 209, 691, 688, 695, 140, 140, 140,
+   209, 209, 209, 209, 209, 322, 691, 426, 700, 209, 209, 209, 701, 702, 176, 694,
+   209, 209, 209, 209, 209, 209, 209, 209, 209, 703, 209, 209, 209, 209, 209, 192,
+    48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48, 140, 140,
+    48,  48,  48, 207,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,
+    48, 204,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,
+    48,  48,  48,  48,  48,  48,  48,  48,  48,  48, 481,  48,  48,  48,  48,  48,
+    48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48, 100,  48,
+    48,  48,  48,  48,  48, 204, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140,
+    48, 204, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140,
+    48,  48,  48,  48,  71,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48,
+    48,  48,  48,  48,  48,  48,  48,  48,  48,  48,  48, 140, 140, 140, 140, 140,
+   704, 140, 584, 584, 584, 584, 584, 584, 140, 140, 140, 140, 140, 140, 140, 140,
     32,  32,  32,  32,  32,  32,  32,  32,  32,  32,  32,  32,  32,  32,  32, 140,
-   391, 391, 391, 391, 391, 391, 391, 685, 391, 391, 391, 391, 391, 391, 391, 686,
-     0,   0,   0,   0,   1,   2,   1,   2,   0,   0,   3,   3,   4,   5,   4,   5,
-     4,   4,   4,   4,   4,   4,   4,   4,   4,   4,   4,   6,   0,   0,   7,   0,
-     8,   8,   8,   8,   8,   8,   8,   9,  10,  11,  12,  11,  11,  11,  13,  11,
-    14,  14,  14,  14,  14,  14,  14,  14,  15,  14,  14,  14,  14,  14,  14,  14,
-    14,  14,  14,  16,  17,  18,  17,  17,  19,  20,  21,  21,  22,  21,  23,  24,
-    25,  26,  27,  27,  28,  29,  27,  30,  27,  27,  27,  27,  27,  31,  27,  27,
-    32,  33,  33,  33,  34,  27,  27,  27,  35,  35,  35,  36,  37,  37,  37,  38,
-    39,  39,  40,  41,  42,  43,  44,  27,  45,  46,  27,  27,  27,  27,  47,  27,
-    48,  48,  48,  48,  48,  49,  50,  48,  51,  52,  53,  54,  55,  56,  57,  58,
-    59,  60,  61,  62,  63,  64,  65,  66,  67,  68,  69,  70,  71,  72,  73,  74,
-    75,  76,  77,  78,  79,  80,  81,  82,  83,  84,  85,  86,  87,  88,  89,  90,
-    91,  92,  93,  94,  95,  96,  97,  98,  99, 100, 101, 102, 103, 104, 105, 106,
-   107, 108, 109, 109, 110, 111, 112, 109, 113, 114, 115, 116, 117, 118, 119, 120,
-   121, 122, 122, 123, 122, 124, 125, 125, 126, 127, 128, 129, 130, 131, 125, 125,
-   132, 132, 132, 132, 133, 132, 134, 135, 132, 133, 132, 136, 136, 137, 125, 125,
-   138, 138, 138, 138, 138, 138, 138, 138, 138, 138, 139, 139, 140, 139, 139, 141,
-   142, 142, 142, 142, 142, 142, 142, 142, 143, 143, 143, 143, 144, 145, 143, 143,
-   144, 143, 143, 146, 147, 148, 143, 143, 143, 147, 143, 143, 143, 149, 143, 150,
-   143, 151, 152, 152, 152, 152, 152, 153, 154, 154, 154, 154, 154, 154, 154, 154,
-   155, 156, 157, 157, 157, 157, 158, 159, 160, 161, 162, 163, 164, 165, 166, 167,
-   168, 168, 168, 168, 168, 169, 170, 170, 171, 172, 173, 173, 173, 173, 173, 174,
-   173, 173, 175, 154, 154, 154, 154, 176, 177, 178, 179, 179, 180, 181, 182, 183,
-   184, 184, 185, 184, 186, 187, 168, 168, 188, 189, 190, 190, 190, 191, 190, 192,
-   193, 193, 194,   8, 195, 125, 125, 125, 196, 196, 196, 196, 197, 196, 196, 198,
-   199, 199, 199, 199, 200, 200, 200, 201, 202, 202, 202, 203, 204, 205, 205, 205,
-   206, 139, 139, 207, 208, 209, 210, 211,   4,   4, 212,   4,   4, 213, 214, 215,
-     4,   4,   4, 216,   8,   8,   8,   8,  11, 217,  11,  11, 217, 218,  11, 219,
-    11,  11,  11, 220, 220, 221,  11, 222, 223,   0,   0,   0,   0,   0, 224, 225,
-   226, 227,   0,   0, 228,   8,   8, 229,   0,   0, 230, 231, 232,   0,   4,   4,
-   233,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0, 234, 125, 235, 125,   0,   0, 236, 236, 236, 236, 236, 236, 236, 236,
-     0,   0,   0,   0,   0,   0,   0, 237,   0, 238,   0,   0,   0,   0,   0,   0,
-   239, 239, 239, 239, 239, 239,   4,   4, 240, 240, 240, 240, 240, 240, 240, 241,
-   139, 139, 140, 242, 242, 242, 243, 244, 143, 245, 246, 246, 246, 246,  14,  14,
-     0,   0,   0,   0,   0, 247, 125, 125, 248, 249, 248, 248, 248, 248, 248, 250,
-   248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 251, 125,   0,
-   252,   0, 253, 254, 255, 256, 256, 256, 256, 257, 258, 259, 259, 259, 259, 260,
-   261, 262, 262, 263, 142, 142, 142, 142, 264,   0, 262, 262,   0,   0, 265, 259,
-   142, 264,   0,   0,   0,   0, 142, 266,   0,   0,   0,   0,   0, 259, 259, 267,
-   259, 259, 259, 259, 259, 268,   0,   0, 248, 248, 248, 248,   0,   0,   0,   0,
-   269, 269, 269, 269, 269, 269, 269, 269, 270, 269, 269, 269, 271, 272, 272, 272,
-   273, 273, 273, 273, 273, 273, 273, 273, 273, 273, 274, 125,  14,  14,  14,  14,
-    14,  14, 275, 275, 275, 275, 275, 276,   0,   0, 277,   4,   4,   4,   4,   4,
-   278,   4,   4,   4, 279, 280, 125, 281, 282, 282, 283, 284, 285, 285, 285, 286,
-   287, 287, 287, 287, 288, 289,  48,  48, 290, 290, 291, 292, 292, 293, 142, 294,
-   295, 295, 295, 295, 296, 297, 138, 298, 299, 299, 299, 300, 301, 302, 138, 138,
-   303, 303, 303, 303, 304, 305, 306, 307, 308, 309, 246,   4,   4, 310, 311, 152,
-   152, 152, 152, 152, 306, 306, 312, 313, 142, 142, 314, 142, 315, 142, 142, 316,
-   125, 125, 125, 125, 125, 125, 125, 125, 248, 248, 248, 248, 248, 248, 317, 248,
-   248, 248, 248, 248, 248, 318, 125, 125, 319, 320,  21, 321, 322,  27,  27,  27,
-    27,  27,  27,  27, 323, 324,  27,  27,  27,  27,  27,  27,  27,  27,  27,  27,
-    27,  27,  27, 325,  27,  27,  27,  27,  27, 326,  27,  27, 327, 125, 125,  27,
-     8, 284, 328,   0,   0, 329, 330, 331,  27,  27,  27,  27,  27,  27,  27, 332,
-   333,   0,   1,   2,   1,   2, 334, 258, 259, 335, 142, 264, 336, 337, 338, 339,
-   340, 341, 342, 343, 344, 344, 125, 125, 341, 341, 341, 341, 341, 341, 341, 345,
-   346,   0,   0, 347,  11,  11,  11,  11, 348, 349, 350, 125, 125,   0,   0, 351,
-   352, 353, 354, 354, 354, 355, 356, 357, 358, 358, 359, 360, 361, 362, 362, 363,
-   364, 365, 366, 366, 367, 368, 125, 125, 369, 369, 369, 369, 369, 370, 370, 370,
-   371, 372, 373, 374, 374, 375, 374, 376, 377, 377, 378, 379, 379, 379, 380, 381,
-   381, 382, 383, 384, 125, 125, 125, 125, 385, 385, 385, 385, 385, 385, 385, 385,
-   385, 385, 385, 386, 385, 387, 388, 125, 389,   4,   4, 390, 125, 125, 125, 125,
-   391, 392, 392, 393, 394, 395, 396, 396, 397, 398, 399, 125, 125, 125, 400, 401,
-   402, 403, 404, 405, 125, 125, 125, 125, 406, 406, 407, 408, 407, 409, 407, 407,
-   410, 411, 412, 413, 414, 414, 415, 415, 416, 416, 125, 125, 417, 417, 418, 419,
-   420, 420, 420, 421, 422, 423, 424, 425, 426, 427, 428, 125, 125, 125, 125, 125,
-   429, 429, 429, 429, 430, 125, 125, 125, 431, 431, 431, 432, 431, 431, 431, 433,
-   434, 434, 435, 436, 125, 125, 125, 125, 125, 125, 125, 125, 125, 125,  27,  45,
-   437, 437, 438, 439, 125, 125, 125, 440, 441, 441, 442, 443, 443, 444, 125, 445,
-   446, 125, 125, 447, 448, 125, 449, 450, 451, 451, 451, 451, 452, 453, 451, 454,
-   455, 455, 455, 455, 456, 457, 458, 459, 460, 460, 460, 461, 462, 463, 463, 464,
-   465, 465, 465, 465, 465, 465, 466, 467, 468, 469, 468, 468, 470, 125, 125, 125,
-   471, 472, 473, 474, 474, 474, 475, 476, 477, 478, 479, 480, 481, 482, 483, 484,
-   485, 485, 485, 485, 485, 486, 487, 125, 488, 488, 488, 488, 489, 490, 125, 125,
-   491, 491, 491, 492, 491, 493, 125, 125, 494, 494, 494, 494, 495, 496, 497, 125,
-   498, 498, 498, 499, 499, 125, 125, 125, 500, 501, 502, 500, 503, 125, 125, 125,
-   504, 504, 504, 505, 125, 125, 125, 125, 125, 125, 506, 506, 506, 506, 506, 507,
-   508, 509, 510, 511, 512, 513, 125, 125, 125, 125, 514, 515, 515, 514, 516, 125,
-   517, 517, 517, 517, 518, 519, 519, 519, 519, 519, 520, 154, 521, 521, 521, 522,
-   523, 125, 125, 125, 125, 125, 125, 125, 524, 525, 525, 526, 527, 525, 528, 529,
-   529, 530, 531, 532, 125, 125, 125, 125, 533, 534, 534, 535, 536, 537, 538, 539,
-   540, 541, 542, 125, 125, 125, 125, 125, 125, 125, 125, 125, 125, 125, 543, 544,
-   545, 546, 545, 547, 545, 548, 125, 125, 125, 125, 125, 549, 550, 550, 550, 551,
-   552, 552, 552, 552, 552, 552, 552, 552, 552, 553, 125, 125, 125, 125, 125, 125,
-   552, 552, 552, 552, 552, 552, 554, 555, 552, 552, 552, 552, 556, 125, 125, 125,
-   125, 557, 557, 557, 557, 557, 557, 558, 559, 559, 559, 559, 559, 559, 559, 559,
-   559, 559, 559, 559, 559, 560, 125, 125, 561, 561, 561, 561, 561, 561, 561, 561,
-   561, 561, 561, 561, 562, 125, 125, 125, 275, 275, 275, 275, 275, 275, 275, 275,
-   275, 275, 275, 563, 564, 565, 566, 567, 567, 567, 567, 568, 569, 570, 571, 572,
-   573, 573, 573, 573, 574, 575, 576, 577, 573, 125, 125, 125, 125, 125, 125, 125,
-   125, 125, 125, 125, 578, 578, 578, 578, 578, 579, 125, 125, 125, 125, 125, 125,
-   580, 580, 580, 580, 581, 580, 580, 580, 582, 580, 125, 125, 125, 125, 583, 584,
-   585, 585, 585, 585, 585, 585, 585, 585, 585, 585, 585, 585, 585, 585, 585, 586,
-   587, 587, 587, 587, 587, 587, 587, 587, 587, 587, 587, 587, 587, 588, 125, 125,
-   589, 125, 125, 125, 125, 125, 125, 125, 125, 125, 125, 125, 125, 125, 125, 590,
-   591, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
-   256, 256, 592, 593, 125, 594, 595, 596, 596, 596, 596, 596, 596, 596, 596, 596,
-   596, 596, 596, 596, 596, 596, 596, 597, 598, 598, 598, 598, 598, 598, 599, 600,
-   601, 602, 603, 125, 125, 125, 125, 125,   8,   8, 604,   8, 605,   0,   0,   0,
-     0,   0,   0,   0, 603, 125, 125, 125,   0,   0,   0,   0,   0,   0,   0, 606,
-     0,   0, 607,   0,   0,   0, 608, 609, 610,   0, 611,   0,   0,   0, 235, 125,
-    11,  11,  11,  11, 612, 125, 125, 125, 125, 125, 125, 125,   0, 603,   0, 603,
-     0,   0,   0,   0,   0, 234,   0, 613,   0,   0,   0,   0,   0, 224,   0,   0,
-     0, 614, 615, 616, 617,   0,   0,   0, 618, 619,   0, 620, 621, 622,   0,   0,
-     0,   0, 623,   0,   0,   0,   0,   0,   0,   0,   0,   0, 624,   0,   0,   0,
-   625, 625, 625, 625, 625, 625, 625, 625, 626, 627, 628, 125, 125, 125, 125, 125,
-     4, 629, 630, 125, 125, 125, 125, 125, 631, 632, 633,  14,  14,  14, 634, 125,
-   635, 125, 125, 125, 125, 125, 125, 125, 636, 636, 637, 638, 639, 125, 125, 125,
-   125, 640, 641, 125, 642, 642, 642, 643, 125, 125, 125, 125, 125, 644, 644, 645,
-   125, 125, 125, 125, 125, 125, 646, 647, 648, 648, 648, 648, 648, 648, 648, 648,
-   648, 648, 648, 648, 649, 650, 125, 125, 651, 651, 651, 651, 652, 653, 125, 125,
-   125, 125, 125, 125, 125, 125, 125, 333,   0,   0,   0, 654, 125, 125, 125, 125,
-   333,   0,   0, 247, 125, 125, 125, 125, 655,  27, 656, 657, 658, 659, 660, 661,
-   662, 663, 664, 663, 125, 125, 125, 665,   0,   0, 357,   0,   0,   0,   0,   0,
-     0, 603, 226, 333, 333, 333,   0, 606,   0,   0, 247, 125, 125, 125, 666,   0,
-   667,   0,   0, 357, 613, 668, 606, 125,   0,   0,   0,   0,   0, 669, 349, 349,
-     0,   0,   0,   0,   0,   0,   0, 670,   0,   0,   0,   0,   0, 284, 357, 228,
-   357,   0,   0,   0, 671, 284,   0,   0, 671,   0, 247, 668, 125, 125, 125, 125,
-     0,   0,   0,   0,   0, 603, 247, 349, 613,   0,   0, 672, 673, 357, 613, 613,
-     0, 329,   0,   0, 235, 125, 125, 284, 248, 248, 248, 248, 248, 248, 125, 125,
-   248, 248, 248, 318, 248, 248, 248, 248, 248, 317, 248, 248, 248, 248, 248, 248,
-   248, 248, 584, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 674, 248,
-   248, 248, 248, 248, 248, 317, 125, 125, 248, 317, 125, 125, 125, 125, 125, 125,
-   248, 248, 248, 248, 675, 248, 248, 248, 248, 248, 248, 125, 125, 125, 125, 125,
-   676, 125,   0,   0,   0,   0,   0,   0,   8,   8,   8,   8,   8,   8,   8,   8,
-     8,   8,   8,   8,   8,   8,   8,   0,   0,   0,   0,   0,   1,   2,   2,   2,
-     2,   2,   3,   0,   0,   0,   4,   0,   2,   2,   2,   2,   2,   3,   2,   2,
-     2,   2,   5,   0,   2,   5,   6,   0,   7,   7,   7,   7,   8,   9,  10,  11,
-    12,  13,  14,  15,   8,   8,   8,   8,  16,   8,   8,   8,  17,  18,  18,  18,
-    19,  19,  19,  19,  19,  20,  19,  19,  21,  22,  22,  22,  22,  22,  22,  22,
-    22,  23,  21,  22,  22,  22,  23,  21,  24,  25,  25,  25,  25,  25,  25,  25,
-    25,  25,  12,  12,  25,  25,  26,  27,  25,  28,  12,  12,  29,  30,  29,  31,
-    29,  29,  32,  32,  29,  29,  29,  29,  31,  29,  33,   7,   7,  34,  29,  29,
-    35,  29,  29,  29,  29,  29,  29,  30,  36,  36,  36,  37,  36,  36,  36,  36,
-    36,  36,  38,  39,  40,  40,  40,  40,  41,  12,  12,  12,  42,  42,  42,  42,
-    42,  42,  43,  44,  45,  45,  45,  45,  45,  45,  45,  46,  45,  45,  45,  47,
-    48,  48,  48,  48,  48,  48,  48,  49,  36,  36,  38,  12,  29,  29,  29,  50,
-    51,  12,  29,  29,  52,  29,  29,  29,  53,  53,  53,  53,  54,  55,  53,  53,
-    53,  56,  53,  53,  57,  58,  57,  59,  59,  57,  57,  57,  57,  57,  60,  57,
-    61,  62,  63,  57,  57,  59,  59,  64,  12,  65,  12,  66,  57,  62,  57,  57,
-    57,  57,  57,  64,  67,  67,  68,  69,  70,  71,  71,  71,  71,  71,  72,  71,
-    72,  73,  74,  72,  68,  69,  70,  74,  75,  12,  67,  76,  12,  77,  71,  71,
-    71,  68,  12,  12,  78,  78,  79,  80,  80,  79,  79,  79,  79,  79,  81,  79,
-    81,  78,  82,  79,  79,  80,  80,  82,  83,  12,  12,  12,  79,  84,  79,  79,
-    82,  12,  78,  79,  85,  85,  86,  87,  87,  86,  86,  86,  86,  86,  88,  86,
-    88,  85,  89,  86,  86,  87,  87,  89,  12,  85,  12,  90,  86,  91,  86,  86,
-    86,  86,  12,  12,  92,  93,  94,  92,  95,  96,  97,  95,  98,  99,  94,  92,
-   100, 100,  96,  92,  94,  92,  95,  96,  99,  98,  12,  12,  12,  92, 100, 100,
-   100, 100,  94,  12, 101, 101, 101, 102, 102, 101, 101, 101, 101, 101, 102, 101,
-   101, 101, 103, 101, 101, 102, 102, 103,  12, 104, 105, 106, 101, 107, 101, 101,
-    12, 108, 101, 101, 109, 109, 109, 110, 110, 109, 109, 109, 109, 109, 110, 109,
-   109, 111, 112, 109, 109, 110, 110, 112,  12, 113,  12, 113, 109, 114, 109, 109,
-   111,  12,  12,  12, 115, 115, 115, 116, 116, 115, 115, 115, 115, 115, 115, 115,
-   115, 116, 116, 115,  12, 115, 115, 115, 115, 117, 115, 115, 118, 118, 119, 119,
-   119, 120, 121, 119, 119, 119, 119, 119, 122, 119, 119, 123, 119, 120, 124, 125,
-   119, 126, 119, 119,  12, 121, 119, 119, 121, 127,  12,  12, 128, 129, 129, 129,
-   129, 129, 129, 129, 129, 129, 130, 131, 129, 129, 129,  12,  12,  12,  12,  12,
-   132, 133, 134, 135, 135, 135, 135, 135, 135, 136, 135, 135, 135, 135, 135, 137,
-   135, 138, 135, 134, 135, 135, 137, 135, 139, 139, 139, 139, 139, 139, 140, 139,
-   139, 139, 139, 141, 140, 139, 139, 139, 139, 139, 139, 142, 139, 143, 144,  12,
-   145, 145, 145, 145, 146, 146, 146, 146, 146, 147,  12, 148, 146, 146, 149, 146,
-   150, 150, 150, 150, 151, 151, 151, 151, 151, 151, 152, 153, 151, 154, 152, 153,
-   152, 153, 151, 154, 152, 153, 151, 151, 151, 154, 151, 151, 151, 151, 154, 155,
-   151, 151, 151, 156, 151, 151, 153,  12, 157, 157, 157, 157, 157, 158, 157, 158,
-   159, 159, 159, 159, 160, 160, 160, 160, 160, 160, 160, 161, 162, 162, 162, 162,
-   162, 162, 163, 164, 162, 162, 165,  12, 166, 166, 166, 166, 166, 167,  12, 168,
-   169, 169, 169, 169, 169, 170,  12,  12, 171, 171, 171, 171, 171,  12,  12,  12,
-   172, 172, 172, 173, 173,  12,  12,  12, 174, 174, 174, 174, 174, 174, 174, 175,
-   174, 174, 175,  12, 176, 177, 178, 178, 178, 178, 179,  12, 178, 178, 178, 178,
-   178, 178, 180,  12, 178, 178, 181,  12, 159, 182,  12,  12, 183, 183, 183, 183,
-   183, 183, 183, 184, 183, 183, 183,  12, 185, 183, 183, 183, 186, 186, 186, 186,
-   186, 186, 186, 187, 186, 188,  12,  12, 189, 189, 189, 189, 189, 189, 189,  12,
-   189, 189, 190,  12, 189, 189, 191, 192, 193, 193, 193, 193, 193, 193, 193, 194,
-   195, 195, 195, 195, 195, 195, 195, 196, 195, 195, 195, 197, 195, 195, 198,  12,
-   195, 195, 195, 198,   7,   7,   7, 199, 200, 200, 200, 200, 200, 200, 200, 201,
-   200, 200, 200, 202, 203, 203, 203, 203, 204, 204, 204, 204, 204,  12,  12, 204,
-   205, 205, 205, 205, 205, 205, 206, 205, 205, 205, 207, 208, 209, 209, 209, 209,
-    19,  19, 210,  12, 146, 146, 211, 212, 203, 203,  12,  12, 213,   7,   7,   7,
-   214,   7, 215, 216,   0, 215, 217,  12,   2, 218, 219,   2,   2,   2,   2, 220,
-   221, 218, 222,   2,   2,   2, 223,   2,   2,   2,   2, 224,   8, 225,   8, 225,
-     8,   8, 226, 226,   8,   8,   8, 225,   8,  15,   8,   8,   8,  10,   8, 227,
-    10,  15,   8,  14,   0,   0,   0, 228,   0, 229,   0,   0, 230,   0,   0, 231,
-     0,   0,   0, 232,   2,   2,   2, 233, 234,  12,  12,  12, 235,  12,  12,  12,
-     0, 236, 237,   0,   4,   0,   0,   0,   0,   0,   0,   4,   2,   2,   5,  12,
-     0, 232,  12,  12,   0,   0, 232,  12, 238, 238, 238, 238,   0, 239,   0,   0,
-     0, 240,   0,   0, 241, 241, 241, 241,  18,  18,  18,  18,  18,  12, 242,  18,
-   243, 243, 243, 243, 243, 243,  12, 244, 245,  12,  12, 244, 151, 154,  12,  12,
-   151, 154, 151, 154,   0,   0,   0, 246, 247, 247, 247, 247, 247, 247, 248, 247,
-   247,  12,  12,  12, 247, 249,  12,  12,   0, 250,   0,   0, 251, 247, 252, 253,
-     0,   0, 247,   0, 254, 255, 255, 255, 255, 255, 255, 255, 255, 256, 257, 258,
-   259, 260, 260, 260, 260, 260, 260, 260, 260, 260, 261, 259,  12, 262, 263, 263,
-   263, 263, 263, 263, 264, 150, 150, 150, 150, 150, 150, 265,   0,  12,  12, 131,
-   150, 150, 150, 266, 260, 260, 260, 261, 260, 260,   0,   0, 267, 267, 267, 267,
-   267, 267, 267, 268, 267, 269,  12,  12, 270, 270, 270, 270, 271, 271, 271, 271,
-   271, 271, 271,  12, 272, 272, 272, 272, 272, 272,  12,  12, 237,   2,   2,   2,
-     2,   2, 231,   2,   2,   2, 273,  12, 274, 275, 276,  12, 277,   2,   2,   2,
-   278, 278, 278, 278, 278, 278, 278, 279,   0,   0, 246,  12, 280, 280, 280, 280,
-   280, 280,  12,  12, 281, 281, 281, 281, 281, 282,  12, 283, 281, 281, 282,  12,
-   284, 284, 284, 284, 284, 284, 284, 285, 286, 286, 286, 286, 286,  12,  12, 287,
-   150, 150, 150, 288, 289, 289, 289, 289, 289, 289, 289, 290, 289, 289, 291, 292,
-   145, 145, 145, 293, 294, 294, 294, 294, 294, 295,  12,  12, 294, 294, 294, 296,
-   294, 294, 296, 294, 297, 297, 297, 297, 298,  12,  12,  12,  12,  12, 299, 297,
-   300, 300, 300, 300, 300, 301,  12,  12, 155, 154, 155, 154, 155, 154,  12,  12,
-     2,   2,   3,   2,   2, 302, 303,  12, 300, 300, 300, 304, 300, 300, 304,  12,
-   150,  12,  12,  12, 150, 265, 305, 150, 150, 150, 150,  12, 247, 247, 247, 249,
-   247, 247, 249,  12,   2, 273,  12,  12, 306,  22,  12,  24,  25,  26,  25, 307,
-   308, 309,  25,  25,  50,  12,  12,  12, 310,  29,  29,  29,  29,  29,  29, 311,
-   312,  29,  29,  29,  29,  29,  12, 310,   7,   7,   7, 313, 232,   0,   0,   0,
-     0, 232,   0,  12,  29, 314,  29,  29,  29,  29,  29, 315, 316,   0,   0,   0,
-     0, 317, 260, 260, 260, 260, 260, 318, 319, 150, 319, 150, 319, 150, 319, 288,
-     0, 232,   0, 232,  12,  12, 316, 246, 320, 320, 320, 321, 320, 320, 320, 320,
-   320, 322, 320, 320, 320, 320, 322, 323, 320, 320, 320, 324, 320, 320, 322,  12,
-   232, 131,   0,   0,   0, 131,   0,   0,   8,   8,   8,  14,   0,   0,   0, 234,
-   325,  12,  12,  12,   0,   0,   0, 326, 327, 327, 327, 327, 327, 327, 327, 328,
-   329, 329, 329, 329, 330,  12,  12,  12, 215,   0,   0,   0,   0,   0,   0,  12,
-   331, 331, 331, 331, 331,  12,  12, 332, 333, 333, 333, 333, 333, 333, 334,  12,
-   335, 335, 335, 335, 335, 335, 336,  12, 337, 337, 337, 337, 337, 337, 337, 338,
-   339, 339, 339, 339, 339,  12, 339, 339, 339, 340,  12,  12, 341, 341, 341, 341,
-   342, 342, 342, 342, 343, 343, 343, 343, 343, 343, 343, 344, 343, 343, 344,  12,
-   345, 345, 345, 345, 345,  12, 345, 345, 345, 345, 345,  12, 346, 346, 346, 346,
-   346, 346,  12,  12, 347, 347, 347, 347, 347,  12,  12, 348, 349, 349, 350, 349,
-   350, 351, 349, 349, 351, 349, 349, 349, 351, 349, 351, 352, 353, 353, 353, 353,
-   353, 354,  12,  12, 353, 355,  12,  12, 353, 353,  12,  12,   2, 274,   2,   2,
-   356,   2, 273,  12, 357, 358, 359, 357, 357, 357, 357, 357, 357, 360, 361, 362,
-   363, 363, 363, 363, 363, 364, 363, 363, 365, 365, 365, 365, 366, 366, 366, 366,
-   366, 366, 366, 367,  12, 368, 366, 366, 369, 369, 369, 369, 370, 371, 372, 369,
-   373, 373, 373, 373, 373, 373, 373, 374, 375, 375, 375, 375, 375, 375, 376, 377,
-   378, 378, 378, 378, 379, 379, 379, 379, 379, 379,  12, 379, 380, 379, 379, 379,
-   381, 382,  12, 381, 381, 383, 383, 381, 381, 381, 381, 381, 381, 384, 385, 386,
-   381, 381, 387,  12, 388, 388, 388, 388, 389, 389, 389, 389, 390, 390, 390, 390,
-   390, 391, 392, 390, 390, 391,  12,  12, 393, 393, 393, 393, 393, 394, 395, 393,
-   396, 396, 396, 396, 396, 397, 396, 396, 398, 398, 398, 398, 399,  12, 398, 398,
-   400, 400, 400, 400, 401,  12, 402, 403,  12,  12, 402, 400, 404, 404, 404, 404,
-   404, 404, 405,  12, 406, 406, 406, 406, 407,  12,  12,  12, 407,  12, 408, 406,
-   409, 409, 409, 409, 409, 409,  12,  12, 409, 409, 410,  12, 411, 411, 411, 411,
-   411, 411, 412, 413, 413,  12,  12,  12,  12,  12,  12, 414, 415, 415, 415, 415,
-   415, 415,  12,  12, 416, 416, 416, 416, 416, 416, 417,  12, 418, 418, 418, 418,
-   418, 418, 419,  12, 420, 420, 420, 420, 420, 420, 420,  12, 421, 421, 421, 421,
-   421, 422,  12,  12, 423, 423, 423, 423, 423, 423, 423, 424, 425, 423, 423, 423,
-   423, 424,  12, 426, 427, 427, 427, 427, 428,  12,  12, 429, 430, 430, 430, 430,
-   430, 430, 431,  12, 430, 430, 432,  12, 433, 433, 433, 433, 433, 434, 433, 433,
-   433, 433,  12,  12, 435, 435, 435, 435, 435, 436,  12,  12, 437, 437, 437, 437,
-   118, 119, 119, 119, 119, 127,  12,  12, 438, 438, 438, 438, 439, 438, 438, 438,
-   440,  12,  12,  12, 441, 442, 443, 444, 441, 441, 441, 444, 441, 441, 445,  12,
-   446, 446, 446, 446, 446, 446, 447,  12, 446, 446, 448,  12, 449, 450, 449, 451,
-   451, 449, 449, 449, 449, 449, 452, 449, 452, 450, 453, 449, 449, 451, 451, 454,
-   455, 456,  12, 450, 449, 457, 449, 455, 449, 455,  12,  12, 458, 458, 458, 458,
-   458, 458, 458, 459, 460,  12,  12,  12, 461, 461, 461, 461, 461, 461,  12,  12,
-   461, 461, 462,  12, 463, 463, 463, 463, 463, 464, 463, 463, 463, 463, 463, 464,
-   465, 465, 465, 465, 465, 466,  12,  12, 465, 465, 467,  12, 178, 178, 178, 180,
-   468, 468, 468, 468, 468, 468, 469,  12, 470, 470, 470, 470, 470, 470, 471, 472,
-   470, 470, 470,  12, 470, 471,  12,  12, 473, 473, 473, 473, 473, 473, 473,  12,
-   474, 474, 474, 474, 475,  12,  12, 476, 477, 478, 479, 477, 477, 480, 477, 477,
-   477, 477, 477, 477, 477, 481, 482, 477, 477, 478,  12,  12, 477, 477, 483,  12,
-   484, 484, 485, 484, 484, 484, 484, 484, 484, 486,  12,  12, 487, 487, 487, 487,
-   487, 487,  12,  12, 488, 488, 488, 488, 489,  12,  12,  12, 490, 490, 490, 490,
-   490, 490, 491,  12,  53,  53, 492,  12, 493, 493, 494, 493, 493, 493, 493, 493,
-   493, 495, 493, 493, 493, 496,  12,  12, 493, 493, 493, 497, 498, 498, 498, 498,
-   499, 498, 498, 498, 498, 498, 500, 498, 498, 501,  12,  12, 502, 503, 504, 502,
-   502, 502, 502, 502, 502, 503, 505, 504, 502, 502,  12,  12, 502, 502, 506,  12,
-   507, 508, 509, 507, 507, 507, 507, 507, 507, 507, 507, 510, 508, 507, 511,  12,
-   507, 507, 512,  12, 513, 513, 513, 513, 513, 513, 514,  12, 515, 515, 515, 515,
-   516, 515, 515, 515, 515, 515, 517, 518, 515, 515, 519,  12, 520,  12,  12,  12,
-   100, 100, 100, 100,  96,  12,  12,  98, 521, 521, 521, 521, 521, 521, 522,  12,
-   521, 521, 521, 523, 521, 524,  12,  12, 521,  12,  12,  12, 525, 525, 525, 525,
-   526,  12,  12,  12, 527, 527, 527, 527, 527, 528,  12,  12, 529, 529, 529, 529,
-   529, 530,  12,  12, 272, 272, 531,  12, 532, 532, 532, 532, 532, 532, 532, 533,
-   532, 532, 534, 535, 536, 536, 536, 536, 536, 536, 536, 537, 536, 536, 538,  12,
-   539, 539, 539, 539, 539, 539, 539, 540, 539, 540,  12,  12, 541, 541, 541, 541,
-   541, 542,  12,  12, 541, 541, 543, 541, 543, 541, 541, 541, 541, 541,  12, 544,
-   545, 545, 545, 545, 545, 545, 546,  12, 547, 547, 547, 547, 547, 547, 548, 549,
-   547, 547,  12, 549, 550, 551,  12,  12, 249,  12,  12,  12, 552, 552, 552, 552,
-   552, 552,  12,  12, 553, 553, 553, 553, 553, 554,  12,  12, 552, 552, 555,  12,
-   260, 556, 260, 557, 558, 255, 255, 255, 559,  12,  12,  12, 560,  12,  12,  12,
-   256, 561,  12,  12,  12, 260,  12,  12, 562, 562, 562, 562, 562, 562, 562,  12,
-   563, 563, 563, 563, 563, 563, 564,  12, 563, 563, 563, 565, 563, 563, 565,  12,
-   563, 563, 566, 563,   0,  12,  12,  12,   7,   7,   7, 567,   7, 199,  12,  12,
-     0, 246,  12,  12,   0, 232, 316,   0,   0, 568, 228,   0,   0,   0, 568,   7,
-   213, 569,   7,   0,   0,   0, 570, 228,   8, 225,  12,  12,   0,   0, 234,  12,
-     0,   0,   0, 229, 571, 572, 316, 229,   0,   0, 240, 316,   0, 316,   0,   0,
-     0, 240, 232, 316,   0, 229,   0, 229,   0,   0, 240, 232,   0, 573, 239,   0,
-   229,   0,   0,   0,   0, 246,   0,   0,   0,   0,   0, 239, 574, 574, 574, 574,
-   574, 574, 574,  12,  12,  12, 575, 574, 576, 574, 574, 574,   2,   2,   2, 273,
-    12, 275, 273,  12, 241, 577, 241, 241, 241, 241, 578, 241, 579, 580, 577,  12,
-    19,  19,  19, 581,  12,  12,  12, 582, 583, 583, 583, 583, 583, 583, 583, 584,
-   583, 583, 583, 585, 583, 583, 585, 586, 587, 587, 587, 587, 587, 587, 587, 588,
-   589, 589, 589, 589, 589, 589, 590, 591, 592, 592, 592, 592, 592, 592, 593,  12,
-   151, 154, 151, 594, 151, 151, 151, 154, 595, 595, 595, 595, 595, 596, 595, 595,
-   595, 597,  12,  12, 598, 598, 598, 598, 598, 598, 598,  12, 598, 598, 599, 600,
-     0, 234,  12,  12,  29, 414,  29,  29, 601, 602, 414,  29,  50,  29, 603,  12,
-   604, 310, 603, 414, 601, 602, 603, 603, 601, 602,  50,  29,  50,  29, 414, 605,
-    29,  29, 606,  29,  29,  29,  29,  12, 414, 414, 606,  29,  51,  12,  12,  12,
-    12, 239,   0,   0, 607,  12,  12,  12, 246,  12,  12,  12,   0,   0,  12,   0,
-     0, 232, 131,   0,   0,   0,  12,  12,   0,   0,   0, 240,   0, 246,  12, 239,
-   608,  12,  12,  12, 247, 247, 609,  12, 610,  12,  12,  12,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0, 939, 940, 941, 942,
-   946, 948,   0, 962, 969, 970, 971, 976,1001,1002,1003,1008,   0,1033,1040,1041,
-  1042,1043,1047,   0,   0,1080,1081,1082,1086,1110,   0,   0,1124,1125,1126,1127,
-  1131,1133,   0,1147,1154,1155,1156,1161,1187,1188,1189,1193,   0,1219,1226,1227,
-  1228,1229,1233,   0,   0,1267,1268,1269,1273,1298,   0,1303, 943,1128, 944,1129,
-   954,1139, 958,1143, 959,1144, 960,1145, 961,1146, 964,1149,   0,   0, 973,1158,
-   974,1159, 975,1160, 983,1168, 978,1163, 988,1173, 990,1175, 991,1176, 993,1178,
-   994,1179,   0,   0,1004,1190,1005,1191,1006,1192,1014,1199,1007,   0,   0,   0,
-  1016,1201,1020,1206,   0,1022,1208,1025,1211,1023,1209,   0,   0,   0,   0,1032,
-  1218,1037,1223,1035,1221,   0,   0,   0,1044,1230,1045,1231,1049,1235,   0,   0,
-  1058,1244,1064,1250,1060,1246,1066,1252,1067,1253,1072,1258,1069,1255,1077,1264,
-  1074,1261,   0,   0,1083,1270,1084,1271,1085,1272,1088,1275,1089,1276,1096,1283,
-  1103,1290,1111,1299,1115,1118,1307,1120,1309,1121,1310,   0,1053,1239,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,1093,1280,   0,   0,   0,
+   391, 391, 391, 391, 391, 391, 391, 391, 391, 391, 391, 391, 391, 391, 391, 705,
+   391, 391, 391, 391, 391, 391, 391, 391, 391, 391, 391, 391, 391, 391, 391, 706,
+     0,   0,   1,   1,   0,   2,   3,   3,   4,   4,   4,   4,   4,   4,   4,   4,
+     4,   4,   4,   4,   4,   5,   0,   6,   7,   7,   7,   8,   9,  10,  11,  12,
+    13,  13,  13,  13,  14,  13,  13,  13,  13,  15,  16,  17,  18,  19,  20,  21,
+    22,  23,  24,  25,  23,  23,  26,  23,  27,  28,  29,  23,  30,  31,  32,  33,
+    34,  35,  36,  37,  38,  23,  23,  39,  40,  40,  41,  42,  43,  44,  45,  46,
+    47,  48,  49,  50,  51,  52,  53,  54,  55,  56,  57,  58,  59,  60,  61,  62,
+    63,  64,  65,  66,  67,  68,  69,  70,  71,  72,  73,  74,  75,  76,  77,  78,
+    79,  80,  81,  82,  83,  84,  85,  82,  86,  86,  87,  88,  89,  90,  91,  82,
+    92,  92,  92,  92,  92,  93,  94,  95,  96,  96,  96,  96,  96,  96,  96,  96,
+    97,  97,  98,  97,  99, 100, 101,  97, 102,  97, 103, 104, 105, 106, 106, 107,
+   108, 108, 108, 108, 108, 108, 108, 108, 108, 108, 108, 108, 109, 110, 110, 111,
+   112, 113, 114, 115, 116, 116, 117, 118, 119, 120, 120, 121, 120, 122, 108, 123,
+   124, 125, 126, 127, 128, 129, 130, 116, 131, 132, 133, 134, 135, 136, 137,  82,
+   138, 138, 139, 138, 140, 140, 141, 142, 143, 144, 145, 146, 147, 148, 149, 150,
+     4, 151, 152, 153,   4, 154,   7,   7, 155,  11, 156, 157,  11, 158, 159, 160,
+   161,   0,   0, 162, 163,   0, 164, 165,   0, 166, 167,   4, 168,   0,   0,   0,
+     0,   0,   0,   0,   0,   0,   0,   0,   0, 169, 170,   0,   0,   0,   0,   0,
+   171, 171, 171, 171, 171, 171, 171, 171,   0,   0,   0, 172, 173,   0,   0,   0,
+   174, 174, 174,   4, 175, 175, 175, 176,  93, 177, 178, 179, 180, 181, 181,  13,
+     0,   0, 182,  82, 183, 184, 184, 185, 184, 184, 184, 184, 184, 184, 186, 187,
+   188, 189, 190, 191, 192, 193, 194, 195, 196, 197,  96,  96, 198, 199,   0, 200,
+   201,   0,   0, 202,   0,   0, 203, 204, 194, 194, 205,   0,   0,   0,   0,   0,
+   184, 184, 184, 184, 184, 184, 184, 184, 184, 184, 184, 184, 184, 184,   0,   0,
+   206, 206, 206, 206, 206, 206, 206, 206, 206, 206, 206, 206, 207, 206, 208, 209,
+   210, 210, 210, 210, 210, 210, 210, 210, 210, 211,  13,  13,  13, 212, 212, 213,
+     0, 214,   4,   4, 215,   4, 216, 217, 218, 219, 220, 221, 222, 222, 223,  40,
+   224, 225, 226, 227, 228, 228, 229, 230, 231, 232, 233,  92, 234, 234, 235, 236,
+   237, 238, 239, 240, 106, 106, 241, 242,  96,  96,  96,  96,  96, 243, 244, 245,
+    82,  82,  82,  82,  82,  82,  82,  82, 184, 184, 184, 246, 184, 184, 247,  82,
+   248, 249, 250,  23,  23,  23, 251,  23,  23,  23,  23,  23,  23,  23,  23,  23,
+    23, 252,  23,  23, 253,  23, 254, 255, 256, 257, 258, 259,  23,  23,  23, 260,
+   261,   1,   1, 262, 263, 201, 264, 265, 266, 267, 268,  82, 269, 269, 269, 270,
+   271, 272,  11,  11, 273, 274, 187, 275,  82,  82,  82,  82, 276, 277, 278, 279,
+   280, 281, 282, 283, 284, 285, 286,  82, 287, 287, 288, 289, 290, 291, 292, 293,
+   294, 295, 296, 297, 298, 299, 300, 301, 302, 302, 302, 302, 302, 302, 302, 302,
+   302, 303, 304, 305, 306, 307,  82,  82, 308, 309, 310, 311, 312, 313,  82, 314,
+   315, 316,  82,  82, 317, 318, 319, 320, 321, 322, 323, 324, 325,  82, 326, 327,
+   328, 329, 330, 331, 332, 333,  82,  82, 334, 334, 335,  82, 336, 337, 336, 338,
+   339, 340, 341, 342, 343,  82,  82,  82,  82,  82,  82, 344, 345, 346, 347, 348,
+   349, 350, 351, 352, 353, 354, 355, 356, 357, 357, 358, 359, 360, 360, 361, 362,
+   363, 364, 365, 366, 367, 367, 367, 368, 369, 370, 371,  82, 372, 373, 374, 375,
+   376, 377, 378, 379, 380, 381, 382, 383, 384, 384, 385, 386, 387, 387, 388,  82,
+    82,  82,  82,  82, 389, 390, 391,  82, 392, 392, 393, 394, 395, 396, 397, 398,
+   399, 400, 401,  82,  82,  82,  82,  82, 402, 403,  82,  82,  82, 404, 404, 405,
+   406, 407, 408,  82,  82, 409, 410, 411, 412, 412, 413, 414, 414, 415, 416, 417,
+   418,  82,  82,  82,  82,  82, 419, 420, 421, 422, 423, 424, 425, 426,  82,  82,
+   427, 428, 429, 430, 431, 432,  82,  82,  82,  82,  82,  82,  82,  82,  82, 433,
+   434, 435, 436,  82,  82, 437, 438, 439, 440, 440, 440, 440, 440, 440, 440, 440,
+   440, 440, 440, 440, 441,  82,  82,  82, 440, 440, 440, 442, 440, 440, 440, 440,
+   440, 440, 443,  82,  82,  82,  82,  82,  82,  82,  82,  82, 444, 445, 445, 446,
+   447, 447, 447, 447, 447, 447, 447, 447, 447, 447, 448, 447, 447, 447, 447, 447,
+   447, 447, 447, 447, 447, 447, 447, 449, 450, 450, 450, 450, 450, 450, 450, 450,
+   450, 450, 451,  82,  82,  82,  82,  82, 452, 453,  82,  82,  82,  82,  82,  82,
+   212, 212, 212, 212, 212, 212, 212, 212, 212, 454, 455, 456, 457, 458, 459, 460,
+   461, 461, 462, 463, 464,  82,  82,  82,  82,  82, 465, 466,  82,  82,  82,  82,
+    82,  82, 467, 467, 468,  82,  82,  82, 469, 469, 470, 469, 471,  82,  82, 472,
+   473, 473, 473, 473, 473, 473, 473, 473, 473, 473, 473, 473, 473, 473, 473, 474,
+   475, 475, 475, 475, 475, 475, 475, 475, 475, 475, 475, 475, 475, 475, 476, 477,
+   478,  82,  82,  82,  82,  82,  82,  82,  82,  82,  82,  82,  82,  82,  82, 479,
+   480, 191, 191, 191, 191, 191, 191, 191, 191, 481, 482, 483, 484, 484, 484, 484,
+   484, 484, 484, 484, 484, 484, 484, 485, 486, 486, 486, 487, 488, 489,  82,  82,
+     0,   0,   0,   0,   0,   0,   0, 490,   0,   0,   0,   0,   0, 491,  82,  82,
+     7, 492, 493,   0,   0,   0, 489,  82,   0,   0,   0,   0,   0,   0,   0, 494,
+     0, 495,   0, 496, 497, 498,   0, 170,  11,  11, 499,  82,  82,  82, 491, 491,
+     0,   0, 500, 501,  82,  82,  82,  82,   0,   0, 502,   0, 503, 504, 505,   0,
+   506, 507, 508,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0, 509,   0,   0,
+     0,   0,   0,   0,   0,   0, 510,   0, 511, 511, 511, 511, 511, 511, 511, 511,
+   511, 511, 511, 511, 512, 513,  82,  82, 514, 515,  82,  82,  82,  82,  82,  82,
+   516, 517,  13, 518, 519,  82,  82,  82, 520, 521, 522,  82,  82,  82,  82,  82,
+    82,  82,  82,  82, 523, 524, 525, 526,  82,  82,  82,  82,  82,  82, 527, 528,
+    82,  82,  82,  82,  82,  82, 529, 530,  82,  82,  82,  82,  82,  82,  82, 531,
+   532, 532, 532, 532, 532, 532, 533,  82, 534, 534, 535,  82,  82,  82,  82,  82,
+    82,  82,  82, 536,   0, 537,  82,  82, 261, 182,  82,  82,  82,  82,  82,  82,
+   538, 539, 540, 541, 542, 543,  82, 544,   0, 545,   0,   0, 491, 546, 547, 494,
+     0,   0,   0,   0,   0, 548,  82, 549, 550, 551, 552, 553,  82,  82,  82,  82,
+     0,   0,   0,   0,   0,   0, 554, 555,   0,   0,   0, 556,   0,   0, 490, 557,
+   545,   0, 558,   0, 559, 560, 561,  82,   0,   0, 491, 562, 563,   0, 564, 565,
+     0,   0,   0,   0, 258,   0,   0, 490, 184, 184, 184, 184, 184, 184, 184,  82,
+   184, 247, 184, 184, 184, 184, 184, 184, 566, 184, 184, 184, 184, 184, 184, 184,
+   184, 184, 184, 184, 184, 567, 184, 184, 184, 184, 184, 184, 184, 184, 184, 568,
+   184, 184, 566,  82,  82,  82,  82,  82, 566,  82,  82,  82,  82,  82,  82,  82,
+   184, 184, 569, 184, 184, 184, 184, 184, 184, 184, 184, 184, 184, 570,  82,  82,
+   571,   0,   0,   0,  82,  82,  82,  82,   7,   7,   7,   7,   7,   7,   7, 572,
+     0,   0,   0,   0,   1,   2,   2,   3,   0,   4,   0,   4,   2,   2,   5,   2,
+     2,   2,   2,   2,   2,   2,   2,   6,   7,   8,   0,   0,   9,   9,   9,   9,
+     9,   9,  10,  11,  12,  13,  14,  14,  15,  14,  14,  14,  14,  14,  14,  14,
+    16,  17,  14,  14,  18,  18,  18,  18,  19,  18,  18,  18,  18,  18,  20,  21,
+    21,  21,  22,  20,  21,  21,  21,  21,  21,  23,  24,  25,  25,  25,  25,  25,
+    25,  26,  25,  25,  25,  27,  28,  26,  29,  30,  31,  32,  31,  31,  31,  31,
+    33,  34,  35,  31,  31,  31,  36,  31,  31,  31,  31,  29,  37,  38,  37,  37,
+    37,  37,  37,  37,  37,  39,  31,  31,  40,  40,  40,  40,  40,  40,  41,  26,
+    42,  42,  42,  42,  42,  42,  42,  43,  44,  44,  44,  44,  44,  45,  44,  46,
+    47,  47,  47,  48,  37,  49,  31,  31,  31,  50,  51,  31,  52,  31,  31,  31,
+    53,  53,  53,  53,  53,  53,  54,  53,  55,  53,  53,  53,  56,  57,  58,  59,
+    59,  60,  61,  62,  57,  63,  64,  65,  66,  59,  59,  67,  68,  69,  70,  71,
+    71,  72,  73,  74,  69,  75,  76,  77,  78,  71,  79,  26,  80,  81,  82,  83,
+    83,  84,  85,  86,  81,  87,  88,  26,  89,  83,  90,  91,  92,  93,  94,  95,
+    95,  96,  97,  98,  93,  99, 100, 101, 102,  95,  95,  26, 103, 104, 105, 106,
+   107, 104, 108, 109, 104, 105, 110,  26, 111, 108, 108, 112, 113, 114, 115, 113,
+   113, 115, 113, 116, 114, 117, 118, 119, 120, 113, 121, 113, 122, 123, 124, 122,
+   122, 124, 125, 126, 123, 127, 128, 128, 129, 122, 130,  26, 131, 132, 133, 131,
+   131, 131, 131, 131, 132, 133, 134, 131, 135, 131, 131, 131, 136, 137, 138, 139,
+   137, 137, 140, 141, 138, 142, 143, 137, 144, 137, 145,  26, 146, 147, 147, 147,
+   147, 147, 147, 148, 147, 147, 147, 149,  26,  26,  26,  26, 150, 151, 152, 152,
+   153, 152, 152, 154, 155, 156, 152, 157, 158, 158, 158, 158, 158, 159, 158, 158,
+   158, 160, 159, 158, 158, 158, 158, 159, 158, 158, 158, 161, 158, 161, 162, 163,
+   164, 164, 164, 164, 165, 165, 165, 165, 166, 167, 165, 165, 165, 165, 165, 168,
+   169, 169, 169, 169, 170, 170, 170, 170, 170, 171, 172, 171, 170, 171, 170, 170,
+   170, 170, 171, 172, 171, 170, 172, 170, 170, 170, 171, 170, 170, 170, 170, 173,
+   170, 170, 170, 174, 170, 170, 170, 175, 176, 176, 176, 176, 176, 176, 177, 177,
+   178, 178, 178, 178, 179, 179, 179, 180, 181, 181, 181, 181, 181, 182, 181, 183,
+   184, 184, 185, 186, 187, 187, 188,  26, 189, 189, 190,  26, 191, 192, 193,  26,
+   194, 194, 194, 194, 194, 194, 194, 195, 194, 196, 194, 196, 197, 198, 198, 199,
+   198, 198, 198, 198, 198, 198, 198, 200, 198, 201, 178, 178, 178, 178, 202,  26,
+   203, 203, 203, 204, 203, 205, 203, 205, 206, 203, 207, 207, 207, 208, 209,  26,
+   210, 210, 210, 210, 210, 211, 210, 210, 210, 212, 210, 213, 214, 214, 214, 215,
+   216, 216, 216, 216, 216, 216, 216, 217, 216, 216, 216, 218, 216, 219, 216, 219,
+   216, 220,   9,   9,   9, 221,  26,  26, 222, 222, 222, 222, 222, 223, 222, 222,
+   224, 224, 224, 224, 225, 225, 225, 225, 225, 225, 226, 227, 228, 228, 228, 228,
+   228, 228, 228, 229, 228, 230, 231, 231, 231, 231, 231, 231,  18, 232, 165, 165,
+   165, 165, 165, 233, 224,  26, 234,   9, 235, 236, 237, 238, 239, 240,   2,   2,
+     2,   2,   2, 241, 242, 243,   2, 244,   2,   2,   2, 245,  14,  14, 246, 246,
+   246, 246,  14, 247,  14,  14,  14, 246,  14,  14, 248,  14, 248,  14, 249, 250,
+    14,  14, 251, 252,   0, 253,   0,   0, 254,   0, 255, 256,   0, 257,   2, 258,
+   259,  26,   9,   9,   9,   9, 260,  26, 261, 262,   4,   0,   0, 263,   0,   0,
+     2, 264,   0,   0,   0, 265,  26,  26,   0, 266,  26,  26, 267, 267, 267, 267,
+     0,   0, 268,   0,   0,   0, 269,   0, 270, 270, 270, 270,  17,  17,  17,  17,
+    17,  17, 271, 272, 166, 167, 273, 273, 273, 273, 273, 273, 273, 274, 275, 274,
+   170, 170, 172,  26, 172, 172, 172, 172,   0,   0,   0, 276, 277, 277, 277, 278,
+   277, 277, 277, 277, 277, 277, 279,  26, 277, 277, 280,  26,  26,  26,   0,   0,
+   281,   0,   0,   0, 282, 283,   0, 284, 285, 286, 286, 286, 286, 286, 286, 286,
+   286, 286, 287, 288, 289, 290, 290, 290, 290, 290, 290, 290, 290, 290, 290, 291,
+   292, 293, 293, 293, 293, 293, 294, 169, 169, 295,   0,   0, 293, 293, 293, 293,
+   276, 296, 290, 290, 169, 169, 169, 295, 169, 169, 169, 297,   0,   0, 290, 290,
+   290, 290, 290, 298, 290, 290, 290,   0, 299, 299, 299, 299, 299, 300, 299, 299,
+   301,  26, 302, 302, 302, 302, 302, 302, 303, 303, 303, 303, 303, 304,  26,  26,
+   305, 305, 305, 305, 305, 305, 305,  26, 306,   2,   2,   2,   2, 307,   2,   2,
+     2, 308, 309, 258,  26,  26, 310,   2, 311, 311, 311, 311, 311, 312,   0, 265,
+   313, 313, 313, 313, 313, 313, 313,  26, 314, 314, 314, 314, 315, 316, 314, 317,
+   318, 318, 318, 318, 318, 319, 320, 320, 320, 320, 321, 322, 169, 169, 169, 323,
+   324, 324, 324, 324, 324, 325, 324, 326, 164, 164, 164, 327, 328, 328, 328, 328,
+   328, 328, 329,  26, 328, 330, 328, 331, 332, 332, 332, 332, 333,  26,  26, 334,
+   335, 335, 336,  26, 337, 337, 337,  26, 172, 172,   2,   2,   2,   2,   2, 338,
+   339, 340, 176, 176, 335, 335, 335, 335, 335, 341, 335, 342, 343,  26, 169, 169,
+   295, 344, 169, 169, 169, 169, 169, 343, 277, 280, 277, 277, 277, 277, 277, 345,
+   346,  26, 347, 348,  25,  25, 349, 350, 351,  25,  31,  31, 352,  26, 353,  31,
+    31,  31,  31, 354,  31,  31, 355,  31,  31, 356,  26,  26,  26,  26,  31,  31,
+     9,   9,   0, 265,   9, 357,   0,   0,   0,   0, 358,   0, 257, 359, 360,  31,
+    31,  31,  31, 361, 362,   0,   0,   0, 363, 290, 289, 290, 290, 290, 290, 364,
+   365, 365, 365, 366, 257, 257,  26, 367, 368, 369, 368, 368, 370, 368, 368, 371,
+   368, 372, 368, 372, 368, 368, 368, 368, 368, 368, 368, 373, 374,   0,   0,   0,
+     0,   0, 375,   0,  14, 252,   0, 376, 377,  26,  26,  26,   0,   0,   0, 378,
+   379, 379, 379, 380, 381, 381, 381, 381, 381, 381, 382,  26, 383,   0,   0, 359,
+   384, 384, 384, 384, 385, 386, 387, 387, 387, 388, 389, 389, 389, 389, 389, 390,
+   391, 391, 391, 392, 393, 393, 393, 393, 394, 393, 395,  26, 396, 396, 396, 396,
+   396, 396, 397, 397, 397, 397, 397, 397, 398, 398, 398, 399, 398, 400, 401, 401,
+   401, 401, 402, 401, 401, 401, 401, 402, 403, 403, 403, 403, 403,  26, 404, 404,
+   404, 404, 404, 404, 405, 406, 407, 408, 407, 408, 409, 407, 410, 407, 410, 411,
+   412, 412, 412, 412, 412, 412, 413,  26, 414, 414, 414, 414, 414, 414, 415,  26,
+   414, 414, 416,  26, 414,  26,  26,  26, 417,   2,   2,   2,   2,   2, 418, 419,
+   420, 421, 422, 422, 422, 422, 423, 424, 425, 425, 426, 425, 427, 427, 427, 427,
+   428, 428, 428, 429, 430, 428,  26,  26, 431, 431, 432, 433, 434, 434, 434, 435,
+   436, 436, 436, 437, 438, 438, 438, 438, 439, 439, 439, 440, 439, 439, 441, 439,
+   439, 439, 439, 439, 442, 443, 444, 445, 446, 446, 447, 448, 446, 449, 446, 449,
+   450, 450, 450, 450, 451, 451, 451, 451, 452, 452, 452, 452, 453, 454, 453,  26,
+   455, 455, 455, 455, 455, 455, 456, 457, 458, 458, 459, 458, 460, 460, 461, 460,
+   462, 462, 463, 464,  26, 465,  26,  26, 466, 466, 466, 466, 466, 467,  26,  26,
+   468, 468, 468, 468, 468, 468, 469,  26, 468, 468, 469, 470, 471, 471, 471, 471,
+   471,  26, 471, 472, 473, 473, 473, 473, 474, 475, 473, 473, 474, 476,  26,  26,
+    31,  31,  31,  50, 477, 477, 477, 477, 477, 478, 479,  26, 480,  26,  26,  26,
+    26,  26,  26, 481, 482, 482, 482, 482, 482,  26, 483, 483, 483, 483, 483, 484,
+    26,  26, 485, 485, 485, 486,  26,  26,  26,  26, 487, 487, 487, 488,  26,  26,
+   489, 489, 490,  26, 491, 491, 491, 491, 491, 492, 493, 491, 491, 491, 492, 494,
+   495, 495, 495, 495, 496, 497, 498, 498, 498, 499, 498, 500, 501, 501, 501, 501,
+   501, 501, 502, 501, 501,  26, 503, 503, 503, 503, 504,  26, 505, 505, 505, 505,
+   506, 137, 507,  26, 508, 508, 509, 508, 508, 508, 508, 508, 510,  26,  26,  26,
+   511, 512, 513, 514, 513, 515, 516, 516, 516, 516, 516, 516, 516, 517, 516, 518,
+   519, 520, 521, 522, 522, 523, 524, 525, 520, 526, 527, 528, 529, 530, 530,  26,
+   531, 532, 531, 531, 531, 531, 533, 531, 534, 535, 533, 536, 537,  26,  26,  26,
+   538, 538, 538, 538, 538, 538, 538, 539, 540,  26,  26,  26, 541, 541, 541, 541,
+   541,  26, 541, 542, 543, 543, 543, 543, 543, 543, 544, 543, 543, 543, 543, 544,
+   545, 545, 545, 545, 546,  26, 545, 547, 198, 548,  26,  26, 549, 549, 549, 549,
+   549, 549, 549, 550, 549, 550, 164, 164, 551,  26,  26,  26, 552, 552, 552, 553,
+   552, 554, 552, 552, 555,  26,  26,  26, 556, 556, 556, 556, 556, 556, 556, 557,
+   558, 558, 558, 558, 558, 558, 559, 560, 561, 562, 563, 564, 564, 564, 565, 566,
+   561,  26, 564, 567, 568, 569, 568, 568, 568, 568, 568, 569, 570,  26,  26,  26,
+   571, 571, 571, 571, 571,  26, 572, 572, 572, 572, 572, 572, 573,  26, 178, 178,
+   574, 574, 574, 574, 574, 574, 574, 575,  53, 576,  26,  26, 577, 577, 577, 577,
+   578,  26, 577, 578, 579, 580, 579, 579, 579, 579, 581, 579, 582,  26, 579, 579,
+   579, 583, 584, 584, 584, 584, 585, 584, 584, 586, 587,  26, 588, 589, 590, 590,
+   590, 590, 588, 591, 590,  26, 590, 592, 593, 594, 595, 595, 595, 596, 597, 598,
+   595, 599,  26,  26, 600, 600, 600, 601, 602, 602, 603, 602, 602, 602, 602, 604,
+   602, 602, 602, 605,  26,  26, 606,  26, 108, 108, 108, 108, 108, 108, 607, 608,
+   609, 609, 609, 609, 609, 609, 609, 610, 609, 611, 612,  26, 613,  26,  26,  26,
+    26,  26, 614, 614, 614, 614, 614, 614, 614, 614, 615,  26, 616, 616, 616, 616,
+   616, 616, 617,  26, 616, 616, 616, 618, 619, 619, 619, 619, 620,  26,  26,  26,
+   621, 621, 621, 621, 621, 621, 621, 622, 305, 305, 305, 623, 624, 624, 624, 625,
+   624, 626, 627, 627, 627, 627, 627, 627, 627, 627, 627, 628, 627, 629, 630, 630,
+   630, 631, 631,  26, 632, 632, 632, 632, 633,  26, 632, 634, 634, 632, 632, 635,
+   632, 632,  26,  26, 636, 636, 636, 636, 636, 636, 636, 637, 638, 638, 638, 638,
+   638, 638, 638, 639, 640, 640, 640, 640, 640, 641, 640, 640, 640, 642, 640, 640,
+   643,  26, 345,  26, 644, 644, 644, 644, 644, 644, 644,  26, 645, 645, 645, 645,
+   645, 645, 646,  26,  26,  26,  26, 647, 644, 648,  26,  26,  26,  26, 649, 650,
+   651, 286, 286, 286, 652,  26, 653,  26,  26,  26, 654,  26, 655,  26, 656, 656,
+   656, 656, 656, 656, 656, 656, 656, 657, 658, 658, 658, 658, 658, 659, 658, 660,
+   658, 661, 658, 662, 359,  26,  26,  26,   0,   0,   0, 265,   0,   0, 359,  26,
+     9, 663,   9,   9, 221,  26,   0,   0,   0,   0, 276,  26, 257, 362,   0,   0,
+   664, 665,   0, 666, 667, 668,   0,   0,   0, 669,   0,   0, 246,  26,  26,  26,
+     0,   0, 257,  26,   0,   0,   0, 259,   0,   0, 254,   0,   0,   0,   0, 254,
+   670, 671,   0, 672, 673,   0,   0,   0, 269, 674, 254, 254,   0,   0,   0, 675,
+   676, 677, 678,   0, 276,   0,   0,   0,   0, 268,   0,   0, 679, 679, 679, 679,
+   679, 680,  26, 681, 682, 679,  26,  26,   2,   2,   2, 346, 683, 419,  26,  26,
+   684, 270, 270, 685, 686, 687,  18,  18,  18, 688,  26,  26,  26, 689,  26,  26,
+   690, 690, 690, 690, 690, 691, 690, 692, 690, 693,  26,  26,  26,  26, 694, 694,
+   694, 695,  26,  26, 696, 696, 696, 696, 696, 696, 696, 697,  26,  26, 698, 698,
+   698, 698, 698, 699,  26,  26, 700, 700, 700, 700, 700, 701, 172, 702, 170, 172,
+   703, 703, 703, 703, 704, 703, 705,  26, 706, 706, 706, 706, 706, 707, 706, 708,
+    26,  26, 362,   0,   0,   0, 376,  26, 709,  31,  31,  31, 710, 711, 712, 713,
+   714, 715, 710, 716, 710, 712, 712, 717,  31, 718,  31, 719, 720, 718,  31, 719,
+    26,  26, 721,  26,   0, 359,   0,   0,   0, 257, 362,   0, 362,   0, 362,   0,
+     0, 276,  26,  26, 722,   0,   0,   0, 723,  26,   0,   0,   0,   0,   0, 359,
+     0, 259, 265,  26, 276,  26,  26,  26,   0,   0,   0, 724,   0, 376,   0, 376,
+     0,   0, 257, 725,   0, 359, 259,  26,   0,  26,   0, 265,   0,  26,   0,   0,
+     0, 276,   0, 359, 265,  26,  26,  26,   0, 276,   0, 376,   0, 726,   0,   0,
+   257, 722,   0, 727,   0, 265,   0, 259, 277, 277, 277, 280, 345,  26, 277, 277,
+   728,  26, 277, 277, 277, 729, 277, 277, 277, 277,  26,  26, 730,  26,  26,  26,
+     9,   9,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+     0,   0,   0,   0, 939, 940, 941, 942, 946, 948,   0, 962, 969, 970, 971, 976,
+  1001,1002,1003,1008,   0,1033,1040,1041,1042,1043,1047,   0,   0,1080,1081,1082,
+  1086,1110,   0,   0,1124,1125,1126,1127,1131,1133,   0,1147,1154,1155,1156,1161,
+  1187,1188,1189,1193,   0,1219,1226,1227,1228,1229,1233,   0,   0,1267,1268,1269,
+  1273,1298,   0,1303, 943,1128, 944,1129, 954,1139, 958,1143, 959,1144, 960,1145,
+   961,1146, 964,1149,   0,   0, 973,1158, 974,1159, 975,1160, 983,1168, 978,1163,
+   988,1173, 990,1175, 991,1176, 993,1178, 994,1179,   0,   0,1004,1190,1005,1191,
+  1006,1192,1014,1199,1007,   0,   0,   0,1016,1201,1020,1206,   0,1022,1208,1025,
+  1211,1023,1209,   0,   0,   0,   0,1032,1218,1037,1223,1035,1221,   0,   0,   0,
+  1044,1230,1045,1231,1049,1235,   0,   0,1058,1244,1064,1250,1060,1246,1066,1252,
+  1067,1253,1072,1258,1069,1255,1077,1264,1074,1261,   0,   0,1083,1270,1084,1271,
+  1085,1272,1088,1275,1089,1276,1096,1283,1103,1290,1111,1299,1115,1118,1307,1120,
+  1309,1121,1310,   0,1053,1239,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+     0,   0,   0,1093,1280,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
      0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0, 949,1134,1010,1195,1050,1236,1090,
-  1277,1341,1368,1340,1367,1342,1369,1339,1366,   0,1320,1347,1418,1419,1323,1350,
-     0,   0, 992,1177,1018,1204,1055,1241,1416,1417,1415,1424,1202,   0,   0,   0,
-   987,1172,   0,   0,1031,1217,1321,1348,1322,1349,1338,1365, 950,1135, 951,1136,
-   979,1164, 980,1165,1011,1196,1012,1197,1051,1237,1052,1238,1061,1247,1062,1248,
-  1091,1278,1092,1279,1071,1257,1076,1263,   0,   0, 997,1182,   0,   0,   0,   0,
-     0,   0, 945,1130, 982,1167,1337,1364,1335,1362,1046,1232,1422,1423,1113,1301,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   8,   9,   0,  10,
-  1425,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-     7,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   0,   0,   0,   0,   0,
-     0,1314,1427,   5,1434,1438,1443,   0,1450,   0,1455,1461,1514,   0,   0,   0,
+     0, 949,1134,1010,1195,1050,1236,1090,1277,1341,1368,1340,1367,1342,1369,1339,
+  1366,   0,1320,1347,1418,1419,1323,1350,   0,   0, 992,1177,1018,1204,1055,1241,
+  1416,1417,1415,1424,1202,   0,   0,   0, 987,1172,   0,   0,1031,1217,1321,1348,
+  1322,1349,1338,1365, 950,1135, 951,1136, 979,1164, 980,1165,1011,1196,1012,1197,
+  1051,1237,1052,1238,1061,1247,1062,1248,1091,1278,1092,1279,1071,1257,1076,1263,
+     0,   0, 997,1182,   0,   0,   0,   0,   0,   0, 945,1130, 982,1167,1337,1364,
+  1335,1362,1046,1232,1422,1423,1113,1301,   0,   0,   0,   0,   0,   0,   0,   0,
+     0,   0,   0,   0,   8,   9,   0,  10,1425,   0,   0,   0,   0,   0,   0,   0,
+     0,   0,   0,   0,   0,   0,   0,   0,   7,   0,   0,   0,   0,   0,   0,   0,
+     0,   0,   1,   0,   0,   0,   0,   0,   0,1314,1427,   5,1434,1438,1443,   0,
+  1450,   0,1455,1461,1514,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,1446,1458,
+  1468,1476,1480,1486,1517,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,1489,1503,
+  1494,1500,1508,   0,   0,   0,   0,1520,1521,   0,   0,   0,   0,   0,   0,   0,
+     0,   0,   0,   0,1526,1528,   0,1525,   0,   0,   0,1522,   0,   0,   0,   0,
+  1536,1532,1539,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,1534,   0,   0,
+     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,1556,   0,   0,
+     0,   0,   0,   0,1548,1550,   0,1547,   0,   0,   0,1567,   0,   0,   0,   0,
+  1558,1554,1561,   0,   0,   0,   0,   0,   0,   0,1568,1569,   0,   0,   0,   0,
+     0,   0,   0,   0,   0,1529,1551,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+     0,   0,   0,   0,1523,1545,1524,1546,   0,   0,1527,1549,   0,   0,1570,1571,
+  1530,1552,1531,1553,   0,   0,1533,1555,1535,1557,1537,1559,   0,   0,1572,1573,
+  1544,1566,1538,1560,1540,1562,1541,1563,1542,1564,   0,   0,1543,1565,   0,   0,
+     0,   0,   0,   0,   0,   0,1606,1607,1609,1608,1610,   0,   0,   0,   0,   0,
+     0,   0,   0,   0,1613,   0,1611,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+     0,   0,   0,   0,   0,   0,   0,1612,   0,   0,   0,   0,   0,   0,   0,   0,
+     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,1620,   0,   0,
+     0,   0,   0,   0,   0,1623,   0,   0,1624,   0,   0,   0,   0,   0,   0,   0,
+     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,1614,1615,1616,1617,
+  1618,1619,1621,1622,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,1628,
+  1629,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+  1625,1626,   0,1627,   0,   0,   0,1634,   0,   0,1635,   0,   0,   0,   0,   0,
+     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,1630,1631,1632,
+     0,   0,1633,   0,   0,   0,   0,   0,   0,   0,   0,   0,1639,   0,   0,1638,
+  1640,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+  1636,1637,   0,   0,   0,   0,   0,   0,1641,   0,   0,   0,   0,   0,   0,   0,
+     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,1642,1644,
+  1643,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,1645,   0,   0,   0,
+     0,   0,   0,   0,1646,   0,   0,   0,   0,   0,   0,1648,1649,   0,1647,1650,
+     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,1651,1653,
+  1652,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,1654,   0,
+  1655,1657,1656,   0,   0,   0,   0,1659,   0,   0,   0,   0,   0,   0,   0,   0,
+     0,1660,   0,   0,   0,   0,1661,   0,   0,   0,   0,1662,   0,   0,   0,   0,
+  1663,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,1658,   0,   0,
+     0,   0,   0,   0,   0,   0,   0,1664,   0,1665,1673,   0,1674,   0,   0,   0,
+     0,   0,   0,   0,   0,1666,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+     0,   0,   0,   0,   0,   0,   0,1668,   0,   0,   0,   0,   0,   0,   0,   0,
+     0,1669,   0,   0,   0,   0,1670,   0,   0,   0,   0,1671,   0,   0,   0,   0,
+  1672,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,1667,   0,   0,
+     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,1675,   0,   0,   0,   0,   0,
+     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,1676,   0,1677,   0,1678,   0,
+  1679,   0,1680,   0,   0,   0,1681,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,1682,
+     0,1683,   0,   0,1684,1685,   0,1686,   0,   0,   0,   0,   0,   0,   0,   0,
+     0,   0,   0,   0, 953,1138, 955,1140, 956,1141, 957,1142,1324,1351, 963,1148,
+   965,1150, 968,1153, 966,1151, 967,1152,1378,1380,1379,1381, 984,1169, 985,1170,
+  1420,1421, 986,1171, 989,1174, 995,1180, 998,1183, 996,1181, 999,1184,1000,1185,
+  1015,1200,1329,1356,1017,1203,1019,1205,1021,1207,1024,1210,1687,1688,1027,1213,
+  1026,1212,1028,1214,1029,1215,1030,1216,1034,1220,1036,1222,1039,1225,1038,1224,
+  1334,1361,1336,1363,1382,1384,1383,1385,1056,1242,1057,1243,1059,1245,1063,1249,
+  1689,1690,1065,1251,1068,1254,1070,1256,1386,1387,1388,1389,1691,1692,1073,1259,
+  1075,1262,1079,1266,1078,1265,1095,1282,1098,1285,1097,1284,1390,1391,1392,1393,
+  1099,1286,1100,1287,1101,1288,1102,1289,1105,1292,1104,1291,1106,1294,1107,1295,
+  1108,1296,1114,1302,1119,1308,1122,1311,1123,1312,1186,1260,1293,1305,   0,1394,
+     0,   0,   0,   0, 952,1137, 947,1132,1317,1344,1316,1343,1319,1346,1318,1345,
+  1693,1695,1371,1375,1370,1374,1373,1377,1372,1376,1694,1696, 981,1166, 977,1162,
+   972,1157,1326,1353,1325,1352,1328,1355,1327,1354,1697,1698,1009,1194,1013,1198,
+  1054,1240,1048,1234,1331,1358,1330,1357,1333,1360,1332,1359,1699,1700,1396,1401,
+  1395,1400,1398,1403,1397,1402,1399,1404,1094,1281,1087,1274,1406,1411,1405,1410,
+  1408,1413,1407,1412,1409,1414,1109,1297,1117,1306,1116,1304,1112,1300,   0,   0,
+     0,   0,   0,   0,1471,1472,1701,1705,1702,1706,1703,1707,1430,1431,1715,1719,
+  1716,1720,1717,1721,1477,1478,1729,1731,1730,1732,   0,   0,1435,1436,1733,1735,
+  1734,1736,   0,   0,1481,1482,1737,1741,1738,1742,1739,1743,1439,1440,1751,1755,
+  1752,1756,1753,1757,1490,1491,1765,1768,1766,1769,1767,1770,1447,1448,1771,1774,
+  1772,1775,1773,1776,1495,1496,1777,1779,1778,1780,   0,   0,1451,1452,1781,1783,
+  1782,1784,   0,   0,1504,1505,1785,1788,1786,1789,1787,1790,   0,1459,   0,1791,
+     0,1792,   0,1793,1509,1510,1794,1798,1795,1799,1796,1800,1462,1463,1808,1812,
+  1809,1813,1810,1814,1467,  21,1475,  22,1479,  23,1485,  24,1493,  27,1499,  28,
+  1507,  29,   0,   0,1704,1708,1709,1710,1711,1712,1713,1714,1718,1722,1723,1724,
+  1725,1726,1727,1728,1740,1744,1745,1746,1747,1748,1749,1750,1754,1758,1759,1760,
+  1761,1762,1763,1764,1797,1801,1802,1803,1804,1805,1806,1807,1811,1815,1816,1817,
+  1818,1819,1820,1821,1470,1469,1822,1474,1465,   0,1473,1825,1429,1428,1426,  12,
+  1432,   0,  26,   0,   0,1315,1823,1484,1466,   0,1483,1829,1433,  13,1437,  14,
+  1441,1826,1827,1828,1488,1487,1513,  19,   0,   0,1492,1515,1445,1444,1442,  15,
+     0,1831,1832,1833,1502,1501,1516,  25,1497,1498,1506,1518,1457,1456,1454,  17,
+  1453,1313,  11,   3,   0,   0,1824,1512,1519,   0,1511,1830,1449,  16,1460,  18,
+  1464,   4,   0,   0,  30,  31,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,  20,   0,   0,   0,   2,   6,
+     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,1834,1835,
      0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,1446,1458,1468,1476,1480,1486,1517,   0,   0,   0,
+     0,   0,1836,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+     0,1837,1839,1838,   0,   0,   0,   0,1840,   0,   0,   0,   0,1841,   0,   0,
+  1842,   0,   0,   0,   0,   0,   0,   0,1843,   0,1844,   0,   0,   0,   0,   0,
+     0,   0,   0,   0,   0,1845,   0,   0,1846,   0,   0,1847,   0,1848,   0,   0,
+     0,   0,   0,   0, 937,   0,1850,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+     0,1849, 936, 938,1851,1852,   0,   0,1853,1854,   0,   0,1855,1856,   0,   0,
+     0,   0,   0,   0,1857,1858,   0,   0,1861,1862,   0,   0,1863,1864,   0,   0,
      0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,1489,1503,1494,1500,1508,   0,   0,   0,   0,1520,
-  1521,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,1526,1528,   0,1525,
-     0,   0,   0,1522,   0,   0,   0,   0,1536,1532,1539,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,1534,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,1556,   0,   0,   0,   0,   0,   0,1548,1550,   0,1547,
-     0,   0,   0,1567,   0,   0,   0,   0,1558,1554,1561,   0,   0,   0,   0,   0,
-     0,   0,1568,1569,   0,   0,   0,   0,   0,   0,   0,   0,   0,1529,1551,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,1523,1545,1524,1546,
-     0,   0,1527,1549,   0,   0,1570,1571,1530,1552,1531,1553,   0,   0,1533,1555,
-  1535,1557,1537,1559,   0,   0,1572,1573,1544,1566,1538,1560,1540,1562,1541,1563,
-  1542,1564,   0,   0,1543,1565,   0,   0,   0,   0,   0,   0,   0,   0,1606,1607,
-  1609,1608,1610,   0,   0,   0,   0,   0,   0,   0,   0,   0,1613,   0,1611,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,1612,
+  1867,1868,1869,1870,1859,1860,1865,1866,   0,   0,   0,   0,   0,   0,1871,1872,
+  1873,1874,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,  32,  33,   0,
      0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,1620,   0,   0,   0,   0,   0,   0,   0,1623,   0,   0,
-  1624,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,1614,1615,1616,1617,1618,1619,1621,1622,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,1628,1629,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,1625,1626,   0,1627,   0,   0,   0,1634,
-     0,   0,1635,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,1630,1631,1632,   0,   0,1633,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,1639,   0,   0,1638,1640,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,1636,1637,   0,   0,   0,   0,   0,   0,
-  1641,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,1642,1644,1643,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,1645,   0,   0,   0,   0,   0,   0,   0,1646,   0,   0,   0,
-     0,   0,   0,1648,1649,   0,1647,1650,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,1651,1653,1652,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,1654,   0,1655,1657,1656,   0,   0,   0,   0,1659,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,1660,   0,   0,   0,   0,1661,   0,
-     0,   0,   0,1662,   0,   0,   0,   0,1663,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,1658,   0,   0,   0,   0,   0,   0,   0,   0,   0,1664,
-     0,1665,1673,   0,1674,   0,   0,   0,   0,   0,   0,   0,   0,1666,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,1668,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,1669,   0,   0,   0,   0,1670,   0,
-     0,   0,   0,1671,   0,   0,   0,   0,1672,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,1667,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,1675,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,1676,   0,1677,   0,1678,   0,1679,   0,1680,   0,   0,   0,1681,   0,
+  1875,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+  1877,   0,1878,   0,1879,   0,1880,   0,1881,   0,1882,   0,1883,   0,1884,   0,
+  1885,   0,1886,   0,1887,   0,1888,   0,   0,1889,   0,1890,   0,1891,   0,   0,
+     0,   0,   0,   0,1892,1893,   0,1894,1895,   0,1896,1897,   0,1898,1899,   0,
+  1900,1901,   0,   0,   0,   0,   0,   0,1876,   0,   0,   0,   0,   0,   0,   0,
+     0,   0,1902,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+  1904,   0,1905,   0,1906,   0,1907,   0,1908,   0,1909,   0,1910,   0,1911,   0,
+  1912,   0,1913,   0,1914,   0,1915,   0,   0,1916,   0,1917,   0,1918,   0,   0,
+     0,   0,   0,   0,1919,1920,   0,1921,1922,   0,1923,1924,   0,1925,1926,   0,
+  1927,1928,   0,   0,   0,   0,   0,   0,1903,   0,   0,1929,1930,1931,1932,   0,
+     0,   0,1933,   0, 710, 385, 724, 715, 455, 103, 186, 825, 825, 242, 751, 205,
+   241, 336, 524, 601, 663, 676, 688, 738, 411, 434, 474, 500, 649, 746, 799, 108,
+   180, 416, 482, 662, 810, 275, 462, 658, 692, 344, 618, 679, 293, 388, 440, 492,
+   740, 116, 146, 168, 368, 414, 481, 527, 606, 660, 665, 722, 781, 803, 809, 538,
+   553, 588, 642, 758, 811, 701, 233, 299, 573, 612, 487, 540, 714, 779, 232, 267,
+   412, 445, 457, 585, 594, 766, 167, 613, 149, 148, 560, 589, 648, 768, 708, 345,
+   411, 704, 105, 259, 313, 496, 518, 174, 542, 120, 307, 101, 430, 372, 584, 183,
+   228, 529, 650, 697, 424, 732, 428, 349, 632, 355, 517, 110, 135, 147, 403, 580,
+   624, 700, 750, 170, 193, 245, 297, 374, 463, 543, 763, 801, 812, 815, 162, 384,
+   420, 730, 287, 330, 337, 366, 459, 476, 509, 558, 591, 610, 726, 652, 734, 759,
+   154, 163, 198, 473, 683, 697, 292, 311, 353, 423, 572, 494, 113, 217, 259, 280,
+   314, 499, 506, 603, 608, 752, 778, 782, 788, 117, 557, 748, 774, 320, 109, 126,
+   260, 265, 373, 411, 479, 523, 655, 737, 823, 380, 765, 161, 395, 398, 438, 451,
+   502, 516, 537, 583, 791, 136, 340, 769, 122, 273, 446, 727, 305, 322, 400, 496,
+   771, 155, 190, 269, 377, 391, 406, 432, 501, 519, 599, 684, 687, 749, 776, 175,
+   452, 191, 480, 510, 659, 772, 805, 813, 397, 444, 619, 566, 568, 575, 491, 471,
+   707, 111, 636, 156, 153, 288, 346, 578, 256, 435, 383, 729, 680, 767, 694, 295,
+   128, 210,   0,   0, 227,   0, 379,   0,   0, 150, 493, 525, 544, 551, 552, 556,
+   783, 576, 604,   0, 661,   0, 703,   0,   0, 735, 743,   0,   0,   0, 793, 794,
+   795, 808, 741, 773, 118, 127, 130, 166, 169, 177, 207, 213, 215, 226, 229, 268,
+   270, 317, 327, 329, 335, 369, 375, 381, 404, 441, 448, 458, 477, 484, 503, 539,
+   545, 547, 546, 548, 549, 550, 554, 555, 561, 564, 569, 591, 593, 595, 598, 607,
+   620, 625, 625, 651, 690, 695, 705, 706, 716, 717, 733, 735, 777, 786, 790, 315,
+   869, 623,   0,   0, 102, 145, 134, 115, 129, 138, 165, 171, 207, 202, 206, 212,
+   227, 231, 240, 243, 250, 254, 294, 296, 303, 308, 319, 325, 321, 329, 326, 335,
+   341, 357, 360, 362, 370, 379, 388, 389, 393, 421, 424, 438, 456, 454, 458, 465,
+   477, 535, 485, 490, 493, 507, 512, 514, 521, 522, 525, 526, 528, 533, 532, 541,
+   565, 569, 574, 586, 591, 597, 607, 637, 647, 674, 691, 693, 695, 698, 703, 699,
+   705, 704, 702, 706, 709, 717, 728, 736, 747, 754, 770, 777, 783, 784, 786, 787,
+   790, 802, 825, 848, 847, 857,  55,  65,  66, 883, 892, 916, 822, 824,   0,   0,
      0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,1682,   0,1683,   0,   0,1684,1685,   0,1686,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0, 953,1138, 955,1140,
-   956,1141, 957,1142,1324,1351, 963,1148, 965,1150, 968,1153, 966,1151, 967,1152,
-  1378,1380,1379,1381, 984,1169, 985,1170,1420,1421, 986,1171, 989,1174, 995,1180,
-   998,1183, 996,1181, 999,1184,1000,1185,1015,1200,1329,1356,1017,1203,1019,1205,
-  1021,1207,1024,1210,1687,1688,1027,1213,1026,1212,1028,1214,1029,1215,1030,1216,
-  1034,1220,1036,1222,1039,1225,1038,1224,1334,1361,1336,1363,1382,1384,1383,1385,
-  1056,1242,1057,1243,1059,1245,1063,1249,1689,1690,1065,1251,1068,1254,1070,1256,
-  1386,1387,1388,1389,1691,1692,1073,1259,1075,1262,1079,1266,1078,1265,1095,1282,
-  1098,1285,1097,1284,1390,1391,1392,1393,1099,1286,1100,1287,1101,1288,1102,1289,
-  1105,1292,1104,1291,1106,1294,1107,1295,1108,1296,1114,1302,1119,1308,1122,1311,
-  1123,1312,1186,1260,1293,1305,   0,1394,   0,   0,   0,   0, 952,1137, 947,1132,
-  1317,1344,1316,1343,1319,1346,1318,1345,1693,1695,1371,1375,1370,1374,1373,1377,
-  1372,1376,1694,1696, 981,1166, 977,1162, 972,1157,1326,1353,1325,1352,1328,1355,
-  1327,1354,1697,1698,1009,1194,1013,1198,1054,1240,1048,1234,1331,1358,1330,1357,
-  1333,1360,1332,1359,1699,1700,1396,1401,1395,1400,1398,1403,1397,1402,1399,1404,
-  1094,1281,1087,1274,1406,1411,1405,1410,1408,1413,1407,1412,1409,1414,1109,1297,
-  1117,1306,1116,1304,1112,1300,   0,   0,   0,   0,   0,   0,1471,1472,1701,1705,
-  1702,1706,1703,1707,1430,1431,1715,1719,1716,1720,1717,1721,1477,1478,1729,1731,
-  1730,1732,   0,   0,1435,1436,1733,1735,1734,1736,   0,   0,1481,1482,1737,1741,
-  1738,1742,1739,1743,1439,1440,1751,1755,1752,1756,1753,1757,1490,1491,1765,1768,
-  1766,1769,1767,1770,1447,1448,1771,1774,1772,1775,1773,1776,1495,1496,1777,1779,
-  1778,1780,   0,   0,1451,1452,1781,1783,1782,1784,   0,   0,1504,1505,1785,1788,
-  1786,1789,1787,1790,   0,1459,   0,1791,   0,1792,   0,1793,1509,1510,1794,1798,
-  1795,1799,1796,1800,1462,1463,1808,1812,1809,1813,1810,1814,1467,  21,1475,  22,
-  1479,  23,1485,  24,1493,  27,1499,  28,1507,  29,   0,   0,1704,1708,1709,1710,
-  1711,1712,1713,1714,1718,1722,1723,1724,1725,1726,1727,1728,1740,1744,1745,1746,
-  1747,1748,1749,1750,1754,1758,1759,1760,1761,1762,1763,1764,1797,1801,1802,1803,
-  1804,1805,1806,1807,1811,1815,1816,1817,1818,1819,1820,1821,1470,1469,1822,1474,
-  1465,   0,1473,1825,1429,1428,1426,  12,1432,   0,  26,   0,   0,1315,1823,1484,
-  1466,   0,1483,1829,1433,  13,1437,  14,1441,1826,1827,1828,1488,1487,1513,  19,
-     0,   0,1492,1515,1445,1444,1442,  15,   0,1831,1832,1833,1502,1501,1516,  25,
-  1497,1498,1506,1518,1457,1456,1454,  17,1453,1313,  11,   3,   0,   0,1824,1512,
-  1519,   0,1511,1830,1449,  16,1460,  18,1464,   4,   0,   0,  30,  31,   0,   0,
+     0,1586,   0,1605,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,1602,1603,
+  1934,1935,1574,1575,1576,1577,1579,1580,1581,1583,1584,   0,1585,1587,1588,1589,
+  1591,   0,1592,   0,1593,1594,   0,1595,1596,   0,1598,1599,1600,1601,1604,1582,
+  1578,1590,1597,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,1936,   0,   0,
+     0,   0,   0,   0,   0,   0,   0,   0,1937,   0,   0,   0,   0,   0,   0,   0,
+     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,1938,   0,
+  1939,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,1940,
      0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,  20,   0,   0,   0,   2,   6,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,1834,1835,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,1836,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,1837,1839,1838,   0,   0,   0,   0,
-  1840,   0,   0,   0,   0,1841,   0,   0,1842,   0,   0,   0,   0,   0,   0,   0,
-  1843,   0,1844,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,1845,   0,   0,
-  1846,   0,   0,1847,   0,1848,   0,   0,   0,   0,   0,   0, 937,   0,1850,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,1849, 936, 938,1851,1852,   0,   0,
-  1853,1854,   0,   0,1855,1856,   0,   0,   0,   0,   0,   0,1857,1858,   0,   0,
-  1861,1862,   0,   0,1863,1864,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,1867,1868,1869,1870,1859,1860,1865,1866,
-     0,   0,   0,   0,   0,   0,1871,1872,1873,1874,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,  32,  33,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,1875,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,1877,   0,1878,   0,1879,   0,1880,   0,
-  1881,   0,1882,   0,1883,   0,1884,   0,1885,   0,1886,   0,1887,   0,1888,   0,
-     0,1889,   0,1890,   0,1891,   0,   0,   0,   0,   0,   0,1892,1893,   0,1894,
-  1895,   0,1896,1897,   0,1898,1899,   0,1900,1901,   0,   0,   0,   0,   0,   0,
-  1876,   0,   0,   0,   0,   0,   0,   0,   0,   0,1902,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,1904,   0,1905,   0,1906,   0,1907,   0,
-  1908,   0,1909,   0,1910,   0,1911,   0,1912,   0,1913,   0,1914,   0,1915,   0,
-     0,1916,   0,1917,   0,1918,   0,   0,   0,   0,   0,   0,1919,1920,   0,1921,
-  1922,   0,1923,1924,   0,1925,1926,   0,1927,1928,   0,   0,   0,   0,   0,   0,
-  1903,   0,   0,1929,1930,1931,1932,   0,   0,   0,1933,   0, 710, 385, 724, 715,
-   455, 103, 186, 825, 825, 242, 751, 205, 241, 336, 524, 601, 663, 676, 688, 738,
-   411, 434, 474, 500, 649, 746, 799, 108, 180, 416, 482, 662, 810, 275, 462, 658,
-   692, 344, 618, 679, 293, 388, 440, 492, 740, 116, 146, 168, 368, 414, 481, 527,
-   606, 660, 665, 722, 781, 803, 809, 538, 553, 588, 642, 758, 811, 701, 233, 299,
-   573, 612, 487, 540, 714, 779, 232, 267, 412, 445, 457, 585, 594, 766, 167, 613,
-   149, 148, 560, 589, 648, 768, 708, 345, 411, 704, 105, 259, 313, 496, 518, 174,
-   542, 120, 307, 101, 430, 372, 584, 183, 228, 529, 650, 697, 424, 732, 428, 349,
-   632, 355, 517, 110, 135, 147, 403, 580, 624, 700, 750, 170, 193, 245, 297, 374,
-   463, 543, 763, 801, 812, 815, 162, 384, 420, 730, 287, 330, 337, 366, 459, 476,
-   509, 558, 591, 610, 726, 652, 734, 759, 154, 163, 198, 473, 683, 697, 292, 311,
-   353, 423, 572, 494, 113, 217, 259, 280, 314, 499, 506, 603, 608, 752, 778, 782,
-   788, 117, 557, 748, 774, 320, 109, 126, 260, 265, 373, 411, 479, 523, 655, 737,
-   823, 380, 765, 161, 395, 398, 438, 451, 502, 516, 537, 583, 791, 136, 340, 769,
-   122, 273, 446, 727, 305, 322, 400, 496, 771, 155, 190, 269, 377, 391, 406, 432,
-   501, 519, 599, 684, 687, 749, 776, 175, 452, 191, 480, 510, 659, 772, 805, 813,
-   397, 444, 619, 566, 568, 575, 491, 471, 707, 111, 636, 156, 153, 288, 346, 578,
-   256, 435, 383, 729, 680, 767, 694, 295, 128, 210,   0,   0, 227,   0, 379,   0,
-     0, 150, 493, 525, 544, 551, 552, 556, 783, 576, 604,   0, 661,   0, 703,   0,
-     0, 735, 743,   0,   0,   0, 793, 794, 795, 808, 741, 773, 118, 127, 130, 166,
-   169, 177, 207, 213, 215, 226, 229, 268, 270, 317, 327, 329, 335, 369, 375, 381,
-   404, 441, 448, 458, 477, 484, 503, 539, 545, 547, 546, 548, 549, 550, 554, 555,
-   561, 564, 569, 591, 593, 595, 598, 607, 620, 625, 625, 651, 690, 695, 705, 706,
-   716, 717, 733, 735, 777, 786, 790, 315, 869, 623,   0,   0, 102, 145, 134, 115,
-   129, 138, 165, 171, 207, 202, 206, 212, 227, 231, 240, 243, 250, 254, 294, 296,
-   303, 308, 319, 325, 321, 329, 326, 335, 341, 357, 360, 362, 370, 379, 388, 389,
-   393, 421, 424, 438, 456, 454, 458, 465, 477, 535, 485, 490, 493, 507, 512, 514,
-   521, 522, 525, 526, 528, 533, 532, 541, 565, 569, 574, 586, 591, 597, 607, 637,
-   647, 674, 691, 693, 695, 698, 703, 699, 705, 704, 702, 706, 709, 717, 728, 736,
-   747, 754, 770, 777, 783, 784, 786, 787, 790, 802, 825, 848, 847, 857,  55,  65,
-    66, 883, 892, 916, 822, 824,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,1586,   0,1605,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,1602,1603,1934,1935,1574,1575,1576,1577,1579,1580,
-  1581,1583,1584,   0,1585,1587,1588,1589,1591,   0,1592,   0,1593,1594,   0,1595,
-  1596,   0,1598,1599,1600,1601,1604,1582,1578,1590,1597,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,1936,   0,1937,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,1938,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,1939,1940,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,1941,1942,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,1944,1943,   0,1945,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,1946,1947,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,1948,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,1949,1950,1951,1952,1953,1954,
-  1955,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,1956,1957,1958,1960,1959,1961,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0, 106, 104, 107, 826,
-   114, 118, 119, 121, 123, 124, 127, 125,  34, 830, 130, 131, 132, 137, 827,  35,
-   133, 139, 829, 142, 143, 112, 144, 145, 924, 151, 152,  37, 157, 158, 159, 160,
-    38, 165, 166, 169, 171, 172, 173, 174, 176, 177, 178, 179, 181, 182, 182, 182,
-   833, 468, 184, 185, 834, 187, 188, 189, 196, 192, 194, 195, 197, 199, 200, 201,
-   203, 204, 204, 206, 208, 209, 211, 218, 213, 219, 214, 216, 153, 234, 221, 222,
-   223, 220, 225, 224, 230, 835, 235, 236, 237, 238, 239, 244, 836, 837, 247, 248,
-   249, 246, 251,  39,  40, 253, 255, 255, 838, 257, 258, 259, 261, 839, 262, 263,
-   301, 264,  41, 266, 270, 272, 271, 841, 274, 842, 277, 276, 278, 281, 282,  42,
-   283, 284, 285, 286,  43, 843,  44, 289, 290, 291, 293, 934, 298, 845, 845, 621,
-   300, 300,  45, 852, 894, 302, 304,  46, 306, 309, 310, 312, 316,  48,  47, 317,
-   846, 318, 323, 324, 325, 324, 328, 329, 333, 331, 332, 334, 335, 336, 338, 339,
-   342, 343, 347, 351, 849, 350, 348, 352, 354, 359, 850, 361, 358, 356,  49, 363,
-   365, 367, 364,  50, 369, 371, 851, 376, 386, 378,  53, 381,  52,  51, 140, 141,
-   387, 382, 614,  78, 388, 389, 390, 394, 392, 856,  54, 399, 396, 402, 404, 858,
-   405, 401, 407,  55, 408, 409, 410, 413, 859, 415,  56, 417, 860, 418,  57, 419,
-   422, 424, 425, 861, 840, 862, 426, 863, 429, 431, 427, 433, 437, 441, 438, 439,
-   442, 443, 864, 436, 449, 450,  58, 454, 453, 865, 447, 460, 866, 867, 461, 466,
-   465, 464,  59, 467, 470, 469, 472, 828, 475, 868, 478, 870, 483, 485, 486, 871,
-   488, 489, 872, 873, 495, 497,  60, 498,  61,  61, 504, 505, 507, 508, 511,  62,
-   513, 874, 515, 875, 518, 844, 520, 876, 877, 878,  63,  64, 528, 880, 879, 881,
-   882, 530, 531, 531, 533,  66, 534,  67,  68, 884, 536, 538, 541,  69, 885, 549,
-   886, 887, 556, 559,  70, 561, 562, 563, 888, 889, 889, 567,  71, 890, 570, 571,
-    72, 891, 577,  73, 581, 579, 582, 893, 587,  74, 590, 592, 596,  75, 895, 896,
-    76, 897, 600, 898, 602, 605, 607, 899, 900, 609, 901, 611, 853,  77, 615, 616,
-    79, 617, 252, 902, 903, 854, 855, 621, 622, 731,  80, 627, 626, 628, 164, 629,
-   630, 631, 633, 904, 632, 634, 639, 640, 635, 641, 646, 651, 638, 643, 644, 645,
-   905, 907, 906,  81, 653, 654, 656, 911, 657, 908,  82,  83, 909, 910,  84, 664,
-   665, 666, 667, 669, 668, 671, 670, 674, 672, 673, 675,  85, 677, 678,  86, 681,
-   682, 912, 685, 686,  87, 689,  36, 913, 914,  88,  89, 696, 702, 709, 711, 915,
-   712, 713, 718, 719, 917, 831, 721, 720, 723, 832, 725, 728, 918, 919, 739, 742,
-   744, 920, 745, 753, 756, 757, 755, 760, 761, 921, 762,  90, 764, 922,  91, 775,
-   279, 780, 923, 925,  92,  93, 785, 926,  94, 927, 787, 787, 789, 928, 792,  95,
-   796, 797, 798, 800,  96, 929, 802, 804, 806,  97,  98, 807, 930,  99, 931, 932,
-   933, 814, 100, 816, 817, 818, 819, 820, 821, 935,   0,   0,
+     0,   0,1941,1942,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,1943,
+  1944,   0,   0,   0,   0,   0,   0,1945,   0,1946,   0,   0,   0,   0,   0,   0,
+     0,   0,1947,   0,   0,1948,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+     0,   0,   0,   0,   0,   0,   0,   0,   0,1950,   0,1949,1951,   0,   0,   0,
+     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,1953,
+  1952,   0,1954,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,1955,1956,
+     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,1957,   0,   0,   0,
+     0,   0,   0,   0,   0,1958,1961,1959,1965,1960,1962,1964,1963,   0,   0,   0,
+     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,1967,1966,1968,   0,
+     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+     0,   0,1969,1970,1971,1972,1973,1974,1975,   0,   0,   0,   0,   0,   0,   0,
+     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,1976,
+  1977,1978,1980,1979,1981,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+     0,   0,   0,   0, 106, 104, 107, 826, 114, 118, 119, 121, 123, 124, 127, 125,
+    34, 830, 130, 131, 132, 137, 827,  35, 133, 139, 829, 142, 143, 112, 144, 145,
+   924, 151, 152,  37, 157, 158, 159, 160,  38, 165, 166, 169, 171, 172, 173, 174,
+   176, 177, 178, 179, 181, 182, 182, 182, 833, 468, 184, 185, 834, 187, 188, 189,
+   196, 192, 194, 195, 197, 199, 200, 201, 203, 204, 204, 206, 208, 209, 211, 218,
+   213, 219, 214, 216, 153, 234, 221, 222, 223, 220, 225, 224, 230, 835, 235, 236,
+   237, 238, 239, 244, 836, 837, 247, 248, 249, 246, 251,  39,  40, 253, 255, 255,
+   838, 257, 258, 259, 261, 839, 262, 263, 301, 264,  41, 266, 270, 272, 271, 841,
+   274, 842, 277, 276, 278, 281, 282,  42, 283, 284, 285, 286,  43, 843,  44, 289,
+   290, 291, 293, 934, 298, 845, 845, 621, 300, 300,  45, 852, 894, 302, 304,  46,
+   306, 309, 310, 312, 316,  48,  47, 317, 846, 318, 323, 324, 325, 324, 328, 329,
+   333, 331, 332, 334, 335, 336, 338, 339, 342, 343, 347, 351, 849, 350, 348, 352,
+   354, 359, 850, 361, 358, 356,  49, 363, 365, 367, 364,  50, 369, 371, 851, 376,
+   386, 378,  53, 381,  52,  51, 140, 141, 387, 382, 614,  78, 388, 389, 390, 394,
+   392, 856,  54, 399, 396, 402, 404, 858, 405, 401, 407,  55, 408, 409, 410, 413,
+   859, 415,  56, 417, 860, 418,  57, 419, 422, 424, 425, 861, 840, 862, 426, 863,
+   429, 431, 427, 433, 437, 441, 438, 439, 442, 443, 864, 436, 449, 450,  58, 454,
+   453, 865, 447, 460, 866, 867, 461, 466, 465, 464,  59, 467, 470, 469, 472, 828,
+   475, 868, 478, 870, 483, 485, 486, 871, 488, 489, 872, 873, 495, 497,  60, 498,
+    61,  61, 504, 505, 507, 508, 511,  62, 513, 874, 515, 875, 518, 844, 520, 876,
+   877, 878,  63,  64, 528, 880, 879, 881, 882, 530, 531, 531, 533,  66, 534,  67,
+    68, 884, 536, 538, 541,  69, 885, 549, 886, 887, 556, 559,  70, 561, 562, 563,
+   888, 889, 889, 567,  71, 890, 570, 571,  72, 891, 577,  73, 581, 579, 582, 893,
+   587,  74, 590, 592, 596,  75, 895, 896,  76, 897, 600, 898, 602, 605, 607, 899,
+   900, 609, 901, 611, 853,  77, 615, 616,  79, 617, 252, 902, 903, 854, 855, 621,
+   622, 731,  80, 627, 626, 628, 164, 629, 630, 631, 633, 904, 632, 634, 639, 640,
+   635, 641, 646, 651, 638, 643, 644, 645, 905, 907, 906,  81, 653, 654, 656, 911,
+   657, 908,  82,  83, 909, 910,  84, 664, 665, 666, 667, 669, 668, 671, 670, 674,
+   672, 673, 675,  85, 677, 678,  86, 681, 682, 912, 685, 686,  87, 689,  36, 913,
+   914,  88,  89, 696, 702, 709, 711, 915, 712, 713, 718, 719, 917, 831, 721, 720,
+   723, 832, 725, 728, 918, 919, 739, 742, 744, 920, 745, 753, 756, 757, 755, 760,
+   761, 921, 762,  90, 764, 922,  91, 775, 279, 780, 923, 925,  92,  93, 785, 926,
+    94, 927, 787, 787, 789, 928, 792,  95, 796, 797, 798, 800,  96, 929, 802, 804,
+   806,  97,  98, 807, 930,  99, 931, 932, 933, 814, 100, 816, 817, 818, 819, 820,
+   821, 935,   0,   0,
 };
 static const int16_t
 _hb_ucd_i16[92] =
@@ -4403,12 +4615,12 @@ _hb_ucd_i16[92] =
 static inline uint_fast8_t
 _hb_ucd_gc (unsigned u)
 {
-  return u<1114110u?_hb_ucd_u8[6808+(((_hb_ucd_u8[1312+(((_hb_ucd_u16[((_hb_ucd_u8[544+(((_hb_ucd_u8[u>>1>>3>>3>>4])<<4)+((u>>1>>3>>3)&15u))])<<3)+((u>>1>>3)&7u)])<<3)+((u>>1)&7u))])<<1)+((u)&1u))]:2;
+  return u<1114110u?_hb_ucd_u8[6472+(((_hb_ucd_u8[816+(((_hb_ucd_u16[((_hb_ucd_u8[272+(((_hb_ucd_u8[u>>1>>3>>4>>4])<<4)+((u>>1>>3>>4)&15u))])<<4)+((u>>1>>3)&15u)])<<3)+((u>>1)&7u))])<<1)+((u)&1u))]:2;
 }
 static inline uint_fast8_t
 _hb_ucd_ccc (unsigned u)
 {
-  return u<125259u?_hb_ucd_u8[8800+(((_hb_ucd_u8[8244+(((_hb_ucd_u8[7784+(((_hb_ucd_u8[7432+(((_hb_ucd_u8[7186+(u>>2>>2>>2>>3)])<<3)+((u>>2>>2>>2)&7u))])<<2)+((u>>2>>2)&3u))])<<2)+((u>>2)&3u))])<<2)+((u)&3u))]:0;
+  return u<125259u?_hb_ucd_u8[8504+(((_hb_ucd_u8[7936+(((_hb_ucd_u8[7460+(((_hb_ucd_u8[7100+(((_hb_ucd_u8[6854+(u>>2>>2>>2>>3)])<<3)+((u>>2>>2>>2)&7u))])<<2)+((u>>2>>2)&3u))])<<2)+((u>>2)&3u))])<<2)+((u)&3u))]:0;
 }
 static inline unsigned
 _hb_ucd_b4 (const uint8_t* a, unsigned i)
@@ -4418,55 +4630,55 @@ _hb_ucd_b4 (const uint8_t* a, unsigned i)
 static inline int_fast16_t
 _hb_ucd_bmg (unsigned u)
 {
-  return u<65380u?_hb_ucd_i16[((_hb_ucd_u8[9692+(((_hb_ucd_u8[9460+(((_hb_ucd_u8[9364+(((_hb_ucd_b4(9300+_hb_ucd_u8,u>>1>>2>>3>>3))<<3)+((u>>1>>2>>3)&7u))])<<3)+((u>>1>>2)&7u))])<<2)+((u>>1)&3u))])<<1)+((u)&1u)]:0;
+  return u<65380u?_hb_ucd_i16[((_hb_ucd_u8[9396+(((_hb_ucd_u8[9164+(((_hb_ucd_u8[9068+(((_hb_ucd_b4(9004+_hb_ucd_u8,u>>1>>2>>3>>3))<<3)+((u>>1>>2>>3)&7u))])<<3)+((u>>1>>2)&7u))])<<2)+((u>>1)&3u))])<<1)+((u)&1u)]:0;
 }
 static inline uint_fast8_t
 _hb_ucd_sc (unsigned u)
 {
-  return u<918000u?_hb_ucd_u8[11126+(((_hb_ucd_u16[4040+(((_hb_ucd_u16[2048+(((_hb_ucd_u8[10390+(((_hb_ucd_u8[9940+(u>>2>>2>>3>>4)])<<4)+((u>>2>>2>>3)&15u))])<<3)+((u>>2>>2)&7u))])<<2)+((u>>2)&3u))])<<2)+((u)&3u))]:2;
+  return u<918000u?_hb_ucd_u8[10398+(((_hb_ucd_u16[3952+(((_hb_ucd_u16[2624+(((_hb_ucd_u8[9870+(((_hb_ucd_u8[9644+(u>>3>>2>>3>>4)])<<4)+((u>>3>>2>>3)&15u))])<<3)+((u>>3>>2)&7u))])<<2)+((u>>3)&3u))])<<3)+((u)&7u))]:2;
 }
 static inline uint_fast16_t
 _hb_ucd_dm (unsigned u)
 {
-  return u<195102u?_hb_ucd_u16[6748+(((_hb_ucd_u8[13952+(((_hb_ucd_u8[13570+(u>>4>>5)])<<5)+((u>>4)&31u))])<<4)+((u)&15u))]:0;
+  return u<195102u?_hb_ucd_u16[6244+(((_hb_ucd_u8[16628+(((_hb_ucd_u8[16246+(u>>4>>5)])<<5)+((u>>4)&31u))])<<4)+((u)&15u))]:0;
 }
 
 
 #else
 
 static const uint8_t
-_hb_ucd_u8[13386] =
+_hb_ucd_u8[13730] =
 {
     0,  1,  2,  3,  4,  5,  6,  7,  7,  8,  7,  7,  7,  7,  7,  7,
     7,  7,  7,  7,  9, 10,  7,  7,  7,  7,  7, 11, 12, 12, 12, 13,
-   14, 15, 16, 17, 18, 19, 20, 21, 22, 21, 21, 21, 21, 23,  7,  7,
-    7, 24, 21, 21, 21, 25, 26, 27, 21, 28, 29, 30, 31, 32, 33, 34,
+   14, 15, 16, 17, 18, 19, 20,  7, 21, 22, 22, 22, 23, 24,  7,  7,
+    7, 25, 22, 22, 22, 26, 27, 28, 22, 29, 30, 31, 32, 33, 34, 35,
     7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,
-    7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7, 35, 21, 36,
-    7,  7,  7,  7, 37, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
-   21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
-   21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
-   21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
-   21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
-   21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
-   21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
-   21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
-   21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
-   21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
-   21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
-   21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
-   21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
-   21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
-   21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
-   21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
-   21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
-   21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
-   21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
-   21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
-   21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
-   21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
-   38, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
-   21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+    7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7, 21, 22, 36,
+    7,  7,  7,  7, 37, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+   22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+   22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+   22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+   22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+   22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+   22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+   22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+   22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+   22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+   22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+   22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+   22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+   22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+   22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+   22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+   22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+   22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+   22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+   22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+   22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+   22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+   38, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+   22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
    12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12,
    12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12,
    12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12,
@@ -4486,30 +4698,30 @@ _hb_ucd_u8[13386] =
   100,100,100,100,100,100,100,100,100,100,100,100,100,100,100,100,
   100,100, 34, 34, 34, 34,101,102, 34, 34,103,104,105,106,107,108,
    34, 34,109,110,111,112,113,114,115,116,117,118, 34, 34, 34,119,
-  120,121,122,123,124,125,126,127, 34,128,129,111,130,131,132,133,
-  134,135,136,137,138,139,140,111,141,142,111,143,144,145,146,111,
-  147,148,149,150,151,152,153,111,154,155,156,157,111,158,159,160,
-   34, 34, 34, 34, 34, 34, 34, 34,161, 34, 34,111,111,111,111,111,
-  111,111,111,111,111,111,111,111,111,111,111,111,111,111,111,162,
-   34, 34, 34, 34, 34, 34, 34, 34,163,111,111,111,111,111,111,111,
+  120,121,122,123,124,125,126,127, 34,128,129,130,131,132,133,134,
+  135,136,137,138,139,140,141,142,143,144,111,145,146,147,148,111,
+  149,150,151,152,153,154,155,156,157,158,159,160,111,161,162,163,
+   34, 34, 34, 34, 34, 34, 34, 34,164, 34, 34,111,111,111,111,111,
+  111,111,111,111,111,111,111,111,111,111,111,111,111,111,111,165,
+   34, 34, 34, 34, 34, 34, 34, 34,166, 34, 34, 34, 34, 34, 34, 34,
+   34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,111,111,111,
   111,111,111,111,111,111,111,111,111,111,111,111,111,111,111,111,
-  111,111,111,111,111,111,111,111, 34, 34, 34, 34, 34,111,111,111,
-   34, 34, 34, 34,164,165,166, 34,111,111,111,111,167,168,169,170,
+  111,111,167,111,111,111,111,111,111,111,111,111,111,111,111,111,
+   34, 34, 34, 34,168,169,170, 34,111,111,171,111,172,173,174,175,
    34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,111,111,111,111,111,
   111,111,111,111,111,111,111,111,111,111,111,111,111,111,111,119,
    34, 34, 34, 34, 34, 34,111,111,111,111,111,111,111,111,111,111,
-  111,111,111,111,111,111,111,111, 34,171,111,111,111,111,111,111,
-  111,111,111,111,111,111,111,111,111,111,111,111,111,111,172, 67,
-   67, 67,173,174,175,130, 65,111,176,177,178,179,180,181,182,183,
-   67, 67, 67, 67,184,185,111,111,111,111,111,111,111,111,186,111,
-  187,188,189,111,111,190,111,111,111,191,111,111,111,111,111, 34,
-   34,192,193,111,111,111,111,111,130,194,195,111, 34,196,111,111,
-   67, 67,197, 67, 67,111, 67,198, 67, 67, 67, 67, 67, 67, 67, 67,
-   67, 67, 67, 67, 67, 67, 67,199,111,111,111,111,111,111,111,111,
-   34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,111,111,111,
+  111,111,111,111,111,111,111,111, 34,176,111,111,111,111,111,111,
+  111,111,111,111,111,111,111,111, 67,177, 67, 67, 67, 67,178, 67,
+   67, 67,179,180,181,131, 65,111,182,183,184,185,186,187,188,189,
+   67, 67, 67, 67,190,191,111,111,111,111,111,111,111,111,192,111,
+  193,194,195,111,111,196,111,111,111,197,111,198,111,111,111, 34,
+   34,199,200,111,111,111,111,111,131,201,202,111, 34,203,111,111,
+   67, 67,204, 67, 67,111, 67,205, 67, 67, 67, 67, 67, 67, 67, 67,
+   67, 67, 67, 67, 67, 67, 67,177,111,111,111,111,111,111,111,111,
    34, 34, 34, 34, 34,111,111,111,111,111,111,111,111,111,111,111,
    34, 34, 34, 34, 34, 34, 34, 34,111,111,111,111,111,111,111,111,
-  200,111,188,188,111,111,111,111,111,111,111,111,111,111,111,111,
+  206,111,194,194,111,111,111,111,111,111,111,111,111,111,111,111,
     0,  0,  0,  0,  0,  0,  0,  0,  1,  2,  3,  2,  4,  5,  6,  2,
     7,  7,  7,  7,  7,  2,  8,  9, 10, 11, 11, 11, 11, 11, 11, 11,
    11, 11, 11, 11, 11, 12, 13, 14, 15, 16, 16, 16, 16, 16, 16, 16,
@@ -4544,8 +4756,8 @@ _hb_ucd_u8[13386] =
    36, 36, 36, 36, 36, 64, 43, 43, 43, 43, 40, 21,  2, 40, 69, 20,
    36, 36, 36, 43, 43, 69, 43, 43, 43, 43, 69, 43, 69, 43, 43, 43,
     2,  2,  2,  2,  2,  2,  2,  2, 36, 36, 36, 36, 64, 43, 43,  2,
-   36, 36, 36, 36, 74, 36, 36, 36, 59, 59, 59, 59, 43, 43, 43, 43,
-   36, 36, 36, 36, 75, 43, 43, 43, 43, 76, 43, 43, 43, 43, 43, 43,
+   36, 36, 36, 36, 74, 36, 36, 36, 59, 59, 59, 75, 43, 43, 43, 43,
+   36, 36, 36, 36, 76, 43, 43, 43, 43, 75, 43, 43, 43, 43, 43, 43,
    43, 77, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 77, 65, 78,
    79, 43, 43, 43, 77, 78, 79, 78, 64, 43, 43, 43, 36, 36, 36, 36,
    36, 43,  2,  7,  7,  7,  7,  7, 80, 36, 36, 36, 36, 36, 36, 36,
@@ -4590,130 +4802,135 @@ _hb_ucd_u8[13386] =
    36, 43, 77, 78, 78, 78, 78, 81, 36, 43, 97,  2,  2,  2,  2,  2,
    36, 43, 43, 43, 43, 43, 43, 43, 36, 36, 43, 79, 43, 43, 43, 78,
    78, 78, 78, 77, 79, 43, 43, 43, 43, 43,  2, 80,  2, 60, 64, 43,
-    7,  7,  7,  7,  7,  7,  7,  7,  2,  2,  2, 98,  2, 56, 43, 76,
-   36, 75, 36, 36, 36, 36, 36, 36, 36, 36, 64, 65, 36, 36, 36, 36,
+    7,  7,  7,  7,  7,  7,  7,  7,  2,  2,  2, 98,  2, 56, 43, 75,
+   36, 76, 36, 36, 36, 36, 36, 36, 36, 36, 64, 65, 36, 36, 36, 36,
    36, 36, 36, 36, 64, 36, 36, 36, 43, 77, 78, 79, 77, 78, 78, 78,
    78, 77, 78, 78, 79, 43, 43, 43, 61, 61,  2,  7,  7,  7,  7,  7,
     7,  7,  7,  7,  7, 27, 27, 61, 36, 36, 36, 64, 77, 79, 43,  2,
    36, 36, 82, 77, 43, 43, 43, 43, 77, 77, 79, 43, 43, 43, 77, 78,
    78, 79, 43, 43, 43, 43, 43, 43,  2,  2,  2, 80,  2,  2,  2,  2,
    43, 43, 43, 43, 43, 43, 43, 99, 43, 43, 81, 36, 36, 36, 36, 36,
-   36, 36, 77, 43, 43, 77, 77, 78, 78, 77, 81, 36, 36, 36, 36, 36,
+   36, 36, 77, 43, 43, 77, 77, 78, 78, 77, 81, 36, 36, 36, 36,  2,
    89, 61, 61, 61, 61, 47, 43, 43, 43, 43, 61, 61, 61, 61, 21,  2,
    43, 81, 36, 36, 36, 36, 36, 36, 82, 43, 43, 78, 43, 79, 43, 36,
    36, 36, 36, 77, 43, 78, 79, 79, 43, 78, 78, 78, 78, 78,  2,  2,
    36, 36, 78, 78, 78, 78, 43, 43, 43, 43, 78, 43, 43, 57,  2,  2,
     7,  7,  7,  7,  7,  7, 86, 36, 36, 36, 36, 36, 40, 40, 40,  2,
-   43, 57, 43, 43, 43, 43, 43, 43, 77, 43, 43, 43, 65, 36, 64, 36,
-   36, 36, 65, 82, 43, 36, 36, 36, 16, 16, 16, 16, 16, 16, 40, 40,
-   40, 40, 40, 40, 40, 44, 16, 16, 16, 16, 16, 16, 44, 16, 16, 16,
-   16, 16, 16, 16, 16,100, 40, 40, 32, 32, 32, 16, 16, 16, 16, 32,
-   16, 16, 16, 16, 11, 11, 11, 11, 16, 16, 16, 16, 34, 11, 11, 11,
-   16, 16, 16, 16,101,101,101,101, 16, 16, 16, 16, 11, 11,102,103,
-   41, 16, 16, 16, 11, 11,102, 41, 16, 16, 16, 16, 11, 11,104, 41,
-  105,105,105,105,105,106, 59, 59, 51, 51, 51,  2,107,108,107,108,
-    2,  2,  2,  2,109, 59, 59,110,  2,  2,  2,  2,111,112,  2,113,
-  114,  2,115,116,  2,  2,  2,  2,  2,  9,114,  2,  2,  2,  2,117,
-   59, 59, 59, 59, 59, 59, 59, 59,118, 40, 27, 27, 27,  8,115,119,
-   27, 27, 27, 27, 27,  8,115, 94, 20, 20, 20, 20, 20, 20, 20, 20,
-   43, 43, 43, 43, 43, 43,120, 48, 99, 48, 99, 43, 43, 43, 43, 43,
-   61,121, 61,122, 61, 34, 11, 16, 11, 32,122, 61, 46, 11, 11, 61,
-   61, 61,121,121,121, 11, 11,123, 11, 11, 35, 36, 39, 61, 16, 11,
-    8,  8, 46, 16, 16, 26, 61,124, 95, 95, 95, 95, 95, 95, 95, 95,
-   95,125,126, 95,127, 61, 61, 61,  8,  8,128, 61, 61,  8, 61, 61,
-  128, 26, 61,128, 61, 61, 61,128, 61, 61, 61, 61, 61, 61, 61,  8,
-   61,128,128, 61, 61, 61, 61, 61, 61, 61,  8,  8,  8,  8,  8,  8,
-    8,  8,  8,  8,  8,  8,  8,  8, 61, 61, 61, 61,  4,  4, 61, 61,
-    8, 61, 61, 61,129,130, 61, 61, 61, 61, 61, 61, 61, 61,128, 61,
-   61, 61, 61, 61, 61, 26,  8,  8,  8,  8, 61, 61, 61, 61, 61, 61,
-   61, 61, 61, 61, 61, 61,  8,  8,  8, 61, 61, 61, 61, 61, 61, 61,
-   27, 27, 27, 27, 27, 27, 61, 61, 61, 61, 61, 61, 61, 27, 27, 27,
-   61, 61, 61, 26, 61, 61, 61, 61, 26, 61, 61, 61, 61, 61, 61, 61,
-   61, 61, 61, 61,  8,  8,  8,  8, 61, 61, 61, 61, 61, 61, 61, 26,
-   61, 61, 61, 61,  4,  4,  4,  4,  4,  4,  4, 27, 27, 27, 27, 27,
-   27, 27, 61, 61, 61, 61, 61, 61,  8,  8,115,131,  8,  8,  8,  8,
-    8,  8,  8,  4,  4,  4,  4,  4,  8,115,132,132,132,132,132,132,
-  132,132,132,132,131,  8,  8,  8,  8,  8,  8,  8,  4,  4,  8,  8,
-    8,  8,  8,  8,  8,  8,  4,  8,  8,  8,128, 26,  8,  8,128, 61,
-   32, 11, 32, 34, 34, 34, 34, 11, 32, 32, 34, 16, 16, 16, 40, 11,
-   32, 32,124, 61, 61,122, 34,133, 43, 32, 16, 16, 50,  2, 90,  2,
-   36, 36, 36, 36, 36, 36, 36, 75,  2,  2,  2,  2,  2,  2,  2, 56,
-    2,107,107,  2,111,112,107,  2,  2,  2,  2,  6,  2, 98,107,  2,
-  107,  4,  4,  4,  4,  2,  2, 80,  2,  2,  2,  2,  2, 51,  2,  2,
-   98,134,  2,  2,  2,  2,  2,  2, 61,  2,135,132,132,132,136, 51,
-   51, 51, 51, 51, 51, 51, 51, 51,  1,  2,137,138,  4,  4,  4,  4,
-    4, 61,  4,  4,  4,  4,139, 94,140, 95, 95, 95, 95, 43, 43, 78,
-  141, 40, 40, 61, 95,142, 58, 61, 72, 36, 36, 36, 36, 36, 36, 36,
-   36, 36, 36, 36, 64,143,144, 63, 36, 36, 36, 36, 36, 58, 40, 63,
-   61, 27, 27, 61, 61, 61, 61, 61, 27, 27, 27, 27, 27, 61, 61, 61,
-   61, 61, 61, 61, 27, 27, 27, 27,145, 27, 27, 27, 27, 27, 27, 27,
-   36, 36, 75, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36,146,  2,
-   32, 32, 32, 32, 32, 32, 32, 64, 48,147, 43, 43, 43, 43, 43, 80,
-   32, 32, 32, 32, 32, 32, 40, 43, 36, 36, 36, 95, 95, 95, 95, 95,
-   43,  2,  2,  2,  2,  2,  2,  2, 41, 41, 41,144, 40, 40, 40, 40,
-   41, 32, 32, 32, 32, 32, 32, 32, 16, 32, 32, 32, 32, 32, 32, 32,
-   44, 16, 16, 16, 34, 34, 34, 32, 32, 32, 32, 32, 42,148, 34, 35,
-   32, 32, 16, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 11, 11, 32,
-   11, 11, 32, 32, 32, 32, 32, 32, 32, 32, 11, 11, 34, 16, 16, 16,
-   32, 16, 16, 32, 32, 16, 16, 16, 16, 40,149, 35, 40, 35, 36, 36,
-   36, 65, 36, 65, 36, 64, 36, 36, 36, 82, 79, 77, 61, 61, 43, 43,
-   27, 27, 27, 61,150, 61, 61, 61, 36, 36,  2,  2,  2,  2,  2,  2,
-   78, 36, 36, 36, 36, 36, 36, 36, 36, 36, 78, 78, 78, 78, 78, 78,
-   78, 78, 43, 43, 43, 43, 43,  2, 43, 36, 36, 36,  2, 66, 66, 64,
-   36, 36, 36, 43, 43, 43, 43,  2, 36, 36, 36, 64, 43, 43, 43, 43,
-   43, 78, 78, 78, 78, 78, 78, 97, 36, 64, 78, 43, 43, 78, 43, 78,
-   97,  2,  2,  2,  2,  2,  2, 80,  7,  7,  7,  7,  7,  7,  7,  2,
-   36, 36, 64, 63, 36, 36, 36, 36, 36, 36, 36, 36, 64, 43, 43, 77,
-   79, 77, 79, 43, 43, 43, 43, 43, 36, 64, 36, 36, 36, 36, 77, 78,
-    7,  7,  7,  7,  7,  7,  2,  2, 63, 36, 36, 71, 61, 82, 77, 36,
-   65, 43, 65, 64, 65, 36, 36, 43, 36, 36, 36, 36, 36, 36, 75,  2,
-   36, 36, 36, 36, 36, 82, 43, 78,  2, 75,151, 43, 43, 43, 43, 43,
-   16, 16, 16, 16, 16,103, 40, 40, 16, 16, 16, 16,100, 41, 41, 41,
-   36, 82, 79, 78, 77, 97, 79, 43,152,152,152,152,152,152,152,152,
-  153,153,153,153,153,153,153,153, 16, 16, 16, 16, 16, 16, 35, 65,
-   36, 36, 36, 36,154, 36, 36, 36, 36, 41, 41, 41, 41, 41, 41, 41,
-   41, 74, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36,132,
-   36, 36, 36, 36, 36, 36, 36, 71, 36, 36, 36, 36, 36, 36,150, 61,
-    2,  2,  2,135,116,  2,  2,  2,  6,155,156,132,132,132,132,132,
-  132,132,116,135,116,  2,113,157,  2,  2,  2,  2,139,132,132,116,
-    2,158,  8,  8, 60,  2,  2,  2, 36, 36, 36, 36, 36, 36, 36,159,
-    2,  2,  3,  2,  4,  5,  6,  2, 16, 16, 16, 16, 16, 17, 18,115,
-  116,  4,  2, 36, 36, 36, 36, 36, 63, 36, 36, 36, 36, 36, 36, 36,
-   36, 36, 36, 36, 36, 36, 36, 40, 20,160, 53, 20, 26,  8,128, 61,
-   61, 61, 61, 61,161, 59, 61, 61,  2,  2,  2, 90, 27, 27, 27, 27,
-   27, 27, 27, 84, 61, 61, 61, 61, 95, 95,127, 27, 84, 61, 61, 61,
-   61, 61, 61, 61, 61, 27, 61, 61, 61, 61, 61, 61, 61, 61, 47, 43,
-  162,162,162,162,162,162,162,162,163, 27, 27, 27, 27, 27, 27, 27,
-   27, 27, 27, 27, 27, 27, 87, 36,138, 36, 36, 36, 36, 95, 95, 95,
-   36, 36, 36, 36, 36, 36, 36, 58,164, 95, 95, 95, 95, 95, 95, 95,
-   11, 11, 11, 32, 16, 16, 16, 16, 36, 36, 36, 58, 27, 27, 27, 27,
-   36, 36, 36, 71,145, 27, 27, 27, 36, 36, 36,165, 27, 27, 27, 27,
-   36, 36, 36, 36, 36,165, 27, 27, 36, 36, 36, 27, 27, 27, 27, 30,
-   36, 36, 36, 36, 36, 36, 27, 36, 64, 43, 43, 43, 43, 43, 43, 43,
-   36, 36, 36, 36, 43, 43, 43, 43, 36, 36, 36, 36, 36, 36,165, 30,
-   36, 36, 36, 36, 36, 36,165, 27, 36, 36, 36, 36, 72, 36, 36, 36,
-   36, 36, 64, 43, 43,163, 27, 27, 36, 36, 36, 36, 58,  2,  2,  2,
-   36, 36, 36, 36, 27, 27, 27, 27, 16, 16, 16, 16, 16, 27, 27, 27,
-   36, 36, 43, 43, 43, 43, 43, 43, 36, 36, 36, 36, 36, 64,166, 51,
-   27, 27, 27, 87, 36, 36, 36, 36,163, 27, 30,  2,  2,  2,  2,  2,
-   36, 43, 43,  2,  2,  2,  2,  2, 36, 36,165, 27, 27, 27, 27, 27,
-   79, 81, 36, 36, 36, 36, 36, 36, 43, 43, 43, 57,  2,  2,  2,  2,
-    2, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27,  7,  7,  7,  7,  7,
-   65, 64, 65, 36, 36, 36, 36, 64, 78, 79, 43, 77, 79, 57, 73,  2,
-    2, 43, 43, 43, 43, 43, 67, 59, 36, 36, 36, 64, 43, 43, 79, 43,
-   43, 43, 43,  7,  7,  7,  7,  7,  2,  2, 82, 81, 36, 36, 36, 36,
-   36, 64,  2, 36, 36, 36, 36, 36, 36, 82, 78, 43, 43, 43, 43, 77,
-   81, 36, 58,  2, 56, 43, 57, 79,  7,  7,  7,  7,  7, 58, 58,  2,
-   90, 27, 27, 27, 27, 27, 27, 27, 36, 36, 36, 36, 36, 36, 78, 79,
-   43, 78, 77, 43,  2,  2,  2, 65, 36, 36, 36, 36, 36, 36, 36, 64,
-   77, 78, 78, 78, 78, 78, 78, 78, 36, 36, 36, 82, 78, 78, 81, 36,
-   36, 78, 78, 43, 43, 43, 43, 43, 36, 36, 82, 78, 43, 43, 43, 43,
-   78, 43, 77, 65, 36, 58,  2,  2,  7,  7,  7,  7,  7,  2,  2, 65,
-   78, 79, 43, 43, 77, 77, 78, 79, 77, 43, 36, 66, 36, 36, 36, 36,
-   36, 36, 36, 36, 36, 36, 36, 82, 78, 43, 43, 43, 78, 78, 43, 79,
-   57,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2, 36, 36, 43, 43,
-   78, 79, 43, 43, 43, 77, 79, 79, 57,  2, 36, 36, 36, 36, 36, 36,
-   36, 36, 36, 36, 36, 64, 79, 78, 43, 43, 43, 79, 58,  2,  2,  2,
+   16, 16, 16, 16, 34, 16, 16, 16, 43, 57, 43, 43, 43, 43, 43, 43,
+   77, 43, 43, 43, 65, 36, 64, 36, 36, 36, 65, 82, 43, 36, 36, 36,
+   16, 16, 16, 16, 16, 16, 40, 40, 40, 40, 40, 40, 40, 44, 16, 16,
+   16, 16, 16, 16, 44, 16, 16, 16, 16, 16, 16, 16, 16,100, 40, 40,
+   32, 32, 32, 16, 16, 16, 16, 32, 16, 16, 16, 16, 11, 11, 11, 11,
+   16, 16, 16, 16, 34, 11, 11, 11, 16, 16, 16, 16,101,101,101,101,
+   16, 16, 16, 16, 11, 11,102,103, 41, 16, 16, 16, 11, 11,102, 41,
+   16, 16, 16, 16, 11, 11,104, 41,105,105,105,105,105,106, 59, 59,
+   51, 51, 51,  2,107,108,107,108,  2,  2,  2,  2,109, 59, 59,110,
+    2,  2,  2,  2,111,112,  2,113,114,  2,115,116,  2,  2,  2,  2,
+    2,  9,114,  2,  2,  2,  2,117, 59, 59, 59, 59, 59, 59, 59, 59,
+  118, 40, 27, 27, 27,  8,115,119, 27, 27, 27, 27, 27,  8,115, 94,
+   20, 20, 20, 20, 20, 20, 20, 20, 43, 43, 43, 43, 43, 43,120, 48,
+   99, 48, 99, 43, 43, 43, 43, 43, 61,121, 61,122, 61, 34, 11, 16,
+   11, 32,122, 61, 46, 11, 11, 61, 61, 61,121,121,121, 11, 11,123,
+   11, 11, 35, 36, 39, 61, 16, 11,  8,  8, 46, 16, 16, 26, 61,124,
+   95, 95, 95, 95, 95, 95, 95, 95, 95,125,126, 95,127, 61, 61, 61,
+    8,  8,128, 61, 61,  8, 61, 61,128, 26, 61,128, 61, 61, 61,128,
+   61, 61, 61, 61, 61, 61, 61,  8, 61,128,128, 61, 61, 61, 61, 61,
+   61, 61,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,
+   61, 61, 61, 61,  4,  4, 61, 61,  8, 61, 61, 61,129,130, 61, 61,
+   61, 61, 61, 61, 61, 61,128, 61, 61, 61, 61, 61, 61, 26,  8,  8,
+    8,  8, 61, 61, 61, 61, 61, 61, 61, 61, 61, 61, 61, 61,  8,  8,
+    8, 61, 61, 61, 61, 61, 61, 61, 27, 27, 27, 27, 27, 27, 61, 61,
+   61, 61, 61, 61, 61, 27, 27, 27, 61, 61, 61, 26, 61, 61, 61, 61,
+   26, 61, 61, 61, 61, 61, 61, 61, 61, 61, 61, 61,  8,  8,  8,  8,
+   61, 61, 61, 61, 61, 61, 61, 26, 61, 61, 61, 61,  4,  4,  4,  4,
+    4,  4,  4, 27, 27, 27, 27, 27, 27, 27, 61, 61, 61, 61, 61, 61,
+    8,  8,115,131,  8,  8,  8,  8,  8,  8,  8,  4,  4,  4,  4,  4,
+    8,115,132,132,132,132,132,132,132,132,132,132,131,  8,  8,  8,
+    8,  8,  8,  8,  4,  4,  8,  8,  8,  8,  8,  8,  8,  8,  4,  8,
+    8,  8,128, 26,  8,  8,128, 61, 32, 11, 32, 34, 34, 34, 34, 11,
+   32, 32, 34, 16, 16, 16, 40, 11, 32, 32,124, 61, 61,122, 34,133,
+   43, 32, 16, 16, 50,  2, 90,  2, 36, 36, 36, 36, 36, 36, 36, 76,
+    2,  2,  2,  2,  2,  2,  2, 56,  2,107,107,  2,111,112,107,  2,
+    2,  2,  2,  6,  2, 98,107,  2,107,  4,  4,  4,  4,  2,  2, 80,
+    2,  2,  2,  2,  2, 51,  2,  2, 98,134,  2,  2,  2,  2,  2,  2,
+   61,  2,135,132,132,132,136, 51, 51, 51, 51, 51, 51, 51, 51, 51,
+    1,  2,137,138,  4,  4,  4,  4,  4, 61,  4,  4,  4,  4,139, 94,
+  140, 95, 95, 95, 95, 43, 43, 78,141, 40, 40, 61, 95,142, 58, 61,
+   72, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 64,143,144, 63,
+   36, 36, 36, 36, 36, 58, 40, 63, 61, 27, 27, 61, 61, 61, 61, 61,
+   27, 27, 27, 27, 27, 61, 61, 61, 61, 61, 61, 61, 27, 27, 27, 27,
+  145, 27, 27, 27, 27, 27, 27, 27, 36, 36, 76, 36, 36, 36, 36, 36,
+   36, 36, 36, 36, 36, 36,146,  2, 32, 32, 32, 32, 32, 32, 32, 64,
+   48,147, 43, 43, 43, 43, 43, 80, 32, 32, 32, 32, 32, 32, 40, 43,
+   36, 36, 36, 95, 95, 95, 95, 95, 43,  2,  2,  2,  2,  2,  2,  2,
+   41, 41, 41,144, 40, 40, 40, 40, 41, 32, 32, 32, 32, 32, 32, 32,
+   16, 32, 32, 32, 32, 32, 32, 32, 44, 16, 16, 16, 34, 34, 34, 32,
+   32, 32, 32, 32, 42,148, 34, 35, 32, 32, 16, 32, 32, 32, 32, 32,
+   32, 32, 32, 32, 32, 11, 11, 32, 11, 11, 32, 32, 32, 32, 32, 32,
+   32, 32, 11, 11, 34, 34, 32, 16, 32, 16, 16, 32, 32, 32, 11, 11,
+   11, 40,149, 35, 40, 35, 36, 36, 36, 65, 36, 65, 36, 64, 36, 36,
+   36, 82, 79, 77, 61, 61, 43, 43, 27, 27, 27, 61,150, 61, 61, 61,
+   36, 36,  2,  2,  2,  2,  2,  2, 78, 36, 36, 36, 36, 36, 36, 36,
+   36, 36, 78, 78, 78, 78, 78, 78, 78, 78, 43, 43, 43, 43, 43,  2,
+   43, 36, 36, 36,  2, 66, 66, 64, 36, 36, 36, 43, 43, 43, 43,  2,
+   36, 36, 36, 64, 43, 43, 43, 43, 43, 78, 78, 78, 78, 78, 78, 97,
+   36, 64, 78, 43, 43, 78, 43, 78, 97,  2,  2,  2,  2,  2,  2, 80,
+    7,  7,  7,  7,  7,  7,  7,  2, 36, 36, 64, 63, 36, 36, 36, 36,
+   36, 36, 36, 36, 64, 43, 43, 77, 79, 77, 79, 43, 43, 43, 43, 43,
+   36, 64, 36, 36, 36, 36, 77, 78,  7,  7,  7,  7,  7,  7,  2,  2,
+   63, 36, 36, 71, 61, 82, 77, 36, 65, 43, 65, 64, 65, 36, 36, 43,
+   36, 36, 36, 36, 36, 36, 76,  2, 36, 36, 36, 36, 36, 82, 43, 78,
+    2, 76,151, 43, 43, 43, 43, 43, 16, 16, 16, 16, 16,103, 40, 40,
+   16, 16, 16, 16,100, 41, 41, 41, 36, 82, 79, 78, 77, 97, 79, 43,
+  152,152,152,152,152,152,152,152,153,153,153,153,153,153,153,153,
+   16, 16, 16, 16, 16, 16, 35, 65, 36, 36, 36, 36,154, 36, 36, 36,
+   36, 41, 41, 41, 41, 41, 41, 41, 41, 74, 36, 36, 36, 36, 36, 36,
+   36, 36, 36, 36, 36, 36, 36,132, 36, 36, 36, 36, 36, 36, 36, 71,
+   36, 36, 36, 36, 36, 36,150, 61,  2,  2,  2,135,116,  2,  2,  2,
+    6,155,156,132,132,132,132,132,132,132,116,135,116,  2,113,157,
+    2,  2,  2,  2,139,132,132,116,  2,158,  8,  8, 60,  2,  2,  2,
+   36, 36, 36, 36, 36, 36, 36,159,  2,  2,  3,  2,  4,  5,  6,  2,
+   16, 16, 16, 16, 16, 17, 18,115,116,  4,  2, 36, 36, 36, 36, 36,
+   63, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 40,
+   20,160, 53, 20, 26,  8,128, 61, 61, 61, 61, 61,161, 59, 61, 61,
+    2,  2,  2, 90, 27, 27, 27, 27, 27, 27, 27, 84, 61, 61, 61, 61,
+   95, 95,127, 27, 84, 61, 61, 61, 61, 61, 61, 61, 61, 27, 61, 61,
+   61, 61, 61, 61, 61, 61, 47, 43,162,162,162,162,162,162,162,162,
+  163, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 87, 36,
+  138, 36, 36, 36, 36, 95, 95, 95, 36, 36, 36, 36, 36, 36, 36, 58,
+  164, 95, 95, 95, 95, 95, 95, 95, 11, 11, 11, 32, 16, 16, 16, 16,
+   36, 36, 36, 58, 27, 27, 27, 27, 36, 36, 36, 71,145, 27, 27, 27,
+   36, 36, 36,165, 27, 27, 27, 27, 36, 36, 36, 36, 36,165, 27, 27,
+   36, 36, 36, 27, 27, 27, 27, 30, 36, 36, 36, 36, 36, 36, 27, 36,
+   64, 43, 43, 43, 43, 43, 43, 43, 36, 36, 36, 36, 43, 43, 43, 43,
+   36, 36, 36, 36, 36, 36,165, 30, 36, 36, 36, 36, 36, 36,165, 27,
+   36, 36, 36, 36, 72, 36, 36, 36, 36, 36, 64, 43, 43,163, 27, 27,
+   36, 36, 36, 36, 58,  2,  2,  2, 36, 36, 36, 36, 27, 27, 27, 27,
+   16, 16, 16, 16, 16, 27, 27, 27, 36, 36, 43, 43, 43, 43, 43, 43,
+    7,  7,  7,  7,  7, 36, 36, 63, 11, 11, 11, 11,166, 43, 43,141,
+   16, 16, 16, 16, 16, 16, 16,  8, 36, 36, 36, 36, 36, 64,167, 51,
+   36, 36, 36, 36, 36, 36, 43, 43, 27, 27, 27, 87, 36, 36, 36, 36,
+  163, 27, 30,  2,  2,  2,  2,  2, 36, 43, 43,  2,  2,  2,  2,  2,
+   36, 36,165, 27, 27, 27, 27, 27, 79, 81, 36, 36, 36, 36, 36, 36,
+   43, 43, 43, 57,  2,  2,  2,  2,  2, 27, 27, 27, 27, 27, 27, 27,
+   27, 27, 27,  7,  7,  7,  7,  7, 65, 64, 65, 36, 36, 36, 36, 64,
+   78, 79, 43, 77, 79, 57, 73,  2,  2, 43, 43, 43, 43, 43, 67, 59,
+   36, 36, 36, 64, 43, 43, 79, 43, 43, 43, 43,  7,  7,  7,  7,  7,
+    2,  2, 82, 81, 36, 36, 36, 36, 36, 64,  2, 36, 36, 36, 36, 36,
+   36, 82, 78, 43, 43, 43, 43, 77, 81, 36, 58,  2, 56, 43, 57, 79,
+    7,  7,  7,  7,  7, 58, 58,  2, 90, 27, 27, 27, 27, 27, 27, 27,
+   36, 36, 36, 36, 36, 36, 78, 79, 43, 78, 77, 43,  2,  2,  2, 65,
+   36, 36, 36, 36, 36, 36, 36, 64, 77, 78, 78, 78, 78, 78, 78, 78,
+   36, 36, 36, 82, 78, 78, 81, 36, 36, 78, 78, 43, 43, 43, 43, 43,
+   36, 36, 36, 36, 78, 79, 43, 43, 43, 78, 78, 78, 78, 78, 78, 77,
+   65, 65,  2,  2,  2,  2,  2,  2, 56, 43, 43, 43, 43, 43, 43, 43,
+   36, 36, 82, 78, 43, 43, 43, 43, 78, 43, 77, 65, 36, 58,  2,  2,
+    7,  7,  7,  7,  7,  2,  2, 65, 78, 79, 43, 43, 77, 77, 78, 79,
+   77, 43, 36, 66, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 82,
+   78, 43, 43, 43, 78, 78, 43, 79, 57,  2,  2,  2,  2,  2,  2,  2,
+    2,  2,  2,  2, 36, 36, 43, 43, 78, 79, 43, 43, 43, 77, 79, 79,
+   57,  2, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 64, 79, 78,
+   43, 43, 43, 79, 58,  2,  2,  2, 36, 36, 36, 36, 36, 36, 64, 79,
    78, 43, 43, 79, 43, 43, 43, 43,  7,  7,  7,  7,  7, 27,  2, 89,
    43, 43, 43, 43, 79, 57,  2,  2, 27, 27, 27, 27, 27, 27, 27, 87,
    78, 78, 78, 78, 78, 79, 77, 65, 81, 79,  2,  2,  2,  2,  2,  2,
@@ -4721,39 +4938,41 @@ _hb_ucd_u8[13386] =
    78, 78, 78, 78, 78, 78, 78, 78, 64, 43, 43, 43, 43, 65, 36, 36,
    36, 64, 43, 43, 77, 64, 43, 57,  2,  2,  2, 56, 43, 43, 43, 43,
    64, 43, 43, 77, 79, 43, 36, 36, 36, 36, 36, 36, 36, 43, 43, 43,
-   43, 43, 43, 77, 43,  2, 66,  2, 43, 43, 43, 43, 43, 43, 43, 79,
-   58,  2,  2,  2,  2,  2,  2,  2,  2, 36, 36, 36, 36, 36, 36, 36,
+   43, 43, 43, 77, 43,  2, 66,  2, 58,  2,  2,  2,  2,  2,  2,  2,
+   43, 43, 43, 43, 43, 43, 43, 79,  2, 36, 36, 36, 36, 36, 36, 36,
    43, 43, 43, 43, 77, 43, 43, 43, 77, 43, 79, 43, 43, 43, 43, 43,
    43, 43, 43, 64, 43, 43, 43, 43, 36, 36, 36, 36, 36, 78, 78, 78,
    43, 77, 79, 79, 36, 36, 36, 36, 36, 64, 77, 97,  2,  2,  2,  2,
    43, 82, 36, 36, 36, 36, 36, 36, 36, 36, 78, 43, 43, 43, 43, 78,
-   77, 57,  2,  2,  2,  2,  2,  2, 27, 27, 84, 61, 61, 61, 53, 20,
-  150, 61, 61, 61, 61, 61, 61, 61, 61, 61, 61, 61, 61, 61, 61, 21,
-   65, 36, 36, 64, 43, 43, 43, 43, 43, 43, 57,  2,  2,  2,  2,  2,
-   43, 43, 43, 57,  2,  2, 61, 61, 40, 40, 89, 61, 61, 61, 61, 61,
-    7,  7,  7,  7,  7,167, 27, 27, 27, 87, 36, 36, 36, 36, 36, 36,
-   27, 27, 27, 30,  2,  2,  2,  2, 82, 78, 78, 78, 78, 78, 78, 78,
-   78, 78, 78, 78, 78, 78, 78, 79, 43, 68, 40, 40, 40, 40, 40, 40,
-   40, 80, 43, 43, 43, 43, 43, 43, 36, 36, 36, 36, 36, 36, 47, 57,
-   61, 61,168, 79, 43, 61,168, 78, 78,169, 59, 59, 59, 76, 43, 43,
-   43, 70, 47, 43, 43, 43, 61, 61, 61, 61, 61, 61, 61, 43, 43, 61,
-   61, 43, 70, 61, 61, 61, 61, 61, 11, 11, 11, 11, 11, 16, 16, 16,
-   16, 16, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 16,
-   11, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 11, 11,
-   11, 11, 11, 16, 16, 16, 16, 16, 31, 16, 16, 16, 16, 16, 16, 16,
-   16, 16, 16, 16, 16, 33, 16, 16, 16, 11, 11, 11, 11, 11, 11, 11,
-   11, 11, 11, 11, 11, 31, 16, 16, 16, 16, 33, 16, 16, 16, 11, 11,
-   11, 11, 31, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 33,
-   16, 16, 16, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 31,
-   16, 16, 16, 16, 33, 16, 16, 16, 11, 11, 11, 11, 31, 16, 16, 16,
-   16, 33, 16, 16, 16, 32, 16,  7, 43, 43, 43, 70, 61, 47, 43, 43,
-   43, 43, 43, 43, 43, 43, 70, 61, 61, 61, 47, 61, 61, 61, 61, 61,
-   61, 61, 70, 21,  2,  2,  2,  2,  2,  2,  2,  2,  2, 56, 43, 43,
-   16, 16, 16, 16, 16, 39, 16, 16, 43, 43, 43, 68, 40, 40, 40, 40,
-    7,  7,  7,  7,  7,  7,  7, 71, 36, 36, 36, 36, 36, 36, 36, 43,
-   36, 36, 36, 36, 36, 36, 43, 43,  7,  7,  7,  7,  7,  7,  7,170,
-   36, 36, 36, 36, 36, 75, 43, 43, 16, 16, 43, 43, 43, 68, 40, 40,
-   27, 27, 27, 27, 27, 27,145, 27,171, 27, 27, 27, 27, 27, 27, 27,
+   77, 57,  2,  2,  2,  2,  2,  2,  7,  7,  7,  7,  7, 43, 43, 43,
+   27, 27, 84, 61, 61, 61, 53, 20,150, 61, 61, 61, 61, 61, 61, 61,
+   61, 61, 61, 61, 61, 61, 61, 21, 65, 36, 36, 64, 43, 43, 43, 43,
+   36, 36, 36, 36, 36, 36, 36, 43, 43, 43, 43, 43, 43, 78, 79, 43,
+   43, 43, 57,  2,  2,  2,  2,  2, 43, 43, 43, 57,  2,  2, 61, 61,
+   40, 40, 89, 61, 61, 61, 61, 61,  7,  7,  7,  7,  7,168, 27, 27,
+   27, 87, 36, 36, 36, 36, 36, 36, 40, 63, 36, 36, 36, 36, 36, 36,
+   36, 36, 36, 36, 36, 76,146,  2, 27, 27, 27, 30,  2,  2,  2,  2,
+   82, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, 79,
+   43, 68, 40, 40, 40, 40, 40, 40, 40, 80, 43, 43, 43, 43, 43, 43,
+   36, 36, 36, 36, 36, 36, 47, 57, 61, 61,169, 79, 43, 61,169, 78,
+   78,170, 59, 59, 59, 75, 43, 43, 43, 70, 47, 43, 43, 43, 61, 61,
+   61, 61, 61, 61, 61, 43, 43, 61, 61, 43, 70, 61, 61, 61, 61, 61,
+   11, 11, 11, 11, 11, 16, 16, 16, 16, 16, 11, 11, 11, 11, 11, 11,
+   11, 11, 11, 11, 11, 11, 11, 16, 11, 16, 16, 16, 16, 16, 16, 16,
+   16, 16, 16, 16, 16, 16, 11, 11, 11, 11, 11, 16, 16, 16, 16, 16,
+   31, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 33, 16, 16,
+   16, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 31, 16, 16,
+   16, 16, 33, 16, 16, 16, 11, 11, 11, 11, 31, 16, 16, 16, 16, 16,
+   16, 16, 16, 16, 16, 16, 16, 33, 16, 16, 16, 11, 11, 11, 11, 11,
+   11, 11, 11, 11, 11, 11, 11, 31, 16, 16, 16, 16, 33, 16, 16, 16,
+   11, 11, 11, 11, 31, 16, 16, 16, 16, 33, 16, 16, 16, 32, 16,  7,
+   43, 43, 43, 70, 61, 47, 43, 43, 43, 43, 43, 43, 43, 43, 70, 61,
+   61, 61, 47, 61, 61, 61, 61, 61, 61, 61, 70, 21,  2,  2,  2,  2,
+    2,  2,  2,  2,  2, 56, 43, 43, 16, 16, 16, 16, 16, 39, 16, 16,
+   43, 43, 43, 68, 40, 40, 40, 40,  7,  7,  7,  7,  7,  7,  7, 71,
+    7,  7,  7,  7,  7,  7,  7,171, 36, 36, 36, 36, 36, 76, 43, 43,
+  172,  7,  7,  7,  7,  7,  7, 85, 16, 16, 43, 43, 43, 68, 40, 40,
+   27, 27, 27, 27, 27, 27,145, 27,173, 27, 27, 27, 27, 27, 27, 27,
    27, 27, 27, 27, 27, 27, 27,145, 27, 27, 27, 27, 27, 27, 84, 61,
    61, 61, 61, 61, 61, 25, 41, 41,  0,  0, 29, 21, 21, 21, 23, 21,
    22, 18, 21, 25, 21, 17, 13, 13, 25, 25, 25, 21, 21,  9,  9,  9,
@@ -4764,8 +4983,8 @@ _hb_ucd_u8[13386] =
     6,  5,  9, 21, 25,  9, 26, 12, 11, 11,  9,  6,  5, 21, 17, 17,
    17, 26, 26, 23, 23, 12, 17, 12, 21, 12, 12, 21,  7, 21,  1,  1,
    21, 23, 26, 26,  1, 21,  6,  7,  7, 12, 12,  7, 21,  7, 12,  1,
-   12,  6,  6, 12, 12, 26,  7, 26, 26,  7, 21,  1, 24,  7,  7,  6,
-    1, 12, 12, 10, 10, 10, 10, 12, 21,  6, 10,  7,  7, 10, 23,  7,
+   12,  6,  6, 12, 12, 26,  7, 26, 26,  7, 21,  1, 24,  7,  1, 12,
+    7,  6, 12, 10, 10, 10, 10, 12, 21,  6, 10,  7,  7, 10, 23,  7,
    15, 26, 13, 21, 13,  7, 15,  7, 12, 23, 21, 26, 21, 15, 17,  7,
    29,  7,  7, 22, 18, 18, 14, 14, 14,  7, 10, 21, 17, 21, 11, 12,
     5,  6,  8,  8,  8, 24,  5, 24,  9, 24, 29, 29, 29,  1, 20, 19,
@@ -4776,247 +4995,250 @@ _hb_ucd_u8[13386] =
    26, 14, 17,  6, 14,  6, 12, 24, 24,  6, 26, 15,  6, 21, 11, 21,
    24,  9,  6,  9, 23, 26,  6, 10,  4,  4,  3,  3,  7, 25, 17, 16,
    16, 22, 16, 16, 25, 17,  7,  1, 25, 24, 26,  1,  2,  2, 12, 15,
-   21, 14,  7, 15, 12, 17, 13, 15, 26, 10, 10,  1, 13, 23, 23, 15,
-    0,  1,  2,  3,  4,  5,  6,  7,  8,  9,  0, 10, 11, 12, 13,  0,
-   14,  0,  0,  0,  0,  0, 15,  0, 16,  0,  0,  0,  0,  0,  0,  0,
+   21, 14,  7, 15,  9, 12, 12, 17, 13, 15, 26, 10, 10,  1, 13, 23,
+    7, 13, 23, 15,  0,  1,  2,  3,  4,  5,  6,  7,  8,  9,  0, 10,
+   11, 12, 13,  0, 14,  0,  0,  0,  0,  0, 15,  0, 16,  0,  0,  0,
     0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
     0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
     0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0, 17, 18, 19,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 20,  0, 21,
-   22, 23,  0,  0,  0, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34,
+    0,  0,  0,  0,  0,  0,  0, 17, 18, 19,  0,  0,  0,  0,  0,  0,
     0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
     0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0, 35,  0, 36,  0,  0,  0,  0,  0,  0,  0,  0,
+    0, 20,  0, 21, 22, 23,  0,  0,  0, 24, 25, 26, 27, 28, 29, 30,
+   31, 32, 33, 34,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
     0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 37,  0,
-    0,  0,  0,  0,  0,  0,  0,  0, 38, 39,  0,  0,  0,  0,  0,  0,
-   40, 41, 42,  0, 43,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  1,  2,  0,  0,  0,  0,  3,  0,  0,  0,  4,  5,  6,  7,
-    0,  8,  9, 10,  0, 11, 12, 13, 14, 15, 16, 17, 16, 18, 16, 19,
-   16, 19, 16, 19,  0, 19, 16, 20, 16, 19, 21, 19,  0, 22, 23, 24,
-   25, 26, 27, 28, 29, 30, 31,  0, 32,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0, 33,  0,  0,  0,  0,  0,  0, 34,  0,  0, 35,  0,  0,
-   36,  0, 37,  0,  0,  0, 38, 39, 40, 41, 42, 43, 44, 45, 46,  0,
-    0, 47,  0,  0,  0, 48,  0,  0,  0, 49,  0,  0,  0,  0,  0,  0,
-    0, 50,  0, 51,  0, 52, 53,  0, 54,  0,  0,  0,  0,  0,  0, 55,
-   56, 57,  0,  0,  0,  0, 58,  0,  0, 59, 60, 61, 62, 63,  0,  0,
-   64, 65,  0,  0,  0, 66,  0,  0,  0,  0, 67,  0,  0,  0, 68,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 69,  0,  0,
-    0, 70,  0, 71,  0,  0, 72,  0,  0, 73,  0,  0,  0,  0,  0,  0,
-    0,  0, 74,  0,  0,  0,  0,  0, 75, 76,  0, 77, 78,  0,  0, 79,
-   80,  0, 81, 62,  0, 82, 83,  0,  0, 84, 85, 86,  0,  0,  0, 87,
-    0, 88,  0,  0, 51, 89, 51,  0, 90,  0, 91,  0,  0,  0, 80,  0,
-    0,  0, 92, 93,  0, 94, 95, 96, 97,  0,  0,  0,  0,  0, 51,  0,
-    0,  0,  0, 98, 99,  0,  0,  0,  0,  0,  0,100,  0,  0,  0,  0,
-    0,101,102,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,103,  0,  0,
-  104,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,105,106,  0,  0,107,
-    0,  0,  0,  0,  0,  0,108,  0,109,  0,102,  0,  0,  0,  0,  0,
-  110,111,  0,  0,  0,  0,  0,  0,  0,112,  0,  0,  0,  0,  0,  0,
-    0,113,  0,114,  0,  0,  0,  0,  0,  0,  1,  2,  3,  4,  5,  6,
-    7,  0,  8,  0,  0,  0,  0,  9, 10, 11, 12,  0,  0,  0,  0, 13,
-    0,  0, 14, 15,  0, 16,  0, 17, 18,  0,  0, 19,  0, 20, 21,  0,
-    0,  0,  0,  0, 22, 23,  0, 24, 25,  0,  0, 26,  0,  0,  0, 27,
-    0,  0, 28, 29, 30, 31,  0,  0,  0, 32, 33, 34,  0,  0, 33,  0,
-    0, 35, 33,  0,  0,  0, 33, 36,  0,  0,  0,  0,  0, 37, 38,  0,
-    0,  0,  0,  0,  0, 39, 40,  0,  0,  0,  0,  0,  0, 41, 42,  0,
-    0,  0,  0, 43,  0, 44,  0,  0,  0, 45, 46,  0,  0,  0, 47,  0,
-    0,  0,  0,  0,  0, 48, 49,  0,  0,  0,  0, 50,  0,  0,  0, 51,
-    0, 52,  0, 53,  0,  0,  0,  0, 54,  0,  0,  0,  0, 55,  0, 56,
-    0,  0,  0,  0, 57, 58,  0,  0,  0, 59, 60,  0,  0,  0,  0,  0,
-    0, 61, 52,  0, 62, 63,  0,  0, 64,  0,  0,  0, 65, 66,  0,  0,
-    0, 67,  0, 68, 69, 70, 71, 72,  1, 73,  0, 74, 75, 76,  0,  0,
-   77, 78,  0,  0,  0, 79,  0,  0,  1,  1,  0,  0, 80,  0,  0, 81,
-    0,  0,  0,  0, 77, 82,  0, 83,  0,  0,  0,  0,  0, 78, 84,  0,
-   85,  0, 52,  0,  1, 78,  0,  0, 86,  0,  0, 87,  0,  0,  0,  0,
-    0, 88, 57,  0,  0,  0,  0,  0,  0, 89, 90,  0,  0, 84,  0,  0,
-   33,  0,  0, 91,  0,  0,  0,  0, 92,  0,  0,  0,  0, 49,  0,  0,
-   93,  0,  0,  0,  0, 94, 95,  0,  0, 96,  0,  0, 97,  0,  0,  0,
-   98,  0,  0,  0, 99,  0,  0,  0,  0,100,101, 93,  0,  0,102,  0,
-    0,  0, 84,  0,  0,103,  0,  0,  0,104,105,  0,  0,106,107,  0,
-    0,  0,  0,  0,  0,108,  0,  0,109,  0,  0,  0,  0,110, 33,  0,
-  111,112,113, 35,  0,  0,114,  0,  0,  0,115,  0,  0,  0,  0,  0,
-    0,116,  0,  0,117,  0,  0,  0,  0,118, 88,  0,  0,  0,  0,  0,
-   57,  0,  0,  0,  0, 52,119,  0,  0,  0,  0,120,  0,  0,121,  0,
-    0,  0,  0,119,  0,  0,122,  0,  0,  0,  0,  0,  0,123,  0,  0,
-    0,124,  0,  0,  0,125,  0,126,  0,  0,  0,  0,127,128,129,  0,
-  130,  0,131,  0,  0,  0,132,133,134,  0, 77,  0,  0,  0,  0,  0,
-   35,  0,  0,  0,135,  0,  0,  0,136,  0,  0,137,  0,  0,138,  0,
-    0,  0,  0,  0,  0,  0,  1,  1,  1,  1,  1,  2,  3,  4,  5,  6,
-    7,  4,  4,  8,  9, 10,  1, 11, 12, 13, 14, 15, 16, 17, 18,  1,
-    1,  1, 19,  1,  0,  0, 20, 21, 22,  1, 23,  4, 21, 24, 25, 26,
-   27, 28, 29, 30,  0,  0,  1,  1, 31,  0,  0,  0, 32, 33, 34, 35,
-    1, 36, 37,  0,  0,  0,  0, 38,  1, 39, 14, 39, 40, 41, 42,  0,
-    0,  0, 43, 36, 44, 45, 21, 45, 46,  0,  0,  0, 19,  1, 21,  0,
-    0, 47,  0, 38, 48,  1,  1, 49, 49, 50,  0,  0, 51,  0,  0,  0,
-   52,  1,  0,  0, 38, 14,  4,  1,  1,  1, 53, 21, 43, 52, 54, 21,
-   35,  1,  0,  0,  0, 55,  0,  0,  0, 56, 57, 58,  0,  0,  0,  0,
-    0, 59,  0, 60,  0,  0,  0,  0, 61, 62,  0,  0, 63,  0,  0,  0,
-   64,  0,  0,  0, 65,  0,  0,  0, 66,  0,  0,  0, 67,  0,  0,  0,
-   68,  0,  0, 69, 70,  0, 71, 72, 73, 74, 75, 76,  0,  0,  0, 77,
-    0,  0,  0, 78, 79,  0,  0,  0,  0, 47,  0,  0,  0, 49,  0, 80,
-    0,  0,  0, 62,  0,  0, 63,  0,  0, 81,  0,  0, 82,  0,  0,  0,
-   83,  0,  0, 19, 84,  0, 62,  0,  0,  0,  0, 49,  1, 85,  1, 52,
-   15, 86, 36, 10, 21, 87,  0, 55,  0,  0,  0,  0, 19, 10,  1,  0,
-    0,  0,  0,  0, 88,  0,  0, 89,  0,  0, 88,  0,  0,  0,  0, 78,
-    0,  0, 87,  9, 12,  4, 90,  8, 91, 47,  0, 58, 50,  0, 21,  1,
-   21, 92, 93,  1,  1,  1,  1, 94, 95, 96, 97,  1, 98, 58, 81, 99,
-  100,  4, 58,  0,  0,  0,  0,  0,  0, 19, 50,  0,  0,  0,  0,  0,
-    0, 61,  0,  0,101,102,  0,  0,103,  0,  0,  1,  1, 50,  0,  0,
-    0, 38,  0, 63,  0,  0,  0,  0,  0, 62,  0,  0,104, 68, 61,  0,
-    0,  0, 78,  0,  0,  0,105,106, 58, 38, 81,  0,  0,  0,  0,  0,
-    0,107,  1, 14,  4, 12, 84,  0,  0,  0,  0, 38, 87,  0,  0,  0,
-    0,108,  0,  0,109, 61,  0,110,  0,  0,  0,  1,  0,  0,  0,  0,
+    0,  0,  0,  0, 35,  0,  0,  0,  0, 36,  0, 37,  0,  0,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+    0,  0, 38,  0,  0,  0,  0,  0,  0,  0,  0,  0, 39, 40,  0,  0,
+    0,  0,  0,  0, 41, 42, 43,  0, 44,  0,  0,  0,  0,  0,  0,  0,
+    0,  0,  0,  0,  0,  0,  1,  2,  0,  0,  0,  0,  3,  0,  0,  0,
+    4,  5,  6,  7,  0,  8,  9, 10,  0, 11, 12, 13, 14, 15, 16, 17,
+   16, 18, 16, 19, 16, 19, 16, 19,  0, 19, 16, 20, 16, 19, 21, 19,
+    0, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,  0, 32,  0,  0,  0,
+    0,  0,  0,  0,  0,  0,  0, 33,  0,  0,  0,  0,  0,  0, 34,  0,
+    0, 35,  0,  0, 36,  0, 37,  0,  0,  0, 38, 39, 40, 41, 42, 43,
+   44, 45, 46,  0,  0, 47,  0,  0,  0, 48,  0,  0,  0, 49,  0,  0,
+    0,  0,  0,  0,  0, 50,  0, 51,  0, 52, 53,  0, 54,  0,  0,  0,
+    0,  0,  0, 55, 56, 57,  0,  0,  0,  0, 58,  0,  0, 59, 60, 61,
+   62, 63,  0,  0, 64, 65,  0,  0,  0, 66,  0,  0,  0,  0, 67,  0,
+    0,  0, 68,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+    0, 69,  0,  0,  0, 70,  0, 71,  0,  0, 72,  0,  0, 73,  0,  0,
+    0,  0,  0,  0,  0,  0, 74, 75,  0,  0,  0,  0, 76, 77,  0, 78,
+   79,  0,  0, 80, 81,  0, 82, 62,  0, 83, 84,  0,  0, 85, 86, 87,
+    0, 88,  0, 89,  0, 90,  0,  0, 51, 91, 51,  0, 92,  0, 93,  0,
+    0,  0, 81,  0,  0,  0, 94, 95,  0, 96, 97, 98, 99,  0,  0,  0,
+    0,  0, 51,  0,  0,  0,  0,100,101,  0,  0,  0,  0,  0,  0,102,
+    0,  0,  0,  0,  0,  0,103,  0,  0,  0,  0,  0,  0,104,105,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,106,  0,  0,107,  0,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,108,109,  0,  0,110,  0,  0,  0,  0,
+    0,  0,111,  0,112,  0,105,  0,  0,  0,  0,  0,113,114,  0,  0,
+    0,  0,  0,  0,  0,115,  0,  0,  0,116,  0,  0,  0,117,  0,118,
+    0,  0,  0,  0,  0,  0,  1,  2,  3,  4,  5,  6,  7,  0,  8,  0,
+    0,  0,  0,  9, 10, 11, 12,  0,  0,  0,  0, 13,  0,  0, 14, 15,
+    0, 16,  0, 17, 18,  0,  0, 19,  0, 20, 21,  0,  0,  0,  0,  0,
+   22, 23,  0, 24, 25,  0,  0, 26,  0,  0,  0, 27,  0,  0, 28, 29,
+   30, 31,  0,  0,  0, 32, 33, 34,  0,  0, 33,  0,  0, 35, 33,  0,
+    0,  0, 33, 36,  0,  0,  0,  0,  0, 37, 38,  0,  0,  0,  0,  0,
+    0, 39, 40,  0,  0,  0,  0,  0,  0, 41, 42,  0,  0,  0,  0, 43,
+    0, 44,  0,  0,  0, 45, 46,  0,  0,  0, 47,  0,  0,  0,  0,  0,
+    0, 48, 49,  0,  0,  0,  0, 50,  0,  0,  0, 51,  0, 52,  0, 53,
+    0,  0,  0,  0, 54,  0,  0,  0,  0, 55,  0, 56,  0,  0,  0,  0,
+   57, 58,  0,  0,  0, 59, 60,  0,  0,  0,  0,  0,  0, 61, 52,  0,
+   62, 63,  0,  0, 64,  0,  0,  0, 65, 66,  0,  0,  0, 67,  0, 68,
+   69, 70, 71, 72,  1, 73,  0, 74, 75, 76,  0,  0, 77, 78,  0,  0,
+    0, 79,  0,  0,  1,  1,  0,  0, 80,  0,  0, 81,  0,  0,  0,  0,
+   77, 82,  0, 83,  0,  0,  0,  0,  0, 78, 84,  0, 85,  0, 52,  0,
+    1, 78,  0,  0, 86,  0,  0, 87,  0,  0,  0,  0,  0, 88, 57,  0,
+    0,  0,  0,  0,  0, 89, 90,  0,  0, 84,  0,  0, 33,  0,  0, 91,
+    0,  0,  0,  0, 92,  0,  0,  0,  0, 49,  0,  0, 93,  0,  0,  0,
+    0, 94, 95,  0,  0, 96,  0,  0, 97,  0,  0,  0, 98,  0,  0,  0,
+   99,  0,  0,  0,100,  0,  0,  0,  0,101,102, 93,  0,  0,103,  0,
+    0,  0, 84,  0,  0,104,  0,  0,  0,105,106,  0,  0,107,108,  0,
+    0,  0,  0,  0,  0,109,  0,  0,110,  0,  0,  0,  0,111, 33,  0,
+  112,113,114, 57,  0,  0,115, 35,  0,  0,116,  0,  0,  0,117,  0,
+    0,  0,  0,  0,  0,118,  0,  0,119,  0,  0,  0,  0,120, 88,  0,
+    0,  0,  0,  0, 57,  0,  0,  0,  0, 52,121,  0,  0,  0,  0,122,
+    0,  0,123,  0,  0,  0,  0,121,  0,  0,124,  0,  0,  0,  0,  0,
+   79,  0,  0,  0,  0,125,  0,  0,  0,126,  0,  0,  0,127,  0,128,
+    0,  0,  0,  0,129,130,131,  0,132,  0,133,  0,  0,  0,134,135,
+  136,  0, 77,  0,  0,  0,  0,  0, 35,  0,  0,  0,137,  0,  0,  0,
+  138,  0,  0,  0,139,  0,  0,140,  0,  0,141,  0,  0,  0,  0,  0,
+    0,  0,  1,  1,  1,  1,  1,  2,  3,  4,  5,  6,  7,  4,  4,  8,
+    9, 10,  1, 11, 12, 13, 14, 15, 16, 17, 18,  1,  1,  1, 19,  1,
+    0,  0, 20, 21, 22,  1, 23,  4, 21, 24, 25, 26, 27, 28, 29, 30,
+    0,  0,  1,  1, 31,  0,  0,  0, 32, 33, 34, 35,  1, 36, 37,  0,
+    0,  0,  0, 38,  1, 39, 14, 39, 40, 41, 42,  0,  0,  0, 43, 36,
+   44, 45, 21, 45, 46,  0,  0,  0, 19,  1, 21,  0,  0, 47,  0, 38,
+   48,  1,  1, 49, 49, 50,  0,  0, 51,  0,  0, 19, 52,  1,  0,  0,
+   38, 14,  4,  1,  1,  1, 53, 21, 43, 52, 54, 21, 35,  1,  0,  0,
+    0, 55,  0,  0,  0, 56, 57, 58,  0,  0,  0,  0,  0, 59,  0, 60,
+    0,  0,  0,  0, 61, 62,  0,  0, 63,  0,  0,  0, 64,  0,  0,  0,
+   65,  0,  0,  0, 66,  0,  0,  0, 67,  0,  0,  0, 68,  0,  0, 69,
+   70,  0, 71, 72, 73, 74, 75, 76,  0,  0,  0, 77,  0,  0,  0, 78,
+   79,  0,  0,  0,  0, 47,  0,  0,  0, 49,  0, 80,  0,  0,  0, 62,
+    0,  0, 63,  0,  0, 81,  0,  0, 82,  0,  0,  0, 83,  0,  0, 19,
+   84,  0, 62,  0,  0,  0,  0, 49,  1, 85,  1, 52, 15, 86, 36, 10,
+   21, 87,  0, 55,  0,  0,  0,  0, 19, 10,  1,  0,  0,  0,  0,  0,
+   88,  0,  0, 89,  0,  0, 88,  0,  0,  0,  0, 78,  0,  0, 87,  9,
+   12,  4, 90,  8, 91, 47,  0, 58, 50,  0, 21,  1, 21, 92, 93,  1,
+    1,  1,  1, 94, 95, 96, 97,  1, 98, 58, 81, 99,100,  4, 58,  0,
+    0,  0,  0,  0,  0, 19, 50,  0,  0,  0,  0,  0,  0, 61,  0,  0,
+  101,102,  0,  0,103,  0,  0,  1,  1, 50,  0,  0,  0, 38,  0, 63,
+    0,  0,  0,  0,  0, 62,  0,  0,104, 68, 61,  0,  0,  0, 78,  0,
+    0,  0,105,106, 58, 38, 81,  0,  0,  0,  0,  0,  0,107,  1, 14,
+    4, 12, 84,  0,  0,  0,  0, 38, 87,  0,  0,  0,  0,108,  0,  0,
+  109, 61,  0,110,  0,  0,  0,  1,  0,  0,  0,  0, 49, 50,  0,  0,
    19, 58,  0,  0,  0, 51,  0,111, 14, 52,112, 41,  0,  0, 62,  0,
     0, 61,  0,  0,113,  0, 87,  0,  0,  0, 61, 62,  0,  0, 62,  0,
    89,  0,  0,113,  0,  0,  0,  0,114,  0,  0,  0, 78, 55,  0, 38,
-    1, 58,  1, 58,  0,  0, 63, 89,  0,  0,115,  0,  0,  0, 55,  0,
-    0,  0,  0,115,  0,  0,  0,  0, 61,  0,  0,  0,  0, 79,  0, 61,
-    0,  0,  0,  0, 56,  0, 89, 80,  0,  0, 79,  0,  0,  0,  8, 91,
-    0,  0,  1, 87,  0,  0,116,  0,  0,  0,  0,  0,  0,117,  0,118,
-  119,120,121,  0,104,  4,122, 49, 23,  0,  0,  0, 38, 50, 38, 58,
-    0,  0,  1, 87,  1,  1,  1,  1, 39,  1, 48,105, 87,  0,  0,  0,
-    0,  1,  0,  0,  0,123,  4,122,  0,  0,  0,  1,124,  0,  0,  0,
-    0,  0,230,230,230,230,230,232,220,220,220,220,232,216,220,220,
-  220,220,220,202,202,220,220,220,220,202,202,220,220,220,  1,  1,
-    1,  1,  1,220,220,220,220,230,230,230,230,240,230,220,220,220,
-  230,230,230,220,220,  0,230,230,230,220,220,220,220,230,232,220,
-  220,230,233,234,234,233,234,234,233,230,  0,  0,  0,230,  0,220,
-  230,230,230,230,220,230,230,230,222,220,230,230,220,220,230,222,
-  228,230, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 19, 20, 21, 22,
-    0, 23,  0, 24, 25,  0,230,220,  0, 18, 30, 31, 32,  0,  0,  0,
-    0, 27, 28, 29, 30, 31, 32, 33, 34,230,230,220,220,230,220,230,
-  230,220, 35,  0,  0,  0,  0,  0,230,230,230,  0,  0,230,230,  0,
-  220,230,230,220,  0,  0,  0, 36,  0,  0,230,220,230,230,220,220,
-  230,220,220,230,220,230,220,230,230,  0,  0,220,  0,  0,230,230,
-    0,230,  0,230,230,230,230,230,  0,  0,  0,220,220,220,230,220,
-  220,220,230,230,  0,220, 27, 28, 29,230,  7,  0,  0,  0,  0,  9,
-    0,  0,  0,230,220,230,230,  0,  0,  0,  0,  0,230,  0,  0, 84,
-   91,  0,  0,  0,  0,  9,  9,  0,  0,  0,  0,  0,  9,  0,103,103,
-    9,  0,107,107,107,107,118,118,  9,  0,122,122,122,122,220,220,
-    0,  0,  0,220,  0,220,  0,216,  0,  0,  0,129,130,  0,132,  0,
-    0,  0,  0,  0,130,130,130,130,  0,  0,130,  0,230,230,  9,  0,
-  230,230,  0,  0,220,  0,  0,  0,  0,  7,  0,  9,  9,  0,  9,  9,
-    0,  0,  0,230,  0,  0,  0,228,  0,  0,  0,222,230,220,220,  0,
-    0,  0,230,  0,  0,220,230,220,  0,220,230,230,230,  0,  0,  0,
-    9,  9,  0,  0,  7,  0,230,  0,  1,  1,  1,  0,  0,  0,230,234,
-  214,220,202,230,230,230,230,230,232,228,228,220,218,230,233,220,
-  230,220,230,230,  1,  1,  1,  1,  1,230,  0,  1,  1,230,220,230,
-    1,  1,  0,  0,218,228,232,222,224,224,  0,  8,  8,  0,  0,  0,
-    0,220,230,  0,230,230,220,  0,  0,230,  0,  0, 26,  0,  0,220,
-    0,230,230,  1,220,  0,  0,230,220,  0,  0,  0,220,220,  0,  0,
-  230,220,  0,  9,  7,  0,  0,  7,  9,  0,  0,  0,  9,  7,  6,  6,
-    0,  0,  0,  0,  1,  0,  0,216,216,  1,  1,  1,  0,  0,  0,226,
-  216,216,216,216,216,  0,220,220,220,  0,232,232,220,230,230,230,
-    7,  0, 16, 17, 17, 33, 17, 49, 17, 17, 84, 97,135,145, 26, 17,
+    1, 58,  1, 58,  0,  0,  0,  0,  0, 88, 63, 89,  0,  0,115,  0,
+    0,  0, 55,  0,  0,  0,  0,115,  0,  0,  0,  0, 61,  0,  0,  0,
+    0, 79,  0, 61,  0,  0,  0,  0, 56,  0, 89, 80,  0,  0, 79,  0,
+    0,  0,  8, 91,  0,  0,  1, 87,  0,  0,116,  0,  0,  0,  0,  0,
+    0,117,  0,118,119,120,121,  0,104,  4,122, 49, 23,  0,  0,  0,
+   38, 50, 38, 58,  0,  0,  1, 87,  1,  1,  1,  1, 39,  1, 48,105,
+   87,  0,  0,  0,  0,  1,  0,  0,  0,123,  0,  0,  0,112,  4,122,
+    0,  0,  0,  1,124,  0,  0,  0,  0,  0,230,230,230,230,230,232,
+  220,220,220,220,232,216,220,220,220,220,220,202,202,220,220,220,
+  220,202,202,220,220,220,  1,  1,  1,  1,  1,220,220,220,220,230,
+  230,230,230,240,230,220,220,220,230,230,230,220,220,  0,230,230,
+  230,220,220,220,220,230,232,220,220,230,233,234,234,233,234,234,
+  233,230,  0,  0,  0,230,  0,220,230,230,230,230,220,230,230,230,
+  222,220,230,230,220,220,230,222,228,230, 10, 11, 12, 13, 14, 15,
+   16, 17, 18, 19, 19, 20, 21, 22,  0, 23,  0, 24, 25,  0,230,220,
+    0, 18, 30, 31, 32,  0,  0,  0,  0, 27, 28, 29, 30, 31, 32, 33,
+   34,230,230,220,220,230,220,230,230,220, 35,  0,  0,  0,  0,  0,
+  230,230,230,  0,  0,230,230,  0,220,230,230,220,  0,  0,  0, 36,
+    0,  0,230,220,230,230,220,220,230,220,220,230,220,230,220,230,
+  230,  0,  0,220,  0,  0,230,230,  0,230,  0,230,230,230,230,230,
+    0,  0,  0,220,220,220,230,220,220,220,230,230,  0,220, 27, 28,
+   29,230,  7,  0,  0,  0,  0,  9,  0,  0,  0,230,220,230,230,  0,
+    0,  0,  0,  0,230,  0,  0, 84, 91,  0,  0,  0,  0,  9,  9,  0,
+    0,  0,  0,  0,  9,  0,103,103,  9,  0,107,107,107,107,118,118,
+    9,  0,122,122,122,122,220,220,  0,  0,  0,220,  0,220,  0,216,
+    0,  0,  0,129,130,  0,132,  0,  0,  0,  0,  0,130,130,130,130,
+    0,  0,130,  0,230,230,  9,  0,230,230,  0,  0,220,  0,  0,  0,
+    0,  7,  0,  9,  9,  0,  9,  9,  0,  0,  0,230,  0,  0,  0,228,
+    0,  0,  0,222,230,220,220,  0,  0,  0,230,  0,  0,220,230,220,
+    0,220,230,230,230,  0,  0,  0,  9,  9,  0,  0,  7,  0,230,  0,
+    1,  1,  1,  0,  0,  0,230,234,214,220,202,230,230,230,230,230,
+  232,228,228,220,218,230,233,220,230,220,230,230,  1,  1,  1,  1,
+    1,230,  0,  1,  1,230,220,230,  1,  1,  0,  0,218,228,232,222,
+  224,224,  0,  8,  8,  0,  0,  0,  0,220,230,  0,230,230,220,  0,
+    0,230,  0,  0, 26,  0,  0,220,  0,230,230,  1,220,  0,  0,230,
+  220,  0,  0,  0,220,220,  0,  0,230,220,  0,  9,  7,  0,  0,  7,
+    9,  0,  0,  0,  9,  7,  6,  6,  0,  0,  0,  0,  1,  0,  0,216,
+  216,  1,  1,  1,  0,  0,  0,226,216,216,216,216,216,  0,220,220,
+  220,  0,232,232,220,230,230,230,  7,  0, 16, 17, 17, 33, 17, 49,
+   17, 17, 84, 97,135,145, 26, 17, 17, 17, 17, 17, 17, 17, 17, 17,
    17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
    17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-   17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-   17,177,  0,  1,  2,  3,  3,  3,  3,  3,  3,  3,  3,  3,  3,  3,
-    3,  3,  3,  3,  3,  3,  4,  3,  3,  3,  3,  3,  5,  3,  3,  3,
-    3,  3,  6,  7,  8,  3,  3,  3,  3,  3,  9, 10, 11, 12, 13,  3,
-    3,  3,  3,  3,  3,  3,  3, 14,  3, 15,  3,  3,  3,  3,  3,  3,
-   16, 17, 18, 19, 20, 21,  3,  3,  3, 22, 23, 24,  3,  3,  3,  3,
-    3,  3, 25,  3,  3,  3,  3,  3,  3,  3,  3, 26,  3,  3, 27, 28,
-    0,  1,  0,  0,  0,  0,  0,  1,  0,  2,  0,  0,  0,  3,  0,  0,
-    0,  3,  0,  0,  0,  0,  0,  4,  0,  5,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  6,  0,  0,  0,  7,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  8,  9,  0,  0,  0,  0,  0,
-    0,  9,  0,  9,  0,  0,  0,  0,  0,  0,  0, 10, 11, 12, 13,  0,
-    0, 14, 15, 16,  6,  0, 17, 18, 19, 19, 19, 20, 21, 22, 23, 24,
-   19, 25,  0, 26, 27, 19, 19, 28, 29, 30,  0, 31,  0,  0,  0,  8,
-    0,  0,  0,  0,  0,  0,  0, 19, 28,  0, 32, 33,  9, 34, 35, 19,
-    0,  0, 36, 37, 38, 39, 40, 19,  0, 41, 42, 43, 44, 31,  0,  1,
-   45, 42,  0,  0,  0,  0,  0, 32, 14, 14,  0,  0,  0,  0, 14,  0,
-    0, 46, 47, 47, 47, 47, 48, 49, 47, 47, 47, 47, 50, 51, 52, 53,
-   43, 21,  0,  0,  0,  0,  0,  0,  0, 54,  6, 55,  0, 14, 19,  1,
-    0,  0,  0,  0, 56, 57,  0,  0,  0,  0,  0, 19, 58, 31,  0,  0,
-    0,  0,  0,  0,  0, 59, 14,  0,  0,  0,  0,  1,  0,  2,  0,  0,
-    0,  3,  0,  0,  0, 60, 61,  0,  0,  0,  0,  0,  0,  0,  1,  0,
-    0,  0,  0,  0,  2,  3,  0,  4,  5,  0,  0,  6,  0,  0,  0,  7,
-    0,  0,  0,  1,  1,  0,  0,  8,  9,  0,  8,  9,  0,  0,  0,  0,
-    8,  9, 10, 11, 12,  0,  0,  0, 13,  0,  0,  0,  0, 14, 15, 16,
-   17,  0,  0,  0,  1,  0,  0, 18, 19,  0,  0,  0, 20,  0,  0,  0,
-    1,  1,  1,  1,  0,  1,  1,  1,  1,  1,  1,  1,  0,  8, 21,  9,
-    0,  0, 22,  0,  0,  0,  0,  1,  0, 23, 24, 25,  0,  0, 26,  0,
-    0,  0,  8, 21, 27,  0,  1,  0,  0,  1,  1,  1,  1,  0,  1, 28,
-   29, 30,  0, 31, 32, 20,  1,  1,  0,  0,  0,  8, 21,  9,  1,  4,
-    5,  0,  0,  0, 33,  9,  0,  1,  1,  1,  0,  8, 21, 21, 21, 21,
-   34,  1, 35, 21, 21, 21,  9, 36,  0,  0, 37, 38,  1,  0, 39,  0,
-    0,  0,  1,  0,  1,  0,  0,  0,  0,  8, 21,  9,  1,  0,  0,  0,
-   40,  0,  8, 21, 21, 21, 21, 21, 21, 21, 21,  9,  0,  1,  1,  1,
-    1,  8, 21, 21, 21,  9,  0,  0,  0, 41,  0, 42, 43,  0,  0,  0,
-    1, 44,  0,  0,  0, 45,  8,  9,  1,  0,  0,  0,  8, 21, 21, 21,
-    9,  0,  1,  0,  1,  1,  8, 21, 21,  9,  0,  4,  5,  8,  9,  1,
-    0,  0,  0,  1,  2,  3,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12,
-   13, 14,  3,  3,  3,  3,  3,  3,  3, 15,  3, 16, 17, 17, 17, 17,
+   17, 17, 17, 17, 17, 17, 17, 17, 17,177,  0,  1,  2,  3,  3,  3,
+    3,  3,  3,  3,  3,  3,  3,  3,  3,  3,  3,  3,  3,  3,  4,  3,
+    3,  3,  3,  3,  5,  3,  3,  3,  3,  3,  6,  7,  8,  3,  3,  3,
+    3,  3,  9, 10, 11, 12, 13,  3,  3,  3,  3,  3,  3,  3,  3, 14,
+    3, 15,  3,  3,  3,  3,  3,  3, 16, 17, 18, 19, 20, 21,  3,  3,
+    3, 22, 23, 24,  3,  3,  3,  3,  3,  3, 25,  3,  3,  3,  3,  3,
+    3,  3,  3, 26,  3,  3, 27, 28,  0,  1,  0,  0,  0,  0,  0,  1,
+    0,  2,  0,  0,  0,  3,  0,  0,  0,  3,  0,  0,  0,  0,  0,  4,
+    0,  5,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+    0,  6,  0,  0,  0,  7,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+    0,  8,  9,  0,  0,  0,  0,  0,  0,  9,  0,  9,  0,  0,  0,  0,
+    0,  0,  0, 10, 11, 12, 13,  0,  0, 14, 15, 16,  6,  0, 17, 18,
+   19, 19, 19, 20, 21, 22, 23, 24, 19, 25,  0, 26, 27, 19, 19, 28,
+   29, 30,  0, 31,  0,  0,  0,  8,  0,  0,  0,  0,  0,  0,  0, 19,
+   28,  0, 32, 33,  9, 34, 35, 19,  0,  0, 36, 37, 38, 39, 40, 19,
+    0, 41, 42, 43, 44, 31,  0,  1, 45, 42,  0,  0,  0,  0,  0, 32,
+   14, 14,  0,  0,  0,  0, 14,  0,  0, 46, 47, 47, 47, 47, 48, 49,
+   47, 47, 47, 47, 50, 51, 52, 53, 43, 21,  0,  0,  0,  0,  0,  0,
+    0, 54,  6, 55,  0, 14, 19,  1,  0,  0,  0,  0, 56, 57,  0,  0,
+    0,  0,  0, 19, 58, 31,  0,  0,  0,  0,  0,  0,  0, 59, 14,  0,
+    0,  0,  0,  1,  0,  2,  0,  0,  0,  3,  0,  0,  0, 60, 61,  0,
+    0,  0,  0,  0,  0,  0,  1,  0,  0,  0,  0,  0,  2,  3,  0,  4,
+    5,  0,  0,  6,  0,  0,  0,  7,  0,  0,  0,  1,  1,  0,  0,  8,
+    9,  0,  8,  9,  0,  0,  0,  0,  8,  9, 10, 11, 12,  0,  0,  0,
+   13,  0,  0,  0,  0, 14, 15, 16, 17,  0,  0,  0,  1,  0,  0, 18,
+   19,  0,  0,  0, 20,  0,  0,  0,  1,  1,  1,  1,  0,  1,  1,  1,
+    1,  1,  1,  1,  0,  8, 21,  9,  0,  0, 22,  0,  0,  0,  0,  1,
+    0, 23, 24, 25,  0,  0, 26,  0,  0,  0,  8, 21, 27,  0,  1,  0,
+    0,  1,  1,  1,  1,  0,  1, 28, 29, 30,  0, 31, 32, 20,  1,  1,
+    0,  0,  0,  8, 21,  9,  1,  4,  5,  0,  0,  0, 33,  9,  0,  1,
+    1,  1,  0,  8, 21, 21, 21, 21, 34,  1, 35, 21, 21, 21,  9, 36,
+    0,  0, 37, 38,  1,  0, 39,  0,  0,  0,  1,  0,  1,  0,  0,  0,
+    0,  8, 21,  9,  1,  0,  0,  0, 40,  0,  8, 21, 21, 21, 21, 21,
+   21, 21, 21,  9,  0,  1,  1,  1,  1,  8, 21, 21, 21,  9,  0,  0,
+    0, 41,  0, 42, 43,  0,  0,  0,  1, 44,  0,  0,  0, 45,  8,  9,
+    1,  0,  0,  0,  8, 21, 21, 21,  9,  0,  1,  0,  1,  1,  8, 21,
+   21,  9,  0,  4,  5,  8,  9,  1,  0,  0,  0,  1,  2,  3,  3,  4,
+    5,  6,  7,  8,  9, 10, 11, 12, 13, 14,  3,  3,  3,  3,  3,  3,
+    3, 15,  3, 16, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
    17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
    17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
    17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
    17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-   17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-   17, 17, 18,  0,  0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11,
-   12, 13, 14, 15, 16, 17, 17, 17, 18, 17, 19, 20, 21, 22, 23, 23,
-   23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 24, 23, 23, 23, 23, 23,
-   23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23,
-   23, 23, 23, 23, 25, 25, 26, 27, 28, 29, 30, 30, 30, 30, 30, 30,
-   30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30,
+   17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 18,  0,  0,  1,  2,  3,
+    4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 14, 15, 16, 17, 17, 17,
+   18, 17, 19, 20, 21, 22, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23,
+   23, 23, 24, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23,
+   23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 25, 25, 26, 27,
+   28, 29, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30,
+   30, 30, 30, 30, 30, 30, 30, 30, 31, 31, 31, 31, 31, 31, 31, 31,
+   31, 31, 31, 31, 31, 31, 31, 31, 32, 33, 34, 35, 36, 37, 38, 39,
+   40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 52, 53, 31,
+   31, 31, 31, 54, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 56, 57,
+   31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 58, 31, 31, 31,
+   59, 60, 61, 62, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
+   63, 64, 65, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31,
+   31, 31, 31, 66, 67, 68, 31, 31, 31, 31, 69, 31, 31, 31, 31, 31,
+   31, 31, 17, 70, 71, 72, 17, 17, 73, 74, 31, 75, 76, 77, 78, 79,
+   80, 31, 81, 82, 17, 83, 17, 17, 17, 17, 31, 31, 23, 23, 23, 23,
+   23, 23, 23, 84, 31, 31, 31, 31, 23, 84, 31, 31, 23, 23, 31, 31,
    31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31,
-   32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
-   48, 49, 50, 51, 52, 52, 53, 31, 31, 31, 31, 54, 55, 55, 56, 31,
-   31, 31, 31, 31, 31, 31, 57, 58, 31, 31, 31, 31, 31, 31, 31, 31,
-   31, 31, 31, 31, 31, 31, 31, 31, 59, 60, 31, 61, 62, 62, 62, 62,
-   62, 62, 62, 62, 62, 62, 62, 62, 62, 63, 64, 31, 31, 31, 31, 31,
-   31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 65, 66, 67, 31, 31,
-   31, 31, 68, 31, 31, 31, 31, 31, 31, 31, 31, 69, 70, 71, 17, 17,
-   72, 73, 31, 74, 75, 76, 77, 78, 79, 31, 80, 81, 17, 82, 17, 17,
-   17, 17, 31, 31, 23, 23, 23, 23, 23, 23, 23, 83, 31, 31, 31, 31,
-   23, 83, 31, 31, 23, 23, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31,
-   31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31,
-   31, 31, 31, 31, 84,  0,  0,  1,  0,  1,  2,  3,  0,  1,  2,  3,
-    4,  5,  6,  7,  0,  1,  2,  3,  4,  4,  4,  4,  4,  4,  5,  6,
-    7,  8,  9, 10, 11, 11, 12, 11, 13, 14, 15, 16, 17, 18, 19, 20,
-   21, 22, 23, 24, 25, 26, 19, 27, 28, 29, 30, 30, 31, 31, 32, 32,
-   33, 33, 34, 34, 35, 35, 36, 36, 37, 37, 38, 38, 39, 40, 41, 41,
-   42, 42, 42, 43, 44, 44, 45, 46, 47, 47, 47, 47, 48, 48, 48, 48,
-   48, 48, 49, 50, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 52, 53,
-   54, 55, 56, 56, 57, 58, 59, 51, 60, 61, 62, 63, 64, 65, 66,  7,
-   67, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76,  7,  4,  4,  4,  4,
-   77, 77, 77, 77, 78, 79, 80, 81, 82, 83, 84,  0,  0,  0,  0,  0,
-    0,  0,  0,  0, 85, 85, 85, 85,  0,  0,  0,  0, 86, 87, 88, 88,
-   89, 90, 48, 91,  0,  0, 92, 92, 92, 92, 92, 93, 94, 95, 96, 97,
-   98, 47, 99,100,101,102,  0,103,104,105,  0,  0, 92, 92, 92, 92,
-   92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92,  0,106,106,106,106,
-  106,106,106,106,106,106,106,107,108,108,108,108,108, 11,109,110,
-  111,  4,112,  4,113,114,115,116,117,118,119,120,121,122,123,124,
-  125,126, 50,127, 47, 47, 47, 47, 47, 47, 47, 47,128,128,128,128,
-  128,128,128,128,128,128,128,128, 92, 92, 92, 92, 92, 92, 92, 92,
-  129,130, 19, 19, 19, 19, 19, 19,131, 19, 19, 19,132,133, 19,134,
-  135,136,137,101,138,138,138,138,  0, 77,139,140,128,128,141,142,
-  143,144,145,146,147,148,149,150,151,152,153,153,154,154,154,154,
-  154,154,  4,  4,155,156,157,158,159,160,161,162,163,164,165,166,
-  167,168,169,169,170,170,171,171,172,172,128,128, 19, 19,173,174,
-  175,176,177,178,179,179,180,181,182,183,184,185,186,186,187,188,
-  189,190,128,128,191,191,192,192,128,128,193,193,194,195,196,196,
-  197,197,128,128,198,198,199,199,200,200,201,201,202,203,204,205,
-   28, 28,128,128,206,207,208,208,209,210,211,211,128,128,212,212,
-  213,213,214, 34,215,215,215,215,215,215,215,215,215,215,215,215,
-  215,215,128,128,128,128,128,128,128,128,216,216,217,217,217,217,
-  217,217,217,217,217,217,128,128,128,128,128,128,218,218,218,218,
-  218,218,218,218,218,218,128,128,128,128,128,128,110,110,110,110,
-  110,110,110,110,110,219,220,221,222,222,222,222,223,223,223,223,
-  224,224,224,225,226,226,226,226,226,226,226,226,226,226,226,226,
-  227,227,227,227,227,227,227,227,226,226,128,128,128,128,128,128,
-  128,128,104,104,228,229,229,229,230,231,232,232,232,232,232,232,
-  128,128,128,128,233,233,234,  0,128,128,128,128,128,128,128,128,
-    7,235,  0,  0,  0,  0,  0,  0,  0,236,237,  0, 77, 77,  0,  0,
-    0,  0,128,128,238,238,238,238,238,238,238,238,238,238,238,238,
-  128,128,128,128,128,128,128,128,  4,  4,128,128,239, 11, 11, 11,
-  240,240,128,128,128,128,241,242,128,128,128,128,128,128,243,243,
-  128,128,128,128,128,128,128,128,128,128, 48, 48,244,244,244,244,
-  245,245,128,128,  0,  0,  0,  0,  0,  0,128,128, 19, 19, 19, 19,
-  128,128,128,128,246,  0,128,128,  0,  0,  0,  0, 92, 92,128,128,
+   31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 85,  0,  0,  1,
+    0,  1,  2,  3,  0,  1,  2,  3,  4,  5,  6,  7,  0,  1,  2,  3,
+    4,  4,  4,  4,  4,  4,  5,  6,  7,  8,  9, 10, 11, 11, 12, 11,
+   13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 19, 27,
+   28, 29, 30, 30, 31, 31, 32, 32, 33, 33, 34, 34, 35, 35, 36, 36,
+   37, 37, 38, 38, 39, 40, 41, 41, 42, 42, 42, 43, 44, 44, 45, 46,
+   47, 47, 47, 47, 48, 48, 48, 48, 48, 48, 49, 50, 51, 51, 51, 51,
+   51, 51, 51, 51, 51, 51, 52, 53, 54, 55, 56, 56, 57, 58, 59, 51,
+   60, 61, 62, 63, 64, 65, 66,  7, 67, 67, 68, 69, 70, 71, 72, 73,
+   74, 75, 76,  7,  4,  4,  4,  4, 77, 77, 77, 77, 78, 79, 80, 81,
+   82, 83, 84,  0,  0,  0,  0,  0,  0,  0,  0,  0, 85, 85, 85, 85,
+    0,  0,  0,  0, 86, 87, 88, 88, 89, 90, 48, 91,  0,  0, 92, 92,
+   92, 92, 92, 93, 94, 95, 96, 97, 98, 47, 99,100,101,102,  0,103,
+  104,105,  0,  0, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92,
+   92, 92, 92,  0,106,106,106,106,106,106,106,106,106,106,106,107,
+  108,108,108,108,108, 11,109,110,111,  4,112,  4,113,114,115,116,
+  117,118,119,120,121,122,123,124,125,126, 50,127, 47, 47, 47, 47,
+   47, 47, 47, 47,128,128,128,128,128,128,128,128,128,128,128,128,
+   92, 92, 92, 92, 92, 92, 92, 92,129,130, 19, 19, 19, 19, 19, 19,
+  131, 19, 19, 19,132,133, 19,134,135,136,137,101,138,138,138,138,
+    0, 77,139,140,128,128,141,142,143,144,145,146,147,148,149,150,
+  151,152,153,154,155,155,155,155,155,155,  4,  4,156,157,158,159,
+  160,161,162,163,164,165,166,167,168,169,170,170,171,171,172,172,
+  173,174,174,174, 19, 19,175,176,177,178,179,180,181,181,182,183,
+  184,185,186,187,188,188,189,190,191,192,193,193,194,194,195,195,
+  128,128,196,196,197,198,199,200,201,201,128,128,202,202,203,203,
+  204,204,205,205,206,207,208,209, 28, 28,210,210,211,212,213,213,
+  214,215,216,216,128,128,217,217,218,218,219, 34,220,220,220,220,
+  220,220,220,220,220,220,220,220,220,220,128,128,128,128,128,128,
+  128,128,221,221,222,222,222,222,222,222,222,222,223,223,223,223,
+  223,223,223,223,223,223,128,128,128,128,128,128,128,128,128,128,
+  224,224,128,128,110,110,110,110,110,110,110,110,110,225,226,227,
+  228,228,228,228,128,128,128,128,229,229,128,128,230,230,230,230,
+  231,231,231,232,233,233,233,233,233,233,233,233,233,233,233,233,
+  234,234,234,234,234,234,234,234,233,233,128,128,128,128,128,128,
+  128,128,104,104,235,236,236,236,237,238,239,239,239,239,239,239,
+  128,128,128,128,240,240,241,  0,128,128,128,128,  0,  0,  0,  0,
+    7,242,  0,  0,  0,  0,  0,  0,  0,243,244,  0, 77, 77,  0,  0,
+    0,  0,128,128,245,245,245,245,245,245,245,245,245,245,245,245,
+  128,128,128,128,128,128,128,128,  4,  4,128,128,246, 11, 11, 11,
+  247,247,128,128,128,128,248,249,128,128,128,128,128,128,250,250,
+  128,128,251,251,128,128,128,128,128,128, 48, 48,252,252,252,252,
+  253,253,128,128,  0,  0,  0,  0,  0,  0,128,128, 19, 19, 19, 19,
+  128,128,128,128,254,  0,128,128,  0,  0,  0,  0, 92, 92,128,128,
   128,128,128,128,  0,  0,128,128,  7,  7,  7,  7,  0,  0,  0,  0,
     1,  2,  1,  2,  0,  0,  3,  3,  4,  5,  4,  5,  4,  4,  4,  4,
     4,  4,  4,  6,  0,  0,  7,  0,  8,  8,  8,  8,  8,  8,  8,  9,
@@ -5056,30 +5278,32 @@ _hb_ucd_u8[13386] =
   137,137,138,138,138,138,139,  0,140,140,140,141,141,142,142,142,
   143,143,144,144,144,144,144,144,145,145,145,145,145,146,146,146,
   147,147,147,148,148,148,148,148,149,149,149,150,150,150,150,151,
-  151,151,151,151,152,152,152,152,153,153,153,153,154,154,155,155,
-  156,156,156,156,156,156,157,157,158,158,159,159,159,159,159,159,
-  160,160,161,161,161,161,161,161,162,162,162,162,162,162,163,163,
-  164,164,164,164,165,165,165,165,166,166,166,166,167,167,168,168,
-  169,169,169,169,170,170,170,170,171,171,171,171,172,172,172,172,
-  173,173,173,173,173,173,173,174,175,175,175,176,176,176,176,177,
-  177,177,177,178,178,178,179,179,180,180,180,180,181,181,181,181,
-  181,182,182,182,183,183,183,183,183,184,184,184,185,185,185,185,
-  185,185,186, 43,187,187,187,187,188,188,188,189,189,189,189,189,
-  190,190,190,191,190,190,190,190,192,192,192,192,193,193,193,193,
-  194,194,194,194,195,195,195,195,195,195, 66, 66,196,196,196,196,
-  197,197,197,197,198,198,198,198,199,199,199,199,200,200,200,200,
-  201,201,201,201,202,202,202,202,202,203,203,203,203,203,203, 55,
-  204,204,204,204,205,205,205,205,205,205,205,206,206,206,206,206,
-  207,207,207,207,207,207,208,208,208,208,208,208,209,209,209,209,
-  210,210,210,210,110,110,110,110,211,211,211,211,212,212,212,212,
-  213,213,213,213,214,214,214,214,215,215,215,216,216,216,216,216,
-  216,217,217,217,218,218,218,218,219,219,219,219,220,220,220,220,
-  220,220,221, 94,222,222,222,222,223,223,223,223,224, 99, 99, 99,
-   99, 99, 99, 99, 99, 99,102,225, 99,226,102,227,227,227,227,227,
-  228,228,228,228,228,228,  0,  0,  8,  0,  0,  0,  0,  0,229,230,
-  231,  0,232,  0,233,233,233,233, 91, 91, 91, 13,234,234,234,234,
-  235,235,235,235,236,236,236,236,237,237,237,237,238,238,238,238,
-  239,239,239,239,240,  0,  0,  0,  0,  0,  0,  0,  1,  2,  2,  2,
+  151,151,151,151,152,152,152,152,153,153,153,153,154,154,154,154,
+  155,155,156,156,157,157,157,157,157,157,158,158,159,159,160,160,
+  160,160,160,160,161,161,162,162,162,162,162,162,163,163,163,163,
+  163,163,164,164,165,165,165,165,166,166,166,166,167,167,167,167,
+  168,168,169,169,170,170,170,170,171,171,171,171,172,172,172,172,
+  173,173,173,173,174,174,174,174,175,175,175,175,176, 21, 21, 21,
+  177,177,177,178,178,178,178,179,179,179,179,180,180,180,181,181,
+  182,182,182,182,183,183,183,183,183,184,184,184,185,185,185,185,
+  185,186,186,186,187,187,187,187,187,187,188, 43,189,189,189,189,
+  190,190,190,191,191,191,191,191,192,192,192,193,192,192,192,192,
+  194,194,194,194,195,195,195,195,196,196,196,196,197,197,197,197,
+  198,198,198,198,198,198, 66, 66,199,199,199,199,199, 49, 49, 49,
+  200,200,200,200,201,201,201,201,202,202,202,202,203,203,203,203,
+  204,204,204,204,205,205,205,205,205,206,206,206,206,206,206, 55,
+  207,207,207,207,208,208,208,208,209,209,209,209,209,209,209,210,
+  210,210,210,210,211,211,211,211,211,211,212,212,212,212,212,212,
+  213,213,213,213,214,214,214,214,110,110,110,110,215,215,215,215,
+  216,216,216,216,217,217,217,217,218,218,218,218,219,219,219,219,
+  220,220,220,221,221,221,221,221,221,222,222,222,223,223,223,223,
+  224,224,224,224,225,225,225,225,226,226,226,226,226,226,227, 94,
+  228,228,228,228,229,229,229,229,230, 99, 99, 99, 99, 99, 99, 99,
+   99, 99,102,231, 99,232,102,233,233,233,233,233,234,234,234,234,
+  234,234,  0,  0,  8,  0,  0,  0,  0,  0,235,236,237,  0,238,  0,
+  239,239,239,239, 91, 91, 91, 13,240,240,240,240,241,241,241,241,
+  242,242,242,242,243,243,243,243,244,244,244,244,245,245,245,245,
+  246,246,246,246,247,  0,  0,  0,  0,  0,  0,  0,  1,  2,  2,  2,
     2,  2,  3,  0,  0,  0,  4,  0,  2,  2,  2,  2,  2,  3,  2,  2,
     2,  2,  5,  0,  2,  5,  6,  0,  7,  7,  7,  7,  8,  9,  8, 10,
     8, 11,  8,  8,  8,  8,  8,  8, 12, 13, 13, 13, 14, 14, 14, 14,
@@ -5123,98 +5347,101 @@ _hb_ucd_u8[13386] =
   163,163,163,163,164,164,164,164,165,165,165,165,166,166,166,166,
   167,167,167,167,168,168,168,168,169,169,169,169,170,170,170,170,
   171,171,171,171,172,172,172,172,173,173,173,173,174,174,174,174,
-  174,174,174,175,176,176,176,176,177,177,177,177,178,178,178,178,
+  175,175,175,175,176,176,176,176,177, 20, 20, 20,178,178,178,178,
   179,179,179,179,180,180,180,180,181,181,181,181,182,182,182,182,
   183,183,183,183,184,184,184,184,185,185,185,185,186,186,186,186,
-  187, 45, 45, 45,188,188,188,188,189,189,189,189,190,190,190,190,
-  191,191,191,191,191,191,192,191,193,193,193,193,194,194,194,194,
+  187,187,187,187,188,188,188,188,189, 45, 45, 45,190,190,190,190,
+  191,191,191,191,192,192,192,192,193,193,193,193,193,193,194,193,
   195,195,195,195,196,196,196,196,197,197,197,197,198,198,198,198,
   199,199,199,199,200,200,200,200,201,201,201,201,202,202,202,202,
   203,203,203,203,204,204,204,204,205,205,205,205,206,206,206,206,
   207,207,207,207,208,208,208,208,209,209,209,209,210,210,210,210,
   211,211,211,211,212,212,212,212,213,213,213,213,214,214,214,214,
   215,215,215,215,216,216,216,216,217,217,217,217,218,218,218,218,
-  219,219,219,219,220,220,220,220,221,221,221,221,222,223,223,223,
-  224,224,224,224,223,223,223,223,225,106,106,106,226,106,106,106,
-  106,227,109,109,228,228,228,228,229,229,229,229,  0,230, 86,  0,
-    0,  0,230,  7, 82,138,  7,  0,  0,  0,231, 86,232,232,232,232,
-  233,233,233,233,234,234,234,234,235,235,235,235,236,236,236,236,
-  237,237,237,237,238,238,238,238,239,  0,  0,  0,  0,  0,  0,  0,
-    0, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,  0,  0,  0, 19,  0,
-   19,  0,  0,  0,  0,  0, 26, 26,  1,  1,  1,  1,  9,  9,  9,  9,
-    0,  9,  9,  9,  9,  9,  0,  9,  9,  0,  9,  0,  9,  9, 55, 55,
-   55, 55, 55, 55,  6,  6,  6,  6,  6,  1,  1,  6,  6,  4,  4,  4,
-    4,  4,  4,  4,  4, 14, 14, 14, 14, 14, 14, 14,  3,  3,  3,  3,
-    3,  0,  3,  3,  0,  3,  3,  3,  3,  3,  3,  0,  3,  3,  3,  1,
-    1,  1,  3,  3,  1,  3,  3,  3, 37, 37, 37, 37, 38, 38, 38, 38,
-   64, 64, 64, 64, 90, 90, 90, 90, 95, 95, 95, 95,  3,  3,  0,  3,
-    7,  7,  7,  7,  7,  1,  1,  1,  1,  7,  7,  7,  0,  0,  7,  7,
-    5,  5,  5,  5, 11, 11, 11, 11, 10, 10, 10, 10, 21, 21, 21, 21,
-   22, 22, 22, 22, 23, 23, 23, 23, 16, 16, 16, 16, 20, 20, 20, 20,
-   36, 36, 36, 36, 24, 24, 24, 24, 24, 24, 24,  0, 18, 18, 18, 18,
-   25, 25, 25, 25, 25,  0,  0,  0,  0, 25, 25, 25, 33, 33, 33, 33,
-    8,  8,  8,  8,  8,  8,  8,  0, 12, 12, 12, 12, 30, 30, 30, 30,
-   29, 29, 29, 29, 28, 28, 28, 28, 34, 34, 34, 34, 35, 35, 35, 35,
-   35, 35, 35,  0,  0,  0, 35, 35, 45, 45, 45, 45, 44, 44, 44, 44,
-   44,  0,  0,  0, 43, 43, 43, 43, 46, 46, 46, 46, 31, 31, 31, 31,
-   32, 32,  0,  0, 32,  0, 32, 32, 32, 32, 32, 32, 48, 48, 48, 48,
-   52, 52, 52, 52, 58, 58, 58, 58, 54, 54, 54, 54, 91, 91, 91, 91,
-   62, 62, 62, 62, 76, 76, 76, 76, 93, 93, 93, 93, 70, 70, 70, 70,
-   73, 73, 73, 73,  1,  1,  1,  0,  1,  0,  1,  1,  1,  0,  0,  0,
-    0,  1,  0,  0,  1,  1,  0,  0, 19, 19,  9,  9,  9,  9,  9,  6,
-   19,  9,  9,  9,  9,  9, 19, 19,  9,  9,  9, 19,  6, 19, 19, 19,
-   19, 19, 19,  9,  0,  0,  0, 19,  0,  0,  9,  0,  0,  0, 19, 19,
-   27, 27, 27, 27, 56, 56, 56, 56, 61, 61, 61, 61, 13, 13, 13, 13,
-    0, 13,  0, 13,  0, 13, 13, 13, 13, 13,  1,  1,  1,  1, 12, 12,
-    0, 15, 15, 15, 15, 15, 15, 15, 15,  1,  1,  0,  0, 17, 17, 17,
-   17, 17, 17, 17, 17, 17, 17,  0, 26, 26, 26, 26, 26, 12, 12, 12,
-   12, 12, 12,  0, 39, 39, 39, 39, 86, 86, 86, 86, 77, 77, 77, 77,
-   79, 79, 79, 79, 60, 60, 60, 60, 65, 65, 65, 65, 75, 75, 75, 75,
-   69, 69, 69, 69, 69, 69,  0, 69, 74, 74, 74, 74, 84, 84, 84, 84,
-   84, 84, 84,  0, 68, 68, 68, 68, 92, 92, 92, 92, 87, 87, 87, 87,
-   19,  9, 19, 19, 19, 19,  0,  0,  2,  2,  2,  2, 19, 19, 19,  4,
-    3,  3,  0,  0,  1,  1,  6,  6,  0,  0, 17, 17, 17, 17,  0,  0,
-   49, 49, 49, 49,  0,  1,  1,  1, 71, 71, 71, 71, 67, 67, 67, 67,
-   42, 42, 42, 42, 41, 41, 41, 41,118,118,118,118, 53, 53, 53, 53,
-   59, 59, 59, 59, 40, 40, 40, 40, 51, 51, 51, 51, 50, 50, 50, 50,
-  135,135,135,135,106,106,106,106,104,104,104,104,161,161,161,161,
+  219,219,219,219,220,220,220,220,221,221,221,221,222,222,222,222,
+  223,223,223,223,224,224,224,224,225,225,225,225,226,226,226,226,
+  227,227,227,227,228,229,229,229,230,230,230,230,229,229,229,229,
+  231,106,106,106,232,106,106,106,106,233,109,109,234,234,234,234,
+  235,235,235,235,  0,236, 86,  0,  0,  0,236,  7, 82,138,  7,  0,
+    0,  0,237, 86,238,238,238,238,239,239,239,239,240,240,240,240,
+  241,241,241,241,242,242,242,242,243,243,243,243,244,244,244,244,
+  245,245,245,245,246,  0,  0,  0,  0,  0,  0,  0,  0, 19, 19, 19,
+   19, 19, 19, 19, 19, 19, 19,  0,  0,  0, 19,  0, 19,  0,  0,  0,
+    0,  0, 26, 26,  1,  1,  1,  1,  9,  9,  9,  9,  0,  9,  9,  9,
+    9,  9,  0,  9,  9,  0,  9,  0,  9,  9, 55, 55, 55, 55, 55, 55,
+    6,  6,  6,  6,  6,  1,  1,  6,  6,  4,  4,  4,  4,  4,  4,  4,
+    4, 14, 14, 14, 14, 14, 14, 14,  3,  3,  3,  3,  3,  0,  3,  3,
+    0,  3,  3,  3,  3,  3,  3,  0,  3,  3,  3,  1,  1,  1,  3,  3,
+    1,  3,  3,  3, 37, 37, 37, 37, 38, 38, 38, 38, 64, 64, 64, 64,
+   90, 90, 90, 90, 95, 95, 95, 95,  3,  3,  0,  3,  7,  7,  7,  7,
+    7,  1,  1,  1,  1,  7,  7,  7,  0,  0,  7,  7,  5,  5,  5,  5,
+   11, 11, 11, 11, 10, 10, 10, 10, 21, 21, 21, 21, 22, 22, 22, 22,
+   23, 23, 23, 23, 16, 16, 16, 16, 20, 20, 20, 20, 36, 36, 36, 36,
+   24, 24, 24, 24, 24, 24, 24,  0, 18, 18, 18, 18, 25, 25, 25, 25,
+   25,  0,  0,  0,  0, 25, 25, 25, 33, 33, 33, 33,  8,  8,  8,  8,
+    8,  8,  8,  0, 12, 12, 12, 12, 30, 30, 30, 30, 29, 29, 29, 29,
+   28, 28, 28, 28, 34, 34, 34, 34, 35, 35, 35, 35, 35, 35, 35,  0,
+    0,  0, 35, 35, 45, 45, 45, 45, 44, 44, 44, 44, 44,  0,  0,  0,
+   43, 43, 43, 43, 46, 46, 46, 46, 31, 31, 31, 31, 32, 32,  0,  0,
+   32,  0, 32, 32, 32, 32, 32, 32, 48, 48, 48, 48, 52, 52, 52, 52,
+   58, 58, 58, 58, 54, 54, 54, 54, 91, 91, 91, 91, 62, 62, 62, 62,
+   76, 76, 76, 76, 93, 93, 93, 93, 70, 70, 70, 70, 73, 73, 73, 73,
+    1,  1,  1,  0,  1,  0,  1,  1,  1,  0,  0,  0,  0,  1,  0,  0,
+    1,  1,  0,  0, 19, 19,  9,  9,  9,  9,  9,  6, 19,  9,  9,  9,
+    9,  9, 19, 19,  9,  9,  9, 19,  6, 19, 19, 19, 19, 19, 19,  9,
+    0,  0,  0, 19,  0,  0,  9,  0,  0,  0, 19, 19, 27, 27, 27, 27,
+   56, 56, 56, 56, 61, 61, 61, 61, 13, 13, 13, 13,  0, 13,  0, 13,
+    0, 13, 13, 13, 13, 13,  1,  1,  1,  1, 12, 12,  0, 15, 15, 15,
+   15, 15, 15, 15, 15,  1,  1,  0,  0, 17, 17, 17, 17, 17, 17, 17,
+   17, 17, 17,  0, 26, 26, 26, 26, 26, 12, 12, 12, 12, 12, 12,  0,
+   39, 39, 39, 39, 86, 86, 86, 86, 77, 77, 77, 77, 79, 79, 79, 79,
+   60, 60, 60, 60, 65, 65, 65, 65, 75, 75, 75, 75, 69, 69, 69, 69,
+   69, 69,  0, 69, 74, 74, 74, 74, 84, 84, 84, 84, 84, 84, 84,  0,
+   68, 68, 68, 68, 92, 92, 92, 92, 87, 87, 87, 87, 19,  9, 19, 19,
+   19, 19,  0,  0,  2,  2,  2,  2, 19, 19, 19,  4,  3,  3,  0,  0,
+    1,  1,  6,  6,  0,  0, 17, 17, 17, 17,  0,  0, 49, 49, 49, 49,
+    0,  1,  1,  1, 71, 71, 71, 71, 67, 67, 67, 67, 42, 42, 42, 42,
+   41, 41, 41, 41,118,118,118,118, 53, 53, 53, 53, 59, 59, 59, 59,
+   40, 40, 40, 40, 51, 51, 51, 51, 50, 50, 50, 50,135,135,135,135,
+  106,106,106,106,104,104,104,104,161,161,161,161,170,170,170,170,
   110,110,110,110, 47, 47, 47, 47, 81, 81, 81, 81,120,120,120,120,
   116,116,116,116,128,128,128,128, 66, 66, 66, 66, 72, 72, 72, 72,
    98, 98, 98, 98, 97, 97, 97, 97, 57, 57, 57, 57, 88, 88, 88, 88,
   117,117,117,117,112,112,112,112, 78, 78, 78, 78, 83, 83, 83, 83,
    82, 82, 82, 82,122,122,122,122, 89, 89, 89, 89,130,130,130,130,
-  144,144,144,144,156,156,156,156,156,  3,  3,  3,147,147,147,147,
-  148,148,148,148,158,158,158,158,153,153,153,153,149,149,149,149,
-   94, 94, 94, 94, 85, 85, 85, 85,101,101,101,101, 96, 96, 96, 96,
-  111,111,111,111,100,100,100,100,100, 36, 36, 36,108,108,108,108,
-  129,129,129,129,109,109,109,109,107,107,107,107,107,107,107,  1,
-  137,137,137,137,124,124,124,124,123,123,123,123,114,114,114,114,
-  102,102,102,102,126,126,126,126,142,142,142,142,125,125,125,125,
-  154,154,154,154,150,150,150,150,141,141,141,141,140,140,140,140,
-  121,121,121,121,133,133,133,133,134,134,134,134,138,138,138,138,
-  143,143,143,143,145,145,145,145,163,163,163,163, 63, 63, 63, 63,
-  157,157,157,157, 80, 80, 80, 80,127,127,127,127,115,115,115,115,
-  159,159,159,159,103,103,103,103,119,119,119,119,146,146,146,146,
-   99, 99, 99, 99,136,139, 13, 13,155,155,155,155,136,136,136,136,
-   17, 15, 15, 15, 17, 17, 15, 15, 15, 17, 17, 17,139,139,139,139,
-  105,105,105,105,  0,  0,  0,  1,  0,  0,  1,  1,131,131,131,131,
-  151,151,151,151,160,160,160,160,152,152,152,152,164,164,164,164,
-  113,113,113,113,132,132,132,132, 15,  0,  0,  0,  0,  1,  2,  3,
-    4,  5,  6,  7,  8,  9,  9,  9,  9, 10,  9, 11, 12, 13,  9,  9,
-    9, 14,  9,  9, 15,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,
+  144,144,144,144,165,165,165,165,156,156,156,156,156,156,  3,  3,
+  147,147,147,147,148,148,148,148,158,158,158,158,153,153,153,153,
+  149,149,149,149, 94, 94, 94, 94, 85, 85, 85, 85,101,101,101,101,
+   96, 96, 96, 96,111,111,111,111,100,100,100,100,100, 36, 36, 36,
+  108,108,108,108,129,129,129,129,109,109,109,109,107,107,107,107,
+  107,107,107,  1,171,171,171,171,137,137,137,137,124,124,124,124,
+  123,123,123,123,114,114,114,114,102,102,102,102,126,126,126,126,
+  142,142,142,142,125,125,125,125,154,154,154,154,150,150,150,150,
+  141,141,141,141,140,140,140,140,121,121,121,121,169,169,169,169,
+  133,133,133,133,134,134,134,134,138,138,138,138,143,143,143,143,
+  145,145,145,145,163,163,163,163, 63, 63, 63, 63,157,157,157,157,
+   80, 80, 80, 80,127,127,127,127,166,166,166,166,115,115,115,115,
+  159,159,159,159,103,103,103,103,119,119,119,119,167,167,167,167,
+  146,146,146,146, 99, 99, 99, 99,136,139, 13, 13,155,155,155,155,
+  136,136,136,136, 17, 15, 15, 15, 17, 17, 15, 15, 15, 17, 17, 17,
+  139,139,139,139,105,105,105,105,  0,  0,  0,  1,  0,  0,  1,  1,
+  131,131,131,131,151,151,151,151,160,160,160,160,152,152,152,152,
+  164,164,164,164,168,168,168,168,113,113,113,113,132,132,132,132,
+   15,  0,  0,  0,  0,  1,  2,  3,  4,  5,  6,  7,  8,  9,  9,  9,
+    9, 10,  9, 11, 12, 13,  9,  9,  9, 14,  9,  9, 15,  9,  9,  9,
     9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,
     9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,
     9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,
     9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,
     9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,
-    9,  9,  9,  9,  9,  9,  9,  9, 16, 17,  9,  9,  9,  9,  9,  9,
-    9,  9,  9,  9, 18, 19, 20,  9, 21,  9,  9,  9,  9,  9,  9,  9,
+    9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,
+   16, 17,  9,  9,  9,  9, 18,  9,  9,  9,  9,  9, 19, 20, 21,  9,
+   22,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,
+    9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,
+    9,  9,  9,  9, 23,  9,  9,  9,  9,  9, 24,  9,  9,  9,  9,  9,
     9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,
     9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,
-    9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,
-    9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,
-    9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,
-    9,  9,  9,  9, 22,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,
+    9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9, 25,  9,  9,  9,
     9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,
     9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,
     9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,
@@ -5223,60 +5450,67 @@ _hb_ucd_u8[13386] =
     9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,
     9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,
     9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,
-    9,  9,  9,  9,  9,  9,  9,  9, 23, 24,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10,
-   11, 12,  0,  0, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 23,  0,
-    0, 24, 25, 26, 27, 28, 29, 30,  0,  0, 31, 32,  0, 33,  0, 34,
-    0, 35,  0,  0,  0,  0, 36, 37, 38, 39,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 40,  0,  0,  0,
-    0,  0,  0,  0,  0,  0, 41, 42,  0,  0,  0,  0,  0,  0,  0,  0,
+    9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,
+   26, 27,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  2,
+    3,  4,  5,  6,  7,  8,  9, 10, 11, 12,  0,  0, 13, 14, 15, 16,
+   17, 18, 19, 20, 21, 22,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+    0,  0,  0,  0,  0,  0, 23,  0,  0, 24, 25, 26, 27, 28, 29, 30,
+    0,  0, 31, 32,  0, 33,  0, 34,  0, 35,  0,  0,  0,  0, 36, 37,
+   38, 39,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+    0,  0,  0,  0, 40,  0,  0,  0,  0,  0,  0,  0,  0,  0, 41, 42,
     0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 43, 44,  0, 45,
-    0,  0,  0,  0,  0,  0, 46, 47,  0,  0,  0,  0,  0, 48,  0, 49,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 50, 51,
-    0,  0,  0, 52,  0,  0, 53,  0,  0,  0,  0,  0,  0,  0, 54,  0,
-    0,  0,  0,  0,  0,  0, 55,  0,  0,  0,  0,  0,  0,  0, 56,  0,
-    0,  0,  0,  0,  0,  0,  0, 57,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 58, 59,
-   60, 61, 62, 63, 64, 65,  0,  0,  0,  0,  0,  0, 66,  0,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+    0,  0,  0,  0, 43, 44,  0, 45,  0,  0,  0,  0,  0,  0, 46, 47,
+    0,  0,  0,  0,  0, 48,  0, 49,  0,  0,  0,  0,  0,  0,  0,  0,
+    0,  0,  0,  0,  0,  0, 50, 51,  0,  0,  0, 52,  0,  0, 53,  0,
+    0,  0,  0,  0,  0,  0, 54,  0,  0,  0,  0,  0,  0,  0, 55,  0,
+    0,  0,  0,  0,  0,  0, 56,  0,  0,  0,  0,  0,  0,  0,  0, 57,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+    0,  0,  0,  0,  0,  0, 58, 59, 60, 61, 62, 63, 64, 65,  0,  0,
+    0,  0,  0,  0, 66,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
     0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
     0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
     0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
     0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 67, 68,  0, 69, 70,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 71, 72, 73, 74, 75, 76,
-   77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92,
-   93, 94, 95, 96, 97, 98, 99,100,101,102,103,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,104,  0,  0,  0,
-    0,  0,  0,105,106,  0,107,  0,  0,  0,108,  0,109,  0,110,  0,
-  111,112,113,  0,114,  0,  0,  0,115,  0,  0,  0,116,  0,  0,  0,
+    0,  0, 67, 68,  0, 69, 70,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+    0,  0, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84,
+   85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99,100,
+  101,102,103,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+    0,  0,  0,  0,104,  0,  0,  0,  0,  0,  0,105,106,  0,107,  0,
+    0,  0,108,  0,109,  0,110,  0,111,112,113,  0,114,  0,  0,  0,
+  115,  0,  0,  0,116,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,117,
     0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,117,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,118,119,
-  120,121,  0,122,123,124,125,126,  0,127,  0,  0,  0,  0,  0,  0,
+    0,  0,  0,  0,  0,  0,118,119,120,121,  0,122,123,124,125,126,
+    0,127,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
     0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128,129,130,131,132,133,
-  134,135,136,137,138,139,140,141,142,143,144,145,146,147,148,149,
-  150,151,152,153,154,155,156,157,  0,  0,  0,158,159,160,161,  0,
+    0,  0,128,129,130,131,132,133,134,135,136,137,138,139,140,141,
+  142,143,144,145,146,147,148,149,150,151,152,153,154,155,156,157,
+    0,  0,  0,158,159,160,161,  0,  0,  0,  0,  0,  0,  0,  0,  0,
     0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,162,163,  0,  0,  0,  0,  0,  0,  0,164,  0,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,162,  0,
+  163,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,164,165,  0,  0,  0,
+    0,  0,  0,  0,166,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
     0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,165,  0,
+    0,  0,  0,  0,  0,  0,167,  0,  0,  0,168,169,  0,  0,170,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,171,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,172,  0,  0,
     0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,166,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,167,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,168,  0,  0,
+    0,  0,  0,  0,  0,173,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
     0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,169,
-  170,  0,  0,  0,  0,171,172,  0,  0,  0,173,174,175,176,177,178,
-  179,180,181,182,183,184,185,186,187,188,189,190,191,192,193,194,
-  195,196,197,198,199,200,201,202,203,204,205,206,  0,  0,  0,  0,
+    0,  0,  0,  0,174,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
     0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-    0,  0,  0,  0,  0,  0,  1,  2,  3,  4,
+    0,  0,  0,  0,  0,  0,  0,  0,175,  0,  0,  0,  0,  0,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,176,177,  0,  0,  0,  0,178,179,  0,
+    0,  0,180,181,182,183,184,185,186,187,188,189,190,191,192,193,
+  194,195,196,197,198,199,200,201,202,203,204,205,206,207,208,209,
+  210,211,212,213,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  2,
+    3,  4,
 };
 static const uint16_t
-_hb_ucd_u16[4920] =
+_hb_ucd_u16[5080] =
 {
      0,   0,   1,   2,   3,   4,   5,   6,   0,   0,   7,   8,   9,  10,  11,  12,
     13,  13,  13,  14,  15,  13,  13,  16,  17,  18,  19,  20,  21,  22,  13,  23,
@@ -5303,82 +5537,85 @@ _hb_ucd_u16[4920] =
     47,  47, 165, 166, 167,  47,  47,  47,  47,  47,  47,  47,  47, 168, 146, 146,
     47, 169,  47,  47,  47, 170, 171, 172, 160, 160, 173, 174,  32,  32,  32,  32,
    175,  47,  47, 176, 177, 122, 178, 179, 180,  47, 181,  61,  47,  47, 182, 183,
-    47,  47, 184, 185, 186,  61,  47, 187,  11,   9,   9,   9,  66, 188, 189, 190,
-    11,  11, 191,  27,  27,  27, 192, 193,  11, 194,  27,  27,  32,  32,  32,  32,
-    13,  13,  13,  13,  13,  13,  13,  13,  13, 195,  13,  13,  13,  13,  13,  13,
-   196, 196, 196, 196, 196, 197, 196,  11, 198, 198, 198, 199, 200, 201, 201, 200,
-   202, 203, 204, 205, 206, 207, 208, 209, 210,  27, 211, 211, 211, 212, 213,  32,
-   214, 215, 216, 217, 218, 145, 219, 219, 220, 221, 222, 146, 223, 224, 146, 225,
-   226, 226, 226, 226, 226, 226, 226, 226, 227, 146, 228, 146, 146, 146, 146, 229,
-   146, 230, 226, 231, 146, 232, 233, 146, 146, 146, 146, 146, 146, 146, 145, 145,
-   145, 234, 146, 146, 146, 146, 235, 145, 146, 146, 146, 146, 146, 146, 146, 146,
-   146, 146, 146, 236, 237, 146, 146, 238, 146, 146, 146, 146, 146, 146, 239, 146,
-   146, 146, 146, 146, 146, 146, 240, 241, 145, 242, 146, 146, 243, 226, 244, 226,
-   245, 246, 226, 226, 226, 247, 226, 248, 146, 146, 146, 226, 249, 146, 146, 146,
-     9,   9,   9,  11,  11,  11, 250, 251,  13,  13,  13,  13,  13,  13, 252, 253,
-    11,  11,  11,  47,  47,  47, 254, 255,  47,  47,  47,  47,  47,  47,  32,  32,
-   256, 257, 258, 259, 260, 261, 262, 262, 263, 264, 265, 266, 267,  47,  47,  47,
-    47, 268, 148,  47,  47,  47,  47, 269,  47, 270,  47,  47, 146, 146, 146,  47,
-   146, 146, 271, 146, 272, 273, 146, 146, 271, 146, 146, 273, 146, 146, 146, 146,
-    47,  47,  47,  47, 146, 146, 146, 146,  47, 274,  47,  47,  47,  47,  47,  47,
-    47, 146, 146, 146, 146,  47,  47, 187, 275,  47,  61,  47,  13,  13, 276, 277,
-    13, 278,  47,  47,  47,  47, 279, 280,  31, 281, 282, 283,  13,  13,  13, 284,
-   285, 286, 287, 288, 289, 290,  11, 291, 292,  47, 293, 294,  47,  47,  47, 295,
-   296,  47,  47, 297, 298, 160,  32, 299,  61,  47, 300,  47, 301, 302,  47,  47,
-    72,  47,  47, 303, 304, 305, 306,  61,  47,  47, 307, 308, 309, 310,  47, 311,
-    47,  47,  47, 312,  58, 313, 314, 315,  47,  47,  47,  11,  11, 316, 317,  11,
-    11,  11,  11,  11,  47,  47, 318, 160, 319, 319, 319, 319, 319, 319, 319, 319,
-   320, 320, 320, 320, 320, 320, 320, 320,  11, 321, 322,  47,  47,  47,  47,  47,
-    47,  47,  47, 323,  31, 324,  47,  47,  47,  47,  47, 325, 146,  47,  47,  47,
-    47,  47,  47,  47, 326, 146, 146, 327,  32, 328,  32, 329, 330, 331, 332,  47,
-    47,  47,  47,  47,  47,  47,  47, 333, 334,   2,   3,   4,   5, 335, 336, 337,
-    47, 338,  47,  47,  47,  47, 339, 340, 341, 145, 145, 342, 219, 219, 219, 343,
-   344, 146, 146, 146, 146, 146, 146, 345, 346, 346, 346, 346, 346, 346, 346, 346,
-    47,  47,  47,  47,  47,  47, 347, 145,  47,  47, 348,  47, 349,  47,  47,  60,
-    47, 350,  47,  47,  47, 351, 219, 219,   9,   9, 147,  11,  11,  47,  47,  47,
-    47,  47, 160,   9,   9, 147,  11,  11,  47,  47,  47,  47,  47,  47, 350,   9,
-     9, 352,  11,  11,  11,  11,  11,  11,  27,  27,  27,  27,  27,  27,  27,  27,
-    47,  47,  47,  47,  47, 353,  47, 354,  47,  47, 355, 145, 145, 145,  47, 356,
-    47, 357,  47, 350,  66,  66,  66,  66,  47,  47,  47, 358, 145, 145, 145, 145,
-   359,  47,  47, 360, 145,  66,  47, 361,  47, 362, 145, 145, 363,  47, 364,  66,
-    47,  47,  47, 365,  47, 366,  47, 366,  47, 365, 144, 145, 145, 145, 145, 145,
-     9,   9,   9,   9,  11,  11,  11, 367,  47,  47, 368, 160, 160, 160, 160, 160,
-   145, 145, 145, 145, 145, 145, 145, 145,  47,  47, 369,  47,  47,  47,  47, 143,
-    47, 362, 370,  47,  60, 371,  66,  47, 372,  66,  66,  47, 373, 145,  47,  47,
-   374,  47,  47, 360, 375, 376, 377, 378, 180,  47,  47, 379, 380,  47,  47, 160,
-    97,  47, 381, 382, 383,  47,  47, 384, 180,  47,  47, 385, 386, 387, 388, 145,
-    47,  47, 389, 390, 359,  32,  32,  32,  47,  47, 365,  47,  47, 391, 172, 160,
-    92,  47,  47, 113, 392, 393, 394,  32,  47,  47,  47, 395, 396, 397,  47,  47,
-    47,  47,  47, 398, 399, 160, 160, 160,  47,  47, 400, 401, 402, 403,  32,  32,
-    47,  47,  47, 404, 405, 160,  66,  66,  47,  47, 406, 407, 160, 160, 160, 160,
-    47, 143, 408, 409,  47,  47,  47,  47,  47,  47, 389, 410,  66,  66,  66,  66,
-     9,   9,   9,   9,  11,  11, 128, 411,  47,  47,  47, 412, 413, 160, 160, 160,
-    47,  47,  47,  47,  47, 414, 415, 416, 417,  47,  47, 418, 419, 420,  47,  47,
-   421, 422,  66,  47,  47,  47,  47,  47,  66,  66,  66,  66,  66,  66,  66,  66,
-    47,  47, 400, 423, 424, 128, 145, 425,  47, 156, 426, 427,  32,  32,  32,  32,
-    47,  47,  47, 359, 428, 160,  47,  47, 429, 430, 160, 160, 160, 160, 160, 160,
-    47,  47,  47,  47,  47,  47,  47, 431, 432,  47,  47, 433, 434, 160, 160, 160,
-    47,  47,  47,  47, 145, 435, 436, 437, 219, 219, 219, 219, 219, 219, 219,  66,
-    47,  47,  47,  47,  47,  47,  47, 424,  47,  47,  47, 208, 438,  32,  32,  32,
-    47,  47,  47,  47,  47,  47, 305,  47,  47,  47,  47,  47, 160,  47,  47, 439,
-    47,  47,  47, 440, 441, 442, 443,  47,   9,   9,   9,   9,   9,   9,  11,  11,
-   145, 444,  66,  66,  66,  66,  66,  66,  47,  47,  47,  47, 391, 445, 416, 416,
-   446, 447,  27,  27,  27,  27, 448, 416,  47, 449, 208, 208, 208, 208, 208, 208,
-    32,  32,  32,  32,  32, 146, 146, 146, 146, 146, 146, 146, 146, 146, 450, 451,
-   452, 146, 453, 146, 146, 146, 146, 146, 146, 146, 146, 146, 454, 146, 146, 146,
-     9, 455,  11, 456, 457,  11, 196,   9, 458, 459,   9, 460,  11,   9, 455,  11,
-   456, 457,  11, 196,   9, 458, 459,   9, 460,  11,   9, 455,  11, 456, 457,  11,
-   196,   9, 458, 459,   9, 460,  11,   9, 455,  11, 196,   9, 461, 462, 463, 464,
-    11, 465,   9, 466, 467, 468, 469,  11, 470,   9, 471,  11, 472, 160, 160, 160,
-    32,  32,  32, 473,  32,  32, 474, 475, 476, 477,  32,  32,  32,  32,  32,  32,
-   478,  11,  11,  11,  11,  11,  11,  11,  32,  32,  32,  27,  27,  27,  27,  27,
-    32,  32,  32,  32,  32,  32,  32,  32,  47,  47,  47, 479, 480, 146, 146, 146,
-    47,  47, 481,  32,  47,  47, 482, 483,  47,  47,  47,  47,  47,  47, 484, 160,
-    47,  47,  47,  47, 355,  32,  32,  32,   9,   9, 458,  11, 485, 305,  66,  66,
-   145, 145, 486, 487, 145, 145, 145, 145, 145, 145, 488, 145, 145, 145, 145, 145,
-    47,  47,  47,  47,  47,  47,  47, 226, 489, 146, 146, 146, 146, 146, 146, 146,
-   146, 146, 146, 146, 146, 146, 146, 490, 146, 146, 146, 146, 146, 146, 146, 160,
-   208, 208, 208, 208, 208, 208, 208, 208,   0,   0,   0,   0,   0,   0,   0,   0,
+    47,  47, 184, 185, 186,  61,  47, 187, 188,   9,   9,   9,  66, 189, 190, 191,
+    11,  11, 192,  27,  27,  27, 193, 194,  11, 195,  27,  27,  32,  32,  32,  32,
+    13,  13,  13,  13,  13,  13,  13,  13,  13, 196,  13,  13,  13,  13,  13,  13,
+   197, 197, 197, 197, 197, 198, 197,  11, 199, 199, 199, 200, 201, 202, 202, 201,
+   203, 204, 205, 206, 207, 208, 209, 210, 211,  27, 212, 212, 212, 213, 214,  32,
+   215, 216, 217, 218, 219, 145, 220, 220, 221, 222, 223, 146, 224, 225, 146, 226,
+   227, 227, 227, 227, 227, 227, 227, 227, 228, 146, 229, 146, 146, 146, 146, 230,
+   146, 231, 227, 232, 146, 233, 234, 146, 146, 146, 146, 146, 146, 146, 145, 145,
+   145, 235, 146, 146, 146, 146, 236, 145, 146, 146, 146, 146, 146, 146, 146, 146,
+   146, 146, 146, 237, 238, 146, 146, 239, 146, 146, 146, 146, 146, 146, 240, 146,
+   146, 146, 146, 146, 146, 146, 241, 242, 145, 243, 146, 146, 244, 227, 245, 227,
+   246, 247, 227, 227, 227, 248, 227, 249, 146, 146, 146, 227, 250, 146, 146, 146,
+     9,   9,   9,  11,  11,  11, 251, 252,  13,  13,  13,  13,  13,  13, 253, 254,
+    11,  11,  11,  47,  47,  47, 255, 256,  47,  47,  47,  47,  47,  47,  32,  32,
+   257, 258, 259, 260, 261, 262, 263, 263, 264, 265, 266, 267, 268,  47,  47,  47,
+    47, 269, 148,  47,  47,  47,  47, 270,  47, 271,  47,  47, 146, 146, 146,  47,
+   146, 146, 272, 146, 273, 274, 146, 146, 272, 146, 146, 274, 146, 146, 146, 146,
+    47,  47,  47,  47, 146, 146, 146, 146,  47, 275,  47,  47,  47,  47,  47,  47,
+    47, 146, 146, 146, 146,  47,  47, 187, 276,  47,  61,  47,  13,  13, 277, 278,
+    13, 279,  47,  47,  47,  47, 280, 281,  31, 282, 283, 284,  13,  13,  13, 285,
+   286, 287, 288, 289, 290, 291,   9, 292, 293,  47, 294, 295,  47,  47,  47, 296,
+   297,  47,  47, 298, 299, 160,  32, 300,  61,  47, 301,  47, 302, 303,  47,  47,
+    72,  47,  47, 304, 305, 306, 307,  61,  47,  47, 308, 309, 310, 311,  47, 312,
+    47,  47,  47, 313,  58, 314, 315, 316,  47,  47,  47,  11,  11, 317, 318,  11,
+    11,  11,  11,  11,  47,  47, 319, 160, 320, 320, 320, 320, 320, 320, 320, 320,
+   321, 321, 321, 321, 321, 321, 321, 321,  11, 322, 323,  47,  47,  47,  47,  47,
+    47,  47,  47, 324,  31, 325,  47,  47,  47,  47,  47, 326, 146,  47,  47,  47,
+    47,  47,  47,  47, 327, 146, 146, 328,  32, 329,  32, 330, 331, 332, 333,  47,
+    47,  47,  47,  47,  47,  47,  47, 334, 335,   2,   3,   4,   5, 336, 337, 338,
+    47, 339,  47,  47,  47,  47, 340, 341, 342, 145, 145, 343, 220, 220, 220, 344,
+   345, 146, 146, 146, 146, 146, 146, 346, 347, 347, 347, 347, 347, 347, 347, 347,
+    47,  47,  47,  47,  47,  47, 348, 145,  47,  47, 349,  47, 350,  47,  47,  60,
+    47, 351,  47,  47,  47, 352, 220, 220,   9,   9, 147,  11,  11,  47,  47,  47,
+    47,  47, 160,   9,   9, 147,  11,  11,  47,  47,  47,  47,  47,  47, 351,   9,
+     9, 353,  11,  11,  47,  47,  47,  47,  27,  27,  27,  27,  27,  27,  27,  27,
+    47,  47,  47,  47,  47, 354,  47, 355,  47,  47, 356, 145, 145, 145,  47, 357,
+    47, 358,  47, 351,  66,  66,  66,  66,  47,  47,  47, 359, 145, 145, 145, 145,
+   360,  47,  47, 361, 145,  66,  47, 362,  47, 363, 145, 145, 364,  47, 365,  66,
+    47,  47,  47, 366,  47, 367,  47, 367,  47, 366, 144, 145, 145, 145, 145, 145,
+     9,   9,   9,   9,  11,  11,  11, 368,  47,  47, 369, 160, 370,   9, 371,  11,
+   372, 227, 227, 227, 227, 227, 227, 227, 145, 145, 145, 145, 145, 145, 145, 145,
+    47,  47, 373,  47,  47,  47,  47, 374,  47, 363, 375,  47,  60, 376,  66,  47,
+   377,  66,  66,  47, 378, 145,  47,  47, 379,  47,  47, 361, 380, 381, 382, 383,
+   180,  47,  47, 384, 385,  47,  47, 160,  97,  47, 386, 387, 388,  47,  47, 389,
+   180,  47,  47, 390, 391, 392, 393, 145,  47,  47, 394, 395, 360,  32,  32,  32,
+    47,  47, 366,  47,  47, 396, 172, 160,  92,  47,  47, 113, 397, 398, 399,  32,
+    47,  47,  47, 400, 401, 402, 403,  32,  47,  47,  47, 404, 405, 406,  47,  47,
+    47,  47,  47, 407, 408, 160, 160, 160,  47,  47, 409, 410, 411, 412,  32,  32,
+    47,  47,  47, 413, 414, 160,  66,  66,  47,  47, 415, 416, 160, 160, 160, 160,
+    47, 417, 418, 419,  47,  47,  47,  47,  47,  47, 394, 420,  66,  66,  66,  66,
+     9,   9,   9,   9,  11,  11, 128, 421,  47,  47,  47, 422, 423, 160, 160, 160,
+    47,  47,  47,  47,  47, 424, 425, 426, 427,  47,  47, 428, 429, 430,  47,  47,
+   431, 432,  66,  47,  47,  47,  47,  47,  66,  66,  66,  66,  66,  66,  66,  66,
+    47,  47,  47,  47,  47,  47, 433, 160,  47,  47, 409, 434, 433, 128, 145, 435,
+    47, 156, 436, 437,  32,  32,  32,  32,  47,  47,  47, 360, 438, 160,  47,  47,
+   439, 440, 160, 160, 160, 160, 160, 160,  47,  47,  47,  47,  47,  47,  47, 441,
+   442,  47,  47, 443, 444, 445,  32,  32,  47,  47,  47,  47, 145, 446, 447, 448,
+   220, 220, 220, 220, 220, 220, 220,  66,  47,  47,  47,  47,  47,  47,  47, 433,
+    47,  47,  47, 209, 449,  32,  47,  47,  47, 450, 451, 160, 160, 160, 160, 160,
+    47,  47,  47,  47,  47,  47, 306,  47,  47,  47,  47,  47, 160,  47,  47, 452,
+    47,  47,  47, 453, 454, 455, 456,  47,  27,  27,  27,  27, 457,  47, 458, 160,
+     9,   9,   9,   9,   9,   9,  11,  11, 145, 459,  66,  66,  66,  66,  66,  66,
+    47,  47,  47,  47, 396, 460, 426, 426, 461, 462,  27,  27,  27,  27, 463, 426,
+    47, 464, 209, 209, 209, 209, 209, 209, 146, 146, 146, 146, 146, 146, 146, 160,
+    32,  32,  32,  32,  32, 146, 146, 146, 146, 146, 146, 146, 146, 146, 465, 466,
+   467, 146, 468, 146, 146, 146, 146, 146, 146, 146, 146, 146, 469, 146, 146, 146,
+     9, 470,  11, 471, 472,  11, 197,   9, 473, 474,   9, 475,  11,   9, 470,  11,
+   471, 472,  11, 197,   9, 473, 474,   9, 475,  11,   9, 470,  11, 471, 472,  11,
+   197,   9, 473, 474,   9, 475,  11,   9, 470,  11, 197,   9, 476, 477, 478, 479,
+    11, 480,   9, 481, 482, 483, 484,  11, 485,   9, 486,  11, 487, 160, 160, 160,
+    32,  32,  32, 488,  32,  32, 489, 490, 491, 492,  32,  32,  32,  32,  32,  32,
+   493,  11,  11,  11,  11,  11,  11,  11,  32,  32,  32,  27,  27,  27,  27,  27,
+    32,  32,  32,  32,  32,  32,  32,  32,  47,  47,  47, 494, 495, 146, 146, 146,
+    47,  47, 450,  32,  47,  47, 374, 496,  47,  47,  47,  47,  47,  47, 497, 160,
+    47,  47,  47,  47,  47,  47, 450, 498,  47,  47,  47,  47, 356,  32,  32,  32,
+     9,   9, 473,  11, 499, 306,  66,  66, 145, 145, 500, 501, 145, 145, 145, 145,
+   145, 145, 502, 145, 145, 145, 145, 145,  47,  47,  47,  47,  47,  47,  47, 227,
+   503, 146, 146, 146, 146, 146, 146, 146, 146, 146, 146, 146, 146, 146, 146, 504,
+   209, 209, 209, 209, 209, 209, 209, 209,   0,   0,   0,   0,   0,   0,   0,   0,
      0,   0,   0,   0,   0,   0,   0,   0, 939, 940, 941, 942, 946, 948,   0, 962,
    969, 970, 971, 976,1001,1002,1003,1008,   0,1033,1040,1041,1042,1043,1047,   0,
      0,1080,1081,1082,1086,1110,   0,   0,1124,1125,1126,1127,1131,1133,   0,1147,
@@ -5541,16 +5778,23 @@ _hb_ucd_u16[4920] =
      0,   0,1602,1603,1934,1935,1574,1575,1576,1577,1579,1580,1581,1583,1584,   0,
   1585,1587,1588,1589,1591,   0,1592,   0,1593,1594,   0,1595,1596,   0,1598,1599,
   1600,1601,1604,1582,1578,1590,1597,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,1936,   0,1937,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,1938,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,1939,1940,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,1941,1942,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,1944,1943,   0,1945,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,1946,1947,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-  1948,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,1949,1950,1951,1952,1953,1954,1955,   0,   0,   0,
+     0,1936,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,1937,   0,   0,   0,
      0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,1956,1957,1958,1960,1959,1961,   0,   0,   0,   0,   0,   0,   0,
+     0,   0,1938,   0,1939,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+     0,   0,   0,1940,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+     0,   0,   0,   0,   0,   0,1941,1942,   0,   0,   0,   0,   0,   0,   0,   0,
+     0,   0,   0,1943,1944,   0,   0,   0,   0,   0,   0,1945,   0,1946,   0,   0,
+     0,   0,   0,   0,   0,   0,1947,   0,   0,1948,   0,   0,   0,   0,   0,   0,
+     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,1950,   0,1949,
+  1951,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+     0,   0,   0,1953,1952,   0,1954,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+     0,   0,1955,1956,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+  1957,   0,   0,   0,   0,   0,   0,   0,   0,1958,1961,1959,1965,1960,1962,1964,
+  1963,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+  1967,1966,1968,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+     0,   0,   0,   0,   0,   0,1969,1970,1971,1972,1973,1974,1975,   0,   0,   0,
+     0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+     0,   0,   0,1976,1977,1978,1980,1979,1981,   0,   0,   0,   0,   0,   0,   0,
      0,   0,   0,   0,   0,   0,   0,   0, 106, 104, 107, 826, 114, 118, 119, 121,
    123, 124, 127, 125,  34, 830, 130, 131, 132, 137, 827,  35, 133, 139, 829, 142,
    143, 112, 144, 145, 924, 151, 152,  37, 157, 158, 159, 160,  38, 165, 166, 169,
@@ -5601,12 +5845,12 @@ _hb_ucd_i16[92] =
 static inline uint_fast8_t
 _hb_ucd_gc (unsigned u)
 {
-  return u<1114112u?_hb_ucd_u8[5096+(((_hb_ucd_u8[1168+(((_hb_ucd_u16[((_hb_ucd_u8[544+(((_hb_ucd_u8[u>>1>>3>>3>>4])<<4)+((u>>1>>3>>3)&15u))])<<3)+((u>>1>>3)&7u)])<<3)+((u>>1)&7u))])<<1)+((u)&1u))]:2;
+  return u<1114112u?_hb_ucd_u8[5208+(((_hb_ucd_u8[1168+(((_hb_ucd_u16[((_hb_ucd_u8[544+(((_hb_ucd_u8[u>>1>>3>>3>>4])<<4)+((u>>1>>3>>3)&15u))])<<3)+((u>>1>>3)&7u)])<<3)+((u>>1)&7u))])<<1)+((u)&1u))]:2;
 }
 static inline uint_fast8_t
 _hb_ucd_ccc (unsigned u)
 {
-  return u<125259u?_hb_ucd_u8[7054+(((_hb_ucd_u8[6498+(((_hb_ucd_u8[6038+(((_hb_ucd_u8[5686+(((_hb_ucd_u8[5440+(u>>2>>2>>2>>3)])<<3)+((u>>2>>2>>2)&7u))])<<2)+((u>>2>>2)&3u))])<<2)+((u>>2)&3u))])<<2)+((u)&3u))]:0;
+  return u<125259u?_hb_ucd_u8[7206+(((_hb_ucd_u8[6638+(((_hb_ucd_u8[6162+(((_hb_ucd_u8[5802+(((_hb_ucd_u8[5556+(u>>2>>2>>2>>3)])<<3)+((u>>2>>2>>2)&7u))])<<2)+((u>>2>>2)&3u))])<<2)+((u>>2)&3u))])<<2)+((u)&3u))]:0;
 }
 static inline unsigned
 _hb_ucd_b4 (const uint8_t* a, unsigned i)
@@ -5616,17 +5860,17 @@ _hb_ucd_b4 (const uint8_t* a, unsigned i)
 static inline int_fast16_t
 _hb_ucd_bmg (unsigned u)
 {
-  return u<65380u?_hb_ucd_i16[((_hb_ucd_u8[7946+(((_hb_ucd_u8[7714+(((_hb_ucd_u8[7618+(((_hb_ucd_b4(7554+_hb_ucd_u8,u>>1>>2>>3>>3))<<3)+((u>>1>>2>>3)&7u))])<<3)+((u>>1>>2)&7u))])<<2)+((u>>1)&3u))])<<1)+((u)&1u)]:0;
+  return u<65380u?_hb_ucd_i16[((_hb_ucd_u8[8098+(((_hb_ucd_u8[7866+(((_hb_ucd_u8[7770+(((_hb_ucd_b4(7706+_hb_ucd_u8,u>>1>>2>>3>>3))<<3)+((u>>1>>2>>3)&7u))])<<3)+((u>>1>>2)&7u))])<<2)+((u>>1)&3u))])<<1)+((u)&1u)]:0;
 }
 static inline uint_fast8_t
 _hb_ucd_sc (unsigned u)
 {
-  return u<918016u?_hb_ucd_u8[11244+(((_hb_ucd_u8[10280+(((_hb_ucd_u8[9292+(((_hb_ucd_u8[8612+(((_hb_ucd_u8[8308+(((_hb_ucd_u8[8194+(u>>2>>2>>2>>3>>4)])<<4)+((u>>2>>2>>2>>3)&15u))])<<3)+((u>>2>>2>>2)&7u))])<<2)+((u>>2>>2)&3u))])<<2)+((u>>2)&3u))])<<2)+((u)&3u))]:2;
+  return u<918016u?_hb_ucd_u8[11464+(((_hb_ucd_u8[10472+(((_hb_ucd_u8[9452+(((_hb_ucd_u8[8764+(((_hb_ucd_u8[8460+(((_hb_ucd_u8[8346+(u>>2>>2>>2>>3>>4)])<<4)+((u>>2>>2>>2>>3)&15u))])<<3)+((u>>2>>2>>2)&7u))])<<2)+((u>>2>>2)&3u))])<<2)+((u>>2)&3u))])<<2)+((u)&3u))]:2;
 }
 static inline uint_fast16_t
 _hb_ucd_dm (unsigned u)
 {
-  return u<195102u?_hb_ucd_u16[1608+(((_hb_ucd_u8[12586+(((_hb_ucd_u8[12204+(u>>4>>5)])<<5)+((u>>4)&31u))])<<4)+((u)&15u))]:0;
+  return u<195102u?_hb_ucd_u16[1656+(((_hb_ucd_u8[12834+(((_hb_ucd_u8[12452+(u>>4>>5)])<<5)+((u>>4)&31u))])<<4)+((u)&15u))]:0;
 }
 
 #endif
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-unicode-emoji-table.hh b/src/java.desktop/share/native/libharfbuzz/hb-unicode-emoji-table.hh
index e607e8ca829..4bc8d64c28f 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-unicode-emoji-table.hh
+++ b/src/java.desktop/share/native/libharfbuzz/hb-unicode-emoji-table.hh
@@ -7,13 +7,13 @@
  * on file with this header:
  *
  * # emoji-data.txt
- * # Date: 2023-02-01, 02:22:54 GMT
- * # © 2023 Unicode®, Inc.
+ * # Date: 2024-05-01, 21:25:24 GMT
+ * # © 2024 Unicode®, Inc.
  * # Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
- * # For terms of use, see https://www.unicode.org/terms_of_use.html
+ * # For terms of use and license, see https://www.unicode.org/terms_of_use.html
  * #
  * # Emoji Data for UTS #51
- * # Used with Emoji Version 15.1 and subsequent minor revisions (if any)
+ * # Used with Emoji Version 16.0 and subsequent minor revisions (if any)
  * #
  * # For documentation and usage, see https://www.unicode.org/reports/tr51
  */
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-utf.hh b/src/java.desktop/share/native/libharfbuzz/hb-utf.hh
index 9175df265b9..7fd3bf8828b 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-utf.hh
+++ b/src/java.desktop/share/native/libharfbuzz/hb-utf.hh
@@ -458,19 +458,21 @@ struct hb_ascii_t
 template <typename utf_t>
 static inline const typename utf_t::codepoint_t *
 hb_utf_offset_to_pointer (const typename utf_t::codepoint_t *start,
+                          const typename utf_t::codepoint_t *text,
+                          unsigned text_len,
                           signed offset)
 {
   hb_codepoint_t unicode;
 
   while (offset-- > 0)
     start = utf_t::next (start,
-                         start + utf_t::max_len,
+                         text + text_len,
                          &unicode,
                          HB_BUFFER_REPLACEMENT_CODEPOINT_DEFAULT);
 
   while (offset++ < 0)
     start = utf_t::prev (start,
-                         start - utf_t::max_len,
+                         text,
                          &unicode,
                          HB_BUFFER_REPLACEMENT_CODEPOINT_DEFAULT);
 
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-vector.hh b/src/java.desktop/share/native/libharfbuzz/hb-vector.hh
index 001789a3037..7e755818ddd 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-vector.hh
+++ b/src/java.desktop/share/native/libharfbuzz/hb-vector.hh
@@ -37,6 +37,8 @@ template <typename Type,
           bool sorted=false>
 struct hb_vector_t
 {
+  static constexpr bool realloc_move = true;
+
   typedef Type item_t;
   static constexpr unsigned item_size = hb_static_size (Type);
   using array_t = typename std::conditional<sorted, hb_sorted_array_t<Type>, hb_array_t<Type>>::type;
@@ -51,32 +53,29 @@ struct hb_vector_t
   }
   template <typename Iterable,
             hb_requires (hb_is_iterable (Iterable))>
-  hb_vector_t (const Iterable &o) : hb_vector_t ()
+  explicit hb_vector_t (const Iterable &o) : hb_vector_t ()
   {
-    auto iter = hb_iter (o);
-    if (iter.is_random_access_iterator || iter.has_fast_len)
-      alloc (hb_len (iter), true);
-    hb_copy (iter, *this);
+    extend (o);
   }
   hb_vector_t (const hb_vector_t &o) : hb_vector_t ()
   {
-    alloc (o.length, true);
+    alloc_exact (o.length);
     if (unlikely (in_error ())) return;
     copy_array (o.as_array ());
   }
   hb_vector_t (array_t o) : hb_vector_t ()
   {
-    alloc (o.length, true);
+    alloc_exact (o.length);
     if (unlikely (in_error ())) return;
     copy_array (o);
   }
   hb_vector_t (c_array_t o) : hb_vector_t ()
   {
-    alloc (o.length, true);
+    alloc_exact (o.length);
     if (unlikely (in_error ())) return;
     copy_array (o);
   }
-  hb_vector_t (hb_vector_t &&o)
+  hb_vector_t (hb_vector_t &&o) noexcept
   {
     allocated = o.allocated;
     length = o.length;
@@ -85,6 +84,35 @@ struct hb_vector_t
   }
   ~hb_vector_t () { fini (); }
 
+  template <typename Iterable,
+            hb_requires (hb_is_iterable (Iterable))>
+  void extend (const Iterable &o)
+  {
+    auto iter = hb_iter (o);
+    if (iter.is_random_access_iterator || iter.has_fast_len)
+      alloc (hb_len (iter), true);
+    while (iter)
+    {
+      if (unlikely (!alloc (length + 1)))
+        return;
+      unsigned room = allocated - length;
+      for (unsigned i = 0; i < room && iter; i++)
+        push_has_room (*iter++);
+    }
+  }
+  void extend (array_t o)
+  {
+    alloc (length + o.length);
+    if (unlikely (in_error ())) return;
+    copy_array (o);
+  }
+  void extend (c_array_t o)
+  {
+    alloc (length + o.length);
+    if (unlikely (in_error ())) return;
+    copy_array (o);
+  }
+
   public:
   int allocated = 0; /* < 0 means allocation failed. */
   unsigned int length = 0;
@@ -120,7 +148,7 @@ struct hb_vector_t
     resize (0);
   }
 
-  friend void swap (hb_vector_t& a, hb_vector_t& b)
+  friend void swap (hb_vector_t& a, hb_vector_t& b) noexcept
   {
     hb_swap (a.allocated, b.allocated);
     hb_swap (a.length, b.length);
@@ -130,14 +158,15 @@ struct hb_vector_t
   hb_vector_t& operator = (const hb_vector_t &o)
   {
     reset ();
-    alloc (o.length, true);
+    alloc_exact (o.length);
     if (unlikely (in_error ())) return *this;
 
+    length = 0;
     copy_array (o.as_array ());
 
     return *this;
   }
-  hb_vector_t& operator = (hb_vector_t &&o)
+  hb_vector_t& operator = (hb_vector_t &&o) noexcept
   {
     hb_swap (*this, o);
     return *this;
@@ -216,6 +245,10 @@ struct hb_vector_t
       // reference to it.
       return std::addressof (Crap (Type));
 
+    return push_has_room (std::forward<Args> (args)...);
+  }
+  template <typename... Args> Type *push_has_room (Args&&... args)
+  {
     /* Emplace. */
     Type *p = std::addressof (arrayZ[length++]);
     return new (p) Type (std::forward<Args> (args)...);
@@ -268,10 +301,9 @@ struct hb_vector_t
     }
     return new_array;
   }
-  /* Specialization for hb_vector_t<hb_{vector,array}_t<U>> to speed up. */
+  /* Specialization for types that can be moved using realloc(). */
   template <typename T = Type,
-            hb_enable_if (hb_is_same (T, hb_vector_t<typename T::item_t>) ||
-                          hb_is_same (T, hb_array_t <typename T::item_t>))>
+            hb_enable_if (T::realloc_move)>
   Type *
   realloc_vector (unsigned new_allocated, hb_priority<1>)
   {
@@ -310,18 +342,23 @@ struct hb_vector_t
     length = size;
   }
 
+  template <typename T = Type,
+            hb_enable_if (hb_is_trivially_copyable (T))>
+  void
+  copy_array (hb_array_t<Type> other)
+  {
+    assert ((int) (length + other.length) <= allocated);
+    hb_memcpy ((void *) (arrayZ + length), (const void *) other.arrayZ, other.length * item_size);
+    length += other.length;
+  }
   template <typename T = Type,
             hb_enable_if (hb_is_trivially_copyable (T))>
   void
   copy_array (hb_array_t<const Type> other)
   {
-    length = other.length;
-    if (!HB_OPTIMIZE_SIZE_VAL && sizeof (T) >= sizeof (long long))
-      /* This runs faster because of alignment. */
-      for (unsigned i = 0; i < length; i++)
-        arrayZ[i] = other.arrayZ[i];
-    else
-       hb_memcpy ((void *) arrayZ, (const void *) other.arrayZ, length * item_size);
+    assert ((int) (length + other.length) <= allocated);
+    hb_memcpy ((void *) (arrayZ + length), (const void *) other.arrayZ, other.length * item_size);
+    length += other.length;
   }
   template <typename T = Type,
             hb_enable_if (!hb_is_trivially_copyable (T) &&
@@ -329,12 +366,10 @@ struct hb_vector_t
   void
   copy_array (hb_array_t<const Type> other)
   {
-    length = 0;
-    while (length < other.length)
-    {
-      length++;
-      new (std::addressof (arrayZ[length - 1])) Type (other.arrayZ[length - 1]);
-    }
+    assert ((int) (length + other.length) <= allocated);
+    for (unsigned i = 0; i < other.length; i++)
+      new (std::addressof (arrayZ[length + i])) Type (other.arrayZ[i]);
+    length += other.length;
   }
   template <typename T = Type,
             hb_enable_if (!hb_is_trivially_copyable (T) &&
@@ -344,13 +379,13 @@ struct hb_vector_t
   void
   copy_array (hb_array_t<const Type> other)
   {
-    length = 0;
-    while (length < other.length)
+    assert ((int) (length + other.length) <= allocated);
+    for (unsigned i = 0; i < other.length; i++)
     {
-      length++;
-      new (std::addressof (arrayZ[length - 1])) Type ();
-      arrayZ[length - 1] = other.arrayZ[length - 1];
+      new (std::addressof (arrayZ[length + i])) Type ();
+      arrayZ[length + i] = other.arrayZ[i];
     }
+    length += other.length;
   }
 
   void
@@ -431,6 +466,15 @@ struct hb_vector_t
 
     return true;
   }
+  bool alloc_exact (unsigned int size)
+  {
+    return alloc (size, true);
+  }
+
+  void clear ()
+  {
+    resize (0);
+  }
 
   bool resize (int size_, bool initialize = true, bool exact = false)
   {
@@ -496,7 +540,7 @@ struct hb_vector_t
     shrink_vector (size);
 
     if (shrink_memory)
-      alloc (size, true); /* To force shrinking memory if needed. */
+      alloc_exact (size); /* To force shrinking memory if needed. */
   }
 
 
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-version.h b/src/java.desktop/share/native/libharfbuzz/hb-version.h
index 3627da3bf0c..01edf174350 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb-version.h
+++ b/src/java.desktop/share/native/libharfbuzz/hb-version.h
@@ -41,26 +41,26 @@ HB_BEGIN_DECLS
  *
  * The major component of the library version available at compile-time.
  */
-#define HB_VERSION_MAJOR 8
+#define HB_VERSION_MAJOR 10
 /**
  * HB_VERSION_MINOR:
  *
  * The minor component of the library version available at compile-time.
  */
-#define HB_VERSION_MINOR 2
+#define HB_VERSION_MINOR 4
 /**
  * HB_VERSION_MICRO:
  *
  * The micro component of the library version available at compile-time.
  */
-#define HB_VERSION_MICRO 2
+#define HB_VERSION_MICRO 0
 
 /**
  * HB_VERSION_STRING:
  *
  * A string literal containing the library version available at compile-time.
  */
-#define HB_VERSION_STRING "8.2.2"
+#define HB_VERSION_STRING "10.4.0"
 
 /**
  * HB_VERSION_ATLEAST:
diff --git a/src/java.desktop/share/native/libharfbuzz/hb.hh b/src/java.desktop/share/native/libharfbuzz/hb.hh
index 65d2dd58a20..fee1c9cd663 100644
--- a/src/java.desktop/share/native/libharfbuzz/hb.hh
+++ b/src/java.desktop/share/native/libharfbuzz/hb.hh
@@ -64,6 +64,7 @@
 #pragma GCC diagnostic error   "-Wbitwise-instead-of-logical"
 #pragma GCC diagnostic error   "-Wcast-align"
 #pragma GCC diagnostic error   "-Wcast-function-type"
+#pragma GCC diagnostic error   "-Wcast-function-type-strict"
 #pragma GCC diagnostic error   "-Wconstant-conversion"
 #pragma GCC diagnostic error   "-Wcomma"
 #pragma GCC diagnostic error   "-Wdelete-non-virtual-dtor"
@@ -83,6 +84,7 @@
 #pragma GCC diagnostic error   "-Wredundant-decls"
 #pragma GCC diagnostic error   "-Wreorder"
 #pragma GCC diagnostic error   "-Wsign-compare"
+#pragma GCC diagnostic error   "-Wstrict-flex-arrays"
 #pragma GCC diagnostic error   "-Wstrict-prototypes"
 #pragma GCC diagnostic error   "-Wstring-conversion"
 #pragma GCC diagnostic error   "-Wswitch-enum"
@@ -129,6 +131,7 @@
 #pragma GCC diagnostic ignored "-Wclass-memaccess"
 #pragma GCC diagnostic ignored "-Wcast-function-type-strict" // https://github.com/harfbuzz/harfbuzz/pull/3859#issuecomment-1295409126
 #pragma GCC diagnostic ignored "-Wdangling-reference" // https://github.com/harfbuzz/harfbuzz/issues/4043
+#pragma GCC diagnostic ignored "-Wdangling-pointer" // Trigerred by hb_decycler_node_t().
 #pragma GCC diagnostic ignored "-Wformat-nonliteral"
 #pragma GCC diagnostic ignored "-Wformat-zero-length"
 #pragma GCC diagnostic ignored "-Wmissing-field-initializers"
@@ -177,6 +180,11 @@
 #define HB_EXTERN __declspec (dllexport) extern
 #endif
 
+// https://github.com/harfbuzz/harfbuzz/pull/4619
+#ifndef __STDC_FORMAT_MACROS
+#define __STDC_FORMAT_MACROS 1
+#endif
+
 #include "hb.h"
 #define HB_H_IN
 #include "hb-ot.h"
@@ -212,6 +220,12 @@
 #include <winapifamily.h>
 #endif
 
+#ifndef PRId32
+# define PRId32 "d"
+# define PRIu32 "u"
+# define PRIx32 "x"
+#endif
+
 #define HB_PASTE1(a,b) a##b
 #define HB_PASTE(a,b) HB_PASTE1(a,b)
 
@@ -268,7 +282,9 @@ extern "C" void  hb_free_impl(void *ptr);
 #define __attribute__(x)
 #endif
 
-#if defined(__GNUC__) && (__GNUC__ >= 3)
+#if defined(__MINGW32__) && (__GNUC__ >= 3)
+#define HB_PRINTF_FUNC(format_idx, arg_idx) __attribute__((__format__ (gnu_printf, format_idx, arg_idx)))
+#elif defined(__GNUC__) && (__GNUC__ >= 3)
 #define HB_PRINTF_FUNC(format_idx, arg_idx) __attribute__((__format__ (__printf__, format_idx, arg_idx)))
 #else
 #define HB_PRINTF_FUNC(format_idx, arg_idx)

From 73465b9866da8e97e557d6ad80a95568ada3ee01 Mon Sep 17 00:00:00 2001
From: jeremy <jeremy.wood@mac.com>
Date: Mon, 10 Mar 2025 18:32:15 +0000
Subject: [PATCH 288/587] 8160327: Support for thumbnails present in APP1
 marker for JPEG

Reviewed-by: prr
---
 .../plugins/jpeg/ExifMarkerSegment.java       | 294 ++++++++++++++++++
 .../plugins/jpeg/JFIFMarkerSegment.java       |   4 +-
 .../imageio/plugins/jpeg/JPEGImageReader.java |  83 +++--
 .../imageio/plugins/jpeg/JPEGMetadata.java    |  50 ++-
 .../metadata/doc-files/jpeg_metadata.html     |  13 +-
 .../JpegExifThumbnailTest.java                | 290 +++++++++++++++++
 .../plugins/jpeg/JpegExifThumbnail/SV650.jpg  | Bin 0 -> 130738 bytes
 .../jpeg/JpegExifThumbnail/bad-timestamp.jpg  | Bin 0 -> 186706 bytes
 .../corrupt-magic-number.jpg                  | Bin 0 -> 130738 bytes
 .../jpeg/JpegExifThumbnail/jfif-and-exif.jpg  | Bin 0 -> 230979 bytes
 .../malicious-looping-IFD.jpg                 | Bin 0 -> 260977 bytes
 .../jpeg/JpegExifThumbnail/plastic-wrap.jpg   | Bin 0 -> 72776 bytes
 .../uncompressed-exif-thumbnail.jpg           | Bin 0 -> 132599 bytes
 .../unusual-ImageFileDirectory.jpeg           | Bin 0 -> 153777 bytes
 14 files changed, 711 insertions(+), 23 deletions(-)
 create mode 100644 src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/ExifMarkerSegment.java
 create mode 100644 test/jdk/javax/imageio/plugins/jpeg/JpegExifThumbnail/JpegExifThumbnailTest.java
 create mode 100644 test/jdk/javax/imageio/plugins/jpeg/JpegExifThumbnail/SV650.jpg
 create mode 100644 test/jdk/javax/imageio/plugins/jpeg/JpegExifThumbnail/bad-timestamp.jpg
 create mode 100644 test/jdk/javax/imageio/plugins/jpeg/JpegExifThumbnail/corrupt-magic-number.jpg
 create mode 100644 test/jdk/javax/imageio/plugins/jpeg/JpegExifThumbnail/jfif-and-exif.jpg
 create mode 100644 test/jdk/javax/imageio/plugins/jpeg/JpegExifThumbnail/malicious-looping-IFD.jpg
 create mode 100644 test/jdk/javax/imageio/plugins/jpeg/JpegExifThumbnail/plastic-wrap.jpg
 create mode 100644 test/jdk/javax/imageio/plugins/jpeg/JpegExifThumbnail/uncompressed-exif-thumbnail.jpg
 create mode 100644 test/jdk/javax/imageio/plugins/jpeg/JpegExifThumbnail/unusual-ImageFileDirectory.jpeg

diff --git a/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/ExifMarkerSegment.java b/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/ExifMarkerSegment.java
new file mode 100644
index 00000000000..479de42d96f
--- /dev/null
+++ b/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/ExifMarkerSegment.java
@@ -0,0 +1,294 @@
+/*
+ * Copyright (c) 2001, 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package com.sun.imageio.plugins.jpeg;
+
+import com.sun.imageio.plugins.tiff.TIFFImageReader;
+
+import javax.imageio.ImageIO;
+import javax.imageio.ImageReader;
+import javax.imageio.stream.ImageInputStream;
+import javax.imageio.stream.MemoryCacheImageInputStream;
+import java.awt.image.BufferedImage;
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.ByteOrder;
+import java.nio.charset.StandardCharsets;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+import java.util.LinkedHashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * An Exif (Exchangeable Image File Format) APP1 (Application-Specific)
+ * marker segment. This implementation only supports reading thumbnails
+ * and the image creation time.
+ */
+class ExifMarkerSegment extends MarkerSegment {
+
+    static class ImageFileDirectory implements Cloneable {
+        static class Entry implements Cloneable {
+            final int tagNumber, dataFormat;
+            final long componentCount, fieldValue;
+
+            Entry(ImageInputStream in) throws IOException {
+                tagNumber = in.readUnsignedShort();
+                dataFormat = in.readUnsignedShort();
+                componentCount = in.readUnsignedInt();
+                fieldValue = in.readUnsignedInt();
+            }
+
+            @Override
+            public String toString() {
+                return "Entry[ tagNumber: " + tagNumber +
+                        ", dataFormat: " + dataFormat +
+                        ", componentCount: " + componentCount +
+                        ", fieldValue: " + fieldValue + "]";
+            }
+        }
+        static final int[] bytesPerComponent = new int[] {1, 1, 1, 2, 4, 8, 1};
+
+        Map<Integer, Entry> entriesByTag = new LinkedHashMap<>();
+        long nextIFD;
+
+        ImageFileDirectory(ImageInputStream in, long pos) throws IOException {
+            in.seek(pos);
+            int entryCount = in.readUnsignedShort();
+            for (int a = 0; a < entryCount; a++) {
+                Entry e = new Entry(in);
+                entriesByTag.put(e.tagNumber, e);
+            }
+
+            // The next 4 bytes SHOULD be the position of the next IFD.
+
+            // However in rare cases: the position of the next IFD header is missing. We can detect
+            // this by checking to see if any of the IFD entries we just read appear where the
+            // next IFD position *should* be:
+
+            long streamPos = in.getStreamPosition();
+            for (Entry e : entriesByTag.values()) {
+                int byteLength = e.dataFormat < bytesPerComponent.length ?
+                        (int) (e.componentCount * bytesPerComponent[e.dataFormat]) :
+                        // this is an unknown data format, so let's just assume its 1 byte
+                        1;
+                if (byteLength > 4) {
+                    long valuePos = e.fieldValue;
+                    if (valuePos <= streamPos) {
+                        nextIFD = 0;
+                        return;
+                    }
+                }
+            }
+
+            nextIFD = in.readUnsignedInt();
+        }
+
+        int getTagValueAsInt(int tagID) {
+            ImageFileDirectory.Entry e = entriesByTag.get(tagID);
+            if (e == null) {
+                return NO_VALUE;
+            }
+            return (int) e.fieldValue;
+        }
+    }
+
+    private static final int NO_VALUE = -1;
+
+    private static final int TIFF_BIG_ENDIAN = 0x4d4d;
+    private static final int TIFF_MAGIC = 42;
+    private static final int TIFF_TYPE_SHORT = 3;
+    private static final int TAG_IMAGE_WIDTH = 256;
+    private static final int TAG_IMAGE_HEIGHT = 257;
+    private static final int TAG_DATE_TIME = 306;
+    private static final int TAG_JPEG_INTERCHANGE_FORMAT = 513;
+    private static final int TAG_JPEG_INTERCHANGE_FORMAT_LENGTH = 514;
+
+    int thumbnailPos = -1;
+    int thumbnailLength = -1;
+    boolean isThumbnailJPEG;
+
+    int thumbnailWidth = -1;
+    int thumbnailHeight = -1;
+
+    final long firstIFDOffset;
+    final List<ImageFileDirectory> imageFileDirectories = new LinkedList<>();
+
+    ExifMarkerSegment(MarkerSegment originalSegment) throws IOException {
+        super(originalSegment.tag);
+        this.length = originalSegment.length;
+        this.data = originalSegment.data;
+
+        ByteArrayInputStream in = new ByteArrayInputStream(data, 6, data.length - 6);
+
+        // we aren't actually going to read anything as an image yet, but ImageInputStream
+        // has useful helper methods:
+        ImageInputStream input = new MemoryCacheImageInputStream(in);
+        input.setByteOrder(input.readUnsignedShort() == TIFF_BIG_ENDIAN ?
+                ByteOrder.BIG_ENDIAN : ByteOrder.LITTLE_ENDIAN);
+        if (input.readUnsignedShort() != TIFF_MAGIC) {
+            throw new IllegalArgumentException("Bad magic number");
+        }
+
+        firstIFDOffset = input.readUnsignedInt();
+        ImageFileDirectory ifd1 = null;
+        ImageFileDirectory ifd2 = null;
+        if (firstIFDOffset != 0) {
+            ifd1 = new ImageFileDirectory(input, firstIFDOffset);
+            imageFileDirectories.add(ifd1);
+
+            long secondIFDOffset = ifd1.nextIFD;
+            if (secondIFDOffset != 0) {
+                ifd2 = new ImageFileDirectory(input, secondIFDOffset);
+                imageFileDirectories.add(ifd2);
+            }
+        }
+
+        if (ifd2 != null) {
+            // the thumbnail should always be described in the 2nd IFD (if it exists at all)
+
+            thumbnailPos = ifd2.getTagValueAsInt(TAG_JPEG_INTERCHANGE_FORMAT);
+            thumbnailLength = ifd2.getTagValueAsInt(TAG_JPEG_INTERCHANGE_FORMAT_LENGTH);
+            if (thumbnailPos != NO_VALUE && thumbnailLength != NO_VALUE) {
+                // The `compression` tag (259) should also help inform whether we read this
+                // image as a JPEG or TIFF. But in reality this is tricky: the docs say
+                // the value for a JPEG encoding is 0x0006, but the `jdk_8160327-plastic-wrap.jpg`
+                // file shows it can also sometimes be 0x60000. I've also observed it to be
+                // undefined, 0x0007, or several variations of 0x????0006. Similarly the same
+                // tag should be 0x0001 for TIFFs, but I also observed a case where it as 0x10000.
+                isThumbnailJPEG = true;
+            } else {
+                thumbnailWidth = ifd2.getTagValueAsInt(TAG_IMAGE_WIDTH);
+                thumbnailHeight = ifd2.getTagValueAsInt(TAG_IMAGE_HEIGHT);
+                thumbnailPos = 0;
+                thumbnailLength = data.length - 6;
+                isThumbnailJPEG = false;
+            }
+        }
+    }
+
+    LocalDateTime getImageCreationTime() {
+        LocalDateTime imageCreationTime = null;
+
+        if (!imageFileDirectories.isEmpty()) {
+            ImageFileDirectory ifd = imageFileDirectories.get(0);
+            int dateTimeOffset = ifd.getTagValueAsInt(TAG_DATE_TIME);
+            if (dateTimeOffset != NO_VALUE) {
+                try {
+                    String dateTime = new String(data, dateTimeOffset + 6, 19, StandardCharsets.US_ASCII);
+                    DateTimeFormatter formatter = DateTimeFormatter.ofPattern("uuuu:MM:dd HH:mm:ss");
+                    imageCreationTime = LocalDateTime.parse(dateTime, formatter);
+                } catch(Exception e) {
+                    // intentionally empty
+                }
+            }
+        }
+
+        return imageCreationTime;
+    }
+
+    @Override
+    void print() {
+        printTag("Exif APP1");
+        for (int a = 0; a < imageFileDirectories.size(); a++) {
+            System.out.println("ImageFileDirectory #" + a + ", offset = " + firstIFDOffset);
+            int entryCtr = 0;
+            for (ImageFileDirectory.Entry entry : imageFileDirectories.get(a).entriesByTag.values()) {
+                System.out.println("Entry #" + (entryCtr++) + ": " + entry.toString());
+            }
+            System.out.println("next directory: " + imageFileDirectories.get(a).nextIFD);
+        }
+    }
+
+    int getNumThumbnails() {
+        return thumbnailPos >= 0 && thumbnailLength > 0 ? 1 : 0;
+    }
+
+    int getThumbnailWidth() throws IOException {
+        // this should only be called if there is a thumbnail
+
+        if (thumbnailWidth == -1) {
+            populateJPEGThumbnailDimensions();
+        }
+        return thumbnailWidth;
+    }
+
+    int getThumbnailHeight() throws IOException {
+        // this should only be called if there is a thumbnail
+
+        if (thumbnailHeight == -1) {
+            populateJPEGThumbnailDimensions();
+        }
+        return thumbnailHeight;
+    }
+
+    /**
+     * Use a JPEGImageReader to identify the size of the thumbnail. This
+     * populates the `thumbnailWidth` and `thumbnailHeight` fields.
+     */
+    private void populateJPEGThumbnailDimensions() throws IOException {
+        // this method will never be invoked for TIFF thumbnails, because TIFF
+        // thumbnails clearly define their thumbnail size via IFD entries.
+        JPEGImageReader reader = new JPEGImageReader(null);
+        try {
+            reader.setInput(ImageIO.createImageInputStream(new ByteArrayInputStream(
+                    data, thumbnailPos + 6, thumbnailLength)));
+            thumbnailWidth = reader.getWidth(0);
+            thumbnailHeight = reader.getHeight(0);
+        } finally {
+            reader.dispose();
+        }
+    }
+
+    BufferedImage getThumbnail(JPEGImageReader callbackReader) throws IOException {
+        // this should only be called if there is a thumbnail
+
+        callbackReader.thumbnailStarted(0);
+        ImageReader thumbReader;
+        int imageIndex = 0;
+        if (isThumbnailJPEG) {
+            thumbReader = new JPEGImageReader(null);
+            imageIndex = 0;
+        } else {
+            thumbReader = new TIFFImageReader(null);
+            imageIndex = 1;
+        }
+        try {
+            InputStream byteIn = new ByteArrayInputStream(data, thumbnailPos + 6, thumbnailLength);
+            ImageInputStream input = new MemoryCacheImageInputStream(byteIn);
+            thumbReader.setInput(input);
+            thumbReader.addIIOReadProgressListener(new JFIFMarkerSegment.JFIFThumbJPEG.ThumbnailReadListener(callbackReader));
+            BufferedImage thumbnailImage = thumbReader.read(imageIndex);
+            thumbnailWidth = thumbnailImage.getWidth();
+            thumbnailHeight = thumbnailImage.getHeight();
+            callbackReader.thumbnailComplete();
+            return thumbnailImage;
+        } finally {
+            thumbReader.dispose();
+        }
+    }
+}
diff --git a/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/JFIFMarkerSegment.java b/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/JFIFMarkerSegment.java
index 8b95d8adc65..c8fd2a5fbc4 100644
--- a/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/JFIFMarkerSegment.java
+++ b/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/JFIFMarkerSegment.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -1234,7 +1234,7 @@ class JFIFMarkerSegment extends MarkerSegment {
             return retval;
         }
 
-        private static class ThumbnailReadListener
+        static class ThumbnailReadListener
             implements IIOReadProgressListener {
             JPEGImageReader reader = null;
             ThumbnailReadListener (JPEGImageReader reader) {
diff --git a/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageReader.java b/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageReader.java
index 3ddf2009efe..77c15c7c7fc 100644
--- a/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageReader.java
+++ b/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageReader.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -1636,6 +1636,13 @@ public class JPEGImageReader extends ImageReader {
         return true;
     }
 
+    private int getNumJFIFThumbnails(JFIFMarkerSegment jfif) throws IOException {
+        if (jfif == null) {
+            return 0;
+        }
+        return ((jfif.thumb == null) ? 0 : 1) + jfif.extSegments.size();
+    }
+
     @Override
     public int getNumThumbnails(int imageIndex) throws IOException {
         setThreadLock();
@@ -1643,16 +1650,22 @@ public class JPEGImageReader extends ImageReader {
             cbLock.check();
 
             getImageMetadata(imageIndex);  // checks iis state for us
-            // Now check the jfif segments
+
+            // Check the jfif segments
             JFIFMarkerSegment jfif =
-                (JFIFMarkerSegment) imageMetadata.findMarkerSegment
-                (JFIFMarkerSegment.class, true);
-            int retval = 0;
-            if (jfif != null) {
-                retval = (jfif.thumb == null) ? 0 : 1;
-                retval += jfif.extSegments.size();
+                    (JFIFMarkerSegment) imageMetadata.findMarkerSegment
+                            (JFIFMarkerSegment.class, true);
+            int numThumbnails = getNumJFIFThumbnails(jfif);
+
+            // Check the Exif segment
+            ExifMarkerSegment exifMarkerSegment =
+                    (ExifMarkerSegment) imageMetadata.findMarkerSegment
+                            (ExifMarkerSegment.class, true);
+            if (exifMarkerSegment != null) {
+                numThumbnails += exifMarkerSegment.getNumThumbnails();
             }
-            return retval;
+
+            return numThumbnails;
         } finally {
             clearThreadLock();
         }
@@ -1669,11 +1682,22 @@ public class JPEGImageReader extends ImageReader {
                 || (thumbnailIndex >= getNumThumbnails(imageIndex))) {
                 throw new IndexOutOfBoundsException("No such thumbnail");
             }
-            // Now we know that there is a jfif segment
+
+            // Check the JFIF segment
             JFIFMarkerSegment jfif =
                 (JFIFMarkerSegment) imageMetadata.findMarkerSegment
                 (JFIFMarkerSegment.class, true);
-            return  jfif.getThumbnailWidth(thumbnailIndex);
+
+            int numJFIFThumbnails = getNumJFIFThumbnails(jfif);
+            if (thumbnailIndex < numJFIFThumbnails) {
+                return jfif.getThumbnailWidth(thumbnailIndex);
+            }
+
+            // Check the Exif segment
+            ExifMarkerSegment exifMarkerSegment =
+                    (ExifMarkerSegment) imageMetadata.findMarkerSegment
+                            (ExifMarkerSegment.class, true);
+            return exifMarkerSegment.getThumbnailWidth();
         } finally {
             clearThreadLock();
         }
@@ -1690,11 +1714,22 @@ public class JPEGImageReader extends ImageReader {
                 || (thumbnailIndex >= getNumThumbnails(imageIndex))) {
                 throw new IndexOutOfBoundsException("No such thumbnail");
             }
-            // Now we know that there is a jfif segment
+
+            // Check the JFIF segment
             JFIFMarkerSegment jfif =
-                (JFIFMarkerSegment) imageMetadata.findMarkerSegment
-                (JFIFMarkerSegment.class, true);
-            return  jfif.getThumbnailHeight(thumbnailIndex);
+                    (JFIFMarkerSegment) imageMetadata.findMarkerSegment
+                            (JFIFMarkerSegment.class, true);
+
+            int numJFIFThumbnails = getNumJFIFThumbnails(jfif);
+            if (thumbnailIndex < numJFIFThumbnails) {
+                return jfif.getThumbnailHeight(thumbnailIndex);
+            }
+
+            // Check the Exif segment
+            ExifMarkerSegment exifMarkerSegment =
+                    (ExifMarkerSegment) imageMetadata.findMarkerSegment
+                            (ExifMarkerSegment.class, true);
+            return exifMarkerSegment.getThumbnailHeight();
         } finally {
             clearThreadLock();
         }
@@ -1712,11 +1747,21 @@ public class JPEGImageReader extends ImageReader {
                 || (thumbnailIndex >= getNumThumbnails(imageIndex))) {
                 throw new IndexOutOfBoundsException("No such thumbnail");
             }
-            // Now we know that there is a jfif segment and that iis is good
+
+            // Check the JFIF segment
             JFIFMarkerSegment jfif =
-                (JFIFMarkerSegment) imageMetadata.findMarkerSegment
-                (JFIFMarkerSegment.class, true);
-            return  jfif.getThumbnail(iis, thumbnailIndex, this);
+                    (JFIFMarkerSegment) imageMetadata.findMarkerSegment
+                            (JFIFMarkerSegment.class, true);
+            int numJFIFThumbnails = getNumJFIFThumbnails(jfif);
+            if (thumbnailIndex < numJFIFThumbnails) {
+                return jfif.getThumbnail(iis, thumbnailIndex, this);
+            }
+
+            // Check the Exif segment
+            ExifMarkerSegment exifMarkerSegment =
+                    (ExifMarkerSegment) imageMetadata.findMarkerSegment
+                            (ExifMarkerSegment.class, true);
+            return exifMarkerSegment.getThumbnail(this);
         } finally {
             clearThreadLock();
         }
diff --git a/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/JPEGMetadata.java b/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/JPEGMetadata.java
index a2fe287bc3d..c7ad982b35a 100644
--- a/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/JPEGMetadata.java
+++ b/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/JPEGMetadata.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -32,6 +32,7 @@ import java.awt.color.ICC_Profile;
 import java.awt.image.BufferedImage;
 import java.awt.image.ColorModel;
 import java.io.IOException;
+import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
@@ -252,6 +253,24 @@ public class JPEGMetadata extends IIOMetadata implements Cloneable {
                     newGuy.loadData(buffer);
                 }
                 break;
+            case JPEG.APP1:
+                newGuy = new MarkerSegment(buffer);
+                newGuy.loadData(buffer);
+
+                if (newGuy.data.length > 5 &&
+                        newGuy.data[0] == 'E' &&
+                        newGuy.data[1] == 'x' &&
+                        newGuy.data[2] == 'i' &&
+                        newGuy.data[3] == 'f' &&
+                        newGuy.data[4] == 0) {
+                    try {
+                        newGuy = new ExifMarkerSegment(newGuy);
+                    } catch(Exception e) {
+                        // This is intentionally empty.
+                        // Now we fallback to keeping the generic MarkerSegment
+                    }
+                }
+                break;
             case JPEG.APP2:
                 // Either an ICC profile or unknown APP2
                 buffer.loadBuf(15); // tag, length, id
@@ -1007,6 +1026,35 @@ public class JPEGMetadata extends IIOMetadata implements Cloneable {
         return dim;
     }
 
+    @Override
+    protected IIOMetadataNode getStandardDocumentNode() {
+        IIOMetadataNode doc = null;
+
+        ExifMarkerSegment exifMarkerSegment =
+                (ExifMarkerSegment) findMarkerSegment
+                        (ExifMarkerSegment.class, true);
+
+        if (exifMarkerSegment != null) {
+            // If there is an Exif marker segment get the image creation time.
+            LocalDateTime ict = exifMarkerSegment.getImageCreationTime();
+            if (ict != null) {
+                doc = new IIOMetadataNode("Document");
+                IIOMetadataNode dateTime = new IIOMetadataNode("ImageCreationTime");
+                dateTime.setAttribute("year", String.valueOf(ict.getYear()));
+                dateTime.setAttribute("month", String.valueOf(ict.getMonthValue()));
+                dateTime.setAttribute("day", String.valueOf(ict.getDayOfMonth()));
+                dateTime.setAttribute("hour", String.valueOf(ict.getHour()));
+                dateTime.setAttribute("minute", String.valueOf(ict.getMinute()));
+                dateTime.setAttribute("second", String.valueOf(ict.getSecond()));
+                doc.appendChild(dateTime);
+            }
+        } else {
+            doc = super.getStandardDocumentNode();
+        }
+
+        return doc;
+    }
+
     protected IIOMetadataNode getStandardTextNode() {
         IIOMetadataNode text = null;
         // Add a text entry for each COM Marker Segment
diff --git a/src/java.desktop/share/classes/javax/imageio/metadata/doc-files/jpeg_metadata.html b/src/java.desktop/share/classes/javax/imageio/metadata/doc-files/jpeg_metadata.html
index c5dd4044a1b..5eb0eb288c0 100644
--- a/src/java.desktop/share/classes/javax/imageio/metadata/doc-files/jpeg_metadata.html
+++ b/src/java.desktop/share/classes/javax/imageio/metadata/doc-files/jpeg_metadata.html
@@ -5,7 +5,7 @@
   <title>JPEG Metadata Format Specification and Usage Notes</title>
 </head>
 <!--
-Copyright (c) 2000, 2021, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2000, 2025, Oracle and/or its affiliates. All rights reserved.
 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 
 This code is free software; you can redistribute it and/or modify it
@@ -509,6 +509,17 @@ in the frame header node of the metadata object, regardless of color space.)
 <h2>
 <a id=thumbs>Thumbnail Images</a>
 </h2>
+<h3>
+Reading Thumbnail Images
+</h3>
+Thumbnail images are read from JFIF, JFIF extension, and Exif marker segments.
+One or more thumbnails may be present in the JFIF segment(s), but at most one
+will be present in the Exif segment. As specified, JFIF and Exif marker segments
+should be mutually exclusive, but if they are both present, then any JFIF
+thumbnail(s) will precede any Exif thumbnail.
+<h3>
+Writing Thumbnail Images
+</h3>
 Thumbnails are supported by the use of JFIF and JFIF extension marker segments.
 Thumbnails provided on the write methods determine the thumbnails that will be
 included.  <code>app0JFIF</code> and <code>app0JFXX</code> nodes present in
diff --git a/test/jdk/javax/imageio/plugins/jpeg/JpegExifThumbnail/JpegExifThumbnailTest.java b/test/jdk/javax/imageio/plugins/jpeg/JpegExifThumbnail/JpegExifThumbnailTest.java
new file mode 100644
index 00000000000..dd43e7558fe
--- /dev/null
+++ b/test/jdk/javax/imageio/plugins/jpeg/JpegExifThumbnail/JpegExifThumbnailTest.java
@@ -0,0 +1,290 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact 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 8160327
+ * @summary Test verifies thumbnails are read from sample JPEG images
+ *          that are encoded using Exif file format.
+ * @run     main JpegExifThumbnailTest
+ */
+
+
+import org.w3c.dom.Node;
+
+import java.awt.Dimension;
+import java.awt.image.BufferedImage;
+import java.io.File;
+import java.io.IOException;
+import java.util.Iterator;
+import javax.imageio.ImageIO;
+import javax.imageio.ImageReader;
+import javax.imageio.event.IIOReadProgressListener;
+import javax.imageio.metadata.IIOMetadata;
+import javax.imageio.metadata.IIOMetadataFormatImpl;
+import javax.imageio.stream.ImageInputStream;
+
+public class JpegExifThumbnailTest {
+
+    private static void assertBoolean(boolean b, String errorMsg) {
+        if (!b) {
+            throw new Error(errorMsg);
+        }
+    }
+
+    private static void assertEquals(int expected, int observed) {
+        if (expected != observed) {
+            throw new Error("expected " + expected + ", but observed " + observed);
+        }
+    }
+
+    private static void assertEquals(Node node, String attributeName, int expectedAttributeValue) {
+        String s = node.getAttributes().getNamedItem(attributeName).getNodeValue();
+        if (!Integer.toString(expectedAttributeValue).equals(s))
+            throw new Error("expected \"" + attributeName + "\" to be " + expectedAttributeValue + ", but observed " + s);
+    }
+
+    static class MyListener implements IIOReadProgressListener {
+
+        boolean thumbnailStarted = false;
+        boolean thumbnailCompleted = false;
+        float thumbnailPercent = -1;
+
+        @Override
+        public void sequenceStarted(ImageReader source, int minIndex) {
+            throw new Error("sequenceStarted should not be called");
+        }
+
+        @Override
+        public void sequenceComplete(ImageReader source) {
+            throw new Error("sequenceComplete should not be called");
+        }
+
+        @Override
+        public void imageStarted(ImageReader source, int imageIndex) {
+            throw new Error("imageStarted should not be called");
+        }
+
+        @Override
+        public void imageProgress(ImageReader source, float percentageDone) {
+            throw new Error("imageProgress should not be called");
+        }
+
+        @Override
+        public void imageComplete(ImageReader source) {
+            throw new Error("imageComplete should not be called");
+        }
+
+        @Override
+        public void thumbnailStarted(ImageReader source, int imageIndex, int thumbnailIndex) {
+            if (thumbnailStarted || thumbnailCompleted || thumbnailPercent >= 0)
+                throw new Error();
+            thumbnailStarted = true;
+        }
+
+        @Override
+        public void thumbnailProgress(ImageReader source, float percentageDone) {
+            if (!thumbnailStarted || thumbnailCompleted || thumbnailPercent >= percentageDone)
+                throw new Error();
+            thumbnailPercent = percentageDone;
+        }
+
+        @Override
+        public void thumbnailComplete(ImageReader source) {
+            if (!thumbnailStarted || thumbnailCompleted)
+                throw new Error();
+            thumbnailCompleted = true;
+        }
+
+        @Override
+        public void readAborted(ImageReader source) {
+            throw new Error("readAborted should not be called");
+        }
+    }
+
+    public static void main (String[] args) throws IOException {
+        // all the timestamps were verified in a 3rd party app (such as Preview on Mac)
+
+        // this is little endian, and uses a compression type 0x00000006
+        new JpegExifThumbnailTest("SV650.jpg",
+                2015,6,24,10,3,55,
+                new Dimension(160, 120)).run();
+
+        // This Exif thumbnail is uncompressed (a TIFF). The exif marker uses
+        // a compression type of 0x00010000, and it is big endian
+        new JpegExifThumbnailTest("uncompressed-exif-thumbnail.jpg",
+                2025,2,24,14,22,36,
+                new Dimension(80, 60)).run();
+
+        // This includes a JFIF thumbnail and an EXIF thumbnail.
+        new JpegExifThumbnailTest("jfif-and-exif.jpg",
+                2025,2,21,1,14,51,
+                new Dimension(150, 200),
+                new Dimension(120, 160)).run();
+
+        // this includes Exif data, but the `compression` tag is 0x60000 instead of 0x6,
+        // also it doesn't include any date
+        new JpegExifThumbnailTest("plastic-wrap.jpg",
+                -1, -1, -1, -1, -1, -1,
+                new Dimension(200, 132)).run();
+
+        // here the timestamp doesn't match our parser, so we'll ignore it
+        new JpegExifThumbnailTest("bad-timestamp.jpg",
+                -1, -1, -1, -1, -1, -1).run();
+
+        // this ImageFileDirectory doesn't terminate like it should. We need to
+        // not fail with an EOFException in this case:
+        new JpegExifThumbnailTest("unusual-ImageFileDirectory.jpeg",
+                2007, 11, 10, 21, 23, 4).run();
+
+        // This file is a replica of SV650.jpg, except the 14th byte was changed
+        // so ExifMarkerSegment's constructor throws a "Bad magic number" exception.
+        // The expected behavior here is: we do NOT catch an exception, because internally
+        // JPEGMetaData just recorded a generic MarkerSegment instead of an ExifMarkerSegment
+        new JpegExifThumbnailTest("corrupt-magic-number.jpg",
+                -1, -1, -1, -1, -1, -1).run();
+
+        // This file is set up so ImageFileDirectory X points to Y,
+        // then Y points back to X. An early draft of the ExifMarkerSegment
+        // class would get stuck parsing this loop. (After a few minutes this
+        // would probably fail with an OutOfMemoryError as the list of IFDs
+        // grew too large.)
+        // The expected behavior here is to stop after reading 2 IFDs, and
+        // otherwise read the JPEG as usual
+        new JpegExifThumbnailTest("malicious-looping-IFD.jpg",
+                2025, 2, 16, 15, 48, 34,
+                new Dimension(60, 80)).run();
+    }
+
+    final String filename;
+    final Dimension[] thumbnailSizes;
+    final int year, month, day, hour, minute, second;
+
+    JpegExifThumbnailTest(String filename,
+                          int year, int month, int day,
+                          int hour, int minute, int second,
+                          Dimension... thumbnailSizes) {
+        this.filename = filename;
+        this.thumbnailSizes = thumbnailSizes;
+        this.year = year;
+        this.month = month;
+        this.day = day;
+        this.hour = hour;
+        this.minute = minute;
+        this.second = second;
+    }
+
+    public void run() throws IOException {
+        String sep = System.getProperty("file.separator");
+        String dir = System.getProperty("test.src", ".");
+        String filePath = dir+sep+filename;
+        File file = new File(filePath);
+
+        if (!file.exists())
+            throw new IOException("missing test file: " + file.getPath());
+        System.out.println("Testing " + file.getPath());
+
+        ImageReader reader = getJPEGImageReader();
+        ImageInputStream stream = ImageIO.createImageInputStream(file);
+        reader.setInput(stream);
+
+        int thumbnailCount = reader.getNumThumbnails(0);
+        if (thumbnailCount != thumbnailSizes.length)
+            throw new Error("expected " + thumbnailSizes.length + " thumbnails, but observed " + thumbnailCount);
+
+        for (int a = 0; a < thumbnailSizes.length; a++) {
+            MyListener listener = new MyListener();
+            reader.addIIOReadProgressListener(listener);
+            try {
+                int w = reader.getThumbnailWidth(0, a);
+                int h = reader.getThumbnailHeight(0, a);
+                System.out.println("\tthumbnail: " + w + "x" + h);
+                assertEquals(thumbnailSizes[a].width, w);
+                assertEquals(thumbnailSizes[a].height, h);
+
+                BufferedImage bi = reader.readThumbnail(0, a);
+                assertEquals(thumbnailSizes[a].width, bi.getWidth());
+                assertEquals(thumbnailSizes[a].height, bi.getHeight());
+
+                assertBoolean(listener.thumbnailStarted, "the IIOReadProgressListener was not notified that the thumbnail started");
+                assertBoolean(listener.thumbnailCompleted, "the IIOReadProgressListener was not notified that the thumbnail completed");
+            } finally {
+                reader.removeIIOReadProgressListener(listener);
+            }
+        }
+
+        IIOMetadata metadata = reader.getImageMetadata(0);
+        Node root = metadata.getAsTree(IIOMetadataFormatImpl.standardMetadataFormatName);
+        Node docNode = findChild(root, "Document");
+        Node timeNode = findChild(docNode, "ImageCreationTime");
+
+        if (timeNode == null) {
+            // this is OK, it means there's no ImageCreationTime
+            assertEquals(-1, year);
+            assertEquals(-1, month);
+            assertEquals(-1, day);
+            assertEquals(-1, hour);
+            assertEquals(-1, minute);
+            assertEquals(-1, second);
+        } else {
+            StringBuilder sb = new StringBuilder();
+            for (int b = 0; b < timeNode.getAttributes().getLength(); b++) {
+                sb.append(timeNode.getAttributes().item(b).getNodeName() + "=" +
+                        timeNode.getAttributes().item(b).getNodeValue() + " ");
+            }
+            System.out.println("\tImageCreationTime: " + sb.toString().trim());
+
+            assertEquals(timeNode, "year", year);
+            assertEquals(timeNode, "month", month);
+            assertEquals(timeNode, "day", day);
+            assertEquals(timeNode, "hour", hour);
+            assertEquals(timeNode, "minute", minute);
+            assertEquals(timeNode, "second", second);
+        }
+    }
+
+    private static Node findChild(Node node, String nodeName) {
+        if (node == null) {
+            return null;
+        }
+        Node child = node.getFirstChild();
+        while (child != null) {
+            if (child.getNodeName().equals(nodeName))
+                return child;
+            child = child.getNextSibling();
+        }
+        return null;
+    }
+
+    private static ImageReader getJPEGImageReader() {
+        Iterator<ImageReader> readers = ImageIO.getImageReadersByFormatName("jpeg");
+        ImageReader reader;
+        while(readers.hasNext()) {
+            reader = readers.next();
+            if(reader.canReadRaster()) {
+                return reader;
+            }
+        }
+        return null;
+    }
+}
\ No newline at end of file
diff --git a/test/jdk/javax/imageio/plugins/jpeg/JpegExifThumbnail/SV650.jpg b/test/jdk/javax/imageio/plugins/jpeg/JpegExifThumbnail/SV650.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..a7dc85f5258b4fe90e8db36af7da5c53d1ab6bca
GIT binary patch
literal 130738
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
al8OcxS229jT*Sr)AOcQWlPOthfB)Hm$^dr&

literal 0
HcmV?d00001

diff --git a/test/jdk/javax/imageio/plugins/jpeg/JpegExifThumbnail/bad-timestamp.jpg b/test/jdk/javax/imageio/plugins/jpeg/JpegExifThumbnail/bad-timestamp.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..f53c899ff64f77fcfcfd12d7d478f2432c1bef1e
GIT binary patch
literal 186706
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%0AaS4mEc(N73ykN
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

literal 0
HcmV?d00001

diff --git a/test/jdk/javax/imageio/plugins/jpeg/JpegExifThumbnail/corrupt-magic-number.jpg b/test/jdk/javax/imageio/plugins/jpeg/JpegExifThumbnail/corrupt-magic-number.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..c370119dd959796b2171c113483e04f87b1339f3
GIT binary patch
literal 130738
zcmeFYWpEtJ(k48zm{}IHEwY%|k}S5E*<xn2EU?&OmTWOv%*@PWF*7qWZOg~!-n$X+
zZoIKS_WL&CWKUH+lbKbO1wEae-Sa&2yh`&V>|$yJ0*Q;Of?z-(5G)88>=g(KK(0VS
z0Wc;|egzU57&r(FC|?pT807CV4ZwJRa4vu;|LD8|FcVN011L*@g#PN^bxi{xe%I{;
z_{#7gkdUsGwbfrav8=VTp`C(>wF9vLD+>eY`QKCtXutIQcge)S$jZgQ#>K=!%*epS
zz|6(U3L*j}c>iS=A7DW8A1v}>OawFt0w@@mm>9q#{<2FN;6wbudH@EC{7VN6u=Q2s
zU+p-(@T1^<_v``SS5bfQ{a@<-;fDbj@((`_z|c{DjTI8;5B3jM1u)znofJUFEeaZ>
z4h;hR1h7AVVP1v?2c)z=b}}+BfTjI=&R+e&UjcpaKX?VG1DW>MT*3hJh?MbX>;Ojo
zgGB(0lJQqNKvmG||G=P3=-=Z42l!xFf9U`a^y)t__<vxCtiRfq2HJ%B5B^J?7xQ_5
zgbSpXVf<IC^I!3P_YLSb0f`t$FZ1+LzR-*8@9()-AkYrLzyx{%2hjnNT;SU)0Kcp%
z1dxIM!3Y3`05B=Q$9NF}_+>Y%0vHOYfel~-07C;9XcXiNU>Kmr%Lrhlkb(XG>bC_+
z03Q+Hn*jVq0HgfT0fFKGRd7HL1kwZ=MguTDfUN+G4q!kP^b^3?FD(L}VgTa+d;tDV
z_<u0)6+{4F6rd~yb^_tw?Y{zn5dnN*fIkfINdf!|z^X4NCqSBjeJ}mL?5>xQK0kx~
z=KTH&WXOOF3<UNb1bX&-eoj-*#o7T^1+@Zte`^4eXJDP+fdilyKA`FOf?t7hv9>@(
zFYq^g0G&Ulf$D%&cv+wSn!rH8fIuJU;e}p-?tYj5btWz)%Jn~=;lvWM!lM6D7BRK6
zbk?;qBvv-Gvp2Q2B4(sxVEC8xe-B>f{e@70>0$c|{w{&({}+k;L07<Hyy#H@<pEH3
z0zWe^qGO<Zk=X<3J;2`r%D-j*YUF<b@&UdmP(Ku?^S`3CKLRm8FXTV;76yO)?q3)f
z1RapDfP@Duu*9GCkbru#z<yr^1~U!tU+@dD0VN91&O5+XjX&c6s{C%N1>nE`t@ZD$
z5YYK+-~5~Rg8nuI<4?PPOaE@;Tjulgi|A#~j{t4_0@5gu2LA&O0J!lF|K+>_wk}AQ
ztbX9~zv>WZ2^RGA)e6{GNEon35CaGtu=(+S%154G4xkZ$7=It+!1d%G`fCP=f3Mjq
z;Cy>I{w9jQ0VwFV9OCyC{a?)gPe9u5&4mJ30{kldUh{vO0R#H__tyJ2^B?qobq2)6
zsegMR|5rQx|8Zw8p1`Z$S8;hx4gmd!KZf$xRs1V(!oB)~SN`6=ov@(Qmr*G|gYsU=
zmuu^bp9BK`;}O4HhyM1OvjEB8UUMOU|I=#*d-azua)A!?@&|u>{nF&Wec!)*;J>*4
z<p0dTKQr*p4E!?#|IENYGw{z0{P$<zdFFW@<O_m@f`Wm9goS~IfrEvGN5n!#L_k2q
zN5@3LA|W6nCBY{qBBx?`M^3>=K}bZ)OUuZ{&c($=O3nX)k3*1|os$g=78Vu(4gmuJ
z0RtHh4h|U?7Y+^=R|fZmWd1w!+zLX40l9$Ez`;mBuTa6jQNf-&!7_jwQ%JDi^!Jc}
z&>RFL6f_Jh96S&Q`b!4ne~JG?hyr>A1`hrT0vr<ZB{l@+{u0xJK!rpjVHAKum(ztN
zwZ&laicE(g6D(`Plpj4IXV$axhK0j=jg5o*<}C#!6*UVh8#@Olm(T}c5m7O52?a$Z
zWffI5b$tUvBV!X&GkXU|Cuf(>u0Fng{sG?tgQB8iV&me!|47Kl%*y_mlbe@cUQt<9
zT~k|E-`>&L)!ozE*FQEsF*!9oGds7sw!X2swY{^ucY1byad~xpb9;vhnEVO?0vrPR
z#bmHo&Oic3g@7bsghCULgVwc0CuQ=2!4Qm0FKdG(W0pU`)Uz9f!y;!{eRKL^^>3s9
zdp3Lj9~u2GoBw6<^Bf2P9PpM=!BIi{po?HyZh7$p@ihE04mABRR}aSqyn45-z7F)^
zDS6R-H36DKqtHERDYb#bIzu^CEJi<yV%vn?lZ9ZcSSRcdq0e?XM3<xCmqjd$bSBf0
zOS@&2p9+X!b~+%%4m?L(`%gOG&(_u0VBrN~p0?_TKh-|uIh9Tg=2)&$S{w~+{rF;Q
z?zGz2R|5-fun~ef!dXO1BZ!5nks(R;T~<WAd%Tacr}%TW`7<b@ML~TIM=#`E7<L#K
zIKE=1aT3Dhx2!ASYL88L3b=zFjtA<Zq3VpX?oW)bLX+Hj$cmYh?xv)XU8=Aiij^*j
ze-KBB)cdWNNBDE9x~}J7Lbmu_eA!X6qSa-xKkx2z=DRc%E<W4qyN-T37Pxvs8F$Dn
zW)poE$U!R5r-!VaI+i~(yJMr-U0^pRiKpwf5ZCQOB++gcLe!XCFVP)u`6Yj9!Li#H
zYe67;1Ow~IB?fd*GLAixQ`016nO0PueC`uvcT9Dw66tm0ny_u><I2HNGc5_8=xHme
zI9jx(VKa?v%SocwVKv{|2dbgKIn><BSy7&#|511}RA~l1@J^$SS4338Aqgu?d=~M`
z94~i8<3!~TqXE&p1)<2Zo)#ZX$K|WR*KhRd63K2tdqGbbP1v<XhkJVCU$8{dsY9=8
zDq1)68Kt(~y7Twts0;H}74<}Zwr5CCw#*Rl*PmE9bNzBz{CQaNi+RS5lSqhB348-h
zKd&5OOHc_*AR*f~e<ylk`zYAmM`{_w{faJK*5--FgAmoSxz@-Ddub+dnu|TXmCN%T
zdjDgM4mLY=?Kw?&%9GJypFvp|Jg@mAxA}0gCi9_nc$#@+df|yQbAMull~@Atp49~<
ziuvNf`0aC%;n@7(L%O-u*kJKky&y3JCgfiRxV2V#Xx|6EcI2`;OS;3>=&p7Y%lZs6
zOWCsV38sb#Gva$>u1Q)lcZo_R;HQVNnkpLWJFSO=plbMtn)~Y8eDYvMPa`uuu(2O$
zHv25GWw<-EAS+UR+CyUiwfvTW*Hy8b$E!{*+|G3Fel}fu-lV(Hj<Nq+{9fHN2(E~=
zsr#4m(wMTm7(`6ZxQ`sQZQLH+{SM3HNAp9l5@T_LaV;X7g<p$juT!9GgEF27D@)&s
zO{;z_5lj=~m)Td9goP@sWLMIAq7>0K7qQL>q&2EJw_HoG7FNP}a@4BYQZy~TxD0&X
z{{tWVZdze{x@_dunR7_82YomsE>2c><gT4Pbu*}+sV_f0>gY~9r>CEtVfF&dR&n)b
z^L0d~T#mzn`fQw)8)sfmCj3?l84{QpX@7o7X!LxlL^plz{I-qvM>N>WhfvW{>s718
zlpIaln5EdXtY=U%H`4^}=9%#3W6*TT5}f_RzS`E9kry3O(y@CDp*|&;I5r2z&_|Pg
zy2Ap7A{Ar~dV_qbWyPy9QQ`3_8XQpd6#beH`L}BWgfo}jI~6tbdSbNw8iV!7&64vj
zg|H@RgV6%r+<Ed>%r0j&*E#LccW?$zB>u2Y95Th{kB}@Wb5V!Q9gcX9eET8|$+$RK
z8qU;pcomf=%)LdZ45-+LlLjsmM!YjU_z2_hKU5MnADAGu*pzw{8f>1Fl(##Xlfd4|
zvOBho?1w1SSi1S`=lp=%OUTo?`0_oA&&$~}@R7Q)nQqcDP&_S!<LSb{_%dIdpJGO;
zYRgv#f4P`_u62C^3X{i!*YnmiXZvy1^KRntd)=V;WfS!nt0f;9dB;t%%*_;CPN7tu
zWV2-^!K)Cxq)*46t*YNDXo%|JX^BXREW%^*OQbBzRx>d#%>RHr3NVGr>&YK2mEXA(
zZm@J^e)4fUXG?yoxcX!OoqwNqarwx)edDR0tMQoAkq{HX$a%J@x5L}g$geITjXY4h
zi9MoSWEQ3)S9YrH=R#69uG{F>yzAG&jkKY^Mf9!9q`jSapgeMdaN=mQVD>;N#zBjn
z)uMzu(ZBWjDK;A>NH9uElf|Y+@b$5xh8BEtLgL$TaYmyLU{IjQ?<-H7`Pa=@-fP2h
z`i!Aj^5DiC*U&Zl!gI^U6PPLUnL|7>nK~wg1z+-(@=*lIzCP(*k%1F!2PL+vPo&_c
z?BeciLz|*%l0hor9QG1<UHn{2O*N95J39)NI*k*`|2nnYumB2mg*=k6li5Ai@~y8<
zbO7fKtxT+2txnyP+s&>qyxVt=6j{?EUB9;JoI2inv-oIxHvx%-pT8$nb6@^e@yQrd
z<qPZJ+vrI?d4ATl1%jfDkM7461;~SNnKmDCNX1k=9l_R5Sk315uOp7DQ*8&K7H8xt
zqt#W1H|J^0KWBZ2`mFTb4@{O&W@4(kXl4G939F9N1><bM+jie;F1<QAx$ufboYisM
z{zprtd4oN^GZde|0(8#0`V;=76$^(PVrQ75XCZ-yuQLY6vQDe!B0t(ywj+C>_0&;^
ztOl(x3gtW4Fii)-{Lh6$q8gKFhT)y+1{TYXRuTHnqXE#TTYjSs8t@H!*W_cD@Z!gZ
z>x=_r;-tBOs#YGZNHn9Y-wq5bo<R}`+%`}cWpJ<OlA@$Ev{w?%wYc#kr;aQHDudYS
zLLPf|eBEWB3U@_28O6rb)Q8aOM&f2Ed*(x1iYUy@&0op<+_XmByDRFqm?)I}@B<0=
z12K^-7|%2fR1E8*;84nK`e!<~nonJ^O7WYr9D5?v28BhxvM!qs46DOf=Dj?^-WB<_
zDYHdJsexH#5);%O_6SWiygtQ_GO7*gri_wFV1gRUB+M+LQ=(-fVpcz*zDWZM4u+R3
zxmuJy9?necEUCbXbWd^){Vo=8Vioh4nmqmKDn<R8d27-jw&qrk{prF@k=ZOh9ve-p
zT>s}L#FM+(#OtDJ1I`x7qmWVt7rEPsg6J^D8)aX3Qsb}4YczQ$HGvtG;<T*dnt~pN
z#++?EWc+@Ha%?4&xZ_bWz41CHS=JV;T4dL8V-(-@!6T44!S7V)(KN;2DhbtA@+?68
zu1WU>w$o5C#_ojsHZhjPeFx(2oXU5jg6k-1z9F8-;2y-vIKfFvoQ`Aj^<<koXsscV
zE*?~YK`tiJ4>;qStr<{&&LiBBaiELXTjCWZ9$cBKL-UHl(w{+SlFsG>;js|<wr*EA
zJNyzCS*4Yum4<bv2sB^ZPAga#y*IByJ3%r-U%5|rpll`Vb_wvP8TV-|e{Ef~1W(1!
zCE*(TH*&RYTBaw*y^&jpNIQY%_Y-wrU&h+6pSZL3v!u-lBC9&;B&U9Q*NJ@IWo%Vg
zeP>~>-Wj#aEM@AMtFiZbWZ?VEJF`wZ=G`M(xmM9D3kl4xwaNl^YNc8*-FP|JtzC%O
z=V&Uo7?y6lyqg>B@vq<Y&lt;h);>soE?(+=Oh=H@A!XdfNb|ZOjMc1GSx{-H?lK?Z
z`@-~b)bASN)A#|4^Mo|yP$9$xdh?h^lD)b;jh2~Ya8ruU(FMmLzUZ4>apdd6MV0ez
zPl>O)H9-Lb)j@}zO|VF!6ZB-K7}`(TdNm`x^Od6x0o728A?1<347_9<#}8-+Rj|H|
z=^xYckJa7gP#9-&aej)O%I$1wtn9}o<<q-tUr~Pj%~4P<Xl@qM$_fuotW|EJ?25qL
zoTd1h(N1dCLhEECgzlm@3N}T}q5WPh44kTGiNNb>cVx}+!CLpHWcD-2%(TWDj5tPB
z<YPdcET=N|1|c<JD&z59I7!%(IjvmEXF{=T>t)2AYoB6|ru`{e2aK?(IgahHb)kAg
zstz1dBjQ(C296v&;ptt9d{<OEPVkm#H*}L#>_PCdk@-AH)`r*w+$pKrmjgOg0pA`(
z3G0Z055B^eFTGww>)Hb&H*R);-W5Og=+Mw;k)I0HT}6aeYciovt8Hku3<kwed$my)
z+OS1WN2mC(_CE-oE=-*z;|WFKeGz^?4sUWrX|!!kY_M`Bwm*X^-qKJyc0U`tN(J>J
zV~=Y`kN~5d+!#p`HHtyB6nb`d&f%KNGvJe-0cS*_zn~q|c%xg3_mjieN2!^G(V`MZ
z*<*~?kaGQ5-lTTi#$iZ|D)g0)^5lz-rj+mx9&$uuMXcEu=6dQ@SChP>a#ouTD3vWF
zPguM15&Gdo?Bg|CRF!ebor#_#SFT-?c{9<qA(x@e2K-)Y#fkIqKcUQ7)xNMG=vnWz
zq-Bju?^|U`u^Oq278{f%%Pa}aJ34a3T;+(H>QHaG;43Tf(G)i!<~^{vBY|HR*=Xon
zLi0>{<k?I=k$l=KsP3z_B)s9j*<~%Ps)-C5m)>{=>5Ug%>^#k~CuDm^<M(?p@#)zw
zc>0;Dhw_WpGVkIRn!5!0hN)erEA+|pA`?aAnOaVun`;N~o7EFsf17n2;)0T&pP83v
zBiA`5Q5c`Ubs+dQ)kvl5iRte<o$}EfF9RwvbF<FMPK0CR{pUQN<LnwbN$JOsMFm-F
z%$x3M>8YjJLs~srQVm9UGV}=8{m=$a{E39FY=5spL5sq|W$Ai6;k0jz<Opbz#?Ab2
zO-)v!@giX~o!xUwB2i=Ts-R>QhNG2FHF)*<yfIFNS&YeNZC2wDZAKJ+BU9;n&mh66
z<-FM)KIn<6FD94p=H^BL1CN{e9}#@7jAYa;n<k5j%k1ds<M0Y}E}cfe(ZuctBKUMh
zYUC7?<C8Bxu*{!TZ|fTuG<)TJTUXr(5@uxR!!M!nnK@*An|aEofujxMaNR81!egP5
zlXf&Q*OIC$TveSsY;lt)dWz6&S)5FlOw8Z-el;dsma&V5p*n&`zHs!;f&W{+R8?`!
z9wPa1g%)Ciq&uF5051Q`(LJojrv8CRY6rWr{6QlvhUN7eg*txRf#j~U0p;e`3*)hp
zsyp?W=+ZF(OK;(Qd?HhSP5Gx6e!zeIeNoqj;nm80P@Txx{1#>Z=;T94;H3<U<ykik
zk!<QgP28P#PZP--!;g<UGrImBzTw>^aRa|b5)O6@#-px<#T{<3T=0%KI2O1L`9gS+
z&$<jXOl;>qM=j1-R;%{+j^R^>tK%z7m&PPG&DV7<@1gAx63digVUuz^gBA%!_RO6I
zR8j#KOJ0*ADJ?389Kp7gzukqv{%#8QK?{9iUM8SG9rF0wdZJF$nTB(P+6<)0EsfXL
z**@rT@DSy+N&T@SvWa3k?YkqMEJhBvwDqJ<C!hB`lljbpra0k;B-S-2jq4_06O>m)
zo<Xrtt_W8+Mf}Jvo^n%FBW0$!#xdPObVp=3ZSQ1=HsrPX&$yD6E|Fo|4+dznCun?m
z@<!eZ9MOFL`u*L*ZD5>+zuKF3(z{?5hr`@o#qWZ~w0PN>!?&)u;0YwIRY&QJZ0~oL
z-K;hk^cqobG4Us*xaE}^sPc{zc#;lU^%hG#ns!>W!yRa>>WhA;sDu{MDaiW?Znplw
zI32d}#7FT+xhxMW7b(v1$HBB6t)w!G29GdTkU15}&S}?0yZwdggOO?T4BD5Yq%wK>
zD3=&qfBQYX7axtPA;4Z8g~SlNNvW<DE(;REIjcK%5G>D(i?yRKdxRWrQ3*f1BW!6>
zMt17b{ZpZH4O2OIs}VVJTCvg6B9d?1qZ9!yyg4K-p|&y+bLsXDFO9|_YHzI#%mvTX
zXu0x^Ax({qze81D^;?2v7ZDr07P9mQVJ^wI267o|ebRMrOC?nz&7TWToOur8^8$HQ
z%~|quu=8ex3|&cI3u;S#r6f)H`8<P+%6Su6=yFJYMa*6fDe7BZ>cx~)e;Ysb454#u
zff&)x6^#BE5>C(xVgU2Ezj4Nl{<-7KwG{mBO4pF>M3m7NpAqa;6z}^vmpes{vjzuq
z!RRgV%jTaVezuRPxv#~v-^&($Ym9>)&)H0<%3AmwXPNV+DlarJVp#F^8xsu99sLuJ
znX8Ae<MfuL%N`=v_=kwy8hTr6GSRX{8)y6^59~)X8WW0&@|vJEiXZ{BO)W8A-hI^v
z^<zu9=y@rn9+osDQ}8?va<4;Wai~30SA!7e-uyE<Q>I91bDPEd0(FoJW}*tqN2LI3
z3&pg^r5xQb1bg{{q;*#Dzzm0oiT<rTCS1Z5Npw--{!-#_v*7mnhi0tFIM{54L-IC0
zrdnR5fb>Vik9T~@65&eI>C@UK>TFebIvL{nP6CGa9OopFO`<v5YQJ0@S!U)We`M5D
zDV&QvgD5RL`P2H+1&5zOHk^wZCHkpTj+m!}IS6b)13%{oar}8Y7S@+R`lXnQvo2?N
z`;L{TtU)@0P!PT820G`5LCRZ`CQkzdw+^l)m4U@P=%$4lRnvZ#81<S4^Zhf9S0guG
zm&FoK-P<2)8J60}(U4bdLmqj})@gPwq88C9=amYz2a9De#+8j&)-tV3s1O{la@D!w
z{Qa?a{kei)+rUcW%Y&_+&LwY0j^!$2PfG=jG&$FY6o6C~9P*-nWmQpYjO3}JUvc-5
zj$Eq-)flqG<0jdgYg^t?-Da9f91;H5mo2H7FO!}xBC?;dV4+8J>FyH=Q~22Up(i2@
zdFV^H?aefEv5UU^$;C|5*YAPtgGrel{J*C1B_0}_m~5Sz9|!lp%m-7&nVY8Iyw1!-
z5q7L5LM3ai#?q!N4|_sNF?mnme)=dv)z3a{O8Z@Seu#Ip$0tF1(nt?AL047^9J|%$
zqkdafKQ;^n#uWChJfnZ&QbZRtM#zN!haO%trXMW+Bq5%cd9t4_(%|E2nCAP-KaAkz
z_16O@b=3|Z;Y}iCz<~#eueJumoZ%e2{$rYp_4eh@$w%cum72^&T<2!cn41u&<z#V<
zv~1u5lFII0&dgJ6n^}U?R;bOV=4u!6!&)2BTwdf=X|(2WaS{o(NwXiqZ}Jd;XiIvs
zFSBt7a)06$!Y^=ySUe7jrnj<VOBcR(iXr-J$SjHeE?W^WLp|9H=kI@g=T`?=Tx2nR
zP}?|{&;M#G-EI-7ko~dlP%)6+G@<Dz)PbV3&V~HA^2Ghyj_6dwBl8;6kCM4ZpU$aK
zx+9)JBPMru#rtOv^$(G|BJyfO5#`Z?Yn~#!uqw(=?ld3XqaF_t<LsG$!G)Z7f=L<5
zO+<!G6oN}q@k&!MA-hI~lH;GsZG<t3>6bM$anNzYfn-4}nGhF0Nd!YqrD44hxxuKt
zWT2sveIa{nW&0=zsJ!`~XFEE0c>Z5Yf8zf@1pO880SFxUfI~rm0|X5T0|5mCJQ09_
zhKGSeLWGBdLx6*Ufky$J4Il#q3y*?|jD(7agoFeJ0RaIC0SOBU35yH|1H}K)VPVl<
zg8zsw*?)t6$N#}rUVZ&1{{R1O{QoJMkGaO*;TbfavwB$}ZcnaY8Xfp;{v1E~I~nIT
zCxqu^W63&2k2$OdvznTVdkIoJ7Uq=duT%ysWN)rK2;?)GK1EaZ43CfZ(1~l9Tu!#m
z&QaPjPp^0rJGIFwr<%!3uW>PByNcth8h3u`M)Oz(Y!fZcFpg+mm*i9?YY3dGbcZ9D
zT-Qs^&<=%8E*3hYV@c-tcC(=<TD8VhgYi3atYsuq+UM4qde-LG){pv0loi(%Ia^mb
zj#r3|@}qm;2^5-)Y42W{+;z1aTjJt>FzDvD5$oRY5Tyv&_6EZzPldXq73xkfT%J9&
zw6L_AvM69v6WH|@?}G^Mu4lw%SI$U6)6hzB(n@mIj!D;+_t=-!I;u};`{_nMdhuu`
zCC>8g(*%K+sb2E%!7C_NCyFXpl(KIj*sTxd&D1?UoOSBQ`uuXgERPShu>uKjBud>P
zM7Oos(>zAzUi-LxNT?1?Gl}Dh!kTx8dsp00(Xh3+OmUt~siR~~(w-SQdA)G4h~5!p
z;{4jK%~BsCUjDX*9^wr`$*;1FjTOgY4}QqSon`c5$0i<)$DpG&k_NBxqAiimOm8T@
zeFn}8OuFQQgW}|06JzyLLuQ`T&!7_>B1CGBsU^&bE#c}PmE6`;lh@YpJgs-GVKjI3
zHwvVSZnP&8UX87DN)1rM_TQ(IrW8LVZ6)lPvNidlopWExrh#bKm1<%yf@=@8^lMF0
z2b{IqG=029ZBr&2ysN_W*HdQ{I!4vq@M<Q!bgDIFY-$XM@n$}D61Aey>?a$GSV~`Y
ze`<w!v*do~=_e7oo0}<0?|QIfh8NMj^gffea(!R@M`};NA?8XEsr9_5PI(Kuq%mI+
zX#*v>w+6mv!^oyig=e`;`;h0Ag_fR{AbnMbCxj(>MqHbyZFJa%{yAo!wDz5j?cBO6
zJ74xG`yuqoaRAee`-8$4s3iI-%%IUDjON?#`1+s-QJxEMPSWNHa!T?fq^xNb){6r>
z37(u2;DHik+GD|`&RoD%ecj1$wELSL-$stC4lCq7av$(P@M%uYeg7V_hoi^5cZKUG
zBOS*GyYZ+?;yF7-h34q<U2*K!2jxtRJtyzuf_IRP)weTQj^8u}=0T5O)LUN@{o;Q>
zqqrKlp}MDbqiy-sXr9-zdW=4^kZ9i`ov_jmUK!4IAygR`AzH(K)+Xcnl=g)CU~)3j
zwH(0qM0@g7gp|2@oAFt{LGb;IuRl3Hs&`Sudmh~R`8-w}lf(2_e#a`~rXx>GU=%#y
zMV@W%`K^jPI}^o5tE|zQx)wHvN&VDPScr|k=H~)7>Lxse^RHwr<2f91uPPUuBua!9
zU1|w-&#E7IZK}2#VnZj-2X)SXY$NP7_skfq>l&tdbMBGd6oS`AI+8V3o<Sk3O4B8l
zg$PbHk;M>Gt&pwO$09ZY`yrmrtd{`?J*$bw0k2(0{8+uN5*xHK@G3^;bh|OjT@7s`
z_i&377389J(>99ivu>pFG<N1X6WsmQwbX;_NFp>j7YWB&LCCe*j0@BCd(Ffe+#S|L
zapxd-DqgVSZ0rKcouYK_l(74S*)sTdR8*Yrn5VN%6cZqo8p^$&c%$2+DXz7Ikf**%
zcY~dXguFpRq?<HAz-I6gfWQy)gxj$!(y#g`;>7`q;N-x@D2&VI>{n;EUoQ#ZYS481
zJnfbXE@6;r)_~cD0Ns*)s2zC!-VL|v=JsUkSg5(mBs*Rg%^NvR$!q0_Fm^Dejy$9I
z=)hcFvpo2WpZCzyc>WpW6G-GoYq8l<8OJ%)lH{S5MV&52W+Z0RHssEI($e+BRpn31
zEnC^_zer-_w_Uj~*qgHf;h+$L@C>>PkIP$2S4g2AyI02F9!?*u#~*ka<s&{J*lhMO
z&g>#6nO7(A^cX{INQ!7y-AGL&Z~<q%D(U2h)NpB#@iG!?4cg+&Ho}h)isHxDYdAT|
z)^<_6QRzsJiuSz?Pds{1S(6;X&O34O?$SeAGCW$vR%ju%9~S5Lr)jyNTKkfUbz{aI
zyoiQ<NG|TQm_dp3^(0IG7wV15hd0Vh6;+L4KjgFWI7OU|3v)V#nA9p80{lKsF+XO^
z#<56+$wj2bAmtzM<34$KuB0tj@CRsIc}=kL3QB$^pERH+cRI&38Sb`GC73ZHrh5;b
zgFjZ74fAxoW_`?=nYTj(`-JAAqjN)b>LDp5{Ujx-HeNYTvwScwMB>l=sZ6l10dK$(
z=b~>v=#l3!E9$zPzk;E<EX+wTvdb;*psX^ol<(7m5G2A3#Cj&7?^d}@qHkTsMB!)=
zC!I-gyyyx=SNKei=1qrX?p}N|VhfdHUYqSZ22=a`@<LstrJ@jg_oJD<E*Gbod*nUW
z)Ud+F5vb+a_eT-k^cO#HK1haO>G8>Zg#ufD8{{!6FK6p|sRj8hI#vqvVI<ihe74k#
zkh*5<_=1vUmaYmWEy$^cl1xPpmN?`g3rXg(7<rxjpu=z_HE?+bW$-$rxa@Xx&?f8T
ziwziQSc%4b9cqYsV)P<2-c`~GiVQAoxrDmvG|CVjW_v0A6Y(_i$$cyO4MltD@`A>K
zxH0Q|78={DA=1O8v=njK-6T&J<06_`p(wVxY_;<VYx}#PM_-o2eH~w{>0@1ctdiU;
zCt6bvUxK3KG0awuPhJ&|<2{<w+s~i}jCG+Yhh*dS`l?QN^G(wpY16{C2>KYMz{MWU
z*cgLn5G)P{>j-uqZ^<Ho6rV`7yWF{GyUx6I_cDYViK)JBF7HuLm}a*gDofZ5k=v_f
zM@Da%lJUi7kO_StA;)8u8}!OOx22Hs#8DM2X_FKk$HPqbV`oKan^ry&EcV7W&XB$g
znAF5oT+^M7u43-G!M&9@^ufp}>C>D$ncNowGU>)9w0=5Av6w>cz`25GulR_y7Wrq8
zA#%XoW=s1By2}_mHmfI=n&z@pM*H~oNL@rJn%KI(v|zZfW|)*iBX>yV>jk?498PiW
zpPoF=AQV2Br_pAlQ;ca3lKM&Y9>v-(16RSai}*oV4GmwNPQX!+`Mg_fTUMfhU(t;z
zgXkW#o2Xr~@#~p+lapo)s5d{BC&l%>_I`|D7vl?s><K8i6*cLs-w{N{Q0nHh6B<pW
zsElp@d<L~CG}F2XJ^uJ~vfW7!w-?18fVRf1Wh@2vJsLqx<g8GZV<9Wd7kpO-@`3dk
z<o(@E=`pR5F?ab!W##dyG{M}zvA%L@A~v+9{OeCbi9*W|`v@i^8%@f|PHCH%sS=S#
z`i0FrTytcJN?NC)H`|^!`n?aZ_g`GLTebPBtOK=CQajWM(=D%j8<RWbKkQQXkk=8T
zpVK@Y<J|f<wDI+&xye-Cc%7Onjaw>j>A;gmsL_tk(|m`hp!(vc3{6}LU-?RLkfVo;
zy3TF4uVGRB`Yp5DFw=7SLCw;esf!Vu8x{Gn3z~3r9kU=~NgB!yyxxJ3IwNSK<wWjT
z^o>>u%nOP`)U_u5_Gb`sqX1MM7hATuMG3jnFBETaQe;$!S42J`#oQ@9_-6wJ)E;AV
z4q9#85<UH%pl6T;uV{AyZCIc#Vv_oze-XvZ0iB`Ky@BC}Zw>yVgdhV1J8|Mq2%Da!
z$TyS@9!RIfnOSBj1hwM_af6@723%-2)V@(y^dzMVVwT1BzNz>Hx22fMonw7N&S$0c
zX57I;c-~Ds{wm;RXtjWsU#)p;S#Ba~iP4i{9^ITNdEUR9F`wDMZ-bKjn#jTpbVAf_
z?Q;hmIKGCEU#`<VogmfdobD~eGTz;QxxnqSDcTL&%eh*2sVhxoc?LBWoS?xQ9`r=H
zON4wOgCS6OBh+~vF?jG%c6pvFV+aQ_sPVHhd<%YPmPijj6V>hgnzdhX)Si^|zO<Co
zk@_2CI5zTkgE(y9lf4Mwxq567Af7Sr;4O70##EXqE@#n!-IFtV0@Ee3fWtdce>#?4
zZPmjncrS!=lp7a0@jlxqo6oHryFu$0%NRO0mQqbgcC?j@lu=@{u|8LNc6KsV76%tb
zc0p!~u9<gfH_xC`{naF*D$({sN#SY7f)?b=-h`^5uE+I0Gxp*sQTr`=gw6wAKUbrg
z!Wpwv6uPal)Zy_T8~5+-#ZC3wW|rAG=c~#^?57&uMv3e;E1BdTmmRZT2WGh#f1Jv0
zNYSX89MG&hlHiiWS-AH&I><Pm*lu$Fyeb6_><aV?b1^re+$EWOQ+59xb@<x|VRC(V
zQVb3pW#Y(dFV5lhSnLvu@wx6|DLMI|2AL1;8m!6j-{fb}<?EqHaS#+L4QqQix?Qh}
zzVIUlbAkuY*CA_)bL!rzsE2D*_%)b}alujd!cl@UzVgS=-*CL;NWA)b<8dxt`Zfed
z^yAax`6JC8?PEBreeqMjCz92i3`<LZC7-qChs--=*_$lD8KjHPyYM40S0GzUovD^H
z&2Xu2CGn?h6tdkAt${1>>(%)wB5Dz?ey{$M2##9AkL?2*8P$#mq8!DU<GrcN+dI#B
zw!03I7!4o_eefwhGQep8mbcEz{92(6+1YVbipPu{76Vm-SR>F7%)kc5`uhbL2u0@8
zmxS|8Lv@;oBkv}tW%uycH-INPz82qE0=*>UX~{5Vd7Pzsc!b%l+A7X1lTkWyFS^ts
z@I+xY&FIE8@wS3be*|0X2b5E$S6vI~!Xu4K|DGkb^i<$2p5rqJ;`~PFRH(~a2g5~q
z$+0e0^GyK@^1Be*0TO6%d!qIx*O4cf`xA=Q<ez2kIXh!&!mMQ?lJhxrL9G4JXVHxt
zCD-SD;P}cDW;uAXrW3=N)*>D<Zl8ePFR5iyU`b0@Ex`_X#I14r9NqY)^fU(t)lsnh
zlw@rfHZ~j1!vj1>p88U#Z#Y*qmTzKjd_Go)MW9@b-P%QmC%QfakerC#oDV3+<hxOc
zJG~J#xZ(pMjNT@0FsIuci#i`p`2u;Aom@jF?i?%6DH)STaN~3zgvBDhy1SIjw*&(B
zIMNOL!Te~K^yqs_^o=P;rxEq6F)m6<a2TJ$K;SjgtXWhdrg=5HGnR8IJj(Z1cKqe+
zJ=Sn8KBBb=cT=B3%fBYoT0n((Eo}SfWTs*uOsPAT1UY1UygFSIEJ!}7;R(MIAKCtZ
z9>Bsy8=Tr0ttB(kguYhv4D$DQqpi6&H99POJ(pIy(}ojB{K=gGhTyiOtdZ5){uEl9
z>)bR0nc*l*)k^kAu!XuB$qtMt)Fi)OJ}62G|7j%FbmHzUw<+nb5UX|y3efgX8B9JO
zn``9)GAghb5B-Or#r@o=IFU=tHz=AKMg15avX86#a+*tRpMs1MI22FVOK~1{Kl_cO
zR3iH`+~}_*?%#P7K@PH`_R`U2e>eUTAxVXEJl7m5jwMWvBAUxtxZ4xU`X!#zUM)!_
zgw|5uTuXTqq3@Hru%c9tZENqH%6D_mO19LD8;_+s4HYOO%gCcXu=hN7#x}(W+Dt#O
z+$wkL>S#*N5DhAKT#iFL&A)Gq7tvj45e@U%in5zQ!OTb0^7&5D`+Azr@=@O0Yn@EU
z(Ppa6X?=X_j9>XF{~6T!dB|9XK)o^{hLdzo*_}J0E+#IZjga%P^il`mCa#^?xp{1R
z({biKNuX8}*F(`rljQ^9V@1j8`GvT(0T!xyeFuhE-D2r_^h_CfYJX#{J|lyKowb^o
zXl2y3E0M<o%uRNo+lP}v*X+exF{Kbe!XrBoS7S18uYK(T!<E}c)@-wcjqy2wVyQrS
zdShSl%}(Ysf1Xtp0(UOw5*=#C{chHM@haz|C!#I3W!kBb+qc(iR+$BwwA}^k=8H5E
zjj=<C9Y|BCZxtC;TgmLH)|2$IZj#;8q)zUoYR4PZ3RoYmWk0m<%m0YeT>XxDn1q6i
z&3ddy(kCzyy=b~;_p1O$50g{8?rkN{wDwKg+A_q$m)c(rEof5adegxe@E%WgkQ{BC
z_*TO*(&{bZ4>YH*j`n4rx+bP3%nM+CxcPI_>63f+BNKZg3EYKTB~+%13y9oxuV-s3
z<gwiGB8yGBapvs*`hHw!d5m(2E?CU3eyhKxa=?GGy{6x=>>~70E!D@?ti){p2$zY;
zqbhKIh{o>X!0pZY$PJl{KkEpJ#va?<<i=Gg=1|DIq?k`WtO$q~N+P9d`hoxPheL_a
z-3Cg>3cQeQPH#I2?O;uBIfp`%c&q&Tj}iHHwHrt-j74J-g%<JpQ~gs&S=k7Zo7SuG
z`Ulqju0~}P!NpaFBE2*7w<NQu(r;k0Y;v|nh{G1XsOYaQLQQv%?M>B>1f+8rZl<5p
z{`BRs%k16O2k$;o3%5?fO<-*%^bC^T=A)I*Q8)7~f!Te%@KA9B+;>5A-Po_p2Rg!Y
zvYIcVt*sy*@UoHE(p@67>05+=nvEo*d-6&un-SeOPQn6DY9wk#SrWfhURMPcZWF^o
z2n#6bxu$%%*x^#qq`+pUJ-XmLWpXS!n$=L$bva)-_O>9YpLU$R#G^40x!p=}R1}Ep
z5$bu*Pkk3~WqVS{hkQe{+CZsCXILI)TH|aAbxpDS&TLbj^$i{ki$2CWRy~%R<O#Px
zQ+d4_YG`5a=zujbQb-7lVOx)^3};E7&MbKM6%iQVI@63G&1(+O2ON>cP3q1zOP%%}
zgx$OJ;gy9YhPgK;b<FBcD9EV2ZBeL?)iITpi`POu*EvkQSKcGSZPe!vxGciO(;|g$
zdrZ}LRV_Y^?fl9hFTEx$(9Llq6XS+`Vjbv#qPG9Kp0L3(qvJ|MHC7Xd^{<=ddqu7K
zU|zOCd)u!KU~)NFHB+%YgGxT=ha^a_q@VOypYtW(j26y5Xx-35)vO~L(zzL1I}$AU
zS${T%M-R{%rGyceJBunh+t`K<ab8CB)c?}({o&2pql~J*R826;lzr}pYXA3dO$ICp
z^<R&?S48(pnb&206X>l(QJ^k5I{yS4iX&dRIP$9`WQp=bIn<fZ%Z8S$qP9waMGi~A
zDtC1<(Re`#X&3`6X=6jLk)jLmEG;q~zc<tDnVLdeCsanTlw~K9Tl6Y?g858yj>Lh@
z(d9TgOu4qN*fDN??ObzRSc73!$E~C27JZW0HpKt+a2+;V+Z-!m=rNQo{S&QQ-Efa(
z7PMtPp4AGJ22YsSWeNNZxcbC9I=V*tlV?ynAHQTo5t)YiyJIuVZ*%?nt+Hv5^AD2V
z(&pQ{0&CO~Rb2Hs_qEL}Q$J&<rMaa?(ifga_+K@@-d$pT2KjdD`1-Wgm-t&6r``*$
z8Hao*j(X=y_g=TM6e2uU?5bydEAn*!aNn#=T3LR|?|a0;k7(k&<0Cg_@lX{tj3NBN
zd84uLNQ6TPjTxmgw0VS&E)Mwz{nFcmn!1Vn3C%H6zEJ0dd(XA)2ejiA`a}2?)9n-K
zX!ZaexttFbGn&HoZ(3_98>ZL;XKVbyBN$xm=UP(2=fhWCck;tLc#KsxSif>fl>KGF
zVvZ5Fu~UII7OZrx_~}#HkJRO`s%9nmpIp)QQX1wFsZ)A$;!<uUXZ%ENra3nQLN{Sn
ztd>NwW7$#Kw8fT-49L*_MCupI{&!CW>(;?e&95uP^}_ZHYy6mhSs}&|oM2pBmM9lN
zT7NL)VkJK0sPxqG;D7w)=4i=ScjA$jLQ@`EL-iFRQdF)Ed2>2dV#kBP4eO@PaSh(Z
zs*ycUgUJhz+q4c&j5rFOl8oSt>oS`wGPaJjxhJbsGCo0Gu6nmJ+_vR0fsaKy*qlJ6
zqjb^q^fu(@+#z$_ul(q9`>LSQk({X}BprWGY(7F0<=5JT<Hd)p26Zk+>7hb}qbs_B
z5Mgya6Jur)CCtH9A$3$=h>URqtDiwd!_ytlApB-_b*h?{lf&LboO8F(PUMfDKps^W
zR-tRw!B`n{rfcDHrt5UoJEWn}A!o?a(tM37AE~>gr%jV$8Hy9OELk^nmpvx58BYX7
zcqCV|$Duf*oZ*NF1H!7BR*&aB#U}uNO3a^(apN7j)f_MIQsADV!Q}YI)tCvb1mkKK
zp|!{9a5CoIh`FlT!*_+*6$>cH``R@*d+{YU`VHk`q9;5GuMuy(g8T~)26pW;agHU$
zkT<WNkT6b0!@HkB2&{paxJ#1U1NP(Gk!!j)9%n5!{41&BIKXQ*$NrrmmZPKsJ%+tR
zX@#p<Sr*GjQRjT^CCoP!r?Aa9E&`V<73^o93vj!(Ec$rQeP#$JEoU`5A1H2M@6B)G
z+nzxLjRJ<2nQsg9^UV|%=1nDuh44ea3ib;;VdCpYK}$UOR3a)l9>VqCDv~a|kMcuI
zvI4F1-c1NxP<3S`vgW}cz>twvl0QH^mUs}*2Q*XNOly^c<(y-viWSv%kid;hQyd$7
z@xZ)%{eZ6DbG2N_-zr|@2;Jg;EZTr|#-%L@E+GNlLMcFee~nWNGv_$&PUlo*hO{KQ
zbm!a}j<j2UW)_S%c)gD&60ND-N2O$897plXLuuM2yaNk2F36$;WyEMF;xpX>*f{Ye
zG{hOAlLTYMuZ=CMzEmE!w>J{YNDt11It${Ch#>-TqgGZQTYs*5!yBAHxsVk(aixZq
zTw>VrMv3cFH+(mc75jz)#(BAo8CR-VIyN6`NETH+#=?)T_4C^&HdvahwDyf~21>lo
zhZFAR3l@!Ue%@HOUo*^!^<jNX(T&;Qz;|^Z%PCUCjj}Tvl&}AF9uDD#@vG$Bv|Qcz
z+P!ho*nB@3+^=StW9G#^oW8;mLN~c7H|RVK(>eE{pB1DLQSYt>i#Z6?G$0-^JVVVg
z9UIV8oVY!)Ot_{4#|0V_+LuHsBQzyVx9!UP<wLSU40QdOA4H3+ZlLat70X)6CJqSa
z^&<*MKk-<m@ZOGW%V)B3H>GUyX-lySrurtZ_%o9env+^6+rYx_rgmqQ-Wcm<$&k(U
zY!=|hs<i6whp32hmurQ5mYaR+XA$X3sV2hlw$iQSop&Zh=`bj3USFJqt=eM+{BbXa
zcwbCE#u8-A>Q}VOWH#z6K1l3{4Z(1SVuH&vuX1Bl!<6~xKeZWv<0z2ofuWMB^+3}U
zwI=3SP7*fz?M)i$`Hi8y?8Iz_&6gis&aFjq!0XY+gm`T316F(367R8l5!|~ui&Hz6
zVOja%)Q4FvO9O^AITV4n*V=j%#u8$R%vGfXuQ@26z;41il<&2Y7t2w^#g6d%^JVVI
z?VntV2ikNXtR3zPW-o1x9c^g~%L>ch2TAhhfowxgg@VkMU2dZ$nSpp3=F<>YP7r;R
z2JrOiWDs~8!##|B)~gM>5BkA;D{*;-`U^7J;+~A&A>((6a*fVjl=EvB4)92|$sCES
z&xWsm4(_xog%M^Z%H=s)sS&w*3=$!e+-R+QX4(Cb9eqe^Bfajo@X9ONCyAIBTK!rE
zWya)*YII}V`i-OaYU9sP18M^f3TuKdr%HmT*%0Y9LI@uxCCbgHsUBm0og#W(nV-}I
zJKVnsyK<4ovxzu}l<61OZ6mPjZkE28z2`{<U%HWcSLNRrwylivjXW6geQ4N0SVzlL
z{r=kKJC@w4Om*g<FeG?%+yaLy_NTWV1BA5Gd<^0xvpxFG+2XnH2Fn&LB1sXWLuc^3
zFSd)^g--d_JE8~cn?h%*Pqi{W$2BPZ$eQg7$?YZH@CnzEurHv>&Yn>6llC>ODOyM#
z$!MfngE&?3Kd8c9H&I^0w8sm<pvX_Pv7@mV_SVJuL_XhOT~lO#;DC%&=;iaOcGzBa
zxGU2ZYbu6Lk+Fw2kJa%L$D@#1uyjrEy}+UTW;7ZNhg7G18_yvy{lhFJVRORMK?b9S
zQA@na3u|X%oa`)cVl&GO@=7&Sw*q@Kt(`{juq-*){W_LKPsc5GG1g_{E&*#s(W}8<
zBnxss%8K#yc{-j87IH-75;;?t^4h&`V^wK;;y;NGb`WPpBvs8GOQXTA6$=uP)Cbvs
z?KMHW?)V!DD%ixR?^pLvPdLSGYvh~M({6fsKVkp$QhUQVGD6uFTk5(RL)2bu>gu0(
z#r@?AUZog`E-twRl3<ACHU&2E_U@3QyE&rN+4-EHWmR!^N~S(xe%$KD99fJQTa7$(
z__hxIu1@KdSH^=*VprT<NNXSYSyRP_x@Cq>JuW>U&ek66ed#7RmjVjf<O7b8_@DEH
zjHiIRb;n2kAUf%|?>J7M*1|nhweW^-cm|vdpK<RqS<&ZXzh{sxO@Y??=9*RP<6kIw
zS6cc9E1-=d>KqDh7sTBi#x@=L!c9796{w@M0Y}cLvm<xRd%>r{1f9-sJX8CwmFbDN
zsad@+r3vLJmiZ_!S$KRKj<)M#?V`Nhgd~~OCORGX*+lGPeI>@t<`F;ZB!g}E(B(MM
z5}tHzf0BGfvV)C-%^8n5=>bXl&U4`Mq??Mg&qo)p*)(}6S$D)!)mZaA|J^EMtpR8U
z51Ly8|GFfDh2C48(C_5V8i_rXEt$6UhtJ@AdA0=IaigHGK$PA4jp%3%U8Vy%yaaJp
zhjFJ#%>b6<b&Ns>SDlU$c-1x&OO`JfV$lO%3u)Tde|`z$m*_oBDdd4Qwa*h+?WJ4u
z=E;gEr$LiuTgTZr+)dg_R(Ek@r8o6S$BmoJz)xJb@wxi?Sjn=8yh0zmHNny|x^2lO
zR<t^yGRTfhOf5^?2FE;EHt*A062h;KJSQr4<9<(ZBO_IPG8sBKg}?l<di6(0nAQ(3
z{4)78^l9)aOF>o|byeSV!z}ii!70MgHan}?3-_GP5ilL|3e!0qU%E^1T$Bjdk;rOg
zJP}krog=SbD_}_~{W>@nTc^`qc#p2uXlAaM$MZFXHtqeT85^I813)3`Tiq@t^1izY
z;<RY9s9fk#ZvEE_ck!#o9f<U6(*add8r_zUEd+j9=9YG|GR$B<zRKf;tThG*0pS=8
z7qtC#;|}`3xI3+);)*xDac6k;ehI9C{Z8TW#J&*Wnz)<!F`E>xn~uI{&)K$9qfJrK
zxKHzIxnbV(-<Ypn#aTLhx1ycK`w;4M#z5e&ngVIQ-~z5#!(HemYEQ)Pq}!-hXUl1j
zPiMiZCZFm!vF&dRgn{NvyR$s@UGba}q+2Xekn@GPpFveHI1dHd5R;<;->-(7TZ4vE
zh}g0w_XRWd9j$w}@_63O+XROjSQ>3OsE$0q1XbYJ`M7{Jg_%$O+}F7d)ac!C+7Wd$
z$GmLl;E`nc$k4lo&2WdiMf*f#!WLavx>GIN--JUeC-(5Z$V<E^EQ3b1XyTo1KIK6{
zP%8FrYnn=}+<T%S&j)<PO*i_JBGr<(Yn1`-)UIy~&Q1g_Bm4nG8J;Ji%ilWIC=MuA
z-SPv*4HLSmQyMf}9&CvVGaj$Zs<O}dWz5%?=VaF2U2(lRN;WkmI4_<!+vtT7;in`=
zc@Ia<dD$gRDkV6&7%inOx<()FX}C=A0ACxvrWL)Qs-?P|b<Gy$HHCH{!7#EEa^_38
z;d*)}2iystJ?1_LohGVJ@bDI>sm;uo-f7Cu37f;yE!1K6QG7)L9fno0EF{HVn0qpd
zxA*rgl3mIN?K1Gk9N$om1Y4tDMV@9?z78e$5ltvxhhz8wr>9up8N@Taq;n$V@<FGf
z>){9{<<7C*Mn<q7?1AG^$}TJR!?Z@SoO3q4(A85NJ=TK8T(-|bd7-C;@NKxf9rT_j
zv3Z6%t+Zj?nM_cNSvZ8b4#B|_q3GHpm76F}M1?8TCB!DU)hDuHJDVH=8=84Ht)KH6
zCe!v9Xn0d+ll8h_6ycqxhe6v)WOCxge%a>Oe8?vY9=N~gtFZLnMS~$w@Ar}A>;vz8
zf)%CWE){B{R*z$P)g{MfU2Stdv}Rm|_x>z?GFoa{b7^E>y*C$A88iy;MnW!o_{{PQ
z3Rps_rmS!3<UZPb6Vbu}-7+yX>g*vlR6y7uY$7K29ufoepBa8w%__z;ow7<xqgRY~
z0YcmRo@!3uB2zWuJyKY~e|0z~p}{=^MeIaSKqVJ)%@T6!N(A@xE46Z~<b>`S)bWII
zV&uQXaax>%%I0MHR#q4f<*augD(%!O_1KP4GoW>3PG9FHu*B>M|MWTluY-`G%*ASH
zm`Yso8<WaV=>1n!@aY-~9;2kFYxNB+M0|Rhssg^;sSW=nv?;9X)0DJ$2v6$MI!E(I
z$u-FAfy#2B%sFvBd>d^&6yyh+)7^xGC@ZWZQy4n)gzFaUs)0=na=YsOR}Hb<@7Eeq
zk=)dSg;9Jf1JyVe6rwz;X7X7Hl`0lCuh`<*wFAa+k-N+-rN=lo5*GFK1Rl5GKCLI+
zU1IKWdE`LlS-tUAOyEBz^C!xdFue;bc)iEwM=*c^Sr!sG_dQIf^9geF!PIoatlr}F
z={opO2wLXMC6S+-<SF+RA-%16zRPQ^c%ey)H3M(>k|nZ@GT_{A#<$|IuMMGN^a|sV
zh6<zNGc@&NtfF2B8&ULdb(yjb;iB*=d0<@Qhcb8d^<O+3&NDmaiqewc7eTPeXHJ;~
zlRjLgaS2~n31z7(vfK!e58DtyI2qC3pe-PM+9lJ2RnjV$v2ofca+}nw&ZgqBo1!VP
zAI<T)irCJYh}@YoJ|xO_>ACVgIh<?z@-~#b8|Lt}MgCbY1~*8^&!SQk#7+h(;kXZ9
zB?>+c=nPed(RJs;DLzvc!`ekf$)a2{v;g0#9P+22{_3C*Mm>6^yd}<!t=J)*Flq9|
z)0;<T9giN>C2n5%l!Zc7G5H-!nRUE1m13q_2SkK@8|UHy<Ng!wO+~@7%NOyu?T^5}
z3e6SXorW)cRm?Lafh9gP2Bp}2CnJaJ4^^L-|CyBNTz<a1W!IllPeA0?{Kmyw<7Q~f
z%ONhBJPQ7Y7OFldHxO<kc@Unk7W*1wpFZrh2l*)QXUn(UYU$%gbMUz-P|M$E0$+J0
zCF$cEC#@H=XaCs3SV@a-qD|bN{vZ_kV<|OQ-Mk(;MN%2Agmmb2yr1RG{Y>92o>z2F
z?NIEgMLZ$%xWiZ)71Lm$$T2G_h#a+*Bn#v-vO467!JP0t|0I+*DJsexg>v2=$}?<E
zE2&=oBO&_)o$?%nUL6zWFbs5varC~|(*NM<ErZ&6qjqm7v=myPxJ!!_cb61eyg+e>
zwm88xXebnDai_Su1b25SP#l80LxKhf`JX(`JMWyC^CdI+va|Q>z3+RiYyGY(9T&ss
zHU2gPHngNxVZ2%x_#rLIzHm6<gB&h4U~Gf8c~)HYH^=Z+kw;b|@XM{kYTZ*gk}e=u
zqnx$YlKY)YAx&vNKX=1dlGU&wAF(4Xr0i3n6wBrsG4w!Zj=P{P+k#drfko?3)<y2%
z`AhLBIq8^pB}66as>_d4R!@OJxyy*rM_Cl~fiNnN8dN-h04gsz7K%`48DqA6(u~8T
zt;NsWCCbiny;eLGhcSc3Z|z_yC0<pIo;)Eqsbp<F)@r|=g|RW6pECZK?#3LcT^d&5
zZXcao@u4YGC(;kl&|Z`R*uYYU;PwmY9qC0?QTbkVZ>sluu`!l+-AWj}kIW@Zk%Fn)
zRZpEI5zb+0xoc*aZe?!4hH(sOU*2*FMxkvyTf@ThVUtJAqx!0V$kzO-j*i%3f1gLr
zu2f)2|0a-%qJLqbR@SPRInO^%dG+2RfzQo{Ehf1(Zxz(M1&+E_YBUB$s|<||pWeC}
z8Q*uIcg1>g$`Ouo48WR9&#ms?E%liqT(>D3MEW=d$FycfXG&!A$3rv)4rF-6#*-eQ
z7-M2cj)l4(MRE=y(Obmx_b~Dhe%%nQmJg5K_v{Qi;a^=5`ZN9M#!Qo$Cc^f^DTojh
zUPdl+s8F<oYSH9^&#u8O{c!Ly*`9YdOw+KWIW4A<_9GQuP(5KDwBi9prk<?d^|P$k
z$sGW@>?XF=8*AF9c^c+$_Tpzc&H(<N>)tFi6BTfJwy>0PFSk-HJuJ=~DBQqznR5Bg
zlX$5e?P%`RMOxVJojY7VHcW9?a3U*a8*&hwA|<}MgrQvfNt>8-<54I|VaU8?*K}(0
zk;P&)z}cC~<cPt6{)L*z5@EJqMrST~<C{E4@pt!TfyCuH4)uDnMdSQykvk%lel{vb
zrxCPaos1yr`_nx#zChQjF>P)M+^g#JuGu5UVAk+)Y~fNw;(Dp$TDY?W-20hp(}v=q
z!>J<d#fnmVWJnZYhBKt-a{+dPV_iboJVUHGOdri&5~@Fy2wj9h&El<?uMCd$1;z$d
zs4zeE3_G`<K)cXNRIn-f+CIuqBKZ*?D{M)89^41LSS<}yog9DQ_8huWhaAfa58Nl4
z3hT`shnVXpFH{`{#-TNu=L(2`!19IaMT}dPxE;7jVB-~JxEtCuJE-7uZE3(I{IcNf
z9sXZg<{GBfdwq!Pg?6M`FR!2k{*{9}`jx~vbMz_oCx$H~mY6L~5Of!j&11wVv(yjC
z#Wy2lnV6(tz+CjnIhq<DqJ+C!tS&eGUdX<st$F=&=byX5w_||)`FR_SifE+mQ)$CI
zHzfJ9U|~ks2R&L8Szssgxm(UC#o7Eer&zZ=<oB&sPn~IGs1jx7W?UucrWZ0hg<uw%
zSq8~HY9#QoGd1JCc@>-Jf`xosr0-ggZj`h@;`+xzsqaZ{8xX63Z$NBXnZ{fb<f+2Y
z`sxptbBWhO0Hec-Kt+ofp2>szQjm7v#v3V%vSR?1^*meCe5xjDI#xHqn&3`BM_iwd
z!9PO5_3Yo`9sE%cHBSL(Vmn>g1e5i?Y)m;G{GPoaIA*Hg-#P?1$>+nGC5wzuO#uiN
zq%2&@?9NCjd(}b>?WsYswk@0qKjT-?zJ?iDN9Qsit8wdV&6G)%gIINT(EyfQmhtkr
zx!KH<b!I*s0zy4Hv>ddqNiKw!%kd)!=bP~ibYF1QlPnKY=d37QF-esog{-FIz~u(z
zk#(^v6z>-C{eOqt|Mx@Y1HuQU1;9h<!quC>j?T<iP-BB$uHhfRE(L%3!N}{IXI-BV
z8L$Mjq>a9v7yV*ftTSi+3}ls1@?>n{90AILMmy#hE#Djgp>Ly`?xP1(%mo#-ZCM8a
zQzhK~&s_sZ#;vn`IZ0W`N3{rEGSy<!b51O(&o!9S+p}|dR~4EJF@4ZaGvgDrDaHK!
z=V*12TS-;b*}a@3vOBNz!JphOo;xD%fcPt_<webf9CuM)W1$L_nCGM{9ie!|ev(<?
zvf!>WIT8;ZeijK&Kj?pR+-yb%BM7&9?d@jB-weE8!`f`YPQn{qVNN_sM(Zv%-7i4R
zx9srjv`Sl)V9roCZe#R^qf3^9bcn@Uw_jUU7^fSdT;1%GpdDc=C+`CDSAv<}H+Z#g
zn|n6iq?)yfB(Ty3ESQCL+PA&sv2>r5s_r$Uj!NZu{Y8$Fk8yPWZ22OlJJ}HH;<W0#
z@{{Nf%gCq;u~E7!18@50v(@h`**S*#pFi)913z<p(3dt5=D0`)uA8bIedo~Bi=3_f
zd%S@oq-Jfq+uG3F3fd+9WL+2f*MUG5zuATHDsw+A7d@3hm!SAPjnmhMT5i-<5d*B3
zFB#(q1mg%*`amxy^%J#B3(-UplYVsR)<}lxX!pW_b2&m=V_~A*)Tp9?u!~$vr@)dn
zn12-ufmc+7V4eCHrc{{@G+1Itw&D&pX$6S*a1BGM?4-zWM>SGrOf`e6c+3>b`8>=+
zn~bE>dz>zK=AHbn1x*-|LgM&ZDCs0To;3)?K9kK|TWw62b;O>*wKUjdOu-{fa1Tk=
zrIU0|-$o6WyeyqfG;4cW3-%;kaWr}&+DCCC=pTk!?ffjt8-pl_M}31=0nm`$pWneh
zjIntyM<Me6r08(Mc)k<WjZiBqanrwC|NAIQ7p7sd;Nj-0!!NUb7eE%xW+WK=)55xW
z(S19II&e@GTnQAVcB;i%*-$-b5Ex=gp!)c%h{a4Z5G5BxaGo|K&8dJe_J$zvE@a{4
zA=oJ-ADO$Y9&K9;_T7{*3%Qh8eve9tGD!nR2KTgeAqpyA{HjRI7Y;s^C{*fH?+E{c
zgNgk~VBMh|ykN5KpTe?Csf}tfV@&UAF8i6@O6u`Nk?yG=$9!13X~6ajq-afuEowi2
zq_3IWC`rP8<yfocSli10!cMQB6Bn$Z*;6eV(oirnwc&h?MA>-JV49V?mDoXer$+AG
z2NzOFkObYo?4TXP<9`<uj-qK@+P>1w5{u&JQP3!jn0TzN@&5P^V>2(14W`(q)WO_V
znBuauB1=nQyr%LgLN_00e{-MzGDtz-WzW!6&sY;pstwhK#z!dybEC{uAxBS-*p!A1
zsIx(5D}{I4YMIdMSla}X6zJonzVl}fO3GgG-IxGB1;o|18rZa}W2UN_m$$kqv_s%`
zjz2FCxwu@}ZdT!Ic<cR055GRn%WGw$;b$f952qIxR#LYcA-|)O!y_P`x)J9eY4!PE
zHix_X+Gfhit+y<dRwtA-uikitt_<k(w-x)JBu(LZC02C5_@}_mHeTPer^id9M;)Gr
zj$%h4TReH&-*q5$Uus1kwTo1Z-v{)0n6On3p8y6lLQb~pY??Z{!**uyja0wg^m#)5
z@<xJd6I4AePmE&9%GOo+p|=Z{tCkjB+7RTc7u|{>9$7Q|_QJZ^2NQyUeblYYOGmyF
zvl18jVe2d$-DgY!H8S%%65Xe!JKO;6mIl*j7vAgoSqTFAi%uH5f~GYC!#+Y$Y~euX
zzgsuX%i)9RW-(|;$C1|FwNAA`k8L)w_f`zT)r!#EelIlDIAurc72w@C_NF_&YR4?&
z*nKQ2RmX=u&)1_OghZ9(HBs`{z6v{(2-<Hqk$f!?(Gagvhk<2<7v~4FKUQ7!GS1C=
ze)fH(?(>s0!spSz79AvjBz^FX;^MxEwEk1-Ar*zySUdC*`|{-zP=R-uqNkha?DIM?
z{I#BM2#mW?;G8sb2m4JwM2n`#|BUOq^YY>}q#+=XlXu^2k?=zPn)vRP4iQ>{kiGun
z=;-uT-!2rDMU=Jsm5=0kxcQx{nQ|GDdO-%?&H?(Ar1t<xsh(ap{Y5aN@%-i6b^^jc
zH8tNljpTN7YnOg}O23Jcy(QQM8EUeN3DNpZx?!E7F3hfK%wWO-gh|sjmiC>hHb?=0
zX#lRDLXrTtDS9p#s;a`nJ+Ud^KmQ!xI=a%k8T)W_^Ug7xXseemt~=hH5+v$5G6$@|
z9&gp*2O*7WMyjg#1bR{1euhqYE)_W)?J;}TII~Pu?%kxw=M{*+<?EG|mmVuiZ<K`_
zv~Ub`XrlxY_+)V)z7dTDS`*66^HeQvJf=e8-I3{lAP)l+eXp}C&4x^DyLrm!Z_5+~
zR>6>7D>}toj2+=46h1r?j4Q=mx^V(!8Ms}jc*R}LfF=g<P92`fm?TRp8bt_;+m|T<
z4{d~}aG7QUsRI|G#gHA=S&vshL!Jx1z(JqeQbSVSQva_(2AS|FS#w!?hK7;>NAhdC
ze+Yp-l&wJpOLhhKI1WSqrINa0G3SbQ0Xy@4VgQ#<U5ODMvKf#K`5nkM*P;9P8FVpV
zbXKvn_SEIW!&ON582<523H%4MIZyZj{78bDPe7Y8eCE%DAZPlQ<WN-?l!0VZ%hwOm
z5%BW>&Ir|~{5Kl=-fXD9YmG`z+OTdUDQDlq0RO8ByZly0oG?=F_W=?ZV2LXT)NlKL
zC?!FpNNb|H@gUI8_|G|W`b2P{BR!RIEe@UR4*kudguAA<BB^yzEpin#oKtt*O^n`H
zZIRODhqL2boyPstW+imjR2EJPm#^A?{~CJv>e4~WFd6njf%BLb@pj{krbG^1N(mR6
z;j2%nEl!pdWi%`qy=ok}_j_}=d(~^d=QwzFC2{R5Q*zzE#Y?9MF;-{$g}a9>Xd?|C
ztv+{@>EospC3NjMnau{}3uu|ad3YqL7G$0~%B`-lOeGBLy)^6I(r23SmoFsQT`igc
zd*%Qp8>6@qKTm3DxTA&3AsXipz)LCJ?JCVrWqC(#>l)OwK4D^L-XM(;^9Hhu+r@)4
zN5Cu8;7r=^rlJyit!}8pX{C{;s?zT<%;vpl*V$Iu?AFrCq{_nT)Q>8BT8{M(^5{y|
z9<`*OgQg_?#vMUraO?1QvZWG1GBZ(xsUkRXUNvGnoY?{xPj9OV>ROX_##w_S^5r5h
z-se7xz^L%^BhPV~`MbhIr)IH=XjZEa`I~+zrd@66m@`G{L{XdeAI2-J&zzm~cKMU9
zYoMd=ViCl_oY`|-VhB~G76T{G726^yM=m#+uAFE#&*>j%sfxOT-I>yB(NX0ge2Tuq
ztJ+Twej8oAa$W=Pv#Z{4P3jrHm$<s0^HZu_PRo7`JMZ)<pK>h)p)cDj`Q7^%;W~qe
zx*99VxEf}nBl8S2Hur^rq`PN>-nL5|jy-L#Y`k{=pq7&AQX!J(Me&Vb=B<t_mE@mb
zC5~K=w_@x!9ja0H&W@)6<FJBl&(z`W=LU#G*}7RzO199?zk$r|jTLdYzwdlLSGM*t
z{5sR?dXJdZLpbLe*o&;c>4Z}?8Io^rsI|Tsix?0jGki%*n1o;cSA+6M|MY%l*B)hA
z_8$g63?~A-SqFG7wBjcK*`{gwQ<Keb`f1HUfxkUaFf*rZxJ0^Qwd-}@{Kjj5?HV0K
z$ehepq?DC^)S}`)jNHj3jHjVM*-3#H5{t~o!aRm0WXQ>(>BNY3nJSn}wt2tz9l39&
zk$Z0y?m^0wV^8|pv$NQ!0}l{=F4{VMxpCINd4UIv_N!b!_V#L<jNHoj?QtS@c13T)
zj6?g)H0>G5;fG@dj}Gaq^|D(QQT8>4ul@ov4f~CaUA6PX`{LjABMB(qC@5-F`RV@2
zdi%pVp4pY2#foy=b%Z_(tWwUyBO2K%%<}g}OoRRex*zsWCb1-1j#YafLqO+tN16bv
za(O}+xz0L^+IY&_!rguM#W9Ly=msjr2*F{zW@{8z$xn%Z(|)7kK1GXTy=~P+@Mq#q
zH#9gi+%Gmb)@83!Fvv%x6+oN%)w+FW?$XPGvumc$BI;f=d1d92tgv=u3}#C&bO^d(
z%TTn;e`BLLW5JH?`Jv6m0;@<S%`v9;E(@G93jE>BoSquqSn(|Uxn-^Ma8CQf!kedN
ze|#FoY~YI4#?{O}_&v3{w(($eZ$9KV*a`d$A#?h%tf{~j_nxj&oz{ynWJF3oV3QE4
z(FZ2K$>3BYzB%VH9Ct`SBbK!>J|{g-_Ey@d3V)J}MVOun{0T)WyuYr$ZB%WyGh*LP
zbW5@lV~SsjIC+Oi-BN|T=V>phP4-s6U;WzhV3RG+uAbqQ4B02QZ4KD!q!{!XR8~&9
zwq-j)gqV3-J&J;CRNDO_nOp0#T6t2L69RlDficB~KdUqL8t-gxTzu9Av2au})QJ&^
z#yRL^u2(gX+6d%)D+&+GeMp}8dl*;v{rto7n!qz0I#*-`+h+JF;TG>NKz+#%XWlc9
z@gp19SwTvUN`#zYo|YSuWc1jlT0e1!|JI{iMPmJ+ENt8GpNduid7}!a#udkLH%!?X
zYn9QqfsSqJGv#jNWV84bz~y=n#1IMIj1Hu2X)|=VR{bSHnD{7Z_ATW4kFdMWIDZYo
zimLkW^|u@=%2sfL)^2z5;+D0`0vM)p#@qYuRRuSRdF?{gK1qLBFPAqlSGltOy^EM6
zXo#=FBGHTu&UuRoC&(-4`~?q$khMbtvbQ|BF?hbv{%BR^4kmR1@L{}XbTtvS-L`9A
zDDv}?rrfHl?1e@v`Df*<-aSqo3lL@QS02Rtfz&DP%L7}OvtJk#@rk4Oa(AvE@qt4A
ztQiB0U3uFhRSkpVQUbOMv!Y$EIBB1rf12;yzdkiFTG576Y~S_e!Dh`9PChN39R%-D
z6{wDbrvErG{p=@L5AMQ*Tepk~Mbe%p9^f}Kl5Eh=ugC>Xo2{2{+xw>n3@6j6Bbk3S
zUAPo*vz=dlxDg&3w}%dn4Zl{faZc97WX^oh*AR|Mvh<w{d6Yuzd}>cP5>g!(BC3r2
zlfh94Tk-u7|HOF#CIG!d<ECiQLwg`KRm*s-2R$AgK%R^|w!AK+r4K(DfnW*c;Z>xk
zR6i6P3pfOryzchxoNKaK0@UN2QElgK>2zfdyKg<}xC=ijRpw%7Xis6#^P8d3IDelR
ze~<X_Qgq1O@2d4pSw}!3ktIt_q2(JK|NRyhb#?awQID?ClYPy8ooEh(_qaH(&+WZW
zHV!;;OL(%V!eG@1lqYl|uAFu~RnzM*xdP%8vVAFa(|fYGm{T(!$bsa8Ju^Xs7{KYv
z9GzVt*b-|0VPyR5VXh}#ePhGmC-s%!rV=*h3f7;$ZEro8>wjOwQGG;$bbV^SHeSJJ
zPzpB+wsWkCh2CJ<^HSkT<@zYDGxDfU4s}T(%HZI>6nfJ6#J+Xj_PMHyeEF89mYJp&
zXTiUo*dn@ave@i6l=ljP{iDC!_A`y0-KjWKcwWg@#RgFfj8>f3-d$~cd>wtIMwe^z
z>sjC-7Z$A-vkkQKZYZZQHmbwW<_(1a$Y*Pov9`IbDYU<>=f&{kITcJ4!*#02yZn{v
z*-Gok#jR7v6y~A~6C%=l@p{chd*QsA=WMRho9om}Xp<;$lrErEj5hs&X|S7yyX##*
z%ExVK)9QC#tvW=C-{S~<l2EXqmsIj>j5dr|MJldQ`CBwAt_mh&nprn8UmD=}d*dgI
z-Wzsv2W{zAe!mOXFLzwnd>)54x;Rg#mcIKD()klN%<8gaLADdbMBB=^aXAR~txUE)
z?1h^l%FB4a&ztWZa=6^ad9-KGgY%Ch$V;r8;7y5~a#rr(03tS`a0bta>$CQj&BTZY
z22DgfTykrwudu0c`aI^hN0`AuQ*GLI%kMA^=CfXOoStdi;77_vUs~<{DMC-OOBpc)
zC!7sM`MA09Q%W{>gxA@#0-r{?ZMHCN<xxiI+@{ViD9Wq)W1s84YBxSv$U*z9|5His
zQ%tx0cr3Z>Hwi@G&Y1`WwP{By=<Rd=E)DDojveVAl}?!(JZnUD!d(Y9@sDVDtXIB+
zbDJ0M2s&{JO$jM6HD(#mH)=}b;wN>AKG+%WeONpu3_>%fYBWO+{@O>rMcGxDy@Yli
zbs_iEeI0Cadg-ptmJjLLnfBatr+zFsgOc2A+!BtXBe<Nb0KCI08L=a4IhGV9{gTNa
z-I_+)l?y5FJRWk`P;2W<Gct^UqX6Q{?Y5uXli|#6$#HwFlsk0lA0U&CA8&m%Xi$Un
zY_N@RYEzscBeKE9zfo5f6DcAx4k6Q@wcg;E493hmUX7bpzVWY}Z5<071HWn52nN8k
z?j1Zb1|2B|l-(`7U($S{V7jZIq7x{5w+r@1TROfswHlY+v5!=3UeM%o_#5TO9CtSy
zgiDFS3GVtO>Q;}SKc6evF}+UU#L)eLBgXjPyV!ap!&tZY)zFbg%Y%ur43&&mY0^p`
zm5R#}7&a*Q_lpu2=EFktQi5oUPKwZwYQhW2uR7OeoBX>5Nhx0o<}$w|a78A6?VqEa
z_N*Z?HS7<-l9y5zQY@DU!+{B>S#4EGs()X&CBHrO{j;SzwWq#mETLBB<y<e{+Lps*
zIm<TfaGu1~R5O;lixWl5Fq8%L#tK>t#09AiL>XQ6-#Q&sC{m<oY`0Xafvp*^i+WuP
zq6^<xT;<^0Or5BWb`E7lKLIv*e>UV(uP7?fIIWEe1;yVlUZ$cKy)?w2<2E>IYO6{d
zJp>k@w9tO*FNQVYkeNvi#mS5A1d3W;%$1(B!VXTe9+g2ATjsx24yos$j{jk#sCA9L
zBsn`6`zo>PH0%$PSiIqWd=a>UVtgv{h^&&-{Wr0@a9T43D)OojQJ^KfGj9H1r!Ek=
zk7j{!S#P`mvK@*rKp(wyRL&d3$4~Q?QY7xhgCc;<&#jQ>3uuWW%N!di>%rE7@Gc%^
zdy=GLWJnN*n9Wu*GD<1lep>L0?bBFBOOy=H8dN()`_eh=$SHWcK;%Bm`eH*ar)!;@
ze%pk7S%ll*@R-y}BdW@n)j~JQON#Sg1p!QP40yIZ>G$M>*_zh9iHW&>7`PXorYDf1
zX}Y1FOTx43f|dP~yTj^WEKlJM^Ii2%kitGxkXEB)l)@?%ZOP#12~27wo_1WK%>W34
z9WItuw#^42L<T?rq40@0o{2ne%;oxqPC82)V{p_Pp80PhY*M?vXt@d-VC5Xsb}&SF
zA;Sr(*O~1A0P(oK911FE!9u2g+HhtUMG*VC_EvIy`zG#wx5i{U7ZIEG=u>!@0+o)C
zwS~N9iYr>WdDyQ~wPOltI+h2Vmkl48;&E_{fBL$%wmfk{kJq$FK@y|^5TJ-c+4t3j
z_ba{q#obj_ZWQN!Y2FS#^ef#n4gaek#ZU$PY_u|PRp)wXYBbEtpxM+=St%uN@5)nT
z<<WY)@Hw0zM00H6FHhR69M2M2ixRUIpI3q)f_4FY^MkJ)4VBtv9L{BrS(+54_Sq|b
zD_5oU95d8U{b)3pw}BO>9~UMMmPgq@R7wi{pTX`zrOYiV525}N9xx|u+V^BCb#dxA
zaKEPjdm91|6MNx;<s2q|4fK(nYy+j|8#zw`?1Ajn=k#7t1BR-CPU82iC+0keeiW|N
zHVsY913|5gD}l^uy)p^bO)u%aCvP^fQH9{BGk7!WKMe8)bQAk}j5Oi1L|-YJbO_P#
zB3UzAFBtl&FTT(V4xBCod!M%DIt1b&=h`%VmrYD+{gmky;oki@R9){70?q^==+q!}
zSUB@<PFa@78m@58)LyX%>bqDpKG4JvgJ$^w%COzGFOi>TxwU3yI4f{fUrv88od|Nn
z7~WF(0<>Pt-s5lsI$5?eC>w)&WpD5S9~;{`Q9Z5c{%1c`xm!($#o4@tStHS}pz?I}
zc}Y_X43Q1WETF+x7uShjOn6S@4phk5v=XMgQ>;ANfPF#tfs+PiAaApJ&gcPSc}6tv
z<aza=ht|Uo?@PjkGzhCEL-K&sbNS!sMkP$(Rplud?P3bpuM>x@q+xhyOE&lA$v>BH
z$vT@ut*_NMMl~k+#0sucWaWY~u5gN>PHok6xV~)m`uYn%H_*pwJ@*DmY5^D4)<YDb
zTdqD5GQ?b!&`PV)n_>5&v6cE+4jS)01Brw{g|U=W8C!UBl#IwnZ`yQls1W$gN_>;}
zPf8QdRkE<H>rqtWCBr~~<o0@1X#m6+wiw>P_C+bi*w{JqKa9G+ZeXLLu~ebLe?~w%
zTepXtGc1Bg8!O496nzR}1@Z^4j$k1zvB|krodBFUeVeMlWxxwZq$KTPztVgo7ssz1
z*j4z?g9N%%9GuK3kDZyk+0vWP<-j#X@568A;9hxu{;j*1M}_$!Yo!P^>j(eewBw^g
zUbQ$S>e3Yh&N70B=JZmZ?#Q#nLwa3Q3IE(K%CCLI9Kk5V$_5Sp)1(#*?-agd)wK`>
zHtzc$zzK)xX=nXuSkwQ*AQg^wBYXWkZ8~INS&X~!7xq;zwr`aF1pRYFDww_@GG9U1
z?p>CDWI&y<Wa%hjt-vd+kh@s*u;1ST^4(P9udN$gW0Gbf-AvPNyQ8~UPBtjnW;W-m
z&pHI@f|6EPYiW8}7XRoVi-kE>A?S#nBl7@%@-9T=mSljy`PkTj8SFY`>?H7=4-;c%
zP6s9ifjFH!2$URApq<Ws#oN$ivtnhC`P^57Fv6Zcd*T}XT6v+*8DN_eYW~L4upx&E
z@owns-Mvj4-`TgNpz$!;+bR1ke`%P;rh4Ai%3;H=<*I||lowyCZ>{Pl_n=cTe9YFg
z9#uycU9D>FevJUZ46+2ho@Ms(IG_S*beH};OeXqK94RoD2MeruXkWdz<8rel`a42O
ztD<_28K&{Rq<Jn-A2FpfkCd%gp~+IXz459EW%C*kA5uBMz&eU@;WYBtKbX>z$ySW~
z^)t8C(@YVoa#^j6t2Rm5D%C#qz5pXeX{Qyd$nEaS@e#GrN})^33XS9IeyWq$yy|RA
z*A@|b)h%wb4Hc0frj@@@#GW7jjN*u!1QTjF``%nEr}jOBpYB){E*+k>4OSH<5IL3^
zSC0I>f9*O<6G@aEmaP0J?^vxX<|pcL9x$8dZvZpPD_rZ{jt%t<ETp$!T3ec6$&5c>
zEcIj#(sx-R;5^#E44h_oA;tatr@I}BH%u%>Z|&yscRo$ad)-2lQt4k$oC$m`b(uah
z%QrlQMbh7AE}Mq)K*rk}r&q=H-ozg_N3EK(?lP3GTZ*F%teS(Ak8wU`hhXR_#(=Fi
zmKJYQjLU>$actXkcXxP&_`1?Zd|wP$={IY=6gv=}SEQp>O>wdFPn*yRwJ8VwyZ7GK
zKoXmOTtw2}0`O#{Sz<CsSvgIa3|f`9m3n$&{T+&Qz>9)|fh<Tc`eATIO?TIIt{i)<
z(*=B=piG|kXYf4O^*vLoCoKD{?*<7UP#9C*IL%Z^%Ht+WyP`)=9G*)fc3>7-<lZvx
z=Czbs{M5_<d`~aqoFMgqH0U}KB&_2RIk-+$KgV=9Yq<YH25|r=`ijm-d75p$Gc1uz
zN!Vz;_Krqx>t%q~C^3JIxobb`?%76QH?yoG|5$rv`6kH}mDvH3^ZH^N5-HRUiCyPw
zX`2_aX)y+h-w+bgWQHoG6;QBr2aAZRwTlD9#A$%4Yxb3+D*>^i8&STY-Mu-`S>;8K
zB)-U4is1^VA+G;Im?$VVwYwmAY?Ek?$Q+6j8aR!OMsyNo@|&YGoj%86Kjovt0vvgF
zic3m>c>iHoEOMoe8`l32@|hgkyk?GbaZNlKn(7A!O>7ZzN$>t6rF)zHu?5AYh!W$Z
zn$}Kmm=X4|7z?2A^JsI*5&HXzOEZPhQ;h8XXq%AYMB+b;-%h$7h*ilN$*n!H(fcq_
zq7`wn6!vD@{8D+56-fX#s9Ot`((Nn-MSCF{Sm?gqD}Berj>(GstlzcbZ|3(WB$|BF
zdpNx-4V5f(+~&I1IINYJ*d`7pK3QDnYH3JW(eQK24O4!@KdB&oHn#{ta7dP3SDNxH
zOe&5?%w!~$yBm$9u}~Uzs@G9|dPz#GSccAsH)S{I`Cs*MC-5Cmf1MUa-dJkqrBQmU
zw;(VM1X7Ns%WLU=I9JB_-aWN*8`QqgVF)MD>RNc`(V1XlhlQ1y!nF~z&j!z*XulSU
z`FmBxv=vjmsM!*Gx*IDXYWFPWg`#xDMfZ~1-L`&z7LGO|ZEHRSUtsu44D{kmkaGO<
z@mT{_e{^mNeh*hyqgLo?cIt9`f!Zyg7P7p!O?EdJ8!ST&=P8UE_AXuK?yqWj>#{tA
zIpv_=Fvq!~$(R4<|AFoP|F1eEEAk$pEYVix3SVroPeD_^0M;8ApyG4o8$z5TQ9;0l
zSKSBWOR~N7w@*L2D1cCprlT#%SHw@uVKc1n0~Br?wD+we3R50(L=lN7+=iOSpRn6*
zn{Tu~Nd;};&L1}pz6dV<(;r+%_f5ez{+3Zs87go~qtG~qebsgIe`lUFff>=9T}4F-
ze$C|IkE(CXtCVGbs2`{|cTQztyP-j~p!v=a49p-2Kdrit?G$ADD1HQBEA|(EKG2u0
zIKTXHaUxO-U_||y#P%v$@%9tKxlADfMO+u1NJB5op-=yldM)<W0^v<x=u8;wq2I<q
zI`-h<pv0i5W>;%Aqp*Q|55|5<0fG^qu5;?g_?gYW#sUdFhd5K6msPhi%wC0TO27R3
zLKJL0JUd&2+gRhL?EP*LY{eS}y-AIC-OM6mqD7`#GBF^|K&4MHfw+iQ#u*0f|E>?u
zrFsq*iJ!mO^uXiezj;xtOD1i_iLb6vgdFjAel$bAMcCzc=61{+1i!sp`B1t^gc^a2
z{f7|?hUs+5+*C8cs-pWwM)&rdS)*V6hf!_c3s%`pW{bSjairgmuRLmR_Fh8%f)k$M
zS0fT0&ThD+dERAPaMjCRst^D=+*@oCDD^cq38Q9<YaPit58_3{wBO3nWD9(t&pJuz
zGCU<aI__pVbfH3~>$p-6=iRU@o;j8sEyR+|I>oD0@6a#kj$l8+d>54gXWE;c?&^wg
zwlJ+*D>>}5=n=tT&R|~xK|{?!oxJl=cb?%!DLO7k$r<~LvV)Uqe`+{T@MxW{9X1z(
z`zTXnJ;RZ?OUN%yc{Av^gcNI>>l@EQRLCs^QGIhRd&hr(_P8G1>uXiWLHh2^t$l<q
z{q-0?P3;943mw8`ADLY=XtxxJIppJZJ;cqgB1kk6RJC~CrA!Kstm?dXO^_WuSj?MJ
zDbi3AmKtj)mxU_lvn^gw`*7#AG=q|!_I{|wNelR810HVXkI94SYN4vmE>eGXdtUbn
z2u2-TJag&sW>86`5#(GwTI}_`h~VCAo+WXpFYj<Di)D9n>A9n1%dvmR>0_v4h!SRP
zktoi&Z8ZtiC&p0Lo|1xn=wS%`CS%ZUt__lH{Cg`IZF4J6zHq_ypk7j})=(kzm2Yja
zbV@U)^!mu8Bos-CqHMk7mU0s^*m1vH8|HAjWjg;4Bi_JF4XU|PR+y(&ZF$Y#;l8Pe
zh_n)-XPfQd+&PmrCyFeL{!=OjeMLavbCizUN7SNW<PHQIoZu3>ar%bg*|ENf98~u(
zThv)C#`s_6YyG_NK{p;l`*y+LCWdku8n`#|&FnULY+2F458)F+QsV+=rD{PN9@(SD
zIzsi<XWd@`TZ$UMO~6b0buO6Wa0pUUG<*+@PyD{Iy`7*5gEF-x$TNRUj%Cg!@N+kv
zu25H9^Sc%+*Ut0=THGI_WtvpI8H#=*HB<rq&0TnbEn`dQ-HU-K4&=rFg^T7Xzj>Sa
zYw+fdw6;cb7`I=K$RhX95mzI5q|BqC@%@bds9*c5)C}#5oX`!Jx%o3tosz|ZKX2(#
zQP*|KY~d1;VB^5t2c(a}^Mr*D#uvy}PdOMPY#P2Q?xpu`(*a_5=gCeBZ|9C084&L^
z`Z<*gV(5%i7u<jB_Rpdo2EA(o7wB=~b)ydznDTT-rgk)M4$W4p*M>^f3e<U_#=ZI&
zj_nFKCAcWz-=(Mp6wY+D5xWzWCBvHh0enJxP@eO$Nm#*IH4O}dqHyg*hCTiUmIJB+
zgtyFz<+s-e@a0|>#;jZ66UAA$WrrW>DiWO)Iq7wbW>Kh_HhAdhE64pW<*Xm&FaMO~
zj|;c0M<n(cnL+r`a=_JcHT*ve#}|}=9&?#q)Q%4R6%cSQw+sPL;zwKf$BtQ>AyH#{
zw@kv%;$J1aAW7g&^fU&)3WbU46_IfMah9q$<8ZTNbpF2C+S7Jd>+hN}mrg<e#x?1R
z8@uFTU~J&PgBmLQkqIf@I5#&8N`GE!3Fs-p)J2k(9%PH}cjciI*Yd5}@i=~xe!-N-
zVB-6tEJlB$CQReQywpro|A0eP2>oD~Joc9HS->P`$fAG1e;6+j+^ordULl?7g&T-N
z$!-<8hu2ri=v??%9J{)E-{gt?c($VR3?Xp!s=j7n;J+@MMHlW4-Qrg1^rJ5*wFtT$
zIP32=X-W0PO3z>YP_tf-@D45XWpT{sDXV@9CH?>Q+5g>a-{-y@i16iOEzEtE{+HA;
z6A$A+ScB3oog<~KGv<xNx&1abN)n-Re!4PPwK6K=+Gs4CQ9+ic!kwL1azYNR{C2iW
z%zh|unzAiMTHhjjtfrM<|AalO{&!DU<ChVAL}>L5(AY)dB26At5(Rc(2w%qwg`Nzg
zga)zUGCJj`gd6cH9X}GLtQ-dV`u|S{Ux~2LXiUc^VE4pTm#cf0ixNhgI16q&;0%Lm
za{2<}j#!pH@}t<)9yPONymp$t@7N4k#u+;9#lKOn?lDt(Il!|UPi2S^nBLoZvg8G?
zF|LVeEv~9Zm1U{=cpRSS5LB>w6LegWsfEg{e*cWgF~`_L)<nLE8gcT_ptYo~(xd{R
zw)t~^m8Tfz4guzP8{+r`1<a{!&Mf`?<czk%b~=Ilgf`zC?qegiU)Op{Xc9C+hMZ!&
zj6PHYTTidRW*c8s#qLEi$3P{PblaN{s!3U#Y(+T<k875oP;e-nfz(VFp8qtMY0Q&`
zN{*Pt(lO`^G%`BHNR)GA(%RWk7k9>k0SNFx>F(={+shx--u>a>?9+*^U?T_G<&ZZ9
zFvpV@xjV-yQvp<N(d{>CDNqtt&bx$^_ac4$+<Tq>TAXa`XraHW;_uy&2G7J>(B<S~
zK?`^#WFS3{6*a5c7T2`%b|zPkZPBe%c*7`gy$Jg|826}NfY@7cUopWqCpmnf>brgC
z+LO9{rg%_xtx4q#FFNC`SH5A5m{fBs1e3x2^e#r^NwEC}5&$bfl7%hGciJUze;092
zFuP%JHVd)6InosGE3S*_oMd<T>-F>c)Q@fvNd{3|+#37~jpEE~+ZA!)N4c8`ilWDs
z03t-h+6CL(8dHzS0D<q#%`pfa->okNR6r+JH?KDKsVmE>89b3bWilg7;U~l7ZD#4s
zu|DpvT5~K|`2;r(!4i)ZD7vdnk(LPkM~jizPJ^++u*r{>Q3q1{ou8lU{x061uROEZ
zX^G^?R*f*QV_u0BJwPcmbw7$4fG9L5B&4o7#@xF6gSKKn#z_OW31f^1f89)lLKl+D
zOjl%|pH(g_avd-#GFxe|t)?H{x<;SnZA!#=wF8p6|EI}d_xJvqxM6(a)mGG2eK;nO
zfMB%1$n*w;`j2})vLlB3y%oey(V@~}+QxmFrJd6)E%eQ>i(5PRdc9lxvR!W>^H*he
zT0^8k#A9MFxF&p9^;)40){~{qXR*Nb9|mI2N;}?8B)-rmy-g+oc7Y_xxD89+7Db!$
zKLwYFqZS*)06&vYn*cENDJc0_ct+mKo}DbSjo8s64nF&%VuGRu2Xx2@3bz?PA93Fl
zxANoZOpo_a&6h3}NxZVXP^`0NFX7ny<k4+Cyjz@8drfFZe^3UpK;a7RNE(;!cfg%8
zUa?P|BNtI$^^d3e%tO0`VRWIL)g?Qh=Fhgj<k1haVKr?pmz-8rnnoRH30%n}Q}s--
z#>Giw>J>lpiIAvah{o(alm!^+f8de5Q2mTX3^=c}QFv=oE`j|hW@51@>9xYIIkzR6
zPj-1#Q`3a6kID)_&KmW<&SPHLZfi$bas&aA9p|cklBQt=yVwOaj-RBX(tuPkC%O@X
zv2dDDIe>&(QOk^sKRlqibb1sJ*2P$_I`>hiX{I_r-~&V$mNR(q%Zzd^0ujM2Y1oK`
zbLzctxO{W+@V#g(XE`~idPlh)S_!bDd-s)iA8IV_S6Qcs?A`Ae-Ubg`;F&Ltb8mze
z%r80<B)mhH20y?zN9=3ReoY`Ub_zm@G=^mr9Xaxh4`wqYf+uddfp`Tgd(H=js*h?J
zenIi}W=!*rL4ejdr_EO8o!D*?eRQn*cBi_J$nC!!9`v#fAYMr#GQj;hJVliPaz}g`
z$w}AaL`^>s<Ss4vlO4#o?9p%Rqkq;%#s&p29&CgKY%Cr}86~VnfTO?!MKos}WR*vC
zH&<MqeI)<|JqENI!O*Y(DVVI-dh#}#&Br-6JC?Cw(8U9&q|N9GXX-xYC##zhovqV8
zb=<7+*L!=Gttr-1su}TiE+MCz#82JLn)AWED$i>)J&TVMvhU||0gs=k2e-~(sG@R6
zSsfa`(ER8sB_L0?>r(AMQkWpvKD)28!=TdBjb6h49H;x%$(HoXP?FiP9?<pPKPSq+
zC|y%M6+{F0!R5!U6OkK)22=Fly`;%-2JOt8zD~Ju6khGt?U!aVnwDVoEoV%uE6tAu
zEHxYzWh-_JFzr~Jjgfpu2CZlfkbf&b!jk$XfcF-Ga4)Sfbat-%^B=}kfQb2i?t+tG
z%weO@<o59GFv7}Thmg|HIPss!MfiUhAD?x;Qbn9?W;ruh!ULmSG(My!eah(<=3WWF
z@$i+7sQ{J@&_nk*e@at}V__j8y5;On1-DFjQFxe}G(FhR2n9s-<?!tojPBt@q>dio
zG-|)7br=-8<|mi{w>fLx3V25@Qa38;1#N`m445O{E0np-6#vPVa}Qx8lS(YTnZ`<p
zExRQA^&f^EnuY<jW_T4~>YW8~X2T{S+x2CyS{i}2w3&&$RmozqxGHMv2MgJxh>4vQ
zB|R~uAu(ppv)9{&@RGsUUw60aIKQ=Yhs9zY-P>F`vrg^j(mQVe{3t<CGkRED^;A+S
zRFya;1KgL)(lWf-H%VbQb2kg6lvP|)#8<d)d_T&b^qi*>2Mbz}LBx(x_hW;sUXS%o
zx?*c8M2a)Ok2F2@m$`DX0iP?bq`L2}{+i5d1Pg3KH%P!=%QGnoZodZR*r^g{gP9x`
z=PuMO*3Q|3>)FCAqhoU5%wrQLBs}0`(0=VBx5+Vaaud9Rxb&!VN$*Q#Ti;MZarO+K
z@vTgIokF@Zk&%f-rlR}e6=aPN!6vt4fP9wv;peBzqr1z><Cl(oA3F^mZkSM5MvrD5
z_a01%iB(fkXdeTZ5J|NeOKoI^DCrTA2oJx}T_Gs4z*)8mwqg*VV(PVsP4f=J$rcm7
zH!MXBpePVI#jExV1l7)sVZUE>C3_R!_bRekl)hpg3N+#LeNp|V`Mv4MzWbHf<Z!=4
zPSDx)=x*3c8ZQ+IrJrvUzsOr{fXKJE0c!@1x?ge&rNJ7$;c^0q_<2<ty~s{>p$EbE
zoE~BY)1oHE?7}{Y1qq}Smg}XcO^Ig2qydNXX?770%U?U=yXchyI>I3NdOkm1Au>kH
zw=^0S2pu5o?3QQF#Sht6lVYq^KUXyLXX%KA+@lUDQ{VUUYwJdh)5g1}^QShwl(bC?
z?4GLjY`-{H1F2$sbVjd6ET??MjN-BWDHy&#bsGR@DXwV>^FwIHarK10O$zz<K>ft>
zKQ@zxs!i4fXy3Bm_ZQy*BB<o7*JLI_ree}Gol_LQ1Y2yD{%n`fE94hAYarZvQS5;m
zC}DVZHe=oV!XTE@fS&7tbSvXE<hPW?cJ~{ktd0ca7cZn4YhRIhfRi?HEJpG{-%*0j
zrb5O`J60|xyuj4xxxv1r*`L?Id7%LEb1&_;hO#KcTKbI6!Xv&$?ddx0O!oAffD~4=
z8F`5F5c0ylX8CU<cmCN$h{-&AlOyiZ<JA^LR0B7j2q+Ue%7_W~j9xnG-D!p7<3wM#
zj!UeKL@jZRa=6DNC)td&T8a;+tq~*+N(78yv^^R(o98$qbaCME4Uz@$=b>XU`6leh
zLG98urDTG`@(t?i38^1GKDIB!ZA&IOi)R9P5J1D85Tgd(r&&InoAPL#yT{Qa?%J7g
zZ^w$^3?NLy;&tvKpv>0W85h@+>*Q&HaW?R_)*Jh*O~x8N6?UVP1(l@2IHt2+c>?y9
z1fLc0uiBFsG`Xf^h#~F2=Qk_gQwybK=HN=1mnDjXZx3c3yp>tfi8w>jY=I+Xs5)M`
zm#IvXjQS=2VVFv9pH7%nkPFf9D>(ZP<JmZ*vm9UD)>>@$XYUifFFN6?sVz~GEm!{v
z?J&c6<*y4j4+?yVkW`y?G&7~pnKP2SBXXj5a3+n5iV1(ebb}pRT&u1=l62Pk7!6|^
zNDbsiFm0Zp5fGoQ&S`Em&s9CUFQqaOzqFfvqu{B9`4#tQ%4iaRN3(k6Ob^mFTCB|S
zi1t<EaB%U@?dz5ZWJA6~9N1d{xdR$OKAgK_Z&13LKWXl6a7`iJ3jSGTpn@HZA1s!g
z9gB`hp7(3vH)MM<+=znhjW>Pzdh?Jy+H>M+AZWU%Lo?EosX$8R#Kd5qrJC7&?uP8B
z3xDCd%5aAB<VCyo8Y>6bXa=bED{}53q<;gagBzkiFWy*1t-a2di1|NjzaL?+(a>+=
z(R>hMEF>QPJbRj<*oSPGqZVPWxF6Fp+g0nu?>Szj(O;?1Sz>p0DE26~96q%zUTtZF
zcs2B)>Si*wWHibu!Bz?B8Uak_Ovi7)uYg*LY+#?gZ6Vx(FdTmJG+>=aE3Zbgi~hLV
z0RsQ%%s<TDJaW0SBwwp5-JIJ!Dk)!#zeTHOJQcOui`irdXE48N(*ly)C);bNt`rc%
z8MT0Vwsc%Rkq=r?p8N4w=0&~M-G5W1YpA#rlk+z!^DTEnKrAL)v0u%(FQ(74p(XYa
zW>Sc@AZ;+GUm+SnRmKjttxU1WBNHCQ#Srpu%$ql8jB<-<ChY@Ie7<%;+%@*Vkb*k8
zXyB)!rxX+5av67c`@Lqu70Vd!$aDj2*500aL$ks98W{Z(eb5hh2aQ?8S1Kc|U-TcR
zRbmLY@$r<~J#pxGvZlua((Ok0#Tl=uikP$;Ov=>@=4>EaMuyVU)K!|yX6*BCwJNVh
zLdqo*036eG^Foie?0yzPZuAhE9fnXg^^KQv4@$>X*HmZvQ!|Y;p%;x#pFRUjP{|d9
zL%gIQYgq~;OZNMjEFT(Y({KjZTZ1;&vJTw|pH{D>icJubw`iTyK5kUthQ(O;febdh
zjnhy0O=-IxmrWxL$o0v-vq_{tE7RjRfRz!J6X7Ug)Y+lZk2dz-=|05@ZBUPxaVwDO
ziT6Bf(b?13mdLaa{D-7?!~%hpb^ZFu{vEq5LCiC@Hu^O}oAy=5jX}?DtTCn~X5y6<
zUVZX${spkR_~|R9L05DZF(QD$AAvkTJU*J*QH0KZ0_xL7PrK$^rI&lys~Z)^N2|b9
z6#_j#;lmVNeC>9xWg~rst)U?FL!jFm(^D%w=<6C$T<K~$v6^tORosNhzod@y_+HK3
z9ieJi=b-AyL69Rr6k+cg@M(+XU(qe+xb?s<ohQz+f1cb5lb!}_el}Cs%0JXf8(2I7
zNVeL+q`+fhX}cP9HxwIjk+{Vc#gpox@2)<alkj;_Fj=fKdX7WcDKH&12&lLDf#N|*
zb<Ie9D^_3Un=RgO0XMKjudmDbmx+W83DmJ^Y(oA`1$Wm|gafRrY&6?pH-nce_RoY`
zgO4|rDjKpX#jt5>X|uzA&v$Mo)Grkgn3^4w`P(5r7W#Xl1z(VjQDi{T9LNxZCO0l%
zlwvyR>f#?v4a_mTqZ-(o(?DOc75PKB`*%ZRkTs7>Du2zGMA-=qR-DG6BF)!(%Qf-S
z>4`|UVC}F2ARL`s3?n=f_HnK*P9+RQ>S;V!?UmxwZ4N&#*dff>#$k4GAClUUhldX3
zG;#W^i5&B!0oaHCMI3?H#h`bm?!&Z+^9EyZ?!mj?-@iV1Xg&6fZH%YGo>co4M#siq
zrxXA#r}?!?RZ?OtG@Qzho7uCdvEE`-6S&6DX_bU+yAR>~`*IqgWi`EJAQ#3VeoY6|
zTkNY9r^E~Lp5!o=XI+LKnGvd%k>V05-}vj7+A+Lj?$(YR$)^vkz*YMM<=^Mo@MmtD
z-DZ_+VUfvzr%yJ((6!!j3~_(4EL|BpD{VC0dMa$zj1t%SFAY5cVmu@B0@MbY->Jz;
zrTb8tR4|`PIeHp%p@wkZro+>Hw5pu`F>ffbSZfE>T@@)ka!MN_usAW8oU(Q#T{zrO
zeaw5KSQ8rl8A4U9q0`vb68Gn9FT8c&r%tK&9BsAR)sopc^ioM0BQCw-O~Sm}A~8wk
zrYJ*}eOdL8lOFl3y7AGklw<j+Vqn#*+0>`6aE;C<Dh;7k31$|SR<ww5CWIo4|1g`|
zCc8?E?^pc$(H-QIhg)h#(&P7M#q&FC)~L!q(lh_=U+e%wgLja>wnLxfN;~_n9k)#V
zp^Z04V_FE)(L;3OuDBTS+ZS09T3QVSR;w&}JQC6xnbz<|q&|T~3wiVuzm@B~ZW@XO
zkuBymye*#PdiQDK30Qv&^Bpz+yXRRnozlS$A0MJ8>Nd=qtF|7UoE6lEqOj2&L-@wg
zcQMZ_dcQa^p4bF1zoAZ_;g#0(EeF|I;mwsyIc($XXfw--)Rd-5LQb5xKMp`-o|FUA
zA&jIZJOjXOwgCMr+~42knVj67xw{a&cJijeJs0_S^~Uw?$Mq1mdd@)QgiZl>+7reh
zJ<mV3>F*L=Mb@`OijA+edFJFPkwFYafmTOo&!O<fP|iwy?>h0nb38k}T8*;fSO4y1
zKK>$&8SEHLihZ!76nk$^q7`YEbO$hEugseZ79cdrmC6`qc<JD8h4sVL)rKGSzM2aB
zd2w)^>nT=B?n=C2UhSq8;HHm_%KueFAKL29?Jbr4AI2?N+nlKIMB;BiM}{wos#@ma
zma}=9wsCMS#nL?mD`Iw~q3XMIlvUNFsxCsU3Zx~18itdKMs#0}o(BOwlbEq=GteO*
zeKU?NkMbR8R<5e4l`-&VM2kYQv)Pcgdr5s8UlqC)(V#Lqj}|s8)=(`?(3p#uZbn?m
zRQ3v^Gsk>0Y+j!brVPW4rniU}@CV~+1)xR+mCbO`P^aK=wxHe6wu>13L0|7M84)`P
zxymnxc>k`Kxo4sRU*lX=+9(vJ)ZM2KHRzR#NIUgi^#)3yJJ{a$hAjfdQ`9*VYEC)J
zG+WJ4ag7znZ9<h2RLz+8i3a8K?6#-V6;T}a(|a=L^ub^sW=)|s^=_8q7`e}!I~ug8
zNodIrW_M4^3reXvR(Vg&0R>-fs%RB*ef5JMYqmx}L9X~w8t*X+vP3{Qmx^QX_LqQ{
zWQ!NH&PloJl$qkTg=<Sh3(edfqdB;)pc<^6D}BJfnbhJUdE@F3NFal{ZebHTpvUuR
zZaimPcuF{|<hxhJXG(fJ@$FxuO6nr>L_+Bq%3&$i;*WKG4EGDCMxXBf#XVS6t@v_~
zI*%%$bfB8^wz$o0ts^JY*i9r@ELrmro{Z#7^vl)lAOCsK>}s+_Fwbtx+-dN%K9sSc
zljrjF_uBNIj}={*(gBd169SWr)6IYUzSk*+Le@2JUl}S-VZYt4)pp(%aYbn_c2H~r
zXh)eH$#Vp&-6!P(Ly)X6wg{;t)W160@Q$HY&K3{!pKJoRmma<!D28j)0Dw6o819d=
z<~cbHA{AS|&h`u&MZI<%4Fw~1ioChWCOBG(%I<M?{xq~U;!+QJd5#WUnHlmXRQ89N
z4RyA#jhF3>R%ejN3-J>ZD`>~e&mq8r&V?pS{gM?}^TwnqqOw$mIgUtb#5mAd$aPAx
z-SQdj;))>97aY-0Rl8!`!a4ts`ifI_$jH`LsAPg<YbtUBpC!eRetm&*u^NM6rb}i{
z3MYVTP)n3M(?6}coJ6l)yh64)cODS{ff6z6-F+Z%D+NMei&0WmTmJ_^LB75T)va%C
zVJp;0pX*x5Q>nR<=Z2{CsQ&<H{{V>|0`b<5@ejk&rN@YLc$z8gGl8mEu?;P=4*ag<
zJynMtO@BxK0J8V(rQrVn+e6_rI<|;XS#BUJbEeM2A+d*y`}QFIqnhKCR42-|=z11)
zaO$sEyG!)_PmA?m+N;JtvIm8hTj_56b!iTxH`_GJ#Z;Eg(8$IjlV>bZHYrxzPf?2e
zU;hAtz4-gUpSQ1y{vLSK;n#@QPVu#-n{#JAnLI#CDx<8642llr`|_0}VEo-Wj>Suo
ztZmfty`!8Odf5D5pW?o$;H_p&C&XHH--q>Bj>#aqiIXIE1n@_=uUPQs#;IHaljVIw
zSD>o6zE`7N4p&C%>r{J2i}AK~Ao;8Zvsbg|AGBrVvMPP7l{ooW<R8MiBQ({S&gr$P
zJy%Qk$)jp6qgBxC?&BwxjZ7{1p&zY%8{r>^UIO@^Yr9X^FLVpGA98TF2oL@`!}B#W
zqX{dQ3e$#<R6k$+ntWB^glnxeExb=;yzbLwF2H-lKy&{90S3HN{t|mQq-d@*^Bky1
zWhAKtb;vy{&YT*0Gth+7TMm=N7H;6f5s2fv8tAm&70m`!B`Pt;%zY|3ZnZC(%<nYs
z6VGs}#fuF801@e4nWp&4YiB?s3P<T#$|%w@XRPTz8E&-LSLXx+j00YYrvB5HP;FLM
z1HRcSo>Wwgl~%N8qUfI<wB2jV`%})j$KGuJ0G_qz@p#9>nv@%3xG2~p?ij^l>B<`|
z4OG)9U1~aVqrJ7lJ~Om}c>e(F*FSsWC{91p1I7m)-{&=?S8^omakJ|X7CW3Yhr0~%
zSrY1Y`@mIP<kvz*Et<ABZFK7#2qcjFs;CJk@UFJ!;b)2Npb`%c>J1(<xLL{gcC8~G
z?!-3w9$&2Z8&i&QlIhdKC--E9l%K%Y6L;Y|n{2b%$~*nTTJqS<w)Hscn{|gF#EN@v
zT7nHA>T{|@o@1WFihC2gvFx4{{hjr15rrbqq7$9l^NRRO_Nn;!qkhZ2In=cKoi1HY
z$46*l)@Cju*)*x<EJ#jr-dPQjJM_Rcg07soWA~c6E-~hRapAi6{1lhruZR3`C9an7
zc#}nYXzpOTjot|(R{PO9k&iJ5KX-yLj(D!`R{sEkj(jn>(53#$vYj<T0>Un58x_eT
zoN_?gPadH3$potNKXvF#Q%l~Cr^;{t00lnRJ{@?3zU?Di)8#-Uf=fIFL(WG#fx+va
z@UNHC;*N#kui9$c;x(^{Uj7xdySbju@Cg~_k{1!Gx#wwS8SVn$WF8w(ZL9h*^H1$9
zJ0B~2IQ_6bA^ZaI9M`@W@m8Uwt4L&;CX;$f$Ej$WDA_sc4SnbEhyDx8@dLpAI)h)k
z@PCEx^`wl(_wm|E1hS)bR&{I;a5%;|99JDmPA#}QUvqfb*`M0K?8*CD-F#vARpGr`
z#6BLEL)NeCBDlG>g~W*qI_?XTgTNy>92|=KHp5VlQG`huB~PfuWf?z)TbnrPa`i)T
za~+%yEYd7dD9byX1s=JpB>CGx{i?hj;$Iy;gJ-CTWgjTH=^MBALwEZ0uXWZuJ!Rqx
za~0jXPK0BTT2!SfR#NI`O0;TS!=du$jXz?a2Y9+ikrw8{QgfIk;C=?aZ}B($6P4Xq
z>7F8IAHtU@{Y6wOIPR`FQ;fCQpEP){{t5Zxy*Z0oMFsi}o>bry_!{}=#GkW&j(jE?
z?S2`)C_1!p79W_dsMmv5y_wG}Jd@K?j<(V@jUC8VzSG}7anY9_ooL)c;v2Ykd7}M&
z7^y#z=8kAy@>cT~B-V@WIa}kXSOzoclR`%UmNK~fs~#_i8m5;xF<xClM?vPbT8w4p
zX56Ct9nO#YM)-qDbsyR?FdYkwpU%Cf!=JX7i0n4T_qO*5-aC-Z{PS4P3r*^kjUkAV
z>UzDe$L$Np>Lb@YC#B5nIhHMmPv$?ZV{1PJ{vY^|{h}wj(F=9|07o*Y{{Vp@IIL8v
z&~{Im8{QR{ytVFP*?!9Y7u6&mVDZM2IsX8ja$SUP$$%oeOApwiN4g<yHCWUi<F~m-
zAI_YyZFJO8!_#{+Wd8ucH}suWHfs+Sq;HSABtY}{8uFhO{{X=~yiMW7X)Jt0rre<E
znOP6(PB_@h;z2AT`z-OfJOS|!z*hz^_SeY2!Wt>RM#-)N#X9GR?jvaRFAduR({QvA
zpZs?fv{gC2XuBD|X-#sqba@2+9Mv@gn5`}$2dc*8f%tP=rnBIUTGbiNt;;W5v^^_y
z($K}mQrGZ5Y(5rz70@)>Xx`?@WjF+uT;$i&%X#4+2wDdI$VO!yp$5Du)SQ{^a;Pm2
zpZ+3#*&0WKA!V`A$dG3rxW#-~tp5PPMm0$;q*jDO4snG}Yg%|`Q&}^brG7?vUy6Tj
z6xShiogKj(j+ODJkA5RV;@R3nh(vdHb6u2h-p$<Qt6fc4@mrR|9ASw$$u)~}7<T}W
zPCHj+j#TbgT%rJafCoyF-N2NRyMXKk7AYM~roP&H?ukl2t#y|F02j5(RNDp9uh7;~
zq@}rWsN=CS{6g^tv4xiAM?=`Pbv_XBP5zarE>p}UvO^GaS-NmZq-hz-_h;!3!haBI
zJ|VP3YiJ4(2RN@;@n^wA@g|<{GDQ;=<6;W)<kTg(-j_1e{Qmfv@EG`Nd1SV^Ao^z&
z`Tb$>8^m9*U&YhojR;9|;Y~tdHQNZ!5xG1}qp>;s`0g>aS##6pOIVv_@lLzLN&B@|
zFQe)BpT6D<_}$=t+iStGE~#{<?Qnq>qaQoRWp(e4nd&|IS7rM={{X=-ygl&a;>Mfe
zH;i6OZz-D2?Fexh!NErAzK82wba63IP41S5lUEHYb!8W$y`;Mzb$odJg?<(O(z;}j
zc)P+jS5vqk-Ng`%^XrkpKI9twO8CS700z}~M^du9x$qy3^<NHZ22%FX%Mx5f7X##I
z$yPk)=2sZc-853hX~|i0E|ThpJT;#+Jv*-F;K%KO`xyLL{e(P2Z)xIP88!V5b!N8J
z^s>wtDdaK`8BZgq!R$?Zk)nKCx4n^4DVixk`H}b|+PeAdlin|9+~nj={TkgK)u;SJ
zOARJViLN$Ai@Aw7#dtNh{1g{b@V=*W9-N+J0!&2N#{#jfh?ITUn$p8YO6>Yy;aB_>
zi&xMu;x}SKnd+=~uhfqR{?*<T{jfBH8?+Jlx;XbkKF}KNK;}07^JDIwxf^?oaYn48
zE3>WAjkGLU=&2MqW(TL^o|V$ucz!uf)OAtDKf=42%8jV}C;}E&1m_qH-nFCB-ZO?J
zk72vhgHlq^=`A$0a6yQHfHE67@BS6p+W2{HB~pQvM@}=0bu|pMdLEnM!8X#boG|F1
z<R9{D((JTR1R(DO90Ce-IO+a<YY7`by!MmhD7#Q73)hp+6;fd0*t3iS(Dcuz>q#JN
z&TTQ~olzt#<?seGl6zvl!uVbLBVTGwZF%Bbuk7nK!!4qx?_?h1_(AvQ+O57-ck(4G
z`X6}sN8!em;Tw3M(sYRIAybx-xp_XV)crGFz_JDa5zS#aIXzv?BCI&Xr;spf7f|rs
zhN%gP>cZaYFYe0<u>6fmla8s_Z6~?nekuKxd<){x=4}maq(8@NE5(oa2s?jD`Jcr9
z0Ps({Yi4_o4S0^`#(t|E;t2uv+_)q1HPakRYnGzA?qcXG-Y(4XjZ01VnebY16xWI6
z=Ml(II=(vLhw?nv;}7lM`xxmzwa>&`uNL@*_UB61rngw`A5U$u+_Y=9IUX_&NL()j
zWC|(MrO(W@ze1-viE4gb-2VW<9gADDLGdm$y2-$oNni({$Z~7uui6v-3E|@Z0NL-r
zQ}~d0n@!g=_+3Pz-JKml1P0pON3bOG(;3E+qaK$;#<F{#pB@&m*Zg;`iybz~^H#o?
zY*=jId6<myLat4H1FHN1@%Ms!O<@(!g|&M~7G+kR_fD21TsAUUmjE1RC$XhZ4O(jO
zi)*6^)Qog)$E18#_*1W4=};tk3AWUn0X$w{J<lVt2N?t$5Nn<NkH2R-zmFdlZEZwq
zx@DEjQfhu{<8)!N$UoXDtSd_JZcCY3=2WL>y>Das_wa{}=J3m*N$z1)IQb+vABBCV
z@b~u6o5IM6JjU)J)H{$z=UmmW{O<A5_cf(km0CyG8dvSz;6(7%&ZVqsYox(#5t3$@
z^Z<UR+P|J3j$iOst!MVE__r^Gd_8YIo#6Ml@+~8PpEBU*0p!Q<oM+K{`qWWQGhFL$
z#Hy`I50&nIfX%6REA|G^ZEyTtb8q60iB}OUwpt_;29C!g<#`x>hrjTT;~!mq#^1L{
z_|0i~4~VCQZ^1GvLZLukK)!?VKU(RndhvBTd?@9n)d?zn{w96#2gP3w+%Q$vErb66
zbjks%kMSQtiyQT8R0q3E1$o@@Jq}iGSon)i)f5|R=q?BSGnHHUR=(vcoPsKpli7u=
zV_s?6cA|~v+re-<hKx0N?zQmG!g~BK6q-JlGajof3O`CY?X$4e&yD^ke$6(C9H&U|
zWtG7>AX{ouLVqlgU!49r_$8}pm(m-*2kLOcoB${D03TZ3jaK)Pxt&^SOGJG8t9&NZ
z5_Wri8&Qo1_o62i!d-YjRJ6%$I_fqZLtD4_S8QtB;++<{7_eF2E3&*#0}h+iuYY>l
zw{1$*@RtoAy1z=&%3Tay;>vgb0BfC#O>w=)8?&G1Otx#drXF3$1b?@-n~K;;yXwza
z@b|?}8hBw(_I9&*7y}?B!C*fOpXFV=U$%$DoiRjH>kl%2c6)SiN8&4;;b~NRS(_^L
zY3%eUUVhgap1Bh)r>59W<Z|n5tDk-ac^8SkERAv&SgfOfo_}^W{{SkeVYwcULCX^6
zwOXD>HoJC`hZ0JFoa7V5Z`k}-*7R|R@Aob-wo$wJ*F&WltxOe3LESU<r^7$DFM(}r
ziZE9SxL!vU&G^su`tXukI>BoktVbO=uK{7|-qt;-Vj;cH&ku{=wq>`7B$6v#CN)#Y
zbIp7y;xCIwT9QL0sv##lC+S{|3_F6=oE59{y$?FM@ia5cOGW`B>6*xv`YD{1kjKYk
z+Pc!Q&wG^3%83aQG5Va-7V-B6GGK}UGQrhZ2_`^Cu4>F$<A>TAPp32tL8?hJ5=RvD
z)+C9B7i%9=OF`;NJXs`aKw+M>a^J=B77Xvt)~A&Y?CkW<in^YJ;jJ|ZU{U?oBNgZt
z{{XbliM*j3YSZoYFO!PSR3R<VO046vGOqqGYP#Fvd&wte9nVVVb$=8lv!+~GU)!bC
zr16;MNf#m1j1Ydb{ftt#KviU<q@Js(@vp-#h+4nwUGXgWHxgZVI`UoUq~yXo<Nc)_
zM{&=nAJr%9xBG4+ei^p7it#TjB~Z$xvKSH6dRLhQ>A6yWW&Rxxqs?He#+GAGYRleT
zq_;m=J{x>x(LN~JE7)8rT#=Tyb{QW}TJ>R-IUE|fN0r#}BPAttWb4{3hl+H`Y;|2e
z4NAsAi6OX!WmX>QK?c7me`w$MB45C-+8r)#V9<|+wOKMn)|T5sx30s-;gCJ6YE|V+
z-QF*Fky4aruF~#*IA68r{2SfztKsA`!QhQj9~*dXe1|AD%>W;FG4*Wp`9ZJeZ{r8-
zqwx>m4z~6lC-AlYn=%p#&ua0L@3nw6yr8PCdQSb<V>rG~c6xdDJXK~8;U-fYfZ(eF
zF<rlb{vqmq1o1VVr=(rUZ+8T%BuyJ&h6f|{70lMQX6f5he_Q%iwr_1BmPpklaIC|h
zl#!A?g1VbsS^z*HeqJy?LtXwy4(Cr{slg${k&U1ZdSm?LS49T9Wf@j@RFlT=KqLI}
zYF)}lM`x;8E3qm<vChzQ_~YtN=UrBrs@TU6!69Ef1N8p@>;6>|xoGvz4C<O?tk8+K
z7eWJb!*kO=j(-aE8($P??Glh#LxQIyaz{h${{Yq<E1q}0hVf}3KjAF2S)@cN6y#-x
zQJ#MuG5FPeGAX=Ks>Nw!zi7CUKo%uJO9O(ZABpQiPpCJ2kF|amXnq*@Z!~v0&ZlNI
zkaD0d;}_Gm@Ai-22U_}zN%78;cm$S{B%A*Lk9OkUQ%S~B+hSEnCu6jaUA72aqyPbv
z?OsLUKaOeQje6$VJ4BM)PEy&SmvNph(=YJ4`haphI5bnD=A_=16-vquDQk1vG`()m
zTY=@Yoo0<>F_vHN4x+U(dvYr#oL!#g$*C)?g~)FF(ULmS8Ii8|e#^w#be5O)$#ri3
z0C^l{z6JQp`v<||WR~m08mm~($rhJ?Iuqy{?=Rz;+Kpdk_0<{FhdR@9@^9j&!Y>ef
zDAi4`h&1VJSh4ctWZaVd9B_E|ua|x!_zOn(rQxZxonAO^Z3*0p<NaHVg<yLTn)MS+
zU23`>Yf_8XMp*C{?IEH36Zm~+@JqltU9Z9!R?#K9@njbQ8TAPf{&|{F%d0O@oUd#J
z+h3Vq62ERAivIu({9f_H@q5JHDAJbU(o~ySmOr$?oNrYm<c_5eBoT_>l|5fRvt3TL
zE@h_Aq3G9N@K6mO;`WE2_;bX1HjAy>PZ$tQeTx}vTRBnZ#sQ3O86*HtbIBExqj*E%
zhwT0PT4}nsgyd)N?ycd^F|OjiYoycem8A28jtR!#nHlIEPB|vE_RgejKY6XYnR0tQ
zBc;#OICW<hu}uxiO>HV~hFGNzvM;DLEzR(j)=6GvSkX&6F#`h}*3QdPBHXk;41a82
z+KTI2@lLJb%@<LY?$SvSBt<z8?HDMy>R9r}w@${qbKxiLHFf(QOQ>Gy(7`v0E-e})
zx{*?JjyV(tO{^JN85zS2WSzW#3bzeeb33E55wfx3ejfd-HH*u~U0V8E$0y~QSqm`q
z1fINO75XFlA%5GlcnjhlojjKZV#+ruZWwnTk);}rItryL>VH$(ZO@0iVWZk=LQ^HJ
z)GIV>hm{O6D{(v#;muM59k+<y)<gUg5&df}cD1$9(3D>KGtYJZ0D+qFN@dY?1-O2p
zplyWyAlE+*zww*E3PLuh&@W<4qZPDX9<sEwW>SS%JHg!(L;GWRqfWRH>)LA0<A&U=
z8U1Uy)4yq*3&cb*hVM_hBdNF!GxRkQ!t!eubP>ci?#)@9EBs=;SXr%ZmPqlC3IIRx
z(fw*Y6ZV!}GVDdDT+0J7<oV^)f52Nc4uWe<%{{H2yB@qeQwG0eFZ9_gbtJ}ELX8s-
z#R>la&}#<A;x(SPFt;|dwaDYja~#?K0KS5?W}@D!rskag05tlVnw^G`cWA>@(5ze$
zlDBrI7W~C{o~hwag<6ENeWOR3&P?)bFE`-*4>hGam80;xuEb6-e-b>K#NGk;WfHWO
z8vWcY{{TF0qR-*lyej7R!CF<@L2#4IhmSJfxcVCFgzHUhW^&FnVDI=IiQ#QG;l=E#
z@ayet=O4Sgha>YCuDiq^5BxQ)$Fj!$+IBzl%IqEAfyt?Js~LOB#YIw-bZ3}qAG1JK
z5(j0B^ZVbBW9yIUS+f4ldPH!sxx1dyQ^;jODE&G8D@BTZ5f2L+o>AgY3u(R-l%zV;
z6XS#CLnKDBbm@F8G>Y1tk-G=)HMGnB0M`9$WaTAz=**go9i^&2JfZPP^0~RlBe$h8
zPZJ4u5bPJWd94~oH)KY3k%2BBJQ7YZQM&^nD&Q|ePQh`K%^ZlR>Btxu?^*984&;Re
zK*cK{)UL}5<o&=-Mh{xelHDaFtc;`UO315~TF5+$`{F_EoYmMMkrV+bABRd!6q%&*
z6CMMMcB;}A-dk`qtzfwdxLh$nK<R^5<GhYi&nPTUbImIa8h5(HTBWtDGDe87#!(tL
z6-xq1<bVqvdYY>Rlx2ZX_~h_9QclG+a#JvbmE2B!$f%xWT<w^Ho<?f)A>A4JwwrCO
z*)_G|M|T5q$tng1-xWvUH^t~a9C)_#K+!`zm4Ym{kq0cX7d$8)!zA|pob}@ib3NZv
zrj>fG9>V_R@5+9(d?EdzZZuJCcWZFV89S7#^!#h~v*1VVp=shvSS@v_1Lpy5JCCoe
zbExyHb?7c{XDjsTeg6Qb-&^YziE(K%&kGEOQ<|NjA+wA(sH|GHjOkA5=$#y~3VE*(
z{iM80;Qs&xd?42~uNvvLTE2~8X!FTud2bxvc~QbDzCmU<1M5x>N=e5@&{J_yZd-Lf
zmihh&d>j3`w5YCipN3iwfi)?an%VRij2l&t2<JOlh6g)GIlvXn+5Z5+20SQi(CB6h
z-AWseIR)hJ0dNQ^pn_EW2m-yFMIU68<?lYPx#i*U5~$oZ>}-5Z_&wu4f>Q1AH-_)D
z>u@%u$&5U1eFUqNKTPJl_fPR{t4Iuhs&&sCb^Slaxsy`WGoh|mX&pp9BGQaS)^<h%
z1x`4qrq`@ukO=2yQJiz@+Z2;`)E&APEqq@Laj0U%t1un&#~-L1d)Im4-yPXmfM<<v
zP{>XQ#{mBT_324FXgIW)>~<d#v{$hTu^28nT<5QFe!SEgkB)6Dncm&mkqTvBJb{jQ
z`j6$_u(M9g-s$XjUktTd{{V^}A-2)<i#ODDIXF;*0RaRvG3=w)>+N5sa`<K+fF2Q&
zJ84U5^29`!E5Qrc1K4}@rsH;_)sp9BbMuG9f7&-vJ;k%L%JZDDVU+`?;gWwUn@#w^
zd+_62jzqY5Et$5u7UMV>Abxe!<79FtcVqNl;lIXMJXxj1ac^=Z45M(*BE1j8KMnLK
z9!t9kWYX>kki#5vH<uKSKKPF~2RJ-n98|eDE5&H{K%%DYE}cj`X<?{XcrQzW`ZlxC
zG<nwU@_PwOwbtB_0*{-Lc?Z|nSIa&N{jdC4q1<2UvD#ef-w&;oo=s0xXyTR-r0yRt
z-}D0+Cj%myrwY-2zZaiibtg(o({Cg1KZW14*N6Ti=vqbF%l(-yqYs;F1<?rZKi$tf
z5O~i78u~IRmP8DU9S=edb6gcEx^B$xr&Ux}Tas?{rDq^y4Ay3b9=V|D-Y?Q-vDB=g
zzq62HNG>A|t@s-Jto@?@0N|WZUE17go&aGS<1X4w!|?vd=b`p*UZT2i_5GXWm%{h*
zFs(&YS6lQykI&ot;|w40kWJvL?K0~~)%3fy`$NqalPogehF*CK^B#H}XOW8d*TFsx
z()>^He?qeH&b1)$vDDJW^5)L$0~AjnMvzED4XA!><B$z)HsvpQZP3L>k~(V7*8cz%
zf59)l5Z!4~-*|58SiR6~ZQ5(=xvyQwL<O0K02#pSwfP(3uh|#JzXyIc&829XUFN@J
zvMwb18q852=1-Y{P+1vSTa1PtxT>8sFX5|p2vxd#=h&Va@CS{XSF*D3Ux}uk@rnsF
zxgPS?YgrjV3h)UT6ySrOF9aV#GpF&>#9tjg5cm&L9xl^-pAX?-n^SqBNn$QShFz;1
zok$sIA02bh(omGSt)g8!itxJb&(6IY#Trk+UkzSsmeM}0;t3=%*~uaeww|oR``($s
z_8iy5y040EHQV_om6}<di7lR_*BsTE*B5k2V{3hPaET4PjU#l*{{W4B6Y$63r;L1A
ztwn31>9;rcir?z3VR?%Ec7uWSq@dW_Kd)ceqvBq_@XO#2hCDyw7-4N%*4(Vyhs?Ql
zV5IjT5G&ZPzBAeC!)*5U<Q(C!Mm_6TP?Tb<%$;Q2tY=v3cXv|n(eI^#UcxJqG3nO5
zFHZQ;@ngX#8V9()v>(GXLQsFL5~oh4lhOAC=N)0O&-kbIsk`wkF9(SHBWX04!#G13
z9;fuLnl<kcSlrGg(`}`(W1Plh3<YmWjH&6(bZ1topTw;Dn*JI1yMN)?!Fw2QBT{%S
zRJY<Q>7Nh&(w-R9?8G|9h1d>^e9-v*wH0VhzGyu{mLe-jBHhP{JQsdieG~0kMZqHm
zDNZtL%=MPn^&6Lx&s}+xj*{Lm<LKEHF-<$vTK6@RQeV4v@;H0%8+gCM<cT#I%p;sF
zz+w4jx_=A))i>G^PwfpZElhuV?h-$hX(}+9yfkJir0KnNJ$B#rzwll17`0Cb%@{m0
zMiswG=C$2N;WxynL9)KM(C(Y2`%HoO0xKB8y%%-wBWG5PRcR|e=bhaC%$K^^d2|hO
z*Hwsg3JS3Q0Dzur$vi{wv&6m<n8iJulJn9aPCp9ih9)!7==&V=!pUnLQHy2c9cRJH
zP~Ym>Ql6oAsQkSuSpGh1dO<C3;%~Ge>Vy?Pk>JynI7?f6#GIj}+VVQPe~a;W#?6-h
z09?}^L;nCQwHqR*>Agqwu73ByAKFEww6U?gC!m7=0E6#?f<HQyKV<EyMx4IYYi7^R
z4Ie{-_2&{@LvCYILcT|t{>UH^pROvCTd4|i;d6`vc&?oeXMM<C*`-ipk-)(u5!$Nx
zlA>fvT#iWfqQu;gT}vE+kma}|-l1FRQAr;!a0hx?k3k;tSlkVSf;cC&N^f08Jg>!h
zrFK<`lTwdqC0LK8T^gi00E`~AFEPC}MeA$pWI1NSfs=t+kV#<pEZ9BiJB?V=nQR4+
zl_XR1?J8TIopI^!T)g*o%AhGwaC^|3>JHruv#Q3<th<Tz$6w028x3UJ#2;=(GlF^w
zZCsS>S-RGeV54RM?T(d=E$m_0e4;@)-HcF>IULW8JXvGlzX@LIx5U8=Q4%nDX2;5)
zcO>G!B>oM4(Kmk$J|y1jGNjj$>IzcyADERVCH;uW<2b=SwZn?{+k)thtUBfQo~PL#
z0zYkObPtHrTIy0n{u#NH2m%s*&Pm33!Q05l?O(gz0r4Hwnq(LHeZij9u*%5UAEhd3
z^6R<^i7k)PzuEWpveY~<sT8xfmM|DG;=fov9sbaISB!1r6Uesmo;L%*Khmmj_KNFu
z_>&5r&DreFeu_k$7D(7Sk&w!Bn*KLG;Iy9={6VICYtYU8%&Dfm^Ft(ij@8PQRmV=G
zepOgRuPHs(`IC%y<c~(rlzs|+&{h`K@!836u$16)j92TQ!4KOJ^u>bO?&dv8(Lf5`
zW*rCD`Wp6>;fRkTdY(+7Iy2{6AFSUEK0o+x;tq`3b;ZTK{hh)Tp33<_5-IAXPYf&I
zuiBIT31O%Bk#2lJ@U$#)x|W+jnq8xwNr}(?g2x_&a4W~DPFPx&Yu#tBN~Cc#^xYqd
z{xbM;ec+vK^vzn%<4n|Id`)k28I6}6at<-lu+q&u;UKucQH0#wfJJPYkqtGuvu9{b
z&5M>n&z3`s0y}^8>vUV=2$x01(s93$o}7I#Nv?pMjjM5YyeeJ<`3q<7WB?96yw`Q%
zZ7W{!rn_&X*iZJ`>&ccFB2^zbV~*aPdF@c*in~9j{{Y#u_I%R6XD^3v+klrk%&{rd
zFG>JqZs2+-JqPnO&iqHvpT)~^?sM0Z+t5}N<;^!HX<1q-C+1hhe*|3U(mO_21@y0q
zd}kE$PVFNzu1*O(E2*QIGjHKv#e1)Zn#wvz?PSe~qtD#;`d8|&gMKQmtEa_07Xjm8
zp1GlRCQGU5wm%dmvRo|053PL9@z20|C&ix)Yj&ak0J1Li7?mZswipLvhg_h-pP6~@
zf_bWnP<QD16De~mK8NQg?GNGq0Eil$)vl`~*0bssmdmDS(dj|aVDk>voagQxoOR%k
zK^uAQe`inlDL0Qk8T>YzTG!^&?)*2S2D812S)_ZHnlKcCPE@lJI{NjZr8PCVROI8T
z-2I~XDf@l+OXBZ^bnQjbeJ)F@b(_hZKq?qyWLMX|9r6B;;<&?DU&U~Ly06ImD}r<-
z1%1)m3`Au4UX1FCfs#1yUOVwS;_at^H1}eB+nju<?@Em~R%$4!)fFf?Kau!f`*Hj%
z@Q3Y(roW3XyengI;-3wt+8X&6Yt06B?PciUO9C^T99QF~#9!GT!n%LN8<x~Gx3<-7
zu0C^Xa?!5!JTTgDLEz^YAcM|p)oLjyZ)43<oUb>b^i9vkA@B$GaMY7dx0>qNPS&@T
zz*!U`#ltrQd0>N_*W$;-FZd|Oh@ks%(XXMh7ZR(5wS>8YYAOZu9~j4$56Un*8sx7x
z1d=zQPo1`Yc<CRsPP^c5jP2rWFI2c&x5t?wmnFw=anuo!^fmW~ivB%ozaKscYC2v1
zs_|-f*Qp#WZeofQfthi*9!DhZV!!}1>s-)xXH24&r{_0~yfv)&I__4~7*D*bERI<H
zrXp|~rZy5dKGo?T4E`5*i{gda+4y5fEi+?uuA5d7{pN0fVEs>EX{bp{m#J4tU!nF7
z!yRwoZ|te!Ref^CPm10tLVWmPm?f>FdUKyKhqxoySL@&G+y4Ls4b%K(s@myx9|tGX
zEM#E2?Da%lx%5vhLHcH!rB+Xtm95pWdsxMDPvn0|9yI>|f_&+-=nH=?qvTEHsgWd%
zA1#hDGCJU%wenuQ`v~efS$TBpyKA-TGCI^OM<=@@M?p_mn3`X~PZ0Q0=XBZ>cM1n4
z2J4FYU&1~vJ{{QC`h2$P00cU5#bs92HH*2WILaHN(luX*z6bGLskXY(Ai9){6XgTe
zyrTE^E%5&U#VOi-G9#rI?2E-sI@Ks|sw#BhRcrT|*Prl8d0hkA_=Ks)0pbR{r^KJ|
zPM;QdMmKwF`+MNIAzlOXe>&^>+kX-{zN;Jitn%;d-EZL?;*Cqfw)Zii<)a3^nD}}7
zSNuGQQVny%?O`X~W@v)}`c_q8I*Xc{zmaj8rS8pJ%=*_z)P4?pP_t8RnskiAfXWcp
zo%s9qFz}a(qcZ5`7+<RG+J9QYHRny){l?A^sJeQe9{9KRYrgOlFX!pz`rUtv?8$IH
zqYuE>#U3QnEMe7(rH!ORcg(7?L`VDuiTw?BQ>x{ve<PZu6&0`EXI(q!`()E~p{LD^
zg_1{1emsixPXvC_UN!I>k;{2E_T`A`5z<aS0vep*8mrz`eHolvrtcT0W9t6^4gT5R
z4}4^+Y2phQY$a|Pr?<yG{2%8@;~#~;3qBxQ{j$zW8<2i)^eecAeYTUI<y?!~Vc(Z?
ztyHI3S?+vk<9~#|4`sNP-%njy!t`hEKqpi9XFrjzCA0WptZ6g5>AIHW2ZfSfA&>k8
z>$(-2jjAJ-RAbF}Xnt&Imqzf)KG7Yrs_(?W@_hyeT5LMABPfw~vEv;pvih7aO>goo
z4OwGxgY)$3$F)ee2`ZK-3lq;BD80snm7_6~F_ii@`4yb&8xR2?XP`Aatgd8Kmi3h$
zMv#NMBL_I^+L9ei?%EmH@-ws7-h`|dzQy*qmULAJcIV~Vy)%#St*cKBUS7JacI?ES
z>S%gy2{!aQOD}@@{-{|a)1B40;ZHu5&|Ch^UML46OSoa%3)ZuBV7i+sGh|o40(IL3
z4KAN?7#xygCcNua@U_;Gff^@_gT~~+{b{MjTQX${M|5DNtf9#O{YdLlhPe;16KDq=
zJAaW{E18nV9m0|xGDqc_yKNghU>J8W>V0SnA0_;B)AcVJUg{Q?8ddCeHdeAVp+doC
zl*Vx1C^;aI0LbWT^0{nvD=VggYge}<5bG=@2?rVeL-MaaahjZ^C8O$gLC29K^*g@_
z_*U~))F6XRwhw(Qiw~9?87y+g9-IvN0h<1Rzh}P~Tzml0bo&^meL~VGg55_c$aDNf
zLFhT)dU0D*h0~W_gjJoakJKLt{{UuuNYO^C;p>Hwm}XmWc|+fi>0J(!@ncf(Ea7~~
z5HAH=p`zN|8MLiteY5aq_Ue5RqmJfJHV@;8kLz4t?f(G#JNPU1`1nJ0t6AMNK~xPv
z?bCd=41Vn4INSm11~bnf@-CgDQvD^PGo9T&Ua{35#n<h5`#F48{fxX<Yo++JO_FO{
zpWbNxAh67~+PqlGymAf;V;Mt+9l)=id?EW%>y|f&qfnYATxTptHJq;*U+!k<CmTPS
zKJ@ru`+fMM!}3Mt>Lyhf;zOGKN%$}S00o)xH-m&RPb)GmK0^C}{0((NzdU&=u4Ho0
z56JoHJ2USqpZF^8!{3j(Bvu~~{1IcW#usYN364m!{n-c1zkwCu-Y(Go2>d~frtrUt
zH4hF<e(koUW|t@rr<jFU52~@LSbIO+yT`NWKdifc_B!`RlK%k1KA9yAW#a7%P>h3s
zE~Jd(KkcX=trs7&?xJK4B-5FL1`;N(4@{5ty7jGH2@<Qp^*T)#_J6+CwL@<frKiOs
z;37+@DBRuo<$3oazgd6an?JI($Ai32s`#tKaf5kaO`V)gDoN$G2KV_%86bc;{`Fyq
zi=`cU>~BI*t1orzey?l#>C|pKn2*Rf<G=p^TDd!@hul%}4!m{uu4qS<8qQqK=a_ik
z;e;M2vvaU{j5=ejeqQ`*_$hIsO*DxS2no&yO6r8Um5ymHN950eyhCR;lc+J<h8;&-
ziuI3zUlt_LH6vj&6}Dshu*dG7N&)J9e|hmLDB}b;2Ohm^%r&2jD4Vl3IrXP<QnBQk
z*TsY-ft(TbuaJHxcvr*zJ%&hSR<w>==<e>4)q)GBOply*$R{VM<IqyMNp?G>@!Q(Z
z9JX_LPME-6-q^2W@PF+$b*0?KB)FE|;eU!Z#%V@;tW$!TKHd0r`*rxEDQee|Tp=GR
zx?nIqro7wZpT~Q@5z5y$nzgp@*(n6uvG3`RrBr1~n{F!2lH*cp(sxMs!VlWVOz?&E
z_?J<MR^rxMX_UX;S5l-A`5(fe_?xb1{{R$V(tJmyJV0DnBzHnQ0J5OkKO6uL)83Pp
zzZ-d#6=+KSRzEO*ZEq3jl6XaYKd5+!>1!l!BvC>`lOP1BbsU5zoPpOB+kVKuvxk7b
zC;rF&Gm}ryY_B{~29as6+Fs2Vl2m(X8at?io<fl-NK|q1ips2$sFAf4)DOmw+gssU
zct_(5`i+gY%_~%bJIhjug<mlP6dvG)U-${HY5j{oWzQLWVe!6=1+RpBN2_>hSqYNr
z!%vx`A1T|pz}i$k+=6gMYn~Buo{QAzoRW^eBlX|*<^762CwS}NMW&r|pxO9#-V3;<
zp5p%iQMI=X9B9}?R&d;sFu3hsnBTM?j`jZl+3)s#@HfMF;+I6%^({5EEml~9;M&V9
zi*Fjpr0yjX<|C)w>$q1%d#Ncw-%CFu3N1-;%hd9pfgcU@#;|LtfR;kwWrs|E`s?<`
z{t5Bm^zo<dN#G3zIF!RKuN0ChkG&j6&42uL8n%m6={t5Ynsq8!?Q{C|{jEMN>E0Lk
z3F3!_^;YoPNpBDb1t!`EQaXc!pQknWY4H2@)$tF8rj0Idyy!+Vyauiq;niAh`>l@2
z*Y<K&+o|^!f%|W0`qhr>ud^A*=VI;0;nKW&;?L~?F0ErL=?t;}ynw;8o}5+?!??@d
z*ywfCqo(J~z8(FlwGRnuD=wwsnCJPhSOTPs^{=%&3I6~ELh$y98bx{G%ZM-l%rYx~
zJXW=Ea+ACr{ET6WQPODoKSKWif}{8kQrfZ^t<QClaBJ1{zxXIG!;MWqlTvt8jFQph
z0r*xf6=S5LXs1qJ3oKs#)L#hvW*RAViy2&wjxc{(`HSM`!#{`r01+&wmr1^~5*(4W
zmxEBMN}R7|jh8Ido4NSu@o&KTr^6jmLuGW{NNlS_?SOM!E}8p7__xD&Yflhd##bB(
zNdxe&QZ(t;jpVL*wIwPNv`=l(zizJ{*jS;u)FZoqw%pAa<c_2Dt*gJ<9xsS-fvV`%
z6S*AA3+!sfSXk41&~`M2DpU7ld4GuXMb+)zO*y88Nc)b$L0>oObL*ZIy=M~5Y(dJj
zd;?q3w6u|xORst+E%%Nu^;9W#*7psJZg><Q%woAF)n>PB#2Oaq`>9VgylJGZ)3Jl7
z-mmW|&8}bh!OhIY*BD~Qf%UEHPm5k7u!u%AIj4vIdCcBokHND}RHH4>Dw2!QpEV(m
z%>YcHagy2SD^AZ$j`n=Xbrrm93vQ6$9B28}Sz6@1>}uM>qs`$<xuu%zbwy+rw$Q?k
zvIF<GIc3|9*bSP^YXh{IBnn5&a!90?aBXxZ{?3djW?_Iy+;R`nndDodf`fS(;0~1B
zK{3!r2K7}!JAA|5wCuc;oDzk~oRP@QMT$<xrucuvI(?+-UeG#%1_=DceHG!4i<&l;
zRGTD52OtrVSk$E{Y|e;Qj8A>==k0l<_;NI6u}K^^04V(H+`I|<ZA0U~64>ZkM~5ZU
zHA~4BD{FY71iK!C{PeClVCqTlW2!i~?2oWMHvAaz{+HmnH61&{BVBY*XNt--C%)~V
zozIRr3xnG=@F#~qV~>dc03Ecs^>g8t(sbp?2K9WVlh<kyxRK9pdsdVv#y69ivLdZn
zPfk<hzlk3J*Wq@&bp3RjY56h8yriIaQ|ay09tZ~_yq--zOSF-Ma|b|3QJ$61<u-Gr
z4bVQTq(TWWp<p}kO>%mcqiV&>XsD;42N<UnJA|bh99_l0Rw|4eJRbi5N`~qSTj+?n
zw}w%S5b=iN@vV`AeT*$5!P+i`eI@0Fm1}Eo%YyLRg+HZw)y1BTCx-23hU(<%#zHP_
zq_n~+^M(!^o-x5u`f@!j%7XX!pP?^?yj7}vJ=RxI(QbUH*9GIw7E$O&uf2VX;cwcP
z!ygy)SjFKG->y<{a0<925J%RqsqRYaXSuC6&aC%Cb&G3A;%kc;{K&uQn{q!2so)Qf
zTED_y5=VcgU%XN%D=czyvZ3mXIuLquLbQo@O#N{91LOYy1^&?A3H3h;>sm&i;tvYl
zv1^SJQ;B9<DH!qqZ2X0ZD#Mj085qg@o&B-D;NQOk{7_qsPvKU)z8}@HSv0L$R&*!(
zt8g<Sk7)#-RTNF7Eq)n(45(_f-am>znP1um_C5He`yBX?Sa{#U*Sd5i%G=%fTcfzg
z_a$7T`r%lS+zRv04fwewAPGP{2+vPyl@|wR@_o%4=T}F+_-n-?9i&UgTxPz3@aK-E
zi(yGlKDE_NoV6l**M~kOOvON$s}ECN(WHDqnZO2ee;VwBjyXd5o};38`Js_ZOOamd
z`#ApE`lrKB+TTXf?c}-C^xba7lTx;TnG8l8ZI@{O0AP@PlRmVor8si6cJ>M>#&`SA
z>BB?SVAXWEFD>R-p`8Q9>T(L2>Mc=9?qQ$nUNg}3qV7X?cBolYf=>kh07~;u75I9~
z#8y&AJZi*(HxX9`;_hcs($M^}{h>YpN2mF>7TDRz#w+s6$G#|o;kBjJ#O|t8jlA_D
zw|3mcHhiP4e%Tt-<(AyxLBJTzaMvHSw~F;9B>*7t_bL)>(W?Z16})AtxWsC6{?04f
zych7l;@`wZN7B40sA@`ahqtkn$L0nq)j3IDr*U&7r&H`73xB~rel|^DZ?#=M!^2i!
zZh7@<_}~gXNGBumuMhaIqxdJ_%x*kS@x#G?XkHrMN4;zJQ``|4Bz{#bQoXsZ`yt+I
zXrDF9`&amNKXc*5@rR9L&NHHTZg$=DEEN8gOUHgI_^qq>R>xG(zh_?@YSve?G*+|f
z*M=hOqbD#%Hz*#hf$vM|)m!&rZq4XFX&C%cUnA!C_;veN>sRV+{t#MtQo)!RC6X(2
zWM1T%WZZc6&3y%;UHnkfyf3Hte^%7LvMiP6^Cc76$0fVSp;+&TN?t#_LhV)=#_r|H
zg;i%!rEQY`0DuamJybPsbLam6h99#xh4e2U>ROM)4OV{@TS+cKwJtp1LEKK_7#!`#
zKDib8WBUhcUJ&?k@s~}u(CzND{{Ra~s5YIbTi!|^7T4&|NZfE0OCkD!SWQMLrK{-8
zBPQDDkAXknpx+Mez8>gs+FigUyYR1x<gmGhM94Ajc8fmQc}LQ}v=7-j*8c!o@I{x4
zt@Y?G{2Q%lHn(0L(e3QSOQyo<yhV_C+87`J00Q)^+Dc7-TbC_jypQB-{tAKc6XSQo
ze~o@D@m=<xd#Px*dbQ2XwySTt<}(Az%@UF`<&;9HwSWU}1d8E5W<S}%e{O9{!`A*X
zv(=8DXP~vQ)uKag(9h>7jZnBM>JxrO2>FLb=Bl!E=BAb6_7ogkTU(>_7g7HJf-OIR
zv>6A5ymoJ2dGc-bI}b0+d}Jq@gpA;Sa=vi=g1#c({5Acdd{28L-00fZg>-B4KKRv*
zwA+@^vCa#roZxgM3h1cg?ETg9GJ|rJ&!>Dh`$_7*7PK!C+1+2>U&|JvE^lrxA9G0}
z$K@c&<c}{Mf4f|H*6u+7AU?k+6`m2d2Y%zkTI<li7PoU53=~Fl`Qo}e9}!(dK^LX~
zc*35)<X1$M(UclY=x=WBHK@#TYUKgrk>BfFE~nx50m@x0&x{;kAFXE_M@t&Z-s*DS
zy0wHvVP|k~Sg-`t<5Otj$_7wQIAhYav6bvcHn}2`8Qw>)db?xeyZt4DTii&Uh}}uX
zEm@#al6Oq(pW^<Zb!4L9#lYlz+~il8YFhoSqV8T5R>$xyOev^rRO(7f%)y#ii<DL%
z9@wfX{!?Wik;X=AT^WmPvYsHhgn=E@k&O0YF;c&ZZl}u0dnABxLpF2xQsj%)!&8#j
z$q_|$F(rW~ze>-aL>b<Xk>8&6Ng-XbfzzZ#Vdm{#pL()nu^|X&!N**YR*<fFQPVt@
zB1ses{nJ`9w1(YOxOl<)xX7t$z*@7M!g3W<=OBf~D`I=;b!nPu<}=HHGVEB8I&x{*
zJx6wxx)a2KkODwB=LVz}LN;bBNbI?$B6Ni%Awm<8&J9Z*o|}Vg=K!CYm4f2RsAMdW
zkO|-ensX$G2x3$L_)@ik_Zbrc-+OQLuhC!lCijSZG2k!SD$82&4x%iKD9dRhjN#ZF
z$J^x$x&Huc8qTZbgEph_qx#bDw~n;m7uiK|XLB5}NCAzN!43{U$FD>AS4sVw58ImL
zsWP%`Ib)1{I#-g@i?cl>)RoVfziA)YbHo1tAAB2gV|}MbJCbBTxJFqB{{UEz{1R|E
z=-9&oFh}y8`%C`In*RXo{{XE@(nQz#F`1%<{b4JI9GIkE`DY*;?L9{-S$VF!Jx+|{
zuTIYB`3hT$vknAmPU1dg#%gF-&yO)c7$A|&b|aoewUsU9U^2(9J$)-WZAFlhBN;qr
zH1;JBCG67-DJ)N-ALmp3p7vtAxX&Q;%_}k87j3NWVa$%K=hGn8Ccoimb!^EDa#>$z
zD{&Iw=iGk~;*_DxtW;;pakl>e5d2Z_@=$Lfmg3z%<+LEMKZjBH*R6PK<6f2G{{WU|
zS>FRC8<qb6KJ|iJjM23vbKAZid_&Ye8+f7(XTy4kisC*R8MqQD>Wn%tBaBz<{{X{Z
zj&@%f{3ta&G_|g)XrO93bGBX|_J^waH*wdHb86C7Gm^He=6d@0%Fo5#9k|gvL#JBn
z+AYd?cQ$wMEYZrog;)@4^1Jqz{{Vs&d@cC=C)Iu#>Mij90K^On3klh#wvoL9b0lB*
z`i{sdbXq-Q`4*k^Tc3a*v=96f&*K;DeX99hDDcelX@&N|e{MvPPwBE%`52zcNPqSP
zc*lplOB`1XZ8$df2-{?eRVvDT)bb5!7t7|lF-dcOk?lHms^t~pY>#1GOddTND=C^?
zqpw=%=d!ua%XeeUJaPM1NoRc?o1{egrl%`xhSuNaXJho~U(%=i5hwl$@#2q%UMjly
z*YQ%^+4zF;(8Z!@k`J2NHyAEK>6Ii5`jhBSJnBkul)7xZ*}Xby4JW@-_ipz{hrs&F
zNu{V=8sW>mus`wa=aaN{Q_mfbPAY9r;vKG;Y|SmgLlTdf*{}etRC%?3GMtnfOXPfC
z@k{;+1Mu_V+e;0{h+(<8T;>~7=A8Z&`QPI2_$-~Cv8YR@_&dV-mxylzZ3zSn=RfYK
zC-ka{a?%Ry&9?W@^X2%3`%M1SZ9Ez`!)xst(D2e;+x?uVJvo@Acz2I~U~OkdlxiOq
z{wjDgz{oi<YaSttNV)5XmxK5kyG9?xmc5YDZ{c4v&9tux{>r`@z7~h#w}?I_>WaV{
z9|HJJX^Wpg>=_T|Ut0V<@E)D4>^}~_V$UD=wZG+^_l~u7(UAHR89PY)Dx9Zl#wsiM
zrTu@IN-4cv-(-EC;BVR6_PEtbj}Q1C;OD^W7U<B~KBIFO{{VObgx9y(f59_;H~d5A
z;y3MW;@P5aziHt8Hs3{69)Z_!$KhPlt4V7%>OZ-EUva!CPohyrr075JMDKw@<u1He
zW3T*3)CLK<@n4B<uL~bip_LE)^IvFuHvNiz5Bwh}-WT{`;e8HN`?Ff;a4Y`+-+Ol-
z&a!x_n?u}Pm-+5$s6lV9spCJjoCyuOtZcT>#yCYGK>RD<Cf98&{tjz#we%@>X(7L{
zUo>R8j52)~0iX9PwiRO<Q097^6)Cq?R@nJl#@`lnKNa{~PZq5S6Gj+*^VDX)A^t7+
zuT9bKr;=SlGZsl^-Ho*6S`u4|6sH$^A0XO%a?tgCOxjw_CZj7HEOwBzrH`Njy)#Pq
zqd$N?AX(_wws$%;&Zvt6!+jr;z%dOQZ9I>eRfo4V#@{vC+qu%B){k@VFZd}xhhO6F
zhHU&xZyxykXW@u%rVG&DTY{5*JJLh=*Xkeq5M%a&i{j_}6V}^6)NU8;z8KUe(&i5)
z50dB2i081xj)VTW(JkRGFVH^AzjN^?K>q-ONPg6opA$9BH%jr%&xCw2Z>h}{o})L3
zX8!<7w+?){L{OF_mBGX9=D$=v7hJ{r1z2fb75JaytFIPbUQ6evh_x8RF+doFF?ozm
z6#}#6n3KDK+LcOCrrguhq8gf-<x0=F;r{@%r~DPS;E#j6Pp04LI?k!%okvQX+}i2d
zP-yL*;Z&+S$k+r7o>zBX_4vi`Bles+mZkAGUcPg2;-44lFvlD=sg*%J%UsL>$iNL0
zN&(J6_N6Mx=#b$?No%`4<NcQGX4lV&uVWco{X=sQK3(540nf8wdkXso=iwHxk$I_V
z&ln%Vx!~5cDn>EaOR-g@DN9Xka2lSICY0n)Zb4oKR~Y{QJl8cn{jy_vGB?*X)TExr
zG@#by7uAs@J7mZ$o=rS>fg&Ull65)74IoXTx?e5Qov{Wg3la}+U*%OFQVi%2{Jq5s
zKx3lR;l^YFKzIQ0LA$oyornP)Gt!!3vtoUw76ar~Bi}tLyzdm5+irl4neR+nZdZ~8
zbp$Y1#!3;KRWz~XiOC1hXB77n(6M!<7_u4Ew`|ofu}TVnpbYf~JX5hZA~^#M7UDYK
zXB8N^5u*~jRCN_-8!bV73Xobga4=3qbk;XMAGtu6P&7@PWDJbd$vb<cMXUSA%B^c~
z(1nzTUY&Z1w{N5|d`vc=2L?W*_UlcdT%H?HrO>gNzy}9B=lRyO7Ss7*h}yqSlvo*{
zmQOnn4@1)!&-m7~I(o;SFpxbM)!M|~<=EoDJ4W1bk;Vl%;s`M0g(IdjND4E^p-#Z6
zJ#o!MmW^?fA=}txu}eTfCYYX4StKNmM$?Mq^^G4_{{V!aN7Qs(O`?|4Vr94Te9yE-
zMi~J9_e@qbqNNw9ttV+C^kd<7{1k7+z7+87#(@Quq<Z2(BswkJ&SP6?FrY-oppXE>
zZr~lD@snS-fACE|iJuT(;6|G-#9N8)WxBYPpi7qXXS0iU?!&mw{xi6o6+C)@!z)yS
zZ*#UO!hT2F{y6dN_lQ2%W#QYEw70g&z15p(jxeAz#2cNgQGpIruj5}ec+6;D7qyGu
z4C@lxF1;ikTz5AR{_9hVBrH>)#@6Unfd}SRLJ8YgQ))W(>W@q6lC1|AtH~~FpMgKM
zhwO!O@SDWf$)-g#HqjxP<4wHzrL#=n$QW@n88{NC<AC7~Gw@v2QHNxCh$D=SE7GMk
zHNLBJ!mAe-<S}jFT#Ph;j(%#<x3jejuAzt{1Qh97H*JVY`<)$*jWzHHwv4>+SmL{T
ze}=lV#0o^NGo0q7%`M7Q<t>WScqdhjh%q1-JO&5p-mvx0wcW`GxswkRLN#PXQWOp|
zj;FRyG}DZpj8crFxz7tlF2&W@XCou6eVgzf;V*^%0BE}z?DgLaMINbaqsrBxi_0?b
zPS#<MoB&U_9=%+mnJKh>WB%R$01Lh%e!@2m;wY^o@n3)*aHCMSQXb23;U!*!s0!l>
z-8d%|^OwNC6kT^XTmKiP_AY9VP`g%**n}#IqNqL6)~2XUt)i-CilSy}*G%nF6?>1`
zwTZnGGbHl;<@a~;<a3`q=id9CbKZe|)SQZc1~6K=XSPhEL(QT-m}g6;iKrAippAU6
z5a57Fo9}k0zsvK7mHmf1kbRpg54^-#5u>|@xYo+xYkNr(;tcuqWT19>h0b`{g{&M@
z0-zJ)Z*PM*Yv2Of?Pf>$^Xwph!8ESsZLm0}=_X}Y*pW-p0I+HF&C}Fp+j@D?bcL{i
zi6y+6Ss9~-Zc%TY^$su)+Nc@t+5WTA%}*KXNs_U7Wtk^b?K$;p(`q``rtc(W!8GZ6
zZlFg6Rw?4|DkF-e6U=I_QMjyMjdnR^(0TnM&00A_mtA#VkmZpcgZv}8Dca@xM#;gU
zn&?7Qm1$$+r}0n&Io*2`L7ZCcC8{=S$ep&<M`LHDj&Dj0B%CJ>HE|Rb7%|+$T75s%
zty<r=Ll`wJ>=r;{B6%q}zoj`%*1Ee7Zexg;T%;MROH(z!_YH?eR2D7D)!Xn1$X%{<
zl<&42Q{l%cyi+QG3L3_qR09Nr{&}FLlVjQQx;=#<Y}L++$2y=lGSQyl4{D(Ql(P#7
z@64RMneIG~70!=h>lFG<oTl5qjC!J51&=!yf@M#JG2zw!AlAh`KV;BVu&2i}A3UF6
zExs*#`b`^tF7miWhWCKt>0m|U1o|QLm}PSvi7wv!1C4DQ@U`ygDcUH0VWh!+Lj|dI
zds$^Dn(2*O23O(p+JWWTzSlM9F4K66bI|%)BuN-3`clOhCEs5l{OPF5Zo$g^%<YS<
z^e)Mipu}#PVuTDh2>buFw;m2}4#%lm7RLA2tCn!t3uxo_Ls9K_xrCoB?7?O!>yMjD
z%zp&K1J7M0n@_jG=QkpW_6o?Sr>3<gj~WwSvRb~aF<~;s9efb|vHnh>Hbl=fDE;?|
zS5Z-Q#+SyINt*p0yQc{S((tKQsp7TIiO9aL;{s|}D-49{l0y_Unp&|_xMgnDKe^Ve
z^6y8J<hi*w%MZZ?9Ym-j!7JC;vr#*CX_c`BYH~glF{HnxS0G%8^IuR|nX7Ysds`zB
zCC8{1S4O?h1sNX_mZ=8Z)30>9zCZjs?dhYQ8E#R9KL*(&xKU6uAQnGlT)2LbFt61z
zqsF5;6YmbAefmfWGobp8PK&cZv`<9<NraFb$hR;>LlGLXr9%bEt;<__A!J-gsp;~2
zIqhj>9d9P(<<CG~?Lr886zJ-H_>-4(A?wHQm5bskt?ebp;aZtOfU7Au8<rQN>jAE#
z`;6n?e{WaQca>P-F7mmic9fbj&UIOi^;O9U`6CUwe;=Ntx3dJ?MU-mGdvaw#K<iC-
zHihIrLC8kc4;7K}E=LpPaPFDLL~5V2G1*+`qe|UZI?v~~cH`B=&@l)JxKAZI-MW2V
zGJ`c6R%`Dp7R*^E1mCyP9V!h^_{c|Aw!@qoc5TFI96cq~{o};r2=oERlivN_cU9{i
z*AuF99_i$skKL#vtCVn`r_7}WdyzV8)F&q$>=EN?9B$&Co`zKwMuBzxqzK+o0Z4c&
zHH#VqY=CCGDzjss<!fy`w;*sN@D+74_A6&DD0^2kB;+@H(jki0?{6-ZsD8sB&#&Te
zGyf_0uuF}3rrPfKJC&d=H<-10zwPTvcJ<98QRu_N2%3bcU4Ij0>TN&UupD~bdgByn
zBf&qczl)>wGd_!_Itaf}oFJArLY2DmCaVi;3<wpt55CQu)?-f|eP`3he-0u~l|Zb0
z*vhGr_*T!mc=Ni8?5u?1tH89Q`Eqp+kBgT=rSxLk>nP`U;eLj5RM(>Fu_d0R-Mc#@
z{&#L*DQf<ca@cz}ir-0T2=L<=yqr$q_{Ck_8Pg6QXSDMB7krgXli=QXhGaed3>Nq3
zC|x$yX9pqph}Gfwb@1l^OBoMoqb17CoN+TV)iE<kx4NhrEC6Nyf$-Oq*S+0S;$@KD
zCX3z-+oE(KM;YC4q?nm@wRPK@3>KD3MUr?6-wzZ6!_W4Q4YNi*$G#Qa{h|me^|xbn
zH?vuC?4LUO@b4`uVN(7|V;o2KJab<^n{q5`<Ij^{G+lshEq?2~$E`H2gL}W@$2bQS
zZT>}FmO1k<vR`nX8=2Jq6!=zmU<6dT7E#|jy4Xn*xF@|H)X7$vW$oEHNdF0NdVzh!
zc{K8J+!~=g==Uv-4WD7&KO=iMrZ-fSvZJp^VUgmx^ljnUqqV4e@mgcRWk%zmqfp5>
z*%iPhZMt{4d;eNDlzwyAYOOKusDQtRf$v-0-RvZ5Z$3al!OIB$9BQ!W{o~LLVDK)T
zD$H5x9SY|-SX9N?+C9<>t7C6|YTD1L!x6RpvmYxjzT>Mf(=fGEkdT%(ZF3Z91SY=p
z<Ul|_^3Au)O_YFnnCH!DydJu;;Q_Tyri8j^nrd6c0Qk*}KNp{Q3$x#1p9A9{%}Nmu
zSh4=zmherM!fyG+&W}97nF7cy*2pmBVR4eJnlMfkwuc`*&^<=YA05;6LrEvff>V>L
zucotQMKNwNKINPaYAz_3Lenq9fz2mP*mc}Aw63`ZInqDnHocEpJTy58)oM(9%ic|^
z-wBE~o~^kHf$)5^uVhl>!kv%xKLPSD%Z0wjiw^!H;5$DPF%gA7dV02`aFfL)YOas^
zAYCHdsjzRKYoYS{pJhP(FOvnHUE<W7c{Sm7`dAi**b8bO)8X8iS~trW(?pZ$lP4=7
z$Y-dMD1L?Il)^7}l=Z2Xwa(!hnbJ;*T=gML=K60WR(CbmB`Mqi^w`(s`|RP3SwZ;U
zSs)*xf_}ph0RwQVSi`%V0JbpE3Vo;WYPGiNHef=3r*$$0KASxJ_<oh*T4z7)(YDpF
zT*D3flSev-SzUHUrYMVUeGbXb=9!DNkeUVLbl;9-y70}bZ`|aM)R#k%@7@`m<88c1
z@LuK70C=Ynvu*HcCoT*RR~#88Di#Z+^^1PuT`xwSj5BFo+I7l1JDKF<1*}l!8#$@U
zxgf~m;I3;-VfW@`YrMPOZ_ma3s7jl%8A|?lWKqc74=<$q2uAvVd!aOFGQ;K$<anxI
z^#^9p=f&%=>m>E4-+St6vjc2Ha+w2;`xTNh$96(EN<|diRpQ^YGou8Sq1QsI&67-G
zOmx?};8jT9VfwxPs~cD?6?l!?`ryjBKwIr(tL4x>nY>#xNBLUiw$@+~Z>5phQl}y_
zz*+aWhp%>Br;x11aewu}-?v3hjWHMn#ylJ3_x}ifPoLG6O6;iAymjrDy!a&6^5kUM
z|CL|M0i7PKB1|Vk+<rVL<5k8p2jYHdGG99P@sh7W7FyjBV5$biwHP?k7)pri$r)?<
zl)vGRQY#PguK=!g&r4J<<B;ijF0qs{19)a@mKssSxYGQw>ZU3H5!rVqRpVbJ#KKLB
zR2`&li-<Tr9`+9{QZ!SvjOrY5Okr;_F*Kf({CHHV+bSTLjUi8|{6MQ(LB08NETp_h
zW`h5nlp#a<+5^G~51jlYR>*apy|&7wth2o_%R=NnAdw!-k3PpyY9N(2hJ1ct^(MDd
zWxgGi%NyK0Wv|d0aeP{-t=zB)X2;ibPzMz{yg-$E4X^So{)mw%ct{;lFAbgQ0HBNU
z&b6!)B^v%=AY|X``!OAMHs<}KLBdQv0~oW)o{^v;>44j(SS$1p{)<LowkVR(t3`IV
zMb6NKs(+Ru16WE;!H6QbIPMYt99J9=Ym=!BN7dZWLDP>@VxU*1u6M!)np)TKT@#y;
zd<d@4t2Wg2XIP1NjY|Dsun)tauFz~0@Rkt65yp!?M!?wiBltV!B-&Ls%)g0W+%}sl
z7J<T5>J^7~IbDA3GWjGOs9xBGQigq<&s_k(I@COsCM@G#OqckT5BZ2!Ql!|t$^V;v
z@q}z1cm_EJZvFvmc+TZJRgCZ4p3T^n7z=x*rm6F%DJtuB?s8r~$Y=^DvTK71VL8wm
z-_fU6iA^&BmM3M%>fsha8yj;Uz8?S)9-qJ5KJ!2f{`wbny16-#eCSZ^$y%3sOFf|+
zhR4#R>O?_@32k0uBPW8DzV#~JIEp)j0^ST*zYnkbJb57qMXcQ08D?$!n3v8^v>g9N
zo$gK+HU{_{!PGq6?)F;kJDY@rIDeyOb3sVx5|1(8(!VxYssf*(u6|L$YY+J44SUH|
zc#E0_a;@)9rw7z%Uy2|qlPFXz$QAfATdcj1&-WrpfsELbGc|=aGzXn_0Yv}Ger;*c
z+xz*;yANrBkk?c3!v<E@kEC>00=dc-#+bUljn5NDFk!+m+>u?1DrTs)b*(Ij?6Ij)
z+TYdZ^VS~2=Ee_<;=&wQd2QhC)v6#jHM?3D`=WA=hD)-6%mIUrhAH)P#LtEl#)m0v
zpO?47^%>Fgyq=8Ow0(<o%^<yFUE$)?p_Lq@M^<1Q;kD4Ko|L9?P_iVO9&0D-k-MGj
z%7_`ej!;mI?XncH54Q5SeXp5L_RKpl-Tg^9u|pMSN*?NjPOrlxBuON4ic@&F*_ZVF
zjETC&)|Z#QZdHkfu@nwB8Y}%FmDCfQ#WcU5J%Zn=?I17iSBRCi_7nDl*!yNwG>N@`
zW~xS*8yX18Ci%}2A5hw~i42i(X{ii|ZCKgFbguLZKWDEqd{+BnmpI91%!t$I;SU~9
zJ|RC^kurTdby?o}aUzGJoPB>V_iC`0`c+ngPRi1+B4d-u1A5=Yzt`eqSFQ7n8PB$z
z+LNf?Xy(mC@ZWtu4zsUqQF?n{cVYAMJrH-(#AN_WaK8Ti#YRZN4(2J6?2UtjVT5f2
z(8dVAG1KqReY=x6w@r3ZrsMP|+*h%-A6D*{tn8lPx0iLBJX3EJI3y!yx3nV>x?2!>
zS#gX7a+->LG8Lt@@VWDumTe6Qq*^|#jxJJCkf!EZ;BhpcTC(;X{kHBvn(}gZr~Yr+
zT=1JAGq#m}<#`*=O6!}1(NZ)bUH^N!x9>&H5q+9*@ZniXQ&vD#$ds}$L6E}w<OAC0
zJ3_yChe)g{TeCA7qV=hn`dqcQ#Wjj&8*ge(QUyMKsiD%2@D9Vg$C>#(N5}XS*;;Y=
zo*|xzzY|l@0F22MC=q87Nozr}0x5{1Sv`r;>8UV>eq|qPPT;ASa*RyG{5<1|l~zEc
zcQJZgGytPk<hbHp^Q1WTOLS1uJ<Vt<rRe=Mc=P+9zEhc=OqQTq{$@4);NsV1!xsF%
zNQMWc<siBIsekVg@>mGC_8TYKT;YC4m@B&t>$Xh8FYmnGyY#HZ-?H?nN+V96%)FlA
zYxxx#n#vgcI)j#toD1KM97u~wZnAX2>9B!F;Cx)Wj-$kp^G)i^acBtHN(QHIZTS}+
zJYDVQ9NlP*V0$(e6EO#_8|zQp<gl^xF%kC-S||;UebPhr*#`YO7yarFXmvvXwBj(a
zEt%*op&}m;TCQKBUuvg*%+>3=^f)-*kX24wgS3rFNA$^6d~_^K)b3JE5?vMP=jpoS
zjr|7AT=-%$<MIOry`W2)zZEZTXYmDgJlnW_rv@L7<JfEAw6-~lSj0`?INR<@a16m9
zL{JZ$-t9_?IPrN~%gh`40l#07McXp~@hBRvh3=E2d)hK!mWbi24%xf12sv<=iZ=<^
z6~{l#IZ)M(LWpv5G6x+O6tgWWIk$b^Dj#mL3rh)kB5m-8?bZVY*@VZ!UypHn6Jj4*
zhUue}5UOnj_3wrp4kr}4aP(`nMoc&P8>$kg&u1lo9yL$&@k<xGWsclGTHoT*Ovn9Z
zUR~^b9$D0#*>8MSuQzZg*#lj&FhGYO*)b-lRjA0%XoRw5!Qwxrw#*j;RC$k@nHFX?
z-cixCCmg8V$G=20u=H-5AoP<k&FUwf62!*;R=}Q=CL4a745UXIqUSzX@w{la8DlpY
zd4uLf(EZ5udMHw}A326!>hu{!w|N*8>U8YdBHIZX+}6*|yOkPMhcAr+F!1s67$Bhv
z{gU3tXQY2i0)S&Cob{JV6*IeWIjZxW9end03<r?#QhkB6r%C6Uf`M%?{`(#mE$eZ|
zZlzeO=_gAoViv>2<1K4zGofZvP`>TRhweT3ev;WI^J+@3DLgR{_YGLbW24tR#)2%W
zem29NtlIJteW=XW?xRzl1df>s1QrAMpb31u2**e><k{qu&F{l(;uo5f%pof&OzNCx
zJ|C3kfP&ja2cCxc`3rZNkzFkC^#o635C(*}?zbW7Ku0N9UHswRBD3S+Hv8u<^PV;y
zcWrc#(myl&nDjvaaK!H5d$W$2Kq)2>5y`M0L4sU4si|7iD02%;W%Kf?bs|sYIp~8B
zSezeX@Wz;3c-<nJtO!5TLI?G*w9P^IPf42V!q`_uD;Q77=SlLYlXktNAMuhYcO?2&
zzTBSln&_cRSVIQDAx)-_f`hc1rqjQaaR`u|r$YZD(14AuC4!OfKm!vAykCPe&&Cz~
z&idY?lEV4^f%KY2xKeXJZlgf>MDb0@rAUNi?_sm2X0K^u@Afy&hRDtogNVw=uKRFD
zyscTp5}>IgtLBi!f+d0sIn#Y=pN7olYbATAY*!vVb>CO{QQcwEjLln4K62<h_!y3g
z?1cY>c4gz&>A>QD!7yX(m}d!#-Lg`7Vbk}?R-WU8i00rQKue&_@c!R0J6H30PaoxB
z=UFfPts!2;MWdN54AgzmH>~CD@K<kfx(~6%gQdmh0Rt~+@KR_De`J?zgmA=yJ#TXp
z5*Am>K5otdD^2=HwG#J(yPa@3p+AqyqAY)*eW#)do_be>>s~{8mE(7+3r5}g2pHD`
zluH8d$Kfwhqdp33Ti3hw`0a}Um^xyC`|;y2?K6Q4o~8t&M{`pT7JtZe^E=!S+O$@f
z`g|I?+m%T)V=OpDsu7~kQIy_PSh@CiM}3ch_W0tK^t)HW9Q;2pG5qg(0q)oi^cSEc
z_krB)r*f5f-wcYKd(U`{sG#a47AgUMSLbIi@>gLq$L#{^hrwEBL#(e(@}gULb$5x9
zXfv*p*LsF7*J9hQlSqrptz2_#r5mSg*Z4hU`lCjlm0-s;Sh<Go<pU!Fw<cC*q2yug
zX#9o>J+yIWu`wg=Q)@Gr#eDAMLmV~xRqCxIbwY>&tN|w+fyax?vcDYh!wvwG+oD9t
zy!emqOp<S<T|FTQ7H_JYUWT>qDZdmoyb6~Xfs5*5A!FVP=C>TDOGNq~KIyJc?IyR-
zI)97j)<kDHOt{}sq9l*%HX<K{nfyk{HN48oJvI^cl>0Wz>Ea*fCC@;9I1PC2|F`K`
zhu4l-Ud4#vKmxk>iUhe@7sS74u)G+Wo{<a>uEIigb1*IIJ5Bgqa5NmB5KZTR5Mg<0
z;}UHX{I<vl=qP5(7J*y-&FN5(eXsdtF`J)`W`UXFrkiNN<~lh3#h!)YjF{;QgXKET
z91MKpIvK|td?36rBQ`bcaCg~HH`iMC;6QWr(||d5sbXk@POELiU;z=Tv?aIHo`fv5
zsW0phMRvv9K5e2adk9q|eMep`;=mr5J!wk8CfbXx!XrlV04U`sY65>7i1a_nV?RsG
z7rdg5a^H@_0Qa=3of}=CO42cP28aS#K}&170kYH>t0bGGpQiIUjVIcjzgyO$dsCKC
zV4X1KI|xo7%yQ}&<}XR=&Jt)U>{`nX65-_DSdN19$Ls1?Dc>`+7VtX&lSX#&<3xi$
zSHK&l8=nfLhx`zwN9%NS)FB~QdduH@=$QV!Vt}k1d&DU=98dTA>p_8d4Tv)h-q@8)
z)Lg=|*6=Z>WN2eA2^G_t5$PWzaurnrZ#(eDSiE=c`KOTo2pqxDb>C`^WK~W4ImP7Y
ze#k_2{(Jl%!9W$j%^KEIB)e5=gqVdY1?M7!j*?NEFEZ!OpTm)kM}Y&Oo^SCK|L%S}
zGAxDYr#bj~x;-blv|RPNdm{ce@DH=Rc+;jR(*?<<5ZS-)H5qQxQ}t~)N9RpLSmzN2
zKpAF&zqof;JM>F|P&kFHyIj>^>r`i(37P4~5klNq0@}|4d5p{T|GT1&d|nc#V^aF;
z$Zx9c;mo|O-Q?F|VK@HQqOzg&_gdbjbYwUSTdy;2H<PhZ%_YXWE9sXRiw#oslbesf
zE4e@vC4c+C?^&#D3G*Ik^7ea>C|%QojkXo$Oe5eAcOP-<c+Ey!G1SFY>JcT-Q6LaV
zSsJzJdTQN#YnpBO@T2Jrz1}sO%6ooHUVZ+zai5%-2IPLq6HUMU=5$wQ#NPd_0Ou3h
z$Z^q!p~4SRKfEl+-hU!c_7cM{@Y(Xrh@Zf~2G^hIM8nm}eIU}x4`lAm>M?m|FK5mV
zZT)Mm()Qqs&GA`J-KOHWj!#Mk&AF>ttD*ULxXs3MIteIs+o!0VkOsHGUe#h3wYTC}
zAs&W&T0&M{tB49T{;f*Fh-&EtP@tcjY})7A)J>MVy`J&R>*M1pRL`T;{Ju=9LB{j*
z9g#fLJfoyNe{x0d_m*40<PD$*iqwL9wx>q!CgQUcP-1b`znd)!Ke;$Eili>fX1{^)
ztln4p@VM%4I&?qN4nvU?y`rv4<6>8#3v5ajuC@Gk4rg*zBI`S)b+>1mzd*xkTt1hs
zLj7Bp%ZurZ3zC!on&2q>hU+M2l>r&p>djmsa8glb$#!AzUf)V0`^|IDx<B;M14N%s
zls4mt2|N_~h7@XUX-!^)t%cmAV&rk7iybjYs1-VXQ<8RXRT1^lw>of@?SAfT^xsb+
z$~^os&pRKv#IoV}^Q9=6D{FKBs&>B5`nRh~_i3s7)uQjf_Y$c-4qfN8F$%(WJ8T~-
ze%C%O$!}WVwjg1_JHzwOEZO)=MLHdVDX@Zf`8e@lGUIu^*~X<BHJ@@z@H6rF?C$#G
zFJ9!sgX1+RTn#6xn+TSE_~#CWyEvey=*D(Q+gi%S-exljIMzsDtM<^$f^|EFmXNK}
zmX^Ho_gCwbD;aN_hO??G{6r^OJ7NaP5%#=5VXn+5&YEVLDlzwz-l$~^0=tdM><9g6
zIRw{OUnjzyycgK7xFmbIC380=Q?jV;(l?Ooa_N6FJQHLVN<ezHBXlR_Apv&u#R>Va
z79*KXxGQMMuNMvoQzeUgt3tLhaW7b6VfOf9_oMyjXvvYlr<tUrf|rcr(i*@UASMK>
zhSZKn&i51u{dNBH3!RF{jhjBHk&s}@Bu+M!;eSPwP<1BENua(}!Jp%$cK&<sdH90c
zIY<}p%uoP8TKool1hb1rkYWvH@-!bXXWjxn*Ou@Ph<3*vO*3K@Ju7$1wKs`{uuO3{
z@+q2?iT=o_#i!1<3w>8D8==8n7K=emy%c{d`mH6FQ_r@<!3AorpIU{sCgN2@3f<Q5
zVYKKViz!csw9sFOaPyUyI}3G~8NTLuV*g`sMgcF{wCZq;MIylN9=U(e`Kri08P8rz
zj!)7WxW+g9&_@YtKal(7LP9N?3n~<-h0EZQsY_0Y3T|_01;*68fIUOeAM>XhEv?fI
ziKgLty0X8#BuA_`d|dqd+DClSf?^5PB4pABI49(#f!o_bD!F}X60_}E!EN$!jhH_U
z#$V}~N;7`zo!tkueNP_%#YWnLkXlgm!?&OYe{(Rin)t#%MVLXWhD3hZC{fwRB!$f{
zE<9&zU4Q-3%<JqYv7a*T*4lAJvLk%F1k^kS9;G?1{)f5(8FQ?BCgUgnD9QNKLM^C*
zT&yPn!+_&ZOeEUoYW}Y3!aMHz{ZUR(SF(%=MYt?+RF$oy_8TRwJc7`BHoy8Ku`EGX
zMBqixmC|$ofY|zTfF!Yw_*hx42P>6o?xUN*N>Kb$*UcGG+7b&-g+-M=*9uO`6W{(L
zPz{AhcbiF5KUTIhFPs)^{cPae;fvR^IHWaAc<cp&D^B1IEl2wZ@FL?TU7QNv#_=Po
zrj<9552pl)Nre=BLmz(7msfvKFpJ9s)UO>~uS3uRcm|rEXJMazs@ttWmEECIy2Kp3
z?Ul-q&rGJmQ~S<Gb2FPxJAUR+%^N(<j)vg=Ey8+1_uV^W;M73TD-Ta1qw&**r+;Ww
zAIRyRjGYc_OCEJ$h{M$HYQnrcFOmg!U!+;Vrvw(?l@#cMG-mGHcgalj$X}$Dvj|4I
zz<-uwIRZ9d_biv(!Ss1{%ASGKMfOrrXJ0~Hpt)zK;K_pI4LYKTQ2_03!tjJ4vOMmX
zk49{Cgdx`WI(x!i)xgQT2*;$_*0J*?1}AQCD>1MGI8MYrVP7HXdcdE==D2xU^li}b
z&8?p)3j9I+sk;Q+qqtsCS`YO2T}kA6krH>|j}ewQ220qkv%Gaut%TRfkmAxWf;u6i
zjC+t5MnJup4bLT+x$4tN0L?)p^A5U#<`b0Z>rmxb@J|h5AC9H?M534>s=W2L1ObQO
zmslbEzZ848))4qbMY6`#;l=dBKo)E5Qa5g9&6%$O3Z8{J4j)K^cX)$CN6L26e!F@8
zLxL82u3$)5Z&i(`2~sCI?n5nMDv<o>gtaG_mhxwOBKg1j5gP+z(@FD}d>CPTm%#>d
zKE)Hyy^(?y)dx7itQRv!o&h%Tk<Is5&cExp1|BamiswcBzN?)bi?5wYPpCf#FpdM>
ztSn%!uz_gfDqI(!X&^a_iP*y0E8D5c&_A@*H)7Ip+<FziQ|QAKW%CsdD)1y=iUtq^
ziMU6&v9`cQlKzT~Y@pU8o?TP&OFh*n_Eoh^y97U(kNvw41z=9nihhrCw7Zo3wNBwW
zxB=P?yB`KZqXKHz_U-MV%+Rf#cOyMR(mH%3UfY@v-WL3hjfk>E_rXjZzuf<h>QsQ~
zlf#U@ZS=y!i>|U{l|KC??KXNM`a=o0#79q*zC@&0vwU2bRvw<hXng)XBlD@_ZIa*N
zOL1>*5n9JrFY!SwW;Mn%me&(;06^0O;R<iUiB8lrLe?{nOQH?=<9O~r-kcUcpRq!+
z6HqtM{&uV(OYUm?N?flmrd}=m*Iby?rv9t5RX5Di508%y6ZKp3<9G^z8Y}ue>uRX4
z(A#?kCB%0jo`2Lbh73&-8<Yi$fqomH&+N_dr4;wwriX+TNP`IIFNkjEhjEWkcCr26
z`$vpYrs#P^(%Uyx?!5<eQeN!)d4<e|csu)BljeIPgw@#_I#=dPLye;FVl2)u&R*OD
zl-6Z*R60}B$RqeH#p2rMQjwLjF<0R!1A98tBUl_5X&xD0K$N5G&FIElAk_SvEEOSl
zmWn$IgQK^@OWp8g&xDr8=<HP$2M+<gDV38LrbpQS9{^xOL5911Au6xicRn>gSZcPE
zS++7Ej?%$0a&$r2Jq2g+29vt_>&xFx%JgT+@@V!nB@q;`7&Q@mu}OD4!YZCSvlF0b
zineYRpBCYF8%r|rAk^Y2>t`d~P#E&zOZGY1J@njlk0~1bBGkaJJCx&F3V*^5LlXSO
zJ1xtpIdO@7m%15&>DqY`flnr}MsMj;+;;=YpD-AOPc%dTBD*xyB(TEdUxJHq4Ehf?
zhh~de*of{L@P{1SCeWcpU_G$JgG?|}2eY+($K(0tIvquTI@$@#U3Vp}=5Cac^C(5_
zs43pdXu<o+`mTh7n+{bRtn)JKV`I*yE6x7)MD)OdeY?%T8d7_L8|^IEhOBKU3oe^J
z)s7ch$RC)jhobLZ`T(5k8*r~N!V{}yIGqhAXk0DVEHQr}&xa5|?0Y6yoLAm2W=GPu
z;o})IJE_Cp*9!O9b-HUbU+`UP$xA$V3p1EjBLOSC{bj;}XA~S;8MbL7zb}+JA!STE
z+FmBhWB;*oi7vOxV+7V#V#VSVI7zDA-+VPLc|5M;Cx7Ht@%b~!e9C5NNIyPT@_>Ft
zLFU!nTE;t3retjh=?m|LbYn}(><?WBY8kr)kI`gm@lG;#-x<CQdxGTcwXFMAQpFx6
zsAzcFuUQHkzkyJeI+*x<AoSARDu^g=(Ypoos4>SGH=EJw4mhMV)#(1VO?YQfH*>H?
zIXbtLF)IcA+7vuqg>2mv>)#~eB6Cj&s5a9RJ_~m+QZj9$IFnko=(SgvJ;pL^Vsi5-
zQDWZBQ6bdD{uTu1O<8A(oY5Mre0<g&7v3}dIola+0ZRDHjNmSbCgQnvUa>{<IycN=
zjer2*#)(sGn>6<?&On~9-|z~2@UIXVmPva8aRqf)$4_!rdYlllcPmXx*!YkXx$|p&
ze4~Toj!E(9sB);JT?_!3;$(wA4d2c!&P}0eE(fp17#F`d#alHee@9v^ZM_KQPYX5$
z3kPStoC>2`*Hy7VX?RxyWoI(E0D3=X1@7%wykh>x!(*$ryPaBM!og21OdxD0F25(z
zxYRMQt8*-cAqfjdwnPh}cDq$0M!Kx0m2LGmlmpTN8lUKzF+^)JQTJ9BzIac{IlqZZ
z-VE2-Xo-?gp_6L?#h#p&dkkHSw2~Gw*vT-b7E3c_#K_c%3GwZWkD_dzyzso)_hWma
z%YUu2d)@o%5_<37p>goeDq^}P%XDeN1p%Wa3SvrL_Ki3$Np5a);&xo%v0Lh}`#0tf
zz^C3<-41k4Bz<wWCW`cMy;^)@X}w@)m}c;!NN_gI?FB)5tn$mSLbFiE7I}jOuim0c
zNlgT72`|5Rje=f%OAA)fLX709(tP{Yn5^WSutKORM|2Jd9D)t!iw?-+0P`d>K@try
zX+Z@Z6s{-N@*hKtF^L#{+?*Vgv2jl}{7raUB>``m4!<E85_$!P&chN8J07BFpvN*5
z9y!sa<K<58nwtZ!#V7}8<-MM+6Ti)iN>lUt;}Im`+OKWfUhjHl)d;3PfHz-3H=U+U
zLOE*G4VYFcTQaD`f{7XPq&=w>6?pvmBF(`+A=n3H6B}~bCBgXAdY1d>cguH~)24aP
zY@U1e3j1n5Wn-l_WD&&*ZO<iH8|7AHc)rctyTto=L>@7^c$b5*CTOtdl}9urpw^Au
zJ->mMq~JinaG>f3>+ZWvo=7De2g+UW`(i|5sjb0}*t}KM*{bi2((>liq=ri3&k@V%
z`t}<XwHDzlrl<d}P9rQMpc~%oT#C|vi6S<UfY3CRrIy$&<-<IE6L<8b3u0p)6LZr(
zQ}x(_r$CX<BU7NHY9gSRH^|Gi#2N{~ms6KZ{3{RY>bkSGzWoa_$5K%<8Ws#IC!77A
zceu^LV+FIwF7XTRe;#_%z%jG_QWPbgyA1zxz^fhoyt`vX<^ljYfqi<*j_9XOBS;S7
z47E@V%uICj);^mpNMxvf#-vRWiH8J8FaRwYj<;u~Il%WuEEPn)2X9a$TMWKNp=Nw7
z*MtAz1CqL1_p9KV?kU47R#<Qt1xhjrNEbipF}X5$YxQevOZr*hTQ4g5zw`sDzfn23
zQ9L?Bi#XzAA1w;eVDm|#xy!1j!q?*RnTf8YW^B3C`rF+OT%@|3^Ja=xc6qaJYSTbj
zYiLoHqxe!RFFM8r#n*MK(Ta9LY>KZWl)bPVuQd<#epM@7j47e*hYQGt8;-op8*nOD
zVWAoJ{KeB`@bqi*@>Kq^D&5I0j$9E>-TIH9?G768Km(=OKQ|3v_h^1Cn`_gMIn{Wj
z{Gkg26H$f~WpFZdcfjvT+gT8&ODzZrWNlQw<i=dGU$T+eFJ->AU#8K7pkN^$!rA(e
z&YJJleulPV|By>-XnBX8NIal*T@meTD^CpIfRQciPiov1%yrYtCiFJXjc>9IDlAec
z-o!E8v4j!dWnt+s(rCjqU1UL=N9mG!u4aikcOKLmX1bg+{>O}?n*$z?`!wUGXzjNU
zCVHtxeFuwNhuKr084)Z<@2F}oH4&^{Mv~mEU|hDjh$?@o1`%0htx>Jg{JA717&kK_
zR~rCcY(YH8sV!v;X$Fz2F!>X-sJ^s&UQ%LLPZ6RjHC2@NfJHW;LSBA^3$o*|DSylt
zgwY5-E^nD))c=df(R3--6!mQSSSQN%W$UL#>_{NqkDGn!#8UzouV&R(@kZcRlzao=
zB*mAx%ycIRlbEDv)^UDIi?2aK+{k0x-~R|&NJ`iK^`O0bs=fHXM28JMR#&-LS0tO&
ziZsW6xZC4>FU%8J-uD}x1SYy@nG91cjYVF^3uQ2e9>xjq(T{L17zfFQaQx~TRLxfe
z${}!egK5*ISVV^q+Rq5t(&wpfI9Zm_h_NEL7f5qXAW!Yj1F*(@!8fY8@D^C&C0z{j
z)QZM~%v;Y9H<X;&(+UP&j+cauBmrQ}6y+$&oC-Djq}G@Ih%(6BLZp`+T^~L+v)7)x
zdFHv0zej+3`sXELM=vrmVn{FE+~)}7L>I5ZhcOAGY$4%m5k~;1pRQOO)#^o^c$SJq
zE|+tv{E%Ip*UWqfoXxya%S8hb%3%B~j)FhM>|BCfDlh>aEcNC{3OAE}0Eqo@!PJ%O
z>i9cV{Am)iwk`|jC;Rq*Jr7%sZ3y4qs1GIXI@Mi)>HZhJX0`taa>#%O5ftbzZNwE^
zN3n?UIa|lgdC=Ya!wM3hSGmd~1(_pBYP&E6)MZ`Dv0%<yBy~J#B&Ym241|tBG8!0*
z-Lm&lZl0(lOLDj8MPv+6rj<%qy$#f(ui_Z++Y<M+GwPW)qORu%B65@Z(2A|Iy?B4r
zpa=8e8}}P>5rY2-3e(%AX|+1CXGV=ObKtYo925q>Bt<Y?PJD#Bj_6YfeDa7sAf>ed
z4p=8<{x~YO(($EZMsM~+NK9`z$SQwxA%huNqXB(#bH|l~;wc(J#0AB`;NW3-6Crwq
z;W00#B^|$4#9uxP8rh;!@h;jh>&bTAilwE>A+m43Ha#wwN}ma};wzxe{k*UKL-#Xl
zc@?M3R(%+w?1I(Nl*T_8!1{Cd;&O#iA#7ufgO1L=FQ5!;>&D`6qVK7!J%Ww_`(vf>
zb(tGxh<4(CJc3}w>N}S>bJ<JE;*YZ<q`RprRnm)OzUyPpYwN`vKEZ!CD-4L<e9fJY
z0(3rm^XkFyYyBCM_j!+L;YiM$rQ9pYy8@8w(bzhSfrcHY@wKI?eTewBOMU`x)hA$5
z#&vee82Y3crj57WlE+cdZGve-($L=K4Jf8xiu9Qn*(6oDIy@ML%<l;G!53itkrXEa
z29Z5Mx4uM;x~jiPyo>Lq(d_%B=0Lf%x@0{GQ3IpAtxuuq8pA1h)QCS-8*#@>n`<8#
zi}8wI_Oh?VJ7>IYo^gk4!_Z#y`j3t^;z<t|gW|6tQ4s|DELW+OHWaLPv;7|X$#ho+
z4Q<IBNAWFp%g*iAzsi|IU-XnUDObRqgD>`o#H<K|Z{Ayc4&L2Z*-1<J@}%;<zr&2V
zPp_hMsTN-r+OtG2Kx1dn!LIYM3L&_Jn`pWby-uo|I%xaFN6U>#*YYalt!!x3Lkca{
zQ?LluvVPis#I0a;XOWFyU53`9Kw{#_cBp$82cFL4d~P(qN|k6V-Vy9%ds2(BZJSat
zC}w;VV)A%g?xOa@&_>qx+|N#C6U-3|&`Ai%)B9O}Z=JczOTF`Yr@dpk_ls*+8b{PG
zxqGn(s(yBjOL=d{6-&tqrz5-l#QT1cK8N__nR{RD<+bE&`yD5l30vA;s}Nm9qhY03
zIi%n7hq|XHwpw1~dqx6~pG4<<kwAPa3LOZ!{Ns#yK3$umQ($*(DoLiS{*P|MYBt@P
z*u-1&F!G<rI#~+V2?=|N3Ye<_#I*xUo=&^vBp)Snh$Z+w0lmm34jNK%NQ=lsdiNj8
zARf^8sP<axBorFp{E6-#XebU+UGuXJ62%O%Zs_}LnTNw(`R=596yDBbxFWlrJ0M95
zgAm?KE4Hf#O1=gRL*XI;U-=^}@nNtZhRX}_D#k6yvWNG=b#G*|MYo+O;-m$Xy%}=+
z9LGLM($6z>?ASlswZ5!`o!~tQq$bQ6QnLdad@9<iZeGT$b)HsXiIM&BPKZD64&~Ax
z^@wjJLh46#sD4*y4icY{U#Nuf{=et@KZ-#6U9})<c3>ML9-$xxCh2e5%*y=()O1MQ
zy`Gr0)*m~z^BA!yV=p<(Gn{;TP-QUY3V^D?B_izbP~CL$^(f0bJB<#T;H7ORC!Tmd
zMS`k(CHKj<To91OhAWdP;2ovWX8`pZ46xmG+TB|0DQ=xGGlwVQRi(5&Us}wLiRnYt
zwf0u-LkFhfT^rSjvCw3z_SasMc7~IqF(<S{p|?1uEqlI6t&9;8Exvg!59aAhIcsT2
zir}*A?wo3Q<}7h4?TufmkHbSPF2XUQi>}~i+WeBS5KlMI=K|MiFRhu<`wjPh94UD!
zjz3fAx~M_co^6LeucP>JE<Sn7fia2b$0^=rV`W|D!i4<pAf9Yr?A+#XVb3dR3H%3%
zcR#!fuR6o@!<!;wB1nS^>^ORryo!G;8@z>VTWfJtiZTy3UvaL}N=-A(nz-NJvCjLF
z`1Qs<4)34l@c(JjR2T<R$y5I69~;FJTdUyLz~j0^w=*ebqR7fF)-Am3a8m)J1X#Gb
zzB)mf{y9$KCP9(rmy*mjQBnD)iPYL#0Gw1cL@E2bvVt;4Ep|A?y36JN)E_8)y|IJL
zK^D@lERbtQK}ZV&WL)g}FM~%5*`=-RUv$Ms$3_N^6vPImQ$F~2-m(}?neSYBIVE|6
ze@R`3;~GnqR|<a|R;>MVzwa8<+|m*$CL(MS*#_PsJ9oc?#@%*%blk6NHKF<{BBA{3
zV-=(;qbi|3H2<r8^Ff4vWY;s0ha^LoG&-~ft-lfbad85&WPmYPZY~bGQmy)#^n9Q(
zW$dGUyNthm<Y?}u79=6e8>2o}5?m+YpL;!{Ho?=bZTcXoH*BdDGmw5MyGb?_u_00p
zGJyPr|0`OZl-<9mDovnqX0vDe{>6a@@F!*oFbsblK@j$=9ZiQii=?J9bEt5O_7rhm
zq52l%Y-!w2zClP<K=y;QO+=KBvaLDdAk5?LTNn+-A)@arn0;zkT>fcm!&(V8TPa|8
ztLps;ttIG(_#t>a2+LT7Bd6K?BXiZ(JR2bz{6-W+;%Y*b>uP?W*xw)xU8$u{;UnAe
z?Q|sgwT0Lw5taX&5TMAYUpsKMy<ta$d9pj$`1!y>_}vgiuTSJ3A)_vjJuod+qG7ry
z7RL9<flW{}xQOBb|7CZO;>r6tV5QP~$;2~YvC*PC4lsIyxoW(FtFhzy-wS0U{<t~L
zuE@9*Sw;c-x{in)PGatMI<H|pr;8SwS^eO}pbhStO=vv(VZ>Nu!*OHi_6uG3?2Eg9
z-N<d|ckoxg$v9w!Qs8yz8L&zjQ+ER$p6JK-B99Ky4o_ynI55h={#Z%mOkHD8&iSC=
zEb!&Yl<j{6BLX}wj+R6P1`&_?bFxyJD!wU?j&AQ1Xp2W1iH(M)MY0PC$-nv-!nC@(
z#C;EKyzWs$DlUhAn`W{>q`xXZO$tX%FLqSk<-?s$$vq;uR3tZ+{<trK=xpuy7xS)V
zs`WD0x1+uyOF#VMsC#WAJiXNxaVG5t1?K$4rQ@Bft^w3==ZQG($DTsH*HGGOoLF$d
zbq|30@*UGwQv!*T{+#pCbX#S5`gwoJ<!hwmF_jyB&G`=>100H?%|>}x%>;nC-QSmF
zSr;Ezocc~#FES@AS1AfP*0+x;-DBWOaeq@>wUA=H02r}vsx%7VTG=Ws{rx*5UI8;Y
zAas+1OM$z1$4+8-&?1F<$tpf80zcFC2y|sYqnqV#d@dfmE`Fay{j}ym$~A&4MRp>t
zgL0-Rv^>YTDK^{GRsDF<LgkX55>0kRh_0%@(%-d3aE583_<v1ejlxxHFx)CjE^4+n
zTv58@#`_7=ED`$Rb7jHdTx)i8?suiYnxHFD^lA0}RThJ$d|a58pNrsJXWGO5;166q
z+AWiJg0QNK<3LFUbh&kF$n&9q?d1U;#btINVZ&ZvT{R*t*Q2$11(B5+-l(6wbWMKp
z;Ou@trHqCThg7C&b#M<gJ=(%^dK#(7?t$&*(%Up5iDB9$pcVbw2u)}!{pw0G^GW3u
zsbWP2Q2g(vJXgXkEXlC0b?2VCk>=d5o41)atCs)16BYPi4~km-AC!haQ|q4+HhbHw
z<d1dL$$lZS%%ZBCQ&y{&@tJ9Pm~g9ZldLrGJ#ei3W65U|`|P1j?n`Ndx7Kcd43p5W
zCg>k?Ej!FNz0l9sf0C;A`yL&imj;ta#on;nfMtGvHj15NM(W^xp#o-B-#o_f4<x)1
zArI;{^fMk@zxdY#1lI0C4@lC~YZJP(gFYR;WT59+Eid1`sH!7f%?EDBixV*vmn*_v
zBXJEu%8v{SZBl&l*oTXZ?8|<7d&Mn*sNt^g1Q0E~VcaHFytq2C^(ttQkvqy(Zmoyu
z3i=VgUa2&fMc9CvkFL4YH@|U$>Zf~Ibi4`sgb#Z7P;38eVq-F&W}FgJT$65m_Z9Ab
zpZS0aM0HS)l&_e!(!B<>2_5E~g8=x!Cx`#B^CS#Qu_;@?M(Fwmu70rDa$1bvnb3H!
zpO>D@TG$P~E4Q%R8~?q&8+|0ZBy1&UOCXgBc5!Pf$S$!-o)%Q!!b7%HFYAJ~G=0rH
zlzgA61Zx2Zs7ZTyMwfJ{pkgL7;CiBa^4-j|yk>zROS30;eYI$w6e0DHAw=;&%eHkY
z0PpV@w)-OeO-!fzfuW=(m9D$xw3-~3!e<~y%R8m*s#w%%FM#^snG5DM!|t}pO*y-P
za>?_9vL+Y0qOh>(3-WHyrdBSsP~m^O2ihKAP~c;#lI6~@B~jPm=;wpAA0r4hFKT1;
z48G}Ao2ZGP<51Dly+H!UZ(L`PY>q;pC>UQ0%F$<(IF3L4I!?nrN#v}5fcU^qZ?|xt
zTdK+S{y(9*8oWB!rk&*Zu;SJJ3&iP;g*1p6?g@i*6=0V}SqFHd2gnXv>u%@qRIQ)j
zBWMW5E-bilN<b_J*m7&%5Ex8Bt|(g2_nB{x^{Upg_I=y&%qq5V38V>nJFzGSN>~+Y
zM!T%bGOH0zK5Kc|!eM?qAH56c8Q`iL3;C3~j)8GvrJG{Zr;lrjrfS)j-6=~{u_qdq
zUvcX1X^q~SapdmUG(X5FhItxBO!Us@XzhLsBifV%Y38hId)#Ep10)_(#y~ngnVVR;
zJW{@Z?Ui5g-~m+zy5~wB-uSnvv*RJsvy<+DeW1nb-7v{XL(oTTd9%{g_Kvxe$l322
z$U#;oegzlCgmDdHYimWGRB#uT+iAZ}=cDuB<s>yMj3Zm)<i143;fel|^tho8Sv6)<
zY-7u!68uDvjK8md%kpmH7|qGvCo0eECSp|~4zaqc=%B!g-&J7AO3?|o9swO+KKqY(
zt<p(-g^z6iA`<X@r_sfxst7~S;V4P)`UG$tv|mw0-qru6U9%iaGAsDE%q7JY@<iuR
z18>he7B;@W=Bd{vUt6sCL_|k2l~t|KFpMQuq7gX<bHnp?s6MK(%}G5B&wKqU<CES8
z1<D?=;$}9VShgE|JE^sO*J1LveiJ}R?Ma`Ygw|fy0#4jad&cg!#f7IbD!nd5Ke<b;
zU@#mx?r&RMPq?-gvYN_0O0GdyL{fqCPR5MFSNW1cC)=hF2Lb(rAG--1GhrU1HT&Po
z6<>V@(x{TG{Qj~bXxwbMU_|hV4DucYSd7C_*x{Xf2WFk;@F1TgvReQ#U`ylOLoGhS
z`HH1QF&=gJA^foIg~@dmxOd&uCk$3@Kd@z<i=P=iMh11SCCOMCpjh-#0e6jpXRLU;
zNdGHT<q7Rof-WCuMe-j49u8WELh)`8fG}35Uh}*dR-+Pak7`WT-WhCVXbe7E+NHet
zXJ)uf=G)|)W4~oFI%kyaC*PuZN~K%tonMmoZ8By112@ZG==+OM8s?3Q?cek=-MZT$
z6E)8lKWiwmsqwTZ4aC8Yi<O<y$Sfy{@4t&AO1L@g2Q<k-NmQu(O5Nt9+_@F!n&RTR
z7iI9l%-jgsUowg~))ymuGJ#YnCFZ^m*^sc2q#G_QB<L<Lg4`MpK%Ec=7BRitkLCpB
z3m(o1svF$(&;}o~LoyhPesFJ{1{YtwLx*mL#yif236+C~c$arvHN8NZski1nH70p^
z-;dtzn^rt1gE{m9CDDQtonxA2m|%2h$r9M*;m+b1@4N7z?=<-3*t9zS2GGLNAzL8p
zDErh6c%8@J;i;O@ECxe;=?q1NhL|3C)>CUSN8F65z=lJk<K*Q;oEot!j%q4ru6wRu
zp}mJ!oK#WOkd*B8VpAi4+_gYDMGIn`XwsB?rSDljoDdaf=7~=|lr0cA<Zr^pUIvud
z;E!~}zC=&2M=r#5G92K9=c-jC3zw2ev%5(_D`uPx0Cfr=dZ`+>3}=sA|DKa~3pl#j
zXl)0q7ww2bxja%soaPIqc*p5%U&%!N@=(ysT`O2I5K;sCa^Q64@Gjb5EW<fo7u-n`
zf;EEK>Y^ACqVU|H+C!t=`e&g<Qp%uJMep}G4bb{7WNCHt>cd^dE40?em}X=wmg~&E
zNbjD}kH>c#s*ubQZB_ix%sOn`vm@~p9=ioC<6a#XPPeNZtBzeS3c4;(%WeAbMiIMw
zUx!*t;60tnD>b~tJOe*H+f)f<JP02%IR1XLT6X%eoun51k968OL0cG1qhL#zclO>d
z>JoS%*{w=7Fqef2mYaW?9{^yow_aG%6?>YdkNpr?-xoFUv#>(Tk7W8UZV2w`y)b>{
z_!n<-!GV_9oL~%w^{UArKgBx~F9z%MTy?W%BK&s#j5hovl9v6DpF&RAgvRr*N$T&)
zA^q?a>ykiuX?+Kuz=w@=qEgI(>pJB8Tlrm@4Da&_E{i;M%xaR3Pptr1;Ck;KQhXxV
zGuQVapLHF|Bg<BNQa^URh^T3d5QG=u?>lNcw=Fg$ZnFWS^JD9c#pKb$a=~`UD0J~Z
z0{afsK(8m`#!j}#ifr9oMb>Xc4vi~<7&OKr2xEgLQBg$3^$h68jm-FqVuGgEjWfUA
zd+?nIM$7<Or~$x5uIea}#+Ne}V7%XA@&#z|;ifi<Z*AbadrJrRbn%?&i-1*c&*&=s
z?LwEENs1BS9nDLa+Ff>-MTNW38*vwmeZIF>n}_USWA$TFsk+@PPxM81y5-r~*~-CG
zD-3vY%XjI$LHe7f_Pg%u=pH^-z(i>{$tIl8(j&85)3@$~jc{ZC;&q==a(C(9{Zges
zHLn>p`qfSW4@I7QpCmTI!Q&IrA@49L6~;zi?d})PZbCRM%#;#zfO>|4oOQZy%`ETB
z4Du0AsV>)bziSVg@P0p8b&z!G$tut#+Gg6wy^hoZv%I-S!0}T#>GFG~O+&(}+Y`P1
zhejm9gD|aTwEujjr}&>v(RsG5IlnBC624KJIy?QY22y{kH`lwM<oD)TC~uwFk`z_*
zmHQtEc?nb%s)cAH-wQnz7(5nFI;FQkd)q#l8;trFNh@P7S?vmN`I_s-TC1>Ao0l{7
zbSBCE$ELvfCV!@)c#_nf`?J%<RWo95+uiiMx#boerHt&o_mZFe_qQmw9nuw4@OE%V
z4?CW91q%UUUkl3=$$(|-dl106T)cXZ)@JIDOAqwH>lp_Mf6cAb8NZu3pa`&1F4ksm
z%nsahOZQo9W%z6AC$srvcx*^YGRgwq*xYO4mH&v<|KawzCjY0c^rzeM74JgQ%DmP;
z3spt#rr-zuE?Vnri_;d<HJMVPO#P&Qns9-QiDZ0fB~g-Z^BPr|10SP4m1`-Tcn$nj
zBSkuw!t{67?AR!93?BQQEZudk%zb>ULZ^<jk?e@vy?{O&6G*&@nFQ3`Tvi|s5ZIxI
zjz?e)>rv$282_fYP2=-G&ba@SuC0vmrETR!*(+8D3z?)j?CAA!XHPKgndazF7cFe9
zKKwazv2RDbz{kTh<`Z<^y(N_?^?Bm7_+JZ02KQYq?YY=cBkGY~6oQsFd+wth3^WR3
zgJgMmb1;L^w2r<XVeAMKLbu1#Phd>j;0Kp`DirJChS=mO9qwL%R_Xy)Z2Z{Mt*>^U
zicTOq=bQ2g09#b3^^jsJ&l@75+4vFmyHlh@3jF5)mXUk$nB}NL9v#zW9s!{#Btijr
z&2H;zDI=-3&y?M<QV_rMpr_N0$kUk2XBH6^6+_!kl-KhZ(djKn;C1;?@w%JJ&`G8_
zZft7n@gjCv-&b2Oj~0#jaO>Pu$}#dcCuQ&w0x7tMEKislKI{#W8u`)1QTi2C$MBTn
z$L6WTyZ=#i7Jf~)T^I)uk(TZf5NV}*qS68)(nv^m_t*ra8w8}KrMqL&C0)|p3^sDW
z*z^A0KVTal?l|W@=eoYfb&-zhg0vSFDU23MIF#B*(?xtgedCJlV4_UUlLJhKpX!wF
z#nl?jOmUh0=<e{Pjiq|Meh}VSju~coc6mnO>+A)aa&g)Y(TY+LCizwV$IDE@(G1<|
zDqWwW0M!8Q?uL?{>Sgh3hqi^&X#?{{FSX3~@m}M(($8qHJVFvLNPk4_Wf|FBiN~bz
ze!zG@oivwy2Ixuq)pEb(;x^*VdaY`Gt?vY!??Mf&=kNsRsMtq{_xOhXPMjNx>E0CD
z{Yp;Q)|6Vbl3fqc*mpNqoXI$|)bAR1_SlZrZt^nSedRXbr+M8I;rC}+O`T*S3(qx_
zM%HmX%Zm}ZjR;sj_AjFd=0NUZwkA)<VBtwP7-uou!}Qs^&CYk~E$zWq)cs~DNd{aS
z+@IcIANj%+vadwcJtZ|G^hTP`?dEHu9V7smE8fj&GYc5ocp~(wWV(7gfzcz5hxvv_
zn&saOnrs<E@NTnR)}q%0Z<aG!Gg&*9uj(UftnLocI}jt}0+;q`MNbAx^U8<uaQ|6W
z;w;JBp?s-=h+kvDC`fz5C61-8IkW*p@4LQrv+VU$G-c*RPJmYmxH*YeFO)%I1xpe1
z(vf0ZYJaO5_57xn6!i`xfOemsvW!z(r|oe6bK0j!&5<mv>3*Ry@oUhYjk4&RB6$~7
z_#m)a^~LSa8QcVD<r9K5P=1?6<zruMPduXueRB4W6bWhuzSXx=Ok&}`Xf0RDd{_MA
zmTB?!49S8a7`z940n^UP82myN3zC`e{&W&KmdK$y<z!8f<{$vq$6x(iK2X_$jjvy~
zJ~RVqV1y}+D4nO;;Z_R`ahJ}I79Bi-=p66g*h;^tGTdYMFp9B?9y5DxKr90KN#!8A
zu4l%588$J3-^rS}sq;kq2Jb8I4ozV&EYL<dl(EAHp)t`f$A}!7JKgq<`wvUAy`AK%
ztH#{z+%V@GnGKJH5Dkj1SOU*hujtw-piI#{2&2KU*f)90u^~?M^eChU$wx~#LKlsQ
z^75^A7%eSiC3f`YOn|0kNMS=uHT6ut+_R_w$4BcO85I9vfm0kIo}&0Jzmk79`AAnU
z8DR*g00!N=>#xZ8?`W<-vCyq-Jq@vWy=Uu6Dc0=n`)ohz&OW{w;?F>rAkxs3EI<P;
zI1v4L7HqR=Yc>g%77yQ^d6FLJvlpwlAME^?$KyP~RiC8gz?CUKrP^y&kc+p`W)fwi
z34E+)V!L`tfRq_*gaGP9)Nl*;`D_2Gig{$uFCbx7Ey7}1WykA;egV~%pcz>ZT-R|?
zgWY$5Ih6>2r<UBufB7Kyg|mv?;OSBj5q1k6la4(nm$c#%b-~FMNZ9-#-^&!mm6KiS
zdwM_M4=LC>Ru*KPHIFupLtZV<$8IaUDi!SS<%k)l`I?7E^frELa6qc57O6K#A6H&F
z!8u<L;K6aDJ+x@Y;m!9~vy@|QPF0HES%G@3+Bsa)VKZ8mpig9%O=7p}LL8-+b$pXx
zJTz=u@f^$Ys^5BAc~Q>Vv<cQWb;;6Tq~ONX1W(eWpd2>OB9|tzp?Z*j0**9sIPi$Z
zC7HQ`k`vNafO(7MN^q;*rWcteQR!F=8DAeZI*5B}gZ%!(a%%5n*;0?o1D@2(Pv>Ot
zw{uAgyBMbmVUb^@^0FDF$%f6HiK>Aiwy8$}P(0vT;)-7w1n!M&WvR}h)>m)cNpysh
zFS*>%4#m!s%|kun?yWcfVWBA;y2*V_H@ot-N+*lfYCUy@{BK_;Vck)$-V!|MOm}gt
zEgC&7isGJRxpiRqa6f-pTB`l!FVAPU-}fx3EcoDeHrvqU_I|0#4dtY9yNp%6J%+^V
zmycZ~B<Th<i+q62EcBa~OGN6OKxN^Il#->1^z4OdsUmM9a-CN4T5h)B$?VDJ;$%HZ
zC^lq7O00aNMZk;SdF%8b{z@$2I{|3@s|q?4Qi<taubD(OT9w(!F*G;Tc81w5Ps|Er
zgZnKLHH2LMN^Fp%S1f7OLtkG=zNmn}4p|V&)g&lq{med73VMcMA#kk7V93eeK~PG7
zVkEG!IuSDY95WD3`~EZr#i60?WhPz&sVbS3oHKWtx|mi!xWHhZ{W?Om6Qn<rDj{P+
zH1euiAb0jIyMlLY8H3LmXswd@v2HGmgkH$PWoQG^IC8vbU_0KgB5QDQ)(1tsAYKb`
z;Dg!ajA2cj<*&eQ7Jyt6Cey_Y8Pf*Kgzh=1;s?iMG2$3b_ch%b3YCZI?tQoo-s~?m
zQ_W&zc7J*|XO#K7s%e<~=fErf90%CD(DXBzMJ&d$a}~ONf76hz7sdxdeC{t(l%$mh
zj}0^!NBVn=;~q#M(`ab^(FXsD*=t%eJ()YCaaS{9U2&eSD0tU`f5k0oU)6Kn)3cer
zY*pihOQ^VR9lWuHJdR-VD0U+JD*Lt3U+w2OVRZd2bOVY)F$J|l>%+XYL^6$oV-F5k
zJ*gx8g<R~9$qWnVsNiStLXLp~*CU7O8878!g40Q1B0;)|PA=yV)idp4X8JBzqzOK?
zm8{~)R!vn0U<cZb^pyOw&zxN@;CU(fF`yto5y{-Rxz`Iyr}<z58tI(rW#+G6_@y(;
zhA&7v&P$(guO(h09Z)CtdZx;Riy+28eh8;AkP~sSH8vi?^9#>*Lc<}yQqIbPKu419
z4hONYt#DmQsr8Gq&CI*H1x!~uR<5s+=8Bi`=CONy&1<uZKO6fcqB}YzBmS5BfBlI}
zNE_OlpBrFRu^XcNinHRca#g!kGDPCZk)U8lxa;s!EDuv2uyR||l;bX6yYCU6;bGzF
zxP94hZVs~~609dKgr)Kc+Bw~kA^2<}sdR#F$A)pC_UV0-OghZB%DGA~>^8lI1e=Le
z^w5NEx{>!bFKT{yOcGDl?R|sciG=+nNL2<G5l09k=;vIm$2Slf%pr#80GIiD{!7y^
zdg5RPk5?JHOYajQ#?Q$?pFlhpoVt2;!jmZyg_%mgm^?Y0C9w6wFEEQme!SGE$=t7|
z9LAl#FM~g!tII9%st<stD7YDw=T*I=y56J90Z_f0UfEqwaeXKYgUI@bfe6~v+j#C<
z>E>h03Y+9OXNP9cT7G<H${7N=O+?TM?;fCk*A;1hzyC+-gay9~?{L)1j!>xk{9C_4
zp}Ri0{C<_@baU~o1$S4(fd7*0M5^ejp}O`b`o@ReiN|SfJyrU9dR!4d0(KSUw=)oe
z@en%XLQg!c{*j)PYe-K$`;Q#DdG#R%+;q*cZ~BjvyWttT@fV$$;?NOKxkspd&^JNi
z&Mbtn(F)P(!2*}NT3p4ii$wSZsawWPE;VE=qxw%Se$jf6S9(LhJu1x+-=pIX_R#R@
zJ3%@|i?u2zqqkqvFJb6s<=3?c&68bZ?#DUE3tKY#j4GIG<wL6vh3r5=bZgfXEeI?v
zXX^4-rbf{%3NzhdXR`@f()_ao4eR1iai}<?8Qu4_7+8AW^Xl&(xM#ZNsTEGJaAVsu
zC1Vb_3%g~q?!o`HI*89epec!heT7Bp#cwl2pHZO%KRYd%#yCB<E1oH2$Nia=^0lme
zn<I>{mGmQQ;%rdx+k(jxB$)FG-wQ6bx5`!5VeqbEBMBcbsGBjaKnAz~&=DHTXS28M
zTaMN<`bmQP9e;z37T9H>^cN0B)(JbM?2Rv~#waH5Ev_A=Pm}I0w3__bTk4emeAd39
ztA)un)oA^Pg>$`sH~Iji5F3@IR1gl|QB8!-M3Bg;7yPoDudQJzWJz=|EtGXfC{0#{
z_DF-bF6xJcrMsT0rpL*u#THjwhaIA1z!1~AXP-m1kfc)+HN8hI#Ic~IL|mv<J^tdo
zaQW#*4eij53$$AtBDxHgM=e(wE~4DfQg<CmYxZQa%NkwIlR60ruf)ooaXKOtg`--U
za*Fv)E$;AVwv{V;ij|ogcmKm;mJtW)9}z5%(O>dVWiIu;_V>!IO>@>lw~#OG13gNs
z|3W$Tm+JiM)e|v(xzGN?vO5biC29C#qk?#7D%j%p9v=@B>^avs!dBuW-%`NB<q0yS
zle98z!=Bi=3B?fjwr`0R4I{cDeYWTfzczo;AF#A`7K$p^V|6hJffc<^lWrg`y^p$>
zyf5i7MJQEA(O35@cdB0eVdf7pG-IB764y`ZLp;}J^Q$@^YA*PXqK}ybxfaWuw`JGx
zMNfNnEVUs2yKj$C=vVNhp*Uwc7B(poJ8Oqf-|p?WAvuyPd)5nNjm8H;&on|Y6Im&s
zt=%|lIYWDNEjF$HDvWLyK&*a9a>3OVdc*U&VLQR07a|Vr#^uAj@@>*2Uj!><FzM=y
z_Ig;Sk=5>hqbqpXf%x^Tvy)d(HS4l7M#rxI!f=1b1^)jZutQZMZ2G?PbLgXrMYUfA
zFoY1kEgwIxgR>F^Zm1&XVRBtO4j4I9FLTPKlj7R8PW$BFk&y_?WWLYjC&CFqSQE5#
zSAbtS=GRGM>x@Q)b=76leyi{3wFL4kJXfg(DVMNDl(ek*)*NQazsSMRn|LrX;s@8q
zP$6^j?j;Y}#xsGXWL#ZdvbP4ojlResH`Jz>;ZgTb`3n9*ghMhQqlq3sREJAG%vSG#
z0pu(T3&qfzA4bc;-o4~cXCL`(cpXSBaMMK4lk+#A@V$@zSZ4Hh6_?ssC|>;WA2l*s
zw^yB?7y3}!5r_Ye)LoYMkQ?*t078wZa9<hm(ZGrd2x@pO6I)AEZ?jIR@a2eGnxAB$
zH@9v-4#IAC?rYAxt{%6yM~#`taKm34=I!gl(oxa3`bZZp@i+<zqC-<5#ZPXxmD;B?
zN-SK6d*3<uxQ;rA=#k-GXxrEFjEujMXAOSJL0_V&mQ=?3?{5D+aM6aM-5>Hi`AIj=
zqQC)uRfk`<hZ~%XC_3{J%7h~&+~44wCC9nVF8CD#aQFt53UI7upPom#`>_lCU{0Wl
z41}tZ-adcspp9;>^du+R1JHMp98#MQBOX#yO8UOmG(>)l;@rkoGTf7aBA>5!dq3io
z_b6Ryi5eM`wA+#B*{<2KTyS^$9!R2YBdEO(eF7Q3Ywn4sK9J*z7^IFDa1?E?`96?5
zG{I&f9l9Dc{P1sk;kteEYQK8|C$bV&D~Ne%AN9f3nR3~1q$^*rYXrJHpoECpYslOU
zoA7qrrED#Nz4utJ5fAZ<6(7vuN2FHfE8woUt2QBxi}!+PT_PT>JPerFYsL?p^?-=L
z+SJ(|V%gBIpHAl;?1-Ew-fl)ek|Lu^fQZ(IFFKSaWv@;>C_%=$IOpVELq>oRl+KyJ
z(Jr;6ZWgD$dC6p%Fd#GTAJPuwkA~IIp58{p{4evl4soWGkt+x2Dn{BLK$zNA+h#;J
zv{mh0vDB-6GM+-m>mq<EHt`Ye$JI=0%*kOhOT^HF!_wud;>@S-Dt0m+1Hcp?B9Q7{
zIgkW(blK?eO#bd%I2Z8`CS|>1Zak+M%>C!EIRVGFdNtReRbo$4NciyjI|*qimXiyL
zJOf~o|7b0^q1Pa=|BI%4C;@FGnTVi34sNBsy6?7S$%OjN;~fFKQU1OU(`2qO0Xn07
zrlhvbGnFRny?e!XD%QAGK&pSaPd~LEKjtmd*08Ig8{lbW)AZwS-Wy`{;qC~LpChSe
zT2zyjyP_Sd(|v^GfXcB^YR>c2={E+8gZEq#H@_X;CIh5}K<AT@w||vx+~?qJUmDu_
zuw>VEF^8gK+N-li#kZZxXn92I6`}WQt}M5K?z^uYEG8&FXh}G^QHx38@A20fRLPS(
zS^+s0UWFrxDFh>b_Pt3(iA!7F=B4co@5|yk1^krwcP0|3dOArRrK`w9xzB}msEHp;
z`&f=|LDC8m^bf~<KD$e9gY;_LWY}Kn{VkgIqLlpE)bOsy%FIVwXS*C5(y*W0#N4_B
z!Xfi*vCn<^oGC}oQwB}0ra0QNkj{535HuMwG)6Vgl0fk(ZhOW98_Hq(=MKQL4tHKp
zx$WLqh>g&5ytb7kyEI8*o6FXELWvNIS;+qf=56hYsUK|A^uC2^8w(s}+wm{<`Q~mi
zb?5>>pC2*q5}dF!L-Z=@Y*SWje9cSXqVzG-2o1}4LjlNlq(Uct$R$Eotj+1TLAmIO
z=GuhlmayrHauqTqR`2wrXZyU`J8L;|ODDF_=J4+CG&)H&Z+1U9N7i9c277BvPjxoY
zu_{5i&)h9}%y`zakxEix1SvNheH}F~A}g7nrmdWr7w^mq==2EmkoMdC6n0Z;Ze5@{
z4e!uDjwx4nP^pW36-5DMxR-H8v<waADQt5H?EpLhsS)(pZ48nE&guTapYX6SxZ%4d
zbNBBWa)ck6WR!kufQNGXD29_)-w)!PQ)%gzkfw{WoI#XQeFgt4n21b^MsB}-zjVpX
z5hp=Nf5t9X;>vz#>gS8INu7TG7VI_&=B>29F{BB9UX!tRbTqJNofx&LLq+?0n8RHY
zM>IdmbH%D&$f>lrjm6ow1cM)f;MKW*zJ@v;jK$6P9`%yXagzYrA!M{Car~J9gYSZ%
z&~2YRa{+51*-cuynyJsn0!j_QwRn0<zuv!%$&Zt^{=ufs$>69~D&6FCl#5UUraSAW
z3vf-zSa|VS3MFsRT68l#<$cO}zwpgB8iUV<7=XrjFI^|UsC3%wBg|&L_G&Tvvm22~
z*vpus7jq>d(d`)YIak*o1h2oR^kpAp!8--aiM}S=y*YeS@R%jfnxlI4{in0J>=sPr
zEtghUAt6IUAU4Q24DpEtu<(dE?;&6@4ab_4fb-^~)%1QVxx5=2qiWKNP0G=3r;b;Q
zF`MPdWaZ90gNn?i)`mITR=}cE<n+5VxKP_UYzu~)u-=Mh5~2*PEm^UKe4KRONN~r6
zB<Xmgsw2?~8!k@{g$-<Ts1RwfVCH1PSl-XGB890cS`lVU5q&XbUtVqMlYPUdt+J<$
z)J}uhc;pvRNgNi))uV{FbHnLl;SG8K3II(*?~L^m&F?IIUkO!*)(v(;gH7b7$WAZ}
zzJ`STZ~9)uVohu|b*ju|7O#A%aMLcLl2+3`V;~JO!Jpp7ciJST$7L#*dCoEolLT#4
zuH$U6)J()Q<~}ww@C9m)pS4!((wdrVWBP`EBX)=&NX8P@b0xZN#;8Wct7Mzczh|_(
zqvU81HfRdy+lP2GHel=ZSRE_(-BTYcvv=@#sV#D1vRm+0ImYkf(6{1O8oqoUmo6b-
zLaPnUrR3fwf3T3e-9v2Is#B_>M`unSMQbFNbiDS;f)khT%4S)mG)uZEJ#3>3iIzs4
z{XU=<3o7CYb!_CCnfW{~xI{f$9QTf~SjH7F06RPGS3l~A#}HNmiy#_<>1HOK0dtA8
z1+K@-40b9?1OynlKdxo;TxI9EFKe!}dQq|H7VX3}i%|hAIl15NU~qXP!w1A%G=ISw
zi}c4?Iw2?i$ZpBgv44Tm*04#IYsQB(IR?zIDM>|xDZ!yuH|xg*nwY%ZHuooAa!bdh
zT=C2eHw~km&L*>roD7_1A8ZhvW64HrA4do2m>f{gfp`!6W!-Ope7gO*7g?O;+z{Y|
z_h!!7bCqYVVQ!6F{3T<TOwS;8i&N`?M8310^LBCmN&F*}()I)uSRA#mS*g^2cU@hw
z=s?yFyw|7JTd7YhKA(@&^2qCNzb&+Q`YpE5;%*nQ(DzbC9(P2@sB$bP#U%jzA|>&o
zYEjKA{DU~ZLHRLtUN3^-%0y&1oZ(&@Gv38wI~dd9ox_^309j_D;ds_dR1_rn*e&*7
z^++{v2oy1l$6aI#9h?a9O~$r>BkDSNuRtf-RaVFBzm(*Ik|1G^<c#SeLs#9fhoKVH
z!qwgU6NoTog{8@~Z(_-zzfA!c<(}}*bn)<+-2g}PxlFfnm%h7HDw`kIbe9QAX)}<t
zzio$fE70n4Of=fBj&$?S(8S}7jW|4G{{`Z!`U9ULC#}ooC_XuAV}o~jzS0V?_BjC#
zZRW<`Lt5Bx>4FD`o&JykNIm>2L)+^dfyvWgKA-OQ;@-L++l7YG)%ydDe}Qc<h7Sr{
zHZ{q1ez~fs<Q_fx!H}JBy{0BaPNG|*Wyib?v-foGo-$2VT*q|<KwQivMAL2Ol5}u=
zM&k6AE&JWA<*ylQy-f7@ez{#Li)%Y;0b6<N4kcNg$o~(^=8S9&Eb)+kCU`Z(*--;)
zPCeRoKNI4B9x{A8Ys1ZX4Hu*W{3_iFRbzk|m9SD%f!m{G@zC4bup`GNqtZVCf((<Y
z(V|ZRwP7FXVyL^eX!_!lfQgtSm9SWm%!1U8jB~b@YtC*^C1kUV()c$K4QsHgx?R|m
zu#Dot287Qy#Bd7y;@sEa17>p0$|_3KoA$f70qKXJ!^;T|(@YFEq60&Z{6TKNG~=+w
zmZOlY8|#6I5fX!&hqRdOD$x#>Na?DVdp=J|?bNImk$rNu)uCRp<e(K8Hos&r)^*11
z^jyPe=YRxH{^Ioke)aVFzkus*l+!&gDr{X1i5ET*)yUha!e1#$XJqN7xT!aOzMjM2
zCWD11@<mZR?)$K$w5(>n+-tPe3~Y0wDTjBOv!33&(&EwRHTHcipD7z1BSixnhkv~4
z5!7LVq#}1YpOg4Wp81RJf2Z#-q6I!qmEN;sCP#OE%m8=v@ekl66>$aqhh+hJ;tLqn
zi7)ACa*K>LUBsA}x%I!vZ(vT9<F)2tt|FkN_)R@HUU5<F+}Fl7mv-WV^Dm_J%)*zV
zdo3ebw*_soxDq2W$^Xu)BXfxaJGdxJ?9PcbRoS20c6|+5A>9M1A_71(Yql5Z{8g6C
zZc_ybrBsJ+RSN}g3dT$EG`#PDP9hiFYRiRKIbW^6D}wpcrjHHs*z~Qh#r4+oX@SC=
zNPC1O$D`{ViMx&MN3BPj7X0P~Qg&a9n7GR1G7-&vo$P~?ks_5}mn_g9Yr1h(7y<V4
zb;(0;2gSYmlDhkKc|I!B<@8FLgU%Y>=?jehz9TcfEa4M5T_`*CQc>&>@qzFBUpCGJ
zwS-YY#@0lod?L4$`Chp53vPY-+Hy_&Z@Vmu?6SLBWKNFo$f=01Q|k5aH}V{Pi-Vgc
z-;ZB5U`7|SwDNZ{j@p>n%6r``1XDyv;yQ?ep(K!$AkOaZxY!>l#x>mFx<wvh8B?j1
zjgqOGf56X#J~v5FT@C^|AqIUVNTNO6cNYnXjd|MdD-1@NACt88KvrFpC}DY|&Ub4z
z#>_OXpy9iP8V68aYD&4$>9dUlkDv@hw!vGaMp|z6t+OatooG`uV{*SE7fvyrmgy5z
z^=4&ix=7Ugz?#|X3qeM`ytnlk630`!GSH7RTQiA~A>&L~CflItWYx(^(dg_Xl^tnD
zT)gM)&Tvn61Czg(r5G%AR;#d0Yb=Xhw(va(P$)1R5JGS23sIy{2)!EcI8%^1GJJd>
zab#hH`fQ?zpAvK=d2G1feUz6t(kc`3d9R<|_Mm}Kty9X&i~yuT!g~Y@U*nk<vHnQo
zpZLv)tJ6bAC7W_39}<OTL8X_f)>da($guo?@6UJr1KJGHMZV}k@5FE89?2$O^cQoo
z#s9_#(xHl_qv@0#aUXBXmLrd^(~y_KjdQh$1&LuFgR+{G9$#;BiInmR@ti<ZP&4{Q
zne*o>LG1y-gX}rJ)pT=$BY$jywdutk#q1<08SAyHEOEsenCLOsZ>d=-#rtNm?a0Tr
zO5z+(cZT;a_y@+NaadW|3E%uA%e{z#TzoYy{c>t+szTgfUMhffIAMs+eQ0+w8T~v>
zX51E-^iiA{_G;py;<#kkTgu6Uxdb?ARH@Q{MqxcH<(sKc&z%SzMvx<Sr?|6vOFVpO
z=DKVi&Y@oA#ryLDGk=4F9J66ECr$SPMV`y;Kg2_=L1bea4%shcnI}FsAt~+3Iu^)N
z?w^@a3t?gS%NQgNP|rJQ)KR=ukct1W8U+%~-3lH`lmfgz&$G8Hk{G@MGQ*3PL}EMl
z%vYVt?mhfBuS3;l9flC`DDL<{C<U6^lvHIi**=PM9V`&p{ce_|)zMuJ7HS6VmX?$B
zjo%WFXr!DMkm+Q`48o-X3xYp<8rZa91%y-SAD!UMvcobp$zJrLS|;NUn*VsI3=~)U
zHCw8}cy*R2B?dbkuU>!nr!FHSGxX?wVdp=r{{t8vufkBHNGw!+x73U5N(Vg&`mlK4
zV{(%k^`Ph^tdUUd;0g&Zv)-&-5~nL3AvYfo6KJC#w}zzi9@qZPX)U~h$)=mWhc6+7
z)z0&<sl2gbM1n7~h7pUwZc~{RoQnWm$L03wy_nzPXrJDbXq#C-ZSt?XWAr|N@?5+Y
z@lo@tmo=7E5UrZ<xFYP9lW}>%Syki^AeOhWoKQ);65^Sm#&T;T=pCIHzEk}!F~k%G
zh!f-CI&K?h6!MHWs&D>mhCKzGO;JZZI@bve%|{*!#hd(cA27c>|HF#B*2^W~LK4|8
zXuWfsZuq!SpCH^|6O;VsMigBSL@prF+-QW*0yXXqHAM59^oB}Hzo@iW&rtfU7urv`
z%6_ECnPJm?eD`WEi_OkqDpWOgU~0AC5EQ+R&{_{?X*la?zvpKk@b+ewXaNq#qR7}6
z$})LB5oxu&VYB?NO6=@7mEbhsf82#U{SBiB>l7U2aM0f$q|S6xa4s8j!j?EfV;pz`
zw;uE8lVH1i`FC2xU|{+#s@#8Ma3r_k4E^j(8<n}eswEP@5D0zSK4%S^-pkYy+y6jO
z>&NQ3?d}&Yo#tVN9kh;U#}KMjRi)f3AD9xr&jt!;LOgvNj+cMXlCO>o1cWh<?o~jq
z$LlMpp5E3SsEn%(-Kk;l#q(ce7xV^Vk*yvz$DFqw)eNZSKVW@=(qq~%L`R9kM5?C*
zRZ=-~pR*H1uWV*CkvZ$~T~YHZkw1~~{^){-R@g>LE(z4ul*}QQqNKT_2FZ~+u(vgh
z-_z?OgndCZ;Pc9ukt}(bj!R0FM@?H|xPO&p+y)+6U0jcFcTmp%a2RUcfCVkXAHZt@
zB~;s^3huRR0SF#2$&bJxBd)XBSJ<d+s`A8Z*t6KmXw)0~)4L%(Ma~vFp5+A`#&a%<
zs)gCRWT3Jetb`JPhHB{_xGTuDB=vhxmwPWSd4Ix>$$6to$4DZa#T<U#ylEW{I!OVt
zXsY<$w1j?hJ0E{O0Y@jy4lr2${phGA^|<6=$bg%wR^11;G|?Hkcfj{n*)7P?JhY&d
zh?c>j)aP%b|Gb>yK0I>wI8_JxAnv<`eKS9|#7RuS3x+S8Uz|@-CWup9d7=AlIQ{hJ
zq!n1~Q0f?Zlz8u*6R;a)6auS`v_doZxq6X-xuamWuFV1YtEJ)&&=x72g(LBcK1x%m
z2~nJN6TBzdY#~yc@LMvyZvSV<w#;is3yCrhEnTA<PWfh^W{ZBu4*9@s*fRwe_QrmA
zuamfVT{^zYV37y?kGr)Zk#aY_qz(bC?h_^Z36J+FCjt9^;A&eF{jg^SzJfi}cl(iN
zrn}A44F^`)e;8d$lPGPn+@c<iP_O^PdNPffVW9<+Ld%b@rSyUgoD7Zlg+I+AMQ6S#
z$6E&UoU(EY32jTt^5kF69lSHVFV}9HfdK=N8^pVxOrzy1P^_9IODh#=yd|c+-pI0x
z_R-jAvcy@OIMnf{H3Rix;FbLb(bhB_C;6B;ti5JRgTKTh{@LoZKkd0lIm4?ry^Joy
zbnuy`z~eo^V9X<w(IzPVE-<{mIzkLXR@d=kl>eYHb(?_n?Qhyr*=V;jjXFCI&oB7J
zm=UGx^m_@Q7?lj+^yTT*L_vKv&S;lIpXh}ht)2SCN!kggWA7l|4ER2Rk$^VxfQ<lQ
z!i++jO(IJUA@oTz^0S@+2GcK5k(??!M4vC_^c+Y?3^YZ5@Tj^b1yYA4m(VtBO|-&X
zpx^!Zn@{5NeUp2ywTy=I*W{su?}JoAF)B22KV8=m1m~Jerh`bFjnwe+Vy5i~B{s&L
zuWdRRCboOW7a(Sk<?<d1djAHkhIn7%)Nzv086}PlF=zZ0P?JP)8MAO`k{hv2g3qG5
zYY)#>s`usHUWn>q{99h+kR~=2e`{&EQV4DHtqz9)g}9eM<3H1s3>GfOY}aPt`^_lQ
zi($Xf#|V5*so2Ue)Xf<-l{hG>mBzVrAL;gKDmOBh9Omq@l-z9t&zOjIfje0SmU=i@
z*-xfo4m{tsUXKSV_yRGZTU`#+*H_Zl`CiN;o`($3WX^vo)p8yyP)%N>K7nqO0WEdK
z6xX_LB-baE&xjsccK|Z-K=P0V+Ng$6cD;PsA-i=J0by;L^JrSSW-_$><OtYx3I6c<
zlXYLqD(iwrb9H996ke{;v$*)CZQsOz?W{!}T>9I(S}j}La51GK$BC10Z}#V%xf@V8
zH%%~S6vMGOXDd5jflNTuVWryA+o{9aQ2LIfjz+mUBvB3?YO#ba|9zOd-1S%?L=>6U
zXS!JI^ui`%U>~k~%Vln!h+5z$s4KkXs$DSoVP9o?3hw-^uTuD>L+>R*$`uP|VWGN6
zSG@bHKpeZ-+xWEV61h&^$<C>Lk*$+JTtxkKCK9h#l1=OecOxby?98<KKP)WhMuC{r
zYM)p}Sp|hFiKgMj>z^79<I*{CG!!o0N=E`A<+dQIhTnfpwEdzJT%P~{yFLgPq+bl6
zCha!sD4KuM>-76^q?-9as;Z)H4{-wjUpeB3idHn>tdaW~(vzU*aB(rf@)!tB=jaJ9
z3lTLsJa-achVSL;*QKYO6JkyDALpeC4&#GN=^gVjc!|FfSNwaVxCMLTBKOQ!b1N){
zSqyv8KM#*;!YCu=v`H*~`;%BeZp8e8R$Ub>Hx8ZXOh4Zz#V9N6c&67;XEx7g+xg0!
z|FFBT%PRN}ev?sgbMsGV!(mpGb8ZY(@N`lCcfY*Z;9;Oz5%tGHLiYI33;AJQENF?Z
zNwT|I&f5_lJ1ysdibvLZ7NyW#6Zy#Uo=<Fbwd4rQbEaFd8I_X8&o}3(-et{|dCGy?
z5X4>Oo)@ERHah}(5@qvHq6&*dT~87`R&o0?jiGI~c3EjnL{6-^{Uf8YCQ|t<x8W-3
zK0|>N#}mYG4R#EO7KCYY{ZT~`V>o+}t*P@RPn$?lxgX*SS$np;?koMS?Ou{RayNcV
z`^Fu6Iqr4|DmY%wJ7fLIA)8qo2*~-!1}Fe<*Z_nzgrbo<WQJXBP40|<hhszp2NY9q
zUOhXpoZNek2K=-DB<jqAP7JmLUBYL%nH!miNBhS2)JNU0AC1`y2Kv*A!5XX4+|Vd`
zE3{r3^4L%=4nv>xxb-g$nIg)7NG9Y3nX=ozt*#Q(yL+7@C~dVUVP-b7QS`As(UM~`
zTb{}{iB!Q?At61@?{4VJK6%9FB}GNIp69{|@83J*Fd{{B+Dp+gHAsQ<-}~y#dL2eT
z3zFW3nBRUbe=Q#}`OVc=6nWDJLcKg~MeuHwguiG*nLGR{{=uOSue4cY`l}IB_yjA)
z*=${huF89tYRrjZcImbH`O3o!)c?zRtT5!w$z~Z?L0xF@Lql!Up32E?oE@zQ1OCV3
zbMp6-3ACk>jyMhb+siN%zg|4FuCm$!A&^F|j;WyI;9~By(`aT@3>UWFw?a%{2(|&S
z_KS+9^Mkt=k)-Ln=_YFiuaDe1JSPrK?tOq?dy2|NZ2!4HrJ2r&$YL3>tGo=?6v7U6
z#TLAv7<4XfDmfd>Zs)N1BsX?`WfKMlRw(!{*!7`Sgvq1VgmoIt>9yfUaz6^poh4hT
z+{Wo9*eLa4Q{hTXG>yq^%sqKv`2%})sJCRbLA_M*X@aUrtU;aukGVYTldLdYUnlgi
zEZ*Bi)i{NbB>LJ4bz62|*rU%Tt|DVCY39WjS0a<(i)F*r2+2WJ>q)tMb7Vt#Y{4~E
z8=D%xPe_%?w1GF3GQ7719gSF_l)iWzmU^Nhzm`rt=bY^y;`ttOpf0&f{Bp04A=tBB
z+$KkB%(=?xLAgRo97c1xI&Tyg=thzgp5o!fpw;hf0ggTjx~0r4+Cs>OyW{P_E}hiZ
zv?sH(9q+hc!+&tmIc~I67WJ<Y*sAxa_v;NbarD!&P9py-^i<%}Z<AiK??9{n{$tNG
z39z{q+@v{K-ah*m<{2e@>&1)jyjpS9t`c>-8~0ZH#&YnpbBn}^WC2O0579f_+PfP>
zG=@NSi{%N2E{3a?zECUvXWcD%5IPc#HxG-^j51}sJd3)!>7RIZL{jHl-<QLdbjjYQ
z-;14CC;>JD|D~Zjz;!V6FaJ3eRyBA4LsQfb;1`*oJco+McALy8`BsI5ByN~UJE8C8
zXi=RnQq1W&etvz!CCmLzKUBv$fF-z#t!N^$pgl?bC|3->Islc8yjwc!Ua)6;pZ|hS
z6AMeS%qeP^rC)Q9l<{3D%BZiJ;YrlzAFS7se;yP9JMW*PpP=%JAOrpisnrN?(r6RX
zAB}sdPN#W(727|~EXkTo&xFNsSZnucquf)&&h1|>oC$R(l%n)DQ+}N1K0&LY<V%%C
zZnahi$>hTA%mI@anBtz*H{=a+AD+6#g#;S!mT|mBsVxn;x<60be^{~$H@~G}Wb~Ms
zF19P@)pzw#KlLp^Q=V-%2ZL-`;>mqOdg@k;jh*gAXOuH_`rhzJ-R;<%Gj~Az)T$<&
zoFnRMzQsiJ`moyEl8)3RFTAtmRe0gK#)#OfFFhoz<j->=m(C*`I;&Ad4a=`&dGxE9
zbC@v9^K;H!9;eHIyx3AKf?dOud*Nm*cnMVD3wR};3!Daaav~l|J02osm_XkPprm$N
zBM&{JxbWE-VMP-BZCO`e+GEq~HBm&wlpMFczv}zR$^v)?QKs7HY7j?K;WK$zd8!$c
zs3;9-###GTv7*+yxqB>I3e1=UvgG^Km}0N-tamy`oD1J_DF1n>iL&H@rd-OyXUHfF
zVHmwC>U0T<%z$3U)`iNK|6?_vX)*z|J+vAJ5}Ve<s;VyEurH5LeYrl0U#tF}%Yf!a
zF7#?0VJPR}jhQd7YC|!$!zV)!E4e-bL^Xg`Btd!Ht1piUG#2oO)vZ)jmIP6@4k8)N
zf!q1bJ(+Pr)`7+`<oEFpa}#DwYbZMip*yh{<$`))`n|F-v(tanxNfe*A&{KoVRqvA
zZ)@v_eS*$K6*^W%>PN5yK?(<{@c0e|x$;tti&c%?^q=R@ySX`&>V_CUZyQm1jZAyP
z29-^<Ks{|FQ)qbjR$KerUbaP}+N;0k${JK31vw)RqaKv!&*a#^QgaxlgEeX7>O{op
zvUZYaP0P>Ks??(V3v-$e8m7`dN_0HovCGjf#|d<uY?EfoVr|<x<Bv!CpwAqw9#R@W
zxb`FGM@tjov4yW1EW_;B&j<89Z-0^wbn!gIHzKzuzGXCpN~g9q;9<Azx|5z){WDO+
zBTB76r=#wD1iLkt**DLkZ{syv+UULWZ~rJ4{}tF@upfry91%nESC4FzpG#7GWsCF0
zN?w;MiM#sVkSXP(JiGu_&hSnXU1V7Nn4-PfPTIGy>0GoS7-`7T=de!JUCPlG+6Nb2
zS<<jzP0nI5lO~HHkmP(R7Nq*x+hzvB@=#F7C$b(1VcOf2X_`CPRPdvDXc$b9x+g<X
zn7l(SVDMK9efN9Ifl0X;p#{B?aw<XBMk~$e3+dLTw5A1V{B7>(@2v}b%?I6TizCMt
z$Zh>8K`_G>VWqHcZEDZ;yl&Li+Sc=Uinw2;JB$mzd>^T)kv>}*WyPhXw1^{7lz(`Q
zT9A${vY9+|K7Mz#zY*W(wiRF?avXVM(o5_4)h`ufe8c_?^6N(QlA)X}h9}9tW_1=~
zte2<0YE;`TOV^t33;Q@}z!AK;CGAUa`}lsL`f#14QF)esv|<!}WTPm&Q0iK-Q90SW
zfc9{yF6W!%rC4Ti7&(3aT3I!TMq&^KjEC*FS63-*zj_(?TkU0UDN7&2LVQn=`iI5f
z9$iJfjnV<0lk^N5K>dyjbrPgNvv-7kLY~4Yum-thNKm5p-S=Vue*!JLJ?iV!NEq7C
zx<QqUb{HBkr-w}EjxiV0P(a<Gz#y4}9KlJnhjqM*%%?CqfCwakO1qb_las3T3h-TK
zuQ_rv0h{Wyu0!H2koABe`$U#2^lZ0%1|IWUXjv<ecK|{Me&2vltVpHL7;`-G<?GXP
z&#WZ$Qj#ex`?Pm3F-!<$RQ>hpBaS7xv~Fd1Y(aa<^E9^l#FT#jq!6Wa`p9->_@=rp
z;q9}KRK6#gqSu1GmBK0wEpbMXJy`P6HN0_kw(!E4*#|6y0Ib-=Ff`crOYq}Q?fwv^
zhvT6xIp3R4h^|=f+P2W{$5<>G8y{~f#)rqJ+CZWkNaot@O4U7CMFrj@8ry;Ofi`ax
zIDc3_;Scjq#`}eUM%m}C<rBId{sW;-#g35$JmZ>wHE;Xnpih^2v3=5wY-#E67`-M`
zDRb9Icu!?=`)gw#{p(P2XZ}uvp}N3yKFRwHZ%e{|{6X$rvn{&}V-B&m)=i_tv9zs6
zWuX*LdP&$bdA9d??Vh(DcME^l8$qFLNWAXsH-oO$t@TOLzo#rVLO~!7<acZMn1g`{
zxrvgjxE<FXL<;4h(}rkjb_%d!i@KZNv}#U-?q(J|QA9s|0xK6p@mMvOHsJkn`M%yD
z7+#4U{i3HHDoVy8_qm0m^oDp}5xPP(i07|4oSmXmSO|e0SkLsBQlW8>&y952W+K&`
zl-qXL2ZDwE!!qU0PnKPFJ#o0?+IHzp26~Na)JTCuFTVK;UU@gyL2rSSXzGcZFSO4{
zKazMDz0-tg(`WiKb5)N4I68ta#$0J$?0Gb)+Ph(6-QTb*P7~T$e*YPs5JiyotG`|D
z)15h#%E@KUV+KuSz@J+3k&tZmS}=dR(AUt&-gGFoqb#xGDn-D;x@cEXro9VG`U{PO
zodR3>J1sN(yS`>Etmul-EU^`mg6TGXMGM0BNky%*hGJ>~Zrx@u&wGHw<O4VU6rI*K
z-ZwpaBe)oS9SEok7ymZd!`+BNM`1|I9pu%RAYAyK`xr*KJ1vsl=nyMmpjo#k`SXWu
z+u4#bLvrqKt{hyi0n)TI%W*$-?k`94gVRtP5f)-!n%*Vx5VS1R+QlmIYaC@8$@KUe
zk~iZT%EL^Z<rmc$f}*YCK)vha_}(SY)_TO%cU`jr=%{+$&-k)iXoRS5sZye%^z)b8
z0ZQDqiwIZ{gdG+x5Tm@NnbB^j;0R<h&>q-33>nz_3+O}ohfEh{c9yKMo;+IiBYAe&
zAh`}VPOsv9D|pw0N5Q1b8yK<ZFxn#Du;0UuL*3<?ZWp^i*R20DGBM#PmM31kW)aA0
zJ(3=85H8+NKNttbEipkwE6)g2$q3^P#~m@Gd&k2l80(c9T0RxN;!k)bJf+wyB5B#6
zNM*Zt!Bv`akE`Z}JiA_)zT}6hi_iN!8@tXNrKGO2YiC<a8sw1o{&xTMrF_ikz)U|>
z4OF)uk=;dgc)S&@umA@Aen0HPm=O8&&Ca8tC$wfbe;zZx*=jB+XnR%O7#DpV`tXzD
zPZv%HlI45l!k`?HgH0kIzOb?WrsiEUi%7)N0lB+NwpM!#`FQ;=6~w3IH%6LV17!9B
zHyEqpg{KDJzU<iG@TPE8J9FzMb+!L{sc-~|ZSEa&=w_)a={bw^4;);!37hOMrEMF$
z-?ue>!0~eoOoGW{9%E*fH2YzsZ>PR+7MDfI+$*^f<m~vz`)h%#`c*va149eJ@?WI>
zIVQV!OP6n)E%RP)G)$t|12!w^Zv{k+8eVH4<=#K_b%u8MLqv9_-$pt8L%X8_H^(fl
zLs2OOzP!qcsSeAb;(U^1?@0{ecTHCWdq_!)fY!2K;ej{%NOMDzastjIcGO7DjY!#L
z?GChw2A*PdPlIO29gzCfK5KUW)=0sI&}J;L?#*o-R!{91lm&*+)<nIunt+FHjR`Th
z5E}Rzsnvfuq!df!0A_bt`#mFGeT7}3TM*@T$|G`{D{gVY(!1o=HOt|iV~$7A={w=y
zT81*bQR|!jV>q{x&*=KfEow(<d46yT`c#h7J{3mbrHS8^{!sdB*xmZGF7~giY7%K=
zvs`w(F*C0TDnt^IWx~`E{CV2RnclJiOq?X=E<fNgd=@n)mTzOZ+j;`4CmlF@hBDeB
z(!KL85we>W;0ikhAjnS`u?Ba!iuH0JjhFjy!IFL&I7O+5R;aLDLdWWPFAwR%dAZ??
z)3i^Zr%;k=S>4LL$Mx6SF4}=AbkXSVk^LBM^sVUS+vN_cbRpAXNbYo7&3{<EN}>Vx
zivFZQa$LtSq7H>8rFr&ghF>m;=(*v=maHK&Au~%b*Df4rx7&Jm8}JA=?03FAu=txX
zo)Z=K&Br#5s;f-zz_wamS8p+tzUoJNNgF5zgyI4GG8Fp28!s9%*ESe^O0NtSbsm`M
zT>{7VSLRbR$7QakSsb}d5<wgXZG5(zoR^hn_^sMtttsYlw4d9RPh4w%GbX7pk{atV
zDOMMcTGaYLg>Tlc-5)Y8p^K*7Y2xBD?=jD9*Z3XuqReEHurC~)b`K&#o^S0i4~R&=
zqd}uOkZun^HOsbz|B7FikeF26CS18;CjY!U;`P7U(q7_`qQ#%CcoG}B)A9UrCe<EK
zM>8}6n?RMI;PpnapemHOBK>uqdC9TAdTs*qg_*P>wkQ8=jn25_xbM}i%QXbqm7EWm
z%i)@72&k2d4RoD(GZOQyA}axV5Gx5paEP)i`nOZ>ZZif*b4<g&LW$Sg-|dOUPG&j_
zx2klr#5ufmA+=|rN2`cOI$rVOO^M1rU#;M5h5Zw`4LMB@K4n;Ted+sEEHUOnf5GHB
zT>V9o-oK45aWoVWmWCuh>wWEje8cv$tq{J8uFU15mceNViP_H>u4@fDo#TvpGc=l#
zB)0YxK2zzSFtAd3VxuK;I^1YVx_or!(JP{*Nffdl{C=fmozd(*B-j6(U-~`L<)pTF
z4Dj1X9hnd%?JOPBf9V$D;pV||h1@+m4#yHo-DiIhRnwW}L&>64>u{a%kki1jOt?9g
z8x3aTaJ6?+d>*Xw(<P|(d`V-ypT%|u<ikqQ9E5tq-j0ZCm&^UVJZ$0PB&^`(@``7&
zE$bC~v*@Uf2d9YVRBBeWXCOD?c#Cn32`QH78uKA>NPfw!^(kxo4wT@*4q+3yiG=)g
z{$(~!viK;*N!9}u3>vDmRlTEIh;5W=HRx%gMfedPALgV84PcK*;>eQV$)c)KJ)SiV
zMYHaXZ{BE#%@nF|#Hu!lll!p)x>*BC@htGb$6tXbL1(IUeIqz#S!PMxj;}|$)dVIf
zV<=E_(Sa%rH!AF$PY39Xo}}Ip%ats^0J{-T?4$*Av_)>rnVinKbxCHjVnpv<?g3I}
zw~mMlRRq76L07NaAFJeVQ2O&)Up2@%kO$^4Q0BIRl0n)cxshEosPv+jYCo+FuxW=x
z5j1e_dm-D5bM*kbM|7^rRybLnRRms)oY0O-Ny-J@e;9SM&Wmj&!t-+vxY4UusX`W#
zUfce0VO`m|66s5J^s)Vg0b5T0;K?RwcH6{?61~qmLTd<qzo^O3^e85`y#^6LdvrXD
z1D;k@Ox`DE<dq(qaCgES913Jd&Ikas4c&I7N0EA`Xy908hT%z|_C|Hc^D}w!H9kYj
z?^eX{k+*(lVSs2fWfaw}ISs~jkkK=FSs%CYA6B`MtyOybB>XA#tZd*^+jeg0b?ZfO
zW%(iL^Ewj~dk&R!!jlkorY?-+;HI%$0n(j`0iPt@`qW3jT1Zue!)#k(2#4wQgzC|E
zXAkwp*1lt)FYiT4_J+T}vnc|ru=kPD3=ZneWrZ4(YOi*%#1)s&^Vnan$GabRHT0;g
zT9cBJ7rw?v$&eM(K3>u&4jT2K+^4-B!ZdC%vrfU!_^KSM3e1xF%v(Nn_maO_iF@Ut
zhc8*26Ej{&DQd*>y-N_$xgP{J_bdD|fE;D0D@fUT1HiuDN>(3kW1i+B(-a@_Addn3
zh&}TAapuq6*$$!ei-w280<ELCd^0=_I)~J-s*izMGumsRe+8d`pQUYvM*$U`N2n-l
ztCE$`-SXiZCmZ9FWYEfO1lN5MMM#6*9IURZktRxpq7u!H%z~H{IcGW%9VdP8BOAi=
zes^BOSeMh-7BAv7S4rX}*GU@M#bY<^i`T#4FOUaxwyo_`wf)?A$Xjso9(z4D3ziBd
z25(j!ys{Urr+X^NMU;)da|w7R44F7T@tkP|m>AeLoVa^KiQ&&LnBC8L&3M?cB*tZx
z8FPLX^yT8qNLM!2XA8XCe|N4)kzx@CK^(bDPhHu&>)M~S1o)MBl_XxWoa{nrdUC0k
zM<Tms{_1*iNe9<R-t7=PNIc|WNDiUY9aLPAXb?@B8}$sIxsn&r(?P8emEIJ6XYd;G
zHVARQY1&J=7~j*j-(T7R63DJRs2!pB`{RdjTZ&GsruS;lVFK@ME@1mEhtc`Mbmy<Q
zF1!ej(^|4S4gMv^JG;t;x-CS7<}oEMsI)e}@TG|;Av1oACj(v^XanJ+<y&S-;<$@^
zzPX*D?iNH(JUIg6@dgg9Z9U<JGbdBa#j~OL-KL-9k2Dz{q`!7LY?g$Bm7rVqvH{&5
zui7K<KT*2IGJZom(d3HxCMimMF5TId!8z7Eba$f+M6E<r^R>UQeVagHiER#B+!mnk
zr@Oo&1c&o%|FUFFk$7y8(*rABU)1ZLmy><SlA)<QIIo!3Yx^K9Fpp<J#V~naZl&2G
zdSJej<(Pfq`qg~o)XTJitDm7dhy`25YMWSKOU)=-Ts7xnScQPIci?+j&4K$Hy5osW
z(-AH>De&IpXKAwO;n#jY3nn&q*m}Abx8o2Mb-`y3u@Z9Ywq|O-ch||~-96>e+S5Dn
zUazI;8)Z`Kp?B$hu=#w?4<AY~pE=Dl6L@apNW~R~x3}TX^3KSV5w?+=^AaIfb_WX%
zSzBUR3rx4_RlpqkFb_WV&xmfVe!E&AsJ#vMcZo9eZw!5?j+j$k-fhr+7T9uZxK0eU
zh>tR*Ykay@i&&jcw})St+S{6cW^Mt!M&qhE8&YOjl-`vh2>;B(YFzp&@p|sOQi@Bq
zWUZ%-vek^{nt2{aZ1mE{m}S{WO5kdcxS7@gcA{wv6{0#!Q1nZHQSG!@bA$$R)U*A&
z6;(IkEMmh|Qq<KO*b2qkH)-M?w=aN&Nr85&c$qF!^i}5D;hxBl*}MikLNY5Y+hZ<Z
z8=NMG^AeTmGa0Q4qvdX*rP#~A<S%DwIIgjDsW>P2<&@MV&Xu%JCa}>Y?TEc1(WXiq
zgVn*lT2)Eyg}bY&<!#;c;)8Yk#%HJGx=EtV8lmek39_$<KgILdCGGyblqvZG*cC*M
zS-wkYMu3_sT&`r_p6-cHeeGD}FMRzNUpTQRovDZ*JWHtsF`D}bS!L0B{!h7Z#Jz5;
z<2M%eM2R7N!?UgBWZ9W(>zPUp<fZmHRn&-}fPrz0lm4y>L+*`MIGT`2d15+;AL-a7
zj&v^H!XNx`Qx`;JdBLcPrFHcONE?(z>79IDXmzUP{x-$(+(Vr85<X75`81IpciP=`
zhLOVCH<?@-X1Cwq#^aKK=q$?{W@+{6T&Tl@@Y<FtcK^ED%mhQ3uWsS@USN~t_lRs*
z7<`XgcJo3&lTlFuC;k&iwJd2j+FVsU;|u9<>zP7Psi$!k9B=@dmO~MmEWtItMk+0+
zpbE8X{N2Xv6T#g0lVyqV<xB*0zkq4-y^`XEu?KCn9ASnXQzHwXX*x}KqZ9Oc3pHG}
ztUtbl*XtxOWsx*ia{e`VL~JFZ&#g5I@2f{_D~8O71);kB{f2(M&opA4{0z-hgi7v)
zP|bWzGpTKv8%vo>iJ5+#aWrYkk^H`<<{$c%(=YO#2A{0tFK`M`D;gGl4bAJ!hhJ#D
z0?gFic-lsEaSb9_V<JD+dYD?TfyG-zYBNHTl|_U1l4kSP<w<kz1fvnEYrVhe=3F*q
z<vP{W+Q=?}mv#vB8YJev8bI{5(IZ7gG?02|L@VZbLwi8|W$$$t;;)G`;)9PHddl=4
zl?7%VGyuzx6~E5^9{^iHq`vW2!JQ*n_<e087V<@XH1S-NCP<b-2|=Hf4cnL>S87;^
za@s{<<II{or$W@Gj`~eX;#R%7x^MKKIz^MNOEYJ$zb3td!ah2e!#b=_rB3=O05gkp
z4+OlP8XSS2b=rN+a>2DOXuVE}tE)Yay?zb+MjsT3w-)BlRfh{KLANVzI1G*aK=v5i
zI%C)O58;>WQFW(&&l;}1@g7*LJShNuNwm`rWxY@kfZy!?=}1w6dz@FHPNJ!0)br;D
z7SG7vi=H>|r^2s^N#cKpdSsergLn)Yw}-A+80J&duOt9-k;&S6ah0!)KW|^zmfOc3
z4~ybgg&Xa$3qL)d7;Bql;nlzCtUV5SC=PN^)YOWTagSY%X}1=e`Ja&*CaTuaf*6+=
z+m`KLqW=K0N5yC@wYe-V<l1h6DGk_yKyUne^sY*B<&n`=H;MX7HL}~FWF^#&8F<Ik
zRThp#jaAryPIitl{X18raBLDs8FBJ3&m@D>{QWA0#4LQbjbtm%a==i~TqZ28UFE<d
zpi`6nb4->ve6|sM%eRzMfGKIz70MG|A_f3&lXu(zXY!~+h9_$>25yA&icEJS7t^eq
zN(%2K%!~=g)7G@2)LJ>o>n2p>cK-khEH$C@U&C+Of5iU)3~ypOey1x&hy7HKk@T<7
z-vj>u!Ab6Q8x*zHKXoSD7CeG`*A62DrupHy-G|0Fd$K<uZTvl`EJ5bAmIOS8nF?+l
zy5oxV&kJ}y(nwI=YWjYi3rT`ym88M{0Cq6V_~N_f>~YhxXRPQtXN2t}jV9DC@1-tO
zrL~|zx3dOwo_*9;(%uTy{3YS+ynY&Mxg30w>N<lzKi=CIjD8tEjd9hL)sEUx>V2o-
z4~_PEUYt_e#=}o6pbsv|8yFbKXWU0mTKQk&eW3V(=FL8}DL^n6&p1#z3|AB+;VYe0
zBN@iW=iayCyT6AQQbT8UZkur=o^f73;*W|thlt&!yp-WH&N0uWdQ{^Xd;L#3tmPHS
z(8ICuW5pO_B#guYbM*fJ>(m#%Ia$=GJ6%VvNb6cPsh>WUXBygr&vP@x&Vb>F&Hx|e
z(lcDj7>Rb0Hi43P$0rr4S4Itv`$fo-J@NuLCj|chBUQsZncPS@AYk+~(zCcZT^|8{
z+FuQ2h3&jo0x%Kc3(@KG9g==$X+DH{SI<8Nek^N01wJC^UM}$M`{|m_nRb^JmocC9
zQYpyex}Jm{2qYdWf=}62zs&8V`KkIJ+^2#(L*WnjD^KjxYvVr+tU7;=>|#hYjV)XT
zf^axac_`Rp6P^eq3Ci*Cmb>5^yB%J~P1dH9LGezTAWb7ykxB+BkRg$eOaXvffIe3F
za7T1fyGy3W6-47JbZ4ggNbs(k`%q}HX&xvE;V+6hbY4}p<;G)+P*MK?EZFuu<P+09
z#!391@$Z1OkA_|$pH0^^tBor4IVn1kxOQ-Q754`RwJTZMqu5tZQ-F%&GHwoBKSB>v
z>sDIu+{=IumM{Ru2&%op)+W>BxW3h`EbIeZY7Rh+Qzw#mA5wV5ef{v;;U=ZwAKD6C
zZb)R8SkbhpbmhDIOACJ@U?e-^&emnlN55R*ag9f+HHL`%DE|P0jegYj-xGXFo(=Hr
z&z<32B4&A~M&kP9XLI|i<bmo*K9%_Ktm=S<m55Xa3JL38Wm)q{v%ZWuVy<}&-P2sm
z%-oV|>0jA9;N$#S_^D)*##>9Yb)NBv$SMyB^<pvf%}prt%_CZp<%?(SPsD$Kz8d(a
zWCpEevi3NFLvsPx>FM)#$D?Fd<<E%q9~XYh-Y|VKSqs}Y&jh$TE|Wid`Vrc?adc8#
z>#pZE7OQQ={Eu9;_}`)YV$;&wT8%BQ0NNdndG>Cj>C&gub-#%p1Yr9|fc#~vX_hEU
zq&7G1s5_Ie9jBja;HN24dNZ<7Q(Ed!_=W!f1uOW|<Bx`#w}bps;u$r)4^fR`x>>EG
zM`a8S1E?LvdH2FE9rzbd@K1=Xmd8=E@eTcgLvE~AbZG?2!~?-lReOW=u7@`{CnGOr
zpqhz~<3Enk=o9z@P|z+fM~L)Kv^~t%AT)5d+Fjv|7yGKLSm&!qM{50w{gVFxZtsZS
zw3ml(wD>h$4#&g`n4&Lc`+&won?qoZykoUgCwW;BID5B!537C^e$hTN_+bV0x5V!Y
z+-t(#Rr2+%ItUOt?FF+Q;lN^Wdx6Lm?7l7iy}T6qPMN6b8c&F|2;_1ndpj_RZh#z?
zW+4wfgLUGzQ%QT<m^j_(vFJWC{iyy0YCjIGd_}K#r%KeV#3JShWr``K+*Du)NMf&m
z0s3I{75u3F(*FP)8{=oiZy0OZMw24xnw-cjp5e>AyitMzf;bzO86Lu-w4-eeD8b#|
zW9F?(!8ckypFQmH?1DE~UPc)ayC&_wTnh7jGhfs+8^yiTZ)dTZBl67zg&BVl&2uMh
zPNuGVcY!`VU-(kq;_p$jms`5J1ybhgQIz11_H)iN?bf!u3#j;~<3EeqD+}vswI;&D
zZFO$0pfLjja<YsQ)Z^+;6{j<mlHAS3M(?5Ot8I02ZL8gCHnx{KgUZrenIlvz=awKY
z0OvdbUZL^V{t4^xANFtfAK?#*9y9RehMnPW7TfvS5-zs@nE9y96Pt2OyFd!(<s)k-
zB};K~i+Wqsh|1qRj~(z`vsys&-O69g3z)ZXanp{K`g{8*{=i=oziM9(-FV|i@Mfi`
z_!CQ*3#-T?&zwebh`)KjEAtfuFMLvpy_4!x-zse%YfGffWK0r7@NDB@INOdeKb1(<
z%^VVilR0d#89Z00qhrgzQnWECje{xAU8nS~!Y|rO$1Cv@;|{HMq?>qTFvJPZ3C4dg
zPvcnPG>56thF6nkm;5{M9rwk5iFzl7^x!_%e|a6OMY<z909^VigOYmyO@79H*Iq1-
z!v6pYd^O-t4M5Pph$DhUx5gShG85(4LPujE4Kt4J&VP!zX}exsk-be?M!u{2GQaG<
z@GHePI&Z`cCsdwjBTaikh=S%-a+_3<yK=KK61g2g$8X4A25I;ALhj)Uz|%8%iM)dm
zB$1GM<E1&p!YK+8Qf=7dHJ9-{=fw*t?{yqpyM(s7y}1gb9RYK|=m$R4^w-0m+Q-GZ
z27#t{CUmx&L!Vau)MA!{%xjJTef@E?0gjwjah#(j%bX)6WBSARb*)A5Pxf52xLG{e
zZB!iRJP}`jpS2&stzS+3rR}wE4Mlb))HLZt>1NOZ-dPQjCIuK^vBzJRj)uD?xuBWL
zN!iIW#jdq2SHe1k53A{sUrMJd_PYV4ToOB^s9FgK=Z3~>8Ve0SQC4j_;%M#zk}U5R
z%8;o5gephgQ@C~KKT7AT?rya@X|8RyJ=5S1#!YMBH^e^=Yno-1xx0en&Ovp`+{c}z
z7!!ap8_<Gto|XEa@z4GWkE;A*u(b|Nta2!Z+S1)}Rk6wi9b4Y2jb29Ab2^l{pEqOV
z4+;D+u=uCq+o`@G-(P9Aa>wP^CZBQvfxo{a5!8ANk6iZmf7!YlzYKWO#2*T^=Z)S=
zi3N*Dzbf8D4`b0Lj2w?nKZw@pIQ#6z{MsY%d-k9BHhu#9Z`L$OqiD3^Mb?}jsJD=u
zA@@cN8TUh8W8jYxzJ=l>kTyBmIrpwwi;|-{;`yL{@ccLNJbp6pMwzJ+S?9L`LJwCQ
zH|h;~8_I~M%mL625A@IY*P#c^6#AZfR&5M<VRMw-yB$c*bK0x0Fp>h927iTd_|p?0
zYX$O47ht61WBFGrJ*&epLc^#9m<~pLd((OgaYmZ1?(&6@XDZk|eR25IsbW(EGKc6f
z-leBu++$m_s);s|58iI4o`hqiGI(MTutHVwlDQm@N-e0<CWMq2B(r2-9Q6MHK9yme
zQSg@#&Vc;S1BdQ&&#$rOi`!1)vwHS8`-|JFxdii0^EtuaBNNBtT~~*sp5}F7DFePT
z4t|`~NeT|f+MYA<pNG6p{et=zhm*riX{SeRcvkSu_SuKtnB)zll6dF0rDIxnvRgu+
zNxc_>K^%Q6fyM0gJq0Cp){CKARQS1ZXS@rBMI7_noMRd0yk}SV#eb@-iyY78f3yh2
zTxhG^kvjI!^Ox~sUS3G#f-p|N4gdi2lhpBCwf3ei6@s%YXYUi&ljt+;T`-M~N|JKa
zWH)M6f^I-K1+qEytp5NZ?ueABL}QTKfG%^_-!-B}R}$qKCusoLwBSkIhCM1PeL{DU
zOl}J9%a`rPwHp8?sJqBlAz1Dt{{RrpOm#S#;hZ@jsTsi_{{WwAFK}wx82Z(vw!7i^
z?5?9*i+hx4=8jC_MIeL6rG7B{SMV+O!0#OWhULxHlW+@KNOSwh^NbVIa`BvfYm*lp
zrT3jUX?xB+_CB`#jDKt|7yicI6s$a5;Qdd@bRJd3ysBO+*hvMTl|PA22cZW95I`gQ
zSpA(pYcGQT0Ps{#2uEh{$D(-SXnV~H>QUzgRmS++kF+2e!C&4e`^rEWsuONLYw<-_
zrlfg4#s2`=+r(c7?3xSxDEQOC@shF49$D;{JOLmZkYo5<U~}?=&3Lp|_TDGZ*G{+B
zEp?qSPZ~Fg?F8OldWC**^~gTLx>S_?dZUWYJDy#x{>pwE@hCHY!W{Mt!yst>Ax*!O
zp@^(~EA}VS?rx(|quy>kBD&U+Kz|63AJkH6U5bl~-Je8gzq0Lz!OKattNZ&83Fy}F
zm%E*CjElxemB}DrcW=VK2*2Q<zwlDMJH|Rq?|^<4v+4dBJC{<{6cl|#^dV1Bhr1q6
zYz|KyX*lTjXH_VvyDhq(&X0>cP?E^eMBAfY2_5~b#&u0x%^^|BbiuDZo$*CoCrF!G
z)S<Ptji;Jc3mPEFVtZo0em`cvgOGe9_<Lz&!2bYg&xvoDam(X@p14pz{C(@M2Mfu`
z^f~czw0V1<O-%0uO7Vd(2P_wi4lB&QDEuhXek}M_T`N+zA+fsNU`FU$oG?F+BfWP{
z3UP6LP8dzbNu%+{;#a{9SK-b4w)b#4gltD}szS&+5Pf~RijToR5IjNP8A7D4&^HBK
z=Y!U~S;57)v)F``*D~sTxfjKs0{mjobp0D$&~3E&VTB=Et7Qn>4o-c^B<H!!avm}L
zj{g9%bx1XD22U=b07D{2xp%8=IP1aZze;gkx)UeMsqmMGJT<HMZ%~#kQ%{=OeZ;Vu
zBBUPuYX1Pj?;Gm>01kd5X?n(obad<Jt`z;C8~`#ip4j!Ip0^&2SpI^3B7V|Z#rMKZ
zN?_V|j<m@k5Z=XRHp#KZ(o~_wMtW@?y{mKfa`>g;pAUR3SPzEpCa}Ey{n9nWGn17H
zQIUe<0RSV~yC-PLUsc@Xifw75?0!l9*J*vP{8H47j+t?5;mc`T`!d_?;x&Rd0FV@L
z0V6oA-vN9}@aD1b9@oN`ejYGiTT0COr<gF?*zRJy5*1kR3F%zgIUN@FPm#VMc#_WR
z#9ktX5%!xKi_+GmUBajbf&nKyamgp%yy|V*IxWe!1^26>%O2%^;~@10kxR__@8Fk>
z{utVLa@OC+Uk|VEgi#ch?@yGde192St{Vk&^LO{IkHOleli{!07Cm?2wvBq;5oy*t
zb-71&GAtpPTWMkdk;i;}(_Im8X<2*54l=vEz0=%3YFj-cPS<a3{4|R&l(D+of}&E#
zE#IiYz&(BI<Bu13@5FvS)a+Zt8qManHLMG3WVaKvzC=Ksu_B%oK_rDx2R$iPZ8oE^
zRAcU^Ezjv+{s?pb00f@!KkZZF1L6;h+WauVWiq{&f`q0ibrrxqWR1ZQ<l|y|#~hU$
zAM_RQcZD=h1NdgcM9?(rT_Z@cghOX#XA;DaBJdSaZ~z{dtY;ZU$*USuoM)<cJ{<k5
zKj52Q0sW}F?M&N`4tSw~#;auz{ptSzrjhWneRywr{%OBzU-&2I#1GkG@=3Kz0jc<R
zek0Z_6`n47Zy$Oy&|$IcO?P2&9M-2T`ab6#CWj;Tk=v^5esOr`!~?@#8PsnJ5N)jF
zl;CyRryt6{oQJrQ?&4`nZQSJYGEG)3?1hF~v+lq6Cntd4#y=LdYrup_4w`Lk*nbSS
zvZbjb-C>&H$Nh87eF5V;Jzw^j{k-)%4-FWSc<&^)u##ul9jq2=R6ctz?(_9}=a2B)
z?#*Sa@7W$P`$cN{j*amLSBhxt^=s9cqrZDb4+X@7tcq|sE!U5j<n_ruZ3l#(O3+OI
z0AiC*mVK@xmQBo9^e3J;^`}z&)_n&Lg<Glf&&1CYSZcEAI(3}J;uvSlmjyW8o>wQY
zT-Wq}{{RHB(>w{|kB43-(IN1SwVt<UZnnCHuOx!uuF`P8famTEFDkra28s<jiu#jX
zHBUq6@7Oa`eLCyJ{tUd7G}e;MYSHJ7$i#n2@c#hXKGRL`4z*|E9bnugu90yhlC`RW
z!3r|B2dFCS2=pfyI5pEW)LL7op@bT9*Q!51elGlI(!MS=hKt~Re%DlsQgV`8%W379
z(S{2<Hb4U>fzK85M7P?n!!0LU@JwdH{{TjhR)$-RW-Cm|8z$eCUpY_;;DO&f@^jBp
zZl=CRML4Q@9S4nP7T4Cd(%UKtn+zid4e0nCI`#hm3iOYGdZo3m#7I(TgBc<)7GxhG
zZdU~Rs2qCMF!v;{v2*w0&%8{EtZ=|aazG#-$NvDWT<63qtDPTL@b8K=@>2da-WY$+
zYiA6EpH^IF+Pyies~&t_rxE`E1$_8(XR7Jm74gQK9&GNm5Ws)S8@SA|jQdFp$Nt*a
z;Hi`B*NWY^{VR_UuGG7uwu8KEe#idC{v<k=!y{<znQdk#uR#2d)EfITB9d(^b{u+j
zuBs03M<rb*#>Wh1R@=$-0~}L}2-GtIaJ>Uo&2=-l?=Z53SJ*m$MnL1&wNWe)@X8)R
z$-{QVD}{{v$%8rx5m+AEJNjmr_>llm+2C&U1Nq{H?hK^1fCAqrZgc!OB>GjT>>Xps
z1e4bX`p_b}SU&I-h#iL<A6kw}QkmMAT;YlB@Aaa^ZecFi)d6NBJ-b!?Hu+$cKyNDt
zuinV?&0AL@EbL<Ogpnh%GO*4Ae=5oU0EEtYr8$sq;P5`~Yd>b2HFadPIQ#un-cIXr
zy^9~4j<rR6gCQa!6K*);1KO=5jGUVzg61glQY7GKYxA7aTU$J7i2zZ-403avdeaY5
zOQ@X8Ryj*9akm4meN9@CbAs}K!z#UV$6=10`_diC(?HjEs>XkjM<*cU008|3NNwSk
zBtYmDa@)brPS~QtW;|9lw#mLnd1XI8%)9~E4{E6`u#yey8I=YO&Y%PRed%mFiE{F-
zm9#O#3LthU%Mb*T0mkm64ZlJ7*Oh!)_-$qJOTx10x~zU_Wy~_fqjkIg0C*AK)Ou9T
z3Q=)mQnZs>pOii#(sgfvo+@oSQ5&LiO|`*alI21D4^BFd=jwh9_>~>y^}Mz>&8O;c
zNUafB3~Y`LL028e7_T-B!d$J{t(oaRemu)&e&&A8fAC!Ij2{M}gHG`=xA=pnLZMZ)
za?xC(`U|APH`YM)_wA?r7RTUc#S2e2#(xWSI~&&J-a9Kh;h*~IOfG*BU9qVdd|ES-
zr6%=9H?98w!BPJJX01DHwmuv20-WSU7LgL}KA35UuM7B<{{RKjw9xcfZGIg5GfNHM
zDqib1D1aYR1S6mO`A&7?Z8c_b!_NBXei#1KAGW`be`vXd*N;3=CDocSXms>GOc5U2
zVO|OMId6LW)A5(Y5AA1?D}2Ro$Sim)E6u4U-TIz|I4G+l!ZkffNh*Zn*F9@G(@&dL
zzep{jd8U!}#)!ErN#J6!-RN$#N9`x<iTf<Y@V3c(L9Z&lyDASV9vke6PayvQv`1e-
zUwB+f1BMc+s;C?sX9Lo`nl$~C66@6RD^&KAzfOcdY5=%$6qnn#cRydpntJ9-Kbk_r
z2Y`7W=Ze>I6EU?t63bhG?X?SduHulKq>*pqw+HE7J9GOect^yt7~zI}I_D&}m39J*
z^x?Nw6=+7T`}Z}cT6F#wr(?!ELHh_=+3M`}ej$<>un1Wq1Rgr@Mk_;2_-o_;0ECa7
zHdyt$MP2O@91;g#l=b`#a!U&+YZr5>IHfO%Tg?4M{g%Jrsox6x0jJNU{ABnkYvY-c
zF&(TI@(9x3BM#;#M+Qb8#lh|Ak5l+trGLRUekvu@TK@osyj|f-%a$8wH)2G$<o(|$
zjE+a%jP&}~6uFbJ(-jx0XVaQj{1K=2JNUGs^WjJBF+YWF<-m<KNs&k+whxfs&b+tc
zulyT7@qSGz>rn6?#UBoM>eL}I%$Gh?&Npw!Vx$63e>1t~6|Xyrw#c4KyRA>k?~5Ps
zMgIWWlfw{22CwkLU-1+c%u8KqQ;WA`?gqmqJ7DeYUmRNg&KDmJJ|Nv$_@_?s7lE!~
zi9gYGEjgH==NTAWWP{G$#*`%qwS7FoN>TWC>}C8?@F#;j6e86ui)%NAH!N>JMN+uN
zBic6;o`;Sr?cFcHULF0TJ_~qqUlHkWKI=&3U$Uu-%3uPO7~~8A$4)(~wv1rp;I&rV
z<*erzsl6IJt6%+-{2kz(8t__phU-JOxwn!zQdw42!>-Z*Jd=!f&3HG$zk{RUBv<#-
zYg0p}%ei1Ko>R<+8N%f4&e6}HrB<4z(~H=uGnGs8Ejyf^v#Q?wO4pM_@YRW(*x+m&
zApY|=VeV`0FM&U^7MJkYMX2gBMXPJvFmevq52Az6=e|EGiZuPCxt_>%>T)hv?$5CF
ze-vNnxA1Bf6G>-r3kHr=l%pveh6HryzZLt1`y&4U!Dl>2@b+76FXALJc!x;HMbx9m
zpAgSe(PY5KTpl`_>#0puji1Qmr%}_FGWnm<-@;#x9vk@A;b=9V4C?m!#+@cI@JW(~
z`>efHhoP@Y)NNqawD~P=AxYqoO1yF)VCr}vj)uIcMpWfzqerV5Dv`R?Gx@9k0D{*4
z0Kqmq5#gWN1L8Nte+jSrBNy6!m}R)r;Y`DD8P!{A{{YK2JG*?mbQ#Tmott4&QVtjc
zo-3wR9au(BeU5n3ROI5e-5;`F@JT%~J1cE>RFD!ARJWHu?7?Yx#DCvXq5K7T@9bNu
zHJ6V(PpHWFyq`re84F;aI_47iKBZOv00L^DuNeB7&sj<N6u)dx{v6lzyWKVs1cWnQ
z%75jma0cLbBw&p7=DeD1ZVwabQfp#)XNjR{&<NXe5DxA!=sMG`)MnGrbW?Cv)cD*(
z9rwel!w#LgNaif^JfIlZl2;3yk?)GBq{FRRTHA<()^M;<xn&?RIKkuV-mq8E#NG8w
z{i^=}f_wPOQ1}n=l6@CfmTgY$CNeVG!z9eWWH<^2<M&$}at1|yl>XCNHTT9J4EU1s
zPVn9Jo`%-{06oU3582BGAy|n1{{R4!$Q%mmr+!x#t2n1+Q=6gurg%HS+SZ@qi1hs~
z3GZ(t+-=RYOw9NnHv=aly?*Kc0KqK(0N|cJD*ph2g!r0W76{iz&~)FIT-2wGkpj7H
zHt=3nA+Wh0bdo?7$0;}~`JHcF7U$O9BmV$`N_eM7{g^&CzMZPu>c_wyBh)N!QcNV~
z*48AND}YbRa}0p($Rm(5UyJ@4y1CQ5nOuM)C=y)q&JH>boZ_{vm6MN4qA4kApUC|%
zx0P?L;+8R(ofbvUaDT5g(`r^pseCbWlET|njzUQ1YpG0sFUq^tsWXDsWslm^MLsb9
z0D@oWSMw0kY4(j7$mBJ>^l>LX(fNb%HT=tKJ7KsDj6Wlu)yatXVs>HP=jj*h7pXPG
zI`l00{nTtR+XRpOn!ib)C0wvwxyCTveGV&pHnh%sLbTaw=LqY&1e1o_%?)&nxpXn8
z=buja#dMflX_<a=fXT@8AC*318!Hgy6aY4==XD{bW(D&Zu^w9(0Gtvkw2YV}MU@AW
zx{_80sYX<C<&-EKWD&a`g;_~LLRc#y#xb6Pp5q$#>ltP!1cYPeBhs^y<VH7=tTCKm
z{{Sj>xL(IUkar^x#Pjm^rL|#cAsJ&P&`2C{>Gh^bVmTcg1W=56?&s@NoHE?7g)kI?
zcemao(Xb9T%?uJ|6k<VL$EfFw0q$xQk>!n}P;yAXBO8{L!pN|Z7{e$~4(vC~Pvx3)
zHbgtAlWK*=03?IhQ)m%zMl9u#NM>+xxSof<vG2`3TR|`ohES|XEDvtIe>yA+Mq=IR
z=(&hY03?D+;{&-qz3RhxGptd#NaG2Rfq7%kTvD)k8Ou7Q;1aO7hp199j-QoO)Ng=C
zkR7oZINHE_V;@>fYq85}I?J<`k#Q&;17t=&$BOg)SH))BC>RP3Fx=$!sFN)#o)_^d
zZ9B!<O!j)syjPJrVNrp~9)N;6AEkb0c-O#Jz5~8{jV@8BY25zkoU#u?>yJ@fIGCsJ
zE&8358;`rulyr}c7q)hWDDPxg@r{=wcm#GCuRyc?q9=DzJ(aD&^6*MIP67ORtQBc>
z)ZNlg$Te@;6YbXP9GY4J4svEBdwN%#Yu_97Mu{S~k_$8kf{Btd?sG({-(g0YM~P~l
zB7H{Tq`0_}=2Cw1Hfx!>)gE>uIb350wPfARQajIwKL_>iidv#u>2^j$X2G6AwHN*b
ze~_=%ui5+de9^uND%{-0nvSkO-*YT^5&J0Z-=4MCg`;=RExH`oind&l->LO_YI0ph
zsEQ?3DnJ>{XvL^3<w%*fk{4>eNav@$dN;YjYZIIFXypqdJMPcQ#E?fLj@_!&wxA@8
zFv)IrGY@Wg{HZ1lXlO?>T&oSakT(M!=da~Z8KaG)GD+pg4<qj!1O9oZxUFGQ^dk9;
z*_a=c5zrpJD_$K@43UkX5;DU*O(*6%9NxbLp01!zYX#Cie|0P><Bt5~cds_oJ_&eJ
zS1wMA6}*6vzS-I=A77V>%5<YsbX;mmp3LH|{sGx(V||Z^uIwKi0^!1+)A`q)c#q<j
zjy?xLCEkzYtD-^L771j9&)^BJO4x2x+In_6sbU<Oy4Sh(r|i@J00o-;s6G{{9V5kh
z)~{(84diNT_OxXkKoaib=~`bEzu>GsIQYHdpAl-`5xgF^m)fjqk9hV?7=czWfGELG
zFbTlNB%bxhDiY+;G`pRVuO59}&#(ML`(=L1pAo-dUmDqJ9upS76RwPnqFfs!k~?;n
zWM~711QlGialz-FmHAn#c;Df)Ffv)|I;NEpyA-#zxiN)9_d&-5g}}{e1mSBtKCDef
zSGv=&;@Zc@p9XkFc9Tcb=GFBgaF<$y#$r7%4r@Qd9}Rq8`$OvEP}ZfBL(v%S-y&h8
zT=Z1*_dI=TWSvQJubVTR<4QOCk@^qt%i-3G@W)L}J4&?>#7=G*`FV#qEZzSA&lTU@
zN?thxYq;(uFg5|}>-?+GgcKE#<<5NXne`uT>vtStNN_^ou*c=bJDSplWo9{5E~JJ$
zjQvN`6<Z0j*?toK&^|2q8R7-jd@HWqX!p_JH<ZH?41<PK!zts27_aE(_C)^xg3f4O
zJZN;Uh_I)JwJrkcaAlyE1D(Spp(h@r>59g^6;)}!LuwUWC$7(P=->D&#-(fHfA}R=
z#!J06=`ZbO@Uz^<EE0!DL}inDu;7dWb6@35TuBteIXu@Ai;Xm&clsUN+|#=3e%Aj0
z!6~E~hl6}mWgjvdnUf3aC6t?g^izIS^MApw7(?)%Ow_zbe>*mla4mGlwt;f*B%9_&
z$6cfB><&A!j&oYm(kb?46IXIesq`i0h2j4I+D_3L`o~kWj^0%R&xN2j37qZcJClz<
zM{H!*hxngY7QP77wB?ClgjyKm*l>DsG1zpd#l=gOqALp8ykA4*d!GQEOW{=O6fwu*
z1Fc0IQX}Vd6U2OwK;ULXVb3+}{yq3h;iK>mPVsh)s!e3KFhM8SWuJO8wl^TpA%kx2
ze(4odsVO9$nhK=adTXfv0ND%T_0Plq031H9)3wdzo$amL86;+DB8iA8&Uo5!^fmnw
zYySWrz9alY_{FVgO{7`d{4|o>M-!V&n}{R?d8*)WLg4apOMVqprr~>P%<D!irqAZj
z;(nXrFWE=L5?WnF8eB<zcWVre;rGR~1|KQPkg`YIbNGt=fd2r3S^ogRV0=~o00i^!
zcDHwTrf8ll@Ls2=eXmxs`)IekhEs$Nt<FIh`AW8WjkzYXborZu(_5Q4TGL0+pAP>3
z;I%pyz2G0(lSI`tOU*x8_^W+1ni8yv@!7>ZEo}SSAnr)^V5*SJG4hK1m+)VObpfW_
zU)$SFcVI6>MrKp73p-(VV*r&$V7*S$O0=UTX!mdW`;8%ZtH}PQb<g-C2Z*Kk7vWD4
zcqdd%VtcI$(&p<&y<rQaj|#JdlkT_7PYt&N9Gd*w@sGmYbK$3hHQgh`8g0&vsvF26
z5MDx2g9grUdW>fTaBH%KNY#S2>vV8dr7Ci}+3d`Zjn++X{{RGy)gI)6=k1KGj=8<Z
z{)9z;DZV1aTX5Or<KD5a@JGI;_;<PY-~1Eo$u769ta%}AfhVs!$NBs#^%-|yg08?1
zn*f|vxL<(75WjfH)nst2SVT)46OWdxweOtZWZ)iH@rvoOj>A0S%1F-8dE{}AYLrj3
zGN;UevPL>_MS}Vf%;7(H5r<#_rV{MqCnu=E>NEa$pf)18yF7<%vEzft{Cz#D6DH(B
zR|j#=Imr6a<cD;`xQ{s-Ll)o=Gmo!ouYaQX_O2MZ6ab-E!vb^8PDdYs`cmd!GL%j}
z*7Y4(<N**KfOV<KR)__B9ORsJ6``Kx$S09hrZ)vAoxF43{{XL0Tsk7NMt62BIxjxC
z_oOBx#O-V(E3^<!;)9>YqmJ@37Qh)|2P7Wn`O$D|xoYC&WOXQ51_yIz0Y-nFNd~8G
zi0JYKVUo_6Cmp!|0PD~eC>>!w%pFmX2Eyb9&%dr}<%fy}lc_A$sIkkOB-=sGexsr1
zG@hecYC&<WNqKNj4<lu`zz7ep?^t(Q+p7m)T}eAJleqNH=nVj4e`z(X^1B1RL7X;6
z8R?H+E0EOn$Ce_JDv4L_ZR9o%3CZhH-HVF5Joi=A-*620Nu<asoiWBvJ7<dGHJwby
zaMDR8OiD+}4{o1{{#A^fjiQej@dPt8gj@y)2yeajiRdfm&lTvh%CZ5uSTPvv2l+px
za@9?p5NFFiF7PzQ;hh&P&P{o3&WU?sT}m+rgY8^xS)D1SVmP=*<rwfr4r-ocX#gR=
z8j_8zH$)nQggl;F{W{mxKMlMg;XOL-8&R~9@=?nPjzISSe_YnIlv}*EBBOS)KJD<w
zh%IewBaYo77R7N8iac%h$4c}IKN3dv<%1oBV}=<g*1aV)Z4W+BcQ&ncxXrRmt>wmB
zx%3{R>E5-H{k+tcHw?!+uzvSB$3B&O#5kKRuVOGHA*Tlc!tN|jTpz=stz)VZ=z$hi
za9eU7r|JGpG{o0KUJ~!+mXpbS`2?vM_WuCu`&62)re(Vc8-*LN#TSA-dG!?7t#Syj
zg!c;&B0Q2+*aN$+2>SX}i1l}9TWkLCpS^%aeQ3BnO7m+XOe}7|hv-jH(EfFoeW|~e
z&lfv^&Iu%coKm<Xa$1eV*KspQ+lFwQ;~2+p#<@@UMB~-(7E6^6>AMY#bgbNYv^7ta
zT=k7FPKwSH7VNPyu0r~c!_vDeX?*g@DDzhs!8{SpYgD=!H*<p3z6p3k#4-u4bZA-g
zy@YJh1GlC^@M<UhpF9_+>@#RkKLiF6x8OKD{{Z!?Cx@op>}l=hm9BPv82CluZwRYT
zrf4>+JY15ohIJz+sps;|dVRg*h63`T+MmLmRQ~|=^P18yj5La|oTn-3*`XD}#ATOq
z5O`(I)BS2?Xyv(90aI}4B7>2hGCNg}mV}bss=0Jvk`==*3<$@!y*}dX$f_AxcVHc$
z5;5C9g#o^!uB3SwFmf_7Hvp%PeE$HPQzO*phCuBR3ak!rMls*6F~u#1W7@5MY5xEp
z_($MRj(iiR>koI~uMp^0mKQp8;olh&#L2x>k+p_$2*!Knzm}gln&HqLppp-K*Cs1V
zSnI=ITl7Czzu=M|5Tfw+#hp`1xqL0m_IGQZ;Y_y7KP$k0;5GCg?ET>l58=n{XKA4L
zw#V&$9{$t0((f0{C}S<XVU<{9h7M!F!5AkXjw?D(-1AJTtKMt6KXSimpZFxFi+&a8
zBgCEtXYt2`=7DY@mexE^5*5m`MmceUK4s5*s@L;7@o&SYM)3}#9I}*@T|fFh2q9Qx
z9P~YLk7~N^HEDB4rv60Gi>FhS^<R1Nca1d}{4JpUuEO1-N!b?lnB+2}DOL;Fk;5G4
zq?oRD!%(^Kw~O>$NMBian$qbmE?-QSdc~(ajC1nz2j<Af{{UXO;XiiWzZ0Ty*Vphp
zpI-2Nhr&M!+dlLE010G@XNAy~9$OK&o&d(z45S?75Pd$g{{V-$c(1}g4ZJ&|>E064
zQ(DuYSf$kNT*xKbr4_ue1_&E_o=4$ZC+uDAd##LIJ*w3Bzr?y0q5D?+dY4j@P-~mJ
zsTzG!;Dic*e;TUb0K=l5c;xzeSH*t`_(M*F>0TI8Zy-gJQM?m0iDw#~bIuHpjiGwv
z=A0KlHA!yv3AUPo*=~8)fP5vWU--?fH48Z;TRpK`NEik4T~+*&$D<9)k?Je<r%3pE
z+H8=fq@o*XNVvY9+9i%Pke{CsCII=Jhzg(qz{g7Elx25gerVYr-^al}i@p!|so)z6
z&j#w&y1tPdD-=y{AU;~C04ZLoc<8_y{%}9wv7ZsGyhZy!L8ipQNVMqCvjfw~jh)Bm
zHa`mK!NJC)ljw}GGmNP#b!X+@{1iIi{44(ef?N1kM{pA3Qi|3mLU2L2nQqVIAdpw`
zW#VbeUZRo61e_mQtV{PJ=tdi7>VB4g!8~-vgG%uhqE&)CkwY0Bw(ckDK4q`cYn!Ea
zDvUrQEwyoj`qubuDctA8Ki)E=rTpMSZ&TB8{{T3uespoL+m{)@EOU?6w=r7iNajX-
zsBGYN>GYyof-sSxf1jQQ<v{l#pHYekS*4XD0Fm>y-Ocqq{*>>vNpUGI6!Z6)znvt<
zZ8j=gnJyz-5rM(UJcFEP+od|%eXxkgXuuqTIts1WiEXc%2^wAJ?&lA|&TG~DGvggD
z>}|h*#GoIWc5(PtRU+Q2b81sjc6%NJ1k4PDLENeW=Zt#hrBE&4W@nJ2a;21V2VegH
zU2Jo)?I3Vlc?rfw;x_S2mE=ase84VQV;|=f1G$th{MFpf*cl}cKy%plqS&nPw<QZU
zPI`m-P!8x>Odv$EI}%g?fZ&h7e=}5ae$gaq`B0?o2caGEC}5dxBtSuVvNBW={{Yth
zRQXE?!I8EwI0#dvA&`sJB#70cWlgPt&JKNg3=ij6PaJ=14q3M-!ml_}-2VXe>TXi=
zIlW5#mQ_Vl8i&9+$qn^2#$C?V%^(q!ARm|!^5Y|u*Vl@MT1PE;WgWB(UBt4O^N@b%
z1A&ihR|%<FypuJ;9he}Z#xs^YbUvKca?sH;guS<Dk(NQ01(<C;{ZIMrUVo|S=v*%H
z=bhOZ`MduB`s*npShLQxJqa!qm6If7eGhJb5nger_;NRA%Hg@rN9p?35{ay2ayMQI
zg|K!28#v<_^{h#}1rm^aphhvk=~*}$bCN~igx!#wgVMU)KSXG-jv15_&U$)^BO49M
z=cagm8T5%vaL8Iduk&(9{{Zz@tm)n(GN#Fx4#RhU>+4+*m9#LLPt^2HKUYa*P|6xC
za=+d=>5pOQT}_<p5*eY|kvkP-Qbs=y^U}I6a~BgrE7npG2xK{J%)k(H-ycr3r)RFd
zR54+=WEE_agX>h8E+H?7M7O&Y<wh9Z#1IeX_*S3x!^v?OU4cRQijr~p4)pni;!JgM
zDi)I<V*rEHQ4X^skO~zl2tael9OV9VTwJ3h)|r_eRotK-Z1PX_s^8krIu>jqhCe9d
zAO5`3xFw+Vkle~kM#G^Tj1R-|u8z>ghzqzYg1Epx<WoTQHLWI7nL_Pe3xG!>*Yq{6
zmq8G!jfu(QJqKUMn!A!-6StV5n{Mod<Z=0XR?1%njagVT1;Oo;`1htx;VEm9R62l*
zmcbYxAJhK;ty)J@^Oi#qEh3YJV~}y}@BJx(Z8Zsll`JAb^KyC42Y=42%W~NY&ZGgg
z6r7X!`}=>5EyNKz#>$GyT&n!5k+hz_i8ZS!RaG%LD2Jgr8TB3i015$<+Rn{9j3#jF
z_eR_ipVp=)biom}?L7SC<aF=TAJ&G2yDXhLJ4;N>7*Nj60dT-%l6#&x&JRrXufVU2
z{uciLgb(7@x2K|ca7TFU3g@J3cPBsYkzClNcqiGNSZD7vdY|mI<5)Ze@$18P_cQ&L
z!s6iB-ONrrl$aC}6X=Xp{{Y|>`*HhLct%w5{g;X%jM|N6*=BO1{YB(BNmuF_LHgDd
zRql;zXwyHkPxvIC?Ne*}M1IT~ZH2_E{k5Y;A(}nh`CRS%6@w?yQ1=!2@&5n?@BaXT
zdTIVN_*ZlBf5JW;hF=hAFuM4HI3p@<ZCe<+!u{ujjFLwv%un1E5cg_0J)c8I?^9Ch
zkK!o=V(3AA6m!};pEG*rW<eRpehv@+09aR$>iPs;9f-jcF};e03dOgU8;=;l1#wy5
zm6{}^kD)#p=zDD;e+_Foef8Yd@x^hb>d@n81EM(jhB|j0E9-xYzq4+U<FA5R$B8u2
zWnrr6kPEnCiqTNqDviVvI^}c0?_H6PGD~#MH!Di^*QxpC;XfT&Y5pVBE+y5b(XDT+
z6=k}!w!<T<1F&FV61$goZ04y$<7C$FEnx80oBf%i#Xk71E*F29D8^-Sf7U;u@&_5L
zRMaEg_BV07ypO-XWxs||T==DRDQsr9(qd<x&82<jS@JUM$C5^KoOMy@Uubym#Sdek
zTj_T4%PgP|GtN0@3)3WbC+4jvN15|?W_6{@r(>f1nf@X8ufo3<w5j|fsNHD#i%vqd
zw1n*)Sg`{IK*=GqoMRRB4~!Q70QQpj`0z<H+{>!!KVkb%1hh!rZQR^(>IORzU3azG
zIGcNPJ{bQ1g7SP`hfw&7;V%GLI{7+Pvt8W8oe`Tc!kGU6WC_@Rvm)2?Uwq>4Rh6<`
zcWqJh;<+(eH6F<B!>dN;_NDs+{{X=fd{5&~_$QBoJa40Fu)*R@b_dj?(l6IyJTfx~
zNRVd*qEu`!$IaAqub4h7{?9%$_!;6S(>!0G-uQmubG4<6ks$6-@>Rzl!f{(+YDT0K
zR_me7UYz3j-pukxS)={V41{L~b_cCi{p=FQ8AH8>au417xvrk3ETbj+Mv`GSw(X!P
z>&VBZ1xnmV%*-|dKKF0NfM~+hBuSZ)NH?o5-C!}n^sGqi1TitUcC(W>%yJM1xn7<7
zgGsA`b~WuTWw(h^Nj}oq$zr=m_rT-wrJiPU7|!FnZU8^Zgsctq8F6tdNE95d-n~w9
z&VIB)(%VYzgenn+;~76sN^GQ7X%op%l44Q9VR*-=^{ZC5O1Jjn?H=mQSQZGvHesHd
zh#()RKSNZ=O<z&k&)BcEX=Ku^<+QV60*kAKnU~b=RZ;m0s?N&-st}}~y^QDl1rfSh
z?h>{1*hMUSwkPD-l7W8rJ?RT9erDt?IL_dM81(wk#EKFS*9vgRm?evI)YD|UQEWD{
zlFUvA86LU%=ZZjwLdfb`MpOlUXWNaw*zM2bRml@VBm;V|+Pjw+AoIudp^a`(F*(NA
zoTw$Ry<748D;Dx*XaNkMhRXAtAO5{d(4?+m%QU}clq2krF~~pX*17wuaeR#7+ztT?
z{9JX;I2kALsCt?so4h~k*^U{qM&e04oPUjET&Cr9$IN)gJw;0?XmQt;QNYg27-u~=
z{+^uI9erTFYm&R$8=1$hPxYvhxp8M9d8afk8B`KE!5P8-064BMQP7%5+ssVy#yeJ0
zjm={0bJso{GICdQ3>@P)tkI%<pC@madFR%$aj|z6EjXr252@Q)5ZQ$xO5~maUMg%m
zns8~wT}p5Pz&+13vn&!gRbl`wxTzg0L_;+#mP;VPA0%Mmjyu;wZK{V*3b7qQ3&&2M
zrCMaPZ;6&d#0}4m3XEglir#z2Sj=wWaB{h9<bQ|KuH>{&4a`#z8Acl<GN(iM{{Wv_
zz9tS809KC!_<3G`J}RzFiACs&eZg=rM<{TA&MGC<3p0Z%6&;UmymQivio-3Yc*A4~
z3FK}$`f>QwuqYG8lY*_c1D>Nl%8P?vd9`P9v4gkeJpjf}(zm6&EpC9|5`Vpe-`A%~
zv_sU;f@X*Sq>;1(gWUUlb5q53+(fcsMrP&C0Utm=&w6*btZAfy=0MC#E^&kRN&f)#
z)|+brNYW(>B)KQ#Bp*V!&M<zI)43$k-K4QID}tn9aB<Xh80NJtFGSO$6;*zR8Tq>U
z(SC!mV$7%vvL7v2pOhT){p|C_Yg_6qYQbJYc<g!~uN7M&Ng$S3Op*j;ZirW&p49lS
zT6h#H>?5{15#I-<C>4!_xkZq;Kuacf3<7^Ir%_KDflHF|mS8eU<3H!E7Z%2xbFg^8
zzy)$sB;;rO{#E(M`+594cRGKG?V{d_1-0WS`jl_xzwi~T>#k~S)`R7!yw8AiiI(mb
zg@DTp3jUOTWq%vT`(l2}&7$2*r^Q-v3R#aL@-#bG`%fC~&vz30R}~j&dYzS*yMD*G
ze!zdU{<Zrae0I0g3ds$Gvw1i6j>QIZheq@bfzM*7dsp`{;7^Hq560hz&}v$2%Xy{W
zz*W(dF#wD-ZigcykU<1}Y1XFhq=}<6uNTz*J3rvB{{Zkx{{R$z&mIfD)jk^Awx{rU
zwP)4tw3w}t<<Rb$F&nnvJi~9a06D_r<{Sq<&&S4316=$oyMoRwBU7;O-nC&4qogjV
zsItjzDEVd#pD7#Fz#t6m$yGT4RFAY=!-M3PDf4HEbemm9_Riu~n(AyS-Ag3f9!wl5
z2N>Z%UUSp%uev@M>E8;!;aJ8zNHtjQr?YesjY8!W<Wg7oNR7XTIO8Xv=}MH9{pVrS
zi)nHnAIIQFx{e(-IAXi7NeqfoGS18W(%ms%O#CeUpJSTd+4V_UJ4j|SLu9jVQIp*C
z!vHcD^Q_?qH>QZvb5UMr+`4th@Wz}i(qitcSw2+)G(8s_e50`ITy52~_p`H2H`_}$
zKPmZ%$2?;_tI?+$BhRTNdmo_x015mJC&S$UJi%b`Hm?~}86)f#zr^P}sW{KJKiMGt
zx9~H=8b`qY0EeC;_^qxw>Do4*r#flRGJ)mWCRydd{wWx6JL4b3Dx$fXk8&E){ZHb*
z_MQ0SdGWjA$BDdWsAfBzQthRR5_9B7fU!gmqDB>e3h_UH-VBH0PsR@p=(jUHuAg^*
z6nA$KruK#s!_1H`eXF^#-xb4%mpt2#U5`QuLLP_u{{a5Y9~Jxs<Ijb<MW@5vTFX-K
z{+nkNoxFCB&9rf-L{>wFTq=$j4wdS@Irwj(d{XfI+DC|Vt4(81lN;@>;aL>>;PfN0
z9E#?&sLQiP@o}jOZjZzd+JF8Ck)!MJ-fEu>H8Y~#oVw|k?$Shg$yJk<PxugSdx2li
z_r~AZf5zXl=BjLbW#Q|+E9N38Htvp6Iu(!|t@sj0di7{mRh6ES>bst8d^@D>wTnJ-
zHyd4)g-nbFUajw0m$9nckX!&1oPq{>*5^A$T-VaX%N$n5Y&Px9CN}irAB82(qLE7)
zJC|~B!Lh;oJ5t=HmqLt}rOZSO706MJxji$As4iN07=&g#o=0EKgewwDJnfMt7mO4n
z@O^PoMD76vgMdywsiFB61I08&WK2j$$?fk-aR5+Td*lz49Ana~hKYl+fLrBWNhjCo
zRg9BeI_(E}{^-XYx^$orz#=cSxRG#1);x-DoUG?+f(RgS+pQ}G<zYMd$+1Z+NErto
z&*@cXoGK)7g+&=HxE?4AjyGxd75+n(U<XhBy;r!tnoDv5s;FGx=bQ>pLXx?Qai~ZU
zl~JT541cp&3n{l(d?<~0Q;xl=SxZ8aA(5Ci2yC4C<eUNxQ@DZr;^oOq7G+=S`hHa<
zBN}^gB5Ys~2FYeW=e2Y9a2U~;5?iOs*?XFnhGM;_W-<pc_Xoe%n&zjqCEh}Pv+7O(
z{<SR@os0|XHaGy}0CyAH)A`mU_F^sNi2+X-`ufx~i@DEBrHI&WU8m3<m5(-->5@QY
zZk$$aT(rmqzwW{^ggNVv(xCeoAPuEkwnallCTl@$h1g#!>F-w!kR%Xz9fehd$&Q&4
z1_g3Da&duH78z~R$^k||$tRKc(7@30wrx}!W+xt@M{a);#Z7LLM<G_h7~rtzX`wSv
zT)2xezTvxq2M5xxMLxi&PQj17KpfM!tXqm`-5U*(PBO3ezrv%MMw%QW1p@$Ky?Y)x
z?@r>iiwH|b0h9rrGNcfFIsSDnN?@ku9XUPo=sv%tJBr4<XJ{LS!Pn;J9@S}*D3RVt
zNejq6nfE<vlO?Mbt?taMsLi|)yJ&Atxc+scCF6N+9XAGUnc#KfAEh#Fa>cZ}(4vD8
zLx5Y1bI|@(uMQ=R9ycMB@Q66a`TkW&*i9M`PF<Lm%zzR@HwPUv-?!^qQBJJqZs&3a
z(5D}#r_!l1TCr*yqjQoFvN0nB<OAFs@()V01dg$tz$9wrNN#XXWBz%nOidPHouY?v
zQ5pUX#{q{NbKlynTgp}4L+pu@b_n$TUHQcqu$gKLp>Ygur+R^bo^klrlIlxu3YiqM
z071dv9-pY~??PbFJWSIxWgSV|z`-1P5m+8I@O8J2ye)sEUu4@|L}D$BlsNfYJu(Oc
zbLm6XS@jZjcU=#{Zx{G(_u;3E?=-9A^6o8VDsh}R>_@R2*VLb~*X<E|`#$_lwDA>?
zdGzTq4y$P!V9gdm$m}FS11a?wJQH4BoF#6@rtLW2x&1A8tHF9d$L|H&c<;jVMSQnb
z;#+}kIJjT=>IY`vhEvEOgVUc&{hI#(YHt^Q&eus6o2<2zISM41e8`**i6VLqfyNm@
z>yB%^T1x#H=gRSR>W}CH_ICdOf|K}b;?3+jAB!N1!oDGrFa$RfhKBqe364{MbCL44
z4`I5zFZPcA0D>|6E%>SN3eU#=5z{PuJ>m;eUG%%VL3gKK?hFdOuH@PQZQr_e0Q}oY
ztYr^o?e<x^pR`}zN8oS8PxvB7?GND%Tf&-lx1&Yz8^Ib3raNf7J*q<+rL2<~W{o`1
zt{ICt8CStQ#eQ~tQT>wqb?~RhS9&g^@c#f^(rx8=A568?Eghte26M5uDurgk;FTC8
z9xEql-TlkRwD~l85okXMHElatmfBq|<VO;pmSysY;POG~&uZ^&pt{rTp=BiQ$U6XI
z$LrV7R<xq$=#1)5m(<hJEN9j(gf>Ye_b%lY-T7xdzyqnTv3?bN96k`fw3hnZYThZB
z=EqDx8EwhI-uUB=y!6Ljq;$XK`_6we^c&!Zz$>4N-X@wk=4-t)Odnj;6zyB4ToG#<
z5BX-e8<=sx1GaxBKj5_Ax4n<Vy+%KTeg(Z#;Y}t{{k3y#!d=`ZHo&;*k&p@OSSbDs
zmwrVlz1EA@`uvKfx#pKde=%Mq@d9666(2N7kPdpD=D$HdVt<9Q>AH2ti|=6t?g56%
zHXMZhC;WO3Z2H%oN<8&Z+gb9{^*>X76ntm#Pr{E9!>f3ERJ_nN2wQKRX(rFW;NYq5
z4<6P11%Asv@Lc0-b8Du2P}5bdf+Ry$(-f8s({z!Of(Yc5IsX7;=Z@O+RaNG3(yHjo
z%c?)24~2gmJSp+F!>g-!UthA<YzPF&X*hj^^R<UnZl5aveXFnWUxD<m9%z&4+Qyx2
zs%i7CCAPbPWl0C2R>(EwH7auK(dwrfk?xuJo%>Gz0KpFYA@LLK8jr*6LQe?lj>VeF
za?;z${>abHoc9HX`!)RTe$oE`u}{R0*?U-*{u1p5;wvKiW7MF`kjv?b7l3&Ct%Hu$
z>EY|D+C3%to^^T-maE}^f%0X_vZx!0EC6CS>C@;dGD~>l!nxeUf==x01NqlM&2vFw
zLvEy|-T*^EyuLCY)DQB1I;(@{D=`keurs&XggtthV&ln}<}z0uHk<*?Y|c!GM;nRi
zSD&p?74;!Yu|3If6vi=y_4Uc9&DvUAH~=?4Hr{_)qDfZzJB_Gh%X5%Hs8Zm@&lk%n
z>RflE*z7?x+f+G-0!}bH{{Ww@Qnl1&w4Ip-#>v4^oOYlH?yqo&Sr`Tcp4AK6yv0xk
z-f%}Jfk+Vr@}y`Po9EtgdgJ_>rcsp{h(!&^$<O})u9MWIp(Dyw6b4YO$vb)h)AOtu
z<TAzz9l$c=jB!Y2TPD>ofa@a@*ODp=l-Y7uaDSKvApW1FODN8r3{kqoGD~mex&lAM
z;;2Z0qEuDEA%SHejPujep0uoi7?+mpE)=j<R9p}aae{MLZxCmfBg|ZoJ9ITHr0!)&
zXs(JQLm($S@P41lu&!-Hh*`i=r*X$~>r&BZp*5H)frbIeBOd*0A?$jC@|@?7)KoN8
z`V}S9P@kCzIL{-X?fj~wnp-i%d=B{)EfkpqR&E@l#sYEEy<Upcqp4LSXE-CKXt3{c
z;EA)as4LtbTC|E-92}F!>q%}GEF?&NWh7t|$j_xc)QI-v7G=pe=h}vVWRa^k%HXy;
z@q^!|T8-gm5w^|PI46ovKo;)KL`6jyaxz%41K4JwNL`pSKgvc}U~p)?z_B&c!L?Nc
zpbQ{$xBU052rmzmv9Ae`PDiNY`qNs7?mR;donv_l>6h<+YbC61?D3e&$W(7a4_r1z
zdJ$Pxth)fqBzedg!2+%_y4P_@S?RGdN#<OT%oWE3r~^3YfBN;g1j`g8GU7qTK+aFE
zx7Qu&kqndU$$G4<gaZr??gzO(^=;-sZX0&&H&Xn8{(t>+(-p4G2qsvGa(1rZ7?F$v
z{{ZS7`&Q~)29tA1lB<PtgX#HGOqP=^3#okK?n8d;0CGWZLHgCG=XsO`b_9?}kRG4p
zRUtHJM#PQk=+Y-q)cYUCu0|asDnVX^ZU-QoXa4}#REcc2YKo00k%3|XDhJ)iLz;31
zMI<-L&fqx&XVb8waWdpA>o9h0z-13?kEhV}_Nm~R*-Od@X#q?qI3N>(NcN)QUPsBl
zwMW1;_?hAHt7(uCu3E-$gCFS;j;b--a!2Aj@%dMy>k?@<4IGG6soLszBmV%dD~A;h
zS@U#fb{bsK<?Mc#e#Kw5-mCj8_>=?YYQ7G;kTvC!Hd@_}23YgJIQz<YY<4&!`a;t5
z4-Ed%z6*oJo&wZuZ|&|EbHtB@cJ8EgM;*bzAJ0k?`zCmZYs`6%_6_!slIe0;t=t*;
z^sC{FA5=Y$`@ffZ``7km{k-+BgV)x&PN}He>KZgSU+nE(QXbVtNABl55COnP$j2Wq
zZkHRQl{TN5`-kxR_Tl({;<0Th@e0{ZI0NkWielQww?85L8ox2W;GlmPG(U<zA3P&r
zqsX_5Z((pv%5btck}_0%19kN#v8P4GPETtc6RM>Pbw4UTI{0@^)4XYEsc1U9I{3P?
z4>WK?AU5;l?ze5~xpl`Nbjaz&d7by{x25S4LwR%J=xy}*R64+85=)Qng;SqiamS@;
z1k-7C{0ye<lRbOGp9+qZY?A2qY2j@qMcCTLqMN6?9l`($HhmOe_s3fMyWofHhjXmi
z$s1eTXc_~i`|F#w33Gg%_qKm=86Uzj#C0dN+n3j;`Tqcso0l>9z5f6OCjS6}vuK_N
z@SX3%UxD{=#{_6?HE$AGaIv7_ptmEb>zO-b;FHMyOT2O7<1#LtXm_?sy93ufzO|Mr
zY75yeoBIC%z&h~s?W^3?_z&<_UyD96NaaQvU8xUv<G9ZVGu+qg)vdk0mt_^LoJ|Z6
zs8on4!k`=s6YP2){=QgPTJrmY6D!F_v2HD1Xp5@GV*!Gz0fT@skMobltlivAbuPfk
z<!3!JkF9oI$1RUs_(k!j#eV{It4(vln&kQ(qrV}oWyX2r5I8Dv_gHi3U(hG)v;P1E
z=aCxQO!%jxnOAnk)-<#VbN%OsfPSh+vep%-MzX%rHltcppZ9v7(9gm@jy@Fl=i!+3
zj|upO&t22s?=`fcjA#3-zj<5PfHmn_ri*2+SkG&DYZcA3s#aL0K+53t1y2NhYszX+
zm7a|rq+Dkkty4c6e`<gDBG1F`i^A_w@NBK%ZE8YYlHE7k$j7&pk+c2)a6h|W&R^|E
z{{RI1_?P=FywmI21eba;e5<P111t@mnP4)R$43CysfWa>zU;m)%=2*=Zb!`@hw?rN
z@`(VLik-!aH$~4;k6tQd@}hFmqRe)Yy<Y?q-`llx+Q&7@@?1qUB!zZhayiB@I{S*v
zH}52%yD*G$K<qno{3)@TGRO+ZMq@yD$@T43zRoTm&V239Tz@)jg>+97tY}G6Mtb8J
z_ol@n+{zV32yd8{=nrmt&;m8qSb#E&a1{RlI%(e#auhQ$J8*hX^aDCWCzh<IE$Bxl
z>58JRvrm?0$l!%xp8o)?Erv%ZVV7qiU!TZuGg<dHAOsFTLP$}bgZ%y`hEmY8a-}@C
zjW-d8;9w4T{VOm-^Qx<sl(QYdx|7rTQbQdKO%X?wD?ZQ|a!V1{^{S>ZF<|3<0o%B3
z1&(t`>!AG%{{St7QiM=TU>46o=sitQX&IfEt_u=D#s<=O{6C&*7}n+?w{@JTTocug
z7~p?Ce>$smZtEMO0E|Z=dI9WzDotE_7}BE4Zz}{;3P~R1b^PltdjT<Et(7VXAbswf
zezdGK%+`&L8TmQfN2V%-wizho<d(w|Q)1I1eLdn<a*V3y8;?wn^ZM0jtiwPUHu8JY
z+^tbzEmRO#<YS-z09`{SoUCwH0QAKx1<Ie<?2#&xNzO*^N{KDiRDys2P6*>akEKgP
z++kAK+{I7wp@CTl-;~|K2d}m%3>HR|l~aW5PdjRB$X43rk|{j+f#L8*?|d3VC23v~
zTMUfcH-Gc>sbDUn3ctM02@TV)dKe&p1<vERgOaSIWBmHl<bply6@YELDz_i!tpa5B
zw%8;(l_MjAkJ7Z`Nbm@hGUFM@!9QB1pqjZXdtN1FMlYNK4_<Nk*2SH;mMIx#VIW_W
zFg*6_>w}(q3VMirqsWC=vVg~HsTtf4U$1_Zs>&ppWfHI;U^qGF9{oi%sH|wL^08ql
zEP&(?amQg-Awn8QOv!<bpk#mby(-Z!Q$hvk#dj}KKfDj99cw{}jTUA`bx;O+Z5`>Y
zNO~HHwpp^LG3SnOdH(=DwLJ5<l?xJCutRZxe~0imr?8ESi42adBdFiXll&*^>-DN=
z(kjU$b29I25Jova(=}HWi<@IaB%HrHjyGT*$Bce7*=AtCM#;HbEW!9Ax%TFr>@7;)
zZ&)KLvLk{x1PpyW>*0UeEB14b#%AMQ@bp17QHP$;arTV=01zFUKcCmGHKFYxZl<)Q
z?B#x)PtNT(T)FVw^FrvzLt;pzTwsp8b~W~g?CJYYc$45aiH5b{tzu0&;mG@4oBZ)y
z0omg`H`l1_MQ}n+FU=j(ijwj_qCbFN@KrB{KO60#(Y`0?so>pQ;eOX5nXR3@M1$v#
zC$n%ryleDsAKCWH;wFt9_l0%4Ul3^SfueBfdl?>rL_5@dE7GMtb$`I~YSVCjUC%wZ
z{h0M_67Aj%8sZtc88p3IN6)B70l)F;Uk>~(@mGaBPadmnXX0DS<Wh=nEE4fToDx2F
zBODLPv}rVAq|xa9A@CoHek5L`x{ro$no*6VKF6l*KVDn%uUGIF>|3u~B3z}Wo#D6#
zEprqm>P7zmwzFb2KI=u|x@tXkIB$tRwa@JH`w`t-Tx-56J~HvFIa6n0KlX*mVUdQH
zh~ea5=V={@uji}w@&5pV#Q6L6wza$P_Lk}3Ux(a=(zMym>!r{9wws23bpS7}?zE>h
zLssuMx0m(!8&ag+uVe88#C|q9l*Z3Y<TuJ?3y;8h3g|u+d<)dRB5QHRvNRTmz}#Gc
zkf5GG^=^6!^CfzcvOC-Mal738V(@2$wBH8!eKfr)Gj9|`uPcTmbz(;(ll-e{?)9aO
zl1Y5m7z+I14?JhBdNGeAY`Pp0e9r8(_Oo>fx84y{968Ppp#${htSOBnS39Ig$R8=-
zspB}$ZcaUFu1$-RT*neB7uYbn6_*)bQhQX8-AQ(khZ|Q1<!(y;J?V<pJ(J+?$NvBo
z{0;G1Ykn2iZuA{WJ{n7DNDRGpvh-#31QB1*C+x5P00rZ?NubicCusud8*ltg^w_qt
zj^&}?Ha%2>{>iK>P>of7z0IiBl_%xY{)T=L{Ce=8$8QQpt$0sewbv{d4bN>ROl0<C
zIAm}3SOZ>_ePsrtZqd$yc%)LV9^8iqs37(}mE|<yD?QQbMoOZ(*`Jf2wBP&@@8OTe
z*(bix?VG^*>-@rPH35m({{VUeh5S&j<6q6M?OXo<1j_iG`!mTs#r}}`?t+BlQ_{hj
zFud}^8<6Aszz=g?o*NVGeaZY?`<{J#Hz&OvyLLY|F4kW?qA)r%V}N-donYOy!?cb!
zC_)Qkp!|h(>~mP|;_{}2-9Bbg2R-vu)-ucn^3pNK&5Q%|?^I+%9EGt9F*|Ze$2iSd
zh5+)3Q}<y>Bph-nSa&NqS&HX^P7nJcq?YMc6$}6>F|{b%3Jg)vcpzhI5!d|ns6bNc
zA&A7iKnH>Ods1WEiYs#rjOChB&H*?acKm9SD&?6|FM>!XfDiuwT81<%h!vw|Mk5*L
z9^L9+v#E62yA-d=4^<w&N-T$a>`<BsV2s7Jm>}F)N8R_$Gg{UrZ93A&&M{kC?%0Zo
zrHdT4PgdtRB%F4~N{KFSkx`c~%*C0Zkjnrhs*n{`ae?bqS`xQ1#K-q0Fk80nm>;b>
z0LjyPZBzsXEIw@K@$|)H%WR_M)sLANPD=j(4}LS>r{z-h1)-U9ZTp-ana(gd>?x}p
zB00>7B$G0zge!nE#&R)}!0n2ec@(_N87$N^j>-ufaqHT%nl|2{u%KY`$6At+6xL>7
z0XaZG0~zDmq4HKYR0v5Qryu^hPeRd6qYPN61;%(MwMdaLh=IAEIVU;ICV?|PPzc)2
zS0s#sRhBUk+(yy-Cp~Fe!@bL?Z5ync)X2nS9o-N4%~p~q)x$U|x1rri!@4QUW~@k3
z!IwR;pL%FRxlVVUgoF8tO${-^6C0c}3=W=xo3+*0kQK<!T<7tnV7-fxOjbXcfd`xs
z>DH|5-xtb>j-j#F{P92+71)6CDGt1##|N)!vXO}qw-t~c8Fu>pYLO+lVoxlrOm}||
zP)MyyYjsG$R@|U`rypD#)3BJkq-HAZzh(~|aw^Ph%_byGhzKC<#Tx;w0)$6p104^&
zU5V4|!*cmR_xhf{r{h(jEfxjojni`|QrHXu#t%-F(Xy)~a;pZ1sN6?CfX+HoM6%ty
zjT}K@lgmT92viK@dir}(HNZd>oHGT$BxC7L;@F4nVVJuBKsm;J2VZZk0{vtqS$3+o
zJrC3W0Ig2pZskZdF>e@*p%N)0a*oG8)7uqEb;V*wmLen-!+Lt;`_arCrhK~CQ6P4~
z{^>t>_TYUh4qp<8gNYoM&UuijBo9&b=|?d6Pnv!$cmu<~6JUFpU;95+=(iE$lm5`|
zG5G%gD*XQOAB8nP0qSnDg3+UGTbM~Iee>J#t}5`e=a0<mqb)gQ@;cuSd{=vASnr@q
z$j2Gz*#1Vok@#Kl>Q9HdnqK%<#d@EFZ;vIcuOzq0_bNa&H0oP-XWY5dzS^$G>KDV0
z_$&v<j|AIC1YZzs{6}o7@}{q*TioP(wiS>4^<PHmpYUCOj8KiT=-vsrkaAu8IQc)6
zpjT{be=<+Z<CPfSYZ(3|{{VvP{B*mG*2ez;MDXb#fcjsDVnV-+rcdQxn|~fZ;Gw@1
zzBi=Mc+=vJuc_F$K4qI~B_nUF5o|;FsiERISGbg4a^Xc>{QA`XCtILowvDcFoE95b
z^6yx_9@2b4@pHu1nogHzbE@h$G6?Ogtl()HMm?1mB%i{#CsOy<=5(m2tF!t~{gA)l
z+b@X!01-S9Cx|?Ks>k4&W`lm8q`XF1C2q?pQ~Qv5W0o1@3}U#?jNh^U0E<6l4MsgH
zS<t_;tU3EF%qhAlNbDpW7RNX|;Edxn)rO~K%=heY)~(F#vgmyO0B1DvPa~CKDI1%d
z=hx-w$6xDKW+rQPOLYc7;Ixd~@_jmEis(+{8nN6r*;#gZN;v1K;|J<J=`EoWGOTK(
z@A(2{h;LppI#nQL_PBeNMrgvcd@xkbc_$~fF@cY#<20s6h!7Z^**`A_o|rTtGFXel
z3o58(lPi`P1D@HdO{vRZVhb{=bQn1U*N^ALF>ZSw!e5WxC-^6>MXC5(#8-MQpg8j_
zXK2X)ju>=h<DvYk_xJWu{{VvUTpeEDL-?PjTin1ARkgh`G8l2eczQN_l*jw0rDIx(
zth~)>R+T4yol*S|d?NVi;g64=5Qkszmazu6rAi8kU<7SF)s%qBMn?<*uT6NC>Ly1}
z%0@BQKZSWRi-fHAN2wVqitA>6Q-0O|0Psj}h99&u++SE(f5IED$(arQml}kTiR$oh
zr=IJy^~ta1OZKw=0D@lpPW_r5^5)}3e-h|ONljBqLnLUUyRY6%a85=&39nNPi1w?N
ze;0n|1$rEhnmZp0`LW<LutX{j(5EN-Doa@-np6RVIN-NTX1fj&q|%6{WJU`BY^g2R
z9qNIZe5L>uOdOuL&p-tsj**=eP8ABSTO%dCsjyD>E(;B+++Z)={-2!;E+lY65*1>0
zHb6MZKc5+>!x%!llB%cW1o4lh1Gx!_UO?M}I5-^p^ZC>dA&fMERRLV6$r%~_O%@p^
zl_ZkO5l|6uR~aPq{{TOoMAnfEd1}ncFvOp{-hg^i4T>_zvq>z{11JFPkDhtxeQP#Z
zRqo5kOF2yKRNJ%sIOCd4TyZm{k)>H%V@8`m$UK01em=C8_cBjAZUG$=1wi|Yj;GY|
zQdXnPPGV9BW@X!k<8u1rwPmahP8{JEmdCGe#)g<8t?L3x0l8EIp1AbS`R`emDpE+~
zRV$uDGW6s0q`<8`xQW3b+c`M{sOGYyh@jY1gZG<`gFe57OD!3}T+F4g0XzVER0aTN
z-ot2P@{IKS1xqPvSiQ7`CJK+aNCzPH?Nv4aN#B9&deR;G6edDfAc8sqYP7cP<Y62u
zV>^c+RM>YL3@v~|XSp1V(noKF$SOhm+;*U3S2k`?ZDF^Zk^Db}Mj|0FNCX@L1}O!{
zeVhQqjIrzLX(YA{wF__K2X1<LQfOt@gc<W3Y>Cd*Cy+b(QnV#shbVG(s`lfiJ?O9|
zSdh!L3n&bJPy=HJ(wAz$*-$|~r>#3!MVPKtcCxO~)Bt$@0PFoK<Z~BQBO9~9_3lTt
zJJ<`zR5LRGSe%v%z#08(LMaudk~VO-<8QJ4eGLf+gY63(sT(m^)a5oFe=df#ON4a+
zcdrGujz_))J6JlFZLZ|=mNHYyAPx^-sp6rzmRMzZgEA)Ue5d((j%nV++WL~uez78M
zcLb0&w;1ey&;I~kqLW;7WsP0pk8n(t7-96MdkJbbEoJ0pP*r|jHuVCak61D7JA$d_
z1oowIrE-PVqM;r}IZ$$q<`4(3`Nd&As%4Q_kmEd%agIOw^qa8lb2j6|z)Fo8s(=)y
z9AqB2@4z+Zdgq9ic}YbP=RG(-U#({;buKHR<XYCFDJNmwfywme*1T)Pw^x_Y%NS=d
zmLDl62kI-HQg1_eq>mKV^k9&a9lIo%Jgabj3gnsRgpkVKmCvd+x?(1=C9?voLH0PU
zRPlAtLAL5;1OA$tr6z*OkiUqoF8=(oNz)l(Yo*b=C#d*>P#}#XLf9`O;3@Z^Hz#2>
zqK~P*5B|^EOZc|JUlrX+sA&RB+*;|=h#F-bR7lF(e!EZ7zq$|jB^}4?>)~$+1^7v!
z+UOeg(6@<yhrJ%4%Gqfbzshm!4;9-&gm29~UqjEuRGh7Cx}UqcKD?JZLP!G+Nj&8L
z0AAGxi+&sFKN0jhjXPS?ZMA(m=oPrNxPVBqk99fe`gN_FaCb6Rnz8s{`&56y5~J0c
z=T-Pus5Oj=S(8P-n6zYaO2;YXJ(YnU?F#;VJ|%o9@ejdI7fq#jyFtCtuatyuJ{`UA
z7!ZD7PeMLZT1HAsPnrgtbblkx?i@YCm|;RoU?^dncITn0&|bzI!y|}@7<D9^AM!;~
zdVzMzJ12pR(t-nh#!~!u`A784UB0=78*~WU;{)YDO97tv9R3HT35d>Xfo&3@EhO6l
z#!BOFPh3=RIaDAQ5)w!NgU`6<1W*rM0&BQRku2^|5?z5jpP(50Dy({hw+WbnnD=1F
z>Olk3G+y4JW7)nA{?HyR{hz!=4z1xo5ngCoi1~xr&w$``R$h#}bRdp8SM)9WDE|P#
zeoo6xE8@12##U{=+j?9$IL}vuztu7R?PFGgtLxm_l~+$~x}*9g_(Ac*!v6prJSlIj
z_+M7G*0kvk1lH1IgZ<K{=2AJzumpNne|2srfru+011_L<{{Z!7yw?{_R%f83sz&Jl
z05y9^H?LMFsBDhD^`LD;Y6AexpP6@c#(A%F@muIsDI7CxVj4m-oM!|70M$_|hTN*b
zn2hcn{pkh9M()VOsV}z}9RQ?AmzegAz#mR}Pz;9V>tQ6Ra1Ues4K=^gC2i+m7}~pr
z2le8C>^x5ypJ<PA@B=x<53Xu39L`!sR6sHmWaA#Rg5+&DlW{GyGar?P2|m2@-hjw~
z_qd6MM0p&V0Lgif!pv~bo^g&3Tx0pxeciiU$sAxTTY)b57zelc?L~@O6fRW^q{kx_
zQb8n!$Km+YGF&vQQWVQ51ilE#_xGt|L*PRb7}%G579_VMV;Db~s?O;#5(WWXLGnT8
z13AqvA>QR^QDwN9Pz26cGaU4)awLv6lk)D)PbG=}03wS8^(b5*nqWXI#N+|a<InhJ
zphY(~0TD1Zl1p__{y*bV$8v?xM^eomKml2S$3D3H>bZktY5>}xWOLJ=YFSCxs*$wl
zGN3m&2kTVQ2_0REluZ1;H{PYV{K;O)rH$MWryv27k`8ixF~{prG%FJjzz}#N)|HCC
zb2-(cknACdByq)C@|j^=ljuD&O2fD{m_;Bq2>aw?H35x8dxGvb=XdamEEght6(vsQ
z=r*3U93+$gkcGMd>Gh>+47ZJ>kf5(pLC7^c4(qiRG8>VCDIjcF5sK#|IT<QB&!tMT
ztZK}vT;Ql2j(u@Y%tFZ;PZ>>s{RR$wY2XB47a@;84^#d$?c5NaQwaz$nGldY3I6~&
zs2k3XM>}?f!i<dWB;yCr&<K64?0`HoN3qll0KoCz>CS3))gz77mG(Gp3LFFN`p_>T
zV}4^%vG<l-t{1ObOPk3hfy=SM0G-W%bJTrkdW|By*9@{4$R0^K8;2+V0If*#OS|Pb
zP(fzN<Y&{?h8vVFq-cP2Ia1qlGyJNA+Jll<jFrjB=}N(3qhAzKrz+>7obYjz$4bV#
zzGVRsn~aik_eXqGvXRMN-UWrwJ4jAIB<CWy-9vLY+Swt!d)9Jhh{Kg#rUa7xbDoF)
z0M}S8WI_ZW5;~gAl(aElMuzEI<QN=-T;1n`V4EyZZam=ksj*i%yN`!3%n1>WnCafJ
zrubft%2jf?!6K!=YIfA<WB5C36@-(0trmToqKu608;2Zs=Rbj~I!}iu(=HG!jJ=N9
zN-Yh_=eT%b?jn#j<_x4|NzUMSKT*=Yi12@jwI2!HTi$8+PiJ`)izG5bF4j^GRDur#
zAM$IeoSDrvbNVO!i2nfKviH6ilFvx^mkj!yub1Wj0Bl>S^Hk>noemaE4oMhq_l<v4
zKLY+Scw^&dge~=t4eK`A#+Nocxviw!6#oEqhBA$gpnz*>w<zDKgd@v4bUuW)wNn6J
zkd|TcgPw8i-~21e{x<&0o)G<_d?4C4i*y@JUexl8>9yf+?<9i^ho?i&y>k0U2Xn94
zsjDB&*X?)z00cepKf{H+*1i|qzlpTuIc+jfqUIsj0PwQoj(|6!p0)TF;x7l@XdWY;
z&rr9T%H|0QT}5#TS4RFdA+gW3cS35UZy%Y(I7*wd`7<I|W77<Zu4GOEGO1jH+m4@w
zJNrUu6EL7r(TH!usl{HxE6r}H3oPV3eEEu_AbxxUin49|n_{tqG2{hYWC5RCb)#_*
zeUVcPz(`d=*rfB#W6e2^7f?1S;Emi9{d!QwPkVW5eW}ScydP%_s(gsp$PkbN44jg=
z$pGYlag)^8mry5a!z^*epElqQN&fF|%7v$>?SD?kw0sQs^Wx8delUw$@V2*iqUv$y
z5?jrH!1WBh7<&+VSM*8yD*ph%d7zr^+e`SPqzD>Ml<PWNZH}LL;U|uHB|9D$j$*AP
zRcpC)>N;=8{%p`09IzuTlbzi$&srn9a)=7yNGA$&?fmPY<`!vMc4Uq`1zfW*1MAOv
z&7M?(*aQs}WZ<?*KjJA|2`!pIYN-)c8OdjEPoSxSu(}PnD9IRK;HEZ+5H!~XSyaZY
z-MahKk8%<Qbzhq#jE*|`{V8r18#Gh0DsRbdKwwS>wNsW@_sCt#5OaXNN%reNXvn6y
zS*2#^xH~Y|{#6vx2yEhHMj36a*vY~C=>eA*idl*KHptg4jlgk_Ugn%F9{E&8!5cUr
z@yDk$o~1IOXxzvK)r~SYgV(1@sRVKPg8_tJc&RzueM$U(T3&<LvXN{%qmy`VoVi>U
z=lN7}MyV&4lFZMNNa%Ub6ncl|XWdvGFp%y+U<w?LbN+K#>k`d!@41|3IP@ZmXfZsq
z<(<V<#s|tUK;!)8s!JF}3Xy<Yp1pti)iz^AM+JaIAR}-XfOG3eAPca75l16;erg|)
zNp~utW`#&Qho%Q=B#cQeL1!Ffdi4D$u<vp?AQH1}A%j0B82m9=h9D*i%)!~f0RI38
zALP;=fi1Ww2q3<2SQ@4+(sfw_5)>bhlga0rLF7Hh-NIxJLC!P&H3iImTL4&==mPZ3
z1N0dRZCto4*v17Tv4K@EF^ru504kdf<GhI@Dy%?HQO56TnnhxWGm=RP2=D$BZW|Ta
z2Y~=~+}J<GPBW+_Ndqf^v~!>H-iv_Ww4)HDC}E5N+K}9bC00NOf0&HW2y(&ZNgl=u
z#N%e{Z63d+CFG_wB=SMWCprB6DT74N4=`^d04UB^X!bt5($8!5rBdOU4hh=5Na#<}
zk_VvWiIu^KkO09Ouz2tNDw}6$5uL<vH}mb+q3cXrjr&W$#S?3Rz`}E$=cZ~Y?o7jB
zP_6(xoMiqKF__r~;HY9`#&8C3Dbq>=MvTHl;{@}J_WY>~&XQGu$pvty3P*olzO|Ee
za3`6V9HGb{4uYkWj%wl(WpGqBJ;&i#Gr%_jN6dN1AJ(&FCU-LEULVtb7K@2)nqLx2
zb^E9y&e&pJ2yb#uN3i#=GM31-xpiFqeSgWUp?7|6`Wnv4+`Y9kjet@{0mnRjD?P14
z5~W6Z=N)R=Gq{hZl~pRZZboy~q8e#wRdT8c$0LD7hS||--U*XQfJi2eQM(6YWb^IR
zR&r^=GIR4B<o^IpXh==<I*mTm$1;#l3!L>Ly+=ig5Q?(Nw1&VVxAhgIRfv)4mRihq
zcFa;=+@4)e8OMKd`q$P!v$ySE<3HJN#c^uB6xQENk+!wWQRR|Q3He!14!Flv<0sO$
zTB8XoAJ%W|CI0{gpzv?)7kO>r-x!Nu3HXSBt9H|Ex4LZO0Jkx*&jGWX9(n`&lc(Ir
zaEl~TEU4UuR|h`z#a^Ey(_^xX`Mpci12P-}%bWlPKU(;w_Obr}f_!{9{jc=a{{V!S
zM;3bWE-m$&Gv&=5I2k=8QRv|H;~i@%b!AE2e9^5+YO1sOGx<pUvOnOH{{Rp_W(h8}
zO*+hYzrtvL<SC~_OT?r8dPE6i13gApr#1O-*4U0{x0NHLU3Yr^HS0!7YngTY4=zc;
z^1aM3n=X}Ea~5|mJTGiu)roB<pKC}wl~PNwz`*D}ooRty^uuR!BoVomW<XibBRKW?
zde%Jl=13iy113`d6O10;<j}*^%ZoylB}o~P0YF_)bMAjrQu#Ao-mR^SF6C2>r*eUk
zbJGI{+NYY^l$FURwwl^ZPVFJtxa98J$6h{_JQqbB6<OA7^gMyjPAc^g>5$3{1%M^U
z+MtfZzt*ILMpQ^XR2_5tUYPwWLmh_s@k<cKVIi=e)}o3pwM*v6*o<HmL)MVdU9F*!
zWk~}D=%aQ5uk|%y%0$~E8{4MBcwhd#0l2a_h4ARvJOH5Q>;C}OrFlrVL&kH03uh<V
zfg-`xrM0qH;)pOGFxsjck&I{hbnjfM87@$}K*jQQq8tSsvfcjx3K-FTWOdq&yavjw
zeG3!R{VP7^GFeqtNgo(gSLjD_c^IU|yNZ^kLXx=xB>w<fr1d@f{*{|In){YPBClBE
zCmV<K9Vpm$Ac(q0o#A9;0b8I|`g--Ko)>Fzmkd}OeBASlas6ox>O1WvuFP!#fG^08
zgURCr=8|a7nG{PQA%+WMml@}utsuEr%th<&LmX-b-<NJNobmVyo@HZgB!#&k3?Jgo
z4u4tzttt<ZqgD*$4!uCgBz{#48hbpRN*uWaw(r-iC#xRC8@on}lA)B7<+7gO^sL#G
zM{yiMuut)0ueqoxI|r1n6QL!6JQ3IqpP8nJif&M>ymHvj7|jfRWNjHq3kETe2OYg?
zw6pFmg@I;ZGoQVl+3!lj*w4gq-56bQ8sz&E+pn%oRtb@`E?tgBI|@x)FJjV06NN>_
z2;}DkcdD_Bkl-AK=ke)Djc=hFCm2(>fr0)s#!$t{I6Q?N0s7E8*sCN=95XOgCjbMS
znrWNt;1DuC_DSeFQXi<<9oi+sH(sZpKEAZ#pD4?H>`)gf$!?P|Uo5hbv~p=6frdaT
zjh&#s){|k>wdEzI42~sp##KoEwQeU!Atgx)+<e`r8zP0sW++ONf=L_`SA;?-NG=_Z
zA%{F4*NQAALbnW}Ms`x8l`J!X>Cbwjx9tjCDO`>ROqyaDBAJ0zOp%PAPJL=43~|ED
zQ9$Z4bJ~HVV@Sd{SR%OXmE*5oPqkBZFvg*mB>=%4xv6^&_w_U78{>9oR8f=9=Zd3!
zjfEmBl0gMY9lPhXOWdP1<0%<-JDV9Q1~HDG&a!0yqJi>~eRIcpRvKk95Gk>f1fG59
zL|0}9j<_Ia29<+EIy-3YJjRik08_UMoSwtjR%=?9RvG!T*U*Y%xb=xf^%*A_;8c-X
zGlEowAa%!F(3Qm9%h6aS(l(c4-#?Wo(t-d$#yb<%i&z^rVAILk!0sgQGuF0kQSA`8
zLS!VXg+E?ulCdo6><Eh8_QI|kgTNtu@m>6LlW7t1!vF?0j)%WmwV@2wvby^?V!*`g
zK10-x<=6ac^|$sK{{Vuvc>DH0)1dI`G+rn0qRr-gg7`2of_{H4UP=>=hjR1xc{Ngs
znzXhiGH`cWpVk-bm;V3-Aoz9rU1+xP=~~=Y9wIRVK8bjIxsmxLS3F1n2b3p{PC8fK
z_PUUpdPEuJQ-%a_{{Yvn3Y2}Dw?np_UVl;7mhs%G!a##>Bq#(Q!xi}h`(S^;AHEy@
z(eqwv`c1p|N5xOM#odG>$(~M5UIC6zKQiq(IXjOPR4Tf9bbFIplAgOYvHY=q*1xc?
z#DCdCQ)qS156Cp5CL`6Y6v+g@{okJ-Dabr92l=0eQY)F@khyks=oN-}I5-FKuSV(Z
zvp5!;@6?t@TPs#n8|5xX%!J@}6>=-NWriYLB%y%$SGH)d6h6X=>{>!t{{Rx4h9BYH
zqqg%=qh*BKOY(^17{<~VKe#-M3}AwKcWn+X?Ay1|(opAj+7FlWC}YqbI21=_WK~V#
z-)im)lauX=q$}!l2*PQ$hgK&fu#-DSy<RG|>Lhm(lgRh>$Kh6H(VHmqOL>QA-<`*u
zqZ#R+!-|sC2b5J@=Wcw*J-(ENEGK&q&6Nk{Wa>}({&c1!mkktc9ANO}I`-@RXcILf
zzRa7NCBuBH&PhL?>sgbTJl6$}1E$l3&lvRmXklc?;<#J{cP_Zj^&Ls=ih4q;gty$I
zg8qPZ>p%;!;gQ}+@Z=6c5yyN1^{8h-ADYdUWAjHCKX{I$&;#xQ$f$+)qNs9Nc7RVz
zeL3q{H<yY1sHh~~N`t#@Km(>uf6i$QJxcQ22^K{lZ{&<0=lBkl9FQ9*k>Vf|fX+uF
zjGj7B$8$ZIoR*gbw+=RPN7tvNPVq@9!c~DMoUR52KmAmOW;9D{E6f;|00!JSKA+CB
zukJvZPz91jATK$_dht{0GW1bL6s*BPn{OqD-TweQ)N;R(Y5+z6kV_77JwF~O+d-Az
z_m;=W!9cmmI3%8@6@_%h?&E5Mv_H(@1~K3AsbIAyyOC#PFdWC7soQ^{@AaiXrZBBA
zR4KIl-8rN(bcLNu<S;A(j^rM{g-3Y|VgRH70Qq+ugPH?keG5UCQ`9`PmMB+gW}0T&
z6b`38n67&4pt%6yhzFb;W49)v_m#UEHD%3x#JNP0MGWMj<bmn<RWi%w<r@mBMk$g_
zfrfl>&&!Ns-m}$Mp$z-v&&;Eo3J2&m;Tc>Vo0p6X^r%gnO625%KKHgW%_fF~m0lH0
zt}&D8nxlJsZSWW~C|r+}^rRN(N|UQ0EV*NxoboCK3i58-l1>hNezb>uNqm$q8k2>|
z#@;c{y-hT`A{hCI<E8<o3~Nm)pxOffK{@O?RO>rR$`mOC<dM#Os1q46QUEKs_9LAC
z0H0cA>|tDBh9~%Uf1i3c9n9>?hxcwFBRjU79<`osrb*Qqjz&K$=8(|#yCcnJ<ZuXI
zW6e{N;Vu*dlx*|pe;-;~fl5G*!Nc!TGmLdV(yGp)GBBlvIvxP#kj&C!mPZ{Mk&GTH
z32nq|6+myu(%fVwBN+rP7aW1xJt`K7`SQ`11GyaYMS<={Z6C;d5`Ytv`PFB&B1Qmi
z8QsXF7atY5^8qP_$LH#5Sm9SWVo>@p<e#Ne0<`ivl|%&gBp#KcYz(&HgZ$YbtM|nM
zE=1RMm!L*fTc{(Ar`YE;egiC1qn*k#w=6p1n$%3_ttXdEx>sVT?yRe@ec-@?Gwunk
zOAS^#Bq7G=9kS}oFue86QYPu0L=wzh8DBBua|r=lk?3msq>#Xp<M)k`@^g{f{QiR#
zL^G@KkBqMT5v{><V|zW7)NCFJ?Pe(G!;nL-BL~vIp#K2ar~V7csCW=qXde`o=U>v&
zHAL1SaAu5px|4}N-pFrrM53gu{zHtMUDwS1qW%&5eekEpKMh-Jo*UO~^~)ExGMQ~;
z+!PL>m#Vf11y4NkE83OF9&Q#O;DsTEFnj0nt{K6>+5N|4CZ?{wXEUyNPQ%3dZPkvW
z1bUUEipw>%#9~E}7-I~LkVju?{3`vh{{Y~J9vk?H1;(%N!esEKw8XK~t{Annr?1LJ
zS|W0Pyu5TBYic$59i_3IT0GjV&*n4Zuk6p`Pua7^lIWf=(Qfp6<YHlb0<#SN0IW#{
zLl1S%J&zT{_$%Sov+)C5OC1+Xy47_DR%09pSd0!y{0Dzp>yuGj&u-@$yLRi?<fjQ?
za@I!Oqn#M5D}(Z|Jn_a4T3f4G7?2pS&rWMZCS9KfKi;_oMlwfCfA#APr7q1Nk%WZf
ze&Pl{r7%d`StPTBAXO9OhG@X!j+v_i5rquJiQ}>D`kG|2Rh!NI>q5)V-F6*5f~ICk
zKv9rE;R0trho{t0<Rdgs<V@_sN0pcb3NeA)XPVlI<IF`>k!4fRWZ<6I6acVWJgp(P
zkINC{?#4(QaqZfiS(YYDDw2D29D|B135;@y5pCZn8&#K_obo>(YHTQzL<=ENjQM%t
zj~E%DF>F=1isINP3=H4Jjskus(xGiKTrp`F&dHB4dk+4?>p<Ot!FK{gOsL~)Z*j+7
zed-xBsN;~iIcyAI0k{vZZj@T!5Wt6Whsi=&*m6&?^s4j89lgRdY7nX%Gn30_(va7g
zLE0z1Qv2MKh8r>g!8rXo)_u-pvs8q6Zb#ldN&bS9DHzXS>0nF9!v{NzcmuCI_vw$V
zKSt6L(%i?tIbzK#5=#^BQ_FGOvw0FQ2(lv<<d8dd{zkKIu2$L!WPG{+PSxihhcrC_
zYRO;^bun`nmI4io#~X9}_^drj`zours}s3ZQ>Pv3TCmX9k|`q!k>G{MTw}LS&lO1?
zHzly|7|A#s5PRa5+l<~U8X!o-U}TJU>OZAK%-1lGKt=>(us9T0E>VUjY_7t<5*U-)
z=}eL(ok(UY{qMuK=}2Zv%l3vzm=h2iLSvUXs4$=)Qbsep<DsN6%obQd4!~nL2N@L^
z!#>csR{PjE98d#~mkg2yV~_y{Jw5*bO07Js>Pj|Qm<~_*??OYmAZA#{KQj^YZR8J1
z&$v`~LheWn%ARxW{Hkm_mY}$fHDVVCymbEnJt^@!qLR(D_W5|l0jX4`ZY6Oc0f-!R
z6(U-Qf;lEuI6RJr@u#p8Tf`KC$2dF!defN{F(BlxUfnuTVP54`m@@5VAd`Zsdev{X
z{{W;D<%Cm`I-F2FhDW+&5@0fc(D9uA0Q$vOxrweWvLs=Fz!>~$R--YZfux(~ah#Gk
z>OTr}&*n_a!9X*@^dIC>SL!l2^#d^qu<XV@ZQbg_TtZn8Wq==e40H6N!zhJjLKtA=
zoE7@>S!o#{1|Xd9M|v0vn{E}HgM!;n9mNR|SqbP!#z$fGq_qL72>GKbS$k)SaJ5X3
z7cGH|cBf#uWp=9ONcRwPobAPPzF3;!+_)g}tDclF9d&MC2^-}R+m;6)8qi%aO}~{G
zB#g4)<o#(|P&4f=Og9J2Y_c5V2a#Pg_fg8src<84HZ%SPnqp{>Tr_2tHe#iC9{dc`
zBDbDvMq;R`8PCk#_{SZ2#R=Rjj;7OAj@A`)%1gIkO~tZ%jCRd*dS<Yf_iGH75n8i-
z*JHFs04J_6bI%`@Up0y4xurd*^Ho(DErBW}W(pbe_q~4u%};L~q%ks!m6m*yAy&v?
z+avsFS8D81(b*qX{?7jZwJ(f+X8!;a+Up(<)#uP|feP&t<tI>cwUGR-r;Mu)PW;#P
z0s9;O0KsoOJ@FQMZ6D%|ls*!^04!RyvoqV=H+{*=N86r9t|+NZO=-VCg-%DV$M63D
zg*;oP_{&AM)O4%JFZBC`4-Lh%t0GLNxMkq~0QIY>mNaak!997eE>UrIXQdXTuC_d<
z;<v#601bR+@U*%=iS#R7b4*}ELv;|7VLWb9c~<1%h6weq#UF_O0Psxz02}_yO|I(S
z0p+sQw7cWxU3hO<2h3apg9Xk(C!e_|PzNOS=%rOkKF*`lqwHZiT(eaouGd5PPxz(a
z?-Te#$J&jDiS(PjD_d)cB)v=ce79C|OMI=!$t3&N3vQ`2OtOzGD9cC&Hxd4O_ODGV
zdLDeAGrv-nrG5bg31)17TcOVtfi2N!L10xjfx~2hOcFY4a?+1DHsDAl<YSV104qv1
zK#p1<(gU?lN7tunqc)4pc`T(=qav<VUABNnpaVX=O%Qodt0YlvW&pdde?m{^KsR#K
zQYk{nKviM2HjnH0Rds15Dr8bv^SMAcKmMv>LjA3$FB+j7kUm~p)BK8pMNP2-3nWX=
z%D;H`qy??Z9Gh7AV<g6;V?MkeuS#?w3b+%NeBm;4gWr#(77d8yjfK>+As}Na7<2ja
zQAw)4<_cA?HnRc1Kh*I>><JY9(9ytDlm+?7Jg?*Q2CCe`jIAR%jx{?}0i5ya_zD>I
zA&M2)NRf9EN(OV+{N|P@KF4f|&Logzu>E+YU_&Ic5=$CIxH095{{TblSjO2c6{APq
zj7I)*lbTHq<WfN+uncmCErE>ZIQ~?Qe5^`~wkY^kVZi?Y>(aH6S2CsZZ(cPGw{soX
z9S3S#$Tu{bNDinEbCx}6YBH>|j53yG*~F!L55xZe*I4gnX1kJ7;W7ge{m=&jmZMf$
zjGjsErD(vy6acX}$nRBUf;6@Ab~4Jm<c_21_*9HrTi3f#sk8$B0CYBea!KjO712jH
zxmK1&2^iqH?}7ZN0ugbWd0)&`X6z1fJJk!hK(`120J%Uw&IWVWxuL5J#z?-;IASDa
zRp06f&-LP*0THq)h}fxS2b`Kn8WQW}os=q-RlzDcRSBj{sL8<ue7*D3{{T8eu@%E4
z3eGrUd!D_zRV81vHcAx80Au)%dR}8Bed!Sam9R$y^cbpMOEaT9gdF4ya3~9xq(zJl
zN#o_`twxd=CuIuGpa4keM!?HWFpZQ13|F||8i8hcozyP#z&IT~rh%57jfxW?7&+_H
z@Tyx{XvdgG1FL7|C%p_;AbBKNW!?ge=Q-s2)86VBWL7V=*zz!c`t%0o9P$XKELUjA
z1aJL+EL1aHt{s*<I5^$uk=H+kBDX6_O52H8?{*tw1Gp5{g%Jr0^OfUoJE;uMh&(wa
zFo3B)H>c8wBt?;lLm<Fx^uf(9AT=SBugah?VUx%5&-voB6D-cE*i|_h^c294%4sA8
zUjPG;J7@V-iEN%2w__{@a(mDZ%z{|e5VIV&7z6zDs2c5-U<7+294{xoe9^FOHKp@z
zRZO8q&=`T9d-M3zNouP55kcFP!_s<!(2iSwE+GRu`FYOnxgLi<ja0U_Wdx%KjPM+F
z9`vkM#>6^dEgKliwlcuJGI9D<*=?=jj1vri<0V@hpJFkQ_*1jEjaV)OiyFp$Ve;gR
z?FZhqhMdx>`6?N*OXD4LRETVv-$+>QL3L1FhUE*4fAy<nv|$avP^%#WKR?U|e0TP$
z<<OhzXu+fXqU3<Y$h&auoRELd>s$W-V}NbirI|<omB!FJXTKt;B5$d*gj>GUb15tW
zsr1JO+Z<K6FJ^}!l@XhOxF0DU!2GI_Ec@s7QvU#gfqY2)lC?E&4C=;R9Lyf$Ou7bW
zX6c`kKPey%RD;J_{<42#U-&Ag!{6G9&dW=_)W?N<T_{v-KK;V1vSX1PpLMc9z&l&e
z8p9DsopU95BYG8iA1itvsmfVhz+z5E%6S;4wX4choum)11OEWkit}5uJqtE`#rsMA
z$es!Ps5~$<?-%G%YAUE!E6DJZL7wR#<b4iT)EfR=zidzVB8QIt5q+;!_<UvY$A^`f
zyqJ`Irrk&Il>R(-DbM>NyYSeBZb?5zabhSt^F?~2@f%#w?=-DN?Cz|lhIm+`tcX;j
z4hSIfIj&b!h9&_DunWLoy!-R`*KMrzITJ6zJ1wxxZ@8T2b^?yVwBjo)Z7YlyUzIVm
zbsYQkswKM@;fO^%B(Y@x0uhPp*8|-5HEz}`oke6;8zEzs7##;adearlcF7FVtWySM
z0FnnA&p0IeaoAIxo>E9+cBv?PDfgj@_9|P;Bq-$zO28E?ao6enYWJ2SMQ3br^KR@<
zw{DaJS{5|zE=^A9ZET^E>hj^jM;uW!j_k*UP&wrBfGdB(e+{+I8ZNOunQks2(;zb5
zJhI0Si2x-1@-lFz3NlVG0imnxE8BB{h8JmzhZ3Be013yp9qN0OhBPjySR-`WGQ?*;
z&XCNzh|)`RW<tbt$o&5Ron{M`xVr%v<N)PHFa|m4NTS+Yh&QlcVlGDJQa7Hs{&dpo
zER0GCE(>RQJOPeJGzGepl3=I?;t_Hcix5tG3W^B9gau^^21^6?eL4RCJ!oS}`W3wA
zNyuOd5_#R%sq6Kru6Ivu9uDc5xZ?pwx6+dv(1D#Gx0zOCRF9S=fIOZs4<zJ%0=V1R
zWxUkH3oh7WA2A0#yPu$`xb0$Tnj2_=a7Y*-LEDj^)~TDUT*%A<C?6_yEPGP8>`6K@
z*(*GOi6;P_N#{QJ#YLv9aI>&UL%1QyY+#T=kbCokk7}J*z(*KmjEuyeJ~#xP+|*ZB
z4&b6T)G9E&M_=ddM!;5!Q$cePm*iDA>5{)e?@>v9rYRV+5?Hs)2hHjD(qlx;BV9O}
zNfI;%XjLDrMJ%Ea;YJP*J<d%4M)#o!X2EO*CmlvkYdqX6uB?EWK@0#qW73AkmX|8Y
zZt{f;`&6EAa8Kj-(Ijq?0f1d{*i(^8z}W<1dFLV2k+hI8kHDIaCzS6Jjz=3o=W##E
zfEcL8R%sQnwBYt1=bE;!BF3zMhQ~lKGwaO*9~#Sa%HaZlr|*oOe@bGNgE%TcCpagu
zI5Z2$p>+gz1%!&bqixwB9j8Cf2CFT=S5jL88BBrKxAdejmp4WbL`qxudH@AyJ4y=4
zAl~74_rd=F>ryFcxfRXCYav+MXdo6`WQvk`f6-={6^ika4`bW$1EnjB%bItA(nJj(
z7|RjUiqf}@W3y?O<qR;SfOs7!13oBPLze+S0JC6$$6B4477>YZH)90yJtz&uws_2-
zs8J#1zx`&aw1awsj(%aaefT|jq#k9Rj<Tz`+DJQxLI+B^$8KX(4BgJ`f1W9Yir3{|
zOJHRYIOqW6j{N>L$jNj~p^Dx!EQ;f9Pp9<br6$24seLu#?O2Xi0IMk(Jl4Ec@`!TI
z1A(-Zq@Bjqi}rFDVi2@TC?q%B<Q|=R{uQ%pYXrGM-dHLyuBU_bs!GJYOaB03iZ}8=
z4pWSdbB;SyhfYV80r}1Wz)#Yu#NNftKH4Zj*#;Yoa5{ZI8q<r;nl>ADmpS>k#wo1{
zdX*=DN)k4al?f~gIp-e#09xp*t_E<<?neYSZsMtFxQ>F~P-6j-IK0z<4ngVp)rjPh
zW<mpHm;PCdXQy9Y)mP9~5K6`{v7aqe5rX^jN7uD)#^Tl%1-HmX(l-;4*#7|fs*x{J
zJBi#&yhkFUocyDf;{<;?*wb|<(xi@P<Y?HCz=i40<~gA|13z!SVxRad*Nr{`&2OQ2
z#Lwd&2_l7!ZYBNws2|*v^1y#}^V0yWe^KAFH|@dj>-MVB{O<_(k_(&Fj5PXf$L^+!
z*D<#w4^_zbt{hGu?Zf7d+&zD>FOxpA^J6$+k^#xjZfYr1Oc*Etp4jRugJZKsd>Q*!
zf5AU~9Ddf;l3eThFWEKFrBheaz=~nl89f|(Fh0ar@?ZO8f59X^C;rT@sA^W0kK&&S
zM*G)N)3-B5y^F#!%kFt!di5~Xx!1Fn>t=9QrONr1&vWwD+2c&S(s^zeh~r<FZUd?5
zR_yNB2WKHm3^JUOpnLYN!;am}8++*1CMzCUm;)w%&%I0itg@2XF@+d8#{<{5YAz;`
zy<?+KeP=Di37chHGajR!=eK&JmGcY4%E0l0NC1KL>p*PEOK~m4>l|Uph-OE?`@XoV
zmy(O-iWu@pISkE!exi$p<d*t_!oa}nWG85JJr90;X&YXeDBcCQkVM?F2I|8jIHKWe
z5kn(Lu>&KoK&q@b{{RZEmmYEg@@-W(3OoKi`u!-_HZv|Kl2vAoO^8&k(Tt9ynrv>@
zL=B8Qv4?C7U>={!koO-g-K)(B0FuOmkDq1_9Dkm)vuaClsNj(!@=C5Yfxw_^QzGK>
zF%v@WH?rnD9Fv^XP)28tW|7%Y5~~VvkOy=5=96GkmQ;acXOUGSTo9~2Z1(TYX~}&p
z#4#$WfZ&a-)N}oFK*kkOJIug21Ljb8`qpe{)=>bg7k?mQ1e|rLwxFJdWuBE96Lln;
zh$L>w=sNNBG{G4<qs(7ySqh;>azN+Y(y;d{UCOrCZp#pPO5qj8Li^^Ob2QCxjOWde
zfK(#m8SRfwDPF@`iX!r^8D%+{2I)R+!B1iT0M@GaA=zV!Nj88-&UnD*KabLo%NDGb
z_DIpFc5*-<4D~fbP|w-mRaY#{l2@?wq{fEcL<>YAi*RPj<+F~tKg*h~E@Sz`g~mt-
zppTf+9qv`Tw^1Yt<VbfGWzIKa`c&%W+?SmbfX5gI9)f`p+e)v6K(5*Q#N_i<yyeLt
zmtKK_@NrB%OtB=ZB#f-e3Y;)KI@HIo3zLlQBa(f8I+BX;!uK;dX$XZ*2eHSkXeGe&
zBUMesn>&f7n5<Kt=0swPg;D%uj;GvpsR6PfP2Q$q<SeY9IRJ1+C%qTGpwWeWaFQc{
zf=#(OCaB4Bg48r=y^|aOK3~R@8YlAI;BeVYHh6Bw{EDwLM}W-XheAgf!0Sk6UBKIU
z5Qh>e7-Q21ujAUR7-S$ZYywC)P;fEr_);FmWb&rwA9_$eP|7epKhL#kL31U=y24*5
zi~;1}5%j09G*xR!E*l_*R|Ng+?#4+qGe;6av5;N3IO&dYgYEtlt};7WGj_<R08&T?
z2Z8TZbqm<cr99|{4t9f*eZ8o90yB=Xu^D49<-o~O{D4pRR)XC{e{N(FZgSX2(Dcu2
zk?d%_-hr`~VW)kQE?09LfC<k7rEf*1zni@XGBz?Br==@*3zsCc`#wXR$Eh2*t8iNY
z5zZTeesk8U$W5COO(fRx#<FHIK`VjD0Dyl}`PO7s3~p8@lMKhMc|V;rtR~sht)W>~
zL4f(k%f?4<)}<)vu<YJ*%M(n3W`#0HRUjbt$8Yefkz0tJT36h9?FTt0>-g0qCd%vr
z#;XiUryqEnp1mtp!b5Kpta(uQGN|VucOR!(6R@9iVlbACzBXyp9Dq4K{eAs?s^GXd
zX;iFgt(gNHZXJ46F2dN78Rw0QqXs;lF@xxOb*Uj@X4>O%EC$iYJao^kG!2>;R|_jR
zWf7uaATNx1<2@;C{DW~G_xWYOXI^kWOp#B_M8;`mzGnfR<3Bd;xhIp)ujgKc;9rQk
zzr)WH*y`G5qjRL++Q_YKacuru#@Xyar*Sj-9sQ910N}fNrh#^vH^nOhtk?nNrnzQ=
z%|q)XV+!NlaD9z`NZ$-TGx%fUUxne;JS*Z0U1v?38JgN$`DgpAycKU|0Q*-3dK|Bw
zD^A^x>NUBSE8O)0@30{O20uL23ym@>`%trh9D-Xs<2>TIljYSN4RdJE^6r8}Xn`yx
zB}u?N27P^M^`@fB<^l^bB#a)T@vmm*lGA2{duNT7FvUgz!N9E;?rpaK?h-MamLHV?
zyE=U%#qwzux7P7T9mH1<7}(02ys&yO&jE*GI%ctc+vP|G&4dl30DQ+h8g~~iq=Qj5
zvcBe!M#pTJZ@i<nKDCnfk`-n`(YYIr-bo!WI|@TB8O5%{v^gn-RUhZxqr1BrWQxqu
z#9J6t!*F|1aagaW+{G&h_c>j}vk}mB?M!W26o-@{c4vO<Wq%%-qUd%l{ka}K7jkgS
z19Zo~r!|Wm>d0iBq+<yfBX<LyzWF3|rPMYoE~dJ5xL~;`NaeCg<bO(*-&qkCbYL8v
zs!v4q%^C*gGhD+Q#Ew|G$s?f2=RechpB}Fik{FgYaluwR1{pb^Wl8K}o-kEc%#(IN
zVhCIlRi5EA+j8k`xs-*EJY(0V)KYH4NwPZ+wOkJ~87#$cRGg1oeQCFsPi+j6Op-gZ
zeBh4bp!TV~hRRTCvZ9k9P}>V_-VQwmI_K-{RBVj8h04ira|j?r0OSt;0FS*5+%`s*
zp)`cZPDbV8H|m2QcmeBG?X9JIgfgPWfNn_pk=yG_sL2`?k(?lo5^_`%!Sy)jJpC&&
z9k;hF9CG=HS0m7$dQU-aXf$bWaFMADI4l6hPjAAhd4S!W(FH1`#-yI#=e;ITUIOz8
z5tzuVat=Vp1fQmUzLlREyzL+h!W`r_c8^cxKo<2IROFMj^ZT?NdUAf1iy|eetcwqp
ztHyu5f&T#3q(8`HHvlPSU<o0zylq~;%A|}v%&^8CRGt`|oCBZMm^&J5hTqIp`Q#@B
zisx=euebE5?wz7#4;}+&E%c-YSN5b9@}y|R*@*dvA#<9&HrbXy+i-xXZ1p+qKv>6;
zNWcI^wZYwxxc>k>Y2$OSl!3HlDg)8Jw1$|IoscTYE*Y`%^U(hQlT?w$lCl9AX!1^6
zb^N;0Yq?3>&AOD9WHU4_a9MGm*Vh@Viz&EvIA+hvq@d~kG;S-7OJzx9!TY1-CyX3(
zS?O-F&nh#56*H6Adgt_`QQWa{Xrgm0Y8}P_Bw!E6-kj2#sX~_W$vHb$r!-o@d+I{-
z63#aH?Sp`O9-X>YR%D)6^2-O@Mq41}ho*pt)+OE%*nz-iKf-(S>C&m*X_0C30!WrO
z$WjkJ{d&~e<zG`uD?593^FkqM21w3JdUdN}z!`(afkAAO{VCeSx76KBM_57fl@xFR
zJ-?+$v6Col?py#zOw$&HkkQ34O@M+&57+$v0QKs?vt})Z1qMkO=nu6&L2OM0x-3jc
z+zH@StE*&{HiA)yCq1d!!oBq@T3?9JMD5N9-g+Oe<<_;Nv=-7JXAZ1^lyBXDef=t}
za$bZC;H-gEgOEoV$NvCYt=htN06>)ShCkunffrziNCLW{8;B<#=i02SJJv^5#CXBO
z^rveBF59!)t4O%oM%Kyc?~dY#B$Z$#(Ij<TbnBjn9<;>Ayw35VJ9dG|#!t5$zO^J4
zr4$V8Z17L#+pm9GcLr|STZF`*`HC`BN%Ix!+wrO72YyjPr(Cj*4^Rhx&YBY&A{$H@
z2ISscvabV<n54Rr)U<DHmzjVqyFV|d(w@TfB#cdQ5P4Wgs~Guywe&B*FWNuGU$d``
zq1OB@uFs}iDFnwGf|4)y9S;sV@N-43wdxmW{+>T$@Axg3g}x@eo{RAcIJ_;a9jdqS
zmTP%mry%6V&#p(fuiVWmUbFEXgco*K5#3wLfuWii11pZiFzPFYy&gw(vD-?oI<wsW
z04`P3CTReIMFexe;1T{u6|n@yNWsW=+r~~a`2JPfc5*$9m@lR<v|eOjrg4mS>VNvw
zrYTxBNmtK=rf`Zf+<utFQ8x&6S6fydO9ekOU=x$re=4<aEcYnR79d$d2Q7_+9^YC4
zq$0-W&LP0tKIQ>H82-PVWkIUXaj0BD9l0>XKoT$@Kd(Qf7XtCR5y=Q*6oZnxKoNo0
zr?9B5B%b-Fk_1@E0B+b0-rQrQCNxQHA&xYPFr^ttFVLQO$E8}-WN`oj1c`p=M!_tj
zl0B$b6EdDzmfkrgi6du2l;KZ3y5!WeTnKH^BVCLWB0dHWWBkn<ZWc_V63ozoTg?hf
zWrr+r$tTcfHF{a*g)SK+R$|9~=Fg@-9<&C=WYRoL!R6XOAOd(C{{TKJBYSgi42%Jk
zG1|<)WkKvcKMGguGQ_O$LV(;x(iB+<PvOZt6WrE)rR0qBOEU(I7#+J0KBF`?2^H<`
z8|`vAxB=d77nBGH&d_`GtjXhTM^H%CLa?i|$i(%}2Oms+l`Y$-_hpNwj^@_c5m`y$
zoQxM3>;4s9dxW%+$nzNN+PhoRp#K0GS3}hhrNoYk5<w-!z{4?YZCs!8%~+3Zy2=^6
z#sGuK?f!9!E)86V&$Y92G%&H4<yhmdryaVAn$i%K(RoT2e+N8n^*^DhwTjdhVIg!-
z6+(d05rDZpGJ2o!seiO1nny-En2-VmBMZkT)2OBfed07W=07RaH$N!=eREG(mde?N
zSu&s^tMJDiO)Y^UoG_c8EUE~VfmLTX$?wmgs(PiA#?&-xxl@@`jtS?C{xr4RcUQ5R
z6{ea<<Upi?tQ(wQbRCC6YKEz(CYfz63rQpVs1><9a(L-O8dnDK8!fC06Kx>nwk~#z
zarpG9*H>%nT*ifFAO-{wKqr%q-RQV9T6AF=#7aP_eo|Nh1zWKD7>SI{Czch2W-<w9
z0OL9S9FPy=icb9ml21~MvYkW9Mj(*b+tVEX0QIX#!5VLZGOZf(yJ6&?N@xrXZsB5U
zc>zQzkZ^KXn$3>+t|XORBzXwR@CHw(;fhz(q^ylZwUT&Mm?UFnKqEZk2B=K0Xi7&X
znCvnDKXcqtvq5z9E$DhI+RWxCZDqNB30PFIe@;680Q%{YI?rxVV%_qbagLoRx?y2$
zQKX60K#|A?ETfNX{{UKKc8o&E?S$?W_4fCs4?@MgvUyIc4mT1$R_3Pu%^q7ZA!RL}
zL5@WhzQVq`nW?7kf=~*omL$0E&09J;e(lNwkO+~ENFPcpJCltVZbn1qF&{G#`hiz2
zm{{Aagn+sEi02=T78b0A-s(9p#kX^gwDD;in_DCTc-l`Nhe|DQy|*{y^3U;=Vb5Pm
zrR6`G=L*Vs0FJ(t#i3?B@+ngo0DRRPnPxs=B{RUrXt<IxZ&bR>RPJ>+P@|~#71imp
z#jDt(#~45nM2et{5HL^Y%`^?ONJZ!1mL!lcLiQDSM6gGa%bnb0_v8HYR7o%kBQr+r
z81J6-b{If~%eL@(-~)q^%{28B*tKqgU_+{*7*z$g53fBc$CPF)ncRarMstCmQ&hA>
z+_N3LZ8AjbkOlz9Uw>|WD&pxx%_Cuz#yQ=dJvg8dVq_MPD2<j;jjCMaekAv-o1IcQ
zE&x?n<&8;VIUEkSrrn2YmF>LUL4Y!BS5QKz7-Q@F>eauKY#4%M01!fs^jun&ueBit
z8BtVmwFg6*BA#2B*_bLOMtJK$BKlq%Hffcx=cpaeu6kGBAF_x16m!S_0J65Gzu7v2
z-snZYf27|M@v-hlbSKnM(rV9Qle4+`J0Vq!ID9z%EO51NOPOPbYDiW0e7lDwN567#
zX>J=EQfze)E(poo6dp0twP-~%7DDIE00OEy4ms!Xrb^J#Bt*MI;y`oqch7I7R<*Zi
z<RVrAHBuO3Brxm6J%jTizP65iIor$;C|pLWH*wGSRj`k5W<Ygd6D-8?+2C}bWfw&a
zE0#h=?BRRo*0bMKH!Ak<zWFk!peX=k_xg3Dfx8Wk!bG2JvJw$+r3oGS{d!dUOmd`3
z%>=ml!%O#vzrP}ddk3LA7=GOwC<bip1&#qHzJCK$?XH?#(6JIK=X`~F{STlNbqf+-
zYH1~rVC>MNvjjowjO2Q8j8=832^vOm<i(657Re{C1GgP`??co`)4S24)KnPV!ms+W
zS38b<1#;|2*AJXsV2Q&>F~?3nnW=gdnW1#Bz49z-S#T8Y`==PiE!FY7yLL!g6C-Ys
zK>;{DI+|9v)`-ZnwlmKg$-H^_$<Lr20Q_p?F-K(X%B*&v0AzK>Kqt02{OMROa@uB~
zb%>SA`9<86$;lyj=za6juS0hsg=7QE0rseHat25zr&0wZ#?FOqK-5(cP(Y<rmQ$RO
z!1k(|qrJVqnu@XHkTzvTa(_?ppjs5xM~)y?K@%Pimw*EEo=#6S9fr5&%O3d}Oc0qX
zje{Pa=dB6%Dft?=ml20`d0J@3FuiwU8UACht!B?WaLB6ylyi}QKIr;;(CjTqRv7MH
zP|uZBT;Stq>-y%iZe3l@6L3caKK$?C@$KHFjSye!a->oTArl2$ulqO$9Cz!V!mEqf
zO^v<0NXrK8?!}28=j%o6KQfYOv)jrFgfiqdS;^Wv{Wz%Z?BTk(VVuVb^=`-0^E5Es
zm7~y+{KrsGvtU0=fA#v)?d?UZ$IX>mMj(_2Cmz3*B!_cC?GB|o7?d<&a8xb>4Dre7
z)Agt=*fBYS<^Tm5&-oPXsELU!`<N9&jz}Ge{(b8FQrX2|#ga#uI<hcqC|{U1d*q$C
z=dt_?1<r0@tkS~*q8#onPIJ#+(x6!6xMd3{bXFkojGx2nNujSY^4Q#DshL?qVDs40
zoh_ug5<IvYeKEl8MVK~qULElb*M%;G_SpcHFAEd4U8E2gcOT<f4{0ROqAG~PACxa6
z9-PuqNx63$leLPr`e9g|H|>0pjsOIoYSDthg_shZv11^f4myxODxz<4OLe!o!o;n+
z`=jaq0M@Hk>E<@Y-6V{91sr>SpISB#E~B={W*%Y{QO_zV%LB+9D`fS@pr%d8UeMb%
zcM{>Tk~7cwG}#(CV?J-(&Q5-`S&rs&X%NoQx*sKX9D!5WG<PzqO2CoO<EJ#NJKWWd
z6499fA;19gaz!3f2J>W$mK_1^DUvL6mXc*v!+JMiRoNa~k;xf3_x_XuBsT1kk{fGe
z6S(C1*H7X904CnT@Jk$qRw~gIY+<?TJB(-Y{AsNO%M81SWI_h)5(W-vR7n|ClqqAw
zdmraimC&wfNgBf26qYU9`H@;t!XZ}*#j*}YF^_NOPQ>2C=;_av>~X?^bA##qDrLA3
zL?jV{7-WIL$I_jLa>be?$e0em^~laY`t`IFjjE?>FIMU?LRS-Z*rg;vu!V4PLB}PB
z)~nlD7{bftY;C(^a(?Lg(`W`YnYndlEKm$8s9vM#`1h*QXiX%524pNr!yb9-&#yFC
z6C$47E#J&7yI{wlH7s+L05S-G<dSnher0QmqYM0w5S*OjkIJ*&;Lhssx}e9*7<E3z
zjY?;m+3dMOU3{&Q0Awd{B>R6_*0;BT1n(f;OW^|Zp4mO|NdsG&7c<ErW<u(wJQh#@
z2e|yRR_yN6%K{~QHqZkM0z3Y`)Gfu((tFWi8%!52kA>$1o-u*=)XMKA(K0CqU}G3u
zka_D=#As<YR~{t0o;6tG#4<^VBvcy_OCC-+;NW-YGoEupD+wi&e2~UEZ5d;p2e`?j
zpm`#!7fmcI^Q4F*`O2?F!Qg&$G@oXX7(%HS1cw8Vd+<GTK<t*~$)|wZvf<KE#sJ7U
zJe>V2mGj;U)l`VH#&A25#QK^~aV29y8>t{NTuTvI8O!4Uoc$@bvrTt6WE&BWmzP`>
z&m`xkY96`|%)0tA8CbhBl?UfxjoAMH4E3hUs|}2k3sTZ@BT|0x&j&w+7O*xfP&iGI
zs~~I!Zk<5QQJThUsfzh#AV?xibmVc5)1@ZZT*!{n>g+tP2~)odyl{ikv@P_a(h>rQ
zaG+<ApKt3@t~;W~*sd>%sQ@ZS0B=$cTBWXNm!{T8Qbb#aPy-dl06FM;`_X3DU%3^&
zf@5WtEP|>t@^X1RXVX0K=}oZk{Q8ViB(r7MmfavHW`4ACyXZb^7iQ3=l~y?J#8Cs5
zbQmpz*05ViK^_)HCFLUw<nHgDe!ZzUuuNk{lHbPx`^paPao0S4LY)2_5v1;_QN~H<
zr(kJvwmxE$TSW6T3`(;A8dW3`0qMumuiU&6P7zqd*}{N6@jj=u0eiC8vWiIV16(fj
z+N3BX9Q8RKm5-!p!+MDXj=3Kw8RYT!&>ErIjDic|=?ba_&c|N4{b~Acpe|-u%wul;
zBVGp6jtd^3Qqc_;Ot3ZlkUOY|au{-Y^z{D#^%~{%_VSW=qYERWgTn$nzP+iiNW_QD
zEk5Zy<x|MrfIX_r9z~>g7dJ5ZPGkjkjsWx~p_G>Bs}`>`k;=u13~&O9Y!SW1(O_i2
z;3;#1kN*H&JBrB~*7lM!GDyG`ApK51rBY<Ii!mT2M+J^^k4jdu)Dzc1sj?t^v{a9A
z`H4L$)1Bdx20J-BkYlfUHXZIQjOxxpp)zCmvNA`tYQuQ)ku1Z?2ZaNGII2XqV@g}N
z+9=o%2Yj65@leSuW!NbJhYQEQui-|*dX3t~HQZES<iAXcfum_7VYo3Q;fHQ$+#ZFi
zSbVs_Nk&P@=t(1w@vVC)p3X(M49v<mC>&t=<a3<jnoJ*Yg_hun8QFp5i07XF09uGl
z(j)n6$T`8|=|<oQ0}PKbfX67qIn7NCoN~f^*TBHSgMtaqG;YH7BM^`R;2oX&k9x(t
zgxR{tgn4p&rAqUjxxk}fPUk}`Op`cwR{&#ldBc0>{Ave`#|xdiiw<$eKj-;T<^rhM
z4+Jyr&m3TP{#4-dTidBv$2^~<F*0ShMguFB1Rh6B){T^2NSy$}gc!zgxDa#s6GG92
z?u~GW%Y~4RG8mF7Q)s~kLXPBgs<AAvmhncx$yJQ7KAEWJGRhswJF4J@#|D^-FsnHL
zl9KNJ7UR?CY2I4fA$D&%LQWBojDzn*hjT_54YI_g!^Tc>!>$iZ)}#;ih1xhwWk!0O
z_U}(&JxL>w#^AQuT~B;rPuJF;v1CIbM{rKxlzra$rY2I&(kYHcP=sf6gODoRPrVsm
zbGU4=01SRKwg+OY@~f6bA>+<hj#t=<!MK#Gkn94k0NOhKG}ePg9pkf*p;ec!BbuQt
z@JO%_U;)TIDHM)QZAHPC5d~}jqa6qT0ISxo*<Q#)ouKR>A@~0PJ-w+Xt%0i>R%SJw
zQss*_)+@o}_T%eTZEhNIAyUpy9GnigA5Wz_-PlaNCWQktj3Ou@fypEuKNC`1LW=S*
zURg+D8>l|MwN?_jt8RiOjXc0q07-NAc<KIqYML#@$C<u-KzY~~f-~v<MJK3iTp?6U
z1Y|^t6qfJkIP0Hku_`1mDoN$C^;AB;;3<ZT&b+mj`2&z5gf?;x02t@_)^b8)R*u#s
zgCBlY>;8YnmAZl|+(yPngal@050jE`KAi`(XiKIov~Wh{T4@xzfWY7n>BynzJ<Cyt
zk;=+E*2l_7<+wa!u&Xzye$J)hRA#{Rz#XaBpEEuN3W~x(JfV&Pr+=?}R+C5~w~ZW<
z%y;m66W`EMAE}*q8s1Y7U=Y9FQVui882oCD)UsU8&_;KvsV8^J7aV8n%_g)OCXVaK
zKoAI`$U8yL&C~w?uTx8W+ROQl3PywPI-X8C(SCr{^%mY{85zObgM*Bm@marV7P1d8
zDuQzR8>sEidL6?}%4buEO7WtY(RdhaWRd>>>#lI$mX!=~?O*_0b{XcPS`?MVf=I10
z$`y9<L0t3heQM+ygiO!&hF~^eA<xcxpK4b?CA7BR+7d}4c@T*I0CtFk`Hhp(v*nKG
zQpD0n6})^Mt%0<9ocG6XdL`KnGSca03s;d`%CV4J9ANf8=hCK<BLG%?u}8g%<-+bi
zUbKM3mMETdY_QHlN4u37{c9#&UO}iwwE0DN3Zw$Vx6^_8(q$u{veskMH9L8{l)Pw(
zX=9cmMtcHy&s^3e`ZTuEv#epJlalMm$5Jur_4K6m1dJgRHqo#PlI#fWxc92}p+3nB
zEM8RIxPWi~{<N$+vQ^b1xwnZe(7=pIW(&6?Ki%p%&*xSmxZ7|>?BJEpC#5vOqV1}<
zGBc1zB;??nQ!K33V#FgcBY;la(AC2BFTI3iH#}sgK%*pNR-R*y$OT_52<LaP{{ZV#
zu`S%nn{b0{F|l*dx29>r26Bli`GAbEJrw;Z4(S&{2+I`#ROe<-um1pB6fy{4XCo-w
z9nHzd@~W{nENoe#49uY5;S_Q|8e|q_tr3SA{4?)Gg6Ovjd3j?X+82-Tsi2V`YcdA_
z;Hz{XcH)?d%`g%GLWIr<1A+NfF)6k}!~q{U80kvZ9)+|YXvRp-_xFCErC5^f?$|pO
zM8bi!a5xyxA5YGhi>z59*h-SkxDos#>)WqNed31_A(J03-T?k|J;LQZDlvHxL;J?=
z*vB~Q{{ZW)HGnWE$P^B~-F-fkErY2N5bm+6f|$lg!Tjq;!m6={0Z2Ij_cYLmwg{Ax
z`;(8CCqI>3)7-qW1xAh7fS|7o!?)}DRSB2j@>XPNTaa=IIIS0nC1(ua9FQ3Z1MAP!
zP=xP$i0->tVpUSS0^pK8KD|wAJf#?{e>UOB9OK%WL9oYHHw`R{w3P!qb4-?2FfW=s
z!k7%hwLO5X4csuN1)(E>xbojh)sj|?kyMvbK{)3pJ^uh4P#f+;1ZQzA8_Wqf!0G;T
zN;N{;%xD=mVTzn%wE)T&u_gVyiq6=^3aKEU%9xswh$w+TT;py&@4hIo6mOnJfQ4T-
z=D{Rm9Q3ToZbsygoyb8MC#50ZQ#$JKc}%G%UzBd^T;;{l`ztG)oSvtGDKd;m?^Za~
zJiN9>GtM~cTNZO%eVZk~iHHMW<daD|AZWV`rro2!3Ap|C=Rb{U8_5_Dp;ZaSI&M7k
zifM~|MNcRoEg=C;N2xtW^X*gpx=SgO2xW3`0R;1pQ{TN%SiWxLj#n~1#bpbIKu;gm
zr+r{c<%GlvRE?NCobXAeD_qs`io&_%XD_sLJ+Yqrew9h57l`g7{{U2QfsYvLngZ7w
zG_ppE9HhFi0RaSV_5<r$DKtt5DqMlIsOJaQKU`1^T*<$>fg^TiWtg3r9N=S~KM_)C
zeo|S;(Szq_g2~Hw{HX&(a9m3?Z5re-<eix#93E+JESB+0yOoSM<@1m~$e{x#VDW&;
zHsNrXTy8$N$I`Q5EhXwKswX>g<(r@#D7crAcxnpq3_jzxArN2ydJpABousYGyv;hO
zE%O1-;qOI&b<NxwOr;~kIOBoexvqJ&k|1b-GRnts+T8*A(q$wv<50#@CP`!<e58&T
z`}z(m4)*1vl_8GhBz?PB?at=M^ffN*X%uxWUJX6sSD6E`#{Hz{-yJHZmwqlx@=DJ%
z&B{n{3zB(1K~bSe8drDbY})6_^AwU~jN~s~zu{T4YOzOkZqZxfIL_alv%A#i(~i_!
z5+1kr5wlJiW}UJXW5@^(^6ggz*O@ZIBgzwZ-d=D(&wjY0a9R@S+YPL<%z@V+DQ4vJ
z=qdVz#89Gzn3hZwjGw)cobmXIY!bPV7NRZZGEC@Qp$H0~`9K)xIL<nrr>W~$aN45Z
znHT^LOD^8LpYw{FTS4m0t9T)oXkza$Ag&*3f!`y)6=Pi0CDbkL?V2NWVg^J-04jz9
zzh1(Qg16vTdpSIpn=2eqN5)2X9{qY&Jb9LMcb6ls(z(yCJ*gDDh^@p+BD<0l{otJD
zrGyuqkrxqzk;hzj{AltHhS@-ng;iqtA2N;<dS<h%pO%zmQ~);Z&f$~aw_1A(b4>`A
zB?_BjVU!)fHL%Sc+M*d5j(8h!Rbopzi#^1KMv$B+1ZOw^ar}irWG&5=!DeFo70AwV
zdF$IBtroVx^&)0LFak3nB#;>6Z8U_EWsTGz=*Qgu0G~=W4a(C@Z6q<V!3PD@_55o=
z-bd5qlp{$TSl@y7dF!980c}hKcWJ?S6rmuf2e;7HpW2}e<bou~zytC*p+4Zz1dsd3
z%b`$sPT(JWbf=uljjjtE1IBpAWBAc#1;}KDAUlXSTxT48e_Fo;J77c#SxCk+*YWhH
zWGfO(8aR~!1-kUkdHrc3Bgsfe?TikM_|vt-$n9Inxnv~9K{*Gw`c~%H{LnCPd+zD$
zLeOmuL{*irL2jx~7^~xKg_x$+191NUKaDiH3d3QQW!Qla%$dUbe@Y{ap+-_;U~|G_
zk>A#xffGVi_Oz*tH_R2V7=N7AqyV_y!AE|3<BBX6B}OtIEmLqj5u9=Ss_ICVawy${
z(=Iw^{QA=usihqM0O^4k`D(u_KdybN21rbkJ|tw=c;`EYKd&?~Br8OyL%H*YINjQ{
zp}ARODo9yR+&Scq)Fol+%4Y6MRV^EZ0FZgC*ss>^R}2UnvVKy(hriTN7As0w?%F`6
zP*-6*jDgz*t2C(uJMtY5-3T#(k7`U3GH$geWiG_1CmeH{&A7{=u^e^Ae=0*rf?y>Z
bwvvhl7*{cT(p<#G2Ot7YT9YYRYJdOPNTvX#

literal 0
HcmV?d00001

diff --git a/test/jdk/javax/imageio/plugins/jpeg/JpegExifThumbnail/jfif-and-exif.jpg b/test/jdk/javax/imageio/plugins/jpeg/JpegExifThumbnail/jfif-and-exif.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..47856d7e75ca9d029a8afcb1051e49d801efeee3
GIT binary patch
literal 230979
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%0A=`ZH*3GFmG3U3;USTz
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
bHf<Ke4mk0k3kBwQ6T<YWMW2T+Wq<$K9~r7C

literal 0
HcmV?d00001

diff --git a/test/jdk/javax/imageio/plugins/jpeg/JpegExifThumbnail/malicious-looping-IFD.jpg b/test/jdk/javax/imageio/plugins/jpeg/JpegExifThumbnail/malicious-looping-IFD.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..627fdf87fc566ca39868d36484508a0543889c17
GIT binary patch
literal 260977
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%0D?7UR4h!5BayIU
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
SHkv-81D(1wRXU3HKmXa@VUgqj

literal 0
HcmV?d00001

diff --git a/test/jdk/javax/imageio/plugins/jpeg/JpegExifThumbnail/plastic-wrap.jpg b/test/jdk/javax/imageio/plugins/jpeg/JpegExifThumbnail/plastic-wrap.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..860e7ad6512056719a0743fc26e932ac5c8ccf4f
GIT binary patch
literal 72776
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
F|JjXJCJg`p

literal 0
HcmV?d00001

diff --git a/test/jdk/javax/imageio/plugins/jpeg/JpegExifThumbnail/uncompressed-exif-thumbnail.jpg b/test/jdk/javax/imageio/plugins/jpeg/JpegExifThumbnail/uncompressed-exif-thumbnail.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..0682f81486c0faa42a8fc805d7ad54ab8c926dd8
GIT binary patch
literal 132599
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%0D_VDI#*w{_*(i9!?Ct=`3XNPS6^-a00j&9
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
M^sH%bV|yR}*$0ZJPXGV_

literal 0
HcmV?d00001

diff --git a/test/jdk/javax/imageio/plugins/jpeg/JpegExifThumbnail/unusual-ImageFileDirectory.jpeg b/test/jdk/javax/imageio/plugins/jpeg/JpegExifThumbnail/unusual-ImageFileDirectory.jpeg
new file mode 100644
index 0000000000000000000000000000000000000000..d35397ad710f265a36d362a5444842dd54e9dd25
GIT binary patch
literal 153777
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

literal 0
HcmV?d00001


From 8d8bd0c4b3bfdc7670bba03b01b0a00dac9f9825 Mon Sep 17 00:00:00 2001
From: Fernando Guallini <fguallini@openjdk.org>
Date: Mon, 10 Mar 2025 19:51:16 +0000
Subject: [PATCH 289/587] 8349492: Update
 sun/security/pkcs12/KeytoolOpensslInteropTest.java to use a recent Openssl
 version

Reviewed-by: rhalade
---
 .../pkcs12/KeytoolOpensslInteropTest.java     | 66 ++++++++-----
 .../lib/security/OpensslArtifactFetcher.java  | 97 +++++++++++++------
 2 files changed, 109 insertions(+), 54 deletions(-)

diff --git a/test/jdk/sun/security/pkcs12/KeytoolOpensslInteropTest.java b/test/jdk/sun/security/pkcs12/KeytoolOpensslInteropTest.java
index c35bf47d56d..846f036cd5f 100644
--- a/test/jdk/sun/security/pkcs12/KeytoolOpensslInteropTest.java
+++ b/test/jdk/sun/security/pkcs12/KeytoolOpensslInteropTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,7 @@
  */
 
 /*
- * @test
+ * @test id=GenerateOpensslPKCS12
  * @bug 8076190 8242151 8153005 8266182
  * @summary This is java keytool <-> openssl interop test. This test generates
  *          some openssl keystores on the fly, java operates on it and
@@ -31,13 +31,24 @@
  *          Note: This test executes some openssl command, so need to set
  *          openssl path using system property "test.openssl.path" or it should
  *          be available in /usr/bin or /usr/local/bin
- *          Required OpenSSL version : OpenSSL 1.1.*
+ *          Required OpenSSL version : OpensslArtifactFetcher.OPENSSL_BUNDLE_VERSION
  *
  * @modules java.base/sun.security.pkcs
  *          java.base/sun.security.util
- * @library /test/lib
- * @library /sun/security/pkcs11/
- * @run main/othervm/timeout=600 KeytoolOpensslInteropTest
+ * @library /test/lib /sun/security/pkcs11/
+ * @run main/othervm KeytoolOpensslInteropTest true
+ */
+
+/*
+ * @test id=UseExistingPKCS12
+ * @bug 8076190 8242151 8153005 8266182
+ * @summary This is java keytool <-> openssl interop test. This test uses
+ *          the existing PKCS12 files located in ./params dir and java operates on it
+ *
+ * @modules java.base/sun.security.pkcs
+ *          java.base/sun.security.util
+ * @library /test/lib /sun/security/pkcs11/
+ * @run main/othervm KeytoolOpensslInteropTest false
  */
 
 import jdk.test.lib.Asserts;
@@ -45,6 +56,7 @@ import jdk.test.lib.SecurityTools;
 import jdk.test.lib.process.ProcessTools;
 import jdk.test.lib.process.OutputAnalyzer;
 import jdk.test.lib.security.OpensslArtifactFetcher;
+import jtreg.SkippedException;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -67,22 +79,25 @@ import static sun.security.pkcs.ContentInfo.*;
 public class KeytoolOpensslInteropTest {
 
     public static void main(String[] args) throws Throwable {
-        String opensslPath = OpensslArtifactFetcher.getOpenssl1dot1dotStar();
-        if (opensslPath != null) {
-            // if preferred version of openssl is available perform all
-            // keytool <-> openssl interop tests
-            generateInitialKeystores(opensslPath);
-            testWithJavaCommands();
-            testWithOpensslCommands(opensslPath);
+        boolean generatePKCS12 = Boolean.parseBoolean(args[0]);
+        if (generatePKCS12) {
+            String opensslPath = OpensslArtifactFetcher.getOpensslPath();
+            if (opensslPath != null) {
+                // if the current version of openssl is available, perform all
+                // keytool <-> openssl interop tests
+                generateInitialKeystores(opensslPath);
+                testWithJavaCommands();
+                testWithOpensslCommands(opensslPath);
+            } else {
+                String exMsg = "Can't find the version: "
+                        + OpensslArtifactFetcher.getTestOpensslBundleVersion()
+                        + " of openssl binary on this machine, please install"
+                        + " and set openssl path with property 'test.openssl.path'";
+                throw new SkippedException(exMsg);
+            }
         } else {
-            // since preferred version of openssl is not available skip all
-            // openssl command dependent tests with a warning
-            System.out.println("\n\u001B[31mWarning: Can't find openssl "
-                    + "(version 1.1.*) binary on this machine, please install"
-                    + " and set openssl path with property "
-                    + "'test.openssl.path'. Now running only half portion of "
-                    + "the test, skipping all tests which depends on openssl "
-                    + "commands.\u001B[0m\n");
+            // since this scenario is using preexisting PKCS12, skip all
+            // openssl command dependent tests
             // De-BASE64 textual files in ./params to `pwd`
             try (DirectoryStream<Path> stream = Files.newDirectoryStream(
                     Path.of(System.getProperty("test.src"), "params"),
@@ -103,6 +118,8 @@ public class KeytoolOpensslInteropTest {
 
     private static void generateInitialKeystores(String opensslPath)
             throws Throwable {
+        Path providerPath = OpensslArtifactFetcher.getProviderPath(opensslPath);
+
         keytool("-keystore ks -keyalg ec -genkeypair -storepass"
                 + " changeit -alias a -dname CN=A").shouldHaveExitValue(0);
 
@@ -123,7 +140,8 @@ public class KeytoolOpensslInteropTest {
         ProcessTools.executeCommand(opensslPath, "pkcs12", "-export", "-in",
                 "kandc", "-out", "os4", "-name", "a", "-passout",
                 "pass:changeit", "-certpbe", "PBE-SHA1-RC4-128", "-keypbe",
-                "PBE-SHA1-RC4-128", "-macalg", "SHA224")
+                "PBE-SHA1-RC4-128", "-macalg", "SHA224",
+                "-legacy", "-provider-path", providerPath.toString())
                 .shouldHaveExitValue(0);
 
         ProcessTools.executeCommand(opensslPath, "pkcs12", "-export", "-in",
@@ -480,12 +498,14 @@ public class KeytoolOpensslInteropTest {
         output1 = ProcessTools.executeCommand(opensslPath, "pkcs12", "-in",
                 "ksnopass", "-passin", "pass:changeit", "-info", "-nokeys",
                 "-nocerts");
-        output1.shouldNotHaveExitValue(0);
+        output1.shouldHaveExitValue(0)
+            .shouldContain("Warning: MAC is absent!");
 
         output1 = ProcessTools.executeCommand(opensslPath, "pkcs12", "-in",
                 "ksnopass", "-passin", "pass:changeit", "-info", "-nokeys",
                 "-nocerts", "-nomacver");
         output1.shouldHaveExitValue(0)
+            .shouldNotContain("Warning: MAC is absent!")
             .shouldNotContain("PKCS7 Encrypted data:")
             .shouldContain("Shrouded Keybag: PBES2, PBKDF2, AES-256-CBC,"
                     + " Iteration 10000, PRF hmacWithSHA256")
diff --git a/test/lib/jdk/test/lib/security/OpensslArtifactFetcher.java b/test/lib/jdk/test/lib/security/OpensslArtifactFetcher.java
index 55ff8c9ef98..14b63abdd69 100644
--- a/test/lib/jdk/test/lib/security/OpensslArtifactFetcher.java
+++ b/test/lib/jdk/test/lib/security/OpensslArtifactFetcher.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@ package jdk.test.lib.security;
 
 import java.io.File;
 
+import java.nio.file.Path;
 import jdk.test.lib.Platform;
 import jdk.test.lib.process.ProcessTools;
 import jdk.test.lib.artifacts.Artifact;
@@ -33,43 +34,49 @@ import jdk.test.lib.artifacts.ArtifactResolverException;
 
 public class OpensslArtifactFetcher {
 
+    private static final String OPENSSL_BUNDLE_VERSION = "3.0.14";
+    private static final String OPENSSL_ORG = "jpg.tests.jdk.openssl";
+
     /**
-     * Gets the openssl binary path of version 1.1.*
+     * Gets the openssl binary path of OPENSSL_BUNDLE_VERSION
      *
      * Openssl selection flow:
         1. Check whether property test.openssl.path is set and it's the
-           preferred version(1.1.*) of openssl, then return that path.
-        2. Else look for already installed openssl (version 1.1.*) in system
+           current version of openssl, then return that path.
+        2. Else look for already installed openssl in system
            path /usr/bin/openssl or /usr/local/bin/openssl, then return that
            path.
-        3. Else try to download openssl (version 1.1.*) from the artifactory
+        3. Else try to download the current version of openssl from the artifactory
            and return that path, if download fails then return null.
      *
-     * @return openssl binary path of version 1.1.*
+     * @return openssl binary path of the current version
      */
-    public static String getOpenssl1dot1dotStar() {
-        String version = "1.1.";
-        String path = getOpensslFromSystemProp(version);
+    public static String getOpensslPath() {
+        String path = getOpensslFromSystemProp(OPENSSL_BUNDLE_VERSION);
         if (path != null) {
             return path;
-        } else {
-            path = getDefaultSystemOpensslPath(version);
-            if (path != null) {
-                return path;
-            } else if (Platform.is64bit()) {
-                if (Platform.isLinux()) {
-                    path = fetchOpenssl(LINUX_X64.class);
-                } else if (Platform.isOSX()) {
-                    path = fetchOpenssl(MACOSX_X64.class);
-                } else if (Platform.isWindows()) {
-                    path = fetchOpenssl(WINDOWS_X64.class);
-                }
-                if (verifyOpensslVersion(path, version)) {
-                    return path;
-                }
+        }
+        path = getDefaultSystemOpensslPath(OPENSSL_BUNDLE_VERSION);
+        if (path != null) {
+            return path;
+        }
+        if (Platform.isX64()) {
+            if (Platform.isLinux()) {
+                path = fetchOpenssl(LINUX_X64.class);
+            } else if (Platform.isOSX()) {
+                path = fetchOpenssl(MACOSX_X64.class);
+            } else if (Platform.isWindows()) {
+                path = fetchOpenssl(WINDOWS_X64.class);
+            }
+        } else if (Platform.isAArch64()) {
+            if (Platform.isLinux()) {
+                path = fetchOpenssl(LINUX_AARCH64.class);
+            }
+            if (Platform.isOSX()) {
+                path = fetchOpenssl(MACOSX_AARCH64.class);
             }
         }
-        return null;
+        return verifyOpensslVersion(path, OPENSSL_BUNDLE_VERSION) ? path : null;
     }
 
     private static String getOpensslFromSystemProp(String version) {
@@ -124,24 +131,52 @@ public class OpensslArtifactFetcher {
         return path;
     }
 
+    // retrieve the provider directory path from <OPENSSL_HOME>/bin/openssl
+    public static Path getProviderPath(String opensslPath) {
+        Path openSslRootPath = Path.of(opensslPath).getParent().getParent();
+        String libDir = "lib";
+        if (Platform.isX64() && (Platform.isLinux() || Platform.isWindows())) {
+            libDir = "lib64";
+        }
+        return openSslRootPath.resolve(libDir, "ossl-modules");
+    }
+
+    public static String getTestOpensslBundleVersion() {
+        return OPENSSL_BUNDLE_VERSION;
+    }
+
     @Artifact(
-            organization = "jpg.tests.jdk.openssl",
+            organization = OPENSSL_ORG,
             name = "openssl-linux_x64",
-            revision = "1.1.1g",
+            revision = OPENSSL_BUNDLE_VERSION,
             extension = "zip")
     private static class LINUX_X64 { }
 
     @Artifact(
-            organization = "jpg.tests.jdk.openssl",
+            organization = OPENSSL_ORG,
+            name = "openssl-linux_aarch64",
+            revision = OPENSSL_BUNDLE_VERSION,
+            extension = "zip")
+    private static class LINUX_AARCH64{ }
+
+    @Artifact(
+            organization = OPENSSL_ORG,
             name = "openssl-macosx_x64",
-            revision = "1.1.1g",
+            revision = OPENSSL_BUNDLE_VERSION,
             extension = "zip")
     private static class MACOSX_X64 { }
 
     @Artifact(
-            organization = "jpg.tests.jdk.openssl",
+            organization = OPENSSL_ORG,
+            name = "openssl-macosx_aarch64",
+            revision = OPENSSL_BUNDLE_VERSION,
+            extension = "zip")
+    private static class MACOSX_AARCH64 { }
+
+    @Artifact(
+            organization = OPENSSL_ORG,
             name = "openssl-windows_x64",
-            revision = "1.1.1g",
+            revision = OPENSSL_BUNDLE_VERSION,
             extension = "zip")
     private static class WINDOWS_X64 { }
 }

From ffa63409884e9a2d41f5223ab5962980edbb008c Mon Sep 17 00:00:00 2001
From: Roger Riggs <rriggs@openjdk.org>
Date: Mon, 10 Mar 2025 23:05:19 +0000
Subject: [PATCH 290/587] 8351567: Jar Manifest test ValueUtf8Coding produces
 misleading diagnostic output

Reviewed-by: lancea, bpb, iris
---
 test/jdk/java/util/jar/Manifest/ValueUtf8Coding.java | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/test/jdk/java/util/jar/Manifest/ValueUtf8Coding.java b/test/jdk/java/util/jar/Manifest/ValueUtf8Coding.java
index 533007dcf7a..28921bba868 100644
--- a/test/jdk/java/util/jar/Manifest/ValueUtf8Coding.java
+++ b/test/jdk/java/util/jar/Manifest/ValueUtf8Coding.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -37,7 +37,7 @@ import static org.testng.Assert.*;
 
 /**
  * @test
- * @bug 8066619
+ * @bug 8066619 8351567
  * @run testng ValueUtf8Coding
  * @summary Tests encoding and decoding manifest header values to and from
  * UTF-8 with the complete Unicode character set.
@@ -201,10 +201,6 @@ public class ValueUtf8Coding {
         mf.write(out);
         byte[] mfBytes = out.toByteArray();
 
-        System.out.println("-".repeat(72));
-        System.out.print(new String(mfBytes, UTF_8));
-        System.out.println("-".repeat(72));
-
         ByteArrayInputStream in = new ByteArrayInputStream(mfBytes);
         return new Manifest(in);
     }

From f984c2b32d7a1420f93424e1d48f06dfbca659e9 Mon Sep 17 00:00:00 2001
From: Brian Burkhalter <bpb@openjdk.org>
Date: Mon, 10 Mar 2025 23:58:12 +0000
Subject: [PATCH 291/587] 8351505: (fs) Typo in the documentation of
 java.nio.file.spi.FileSystemProvider.getFileSystem()

Reviewed-by: alanb, lancea, iris
---
 .../share/classes/java/nio/file/spi/FileSystemProvider.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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 14e5ce90c2c..fdbd737f49c 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, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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,7 +244,7 @@ public abstract class FileSystemProvider {
      *
      * <p> This method returns a reference to a {@code FileSystem} that was
      * created by invoking the {@link #newFileSystem(URI,Map) newFileSystem(URI,Map)}
-     * method. File systems created the {@link #newFileSystem(Path,Map)
+     * method. File systems created by the {@link #newFileSystem(Path,Map)
      * newFileSystem(Path,Map)} method are not returned by this method.
      * The file system is identified by its {@code URI}. Its exact form
      * is highly provider dependent. In the case of the default provider the URI's

From 5928209280e7a655a22f11bc03eae32a4e99756c Mon Sep 17 00:00:00 2001
From: Kuai Wei <kuaiwei.kw@alibaba-inc.com>
Date: Tue, 11 Mar 2025 02:07:19 +0000
Subject: [PATCH 292/587] 8347405: MergeStores with reverse bytes order value

Co-authored-by: Richard Reingruber <rrich@openjdk.org>
Reviewed-by: epeter, thartmann
---
 src/hotspot/share/opto/memnode.cpp            | 143 ++++++++++++++----
 .../jtreg/compiler/c2/TestMergeStores.java    | 133 +++++++++-------
 .../compiler/lib/ir_framework/IRNode.java     |  20 +++
 3 files changed, 212 insertions(+), 84 deletions(-)

diff --git a/src/hotspot/share/opto/memnode.cpp b/src/hotspot/share/opto/memnode.cpp
index a7cf598cb3d..55a65042584 100644
--- a/src/hotspot/share/opto/memnode.cpp
+++ b/src/hotspot/share/opto/memnode.cpp
@@ -2774,12 +2774,33 @@ class MergePrimitiveStores : public StackObj {
 private:
   PhaseGVN* const _phase;
   StoreNode* const _store;
+  // State machine with initial state Unknown
+  // Allowed transitions:
+  //   Unknown     -> Const
+  //   Unknown     -> Platform
+  //   Unknown     -> Reverse
+  //   Unknown     -> NotAdjacent
+  //   Const       -> Const
+  //   Const       -> NotAdjacent
+  //   Platform    -> Platform
+  //   Platform    -> NotAdjacent
+  //   Reverse     -> Reverse
+  //   Reverse     -> NotAdjacent
+  //   NotAdjacent -> NotAdjacent
+  enum ValueOrder : uint8_t {
+    Unknown,     // Initial state
+    Const,       // Input values are const
+    Platform,    // Platform order
+    Reverse,     // Reverse platform order
+    NotAdjacent  // Not adjacent
+  };
+  ValueOrder  _value_order;
 
   NOT_PRODUCT( const CHeapBitMap &_trace_tags; )
 
 public:
   MergePrimitiveStores(PhaseGVN* phase, StoreNode* store) :
-    _phase(phase), _store(store)
+    _phase(phase), _store(store), _value_order(ValueOrder::Unknown)
     NOT_PRODUCT( COMMA _trace_tags(Compile::current()->directive()->trace_merge_stores_tags()) )
     {}
 
@@ -2789,7 +2810,7 @@ private:
   bool is_compatible_store(const StoreNode* other_store) const;
   bool is_adjacent_pair(const StoreNode* use_store, const StoreNode* def_store) const;
   bool is_adjacent_input_pair(const Node* n1, const Node* n2, const int memory_size) const;
-  static bool is_con_RShift(const Node* n, Node const*& base_out, jint& shift_out);
+  static bool is_con_RShift(const Node* n, Node const*& base_out, jint& shift_out, PhaseGVN* phase);
   enum CFGStatus { SuccessNoRangeCheck, SuccessWithRangeCheck, Failure };
   static CFGStatus cfg_status_for_pair(const StoreNode* use_store, const StoreNode* def_store);
 
@@ -2825,6 +2846,7 @@ private:
 #endif
   };
 
+  enum ValueOrder find_adjacent_input_value_order(const Node* n1, const Node* n2, const int memory_size) const;
   Status find_adjacent_use_store(const StoreNode* def_store) const;
   Status find_adjacent_def_store(const StoreNode* use_store) const;
   Status find_use_store(const StoreNode* def_store) const;
@@ -2886,10 +2908,17 @@ StoreNode* MergePrimitiveStores::run() {
   // Check if we can merge with at least one def, so that we have at least 2 stores to merge.
   Status status_def = find_adjacent_def_store(_store);
   NOT_PRODUCT( if (is_trace_basic()) { tty->print("[TraceMergeStores] expect def: "); status_def.print_on(tty); })
-  if (status_def.found_store() == nullptr) {
+  Node* def_store = status_def.found_store();
+  if (def_store == nullptr) {
     return nullptr;
   }
 
+  // Initialize value order
+  _value_order = find_adjacent_input_value_order(def_store->in(MemNode::ValueIn),
+                                                 _store->in(MemNode::ValueIn),
+                                                 _store->memory_size());
+  assert(_value_order != ValueOrder::NotAdjacent && _value_order != ValueOrder::Unknown, "Order should be checked");
+
   ResourceMark rm;
   Node_List merge_list;
   collect_merge_list(merge_list);
@@ -2936,49 +2965,75 @@ bool MergePrimitiveStores::is_adjacent_pair(const StoreNode* use_store, const St
   return pointer_def.is_adjacent_to_and_before(pointer_use);
 }
 
-bool MergePrimitiveStores::is_adjacent_input_pair(const Node* n1, const Node* n2, const int memory_size) const {
+// Check input values n1 and n2 can be merged and return the value order
+MergePrimitiveStores::ValueOrder MergePrimitiveStores::find_adjacent_input_value_order(const Node* n1, const Node* n2,
+                                                                                       const int memory_size) const {
   // Pattern: [n1 = ConI, n2 = ConI]
-  if (n1->Opcode() == Op_ConI) {
-    return n2->Opcode() == Op_ConI;
+  if (n1->Opcode() == Op_ConI && n2->Opcode() == Op_ConI) {
+    return ValueOrder::Const;
   }
 
-  // Pattern: [n1 = base >> shift, n2 = base >> (shift + memory_size)]
-#ifndef VM_LITTLE_ENDIAN
-  // Pattern: [n1 = base >> (shift + memory_size), n2 = base >> shift]
-  // Swapping n1 with n2 gives same pattern as on little endian platforms.
-  swap(n1, n2);
-#endif // !VM_LITTLE_ENDIAN
-  Node const* base_n2;
+  Node const *base_n2;
   jint shift_n2;
-  if (!is_con_RShift(n2, base_n2, shift_n2)) {
-    return false;
+  if (!is_con_RShift(n2, base_n2, shift_n2, _phase)) {
+    return ValueOrder::NotAdjacent;
   }
-  if (n1->Opcode() == Op_ConvL2I) {
-    // look through
-    n1 = n1->in(1);
-  }
-  Node const* base_n1;
+  Node const *base_n1;
   jint shift_n1;
-  if (n1 == base_n2) {
-    // n1 = base = base >> 0
-    base_n1 = n1;
-    shift_n1 = 0;
-  } else if (!is_con_RShift(n1, base_n1, shift_n1)) {
-    return false;
+  if (!is_con_RShift(n1, base_n1, shift_n1, _phase)) {
+    return ValueOrder::NotAdjacent;
   }
+
   int bits_per_store = memory_size * 8;
   if (base_n1 != base_n2 ||
-      shift_n1 + bits_per_store != shift_n2 ||
+      abs(shift_n1 - shift_n2) != bits_per_store ||
       shift_n1 % bits_per_store != 0) {
-    return false;
+    // Values are not adjacent
+    return ValueOrder::NotAdjacent;
   }
 
-  // both load from same value with correct shift
-  return true;
+  // Detect value order
+#ifdef VM_LITTLE_ENDIAN
+  return shift_n1 < shift_n2 ? ValueOrder::Platform     // Pattern: [n1 = base >> shift, n2 = base >> (shift + memory_size)]
+                             : ValueOrder::Reverse;     // Pattern: [n1 = base >> (shift + memory_size), n2 = base >> shift]
+#else
+  return shift_n1 > shift_n2 ? ValueOrder::Platform     // Pattern: [n1 = base >> (shift + memory_size), n2 = base >> shift]
+                             : ValueOrder::Reverse;     // Pattern: [n1 = base >> shift, n2 = base >> (shift + memory_size)]
+#endif
+}
+
+bool MergePrimitiveStores::is_adjacent_input_pair(const Node* n1, const Node* n2, const int memory_size) const {
+  ValueOrder input_value_order = find_adjacent_input_value_order(n1, n2, memory_size);
+
+  switch (input_value_order) {
+    case ValueOrder::NotAdjacent:
+      return false;
+    case ValueOrder::Reverse:
+      if (memory_size != 1 ||
+          !Matcher::match_rule_supported(Op_ReverseBytesS) ||
+          !Matcher::match_rule_supported(Op_ReverseBytesI) ||
+          !Matcher::match_rule_supported(Op_ReverseBytesL)) {
+        // ReverseBytes are not supported by platform
+        return false;
+      }
+      // fall-through.
+    case ValueOrder::Const:
+    case ValueOrder::Platform:
+      if (_value_order == ValueOrder::Unknown) {
+        // Initial state is Unknown, and we find a valid input value order
+        return true;
+      }
+      // The value order can not be changed
+      return _value_order == input_value_order;
+    case ValueOrder::Unknown:
+    default:
+      ShouldNotReachHere();
+  }
+  return false;
 }
 
 // Detect pattern: n = base_out >> shift_out
-bool MergePrimitiveStores::is_con_RShift(const Node* n, Node const*& base_out, jint& shift_out) {
+bool MergePrimitiveStores::is_con_RShift(const Node* n, Node const*& base_out, jint& shift_out, PhaseGVN* phase) {
   assert(n != nullptr, "precondition");
 
   int opc = n->Opcode();
@@ -2997,6 +3052,14 @@ bool MergePrimitiveStores::is_con_RShift(const Node* n, Node const*& base_out, j
     // The shift must be positive:
     return shift_out >= 0;
   }
+
+  if (phase->type(n)->isa_int()  != nullptr ||
+      phase->type(n)->isa_long() != nullptr) {
+    // (base >> 0)
+    base_out = n;
+    shift_out = 0;
+    return true;
+  }
   return false;
 }
 
@@ -3163,6 +3226,7 @@ Node* MergePrimitiveStores::make_merged_input_value(const Node_List& merge_list)
   Node* first = merge_list.at(merge_list.size()-1);
   Node* merged_input_value = nullptr;
   if (_store->in(MemNode::ValueIn)->Opcode() == Op_ConI) {
+    assert(_value_order == ValueOrder::Const, "must match");
     // Pattern: [ConI, ConI, ...] -> new constant
     jlong con = 0;
     jlong bits_per_store = _store->memory_size() * 8;
@@ -3179,6 +3243,7 @@ Node* MergePrimitiveStores::make_merged_input_value(const Node_List& merge_list)
     }
     merged_input_value = _phase->longcon(con);
   } else {
+    assert(_value_order == ValueOrder::Platform || _value_order == ValueOrder::Reverse, "must match");
     // Pattern: [base >> 24, base >> 16, base >> 8, base] -> base
     //             |                                  |
     //           _store                             first
@@ -3189,10 +3254,13 @@ Node* MergePrimitiveStores::make_merged_input_value(const Node_List& merge_list)
     // `_store` and `first` are swapped in the diagram above
     swap(hi, lo);
 #endif // !VM_LITTLE_ENDIAN
+    if (_value_order == ValueOrder::Reverse) {
+      swap(hi, lo);
+    }
     Node const* hi_base;
     jint hi_shift;
     merged_input_value = lo;
-    bool is_true = is_con_RShift(hi, hi_base, hi_shift);
+    bool is_true = is_con_RShift(hi, hi_base, hi_shift, _phase);
     assert(is_true, "must detect con RShift");
     if (merged_input_value != hi_base && merged_input_value->Opcode() == Op_ConvL2I) {
       // look through
@@ -3218,6 +3286,17 @@ Node* MergePrimitiveStores::make_merged_input_value(const Node_List& merge_list)
          (_phase->type(merged_input_value)->isa_long() != nullptr && new_memory_size == 8),
          "merged_input_value is either int or long, and new_memory_size is small enough");
 
+  if (_value_order == ValueOrder::Reverse) {
+    assert(_store->memory_size() == 1, "only implemented for bytes");
+    if (new_memory_size == 8) {
+      merged_input_value = _phase->transform(new ReverseBytesLNode(merged_input_value));
+    } else if (new_memory_size == 4) {
+      merged_input_value = _phase->transform(new ReverseBytesINode(merged_input_value));
+    } else {
+      assert(new_memory_size == 2, "sanity check");
+      merged_input_value = _phase->transform(new ReverseBytesSNode(merged_input_value));
+    }
+  }
   return merged_input_value;
 }
 
diff --git a/test/hotspot/jtreg/compiler/c2/TestMergeStores.java b/test/hotspot/jtreg/compiler/c2/TestMergeStores.java
index 3598b8eae71..99e714d8c5f 100644
--- a/test/hotspot/jtreg/compiler/c2/TestMergeStores.java
+++ b/test/hotspot/jtreg/compiler/c2/TestMergeStores.java
@@ -33,7 +33,7 @@ import java.util.Random;
 
 /*
  * @test
- * @bug 8318446 8331054 8331311 8335392
+ * @bug 8318446 8331054 8331311 8335392 8347405
  * @summary Test merging of consecutive stores
  * @modules java.base/jdk.internal.misc
  * @library /test/lib /
@@ -42,7 +42,7 @@ import java.util.Random;
 
 /*
  * @test
- * @bug 8318446 8331054 8331311 8335392
+ * @bug 8318446 8331054 8331311 8335392 8347405
  * @summary Test merging of consecutive stores
  * @modules java.base/jdk.internal.misc
  * @library /test/lib /
@@ -724,10 +724,12 @@ public class TestMergeStores {
     @IR(counts = {IRNode.STORE_L_OF_CLASS, "byte\\\\[int:>=0] \\\\(java/lang/Cloneable,java/io/Serializable\\\\)", "1"},
         applyIf = {"UseUnalignedAccesses", "true"},
         applyIfPlatform = {"little-endian", "true"})
-    @IR(counts = {IRNode.STORE_B_OF_CLASS, "byte\\\\[int:>=0] \\\\(java/lang/Cloneable,java/io/Serializable\\\\)", "8",
-                  IRNode.STORE_C_OF_CLASS, "byte\\\\[int:>=0] \\\\(java/lang/Cloneable,java/io/Serializable\\\\)", "0",
-                  IRNode.STORE_I_OF_CLASS, "byte\\\\[int:>=0] \\\\(java/lang/Cloneable,java/io/Serializable\\\\)", "0",
-                  IRNode.STORE_L_OF_CLASS, "byte\\\\[int:>=0] \\\\(java/lang/Cloneable,java/io/Serializable\\\\)", "0"},
+    @IR(counts = { IRNode.STORE_B_OF_CLASS, "byte\\\\[int:>=0] \\\\(java/lang/Cloneable,java/io/Serializable\\\\)", "1",
+                   IRNode.STORE_C_OF_CLASS, "byte\\\\[int:>=0] \\\\(java/lang/Cloneable,java/io/Serializable\\\\)", "0",
+                   IRNode.STORE_I_OF_CLASS, "byte\\\\[int:>=0] \\\\(java/lang/Cloneable,java/io/Serializable\\\\)", "0",
+                   IRNode.STORE_L_OF_CLASS, "byte\\\\[int:>=0] \\\\(java/lang/Cloneable,java/io/Serializable\\\\)", "1",
+                   IRNode.REVERSE_BYTES_L, "1"},
+        applyIf = {"UseUnalignedAccesses", "true"},
         applyIfPlatform = {"big-endian", "true"})
     static Object[] test2a(byte[] a, int offset, long v) {
         a[offset + 0] = (byte)(v >> 0);
@@ -755,10 +757,12 @@ public class TestMergeStores {
     @IR(counts = {IRNode.STORE_L_OF_CLASS, "byte\\\\[int:>=0] \\\\(java/lang/Cloneable,java/io/Serializable\\\\)", "1"},
         applyIf = {"UseUnalignedAccesses", "true"},
         applyIfPlatform = {"little-endian", "true"})
-    @IR(counts = {IRNode.STORE_B_OF_CLASS, "byte\\\\[int:>=0] \\\\(java/lang/Cloneable,java/io/Serializable\\\\)", "8",
+    @IR(counts = {IRNode.STORE_B_OF_CLASS, "byte\\\\[int:>=0] \\\\(java/lang/Cloneable,java/io/Serializable\\\\)", "1",
                   IRNode.STORE_C_OF_CLASS, "byte\\\\[int:>=0] \\\\(java/lang/Cloneable,java/io/Serializable\\\\)", "0",
                   IRNode.STORE_I_OF_CLASS, "byte\\\\[int:>=0] \\\\(java/lang/Cloneable,java/io/Serializable\\\\)", "0",
-                  IRNode.STORE_L_OF_CLASS, "byte\\\\[int:>=0] \\\\(java/lang/Cloneable,java/io/Serializable\\\\)", "0"},
+                  IRNode.STORE_L_OF_CLASS, "byte\\\\[int:>=0] \\\\(java/lang/Cloneable,java/io/Serializable\\\\)", "1",
+                  IRNode.REVERSE_BYTES_L, "1"},
+        applyIf = {"UseUnalignedAccesses", "true"},
         applyIfPlatform = {"big-endian", "true"})
     static Object[] test2c(byte[] a, int offset, long v) {
         storeLongLE(a, offset, v);
@@ -797,11 +801,13 @@ public class TestMergeStores {
     }
 
     @Test
-    @IR(counts = {IRNode.STORE_B_OF_CLASS, "byte\\\\[int:>=0] \\\\(java/lang/Cloneable,java/io/Serializable\\\\)", "8",
-                  IRNode.STORE_C_OF_CLASS, "byte\\\\[int:>=0] \\\\(java/lang/Cloneable,java/io/Serializable\\\\)", "0",
-                  IRNode.STORE_I_OF_CLASS, "byte\\\\[int:>=0] \\\\(java/lang/Cloneable,java/io/Serializable\\\\)", "0",
-                  IRNode.STORE_L_OF_CLASS, "byte\\\\[int:>=0] \\\\(java/lang/Cloneable,java/io/Serializable\\\\)", "0"},
-        applyIfPlatform = {"little-endian", "true"})
+    @IR(counts = { IRNode.STORE_B_OF_CLASS, "byte\\\\[int:>=0] \\\\(java/lang/Cloneable,java/io/Serializable\\\\)", "1",
+                   IRNode.STORE_C_OF_CLASS, "byte\\\\[int:>=0] \\\\(java/lang/Cloneable,java/io/Serializable\\\\)", "0",
+                   IRNode.STORE_I_OF_CLASS, "byte\\\\[int:>=0] \\\\(java/lang/Cloneable,java/io/Serializable\\\\)", "0",
+                   IRNode.STORE_L_OF_CLASS, "byte\\\\[int:>=0] \\\\(java/lang/Cloneable,java/io/Serializable\\\\)", "1",
+                   IRNode.REVERSE_BYTES_L, "1"},
+        applyIf = {"UseUnalignedAccesses", "true"},
+        applyIfPlatformAnd = {"little-endian", "true", "riscv64", "false"})   // Exclude riscv64 where ReverseBytes is only conditionally supported
     @IR(counts = {IRNode.STORE_L_OF_CLASS, "byte\\\\[int:>=0] \\\\(java/lang/Cloneable,java/io/Serializable\\\\)", "1"},
         applyIf = {"UseUnalignedAccesses", "true"},
         applyIfPlatform = {"big-endian", "true"})
@@ -828,11 +834,13 @@ public class TestMergeStores {
     }
 
     @Test
-    @IR(counts = {IRNode.STORE_B_OF_CLASS, "byte\\\\[int:>=0] \\\\(java/lang/Cloneable,java/io/Serializable\\\\)", "8",
-                  IRNode.STORE_C_OF_CLASS, "byte\\\\[int:>=0] \\\\(java/lang/Cloneable,java/io/Serializable\\\\)", "0",
-                  IRNode.STORE_I_OF_CLASS, "byte\\\\[int:>=0] \\\\(java/lang/Cloneable,java/io/Serializable\\\\)", "0",
-                  IRNode.STORE_L_OF_CLASS, "byte\\\\[int:>=0] \\\\(java/lang/Cloneable,java/io/Serializable\\\\)", "0"},
-        applyIfPlatform = {"little-endian", "true"})
+    @IR(counts = { IRNode.STORE_B_OF_CLASS, "byte\\\\[int:>=0] \\\\(java/lang/Cloneable,java/io/Serializable\\\\)", "1",
+                   IRNode.STORE_C_OF_CLASS, "byte\\\\[int:>=0] \\\\(java/lang/Cloneable,java/io/Serializable\\\\)", "0",
+                   IRNode.STORE_I_OF_CLASS, "byte\\\\[int:>=0] \\\\(java/lang/Cloneable,java/io/Serializable\\\\)", "0",
+                   IRNode.STORE_L_OF_CLASS, "byte\\\\[int:>=0] \\\\(java/lang/Cloneable,java/io/Serializable\\\\)", "1",
+                   IRNode.REVERSE_BYTES_L, "1"},
+        applyIf = {"UseUnalignedAccesses", "true"},
+        applyIfPlatformAnd = {"little-endian", "true", "riscv64", "false"})   // Exclude riscv64 where ReverseBytes is only conditionally supported
     @IR(counts = {IRNode.STORE_L_OF_CLASS, "byte\\\\[int:>=0] \\\\(java/lang/Cloneable,java/io/Serializable\\\\)", "1"},
         applyIf = {"UseUnalignedAccesses", "true"},
         applyIfPlatform = {"big-endian", "true"})
@@ -873,13 +881,18 @@ public class TestMergeStores {
     }
 
     @Test
-    @IR(counts = {IRNode.STORE_I_OF_CLASS, "byte\\\\[int:>=0] \\\\(java/lang/Cloneable,java/io/Serializable\\\\)", "2"},
+    @IR(counts = {IRNode.STORE_B_OF_CLASS, "byte\\\\[int:>=0] \\\\(java/lang/Cloneable,java/io/Serializable\\\\)", "1",
+                  IRNode.STORE_C_OF_CLASS, "byte\\\\[int:>=0] \\\\(java/lang/Cloneable,java/io/Serializable\\\\)", "0",
+                  IRNode.STORE_I_OF_CLASS, "byte\\\\[int:>=0] \\\\(java/lang/Cloneable,java/io/Serializable\\\\)", "2",
+                  IRNode.STORE_L_OF_CLASS, "byte\\\\[int:>=0] \\\\(java/lang/Cloneable,java/io/Serializable\\\\)", "0"},
         applyIf = {"UseUnalignedAccesses", "true"},
         applyIfPlatform = {"little-endian", "true"})
-    @IR(counts = {IRNode.STORE_B_OF_CLASS, "byte\\\\[int:>=0] \\\\(java/lang/Cloneable,java/io/Serializable\\\\)", "8",
+    @IR(counts = {IRNode.STORE_B_OF_CLASS, "byte\\\\[int:>=0] \\\\(java/lang/Cloneable,java/io/Serializable\\\\)", "1",
                   IRNode.STORE_C_OF_CLASS, "byte\\\\[int:>=0] \\\\(java/lang/Cloneable,java/io/Serializable\\\\)", "0",
-                  IRNode.STORE_I_OF_CLASS, "byte\\\\[int:>=0] \\\\(java/lang/Cloneable,java/io/Serializable\\\\)", "0",
-                  IRNode.STORE_L_OF_CLASS, "byte\\\\[int:>=0] \\\\(java/lang/Cloneable,java/io/Serializable\\\\)", "0"},
+                  IRNode.STORE_I_OF_CLASS, "byte\\\\[int:>=0] \\\\(java/lang/Cloneable,java/io/Serializable\\\\)", "2",
+                  IRNode.STORE_L_OF_CLASS, "byte\\\\[int:>=0] \\\\(java/lang/Cloneable,java/io/Serializable\\\\)", "0",
+                  IRNode.REVERSE_BYTES_I, "1"},
+        applyIf = {"UseUnalignedAccesses", "true"},
         applyIfPlatform = {"big-endian", "true"})
     static Object[] test3a(byte[] a, int offset, long v) {
         a[offset + 0] = (byte)(v >> 0);
@@ -907,11 +920,13 @@ public class TestMergeStores {
     }
 
     @Test
-    @IR(counts = {IRNode.STORE_B_OF_CLASS, "byte\\\\[int:>=0] \\\\(java/lang/Cloneable,java/io/Serializable\\\\)", "8",
+    @IR(counts = {IRNode.STORE_B_OF_CLASS, "byte\\\\[int:>=0] \\\\(java/lang/Cloneable,java/io/Serializable\\\\)", "1",
                   IRNode.STORE_C_OF_CLASS, "byte\\\\[int:>=0] \\\\(java/lang/Cloneable,java/io/Serializable\\\\)", "0",
-                  IRNode.STORE_I_OF_CLASS, "byte\\\\[int:>=0] \\\\(java/lang/Cloneable,java/io/Serializable\\\\)", "0",
-                  IRNode.STORE_L_OF_CLASS, "byte\\\\[int:>=0] \\\\(java/lang/Cloneable,java/io/Serializable\\\\)", "0"},
-        applyIfPlatform = {"little-endian", "true"})
+                  IRNode.STORE_I_OF_CLASS, "byte\\\\[int:>=0] \\\\(java/lang/Cloneable,java/io/Serializable\\\\)", "2",
+                  IRNode.STORE_L_OF_CLASS, "byte\\\\[int:>=0] \\\\(java/lang/Cloneable,java/io/Serializable\\\\)", "0",
+                  IRNode.REVERSE_BYTES_I, "1"},
+        applyIf = {"UseUnalignedAccesses", "true"},
+        applyIfPlatformAnd = {"little-endian", "true", "riscv64", "false"})   // Exclude riscv64 where ReverseBytes is only conditionally supported
     @IR(counts = {IRNode.STORE_I_OF_CLASS, "byte\\\\[int:>=0] \\\\(java/lang/Cloneable,java/io/Serializable\\\\)", "2"},
         applyIf = {"UseUnalignedAccesses", "true"},
         applyIfPlatform = {"big-endian", "true"})
@@ -956,10 +971,12 @@ public class TestMergeStores {
                   IRNode.STORE_L_OF_CLASS, "byte\\\\[int:>=0] \\\\(java/lang/Cloneable,java/io/Serializable\\\\)", "0"},
         applyIf = {"UseUnalignedAccesses", "true"},
         applyIfPlatform = {"little-endian", "true"})
-    @IR(counts = {IRNode.STORE_B_OF_CLASS, "byte\\\\[int:>=0] \\\\(java/lang/Cloneable,java/io/Serializable\\\\)", "12",
-                  IRNode.STORE_C_OF_CLASS, "byte\\\\[int:>=0] \\\\(java/lang/Cloneable,java/io/Serializable\\\\)", "1",  // Stores of constants can be merged
-                  IRNode.STORE_I_OF_CLASS, "byte\\\\[int:>=0] \\\\(java/lang/Cloneable,java/io/Serializable\\\\)", "1",
-                  IRNode.STORE_L_OF_CLASS, "byte\\\\[int:>=0] \\\\(java/lang/Cloneable,java/io/Serializable\\\\)", "0"},
+    @IR(counts = {IRNode.STORE_B_OF_CLASS, "byte\\\\[int:>=0] \\\\(java/lang/Cloneable,java/io/Serializable\\\\)", "4",  // Unmerged stores: offset + (2,3,16) , and 1 for uncommon trap
+                  IRNode.STORE_C_OF_CLASS, "byte\\\\[int:>=0] \\\\(java/lang/Cloneable,java/io/Serializable\\\\)", "3",  // 1([+0,+1]) for platform order and 2([+4,+5], [+14,+15]) for reverse order
+                  IRNode.STORE_I_OF_CLASS, "byte\\\\[int:>=0] \\\\(java/lang/Cloneable,java/io/Serializable\\\\)", "2",  // 1([+6,+9]) for platform order and 1([+10,+13]) for reverse order
+                  IRNode.STORE_L_OF_CLASS, "byte\\\\[int:>=0] \\\\(java/lang/Cloneable,java/io/Serializable\\\\)", "0",
+                  IRNode.REVERSE_BYTES_I, "1",
+                  IRNode.REVERSE_BYTES_S, "2"},
         applyIf = {"UseUnalignedAccesses", "true"},
         applyIfPlatform = {"big-endian", "true"})
     static Object[] test4a(byte[] a, int offset, long v1, int v2, short v3, byte v4) {
@@ -1006,12 +1023,14 @@ public class TestMergeStores {
     }
 
     @Test
-    @IR(counts = {IRNode.STORE_B_OF_CLASS, "byte\\\\[int:>=0] \\\\(java/lang/Cloneable,java/io/Serializable\\\\)", "12",
-                  IRNode.STORE_C_OF_CLASS, "byte\\\\[int:>=0] \\\\(java/lang/Cloneable,java/io/Serializable\\\\)", "1",  // Stores of constants can be merged
-                  IRNode.STORE_I_OF_CLASS, "byte\\\\[int:>=0] \\\\(java/lang/Cloneable,java/io/Serializable\\\\)", "1",
-                  IRNode.STORE_L_OF_CLASS, "byte\\\\[int:>=0] \\\\(java/lang/Cloneable,java/io/Serializable\\\\)", "0"},
+    @IR(counts = {IRNode.STORE_B_OF_CLASS, "byte\\\\[int:>=0] \\\\(java/lang/Cloneable,java/io/Serializable\\\\)", "4",  // Unmerged stores: offset + (2,3,16) , and 1 for uncommon trap
+                  IRNode.STORE_C_OF_CLASS, "byte\\\\[int:>=0] \\\\(java/lang/Cloneable,java/io/Serializable\\\\)", "3",  // 1([+0,+1]) for platform order and 2([+4,+5], [+14,+15]) for reverse order
+                  IRNode.STORE_I_OF_CLASS, "byte\\\\[int:>=0] \\\\(java/lang/Cloneable,java/io/Serializable\\\\)", "2",  // 1([+6,+9]) for platform order and 1([+10,+13]) for reverse order
+                  IRNode.STORE_L_OF_CLASS, "byte\\\\[int:>=0] \\\\(java/lang/Cloneable,java/io/Serializable\\\\)", "0",
+                  IRNode.REVERSE_BYTES_I, "1",
+                  IRNode.REVERSE_BYTES_S, "2"},
         applyIf = {"UseUnalignedAccesses", "true"},
-        applyIfPlatform = {"little-endian", "true"})
+        applyIfPlatformAnd = {"little-endian", "true", "riscv64", "false"})   // Exclude riscv64 where ReverseBytes is only conditionally supported
     @IR(counts = {IRNode.STORE_B_OF_CLASS, "byte\\\\[int:>=0] \\\\(java/lang/Cloneable,java/io/Serializable\\\\)", "4", // 3 (+ 1 for uncommon trap)
                   IRNode.STORE_C_OF_CLASS, "byte\\\\[int:>=0] \\\\(java/lang/Cloneable,java/io/Serializable\\\\)", "3",
                   IRNode.STORE_I_OF_CLASS, "byte\\\\[int:>=0] \\\\(java/lang/Cloneable,java/io/Serializable\\\\)", "2",
@@ -1783,10 +1802,12 @@ public class TestMergeStores {
                   IRNode.STORE_L_OF_CLASS, "byte\\\\[int:>=0] \\\\(java/lang/Cloneable,java/io/Serializable\\\\)", "1"}, // expect merged
         applyIf = {"UseUnalignedAccesses", "true"},
         applyIfPlatform = {"little-endian", "true"})
-    @IR(counts = {IRNode.STORE_B_OF_CLASS, "byte\\\\[int:>=0] \\\\(java/lang/Cloneable,java/io/Serializable\\\\)", "8",
+    @IR(counts = {IRNode.STORE_B_OF_CLASS, "byte\\\\[int:>=0] \\\\(java/lang/Cloneable,java/io/Serializable\\\\)", "1", // for RangeCheck trap
                   IRNode.STORE_C_OF_CLASS, "byte\\\\[int:>=0] \\\\(java/lang/Cloneable,java/io/Serializable\\\\)", "0",
                   IRNode.STORE_I_OF_CLASS, "byte\\\\[int:>=0] \\\\(java/lang/Cloneable,java/io/Serializable\\\\)", "0",
-                  IRNode.STORE_L_OF_CLASS, "byte\\\\[int:>=0] \\\\(java/lang/Cloneable,java/io/Serializable\\\\)", "0"},
+                  IRNode.STORE_L_OF_CLASS, "byte\\\\[int:>=0] \\\\(java/lang/Cloneable,java/io/Serializable\\\\)", "1", // expect merged
+                  IRNode.REVERSE_BYTES_L, "1"},
+        applyIf = {"UseUnalignedAccesses", "true"},
         applyIfPlatform = {"big-endian", "true"})
     static Object[] test500a(byte[] a, int offset, long v) {
         int idx = 0;
@@ -1897,11 +1918,13 @@ public class TestMergeStores {
     }
 
     @Test
-    @IR(counts = {IRNode.STORE_B_OF_CLASS, "byte\\\\[int:>=0] \\\\(java/lang/Cloneable,java/io/Serializable\\\\)", "8",
+    @IR(counts = {IRNode.STORE_B_OF_CLASS, "byte\\\\[int:>=0] \\\\(java/lang/Cloneable,java/io/Serializable\\\\)", "1", // for RangeCheck trap
                   IRNode.STORE_C_OF_CLASS, "byte\\\\[int:>=0] \\\\(java/lang/Cloneable,java/io/Serializable\\\\)", "0",
                   IRNode.STORE_I_OF_CLASS, "byte\\\\[int:>=0] \\\\(java/lang/Cloneable,java/io/Serializable\\\\)", "0",
-                  IRNode.STORE_L_OF_CLASS, "byte\\\\[int:>=0] \\\\(java/lang/Cloneable,java/io/Serializable\\\\)", "0"},
-        applyIfPlatform = {"little-endian", "true"})
+                  IRNode.STORE_L_OF_CLASS, "byte\\\\[int:>=0] \\\\(java/lang/Cloneable,java/io/Serializable\\\\)", "1", // expect merged
+                  IRNode.REVERSE_BYTES_L, "1"},
+        applyIf = {"UseUnalignedAccesses", "true"},
+        applyIfPlatformAnd = {"little-endian", "true", "riscv64", "false"})   // Exclude riscv64 where ReverseBytes is only conditionally supported
     @IR(counts = {IRNode.STORE_B_OF_CLASS, "byte\\\\[int:>=0] \\\\(java/lang/Cloneable,java/io/Serializable\\\\)", "1", // for RangeCheck trap
                   IRNode.STORE_C_OF_CLASS, "byte\\\\[int:>=0] \\\\(java/lang/Cloneable,java/io/Serializable\\\\)", "0",
                   IRNode.STORE_I_OF_CLASS, "byte\\\\[int:>=0] \\\\(java/lang/Cloneable,java/io/Serializable\\\\)", "0",
@@ -1932,11 +1955,13 @@ public class TestMergeStores {
     }
 
     @Test
-    @IR(counts = {IRNode.STORE_B_OF_CLASS, "byte\\\\[int:>=0] \\\\(java/lang/Cloneable,java/io/Serializable\\\\)", "8",
-                  IRNode.STORE_C_OF_CLASS, "byte\\\\[int:>=0] \\\\(java/lang/Cloneable,java/io/Serializable\\\\)", "0",
+    @IR(counts = {IRNode.STORE_B_OF_CLASS, "byte\\\\[int:>=0] \\\\(java/lang/Cloneable,java/io/Serializable\\\\)", "7",
+                  IRNode.STORE_C_OF_CLASS, "byte\\\\[int:>=0] \\\\(java/lang/Cloneable,java/io/Serializable\\\\)", "1",
                   IRNode.STORE_I_OF_CLASS, "byte\\\\[int:>=0] \\\\(java/lang/Cloneable,java/io/Serializable\\\\)", "0",
-                  IRNode.STORE_L_OF_CLASS, "byte\\\\[int:>=0] \\\\(java/lang/Cloneable,java/io/Serializable\\\\)", "0"},
-        applyIfPlatform = {"little-endian", "true"})
+                  IRNode.STORE_L_OF_CLASS, "byte\\\\[int:>=0] \\\\(java/lang/Cloneable,java/io/Serializable\\\\)", "0",
+                  IRNode.REVERSE_BYTES_S, "1"},
+        applyIf = {"UseUnalignedAccesses", "true"},
+        applyIfPlatformAnd = {"little-endian", "true", "riscv64", "false"})   // Exclude riscv64 where ReverseBytes is only conditionally supported
     @IR(counts = {IRNode.STORE_B_OF_CLASS, "byte\\\\[int:>=0] \\\\(java/lang/Cloneable,java/io/Serializable\\\\)", "7",
                   IRNode.STORE_C_OF_CLASS, "byte\\\\[int:>=0] \\\\(java/lang/Cloneable,java/io/Serializable\\\\)", "1",
                   IRNode.STORE_I_OF_CLASS, "byte\\\\[int:>=0] \\\\(java/lang/Cloneable,java/io/Serializable\\\\)", "0",
@@ -1967,11 +1992,13 @@ public class TestMergeStores {
     }
 
     @Test
-    @IR(counts = {IRNode.STORE_B_OF_CLASS, "byte\\\\[int:>=0] \\\\(java/lang/Cloneable,java/io/Serializable\\\\)", "8",
-                  IRNode.STORE_C_OF_CLASS, "byte\\\\[int:>=0] \\\\(java/lang/Cloneable,java/io/Serializable\\\\)", "0",
+    @IR(counts = {IRNode.STORE_B_OF_CLASS, "byte\\\\[int:>=0] \\\\(java/lang/Cloneable,java/io/Serializable\\\\)", "7",
+                  IRNode.STORE_C_OF_CLASS, "byte\\\\[int:>=0] \\\\(java/lang/Cloneable,java/io/Serializable\\\\)", "1",
                   IRNode.STORE_I_OF_CLASS, "byte\\\\[int:>=0] \\\\(java/lang/Cloneable,java/io/Serializable\\\\)", "0",
-                  IRNode.STORE_L_OF_CLASS, "byte\\\\[int:>=0] \\\\(java/lang/Cloneable,java/io/Serializable\\\\)", "0"},
-        applyIfPlatform = {"little-endian", "true"})
+                  IRNode.STORE_L_OF_CLASS, "byte\\\\[int:>=0] \\\\(java/lang/Cloneable,java/io/Serializable\\\\)", "0",
+                  IRNode.REVERSE_BYTES_S, "1"},
+        applyIf = {"UseUnalignedAccesses", "true"},
+        applyIfPlatformAnd = {"little-endian", "true", "riscv64", "false"})   // Exclude riscv64 where ReverseBytes is only conditionally supported
     @IR(counts = {IRNode.STORE_B_OF_CLASS, "byte\\\\[int:>=0] \\\\(java/lang/Cloneable,java/io/Serializable\\\\)", "7",
                   IRNode.STORE_C_OF_CLASS, "byte\\\\[int:>=0] \\\\(java/lang/Cloneable,java/io/Serializable\\\\)", "1",
                   IRNode.STORE_I_OF_CLASS, "byte\\\\[int:>=0] \\\\(java/lang/Cloneable,java/io/Serializable\\\\)", "0",
@@ -2168,11 +2195,13 @@ public class TestMergeStores {
     }
 
     @Test
-    @IR(counts = {IRNode.STORE_B_OF_CLASS, "byte\\\\[int:>=0] \\\\(java/lang/Cloneable,java/io/Serializable\\\\)", "6",
+    @IR(counts = {IRNode.STORE_B_OF_CLASS, "byte\\\\[int:>=0] \\\\(java/lang/Cloneable,java/io/Serializable\\\\)", "2",
                   IRNode.STORE_C_OF_CLASS, "byte\\\\[int:>=0] \\\\(java/lang/Cloneable,java/io/Serializable\\\\)", "0",
-                  IRNode.STORE_I_OF_CLASS, "byte\\\\[int:>=0] \\\\(java/lang/Cloneable,java/io/Serializable\\\\)", "0",
-                  IRNode.STORE_L_OF_CLASS, "byte\\\\[int:>=0] \\\\(java/lang/Cloneable,java/io/Serializable\\\\)", "0"},
-        applyIfPlatform = {"little-endian", "true"})
+                  IRNode.STORE_I_OF_CLASS, "byte\\\\[int:>=0] \\\\(java/lang/Cloneable,java/io/Serializable\\\\)", "1",
+                  IRNode.STORE_L_OF_CLASS, "byte\\\\[int:>=0] \\\\(java/lang/Cloneable,java/io/Serializable\\\\)", "0",
+                  IRNode.REVERSE_BYTES_I, "1"},
+        applyIf = {"UseUnalignedAccesses", "true"},
+        applyIfPlatformAnd = {"little-endian", "true", "riscv64", "false"})   // Exclude riscv64 where ReverseBytes is only conditionally supported
     @IR(counts = {IRNode.STORE_B_OF_CLASS, "byte\\\\[int:>=0] \\\\(java/lang/Cloneable,java/io/Serializable\\\\)", "2",
                   IRNode.STORE_C_OF_CLASS, "byte\\\\[int:>=0] \\\\(java/lang/Cloneable,java/io/Serializable\\\\)", "0",
                   IRNode.STORE_I_OF_CLASS, "byte\\\\[int:>=0] \\\\(java/lang/Cloneable,java/io/Serializable\\\\)", "1",
diff --git a/test/hotspot/jtreg/compiler/lib/ir_framework/IRNode.java b/test/hotspot/jtreg/compiler/lib/ir_framework/IRNode.java
index 20a0af1f111..0a5f6c63c76 100644
--- a/test/hotspot/jtreg/compiler/lib/ir_framework/IRNode.java
+++ b/test/hotspot/jtreg/compiler/lib/ir_framework/IRNode.java
@@ -1520,6 +1520,26 @@ public class IRNode {
         vectorNode(REPLICATE_D, "Replicate", TYPE_DOUBLE);
     }
 
+    public static final String REVERSE_BYTES_I = PREFIX + "REVERSE_BYTES_I" + POSTFIX;
+    static {
+        beforeMatchingNameRegex(REVERSE_BYTES_I, "ReverseBytesI");
+    }
+
+    public static final String REVERSE_BYTES_L = PREFIX + "REVERSE_BYTES_L" + POSTFIX;
+    static {
+        beforeMatchingNameRegex(REVERSE_BYTES_L, "ReverseBytesL");
+    }
+
+    public static final String REVERSE_BYTES_S = PREFIX + "REVERSE_BYTES_S" + POSTFIX;
+    static {
+        beforeMatchingNameRegex(REVERSE_BYTES_S, "ReverseBytesS");
+    }
+
+    public static final String REVERSE_BYTES_US = PREFIX + "REVERSE_BYTES_US" + POSTFIX;
+    static {
+        beforeMatchingNameRegex(REVERSE_BYTES_US, "ReverseBytesUS");
+    }
+
     public static final String REVERSE_BYTES_VB = VECTOR_PREFIX + "REVERSE_BYTES_VB" + POSTFIX;
     static {
         vectorNode(REVERSE_BYTES_VB, "ReverseBytesV", TYPE_BYTE);

From 8a5ed47f00d74d4eb0d2b8027fb92ff2f5c30163 Mon Sep 17 00:00:00 2001
From: Ioi Lam <iklam@openjdk.org>
Date: Tue, 11 Mar 2025 06:49:58 +0000
Subject: [PATCH 293/587] 8350148: Native stack overflow when writing Java heap
 objects into AOT cache

Reviewed-by: iveresov, matsaave
---
 src/hotspot/share/cds/heapShared.cpp | 94 ++++++++++++++++++----------
 src/hotspot/share/cds/heapShared.hpp | 28 ++++++++-
 2 files changed, 87 insertions(+), 35 deletions(-)

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

From 4cf63160ad575d49dbe70f128cd36aba22b8f2ff Mon Sep 17 00:00:00 2001
From: Emanuel Peter <epeter@openjdk.org>
Date: Tue, 11 Mar 2025 07:10:31 +0000
Subject: [PATCH 294/587] 8351414: C2: MergeStores must happen after RangeCheck
 smearing

Reviewed-by: chagedorn, qamai
---
 src/hotspot/share/opto/compile.cpp            | 53 +++++++++++++++++++
 src/hotspot/share/opto/compile.hpp            |  8 +++
 src/hotspot/share/opto/memnode.cpp            | 15 +++++-
 src/hotspot/share/opto/node.cpp               |  8 +++
 src/hotspot/share/opto/node.hpp               |  6 ++-
 src/hotspot/share/opto/phasetype.hpp          |  1 +
 .../jtreg/compiler/c2/TestMergeStores.java    | 22 ++++++++
 .../lib/ir_framework/CompilePhase.java        |  1 +
 8 files changed, 110 insertions(+), 4 deletions(-)

diff --git a/src/hotspot/share/opto/compile.cpp b/src/hotspot/share/opto/compile.cpp
index 014463ccc21..026aa1ba4fb 100644
--- a/src/hotspot/share/opto/compile.cpp
+++ b/src/hotspot/share/opto/compile.cpp
@@ -402,6 +402,9 @@ void Compile::remove_useless_node(Node* dead) {
   if (dead->for_post_loop_opts_igvn()) {
     remove_from_post_loop_opts_igvn(dead);
   }
+  if (dead->for_merge_stores_igvn()) {
+    remove_from_merge_stores_igvn(dead);
+  }
   if (dead->is_Call()) {
     remove_useless_late_inlines(                &_late_inlines, dead);
     remove_useless_late_inlines(         &_string_late_inlines, dead);
@@ -453,6 +456,7 @@ void Compile::disconnect_useless_nodes(Unique_Node_List& useful, Unique_Node_Lis
   remove_useless_nodes(_template_assertion_predicate_opaqs, useful); // remove useless Assertion Predicate opaque nodes
   remove_useless_nodes(_expensive_nodes,    useful); // remove useless expensive nodes
   remove_useless_nodes(_for_post_loop_igvn, useful); // remove useless node recorded for post loop opts IGVN pass
+  remove_useless_nodes(_for_merge_stores_igvn, useful); // remove useless node recorded for merge stores IGVN pass
   remove_useless_unstable_if_traps(useful);          // remove useless unstable_if traps
   remove_useless_coarsened_locks(useful);            // remove useless coarsened locks nodes
 #ifdef ASSERT
@@ -627,6 +631,7 @@ Compile::Compile(ciEnv* ci_env, ciMethod* target, int osr_bci,
       _stub_entry_point(nullptr),
       _max_node_limit(MaxNodeLimit),
       _post_loop_opts_phase(false),
+      _merge_stores_phase(false),
       _allow_macro_nodes(true),
       _inlining_progress(false),
       _inlining_incrementally(false),
@@ -651,6 +656,7 @@ Compile::Compile(ciEnv* ci_env, ciMethod* target, int osr_bci,
       _template_assertion_predicate_opaqs(comp_arena(), 8, 0, nullptr),
       _expensive_nodes(comp_arena(), 8, 0, nullptr),
       _for_post_loop_igvn(comp_arena(), 8, 0, nullptr),
+      _for_merge_stores_igvn(comp_arena(), 8, 0, nullptr),
       _unstable_if_traps(comp_arena(), 8, 0, nullptr),
       _coarsened_locks(comp_arena(), 8, 0, nullptr),
       _congraph(nullptr),
@@ -905,6 +911,7 @@ Compile::Compile(ciEnv* ci_env,
       _stub_entry_point(nullptr),
       _max_node_limit(MaxNodeLimit),
       _post_loop_opts_phase(false),
+      _merge_stores_phase(false),
       _allow_macro_nodes(true),
       _inlining_progress(false),
       _inlining_incrementally(false),
@@ -923,6 +930,7 @@ Compile::Compile(ciEnv* ci_env,
       _log(ci_env->log()),
       _first_failure_details(nullptr),
       _for_post_loop_igvn(comp_arena(), 8, 0, nullptr),
+      _for_merge_stores_igvn(comp_arena(), 8, 0, nullptr),
       _congraph(nullptr),
       NOT_PRODUCT(_igv_printer(nullptr) COMMA)
           _unique(0),
@@ -1870,6 +1878,49 @@ void Compile::process_for_post_loop_opts_igvn(PhaseIterGVN& igvn) {
   }
 }
 
+void Compile::record_for_merge_stores_igvn(Node* n) {
+  if (!n->for_merge_stores_igvn()) {
+    assert(!_for_merge_stores_igvn.contains(n), "duplicate");
+    n->add_flag(Node::NodeFlags::Flag_for_merge_stores_igvn);
+    _for_merge_stores_igvn.append(n);
+  }
+}
+
+void Compile::remove_from_merge_stores_igvn(Node* n) {
+  n->remove_flag(Node::NodeFlags::Flag_for_merge_stores_igvn);
+  _for_merge_stores_igvn.remove(n);
+}
+
+// We need to wait with merging stores until RangeCheck smearing has removed the RangeChecks during
+// the post loops IGVN phase. If we do it earlier, then there may still be some RangeChecks between
+// the stores, and we merge the wrong sequence of stores.
+// Example:
+//   StoreI RangeCheck StoreI StoreI RangeCheck StoreI
+// Apply MergeStores:
+//   StoreI RangeCheck [   StoreL  ] RangeCheck StoreI
+// Remove more RangeChecks:
+//   StoreI            [   StoreL  ]            StoreI
+// But now it would have been better to do this instead:
+//   [         StoreL       ] [       StoreL         ]
+//
+// Note: we allow stores to merge in this dedicated IGVN round, and any later IGVN round,
+//       since we never unset _merge_stores_phase.
+void Compile::process_for_merge_stores_igvn(PhaseIterGVN& igvn) {
+  C->set_merge_stores_phase();
+
+  if (_for_merge_stores_igvn.length() > 0) {
+    while (_for_merge_stores_igvn.length() > 0) {
+      Node* n = _for_merge_stores_igvn.pop();
+      n->remove_flag(Node::NodeFlags::Flag_for_merge_stores_igvn);
+      igvn._worklist.push(n);
+    }
+    igvn.optimize();
+    if (failing()) return;
+    assert(_for_merge_stores_igvn.length() == 0, "no more delayed nodes allowed");
+    print_method(PHASE_AFTER_MERGE_STORES, 3);
+  }
+}
+
 void Compile::record_unstable_if_trap(UnstableIfTrap* trap) {
   if (OptimizeUnstableIf) {
     _unstable_if_traps.append(trap);
@@ -2429,6 +2480,8 @@ void Compile::Optimize() {
 
   process_for_post_loop_opts_igvn(igvn);
 
+  process_for_merge_stores_igvn(igvn);
+
   if (failing())  return;
 
 #ifdef ASSERT
diff --git a/src/hotspot/share/opto/compile.hpp b/src/hotspot/share/opto/compile.hpp
index 1fe6180c54f..7be23e01440 100644
--- a/src/hotspot/share/opto/compile.hpp
+++ b/src/hotspot/share/opto/compile.hpp
@@ -318,6 +318,7 @@ class Compile : public Phase {
   uintx                 _max_node_limit;        // Max unique node count during a single compilation.
 
   bool                  _post_loop_opts_phase;  // Loop opts are finished.
+  bool                  _merge_stores_phase;    // Phase for merging stores, after post loop opts phase.
   bool                  _allow_macro_nodes;     // True if we allow creation of macro nodes.
 
   int                   _major_progress;        // Count of something big happening
@@ -374,6 +375,7 @@ class Compile : public Phase {
   GrowableArray<Node*>  _template_assertion_predicate_opaqs;
   GrowableArray<Node*>  _expensive_nodes;       // List of nodes that are expensive to compute and that we'd better not let the GVN freely common
   GrowableArray<Node*>  _for_post_loop_igvn;    // List of nodes for IGVN after loop opts are over
+  GrowableArray<Node*>  _for_merge_stores_igvn; // List of nodes for IGVN merge stores
   GrowableArray<UnstableIfTrap*> _unstable_if_traps;        // List of ifnodes after IGVN
   GrowableArray<Node_List*> _coarsened_locks;   // List of coarsened Lock and Unlock nodes
   ConnectionGraph*      _congraph;
@@ -766,6 +768,12 @@ public:
   void remove_useless_unstable_if_traps(Unique_Node_List &useful);
   void process_for_unstable_if_traps(PhaseIterGVN& igvn);
 
+  bool     merge_stores_phase() { return _merge_stores_phase;  }
+  void set_merge_stores_phase() { _merge_stores_phase = true;  }
+  void record_for_merge_stores_igvn(Node* n);
+  void remove_from_merge_stores_igvn(Node* n);
+  void process_for_merge_stores_igvn(PhaseIterGVN& igvn);
+
   void shuffle_macro_nodes();
   void sort_macro_nodes();
 
diff --git a/src/hotspot/share/opto/memnode.cpp b/src/hotspot/share/opto/memnode.cpp
index 55a65042584..7a285ee0722 100644
--- a/src/hotspot/share/opto/memnode.cpp
+++ b/src/hotspot/share/opto/memnode.cpp
@@ -3450,12 +3450,23 @@ Node *StoreNode::Ideal(PhaseGVN *phase, bool can_reshape) {
   }
 
   if (MergeStores && UseUnalignedAccesses) {
-    if (phase->C->post_loop_opts_phase()) {
+    if (phase->C->merge_stores_phase()) {
       MergePrimitiveStores merge(phase, this);
       Node* progress = merge.run();
       if (progress != nullptr) { return progress; }
     } else {
-      phase->C->record_for_post_loop_opts_igvn(this);
+      // We need to wait with merging stores until RangeCheck smearing has removed the RangeChecks during
+      // the post loops IGVN phase. If we do it earlier, then there may still be some RangeChecks between
+      // the stores, and we merge the wrong sequence of stores.
+      // Example:
+      //   StoreI RangeCheck StoreI StoreI RangeCheck StoreI
+      // Apply MergeStores:
+      //   StoreI RangeCheck [   StoreL  ] RangeCheck StoreI
+      // Remove more RangeChecks:
+      //   StoreI            [   StoreL  ]            StoreI
+      // But now it would have been better to do this instead:
+      //   [         StoreL       ] [       StoreL         ]
+      phase->C->record_for_merge_stores_igvn(this);
     }
   }
 
diff --git a/src/hotspot/share/opto/node.cpp b/src/hotspot/share/opto/node.cpp
index d1b3d96b76b..fa836eac459 100644
--- a/src/hotspot/share/opto/node.cpp
+++ b/src/hotspot/share/opto/node.cpp
@@ -508,6 +508,11 @@ Node *Node::clone() const {
     // If it is applicable, it will happen anyway when the cloned node is registered with IGVN.
     n->remove_flag(Node::NodeFlags::Flag_for_post_loop_opts_igvn);
   }
+  if (for_merge_stores_igvn()) {
+    // Don't add cloned node to Compile::_for_merge_stores_igvn list automatically.
+    // If it is applicable, it will happen anyway when the cloned node is registered with IGVN.
+    n->remove_flag(Node::NodeFlags::Flag_for_merge_stores_igvn);
+  }
   if (n->is_ParsePredicate()) {
     C->add_parse_predicate(n->as_ParsePredicate());
   }
@@ -615,6 +620,9 @@ void Node::destruct(PhaseValues* phase) {
   if (for_post_loop_opts_igvn()) {
     compile->remove_from_post_loop_opts_igvn(this);
   }
+  if (for_merge_stores_igvn()) {
+    compile->remove_from_merge_stores_igvn(this);
+  }
 
   if (is_SafePoint()) {
     as_SafePoint()->delete_replaced_nodes();
diff --git a/src/hotspot/share/opto/node.hpp b/src/hotspot/share/opto/node.hpp
index f6cb9f692bb..f128a2eca1d 100644
--- a/src/hotspot/share/opto/node.hpp
+++ b/src/hotspot/share/opto/node.hpp
@@ -830,8 +830,9 @@ public:
     Flag_is_expensive                = 1 << 13,
     Flag_is_predicated_vector        = 1 << 14,
     Flag_for_post_loop_opts_igvn     = 1 << 15,
-    Flag_is_removed_by_peephole      = 1 << 16,
-    Flag_is_predicated_using_blend   = 1 << 17,
+    Flag_for_merge_stores_igvn       = 1 << 16,
+    Flag_is_removed_by_peephole      = 1 << 17,
+    Flag_is_predicated_using_blend   = 1 << 18,
     _last_flag                       = Flag_is_predicated_using_blend
   };
 
@@ -1075,6 +1076,7 @@ public:
   bool is_scheduled() const { return (_flags & Flag_is_scheduled) != 0; }
 
   bool for_post_loop_opts_igvn() const { return (_flags & Flag_for_post_loop_opts_igvn) != 0; }
+  bool for_merge_stores_igvn() const { return (_flags & Flag_for_merge_stores_igvn) != 0; }
 
   // Is 'n' possibly a loop entry (i.e. a Parse Predicate projection)?
   static bool may_be_loop_entry(Node* n) {
diff --git a/src/hotspot/share/opto/phasetype.hpp b/src/hotspot/share/opto/phasetype.hpp
index 8015255c03b..318a01e3bd8 100644
--- a/src/hotspot/share/opto/phasetype.hpp
+++ b/src/hotspot/share/opto/phasetype.hpp
@@ -88,6 +88,7 @@
   flags(CCP1,                           "PhaseCCP 1") \
   flags(ITER_GVN2,                      "Iter GVN 2") \
   flags(PHASEIDEALLOOP_ITERATIONS,      "PhaseIdealLoop iterations") \
+  flags(AFTER_MERGE_STORES,             "After Merge Stores") \
   flags(BEFORE_MACRO_EXPANSION ,        "Before Macro Expansion") \
   flags(AFTER_MACRO_EXPANSION_STEP,     "After Macro Expansion Step") \
   flags(AFTER_MACRO_EXPANSION,          "After Macro Expansion") \
diff --git a/test/hotspot/jtreg/compiler/c2/TestMergeStores.java b/test/hotspot/jtreg/compiler/c2/TestMergeStores.java
index 99e714d8c5f..2e2b2b6661f 100644
--- a/test/hotspot/jtreg/compiler/c2/TestMergeStores.java
+++ b/test/hotspot/jtreg/compiler/c2/TestMergeStores.java
@@ -49,6 +49,15 @@ import java.util.Random;
  * @run main compiler.c2.TestMergeStores unaligned
  */
 
+/*
+ * @test
+ * @bug 8318446 8331054 8331311 8335392 8348959 8351414
+ * @summary Test merging of consecutive stores
+ * @modules java.base/jdk.internal.misc
+ * @library /test/lib /
+ * @run main compiler.c2.TestMergeStores StressIGVN
+ */
+
 public class TestMergeStores {
     static int RANGE = 1000;
     private static final Unsafe UNSAFE = Unsafe.getUnsafe();
@@ -99,6 +108,19 @@ public class TestMergeStores {
         switch (args[0]) {
             case "aligned"     -> { framework.addFlags("-XX:-UseUnalignedAccesses"); }
             case "unaligned"   -> { framework.addFlags("-XX:+UseUnalignedAccesses"); }
+            // StressIGVN can mix up the order of RangeCheck smearing and MergeStores optimization,
+            // if they run in the same IGVN round. When we did not yet have a dedicated IGVN round
+            // after post loop opts for MergeStrores, it could happen that we would only remove
+            // RangeChecks after already merging some stores, and now they would have to be split
+            // up again and re-merged with different stores. Example:
+            //   StoreI RangeCheck StoreI StoreI RangeCheck StoreI
+            // Apply MergeStores:
+            //   StoreI RangeCheck [   StoreL  ] RangeCheck StoreI
+            // Remove more RangeChecks:
+            //   StoreI            [   StoreL  ]            StoreI
+            // But now it would have been better to do this instead:
+            //   [         StoreL       ] [       StoreL         ]
+            case "StressIGVN"  -> { framework.addFlags("-XX:+StressIGVN"); }
             default -> { throw new RuntimeException("Test argument not recognized: " + args[0]); }
         }
         framework.start();
diff --git a/test/hotspot/jtreg/compiler/lib/ir_framework/CompilePhase.java b/test/hotspot/jtreg/compiler/lib/ir_framework/CompilePhase.java
index 316eb5f3ce6..6f4410a0220 100644
--- a/test/hotspot/jtreg/compiler/lib/ir_framework/CompilePhase.java
+++ b/test/hotspot/jtreg/compiler/lib/ir_framework/CompilePhase.java
@@ -95,6 +95,7 @@ public enum CompilePhase {
     CCP1("PhaseCCP 1"),
     ITER_GVN2("Iter GVN 2"),
     PHASEIDEALLOOP_ITERATIONS("PhaseIdealLoop iterations"),
+    AFTER_MERGE_STORES("After Merge Stores"),
     BEFORE_MACRO_EXPANSION("Before Macro Expansion"),
     AFTER_MACRO_EXPANSION_STEP("After Macro Expansion Step"),
     AFTER_MACRO_EXPANSION("After Macro Expansion"),

From cd9f1d3d921531511a7552807d099d5d3cce01a6 Mon Sep 17 00:00:00 2001
From: Abhishek Kumar <abhiscxk@openjdk.org>
Date: Tue, 11 Mar 2025 09:05:04 +0000
Subject: [PATCH 295/587] 8286204: [Accessibility,macOS,VoiceOver] VoiceOver
 reads the spinner value 10 as 1 when user iterates to 10 for the first time
 on macOS

Reviewed-by: honkar, kizune, asemenov
---
 .../classes/sun/lwawt/macosx/CAccessible.java |  7 +-
 .../TestJSpinnerAccessibility.java            | 75 +++++++++++++++++++
 2 files changed, 81 insertions(+), 1 deletion(-)
 create mode 100644 test/jdk/javax/accessibility/TestJSpinnerAccessibility.java

diff --git a/src/java.desktop/macosx/classes/sun/lwawt/macosx/CAccessible.java b/src/java.desktop/macosx/classes/sun/lwawt/macosx/CAccessible.java
index 8f67a06a13d..babe899296f 100644
--- a/src/java.desktop/macosx/classes/sun/lwawt/macosx/CAccessible.java
+++ b/src/java.desktop/macosx/classes/sun/lwawt/macosx/CAccessible.java
@@ -32,6 +32,7 @@ import java.util.Objects;
 
 import javax.accessibility.Accessible;
 import javax.accessibility.AccessibleContext;
+import javax.swing.JSpinner;
 import javax.swing.JTabbedPane;
 
 import static javax.accessibility.AccessibleContext.ACCESSIBLE_ACTIVE_DESCENDANT_PROPERTY;
@@ -121,7 +122,11 @@ class CAccessible extends CFRetainedResource implements Accessible {
                 if (name.equals(ACCESSIBLE_CARET_PROPERTY)) {
                     selectedTextChanged(ptr);
                 } else if (name.equals(ACCESSIBLE_TEXT_PROPERTY)) {
-                    valueChanged(ptr);
+                    AccessibleContext thisAC = accessible.getAccessibleContext();
+                    Accessible parentAccessible = thisAC.getAccessibleParent();
+                    if (!(parentAccessible instanceof JSpinner.NumberEditor)) {
+                        valueChanged(ptr);
+                    }
                 } else if (name.equals(ACCESSIBLE_SELECTION_PROPERTY)) {
                     selectionChanged(ptr);
                 } else if (name.equals(ACCESSIBLE_TABLE_MODEL_CHANGED)) {
diff --git a/test/jdk/javax/accessibility/TestJSpinnerAccessibility.java b/test/jdk/javax/accessibility/TestJSpinnerAccessibility.java
new file mode 100644
index 00000000000..4926e5b17fa
--- /dev/null
+++ b/test/jdk/javax/accessibility/TestJSpinnerAccessibility.java
@@ -0,0 +1,75 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.awt.BorderLayout;
+
+import javax.swing.JFrame;
+import javax.swing.JSpinner;
+import javax.swing.SpinnerModel;
+import javax.swing.SpinnerNumberModel;
+
+/*
+ * @test
+ * @bug 8286204
+ * @summary Verifies that VoiceOver announces the JSpinner's value correctly
+ * @requires os.family == "mac"
+ * @library /java/awt/regtesthelpers
+ * @build PassFailJFrame
+ * @run main/manual TestJSpinnerAccessibility
+ */
+
+public class TestJSpinnerAccessibility {
+    public static void main(String[] args) throws Exception {
+        String INSTRUCTIONS = """
+                Test UI contains a JSpinner with minimum value 0, maximum value 20
+                and current value 5. On press of up / down arrow, value will be
+                incremented / decremented by 1.
+
+                Follow these steps to test the behaviour:
+
+                1. Start the VoiceOver (Press Command + F5) application
+                2. Move focus on test window if it is not focused
+                3. Press Up / Down arrow to increase / decrease Spinner value
+                4. VO should announce correct values in terms of percentage
+                   (e.g. For JSpinner's value 10, VO should announce 50%)
+                5. Press Pass if you are able to hear correct announcements
+                   else Fail""";
+
+        PassFailJFrame.builder()
+                .title("TestJSpinnerAccessibility Instruction")
+                .instructions(INSTRUCTIONS)
+                .columns(40)
+                .testUI(TestJSpinnerAccessibility::createUI)
+                .build()
+                .awaitAndCheck();
+    }
+
+    private static JFrame createUI() {
+        JFrame frame = new JFrame("A Frame with JSpinner");
+        SpinnerModel spinnerModel = new SpinnerNumberModel(5, 0, 20, 1);
+        JSpinner spinner = new JSpinner(spinnerModel);
+        frame.getContentPane().add(spinner, BorderLayout.CENTER);
+        frame.setSize(200, 100);
+        return frame;
+    }
+}

From 0de2cddf3a7be23f67af93972875af1235f3107e Mon Sep 17 00:00:00 2001
From: Alan Bateman <alanb@openjdk.org>
Date: Tue, 11 Mar 2025 11:26:47 +0000
Subject: [PATCH 296/587] 8351458: (ch) Move preClose to UnixDispatcher

Reviewed-by: bpb, jpai
---
 .../sun/nio/ch/DatagramChannelImpl.java       | 19 ++---------
 .../classes/sun/nio/ch/NativeDispatcher.java  | 32 +++++++++++++++----
 .../classes/sun/nio/ch/NioSocketImpl.java     | 17 ++--------
 .../sun/nio/ch/ServerSocketChannelImpl.java   | 12 ++-----
 .../classes/sun/nio/ch/SocketChannelImpl.java | 18 ++---------
 .../sun/nio/ch/DatagramDispatcher.java        | 25 +++++++--------
 .../classes/sun/nio/ch/SinkChannelImpl.java   | 14 ++------
 .../classes/sun/nio/ch/SocketDispatcher.java  | 18 ++++-------
 .../classes/sun/nio/ch/SourceChannelImpl.java | 14 ++------
 .../classes/sun/nio/ch/UnixDispatcher.java    | 14 +++++---
 .../sun/nio/ch/DatagramDispatcher.java        |  7 +++-
 .../classes/sun/nio/ch/SocketDispatcher.java  | 11 ++++---
 12 files changed, 81 insertions(+), 120 deletions(-)

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 ae8fd00a318..afb312ed722 100644
--- a/src/java.base/share/classes/sun/nio/ch/DatagramChannelImpl.java
+++ b/src/java.base/share/classes/sun/nio/ch/DatagramChannelImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -1756,22 +1756,7 @@ class DatagramChannelImpl
                 registry.invalidateAll();
 
             if (!tryClose()) {
-                long reader = readerThread;
-                long writer = writerThread;
-                if (reader != 0 || writer != 0) {
-                    if (NativeThread.isVirtualThread(reader)
-                            || NativeThread.isVirtualThread(writer)) {
-                        Poller.stopPoll(fdVal);
-                    }
-                    if (NativeThread.isNativeThread(reader)
-                            || NativeThread.isNativeThread(writer)) {
-                        nd.preClose(fd);
-                        if (NativeThread.isNativeThread(reader))
-                            NativeThread.signal(reader);
-                        if (NativeThread.isNativeThread(writer))
-                            NativeThread.signal(writer);
-                    }
-                }
+                nd.preClose(fd, readerThread, writerThread);
             }
         }
     }
diff --git a/src/java.base/share/classes/sun/nio/ch/NativeDispatcher.java b/src/java.base/share/classes/sun/nio/ch/NativeDispatcher.java
index 1943a3c0569..9b65310784a 100644
--- a/src/java.base/share/classes/sun/nio/ch/NativeDispatcher.java
+++ b/src/java.base/share/classes/sun/nio/ch/NativeDispatcher.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,8 @@ package sun.nio.ch;
 
 import java.io.FileDescriptor;
 import java.io.IOException;
+import jdk.internal.access.JavaIOFileDescriptorAccess;
+import jdk.internal.access.SharedSecrets;
 
 /**
  * Allows different platforms to call different native methods
@@ -34,6 +36,7 @@ import java.io.IOException;
  */
 
 abstract class NativeDispatcher {
+    private static final JavaIOFileDescriptorAccess JIOFDA = SharedSecrets.getJavaIOFileDescriptorAccess();
 
     abstract int read(FileDescriptor fd, long address, int len)
         throws IOException;
@@ -69,11 +72,28 @@ abstract class NativeDispatcher {
 
     abstract void close(FileDescriptor fd) throws IOException;
 
-    // Prepare the given fd for closing by duping it to a known internal fd
-    // that's already closed.  This is necessary on some operating systems
-    // (Solaris and Linux) to prevent fd recycling.
-    //
-    void preClose(FileDescriptor fd) throws IOException {
+    /**
+     * Prepare the given file descriptor for closing. If a virtual thread is blocked
+     * on the file descriptor then it is unparked so that it stops polling. On Unix systems,
+     * if a platform thread is blocked on the file descriptor then the file descriptor is
+     * dup'ed to a special fd and the thread signalled so that the syscall fails with EINTR.
+     */
+    final void preClose(FileDescriptor fd, long reader, long writer) throws IOException {
+        if (NativeThread.isVirtualThread(reader) || NativeThread.isVirtualThread(writer)) {
+            int fdVal = JIOFDA.get(fd);
+            Poller.stopPoll(fdVal);
+        }
+        if (NativeThread.isNativeThread(reader) || NativeThread.isNativeThread(writer)) {
+            implPreClose(fd, reader, writer);
+        }
+    }
+
+    /**
+     * This method does nothing by default. On Unix systems the file descriptor is dup'ed
+     * to a special fd and native threads signalled.
+     */
+
+    void implPreClose(FileDescriptor fd, long reader, long writer) throws IOException {
         // Do nothing by default; this is only needed on Unix
     }
 
diff --git a/src/java.base/share/classes/sun/nio/ch/NioSocketImpl.java b/src/java.base/share/classes/sun/nio/ch/NioSocketImpl.java
index 7c64d6721e2..96d6e1e1db7 100644
--- a/src/java.base/share/classes/sun/nio/ch/NioSocketImpl.java
+++ b/src/java.base/share/classes/sun/nio/ch/NioSocketImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -894,20 +894,7 @@ public final class NioSocketImpl extends SocketImpl implements PlatformSocketImp
             // then the socket is pre-closed and the thread(s) signalled. The
             // last thread will close the file descriptor.
             if (!tryClose()) {
-                long reader = readerThread;
-                long writer = writerThread;
-                if (NativeThread.isVirtualThread(reader)
-                        || NativeThread.isVirtualThread(writer)) {
-                    Poller.stopPoll(fdVal(fd));
-                }
-                if (NativeThread.isNativeThread(reader)
-                        || NativeThread.isNativeThread(writer)) {
-                    nd.preClose(fd);
-                    if (NativeThread.isNativeThread(reader))
-                        NativeThread.signal(reader);
-                    if (NativeThread.isNativeThread(writer))
-                        NativeThread.signal(writer);
-                }
+                nd.preClose(fd, readerThread, writerThread);
             }
         }
     }
diff --git a/src/java.base/share/classes/sun/nio/ch/ServerSocketChannelImpl.java b/src/java.base/share/classes/sun/nio/ch/ServerSocketChannelImpl.java
index f266b762b8b..62a4b9a7cf8 100644
--- a/src/java.base/share/classes/sun/nio/ch/ServerSocketChannelImpl.java
+++ b/src/java.base/share/classes/sun/nio/ch/ServerSocketChannelImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -585,15 +585,7 @@ class ServerSocketChannelImpl
             assert state < ST_CLOSING;
             state = ST_CLOSING;
             if (!tryClose()) {
-                long th = thread;
-                if (th != 0) {
-                    if (NativeThread.isVirtualThread(th)) {
-                        Poller.stopPoll(fdVal);
-                    } else {
-                        nd.preClose(fd);
-                        NativeThread.signal(th);
-                    }
-                }
+                nd.preClose(fd, thread, 0);
             }
         }
     }
diff --git a/src/java.base/share/classes/sun/nio/ch/SocketChannelImpl.java b/src/java.base/share/classes/sun/nio/ch/SocketChannelImpl.java
index 893bd17ceed..0980592abab 100644
--- a/src/java.base/share/classes/sun/nio/ch/SocketChannelImpl.java
+++ b/src/java.base/share/classes/sun/nio/ch/SocketChannelImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -1123,20 +1123,8 @@ class SocketChannelImpl
                     } catch (IOException ignore) { }
                 }
 
-                long reader = readerThread;
-                long writer = writerThread;
-                if (NativeThread.isVirtualThread(reader)
-                        || NativeThread.isVirtualThread(writer)) {
-                    Poller.stopPoll(fdVal);
-                }
-                if (NativeThread.isNativeThread(reader)
-                        || NativeThread.isNativeThread(writer)) {
-                    nd.preClose(fd);
-                    if (NativeThread.isNativeThread(reader))
-                        NativeThread.signal(reader);
-                    if (NativeThread.isNativeThread(writer))
-                        NativeThread.signal(writer);
-                }
+                // prepare file descriptor for closing
+                nd.preClose(fd, readerThread, writerThread);
             }
         }
     }
diff --git a/src/java.base/unix/classes/sun/nio/ch/DatagramDispatcher.java b/src/java.base/unix/classes/sun/nio/ch/DatagramDispatcher.java
index 10a2098a040..8f1692f0e4d 100644
--- a/src/java.base/unix/classes/sun/nio/ch/DatagramDispatcher.java
+++ b/src/java.base/unix/classes/sun/nio/ch/DatagramDispatcher.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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,46 +39,43 @@ class DatagramDispatcher extends UnixDispatcher {
         IOUtil.load();
     }
 
+    @Override
     int read(FileDescriptor fd, long address, int len) throws IOException {
         return read0(fd, address, len);
     }
 
+    @Override
     long readv(FileDescriptor fd, long address, int len) throws IOException {
         return readv0(fd, address, len);
     }
 
+    @Override
     int write(FileDescriptor fd, long address, int len) throws IOException {
         return write0(fd, address, len);
     }
 
+    @Override
     long writev(FileDescriptor fd, long address, int len) throws IOException {
         return writev0(fd, address, len);
     }
 
-    void close(FileDescriptor fd) throws IOException {
-        close0(fd);
-    }
-
-    void preClose(FileDescriptor fd) throws IOException {
-        preClose0(fd);
-    }
-
+    @Override
     void dup(FileDescriptor fd1, FileDescriptor fd2) throws IOException {
         dup0(fd1, fd2);
     }
 
-    static native int read0(FileDescriptor fd, long address, int len)
+    private static native int read0(FileDescriptor fd, long address, int len)
         throws IOException;
 
-    static native long readv0(FileDescriptor fd, long address, int len)
+    private static native long readv0(FileDescriptor fd, long address, int len)
         throws IOException;
 
-    static native int write0(FileDescriptor fd, long address, int len)
+    private static native int write0(FileDescriptor fd, long address, int len)
         throws IOException;
 
-    static native long writev0(FileDescriptor fd, long address, int len)
+    private static native long writev0(FileDescriptor fd, long address, int len)
         throws IOException;
 
-    static native void dup0(FileDescriptor fd1, FileDescriptor fd2)
+    private static native void dup0(FileDescriptor fd1, FileDescriptor fd2)
         throws IOException;
 }
diff --git a/src/java.base/unix/classes/sun/nio/ch/SinkChannelImpl.java b/src/java.base/unix/classes/sun/nio/ch/SinkChannelImpl.java
index bc15d8d156b..b073c287bfb 100644
--- a/src/java.base/unix/classes/sun/nio/ch/SinkChannelImpl.java
+++ b/src/java.base/unix/classes/sun/nio/ch/SinkChannelImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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 @@ class SinkChannelImpl
     implements SelChImpl
 {
     // Used to make native read and write calls
-    private static final NativeDispatcher nd = new FileDispatcherImpl();
+    private static final NativeDispatcher nd = new SocketDispatcher();
 
     // The file descriptor associated with this channel
     private final FileDescriptor fd;
@@ -152,15 +152,7 @@ class SinkChannelImpl
             assert state < ST_CLOSING;
             state = ST_CLOSING;
             if (!tryClose()) {
-                long th = thread;
-                if (th != 0) {
-                    if (NativeThread.isVirtualThread(th)) {
-                        Poller.stopPoll(fdVal);
-                    } else {
-                        nd.preClose(fd);
-                        NativeThread.signal(th);
-                    }
-                }
+                nd.preClose(fd, thread, 0);
             }
         }
     }
diff --git a/src/java.base/unix/classes/sun/nio/ch/SocketDispatcher.java b/src/java.base/unix/classes/sun/nio/ch/SocketDispatcher.java
index 5b262fb58b7..ebc4b2e8fbe 100644
--- a/src/java.base/unix/classes/sun/nio/ch/SocketDispatcher.java
+++ b/src/java.base/unix/classes/sun/nio/ch/SocketDispatcher.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -43,6 +43,7 @@ class SocketDispatcher extends UnixDispatcher {
      * @throws sun.net.ConnectionResetException if connection reset is detected
      * @throws IOException if another I/O error occurs
      */
+    @Override
     int read(FileDescriptor fd, long address, int len) throws IOException {
         return read0(fd, address, len);
     }
@@ -54,26 +55,21 @@ class SocketDispatcher extends UnixDispatcher {
      * @throws sun.net.ConnectionResetException if connection reset is detected
      * @throws IOException if another I/O error occurs
      */
+    @Override
     long readv(FileDescriptor fd, long address, int len) throws IOException {
         return readv0(fd, address, len);
     }
 
+    @Override
     int write(FileDescriptor fd, long address, int len) throws IOException {
         return write0(fd, address, len);
     }
 
+    @Override
     long writev(FileDescriptor fd, long address, int len) throws IOException {
         return writev0(fd, address, len);
     }
 
-    void close(FileDescriptor fd) throws IOException {
-        close0(fd);
-    }
-
-    void preClose(FileDescriptor fd) throws IOException {
-        preClose0(fd);
-    }
-
     // -- Native methods --
 
     private static native int read0(FileDescriptor fd, long address, int len)
@@ -82,10 +78,10 @@ class SocketDispatcher extends UnixDispatcher {
     private static native long readv0(FileDescriptor fd, long address, int len)
         throws IOException;
 
-    static native int write0(FileDescriptor fd, long address, int len)
+    private static native int write0(FileDescriptor fd, long address, int len)
         throws IOException;
 
-    static native long writev0(FileDescriptor fd, long address, int len)
+    private static native long writev0(FileDescriptor fd, long address, int len)
         throws IOException;
 
     static {
diff --git a/src/java.base/unix/classes/sun/nio/ch/SourceChannelImpl.java b/src/java.base/unix/classes/sun/nio/ch/SourceChannelImpl.java
index 2990d35b516..571d7f483d2 100644
--- a/src/java.base/unix/classes/sun/nio/ch/SourceChannelImpl.java
+++ b/src/java.base/unix/classes/sun/nio/ch/SourceChannelImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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 @@ class SourceChannelImpl
     implements SelChImpl
 {
     // Used to make native read and write calls
-    private static final NativeDispatcher nd = new FileDispatcherImpl();
+    private static final NativeDispatcher nd = new SocketDispatcher();
 
     // The file descriptor associated with this channel
     private final FileDescriptor fd;
@@ -152,15 +152,7 @@ class SourceChannelImpl
             assert state < ST_CLOSING;
             state = ST_CLOSING;
             if (!tryClose()) {
-                long th = thread;
-                if (th != 0) {
-                    if (NativeThread.isVirtualThread(th)) {
-                        Poller.stopPoll(fdVal);
-                    } else {
-                        nd.preClose(fd);
-                        NativeThread.signal(th);
-                    }
-                }
+                nd.preClose(fd, thread, 0);
             }
         }
     }
diff --git a/src/java.base/unix/classes/sun/nio/ch/UnixDispatcher.java b/src/java.base/unix/classes/sun/nio/ch/UnixDispatcher.java
index bc643100f9d..fcd2d88d7a6 100644
--- a/src/java.base/unix/classes/sun/nio/ch/UnixDispatcher.java
+++ b/src/java.base/unix/classes/sun/nio/ch/UnixDispatcher.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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,23 @@ import java.io.IOException;
 
 abstract class UnixDispatcher extends NativeDispatcher {
 
+    @Override
     void close(FileDescriptor fd) throws IOException {
         close0(fd);
     }
 
-    void preClose(FileDescriptor fd) throws IOException {
+    @Override
+    void implPreClose(FileDescriptor fd, long reader, long writer) throws IOException {
         preClose0(fd);
+        if (NativeThread.isNativeThread(reader))
+            NativeThread.signal(reader);
+        if (NativeThread.isNativeThread(writer))
+            NativeThread.signal(writer);
     }
 
-    static native void close0(FileDescriptor fd) throws IOException;
+    private static native void close0(FileDescriptor fd) throws IOException;
 
-    static native void preClose0(FileDescriptor fd) throws IOException;
+    private static native void preClose0(FileDescriptor fd) throws IOException;
 
     static native void init();
 
diff --git a/src/java.base/windows/classes/sun/nio/ch/DatagramDispatcher.java b/src/java.base/windows/classes/sun/nio/ch/DatagramDispatcher.java
index c59dfabbced..de40be6cda1 100644
--- a/src/java.base/windows/classes/sun/nio/ch/DatagramDispatcher.java
+++ b/src/java.base/windows/classes/sun/nio/ch/DatagramDispatcher.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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,22 +36,27 @@ import java.io.IOException;
 class DatagramDispatcher extends NativeDispatcher {
     DatagramDispatcher() { }
 
+    @Override
     int read(FileDescriptor fd, long address, int len) throws IOException {
         return read0(fd, address, len);
     }
 
+    @Override
     long readv(FileDescriptor fd, long address, int len) throws IOException {
         return readv0(fd, address, len);
     }
 
+    @Override
     int write(FileDescriptor fd, long address, int len) throws IOException {
         return write0(fd, address, len);
     }
 
+    @Override
     long writev(FileDescriptor fd, long address, int len) throws IOException {
         return writev0(fd, address, len);
     }
 
+    @Override
     void close(FileDescriptor fd) throws IOException {
         SocketDispatcher.invalidateAndClose(fd);
     }
diff --git a/src/java.base/windows/classes/sun/nio/ch/SocketDispatcher.java b/src/java.base/windows/classes/sun/nio/ch/SocketDispatcher.java
index 6ce751bddf7..a9c2a132cad 100644
--- a/src/java.base/windows/classes/sun/nio/ch/SocketDispatcher.java
+++ b/src/java.base/windows/classes/sun/nio/ch/SocketDispatcher.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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,26 +42,27 @@ class SocketDispatcher extends NativeDispatcher {
 
     SocketDispatcher() { }
 
+    @Override
     int read(FileDescriptor fd, long address, int len) throws IOException {
         return read0(fd, address, len);
     }
 
+    @Override
     long readv(FileDescriptor fd, long address, int len) throws IOException {
         return readv0(fd, address, len);
     }
 
+    @Override
     int write(FileDescriptor fd, long address, int len) throws IOException {
         return write0(fd, address, len);
     }
 
+    @Override
     long writev(FileDescriptor fd, long address, int len) throws IOException {
         return writev0(fd, address, len);
     }
 
-    void preClose(FileDescriptor fd) throws IOException {
-        throw new UnsupportedOperationException();
-    }
-
+    @Override
     void close(FileDescriptor fd) throws IOException {
         invalidateAndClose(fd);
     }

From 83de34041eacdf987988364487712c79bbb4c235 Mon Sep 17 00:00:00 2001
From: Boris Ulasevich <bulasevich@openjdk.org>
Date: Tue, 11 Mar 2025 12:33:36 +0000
Subject: [PATCH 297/587] 8343789: Move mutable nmethod data out of CodeCache

Reviewed-by: kvn, dlong
---
 src/hotspot/share/code/codeBlob.cpp           |  28 +++--
 src/hotspot/share/code/codeBlob.hpp           |  31 ++++--
 src/hotspot/share/code/nmethod.cpp            | 101 ++++++++++--------
 src/hotspot/share/code/nmethod.hpp            |  68 ++++++------
 src/hotspot/share/runtime/vmStructs.cpp       |   5 +-
 .../sun/jvm/hotspot/code/CodeBlob.java        |  16 ++-
 .../classes/sun/jvm/hotspot/code/NMethod.java |  11 +-
 7 files changed, 155 insertions(+), 105 deletions(-)

diff --git a/src/hotspot/share/code/codeBlob.cpp b/src/hotspot/share/code/codeBlob.cpp
index 9b61d9e6650..79f6bf61ff1 100644
--- a/src/hotspot/share/code/codeBlob.cpp
+++ b/src/hotspot/share/code/codeBlob.cpp
@@ -109,26 +109,26 @@ unsigned int CodeBlob::align_code_offset(int offset) {
 
 // This must be consistent with the CodeBlob constructor's layout actions.
 unsigned int CodeBlob::allocation_size(CodeBuffer* cb, int header_size) {
-  unsigned int size = header_size;
-  size += align_up(cb->total_relocation_size(), oopSize);
   // align the size to CodeEntryAlignment
-  size = align_code_offset(size);
+  unsigned int size = align_code_offset(header_size);
   size += align_up(cb->total_content_size(), oopSize);
   size += align_up(cb->total_oop_size(), oopSize);
-  size += align_up(cb->total_metadata_size(), oopSize);
   return size;
 }
 
 CodeBlob::CodeBlob(const char* name, CodeBlobKind kind, CodeBuffer* cb, int size, uint16_t header_size,
-                   int16_t frame_complete_offset, int frame_size, OopMapSet* oop_maps, bool caller_must_gc_arguments) :
+                   int16_t frame_complete_offset, int frame_size, OopMapSet* oop_maps, bool caller_must_gc_arguments,
+                   int mutable_data_size) :
   _oop_maps(nullptr), // will be set by set_oop_maps() call
   _name(name),
+  _mutable_data(nullptr),
   _size(size),
   _relocation_size(align_up(cb->total_relocation_size(), oopSize)),
-  _content_offset(CodeBlob::align_code_offset(header_size + _relocation_size)),
+  _content_offset(CodeBlob::align_code_offset(header_size)),
   _code_offset(_content_offset + cb->total_offset_of(cb->insts())),
   _data_offset(_content_offset + align_up(cb->total_content_size(), oopSize)),
   _frame_size(frame_size),
+  _mutable_data_size(mutable_data_size),
   S390_ONLY(_ctable_offset(0) COMMA)
   _header_size(header_size),
   _frame_complete_offset(frame_complete_offset),
@@ -139,12 +139,20 @@ CodeBlob::CodeBlob(const char* name, CodeBlobKind kind, CodeBuffer* cb, int size
   assert(is_aligned(header_size,      oopSize), "unaligned size");
   assert(is_aligned(_relocation_size, oopSize), "unaligned size");
   assert(_data_offset <= _size, "codeBlob is too small: %d > %d", _data_offset, _size);
+  assert(is_nmethod() || (cb->total_oop_size() + cb->total_metadata_size() == 0), "must be nmethod");
   assert(code_end() == content_end(), "must be the same - see code_end()");
 #ifdef COMPILER1
   // probably wrong for tiered
   assert(_frame_size >= -1, "must use frame size or -1 for runtime stubs");
 #endif // COMPILER1
 
+  if (_mutable_data_size > 0) {
+    _mutable_data = (address)os::malloc(_mutable_data_size, mtCode);
+    if (_mutable_data == nullptr) {
+      vm_exit_out_of_memory(_mutable_data_size, OOM_MALLOC_ERROR, "codebuffer: no space for mutable data");
+    }
+  }
+
   set_oop_maps(oop_maps);
 }
 
@@ -152,6 +160,7 @@ CodeBlob::CodeBlob(const char* name, CodeBlobKind kind, CodeBuffer* cb, int size
 CodeBlob::CodeBlob(const char* name, CodeBlobKind kind, int size, uint16_t header_size) :
   _oop_maps(nullptr),
   _name(name),
+  _mutable_data(nullptr),
   _size(size),
   _relocation_size(0),
   _content_offset(CodeBlob::align_code_offset(header_size)),
@@ -169,6 +178,10 @@ CodeBlob::CodeBlob(const char* name, CodeBlobKind kind, int size, uint16_t heade
 }
 
 void CodeBlob::purge() {
+  if (_mutable_data != nullptr) {
+    os::free(_mutable_data);
+    _mutable_data = nullptr;
+  }
   if (_oop_maps != nullptr) {
     delete _oop_maps;
     _oop_maps = nullptr;
@@ -210,7 +223,8 @@ RuntimeBlob::RuntimeBlob(
   int         frame_size,
   OopMapSet*  oop_maps,
   bool        caller_must_gc_arguments)
-  : CodeBlob(name, kind, cb, size, header_size, frame_complete, frame_size, oop_maps, caller_must_gc_arguments)
+  : CodeBlob(name, kind, cb, size, header_size, frame_complete, frame_size, oop_maps, caller_must_gc_arguments,
+             align_up(cb->total_relocation_size(), oopSize))
 {
   cb->copy_code_and_locs_to(this);
 }
diff --git a/src/hotspot/share/code/codeBlob.hpp b/src/hotspot/share/code/codeBlob.hpp
index d0ac2bf1b5f..57f830a4970 100644
--- a/src/hotspot/share/code/codeBlob.hpp
+++ b/src/hotspot/share/code/codeBlob.hpp
@@ -67,12 +67,14 @@ enum class CodeBlobType {
 //   UpcallStub  : Used for upcalls from native code
 //
 //
-// Layout : continuous in the CodeCache
+// Layout in the CodeCache:
 //   - header
-//   - relocation
 //   - content space
 //     - instruction space
-//   - data space
+// Outside of the CodeCache:
+//   - mutable_data
+//     - relocation info
+//     - additional data for subclasses
 
 enum class CodeBlobKind : u1 {
   None,
@@ -104,14 +106,15 @@ protected:
   // order fields from large to small to minimize padding between fields
   ImmutableOopMapSet* _oop_maps;   // OopMap for this CodeBlob
   const char*         _name;
+  address             _mutable_data;
 
   int      _size;                  // total size of CodeBlob in bytes
   int      _relocation_size;       // size of relocation (could be bigger than 64Kb)
   int      _content_offset;        // offset to where content region begins (this includes consts, insts, stubs)
   int      _code_offset;           // offset to where instructions region begins (this includes insts, stubs)
-
   int      _data_offset;           // offset to where data region begins
   int      _frame_size;            // size of stack frame in words (NOT slots. On x64 these are 64bit words)
+  int      _mutable_data_size;
 
   S390_ONLY(int _ctable_offset;)
 
@@ -142,7 +145,8 @@ protected:
   const Vptr* vptr() const;
 
   CodeBlob(const char* name, CodeBlobKind kind, CodeBuffer* cb, int size, uint16_t header_size,
-           int16_t frame_complete_offset, int frame_size, OopMapSet* oop_maps, bool caller_must_gc_arguments);
+           int16_t frame_complete_offset, int frame_size, OopMapSet* oop_maps, bool caller_must_gc_arguments,
+           int mutable_data_size);
 
   // Simple CodeBlob used for simple BufferBlob.
   CodeBlob(const char* name, CodeBlobKind kind, int size, uint16_t header_size);
@@ -190,20 +194,25 @@ public:
   // Boundaries
   address    header_begin() const             { return (address)    this; }
   address    header_end() const               { return ((address)   this) + _header_size; }
-  relocInfo* relocation_begin() const         { return (relocInfo*) header_end(); }
-  relocInfo* relocation_end() const           { return (relocInfo*)(header_end()   + _relocation_size); }
   address    content_begin() const            { return (address)    header_begin() + _content_offset; }
   address    content_end() const              { return (address)    header_begin() + _data_offset; }
   address    code_begin() const               { return (address)    header_begin() + _code_offset; }
-  // code_end == content_end is true for all types of blobs for now, it is also checked in the constructor
   address    code_end() const                 { return (address)    header_begin() + _data_offset; }
   address    data_begin() const               { return (address)    header_begin() + _data_offset; }
   address    data_end() const                 { return (address)    header_begin() + _size; }
+  address    blob_end() const                 { return (address)    header_begin() + _size; }
+  // code_end == content_end is true for all types of blobs for now, it is also checked in the constructor
+
+  int mutable_data_size() const               { return _mutable_data_size; }
+  address mutable_data_begin() const          { return _mutable_data; }
+  address mutable_data_end() const            { return _mutable_data + _mutable_data_size; }
+
+  relocInfo* relocation_begin() const         { return (relocInfo*)_mutable_data; }
+  relocInfo* relocation_end() const           { return (relocInfo*)((address)relocation_begin() + _relocation_size); }
 
   // Offsets
   int content_offset() const                  { return _content_offset; }
   int code_offset() const                     { return _code_offset; }
-  int data_offset() const                     { return _data_offset; }
 
   // This field holds the beginning of the const section in the old code buffer.
   // It is needed to fix relocations of pc-relative loads when resizing the
@@ -221,11 +230,11 @@ public:
   // Only used from CodeCache::free_unused_tail() after the Interpreter blob was trimmed
   void adjust_size(size_t used) {
     _size = (int)used;
-    _data_offset = (int)used;
+    _data_offset = _size;
   }
 
   // Containment
-  bool blob_contains(address addr) const         { return header_begin()       <= addr && addr < data_end();       }
+  bool blob_contains(address addr) const         { return header_begin()       <= addr && addr < blob_end();       }
   bool code_contains(address addr) const         { return code_begin()         <= addr && addr < code_end();       }
   bool contains(address addr) const              { return content_begin()      <= addr && addr < content_end();    }
   bool is_frame_complete_at(address addr) const  { return _frame_complete_offset != CodeOffsets::frame_never_safe &&
diff --git a/src/hotspot/share/code/nmethod.cpp b/src/hotspot/share/code/nmethod.cpp
index 3381a7cb726..23a2dee4d35 100644
--- a/src/hotspot/share/code/nmethod.cpp
+++ b/src/hotspot/share/code/nmethod.cpp
@@ -127,6 +127,7 @@ struct java_nmethod_stats_struct {
   uint nmethod_count;
   uint total_nm_size;
   uint total_immut_size;
+  uint total_mut_size;
   uint relocation_size;
   uint consts_size;
   uint insts_size;
@@ -147,6 +148,7 @@ struct java_nmethod_stats_struct {
     nmethod_count += 1;
     total_nm_size       += nm->size();
     total_immut_size    += nm->immutable_data_size();
+    total_mut_size      += nm->mutable_data_size();
     relocation_size     += nm->relocation_size();
     consts_size         += nm->consts_size();
     insts_size          += nm->insts_size();
@@ -166,7 +168,7 @@ struct java_nmethod_stats_struct {
   void print_nmethod_stats(const char* name) {
     if (nmethod_count == 0)  return;
     tty->print_cr("Statistics for %u bytecoded nmethods for %s:", nmethod_count, name);
-    uint total_size = total_nm_size + total_immut_size;
+    uint total_size = total_nm_size + total_immut_size + total_mut_size;
     if (total_nm_size != 0) {
       tty->print_cr(" total size      = %u (100%%)", total_size);
       tty->print_cr(" in CodeCache    = %u (%f%%)", total_nm_size, (total_nm_size * 100.0f)/total_size);
@@ -175,9 +177,6 @@ struct java_nmethod_stats_struct {
     if (nmethod_count != 0) {
       tty->print_cr("   header        = %u (%f%%)", header_size, (header_size * 100.0f)/total_nm_size);
     }
-    if (relocation_size != 0) {
-      tty->print_cr("   relocation    = %u (%f%%)", relocation_size, (relocation_size * 100.0f)/total_nm_size);
-    }
     if (consts_size != 0) {
       tty->print_cr("   constants     = %u (%f%%)", consts_size, (consts_size * 100.0f)/total_nm_size);
     }
@@ -190,12 +189,18 @@ struct java_nmethod_stats_struct {
     if (oops_size != 0) {
       tty->print_cr("   oops          = %u (%f%%)", oops_size, (oops_size * 100.0f)/total_nm_size);
     }
+    if (total_mut_size != 0) {
+      tty->print_cr(" mutable data    = %u (%f%%)", total_mut_size, (total_mut_size * 100.0f)/total_size);
+    }
+    if (relocation_size != 0) {
+      tty->print_cr("   relocation    = %u (%f%%)", relocation_size, (relocation_size * 100.0f)/total_mut_size);
+    }
     if (metadata_size != 0) {
-      tty->print_cr("   metadata      = %u (%f%%)", metadata_size, (metadata_size * 100.0f)/total_nm_size);
+      tty->print_cr("   metadata      = %u (%f%%)", metadata_size, (metadata_size * 100.0f)/total_mut_size);
     }
 #if INCLUDE_JVMCI
     if (jvmci_data_size != 0) {
-      tty->print_cr("   JVMCI data    = %u (%f%%)", jvmci_data_size, (jvmci_data_size * 100.0f)/total_nm_size);
+      tty->print_cr("   JVMCI data    = %u (%f%%)", jvmci_data_size, (jvmci_data_size * 100.0f)/total_mut_size);
     }
 #endif
     if (total_immut_size != 0) {
@@ -1072,6 +1077,13 @@ static void assert_no_oops_or_metadata(nmethod* nm) {
 }
 #endif
 
+static int required_mutable_data_size(CodeBuffer* code_buffer,
+                                      int jvmci_data_size = 0) {
+  return align_up(code_buffer->total_relocation_size(), oopSize) +
+         align_up(code_buffer->total_metadata_size(), oopSize) +
+         align_up(jvmci_data_size, oopSize);
+}
+
 nmethod* nmethod::new_native_nmethod(const methodHandle& method,
   int compile_id,
   CodeBuffer *code_buffer,
@@ -1096,6 +1108,8 @@ nmethod* nmethod::new_native_nmethod(const methodHandle& method,
       offsets.set_value(CodeOffsets::Exceptions, exception_handler);
     }
 
+    int mutable_data_size = required_mutable_data_size(code_buffer);
+
     // MH intrinsics are dispatch stubs which are compatible with NonNMethod space.
     // IsUnloadingBehaviour::is_unloading needs to handle them separately.
     bool allow_NonNMethod_space = method->can_be_allocated_in_NonNMethod_space();
@@ -1105,7 +1119,7 @@ nmethod* nmethod::new_native_nmethod(const methodHandle& method,
             code_buffer, frame_size,
             basic_lock_owner_sp_offset,
             basic_lock_sp_offset,
-            oop_maps);
+            oop_maps, mutable_data_size);
     DEBUG_ONLY( if (allow_NonNMethod_space) assert_no_oops_or_metadata(nm); )
     NOT_PRODUCT(if (nm != nullptr) native_nmethod_stats.note_native_nmethod(nm));
   }
@@ -1144,11 +1158,6 @@ nmethod* nmethod::new_nmethod(const methodHandle& method,
   // create nmethod
   nmethod* nm = nullptr;
   int nmethod_size = CodeBlob::allocation_size(code_buffer, sizeof(nmethod));
-#if INCLUDE_JVMCI
-    if (compiler->is_jvmci()) {
-      nmethod_size += align_up(jvmci_data->size(), oopSize);
-    }
-#endif
 
   int immutable_data_size =
       adjust_pcs_size(debug_info->pcs_size())
@@ -1169,11 +1178,15 @@ nmethod* nmethod::new_nmethod(const methodHandle& method,
       return nullptr;
     }
   }
+
+  int mutable_data_size = required_mutable_data_size(code_buffer
+    JVMCI_ONLY(COMMA (compiler->is_jvmci() ? jvmci_data->size() : 0)));
+
   {
     MutexLocker mu(CodeCache_lock, Mutex::_no_safepoint_check_flag);
 
     nm = new (nmethod_size, comp_level)
-    nmethod(method(), compiler->type(), nmethod_size, immutable_data_size,
+    nmethod(method(), compiler->type(), nmethod_size, immutable_data_size, mutable_data_size,
             compile_id, entry_bci, immutable_data, offsets, orig_pc_offset,
             debug_info, dependencies, code_buffer, frame_size, oop_maps,
             handler_table, nul_chk_table, compiler, comp_level
@@ -1276,9 +1289,10 @@ nmethod::nmethod(
   int frame_size,
   ByteSize basic_lock_owner_sp_offset,
   ByteSize basic_lock_sp_offset,
-  OopMapSet* oop_maps )
+  OopMapSet* oop_maps,
+  int mutable_data_size)
   : CodeBlob("native nmethod", CodeBlobKind::Nmethod, code_buffer, nmethod_size, sizeof(nmethod),
-             offsets->value(CodeOffsets::Frame_Complete), frame_size, oop_maps, false),
+             offsets->value(CodeOffsets::Frame_Complete), frame_size, oop_maps, false, mutable_data_size),
   _deoptimization_generation(0),
   _gc_epoch(CodeCache::gc_epoch()),
   _method(method),
@@ -1312,17 +1326,15 @@ nmethod::nmethod(
     _deopt_mh_handler_offset = 0;
     _unwind_handler_offset   = 0;
 
-    CHECKED_CAST(_metadata_offset, uint16_t, (align_up(code_buffer->total_oop_size(), oopSize)));
-    int data_end_offset = _metadata_offset + align_up(code_buffer->total_metadata_size(), wordSize);
-#if INCLUDE_JVMCI
-    // jvmci_data_size is 0 in native wrapper but we need to set offset
-    // to correctly calculate metadata_end address
-    CHECKED_CAST(_jvmci_data_offset, uint16_t, data_end_offset);
-#endif
-    assert((data_offset() + data_end_offset) <= nmethod_size, "wrong nmethod's size: %d < %d", nmethod_size, (data_offset() + data_end_offset));
+    CHECKED_CAST(_oops_size, uint16_t, align_up(code_buffer->total_oop_size(), oopSize));
+    int metadata_size = align_up(code_buffer->total_metadata_size(), wordSize);
+    JVMCI_ONLY( _jvmci_data_size = 0; )
+    assert(_mutable_data_size == _relocation_size + metadata_size,
+           "wrong mutable data size: %d != %d + %d",
+           _mutable_data_size, _relocation_size, metadata_size);
 
     // native wrapper does not have read-only data but we need unique not null address
-    _immutable_data          = data_end();
+    _immutable_data          = blob_end();
     _immutable_data_size     = 0;
     _nul_chk_table_offset    = 0;
     _handler_table_offset    = 0;
@@ -1399,6 +1411,7 @@ nmethod::nmethod(
   CompilerType type,
   int nmethod_size,
   int immutable_data_size,
+  int mutable_data_size,
   int compile_id,
   int entry_bci,
   address immutable_data,
@@ -1420,7 +1433,7 @@ nmethod::nmethod(
 #endif
   )
   : CodeBlob("nmethod", CodeBlobKind::Nmethod, code_buffer, nmethod_size, sizeof(nmethod),
-             offsets->value(CodeOffsets::Frame_Complete), frame_size, oop_maps, false),
+             offsets->value(CodeOffsets::Frame_Complete), frame_size, oop_maps, false, mutable_data_size),
   _deoptimization_generation(0),
   _gc_epoch(CodeCache::gc_epoch()),
   _method(method),
@@ -1486,18 +1499,16 @@ nmethod::nmethod(
     } else {
       _unwind_handler_offset = -1;
     }
-    CHECKED_CAST(_metadata_offset, uint16_t, (align_up(code_buffer->total_oop_size(), oopSize)));
-    int metadata_end_offset = _metadata_offset + align_up(code_buffer->total_metadata_size(), wordSize);
 
-#if INCLUDE_JVMCI
-    CHECKED_CAST(_jvmci_data_offset, uint16_t, metadata_end_offset);
-    int jvmci_data_size   = compiler->is_jvmci() ? jvmci_data->size() : 0;
-    DEBUG_ONLY( int data_end_offset = _jvmci_data_offset  + align_up(jvmci_data_size, oopSize); )
-#else
-    DEBUG_ONLY( int data_end_offset = metadata_end_offset; )
-#endif
-    assert((data_offset() + data_end_offset) <= nmethod_size, "wrong nmethod's size: %d > %d",
-           (data_offset() + data_end_offset), nmethod_size);
+    CHECKED_CAST(_oops_size, uint16_t, align_up(code_buffer->total_oop_size(), oopSize));
+    uint16_t metadata_size = (uint16_t)align_up(code_buffer->total_metadata_size(), wordSize);
+    JVMCI_ONLY(CHECKED_CAST(_jvmci_data_size, uint16_t, align_up(compiler->is_jvmci() ? jvmci_data->size() : 0, oopSize)));
+    int jvmci_data_size = 0 JVMCI_ONLY(+ _jvmci_data_size);
+    assert(_mutable_data_size == _relocation_size + metadata_size + jvmci_data_size,
+           "wrong mutable data size: %d != %d + %d + %d",
+           _mutable_data_size, _relocation_size, metadata_size, jvmci_data_size);
+    assert(nmethod_size == data_end() - header_begin(), "wrong nmethod size: %d != %d",
+           nmethod_size, (int)(code_end() - header_begin()));
 
     _immutable_data_size  = immutable_data_size;
     if (immutable_data_size > 0) {
@@ -1505,7 +1516,7 @@ nmethod::nmethod(
       _immutable_data     = immutable_data;
     } else {
       // We need unique not null address
-      _immutable_data     = data_end();
+      _immutable_data     = blob_end();
     }
     CHECKED_CAST(_nul_chk_table_offset, uint16_t, (align_up((int)dependencies->size_in_bytes(), oopSize)));
     CHECKED_CAST(_handler_table_offset, uint16_t, (_nul_chk_table_offset + align_up(nul_chk_table->size_in_bytes(), oopSize)));
@@ -2127,9 +2138,9 @@ void nmethod::purge(bool unregister_nmethod) {
   }
   delete[] _compiled_ic_data;
 
-  if (_immutable_data != data_end()) {
+  if (_immutable_data != blob_end()) {
     os::free(_immutable_data);
-    _immutable_data = data_end(); // Valid not null address
+    _immutable_data = blob_end(); // Valid not null address
   }
   if (unregister_nmethod) {
     Universe::heap()->unregister_nmethod(this);
@@ -3061,10 +3072,6 @@ void nmethod::print_on_impl(outputStream* st) const {
                                              p2i(this),
                                              p2i(this) + size(),
                                              size());
-  if (relocation_size   () > 0) st->print_cr(" relocation     [" INTPTR_FORMAT "," INTPTR_FORMAT "] = %d",
-                                             p2i(relocation_begin()),
-                                             p2i(relocation_end()),
-                                             relocation_size());
   if (consts_size       () > 0) st->print_cr(" constants      [" INTPTR_FORMAT "," INTPTR_FORMAT "] = %d",
                                              p2i(consts_begin()),
                                              p2i(consts_end()),
@@ -3081,6 +3088,14 @@ void nmethod::print_on_impl(outputStream* st) const {
                                              p2i(oops_begin()),
                                              p2i(oops_end()),
                                              oops_size());
+  if (mutable_data_size() > 0) st->print_cr(" mutable data [" INTPTR_FORMAT "," INTPTR_FORMAT "] = %d",
+                                             p2i(mutable_data_begin()),
+                                             p2i(mutable_data_end()),
+                                             mutable_data_size());
+  if (relocation_size() > 0)   st->print_cr(" relocation     [" INTPTR_FORMAT "," INTPTR_FORMAT "] = %d",
+                                             p2i(relocation_begin()),
+                                             p2i(relocation_end()),
+                                             relocation_size());
   if (metadata_size     () > 0) st->print_cr(" metadata       [" INTPTR_FORMAT "," INTPTR_FORMAT "] = %d",
                                              p2i(metadata_begin()),
                                              p2i(metadata_end()),
diff --git a/src/hotspot/share/code/nmethod.hpp b/src/hotspot/share/code/nmethod.hpp
index ac9b1a7098f..ed520d4f847 100644
--- a/src/hotspot/share/code/nmethod.hpp
+++ b/src/hotspot/share/code/nmethod.hpp
@@ -134,27 +134,27 @@ public:
 // nmethods (native methods) are the compiled code versions of Java methods.
 //
 // An nmethod contains:
-//  - header                 (the nmethod structure)
-//  [Relocation]
-//  - relocation information
-//  - constant part          (doubles, longs and floats used in nmethod)
-//  - oop table
-//  [Code]
-//  - code body
-//  - exception handler
-//  - stub code
-//  [Debugging information]
-//  - oop array
-//  - data array
-//  - pcs
-//  [Exception handler table]
-//  - handler entry point array
-//  [Implicit Null Pointer exception table]
-//  - implicit null table array
-//  [Speculations]
-//  - encoded speculations array
-//  [JVMCINMethodData]
-//  - meta data for JVMCI compiled nmethod
+//  - Header                 (the nmethod structure)
+//  - Constant part          (doubles, longs and floats used in nmethod)
+//  - Code part:
+//    - Code body
+//    - Exception handler
+//    - Stub code
+//    - OOP table
+//
+// As a CodeBlob, an nmethod references [mutable data] allocated on the C heap:
+//  - CodeBlob relocation data
+//  - Metainfo
+//  - JVMCI data
+//
+// An nmethod references [immutable data] allocated on C heap:
+//  - Dependency assertions data
+//  - Implicit null table array
+//  - Handler entry point array
+//  - Debugging information:
+//    - Scopes data array
+//    - Scopes pcs array
+//  - JVMCI speculations array
 
 #if INCLUDE_JVMCI
 class FailedSpeculation;
@@ -235,11 +235,9 @@ class nmethod : public CodeBlob {
   // Number of arguments passed on the stack
   uint16_t _num_stack_arg_slots;
 
-  // Offsets in mutable data section
-  // _oops_offset == _data_offset,  offset where embedded oop table begins (inside data)
-  uint16_t _metadata_offset; // embedded meta data table
+  uint16_t _oops_size;
 #if INCLUDE_JVMCI
-  uint16_t _jvmci_data_offset;
+  uint16_t _jvmci_data_size;
 #endif
 
   // Offset in immutable data section
@@ -305,13 +303,15 @@ class nmethod : public CodeBlob {
           int frame_size,
           ByteSize basic_lock_owner_sp_offset, /* synchronized natives only */
           ByteSize basic_lock_sp_offset,       /* synchronized natives only */
-          OopMapSet* oop_maps);
+          OopMapSet* oop_maps,
+          int mutable_data_size);
 
   // For normal JIT compiled code
   nmethod(Method* method,
           CompilerType type,
           int nmethod_size,
           int immutable_data_size,
+          int mutable_data_size,
           int compile_id,
           int entry_bci,
           address immutable_data,
@@ -526,22 +526,22 @@ public:
   address insts_begin           () const { return           code_begin()   ; }
   address insts_end             () const { return           header_begin() + _stub_offset             ; }
   address stub_begin            () const { return           header_begin() + _stub_offset             ; }
-  address stub_end              () const { return           data_begin()   ; }
+  address stub_end              () const { return           code_end()     ; }
   address exception_begin       () const { return           header_begin() + _exception_offset        ; }
   address deopt_handler_begin   () const { return           header_begin() + _deopt_handler_offset    ; }
   address deopt_mh_handler_begin() const { return           header_begin() + _deopt_mh_handler_offset ; }
   address unwind_handler_begin  () const { return _unwind_handler_offset != -1 ? (insts_end() - _unwind_handler_offset) : nullptr; }
+  oop*    oops_begin            () const { return (oop*)    data_begin(); }
+  oop*    oops_end              () const { return (oop*)    data_end(); }
 
   // mutable data
-  oop*    oops_begin            () const { return (oop*)        data_begin(); }
-  oop*    oops_end              () const { return (oop*)       (data_begin() + _metadata_offset)      ; }
-  Metadata** metadata_begin     () const { return (Metadata**) (data_begin() + _metadata_offset)      ; }
+  Metadata** metadata_begin     () const { return (Metadata**) (mutable_data_begin() + _relocation_size); }
 #if INCLUDE_JVMCI
-  Metadata** metadata_end       () const { return (Metadata**) (data_begin() + _jvmci_data_offset)    ; }
-  address jvmci_data_begin      () const { return               data_begin() + _jvmci_data_offset     ; }
-  address jvmci_data_end        () const { return               data_end(); }
+  Metadata** metadata_end       () const { return (Metadata**) (mutable_data_end() - _jvmci_data_size); }
+  address jvmci_data_begin      () const { return               mutable_data_end() - _jvmci_data_size; }
+  address jvmci_data_end        () const { return               mutable_data_end(); }
 #else
-  Metadata** metadata_end       () const { return (Metadata**)  data_end(); }
+  Metadata** metadata_end       () const { return (Metadata**)  mutable_data_end(); }
 #endif
 
   // immutable data
diff --git a/src/hotspot/share/runtime/vmStructs.cpp b/src/hotspot/share/runtime/vmStructs.cpp
index 3daec6d8d06..c95dd709c84 100644
--- a/src/hotspot/share/runtime/vmStructs.cpp
+++ b/src/hotspot/share/runtime/vmStructs.cpp
@@ -519,6 +519,8 @@
   nonstatic_field(CodeBlob,                    _frame_size,                                   int)                                   \
   nonstatic_field(CodeBlob,                    _oop_maps,                                     ImmutableOopMapSet*)                   \
   nonstatic_field(CodeBlob,                    _caller_must_gc_arguments,                     bool)                                  \
+  nonstatic_field(CodeBlob,                    _mutable_data,                                 address)                               \
+  nonstatic_field(CodeBlob,                    _mutable_data_size,                            int)                                   \
                                                                                                                                      \
   nonstatic_field(DeoptimizationBlob,          _unpack_offset,                                int)                                   \
                                                                                                                                      \
@@ -541,8 +543,7 @@
   nonstatic_field(nmethod,                     _deopt_mh_handler_offset,                      int)                                   \
   nonstatic_field(nmethod,                     _orig_pc_offset,                               int)                                   \
   nonstatic_field(nmethod,                     _stub_offset,                                  int)                                   \
-  nonstatic_field(nmethod,                     _metadata_offset,                              u2)                                    \
-  nonstatic_field(nmethod,                     _scopes_pcs_offset,                            int)                                    \
+  nonstatic_field(nmethod,                     _scopes_pcs_offset,                            int)                                   \
   nonstatic_field(nmethod,                     _scopes_data_offset,                           int)                                   \
   nonstatic_field(nmethod,                     _handler_table_offset,                         u2)                                    \
   nonstatic_field(nmethod,                     _nul_chk_table_offset,                         u2)                                    \
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/CodeBlob.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/CodeBlob.java
index a085edf9936..20c5fabf8bc 100644
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/CodeBlob.java
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/CodeBlob.java
@@ -52,6 +52,8 @@ public class CodeBlob extends VMObject {
   private static CIntegerField dataOffsetField;
   private static CIntegerField frameSizeField;
   private static AddressField  oopMapsField;
+  private static AddressField  mutableDataField;
+  private static CIntegerField mutableDataSizeField;
   private static CIntegerField callerMustGCArgumentsField;
 
   // Kinds of CodeBlobs that we need to know about.
@@ -80,6 +82,8 @@ public class CodeBlob extends VMObject {
     frameSizeField           = type.getCIntegerField("_frame_size");
     oopMapsField             = type.getAddressField("_oop_maps");
     callerMustGCArgumentsField = type.getCIntegerField("_caller_must_gc_arguments");
+    mutableDataField         = type.getAddressField("_mutable_data");
+    mutableDataSizeField     = type.getCIntegerField("_mutable_data_size");
 
     NMethodKind        = db.lookupIntConstant("CodeBlobKind::Nmethod").intValue();
     RuntimeStubKind    = db.lookupIntConstant("CodeBlobKind::RuntimeStub").intValue();
@@ -138,6 +142,15 @@ public class CodeBlob extends VMObject {
 
   public int getHeaderSize()      { return (int) headerSizeField.getValue(addr); }
 
+
+  // Mutable data
+  public int getMutableDataSize()   { return (int) mutableDataSizeField.getValue(addr); }
+
+  public Address mutableDataBegin() { return mutableDataField.getValue(addr); }
+
+  public Address mutableDataEnd()   { return mutableDataBegin().addOffsetTo(getMutableDataSize());  }
+
+
   public long getFrameSizeWords() {
     return (int) frameSizeField.getValue(addr);
   }
@@ -177,13 +190,14 @@ public class CodeBlob extends VMObject {
     return null;
   }
 
-  // FIXME: add getRelocationSize()
   public int getContentSize()      { return (int) contentEnd().minus(contentBegin()); }
 
   public int getCodeSize()         { return (int) codeEnd()   .minus(codeBegin());    }
 
   public int getDataSize()         { return (int) dataEnd()   .minus(dataBegin());    }
 
+  public int getRelocationSize()   { return (int) relocationSizeField.getValue(addr); }
+
   // Containment
   public boolean blobContains(Address addr)    { return headerBegin() .lessThanOrEqual(addr) && dataEnd()   .greaterThan(addr); }
 
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/NMethod.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/NMethod.java
index 44d51b005ae..a3228765e91 100644
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/NMethod.java
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/NMethod.java
@@ -51,7 +51,6 @@ public class NMethod extends CodeBlob {
   private static CIntegerField deoptMhHandlerOffsetField;
   private static CIntegerField origPCOffsetField;
   private static CIntegerField stubOffsetField;
-  private static CIntField     metadataOffsetField;
   private static CIntField     handlerTableOffsetField;
   private static CIntField     nulChkTableOffsetField;
   private static CIntegerField scopesPCsOffsetField;
@@ -85,13 +84,11 @@ public class NMethod extends CodeBlob {
     osrLinkField                = type.getAddressField("_osr_link");
     immutableDataField          = type.getAddressField("_immutable_data");
     immutableDataSizeField      = type.getCIntegerField("_immutable_data_size");
-
     exceptionOffsetField        = type.getCIntegerField("_exception_offset");
     deoptHandlerOffsetField     = type.getCIntegerField("_deopt_handler_offset");
     deoptMhHandlerOffsetField   = type.getCIntegerField("_deopt_mh_handler_offset");
     origPCOffsetField           = type.getCIntegerField("_orig_pc_offset");
     stubOffsetField             = type.getCIntegerField("_stub_offset");
-    metadataOffsetField         = new CIntField(type.getCIntegerField("_metadata_offset"), 0);
     scopesPCsOffsetField        = type.getCIntegerField("_scopes_pcs_offset");
     scopesDataOffsetField       = type.getCIntegerField("_scopes_data_offset");
     handlerTableOffsetField     = new CIntField(type.getCIntegerField("_handler_table_offset"), 0);
@@ -132,9 +129,7 @@ public class NMethod extends CodeBlob {
   public Address stubBegin()            { return headerBegin().addOffsetTo(getStubOffset());         }
   public Address stubEnd()              { return dataBegin();                                        }
   public Address oopsBegin()            { return dataBegin();                                        }
-  public Address oopsEnd()              { return dataBegin().addOffsetTo(getMetadataOffset());       }
-  public Address metadataBegin()        { return dataBegin().addOffsetTo(getMetadataOffset());       }
-  public Address metadataEnd()          { return dataEnd();                                          }
+  public Address oopsEnd()              { return dataEnd();                                          }
 
   public Address immutableDataBegin()   { return immutableDataField.getValue(addr);                         }
   public Address immutableDataEnd()     { return immutableDataBegin().addOffsetTo(getImmutableDataSize());  }
@@ -149,6 +144,9 @@ public class NMethod extends CodeBlob {
   public Address scopesPCsBegin()       { return immutableDataBegin().addOffsetTo(getScopesPCsOffset());    }
   public Address scopesPCsEnd()         { return immutableDataEnd();                                        }
 
+  public Address metadataBegin()        { return mutableDataBegin().addOffsetTo(getRelocationSize());   }
+  public Address metadataEnd()          { return mutableDataEnd();                                      }
+
   public int getImmutableDataSize()     { return (int) immutableDataSizeField.getValue(addr);        }
   public int constantsSize()            { return (int) constantsEnd()   .minus(constantsBegin());    }
   public int instsSize()                { return (int) instsEnd()       .minus(instsBegin());        }
@@ -498,7 +496,6 @@ public class NMethod extends CodeBlob {
   private int getDeoptHandlerOffset()   { return (int) deoptHandlerOffsetField  .getValue(addr); }
   private int getDeoptMhHandlerOffset() { return (int) deoptMhHandlerOffsetField.getValue(addr); }
   private int getStubOffset()         { return (int) stubOffsetField        .getValue(addr); }
-  private int getMetadataOffset()     { return (int) metadataOffsetField    .getValue(addr); }
   private int getScopesDataOffset()   { return (int) scopesDataOffsetField  .getValue(addr); }
   private int getScopesPCsOffset()    { return (int) scopesPCsOffsetField   .getValue(addr); }
   private int getHandlerTableOffset() { return (int) handlerTableOffsetField.getValue(addr); }

From af9af7e90f7dab5adc7b89b76eb978d269e863de Mon Sep 17 00:00:00 2001
From: Hamlin Li <mli@openjdk.org>
Date: Tue, 11 Mar 2025 12:51:22 +0000
Subject: [PATCH 298/587] 8351145: RISC-V: only enable some crypto intrinsic
 when AvoidUnalignedAccess == false

Reviewed-by: fyang, rehn
---
 src/hotspot/cpu/riscv/vm_version_riscv.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/hotspot/cpu/riscv/vm_version_riscv.cpp b/src/hotspot/cpu/riscv/vm_version_riscv.cpp
index 5d7ed4bda60..389af3a06e3 100644
--- a/src/hotspot/cpu/riscv/vm_version_riscv.cpp
+++ b/src/hotspot/cpu/riscv/vm_version_riscv.cpp
@@ -126,10 +126,6 @@ void VM_Version::common_initialize() {
     FLAG_SET_DEFAULT(UseVectorizedMismatchIntrinsic, false);
   }
 
-  if (FLAG_IS_DEFAULT(UsePoly1305Intrinsics)) {
-    FLAG_SET_DEFAULT(UsePoly1305Intrinsics, true);
-  }
-
   if (FLAG_IS_DEFAULT(UseCopySignIntrinsic)) {
       FLAG_SET_DEFAULT(UseCopySignIntrinsic, true);
   }
@@ -153,6 +149,10 @@ void VM_Version::common_initialize() {
       unaligned_access.value() != MISALIGNED_FAST);
   }
 
+  if (FLAG_IS_DEFAULT(UsePoly1305Intrinsics) && !AvoidUnalignedAccesses) {
+    FLAG_SET_DEFAULT(UsePoly1305Intrinsics, true);
+  }
+
   // See JDK-8026049
   // This machine has fast unaligned memory accesses
   if (FLAG_IS_DEFAULT(UseUnalignedAccesses)) {
@@ -314,7 +314,7 @@ void VM_Version::c2_initialize() {
     FLAG_SET_DEFAULT(UseMontgomerySquareIntrinsic, true);
   }
 
-  if (FLAG_IS_DEFAULT(UseMD5Intrinsics)) {
+  if (FLAG_IS_DEFAULT(UseMD5Intrinsics) && !AvoidUnalignedAccesses) {
     FLAG_SET_DEFAULT(UseMD5Intrinsics, true);
   }
 
@@ -365,7 +365,7 @@ void VM_Version::c2_initialize() {
 
   // SHA-1, no RVV required though.
   if (UseSHA) {
-    if (FLAG_IS_DEFAULT(UseSHA1Intrinsics)) {
+    if (FLAG_IS_DEFAULT(UseSHA1Intrinsics) && !AvoidUnalignedAccesses) {
       FLAG_SET_DEFAULT(UseSHA1Intrinsics, true);
     }
   } else if (UseSHA1Intrinsics) {

From b957e5ed1a8b77e01aad1bb574e4914131cdbfa6 Mon Sep 17 00:00:00 2001
From: Harald Eilertsen <haraldei@anduin.net>
Date: Tue, 11 Mar 2025 15:11:10 +0000
Subject: [PATCH 299/587] 8351322: Parameterize link option for pthreads

Reviewed-by: erikj, ihse, dholmes
---
 make/autoconf/libraries.m4                    |   10 +-
 make/autoconf/spec.gmk.template               |    1 +
 make/modules/java.base/Lib.gmk                |    2 +-
 make/modules/java.base/lib/CoreLibraries.gmk  |    2 +-
 .../modules/java.desktop/lib/AwtLibraries.gmk |    2 +-
 .../java.desktop/lib/ClientLibraries.gmk      |    2 +-
 make/modules/jdk.jdwp.agent/Lib.gmk           |    2 +-
 make/modules/jdk.sctp/Lib.gmk                 |    2 +-
 make/test/JtregNativeHotspot.gmk              | 1288 ++++++++---------
 9 files changed, 660 insertions(+), 651 deletions(-)

diff --git a/make/autoconf/libraries.m4 b/make/autoconf/libraries.m4
index b68fef7bbba..70d52d189f4 100644
--- a/make/autoconf/libraries.m4
+++ b/make/autoconf/libraries.m4
@@ -139,7 +139,7 @@ AC_DEFUN_ONCE([LIB_SETUP_LIBRARIES],
 
   # Threading library
   if test "x$OPENJDK_TARGET_OS" = xlinux || test "x$OPENJDK_TARGET_OS" = xaix; then
-    BASIC_JVM_LIBS="$BASIC_JVM_LIBS -lpthread"
+    BASIC_JVM_LIBS="$BASIC_JVM_LIBS $LIBPTHREAD"
   fi
 
   # librt for legacy clock_gettime
@@ -197,6 +197,14 @@ AC_DEFUN_ONCE([LIB_SETUP_MISC_LIBS],
   AC_SUBST(LIBDL)
   LIBS="$save_LIBS"
 
+  # Setup posix pthread support
+  if test "x$OPENJDK_TARGET_OS" != "xwindows"; then
+    LIBPTHREAD="-lpthread"
+  else
+    LIBPTHREAD=""
+  fi
+  AC_SUBST(LIBPTHREAD)
+
   # Control if libzip can use mmap. Available for purposes of overriding.
   LIBZIP_CAN_USE_MMAP=true
   AC_SUBST(LIBZIP_CAN_USE_MMAP)
diff --git a/make/autoconf/spec.gmk.template b/make/autoconf/spec.gmk.template
index 2637285334b..e502f5e281b 100644
--- a/make/autoconf/spec.gmk.template
+++ b/make/autoconf/spec.gmk.template
@@ -144,6 +144,7 @@ endif
 
 LIBM := @LIBM@
 LIBDL := @LIBDL@
+LIBPTHREAD := @LIBPTHREAD@
 
 WINENV_ROOT := @WINENV_ROOT@
 WINENV_PREFIX := @WINENV_PREFIX@
diff --git a/make/modules/java.base/Lib.gmk b/make/modules/java.base/Lib.gmk
index 771b94525aa..63a6b521e15 100644
--- a/make/modules/java.base/Lib.gmk
+++ b/make/modules/java.base/Lib.gmk
@@ -81,7 +81,7 @@ $(eval $(call SetupJdkLibrary, BUILD_LIBNIO, \
     DISABLED_WARNINGS_clang_Net.c := unused-function unused-variable, \
     DISABLED_WARNINGS_clang_UnixNativeDispatcher.c := unused-variable, \
     JDK_LIBS := libjava libnet, \
-    LIBS_linux := $(LIBDL) -lpthread, \
+    LIBS_linux := $(LIBDL) $(LIBPTHREAD), \
     LIBS_aix := $(LIBDL), \
     LIBS_macosx := \
         -framework CoreFoundation \
diff --git a/make/modules/java.base/lib/CoreLibraries.gmk b/make/modules/java.base/lib/CoreLibraries.gmk
index b76394d081f..b35e2e03bb8 100644
--- a/make/modules/java.base/lib/CoreLibraries.gmk
+++ b/make/modules/java.base/lib/CoreLibraries.gmk
@@ -187,7 +187,7 @@ $(eval $(call SetupJdkLibrary, BUILD_LIBJLI, \
         unused-function, \
     DISABLED_WARNINGS_clang_java_md_macosx.m := unused-variable, \
     LIBS_unix := $(LIBZ_LIBS), \
-    LIBS_linux := $(LIBDL) -lpthread, \
+    LIBS_linux := $(LIBDL) $(LIBPTHREAD), \
     LIBS_macosx := \
         -framework ApplicationServices \
         -framework Cocoa \
diff --git a/make/modules/java.desktop/lib/AwtLibraries.gmk b/make/modules/java.desktop/lib/AwtLibraries.gmk
index 4d18038f2aa..23b1e6e9d59 100644
--- a/make/modules/java.desktop/lib/AwtLibraries.gmk
+++ b/make/modules/java.desktop/lib/AwtLibraries.gmk
@@ -285,7 +285,7 @@ ifeq ($(call isTargetOs, windows macosx)+$(ENABLE_HEADLESS_ONLY), false+false)
       JDK_LIBS := libawt java.base:libjava, \
       LIBS_unix := $(LIBDL) $(LIBM) $(X_LIBS) -lX11 -lXext -lXi -lXrender \
           -lXtst, \
-      LIBS_linux := -lpthread, \
+      LIBS_linux := $(LIBPTHREAD), \
       STATIC_LIB_EXCLUDE_OBJS := $(LIBAWT_XAWT_STATIC_EXCLUDE_OBJS), \
   ))
 
diff --git a/make/modules/java.desktop/lib/ClientLibraries.gmk b/make/modules/java.desktop/lib/ClientLibraries.gmk
index 520e108bced..330b914b7e5 100644
--- a/make/modules/java.desktop/lib/ClientLibraries.gmk
+++ b/make/modules/java.desktop/lib/ClientLibraries.gmk
@@ -260,7 +260,7 @@ ifeq ($(ENABLE_HEADLESS_ONLY), false)
       JDK_LIBS_windows := java.base:libjava, \
       JDK_LIBS_macosx := libosxapp, \
       LIBS := $(GIFLIB_LIBS) $(LIBJPEG_LIBS) $(LIBZ_LIBS) $(PNG_LIBS), \
-      LIBS_unix := $(LIBM) -lpthread, \
+      LIBS_unix := $(LIBM) $(LIBPTHREAD), \
       LIBS_linux := $(LIBDL) $(X_LIBS) -lX11 -lXext, \
       LIBS_macosx := -liconv \
           -framework ApplicationServices \
diff --git a/make/modules/jdk.jdwp.agent/Lib.gmk b/make/modules/jdk.jdwp.agent/Lib.gmk
index a1f9a0fca52..b4a8cc622c6 100644
--- a/make/modules/jdk.jdwp.agent/Lib.gmk
+++ b/make/modules/jdk.jdwp.agent/Lib.gmk
@@ -38,7 +38,7 @@ $(eval $(call SetupJdkLibrary, BUILD_LIBDT_SOCKET, \
     EXTRA_HEADER_DIRS := \
         include \
         libjdwp/export, \
-    LIBS_linux := -lpthread, \
+    LIBS_linux := $(LIBPTHREAD), \
     LIBS_windows := iphlpapi.lib ws2_32.lib, \
 ))
 
diff --git a/make/modules/jdk.sctp/Lib.gmk b/make/modules/jdk.sctp/Lib.gmk
index 2017805f52d..327f4fa6104 100644
--- a/make/modules/jdk.sctp/Lib.gmk
+++ b/make/modules/jdk.sctp/Lib.gmk
@@ -41,7 +41,7 @@ ifeq ($(call isTargetOs, linux), true)
           java.base:libnio \
           java.base:libnio/ch, \
       JDK_LIBS := java.base:libjava java.base:libnet, \
-      LIBS_linux := $(LIBDL) -lpthread, \
+      LIBS_linux := $(LIBDL) $(LIBPTHREAD), \
   ))
 
   TARGETS += $(BUILD_LIBSCTP)
diff --git a/make/test/JtregNativeHotspot.gmk b/make/test/JtregNativeHotspot.gmk
index 31d2c522387..e560ad6af70 100644
--- a/make/test/JtregNativeHotspot.gmk
+++ b/make/test/JtregNativeHotspot.gmk
@@ -852,14 +852,14 @@ BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libVirtualMachine09agent00 := $(NSK_AOD_INC
 ifeq ($(call isTargetOs, linux), true)
   BUILD_HOTSPOT_JTREG_LIBRARIES_LDFLAGS_libtest-rw := -z noexecstack
   BUILD_HOTSPOT_JTREG_LIBRARIES_LDFLAGS_libtest-rwx := -z execstack
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libstepBreakPopReturn := -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libIndyRedefineClass := -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libredefineClasses := -lpthread
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libstepBreakPopReturn := $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libIndyRedefineClass := $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libredefineClasses := $(LIBPTHREAD)
   BUILD_HOTSPOT_JTREG_EXECUTABLES_JDK_LIBS_exeinvoke := java.base:libjvm
   BUILD_HOTSPOT_JTREG_EXECUTABLES_JDK_LIBS_exestack-gap := java.base:libjvm
   BUILD_HOTSPOT_JTREG_EXECUTABLES_JDK_LIBS_exestack-tls := java.base:libjvm
-  BUILD_HOTSPOT_JTREG_EXECUTABLES_LIBS_exeinvoke := -lpthread
-  BUILD_HOTSPOT_JTREG_EXECUTABLES_LIBS_exestack-gap := -lpthread
+  BUILD_HOTSPOT_JTREG_EXECUTABLES_LIBS_exeinvoke := $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_EXECUTABLES_LIBS_exestack-gap := $(LIBPTHREAD)
   BUILD_TEST_exeinvoke_exeinvoke.c_OPTIMIZATION := NONE
   BUILD_HOTSPOT_JTREG_EXECUTABLES_LIBS_exeFPRegs := -ldl
   BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libatExit += -ldl
@@ -883,645 +883,645 @@ ifeq ($(call isTargetOs, windows), true)
   BUILD_HOTSPOT_JTREG_EXCLUDE += exesigtest.c libterminatedThread.c libTestJNI.c libCompleteExit.c libMonitorWithDeadObjectTest.c libTestPsig.c exeGetCreatedJavaVMs.c libTestUnloadedClass.cpp
   BUILD_HOTSPOT_JTREG_LIBRARIES_JDK_LIBS_libnativeStack := java.base:libjvm
 else
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libbootclssearch_agent += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libsystemclssearch_agent += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libgetsysprop001 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libgetsysprop002 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libgetlocal001 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libgetlocal002 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libGetEnv001 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libgetvern001 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libgetfldecl002 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libgetfldecl004 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libgetfldecl001 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libloadedclss001 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libloadedclss002 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libextevents001 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libdatadumpreq001 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libtimerinfo001 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libthrstat002 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libthrstat005 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libthrstat004 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libthrstat003 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libthrstat001 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libframecnt001 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libframecnt002 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libframecnt003 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libcontmon003 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libcontmon002 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libcontmon001 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libthrtimerinfo001 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libsetenvstor001 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libsetenvstor002 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libsetenvstor003 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libframeloc002 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libframeloc003 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libframeloc001 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libredefclass009 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libredefclass031 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libredefclass001 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libredefclass006 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libredefclass030 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libredefclass008 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libredefclass015 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libredefclass012 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libredefclass024 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libredefclass023 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libredefclass022 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libredefclass025 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libredefclass013 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libredefclass014 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libstressRedefine += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libredefclass003 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libredefclass004 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libredefclass005 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libredefclass002 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libredefclass011 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libredefclass029 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libredefclass016 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libredefclass020 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libredefclass018 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libredefclass027 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libredefclass019 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libredefclass026 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libredefclass021 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libredefclass028 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libredefclass017 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libredefclass010 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libgetjlocfmt002 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libgetjlocfmt001 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libgetlocal003 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libgetlocal004 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libgetallstktr001 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libgetcpool001 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libextmech += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libagentthr += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libheapref += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_librefignore += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libIsSyntheticIssynth001 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_liblinetab004 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libgc += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_librawmonitor += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libfollowref002 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libfollowref005 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libfollowref004 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libfollowref003 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libfollowref006 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libfollowref001 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libclsldrclss00x += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libearlyretvoid += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libearlyretlong += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libearlyretint += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libearlyretbase += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libearlyretstr += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libearlyretobj += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libearlyretfp += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libgetavailproc001 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libgetclstat006 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libgetclstat007 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libgetclstat005 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libthrinfo002 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libthrinfo001 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libsetthrdstor002 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libsetthrdstor003 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libsetthrdstor001 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libobjsize001 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libaddcaps001 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libaddcaps002 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libaddcaps003 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libgetclmthd007 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libgetclmthd006 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libgetclmthd005 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libfieldacc003 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libfieldacc004 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libfieldacc002 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libfieldacc001 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libgetsrcfn006 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libgetsrcfn005 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libgetsrcfn004 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libgetthrdstor001 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libintrpthrd001 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libintrpthrd002 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libintrpthrd003 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libnativemethbind002 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libnativemethbind004 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libnativemethbind003 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libnativemethbind001 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libgetenvstor001 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libsetextevent001 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libgetpotcaps001 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libiterobjreachobj001 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libiterobjreachobj002 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libiterobjreachobj005 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libiterobjreachobj004 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libiterobjreachobj003 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libclrfldw002 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libclrfldw001 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libvminit001 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libsuspendthrd001 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libsuspendthrd002 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libsuspendthrd003 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libsuspendvthr001 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libdeclcls002 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libdeclcls003 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libdeclcls001 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libsetjniftab002 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libsetjniftab001 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libgeterrname002 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libgeterrname001 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libsettag001 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libstopthrd007 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libstopthrd006 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libgenevents001 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libgetfldmdf004 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libgetfldmdf003 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libresumethrdlst001 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libresumethrdlst002 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libsetbrk008 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libsetbrk007 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libsetbrk005 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libsetbrk002 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libsetbrk003 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libsuspendthrdlst001 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libsuspendthrdlst002 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libIsMethodSyntheticIssynth001 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libissynth002 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libagentonunload001 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libsetsysprop002 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libsetsysprop003 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libMethodBind += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libOnUnload += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libStackTrace += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libredefineCFLH += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libAddToBootstrapClassLoaderSearch += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libDispose += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libenvironment += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libnosuspendMonitorInfo += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libnosuspendStackTrace += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libsetNullVMInit += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libtimers += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libHeap += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libHotSwap += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libattach046Agent00 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libattach041Agent00 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libattach015Agent01 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libattach015Agent00 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libattach015Target += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libattach012Agent00 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libattach040Agent00 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libattach014Agent00 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libattach022Agent00 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libattach038Agent00 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libattach009Agent00 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libsimpleAgent00 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libattach037Agent00 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libattach008Agent00 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libattach039Agent00 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libattach020Agent00 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libattach042Agent00 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libattach045Agent00 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libattach045Agent03 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libattach045Agent02 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libattach045Agent01 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libattach002aAgent00 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libattach021Agent00 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libattach050Agent00 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libattach002Agent00 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libgettag001 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libnframepop001 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libnframepop003 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libnframepop002 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libvmobjalloc001 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libobjwithtags001 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_librawmnntfy004 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_librawmnntfy003 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_librawmnntfy002 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_librawmnntfy001 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libmethmod001 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libmethmod002 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libmentry002 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libmentry001 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libiterheap004 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libiterheap003 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libiterheap002 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libiterheap005 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libiterheap007 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libiterheap006 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libiterheap001 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libpopframe005 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libpopframe002 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libpopframe003 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libpopframe004 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libpopframe010 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libpopframe011 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libpopframe001 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libpopframe006 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libpopframe008 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libpopframe009 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libpopframe007 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libcurthrtimerinfo001 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_librawmnwait004 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_librawmnwait003 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_librawmnwait002 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_librawmnwait005 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_librawmnwait001 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libsetfldw001 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libsetfldw006 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libsetfldw003 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libsetfldw004 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libsetfldw005 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libsetfldw002 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libclrfmodw001 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libclrfmodw002 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libisnative002 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libisnative001 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libiterreachobj002 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libiterreachobj005 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libiterreachobj004 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libiterreachobj003 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libiterreachobj001 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_liballthr001 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_liballthr002 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libobjhashcode001 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libdyncodgen001 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libsetnotif001 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libmexit001 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libmexit002 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libmethloc002 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libmethloc001 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libbreakpoint001 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libgetcaps001 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libgetcaps002 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libclsldrclss001 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libclsldrclss002 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_liblinetab001 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_liblinetab003 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_liblinetab002 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libmaxloc001 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libmaxloc002 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libclassfloadhk002 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libclassfloadhk005 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libclassfloadhk004 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libclassfloadhk003 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libclassfloadhk008 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libclassfloadhk006 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libclassfloadhk001 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libclassfloadhk007 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libclassfloadhk009 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libgetintrf006 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libgetintrf007 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libgetintrf005 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libexcatch001 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libresumethrd002 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libresumethrd001 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libobjfree001 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libobjfree002 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libfieldmod002 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libfieldmod001 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libextfuncs001 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libSetNativeMethodPrefix002Main += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libSetNativeMethodPrefix002 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libSetNativeMethodPrefix001 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libclassprep001 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libsetvrbflag002 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libsetvrbflag001 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libmcontentered001 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libsetevntcallb001 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libsetevntcallb002 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libsetevntcallb003 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_librawmnntfyall002 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_librawmnntfyall004 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_librawmnntfyall003 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_librawmnntfyall001 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libgcfinish001 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libownmoninf002 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libownmoninf003 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libownmoninf001 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libgetfldnm003 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libgetfldnm004 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libgetfldnm005 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libgf08t001 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libgf08t002 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libgf08t003 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libgf01t001 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libgf06t001 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libgf04t001 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libbi02t002 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libbi02t001 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libbi03t002 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libbi03t001 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libbi04t002 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libbi01t002 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libbi01t001 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libex03t001 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libcm02t001 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libcm03t001 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libcm01t013 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libcm01t014 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libcm01t015 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libcm01t012 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libcm01t001 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libcm01t006 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libcm01t008 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libcm01t009 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libcm01t007 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libcm01t019 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libcm01t021 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libcm01t017 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libcm01t010 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libcm01t011 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libcm01t016 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libcm01t020 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libcm01t018 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libcm01t005 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libcm01t002 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libcm01t003 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libcm01t004 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libsp02t001 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libsp02t003 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libsp02t002 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libsp05t003 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libsp05t002 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libsp04t001 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libsp04t002 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libsp03t001 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libsp03t002 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libsp06t001 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libsp06t002 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libsp06t003 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libsp01t001 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libsp01t002 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libsp01t003 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libsp07t001 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libsp07t002 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libtc04t001 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libtc03t001 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libtc03t002 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libtc02t001 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libtc05t001 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libtc01t001 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libma08t001a += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libma08t001 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libma01t001 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libma01t001a += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libma06t001a += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libma06t001 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libma07t001a += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libma07t001 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libma05t001a += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libma05t001 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libma02t001a += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libma02t001 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libma03t001 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libma03t001a += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libma04t003a += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libma04t003 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libma04t002a += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libma04t002 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libma04t001a += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libma04t001 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libma10t003a += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libma10t003 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libma10t004a += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libma10t004 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libma10t005 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libma10t005a += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libma10t002 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libma10t002a += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libma10t007 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libma10t007a += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libma10t008 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libma10t008a += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libma10t001 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libma10t001a += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libma10t006 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libma10t006a += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libhs103t002 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libhs104t002 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libhs104t001 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libhs301t002 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libhs301t005 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libhs301t004 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libhs301t003 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libhs301t001 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libhs203t002 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libhs203t004 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libhs203t003 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libhs203t001 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libhs204t002 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libhs204t003 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libhs204t004 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libhs204t001 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libhs202t002 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libhs202t001 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_build += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libhs302t004 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libhs302t003 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libhs302t002 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libhs302t005 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libhs302t011 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libhs302t010 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libhs302t007 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libhs302t009 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libhs302t008 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libhs302t006 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libhs302t001 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libhs302t012 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libhs201t003 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libhs201t002 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libhs201t001 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libem06t001 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libem01t001 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libem01t002 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libem07t001 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libem07t002 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libem02t006 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libem02t001 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libem02t008 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libem02t009 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libem02t007 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libem02t012 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libem02t002 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libem02t005 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libem02t004 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libem02t003 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libem02t010 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libem02t011 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libem05t001 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libem05t002 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libem04t001 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libji01t001 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libji06t001 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libji03t003 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libji03t004 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libji03t002 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libji03t001 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libji05t001 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libap10t001 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libap11t001 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libap02t001 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libap05t001 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libap05t002 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libap04t001 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libap04t002 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libap04t003 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libap03t001 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libap12t001 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libap06t001 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libap01t001 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libap09t001 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libap07t001 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libap07t002 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libthreadstart001 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libthreadstart003 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libthreadstart002 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_librawmonenter002 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_librawmonenter003 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_librawmonenter004 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_librawmonenter001 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libdealloc001 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libexceptionjni001 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libisfldsin003 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libisfldsin002 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libthrgrpinfo001 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libthrgrpinfo002 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libAbort += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libCallbacks += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libNonConcreteKlassFilter += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libConcreteKlassFilter += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libHeapFilter += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libmcontenter001 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libclrbrk001 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libclrbrk002 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libclrbrk005 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libtopthrgrp002 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libtopthrgrp001 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libisarray004 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libisarray005 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libbytecodes003 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libbytecodes002 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libbytecodes001 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libthreadend001 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libthreadend002 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libgetthrdgrpchld001 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libmonitorwait001 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_liballoc001 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libsrcdebugex003 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libsrcdebugex002 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libsrcdebugex001 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libcrrawmon002 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libcrrawmon001 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libgetjniftab001 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libgetjniftab002 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libgetclsldr003 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libgetclsldr002 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libgetclsldr001 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libcurthrcputime001 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_librawmonexit001 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_librawmonexit002 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_librawmonexit005 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_librawmonexit003 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libisobsolete001 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libargsize001 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libargsize002 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libgetclfld007 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libgetclfld006 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libgetclfld005 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libgetstacktr006 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libgetstacktr001 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libgetstacktr008 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libgetstacktr009 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libgetstacktr007 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libgetstacktr002 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libgetstacktr005 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libgetstacktr004 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libgetstacktr003 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_liblocaltab001 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_liblocaltab004 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_liblocaltab003 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_liblocaltab002 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_liblocaltab005 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libclassload001 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libisintrf004 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libisintrf005 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libframepop001 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libframepop002 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libgetclsig005 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libgetclsig004 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libgetclsig006 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libdisposeenv002 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libdisposeenv001 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libexception001 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libresexhausted += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libgcstart001 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libgcstart002 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libiterinstcls005 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libiterinstcls002 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libiterinstcls003 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libiterinstcls004 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libiterinstcls001 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libiterinstcls006 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libiterinstcls007 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libmethname002 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libmethname003 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libmethname001 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libforcegc001 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libforcegc002 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libgettime001 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libobjmonusage004 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libobjmonusage003 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libobjmonusage002 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libobjmonusage005 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libobjmonusage006 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libobjmonusage001 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libagentonload001 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libagentonload002 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libagentonload003 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libthrcputime002 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libthrcputime001 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libmonitorwaited001 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libForceEarlyReturn001 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libagentthr003 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libagentthr002 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libagentthr001 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libcompmethunload001 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libretransform002 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libretransform004 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libretransform003 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libgetclmdf007 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libgetclmdf006 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libgetclmdf004 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libgetclmdf005 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libsetlocal001 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libsetlocal004 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libsetlocal003 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libsetlocal002 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libcompmethload001 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libgetsysprops001 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libgetsysprops002 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libdrrawmon003 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libdrrawmon004 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libdrrawmon001 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libsinglestep001 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libsinglestep003 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libsinglestep002 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_librelcaps001 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_librelcaps002 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libsetfmodw004 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libsetfmodw003 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libsetfmodw002 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libsetfmodw005 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libsetfmodw006 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libsetfmodw001 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libvmdeath001 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libgetphase001 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libgetphase002 += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libterminatedThread += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libCompleteExit += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libMonitorWithDeadObjectTest += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libnativeStack += -lpthread
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libTestUnloadedClass += -lpthread
-  BUILD_HOTSPOT_JTREG_EXECUTABLES_LIBS_exeGetCreatedJavaVMs := -lpthread
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libbootclssearch_agent += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libsystemclssearch_agent += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libgetsysprop001 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libgetsysprop002 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libgetlocal001 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libgetlocal002 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libGetEnv001 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libgetvern001 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libgetfldecl002 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libgetfldecl004 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libgetfldecl001 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libloadedclss001 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libloadedclss002 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libextevents001 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libdatadumpreq001 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libtimerinfo001 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libthrstat002 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libthrstat005 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libthrstat004 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libthrstat003 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libthrstat001 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libframecnt001 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libframecnt002 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libframecnt003 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libcontmon003 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libcontmon002 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libcontmon001 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libthrtimerinfo001 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libsetenvstor001 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libsetenvstor002 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libsetenvstor003 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libframeloc002 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libframeloc003 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libframeloc001 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libredefclass009 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libredefclass031 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libredefclass001 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libredefclass006 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libredefclass030 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libredefclass008 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libredefclass015 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libredefclass012 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libredefclass024 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libredefclass023 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libredefclass022 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libredefclass025 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libredefclass013 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libredefclass014 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libstressRedefine += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libredefclass003 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libredefclass004 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libredefclass005 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libredefclass002 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libredefclass011 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libredefclass029 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libredefclass016 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libredefclass020 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libredefclass018 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libredefclass027 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libredefclass019 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libredefclass026 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libredefclass021 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libredefclass028 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libredefclass017 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libredefclass010 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libgetjlocfmt002 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libgetjlocfmt001 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libgetlocal003 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libgetlocal004 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libgetallstktr001 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libgetcpool001 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libextmech += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libagentthr += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libheapref += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_librefignore += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libIsSyntheticIssynth001 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_liblinetab004 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libgc += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_librawmonitor += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libfollowref002 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libfollowref005 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libfollowref004 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libfollowref003 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libfollowref006 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libfollowref001 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libclsldrclss00x += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libearlyretvoid += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libearlyretlong += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libearlyretint += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libearlyretbase += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libearlyretstr += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libearlyretobj += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libearlyretfp += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libgetavailproc001 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libgetclstat006 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libgetclstat007 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libgetclstat005 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libthrinfo002 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libthrinfo001 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libsetthrdstor002 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libsetthrdstor003 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libsetthrdstor001 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libobjsize001 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libaddcaps001 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libaddcaps002 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libaddcaps003 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libgetclmthd007 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libgetclmthd006 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libgetclmthd005 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libfieldacc003 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libfieldacc004 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libfieldacc002 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libfieldacc001 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libgetsrcfn006 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libgetsrcfn005 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libgetsrcfn004 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libgetthrdstor001 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libintrpthrd001 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libintrpthrd002 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libintrpthrd003 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libnativemethbind002 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libnativemethbind004 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libnativemethbind003 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libnativemethbind001 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libgetenvstor001 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libsetextevent001 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libgetpotcaps001 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libiterobjreachobj001 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libiterobjreachobj002 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libiterobjreachobj005 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libiterobjreachobj004 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libiterobjreachobj003 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libclrfldw002 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libclrfldw001 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libvminit001 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libsuspendthrd001 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libsuspendthrd002 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libsuspendthrd003 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libsuspendvthr001 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libdeclcls002 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libdeclcls003 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libdeclcls001 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libsetjniftab002 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libsetjniftab001 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libgeterrname002 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libgeterrname001 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libsettag001 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libstopthrd007 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libstopthrd006 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libgenevents001 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libgetfldmdf004 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libgetfldmdf003 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libresumethrdlst001 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libresumethrdlst002 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libsetbrk008 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libsetbrk007 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libsetbrk005 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libsetbrk002 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libsetbrk003 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libsuspendthrdlst001 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libsuspendthrdlst002 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libIsMethodSyntheticIssynth001 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libissynth002 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libagentonunload001 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libsetsysprop002 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libsetsysprop003 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libMethodBind += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libOnUnload += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libStackTrace += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libredefineCFLH += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libAddToBootstrapClassLoaderSearch += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libDispose += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libenvironment += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libnosuspendMonitorInfo += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libnosuspendStackTrace += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libsetNullVMInit += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libtimers += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libHeap += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libHotSwap += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libattach046Agent00 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libattach041Agent00 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libattach015Agent01 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libattach015Agent00 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libattach015Target += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libattach012Agent00 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libattach040Agent00 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libattach014Agent00 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libattach022Agent00 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libattach038Agent00 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libattach009Agent00 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libsimpleAgent00 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libattach037Agent00 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libattach008Agent00 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libattach039Agent00 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libattach020Agent00 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libattach042Agent00 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libattach045Agent00 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libattach045Agent03 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libattach045Agent02 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libattach045Agent01 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libattach002aAgent00 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libattach021Agent00 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libattach050Agent00 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libattach002Agent00 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libgettag001 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libnframepop001 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libnframepop003 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libnframepop002 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libvmobjalloc001 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libobjwithtags001 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_librawmnntfy004 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_librawmnntfy003 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_librawmnntfy002 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_librawmnntfy001 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libmethmod001 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libmethmod002 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libmentry002 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libmentry001 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libiterheap004 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libiterheap003 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libiterheap002 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libiterheap005 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libiterheap007 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libiterheap006 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libiterheap001 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libpopframe005 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libpopframe002 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libpopframe003 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libpopframe004 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libpopframe010 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libpopframe011 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libpopframe001 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libpopframe006 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libpopframe008 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libpopframe009 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libpopframe007 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libcurthrtimerinfo001 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_librawmnwait004 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_librawmnwait003 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_librawmnwait002 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_librawmnwait005 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_librawmnwait001 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libsetfldw001 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libsetfldw006 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libsetfldw003 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libsetfldw004 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libsetfldw005 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libsetfldw002 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libclrfmodw001 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libclrfmodw002 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libisnative002 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libisnative001 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libiterreachobj002 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libiterreachobj005 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libiterreachobj004 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libiterreachobj003 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libiterreachobj001 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_liballthr001 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_liballthr002 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libobjhashcode001 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libdyncodgen001 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libsetnotif001 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libmexit001 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libmexit002 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libmethloc002 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libmethloc001 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libbreakpoint001 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libgetcaps001 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libgetcaps002 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libclsldrclss001 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libclsldrclss002 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_liblinetab001 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_liblinetab003 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_liblinetab002 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libmaxloc001 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libmaxloc002 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libclassfloadhk002 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libclassfloadhk005 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libclassfloadhk004 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libclassfloadhk003 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libclassfloadhk008 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libclassfloadhk006 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libclassfloadhk001 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libclassfloadhk007 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libclassfloadhk009 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libgetintrf006 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libgetintrf007 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libgetintrf005 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libexcatch001 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libresumethrd002 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libresumethrd001 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libobjfree001 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libobjfree002 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libfieldmod002 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libfieldmod001 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libextfuncs001 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libSetNativeMethodPrefix002Main += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libSetNativeMethodPrefix002 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libSetNativeMethodPrefix001 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libclassprep001 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libsetvrbflag002 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libsetvrbflag001 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libmcontentered001 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libsetevntcallb001 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libsetevntcallb002 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libsetevntcallb003 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_librawmnntfyall002 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_librawmnntfyall004 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_librawmnntfyall003 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_librawmnntfyall001 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libgcfinish001 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libownmoninf002 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libownmoninf003 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libownmoninf001 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libgetfldnm003 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libgetfldnm004 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libgetfldnm005 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libgf08t001 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libgf08t002 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libgf08t003 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libgf01t001 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libgf06t001 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libgf04t001 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libbi02t002 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libbi02t001 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libbi03t002 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libbi03t001 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libbi04t002 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libbi01t002 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libbi01t001 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libex03t001 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libcm02t001 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libcm03t001 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libcm01t013 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libcm01t014 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libcm01t015 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libcm01t012 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libcm01t001 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libcm01t006 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libcm01t008 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libcm01t009 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libcm01t007 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libcm01t019 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libcm01t021 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libcm01t017 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libcm01t010 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libcm01t011 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libcm01t016 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libcm01t020 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libcm01t018 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libcm01t005 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libcm01t002 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libcm01t003 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libcm01t004 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libsp02t001 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libsp02t003 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libsp02t002 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libsp05t003 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libsp05t002 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libsp04t001 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libsp04t002 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libsp03t001 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libsp03t002 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libsp06t001 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libsp06t002 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libsp06t003 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libsp01t001 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libsp01t002 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libsp01t003 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libsp07t001 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libsp07t002 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libtc04t001 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libtc03t001 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libtc03t002 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libtc02t001 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libtc05t001 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libtc01t001 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libma08t001a += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libma08t001 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libma01t001 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libma01t001a += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libma06t001a += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libma06t001 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libma07t001a += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libma07t001 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libma05t001a += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libma05t001 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libma02t001a += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libma02t001 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libma03t001 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libma03t001a += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libma04t003a += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libma04t003 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libma04t002a += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libma04t002 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libma04t001a += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libma04t001 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libma10t003a += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libma10t003 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libma10t004a += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libma10t004 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libma10t005 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libma10t005a += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libma10t002 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libma10t002a += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libma10t007 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libma10t007a += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libma10t008 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libma10t008a += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libma10t001 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libma10t001a += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libma10t006 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libma10t006a += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libhs103t002 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libhs104t002 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libhs104t001 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libhs301t002 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libhs301t005 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libhs301t004 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libhs301t003 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libhs301t001 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libhs203t002 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libhs203t004 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libhs203t003 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libhs203t001 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libhs204t002 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libhs204t003 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libhs204t004 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libhs204t001 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libhs202t002 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libhs202t001 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_build += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libhs302t004 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libhs302t003 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libhs302t002 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libhs302t005 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libhs302t011 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libhs302t010 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libhs302t007 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libhs302t009 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libhs302t008 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libhs302t006 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libhs302t001 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libhs302t012 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libhs201t003 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libhs201t002 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libhs201t001 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libem06t001 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libem01t001 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libem01t002 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libem07t001 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libem07t002 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libem02t006 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libem02t001 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libem02t008 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libem02t009 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libem02t007 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libem02t012 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libem02t002 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libem02t005 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libem02t004 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libem02t003 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libem02t010 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libem02t011 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libem05t001 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libem05t002 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libem04t001 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libji01t001 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libji06t001 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libji03t003 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libji03t004 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libji03t002 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libji03t001 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libji05t001 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libap10t001 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libap11t001 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libap02t001 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libap05t001 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libap05t002 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libap04t001 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libap04t002 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libap04t003 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libap03t001 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libap12t001 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libap06t001 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libap01t001 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libap09t001 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libap07t001 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libap07t002 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libthreadstart001 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libthreadstart003 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libthreadstart002 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_librawmonenter002 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_librawmonenter003 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_librawmonenter004 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_librawmonenter001 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libdealloc001 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libexceptionjni001 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libisfldsin003 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libisfldsin002 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libthrgrpinfo001 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libthrgrpinfo002 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libAbort += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libCallbacks += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libNonConcreteKlassFilter += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libConcreteKlassFilter += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libHeapFilter += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libmcontenter001 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libclrbrk001 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libclrbrk002 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libclrbrk005 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libtopthrgrp002 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libtopthrgrp001 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libisarray004 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libisarray005 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libbytecodes003 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libbytecodes002 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libbytecodes001 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libthreadend001 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libthreadend002 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libgetthrdgrpchld001 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libmonitorwait001 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_liballoc001 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libsrcdebugex003 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libsrcdebugex002 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libsrcdebugex001 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libcrrawmon002 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libcrrawmon001 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libgetjniftab001 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libgetjniftab002 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libgetclsldr003 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libgetclsldr002 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libgetclsldr001 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libcurthrcputime001 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_librawmonexit001 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_librawmonexit002 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_librawmonexit005 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_librawmonexit003 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libisobsolete001 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libargsize001 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libargsize002 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libgetclfld007 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libgetclfld006 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libgetclfld005 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libgetstacktr006 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libgetstacktr001 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libgetstacktr008 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libgetstacktr009 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libgetstacktr007 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libgetstacktr002 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libgetstacktr005 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libgetstacktr004 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libgetstacktr003 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_liblocaltab001 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_liblocaltab004 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_liblocaltab003 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_liblocaltab002 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_liblocaltab005 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libclassload001 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libisintrf004 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libisintrf005 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libframepop001 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libframepop002 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libgetclsig005 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libgetclsig004 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libgetclsig006 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libdisposeenv002 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libdisposeenv001 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libexception001 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libresexhausted += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libgcstart001 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libgcstart002 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libiterinstcls005 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libiterinstcls002 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libiterinstcls003 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libiterinstcls004 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libiterinstcls001 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libiterinstcls006 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libiterinstcls007 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libmethname002 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libmethname003 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libmethname001 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libforcegc001 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libforcegc002 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libgettime001 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libobjmonusage004 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libobjmonusage003 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libobjmonusage002 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libobjmonusage005 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libobjmonusage006 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libobjmonusage001 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libagentonload001 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libagentonload002 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libagentonload003 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libthrcputime002 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libthrcputime001 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libmonitorwaited001 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libForceEarlyReturn001 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libagentthr003 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libagentthr002 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libagentthr001 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libcompmethunload001 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libretransform002 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libretransform004 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libretransform003 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libgetclmdf007 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libgetclmdf006 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libgetclmdf004 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libgetclmdf005 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libsetlocal001 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libsetlocal004 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libsetlocal003 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libsetlocal002 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libcompmethload001 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libgetsysprops001 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libgetsysprops002 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libdrrawmon003 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libdrrawmon004 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libdrrawmon001 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libsinglestep001 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libsinglestep003 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libsinglestep002 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_librelcaps001 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_librelcaps002 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libsetfmodw004 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libsetfmodw003 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libsetfmodw002 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libsetfmodw005 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libsetfmodw006 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libsetfmodw001 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libvmdeath001 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libgetphase001 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libgetphase002 += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libterminatedThread += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libCompleteExit += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libMonitorWithDeadObjectTest += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libnativeStack += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libTestUnloadedClass += $(LIBPTHREAD)
+  BUILD_HOTSPOT_JTREG_EXECUTABLES_LIBS_exeGetCreatedJavaVMs := $(LIBPTHREAD)
   BUILD_HOTSPOT_JTREG_EXECUTABLES_JDK_LIBS_exeGetCreatedJavaVMs := java.base:libjvm
 
   BUILD_HOTSPOT_JTREG_EXCLUDE += libNativeException.c exeGetProcessorInfo.c

From 0ad9a104e2fed2dd80494cec22e9d9332d37821b Mon Sep 17 00:00:00 2001
From: Aleksey Shipilev <shade@openjdk.org>
Date: Tue, 11 Mar 2025 15:27:36 +0000
Subject: [PATCH 300/587] 8351146: JFR: JavaMonitorInflate event should default
 to no threshold and be disabled

Reviewed-by: coleenp, egahlin
---
 src/jdk.jfr/share/conf/jfr/default.jfc | 2 +-
 src/jdk.jfr/share/conf/jfr/profile.jfc | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/jdk.jfr/share/conf/jfr/default.jfc b/src/jdk.jfr/share/conf/jfr/default.jfc
index 231ecc494a9..c9bdb0828a6 100644
--- a/src/jdk.jfr/share/conf/jfr/default.jfc
+++ b/src/jdk.jfr/share/conf/jfr/default.jfc
@@ -98,7 +98,7 @@
     <event name="jdk.JavaMonitorInflate">
       <setting name="enabled">false</setting>
       <setting name="stackTrace">true</setting>
-      <setting name="threshold" control="locking-threshold">20 ms</setting>
+      <setting name="threshold">0 ms</setting>
     </event>
 
     <event name="jdk.SyncOnValueBasedClass">
diff --git a/src/jdk.jfr/share/conf/jfr/profile.jfc b/src/jdk.jfr/share/conf/jfr/profile.jfc
index e7996689354..44b11e4d150 100644
--- a/src/jdk.jfr/share/conf/jfr/profile.jfc
+++ b/src/jdk.jfr/share/conf/jfr/profile.jfc
@@ -96,9 +96,9 @@
     </event>
 
     <event name="jdk.JavaMonitorInflate">
-      <setting name="enabled">true</setting>
+      <setting name="enabled">false</setting>
       <setting name="stackTrace">true</setting>
-      <setting name="threshold" control="locking-threshold">10 ms</setting>
+      <setting name="threshold">0 ms</setting>
     </event>
 
     <event name="jdk.SyncOnValueBasedClass">

From 030c85de1376123615e804f98084cb3723205819 Mon Sep 17 00:00:00 2001
From: Richard Reingruber <rrich@openjdk.org>
Date: Tue, 11 Mar 2025 15:54:49 +0000
Subject: [PATCH 301/587] 8350106: [PPC] Avoid ticks_unknown_not_Java
 AsyncGetCallTrace() if JavaFrameAnchor::_last_Java_pc not set

Reviewed-by: mdoerr
---
 .../os_cpu/aix_ppc/javaThread_aix_ppc.cpp       | 17 +++++++++++++----
 .../os_cpu/linux_ppc/javaThread_linux_ppc.cpp   | 16 ++++++++++++----
 2 files changed, 25 insertions(+), 8 deletions(-)

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

From da2b4f0749dffc99fa42c7311fbc74231af273bd Mon Sep 17 00:00:00 2001
From: Mikael Vidstedt <mikael@openjdk.org>
Date: Tue, 11 Mar 2025 16:02:25 +0000
Subject: [PATCH 302/587] 8351606: Use build_platform for graphviz dependency

Reviewed-by: erikj
---
 make/conf/jib-profiles.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/make/conf/jib-profiles.js b/make/conf/jib-profiles.js
index 41da3833293..53da00d8730 100644
--- a/make/conf/jib-profiles.js
+++ b/make/conf/jib-profiles.js
@@ -1237,7 +1237,7 @@ var getJibProfilesDependencies = function (input, common) {
             organization: common.organization,
             ext: "tar.gz",
             revision: "9.0.0+1.0",
-            module: "graphviz-" + input.target_platform,
+            module: "graphviz-" + input.build_platform,
             configure_args: "DOT=" + input.get("graphviz", "install_path") + "/dot",
             environment_path: input.get("graphviz", "install_path")
         },

From cef369317570f95ac70aac6ceea88a0042ca2b45 Mon Sep 17 00:00:00 2001
From: Aleksey Shipilev <shade@openjdk.org>
Date: Tue, 11 Mar 2025 19:38:29 +0000
Subject: [PATCH 303/587] 8351656: Problemlist
 gc/TestAllocHumongousFragment#generational

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

diff --git a/test/hotspot/jtreg/ProblemList.txt b/test/hotspot/jtreg/ProblemList.txt
index 856a5381f90..8f3366d16e7 100644
--- a/test/hotspot/jtreg/ProblemList.txt
+++ b/test/hotspot/jtreg/ProblemList.txt
@@ -97,6 +97,7 @@ gc/TestAlwaysPreTouchBehavior.java#Z 8334513 generic-all
 gc/TestAlwaysPreTouchBehavior.java#Epsilon 8334513 generic-all
 gc/shenandoah/oom/TestAllocOutOfMemory.java#large 8344312 linux-ppc64le
 gc/shenandoah/TestEvilSyncBug.java#generational 8345501 generic-all
+gc/TestAllocHumongousFragment.java#generational 8351464 generic-all
 
 #############################################################################
 

From e71f3274a9de4006bc8cdfe4ba1bd12a8867a11a Mon Sep 17 00:00:00 2001
From: Chen Liang <liach@openjdk.org>
Date: Tue, 11 Mar 2025 19:51:47 +0000
Subject: [PATCH 304/587] 8351045: ClassValue::remove cannot ensure computation
 observes up-to-date state

Reviewed-by: rriggs, jrose
---
 .../share/classes/java/lang/ClassValue.java   | 20 ++---
 test/jdk/java/lang/invoke/ClassValueTest.java | 78 ++++++++++++++++---
 2 files changed, 78 insertions(+), 20 deletions(-)

diff --git a/src/java.base/share/classes/java/lang/ClassValue.java b/src/java.base/share/classes/java/lang/ClassValue.java
index 612693de0a7..07c5f14b1d0 100644
--- a/src/java.base/share/classes/java/lang/ClassValue.java
+++ b/src/java.base/share/classes/java/lang/ClassValue.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -500,15 +500,15 @@ public abstract class ClassValue<T> {
         synchronized
         void removeEntry(ClassValue<?> classValue) {
             Entry<?> e = remove(classValue.identity);
-            if (e == null) {
-                // Uninitialized, and no pending calls to computeValue.  No change.
-            } else if (e.isPromise()) {
-                // State is uninitialized, with a pending call to finishEntry.
-                // Since remove is a no-op in such a state, keep the promise
-                // by putting it back into the map.
-                put(classValue.identity, e);
-            } else {
-                // In an initialized state.  Bump forward, and de-initialize.
+            // e == null: Uninitialized, and no pending calls to computeValue.
+            // remove(identity) didn't change anything.  No change.
+            // e.isPromise(): computeValue already used outdated values.
+            // remove(identity) discarded the outdated computation promise.
+            // finishEntry will retry when it discovers the promise is removed.
+            // No cache invalidation.  No further action needed.
+            if (e != null && !e.isPromise()) {
+                // Initialized.
+                // Bump forward to invalidate racy-read cached entries.
                 classValue.bumpVersion();
                 // Make all cache elements for this guy go stale.
                 removeStaleEntries(classValue);
diff --git a/test/jdk/java/lang/invoke/ClassValueTest.java b/test/jdk/java/lang/invoke/ClassValueTest.java
index 42a76074f0d..79482f4185d 100644
--- a/test/jdk/java/lang/invoke/ClassValueTest.java
+++ b/test/jdk/java/lang/invoke/ClassValueTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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,22 +21,27 @@
  * questions.
  */
 
-/* @test
+/*
+ * @test
+ * @bug 8351045
  * @summary tests for class-specific values
- * @compile ClassValueTest.java
- * @run testng/othervm test.java.lang.invoke.ClassValueTest
+ * @run junit ClassValueTest
  */
 
-package test.java.lang.invoke;
+import java.util.ArrayList;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.Executors;
+import java.util.concurrent.Future;
+import java.util.concurrent.atomic.AtomicInteger;
 
-import org.testng.*;
-import static org.testng.AssertJUnit.*;
-import org.testng.annotations.*;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 /**
  * @author jrose
  */
-public class ClassValueTest {
+final class ClassValueTest {
     static String nameForCV1(Class<?> type) {
         return "CV1:" + type.getName();
     }
@@ -143,7 +148,7 @@ public class ClassValueTest {
                 }
             }
         }
-        assertEquals(countForCVN, 0);
+        assertEquals(0, countForCVN);
         System.out.println("[rechecking values]");
         for (int i = 0; i < cvns.length * 10; i++) {
             int n = i % cvns.length;
@@ -152,4 +157,57 @@ public class ClassValueTest {
             }
         }
     }
+
+    private static final int RUNS = 16;
+    private static final long COMPUTE_TIME_MILLIS = 100;
+
+    @Test
+    void testRemoveOnComputeCases() {
+        try (var exec = Executors.newVirtualThreadPerTaskExecutor()) {
+            var tasks = new ArrayList<Future<?>>(RUNS);
+            for (int i = 0; i < RUNS; i++) {
+                tasks.add(exec.submit(this::testRemoveOnCompute));
+            }
+            for (var task : tasks) {
+                try {
+                    task.get();
+                } catch (InterruptedException | ExecutionException ex) {
+                    var cause = ex.getCause();
+                    if (cause instanceof AssertionError ae)
+                        throw ae;
+                    throw new RuntimeException(ex);
+                }
+            }
+        }
+    }
+
+    void testRemoveOnCompute() {
+        AtomicInteger input = new AtomicInteger(0);
+        ClassValue<Integer> cv = new ClassValue<>() {
+            @Override
+            protected Integer computeValue(Class<?> type) {
+                // must get early to represent using outdated input
+                int v = input.get();
+                try {
+                    Thread.sleep(COMPUTE_TIME_MILLIS);
+                } catch (InterruptedException ex) {
+                    throw new RuntimeException(ex);
+                }
+                return v;
+            }
+        };
+        var innocuous = Thread.startVirtualThread(() -> cv.get(int.class));
+        var refreshInput = Thread.startVirtualThread(() -> {
+            input.incrementAndGet();
+            cv.remove(int.class); // Let's recompute with updated inputs!
+        });
+        try {
+            innocuous.join();
+            refreshInput.join();
+        } catch (InterruptedException ex) {
+            throw new RuntimeException(ex);
+        }
+        assertEquals(1, input.get(), "input not updated");
+        assertEquals(1, cv.get(int.class), "CV not using up-to-date input");
+    }
 }

From 9a49418138b93bc8ed8879be5c9b9b9c85ef47e1 Mon Sep 17 00:00:00 2001
From: Artur Barashev <abarashev@openjdk.org>
Date: Tue, 11 Mar 2025 20:07:10 +0000
Subject: [PATCH 305/587] 8345940: Migrate security-related resources from Java
 classes to properties files

Reviewed-by: jlu, weijun, erikj
---
 make/modules/java.base/Gensrc.gmk             |  17 +-
 make/modules/jdk.jartool/Gensrc.gmk           |   7 +-
 .../sun/security/tools/keytool/Main.java      |   4 +-
 .../sun/security/tools/keytool/Resources.java | 519 ------------------
 .../security/tools/keytool/Resources_de.java  | 511 -----------------
 .../security/tools/keytool/Resources_es.java  | 484 ----------------
 .../security/tools/keytool/Resources_fr.java  | 484 ----------------
 .../security/tools/keytool/Resources_it.java  | 484 ----------------
 .../security/tools/keytool/Resources_ja.java  | 511 -----------------
 .../security/tools/keytool/Resources_ko.java  | 484 ----------------
 .../tools/keytool/Resources_pt_BR.java        | 484 ----------------
 .../security/tools/keytool/Resources_sv.java  | 484 ----------------
 .../tools/keytool/Resources_zh_CN.java        | 511 -----------------
 .../tools/keytool/Resources_zh_HK.java        | 429 ---------------
 .../tools/keytool/Resources_zh_TW.java        | 484 ----------------
 .../keytool/resources/keytool.properties      | 329 +++++++++++
 .../keytool/resources/keytool_de.properties   | 321 +++++++++++
 .../keytool/resources/keytool_es.properties   | 302 ++++++++++
 .../keytool/resources/keytool_fr.properties   | 302 ++++++++++
 .../keytool/resources/keytool_it.properties   | 302 ++++++++++
 .../keytool/resources/keytool_ja.properties   | 321 +++++++++++
 .../keytool/resources/keytool_ko.properties   | 302 ++++++++++
 .../resources/keytool_pt_BR.properties        | 302 ++++++++++
 .../keytool/resources/keytool_sv.properties   | 302 ++++++++++
 .../resources/keytool_zh_CN.properties        | 321 +++++++++++
 .../resources/keytool_zh_TW.properties        | 302 ++++++++++
 .../sun/security/util/AuthResources.java      | 110 ----
 .../sun/security/util/AuthResources_de.java   | 110 ----
 .../sun/security/util/AuthResources_es.java   | 110 ----
 .../sun/security/util/AuthResources_fr.java   | 110 ----
 .../sun/security/util/AuthResources_it.java   | 110 ----
 .../sun/security/util/AuthResources_ja.java   | 110 ----
 .../sun/security/util/AuthResources_ko.java   | 110 ----
 .../security/util/AuthResources_pt_BR.java    | 110 ----
 .../sun/security/util/AuthResources_sv.java   | 110 ----
 .../security/util/AuthResources_zh_CN.java    | 110 ----
 .../security/util/AuthResources_zh_TW.java    | 110 ----
 .../sun/security/util/LocalizedMessage.java   |  13 +-
 .../classes/sun/security/util/Resources.java  | 119 ----
 .../sun/security/util/ResourcesMgr.java       |   6 +-
 .../sun/security/util/Resources_de.java       | 119 ----
 .../sun/security/util/Resources_es.java       | 171 ------
 .../sun/security/util/Resources_fr.java       | 171 ------
 .../sun/security/util/Resources_it.java       | 171 ------
 .../sun/security/util/Resources_ja.java       | 119 ----
 .../sun/security/util/Resources_ko.java       | 171 ------
 .../sun/security/util/Resources_pt_BR.java    | 171 ------
 .../sun/security/util/Resources_sv.java       | 171 ------
 .../sun/security/util/Resources_zh_CN.java    | 119 ----
 .../sun/security/util/Resources_zh_TW.java    | 171 ------
 .../security/util/resources/auth.properties   |  67 +++
 .../util/resources/auth_de.properties         |  67 +++
 .../util/resources/auth_es.properties         |  67 +++
 .../util/resources/auth_fr.properties         |  67 +++
 .../util/resources/auth_it.properties         |  67 +++
 .../util/resources/auth_ja.properties         |  67 +++
 .../util/resources/auth_ko.properties         |  66 +++
 .../util/resources/auth_pt_BR.properties      |  66 +++
 .../util/resources/auth_sv.properties         |  66 +++
 .../util/resources/auth_zh_CN.properties      |  67 +++
 .../util/resources/auth_zh_TW.properties      |  66 +++
 .../util/resources/security.properties        |  76 +++
 .../util/resources/security_de.properties     |  76 +++
 .../util/resources/security_es.properties     | 110 ++++
 .../util/resources/security_fr.properties     | 110 ++++
 .../util/resources/security_it.properties     | 110 ++++
 .../util/resources/security_ja.properties     |  76 +++
 .../util/resources/security_ko.properties     | 110 ++++
 .../util/resources/security_pt_BR.properties  | 110 ++++
 .../util/resources/security_sv.properties     | 110 ++++
 .../util/resources/security_zh_CN.properties  |  76 +++
 .../util/resources/security_zh_TW.properties  | 110 ++++
 .../sun/security/tools/jarsigner/Main.java    |   2 +-
 .../security/tools/jarsigner/Resources.java   | 340 ------------
 .../tools/jarsigner/Resources_de.java         | 338 ------------
 .../tools/jarsigner/Resources_ja.java         | 338 ------------
 .../tools/jarsigner/Resources_zh_CN.java      | 338 ------------
 .../jarsigner/resources/jarsigner.properties  | 209 +++++++
 .../resources/jarsigner_de.properties         | 207 +++++++
 .../resources/jarsigner_ja.properties         | 207 +++++++
 .../resources/jarsigner_zh_CN.properties      | 207 +++++++
 .../sun/security/util/Resources/Usages.java   |  25 +-
 .../MessageFormatting.java                    |   6 +-
 83 files changed, 6092 insertions(+), 10137 deletions(-)
 delete mode 100644 src/java.base/share/classes/sun/security/tools/keytool/Resources.java
 delete mode 100644 src/java.base/share/classes/sun/security/tools/keytool/Resources_de.java
 delete mode 100644 src/java.base/share/classes/sun/security/tools/keytool/Resources_es.java
 delete mode 100644 src/java.base/share/classes/sun/security/tools/keytool/Resources_fr.java
 delete mode 100644 src/java.base/share/classes/sun/security/tools/keytool/Resources_it.java
 delete mode 100644 src/java.base/share/classes/sun/security/tools/keytool/Resources_ja.java
 delete mode 100644 src/java.base/share/classes/sun/security/tools/keytool/Resources_ko.java
 delete mode 100644 src/java.base/share/classes/sun/security/tools/keytool/Resources_pt_BR.java
 delete mode 100644 src/java.base/share/classes/sun/security/tools/keytool/Resources_sv.java
 delete mode 100644 src/java.base/share/classes/sun/security/tools/keytool/Resources_zh_CN.java
 delete mode 100644 src/java.base/share/classes/sun/security/tools/keytool/Resources_zh_HK.java
 delete mode 100644 src/java.base/share/classes/sun/security/tools/keytool/Resources_zh_TW.java
 create mode 100644 src/java.base/share/classes/sun/security/tools/keytool/resources/keytool.properties
 create mode 100644 src/java.base/share/classes/sun/security/tools/keytool/resources/keytool_de.properties
 create mode 100644 src/java.base/share/classes/sun/security/tools/keytool/resources/keytool_es.properties
 create mode 100644 src/java.base/share/classes/sun/security/tools/keytool/resources/keytool_fr.properties
 create mode 100644 src/java.base/share/classes/sun/security/tools/keytool/resources/keytool_it.properties
 create mode 100644 src/java.base/share/classes/sun/security/tools/keytool/resources/keytool_ja.properties
 create mode 100644 src/java.base/share/classes/sun/security/tools/keytool/resources/keytool_ko.properties
 create mode 100644 src/java.base/share/classes/sun/security/tools/keytool/resources/keytool_pt_BR.properties
 create mode 100644 src/java.base/share/classes/sun/security/tools/keytool/resources/keytool_sv.properties
 create mode 100644 src/java.base/share/classes/sun/security/tools/keytool/resources/keytool_zh_CN.properties
 create mode 100644 src/java.base/share/classes/sun/security/tools/keytool/resources/keytool_zh_TW.properties
 delete mode 100644 src/java.base/share/classes/sun/security/util/AuthResources.java
 delete mode 100644 src/java.base/share/classes/sun/security/util/AuthResources_de.java
 delete mode 100644 src/java.base/share/classes/sun/security/util/AuthResources_es.java
 delete mode 100644 src/java.base/share/classes/sun/security/util/AuthResources_fr.java
 delete mode 100644 src/java.base/share/classes/sun/security/util/AuthResources_it.java
 delete mode 100644 src/java.base/share/classes/sun/security/util/AuthResources_ja.java
 delete mode 100644 src/java.base/share/classes/sun/security/util/AuthResources_ko.java
 delete mode 100644 src/java.base/share/classes/sun/security/util/AuthResources_pt_BR.java
 delete mode 100644 src/java.base/share/classes/sun/security/util/AuthResources_sv.java
 delete mode 100644 src/java.base/share/classes/sun/security/util/AuthResources_zh_CN.java
 delete mode 100644 src/java.base/share/classes/sun/security/util/AuthResources_zh_TW.java
 delete mode 100644 src/java.base/share/classes/sun/security/util/Resources.java
 delete mode 100644 src/java.base/share/classes/sun/security/util/Resources_de.java
 delete mode 100644 src/java.base/share/classes/sun/security/util/Resources_es.java
 delete mode 100644 src/java.base/share/classes/sun/security/util/Resources_fr.java
 delete mode 100644 src/java.base/share/classes/sun/security/util/Resources_it.java
 delete mode 100644 src/java.base/share/classes/sun/security/util/Resources_ja.java
 delete mode 100644 src/java.base/share/classes/sun/security/util/Resources_ko.java
 delete mode 100644 src/java.base/share/classes/sun/security/util/Resources_pt_BR.java
 delete mode 100644 src/java.base/share/classes/sun/security/util/Resources_sv.java
 delete mode 100644 src/java.base/share/classes/sun/security/util/Resources_zh_CN.java
 delete mode 100644 src/java.base/share/classes/sun/security/util/Resources_zh_TW.java
 create mode 100644 src/java.base/share/classes/sun/security/util/resources/auth.properties
 create mode 100644 src/java.base/share/classes/sun/security/util/resources/auth_de.properties
 create mode 100644 src/java.base/share/classes/sun/security/util/resources/auth_es.properties
 create mode 100644 src/java.base/share/classes/sun/security/util/resources/auth_fr.properties
 create mode 100644 src/java.base/share/classes/sun/security/util/resources/auth_it.properties
 create mode 100644 src/java.base/share/classes/sun/security/util/resources/auth_ja.properties
 create mode 100644 src/java.base/share/classes/sun/security/util/resources/auth_ko.properties
 create mode 100644 src/java.base/share/classes/sun/security/util/resources/auth_pt_BR.properties
 create mode 100644 src/java.base/share/classes/sun/security/util/resources/auth_sv.properties
 create mode 100644 src/java.base/share/classes/sun/security/util/resources/auth_zh_CN.properties
 create mode 100644 src/java.base/share/classes/sun/security/util/resources/auth_zh_TW.properties
 create mode 100644 src/java.base/share/classes/sun/security/util/resources/security.properties
 create mode 100644 src/java.base/share/classes/sun/security/util/resources/security_de.properties
 create mode 100644 src/java.base/share/classes/sun/security/util/resources/security_es.properties
 create mode 100644 src/java.base/share/classes/sun/security/util/resources/security_fr.properties
 create mode 100644 src/java.base/share/classes/sun/security/util/resources/security_it.properties
 create mode 100644 src/java.base/share/classes/sun/security/util/resources/security_ja.properties
 create mode 100644 src/java.base/share/classes/sun/security/util/resources/security_ko.properties
 create mode 100644 src/java.base/share/classes/sun/security/util/resources/security_pt_BR.properties
 create mode 100644 src/java.base/share/classes/sun/security/util/resources/security_sv.properties
 create mode 100644 src/java.base/share/classes/sun/security/util/resources/security_zh_CN.properties
 create mode 100644 src/java.base/share/classes/sun/security/util/resources/security_zh_TW.properties
 delete mode 100644 src/jdk.jartool/share/classes/sun/security/tools/jarsigner/Resources.java
 delete mode 100644 src/jdk.jartool/share/classes/sun/security/tools/jarsigner/Resources_de.java
 delete mode 100644 src/jdk.jartool/share/classes/sun/security/tools/jarsigner/Resources_ja.java
 delete mode 100644 src/jdk.jartool/share/classes/sun/security/tools/jarsigner/Resources_zh_CN.java
 create mode 100644 src/jdk.jartool/share/classes/sun/security/tools/jarsigner/resources/jarsigner.properties
 create mode 100644 src/jdk.jartool/share/classes/sun/security/tools/jarsigner/resources/jarsigner_de.properties
 create mode 100644 src/jdk.jartool/share/classes/sun/security/tools/jarsigner/resources/jarsigner_ja.properties
 create mode 100644 src/jdk.jartool/share/classes/sun/security/tools/jarsigner/resources/jarsigner_zh_CN.properties

diff --git a/make/modules/java.base/Gensrc.gmk b/make/modules/java.base/Gensrc.gmk
index c974db7b6c6..3a482388bec 100644
--- a/make/modules/java.base/Gensrc.gmk
+++ b/make/modules/java.base/Gensrc.gmk
@@ -80,16 +80,17 @@ $(eval $(call SetupCompileProperties, SUN_UTIL, \
     CLASS := sun.util.resources.LocaleNamesBundle, \
 ))
 
-TARGETS += $(LIST_RESOURCE_BUNDLE) $(SUN_UTIL)
+$(eval $(call SetupCompileProperties, SECURITY_RESOURCES, \
+    SRC_DIRS := $(MODULE_SRC)/share/classes/sun/security/util/resources, \
+    CLASS := ListResourceBundle, \
+))
 
-# Some resources bundles are already present as java files but still need to be
-# copied to zh_HK locale.
-$(eval $(call SetupCopy-zh_HK,COPY_ZH_HK, \
-    $(addprefix $(TOPDIR)/src/java.base/share/classes/, \
-        sun/security/util/AuthResources_zh_TW.java \
-        sun/security/util/Resources_zh_TW.java)))
+$(eval $(call SetupCompileProperties, KEYTOOL_RESOURCES, \
+    SRC_DIRS := $(MODULE_SRC)/share/classes/sun/security/tools/keytool/resources, \
+    CLASS := ListResourceBundle, \
+))
 
-TARGETS += $(COPY_ZH_HK)
+TARGETS += $(LIST_RESOURCE_BUNDLE) $(SUN_UTIL) $(SECURITY_RESOURCES) $(KEYTOOL_RESOURCES)
 
 ################################################################################
 
diff --git a/make/modules/jdk.jartool/Gensrc.gmk b/make/modules/jdk.jartool/Gensrc.gmk
index dc53aa0b652..7ae53d0b774 100644
--- a/make/modules/jdk.jartool/Gensrc.gmk
+++ b/make/modules/jdk.jartool/Gensrc.gmk
@@ -33,6 +33,11 @@ $(eval $(call SetupCompileProperties, COMPILE_PROPERTIES, \
     CLASS := ListResourceBundle, \
 ))
 
-TARGETS += $(COMPILE_PROPERTIES)
+$(eval $(call SetupCompileProperties, JARSIGNER_RESOURCES, \
+    SRC_DIRS := $(TOPDIR)/src/jdk.jartool/share/classes/sun/security/tools/jarsigner/resources, \
+    CLASS := ListResourceBundle, \
+))
+
+TARGETS += $(COMPILE_PROPERTIES) $(JARSIGNER_RESOURCES)
 
 ################################################################################
diff --git a/src/java.base/share/classes/sun/security/tools/keytool/Main.java b/src/java.base/share/classes/sun/security/tools/keytool/Main.java
index 71374601eb2..89cad63dc65 100644
--- a/src/java.base/share/classes/sun/security/tools/keytool/Main.java
+++ b/src/java.base/share/classes/sun/security/tools/keytool/Main.java
@@ -388,7 +388,7 @@ public final class Main {
     // for i18n
     private static final java.util.ResourceBundle rb =
         java.util.ResourceBundle.getBundle(
-            "sun.security.tools.keytool.Resources");
+            "sun.security.tools.keytool.resources.keytool");
     private static final Collator collator = Collator.getInstance();
     static {
         // this is for case-insensitive string comparisons
@@ -2069,7 +2069,7 @@ public final class Main {
      * - plain algorithm name, otherwise
      *
      * Note: the same method appears in keytool and jarsigner which uses
-     * same resource string defined in their own Resources.java.
+     * same resource string defined in their own properties file.
      *
      * @param key the key object, cannot be null
      * @return the full name
diff --git a/src/java.base/share/classes/sun/security/tools/keytool/Resources.java b/src/java.base/share/classes/sun/security/tools/keytool/Resources.java
deleted file mode 100644
index 9fc4d43f677..00000000000
--- a/src/java.base/share/classes/sun/security/tools/keytool/Resources.java
+++ /dev/null
@@ -1,519 +0,0 @@
-/*
- * Copyright (c) 2000, 2025, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute 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.tools.keytool;
-
-/**
- * <p> This class represents the <code>ResourceBundle</code>
- * for the keytool.
- *
- */
-public class Resources extends java.util.ListResourceBundle {
-
-    private static final Object[][] contents = {
-        {"NEWLINE", "\n"},
-        {"STAR",
-                "*******************************************"},
-        {"STARNN",
-                "*******************************************\n\n"},
-
-        // keytool: Help part
-        {".OPTION.", " [OPTION]..."},
-        {"Options.", "Options:"},
-        {"option.1.set.twice", "The %s option is specified multiple times. All except the last one will be ignored."},
-        {"multiple.commands.1.2", "Only one command is allowed: both %1$s and %2$s were specified."},
-        {"Use.keytool.help.for.all.available.commands",
-                 "Use \"keytool -?, -h, or --help\" for this help message"},
-        {"Key.and.Certificate.Management.Tool",
-                 "Key and Certificate Management Tool"},
-        {"Commands.", "Commands:"},
-        {"Use.keytool.command.name.help.for.usage.of.command.name",
-                "Use \"keytool -command_name --help\" for usage of command_name.\n" +
-                "Use the -conf <url> option to specify a pre-configured options file."},
-        // keytool: help: commands
-        {"Generates.a.certificate.request",
-                "Generates a certificate request"}, //-certreq
-        {"Changes.an.entry.s.alias",
-                "Changes an entry's alias"}, //-changealias
-        {"Deletes.an.entry",
-                "Deletes an entry"}, //-delete
-        {"Exports.certificate",
-                "Exports certificate"}, //-exportcert
-        {"Generates.a.key.pair",
-                "Generates a key pair"}, //-genkeypair
-        {"Generates.a.secret.key",
-                "Generates a secret key"}, //-genseckey
-        {"Generates.certificate.from.a.certificate.request",
-                "Generates certificate from a certificate request"}, //-gencert
-        {"Generates.CRL", "Generates CRL"}, //-gencrl
-        {"Generated.keyAlgName.secret.key",
-                "Generated {0} secret key"}, //-genseckey
-        {"Generated.keysize.bit.keyAlgName.secret.key",
-                "Generated {0}-bit {1} secret key"}, //-genseckey
-        {"key.algorithm.weak", "%1$s uses the %2$s algorithm which is considered a security risk."},
-        {"key.size.weak", "%1$s uses a %2$s which is considered a security risk."},
-        {"Imports.entries.from.a.JDK.1.1.x.style.identity.database",
-                "Imports entries from a JDK 1.1.x-style identity database"}, //-identitydb
-        {"Imports.a.certificate.or.a.certificate.chain",
-                "Imports a certificate or a certificate chain"}, //-importcert
-        {"Imports.a.password",
-                "Imports a password"}, //-importpass
-        {"Imports.one.or.all.entries.from.another.keystore",
-                "Imports one or all entries from another keystore"}, //-importkeystore
-        {"Clones.a.key.entry",
-                "Clones a key entry"}, //-keyclone
-        {"Changes.the.key.password.of.an.entry",
-                "Changes the key password of an entry"}, //-keypasswd
-        {"Lists.entries.in.a.keystore",
-                "Lists entries in a keystore"}, //-list
-        {"Prints.the.content.of.a.certificate",
-                "Prints the content of a certificate"}, //-printcert
-        {"Prints.the.content.of.a.certificate.request",
-                "Prints the content of a certificate request"}, //-printcertreq
-        {"Prints.the.content.of.a.CRL.file",
-                "Prints the content of a CRL file"}, //-printcrl
-        {"Generates.a.self.signed.certificate",
-                "Generates a self-signed certificate"}, //-selfcert
-        {"Changes.the.store.password.of.a.keystore",
-                "Changes the store password of a keystore"}, //-storepasswd
-        {"showinfo.command.help", "Displays security-related information"},
-        {"Prints.the.program.version", "Prints the program version"},
-
-        // keytool: help: options
-        {"alias.name.of.the.entry.to.process",
-                "alias name of the entry to process"}, //-alias
-        {"groupname.option.help",
-                "Group name. For example, an Elliptic Curve name."}, //-groupname
-        {"destination.alias",
-                "destination alias"}, //-destalias
-        {"destination.key.password",
-                "destination key password"}, //-destkeypass
-        {"destination.keystore.name",
-                "destination keystore name"}, //-destkeystore
-        {"destination.keystore.password.protected",
-                "destination keystore password protected"}, //-destprotected
-        {"destination.keystore.provider.name",
-                "destination keystore provider name"}, //-destprovidername
-        {"destination.keystore.password",
-                "destination keystore password"}, //-deststorepass
-        {"destination.keystore.type",
-                "destination keystore type"}, //-deststoretype
-        {"distinguished.name",
-                "distinguished name"}, //-dname
-        {"X.509.extension",
-                "X.509 extension"}, //-ext
-        {"output.file.name",
-                "output file name"}, //-file and -outfile
-        {"input.file.name",
-                "input file name"}, //-file and -infile
-        {"key.algorithm.name",
-                "key algorithm name"}, //-keyalg
-        {"key.password",
-                "key password"}, //-keypass
-        {"key.bit.size",
-                "key bit size"}, //-keysize
-        {"keystore.name",
-                "keystore name"}, //-keystore
-        {"access.the.cacerts.keystore",
-                "access the cacerts keystore"}, // -cacerts
-        {"warning.cacerts.option",
-                "Warning: use -cacerts option to access cacerts keystore"},
-        {"new.password",
-                "new password"}, //-new
-        {"do.not.prompt",
-                "do not prompt"}, //-noprompt
-        {"password.through.protected.mechanism",
-                "password through protected mechanism"}, //-protected
-        {"tls.option.help", "Displays TLS configuration information"},
-
-        // The following 2 values should span 2 lines, the first for the
-        // option itself, the second for its -providerArg value.
-        {"addprovider.option",
-                "add security provider by name (e.g. SunPKCS11)\n" +
-                        "configure argument for -addprovider"}, //-addprovider
-        {"provider.class.option",
-                "add security provider by fully-qualified class name\n" +
-                        "configure argument for -providerclass"}, //-providerclass
-
-        {"provider.name",
-                "provider name"}, //-providername
-        {"provider.classpath",
-                "provider classpath"}, //-providerpath
-        {"output.in.RFC.style",
-                "output in RFC style"}, //-rfc
-        {"signature.algorithm.name",
-                "signature algorithm name"}, //-sigalg
-        {"signer.alias",
-                "signer alias"}, //-signer
-        {"signer.key.password",
-                "signer key password"}, //-signerkeypass
-        {"source.alias",
-                "source alias"}, //-srcalias
-        {"source.key.password",
-                "source key password"}, //-srckeypass
-        {"source.keystore.name",
-                "source keystore name"}, //-srckeystore
-        {"source.keystore.password.protected",
-                "source keystore password protected"}, //-srcprotected
-        {"source.keystore.provider.name",
-                "source keystore provider name"}, //-srcprovidername
-        {"source.keystore.password",
-                "source keystore password"}, //-srcstorepass
-        {"source.keystore.type",
-                "source keystore type"}, //-srcstoretype
-        {"SSL.server.host.and.port",
-                "SSL server host and port"}, //-sslserver
-        {"signed.jar.file",
-                "signed jar file"}, //=jarfile
-        {"certificate.validity.start.date.time",
-                "certificate validity start date/time"}, //-startdate
-        {"keystore.password",
-                "keystore password"}, //-storepass
-        {"keystore.type",
-                "keystore type"}, //-storetype
-        {"trust.certificates.from.cacerts",
-                "trust certificates from cacerts"}, //-trustcacerts
-        {"verbose.output",
-                "verbose output"}, //-v
-        {"validity.number.of.days",
-                "validity number of days"}, //-validity
-        {"Serial.ID.of.cert.to.revoke",
-                 "Serial ID of cert to revoke"}, //-id
-        // keytool: Running part
-        {"keytool.error.", "keytool error: "},
-        {"Illegal.option.", "Illegal option:  "},
-        {"Illegal.value.", "Illegal value: "},
-        {"Unknown.password.type.", "Unknown password type: "},
-        {"Cannot.find.environment.variable.",
-                "Cannot find environment variable: "},
-        {"Cannot.find.file.", "Cannot find file: "},
-        {"Command.option.flag.needs.an.argument.", "Command option {0} needs an argument."},
-        {"Warning.Different.store.and.key.passwords.not.supported.for.PKCS12.KeyStores.Ignoring.user.specified.command.value.",
-                "Warning:  Different store and key passwords not supported for PKCS12 KeyStores. Ignoring user-specified {0} value."},
-        {"the.keystore.or.storetype.option.cannot.be.used.with.the.cacerts.option",
-            "The -keystore or -storetype option cannot be used with the -cacerts option"},
-        {".keystore.must.be.NONE.if.storetype.is.{0}",
-                "-keystore must be NONE if -storetype is {0}"},
-        {"Too.many.retries.program.terminated",
-                 "Too many retries, program terminated"},
-        {".storepasswd.and.keypasswd.commands.not.supported.if.storetype.is.{0}",
-                "-storepasswd and -keypasswd commands not supported if -storetype is {0}"},
-        {".keypasswd.commands.not.supported.if.storetype.is.PKCS12",
-                "-keypasswd commands not supported if -storetype is PKCS12"},
-        {".keypass.and.new.can.not.be.specified.if.storetype.is.{0}",
-                "-keypass and -new can not be specified if -storetype is {0}"},
-        {"if.protected.is.specified.then.storepass.keypass.and.new.must.not.be.specified",
-                "if -protected is specified, then -storepass, -keypass, and -new must not be specified"},
-        {"if.srcprotected.is.specified.then.srcstorepass.and.srckeypass.must.not.be.specified",
-                "if -srcprotected is specified, then -srcstorepass and -srckeypass must not be specified"},
-        {"if.keystore.is.not.password.protected.then.storepass.keypass.and.new.must.not.be.specified",
-                "if keystore is not password protected, then -storepass, -keypass, and -new must not be specified"},
-        {"if.source.keystore.is.not.password.protected.then.srcstorepass.and.srckeypass.must.not.be.specified",
-                "if source keystore is not password protected, then -srcstorepass and -srckeypass must not be specified"},
-        {"Illegal.startdate.value", "Illegal startdate value"},
-        {"Validity.must.be.greater.than.zero",
-                "Validity must be greater than zero"},
-        {"provclass.not.a.provider", "%s not a provider"},
-        {"provider.name.not.found", "Provider named \"%s\" not found"},
-        {"provider.class.not.found", "Provider \"%s\" not found"},
-        {"Usage.error.no.command.provided", "Usage error: no command provided"},
-        {"Source.keystore.file.exists.but.is.empty.", "Source keystore file exists, but is empty: "},
-        {"Please.specify.srckeystore", "Please specify -srckeystore"},
-        {"Must.not.specify.both.v.and.rfc.with.list.command",
-                "Must not specify both -v and -rfc with 'list' command"},
-        {"Key.password.must.be.at.least.6.characters",
-                "Key password must be at least 6 characters"},
-        {"New.password.must.be.at.least.6.characters",
-                "New password must be at least 6 characters"},
-        {"Keystore.file.exists.but.is.empty.",
-                "Keystore file exists, but is empty: "},
-        {"Keystore.file.does.not.exist.",
-                "Keystore file does not exist: "},
-        {"Must.specify.destination.alias", "Must specify destination alias"},
-        {"Must.specify.alias", "Must specify alias"},
-        {"Keystore.password.must.be.at.least.6.characters",
-                "Keystore password must be at least 6 characters"},
-        {"Enter.the.password.to.be.stored.",
-                "Enter the password to be stored:  "},
-        {"Enter.keystore.password.", "Enter keystore password:  "},
-        {"Enter.source.keystore.password.", "Enter source keystore password:  "},
-        {"Enter.destination.keystore.password.", "Enter destination keystore password:  "},
-        {"Keystore.password.is.too.short.must.be.at.least.6.characters",
-         "Keystore password is too short - must be at least 6 characters"},
-        {"Unknown.Entry.Type", "Unknown Entry Type"},
-        {"Entry.for.alias.alias.successfully.imported.",
-                 "Entry for alias {0} successfully imported."},
-        {"Entry.for.alias.alias.not.imported.", "Entry for alias {0} not imported."},
-        {"Problem.importing.entry.for.alias.alias.exception.Entry.for.alias.alias.not.imported.",
-                 "Problem importing entry for alias {0}: {1}.\nEntry for alias {0} not imported."},
-        {"Import.command.completed.ok.entries.successfully.imported.fail.entries.failed.or.cancelled",
-                 "Import command completed:  {0} entries successfully imported, {1} entries failed or cancelled"},
-        {"Warning.Overwriting.existing.alias.alias.in.destination.keystore",
-                 "Warning: Overwriting existing alias {0} in destination keystore"},
-        {"Existing.entry.alias.alias.exists.overwrite.no.",
-                 "Existing entry alias {0} exists, overwrite? [no]:  "},
-        {"Too.many.failures.try.later", "Too many failures - try later"},
-        {"Certification.request.stored.in.file.filename.",
-                "Certification request stored in file <{0}>"},
-        {"Submit.this.to.your.CA", "Submit this to your CA"},
-        {"if.alias.not.specified.destalias.and.srckeypass.must.not.be.specified",
-            "if alias not specified, destalias and srckeypass must not be specified"},
-        {"The.destination.pkcs12.keystore.has.different.storepass.and.keypass.Please.retry.with.destkeypass.specified.",
-            "The destination pkcs12 keystore has different storepass and keypass. Please retry with -destkeypass specified."},
-        {"Certificate.stored.in.file.filename.",
-                "Certificate stored in file <{0}>"},
-        {"Certificate.reply.was.installed.in.keystore",
-                "Certificate reply was installed in keystore"},
-        {"Certificate.reply.was.not.installed.in.keystore",
-                "Certificate reply was not installed in keystore"},
-        {"Certificate.was.added.to.keystore",
-                "Certificate was added to keystore"},
-        {"Certificate.was.not.added.to.keystore",
-                "Certificate was not added to keystore"},
-        {".Storing.ksfname.", "[Storing {0}]"},
-        {"alias.has.no.public.key.certificate.",
-                "{0} has no public key (certificate)"},
-        {"Cannot.derive.signature.algorithm",
-                "Cannot derive signature algorithm"},
-        {"Alias.alias.does.not.exist",
-                "Alias <{0}> does not exist"},
-        {"Alias.alias.has.no.certificate",
-                "Alias <{0}> has no certificate"},
-        {"groupname.keysize.coexist",
-                "Cannot specify both -groupname and -keysize"},
-        {"deprecate.keysize.for.ec",
-                "Specifying -keysize for generating EC keys is deprecated, please use \"-groupname %s\" instead."},
-        {"Key.pair.not.generated.alias.alias.already.exists",
-                "Key pair not generated, alias <{0}> already exists"},
-        {"size.bit.alg",
-                "%1$d-bit %2$s"},
-        {"Generating.full.keyAlgName.key.pair.and.self.signed.certificate.sigAlgName.with.a.validity.of.days.for",
-                "Generating {0} key pair and self-signed certificate ({1}) with a validity of {2} days\n\tfor: {3}"},
-        {"Generating.full.keyAlgName.key.pair.and.a.certificate.sigAlgName.issued.by.signerAlias.with.a.validity.of.days.for",
-                "Generating {0} key pair and a certificate ({1}) issued by <{2}> with a validity of {3} days\n\tfor: {4}"},
-        {"Enter.key.password.for.alias.", "Enter key password for <{0}>"},
-        {".RETURN.if.same.as.keystore.password.",
-                "\t(RETURN if same as keystore password):  "},
-        {"Key.password.is.too.short.must.be.at.least.6.characters",
-                "Key password is too short - must be at least 6 characters"},
-        {"Too.many.failures.key.not.added.to.keystore",
-                "Too many failures - key not added to keystore"},
-        {"Destination.alias.dest.already.exists",
-                "Destination alias <{0}> already exists"},
-        {"Password.is.too.short.must.be.at.least.6.characters",
-                "Password is too short - must be at least 6 characters"},
-        {"Too.many.failures.Key.entry.not.cloned",
-                "Too many failures. Key entry not cloned"},
-        {"key.password.for.alias.", "key password for <{0}>"},
-        {"No.entries.from.identity.database.added",
-                "No entries from identity database added"},
-        {"Alias.name.alias", "Alias name: {0}"},
-        {"Creation.date.keyStore.getCreationDate.alias.",
-                "Creation date: {0,date}"},
-        {"alias.keyStore.getCreationDate.alias.",
-                "{0}, {1,date}, "},
-        {"alias.", "{0}, "},
-        {"Entry.type.type.", "Entry type: {0}"},
-        {"Certificate.chain.length.", "Certificate chain length: "},
-        {"Certificate.i.1.", "Certificate[{0,number,integer}]:"},
-        {"Certificate.fingerprint.SHA.256.", "Certificate fingerprint (SHA-256): "},
-        {"Keystore.type.", "Keystore type: "},
-        {"Keystore.provider.", "Keystore provider: "},
-        {"Your.keystore.contains.keyStore.size.entry",
-                "Your keystore contains {0,number,integer} entry"},
-        {"Your.keystore.contains.keyStore.size.entries",
-                "Your keystore contains {0,number,integer} entries"},
-        {"Failed.to.parse.input", "Failed to parse input"},
-        {"Empty.input", "Empty input"},
-        {"Not.X.509.certificate", "Not X.509 certificate"},
-        {"alias.has.no.public.key", "{0} has no public key"},
-        {"alias.has.no.X.509.certificate", "{0} has no X.509 certificate"},
-        {"New.certificate.self.signed.", "New certificate (self-signed):"},
-        {"Reply.has.no.certificates", "Reply has no certificates"},
-        {"Certificate.not.imported.alias.alias.already.exists",
-                "Certificate not imported, alias <{0}> already exists"},
-        {"Input.not.an.X.509.certificate", "Input not an X.509 certificate"},
-        {"Certificate.already.exists.in.keystore.under.alias.trustalias.",
-                "Certificate already exists in keystore under alias <{0}>"},
-        {"Do.you.still.want.to.add.it.no.",
-                "Do you still want to add it? [no]:  "},
-        {"Certificate.already.exists.in.system.wide.CA.keystore.under.alias.trustalias.",
-                "Certificate already exists in system-wide CA keystore under alias <{0}>"},
-        {"Do.you.still.want.to.add.it.to.your.own.keystore.no.",
-                "Do you still want to add it to your own keystore? [no]:  "},
-        {"Trust.this.certificate.no.", "Trust this certificate? [no]:  "},
-        {"New.prompt.", "New {0}: "},
-        {"Passwords.must.differ", "Passwords must differ"},
-        {"Re.enter.new.prompt.", "Re-enter new {0}: "},
-        {"Re.enter.password.", "Re-enter password: "},
-        {"Re.enter.new.password.", "Re-enter new password: "},
-        {"They.don.t.match.Try.again", "They don't match. Try again"},
-        {"Enter.prompt.alias.name.", "Enter {0} alias name:  "},
-        {"Enter.new.alias.name.RETURN.to.cancel.import.for.this.entry.",
-                 "Enter new alias name\t(RETURN to cancel import for this entry):  "},
-        {"Enter.alias.name.", "Enter alias name:  "},
-        {".RETURN.if.same.as.for.otherAlias.",
-                "\t(RETURN if same as for <{0}>)"},
-        {"enter.dname.components",
-                "Enter the distinguished name. Provide a single dot (.) to leave a sub-component empty or press ENTER to use the default value in braces."},
-        {"What.is.your.first.and.last.name.",
-                "What is your first and last name?"},
-        {"What.is.the.name.of.your.organizational.unit.",
-                "What is the name of your organizational unit?"},
-        {"What.is.the.name.of.your.organization.",
-                "What is the name of your organization?"},
-        {"What.is.the.name.of.your.City.or.Locality.",
-                "What is the name of your City or Locality?"},
-        {"What.is.the.name.of.your.State.or.Province.",
-                "What is the name of your State or Province?"},
-        {"What.is.the.two.letter.country.code.for.this.unit.",
-                "What is the two-letter country code for this unit?"},
-        {"no.field.in.dname",
-                "At least one field must be provided. Enter again."},
-        {"Is.name.correct.", "Is {0} correct?"},
-        {"no", "no"},
-        {"yes", "yes"},
-        {"y", "y"},
-        {".defaultValue.", "  [{0}]:  "},
-        {"Alias.alias.has.no.key",
-                "Alias <{0}> has no key"},
-        {"Alias.alias.references.an.entry.type.that.is.not.a.private.key.entry.The.keyclone.command.only.supports.cloning.of.private.key",
-                 "Alias <{0}> references an entry type that is not a private key entry.  The -keyclone command only supports cloning of private key entries"},
-
-        {".WARNING.WARNING.WARNING.",
-            "*****************  WARNING WARNING WARNING  *****************"},
-        {"Signer.d.", "Signer #%d:"},
-        {"Certificate.d.", "Certificate #%d:"},
-        {"Timestamp.", "Timestamp:"},
-        {"Certificate.owner.", "Certificate owner: "},
-        {"Not.a.signed.jar.file", "Not a signed jar file"},
-        {"No.certificate.from.the.SSL.server",
-                "No certificate from the SSL server"},
-
-        {".The.integrity.of.the.information.stored.in.your.keystore.",
-            "* The integrity of the information stored in your keystore  *\n" +
-            "* has NOT been verified!  In order to verify its integrity, *\n" +
-            "* you must provide your keystore password.                  *"},
-        {".The.integrity.of.the.information.stored.in.the.srckeystore.",
-            "* The integrity of the information stored in the srckeystore*\n" +
-            "* has NOT been verified!  In order to verify its integrity, *\n" +
-            "* you must provide the srckeystore password.                *"},
-
-        {"Certificate.reply.does.not.contain.public.key.for.alias.",
-                "Certificate reply does not contain public key for <{0}>"},
-        {"Incomplete.certificate.chain.in.reply",
-                "Incomplete certificate chain in reply"},
-        {"Top.level.certificate.in.reply.",
-                "Top-level certificate in reply:\n"},
-        {".is.not.trusted.", "... is not trusted. "},
-        {"Install.reply.anyway.no.", "Install reply anyway? [no]:  "},
-        {"Public.keys.in.reply.and.keystore.don.t.match",
-                "Public keys in reply and keystore don't match"},
-        {"Certificate.reply.and.certificate.in.keystore.are.identical",
-                "Certificate reply and certificate in keystore are identical"},
-        {"Failed.to.establish.chain.from.reply",
-                "Failed to establish chain from reply"},
-        {"n", "n"},
-        {"Wrong.answer.try.again", "Wrong answer, try again"},
-        {"Secret.key.not.generated.alias.alias.already.exists",
-                "Secret Key not generated, alias <{0}> already exists"},
-        {"Please.provide.keysize.for.secret.key.generation",
-                "Please provide -keysize for secret key generation"},
-
-        {"warning.not.verified.make.sure.keystore.is.correct",
-            "WARNING: not verified. Make sure -keystore is correct."},
-        {"warning.not.verified.make.sure.keystore.is.correct.or.specify.trustcacerts",
-            "WARNING: not verified. Make sure -keystore is correct or specify -trustcacerts."},
-
-        {"Extensions.", "Extensions: "},
-        {".Empty.value.", "(Empty value)"},
-        {"Extension.Request.", "Extension Request:"},
-        {"Unknown.keyUsage.type.", "Unknown keyUsage type: "},
-        {"Unknown.extendedkeyUsage.type.", "Unknown extendedkeyUsage type: "},
-        {"Unknown.AccessDescription.type.", "Unknown AccessDescription type: "},
-        {"Unrecognized.GeneralName.type.", "Unrecognized GeneralName type: "},
-        {"This.extension.cannot.be.marked.as.critical.",
-                 "This extension cannot be marked as critical. "},
-        {"Odd.number.of.hex.digits.found.", "Odd number of hex digits found: "},
-        {"Unknown.extension.type.", "Unknown extension type: "},
-        {"command.{0}.is.ambiguous.", "command {0} is ambiguous:"},
-
-        // 8171319: keytool should print out warnings when reading or
-        // generating cert/cert req using weak algorithms
-        {"the.certificate.request", "The certificate request"},
-        {"the.issuer", "The issuer"},
-        {"the.generated.secretkey", "The generated secret key"},
-        {"the.generated.certificate", "The generated certificate"},
-        {"the.generated.crl", "The generated CRL"},
-        {"the.generated.certificate.request", "The generated certificate request"},
-        {"the.certificate", "The certificate"},
-        {"the.crl", "The CRL"},
-        {"the.tsa.certificate", "The TSA certificate"},
-        {"the.input", "The input"},
-        {"reply", "Reply"},
-        {"one.in.many", "%1$s #%2$d of %3$d"},
-        {"one.in.many1", "%1$s #%2$d"},
-        {"one.in.many2", "%1$s of signer #%2$d"},
-        {"one.in.many3", "%1$s #%2$d of signer #%3$d"},
-        {"alias.in.cacerts", "Issuer <%s> in cacerts"},
-        {"alias.in.keystore", "Issuer <%s>"},
-        {"with.weak", "%s (weak)"},
-        {"with.disabled", "%s (disabled)"},
-        {"key.bit", "%s key"},
-        {"key.bit.weak", "%s key (weak)"},
-        {"key.bit.disabled", "%s key (disabled)"},
-        {".PATTERN.printX509Cert.with.weak",
-                "Owner: {0}\nIssuer: {1}\nSerial number: {2}\nValid from: {3} until: {4}\nCertificate fingerprints:\n\t SHA1: {5}\n\t SHA256: {6}\nSignature algorithm name: {7}\nSubject Public Key Algorithm: {8}\nVersion: {9}"},
-        {"PKCS.10.with.weak",
-                "PKCS #10 Certificate Request (Version 1.0)\n" +
-                        "Subject: %1$s\nFormat: %2$s\nPublic Key: %3$s\nSignature algorithm: %4$s\n"},
-        {"verified.by.s.in.s.weak", "Verified by %1$s in %2$s with a %3$s"},
-        {"whose.sigalg.disabled", "%1$s uses the %2$s signature algorithm which is considered a security risk and is disabled."},
-        {"whose.sigalg.usagesignedjar", "%1$s uses the %2$s signature algorithm which is considered a security risk and cannot be used to sign JARs after %3$s."},
-        {"Unable.to.parse.denyAfter.string.in.exception.message", "Unable to parse denyAfter date string in exception message"},
-        {"whose.sigalg.weak", "%1$s uses the %2$s signature algorithm which is considered a security risk."},
-        {"whose.key.disabled", "%1$s uses a %2$s which is considered a security risk and is disabled."},
-        {"whose.key.weak", "%1$s uses a %2$s which is considered a security risk. It will be disabled in a future update."},
-        {"jks.storetype.warning", "The %1$s keystore uses a proprietary format. It is recommended to migrate to PKCS12 which is an industry standard format using \"keytool -importkeystore -srckeystore %2$s -destkeystore %2$s -deststoretype pkcs12\"."},
-        {"migrate.keystore.warning", "Migrated \"%1$s\" to %4$s. The %2$s keystore is backed up as \"%3$s\"."},
-        {"backup.keystore.warning", "The original keystore \"%1$s\" is backed up as \"%3$s\"..."},
-        {"importing.keystore.status", "Importing keystore %1$s to %2$s..."},
-        {"keyalg.option.missing.error", "The -keyalg option must be specified."},
-        {"showinfo.no.option", "Missing option for -showinfo. Try \"keytool -showinfo -tls\"."},
-    };
-
-
-    /**
-     * Returns the contents of this <code>ResourceBundle</code>.
-     *
-     * <p>
-     *
-     * @return the contents of this <code>ResourceBundle</code>.
-     */
-    @Override
-    public Object[][] getContents() {
-        return contents;
-    }
-}
diff --git a/src/java.base/share/classes/sun/security/tools/keytool/Resources_de.java b/src/java.base/share/classes/sun/security/tools/keytool/Resources_de.java
deleted file mode 100644
index 722c6b77b20..00000000000
--- a/src/java.base/share/classes/sun/security/tools/keytool/Resources_de.java
+++ /dev/null
@@ -1,511 +0,0 @@
-/*
- * Copyright (c) 2000, 2025, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute 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.tools.keytool;
-
-/**
- * <p> This class represents the <code>ResourceBundle</code>
- * for the keytool.
- *
- */
-public class Resources_de extends java.util.ListResourceBundle {
-
-    private static final Object[][] contents = {
-        {"NEWLINE", "\n"},
-        {"STAR",
-                "*******************************************"},
-        {"STARNN",
-                "*******************************************\n\n"},
-
-        // keytool: Help part
-        {".OPTION.", " [OPTION]..."},
-        {"Options.", "Optionen:"},
-        {"option.1.set.twice", "Die Option %s wurde mehrmals angegeben. Alle Angaben bis auf die letzte werden ignoriert."},
-        {"multiple.commands.1.2", "Nur ein Befehl ist zul\u00E4ssig: Sowohl %1$s als auch %2$s wurden angegeben."},
-        {"Use.keytool.help.for.all.available.commands",
-                 "Verwenden Sie \"keytool -?, -h, or --help\" f\u00FCr diese Hilfemeldung"},
-        {"Key.and.Certificate.Management.Tool",
-                 "Schl\u00FCssel- und Zertifikatsverwaltungstool"},
-        {"Commands.", "Befehle:"},
-        {"Use.keytool.command.name.help.for.usage.of.command.name",
-                "Verwenden Sie \"keytool -command_name --help\" f\u00FCr die Verwendung von command_name.\nVerwenden Sie die Option -conf <url>, um eine vorkonfigurierte Optionsdatei anzugeben."},
-        // keytool: help: commands
-        {"Generates.a.certificate.request",
-                "Generiert eine Zertifikatsanforderung"}, //-certreq
-        {"Changes.an.entry.s.alias",
-                "\u00C4ndert den Alias eines Eintrags"}, //-changealias
-        {"Deletes.an.entry",
-                "L\u00F6scht einen Eintrag"}, //-delete
-        {"Exports.certificate",
-                "Exportiert ein Zertifikat"}, //-exportcert
-        {"Generates.a.key.pair",
-                "Generiert ein Schl\u00FCsselpaar"}, //-genkeypair
-        {"Generates.a.secret.key",
-                "Generiert einen Secret Key"}, //-genseckey
-        {"Generates.certificate.from.a.certificate.request",
-                "Generiert ein Zertifikat aus einer Zertifikatsanforderung"}, //-gencert
-        {"Generates.CRL", "Generiert eine CRL"}, //-gencrl
-        {"Generated.keyAlgName.secret.key",
-                "{0} Secret Key generiert"}, //-genseckey
-        {"Generated.keysize.bit.keyAlgName.secret.key",
-                "{0}-Bit {1} Secret Key generiert"}, //-genseckey
-        {"key.algorithm.weak", "%1$s verwendet den Algorithmus %2$s. Das gilt als Sicherheitsrisiko."},
-        {"key.size.weak", "%1$s verwendet %2$s. Dies gilt als Sicherheitsrisiko."},
-        {"Imports.entries.from.a.JDK.1.1.x.style.identity.database",
-                "Importiert Eintr\u00E4ge aus einer Identity-Datenbank im JDK 1.1.x-Stil"}, //-identitydb
-        {"Imports.a.certificate.or.a.certificate.chain",
-                "Importiert ein Zertifikat oder eine Zertifikatskette"}, //-importcert
-        {"Imports.a.password",
-                "Importiert ein Kennwort"}, //-importpass
-        {"Imports.one.or.all.entries.from.another.keystore",
-                "Importiert einen oder alle Eintr\u00E4ge aus einem anderen Keystore"}, //-importkeystore
-        {"Clones.a.key.entry",
-                "Clont einen Schl\u00FCsseleintrag"}, //-keyclone
-        {"Changes.the.key.password.of.an.entry",
-                "\u00C4ndert das Schl\u00FCsselkennwort eines Eintrags"}, //-keypasswd
-        {"Lists.entries.in.a.keystore",
-                "Listet die Eintr\u00E4ge in einem Keystore auf"}, //-list
-        {"Prints.the.content.of.a.certificate",
-                "Druckt den Content eines Zertifikats"}, //-printcert
-        {"Prints.the.content.of.a.certificate.request",
-                "Druckt den Content einer Zertifikatsanforderung"}, //-printcertreq
-        {"Prints.the.content.of.a.CRL.file",
-                "Druckt den Content einer CRL-Datei"}, //-printcrl
-        {"Generates.a.self.signed.certificate",
-                "Generiert ein selbst signiertes Zertifikat"}, //-selfcert
-        {"Changes.the.store.password.of.a.keystore",
-                "\u00C4ndert das Speicherkennwort eines Keystores"}, //-storepasswd
-        {"showinfo.command.help", "Zeigt sicherheitsbezogene Informationen an"},
-        {"Prints.the.program.version", "Gibt die Programmversion aus"},
-
-        // keytool: help: options
-        {"alias.name.of.the.entry.to.process",
-                "Aliasname des zu verarbeitenden Eintrags"}, //-alias
-        {"groupname.option.help",
-                "Gruppenname. Beispiel: der Name der elliptischen Kurve."}, //-groupname
-        {"destination.alias",
-                "Zielalias"}, //-destalias
-        {"destination.key.password",
-                "Zielschl\u00FCsselkennwort"}, //-destkeypass
-        {"destination.keystore.name",
-                "Ziel-Keystore-Name"}, //-destkeystore
-        {"destination.keystore.password.protected",
-                "Ziel-Keystore kennwortgesch\u00FCtzt"}, //-destprotected
-        {"destination.keystore.provider.name",
-                "Ziel-Keystore-Providername"}, //-destprovidername
-        {"destination.keystore.password",
-                "Ziel-Keystore-Kennwort"}, //-deststorepass
-        {"destination.keystore.type",
-                "Ziel-Keystore-Typ"}, //-deststoretype
-        {"distinguished.name",
-                "Distinguished Name"}, //-dname
-        {"X.509.extension",
-                "X.509-Erweiterung"}, //-ext
-        {"output.file.name",
-                "Ausgabedateiname"}, //-file and -outfile
-        {"input.file.name",
-                "Eingabedateiname"}, //-file and -infile
-        {"key.algorithm.name",
-                "Schl\u00FCsselalgorithmusname"}, //-keyalg
-        {"key.password",
-                "Schl\u00FCsselkennwort"}, //-keypass
-        {"key.bit.size",
-                "Schl\u00FCsselbitgr\u00F6\u00DFe"}, //-keysize
-        {"keystore.name",
-                "Keystore-Name"}, //-keystore
-        {"access.the.cacerts.keystore",
-                "Zugriff auf den cacerts Keystore"}, // -cacerts
-        {"warning.cacerts.option",
-                "Warnung: Verwenden Sie die Option -cacerts f\u00FCr den Zugriff auf den cacerts Keystore"},
-        {"new.password",
-                "Neues Kennwort"}, //-new
-        {"do.not.prompt",
-                "Kein Prompt"}, //-noprompt
-        {"password.through.protected.mechanism",
-                "Kennwort \u00FCber gesch\u00FCtzten Mechanismus"}, //-protected
-        {"tls.option.help", "Zeigt TLS-Konfigurationsinformationen an"},
-
-        // The following 2 values should span 2 lines, the first for the
-        // option itself, the second for its -providerArg value.
-        {"addprovider.option",
-                "Sicherheitsprovider nach Name hinzuf\u00FCgen (z.B. SunPKCS11)\nArgument f\u00FCr -addprovider konfigurieren"}, //-addprovider
-        {"provider.class.option",
-                "Sicherheitsprovider nach vollst\u00E4ndig angegebenem Klassennamen hinzuf\u00FCgen\nArgument f\u00FCr -providerclass konfigurieren"}, //-providerclass
-
-        {"provider.name",
-                "Providername"}, //-providername
-        {"provider.classpath",
-                "Provider-Classpath"}, //-providerpath
-        {"output.in.RFC.style",
-                "Ausgabe in RFC-Stil"}, //-rfc
-        {"signature.algorithm.name",
-                "Signaturalgorithmusname"}, //-sigalg
-        {"signer.alias",
-                "Signaturgeberalias"}, //-signer
-        {"signer.key.password",
-                "Signaturgeber-Schl\u00FCsselkennwort"}, //-signerkeypass
-        {"source.alias",
-                "Quellalias"}, //-srcalias
-        {"source.key.password",
-                "Quellschl\u00FCsselkennwort"}, //-srckeypass
-        {"source.keystore.name",
-                "Quell-Keystore-Name"}, //-srckeystore
-        {"source.keystore.password.protected",
-                "Quell-Keystore kennwortgesch\u00FCtzt"}, //-srcprotected
-        {"source.keystore.provider.name",
-                "Quell-Keystore-Providername"}, //-srcprovidername
-        {"source.keystore.password",
-                "Quell-Keystore-Kennwort"}, //-srcstorepass
-        {"source.keystore.type",
-                "Quell-Keystore-Typ"}, //-srcstoretype
-        {"SSL.server.host.and.port",
-                "SSL-Serverhost und -port"}, //-sslserver
-        {"signed.jar.file",
-                "Signierte JAR-Datei"}, //=jarfile
-        {"certificate.validity.start.date.time",
-                "Startdatum/-zeit f\u00FCr Zertifikatsg\u00FCltigkeit"}, //-startdate
-        {"keystore.password",
-                "Keystore-Kennwort"}, //-storepass
-        {"keystore.type",
-                "Keystore-Typ"}, //-storetype
-        {"trust.certificates.from.cacerts",
-                "Zertifikaten aus cacerts vertrauen"}, //-trustcacerts
-        {"verbose.output",
-                "Verbose-Ausgabe"}, //-v
-        {"validity.number.of.days",
-                "G\u00FCltigkeitsdauer (Tage)"}, //-validity
-        {"Serial.ID.of.cert.to.revoke",
-                 "Serielle ID des zu entziehenden Certs"}, //-id
-        // keytool: Running part
-        {"keytool.error.", "Keytool-Fehler: "},
-        {"Illegal.option.", "Unzul\u00E4ssige Option:  "},
-        {"Illegal.value.", "Unzul\u00E4ssiger Wert: "},
-        {"Unknown.password.type.", "Unbekannter Kennworttyp: "},
-        {"Cannot.find.environment.variable.",
-                "Umgebungsvariable kann nicht gefunden werden: "},
-        {"Cannot.find.file.", "Datei kann nicht gefunden werden: "},
-        {"Command.option.flag.needs.an.argument.", "Befehlsoption {0} ben\u00F6tigt ein Argument."},
-        {"Warning.Different.store.and.key.passwords.not.supported.for.PKCS12.KeyStores.Ignoring.user.specified.command.value.",
-                "Warnung: Keine Unterst\u00FCtzung f\u00FCr unterschiedliche Speicher- und Schl\u00FCsselkennw\u00F6rter bei PKCS12 KeyStores. Der benutzerdefinierte Wert {0} wird ignoriert."},
-        {"the.keystore.or.storetype.option.cannot.be.used.with.the.cacerts.option",
-            "Die Option -keystore oder -storetype kann nicht mit der Option -cacerts verwendet werden"},
-        {".keystore.must.be.NONE.if.storetype.is.{0}",
-                "-keystore muss NONE sein, wenn -storetype {0} ist"},
-        {"Too.many.retries.program.terminated",
-                 "Zu viele erneute Versuche. Programm wird beendet"},
-        {".storepasswd.and.keypasswd.commands.not.supported.if.storetype.is.{0}",
-                "Befehle -storepasswd und -keypasswd werden nicht unterst\u00FCtzt, wenn -storetype {0} ist"},
-        {".keypasswd.commands.not.supported.if.storetype.is.PKCS12",
-                "Befehle des Typs -keypasswd werden nicht unterst\u00FCtzt, wenn -storetype PKCS12 ist"},
-        {".keypass.and.new.can.not.be.specified.if.storetype.is.{0}",
-                "-keypass und -new k\u00F6nnen nicht angegeben werden, wenn -storetype {0} ist"},
-        {"if.protected.is.specified.then.storepass.keypass.and.new.must.not.be.specified",
-                "Wenn -protected angegeben ist, d\u00FCrfen -storepass, -keypass und -new nicht angegeben werden"},
-        {"if.srcprotected.is.specified.then.srcstorepass.and.srckeypass.must.not.be.specified",
-                "Wenn -srcprotected angegeben ist, d\u00FCrfen -srcstorepass und -srckeypass nicht angegeben werden"},
-        {"if.keystore.is.not.password.protected.then.storepass.keypass.and.new.must.not.be.specified",
-                "Wenn der Keystore nicht kennwortgesch\u00FCtzt ist, d\u00FCrfen -storepass, -keypass und -new nicht angegeben werden"},
-        {"if.source.keystore.is.not.password.protected.then.srcstorepass.and.srckeypass.must.not.be.specified",
-                "Wenn der Quell-Keystore nicht kennwortgesch\u00FCtzt ist, d\u00FCrfen -srcstorepass und -srckeypass nicht angegeben werden"},
-        {"Illegal.startdate.value", "Unzul\u00E4ssiger Wert f\u00FCr Startdatum"},
-        {"Validity.must.be.greater.than.zero",
-                "G\u00FCltigkeit muss gr\u00F6\u00DFer als null sein"},
-        {"provclass.not.a.provider", "%s kein Provider"},
-        {"provider.name.not.found", "Provider namens \"%s\" nicht gefunden"},
-        {"provider.class.not.found", "Provider \"%s\" nicht gefunden"},
-        {"Usage.error.no.command.provided", "Verwendungsfehler: Kein Befehl angegeben"},
-        {"Source.keystore.file.exists.but.is.empty.", "Quell-Keystore-Datei ist zwar vorhanden, ist aber leer: "},
-        {"Please.specify.srckeystore", "Geben Sie -srckeystore an"},
-        {"Must.not.specify.both.v.and.rfc.with.list.command",
-                "-v und -rfc d\u00FCrfen bei Befehl \"list\" nicht beide angegeben werden"},
-        {"Key.password.must.be.at.least.6.characters",
-                "Schl\u00FCsselkennwort muss mindestens sechs Zeichen lang sein"},
-        {"New.password.must.be.at.least.6.characters",
-                "Neues Kennwort muss mindestens sechs Zeichen lang sein"},
-        {"Keystore.file.exists.but.is.empty.",
-                "Keystore-Datei ist vorhanden, ist aber leer: "},
-        {"Keystore.file.does.not.exist.",
-                "Keystore-Datei ist nicht vorhanden: "},
-        {"Must.specify.destination.alias", "Sie m\u00FCssen einen Zielalias angeben"},
-        {"Must.specify.alias", "Sie m\u00FCssen einen Alias angeben"},
-        {"Keystore.password.must.be.at.least.6.characters",
-                "Keystore-Kennwort muss mindestens sechs Zeichen lang sein"},
-        {"Enter.the.password.to.be.stored.",
-                "Geben Sie das Kennwort ein, das gespeichert werden soll:  "},
-        {"Enter.keystore.password.", "Keystore-Kennwort eingeben:  "},
-        {"Enter.source.keystore.password.", "Quell-Keystore-Kennwort eingeben:  "},
-        {"Enter.destination.keystore.password.", "Ziel-Keystore-Kennwort eingeben:  "},
-        {"Keystore.password.is.too.short.must.be.at.least.6.characters",
-         "Keystore-Kennwort ist zu kurz. Es muss mindestens sechs Zeichen lang sein"},
-        {"Unknown.Entry.Type", "Unbekannter Eintragstyp"},
-        {"Entry.for.alias.alias.successfully.imported.",
-                 "Eintrag f\u00FCr Alias {0} erfolgreich importiert."},
-        {"Entry.for.alias.alias.not.imported.", "Eintrag f\u00FCr Alias {0} nicht importiert."},
-        {"Problem.importing.entry.for.alias.alias.exception.Entry.for.alias.alias.not.imported.",
-                 "Problem beim Importieren des Eintrags f\u00FCr Alias {0}: {1}.\nEintrag f\u00FCr Alias {0} nicht importiert."},
-        {"Import.command.completed.ok.entries.successfully.imported.fail.entries.failed.or.cancelled",
-                 "Importbefehl abgeschlossen: {0} Eintr\u00E4ge erfolgreich importiert, {1} Eintr\u00E4ge nicht erfolgreich oder abgebrochen"},
-        {"Warning.Overwriting.existing.alias.alias.in.destination.keystore",
-                 "Warnung: Vorhandener Alias {0} in Ziel-Keystore wird \u00FCberschrieben"},
-        {"Existing.entry.alias.alias.exists.overwrite.no.",
-                 "Eintragsalias {0} ist bereits vorhanden. \u00DCberschreiben? [Nein]:  "},
-        {"Too.many.failures.try.later", "Zu viele Fehler. Versuchen Sie es sp\u00E4ter erneut"},
-        {"Certification.request.stored.in.file.filename.",
-                "Zertifizierungsanforderung in Datei <{0}> gespeichert"},
-        {"Submit.this.to.your.CA", "Leiten Sie dies an die CA weiter"},
-        {"if.alias.not.specified.destalias.and.srckeypass.must.not.be.specified",
-            "Wenn kein Alias angegeben ist, d\u00FCrfen destalias und srckeypass nicht angegeben werden"},
-        {"The.destination.pkcs12.keystore.has.different.storepass.and.keypass.Please.retry.with.destkeypass.specified.",
-            "Der Ziel-Keystore pkcs12 hat unterschiedliche Kennw\u00F6rter f\u00FCr storepass und keypass. Wiederholen Sie den Vorgang, indem Sie -destkeypass angeben."},
-        {"Certificate.stored.in.file.filename.",
-                "Zertifikat in Datei <{0}> gespeichert"},
-        {"Certificate.reply.was.installed.in.keystore",
-                "Zertifikatsantwort wurde in Keystore installiert"},
-        {"Certificate.reply.was.not.installed.in.keystore",
-                "Zertifikatsantwort wurde nicht in Keystore installiert"},
-        {"Certificate.was.added.to.keystore",
-                "Zertifikat wurde Keystore hinzugef\u00FCgt"},
-        {"Certificate.was.not.added.to.keystore",
-                "Zertifikat wurde nicht zu Keystore hinzugef\u00FCgt"},
-        {".Storing.ksfname.", "[{0} wird gesichert]"},
-        {"alias.has.no.public.key.certificate.",
-                "{0} hat keinen Public Key (Zertifikat)"},
-        {"Cannot.derive.signature.algorithm",
-                "Signaturalgorithmus kann nicht abgeleitet werden"},
-        {"Alias.alias.does.not.exist",
-                "Alias <{0}> ist nicht vorhanden"},
-        {"Alias.alias.has.no.certificate",
-                "Alias <{0}> hat kein Zertifikat"},
-        {"groupname.keysize.coexist",
-                "Es k\u00F6nnen nicht sowohl -groupname als auch -keysize angegeben werden"},
-        {"deprecate.keysize.for.ec",
-                "Das Angeben von -keysize zum Generieren von EC-Schl\u00FCsseln ist veraltet. Verwenden Sie stattdessen \"-groupname %s\"."},
-        {"Key.pair.not.generated.alias.alias.already.exists",
-                "Schl\u00FCsselpaar wurde nicht generiert. Alias <{0}> ist bereits vorhanden"},
-        {"size.bit.alg",
-                "%1$d-Bit %2$s"},
-        {"Generating.full.keyAlgName.key.pair.and.self.signed.certificate.sigAlgName.with.a.validity.of.days.for",
-                "Schl\u00FCsselpaar {0} und selbstsigniertes Zertifikat ({1}) werden mit einer G\u00FCltigkeit von {2} Tagen generiert\n\tf\u00FCr: {3}"},
-        {"Generating.full.keyAlgName.key.pair.and.a.certificate.sigAlgName.issued.by.signerAlias.with.a.validity.of.days.for",
-                "Schl\u00FCsselpaar {0} und Zertifikat ({1}) werden generiert, das von <{2}> mit einer G\u00FCltigkeit von {3} Tagen ausgestellt wurde\n\tf\u00FCr: {4}"},
-        {"Enter.key.password.for.alias.", "Schl\u00FCsselkennwort f\u00FCr <{0}> eingeben"},
-        {".RETURN.if.same.as.keystore.password.",
-                "\t(RETURN, wenn identisch mit Keystore-Kennwort):  "},
-        {"Key.password.is.too.short.must.be.at.least.6.characters",
-                "Schl\u00FCsselkennwort ist zu kurz. Es muss mindestens sechs Zeichen lang sein"},
-        {"Too.many.failures.key.not.added.to.keystore",
-                "Zu viele Fehler. Schl\u00FCssel wurde nicht zu Keystore hinzugef\u00FCgt"},
-        {"Destination.alias.dest.already.exists",
-                "Zielalias <{0}> bereits vorhanden"},
-        {"Password.is.too.short.must.be.at.least.6.characters",
-                "Kennwort ist zu kurz. Es muss mindestens sechs Zeichen lang sein"},
-        {"Too.many.failures.Key.entry.not.cloned",
-                "Zu viele Fehler. Schl\u00FCsseleintrag wurde nicht geklont"},
-        {"key.password.for.alias.", "Schl\u00FCsselkennwort f\u00FCr <{0}>"},
-        {"No.entries.from.identity.database.added",
-                "Keine Eintr\u00E4ge aus Identity-Datenbank hinzugef\u00FCgt"},
-        {"Alias.name.alias", "Aliasname: {0}"},
-        {"Creation.date.keyStore.getCreationDate.alias.",
-                "Erstellungsdatum: {0,date}"},
-        {"alias.keyStore.getCreationDate.alias.",
-                "{0}, {1,date}, "},
-        {"alias.", "{0}, "},
-        {"Entry.type.type.", "Eintragstyp: {0}"},
-        {"Certificate.chain.length.", "Zertifikatskettenl\u00E4nge: "},
-        {"Certificate.i.1.", "Zertifikat[{0,number,integer}]:"},
-        {"Certificate.fingerprint.SHA.256.", "Zertifikat-Fingerprint (SHA-256): "},
-        {"Keystore.type.", "Keystore-Typ: "},
-        {"Keystore.provider.", "Keystore-Provider: "},
-        {"Your.keystore.contains.keyStore.size.entry",
-                "Keystore enth\u00E4lt {0,number,integer} Eintrag"},
-        {"Your.keystore.contains.keyStore.size.entries",
-                "Keystore enth\u00E4lt {0,number,integer} Eintr\u00E4ge"},
-        {"Failed.to.parse.input", "Eingabe konnte nicht geparst werden"},
-        {"Empty.input", "Leere Eingabe"},
-        {"Not.X.509.certificate", "Kein X.509-Zertifikat"},
-        {"alias.has.no.public.key", "{0} hat keinen Public Key"},
-        {"alias.has.no.X.509.certificate", "{0} hat kein X.509-Zertifikat"},
-        {"New.certificate.self.signed.", "Neues Zertifikat (selbst signiert):"},
-        {"Reply.has.no.certificates", "Antwort hat keine Zertifikate"},
-        {"Certificate.not.imported.alias.alias.already.exists",
-                "Zertifikat nicht importiert. Alias <{0}> ist bereits vorhanden"},
-        {"Input.not.an.X.509.certificate", "Eingabe kein X.509-Zertifikat"},
-        {"Certificate.already.exists.in.keystore.under.alias.trustalias.",
-                "Zertifikat ist bereits unter Alias <{0}> im Keystore vorhanden"},
-        {"Do.you.still.want.to.add.it.no.",
-                "M\u00F6chten Sie es trotzdem hinzuf\u00FCgen? [Nein]:  "},
-        {"Certificate.already.exists.in.system.wide.CA.keystore.under.alias.trustalias.",
-                "Zertifikat ist bereits unter Alias <{0}> im systemweiten CA-Keystore vorhanden"},
-        {"Do.you.still.want.to.add.it.to.your.own.keystore.no.",
-                "M\u00F6chten Sie es trotzdem zu Ihrem eigenen Keystore hinzuf\u00FCgen? [Nein]:  "},
-        {"Trust.this.certificate.no.", "Diesem Zertifikat vertrauen? [Nein]:  "},
-        {"New.prompt.", "Neues {0}: "},
-        {"Passwords.must.differ", "Kennw\u00F6rter m\u00FCssen sich unterscheiden"},
-        {"Re.enter.new.prompt.", "Neues {0} erneut eingeben: "},
-        {"Re.enter.password.", "Geben Sie das Kennwort erneut ein: "},
-        {"Re.enter.new.password.", "Neues Kennwort erneut eingeben: "},
-        {"They.don.t.match.Try.again", "Keine \u00DCbereinstimmung. Wiederholen Sie den Vorgang"},
-        {"Enter.prompt.alias.name.", "{0}-Aliasnamen eingeben:  "},
-        {"Enter.new.alias.name.RETURN.to.cancel.import.for.this.entry.",
-                 "Geben Sie einen neuen Aliasnamen ein\t(RETURN, um den Import dieses Eintrags abzubrechen):  "},
-        {"Enter.alias.name.", "Aliasnamen eingeben:  "},
-        {".RETURN.if.same.as.for.otherAlias.",
-                "\t(RETURN, wenn identisch mit <{0}>)"},
-        {"enter.dname.components",
-                "Geben Sie den Distinguished Name ein. Geben Sie einen einzelnen Punkt (.) an, um eine Unterkomponente leer zu lassen, oder dr\u00FCcken Sie die Eingabetaste, um den Standardwert in Klammern zu verwenden."},
-        {"What.is.your.first.and.last.name.",
-                "Wie lautet Ihr Vor- und Nachname?"},
-        {"What.is.the.name.of.your.organizational.unit.",
-                "Wie lautet der Name Ihrer organisatorischen Einheit?"},
-        {"What.is.the.name.of.your.organization.",
-                "Wie lautet der Name Ihrer Organisation?"},
-        {"What.is.the.name.of.your.City.or.Locality.",
-                "Wie lautet der Name Ihrer Stadt oder Gemeinde?"},
-        {"What.is.the.name.of.your.State.or.Province.",
-                "Wie lautet der Name Ihres Bundeslands?"},
-        {"What.is.the.two.letter.country.code.for.this.unit.",
-                "Wie lautet der L\u00E4ndercode (zwei Buchstaben) f\u00FCr diese Einheit?"},
-        {"no.field.in.dname",
-                "Mindestens ein Feld muss ausgef\u00FCllt werden. Wiederholen Sie die Eingabe."},
-        {"Is.name.correct.", "Ist {0} richtig?"},
-        {"no", "Nein"},
-        {"yes", "Ja"},
-        {"y", "J"},
-        {".defaultValue.", "  [{0}]:  "},
-        {"Alias.alias.has.no.key",
-                "Alias <{0}> verf\u00FCgt \u00FCber keinen Schl\u00FCssel"},
-        {"Alias.alias.references.an.entry.type.that.is.not.a.private.key.entry.The.keyclone.command.only.supports.cloning.of.private.key",
-                 "Alias <{0}> verweist auf einen Eintragstyp, der kein Private-Key-Eintrag ist. Der Befehl -keyclone unterst\u00FCtzt nur das Klonen von Private-Key-Eintr\u00E4gen"},
-
-        {".WARNING.WARNING.WARNING.",
-            "*****************  WARNING WARNING WARNING  *****************"},
-        {"Signer.d.", "Signaturgeber #%d:"},
-        {"Certificate.d.", "Zertifikat #%d:"},
-        {"Timestamp.", "Zeitstempel:"},
-        {"Certificate.owner.", "Zertifikatseigent\u00FCmer: "},
-        {"Not.a.signed.jar.file", "Keine signierte JAR-Datei"},
-        {"No.certificate.from.the.SSL.server",
-                "Kein Zertifikat vom SSL-Server"},
-
-        {".The.integrity.of.the.information.stored.in.your.keystore.",
-            "* Die Integrit\u00E4t der Informationen, die in Ihrem Keystore gespeichert sind, *\n* wurde NICHT gepr\u00FCft. Um die Integrit\u00E4t zu pr\u00FCfen, *\n* m\u00FCssen Sie Ihr Keystore-Kennwort angeben.                  *"},
-        {".The.integrity.of.the.information.stored.in.the.srckeystore.",
-            "* Die Integrit\u00E4t der Informationen, die in Ihrem Srckeystore gespeichert sind, *\n* wurde NICHT gepr\u00FCft. Um die Integrit\u00E4t zu pr\u00FCfen, *\n* m\u00FCssen Sie Ihr Srckeystore-Kennwort angeben.                  *"},
-
-        {"Certificate.reply.does.not.contain.public.key.for.alias.",
-                "Zertifikatsantwort enth\u00E4lt keinen Public Key f\u00FCr <{0}>"},
-        {"Incomplete.certificate.chain.in.reply",
-                "Unvollst\u00E4ndige Zertifikatskette in Antwort"},
-        {"Top.level.certificate.in.reply.",
-                "Zertifikat der obersten Ebene in Antwort:\n"},
-        {".is.not.trusted.", "... ist nicht vertrauensw\u00FCrdig. "},
-        {"Install.reply.anyway.no.", "Antwort trotzdem installieren? [Nein]:  "},
-        {"Public.keys.in.reply.and.keystore.don.t.match",
-                "Public Keys in Antwort und Keystore stimmen nicht \u00FCberein"},
-        {"Certificate.reply.and.certificate.in.keystore.are.identical",
-                "Zertifikatsantwort und Zertifikat in Keystore sind identisch"},
-        {"Failed.to.establish.chain.from.reply",
-                "Kette konnte der Antwort nicht entnommen werden"},
-        {"n", "N"},
-        {"Wrong.answer.try.again", "Falsche Antwort. Wiederholen Sie den Vorgang"},
-        {"Secret.key.not.generated.alias.alias.already.exists",
-                "Secret Key wurde nicht generiert. Alias <{0}> ist bereits vorhanden"},
-        {"Please.provide.keysize.for.secret.key.generation",
-                "Geben Sie -keysize zum Erstellen eines Secret Key an"},
-
-        {"warning.not.verified.make.sure.keystore.is.correct",
-            "WARNUNG: Nicht gepr\u00FCft. Stellen Sie sicher, dass -keystore korrekt ist."},
-        {"warning.not.verified.make.sure.keystore.is.correct.or.specify.trustcacerts",
-            "Warnung: Nicht gepr\u00FCft. Stellen Sie sicher, dass -keystore korrekt ist, oder geben Sie -trustcacerts an."},
-
-        {"Extensions.", "Erweiterungen: "},
-        {".Empty.value.", "(Leerer Wert)"},
-        {"Extension.Request.", "Erweiterungsanforderung:"},
-        {"Unknown.keyUsage.type.", "Unbekannter keyUsage-Typ: "},
-        {"Unknown.extendedkeyUsage.type.", "Unbekannter extendedkeyUsage-Typ: "},
-        {"Unknown.AccessDescription.type.", "Unbekannter AccessDescription-Typ: "},
-        {"Unrecognized.GeneralName.type.", "Unbekannter GeneralName-Typ: "},
-        {"This.extension.cannot.be.marked.as.critical.",
-                 "Erweiterung kann nicht als \"Kritisch\" markiert werden. "},
-        {"Odd.number.of.hex.digits.found.", "Ungerade Anzahl hexadezimaler Ziffern gefunden: "},
-        {"Unknown.extension.type.", "Unbekannter Erweiterungstyp: "},
-        {"command.{0}.is.ambiguous.", "Befehl {0} ist mehrdeutig:"},
-
-        // 8171319: keytool should print out warnings when reading or
-        // generating cert/cert req using weak algorithms
-        {"the.certificate.request", "Die Zertifikatsanforderung"},
-        {"the.issuer", "Der Aussteller"},
-        {"the.generated.secretkey", "Der generierte Secret Key"},
-        {"the.generated.certificate", "Das generierte Zertifikat"},
-        {"the.generated.crl", "Die generierte CRL"},
-        {"the.generated.certificate.request", "Die generierte Zertifikatsanforderung"},
-        {"the.certificate", "Das Zertifikat"},
-        {"the.crl", "Die CRL"},
-        {"the.tsa.certificate", "Das TSA-Zertifikat"},
-        {"the.input", "Die Eingabe"},
-        {"reply", "Antwort"},
-        {"one.in.many", "%1$s #%2$d von %3$d"},
-        {"one.in.many1", "%1$s #%2$d"},
-        {"one.in.many2", "%1$s von Signaturgeber #%2$d"},
-        {"one.in.many3", "%1$s #%2$d von Signaturgeber #%3$d"},
-        {"alias.in.cacerts", "Aussteller <%s> in cacerts"},
-        {"alias.in.keystore", "Aussteller <%s>"},
-        {"with.weak", "%s (schwach)"},
-        {"with.disabled", "%s (deaktiviert)"},
-        {"key.bit", "%s-Schl\u00FCssel"},
-        {"key.bit.weak", "%s Schl\u00FCssel (schwach)"},
-        {"key.bit.disabled", "%s Schl\u00FCssel (deaktiviert)"},
-        {".PATTERN.printX509Cert.with.weak",
-                "Eigent\u00FCmer: {0}\nAussteller: {1}\nSeriennummer: {2}\nG\u00FCltig von: {3} bis: {4}\nZertifikatsfingerprints:\n\t SHA1: {5}\n\t SHA256: {6}\nSignaturalgorithmusname: {7}\nPublic-Key-Algorithmus von Subject: {8}\nVersion: {9}"},
-        {"PKCS.10.with.weak",
-                "PKCS #10-Zertifikatsanforderung (Version 1.0)\nSubject: %1$s\nFormat: %2$s\nPublic Key: %3$s\nSignaturalgorithmus: %4$s\n"},
-        {"verified.by.s.in.s.weak", "Von %1$s in %2$s mit %3$s verifiziert"},
-        {"whose.sigalg.disabled", "%1$s verwendet den Signaturalgorithmus %2$s. Dies gilt als Sicherheitsrisiko und ist deaktiviert."},
-        {"whose.sigalg.usagesignedjar", "%1$s verwendet den Signaturalgorithmus %2$s. Das gilt als Sicherheitsrisiko und kann nach %3$s nicht zum Signieren von JAR-Archiven verwendet werden."},
-        {"Unable.to.parse.denyAfter.string.in.exception.message", "denyAfter-Datumszeichenfolge in Ausnahmemeldung kann nicht geparst werden"},
-        {"whose.sigalg.weak", "%1$s verwendet den Signaturalgorithmus %2$s. Dies gilt als Sicherheitsrisiko."},
-        {"whose.key.disabled", "%1$s verwendet %2$s. Dies gilt als Sicherheitsrisiko und ist deaktiviert."},
-        {"whose.key.weak", "%1$s verwendet %2$s. Dies gilt als Sicherheitsrisiko. Wird in einem zuk\u00FCnftigen Update deaktiviert."},
-        {"jks.storetype.warning", "Der %1$s-Keystore verwendet ein propriet\u00E4res Format. Es wird empfohlen, auf PKCS12 zu migrieren, das ein Industriestandardformat mit \"keytool -importkeystore -srckeystore %2$s -destkeystore %2$s -deststoretype pkcs12\" ist."},
-        {"migrate.keystore.warning", "\"%1$s\" zu %4$s migriert. Der %2$s-Keystore wurde als \"%3$s\" gesichert."},
-        {"backup.keystore.warning", "Der urspr\u00FCngliche Keystore \"%1$s\" wird als \"%3$s\" gesichert..."},
-        {"importing.keystore.status", "Keystore %1$s wird in %2$s importiert..."},
-        {"keyalg.option.missing.error", "Die Option -keyalg muss angegeben werden."},
-        {"showinfo.no.option", "Fehlende Option f\u00FCr -showinfo. Verwenden Sie keytool -showinfo -tls."},
-    };
-
-
-    /**
-     * Returns the contents of this <code>ResourceBundle</code>.
-     *
-     * <p>
-     *
-     * @return the contents of this <code>ResourceBundle</code>.
-     */
-    @Override
-    public Object[][] getContents() {
-        return contents;
-    }
-}
diff --git a/src/java.base/share/classes/sun/security/tools/keytool/Resources_es.java b/src/java.base/share/classes/sun/security/tools/keytool/Resources_es.java
deleted file mode 100644
index 8bd19ebad5b..00000000000
--- a/src/java.base/share/classes/sun/security/tools/keytool/Resources_es.java
+++ /dev/null
@@ -1,484 +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.  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.tools.keytool;
-
-/**
- * <p> This class represents the <code>ResourceBundle</code>
- * for the keytool.
- *
- */
-public class Resources_es extends java.util.ListResourceBundle {
-
-    private static final Object[][] contents = {
-        {"NEWLINE", "\n"},
-        {"STAR",
-                "*******************************************"},
-        {"STARNN",
-                "*******************************************\n\n"},
-
-        // keytool: Help part
-        {".OPTION.", " [OPTION]..."},
-        {"Options.", "Opciones:"},
-        {"option.1.set.twice", "La opci\u00F3n %s se\u00A0ha especificado\u00A0varias veces. Se ignorar\u00E1n todas excepto la \u00FAltima."},
-        {"multiple.commands.1.2", "Solo se permite un comando: se ha especificado tanto %1$s como %2$s"},
-        {"Use.keytool.help.for.all.available.commands",
-                 "Utilice\"keytool -help\" para todos los comandos disponibles"},
-        {"Key.and.Certificate.Management.Tool",
-                 "Herramienta de Gesti\u00F3n de Certificados y Claves"},
-        {"Commands.", "Comandos:"},
-        {"Use.keytool.command.name.help.for.usage.of.command.name",
-                "Utilice \"keytool -command_name -help\" para la sintaxis de nombre_comando.\nUtilice la opci\u00F3n -conf <url> para especificar un archivo de opciones preconfigurado."},
-        // keytool: help: commands
-        {"Generates.a.certificate.request",
-                "Genera una solicitud de certificado"}, //-certreq
-        {"Changes.an.entry.s.alias",
-                "Cambia un alias de entrada"}, //-changealias
-        {"Deletes.an.entry",
-                "Suprime una entrada"}, //-delete
-        {"Exports.certificate",
-                "Exporta el certificado"}, //-exportcert
-        {"Generates.a.key.pair",
-                "Genera un par de claves"}, //-genkeypair
-        {"Generates.a.secret.key",
-                "Genera un clave secreta"}, //-genseckey
-        {"Generates.certificate.from.a.certificate.request",
-                "Genera un certificado a partir de una solicitud de certificado"}, //-gencert
-        {"Generates.CRL", "Genera CRL"}, //-gencrl
-        {"Generated.keyAlgName.secret.key",
-                "Clave secreta {0} generada"}, //-genseckey
-        {"Generated.keysize.bit.keyAlgName.secret.key",
-                "Clave secreta {1} de {0} bits generada"}, //-genseckey
-        {"Imports.entries.from.a.JDK.1.1.x.style.identity.database",
-                "Importa entradas desde una base de datos de identidades JDK 1.1.x-style"}, //-identitydb
-        {"Imports.a.certificate.or.a.certificate.chain",
-                "Importa un certificado o una cadena de certificados"}, //-importcert
-        {"Imports.a.password",
-                "Importa una contrase\u00F1a"}, //-importpass
-        {"Imports.one.or.all.entries.from.another.keystore",
-                "Importa una o todas las entradas desde otro almac\u00E9n de claves"}, //-importkeystore
-        {"Clones.a.key.entry",
-                "Clona una entrada de clave"}, //-keyclone
-        {"Changes.the.key.password.of.an.entry",
-                "Cambia la contrase\u00F1a de clave de una entrada"}, //-keypasswd
-        {"Lists.entries.in.a.keystore",
-                "Enumera las entradas de un almac\u00E9n de claves"}, //-list
-        {"Prints.the.content.of.a.certificate",
-                "Imprime el contenido de un certificado"}, //-printcert
-        {"Prints.the.content.of.a.certificate.request",
-                "Imprime el contenido de una solicitud de certificado"}, //-printcertreq
-        {"Prints.the.content.of.a.CRL.file",
-                "Imprime el contenido de un archivo CRL"}, //-printcrl
-        {"Generates.a.self.signed.certificate",
-                "Genera un certificado autofirmado"}, //-selfcert
-        {"Changes.the.store.password.of.a.keystore",
-                "Cambia la contrase\u00F1a de almac\u00E9n de un almac\u00E9n de claves"}, //-storepasswd
-        // keytool: help: options
-        {"alias.name.of.the.entry.to.process",
-                "nombre de alias de la entrada que se va a procesar"}, //-alias
-        {"destination.alias",
-                "alias de destino"}, //-destalias
-        {"destination.key.password",
-                "contrase\u00F1a de clave de destino"}, //-destkeypass
-        {"destination.keystore.name",
-                "nombre de almac\u00E9n de claves de destino"}, //-destkeystore
-        {"destination.keystore.password.protected",
-                "almac\u00E9n de claves de destino protegido por contrase\u00F1a"}, //-destprotected
-        {"destination.keystore.provider.name",
-                "nombre de proveedor de almac\u00E9n de claves de destino"}, //-destprovidername
-        {"destination.keystore.password",
-                "contrase\u00F1a de almac\u00E9n de claves de destino"}, //-deststorepass
-        {"destination.keystore.type",
-                "tipo de almac\u00E9n de claves de destino"}, //-deststoretype
-        {"distinguished.name",
-                "nombre distintivo"}, //-dname
-        {"X.509.extension",
-                "extensi\u00F3n X.509"}, //-ext
-        {"output.file.name",
-                "nombre de archivo de salida"}, //-file and -outfile
-        {"input.file.name",
-                "nombre de archivo de entrada"}, //-file and -infile
-        {"key.algorithm.name",
-                "nombre de algoritmo de clave"}, //-keyalg
-        {"key.password",
-                "contrase\u00F1a de clave"}, //-keypass
-        {"key.bit.size",
-                "tama\u00F1o de bit de clave"}, //-keysize
-        {"keystore.name",
-                "nombre de almac\u00E9n de claves"}, //-keystore
-        {"access.the.cacerts.keystore",
-                "acceso al almac\u00E9n de claves cacerts"}, // -cacerts
-        {"warning.cacerts.option",
-                "Advertencia: Utilice la opci\u00F3n -cacerts para acceder al almac\u00E9n de claves cacerts"},
-        {"new.password",
-                "nueva contrase\u00F1a"}, //-new
-        {"do.not.prompt",
-                "no solicitar"}, //-noprompt
-        {"password.through.protected.mechanism",
-                "contrase\u00F1a a trav\u00E9s de mecanismo protegido"}, //-protected
-
-        // The following 2 values should span 2 lines, the first for the
-        // option itself, the second for its -providerArg value.
-        {"addprovider.option",
-                "agregar proveedor de seguridad por nombre (por ejemplo, SunPKCS11)\nconfigurar elemento para -addprovider"}, //-addprovider
-        {"provider.class.option",
-                "agregar proveedor de seguridad por nombre de clase totalmente cualificado\nconfigurar argumento para -providerclass"}, //-providerclass
-
-        {"provider.name",
-                "nombre del proveedor"}, //-providername
-        {"provider.classpath",
-                "classpath de proveedor"}, //-providerpath
-        {"output.in.RFC.style",
-                "salida en estilo RFC"}, //-rfc
-        {"signature.algorithm.name",
-                "nombre de algoritmo de firma"}, //-sigalg
-        {"source.alias",
-                "alias de origen"}, //-srcalias
-        {"source.key.password",
-                "contrase\u00F1a de clave de origen"}, //-srckeypass
-        {"source.keystore.name",
-                "nombre de almac\u00E9n de claves de origen"}, //-srckeystore
-        {"source.keystore.password.protected",
-                "almac\u00E9n de claves de origen protegido por contrase\u00F1a"}, //-srcprotected
-        {"source.keystore.provider.name",
-                "nombre de proveedor de almac\u00E9n de claves de origen"}, //-srcprovidername
-        {"source.keystore.password",
-                "contrase\u00F1a de almac\u00E9n de claves de origen"}, //-srcstorepass
-        {"source.keystore.type",
-                "tipo de almac\u00E9n de claves de origen"}, //-srcstoretype
-        {"SSL.server.host.and.port",
-                "puerto y host del servidor SSL"}, //-sslserver
-        {"signed.jar.file",
-                "archivo jar firmado"}, //=jarfile
-        {"certificate.validity.start.date.time",
-                "fecha/hora de inicio de validez del certificado"}, //-startdate
-        {"keystore.password",
-                "contrase\u00F1a de almac\u00E9n de claves"}, //-storepass
-        {"keystore.type",
-                "tipo de almac\u00E9n de claves"}, //-storetype
-        {"trust.certificates.from.cacerts",
-                "certificados de protecci\u00F3n de cacerts"}, //-trustcacerts
-        {"verbose.output",
-                "salida detallada"}, //-v
-        {"validity.number.of.days",
-                "n\u00FAmero de validez de d\u00EDas"}, //-validity
-        {"Serial.ID.of.cert.to.revoke",
-                 "identificador de serie del certificado que se va a revocar"}, //-id
-        // keytool: Running part
-        {"keytool.error.", "error de herramienta de claves: "},
-        {"Illegal.option.", "Opci\u00F3n no permitida:  "},
-        {"Illegal.value.", "Valor no permitido: "},
-        {"Unknown.password.type.", "Tipo de contrase\u00F1a desconocido: "},
-        {"Cannot.find.environment.variable.",
-                "No se ha encontrado la variable del entorno: "},
-        {"Cannot.find.file.", "No se ha encontrado el archivo: "},
-        {"Command.option.flag.needs.an.argument.", "La opci\u00F3n de comando {0} necesita un argumento."},
-        {"Warning.Different.store.and.key.passwords.not.supported.for.PKCS12.KeyStores.Ignoring.user.specified.command.value.",
-                "Advertencia: los almacenes de claves en formato PKCS12 no admiten contrase\u00F1as de clave y almacenamiento distintas. Se ignorar\u00E1 el valor especificado por el usuario, {0}."},
-        {"the.keystore.or.storetype.option.cannot.be.used.with.the.cacerts.option",
-            "Las opciones -keystore o -storetype no se pueden utilizar con la opci\u00F3n -cacerts"},
-        {".keystore.must.be.NONE.if.storetype.is.{0}",
-                "-keystore debe ser NONE si -storetype es {0}"},
-        {"Too.many.retries.program.terminated",
-                 "Ha habido demasiados intentos, se ha cerrado el programa"},
-        {".storepasswd.and.keypasswd.commands.not.supported.if.storetype.is.{0}",
-                "Los comandos -storepasswd y -keypasswd no est\u00E1n soportados si -storetype es {0}"},
-        {".keypasswd.commands.not.supported.if.storetype.is.PKCS12",
-                "Los comandos -keypasswd no est\u00E1n soportados si -storetype es PKCS12"},
-        {".keypass.and.new.can.not.be.specified.if.storetype.is.{0}",
-                "-keypass y -new no se pueden especificar si -storetype es {0}"},
-        {"if.protected.is.specified.then.storepass.keypass.and.new.must.not.be.specified",
-                "si se especifica -protected, no deben especificarse -storepass, -keypass ni -new"},
-        {"if.srcprotected.is.specified.then.srcstorepass.and.srckeypass.must.not.be.specified",
-                "Si se especifica -srcprotected, no se puede especificar -srcstorepass ni -srckeypass"},
-        {"if.keystore.is.not.password.protected.then.storepass.keypass.and.new.must.not.be.specified",
-                "Si keystore no est\u00E1 protegido por contrase\u00F1a, no se deben especificar -storepass, -keypass ni -new"},
-        {"if.source.keystore.is.not.password.protected.then.srcstorepass.and.srckeypass.must.not.be.specified",
-                "Si el almac\u00E9n de claves de origen no est\u00E1 protegido por contrase\u00F1a, no se deben especificar -srcstorepass ni -srckeypass"},
-        {"Illegal.startdate.value", "Valor de fecha de inicio no permitido"},
-        {"Validity.must.be.greater.than.zero",
-                "La validez debe ser mayor que cero"},
-        {"provclass.not.a.provider", "%s no es un proveedor"},
-        {"provider.name.not.found", "No se ha encontrado el proveedor denominado \"%s\""},
-        {"provider.class.not.found", "No se ha encontrado el proveedor \"%s\""},
-        {"Usage.error.no.command.provided", "Error de sintaxis: no se ha proporcionado ning\u00FAn comando"},
-        {"Source.keystore.file.exists.but.is.empty.", "El archivo de almac\u00E9n de claves de origen existe, pero est\u00E1 vac\u00EDo: "},
-        {"Please.specify.srckeystore", "Especifique -srckeystore"},
-        {"Must.not.specify.both.v.and.rfc.with.list.command",
-                "No se deben especificar -v y -rfc simult\u00E1neamente con el comando 'list'"},
-        {"Key.password.must.be.at.least.6.characters",
-                "La contrase\u00F1a de clave debe tener al menos 6 caracteres"},
-        {"New.password.must.be.at.least.6.characters",
-                "La nueva contrase\u00F1a debe tener al menos 6 caracteres"},
-        {"Keystore.file.exists.but.is.empty.",
-                "El archivo de almac\u00E9n de claves existe, pero est\u00E1 vac\u00EDo: "},
-        {"Keystore.file.does.not.exist.",
-                "El archivo de almac\u00E9n de claves no existe: "},
-        {"Must.specify.destination.alias", "Se debe especificar un alias de destino"},
-        {"Must.specify.alias", "Se debe especificar un alias"},
-        {"Keystore.password.must.be.at.least.6.characters",
-                "La contrase\u00F1a del almac\u00E9n de claves debe tener al menos 6 caracteres"},
-        {"Enter.the.password.to.be.stored.",
-                "Introduzca la contrase\u00F1a que se va a almacenar:  "},
-        {"Enter.keystore.password.", "Introduzca la contrase\u00F1a del almac\u00E9n de claves:  "},
-        {"Enter.source.keystore.password.", "Introduzca la contrase\u00F1a de almac\u00E9n de claves de origen:  "},
-        {"Enter.destination.keystore.password.", "Introduzca la contrase\u00F1a de almac\u00E9n de claves de destino:  "},
-        {"Keystore.password.is.too.short.must.be.at.least.6.characters",
-         "La contrase\u00F1a del almac\u00E9n de claves es demasiado corta, debe tener al menos 6 caracteres"},
-        {"Unknown.Entry.Type", "Tipo de Entrada Desconocido"},
-        {"Too.many.failures.Alias.not.changed", "Demasiados fallos. No se ha cambiado el alias"},
-        {"Entry.for.alias.alias.successfully.imported.",
-                 "La entrada del alias {0} se ha importado correctamente."},
-        {"Entry.for.alias.alias.not.imported.", "La entrada del alias {0} no se ha importado."},
-        {"Problem.importing.entry.for.alias.alias.exception.Entry.for.alias.alias.not.imported.",
-                 "Problema al importar la entrada del alias {0}: {1}.\nNo se ha importado la entrada del alias {0}."},
-        {"Import.command.completed.ok.entries.successfully.imported.fail.entries.failed.or.cancelled",
-                 "Comando de importaci\u00F3n completado: {0} entradas importadas correctamente, {1} entradas incorrectas o canceladas"},
-        {"Warning.Overwriting.existing.alias.alias.in.destination.keystore",
-                 "Advertencia: se sobrescribir\u00E1 el alias {0} en el almac\u00E9n de claves de destino"},
-        {"Existing.entry.alias.alias.exists.overwrite.no.",
-                 "El alias de entrada existente {0} ya existe, \u00BFdesea sobrescribirlo? [no]:  "},
-        {"Too.many.failures.try.later", "Demasiados fallos; int\u00E9ntelo m\u00E1s adelante"},
-        {"Certification.request.stored.in.file.filename.",
-                "Solicitud de certificaci\u00F3n almacenada en el archivo <{0}>"},
-        {"Submit.this.to.your.CA", "Enviar a la CA"},
-        {"if.alias.not.specified.destalias.and.srckeypass.must.not.be.specified",
-            "si no se especifica el alias, no se debe especificar destalias ni srckeypass"},
-        {"The.destination.pkcs12.keystore.has.different.storepass.and.keypass.Please.retry.with.destkeypass.specified.",
-            "El almac\u00E9n de claves pkcs12 de destino tiene storepass y keypass diferentes. Vuelva a intentarlo con -destkeypass especificado."},
-        {"Certificate.stored.in.file.filename.",
-                "Certificado almacenado en el archivo <{0}>"},
-        {"Certificate.reply.was.installed.in.keystore",
-                "Se ha instalado la respuesta del certificado en el almac\u00E9n de claves"},
-        {"Certificate.reply.was.not.installed.in.keystore",
-                "No se ha instalado la respuesta del certificado en el almac\u00E9n de claves"},
-        {"Certificate.was.added.to.keystore",
-                "Se ha agregado el certificado al almac\u00E9n de claves"},
-        {"Certificate.was.not.added.to.keystore",
-                "No se ha agregado el certificado al almac\u00E9n de claves"},
-        {".Storing.ksfname.", "[Almacenando {0}]"},
-        {"alias.has.no.public.key.certificate.",
-                "{0} no tiene clave p\u00FAblica (certificado)"},
-        {"Cannot.derive.signature.algorithm",
-                "No se puede derivar el algoritmo de firma"},
-        {"Alias.alias.does.not.exist",
-                "El alias <{0}> no existe"},
-        {"Alias.alias.has.no.certificate",
-                "El alias <{0}> no tiene certificado"},
-        {"Key.pair.not.generated.alias.alias.already.exists",
-                "No se ha generado el par de claves, el alias <{0}> ya existe"},
-        {"Generating.keysize.bit.keyAlgName.key.pair.and.self.signed.certificate.sigAlgName.with.a.validity.of.validality.days.for",
-                "Generando par de claves {1} de {0} bits para certificado autofirmado ({2}) con una validez de {3} d\u00EDas\n\tpara: {4}"},
-        {"Enter.key.password.for.alias.", "Introduzca la contrase\u00F1a de clave para <{0}>"},
-        {".RETURN.if.same.as.keystore.password.",
-                "\t(INTRO si es la misma contrase\u00F1a que la del almac\u00E9n de claves):  "},
-        {"Key.password.is.too.short.must.be.at.least.6.characters",
-                "La contrase\u00F1a de clave es demasiado corta; debe tener al menos 6 caracteres"},
-        {"Too.many.failures.key.not.added.to.keystore",
-                "Demasiados fallos; no se ha agregado la clave al almac\u00E9n de claves"},
-        {"Destination.alias.dest.already.exists",
-                "El alias de destino <{0}> ya existe"},
-        {"Password.is.too.short.must.be.at.least.6.characters",
-                "La contrase\u00F1a es demasiado corta; debe tener al menos 6 caracteres"},
-        {"Too.many.failures.Key.entry.not.cloned",
-                "Demasiados fallos. No se ha clonado la entrada de clave"},
-        {"key.password.for.alias.", "contrase\u00F1a de clave para <{0}>"},
-        {"Keystore.entry.for.id.getName.already.exists",
-                "La entrada de almac\u00E9n de claves para <{0}> ya existe"},
-        {"Creating.keystore.entry.for.id.getName.",
-                "Creando entrada de almac\u00E9n de claves para <{0}> ..."},
-        {"No.entries.from.identity.database.added",
-                "No se han agregado entradas de la base de datos de identidades"},
-        {"Alias.name.alias", "Nombre de Alias: {0}"},
-        {"Creation.date.keyStore.getCreationDate.alias.",
-                "Fecha de Creaci\u00F3n: {0,date}"},
-        {"alias.keyStore.getCreationDate.alias.",
-                "{0}, {1,date}, "},
-        {"alias.", "{0}, "},
-        {"Entry.type.type.", "Tipo de Entrada: {0}"},
-        {"Certificate.chain.length.", "Longitud de la Cadena de Certificado: "},
-        {"Certificate.i.1.", "Certificado[{0,number,integer}]:"},
-        {"Certificate.fingerprint.SHA.256.", "Huella de certificado (SHA-256): "},
-        {"Keystore.type.", "Tipo de Almac\u00E9n de Claves: "},
-        {"Keystore.provider.", "Proveedor de Almac\u00E9n de Claves: "},
-        {"Your.keystore.contains.keyStore.size.entry",
-                "Su almac\u00E9n de claves contiene {0,number,integer} entrada"},
-        {"Your.keystore.contains.keyStore.size.entries",
-                "Su almac\u00E9n de claves contiene {0,number,integer} entradas"},
-        {"Failed.to.parse.input", "Fallo al analizar la entrada"},
-        {"Empty.input", "Entrada vac\u00EDa"},
-        {"Not.X.509.certificate", "No es un certificado X.509"},
-        {"alias.has.no.public.key", "{0} no tiene clave p\u00FAblica"},
-        {"alias.has.no.X.509.certificate", "{0} no tiene certificado X.509"},
-        {"New.certificate.self.signed.", "Nuevo Certificado (Autofirmado):"},
-        {"Reply.has.no.certificates", "La respuesta no tiene certificados"},
-        {"Certificate.not.imported.alias.alias.already.exists",
-                "Certificado no importado, el alias <{0}> ya existe"},
-        {"Input.not.an.X.509.certificate", "La entrada no es un certificado X.509"},
-        {"Certificate.already.exists.in.keystore.under.alias.trustalias.",
-                "El certificado ya existe en el almac\u00E9n de claves con el alias <{0}>"},
-        {"Do.you.still.want.to.add.it.no.",
-                "\u00BFA\u00FAn desea agregarlo? [no]:  "},
-        {"Certificate.already.exists.in.system.wide.CA.keystore.under.alias.trustalias.",
-                "El certificado ya existe en el almac\u00E9n de claves de la CA del sistema, con el alias <{0}>"},
-        {"Do.you.still.want.to.add.it.to.your.own.keystore.no.",
-                "\u00BFA\u00FAn desea agregarlo a su propio almac\u00E9n de claves? [no]:  "},
-        {"Trust.this.certificate.no.", "\u00BFConfiar en este certificado? [no]:  "},
-        {"YES", "S\u00CD"},
-        {"New.prompt.", "Nuevo {0}: "},
-        {"Passwords.must.differ", "Las contrase\u00F1as deben ser distintas"},
-        {"Re.enter.new.prompt.", "Vuelva a escribir el nuevo {0}: "},
-        {"Re.enter.password.", "Vuelva a introducir la contrase\u00F1a: "},
-        {"Re.enter.new.password.", "Volver a escribir la contrase\u00F1a nueva: "},
-        {"They.don.t.match.Try.again", "No coinciden. Int\u00E9ntelo de nuevo"},
-        {"Enter.prompt.alias.name.", "Escriba el nombre de alias de {0}:  "},
-        {"Enter.new.alias.name.RETURN.to.cancel.import.for.this.entry.",
-                 "Indique el nuevo nombre de alias\t(INTRO para cancelar la importaci\u00F3n de esta entrada):  "},
-        {"Enter.alias.name.", "Introduzca el nombre de alias:  "},
-        {".RETURN.if.same.as.for.otherAlias.",
-                "\t(INTRO si es el mismo que para <{0}>)"},
-        {"What.is.your.first.and.last.name.",
-                "\u00BFCu\u00E1les son su nombre y su apellido?"},
-        {"What.is.the.name.of.your.organizational.unit.",
-                "\u00BFCu\u00E1l es el nombre de su unidad de organizaci\u00F3n?"},
-        {"What.is.the.name.of.your.organization.",
-                "\u00BFCu\u00E1l es el nombre de su organizaci\u00F3n?"},
-        {"What.is.the.name.of.your.City.or.Locality.",
-                "\u00BFCu\u00E1l es el nombre de su ciudad o localidad?"},
-        {"What.is.the.name.of.your.State.or.Province.",
-                "\u00BFCu\u00E1l es el nombre de su estado o provincia?"},
-        {"What.is.the.two.letter.country.code.for.this.unit.",
-                "\u00BFCu\u00E1l es el c\u00F3digo de pa\u00EDs de dos letras de la unidad?"},
-        {"Is.name.correct.", "\u00BFEs correcto {0}?"},
-        {"no", "no"},
-        {"yes", "s\u00ED"},
-        {"y", "s"},
-        {".defaultValue.", "  [{0}]:  "},
-        {"Alias.alias.has.no.key",
-                "El alias <{0}> no tiene clave"},
-        {"Alias.alias.references.an.entry.type.that.is.not.a.private.key.entry.The.keyclone.command.only.supports.cloning.of.private.key",
-                 "El alias <{0}> hace referencia a un tipo de entrada que no es una clave privada. El comando -keyclone s\u00F3lo permite la clonaci\u00F3n de entradas de claves privadas"},
-
-        {".WARNING.WARNING.WARNING.",
-            "*****************  WARNING WARNING WARNING  *****************"},
-        {"Signer.d.", "#%d de Firmante:"},
-        {"Timestamp.", "Registro de Hora:"},
-        {"Signature.", "Firma:"},
-        {"CRLs.", "CRL:"},
-        {"Certificate.owner.", "Propietario del Certificado: "},
-        {"Not.a.signed.jar.file", "No es un archivo jar firmado"},
-        {"No.certificate.from.the.SSL.server",
-                "Ning\u00FAn certificado del servidor SSL"},
-
-        {".The.integrity.of.the.information.stored.in.your.keystore.",
-            "* La integridad de la informaci\u00F3n almacenada en el almac\u00E9n de claves  *\n* NO se ha comprobado.  Para comprobar dicha integridad, *\n* debe proporcionar la contrase\u00F1a del almac\u00E9n de claves.                  *"},
-        {".The.integrity.of.the.information.stored.in.the.srckeystore.",
-            "* La integridad de la informaci\u00F3n almacenada en srckeystore*\n* NO se ha comprobado.  Para comprobar dicha integridad, *\n* debe proporcionar la contrase\u00F1a de srckeystore.                *"},
-
-        {"Certificate.reply.does.not.contain.public.key.for.alias.",
-                "La respuesta de certificado no contiene una clave p\u00FAblica para <{0}>"},
-        {"Incomplete.certificate.chain.in.reply",
-                "Cadena de certificado incompleta en la respuesta"},
-        {"Certificate.chain.in.reply.does.not.verify.",
-                "La cadena de certificado de la respuesta no verifica: "},
-        {"Top.level.certificate.in.reply.",
-                "Certificado de nivel superior en la respuesta:\n"},
-        {".is.not.trusted.", "... no es de confianza. "},
-        {"Install.reply.anyway.no.", "\u00BFInstalar respuesta de todos modos? [no]:  "},
-        {"NO", "NO"},
-        {"Public.keys.in.reply.and.keystore.don.t.match",
-                "Las claves p\u00FAblicas en la respuesta y en el almac\u00E9n de claves no coinciden"},
-        {"Certificate.reply.and.certificate.in.keystore.are.identical",
-                "La respuesta del certificado y el certificado en el almac\u00E9n de claves son id\u00E9nticos"},
-        {"Failed.to.establish.chain.from.reply",
-                "No se ha podido definir una cadena a partir de la respuesta"},
-        {"n", "n"},
-        {"Wrong.answer.try.again", "Respuesta incorrecta, vuelva a intentarlo"},
-        {"Secret.key.not.generated.alias.alias.already.exists",
-                "No se ha generado la clave secreta, el alias <{0}> ya existe"},
-        {"Please.provide.keysize.for.secret.key.generation",
-                "Proporcione el valor de -keysize para la generaci\u00F3n de claves secretas"},
-
-        {"warning.not.verified.make.sure.keystore.is.correct",
-            "ADVERTENCIA: no se ha verificado. Aseg\u00FArese de que el valor de -keystore es correcto."},
-
-        {"Extensions.", "Extensiones: "},
-        {".Empty.value.", "(Valor vac\u00EDo)"},
-        {"Extension.Request.", "Solicitud de Extensi\u00F3n:"},
-        {"Unknown.keyUsage.type.", "Tipo de uso de clave desconocido: "},
-        {"Unknown.extendedkeyUsage.type.", "Tipo de uso de clave extendida desconocido: "},
-        {"Unknown.AccessDescription.type.", "Tipo de descripci\u00F3n de acceso desconocido: "},
-        {"Unrecognized.GeneralName.type.", "Tipo de nombre general no reconocido: "},
-        {"This.extension.cannot.be.marked.as.critical.",
-                 "Esta extensi\u00F3n no se puede marcar como cr\u00EDtica. "},
-        {"Odd.number.of.hex.digits.found.", "Se ha encontrado un n\u00FAmero impar de d\u00EDgitos hexadecimales: "},
-        {"Unknown.extension.type.", "Tipo de extensi\u00F3n desconocida: "},
-        {"command.{0}.is.ambiguous.", "El comando {0} es ambiguo:"},
-
-        // 8171319: keytool should print out warnings when reading or
-        // generating cert/cert req using weak algorithms
-        {"the.certificate.request", "La solicitud de certificado"},
-        {"the.issuer", "El emisor"},
-        {"the.generated.certificate", "El certificado generado"},
-        {"the.generated.crl", "La CRL generada"},
-        {"the.generated.certificate.request", "La solicitud de certificado generada"},
-        {"the.certificate", "El certificado"},
-        {"the.crl", "La CRL"},
-        {"the.tsa.certificate", "El certificado de TSA"},
-        {"the.input", "La entrada"},
-        {"reply", "Responder"},
-        {"one.in.many", "%1$s #%2$d de %3$d"},
-        {"alias.in.cacerts", "Emisor <%s> en cacerts"},
-        {"alias.in.keystore", "Emisor <%s>"},
-        {"with.weak", "%s (d\u00E9bil)"},
-        {"key.bit", "Clave %2$s de %1$d bits"},
-        {"key.bit.weak", "Clave %2$s de %1$d bits (d\u00E9bil)"},
-        {"unknown.size.1", "clave %s de tama\u00F1o desconocido"},
-        {".PATTERN.printX509Cert.with.weak",
-                "Propietario: {0}\nEmisor: {1}\nN\u00FAmero de serie: {2}\nV\u00E1lido desde: {3} hasta: {4}\nHuellas digitales del certificado:\n\t SHA1: {5}\n\t SHA256: {6}\nNombre del algoritmo de firma: {7}\nAlgoritmo de clave p\u00FAblica de asunto: {8}\nVersi\u00F3n: {9}"},
-        {"PKCS.10.with.weak",
-                "Solicitud de certificado PKCS #10 (Versi\u00F3n 1.0)\nAsunto: %1$s\nFormato: %2$s\nClave p\u00FAblica: %3$s\nAlgoritmo de firma: %4$s\n"},
-        {"verified.by.s.in.s.weak", "Verificado por %1$s en %2$s con %3$s"},
-        {"whose.sigalg.risk", "%1$s utiliza el algoritmo de firma %2$s, lo que se considera un riesgo de seguridad."},
-        {"whose.key.risk", "%1$s utiliza %2$s, lo que se considera riesgo de seguridad."},
-        {"jks.storetype.warning", "El almac\u00E9n de claves %1$s utiliza un formato propietario. Se recomienda migrar a PKCS12, que es un formato est\u00E1ndar del sector que utiliza \"keytool -importkeystore -srckeystore %2$s -destkeystore %2$s -deststoretype pkcs12\"."},
-        {"migrate.keystore.warning", "Se ha migrado \"%1$s\" a %4$s. Se ha realizado la copia de seguridad del almac\u00E9n de claves %2$s como \"%3$s\"."},
-        {"backup.keystore.warning", "La copia de seguridad del almac\u00E9n de claves \"%1$s\" se ha realizado como \"%3$s\"..."},
-        {"importing.keystore.status", "Importando el almac\u00E9n de claves de %1$s a %2$s..."},
-    };
-
-
-    /**
-     * Returns the contents of this <code>ResourceBundle</code>.
-     *
-     * <p>
-     *
-     * @return the contents of this <code>ResourceBundle</code>.
-     */
-    @Override
-    public Object[][] getContents() {
-        return contents;
-    }
-}
diff --git a/src/java.base/share/classes/sun/security/tools/keytool/Resources_fr.java b/src/java.base/share/classes/sun/security/tools/keytool/Resources_fr.java
deleted file mode 100644
index 6ad6a0f69ad..00000000000
--- a/src/java.base/share/classes/sun/security/tools/keytool/Resources_fr.java
+++ /dev/null
@@ -1,484 +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.  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.tools.keytool;
-
-/**
- * <p> This class represents the <code>ResourceBundle</code>
- * for the keytool.
- *
- */
-public class Resources_fr extends java.util.ListResourceBundle {
-
-    private static final Object[][] contents = {
-        {"NEWLINE", "\n"},
-        {"STAR",
-                "*******************************************"},
-        {"STARNN",
-                "*******************************************\n\n"},
-
-        // keytool: Help part
-        {".OPTION.", " [OPTION]..."},
-        {"Options.", "Options :"},
-        {"option.1.set.twice", "L'option %s est sp\u00E9cifi\u00E9e plusieurs fois. Toutes les occurrences seront ignor\u00E9es, sauf la derni\u00E8re."},
-        {"multiple.commands.1.2", "Une seule commande est autoris\u00E9e : %1$s et %2$s ont \u00E9t\u00E9 sp\u00E9cifi\u00E9es."},
-        {"Use.keytool.help.for.all.available.commands",
-                 "Utiliser \"keytool -help\" pour toutes les commandes disponibles"},
-        {"Key.and.Certificate.Management.Tool",
-                 "Outil de gestion de certificats et de cl\u00E9s"},
-        {"Commands.", "Commandes :"},
-        {"Use.keytool.command.name.help.for.usage.of.command.name",
-                "Utilisez \"keytool -command_name -help\" pour la syntaxe de command_name.\nUtilisez l'option -conf <url> pour indiquer un fichier d'options pr\u00E9configur\u00E9es."},
-        // keytool: help: commands
-        {"Generates.a.certificate.request",
-                "G\u00E9n\u00E8re une demande de certificat"}, //-certreq
-        {"Changes.an.entry.s.alias",
-                "Modifie l'alias d'une entr\u00E9e"}, //-changealias
-        {"Deletes.an.entry",
-                "Supprime une entr\u00E9e"}, //-delete
-        {"Exports.certificate",
-                "Exporte le certificat"}, //-exportcert
-        {"Generates.a.key.pair",
-                "G\u00E9n\u00E8re une paire de cl\u00E9s"}, //-genkeypair
-        {"Generates.a.secret.key",
-                "G\u00E9n\u00E8re une cl\u00E9 secr\u00E8te"}, //-genseckey
-        {"Generates.certificate.from.a.certificate.request",
-                "G\u00E9n\u00E8re le certificat \u00E0 partir d'une demande de certificat"}, //-gencert
-        {"Generates.CRL", "G\u00E9n\u00E8re la liste des certificats r\u00E9voqu\u00E9s (CRL)"}, //-gencrl
-        {"Generated.keyAlgName.secret.key",
-                "Cl\u00E9 secr\u00E8te {0} g\u00E9n\u00E9r\u00E9e"}, //-genseckey
-        {"Generated.keysize.bit.keyAlgName.secret.key",
-                "Cl\u00E9 secr\u00E8te {0} bits {1} g\u00E9n\u00E9r\u00E9e"}, //-genseckey
-        {"Imports.entries.from.a.JDK.1.1.x.style.identity.database",
-                "Importe les entr\u00E9es \u00E0 partir d'une base de donn\u00E9es d'identit\u00E9s de type JDK 1.1.x"}, //-identitydb
-        {"Imports.a.certificate.or.a.certificate.chain",
-                "Importe un certificat ou une cha\u00EEne de certificat"}, //-importcert
-        {"Imports.a.password",
-                "Importe un mot de passe"}, //-importpass
-        {"Imports.one.or.all.entries.from.another.keystore",
-                "Importe une entr\u00E9e ou la totalit\u00E9 des entr\u00E9es depuis un autre fichier de cl\u00E9s"}, //-importkeystore
-        {"Clones.a.key.entry",
-                "Clone une entr\u00E9e de cl\u00E9"}, //-keyclone
-        {"Changes.the.key.password.of.an.entry",
-                "Modifie le mot de passe de cl\u00E9 d'une entr\u00E9e"}, //-keypasswd
-        {"Lists.entries.in.a.keystore",
-                "R\u00E9pertorie les entr\u00E9es d'un fichier de cl\u00E9s"}, //-list
-        {"Prints.the.content.of.a.certificate",
-                "Imprime le contenu d'un certificat"}, //-printcert
-        {"Prints.the.content.of.a.certificate.request",
-                "Imprime le contenu d'une demande de certificat"}, //-printcertreq
-        {"Prints.the.content.of.a.CRL.file",
-                "Imprime le contenu d'un fichier de liste des certificats r\u00E9voqu\u00E9s (CRL)"}, //-printcrl
-        {"Generates.a.self.signed.certificate",
-                "G\u00E9n\u00E8re un certificat auto-sign\u00E9"}, //-selfcert
-        {"Changes.the.store.password.of.a.keystore",
-                "Modifie le mot de passe de banque d'un fichier de cl\u00E9s"}, //-storepasswd
-        // keytool: help: options
-        {"alias.name.of.the.entry.to.process",
-                "nom d'alias de l'entr\u00E9e \u00E0 traiter"}, //-alias
-        {"destination.alias",
-                "alias de destination"}, //-destalias
-        {"destination.key.password",
-                "mot de passe de la cl\u00E9 de destination"}, //-destkeypass
-        {"destination.keystore.name",
-                "nom du fichier de cl\u00E9s de destination"}, //-destkeystore
-        {"destination.keystore.password.protected",
-                "mot de passe du fichier de cl\u00E9s de destination prot\u00E9g\u00E9"}, //-destprotected
-        {"destination.keystore.provider.name",
-                "nom du fournisseur du fichier de cl\u00E9s de destination"}, //-destprovidername
-        {"destination.keystore.password",
-                "mot de passe du fichier de cl\u00E9s de destination"}, //-deststorepass
-        {"destination.keystore.type",
-                "type du fichier de cl\u00E9s de destination"}, //-deststoretype
-        {"distinguished.name",
-                "nom distinctif"}, //-dname
-        {"X.509.extension",
-                "extension X.509"}, //-ext
-        {"output.file.name",
-                "nom du fichier de sortie"}, //-file and -outfile
-        {"input.file.name",
-                "nom du fichier d'entr\u00E9e"}, //-file and -infile
-        {"key.algorithm.name",
-                "nom de l'algorithme de cl\u00E9"}, //-keyalg
-        {"key.password",
-                "mot de passe de la cl\u00E9"}, //-keypass
-        {"key.bit.size",
-                "taille en bits de la cl\u00E9"}, //-keysize
-        {"keystore.name",
-                "nom du fichier de cl\u00E9s"}, //-keystore
-        {"access.the.cacerts.keystore",
-                "acc\u00E9der au fichier de cl\u00E9s cacerts"}, // -cacerts
-        {"warning.cacerts.option",
-                "Avertissement : utiliser l'option -cacerts pour acc\u00E9der au fichier de cl\u00E9s cacerts"},
-        {"new.password",
-                "nouveau mot de passe"}, //-new
-        {"do.not.prompt",
-                "ne pas inviter"}, //-noprompt
-        {"password.through.protected.mechanism",
-                "mot de passe via m\u00E9canisme prot\u00E9g\u00E9"}, //-protected
-
-        // The following 2 values should span 2 lines, the first for the
-        // option itself, the second for its -providerArg value.
-        {"addprovider.option",
-                "ajouter un fournisseur de s\u00E9curit\u00E9 par nom (par ex. SunPKCS11)\nconfigurer l'argument pour -addprovider"}, //-addprovider
-        {"provider.class.option",
-                "ajouter un fournisseur de s\u00E9curit\u00E9 par nom de classe qualifi\u00E9 complet\nconfigurer l'argument pour -providerclass"}, //-providerclass
-
-        {"provider.name",
-                "nom du fournisseur"}, //-providername
-        {"provider.classpath",
-                "variable d'environnement CLASSPATH du fournisseur"}, //-providerpath
-        {"output.in.RFC.style",
-                "sortie au style RFC"}, //-rfc
-        {"signature.algorithm.name",
-                "nom de l'algorithme de signature"}, //-sigalg
-        {"source.alias",
-                "alias source"}, //-srcalias
-        {"source.key.password",
-                "mot de passe de la cl\u00E9 source"}, //-srckeypass
-        {"source.keystore.name",
-                "nom du fichier de cl\u00E9s source"}, //-srckeystore
-        {"source.keystore.password.protected",
-                "mot de passe du fichier de cl\u00E9s source prot\u00E9g\u00E9"}, //-srcprotected
-        {"source.keystore.provider.name",
-                "nom du fournisseur du fichier de cl\u00E9s source"}, //-srcprovidername
-        {"source.keystore.password",
-                "mot de passe du fichier de cl\u00E9s source"}, //-srcstorepass
-        {"source.keystore.type",
-                "type du fichier de cl\u00E9s source"}, //-srcstoretype
-        {"SSL.server.host.and.port",
-                "Port et h\u00F4te du serveur SSL"}, //-sslserver
-        {"signed.jar.file",
-                "fichier JAR sign\u00E9"}, //=jarfile
-        {"certificate.validity.start.date.time",
-                "date/heure de d\u00E9but de validit\u00E9 du certificat"}, //-startdate
-        {"keystore.password",
-                "mot de passe du fichier de cl\u00E9s"}, //-storepass
-        {"keystore.type",
-                "type du fichier de cl\u00E9s"}, //-storetype
-        {"trust.certificates.from.cacerts",
-                "certificats s\u00E9curis\u00E9s issus de certificats CA"}, //-trustcacerts
-        {"verbose.output",
-                "sortie en mode verbose"}, //-v
-        {"validity.number.of.days",
-                "nombre de jours de validit\u00E9"}, //-validity
-        {"Serial.ID.of.cert.to.revoke",
-                 "ID de s\u00E9rie du certificat \u00E0 r\u00E9voquer"}, //-id
-        // keytool: Running part
-        {"keytool.error.", "erreur keytool : "},
-        {"Illegal.option.", "Option non admise :  "},
-        {"Illegal.value.", "Valeur non admise : "},
-        {"Unknown.password.type.", "Type de mot de passe inconnu : "},
-        {"Cannot.find.environment.variable.",
-                "Variable d'environnement introuvable : "},
-        {"Cannot.find.file.", "Fichier introuvable : "},
-        {"Command.option.flag.needs.an.argument.", "L''option de commande {0} requiert un argument."},
-        {"Warning.Different.store.and.key.passwords.not.supported.for.PKCS12.KeyStores.Ignoring.user.specified.command.value.",
-                "Avertissement\u00A0: les mots de passe de cl\u00E9 et de banque distincts ne sont pas pris en charge pour les fichiers de cl\u00E9s d''acc\u00E8s PKCS12. La valeur {0} sp\u00E9cifi\u00E9e par l''utilisateur est ignor\u00E9e."},
-        {"the.keystore.or.storetype.option.cannot.be.used.with.the.cacerts.option",
-            "Les options -keystore ou -storetype ne peuvent pas \u00EAtre utilis\u00E9es avec l'option -cacerts"},
-        {".keystore.must.be.NONE.if.storetype.is.{0}",
-                "-keystore doit \u00EAtre d\u00E9fini sur NONE si -storetype est {0}"},
-        {"Too.many.retries.program.terminated",
-                 "Trop de tentatives, fin du programme"},
-        {".storepasswd.and.keypasswd.commands.not.supported.if.storetype.is.{0}",
-                "Les commandes -storepasswd et -keypasswd ne sont pas prises en charge si -storetype est d\u00E9fini sur {0}"},
-        {".keypasswd.commands.not.supported.if.storetype.is.PKCS12",
-                "Les commandes -keypasswd ne sont pas prises en charge si -storetype est d\u00E9fini sur PKCS12"},
-        {".keypass.and.new.can.not.be.specified.if.storetype.is.{0}",
-                "Les commandes -keypass et -new ne peuvent pas \u00EAtre sp\u00E9cifi\u00E9es si -storetype est d\u00E9fini sur {0}"},
-        {"if.protected.is.specified.then.storepass.keypass.and.new.must.not.be.specified",
-                "si -protected est sp\u00E9cifi\u00E9, -storepass, -keypass et -new ne doivent pas \u00EAtre indiqu\u00E9s"},
-        {"if.srcprotected.is.specified.then.srcstorepass.and.srckeypass.must.not.be.specified",
-                "Si -srcprotected est indiqu\u00E9, les commandes -srcstorepass et -srckeypass ne doivent pas \u00EAtre sp\u00E9cifi\u00E9es"},
-        {"if.keystore.is.not.password.protected.then.storepass.keypass.and.new.must.not.be.specified",
-                "Si le fichier de cl\u00E9s n'est pas prot\u00E9g\u00E9 par un mot de passe, les commandes -storepass, -keypass et -new ne doivent pas \u00EAtre sp\u00E9cifi\u00E9es"},
-        {"if.source.keystore.is.not.password.protected.then.srcstorepass.and.srckeypass.must.not.be.specified",
-                "Si le fichier de cl\u00E9s source n'est pas prot\u00E9g\u00E9 par un mot de passe, les commandes -srcstorepass et -srckeypass ne doivent pas \u00EAtre sp\u00E9cifi\u00E9es"},
-        {"Illegal.startdate.value", "Valeur de date de d\u00E9but non admise"},
-        {"Validity.must.be.greater.than.zero",
-                "La validit\u00E9 doit \u00EAtre sup\u00E9rieure \u00E0 z\u00E9ro"},
-        {"provclass.not.a.provider", "%s n'est pas un fournisseur"},
-        {"provider.name.not.found", "Fournisseur nomm\u00E9 \"%s\" introuvable"},
-        {"provider.class.not.found", "Fournisseur \"%s\" introuvable"},
-        {"Usage.error.no.command.provided", "Erreur de syntaxe\u00A0: aucune commande fournie"},
-        {"Source.keystore.file.exists.but.is.empty.", "Le fichier de cl\u00E9s source existe mais il est vide : "},
-        {"Please.specify.srckeystore", "Indiquez -srckeystore"},
-        {"Must.not.specify.both.v.and.rfc.with.list.command",
-                "-v et -rfc ne doivent pas \u00EAtre sp\u00E9cifi\u00E9s avec la commande 'list'"},
-        {"Key.password.must.be.at.least.6.characters",
-                "Un mot de passe de cl\u00E9 doit comporter au moins 6 caract\u00E8res"},
-        {"New.password.must.be.at.least.6.characters",
-                "Le nouveau mot de passe doit comporter au moins 6 caract\u00E8res"},
-        {"Keystore.file.exists.but.is.empty.",
-                "Fichier de cl\u00E9s existant mais vide : "},
-        {"Keystore.file.does.not.exist.",
-                "Le fichier de cl\u00E9s n'existe pas : "},
-        {"Must.specify.destination.alias", "L'alias de destination doit \u00EAtre sp\u00E9cifi\u00E9"},
-        {"Must.specify.alias", "L'alias doit \u00EAtre sp\u00E9cifi\u00E9"},
-        {"Keystore.password.must.be.at.least.6.characters",
-                "Un mot de passe de fichier de cl\u00E9s doit comporter au moins 6 caract\u00E8res"},
-        {"Enter.the.password.to.be.stored.",
-                "Saisissez le mot de passe \u00E0 stocker :  "},
-        {"Enter.keystore.password.", "Entrez le mot de passe du fichier de cl\u00E9s :  "},
-        {"Enter.source.keystore.password.", "Entrez le mot de passe du fichier de cl\u00E9s source\u00A0:  "},
-        {"Enter.destination.keystore.password.", "Entrez le mot de passe du fichier de cl\u00E9s de destination\u00A0:  "},
-        {"Keystore.password.is.too.short.must.be.at.least.6.characters",
-         "Le mot de passe du fichier de cl\u00E9s est trop court : il doit comporter au moins 6 caract\u00E8res"},
-        {"Unknown.Entry.Type", "Type d'entr\u00E9e inconnu"},
-        {"Too.many.failures.Alias.not.changed", "Trop d'erreurs. Alias non modifi\u00E9"},
-        {"Entry.for.alias.alias.successfully.imported.",
-                 "L''entr\u00E9e de l''alias {0} a \u00E9t\u00E9 import\u00E9e."},
-        {"Entry.for.alias.alias.not.imported.", "L''entr\u00E9e de l''alias {0} n''a pas \u00E9t\u00E9 import\u00E9e."},
-        {"Problem.importing.entry.for.alias.alias.exception.Entry.for.alias.alias.not.imported.",
-                 "Probl\u00E8me lors de l''import de l''entr\u00E9e de l''alias {0}\u00A0: {1}.\nL''entr\u00E9e de l''alias {0} n''a pas \u00E9t\u00E9 import\u00E9e."},
-        {"Import.command.completed.ok.entries.successfully.imported.fail.entries.failed.or.cancelled",
-                 "Commande d''import ex\u00E9cut\u00E9e\u00A0: {0} entr\u00E9es import\u00E9es, \u00E9chec ou annulation de {1} entr\u00E9es"},
-        {"Warning.Overwriting.existing.alias.alias.in.destination.keystore",
-                 "Avertissement\u00A0: l''alias {0} existant sera remplac\u00E9 dans le fichier de cl\u00E9s d''acc\u00E8s de destination"},
-        {"Existing.entry.alias.alias.exists.overwrite.no.",
-                 "L''alias d''entr\u00E9e {0} existe d\u00E9j\u00E0. Voulez-vous le remplacer ? [non]\u00A0:  "},
-        {"Too.many.failures.try.later", "Trop d'erreurs. R\u00E9essayez plus tard"},
-        {"Certification.request.stored.in.file.filename.",
-                "Demande de certification stock\u00E9e dans le fichier <{0}>"},
-        {"Submit.this.to.your.CA", "Soumettre \u00E0 votre CA"},
-        {"if.alias.not.specified.destalias.and.srckeypass.must.not.be.specified",
-            "si l'alias n'est pas sp\u00E9cifi\u00E9, destalias et srckeypass ne doivent pas \u00EAtre sp\u00E9cifi\u00E9s"},
-        {"The.destination.pkcs12.keystore.has.different.storepass.and.keypass.Please.retry.with.destkeypass.specified.",
-            "Le fichier de cl\u00E9s pkcs12 de destination contient un mot de passe de fichier de cl\u00E9s et un mot de passe de cl\u00E9 diff\u00E9rents. R\u00E9essayez en sp\u00E9cifiant -destkeypass."},
-        {"Certificate.stored.in.file.filename.",
-                "Certificat stock\u00E9 dans le fichier <{0}>"},
-        {"Certificate.reply.was.installed.in.keystore",
-                "R\u00E9ponse de certificat install\u00E9e dans le fichier de cl\u00E9s"},
-        {"Certificate.reply.was.not.installed.in.keystore",
-                "R\u00E9ponse de certificat non install\u00E9e dans le fichier de cl\u00E9s"},
-        {"Certificate.was.added.to.keystore",
-                "Certificat ajout\u00E9 au fichier de cl\u00E9s"},
-        {"Certificate.was.not.added.to.keystore",
-                "Certificat non ajout\u00E9 au fichier de cl\u00E9s"},
-        {".Storing.ksfname.", "[Stockage de {0}]"},
-        {"alias.has.no.public.key.certificate.",
-                "{0} ne poss\u00E8de pas de cl\u00E9 publique (certificat)"},
-        {"Cannot.derive.signature.algorithm",
-                "Impossible de d\u00E9duire l'algorithme de signature"},
-        {"Alias.alias.does.not.exist",
-                "L''alias <{0}> n''existe pas"},
-        {"Alias.alias.has.no.certificate",
-                "L''alias <{0}> ne poss\u00E8de pas de certificat"},
-        {"Key.pair.not.generated.alias.alias.already.exists",
-                "Paire de cl\u00E9s non g\u00E9n\u00E9r\u00E9e, l''alias <{0}> existe d\u00E9j\u00E0"},
-        {"Generating.keysize.bit.keyAlgName.key.pair.and.self.signed.certificate.sigAlgName.with.a.validity.of.validality.days.for",
-                "G\u00E9n\u00E9ration d''une paire de cl\u00E9s {1} de {0} bits et d''un certificat auto-sign\u00E9 ({2}) d''une validit\u00E9 de {3} jours\n\tpour : {4}"},
-        {"Enter.key.password.for.alias.", "Entrez le mot de passe de la cl\u00E9 pour <{0}>"},
-        {".RETURN.if.same.as.keystore.password.",
-                "\t(appuyez sur Entr\u00E9e s'il s'agit du mot de passe du fichier de cl\u00E9s) :  "},
-        {"Key.password.is.too.short.must.be.at.least.6.characters",
-                "Le mot de passe de la cl\u00E9 est trop court : il doit comporter au moins 6 caract\u00E8res"},
-        {"Too.many.failures.key.not.added.to.keystore",
-                "Trop d'erreurs. Cl\u00E9 non ajout\u00E9e au fichier de cl\u00E9s"},
-        {"Destination.alias.dest.already.exists",
-                "L''alias de la destination <{0}> existe d\u00E9j\u00E0"},
-        {"Password.is.too.short.must.be.at.least.6.characters",
-                "Le mot de passe est trop court : il doit comporter au moins 6 caract\u00E8res"},
-        {"Too.many.failures.Key.entry.not.cloned",
-                "Trop d'erreurs. Entr\u00E9e de cl\u00E9 non clon\u00E9e"},
-        {"key.password.for.alias.", "mot de passe de cl\u00E9 pour <{0}>"},
-        {"Keystore.entry.for.id.getName.already.exists",
-                "L''entr\u00E9e de fichier de cl\u00E9s d''acc\u00E8s pour <{0}> existe d\u00E9j\u00E0"},
-        {"Creating.keystore.entry.for.id.getName.",
-                "Cr\u00E9ation d''une entr\u00E9e de fichier de cl\u00E9s d''acc\u00E8s pour <{0}>..."},
-        {"No.entries.from.identity.database.added",
-                "Aucune entr\u00E9e ajout\u00E9e \u00E0 partir de la base de donn\u00E9es d'identit\u00E9s"},
-        {"Alias.name.alias", "Nom d''alias : {0}"},
-        {"Creation.date.keyStore.getCreationDate.alias.",
-                "Date de cr\u00E9ation : {0,date}"},
-        {"alias.keyStore.getCreationDate.alias.",
-                "{0}, {1,date}, "},
-        {"alias.", "{0}, "},
-        {"Entry.type.type.", "Type d''entr\u00E9e\u00A0: {0}"},
-        {"Certificate.chain.length.", "Longueur de cha\u00EEne du certificat : "},
-        {"Certificate.i.1.", "Certificat[{0,number,integer}]:"},
-        {"Certificate.fingerprint.SHA.256.", "Empreinte du certificat (SHA-256) : "},
-        {"Keystore.type.", "Type de fichier de cl\u00E9s : "},
-        {"Keystore.provider.", "Fournisseur de fichier de cl\u00E9s : "},
-        {"Your.keystore.contains.keyStore.size.entry",
-                "Votre fichier de cl\u00E9s d''acc\u00E8s contient {0,number,integer} entr\u00E9e"},
-        {"Your.keystore.contains.keyStore.size.entries",
-                "Votre fichier de cl\u00E9s d''acc\u00E8s contient {0,number,integer} entr\u00E9es"},
-        {"Failed.to.parse.input", "L'analyse de l'entr\u00E9e a \u00E9chou\u00E9"},
-        {"Empty.input", "Entr\u00E9e vide"},
-        {"Not.X.509.certificate", "Pas un certificat X.509"},
-        {"alias.has.no.public.key", "{0} ne poss\u00E8de pas de cl\u00E9 publique"},
-        {"alias.has.no.X.509.certificate", "{0} ne poss\u00E8de pas de certificat X.509"},
-        {"New.certificate.self.signed.", "Nouveau certificat (auto-sign\u00E9) :"},
-        {"Reply.has.no.certificates", "La r\u00E9ponse n'a pas de certificat"},
-        {"Certificate.not.imported.alias.alias.already.exists",
-                "Certificat non import\u00E9, l''alias <{0}> existe d\u00E9j\u00E0"},
-        {"Input.not.an.X.509.certificate", "L'entr\u00E9e n'est pas un certificat X.509"},
-        {"Certificate.already.exists.in.keystore.under.alias.trustalias.",
-                "Le certificat existe d\u00E9j\u00E0 dans le fichier de cl\u00E9s d''acc\u00E8s sous l''alias <{0}>"},
-        {"Do.you.still.want.to.add.it.no.",
-                "Voulez-vous toujours l'ajouter ? [non] :  "},
-        {"Certificate.already.exists.in.system.wide.CA.keystore.under.alias.trustalias.",
-                "Le certificat existe d\u00E9j\u00E0 dans le fichier de cl\u00E9s d''acc\u00E8s CA syst\u00E8me sous l''alias <{0}>"},
-        {"Do.you.still.want.to.add.it.to.your.own.keystore.no.",
-                "Voulez-vous toujours l'ajouter \u00E0 votre fichier de cl\u00E9s ? [non] :  "},
-        {"Trust.this.certificate.no.", "Faire confiance \u00E0 ce certificat ? [non] :  "},
-        {"YES", "OUI"},
-        {"New.prompt.", "Nouveau {0} : "},
-        {"Passwords.must.differ", "Les mots de passe doivent diff\u00E9rer"},
-        {"Re.enter.new.prompt.", "Indiquez encore le nouveau {0} : "},
-        {"Re.enter.password.", "R\u00E9p\u00E9tez le mot de passe : "},
-        {"Re.enter.new.password.", "Ressaisissez le nouveau mot de passe : "},
-        {"They.don.t.match.Try.again", "Ils sont diff\u00E9rents. R\u00E9essayez."},
-        {"Enter.prompt.alias.name.", "Indiquez le nom d''alias {0} :  "},
-        {"Enter.new.alias.name.RETURN.to.cancel.import.for.this.entry.",
-                 "Saisissez le nom du nouvel alias\t(ou appuyez sur Entr\u00E9e pour annuler l'import de cette entr\u00E9e)\u00A0:  "},
-        {"Enter.alias.name.", "Indiquez le nom d'alias :  "},
-        {".RETURN.if.same.as.for.otherAlias.",
-                "\t(appuyez sur Entr\u00E9e si le r\u00E9sultat est identique \u00E0 <{0}>)"},
-        {"What.is.your.first.and.last.name.",
-                "Quels sont vos nom et pr\u00E9nom ?"},
-        {"What.is.the.name.of.your.organizational.unit.",
-                "Quel est le nom de votre unit\u00E9 organisationnelle ?"},
-        {"What.is.the.name.of.your.organization.",
-                "Quel est le nom de votre entreprise ?"},
-        {"What.is.the.name.of.your.City.or.Locality.",
-                "Quel est le nom de votre ville de r\u00E9sidence ?"},
-        {"What.is.the.name.of.your.State.or.Province.",
-                "Quel est le nom de votre \u00E9tat ou province ?"},
-        {"What.is.the.two.letter.country.code.for.this.unit.",
-                "Quel est le code pays \u00E0 deux lettres pour cette unit\u00E9 ?"},
-        {"Is.name.correct.", "Est-ce {0} ?"},
-        {"no", "non"},
-        {"yes", "oui"},
-        {"y", "o"},
-        {".defaultValue.", "  [{0}]:  "},
-        {"Alias.alias.has.no.key",
-                "L''alias <{0}> n''est associ\u00E9 \u00E0 aucune cl\u00E9"},
-        {"Alias.alias.references.an.entry.type.that.is.not.a.private.key.entry.The.keyclone.command.only.supports.cloning.of.private.key",
-                 "L''entr\u00E9e \u00E0 laquelle l''alias <{0}> fait r\u00E9f\u00E9rence n''est pas une entr\u00E9e de type cl\u00E9 priv\u00E9e. La commande -keyclone prend uniquement en charge le clonage des cl\u00E9s priv\u00E9es"},
-
-        {".WARNING.WARNING.WARNING.",
-            "*****************  WARNING WARNING WARNING  *****************"},
-        {"Signer.d.", "Signataire n\u00B0%d :"},
-        {"Timestamp.", "Horodatage :"},
-        {"Signature.", "Signature :"},
-        {"CRLs.", "Listes des certificats r\u00E9voqu\u00E9s (CRL) :"},
-        {"Certificate.owner.", "Propri\u00E9taire du certificat : "},
-        {"Not.a.signed.jar.file", "Fichier JAR non sign\u00E9"},
-        {"No.certificate.from.the.SSL.server",
-                "Aucun certificat du serveur SSL"},
-
-        {".The.integrity.of.the.information.stored.in.your.keystore.",
-            "* L'int\u00E9grit\u00E9 des informations stock\u00E9es dans votre fichier de cl\u00E9s  *\n* n'a PAS \u00E9t\u00E9 v\u00E9rifi\u00E9e. Pour cela, *\n* vous devez fournir le mot de passe de votre fichier de cl\u00E9s.                  *"},
-        {".The.integrity.of.the.information.stored.in.the.srckeystore.",
-            "* L'int\u00E9grit\u00E9 des informations stock\u00E9es dans le fichier de cl\u00E9s source  *\n* n'a PAS \u00E9t\u00E9 v\u00E9rifi\u00E9e. Pour cela, *\n* vous devez fournir le mot de passe de votre fichier de cl\u00E9s source.                  *"},
-
-        {"Certificate.reply.does.not.contain.public.key.for.alias.",
-                "La r\u00E9ponse au certificat ne contient pas de cl\u00E9 publique pour <{0}>"},
-        {"Incomplete.certificate.chain.in.reply",
-                "Cha\u00EEne de certificat incompl\u00E8te dans la r\u00E9ponse"},
-        {"Certificate.chain.in.reply.does.not.verify.",
-                "La cha\u00EEne de certificat de la r\u00E9ponse ne concorde pas : "},
-        {"Top.level.certificate.in.reply.",
-                "Certificat de niveau sup\u00E9rieur dans la r\u00E9ponse :\n"},
-        {".is.not.trusted.", "... non s\u00E9curis\u00E9. "},
-        {"Install.reply.anyway.no.", "Installer la r\u00E9ponse quand m\u00EAme ? [non] :  "},
-        {"NO", "NON"},
-        {"Public.keys.in.reply.and.keystore.don.t.match",
-                "Les cl\u00E9s publiques de la r\u00E9ponse et du fichier de cl\u00E9s ne concordent pas"},
-        {"Certificate.reply.and.certificate.in.keystore.are.identical",
-                "La r\u00E9ponse au certificat et le certificat du fichier de cl\u00E9s sont identiques"},
-        {"Failed.to.establish.chain.from.reply",
-                "Impossible de cr\u00E9er une cha\u00EEne \u00E0 partir de la r\u00E9ponse"},
-        {"n", "n"},
-        {"Wrong.answer.try.again", "R\u00E9ponse incorrecte, recommencez"},
-        {"Secret.key.not.generated.alias.alias.already.exists",
-                "Cl\u00E9 secr\u00E8te non g\u00E9n\u00E9r\u00E9e, l''alias <{0}> existe d\u00E9j\u00E0"},
-        {"Please.provide.keysize.for.secret.key.generation",
-                "Indiquez -keysize pour la g\u00E9n\u00E9ration de la cl\u00E9 secr\u00E8te"},
-
-        {"warning.not.verified.make.sure.keystore.is.correct",
-            "AVERTISSEMENT : non v\u00E9rifi\u00E9. Assurez-vous que -keystore est correct."},
-
-        {"Extensions.", "Extensions\u00A0: "},
-        {".Empty.value.", "(Valeur vide)"},
-        {"Extension.Request.", "Demande d'extension :"},
-        {"Unknown.keyUsage.type.", "Type keyUsage inconnu : "},
-        {"Unknown.extendedkeyUsage.type.", "Type extendedkeyUsage inconnu : "},
-        {"Unknown.AccessDescription.type.", "Type AccessDescription inconnu : "},
-        {"Unrecognized.GeneralName.type.", "Type GeneralName non reconnu : "},
-        {"This.extension.cannot.be.marked.as.critical.",
-                 "Cette extension ne peut pas \u00EAtre marqu\u00E9e comme critique. "},
-        {"Odd.number.of.hex.digits.found.", "Nombre impair de chiffres hexad\u00E9cimaux trouv\u00E9 : "},
-        {"Unknown.extension.type.", "Type d'extension inconnu : "},
-        {"command.{0}.is.ambiguous.", "commande {0} ambigu\u00EB :"},
-
-        // 8171319: keytool should print out warnings when reading or
-        // generating cert/cert req using weak algorithms
-        {"the.certificate.request", "Demande de certificat"},
-        {"the.issuer", "Emetteur"},
-        {"the.generated.certificate", "Certificat g\u00E9n\u00E9r\u00E9"},
-        {"the.generated.crl", "Liste des certificats r\u00E9voqu\u00E9s g\u00E9n\u00E9r\u00E9e"},
-        {"the.generated.certificate.request", "Demande de certificat g\u00E9n\u00E9r\u00E9"},
-        {"the.certificate", "Certificat"},
-        {"the.crl", "Liste de certificats r\u00E9voqu\u00E9s"},
-        {"the.tsa.certificate", "Certificat TSA"},
-        {"the.input", "Entr\u00E9e"},
-        {"reply", "R\u00E9pondre"},
-        {"one.in.many", "%1$s #%2$d sur %3$d"},
-        {"alias.in.cacerts", "Emetteur <%s> dans les certificats CA"},
-        {"alias.in.keystore", "Emetteur <%s>"},
-        {"with.weak", "%s (faible)"},
-        {"key.bit", "Cl\u00E9 %2$s %1$d bits"},
-        {"key.bit.weak", "Cl\u00E9 %2$s %1$d bits (faible)"},
-        {"unknown.size.1", "taille de cl\u00E9 %s inconnue"},
-        {".PATTERN.printX509Cert.with.weak",
-                "Propri\u00E9taire : {0}\nEmetteur : {1}\nNum\u00E9ro de s\u00E9rie : {2}\nValide du {3} au {4}\nEmpreintes du certificat :\n\t SHA 1: {5}\n\t SHA 256: {6}\nNom de l''algorithme de signature : {7}\nAlgorithme de cl\u00E9 publique du sujet : {8}\nVersion : {9}"},
-        {"PKCS.10.with.weak",
-                "Demande de certificat PKCS #10 (version 1.0)\nSujet : %1$s\nFormat : %2$s\nCl\u00E9 publique : %3$s\nAlgorithme de signature : %4$s\n"},
-        {"verified.by.s.in.s.weak", "V\u00E9rifi\u00E9 par %1$s dans %2$s avec un \u00E9l\u00E9ment %3$s"},
-        {"whose.sigalg.risk", "%1$s utilise l'algorithme de signature %2$s, qui repr\u00E9sente un risque pour la s\u00E9curit\u00E9."},
-        {"whose.key.risk", "%1$s utilise un \u00E9l\u00E9ment %2$s, qui repr\u00E9sente un risque pour la s\u00E9curit\u00E9."},
-        {"jks.storetype.warning", "Le fichier de cl\u00E9s %1$s utilise un format propri\u00E9taire. Il est recommand\u00E9 de migrer vers PKCS12, qui est un format standard de l'industrie en utilisant \"keytool -importkeystore -srckeystore %2$s -destkeystore %2$s -deststoretype pkcs12\"."},
-        {"migrate.keystore.warning", "El\u00E9ment \"%1$s\" migr\u00E9 vers %4$s. Le fichier de cl\u00E9s %2$s est sauvegard\u00E9 en tant que \"%3$s\"."},
-        {"backup.keystore.warning", "Le fichier de cl\u00E9s d'origine \"%1$s\" est sauvegard\u00E9 en tant que \"%3$s\"..."},
-        {"importing.keystore.status", "Import du fichier de cl\u00E9s %1$s vers %2$s..."},
-    };
-
-
-    /**
-     * Returns the contents of this <code>ResourceBundle</code>.
-     *
-     * <p>
-     *
-     * @return the contents of this <code>ResourceBundle</code>.
-     */
-    @Override
-    public Object[][] getContents() {
-        return contents;
-    }
-}
diff --git a/src/java.base/share/classes/sun/security/tools/keytool/Resources_it.java b/src/java.base/share/classes/sun/security/tools/keytool/Resources_it.java
deleted file mode 100644
index 4b1625a4568..00000000000
--- a/src/java.base/share/classes/sun/security/tools/keytool/Resources_it.java
+++ /dev/null
@@ -1,484 +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.  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.tools.keytool;
-
-/**
- * <p> This class represents the <code>ResourceBundle</code>
- * for the keytool.
- *
- */
-public class Resources_it extends java.util.ListResourceBundle {
-
-    private static final Object[][] contents = {
-        {"NEWLINE", "\n"},
-        {"STAR",
-                "*******************************************"},
-        {"STARNN",
-                "*******************************************\n\n"},
-
-        // keytool: Help part
-        {".OPTION.", " [OPTION]..."},
-        {"Options.", "Opzioni:"},
-        {"option.1.set.twice", "L'opzione %s \u00E8 specificata pi\u00F9 volte. Tutte le ricorrenze verranno ignorate tranne l'ultima."},
-        {"multiple.commands.1.2", "\u00C8 consentito un solo comando: \u00E8 stato specificato sia %1$s che %2$s."},
-        {"Use.keytool.help.for.all.available.commands",
-                 "Utilizzare \"keytool -help\" per visualizzare tutti i comandi disponibili"},
-        {"Key.and.Certificate.Management.Tool",
-                 "Strumento di gestione di chiavi e certificati"},
-        {"Commands.", "Comandi:"},
-        {"Use.keytool.command.name.help.for.usage.of.command.name",
-                "Utilizzare \"keytool -command_name -help\" per informazioni sull'uso di command_name.\nUtilizzare l'opzione -conf <url> per specificare un file di opzioni preconfigurato."},
-        // keytool: help: commands
-        {"Generates.a.certificate.request",
-                "Genera una richiesta di certificato"}, //-certreq
-        {"Changes.an.entry.s.alias",
-                "Modifica l'alias di una voce"}, //-changealias
-        {"Deletes.an.entry",
-                "Elimina una voce"}, //-delete
-        {"Exports.certificate",
-                "Esporta il certificato"}, //-exportcert
-        {"Generates.a.key.pair",
-                "Genera una coppia di chiavi"}, //-genkeypair
-        {"Generates.a.secret.key",
-                "Genera una chiave segreta"}, //-genseckey
-        {"Generates.certificate.from.a.certificate.request",
-                "Genera un certificato da una richiesta di certificato"}, //-gencert
-        {"Generates.CRL", "Genera CRL"}, //-gencrl
-        {"Generated.keyAlgName.secret.key",
-                "Generata chiave segreta {0}"}, //-genseckey
-        {"Generated.keysize.bit.keyAlgName.secret.key",
-                "Generata chiave segreta {1} a {0} bit"}, //-genseckey
-        {"Imports.entries.from.a.JDK.1.1.x.style.identity.database",
-                "Importa le voci da un database delle identit\u00E0 di tipo JDK 1.1.x"}, //-identitydb
-        {"Imports.a.certificate.or.a.certificate.chain",
-                "Importa un certificato o una catena di certificati"}, //-importcert
-        {"Imports.a.password",
-                "Importa una password"}, //-importpass
-        {"Imports.one.or.all.entries.from.another.keystore",
-                "Importa una o tutte le voci da un altro keystore"}, //-importkeystore
-        {"Clones.a.key.entry",
-                "Duplica una voce di chiave"}, //-keyclone
-        {"Changes.the.key.password.of.an.entry",
-                "Modifica la password della chiave per una voce"}, //-keypasswd
-        {"Lists.entries.in.a.keystore",
-                "Elenca le voci in un keystore"}, //-list
-        {"Prints.the.content.of.a.certificate",
-                "Visualizza i contenuti di un certificato"}, //-printcert
-        {"Prints.the.content.of.a.certificate.request",
-                "Visualizza i contenuti di una richiesta di certificato"}, //-printcertreq
-        {"Prints.the.content.of.a.CRL.file",
-                "Visualizza i contenuti di un file CRL"}, //-printcrl
-        {"Generates.a.self.signed.certificate",
-                "Genera certificato con firma automatica"}, //-selfcert
-        {"Changes.the.store.password.of.a.keystore",
-                "Modifica la password di area di memorizzazione di un keystore"}, //-storepasswd
-        // keytool: help: options
-        {"alias.name.of.the.entry.to.process",
-                "nome alias della voce da elaborare"}, //-alias
-        {"destination.alias",
-                "alias di destinazione"}, //-destalias
-        {"destination.key.password",
-                "password chiave di destinazione"}, //-destkeypass
-        {"destination.keystore.name",
-                "nome keystore di destinazione"}, //-destkeystore
-        {"destination.keystore.password.protected",
-                "password keystore di destinazione protetta"}, //-destprotected
-        {"destination.keystore.provider.name",
-                "nome provider keystore di destinazione"}, //-destprovidername
-        {"destination.keystore.password",
-                "password keystore di destinazione"}, //-deststorepass
-        {"destination.keystore.type",
-                "tipo keystore di destinazione"}, //-deststoretype
-        {"distinguished.name",
-                "nome distinto"}, //-dname
-        {"X.509.extension",
-                "estensione X.509"}, //-ext
-        {"output.file.name",
-                "nome file di output"}, //-file and -outfile
-        {"input.file.name",
-                "nome file di input"}, //-file and -infile
-        {"key.algorithm.name",
-                "nome algoritmo chiave"}, //-keyalg
-        {"key.password",
-                "password chiave"}, //-keypass
-        {"key.bit.size",
-                "dimensione bit chiave"}, //-keysize
-        {"keystore.name",
-                "nome keystore"}, //-keystore
-        {"access.the.cacerts.keystore",
-                "accedi al keystore cacerts"}, // -cacerts
-        {"warning.cacerts.option",
-                "Avvertenza: utilizzare l'opzione -cacerts per accedere al keystore cacerts"},
-        {"new.password",
-                "nuova password"}, //-new
-        {"do.not.prompt",
-                "non richiedere"}, //-noprompt
-        {"password.through.protected.mechanism",
-                "password mediante meccanismo protetto"}, //-protected
-
-        // The following 2 values should span 2 lines, the first for the
-        // option itself, the second for its -providerArg value.
-        {"addprovider.option",
-                "aggiunge il provider di sicurezza in base al nome (ad esempio SunPKCS11)\nconfigura l'argomento per -addprovider"}, //-addprovider
-        {"provider.class.option",
-                "aggiunge il provider di sicurezza in base al nome di classe completamente qualificato\nconfigura l'argomento per -providerclass"}, //-providerclass
-
-        {"provider.name",
-                "nome provider"}, //-providername
-        {"provider.classpath",
-                "classpath provider"}, //-providerpath
-        {"output.in.RFC.style",
-                "output in stile RFC"}, //-rfc
-        {"signature.algorithm.name",
-                "nome algoritmo firma"}, //-sigalg
-        {"source.alias",
-                "alias origine"}, //-srcalias
-        {"source.key.password",
-                "password chiave di origine"}, //-srckeypass
-        {"source.keystore.name",
-                "nome keystore di origine"}, //-srckeystore
-        {"source.keystore.password.protected",
-                "password keystore di origine protetta"}, //-srcprotected
-        {"source.keystore.provider.name",
-                "nome provider keystore di origine"}, //-srcprovidername
-        {"source.keystore.password",
-                "password keystore di origine"}, //-srcstorepass
-        {"source.keystore.type",
-                "tipo keystore di origine"}, //-srcstoretype
-        {"SSL.server.host.and.port",
-                "host e porta server SSL"}, //-sslserver
-        {"signed.jar.file",
-                "file jar firmato"}, //=jarfile
-        {"certificate.validity.start.date.time",
-                "data/ora di inizio validit\u00E0 certificato"}, //-startdate
-        {"keystore.password",
-                "password keystore"}, //-storepass
-        {"keystore.type",
-                "tipo keystore"}, //-storetype
-        {"trust.certificates.from.cacerts",
-                "considera sicuri i certificati da cacerts"}, //-trustcacerts
-        {"verbose.output",
-                "output descrittivo"}, //-v
-        {"validity.number.of.days",
-                "numero di giorni di validit\u00E0"}, //-validity
-        {"Serial.ID.of.cert.to.revoke",
-                 "ID seriale del certificato da revocare"}, //-id
-        // keytool: Running part
-        {"keytool.error.", "Errore keytool: "},
-        {"Illegal.option.", "Opzione non valida:  "},
-        {"Illegal.value.", "Valore non valido: "},
-        {"Unknown.password.type.", "Tipo di password sconosciuto: "},
-        {"Cannot.find.environment.variable.",
-                "Impossibile trovare la variabile di ambiente: "},
-        {"Cannot.find.file.", "Impossibile trovare il file: "},
-        {"Command.option.flag.needs.an.argument.", "\u00C8 necessario specificare un argomento per l''opzione di comando {0}."},
-        {"Warning.Different.store.and.key.passwords.not.supported.for.PKCS12.KeyStores.Ignoring.user.specified.command.value.",
-                "Avvertenza: non sono supportate password diverse di chiave e di archivio per i keystore PKCS12. Il valore {0} specificato dall''utente verr\u00E0 ignorato."},
-        {"the.keystore.or.storetype.option.cannot.be.used.with.the.cacerts.option",
-            "L'opzione -keystore o -storetype non pu\u00F2 essere utilizzata con l'opzione -cacerts"},
-        {".keystore.must.be.NONE.if.storetype.is.{0}",
-                "Se -storetype \u00E8 impostato su {0}, -keystore deve essere impostato su NONE"},
-        {"Too.many.retries.program.terminated",
-                 "Il numero dei tentativi consentiti \u00E8 stato superato. Il programma verr\u00E0 terminato."},
-        {".storepasswd.and.keypasswd.commands.not.supported.if.storetype.is.{0}",
-                "Se -storetype \u00E8 impostato su {0}, i comandi -storepasswd e -keypasswd non sono supportati"},
-        {".keypasswd.commands.not.supported.if.storetype.is.PKCS12",
-                "Se -storetype \u00E8 impostato su PKCS12 i comandi -keypasswd non vengono supportati"},
-        {".keypass.and.new.can.not.be.specified.if.storetype.is.{0}",
-                "Se -storetype \u00E8 impostato su {0}, non \u00E8 possibile specificare un valore per -keypass e -new"},
-        {"if.protected.is.specified.then.storepass.keypass.and.new.must.not.be.specified",
-                "Se \u00E8 specificata l'opzione -protected, le opzioni -storepass, -keypass e -new non possono essere specificate"},
-        {"if.srcprotected.is.specified.then.srcstorepass.and.srckeypass.must.not.be.specified",
-                "Se viene specificato -srcprotected, -srcstorepass e -srckeypass non dovranno essere specificati"},
-        {"if.keystore.is.not.password.protected.then.storepass.keypass.and.new.must.not.be.specified",
-                "Se il file keystore non \u00E8 protetto da password, non deve essere specificato alcun valore per -storepass, -keypass e -new"},
-        {"if.source.keystore.is.not.password.protected.then.srcstorepass.and.srckeypass.must.not.be.specified",
-                "Se il file keystore non \u00E8 protetto da password, non deve essere specificato alcun valore per -srcstorepass e -srckeypass"},
-        {"Illegal.startdate.value", "Valore di data di inizio non valido"},
-        {"Validity.must.be.greater.than.zero",
-                "La validit\u00E0 deve essere maggiore di zero"},
-        {"provclass.not.a.provider", "%s non \u00E8 un provider"},
-        {"provider.name.not.found", "Provider denominato \"%s\" non trovato"},
-        {"provider.class.not.found", "Provider \"%s\" non trovato"},
-        {"Usage.error.no.command.provided", "Errore di utilizzo: nessun comando specificato"},
-        {"Source.keystore.file.exists.but.is.empty.", "Il file keystore di origine esiste, ma \u00E8 vuoto: "},
-        {"Please.specify.srckeystore", "Specificare -srckeystore"},
-        {"Must.not.specify.both.v.and.rfc.with.list.command",
-                "Impossibile specificare sia -v sia -rfc con il comando 'list'"},
-        {"Key.password.must.be.at.least.6.characters",
-                "La password della chiave deve contenere almeno 6 caratteri"},
-        {"New.password.must.be.at.least.6.characters",
-                "La nuova password deve contenere almeno 6 caratteri"},
-        {"Keystore.file.exists.but.is.empty.",
-                "Il file keystore esiste ma \u00E8 vuoto: "},
-        {"Keystore.file.does.not.exist.",
-                "Il file keystore non esiste: "},
-        {"Must.specify.destination.alias", "\u00C8 necessario specificare l'alias di destinazione"},
-        {"Must.specify.alias", "\u00C8 necessario specificare l'alias"},
-        {"Keystore.password.must.be.at.least.6.characters",
-                "La password del keystore deve contenere almeno 6 caratteri"},
-        {"Enter.the.password.to.be.stored.",
-                "Immettere la password da memorizzare:  "},
-        {"Enter.keystore.password.", "Immettere la password del keystore:  "},
-        {"Enter.source.keystore.password.", "Immettere la password del keystore di origine:  "},
-        {"Enter.destination.keystore.password.", "Immettere la password del keystore di destinazione:  "},
-        {"Keystore.password.is.too.short.must.be.at.least.6.characters",
-         "La password del keystore \u00E8 troppo corta - deve contenere almeno 6 caratteri"},
-        {"Unknown.Entry.Type", "Tipo di voce sconosciuto"},
-        {"Too.many.failures.Alias.not.changed", "Numero eccessivo di errori. L'alias non \u00E8 stato modificato."},
-        {"Entry.for.alias.alias.successfully.imported.",
-                 "La voce dell''alias {0} \u00E8 stata importata."},
-        {"Entry.for.alias.alias.not.imported.", "La voce dell''alias {0} non \u00E8 stata importata."},
-        {"Problem.importing.entry.for.alias.alias.exception.Entry.for.alias.alias.not.imported.",
-                 "Si \u00E8 verificato un problema durante l''importazione della voce dell''alias {0}: {1}.\nLa voce dell''alias {0} non \u00E8 stata importata."},
-        {"Import.command.completed.ok.entries.successfully.imported.fail.entries.failed.or.cancelled",
-                 "Comando di importazione completato: {0} voce/i importata/e, {1} voce/i non importata/e o annullata/e"},
-        {"Warning.Overwriting.existing.alias.alias.in.destination.keystore",
-                 "Avvertenza: sovrascrittura in corso dell''alias {0} nel file keystore di destinazione"},
-        {"Existing.entry.alias.alias.exists.overwrite.no.",
-                 "La voce dell''alias {0} esiste gi\u00E0. Sovrascrivere? [no]:  "},
-        {"Too.many.failures.try.later", "Troppi errori - riprovare"},
-        {"Certification.request.stored.in.file.filename.",
-                "La richiesta di certificazione \u00E8 memorizzata nel file <{0}>"},
-        {"Submit.this.to.your.CA", "Sottomettere alla propria CA"},
-        {"if.alias.not.specified.destalias.and.srckeypass.must.not.be.specified",
-            "Se l'alias non \u00E8 specificato, destalias e srckeypass non dovranno essere specificati"},
-        {"The.destination.pkcs12.keystore.has.different.storepass.and.keypass.Please.retry.with.destkeypass.specified.",
-            "Keystore pkcs12 di destinazione con storepass e keypass differenti. Riprovare con -destkeypass specificato."},
-        {"Certificate.stored.in.file.filename.",
-                "Il certificato \u00E8 memorizzato nel file <{0}>"},
-        {"Certificate.reply.was.installed.in.keystore",
-                "La risposta del certificato \u00E8 stata installata nel keystore"},
-        {"Certificate.reply.was.not.installed.in.keystore",
-                "La risposta del certificato non \u00E8 stata installata nel keystore"},
-        {"Certificate.was.added.to.keystore",
-                "Il certificato \u00E8 stato aggiunto al keystore"},
-        {"Certificate.was.not.added.to.keystore",
-                "Il certificato non \u00E8 stato aggiunto al keystore"},
-        {".Storing.ksfname.", "[Memorizzazione di {0}] in corso"},
-        {"alias.has.no.public.key.certificate.",
-                "{0} non dispone di chiave pubblica (certificato)"},
-        {"Cannot.derive.signature.algorithm",
-                "Impossibile derivare l'algoritmo di firma"},
-        {"Alias.alias.does.not.exist",
-                "L''alias <{0}> non esiste"},
-        {"Alias.alias.has.no.certificate",
-                "L''alias <{0}> non dispone di certificato"},
-        {"Key.pair.not.generated.alias.alias.already.exists",
-                "Non \u00E8 stata generata la coppia di chiavi, l''alias <{0}> \u00E8 gi\u00E0 esistente"},
-        {"Generating.keysize.bit.keyAlgName.key.pair.and.self.signed.certificate.sigAlgName.with.a.validity.of.validality.days.for",
-                "Generazione in corso di una coppia di chiavi {1} da {0} bit e di un certificato autofirmato ({2}) con una validit\u00E0 di {3} giorni\n\tper: {4}"},
-        {"Enter.key.password.for.alias.", "Immettere la password della chiave per <{0}>"},
-        {".RETURN.if.same.as.keystore.password.",
-                "\t(INVIO se corrisponde alla password del keystore):  "},
-        {"Key.password.is.too.short.must.be.at.least.6.characters",
-                "La password della chiave \u00E8 troppo corta - deve contenere almeno 6 caratteri"},
-        {"Too.many.failures.key.not.added.to.keystore",
-                "Troppi errori - la chiave non \u00E8 stata aggiunta al keystore"},
-        {"Destination.alias.dest.already.exists",
-                "L''alias di destinazione <{0}> \u00E8 gi\u00E0 esistente"},
-        {"Password.is.too.short.must.be.at.least.6.characters",
-                "La password \u00E8 troppo corta - deve contenere almeno 6 caratteri"},
-        {"Too.many.failures.Key.entry.not.cloned",
-                "Numero eccessivo di errori. Il valore della chiave non \u00E8 stato copiato."},
-        {"key.password.for.alias.", "password della chiave per <{0}>"},
-        {"Keystore.entry.for.id.getName.already.exists",
-                "La voce del keystore per <{0}> esiste gi\u00E0"},
-        {"Creating.keystore.entry.for.id.getName.",
-                "Creazione della voce del keystore per <{0}> in corso..."},
-        {"No.entries.from.identity.database.added",
-                "Nessuna voce aggiunta dal database delle identit\u00E0"},
-        {"Alias.name.alias", "Nome alias: {0}"},
-        {"Creation.date.keyStore.getCreationDate.alias.",
-                "Data di creazione: {0,date}"},
-        {"alias.keyStore.getCreationDate.alias.",
-                "{0}, {1,date}, "},
-        {"alias.", "{0}, "},
-        {"Entry.type.type.", "Tipo di voce: {0}"},
-        {"Certificate.chain.length.", "Lunghezza catena certificati: "},
-        {"Certificate.i.1.", "Certificato[{0,number,integer}]:"},
-        {"Certificate.fingerprint.SHA.256.", "Copia di certificato (SHA-256): "},
-        {"Keystore.type.", "Tipo keystore: "},
-        {"Keystore.provider.", "Provider keystore: "},
-        {"Your.keystore.contains.keyStore.size.entry",
-                "Il keystore contiene {0,number,integer} voce"},
-        {"Your.keystore.contains.keyStore.size.entries",
-                "Il keystore contiene {0,number,integer} voci"},
-        {"Failed.to.parse.input", "Impossibile analizzare l'input"},
-        {"Empty.input", "Input vuoto"},
-        {"Not.X.509.certificate", "Il certificato non \u00E8 X.509"},
-        {"alias.has.no.public.key", "{0} non dispone di chiave pubblica"},
-        {"alias.has.no.X.509.certificate", "{0} non dispone di certificato X.509"},
-        {"New.certificate.self.signed.", "Nuovo certificato (autofirmato):"},
-        {"Reply.has.no.certificates", "La risposta non dispone di certificati"},
-        {"Certificate.not.imported.alias.alias.already.exists",
-                "Impossibile importare il certificato, l''alias <{0}> \u00E8 gi\u00E0 esistente"},
-        {"Input.not.an.X.509.certificate", "L'input non \u00E8 un certificato X.509"},
-        {"Certificate.already.exists.in.keystore.under.alias.trustalias.",
-                "Il certificato esiste gi\u00E0 nel keystore con alias <{0}>"},
-        {"Do.you.still.want.to.add.it.no.",
-                "Aggiungerlo ugualmente? [no]:  "},
-        {"Certificate.already.exists.in.system.wide.CA.keystore.under.alias.trustalias.",
-                "Il certificato esiste gi\u00E0 nel keystore CA con alias <{0}>"},
-        {"Do.you.still.want.to.add.it.to.your.own.keystore.no.",
-                "Aggiungerlo al proprio keystore? [no]:  "},
-        {"Trust.this.certificate.no.", "Considerare sicuro questo certificato? [no]:  "},
-        {"YES", "S\u00EC"},
-        {"New.prompt.", "Nuova {0}: "},
-        {"Passwords.must.differ", "Le password non devono coincidere"},
-        {"Re.enter.new.prompt.", "Reimmettere un nuovo valore per {0}: "},
-        {"Re.enter.password.", "Reimmettere la password: "},
-        {"Re.enter.new.password.", "Immettere nuovamente la nuova password: "},
-        {"They.don.t.match.Try.again", "Non corrispondono. Riprovare."},
-        {"Enter.prompt.alias.name.", "Immettere nome alias {0}:  "},
-        {"Enter.new.alias.name.RETURN.to.cancel.import.for.this.entry.",
-                 "Immettere un nuovo nome alias\t(premere INVIO per annullare l'importazione della voce):  "},
-        {"Enter.alias.name.", "Immettere nome alias:  "},
-        {".RETURN.if.same.as.for.otherAlias.",
-                "\t(INVIO se corrisponde al nome di <{0}>)"},
-        {"What.is.your.first.and.last.name.",
-                "Specificare nome e cognome"},
-        {"What.is.the.name.of.your.organizational.unit.",
-                "Specificare il nome dell'unit\u00E0 organizzativa"},
-        {"What.is.the.name.of.your.organization.",
-                "Specificare il nome dell'organizzazione"},
-        {"What.is.the.name.of.your.City.or.Locality.",
-                "Specificare la localit\u00E0"},
-        {"What.is.the.name.of.your.State.or.Province.",
-                "Specificare la provincia"},
-        {"What.is.the.two.letter.country.code.for.this.unit.",
-                "Specificare il codice a due lettere del paese in cui si trova l'unit\u00E0"},
-        {"Is.name.correct.", "Il dato {0} \u00E8 corretto?"},
-        {"no", "no"},
-        {"yes", "s\u00EC"},
-        {"y", "s"},
-        {".defaultValue.", "  [{0}]:  "},
-        {"Alias.alias.has.no.key",
-                "All''alias <{0}> non \u00E8 associata alcuna chiave"},
-        {"Alias.alias.references.an.entry.type.that.is.not.a.private.key.entry.The.keyclone.command.only.supports.cloning.of.private.key",
-                 "L''alias <{0}> fa riferimento a un tipo di voce che non \u00E8 una voce di chiave privata. Il comando -keyclone supporta solo la copia delle voci di chiave private."},
-
-        {".WARNING.WARNING.WARNING.",
-            "*****************  WARNING WARNING WARNING  *****************"},
-        {"Signer.d.", "Firmatario #%d:"},
-        {"Timestamp.", "Indicatore orario:"},
-        {"Signature.", "Firma:"},
-        {"CRLs.", "CRL:"},
-        {"Certificate.owner.", "Proprietario certificato: "},
-        {"Not.a.signed.jar.file", "Non \u00E8 un file jar firmato"},
-        {"No.certificate.from.the.SSL.server",
-                "Nessun certificato dal server SSL"},
-
-        {".The.integrity.of.the.information.stored.in.your.keystore.",
-            "* L'integrit\u00E0 delle informazioni memorizzate nel keystore *\n* NON \u00E8 stata verificata. Per verificarne l'integrit\u00E0 *\n* \u00E8 necessario fornire la password del keystore.                  *"},
-        {".The.integrity.of.the.information.stored.in.the.srckeystore.",
-            "* L'integrit\u00E0 delle informazioni memorizzate nel srckeystore *\n* NON \u00E8 stata verificata. Per verificarne l'integrit\u00E0 *\n* \u00E8 necessario fornire la password del srckeystore.                  *"},
-
-        {"Certificate.reply.does.not.contain.public.key.for.alias.",
-                "La risposta del certificato non contiene la chiave pubblica per <{0}>"},
-        {"Incomplete.certificate.chain.in.reply",
-                "Catena dei certificati incompleta nella risposta"},
-        {"Certificate.chain.in.reply.does.not.verify.",
-                "La catena dei certificati nella risposta non verifica: "},
-        {"Top.level.certificate.in.reply.",
-                "Certificato di primo livello nella risposta:\n"},
-        {".is.not.trusted.", "...non \u00E8 considerato sicuro. "},
-        {"Install.reply.anyway.no.", "Installare la risposta? [no]:  "},
-        {"NO", "NO"},
-        {"Public.keys.in.reply.and.keystore.don.t.match",
-                "Le chiavi pubbliche nella risposta e nel keystore non corrispondono"},
-        {"Certificate.reply.and.certificate.in.keystore.are.identical",
-                "La risposta del certificato e il certificato nel keystore sono identici"},
-        {"Failed.to.establish.chain.from.reply",
-                "Impossibile stabilire la catena dalla risposta"},
-        {"n", "n"},
-        {"Wrong.answer.try.again", "Risposta errata, riprovare"},
-        {"Secret.key.not.generated.alias.alias.already.exists",
-                "La chiave segreta non \u00E8 stata generata; l''alias <{0}> esiste gi\u00E0"},
-        {"Please.provide.keysize.for.secret.key.generation",
-                "Specificare il valore -keysize per la generazione della chiave segreta"},
-
-        {"warning.not.verified.make.sure.keystore.is.correct",
-            "AVVERTENZA: non verificato. Assicurarsi che -keystore sia corretto."},
-
-        {"Extensions.", "Estensioni: "},
-        {".Empty.value.", "(valore vuoto)"},
-        {"Extension.Request.", "Richiesta di estensione:"},
-        {"Unknown.keyUsage.type.", "Tipo keyUsage sconosciuto: "},
-        {"Unknown.extendedkeyUsage.type.", "Tipo extendedkeyUsage sconosciuto: "},
-        {"Unknown.AccessDescription.type.", "Tipo AccessDescription sconosciuto: "},
-        {"Unrecognized.GeneralName.type.", "Tipo GeneralName non riconosciuto: "},
-        {"This.extension.cannot.be.marked.as.critical.",
-                 "Impossibile contrassegnare questa estensione come critica. "},
-        {"Odd.number.of.hex.digits.found.", "\u00C8 stato trovato un numero dispari di cifre esadecimali: "},
-        {"Unknown.extension.type.", "Tipo di estensione sconosciuto: "},
-        {"command.{0}.is.ambiguous.", "il comando {0} \u00E8 ambiguo:"},
-
-        // 8171319: keytool should print out warnings when reading or
-        // generating cert/cert req using weak algorithms
-        {"the.certificate.request", "La richiesta di certificato"},
-        {"the.issuer", "L'emittente"},
-        {"the.generated.certificate", "Il certificato generato"},
-        {"the.generated.crl", "La CRL generata"},
-        {"the.generated.certificate.request", "La richiesta di certificato generata"},
-        {"the.certificate", "Il certificato"},
-        {"the.crl", "La CRL"},
-        {"the.tsa.certificate", "Il certificato TSA"},
-        {"the.input", "L'input"},
-        {"reply", "Rispondi"},
-        {"one.in.many", "%1$s #%2$d di %3$d"},
-        {"alias.in.cacerts", "Emittente <%s> in cacerts"},
-        {"alias.in.keystore", "Emittente <%s>"},
-        {"with.weak", "%s (debole)"},
-        {"key.bit", "Chiave %2$s a %1$d bit"},
-        {"key.bit.weak", "Chiave %2$s a %1$d bit (debole)"},
-        {"unknown.size.1", "chiave %s di dimensione sconosciuta"},
-        {".PATTERN.printX509Cert.with.weak",
-                "Proprietario: {0}\nEmittente: {1}\nNumero di serie: {2}\nValido da: {3} a: {4}\nImpronte digitali certificato:\n\t SHA1: {5}\n\t SHA256: {6}\nNome algoritmo firma: {7}\nAlgoritmo di chiave pubblica oggetto: {8}\nVersione: {9}"},
-        {"PKCS.10.with.weak",
-                "Richiesta di certificato PKCS #10 (versione 1.0)\nOggetto: %1$s\nFormato: %2$s\nChiave pubblica: %3$s\nAlgoritmo firma: %4$s\n"},
-        {"verified.by.s.in.s.weak", "Verificato da %1$s in %2$s con un %3$s"},
-        {"whose.sigalg.risk", "%1$s utilizza l'algoritmo firma %2$s che \u00E8 considerato un rischio per la sicurezza."},
-        {"whose.key.risk", "%1$s utilizza un %2$s che \u00E8 considerato un rischio per la sicurezza."},
-        {"jks.storetype.warning", "Il keystore %1$s utilizza un formato proprietario. Si consiglia di eseguire la migrazione a PKCS12, un formato standard di settore, utilizzando il comando \"keytool -importkeystore -srckeystore %2$s -destkeystore %2$s -deststoretype pkcs12\"."},
-        {"migrate.keystore.warning", "Migrazione di \"%1$s\" in %4$s eseguita. Backup del keystore %2$s eseguito con il nome \"%3$s\"."},
-        {"backup.keystore.warning", "Backup del keystore originale \"%1$s\" eseguito con il nome \"%3$s\"..."},
-        {"importing.keystore.status", "Importazione del keystore %1$s in %2$s in corso..."},
-    };
-
-
-    /**
-     * Returns the contents of this <code>ResourceBundle</code>.
-     *
-     * <p>
-     *
-     * @return the contents of this <code>ResourceBundle</code>.
-     */
-    @Override
-    public Object[][] getContents() {
-        return contents;
-    }
-}
diff --git a/src/java.base/share/classes/sun/security/tools/keytool/Resources_ja.java b/src/java.base/share/classes/sun/security/tools/keytool/Resources_ja.java
deleted file mode 100644
index 225b6eabd71..00000000000
--- a/src/java.base/share/classes/sun/security/tools/keytool/Resources_ja.java
+++ /dev/null
@@ -1,511 +0,0 @@
-/*
- * Copyright (c) 2000, 2025, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute 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.tools.keytool;
-
-/**
- * <p> This class represents the <code>ResourceBundle</code>
- * for the keytool.
- *
- */
-public class Resources_ja extends java.util.ListResourceBundle {
-
-    private static final Object[][] contents = {
-        {"NEWLINE", "\n"},
-        {"STAR",
-                "*******************************************"},
-        {"STARNN",
-                "*******************************************\n\n"},
-
-        // keytool: Help part
-        {".OPTION.", " [OPTION]..."},
-        {"Options.", "\u30AA\u30D7\u30B7\u30E7\u30F3:"},
-        {"option.1.set.twice", "%s\u30AA\u30D7\u30B7\u30E7\u30F3\u304C\u8907\u6570\u56DE\u6307\u5B9A\u3055\u308C\u3066\u3044\u307E\u3059\u3002\u6700\u5F8C\u306E\u3082\u306E\u4EE5\u5916\u306F\u3059\u3079\u3066\u7121\u8996\u3055\u308C\u307E\u3059\u3002"},
-        {"multiple.commands.1.2", "1\u3064\u306E\u30B3\u30DE\u30F3\u30C9\u306E\u307F\u8A31\u53EF\u3055\u308C\u307E\u3059: %1$s\u3068%2$s\u306E\u4E21\u65B9\u304C\u6307\u5B9A\u3055\u308C\u307E\u3057\u305F\u3002"},
-        {"Use.keytool.help.for.all.available.commands",
-                 "\u3053\u306E\u30D8\u30EB\u30D7\u30FB\u30E1\u30C3\u30BB\u30FC\u30B8\u3092\u8868\u793A\u3059\u308B\u306B\u306F\"keytool -?\u3001-h\u307E\u305F\u306F--help\"\u3092\u4F7F\u7528\u3057\u307E\u3059"},
-        {"Key.and.Certificate.Management.Tool",
-                 "\u30AD\u30FC\u304A\u3088\u3073\u8A3C\u660E\u66F8\u7BA1\u7406\u30C4\u30FC\u30EB"},
-        {"Commands.", "\u30B3\u30DE\u30F3\u30C9:"},
-        {"Use.keytool.command.name.help.for.usage.of.command.name",
-                "command_name\u306E\u4F7F\u7528\u65B9\u6CD5\u306B\u3064\u3044\u3066\u306F\u3001\"keytool -command_name --help\"\u3092\u4F7F\u7528\u3057\u307E\u3059\u3002\n\u4E8B\u524D\u69CB\u6210\u6E08\u306E\u30AA\u30D7\u30B7\u30E7\u30F3\u30FB\u30D5\u30A1\u30A4\u30EB\u3092\u6307\u5B9A\u3059\u308B\u306B\u306F\u3001-conf <url>\u30AA\u30D7\u30B7\u30E7\u30F3\u3092\u4F7F\u7528\u3057\u307E\u3059\u3002"},
-        // keytool: help: commands
-        {"Generates.a.certificate.request",
-                "\u8A3C\u660E\u66F8\u30EA\u30AF\u30A8\u30B9\u30C8\u3092\u751F\u6210\u3057\u307E\u3059"}, //-certreq
-        {"Changes.an.entry.s.alias",
-                "\u30A8\u30F3\u30C8\u30EA\u306E\u5225\u540D\u3092\u5909\u66F4\u3057\u307E\u3059"}, //-changealias
-        {"Deletes.an.entry",
-                "\u30A8\u30F3\u30C8\u30EA\u3092\u524A\u9664\u3057\u307E\u3059"}, //-delete
-        {"Exports.certificate",
-                "\u8A3C\u660E\u66F8\u3092\u30A8\u30AF\u30B9\u30DD\u30FC\u30C8\u3057\u307E\u3059"}, //-exportcert
-        {"Generates.a.key.pair",
-                "\u30AD\u30FC\u30FB\u30DA\u30A2\u3092\u751F\u6210\u3057\u307E\u3059"}, //-genkeypair
-        {"Generates.a.secret.key",
-                "\u79D8\u5BC6\u30AD\u30FC\u3092\u751F\u6210\u3057\u307E\u3059"}, //-genseckey
-        {"Generates.certificate.from.a.certificate.request",
-                "\u8A3C\u660E\u66F8\u30EA\u30AF\u30A8\u30B9\u30C8\u304B\u3089\u8A3C\u660E\u66F8\u3092\u751F\u6210\u3057\u307E\u3059"}, //-gencert
-        {"Generates.CRL", "CRL\u3092\u751F\u6210\u3057\u307E\u3059"}, //-gencrl
-        {"Generated.keyAlgName.secret.key",
-                "{0}\u79D8\u5BC6\u30AD\u30FC\u3092\u751F\u6210\u3057\u307E\u3057\u305F"}, //-genseckey
-        {"Generated.keysize.bit.keyAlgName.secret.key",
-                "{0}\u30D3\u30C3\u30C8{1}\u79D8\u5BC6\u30AD\u30FC\u3092\u751F\u6210\u3057\u307E\u3057\u305F"}, //-genseckey
-        {"key.algorithm.weak", "%1$s\u306F%2$s\u30A2\u30EB\u30B4\u30EA\u30BA\u30E0\u3092\u4F7F\u7528\u3057\u3066\u304A\u308A\u3001\u3053\u308C\u306F\u30BB\u30AD\u30E5\u30EA\u30C6\u30A3\u30FB\u30EA\u30B9\u30AF\u3068\u307F\u306A\u3055\u308C\u307E\u3059\u3002"},
-        {"key.size.weak", "%1$s\u306F%2$s\u3092\u4F7F\u7528\u3057\u3066\u304A\u308A\u3001\u3053\u308C\u306F\u30BB\u30AD\u30E5\u30EA\u30C6\u30A3\u30FB\u30EA\u30B9\u30AF\u3068\u307F\u306A\u3055\u308C\u307E\u3059\u3002"},
-        {"Imports.entries.from.a.JDK.1.1.x.style.identity.database",
-                "JDK 1.1.x-style\u30A2\u30A4\u30C7\u30F3\u30C6\u30A3\u30C6\u30A3\u30FB\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u304B\u3089\u30A8\u30F3\u30C8\u30EA\u3092\u30A4\u30F3\u30DD\u30FC\u30C8\u3057\u307E\u3059"}, //-identitydb
-        {"Imports.a.certificate.or.a.certificate.chain",
-                "\u8A3C\u660E\u66F8\u307E\u305F\u306F\u8A3C\u660E\u66F8\u30C1\u30A7\u30FC\u30F3\u3092\u30A4\u30F3\u30DD\u30FC\u30C8\u3057\u307E\u3059"}, //-importcert
-        {"Imports.a.password",
-                "\u30D1\u30B9\u30EF\u30FC\u30C9\u3092\u30A4\u30F3\u30DD\u30FC\u30C8\u3057\u307E\u3059"}, //-importpass
-        {"Imports.one.or.all.entries.from.another.keystore",
-                "\u5225\u306E\u30AD\u30FC\u30B9\u30C8\u30A2\u304B\u30891\u3064\u307E\u305F\u306F\u3059\u3079\u3066\u306E\u30A8\u30F3\u30C8\u30EA\u3092\u30A4\u30F3\u30DD\u30FC\u30C8\u3057\u307E\u3059"}, //-importkeystore
-        {"Clones.a.key.entry",
-                "\u30AD\u30FC\u30FB\u30A8\u30F3\u30C8\u30EA\u306E\u30AF\u30ED\u30FC\u30F3\u3092\u4F5C\u6210\u3057\u307E\u3059"}, //-keyclone
-        {"Changes.the.key.password.of.an.entry",
-                "\u30A8\u30F3\u30C8\u30EA\u306E\u30AD\u30FC\u30FB\u30D1\u30B9\u30EF\u30FC\u30C9\u3092\u5909\u66F4\u3057\u307E\u3059"}, //-keypasswd
-        {"Lists.entries.in.a.keystore",
-                "\u30AD\u30FC\u30B9\u30C8\u30A2\u5185\u306E\u30A8\u30F3\u30C8\u30EA\u3092\u30EA\u30B9\u30C8\u3057\u307E\u3059"}, //-list
-        {"Prints.the.content.of.a.certificate",
-                "\u8A3C\u660E\u66F8\u306E\u5185\u5BB9\u3092\u51FA\u529B\u3057\u307E\u3059"}, //-printcert
-        {"Prints.the.content.of.a.certificate.request",
-                "\u8A3C\u660E\u66F8\u30EA\u30AF\u30A8\u30B9\u30C8\u306E\u5185\u5BB9\u3092\u51FA\u529B\u3057\u307E\u3059"}, //-printcertreq
-        {"Prints.the.content.of.a.CRL.file",
-                "CRL\u30D5\u30A1\u30A4\u30EB\u306E\u5185\u5BB9\u3092\u51FA\u529B\u3057\u307E\u3059"}, //-printcrl
-        {"Generates.a.self.signed.certificate",
-                "\u81EA\u5DF1\u7F72\u540D\u578B\u8A3C\u660E\u66F8\u3092\u751F\u6210\u3057\u307E\u3059"}, //-selfcert
-        {"Changes.the.store.password.of.a.keystore",
-                "\u30AD\u30FC\u30B9\u30C8\u30A2\u306E\u30B9\u30C8\u30A2\u30FB\u30D1\u30B9\u30EF\u30FC\u30C9\u3092\u5909\u66F4\u3057\u307E\u3059"}, //-storepasswd
-        {"showinfo.command.help", "\u30BB\u30AD\u30E5\u30EA\u30C6\u30A3\u95A2\u9023\u60C5\u5831\u3092\u8868\u793A\u3057\u307E\u3059"},
-        {"Prints.the.program.version", "\u30D7\u30ED\u30B0\u30E9\u30E0\u30FB\u30D0\u30FC\u30B8\u30E7\u30F3\u3092\u51FA\u529B\u3057\u307E\u3059"},
-
-        // keytool: help: options
-        {"alias.name.of.the.entry.to.process",
-                "\u51E6\u7406\u3059\u308B\u30A8\u30F3\u30C8\u30EA\u306E\u5225\u540D"}, //-alias
-        {"groupname.option.help",
-                "\u30B0\u30EB\u30FC\u30D7\u540D\u3002\u305F\u3068\u3048\u3070\u3001\u6955\u5186\u66F2\u7DDA\u540D\u3067\u3059\u3002"}, //-groupname
-        {"destination.alias",
-                "\u51FA\u529B\u5148\u306E\u5225\u540D"}, //-destalias
-        {"destination.key.password",
-                "\u51FA\u529B\u5148\u30AD\u30FC\u306E\u30D1\u30B9\u30EF\u30FC\u30C9"}, //-destkeypass
-        {"destination.keystore.name",
-                "\u51FA\u529B\u5148\u30AD\u30FC\u30B9\u30C8\u30A2\u540D"}, //-destkeystore
-        {"destination.keystore.password.protected",
-                "\u51FA\u529B\u5148\u30AD\u30FC\u30B9\u30C8\u30A2\u306E\u4FDD\u8B77\u5BFE\u8C61\u30D1\u30B9\u30EF\u30FC\u30C9"}, //-destprotected
-        {"destination.keystore.provider.name",
-                "\u51FA\u529B\u5148\u30AD\u30FC\u30B9\u30C8\u30A2\u30FB\u30D7\u30ED\u30D0\u30A4\u30C0\u540D"}, //-destprovidername
-        {"destination.keystore.password",
-                "\u51FA\u529B\u5148\u30AD\u30FC\u30B9\u30C8\u30A2\u306E\u30D1\u30B9\u30EF\u30FC\u30C9"}, //-deststorepass
-        {"destination.keystore.type",
-                "\u51FA\u529B\u5148\u30AD\u30FC\u30B9\u30C8\u30A2\u306E\u30BF\u30A4\u30D7"}, //-deststoretype
-        {"distinguished.name",
-                "\u8B58\u5225\u540D"}, //-dname
-        {"X.509.extension",
-                "X.509\u62E1\u5F35"}, //-ext
-        {"output.file.name",
-                "\u51FA\u529B\u30D5\u30A1\u30A4\u30EB\u540D"}, //-file and -outfile
-        {"input.file.name",
-                "\u5165\u529B\u30D5\u30A1\u30A4\u30EB\u540D"}, //-file and -infile
-        {"key.algorithm.name",
-                "\u30AD\u30FC\u30FB\u30A2\u30EB\u30B4\u30EA\u30BA\u30E0\u540D"}, //-keyalg
-        {"key.password",
-                "\u30AD\u30FC\u306E\u30D1\u30B9\u30EF\u30FC\u30C9"}, //-keypass
-        {"key.bit.size",
-                "\u30AD\u30FC\u306E\u30D3\u30C3\u30C8\u30FB\u30B5\u30A4\u30BA"}, //-keysize
-        {"keystore.name",
-                "\u30AD\u30FC\u30B9\u30C8\u30A2\u540D"}, //-keystore
-        {"access.the.cacerts.keystore",
-                "cacerts\u30AD\u30FC\u30B9\u30C8\u30A2\u306B\u30A2\u30AF\u30BB\u30B9\u3059\u308B"}, // -cacerts
-        {"warning.cacerts.option",
-                "\u8B66\u544A: cacerts\u30AD\u30FC\u30B9\u30C8\u30A2\u306B\u30A2\u30AF\u30BB\u30B9\u3059\u308B\u306B\u306F-cacerts\u30AA\u30D7\u30B7\u30E7\u30F3\u3092\u4F7F\u7528\u3057\u3066\u304F\u3060\u3055\u3044"},
-        {"new.password",
-                "\u65B0\u898F\u30D1\u30B9\u30EF\u30FC\u30C9"}, //-new
-        {"do.not.prompt",
-                "\u30D7\u30ED\u30F3\u30D7\u30C8\u3092\u8868\u793A\u3057\u306A\u3044"}, //-noprompt
-        {"password.through.protected.mechanism",
-                "\u4FDD\u8B77\u30E1\u30AB\u30CB\u30BA\u30E0\u306B\u3088\u308B\u30D1\u30B9\u30EF\u30FC\u30C9"}, //-protected
-        {"tls.option.help", "TLS\u69CB\u6210\u60C5\u5831\u3092\u8868\u793A\u3057\u307E\u3059"},
-
-        // The following 2 values should span 2 lines, the first for the
-        // option itself, the second for its -providerArg value.
-        {"addprovider.option",
-                "\u540D\u524D\u3067\u30BB\u30AD\u30E5\u30EA\u30C6\u30A3\u30FB\u30D7\u30ED\u30D0\u30A4\u30C0\u3092\u8FFD\u52A0\u3059\u308B(SunPKCS11\u306A\u3069)\n-addprovider\u306E\u5F15\u6570\u3092\u69CB\u6210\u3059\u308B"}, //-addprovider
-        {"provider.class.option",
-                "\u5B8C\u5168\u4FEE\u98FE\u30AF\u30E9\u30B9\u540D\u3067\u30BB\u30AD\u30E5\u30EA\u30C6\u30A3\u30FB\u30D7\u30ED\u30D0\u30A4\u30C0\u3092\u8FFD\u52A0\u3059\u308B\n-providerclass\u306E\u5F15\u6570\u3092\u69CB\u6210\u3059\u308B"}, //-providerclass
-
-        {"provider.name",
-                "\u30D7\u30ED\u30D0\u30A4\u30C0\u540D"}, //-providername
-        {"provider.classpath",
-                "\u30D7\u30ED\u30D0\u30A4\u30C0\u30FB\u30AF\u30E9\u30B9\u30D1\u30B9"}, //-providerpath
-        {"output.in.RFC.style",
-                "RFC\u30B9\u30BF\u30A4\u30EB\u306E\u51FA\u529B"}, //-rfc
-        {"signature.algorithm.name",
-                "\u7F72\u540D\u30A2\u30EB\u30B4\u30EA\u30BA\u30E0\u540D"}, //-sigalg
-        {"signer.alias",
-                "\u7F72\u540D\u8005\u306E\u5225\u540D"}, //-signer
-        {"signer.key.password",
-                "\u7F72\u540D\u8005\u306E\u30AD\u30FC\u306E\u30D1\u30B9\u30EF\u30FC\u30C9"}, //-signerkeypass
-        {"source.alias",
-                "\u30BD\u30FC\u30B9\u5225\u540D"}, //-srcalias
-        {"source.key.password",
-                "\u30BD\u30FC\u30B9\u30FB\u30AD\u30FC\u306E\u30D1\u30B9\u30EF\u30FC\u30C9"}, //-srckeypass
-        {"source.keystore.name",
-                "\u30BD\u30FC\u30B9\u30FB\u30AD\u30FC\u30B9\u30C8\u30A2\u540D"}, //-srckeystore
-        {"source.keystore.password.protected",
-                "\u30BD\u30FC\u30B9\u30FB\u30AD\u30FC\u30B9\u30C8\u30A2\u306E\u4FDD\u8B77\u5BFE\u8C61\u30D1\u30B9\u30EF\u30FC\u30C9"}, //-srcprotected
-        {"source.keystore.provider.name",
-                "\u30BD\u30FC\u30B9\u30FB\u30AD\u30FC\u30B9\u30C8\u30A2\u30FB\u30D7\u30ED\u30D0\u30A4\u30C0\u540D"}, //-srcprovidername
-        {"source.keystore.password",
-                "\u30BD\u30FC\u30B9\u30FB\u30AD\u30FC\u30B9\u30C8\u30A2\u306E\u30D1\u30B9\u30EF\u30FC\u30C9"}, //-srcstorepass
-        {"source.keystore.type",
-                "\u30BD\u30FC\u30B9\u30FB\u30AD\u30FC\u30B9\u30C8\u30A2\u306E\u30BF\u30A4\u30D7"}, //-srcstoretype
-        {"SSL.server.host.and.port",
-                "SSL\u30B5\u30FC\u30D0\u30FC\u306E\u30DB\u30B9\u30C8\u3068\u30DD\u30FC\u30C8"}, //-sslserver
-        {"signed.jar.file",
-                "\u7F72\u540D\u4ED8\u304DJAR\u30D5\u30A1\u30A4\u30EB"}, //=jarfile
-        {"certificate.validity.start.date.time",
-                "\u8A3C\u660E\u66F8\u306E\u6709\u52B9\u958B\u59CB\u65E5\u6642"}, //-startdate
-        {"keystore.password",
-                "\u30AD\u30FC\u30B9\u30C8\u30A2\u306E\u30D1\u30B9\u30EF\u30FC\u30C9"}, //-storepass
-        {"keystore.type",
-                "\u30AD\u30FC\u30B9\u30C8\u30A2\u306E\u30BF\u30A4\u30D7"}, //-storetype
-        {"trust.certificates.from.cacerts",
-                "cacerts\u304B\u3089\u306E\u8A3C\u660E\u66F8\u3092\u4FE1\u983C\u3059\u308B"}, //-trustcacerts
-        {"verbose.output",
-                "\u8A73\u7D30\u51FA\u529B"}, //-v
-        {"validity.number.of.days",
-                "\u59A5\u5F53\u6027\u65E5\u6570"}, //-validity
-        {"Serial.ID.of.cert.to.revoke",
-                 "\u5931\u52B9\u3059\u308B\u8A3C\u660E\u66F8\u306E\u30B7\u30EA\u30A2\u30EBID"}, //-id
-        // keytool: Running part
-        {"keytool.error.", "keytool\u30A8\u30E9\u30FC: "},
-        {"Illegal.option.", "\u4E0D\u6B63\u306A\u30AA\u30D7\u30B7\u30E7\u30F3:  "},
-        {"Illegal.value.", "\u4E0D\u6B63\u306A\u5024: "},
-        {"Unknown.password.type.", "\u4E0D\u660E\u306A\u30D1\u30B9\u30EF\u30FC\u30C9\u30FB\u30BF\u30A4\u30D7: "},
-        {"Cannot.find.environment.variable.",
-                "\u74B0\u5883\u5909\u6570\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093: "},
-        {"Cannot.find.file.", "\u30D5\u30A1\u30A4\u30EB\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093: "},
-        {"Command.option.flag.needs.an.argument.", "\u30B3\u30DE\u30F3\u30C9\u30FB\u30AA\u30D7\u30B7\u30E7\u30F3{0}\u306B\u306F\u5F15\u6570\u304C\u5FC5\u8981\u3067\u3059\u3002"},
-        {"Warning.Different.store.and.key.passwords.not.supported.for.PKCS12.KeyStores.Ignoring.user.specified.command.value.",
-                "\u8B66\u544A: PKCS12\u30AD\u30FC\u30B9\u30C8\u30A2\u3067\u306F\u3001\u30B9\u30C8\u30A2\u306E\u30D1\u30B9\u30EF\u30FC\u30C9\u3068\u30AD\u30FC\u306E\u30D1\u30B9\u30EF\u30FC\u30C9\u304C\u7570\u306A\u308B\u72B6\u6CC1\u306F\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u307E\u305B\u3093\u3002\u30E6\u30FC\u30B6\u30FC\u304C\u6307\u5B9A\u3057\u305F{0}\u306E\u5024\u306F\u7121\u8996\u3057\u307E\u3059\u3002"},
-        {"the.keystore.or.storetype.option.cannot.be.used.with.the.cacerts.option",
-            "-keystore\u307E\u305F\u306F-storetype\u30AA\u30D7\u30B7\u30E7\u30F3\u306F\u3001-cacerts\u30AA\u30D7\u30B7\u30E7\u30F3\u3068\u3068\u3082\u306B\u4F7F\u7528\u3067\u304D\u307E\u305B\u3093"},
-        {".keystore.must.be.NONE.if.storetype.is.{0}",
-                "-storetype\u304C{0}\u306E\u5834\u5408\u3001-keystore\u306FNONE\u3067\u3042\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059"},
-        {"Too.many.retries.program.terminated",
-                 "\u518D\u8A66\u884C\u304C\u591A\u3059\u304E\u307E\u3059\u3002\u30D7\u30ED\u30B0\u30E9\u30E0\u304C\u7D42\u4E86\u3057\u307E\u3057\u305F"},
-        {".storepasswd.and.keypasswd.commands.not.supported.if.storetype.is.{0}",
-                "-storetype\u304C{0}\u306E\u5834\u5408\u3001-storepasswd\u30B3\u30DE\u30F3\u30C9\u304A\u3088\u3073-keypasswd\u30B3\u30DE\u30F3\u30C9\u306F\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u307E\u305B\u3093"},
-        {".keypasswd.commands.not.supported.if.storetype.is.PKCS12",
-                "-storetype\u304CPKCS12\u306E\u5834\u5408\u3001-keypasswd\u30B3\u30DE\u30F3\u30C9\u306F\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u307E\u305B\u3093"},
-        {".keypass.and.new.can.not.be.specified.if.storetype.is.{0}",
-                "-storetype\u304C{0}\u306E\u5834\u5408\u3001-keypass\u3068-new\u306F\u6307\u5B9A\u3067\u304D\u307E\u305B\u3093"},
-        {"if.protected.is.specified.then.storepass.keypass.and.new.must.not.be.specified",
-                "-protected\u304C\u6307\u5B9A\u3055\u308C\u3066\u3044\u308B\u5834\u5408\u3001-storepass\u3001-keypass\u304A\u3088\u3073-new\u306F\u6307\u5B9A\u3067\u304D\u307E\u305B\u3093"},
-        {"if.srcprotected.is.specified.then.srcstorepass.and.srckeypass.must.not.be.specified",
-                "-srcprotected\u304C\u6307\u5B9A\u3055\u308C\u3066\u3044\u308B\u5834\u5408\u3001-srcstorepass\u304A\u3088\u3073-srckeypass\u306F\u6307\u5B9A\u3067\u304D\u307E\u305B\u3093"},
-        {"if.keystore.is.not.password.protected.then.storepass.keypass.and.new.must.not.be.specified",
-                "\u30AD\u30FC\u30B9\u30C8\u30A2\u304C\u30D1\u30B9\u30EF\u30FC\u30C9\u3067\u4FDD\u8B77\u3055\u308C\u3066\u3044\u306A\u3044\u5834\u5408\u3001-storepass\u3001-keypass\u304A\u3088\u3073-new\u306F\u6307\u5B9A\u3067\u304D\u307E\u305B\u3093"},
-        {"if.source.keystore.is.not.password.protected.then.srcstorepass.and.srckeypass.must.not.be.specified",
-                "\u30BD\u30FC\u30B9\u30FB\u30AD\u30FC\u30B9\u30C8\u30A2\u304C\u30D1\u30B9\u30EF\u30FC\u30C9\u3067\u4FDD\u8B77\u3055\u308C\u3066\u3044\u306A\u3044\u5834\u5408\u3001-srcstorepass\u304A\u3088\u3073-srckeypass\u306F\u6307\u5B9A\u3067\u304D\u307E\u305B\u3093"},
-        {"Illegal.startdate.value", "startdate\u5024\u304C\u7121\u52B9\u3067\u3059"},
-        {"Validity.must.be.greater.than.zero",
-                "\u59A5\u5F53\u6027\u306F\u30BC\u30ED\u3088\u308A\u5927\u304D\u3044\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059"},
-        {"provclass.not.a.provider", "%s\u306F\u30D7\u30ED\u30D0\u30A4\u30C0\u3067\u306F\u3042\u308A\u307E\u305B\u3093"},
-        {"provider.name.not.found", "\u30D7\u30ED\u30D0\u30A4\u30C0\u540D\"%s\"\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093"},
-        {"provider.class.not.found", "\u30D7\u30ED\u30D0\u30A4\u30C0\"%s\"\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093"},
-        {"Usage.error.no.command.provided", "\u4F7F\u7528\u30A8\u30E9\u30FC: \u30B3\u30DE\u30F3\u30C9\u304C\u6307\u5B9A\u3055\u308C\u3066\u3044\u307E\u305B\u3093"},
-        {"Source.keystore.file.exists.but.is.empty.", "\u30BD\u30FC\u30B9\u30FB\u30AD\u30FC\u30B9\u30C8\u30A2\u30FB\u30D5\u30A1\u30A4\u30EB\u306F\u3001\u5B58\u5728\u3057\u307E\u3059\u304C\u7A7A\u3067\u3059: "},
-        {"Please.specify.srckeystore", "-srckeystore\u3092\u6307\u5B9A\u3057\u3066\u304F\u3060\u3055\u3044"},
-        {"Must.not.specify.both.v.and.rfc.with.list.command",
-                "'list'\u30B3\u30DE\u30F3\u30C9\u306B-v\u3068-rfc\u306E\u4E21\u65B9\u3092\u6307\u5B9A\u3059\u308B\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093"},
-        {"Key.password.must.be.at.least.6.characters",
-                "\u30AD\u30FC\u306E\u30D1\u30B9\u30EF\u30FC\u30C9\u306F6\u6587\u5B57\u4EE5\u4E0A\u3067\u3042\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059"},
-        {"New.password.must.be.at.least.6.characters",
-                "\u65B0\u898F\u30D1\u30B9\u30EF\u30FC\u30C9\u306F6\u6587\u5B57\u4EE5\u4E0A\u3067\u3042\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059"},
-        {"Keystore.file.exists.but.is.empty.",
-                "\u30AD\u30FC\u30B9\u30C8\u30A2\u30FB\u30D5\u30A1\u30A4\u30EB\u306F\u5B58\u5728\u3057\u307E\u3059\u304C\u3001\u7A7A\u3067\u3059: "},
-        {"Keystore.file.does.not.exist.",
-                "\u30AD\u30FC\u30B9\u30C8\u30A2\u30FB\u30D5\u30A1\u30A4\u30EB\u306F\u5B58\u5728\u3057\u307E\u305B\u3093: "},
-        {"Must.specify.destination.alias", "\u51FA\u529B\u5148\u306E\u5225\u540D\u3092\u6307\u5B9A\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059"},
-        {"Must.specify.alias", "\u5225\u540D\u3092\u6307\u5B9A\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059"},
-        {"Keystore.password.must.be.at.least.6.characters",
-                "\u30AD\u30FC\u30B9\u30C8\u30A2\u306E\u30D1\u30B9\u30EF\u30FC\u30C9\u306F6\u6587\u5B57\u4EE5\u4E0A\u3067\u3042\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059"},
-        {"Enter.the.password.to.be.stored.",
-                "\u4FDD\u5B58\u3059\u308B\u30D1\u30B9\u30EF\u30FC\u30C9\u3092\u5165\u529B\u3057\u3066\u304F\u3060\u3055\u3044:  "},
-        {"Enter.keystore.password.", "\u30AD\u30FC\u30B9\u30C8\u30A2\u306E\u30D1\u30B9\u30EF\u30FC\u30C9\u3092\u5165\u529B\u3057\u3066\u304F\u3060\u3055\u3044:  "},
-        {"Enter.source.keystore.password.", "\u30BD\u30FC\u30B9\u30FB\u30AD\u30FC\u30B9\u30C8\u30A2\u306E\u30D1\u30B9\u30EF\u30FC\u30C9\u3092\u5165\u529B\u3057\u3066\u304F\u3060\u3055\u3044:  "},
-        {"Enter.destination.keystore.password.", "\u51FA\u529B\u5148\u30AD\u30FC\u30B9\u30C8\u30A2\u306E\u30D1\u30B9\u30EF\u30FC\u30C9\u3092\u5165\u529B\u3057\u3066\u304F\u3060\u3055\u3044:  "},
-        {"Keystore.password.is.too.short.must.be.at.least.6.characters",
-         "\u30AD\u30FC\u30B9\u30C8\u30A2\u306E\u30D1\u30B9\u30EF\u30FC\u30C9\u304C\u77ED\u3059\u304E\u307E\u3059 - 6\u6587\u5B57\u4EE5\u4E0A\u306B\u3057\u3066\u304F\u3060\u3055\u3044"},
-        {"Unknown.Entry.Type", "\u4E0D\u660E\u306A\u30A8\u30F3\u30C8\u30EA\u30FB\u30BF\u30A4\u30D7"},
-        {"Entry.for.alias.alias.successfully.imported.",
-                 "\u5225\u540D{0}\u306E\u30A8\u30F3\u30C8\u30EA\u306E\u30A4\u30F3\u30DD\u30FC\u30C8\u306B\u6210\u529F\u3057\u307E\u3057\u305F\u3002"},
-        {"Entry.for.alias.alias.not.imported.", "\u5225\u540D{0}\u306E\u30A8\u30F3\u30C8\u30EA\u306F\u30A4\u30F3\u30DD\u30FC\u30C8\u3055\u308C\u307E\u305B\u3093\u3067\u3057\u305F\u3002"},
-        {"Problem.importing.entry.for.alias.alias.exception.Entry.for.alias.alias.not.imported.",
-                 "\u5225\u540D{0}\u306E\u30A8\u30F3\u30C8\u30EA\u306E\u30A4\u30F3\u30DD\u30FC\u30C8\u4E2D\u306B\u554F\u984C\u304C\u767A\u751F\u3057\u307E\u3057\u305F: {1}\u3002\n\u5225\u540D{0}\u306E\u30A8\u30F3\u30C8\u30EA\u306F\u30A4\u30F3\u30DD\u30FC\u30C8\u3055\u308C\u307E\u305B\u3093\u3067\u3057\u305F\u3002"},
-        {"Import.command.completed.ok.entries.successfully.imported.fail.entries.failed.or.cancelled",
-                 "\u30A4\u30F3\u30DD\u30FC\u30C8\u30FB\u30B3\u30DE\u30F3\u30C9\u304C\u5B8C\u4E86\u3057\u307E\u3057\u305F: {0}\u4EF6\u306E\u30A8\u30F3\u30C8\u30EA\u306E\u30A4\u30F3\u30DD\u30FC\u30C8\u304C\u6210\u529F\u3057\u307E\u3057\u305F\u3002{1}\u4EF6\u306E\u30A8\u30F3\u30C8\u30EA\u306E\u30A4\u30F3\u30DD\u30FC\u30C8\u304C\u5931\u6557\u3057\u305F\u304B\u53D6\u308A\u6D88\u3055\u308C\u307E\u3057\u305F"},
-        {"Warning.Overwriting.existing.alias.alias.in.destination.keystore",
-                 "\u8B66\u544A: \u51FA\u529B\u5148\u30AD\u30FC\u30B9\u30C8\u30A2\u5185\u306E\u65E2\u5B58\u306E\u5225\u540D{0}\u3092\u4E0A\u66F8\u304D\u3057\u3066\u3044\u307E\u3059"},
-        {"Existing.entry.alias.alias.exists.overwrite.no.",
-                 "\u65E2\u5B58\u306E\u30A8\u30F3\u30C8\u30EA\u306E\u5225\u540D{0}\u304C\u5B58\u5728\u3057\u3066\u3044\u307E\u3059\u3002\u4E0A\u66F8\u304D\u3057\u307E\u3059\u304B\u3002[\u3044\u3044\u3048]:  "},
-        {"Too.many.failures.try.later", "\u969C\u5BB3\u304C\u591A\u3059\u304E\u307E\u3059 - \u5F8C\u3067\u5B9F\u884C\u3057\u3066\u304F\u3060\u3055\u3044"},
-        {"Certification.request.stored.in.file.filename.",
-                "\u8A8D\u8A3C\u30EA\u30AF\u30A8\u30B9\u30C8\u304C\u30D5\u30A1\u30A4\u30EB<{0}>\u306B\u4FDD\u5B58\u3055\u308C\u307E\u3057\u305F"},
-        {"Submit.this.to.your.CA", "\u3053\u308C\u3092CA\u306B\u63D0\u51FA\u3057\u3066\u304F\u3060\u3055\u3044"},
-        {"if.alias.not.specified.destalias.and.srckeypass.must.not.be.specified",
-            "\u5225\u540D\u3092\u6307\u5B9A\u3057\u306A\u3044\u5834\u5408\u3001\u51FA\u529B\u5148\u30AD\u30FC\u30B9\u30C8\u30A2\u306E\u5225\u540D\u304A\u3088\u3073\u30BD\u30FC\u30B9\u30FB\u30AD\u30FC\u30B9\u30C8\u30A2\u306E\u30D1\u30B9\u30EF\u30FC\u30C9\u306F\u6307\u5B9A\u3067\u304D\u307E\u305B\u3093"},
-        {"The.destination.pkcs12.keystore.has.different.storepass.and.keypass.Please.retry.with.destkeypass.specified.",
-            "\u51FA\u529B\u5148pkcs12\u30AD\u30FC\u30B9\u30C8\u30A2\u306B\u3001\u7570\u306A\u308Bstorepass\u304A\u3088\u3073keypass\u304C\u3042\u308A\u307E\u3059\u3002-destkeypass\u3092\u6307\u5B9A\u3057\u3066\u518D\u8A66\u884C\u3057\u3066\u304F\u3060\u3055\u3044\u3002"},
-        {"Certificate.stored.in.file.filename.",
-                "\u8A3C\u660E\u66F8\u304C\u30D5\u30A1\u30A4\u30EB<{0}>\u306B\u4FDD\u5B58\u3055\u308C\u307E\u3057\u305F"},
-        {"Certificate.reply.was.installed.in.keystore",
-                "\u8A3C\u660E\u66F8\u5FDC\u7B54\u304C\u30AD\u30FC\u30B9\u30C8\u30A2\u306B\u30A4\u30F3\u30B9\u30C8\u30FC\u30EB\u3055\u308C\u307E\u3057\u305F"},
-        {"Certificate.reply.was.not.installed.in.keystore",
-                "\u8A3C\u660E\u66F8\u5FDC\u7B54\u304C\u30AD\u30FC\u30B9\u30C8\u30A2\u306B\u30A4\u30F3\u30B9\u30C8\u30FC\u30EB\u3055\u308C\u307E\u305B\u3093\u3067\u3057\u305F"},
-        {"Certificate.was.added.to.keystore",
-                "\u8A3C\u660E\u66F8\u304C\u30AD\u30FC\u30B9\u30C8\u30A2\u306B\u8FFD\u52A0\u3055\u308C\u307E\u3057\u305F"},
-        {"Certificate.was.not.added.to.keystore",
-                "\u8A3C\u660E\u66F8\u304C\u30AD\u30FC\u30B9\u30C8\u30A2\u306B\u8FFD\u52A0\u3055\u308C\u307E\u305B\u3093\u3067\u3057\u305F"},
-        {".Storing.ksfname.", "[{0}\u3092\u683C\u7D0D\u4E2D]"},
-        {"alias.has.no.public.key.certificate.",
-                "{0}\u306B\u306F\u516C\u958B\u30AD\u30FC(\u8A3C\u660E\u66F8)\u304C\u3042\u308A\u307E\u305B\u3093"},
-        {"Cannot.derive.signature.algorithm",
-                "\u7F72\u540D\u30A2\u30EB\u30B4\u30EA\u30BA\u30E0\u3092\u53D6\u5F97\u3067\u304D\u307E\u305B\u3093"},
-        {"Alias.alias.does.not.exist",
-                "\u5225\u540D<{0}>\u306F\u5B58\u5728\u3057\u307E\u305B\u3093"},
-        {"Alias.alias.has.no.certificate",
-                "\u5225\u540D<{0}>\u306B\u306F\u8A3C\u660E\u66F8\u304C\u3042\u308A\u307E\u305B\u3093"},
-        {"groupname.keysize.coexist",
-                "-groupname\u3068-keysize\u306E\u4E21\u65B9\u3092\u6307\u5B9A\u3067\u304D\u307E\u305B\u3093"},
-        {"deprecate.keysize.for.ec",
-                "-keysize\u306E\u6307\u5B9A\u306B\u3088\u308BEC\u30AD\u30FC\u306E\u751F\u6210\u306F\u975E\u63A8\u5968\u3067\u3059\u3002\u304B\u308F\u308A\u306B\"-groupname %s\"\u3092\u4F7F\u7528\u3057\u3066\u304F\u3060\u3055\u3044\u3002"},
-        {"Key.pair.not.generated.alias.alias.already.exists",
-                "\u30AD\u30FC\u30FB\u30DA\u30A2\u306F\u751F\u6210\u3055\u308C\u307E\u305B\u3093\u3067\u3057\u305F\u3002\u5225\u540D<{0}>\u306F\u3059\u3067\u306B\u5B58\u5728\u3057\u307E\u3059"},
-        {"size.bit.alg",
-                "%1$d\u30D3\u30C3\u30C8%2$s"},
-        {"Generating.full.keyAlgName.key.pair.and.self.signed.certificate.sigAlgName.with.a.validity.of.days.for",
-                "{0}\u30AD\u30FC\u30FB\u30DA\u30A2\u304A\u3088\u3073\u81EA\u5DF1\u7F72\u540D\u8A3C\u660E\u66F8({1})\u3092{2}\u65E5\u306E\u6709\u52B9\u6027\u3067\u751F\u6210\u3057\u3066\u3044\u307E\u3059\n\t\u5BFE\u8C61: {3}"},
-        {"Generating.full.keyAlgName.key.pair.and.a.certificate.sigAlgName.issued.by.signerAlias.with.a.validity.of.days.for",
-                "{0}\u30AD\u30FC\u30FB\u30DA\u30A2\u3068\u003C\u007B\u0032\u007D\u003E\u306B\u3088\u3063\u3066\u767A\u884C\u3055\u308C\u305F\u8A3C\u660E\u66F8({1})\u3092{3}\u65E5\u9593\u306E\u6709\u52B9\u6027\u3067\u751F\u6210\u3057\u3066\u3044\u307E\u3059\n\t\u5BFE\u8C61: {4}"},
-        {"Enter.key.password.for.alias.", "<{0}>\u306E\u30AD\u30FC\u30FB\u30D1\u30B9\u30EF\u30FC\u30C9\u3092\u5165\u529B\u3057\u3066\u304F\u3060\u3055\u3044"},
-        {".RETURN.if.same.as.keystore.password.",
-                "\t(\u30AD\u30FC\u30B9\u30C8\u30A2\u306E\u30D1\u30B9\u30EF\u30FC\u30C9\u3068\u540C\u3058\u5834\u5408\u306FRETURN\u3092\u62BC\u3057\u3066\u304F\u3060\u3055\u3044):  "},
-        {"Key.password.is.too.short.must.be.at.least.6.characters",
-                "\u30AD\u30FC\u306E\u30D1\u30B9\u30EF\u30FC\u30C9\u304C\u77ED\u3059\u304E\u307E\u3059 - 6\u6587\u5B57\u4EE5\u4E0A\u3092\u6307\u5B9A\u3057\u3066\u304F\u3060\u3055\u3044"},
-        {"Too.many.failures.key.not.added.to.keystore",
-                "\u969C\u5BB3\u304C\u591A\u3059\u304E\u307E\u3059 - \u30AD\u30FC\u306F\u30AD\u30FC\u30B9\u30C8\u30A2\u306B\u8FFD\u52A0\u3055\u308C\u307E\u305B\u3093\u3067\u3057\u305F"},
-        {"Destination.alias.dest.already.exists",
-                "\u51FA\u529B\u5148\u306E\u5225\u540D<{0}>\u306F\u3059\u3067\u306B\u5B58\u5728\u3057\u307E\u3059"},
-        {"Password.is.too.short.must.be.at.least.6.characters",
-                "\u30D1\u30B9\u30EF\u30FC\u30C9\u304C\u77ED\u3059\u304E\u307E\u3059 - 6\u6587\u5B57\u4EE5\u4E0A\u3092\u6307\u5B9A\u3057\u3066\u304F\u3060\u3055\u3044"},
-        {"Too.many.failures.Key.entry.not.cloned",
-                "\u969C\u5BB3\u304C\u591A\u3059\u304E\u307E\u3059\u3002\u30AD\u30FC\u30FB\u30A8\u30F3\u30C8\u30EA\u306E\u30AF\u30ED\u30FC\u30F3\u306F\u4F5C\u6210\u3055\u308C\u307E\u305B\u3093\u3067\u3057\u305F"},
-        {"key.password.for.alias.", "<{0}>\u306E\u30AD\u30FC\u306E\u30D1\u30B9\u30EF\u30FC\u30C9"},
-        {"No.entries.from.identity.database.added",
-                "\u30A2\u30A4\u30C7\u30F3\u30C6\u30A3\u30C6\u30A3\u30FB\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u304B\u3089\u8FFD\u52A0\u3055\u308C\u305F\u30A8\u30F3\u30C8\u30EA\u306F\u3042\u308A\u307E\u305B\u3093"},
-        {"Alias.name.alias", "\u5225\u540D: {0}"},
-        {"Creation.date.keyStore.getCreationDate.alias.",
-                "\u4F5C\u6210\u65E5: {0,date}"},
-        {"alias.keyStore.getCreationDate.alias.",
-                "{0},{1,date}, "},
-        {"alias.", "{0}, "},
-        {"Entry.type.type.", "\u30A8\u30F3\u30C8\u30EA\u30FB\u30BF\u30A4\u30D7: {0}"},
-        {"Certificate.chain.length.", "\u8A3C\u660E\u66F8\u30C1\u30A7\u30FC\u30F3\u306E\u9577\u3055: "},
-        {"Certificate.i.1.", "\u8A3C\u660E\u66F8[{0,number,integer}]:"},
-        {"Certificate.fingerprint.SHA.256.", "\u8A3C\u660E\u66F8\u306E\u30D5\u30A3\u30F3\u30AC\u30D7\u30EA\u30F3\u30C8(SHA-256): "},
-        {"Keystore.type.", "\u30AD\u30FC\u30B9\u30C8\u30A2\u306E\u30BF\u30A4\u30D7: "},
-        {"Keystore.provider.", "\u30AD\u30FC\u30B9\u30C8\u30A2\u30FB\u30D7\u30ED\u30D0\u30A4\u30C0: "},
-        {"Your.keystore.contains.keyStore.size.entry",
-                "\u30AD\u30FC\u30B9\u30C8\u30A2\u306B\u306F{0,number,integer}\u30A8\u30F3\u30C8\u30EA\u304C\u542B\u307E\u308C\u307E\u3059"},
-        {"Your.keystore.contains.keyStore.size.entries",
-                "\u30AD\u30FC\u30B9\u30C8\u30A2\u306B\u306F{0,number,integer}\u30A8\u30F3\u30C8\u30EA\u304C\u542B\u307E\u308C\u307E\u3059"},
-        {"Failed.to.parse.input", "\u5165\u529B\u306E\u69CB\u6587\u89E3\u6790\u306B\u5931\u6557\u3057\u307E\u3057\u305F"},
-        {"Empty.input", "\u5165\u529B\u304C\u3042\u308A\u307E\u305B\u3093"},
-        {"Not.X.509.certificate", "X.509\u8A3C\u660E\u66F8\u3067\u306F\u3042\u308A\u307E\u305B\u3093"},
-        {"alias.has.no.public.key", "{0}\u306B\u306F\u516C\u958B\u30AD\u30FC\u304C\u3042\u308A\u307E\u305B\u3093"},
-        {"alias.has.no.X.509.certificate", "{0}\u306B\u306FX.509\u8A3C\u660E\u66F8\u304C\u3042\u308A\u307E\u305B\u3093"},
-        {"New.certificate.self.signed.", "\u65B0\u3057\u3044\u8A3C\u660E\u66F8(\u81EA\u5DF1\u7F72\u540D\u578B):"},
-        {"Reply.has.no.certificates", "\u5FDC\u7B54\u306B\u306F\u8A3C\u660E\u66F8\u304C\u3042\u308A\u307E\u305B\u3093"},
-        {"Certificate.not.imported.alias.alias.already.exists",
-                "\u8A3C\u660E\u66F8\u306F\u30A4\u30F3\u30DD\u30FC\u30C8\u3055\u308C\u307E\u305B\u3093\u3067\u3057\u305F\u3002\u5225\u540D<{0}>\u306F\u3059\u3067\u306B\u5B58\u5728\u3057\u307E\u3059"},
-        {"Input.not.an.X.509.certificate", "\u5165\u529B\u306FX.509\u8A3C\u660E\u66F8\u3067\u306F\u3042\u308A\u307E\u305B\u3093"},
-        {"Certificate.already.exists.in.keystore.under.alias.trustalias.",
-                "\u8A3C\u660E\u66F8\u306F\u3001\u5225\u540D<{0}>\u306E\u30AD\u30FC\u30B9\u30C8\u30A2\u306B\u3059\u3067\u306B\u5B58\u5728\u3057\u307E\u3059"},
-        {"Do.you.still.want.to.add.it.no.",
-                "\u8FFD\u52A0\u3057\u307E\u3059\u304B\u3002[\u3044\u3044\u3048]:  "},
-        {"Certificate.already.exists.in.system.wide.CA.keystore.under.alias.trustalias.",
-                "\u8A3C\u660E\u66F8\u306F\u3001\u5225\u540D<{0}>\u306E\u30B7\u30B9\u30C6\u30E0\u898F\u6A21\u306ECA\u30AD\u30FC\u30B9\u30C8\u30A2\u5185\u306B\u3059\u3067\u306B\u5B58\u5728\u3057\u307E\u3059"},
-        {"Do.you.still.want.to.add.it.to.your.own.keystore.no.",
-                "\u30AD\u30FC\u30B9\u30C8\u30A2\u306B\u8FFD\u52A0\u3057\u307E\u3059\u304B\u3002 [\u3044\u3044\u3048]:  "},
-        {"Trust.this.certificate.no.", "\u3053\u306E\u8A3C\u660E\u66F8\u3092\u4FE1\u983C\u3057\u307E\u3059\u304B\u3002 [\u3044\u3044\u3048]:  "},
-        {"New.prompt.", "\u65B0\u898F{0}: "},
-        {"Passwords.must.differ", "\u30D1\u30B9\u30EF\u30FC\u30C9\u306F\u7570\u306A\u3063\u3066\u3044\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059"},
-        {"Re.enter.new.prompt.", "\u65B0\u898F{0}\u3092\u518D\u5165\u529B\u3057\u3066\u304F\u3060\u3055\u3044: "},
-        {"Re.enter.password.", "\u30D1\u30B9\u30EF\u30FC\u30C9\u3092\u518D\u5165\u529B\u3057\u3066\u304F\u3060\u3055\u3044: "},
-        {"Re.enter.new.password.", "\u65B0\u898F\u30D1\u30B9\u30EF\u30FC\u30C9\u3092\u518D\u5165\u529B\u3057\u3066\u304F\u3060\u3055\u3044: "},
-        {"They.don.t.match.Try.again", "\u4E00\u81F4\u3057\u307E\u305B\u3093\u3002\u3082\u3046\u4E00\u5EA6\u5B9F\u884C\u3057\u3066\u304F\u3060\u3055\u3044"},
-        {"Enter.prompt.alias.name.", "{0}\u306E\u5225\u540D\u3092\u5165\u529B\u3057\u3066\u304F\u3060\u3055\u3044:  "},
-        {"Enter.new.alias.name.RETURN.to.cancel.import.for.this.entry.",
-                 "\u65B0\u3057\u3044\u5225\u540D\u3092\u5165\u529B\u3057\u3066\u304F\u3060\u3055\u3044\t(\u3053\u306E\u30A8\u30F3\u30C8\u30EA\u306E\u30A4\u30F3\u30DD\u30FC\u30C8\u3092\u53D6\u308A\u6D88\u3059\u5834\u5408\u306FRETURN\u3092\u62BC\u3057\u3066\u304F\u3060\u3055\u3044):  "},
-        {"Enter.alias.name.", "\u5225\u540D\u3092\u5165\u529B\u3057\u3066\u304F\u3060\u3055\u3044:  "},
-        {".RETURN.if.same.as.for.otherAlias.",
-                "\t(<{0}>\u3068\u540C\u3058\u5834\u5408\u306FRETURN\u3092\u62BC\u3057\u3066\u304F\u3060\u3055\u3044)"},
-        {"enter.dname.components",
-                "\u8B58\u5225\u540D\u3092\u5165\u529B\u3057\u307E\u3059\u3002\u30B5\u30D6\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u3092\u7A7A\u306E\u307E\u307E\u306B\u3059\u308B\u5834\u5408\u306F\u30C9\u30C3\u30C8(.)\u30921\u3064\u5165\u529B\u3057\u3001\u4E2D\u30AB\u30C3\u30B3\u5185\u306E\u30C7\u30D5\u30A9\u30EB\u30C8\u5024\u3092\u4F7F\u7528\u3059\u308B\u5834\u5408\u306F[ENTER]\u3092\u62BC\u3057\u307E\u3059\u3002"},
-        {"What.is.your.first.and.last.name.",
-                "\u59D3\u540D\u306F\u4F55\u3067\u3059\u304B\u3002"},
-        {"What.is.the.name.of.your.organizational.unit.",
-                "\u7D44\u7E54\u5358\u4F4D\u540D\u306F\u4F55\u3067\u3059\u304B\u3002"},
-        {"What.is.the.name.of.your.organization.",
-                "\u7D44\u7E54\u540D\u306F\u4F55\u3067\u3059\u304B\u3002"},
-        {"What.is.the.name.of.your.City.or.Locality.",
-                "\u90FD\u5E02\u540D\u307E\u305F\u306F\u5730\u57DF\u540D\u306F\u4F55\u3067\u3059\u304B\u3002"},
-        {"What.is.the.name.of.your.State.or.Province.",
-                "\u90FD\u9053\u5E9C\u770C\u540D\u307E\u305F\u306F\u5DDE\u540D\u306F\u4F55\u3067\u3059\u304B\u3002"},
-        {"What.is.the.two.letter.country.code.for.this.unit.",
-                "\u3053\u306E\u5358\u4F4D\u306B\u8A72\u5F53\u3059\u308B2\u6587\u5B57\u306E\u56FD\u30B3\u30FC\u30C9\u306F\u4F55\u3067\u3059\u304B\u3002"},
-        {"no.field.in.dname",
-                "\u5C11\u306A\u304F\u3068\u30821\u3064\u306E\u30D5\u30A3\u30FC\u30EB\u30C9\u3092\u6307\u5B9A\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002\u518D\u5EA6\u5165\u529B\u3057\u3066\u304F\u3060\u3055\u3044\u3002"},
-        {"Is.name.correct.", "{0}\u3067\u3088\u308D\u3057\u3044\u3067\u3059\u304B\u3002"},
-        {"no", "\u3044\u3044\u3048"},
-        {"yes", "\u306F\u3044"},
-        {"y", "y"},
-        {".defaultValue.", "  [{0}]:  "},
-        {"Alias.alias.has.no.key",
-                "\u5225\u540D<{0}>\u306B\u306F\u30AD\u30FC\u304C\u3042\u308A\u307E\u305B\u3093"},
-        {"Alias.alias.references.an.entry.type.that.is.not.a.private.key.entry.The.keyclone.command.only.supports.cloning.of.private.key",
-                 "\u5225\u540D<{0}>\u304C\u53C2\u7167\u3057\u3066\u3044\u308B\u30A8\u30F3\u30C8\u30EA\u30FB\u30BF\u30A4\u30D7\u306F\u79D8\u5BC6\u30AD\u30FC\u30FB\u30A8\u30F3\u30C8\u30EA\u3067\u306F\u3042\u308A\u307E\u305B\u3093\u3002-keyclone\u30B3\u30DE\u30F3\u30C9\u306F\u79D8\u5BC6\u30AD\u30FC\u30FB\u30A8\u30F3\u30C8\u30EA\u306E\u30AF\u30ED\u30FC\u30F3\u4F5C\u6210\u306E\u307F\u3092\u30B5\u30DD\u30FC\u30C8\u3057\u307E\u3059"},
-
-        {".WARNING.WARNING.WARNING.",
-            "*****************  WARNING WARNING WARNING  *****************"},
-        {"Signer.d.", "\u7F72\u540D\u8005\u756A\u53F7%d:"},
-        {"Certificate.d.", "\u8A3C\u660E\u66F8#%d:"},
-        {"Timestamp.", "\u30BF\u30A4\u30E0\u30B9\u30BF\u30F3\u30D7:"},
-        {"Certificate.owner.", "\u8A3C\u660E\u66F8\u306E\u6240\u6709\u8005: "},
-        {"Not.a.signed.jar.file", "\u7F72\u540D\u4ED8\u304DJAR\u30D5\u30A1\u30A4\u30EB\u3067\u306F\u3042\u308A\u307E\u305B\u3093"},
-        {"No.certificate.from.the.SSL.server",
-                "SSL\u30B5\u30FC\u30D0\u30FC\u304B\u3089\u306E\u8A3C\u660E\u66F8\u304C\u3042\u308A\u307E\u305B\u3093"},
-
-        {".The.integrity.of.the.information.stored.in.your.keystore.",
-            "*\u30AD\u30FC\u30B9\u30C8\u30A2\u306B\u4FDD\u5B58\u3055\u308C\u305F\u60C5\u5831\u306E\u6574\u5408\u6027\u306F*\n*\u691C\u8A3C\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002\u6574\u5408\u6027\u3092\u691C\u8A3C\u3059\u308B\u306B\u306F*\n*\u30AD\u30FC\u30B9\u30C8\u30A2\u306E\u30D1\u30B9\u30EF\u30FC\u30C9\u3092\u5165\u529B\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002*"},
-        {".The.integrity.of.the.information.stored.in.the.srckeystore.",
-            "*\u30BD\u30FC\u30B9\u30FB\u30AD\u30FC\u30B9\u30C8\u30A2\u306B\u4FDD\u5B58\u3055\u308C\u305F\u60C5\u5831\u306E\u6574\u5408\u6027\u306F*\n*\u691C\u8A3C\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002\u6574\u5408\u6027\u3092\u691C\u8A3C\u3059\u308B\u306B\u306F*\n*\u30BD\u30FC\u30B9\u30FB\u30AD\u30FC\u30B9\u30C8\u30A2\u306E\u30D1\u30B9\u30EF\u30FC\u30C9\u3092\u5165\u529B\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002*"},
-
-        {"Certificate.reply.does.not.contain.public.key.for.alias.",
-                "\u8A3C\u660E\u66F8\u5FDC\u7B54\u306B\u306F\u3001<{0}>\u306E\u516C\u958B\u30AD\u30FC\u306F\u542B\u307E\u308C\u307E\u305B\u3093"},
-        {"Incomplete.certificate.chain.in.reply",
-                "\u5FDC\u7B54\u3057\u305F\u8A3C\u660E\u66F8\u30C1\u30A7\u30FC\u30F3\u306F\u4E0D\u5B8C\u5168\u3067\u3059"},
-        {"Top.level.certificate.in.reply.",
-                "\u5FDC\u7B54\u3057\u305F\u30C8\u30C3\u30D7\u30EC\u30D9\u30EB\u306E\u8A3C\u660E\u66F8:\n"},
-        {".is.not.trusted.", "... \u306F\u4FE1\u983C\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002 "},
-        {"Install.reply.anyway.no.", "\u5FDC\u7B54\u3092\u30A4\u30F3\u30B9\u30C8\u30FC\u30EB\u3057\u307E\u3059\u304B\u3002[\u3044\u3044\u3048]:  "},
-        {"Public.keys.in.reply.and.keystore.don.t.match",
-                "\u5FDC\u7B54\u3057\u305F\u516C\u958B\u30AD\u30FC\u3068\u30AD\u30FC\u30B9\u30C8\u30A2\u304C\u4E00\u81F4\u3057\u307E\u305B\u3093"},
-        {"Certificate.reply.and.certificate.in.keystore.are.identical",
-                "\u8A3C\u660E\u66F8\u5FDC\u7B54\u3068\u30AD\u30FC\u30B9\u30C8\u30A2\u5185\u306E\u8A3C\u660E\u66F8\u304C\u540C\u3058\u3067\u3059"},
-        {"Failed.to.establish.chain.from.reply",
-                "\u5FDC\u7B54\u304B\u3089\u9023\u9396\u3092\u78BA\u7ACB\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F"},
-        {"n", "n"},
-        {"Wrong.answer.try.again", "\u5FDC\u7B54\u304C\u9593\u9055\u3063\u3066\u3044\u307E\u3059\u3002\u3082\u3046\u4E00\u5EA6\u5B9F\u884C\u3057\u3066\u304F\u3060\u3055\u3044"},
-        {"Secret.key.not.generated.alias.alias.already.exists",
-                "\u79D8\u5BC6\u30AD\u30FC\u306F\u751F\u6210\u3055\u308C\u307E\u305B\u3093\u3067\u3057\u305F\u3002\u5225\u540D<{0}>\u306F\u3059\u3067\u306B\u5B58\u5728\u3057\u307E\u3059"},
-        {"Please.provide.keysize.for.secret.key.generation",
-                "\u79D8\u5BC6\u30AD\u30FC\u306E\u751F\u6210\u6642\u306B\u306F -keysize\u3092\u6307\u5B9A\u3057\u3066\u304F\u3060\u3055\u3044"},
-
-        {"warning.not.verified.make.sure.keystore.is.correct",
-            "\u8B66\u544A: \u691C\u8A3C\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002-keystore\u304C\u6B63\u3057\u3044\u3053\u3068\u3092\u78BA\u8A8D\u3057\u3066\u304F\u3060\u3055\u3044\u3002"},
-        {"warning.not.verified.make.sure.keystore.is.correct.or.specify.trustcacerts",
-            "\u8B66\u544A: \u691C\u8A3C\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002-keystore\u304C\u6B63\u3057\u3044\u3053\u3068\u3092\u78BA\u8A8D\u3059\u308B\u304B\u3001-trustcacerts\u3092\u6307\u5B9A\u3057\u3066\u304F\u3060\u3055\u3044\u3002"},
-
-        {"Extensions.", "\u62E1\u5F35: "},
-        {".Empty.value.", "(\u7A7A\u306E\u5024)"},
-        {"Extension.Request.", "\u62E1\u5F35\u30EA\u30AF\u30A8\u30B9\u30C8:"},
-        {"Unknown.keyUsage.type.", "\u4E0D\u660E\u306AkeyUsage\u30BF\u30A4\u30D7: "},
-        {"Unknown.extendedkeyUsage.type.", "\u4E0D\u660E\u306AextendedkeyUsage\u30BF\u30A4\u30D7: "},
-        {"Unknown.AccessDescription.type.", "\u4E0D\u660E\u306AAccessDescription\u30BF\u30A4\u30D7: "},
-        {"Unrecognized.GeneralName.type.", "\u8A8D\u8B58\u3055\u308C\u306A\u3044GeneralName\u30BF\u30A4\u30D7: "},
-        {"This.extension.cannot.be.marked.as.critical.",
-                 "\u3053\u306E\u62E1\u5F35\u306F\u30AF\u30EA\u30C6\u30A3\u30AB\u30EB\u3068\u3057\u3066\u30DE\u30FC\u30AF\u4ED8\u3051\u3067\u304D\u307E\u305B\u3093\u3002 "},
-        {"Odd.number.of.hex.digits.found.", "\u5947\u6570\u306E16\u9032\u6570\u304C\u898B\u3064\u304B\u308A\u307E\u3057\u305F: "},
-        {"Unknown.extension.type.", "\u4E0D\u660E\u306A\u62E1\u5F35\u30BF\u30A4\u30D7: "},
-        {"command.{0}.is.ambiguous.", "\u30B3\u30DE\u30F3\u30C9{0}\u306F\u3042\u3044\u307E\u3044\u3067\u3059:"},
-
-        // 8171319: keytool should print out warnings when reading or
-        // generating cert/cert req using weak algorithms
-        {"the.certificate.request", "\u8A3C\u660E\u66F8\u30EA\u30AF\u30A8\u30B9\u30C8"},
-        {"the.issuer", "\u767A\u884C\u8005"},
-        {"the.generated.secretkey", "\u751F\u6210\u3055\u308C\u305F\u79D8\u5BC6\u30AD\u30FC"},
-        {"the.generated.certificate", "\u751F\u6210\u3055\u308C\u305F\u8A3C\u660E\u66F8"},
-        {"the.generated.crl", "\u751F\u6210\u3055\u308C\u305FCRL"},
-        {"the.generated.certificate.request", "\u751F\u6210\u3055\u308C\u305F\u8A3C\u660E\u66F8\u30EA\u30AF\u30A8\u30B9\u30C8"},
-        {"the.certificate", "\u8A3C\u660E\u66F8"},
-        {"the.crl", "CRL"},
-        {"the.tsa.certificate", "TSA\u8A3C\u660E\u66F8"},
-        {"the.input", "\u5165\u529B"},
-        {"reply", "\u5FDC\u7B54"},
-        {"one.in.many", "%1$s #%2$d / %3$d"},
-        {"one.in.many1", "%1$s #%2$d"},
-        {"one.in.many2", "\u7F72\u540D\u8005\u306E%1$s #%2$d"},
-        {"one.in.many3", "\u7F72\u540D\u8005\u306E%1$s #%2$d #%3$d"},
-        {"alias.in.cacerts", "cacerts\u5185\u306E\u767A\u884C\u8005<%s>"},
-        {"alias.in.keystore", "\u767A\u884C\u8005<%s>"},
-        {"with.weak", "%s (\u5F31)"},
-        {"with.disabled", "%s (\u7121\u52B9)"},
-        {"key.bit", "%s\u30AD\u30FC"},
-        {"key.bit.weak", "%s\u30AD\u30FC(\u5F31\u3044)"},
-        {"key.bit.disabled", "%s\u30AD\u30FC(\u7121\u52B9)"},
-        {".PATTERN.printX509Cert.with.weak",
-                "\u6240\u6709\u8005: {0}\n\u767A\u884C\u8005: {1}\n\u30B7\u30EA\u30A2\u30EB\u756A\u53F7: {2}\n\u6709\u52B9\u671F\u9593\u306E\u958B\u59CB\u65E5: {3}\u7D42\u4E86\u65E5: {4}\n\u8A3C\u660E\u66F8\u306E\u30D5\u30A3\u30F3\u30AC\u30D7\u30EA\u30F3\u30C8:\n\t SHA1: {5}\n\t SHA256: {6}\n\u7F72\u540D\u30A2\u30EB\u30B4\u30EA\u30BA\u30E0\u540D: {7}\n\u30B5\u30D6\u30B8\u30A7\u30AF\u30C8\u516C\u958B\u30AD\u30FC\u30FB\u30A2\u30EB\u30B4\u30EA\u30BA\u30E0: {8}\n\u30D0\u30FC\u30B8\u30E7\u30F3: {9}"},
-        {"PKCS.10.with.weak",
-                "PKCS #10\u8A3C\u660E\u66F8\u30EA\u30AF\u30A8\u30B9\u30C8(\u30D0\u30FC\u30B8\u30E7\u30F31.0)\n\u30B5\u30D6\u30B8\u30A7\u30AF\u30C8: %1$s\n\u30D5\u30A9\u30FC\u30DE\u30C3\u30C8: %2$s\n\u516C\u958B\u30AD\u30FC: %3$s\n\u7F72\u540D\u30A2\u30EB\u30B4\u30EA\u30BA\u30E0: %4$s\n"},
-        {"verified.by.s.in.s.weak", "%2$s\u5185\u306E%1$s\u306B\u3088\u308A%3$s\u3067\u691C\u8A3C\u3055\u308C\u307E\u3057\u305F"},
-        {"whose.sigalg.disabled", "%1$s\u306F%2$s\u7F72\u540D\u30A2\u30EB\u30B4\u30EA\u30BA\u30E0\u3092\u4F7F\u7528\u3057\u3066\u304A\u308A\u3001\u3053\u308C\u306F\u30BB\u30AD\u30E5\u30EA\u30C6\u30A3\u30FB\u30EA\u30B9\u30AF\u3068\u307F\u306A\u3055\u308C\u3001\u7121\u52B9\u5316\u3055\u308C\u3066\u3044\u307E\u3059\u3002"},
-        {"whose.sigalg.usagesignedjar", "%1$s\u306F%2$s\u7F72\u540D\u30A2\u30EB\u30B4\u30EA\u30BA\u30E0\u3092\u4F7F\u7528\u3057\u3066\u304A\u308A\u3001\u3053\u308C\u306F\u30BB\u30AD\u30E5\u30EA\u30C6\u30A3\u30FB\u30EA\u30B9\u30AF\u3068\u307F\u306A\u3055\u308C\u307E\u3059\u3002%3$s\u306E\u5F8C\u3067JAR\u306B\u7F72\u540D\u3059\u308B\u305F\u3081\u306B\u4F7F\u7528\u3059\u308B\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093\u3002"},
-        {"Unable.to.parse.denyAfter.string.in.exception.message", "\u4F8B\u5916\u30E1\u30C3\u30BB\u30FC\u30B8\u306EdenyAfter\u65E5\u4ED8\u6587\u5B57\u5217\u3092\u89E3\u6790\u3067\u304D\u307E\u305B\u3093"},
-        {"whose.sigalg.weak", "%1$s\u306F%2$s\u7F72\u540D\u30A2\u30EB\u30B4\u30EA\u30BA\u30E0\u3092\u4F7F\u7528\u3057\u3066\u304A\u308A\u3001\u3053\u308C\u306F\u30BB\u30AD\u30E5\u30EA\u30C6\u30A3\u30FB\u30EA\u30B9\u30AF\u3068\u307F\u306A\u3055\u308C\u307E\u3059\u3002"},
-        {"whose.key.disabled", "%1$s\u306F%2$s\u3092\u4F7F\u7528\u3057\u3066\u304A\u308A\u3001\u3053\u308C\u306F\u30BB\u30AD\u30E5\u30EA\u30C6\u30A3\u30FB\u30EA\u30B9\u30AF\u3068\u307F\u306A\u3055\u308C\u3001\u7121\u52B9\u5316\u3055\u308C\u3066\u3044\u307E\u3059\u3002"},
-        {"whose.key.weak", "%1$s\u306F%2$s\u3092\u4F7F\u7528\u3057\u3066\u304A\u308A\u3001\u3053\u308C\u306F\u30BB\u30AD\u30E5\u30EA\u30C6\u30A3\u30FB\u30EA\u30B9\u30AF\u3068\u307F\u306A\u3055\u308C\u307E\u3059\u3002\u4ECA\u5F8C\u306E\u66F4\u65B0\u3067\u306F\u7121\u52B9\u306B\u306A\u308A\u307E\u3059\u3002"},
-        {"jks.storetype.warning", "%1$s\u30AD\u30FC\u30B9\u30C8\u30A2\u306F\u72EC\u81EA\u306E\u5F62\u5F0F\u3092\u4F7F\u7528\u3057\u3066\u3044\u307E\u3059\u3002\"keytool -importkeystore -srckeystore %2$s -destkeystore %2$s -deststoretype pkcs12\"\u3092\u4F7F\u7528\u3059\u308B\u696D\u754C\u6A19\u6E96\u306E\u5F62\u5F0F\u3067\u3042\u308BPKCS12\u306B\u79FB\u884C\u3059\u308B\u3053\u3068\u3092\u304A\u85A6\u3081\u3057\u307E\u3059\u3002"},
-        {"migrate.keystore.warning", "\"%1$s\"\u304C%4$s\u306B\u79FB\u884C\u3055\u308C\u307E\u3057\u305F\u3002%2$s\u30AD\u30FC\u30B9\u30C8\u30A2\u306F\"%3$s\"\u3068\u3057\u3066\u30D0\u30C3\u30AF\u30A2\u30C3\u30D7\u3055\u308C\u307E\u3059\u3002"},
-        {"backup.keystore.warning", "\u5143\u306E\u30AD\u30FC\u30B9\u30C8\u30A2\"%1$s\"\u306F\"%3$s\"\u3068\u3057\u3066\u30D0\u30C3\u30AF\u30A2\u30C3\u30D7\u3055\u308C\u307E\u3059..."},
-        {"importing.keystore.status", "\u30AD\u30FC\u30B9\u30C8\u30A2%1$s\u3092%2$s\u306B\u30A4\u30F3\u30DD\u30FC\u30C8\u3057\u3066\u3044\u307E\u3059..."},
-        {"keyalg.option.missing.error", "-keyalg\u30AA\u30D7\u30B7\u30E7\u30F3\u3092\u6307\u5B9A\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002"},
-        {"showinfo.no.option", "-showinfo\u306E\u30AA\u30D7\u30B7\u30E7\u30F3\u304C\u3042\u308A\u307E\u305B\u3093\u3002\"keytool -showinfo -tls\"\u3092\u8A66\u3057\u3066\u304F\u3060\u3055\u3044\u3002"},
-    };
-
-
-    /**
-     * Returns the contents of this <code>ResourceBundle</code>.
-     *
-     * <p>
-     *
-     * @return the contents of this <code>ResourceBundle</code>.
-     */
-    @Override
-    public Object[][] getContents() {
-        return contents;
-    }
-}
diff --git a/src/java.base/share/classes/sun/security/tools/keytool/Resources_ko.java b/src/java.base/share/classes/sun/security/tools/keytool/Resources_ko.java
deleted file mode 100644
index 45c88cb2e07..00000000000
--- a/src/java.base/share/classes/sun/security/tools/keytool/Resources_ko.java
+++ /dev/null
@@ -1,484 +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.  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.tools.keytool;
-
-/**
- * <p> This class represents the <code>ResourceBundle</code>
- * for the keytool.
- *
- */
-public class Resources_ko extends java.util.ListResourceBundle {
-
-    private static final Object[][] contents = {
-        {"NEWLINE", "\n"},
-        {"STAR",
-                "*******************************************"},
-        {"STARNN",
-                "*******************************************\n\n"},
-
-        // keytool: Help part
-        {".OPTION.", " [OPTION]..."},
-        {"Options.", "\uC635\uC158:"},
-        {"option.1.set.twice", "%s \uC635\uC158\uC774 \uC5EC\uB7EC \uBC88 \uC9C0\uC815\uB418\uC5C8\uC2B5\uB2C8\uB2E4. \uB9C8\uC9C0\uB9C9 \uD56D\uBAA9\uC744 \uC81C\uC678\uD55C \uBAA8\uB4E0 \uD56D\uBAA9\uC774 \uBB34\uC2DC\uB429\uB2C8\uB2E4."},
-        {"multiple.commands.1.2", "\uBA85\uB839\uC740 \uD558\uB098\uB9CC \uD5C8\uC6A9\uB429\uB2C8\uB2E4. %1$s \uBC0F %2$s\uC774(\uAC00) \uBAA8\uB450 \uC9C0\uC815\uB418\uC5C8\uC2B5\uB2C8\uB2E4."},
-        {"Use.keytool.help.for.all.available.commands",
-                 "\uC0AC\uC6A9 \uAC00\uB2A5\uD55C \uBAA8\uB4E0 \uBA85\uB839\uC5D0 \"keytool -help\" \uC0AC\uC6A9"},
-        {"Key.and.Certificate.Management.Tool",
-                 "\uD0A4 \uBC0F \uC778\uC99D\uC11C \uAD00\uB9AC \uD234"},
-        {"Commands.", "\uBA85\uB839:"},
-        {"Use.keytool.command.name.help.for.usage.of.command.name",
-                "command_name \uC0AC\uC6A9\uBC95\uC5D0 \"keytool -command_name -help\"\uB97C \uC0AC\uC6A9\uD569\uB2C8\uB2E4.\n-conf <url> \uC635\uC158\uC744 \uC0AC\uC6A9\uD558\uC5EC \uC0AC\uC804 \uAD6C\uC131\uB41C \uC635\uC158 \uD30C\uC77C\uC744 \uC9C0\uC815\uD569\uB2C8\uB2E4."},
-        // keytool: help: commands
-        {"Generates.a.certificate.request",
-                "\uC778\uC99D\uC11C \uC694\uCCAD\uC744 \uC0DD\uC131\uD569\uB2C8\uB2E4."}, //-certreq
-        {"Changes.an.entry.s.alias",
-                "\uD56D\uBAA9\uC758 \uBCC4\uCE6D\uC744 \uBCC0\uACBD\uD569\uB2C8\uB2E4."}, //-changealias
-        {"Deletes.an.entry",
-                "\uD56D\uBAA9\uC744 \uC0AD\uC81C\uD569\uB2C8\uB2E4."}, //-delete
-        {"Exports.certificate",
-                "\uC778\uC99D\uC11C\uB97C \uC775\uC2A4\uD3EC\uD2B8\uD569\uB2C8\uB2E4."}, //-exportcert
-        {"Generates.a.key.pair",
-                "\uD0A4 \uC30D\uC744 \uC0DD\uC131\uD569\uB2C8\uB2E4."}, //-genkeypair
-        {"Generates.a.secret.key",
-                "\uBCF4\uC548 \uD0A4\uB97C \uC0DD\uC131\uD569\uB2C8\uB2E4."}, //-genseckey
-        {"Generates.certificate.from.a.certificate.request",
-                "\uC778\uC99D\uC11C \uC694\uCCAD\uC5D0\uC11C \uC778\uC99D\uC11C\uB97C \uC0DD\uC131\uD569\uB2C8\uB2E4."}, //-gencert
-        {"Generates.CRL", "CRL\uC744 \uC0DD\uC131\uD569\uB2C8\uB2E4."}, //-gencrl
-        {"Generated.keyAlgName.secret.key",
-                "{0} \uBCF4\uC548 \uD0A4\uB97C \uC0DD\uC131\uD569\uB2C8\uB2E4."}, //-genseckey
-        {"Generated.keysize.bit.keyAlgName.secret.key",
-                "{0}\uBE44\uD2B8 {1} \uBCF4\uC548 \uD0A4\uB97C \uC0DD\uC131\uD569\uB2C8\uB2E4."}, //-genseckey
-        {"Imports.entries.from.a.JDK.1.1.x.style.identity.database",
-                "JDK 1.1.x \uC2A4\uD0C0\uC77C ID \uB370\uC774\uD130\uBCA0\uC774\uC2A4\uC5D0\uC11C \uD56D\uBAA9\uC744 \uC784\uD3EC\uD2B8\uD569\uB2C8\uB2E4."}, //-identitydb
-        {"Imports.a.certificate.or.a.certificate.chain",
-                "\uC778\uC99D\uC11C \uB610\uB294 \uC778\uC99D\uC11C \uCCB4\uC778\uC744 \uC784\uD3EC\uD2B8\uD569\uB2C8\uB2E4."}, //-importcert
-        {"Imports.a.password",
-                "\uBE44\uBC00\uBC88\uD638\uB97C \uC784\uD3EC\uD2B8\uD569\uB2C8\uB2E4."}, //-importpass
-        {"Imports.one.or.all.entries.from.another.keystore",
-                "\uB2E4\uB978 \uD0A4 \uC800\uC7A5\uC18C\uC5D0\uC11C \uD558\uB098 \uB610\uB294 \uBAA8\uB4E0 \uD56D\uBAA9\uC744 \uC784\uD3EC\uD2B8\uD569\uB2C8\uB2E4."}, //-importkeystore
-        {"Clones.a.key.entry",
-                "\uD0A4 \uD56D\uBAA9\uC744 \uBCF5\uC81C\uD569\uB2C8\uB2E4."}, //-keyclone
-        {"Changes.the.key.password.of.an.entry",
-                "\uD56D\uBAA9\uC758 \uD0A4 \uBE44\uBC00\uBC88\uD638\uB97C \uBCC0\uACBD\uD569\uB2C8\uB2E4."}, //-keypasswd
-        {"Lists.entries.in.a.keystore",
-                "\uD0A4 \uC800\uC7A5\uC18C\uC758 \uD56D\uBAA9\uC744 \uB098\uC5F4\uD569\uB2C8\uB2E4."}, //-list
-        {"Prints.the.content.of.a.certificate",
-                "\uC778\uC99D\uC11C\uC758 \uCF58\uD150\uCE20\uB97C \uC778\uC1C4\uD569\uB2C8\uB2E4."}, //-printcert
-        {"Prints.the.content.of.a.certificate.request",
-                "\uC778\uC99D\uC11C \uC694\uCCAD\uC758 \uCF58\uD150\uCE20\uB97C \uC778\uC1C4\uD569\uB2C8\uB2E4."}, //-printcertreq
-        {"Prints.the.content.of.a.CRL.file",
-                "CRL \uD30C\uC77C\uC758 \uCF58\uD150\uCE20\uB97C \uC778\uC1C4\uD569\uB2C8\uB2E4."}, //-printcrl
-        {"Generates.a.self.signed.certificate",
-                "\uC790\uCCB4 \uC11C\uBA85\uB41C \uC778\uC99D\uC11C\uB97C \uC0DD\uC131\uD569\uB2C8\uB2E4."}, //-selfcert
-        {"Changes.the.store.password.of.a.keystore",
-                "\uD0A4 \uC800\uC7A5\uC18C\uC758 \uC800\uC7A5\uC18C \uBE44\uBC00\uBC88\uD638\uB97C \uBCC0\uACBD\uD569\uB2C8\uB2E4."}, //-storepasswd
-        // keytool: help: options
-        {"alias.name.of.the.entry.to.process",
-                "\uCC98\uB9AC\uD560 \uD56D\uBAA9\uC758 \uBCC4\uCE6D \uC774\uB984"}, //-alias
-        {"destination.alias",
-                "\uB300\uC0C1 \uBCC4\uCE6D"}, //-destalias
-        {"destination.key.password",
-                "\uB300\uC0C1 \uD0A4 \uBE44\uBC00\uBC88\uD638"}, //-destkeypass
-        {"destination.keystore.name",
-                "\uB300\uC0C1 \uD0A4 \uC800\uC7A5\uC18C \uC774\uB984"}, //-destkeystore
-        {"destination.keystore.password.protected",
-                "\uB300\uC0C1 \uD0A4 \uC800\uC7A5\uC18C \uBE44\uBC00\uBC88\uD638\uB85C \uBCF4\uD638\uB428"}, //-destprotected
-        {"destination.keystore.provider.name",
-                "\uB300\uC0C1 \uD0A4 \uC800\uC7A5\uC18C \uC81C\uACF5\uC790 \uC774\uB984"}, //-destprovidername
-        {"destination.keystore.password",
-                "\uB300\uC0C1 \uD0A4 \uC800\uC7A5\uC18C \uBE44\uBC00\uBC88\uD638"}, //-deststorepass
-        {"destination.keystore.type",
-                "\uB300\uC0C1 \uD0A4 \uC800\uC7A5\uC18C \uC720\uD615"}, //-deststoretype
-        {"distinguished.name",
-                "\uC2DD\uBCC4 \uC774\uB984"}, //-dname
-        {"X.509.extension",
-                "X.509 \uD655\uC7A5"}, //-ext
-        {"output.file.name",
-                "\uCD9C\uB825 \uD30C\uC77C \uC774\uB984"}, //-file and -outfile
-        {"input.file.name",
-                "\uC785\uB825 \uD30C\uC77C \uC774\uB984"}, //-file and -infile
-        {"key.algorithm.name",
-                "\uD0A4 \uC54C\uACE0\uB9AC\uC998 \uC774\uB984"}, //-keyalg
-        {"key.password",
-                "\uD0A4 \uBE44\uBC00\uBC88\uD638"}, //-keypass
-        {"key.bit.size",
-                "\uD0A4 \uBE44\uD2B8 \uD06C\uAE30"}, //-keysize
-        {"keystore.name",
-                "\uD0A4 \uC800\uC7A5\uC18C \uC774\uB984"}, //-keystore
-        {"access.the.cacerts.keystore",
-                "cacerts \uD0A4 \uC800\uC7A5\uC18C \uC561\uC138\uC2A4"}, // -cacerts
-        {"warning.cacerts.option",
-                "\uACBD\uACE0: -cacerts \uC635\uC158\uC744 \uC0AC\uC6A9\uD558\uC5EC cacerts \uD0A4 \uC800\uC7A5\uC18C\uC5D0 \uC561\uC138\uC2A4\uD558\uC2ED\uC2DC\uC624."},
-        {"new.password",
-                "\uC0C8 \uBE44\uBC00\uBC88\uD638"}, //-new
-        {"do.not.prompt",
-                "\uD655\uC778\uD558\uC9C0 \uC54A\uC74C"}, //-noprompt
-        {"password.through.protected.mechanism",
-                "\uBCF4\uD638\uB418\uB294 \uBA54\uCEE4\uB2C8\uC998\uC744 \uD1B5\uD55C \uBE44\uBC00\uBC88\uD638"}, //-protected
-
-        // The following 2 values should span 2 lines, the first for the
-        // option itself, the second for its -providerArg value.
-        {"addprovider.option",
-                "\uC774\uB984\uBCC4 \uBCF4\uC548 \uC81C\uACF5\uC790 \uCD94\uAC00(\uC608: SunPKCS11)\n-addprovider\uC5D0 \uB300\uD55C \uC778\uC218 \uAD6C\uC131"}, //-addprovider
-        {"provider.class.option",
-                "\uC804\uCCB4 \uD074\uB798\uC2A4 \uC774\uB984\uBCC4 \uBCF4\uC548 \uC81C\uACF5\uC790 \uCD94\uAC00\n-providerclass\uC5D0 \uB300\uD55C \uC778\uC218 \uAD6C\uC131"}, //-providerclass
-
-        {"provider.name",
-                "\uC81C\uACF5\uC790 \uC774\uB984"}, //-providername
-        {"provider.classpath",
-                "\uC81C\uACF5\uC790 \uD074\uB798\uC2A4 \uACBD\uB85C"}, //-providerpath
-        {"output.in.RFC.style",
-                "RFC \uC2A4\uD0C0\uC77C\uC758 \uCD9C\uB825"}, //-rfc
-        {"signature.algorithm.name",
-                "\uC11C\uBA85 \uC54C\uACE0\uB9AC\uC998 \uC774\uB984"}, //-sigalg
-        {"source.alias",
-                "\uC18C\uC2A4 \uBCC4\uCE6D"}, //-srcalias
-        {"source.key.password",
-                "\uC18C\uC2A4 \uD0A4 \uBE44\uBC00\uBC88\uD638"}, //-srckeypass
-        {"source.keystore.name",
-                "\uC18C\uC2A4 \uD0A4 \uC800\uC7A5\uC18C \uC774\uB984"}, //-srckeystore
-        {"source.keystore.password.protected",
-                "\uC18C\uC2A4 \uD0A4 \uC800\uC7A5\uC18C \uBE44\uBC00\uBC88\uD638\uB85C \uBCF4\uD638\uB428"}, //-srcprotected
-        {"source.keystore.provider.name",
-                "\uC18C\uC2A4 \uD0A4 \uC800\uC7A5\uC18C \uC81C\uACF5\uC790 \uC774\uB984"}, //-srcprovidername
-        {"source.keystore.password",
-                "\uC18C\uC2A4 \uD0A4 \uC800\uC7A5\uC18C \uBE44\uBC00\uBC88\uD638"}, //-srcstorepass
-        {"source.keystore.type",
-                "\uC18C\uC2A4 \uD0A4 \uC800\uC7A5\uC18C \uC720\uD615"}, //-srcstoretype
-        {"SSL.server.host.and.port",
-                "SSL \uC11C\uBC84 \uD638\uC2A4\uD2B8 \uBC0F \uD3EC\uD2B8"}, //-sslserver
-        {"signed.jar.file",
-                "\uC11C\uBA85\uB41C jar \uD30C\uC77C"}, //=jarfile
-        {"certificate.validity.start.date.time",
-                "\uC778\uC99D\uC11C \uC720\uD6A8 \uAE30\uAC04 \uC2DC\uC791 \uB0A0\uC9DC/\uC2DC\uAC04"}, //-startdate
-        {"keystore.password",
-                "\uD0A4 \uC800\uC7A5\uC18C \uBE44\uBC00\uBC88\uD638"}, //-storepass
-        {"keystore.type",
-                "\uD0A4 \uC800\uC7A5\uC18C \uC720\uD615"}, //-storetype
-        {"trust.certificates.from.cacerts",
-                "cacerts\uC758 \uBCF4\uC548 \uC778\uC99D\uC11C"}, //-trustcacerts
-        {"verbose.output",
-                "\uC0C1\uC138 \uC815\uBCF4 \uCD9C\uB825"}, //-v
-        {"validity.number.of.days",
-                "\uC720\uD6A8 \uAE30\uAC04 \uC77C \uC218"}, //-validity
-        {"Serial.ID.of.cert.to.revoke",
-                 "\uCCA0\uD68C\uD560 \uC778\uC99D\uC11C\uC758 \uC77C\uB828 ID"}, //-id
-        // keytool: Running part
-        {"keytool.error.", "keytool \uC624\uB958: "},
-        {"Illegal.option.", "\uC798\uBABB\uB41C \uC635\uC158:  "},
-        {"Illegal.value.", "\uC798\uBABB\uB41C \uAC12: "},
-        {"Unknown.password.type.", "\uC54C \uC218 \uC5C6\uB294 \uBE44\uBC00\uBC88\uD638 \uC720\uD615: "},
-        {"Cannot.find.environment.variable.",
-                "\uD658\uACBD \uBCC0\uC218\uB97C \uCC3E\uC744 \uC218 \uC5C6\uC74C: "},
-        {"Cannot.find.file.", "\uD30C\uC77C\uC744 \uCC3E\uC744 \uC218 \uC5C6\uC74C: "},
-        {"Command.option.flag.needs.an.argument.", "\uBA85\uB839 \uC635\uC158 {0}\uC5D0 \uC778\uC218\uAC00 \uD544\uC694\uD569\uB2C8\uB2E4."},
-        {"Warning.Different.store.and.key.passwords.not.supported.for.PKCS12.KeyStores.Ignoring.user.specified.command.value.",
-                "\uACBD\uACE0: \uB2E4\uB978 \uC800\uC7A5\uC18C \uBC0F \uD0A4 \uBE44\uBC00\uBC88\uD638\uB294 PKCS12 KeyStores\uC5D0 \uB300\uD574 \uC9C0\uC6D0\uB418\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4. \uC0AC\uC6A9\uC790\uAC00 \uC9C0\uC815\uD55C {0} \uAC12\uC744 \uBB34\uC2DC\uD558\uB294 \uC911\uC785\uB2C8\uB2E4."},
-        {"the.keystore.or.storetype.option.cannot.be.used.with.the.cacerts.option",
-            "-keystore \uB610\uB294 -storetype \uC635\uC158\uC740 -cacerts \uC635\uC158\uACFC \uD568\uAED8 \uC0AC\uC6A9\uD560 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4."},
-        {".keystore.must.be.NONE.if.storetype.is.{0}",
-                "-storetype\uC774 {0}\uC778 \uACBD\uC6B0 -keystore\uB294 NONE\uC774\uC5B4\uC57C \uD569\uB2C8\uB2E4."},
-        {"Too.many.retries.program.terminated",
-                 "\uC7AC\uC2DC\uB3C4 \uD69F\uC218\uAC00 \uB108\uBB34 \uB9CE\uC544 \uD504\uB85C\uADF8\uB7A8\uC774 \uC885\uB8CC\uB418\uC5C8\uC2B5\uB2C8\uB2E4."},
-        {".storepasswd.and.keypasswd.commands.not.supported.if.storetype.is.{0}",
-                "-storetype\uC774 {0}\uC778 \uACBD\uC6B0 -storepasswd \uBC0F -keypasswd \uBA85\uB839\uC774 \uC9C0\uC6D0\uB418\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4."},
-        {".keypasswd.commands.not.supported.if.storetype.is.PKCS12",
-                "-storetype\uC774 PKCS12\uC778 \uACBD\uC6B0 -keypasswd \uBA85\uB839\uC774 \uC9C0\uC6D0\uB418\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4."},
-        {".keypass.and.new.can.not.be.specified.if.storetype.is.{0}",
-                "-storetype\uC774 {0}\uC778 \uACBD\uC6B0 -keypass \uBC0F -new\uB97C \uC9C0\uC815\uD560 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4."},
-        {"if.protected.is.specified.then.storepass.keypass.and.new.must.not.be.specified",
-                "-protected\uB97C \uC9C0\uC815\uD55C \uACBD\uC6B0 -storepass, -keypass \uBC0F -new\uB97C \uC9C0\uC815\uD558\uC9C0 \uC54A\uC544\uC57C \uD569\uB2C8\uB2E4."},
-        {"if.srcprotected.is.specified.then.srcstorepass.and.srckeypass.must.not.be.specified",
-                "-srcprotected\uB97C \uC9C0\uC815\uD55C \uACBD\uC6B0 -srcstorepass \uBC0F -srckeypass\uB97C \uC9C0\uC815\uD558\uC9C0 \uC54A\uC544\uC57C \uD569\uB2C8\uB2E4."},
-        {"if.keystore.is.not.password.protected.then.storepass.keypass.and.new.must.not.be.specified",
-                "\uD0A4 \uC800\uC7A5\uC18C\uAC00 \uBE44\uBC00\uBC88\uD638\uB85C \uBCF4\uD638\uB418\uC9C0 \uC54A\uB294 \uACBD\uC6B0 -storepass, -keypass \uBC0F -new\uB97C \uC9C0\uC815\uD558\uC9C0 \uC54A\uC544\uC57C \uD569\uB2C8\uB2E4."},
-        {"if.source.keystore.is.not.password.protected.then.srcstorepass.and.srckeypass.must.not.be.specified",
-                "\uC18C\uC2A4 \uD0A4 \uC800\uC7A5\uC18C\uAC00 \uBE44\uBC00\uBC88\uD638\uB85C \uBCF4\uD638\uB418\uC9C0 \uC54A\uB294 \uACBD\uC6B0 -srcstorepass \uBC0F -srckeypass\uB97C \uC9C0\uC815\uD558\uC9C0 \uC54A\uC544\uC57C \uD569\uB2C8\uB2E4."},
-        {"Illegal.startdate.value", "startdate \uAC12\uC774 \uC798\uBABB\uB418\uC5C8\uC2B5\uB2C8\uB2E4."},
-        {"Validity.must.be.greater.than.zero",
-                "\uC720\uD6A8 \uAE30\uAC04\uC740 0\uBCF4\uB2E4 \uCEE4\uC57C \uD569\uB2C8\uB2E4."},
-        {"provclass.not.a.provider", "%s\uC740(\uB294) \uC81C\uACF5\uC790\uAC00 \uC544\uB2D9\uB2C8\uB2E4."},
-        {"provider.name.not.found", "\"%s\" \uC774\uB984\uC758 \uC81C\uACF5\uC790\uB97C \uCC3E\uC744 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4."},
-        {"provider.class.not.found", "\"%s\" \uC81C\uACF5\uC790\uB97C \uCC3E\uC744 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4."},
-        {"Usage.error.no.command.provided", "\uC0AC\uC6A9\uBC95 \uC624\uB958: \uBA85\uB839\uC744 \uC785\uB825\uD558\uC9C0 \uC54A\uC558\uC2B5\uB2C8\uB2E4."},
-        {"Source.keystore.file.exists.but.is.empty.", "\uC18C\uC2A4 \uD0A4 \uC800\uC7A5\uC18C \uD30C\uC77C\uC774 \uC874\uC7AC\uD558\uC9C0\uB9CC \uBE44\uC5B4 \uC788\uC74C: "},
-        {"Please.specify.srckeystore", "-srckeystore\uB97C \uC9C0\uC815\uD558\uC2ED\uC2DC\uC624."},
-        {"Must.not.specify.both.v.and.rfc.with.list.command",
-                "'list' \uBA85\uB839\uC5D0 -v\uC640 -rfc\uB97C \uD568\uAED8 \uC9C0\uC815\uD558\uC9C0 \uC54A\uC544\uC57C \uD569\uB2C8\uB2E4."},
-        {"Key.password.must.be.at.least.6.characters",
-                "\uD0A4 \uBE44\uBC00\uBC88\uD638\uB294 6\uC790 \uC774\uC0C1\uC774\uC5B4\uC57C \uD569\uB2C8\uB2E4."},
-        {"New.password.must.be.at.least.6.characters",
-                "\uC0C8 \uBE44\uBC00\uBC88\uD638\uB294 6\uC790 \uC774\uC0C1\uC774\uC5B4\uC57C \uD569\uB2C8\uB2E4."},
-        {"Keystore.file.exists.but.is.empty.",
-                "\uD0A4 \uC800\uC7A5\uC18C \uD30C\uC77C\uC774 \uC874\uC7AC\uD558\uC9C0\uB9CC \uBE44\uC5B4 \uC788\uC74C: "},
-        {"Keystore.file.does.not.exist.",
-                "\uD0A4 \uC800\uC7A5\uC18C \uD30C\uC77C\uC774 \uC874\uC7AC\uD558\uC9C0 \uC54A\uC74C: "},
-        {"Must.specify.destination.alias", "\uB300\uC0C1 \uBCC4\uCE6D\uC744 \uC9C0\uC815\uD574\uC57C \uD569\uB2C8\uB2E4."},
-        {"Must.specify.alias", "\uBCC4\uCE6D\uC744 \uC9C0\uC815\uD574\uC57C \uD569\uB2C8\uB2E4."},
-        {"Keystore.password.must.be.at.least.6.characters",
-                "\uD0A4 \uC800\uC7A5\uC18C \uBE44\uBC00\uBC88\uD638\uB294 6\uC790 \uC774\uC0C1\uC774\uC5B4\uC57C \uD569\uB2C8\uB2E4."},
-        {"Enter.the.password.to.be.stored.",
-                "\uC800\uC7A5\uD560 \uBE44\uBC00\uBC88\uD638 \uC785\uB825:  "},
-        {"Enter.keystore.password.", "\uD0A4 \uC800\uC7A5\uC18C \uBE44\uBC00\uBC88\uD638 \uC785\uB825:  "},
-        {"Enter.source.keystore.password.", "\uC18C\uC2A4 \uD0A4 \uC800\uC7A5\uC18C \uBE44\uBC00\uBC88\uD638 \uC785\uB825:  "},
-        {"Enter.destination.keystore.password.", "\uB300\uC0C1 \uD0A4 \uC800\uC7A5\uC18C \uBE44\uBC00\uBC88\uD638 \uC785\uB825:  "},
-        {"Keystore.password.is.too.short.must.be.at.least.6.characters",
-         "\uD0A4 \uC800\uC7A5\uC18C \uBE44\uBC00\uBC88\uD638\uAC00 \uB108\uBB34 \uC9E7\uC74C - 6\uC790 \uC774\uC0C1\uC774\uC5B4\uC57C \uD569\uB2C8\uB2E4."},
-        {"Unknown.Entry.Type", "\uC54C \uC218 \uC5C6\uB294 \uD56D\uBAA9 \uC720\uD615"},
-        {"Too.many.failures.Alias.not.changed", "\uC624\uB958\uAC00 \uB108\uBB34 \uB9CE\uC2B5\uB2C8\uB2E4. \uBCC4\uCE6D\uC774 \uBCC0\uACBD\uB418\uC9C0 \uC54A\uC558\uC2B5\uB2C8\uB2E4."},
-        {"Entry.for.alias.alias.successfully.imported.",
-                 "{0} \uBCC4\uCE6D\uC5D0 \uB300\uD55C \uD56D\uBAA9\uC774 \uC131\uACF5\uC801\uC73C\uB85C \uC784\uD3EC\uD2B8\uB418\uC5C8\uC2B5\uB2C8\uB2E4."},
-        {"Entry.for.alias.alias.not.imported.", "{0} \uBCC4\uCE6D\uC5D0 \uB300\uD55C \uD56D\uBAA9\uC774 \uC784\uD3EC\uD2B8\uB418\uC9C0 \uC54A\uC558\uC2B5\uB2C8\uB2E4."},
-        {"Problem.importing.entry.for.alias.alias.exception.Entry.for.alias.alias.not.imported.",
-                 "{0} \uBCC4\uCE6D\uC5D0 \uB300\uD55C \uD56D\uBAA9\uC744 \uC784\uD3EC\uD2B8\uD558\uB294 \uC911 \uBB38\uC81C \uBC1C\uC0DD: {1}.\n{0} \uBCC4\uCE6D\uC5D0 \uB300\uD55C \uD56D\uBAA9\uC774 \uC784\uD3EC\uD2B8\uB418\uC9C0 \uC54A\uC558\uC2B5\uB2C8\uB2E4."},
-        {"Import.command.completed.ok.entries.successfully.imported.fail.entries.failed.or.cancelled",
-                 "\uC784\uD3EC\uD2B8 \uBA85\uB839 \uC644\uB8CC: \uC131\uACF5\uC801\uC73C\uB85C \uC784\uD3EC\uD2B8\uB41C \uD56D\uBAA9\uC740 {0}\uAC1C, \uC2E4\uD328\uD558\uAC70\uB098 \uCDE8\uC18C\uB41C \uD56D\uBAA9\uC740 {1}\uAC1C\uC785\uB2C8\uB2E4."},
-        {"Warning.Overwriting.existing.alias.alias.in.destination.keystore",
-                 "\uACBD\uACE0: \uB300\uC0C1 \uD0A4 \uC800\uC7A5\uC18C\uC5D0\uC11C \uAE30\uC874 \uBCC4\uCE6D {0}\uC744(\uB97C) \uACB9\uCCD0 \uC4F0\uB294 \uC911"},
-        {"Existing.entry.alias.alias.exists.overwrite.no.",
-                 "\uAE30\uC874 \uD56D\uBAA9 \uBCC4\uCE6D {0}\uC774(\uAC00) \uC874\uC7AC\uD569\uB2C8\uB2E4. \uACB9\uCCD0 \uC4F0\uACA0\uC2B5\uB2C8\uAE4C? [\uC544\uB2C8\uC624]:  "},
-        {"Too.many.failures.try.later", "\uC624\uB958\uAC00 \uB108\uBB34 \uB9CE\uC74C - \uB098\uC911\uC5D0 \uC2DC\uB3C4\uD558\uC2ED\uC2DC\uC624."},
-        {"Certification.request.stored.in.file.filename.",
-                "\uC778\uC99D \uC694\uCCAD\uC774 <{0}> \uD30C\uC77C\uC5D0 \uC800\uC7A5\uB418\uC5C8\uC2B5\uB2C8\uB2E4."},
-        {"Submit.this.to.your.CA", "CA\uC5D0\uAC8C \uC81C\uCD9C\uD558\uC2ED\uC2DC\uC624."},
-        {"if.alias.not.specified.destalias.and.srckeypass.must.not.be.specified",
-            "\uBCC4\uCE6D\uC744 \uC9C0\uC815\uD558\uC9C0 \uC54A\uC740 \uACBD\uC6B0 destalias \uBC0F srckeypass\uB97C \uC9C0\uC815\uD558\uC9C0 \uC54A\uC544\uC57C \uD569\uB2C8\uB2E4."},
-        {"The.destination.pkcs12.keystore.has.different.storepass.and.keypass.Please.retry.with.destkeypass.specified.",
-            "\uB300\uC0C1 pkcs12 \uD0A4 \uC800\uC7A5\uC18C\uC5D0 \uB2E4\uB978 storepass \uBC0F keypass\uAC00 \uC788\uC2B5\uB2C8\uB2E4. \uC9C0\uC815\uB41C -destkeypass\uB85C \uC7AC\uC2DC\uB3C4\uD558\uC2ED\uC2DC\uC624."},
-        {"Certificate.stored.in.file.filename.",
-                "\uC778\uC99D\uC11C\uAC00 <{0}> \uD30C\uC77C\uC5D0 \uC800\uC7A5\uB418\uC5C8\uC2B5\uB2C8\uB2E4."},
-        {"Certificate.reply.was.installed.in.keystore",
-                "\uC778\uC99D\uC11C \uD68C\uC2E0\uC774 \uD0A4 \uC800\uC7A5\uC18C\uC5D0 \uC124\uCE58\uB418\uC5C8\uC2B5\uB2C8\uB2E4."},
-        {"Certificate.reply.was.not.installed.in.keystore",
-                "\uC778\uC99D\uC11C \uD68C\uC2E0\uC774 \uD0A4 \uC800\uC7A5\uC18C\uC5D0 \uC124\uCE58\uB418\uC9C0 \uC54A\uC558\uC2B5\uB2C8\uB2E4."},
-        {"Certificate.was.added.to.keystore",
-                "\uC778\uC99D\uC11C\uAC00 \uD0A4 \uC800\uC7A5\uC18C\uC5D0 \uCD94\uAC00\uB418\uC5C8\uC2B5\uB2C8\uB2E4."},
-        {"Certificate.was.not.added.to.keystore",
-                "\uC778\uC99D\uC11C\uAC00 \uD0A4 \uC800\uC7A5\uC18C\uC5D0 \uCD94\uAC00\uB418\uC9C0 \uC54A\uC558\uC2B5\uB2C8\uB2E4."},
-        {".Storing.ksfname.", "[{0}\uC744(\uB97C) \uC800\uC7A5\uD558\uB294 \uC911]"},
-        {"alias.has.no.public.key.certificate.",
-                "{0}\uC5D0 \uACF5\uC6A9 \uD0A4(\uC778\uC99D\uC11C)\uAC00 \uC5C6\uC2B5\uB2C8\uB2E4."},
-        {"Cannot.derive.signature.algorithm",
-                "\uC11C\uBA85 \uC54C\uACE0\uB9AC\uC998\uC744 \uD30C\uC0DD\uD560 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4."},
-        {"Alias.alias.does.not.exist",
-                "<{0}> \uBCC4\uCE6D\uC774 \uC874\uC7AC\uD558\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4."},
-        {"Alias.alias.has.no.certificate",
-                "<{0}> \uBCC4\uCE6D\uC5D0 \uC778\uC99D\uC11C\uAC00 \uC5C6\uC2B5\uB2C8\uB2E4."},
-        {"Key.pair.not.generated.alias.alias.already.exists",
-                "\uD0A4 \uC30D\uC774 \uC0DD\uC131\uB418\uC9C0 \uC54A\uC558\uC73C\uBA70 <{0}> \uBCC4\uCE6D\uC774 \uC874\uC7AC\uD569\uB2C8\uB2E4."},
-        {"Generating.keysize.bit.keyAlgName.key.pair.and.self.signed.certificate.sigAlgName.with.a.validity.of.validality.days.for",
-                "\uB2E4\uC74C\uC5D0 \uB300\uD574 \uC720\uD6A8 \uAE30\uAC04\uC774 {3}\uC77C\uC778 {0}\uBE44\uD2B8 {1} \uD0A4 \uC30D \uBC0F \uC790\uCCB4 \uC11C\uBA85\uB41C \uC778\uC99D\uC11C({2})\uB97C \uC0DD\uC131\uD558\uB294 \uC911\n\t: {4}"},
-        {"Enter.key.password.for.alias.", "<{0}>\uC5D0 \uB300\uD55C \uD0A4 \uBE44\uBC00\uBC88\uD638\uB97C \uC785\uB825\uD558\uC2ED\uC2DC\uC624."},
-        {".RETURN.if.same.as.keystore.password.",
-                "\t(\uD0A4 \uC800\uC7A5\uC18C \uBE44\uBC00\uBC88\uD638\uC640 \uB3D9\uC77C\uD55C \uACBD\uC6B0 Enter \uD0A4\uB97C \uB204\uB984):  "},
-        {"Key.password.is.too.short.must.be.at.least.6.characters",
-                "\uD0A4 \uBE44\uBC00\uBC88\uD638\uAC00 \uB108\uBB34 \uC9E7\uC74C - 6\uC790 \uC774\uC0C1\uC774\uC5B4\uC57C \uD569\uB2C8\uB2E4."},
-        {"Too.many.failures.key.not.added.to.keystore",
-                "\uC624\uB958\uAC00 \uB108\uBB34 \uB9CE\uC74C - \uD0A4 \uC800\uC7A5\uC18C\uC5D0 \uD0A4\uAC00 \uCD94\uAC00\uB418\uC9C0 \uC54A\uC558\uC2B5\uB2C8\uB2E4."},
-        {"Destination.alias.dest.already.exists",
-                "\uB300\uC0C1 \uBCC4\uCE6D <{0}>\uC774(\uAC00) \uC874\uC7AC\uD569\uB2C8\uB2E4."},
-        {"Password.is.too.short.must.be.at.least.6.characters",
-                "\uBE44\uBC00\uBC88\uD638\uAC00 \uB108\uBB34 \uC9E7\uC74C - 6\uC790 \uC774\uC0C1\uC774\uC5B4\uC57C \uD569\uB2C8\uB2E4."},
-        {"Too.many.failures.Key.entry.not.cloned",
-                "\uC624\uB958\uAC00 \uB108\uBB34 \uB9CE\uC2B5\uB2C8\uB2E4. \uD0A4 \uD56D\uBAA9\uC774 \uBCF5\uC81C\uB418\uC9C0 \uC54A\uC558\uC2B5\uB2C8\uB2E4."},
-        {"key.password.for.alias.", "<{0}>\uC5D0 \uB300\uD55C \uD0A4 \uBE44\uBC00\uBC88\uD638"},
-        {"Keystore.entry.for.id.getName.already.exists",
-                "<{0}>\uC5D0 \uB300\uD55C \uD0A4 \uC800\uC7A5\uC18C \uD56D\uBAA9\uC774 \uC874\uC7AC\uD569\uB2C8\uB2E4."},
-        {"Creating.keystore.entry.for.id.getName.",
-                "<{0}>\uC5D0 \uB300\uD55C \uD0A4 \uC800\uC7A5\uC18C \uD56D\uBAA9\uC744 \uC0DD\uC131\uD558\uB294 \uC911..."},
-        {"No.entries.from.identity.database.added",
-                "ID \uB370\uC774\uD130\uBCA0\uC774\uC2A4\uC5D0\uC11C \uCD94\uAC00\uB41C \uD56D\uBAA9\uC774 \uC5C6\uC2B5\uB2C8\uB2E4."},
-        {"Alias.name.alias", "\uBCC4\uCE6D \uC774\uB984: {0}"},
-        {"Creation.date.keyStore.getCreationDate.alias.",
-                "\uC0DD\uC131 \uB0A0\uC9DC: {0,date}"},
-        {"alias.keyStore.getCreationDate.alias.",
-                "{0}, {1,date}, "},
-        {"alias.", "{0}, "},
-        {"Entry.type.type.", "\uD56D\uBAA9 \uC720\uD615: {0}"},
-        {"Certificate.chain.length.", "\uC778\uC99D\uC11C \uCCB4\uC778 \uAE38\uC774: "},
-        {"Certificate.i.1.", "\uC778\uC99D\uC11C[{0,number,integer}]:"},
-        {"Certificate.fingerprint.SHA.256.", "\uC778\uC99D\uC11C \uC9C0\uBB38(SHA-256): "},
-        {"Keystore.type.", "\uD0A4 \uC800\uC7A5\uC18C \uC720\uD615: "},
-        {"Keystore.provider.", "\uD0A4 \uC800\uC7A5\uC18C \uC81C\uACF5\uC790: "},
-        {"Your.keystore.contains.keyStore.size.entry",
-                "\uD0A4 \uC800\uC7A5\uC18C\uC5D0 {0,number,integer}\uAC1C\uC758 \uD56D\uBAA9\uC774 \uD3EC\uD568\uB418\uC5B4 \uC788\uC2B5\uB2C8\uB2E4."},
-        {"Your.keystore.contains.keyStore.size.entries",
-                "\uD0A4 \uC800\uC7A5\uC18C\uC5D0 {0,number,integer}\uAC1C\uC758 \uD56D\uBAA9\uC774 \uD3EC\uD568\uB418\uC5B4 \uC788\uC2B5\uB2C8\uB2E4."},
-        {"Failed.to.parse.input", "\uC785\uB825\uAC12\uC758 \uAD6C\uBB38 \uBD84\uC11D\uC744 \uC2E4\uD328\uD588\uC2B5\uB2C8\uB2E4."},
-        {"Empty.input", "\uC785\uB825\uAC12\uC774 \uBE44\uC5B4 \uC788\uC2B5\uB2C8\uB2E4."},
-        {"Not.X.509.certificate", "X.509 \uC778\uC99D\uC11C\uAC00 \uC544\uB2D9\uB2C8\uB2E4."},
-        {"alias.has.no.public.key", "{0}\uC5D0 \uACF5\uC6A9 \uD0A4\uAC00 \uC5C6\uC2B5\uB2C8\uB2E4."},
-        {"alias.has.no.X.509.certificate", "{0}\uC5D0 X.509 \uC778\uC99D\uC11C\uAC00 \uC5C6\uC2B5\uB2C8\uB2E4."},
-        {"New.certificate.self.signed.", "\uC0C8 \uC778\uC99D\uC11C(\uC790\uCCB4 \uC11C\uBA85):"},
-        {"Reply.has.no.certificates", "\uD68C\uC2E0\uC5D0 \uC778\uC99D\uC11C\uAC00 \uC5C6\uC2B5\uB2C8\uB2E4."},
-        {"Certificate.not.imported.alias.alias.already.exists",
-                "\uC778\uC99D\uC11C\uAC00 \uC784\uD3EC\uD2B8\uB418\uC9C0 \uC54A\uC558\uC73C\uBA70 <{0}> \uBCC4\uCE6D\uC774 \uC874\uC7AC\uD569\uB2C8\uB2E4."},
-        {"Input.not.an.X.509.certificate", "\uC785\uB825\uC774 X.509 \uC778\uC99D\uC11C\uAC00 \uC544\uB2D9\uB2C8\uB2E4."},
-        {"Certificate.already.exists.in.keystore.under.alias.trustalias.",
-                "\uC778\uC99D\uC11C\uAC00 <{0}> \uBCC4\uCE6D \uC544\uB798\uC758 \uD0A4 \uC800\uC7A5\uC18C\uC5D0 \uC874\uC7AC\uD569\uB2C8\uB2E4."},
-        {"Do.you.still.want.to.add.it.no.",
-                "\uCD94\uAC00\uD558\uACA0\uC2B5\uB2C8\uAE4C? [\uC544\uB2C8\uC624]:  "},
-        {"Certificate.already.exists.in.system.wide.CA.keystore.under.alias.trustalias.",
-                "\uC778\uC99D\uC11C\uAC00 <{0}> \uBCC4\uCE6D \uC544\uB798\uC5D0 \uC788\uB294 \uC2DC\uC2A4\uD15C \uCC28\uC6D0\uC758 CA \uD0A4 \uC800\uC7A5\uC18C\uC5D0 \uC874\uC7AC\uD569\uB2C8\uB2E4."},
-        {"Do.you.still.want.to.add.it.to.your.own.keystore.no.",
-                "\uACE0\uC720\uD55C \uD0A4 \uC800\uC7A5\uC18C\uC5D0 \uCD94\uAC00\uD558\uACA0\uC2B5\uB2C8\uAE4C? [\uC544\uB2C8\uC624]:  "},
-        {"Trust.this.certificate.no.", "\uC774 \uC778\uC99D\uC11C\uB97C \uC2E0\uB8B0\uD569\uB2C8\uAE4C? [\uC544\uB2C8\uC624]:  "},
-        {"YES", "\uC608"},
-        {"New.prompt.", "\uC0C8 {0}: "},
-        {"Passwords.must.differ", "\uBE44\uBC00\uBC88\uD638\uB294 \uB2EC\uB77C\uC57C \uD569\uB2C8\uB2E4."},
-        {"Re.enter.new.prompt.", "\uC0C8 {0} \uB2E4\uC2DC \uC785\uB825: "},
-        {"Re.enter.password.", "\uBE44\uBC00\uBC88\uD638  \uB2E4\uC2DC \uC785\uB825: "},
-        {"Re.enter.new.password.", "\uC0C8 \uBE44\uBC00\uBC88\uD638 \uB2E4\uC2DC \uC785\uB825: "},
-        {"They.don.t.match.Try.again", "\uC77C\uCE58\uD558\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4. \uB2E4\uC2DC \uC2DC\uB3C4\uD558\uC2ED\uC2DC\uC624."},
-        {"Enter.prompt.alias.name.", "{0} \uBCC4\uCE6D \uC774\uB984 \uC785\uB825:  "},
-        {"Enter.new.alias.name.RETURN.to.cancel.import.for.this.entry.",
-                 "\uC0C8 \uBCC4\uCE6D \uC774\uB984 \uC785\uB825\t(\uC774 \uD56D\uBAA9\uC5D0 \uB300\uD55C \uC784\uD3EC\uD2B8\uB97C \uCDE8\uC18C\uD558\uB824\uBA74 Enter \uD0A4\uB97C \uB204\uB984):  "},
-        {"Enter.alias.name.", "\uBCC4\uCE6D \uC774\uB984 \uC785\uB825:  "},
-        {".RETURN.if.same.as.for.otherAlias.",
-                "\t(<{0}>\uACFC(\uC640) \uB3D9\uC77C\uD55C \uACBD\uC6B0 Enter \uD0A4\uB97C \uB204\uB984)"},
-        {"What.is.your.first.and.last.name.",
-                "\uC774\uB984\uACFC \uC131\uC744 \uC785\uB825\uD558\uC2ED\uC2DC\uC624."},
-        {"What.is.the.name.of.your.organizational.unit.",
-                "\uC870\uC9C1 \uB2E8\uC704 \uC774\uB984\uC744 \uC785\uB825\uD558\uC2ED\uC2DC\uC624."},
-        {"What.is.the.name.of.your.organization.",
-                "\uC870\uC9C1 \uC774\uB984\uC744 \uC785\uB825\uD558\uC2ED\uC2DC\uC624."},
-        {"What.is.the.name.of.your.City.or.Locality.",
-                "\uAD6C/\uAD70/\uC2DC \uC774\uB984\uC744 \uC785\uB825\uD558\uC2ED\uC2DC\uC624?"},
-        {"What.is.the.name.of.your.State.or.Province.",
-                "\uC2DC/\uB3C4 \uC774\uB984\uC744 \uC785\uB825\uD558\uC2ED\uC2DC\uC624."},
-        {"What.is.the.two.letter.country.code.for.this.unit.",
-                "\uC774 \uC870\uC9C1\uC758 \uB450 \uC790\uB9AC \uAD6D\uAC00 \uCF54\uB4DC\uB97C \uC785\uB825\uD558\uC2ED\uC2DC\uC624."},
-        {"Is.name.correct.", "{0}\uC774(\uAC00) \uB9DE\uC2B5\uB2C8\uAE4C?"},
-        {"no", "\uC544\uB2C8\uC624"},
-        {"yes", "\uC608"},
-        {"y", "y"},
-        {".defaultValue.", "  [{0}]:  "},
-        {"Alias.alias.has.no.key",
-                "<{0}> \uBCC4\uCE6D\uC5D0 \uD0A4\uAC00 \uC5C6\uC2B5\uB2C8\uB2E4."},
-        {"Alias.alias.references.an.entry.type.that.is.not.a.private.key.entry.The.keyclone.command.only.supports.cloning.of.private.key",
-                 "<{0}> \uBCC4\uCE6D\uC740 \uC804\uC6A9 \uD0A4 \uD56D\uBAA9\uC774 \uC544\uB2CC \uD56D\uBAA9 \uC720\uD615\uC744 \uCC38\uC870\uD569\uB2C8\uB2E4. -keyclone \uBA85\uB839\uC740 \uC804\uC6A9 \uD0A4 \uD56D\uBAA9\uC758 \uBCF5\uC81C\uB9CC \uC9C0\uC6D0\uD569\uB2C8\uB2E4."},
-
-        {".WARNING.WARNING.WARNING.",
-            "*****************  WARNING WARNING WARNING  *****************"},
-        {"Signer.d.", "\uC11C\uBA85\uC790 #%d:"},
-        {"Timestamp.", "\uC2DC\uAC04 \uAE30\uB85D:"},
-        {"Signature.", "\uC11C\uBA85:"},
-        {"CRLs.", "CRL:"},
-        {"Certificate.owner.", "\uC778\uC99D\uC11C \uC18C\uC720\uC790: "},
-        {"Not.a.signed.jar.file", "\uC11C\uBA85\uB41C jar \uD30C\uC77C\uC774 \uC544\uB2D9\uB2C8\uB2E4."},
-        {"No.certificate.from.the.SSL.server",
-                "SSL \uC11C\uBC84\uC5D0\uC11C \uAC00\uC838\uC628 \uC778\uC99D\uC11C\uAC00 \uC5C6\uC2B5\uB2C8\uB2E4."},
-
-        {".The.integrity.of.the.information.stored.in.your.keystore.",
-            "* \uD0A4 \uC800\uC7A5\uC18C\uC5D0 \uC800\uC7A5\uB41C \uC815\uBCF4\uC758 \uBB34\uACB0\uC131\uC774  *\n* \uD655\uC778\uB418\uC9C0 \uC54A\uC558\uC2B5\uB2C8\uB2E4! \uBB34\uACB0\uC131\uC744 \uD655\uC778\uD558\uB824\uBA74, *\n* \uD0A4 \uC800\uC7A5\uC18C \uBE44\uBC00\uBC88\uD638\uB97C \uC81C\uACF5\uD574\uC57C \uD569\uB2C8\uB2E4.                  *"},
-        {".The.integrity.of.the.information.stored.in.the.srckeystore.",
-            "* srckeystore\uC5D0 \uC800\uC7A5\uB41C \uC815\uBCF4\uC758 \uBB34\uACB0\uC131\uC774  *\n* \uD655\uC778\uB418\uC9C0 \uC54A\uC558\uC2B5\uB2C8\uB2E4! \uBB34\uACB0\uC131\uC744 \uD655\uC778\uD558\uB824\uBA74, *\n* srckeystore \uBE44\uBC00\uBC88\uD638\uB97C \uC81C\uACF5\uD574\uC57C \uD569\uB2C8\uB2E4.                  *"},
-
-        {"Certificate.reply.does.not.contain.public.key.for.alias.",
-                "\uC778\uC99D\uC11C \uD68C\uC2E0\uC5D0 <{0}>\uC5D0 \uB300\uD55C \uACF5\uC6A9 \uD0A4\uAC00 \uD3EC\uD568\uB418\uC5B4 \uC788\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4."},
-        {"Incomplete.certificate.chain.in.reply",
-                "\uD68C\uC2E0\uC5D0 \uBD88\uC644\uC804\uD55C \uC778\uC99D\uC11C \uCCB4\uC778\uC774 \uC788\uC2B5\uB2C8\uB2E4."},
-        {"Certificate.chain.in.reply.does.not.verify.",
-                "\uD68C\uC2E0\uC758 \uC778\uC99D\uC11C \uCCB4\uC778\uC774 \uD655\uC778\uB418\uC9C0 \uC54A\uC74C: "},
-        {"Top.level.certificate.in.reply.",
-                "\uD68C\uC2E0\uC5D0 \uCD5C\uC0C1\uC704 \uB808\uBCA8 \uC778\uC99D\uC11C\uAC00 \uC788\uC74C:\n"},
-        {".is.not.trusted.", "...\uC744(\uB97C) \uC2E0\uB8B0\uD560 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4. "},
-        {"Install.reply.anyway.no.", "\uD68C\uC2E0\uC744 \uC124\uCE58\uD558\uACA0\uC2B5\uB2C8\uAE4C? [\uC544\uB2C8\uC624]:  "},
-        {"NO", "\uC544\uB2C8\uC624"},
-        {"Public.keys.in.reply.and.keystore.don.t.match",
-                "\uD68C\uC2E0\uACFC \uD0A4 \uC800\uC7A5\uC18C\uC758 \uACF5\uC6A9 \uD0A4\uAC00 \uC77C\uCE58\uD558\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4."},
-        {"Certificate.reply.and.certificate.in.keystore.are.identical",
-                "\uD68C\uC2E0\uACFC \uD0A4 \uC800\uC7A5\uC18C\uC758 \uC778\uC99D\uC11C\uAC00 \uB3D9\uC77C\uD569\uB2C8\uB2E4."},
-        {"Failed.to.establish.chain.from.reply",
-                "\uD68C\uC2E0\uC758 \uCCB4\uC778 \uC124\uC815\uC744 \uC2E4\uD328\uD588\uC2B5\uB2C8\uB2E4."},
-        {"n", "n"},
-        {"Wrong.answer.try.again", "\uC798\uBABB\uB41C \uC751\uB2F5\uC785\uB2C8\uB2E4. \uB2E4\uC2DC \uC2DC\uB3C4\uD558\uC2ED\uC2DC\uC624."},
-        {"Secret.key.not.generated.alias.alias.already.exists",
-                "\uBCF4\uC548 \uD0A4\uAC00 \uC0DD\uC131\uB418\uC9C0 \uC54A\uC558\uC73C\uBA70 <{0}> \uBCC4\uCE6D\uC774 \uC874\uC7AC\uD569\uB2C8\uB2E4."},
-        {"Please.provide.keysize.for.secret.key.generation",
-                "\uBCF4\uC548 \uD0A4\uB97C \uC0DD\uC131\uD558\uB824\uBA74 -keysize\uB97C \uC81C\uACF5\uD558\uC2ED\uC2DC\uC624."},
-
-        {"warning.not.verified.make.sure.keystore.is.correct",
-            "\uACBD\uACE0: \uD655\uC778\uB418\uC9C0 \uC54A\uC74C. -keystore\uAC00 \uC62C\uBC14\uB978\uC9C0 \uD655\uC778\uD558\uC2ED\uC2DC\uC624."},
-
-        {"Extensions.", "\uD655\uC7A5: "},
-        {".Empty.value.", "(\uBE44\uC5B4 \uC788\uB294 \uAC12)"},
-        {"Extension.Request.", "\uD655\uC7A5 \uC694\uCCAD:"},
-        {"Unknown.keyUsage.type.", "\uC54C \uC218 \uC5C6\uB294 keyUsage \uC720\uD615: "},
-        {"Unknown.extendedkeyUsage.type.", "\uC54C \uC218 \uC5C6\uB294 extendedkeyUsage \uC720\uD615: "},
-        {"Unknown.AccessDescription.type.", "\uC54C \uC218 \uC5C6\uB294 AccessDescription \uC720\uD615: "},
-        {"Unrecognized.GeneralName.type.", "\uC54C \uC218 \uC5C6\uB294 GeneralName \uC720\uD615: "},
-        {"This.extension.cannot.be.marked.as.critical.",
-                 "\uC774 \uD655\uC7A5\uC740 \uC911\uC694\uD55C \uAC83\uC73C\uB85C \uD45C\uC2DC\uD560 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4. "},
-        {"Odd.number.of.hex.digits.found.", "\uD640\uC218 \uAC1C\uC758 16\uC9C4\uC218\uAC00 \uBC1C\uACAC\uB428: "},
-        {"Unknown.extension.type.", "\uC54C \uC218 \uC5C6\uB294 \uD655\uC7A5 \uC720\uD615: "},
-        {"command.{0}.is.ambiguous.", "{0} \uBA85\uB839\uC774 \uBAA8\uD638\uD568:"},
-
-        // 8171319: keytool should print out warnings when reading or
-        // generating cert/cert req using weak algorithms
-        {"the.certificate.request", "\uC778\uC99D\uC11C \uC694\uCCAD"},
-        {"the.issuer", "\uBC1C\uD589\uC790"},
-        {"the.generated.certificate", "\uC0DD\uC131\uB41C \uC778\uC99D\uC11C"},
-        {"the.generated.crl", "\uC0DD\uC131\uB41C CRL"},
-        {"the.generated.certificate.request", "\uC0DD\uC131\uB41C \uC778\uC99D\uC11C \uC694\uCCAD"},
-        {"the.certificate", "\uC778\uC99D\uC11C"},
-        {"the.crl", "CRL"},
-        {"the.tsa.certificate", "TSA \uC778\uC99D\uC11C"},
-        {"the.input", "\uC785\uB825"},
-        {"reply", "\uD68C\uC2E0"},
-        {"one.in.many", "%1$s #%2$d/%3$d"},
-        {"alias.in.cacerts", "cacerts\uC758 <%s> \uBC1C\uD589\uC790"},
-        {"alias.in.keystore", "<%s> \uBC1C\uD589\uC790"},
-        {"with.weak", "%s(\uC57D\uD568)"},
-        {"key.bit", "%1$d\uBE44\uD2B8 %2$s \uD0A4"},
-        {"key.bit.weak", "%1$d\uBE44\uD2B8 %2$s \uD0A4(\uC57D\uD568)"},
-        {"unknown.size.1", "\uC54C \uC218 \uC5C6\uB294 \uD06C\uAE30 %s \uD0A4"},
-        {".PATTERN.printX509Cert.with.weak",
-                "\uC18C\uC720\uC790: {0}\n\uBC1C\uD589\uC790: {1}\n\uC77C\uB828 \uBC88\uD638: {2}\n\uC801\uD569\uD55C \uC2DC\uC791 \uB0A0\uC9DC: {3} \uC885\uB8CC \uB0A0\uC9DC: {4}\n\uC778\uC99D\uC11C \uC9C0\uBB38:\n\t SHA1: {5}\n\t SHA256: {6}\n\uC11C\uBA85 \uC54C\uACE0\uB9AC\uC998 \uC774\uB984: {7}\n\uC8FC\uCCB4 \uACF5\uC6A9 \uD0A4 \uC54C\uACE0\uB9AC\uC998: {8}\n\uBC84\uC804: {9}"},
-        {"PKCS.10.with.weak",
-                "PKCS #10 \uC778\uC99D\uC11C \uC694\uCCAD(1.0 \uBC84\uC804)\n\uC81C\uBAA9: %1$s\n\uD615\uC2DD: %2$s\n\uACF5\uC6A9 \uD0A4: %3$s\n\uC11C\uBA85 \uC54C\uACE0\uB9AC\uC998: %4$s\n"},
-        {"verified.by.s.in.s.weak", "%3$s\uC744(\uB97C) \uD3EC\uD568\uD558\uB294 %2$s\uC758 %1$s\uC5D0 \uC758\uD574 \uD655\uC778\uB428"},
-        {"whose.sigalg.risk", "%1$s\uC774(\uAC00) \uBCF4\uC548 \uC704\uD5D8\uC73C\uB85C \uAC04\uC8FC\uB418\uB294 %2$s \uC11C\uBA85 \uC54C\uACE0\uB9AC\uC998\uC744 \uC0AC\uC6A9\uD569\uB2C8\uB2E4."},
-        {"whose.key.risk", "%1$s\uC774(\uAC00) \uBCF4\uC548 \uC704\uD5D8\uC73C\uB85C \uAC04\uC8FC\uB418\uB294 %2$s\uC744(\uB97C) \uC0AC\uC6A9\uD569\uB2C8\uB2E4."},
-        {"jks.storetype.warning", "%1$s \uD0A4 \uC800\uC7A5\uC18C\uB294 \uACE0\uC720 \uD615\uC2DD\uC744 \uC0AC\uC6A9\uD569\uB2C8\uB2E4. \"keytool -importkeystore -srckeystore %2$s -destkeystore %2$s -deststoretype pkcs12\"\uB97C \uC0AC\uC6A9\uD558\uB294 \uC0B0\uC5C5 \uD45C\uC900 \uD615\uC2DD\uC778 PKCS12\uB85C \uC774\uC804\uD558\uB294 \uAC83\uC774 \uC88B\uC2B5\uB2C8\uB2E4."},
-        {"migrate.keystore.warning", "\"%1$s\"\uC744(\uB97C) %4$s(\uC73C)\uB85C \uC774\uC804\uD588\uC2B5\uB2C8\uB2E4. %2$s \uD0A4 \uC800\uC7A5\uC18C\uAC00 \"%3$s\"(\uC73C)\uB85C \uBC31\uC5C5\uB418\uC5C8\uC2B5\uB2C8\uB2E4."},
-        {"backup.keystore.warning", "\uC6D0\uBCF8 \uD0A4 \uC800\uC7A5\uC18C \"%1$s\"\uC774(\uAC00) \"%3$s\"(\uC73C)\uB85C \uBC31\uC5C5\uB418\uC5C8\uC2B5\uB2C8\uB2E4."},
-        {"importing.keystore.status", "\uD0A4 \uC800\uC7A5\uC18C %1$s\uC744(\uB97C) %2$s(\uC73C)\uB85C \uC784\uD3EC\uD2B8\uD558\uB294 \uC911..."},
-    };
-
-
-    /**
-     * Returns the contents of this <code>ResourceBundle</code>.
-     *
-     * <p>
-     *
-     * @return the contents of this <code>ResourceBundle</code>.
-     */
-    @Override
-    public Object[][] getContents() {
-        return contents;
-    }
-}
diff --git a/src/java.base/share/classes/sun/security/tools/keytool/Resources_pt_BR.java b/src/java.base/share/classes/sun/security/tools/keytool/Resources_pt_BR.java
deleted file mode 100644
index a83e63dbdd9..00000000000
--- a/src/java.base/share/classes/sun/security/tools/keytool/Resources_pt_BR.java
+++ /dev/null
@@ -1,484 +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.  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.tools.keytool;
-
-/**
- * <p> This class represents the <code>ResourceBundle</code>
- * for the keytool.
- *
- */
-public class Resources_pt_BR extends java.util.ListResourceBundle {
-
-    private static final Object[][] contents = {
-        {"NEWLINE", "\n"},
-        {"STAR",
-                "*******************************************"},
-        {"STARNN",
-                "*******************************************\n\n"},
-
-        // keytool: Help part
-        {".OPTION.", " [OPTION]..."},
-        {"Options.", "Op\u00E7\u00F5es:"},
-        {"option.1.set.twice", "A op\u00E7\u00E3o %s foi especificada v\u00E1rias vezes. Todas, exceto a \u00FAltima, ser\u00E3o ignoradas."},
-        {"multiple.commands.1.2", "Somente um comando \u00E9 permitido: tanto %1$s quanto %2$s foram especificados."},
-        {"Use.keytool.help.for.all.available.commands",
-                 "Use \"keytool -help\" para todos os comandos dispon\u00EDveis"},
-        {"Key.and.Certificate.Management.Tool",
-                 "Ferramenta de Gerenciamento de Chave e Certificado"},
-        {"Commands.", "Comandos:"},
-        {"Use.keytool.command.name.help.for.usage.of.command.name",
-                "Utilize \"keytool -command_name -help\" para uso de command_name.\nUtilize a op\u00E7\u00E3o -conf <url> para especificar um arquivo de op\u00E7\u00F5es pr\u00E9-configurado."},
-        // keytool: help: commands
-        {"Generates.a.certificate.request",
-                "Gera uma solicita\u00E7\u00E3o de certificado"}, //-certreq
-        {"Changes.an.entry.s.alias",
-                "Altera um alias de entrada"}, //-changealias
-        {"Deletes.an.entry",
-                "Exclui uma entrada"}, //-delete
-        {"Exports.certificate",
-                "Exporta o certificado"}, //-exportcert
-        {"Generates.a.key.pair",
-                "Gera um par de chaves"}, //-genkeypair
-        {"Generates.a.secret.key",
-                "Gera uma chave secreta"}, //-genseckey
-        {"Generates.certificate.from.a.certificate.request",
-                "Gera um certificado de uma solicita\u00E7\u00E3o de certificado"}, //-gencert
-        {"Generates.CRL", "Gera CRL"}, //-gencrl
-        {"Generated.keyAlgName.secret.key",
-                "Chave secreta {0} gerada"}, //-genseckey
-        {"Generated.keysize.bit.keyAlgName.secret.key",
-                "Chave secreta {1} de {0} bits gerada"}, //-genseckey
-        {"Imports.entries.from.a.JDK.1.1.x.style.identity.database",
-                "Importa entradas de um banco de dados de identidade JDK 1.1.x-style"}, //-identitydb
-        {"Imports.a.certificate.or.a.certificate.chain",
-                "Importa um certificado ou uma cadeia de certificados"}, //-importcert
-        {"Imports.a.password",
-                "Importa uma senha"}, //-importpass
-        {"Imports.one.or.all.entries.from.another.keystore",
-                "Importa uma ou todas as entradas de outra \u00E1rea de armazenamento de chaves"}, //-importkeystore
-        {"Clones.a.key.entry",
-                "Clona uma entrada de chave"}, //-keyclone
-        {"Changes.the.key.password.of.an.entry",
-                "Altera a senha da chave de uma entrada"}, //-keypasswd
-        {"Lists.entries.in.a.keystore",
-                "Lista entradas em uma \u00E1rea de armazenamento de chaves"}, //-list
-        {"Prints.the.content.of.a.certificate",
-                "Imprime o conte\u00FAdo de um certificado"}, //-printcert
-        {"Prints.the.content.of.a.certificate.request",
-                "Imprime o conte\u00FAdo de uma solicita\u00E7\u00E3o de certificado"}, //-printcertreq
-        {"Prints.the.content.of.a.CRL.file",
-                "Imprime o conte\u00FAdo de um arquivo CRL"}, //-printcrl
-        {"Generates.a.self.signed.certificate",
-                "Gera um certificado autoassinado"}, //-selfcert
-        {"Changes.the.store.password.of.a.keystore",
-                "Altera a senha de armazenamento de uma \u00E1rea de armazenamento de chaves"}, //-storepasswd
-        // keytool: help: options
-        {"alias.name.of.the.entry.to.process",
-                "nome do alias da entrada a ser processada"}, //-alias
-        {"destination.alias",
-                "alias de destino"}, //-destalias
-        {"destination.key.password",
-                "senha da chave de destino"}, //-destkeypass
-        {"destination.keystore.name",
-                "nome da \u00E1rea de armazenamento de chaves de destino"}, //-destkeystore
-        {"destination.keystore.password.protected",
-                "senha protegida da \u00E1rea de armazenamento de chaves de destino"}, //-destprotected
-        {"destination.keystore.provider.name",
-                "nome do fornecedor da \u00E1rea de armazenamento de chaves de destino"}, //-destprovidername
-        {"destination.keystore.password",
-                "senha da \u00E1rea de armazenamento de chaves de destino"}, //-deststorepass
-        {"destination.keystore.type",
-                "tipo de \u00E1rea de armazenamento de chaves de destino"}, //-deststoretype
-        {"distinguished.name",
-                "nome distinto"}, //-dname
-        {"X.509.extension",
-                "extens\u00E3o X.509"}, //-ext
-        {"output.file.name",
-                "nome do arquivo de sa\u00EDda"}, //-file and -outfile
-        {"input.file.name",
-                "nome do arquivo de entrada"}, //-file and -infile
-        {"key.algorithm.name",
-                "nome do algoritmo da chave"}, //-keyalg
-        {"key.password",
-                "senha da chave"}, //-keypass
-        {"key.bit.size",
-                "tamanho do bit da chave"}, //-keysize
-        {"keystore.name",
-                "nome da \u00E1rea de armazenamento de chaves"}, //-keystore
-        {"access.the.cacerts.keystore",
-                "acessar a \u00E1rea de armazenamento de chaves cacerts"}, // -cacerts
-        {"warning.cacerts.option",
-                "Advert\u00EAncia: use a op\u00E7\u00E3o -cacerts para acessar a \u00E1rea de armazenamento de chaves cacerts"},
-        {"new.password",
-                "nova senha"}, //-new
-        {"do.not.prompt",
-                "n\u00E3o perguntar"}, //-noprompt
-        {"password.through.protected.mechanism",
-                "senha por meio de mecanismo protegido"}, //-protected
-
-        // The following 2 values should span 2 lines, the first for the
-        // option itself, the second for its -providerArg value.
-        {"addprovider.option",
-                "adicionar provedor de seguran\u00E7a por nome (por exemplo, SunPKCS11)\nconfigurar argumento para -addprovider"}, //-addprovider
-        {"provider.class.option",
-                "adicionar provedor de seguran\u00E7a por nome de classe totalmente qualificado\nconfigurar argumento para -providerclass"}, //-providerclass
-
-        {"provider.name",
-                "nome do fornecedor"}, //-providername
-        {"provider.classpath",
-                "classpath do fornecedor"}, //-providerpath
-        {"output.in.RFC.style",
-                "sa\u00EDda no estilo RFC"}, //-rfc
-        {"signature.algorithm.name",
-                "nome do algoritmo de assinatura"}, //-sigalg
-        {"source.alias",
-                "alias de origem"}, //-srcalias
-        {"source.key.password",
-                "senha da chave de origem"}, //-srckeypass
-        {"source.keystore.name",
-                "nome da \u00E1rea de armazenamento de chaves de origem"}, //-srckeystore
-        {"source.keystore.password.protected",
-                "senha protegida da \u00E1rea de armazenamento de chaves de origem"}, //-srcprotected
-        {"source.keystore.provider.name",
-                "nome do fornecedor da \u00E1rea de armazenamento de chaves de origem"}, //-srcprovidername
-        {"source.keystore.password",
-                "senha da \u00E1rea de armazenamento de chaves de origem"}, //-srcstorepass
-        {"source.keystore.type",
-                "tipo de \u00E1rea de armazenamento de chaves de origem"}, //-srcstoretype
-        {"SSL.server.host.and.port",
-                "porta e host do servidor SSL"}, //-sslserver
-        {"signed.jar.file",
-                "arquivo jar assinado"}, //=jarfile
-        {"certificate.validity.start.date.time",
-                "data/hora inicial de validade do certificado"}, //-startdate
-        {"keystore.password",
-                "senha da \u00E1rea de armazenamento de chaves"}, //-storepass
-        {"keystore.type",
-                "tipo de \u00E1rea de armazenamento de chaves"}, //-storetype
-        {"trust.certificates.from.cacerts",
-                "certificados confi\u00E1veis do cacerts"}, //-trustcacerts
-        {"verbose.output",
-                "sa\u00EDda detalhada"}, //-v
-        {"validity.number.of.days",
-                "n\u00FAmero de dias da validade"}, //-validity
-        {"Serial.ID.of.cert.to.revoke",
-                 "ID de s\u00E9rie do certificado a ser revogado"}, //-id
-        // keytool: Running part
-        {"keytool.error.", "erro de keytool: "},
-        {"Illegal.option.", "Op\u00E7\u00E3o inv\u00E1lida:  "},
-        {"Illegal.value.", "Valor inv\u00E1lido: "},
-        {"Unknown.password.type.", "Tipo de senha desconhecido: "},
-        {"Cannot.find.environment.variable.",
-                "N\u00E3o \u00E9 poss\u00EDvel localizar a vari\u00E1vel do ambiente: "},
-        {"Cannot.find.file.", "N\u00E3o \u00E9 poss\u00EDvel localizar o arquivo: "},
-        {"Command.option.flag.needs.an.argument.", "A op\u00E7\u00E3o de comando {0} precisa de um argumento."},
-        {"Warning.Different.store.and.key.passwords.not.supported.for.PKCS12.KeyStores.Ignoring.user.specified.command.value.",
-                "Advert\u00EAncia: Senhas de chave e de armazenamento diferentes n\u00E3o suportadas para KeyStores PKCS12. Ignorando valor {0} especificado pelo usu\u00E1rio."},
-        {"the.keystore.or.storetype.option.cannot.be.used.with.the.cacerts.option",
-            "A op\u00E7\u00E3o -keystore ou -storetype n\u00E3o pode ser usada com a op\u00E7\u00E3o -cacerts"},
-        {".keystore.must.be.NONE.if.storetype.is.{0}",
-                "-keystore deve ser NONE se -storetype for {0}"},
-        {"Too.many.retries.program.terminated",
-                 "Excesso de tentativas de repeti\u00E7\u00E3o; programa finalizado"},
-        {".storepasswd.and.keypasswd.commands.not.supported.if.storetype.is.{0}",
-                "comandos -storepasswd e -keypasswd n\u00E3o suportados se -storetype for {0}"},
-        {".keypasswd.commands.not.supported.if.storetype.is.PKCS12",
-                "comandos -keypasswd n\u00E3o suportados se -storetype for PKCS12"},
-        {".keypass.and.new.can.not.be.specified.if.storetype.is.{0}",
-                "-keypass e -new n\u00E3o podem ser especificados se -storetype for {0}"},
-        {"if.protected.is.specified.then.storepass.keypass.and.new.must.not.be.specified",
-                "se -protected for especificado, ent\u00E3o -storepass, -keypass e -new n\u00E3o dever\u00E3o ser especificados"},
-        {"if.srcprotected.is.specified.then.srcstorepass.and.srckeypass.must.not.be.specified",
-                "se -srcprotected for especificado, ent\u00E3o -srcstorepass e -srckeypass n\u00E3o dever\u00E3o ser especificados"},
-        {"if.keystore.is.not.password.protected.then.storepass.keypass.and.new.must.not.be.specified",
-                "se a \u00E1rea de armazenamento de chaves n\u00E3o estiver protegida por senha, ent\u00E3o -storepass, -keypass e -new n\u00E3o dever\u00E3o ser especificados"},
-        {"if.source.keystore.is.not.password.protected.then.srcstorepass.and.srckeypass.must.not.be.specified",
-                "se a \u00E1rea de armazenamento de chaves de origem n\u00E3o estiver protegida por senha, ent\u00E3o -srcstorepass e -srckeypass n\u00E3o dever\u00E3o ser especificados"},
-        {"Illegal.startdate.value", "valor da data inicial inv\u00E1lido"},
-        {"Validity.must.be.greater.than.zero",
-                "A validade deve ser maior do que zero"},
-        {"provclass.not.a.provider", "%s n\u00E3o \u00E9 um fornecedor"},
-        {"provider.name.not.found", "O fornecedor chamado \"%s\" n\u00E3o foi encontrado"},
-        {"provider.class.not.found", "Fornecedor \"%s\" n\u00E3o encontrado"},
-        {"Usage.error.no.command.provided", "Erro de uso: nenhum comando fornecido"},
-        {"Source.keystore.file.exists.but.is.empty.", "O arquivo da \u00E1rea de armazenamento de chaves de origem existe, mas est\u00E1 vazio: "},
-        {"Please.specify.srckeystore", "Especifique -srckeystore"},
-        {"Must.not.specify.both.v.and.rfc.with.list.command",
-                "N\u00E3o devem ser especificados -v e -rfc com o comando 'list'"},
-        {"Key.password.must.be.at.least.6.characters",
-                "A senha da chave deve ter, no m\u00EDnimo, 6 caracteres"},
-        {"New.password.must.be.at.least.6.characters",
-                "A nova senha deve ter, no m\u00EDnimo, 6 caracteres"},
-        {"Keystore.file.exists.but.is.empty.",
-                "O arquivo da \u00E1rea de armazenamento de chaves existe, mas est\u00E1 vazio: "},
-        {"Keystore.file.does.not.exist.",
-                "O arquivo da \u00E1rea de armazenamento de chaves n\u00E3o existe. "},
-        {"Must.specify.destination.alias", "Deve ser especificado um alias de destino"},
-        {"Must.specify.alias", "Deve ser especificado um alias"},
-        {"Keystore.password.must.be.at.least.6.characters",
-                "A senha da \u00E1rea de armazenamento de chaves deve ter, no m\u00EDnimo, 6 caracteres"},
-        {"Enter.the.password.to.be.stored.",
-                "Digite a senha a ser armazenada:  "},
-        {"Enter.keystore.password.", "Informe a senha da \u00E1rea de armazenamento de chaves:  "},
-        {"Enter.source.keystore.password.", "Informe a senha da \u00E1rea de armazenamento de chaves de origem:  "},
-        {"Enter.destination.keystore.password.", "Informe a senha da \u00E1rea de armazenamento de chaves de destino:  "},
-        {"Keystore.password.is.too.short.must.be.at.least.6.characters",
-         "A senha da \u00E1rea de armazenamento de chaves \u00E9 muito curta - ela deve ter, no m\u00EDnimo, 6 caracteres"},
-        {"Unknown.Entry.Type", "Tipo de Entrada Desconhecido"},
-        {"Too.many.failures.Alias.not.changed", "Excesso de falhas. Alias n\u00E3o alterado"},
-        {"Entry.for.alias.alias.successfully.imported.",
-                 "Entrada do alias {0} importada com \u00EAxito."},
-        {"Entry.for.alias.alias.not.imported.", "Entrada do alias {0} n\u00E3o importada."},
-        {"Problem.importing.entry.for.alias.alias.exception.Entry.for.alias.alias.not.imported.",
-                 "Problema ao importar a entrada do alias {0}: {1}.\nEntrada do alias {0} n\u00E3o importada."},
-        {"Import.command.completed.ok.entries.successfully.imported.fail.entries.failed.or.cancelled",
-                 "Comando de importa\u00E7\u00E3o conclu\u00EDdo:  {0} entradas importadas com \u00EAxito, {1} entradas falharam ou foram canceladas"},
-        {"Warning.Overwriting.existing.alias.alias.in.destination.keystore",
-                 "Advert\u00EAncia: Substitui\u00E7\u00E3o do alias {0} existente na \u00E1rea de armazenamento de chaves de destino"},
-        {"Existing.entry.alias.alias.exists.overwrite.no.",
-                 "Entrada j\u00E1 existente no alias {0}, substituir? [n\u00E3o]:  "},
-        {"Too.many.failures.try.later", "Excesso de falhas - tente mais tarde"},
-        {"Certification.request.stored.in.file.filename.",
-                "Solicita\u00E7\u00E3o de certificado armazenada no arquivo <{0}>"},
-        {"Submit.this.to.your.CA", "Submeter \u00E0 CA"},
-        {"if.alias.not.specified.destalias.and.srckeypass.must.not.be.specified",
-            "se o alias n\u00E3o estiver especificado, destalias e srckeypass n\u00E3o dever\u00E3o ser especificados"},
-        {"The.destination.pkcs12.keystore.has.different.storepass.and.keypass.Please.retry.with.destkeypass.specified.",
-            "O armazenamento de chaves pkcs12 de destino tem storepass e keypass diferentes. Tente novamente especificando -destkeypass."},
-        {"Certificate.stored.in.file.filename.",
-                "Certificado armazenado no arquivo <{0}>"},
-        {"Certificate.reply.was.installed.in.keystore",
-                "A resposta do certificado foi instalada na \u00E1rea de armazenamento de chaves"},
-        {"Certificate.reply.was.not.installed.in.keystore",
-                "A resposta do certificado n\u00E3o foi instalada na \u00E1rea de armazenamento de chaves"},
-        {"Certificate.was.added.to.keystore",
-                "O certificado foi adicionado \u00E0 \u00E1rea de armazenamento de chaves"},
-        {"Certificate.was.not.added.to.keystore",
-                "O certificado n\u00E3o foi adicionado \u00E0 \u00E1rea de armazenamento de chaves"},
-        {".Storing.ksfname.", "[Armazenando {0}]"},
-        {"alias.has.no.public.key.certificate.",
-                "{0} n\u00E3o tem chave p\u00FAblica (certificado)"},
-        {"Cannot.derive.signature.algorithm",
-                "N\u00E3o \u00E9 poss\u00EDvel obter um algoritmo de assinatura"},
-        {"Alias.alias.does.not.exist",
-                "O alias <{0}> n\u00E3o existe"},
-        {"Alias.alias.has.no.certificate",
-                "O alias <{0}> n\u00E3o tem certificado"},
-        {"Key.pair.not.generated.alias.alias.already.exists",
-                "Par de chaves n\u00E3o gerado; o alias <{0}> j\u00E1 existe"},
-        {"Generating.keysize.bit.keyAlgName.key.pair.and.self.signed.certificate.sigAlgName.with.a.validity.of.validality.days.for",
-                "Gerando o par de chaves {1} de {0} bit e o certificado autoassinado ({2}) com uma validade de {3} dias\n\tpara: {4}"},
-        {"Enter.key.password.for.alias.", "Informar a senha da chave de <{0}>"},
-        {".RETURN.if.same.as.keystore.password.",
-                "\t(RETURN se for igual \u00E0 senha da \u00E1rea do armazenamento de chaves):  "},
-        {"Key.password.is.too.short.must.be.at.least.6.characters",
-                "A senha da chave \u00E9 muito curta - deve ter, no m\u00EDnimo, 6 caracteres"},
-        {"Too.many.failures.key.not.added.to.keystore",
-                "Excesso de falhas - chave n\u00E3o adicionada a \u00E1rea de armazenamento de chaves"},
-        {"Destination.alias.dest.already.exists",
-                "O alias de destino <{0}> j\u00E1 existe"},
-        {"Password.is.too.short.must.be.at.least.6.characters",
-                "A senha \u00E9 muito curta - deve ter, no m\u00EDnimo, 6 caracteres"},
-        {"Too.many.failures.Key.entry.not.cloned",
-                "Excesso de falhas. Entrada da chave n\u00E3o clonada"},
-        {"key.password.for.alias.", "senha da chave de <{0}>"},
-        {"Keystore.entry.for.id.getName.already.exists",
-                "A entrada da \u00E1rea do armazenamento de chaves de <{0}> j\u00E1 existe"},
-        {"Creating.keystore.entry.for.id.getName.",
-                "Criando entrada da \u00E1rea do armazenamento de chaves para <{0}> ..."},
-        {"No.entries.from.identity.database.added",
-                "Nenhuma entrada adicionada do banco de dados de identidades"},
-        {"Alias.name.alias", "Nome do alias: {0}"},
-        {"Creation.date.keyStore.getCreationDate.alias.",
-                "Data de cria\u00E7\u00E3o: {0,date}"},
-        {"alias.keyStore.getCreationDate.alias.",
-                "{0}, {1,date}, "},
-        {"alias.", "{0}, "},
-        {"Entry.type.type.", "Tipo de entrada: {0}"},
-        {"Certificate.chain.length.", "Comprimento da cadeia de certificados: "},
-        {"Certificate.i.1.", "Certificado[{0,number,integer}]:"},
-        {"Certificate.fingerprint.SHA.256.", "Fingerprint (SHA-256) do certificado: "},
-        {"Keystore.type.", "Tipo de \u00E1rea de armazenamento de chaves: "},
-        {"Keystore.provider.", "Fornecedor da \u00E1rea de armazenamento de chaves: "},
-        {"Your.keystore.contains.keyStore.size.entry",
-                "Sua \u00E1rea de armazenamento de chaves cont\u00E9m {0,number,integer} entrada"},
-        {"Your.keystore.contains.keyStore.size.entries",
-                "Sua \u00E1rea de armazenamento de chaves cont\u00E9m {0,number,integer} entradas"},
-        {"Failed.to.parse.input", "Falha durante o parsing da entrada"},
-        {"Empty.input", "Entrada vazia"},
-        {"Not.X.509.certificate", "N\u00E3o \u00E9 um certificado X.509"},
-        {"alias.has.no.public.key", "{0} n\u00E3o tem chave p\u00FAblica"},
-        {"alias.has.no.X.509.certificate", "{0} n\u00E3o tem certificado X.509"},
-        {"New.certificate.self.signed.", "Novo certificado (autoassinado):"},
-        {"Reply.has.no.certificates", "A resposta n\u00E3o tem certificado"},
-        {"Certificate.not.imported.alias.alias.already.exists",
-                "Certificado n\u00E3o importado, o alias <{0}> j\u00E1 existe"},
-        {"Input.not.an.X.509.certificate", "A entrada n\u00E3o \u00E9 um certificado X.509"},
-        {"Certificate.already.exists.in.keystore.under.alias.trustalias.",
-                "O certificado j\u00E1 existe no armazenamento de chaves no alias <{0}>"},
-        {"Do.you.still.want.to.add.it.no.",
-                "Ainda deseja adicion\u00E1-lo? [n\u00E3o]:  "},
-        {"Certificate.already.exists.in.system.wide.CA.keystore.under.alias.trustalias.",
-                "O certificado j\u00E1 existe na \u00E1rea de armazenamento de chaves da CA em todo o sistema no alias <{0}>"},
-        {"Do.you.still.want.to.add.it.to.your.own.keystore.no.",
-                "Ainda deseja adicion\u00E1-lo \u00E0 sua \u00E1rea de armazenamento de chaves? [n\u00E3o]:  "},
-        {"Trust.this.certificate.no.", "Confiar neste certificado? [n\u00E3o]:  "},
-        {"YES", "SIM"},
-        {"New.prompt.", "Nova {0}: "},
-        {"Passwords.must.differ", "As senhas devem ser diferentes"},
-        {"Re.enter.new.prompt.", "Informe novamente a nova {0}: "},
-        {"Re.enter.password.", "Redigite a senha: "},
-        {"Re.enter.new.password.", "Informe novamente a nova senha: "},
-        {"They.don.t.match.Try.again", "Elas n\u00E3o correspondem. Tente novamente"},
-        {"Enter.prompt.alias.name.", "Informe o nome do alias {0}:  "},
-        {"Enter.new.alias.name.RETURN.to.cancel.import.for.this.entry.",
-                 "Informe o novo nome do alias\t(RETURN para cancelar a importa\u00E7\u00E3o desta entrada):  "},
-        {"Enter.alias.name.", "Informe o nome do alias:  "},
-        {".RETURN.if.same.as.for.otherAlias.",
-                "\t(RETURN se for igual ao de <{0}>)"},
-        {"What.is.your.first.and.last.name.",
-                "Qual \u00E9 o seu nome e o seu sobrenome?"},
-        {"What.is.the.name.of.your.organizational.unit.",
-                "Qual \u00E9 o nome da sua unidade organizacional?"},
-        {"What.is.the.name.of.your.organization.",
-                "Qual \u00E9 o nome da sua empresa?"},
-        {"What.is.the.name.of.your.City.or.Locality.",
-                "Qual \u00E9 o nome da sua Cidade ou Localidade?"},
-        {"What.is.the.name.of.your.State.or.Province.",
-                "Qual \u00E9 o nome do seu Estado ou Munic\u00EDpio?"},
-        {"What.is.the.two.letter.country.code.for.this.unit.",
-                "Quais s\u00E3o as duas letras do c\u00F3digo do pa\u00EDs desta unidade?"},
-        {"Is.name.correct.", "{0} Est\u00E1 correto?"},
-        {"no", "n\u00E3o"},
-        {"yes", "sim"},
-        {"y", "s"},
-        {".defaultValue.", "  [{0}]:  "},
-        {"Alias.alias.has.no.key",
-                "O alias <{0}> n\u00E3o tem chave"},
-        {"Alias.alias.references.an.entry.type.that.is.not.a.private.key.entry.The.keyclone.command.only.supports.cloning.of.private.key",
-                 "O alias <{0}> faz refer\u00EAncia a um tipo de entrada que n\u00E3o \u00E9 uma entrada de chave privada. O comando -keyclone oferece suporte somente \u00E0 clonagem de entradas de chave privada"},
-
-        {".WARNING.WARNING.WARNING.",
-            "*****************  WARNING WARNING WARNING  *****************"},
-        {"Signer.d.", "Signat\u00E1rio #%d:"},
-        {"Timestamp.", "Timestamp:"},
-        {"Signature.", "Assinatura:"},
-        {"CRLs.", "CRLs:"},
-        {"Certificate.owner.", "Propriet\u00E1rio do certificado: "},
-        {"Not.a.signed.jar.file", "N\u00E3o \u00E9 um arquivo jar assinado"},
-        {"No.certificate.from.the.SSL.server",
-                "N\u00E3o \u00E9 um certificado do servidor SSL"},
-
-        {".The.integrity.of.the.information.stored.in.your.keystore.",
-            "* A integridade das informa\u00E7\u00F5es armazenadas na sua \u00E1rea de armazenamento de chaves  *\n* N\u00C3O foi verificada!  Para que seja poss\u00EDvel verificar sua integridade, *\n* voc\u00EA deve fornecer a senha da \u00E1rea de armazenamento de chaves.                  *"},
-        {".The.integrity.of.the.information.stored.in.the.srckeystore.",
-            "* A integridade das informa\u00E7\u00F5es armazenadas no srckeystore  *\n* N\u00C3O foi verificada!  Para que seja poss\u00EDvel verificar sua integridade, *\n* voc\u00EA deve fornecer a senha do srckeystore.                  *"},
-
-        {"Certificate.reply.does.not.contain.public.key.for.alias.",
-                "A resposta do certificado n\u00E3o cont\u00E9m a chave p\u00FAblica de <{0}>"},
-        {"Incomplete.certificate.chain.in.reply",
-                "Cadeia de certificados incompleta na resposta"},
-        {"Certificate.chain.in.reply.does.not.verify.",
-                "A cadeia de certificados da resposta n\u00E3o verifica: "},
-        {"Top.level.certificate.in.reply.",
-                "Certificado de n\u00EDvel superior na resposta:\n"},
-        {".is.not.trusted.", "... n\u00E3o \u00E9 confi\u00E1vel. "},
-        {"Install.reply.anyway.no.", "Instalar resposta assim mesmo? [n\u00E3o]:  "},
-        {"NO", "N\u00C3O"},
-        {"Public.keys.in.reply.and.keystore.don.t.match",
-                "As chaves p\u00FAblicas da resposta e da \u00E1rea de armazenamento de chaves n\u00E3o correspondem"},
-        {"Certificate.reply.and.certificate.in.keystore.are.identical",
-                "O certificado da resposta e o certificado da \u00E1rea de armazenamento de chaves s\u00E3o id\u00EAnticos"},
-        {"Failed.to.establish.chain.from.reply",
-                "Falha ao estabelecer a cadeia a partir da resposta"},
-        {"n", "n"},
-        {"Wrong.answer.try.again", "Resposta errada; tente novamente"},
-        {"Secret.key.not.generated.alias.alias.already.exists",
-                "Chave secreta n\u00E3o gerada; o alias <{0}> j\u00E1 existe"},
-        {"Please.provide.keysize.for.secret.key.generation",
-                "Forne\u00E7a o -keysize para a gera\u00E7\u00E3o da chave secreta"},
-
-        {"warning.not.verified.make.sure.keystore.is.correct",
-            "ADVERT\u00CANCIA: n\u00E3o verificado. Certifique-se que -keystore esteja correto."},
-
-        {"Extensions.", "Extens\u00F5es: "},
-        {".Empty.value.", "(Valor vazio)"},
-        {"Extension.Request.", "Solicita\u00E7\u00E3o de Extens\u00E3o:"},
-        {"Unknown.keyUsage.type.", "Tipo de keyUsage desconhecido: "},
-        {"Unknown.extendedkeyUsage.type.", "Tipo de extendedkeyUsage desconhecido: "},
-        {"Unknown.AccessDescription.type.", "Tipo de AccessDescription desconhecido: "},
-        {"Unrecognized.GeneralName.type.", "Tipo de GeneralName n\u00E3o reconhecido: "},
-        {"This.extension.cannot.be.marked.as.critical.",
-                 "Esta extens\u00E3o n\u00E3o pode ser marcada como cr\u00EDtica. "},
-        {"Odd.number.of.hex.digits.found.", "Encontrado n\u00FAmero \u00EDmpar de seis d\u00EDgitos: "},
-        {"Unknown.extension.type.", "Tipo de extens\u00E3o desconhecido: "},
-        {"command.{0}.is.ambiguous.", "o comando {0} \u00E9 amb\u00EDguo:"},
-
-        // 8171319: keytool should print out warnings when reading or
-        // generating cert/cert req using weak algorithms
-        {"the.certificate.request", "A solicita\u00E7\u00E3o do certificado"},
-        {"the.issuer", "O emissor"},
-        {"the.generated.certificate", "O certificado gerado"},
-        {"the.generated.crl", "A CRL gerada"},
-        {"the.generated.certificate.request", "A solicita\u00E7\u00E3o do certificado gerada"},
-        {"the.certificate", "O certificado"},
-        {"the.crl", "A CRL"},
-        {"the.tsa.certificate", "O certificado TSA"},
-        {"the.input", "A entrada"},
-        {"reply", "Resposta"},
-        {"one.in.many", "%1$s #%2$d de %3$d"},
-        {"alias.in.cacerts", "Emissor <%s> no cacerts"},
-        {"alias.in.keystore", "Emissor <%s>"},
-        {"with.weak", "%s (fraca)"},
-        {"key.bit", "Chave %2$s de %1$d bits"},
-        {"key.bit.weak", "Chave %2$s de %1$d bits (fraca)"},
-        {"unknown.size.1", "chave de tamanho desconhecido  %s"},
-        {".PATTERN.printX509Cert.with.weak",
-                "Propriet\u00E1rio: {0}\nEmissor: {1}\nN\u00FAmero de s\u00E9rie: {2}\nV\u00E1lido de: {3} at\u00E9: {4}\nFingerprints do certificado:\n\t SHA1: {5}\n\t SHA256: {6}\nNome do algoritmo de assinatura: {7}\nAlgoritmo de Chave P\u00FAblica do Assunto: {8}\nVers\u00E3o: {9}"},
-        {"PKCS.10.with.weak",
-                "Solicita\u00E7\u00E3o do Certificado PKCS #10 (Vers\u00E3o 1.0)\nAssunto: %1$s\nFormato: %2$s\nChave P\u00FAblica: %3$s\nAlgoritmo de assinatura: %4$s\n"},
-        {"verified.by.s.in.s.weak", "Verificado por %1$s em %2$s com um %3$s"},
-        {"whose.sigalg.risk", "%1$s usa o algoritmo de assinatura %2$s que \u00E9 considerado um risco \u00E0 seguran\u00E7a."},
-        {"whose.key.risk", "%1$s usa um %2$s que \u00E9 considerado um risco \u00E0 seguran\u00E7a."},
-        {"jks.storetype.warning", "O armazenamento de chaves %1$s usa um formato propriet\u00E1rio. \u00C9 recomendada a migra\u00E7\u00E3o para PKCS12, que \u00E9 um formato de padr\u00E3o industrial que usa \"keytool -importkeystore -srckeystore %2$s -destkeystore %2$s -deststoretype pkcs12\"."},
-        {"migrate.keystore.warning", "\"%1$s\" foi migrado para %4$s. O backup do armazenamento de chaves %2$s \u00E9 feito como \"%3$s\"."},
-        {"backup.keystore.warning", "O backup do armazenamento de chaves original \"%1$s\" \u00E9 feito como \"%3$s\"..."},
-        {"importing.keystore.status", "Importando armazenamento de chaves %1$s to %2$s..."},
-    };
-
-
-    /**
-     * Returns the contents of this <code>ResourceBundle</code>.
-     *
-     * <p>
-     *
-     * @return the contents of this <code>ResourceBundle</code>.
-     */
-    @Override
-    public Object[][] getContents() {
-        return contents;
-    }
-}
diff --git a/src/java.base/share/classes/sun/security/tools/keytool/Resources_sv.java b/src/java.base/share/classes/sun/security/tools/keytool/Resources_sv.java
deleted file mode 100644
index ee83e853b28..00000000000
--- a/src/java.base/share/classes/sun/security/tools/keytool/Resources_sv.java
+++ /dev/null
@@ -1,484 +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.  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.tools.keytool;
-
-/**
- * <p> This class represents the <code>ResourceBundle</code>
- * for the keytool.
- *
- */
-public class Resources_sv extends java.util.ListResourceBundle {
-
-    private static final Object[][] contents = {
-        {"NEWLINE", "\n"},
-        {"STAR",
-                "*******************************************"},
-        {"STARNN",
-                "*******************************************\n\n"},
-
-        // keytool: Help part
-        {".OPTION.", " [OPTION]..."},
-        {"Options.", "Alternativ:"},
-        {"option.1.set.twice", "Du har angett alternativet %s flera g\u00E5nger. Alla f\u00F6rutom det sista ignoreras."},
-        {"multiple.commands.1.2", "Endast ett kommando \u00E4r till\u00E5tet: du har angett b\u00E5de %1$s och %2$s."},
-        {"Use.keytool.help.for.all.available.commands",
-                 "L\u00E4s \"Hj\u00E4lp - Nyckelverktyg\" f\u00F6r alla tillg\u00E4ngliga kommandon"},
-        {"Key.and.Certificate.Management.Tool",
-                 "Hanteringsverktyg f\u00F6r nycklar och certifikat"},
-        {"Commands.", "Kommandon:"},
-        {"Use.keytool.command.name.help.for.usage.of.command.name",
-                "Anv\u00E4nd \"keytool -command_name -help\" f\u00F6r syntax f\u00F6r command_name.\nAnv\u00E4nd alternativet -conf <url> f\u00F6r att ange en f\u00F6rkonfigurerad alternativfil."},
-        // keytool: help: commands
-        {"Generates.a.certificate.request",
-                "Genererar certifikatbeg\u00E4ran"}, //-certreq
-        {"Changes.an.entry.s.alias",
-                "\u00C4ndrar postalias"}, //-changealias
-        {"Deletes.an.entry",
-                "Tar bort en post"}, //-delete
-        {"Exports.certificate",
-                "Exporterar certifikat"}, //-exportcert
-        {"Generates.a.key.pair",
-                "Genererar nyckelpar"}, //-genkeypair
-        {"Generates.a.secret.key",
-                "Genererar hemlig nyckel"}, //-genseckey
-        {"Generates.certificate.from.a.certificate.request",
-                "Genererar certifikat fr\u00E5n certifikatbeg\u00E4ran"}, //-gencert
-        {"Generates.CRL", "Genererar CRL"}, //-gencrl
-        {"Generated.keyAlgName.secret.key",
-                "Genererade {0} hemlig nyckel"}, //-genseckey
-        {"Generated.keysize.bit.keyAlgName.secret.key",
-                "Genererade {0}-bitars {1} hemlig nyckel"}, //-genseckey
-        {"Imports.entries.from.a.JDK.1.1.x.style.identity.database",
-                "Importerar poster fr\u00E5n identitetsdatabas i JDK 1.1.x-format"}, //-identitydb
-        {"Imports.a.certificate.or.a.certificate.chain",
-                "Importerar ett certifikat eller en certifikatkedja"}, //-importcert
-        {"Imports.a.password",
-                "Importerar ett l\u00F6senord"}, //-importpass
-        {"Imports.one.or.all.entries.from.another.keystore",
-                "Importerar en eller alla poster fr\u00E5n annat nyckellager"}, //-importkeystore
-        {"Clones.a.key.entry",
-                "Klonar en nyckelpost"}, //-keyclone
-        {"Changes.the.key.password.of.an.entry",
-                "\u00C4ndrar nyckell\u00F6senordet f\u00F6r en post"}, //-keypasswd
-        {"Lists.entries.in.a.keystore",
-                "Visar lista \u00F6ver poster i nyckellager"}, //-list
-        {"Prints.the.content.of.a.certificate",
-                "Skriver ut inneh\u00E5llet i ett certifikat"}, //-printcert
-        {"Prints.the.content.of.a.certificate.request",
-                "Skriver ut inneh\u00E5llet i en certifikatbeg\u00E4ran"}, //-printcertreq
-        {"Prints.the.content.of.a.CRL.file",
-                "Skriver ut inneh\u00E5llet i en CRL-fil"}, //-printcrl
-        {"Generates.a.self.signed.certificate",
-                "Genererar ett sj\u00E4lvsignerat certifikat"}, //-selfcert
-        {"Changes.the.store.password.of.a.keystore",
-                "\u00C4ndrar lagerl\u00F6senordet f\u00F6r ett nyckellager"}, //-storepasswd
-        // keytool: help: options
-        {"alias.name.of.the.entry.to.process",
-                "aliasnamn f\u00F6r post som ska bearbetas"}, //-alias
-        {"destination.alias",
-                "destinationsalias"}, //-destalias
-        {"destination.key.password",
-                "l\u00F6senord f\u00F6r destinationsnyckel"}, //-destkeypass
-        {"destination.keystore.name",
-                "namn p\u00E5 destinationsnyckellager"}, //-destkeystore
-        {"destination.keystore.password.protected",
-                "skyddat l\u00F6senord f\u00F6r destinationsnyckellager"}, //-destprotected
-        {"destination.keystore.provider.name",
-                "leverant\u00F6rsnamn f\u00F6r destinationsnyckellager"}, //-destprovidername
-        {"destination.keystore.password",
-                "l\u00F6senord f\u00F6r destinationsnyckellager"}, //-deststorepass
-        {"destination.keystore.type",
-                "typ av destinationsnyckellager"}, //-deststoretype
-        {"distinguished.name",
-                "unikt namn"}, //-dname
-        {"X.509.extension",
-                "X.509-till\u00E4gg"}, //-ext
-        {"output.file.name",
-                "namn p\u00E5 utdatafil"}, //-file and -outfile
-        {"input.file.name",
-                "namn p\u00E5 indatafil"}, //-file and -infile
-        {"key.algorithm.name",
-                "namn p\u00E5 nyckelalgoritm"}, //-keyalg
-        {"key.password",
-                "nyckell\u00F6senord"}, //-keypass
-        {"key.bit.size",
-                "nyckelbitstorlek"}, //-keysize
-        {"keystore.name",
-                "namn p\u00E5 nyckellager"}, //-keystore
-        {"access.the.cacerts.keystore",
-                "\u00E5tkomst till nyckellagret cacerts"}, // -cacerts
-        {"warning.cacerts.option",
-                "Varning: anv\u00E4nd alternativet -cacerts f\u00F6r att f\u00E5 \u00E5tkomst till nyckellagret cacerts"},
-        {"new.password",
-                "nytt l\u00F6senord"}, //-new
-        {"do.not.prompt",
-                "fr\u00E5ga inte"}, //-noprompt
-        {"password.through.protected.mechanism",
-                "l\u00F6senord med skyddad mekanism"}, //-protected
-
-        // The following 2 values should span 2 lines, the first for the
-        // option itself, the second for its -providerArg value.
-        {"addprovider.option",
-                "l\u00E4gg till s\u00E4kerhetsleverant\u00F6r per namn (t.ex. SunPKCS11)\nkonfigurera argument f\u00F6r -addprovider"}, //-addprovider
-        {"provider.class.option",
-                "l\u00E4gg till s\u00E4kerhetsleverant\u00F6r per fullt kvalificerat klassnamn\nkonfigurera argument f\u00F6r -providerclass"}, //-providerclass
-
-        {"provider.name",
-                "leverant\u00F6rsnamn"}, //-providername
-        {"provider.classpath",
-                "leverant\u00F6rsklass\u00F6kv\u00E4g"}, //-providerpath
-        {"output.in.RFC.style",
-                "utdata i RFC-format"}, //-rfc
-        {"signature.algorithm.name",
-                "namn p\u00E5 signaturalgoritm"}, //-sigalg
-        {"source.alias",
-                "k\u00E4llalias"}, //-srcalias
-        {"source.key.password",
-                "l\u00F6senord f\u00F6r k\u00E4llnyckel"}, //-srckeypass
-        {"source.keystore.name",
-                "namn p\u00E5 k\u00E4llnyckellager"}, //-srckeystore
-        {"source.keystore.password.protected",
-                "skyddat l\u00F6senord f\u00F6r k\u00E4llnyckellager"}, //-srcprotected
-        {"source.keystore.provider.name",
-                "leverant\u00F6rsnamn f\u00F6r k\u00E4llnyckellager"}, //-srcprovidername
-        {"source.keystore.password",
-                "l\u00F6senord f\u00F6r k\u00E4llnyckellager"}, //-srcstorepass
-        {"source.keystore.type",
-                "typ av k\u00E4llnyckellager"}, //-srcstoretype
-        {"SSL.server.host.and.port",
-                "SSL-serverv\u00E4rd och -port"}, //-sslserver
-        {"signed.jar.file",
-                "signerad jar-fil"}, //=jarfile
-        {"certificate.validity.start.date.time",
-                "startdatum/-tid f\u00F6r certifikatets giltighet"}, //-startdate
-        {"keystore.password",
-                "l\u00F6senord f\u00F6r nyckellager"}, //-storepass
-        {"keystore.type",
-                "nyckellagertyp"}, //-storetype
-        {"trust.certificates.from.cacerts",
-                "tillf\u00F6rlitliga certifikat fr\u00E5n cacerts"}, //-trustcacerts
-        {"verbose.output",
-                "utf\u00F6rliga utdata"}, //-v
-        {"validity.number.of.days",
-                "antal dagar f\u00F6r giltighet"}, //-validity
-        {"Serial.ID.of.cert.to.revoke",
-                 "Serienummer p\u00E5 certifikat som ska \u00E5terkallas"}, //-id
-        // keytool: Running part
-        {"keytool.error.", "nyckelverktygsfel: "},
-        {"Illegal.option.", "Otill\u00E5tet alternativ:  "},
-        {"Illegal.value.", "Otill\u00E5tet v\u00E4rde: "},
-        {"Unknown.password.type.", "Ok\u00E4nd l\u00F6senordstyp: "},
-        {"Cannot.find.environment.variable.",
-                "Hittar inte milj\u00F6variabel: "},
-        {"Cannot.find.file.", "Hittar inte fil: "},
-        {"Command.option.flag.needs.an.argument.", "Kommandoalternativet {0} beh\u00F6ver ett argument."},
-        {"Warning.Different.store.and.key.passwords.not.supported.for.PKCS12.KeyStores.Ignoring.user.specified.command.value.",
-                "Varning!  PKCS12-nyckellager har inte st\u00F6d f\u00F6r olika l\u00F6senord f\u00F6r lagret och nyckeln. Det anv\u00E4ndarspecificerade {0}-v\u00E4rdet ignoreras."},
-        {"the.keystore.or.storetype.option.cannot.be.used.with.the.cacerts.option",
-            "Alternativen -keystore och -storetype kan inte anv\u00E4ndas med alternativet -cacerts"},
-        {".keystore.must.be.NONE.if.storetype.is.{0}",
-                "-keystore m\u00E5ste vara NONE om -storetype \u00E4r {0}"},
-        {"Too.many.retries.program.terminated",
-                 "F\u00F6r m\u00E5nga f\u00F6rs\u00F6k. Programmet avslutas"},
-        {".storepasswd.and.keypasswd.commands.not.supported.if.storetype.is.{0}",
-                "-storepasswd- och -keypasswd-kommandon st\u00F6ds inte om -storetype \u00E4r {0}"},
-        {".keypasswd.commands.not.supported.if.storetype.is.PKCS12",
-                "-keypasswd-kommandon st\u00F6ds inte om -storetype \u00E4r PKCS12"},
-        {".keypass.and.new.can.not.be.specified.if.storetype.is.{0}",
-                "-keypass och -new kan inte anges om -storetype \u00E4r {0}"},
-        {"if.protected.is.specified.then.storepass.keypass.and.new.must.not.be.specified",
-                "om -protected har angetts f\u00E5r inte -storepass, -keypass och -new anges"},
-        {"if.srcprotected.is.specified.then.srcstorepass.and.srckeypass.must.not.be.specified",
-                "om -srcprotected anges f\u00E5r -srcstorepass och -srckeypass inte anges"},
-        {"if.keystore.is.not.password.protected.then.storepass.keypass.and.new.must.not.be.specified",
-                "om nyckellagret inte \u00E4r l\u00F6senordsskyddat f\u00E5r -storepass, -keypass och -new inte anges"},
-        {"if.source.keystore.is.not.password.protected.then.srcstorepass.and.srckeypass.must.not.be.specified",
-                "om k\u00E4llnyckellagret inte \u00E4r l\u00F6senordsskyddat f\u00E5r -srcstorepass och -srckeypass inte anges"},
-        {"Illegal.startdate.value", "Otill\u00E5tet v\u00E4rde f\u00F6r startdatum"},
-        {"Validity.must.be.greater.than.zero",
-                "Giltigheten m\u00E5ste vara st\u00F6rre \u00E4n noll"},
-        {"provclass.not.a.provider", "%s \u00E4r inte en leverant\u00F6r"},
-        {"provider.name.not.found", "Leverant\u00F6ren med namnet \"%s\" hittades inte"},
-        {"provider.class.not.found", "Leverant\u00F6ren \"%s\" hittades inte"},
-        {"Usage.error.no.command.provided", "Syntaxfel: inget kommando angivet"},
-        {"Source.keystore.file.exists.but.is.empty.", "Nyckellagrets k\u00E4llfil finns, men \u00E4r tom: "},
-        {"Please.specify.srckeystore", "Ange -srckeystore"},
-        {"Must.not.specify.both.v.and.rfc.with.list.command",
-                "Kan inte specificera b\u00E5de -v och -rfc med 'list'-kommandot"},
-        {"Key.password.must.be.at.least.6.characters",
-                "Nyckell\u00F6senordet m\u00E5ste inneh\u00E5lla minst 6 tecken"},
-        {"New.password.must.be.at.least.6.characters",
-                "Det nya l\u00F6senordet m\u00E5ste inneh\u00E5lla minst 6 tecken"},
-        {"Keystore.file.exists.but.is.empty.",
-                "Nyckellagerfilen finns, men \u00E4r tom: "},
-        {"Keystore.file.does.not.exist.",
-                "Nyckellagerfilen finns inte: "},
-        {"Must.specify.destination.alias", "Du m\u00E5ste ange destinationsalias"},
-        {"Must.specify.alias", "Du m\u00E5ste ange alias"},
-        {"Keystore.password.must.be.at.least.6.characters",
-                "Nyckellagerl\u00F6senordet m\u00E5ste inneh\u00E5lla minst 6 tecken"},
-        {"Enter.the.password.to.be.stored.",
-                "Ange det l\u00F6senord som ska lagras:  "},
-        {"Enter.keystore.password.", "Ange nyckellagerl\u00F6senord:  "},
-        {"Enter.source.keystore.password.", "Ange l\u00F6senord f\u00F6r k\u00E4llnyckellagret:  "},
-        {"Enter.destination.keystore.password.", "Ange nyckellagerl\u00F6senord f\u00F6r destination:  "},
-        {"Keystore.password.is.too.short.must.be.at.least.6.characters",
-         "Nyckellagerl\u00F6senordet \u00E4r f\u00F6r kort - det m\u00E5ste inneh\u00E5lla minst 6 tecken"},
-        {"Unknown.Entry.Type", "Ok\u00E4nd posttyp"},
-        {"Too.many.failures.Alias.not.changed", "F\u00F6r m\u00E5nga fel. Alias har inte \u00E4ndrats"},
-        {"Entry.for.alias.alias.successfully.imported.",
-                 "Posten f\u00F6r alias {0} har importerats."},
-        {"Entry.for.alias.alias.not.imported.", "Posten f\u00F6r alias {0} har inte importerats."},
-        {"Problem.importing.entry.for.alias.alias.exception.Entry.for.alias.alias.not.imported.",
-                 "Ett problem uppstod vid importen av posten f\u00F6r alias {0}: {1}.\nPosten {0} har inte importerats."},
-        {"Import.command.completed.ok.entries.successfully.imported.fail.entries.failed.or.cancelled",
-                 "Kommandoimporten slutf\u00F6rd: {0} poster har importerats, {1} poster var felaktiga eller annullerades"},
-        {"Warning.Overwriting.existing.alias.alias.in.destination.keystore",
-                 "Varning! Det befintliga aliaset {0} i destinationsnyckellagret skrivs \u00F6ver"},
-        {"Existing.entry.alias.alias.exists.overwrite.no.",
-                 "Aliaset {0} finns redan. Vill du skriva \u00F6ver det? [nej]:  "},
-        {"Too.many.failures.try.later", "F\u00F6r m\u00E5nga fel - f\u00F6rs\u00F6k igen senare"},
-        {"Certification.request.stored.in.file.filename.",
-                "Certifikatbeg\u00E4ran har lagrats i filen <{0}>"},
-        {"Submit.this.to.your.CA", "Skicka detta till certifikatutf\u00E4rdaren"},
-        {"if.alias.not.specified.destalias.and.srckeypass.must.not.be.specified",
-            "om alias inte angivits ska inte heller destalias och srckeypass anges"},
-        {"The.destination.pkcs12.keystore.has.different.storepass.and.keypass.Please.retry.with.destkeypass.specified.",
-            "Destinationsnyckellagret pkcs12 har olika storepass och keypass. F\u00F6rs\u00F6k igen med -destkeypass angivet."},
-        {"Certificate.stored.in.file.filename.",
-                "Certifikatet har lagrats i filen <{0}>"},
-        {"Certificate.reply.was.installed.in.keystore",
-                "Certifikatsvaret har installerats i nyckellagret"},
-        {"Certificate.reply.was.not.installed.in.keystore",
-                "Certifikatsvaret har inte installerats i nyckellagret"},
-        {"Certificate.was.added.to.keystore",
-                "Certifikatet har lagts till i nyckellagret"},
-        {"Certificate.was.not.added.to.keystore",
-                "Certifikatet har inte lagts till i nyckellagret"},
-        {".Storing.ksfname.", "[Lagrar {0}]"},
-        {"alias.has.no.public.key.certificate.",
-                "{0} saknar \u00F6ppen nyckel (certifikat)"},
-        {"Cannot.derive.signature.algorithm",
-                "Kan inte h\u00E4rleda signaturalgoritm"},
-        {"Alias.alias.does.not.exist",
-                "Aliaset <{0}> finns inte"},
-        {"Alias.alias.has.no.certificate",
-                "Aliaset <{0}> saknar certifikat"},
-        {"Key.pair.not.generated.alias.alias.already.exists",
-                "Nyckelparet genererades inte. Aliaset <{0}> finns redan"},
-        {"Generating.keysize.bit.keyAlgName.key.pair.and.self.signed.certificate.sigAlgName.with.a.validity.of.validality.days.for",
-                "Genererar {0} bitars {1}-nyckelpar och sj\u00E4lvsignerat certifikat ({2}) med en giltighet p\u00E5 {3} dagar\n\tf\u00F6r: {4}"},
-        {"Enter.key.password.for.alias.", "Ange nyckell\u00F6senord f\u00F6r <{0}>"},
-        {".RETURN.if.same.as.keystore.password.",
-                "\t(RETURN om det \u00E4r identiskt med nyckellagerl\u00F6senordet):  "},
-        {"Key.password.is.too.short.must.be.at.least.6.characters",
-                "Nyckell\u00F6senordet \u00E4r f\u00F6r kort - det m\u00E5ste inneh\u00E5lla minst 6 tecken"},
-        {"Too.many.failures.key.not.added.to.keystore",
-                "F\u00F6r m\u00E5nga fel - nyckeln lades inte till i nyckellagret"},
-        {"Destination.alias.dest.already.exists",
-                "Destinationsaliaset <{0}> finns redan"},
-        {"Password.is.too.short.must.be.at.least.6.characters",
-                "L\u00F6senordet \u00E4r f\u00F6r kort - det m\u00E5ste inneh\u00E5lla minst 6 tecken"},
-        {"Too.many.failures.Key.entry.not.cloned",
-                "F\u00F6r m\u00E5nga fel. Nyckelposten har inte klonats"},
-        {"key.password.for.alias.", "nyckell\u00F6senord f\u00F6r <{0}>"},
-        {"Keystore.entry.for.id.getName.already.exists",
-                "Nyckellagerpost f\u00F6r <{0}> finns redan"},
-        {"Creating.keystore.entry.for.id.getName.",
-                "Skapar nyckellagerpost f\u00F6r <{0}> ..."},
-        {"No.entries.from.identity.database.added",
-                "Inga poster fr\u00E5n identitetsdatabasen har lagts till"},
-        {"Alias.name.alias", "Aliasnamn: {0}"},
-        {"Creation.date.keyStore.getCreationDate.alias.",
-                "Skapat den: {0,date}"},
-        {"alias.keyStore.getCreationDate.alias.",
-                "{0}, {1,date}, "},
-        {"alias.", "{0}, "},
-        {"Entry.type.type.", "Posttyp: {0}"},
-        {"Certificate.chain.length.", "L\u00E4ngd p\u00E5 certifikatskedja: "},
-        {"Certificate.i.1.", "Certifikat[{0,number,integer}]:"},
-        {"Certificate.fingerprint.SHA.256.", "Certifikatfingeravtryck (SHA-256): "},
-        {"Keystore.type.", "Nyckellagertyp: "},
-        {"Keystore.provider.", "Nyckellagerleverant\u00F6r: "},
-        {"Your.keystore.contains.keyStore.size.entry",
-                "Nyckellagret inneh\u00E5ller {0,number,integer} post"},
-        {"Your.keystore.contains.keyStore.size.entries",
-                "Nyckellagret inneh\u00E5ller {0,number,integer} poster"},
-        {"Failed.to.parse.input", "Kunde inte tolka indata"},
-        {"Empty.input", "Inga indata"},
-        {"Not.X.509.certificate", "Inte ett X.509-certifikat"},
-        {"alias.has.no.public.key", "{0} saknar \u00F6ppen nyckel"},
-        {"alias.has.no.X.509.certificate", "{0} saknar X.509-certifikat"},
-        {"New.certificate.self.signed.", "Nytt certifikat (sj\u00E4lvsignerat):"},
-        {"Reply.has.no.certificates", "Svaret saknar certifikat"},
-        {"Certificate.not.imported.alias.alias.already.exists",
-                "Certifikatet importerades inte. Aliaset <{0}> finns redan"},
-        {"Input.not.an.X.509.certificate", "Indata \u00E4r inte ett X.509-certifikat"},
-        {"Certificate.already.exists.in.keystore.under.alias.trustalias.",
-                "Certifikatet finns redan i nyckellagerfilen under aliaset <{0}>"},
-        {"Do.you.still.want.to.add.it.no.",
-                "Vill du fortfarande l\u00E4gga till det? [nej]:  "},
-        {"Certificate.already.exists.in.system.wide.CA.keystore.under.alias.trustalias.",
-                "Certifikatet finns redan i den systemomsp\u00E4nnande CA-nyckellagerfilen under aliaset <{0}>"},
-        {"Do.you.still.want.to.add.it.to.your.own.keystore.no.",
-                "Vill du fortfarande l\u00E4gga till det i ditt eget nyckellagret? [nej]:  "},
-        {"Trust.this.certificate.no.", "Litar du p\u00E5 det h\u00E4r certifikatet? [nej]:  "},
-        {"YES", "JA"},
-        {"New.prompt.", "Nytt {0}: "},
-        {"Passwords.must.differ", "L\u00F6senorden m\u00E5ste vara olika"},
-        {"Re.enter.new.prompt.", "Ange nytt {0} igen: "},
-        {"Re.enter.password.", "Ange l\u00F6senord igen: "},
-        {"Re.enter.new.password.", "Ange det nya l\u00F6senordet igen: "},
-        {"They.don.t.match.Try.again", "De matchar inte. F\u00F6rs\u00F6k igen"},
-        {"Enter.prompt.alias.name.", "Ange aliasnamn f\u00F6r {0}:  "},
-        {"Enter.new.alias.name.RETURN.to.cancel.import.for.this.entry.",
-                 "Ange ett nytt aliasnamn\t(skriv RETURN f\u00F6r att avbryta importen av denna post):  "},
-        {"Enter.alias.name.", "Ange aliasnamn:  "},
-        {".RETURN.if.same.as.for.otherAlias.",
-                "\t(RETURN om det \u00E4r det samma som f\u00F6r <{0}>)"},
-        {"What.is.your.first.and.last.name.",
-                "Vad heter du i f\u00F6r- och efternamn?"},
-        {"What.is.the.name.of.your.organizational.unit.",
-                "Vad heter din avdelning inom organisationen?"},
-        {"What.is.the.name.of.your.organization.",
-                "Vad heter din organisation?"},
-        {"What.is.the.name.of.your.City.or.Locality.",
-                "Vad heter din ort eller plats?"},
-        {"What.is.the.name.of.your.State.or.Province.",
-                "Vad heter ditt land eller din provins?"},
-        {"What.is.the.two.letter.country.code.for.this.unit.",
-                "Vilken \u00E4r den tv\u00E5st\u00E4lliga landskoden?"},
-        {"Is.name.correct.", "\u00C4r {0} korrekt?"},
-        {"no", "nej"},
-        {"yes", "ja"},
-        {"y", "j"},
-        {".defaultValue.", "  [{0}]:  "},
-        {"Alias.alias.has.no.key",
-                "Aliaset <{0}> saknar nyckel"},
-        {"Alias.alias.references.an.entry.type.that.is.not.a.private.key.entry.The.keyclone.command.only.supports.cloning.of.private.key",
-                 "Aliaset <{0}> refererar till en posttyp som inte \u00E4r n\u00E5gon privat nyckelpost. Kommandot -keyclone har endast st\u00F6d f\u00F6r kloning av privata nyckelposter"},
-
-        {".WARNING.WARNING.WARNING.",
-            "*****************  WARNING WARNING WARNING  *****************"},
-        {"Signer.d.", "Undertecknare %d:"},
-        {"Timestamp.", "Tidsst\u00E4mpel:"},
-        {"Signature.", "Signatur:"},
-        {"CRLs.", "CRL:er:"},
-        {"Certificate.owner.", "Certifikat\u00E4gare: "},
-        {"Not.a.signed.jar.file", "Ingen signerad jar-fil"},
-        {"No.certificate.from.the.SSL.server",
-                "Inget certifikat fr\u00E5n SSL-servern"},
-
-        {".The.integrity.of.the.information.stored.in.your.keystore.",
-            "* Integriteten f\u00F6r den information som lagras i nyckellagerfilen  *\n* har INTE verifierats!  Om du vill verifiera dess integritet *\n* m\u00E5ste du ange l\u00F6senordet f\u00F6r nyckellagret.                  *"},
-        {".The.integrity.of.the.information.stored.in.the.srckeystore.",
-            "* Integriteten f\u00F6r den information som lagras i srckeystore*\n* har INTE verifierats!  Om du vill verifiera dess integritet *\n* m\u00E5ste du ange l\u00F6senordet f\u00F6r srckeystore.                *"},
-
-        {"Certificate.reply.does.not.contain.public.key.for.alias.",
-                "Certifikatsvaret inneh\u00E5ller inte n\u00E5gon \u00F6ppen nyckel f\u00F6r <{0}>"},
-        {"Incomplete.certificate.chain.in.reply",
-                "Ofullst\u00E4ndig certifikatskedja i svaret"},
-        {"Certificate.chain.in.reply.does.not.verify.",
-                "Certifikatskedjan i svaret g\u00E5r inte att verifiera: "},
-        {"Top.level.certificate.in.reply.",
-                "Toppniv\u00E5certifikatet i svaret:\n"},
-        {".is.not.trusted.", "... \u00E4r inte betrott. "},
-        {"Install.reply.anyway.no.", "Vill du installera svaret \u00E4nd\u00E5? [nej]:  "},
-        {"NO", "NEJ"},
-        {"Public.keys.in.reply.and.keystore.don.t.match",
-                "De offentliga nycklarna i svaret och nyckellagret matchar inte varandra"},
-        {"Certificate.reply.and.certificate.in.keystore.are.identical",
-                "Certifikatsvaret och certifikatet i nyckellagret \u00E4r identiska"},
-        {"Failed.to.establish.chain.from.reply",
-                "Kunde inte uppr\u00E4tta kedja fr\u00E5n svaret"},
-        {"n", "n"},
-        {"Wrong.answer.try.again", "Fel svar. F\u00F6rs\u00F6k p\u00E5 nytt."},
-        {"Secret.key.not.generated.alias.alias.already.exists",
-                "Den hemliga nyckeln har inte genererats eftersom aliaset <{0}> redan finns"},
-        {"Please.provide.keysize.for.secret.key.generation",
-                "Ange -keysize f\u00F6r att skapa hemlig nyckel"},
-
-        {"warning.not.verified.make.sure.keystore.is.correct",
-            "VARNING: ej verifierad. Se till att -nyckellager \u00E4r korrekt."},
-
-        {"Extensions.", "Till\u00E4gg: "},
-        {".Empty.value.", "(Tomt v\u00E4rde)"},
-        {"Extension.Request.", "Till\u00E4ggsbeg\u00E4ran:"},
-        {"Unknown.keyUsage.type.", "Ok\u00E4nd keyUsage-typ: "},
-        {"Unknown.extendedkeyUsage.type.", "Ok\u00E4nd extendedkeyUsage-typ: "},
-        {"Unknown.AccessDescription.type.", "Ok\u00E4nd AccessDescription-typ: "},
-        {"Unrecognized.GeneralName.type.", "Ok\u00E4nd GeneralName-typ: "},
-        {"This.extension.cannot.be.marked.as.critical.",
-                 "Detta till\u00E4gg kan inte markeras som kritiskt. "},
-        {"Odd.number.of.hex.digits.found.", "Udda antal hex-siffror p\u00E5tr\u00E4ffades: "},
-        {"Unknown.extension.type.", "Ok\u00E4nd till\u00E4ggstyp: "},
-        {"command.{0}.is.ambiguous.", "kommandot {0} \u00E4r tvetydigt:"},
-
-        // 8171319: keytool should print out warnings when reading or
-        // generating cert/cert req using weak algorithms
-        {"the.certificate.request", "Certifikatbeg\u00E4ran"},
-        {"the.issuer", "Utf\u00E4rdaren"},
-        {"the.generated.certificate", "Det genererade certifikatet"},
-        {"the.generated.crl", "Den genererade listan \u00F6ver \u00E5terkallade certifikat"},
-        {"the.generated.certificate.request", "Den genererade certifikatbeg\u00E4ran"},
-        {"the.certificate", "Certifikatet"},
-        {"the.crl", "Listan \u00F6ver \u00E5terkallade certifikat"},
-        {"the.tsa.certificate", "TSA-certifikatet"},
-        {"the.input", "Indata"},
-        {"reply", "Svar"},
-        {"one.in.many", "%1$s #%2$d av %3$d"},
-        {"alias.in.cacerts", "Utf\u00E4rdaren <%s> i cacerts"},
-        {"alias.in.keystore", "Utf\u00E4rdaren <%s>"},
-        {"with.weak", "%s (svag)"},
-        {"key.bit", "%1$d-bitars %2$s-nyckel"},
-        {"key.bit.weak", "%1$d-bitars %2$s-nyckel (svag)"},
-        {"unknown.size.1", "ok\u00E4nd storlek p\u00E5 nyckeln %s"},
-        {".PATTERN.printX509Cert.with.weak",
-                "\u00C4gare: {0}\nUtf\u00E4rdare: {1}\nSerienummer: {2}\nGiltigt fr\u00E5n: {3}, till: {4}\nCertifikatfingeravtryck:\n\t SHA1: {5}\n\t SHA256: {6}\nSignaturalgoritmnamn: {7}\nAlgoritm f\u00F6r \u00F6ppen nyckel f\u00F6r \u00E4mne: {8}\nVersion: {9}"},
-        {"PKCS.10.with.weak",
-                "PKCS #10-certifikatbeg\u00E4ran (version 1.0)\n\u00C4mne: %1$s\nFormat: %2$s\n\u00D6ppen nyckel: %3$s\nSignaturalgoritm: %4$s\n"},
-        {"verified.by.s.in.s.weak", "Verifierades av %1$s i %2$s med en %3$s"},
-        {"whose.sigalg.risk", "%1$s anv\u00E4nder signaturalgoritmen %2$s, vilket anses utg\u00F6ra en s\u00E4kerhetsrisk."},
-        {"whose.key.risk", "%1$s anv\u00E4nder en %2$s, vilket anses utg\u00F6ra en s\u00E4kerhetsrisk."},
-        {"jks.storetype.warning", "Nyckellagret %1$s anv\u00E4nder ett propriet\u00E4rt format. Du b\u00F6r migrera till PKCS12, som \u00E4r ett branschstandardformat, med \"keytool -importkeystore -srckeystore %2$s -destkeystore %2$s -deststoretype pkcs12\"."},
-        {"migrate.keystore.warning", "Migrerade \"%1$s\" till %4$s. Nyckellagret %2$s s\u00E4kerhetskopierades som \"%3$s\"."},
-        {"backup.keystore.warning", "Det ursprungliga nyckellagret, \"%1$s\", s\u00E4kerhetskopieras som \"%3$s\"..."},
-        {"importing.keystore.status", "Importerar nyckellagret %1$s till %2$s..."},
-    };
-
-
-    /**
-     * Returns the contents of this <code>ResourceBundle</code>.
-     *
-     * <p>
-     *
-     * @return the contents of this <code>ResourceBundle</code>.
-     */
-    @Override
-    public Object[][] getContents() {
-        return contents;
-    }
-}
diff --git a/src/java.base/share/classes/sun/security/tools/keytool/Resources_zh_CN.java b/src/java.base/share/classes/sun/security/tools/keytool/Resources_zh_CN.java
deleted file mode 100644
index cb697082242..00000000000
--- a/src/java.base/share/classes/sun/security/tools/keytool/Resources_zh_CN.java
+++ /dev/null
@@ -1,511 +0,0 @@
-/*
- * Copyright (c) 2000, 2025, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute 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.tools.keytool;
-
-/**
- * <p> This class represents the <code>ResourceBundle</code>
- * for the keytool.
- *
- */
-public class Resources_zh_CN extends java.util.ListResourceBundle {
-
-    private static final Object[][] contents = {
-        {"NEWLINE", "\n"},
-        {"STAR",
-                "*******************************************"},
-        {"STARNN",
-                "*******************************************\n\n"},
-
-        // keytool: Help part
-        {".OPTION.", " [OPTION]..."},
-        {"Options.", "\u9009\u9879:"},
-        {"option.1.set.twice", "\u591A\u6B21\u6307\u5B9A\u4E86 %s \u9009\u9879\u3002\u9664\u6700\u540E\u4E00\u4E2A\u4E4B\u5916, \u5176\u4F59\u7684\u5C06\u5168\u90E8\u5FFD\u7565\u3002"},
-        {"multiple.commands.1.2", "\u53EA\u5141\u8BB8\u4E00\u4E2A\u547D\u4EE4: \u540C\u65F6\u6307\u5B9A\u4E86 %1$s \u548C %2$s\u3002"},
-        {"Use.keytool.help.for.all.available.commands",
-                 "\u4F7F\u7528 \"keytool -?, -h, or --help\" \u53EF\u8F93\u51FA\u6B64\u5E2E\u52A9\u6D88\u606F"},
-        {"Key.and.Certificate.Management.Tool",
-                 "\u5BC6\u94A5\u548C\u8BC1\u4E66\u7BA1\u7406\u5DE5\u5177"},
-        {"Commands.", "\u547D\u4EE4:"},
-        {"Use.keytool.command.name.help.for.usage.of.command.name",
-                "\u4F7F\u7528 \"keytool -command_name --help\" \u53EF\u83B7\u53D6 command_name \u7684\u7528\u6CD5\u3002\n\u4F7F\u7528 -conf <url> \u9009\u9879\u53EF\u6307\u5B9A\u9884\u914D\u7F6E\u7684\u9009\u9879\u6587\u4EF6\u3002"},
-        // keytool: help: commands
-        {"Generates.a.certificate.request",
-                "\u751F\u6210\u8BC1\u4E66\u8BF7\u6C42"}, //-certreq
-        {"Changes.an.entry.s.alias",
-                "\u66F4\u6539\u6761\u76EE\u7684\u522B\u540D"}, //-changealias
-        {"Deletes.an.entry",
-                "\u5220\u9664\u6761\u76EE"}, //-delete
-        {"Exports.certificate",
-                "\u5BFC\u51FA\u8BC1\u4E66"}, //-exportcert
-        {"Generates.a.key.pair",
-                "\u751F\u6210\u5BC6\u94A5\u5BF9"}, //-genkeypair
-        {"Generates.a.secret.key",
-                "\u751F\u6210\u5BC6\u94A5"}, //-genseckey
-        {"Generates.certificate.from.a.certificate.request",
-                "\u6839\u636E\u8BC1\u4E66\u8BF7\u6C42\u751F\u6210\u8BC1\u4E66"}, //-gencert
-        {"Generates.CRL", "\u751F\u6210 CRL"}, //-gencrl
-        {"Generated.keyAlgName.secret.key",
-                "\u5DF2\u751F\u6210{0}\u5BC6\u94A5"}, //-genseckey
-        {"Generated.keysize.bit.keyAlgName.secret.key",
-                "\u5DF2\u751F\u6210 {0} \u4F4D{1}\u5BC6\u94A5"}, //-genseckey
-        {"key.algorithm.weak", "%1$s \u4F7F\u7528\u7684 %2$s \u7B97\u6CD5\u88AB\u89C6\u4E3A\u5B58\u5728\u5B89\u5168\u98CE\u9669\u3002"},
-        {"key.size.weak", "%1$s \u4F7F\u7528\u7684 %2$s \u5B58\u5728\u5B89\u5168\u98CE\u9669\u3002"},
-        {"Imports.entries.from.a.JDK.1.1.x.style.identity.database",
-                "\u4ECE JDK 1.1.x \u6837\u5F0F\u7684\u8EAB\u4EFD\u6570\u636E\u5E93\u5BFC\u5165\u6761\u76EE"}, //-identitydb
-        {"Imports.a.certificate.or.a.certificate.chain",
-                "\u5BFC\u5165\u8BC1\u4E66\u6216\u8BC1\u4E66\u94FE"}, //-importcert
-        {"Imports.a.password",
-                "\u5BFC\u5165\u53E3\u4EE4"}, //-importpass
-        {"Imports.one.or.all.entries.from.another.keystore",
-                "\u4ECE\u5176\u4ED6\u5BC6\u94A5\u5E93\u5BFC\u5165\u4E00\u4E2A\u6216\u6240\u6709\u6761\u76EE"}, //-importkeystore
-        {"Clones.a.key.entry",
-                "\u514B\u9686\u5BC6\u94A5\u6761\u76EE"}, //-keyclone
-        {"Changes.the.key.password.of.an.entry",
-                "\u66F4\u6539\u6761\u76EE\u7684\u5BC6\u94A5\u53E3\u4EE4"}, //-keypasswd
-        {"Lists.entries.in.a.keystore",
-                "\u5217\u51FA\u5BC6\u94A5\u5E93\u4E2D\u7684\u6761\u76EE"}, //-list
-        {"Prints.the.content.of.a.certificate",
-                "\u6253\u5370\u8BC1\u4E66\u5185\u5BB9"}, //-printcert
-        {"Prints.the.content.of.a.certificate.request",
-                "\u6253\u5370\u8BC1\u4E66\u8BF7\u6C42\u7684\u5185\u5BB9"}, //-printcertreq
-        {"Prints.the.content.of.a.CRL.file",
-                "\u6253\u5370 CRL \u6587\u4EF6\u7684\u5185\u5BB9"}, //-printcrl
-        {"Generates.a.self.signed.certificate",
-                "\u751F\u6210\u81EA\u7B7E\u540D\u8BC1\u4E66"}, //-selfcert
-        {"Changes.the.store.password.of.a.keystore",
-                "\u66F4\u6539\u5BC6\u94A5\u5E93\u7684\u5B58\u50A8\u53E3\u4EE4"}, //-storepasswd
-        {"showinfo.command.help", "\u663E\u793A\u5B89\u5168\u76F8\u5173\u4FE1\u606F"},
-        {"Prints.the.program.version", "\u8F93\u51FA\u7A0B\u5E8F\u7248\u672C"},
-
-        // keytool: help: options
-        {"alias.name.of.the.entry.to.process",
-                "\u8981\u5904\u7406\u7684\u6761\u76EE\u7684\u522B\u540D"}, //-alias
-        {"groupname.option.help",
-                "\u7EC4\u540D\u3002\u4F8B\u5982\uFF0C\u692D\u5706\u66F2\u7EBF\u540D\u79F0\u3002"}, //-groupname
-        {"destination.alias",
-                "\u76EE\u6807\u522B\u540D"}, //-destalias
-        {"destination.key.password",
-                "\u76EE\u6807\u5BC6\u94A5\u53E3\u4EE4"}, //-destkeypass
-        {"destination.keystore.name",
-                "\u76EE\u6807\u5BC6\u94A5\u5E93\u540D\u79F0"}, //-destkeystore
-        {"destination.keystore.password.protected",
-                "\u53D7\u4FDD\u62A4\u7684\u76EE\u6807\u5BC6\u94A5\u5E93\u53E3\u4EE4"}, //-destprotected
-        {"destination.keystore.provider.name",
-                "\u76EE\u6807\u5BC6\u94A5\u5E93\u63D0\u4F9B\u65B9\u540D\u79F0"}, //-destprovidername
-        {"destination.keystore.password",
-                "\u76EE\u6807\u5BC6\u94A5\u5E93\u53E3\u4EE4"}, //-deststorepass
-        {"destination.keystore.type",
-                "\u76EE\u6807\u5BC6\u94A5\u5E93\u7C7B\u578B"}, //-deststoretype
-        {"distinguished.name",
-                "\u552F\u4E00\u5224\u522B\u540D"}, //-dname
-        {"X.509.extension",
-                "X.509 \u6269\u5C55"}, //-ext
-        {"output.file.name",
-                "\u8F93\u51FA\u6587\u4EF6\u540D"}, //-file and -outfile
-        {"input.file.name",
-                "\u8F93\u5165\u6587\u4EF6\u540D"}, //-file and -infile
-        {"key.algorithm.name",
-                "\u5BC6\u94A5\u7B97\u6CD5\u540D\u79F0"}, //-keyalg
-        {"key.password",
-                "\u5BC6\u94A5\u53E3\u4EE4"}, //-keypass
-        {"key.bit.size",
-                "\u5BC6\u94A5\u4F4D\u5927\u5C0F"}, //-keysize
-        {"keystore.name",
-                "\u5BC6\u94A5\u5E93\u540D\u79F0"}, //-keystore
-        {"access.the.cacerts.keystore",
-                "\u8BBF\u95EE cacerts \u5BC6\u94A5\u5E93"}, // -cacerts
-        {"warning.cacerts.option",
-                "\u8B66\u544A: \u4F7F\u7528 -cacerts \u9009\u9879\u8BBF\u95EE cacerts \u5BC6\u94A5\u5E93"},
-        {"new.password",
-                "\u65B0\u53E3\u4EE4"}, //-new
-        {"do.not.prompt",
-                "\u4E0D\u63D0\u793A"}, //-noprompt
-        {"password.through.protected.mechanism",
-                "\u901A\u8FC7\u53D7\u4FDD\u62A4\u7684\u673A\u5236\u7684\u53E3\u4EE4"}, //-protected
-        {"tls.option.help", "\u663E\u793A TLS \u914D\u7F6E\u4FE1\u606F"},
-
-        // The following 2 values should span 2 lines, the first for the
-        // option itself, the second for its -providerArg value.
-        {"addprovider.option",
-                "\u6309\u540D\u79F0 (\u4F8B\u5982 SunPKCS11) \u6DFB\u52A0\u5B89\u5168\u63D0\u4F9B\u65B9\n\u914D\u7F6E -addprovider \u7684\u53C2\u6570"}, //-addprovider
-        {"provider.class.option",
-                "\u6309\u5168\u9650\u5B9A\u7C7B\u540D\u6DFB\u52A0\u5B89\u5168\u63D0\u4F9B\u65B9\n\u914D\u7F6E -providerclass \u7684\u53C2\u6570"}, //-providerclass
-
-        {"provider.name",
-                "\u63D0\u4F9B\u65B9\u540D\u79F0"}, //-providername
-        {"provider.classpath",
-                "\u63D0\u4F9B\u65B9\u7C7B\u8DEF\u5F84"}, //-providerpath
-        {"output.in.RFC.style",
-                "\u4EE5 RFC \u6837\u5F0F\u8F93\u51FA"}, //-rfc
-        {"signature.algorithm.name",
-                "\u7B7E\u540D\u7B97\u6CD5\u540D\u79F0"}, //-sigalg
-        {"signer.alias",
-                "\u7B7E\u540D\u8005\u522B\u540D"}, //-signer
-        {"signer.key.password",
-                "\u7B7E\u540D\u8005\u5BC6\u94A5\u5BC6\u7801"}, //-signerkeypass
-        {"source.alias",
-                "\u6E90\u522B\u540D"}, //-srcalias
-        {"source.key.password",
-                "\u6E90\u5BC6\u94A5\u53E3\u4EE4"}, //-srckeypass
-        {"source.keystore.name",
-                "\u6E90\u5BC6\u94A5\u5E93\u540D\u79F0"}, //-srckeystore
-        {"source.keystore.password.protected",
-                "\u53D7\u4FDD\u62A4\u7684\u6E90\u5BC6\u94A5\u5E93\u53E3\u4EE4"}, //-srcprotected
-        {"source.keystore.provider.name",
-                "\u6E90\u5BC6\u94A5\u5E93\u63D0\u4F9B\u65B9\u540D\u79F0"}, //-srcprovidername
-        {"source.keystore.password",
-                "\u6E90\u5BC6\u94A5\u5E93\u53E3\u4EE4"}, //-srcstorepass
-        {"source.keystore.type",
-                "\u6E90\u5BC6\u94A5\u5E93\u7C7B\u578B"}, //-srcstoretype
-        {"SSL.server.host.and.port",
-                "SSL \u670D\u52A1\u5668\u4E3B\u673A\u548C\u7AEF\u53E3"}, //-sslserver
-        {"signed.jar.file",
-                "\u5DF2\u7B7E\u540D\u7684 jar \u6587\u4EF6"}, //=jarfile
-        {"certificate.validity.start.date.time",
-                "\u8BC1\u4E66\u6709\u6548\u671F\u5F00\u59CB\u65E5\u671F/\u65F6\u95F4"}, //-startdate
-        {"keystore.password",
-                "\u5BC6\u94A5\u5E93\u53E3\u4EE4"}, //-storepass
-        {"keystore.type",
-                "\u5BC6\u94A5\u5E93\u7C7B\u578B"}, //-storetype
-        {"trust.certificates.from.cacerts",
-                "\u4FE1\u4EFB\u6765\u81EA cacerts \u7684\u8BC1\u4E66"}, //-trustcacerts
-        {"verbose.output",
-                "\u8BE6\u7EC6\u8F93\u51FA"}, //-v
-        {"validity.number.of.days",
-                "\u6709\u6548\u5929\u6570"}, //-validity
-        {"Serial.ID.of.cert.to.revoke",
-                 "\u8981\u64A4\u9500\u7684\u8BC1\u4E66\u7684\u5E8F\u5217 ID"}, //-id
-        // keytool: Running part
-        {"keytool.error.", "keytool \u9519\u8BEF: "},
-        {"Illegal.option.", "\u975E\u6CD5\u9009\u9879:  "},
-        {"Illegal.value.", "\u975E\u6CD5\u503C: "},
-        {"Unknown.password.type.", "\u672A\u77E5\u53E3\u4EE4\u7C7B\u578B: "},
-        {"Cannot.find.environment.variable.",
-                "\u627E\u4E0D\u5230\u73AF\u5883\u53D8\u91CF: "},
-        {"Cannot.find.file.", "\u627E\u4E0D\u5230\u6587\u4EF6: "},
-        {"Command.option.flag.needs.an.argument.", "\u547D\u4EE4\u9009\u9879{0}\u9700\u8981\u4E00\u4E2A\u53C2\u6570\u3002"},
-        {"Warning.Different.store.and.key.passwords.not.supported.for.PKCS12.KeyStores.Ignoring.user.specified.command.value.",
-                "\u8B66\u544A: PKCS12 \u5BC6\u94A5\u5E93\u4E0D\u652F\u6301\u5176\u4ED6\u5B58\u50A8\u548C\u5BC6\u94A5\u53E3\u4EE4\u3002\u6B63\u5728\u5FFD\u7565\u7528\u6237\u6307\u5B9A\u7684{0}\u503C\u3002"},
-        {"the.keystore.or.storetype.option.cannot.be.used.with.the.cacerts.option",
-            "-keystore \u6216 -storetype \u9009\u9879\u4E0D\u80FD\u4E0E -cacerts \u9009\u9879\u4E00\u8D77\u4F7F\u7528"},
-        {".keystore.must.be.NONE.if.storetype.is.{0}",
-                "\u5982\u679C -storetype \u4E3A {0}, \u5219 -keystore \u5FC5\u987B\u4E3A NONE"},
-        {"Too.many.retries.program.terminated",
-                 "\u91CD\u8BD5\u6B21\u6570\u8FC7\u591A, \u7A0B\u5E8F\u5DF2\u7EC8\u6B62"},
-        {".storepasswd.and.keypasswd.commands.not.supported.if.storetype.is.{0}",
-                "\u5982\u679C -storetype \u4E3A {0}, \u5219\u4E0D\u652F\u6301 -storepasswd \u548C -keypasswd \u547D\u4EE4"},
-        {".keypasswd.commands.not.supported.if.storetype.is.PKCS12",
-                "\u5982\u679C -storetype \u4E3A PKCS12, \u5219\u4E0D\u652F\u6301 -keypasswd \u547D\u4EE4"},
-        {".keypass.and.new.can.not.be.specified.if.storetype.is.{0}",
-                "\u5982\u679C -storetype \u4E3A {0}, \u5219\u4E0D\u80FD\u6307\u5B9A -keypass \u548C -new"},
-        {"if.protected.is.specified.then.storepass.keypass.and.new.must.not.be.specified",
-                "\u5982\u679C\u6307\u5B9A\u4E86 -protected, \u5219\u4E0D\u80FD\u6307\u5B9A -storepass, -keypass \u548C -new"},
-        {"if.srcprotected.is.specified.then.srcstorepass.and.srckeypass.must.not.be.specified",
-                "\u5982\u679C\u6307\u5B9A\u4E86 -srcprotected, \u5219\u4E0D\u80FD\u6307\u5B9A -srcstorepass \u548C -srckeypass"},
-        {"if.keystore.is.not.password.protected.then.storepass.keypass.and.new.must.not.be.specified",
-                "\u5982\u679C\u5BC6\u94A5\u5E93\u672A\u53D7\u53E3\u4EE4\u4FDD\u62A4, \u5219\u4E0D\u80FD\u6307\u5B9A -storepass, -keypass \u548C -new"},
-        {"if.source.keystore.is.not.password.protected.then.srcstorepass.and.srckeypass.must.not.be.specified",
-                "\u5982\u679C\u6E90\u5BC6\u94A5\u5E93\u672A\u53D7\u53E3\u4EE4\u4FDD\u62A4, \u5219\u4E0D\u80FD\u6307\u5B9A -srcstorepass \u548C -srckeypass"},
-        {"Illegal.startdate.value", "\u975E\u6CD5\u5F00\u59CB\u65E5\u671F\u503C"},
-        {"Validity.must.be.greater.than.zero",
-                "\u6709\u6548\u6027\u5FC5\u987B\u5927\u4E8E\u96F6"},
-        {"provclass.not.a.provider", "%s\u4E0D\u662F\u63D0\u4F9B\u65B9"},
-        {"provider.name.not.found", "\u672A\u627E\u5230\u540D\u4E3A \"%s\" \u7684\u63D0\u4F9B\u65B9"},
-        {"provider.class.not.found", "\u672A\u627E\u5230\u63D0\u4F9B\u65B9 \"%s\""},
-        {"Usage.error.no.command.provided", "\u7528\u6CD5\u9519\u8BEF: \u6CA1\u6709\u63D0\u4F9B\u547D\u4EE4"},
-        {"Source.keystore.file.exists.but.is.empty.", "\u6E90\u5BC6\u94A5\u5E93\u6587\u4EF6\u5B58\u5728, \u4F46\u4E3A\u7A7A: "},
-        {"Please.specify.srckeystore", "\u8BF7\u6307\u5B9A -srckeystore"},
-        {"Must.not.specify.both.v.and.rfc.with.list.command",
-                "\u4E0D\u80FD\u4F7F\u7528 'list' \u547D\u4EE4\u6765\u6307\u5B9A -v \u53CA -rfc"},
-        {"Key.password.must.be.at.least.6.characters",
-                "\u5BC6\u94A5\u53E3\u4EE4\u81F3\u5C11\u5FC5\u987B\u4E3A 6 \u4E2A\u5B57\u7B26"},
-        {"New.password.must.be.at.least.6.characters",
-                "\u65B0\u53E3\u4EE4\u81F3\u5C11\u5FC5\u987B\u4E3A 6 \u4E2A\u5B57\u7B26"},
-        {"Keystore.file.exists.but.is.empty.",
-                "\u5BC6\u94A5\u5E93\u6587\u4EF6\u5B58\u5728, \u4F46\u4E3A\u7A7A: "},
-        {"Keystore.file.does.not.exist.",
-                "\u5BC6\u94A5\u5E93\u6587\u4EF6\u4E0D\u5B58\u5728: "},
-        {"Must.specify.destination.alias", "\u5FC5\u987B\u6307\u5B9A\u76EE\u6807\u522B\u540D"},
-        {"Must.specify.alias", "\u5FC5\u987B\u6307\u5B9A\u522B\u540D"},
-        {"Keystore.password.must.be.at.least.6.characters",
-                "\u5BC6\u94A5\u5E93\u53E3\u4EE4\u81F3\u5C11\u5FC5\u987B\u4E3A 6 \u4E2A\u5B57\u7B26"},
-        {"Enter.the.password.to.be.stored.",
-                "\u8F93\u5165\u8981\u5B58\u50A8\u7684\u53E3\u4EE4:  "},
-        {"Enter.keystore.password.", "\u8F93\u5165\u5BC6\u94A5\u5E93\u53E3\u4EE4:  "},
-        {"Enter.source.keystore.password.", "\u8F93\u5165\u6E90\u5BC6\u94A5\u5E93\u53E3\u4EE4:  "},
-        {"Enter.destination.keystore.password.", "\u8F93\u5165\u76EE\u6807\u5BC6\u94A5\u5E93\u53E3\u4EE4:  "},
-        {"Keystore.password.is.too.short.must.be.at.least.6.characters",
-         "\u5BC6\u94A5\u5E93\u53E3\u4EE4\u592A\u77ED - \u81F3\u5C11\u5FC5\u987B\u4E3A 6 \u4E2A\u5B57\u7B26"},
-        {"Unknown.Entry.Type", "\u672A\u77E5\u6761\u76EE\u7C7B\u578B"},
-        {"Entry.for.alias.alias.successfully.imported.",
-                 "\u5DF2\u6210\u529F\u5BFC\u5165\u522B\u540D {0} \u7684\u6761\u76EE\u3002"},
-        {"Entry.for.alias.alias.not.imported.", "\u672A\u5BFC\u5165\u522B\u540D {0} \u7684\u6761\u76EE\u3002"},
-        {"Problem.importing.entry.for.alias.alias.exception.Entry.for.alias.alias.not.imported.",
-                 "\u5BFC\u5165\u522B\u540D {0} \u7684\u6761\u76EE\u65F6\u51FA\u73B0\u95EE\u9898: {1}\u3002\n\u672A\u5BFC\u5165\u522B\u540D {0} \u7684\u6761\u76EE\u3002"},
-        {"Import.command.completed.ok.entries.successfully.imported.fail.entries.failed.or.cancelled",
-                 "\u5DF2\u5B8C\u6210\u5BFC\u5165\u547D\u4EE4: {0} \u4E2A\u6761\u76EE\u6210\u529F\u5BFC\u5165, {1} \u4E2A\u6761\u76EE\u5931\u8D25\u6216\u53D6\u6D88"},
-        {"Warning.Overwriting.existing.alias.alias.in.destination.keystore",
-                 "\u8B66\u544A: \u6B63\u5728\u8986\u76D6\u76EE\u6807\u5BC6\u94A5\u5E93\u4E2D\u7684\u73B0\u6709\u522B\u540D {0}"},
-        {"Existing.entry.alias.alias.exists.overwrite.no.",
-                 "\u5B58\u5728\u73B0\u6709\u6761\u76EE\u522B\u540D {0}, \u662F\u5426\u8986\u76D6? [\u5426]:  "},
-        {"Too.many.failures.try.later", "\u6545\u969C\u592A\u591A - \u8BF7\u7A0D\u540E\u518D\u8BD5"},
-        {"Certification.request.stored.in.file.filename.",
-                "\u5B58\u50A8\u5728\u6587\u4EF6 <{0}> \u4E2D\u7684\u8BA4\u8BC1\u8BF7\u6C42"},
-        {"Submit.this.to.your.CA", "\u5C06\u6B64\u63D0\u4EA4\u7ED9\u60A8\u7684 CA"},
-        {"if.alias.not.specified.destalias.and.srckeypass.must.not.be.specified",
-            "\u5982\u679C\u6CA1\u6709\u6307\u5B9A\u522B\u540D, \u5219\u4E0D\u80FD\u6307\u5B9A\u76EE\u6807\u522B\u540D\u548C\u6E90\u5BC6\u94A5\u5E93\u53E3\u4EE4"},
-        {"The.destination.pkcs12.keystore.has.different.storepass.and.keypass.Please.retry.with.destkeypass.specified.",
-            "\u76EE\u6807 pkcs12 \u5BC6\u94A5\u5E93\u5177\u6709\u4E0D\u540C\u7684 storepass \u548C keypass\u3002\u8BF7\u5728\u6307\u5B9A\u4E86 -destkeypass \u65F6\u91CD\u8BD5\u3002"},
-        {"Certificate.stored.in.file.filename.",
-                "\u5B58\u50A8\u5728\u6587\u4EF6 <{0}> \u4E2D\u7684\u8BC1\u4E66"},
-        {"Certificate.reply.was.installed.in.keystore",
-                "\u8BC1\u4E66\u56DE\u590D\u5DF2\u5B89\u88C5\u5728\u5BC6\u94A5\u5E93\u4E2D"},
-        {"Certificate.reply.was.not.installed.in.keystore",
-                "\u8BC1\u4E66\u56DE\u590D\u672A\u5B89\u88C5\u5728\u5BC6\u94A5\u5E93\u4E2D"},
-        {"Certificate.was.added.to.keystore",
-                "\u8BC1\u4E66\u5DF2\u6DFB\u52A0\u5230\u5BC6\u94A5\u5E93\u4E2D"},
-        {"Certificate.was.not.added.to.keystore",
-                "\u8BC1\u4E66\u672A\u6DFB\u52A0\u5230\u5BC6\u94A5\u5E93\u4E2D"},
-        {".Storing.ksfname.", "[\u6B63\u5728\u5B58\u50A8{0}]"},
-        {"alias.has.no.public.key.certificate.",
-                "{0}\u6CA1\u6709\u516C\u5171\u5BC6\u94A5 (\u8BC1\u4E66)"},
-        {"Cannot.derive.signature.algorithm",
-                "\u65E0\u6CD5\u6D3E\u751F\u7B7E\u540D\u7B97\u6CD5"},
-        {"Alias.alias.does.not.exist",
-                "\u522B\u540D <{0}> \u4E0D\u5B58\u5728"},
-        {"Alias.alias.has.no.certificate",
-                "\u522B\u540D <{0}> \u6CA1\u6709\u8BC1\u4E66"},
-        {"groupname.keysize.coexist",
-                "\u65E0\u6CD5\u540C\u65F6\u6307\u5B9A -groupname \u548C -keysize"},
-        {"deprecate.keysize.for.ec",
-                "\u4E3A\u751F\u6210 EC \u5BC6\u94A5\u6307\u5B9A -keysize \u5DF2\u8FC7\u65F6\uFF0C\u8BF7\u6539\u4E3A\u4F7F\u7528 \"-groupname %s\"\u3002"},
-        {"Key.pair.not.generated.alias.alias.already.exists",
-                "\u672A\u751F\u6210\u5BC6\u94A5\u5BF9, \u522B\u540D <{0}> \u5DF2\u7ECF\u5B58\u5728"},
-        {"size.bit.alg",
-                "%1$d \u4F4D %2$s"},
-        {"Generating.full.keyAlgName.key.pair.and.self.signed.certificate.sigAlgName.with.a.validity.of.days.for",
-                "\u6B63\u5728\u4E3A {3} \u751F\u6210\u6709\u6548\u671F\u4E3A {2} \u5929\u7684 {0} \u5BC6\u94A5\u5BF9\u548C\u81EA\u7B7E\u540D\u8BC1\u4E66 ({1})\n"},
-        {"Generating.full.keyAlgName.key.pair.and.a.certificate.sigAlgName.issued.by.signerAlias.with.a.validity.of.days.for",
-                "\u751F\u6210 {0} \u5BC6\u94A5\u5BF9\u548C <{2}> \u9881\u53D1\u7684\u8BC1\u4E66 ({1})\uFF0C\u6709\u6548\u671F\u4E3A {3} \u5929 \n\t \u5BF9\u4E8E\uFF1A{4}"},
-        {"Enter.key.password.for.alias.", "\u8F93\u5165 <{0}> \u7684\u5BC6\u94A5\u53E3\u4EE4"},
-        {".RETURN.if.same.as.keystore.password.",
-                "\t(\u5982\u679C\u548C\u5BC6\u94A5\u5E93\u53E3\u4EE4\u76F8\u540C, \u6309\u56DE\u8F66):  "},
-        {"Key.password.is.too.short.must.be.at.least.6.characters",
-                "\u5BC6\u94A5\u53E3\u4EE4\u592A\u77ED - \u81F3\u5C11\u5FC5\u987B\u4E3A 6 \u4E2A\u5B57\u7B26"},
-        {"Too.many.failures.key.not.added.to.keystore",
-                "\u6545\u969C\u592A\u591A - \u5BC6\u94A5\u672A\u6DFB\u52A0\u5230\u5BC6\u94A5\u5E93\u4E2D"},
-        {"Destination.alias.dest.already.exists",
-                "\u76EE\u6807\u522B\u540D <{0}> \u5DF2\u7ECF\u5B58\u5728"},
-        {"Password.is.too.short.must.be.at.least.6.characters",
-                "\u53E3\u4EE4\u592A\u77ED - \u81F3\u5C11\u5FC5\u987B\u4E3A 6 \u4E2A\u5B57\u7B26"},
-        {"Too.many.failures.Key.entry.not.cloned",
-                "\u6545\u969C\u592A\u591A\u3002\u672A\u514B\u9686\u5BC6\u94A5\u6761\u76EE"},
-        {"key.password.for.alias.", "<{0}> \u7684\u5BC6\u94A5\u53E3\u4EE4"},
-        {"No.entries.from.identity.database.added",
-                "\u672A\u4ECE\u8EAB\u4EFD\u6570\u636E\u5E93\u4E2D\u6DFB\u52A0\u4EFB\u4F55\u6761\u76EE"},
-        {"Alias.name.alias", "\u522B\u540D: {0}"},
-        {"Creation.date.keyStore.getCreationDate.alias.",
-                "\u521B\u5EFA\u65E5\u671F: {0,date}"},
-        {"alias.keyStore.getCreationDate.alias.",
-                "{0}, {1,date}, "},
-        {"alias.", "{0}, "},
-        {"Entry.type.type.", "\u6761\u76EE\u7C7B\u578B: {0}"},
-        {"Certificate.chain.length.", "\u8BC1\u4E66\u94FE\u957F\u5EA6: "},
-        {"Certificate.i.1.", "\u8BC1\u4E66[{0,number,integer}]:"},
-        {"Certificate.fingerprint.SHA.256.", "\u8BC1\u4E66\u6307\u7EB9 (SHA-256): "},
-        {"Keystore.type.", "\u5BC6\u94A5\u5E93\u7C7B\u578B: "},
-        {"Keystore.provider.", "\u5BC6\u94A5\u5E93\u63D0\u4F9B\u65B9: "},
-        {"Your.keystore.contains.keyStore.size.entry",
-                "\u60A8\u7684\u5BC6\u94A5\u5E93\u5305\u542B {0,number,integer} \u4E2A\u6761\u76EE"},
-        {"Your.keystore.contains.keyStore.size.entries",
-                "\u60A8\u7684\u5BC6\u94A5\u5E93\u5305\u542B {0,number,integer} \u4E2A\u6761\u76EE"},
-        {"Failed.to.parse.input", "\u65E0\u6CD5\u89E3\u6790\u8F93\u5165"},
-        {"Empty.input", "\u7A7A\u8F93\u5165"},
-        {"Not.X.509.certificate", "\u975E X.509 \u8BC1\u4E66"},
-        {"alias.has.no.public.key", "{0}\u6CA1\u6709\u516C\u5171\u5BC6\u94A5"},
-        {"alias.has.no.X.509.certificate", "{0}\u6CA1\u6709 X.509 \u8BC1\u4E66"},
-        {"New.certificate.self.signed.", "\u65B0\u8BC1\u4E66 (\u81EA\u7B7E\u540D):"},
-        {"Reply.has.no.certificates", "\u56DE\u590D\u4E2D\u6CA1\u6709\u8BC1\u4E66"},
-        {"Certificate.not.imported.alias.alias.already.exists",
-                "\u8BC1\u4E66\u672A\u5BFC\u5165, \u522B\u540D <{0}> \u5DF2\u7ECF\u5B58\u5728"},
-        {"Input.not.an.X.509.certificate", "\u6240\u8F93\u5165\u7684\u4E0D\u662F X.509 \u8BC1\u4E66"},
-        {"Certificate.already.exists.in.keystore.under.alias.trustalias.",
-                "\u5728\u522B\u540D <{0}> \u4E4B\u4E0B, \u8BC1\u4E66\u5DF2\u7ECF\u5B58\u5728\u4E8E\u5BC6\u94A5\u5E93\u4E2D"},
-        {"Do.you.still.want.to.add.it.no.",
-                "\u662F\u5426\u4ECD\u8981\u6DFB\u52A0? [\u5426]:  "},
-        {"Certificate.already.exists.in.system.wide.CA.keystore.under.alias.trustalias.",
-                "\u5728\u522B\u540D <{0}> \u4E4B\u4E0B, \u8BC1\u4E66\u5DF2\u7ECF\u5B58\u5728\u4E8E\u7CFB\u7EDF\u8303\u56F4\u7684 CA \u5BC6\u94A5\u5E93\u4E2D"},
-        {"Do.you.still.want.to.add.it.to.your.own.keystore.no.",
-                "\u662F\u5426\u4ECD\u8981\u5C06\u5B83\u6DFB\u52A0\u5230\u81EA\u5DF1\u7684\u5BC6\u94A5\u5E93? [\u5426]:  "},
-        {"Trust.this.certificate.no.", "\u662F\u5426\u4FE1\u4EFB\u6B64\u8BC1\u4E66? [\u5426]:  "},
-        {"New.prompt.", "\u65B0{0}: "},
-        {"Passwords.must.differ", "\u53E3\u4EE4\u4E0D\u80FD\u76F8\u540C"},
-        {"Re.enter.new.prompt.", "\u91CD\u65B0\u8F93\u5165\u65B0{0}: "},
-        {"Re.enter.password.", "\u518D\u6B21\u8F93\u5165\u53E3\u4EE4: "},
-        {"Re.enter.new.password.", "\u518D\u6B21\u8F93\u5165\u65B0\u53E3\u4EE4: "},
-        {"They.don.t.match.Try.again", "\u5B83\u4EEC\u4E0D\u5339\u914D\u3002\u8BF7\u91CD\u8BD5"},
-        {"Enter.prompt.alias.name.", "\u8F93\u5165{0}\u522B\u540D:  "},
-        {"Enter.new.alias.name.RETURN.to.cancel.import.for.this.entry.",
-                 "\u5BFC\u5165\u65B0\u7684\u522B\u540D\t(\u6309\u56DE\u8F66\u4EE5\u53D6\u6D88\u5BF9\u6B64\u6761\u76EE\u7684\u5BFC\u5165):  "},
-        {"Enter.alias.name.", "\u8F93\u5165\u522B\u540D:  "},
-        {".RETURN.if.same.as.for.otherAlias.",
-                "\t(\u5982\u679C\u548C <{0}> \u76F8\u540C, \u5219\u6309\u56DE\u8F66)"},
-        {"enter.dname.components",
-                "\u8F93\u5165\u552F\u4E00\u5224\u522B\u540D\u3002\u63D0\u4F9B\u5355\u4E2A\u70B9 (.) \u4EE5\u5C06\u5B50\u7EC4\u4EF6\u7559\u7A7A\uFF0C\u6216\u6309 ENTER \u4EE5\u4F7F\u7528\u5927\u62EC\u53F7\u4E2D\u7684\u9ED8\u8BA4\u503C\u3002"},
-        {"What.is.your.first.and.last.name.",
-                "\u60A8\u7684\u540D\u5B57\u4E0E\u59D3\u6C0F\u662F\u4EC0\u4E48?"},
-        {"What.is.the.name.of.your.organizational.unit.",
-                "\u60A8\u7684\u7EC4\u7EC7\u5355\u4F4D\u540D\u79F0\u662F\u4EC0\u4E48?"},
-        {"What.is.the.name.of.your.organization.",
-                "\u60A8\u7684\u7EC4\u7EC7\u540D\u79F0\u662F\u4EC0\u4E48?"},
-        {"What.is.the.name.of.your.City.or.Locality.",
-                "\u60A8\u6240\u5728\u7684\u57CE\u5E02\u6216\u533A\u57DF\u540D\u79F0\u662F\u4EC0\u4E48?"},
-        {"What.is.the.name.of.your.State.or.Province.",
-                "\u60A8\u6240\u5728\u7684\u7701/\u5E02/\u81EA\u6CBB\u533A\u540D\u79F0\u662F\u4EC0\u4E48?"},
-        {"What.is.the.two.letter.country.code.for.this.unit.",
-                "\u8BE5\u5355\u4F4D\u7684\u53CC\u5B57\u6BCD\u56FD\u5BB6/\u5730\u533A\u4EE3\u7801\u662F\u4EC0\u4E48?"},
-        {"no.field.in.dname",
-                "\u5FC5\u987B\u81F3\u5C11\u63D0\u4F9B\u4E00\u4E2A\u5B57\u6BB5\u3002\u8BF7\u518D\u6B21\u8F93\u5165\u3002"},
-        {"Is.name.correct.", "{0}\u662F\u5426\u6B63\u786E?"},
-        {"no", "\u5426"},
-        {"yes", "\u662F"},
-        {"y", "y"},
-        {".defaultValue.", "  [{0}]:  "},
-        {"Alias.alias.has.no.key",
-                "\u522B\u540D <{0}> \u6CA1\u6709\u5BC6\u94A5"},
-        {"Alias.alias.references.an.entry.type.that.is.not.a.private.key.entry.The.keyclone.command.only.supports.cloning.of.private.key",
-                 "\u522B\u540D <{0}> \u5F15\u7528\u4E86\u4E0D\u5C5E\u4E8E\u79C1\u6709\u5BC6\u94A5\u6761\u76EE\u7684\u6761\u76EE\u7C7B\u578B\u3002-keyclone \u547D\u4EE4\u4EC5\u652F\u6301\u5BF9\u79C1\u6709\u5BC6\u94A5\u6761\u76EE\u7684\u514B\u9686"},
-
-        {".WARNING.WARNING.WARNING.",
-            "*****************  WARNING WARNING WARNING  *****************"},
-        {"Signer.d.", "\u7B7E\u540D\u8005 #%d:"},
-        {"Certificate.d.", "\u8BC1\u4E66 #%d\uFF1A"},
-        {"Timestamp.", "\u65F6\u95F4\u6233:"},
-        {"Certificate.owner.", "\u8BC1\u4E66\u6240\u6709\u8005: "},
-        {"Not.a.signed.jar.file", "\u4E0D\u662F\u5DF2\u7B7E\u540D\u7684 jar \u6587\u4EF6"},
-        {"No.certificate.from.the.SSL.server",
-                "\u6CA1\u6709\u6765\u81EA SSL \u670D\u52A1\u5668\u7684\u8BC1\u4E66"},
-
-        {".The.integrity.of.the.information.stored.in.your.keystore.",
-            "* \u5B58\u50A8\u5728\u60A8\u7684\u5BC6\u94A5\u5E93\u4E2D\u7684\u4FE1\u606F\u7684\u5B8C\u6574\u6027  *\n* \u5C1A\u672A\u7ECF\u8FC7\u9A8C\u8BC1!  \u4E3A\u4E86\u9A8C\u8BC1\u5176\u5B8C\u6574\u6027, *\n* \u5FC5\u987B\u63D0\u4F9B\u5BC6\u94A5\u5E93\u53E3\u4EE4\u3002                  *"},
-        {".The.integrity.of.the.information.stored.in.the.srckeystore.",
-            "* \u5B58\u50A8\u5728 srckeystore \u4E2D\u7684\u4FE1\u606F\u7684\u5B8C\u6574\u6027*\n* \u5C1A\u672A\u7ECF\u8FC7\u9A8C\u8BC1!  \u4E3A\u4E86\u9A8C\u8BC1\u5176\u5B8C\u6574\u6027, *\n* \u5FC5\u987B\u63D0\u4F9B\u6E90\u5BC6\u94A5\u5E93\u53E3\u4EE4\u3002                  *"},
-
-        {"Certificate.reply.does.not.contain.public.key.for.alias.",
-                "\u8BC1\u4E66\u56DE\u590D\u4E2D\u4E0D\u5305\u542B <{0}> \u7684\u516C\u5171\u5BC6\u94A5"},
-        {"Incomplete.certificate.chain.in.reply",
-                "\u56DE\u590D\u4E2D\u7684\u8BC1\u4E66\u94FE\u4E0D\u5B8C\u6574"},
-        {"Top.level.certificate.in.reply.",
-                "\u56DE\u590D\u4E2D\u7684\u9876\u7EA7\u8BC1\u4E66:\n"},
-        {".is.not.trusted.", "... \u662F\u4E0D\u53EF\u4FE1\u7684\u3002"},
-        {"Install.reply.anyway.no.", "\u662F\u5426\u4ECD\u8981\u5B89\u88C5\u56DE\u590D? [\u5426]:  "},
-        {"Public.keys.in.reply.and.keystore.don.t.match",
-                "\u56DE\u590D\u4E2D\u7684\u516C\u5171\u5BC6\u94A5\u4E0E\u5BC6\u94A5\u5E93\u4E0D\u5339\u914D"},
-        {"Certificate.reply.and.certificate.in.keystore.are.identical",
-                "\u8BC1\u4E66\u56DE\u590D\u4E0E\u5BC6\u94A5\u5E93\u4E2D\u7684\u8BC1\u4E66\u662F\u76F8\u540C\u7684"},
-        {"Failed.to.establish.chain.from.reply",
-                "\u65E0\u6CD5\u4ECE\u56DE\u590D\u4E2D\u5EFA\u7ACB\u94FE"},
-        {"n", "n"},
-        {"Wrong.answer.try.again", "\u9519\u8BEF\u7684\u7B54\u6848, \u8BF7\u518D\u8BD5\u4E00\u6B21"},
-        {"Secret.key.not.generated.alias.alias.already.exists",
-                "\u6CA1\u6709\u751F\u6210\u5BC6\u94A5, \u522B\u540D <{0}> \u5DF2\u7ECF\u5B58\u5728"},
-        {"Please.provide.keysize.for.secret.key.generation",
-                "\u8BF7\u63D0\u4F9B -keysize \u4EE5\u751F\u6210\u5BC6\u94A5"},
-
-        {"warning.not.verified.make.sure.keystore.is.correct",
-            "\u8B66\u544A: \u672A\u9A8C\u8BC1\u3002\u8BF7\u786E\u4FDD\u5BC6\u94A5\u5E93\u662F\u6B63\u786E\u7684\u3002"},
-        {"warning.not.verified.make.sure.keystore.is.correct.or.specify.trustcacerts",
-            "\u8B66\u544A\uFF1A\u672A\u9A8C\u8BC1\u3002\u8BF7\u786E\u4FDD\u5BC6\u94A5\u5E93\u662F\u6B63\u786E\u7684\uFF0C\u6216\u8005\u6307\u5B9A -trustcacerts\u3002"},
-
-        {"Extensions.", "\u6269\u5C55: "},
-        {".Empty.value.", "(\u7A7A\u503C)"},
-        {"Extension.Request.", "\u6269\u5C55\u8BF7\u6C42:"},
-        {"Unknown.keyUsage.type.", "\u672A\u77E5 keyUsage \u7C7B\u578B: "},
-        {"Unknown.extendedkeyUsage.type.", "\u672A\u77E5 extendedkeyUsage \u7C7B\u578B: "},
-        {"Unknown.AccessDescription.type.", "\u672A\u77E5 AccessDescription \u7C7B\u578B: "},
-        {"Unrecognized.GeneralName.type.", "\u65E0\u6CD5\u8BC6\u522B\u7684 GeneralName \u7C7B\u578B: "},
-        {"This.extension.cannot.be.marked.as.critical.",
-                 "\u65E0\u6CD5\u5C06\u6B64\u6269\u5C55\u6807\u8BB0\u4E3A\u201C\u4E25\u91CD\u201D\u3002"},
-        {"Odd.number.of.hex.digits.found.", "\u627E\u5230\u5947\u6570\u4E2A\u5341\u516D\u8FDB\u5236\u6570\u5B57: "},
-        {"Unknown.extension.type.", "\u672A\u77E5\u6269\u5C55\u7C7B\u578B: "},
-        {"command.{0}.is.ambiguous.", "\u547D\u4EE4{0}\u4E0D\u660E\u786E:"},
-
-        // 8171319: keytool should print out warnings when reading or
-        // generating cert/cert req using weak algorithms
-        {"the.certificate.request", "\u8BC1\u4E66\u8BF7\u6C42"},
-        {"the.issuer", "\u53D1\u5E03\u8005"},
-        {"the.generated.secretkey", "\u751F\u6210\u7684\u5BC6\u94A5"},
-        {"the.generated.certificate", "\u751F\u6210\u7684\u8BC1\u4E66"},
-        {"the.generated.crl", "\u751F\u6210\u7684 CRL"},
-        {"the.generated.certificate.request", "\u751F\u6210\u7684\u8BC1\u4E66\u8BF7\u6C42"},
-        {"the.certificate", "\u8BC1\u4E66"},
-        {"the.crl", "CRL"},
-        {"the.tsa.certificate", "TSA \u8BC1\u4E66"},
-        {"the.input", "\u8F93\u5165"},
-        {"reply", "\u56DE\u590D"},
-        {"one.in.many", "%1$s #%2$d/%3$d"},
-        {"one.in.many1", "%1$s #%2$d"},
-        {"one.in.many2", "\u7B7E\u540D\u8005 #%2$d \u7684 %1$s"},
-        {"one.in.many3", "\u7B7E\u540D\u8005 #%3$d \u7684 %1$s #%2$d"},
-        {"alias.in.cacerts", "cacerts \u4E2D\u7684\u53D1\u5E03\u8005 <%s>"},
-        {"alias.in.keystore", "\u53D1\u5E03\u8005 <%s>"},
-        {"with.weak", "%s (\u5F31)"},
-        {"with.disabled", "%s\uFF08\u7981\u7528\uFF09"},
-        {"key.bit", "%s \u5BC6\u94A5"},
-        {"key.bit.weak", "%s \u5BC6\u94A5\uFF08\u5F31\uFF09"},
-        {"key.bit.disabled", "%s \u5BC6\u94A5\uFF08\u5DF2\u7981\u7528\uFF09"},
-        {".PATTERN.printX509Cert.with.weak",
-                "\u6240\u6709\u8005: {0}\n\u53D1\u5E03\u8005: {1}\n\u5E8F\u5217\u53F7: {2}\n\u751F\u6548\u65F6\u95F4: {3}, \u5931\u6548\u65F6\u95F4: {4}\n\u8BC1\u4E66\u6307\u7EB9:\n\t SHA1: {5}\n\t SHA256: {6}\n\u7B7E\u540D\u7B97\u6CD5\u540D\u79F0: {7}\n\u4E3B\u4F53\u516C\u5171\u5BC6\u94A5\u7B97\u6CD5: {8}\n\u7248\u672C: {9}"},
-        {"PKCS.10.with.weak",
-                "PKCS #10 \u8BC1\u4E66\u8BF7\u6C42 (\u7248\u672C 1.0)\n\u4E3B\u4F53: %1$s\n\u683C\u5F0F: %2$s\n\u516C\u5171\u5BC6\u94A5: %3$s\n\u7B7E\u540D\u7B97\u6CD5: %4$s\n"},
-        {"verified.by.s.in.s.weak", "\u7531 %2$s \u4E2D\u7684 %1$s \u4EE5 %3$s \u9A8C\u8BC1"},
-        {"whose.sigalg.disabled", "%1$s \u4F7F\u7528\u7684 %2$s \u7B7E\u540D\u7B97\u6CD5\u88AB\u89C6\u4E3A\u5B58\u5728\u5B89\u5168\u98CE\u9669\u800C\u4E14\u88AB\u7981\u7528\u3002"},
-        {"whose.sigalg.usagesignedjar", "%1$s \u4F7F\u7528\u7684 %2$s \u7B7E\u540D\u7B97\u6CD5\u88AB\u89C6\u4E3A\u5B58\u5728\u5B89\u5168\u98CE\u9669\uFF0C\u65E0\u6CD5\u7528\u4E8E\u5728 %3$s \u540E\u5BF9 JAR \u8FDB\u884C\u7B7E\u540D\u3002"},
-        {"Unable.to.parse.denyAfter.string.in.exception.message", "\u65E0\u6CD5\u89E3\u6790\u5F02\u5E38\u9519\u8BEF\u6D88\u606F\u4E2D\u7684 denyAfter \u65E5\u671F\u5B57\u7B26\u4E32"},
-        {"whose.sigalg.weak", "%1$s \u4F7F\u7528\u7684 %2$s \u7B7E\u540D\u7B97\u6CD5\u5B58\u5728\u5B89\u5168\u98CE\u9669\u3002"},
-        {"whose.key.disabled", "%1$s \u4F7F\u7528\u7684 %2$s \u88AB\u89C6\u4E3A\u5B58\u5728\u5B89\u5168\u98CE\u9669\u800C\u4E14\u88AB\u7981\u7528\u3002"},
-        {"whose.key.weak", "%1$s \u4F7F\u7528\u7684 %2$s \u88AB\u89C6\u4E3A\u5B58\u5728\u5B89\u5168\u98CE\u9669\u3002\u5728\u5C06\u6765\u7684\u66F4\u65B0\u4E2D\u5C06\u7981\u7528\u5B83\u3002"},
-        {"jks.storetype.warning", "%1$s \u5BC6\u94A5\u5E93\u4F7F\u7528\u4E13\u7528\u683C\u5F0F\u3002\u5EFA\u8BAE\u4F7F\u7528 \"keytool -importkeystore -srckeystore %2$s -destkeystore %2$s -deststoretype pkcs12\" \u8FC1\u79FB\u5230\u884C\u4E1A\u6807\u51C6\u683C\u5F0F PKCS12\u3002"},
-        {"migrate.keystore.warning", "\u5DF2\u5C06 \"%1$s\" \u8FC1\u79FB\u5230 %4$s\u3002\u5C06 %2$s \u5BC6\u94A5\u5E93\u4F5C\u4E3A \"%3$s\" \u8FDB\u884C\u4E86\u5907\u4EFD\u3002"},
-        {"backup.keystore.warning", "\u5DF2\u5C06\u539F\u59CB\u5BC6\u94A5\u5E93 \"%1$s\" \u5907\u4EFD\u4E3A \"%3$s\"..."},
-        {"importing.keystore.status", "\u6B63\u5728\u5C06\u5BC6\u94A5\u5E93 %1$s \u5BFC\u5165\u5230 %2$s..."},
-        {"keyalg.option.missing.error", "\u5FC5\u987B\u6307\u5B9A -keyalg \u9009\u9879\u3002"},
-        {"showinfo.no.option", "-showinfo \u7F3A\u5C11\u9009\u9879\u3002\u8BF7\u5C1D\u8BD5\u4F7F\u7528 \"keytool -showinfo -tls\"\u3002"},
-    };
-
-
-    /**
-     * Returns the contents of this <code>ResourceBundle</code>.
-     *
-     * <p>
-     *
-     * @return the contents of this <code>ResourceBundle</code>.
-     */
-    @Override
-    public Object[][] getContents() {
-        return contents;
-    }
-}
diff --git a/src/java.base/share/classes/sun/security/tools/keytool/Resources_zh_HK.java b/src/java.base/share/classes/sun/security/tools/keytool/Resources_zh_HK.java
deleted file mode 100644
index 89ef6076a62..00000000000
--- a/src/java.base/share/classes/sun/security/tools/keytool/Resources_zh_HK.java
+++ /dev/null
@@ -1,429 +0,0 @@
-/*
- * Copyright (c) 2000, 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.  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.tools.keytool;
-
-/**
- * This class represents the <code>ResourceBundle</code>
- * for the keytool.
- *
- */
-public class Resources_zh_HK extends java.util.ListResourceBundle {
-
-    private static final Object[][] contents = {
-        {"NEWLINE", "\n"},
-        {"STAR",
-                "*******************************************"},
-        {"STARNN",
-                "*******************************************\n\n"},
-
-        // keytool: Help part
-// "Option" should be translated.
-        {".OPTION.", " [\u9078\u9805]..."},
-        {"Options.", "\u9078\u9805:"},
-        {"Use.keytool.help.for.all.available.commands",
-                 "\u4F7F\u7528 \"keytool -help\" \u53D6\u5F97\u6240\u6709\u53EF\u7528\u7684\u547D\u4EE4"},
-        {"Key.and.Certificate.Management.Tool",
-                 "\u91D1\u9470\u8207\u6191\u8B49\u7BA1\u7406\u5DE5\u5177"},
-        {"Commands.", "\u547D\u4EE4:"},
-        {"Use.keytool.command.name.help.for.usage.of.command.name",
-                "\u4F7F\u7528 \"keytool -command_name -help\" \u53D6\u5F97 command_name \u7684\u7528\u6CD5"},
-        // keytool: help: commands
-        {"Generates.a.certificate.request",
-                "\u7522\u751F\u6191\u8B49\u8981\u6C42"}, //-certreq
-        {"Changes.an.entry.s.alias",
-                "\u8B8A\u66F4\u9805\u76EE\u7684\u5225\u540D"}, //-changealias
-        {"Deletes.an.entry",
-                "\u522A\u9664\u9805\u76EE"}, //-delete
-        {"Exports.certificate",
-                "\u532F\u51FA\u6191\u8B49"}, //-exportcert
-        {"Generates.a.key.pair",
-                "\u7522\u751F\u91D1\u9470\u7D44"}, //-genkeypair
-// translation of "secret" key should be different to "private" key.
-        {"Generates.a.secret.key",
-                "\u7522\u751F\u79D8\u5BC6\u91D1\u9470"}, //-genseckey
-        {"Generates.certificate.from.a.certificate.request",
-                "\u5F9E\u6191\u8B49\u8981\u6C42\u7522\u751F\u6191\u8B49"}, //-gencert
-        {"Generates.CRL", "\u7522\u751F CRL"}, //-gencrl
-        {"Imports.entries.from.a.JDK.1.1.x.style.identity.database",
-                "\u5F9E JDK 1.1.x-style \u8B58\u5225\u8CC7\u6599\u5EAB\u532F\u5165\u9805\u76EE"}, //-identitydb
-        {"Imports.a.certificate.or.a.certificate.chain",
-                "\u532F\u5165\u6191\u8B49\u6216\u6191\u8B49\u93C8"}, //-importcert
-        {"Imports.one.or.all.entries.from.another.keystore",
-                "\u5F9E\u5176\u4ED6\u91D1\u9470\u5132\u5B58\u5EAB\u532F\u5165\u4E00\u500B\u6216\u5168\u90E8\u9805\u76EE"}, //-importkeystore
-        {"Clones.a.key.entry",
-                "\u8907\u88FD\u91D1\u9470\u9805\u76EE"}, //-keyclone
-        {"Changes.the.key.password.of.an.entry",
-                "\u8B8A\u66F4\u9805\u76EE\u7684\u91D1\u9470\u5BC6\u78BC"}, //-keypasswd
-        {"Lists.entries.in.a.keystore",
-                "\u5217\u793A\u91D1\u9470\u5132\u5B58\u5EAB\u4E2D\u7684\u9805\u76EE"}, //-list
-        {"Prints.the.content.of.a.certificate",
-                "\u5217\u5370\u6191\u8B49\u7684\u5167\u5BB9"}, //-printcert
-        {"Prints.the.content.of.a.certificate.request",
-                "\u5217\u5370\u6191\u8B49\u8981\u6C42\u7684\u5167\u5BB9"}, //-printcertreq
-        {"Prints.the.content.of.a.CRL.file",
-                "\u5217\u5370 CRL \u6A94\u6848\u7684\u5167\u5BB9"}, //-printcrl
-        {"Generates.a.self.signed.certificate",
-                "\u7522\u751F\u81EA\u884C\u7C3D\u7F72\u7684\u6191\u8B49"}, //-selfcert
-        {"Changes.the.store.password.of.a.keystore",
-                "\u8B8A\u66F4\u91D1\u9470\u5132\u5B58\u5EAB\u7684\u5132\u5B58\u5BC6\u78BC"}, //-storepasswd
-        // keytool: help: options
-        {"alias.name.of.the.entry.to.process",
-                "\u8981\u8655\u7406\u9805\u76EE\u7684\u5225\u540D\u540D\u7A31"}, //-alias
-        {"destination.alias",
-                "\u76EE\u7684\u5730\u5225\u540D"}, //-destalias
-        {"destination.key.password",
-                "\u76EE\u7684\u5730\u91D1\u9470\u5BC6\u78BC"}, //-destkeypass
-        {"destination.keystore.name",
-                "\u76EE\u7684\u5730\u91D1\u9470\u5132\u5B58\u5EAB\u540D\u7A31"}, //-destkeystore
-        {"destination.keystore.password.protected",
-                "\u76EE\u7684\u5730\u91D1\u9470\u5132\u5B58\u5EAB\u5BC6\u78BC\u4FDD\u8B77"}, //-destprotected
-        {"destination.keystore.provider.name",
-                "\u76EE\u7684\u5730\u91D1\u9470\u5132\u5B58\u5EAB\u63D0\u4F9B\u8005\u540D\u7A31"}, //-destprovidername
-        {"destination.keystore.password",
-                "\u76EE\u7684\u5730\u91D1\u9470\u5132\u5B58\u5EAB\u5BC6\u78BC"}, //-deststorepass
-        {"destination.keystore.type",
-                "\u76EE\u7684\u5730\u91D1\u9470\u5132\u5B58\u5EAB\u985E\u578B"}, //-deststoretype
-        {"distinguished.name",
-                "\u8FA8\u5225\u540D\u7A31"}, //-dname
-        {"X.509.extension",
-                "X.509 \u64F4\u5145\u5957\u4EF6"}, //-ext
-        {"output.file.name",
-                "\u8F38\u51FA\u6A94\u6848\u540D\u7A31"}, //-file and -outfile
-        {"input.file.name",
-                "\u8F38\u5165\u6A94\u6848\u540D\u7A31"}, //-file and -infile
-        {"key.algorithm.name",
-                "\u91D1\u9470\u6F14\u7B97\u6CD5\u540D\u7A31"}, //-keyalg
-        {"key.password",
-                "\u91D1\u9470\u5BC6\u78BC"}, //-keypass
-        {"key.bit.size",
-                "\u91D1\u9470\u4F4D\u5143\u5927\u5C0F"}, //-keysize
-        {"keystore.name",
-                "\u91D1\u9470\u5132\u5B58\u5EAB\u540D\u7A31"}, //-keystore
-        {"new.password",
-                "\u65B0\u5BC6\u78BC"}, //-new
-        {"do.not.prompt",
-                "\u4E0D\u8981\u63D0\u793A"}, //-noprompt
-        {"password.through.protected.mechanism",
-                "\u7D93\u7531\u4FDD\u8B77\u6A5F\u5236\u7684\u5BC6\u78BC"}, //-protected
-        {"provider.argument",
-                "\u63D0\u4F9B\u8005\u5F15\u6578"}, //-providerarg
-        {"provider.class.name",
-                "\u63D0\u4F9B\u8005\u985E\u5225\u540D\u7A31"}, //-providerclass
-        {"provider.name",
-                "\u63D0\u4F9B\u8005\u540D\u7A31"}, //-providername
-        {"provider.classpath",
-                "\u63D0\u4F9B\u8005\u985E\u5225\u8DEF\u5F91"}, //-providerpath
-        {"output.in.RFC.style",
-                "\u4EE5 RFC \u6A23\u5F0F\u8F38\u51FA"}, //-rfc
-        {"signature.algorithm.name",
-                "\u7C3D\u7AE0\u6F14\u7B97\u6CD5\u540D\u7A31"}, //-sigalg
-        {"source.alias",
-                "\u4F86\u6E90\u5225\u540D"}, //-srcalias
-        {"source.key.password",
-                "\u4F86\u6E90\u91D1\u9470\u5BC6\u78BC"}, //-srckeypass
-        {"source.keystore.name",
-                "\u4F86\u6E90\u91D1\u9470\u5132\u5B58\u5EAB\u540D\u7A31"}, //-srckeystore
-        {"source.keystore.password.protected",
-                "\u4F86\u6E90\u91D1\u9470\u5132\u5B58\u5EAB\u5BC6\u78BC\u4FDD\u8B77"}, //-srcprotected
-        {"source.keystore.provider.name",
-                "\u4F86\u6E90\u91D1\u9470\u5132\u5B58\u5EAB\u63D0\u4F9B\u8005\u540D\u7A31"}, //-srcprovidername
-        {"source.keystore.password",
-                "\u4F86\u6E90\u91D1\u9470\u5132\u5B58\u5EAB\u5BC6\u78BC"}, //-srcstorepass
-        {"source.keystore.type",
-                "\u4F86\u6E90\u91D1\u9470\u5132\u5B58\u5EAB\u985E\u578B"}, //-srcstoretype
-        {"SSL.server.host.and.port",
-                "SSL \u4F3A\u670D\u5668\u4E3B\u6A5F\u8207\u9023\u63A5\u57E0"}, //-sslserver
-        {"signed.jar.file",
-                "\u7C3D\u7F72\u7684 jar \u6A94\u6848"}, //=jarfile
-        {"certificate.validity.start.date.time",
-                "\u6191\u8B49\u6709\u6548\u6027\u958B\u59CB\u65E5\u671F/\u6642\u9593"}, //-startdate
-        {"keystore.password",
-                "\u91D1\u9470\u5132\u5B58\u5EAB\u5BC6\u78BC"}, //-storepass
-        {"keystore.type",
-                "\u91D1\u9470\u5132\u5B58\u5EAB\u985E\u578B"}, //-storetype
-        {"trust.certificates.from.cacerts",
-                "\u4F86\u81EA cacerts \u7684\u4FE1\u4EFB\u6191\u8B49"}, //-trustcacerts
-        {"verbose.output",
-                "\u8A73\u7D30\u8CC7\u8A0A\u8F38\u51FA"}, //-v
-        {"validity.number.of.days",
-                "\u6709\u6548\u6027\u65E5\u6578"}, //-validity
-        {"Serial.ID.of.cert.to.revoke",
-                 "\u8981\u64A4\u92B7\u6191\u8B49\u7684\u5E8F\u5217 ID"}, //-id
-        // keytool: Running part
-        {"keytool.error.", "\u91D1\u9470\u5DE5\u5177\u932F\u8AA4: "},
-        {"Illegal.option.", "\u7121\u6548\u7684\u9078\u9805:"},
-        {"Illegal.value.", "\u7121\u6548\u503C: "},
-        {"Unknown.password.type.", "\u4E0D\u660E\u7684\u5BC6\u78BC\u985E\u578B: "},
-        {"Cannot.find.environment.variable.",
-                "\u627E\u4E0D\u5230\u74B0\u5883\u8B8A\u6578: "},
-        {"Cannot.find.file.", "\u627E\u4E0D\u5230\u6A94\u6848: "},
-        {"Command.option.flag.needs.an.argument.", "\u547D\u4EE4\u9078\u9805 {0} \u9700\u8981\u5F15\u6578\u3002"},
-        {"Warning.Different.store.and.key.passwords.not.supported.for.PKCS12.KeyStores.Ignoring.user.specified.command.value.",
-                "\u8B66\u544A: PKCS12 \u91D1\u9470\u5132\u5B58\u5EAB\u4E0D\u652F\u63F4\u4E0D\u540C\u7684\u5132\u5B58\u5EAB\u548C\u91D1\u9470\u5BC6\u78BC\u3002\u5FFD\u7565\u4F7F\u7528\u8005\u6307\u5B9A\u7684 {0} \u503C\u3002"},
-        {".keystore.must.be.NONE.if.storetype.is.{0}",
-                "\u5982\u679C -storetype \u70BA {0}\uFF0C\u5247 -keystore \u5FC5\u9808\u70BA NONE"},
-        {"Too.many.retries.program.terminated",
-                 "\u91CD\u8A66\u6B21\u6578\u592A\u591A\uFF0C\u7A0B\u5F0F\u5DF2\u7D42\u6B62"},
-        {".storepasswd.and.keypasswd.commands.not.supported.if.storetype.is.{0}",
-                "\u5982\u679C -storetype \u70BA {0}\uFF0C\u5247\u4E0D\u652F\u63F4 -storepasswd \u548C -keypasswd \u547D\u4EE4"},
-        {".keypasswd.commands.not.supported.if.storetype.is.PKCS12",
-                "\u5982\u679C -storetype \u70BA PKCS12\uFF0C\u5247\u4E0D\u652F\u63F4 -keypasswd \u547D\u4EE4"},
-        {".keypass.and.new.can.not.be.specified.if.storetype.is.{0}",
-                "\u5982\u679C -storetype \u70BA {0}\uFF0C\u5247\u4E0D\u80FD\u6307\u5B9A -keypass \u548C -new"},
-        {"if.protected.is.specified.then.storepass.keypass.and.new.must.not.be.specified",
-                "\u5982\u679C\u6307\u5B9A -protected\uFF0C\u5247\u4E0D\u80FD\u6307\u5B9A -storepass\u3001-keypass \u548C -new"},
-        {"if.srcprotected.is.specified.then.srcstorepass.and.srckeypass.must.not.be.specified",
-                "\u5982\u679C\u6307\u5B9A -srcprotected\uFF0C\u5247\u4E0D\u80FD\u6307\u5B9A -srcstorepass \u548C -srckeypass"},
-        {"if.keystore.is.not.password.protected.then.storepass.keypass.and.new.must.not.be.specified",
-                "\u5982\u679C\u91D1\u9470\u5132\u5B58\u5EAB\u4E0D\u53D7\u5BC6\u78BC\u4FDD\u8B77\uFF0C\u5247\u4E0D\u80FD\u6307\u5B9A -storepass\u3001-keypass \u548C -new"},
-        {"if.source.keystore.is.not.password.protected.then.srcstorepass.and.srckeypass.must.not.be.specified",
-                "\u5982\u679C\u4F86\u6E90\u91D1\u9470\u5132\u5B58\u5EAB\u4E0D\u53D7\u5BC6\u78BC\u4FDD\u8B77\uFF0C\u5247\u4E0D\u80FD\u6307\u5B9A -srcstorepass \u548C -srckeypass"},
-        {"Illegal.startdate.value", "\u7121\u6548\u7684 startdate \u503C"},
-        {"Validity.must.be.greater.than.zero",
-                "\u6709\u6548\u6027\u5FC5\u9808\u5927\u65BC\u96F6"},
-        {"provName.not.a.provider", "{0} \u4E0D\u662F\u4E00\u500B\u63D0\u4F9B\u8005"},
-        {"Usage.error.no.command.provided", "\u7528\u6CD5\u932F\u8AA4: \u672A\u63D0\u4F9B\u547D\u4EE4"},
-        {"Source.keystore.file.exists.but.is.empty.", "\u4F86\u6E90\u91D1\u9470\u5132\u5B58\u5EAB\u6A94\u6848\u5B58\u5728\uFF0C\u4F46\u70BA\u7A7A: "},
-        {"Please.specify.srckeystore", "\u8ACB\u6307\u5B9A -srckeystore"},
-        {"Must.not.specify.both.v.and.rfc.with.list.command",
-                " 'list' \u547D\u4EE4\u4E0D\u80FD\u540C\u6642\u6307\u5B9A -v \u53CA -rfc"},
-        {"Key.password.must.be.at.least.6.characters",
-                "\u91D1\u9470\u5BC6\u78BC\u5FC5\u9808\u81F3\u5C11\u70BA 6 \u500B\u5B57\u5143"},
-        {"New.password.must.be.at.least.6.characters",
-                "\u65B0\u7684\u5BC6\u78BC\u5FC5\u9808\u81F3\u5C11\u70BA 6 \u500B\u5B57\u5143"},
-        {"Keystore.file.exists.but.is.empty.",
-                "\u91D1\u9470\u5132\u5B58\u5EAB\u6A94\u6848\u5B58\u5728\uFF0C\u4F46\u70BA\u7A7A\u767D: "},
-        {"Keystore.file.does.not.exist.",
-                "\u91D1\u9470\u5132\u5B58\u5EAB\u6A94\u6848\u4E0D\u5B58\u5728: "},
-        {"Must.specify.destination.alias", "\u5FC5\u9808\u6307\u5B9A\u76EE\u7684\u5730\u5225\u540D"},
-        {"Must.specify.alias", "\u5FC5\u9808\u6307\u5B9A\u5225\u540D"},
-        {"Keystore.password.must.be.at.least.6.characters",
-                "\u91D1\u9470\u5132\u5B58\u5EAB\u5BC6\u78BC\u5FC5\u9808\u81F3\u5C11\u70BA 6 \u500B\u5B57\u5143"},
-        {"Enter.keystore.password.", "\u8F38\u5165\u91D1\u9470\u5132\u5B58\u5EAB\u5BC6\u78BC:  "},
-        {"Enter.source.keystore.password.", "\u8ACB\u8F38\u5165\u4F86\u6E90\u91D1\u9470\u5132\u5B58\u5EAB\u5BC6\u78BC: "},
-        {"Enter.destination.keystore.password.", "\u8ACB\u8F38\u5165\u76EE\u7684\u5730\u91D1\u9470\u5132\u5B58\u5EAB\u5BC6\u78BC: "},
-        {"Keystore.password.is.too.short.must.be.at.least.6.characters",
-         "\u91D1\u9470\u5132\u5B58\u5EAB\u5BC6\u78BC\u592A\u77ED - \u5FC5\u9808\u81F3\u5C11\u70BA 6 \u500B\u5B57\u5143"},
-        {"Unknown.Entry.Type", "\u4E0D\u660E\u7684\u9805\u76EE\u985E\u578B"},
-        {"Too.many.failures.Alias.not.changed", "\u592A\u591A\u932F\u8AA4\u3002\u672A\u8B8A\u66F4\u5225\u540D"},
-        {"Entry.for.alias.alias.successfully.imported.",
-                 "\u5DF2\u6210\u529F\u532F\u5165\u5225\u540D {0} \u7684\u9805\u76EE\u3002"},
-        {"Entry.for.alias.alias.not.imported.", "\u672A\u532F\u5165\u5225\u540D {0} \u7684\u9805\u76EE\u3002"},
-        {"Problem.importing.entry.for.alias.alias.exception.Entry.for.alias.alias.not.imported.",
-                 "\u532F\u5165\u5225\u540D {0} \u7684\u9805\u76EE\u6642\u51FA\u73FE\u554F\u984C: {1}\u3002\n\u672A\u532F\u5165\u5225\u540D {0} \u7684\u9805\u76EE\u3002"},
-        {"Import.command.completed.ok.entries.successfully.imported.fail.entries.failed.or.cancelled",
-                 "\u5DF2\u5B8C\u6210\u532F\u5165\u547D\u4EE4: \u6210\u529F\u532F\u5165 {0} \u500B\u9805\u76EE\uFF0C{1} \u500B\u9805\u76EE\u5931\u6557\u6216\u5DF2\u53D6\u6D88"},
-        {"Warning.Overwriting.existing.alias.alias.in.destination.keystore",
-                 "\u8B66\u544A: \u6B63\u5728\u8986\u5BEB\u76EE\u7684\u5730\u91D1\u9470\u5132\u5B58\u5EAB\u4E2D\u7684\u73FE\u6709\u5225\u540D {0}"},
-        {"Existing.entry.alias.alias.exists.overwrite.no.",
-                 "\u73FE\u6709\u9805\u76EE\u5225\u540D {0} \u5B58\u5728\uFF0C\u662F\u5426\u8986\u5BEB\uFF1F[\u5426]:  "},
-        {"Too.many.failures.try.later", "\u592A\u591A\u932F\u8AA4 - \u8ACB\u7A0D\u5F8C\u518D\u8A66"},
-        {"Certification.request.stored.in.file.filename.",
-                "\u8A8D\u8B49\u8981\u6C42\u5132\u5B58\u5728\u6A94\u6848 <{0}>"},
-        {"Submit.this.to.your.CA", "\u5C07\u6B64\u9001\u51FA\u81F3\u60A8\u7684 CA"},
-        {"if.alias.not.specified.destalias.srckeypass.and.destkeypass.must.not.be.specified",
-            "\u5982\u679C\u672A\u6307\u5B9A\u5225\u540D\uFF0C\u5247\u4E0D\u80FD\u6307\u5B9A destalias\u3001srckeypass \u53CA destkeypass"},
-        {"Certificate.stored.in.file.filename.",
-                "\u6191\u8B49\u5132\u5B58\u5728\u6A94\u6848 <{0}>"},
-        {"Certificate.reply.was.installed.in.keystore",
-                "\u6191\u8B49\u56DE\u8986\u5DF2\u5B89\u88DD\u5728\u91D1\u9470\u5132\u5B58\u5EAB\u4E2D"},
-        {"Certificate.reply.was.not.installed.in.keystore",
-                "\u6191\u8B49\u56DE\u8986\u672A\u5B89\u88DD\u5728\u91D1\u9470\u5132\u5B58\u5EAB\u4E2D"},
-        {"Certificate.was.added.to.keystore",
-                "\u6191\u8B49\u5DF2\u65B0\u589E\u81F3\u91D1\u9470\u5132\u5B58\u5EAB\u4E2D"},
-        {"Certificate.was.not.added.to.keystore",
-                "\u6191\u8B49\u672A\u65B0\u589E\u81F3\u91D1\u9470\u5132\u5B58\u5EAB\u4E2D"},
-        {".Storing.ksfname.", "[\u5132\u5B58 {0}]"},
-        {"alias.has.no.public.key.certificate.",
-                "{0} \u6C92\u6709\u516C\u958B\u91D1\u9470 (\u6191\u8B49)"},
-        {"Cannot.derive.signature.algorithm",
-                "\u7121\u6CD5\u53D6\u5F97\u7C3D\u7AE0\u6F14\u7B97\u6CD5"},
-        {"Alias.alias.does.not.exist",
-                "\u5225\u540D <{0}> \u4E0D\u5B58\u5728"},
-        {"Alias.alias.has.no.certificate",
-                "\u5225\u540D <{0}> \u6C92\u6709\u6191\u8B49"},
-        {"Key.pair.not.generated.alias.alias.already.exists",
-                "\u6C92\u6709\u5EFA\u7ACB\u91D1\u9470\u7D44\uFF0C\u5225\u540D <{0}> \u5DF2\u7D93\u5B58\u5728"},
-        {"Generating.keysize.bit.keyAlgName.key.pair.and.self.signed.certificate.sigAlgName.with.a.validity.of.validality.days.for",
-                "\u91DD\u5C0D {4} \u7522\u751F\u6709\u6548\u671F {3} \u5929\u7684 {0} \u4F4D\u5143 {1} \u91D1\u9470\u7D44\u4EE5\u53CA\u81EA\u6211\u7C3D\u7F72\u6191\u8B49 ({2})\n\t"},
-        {"Enter.key.password.for.alias.", "\u8F38\u5165 <{0}> \u7684\u91D1\u9470\u5BC6\u78BC"},
-        {".RETURN.if.same.as.keystore.password.",
-                "\t(RETURN \u5982\u679C\u548C\u91D1\u9470\u5132\u5B58\u5EAB\u5BC6\u78BC\u76F8\u540C):  "},
-        {"Key.password.is.too.short.must.be.at.least.6.characters",
-                "\u91D1\u9470\u5BC6\u78BC\u592A\u77ED - \u5FC5\u9808\u81F3\u5C11\u70BA 6 \u500B\u5B57\u5143"},
-        {"Too.many.failures.key.not.added.to.keystore",
-                "\u592A\u591A\u932F\u8AA4 - \u91D1\u9470\u672A\u65B0\u589E\u81F3\u91D1\u9470\u5132\u5B58\u5EAB"},
-        {"Destination.alias.dest.already.exists",
-                "\u76EE\u7684\u5730\u5225\u540D <{0}> \u5DF2\u7D93\u5B58\u5728"},
-        {"Password.is.too.short.must.be.at.least.6.characters",
-                "\u5BC6\u78BC\u592A\u77ED - \u5FC5\u9808\u81F3\u5C11\u70BA 6 \u500B\u5B57\u5143"},
-        {"Too.many.failures.Key.entry.not.cloned",
-                "\u592A\u591A\u932F\u8AA4\u3002\u672A\u8907\u88FD\u91D1\u9470\u9805\u76EE"},
-        {"key.password.for.alias.", "<{0}> \u7684\u91D1\u9470\u5BC6\u78BC"},
-        {"Keystore.entry.for.id.getName.already.exists",
-                "<{0}> \u7684\u91D1\u9470\u5132\u5B58\u5EAB\u9805\u76EE\u5DF2\u7D93\u5B58\u5728"},
-        {"Creating.keystore.entry.for.id.getName.",
-                "\u5EFA\u7ACB <{0}> \u7684\u91D1\u9470\u5132\u5B58\u5EAB\u9805\u76EE..."},
-        {"No.entries.from.identity.database.added",
-                "\u6C92\u6709\u65B0\u589E\u4F86\u81EA\u8B58\u5225\u8CC7\u6599\u5EAB\u7684\u9805\u76EE"},
-        {"Alias.name.alias", "\u5225\u540D\u540D\u7A31: {0}"},
-        {"Creation.date.keyStore.getCreationDate.alias.",
-                "\u5EFA\u7ACB\u65E5\u671F: {0,date}"},
-        {"alias.keyStore.getCreationDate.alias.",
-                "{0}, {1,date}, "},
-        {"alias.", "{0}, "},
-        {"Entry.type.type.", "\u9805\u76EE\u985E\u578B: {0}"},
-        {"Certificate.chain.length.", "\u6191\u8B49\u93C8\u9577\u5EA6: "},
-        {"Certificate.i.1.", "\u6191\u8B49 [{0,number,integer}]:"},
-        {"Certificate.fingerprint.SHA1.", "\u6191\u8B49\u6307\u7D0B (SHA1): "},
-        {"Keystore.type.", "\u91D1\u9470\u5132\u5B58\u5EAB\u985E\u578B: "},
-        {"Keystore.provider.", "\u91D1\u9470\u5132\u5B58\u5EAB\u63D0\u4F9B\u8005: "},
-        {"Your.keystore.contains.keyStore.size.entry",
-                "\u60A8\u7684\u91D1\u9470\u5132\u5B58\u5EAB\u5305\u542B {0,number,integer} \u9805\u76EE"},
-        {"Your.keystore.contains.keyStore.size.entries",
-                "\u60A8\u7684\u91D1\u9470\u5132\u5B58\u5EAB\u5305\u542B {0,number,integer} \u9805\u76EE"},
-        {"Failed.to.parse.input", "\u7121\u6CD5\u5256\u6790\u8F38\u5165"},
-        {"Empty.input", "\u7A7A\u8F38\u5165"},
-        {"Not.X.509.certificate", "\u975E X.509 \u6191\u8B49"},
-        {"alias.has.no.public.key", "{0} \u7121\u516C\u958B\u91D1\u9470"},
-        {"alias.has.no.X.509.certificate", "{0} \u7121 X.509 \u6191\u8B49"},
-        {"New.certificate.self.signed.", "\u65B0\u6191\u8B49 (\u81EA\u6211\u7C3D\u7F72): "},
-        {"Reply.has.no.certificates", "\u56DE\u8986\u4E0D\u542B\u6191\u8B49"},
-        {"Certificate.not.imported.alias.alias.already.exists",
-                "\u6191\u8B49\u672A\u8F38\u5165\uFF0C\u5225\u540D <{0}> \u5DF2\u7D93\u5B58\u5728"},
-        {"Input.not.an.X.509.certificate", "\u8F38\u5165\u7684\u4E0D\u662F X.509 \u6191\u8B49"},
-        {"Certificate.already.exists.in.keystore.under.alias.trustalias.",
-                "\u91D1\u9470\u5132\u5B58\u5EAB\u4E2D\u7684 <{0}> \u5225\u540D\u4E4B\u4E0B\uFF0C\u6191\u8B49\u5DF2\u7D93\u5B58\u5728"},
-        {"Do.you.still.want.to.add.it.no.",
-                "\u60A8\u4ECD\u7136\u60F3\u8981\u5C07\u4E4B\u65B0\u589E\u55CE\uFF1F [\u5426]:  "},
-        {"Certificate.already.exists.in.system.wide.CA.keystore.under.alias.trustalias.",
-                "\u6574\u500B\u7CFB\u7D71 CA \u91D1\u9470\u5132\u5B58\u5EAB\u4E2D\u7684 <{0}> \u5225\u540D\u4E4B\u4E0B\uFF0C\u6191\u8B49\u5DF2\u7D93\u5B58\u5728"},
-        {"Do.you.still.want.to.add.it.to.your.own.keystore.no.",
-                "\u60A8\u4ECD\u7136\u60F3\u8981\u5C07\u4E4B\u65B0\u589E\u81F3\u81EA\u5DF1\u7684\u91D1\u9470\u5132\u5B58\u5EAB\u55CE\uFF1F [\u5426]:  "},
-        {"Trust.this.certificate.no.", "\u4FE1\u4EFB\u9019\u500B\u6191\u8B49\uFF1F [\u5426]:  "},
-        {"YES", "\u662F"},
-        {"New.prompt.", "\u65B0 {0}: "},
-        {"Passwords.must.differ", "\u5FC5\u9808\u662F\u4E0D\u540C\u7684\u5BC6\u78BC"},
-        {"Re.enter.new.prompt.", "\u91CD\u65B0\u8F38\u5165\u65B0 {0}: "},
-        {"Re.enter.new.password.", "\u91CD\u65B0\u8F38\u5165\u65B0\u5BC6\u78BC: "},
-        {"They.don.t.match.Try.again", "\u5B83\u5011\u4E0D\u76F8\u7B26\u3002\u8ACB\u91CD\u8A66"},
-        {"Enter.prompt.alias.name.", "\u8F38\u5165 {0} \u5225\u540D\u540D\u7A31:  "},
-        {"Enter.new.alias.name.RETURN.to.cancel.import.for.this.entry.",
-                 "\u8ACB\u8F38\u5165\u65B0\u7684\u5225\u540D\u540D\u7A31\t(RETURN \u4EE5\u53D6\u6D88\u532F\u5165\u6B64\u9805\u76EE):"},
-        {"Enter.alias.name.", "\u8F38\u5165\u5225\u540D\u540D\u7A31:  "},
-        {".RETURN.if.same.as.for.otherAlias.",
-                "\t(RETURN \u5982\u679C\u548C <{0}> \u7684\u76F8\u540C)"},
-        {".PATTERN.printX509Cert",
-                "\u64C1\u6709\u8005: {0}\n\u767C\u51FA\u8005: {1}\n\u5E8F\u865F: {2}\n\u6709\u6548\u671F\u81EA: {3} \u5230: {4}\n\u6191\u8B49\u6307\u7D0B:\n\t MD5:  {5}\n\t SHA1: {6}\n\t SHA256: {7}\n\t \u7C3D\u7AE0\u6F14\u7B97\u6CD5\u540D\u7A31: {8}\n\t \u7248\u672C: {9}"},
-        {"What.is.your.first.and.last.name.",
-                "\u60A8\u7684\u540D\u5B57\u8207\u59D3\u6C0F\u70BA\u4F55\uFF1F"},
-        {"What.is.the.name.of.your.organizational.unit.",
-                "\u60A8\u7684\u7D44\u7E54\u55AE\u4F4D\u540D\u7A31\u70BA\u4F55\uFF1F"},
-        {"What.is.the.name.of.your.organization.",
-                "\u60A8\u7684\u7D44\u7E54\u540D\u7A31\u70BA\u4F55\uFF1F"},
-        {"What.is.the.name.of.your.City.or.Locality.",
-                "\u60A8\u6240\u5728\u7684\u57CE\u5E02\u6216\u5730\u5340\u540D\u7A31\u70BA\u4F55\uFF1F"},
-        {"What.is.the.name.of.your.State.or.Province.",
-                "\u60A8\u6240\u5728\u7684\u5DDE\u53CA\u7701\u4EFD\u540D\u7A31\u70BA\u4F55\uFF1F"},
-        {"What.is.the.two.letter.country.code.for.this.unit.",
-                "\u6B64\u55AE\u4F4D\u7684\u5169\u500B\u5B57\u6BCD\u570B\u5225\u4EE3\u78BC\u70BA\u4F55\uFF1F"},
-        {"Is.name.correct.", "{0} \u6B63\u78BA\u55CE\uFF1F"},
-        {"no", "\u5426"},
-        {"yes", "\u662F"},
-        {"y", "y"},
-        {".defaultValue.", "  [{0}]:  "},
-        {"Alias.alias.has.no.key",
-                "\u5225\u540D <{0}> \u6C92\u6709\u91D1\u9470"},
-        {"Alias.alias.references.an.entry.type.that.is.not.a.private.key.entry.The.keyclone.command.only.supports.cloning.of.private.key",
-                 "\u5225\u540D <{0}> \u6240\u53C3\u7167\u7684\u9805\u76EE\u4E0D\u662F\u79C1\u5BC6\u91D1\u9470\u985E\u578B\u3002-keyclone \u547D\u4EE4\u50C5\u652F\u63F4\u79C1\u5BC6\u91D1\u9470\u9805\u76EE\u7684\u8907\u88FD"},
-
-        {".WARNING.WARNING.WARNING.",
-            "*****************  \u8B66\u544A \u8B66\u544A \u8B66\u544A  *****************"},
-        {"Signer.d.", "\u7C3D\u7F72\u8005 #%d:"},
-        {"Timestamp.", "\u6642\u6233:"},
-        {"Signature.", "\u7C3D\u7AE0:"},
-        {"CRLs.", "CRL:"},
-        {"Certificate.owner.", "\u6191\u8B49\u64C1\u6709\u8005: "},
-        {"Not.a.signed.jar.file", "\u4E0D\u662F\u7C3D\u7F72\u7684 jar \u6A94\u6848"},
-        {"No.certificate.from.the.SSL.server",
-                "\u6C92\u6709\u4F86\u81EA SSL \u4F3A\u670D\u5668\u7684\u6191\u8B49"},
-
-        {".The.integrity.of.the.information.stored.in.your.keystore.",
-            "* \u5C1A\u672A\u9A57\u8B49\u5132\u5B58\u65BC\u91D1\u9470\u5132\u5B58\u5EAB\u4E2D\u8CC7\u8A0A  *\n* \u7684\u5B8C\u6574\u6027\uFF01\u82E5\u8981\u9A57\u8B49\u5176\u5B8C\u6574\u6027\uFF0C*\n* \u60A8\u5FC5\u9808\u63D0\u4F9B\u60A8\u7684\u91D1\u9470\u5132\u5B58\u5EAB\u5BC6\u78BC\u3002                  *"},
-        {".The.integrity.of.the.information.stored.in.the.srckeystore.",
-            "* \u5C1A\u672A\u9A57\u8B49\u5132\u5B58\u65BC srckeystore \u4E2D\u8CC7\u8A0A*\n* \u7684\u5B8C\u6574\u6027\uFF01\u82E5\u8981\u9A57\u8B49\u5176\u5B8C\u6574\u6027\uFF0C\u60A8\u5FC5\u9808 *\n* \u63D0\u4F9B srckeystore \u5BC6\u78BC\u3002          *"},
-
-        {"Certificate.reply.does.not.contain.public.key.for.alias.",
-                "\u6191\u8B49\u56DE\u8986\u4E26\u672A\u5305\u542B <{0}> \u7684\u516C\u958B\u91D1\u9470"},
-        {"Incomplete.certificate.chain.in.reply",
-                "\u56DE\u8986\u6642\u7684\u6191\u8B49\u93C8\u4E0D\u5B8C\u6574"},
-        {"Certificate.chain.in.reply.does.not.verify.",
-                "\u56DE\u8986\u6642\u7684\u6191\u8B49\u93C8\u672A\u9A57\u8B49: "},
-        {"Top.level.certificate.in.reply.",
-                "\u56DE\u8986\u6642\u7684\u6700\u9AD8\u7D1A\u6191\u8B49:\\n"},
-        {".is.not.trusted.", "... \u662F\u4E0D\u88AB\u4FE1\u4EFB\u7684\u3002"},
-        {"Install.reply.anyway.no.", "\u9084\u662F\u8981\u5B89\u88DD\u56DE\u8986\uFF1F [\u5426]:  "},
-        {"NO", "\u5426"},
-        {"Public.keys.in.reply.and.keystore.don.t.match",
-                "\u56DE\u8986\u6642\u7684\u516C\u958B\u91D1\u9470\u8207\u91D1\u9470\u5132\u5B58\u5EAB\u4E0D\u7B26"},
-        {"Certificate.reply.and.certificate.in.keystore.are.identical",
-                "\u6191\u8B49\u56DE\u8986\u8207\u91D1\u9470\u5132\u5B58\u5EAB\u4E2D\u7684\u6191\u8B49\u662F\u76F8\u540C\u7684"},
-        {"Failed.to.establish.chain.from.reply",
-                "\u7121\u6CD5\u5F9E\u56DE\u8986\u4E2D\u5C07\u93C8\u5EFA\u7ACB\u8D77\u4F86"},
-        {"n", "n"},
-        {"Wrong.answer.try.again", "\u932F\u8AA4\u7684\u7B54\u6848\uFF0C\u8ACB\u518D\u8A66\u4E00\u6B21"},
-        {"Secret.key.not.generated.alias.alias.already.exists",
-                "\u672A\u7522\u751F\u79D8\u5BC6\u91D1\u9470\uFF0C\u5225\u540D <{0}> \u5DF2\u5B58\u5728"},
-        {"Please.provide.keysize.for.secret.key.generation",
-                "\u8ACB\u63D0\u4F9B -keysize \u4EE5\u7522\u751F\u79D8\u5BC6\u91D1\u9470"},
-
-        {"Extensions.", "\u64F4\u5145\u5957\u4EF6: "},
-        {".Empty.value.", "(\u7A7A\u767D\u503C)"},
-        {"Extension.Request.", "\u64F4\u5145\u5957\u4EF6\u8981\u6C42:"},
-        {"PKCS.10.Certificate.Request.Version.1.0.Subject.s.Public.Key.s.format.s.key.",
-                "PKCS #10 \u6191\u8B49\u8981\u6C42 (\u7248\u672C 1.0)\n\u4E3B\u9AD4: %s\n\u516C\u7528\u91D1\u9470: %s \u683C\u5F0F %s \u91D1\u9470\n"},
-        {"Unknown.keyUsage.type.", "\u4E0D\u660E\u7684 keyUsage \u985E\u578B: "},
-        {"Unknown.extendedkeyUsage.type.", "\u4E0D\u660E\u7684 extendedkeyUsage \u985E\u578B: "},
-        {"Unknown.AccessDescription.type.", "\u4E0D\u660E\u7684 AccessDescription \u985E\u578B: "},
-        {"Unrecognized.GeneralName.type.", "\u7121\u6CD5\u8FA8\u8B58\u7684 GeneralName \u985E\u578B: "},
-        {"This.extension.cannot.be.marked.as.critical.",
-                 "\u6B64\u64F4\u5145\u5957\u4EF6\u7121\u6CD5\u6A19\u793A\u70BA\u95DC\u9375\u3002"},
-        {"Odd.number.of.hex.digits.found.", "\u627E\u5230\u5341\u516D\u9032\u4F4D\u6578\u5B57\u7684\u5947\u6578: "},
-        {"Unknown.extension.type.", "\u4E0D\u660E\u7684\u64F4\u5145\u5957\u4EF6\u985E\u578B: "},
-        {"command.{0}.is.ambiguous.", "\u547D\u4EE4 {0} \u4E0D\u660E\u78BA:"}
-    };
-
-
-    /**
-     * Returns the contents of this <code>ResourceBundle</code>.
-     *
-     * @return the contents of this <code>ResourceBundle</code>.
-     */
-    @Override
-    public Object[][] getContents() {
-        return contents;
-    }
-}
diff --git a/src/java.base/share/classes/sun/security/tools/keytool/Resources_zh_TW.java b/src/java.base/share/classes/sun/security/tools/keytool/Resources_zh_TW.java
deleted file mode 100644
index c20c0eb871b..00000000000
--- a/src/java.base/share/classes/sun/security/tools/keytool/Resources_zh_TW.java
+++ /dev/null
@@ -1,484 +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.  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.tools.keytool;
-
-/**
- * <p> This class represents the <code>ResourceBundle</code>
- * for the keytool.
- *
- */
-public class Resources_zh_TW extends java.util.ListResourceBundle {
-
-    private static final Object[][] contents = {
-        {"NEWLINE", "\n"},
-        {"STAR",
-                "*******************************************"},
-        {"STARNN",
-                "*******************************************\n\n"},
-
-        // keytool: Help part
-        {".OPTION.", " [OPTION]..."},
-        {"Options.", "\u9078\u9805:"},
-        {"option.1.set.twice", "%s \u9078\u9805\u5DF2\u6307\u5B9A\u591A\u6B21\u3002\u5C07\u5FFD\u7565\u6700\u5F8C\u4E00\u500B\u9078\u9805\u4EE5\u5916\u7684\u5176\u4ED6\u6240\u6709\u9078\u9805\u3002"},
-        {"multiple.commands.1.2", "\u53EA\u5141\u8A31\u4E00\u500B\u547D\u4EE4: \u6307\u5B9A\u4E86 %1$s \u548C %2$s \u5169\u8005\u3002"},
-        {"Use.keytool.help.for.all.available.commands",
-                 "\u4F7F\u7528 \"keytool -help\" \u53D6\u5F97\u6240\u6709\u53EF\u7528\u7684\u547D\u4EE4"},
-        {"Key.and.Certificate.Management.Tool",
-                 "\u91D1\u9470\u8207\u6191\u8B49\u7BA1\u7406\u5DE5\u5177"},
-        {"Commands.", "\u547D\u4EE4:"},
-        {"Use.keytool.command.name.help.for.usage.of.command.name",
-                "\u4F7F\u7528 \"keytool -command_name -help\" \u53D6\u5F97 command_name \u7684\u7528\u6CD5\u3002\n\u4F7F\u7528 -conf <url> \u9078\u9805\u6307\u5B9A\u9810\u5148\u8A2D\u5B9A\u7684\u9078\u9805\u6A94\u6848\u3002"},
-        // keytool: help: commands
-        {"Generates.a.certificate.request",
-                "\u7522\u751F\u6191\u8B49\u8981\u6C42"}, //-certreq
-        {"Changes.an.entry.s.alias",
-                "\u8B8A\u66F4\u9805\u76EE\u7684\u5225\u540D"}, //-changealias
-        {"Deletes.an.entry",
-                "\u522A\u9664\u9805\u76EE"}, //-delete
-        {"Exports.certificate",
-                "\u532F\u51FA\u6191\u8B49"}, //-exportcert
-        {"Generates.a.key.pair",
-                "\u7522\u751F\u91D1\u9470\u7D44"}, //-genkeypair
-        {"Generates.a.secret.key",
-                "\u7522\u751F\u79D8\u5BC6\u91D1\u9470"}, //-genseckey
-        {"Generates.certificate.from.a.certificate.request",
-                "\u5F9E\u6191\u8B49\u8981\u6C42\u7522\u751F\u6191\u8B49"}, //-gencert
-        {"Generates.CRL", "\u7522\u751F CRL"}, //-gencrl
-        {"Generated.keyAlgName.secret.key",
-                "\u5DF2\u7522\u751F {0} \u79D8\u5BC6\u91D1\u9470"}, //-genseckey
-        {"Generated.keysize.bit.keyAlgName.secret.key",
-                "\u5DF2\u7522\u751F {0} \u4F4D\u5143 {1} \u79D8\u5BC6\u91D1\u9470"}, //-genseckey
-        {"Imports.entries.from.a.JDK.1.1.x.style.identity.database",
-                "\u5F9E JDK 1.1.x-style \u8B58\u5225\u8CC7\u6599\u5EAB\u532F\u5165\u9805\u76EE"}, //-identitydb
-        {"Imports.a.certificate.or.a.certificate.chain",
-                "\u532F\u5165\u6191\u8B49\u6216\u6191\u8B49\u93C8"}, //-importcert
-        {"Imports.a.password",
-                "\u532F\u5165\u5BC6\u78BC"}, //-importpass
-        {"Imports.one.or.all.entries.from.another.keystore",
-                "\u5F9E\u5176\u4ED6\u91D1\u9470\u5132\u5B58\u5EAB\u532F\u5165\u4E00\u500B\u6216\u5168\u90E8\u9805\u76EE"}, //-importkeystore
-        {"Clones.a.key.entry",
-                "\u8907\u88FD\u91D1\u9470\u9805\u76EE"}, //-keyclone
-        {"Changes.the.key.password.of.an.entry",
-                "\u8B8A\u66F4\u9805\u76EE\u7684\u91D1\u9470\u5BC6\u78BC"}, //-keypasswd
-        {"Lists.entries.in.a.keystore",
-                "\u5217\u793A\u91D1\u9470\u5132\u5B58\u5EAB\u4E2D\u7684\u9805\u76EE"}, //-list
-        {"Prints.the.content.of.a.certificate",
-                "\u5217\u5370\u6191\u8B49\u7684\u5167\u5BB9"}, //-printcert
-        {"Prints.the.content.of.a.certificate.request",
-                "\u5217\u5370\u6191\u8B49\u8981\u6C42\u7684\u5167\u5BB9"}, //-printcertreq
-        {"Prints.the.content.of.a.CRL.file",
-                "\u5217\u5370 CRL \u6A94\u6848\u7684\u5167\u5BB9"}, //-printcrl
-        {"Generates.a.self.signed.certificate",
-                "\u7522\u751F\u81EA\u884C\u7C3D\u7F72\u7684\u6191\u8B49"}, //-selfcert
-        {"Changes.the.store.password.of.a.keystore",
-                "\u8B8A\u66F4\u91D1\u9470\u5132\u5B58\u5EAB\u7684\u5132\u5B58\u5BC6\u78BC"}, //-storepasswd
-        // keytool: help: options
-        {"alias.name.of.the.entry.to.process",
-                "\u8981\u8655\u7406\u9805\u76EE\u7684\u5225\u540D\u540D\u7A31"}, //-alias
-        {"destination.alias",
-                "\u76EE\u7684\u5730\u5225\u540D"}, //-destalias
-        {"destination.key.password",
-                "\u76EE\u7684\u5730\u91D1\u9470\u5BC6\u78BC"}, //-destkeypass
-        {"destination.keystore.name",
-                "\u76EE\u7684\u5730\u91D1\u9470\u5132\u5B58\u5EAB\u540D\u7A31"}, //-destkeystore
-        {"destination.keystore.password.protected",
-                "\u76EE\u7684\u5730\u91D1\u9470\u5132\u5B58\u5EAB\u5BC6\u78BC\u4FDD\u8B77"}, //-destprotected
-        {"destination.keystore.provider.name",
-                "\u76EE\u7684\u5730\u91D1\u9470\u5132\u5B58\u5EAB\u63D0\u4F9B\u8005\u540D\u7A31"}, //-destprovidername
-        {"destination.keystore.password",
-                "\u76EE\u7684\u5730\u91D1\u9470\u5132\u5B58\u5EAB\u5BC6\u78BC"}, //-deststorepass
-        {"destination.keystore.type",
-                "\u76EE\u7684\u5730\u91D1\u9470\u5132\u5B58\u5EAB\u985E\u578B"}, //-deststoretype
-        {"distinguished.name",
-                "\u8FA8\u5225\u540D\u7A31"}, //-dname
-        {"X.509.extension",
-                "X.509 \u64F4\u5145\u5957\u4EF6"}, //-ext
-        {"output.file.name",
-                "\u8F38\u51FA\u6A94\u6848\u540D\u7A31"}, //-file and -outfile
-        {"input.file.name",
-                "\u8F38\u5165\u6A94\u6848\u540D\u7A31"}, //-file and -infile
-        {"key.algorithm.name",
-                "\u91D1\u9470\u6F14\u7B97\u6CD5\u540D\u7A31"}, //-keyalg
-        {"key.password",
-                "\u91D1\u9470\u5BC6\u78BC"}, //-keypass
-        {"key.bit.size",
-                "\u91D1\u9470\u4F4D\u5143\u5927\u5C0F"}, //-keysize
-        {"keystore.name",
-                "\u91D1\u9470\u5132\u5B58\u5EAB\u540D\u7A31"}, //-keystore
-        {"access.the.cacerts.keystore",
-                "\u5B58\u53D6 cacerts \u91D1\u9470\u5132\u5B58\u5EAB"}, // -cacerts
-        {"warning.cacerts.option",
-                "\u8B66\u544A: \u4F7F\u7528 -cacerts \u9078\u9805\u5B58\u53D6 cacerts \u91D1\u9470\u5132\u5B58\u5EAB"},
-        {"new.password",
-                "\u65B0\u5BC6\u78BC"}, //-new
-        {"do.not.prompt",
-                "\u4E0D\u8981\u63D0\u793A"}, //-noprompt
-        {"password.through.protected.mechanism",
-                "\u7D93\u7531\u4FDD\u8B77\u6A5F\u5236\u7684\u5BC6\u78BC"}, //-protected
-
-        // The following 2 values should span 2 lines, the first for the
-        // option itself, the second for its -providerArg value.
-        {"addprovider.option",
-                "\u4F7F\u7528\u540D\u7A31\u65B0\u589E\u5B89\u5168\u63D0\u4F9B\u8005 (\u4F8B\u5982 SunPKCS11)\n\u8A2D\u5B9A -addprovider \u5F15\u6578"}, //-addprovider
-        {"provider.class.option",
-                "\u4F7F\u7528\u5B8C\u6574\u985E\u5225\u540D\u7A31\u65B0\u589E\u5B89\u5168\u63D0\u4F9B\u8005\n\u8A2D\u5B9A -providerclass \u5F15\u6578"}, //-providerclass
-
-        {"provider.name",
-                "\u63D0\u4F9B\u8005\u540D\u7A31"}, //-providername
-        {"provider.classpath",
-                "\u63D0\u4F9B\u8005\u985E\u5225\u8DEF\u5F91"}, //-providerpath
-        {"output.in.RFC.style",
-                "\u4EE5 RFC \u6A23\u5F0F\u8F38\u51FA"}, //-rfc
-        {"signature.algorithm.name",
-                "\u7C3D\u7AE0\u6F14\u7B97\u6CD5\u540D\u7A31"}, //-sigalg
-        {"source.alias",
-                "\u4F86\u6E90\u5225\u540D"}, //-srcalias
-        {"source.key.password",
-                "\u4F86\u6E90\u91D1\u9470\u5BC6\u78BC"}, //-srckeypass
-        {"source.keystore.name",
-                "\u4F86\u6E90\u91D1\u9470\u5132\u5B58\u5EAB\u540D\u7A31"}, //-srckeystore
-        {"source.keystore.password.protected",
-                "\u4F86\u6E90\u91D1\u9470\u5132\u5B58\u5EAB\u5BC6\u78BC\u4FDD\u8B77"}, //-srcprotected
-        {"source.keystore.provider.name",
-                "\u4F86\u6E90\u91D1\u9470\u5132\u5B58\u5EAB\u63D0\u4F9B\u8005\u540D\u7A31"}, //-srcprovidername
-        {"source.keystore.password",
-                "\u4F86\u6E90\u91D1\u9470\u5132\u5B58\u5EAB\u5BC6\u78BC"}, //-srcstorepass
-        {"source.keystore.type",
-                "\u4F86\u6E90\u91D1\u9470\u5132\u5B58\u5EAB\u985E\u578B"}, //-srcstoretype
-        {"SSL.server.host.and.port",
-                "SSL \u4F3A\u670D\u5668\u4E3B\u6A5F\u8207\u9023\u63A5\u57E0"}, //-sslserver
-        {"signed.jar.file",
-                "\u7C3D\u7F72\u7684 jar \u6A94\u6848"}, //=jarfile
-        {"certificate.validity.start.date.time",
-                "\u6191\u8B49\u6709\u6548\u6027\u958B\u59CB\u65E5\u671F/\u6642\u9593"}, //-startdate
-        {"keystore.password",
-                "\u91D1\u9470\u5132\u5B58\u5EAB\u5BC6\u78BC"}, //-storepass
-        {"keystore.type",
-                "\u91D1\u9470\u5132\u5B58\u5EAB\u985E\u578B"}, //-storetype
-        {"trust.certificates.from.cacerts",
-                "\u4F86\u81EA cacerts \u7684\u4FE1\u4EFB\u6191\u8B49"}, //-trustcacerts
-        {"verbose.output",
-                "\u8A73\u7D30\u8CC7\u8A0A\u8F38\u51FA"}, //-v
-        {"validity.number.of.days",
-                "\u6709\u6548\u6027\u65E5\u6578"}, //-validity
-        {"Serial.ID.of.cert.to.revoke",
-                 "\u8981\u64A4\u92B7\u6191\u8B49\u7684\u5E8F\u5217 ID"}, //-id
-        // keytool: Running part
-        {"keytool.error.", "\u91D1\u9470\u5DE5\u5177\u932F\u8AA4: "},
-        {"Illegal.option.", "\u7121\u6548\u7684\u9078\u9805:"},
-        {"Illegal.value.", "\u7121\u6548\u503C: "},
-        {"Unknown.password.type.", "\u4E0D\u660E\u7684\u5BC6\u78BC\u985E\u578B: "},
-        {"Cannot.find.environment.variable.",
-                "\u627E\u4E0D\u5230\u74B0\u5883\u8B8A\u6578: "},
-        {"Cannot.find.file.", "\u627E\u4E0D\u5230\u6A94\u6848: "},
-        {"Command.option.flag.needs.an.argument.", "\u547D\u4EE4\u9078\u9805 {0} \u9700\u8981\u5F15\u6578\u3002"},
-        {"Warning.Different.store.and.key.passwords.not.supported.for.PKCS12.KeyStores.Ignoring.user.specified.command.value.",
-                "\u8B66\u544A: PKCS12 \u91D1\u9470\u5132\u5B58\u5EAB\u4E0D\u652F\u63F4\u4E0D\u540C\u7684\u5132\u5B58\u5EAB\u548C\u91D1\u9470\u5BC6\u78BC\u3002\u5FFD\u7565\u4F7F\u7528\u8005\u6307\u5B9A\u7684 {0} \u503C\u3002"},
-        {"the.keystore.or.storetype.option.cannot.be.used.with.the.cacerts.option",
-            "-keystore \u6216 -storetype \u9078\u9805\u4E0D\u80FD\u8207 -cacerts \u9078\u9805\u4E00\u8D77\u4F7F\u7528"},
-        {".keystore.must.be.NONE.if.storetype.is.{0}",
-                "\u5982\u679C -storetype \u70BA {0}\uFF0C\u5247 -keystore \u5FC5\u9808\u70BA NONE"},
-        {"Too.many.retries.program.terminated",
-                 "\u91CD\u8A66\u6B21\u6578\u592A\u591A\uFF0C\u7A0B\u5F0F\u5DF2\u7D42\u6B62"},
-        {".storepasswd.and.keypasswd.commands.not.supported.if.storetype.is.{0}",
-                "\u5982\u679C -storetype \u70BA {0}\uFF0C\u5247\u4E0D\u652F\u63F4 -storepasswd \u548C -keypasswd \u547D\u4EE4"},
-        {".keypasswd.commands.not.supported.if.storetype.is.PKCS12",
-                "\u5982\u679C -storetype \u70BA PKCS12\uFF0C\u5247\u4E0D\u652F\u63F4 -keypasswd \u547D\u4EE4"},
-        {".keypass.and.new.can.not.be.specified.if.storetype.is.{0}",
-                "\u5982\u679C -storetype \u70BA {0}\uFF0C\u5247\u4E0D\u80FD\u6307\u5B9A -keypass \u548C -new"},
-        {"if.protected.is.specified.then.storepass.keypass.and.new.must.not.be.specified",
-                "\u5982\u679C\u6307\u5B9A -protected\uFF0C\u5247\u4E0D\u80FD\u6307\u5B9A -storepass\u3001-keypass \u548C -new"},
-        {"if.srcprotected.is.specified.then.srcstorepass.and.srckeypass.must.not.be.specified",
-                "\u5982\u679C\u6307\u5B9A -srcprotected\uFF0C\u5247\u4E0D\u80FD\u6307\u5B9A -srcstorepass \u548C -srckeypass"},
-        {"if.keystore.is.not.password.protected.then.storepass.keypass.and.new.must.not.be.specified",
-                "\u5982\u679C\u91D1\u9470\u5132\u5B58\u5EAB\u4E0D\u53D7\u5BC6\u78BC\u4FDD\u8B77\uFF0C\u5247\u4E0D\u80FD\u6307\u5B9A -storepass\u3001-keypass \u548C -new"},
-        {"if.source.keystore.is.not.password.protected.then.srcstorepass.and.srckeypass.must.not.be.specified",
-                "\u5982\u679C\u4F86\u6E90\u91D1\u9470\u5132\u5B58\u5EAB\u4E0D\u53D7\u5BC6\u78BC\u4FDD\u8B77\uFF0C\u5247\u4E0D\u80FD\u6307\u5B9A -srcstorepass \u548C -srckeypass"},
-        {"Illegal.startdate.value", "\u7121\u6548\u7684 startdate \u503C"},
-        {"Validity.must.be.greater.than.zero",
-                "\u6709\u6548\u6027\u5FC5\u9808\u5927\u65BC\u96F6"},
-        {"provclass.not.a.provider", "%s \u4E0D\u662F\u4E00\u500B\u63D0\u4F9B\u8005"},
-        {"provider.name.not.found", "\u627E\u4E0D\u5230\u540D\u7A31\u70BA \"%s\" \u7684\u63D0\u4F9B\u8005"},
-        {"provider.class.not.found", "\u627E\u4E0D\u5230\u63D0\u4F9B\u8005 \"%s\""},
-        {"Usage.error.no.command.provided", "\u7528\u6CD5\u932F\u8AA4: \u672A\u63D0\u4F9B\u547D\u4EE4"},
-        {"Source.keystore.file.exists.but.is.empty.", "\u4F86\u6E90\u91D1\u9470\u5132\u5B58\u5EAB\u6A94\u6848\u5B58\u5728\uFF0C\u4F46\u70BA\u7A7A: "},
-        {"Please.specify.srckeystore", "\u8ACB\u6307\u5B9A -srckeystore"},
-        {"Must.not.specify.both.v.and.rfc.with.list.command",
-                " 'list' \u547D\u4EE4\u4E0D\u80FD\u540C\u6642\u6307\u5B9A -v \u53CA -rfc"},
-        {"Key.password.must.be.at.least.6.characters",
-                "\u91D1\u9470\u5BC6\u78BC\u5FC5\u9808\u81F3\u5C11\u70BA 6 \u500B\u5B57\u5143"},
-        {"New.password.must.be.at.least.6.characters",
-                "\u65B0\u7684\u5BC6\u78BC\u5FC5\u9808\u81F3\u5C11\u70BA 6 \u500B\u5B57\u5143"},
-        {"Keystore.file.exists.but.is.empty.",
-                "\u91D1\u9470\u5132\u5B58\u5EAB\u6A94\u6848\u5B58\u5728\uFF0C\u4F46\u70BA\u7A7A\u767D: "},
-        {"Keystore.file.does.not.exist.",
-                "\u91D1\u9470\u5132\u5B58\u5EAB\u6A94\u6848\u4E0D\u5B58\u5728: "},
-        {"Must.specify.destination.alias", "\u5FC5\u9808\u6307\u5B9A\u76EE\u7684\u5730\u5225\u540D"},
-        {"Must.specify.alias", "\u5FC5\u9808\u6307\u5B9A\u5225\u540D"},
-        {"Keystore.password.must.be.at.least.6.characters",
-                "\u91D1\u9470\u5132\u5B58\u5EAB\u5BC6\u78BC\u5FC5\u9808\u81F3\u5C11\u70BA 6 \u500B\u5B57\u5143"},
-        {"Enter.the.password.to.be.stored.",
-                "\u8F38\u5165\u8981\u5132\u5B58\u7684\u5BC6\u78BC:  "},
-        {"Enter.keystore.password.", "\u8F38\u5165\u91D1\u9470\u5132\u5B58\u5EAB\u5BC6\u78BC:  "},
-        {"Enter.source.keystore.password.", "\u8ACB\u8F38\u5165\u4F86\u6E90\u91D1\u9470\u5132\u5B58\u5EAB\u5BC6\u78BC: "},
-        {"Enter.destination.keystore.password.", "\u8ACB\u8F38\u5165\u76EE\u7684\u5730\u91D1\u9470\u5132\u5B58\u5EAB\u5BC6\u78BC: "},
-        {"Keystore.password.is.too.short.must.be.at.least.6.characters",
-         "\u91D1\u9470\u5132\u5B58\u5EAB\u5BC6\u78BC\u592A\u77ED - \u5FC5\u9808\u81F3\u5C11\u70BA 6 \u500B\u5B57\u5143"},
-        {"Unknown.Entry.Type", "\u4E0D\u660E\u7684\u9805\u76EE\u985E\u578B"},
-        {"Too.many.failures.Alias.not.changed", "\u592A\u591A\u932F\u8AA4\u3002\u672A\u8B8A\u66F4\u5225\u540D"},
-        {"Entry.for.alias.alias.successfully.imported.",
-                 "\u5DF2\u6210\u529F\u532F\u5165\u5225\u540D {0} \u7684\u9805\u76EE\u3002"},
-        {"Entry.for.alias.alias.not.imported.", "\u672A\u532F\u5165\u5225\u540D {0} \u7684\u9805\u76EE\u3002"},
-        {"Problem.importing.entry.for.alias.alias.exception.Entry.for.alias.alias.not.imported.",
-                 "\u532F\u5165\u5225\u540D {0} \u7684\u9805\u76EE\u6642\u51FA\u73FE\u554F\u984C: {1}\u3002\n\u672A\u532F\u5165\u5225\u540D {0} \u7684\u9805\u76EE\u3002"},
-        {"Import.command.completed.ok.entries.successfully.imported.fail.entries.failed.or.cancelled",
-                 "\u5DF2\u5B8C\u6210\u532F\u5165\u547D\u4EE4: \u6210\u529F\u532F\u5165 {0} \u500B\u9805\u76EE\uFF0C{1} \u500B\u9805\u76EE\u5931\u6557\u6216\u5DF2\u53D6\u6D88"},
-        {"Warning.Overwriting.existing.alias.alias.in.destination.keystore",
-                 "\u8B66\u544A: \u6B63\u5728\u8986\u5BEB\u76EE\u7684\u5730\u91D1\u9470\u5132\u5B58\u5EAB\u4E2D\u7684\u73FE\u6709\u5225\u540D {0}"},
-        {"Existing.entry.alias.alias.exists.overwrite.no.",
-                 "\u73FE\u6709\u9805\u76EE\u5225\u540D {0} \u5B58\u5728\uFF0C\u662F\u5426\u8986\u5BEB\uFF1F[\u5426]:  "},
-        {"Too.many.failures.try.later", "\u592A\u591A\u932F\u8AA4 - \u8ACB\u7A0D\u5F8C\u518D\u8A66"},
-        {"Certification.request.stored.in.file.filename.",
-                "\u8A8D\u8B49\u8981\u6C42\u5132\u5B58\u5728\u6A94\u6848 <{0}>"},
-        {"Submit.this.to.your.CA", "\u5C07\u6B64\u9001\u51FA\u81F3\u60A8\u7684 CA"},
-        {"if.alias.not.specified.destalias.and.srckeypass.must.not.be.specified",
-            "\u5982\u679C\u672A\u6307\u5B9A\u5225\u540D\uFF0C\u5247\u4E0D\u80FD\u6307\u5B9A destalias \u548C srckeypass"},
-        {"The.destination.pkcs12.keystore.has.different.storepass.and.keypass.Please.retry.with.destkeypass.specified.",
-            "\u76EE\u7684\u5730 pkcs12 \u91D1\u9470\u5132\u5B58\u5EAB\u7684 storepass \u548C keypass \u4E0D\u540C\u3002\u8ACB\u91CD\u65B0\u4EE5 -destkeypass \u6307\u5B9A\u3002"},
-        {"Certificate.stored.in.file.filename.",
-                "\u6191\u8B49\u5132\u5B58\u5728\u6A94\u6848 <{0}>"},
-        {"Certificate.reply.was.installed.in.keystore",
-                "\u6191\u8B49\u56DE\u8986\u5DF2\u5B89\u88DD\u5728\u91D1\u9470\u5132\u5B58\u5EAB\u4E2D"},
-        {"Certificate.reply.was.not.installed.in.keystore",
-                "\u6191\u8B49\u56DE\u8986\u672A\u5B89\u88DD\u5728\u91D1\u9470\u5132\u5B58\u5EAB\u4E2D"},
-        {"Certificate.was.added.to.keystore",
-                "\u6191\u8B49\u5DF2\u65B0\u589E\u81F3\u91D1\u9470\u5132\u5B58\u5EAB\u4E2D"},
-        {"Certificate.was.not.added.to.keystore",
-                "\u6191\u8B49\u672A\u65B0\u589E\u81F3\u91D1\u9470\u5132\u5B58\u5EAB\u4E2D"},
-        {".Storing.ksfname.", "[\u5132\u5B58 {0}]"},
-        {"alias.has.no.public.key.certificate.",
-                "{0} \u6C92\u6709\u516C\u958B\u91D1\u9470 (\u6191\u8B49)"},
-        {"Cannot.derive.signature.algorithm",
-                "\u7121\u6CD5\u53D6\u5F97\u7C3D\u7AE0\u6F14\u7B97\u6CD5"},
-        {"Alias.alias.does.not.exist",
-                "\u5225\u540D <{0}> \u4E0D\u5B58\u5728"},
-        {"Alias.alias.has.no.certificate",
-                "\u5225\u540D <{0}> \u6C92\u6709\u6191\u8B49"},
-        {"Key.pair.not.generated.alias.alias.already.exists",
-                "\u6C92\u6709\u5EFA\u7ACB\u91D1\u9470\u7D44\uFF0C\u5225\u540D <{0}> \u5DF2\u7D93\u5B58\u5728"},
-        {"Generating.keysize.bit.keyAlgName.key.pair.and.self.signed.certificate.sigAlgName.with.a.validity.of.validality.days.for",
-                "\u91DD\u5C0D {4} \u7522\u751F\u6709\u6548\u671F {3} \u5929\u7684 {0} \u4F4D\u5143 {1} \u91D1\u9470\u7D44\u4EE5\u53CA\u81EA\u6211\u7C3D\u7F72\u6191\u8B49 ({2})\n\t"},
-        {"Enter.key.password.for.alias.", "\u8F38\u5165 <{0}> \u7684\u91D1\u9470\u5BC6\u78BC"},
-        {".RETURN.if.same.as.keystore.password.",
-                "\t(RETURN \u5982\u679C\u548C\u91D1\u9470\u5132\u5B58\u5EAB\u5BC6\u78BC\u76F8\u540C):  "},
-        {"Key.password.is.too.short.must.be.at.least.6.characters",
-                "\u91D1\u9470\u5BC6\u78BC\u592A\u77ED - \u5FC5\u9808\u81F3\u5C11\u70BA 6 \u500B\u5B57\u5143"},
-        {"Too.many.failures.key.not.added.to.keystore",
-                "\u592A\u591A\u932F\u8AA4 - \u91D1\u9470\u672A\u65B0\u589E\u81F3\u91D1\u9470\u5132\u5B58\u5EAB"},
-        {"Destination.alias.dest.already.exists",
-                "\u76EE\u7684\u5730\u5225\u540D <{0}> \u5DF2\u7D93\u5B58\u5728"},
-        {"Password.is.too.short.must.be.at.least.6.characters",
-                "\u5BC6\u78BC\u592A\u77ED - \u5FC5\u9808\u81F3\u5C11\u70BA 6 \u500B\u5B57\u5143"},
-        {"Too.many.failures.Key.entry.not.cloned",
-                "\u592A\u591A\u932F\u8AA4\u3002\u672A\u8907\u88FD\u91D1\u9470\u9805\u76EE"},
-        {"key.password.for.alias.", "<{0}> \u7684\u91D1\u9470\u5BC6\u78BC"},
-        {"Keystore.entry.for.id.getName.already.exists",
-                "<{0}> \u7684\u91D1\u9470\u5132\u5B58\u5EAB\u9805\u76EE\u5DF2\u7D93\u5B58\u5728"},
-        {"Creating.keystore.entry.for.id.getName.",
-                "\u5EFA\u7ACB <{0}> \u7684\u91D1\u9470\u5132\u5B58\u5EAB\u9805\u76EE..."},
-        {"No.entries.from.identity.database.added",
-                "\u6C92\u6709\u65B0\u589E\u4F86\u81EA\u8B58\u5225\u8CC7\u6599\u5EAB\u7684\u9805\u76EE"},
-        {"Alias.name.alias", "\u5225\u540D\u540D\u7A31: {0}"},
-        {"Creation.date.keyStore.getCreationDate.alias.",
-                "\u5EFA\u7ACB\u65E5\u671F: {0,date}"},
-        {"alias.keyStore.getCreationDate.alias.",
-                "{0}, {1,date}, "},
-        {"alias.", "{0}, "},
-        {"Entry.type.type.", "\u9805\u76EE\u985E\u578B: {0}"},
-        {"Certificate.chain.length.", "\u6191\u8B49\u93C8\u9577\u5EA6: "},
-        {"Certificate.i.1.", "\u6191\u8B49 [{0,number,integer}]:"},
-        {"Certificate.fingerprint.SHA.256.", "\u6191\u8B49\u6307\u7D0B (SHA-256): "},
-        {"Keystore.type.", "\u91D1\u9470\u5132\u5B58\u5EAB\u985E\u578B: "},
-        {"Keystore.provider.", "\u91D1\u9470\u5132\u5B58\u5EAB\u63D0\u4F9B\u8005: "},
-        {"Your.keystore.contains.keyStore.size.entry",
-                "\u60A8\u7684\u91D1\u9470\u5132\u5B58\u5EAB\u5305\u542B {0,number,integer} \u9805\u76EE"},
-        {"Your.keystore.contains.keyStore.size.entries",
-                "\u60A8\u7684\u91D1\u9470\u5132\u5B58\u5EAB\u5305\u542B {0,number,integer} \u9805\u76EE"},
-        {"Failed.to.parse.input", "\u7121\u6CD5\u5256\u6790\u8F38\u5165"},
-        {"Empty.input", "\u7A7A\u8F38\u5165"},
-        {"Not.X.509.certificate", "\u975E X.509 \u6191\u8B49"},
-        {"alias.has.no.public.key", "{0} \u7121\u516C\u958B\u91D1\u9470"},
-        {"alias.has.no.X.509.certificate", "{0} \u7121 X.509 \u6191\u8B49"},
-        {"New.certificate.self.signed.", "\u65B0\u6191\u8B49 (\u81EA\u6211\u7C3D\u7F72): "},
-        {"Reply.has.no.certificates", "\u56DE\u8986\u4E0D\u542B\u6191\u8B49"},
-        {"Certificate.not.imported.alias.alias.already.exists",
-                "\u6191\u8B49\u672A\u8F38\u5165\uFF0C\u5225\u540D <{0}> \u5DF2\u7D93\u5B58\u5728"},
-        {"Input.not.an.X.509.certificate", "\u8F38\u5165\u7684\u4E0D\u662F X.509 \u6191\u8B49"},
-        {"Certificate.already.exists.in.keystore.under.alias.trustalias.",
-                "\u91D1\u9470\u5132\u5B58\u5EAB\u4E2D\u7684 <{0}> \u5225\u540D\u4E4B\u4E0B\uFF0C\u6191\u8B49\u5DF2\u7D93\u5B58\u5728"},
-        {"Do.you.still.want.to.add.it.no.",
-                "\u60A8\u4ECD\u7136\u60F3\u8981\u5C07\u4E4B\u65B0\u589E\u55CE\uFF1F [\u5426]:  "},
-        {"Certificate.already.exists.in.system.wide.CA.keystore.under.alias.trustalias.",
-                "\u6574\u500B\u7CFB\u7D71 CA \u91D1\u9470\u5132\u5B58\u5EAB\u4E2D\u7684 <{0}> \u5225\u540D\u4E4B\u4E0B\uFF0C\u6191\u8B49\u5DF2\u7D93\u5B58\u5728"},
-        {"Do.you.still.want.to.add.it.to.your.own.keystore.no.",
-                "\u60A8\u4ECD\u7136\u60F3\u8981\u5C07\u4E4B\u65B0\u589E\u81F3\u81EA\u5DF1\u7684\u91D1\u9470\u5132\u5B58\u5EAB\u55CE\uFF1F [\u5426]:  "},
-        {"Trust.this.certificate.no.", "\u4FE1\u4EFB\u9019\u500B\u6191\u8B49\uFF1F [\u5426]:  "},
-        {"YES", "\u662F"},
-        {"New.prompt.", "\u65B0 {0}: "},
-        {"Passwords.must.differ", "\u5FC5\u9808\u662F\u4E0D\u540C\u7684\u5BC6\u78BC"},
-        {"Re.enter.new.prompt.", "\u91CD\u65B0\u8F38\u5165\u65B0 {0}: "},
-        {"Re.enter.password.", "\u91CD\u65B0\u8F38\u5165\u5BC6\u78BC:"},
-        {"Re.enter.new.password.", "\u91CD\u65B0\u8F38\u5165\u65B0\u5BC6\u78BC: "},
-        {"They.don.t.match.Try.again", "\u5B83\u5011\u4E0D\u76F8\u7B26\u3002\u8ACB\u91CD\u8A66"},
-        {"Enter.prompt.alias.name.", "\u8F38\u5165 {0} \u5225\u540D\u540D\u7A31:  "},
-        {"Enter.new.alias.name.RETURN.to.cancel.import.for.this.entry.",
-                 "\u8ACB\u8F38\u5165\u65B0\u7684\u5225\u540D\u540D\u7A31\t(RETURN \u4EE5\u53D6\u6D88\u532F\u5165\u6B64\u9805\u76EE):"},
-        {"Enter.alias.name.", "\u8F38\u5165\u5225\u540D\u540D\u7A31:  "},
-        {".RETURN.if.same.as.for.otherAlias.",
-                "\t(RETURN \u5982\u679C\u548C <{0}> \u7684\u76F8\u540C)"},
-        {"What.is.your.first.and.last.name.",
-                "\u60A8\u7684\u540D\u5B57\u8207\u59D3\u6C0F\u70BA\u4F55\uFF1F"},
-        {"What.is.the.name.of.your.organizational.unit.",
-                "\u60A8\u7684\u7D44\u7E54\u55AE\u4F4D\u540D\u7A31\u70BA\u4F55\uFF1F"},
-        {"What.is.the.name.of.your.organization.",
-                "\u60A8\u7684\u7D44\u7E54\u540D\u7A31\u70BA\u4F55\uFF1F"},
-        {"What.is.the.name.of.your.City.or.Locality.",
-                "\u60A8\u6240\u5728\u7684\u57CE\u5E02\u6216\u5730\u5340\u540D\u7A31\u70BA\u4F55\uFF1F"},
-        {"What.is.the.name.of.your.State.or.Province.",
-                "\u60A8\u6240\u5728\u7684\u5DDE\u53CA\u7701\u4EFD\u540D\u7A31\u70BA\u4F55\uFF1F"},
-        {"What.is.the.two.letter.country.code.for.this.unit.",
-                "\u6B64\u55AE\u4F4D\u7684\u5169\u500B\u5B57\u6BCD\u570B\u5225\u4EE3\u78BC\u70BA\u4F55\uFF1F"},
-        {"Is.name.correct.", "{0} \u6B63\u78BA\u55CE\uFF1F"},
-        {"no", "\u5426"},
-        {"yes", "\u662F"},
-        {"y", "y"},
-        {".defaultValue.", "  [{0}]:  "},
-        {"Alias.alias.has.no.key",
-                "\u5225\u540D <{0}> \u6C92\u6709\u91D1\u9470"},
-        {"Alias.alias.references.an.entry.type.that.is.not.a.private.key.entry.The.keyclone.command.only.supports.cloning.of.private.key",
-                 "\u5225\u540D <{0}> \u6240\u53C3\u7167\u7684\u9805\u76EE\u4E0D\u662F\u79C1\u5BC6\u91D1\u9470\u985E\u578B\u3002-keyclone \u547D\u4EE4\u50C5\u652F\u63F4\u79C1\u5BC6\u91D1\u9470\u9805\u76EE\u7684\u8907\u88FD"},
-
-        {".WARNING.WARNING.WARNING.",
-            "*****************  WARNING WARNING WARNING  *****************"},
-        {"Signer.d.", "\u7C3D\u7F72\u8005 #%d:"},
-        {"Timestamp.", "\u6642\u6233:"},
-        {"Signature.", "\u7C3D\u7AE0:"},
-        {"CRLs.", "CRL:"},
-        {"Certificate.owner.", "\u6191\u8B49\u64C1\u6709\u8005: "},
-        {"Not.a.signed.jar.file", "\u4E0D\u662F\u7C3D\u7F72\u7684 jar \u6A94\u6848"},
-        {"No.certificate.from.the.SSL.server",
-                "\u6C92\u6709\u4F86\u81EA SSL \u4F3A\u670D\u5668\u7684\u6191\u8B49"},
-
-        {".The.integrity.of.the.information.stored.in.your.keystore.",
-            "* \u5C1A\u672A\u9A57\u8B49\u5132\u5B58\u65BC\u91D1\u9470\u5132\u5B58\u5EAB\u4E2D\u8CC7\u8A0A  *\n* \u7684\u5B8C\u6574\u6027\uFF01\u82E5\u8981\u9A57\u8B49\u5176\u5B8C\u6574\u6027\uFF0C    *\n* \u60A8\u5FC5\u9808\u63D0\u4F9B\u60A8\u7684\u91D1\u9470\u5132\u5B58\u5EAB\u5BC6\u78BC\u3002  *"},
-        {".The.integrity.of.the.information.stored.in.the.srckeystore.",
-            "* \u5C1A\u672A\u9A57\u8B49\u5132\u5B58\u65BC srckeystore \u4E2D\u8CC7\u8A0A  *\n* \u7684\u5B8C\u6574\u6027\uFF01\u82E5\u8981\u9A57\u8B49\u5176\u5B8C\u6574\u6027\uFF0C\u60A8\u5FC5\u9808 *\n* \u63D0\u4F9B srckeystore \u5BC6\u78BC\u3002            *"},
-
-        {"Certificate.reply.does.not.contain.public.key.for.alias.",
-                "\u6191\u8B49\u56DE\u8986\u4E26\u672A\u5305\u542B <{0}> \u7684\u516C\u958B\u91D1\u9470"},
-        {"Incomplete.certificate.chain.in.reply",
-                "\u56DE\u8986\u6642\u7684\u6191\u8B49\u93C8\u4E0D\u5B8C\u6574"},
-        {"Certificate.chain.in.reply.does.not.verify.",
-                "\u56DE\u8986\u6642\u7684\u6191\u8B49\u93C8\u672A\u9A57\u8B49: "},
-        {"Top.level.certificate.in.reply.",
-                "\u56DE\u8986\u6642\u7684\u6700\u9AD8\u7D1A\u6191\u8B49:\n"},
-        {".is.not.trusted.", "... \u662F\u4E0D\u88AB\u4FE1\u4EFB\u7684\u3002"},
-        {"Install.reply.anyway.no.", "\u9084\u662F\u8981\u5B89\u88DD\u56DE\u8986\uFF1F [\u5426]:  "},
-        {"NO", "\u5426"},
-        {"Public.keys.in.reply.and.keystore.don.t.match",
-                "\u56DE\u8986\u6642\u7684\u516C\u958B\u91D1\u9470\u8207\u91D1\u9470\u5132\u5B58\u5EAB\u4E0D\u7B26"},
-        {"Certificate.reply.and.certificate.in.keystore.are.identical",
-                "\u6191\u8B49\u56DE\u8986\u8207\u91D1\u9470\u5132\u5B58\u5EAB\u4E2D\u7684\u6191\u8B49\u662F\u76F8\u540C\u7684"},
-        {"Failed.to.establish.chain.from.reply",
-                "\u7121\u6CD5\u5F9E\u56DE\u8986\u4E2D\u5C07\u93C8\u5EFA\u7ACB\u8D77\u4F86"},
-        {"n", "n"},
-        {"Wrong.answer.try.again", "\u932F\u8AA4\u7684\u7B54\u6848\uFF0C\u8ACB\u518D\u8A66\u4E00\u6B21"},
-        {"Secret.key.not.generated.alias.alias.already.exists",
-                "\u672A\u7522\u751F\u79D8\u5BC6\u91D1\u9470\uFF0C\u5225\u540D <{0}> \u5DF2\u5B58\u5728"},
-        {"Please.provide.keysize.for.secret.key.generation",
-                "\u8ACB\u63D0\u4F9B -keysize \u4EE5\u7522\u751F\u79D8\u5BC6\u91D1\u9470"},
-
-        {"warning.not.verified.make.sure.keystore.is.correct",
-            "\u8B66\u544A: \u672A\u9A57\u8B49\u3002\u8ACB\u78BA\u5B9A -keystore \u6B63\u78BA\u3002"},
-
-        {"Extensions.", "\u64F4\u5145\u5957\u4EF6: "},
-        {".Empty.value.", "(\u7A7A\u767D\u503C)"},
-        {"Extension.Request.", "\u64F4\u5145\u5957\u4EF6\u8981\u6C42:"},
-        {"Unknown.keyUsage.type.", "\u4E0D\u660E\u7684 keyUsage \u985E\u578B: "},
-        {"Unknown.extendedkeyUsage.type.", "\u4E0D\u660E\u7684 extendedkeyUsage \u985E\u578B: "},
-        {"Unknown.AccessDescription.type.", "\u4E0D\u660E\u7684 AccessDescription \u985E\u578B: "},
-        {"Unrecognized.GeneralName.type.", "\u7121\u6CD5\u8FA8\u8B58\u7684 GeneralName \u985E\u578B: "},
-        {"This.extension.cannot.be.marked.as.critical.",
-                 "\u6B64\u64F4\u5145\u5957\u4EF6\u7121\u6CD5\u6A19\u793A\u70BA\u95DC\u9375\u3002"},
-        {"Odd.number.of.hex.digits.found.", "\u627E\u5230\u5341\u516D\u9032\u4F4D\u6578\u5B57\u7684\u5947\u6578: "},
-        {"Unknown.extension.type.", "\u4E0D\u660E\u7684\u64F4\u5145\u5957\u4EF6\u985E\u578B: "},
-        {"command.{0}.is.ambiguous.", "\u547D\u4EE4 {0} \u4E0D\u660E\u78BA:"},
-
-        // 8171319: keytool should print out warnings when reading or
-        // generating cert/cert req using weak algorithms
-        {"the.certificate.request", "\u6191\u8B49\u8981\u6C42"},
-        {"the.issuer", "\u767C\u884C\u4EBA"},
-        {"the.generated.certificate", "\u7522\u751F\u7684\u6191\u8B49"},
-        {"the.generated.crl", "\u7522\u751F\u7684 CRL"},
-        {"the.generated.certificate.request", "\u7522\u751F\u7684\u6191\u8B49\u8981\u6C42"},
-        {"the.certificate", "\u6191\u8B49"},
-        {"the.crl", "CRL"},
-        {"the.tsa.certificate", "TSA \u6191\u8B49"},
-        {"the.input", "\u8F38\u5165"},
-        {"reply", "\u56DE\u8986"},
-        {"one.in.many", "%1$s #%2$d / %3$d"},
-        {"alias.in.cacerts", "cacerts \u4E2D\u7684\u767C\u884C\u4EBA <%s>"},
-        {"alias.in.keystore", "\u767C\u884C\u4EBA <%s>"},
-        {"with.weak", "%s (\u4F4E\u5F37\u5EA6)"},
-        {"key.bit", "%1$d \u4F4D\u5143\u7684 %2$s \u91D1\u9470"},
-        {"key.bit.weak", "%1$d \u4F4D\u5143\u7684 %2$s \u91D1\u9470 (\u4F4E\u5F37\u5EA6)"},
-        {"unknown.size.1", "%s \u91D1\u9470\u5927\u5C0F\u4E0D\u660E"},
-        {".PATTERN.printX509Cert.with.weak",
-                "\u64C1\u6709\u8005: {0}\n\u767C\u884C\u4EBA: {1}\n\u5E8F\u865F: {2}\n\u6709\u6548\u671F\u81EA: {3} \u5230: {4}\n\u6191\u8B49\u6307\u7D0B:\n\t SHA1: {5}\n\t SHA256: {6}\n\u7C3D\u7AE0\u6F14\u7B97\u6CD5\u540D\u7A31: {7}\n\u4E3B\u9AD4\u516C\u958B\u91D1\u9470\u6F14\u7B97\u6CD5: {8}\n\u7248\u672C: {9}"},
-        {"PKCS.10.with.weak",
-                "PKCS #10 \u6191\u8B49\u8981\u6C42 (\u7248\u672C 1.0)\n\u4E3B\u9AD4: %1$s\n\u683C\u5F0F: %2$s\n\u516C\u7528\u91D1\u9470: %3$s\n\u7C3D\u7AE0\u6F14\u7B97\u6CD5: %4$s\n"},
-        {"verified.by.s.in.s.weak", "\u7531 %2$s \u4E2D\u7684 %1$s \u4EE5 %3$s \u9A57\u8B49"},
-        {"whose.sigalg.risk", "%1$s \u4F7F\u7528\u7684 %2$s \u7C3D\u7AE0\u6F14\u7B97\u6CD5\u5B58\u5728\u5B89\u5168\u98A8\u96AA\u3002"},
-        {"whose.key.risk", "%1$s \u4F7F\u7528\u7684 %2$s \u5B58\u5728\u5B89\u5168\u98A8\u96AA\u3002"},
-        {"jks.storetype.warning", "%1$s \u91D1\u9470\u5132\u5B58\u5EAB\u4F7F\u7528\u5C08\u6709\u683C\u5F0F\u3002\u5EFA\u8B70\u60A8\u4F7F\u7528 \"keytool -importkeystore -srckeystore %2$s -destkeystore %2$s -deststoretype pkcs12\" \u79FB\u8F49\u6210\u70BA\u4F7F\u7528 PKCS12 (\u696D\u754C\u6A19\u6E96\u683C\u5F0F)\u3002"},
-        {"migrate.keystore.warning", "\u5DF2\u5C07 \"%1$s\" \u79FB\u8F49\u6210\u70BA %4$s\u3002%2$s \u91D1\u9470\u5132\u5B58\u5EAB\u5DF2\u5099\u4EFD\u70BA \"%3$s\"\u3002"},
-        {"backup.keystore.warning", "\u539F\u59CB\u7684\u91D1\u9470\u5132\u5B58\u5EAB \"%1$s\" \u5DF2\u5099\u4EFD\u70BA \"%3$s\"..."},
-        {"importing.keystore.status", "\u6B63\u5728\u5C07\u91D1\u9470\u5132\u5B58\u5EAB %1$s \u532F\u5165 %2$s..."},
-    };
-
-
-    /**
-     * Returns the contents of this <code>ResourceBundle</code>.
-     *
-     * <p>
-     *
-     * @return the contents of this <code>ResourceBundle</code>.
-     */
-    @Override
-    public Object[][] getContents() {
-        return contents;
-    }
-}
diff --git a/src/java.base/share/classes/sun/security/tools/keytool/resources/keytool.properties b/src/java.base/share/classes/sun/security/tools/keytool/resources/keytool.properties
new file mode 100644
index 00000000000..fb03573a7d5
--- /dev/null
+++ b/src/java.base/share/classes/sun/security/tools/keytool/resources/keytool.properties
@@ -0,0 +1,329 @@
+#
+# Copyright (c) 2000, 2025, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute 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.
+#
+
+NEWLINE=\n
+STAR=*******************************************
+STARNN=*******************************************\n\n
+# keytool: Help part
+.OPTION.=\u0020[OPTION]...
+Options.=Options:
+option.1.set.twice=The %s option is specified multiple times. All except the last one will be ignored.
+multiple.commands.1.2=Only one command is allowed: both %1$s and %2$s were specified.
+Use.keytool.help.for.all.available.commands=Use "keytool -?, -h, or --help" for this help message
+Key.and.Certificate.Management.Tool=Key and Certificate Management Tool
+Commands.=Commands:
+Use.keytool.command.name.help.for.usage.of.command.name=Use "keytool -command_name --help" for usage of command_name.\n\
+Use the -conf <url> option to specify a pre-configured options file.
+# keytool: help: commands
+Generates.a.certificate.request=Generates a certificate request
+Changes.an.entry.s.alias=Changes an entry's alias
+Deletes.an.entry=Deletes an entry
+Exports.certificate=Exports certificate
+Generates.a.key.pair=Generates a key pair
+Generates.a.secret.key=Generates a secret key
+Generates.certificate.from.a.certificate.request=Generates certificate from a certificate request
+Generates.CRL=Generates CRL
+Generated.keyAlgName.secret.key=Generated {0} secret key
+Generated.keysize.bit.keyAlgName.secret.key=Generated {0}-bit {1} secret key
+key.algorithm.weak=%1$s uses the %2$s algorithm which is considered a security risk.
+key.size.weak=%1$s uses a %2$s which is considered a security risk.
+Imports.entries.from.a.JDK.1.1.x.style.identity.database=Imports entries from a JDK 1.1.x-style identity database
+Imports.a.certificate.or.a.certificate.chain=Imports a certificate or a certificate chain
+Imports.a.password=Imports a password
+Imports.one.or.all.entries.from.another.keystore=Imports one or all entries from another keystore
+Clones.a.key.entry=Clones a key entry
+Changes.the.key.password.of.an.entry=Changes the key password of an entry
+Lists.entries.in.a.keystore=Lists entries in a keystore
+Prints.the.content.of.a.certificate=Prints the content of a certificate
+Prints.the.content.of.a.certificate.request=Prints the content of a certificate request
+Prints.the.content.of.a.CRL.file=Prints the content of a CRL file
+Generates.a.self.signed.certificate=Generates a self-signed certificate
+Changes.the.store.password.of.a.keystore=Changes the store password of a keystore
+showinfo.command.help=Displays security-related information
+Prints.the.program.version=Prints the program version
+# keytool: help: options
+alias.name.of.the.entry.to.process=alias name of the entry to process
+groupname.option.help=Group name. For example, an Elliptic Curve name.
+destination.alias=destination alias
+destination.key.password=destination key password
+destination.keystore.name=destination keystore name
+destination.keystore.password.protected=destination keystore password protected
+destination.keystore.provider.name=destination keystore provider name
+destination.keystore.password=destination keystore password
+destination.keystore.type=destination keystore type
+distinguished.name=distinguished name
+X.509.extension=X.509 extension
+output.file.name=output file name
+input.file.name=input file name
+key.algorithm.name=key algorithm name
+key.password=key password
+key.bit.size=key bit size
+keystore.name=keystore name
+access.the.cacerts.keystore=access the cacerts keystore
+warning.cacerts.option=Warning: use -cacerts option to access cacerts keystore
+new.password=new password
+do.not.prompt=do not prompt
+password.through.protected.mechanism=password through protected mechanism
+tls.option.help=Displays TLS configuration information
+# The following 2 values should span 2 lines, the first for the
+# option itself, the second for its -providerArg value.
+addprovider.option=add security provider by name (e.g. SunPKCS11)\n\
+configure argument for -addprovider
+provider.class.option=add security provider by fully-qualified class name\n\
+configure argument for -providerclass
+
+provider.name=provider name
+provider.classpath=provider classpath
+output.in.RFC.style=output in RFC style
+signature.algorithm.name=signature algorithm name
+signer.alias=signer alias
+signer.key.password=signer key password
+source.alias=source alias
+source.key.password=source key password
+source.keystore.name=source keystore name
+source.keystore.password.protected=source keystore password protected
+source.keystore.provider.name=source keystore provider name
+source.keystore.password=source keystore password
+source.keystore.type=source keystore type
+SSL.server.host.and.port=SSL server host and port
+signed.jar.file=signed jar file
+certificate.validity.start.date.time=certificate validity start date/time
+keystore.password=keystore password
+keystore.type=keystore type
+trust.certificates.from.cacerts=trust certificates from cacerts
+verbose.output=verbose output
+validity.number.of.days=validity number of days
+Serial.ID.of.cert.to.revoke=Serial ID of cert to revoke
+# keytool: Running part
+keytool.error.=keytool error:\u0020
+Illegal.option.=Illegal option: \u0020
+Illegal.value.=Illegal value:\u0020
+Unknown.password.type.=Unknown password type:\u0020
+Cannot.find.environment.variable.=Cannot find environment variable:\u0020
+Cannot.find.file.=Cannot find file:\u0020
+Command.option.flag.needs.an.argument.=Command option {0} needs an argument.
+Warning.Different.store.and.key.passwords.not.supported.for.PKCS12.KeyStores.Ignoring.user.specified.command.value.=Warning:  Different store and key passwords not supported for PKCS12 KeyStores. Ignoring user-specified {0} value.
+the.keystore.or.storetype.option.cannot.be.used.with.the.cacerts.option=The -keystore or -storetype option cannot be used with the -cacerts option
+.keystore.must.be.NONE.if.storetype.is.{0}=-keystore must be NONE if -storetype is {0}
+Too.many.retries.program.terminated=Too many retries, program terminated
+.storepasswd.and.keypasswd.commands.not.supported.if.storetype.is.{0}=-storepasswd and -keypasswd commands not supported if -storetype is {0}
+.keypasswd.commands.not.supported.if.storetype.is.PKCS12=-keypasswd commands not supported if -storetype is PKCS12
+.keypass.and.new.can.not.be.specified.if.storetype.is.{0}=-keypass and -new can not be specified if -storetype is {0}
+if.protected.is.specified.then.storepass.keypass.and.new.must.not.be.specified=if -protected is specified, then -storepass, -keypass, and -new must not be specified
+if.srcprotected.is.specified.then.srcstorepass.and.srckeypass.must.not.be.specified=if -srcprotected is specified, then -srcstorepass and -srckeypass must not be specified
+if.keystore.is.not.password.protected.then.storepass.keypass.and.new.must.not.be.specified=if keystore is not password protected, then -storepass, -keypass, and -new must not be specified
+if.source.keystore.is.not.password.protected.then.srcstorepass.and.srckeypass.must.not.be.specified=if source keystore is not password protected, then -srcstorepass and -srckeypass must not be specified
+Illegal.startdate.value=Illegal startdate value
+Validity.must.be.greater.than.zero=Validity must be greater than zero
+provclass.not.a.provider=%s not a provider
+provider.name.not.found=Provider named "%s" not found
+provider.class.not.found=Provider "%s" not found
+Usage.error.no.command.provided=Usage error: no command provided
+Source.keystore.file.exists.but.is.empty.=Source keystore file exists, but is empty:\u0020
+Please.specify.srckeystore=Please specify -srckeystore
+Must.not.specify.both.v.and.rfc.with.list.command=Must not specify both -v and -rfc with 'list' command
+Key.password.must.be.at.least.6.characters=Key password must be at least 6 characters
+New.password.must.be.at.least.6.characters=New password must be at least 6 characters
+Keystore.file.exists.but.is.empty.=Keystore file exists, but is empty:\u0020
+Keystore.file.does.not.exist.=Keystore file does not exist:\u0020
+Must.specify.destination.alias=Must specify destination alias
+Must.specify.alias=Must specify alias
+Keystore.password.must.be.at.least.6.characters=Keystore password must be at least 6 characters
+Enter.the.password.to.be.stored.=Enter the password to be stored: \u0020
+Enter.keystore.password.=Enter keystore password: \u0020
+Enter.source.keystore.password.=Enter source keystore password: \u0020
+Enter.destination.keystore.password.=Enter destination keystore password: \u0020
+Keystore.password.is.too.short.must.be.at.least.6.characters=Keystore password is too short - must be at least 6 characters
+Unknown.Entry.Type=Unknown Entry Type
+Entry.for.alias.alias.successfully.imported.=Entry for alias {0} successfully imported.
+Entry.for.alias.alias.not.imported.=Entry for alias {0} not imported.
+Problem.importing.entry.for.alias.alias.exception.Entry.for.alias.alias.not.imported.=Problem importing entry for alias {0}: {1}.\nEntry for alias {0} not imported.
+Import.command.completed.ok.entries.successfully.imported.fail.entries.failed.or.cancelled=Import command completed:  {0} entries successfully imported, {1} entries failed or cancelled
+Warning.Overwriting.existing.alias.alias.in.destination.keystore=Warning: Overwriting existing alias {0} in destination keystore
+Existing.entry.alias.alias.exists.overwrite.no.=Existing entry alias {0} exists, overwrite? [no]: \u0020
+Too.many.failures.try.later=Too many failures - try later
+Certification.request.stored.in.file.filename.=Certification request stored in file <{0}>
+Submit.this.to.your.CA=Submit this to your CA
+if.alias.not.specified.destalias.and.srckeypass.must.not.be.specified=if alias not specified, destalias and srckeypass must not be specified
+The.destination.pkcs12.keystore.has.different.storepass.and.keypass.Please.retry.with.destkeypass.specified.=The destination pkcs12 keystore has different storepass and keypass. Please retry with -destkeypass specified.
+Certificate.stored.in.file.filename.=Certificate stored in file <{0}>
+Certificate.reply.was.installed.in.keystore=Certificate reply was installed in keystore
+Certificate.reply.was.not.installed.in.keystore=Certificate reply was not installed in keystore
+Certificate.was.added.to.keystore=Certificate was added to keystore
+Certificate.was.not.added.to.keystore=Certificate was not added to keystore
+.Storing.ksfname.=[Storing {0}]
+alias.has.no.public.key.certificate.={0} has no public key (certificate)
+Cannot.derive.signature.algorithm=Cannot derive signature algorithm
+Alias.alias.does.not.exist=Alias <{0}> does not exist
+Alias.alias.has.no.certificate=Alias <{0}> has no certificate
+groupname.keysize.coexist=Cannot specify both -groupname and -keysize
+deprecate.keysize.for.ec=Specifying -keysize for generating EC keys is deprecated, please use "-groupname %s" instead.
+Key.pair.not.generated.alias.alias.already.exists=Key pair not generated, alias <{0}> already exists
+size.bit.alg=%1$d-bit %2$s
+Generating.full.keyAlgName.key.pair.and.self.signed.certificate.sigAlgName.with.a.validity.of.days.for=Generating {0} key pair and self-signed certificate ({1}) with a validity of {2} days\n\tfor: {3}
+Generating.full.keyAlgName.key.pair.and.a.certificate.sigAlgName.issued.by.signerAlias.with.a.validity.of.days.for=Generating {0} key pair and a certificate ({1}) issued by <{2}> with a validity of {3} days\n\tfor: {4}
+Enter.key.password.for.alias.=Enter key password for <{0}>
+.RETURN.if.same.as.keystore.password.=\t(RETURN if same as keystore password): \u0020
+Key.password.is.too.short.must.be.at.least.6.characters=Key password is too short - must be at least 6 characters
+Too.many.failures.key.not.added.to.keystore=Too many failures - key not added to keystore
+Destination.alias.dest.already.exists=Destination alias <{0}> already exists
+Password.is.too.short.must.be.at.least.6.characters=Password is too short - must be at least 6 characters
+Too.many.failures.Key.entry.not.cloned=Too many failures. Key entry not cloned
+key.password.for.alias.=key password for <{0}>
+No.entries.from.identity.database.added=No entries from identity database added
+Alias.name.alias=Alias name: {0}
+Creation.date.keyStore.getCreationDate.alias.=Creation date: {0,date}
+alias.keyStore.getCreationDate.alias.={0}, {1,date},\u0020
+alias.={0},\u0020
+Entry.type.type.=Entry type: {0}
+Certificate.chain.length.=Certificate chain length:\u0020
+Certificate.i.1.=Certificate[{0,number,integer}]:
+Certificate.fingerprint.SHA.256.=Certificate fingerprint (SHA-256):\u0020
+Keystore.type.=Keystore type:\u0020
+Keystore.provider.=Keystore provider:\u0020
+Your.keystore.contains.keyStore.size.entry=Your keystore contains {0,number,integer} entry
+Your.keystore.contains.keyStore.size.entries=Your keystore contains {0,number,integer} entries
+Failed.to.parse.input=Failed to parse input
+Empty.input=Empty input
+Not.X.509.certificate=Not X.509 certificate
+alias.has.no.public.key={0} has no public key
+alias.has.no.X.509.certificate={0} has no X.509 certificate
+New.certificate.self.signed.=New certificate (self-signed):
+Reply.has.no.certificates=Reply has no certificates
+Certificate.not.imported.alias.alias.already.exists=Certificate not imported, alias <{0}> already exists
+Input.not.an.X.509.certificate=Input not an X.509 certificate
+Certificate.already.exists.in.keystore.under.alias.trustalias.=Certificate already exists in keystore under alias <{0}>
+Do.you.still.want.to.add.it.no.=Do you still want to add it? [no]: \u0020
+Certificate.already.exists.in.system.wide.CA.keystore.under.alias.trustalias.=Certificate already exists in system-wide CA keystore under alias <{0}>
+Do.you.still.want.to.add.it.to.your.own.keystore.no.=Do you still want to add it to your own keystore? [no]: \u0020
+Trust.this.certificate.no.=Trust this certificate? [no]: \u0020
+New.prompt.=New {0}:\u0020
+Passwords.must.differ=Passwords must differ
+Re.enter.new.prompt.=Re-enter new {0}:\u0020
+Re.enter.password.=Re-enter password:\u0020
+Re.enter.new.password.=Re-enter new password:\u0020
+They.don.t.match.Try.again=They don't match. Try again
+Enter.prompt.alias.name.=Enter {0} alias name: \u0020
+Enter.new.alias.name.RETURN.to.cancel.import.for.this.entry.=Enter new alias name\t(RETURN to cancel import for this entry): \u0020
+Enter.alias.name.=Enter alias name: \u0020
+.RETURN.if.same.as.for.otherAlias.=\t(RETURN if same as for <{0}>)
+enter.dname.components=Enter the distinguished name. Provide a single dot (.) to leave a sub-component empty or press ENTER to use the default value in braces.
+What.is.your.first.and.last.name.=What is your first and last name?
+What.is.the.name.of.your.organizational.unit.=What is the name of your organizational unit?
+What.is.the.name.of.your.organization.=What is the name of your organization?
+What.is.the.name.of.your.City.or.Locality.=What is the name of your City or Locality?
+What.is.the.name.of.your.State.or.Province.=What is the name of your State or Province?
+What.is.the.two.letter.country.code.for.this.unit.=What is the two-letter country code for this unit?
+no.field.in.dname=At least one field must be provided. Enter again.
+Is.name.correct.=Is {0} correct?
+no=no
+yes=yes
+y=y
+.defaultValue.=\u0020 [{0}]: \u0020
+Alias.alias.has.no.key=Alias <{0}> has no key
+Alias.alias.references.an.entry.type.that.is.not.a.private.key.entry.The.keyclone.command.only.supports.cloning.of.private.key=Alias <{0}> references an entry type that is not a private key entry.  The -keyclone command only supports cloning of private key entries
+
+.WARNING.WARNING.WARNING.=*****************  WARNING WARNING WARNING  *****************
+Signer.d.=Signer #%d:
+Certificate.d.=Certificate #%d:
+Timestamp.=Timestamp:
+Certificate.owner.=Certificate owner:\u0020
+Not.a.signed.jar.file=Not a signed jar file
+No.certificate.from.the.SSL.server=No certificate from the SSL server
+
+.The.integrity.of.the.information.stored.in.your.keystore.=* The integrity of the information stored in your keystore  *\n\
+* has NOT been verified!  In order to verify its integrity, *\n\
+* you must provide your keystore password.                  *
+.The.integrity.of.the.information.stored.in.the.srckeystore.=* The integrity of the information stored in the srckeystore*\n\
+* has NOT been verified!  In order to verify its integrity, *\n\
+* you must provide the srckeystore password.                *
+
+Certificate.reply.does.not.contain.public.key.for.alias.=Certificate reply does not contain public key for <{0}>
+Incomplete.certificate.chain.in.reply=Incomplete certificate chain in reply
+Top.level.certificate.in.reply.=Top-level certificate in reply:\n
+.is.not.trusted.=... is not trusted.\u0020
+Install.reply.anyway.no.=Install reply anyway? [no]: \u0020
+Public.keys.in.reply.and.keystore.don.t.match=Public keys in reply and keystore don't match
+Certificate.reply.and.certificate.in.keystore.are.identical=Certificate reply and certificate in keystore are identical
+Failed.to.establish.chain.from.reply=Failed to establish chain from reply
+n=n
+Wrong.answer.try.again=Wrong answer, try again
+Secret.key.not.generated.alias.alias.already.exists=Secret Key not generated, alias <{0}> already exists
+Please.provide.keysize.for.secret.key.generation=Please provide -keysize for secret key generation
+
+warning.not.verified.make.sure.keystore.is.correct=WARNING: not verified. Make sure -keystore is correct.
+warning.not.verified.make.sure.keystore.is.correct.or.specify.trustcacerts=WARNING: not verified. Make sure -keystore is correct or specify -trustcacerts.
+
+Extensions.=Extensions:\u0020
+.Empty.value.=(Empty value)
+Extension.Request.=Extension Request:
+Unknown.keyUsage.type.=Unknown keyUsage type:\u0020
+Unknown.extendedkeyUsage.type.=Unknown extendedkeyUsage type:\u0020
+Unknown.AccessDescription.type.=Unknown AccessDescription type:\u0020
+Unrecognized.GeneralName.type.=Unrecognized GeneralName type:\u0020
+This.extension.cannot.be.marked.as.critical.=This extension cannot be marked as critical.\u0020
+Odd.number.of.hex.digits.found.=Odd number of hex digits found:\u0020
+Unknown.extension.type.=Unknown extension type:\u0020
+command.{0}.is.ambiguous.=command {0} is ambiguous:
+# 8171319: keytool should print out warnings when reading or
+# generating cert/cert req using weak algorithms
+the.certificate.request=The certificate request
+the.issuer=The issuer
+the.generated.secretkey=The generated secret key
+the.generated.certificate=The generated certificate
+the.generated.crl=The generated CRL
+the.generated.certificate.request=The generated certificate request
+the.certificate=The certificate
+the.crl=The CRL
+the.tsa.certificate=The TSA certificate
+the.input=The input
+reply=Reply
+one.in.many=%1$s #%2$d of %3$d
+one.in.many1=%1$s #%2$d
+one.in.many2=%1$s of signer #%2$d
+one.in.many3=%1$s #%2$d of signer #%3$d
+alias.in.cacerts=Issuer <%s> in cacerts
+alias.in.keystore=Issuer <%s>
+with.weak=%s (weak)
+with.disabled=%s (disabled)
+key.bit=%s key
+key.bit.weak=%s key (weak)
+key.bit.disabled=%s key (disabled)
+.PATTERN.printX509Cert.with.weak=Owner: {0}\nIssuer: {1}\nSerial number: {2}\nValid from: {3} until: {4}\nCertificate fingerprints:\n\t SHA1: {5}\n\t SHA256: {6}\nSignature algorithm name: {7}\nSubject Public Key Algorithm: {8}\nVersion: {9}
+PKCS.10.with.weak=PKCS #10 Certificate Request (Version 1.0)\n\
+Subject: %1$s\nFormat: %2$s\nPublic Key: %3$s\nSignature algorithm: %4$s\n
+verified.by.s.in.s.weak=Verified by %1$s in %2$s with a %3$s
+whose.sigalg.disabled=%1$s uses the %2$s signature algorithm which is considered a security risk and is disabled.
+whose.sigalg.usagesignedjar=%1$s uses the %2$s signature algorithm which is considered a security risk and cannot be used to sign JARs after %3$s.
+Unable.to.parse.denyAfter.string.in.exception.message=Unable to parse denyAfter date string in exception message
+whose.sigalg.weak=%1$s uses the %2$s signature algorithm which is considered a security risk.
+whose.key.disabled=%1$s uses a %2$s which is considered a security risk and is disabled.
+whose.key.weak=%1$s uses a %2$s which is considered a security risk. It will be disabled in a future update.
+jks.storetype.warning=The %1$s keystore uses a proprietary format. It is recommended to migrate to PKCS12 which is an industry standard format using "keytool -importkeystore -srckeystore %2$s -destkeystore %2$s -deststoretype pkcs12".
+migrate.keystore.warning=Migrated "%1$s" to %4$s. The %2$s keystore is backed up as "%3$s".
+backup.keystore.warning=The original keystore "%1$s" is backed up as "%3$s"...
+importing.keystore.status=Importing keystore %1$s to %2$s...
+keyalg.option.missing.error=The -keyalg option must be specified.
+showinfo.no.option=Missing option for -showinfo. Try "keytool -showinfo -tls".
diff --git a/src/java.base/share/classes/sun/security/tools/keytool/resources/keytool_de.properties b/src/java.base/share/classes/sun/security/tools/keytool/resources/keytool_de.properties
new file mode 100644
index 00000000000..6290bb2a7ac
--- /dev/null
+++ b/src/java.base/share/classes/sun/security/tools/keytool/resources/keytool_de.properties
@@ -0,0 +1,321 @@
+#
+# Copyright (c) 2000, 2025, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute 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.
+#
+
+NEWLINE=\n
+STAR=*******************************************
+STARNN=*******************************************\n\n
+# keytool: Help part
+.OPTION.=\u0020[OPTION]...
+Options.=Optionen:
+option.1.set.twice=Die Option %s wurde mehrmals angegeben. Alle Angaben bis auf die letzte werden ignoriert.
+multiple.commands.1.2=Nur ein Befehl ist zulässig: Sowohl %1$s als auch %2$s wurden angegeben.
+Use.keytool.help.for.all.available.commands=Verwenden Sie "keytool -?, -h, or --help" für diese Hilfemeldung
+Key.and.Certificate.Management.Tool=Schlüssel- und Zertifikatsverwaltungstool
+Commands.=Befehle:
+Use.keytool.command.name.help.for.usage.of.command.name=Verwenden Sie "keytool -command_name --help" für die Verwendung von command_name.\nVerwenden Sie die Option -conf <url>, um eine vorkonfigurierte Optionsdatei anzugeben.
+# keytool: help: commands
+Generates.a.certificate.request=Generiert eine Zertifikatsanforderung
+Changes.an.entry.s.alias=Ändert den Alias eines Eintrags
+Deletes.an.entry=Löscht einen Eintrag
+Exports.certificate=Exportiert ein Zertifikat
+Generates.a.key.pair=Generiert ein Schlüsselpaar
+Generates.a.secret.key=Generiert einen Secret Key
+Generates.certificate.from.a.certificate.request=Generiert ein Zertifikat aus einer Zertifikatsanforderung
+Generates.CRL=Generiert eine CRL
+Generated.keyAlgName.secret.key={0} Secret Key generiert
+Generated.keysize.bit.keyAlgName.secret.key={0}-Bit {1} Secret Key generiert
+key.algorithm.weak=%1$s verwendet den Algorithmus %2$s. Das gilt als Sicherheitsrisiko.
+key.size.weak=%1$s verwendet %2$s. Dies gilt als Sicherheitsrisiko.
+Imports.entries.from.a.JDK.1.1.x.style.identity.database=Importiert Einträge aus einer Identity-Datenbank im JDK 1.1.x-Stil
+Imports.a.certificate.or.a.certificate.chain=Importiert ein Zertifikat oder eine Zertifikatskette
+Imports.a.password=Importiert ein Kennwort
+Imports.one.or.all.entries.from.another.keystore=Importiert einen oder alle Einträge aus einem anderen Keystore
+Clones.a.key.entry=Clont einen Schlüsseleintrag
+Changes.the.key.password.of.an.entry=Ändert das Schlüsselkennwort eines Eintrags
+Lists.entries.in.a.keystore=Listet die Einträge in einem Keystore auf
+Prints.the.content.of.a.certificate=Druckt den Content eines Zertifikats
+Prints.the.content.of.a.certificate.request=Druckt den Content einer Zertifikatsanforderung
+Prints.the.content.of.a.CRL.file=Druckt den Content einer CRL-Datei
+Generates.a.self.signed.certificate=Generiert ein selbst signiertes Zertifikat
+Changes.the.store.password.of.a.keystore=Ändert das Speicherkennwort eines Keystores
+showinfo.command.help=Zeigt sicherheitsbezogene Informationen an
+Prints.the.program.version=Gibt die Programmversion aus
+# keytool: help: options
+alias.name.of.the.entry.to.process=Aliasname des zu verarbeitenden Eintrags
+groupname.option.help=Gruppenname. Beispiel: der Name der elliptischen Kurve.
+destination.alias=Zielalias
+destination.key.password=Zielschlüsselkennwort
+destination.keystore.name=Ziel-Keystore-Name
+destination.keystore.password.protected=Ziel-Keystore kennwortgeschützt
+destination.keystore.provider.name=Ziel-Keystore-Providername
+destination.keystore.password=Ziel-Keystore-Kennwort
+destination.keystore.type=Ziel-Keystore-Typ
+distinguished.name=Distinguished Name
+X.509.extension=X.509-Erweiterung
+output.file.name=Ausgabedateiname
+input.file.name=Eingabedateiname
+key.algorithm.name=Schlüsselalgorithmusname
+key.password=Schlüsselkennwort
+key.bit.size=Schlüsselbitgröße
+keystore.name=Keystore-Name
+access.the.cacerts.keystore=Zugriff auf den cacerts Keystore
+warning.cacerts.option=Warnung: Verwenden Sie die Option -cacerts für den Zugriff auf den cacerts Keystore
+new.password=Neues Kennwort
+do.not.prompt=Kein Prompt
+password.through.protected.mechanism=Kennwort über geschützten Mechanismus
+tls.option.help=Zeigt TLS-Konfigurationsinformationen an
+# The following 2 values should span 2 lines, the first for the
+# option itself, the second for its -providerArg value.
+addprovider.option=Sicherheitsprovider nach Name hinzufügen (z.B. SunPKCS11)\nArgument für -addprovider konfigurieren
+provider.class.option=Sicherheitsprovider nach vollständig angegebenem Klassennamen hinzufügen\nArgument für -providerclass konfigurieren
+
+provider.name=Providername
+provider.classpath=Provider-Classpath
+output.in.RFC.style=Ausgabe in RFC-Stil
+signature.algorithm.name=Signaturalgorithmusname
+signer.alias=Signaturgeberalias
+signer.key.password=Signaturgeber-Schlüsselkennwort
+source.alias=Quellalias
+source.key.password=Quellschlüsselkennwort
+source.keystore.name=Quell-Keystore-Name
+source.keystore.password.protected=Quell-Keystore kennwortgeschützt
+source.keystore.provider.name=Quell-Keystore-Providername
+source.keystore.password=Quell-Keystore-Kennwort
+source.keystore.type=Quell-Keystore-Typ
+SSL.server.host.and.port=SSL-Serverhost und -port
+signed.jar.file=Signierte JAR-Datei
+certificate.validity.start.date.time=Startdatum/-zeit für Zertifikatsgültigkeit
+keystore.password=Keystore-Kennwort
+keystore.type=Keystore-Typ
+trust.certificates.from.cacerts=Zertifikaten aus cacerts vertrauen
+verbose.output=Verbose-Ausgabe
+validity.number.of.days=Gültigkeitsdauer (Tage)
+Serial.ID.of.cert.to.revoke=Serielle ID des zu entziehenden Certs
+# keytool: Running part
+keytool.error.=Keytool-Fehler:\u0020
+Illegal.option.=Unzulässige Option: \u0020
+Illegal.value.=Unzulässiger Wert:\u0020
+Unknown.password.type.=Unbekannter Kennworttyp:\u0020
+Cannot.find.environment.variable.=Umgebungsvariable kann nicht gefunden werden:\u0020
+Cannot.find.file.=Datei kann nicht gefunden werden:\u0020
+Command.option.flag.needs.an.argument.=Befehlsoption {0} benötigt ein Argument.
+Warning.Different.store.and.key.passwords.not.supported.for.PKCS12.KeyStores.Ignoring.user.specified.command.value.=Warnung: Keine Unterstützung für unterschiedliche Speicher- und Schlüsselkennwörter bei PKCS12 KeyStores. Der benutzerdefinierte Wert {0} wird ignoriert.
+the.keystore.or.storetype.option.cannot.be.used.with.the.cacerts.option=Die Option -keystore oder -storetype kann nicht mit der Option -cacerts verwendet werden
+.keystore.must.be.NONE.if.storetype.is.{0}=-keystore muss NONE sein, wenn -storetype {0} ist
+Too.many.retries.program.terminated=Zu viele erneute Versuche. Programm wird beendet
+.storepasswd.and.keypasswd.commands.not.supported.if.storetype.is.{0}=Befehle -storepasswd und -keypasswd werden nicht unterstützt, wenn -storetype {0} ist
+.keypasswd.commands.not.supported.if.storetype.is.PKCS12=Befehle des Typs -keypasswd werden nicht unterstützt, wenn -storetype PKCS12 ist
+.keypass.and.new.can.not.be.specified.if.storetype.is.{0}=-keypass und -new können nicht angegeben werden, wenn -storetype {0} ist
+if.protected.is.specified.then.storepass.keypass.and.new.must.not.be.specified=Wenn -protected angegeben ist, dürfen -storepass, -keypass und -new nicht angegeben werden
+if.srcprotected.is.specified.then.srcstorepass.and.srckeypass.must.not.be.specified=Wenn -srcprotected angegeben ist, dürfen -srcstorepass und -srckeypass nicht angegeben werden
+if.keystore.is.not.password.protected.then.storepass.keypass.and.new.must.not.be.specified=Wenn der Keystore nicht kennwortgeschützt ist, dürfen -storepass, -keypass und -new nicht angegeben werden
+if.source.keystore.is.not.password.protected.then.srcstorepass.and.srckeypass.must.not.be.specified=Wenn der Quell-Keystore nicht kennwortgeschützt ist, dürfen -srcstorepass und -srckeypass nicht angegeben werden
+Illegal.startdate.value=Unzulässiger Wert für Startdatum
+Validity.must.be.greater.than.zero=Gültigkeit muss größer als null sein
+provclass.not.a.provider=%s kein Provider
+provider.name.not.found=Provider namens "%s" nicht gefunden
+provider.class.not.found=Provider "%s" nicht gefunden
+Usage.error.no.command.provided=Verwendungsfehler: Kein Befehl angegeben
+Source.keystore.file.exists.but.is.empty.=Quell-Keystore-Datei ist zwar vorhanden, ist aber leer:\u0020
+Please.specify.srckeystore=Geben Sie -srckeystore an
+Must.not.specify.both.v.and.rfc.with.list.command=-v und -rfc dürfen bei Befehl "list" nicht beide angegeben werden
+Key.password.must.be.at.least.6.characters=Schlüsselkennwort muss mindestens sechs Zeichen lang sein
+New.password.must.be.at.least.6.characters=Neues Kennwort muss mindestens sechs Zeichen lang sein
+Keystore.file.exists.but.is.empty.=Keystore-Datei ist vorhanden, ist aber leer:\u0020
+Keystore.file.does.not.exist.=Keystore-Datei ist nicht vorhanden:\u0020
+Must.specify.destination.alias=Sie müssen einen Zielalias angeben
+Must.specify.alias=Sie müssen einen Alias angeben
+Keystore.password.must.be.at.least.6.characters=Keystore-Kennwort muss mindestens sechs Zeichen lang sein
+Enter.the.password.to.be.stored.=Geben Sie das Kennwort ein, das gespeichert werden soll: \u0020
+Enter.keystore.password.=Keystore-Kennwort eingeben: \u0020
+Enter.source.keystore.password.=Quell-Keystore-Kennwort eingeben: \u0020
+Enter.destination.keystore.password.=Ziel-Keystore-Kennwort eingeben: \u0020
+Keystore.password.is.too.short.must.be.at.least.6.characters=Keystore-Kennwort ist zu kurz. Es muss mindestens sechs Zeichen lang sein
+Unknown.Entry.Type=Unbekannter Eintragstyp
+Entry.for.alias.alias.successfully.imported.=Eintrag für Alias {0} erfolgreich importiert.
+Entry.for.alias.alias.not.imported.=Eintrag für Alias {0} nicht importiert.
+Problem.importing.entry.for.alias.alias.exception.Entry.for.alias.alias.not.imported.=Problem beim Importieren des Eintrags für Alias {0}: {1}.\nEintrag für Alias {0} nicht importiert.
+Import.command.completed.ok.entries.successfully.imported.fail.entries.failed.or.cancelled=Importbefehl abgeschlossen: {0} Einträge erfolgreich importiert, {1} Einträge nicht erfolgreich oder abgebrochen
+Warning.Overwriting.existing.alias.alias.in.destination.keystore=Warnung: Vorhandener Alias {0} in Ziel-Keystore wird überschrieben
+Existing.entry.alias.alias.exists.overwrite.no.=Eintragsalias {0} ist bereits vorhanden. Überschreiben? [Nein]: \u0020
+Too.many.failures.try.later=Zu viele Fehler. Versuchen Sie es später erneut
+Certification.request.stored.in.file.filename.=Zertifizierungsanforderung in Datei <{0}> gespeichert
+Submit.this.to.your.CA=Leiten Sie dies an die CA weiter
+if.alias.not.specified.destalias.and.srckeypass.must.not.be.specified=Wenn kein Alias angegeben ist, dürfen destalias und srckeypass nicht angegeben werden
+The.destination.pkcs12.keystore.has.different.storepass.and.keypass.Please.retry.with.destkeypass.specified.=Der Ziel-Keystore pkcs12 hat unterschiedliche Kennwörter für storepass und keypass. Wiederholen Sie den Vorgang, indem Sie -destkeypass angeben.
+Certificate.stored.in.file.filename.=Zertifikat in Datei <{0}> gespeichert
+Certificate.reply.was.installed.in.keystore=Zertifikatsantwort wurde in Keystore installiert
+Certificate.reply.was.not.installed.in.keystore=Zertifikatsantwort wurde nicht in Keystore installiert
+Certificate.was.added.to.keystore=Zertifikat wurde Keystore hinzugefügt
+Certificate.was.not.added.to.keystore=Zertifikat wurde nicht zu Keystore hinzugefügt
+.Storing.ksfname.=[{0} wird gesichert]
+alias.has.no.public.key.certificate.={0} hat keinen Public Key (Zertifikat)
+Cannot.derive.signature.algorithm=Signaturalgorithmus kann nicht abgeleitet werden
+Alias.alias.does.not.exist=Alias <{0}> ist nicht vorhanden
+Alias.alias.has.no.certificate=Alias <{0}> hat kein Zertifikat
+groupname.keysize.coexist=Es können nicht sowohl -groupname als auch -keysize angegeben werden
+deprecate.keysize.for.ec=Das Angeben von -keysize zum Generieren von EC-Schlüsseln ist veraltet. Verwenden Sie stattdessen "-groupname %s".
+Key.pair.not.generated.alias.alias.already.exists=Schlüsselpaar wurde nicht generiert. Alias <{0}> ist bereits vorhanden
+size.bit.alg=%1$d-Bit %2$s
+Generating.full.keyAlgName.key.pair.and.self.signed.certificate.sigAlgName.with.a.validity.of.days.for=Schlüsselpaar {0} und selbstsigniertes Zertifikat ({1}) werden mit einer Gültigkeit von {2} Tagen generiert\n\tfür: {3}
+Generating.full.keyAlgName.key.pair.and.a.certificate.sigAlgName.issued.by.signerAlias.with.a.validity.of.days.for=Schlüsselpaar {0} und Zertifikat ({1}) werden generiert, das von <{2}> mit einer Gültigkeit von {3} Tagen ausgestellt wurde\n\tfür: {4}
+Enter.key.password.for.alias.=Schlüsselkennwort für <{0}> eingeben
+.RETURN.if.same.as.keystore.password.=\t(RETURN, wenn identisch mit Keystore-Kennwort): \u0020
+Key.password.is.too.short.must.be.at.least.6.characters=Schlüsselkennwort ist zu kurz. Es muss mindestens sechs Zeichen lang sein
+Too.many.failures.key.not.added.to.keystore=Zu viele Fehler. Schlüssel wurde nicht zu Keystore hinzugefügt
+Destination.alias.dest.already.exists=Zielalias <{0}> bereits vorhanden
+Password.is.too.short.must.be.at.least.6.characters=Kennwort ist zu kurz. Es muss mindestens sechs Zeichen lang sein
+Too.many.failures.Key.entry.not.cloned=Zu viele Fehler. Schlüsseleintrag wurde nicht geklont
+key.password.for.alias.=Schlüsselkennwort für <{0}>
+No.entries.from.identity.database.added=Keine Einträge aus Identity-Datenbank hinzugefügt
+Alias.name.alias=Aliasname: {0}
+Creation.date.keyStore.getCreationDate.alias.=Erstellungsdatum: {0,date}
+alias.keyStore.getCreationDate.alias.={0}, {1,date},\u0020
+alias.={0},\u0020
+Entry.type.type.=Eintragstyp: {0}
+Certificate.chain.length.=Zertifikatskettenlänge:\u0020
+Certificate.i.1.=Zertifikat[{0,number,integer}]:
+Certificate.fingerprint.SHA.256.=Zertifikat-Fingerprint (SHA-256):\u0020
+Keystore.type.=Keystore-Typ:\u0020
+Keystore.provider.=Keystore-Provider:\u0020
+Your.keystore.contains.keyStore.size.entry=Keystore enthält {0,number,integer} Eintrag
+Your.keystore.contains.keyStore.size.entries=Keystore enthält {0,number,integer} Einträge
+Failed.to.parse.input=Eingabe konnte nicht geparst werden
+Empty.input=Leere Eingabe
+Not.X.509.certificate=Kein X.509-Zertifikat
+alias.has.no.public.key={0} hat keinen Public Key
+alias.has.no.X.509.certificate={0} hat kein X.509-Zertifikat
+New.certificate.self.signed.=Neues Zertifikat (selbst signiert):
+Reply.has.no.certificates=Antwort hat keine Zertifikate
+Certificate.not.imported.alias.alias.already.exists=Zertifikat nicht importiert. Alias <{0}> ist bereits vorhanden
+Input.not.an.X.509.certificate=Eingabe kein X.509-Zertifikat
+Certificate.already.exists.in.keystore.under.alias.trustalias.=Zertifikat ist bereits unter Alias <{0}> im Keystore vorhanden
+Do.you.still.want.to.add.it.no.=Möchten Sie es trotzdem hinzufügen? [Nein]: \u0020
+Certificate.already.exists.in.system.wide.CA.keystore.under.alias.trustalias.=Zertifikat ist bereits unter Alias <{0}> im systemweiten CA-Keystore vorhanden
+Do.you.still.want.to.add.it.to.your.own.keystore.no.=Möchten Sie es trotzdem zu Ihrem eigenen Keystore hinzufügen? [Nein]: \u0020
+Trust.this.certificate.no.=Diesem Zertifikat vertrauen? [Nein]: \u0020
+New.prompt.=Neues {0}:\u0020
+Passwords.must.differ=Kennwörter müssen sich unterscheiden
+Re.enter.new.prompt.=Neues {0} erneut eingeben:\u0020
+Re.enter.password.=Geben Sie das Kennwort erneut ein:\u0020
+Re.enter.new.password.=Neues Kennwort erneut eingeben:\u0020
+They.don.t.match.Try.again=Keine Übereinstimmung. Wiederholen Sie den Vorgang
+Enter.prompt.alias.name.={0}-Aliasnamen eingeben: \u0020
+Enter.new.alias.name.RETURN.to.cancel.import.for.this.entry.=Geben Sie einen neuen Aliasnamen ein\t(RETURN, um den Import dieses Eintrags abzubrechen): \u0020
+Enter.alias.name.=Aliasnamen eingeben: \u0020
+.RETURN.if.same.as.for.otherAlias.=\t(RETURN, wenn identisch mit <{0}>)
+enter.dname.components=Geben Sie den Distinguished Name ein. Geben Sie einen einzelnen Punkt (.) an, um eine Unterkomponente leer zu lassen, oder drücken Sie die Eingabetaste, um den Standardwert in Klammern zu verwenden.
+What.is.your.first.and.last.name.=Wie lautet Ihr Vor- und Nachname?
+What.is.the.name.of.your.organizational.unit.=Wie lautet der Name Ihrer organisatorischen Einheit?
+What.is.the.name.of.your.organization.=Wie lautet der Name Ihrer Organisation?
+What.is.the.name.of.your.City.or.Locality.=Wie lautet der Name Ihrer Stadt oder Gemeinde?
+What.is.the.name.of.your.State.or.Province.=Wie lautet der Name Ihres Bundeslands?
+What.is.the.two.letter.country.code.for.this.unit.=Wie lautet der Ländercode (zwei Buchstaben) für diese Einheit?
+no.field.in.dname=Mindestens ein Feld muss ausgefüllt werden. Wiederholen Sie die Eingabe.
+Is.name.correct.=Ist {0} richtig?
+no=Nein
+yes=Ja
+y=J
+.defaultValue.=\u0020 [{0}]: \u0020
+Alias.alias.has.no.key=Alias <{0}> verfügt über keinen Schlüssel
+Alias.alias.references.an.entry.type.that.is.not.a.private.key.entry.The.keyclone.command.only.supports.cloning.of.private.key=Alias <{0}> verweist auf einen Eintragstyp, der kein Private-Key-Eintrag ist. Der Befehl -keyclone unterstützt nur das Klonen von Private-Key-Einträgen
+
+.WARNING.WARNING.WARNING.=*****************  WARNING WARNING WARNING  *****************
+Signer.d.=Signaturgeber #%d:
+Certificate.d.=Zertifikat #%d:
+Timestamp.=Zeitstempel:
+Certificate.owner.=Zertifikatseigentümer:\u0020
+Not.a.signed.jar.file=Keine signierte JAR-Datei
+No.certificate.from.the.SSL.server=Kein Zertifikat vom SSL-Server
+
+.The.integrity.of.the.information.stored.in.your.keystore.=* Die Integrität der Informationen, die in Ihrem Keystore gespeichert sind, *\n* wurde NICHT geprüft. Um die Integrität zu prüfen, *\n* müssen Sie Ihr Keystore-Kennwort angeben.                  *
+.The.integrity.of.the.information.stored.in.the.srckeystore.=* Die Integrität der Informationen, die in Ihrem Srckeystore gespeichert sind, *\n* wurde NICHT geprüft. Um die Integrität zu prüfen, *\n* müssen Sie Ihr Srckeystore-Kennwort angeben.                  *
+
+Certificate.reply.does.not.contain.public.key.for.alias.=Zertifikatsantwort enthält keinen Public Key für <{0}>
+Incomplete.certificate.chain.in.reply=Unvollständige Zertifikatskette in Antwort
+Top.level.certificate.in.reply.=Zertifikat der obersten Ebene in Antwort:\n
+.is.not.trusted.=... ist nicht vertrauenswürdig.\u0020
+Install.reply.anyway.no.=Antwort trotzdem installieren? [Nein]: \u0020
+Public.keys.in.reply.and.keystore.don.t.match=Public Keys in Antwort und Keystore stimmen nicht überein
+Certificate.reply.and.certificate.in.keystore.are.identical=Zertifikatsantwort und Zertifikat in Keystore sind identisch
+Failed.to.establish.chain.from.reply=Kette konnte der Antwort nicht entnommen werden
+n=N
+Wrong.answer.try.again=Falsche Antwort. Wiederholen Sie den Vorgang
+Secret.key.not.generated.alias.alias.already.exists=Secret Key wurde nicht generiert. Alias <{0}> ist bereits vorhanden
+Please.provide.keysize.for.secret.key.generation=Geben Sie -keysize zum Erstellen eines Secret Key an
+
+warning.not.verified.make.sure.keystore.is.correct=WARNUNG: Nicht geprüft. Stellen Sie sicher, dass -keystore korrekt ist.
+warning.not.verified.make.sure.keystore.is.correct.or.specify.trustcacerts=Warnung: Nicht geprüft. Stellen Sie sicher, dass -keystore korrekt ist, oder geben Sie -trustcacerts an.
+
+Extensions.=Erweiterungen:\u0020
+.Empty.value.=(Leerer Wert)
+Extension.Request.=Erweiterungsanforderung:
+Unknown.keyUsage.type.=Unbekannter keyUsage-Typ:\u0020
+Unknown.extendedkeyUsage.type.=Unbekannter extendedkeyUsage-Typ:\u0020
+Unknown.AccessDescription.type.=Unbekannter AccessDescription-Typ:\u0020
+Unrecognized.GeneralName.type.=Unbekannter GeneralName-Typ:\u0020
+This.extension.cannot.be.marked.as.critical.=Erweiterung kann nicht als "Kritisch" markiert werden.\u0020
+Odd.number.of.hex.digits.found.=Ungerade Anzahl hexadezimaler Ziffern gefunden:\u0020
+Unknown.extension.type.=Unbekannter Erweiterungstyp:\u0020
+command.{0}.is.ambiguous.=Befehl {0} ist mehrdeutig:
+# 8171319: keytool should print out warnings when reading or
+# generating cert/cert req using weak algorithms
+the.certificate.request=Die Zertifikatsanforderung
+the.issuer=Der Aussteller
+the.generated.secretkey=Der generierte Secret Key
+the.generated.certificate=Das generierte Zertifikat
+the.generated.crl=Die generierte CRL
+the.generated.certificate.request=Die generierte Zertifikatsanforderung
+the.certificate=Das Zertifikat
+the.crl=Die CRL
+the.tsa.certificate=Das TSA-Zertifikat
+the.input=Die Eingabe
+reply=Antwort
+one.in.many=%1$s #%2$d von %3$d
+one.in.many1=%1$s #%2$d
+one.in.many2=%1$s von Signaturgeber #%2$d
+one.in.many3=%1$s #%2$d von Signaturgeber #%3$d
+alias.in.cacerts=Aussteller <%s> in cacerts
+alias.in.keystore=Aussteller <%s>
+with.weak=%s (schwach)
+with.disabled=%s (deaktiviert)
+key.bit=%s-Schlüssel
+key.bit.weak=%s Schlüssel (schwach)
+key.bit.disabled=%s Schlüssel (deaktiviert)
+.PATTERN.printX509Cert.with.weak=Eigentümer: {0}\nAussteller: {1}\nSeriennummer: {2}\nGültig von: {3} bis: {4}\nZertifikatsfingerprints:\n\t SHA1: {5}\n\t SHA256: {6}\nSignaturalgorithmusname: {7}\nPublic-Key-Algorithmus von Subject: {8}\nVersion: {9}
+PKCS.10.with.weak=PKCS #10-Zertifikatsanforderung (Version 1.0)\nSubject: %1$s\nFormat: %2$s\nPublic Key: %3$s\nSignaturalgorithmus: %4$s\n
+verified.by.s.in.s.weak=Von %1$s in %2$s mit %3$s verifiziert
+whose.sigalg.disabled=%1$s verwendet den Signaturalgorithmus %2$s. Dies gilt als Sicherheitsrisiko und ist deaktiviert.
+whose.sigalg.usagesignedjar=%1$s verwendet den Signaturalgorithmus %2$s. Das gilt als Sicherheitsrisiko und kann nach %3$s nicht zum Signieren von JAR-Archiven verwendet werden.
+Unable.to.parse.denyAfter.string.in.exception.message=denyAfter-Datumszeichenfolge in Ausnahmemeldung kann nicht geparst werden
+whose.sigalg.weak=%1$s verwendet den Signaturalgorithmus %2$s. Dies gilt als Sicherheitsrisiko.
+whose.key.disabled=%1$s verwendet %2$s. Dies gilt als Sicherheitsrisiko und ist deaktiviert.
+whose.key.weak=%1$s verwendet %2$s. Dies gilt als Sicherheitsrisiko. Wird in einem zukünftigen Update deaktiviert.
+jks.storetype.warning=Der %1$s-Keystore verwendet ein proprietäres Format. Es wird empfohlen, auf PKCS12 zu migrieren, das ein Industriestandardformat mit "keytool -importkeystore -srckeystore %2$s -destkeystore %2$s -deststoretype pkcs12" ist.
+migrate.keystore.warning="%1$s" zu %4$s migriert. Der %2$s-Keystore wurde als "%3$s" gesichert.
+backup.keystore.warning=Der ursprüngliche Keystore "%1$s" wird als "%3$s" gesichert...
+importing.keystore.status=Keystore %1$s wird in %2$s importiert...
+keyalg.option.missing.error=Die Option -keyalg muss angegeben werden.
+showinfo.no.option=Fehlende Option für -showinfo. Verwenden Sie keytool -showinfo -tls.
diff --git a/src/java.base/share/classes/sun/security/tools/keytool/resources/keytool_es.properties b/src/java.base/share/classes/sun/security/tools/keytool/resources/keytool_es.properties
new file mode 100644
index 00000000000..27015f73454
--- /dev/null
+++ b/src/java.base/share/classes/sun/security/tools/keytool/resources/keytool_es.properties
@@ -0,0 +1,302 @@
+#
+# Copyright (c) 2000, 2025, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute 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.
+#
+
+NEWLINE=\n
+STAR=*******************************************
+STARNN=*******************************************\n\n
+# keytool: Help part
+.OPTION.=\u0020[OPTION]...
+Options.=Opciones:
+option.1.set.twice=La opción %s se ha especificado varias veces. Se ignorarán todas excepto la última.
+multiple.commands.1.2=Solo se permite un comando: se ha especificado tanto %1$s como %2$s
+Use.keytool.help.for.all.available.commands=Utilice "keytool -help" para todos los comandos disponibles
+Key.and.Certificate.Management.Tool=Herramienta de Gestión de Certificados y Claves
+Commands.=Comandos:
+Use.keytool.command.name.help.for.usage.of.command.name=Utilice "keytool -command_name -help" para la sintaxis de nombre_comando.\nUtilice la opción -conf <url> para especificar un archivo de opciones preconfigurado.
+# keytool: help: commands
+Generates.a.certificate.request=Genera una solicitud de certificado
+Changes.an.entry.s.alias=Cambia un alias de entrada
+Deletes.an.entry=Suprime una entrada
+Exports.certificate=Exporta el certificado
+Generates.a.key.pair=Genera un par de claves
+Generates.a.secret.key=Genera un clave secreta
+Generates.certificate.from.a.certificate.request=Genera un certificado a partir de una solicitud de certificado
+Generates.CRL=Genera CRL
+Generated.keyAlgName.secret.key=Clave secreta {0} generada
+Generated.keysize.bit.keyAlgName.secret.key=Clave secreta {1} de {0} bits generada
+Imports.entries.from.a.JDK.1.1.x.style.identity.database=Importa entradas desde una base de datos de identidades JDK 1.1.x-style
+Imports.a.certificate.or.a.certificate.chain=Importa un certificado o una cadena de certificados
+Imports.a.password=Importa una contraseña
+Imports.one.or.all.entries.from.another.keystore=Importa una o todas las entradas desde otro almacén de claves
+Clones.a.key.entry=Clona una entrada de clave
+Changes.the.key.password.of.an.entry=Cambia la contraseña de clave de una entrada
+Lists.entries.in.a.keystore=Enumera las entradas de un almacén de claves
+Prints.the.content.of.a.certificate=Imprime el contenido de un certificado
+Prints.the.content.of.a.certificate.request=Imprime el contenido de una solicitud de certificado
+Prints.the.content.of.a.CRL.file=Imprime el contenido de un archivo CRL
+Generates.a.self.signed.certificate=Genera un certificado autofirmado
+Changes.the.store.password.of.a.keystore=Cambia la contraseña de almacén de un almacén de claves
+# keytool: help: options
+alias.name.of.the.entry.to.process=nombre de alias de la entrada que se va a procesar
+destination.alias=alias de destino
+destination.key.password=contraseña de clave de destino
+destination.keystore.name=nombre de almacén de claves de destino
+destination.keystore.password.protected=almacén de claves de destino protegido por contraseña
+destination.keystore.provider.name=nombre de proveedor de almacén de claves de destino
+destination.keystore.password=contraseña de almacén de claves de destino
+destination.keystore.type=tipo de almacén de claves de destino
+distinguished.name=nombre distintivo
+X.509.extension=extensión X.509
+output.file.name=nombre de archivo de salida
+input.file.name=nombre de archivo de entrada
+key.algorithm.name=nombre de algoritmo de clave
+key.password=contraseña de clave
+key.bit.size=tamaño de bit de clave
+keystore.name=nombre de almacén de claves
+access.the.cacerts.keystore=acceso al almacén de claves cacerts
+warning.cacerts.option=Advertencia: Utilice la opción -cacerts para acceder al almacén de claves cacerts
+new.password=nueva contraseña
+do.not.prompt=no solicitar
+password.through.protected.mechanism=contraseña a través de mecanismo protegido
+# The following 2 values should span 2 lines, the first for the
+# option itself, the second for its -providerArg value.
+addprovider.option=agregar proveedor de seguridad por nombre (por ejemplo, SunPKCS11)\nconfigurar elemento para -addprovider
+provider.class.option=agregar proveedor de seguridad por nombre de clase totalmente cualificado\nconfigurar argumento para -providerclass
+
+provider.name=nombre del proveedor
+provider.classpath=classpath de proveedor
+output.in.RFC.style=salida en estilo RFC
+signature.algorithm.name=nombre de algoritmo de firma
+source.alias=alias de origen
+source.key.password=contraseña de clave de origen
+source.keystore.name=nombre de almacén de claves de origen
+source.keystore.password.protected=almacén de claves de origen protegido por contraseña
+source.keystore.provider.name=nombre de proveedor de almacén de claves de origen
+source.keystore.password=contraseña de almacén de claves de origen
+source.keystore.type=tipo de almacén de claves de origen
+SSL.server.host.and.port=puerto y host del servidor SSL
+signed.jar.file=archivo jar firmado
+certificate.validity.start.date.time=fecha/hora de inicio de validez del certificado
+keystore.password=contraseña de almacén de claves
+keystore.type=tipo de almacén de claves
+trust.certificates.from.cacerts=certificados de protección de cacerts
+verbose.output=salida detallada
+validity.number.of.days=número de validez de días
+Serial.ID.of.cert.to.revoke=identificador de serie del certificado que se va a revocar
+# keytool: Running part
+keytool.error.=error de herramienta de claves:\u0020
+Illegal.option.=Opción no permitida: \u0020
+Illegal.value.=Valor no permitido:\u0020
+Unknown.password.type.=Tipo de contraseña desconocido:\u0020
+Cannot.find.environment.variable.=No se ha encontrado la variable del entorno:\u0020
+Cannot.find.file.=No se ha encontrado el archivo:\u0020
+Command.option.flag.needs.an.argument.=La opción de comando {0} necesita un argumento.
+Warning.Different.store.and.key.passwords.not.supported.for.PKCS12.KeyStores.Ignoring.user.specified.command.value.=Advertencia: los almacenes de claves en formato PKCS12 no admiten contraseñas de clave y almacenamiento distintas. Se ignorará el valor especificado por el usuario, {0}.
+the.keystore.or.storetype.option.cannot.be.used.with.the.cacerts.option=Las opciones -keystore o -storetype no se pueden utilizar con la opción -cacerts
+.keystore.must.be.NONE.if.storetype.is.{0}=-keystore debe ser NONE si -storetype es {0}
+Too.many.retries.program.terminated=Ha habido demasiados intentos, se ha cerrado el programa
+.storepasswd.and.keypasswd.commands.not.supported.if.storetype.is.{0}=Los comandos -storepasswd y -keypasswd no están soportados si -storetype es {0}
+.keypasswd.commands.not.supported.if.storetype.is.PKCS12=Los comandos -keypasswd no están soportados si -storetype es PKCS12
+.keypass.and.new.can.not.be.specified.if.storetype.is.{0}=-keypass y -new no se pueden especificar si -storetype es {0}
+if.protected.is.specified.then.storepass.keypass.and.new.must.not.be.specified=si se especifica -protected, no deben especificarse -storepass, -keypass ni -new
+if.srcprotected.is.specified.then.srcstorepass.and.srckeypass.must.not.be.specified=Si se especifica -srcprotected, no se puede especificar -srcstorepass ni -srckeypass
+if.keystore.is.not.password.protected.then.storepass.keypass.and.new.must.not.be.specified=Si keystore no está protegido por contraseña, no se deben especificar -storepass, -keypass ni -new
+if.source.keystore.is.not.password.protected.then.srcstorepass.and.srckeypass.must.not.be.specified=Si el almacén de claves de origen no está protegido por contraseña, no se deben especificar -srcstorepass ni -srckeypass
+Illegal.startdate.value=Valor de fecha de inicio no permitido
+Validity.must.be.greater.than.zero=La validez debe ser mayor que cero
+provclass.not.a.provider=%s no es un proveedor
+provider.name.not.found=No se ha encontrado el proveedor denominado "%s"
+provider.class.not.found=No se ha encontrado el proveedor "%s"
+Usage.error.no.command.provided=Error de sintaxis: no se ha proporcionado ningún comando
+Source.keystore.file.exists.but.is.empty.=El archivo de almacén de claves de origen existe, pero está vacío:\u0020
+Please.specify.srckeystore=Especifique -srckeystore
+Must.not.specify.both.v.and.rfc.with.list.command=No se deben especificar -v y -rfc simultáneamente con el comando 'list'
+Key.password.must.be.at.least.6.characters=La contraseña de clave debe tener al menos 6 caracteres
+New.password.must.be.at.least.6.characters=La nueva contraseña debe tener al menos 6 caracteres
+Keystore.file.exists.but.is.empty.=El archivo de almacén de claves existe, pero está vacío:\u0020
+Keystore.file.does.not.exist.=El archivo de almacén de claves no existe:\u0020
+Must.specify.destination.alias=Se debe especificar un alias de destino
+Must.specify.alias=Se debe especificar un alias
+Keystore.password.must.be.at.least.6.characters=La contraseña del almacén de claves debe tener al menos 6 caracteres
+Enter.the.password.to.be.stored.=Introduzca la contraseña que se va a almacenar: \u0020
+Enter.keystore.password.=Introduzca la contraseña del almacén de claves: \u0020
+Enter.source.keystore.password.=Introduzca la contraseña de almacén de claves de origen: \u0020
+Enter.destination.keystore.password.=Introduzca la contraseña de almacén de claves de destino: \u0020
+Keystore.password.is.too.short.must.be.at.least.6.characters=La contraseña del almacén de claves es demasiado corta, debe tener al menos 6 caracteres
+Unknown.Entry.Type=Tipo de Entrada Desconocido
+Too.many.failures.Alias.not.changed=Demasiados fallos. No se ha cambiado el alias
+Entry.for.alias.alias.successfully.imported.=La entrada del alias {0} se ha importado correctamente.
+Entry.for.alias.alias.not.imported.=La entrada del alias {0} no se ha importado.
+Problem.importing.entry.for.alias.alias.exception.Entry.for.alias.alias.not.imported.=Problema al importar la entrada del alias {0}: {1}.\nNo se ha importado la entrada del alias {0}.
+Import.command.completed.ok.entries.successfully.imported.fail.entries.failed.or.cancelled=Comando de importación completado: {0} entradas importadas correctamente, {1} entradas incorrectas o canceladas
+Warning.Overwriting.existing.alias.alias.in.destination.keystore=Advertencia: se sobrescribirá el alias {0} en el almacén de claves de destino
+Existing.entry.alias.alias.exists.overwrite.no.=El alias de entrada existente {0} ya existe, ¿desea sobrescribirlo? [no]: \u0020
+Too.many.failures.try.later=Demasiados fallos; inténtelo más adelante
+Certification.request.stored.in.file.filename.=Solicitud de certificación almacenada en el archivo <{0}>
+Submit.this.to.your.CA=Enviar a la CA
+if.alias.not.specified.destalias.and.srckeypass.must.not.be.specified=si no se especifica el alias, no se debe especificar destalias ni srckeypass
+The.destination.pkcs12.keystore.has.different.storepass.and.keypass.Please.retry.with.destkeypass.specified.=El almacén de claves pkcs12 de destino tiene storepass y keypass diferentes. Vuelva a intentarlo con -destkeypass especificado.
+Certificate.stored.in.file.filename.=Certificado almacenado en el archivo <{0}>
+Certificate.reply.was.installed.in.keystore=Se ha instalado la respuesta del certificado en el almacén de claves
+Certificate.reply.was.not.installed.in.keystore=No se ha instalado la respuesta del certificado en el almacén de claves
+Certificate.was.added.to.keystore=Se ha agregado el certificado al almacén de claves
+Certificate.was.not.added.to.keystore=No se ha agregado el certificado al almacén de claves
+.Storing.ksfname.=[Almacenando {0}]
+alias.has.no.public.key.certificate.={0} no tiene clave pública (certificado)
+Cannot.derive.signature.algorithm=No se puede derivar el algoritmo de firma
+Alias.alias.does.not.exist=El alias <{0}> no existe
+Alias.alias.has.no.certificate=El alias <{0}> no tiene certificado
+Key.pair.not.generated.alias.alias.already.exists=No se ha generado el par de claves, el alias <{0}> ya existe
+Generating.keysize.bit.keyAlgName.key.pair.and.self.signed.certificate.sigAlgName.with.a.validity.of.validality.days.for=Generando par de claves {1} de {0} bits para certificado autofirmado ({2}) con una validez de {3} días\n\tpara: {4}
+Enter.key.password.for.alias.=Introduzca la contraseña de clave para <{0}>
+.RETURN.if.same.as.keystore.password.=\t(INTRO si es la misma contraseña que la del almacén de claves): \u0020
+Key.password.is.too.short.must.be.at.least.6.characters=La contraseña de clave es demasiado corta; debe tener al menos 6 caracteres
+Too.many.failures.key.not.added.to.keystore=Demasiados fallos; no se ha agregado la clave al almacén de claves
+Destination.alias.dest.already.exists=El alias de destino <{0}> ya existe
+Password.is.too.short.must.be.at.least.6.characters=La contraseña es demasiado corta; debe tener al menos 6 caracteres
+Too.many.failures.Key.entry.not.cloned=Demasiados fallos. No se ha clonado la entrada de clave
+key.password.for.alias.=contraseña de clave para <{0}>
+Keystore.entry.for.id.getName.already.exists=La entrada de almacén de claves para <{0}> ya existe
+Creating.keystore.entry.for.id.getName.=Creando entrada de almacén de claves para <{0}> ...
+No.entries.from.identity.database.added=No se han agregado entradas de la base de datos de identidades
+Alias.name.alias=Nombre de Alias: {0}
+Creation.date.keyStore.getCreationDate.alias.=Fecha de Creación: {0,date}
+alias.keyStore.getCreationDate.alias.={0}, {1,date},\u0020
+alias.={0},\u0020
+Entry.type.type.=Tipo de Entrada: {0}
+Certificate.chain.length.=Longitud de la Cadena de Certificado:\u0020
+Certificate.i.1.=Certificado[{0,number,integer}]:
+Certificate.fingerprint.SHA.256.=Huella de certificado (SHA-256):\u0020
+Keystore.type.=Tipo de Almacén de Claves:\u0020
+Keystore.provider.=Proveedor de Almacén de Claves:\u0020
+Your.keystore.contains.keyStore.size.entry=Su almacén de claves contiene {0,number,integer} entrada
+Your.keystore.contains.keyStore.size.entries=Su almacén de claves contiene {0,number,integer} entradas
+Failed.to.parse.input=Fallo al analizar la entrada
+Empty.input=Entrada vacía
+Not.X.509.certificate=No es un certificado X.509
+alias.has.no.public.key={0} no tiene clave pública
+alias.has.no.X.509.certificate={0} no tiene certificado X.509
+New.certificate.self.signed.=Nuevo Certificado (Autofirmado):
+Reply.has.no.certificates=La respuesta no tiene certificados
+Certificate.not.imported.alias.alias.already.exists=Certificado no importado, el alias <{0}> ya existe
+Input.not.an.X.509.certificate=La entrada no es un certificado X.509
+Certificate.already.exists.in.keystore.under.alias.trustalias.=El certificado ya existe en el almacén de claves con el alias <{0}>
+Do.you.still.want.to.add.it.no.=¿Aún desea agregarlo? [no]: \u0020
+Certificate.already.exists.in.system.wide.CA.keystore.under.alias.trustalias.=El certificado ya existe en el almacén de claves de la CA del sistema, con el alias <{0}>
+Do.you.still.want.to.add.it.to.your.own.keystore.no.=¿Aún desea agregarlo a su propio almacén de claves? [no]: \u0020
+Trust.this.certificate.no.=¿Confiar en este certificado? [no]: \u0020
+YES=SÍ
+New.prompt.=Nuevo {0}:\u0020
+Passwords.must.differ=Las contraseñas deben ser distintas
+Re.enter.new.prompt.=Vuelva a escribir el nuevo {0}:\u0020
+Re.enter.password.=Vuelva a introducir la contraseña:\u0020
+Re.enter.new.password.=Volver a escribir la contraseña nueva:\u0020
+They.don.t.match.Try.again=No coinciden. Inténtelo de nuevo
+Enter.prompt.alias.name.=Escriba el nombre de alias de {0}: \u0020
+Enter.new.alias.name.RETURN.to.cancel.import.for.this.entry.=Indique el nuevo nombre de alias\t(INTRO para cancelar la importación de esta entrada): \u0020
+Enter.alias.name.=Introduzca el nombre de alias: \u0020
+.RETURN.if.same.as.for.otherAlias.=\t(INTRO si es el mismo que para <{0}>)
+What.is.your.first.and.last.name.=¿Cuáles son su nombre y su apellido?
+What.is.the.name.of.your.organizational.unit.=¿Cuál es el nombre de su unidad de organización?
+What.is.the.name.of.your.organization.=¿Cuál es el nombre de su organización?
+What.is.the.name.of.your.City.or.Locality.=¿Cuál es el nombre de su ciudad o localidad?
+What.is.the.name.of.your.State.or.Province.=¿Cuál es el nombre de su estado o provincia?
+What.is.the.two.letter.country.code.for.this.unit.=¿Cuál es el código de país de dos letras de la unidad?
+Is.name.correct.=¿Es correcto {0}?
+no=no
+yes=sí
+y=s
+.defaultValue.=\u0020 [{0}]: \u0020
+Alias.alias.has.no.key=El alias <{0}> no tiene clave
+Alias.alias.references.an.entry.type.that.is.not.a.private.key.entry.The.keyclone.command.only.supports.cloning.of.private.key=El alias <{0}> hace referencia a un tipo de entrada que no es una clave privada. El comando -keyclone sólo permite la clonación de entradas de claves privadas
+
+.WARNING.WARNING.WARNING.=*****************  WARNING WARNING WARNING  *****************
+Signer.d.=#%d de Firmante:
+Timestamp.=Registro de Hora:
+Signature.=Firma:
+CRLs.=CRL:
+Certificate.owner.=Propietario del Certificado:\u0020
+Not.a.signed.jar.file=No es un archivo jar firmado
+No.certificate.from.the.SSL.server=Ningún certificado del servidor SSL
+
+.The.integrity.of.the.information.stored.in.your.keystore.=* La integridad de la información almacenada en el almacén de claves  *\n* NO se ha comprobado.  Para comprobar dicha integridad, *\n* debe proporcionar la contraseña del almacén de claves.                  *
+.The.integrity.of.the.information.stored.in.the.srckeystore.=* La integridad de la información almacenada en srckeystore*\n* NO se ha comprobado.  Para comprobar dicha integridad, *\n* debe proporcionar la contraseña de srckeystore.                *
+
+Certificate.reply.does.not.contain.public.key.for.alias.=La respuesta de certificado no contiene una clave pública para <{0}>
+Incomplete.certificate.chain.in.reply=Cadena de certificado incompleta en la respuesta
+Certificate.chain.in.reply.does.not.verify.=La cadena de certificado de la respuesta no verifica:\u0020
+Top.level.certificate.in.reply.=Certificado de nivel superior en la respuesta:\n
+.is.not.trusted.=... no es de confianza.\u0020
+Install.reply.anyway.no.=¿Instalar respuesta de todos modos? [no]: \u0020
+NO=NO
+Public.keys.in.reply.and.keystore.don.t.match=Las claves públicas en la respuesta y en el almacén de claves no coinciden
+Certificate.reply.and.certificate.in.keystore.are.identical=La respuesta del certificado y el certificado en el almacén de claves son idénticos
+Failed.to.establish.chain.from.reply=No se ha podido definir una cadena a partir de la respuesta
+n=n
+Wrong.answer.try.again=Respuesta incorrecta, vuelva a intentarlo
+Secret.key.not.generated.alias.alias.already.exists=No se ha generado la clave secreta, el alias <{0}> ya existe
+Please.provide.keysize.for.secret.key.generation=Proporcione el valor de -keysize para la generación de claves secretas
+
+warning.not.verified.make.sure.keystore.is.correct=ADVERTENCIA: no se ha verificado. Asegúrese de que el valor de -keystore es correcto.
+
+Extensions.=Extensiones:\u0020
+.Empty.value.=(Valor vacío)
+Extension.Request.=Solicitud de Extensión:
+Unknown.keyUsage.type.=Tipo de uso de clave desconocido:\u0020
+Unknown.extendedkeyUsage.type.=Tipo de uso de clave extendida desconocido:\u0020
+Unknown.AccessDescription.type.=Tipo de descripción de acceso desconocido:\u0020
+Unrecognized.GeneralName.type.=Tipo de nombre general no reconocido:\u0020
+This.extension.cannot.be.marked.as.critical.=Esta extensión no se puede marcar como crítica.\u0020
+Odd.number.of.hex.digits.found.=Se ha encontrado un número impar de dígitos hexadecimales:\u0020
+Unknown.extension.type.=Tipo de extensión desconocida:\u0020
+command.{0}.is.ambiguous.=El comando {0} es ambiguo:
+# 8171319: keytool should print out warnings when reading or
+# generating cert/cert req using weak algorithms
+the.certificate.request=La solicitud de certificado
+the.issuer=El emisor
+the.generated.certificate=El certificado generado
+the.generated.crl=La CRL generada
+the.generated.certificate.request=La solicitud de certificado generada
+the.certificate=El certificado
+the.crl=La CRL
+the.tsa.certificate=El certificado de TSA
+the.input=La entrada
+reply=Responder
+one.in.many=%1$s #%2$d de %3$d
+alias.in.cacerts=Emisor <%s> en cacerts
+alias.in.keystore=Emisor <%s>
+with.weak=%s (débil)
+key.bit=Clave %2$s de %1$d bits
+key.bit.weak=Clave %2$s de %1$d bits (débil)
+unknown.size.1=clave %s de tamaño desconocido
+.PATTERN.printX509Cert.with.weak=Propietario: {0}\nEmisor: {1}\nNúmero de serie: {2}\nVálido desde: {3} hasta: {4}\nHuellas digitales del certificado:\n\t SHA1: {5}\n\t SHA256: {6}\nNombre del algoritmo de firma: {7}\nAlgoritmo de clave pública de asunto: {8}\nVersión: {9}
+PKCS.10.with.weak=Solicitud de certificado PKCS #10 (Versión 1.0)\nAsunto: %1$s\nFormato: %2$s\nClave pública: %3$s\nAlgoritmo de firma: %4$s\n
+verified.by.s.in.s.weak=Verificado por %1$s en %2$s con %3$s
+whose.sigalg.risk=%1$s utiliza el algoritmo de firma %2$s, lo que se considera un riesgo de seguridad.
+whose.key.risk=%1$s utiliza %2$s, lo que se considera riesgo de seguridad.
+jks.storetype.warning=El almacén de claves %1$s utiliza un formato propietario. Se recomienda migrar a PKCS12, que es un formato estándar del sector que utiliza "keytool -importkeystore -srckeystore %2$s -destkeystore %2$s -deststoretype pkcs12".
+migrate.keystore.warning=Se ha migrado "%1$s" a %4$s. Se ha realizado la copia de seguridad del almacén de claves %2$s como "%3$s".
+backup.keystore.warning=La copia de seguridad del almacén de claves "%1$s" se ha realizado como "%3$s"...
+importing.keystore.status=Importando el almacén de claves de %1$s a %2$s...
diff --git a/src/java.base/share/classes/sun/security/tools/keytool/resources/keytool_fr.properties b/src/java.base/share/classes/sun/security/tools/keytool/resources/keytool_fr.properties
new file mode 100644
index 00000000000..c1c5f28149e
--- /dev/null
+++ b/src/java.base/share/classes/sun/security/tools/keytool/resources/keytool_fr.properties
@@ -0,0 +1,302 @@
+#
+# Copyright (c) 2000, 2025, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute 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.
+#
+
+NEWLINE=\n
+STAR=*******************************************
+STARNN=*******************************************\n\n
+# keytool: Help part
+.OPTION.=\u0020[OPTION]...
+Options.=Options :
+option.1.set.twice=L'option %s est spécifiée plusieurs fois. Toutes les occurrences seront ignorées, sauf la dernière.
+multiple.commands.1.2=Une seule commande est autorisée : %1$s et %2$s ont été spécifiées.
+Use.keytool.help.for.all.available.commands=Utiliser "keytool -help" pour toutes les commandes disponibles
+Key.and.Certificate.Management.Tool=Outil de gestion de certificats et de clés
+Commands.=Commandes :
+Use.keytool.command.name.help.for.usage.of.command.name=Utilisez "keytool -command_name -help" pour la syntaxe de command_name.\nUtilisez l'option -conf <url> pour indiquer un fichier d'options préconfigurées.
+# keytool: help: commands
+Generates.a.certificate.request=Génère une demande de certificat
+Changes.an.entry.s.alias=Modifie l'alias d'une entrée
+Deletes.an.entry=Supprime une entrée
+Exports.certificate=Exporte le certificat
+Generates.a.key.pair=Génère une paire de clés
+Generates.a.secret.key=Génère une clé secrète
+Generates.certificate.from.a.certificate.request=Génère le certificat à partir d'une demande de certificat
+Generates.CRL=Génère la liste des certificats révoqués (CRL)
+Generated.keyAlgName.secret.key=Clé secrète {0} générée
+Generated.keysize.bit.keyAlgName.secret.key=Clé secrète {0} bits {1} générée
+Imports.entries.from.a.JDK.1.1.x.style.identity.database=Importe les entrées à partir d'une base de données d'identités de type JDK 1.1.x
+Imports.a.certificate.or.a.certificate.chain=Importe un certificat ou une chaîne de certificat
+Imports.a.password=Importe un mot de passe
+Imports.one.or.all.entries.from.another.keystore=Importe une entrée ou la totalité des entrées depuis un autre fichier de clés
+Clones.a.key.entry=Clone une entrée de clé
+Changes.the.key.password.of.an.entry=Modifie le mot de passe de clé d'une entrée
+Lists.entries.in.a.keystore=Répertorie les entrées d'un fichier de clés
+Prints.the.content.of.a.certificate=Imprime le contenu d'un certificat
+Prints.the.content.of.a.certificate.request=Imprime le contenu d'une demande de certificat
+Prints.the.content.of.a.CRL.file=Imprime le contenu d'un fichier de liste des certificats révoqués (CRL)
+Generates.a.self.signed.certificate=Génère un certificat auto-signé
+Changes.the.store.password.of.a.keystore=Modifie le mot de passe de banque d'un fichier de clés
+# keytool: help: options
+alias.name.of.the.entry.to.process=nom d'alias de l'entrée à traiter
+destination.alias=alias de destination
+destination.key.password=mot de passe de la clé de destination
+destination.keystore.name=nom du fichier de clés de destination
+destination.keystore.password.protected=mot de passe du fichier de clés de destination protégé
+destination.keystore.provider.name=nom du fournisseur du fichier de clés de destination
+destination.keystore.password=mot de passe du fichier de clés de destination
+destination.keystore.type=type du fichier de clés de destination
+distinguished.name=nom distinctif
+X.509.extension=extension X.509
+output.file.name=nom du fichier de sortie
+input.file.name=nom du fichier d'entrée
+key.algorithm.name=nom de l'algorithme de clé
+key.password=mot de passe de la clé
+key.bit.size=taille en bits de la clé
+keystore.name=nom du fichier de clés
+access.the.cacerts.keystore=accéder au fichier de clés cacerts
+warning.cacerts.option=Avertissement : utiliser l'option -cacerts pour accéder au fichier de clés cacerts
+new.password=nouveau mot de passe
+do.not.prompt=ne pas inviter
+password.through.protected.mechanism=mot de passe via mécanisme protégé
+# The following 2 values should span 2 lines, the first for the
+# option itself, the second for its -providerArg value.
+addprovider.option=ajouter un fournisseur de sécurité par nom (par ex. SunPKCS11)\nconfigurer l'argument pour -addprovider
+provider.class.option=ajouter un fournisseur de sécurité par nom de classe qualifié complet\nconfigurer l'argument pour -providerclass
+
+provider.name=nom du fournisseur
+provider.classpath=variable d'environnement CLASSPATH du fournisseur
+output.in.RFC.style=sortie au style RFC
+signature.algorithm.name=nom de l'algorithme de signature
+source.alias=alias source
+source.key.password=mot de passe de la clé source
+source.keystore.name=nom du fichier de clés source
+source.keystore.password.protected=mot de passe du fichier de clés source protégé
+source.keystore.provider.name=nom du fournisseur du fichier de clés source
+source.keystore.password=mot de passe du fichier de clés source
+source.keystore.type=type du fichier de clés source
+SSL.server.host.and.port=Port et hôte du serveur SSL
+signed.jar.file=fichier JAR signé
+certificate.validity.start.date.time=date/heure de début de validité du certificat
+keystore.password=mot de passe du fichier de clés
+keystore.type=type du fichier de clés
+trust.certificates.from.cacerts=certificats sécurisés issus de certificats CA
+verbose.output=sortie en mode verbose
+validity.number.of.days=nombre de jours de validité
+Serial.ID.of.cert.to.revoke=ID de série du certificat à révoquer
+# keytool: Running part
+keytool.error.=erreur keytool :\u0020
+Illegal.option.=Option non admise : \u0020
+Illegal.value.=Valeur non admise :\u0020
+Unknown.password.type.=Type de mot de passe inconnu :\u0020
+Cannot.find.environment.variable.=Variable d'environnement introuvable :\u0020
+Cannot.find.file.=Fichier introuvable :\u0020
+Command.option.flag.needs.an.argument.=L''option de commande {0} requiert un argument.
+Warning.Different.store.and.key.passwords.not.supported.for.PKCS12.KeyStores.Ignoring.user.specified.command.value.=Avertissement : les mots de passe de clé et de banque distincts ne sont pas pris en charge pour les fichiers de clés d''accès PKCS12. La valeur {0} spécifiée par l''utilisateur est ignorée.
+the.keystore.or.storetype.option.cannot.be.used.with.the.cacerts.option=Les options -keystore ou -storetype ne peuvent pas être utilisées avec l'option -cacerts
+.keystore.must.be.NONE.if.storetype.is.{0}=-keystore doit être défini sur NONE si -storetype est {0}
+Too.many.retries.program.terminated=Trop de tentatives, fin du programme
+.storepasswd.and.keypasswd.commands.not.supported.if.storetype.is.{0}=Les commandes -storepasswd et -keypasswd ne sont pas prises en charge si -storetype est défini sur {0}
+.keypasswd.commands.not.supported.if.storetype.is.PKCS12=Les commandes -keypasswd ne sont pas prises en charge si -storetype est défini sur PKCS12
+.keypass.and.new.can.not.be.specified.if.storetype.is.{0}=Les commandes -keypass et -new ne peuvent pas être spécifiées si -storetype est défini sur {0}
+if.protected.is.specified.then.storepass.keypass.and.new.must.not.be.specified=si -protected est spécifié, -storepass, -keypass et -new ne doivent pas être indiqués
+if.srcprotected.is.specified.then.srcstorepass.and.srckeypass.must.not.be.specified=Si -srcprotected est indiqué, les commandes -srcstorepass et -srckeypass ne doivent pas être spécifiées
+if.keystore.is.not.password.protected.then.storepass.keypass.and.new.must.not.be.specified=Si le fichier de clés n'est pas protégé par un mot de passe, les commandes -storepass, -keypass et -new ne doivent pas être spécifiées
+if.source.keystore.is.not.password.protected.then.srcstorepass.and.srckeypass.must.not.be.specified=Si le fichier de clés source n'est pas protégé par un mot de passe, les commandes -srcstorepass et -srckeypass ne doivent pas être spécifiées
+Illegal.startdate.value=Valeur de date de début non admise
+Validity.must.be.greater.than.zero=La validité doit être supérieure à zéro
+provclass.not.a.provider=%s n'est pas un fournisseur
+provider.name.not.found=Fournisseur nommé "%s" introuvable
+provider.class.not.found=Fournisseur "%s" introuvable
+Usage.error.no.command.provided=Erreur de syntaxe : aucune commande fournie
+Source.keystore.file.exists.but.is.empty.=Le fichier de clés source existe mais il est vide :\u0020
+Please.specify.srckeystore=Indiquez -srckeystore
+Must.not.specify.both.v.and.rfc.with.list.command=-v et -rfc ne doivent pas être spécifiés avec la commande 'list'
+Key.password.must.be.at.least.6.characters=Un mot de passe de clé doit comporter au moins 6 caractères
+New.password.must.be.at.least.6.characters=Le nouveau mot de passe doit comporter au moins 6 caractères
+Keystore.file.exists.but.is.empty.=Fichier de clés existant mais vide :\u0020
+Keystore.file.does.not.exist.=Le fichier de clés n'existe pas :\u0020
+Must.specify.destination.alias=L'alias de destination doit être spécifié
+Must.specify.alias=L'alias doit être spécifié
+Keystore.password.must.be.at.least.6.characters=Un mot de passe de fichier de clés doit comporter au moins 6 caractères
+Enter.the.password.to.be.stored.=Saisissez le mot de passe à stocker : \u0020
+Enter.keystore.password.=Entrez le mot de passe du fichier de clés : \u0020
+Enter.source.keystore.password.=Entrez le mot de passe du fichier de clés source : \u0020
+Enter.destination.keystore.password.=Entrez le mot de passe du fichier de clés de destination : \u0020
+Keystore.password.is.too.short.must.be.at.least.6.characters=Le mot de passe du fichier de clés est trop court : il doit comporter au moins 6 caractères
+Unknown.Entry.Type=Type d'entrée inconnu
+Too.many.failures.Alias.not.changed=Trop d'erreurs. Alias non modifié
+Entry.for.alias.alias.successfully.imported.=L''entrée de l''alias {0} a été importée.
+Entry.for.alias.alias.not.imported.=L''entrée de l''alias {0} n''a pas été importée.
+Problem.importing.entry.for.alias.alias.exception.Entry.for.alias.alias.not.imported.=Problème lors de l''import de l''entrée de l''alias {0} : {1}.\nL''entrée de l''alias {0} n''a pas été importée.
+Import.command.completed.ok.entries.successfully.imported.fail.entries.failed.or.cancelled=Commande d''import exécutée : {0} entrées importées, échec ou annulation de {1} entrées
+Warning.Overwriting.existing.alias.alias.in.destination.keystore=Avertissement : l''alias {0} existant sera remplacé dans le fichier de clés d''accès de destination
+Existing.entry.alias.alias.exists.overwrite.no.=L''alias d''entrée {0} existe déjà. Voulez-vous le remplacer ? [non] : \u0020
+Too.many.failures.try.later=Trop d'erreurs. Réessayez plus tard
+Certification.request.stored.in.file.filename.=Demande de certification stockée dans le fichier <{0}>
+Submit.this.to.your.CA=Soumettre à votre CA
+if.alias.not.specified.destalias.and.srckeypass.must.not.be.specified=si l'alias n'est pas spécifié, destalias et srckeypass ne doivent pas être spécifiés
+The.destination.pkcs12.keystore.has.different.storepass.and.keypass.Please.retry.with.destkeypass.specified.=Le fichier de clés pkcs12 de destination contient un mot de passe de fichier de clés et un mot de passe de clé différents. Réessayez en spécifiant -destkeypass.
+Certificate.stored.in.file.filename.=Certificat stocké dans le fichier <{0}>
+Certificate.reply.was.installed.in.keystore=Réponse de certificat installée dans le fichier de clés
+Certificate.reply.was.not.installed.in.keystore=Réponse de certificat non installée dans le fichier de clés
+Certificate.was.added.to.keystore=Certificat ajouté au fichier de clés
+Certificate.was.not.added.to.keystore=Certificat non ajouté au fichier de clés
+.Storing.ksfname.=[Stockage de {0}]
+alias.has.no.public.key.certificate.={0} ne possède pas de clé publique (certificat)
+Cannot.derive.signature.algorithm=Impossible de déduire l'algorithme de signature
+Alias.alias.does.not.exist=L''alias <{0}> n''existe pas
+Alias.alias.has.no.certificate=L''alias <{0}> ne possède pas de certificat
+Key.pair.not.generated.alias.alias.already.exists=Paire de clés non générée, l''alias <{0}> existe déjà
+Generating.keysize.bit.keyAlgName.key.pair.and.self.signed.certificate.sigAlgName.with.a.validity.of.validality.days.for=Génération d''une paire de clés {1} de {0} bits et d''un certificat auto-signé ({2}) d''une validité de {3} jours\n\tpour : {4}
+Enter.key.password.for.alias.=Entrez le mot de passe de la clé pour <{0}>
+.RETURN.if.same.as.keystore.password.=\t(appuyez sur Entrée s'il s'agit du mot de passe du fichier de clés) : \u0020
+Key.password.is.too.short.must.be.at.least.6.characters=Le mot de passe de la clé est trop court : il doit comporter au moins 6 caractères
+Too.many.failures.key.not.added.to.keystore=Trop d'erreurs. Clé non ajoutée au fichier de clés
+Destination.alias.dest.already.exists=L''alias de la destination <{0}> existe déjà
+Password.is.too.short.must.be.at.least.6.characters=Le mot de passe est trop court : il doit comporter au moins 6 caractères
+Too.many.failures.Key.entry.not.cloned=Trop d'erreurs. Entrée de clé non clonée
+key.password.for.alias.=mot de passe de clé pour <{0}>
+Keystore.entry.for.id.getName.already.exists=L''entrée de fichier de clés d''accès pour <{0}> existe déjà
+Creating.keystore.entry.for.id.getName.=Création d''une entrée de fichier de clés d''accès pour <{0}>...
+No.entries.from.identity.database.added=Aucune entrée ajoutée à partir de la base de données d'identités
+Alias.name.alias=Nom d''alias : {0}
+Creation.date.keyStore.getCreationDate.alias.=Date de création : {0,date}
+alias.keyStore.getCreationDate.alias.={0}, {1,date},\u0020
+alias.={0},\u0020
+Entry.type.type.=Type d''entrée : {0}
+Certificate.chain.length.=Longueur de chaîne du certificat :\u0020
+Certificate.i.1.=Certificat[{0,number,integer}]:
+Certificate.fingerprint.SHA.256.=Empreinte du certificat (SHA-256) :\u0020
+Keystore.type.=Type de fichier de clés :\u0020
+Keystore.provider.=Fournisseur de fichier de clés :\u0020
+Your.keystore.contains.keyStore.size.entry=Votre fichier de clés d''accès contient {0,number,integer} entrée
+Your.keystore.contains.keyStore.size.entries=Votre fichier de clés d''accès contient {0,number,integer} entrées
+Failed.to.parse.input=L'analyse de l'entrée a échoué
+Empty.input=Entrée vide
+Not.X.509.certificate=Pas un certificat X.509
+alias.has.no.public.key={0} ne possède pas de clé publique
+alias.has.no.X.509.certificate={0} ne possède pas de certificat X.509
+New.certificate.self.signed.=Nouveau certificat (auto-signé) :
+Reply.has.no.certificates=La réponse n'a pas de certificat
+Certificate.not.imported.alias.alias.already.exists=Certificat non importé, l''alias <{0}> existe déjà
+Input.not.an.X.509.certificate=L'entrée n'est pas un certificat X.509
+Certificate.already.exists.in.keystore.under.alias.trustalias.=Le certificat existe déjà dans le fichier de clés d''accès sous l''alias <{0}>
+Do.you.still.want.to.add.it.no.=Voulez-vous toujours l'ajouter ? [non] : \u0020
+Certificate.already.exists.in.system.wide.CA.keystore.under.alias.trustalias.=Le certificat existe déjà dans le fichier de clés d''accès CA système sous l''alias <{0}>
+Do.you.still.want.to.add.it.to.your.own.keystore.no.=Voulez-vous toujours l'ajouter à votre fichier de clés ? [non] : \u0020
+Trust.this.certificate.no.=Faire confiance à ce certificat ? [non] : \u0020
+YES=OUI
+New.prompt.=Nouveau {0} :\u0020
+Passwords.must.differ=Les mots de passe doivent différer
+Re.enter.new.prompt.=Indiquez encore le nouveau {0} :\u0020
+Re.enter.password.=Répétez le mot de passe :\u0020
+Re.enter.new.password.=Ressaisissez le nouveau mot de passe :\u0020
+They.don.t.match.Try.again=Ils sont différents. Réessayez.
+Enter.prompt.alias.name.=Indiquez le nom d''alias {0} : \u0020
+Enter.new.alias.name.RETURN.to.cancel.import.for.this.entry.=Saisissez le nom du nouvel alias\t(ou appuyez sur Entrée pour annuler l'import de cette entrée) : \u0020
+Enter.alias.name.=Indiquez le nom d'alias : \u0020
+.RETURN.if.same.as.for.otherAlias.=\t(appuyez sur Entrée si le résultat est identique à <{0}>)
+What.is.your.first.and.last.name.=Quels sont vos nom et prénom ?
+What.is.the.name.of.your.organizational.unit.=Quel est le nom de votre unité organisationnelle ?
+What.is.the.name.of.your.organization.=Quel est le nom de votre entreprise ?
+What.is.the.name.of.your.City.or.Locality.=Quel est le nom de votre ville de résidence ?
+What.is.the.name.of.your.State.or.Province.=Quel est le nom de votre état ou province ?
+What.is.the.two.letter.country.code.for.this.unit.=Quel est le code pays à deux lettres pour cette unité ?
+Is.name.correct.=Est-ce {0} ?
+no=non
+yes=oui
+y=o
+.defaultValue.=\u0020 [{0}]: \u0020
+Alias.alias.has.no.key=L''alias <{0}> n''est associé à aucune clé
+Alias.alias.references.an.entry.type.that.is.not.a.private.key.entry.The.keyclone.command.only.supports.cloning.of.private.key=L''entrée à laquelle l''alias <{0}> fait référence n''est pas une entrée de type clé privée. La commande -keyclone prend uniquement en charge le clonage des clés privées
+
+.WARNING.WARNING.WARNING.=*****************  WARNING WARNING WARNING  *****************
+Signer.d.=Signataire n°%d :
+Timestamp.=Horodatage :
+Signature.=Signature :
+CRLs.=Listes des certificats révoqués (CRL) :
+Certificate.owner.=Propriétaire du certificat :\u0020
+Not.a.signed.jar.file=Fichier JAR non signé
+No.certificate.from.the.SSL.server=Aucun certificat du serveur SSL
+
+.The.integrity.of.the.information.stored.in.your.keystore.=* L'intégrité des informations stockées dans votre fichier de clés  *\n* n'a PAS été vérifiée. Pour cela, *\n* vous devez fournir le mot de passe de votre fichier de clés.                  *
+.The.integrity.of.the.information.stored.in.the.srckeystore.=* L'intégrité des informations stockées dans le fichier de clés source  *\n* n'a PAS été vérifiée. Pour cela, *\n* vous devez fournir le mot de passe de votre fichier de clés source.                  *
+
+Certificate.reply.does.not.contain.public.key.for.alias.=La réponse au certificat ne contient pas de clé publique pour <{0}>
+Incomplete.certificate.chain.in.reply=Chaîne de certificat incomplète dans la réponse
+Certificate.chain.in.reply.does.not.verify.=La chaîne de certificat de la réponse ne concorde pas :\u0020
+Top.level.certificate.in.reply.=Certificat de niveau supérieur dans la réponse :\n
+.is.not.trusted.=... non sécurisé.\u0020
+Install.reply.anyway.no.=Installer la réponse quand même ? [non] : \u0020
+NO=NON
+Public.keys.in.reply.and.keystore.don.t.match=Les clés publiques de la réponse et du fichier de clés ne concordent pas
+Certificate.reply.and.certificate.in.keystore.are.identical=La réponse au certificat et le certificat du fichier de clés sont identiques
+Failed.to.establish.chain.from.reply=Impossible de créer une chaîne à partir de la réponse
+n=n
+Wrong.answer.try.again=Réponse incorrecte, recommencez
+Secret.key.not.generated.alias.alias.already.exists=Clé secrète non générée, l''alias <{0}> existe déjà
+Please.provide.keysize.for.secret.key.generation=Indiquez -keysize pour la génération de la clé secrète
+
+warning.not.verified.make.sure.keystore.is.correct=AVERTISSEMENT : non vérifié. Assurez-vous que -keystore est correct.
+
+Extensions.=Extensions :\u0020
+.Empty.value.=(Valeur vide)
+Extension.Request.=Demande d'extension :
+Unknown.keyUsage.type.=Type keyUsage inconnu :\u0020
+Unknown.extendedkeyUsage.type.=Type extendedkeyUsage inconnu :\u0020
+Unknown.AccessDescription.type.=Type AccessDescription inconnu :\u0020
+Unrecognized.GeneralName.type.=Type GeneralName non reconnu :\u0020
+This.extension.cannot.be.marked.as.critical.=Cette extension ne peut pas être marquée comme critique.\u0020
+Odd.number.of.hex.digits.found.=Nombre impair de chiffres hexadécimaux trouvé :\u0020
+Unknown.extension.type.=Type d'extension inconnu :\u0020
+command.{0}.is.ambiguous.=commande {0} ambiguë :
+# 8171319: keytool should print out warnings when reading or
+# generating cert/cert req using weak algorithms
+the.certificate.request=Demande de certificat
+the.issuer=Emetteur
+the.generated.certificate=Certificat généré
+the.generated.crl=Liste des certificats révoqués générée
+the.generated.certificate.request=Demande de certificat généré
+the.certificate=Certificat
+the.crl=Liste de certificats révoqués
+the.tsa.certificate=Certificat TSA
+the.input=Entrée
+reply=Répondre
+one.in.many=%1$s #%2$d sur %3$d
+alias.in.cacerts=Emetteur <%s> dans les certificats CA
+alias.in.keystore=Emetteur <%s>
+with.weak=%s (faible)
+key.bit=Clé %2$s %1$d bits
+key.bit.weak=Clé %2$s %1$d bits (faible)
+unknown.size.1=taille de clé %s inconnue
+.PATTERN.printX509Cert.with.weak=Propriétaire : {0}\nEmetteur : {1}\nNuméro de série : {2}\nValide du {3} au {4}\nEmpreintes du certificat :\n\t SHA 1: {5}\n\t SHA 256: {6}\nNom de l''algorithme de signature : {7}\nAlgorithme de clé publique du sujet : {8}\nVersion : {9}
+PKCS.10.with.weak=Demande de certificat PKCS #10 (version 1.0)\nSujet : %1$s\nFormat : %2$s\nClé publique : %3$s\nAlgorithme de signature : %4$s\n
+verified.by.s.in.s.weak=Vérifié par %1$s dans %2$s avec un élément %3$s
+whose.sigalg.risk=%1$s utilise l'algorithme de signature %2$s, qui représente un risque pour la sécurité.
+whose.key.risk=%1$s utilise un élément %2$s, qui représente un risque pour la sécurité.
+jks.storetype.warning=Le fichier de clés %1$s utilise un format propriétaire. Il est recommandé de migrer vers PKCS12, qui est un format standard de l'industrie en utilisant "keytool -importkeystore -srckeystore %2$s -destkeystore %2$s -deststoretype pkcs12".
+migrate.keystore.warning=Elément "%1$s" migré vers %4$s. Le fichier de clés %2$s est sauvegardé en tant que "%3$s".
+backup.keystore.warning=Le fichier de clés d'origine "%1$s" est sauvegardé en tant que "%3$s"...
+importing.keystore.status=Import du fichier de clés %1$s vers %2$s...
diff --git a/src/java.base/share/classes/sun/security/tools/keytool/resources/keytool_it.properties b/src/java.base/share/classes/sun/security/tools/keytool/resources/keytool_it.properties
new file mode 100644
index 00000000000..d2709d5843d
--- /dev/null
+++ b/src/java.base/share/classes/sun/security/tools/keytool/resources/keytool_it.properties
@@ -0,0 +1,302 @@
+#
+# Copyright (c) 2000, 2025, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute 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.
+#
+
+NEWLINE=\n
+STAR=*******************************************
+STARNN=*******************************************\n\n
+# keytool: Help part
+.OPTION.=\u0020[OPTION]...
+Options.=Opzioni:
+option.1.set.twice=L'opzione %s è specificata più volte. Tutte le ricorrenze verranno ignorate tranne l'ultima.
+multiple.commands.1.2=È consentito un solo comando: è stato specificato sia %1$s che %2$s.
+Use.keytool.help.for.all.available.commands=Utilizzare "keytool -help" per visualizzare tutti i comandi disponibili
+Key.and.Certificate.Management.Tool=Strumento di gestione di chiavi e certificati
+Commands.=Comandi:
+Use.keytool.command.name.help.for.usage.of.command.name=Utilizzare "keytool -command_name -help" per informazioni sull'uso di command_name.\nUtilizzare l'opzione -conf <url> per specificare un file di opzioni preconfigurato.
+# keytool: help: commands
+Generates.a.certificate.request=Genera una richiesta di certificato
+Changes.an.entry.s.alias=Modifica l'alias di una voce
+Deletes.an.entry=Elimina una voce
+Exports.certificate=Esporta il certificato
+Generates.a.key.pair=Genera una coppia di chiavi
+Generates.a.secret.key=Genera una chiave segreta
+Generates.certificate.from.a.certificate.request=Genera un certificato da una richiesta di certificato
+Generates.CRL=Genera CRL
+Generated.keyAlgName.secret.key=Generata chiave segreta {0}
+Generated.keysize.bit.keyAlgName.secret.key=Generata chiave segreta {1} a {0} bit
+Imports.entries.from.a.JDK.1.1.x.style.identity.database=Importa le voci da un database delle identità di tipo JDK 1.1.x
+Imports.a.certificate.or.a.certificate.chain=Importa un certificato o una catena di certificati
+Imports.a.password=Importa una password
+Imports.one.or.all.entries.from.another.keystore=Importa una o tutte le voci da un altro keystore
+Clones.a.key.entry=Duplica una voce di chiave
+Changes.the.key.password.of.an.entry=Modifica la password della chiave per una voce
+Lists.entries.in.a.keystore=Elenca le voci in un keystore
+Prints.the.content.of.a.certificate=Visualizza i contenuti di un certificato
+Prints.the.content.of.a.certificate.request=Visualizza i contenuti di una richiesta di certificato
+Prints.the.content.of.a.CRL.file=Visualizza i contenuti di un file CRL
+Generates.a.self.signed.certificate=Genera certificato con firma automatica
+Changes.the.store.password.of.a.keystore=Modifica la password di area di memorizzazione di un keystore
+# keytool: help: options
+alias.name.of.the.entry.to.process=nome alias della voce da elaborare
+destination.alias=alias di destinazione
+destination.key.password=password chiave di destinazione
+destination.keystore.name=nome keystore di destinazione
+destination.keystore.password.protected=password keystore di destinazione protetta
+destination.keystore.provider.name=nome provider keystore di destinazione
+destination.keystore.password=password keystore di destinazione
+destination.keystore.type=tipo keystore di destinazione
+distinguished.name=nome distinto
+X.509.extension=estensione X.509
+output.file.name=nome file di output
+input.file.name=nome file di input
+key.algorithm.name=nome algoritmo chiave
+key.password=password chiave
+key.bit.size=dimensione bit chiave
+keystore.name=nome keystore
+access.the.cacerts.keystore=accedi al keystore cacerts
+warning.cacerts.option=Avvertenza: utilizzare l'opzione -cacerts per accedere al keystore cacerts
+new.password=nuova password
+do.not.prompt=non richiedere
+password.through.protected.mechanism=password mediante meccanismo protetto
+# The following 2 values should span 2 lines, the first for the
+# option itself, the second for its -providerArg value.
+addprovider.option=aggiunge il provider di sicurezza in base al nome (ad esempio SunPKCS11)\nconfigura l'argomento per -addprovider
+provider.class.option=aggiunge il provider di sicurezza in base al nome di classe completamente qualificato\nconfigura l'argomento per -providerclass
+
+provider.name=nome provider
+provider.classpath=classpath provider
+output.in.RFC.style=output in stile RFC
+signature.algorithm.name=nome algoritmo firma
+source.alias=alias origine
+source.key.password=password chiave di origine
+source.keystore.name=nome keystore di origine
+source.keystore.password.protected=password keystore di origine protetta
+source.keystore.provider.name=nome provider keystore di origine
+source.keystore.password=password keystore di origine
+source.keystore.type=tipo keystore di origine
+SSL.server.host.and.port=host e porta server SSL
+signed.jar.file=file jar firmato
+certificate.validity.start.date.time=data/ora di inizio validità certificato
+keystore.password=password keystore
+keystore.type=tipo keystore
+trust.certificates.from.cacerts=considera sicuri i certificati da cacerts
+verbose.output=output descrittivo
+validity.number.of.days=numero di giorni di validità
+Serial.ID.of.cert.to.revoke=ID seriale del certificato da revocare
+# keytool: Running part
+keytool.error.=Errore keytool:\u0020
+Illegal.option.=Opzione non valida: \u0020
+Illegal.value.=Valore non valido:\u0020
+Unknown.password.type.=Tipo di password sconosciuto:\u0020
+Cannot.find.environment.variable.=Impossibile trovare la variabile di ambiente:\u0020
+Cannot.find.file.=Impossibile trovare il file:\u0020
+Command.option.flag.needs.an.argument.=È necessario specificare un argomento per l''opzione di comando {0}.
+Warning.Different.store.and.key.passwords.not.supported.for.PKCS12.KeyStores.Ignoring.user.specified.command.value.=Avvertenza: non sono supportate password diverse di chiave e di archivio per i keystore PKCS12. Il valore {0} specificato dall''utente verrà ignorato.
+the.keystore.or.storetype.option.cannot.be.used.with.the.cacerts.option=L'opzione -keystore o -storetype non può essere utilizzata con l'opzione -cacerts
+.keystore.must.be.NONE.if.storetype.is.{0}=Se -storetype è impostato su {0}, -keystore deve essere impostato su NONE
+Too.many.retries.program.terminated=Il numero dei tentativi consentiti è stato superato. Il programma verrà terminato.
+.storepasswd.and.keypasswd.commands.not.supported.if.storetype.is.{0}=Se -storetype è impostato su {0}, i comandi -storepasswd e -keypasswd non sono supportati
+.keypasswd.commands.not.supported.if.storetype.is.PKCS12=Se -storetype è impostato su PKCS12 i comandi -keypasswd non vengono supportati
+.keypass.and.new.can.not.be.specified.if.storetype.is.{0}=Se -storetype è impostato su {0}, non è possibile specificare un valore per -keypass e -new
+if.protected.is.specified.then.storepass.keypass.and.new.must.not.be.specified=Se è specificata l'opzione -protected, le opzioni -storepass, -keypass e -new non possono essere specificate
+if.srcprotected.is.specified.then.srcstorepass.and.srckeypass.must.not.be.specified=Se viene specificato -srcprotected, -srcstorepass e -srckeypass non dovranno essere specificati
+if.keystore.is.not.password.protected.then.storepass.keypass.and.new.must.not.be.specified=Se il file keystore non è protetto da password, non deve essere specificato alcun valore per -storepass, -keypass e -new
+if.source.keystore.is.not.password.protected.then.srcstorepass.and.srckeypass.must.not.be.specified=Se il file keystore non è protetto da password, non deve essere specificato alcun valore per -srcstorepass e -srckeypass
+Illegal.startdate.value=Valore di data di inizio non valido
+Validity.must.be.greater.than.zero=La validità deve essere maggiore di zero
+provclass.not.a.provider=%s non è un provider
+provider.name.not.found=Provider denominato "%s" non trovato
+provider.class.not.found=Provider "%s" non trovato
+Usage.error.no.command.provided=Errore di utilizzo: nessun comando specificato
+Source.keystore.file.exists.but.is.empty.=Il file keystore di origine esiste, ma è vuoto:\u0020
+Please.specify.srckeystore=Specificare -srckeystore
+Must.not.specify.both.v.and.rfc.with.list.command=Impossibile specificare sia -v sia -rfc con il comando 'list'
+Key.password.must.be.at.least.6.characters=La password della chiave deve contenere almeno 6 caratteri
+New.password.must.be.at.least.6.characters=La nuova password deve contenere almeno 6 caratteri
+Keystore.file.exists.but.is.empty.=Il file keystore esiste ma è vuoto:\u0020
+Keystore.file.does.not.exist.=Il file keystore non esiste:\u0020
+Must.specify.destination.alias=È necessario specificare l'alias di destinazione
+Must.specify.alias=È necessario specificare l'alias
+Keystore.password.must.be.at.least.6.characters=La password del keystore deve contenere almeno 6 caratteri
+Enter.the.password.to.be.stored.=Immettere la password da memorizzare: \u0020
+Enter.keystore.password.=Immettere la password del keystore: \u0020
+Enter.source.keystore.password.=Immettere la password del keystore di origine: \u0020
+Enter.destination.keystore.password.=Immettere la password del keystore di destinazione: \u0020
+Keystore.password.is.too.short.must.be.at.least.6.characters=La password del keystore è troppo corta - deve contenere almeno 6 caratteri
+Unknown.Entry.Type=Tipo di voce sconosciuto
+Too.many.failures.Alias.not.changed=Numero eccessivo di errori. L'alias non è stato modificato.
+Entry.for.alias.alias.successfully.imported.=La voce dell''alias {0} è stata importata.
+Entry.for.alias.alias.not.imported.=La voce dell''alias {0} non è stata importata.
+Problem.importing.entry.for.alias.alias.exception.Entry.for.alias.alias.not.imported.=Si è verificato un problema durante l''importazione della voce dell''alias {0}: {1}.\nLa voce dell''alias {0} non è stata importata.
+Import.command.completed.ok.entries.successfully.imported.fail.entries.failed.or.cancelled=Comando di importazione completato: {0} voce/i importata/e, {1} voce/i non importata/e o annullata/e
+Warning.Overwriting.existing.alias.alias.in.destination.keystore=Avvertenza: sovrascrittura in corso dell''alias {0} nel file keystore di destinazione
+Existing.entry.alias.alias.exists.overwrite.no.=La voce dell''alias {0} esiste già. Sovrascrivere? [no]: \u0020
+Too.many.failures.try.later=Troppi errori - riprovare
+Certification.request.stored.in.file.filename.=La richiesta di certificazione è memorizzata nel file <{0}>
+Submit.this.to.your.CA=Sottomettere alla propria CA
+if.alias.not.specified.destalias.and.srckeypass.must.not.be.specified=Se l'alias non è specificato, destalias e srckeypass non dovranno essere specificati
+The.destination.pkcs12.keystore.has.different.storepass.and.keypass.Please.retry.with.destkeypass.specified.=Keystore pkcs12 di destinazione con storepass e keypass differenti. Riprovare con -destkeypass specificato.
+Certificate.stored.in.file.filename.=Il certificato è memorizzato nel file <{0}>
+Certificate.reply.was.installed.in.keystore=La risposta del certificato è stata installata nel keystore
+Certificate.reply.was.not.installed.in.keystore=La risposta del certificato non è stata installata nel keystore
+Certificate.was.added.to.keystore=Il certificato è stato aggiunto al keystore
+Certificate.was.not.added.to.keystore=Il certificato non è stato aggiunto al keystore
+.Storing.ksfname.=[Memorizzazione di {0}] in corso
+alias.has.no.public.key.certificate.={0} non dispone di chiave pubblica (certificato)
+Cannot.derive.signature.algorithm=Impossibile derivare l'algoritmo di firma
+Alias.alias.does.not.exist=L''alias <{0}> non esiste
+Alias.alias.has.no.certificate=L''alias <{0}> non dispone di certificato
+Key.pair.not.generated.alias.alias.already.exists=Non è stata generata la coppia di chiavi, l''alias <{0}> è già esistente
+Generating.keysize.bit.keyAlgName.key.pair.and.self.signed.certificate.sigAlgName.with.a.validity.of.validality.days.for=Generazione in corso di una coppia di chiavi {1} da {0} bit e di un certificato autofirmato ({2}) con una validità di {3} giorni\n\tper: {4}
+Enter.key.password.for.alias.=Immettere la password della chiave per <{0}>
+.RETURN.if.same.as.keystore.password.=\t(INVIO se corrisponde alla password del keystore): \u0020
+Key.password.is.too.short.must.be.at.least.6.characters=La password della chiave è troppo corta - deve contenere almeno 6 caratteri
+Too.many.failures.key.not.added.to.keystore=Troppi errori - la chiave non è stata aggiunta al keystore
+Destination.alias.dest.already.exists=L''alias di destinazione <{0}> è già esistente
+Password.is.too.short.must.be.at.least.6.characters=La password è troppo corta - deve contenere almeno 6 caratteri
+Too.many.failures.Key.entry.not.cloned=Numero eccessivo di errori. Il valore della chiave non è stato copiato.
+key.password.for.alias.=password della chiave per <{0}>
+Keystore.entry.for.id.getName.already.exists=La voce del keystore per <{0}> esiste già
+Creating.keystore.entry.for.id.getName.=Creazione della voce del keystore per <{0}> in corso...
+No.entries.from.identity.database.added=Nessuna voce aggiunta dal database delle identità
+Alias.name.alias=Nome alias: {0}
+Creation.date.keyStore.getCreationDate.alias.=Data di creazione: {0,date}
+alias.keyStore.getCreationDate.alias.={0}, {1,date},\u0020
+alias.={0},\u0020
+Entry.type.type.=Tipo di voce: {0}
+Certificate.chain.length.=Lunghezza catena certificati:\u0020
+Certificate.i.1.=Certificato[{0,number,integer}]:
+Certificate.fingerprint.SHA.256.=Copia di certificato (SHA-256):\u0020
+Keystore.type.=Tipo keystore:\u0020
+Keystore.provider.=Provider keystore:\u0020
+Your.keystore.contains.keyStore.size.entry=Il keystore contiene {0,number,integer} voce
+Your.keystore.contains.keyStore.size.entries=Il keystore contiene {0,number,integer} voci
+Failed.to.parse.input=Impossibile analizzare l'input
+Empty.input=Input vuoto
+Not.X.509.certificate=Il certificato non è X.509
+alias.has.no.public.key={0} non dispone di chiave pubblica
+alias.has.no.X.509.certificate={0} non dispone di certificato X.509
+New.certificate.self.signed.=Nuovo certificato (autofirmato):
+Reply.has.no.certificates=La risposta non dispone di certificati
+Certificate.not.imported.alias.alias.already.exists=Impossibile importare il certificato, l''alias <{0}> è già esistente
+Input.not.an.X.509.certificate=L'input non è un certificato X.509
+Certificate.already.exists.in.keystore.under.alias.trustalias.=Il certificato esiste già nel keystore con alias <{0}>
+Do.you.still.want.to.add.it.no.=Aggiungerlo ugualmente? [no]: \u0020
+Certificate.already.exists.in.system.wide.CA.keystore.under.alias.trustalias.=Il certificato esiste già nel keystore CA con alias <{0}>
+Do.you.still.want.to.add.it.to.your.own.keystore.no.=Aggiungerlo al proprio keystore? [no]: \u0020
+Trust.this.certificate.no.=Considerare sicuro questo certificato? [no]: \u0020
+YES=Sì
+New.prompt.=Nuova {0}:\u0020
+Passwords.must.differ=Le password non devono coincidere
+Re.enter.new.prompt.=Reimmettere un nuovo valore per {0}:\u0020
+Re.enter.password.=Reimmettere la password:\u0020
+Re.enter.new.password.=Immettere nuovamente la nuova password:\u0020
+They.don.t.match.Try.again=Non corrispondono. Riprovare.
+Enter.prompt.alias.name.=Immettere nome alias {0}: \u0020
+Enter.new.alias.name.RETURN.to.cancel.import.for.this.entry.=Immettere un nuovo nome alias\t(premere INVIO per annullare l'importazione della voce): \u0020
+Enter.alias.name.=Immettere nome alias: \u0020
+.RETURN.if.same.as.for.otherAlias.=\t(INVIO se corrisponde al nome di <{0}>)
+What.is.your.first.and.last.name.=Specificare nome e cognome
+What.is.the.name.of.your.organizational.unit.=Specificare il nome dell'unità organizzativa
+What.is.the.name.of.your.organization.=Specificare il nome dell'organizzazione
+What.is.the.name.of.your.City.or.Locality.=Specificare la località
+What.is.the.name.of.your.State.or.Province.=Specificare la provincia
+What.is.the.two.letter.country.code.for.this.unit.=Specificare il codice a due lettere del paese in cui si trova l'unità
+Is.name.correct.=Il dato {0} è corretto?
+no=no
+yes=sì
+y=s
+.defaultValue.=\u0020 [{0}]: \u0020
+Alias.alias.has.no.key=All''alias <{0}> non è associata alcuna chiave
+Alias.alias.references.an.entry.type.that.is.not.a.private.key.entry.The.keyclone.command.only.supports.cloning.of.private.key=L''alias <{0}> fa riferimento a un tipo di voce che non è una voce di chiave privata. Il comando -keyclone supporta solo la copia delle voci di chiave private.
+
+.WARNING.WARNING.WARNING.=*****************  WARNING WARNING WARNING  *****************
+Signer.d.=Firmatario #%d:
+Timestamp.=Indicatore orario:
+Signature.=Firma:
+CRLs.=CRL:
+Certificate.owner.=Proprietario certificato:\u0020
+Not.a.signed.jar.file=Non è un file jar firmato
+No.certificate.from.the.SSL.server=Nessun certificato dal server SSL
+
+.The.integrity.of.the.information.stored.in.your.keystore.=* L'integrità delle informazioni memorizzate nel keystore *\n* NON è stata verificata. Per verificarne l'integrità *\n* è necessario fornire la password del keystore.                  *
+.The.integrity.of.the.information.stored.in.the.srckeystore.=* L'integrità delle informazioni memorizzate nel srckeystore *\n* NON è stata verificata. Per verificarne l'integrità *\n* è necessario fornire la password del srckeystore.                  *
+
+Certificate.reply.does.not.contain.public.key.for.alias.=La risposta del certificato non contiene la chiave pubblica per <{0}>
+Incomplete.certificate.chain.in.reply=Catena dei certificati incompleta nella risposta
+Certificate.chain.in.reply.does.not.verify.=La catena dei certificati nella risposta non verifica:\u0020
+Top.level.certificate.in.reply.=Certificato di primo livello nella risposta:\n
+.is.not.trusted.=...non è considerato sicuro.\u0020
+Install.reply.anyway.no.=Installare la risposta? [no]: \u0020
+NO=NO
+Public.keys.in.reply.and.keystore.don.t.match=Le chiavi pubbliche nella risposta e nel keystore non corrispondono
+Certificate.reply.and.certificate.in.keystore.are.identical=La risposta del certificato e il certificato nel keystore sono identici
+Failed.to.establish.chain.from.reply=Impossibile stabilire la catena dalla risposta
+n=n
+Wrong.answer.try.again=Risposta errata, riprovare
+Secret.key.not.generated.alias.alias.already.exists=La chiave segreta non è stata generata; l''alias <{0}> esiste già
+Please.provide.keysize.for.secret.key.generation=Specificare il valore -keysize per la generazione della chiave segreta
+
+warning.not.verified.make.sure.keystore.is.correct=AVVERTENZA: non verificato. Assicurarsi che -keystore sia corretto.
+
+Extensions.=Estensioni:\u0020
+.Empty.value.=(valore vuoto)
+Extension.Request.=Richiesta di estensione:
+Unknown.keyUsage.type.=Tipo keyUsage sconosciuto:\u0020
+Unknown.extendedkeyUsage.type.=Tipo extendedkeyUsage sconosciuto:\u0020
+Unknown.AccessDescription.type.=Tipo AccessDescription sconosciuto:\u0020
+Unrecognized.GeneralName.type.=Tipo GeneralName non riconosciuto:\u0020
+This.extension.cannot.be.marked.as.critical.=Impossibile contrassegnare questa estensione come critica.\u0020
+Odd.number.of.hex.digits.found.=È stato trovato un numero dispari di cifre esadecimali:\u0020
+Unknown.extension.type.=Tipo di estensione sconosciuto:\u0020
+command.{0}.is.ambiguous.=il comando {0} è ambiguo:
+# 8171319: keytool should print out warnings when reading or
+# generating cert/cert req using weak algorithms
+the.certificate.request=La richiesta di certificato
+the.issuer=L'emittente
+the.generated.certificate=Il certificato generato
+the.generated.crl=La CRL generata
+the.generated.certificate.request=La richiesta di certificato generata
+the.certificate=Il certificato
+the.crl=La CRL
+the.tsa.certificate=Il certificato TSA
+the.input=L'input
+reply=Rispondi
+one.in.many=%1$s #%2$d di %3$d
+alias.in.cacerts=Emittente <%s> in cacerts
+alias.in.keystore=Emittente <%s>
+with.weak=%s (debole)
+key.bit=Chiave %2$s a %1$d bit
+key.bit.weak=Chiave %2$s a %1$d bit (debole)
+unknown.size.1=chiave %s di dimensione sconosciuta
+.PATTERN.printX509Cert.with.weak=Proprietario: {0}\nEmittente: {1}\nNumero di serie: {2}\nValido da: {3} a: {4}\nImpronte digitali certificato:\n\t SHA1: {5}\n\t SHA256: {6}\nNome algoritmo firma: {7}\nAlgoritmo di chiave pubblica oggetto: {8}\nVersione: {9}
+PKCS.10.with.weak=Richiesta di certificato PKCS #10 (versione 1.0)\nOggetto: %1$s\nFormato: %2$s\nChiave pubblica: %3$s\nAlgoritmo firma: %4$s\n
+verified.by.s.in.s.weak=Verificato da %1$s in %2$s con un %3$s
+whose.sigalg.risk=%1$s utilizza l'algoritmo firma %2$s che è considerato un rischio per la sicurezza.
+whose.key.risk=%1$s utilizza un %2$s che è considerato un rischio per la sicurezza.
+jks.storetype.warning=Il keystore %1$s utilizza un formato proprietario. Si consiglia di eseguire la migrazione a PKCS12, un formato standard di settore, utilizzando il comando "keytool -importkeystore -srckeystore %2$s -destkeystore %2$s -deststoretype pkcs12".
+migrate.keystore.warning=Migrazione di "%1$s" in %4$s eseguita. Backup del keystore %2$s eseguito con il nome "%3$s".
+backup.keystore.warning=Backup del keystore originale "%1$s" eseguito con il nome "%3$s"...
+importing.keystore.status=Importazione del keystore %1$s in %2$s in corso...
diff --git a/src/java.base/share/classes/sun/security/tools/keytool/resources/keytool_ja.properties b/src/java.base/share/classes/sun/security/tools/keytool/resources/keytool_ja.properties
new file mode 100644
index 00000000000..416cf51007f
--- /dev/null
+++ b/src/java.base/share/classes/sun/security/tools/keytool/resources/keytool_ja.properties
@@ -0,0 +1,321 @@
+#
+# Copyright (c) 2000, 2025, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute 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.
+#
+
+NEWLINE=\n
+STAR=*******************************************
+STARNN=*******************************************\n\n
+# keytool: Help part
+.OPTION.=\u0020[OPTION]...
+Options.=オプション:
+option.1.set.twice=%sオプションが複数回指定されています。最後のもの以外はすべて無視されます。
+multiple.commands.1.2=1つのコマンドのみ許可されます: %1$sと%2$sの両方が指定されました。
+Use.keytool.help.for.all.available.commands=このヘルプ・メッセージを表示するには"keytool -?、-hまたは--help"を使用します
+Key.and.Certificate.Management.Tool=キーおよび証明書管理ツール
+Commands.=コマンド:
+Use.keytool.command.name.help.for.usage.of.command.name=command_nameの使用方法については、"keytool -command_name --help"を使用します。\n事前構成済のオプション・ファイルを指定するには、-conf <url>オプションを使用します。
+# keytool: help: commands
+Generates.a.certificate.request=証明書リクエストを生成します
+Changes.an.entry.s.alias=エントリの別名を変更します
+Deletes.an.entry=エントリを削除します
+Exports.certificate=証明書をエクスポートします
+Generates.a.key.pair=キー・ペアを生成します
+Generates.a.secret.key=秘密キーを生成します
+Generates.certificate.from.a.certificate.request=証明書リクエストから証明書を生成します
+Generates.CRL=CRLを生成します
+Generated.keyAlgName.secret.key={0}秘密キーを生成しました
+Generated.keysize.bit.keyAlgName.secret.key={0}ビット{1}秘密キーを生成しました
+key.algorithm.weak=%1$sは%2$sアルゴリズムを使用しており、これはセキュリティ・リスクとみなされます。
+key.size.weak=%1$sは%2$sを使用しており、これはセキュリティ・リスクとみなされます。
+Imports.entries.from.a.JDK.1.1.x.style.identity.database=JDK 1.1.x-styleアイデンティティ・データベースからエントリをインポートします
+Imports.a.certificate.or.a.certificate.chain=証明書または証明書チェーンをインポートします
+Imports.a.password=パスワードをインポートします
+Imports.one.or.all.entries.from.another.keystore=別のキーストアから1つまたはすべてのエントリをインポートします
+Clones.a.key.entry=キー・エントリのクローンを作成します
+Changes.the.key.password.of.an.entry=エントリのキー・パスワードを変更します
+Lists.entries.in.a.keystore=キーストア内のエントリをリストします
+Prints.the.content.of.a.certificate=証明書の内容を出力します
+Prints.the.content.of.a.certificate.request=証明書リクエストの内容を出力します
+Prints.the.content.of.a.CRL.file=CRLファイルの内容を出力します
+Generates.a.self.signed.certificate=自己署名型証明書を生成します
+Changes.the.store.password.of.a.keystore=キーストアのストア・パスワードを変更します
+showinfo.command.help=セキュリティ関連情報を表示します
+Prints.the.program.version=プログラム・バージョンを出力します
+# keytool: help: options
+alias.name.of.the.entry.to.process=処理するエントリの別名
+groupname.option.help=グループ名。たとえば、楕円曲線名です。
+destination.alias=出力先の別名
+destination.key.password=出力先キーのパスワード
+destination.keystore.name=出力先キーストア名
+destination.keystore.password.protected=出力先キーストアの保護対象パスワード
+destination.keystore.provider.name=出力先キーストア・プロバイダ名
+destination.keystore.password=出力先キーストアのパスワード
+destination.keystore.type=出力先キーストアのタイプ
+distinguished.name=識別名
+X.509.extension=X.509拡張
+output.file.name=出力ファイル名
+input.file.name=入力ファイル名
+key.algorithm.name=キー・アルゴリズム名
+key.password=キーのパスワード
+key.bit.size=キーのビット・サイズ
+keystore.name=キーストア名
+access.the.cacerts.keystore=cacertsキーストアにアクセスする
+warning.cacerts.option=警告: cacertsキーストアにアクセスするには-cacertsオプションを使用してください
+new.password=新規パスワード
+do.not.prompt=プロンプトを表示しない
+password.through.protected.mechanism=保護メカニズムによるパスワード
+tls.option.help=TLS構成情報を表示します
+# The following 2 values should span 2 lines, the first for the
+# option itself, the second for its -providerArg value.
+addprovider.option=名前でセキュリティ・プロバイダを追加する(SunPKCS11など)\n-addproviderの引数を構成する
+provider.class.option=完全修飾クラス名でセキュリティ・プロバイダを追加する\n-providerclassの引数を構成する
+
+provider.name=プロバイダ名
+provider.classpath=プロバイダ・クラスパス
+output.in.RFC.style=RFCスタイルの出力
+signature.algorithm.name=署名アルゴリズム名
+signer.alias=署名者の別名
+signer.key.password=署名者のキーのパスワード
+source.alias=ソース別名
+source.key.password=ソース・キーのパスワード
+source.keystore.name=ソース・キーストア名
+source.keystore.password.protected=ソース・キーストアの保護対象パスワード
+source.keystore.provider.name=ソース・キーストア・プロバイダ名
+source.keystore.password=ソース・キーストアのパスワード
+source.keystore.type=ソース・キーストアのタイプ
+SSL.server.host.and.port=SSLサーバーのホストとポート
+signed.jar.file=署名付きJARファイル
+certificate.validity.start.date.time=証明書の有効開始日時
+keystore.password=キーストアのパスワード
+keystore.type=キーストアのタイプ
+trust.certificates.from.cacerts=cacertsからの証明書を信頼する
+verbose.output=詳細出力
+validity.number.of.days=妥当性日数
+Serial.ID.of.cert.to.revoke=失効する証明書のシリアルID
+# keytool: Running part
+keytool.error.=keytoolエラー:\u0020
+Illegal.option.=不正なオプション: \u0020
+Illegal.value.=不正な値:\u0020
+Unknown.password.type.=不明なパスワード・タイプ:\u0020
+Cannot.find.environment.variable.=環境変数が見つかりません:\u0020
+Cannot.find.file.=ファイルが見つかりません:\u0020
+Command.option.flag.needs.an.argument.=コマンド・オプション{0}には引数が必要です。
+Warning.Different.store.and.key.passwords.not.supported.for.PKCS12.KeyStores.Ignoring.user.specified.command.value.=警告: PKCS12キーストアでは、ストアのパスワードとキーのパスワードが異なる状況はサポートされません。ユーザーが指定した{0}の値は無視します。
+the.keystore.or.storetype.option.cannot.be.used.with.the.cacerts.option=-keystoreまたは-storetypeオプションは、-cacertsオプションとともに使用できません
+.keystore.must.be.NONE.if.storetype.is.{0}=-storetypeが{0}の場合、-keystoreはNONEである必要があります
+Too.many.retries.program.terminated=再試行が多すぎます。プログラムが終了しました
+.storepasswd.and.keypasswd.commands.not.supported.if.storetype.is.{0}=-storetypeが{0}の場合、-storepasswdコマンドおよび-keypasswdコマンドはサポートされません
+.keypasswd.commands.not.supported.if.storetype.is.PKCS12=-storetypeがPKCS12の場合、-keypasswdコマンドはサポートされません
+.keypass.and.new.can.not.be.specified.if.storetype.is.{0}=-storetypeが{0}の場合、-keypassと-newは指定できません
+if.protected.is.specified.then.storepass.keypass.and.new.must.not.be.specified=-protectedが指定されている場合、-storepass、-keypassおよび-newは指定できません
+if.srcprotected.is.specified.then.srcstorepass.and.srckeypass.must.not.be.specified=-srcprotectedが指定されている場合、-srcstorepassおよび-srckeypassは指定できません
+if.keystore.is.not.password.protected.then.storepass.keypass.and.new.must.not.be.specified=キーストアがパスワードで保護されていない場合、-storepass、-keypassおよび-newは指定できません
+if.source.keystore.is.not.password.protected.then.srcstorepass.and.srckeypass.must.not.be.specified=ソース・キーストアがパスワードで保護されていない場合、-srcstorepassおよび-srckeypassは指定できません
+Illegal.startdate.value=startdate値が無効です
+Validity.must.be.greater.than.zero=妥当性はゼロより大きい必要があります
+provclass.not.a.provider=%sはプロバイダではありません
+provider.name.not.found=プロバイダ名"%s"が見つかりません
+provider.class.not.found=プロバイダ"%s"が見つかりません
+Usage.error.no.command.provided=使用エラー: コマンドが指定されていません
+Source.keystore.file.exists.but.is.empty.=ソース・キーストア・ファイルは、存在しますが空です:\u0020
+Please.specify.srckeystore=-srckeystoreを指定してください
+Must.not.specify.both.v.and.rfc.with.list.command='list'コマンドに-vと-rfcの両方を指定することはできません
+Key.password.must.be.at.least.6.characters=キーのパスワードは6文字以上である必要があります
+New.password.must.be.at.least.6.characters=新規パスワードは6文字以上である必要があります
+Keystore.file.exists.but.is.empty.=キーストア・ファイルは存在しますが、空です:\u0020
+Keystore.file.does.not.exist.=キーストア・ファイルは存在しません:\u0020
+Must.specify.destination.alias=出力先の別名を指定する必要があります
+Must.specify.alias=別名を指定する必要があります
+Keystore.password.must.be.at.least.6.characters=キーストアのパスワードは6文字以上である必要があります
+Enter.the.password.to.be.stored.=保存するパスワードを入力してください: \u0020
+Enter.keystore.password.=キーストアのパスワードを入力してください: \u0020
+Enter.source.keystore.password.=ソース・キーストアのパスワードを入力してください: \u0020
+Enter.destination.keystore.password.=出力先キーストアのパスワードを入力してください: \u0020
+Keystore.password.is.too.short.must.be.at.least.6.characters=キーストアのパスワードが短すぎます - 6文字以上にしてください
+Unknown.Entry.Type=不明なエントリ・タイプ
+Entry.for.alias.alias.successfully.imported.=別名{0}のエントリのインポートに成功しました。
+Entry.for.alias.alias.not.imported.=別名{0}のエントリはインポートされませんでした。
+Problem.importing.entry.for.alias.alias.exception.Entry.for.alias.alias.not.imported.=別名{0}のエントリのインポート中に問題が発生しました: {1}。\n別名{0}のエントリはインポートされませんでした。
+Import.command.completed.ok.entries.successfully.imported.fail.entries.failed.or.cancelled=インポート・コマンドが完了しました: {0}件のエントリのインポートが成功しました。{1}件のエントリのインポートが失敗したか取り消されました
+Warning.Overwriting.existing.alias.alias.in.destination.keystore=警告: 出力先キーストア内の既存の別名{0}を上書きしています
+Existing.entry.alias.alias.exists.overwrite.no.=既存のエントリの別名{0}が存在しています。上書きしますか。[いいえ]: \u0020
+Too.many.failures.try.later=障害が多すぎます - 後で実行してください
+Certification.request.stored.in.file.filename.=認証リクエストがファイル<{0}>に保存されました
+Submit.this.to.your.CA=これをCAに提出してください
+if.alias.not.specified.destalias.and.srckeypass.must.not.be.specified=別名を指定しない場合、出力先キーストアの別名およびソース・キーストアのパスワードは指定できません
+The.destination.pkcs12.keystore.has.different.storepass.and.keypass.Please.retry.with.destkeypass.specified.=出力先pkcs12キーストアに、異なるstorepassおよびkeypassがあります。-destkeypassを指定して再試行してください。
+Certificate.stored.in.file.filename.=証明書がファイル<{0}>に保存されました
+Certificate.reply.was.installed.in.keystore=証明書応答がキーストアにインストールされました
+Certificate.reply.was.not.installed.in.keystore=証明書応答がキーストアにインストールされませんでした
+Certificate.was.added.to.keystore=証明書がキーストアに追加されました
+Certificate.was.not.added.to.keystore=証明書がキーストアに追加されませんでした
+.Storing.ksfname.=[{0}を格納中]
+alias.has.no.public.key.certificate.={0}には公開キー(証明書)がありません
+Cannot.derive.signature.algorithm=署名アルゴリズムを取得できません
+Alias.alias.does.not.exist=別名<{0}>は存在しません
+Alias.alias.has.no.certificate=別名<{0}>には証明書がありません
+groupname.keysize.coexist=-groupnameと-keysizeの両方を指定できません
+deprecate.keysize.for.ec=-keysizeの指定によるECキーの生成は非推奨です。かわりに"-groupname %s"を使用してください。
+Key.pair.not.generated.alias.alias.already.exists=キー・ペアは生成されませんでした。別名<{0}>はすでに存在します
+size.bit.alg=%1$dビット%2$s
+Generating.full.keyAlgName.key.pair.and.self.signed.certificate.sigAlgName.with.a.validity.of.days.for={0}キー・ペアおよび自己署名証明書({1})を{2}日の有効性で生成しています\n\t対象: {3}
+Generating.full.keyAlgName.key.pair.and.a.certificate.sigAlgName.issued.by.signerAlias.with.a.validity.of.days.for={0}キー・ペアと<{2}>によって発行された証明書({1})を{3}日間の有効性で生成しています\n\t対象: {4}
+Enter.key.password.for.alias.=<{0}>のキー・パスワードを入力してください
+.RETURN.if.same.as.keystore.password.=\t(キーストアのパスワードと同じ場合はRETURNを押してください): \u0020
+Key.password.is.too.short.must.be.at.least.6.characters=キーのパスワードが短すぎます - 6文字以上を指定してください
+Too.many.failures.key.not.added.to.keystore=障害が多すぎます - キーはキーストアに追加されませんでした
+Destination.alias.dest.already.exists=出力先の別名<{0}>はすでに存在します
+Password.is.too.short.must.be.at.least.6.characters=パスワードが短すぎます - 6文字以上を指定してください
+Too.many.failures.Key.entry.not.cloned=障害が多すぎます。キー・エントリのクローンは作成されませんでした
+key.password.for.alias.=<{0}>のキーのパスワード
+No.entries.from.identity.database.added=アイデンティティ・データベースから追加されたエントリはありません
+Alias.name.alias=別名: {0}
+Creation.date.keyStore.getCreationDate.alias.=作成日: {0,date}
+alias.keyStore.getCreationDate.alias.={0},{1,date},\u0020
+alias.={0},\u0020
+Entry.type.type.=エントリ・タイプ: {0}
+Certificate.chain.length.=証明書チェーンの長さ:\u0020
+Certificate.i.1.=証明書[{0,number,integer}]:
+Certificate.fingerprint.SHA.256.=証明書のフィンガプリント(SHA-256):\u0020
+Keystore.type.=キーストアのタイプ:\u0020
+Keystore.provider.=キーストア・プロバイダ:\u0020
+Your.keystore.contains.keyStore.size.entry=キーストアには{0,number,integer}エントリが含まれます
+Your.keystore.contains.keyStore.size.entries=キーストアには{0,number,integer}エントリが含まれます
+Failed.to.parse.input=入力の構文解析に失敗しました
+Empty.input=入力がありません
+Not.X.509.certificate=X.509証明書ではありません
+alias.has.no.public.key={0}には公開キーがありません
+alias.has.no.X.509.certificate={0}にはX.509証明書がありません
+New.certificate.self.signed.=新しい証明書(自己署名型):
+Reply.has.no.certificates=応答には証明書がありません
+Certificate.not.imported.alias.alias.already.exists=証明書はインポートされませんでした。別名<{0}>はすでに存在します
+Input.not.an.X.509.certificate=入力はX.509証明書ではありません
+Certificate.already.exists.in.keystore.under.alias.trustalias.=証明書は、別名<{0}>のキーストアにすでに存在します
+Do.you.still.want.to.add.it.no.=追加しますか。[いいえ]: \u0020
+Certificate.already.exists.in.system.wide.CA.keystore.under.alias.trustalias.=証明書は、別名<{0}>のシステム規模のCAキーストア内にすでに存在します
+Do.you.still.want.to.add.it.to.your.own.keystore.no.=キーストアに追加しますか。 [いいえ]: \u0020
+Trust.this.certificate.no.=この証明書を信頼しますか。 [いいえ]: \u0020
+New.prompt.=新規{0}:\u0020
+Passwords.must.differ=パスワードは異なっている必要があります
+Re.enter.new.prompt.=新規{0}を再入力してください:\u0020
+Re.enter.password.=パスワードを再入力してください:\u0020
+Re.enter.new.password.=新規パスワードを再入力してください:\u0020
+They.don.t.match.Try.again=一致しません。もう一度実行してください
+Enter.prompt.alias.name.={0}の別名を入力してください: \u0020
+Enter.new.alias.name.RETURN.to.cancel.import.for.this.entry.=新しい別名を入力してください\t(このエントリのインポートを取り消す場合はRETURNを押してください): \u0020
+Enter.alias.name.=別名を入力してください: \u0020
+.RETURN.if.same.as.for.otherAlias.=\t(<{0}>と同じ場合はRETURNを押してください)
+enter.dname.components=識別名を入力します。サブコンポーネントを空のままにする場合はドット(.)を1つ入力し、中カッコ内のデフォルト値を使用する場合は[ENTER]を押します。
+What.is.your.first.and.last.name.=姓名は何ですか。
+What.is.the.name.of.your.organizational.unit.=組織単位名は何ですか。
+What.is.the.name.of.your.organization.=組織名は何ですか。
+What.is.the.name.of.your.City.or.Locality.=都市名または地域名は何ですか。
+What.is.the.name.of.your.State.or.Province.=都道府県名または州名は何ですか。
+What.is.the.two.letter.country.code.for.this.unit.=この単位に該当する2文字の国コードは何ですか。
+no.field.in.dname=少なくとも1つのフィールドを指定する必要があります。再度入力してください。
+Is.name.correct.={0}でよろしいですか。
+no=いいえ
+yes=はい
+y=y
+.defaultValue.=\u0020 [{0}]: \u0020
+Alias.alias.has.no.key=別名<{0}>にはキーがありません
+Alias.alias.references.an.entry.type.that.is.not.a.private.key.entry.The.keyclone.command.only.supports.cloning.of.private.key=別名<{0}>が参照しているエントリ・タイプは秘密キー・エントリではありません。-keycloneコマンドは秘密キー・エントリのクローン作成のみをサポートします
+
+.WARNING.WARNING.WARNING.=*****************  WARNING WARNING WARNING  *****************
+Signer.d.=署名者番号%d:
+Certificate.d.=証明書#%d:
+Timestamp.=タイムスタンプ:
+Certificate.owner.=証明書の所有者:\u0020
+Not.a.signed.jar.file=署名付きJARファイルではありません
+No.certificate.from.the.SSL.server=SSLサーバーからの証明書がありません
+
+.The.integrity.of.the.information.stored.in.your.keystore.=*キーストアに保存された情報の整合性は*\n*検証されていません。整合性を検証するには*\n*キーストアのパスワードを入力する必要があります。*
+.The.integrity.of.the.information.stored.in.the.srckeystore.=*ソース・キーストアに保存された情報の整合性は*\n*検証されていません。整合性を検証するには*\n*ソース・キーストアのパスワードを入力する必要があります。*
+
+Certificate.reply.does.not.contain.public.key.for.alias.=証明書応答には、<{0}>の公開キーは含まれません
+Incomplete.certificate.chain.in.reply=応答した証明書チェーンは不完全です
+Top.level.certificate.in.reply.=応答したトップレベルの証明書:\n
+.is.not.trusted.=... は信頼されていません。\u0020
+Install.reply.anyway.no.=応答をインストールしますか。[いいえ]: \u0020
+Public.keys.in.reply.and.keystore.don.t.match=応答した公開キーとキーストアが一致しません
+Certificate.reply.and.certificate.in.keystore.are.identical=証明書応答とキーストア内の証明書が同じです
+Failed.to.establish.chain.from.reply=応答から連鎖を確立できませんでした
+n=n
+Wrong.answer.try.again=応答が間違っています。もう一度実行してください
+Secret.key.not.generated.alias.alias.already.exists=秘密キーは生成されませんでした。別名<{0}>はすでに存在します
+Please.provide.keysize.for.secret.key.generation=秘密キーの生成時には -keysizeを指定してください
+
+warning.not.verified.make.sure.keystore.is.correct=警告: 検証されていません。-keystoreが正しいことを確認してください。
+warning.not.verified.make.sure.keystore.is.correct.or.specify.trustcacerts=警告: 検証されていません。-keystoreが正しいことを確認するか、-trustcacertsを指定してください。
+
+Extensions.=拡張:\u0020
+.Empty.value.=(空の値)
+Extension.Request.=拡張リクエスト:
+Unknown.keyUsage.type.=不明なkeyUsageタイプ:\u0020
+Unknown.extendedkeyUsage.type.=不明なextendedkeyUsageタイプ:\u0020
+Unknown.AccessDescription.type.=不明なAccessDescriptionタイプ:\u0020
+Unrecognized.GeneralName.type.=認識されないGeneralNameタイプ:\u0020
+This.extension.cannot.be.marked.as.critical.=この拡張はクリティカルとしてマーク付けできません。\u0020
+Odd.number.of.hex.digits.found.=奇数の16進数が見つかりました:\u0020
+Unknown.extension.type.=不明な拡張タイプ:\u0020
+command.{0}.is.ambiguous.=コマンド{0}はあいまいです:
+# 8171319: keytool should print out warnings when reading or
+# generating cert/cert req using weak algorithms
+the.certificate.request=証明書リクエスト
+the.issuer=発行者
+the.generated.secretkey=生成された秘密キー
+the.generated.certificate=生成された証明書
+the.generated.crl=生成されたCRL
+the.generated.certificate.request=生成された証明書リクエスト
+the.certificate=証明書
+the.crl=CRL
+the.tsa.certificate=TSA証明書
+the.input=入力
+reply=応答
+one.in.many=%1$s #%2$d / %3$d
+one.in.many1=%1$s #%2$d
+one.in.many2=署名者の%1$s #%2$d
+one.in.many3=署名者の%1$s #%2$d #%3$d
+alias.in.cacerts=cacerts内の発行者<%s>
+alias.in.keystore=発行者<%s>
+with.weak=%s (弱)
+with.disabled=%s (無効)
+key.bit=%sキー
+key.bit.weak=%sキー(弱い)
+key.bit.disabled=%sキー(無効)
+.PATTERN.printX509Cert.with.weak=所有者: {0}\n発行者: {1}\nシリアル番号: {2}\n有効期間の開始日: {3}終了日: {4}\n証明書のフィンガプリント:\n\t SHA1: {5}\n\t SHA256: {6}\n署名アルゴリズム名: {7}\nサブジェクト公開キー・アルゴリズム: {8}\nバージョン: {9}
+PKCS.10.with.weak=PKCS #10証明書リクエスト(バージョン1.0)\nサブジェクト: %1$s\nフォーマット: %2$s\n公開キー: %3$s\n署名アルゴリズム: %4$s\n
+verified.by.s.in.s.weak=%2$s内の%1$sにより%3$sで検証されました
+whose.sigalg.disabled=%1$sは%2$s署名アルゴリズムを使用しており、これはセキュリティ・リスクとみなされ、無効化されています。
+whose.sigalg.usagesignedjar=%1$sは%2$s署名アルゴリズムを使用しており、これはセキュリティ・リスクとみなされます。%3$sの後でJARに署名するために使用することはできません。
+Unable.to.parse.denyAfter.string.in.exception.message=例外メッセージのdenyAfter日付文字列を解析できません
+whose.sigalg.weak=%1$sは%2$s署名アルゴリズムを使用しており、これはセキュリティ・リスクとみなされます。
+whose.key.disabled=%1$sは%2$sを使用しており、これはセキュリティ・リスクとみなされ、無効化されています。
+whose.key.weak=%1$sは%2$sを使用しており、これはセキュリティ・リスクとみなされます。今後の更新では無効になります。
+jks.storetype.warning=%1$sキーストアは独自の形式を使用しています。"keytool -importkeystore -srckeystore %2$s -destkeystore %2$s -deststoretype pkcs12"を使用する業界標準の形式であるPKCS12に移行することをお薦めします。
+migrate.keystore.warning="%1$s"が%4$sに移行されました。%2$sキーストアは"%3$s"としてバックアップされます。
+backup.keystore.warning=元のキーストア"%1$s"は"%3$s"としてバックアップされます...
+importing.keystore.status=キーストア%1$sを%2$sにインポートしています...
+keyalg.option.missing.error=-keyalgオプションを指定する必要があります。
+showinfo.no.option=-showinfoのオプションがありません。"keytool -showinfo -tls"を試してください。
diff --git a/src/java.base/share/classes/sun/security/tools/keytool/resources/keytool_ko.properties b/src/java.base/share/classes/sun/security/tools/keytool/resources/keytool_ko.properties
new file mode 100644
index 00000000000..d589382e203
--- /dev/null
+++ b/src/java.base/share/classes/sun/security/tools/keytool/resources/keytool_ko.properties
@@ -0,0 +1,302 @@
+#
+# Copyright (c) 2000, 2025, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute 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.
+#
+
+NEWLINE=\n
+STAR=*******************************************
+STARNN=*******************************************\n\n
+# keytool: Help part
+.OPTION.=\u0020[OPTION]...
+Options.=옵션:
+option.1.set.twice=%s 옵션이 여러 번 지정되었습니다. 마지막 항목을 제외한 모든 항목이 무시됩니다.
+multiple.commands.1.2=명령은 하나만 허용됩니다. %1$s 및 %2$s이(가) 모두 지정되었습니다.
+Use.keytool.help.for.all.available.commands=사용 가능한 모든 명령에 "keytool -help" 사용
+Key.and.Certificate.Management.Tool=키 및 인증서 관리 툴
+Commands.=명령:
+Use.keytool.command.name.help.for.usage.of.command.name=command_name 사용법에 "keytool -command_name -help"를 사용합니다.\n-conf <url> 옵션을 사용하여 사전 구성된 옵션 파일을 지정합니다.
+# keytool: help: commands
+Generates.a.certificate.request=인증서 요청을 생성합니다.
+Changes.an.entry.s.alias=항목의 별칭을 변경합니다.
+Deletes.an.entry=항목을 삭제합니다.
+Exports.certificate=인증서를 익스포트합니다.
+Generates.a.key.pair=키 쌍을 생성합니다.
+Generates.a.secret.key=보안 키를 생성합니다.
+Generates.certificate.from.a.certificate.request=인증서 요청에서 인증서를 생성합니다.
+Generates.CRL=CRL을 생성합니다.
+Generated.keyAlgName.secret.key={0} 보안 키를 생성합니다.
+Generated.keysize.bit.keyAlgName.secret.key={0}비트 {1} 보안 키를 생성합니다.
+Imports.entries.from.a.JDK.1.1.x.style.identity.database=JDK 1.1.x 스타일 ID 데이터베이스에서 항목을 임포트합니다.
+Imports.a.certificate.or.a.certificate.chain=인증서 또는 인증서 체인을 임포트합니다.
+Imports.a.password=비밀번호를 임포트합니다.
+Imports.one.or.all.entries.from.another.keystore=다른 키 저장소에서 하나 또는 모든 항목을 임포트합니다.
+Clones.a.key.entry=키 항목을 복제합니다.
+Changes.the.key.password.of.an.entry=항목의 키 비밀번호를 변경합니다.
+Lists.entries.in.a.keystore=키 저장소의 항목을 나열합니다.
+Prints.the.content.of.a.certificate=인증서의 콘텐츠를 인쇄합니다.
+Prints.the.content.of.a.certificate.request=인증서 요청의 콘텐츠를 인쇄합니다.
+Prints.the.content.of.a.CRL.file=CRL 파일의 콘텐츠를 인쇄합니다.
+Generates.a.self.signed.certificate=자체 서명된 인증서를 생성합니다.
+Changes.the.store.password.of.a.keystore=키 저장소의 저장소 비밀번호를 변경합니다.
+# keytool: help: options
+alias.name.of.the.entry.to.process=처리할 항목의 별칭 이름
+destination.alias=대상 별칭
+destination.key.password=대상 키 비밀번호
+destination.keystore.name=대상 키 저장소 이름
+destination.keystore.password.protected=대상 키 저장소 비밀번호로 보호됨
+destination.keystore.provider.name=대상 키 저장소 제공자 이름
+destination.keystore.password=대상 키 저장소 비밀번호
+destination.keystore.type=대상 키 저장소 유형
+distinguished.name=식별 이름
+X.509.extension=X.509 확장
+output.file.name=출력 파일 이름
+input.file.name=입력 파일 이름
+key.algorithm.name=키 알고리즘 이름
+key.password=키 비밀번호
+key.bit.size=키 비트 크기
+keystore.name=키 저장소 이름
+access.the.cacerts.keystore=cacerts 키 저장소 액세스
+warning.cacerts.option=경고: -cacerts 옵션을 사용하여 cacerts 키 저장소에 액세스하십시오.
+new.password=새 비밀번호
+do.not.prompt=확인하지 않음
+password.through.protected.mechanism=보호되는 메커니즘을 통한 비밀번호
+# The following 2 values should span 2 lines, the first for the
+# option itself, the second for its -providerArg value.
+addprovider.option=이름별 보안 제공자 추가(예: SunPKCS11)\n-addprovider에 대한 인수 구성
+provider.class.option=전체 클래스 이름별 보안 제공자 추가\n-providerclass에 대한 인수 구성
+
+provider.name=제공자 이름
+provider.classpath=제공자 클래스 경로
+output.in.RFC.style=RFC 스타일의 출력
+signature.algorithm.name=서명 알고리즘 이름
+source.alias=소스 별칭
+source.key.password=소스 키 비밀번호
+source.keystore.name=소스 키 저장소 이름
+source.keystore.password.protected=소스 키 저장소 비밀번호로 보호됨
+source.keystore.provider.name=소스 키 저장소 제공자 이름
+source.keystore.password=소스 키 저장소 비밀번호
+source.keystore.type=소스 키 저장소 유형
+SSL.server.host.and.port=SSL 서버 호스트 및 포트
+signed.jar.file=서명된 jar 파일
+certificate.validity.start.date.time=인증서 유효 기간 시작 날짜/시간
+keystore.password=키 저장소 비밀번호
+keystore.type=키 저장소 유형
+trust.certificates.from.cacerts=cacerts의 보안 인증서
+verbose.output=상세 정보 출력
+validity.number.of.days=유효 기간 일 수
+Serial.ID.of.cert.to.revoke=철회할 인증서의 일련 ID
+# keytool: Running part
+keytool.error.=keytool 오류:\u0020
+Illegal.option.=잘못된 옵션: \u0020
+Illegal.value.=잘못된 값:\u0020
+Unknown.password.type.=알 수 없는 비밀번호 유형:\u0020
+Cannot.find.environment.variable.=환경 변수를 찾을 수 없음:\u0020
+Cannot.find.file.=파일을 찾을 수 없음:\u0020
+Command.option.flag.needs.an.argument.=명령 옵션 {0}에 인수가 필요합니다.
+Warning.Different.store.and.key.passwords.not.supported.for.PKCS12.KeyStores.Ignoring.user.specified.command.value.=경고: 다른 저장소 및 키 비밀번호는 PKCS12 KeyStores에 대해 지원되지 않습니다. 사용자가 지정한 {0} 값을 무시하는 중입니다.
+the.keystore.or.storetype.option.cannot.be.used.with.the.cacerts.option=-keystore 또는 -storetype 옵션은 -cacerts 옵션과 함께 사용할 수 없습니다.
+.keystore.must.be.NONE.if.storetype.is.{0}=-storetype이 {0}인 경우 -keystore는 NONE이어야 합니다.
+Too.many.retries.program.terminated=재시도 횟수가 너무 많아 프로그램이 종료되었습니다.
+.storepasswd.and.keypasswd.commands.not.supported.if.storetype.is.{0}=-storetype이 {0}인 경우 -storepasswd 및 -keypasswd 명령이 지원되지 않습니다.
+.keypasswd.commands.not.supported.if.storetype.is.PKCS12=-storetype이 PKCS12인 경우 -keypasswd 명령이 지원되지 않습니다.
+.keypass.and.new.can.not.be.specified.if.storetype.is.{0}=-storetype이 {0}인 경우 -keypass 및 -new를 지정할 수 없습니다.
+if.protected.is.specified.then.storepass.keypass.and.new.must.not.be.specified=-protected를 지정한 경우 -storepass, -keypass 및 -new를 지정하지 않아야 합니다.
+if.srcprotected.is.specified.then.srcstorepass.and.srckeypass.must.not.be.specified=-srcprotected를 지정한 경우 -srcstorepass 및 -srckeypass를 지정하지 않아야 합니다.
+if.keystore.is.not.password.protected.then.storepass.keypass.and.new.must.not.be.specified=키 저장소가 비밀번호로 보호되지 않는 경우 -storepass, -keypass 및 -new를 지정하지 않아야 합니다.
+if.source.keystore.is.not.password.protected.then.srcstorepass.and.srckeypass.must.not.be.specified=소스 키 저장소가 비밀번호로 보호되지 않는 경우 -srcstorepass 및 -srckeypass를 지정하지 않아야 합니다.
+Illegal.startdate.value=startdate 값이 잘못되었습니다.
+Validity.must.be.greater.than.zero=유효 기간은 0보다 커야 합니다.
+provclass.not.a.provider=%s은(는) 제공자가 아닙니다.
+provider.name.not.found="%s" 이름의 제공자를 찾을 수 없습니다.
+provider.class.not.found="%s" 제공자를 찾을 수 없습니다.
+Usage.error.no.command.provided=사용법 오류: 명령을 입력하지 않았습니다.
+Source.keystore.file.exists.but.is.empty.=소스 키 저장소 파일이 존재하지만 비어 있음:\u0020
+Please.specify.srckeystore=-srckeystore를 지정하십시오.
+Must.not.specify.both.v.and.rfc.with.list.command='list' 명령에 -v와 -rfc를 함께 지정하지 않아야 합니다.
+Key.password.must.be.at.least.6.characters=키 비밀번호는 6자 이상이어야 합니다.
+New.password.must.be.at.least.6.characters=새 비밀번호는 6자 이상이어야 합니다.
+Keystore.file.exists.but.is.empty.=키 저장소 파일이 존재하지만 비어 있음:\u0020
+Keystore.file.does.not.exist.=키 저장소 파일이 존재하지 않음:\u0020
+Must.specify.destination.alias=대상 별칭을 지정해야 합니다.
+Must.specify.alias=별칭을 지정해야 합니다.
+Keystore.password.must.be.at.least.6.characters=키 저장소 비밀번호는 6자 이상이어야 합니다.
+Enter.the.password.to.be.stored.=저장할 비밀번호 입력: \u0020
+Enter.keystore.password.=키 저장소 비밀번호 입력: \u0020
+Enter.source.keystore.password.=소스 키 저장소 비밀번호 입력: \u0020
+Enter.destination.keystore.password.=대상 키 저장소 비밀번호 입력: \u0020
+Keystore.password.is.too.short.must.be.at.least.6.characters=키 저장소 비밀번호가 너무 짧음 - 6자 이상이어야 합니다.
+Unknown.Entry.Type=알 수 없는 항목 유형
+Too.many.failures.Alias.not.changed=오류가 너무 많습니다. 별칭이 변경되지 않았습니다.
+Entry.for.alias.alias.successfully.imported.={0} 별칭에 대한 항목이 성공적으로 임포트되었습니다.
+Entry.for.alias.alias.not.imported.={0} 별칭에 대한 항목이 임포트되지 않았습니다.
+Problem.importing.entry.for.alias.alias.exception.Entry.for.alias.alias.not.imported.={0} 별칭에 대한 항목을 임포트하는 중 문제 발생: {1}.\n{0} 별칭에 대한 항목이 임포트되지 않았습니다.
+Import.command.completed.ok.entries.successfully.imported.fail.entries.failed.or.cancelled=임포트 명령 완료: 성공적으로 임포트된 항목은 {0}개, 실패하거나 취소된 항목은 {1}개입니다.
+Warning.Overwriting.existing.alias.alias.in.destination.keystore=경고: 대상 키 저장소에서 기존 별칭 {0}을(를) 겹쳐 쓰는 중
+Existing.entry.alias.alias.exists.overwrite.no.=기존 항목 별칭 {0}이(가) 존재합니다. 겹쳐 쓰겠습니까? [아니오]: \u0020
+Too.many.failures.try.later=오류가 너무 많음 - 나중에 시도하십시오.
+Certification.request.stored.in.file.filename.=인증 요청이 <{0}> 파일에 저장되었습니다.
+Submit.this.to.your.CA=CA에게 제출하십시오.
+if.alias.not.specified.destalias.and.srckeypass.must.not.be.specified=별칭을 지정하지 않은 경우 destalias 및 srckeypass를 지정하지 않아야 합니다.
+The.destination.pkcs12.keystore.has.different.storepass.and.keypass.Please.retry.with.destkeypass.specified.=대상 pkcs12 키 저장소에 다른 storepass 및 keypass가 있습니다. 지정된 -destkeypass로 재시도하십시오.
+Certificate.stored.in.file.filename.=인증서가 <{0}> 파일에 저장되었습니다.
+Certificate.reply.was.installed.in.keystore=인증서 회신이 키 저장소에 설치되었습니다.
+Certificate.reply.was.not.installed.in.keystore=인증서 회신이 키 저장소에 설치되지 않았습니다.
+Certificate.was.added.to.keystore=인증서가 키 저장소에 추가되었습니다.
+Certificate.was.not.added.to.keystore=인증서가 키 저장소에 추가되지 않았습니다.
+.Storing.ksfname.=[{0}을(를) 저장하는 중]
+alias.has.no.public.key.certificate.={0}에 공용 키(인증서)가 없습니다.
+Cannot.derive.signature.algorithm=서명 알고리즘을 파생할 수 없습니다.
+Alias.alias.does.not.exist=<{0}> 별칭이 존재하지 않습니다.
+Alias.alias.has.no.certificate=<{0}> 별칭에 인증서가 없습니다.
+Key.pair.not.generated.alias.alias.already.exists=키 쌍이 생성되지 않았으며 <{0}> 별칭이 존재합니다.
+Generating.keysize.bit.keyAlgName.key.pair.and.self.signed.certificate.sigAlgName.with.a.validity.of.validality.days.for=다음에 대해 유효 기간이 {3}일인 {0}비트 {1} 키 쌍 및 자체 서명된 인증서({2})를 생성하는 중\n\t: {4}
+Enter.key.password.for.alias.=<{0}>에 대한 키 비밀번호를 입력하십시오.
+.RETURN.if.same.as.keystore.password.=\t(키 저장소 비밀번호와 동일한 경우 Enter 키를 누름): \u0020
+Key.password.is.too.short.must.be.at.least.6.characters=키 비밀번호가 너무 짧음 - 6자 이상이어야 합니다.
+Too.many.failures.key.not.added.to.keystore=오류가 너무 많음 - 키 저장소에 키가 추가되지 않았습니다.
+Destination.alias.dest.already.exists=대상 별칭 <{0}>이(가) 존재합니다.
+Password.is.too.short.must.be.at.least.6.characters=비밀번호가 너무 짧음 - 6자 이상이어야 합니다.
+Too.many.failures.Key.entry.not.cloned=오류가 너무 많습니다. 키 항목이 복제되지 않았습니다.
+key.password.for.alias.=<{0}>에 대한 키 비밀번호
+Keystore.entry.for.id.getName.already.exists=<{0}>에 대한 키 저장소 항목이 존재합니다.
+Creating.keystore.entry.for.id.getName.=<{0}>에 대한 키 저장소 항목을 생성하는 중...
+No.entries.from.identity.database.added=ID 데이터베이스에서 추가된 항목이 없습니다.
+Alias.name.alias=별칭 이름: {0}
+Creation.date.keyStore.getCreationDate.alias.=생성 날짜: {0,date}
+alias.keyStore.getCreationDate.alias.={0}, {1,date},\u0020
+alias.={0},\u0020
+Entry.type.type.=항목 유형: {0}
+Certificate.chain.length.=인증서 체인 길이:\u0020
+Certificate.i.1.=인증서[{0,number,integer}]:
+Certificate.fingerprint.SHA.256.=인증서 지문(SHA-256):\u0020
+Keystore.type.=키 저장소 유형:\u0020
+Keystore.provider.=키 저장소 제공자:\u0020
+Your.keystore.contains.keyStore.size.entry=키 저장소에 {0,number,integer}개의 항목이 포함되어 있습니다.
+Your.keystore.contains.keyStore.size.entries=키 저장소에 {0,number,integer}개의 항목이 포함되어 있습니다.
+Failed.to.parse.input=입력값의 구문 분석을 실패했습니다.
+Empty.input=입력값이 비어 있습니다.
+Not.X.509.certificate=X.509 인증서가 아닙니다.
+alias.has.no.public.key={0}에 공용 키가 없습니다.
+alias.has.no.X.509.certificate={0}에 X.509 인증서가 없습니다.
+New.certificate.self.signed.=새 인증서(자체 서명):
+Reply.has.no.certificates=회신에 인증서가 없습니다.
+Certificate.not.imported.alias.alias.already.exists=인증서가 임포트되지 않았으며 <{0}> 별칭이 존재합니다.
+Input.not.an.X.509.certificate=입력이 X.509 인증서가 아닙니다.
+Certificate.already.exists.in.keystore.under.alias.trustalias.=인증서가 <{0}> 별칭 아래의 키 저장소에 존재합니다.
+Do.you.still.want.to.add.it.no.=추가하겠습니까? [아니오]: \u0020
+Certificate.already.exists.in.system.wide.CA.keystore.under.alias.trustalias.=인증서가 <{0}> 별칭 아래에 있는 시스템 차원의 CA 키 저장소에 존재합니다.
+Do.you.still.want.to.add.it.to.your.own.keystore.no.=고유한 키 저장소에 추가하겠습니까? [아니오]: \u0020
+Trust.this.certificate.no.=이 인증서를 신뢰합니까? [아니오]: \u0020
+YES=예
+New.prompt.=새 {0}:\u0020
+Passwords.must.differ=비밀번호는 달라야 합니다.
+Re.enter.new.prompt.=새 {0} 다시 입력:\u0020
+Re.enter.password.=비밀번호  다시 입력:\u0020
+Re.enter.new.password.=새 비밀번호 다시 입력:\u0020
+They.don.t.match.Try.again=일치하지 않습니다. 다시 시도하십시오.
+Enter.prompt.alias.name.={0} 별칭 이름 입력: \u0020
+Enter.new.alias.name.RETURN.to.cancel.import.for.this.entry.=새 별칭 이름 입력\t(이 항목에 대한 임포트를 취소하려면 Enter 키를 누름): \u0020
+Enter.alias.name.=별칭 이름 입력: \u0020
+.RETURN.if.same.as.for.otherAlias.=\t(<{0}>과(와) 동일한 경우 Enter 키를 누름)
+What.is.your.first.and.last.name.=이름과 성을 입력하십시오.
+What.is.the.name.of.your.organizational.unit.=조직 단위 이름을 입력하십시오.
+What.is.the.name.of.your.organization.=조직 이름을 입력하십시오.
+What.is.the.name.of.your.City.or.Locality.=구/군/시 이름을 입력하십시오?
+What.is.the.name.of.your.State.or.Province.=시/도 이름을 입력하십시오.
+What.is.the.two.letter.country.code.for.this.unit.=이 조직의 두 자리 국가 코드를 입력하십시오.
+Is.name.correct.={0}이(가) 맞습니까?
+no=아니오
+yes=예
+y=y
+.defaultValue.=\u0020 [{0}]: \u0020
+Alias.alias.has.no.key=<{0}> 별칭에 키가 없습니다.
+Alias.alias.references.an.entry.type.that.is.not.a.private.key.entry.The.keyclone.command.only.supports.cloning.of.private.key=<{0}> 별칭은 전용 키 항목이 아닌 항목 유형을 참조합니다. -keyclone 명령은 전용 키 항목의 복제만 지원합니다.
+
+.WARNING.WARNING.WARNING.=*****************  WARNING WARNING WARNING  *****************
+Signer.d.=서명자 #%d:
+Timestamp.=시간 기록:
+Signature.=서명:
+CRLs.=CRL:
+Certificate.owner.=인증서 소유자:\u0020
+Not.a.signed.jar.file=서명된 jar 파일이 아닙니다.
+No.certificate.from.the.SSL.server=SSL 서버에서 가져온 인증서가 없습니다.
+
+.The.integrity.of.the.information.stored.in.your.keystore.=* 키 저장소에 저장된 정보의 무결성이  *\n* 확인되지 않았습니다! 무결성을 확인하려면, *\n* 키 저장소 비밀번호를 제공해야 합니다.                  *
+.The.integrity.of.the.information.stored.in.the.srckeystore.=* srckeystore에 저장된 정보의 무결성이  *\n* 확인되지 않았습니다! 무결성을 확인하려면, *\n* srckeystore 비밀번호를 제공해야 합니다.                  *
+
+Certificate.reply.does.not.contain.public.key.for.alias.=인증서 회신에 <{0}>에 대한 공용 키가 포함되어 있지 않습니다.
+Incomplete.certificate.chain.in.reply=회신에 불완전한 인증서 체인이 있습니다.
+Certificate.chain.in.reply.does.not.verify.=회신의 인증서 체인이 확인되지 않음:\u0020
+Top.level.certificate.in.reply.=회신에 최상위 레벨 인증서가 있음:\n
+.is.not.trusted.=...을(를) 신뢰할 수 없습니다.\u0020
+Install.reply.anyway.no.=회신을 설치하겠습니까? [아니오]: \u0020
+NO=아니오
+Public.keys.in.reply.and.keystore.don.t.match=회신과 키 저장소의 공용 키가 일치하지 않습니다.
+Certificate.reply.and.certificate.in.keystore.are.identical=회신과 키 저장소의 인증서가 동일합니다.
+Failed.to.establish.chain.from.reply=회신의 체인 설정을 실패했습니다.
+n=n
+Wrong.answer.try.again=잘못된 응답입니다. 다시 시도하십시오.
+Secret.key.not.generated.alias.alias.already.exists=보안 키가 생성되지 않았으며 <{0}> 별칭이 존재합니다.
+Please.provide.keysize.for.secret.key.generation=보안 키를 생성하려면 -keysize를 제공하십시오.
+
+warning.not.verified.make.sure.keystore.is.correct=경고: 확인되지 않음. -keystore가 올바른지 확인하십시오.
+
+Extensions.=확장:\u0020
+.Empty.value.=(비어 있는 값)
+Extension.Request.=확장 요청:
+Unknown.keyUsage.type.=알 수 없는 keyUsage 유형:\u0020
+Unknown.extendedkeyUsage.type.=알 수 없는 extendedkeyUsage 유형:\u0020
+Unknown.AccessDescription.type.=알 수 없는 AccessDescription 유형:\u0020
+Unrecognized.GeneralName.type.=알 수 없는 GeneralName 유형:\u0020
+This.extension.cannot.be.marked.as.critical.=이 확장은 중요한 것으로 표시할 수 없습니다.\u0020
+Odd.number.of.hex.digits.found.=홀수 개의 16진수가 발견됨:\u0020
+Unknown.extension.type.=알 수 없는 확장 유형:\u0020
+command.{0}.is.ambiguous.={0} 명령이 모호함:
+# 8171319: keytool should print out warnings when reading or
+# generating cert/cert req using weak algorithms
+the.certificate.request=인증서 요청
+the.issuer=발행자
+the.generated.certificate=생성된 인증서
+the.generated.crl=생성된 CRL
+the.generated.certificate.request=생성된 인증서 요청
+the.certificate=인증서
+the.crl=CRL
+the.tsa.certificate=TSA 인증서
+the.input=입력
+reply=회신
+one.in.many=%1$s #%2$d/%3$d
+alias.in.cacerts=cacerts의 <%s> 발행자
+alias.in.keystore=<%s> 발행자
+with.weak=%s(약함)
+key.bit=%1$d비트 %2$s 키
+key.bit.weak=%1$d비트 %2$s 키(약함)
+unknown.size.1=알 수 없는 크기 %s 키
+.PATTERN.printX509Cert.with.weak=소유자: {0}\n발행자: {1}\n일련 번호: {2}\n적합한 시작 날짜: {3} 종료 날짜: {4}\n인증서 지문:\n\t SHA1: {5}\n\t SHA256: {6}\n서명 알고리즘 이름: {7}\n주체 공용 키 알고리즘: {8}\n버전: {9}
+PKCS.10.with.weak=PKCS #10 인증서 요청(1.0 버전)\n제목: %1$s\n형식: %2$s\n공용 키: %3$s\n서명 알고리즘: %4$s\n
+verified.by.s.in.s.weak=%3$s을(를) 포함하는 %2$s의 %1$s에 의해 확인됨
+whose.sigalg.risk=%1$s이(가) 보안 위험으로 간주되는 %2$s 서명 알고리즘을 사용합니다.
+whose.key.risk=%1$s이(가) 보안 위험으로 간주되는 %2$s을(를) 사용합니다.
+jks.storetype.warning=%1$s 키 저장소는 고유 형식을 사용합니다. "keytool -importkeystore -srckeystore %2$s -destkeystore %2$s -deststoretype pkcs12"를 사용하는 산업 표준 형식인 PKCS12로 이전하는 것이 좋습니다.
+migrate.keystore.warning="%1$s"을(를) %4$s(으)로 이전했습니다. %2$s 키 저장소가 "%3$s"(으)로 백업되었습니다.
+backup.keystore.warning=원본 키 저장소 "%1$s"이(가) "%3$s"(으)로 백업되었습니다.
+importing.keystore.status=키 저장소 %1$s을(를) %2$s(으)로 임포트하는 중...
diff --git a/src/java.base/share/classes/sun/security/tools/keytool/resources/keytool_pt_BR.properties b/src/java.base/share/classes/sun/security/tools/keytool/resources/keytool_pt_BR.properties
new file mode 100644
index 00000000000..2ae254a368f
--- /dev/null
+++ b/src/java.base/share/classes/sun/security/tools/keytool/resources/keytool_pt_BR.properties
@@ -0,0 +1,302 @@
+#
+# Copyright (c) 2000, 2025, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute 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.
+#
+
+NEWLINE=\n
+STAR=*******************************************
+STARNN=*******************************************\n\n
+# keytool: Help part
+.OPTION.=\u0020[OPTION]...
+Options.=Opções:
+option.1.set.twice=A opção %s foi especificada várias vezes. Todas, exceto a última, serão ignoradas.
+multiple.commands.1.2=Somente um comando é permitido: tanto %1$s quanto %2$s foram especificados.
+Use.keytool.help.for.all.available.commands=Use "keytool -help" para todos os comandos disponíveis
+Key.and.Certificate.Management.Tool=Ferramenta de Gerenciamento de Chave e Certificado
+Commands.=Comandos:
+Use.keytool.command.name.help.for.usage.of.command.name=Utilize "keytool -command_name -help" para uso de command_name.\nUtilize a opção -conf <url> para especificar um arquivo de opções pré-configurado.
+# keytool: help: commands
+Generates.a.certificate.request=Gera uma solicitação de certificado
+Changes.an.entry.s.alias=Altera um alias de entrada
+Deletes.an.entry=Exclui uma entrada
+Exports.certificate=Exporta o certificado
+Generates.a.key.pair=Gera um par de chaves
+Generates.a.secret.key=Gera uma chave secreta
+Generates.certificate.from.a.certificate.request=Gera um certificado de uma solicitação de certificado
+Generates.CRL=Gera CRL
+Generated.keyAlgName.secret.key=Chave secreta {0} gerada
+Generated.keysize.bit.keyAlgName.secret.key=Chave secreta {1} de {0} bits gerada
+Imports.entries.from.a.JDK.1.1.x.style.identity.database=Importa entradas de um banco de dados de identidade JDK 1.1.x-style
+Imports.a.certificate.or.a.certificate.chain=Importa um certificado ou uma cadeia de certificados
+Imports.a.password=Importa uma senha
+Imports.one.or.all.entries.from.another.keystore=Importa uma ou todas as entradas de outra área de armazenamento de chaves
+Clones.a.key.entry=Clona uma entrada de chave
+Changes.the.key.password.of.an.entry=Altera a senha da chave de uma entrada
+Lists.entries.in.a.keystore=Lista entradas em uma área de armazenamento de chaves
+Prints.the.content.of.a.certificate=Imprime o conteúdo de um certificado
+Prints.the.content.of.a.certificate.request=Imprime o conteúdo de uma solicitação de certificado
+Prints.the.content.of.a.CRL.file=Imprime o conteúdo de um arquivo CRL
+Generates.a.self.signed.certificate=Gera um certificado autoassinado
+Changes.the.store.password.of.a.keystore=Altera a senha de armazenamento de uma área de armazenamento de chaves
+# keytool: help: options
+alias.name.of.the.entry.to.process=nome do alias da entrada a ser processada
+destination.alias=alias de destino
+destination.key.password=senha da chave de destino
+destination.keystore.name=nome da área de armazenamento de chaves de destino
+destination.keystore.password.protected=senha protegida da área de armazenamento de chaves de destino
+destination.keystore.provider.name=nome do fornecedor da área de armazenamento de chaves de destino
+destination.keystore.password=senha da área de armazenamento de chaves de destino
+destination.keystore.type=tipo de área de armazenamento de chaves de destino
+distinguished.name=nome distinto
+X.509.extension=extensão X.509
+output.file.name=nome do arquivo de saída
+input.file.name=nome do arquivo de entrada
+key.algorithm.name=nome do algoritmo da chave
+key.password=senha da chave
+key.bit.size=tamanho do bit da chave
+keystore.name=nome da área de armazenamento de chaves
+access.the.cacerts.keystore=acessar a área de armazenamento de chaves cacerts
+warning.cacerts.option=Advertência: use a opção -cacerts para acessar a área de armazenamento de chaves cacerts
+new.password=nova senha
+do.not.prompt=não perguntar
+password.through.protected.mechanism=senha por meio de mecanismo protegido
+# The following 2 values should span 2 lines, the first for the
+# option itself, the second for its -providerArg value.
+addprovider.option=adicionar provedor de segurança por nome (por exemplo, SunPKCS11)\nconfigurar argumento para -addprovider
+provider.class.option=adicionar provedor de segurança por nome de classe totalmente qualificado\nconfigurar argumento para -providerclass
+
+provider.name=nome do fornecedor
+provider.classpath=classpath do fornecedor
+output.in.RFC.style=saída no estilo RFC
+signature.algorithm.name=nome do algoritmo de assinatura
+source.alias=alias de origem
+source.key.password=senha da chave de origem
+source.keystore.name=nome da área de armazenamento de chaves de origem
+source.keystore.password.protected=senha protegida da área de armazenamento de chaves de origem
+source.keystore.provider.name=nome do fornecedor da área de armazenamento de chaves de origem
+source.keystore.password=senha da área de armazenamento de chaves de origem
+source.keystore.type=tipo de área de armazenamento de chaves de origem
+SSL.server.host.and.port=porta e host do servidor SSL
+signed.jar.file=arquivo jar assinado
+certificate.validity.start.date.time=data/hora inicial de validade do certificado
+keystore.password=senha da área de armazenamento de chaves
+keystore.type=tipo de área de armazenamento de chaves
+trust.certificates.from.cacerts=certificados confiáveis do cacerts
+verbose.output=saída detalhada
+validity.number.of.days=número de dias da validade
+Serial.ID.of.cert.to.revoke=ID de série do certificado a ser revogado
+# keytool: Running part
+keytool.error.=erro de keytool:\u0020
+Illegal.option.=Opção inválida: \u0020
+Illegal.value.=Valor inválido:\u0020
+Unknown.password.type.=Tipo de senha desconhecido:\u0020
+Cannot.find.environment.variable.=Não é possível localizar a variável do ambiente:\u0020
+Cannot.find.file.=Não é possível localizar o arquivo:\u0020
+Command.option.flag.needs.an.argument.=A opção de comando {0} precisa de um argumento.
+Warning.Different.store.and.key.passwords.not.supported.for.PKCS12.KeyStores.Ignoring.user.specified.command.value.=Advertência: Senhas de chave e de armazenamento diferentes não suportadas para KeyStores PKCS12. Ignorando valor {0} especificado pelo usuário.
+the.keystore.or.storetype.option.cannot.be.used.with.the.cacerts.option=A opção -keystore ou -storetype não pode ser usada com a opção -cacerts
+.keystore.must.be.NONE.if.storetype.is.{0}=-keystore deve ser NONE se -storetype for {0}
+Too.many.retries.program.terminated=Excesso de tentativas de repetição; programa finalizado
+.storepasswd.and.keypasswd.commands.not.supported.if.storetype.is.{0}=comandos -storepasswd e -keypasswd não suportados se -storetype for {0}
+.keypasswd.commands.not.supported.if.storetype.is.PKCS12=comandos -keypasswd não suportados se -storetype for PKCS12
+.keypass.and.new.can.not.be.specified.if.storetype.is.{0}=-keypass e -new não podem ser especificados se -storetype for {0}
+if.protected.is.specified.then.storepass.keypass.and.new.must.not.be.specified=se -protected for especificado, então -storepass, -keypass e -new não deverão ser especificados
+if.srcprotected.is.specified.then.srcstorepass.and.srckeypass.must.not.be.specified=se -srcprotected for especificado, então -srcstorepass e -srckeypass não deverão ser especificados
+if.keystore.is.not.password.protected.then.storepass.keypass.and.new.must.not.be.specified=se a área de armazenamento de chaves não estiver protegida por senha, então -storepass, -keypass e -new não deverão ser especificados
+if.source.keystore.is.not.password.protected.then.srcstorepass.and.srckeypass.must.not.be.specified=se a área de armazenamento de chaves de origem não estiver protegida por senha, então -srcstorepass e -srckeypass não deverão ser especificados
+Illegal.startdate.value=valor da data inicial inválido
+Validity.must.be.greater.than.zero=A validade deve ser maior do que zero
+provclass.not.a.provider=%s não é um fornecedor
+provider.name.not.found=O fornecedor chamado "%s" não foi encontrado
+provider.class.not.found=Fornecedor "%s" não encontrado
+Usage.error.no.command.provided=Erro de uso: nenhum comando fornecido
+Source.keystore.file.exists.but.is.empty.=O arquivo da área de armazenamento de chaves de origem existe, mas está vazio:\u0020
+Please.specify.srckeystore=Especifique -srckeystore
+Must.not.specify.both.v.and.rfc.with.list.command=Não devem ser especificados -v e -rfc com o comando 'list'
+Key.password.must.be.at.least.6.characters=A senha da chave deve ter, no mínimo, 6 caracteres
+New.password.must.be.at.least.6.characters=A nova senha deve ter, no mínimo, 6 caracteres
+Keystore.file.exists.but.is.empty.=O arquivo da área de armazenamento de chaves existe, mas está vazio:\u0020
+Keystore.file.does.not.exist.=O arquivo da área de armazenamento de chaves não existe.\u0020
+Must.specify.destination.alias=Deve ser especificado um alias de destino
+Must.specify.alias=Deve ser especificado um alias
+Keystore.password.must.be.at.least.6.characters=A senha da área de armazenamento de chaves deve ter, no mínimo, 6 caracteres
+Enter.the.password.to.be.stored.=Digite a senha a ser armazenada: \u0020
+Enter.keystore.password.=Informe a senha da área de armazenamento de chaves: \u0020
+Enter.source.keystore.password.=Informe a senha da área de armazenamento de chaves de origem: \u0020
+Enter.destination.keystore.password.=Informe a senha da área de armazenamento de chaves de destino: \u0020
+Keystore.password.is.too.short.must.be.at.least.6.characters=A senha da área de armazenamento de chaves é muito curta - ela deve ter, no mínimo, 6 caracteres
+Unknown.Entry.Type=Tipo de Entrada Desconhecido
+Too.many.failures.Alias.not.changed=Excesso de falhas. Alias não alterado
+Entry.for.alias.alias.successfully.imported.=Entrada do alias {0} importada com êxito.
+Entry.for.alias.alias.not.imported.=Entrada do alias {0} não importada.
+Problem.importing.entry.for.alias.alias.exception.Entry.for.alias.alias.not.imported.=Problema ao importar a entrada do alias {0}: {1}.\nEntrada do alias {0} não importada.
+Import.command.completed.ok.entries.successfully.imported.fail.entries.failed.or.cancelled=Comando de importação concluído:  {0} entradas importadas com êxito, {1} entradas falharam ou foram canceladas
+Warning.Overwriting.existing.alias.alias.in.destination.keystore=Advertência: Substituição do alias {0} existente na área de armazenamento de chaves de destino
+Existing.entry.alias.alias.exists.overwrite.no.=Entrada já existente no alias {0}, substituir? [não]: \u0020
+Too.many.failures.try.later=Excesso de falhas - tente mais tarde
+Certification.request.stored.in.file.filename.=Solicitação de certificado armazenada no arquivo <{0}>
+Submit.this.to.your.CA=Submeter à CA
+if.alias.not.specified.destalias.and.srckeypass.must.not.be.specified=se o alias não estiver especificado, destalias e srckeypass não deverão ser especificados
+The.destination.pkcs12.keystore.has.different.storepass.and.keypass.Please.retry.with.destkeypass.specified.=O armazenamento de chaves pkcs12 de destino tem storepass e keypass diferentes. Tente novamente especificando -destkeypass.
+Certificate.stored.in.file.filename.=Certificado armazenado no arquivo <{0}>
+Certificate.reply.was.installed.in.keystore=A resposta do certificado foi instalada na área de armazenamento de chaves
+Certificate.reply.was.not.installed.in.keystore=A resposta do certificado não foi instalada na área de armazenamento de chaves
+Certificate.was.added.to.keystore=O certificado foi adicionado à área de armazenamento de chaves
+Certificate.was.not.added.to.keystore=O certificado não foi adicionado à área de armazenamento de chaves
+.Storing.ksfname.=[Armazenando {0}]
+alias.has.no.public.key.certificate.={0} não tem chave pública (certificado)
+Cannot.derive.signature.algorithm=Não é possível obter um algoritmo de assinatura
+Alias.alias.does.not.exist=O alias <{0}> não existe
+Alias.alias.has.no.certificate=O alias <{0}> não tem certificado
+Key.pair.not.generated.alias.alias.already.exists=Par de chaves não gerado; o alias <{0}> já existe
+Generating.keysize.bit.keyAlgName.key.pair.and.self.signed.certificate.sigAlgName.with.a.validity.of.validality.days.for=Gerando o par de chaves {1} de {0} bit e o certificado autoassinado ({2}) com uma validade de {3} dias\n\tpara: {4}
+Enter.key.password.for.alias.=Informar a senha da chave de <{0}>
+.RETURN.if.same.as.keystore.password.=\t(RETURN se for igual à senha da área do armazenamento de chaves): \u0020
+Key.password.is.too.short.must.be.at.least.6.characters=A senha da chave é muito curta - deve ter, no mínimo, 6 caracteres
+Too.many.failures.key.not.added.to.keystore=Excesso de falhas - chave não adicionada a área de armazenamento de chaves
+Destination.alias.dest.already.exists=O alias de destino <{0}> já existe
+Password.is.too.short.must.be.at.least.6.characters=A senha é muito curta - deve ter, no mínimo, 6 caracteres
+Too.many.failures.Key.entry.not.cloned=Excesso de falhas. Entrada da chave não clonada
+key.password.for.alias.=senha da chave de <{0}>
+Keystore.entry.for.id.getName.already.exists=A entrada da área do armazenamento de chaves de <{0}> já existe
+Creating.keystore.entry.for.id.getName.=Criando entrada da área do armazenamento de chaves para <{0}> ...
+No.entries.from.identity.database.added=Nenhuma entrada adicionada do banco de dados de identidades
+Alias.name.alias=Nome do alias: {0}
+Creation.date.keyStore.getCreationDate.alias.=Data de criação: {0,date}
+alias.keyStore.getCreationDate.alias.={0}, {1,date},\u0020
+alias.={0},\u0020
+Entry.type.type.=Tipo de entrada: {0}
+Certificate.chain.length.=Comprimento da cadeia de certificados:\u0020
+Certificate.i.1.=Certificado[{0,number,integer}]:
+Certificate.fingerprint.SHA.256.=Fingerprint (SHA-256) do certificado:\u0020
+Keystore.type.=Tipo de área de armazenamento de chaves:\u0020
+Keystore.provider.=Fornecedor da área de armazenamento de chaves:\u0020
+Your.keystore.contains.keyStore.size.entry=Sua área de armazenamento de chaves contém {0,number,integer} entrada
+Your.keystore.contains.keyStore.size.entries=Sua área de armazenamento de chaves contém {0,number,integer} entradas
+Failed.to.parse.input=Falha durante o parsing da entrada
+Empty.input=Entrada vazia
+Not.X.509.certificate=Não é um certificado X.509
+alias.has.no.public.key={0} não tem chave pública
+alias.has.no.X.509.certificate={0} não tem certificado X.509
+New.certificate.self.signed.=Novo certificado (autoassinado):
+Reply.has.no.certificates=A resposta não tem certificado
+Certificate.not.imported.alias.alias.already.exists=Certificado não importado, o alias <{0}> já existe
+Input.not.an.X.509.certificate=A entrada não é um certificado X.509
+Certificate.already.exists.in.keystore.under.alias.trustalias.=O certificado já existe no armazenamento de chaves no alias <{0}>
+Do.you.still.want.to.add.it.no.=Ainda deseja adicioná-lo? [não]: \u0020
+Certificate.already.exists.in.system.wide.CA.keystore.under.alias.trustalias.=O certificado já existe na área de armazenamento de chaves da CA em todo o sistema no alias <{0}>
+Do.you.still.want.to.add.it.to.your.own.keystore.no.=Ainda deseja adicioná-lo à sua área de armazenamento de chaves? [não]: \u0020
+Trust.this.certificate.no.=Confiar neste certificado? [não]: \u0020
+YES=SIM
+New.prompt.=Nova {0}:\u0020
+Passwords.must.differ=As senhas devem ser diferentes
+Re.enter.new.prompt.=Informe novamente a nova {0}:\u0020
+Re.enter.password.=Redigite a senha:\u0020
+Re.enter.new.password.=Informe novamente a nova senha:\u0020
+They.don.t.match.Try.again=Elas não correspondem. Tente novamente
+Enter.prompt.alias.name.=Informe o nome do alias {0}: \u0020
+Enter.new.alias.name.RETURN.to.cancel.import.for.this.entry.=Informe o novo nome do alias\t(RETURN para cancelar a importação desta entrada): \u0020
+Enter.alias.name.=Informe o nome do alias: \u0020
+.RETURN.if.same.as.for.otherAlias.=\t(RETURN se for igual ao de <{0}>)
+What.is.your.first.and.last.name.=Qual é o seu nome e o seu sobrenome?
+What.is.the.name.of.your.organizational.unit.=Qual é o nome da sua unidade organizacional?
+What.is.the.name.of.your.organization.=Qual é o nome da sua empresa?
+What.is.the.name.of.your.City.or.Locality.=Qual é o nome da sua Cidade ou Localidade?
+What.is.the.name.of.your.State.or.Province.=Qual é o nome do seu Estado ou Município?
+What.is.the.two.letter.country.code.for.this.unit.=Quais são as duas letras do código do país desta unidade?
+Is.name.correct.={0} Está correto?
+no=não
+yes=sim
+y=s
+.defaultValue.=\u0020 [{0}]: \u0020
+Alias.alias.has.no.key=O alias <{0}> não tem chave
+Alias.alias.references.an.entry.type.that.is.not.a.private.key.entry.The.keyclone.command.only.supports.cloning.of.private.key=O alias <{0}> faz referência a um tipo de entrada que não é uma entrada de chave privada. O comando -keyclone oferece suporte somente à clonagem de entradas de chave privada
+
+.WARNING.WARNING.WARNING.=*****************  WARNING WARNING WARNING  *****************
+Signer.d.=Signatário #%d:
+Timestamp.=Timestamp:
+Signature.=Assinatura:
+CRLs.=CRLs:
+Certificate.owner.=Proprietário do certificado:\u0020
+Not.a.signed.jar.file=Não é um arquivo jar assinado
+No.certificate.from.the.SSL.server=Não é um certificado do servidor SSL
+
+.The.integrity.of.the.information.stored.in.your.keystore.=* A integridade das informações armazenadas na sua área de armazenamento de chaves  *\n* NÃO foi verificada!  Para que seja possível verificar sua integridade, *\n* você deve fornecer a senha da área de armazenamento de chaves.                  *
+.The.integrity.of.the.information.stored.in.the.srckeystore.=* A integridade das informações armazenadas no srckeystore  *\n* NÃO foi verificada!  Para que seja possível verificar sua integridade, *\n* você deve fornecer a senha do srckeystore.                  *
+
+Certificate.reply.does.not.contain.public.key.for.alias.=A resposta do certificado não contém a chave pública de <{0}>
+Incomplete.certificate.chain.in.reply=Cadeia de certificados incompleta na resposta
+Certificate.chain.in.reply.does.not.verify.=A cadeia de certificados da resposta não verifica:\u0020
+Top.level.certificate.in.reply.=Certificado de nível superior na resposta:\n
+.is.not.trusted.=... não é confiável.\u0020
+Install.reply.anyway.no.=Instalar resposta assim mesmo? [não]: \u0020
+NO=NÃO
+Public.keys.in.reply.and.keystore.don.t.match=As chaves públicas da resposta e da área de armazenamento de chaves não correspondem
+Certificate.reply.and.certificate.in.keystore.are.identical=O certificado da resposta e o certificado da área de armazenamento de chaves são idênticos
+Failed.to.establish.chain.from.reply=Falha ao estabelecer a cadeia a partir da resposta
+n=n
+Wrong.answer.try.again=Resposta errada; tente novamente
+Secret.key.not.generated.alias.alias.already.exists=Chave secreta não gerada; o alias <{0}> já existe
+Please.provide.keysize.for.secret.key.generation=Forneça o -keysize para a geração da chave secreta
+
+warning.not.verified.make.sure.keystore.is.correct=ADVERTÊNCIA: não verificado. Certifique-se que -keystore esteja correto.
+
+Extensions.=Extensões:\u0020
+.Empty.value.=(Valor vazio)
+Extension.Request.=Solicitação de Extensão:
+Unknown.keyUsage.type.=Tipo de keyUsage desconhecido:\u0020
+Unknown.extendedkeyUsage.type.=Tipo de extendedkeyUsage desconhecido:\u0020
+Unknown.AccessDescription.type.=Tipo de AccessDescription desconhecido:\u0020
+Unrecognized.GeneralName.type.=Tipo de GeneralName não reconhecido:\u0020
+This.extension.cannot.be.marked.as.critical.=Esta extensão não pode ser marcada como crítica.\u0020
+Odd.number.of.hex.digits.found.=Encontrado número ímpar de seis dígitos:\u0020
+Unknown.extension.type.=Tipo de extensão desconhecido:\u0020
+command.{0}.is.ambiguous.=o comando {0} é ambíguo:
+# 8171319: keytool should print out warnings when reading or
+# generating cert/cert req using weak algorithms
+the.certificate.request=A solicitação do certificado
+the.issuer=O emissor
+the.generated.certificate=O certificado gerado
+the.generated.crl=A CRL gerada
+the.generated.certificate.request=A solicitação do certificado gerada
+the.certificate=O certificado
+the.crl=A CRL
+the.tsa.certificate=O certificado TSA
+the.input=A entrada
+reply=Resposta
+one.in.many=%1$s #%2$d de %3$d
+alias.in.cacerts=Emissor <%s> no cacerts
+alias.in.keystore=Emissor <%s>
+with.weak=%s (fraca)
+key.bit=Chave %2$s de %1$d bits
+key.bit.weak=Chave %2$s de %1$d bits (fraca)
+unknown.size.1=chave de tamanho desconhecido  %s
+.PATTERN.printX509Cert.with.weak=Proprietário: {0}\nEmissor: {1}\nNúmero de série: {2}\nVálido de: {3} até: {4}\nFingerprints do certificado:\n\t SHA1: {5}\n\t SHA256: {6}\nNome do algoritmo de assinatura: {7}\nAlgoritmo de Chave Pública do Assunto: {8}\nVersão: {9}
+PKCS.10.with.weak=Solicitação do Certificado PKCS #10 (Versão 1.0)\nAssunto: %1$s\nFormato: %2$s\nChave Pública: %3$s\nAlgoritmo de assinatura: %4$s\n
+verified.by.s.in.s.weak=Verificado por %1$s em %2$s com um %3$s
+whose.sigalg.risk=%1$s usa o algoritmo de assinatura %2$s que é considerado um risco à segurança.
+whose.key.risk=%1$s usa um %2$s que é considerado um risco à segurança.
+jks.storetype.warning=O armazenamento de chaves %1$s usa um formato proprietário. É recomendada a migração para PKCS12, que é um formato de padrão industrial que usa "keytool -importkeystore -srckeystore %2$s -destkeystore %2$s -deststoretype pkcs12".
+migrate.keystore.warning="%1$s" foi migrado para %4$s. O backup do armazenamento de chaves %2$s é feito como "%3$s".
+backup.keystore.warning=O backup do armazenamento de chaves original "%1$s" é feito como "%3$s"...
+importing.keystore.status=Importando armazenamento de chaves %1$s to %2$s...
diff --git a/src/java.base/share/classes/sun/security/tools/keytool/resources/keytool_sv.properties b/src/java.base/share/classes/sun/security/tools/keytool/resources/keytool_sv.properties
new file mode 100644
index 00000000000..151a5ca427e
--- /dev/null
+++ b/src/java.base/share/classes/sun/security/tools/keytool/resources/keytool_sv.properties
@@ -0,0 +1,302 @@
+#
+# Copyright (c) 2000, 2025, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute 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.
+#
+
+NEWLINE=\n
+STAR=*******************************************
+STARNN=*******************************************\n\n
+# keytool: Help part
+.OPTION.=\u0020[OPTION]...
+Options.=Alternativ:
+option.1.set.twice=Du har angett alternativet %s flera gånger. Alla förutom det sista ignoreras.
+multiple.commands.1.2=Endast ett kommando är tillåtet: du har angett både %1$s och %2$s.
+Use.keytool.help.for.all.available.commands=Läs "Hjälp - Nyckelverktyg" för alla tillgängliga kommandon
+Key.and.Certificate.Management.Tool=Hanteringsverktyg för nycklar och certifikat
+Commands.=Kommandon:
+Use.keytool.command.name.help.for.usage.of.command.name=Använd "keytool -command_name -help" för syntax för command_name.\nAnvänd alternativet -conf <url> för att ange en förkonfigurerad alternativfil.
+# keytool: help: commands
+Generates.a.certificate.request=Genererar certifikatbegäran
+Changes.an.entry.s.alias=Ändrar postalias
+Deletes.an.entry=Tar bort en post
+Exports.certificate=Exporterar certifikat
+Generates.a.key.pair=Genererar nyckelpar
+Generates.a.secret.key=Genererar hemlig nyckel
+Generates.certificate.from.a.certificate.request=Genererar certifikat från certifikatbegäran
+Generates.CRL=Genererar CRL
+Generated.keyAlgName.secret.key=Genererade {0} hemlig nyckel
+Generated.keysize.bit.keyAlgName.secret.key=Genererade {0}-bitars {1} hemlig nyckel
+Imports.entries.from.a.JDK.1.1.x.style.identity.database=Importerar poster från identitetsdatabas i JDK 1.1.x-format
+Imports.a.certificate.or.a.certificate.chain=Importerar ett certifikat eller en certifikatkedja
+Imports.a.password=Importerar ett lösenord
+Imports.one.or.all.entries.from.another.keystore=Importerar en eller alla poster från annat nyckellager
+Clones.a.key.entry=Klonar en nyckelpost
+Changes.the.key.password.of.an.entry=Ändrar nyckellösenordet för en post
+Lists.entries.in.a.keystore=Visar lista över poster i nyckellager
+Prints.the.content.of.a.certificate=Skriver ut innehållet i ett certifikat
+Prints.the.content.of.a.certificate.request=Skriver ut innehållet i en certifikatbegäran
+Prints.the.content.of.a.CRL.file=Skriver ut innehållet i en CRL-fil
+Generates.a.self.signed.certificate=Genererar ett självsignerat certifikat
+Changes.the.store.password.of.a.keystore=Ändrar lagerlösenordet för ett nyckellager
+# keytool: help: options
+alias.name.of.the.entry.to.process=aliasnamn för post som ska bearbetas
+destination.alias=destinationsalias
+destination.key.password=lösenord för destinationsnyckel
+destination.keystore.name=namn på destinationsnyckellager
+destination.keystore.password.protected=skyddat lösenord för destinationsnyckellager
+destination.keystore.provider.name=leverantörsnamn för destinationsnyckellager
+destination.keystore.password=lösenord för destinationsnyckellager
+destination.keystore.type=typ av destinationsnyckellager
+distinguished.name=unikt namn
+X.509.extension=X.509-tillägg
+output.file.name=namn på utdatafil
+input.file.name=namn på indatafil
+key.algorithm.name=namn på nyckelalgoritm
+key.password=nyckellösenord
+key.bit.size=nyckelbitstorlek
+keystore.name=namn på nyckellager
+access.the.cacerts.keystore=åtkomst till nyckellagret cacerts
+warning.cacerts.option=Varning: använd alternativet -cacerts för att få åtkomst till nyckellagret cacerts
+new.password=nytt lösenord
+do.not.prompt=fråga inte
+password.through.protected.mechanism=lösenord med skyddad mekanism
+# The following 2 values should span 2 lines, the first for the
+# option itself, the second for its -providerArg value.
+addprovider.option=lägg till säkerhetsleverantör per namn (t.ex. SunPKCS11)\nkonfigurera argument för -addprovider
+provider.class.option=lägg till säkerhetsleverantör per fullt kvalificerat klassnamn\nkonfigurera argument för -providerclass
+
+provider.name=leverantörsnamn
+provider.classpath=leverantörsklassökväg
+output.in.RFC.style=utdata i RFC-format
+signature.algorithm.name=namn på signaturalgoritm
+source.alias=källalias
+source.key.password=lösenord för källnyckel
+source.keystore.name=namn på källnyckellager
+source.keystore.password.protected=skyddat lösenord för källnyckellager
+source.keystore.provider.name=leverantörsnamn för källnyckellager
+source.keystore.password=lösenord för källnyckellager
+source.keystore.type=typ av källnyckellager
+SSL.server.host.and.port=SSL-servervärd och -port
+signed.jar.file=signerad jar-fil
+certificate.validity.start.date.time=startdatum/-tid för certifikatets giltighet
+keystore.password=lösenord för nyckellager
+keystore.type=nyckellagertyp
+trust.certificates.from.cacerts=tillförlitliga certifikat från cacerts
+verbose.output=utförliga utdata
+validity.number.of.days=antal dagar för giltighet
+Serial.ID.of.cert.to.revoke=Serienummer på certifikat som ska återkallas
+# keytool: Running part
+keytool.error.=nyckelverktygsfel:\u0020
+Illegal.option.=Otillåtet alternativ: \u0020
+Illegal.value.=Otillåtet värde:\u0020
+Unknown.password.type.=Okänd lösenordstyp:\u0020
+Cannot.find.environment.variable.=Hittar inte miljövariabel:\u0020
+Cannot.find.file.=Hittar inte fil:\u0020
+Command.option.flag.needs.an.argument.=Kommandoalternativet {0} behöver ett argument.
+Warning.Different.store.and.key.passwords.not.supported.for.PKCS12.KeyStores.Ignoring.user.specified.command.value.=Varning!  PKCS12-nyckellager har inte stöd för olika lösenord för lagret och nyckeln. Det användarspecificerade {0}-värdet ignoreras.
+the.keystore.or.storetype.option.cannot.be.used.with.the.cacerts.option=Alternativen -keystore och -storetype kan inte användas med alternativet -cacerts
+.keystore.must.be.NONE.if.storetype.is.{0}=-keystore måste vara NONE om -storetype är {0}
+Too.many.retries.program.terminated=För många försök. Programmet avslutas
+.storepasswd.and.keypasswd.commands.not.supported.if.storetype.is.{0}=-storepasswd- och -keypasswd-kommandon stöds inte om -storetype är {0}
+.keypasswd.commands.not.supported.if.storetype.is.PKCS12=-keypasswd-kommandon stöds inte om -storetype är PKCS12
+.keypass.and.new.can.not.be.specified.if.storetype.is.{0}=-keypass och -new kan inte anges om -storetype är {0}
+if.protected.is.specified.then.storepass.keypass.and.new.must.not.be.specified=om -protected har angetts får inte -storepass, -keypass och -new anges
+if.srcprotected.is.specified.then.srcstorepass.and.srckeypass.must.not.be.specified=om -srcprotected anges får -srcstorepass och -srckeypass inte anges
+if.keystore.is.not.password.protected.then.storepass.keypass.and.new.must.not.be.specified=om nyckellagret inte är lösenordsskyddat får -storepass, -keypass och -new inte anges
+if.source.keystore.is.not.password.protected.then.srcstorepass.and.srckeypass.must.not.be.specified=om källnyckellagret inte är lösenordsskyddat får -srcstorepass och -srckeypass inte anges
+Illegal.startdate.value=Otillåtet värde för startdatum
+Validity.must.be.greater.than.zero=Giltigheten måste vara större än noll
+provclass.not.a.provider=%s är inte en leverantör
+provider.name.not.found=Leverantören med namnet "%s" hittades inte
+provider.class.not.found=Leverantören "%s" hittades inte
+Usage.error.no.command.provided=Syntaxfel: inget kommando angivet
+Source.keystore.file.exists.but.is.empty.=Nyckellagrets källfil finns, men är tom:\u0020
+Please.specify.srckeystore=Ange -srckeystore
+Must.not.specify.both.v.and.rfc.with.list.command=Kan inte specificera både -v och -rfc med 'list'-kommandot
+Key.password.must.be.at.least.6.characters=Nyckellösenordet måste innehålla minst 6 tecken
+New.password.must.be.at.least.6.characters=Det nya lösenordet måste innehålla minst 6 tecken
+Keystore.file.exists.but.is.empty.=Nyckellagerfilen finns, men är tom:\u0020
+Keystore.file.does.not.exist.=Nyckellagerfilen finns inte:\u0020
+Must.specify.destination.alias=Du måste ange destinationsalias
+Must.specify.alias=Du måste ange alias
+Keystore.password.must.be.at.least.6.characters=Nyckellagerlösenordet måste innehålla minst 6 tecken
+Enter.the.password.to.be.stored.=Ange det lösenord som ska lagras: \u0020
+Enter.keystore.password.=Ange nyckellagerlösenord: \u0020
+Enter.source.keystore.password.=Ange lösenord för källnyckellagret: \u0020
+Enter.destination.keystore.password.=Ange nyckellagerlösenord för destination: \u0020
+Keystore.password.is.too.short.must.be.at.least.6.characters=Nyckellagerlösenordet är för kort - det måste innehålla minst 6 tecken
+Unknown.Entry.Type=Okänd posttyp
+Too.many.failures.Alias.not.changed=För många fel. Alias har inte ändrats
+Entry.for.alias.alias.successfully.imported.=Posten för alias {0} har importerats.
+Entry.for.alias.alias.not.imported.=Posten för alias {0} har inte importerats.
+Problem.importing.entry.for.alias.alias.exception.Entry.for.alias.alias.not.imported.=Ett problem uppstod vid importen av posten för alias {0}: {1}.\nPosten {0} har inte importerats.
+Import.command.completed.ok.entries.successfully.imported.fail.entries.failed.or.cancelled=Kommandoimporten slutförd: {0} poster har importerats, {1} poster var felaktiga eller annullerades
+Warning.Overwriting.existing.alias.alias.in.destination.keystore=Varning! Det befintliga aliaset {0} i destinationsnyckellagret skrivs över
+Existing.entry.alias.alias.exists.overwrite.no.=Aliaset {0} finns redan. Vill du skriva över det? [nej]: \u0020
+Too.many.failures.try.later=För många fel - försök igen senare
+Certification.request.stored.in.file.filename.=Certifikatbegäran har lagrats i filen <{0}>
+Submit.this.to.your.CA=Skicka detta till certifikatutfärdaren
+if.alias.not.specified.destalias.and.srckeypass.must.not.be.specified=om alias inte angivits ska inte heller destalias och srckeypass anges
+The.destination.pkcs12.keystore.has.different.storepass.and.keypass.Please.retry.with.destkeypass.specified.=Destinationsnyckellagret pkcs12 har olika storepass och keypass. Försök igen med -destkeypass angivet.
+Certificate.stored.in.file.filename.=Certifikatet har lagrats i filen <{0}>
+Certificate.reply.was.installed.in.keystore=Certifikatsvaret har installerats i nyckellagret
+Certificate.reply.was.not.installed.in.keystore=Certifikatsvaret har inte installerats i nyckellagret
+Certificate.was.added.to.keystore=Certifikatet har lagts till i nyckellagret
+Certificate.was.not.added.to.keystore=Certifikatet har inte lagts till i nyckellagret
+.Storing.ksfname.=[Lagrar {0}]
+alias.has.no.public.key.certificate.={0} saknar öppen nyckel (certifikat)
+Cannot.derive.signature.algorithm=Kan inte härleda signaturalgoritm
+Alias.alias.does.not.exist=Aliaset <{0}> finns inte
+Alias.alias.has.no.certificate=Aliaset <{0}> saknar certifikat
+Key.pair.not.generated.alias.alias.already.exists=Nyckelparet genererades inte. Aliaset <{0}> finns redan
+Generating.keysize.bit.keyAlgName.key.pair.and.self.signed.certificate.sigAlgName.with.a.validity.of.validality.days.for=Genererar {0} bitars {1}-nyckelpar och självsignerat certifikat ({2}) med en giltighet på {3} dagar\n\tför: {4}
+Enter.key.password.for.alias.=Ange nyckellösenord för <{0}>
+.RETURN.if.same.as.keystore.password.=\t(RETURN om det är identiskt med nyckellagerlösenordet): \u0020
+Key.password.is.too.short.must.be.at.least.6.characters=Nyckellösenordet är för kort - det måste innehålla minst 6 tecken
+Too.many.failures.key.not.added.to.keystore=För många fel - nyckeln lades inte till i nyckellagret
+Destination.alias.dest.already.exists=Destinationsaliaset <{0}> finns redan
+Password.is.too.short.must.be.at.least.6.characters=Lösenordet är för kort - det måste innehålla minst 6 tecken
+Too.many.failures.Key.entry.not.cloned=För många fel. Nyckelposten har inte klonats
+key.password.for.alias.=nyckellösenord för <{0}>
+Keystore.entry.for.id.getName.already.exists=Nyckellagerpost för <{0}> finns redan
+Creating.keystore.entry.for.id.getName.=Skapar nyckellagerpost för <{0}> ...
+No.entries.from.identity.database.added=Inga poster från identitetsdatabasen har lagts till
+Alias.name.alias=Aliasnamn: {0}
+Creation.date.keyStore.getCreationDate.alias.=Skapat den: {0,date}
+alias.keyStore.getCreationDate.alias.={0}, {1,date},\u0020
+alias.={0},\u0020
+Entry.type.type.=Posttyp: {0}
+Certificate.chain.length.=Längd på certifikatskedja:\u0020
+Certificate.i.1.=Certifikat[{0,number,integer}]:
+Certificate.fingerprint.SHA.256.=Certifikatfingeravtryck (SHA-256):\u0020
+Keystore.type.=Nyckellagertyp:\u0020
+Keystore.provider.=Nyckellagerleverantör:\u0020
+Your.keystore.contains.keyStore.size.entry=Nyckellagret innehåller {0,number,integer} post
+Your.keystore.contains.keyStore.size.entries=Nyckellagret innehåller {0,number,integer} poster
+Failed.to.parse.input=Kunde inte tolka indata
+Empty.input=Inga indata
+Not.X.509.certificate=Inte ett X.509-certifikat
+alias.has.no.public.key={0} saknar öppen nyckel
+alias.has.no.X.509.certificate={0} saknar X.509-certifikat
+New.certificate.self.signed.=Nytt certifikat (självsignerat):
+Reply.has.no.certificates=Svaret saknar certifikat
+Certificate.not.imported.alias.alias.already.exists=Certifikatet importerades inte. Aliaset <{0}> finns redan
+Input.not.an.X.509.certificate=Indata är inte ett X.509-certifikat
+Certificate.already.exists.in.keystore.under.alias.trustalias.=Certifikatet finns redan i nyckellagerfilen under aliaset <{0}>
+Do.you.still.want.to.add.it.no.=Vill du fortfarande lägga till det? [nej]: \u0020
+Certificate.already.exists.in.system.wide.CA.keystore.under.alias.trustalias.=Certifikatet finns redan i den systemomspännande CA-nyckellagerfilen under aliaset <{0}>
+Do.you.still.want.to.add.it.to.your.own.keystore.no.=Vill du fortfarande lägga till det i ditt eget nyckellagret? [nej]: \u0020
+Trust.this.certificate.no.=Litar du på det här certifikatet? [nej]: \u0020
+YES=JA
+New.prompt.=Nytt {0}:\u0020
+Passwords.must.differ=Lösenorden måste vara olika
+Re.enter.new.prompt.=Ange nytt {0} igen:\u0020
+Re.enter.password.=Ange lösenord igen:\u0020
+Re.enter.new.password.=Ange det nya lösenordet igen:\u0020
+They.don.t.match.Try.again=De matchar inte. Försök igen
+Enter.prompt.alias.name.=Ange aliasnamn för {0}: \u0020
+Enter.new.alias.name.RETURN.to.cancel.import.for.this.entry.=Ange ett nytt aliasnamn\t(skriv RETURN för att avbryta importen av denna post): \u0020
+Enter.alias.name.=Ange aliasnamn: \u0020
+.RETURN.if.same.as.for.otherAlias.=\t(RETURN om det är det samma som för <{0}>)
+What.is.your.first.and.last.name.=Vad heter du i för- och efternamn?
+What.is.the.name.of.your.organizational.unit.=Vad heter din avdelning inom organisationen?
+What.is.the.name.of.your.organization.=Vad heter din organisation?
+What.is.the.name.of.your.City.or.Locality.=Vad heter din ort eller plats?
+What.is.the.name.of.your.State.or.Province.=Vad heter ditt land eller din provins?
+What.is.the.two.letter.country.code.for.this.unit.=Vilken är den tvåställiga landskoden?
+Is.name.correct.=Är {0} korrekt?
+no=nej
+yes=ja
+y=j
+.defaultValue.=\u0020 [{0}]: \u0020
+Alias.alias.has.no.key=Aliaset <{0}> saknar nyckel
+Alias.alias.references.an.entry.type.that.is.not.a.private.key.entry.The.keyclone.command.only.supports.cloning.of.private.key=Aliaset <{0}> refererar till en posttyp som inte är någon privat nyckelpost. Kommandot -keyclone har endast stöd för kloning av privata nyckelposter
+
+.WARNING.WARNING.WARNING.=*****************  WARNING WARNING WARNING  *****************
+Signer.d.=Undertecknare %d:
+Timestamp.=Tidsstämpel:
+Signature.=Signatur:
+CRLs.=CRL:er:
+Certificate.owner.=Certifikatägare:\u0020
+Not.a.signed.jar.file=Ingen signerad jar-fil
+No.certificate.from.the.SSL.server=Inget certifikat från SSL-servern
+
+.The.integrity.of.the.information.stored.in.your.keystore.=* Integriteten för den information som lagras i nyckellagerfilen  *\n* har INTE verifierats!  Om du vill verifiera dess integritet *\n* måste du ange lösenordet för nyckellagret.                  *
+.The.integrity.of.the.information.stored.in.the.srckeystore.=* Integriteten för den information som lagras i srckeystore*\n* har INTE verifierats!  Om du vill verifiera dess integritet *\n* måste du ange lösenordet för srckeystore.                *
+
+Certificate.reply.does.not.contain.public.key.for.alias.=Certifikatsvaret innehåller inte någon öppen nyckel för <{0}>
+Incomplete.certificate.chain.in.reply=Ofullständig certifikatskedja i svaret
+Certificate.chain.in.reply.does.not.verify.=Certifikatskedjan i svaret går inte att verifiera:\u0020
+Top.level.certificate.in.reply.=Toppnivåcertifikatet i svaret:\n
+.is.not.trusted.=... är inte betrott.\u0020
+Install.reply.anyway.no.=Vill du installera svaret ändå? [nej]: \u0020
+NO=NEJ
+Public.keys.in.reply.and.keystore.don.t.match=De offentliga nycklarna i svaret och nyckellagret matchar inte varandra
+Certificate.reply.and.certificate.in.keystore.are.identical=Certifikatsvaret och certifikatet i nyckellagret är identiska
+Failed.to.establish.chain.from.reply=Kunde inte upprätta kedja från svaret
+n=n
+Wrong.answer.try.again=Fel svar. Försök på nytt.
+Secret.key.not.generated.alias.alias.already.exists=Den hemliga nyckeln har inte genererats eftersom aliaset <{0}> redan finns
+Please.provide.keysize.for.secret.key.generation=Ange -keysize för att skapa hemlig nyckel
+
+warning.not.verified.make.sure.keystore.is.correct=VARNING: ej verifierad. Se till att -nyckellager är korrekt.
+
+Extensions.=Tillägg:\u0020
+.Empty.value.=(Tomt värde)
+Extension.Request.=Tilläggsbegäran:
+Unknown.keyUsage.type.=Okänd keyUsage-typ:\u0020
+Unknown.extendedkeyUsage.type.=Okänd extendedkeyUsage-typ:\u0020
+Unknown.AccessDescription.type.=Okänd AccessDescription-typ:\u0020
+Unrecognized.GeneralName.type.=Okänd GeneralName-typ:\u0020
+This.extension.cannot.be.marked.as.critical.=Detta tillägg kan inte markeras som kritiskt.\u0020
+Odd.number.of.hex.digits.found.=Udda antal hex-siffror påträffades:\u0020
+Unknown.extension.type.=Okänd tilläggstyp:\u0020
+command.{0}.is.ambiguous.=kommandot {0} är tvetydigt:
+# 8171319: keytool should print out warnings when reading or
+# generating cert/cert req using weak algorithms
+the.certificate.request=Certifikatbegäran
+the.issuer=Utfärdaren
+the.generated.certificate=Det genererade certifikatet
+the.generated.crl=Den genererade listan över återkallade certifikat
+the.generated.certificate.request=Den genererade certifikatbegäran
+the.certificate=Certifikatet
+the.crl=Listan över återkallade certifikat
+the.tsa.certificate=TSA-certifikatet
+the.input=Indata
+reply=Svar
+one.in.many=%1$s #%2$d av %3$d
+alias.in.cacerts=Utfärdaren <%s> i cacerts
+alias.in.keystore=Utfärdaren <%s>
+with.weak=%s (svag)
+key.bit=%1$d-bitars %2$s-nyckel
+key.bit.weak=%1$d-bitars %2$s-nyckel (svag)
+unknown.size.1=okänd storlek på nyckeln %s
+.PATTERN.printX509Cert.with.weak=Ägare: {0}\nUtfärdare: {1}\nSerienummer: {2}\nGiltigt från: {3}, till: {4}\nCertifikatfingeravtryck:\n\t SHA1: {5}\n\t SHA256: {6}\nSignaturalgoritmnamn: {7}\nAlgoritm för öppen nyckel för ämne: {8}\nVersion: {9}
+PKCS.10.with.weak=PKCS #10-certifikatbegäran (version 1.0)\nÄmne: %1$s\nFormat: %2$s\nÖppen nyckel: %3$s\nSignaturalgoritm: %4$s\n
+verified.by.s.in.s.weak=Verifierades av %1$s i %2$s med en %3$s
+whose.sigalg.risk=%1$s använder signaturalgoritmen %2$s, vilket anses utgöra en säkerhetsrisk.
+whose.key.risk=%1$s använder en %2$s, vilket anses utgöra en säkerhetsrisk.
+jks.storetype.warning=Nyckellagret %1$s använder ett proprietärt format. Du bör migrera till PKCS12, som är ett branschstandardformat, med "keytool -importkeystore -srckeystore %2$s -destkeystore %2$s -deststoretype pkcs12".
+migrate.keystore.warning=Migrerade "%1$s" till %4$s. Nyckellagret %2$s säkerhetskopierades som "%3$s".
+backup.keystore.warning=Det ursprungliga nyckellagret, \"%1$s\", säkerhetskopieras som \"%3$s\"...
+importing.keystore.status=Importerar nyckellagret %1$s till %2$s...
diff --git a/src/java.base/share/classes/sun/security/tools/keytool/resources/keytool_zh_CN.properties b/src/java.base/share/classes/sun/security/tools/keytool/resources/keytool_zh_CN.properties
new file mode 100644
index 00000000000..5aa27eb2ed4
--- /dev/null
+++ b/src/java.base/share/classes/sun/security/tools/keytool/resources/keytool_zh_CN.properties
@@ -0,0 +1,321 @@
+#
+# Copyright (c) 2000, 2025, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute 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.
+#
+
+NEWLINE=\n
+STAR=*******************************************
+STARNN=*******************************************\n\n
+# keytool: Help part
+.OPTION.=\u0020[OPTION]...
+Options.=选项:
+option.1.set.twice=多次指定了 %s 选项。除最后一个之外, 其余的将全部忽略。
+multiple.commands.1.2=只允许一个命令: 同时指定了 %1$s 和 %2$s。
+Use.keytool.help.for.all.available.commands=使用 "keytool -?, -h, or --help" 可输出此帮助消息
+Key.and.Certificate.Management.Tool=密钥和证书管理工具
+Commands.=命令:
+Use.keytool.command.name.help.for.usage.of.command.name=使用 "keytool -command_name --help" 可获取 command_name 的用法。\n使用 -conf <url> 选项可指定预配置的选项文件。
+# keytool: help: commands
+Generates.a.certificate.request=生成证书请求
+Changes.an.entry.s.alias=更改条目的别名
+Deletes.an.entry=删除条目
+Exports.certificate=导出证书
+Generates.a.key.pair=生成密钥对
+Generates.a.secret.key=生成密钥
+Generates.certificate.from.a.certificate.request=根据证书请求生成证书
+Generates.CRL=生成 CRL
+Generated.keyAlgName.secret.key=已生成{0}密钥
+Generated.keysize.bit.keyAlgName.secret.key=已生成 {0} 位{1}密钥
+key.algorithm.weak=%1$s 使用的 %2$s 算法被视为存在安全风险。
+key.size.weak=%1$s 使用的 %2$s 存在安全风险。
+Imports.entries.from.a.JDK.1.1.x.style.identity.database=从 JDK 1.1.x 样式的身份数据库导入条目
+Imports.a.certificate.or.a.certificate.chain=导入证书或证书链
+Imports.a.password=导入口令
+Imports.one.or.all.entries.from.another.keystore=从其他密钥库导入一个或所有条目
+Clones.a.key.entry=克隆密钥条目
+Changes.the.key.password.of.an.entry=更改条目的密钥口令
+Lists.entries.in.a.keystore=列出密钥库中的条目
+Prints.the.content.of.a.certificate=打印证书内容
+Prints.the.content.of.a.certificate.request=打印证书请求的内容
+Prints.the.content.of.a.CRL.file=打印 CRL 文件的内容
+Generates.a.self.signed.certificate=生成自签名证书
+Changes.the.store.password.of.a.keystore=更改密钥库的存储口令
+showinfo.command.help=显示安全相关信息
+Prints.the.program.version=输出程序版本
+# keytool: help: options
+alias.name.of.the.entry.to.process=要处理的条目的别名
+groupname.option.help=组名。例如，椭圆曲线名称。
+destination.alias=目标别名
+destination.key.password=目标密钥口令
+destination.keystore.name=目标密钥库名称
+destination.keystore.password.protected=受保护的目标密钥库口令
+destination.keystore.provider.name=目标密钥库提供方名称
+destination.keystore.password=目标密钥库口令
+destination.keystore.type=目标密钥库类型
+distinguished.name=唯一判别名
+X.509.extension=X.509 扩展
+output.file.name=输出文件名
+input.file.name=输入文件名
+key.algorithm.name=密钥算法名称
+key.password=密钥口令
+key.bit.size=密钥位大小
+keystore.name=密钥库名称
+access.the.cacerts.keystore=访问 cacerts 密钥库
+warning.cacerts.option=警告: 使用 -cacerts 选项访问 cacerts 密钥库
+new.password=新口令
+do.not.prompt=不提示
+password.through.protected.mechanism=通过受保护的机制的口令
+tls.option.help=显示 TLS 配置信息
+# The following 2 values should span 2 lines, the first for the
+# option itself, the second for its -providerArg value.
+addprovider.option=按名称 (例如 SunPKCS11) 添加安全提供方\n配置 -addprovider 的参数
+provider.class.option=按全限定类名添加安全提供方\n配置 -providerclass 的参数
+
+provider.name=提供方名称
+provider.classpath=提供方类路径
+output.in.RFC.style=以 RFC 样式输出
+signature.algorithm.name=签名算法名称
+signer.alias=签名者别名
+signer.key.password=签名者密钥密码
+source.alias=源别名
+source.key.password=源密钥口令
+source.keystore.name=源密钥库名称
+source.keystore.password.protected=受保护的源密钥库口令
+source.keystore.provider.name=源密钥库提供方名称
+source.keystore.password=源密钥库口令
+source.keystore.type=源密钥库类型
+SSL.server.host.and.port=SSL 服务器主机和端口
+signed.jar.file=已签名的 jar 文件
+certificate.validity.start.date.time=证书有效期开始日期/时间
+keystore.password=密钥库口令
+keystore.type=密钥库类型
+trust.certificates.from.cacerts=信任来自 cacerts 的证书
+verbose.output=详细输出
+validity.number.of.days=有效天数
+Serial.ID.of.cert.to.revoke=要撤销的证书的序列 ID
+# keytool: Running part
+keytool.error.=keytool 错误:\u0020
+Illegal.option.=非法选项: \u0020
+Illegal.value.=非法值:\u0020
+Unknown.password.type.=未知口令类型:\u0020
+Cannot.find.environment.variable.=找不到环境变量:\u0020
+Cannot.find.file.=找不到文件:\u0020
+Command.option.flag.needs.an.argument.=命令选项{0}需要一个参数。
+Warning.Different.store.and.key.passwords.not.supported.for.PKCS12.KeyStores.Ignoring.user.specified.command.value.=警告: PKCS12 密钥库不支持其他存储和密钥口令。正在忽略用户指定的{0}值。
+the.keystore.or.storetype.option.cannot.be.used.with.the.cacerts.option=-keystore 或 -storetype 选项不能与 -cacerts 选项一起使用
+.keystore.must.be.NONE.if.storetype.is.{0}=如果 -storetype 为 {0}, 则 -keystore 必须为 NONE
+Too.many.retries.program.terminated=重试次数过多, 程序已终止
+.storepasswd.and.keypasswd.commands.not.supported.if.storetype.is.{0}=如果 -storetype 为 {0}, 则不支持 -storepasswd 和 -keypasswd 命令
+.keypasswd.commands.not.supported.if.storetype.is.PKCS12=如果 -storetype 为 PKCS12, 则不支持 -keypasswd 命令
+.keypass.and.new.can.not.be.specified.if.storetype.is.{0}=如果 -storetype 为 {0}, 则不能指定 -keypass 和 -new
+if.protected.is.specified.then.storepass.keypass.and.new.must.not.be.specified=如果指定了 -protected, 则不能指定 -storepass, -keypass 和 -new
+if.srcprotected.is.specified.then.srcstorepass.and.srckeypass.must.not.be.specified=如果指定了 -srcprotected, 则不能指定 -srcstorepass 和 -srckeypass
+if.keystore.is.not.password.protected.then.storepass.keypass.and.new.must.not.be.specified=如果密钥库未受口令保护, 则不能指定 -storepass, -keypass 和 -new
+if.source.keystore.is.not.password.protected.then.srcstorepass.and.srckeypass.must.not.be.specified=如果源密钥库未受口令保护, 则不能指定 -srcstorepass 和 -srckeypass
+Illegal.startdate.value=非法开始日期值
+Validity.must.be.greater.than.zero=有效性必须大于零
+provclass.not.a.provider=%s不是提供方
+provider.name.not.found=未找到名为 "%s" 的提供方
+provider.class.not.found=未找到提供方 "%s"
+Usage.error.no.command.provided=用法错误: 没有提供命令
+Source.keystore.file.exists.but.is.empty.=源密钥库文件存在, 但为空:\u0020
+Please.specify.srckeystore=请指定 -srckeystore
+Must.not.specify.both.v.and.rfc.with.list.command=不能使用 'list' 命令来指定 -v 及 -rfc
+Key.password.must.be.at.least.6.characters=密钥口令至少必须为 6 个字符
+New.password.must.be.at.least.6.characters=新口令至少必须为 6 个字符
+Keystore.file.exists.but.is.empty.=密钥库文件存在, 但为空:\u0020
+Keystore.file.does.not.exist.=密钥库文件不存在:\u0020
+Must.specify.destination.alias=必须指定目标别名
+Must.specify.alias=必须指定别名
+Keystore.password.must.be.at.least.6.characters=密钥库口令至少必须为 6 个字符
+Enter.the.password.to.be.stored.=输入要存储的口令: \u0020
+Enter.keystore.password.=输入密钥库口令: \u0020
+Enter.source.keystore.password.=输入源密钥库口令: \u0020
+Enter.destination.keystore.password.=输入目标密钥库口令: \u0020
+Keystore.password.is.too.short.must.be.at.least.6.characters=密钥库口令太短 - 至少必须为 6 个字符
+Unknown.Entry.Type=未知条目类型
+Entry.for.alias.alias.successfully.imported.=已成功导入别名 {0} 的条目。
+Entry.for.alias.alias.not.imported.=未导入别名 {0} 的条目。
+Problem.importing.entry.for.alias.alias.exception.Entry.for.alias.alias.not.imported.=导入别名 {0} 的条目时出现问题: {1}。\n未导入别名 {0} 的条目。
+Import.command.completed.ok.entries.successfully.imported.fail.entries.failed.or.cancelled=已完成导入命令: {0} 个条目成功导入, {1} 个条目失败或取消
+Warning.Overwriting.existing.alias.alias.in.destination.keystore=警告: 正在覆盖目标密钥库中的现有别名 {0}
+Existing.entry.alias.alias.exists.overwrite.no.=存在现有条目别名 {0}, 是否覆盖? [否]: \u0020
+Too.many.failures.try.later=故障太多 - 请稍后再试
+Certification.request.stored.in.file.filename.=存储在文件 <{0}> 中的认证请求
+Submit.this.to.your.CA=将此提交给您的 CA
+if.alias.not.specified.destalias.and.srckeypass.must.not.be.specified=如果没有指定别名, 则不能指定目标别名和源密钥库口令
+The.destination.pkcs12.keystore.has.different.storepass.and.keypass.Please.retry.with.destkeypass.specified.=目标 pkcs12 密钥库具有不同的 storepass 和 keypass。请在指定了 -destkeypass 时重试。
+Certificate.stored.in.file.filename.=存储在文件 <{0}> 中的证书
+Certificate.reply.was.installed.in.keystore=证书回复已安装在密钥库中
+Certificate.reply.was.not.installed.in.keystore=证书回复未安装在密钥库中
+Certificate.was.added.to.keystore=证书已添加到密钥库中
+Certificate.was.not.added.to.keystore=证书未添加到密钥库中
+.Storing.ksfname.=[正在存储{0}]
+alias.has.no.public.key.certificate.={0}没有公共密钥 (证书)
+Cannot.derive.signature.algorithm=无法派生签名算法
+Alias.alias.does.not.exist=别名 <{0}> 不存在
+Alias.alias.has.no.certificate=别名 <{0}> 没有证书
+groupname.keysize.coexist=无法同时指定 -groupname 和 -keysize
+deprecate.keysize.for.ec=为生成 EC 密钥指定 -keysize 已过时，请改为使用 "-groupname %s"。
+Key.pair.not.generated.alias.alias.already.exists=未生成密钥对, 别名 <{0}> 已经存在
+size.bit.alg=%1$d 位 %2$s
+Generating.full.keyAlgName.key.pair.and.self.signed.certificate.sigAlgName.with.a.validity.of.days.for=正在为 {3} 生成有效期为 {2} 天的 {0} 密钥对和自签名证书 ({1})\n
+Generating.full.keyAlgName.key.pair.and.a.certificate.sigAlgName.issued.by.signerAlias.with.a.validity.of.days.for=生成 {0} 密钥对和 <{2}> 颁发的证书 ({1})，有效期为 {3} 天 \n\t 对于：{4}
+Enter.key.password.for.alias.=输入 <{0}> 的密钥口令
+.RETURN.if.same.as.keystore.password.=\t(如果和密钥库口令相同, 按回车): \u0020
+Key.password.is.too.short.must.be.at.least.6.characters=密钥口令太短 - 至少必须为 6 个字符
+Too.many.failures.key.not.added.to.keystore=故障太多 - 密钥未添加到密钥库中
+Destination.alias.dest.already.exists=目标别名 <{0}> 已经存在
+Password.is.too.short.must.be.at.least.6.characters=口令太短 - 至少必须为 6 个字符
+Too.many.failures.Key.entry.not.cloned=故障太多。未克隆密钥条目
+key.password.for.alias.=<{0}> 的密钥口令
+No.entries.from.identity.database.added=未从身份数据库中添加任何条目
+Alias.name.alias=别名: {0}
+Creation.date.keyStore.getCreationDate.alias.=创建日期: {0,date}
+alias.keyStore.getCreationDate.alias.={0}, {1,date},\u0020
+alias.={0},\u0020
+Entry.type.type.=条目类型: {0}
+Certificate.chain.length.=证书链长度:\u0020
+Certificate.i.1.=证书[{0,number,integer}]:
+Certificate.fingerprint.SHA.256.=证书指纹 (SHA-256):\u0020
+Keystore.type.=密钥库类型:\u0020
+Keystore.provider.=密钥库提供方:\u0020
+Your.keystore.contains.keyStore.size.entry=您的密钥库包含 {0,number,integer} 个条目
+Your.keystore.contains.keyStore.size.entries=您的密钥库包含 {0,number,integer} 个条目
+Failed.to.parse.input=无法解析输入
+Empty.input=空输入
+Not.X.509.certificate=非 X.509 证书
+alias.has.no.public.key={0}没有公共密钥
+alias.has.no.X.509.certificate={0}没有 X.509 证书
+New.certificate.self.signed.=新证书 (自签名):
+Reply.has.no.certificates=回复中没有证书
+Certificate.not.imported.alias.alias.already.exists=证书未导入, 别名 <{0}> 已经存在
+Input.not.an.X.509.certificate=所输入的不是 X.509 证书
+Certificate.already.exists.in.keystore.under.alias.trustalias.=在别名 <{0}> 之下, 证书已经存在于密钥库中
+Do.you.still.want.to.add.it.no.=是否仍要添加? [否]: \u0020
+Certificate.already.exists.in.system.wide.CA.keystore.under.alias.trustalias.=在别名 <{0}> 之下, 证书已经存在于系统范围的 CA 密钥库中
+Do.you.still.want.to.add.it.to.your.own.keystore.no.=是否仍要将它添加到自己的密钥库? [否]: \u0020
+Trust.this.certificate.no.=是否信任此证书? [否]: \u0020
+New.prompt.=新{0}:\u0020
+Passwords.must.differ=口令不能相同
+Re.enter.new.prompt.=重新输入新{0}:\u0020
+Re.enter.password.=再次输入口令:\u0020
+Re.enter.new.password.=再次输入新口令:\u0020
+They.don.t.match.Try.again=它们不匹配。请重试
+Enter.prompt.alias.name.=输入{0}别名: \u0020
+Enter.new.alias.name.RETURN.to.cancel.import.for.this.entry.=导入新的别名\t(按回车以取消对此条目的导入): \u0020
+Enter.alias.name.=输入别名: \u0020
+.RETURN.if.same.as.for.otherAlias.=\t(如果和 <{0}> 相同, 则按回车)
+enter.dname.components=输入唯一判别名。提供单个点 (.) 以将子组件留空，或按 ENTER 以使用大括号中的默认值。
+What.is.your.first.and.last.name.=您的名字与姓氏是什么?
+What.is.the.name.of.your.organizational.unit.=您的组织单位名称是什么?
+What.is.the.name.of.your.organization.=您的组织名称是什么?
+What.is.the.name.of.your.City.or.Locality.=您所在的城市或区域名称是什么?
+What.is.the.name.of.your.State.or.Province.=您所在的省/市/自治区名称是什么?
+What.is.the.two.letter.country.code.for.this.unit.=该单位的双字母国家/地区代码是什么?
+no.field.in.dname=必须至少提供一个字段。请再次输入。
+Is.name.correct.={0}是否正确?
+no=否
+yes=是
+y=y
+.defaultValue.=\u0020 [{0}]: \u0020
+Alias.alias.has.no.key=别名 <{0}> 没有密钥
+Alias.alias.references.an.entry.type.that.is.not.a.private.key.entry.The.keyclone.command.only.supports.cloning.of.private.key=别名 <{0}> 引用了不属于私有密钥条目的条目类型。-keyclone 命令仅支持对私有密钥条目的克隆
+
+.WARNING.WARNING.WARNING.=*****************  WARNING WARNING WARNING  *****************
+Signer.d.=签名者 #%d:
+Certificate.d.=证书 #%d：
+Timestamp.=时间戳:
+Certificate.owner.=证书所有者:\u0020
+Not.a.signed.jar.file=不是已签名的 jar 文件
+No.certificate.from.the.SSL.server=没有来自 SSL 服务器的证书
+
+.The.integrity.of.the.information.stored.in.your.keystore.=* 存储在您的密钥库中的信息的完整性  *\n* 尚未经过验证!  为了验证其完整性, *\n* 必须提供密钥库口令。                  *
+.The.integrity.of.the.information.stored.in.the.srckeystore.=* 存储在 srckeystore 中的信息的完整性*\n* 尚未经过验证!  为了验证其完整性, *\n* 必须提供源密钥库口令。                  *
+
+Certificate.reply.does.not.contain.public.key.for.alias.=证书回复中不包含 <{0}> 的公共密钥
+Incomplete.certificate.chain.in.reply=回复中的证书链不完整
+Top.level.certificate.in.reply.=回复中的顶级证书:\n
+.is.not.trusted.=... 是不可信的。
+Install.reply.anyway.no.=是否仍要安装回复? [否]: \u0020
+Public.keys.in.reply.and.keystore.don.t.match=回复中的公共密钥与密钥库不匹配
+Certificate.reply.and.certificate.in.keystore.are.identical=证书回复与密钥库中的证书是相同的
+Failed.to.establish.chain.from.reply=无法从回复中建立链
+n=n
+Wrong.answer.try.again=错误的答案, 请再试一次
+Secret.key.not.generated.alias.alias.already.exists=没有生成密钥, 别名 <{0}> 已经存在
+Please.provide.keysize.for.secret.key.generation=请提供 -keysize 以生成密钥
+
+warning.not.verified.make.sure.keystore.is.correct=警告: 未验证。请确保密钥库是正确的。
+warning.not.verified.make.sure.keystore.is.correct.or.specify.trustcacerts=警告：未验证。请确保密钥库是正确的，或者指定 -trustcacerts。
+
+Extensions.=扩展:\u0020
+.Empty.value.=(空值)
+Extension.Request.=扩展请求:
+Unknown.keyUsage.type.=未知 keyUsage 类型:\u0020
+Unknown.extendedkeyUsage.type.=未知 extendedkeyUsage 类型:\u0020
+Unknown.AccessDescription.type.=未知 AccessDescription 类型:\u0020
+Unrecognized.GeneralName.type.=无法识别的 GeneralName 类型:\u0020
+This.extension.cannot.be.marked.as.critical.=无法将此扩展标记为“严重”。
+Odd.number.of.hex.digits.found.=找到奇数个十六进制数字:\u0020
+Unknown.extension.type.=未知扩展类型:\u0020
+command.{0}.is.ambiguous.=命令{0}不明确:
+# 8171319: keytool should print out warnings when reading or
+# generating cert/cert req using weak algorithms
+the.certificate.request=证书请求
+the.issuer=发布者
+the.generated.secretkey=生成的密钥
+the.generated.certificate=生成的证书
+the.generated.crl=生成的 CRL
+the.generated.certificate.request=生成的证书请求
+the.certificate=证书
+the.crl=CRL
+the.tsa.certificate=TSA 证书
+the.input=输入
+reply=回复
+one.in.many=%1$s #%2$d/%3$d
+one.in.many1=%1$s #%2$d
+one.in.many2=签名者 #%2$d 的 %1$s
+one.in.many3=签名者 #%3$d 的 %1$s #%2$d
+alias.in.cacerts=cacerts 中的发布者 <%s>
+alias.in.keystore=发布者 <%s>
+with.weak=%s (弱)
+with.disabled=%s（禁用）
+key.bit=%s 密钥
+key.bit.weak=%s 密钥（弱）
+key.bit.disabled=%s 密钥（已禁用）
+.PATTERN.printX509Cert.with.weak=所有者: {0}\n发布者: {1}\n序列号: {2}\n生效时间: {3}, 失效时间: {4}\n证书指纹:\n\t SHA1: {5}\n\t SHA256: {6}\n签名算法名称: {7}\n主体公共密钥算法: {8}\n版本: {9}
+PKCS.10.with.weak=PKCS #10 证书请求 (版本 1.0)\n主体: %1$s\n格式: %2$s\n公共密钥: %3$s\n签名算法: %4$s\n
+verified.by.s.in.s.weak=由 %2$s 中的 %1$s 以 %3$s 验证
+whose.sigalg.disabled=%1$s 使用的 %2$s 签名算法被视为存在安全风险而且被禁用。
+whose.sigalg.usagesignedjar=%1$s 使用的 %2$s 签名算法被视为存在安全风险，无法用于在 %3$s 后对 JAR 进行签名。
+Unable.to.parse.denyAfter.string.in.exception.message=无法解析异常错误消息中的 denyAfter 日期字符串
+whose.sigalg.weak=%1$s 使用的 %2$s 签名算法存在安全风险。
+whose.key.disabled=%1$s 使用的 %2$s 被视为存在安全风险而且被禁用。
+whose.key.weak=%1$s 使用的 %2$s 被视为存在安全风险。在将来的更新中将禁用它。
+jks.storetype.warning=%1$s 密钥库使用专用格式。建议使用 "keytool -importkeystore -srckeystore %2$s -destkeystore %2$s -deststoretype pkcs12" 迁移到行业标准格式 PKCS12。
+migrate.keystore.warning=已将 "%1$s" 迁移到 %4$s。将 %2$s 密钥库作为 "%3$s" 进行了备份。
+backup.keystore.warning=已将原始密钥库 "%1$s" 备份为 "%3$s"...
+importing.keystore.status=正在将密钥库 %1$s 导入到 %2$s...
+keyalg.option.missing.error=必须指定 -keyalg 选项。
+showinfo.no.option=-showinfo 缺少选项。请尝试使用 "keytool -showinfo -tls"。
diff --git a/src/java.base/share/classes/sun/security/tools/keytool/resources/keytool_zh_TW.properties b/src/java.base/share/classes/sun/security/tools/keytool/resources/keytool_zh_TW.properties
new file mode 100644
index 00000000000..6e2c64e900f
--- /dev/null
+++ b/src/java.base/share/classes/sun/security/tools/keytool/resources/keytool_zh_TW.properties
@@ -0,0 +1,302 @@
+#
+# Copyright (c) 2000, 2025, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute 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.
+#
+
+NEWLINE=\n
+STAR=*******************************************
+STARNN=*******************************************\n\n
+# keytool: Help part
+.OPTION.=\u0020[OPTION]...
+Options.=選項:
+option.1.set.twice=%s 選項已指定多次。將忽略最後一個選項以外的其他所有選項。
+multiple.commands.1.2=只允許一個命令: 指定了 %1$s 和 %2$s 兩者。
+Use.keytool.help.for.all.available.commands=使用 "keytool -help" 取得所有可用的命令
+Key.and.Certificate.Management.Tool=金鑰與憑證管理工具
+Commands.=命令:
+Use.keytool.command.name.help.for.usage.of.command.name=使用 "keytool -command_name -help" 取得 command_name 的用法。\n使用 -conf <url> 選項指定預先設定的選項檔案。
+# keytool: help: commands
+Generates.a.certificate.request=產生憑證要求
+Changes.an.entry.s.alias=變更項目的別名
+Deletes.an.entry=刪除項目
+Exports.certificate=匯出憑證
+Generates.a.key.pair=產生金鑰組
+Generates.a.secret.key=產生秘密金鑰
+Generates.certificate.from.a.certificate.request=從憑證要求產生憑證
+Generates.CRL=產生 CRL
+Generated.keyAlgName.secret.key=已產生 {0} 秘密金鑰
+Generated.keysize.bit.keyAlgName.secret.key=已產生 {0} 位元 {1} 秘密金鑰
+Imports.entries.from.a.JDK.1.1.x.style.identity.database=從 JDK 1.1.x-style 識別資料庫匯入項目
+Imports.a.certificate.or.a.certificate.chain=匯入憑證或憑證鏈
+Imports.a.password=匯入密碼
+Imports.one.or.all.entries.from.another.keystore=從其他金鑰儲存庫匯入一個或全部項目
+Clones.a.key.entry=複製金鑰項目
+Changes.the.key.password.of.an.entry=變更項目的金鑰密碼
+Lists.entries.in.a.keystore=列示金鑰儲存庫中的項目
+Prints.the.content.of.a.certificate=列印憑證的內容
+Prints.the.content.of.a.certificate.request=列印憑證要求的內容
+Prints.the.content.of.a.CRL.file=列印 CRL 檔案的內容
+Generates.a.self.signed.certificate=產生自行簽署的憑證
+Changes.the.store.password.of.a.keystore=變更金鑰儲存庫的儲存密碼
+# keytool: help: options
+alias.name.of.the.entry.to.process=要處理項目的別名名稱
+destination.alias=目的地別名
+destination.key.password=目的地金鑰密碼
+destination.keystore.name=目的地金鑰儲存庫名稱
+destination.keystore.password.protected=目的地金鑰儲存庫密碼保護
+destination.keystore.provider.name=目的地金鑰儲存庫提供者名稱
+destination.keystore.password=目的地金鑰儲存庫密碼
+destination.keystore.type=目的地金鑰儲存庫類型
+distinguished.name=辨別名稱
+X.509.extension=X.509 擴充套件
+output.file.name=輸出檔案名稱
+input.file.name=輸入檔案名稱
+key.algorithm.name=金鑰演算法名稱
+key.password=金鑰密碼
+key.bit.size=金鑰位元大小
+keystore.name=金鑰儲存庫名稱
+access.the.cacerts.keystore=存取 cacerts 金鑰儲存庫
+warning.cacerts.option=警告: 使用 -cacerts 選項存取 cacerts 金鑰儲存庫
+new.password=新密碼
+do.not.prompt=不要提示
+password.through.protected.mechanism=經由保護機制的密碼
+# The following 2 values should span 2 lines, the first for the
+# option itself, the second for its -providerArg value.
+addprovider.option=使用名稱新增安全提供者 (例如 SunPKCS11)\n設定 -addprovider 引數
+provider.class.option=使用完整類別名稱新增安全提供者\n設定 -providerclass 引數
+
+provider.name=提供者名稱
+provider.classpath=提供者類別路徑
+output.in.RFC.style=以 RFC 樣式輸出
+signature.algorithm.name=簽章演算法名稱
+source.alias=來源別名
+source.key.password=來源金鑰密碼
+source.keystore.name=來源金鑰儲存庫名稱
+source.keystore.password.protected=來源金鑰儲存庫密碼保護
+source.keystore.provider.name=來源金鑰儲存庫提供者名稱
+source.keystore.password=來源金鑰儲存庫密碼
+source.keystore.type=來源金鑰儲存庫類型
+SSL.server.host.and.port=SSL 伺服器主機與連接埠
+signed.jar.file=簽署的 jar 檔案
+certificate.validity.start.date.time=憑證有效性開始日期/時間
+keystore.password=金鑰儲存庫密碼
+keystore.type=金鑰儲存庫類型
+trust.certificates.from.cacerts=來自 cacerts 的信任憑證
+verbose.output=詳細資訊輸出
+validity.number.of.days=有效性日數
+Serial.ID.of.cert.to.revoke=要撤銷憑證的序列 ID
+# keytool: Running part
+keytool.error.=金鑰工具錯誤:\u0020
+Illegal.option.=無效的選項:
+Illegal.value.=無效值:\u0020
+Unknown.password.type.=不明的密碼類型:\u0020
+Cannot.find.environment.variable.=找不到環境變數:\u0020
+Cannot.find.file.=找不到檔案:\u0020
+Command.option.flag.needs.an.argument.=命令選項 {0} 需要引數。
+Warning.Different.store.and.key.passwords.not.supported.for.PKCS12.KeyStores.Ignoring.user.specified.command.value.=警告: PKCS12 金鑰儲存庫不支援不同的儲存庫和金鑰密碼。忽略使用者指定的 {0} 值。
+the.keystore.or.storetype.option.cannot.be.used.with.the.cacerts.option=-keystore 或 -storetype 選項不能與 -cacerts 選項一起使用
+.keystore.must.be.NONE.if.storetype.is.{0}=如果 -storetype 為 {0}，則 -keystore 必須為 NONE
+Too.many.retries.program.terminated=重試次數太多，程式已終止
+.storepasswd.and.keypasswd.commands.not.supported.if.storetype.is.{0}=如果 -storetype 為 {0}，則不支援 -storepasswd 和 -keypasswd 命令
+.keypasswd.commands.not.supported.if.storetype.is.PKCS12=如果 -storetype 為 PKCS12，則不支援 -keypasswd 命令
+.keypass.and.new.can.not.be.specified.if.storetype.is.{0}=如果 -storetype 為 {0}，則不能指定 -keypass 和 -new
+if.protected.is.specified.then.storepass.keypass.and.new.must.not.be.specified=如果指定 -protected，則不能指定 -storepass、-keypass 和 -new
+if.srcprotected.is.specified.then.srcstorepass.and.srckeypass.must.not.be.specified=如果指定 -srcprotected，則不能指定 -srcstorepass 和 -srckeypass
+if.keystore.is.not.password.protected.then.storepass.keypass.and.new.must.not.be.specified=如果金鑰儲存庫不受密碼保護，則不能指定 -storepass、-keypass 和 -new
+if.source.keystore.is.not.password.protected.then.srcstorepass.and.srckeypass.must.not.be.specified=如果來源金鑰儲存庫不受密碼保護，則不能指定 -srcstorepass 和 -srckeypass
+Illegal.startdate.value=無效的 startdate 值
+Validity.must.be.greater.than.zero=有效性必須大於零
+provclass.not.a.provider=%s 不是一個提供者
+provider.name.not.found=找不到名稱為 "%s" 的提供者
+provider.class.not.found=找不到提供者 "%s"
+Usage.error.no.command.provided=用法錯誤: 未提供命令
+Source.keystore.file.exists.but.is.empty.=來源金鑰儲存庫檔案存在，但為空:\u0020
+Please.specify.srckeystore=請指定 -srckeystore
+Must.not.specify.both.v.and.rfc.with.list.command=\u0020'list' 命令不能同時指定 -v 及 -rfc
+Key.password.must.be.at.least.6.characters=金鑰密碼必須至少為 6 個字元
+New.password.must.be.at.least.6.characters=新的密碼必須至少為 6 個字元
+Keystore.file.exists.but.is.empty.=金鑰儲存庫檔案存在，但為空白:\u0020
+Keystore.file.does.not.exist.=金鑰儲存庫檔案不存在:\u0020
+Must.specify.destination.alias=必須指定目的地別名
+Must.specify.alias=必須指定別名
+Keystore.password.must.be.at.least.6.characters=金鑰儲存庫密碼必須至少為 6 個字元
+Enter.the.password.to.be.stored.=輸入要儲存的密碼: \u0020
+Enter.keystore.password.=輸入金鑰儲存庫密碼: \u0020
+Enter.source.keystore.password.=請輸入來源金鑰儲存庫密碼:\u0020
+Enter.destination.keystore.password.=請輸入目的地金鑰儲存庫密碼:\u0020
+Keystore.password.is.too.short.must.be.at.least.6.characters=金鑰儲存庫密碼太短 - 必須至少為 6 個字元
+Unknown.Entry.Type=不明的項目類型
+Too.many.failures.Alias.not.changed=太多錯誤。未變更別名
+Entry.for.alias.alias.successfully.imported.=已成功匯入別名 {0} 的項目。
+Entry.for.alias.alias.not.imported.=未匯入別名 {0} 的項目。
+Problem.importing.entry.for.alias.alias.exception.Entry.for.alias.alias.not.imported.=匯入別名 {0} 的項目時出現問題: {1}。\n未匯入別名 {0} 的項目。
+Import.command.completed.ok.entries.successfully.imported.fail.entries.failed.or.cancelled=已完成匯入命令: 成功匯入 {0} 個項目，{1} 個項目失敗或已取消
+Warning.Overwriting.existing.alias.alias.in.destination.keystore=警告: 正在覆寫目的地金鑰儲存庫中的現有別名 {0}
+Existing.entry.alias.alias.exists.overwrite.no.=現有項目別名 {0} 存在，是否覆寫？[否]: \u0020
+Too.many.failures.try.later=太多錯誤 - 請稍後再試
+Certification.request.stored.in.file.filename.=認證要求儲存在檔案 <{0}>
+Submit.this.to.your.CA=將此送出至您的 CA
+if.alias.not.specified.destalias.and.srckeypass.must.not.be.specified=如果未指定別名，則不能指定 destalias 和 srckeypass
+The.destination.pkcs12.keystore.has.different.storepass.and.keypass.Please.retry.with.destkeypass.specified.=目的地 pkcs12 金鑰儲存庫的 storepass 和 keypass 不同。請重新以 -destkeypass 指定。
+Certificate.stored.in.file.filename.=憑證儲存在檔案 <{0}>
+Certificate.reply.was.installed.in.keystore=憑證回覆已安裝在金鑰儲存庫中
+Certificate.reply.was.not.installed.in.keystore=憑證回覆未安裝在金鑰儲存庫中
+Certificate.was.added.to.keystore=憑證已新增至金鑰儲存庫中
+Certificate.was.not.added.to.keystore=憑證未新增至金鑰儲存庫中
+.Storing.ksfname.=[儲存 {0}]
+alias.has.no.public.key.certificate.={0} 沒有公開金鑰 (憑證)
+Cannot.derive.signature.algorithm=無法取得簽章演算法
+Alias.alias.does.not.exist=別名 <{0}> 不存在
+Alias.alias.has.no.certificate=別名 <{0}> 沒有憑證
+Key.pair.not.generated.alias.alias.already.exists=沒有建立金鑰組，別名 <{0}> 已經存在
+Generating.keysize.bit.keyAlgName.key.pair.and.self.signed.certificate.sigAlgName.with.a.validity.of.validality.days.for=針對 {4} 產生有效期 {3} 天的 {0} 位元 {1} 金鑰組以及自我簽署憑證 ({2})\n\t
+Enter.key.password.for.alias.=輸入 <{0}> 的金鑰密碼
+.RETURN.if.same.as.keystore.password.=\t(RETURN 如果和金鑰儲存庫密碼相同): \u0020
+Key.password.is.too.short.must.be.at.least.6.characters=金鑰密碼太短 - 必須至少為 6 個字元
+Too.many.failures.key.not.added.to.keystore=太多錯誤 - 金鑰未新增至金鑰儲存庫
+Destination.alias.dest.already.exists=目的地別名 <{0}> 已經存在
+Password.is.too.short.must.be.at.least.6.characters=密碼太短 - 必須至少為 6 個字元
+Too.many.failures.Key.entry.not.cloned=太多錯誤。未複製金鑰項目
+key.password.for.alias.=<{0}> 的金鑰密碼
+Keystore.entry.for.id.getName.already.exists=<{0}> 的金鑰儲存庫項目已經存在
+Creating.keystore.entry.for.id.getName.=建立 <{0}> 的金鑰儲存庫項目...
+No.entries.from.identity.database.added=沒有新增來自識別資料庫的項目
+Alias.name.alias=別名名稱: {0}
+Creation.date.keyStore.getCreationDate.alias.=建立日期: {0,date}
+alias.keyStore.getCreationDate.alias.={0}, {1,date},\u0020
+alias.={0},\u0020
+Entry.type.type.=項目類型: {0}
+Certificate.chain.length.=憑證鏈長度:\u0020
+Certificate.i.1.=憑證 [{0,number,integer}]:
+Certificate.fingerprint.SHA.256.=憑證指紋 (SHA-256):\u0020
+Keystore.type.=金鑰儲存庫類型:\u0020
+Keystore.provider.=金鑰儲存庫提供者:\u0020
+Your.keystore.contains.keyStore.size.entry=您的金鑰儲存庫包含 {0,number,integer} 項目
+Your.keystore.contains.keyStore.size.entries=您的金鑰儲存庫包含 {0,number,integer} 項目
+Failed.to.parse.input=無法剖析輸入
+Empty.input=空輸入
+Not.X.509.certificate=非 X.509 憑證
+alias.has.no.public.key={0} 無公開金鑰
+alias.has.no.X.509.certificate={0} 無 X.509 憑證
+New.certificate.self.signed.=新憑證 (自我簽署):\u0020
+Reply.has.no.certificates=回覆不含憑證
+Certificate.not.imported.alias.alias.already.exists=憑證未輸入，別名 <{0}> 已經存在
+Input.not.an.X.509.certificate=輸入的不是 X.509 憑證
+Certificate.already.exists.in.keystore.under.alias.trustalias.=金鑰儲存庫中的 <{0}> 別名之下，憑證已經存在
+Do.you.still.want.to.add.it.no.=您仍然想要將之新增嗎？ [否]: \u0020
+Certificate.already.exists.in.system.wide.CA.keystore.under.alias.trustalias.=整個系統 CA 金鑰儲存庫中的 <{0}> 別名之下，憑證已經存在
+Do.you.still.want.to.add.it.to.your.own.keystore.no.=您仍然想要將之新增至自己的金鑰儲存庫嗎？ [否]: \u0020
+Trust.this.certificate.no.=信任這個憑證？ [否]: \u0020
+YES=是
+New.prompt.=新 {0}:\u0020
+Passwords.must.differ=必須是不同的密碼
+Re.enter.new.prompt.=重新輸入新 {0}:\u0020
+Re.enter.password.=重新輸入密碼:
+Re.enter.new.password.=重新輸入新密碼:\u0020
+They.don.t.match.Try.again=它們不相符。請重試
+Enter.prompt.alias.name.=輸入 {0} 別名名稱: \u0020
+Enter.new.alias.name.RETURN.to.cancel.import.for.this.entry.=請輸入新的別名名稱\t(RETURN 以取消匯入此項目):
+Enter.alias.name.=輸入別名名稱: \u0020
+.RETURN.if.same.as.for.otherAlias.=\t(RETURN 如果和 <{0}> 的相同)
+What.is.your.first.and.last.name.=您的名字與姓氏為何？
+What.is.the.name.of.your.organizational.unit.=您的組織單位名稱為何？
+What.is.the.name.of.your.organization.=您的組織名稱為何？
+What.is.the.name.of.your.City.or.Locality.=您所在的城市或地區名稱為何？
+What.is.the.name.of.your.State.or.Province.=您所在的州及省份名稱為何？
+What.is.the.two.letter.country.code.for.this.unit.=此單位的兩個字母國別代碼為何？
+Is.name.correct.={0} 正確嗎？
+no=否
+yes=是
+y=y
+.defaultValue.=\u0020 [{0}]: \u0020
+Alias.alias.has.no.key=別名 <{0}> 沒有金鑰
+Alias.alias.references.an.entry.type.that.is.not.a.private.key.entry.The.keyclone.command.only.supports.cloning.of.private.key=別名 <{0}> 所參照的項目不是私密金鑰類型。-keyclone 命令僅支援私密金鑰項目的複製
+
+.WARNING.WARNING.WARNING.=*****************  WARNING WARNING WARNING  *****************
+Signer.d.=簽署者 #%d:
+Timestamp.=時戳:
+Signature.=簽章:
+CRLs.=CRL:
+Certificate.owner.=憑證擁有者:\u0020
+Not.a.signed.jar.file=不是簽署的 jar 檔案
+No.certificate.from.the.SSL.server=沒有來自 SSL 伺服器的憑證
+
+.The.integrity.of.the.information.stored.in.your.keystore.=* 尚未驗證儲存於金鑰儲存庫中資訊  *\n* 的完整性！若要驗證其完整性，    *\n* 您必須提供您的金鑰儲存庫密碼。  *
+.The.integrity.of.the.information.stored.in.the.srckeystore.=* 尚未驗證儲存於 srckeystore 中資訊  *\n* 的完整性！若要驗證其完整性，您必須 *\n* 提供 srckeystore 密碼。            *
+
+Certificate.reply.does.not.contain.public.key.for.alias.=憑證回覆並未包含 <{0}> 的公開金鑰
+Incomplete.certificate.chain.in.reply=回覆時的憑證鏈不完整
+Certificate.chain.in.reply.does.not.verify.=回覆時的憑證鏈未驗證:\u0020
+Top.level.certificate.in.reply.=回覆時的最高級憑證:\n
+.is.not.trusted.=... 是不被信任的。
+Install.reply.anyway.no.=還是要安裝回覆？ [否]: \u0020
+NO=否
+Public.keys.in.reply.and.keystore.don.t.match=回覆時的公開金鑰與金鑰儲存庫不符
+Certificate.reply.and.certificate.in.keystore.are.identical=憑證回覆與金鑰儲存庫中的憑證是相同的
+Failed.to.establish.chain.from.reply=無法從回覆中將鏈建立起來
+n=n
+Wrong.answer.try.again=錯誤的答案，請再試一次
+Secret.key.not.generated.alias.alias.already.exists=未產生秘密金鑰，別名 <{0}> 已存在
+Please.provide.keysize.for.secret.key.generation=請提供 -keysize 以產生秘密金鑰
+
+warning.not.verified.make.sure.keystore.is.correct=警告: 未驗證。請確定 -keystore 正確。
+
+Extensions.=擴充套件:\u0020
+.Empty.value.=(空白值)
+Extension.Request.=擴充套件要求:
+Unknown.keyUsage.type.=不明的 keyUsage 類型:\u0020
+Unknown.extendedkeyUsage.type.=不明的 extendedkeyUsage 類型:\u0020
+Unknown.AccessDescription.type.=不明的 AccessDescription 類型:\u0020
+Unrecognized.GeneralName.type.=無法辨識的 GeneralName 類型:\u0020
+This.extension.cannot.be.marked.as.critical.=此擴充套件無法標示為關鍵。
+Odd.number.of.hex.digits.found.=找到十六進位數字的奇數:\u0020
+Unknown.extension.type.=不明的擴充套件類型:\u0020
+command.{0}.is.ambiguous.=命令 {0} 不明確:
+# 8171319: keytool should print out warnings when reading or
+# generating cert/cert req using weak algorithms
+the.certificate.request=憑證要求
+the.issuer=發行人
+the.generated.certificate=產生的憑證
+the.generated.crl=產生的 CRL
+the.generated.certificate.request=產生的憑證要求
+the.certificate=憑證
+the.crl=CRL
+the.tsa.certificate=TSA 憑證
+the.input=輸入
+reply=回覆
+one.in.many=%1$s #%2$d / %3$d
+alias.in.cacerts=cacerts 中的發行人 <%s>
+alias.in.keystore=發行人 <%s>
+with.weak=%s (低強度)
+key.bit=%1$d 位元的 %2$s 金鑰
+key.bit.weak=%1$d 位元的 %2$s 金鑰 (低強度)
+unknown.size.1=%s 金鑰大小不明
+.PATTERN.printX509Cert.with.weak=擁有者: {0}\n發行人: {1}\n序號: {2}\n有效期自: {3} 到: {4}\n憑證指紋:\n\t SHA1: {5}\n\t SHA256: {6}\n簽章演算法名稱: {7}\n主體公開金鑰演算法: {8}\n版本: {9}
+PKCS.10.with.weak=PKCS #10 憑證要求 (版本 1.0)\n主體: %1$s\n格式: %2$s\n公用金鑰: %3$s\n簽章演算法: %4$s\n
+verified.by.s.in.s.weak=由 %2$s 中的 %1$s 以 %3$s 驗證
+whose.sigalg.risk=%1$s 使用的 %2$s 簽章演算法存在安全風險。
+whose.key.risk=%1$s 使用的 %2$s 存在安全風險。
+jks.storetype.warning=%1$s 金鑰儲存庫使用專有格式。建議您使用 "keytool -importkeystore -srckeystore %2$s -destkeystore %2$s -deststoretype pkcs12" 移轉成為使用 PKCS12 (業界標準格式)。
+migrate.keystore.warning=已將 "%1$s" 移轉成為 %4$s。%2$s 金鑰儲存庫已備份為 "%3$s"。
+backup.keystore.warning=原始的金鑰儲存庫 "%1$s" 已備份為 "%3$s"...
+importing.keystore.status=正在將金鑰儲存庫 %1$s 匯入 %2$s...
diff --git a/src/java.base/share/classes/sun/security/util/AuthResources.java b/src/java.base/share/classes/sun/security/util/AuthResources.java
deleted file mode 100644
index 76c644150bd..00000000000
--- a/src/java.base/share/classes/sun/security/util/AuthResources.java
+++ /dev/null
@@ -1,110 +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.  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.util;
-
-/**
- * <p> This class represents the <code>ResourceBundle</code>
- * for the following packages:
- *
- * <ol>
- * <li> com.sun.security.auth
- * <li> com.sun.security.auth.login
- * </ol>
- *
- */
-public class AuthResources extends java.util.ListResourceBundle {
-
-    private static final Object[][] contents = {
-
-        // NT principals
-        {"invalid.null.input.value", "invalid null input: {0}"},
-        {"NTDomainPrincipal.name", "NTDomainPrincipal: {0}"},
-        {"NTNumericCredential.name", "NTNumericCredential: {0}"},
-        {"Invalid.NTSid.value", "Invalid NTSid value"},
-        {"NTSid.name", "NTSid: {0}"},
-        {"NTSidDomainPrincipal.name", "NTSidDomainPrincipal: {0}"},
-        {"NTSidGroupPrincipal.name", "NTSidGroupPrincipal: {0}"},
-        {"NTSidPrimaryGroupPrincipal.name", "NTSidPrimaryGroupPrincipal: {0}"},
-        {"NTSidUserPrincipal.name", "NTSidUserPrincipal: {0}"},
-        {"NTUserPrincipal.name", "NTUserPrincipal: {0}"},
-
-        // UnixPrincipals
-        {"UnixNumericGroupPrincipal.Primary.Group.name",
-                "UnixNumericGroupPrincipal [Primary Group]: {0}"},
-        {"UnixNumericGroupPrincipal.Supplementary.Group.name",
-                "UnixNumericGroupPrincipal [Supplementary Group]: {0}"},
-        {"UnixNumericUserPrincipal.name", "UnixNumericUserPrincipal: {0}"},
-        {"UnixPrincipal.name", "UnixPrincipal: {0}"},
-
-        // com.sun.security.auth.login.ConfigFile
-        {"Unable.to.properly.expand.config", "Unable to properly expand {0}"},
-        {"extra.config.No.such.file.or.directory.",
-                "{0} (No such file or directory)"},
-        {"Configuration.Error.No.such.file.or.directory",
-                "Configuration Error:\n\tNo such file or directory"},
-        {"Configuration.Error.Invalid.control.flag.flag",
-                "Configuration Error:\n\tInvalid control flag, {0}"},
-        {"Configuration.Error.Can.not.specify.multiple.entries.for.appName",
-            "Configuration Error:\n\tCan not specify multiple entries for {0}"},
-        {"Configuration.Error.expected.expect.read.end.of.file.",
-                "Configuration Error:\n\texpected [{0}], read [end of file]"},
-        {"Configuration.Error.Line.line.expected.expect.found.value.",
-            "Configuration Error:\n\tLine {0}: expected [{1}], found [{2}]"},
-        {"Configuration.Error.Line.line.expected.expect.",
-            "Configuration Error:\n\tLine {0}: expected [{1}]"},
-        {"Configuration.Error.Line.line.system.property.value.expanded.to.empty.value",
-            "Configuration Error:\n\tLine {0}: system property [{1}] expanded to empty value"},
-
-        // com.sun.security.auth.module.JndiLoginModule
-        {"username.","username: "},
-        {"password.","password: "},
-
-        // com.sun.security.auth.module.KeyStoreLoginModule
-        {"Please.enter.keystore.information",
-                "Please enter keystore information"},
-        {"Keystore.alias.","Keystore alias: "},
-        {"Keystore.password.","Keystore password: "},
-        {"Private.key.password.optional.",
-            "Private key password (optional): "},
-
-        // com.sun.security.auth.module.Krb5LoginModule
-        {"Kerberos.username.defUsername.",
-                "Kerberos username [{0}]: "},
-        {"Kerberos.password.for.username.",
-                "Kerberos password for {0}: "},
-    };
-
-    /**
-     * Returns the contents of this <code>ResourceBundle</code>.
-     *
-     * <p>
-     *
-     * @return the contents of this <code>ResourceBundle</code>.
-     */
-    public Object[][] getContents() {
-        return contents;
-    }
-}
diff --git a/src/java.base/share/classes/sun/security/util/AuthResources_de.java b/src/java.base/share/classes/sun/security/util/AuthResources_de.java
deleted file mode 100644
index 03b919626de..00000000000
--- a/src/java.base/share/classes/sun/security/util/AuthResources_de.java
+++ /dev/null
@@ -1,110 +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.  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.util;
-
-/**
- * <p> This class represents the <code>ResourceBundle</code>
- * for the following packages:
- *
- * <ol>
- * <li> com.sun.security.auth
- * <li> com.sun.security.auth.login
- * </ol>
- *
- */
-public class AuthResources_de extends java.util.ListResourceBundle {
-
-    private static final Object[][] contents = {
-
-        // NT principals
-        {"invalid.null.input.value", "Ung\u00FCltige Nulleingabe: {0}"},
-        {"NTDomainPrincipal.name", "NTDomainPrincipal: {0}"},
-        {"NTNumericCredential.name", "NTNumericCredential: {0}"},
-        {"Invalid.NTSid.value", "Ung\u00FCltiger NTSid-Wert"},
-        {"NTSid.name", "NTSid: {0}"},
-        {"NTSidDomainPrincipal.name", "NTSidDomainPrincipal: {0}"},
-        {"NTSidGroupPrincipal.name", "NTSidGroupPrincipal: {0}"},
-        {"NTSidPrimaryGroupPrincipal.name", "NTSidPrimaryGroupPrincipal: {0}"},
-        {"NTSidUserPrincipal.name", "NTSidUserPrincipal: {0}"},
-        {"NTUserPrincipal.name", "NTUserPrincipal: {0}"},
-
-        // UnixPrincipals
-        {"UnixNumericGroupPrincipal.Primary.Group.name",
-                "UnixNumericGroupPrincipal [Prim\u00E4rgruppe]: {0}"},
-        {"UnixNumericGroupPrincipal.Supplementary.Group.name",
-                "UnixNumericGroupPrincipal [Zusatzgruppe]: {0}"},
-        {"UnixNumericUserPrincipal.name", "UnixNumericUserPrincipal: {0}"},
-        {"UnixPrincipal.name", "UnixPrincipal: {0}"},
-
-        // com.sun.security.auth.login.ConfigFile
-        {"Unable.to.properly.expand.config", "{0} kann nicht ordnungsgem\u00E4\u00DF erweitert werden"},
-        {"extra.config.No.such.file.or.directory.",
-                "{0} (Datei oder Verzeichnis nicht vorhanden)"},
-        {"Configuration.Error.No.such.file.or.directory",
-                "Konfigurationsfehler:\n\tDatei oder Verzeichnis nicht vorhanden"},
-        {"Configuration.Error.Invalid.control.flag.flag",
-                "Konfigurationsfehler:\n\tUng\u00FCltiges Steuerkennzeichen {0}"},
-        {"Configuration.Error.Can.not.specify.multiple.entries.for.appName",
-            "Konfigurationsfehler:\n\tEs k\u00F6nnen nicht mehrere Angaben f\u00FCr {0} gemacht werden."},
-        {"Configuration.Error.expected.expect.read.end.of.file.",
-                "Konfigurationsfehler:\n\t[{0}] erwartet, [Dateiende] gelesen"},
-        {"Configuration.Error.Line.line.expected.expect.found.value.",
-            "Konfigurationsfehler:\n\tZeile {0}: [{1}] erwartet, [{2}] gefunden"},
-        {"Configuration.Error.Line.line.expected.expect.",
-            "Konfigurationsfehler:\n\tZeile {0}: [{1}] erwartet"},
-        {"Configuration.Error.Line.line.system.property.value.expanded.to.empty.value",
-            "Konfigurationsfehler:\n\tZeile {0}: Systemeigenschaft [{1}] auf leeren Wert erweitert"},
-
-        // com.sun.security.auth.module.JndiLoginModule
-        {"username.","Benutzername: "},
-        {"password.","Kennwort: "},
-
-        // com.sun.security.auth.module.KeyStoreLoginModule
-        {"Please.enter.keystore.information",
-                "Geben Sie die Keystore-Informationen ein"},
-        {"Keystore.alias.","Keystore-Alias: "},
-        {"Keystore.password.","Keystore-Kennwort: "},
-        {"Private.key.password.optional.",
-            "Private-Key-Kennwort (optional): "},
-
-        // com.sun.security.auth.module.Krb5LoginModule
-        {"Kerberos.username.defUsername.",
-                "Kerberos-Benutzername [{0}]: "},
-        {"Kerberos.password.for.username.",
-                "Kerberos-Kennwort f\u00FCr {0}: "},
-    };
-
-    /**
-     * Returns the contents of this <code>ResourceBundle</code>.
-     *
-     * <p>
-     *
-     * @return the contents of this <code>ResourceBundle</code>.
-     */
-    public Object[][] getContents() {
-        return contents;
-    }
-}
diff --git a/src/java.base/share/classes/sun/security/util/AuthResources_es.java b/src/java.base/share/classes/sun/security/util/AuthResources_es.java
deleted file mode 100644
index 6060f8b565d..00000000000
--- a/src/java.base/share/classes/sun/security/util/AuthResources_es.java
+++ /dev/null
@@ -1,110 +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.  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.util;
-
-/**
- * <p> This class represents the <code>ResourceBundle</code>
- * for the following packages:
- *
- * <ol>
- * <li> com.sun.security.auth
- * <li> com.sun.security.auth.login
- * </ol>
- *
- */
-public class AuthResources_es extends java.util.ListResourceBundle {
-
-    private static final Object[][] contents = {
-
-        // NT principals
-        {"invalid.null.input.value", "entrada nula no v\u00E1lida: {0}"},
-        {"NTDomainPrincipal.name", "NTDomainPrincipal: {0}"},
-        {"NTNumericCredential.name", "NTNumericCredential: {0}"},
-        {"Invalid.NTSid.value", "Valor de NTSid no v\u00E1lido"},
-        {"NTSid.name", "NTSid: {0}"},
-        {"NTSidDomainPrincipal.name", "NTSidDomainPrincipal: {0}"},
-        {"NTSidGroupPrincipal.name", "NTSidGroupPrincipal: {0}"},
-        {"NTSidPrimaryGroupPrincipal.name", "NTSidPrimaryGroupPrincipal: {0}"},
-        {"NTSidUserPrincipal.name", "NTSidUserPrincipal: {0}"},
-        {"NTUserPrincipal.name", "NTUserPrincipal: {0}"},
-
-        // UnixPrincipals
-        {"UnixNumericGroupPrincipal.Primary.Group.name",
-                "UnixNumericGroupPrincipal [Grupo Principal] {0}"},
-        {"UnixNumericGroupPrincipal.Supplementary.Group.name",
-                "UnixNumericGroupPrincipal [Grupo Adicional] {0}"},
-        {"UnixNumericUserPrincipal.name", "UnixNumericUserPrincipal: {0}"},
-        {"UnixPrincipal.name", "UnixPrincipal: {0}"},
-
-        // com.sun.security.auth.login.ConfigFile
-        {"Unable.to.properly.expand.config", "No se ha podido ampliar correctamente {0}"},
-        {"extra.config.No.such.file.or.directory.",
-                "{0} (No existe tal archivo o directorio)"},
-        {"Configuration.Error.No.such.file.or.directory",
-                "Error de Configuraci\u00F3n:\n\tNo existe tal archivo o directorio"},
-        {"Configuration.Error.Invalid.control.flag.flag",
-                "Error de Configuraci\u00F3n:\n\tIndicador de control no v\u00E1lido, {0}"},
-        {"Configuration.Error.Can.not.specify.multiple.entries.for.appName",
-            "Error de Configuraci\u00F3n:\n\tNo se pueden especificar varias entradas para {0}"},
-        {"Configuration.Error.expected.expect.read.end.of.file.",
-                "Error de configuraci\u00F3n:\n\tse esperaba [{0}], se ha le\u00EDdo [final de archivo]"},
-        {"Configuration.Error.Line.line.expected.expect.found.value.",
-            "Error de configuraci\u00F3n:\n\tL\u00EDnea {0}: se esperaba [{1}], se ha encontrado [{2}]"},
-        {"Configuration.Error.Line.line.expected.expect.",
-            "Error de configuraci\u00F3n:\n\tL\u00EDnea {0}: se esperaba [{1}]"},
-        {"Configuration.Error.Line.line.system.property.value.expanded.to.empty.value",
-            "Error de configuraci\u00F3n:\n\tL\u00EDnea {0}: propiedad de sistema [{1}] ampliada a valor vac\u00EDo"},
-
-        // com.sun.security.auth.module.JndiLoginModule
-        {"username.","nombre de usuario: "},
-        {"password.","contrase\u00F1a: "},
-
-        // com.sun.security.auth.module.KeyStoreLoginModule
-        {"Please.enter.keystore.information",
-                "Introduzca la informaci\u00F3n del almac\u00E9n de claves"},
-        {"Keystore.alias.","Alias de Almac\u00E9n de Claves: "},
-        {"Keystore.password.","Contrase\u00F1a de Almac\u00E9n de Claves: "},
-        {"Private.key.password.optional.",
-            "Contrase\u00F1a de Clave Privada (opcional): "},
-
-        // com.sun.security.auth.module.Krb5LoginModule
-        {"Kerberos.username.defUsername.",
-                "Nombre de usuario de Kerberos [{0}]: "},
-        {"Kerberos.password.for.username.",
-                "Contrase\u00F1a de Kerberos de {0}: "},
-    };
-
-    /**
-     * Returns the contents of this <code>ResourceBundle</code>.
-     *
-     * <p>
-     *
-     * @return the contents of this <code>ResourceBundle</code>.
-     */
-    public Object[][] getContents() {
-        return contents;
-    }
-}
diff --git a/src/java.base/share/classes/sun/security/util/AuthResources_fr.java b/src/java.base/share/classes/sun/security/util/AuthResources_fr.java
deleted file mode 100644
index 4f9962633cd..00000000000
--- a/src/java.base/share/classes/sun/security/util/AuthResources_fr.java
+++ /dev/null
@@ -1,110 +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.  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.util;
-
-/**
- * <p> This class represents the <code>ResourceBundle</code>
- * for the following packages:
- *
- * <ol>
- * <li> com.sun.security.auth
- * <li> com.sun.security.auth.login
- * </ol>
- *
- */
-public class AuthResources_fr extends java.util.ListResourceBundle {
-
-    private static final Object[][] contents = {
-
-        // NT principals
-        {"invalid.null.input.value", "entr\u00E9e NULL non valide : {0}"},
-        {"NTDomainPrincipal.name", "NTDomainPrincipal : {0}"},
-        {"NTNumericCredential.name", "NTNumericCredential : {0}"},
-        {"Invalid.NTSid.value", "Valeur de NTSid non valide"},
-        {"NTSid.name", "NTSid : {0}"},
-        {"NTSidDomainPrincipal.name", "NTSidDomainPrincipal : {0}"},
-        {"NTSidGroupPrincipal.name", "NTSidGroupPrincipal : {0}"},
-        {"NTSidPrimaryGroupPrincipal.name", "NTSidPrimaryGroupPrincipal : {0}"},
-        {"NTSidUserPrincipal.name", "NTSidUserPrincipal : {0}"},
-        {"NTUserPrincipal.name", "NTUserPrincipal : {0}"},
-
-        // UnixPrincipals
-        {"UnixNumericGroupPrincipal.Primary.Group.name",
-                "UnixNumericGroupPrincipal [groupe principal] : {0}"},
-        {"UnixNumericGroupPrincipal.Supplementary.Group.name",
-                "UnixNumericGroupPrincipal [groupe suppl\u00E9mentaire] : {0}"},
-        {"UnixNumericUserPrincipal.name", "UnixNumericUserPrincipal : {0}"},
-        {"UnixPrincipal.name", "UnixPrincipal : {0}"},
-
-        // com.sun.security.auth.login.ConfigFile
-        {"Unable.to.properly.expand.config", "Impossible de d\u00E9velopper {0} correctement"},
-        {"extra.config.No.such.file.or.directory.",
-                "{0} (fichier ou r\u00E9pertoire inexistant)"},
-        {"Configuration.Error.No.such.file.or.directory",
-                "Erreur de configuration :\n\tCe fichier ou r\u00E9pertoire n'existe pas"},
-        {"Configuration.Error.Invalid.control.flag.flag",
-                "Erreur de configuration :\n\tIndicateur de contr\u00F4le non valide, {0}"},
-        {"Configuration.Error.Can.not.specify.multiple.entries.for.appName",
-            "Erreur de configuration :\n\tImpossible de sp\u00E9cifier des entr\u00E9es multiples pour {0}"},
-        {"Configuration.Error.expected.expect.read.end.of.file.",
-                "Erreur de configuration :\n\tAttendu : [{0}], lu : [fin de fichier]"},
-        {"Configuration.Error.Line.line.expected.expect.found.value.",
-            "Erreur de configuration :\n\tLigne {0} : attendu [{1}], trouv\u00E9 [{2}]"},
-        {"Configuration.Error.Line.line.expected.expect.",
-            "Erreur de configuration :\n\tLigne {0} : attendu [{1}]"},
-        {"Configuration.Error.Line.line.system.property.value.expanded.to.empty.value",
-            "Erreur de configuration :\n\tLigne {0} : propri\u00E9t\u00E9 syst\u00E8me [{1}] d\u00E9velopp\u00E9e en valeur vide"},
-
-        // com.sun.security.auth.module.JndiLoginModule
-        {"username.","nom utilisateur : "},
-        {"password.","mot de passe : "},
-
-        // com.sun.security.auth.module.KeyStoreLoginModule
-        {"Please.enter.keystore.information",
-                "Entrez les informations du fichier de cl\u00E9s"},
-        {"Keystore.alias.","Alias du fichier de cl\u00E9s : "},
-        {"Keystore.password.","Mot de passe pour fichier de cl\u00E9s : "},
-        {"Private.key.password.optional.",
-            "Mot de passe de la cl\u00E9 priv\u00E9e (facultatif) : "},
-
-        // com.sun.security.auth.module.Krb5LoginModule
-        {"Kerberos.username.defUsername.",
-                "Nom utilisateur Kerberos [{0}] : "},
-        {"Kerberos.password.for.username.",
-                "Mot de passe Kerberos pour {0} : "},
-    };
-
-    /**
-     * Returns the contents of this <code>ResourceBundle</code>.
-     *
-     * <p>
-     *
-     * @return the contents of this <code>ResourceBundle</code>.
-     */
-    public Object[][] getContents() {
-        return contents;
-    }
-}
diff --git a/src/java.base/share/classes/sun/security/util/AuthResources_it.java b/src/java.base/share/classes/sun/security/util/AuthResources_it.java
deleted file mode 100644
index cee8c457c4a..00000000000
--- a/src/java.base/share/classes/sun/security/util/AuthResources_it.java
+++ /dev/null
@@ -1,110 +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.  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.util;
-
-/**
- * <p> This class represents the <code>ResourceBundle</code>
- * for the following packages:
- *
- * <ol>
- * <li> com.sun.security.auth
- * <li> com.sun.security.auth.login
- * </ol>
- *
- */
-public class AuthResources_it extends java.util.ListResourceBundle {
-
-    private static final Object[][] contents = {
-
-        // NT principals
-        {"invalid.null.input.value", "input nullo non valido: {0}"},
-        {"NTDomainPrincipal.name", "NTDomainPrincipal: {0}"},
-        {"NTNumericCredential.name", "NTNumericCredential: {0}"},
-        {"Invalid.NTSid.value", "Valore NTSid non valido"},
-        {"NTSid.name", "NTSid: {0}"},
-        {"NTSidDomainPrincipal.name", "NTSidDomainPrincipal: {0}"},
-        {"NTSidGroupPrincipal.name", "NTSidGroupPrincipal: {0}"},
-        {"NTSidPrimaryGroupPrincipal.name", "NTSidPrimaryGroupPrincipal: {0}"},
-        {"NTSidUserPrincipal.name", "NTSidUserPrincipal: {0}"},
-        {"NTUserPrincipal.name", "NTUserPrincipal: {0}"},
-
-        // UnixPrincipals
-        {"UnixNumericGroupPrincipal.Primary.Group.name",
-                "UnixNumericGroupPrincipal [gruppo primario]: {0}"},
-        {"UnixNumericGroupPrincipal.Supplementary.Group.name",
-                "UnixNumericGroupPrincipal [gruppo supplementare]: {0}"},
-        {"UnixNumericUserPrincipal.name", "UnixNumericUserPrincipal: {0}"},
-        {"UnixPrincipal.name", "UnixPrincipal: {0}"},
-
-        // com.sun.security.auth.login.ConfigFile
-        {"Unable.to.properly.expand.config", "Impossibile espandere correttamente {0}"},
-        {"extra.config.No.such.file.or.directory.",
-                "{0} (file o directory inesistente)"},
-        {"Configuration.Error.No.such.file.or.directory",
-                "Errore di configurazione:\n\tFile o directory inesistente"},
-        {"Configuration.Error.Invalid.control.flag.flag",
-                "Errore di configurazione:\n\tflag di controllo non valido, {0}"},
-        {"Configuration.Error.Can.not.specify.multiple.entries.for.appName",
-            "Errore di configurazione:\n\timpossibile specificare pi\u00F9 valori per {0}"},
-        {"Configuration.Error.expected.expect.read.end.of.file.",
-                "Errore di configurazione:\n\tprevisto [{0}], letto [end of file]"},
-        {"Configuration.Error.Line.line.expected.expect.found.value.",
-            "Errore di configurazione:\n\triga {0}: previsto [{1}], trovato [{2}]"},
-        {"Configuration.Error.Line.line.expected.expect.",
-            "Errore di configurazione:\n\triga {0}: previsto [{1}]"},
-        {"Configuration.Error.Line.line.system.property.value.expanded.to.empty.value",
-            "Errore di configurazione:\n\triga {0}: propriet\u00E0 di sistema [{1}] espansa a valore vuoto"},
-
-        // com.sun.security.auth.module.JndiLoginModule
-        {"username.","Nome utente: "},
-        {"password.","Password: "},
-
-        // com.sun.security.auth.module.KeyStoreLoginModule
-        {"Please.enter.keystore.information",
-                "Immettere le informazioni per il keystore"},
-        {"Keystore.alias.","Alias keystore: "},
-        {"Keystore.password.","Password keystore: "},
-        {"Private.key.password.optional.",
-            "Password chiave privata (opzionale): "},
-
-        // com.sun.security.auth.module.Krb5LoginModule
-        {"Kerberos.username.defUsername.",
-                "Nome utente Kerberos [{0}]: "},
-        {"Kerberos.password.for.username.",
-                "Password Kerberos per {0}: "},
-    };
-
-    /**
-     * Returns the contents of this <code>ResourceBundle</code>.
-     *
-     * <p>
-     *
-     * @return the contents of this <code>ResourceBundle</code>.
-     */
-    public Object[][] getContents() {
-        return contents;
-    }
-}
diff --git a/src/java.base/share/classes/sun/security/util/AuthResources_ja.java b/src/java.base/share/classes/sun/security/util/AuthResources_ja.java
deleted file mode 100644
index fc313e144b1..00000000000
--- a/src/java.base/share/classes/sun/security/util/AuthResources_ja.java
+++ /dev/null
@@ -1,110 +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.  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.util;
-
-/**
- * <p> This class represents the <code>ResourceBundle</code>
- * for the following packages:
- *
- * <ol>
- * <li> com.sun.security.auth
- * <li> com.sun.security.auth.login
- * </ol>
- *
- */
-public class AuthResources_ja extends java.util.ListResourceBundle {
-
-    private static final Object[][] contents = {
-
-        // NT principals
-        {"invalid.null.input.value", "\u7121\u52B9\u306Anull\u306E\u5165\u529B: {0}"},
-        {"NTDomainPrincipal.name", "NTDomainPrincipal: {0}"},
-        {"NTNumericCredential.name", "NTNumericCredential: {0}"},
-        {"Invalid.NTSid.value", "\u7121\u52B9\u306ANTSid\u5024"},
-        {"NTSid.name", "NTSid: {0}"},
-        {"NTSidDomainPrincipal.name", "NTSidDomainPrincipal: {0}"},
-        {"NTSidGroupPrincipal.name", "NTSidGroupPrincipal: {0}"},
-        {"NTSidPrimaryGroupPrincipal.name", "NTSidPrimaryGroupPrincipal: {0}"},
-        {"NTSidUserPrincipal.name", "NTSidUserPrincipal: {0}"},
-        {"NTUserPrincipal.name", "NTUserPrincipal: {0}"},
-
-        // UnixPrincipals
-        {"UnixNumericGroupPrincipal.Primary.Group.name",
-                "UnixNumericGroupPrincipal [\u4E3B\u30B0\u30EB\u30FC\u30D7]: {0}"},
-        {"UnixNumericGroupPrincipal.Supplementary.Group.name",
-                "UnixNumericGroupPrincipal [\u88DC\u52A9\u30B0\u30EB\u30FC\u30D7]: {0}"},
-        {"UnixNumericUserPrincipal.name", "UnixNumericUserPrincipal: {0}"},
-        {"UnixPrincipal.name", "UnixPrincipal: {0}"},
-
-        // com.sun.security.auth.login.ConfigFile
-        {"Unable.to.properly.expand.config", "{0}\u3092\u6B63\u3057\u304F\u5C55\u958B\u3067\u304D\u307E\u305B\u3093"},
-        {"extra.config.No.such.file.or.directory.",
-                "{0}(\u6307\u5B9A\u3055\u308C\u305F\u30D5\u30A1\u30A4\u30EB\u307E\u305F\u306F\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u306F\u5B58\u5728\u3057\u307E\u305B\u3093)"},
-        {"Configuration.Error.No.such.file.or.directory",
-                "\u69CB\u6210\u30A8\u30E9\u30FC:\n\t\u6307\u5B9A\u3055\u308C\u305F\u30D5\u30A1\u30A4\u30EB\u307E\u305F\u306F\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u306F\u5B58\u5728\u3057\u307E\u305B\u3093"},
-        {"Configuration.Error.Invalid.control.flag.flag",
-                "\u69CB\u6210\u30A8\u30E9\u30FC:\n\t\u7121\u52B9\u306A\u5236\u5FA1\u30D5\u30E9\u30B0: {0}"},
-        {"Configuration.Error.Can.not.specify.multiple.entries.for.appName",
-            "\u69CB\u6210\u30A8\u30E9\u30FC:\n\t{0}\u306B\u8907\u6570\u306E\u30A8\u30F3\u30C8\u30EA\u3092\u6307\u5B9A\u3067\u304D\u307E\u305B\u3093"},
-        {"Configuration.Error.expected.expect.read.end.of.file.",
-                "\u69CB\u6210\u30A8\u30E9\u30FC:\n\t[{0}]\u3067\u306F\u306A\u304F\u3001[\u30D5\u30A1\u30A4\u30EB\u306E\u7D42\u308F\u308A]\u304C\u8AAD\u307F\u8FBC\u307E\u308C\u307E\u3057\u305F"},
-        {"Configuration.Error.Line.line.expected.expect.found.value.",
-            "\u69CB\u6210\u30A8\u30E9\u30FC:\n\t\u884C{0}: [{1}]\u3067\u306F\u306A\u304F\u3001[{2}]\u304C\u691C\u51FA\u3055\u308C\u307E\u3057\u305F"},
-        {"Configuration.Error.Line.line.expected.expect.",
-            "\u69CB\u6210\u30A8\u30E9\u30FC:\n\t\u884C{0}: [{1}]\u304C\u8981\u6C42\u3055\u308C\u307E\u3057\u305F"},
-        {"Configuration.Error.Line.line.system.property.value.expanded.to.empty.value",
-            "\u69CB\u6210\u30A8\u30E9\u30FC:\n\t\u884C{0}: \u30B7\u30B9\u30C6\u30E0\u30FB\u30D7\u30ED\u30D1\u30C6\u30A3[{1}]\u304C\u7A7A\u306E\u5024\u306B\u5C55\u958B\u3055\u308C\u307E\u3057\u305F"},
-
-        // com.sun.security.auth.module.JndiLoginModule
-        {"username.","\u30E6\u30FC\u30B6\u30FC\u540D: "},
-        {"password.","\u30D1\u30B9\u30EF\u30FC\u30C9: "},
-
-        // com.sun.security.auth.module.KeyStoreLoginModule
-        {"Please.enter.keystore.information",
-                "\u30AD\u30FC\u30B9\u30C8\u30A2\u60C5\u5831\u3092\u5165\u529B\u3057\u3066\u304F\u3060\u3055\u3044"},
-        {"Keystore.alias.","\u30AD\u30FC\u30B9\u30C8\u30A2\u306E\u5225\u540D: "},
-        {"Keystore.password.","\u30AD\u30FC\u30B9\u30C8\u30A2\u306E\u30D1\u30B9\u30EF\u30FC\u30C9: "},
-        {"Private.key.password.optional.",
-            "\u79D8\u5BC6\u30AD\u30FC\u306E\u30D1\u30B9\u30EF\u30FC\u30C9(\u30AA\u30D7\u30B7\u30E7\u30F3): "},
-
-        // com.sun.security.auth.module.Krb5LoginModule
-        {"Kerberos.username.defUsername.",
-                "Kerberos\u30E6\u30FC\u30B6\u30FC\u540D[{0}]: "},
-        {"Kerberos.password.for.username.",
-                "{0}\u306EKerberos\u30D1\u30B9\u30EF\u30FC\u30C9: "},
-    };
-
-    /**
-     * Returns the contents of this <code>ResourceBundle</code>.
-     *
-     * <p>
-     *
-     * @return the contents of this <code>ResourceBundle</code>.
-     */
-    public Object[][] getContents() {
-        return contents;
-    }
-}
diff --git a/src/java.base/share/classes/sun/security/util/AuthResources_ko.java b/src/java.base/share/classes/sun/security/util/AuthResources_ko.java
deleted file mode 100644
index 852b79bcdc1..00000000000
--- a/src/java.base/share/classes/sun/security/util/AuthResources_ko.java
+++ /dev/null
@@ -1,110 +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.  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.util;
-
-/**
- * <p> This class represents the <code>ResourceBundle</code>
- * for the following packages:
- *
- * <ol>
- * <li> com.sun.security.auth
- * <li> com.sun.security.auth.login
- * </ol>
- *
- */
-public class AuthResources_ko extends java.util.ListResourceBundle {
-
-    private static final Object[][] contents = {
-
-        // NT principals
-        {"invalid.null.input.value", "\uBD80\uC801\uD569\uD55C \uB110 \uC785\uB825: {0}"},
-        {"NTDomainPrincipal.name", "NTDomainPrincipal: {0}"},
-        {"NTNumericCredential.name", "NTNumericCredential: {0}"},
-        {"Invalid.NTSid.value", "NTSid \uAC12\uC774 \uBD80\uC801\uD569\uD569\uB2C8\uB2E4."},
-        {"NTSid.name", "NTSid: {0}"},
-        {"NTSidDomainPrincipal.name", "NTSidDomainPrincipal: {0}"},
-        {"NTSidGroupPrincipal.name", "NTSidGroupPrincipal: {0}"},
-        {"NTSidPrimaryGroupPrincipal.name", "NTSidPrimaryGroupPrincipal: {0}"},
-        {"NTSidUserPrincipal.name", "NTSidUserPrincipal: {0}"},
-        {"NTUserPrincipal.name", "NTUserPrincipal: {0}"},
-
-        // UnixPrincipals
-        {"UnixNumericGroupPrincipal.Primary.Group.name",
-                "UnixNumericGroupPrincipal [\uAE30\uBCF8 \uADF8\uB8F9]: {0}"},
-        {"UnixNumericGroupPrincipal.Supplementary.Group.name",
-                "UnixNumericGroupPrincipal [\uBCF4\uC870 \uADF8\uB8F9]: {0}"},
-        {"UnixNumericUserPrincipal.name", "UnixNumericUserPrincipal: {0}"},
-        {"UnixPrincipal.name", "UnixPrincipal: {0}"},
-
-        // com.sun.security.auth.login.ConfigFile
-        {"Unable.to.properly.expand.config", "{0}\uC744(\uB97C) \uC81C\uB300\uB85C \uD655\uC7A5\uD560 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4."},
-        {"extra.config.No.such.file.or.directory.",
-                "{0}(\uD574\uB2F9 \uD30C\uC77C \uB610\uB294 \uB514\uB809\uD1A0\uB9AC\uAC00 \uC5C6\uC2B5\uB2C8\uB2E4.)"},
-        {"Configuration.Error.No.such.file.or.directory",
-                "\uAD6C\uC131 \uC624\uB958:\n\t\uD574\uB2F9 \uD30C\uC77C \uB610\uB294 \uB514\uB809\uD1A0\uB9AC\uAC00 \uC5C6\uC2B5\uB2C8\uB2E4."},
-        {"Configuration.Error.Invalid.control.flag.flag",
-                "\uAD6C\uC131 \uC624\uB958:\n\t\uC81C\uC5B4 \uD50C\uB798\uADF8\uAC00 \uBD80\uC801\uD569\uD568, {0}"},
-        {"Configuration.Error.Can.not.specify.multiple.entries.for.appName",
-            "\uAD6C\uC131 \uC624\uB958:\n\t{0}\uC5D0 \uB300\uD574 \uC5EC\uB7EC \uD56D\uBAA9\uC744 \uC9C0\uC815\uD560 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4."},
-        {"Configuration.Error.expected.expect.read.end.of.file.",
-                "\uAD6C\uC131 \uC624\uB958:\n\t[{0}]\uC774(\uAC00) \uD544\uC694\uD558\uC9C0\uB9CC [\uD30C\uC77C\uC758 \uB05D]\uC5D0 \uB3C4\uB2EC\uD588\uC2B5\uB2C8\uB2E4."},
-        {"Configuration.Error.Line.line.expected.expect.found.value.",
-            "\uAD6C\uC131 \uC624\uB958:\n\t{0} \uD589: [{1}]\uC774(\uAC00) \uD544\uC694\uD558\uC9C0\uB9CC [{2}]\uC774(\uAC00) \uBC1C\uACAC\uB418\uC5C8\uC2B5\uB2C8\uB2E4."},
-        {"Configuration.Error.Line.line.expected.expect.",
-            "\uAD6C\uC131 \uC624\uB958:\n\t{0} \uD589: [{1}]\uC774(\uAC00) \uD544\uC694\uD569\uB2C8\uB2E4."},
-        {"Configuration.Error.Line.line.system.property.value.expanded.to.empty.value",
-            "\uAD6C\uC131 \uC624\uB958:\n\t{0} \uD589: \uC2DC\uC2A4\uD15C \uC18D\uC131 [{1}]\uC774(\uAC00) \uBE48 \uAC12\uC73C\uB85C \uD655\uC7A5\uB418\uC5C8\uC2B5\uB2C8\uB2E4."},
-
-        // com.sun.security.auth.module.JndiLoginModule
-        {"username.","\uC0AC\uC6A9\uC790 \uC774\uB984: "},
-        {"password.","\uBE44\uBC00\uBC88\uD638: "},
-
-        // com.sun.security.auth.module.KeyStoreLoginModule
-        {"Please.enter.keystore.information",
-                "\uD0A4 \uC800\uC7A5\uC18C \uC815\uBCF4\uB97C \uC785\uB825\uD558\uC2ED\uC2DC\uC624."},
-        {"Keystore.alias.","\uD0A4 \uC800\uC7A5\uC18C \uBCC4\uCE6D: "},
-        {"Keystore.password.","\uD0A4 \uC800\uC7A5\uC18C \uBE44\uBC00\uBC88\uD638: "},
-        {"Private.key.password.optional.",
-            "\uC804\uC6A9 \uD0A4 \uBE44\uBC00\uBC88\uD638(\uC120\uD0DD\uC0AC\uD56D): "},
-
-        // com.sun.security.auth.module.Krb5LoginModule
-        {"Kerberos.username.defUsername.",
-                "Kerberos \uC0AC\uC6A9\uC790 \uC774\uB984 [{0}]: "},
-        {"Kerberos.password.for.username.",
-                "{0}\uC758 Kerberos \uBE44\uBC00\uBC88\uD638: "},
-    };
-
-    /**
-     * Returns the contents of this <code>ResourceBundle</code>.
-     *
-     * <p>
-     *
-     * @return the contents of this <code>ResourceBundle</code>.
-     */
-    public Object[][] getContents() {
-        return contents;
-    }
-}
diff --git a/src/java.base/share/classes/sun/security/util/AuthResources_pt_BR.java b/src/java.base/share/classes/sun/security/util/AuthResources_pt_BR.java
deleted file mode 100644
index 2c6671e07db..00000000000
--- a/src/java.base/share/classes/sun/security/util/AuthResources_pt_BR.java
+++ /dev/null
@@ -1,110 +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.  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.util;
-
-/**
- * <p> This class represents the <code>ResourceBundle</code>
- * for the following packages:
- *
- * <ol>
- * <li> com.sun.security.auth
- * <li> com.sun.security.auth.login
- * </ol>
- *
- */
-public class AuthResources_pt_BR extends java.util.ListResourceBundle {
-
-    private static final Object[][] contents = {
-
-        // NT principals
-        {"invalid.null.input.value", "entrada nula inv\u00E1lida: {0}"},
-        {"NTDomainPrincipal.name", "NTDomainPrincipal: {0}"},
-        {"NTNumericCredential.name", "NTNumericCredential: {0}"},
-        {"Invalid.NTSid.value", "Valor de NTSid inv\u00E1lido"},
-        {"NTSid.name", "NTSid: {0}"},
-        {"NTSidDomainPrincipal.name", "NTSidDomainPrincipal: {0}"},
-        {"NTSidGroupPrincipal.name", "NTSidGroupPrincipal: {0}"},
-        {"NTSidPrimaryGroupPrincipal.name", "NTSidPrimaryGroupPrincipal: {0}"},
-        {"NTSidUserPrincipal.name", "NTSidUserPrincipal: {0}"},
-        {"NTUserPrincipal.name", "NTUserPrincipal: {0}"},
-
-        // UnixPrincipals
-        {"UnixNumericGroupPrincipal.Primary.Group.name",
-                "UnixNumericGroupPrincipal [Grupo Principal]: {0}"},
-        {"UnixNumericGroupPrincipal.Supplementary.Group.name",
-                "UnixNumericGroupPrincipal [Grupo Complementar]: {0}"},
-        {"UnixNumericUserPrincipal.name", "UnixNumericUserPrincipal: {0}"},
-        {"UnixPrincipal.name", "UnixPrincipal: {0}"},
-
-        // com.sun.security.auth.login.ConfigFile
-        {"Unable.to.properly.expand.config", "N\u00E3o \u00E9 poss\u00EDvel expandir corretamente {0}"},
-        {"extra.config.No.such.file.or.directory.",
-                "{0} (tal arquivo ou diret\u00F3rio n\u00E3o existe)"},
-        {"Configuration.Error.No.such.file.or.directory",
-                "Erro de Configura\u00E7\u00E3o:\n\tN\u00E3o h\u00E1 tal arquivo ou diret\u00F3rio"},
-        {"Configuration.Error.Invalid.control.flag.flag",
-                "Erro de Configura\u00E7\u00E3o:\n\tFlag de controle inv\u00E1lido, {0}"},
-        {"Configuration.Error.Can.not.specify.multiple.entries.for.appName",
-            "Erro de Configura\u00E7\u00E3o:\n\tN\u00E3o \u00E9 poss\u00EDvel especificar v\u00E1rias entradas para {0}"},
-        {"Configuration.Error.expected.expect.read.end.of.file.",
-                "Erro de Configura\u00E7\u00E3o:\n\tesperado [{0}], lido [fim do arquivo]"},
-        {"Configuration.Error.Line.line.expected.expect.found.value.",
-            "Erro de Configura\u00E7\u00E3o:\n\tLinha {0}: esperada [{1}], encontrada [{2}]"},
-        {"Configuration.Error.Line.line.expected.expect.",
-            "Erro de Configura\u00E7\u00E3o:\n\tLinha {0}: esperada [{1}]"},
-        {"Configuration.Error.Line.line.system.property.value.expanded.to.empty.value",
-            "Erro de Configura\u00E7\u00E3o:\n\tLinha {0}: propriedade do sistema [{1}] expandida para valor vazio"},
-
-        // com.sun.security.auth.module.JndiLoginModule
-        {"username.","nome do usu\u00E1rio: "},
-        {"password.","senha: "},
-
-        // com.sun.security.auth.module.KeyStoreLoginModule
-        {"Please.enter.keystore.information",
-                "Especifique as informa\u00E7\u00F5es do armazenamento de chaves"},
-        {"Keystore.alias.","Alias do armazenamento de chaves: "},
-        {"Keystore.password.","Senha do armazenamento de chaves: "},
-        {"Private.key.password.optional.",
-            "Senha da chave privada (opcional): "},
-
-        // com.sun.security.auth.module.Krb5LoginModule
-        {"Kerberos.username.defUsername.",
-                "Nome do usu\u00E1rio de Kerberos [{0}]: "},
-        {"Kerberos.password.for.username.",
-                "Senha de Kerberos de {0}: "},
-    };
-
-    /**
-     * Returns the contents of this <code>ResourceBundle</code>.
-     *
-     * <p>
-     *
-     * @return the contents of this <code>ResourceBundle</code>.
-     */
-    public Object[][] getContents() {
-        return contents;
-    }
-}
diff --git a/src/java.base/share/classes/sun/security/util/AuthResources_sv.java b/src/java.base/share/classes/sun/security/util/AuthResources_sv.java
deleted file mode 100644
index e328b209bac..00000000000
--- a/src/java.base/share/classes/sun/security/util/AuthResources_sv.java
+++ /dev/null
@@ -1,110 +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.  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.util;
-
-/**
- * <p> This class represents the <code>ResourceBundle</code>
- * for the following packages:
- *
- * <ol>
- * <li> com.sun.security.auth
- * <li> com.sun.security.auth.login
- * </ol>
- *
- */
-public class AuthResources_sv extends java.util.ListResourceBundle {
-
-    private static final Object[][] contents = {
-
-        // NT principals
-        {"invalid.null.input.value", "ogiltiga null-indata: {0}"},
-        {"NTDomainPrincipal.name", "NTDomainPrincipal: {0}"},
-        {"NTNumericCredential.name", "NTNumericCredential: {0}"},
-        {"Invalid.NTSid.value", "Ogiltigt NTSid-v\u00E4rde"},
-        {"NTSid.name", "NTSid: {0}"},
-        {"NTSidDomainPrincipal.name", "NTSidDomainPrincipal: {0}"},
-        {"NTSidGroupPrincipal.name", "NTSidGroupPrincipal: {0}"},
-        {"NTSidPrimaryGroupPrincipal.name", "NTSidPrimaryGroupPrincipal: {0}"},
-        {"NTSidUserPrincipal.name", "NTSidUserPrincipal: {0}"},
-        {"NTUserPrincipal.name", "NTUserPrincipal: {0}"},
-
-        // UnixPrincipals
-        {"UnixNumericGroupPrincipal.Primary.Group.name",
-                "UnixNumericGroupPrincipal [prim\u00E4r grupp]: {0}"},
-        {"UnixNumericGroupPrincipal.Supplementary.Group.name",
-                "UnixNumericGroupPrincipal [till\u00E4ggsgrupp]: {0}"},
-        {"UnixNumericUserPrincipal.name", "UnixNumericUserPrincipal: {0}"},
-        {"UnixPrincipal.name", "UnixPrincipal: {0}"},
-
-        // com.sun.security.auth.login.ConfigFile
-        {"Unable.to.properly.expand.config", "Kan inte ut\u00F6ka korrekt {0}"},
-        {"extra.config.No.such.file.or.directory.",
-                "{0} (det finns ingen s\u00E5dan fil eller katalog)"},
-        {"Configuration.Error.No.such.file.or.directory",
-                "Konfigurationsfel:\n\tFilen eller katalogen finns inte"},
-        {"Configuration.Error.Invalid.control.flag.flag",
-                "Konfigurationsfel:\n\tOgiltig kontrollflagga, {0}"},
-        {"Configuration.Error.Can.not.specify.multiple.entries.for.appName",
-            "Konfigurationsfel:\n\tKan inte ange flera poster f\u00F6r {0}"},
-        {"Configuration.Error.expected.expect.read.end.of.file.",
-                "Konfigurationsfel:\n\tf\u00F6rv\u00E4ntade [{0}], l\u00E4ste [filslut]"},
-        {"Configuration.Error.Line.line.expected.expect.found.value.",
-            "Konfigurationsfel:\n\tRad {0}: f\u00F6rv\u00E4ntade [{1}], hittade [{2}]"},
-        {"Configuration.Error.Line.line.expected.expect.",
-            "Konfigurationsfel:\n\tRad {0}: f\u00F6rv\u00E4ntade [{1}]"},
-        {"Configuration.Error.Line.line.system.property.value.expanded.to.empty.value",
-            "Konfigurationsfel:\n\tRad {0}: systemegenskapen [{1}] ut\u00F6kad till tomt v\u00E4rde"},
-
-        // com.sun.security.auth.module.JndiLoginModule
-        {"username.","anv\u00E4ndarnamn: "},
-        {"password.","l\u00F6senord: "},
-
-        // com.sun.security.auth.module.KeyStoreLoginModule
-        {"Please.enter.keystore.information",
-                "Ange nyckellagerinformation"},
-        {"Keystore.alias.","Nyckellageralias: "},
-        {"Keystore.password.","Nyckellagerl\u00F6senord: "},
-        {"Private.key.password.optional.",
-            "L\u00F6senord f\u00F6r personlig nyckel (valfritt): "},
-
-        // com.sun.security.auth.module.Krb5LoginModule
-        {"Kerberos.username.defUsername.",
-                "Kerberos-anv\u00E4ndarnamn [{0}]: "},
-        {"Kerberos.password.for.username.",
-                "Kerberos-l\u00F6senord f\u00F6r {0}: "},
-    };
-
-    /**
-     * Returns the contents of this <code>ResourceBundle</code>.
-     *
-     * <p>
-     *
-     * @return the contents of this <code>ResourceBundle</code>.
-     */
-    public Object[][] getContents() {
-        return contents;
-    }
-}
diff --git a/src/java.base/share/classes/sun/security/util/AuthResources_zh_CN.java b/src/java.base/share/classes/sun/security/util/AuthResources_zh_CN.java
deleted file mode 100644
index b3367db7bbc..00000000000
--- a/src/java.base/share/classes/sun/security/util/AuthResources_zh_CN.java
+++ /dev/null
@@ -1,110 +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.  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.util;
-
-/**
- * <p> This class represents the <code>ResourceBundle</code>
- * for the following packages:
- *
- * <ol>
- * <li> com.sun.security.auth
- * <li> com.sun.security.auth.login
- * </ol>
- *
- */
-public class AuthResources_zh_CN extends java.util.ListResourceBundle {
-
-    private static final Object[][] contents = {
-
-        // NT principals
-        {"invalid.null.input.value", "\u65E0\u6548\u7684\u7A7A\u8F93\u5165: {0}"},
-        {"NTDomainPrincipal.name", "NTDomainPrincipal: {0}"},
-        {"NTNumericCredential.name", "NTNumericCredential: {0}"},
-        {"Invalid.NTSid.value", "\u65E0\u6548\u7684 NTSid \u503C"},
-        {"NTSid.name", "NTSid: {0}"},
-        {"NTSidDomainPrincipal.name", "NTSidDomainPrincipal: {0}"},
-        {"NTSidGroupPrincipal.name", "NTSidGroupPrincipal: {0}"},
-        {"NTSidPrimaryGroupPrincipal.name", "NTSidPrimaryGroupPrincipal: {0}"},
-        {"NTSidUserPrincipal.name", "NTSidUserPrincipal: {0}"},
-        {"NTUserPrincipal.name", "NTUserPrincipal: {0}"},
-
-        // UnixPrincipals
-        {"UnixNumericGroupPrincipal.Primary.Group.name",
-                "UnixNumericGroupPrincipal [\u4E3B\u7EC4]: {0}"},
-        {"UnixNumericGroupPrincipal.Supplementary.Group.name",
-                "UnixNumericGroupPrincipal [\u8865\u5145\u7EC4]: {0}"},
-        {"UnixNumericUserPrincipal.name", "UnixNumericUserPrincipal: {0}"},
-        {"UnixPrincipal.name", "UnixPrincipal: {0}"},
-
-        // com.sun.security.auth.login.ConfigFile
-        {"Unable.to.properly.expand.config", "\u65E0\u6CD5\u6B63\u786E\u6269\u5C55{0}"},
-        {"extra.config.No.such.file.or.directory.",
-                "{0} (\u6CA1\u6709\u8FD9\u6837\u7684\u6587\u4EF6\u6216\u76EE\u5F55)"},
-        {"Configuration.Error.No.such.file.or.directory",
-                "\u914D\u7F6E\u9519\u8BEF:\n\t\u6CA1\u6709\u6B64\u6587\u4EF6\u6216\u76EE\u5F55"},
-        {"Configuration.Error.Invalid.control.flag.flag",
-                "\u914D\u7F6E\u9519\u8BEF: \n\t\u65E0\u6548\u7684\u63A7\u5236\u6807\u8BB0, {0}"},
-        {"Configuration.Error.Can.not.specify.multiple.entries.for.appName",
-            "\u914D\u7F6E\u9519\u8BEF:\n\t\u65E0\u6CD5\u6307\u5B9A{0}\u7684\u591A\u4E2A\u6761\u76EE"},
-        {"Configuration.Error.expected.expect.read.end.of.file.",
-                "\u914D\u7F6E\u9519\u8BEF: \n\t\u5E94\u4E3A [{0}], \u8BFB\u53D6\u7684\u662F [\u6587\u4EF6\u7ED3\u5C3E]"},
-        {"Configuration.Error.Line.line.expected.expect.found.value.",
-            "\u914D\u7F6E\u9519\u8BEF: \n\t\u884C {0}: \u5E94\u4E3A [{1}], \u627E\u5230 [{2}]"},
-        {"Configuration.Error.Line.line.expected.expect.",
-            "\u914D\u7F6E\u9519\u8BEF: \n\t\u884C {0}: \u5E94\u4E3A [{1}]"},
-        {"Configuration.Error.Line.line.system.property.value.expanded.to.empty.value",
-            "\u914D\u7F6E\u9519\u8BEF: \n\t\u884C {0}: \u7CFB\u7EDF\u5C5E\u6027 [{1}] \u6269\u5C55\u5230\u7A7A\u503C"},
-
-        // com.sun.security.auth.module.JndiLoginModule
-        {"username.","\u7528\u6237\u540D: "},
-        {"password.","\u53E3\u4EE4: "},
-
-        // com.sun.security.auth.module.KeyStoreLoginModule
-        {"Please.enter.keystore.information",
-                "\u8BF7\u8F93\u5165\u5BC6\u94A5\u5E93\u4FE1\u606F"},
-        {"Keystore.alias.","\u5BC6\u94A5\u5E93\u522B\u540D: "},
-        {"Keystore.password.","\u5BC6\u94A5\u5E93\u53E3\u4EE4: "},
-        {"Private.key.password.optional.",
-            "\u79C1\u6709\u5BC6\u94A5\u53E3\u4EE4 (\u53EF\u9009): "},
-
-        // com.sun.security.auth.module.Krb5LoginModule
-        {"Kerberos.username.defUsername.",
-                "Kerberos \u7528\u6237\u540D [{0}]: "},
-        {"Kerberos.password.for.username.",
-                "{0}\u7684 Kerberos \u53E3\u4EE4: "},
-    };
-
-    /**
-     * Returns the contents of this <code>ResourceBundle</code>.
-     *
-     * <p>
-     *
-     * @return the contents of this <code>ResourceBundle</code>.
-     */
-    public Object[][] getContents() {
-        return contents;
-    }
-}
diff --git a/src/java.base/share/classes/sun/security/util/AuthResources_zh_TW.java b/src/java.base/share/classes/sun/security/util/AuthResources_zh_TW.java
deleted file mode 100644
index 8fcf9d60ffe..00000000000
--- a/src/java.base/share/classes/sun/security/util/AuthResources_zh_TW.java
+++ /dev/null
@@ -1,110 +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.  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.util;
-
-/**
- * <p> This class represents the <code>ResourceBundle</code>
- * for the following packages:
- *
- * <ol>
- * <li> com.sun.security.auth
- * <li> com.sun.security.auth.login
- * </ol>
- *
- */
-public class AuthResources_zh_TW extends java.util.ListResourceBundle {
-
-    private static final Object[][] contents = {
-
-        // NT principals
-        {"invalid.null.input.value", "\u7121\u6548\u7A7A\u503C\u8F38\u5165: {0}"},
-        {"NTDomainPrincipal.name", "NTDomainPrincipal: {0}"},
-        {"NTNumericCredential.name", "NTNumericCredential: {0}"},
-        {"Invalid.NTSid.value", "\u7121\u6548 NTSid \u503C"},
-        {"NTSid.name", "NTSid: {0}"},
-        {"NTSidDomainPrincipal.name", "NTSidDomainPrincipal: {0}"},
-        {"NTSidGroupPrincipal.name", "NTSidGroupPrincipal: {0}"},
-        {"NTSidPrimaryGroupPrincipal.name", "NTSidPrimaryGroupPrincipal: {0}"},
-        {"NTSidUserPrincipal.name", "NTSidUserPrincipal: {0}"},
-        {"NTUserPrincipal.name", "NTUserPrincipal: {0}"},
-
-        // UnixPrincipals
-        {"UnixNumericGroupPrincipal.Primary.Group.name",
-                "UnixNumericGroupPrincipal [\u4E3B\u7FA4\u7D44]: {0}"},
-        {"UnixNumericGroupPrincipal.Supplementary.Group.name",
-                "UnixNumericGroupPrincipal [\u9644\u52A0\u7FA4\u7D44]: {0}"},
-        {"UnixNumericUserPrincipal.name", "UnixNumericUserPrincipal: {0}"},
-        {"UnixPrincipal.name", "UnixPrincipal: {0}"},
-
-        // com.sun.security.auth.login.ConfigFile
-        {"Unable.to.properly.expand.config", "\u7121\u6CD5\u9069\u7576\u5730\u64F4\u5145 {0}"},
-        {"extra.config.No.such.file.or.directory.",
-                "{0} (\u6C92\u6709\u6B64\u6A94\u6848\u6216\u76EE\u9304)"},
-        {"Configuration.Error.No.such.file.or.directory",
-                "\u7D44\u614B\u932F\u8AA4:\n\t\u7121\u6B64\u6A94\u6848\u6216\u76EE\u9304"},
-        {"Configuration.Error.Invalid.control.flag.flag",
-                "\u7D44\u614B\u932F\u8AA4:\n\t\u7121\u6548\u7684\u63A7\u5236\u65D7\u6A19\uFF0C{0}"},
-        {"Configuration.Error.Can.not.specify.multiple.entries.for.appName",
-            "\u7D44\u614B\u932F\u8AA4: \n\t\u7121\u6CD5\u6307\u5B9A\u591A\u91CD\u9805\u76EE {0}"},
-        {"Configuration.Error.expected.expect.read.end.of.file.",
-                "\u7D44\u614B\u932F\u8AA4: \n\t\u9810\u671F\u7684 [{0}], \u8B80\u53D6 [end of file]"},
-        {"Configuration.Error.Line.line.expected.expect.found.value.",
-            "\u7D44\u614B\u932F\u8AA4: \n\t\u884C {0}: \u9810\u671F\u7684 [{1}], \u767C\u73FE [{2}]"},
-        {"Configuration.Error.Line.line.expected.expect.",
-            "\u7D44\u614B\u932F\u8AA4: \n\t\u884C {0}: \u9810\u671F\u7684 [{1}]"},
-        {"Configuration.Error.Line.line.system.property.value.expanded.to.empty.value",
-            "\u7D44\u614B\u932F\u8AA4: \n\t\u884C {0}: \u7CFB\u7D71\u5C6C\u6027 [{1}] \u64F4\u5145\u81F3\u7A7A\u503C"},
-
-        // com.sun.security.auth.module.JndiLoginModule
-        {"username.","\u4F7F\u7528\u8005\u540D\u7A31: "},
-        {"password.","\u5BC6\u78BC: "},
-
-        // com.sun.security.auth.module.KeyStoreLoginModule
-        {"Please.enter.keystore.information",
-                "\u8ACB\u8F38\u5165\u91D1\u9470\u5132\u5B58\u5EAB\u8CC7\u8A0A"},
-        {"Keystore.alias.","\u91D1\u9470\u5132\u5B58\u5EAB\u5225\u540D: "},
-        {"Keystore.password.","\u91D1\u9470\u5132\u5B58\u5EAB\u5BC6\u78BC: "},
-        {"Private.key.password.optional.",
-            "\u79C1\u4EBA\u91D1\u9470\u5BC6\u78BC (\u9078\u64C7\u6027\u7684): "},
-
-        // com.sun.security.auth.module.Krb5LoginModule
-        {"Kerberos.username.defUsername.",
-                "Kerberos \u4F7F\u7528\u8005\u540D\u7A31 [{0}]: "},
-        {"Kerberos.password.for.username.",
-                "Kerberos \u5BC6\u78BC {0}: "},
-    };
-
-    /**
-     * Returns the contents of this <code>ResourceBundle</code>.
-     *
-     * <p>
-     *
-     * @return the contents of this <code>ResourceBundle</code>.
-     */
-    public Object[][] getContents() {
-        return contents;
-    }
-}
diff --git a/src/java.base/share/classes/sun/security/util/LocalizedMessage.java b/src/java.base/share/classes/sun/security/util/LocalizedMessage.java
index ffe092a6b6d..61062bf6e1a 100644
--- a/src/java.base/share/classes/sun/security/util/LocalizedMessage.java
+++ b/src/java.base/share/classes/sun/security/util/LocalizedMessage.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,8 @@
 
 package sun.security.util;
 
+import java.util.ListResourceBundle;
+
 /**
  * This class produces formatted and localized messages describing security
  * issues. Some messages may be required when the VM is not fully booted. In
@@ -42,7 +44,8 @@ package sun.security.util;
 
 public class LocalizedMessage {
 
-    private static final Resources RESOURCES = new Resources();
+    private static final ListResourceBundle RESOURCES =
+            new sun.security.util.resources.security();
 
     private final String key;
 
@@ -73,7 +76,7 @@ public class LocalizedMessage {
     /**
      * Return a non-localized string corresponding to the key stored in this
      * object, formatted with the provided arguments. All strings are obtained
-     * from sun.security.util.Resources, and the formatting only supports
+     * from sun.security.util.resources, and the formatting only supports
      * simple positional argument replacement (e.g. {1}).
      *
      * @param arguments The arguments that should be placed in the message
@@ -86,10 +89,10 @@ public class LocalizedMessage {
     /**
      * Return a non-localized string corresponding to the provided key, and
      * formatted with the provided arguments. All strings are obtained from
-     * sun.security.util.Resources, and the formatting only supports
+     * sun.security.util.resources, and the formatting only supports
      * simple positional argument replacement (e.g. {1}).
      *
-     * @param key The key of the desired string in Resources
+     * @param key The key of the desired string in resources
      * @param arguments The arguments that should be placed in the message
      * @return A formatted message string
      */
diff --git a/src/java.base/share/classes/sun/security/util/Resources.java b/src/java.base/share/classes/sun/security/util/Resources.java
deleted file mode 100644
index 679e0ea6aa5..00000000000
--- a/src/java.base/share/classes/sun/security/util/Resources.java
+++ /dev/null
@@ -1,119 +0,0 @@
-/*
- * Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  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.util;
-
-/**
- * This class represents the <code>ResourceBundle</code>
- * for javax.security.auth and sun.security.
- *
- */
-public class Resources extends java.util.ListResourceBundle {
-
-    private static final Object[][] contents = {
-
-        // javax.security.auth.PrivateCredentialPermission
-        {"invalid.null.input.s.", "invalid null input(s)"},
-        {"actions.can.only.be.read.", "actions can only be 'read'"},
-        {"permission.name.name.syntax.invalid.",
-                "permission name [{0}] syntax invalid: "},
-        {"Credential.Class.not.followed.by.a.Principal.Class.and.Name",
-                "Credential Class not followed by a Principal Class and Name"},
-        {"Principal.Class.not.followed.by.a.Principal.Name",
-                "Principal Class not followed by a Principal Name"},
-        {"Principal.Name.must.be.surrounded.by.quotes",
-                "Principal Name must be surrounded by quotes"},
-        {"Principal.Name.missing.end.quote",
-                "Principal Name missing end quote"},
-        {"PrivateCredentialPermission.Principal.Class.can.not.be.a.wildcard.value.if.Principal.Name.is.not.a.wildcard.value",
-                "PrivateCredentialPermission Principal Class can not be a wildcard (*) value if Principal Name is not a wildcard (*) value"},
-        {"CredOwner.Principal.Class.class.Principal.Name.name",
-                "CredOwner:\n\tPrincipal Class = {0}\n\tPrincipal Name = {1}"},
-
-        // javax.security.auth.x500
-        {"provided.null.name", "provided null name"},
-        {"provided.null.keyword.map", "provided null keyword map"},
-        {"provided.null.OID.map", "provided null OID map"},
-
-        // javax.security.auth.Subject
-        {"NEWLINE", "\n"},
-        {"invalid.null.action.provided", "invalid null action provided"},
-        {"invalid.null.Class.provided", "invalid null Class provided"},
-        {"Subject.", "Subject:\n"},
-        {".Principal.", "\tPrincipal: "},
-        {".Public.Credential.", "\tPublic Credential: "},
-        {".Private.Credential.", "\tPrivate Credential: "},
-        {".Private.Credential.inaccessible.",
-                "\tPrivate Credential inaccessible\n"},
-        {"Subject.is.read.only", "Subject is read-only"},
-        {"attempting.to.add.an.object.which.is.not.an.instance.of.java.security.Principal.to.a.Subject.s.Principal.Set",
-                "attempting to add an object which is not an instance of java.security.Principal to a Subject's Principal Set"},
-        {"attempting.to.add.an.object.which.is.not.an.instance.of.class",
-                "attempting to add an object which is not an instance of {0}"},
-
-        // javax.security.auth.login.AppConfigurationEntry
-        {"LoginModuleControlFlag.", "LoginModuleControlFlag: "},
-
-        // javax.security.auth.login.LoginContext
-        {"Invalid.null.input.name", "Invalid null input: name"},
-        {"No.LoginModules.configured.for.name",
-         "No LoginModules configured for {0}"},
-        {"invalid.null.Subject.provided", "invalid null Subject provided"},
-        {"invalid.null.CallbackHandler.provided",
-                "invalid null CallbackHandler provided"},
-        {"null.subject.logout.called.before.login",
-                "null subject - logout called before login"},
-        {"Login.Failure.all.modules.ignored",
-                "Login Failure: all modules ignored"},
-
-        // sun.security.provider.PolicyParser
-        {"duplicate.keystore.domain.name","duplicate keystore domain name: {0}"},
-        {"duplicate.keystore.name","duplicate keystore name: {0}"},
-        {"number.", "number "},
-        {"expected.expect.read.end.of.file.",
-                "expected [{0}], read [end of file]"},
-        {"expected.read.end.of.file.",
-                "expected [;], read [end of file]"},
-        {"line.number.msg", "line {0}: {1}"},
-        {"line.number.expected.expect.found.actual.",
-                "line {0}: expected [{1}], found [{2}]"},
-
-        // sun.security.pkcs11.SunPKCS11
-        {"PKCS11.Token.providerName.Password.",
-                "PKCS11 Token [{0}] Password: "},
-    };
-
-
-    /**
-     * Returns the contents of this <code>ResourceBundle</code>.
-     *
-     * @return the contents of this <code>ResourceBundle</code>.
-     */
-    @Override
-    public Object[][] getContents() {
-        return contents;
-    }
-}
-
diff --git a/src/java.base/share/classes/sun/security/util/ResourcesMgr.java b/src/java.base/share/classes/sun/security/util/ResourcesMgr.java
index f2b6fd2c9c0..df387cbed7a 100644
--- a/src/java.base/share/classes/sun/security/util/ResourcesMgr.java
+++ b/src/java.base/share/classes/sun/security/util/ResourcesMgr.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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,11 +37,11 @@ public class ResourcesMgr {
     private static final Map<String, ResourceBundle> bundles = new ConcurrentHashMap<>();
 
     public static String getString(String s) {
-        return getBundle("sun.security.util.Resources").getString(s);
+        return getBundle("sun.security.util.resources.security").getString(s);
     }
 
     public static String getAuthResourceString(String s) {
-        return getBundle("sun.security.util.AuthResources").getString(s);
+        return getBundle("sun.security.util.resources.auth").getString(s);
     }
 
     private static ResourceBundle getBundle(String bundleName) {
diff --git a/src/java.base/share/classes/sun/security/util/Resources_de.java b/src/java.base/share/classes/sun/security/util/Resources_de.java
deleted file mode 100644
index 0ff218d6390..00000000000
--- a/src/java.base/share/classes/sun/security/util/Resources_de.java
+++ /dev/null
@@ -1,119 +0,0 @@
-/*
- * Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  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.util;
-
-/**
- * This class represents the <code>ResourceBundle</code>
- * for javax.security.auth and sun.security.
- *
- */
-public class Resources_de extends java.util.ListResourceBundle {
-
-    private static final Object[][] contents = {
-
-        // javax.security.auth.PrivateCredentialPermission
-        {"invalid.null.input.s.", "Ung\u00FCltige Nulleingabe(n)"},
-        {"actions.can.only.be.read.", "Aktionen k\u00F6nnen nur \"lesen\" sein"},
-        {"permission.name.name.syntax.invalid.",
-                "Syntax f\u00FCr Berechtigungsnamen [{0}] ung\u00FCltig: "},
-        {"Credential.Class.not.followed.by.a.Principal.Class.and.Name",
-                "Nach Zugangsdatenklasse folgt keine Principal-Klasse und kein Name"},
-        {"Principal.Class.not.followed.by.a.Principal.Name",
-                "Nach Principal-Klasse folgt kein Principal-Name"},
-        {"Principal.Name.must.be.surrounded.by.quotes",
-                "Principal-Name muss in Anf\u00FChrungszeichen stehen"},
-        {"Principal.Name.missing.end.quote",
-                "Abschlie\u00DFendes Anf\u00FChrungszeichen f\u00FCr Principal-Name fehlt"},
-        {"PrivateCredentialPermission.Principal.Class.can.not.be.a.wildcard.value.if.Principal.Name.is.not.a.wildcard.value",
-                "Principal-Klasse PrivateCredentialPermission kann kein Platzhalterwert (*) sein, wenn der Principal-Name kein Platzhalterwert (*) ist"},
-        {"CredOwner.Principal.Class.class.Principal.Name.name",
-                "CredOwner:\n\tPrincipal-Klasse = {0}\n\tPrincipal-Name = {1}"},
-
-        // javax.security.auth.x500
-        {"provided.null.name", "Nullname angegeben"},
-        {"provided.null.keyword.map", "Null-Schl\u00FCsselwortzuordnung angegeben"},
-        {"provided.null.OID.map", "Null-OID-Zuordnung angegeben"},
-
-        // javax.security.auth.Subject
-        {"NEWLINE", "\n"},
-        {"invalid.null.action.provided", "Ung\u00FCltige Nullaktion angegeben"},
-        {"invalid.null.Class.provided", "Ung\u00FCltige Nullklasse angegeben"},
-        {"Subject.", "Subjekt:\n"},
-        {".Principal.", "\tPrincipal: "},
-        {".Public.Credential.", "\t\u00D6ffentliche Zugangsdaten: "},
-        {".Private.Credential.", "\tPrivate Zugangsdaten: "},
-        {".Private.Credential.inaccessible.",
-                "\tKein Zugriff auf private Zugangsdaten\n"},
-        {"Subject.is.read.only", "Subjekt ist schreibgesch\u00FCtzt"},
-        {"attempting.to.add.an.object.which.is.not.an.instance.of.java.security.Principal.to.a.Subject.s.Principal.Set",
-                "Es wird versucht, ein Objekt hinzuzuf\u00FCgen, das keine Instanz von java.security.Principal f\u00FCr eine Principal-Gruppe eines Subjekts ist"},
-        {"attempting.to.add.an.object.which.is.not.an.instance.of.class",
-                "Es wird versucht, ein Objekt hinzuzuf\u00FCgen, das keine Instanz von {0} ist"},
-
-        // javax.security.auth.login.AppConfigurationEntry
-        {"LoginModuleControlFlag.", "LoginModuleControlFlag: "},
-
-        // javax.security.auth.login.LoginContext
-        {"Invalid.null.input.name", "Ung\u00FCltige Nulleingabe: Name"},
-        {"No.LoginModules.configured.for.name",
-         "F\u00FCr {0} sind keine LoginModules konfiguriert"},
-        {"invalid.null.Subject.provided", "Ung\u00FCltiges Nullsubjekt angegeben"},
-        {"invalid.null.CallbackHandler.provided",
-                "Ung\u00FCltiger Nullwert f\u00FCr CallbackHandler angegeben"},
-        {"null.subject.logout.called.before.login",
-                "Nullsubjekt - Abmeldung vor Anmeldung aufgerufen"},
-        {"Login.Failure.all.modules.ignored",
-                "Anmeldefehler: Alle Module werden ignoriert"},
-
-        // sun.security.provider.PolicyParser
-        {"duplicate.keystore.domain.name","Keystore-Domainname doppelt vorhanden: {0}"},
-        {"duplicate.keystore.name","Keystore-Name doppelt vorhanden: {0}"},
-        {"number.", "Nummer "},
-        {"expected.expect.read.end.of.file.",
-                "[{0}] erwartet, [Dateiende] gelesen"},
-        {"expected.read.end.of.file.",
-                "[;] erwartet, [Dateiende] gelesen"},
-        {"line.number.msg", "Zeile {0}: {1}"},
-        {"line.number.expected.expect.found.actual.",
-                "Zeile {0}: [{1}] erwartet, [{2}] gefunden"},
-
-        // sun.security.pkcs11.SunPKCS11
-        {"PKCS11.Token.providerName.Password.",
-                "Kennwort f\u00FCr PKCS11-Token [{0}]: "},
-    };
-
-
-    /**
-     * Returns the contents of this <code>ResourceBundle</code>.
-     *
-     * @return the contents of this <code>ResourceBundle</code>.
-     */
-    @Override
-    public Object[][] getContents() {
-        return contents;
-    }
-}
-
diff --git a/src/java.base/share/classes/sun/security/util/Resources_es.java b/src/java.base/share/classes/sun/security/util/Resources_es.java
deleted file mode 100644
index 334a059b19c..00000000000
--- a/src/java.base/share/classes/sun/security/util/Resources_es.java
+++ /dev/null
@@ -1,171 +0,0 @@
-/*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package sun.security.util;
-
-/**
- * This class represents the <code>ResourceBundle</code>
- * for javax.security.auth and sun.security.
- *
- */
-public class Resources_es extends java.util.ListResourceBundle {
-
-    private static final Object[][] contents = {
-
-        // javax.security.auth.PrivateCredentialPermission
-        {"invalid.null.input.s.", "entradas nulas no v\u00E1lidas"},
-        {"actions.can.only.be.read.", "las acciones s\u00F3lo pueden 'leerse'"},
-        {"permission.name.name.syntax.invalid.",
-                "sintaxis de nombre de permiso [{0}] no v\u00E1lida: "},
-        {"Credential.Class.not.followed.by.a.Principal.Class.and.Name",
-                "La clase de credencial no va seguida de una clase y nombre de principal"},
-        {"Principal.Class.not.followed.by.a.Principal.Name",
-                "La clase de principal no va seguida de un nombre de principal"},
-        {"Principal.Name.must.be.surrounded.by.quotes",
-                "El nombre de principal debe ir entre comillas"},
-        {"Principal.Name.missing.end.quote",
-                "Faltan las comillas finales en el nombre de principal"},
-        {"PrivateCredentialPermission.Principal.Class.can.not.be.a.wildcard.value.if.Principal.Name.is.not.a.wildcard.value",
-                "La clase de principal PrivateCredentialPermission no puede ser un valor comod\u00EDn (*) si el nombre de principal no lo es tambi\u00E9n"},
-        {"CredOwner.Principal.Class.class.Principal.Name.name",
-                "CredOwner:\n\tClase de Principal = {0}\n\tNombre de Principal = {1}"},
-
-        // javax.security.auth.x500
-        {"provided.null.name", "se ha proporcionado un nombre nulo"},
-        {"provided.null.keyword.map", "mapa de palabras clave proporcionado nulo"},
-        {"provided.null.OID.map", "mapa de OID proporcionado nulo"},
-
-        // javax.security.auth.Subject
-        {"NEWLINE", "\n"},
-        {"invalid.null.AccessControlContext.provided",
-                "se ha proporcionado un AccessControlContext nulo no v\u00E1lido"},
-        {"invalid.null.action.provided", "se ha proporcionado una acci\u00F3n nula no v\u00E1lida"},
-        {"invalid.null.Class.provided", "se ha proporcionado una clase nula no v\u00E1lida"},
-        {"Subject.", "Asunto:\n"},
-        {".Principal.", "\tPrincipal: "},
-        {".Public.Credential.", "\tCredencial P\u00FAblica: "},
-        {".Private.Credentials.inaccessible.",
-                "\tCredenciales Privadas Inaccesibles\n"},
-        {".Private.Credential.", "\tCredencial Privada: "},
-        {".Private.Credential.inaccessible.",
-                "\tCredencial Privada Inaccesible\n"},
-        {"Subject.is.read.only", "El asunto es de s\u00F3lo lectura"},
-        {"attempting.to.add.an.object.which.is.not.an.instance.of.java.security.Principal.to.a.Subject.s.Principal.Set",
-                "intentando agregar un objeto que no es una instancia de java.security.Principal al juego principal de un asunto"},
-        {"attempting.to.add.an.object.which.is.not.an.instance.of.class",
-                "intentando agregar un objeto que no es una instancia de {0}"},
-
-        // javax.security.auth.login.AppConfigurationEntry
-        {"LoginModuleControlFlag.", "LoginModuleControlFlag: "},
-
-        // javax.security.auth.login.LoginContext
-        {"Invalid.null.input.name", "Entrada nula no v\u00E1lida: nombre"},
-        {"No.LoginModules.configured.for.name",
-         "No se han configurado LoginModules para {0}"},
-        {"invalid.null.Subject.provided", "se ha proporcionado un asunto nulo no v\u00E1lido"},
-        {"invalid.null.CallbackHandler.provided",
-                "se ha proporcionado CallbackHandler nulo no v\u00E1lido"},
-        {"null.subject.logout.called.before.login",
-                "asunto nulo - se ha llamado al cierre de sesi\u00F3n antes del inicio de sesi\u00F3n"},
-        {"unable.to.instantiate.LoginModule.module.because.it.does.not.provide.a.no.argument.constructor",
-                "no se ha podido instanciar LoginModule, {0}, porque no incluye un constructor sin argumentos"},
-        {"unable.to.instantiate.LoginModule",
-                "no se ha podido instanciar LoginModule"},
-        {"unable.to.instantiate.LoginModule.",
-                "no se ha podido instanciar LoginModule: "},
-        {"unable.to.find.LoginModule.class.",
-                "no se ha encontrado la clase LoginModule: "},
-        {"unable.to.access.LoginModule.",
-                "no se ha podido acceder a LoginModule: "},
-        {"Login.Failure.all.modules.ignored",
-                "Fallo en inicio de sesi\u00F3n: se han ignorado todos los m\u00F3dulos"},
-
-        // sun.security.provider.PolicyFile
-
-        {"java.security.policy.error.parsing.policy.message",
-                "java.security.policy: error de an\u00E1lisis de {0}:\n\t{1}"},
-        {"java.security.policy.error.adding.Permission.perm.message",
-                "java.security.policy: error al agregar un permiso, {0}:\n\t{1}"},
-        {"java.security.policy.error.adding.Entry.message",
-                "java.security.policy: error al agregar una entrada:\n\t{0}"},
-        {"alias.name.not.provided.pe.name.", "no se ha proporcionado el nombre de alias ({0})"},
-        {"unable.to.perform.substitution.on.alias.suffix",
-                "no se puede realizar la sustituci\u00F3n en el alias, {0}"},
-        {"substitution.value.prefix.unsupported",
-                "valor de sustituci\u00F3n, {0}, no soportado"},
-        {"SPACE", " "},
-        {"LPARAM", "("},
-        {"RPARAM", ")"},
-        {"type.can.t.be.null","el tipo no puede ser nulo"},
-
-        // sun.security.provider.PolicyParser
-        {"keystorePasswordURL.can.not.be.specified.without.also.specifying.keystore",
-                "keystorePasswordURL no puede especificarse sin especificar tambi\u00E9n el almac\u00E9n de claves"},
-        {"expected.keystore.type", "se esperaba un tipo de almac\u00E9n de claves"},
-        {"expected.keystore.provider", "se esperaba un proveedor de almac\u00E9n de claves"},
-        {"multiple.Codebase.expressions",
-                "expresiones m\u00FAltiples de CodeBase"},
-        {"multiple.SignedBy.expressions","expresiones m\u00FAltiples de SignedBy"},
-        {"duplicate.keystore.domain.name","nombre de dominio de almac\u00E9n de claves duplicado: {0}"},
-        {"duplicate.keystore.name","nombre de almac\u00E9n de claves duplicado: {0}"},
-        {"SignedBy.has.empty.alias","SignedBy tiene un alias vac\u00EDo"},
-        {"can.not.specify.Principal.with.a.wildcard.class.without.a.wildcard.name",
-                "no se puede especificar Principal con una clase de comod\u00EDn sin un nombre de comod\u00EDn"},
-        {"expected.codeBase.or.SignedBy.or.Principal",
-                "se esperaba codeBase o SignedBy o Principal"},
-        {"expected.permission.entry", "se esperaba un permiso de entrada"},
-        {"number.", "n\u00FAmero "},
-        {"expected.expect.read.end.of.file.",
-                "se esperaba [{0}], se ha le\u00EDdo [final de archivo]"},
-        {"expected.read.end.of.file.",
-                "se esperaba [;], se ha le\u00EDdo [final de archivo]"},
-        {"line.number.msg", "l\u00EDnea {0}: {1}"},
-        {"line.number.expected.expect.found.actual.",
-                "l\u00EDnea {0}: se esperaba [{1}], se ha encontrado [{2}]"},
-        {"null.principalClass.or.principalName",
-                "principalClass o principalName nulos"},
-
-        // sun.security.pkcs11.SunPKCS11
-        {"PKCS11.Token.providerName.Password.",
-                "Contrase\u00F1a del Token PKCS11 [{0}]: "},
-
-        /* --- DEPRECATED --- */
-        // javax.security.auth.Policy
-        {"unable.to.instantiate.Subject.based.policy",
-                "no se ha podido instanciar una pol\u00EDtica basada en asunto"}
-    };
-
-
-    /**
-     * Returns the contents of this <code>ResourceBundle</code>.
-     *
-     * @return the contents of this <code>ResourceBundle</code>.
-     */
-    @Override
-    public Object[][] getContents() {
-        return contents;
-    }
-}
-
diff --git a/src/java.base/share/classes/sun/security/util/Resources_fr.java b/src/java.base/share/classes/sun/security/util/Resources_fr.java
deleted file mode 100644
index c924d9b1913..00000000000
--- a/src/java.base/share/classes/sun/security/util/Resources_fr.java
+++ /dev/null
@@ -1,171 +0,0 @@
-/*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package sun.security.util;
-
-/**
- * This class represents the <code>ResourceBundle</code>
- * for javax.security.auth and sun.security.
- *
- */
-public class Resources_fr extends java.util.ListResourceBundle {
-
-    private static final Object[][] contents = {
-
-        // javax.security.auth.PrivateCredentialPermission
-        {"invalid.null.input.s.", "entr\u00E9es NULL non valides"},
-        {"actions.can.only.be.read.", "les actions sont accessibles en lecture uniquement"},
-        {"permission.name.name.syntax.invalid.",
-                "syntaxe de nom de droit [{0}] non valide : "},
-        {"Credential.Class.not.followed.by.a.Principal.Class.and.Name",
-                "Classe Credential non suivie d'une classe et d'un nom de principal"},
-        {"Principal.Class.not.followed.by.a.Principal.Name",
-                "Classe de principal non suivie d'un nom de principal"},
-        {"Principal.Name.must.be.surrounded.by.quotes",
-                "Le nom de principal doit \u00EAtre indiqu\u00E9 entre guillemets"},
-        {"Principal.Name.missing.end.quote",
-                "Guillemet fermant manquant pour le nom de principal"},
-        {"PrivateCredentialPermission.Principal.Class.can.not.be.a.wildcard.value.if.Principal.Name.is.not.a.wildcard.value",
-                "La classe de principal PrivateCredentialPermission ne peut pas \u00EAtre une valeur g\u00E9n\u00E9rique (*) si le nom de principal n'est pas une valeur g\u00E9n\u00E9rique (*)"},
-        {"CredOwner.Principal.Class.class.Principal.Name.name",
-                "CredOwner :\n\tClasse de principal = {0}\n\tNom de principal = {1}"},
-
-        // javax.security.auth.x500
-        {"provided.null.name", "nom NULL fourni"},
-        {"provided.null.keyword.map", "mappage de mots-cl\u00E9s NULL fourni"},
-        {"provided.null.OID.map", "mappage OID NULL fourni"},
-
-        // javax.security.auth.Subject
-        {"NEWLINE", "\n"},
-        {"invalid.null.AccessControlContext.provided",
-                "AccessControlContext NULL fourni non valide"},
-        {"invalid.null.action.provided", "action NULL fournie non valide"},
-        {"invalid.null.Class.provided", "classe NULL fournie non valide"},
-        {"Subject.", "Objet :\n"},
-        {".Principal.", "\tPrincipal : "},
-        {".Public.Credential.", "\tInformations d'identification publiques : "},
-        {".Private.Credentials.inaccessible.",
-                "\tInformations d'identification priv\u00E9es inaccessibles\n"},
-        {".Private.Credential.", "\tInformations d'identification priv\u00E9es : "},
-        {".Private.Credential.inaccessible.",
-                "\tInformations d'identification priv\u00E9es inaccessibles\n"},
-        {"Subject.is.read.only", "Sujet en lecture seule"},
-        {"attempting.to.add.an.object.which.is.not.an.instance.of.java.security.Principal.to.a.Subject.s.Principal.Set",
-                "tentative d'ajout d'un objet qui n'est pas une instance de java.security.Principal dans un ensemble de principaux du sujet"},
-        {"attempting.to.add.an.object.which.is.not.an.instance.of.class",
-                "tentative d''ajout d''un objet qui n''est pas une instance de {0}"},
-
-        // javax.security.auth.login.AppConfigurationEntry
-        {"LoginModuleControlFlag.", "LoginModuleControlFlag : "},
-
-        // javax.security.auth.login.LoginContext
-        {"Invalid.null.input.name", "Entr\u00E9e NULL non valide : nom"},
-        {"No.LoginModules.configured.for.name",
-         "Aucun LoginModule configur\u00E9 pour {0}"},
-        {"invalid.null.Subject.provided", "sujet NULL fourni non valide"},
-        {"invalid.null.CallbackHandler.provided",
-                "CallbackHandler NULL fourni non valide"},
-        {"null.subject.logout.called.before.login",
-                "sujet NULL - Tentative de d\u00E9connexion avant la connexion"},
-        {"unable.to.instantiate.LoginModule.module.because.it.does.not.provide.a.no.argument.constructor",
-                "impossible d''instancier LoginModule {0} car il ne fournit pas de constructeur sans argument"},
-        {"unable.to.instantiate.LoginModule",
-                "impossible d'instancier LoginModule"},
-        {"unable.to.instantiate.LoginModule.",
-                "impossible d'instancier LoginModule\u00A0: "},
-        {"unable.to.find.LoginModule.class.",
-                "classe LoginModule introuvable : "},
-        {"unable.to.access.LoginModule.",
-                "impossible d'acc\u00E9der \u00E0 LoginModule : "},
-        {"Login.Failure.all.modules.ignored",
-                "Echec de connexion : tous les modules ont \u00E9t\u00E9 ignor\u00E9s"},
-
-        // sun.security.provider.PolicyFile
-
-        {"java.security.policy.error.parsing.policy.message",
-                "java.security.policy : erreur d''analyse de {0} :\n\t{1}"},
-        {"java.security.policy.error.adding.Permission.perm.message",
-                "java.security.policy : erreur d''ajout de droit, {0} :\n\t{1}"},
-        {"java.security.policy.error.adding.Entry.message",
-                "java.security.policy : erreur d''ajout d''entr\u00E9e :\n\t{0}"},
-        {"alias.name.not.provided.pe.name.", "nom d''alias non fourni ({0})"},
-        {"unable.to.perform.substitution.on.alias.suffix",
-                "impossible d''effectuer une substitution pour l''alias, {0}"},
-        {"substitution.value.prefix.unsupported",
-                "valeur de substitution, {0}, non prise en charge"},
-        {"SPACE", " "},
-        {"LPARAM", "("},
-        {"RPARAM", ")"},
-        {"type.can.t.be.null","le type ne peut \u00EAtre NULL"},
-
-        // sun.security.provider.PolicyParser
-        {"keystorePasswordURL.can.not.be.specified.without.also.specifying.keystore",
-                "Impossible de sp\u00E9cifier keystorePasswordURL sans indiquer aussi le fichier de cl\u00E9s"},
-        {"expected.keystore.type", "type de fichier de cl\u00E9s attendu"},
-        {"expected.keystore.provider", "fournisseur de fichier de cl\u00E9s attendu"},
-        {"multiple.Codebase.expressions",
-                "expressions Codebase multiples"},
-        {"multiple.SignedBy.expressions","expressions SignedBy multiples"},
-        {"duplicate.keystore.domain.name","nom de domaine de fichier de cl\u00E9s en double : {0}"},
-        {"duplicate.keystore.name","nom de fichier de cl\u00E9s en double : {0}"},
-        {"SignedBy.has.empty.alias","SignedBy poss\u00E8de un alias vide"},
-        {"can.not.specify.Principal.with.a.wildcard.class.without.a.wildcard.name",
-                "impossible de sp\u00E9cifier le principal avec une classe g\u00E9n\u00E9rique sans nom g\u00E9n\u00E9rique"},
-        {"expected.codeBase.or.SignedBy.or.Principal",
-                "codeBase, SignedBy ou Principal attendu"},
-        {"expected.permission.entry", "entr\u00E9e de droit attendue"},
-        {"number.", "nombre "},
-        {"expected.expect.read.end.of.file.",
-                "attendu [{0}], lu [fin de fichier]"},
-        {"expected.read.end.of.file.",
-                "attendu [;], lu [fin de fichier]"},
-        {"line.number.msg", "ligne {0} : {1}"},
-        {"line.number.expected.expect.found.actual.",
-                "ligne {0} : attendu [{1}], trouv\u00E9 [{2}]"},
-        {"null.principalClass.or.principalName",
-                "principalClass ou principalName NULL"},
-
-        // sun.security.pkcs11.SunPKCS11
-        {"PKCS11.Token.providerName.Password.",
-                "Mot de passe PKCS11 Token [{0}] : "},
-
-        /* --- DEPRECATED --- */
-        // javax.security.auth.Policy
-        {"unable.to.instantiate.Subject.based.policy",
-                "impossible d'instancier les r\u00E8gles bas\u00E9es sur le sujet"}
-    };
-
-
-    /**
-     * Returns the contents of this <code>ResourceBundle</code>.
-     *
-     * @return the contents of this <code>ResourceBundle</code>.
-     */
-    @Override
-    public Object[][] getContents() {
-        return contents;
-    }
-}
-
diff --git a/src/java.base/share/classes/sun/security/util/Resources_it.java b/src/java.base/share/classes/sun/security/util/Resources_it.java
deleted file mode 100644
index 9a1cbe4cacf..00000000000
--- a/src/java.base/share/classes/sun/security/util/Resources_it.java
+++ /dev/null
@@ -1,171 +0,0 @@
-/*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package sun.security.util;
-
-/**
- * This class represents the <code>ResourceBundle</code>
- * for javax.security.auth and sun.security.
- *
- */
-public class Resources_it extends java.util.ListResourceBundle {
-
-    private static final Object[][] contents = {
-
-        // javax.security.auth.PrivateCredentialPermission
-        {"invalid.null.input.s.", "input nullo/i non valido/i"},
-        {"actions.can.only.be.read.", "le azioni possono essere solamente 'lette'"},
-        {"permission.name.name.syntax.invalid.",
-                "sintassi [{0}] non valida per il nome autorizzazione: "},
-        {"Credential.Class.not.followed.by.a.Principal.Class.and.Name",
-                "la classe di credenziali non \u00E8 seguita da un nome e una classe di principal"},
-        {"Principal.Class.not.followed.by.a.Principal.Name",
-                "la classe di principal non \u00E8 seguita da un nome principal"},
-        {"Principal.Name.must.be.surrounded.by.quotes",
-                "il nome principal deve essere compreso tra apici"},
-        {"Principal.Name.missing.end.quote",
-                "apice di chiusura del nome principal mancante"},
-        {"PrivateCredentialPermission.Principal.Class.can.not.be.a.wildcard.value.if.Principal.Name.is.not.a.wildcard.value",
-                "la classe principal PrivateCredentialPermission non pu\u00F2 essere un valore carattere jolly (*) se il nome principal a sua volta non \u00E8 un valore carattere jolly (*)"},
-        {"CredOwner.Principal.Class.class.Principal.Name.name",
-                "CredOwner:\n\tclasse Principal = {0}\n\tNome Principal = {1}"},
-
-        // javax.security.auth.x500
-        {"provided.null.name", "il nome fornito \u00E8 nullo"},
-        {"provided.null.keyword.map", "specificata mappa parole chiave null"},
-        {"provided.null.OID.map", "specificata mappa OID null"},
-
-        // javax.security.auth.Subject
-        {"NEWLINE", "\n"},
-        {"invalid.null.AccessControlContext.provided",
-                "fornito un valore nullo non valido per AccessControlContext"},
-        {"invalid.null.action.provided", "fornita un'azione nulla non valida"},
-        {"invalid.null.Class.provided", "fornita una classe nulla non valida"},
-        {"Subject.", "Oggetto:\n"},
-        {".Principal.", "\tPrincipal: "},
-        {".Public.Credential.", "\tCredenziale pubblica: "},
-        {".Private.Credentials.inaccessible.",
-                "\tImpossibile accedere alle credenziali private\n"},
-        {".Private.Credential.", "\tCredenziale privata: "},
-        {".Private.Credential.inaccessible.",
-                "\tImpossibile accedere alla credenziale privata\n"},
-        {"Subject.is.read.only", "L'oggetto \u00E8 di sola lettura"},
-        {"attempting.to.add.an.object.which.is.not.an.instance.of.java.security.Principal.to.a.Subject.s.Principal.Set",
-                "si \u00E8 tentato di aggiungere un oggetto che non \u00E8 un'istanza di java.security.Principal a un set principal dell'oggetto"},
-        {"attempting.to.add.an.object.which.is.not.an.instance.of.class",
-                "si \u00E8 tentato di aggiungere un oggetto che non \u00E8 un''istanza di {0}"},
-
-        // javax.security.auth.login.AppConfigurationEntry
-        {"LoginModuleControlFlag.", "LoginModuleControlFlag: "},
-
-        // javax.security.auth.login.LoginContext
-        {"Invalid.null.input.name", "Input nullo non valido: nome"},
-        {"No.LoginModules.configured.for.name",
-         "Nessun LoginModules configurato per {0}"},
-        {"invalid.null.Subject.provided", "fornito un valore nullo non valido per l'oggetto"},
-        {"invalid.null.CallbackHandler.provided",
-                "fornito un valore nullo non valido per CallbackHandler"},
-        {"null.subject.logout.called.before.login",
-                "oggetto nullo - il logout \u00E8 stato richiamato prima del login"},
-        {"unable.to.instantiate.LoginModule.module.because.it.does.not.provide.a.no.argument.constructor",
-                "impossibile creare un''istanza di LoginModule {0} in quanto non restituisce un argomento vuoto per il costruttore"},
-        {"unable.to.instantiate.LoginModule",
-                "impossibile creare un'istanza di LoginModule"},
-        {"unable.to.instantiate.LoginModule.",
-                "impossibile creare un'istanza di LoginModule: "},
-        {"unable.to.find.LoginModule.class.",
-                "impossibile trovare la classe LoginModule: "},
-        {"unable.to.access.LoginModule.",
-                "impossibile accedere a LoginModule "},
-        {"Login.Failure.all.modules.ignored",
-                "Errore di login: tutti i moduli sono stati ignorati"},
-
-        // sun.security.provider.PolicyFile
-
-        {"java.security.policy.error.parsing.policy.message",
-                "java.security.policy: errore durante l''analisi di {0}:\n\t{1}"},
-        {"java.security.policy.error.adding.Permission.perm.message",
-                "java.security.policy: errore durante l''aggiunta dell''autorizzazione {0}:\n\t{1}"},
-        {"java.security.policy.error.adding.Entry.message",
-                "java.security.policy: errore durante l''aggiunta della voce:\n\t{0}"},
-        {"alias.name.not.provided.pe.name.", "impossibile fornire nome alias ({0})"},
-        {"unable.to.perform.substitution.on.alias.suffix",
-                "impossibile eseguire una sostituzione sull''alias, {0}"},
-        {"substitution.value.prefix.unsupported",
-                "valore sostituzione, {0}, non supportato"},
-        {"SPACE", " "},
-        {"LPARAM", "("},
-        {"RPARAM", ")"},
-        {"type.can.t.be.null","il tipo non pu\u00F2 essere nullo"},
-
-        // sun.security.provider.PolicyParser
-        {"keystorePasswordURL.can.not.be.specified.without.also.specifying.keystore",
-                "Impossibile specificare keystorePasswordURL senza specificare anche il keystore"},
-        {"expected.keystore.type", "tipo keystore previsto"},
-        {"expected.keystore.provider", "provider di keystore previsto"},
-        {"multiple.Codebase.expressions",
-                "espressioni Codebase multiple"},
-        {"multiple.SignedBy.expressions","espressioni SignedBy multiple"},
-        {"duplicate.keystore.domain.name","nome dominio keystore duplicato: {0}"},
-        {"duplicate.keystore.name","nome keystore duplicato: {0}"},
-        {"SignedBy.has.empty.alias","SignedBy presenta un alias vuoto"},
-        {"can.not.specify.Principal.with.a.wildcard.class.without.a.wildcard.name",
-                "impossibile specificare un principal con una classe carattere jolly senza un nome carattere jolly"},
-        {"expected.codeBase.or.SignedBy.or.Principal",
-                "previsto codeBase o SignedBy o principal"},
-        {"expected.permission.entry", "prevista voce di autorizzazione"},
-        {"number.", "numero "},
-        {"expected.expect.read.end.of.file.",
-                "previsto [{0}], letto [end of file]"},
-        {"expected.read.end.of.file.",
-                "previsto [;], letto [end of file]"},
-        {"line.number.msg", "riga {0}: {1}"},
-        {"line.number.expected.expect.found.actual.",
-                "riga {0}: previsto [{1}], trovato [{2}]"},
-        {"null.principalClass.or.principalName",
-                "principalClass o principalName nullo"},
-
-        // sun.security.pkcs11.SunPKCS11
-        {"PKCS11.Token.providerName.Password.",
-                "Password per token PKCS11 [{0}]: "},
-
-        /* --- DEPRECATED --- */
-        // javax.security.auth.Policy
-        {"unable.to.instantiate.Subject.based.policy",
-                "impossibile creare un'istanza dei criteri basati sull'oggetto"}
-    };
-
-
-    /**
-     * Returns the contents of this <code>ResourceBundle</code>.
-     *
-     * @return the contents of this <code>ResourceBundle</code>.
-     */
-    @Override
-    public Object[][] getContents() {
-        return contents;
-    }
-}
-
diff --git a/src/java.base/share/classes/sun/security/util/Resources_ja.java b/src/java.base/share/classes/sun/security/util/Resources_ja.java
deleted file mode 100644
index 3cf3b91a62a..00000000000
--- a/src/java.base/share/classes/sun/security/util/Resources_ja.java
+++ /dev/null
@@ -1,119 +0,0 @@
-/*
- * Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  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.util;
-
-/**
- * This class represents the <code>ResourceBundle</code>
- * for javax.security.auth and sun.security.
- *
- */
-public class Resources_ja extends java.util.ListResourceBundle {
-
-    private static final Object[][] contents = {
-
-        // javax.security.auth.PrivateCredentialPermission
-        {"invalid.null.input.s.", "null\u306E\u5165\u529B\u306F\u7121\u52B9\u3067\u3059"},
-        {"actions.can.only.be.read.", "\u30A2\u30AF\u30B7\u30E7\u30F3\u306F'\u8AAD\u8FBC\u307F'\u306E\u307F\u53EF\u80FD\u3067\u3059"},
-        {"permission.name.name.syntax.invalid.",
-                "\u30A2\u30AF\u30BB\u30B9\u6A29\u540D[{0}]\u306E\u69CB\u6587\u304C\u7121\u52B9\u3067\u3059: "},
-        {"Credential.Class.not.followed.by.a.Principal.Class.and.Name",
-                "Credential\u30AF\u30E9\u30B9\u306E\u6B21\u306BPrincipal\u30AF\u30E9\u30B9\u304A\u3088\u3073\u540D\u524D\u304C\u3042\u308A\u307E\u305B\u3093"},
-        {"Principal.Class.not.followed.by.a.Principal.Name",
-                "Principal\u30AF\u30E9\u30B9\u306E\u6B21\u306B\u30D7\u30EA\u30F3\u30B7\u30D1\u30EB\u540D\u304C\u3042\u308A\u307E\u305B\u3093"},
-        {"Principal.Name.must.be.surrounded.by.quotes",
-                "\u30D7\u30EA\u30F3\u30B7\u30D1\u30EB\u540D\u306F\u5F15\u7528\u7B26\u3067\u56F2\u3080\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059"},
-        {"Principal.Name.missing.end.quote",
-                "\u30D7\u30EA\u30F3\u30B7\u30D1\u30EB\u540D\u306E\u6700\u5F8C\u306B\u5F15\u7528\u7B26\u304C\u3042\u308A\u307E\u305B\u3093"},
-        {"PrivateCredentialPermission.Principal.Class.can.not.be.a.wildcard.value.if.Principal.Name.is.not.a.wildcard.value",
-                "\u30D7\u30EA\u30F3\u30B7\u30D1\u30EB\u540D\u304C\u30EF\u30A4\u30EB\u30C9\u30AB\u30FC\u30C9(*)\u5024\u3067\u306A\u3044\u5834\u5408\u3001PrivateCredentialPermission\u306EPrincipal\u30AF\u30E9\u30B9\u3092\u30EF\u30A4\u30EB\u30C9\u30AB\u30FC\u30C9(*)\u5024\u306B\u3059\u308B\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093"},
-        {"CredOwner.Principal.Class.class.Principal.Name.name",
-                "CredOwner:\n\tPrincipal\u30AF\u30E9\u30B9={0}\n\t\u30D7\u30EA\u30F3\u30B7\u30D1\u30EB\u540D={1}"},
-
-        // javax.security.auth.x500
-        {"provided.null.name", "null\u306E\u540D\u524D\u304C\u6307\u5B9A\u3055\u308C\u307E\u3057\u305F"},
-        {"provided.null.keyword.map", "null\u306E\u30AD\u30FC\u30EF\u30FC\u30C9\u30FB\u30DE\u30C3\u30D7\u304C\u6307\u5B9A\u3055\u308C\u307E\u3057\u305F"},
-        {"provided.null.OID.map", "null\u306EOID\u30DE\u30C3\u30D7\u304C\u6307\u5B9A\u3055\u308C\u307E\u3057\u305F"},
-
-        // javax.security.auth.Subject
-        {"NEWLINE", "\n"},
-        {"invalid.null.action.provided", "\u7121\u52B9\u306Anull\u30A2\u30AF\u30B7\u30E7\u30F3\u304C\u6307\u5B9A\u3055\u308C\u307E\u3057\u305F"},
-        {"invalid.null.Class.provided", "\u7121\u52B9\u306Anull\u30AF\u30E9\u30B9\u304C\u6307\u5B9A\u3055\u308C\u307E\u3057\u305F"},
-        {"Subject.", "\u30B5\u30D6\u30B8\u30A7\u30AF\u30C8:\n"},
-        {".Principal.", "\t\u30D7\u30EA\u30F3\u30B7\u30D1\u30EB: "},
-        {".Public.Credential.", "\t\u516C\u958B\u8CC7\u683C: "},
-        {".Private.Credential.", "\t\u975E\u516C\u958B\u8CC7\u683C: "},
-        {".Private.Credential.inaccessible.",
-                "\t\u975E\u516C\u958B\u8CC7\u683C\u306B\u306F\u30A2\u30AF\u30BB\u30B9\u3067\u304D\u307E\u305B\u3093\n"},
-        {"Subject.is.read.only", "\u30B5\u30D6\u30B8\u30A7\u30AF\u30C8\u306F\u8AAD\u53D6\u308A\u5C02\u7528\u3067\u3059"},
-        {"attempting.to.add.an.object.which.is.not.an.instance.of.java.security.Principal.to.a.Subject.s.Principal.Set",
-                "java.security.Principal\u306E\u30A4\u30F3\u30B9\u30BF\u30F3\u30B9\u3067\u306F\u306A\u3044\u30AA\u30D6\u30B8\u30A7\u30AF\u30C8\u3092\u3001\u30B5\u30D6\u30B8\u30A7\u30AF\u30C8\u306E\u30D7\u30EA\u30F3\u30B7\u30D1\u30EB\u30FB\u30BB\u30C3\u30C8\u306B\u8FFD\u52A0\u3057\u3088\u3046\u3068\u3057\u307E\u3057\u305F"},
-        {"attempting.to.add.an.object.which.is.not.an.instance.of.class",
-                "{0}\u306E\u30A4\u30F3\u30B9\u30BF\u30F3\u30B9\u3067\u306F\u306A\u3044\u30AA\u30D6\u30B8\u30A7\u30AF\u30C8\u3092\u8FFD\u52A0\u3057\u3088\u3046\u3068\u3057\u307E\u3057\u305F"},
-
-        // javax.security.auth.login.AppConfigurationEntry
-        {"LoginModuleControlFlag.", "LoginModuleControlFlag: "},
-
-        // javax.security.auth.login.LoginContext
-        {"Invalid.null.input.name", "\u7121\u52B9\u306Anull\u5165\u529B: \u540D\u524D"},
-        {"No.LoginModules.configured.for.name",
-         "{0}\u7528\u306B\u69CB\u6210\u3055\u308C\u305FLoginModules\u306F\u3042\u308A\u307E\u305B\u3093"},
-        {"invalid.null.Subject.provided", "\u7121\u52B9\u306Anull\u30B5\u30D6\u30B8\u30A7\u30AF\u30C8\u304C\u6307\u5B9A\u3055\u308C\u307E\u3057\u305F"},
-        {"invalid.null.CallbackHandler.provided",
-                "\u7121\u52B9\u306Anull CallbackHandler\u304C\u6307\u5B9A\u3055\u308C\u307E\u3057\u305F"},
-        {"null.subject.logout.called.before.login",
-                "null\u30B5\u30D6\u30B8\u30A7\u30AF\u30C8 - \u30ED\u30B0\u30A4\u30F3\u3059\u308B\u524D\u306B\u30ED\u30B0\u30A2\u30A6\u30C8\u304C\u547C\u3073\u51FA\u3055\u308C\u307E\u3057\u305F"},
-        {"Login.Failure.all.modules.ignored",
-                "\u30ED\u30B0\u30A4\u30F3\u5931\u6557: \u3059\u3079\u3066\u306E\u30E2\u30B8\u30E5\u30FC\u30EB\u306F\u7121\u8996\u3055\u308C\u307E\u3059"},
-
-        // sun.security.provider.PolicyParser
-        {"duplicate.keystore.domain.name","\u91CD\u8907\u3059\u308B\u30AD\u30FC\u30B9\u30C8\u30A2\u30FB\u30C9\u30E1\u30A4\u30F3\u540D: {0}"},
-        {"duplicate.keystore.name","\u91CD\u8907\u3059\u308B\u30AD\u30FC\u30B9\u30C8\u30A2\u540D: {0}"},
-        {"number.", "\u6570 "},
-        {"expected.expect.read.end.of.file.",
-                "[{0}]\u3067\u306F\u306A\u304F[\u30D5\u30A1\u30A4\u30EB\u306E\u7D42\u308F\u308A]\u304C\u8AAD\u307F\u8FBC\u307E\u308C\u307E\u3057\u305F"},
-        {"expected.read.end.of.file.",
-                "[;]\u3067\u306F\u306A\u304F[\u30D5\u30A1\u30A4\u30EB\u306E\u7D42\u308F\u308A]\u304C\u8AAD\u307F\u8FBC\u307E\u308C\u307E\u3057\u305F"},
-        {"line.number.msg", "\u884C{0}: {1}"},
-        {"line.number.expected.expect.found.actual.",
-                "\u884C{0}: [{1}]\u3067\u306F\u306A\u304F[{2}]\u304C\u691C\u51FA\u3055\u308C\u307E\u3057\u305F"},
-
-        // sun.security.pkcs11.SunPKCS11
-        {"PKCS11.Token.providerName.Password.",
-                "PKCS11\u30C8\u30FC\u30AF\u30F3[{0}]\u30D1\u30B9\u30EF\u30FC\u30C9: "},
-    };
-
-
-    /**
-     * Returns the contents of this <code>ResourceBundle</code>.
-     *
-     * @return the contents of this <code>ResourceBundle</code>.
-     */
-    @Override
-    public Object[][] getContents() {
-        return contents;
-    }
-}
-
diff --git a/src/java.base/share/classes/sun/security/util/Resources_ko.java b/src/java.base/share/classes/sun/security/util/Resources_ko.java
deleted file mode 100644
index a3fd02eaff5..00000000000
--- a/src/java.base/share/classes/sun/security/util/Resources_ko.java
+++ /dev/null
@@ -1,171 +0,0 @@
-/*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package sun.security.util;
-
-/**
- * This class represents the <code>ResourceBundle</code>
- * for javax.security.auth and sun.security.
- *
- */
-public class Resources_ko extends java.util.ListResourceBundle {
-
-    private static final Object[][] contents = {
-
-        // javax.security.auth.PrivateCredentialPermission
-        {"invalid.null.input.s.", "\uB110 \uC785\uB825\uAC12\uC774 \uBD80\uC801\uD569\uD569\uB2C8\uB2E4."},
-        {"actions.can.only.be.read.", "\uC791\uC5C5\uC740 '\uC77D\uAE30' \uC804\uC6A9\uC785\uB2C8\uB2E4."},
-        {"permission.name.name.syntax.invalid.",
-                "\uAD8C\uD55C \uC774\uB984 [{0}] \uAD6C\uBB38\uC774 \uBD80\uC801\uD569\uD568: "},
-        {"Credential.Class.not.followed.by.a.Principal.Class.and.Name",
-                "\uC778\uC99D\uC11C \uD074\uB798\uC2A4 \uB2E4\uC74C\uC5D0 \uC8FC\uCCB4 \uD074\uB798\uC2A4\uC640 \uC774\uB984\uC774 \uC5C6\uC2B5\uB2C8\uB2E4."},
-        {"Principal.Class.not.followed.by.a.Principal.Name",
-                "\uC8FC\uCCB4 \uD074\uB798\uC2A4 \uB2E4\uC74C\uC5D0 \uC8FC\uCCB4 \uC774\uB984\uC774 \uC5C6\uC2B5\uB2C8\uB2E4."},
-        {"Principal.Name.must.be.surrounded.by.quotes",
-                "\uC8FC\uCCB4 \uC774\uB984\uC740 \uB530\uC634\uD45C\uB85C \uBB36\uC5B4\uC57C \uD569\uB2C8\uB2E4."},
-        {"Principal.Name.missing.end.quote",
-                "\uC8FC\uCCB4 \uC774\uB984\uC5D0 \uB2EB\uB294 \uB530\uC634\uD45C\uAC00 \uB204\uB77D\uB418\uC5C8\uC2B5\uB2C8\uB2E4."},
-        {"PrivateCredentialPermission.Principal.Class.can.not.be.a.wildcard.value.if.Principal.Name.is.not.a.wildcard.value",
-                "\uC8FC\uCCB4 \uC774\uB984\uC774 \uC640\uC77C\uB4DC \uCE74\uB4DC \uBB38\uC790(*) \uAC12\uC774 \uC544\uB2CC \uACBD\uC6B0 PrivateCredentialPermission \uC8FC\uCCB4 \uD074\uB798\uC2A4\uB294 \uC640\uC77C\uB4DC \uCE74\uB4DC \uBB38\uC790(*) \uAC12\uC77C \uC218 \uC5C6\uC2B5\uB2C8\uB2E4."},
-        {"CredOwner.Principal.Class.class.Principal.Name.name",
-                "CredOwner:\n\t\uC8FC\uCCB4 \uD074\uB798\uC2A4 = {0}\n\t\uC8FC\uCCB4 \uC774\uB984 = {1}"},
-
-        // javax.security.auth.x500
-        {"provided.null.name", "\uB110 \uC774\uB984\uC744 \uC81C\uACF5\uD588\uC2B5\uB2C8\uB2E4."},
-        {"provided.null.keyword.map", "\uB110 \uD0A4\uC6CC\uB4DC \uB9F5\uC744 \uC81C\uACF5\uD588\uC2B5\uB2C8\uB2E4."},
-        {"provided.null.OID.map", "\uB110 OID \uB9F5\uC744 \uC81C\uACF5\uD588\uC2B5\uB2C8\uB2E4."},
-
-        // javax.security.auth.Subject
-        {"NEWLINE", "\n"},
-        {"invalid.null.AccessControlContext.provided",
-                "\uBD80\uC801\uD569\uD55C \uB110 AccessControlContext\uAC00 \uC81C\uACF5\uB418\uC5C8\uC2B5\uB2C8\uB2E4."},
-        {"invalid.null.action.provided", "\uBD80\uC801\uD569\uD55C \uB110 \uC791\uC5C5\uC774 \uC81C\uACF5\uB418\uC5C8\uC2B5\uB2C8\uB2E4."},
-        {"invalid.null.Class.provided", "\uBD80\uC801\uD569\uD55C \uB110 \uD074\uB798\uC2A4\uAC00 \uC81C\uACF5\uB418\uC5C8\uC2B5\uB2C8\uB2E4."},
-        {"Subject.", "\uC81C\uBAA9:\n"},
-        {".Principal.", "\\\uC8FC\uCCB4: "},
-        {".Public.Credential.", "\t\uACF5\uC6A9 \uC778\uC99D\uC11C: "},
-        {".Private.Credentials.inaccessible.",
-                "\t\uC804\uC6A9 \uC778\uC99D\uC11C\uC5D0 \uC561\uC138\uC2A4\uD560 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.\n"},
-        {".Private.Credential.", "\t\uC804\uC6A9 \uC778\uC99D\uC11C: "},
-        {".Private.Credential.inaccessible.",
-                "\t\uC804\uC6A9 \uC778\uC99D\uC11C\uC5D0 \uC561\uC138\uC2A4\uD560 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.\n"},
-        {"Subject.is.read.only", "\uC81C\uBAA9\uC774 \uC77D\uAE30 \uC804\uC6A9\uC785\uB2C8\uB2E4."},
-        {"attempting.to.add.an.object.which.is.not.an.instance.of.java.security.Principal.to.a.Subject.s.Principal.Set",
-                "java.security.Principal\uC758 \uC778\uC2A4\uD134\uC2A4\uAC00 \uC544\uB2CC \uAC1D\uCCB4\uB97C \uC81C\uBAA9\uC758 \uC8FC\uCCB4 \uC9D1\uD569\uC5D0 \uCD94\uAC00\uD558\uB824\uACE0 \uC2DC\uB3C4\uD558\uB294 \uC911"},
-        {"attempting.to.add.an.object.which.is.not.an.instance.of.class",
-                "{0}\uC758 \uC778\uC2A4\uD134\uC2A4\uAC00 \uC544\uB2CC \uAC1D\uCCB4\uB97C \uCD94\uAC00\uD558\uB824\uACE0 \uC2DC\uB3C4\uD558\uB294 \uC911"},
-
-        // javax.security.auth.login.AppConfigurationEntry
-        {"LoginModuleControlFlag.", "LoginModuleControlFlag: "},
-
-        // javax.security.auth.login.LoginContext
-        {"Invalid.null.input.name", "\uBD80\uC801\uD569\uD55C \uB110 \uC785\uB825\uAC12: \uC774\uB984"},
-        {"No.LoginModules.configured.for.name",
-         "{0}\uC5D0 \uB300\uD574 \uAD6C\uC131\uB41C LoginModules\uAC00 \uC5C6\uC2B5\uB2C8\uB2E4."},
-        {"invalid.null.Subject.provided", "\uBD80\uC801\uD569\uD55C \uB110 \uC81C\uBAA9\uC774 \uC81C\uACF5\uB418\uC5C8\uC2B5\uB2C8\uB2E4."},
-        {"invalid.null.CallbackHandler.provided",
-                "\uBD80\uC801\uD569\uD55C \uB110 CallbackHandler\uAC00 \uC81C\uACF5\uB418\uC5C8\uC2B5\uB2C8\uB2E4."},
-        {"null.subject.logout.called.before.login",
-                "\uB110 \uC81C\uBAA9 - \uB85C\uADF8\uC778 \uC804\uC5D0 \uB85C\uADF8\uC544\uC6C3\uC774 \uD638\uCD9C\uB418\uC5C8\uC2B5\uB2C8\uB2E4."},
-        {"unable.to.instantiate.LoginModule.module.because.it.does.not.provide.a.no.argument.constructor",
-                "\uC778\uC218\uAC00 \uC5C6\uB294 \uC0DD\uC131\uC790\uB97C \uC81C\uACF5\uD558\uC9C0 \uC54A\uC544 LoginModule {0}\uC744(\uB97C) \uC778\uC2A4\uD134\uC2A4\uD654\uD560 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4."},
-        {"unable.to.instantiate.LoginModule",
-                "LoginModule\uC744 \uC778\uC2A4\uD134\uC2A4\uD654\uD560 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4."},
-        {"unable.to.instantiate.LoginModule.",
-                "LoginModule\uC744 \uC778\uC2A4\uD134\uC2A4\uD654\uD560 \uC218 \uC5C6\uC74C: "},
-        {"unable.to.find.LoginModule.class.",
-                "LoginModule \uD074\uB798\uC2A4\uB97C \uCC3E\uC744 \uC218 \uC5C6\uC74C: "},
-        {"unable.to.access.LoginModule.",
-                "LoginModule\uC5D0 \uC561\uC138\uC2A4\uD560 \uC218 \uC5C6\uC74C: "},
-        {"Login.Failure.all.modules.ignored",
-                "\uB85C\uADF8\uC778 \uC2E4\uD328: \uBAA8\uB4E0 \uBAA8\uB4C8\uC774 \uBB34\uC2DC\uB418\uC5C8\uC2B5\uB2C8\uB2E4."},
-
-        // sun.security.provider.PolicyFile
-
-        {"java.security.policy.error.parsing.policy.message",
-                "java.security.policy: {0}\uC758 \uAD6C\uBB38\uC744 \uBD84\uC11D\uD558\uB294 \uC911 \uC624\uB958 \uBC1C\uC0DD:\n\t{1}"},
-        {"java.security.policy.error.adding.Permission.perm.message",
-                "java.security.policy: {0} \uAD8C\uD55C\uC744 \uCD94\uAC00\uD558\uB294 \uC911 \uC624\uB958 \uBC1C\uC0DD:\n\t{1}"},
-        {"java.security.policy.error.adding.Entry.message",
-                "java.security.policy: \uD56D\uBAA9\uC744 \uCD94\uAC00\uD558\uB294 \uC911 \uC624\uB958 \uBC1C\uC0DD:\n\t{0}"},
-        {"alias.name.not.provided.pe.name.", "\uBCC4\uCE6D \uC774\uB984\uC774 \uC81C\uACF5\uB418\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4({0})."},
-        {"unable.to.perform.substitution.on.alias.suffix",
-                "{0} \uBCC4\uCE6D\uC744 \uB300\uCCB4\uD560 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4."},
-        {"substitution.value.prefix.unsupported",
-                "\uB300\uCCB4 \uAC12 {0}\uC740(\uB294) \uC9C0\uC6D0\uB418\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4."},
-        {"SPACE", " "},
-        {"LPARAM", "("},
-        {"RPARAM", ")"},
-        {"type.can.t.be.null","\uC720\uD615\uC740 \uB110\uC77C \uC218 \uC5C6\uC2B5\uB2C8\uB2E4."},
-
-        // sun.security.provider.PolicyParser
-        {"keystorePasswordURL.can.not.be.specified.without.also.specifying.keystore",
-                "\uD0A4 \uC800\uC7A5\uC18C\uB97C \uC9C0\uC815\uD558\uC9C0 \uC54A\uACE0 keystorePasswordURL\uC744 \uC9C0\uC815\uD560 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4."},
-        {"expected.keystore.type", "\uD0A4 \uC800\uC7A5\uC18C \uC720\uD615\uC774 \uD544\uC694\uD569\uB2C8\uB2E4."},
-        {"expected.keystore.provider", "\uD0A4 \uC800\uC7A5\uC18C \uC81C\uACF5\uC790\uAC00 \uD544\uC694\uD569\uB2C8\uB2E4."},
-        {"multiple.Codebase.expressions",
-                "Codebase \uD45C\uD604\uC2DD\uC774 \uC5EC\uB7EC \uAC1C\uC785\uB2C8\uB2E4."},
-        {"multiple.SignedBy.expressions","SignedBy \uD45C\uD604\uC2DD\uC774 \uC5EC\uB7EC \uAC1C\uC785\uB2C8\uB2E4."},
-        {"duplicate.keystore.domain.name","\uC911\uBCF5\uB41C \uD0A4 \uC800\uC7A5\uC18C \uB3C4\uBA54\uC778 \uC774\uB984: {0}"},
-        {"duplicate.keystore.name","\uC911\uBCF5\uB41C \uD0A4 \uC800\uC7A5\uC18C \uC774\uB984: {0}"},
-        {"SignedBy.has.empty.alias","SignedBy\uC758 \uBCC4\uCE6D\uC774 \uBE44\uC5B4 \uC788\uC2B5\uB2C8\uB2E4."},
-        {"can.not.specify.Principal.with.a.wildcard.class.without.a.wildcard.name",
-                "\uC640\uC77C\uB4DC \uCE74\uB4DC \uBB38\uC790 \uC774\uB984 \uC5C6\uC774 \uC640\uC77C\uB4DC \uCE74\uB4DC \uBB38\uC790 \uD074\uB798\uC2A4\uB97C \uC0AC\uC6A9\uD558\uB294 \uC8FC\uCCB4\uB97C \uC9C0\uC815\uD560 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4."},
-        {"expected.codeBase.or.SignedBy.or.Principal",
-                "codeBase, SignedBy \uB610\uB294 \uC8FC\uCCB4\uAC00 \uD544\uC694\uD569\uB2C8\uB2E4."},
-        {"expected.permission.entry", "\uAD8C\uD55C \uD56D\uBAA9\uC774 \uD544\uC694\uD569\uB2C8\uB2E4."},
-        {"number.", "\uC22B\uC790 "},
-        {"expected.expect.read.end.of.file.",
-                "[{0}]\uC774(\uAC00) \uD544\uC694\uD558\uC9C0\uB9CC [\uD30C\uC77C\uC758 \uB05D]\uAE4C\uC9C0 \uC77D\uC5C8\uC2B5\uB2C8\uB2E4."},
-        {"expected.read.end.of.file.",
-                "[;]\uC774 \uD544\uC694\uD558\uC9C0\uB9CC [\uD30C\uC77C\uC758 \uB05D]\uAE4C\uC9C0 \uC77D\uC5C8\uC2B5\uB2C8\uB2E4."},
-        {"line.number.msg", "{0} \uD589: {1}"},
-        {"line.number.expected.expect.found.actual.",
-                "{0} \uD589: [{1}]\uC774(\uAC00) \uD544\uC694\uD558\uC9C0\uB9CC [{2}]\uC774(\uAC00) \uBC1C\uACAC\uB418\uC5C8\uC2B5\uB2C8\uB2E4."},
-        {"null.principalClass.or.principalName",
-                "principalClass \uB610\uB294 principalName\uC774 \uB110\uC785\uB2C8\uB2E4."},
-
-        // sun.security.pkcs11.SunPKCS11
-        {"PKCS11.Token.providerName.Password.",
-                "PKCS11 \uD1A0\uD070 [{0}] \uBE44\uBC00\uBC88\uD638: "},
-
-        /* --- DEPRECATED --- */
-        // javax.security.auth.Policy
-        {"unable.to.instantiate.Subject.based.policy",
-                "\uC81C\uBAA9 \uAE30\uBC18 \uC815\uCC45\uC744 \uC778\uC2A4\uD134\uC2A4\uD654\uD560 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4."}
-    };
-
-
-    /**
-     * Returns the contents of this <code>ResourceBundle</code>.
-     *
-     * @return the contents of this <code>ResourceBundle</code>.
-     */
-    @Override
-    public Object[][] getContents() {
-        return contents;
-    }
-}
-
diff --git a/src/java.base/share/classes/sun/security/util/Resources_pt_BR.java b/src/java.base/share/classes/sun/security/util/Resources_pt_BR.java
deleted file mode 100644
index 2ce9ac9dbd3..00000000000
--- a/src/java.base/share/classes/sun/security/util/Resources_pt_BR.java
+++ /dev/null
@@ -1,171 +0,0 @@
-/*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package sun.security.util;
-
-/**
- * This class represents the <code>ResourceBundle</code>
- * for javax.security.auth and sun.security.
- *
- */
-public class Resources_pt_BR extends java.util.ListResourceBundle {
-
-    private static final Object[][] contents = {
-
-        // javax.security.auth.PrivateCredentialPermission
-        {"invalid.null.input.s.", "entrada(s) nula(s) inv\u00E1lida(s)"},
-        {"actions.can.only.be.read.", "as a\u00E7\u00F5es s\u00F3 podem ser 'lidas'"},
-        {"permission.name.name.syntax.invalid.",
-                "sintaxe inv\u00E1lida do nome da permiss\u00E3o [{0}]: "},
-        {"Credential.Class.not.followed.by.a.Principal.Class.and.Name",
-                "Classe da Credencial n\u00E3o seguida por um Nome e uma Classe do Principal"},
-        {"Principal.Class.not.followed.by.a.Principal.Name",
-                "Classe do Principal n\u00E3o seguida por um Nome do Principal"},
-        {"Principal.Name.must.be.surrounded.by.quotes",
-                "O Nome do Principal deve estar entre aspas"},
-        {"Principal.Name.missing.end.quote",
-                "Faltam as aspas finais no Nome do Principal"},
-        {"PrivateCredentialPermission.Principal.Class.can.not.be.a.wildcard.value.if.Principal.Name.is.not.a.wildcard.value",
-                "A Classe do Principal PrivateCredentialPermission n\u00E3o pode ser um valor curinga (*) se o Nome do Principal n\u00E3o for um valor curinga (*)"},
-        {"CredOwner.Principal.Class.class.Principal.Name.name",
-                "CredOwner:\n\tClasse do Principal = {0}\n\tNome do Principal = {1}"},
-
-        // javax.security.auth.x500
-        {"provided.null.name", "nome nulo fornecido"},
-        {"provided.null.keyword.map", "mapa de palavra-chave nulo fornecido"},
-        {"provided.null.OID.map", "mapa OID nulo fornecido"},
-
-        // javax.security.auth.Subject
-        {"NEWLINE", "\n"},
-        {"invalid.null.AccessControlContext.provided",
-                "AccessControlContext nulo inv\u00E1lido fornecido"},
-        {"invalid.null.action.provided", "a\u00E7\u00E3o nula inv\u00E1lida fornecida"},
-        {"invalid.null.Class.provided", "Classe nula inv\u00E1lida fornecida"},
-        {"Subject.", "Assunto:\n"},
-        {".Principal.", "\tPrincipal: "},
-        {".Public.Credential.", "\tCredencial P\u00FAblica: "},
-        {".Private.Credentials.inaccessible.",
-                "\tCredenciais Privadas inacess\u00EDveis\n"},
-        {".Private.Credential.", "\tCredencial Privada: "},
-        {".Private.Credential.inaccessible.",
-                "\tCredencial Privada inacess\u00EDvel\n"},
-        {"Subject.is.read.only", "O Assunto \u00E9 somente para leitura"},
-        {"attempting.to.add.an.object.which.is.not.an.instance.of.java.security.Principal.to.a.Subject.s.Principal.Set",
-                "tentativa de adicionar um objeto que n\u00E3o \u00E9 uma inst\u00E2ncia de java.security.Principal a um conjunto de principais do Subject"},
-        {"attempting.to.add.an.object.which.is.not.an.instance.of.class",
-                "tentativa de adicionar um objeto que n\u00E3o \u00E9 uma inst\u00E2ncia de {0}"},
-
-        // javax.security.auth.login.AppConfigurationEntry
-        {"LoginModuleControlFlag.", "LoginModuleControlFlag: "},
-
-        // javax.security.auth.login.LoginContext
-        {"Invalid.null.input.name", "Entrada nula inv\u00E1lida: nome"},
-        {"No.LoginModules.configured.for.name",
-         "Nenhum LoginModule configurado para {0}"},
-        {"invalid.null.Subject.provided", "Subject nulo inv\u00E1lido fornecido"},
-        {"invalid.null.CallbackHandler.provided",
-                "CallbackHandler nulo inv\u00E1lido fornecido"},
-        {"null.subject.logout.called.before.login",
-                "Subject nulo - log-out chamado antes do log-in"},
-        {"unable.to.instantiate.LoginModule.module.because.it.does.not.provide.a.no.argument.constructor",
-                "n\u00E3o \u00E9 poss\u00EDvel instanciar LoginModule, {0}, porque ele n\u00E3o fornece um construtor sem argumento"},
-        {"unable.to.instantiate.LoginModule",
-                "n\u00E3o \u00E9 poss\u00EDvel instanciar LoginModule"},
-        {"unable.to.instantiate.LoginModule.",
-                "n\u00E3o \u00E9 poss\u00EDvel instanciar LoginModule: "},
-        {"unable.to.find.LoginModule.class.",
-                "n\u00E3o \u00E9 poss\u00EDvel localizar a classe LoginModule: "},
-        {"unable.to.access.LoginModule.",
-                "n\u00E3o \u00E9 poss\u00EDvel acessar LoginModule: "},
-        {"Login.Failure.all.modules.ignored",
-                "Falha de Log-in: todos os m\u00F3dulos ignorados"},
-
-        // sun.security.provider.PolicyFile
-
-        {"java.security.policy.error.parsing.policy.message",
-                "java.security.policy: erro durante o parsing de {0}:\n\t{1}"},
-        {"java.security.policy.error.adding.Permission.perm.message",
-                "java.security.policy: erro ao adicionar a permiss\u00E3o, {0}:\n\t{1}"},
-        {"java.security.policy.error.adding.Entry.message",
-                "java.security.policy: erro ao adicionar a Entrada:\n\t{0}"},
-        {"alias.name.not.provided.pe.name.", "nome de alias n\u00E3o fornecido ({0})"},
-        {"unable.to.perform.substitution.on.alias.suffix",
-                "n\u00E3o \u00E9 poss\u00EDvel realizar a substitui\u00E7\u00E3o no alias, {0}"},
-        {"substitution.value.prefix.unsupported",
-                "valor da substitui\u00E7\u00E3o, {0}, n\u00E3o suportado"},
-        {"SPACE", " "},
-        {"LPARAM", "("},
-        {"RPARAM", ")"},
-        {"type.can.t.be.null","o tipo n\u00E3o pode ser nulo"},
-
-        // sun.security.provider.PolicyParser
-        {"keystorePasswordURL.can.not.be.specified.without.also.specifying.keystore",
-                "keystorePasswordURL n\u00E3o pode ser especificado sem que a \u00E1rea de armazenamento de chaves tamb\u00E9m seja especificada"},
-        {"expected.keystore.type", "tipo de armazenamento de chaves esperado"},
-        {"expected.keystore.provider", "fornecedor da \u00E1rea de armazenamento de chaves esperado"},
-        {"multiple.Codebase.expressions",
-                "v\u00E1rias express\u00F5es CodeBase"},
-        {"multiple.SignedBy.expressions","v\u00E1rias express\u00F5es SignedBy"},
-        {"duplicate.keystore.domain.name","nome do dom\u00EDnio da \u00E1rea de armazenamento de teclas duplicado: {0}"},
-        {"duplicate.keystore.name","nome da \u00E1rea de armazenamento de chaves duplicado: {0}"},
-        {"SignedBy.has.empty.alias","SignedBy tem alias vazio"},
-        {"can.not.specify.Principal.with.a.wildcard.class.without.a.wildcard.name",
-                "n\u00E3o \u00E9 poss\u00EDvel especificar um principal com uma classe curinga sem um nome curinga"},
-        {"expected.codeBase.or.SignedBy.or.Principal",
-                "CodeBase ou SignedBy ou Principal esperado"},
-        {"expected.permission.entry", "entrada de permiss\u00E3o esperada"},
-        {"number.", "n\u00FAmero "},
-        {"expected.expect.read.end.of.file.",
-                "esperado [{0}], lido [fim do arquivo]"},
-        {"expected.read.end.of.file.",
-                "esperado [;], lido [fim do arquivo]"},
-        {"line.number.msg", "linha {0}: {1}"},
-        {"line.number.expected.expect.found.actual.",
-                "linha {0}: esperada [{1}], encontrada [{2}]"},
-        {"null.principalClass.or.principalName",
-                "principalClass ou principalName nulo"},
-
-        // sun.security.pkcs11.SunPKCS11
-        {"PKCS11.Token.providerName.Password.",
-                "Senha PKCS11 de Token [{0}]: "},
-
-        /* --- DEPRECATED --- */
-        // javax.security.auth.Policy
-        {"unable.to.instantiate.Subject.based.policy",
-                "n\u00E3o \u00E9 poss\u00EDvel instanciar a pol\u00EDtica com base em Subject"}
-    };
-
-
-    /**
-     * Returns the contents of this <code>ResourceBundle</code>.
-     *
-     * @return the contents of this <code>ResourceBundle</code>.
-     */
-    @Override
-    public Object[][] getContents() {
-        return contents;
-    }
-}
-
diff --git a/src/java.base/share/classes/sun/security/util/Resources_sv.java b/src/java.base/share/classes/sun/security/util/Resources_sv.java
deleted file mode 100644
index 21c94a59760..00000000000
--- a/src/java.base/share/classes/sun/security/util/Resources_sv.java
+++ /dev/null
@@ -1,171 +0,0 @@
-/*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package sun.security.util;
-
-/**
- * This class represents the <code>ResourceBundle</code>
- * for javax.security.auth and sun.security.
- *
- */
-public class Resources_sv extends java.util.ListResourceBundle {
-
-    private static final Object[][] contents = {
-
-        // javax.security.auth.PrivateCredentialPermission
-        {"invalid.null.input.s.", "ogiltiga null-indata"},
-        {"actions.can.only.be.read.", "\u00E5tg\u00E4rder kan endast 'l\u00E4sas'"},
-        {"permission.name.name.syntax.invalid.",
-                "syntaxen f\u00F6r beh\u00F6righetsnamnet [{0}] \u00E4r ogiltig: "},
-        {"Credential.Class.not.followed.by.a.Principal.Class.and.Name",
-                "Inloggningsuppgiftsklassen f\u00F6ljs inte av klass eller namn f\u00F6r identitetshavare"},
-        {"Principal.Class.not.followed.by.a.Principal.Name",
-                "Identitetshavareklassen f\u00F6ljs inte av n\u00E5got identitetshavarenamn"},
-        {"Principal.Name.must.be.surrounded.by.quotes",
-                "Identitetshavarenamnet m\u00E5ste anges inom citattecken"},
-        {"Principal.Name.missing.end.quote",
-                "Identitetshavarenamnet saknar avslutande citattecken"},
-        {"PrivateCredentialPermission.Principal.Class.can.not.be.a.wildcard.value.if.Principal.Name.is.not.a.wildcard.value",
-                "Identitetshavareklassen PrivateCredentialPermission kan inte ha n\u00E5got jokertecken (*) om inte namnet p\u00E5 identitetshavaren anges med jokertecken (*)"},
-        {"CredOwner.Principal.Class.class.Principal.Name.name",
-                "CredOwner:\n\tIdentitetshavareklass = {0}\n\tIdentitetshavarenamn = {1}"},
-
-        // javax.security.auth.x500
-        {"provided.null.name", "null-namn angavs"},
-        {"provided.null.keyword.map", "nullnyckelordsmappning angavs"},
-        {"provided.null.OID.map", "null-OID-mappning angavs"},
-
-        // javax.security.auth.Subject
-        {"NEWLINE", "\n"},
-        {"invalid.null.AccessControlContext.provided",
-                "ogiltigt null-AccessControlContext"},
-        {"invalid.null.action.provided", "ogiltig null-funktion"},
-        {"invalid.null.Class.provided", "ogiltig null-klass"},
-        {"Subject.", "Innehavare:\n"},
-        {".Principal.", "\tIdentitetshavare: "},
-        {".Public.Credential.", "\tOffentlig inloggning: "},
-        {".Private.Credentials.inaccessible.",
-                "\tPrivat inloggning \u00E4r inte tillg\u00E4nglig\n"},
-        {".Private.Credential.", "\tPrivat inloggning: "},
-        {".Private.Credential.inaccessible.",
-                "\tPrivat inloggning \u00E4r inte tillg\u00E4nglig\n"},
-        {"Subject.is.read.only", "Innehavare \u00E4r skrivskyddad"},
-        {"attempting.to.add.an.object.which.is.not.an.instance.of.java.security.Principal.to.a.Subject.s.Principal.Set",
-                "f\u00F6rs\u00F6k att l\u00E4gga till ett objekt som inte \u00E4r en instans av java.security.Principal till ett subjekts upps\u00E4ttning av identitetshavare"},
-        {"attempting.to.add.an.object.which.is.not.an.instance.of.class",
-                "f\u00F6rs\u00F6ker l\u00E4gga till ett objekt som inte \u00E4r en instans av {0}"},
-
-        // javax.security.auth.login.AppConfigurationEntry
-        {"LoginModuleControlFlag.", "LoginModuleControlFlag: "},
-
-        // javax.security.auth.login.LoginContext
-        {"Invalid.null.input.name", "Ogiltiga null-indata: namn"},
-        {"No.LoginModules.configured.for.name",
-         "Inga inloggningsmoduler har konfigurerats f\u00F6r {0}"},
-        {"invalid.null.Subject.provided", "ogiltig null-subjekt"},
-        {"invalid.null.CallbackHandler.provided",
-                "ogiltig null-CallbackHandler"},
-        {"null.subject.logout.called.before.login",
-                "null-subjekt - utloggning anropades f\u00F6re inloggning"},
-        {"unable.to.instantiate.LoginModule.module.because.it.does.not.provide.a.no.argument.constructor",
-                "kan inte instansiera LoginModule, {0}, eftersom den inte tillhandah\u00E5ller n\u00E5gon icke-argumentskonstruktor"},
-        {"unable.to.instantiate.LoginModule",
-                "kan inte instansiera LoginModule"},
-        {"unable.to.instantiate.LoginModule.",
-                "kan inte instansiera LoginModule: "},
-        {"unable.to.find.LoginModule.class.",
-                "hittar inte LoginModule-klassen: "},
-        {"unable.to.access.LoginModule.",
-                "ingen \u00E5tkomst till LoginModule: "},
-        {"Login.Failure.all.modules.ignored",
-                "Inloggningsfel: alla moduler ignoreras"},
-
-        // sun.security.provider.PolicyFile
-
-        {"java.security.policy.error.parsing.policy.message",
-                "java.security.policy: fel vid tolkning av {0}:\n\t{1}"},
-        {"java.security.policy.error.adding.Permission.perm.message",
-                "java.security.policy: fel vid till\u00E4gg av beh\u00F6righet, {0}:\n\t{1}"},
-        {"java.security.policy.error.adding.Entry.message",
-                "java.security.policy: fel vid till\u00E4gg av post:\n\t{0}"},
-        {"alias.name.not.provided.pe.name.", "aliasnamn ej angivet ({0})"},
-        {"unable.to.perform.substitution.on.alias.suffix",
-                "kan ej ers\u00E4tta alias, {0}"},
-        {"substitution.value.prefix.unsupported",
-                "ers\u00E4ttningsv\u00E4rde, {0}, st\u00F6ds ej"},
-        {"SPACE", " "},
-        {"LPARAM", "("},
-        {"RPARAM", ")"},
-        {"type.can.t.be.null","typen kan inte vara null"},
-
-        // sun.security.provider.PolicyParser
-        {"keystorePasswordURL.can.not.be.specified.without.also.specifying.keystore",
-                "kan inte ange keystorePasswordURL utan att ange nyckellager"},
-        {"expected.keystore.type", "f\u00F6rv\u00E4ntad nyckellagertyp"},
-        {"expected.keystore.provider", "nyckellagerleverant\u00F6r f\u00F6rv\u00E4ntades"},
-        {"multiple.Codebase.expressions",
-                "flera CodeBase-uttryck"},
-        {"multiple.SignedBy.expressions","flera SignedBy-uttryck"},
-        {"duplicate.keystore.domain.name","dom\u00E4nnamn f\u00F6r dubbelt nyckellager: {0}"},
-        {"duplicate.keystore.name","namn f\u00F6r dubbelt nyckellager: {0}"},
-        {"SignedBy.has.empty.alias","SignedBy har ett tomt alias"},
-        {"can.not.specify.Principal.with.a.wildcard.class.without.a.wildcard.name",
-                "kan inte ange identitetshavare med en jokerteckenklass utan ett jokerteckennamn"},
-        {"expected.codeBase.or.SignedBy.or.Principal",
-                "f\u00F6rv\u00E4ntad codeBase eller SignedBy eller identitetshavare"},
-        {"expected.permission.entry", "f\u00F6rv\u00E4ntade beh\u00F6righetspost"},
-        {"number.", "nummer"},
-        {"expected.expect.read.end.of.file.",
-                "f\u00F6rv\u00E4ntade [{0}], l\u00E4ste [filslut]"},
-        {"expected.read.end.of.file.",
-                "f\u00F6rv\u00E4ntade [;], l\u00E4ste [filslut]"},
-        {"line.number.msg", "rad {0}: {1}"},
-        {"line.number.expected.expect.found.actual.",
-                "rad {0}: f\u00F6rv\u00E4ntade [{1}], hittade [{2}]"},
-        {"null.principalClass.or.principalName",
-                "null-principalClass eller -principalName"},
-
-        // sun.security.pkcs11.SunPKCS11
-        {"PKCS11.Token.providerName.Password.",
-                "L\u00F6senord f\u00F6r PKCS11-token [{0}]: "},
-
-        /* --- DEPRECATED --- */
-        // javax.security.auth.Policy
-        {"unable.to.instantiate.Subject.based.policy",
-                "kan inte instansiera subjektbaserad policy"}
-    };
-
-
-    /**
-     * Returns the contents of this <code>ResourceBundle</code>.
-     *
-     * @return the contents of this <code>ResourceBundle</code>.
-     */
-    @Override
-    public Object[][] getContents() {
-        return contents;
-    }
-}
-
diff --git a/src/java.base/share/classes/sun/security/util/Resources_zh_CN.java b/src/java.base/share/classes/sun/security/util/Resources_zh_CN.java
deleted file mode 100644
index b4f8f7b49df..00000000000
--- a/src/java.base/share/classes/sun/security/util/Resources_zh_CN.java
+++ /dev/null
@@ -1,119 +0,0 @@
-/*
- * Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  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.util;
-
-/**
- * This class represents the <code>ResourceBundle</code>
- * for javax.security.auth and sun.security.
- *
- */
-public class Resources_zh_CN extends java.util.ListResourceBundle {
-
-    private static final Object[][] contents = {
-
-        // javax.security.auth.PrivateCredentialPermission
-        {"invalid.null.input.s.", "\u65E0\u6548\u7684\u7A7A\u8F93\u5165"},
-        {"actions.can.only.be.read.", "\u64CD\u4F5C\u53EA\u80FD\u4E3A '\u8BFB\u53D6'"},
-        {"permission.name.name.syntax.invalid.",
-                "\u6743\u9650\u540D\u79F0 [{0}] \u8BED\u6CD5\u65E0\u6548: "},
-        {"Credential.Class.not.followed.by.a.Principal.Class.and.Name",
-                "\u8EAB\u4EFD\u8BC1\u660E\u7C7B\u540E\u9762\u672A\u8DDF\u968F\u4E3B\u7528\u6237\u7C7B\u53CA\u540D\u79F0"},
-        {"Principal.Class.not.followed.by.a.Principal.Name",
-                "\u4E3B\u7528\u6237\u7C7B\u540E\u9762\u672A\u8DDF\u968F\u4E3B\u7528\u6237\u540D\u79F0"},
-        {"Principal.Name.must.be.surrounded.by.quotes",
-                "\u4E3B\u7528\u6237\u540D\u79F0\u5FC5\u987B\u653E\u5728\u5F15\u53F7\u5185"},
-        {"Principal.Name.missing.end.quote",
-                "\u4E3B\u7528\u6237\u540D\u79F0\u7F3A\u5C11\u53F3\u5F15\u53F7"},
-        {"PrivateCredentialPermission.Principal.Class.can.not.be.a.wildcard.value.if.Principal.Name.is.not.a.wildcard.value",
-                "\u5982\u679C\u4E3B\u7528\u6237\u540D\u79F0\u4E0D\u662F\u901A\u914D\u7B26 (*) \u503C, \u90A3\u4E48 PrivateCredentialPermission \u4E3B\u7528\u6237\u7C7B\u4E0D\u80FD\u662F\u901A\u914D\u7B26 (*) \u503C"},
-        {"CredOwner.Principal.Class.class.Principal.Name.name",
-                "CredOwner:\n\t\u4E3B\u7528\u6237\u7C7B = {0}\n\t\u4E3B\u7528\u6237\u540D\u79F0 = {1}"},
-
-        // javax.security.auth.x500
-        {"provided.null.name", "\u63D0\u4F9B\u7684\u540D\u79F0\u4E3A\u7A7A\u503C"},
-        {"provided.null.keyword.map", "\u63D0\u4F9B\u7684\u5173\u952E\u5B57\u6620\u5C04\u4E3A\u7A7A\u503C"},
-        {"provided.null.OID.map", "\u63D0\u4F9B\u7684 OID \u6620\u5C04\u4E3A\u7A7A\u503C"},
-
-        // javax.security.auth.Subject
-        {"NEWLINE", "\n"},
-        {"invalid.null.action.provided", "\u63D0\u4F9B\u4E86\u65E0\u6548\u7684\u7A7A\u64CD\u4F5C"},
-        {"invalid.null.Class.provided", "\u63D0\u4F9B\u4E86\u65E0\u6548\u7684\u7A7A\u7C7B"},
-        {"Subject.", "\u4E3B\u4F53: \n"},
-        {".Principal.", "\t\u4E3B\u7528\u6237: "},
-        {".Public.Credential.", "\t\u516C\u5171\u8EAB\u4EFD\u8BC1\u660E: "},
-        {".Private.Credential.", "\t\u4E13\u7528\u8EAB\u4EFD\u8BC1\u660E: "},
-        {".Private.Credential.inaccessible.",
-                "\t\u65E0\u6CD5\u8BBF\u95EE\u4E13\u7528\u8EAB\u4EFD\u8BC1\u660E\n"},
-        {"Subject.is.read.only", "\u4E3B\u4F53\u4E3A\u53EA\u8BFB"},
-        {"attempting.to.add.an.object.which.is.not.an.instance.of.java.security.Principal.to.a.Subject.s.Principal.Set",
-                "\u6B63\u5728\u5C1D\u8BD5\u5C06\u4E00\u4E2A\u975E java.security.Principal \u5B9E\u4F8B\u7684\u5BF9\u8C61\u6DFB\u52A0\u5230\u4E3B\u4F53\u7684\u4E3B\u7528\u6237\u96C6\u4E2D"},
-        {"attempting.to.add.an.object.which.is.not.an.instance.of.class",
-                "\u6B63\u5728\u5C1D\u8BD5\u6DFB\u52A0\u4E00\u4E2A\u975E{0}\u5B9E\u4F8B\u7684\u5BF9\u8C61"},
-
-        // javax.security.auth.login.AppConfigurationEntry
-        {"LoginModuleControlFlag.", "LoginModuleControlFlag: "},
-
-        // javax.security.auth.login.LoginContext
-        {"Invalid.null.input.name", "\u65E0\u6548\u7A7A\u8F93\u5165: \u540D\u79F0"},
-        {"No.LoginModules.configured.for.name",
-         "\u6CA1\u6709\u4E3A{0}\u914D\u7F6E LoginModules"},
-        {"invalid.null.Subject.provided", "\u63D0\u4F9B\u4E86\u65E0\u6548\u7684\u7A7A\u4E3B\u4F53"},
-        {"invalid.null.CallbackHandler.provided",
-                "\u63D0\u4F9B\u4E86\u65E0\u6548\u7684\u7A7A CallbackHandler"},
-        {"null.subject.logout.called.before.login",
-                "\u7A7A\u4E3B\u4F53 - \u5728\u767B\u5F55\u4E4B\u524D\u8C03\u7528\u4E86\u6CE8\u9500"},
-        {"Login.Failure.all.modules.ignored",
-                "\u767B\u5F55\u5931\u8D25: \u5FFD\u7565\u6240\u6709\u6A21\u5757"},
-
-        // sun.security.provider.PolicyParser
-        {"duplicate.keystore.domain.name","\u5BC6\u94A5\u5E93\u57DF\u540D\u91CD\u590D: {0}"},
-        {"duplicate.keystore.name","\u5BC6\u94A5\u5E93\u540D\u79F0\u91CD\u590D: {0}"},
-        {"number.", "\u7F16\u53F7 "},
-        {"expected.expect.read.end.of.file.",
-                "\u5E94\u4E3A [{0}], \u8BFB\u53D6\u7684\u662F [\u6587\u4EF6\u7ED3\u5C3E]"},
-        {"expected.read.end.of.file.",
-                "\u5E94\u4E3A [;], \u8BFB\u53D6\u7684\u662F [\u6587\u4EF6\u7ED3\u5C3E]"},
-        {"line.number.msg", "\u5217{0}: {1}"},
-        {"line.number.expected.expect.found.actual.",
-                "\u884C\u53F7 {0}: \u5E94\u4E3A [{1}], \u627E\u5230 [{2}]"},
-
-        // sun.security.pkcs11.SunPKCS11
-        {"PKCS11.Token.providerName.Password.",
-                "PKCS11 \u6807\u8BB0 [{0}] \u53E3\u4EE4: "},
-    };
-
-
-    /**
-     * Returns the contents of this <code>ResourceBundle</code>.
-     *
-     * @return the contents of this <code>ResourceBundle</code>.
-     */
-    @Override
-    public Object[][] getContents() {
-        return contents;
-    }
-}
-
diff --git a/src/java.base/share/classes/sun/security/util/Resources_zh_TW.java b/src/java.base/share/classes/sun/security/util/Resources_zh_TW.java
deleted file mode 100644
index e428ff59f60..00000000000
--- a/src/java.base/share/classes/sun/security/util/Resources_zh_TW.java
+++ /dev/null
@@ -1,171 +0,0 @@
-/*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package sun.security.util;
-
-/**
- * This class represents the <code>ResourceBundle</code>
- * for javax.security.auth and sun.security.
- *
- */
-public class Resources_zh_TW extends java.util.ListResourceBundle {
-
-    private static final Object[][] contents = {
-
-        // javax.security.auth.PrivateCredentialPermission
-        {"invalid.null.input.s.", "\u7121\u6548\u7A7A\u503C\u8F38\u5165"},
-        {"actions.can.only.be.read.", "\u52D5\u4F5C\u53EA\u80FD\u88AB\u300C\u8B80\u53D6\u300D"},
-        {"permission.name.name.syntax.invalid.",
-                "\u6B0A\u9650\u540D\u7A31 [{0}] \u662F\u7121\u6548\u7684\u8A9E\u6CD5: "},
-        {"Credential.Class.not.followed.by.a.Principal.Class.and.Name",
-                "Credential \u985E\u5225\u5F8C\u9762\u4E0D\u662F Principal \u985E\u5225\u53CA\u540D\u7A31"},
-        {"Principal.Class.not.followed.by.a.Principal.Name",
-                "Principal \u985E\u5225\u5F8C\u9762\u4E0D\u662F Principal \u540D\u7A31"},
-        {"Principal.Name.must.be.surrounded.by.quotes",
-                "Principal \u540D\u7A31\u5FC5\u9808\u4EE5\u5F15\u865F\u5708\u4F4F"},
-        {"Principal.Name.missing.end.quote",
-                "Principal \u540D\u7A31\u7F3A\u5C11\u4E0B\u5F15\u865F"},
-        {"PrivateCredentialPermission.Principal.Class.can.not.be.a.wildcard.value.if.Principal.Name.is.not.a.wildcard.value",
-                "\u5982\u679C Principal \u540D\u7A31\u4E0D\u662F\u4E00\u500B\u842C\u7528\u5B57\u5143 (*) \u503C\uFF0C\u90A3\u9EBC PrivateCredentialPermission Principal \u985E\u5225\u5C31\u4E0D\u80FD\u662F\u842C\u7528\u5B57\u5143 (*) \u503C"},
-        {"CredOwner.Principal.Class.class.Principal.Name.name",
-                "CredOwner:\n\tPrincipal \u985E\u5225 = {0}\n\tPrincipal \u540D\u7A31 = {1}"},
-
-        // javax.security.auth.x500
-        {"provided.null.name", "\u63D0\u4F9B\u7A7A\u503C\u540D\u7A31"},
-        {"provided.null.keyword.map", "\u63D0\u4F9B\u7A7A\u503C\u95DC\u9375\u5B57\u5C0D\u6620"},
-        {"provided.null.OID.map", "\u63D0\u4F9B\u7A7A\u503C OID \u5C0D\u6620"},
-
-        // javax.security.auth.Subject
-        {"NEWLINE", "\n"},
-        {"invalid.null.AccessControlContext.provided",
-                "\u63D0\u4F9B\u7121\u6548\u7684\u7A7A\u503C AccessControlContext"},
-        {"invalid.null.action.provided", "\u63D0\u4F9B\u7121\u6548\u7684\u7A7A\u503C\u52D5\u4F5C"},
-        {"invalid.null.Class.provided", "\u63D0\u4F9B\u7121\u6548\u7684\u7A7A\u503C\u985E\u5225"},
-        {"Subject.", "\u4E3B\u984C:\n"},
-        {".Principal.", "\tPrincipal: "},
-        {".Public.Credential.", "\t\u516C\u7528\u8B49\u660E\u8CC7\u6599: "},
-        {".Private.Credentials.inaccessible.",
-                "\t\u79C1\u4EBA\u8B49\u660E\u8CC7\u6599\u7121\u6CD5\u5B58\u53D6\n"},
-        {".Private.Credential.", "\t\u79C1\u4EBA\u8B49\u660E\u8CC7\u6599: "},
-        {".Private.Credential.inaccessible.",
-                "\t\u79C1\u4EBA\u8B49\u660E\u8CC7\u6599\u7121\u6CD5\u5B58\u53D6\n"},
-        {"Subject.is.read.only", "\u4E3B\u984C\u70BA\u552F\u8B80"},
-        {"attempting.to.add.an.object.which.is.not.an.instance.of.java.security.Principal.to.a.Subject.s.Principal.Set",
-                "\u8A66\u5716\u65B0\u589E\u4E00\u500B\u975E java.security.Principal \u57F7\u884C\u8655\u7406\u7684\u7269\u4EF6\u81F3\u4E3B\u984C\u7684 Principal \u7FA4\u4E2D"},
-        {"attempting.to.add.an.object.which.is.not.an.instance.of.class",
-                "\u8A66\u5716\u65B0\u589E\u4E00\u500B\u975E {0} \u57F7\u884C\u8655\u7406\u7684\u7269\u4EF6"},
-
-        // javax.security.auth.login.AppConfigurationEntry
-        {"LoginModuleControlFlag.", "LoginModuleControlFlag: "},
-
-        // javax.security.auth.login.LoginContext
-        {"Invalid.null.input.name", "\u7121\u6548\u7A7A\u503C\u8F38\u5165: \u540D\u7A31"},
-        {"No.LoginModules.configured.for.name",
-         "\u7121\u91DD\u5C0D {0} \u8A2D\u5B9A\u7684 LoginModules"},
-        {"invalid.null.Subject.provided", "\u63D0\u4F9B\u7121\u6548\u7A7A\u503C\u4E3B\u984C"},
-        {"invalid.null.CallbackHandler.provided",
-                "\u63D0\u4F9B\u7121\u6548\u7A7A\u503C CallbackHandler"},
-        {"null.subject.logout.called.before.login",
-                "\u7A7A\u503C\u4E3B\u984C - \u5728\u767B\u5165\u4E4B\u524D\u5373\u547C\u53EB\u767B\u51FA"},
-        {"unable.to.instantiate.LoginModule.module.because.it.does.not.provide.a.no.argument.constructor",
-                "\u7121\u6CD5\u5275\u8A2D LoginModule\uFF0C{0}\uFF0C\u56E0\u70BA\u5B83\u4E26\u672A\u63D0\u4F9B\u975E\u5F15\u6578\u7684\u5EFA\u69CB\u5B50"},
-        {"unable.to.instantiate.LoginModule",
-                "\u7121\u6CD5\u5EFA\u7ACB LoginModule"},
-        {"unable.to.instantiate.LoginModule.",
-                "\u7121\u6CD5\u5EFA\u7ACB LoginModule: "},
-        {"unable.to.find.LoginModule.class.",
-                "\u627E\u4E0D\u5230 LoginModule \u985E\u5225: "},
-        {"unable.to.access.LoginModule.",
-                "\u7121\u6CD5\u5B58\u53D6 LoginModule: "},
-        {"Login.Failure.all.modules.ignored",
-                "\u767B\u5165\u5931\u6557: \u5FFD\u7565\u6240\u6709\u6A21\u7D44"},
-
-        // sun.security.provider.PolicyFile
-
-        {"java.security.policy.error.parsing.policy.message",
-                "java.security.policy: \u5256\u6790\u932F\u8AA4 {0}: \n\t{1}"},
-        {"java.security.policy.error.adding.Permission.perm.message",
-                "java.security.policy: \u65B0\u589E\u6B0A\u9650\u932F\u8AA4 {0}: \n\t{1}"},
-        {"java.security.policy.error.adding.Entry.message",
-                "java.security.policy: \u65B0\u589E\u9805\u76EE\u932F\u8AA4: \n\t{0}"},
-        {"alias.name.not.provided.pe.name.", "\u672A\u63D0\u4F9B\u5225\u540D\u540D\u7A31 ({0})"},
-        {"unable.to.perform.substitution.on.alias.suffix",
-                "\u7121\u6CD5\u5C0D\u5225\u540D\u57F7\u884C\u66FF\u63DB\uFF0C{0}"},
-        {"substitution.value.prefix.unsupported",
-                "\u4E0D\u652F\u63F4\u7684\u66FF\u63DB\u503C\uFF0C{0}"},
-        {"SPACE", " "},
-        {"LPARAM", "("},
-        {"RPARAM", ")"},
-        {"type.can.t.be.null","\u8F38\u5165\u4E0D\u80FD\u70BA\u7A7A\u503C"},
-
-        // sun.security.provider.PolicyParser
-        {"keystorePasswordURL.can.not.be.specified.without.also.specifying.keystore",
-                "\u6307\u5B9A keystorePasswordURL \u9700\u8981\u540C\u6642\u6307\u5B9A\u91D1\u9470\u5132\u5B58\u5EAB"},
-        {"expected.keystore.type", "\u9810\u671F\u7684\u91D1\u9470\u5132\u5B58\u5EAB\u985E\u578B"},
-        {"expected.keystore.provider", "\u9810\u671F\u7684\u91D1\u9470\u5132\u5B58\u5EAB\u63D0\u4F9B\u8005"},
-        {"multiple.Codebase.expressions",
-                "\u591A\u91CD Codebase \u8868\u793A\u5F0F"},
-        {"multiple.SignedBy.expressions","\u591A\u91CD SignedBy \u8868\u793A\u5F0F"},
-        {"duplicate.keystore.domain.name","\u91CD\u8907\u7684\u91D1\u9470\u5132\u5B58\u5EAB\u7DB2\u57DF\u540D\u7A31: {0}"},
-        {"duplicate.keystore.name","\u91CD\u8907\u7684\u91D1\u9470\u5132\u5B58\u5EAB\u540D\u7A31: {0}"},
-        {"SignedBy.has.empty.alias","SignedBy \u6709\u7A7A\u5225\u540D"},
-        {"can.not.specify.Principal.with.a.wildcard.class.without.a.wildcard.name",
-                "\u6C92\u6709\u842C\u7528\u5B57\u5143\u540D\u7A31\uFF0C\u7121\u6CD5\u6307\u5B9A\u542B\u6709\u842C\u7528\u5B57\u5143\u985E\u5225\u7684 Principal"},
-        {"expected.codeBase.or.SignedBy.or.Principal",
-                "\u9810\u671F\u7684 codeBase \u6216 SignedBy \u6216 Principal"},
-        {"expected.permission.entry", "\u9810\u671F\u7684\u6B0A\u9650\u9805\u76EE"},
-        {"number.", "\u865F\u78BC "},
-        {"expected.expect.read.end.of.file.",
-                "\u9810\u671F\u7684 [{0}], \u8B80\u53D6 [end of file]"},
-        {"expected.read.end.of.file.",
-                "\u9810\u671F\u7684 [;], \u8B80\u53D6 [end of file]"},
-        {"line.number.msg", "\u884C {0}: {1}"},
-        {"line.number.expected.expect.found.actual.",
-                "\u884C {0}: \u9810\u671F\u7684 [{1}]\uFF0C\u767C\u73FE [{2}]"},
-        {"null.principalClass.or.principalName",
-                "\u7A7A\u503C principalClass \u6216 principalName"},
-
-        // sun.security.pkcs11.SunPKCS11
-        {"PKCS11.Token.providerName.Password.",
-                "PKCS11 \u8A18\u865F [{0}] \u5BC6\u78BC: "},
-
-        /* --- DEPRECATED --- */
-        // javax.security.auth.Policy
-        {"unable.to.instantiate.Subject.based.policy",
-                "\u7121\u6CD5\u5EFA\u7ACB\u4E3B\u984C\u5F0F\u7684\u539F\u5247"}
-    };
-
-
-    /**
-     * Returns the contents of this <code>ResourceBundle</code>.
-     *
-     * @return the contents of this <code>ResourceBundle</code>.
-     */
-    @Override
-    public Object[][] getContents() {
-        return contents;
-    }
-}
-
diff --git a/src/java.base/share/classes/sun/security/util/resources/auth.properties b/src/java.base/share/classes/sun/security/util/resources/auth.properties
new file mode 100644
index 00000000000..a2686983ee4
--- /dev/null
+++ b/src/java.base/share/classes/sun/security/util/resources/auth.properties
@@ -0,0 +1,67 @@
+#
+# Copyright (c) 2000, 2025, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute 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.
+#
+
+# NT principals
+invalid.null.input.value=invalid null input: {0}
+NTDomainPrincipal.name=NTDomainPrincipal: {0}
+NTNumericCredential.name=NTNumericCredential: {0}
+Invalid.NTSid.value=Invalid NTSid value
+NTSid.name=NTSid: {0}
+NTSidDomainPrincipal.name=NTSidDomainPrincipal: {0}
+NTSidGroupPrincipal.name=NTSidGroupPrincipal: {0}
+NTSidPrimaryGroupPrincipal.name=NTSidPrimaryGroupPrincipal: {0}
+NTSidUserPrincipal.name=NTSidUserPrincipal: {0}
+NTUserPrincipal.name=NTUserPrincipal: {0}
+
+# UnixPrincipals
+UnixNumericGroupPrincipal.Primary.Group.name=UnixNumericGroupPrincipal [Primary Group]: {0}
+UnixNumericGroupPrincipal.Supplementary.Group.name=UnixNumericGroupPrincipal [Supplementary Group]: {0}
+UnixNumericUserPrincipal.name=UnixNumericUserPrincipal: {0}
+UnixPrincipal.name=UnixPrincipal: {0}
+
+# com.sun.security.auth.login.ConfigFile
+Unable.to.properly.expand.config=Unable to properly expand {0}
+extra.config.No.such.file.or.directory.={0} (No such file or directory)
+Configuration.Error.No.such.file.or.directory=Configuration Error:\n\tNo such file or directory
+Configuration.Error.Invalid.control.flag.flag=Configuration Error:\n\tInvalid control flag, {0}
+Configuration.Error.Can.not.specify.multiple.entries.for.appName=Configuration Error:\n\tCan not specify multiple entries for {0}
+Configuration.Error.expected.expect.read.end.of.file.=Configuration Error:\n\texpected [{0}], read [end of file]
+Configuration.Error.Line.line.expected.expect.found.value.=Configuration Error:\n\tLine {0}: expected [{1}], found [{2}]
+Configuration.Error.Line.line.expected.expect.=Configuration Error:\n\tLine {0}: expected [{1}]
+Configuration.Error.Line.line.system.property.value.expanded.to.empty.value=Configuration Error:\n\tLine {0}: system property [{1}] expanded to empty value
+
+# com.sun.security.auth.module.JndiLoginModule
+username.=username:\u0020
+password.=password:\u0020
+
+# com.sun.security.auth.module.KeyStoreLoginModule
+Please.enter.keystore.information=Please enter keystore information
+Keystore.alias.=Keystore alias:\u0020
+Keystore.password.=Keystore password:\u0020
+Private.key.password.optional.=Private key password (optional):\u0020
+
+# com.sun.security.auth.module.Krb5LoginModule
+Kerberos.username.defUsername.=Kerberos username [{0}]:\u0020
+Kerberos.password.for.username.=Kerberos password for {0}:\u0020
diff --git a/src/java.base/share/classes/sun/security/util/resources/auth_de.properties b/src/java.base/share/classes/sun/security/util/resources/auth_de.properties
new file mode 100644
index 00000000000..a1ae9fc6723
--- /dev/null
+++ b/src/java.base/share/classes/sun/security/util/resources/auth_de.properties
@@ -0,0 +1,67 @@
+#
+# Copyright (c) 2000, 2025, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute 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.
+#
+
+# NT principals
+invalid.null.input.value=Ungültige Nulleingabe: {0}
+NTDomainPrincipal.name=NTDomainPrincipal: {0}
+NTNumericCredential.name=NTNumericCredential: {0}
+Invalid.NTSid.value=Ungültiger NTSid-Wert
+NTSid.name=NTSid: {0}
+NTSidDomainPrincipal.name=NTSidDomainPrincipal: {0}
+NTSidGroupPrincipal.name=NTSidGroupPrincipal: {0}
+NTSidPrimaryGroupPrincipal.name=NTSidPrimaryGroupPrincipal: {0}
+NTSidUserPrincipal.name=NTSidUserPrincipal: {0}
+NTUserPrincipal.name=NTUserPrincipal: {0}
+
+# UnixPrincipals
+UnixNumericGroupPrincipal.Primary.Group.name=UnixNumericGroupPrincipal [Primärgruppe]: {0}
+UnixNumericGroupPrincipal.Supplementary.Group.name=UnixNumericGroupPrincipal [Zusatzgruppe]: {0}
+UnixNumericUserPrincipal.name=UnixNumericUserPrincipal: {0}
+UnixPrincipal.name=UnixPrincipal: {0}
+
+# com.sun.security.auth.login.ConfigFile
+Unable.to.properly.expand.config={0} kann nicht ordnungsgemäß erweitert werden
+extra.config.No.such.file.or.directory.={0} (Datei oder Verzeichnis nicht vorhanden)
+Configuration.Error.No.such.file.or.directory=Konfigurationsfehler:\n\tDatei oder Verzeichnis nicht vorhanden
+Configuration.Error.Invalid.control.flag.flag=Konfigurationsfehler:\n\tUngültiges Steuerkennzeichen {0}
+Configuration.Error.Can.not.specify.multiple.entries.for.appName=Konfigurationsfehler:\n\tEs können nicht mehrere Angaben für {0} gemacht werden.
+Configuration.Error.expected.expect.read.end.of.file.=Konfigurationsfehler:\n\t[{0}] erwartet, [Dateiende] gelesen
+Configuration.Error.Line.line.expected.expect.found.value.=Konfigurationsfehler:\n\tZeile {0}: [{1}] erwartet, [{2}] gefunden
+Configuration.Error.Line.line.expected.expect.=Konfigurationsfehler:\n\tZeile {0}: [{1}] erwartet
+Configuration.Error.Line.line.system.property.value.expanded.to.empty.value=Konfigurationsfehler:\n\tZeile {0}: Systemeigenschaft [{1}] auf leeren Wert erweitert
+
+# com.sun.security.auth.module.JndiLoginModule
+username.=Benutzername:\u0020
+password.=Kennwort:\u0020
+
+# com.sun.security.auth.module.KeyStoreLoginModule
+Please.enter.keystore.information=Geben Sie die Keystore-Informationen ein
+Keystore.alias.=Keystore-Alias:\u0020
+Keystore.password.=Keystore-Kennwort:\u0020
+Private.key.password.optional.=Private-Key-Kennwort (optional):\u0020
+
+# com.sun.security.auth.module.Krb5LoginModule
+Kerberos.username.defUsername.=Kerberos-Benutzername [{0}]:\u0020
+Kerberos.password.for.username.=Kerberos-Kennwort für {0}:\u0020
diff --git a/src/java.base/share/classes/sun/security/util/resources/auth_es.properties b/src/java.base/share/classes/sun/security/util/resources/auth_es.properties
new file mode 100644
index 00000000000..2a7dceede2d
--- /dev/null
+++ b/src/java.base/share/classes/sun/security/util/resources/auth_es.properties
@@ -0,0 +1,67 @@
+#
+# Copyright (c) 2000, 2025, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute 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.
+#
+
+# NT principals
+invalid.null.input.value=entrada nula no válida: {0}
+NTDomainPrincipal.name=NTDomainPrincipal: {0}
+NTNumericCredential.name=NTNumericCredential: {0}
+Invalid.NTSid.value=Valor de NTSid no válido
+NTSid.name=NTSid: {0}
+NTSidDomainPrincipal.name=NTSidDomainPrincipal: {0}
+NTSidGroupPrincipal.name=NTSidGroupPrincipal: {0}
+NTSidPrimaryGroupPrincipal.name=NTSidPrimaryGroupPrincipal: {0}
+NTSidUserPrincipal.name=NTSidUserPrincipal: {0}
+NTUserPrincipal.name=NTUserPrincipal: {0}
+
+# UnixPrincipals
+UnixNumericGroupPrincipal.Primary.Group.name=UnixNumericGroupPrincipal [Grupo Principal] {0}
+UnixNumericGroupPrincipal.Supplementary.Group.name=UnixNumericGroupPrincipal [Grupo Adicional] {0}
+UnixNumericUserPrincipal.name=UnixNumericUserPrincipal: {0}
+UnixPrincipal.name=UnixPrincipal: {0}
+
+# com.sun.security.auth.login.ConfigFile
+Unable.to.properly.expand.config=No se ha podido ampliar correctamente {0}
+extra.config.No.such.file.or.directory.={0} (No existe tal archivo o directorio)
+Configuration.Error.No.such.file.or.directory=Error de Configuración:\n\tNo existe tal archivo o directorio
+Configuration.Error.Invalid.control.flag.flag=Error de Configuración:\n\tIndicador de control no válido, {0}
+Configuration.Error.Can.not.specify.multiple.entries.for.appName=Error de Configuración:\n\tNo se pueden especificar varias entradas para {0}
+Configuration.Error.expected.expect.read.end.of.file.=Error de configuración:\n\tse esperaba [{0}], se ha leído [final de archivo]
+Configuration.Error.Line.line.expected.expect.found.value.=Error de configuración:\n\tLínea {0}: se esperaba [{1}], se ha encontrado [{2}]
+Configuration.Error.Line.line.expected.expect.=Error de configuración:\n\tLínea {0}: se esperaba [{1}]
+Configuration.Error.Line.line.system.property.value.expanded.to.empty.value=Error de configuración:\n\tLínea {0}: propiedad de sistema [{1}] ampliada a valor vacío
+
+# com.sun.security.auth.module.JndiLoginModule
+username.=nombre de usuario:\u0020
+password.=contraseña:\u0020
+
+# com.sun.security.auth.module.KeyStoreLoginModule
+Please.enter.keystore.information=Introduzca la información del almacén de claves
+Keystore.alias.=Alias de Almacén de Claves:\u0020
+Keystore.password.=Contraseña de Almacén de Claves:\u0020
+Private.key.password.optional.=Contraseña de Clave Privada (opcional):\u0020
+
+# com.sun.security.auth.module.Krb5LoginModule
+Kerberos.username.defUsername.=Nombre de usuario de Kerberos [{0}]:\u0020
+Kerberos.password.for.username.=Contraseña de Kerberos de {0}:\u0020
diff --git a/src/java.base/share/classes/sun/security/util/resources/auth_fr.properties b/src/java.base/share/classes/sun/security/util/resources/auth_fr.properties
new file mode 100644
index 00000000000..75f78083249
--- /dev/null
+++ b/src/java.base/share/classes/sun/security/util/resources/auth_fr.properties
@@ -0,0 +1,67 @@
+#
+# Copyright (c) 2000, 2025, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute 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.
+#
+
+# NT principals
+invalid.null.input.value=entrée NULL non valide : {0}
+NTDomainPrincipal.name=NTDomainPrincipal : {0}
+NTNumericCredential.name=NTNumericCredential : {0}
+Invalid.NTSid.value=Valeur de NTSid non valide
+NTSid.name=NTSid : {0}
+NTSidDomainPrincipal.name=NTSidDomainPrincipal : {0}
+NTSidGroupPrincipal.name=NTSidGroupPrincipal : {0}
+NTSidPrimaryGroupPrincipal.name=NTSidPrimaryGroupPrincipal : {0}
+NTSidUserPrincipal.name=NTSidUserPrincipal : {0}
+NTUserPrincipal.name=NTUserPrincipal : {0}
+
+# UnixPrincipals
+UnixNumericGroupPrincipal.Primary.Group.name=UnixNumericGroupPrincipal [groupe principal] : {0}
+UnixNumericGroupPrincipal.Supplementary.Group.name=UnixNumericGroupPrincipal [groupe supplémentaire] : {0}
+UnixNumericUserPrincipal.name=UnixNumericUserPrincipal : {0}
+UnixPrincipal.name=UnixPrincipal : {0}
+
+# com.sun.security.auth.login.ConfigFile
+Unable.to.properly.expand.config=Impossible de développer {0} correctement
+extra.config.No.such.file.or.directory.={0} (fichier ou répertoire inexistant)
+Configuration.Error.No.such.file.or.directory=Erreur de configuration :\n\tCe fichier ou répertoire n'existe pas
+Configuration.Error.Invalid.control.flag.flag=Erreur de configuration :\n\tIndicateur de contrôle non valide, {0}
+Configuration.Error.Can.not.specify.multiple.entries.for.appName=Erreur de configuration :\n\tImpossible de spécifier des entrées multiples pour {0}
+Configuration.Error.expected.expect.read.end.of.file.=Erreur de configuration :\n\tAttendu : [{0}], lu : [fin de fichier]
+Configuration.Error.Line.line.expected.expect.found.value.=Erreur de configuration :\n\tLigne {0} : attendu [{1}], trouvé [{2}]
+Configuration.Error.Line.line.expected.expect.=Erreur de configuration :\n\tLigne {0} : attendu [{1}]
+Configuration.Error.Line.line.system.property.value.expanded.to.empty.value=Erreur de configuration :\n\tLigne {0} : propriété système [{1}] développée en valeur vide
+
+# com.sun.security.auth.module.JndiLoginModule
+username.=nom utilisateur :\u0020
+password.=mot de passe :\u0020
+
+# com.sun.security.auth.module.KeyStoreLoginModule
+Please.enter.keystore.information=Entrez les informations du fichier de clés
+Keystore.alias.=Alias du fichier de clés :\u0020
+Keystore.password.=Mot de passe pour fichier de clés :\u0020
+Private.key.password.optional.=Mot de passe de la clé privée (facultatif) :\u0020
+
+# com.sun.security.auth.module.Krb5LoginModule
+Kerberos.username.defUsername.=Nom utilisateur Kerberos [{0}] :\u0020
+Kerberos.password.for.username.=Mot de passe Kerberos pour {0} :\u0020
diff --git a/src/java.base/share/classes/sun/security/util/resources/auth_it.properties b/src/java.base/share/classes/sun/security/util/resources/auth_it.properties
new file mode 100644
index 00000000000..49a0dc764c7
--- /dev/null
+++ b/src/java.base/share/classes/sun/security/util/resources/auth_it.properties
@@ -0,0 +1,67 @@
+#
+# Copyright (c) 2000, 2025, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute 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.
+#
+
+# NT principals
+invalid.null.input.value=input nullo non valido: {0}
+NTDomainPrincipal.name=NTDomainPrincipal: {0}
+NTNumericCredential.name=NTNumericCredential: {0}
+Invalid.NTSid.value=Valore NTSid non valido
+NTSid.name=NTSid: {0}
+NTSidDomainPrincipal.name=NTSidDomainPrincipal: {0}
+NTSidGroupPrincipal.name=NTSidGroupPrincipal: {0}
+NTSidPrimaryGroupPrincipal.name=NTSidPrimaryGroupPrincipal: {0}
+NTSidUserPrincipal.name=NTSidUserPrincipal: {0}
+NTUserPrincipal.name=NTUserPrincipal: {0}
+
+# UnixPrincipals
+UnixNumericGroupPrincipal.Primary.Group.name=UnixNumericGroupPrincipal [gruppo primario]: {0}
+UnixNumericGroupPrincipal.Supplementary.Group.name=UnixNumericGroupPrincipal [gruppo supplementare]: {0}
+UnixNumericUserPrincipal.name=UnixNumericUserPrincipal: {0}
+UnixPrincipal.name=UnixPrincipal: {0}
+
+# com.sun.security.auth.login.ConfigFile
+Unable.to.properly.expand.config=Impossibile espandere correttamente {0}
+extra.config.No.such.file.or.directory.={0} (file o directory inesistente)
+Configuration.Error.No.such.file.or.directory=Errore di configurazione:\n\tFile o directory inesistente
+Configuration.Error.Invalid.control.flag.flag=Errore di configurazione:\n\tflag di controllo non valido, {0}
+Configuration.Error.Can.not.specify.multiple.entries.for.appName=Errore di configurazione:\n\timpossibile specificare più valori per {0}
+Configuration.Error.expected.expect.read.end.of.file.=Errore di configurazione:\n\tprevisto [{0}], letto [end of file]
+Configuration.Error.Line.line.expected.expect.found.value.=Errore di configurazione:\n\triga {0}: previsto [{1}], trovato [{2}]
+Configuration.Error.Line.line.expected.expect.=Errore di configurazione:\n\triga {0}: previsto [{1}]
+Configuration.Error.Line.line.system.property.value.expanded.to.empty.value=Errore di configurazione:\n\triga {0}: proprietà di sistema [{1}] espansa a valore vuoto
+
+# com.sun.security.auth.module.JndiLoginModule
+username.=Nome utente:\u0020
+password.=Password:\u0020
+
+# com.sun.security.auth.module.KeyStoreLoginModule
+Please.enter.keystore.information=Immettere le informazioni per il keystore
+Keystore.alias.=Alias keystore:\u0020
+Keystore.password.=Password keystore:\u0020
+Private.key.password.optional.=Password chiave privata (opzionale):\u0020
+
+# com.sun.security.auth.module.Krb5LoginModule
+Kerberos.username.defUsername.=Nome utente Kerberos [{0}]:\u0020
+Kerberos.password.for.username.=Password Kerberos per {0}:\u0020
diff --git a/src/java.base/share/classes/sun/security/util/resources/auth_ja.properties b/src/java.base/share/classes/sun/security/util/resources/auth_ja.properties
new file mode 100644
index 00000000000..9caaf22002c
--- /dev/null
+++ b/src/java.base/share/classes/sun/security/util/resources/auth_ja.properties
@@ -0,0 +1,67 @@
+#
+# Copyright (c) 2000, 2025, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute 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.
+#
+
+# NT principals
+invalid.null.input.value=無効なnullの入力: {0}
+NTDomainPrincipal.name=NTDomainPrincipal: {0}
+NTNumericCredential.name=NTNumericCredential: {0}
+Invalid.NTSid.value=無効なNTSid値
+NTSid.name=NTSid: {0}
+NTSidDomainPrincipal.name=NTSidDomainPrincipal: {0}
+NTSidGroupPrincipal.name=NTSidGroupPrincipal: {0}
+NTSidPrimaryGroupPrincipal.name=NTSidPrimaryGroupPrincipal: {0}
+NTSidUserPrincipal.name=NTSidUserPrincipal: {0}
+NTUserPrincipal.name=NTUserPrincipal: {0}
+
+# UnixPrincipals
+UnixNumericGroupPrincipal.Primary.Group.name=UnixNumericGroupPrincipal [主グループ]: {0}
+UnixNumericGroupPrincipal.Supplementary.Group.name=UnixNumericGroupPrincipal [補助グループ]: {0}
+UnixNumericUserPrincipal.name=UnixNumericUserPrincipal: {0}
+UnixPrincipal.name=UnixPrincipal: {0}
+
+# com.sun.security.auth.login.ConfigFile
+Unable.to.properly.expand.config={0}を正しく展開できません
+extra.config.No.such.file.or.directory.={0}(指定されたファイルまたはディレクトリは存在しません)
+Configuration.Error.No.such.file.or.directory=構成エラー:\n\t指定されたファイルまたはディレクトリは存在しません
+Configuration.Error.Invalid.control.flag.flag=構成エラー:\n\t無効な制御フラグ: {0}
+Configuration.Error.Can.not.specify.multiple.entries.for.appName=構成エラー:\n\t{0}に複数のエントリを指定できません
+Configuration.Error.expected.expect.read.end.of.file.=構成エラー:\n\t[{0}]ではなく、[ファイルの終わり]が読み込まれました
+Configuration.Error.Line.line.expected.expect.found.value.=構成エラー:\n\t行{0}: [{1}]ではなく、[{2}]が検出されました
+Configuration.Error.Line.line.expected.expect.=構成エラー:\n\t行{0}: [{1}]が要求されました
+Configuration.Error.Line.line.system.property.value.expanded.to.empty.value=構成エラー:\n\t行{0}: システム・プロパティ[{1}]が空の値に展開されました
+
+# com.sun.security.auth.module.JndiLoginModule
+username.=ユーザー名:\u0020
+password.=パスワード:\u0020
+
+# com.sun.security.auth.module.KeyStoreLoginModule
+Please.enter.keystore.information=キーストア情報を入力してください
+Keystore.alias.=キーストアの別名:\u0020
+Keystore.password.=キーストアのパスワード:\u0020
+Private.key.password.optional.=秘密キーのパスワード(オプション):\u0020
+
+# com.sun.security.auth.module.Krb5LoginModule
+Kerberos.username.defUsername.=Kerberosユーザー名[{0}]:\u0020
+Kerberos.password.for.username.={0}のKerberosパスワード:\u0020
diff --git a/src/java.base/share/classes/sun/security/util/resources/auth_ko.properties b/src/java.base/share/classes/sun/security/util/resources/auth_ko.properties
new file mode 100644
index 00000000000..2321cfd51c0
--- /dev/null
+++ b/src/java.base/share/classes/sun/security/util/resources/auth_ko.properties
@@ -0,0 +1,66 @@
+#
+# Copyright (c) 2000, 2025, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute 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.
+#
+
+# NT principals
+invalid.null.input.value=부적합한 널 입력: {0}
+NTDomainPrincipal.name=NTDomainPrincipal: {0}
+NTNumericCredential.name=NTNumericCredential: {0}
+Invalid.NTSid.value=NTSid 값이 부적합합니다.
+NTSid.name=NTSid: {0}
+NTSidDomainPrincipal.name=NTSidDomainPrincipal: {0}
+NTSidGroupPrincipal.name=NTSidGroupPrincipal: {0}
+NTSidPrimaryGroupPrincipal.name=NTSidPrimaryGroupPrincipal: {0}
+NTSidUserPrincipal.name=NTSidUserPrincipal: {0}
+NTUserPrincipal.name=NTUserPrincipal: {0}
+
+# UnixPrincipals
+UnixNumericGroupPrincipal.Primary.Group.name=UnixNumericGroupPrincipal [기본 그룹]: {0}
+UnixNumericGroupPrincipal.Supplementary.Group.name=UnixNumericGroupPrincipal [보조 그룹]: {0}
+UnixNumericUserPrincipal.name=UnixNumericUserPrincipal: {0}
+UnixPrincipal.name=UnixPrincipal: {0}
+
+# com.sun.security.auth.login.ConfigFile
+Unable.to.properly.expand.config={0}을(를) 제대로 확장할 수 없습니다.
+extra.config.No.such.file.or.directory.={0}(해당 파일 또는 디렉토리가 없습니다.)
+Configuration.Error.No.such.file.or.directory=구성 오류:\n\t해당 파일 또는 디렉토리가 없습니다.
+Configuration.Error.Invalid.control.flag.flag=구성 오류:\n\t제어 플래그가 부적합함, {0}
+Configuration.Error.Can.not.specify.multiple.entries.for.appName=구성 오류:\n\t{0}에 대해 여러 항목을 지정할 수 없습니다.
+Configuration.Error.expected.expect.read.end.of.file.=구성 오류:\n\t[{0}]이(가) 필요하지만 [파일의 끝]에 도달했습니다.
+Configuration.Error.Line.line.expected.expect.found.value.=구성 오류:\n\t{0} 행: [{1}]이(가) 필요하지만 [{2}]이(가) 발견되었습니다.
+Configuration.Error.Line.line.expected.expect.=구성 오류:\n\t{0} 행: [{1}]이(가) 필요합니다.
+Configuration.Error.Line.line.system.property.value.expanded.to.empty.value=구성 오류:\n\t{0} 행: 시스템 속성 [{1}]이(가) 빈 값으로 확장되었습니다.
+
+# com.sun.security.auth.module.JndiLoginModule
+username.=사용자 이름:\u0020
+password.=비밀번호:\u0020
+
+# com.sun.security.auth.module.KeyStoreLoginModule
+Please.enter.keystore.information=키 저장소 정보를 입력하십시오.
+Keystore.alias.=키 저장소 별칭:\u0020
+Keystore.password.=키 저장소 비밀번호:\u0020
+Private.key.password.optional.=전용 키 비밀번호(선택사항):\u0020
+# com.sun.security.auth.module.Krb5LoginModule
+Kerberos.username.defUsername.=Kerberos 사용자 이름 [{0}]:\u0020
+Kerberos.password.for.username.={0}의 Kerberos 비밀번호:\u0020
diff --git a/src/java.base/share/classes/sun/security/util/resources/auth_pt_BR.properties b/src/java.base/share/classes/sun/security/util/resources/auth_pt_BR.properties
new file mode 100644
index 00000000000..26111010625
--- /dev/null
+++ b/src/java.base/share/classes/sun/security/util/resources/auth_pt_BR.properties
@@ -0,0 +1,66 @@
+#
+# Copyright (c) 2000, 2025, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute 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.
+#
+
+# NT principals
+invalid.null.input.value=entrada nula inválida: {0}
+NTDomainPrincipal.name=NTDomainPrincipal: {0}
+NTNumericCredential.name=NTNumericCredential: {0}
+Invalid.NTSid.value=Valor de NTSid inválido
+NTSid.name=NTSid: {0}
+NTSidDomainPrincipal.name=NTSidDomainPrincipal: {0}
+NTSidGroupPrincipal.name=NTSidGroupPrincipal: {0}
+NTSidPrimaryGroupPrincipal.name=NTSidPrimaryGroupPrincipal: {0}
+NTSidUserPrincipal.name=NTSidUserPrincipal: {0}
+NTUserPrincipal.name=NTUserPrincipal: {0}
+
+# UnixPrincipals
+UnixNumericGroupPrincipal.Primary.Group.name=UnixNumericGroupPrincipal [Grupo Principal]: {0}
+UnixNumericGroupPrincipal.Supplementary.Group.name=UnixNumericGroupPrincipal [Grupo Complementar]: {0}
+UnixNumericUserPrincipal.name=UnixNumericUserPrincipal: {0}
+UnixPrincipal.name=UnixPrincipal: {0}
+
+# com.sun.security.auth.login.ConfigFile
+Unable.to.properly.expand.config=Não é possível expandir corretamente {0}
+extra.config.No.such.file.or.directory.={0} (tal arquivo ou diretório não existe)
+Configuration.Error.No.such.file.or.directory=Erro de Configuração:\n\tNão há tal arquivo ou diretório
+Configuration.Error.Invalid.control.flag.flag=Erro de Configuração:\n\tFlag de controle inválido, {0}
+Configuration.Error.Can.not.specify.multiple.entries.for.appName=Erro de Configuração:\n\tNão é possível especificar várias entradas para {0}
+Configuration.Error.expected.expect.read.end.of.file.=Erro de Configuração:\n\tesperado [{0}], lido [fim do arquivo]
+Configuration.Error.Line.line.expected.expect.found.value.=Erro de Configuração:\n\tLinha {0}: esperada [{1}], encontrada [{2}]
+Configuration.Error.Line.line.expected.expect.=Erro de Configuração:\n\tLinha {0}: esperada [{1}]
+Configuration.Error.Line.line.system.property.value.expanded.to.empty.value=Erro de Configuração:\n\tLinha {0}: propriedade do sistema [{1}] expandida para valor vazio
+
+# com.sun.security.auth.module.JndiLoginModule
+username.=nome do usuário:\u0020
+password.=senha:\u0020
+
+# com.sun.security.auth.module.KeyStoreLoginModule
+Please.enter.keystore.information=Especifique as informações do armazenamento de chaves
+Keystore.alias.=Alias do armazenamento de chaves:\u0020
+Keystore.password.=Senha do armazenamento de chaves:\u0020
+Private.key.password.optional.=Senha da chave privada (opcional):\u0020
+# com.sun.security.auth.module.Krb5LoginModule
+Kerberos.username.defUsername.=Nome do usuário de Kerberos [{0}]:\u0020
+Kerberos.password.for.username.=Senha de Kerberos de {0}:\u0020
diff --git a/src/java.base/share/classes/sun/security/util/resources/auth_sv.properties b/src/java.base/share/classes/sun/security/util/resources/auth_sv.properties
new file mode 100644
index 00000000000..4eb167b7645
--- /dev/null
+++ b/src/java.base/share/classes/sun/security/util/resources/auth_sv.properties
@@ -0,0 +1,66 @@
+#
+# Copyright (c) 2000, 2025, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute 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.
+#
+
+# NT principals
+invalid.null.input.value=ogiltiga null-indata: {0}
+NTDomainPrincipal.name=NTDomainPrincipal: {0}
+NTNumericCredential.name=NTNumericCredential: {0}
+Invalid.NTSid.value=Ogiltigt NTSid-värde
+NTSid.name=NTSid: {0}
+NTSidDomainPrincipal.name=NTSidDomainPrincipal: {0}
+NTSidGroupPrincipal.name=NTSidGroupPrincipal: {0}
+NTSidPrimaryGroupPrincipal.name=NTSidPrimaryGroupPrincipal: {0}
+NTSidUserPrincipal.name=NTSidUserPrincipal: {0}
+NTUserPrincipal.name=NTUserPrincipal: {0}
+
+# UnixPrincipals
+UnixNumericGroupPrincipal.Primary.Group.name=UnixNumericGroupPrincipal [primär grupp]: {0}
+UnixNumericGroupPrincipal.Supplementary.Group.name=UnixNumericGroupPrincipal [tilläggsgrupp]: {0}
+UnixNumericUserPrincipal.name=UnixNumericUserPrincipal: {0}
+UnixPrincipal.name=UnixPrincipal: {0}
+
+# com.sun.security.auth.login.ConfigFile
+Unable.to.properly.expand.config=Kan inte utöka korrekt {0}
+extra.config.No.such.file.or.directory.={0} (det finns ingen sådan fil eller katalog)
+Configuration.Error.No.such.file.or.directory=Konfigurationsfel:\n\tFilen eller katalogen finns inte
+Configuration.Error.Invalid.control.flag.flag=Konfigurationsfel:\n\tOgiltig kontrollflagga, {0}
+Configuration.Error.Can.not.specify.multiple.entries.for.appName=Konfigurationsfel:\n\tKan inte ange flera poster för {0}
+Configuration.Error.expected.expect.read.end.of.file.=Konfigurationsfel:\n\tförväntade [{0}], läste [filslut]
+Configuration.Error.Line.line.expected.expect.found.value.=Konfigurationsfel:\n\tRad {0}: förväntade [{1}], hittade [{2}]
+Configuration.Error.Line.line.expected.expect.=Konfigurationsfel:\n\tRad {0}: förväntade [{1}]
+Configuration.Error.Line.line.system.property.value.expanded.to.empty.value=Konfigurationsfel:\n\tRad {0}: systemegenskapen [{1}] utökad till tomt värde
+
+# com.sun.security.auth.module.JndiLoginModule
+username.=användarnamn:\u0020
+password.=lösenord:\u0020
+
+# com.sun.security.auth.module.KeyStoreLoginModule
+Please.enter.keystore.information=Ange nyckellagerinformation
+Keystore.alias.=Nyckellageralias:\u0020
+Keystore.password.=Nyckellagerlösenord:\u0020
+Private.key.password.optional.=Lösenord för personlig nyckel (valfritt):\u0020
+# com.sun.security.auth.module.Krb5LoginModule
+Kerberos.username.defUsername.=Kerberos-användarnamn [{0}]:\u0020
+Kerberos.password.for.username.=Kerberos-lösenord för {0}:\u0020
diff --git a/src/java.base/share/classes/sun/security/util/resources/auth_zh_CN.properties b/src/java.base/share/classes/sun/security/util/resources/auth_zh_CN.properties
new file mode 100644
index 00000000000..6d677804544
--- /dev/null
+++ b/src/java.base/share/classes/sun/security/util/resources/auth_zh_CN.properties
@@ -0,0 +1,67 @@
+#
+# Copyright (c) 2000, 2025, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute 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.
+#
+
+# NT principals
+invalid.null.input.value=无效的空输入: {0}
+NTDomainPrincipal.name=NTDomainPrincipal: {0}
+NTNumericCredential.name=NTNumericCredential: {0}
+Invalid.NTSid.value=无效的 NTSid 值
+NTSid.name=NTSid: {0}
+NTSidDomainPrincipal.name=NTSidDomainPrincipal: {0}
+NTSidGroupPrincipal.name=NTSidGroupPrincipal: {0}
+NTSidPrimaryGroupPrincipal.name=NTSidPrimaryGroupPrincipal: {0}
+NTSidUserPrincipal.name=NTSidUserPrincipal: {0}
+NTUserPrincipal.name=NTUserPrincipal: {0}
+
+# UnixPrincipals
+UnixNumericGroupPrincipal.Primary.Group.name=UnixNumericGroupPrincipal [主组]: {0}
+UnixNumericGroupPrincipal.Supplementary.Group.name=UnixNumericGroupPrincipal [补充组]: {0}
+UnixNumericUserPrincipal.name=UnixNumericUserPrincipal: {0}
+UnixPrincipal.name=UnixPrincipal: {0}
+
+# com.sun.security.auth.login.ConfigFile
+Unable.to.properly.expand.config=无法正确扩展{0}
+extra.config.No.such.file.or.directory.={0} (没有这样的文件或目录)
+Configuration.Error.No.such.file.or.directory=配置错误:\n\t没有此文件或目录
+Configuration.Error.Invalid.control.flag.flag=配置错误: \n\t无效的控制标记, {0}
+Configuration.Error.Can.not.specify.multiple.entries.for.appName=配置错误:\n\t无法指定{0}的多个条目
+Configuration.Error.expected.expect.read.end.of.file.=配置错误: \n\t应为 [{0}], 读取的是 [文件结尾]
+Configuration.Error.Line.line.expected.expect.found.value.=配置错误: \n\t行 {0}: 应为 [{1}], 找到 [{2}]
+Configuration.Error.Line.line.expected.expect.=配置错误: \n\t行 {0}: 应为 [{1}]
+Configuration.Error.Line.line.system.property.value.expanded.to.empty.value=配置错误: \n\t行 {0}: 系统属性 [{1}] 扩展到空值
+
+# com.sun.security.auth.module.JndiLoginModule
+username.=用户名:\u0020
+password.=口令:\u0020
+
+# com.sun.security.auth.module.KeyStoreLoginModule
+Please.enter.keystore.information=请输入密钥库信息
+Keystore.alias.=密钥库别名:\u0020
+Keystore.password.=密钥库口令:\u0020
+Private.key.password.optional.=私有密钥口令 (可选):\u0020
+
+# com.sun.security.auth.module.Krb5LoginModule
+Kerberos.username.defUsername.=Kerberos 用户名 [{0}]:\u0020
+Kerberos.password.for.username.={0}的 Kerberos 口令:\u0020
diff --git a/src/java.base/share/classes/sun/security/util/resources/auth_zh_TW.properties b/src/java.base/share/classes/sun/security/util/resources/auth_zh_TW.properties
new file mode 100644
index 00000000000..227e5093612
--- /dev/null
+++ b/src/java.base/share/classes/sun/security/util/resources/auth_zh_TW.properties
@@ -0,0 +1,66 @@
+#
+# Copyright (c) 2000, 2025, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute 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.
+#
+
+# NT principals
+invalid.null.input.value=無效空值輸入: {0}
+NTDomainPrincipal.name=NTDomainPrincipal: {0}
+NTNumericCredential.name=NTNumericCredential: {0}
+Invalid.NTSid.value=無效 NTSid 值
+NTSid.name=NTSid: {0}
+NTSidDomainPrincipal.name=NTSidDomainPrincipal: {0}
+NTSidGroupPrincipal.name=NTSidGroupPrincipal: {0}
+NTSidPrimaryGroupPrincipal.name=NTSidPrimaryGroupPrincipal: {0}
+NTSidUserPrincipal.name=NTSidUserPrincipal: {0}
+NTUserPrincipal.name=NTUserPrincipal: {0}
+
+# UnixPrincipals
+UnixNumericGroupPrincipal.Primary.Group.name=UnixNumericGroupPrincipal [主群組]: {0}
+UnixNumericGroupPrincipal.Supplementary.Group.name=UnixNumericGroupPrincipal [附加群組]: {0}
+UnixNumericUserPrincipal.name=UnixNumericUserPrincipal: {0}
+UnixPrincipal.name=UnixPrincipal: {0}
+
+# com.sun.security.auth.login.ConfigFile
+Unable.to.properly.expand.config=無法適當地擴充 {0}
+extra.config.No.such.file.or.directory.={0} (沒有此檔案或目錄)
+Configuration.Error.No.such.file.or.directory=組態錯誤:\n\t無此檔案或目錄
+Configuration.Error.Invalid.control.flag.flag=組態錯誤:\n\t無效的控制旗標，{0}
+Configuration.Error.Can.not.specify.multiple.entries.for.appName=組態錯誤: \n\t無法指定多重項目 {0}
+Configuration.Error.expected.expect.read.end.of.file.=組態錯誤: \n\t預期的 [{0}], 讀取 [end of file]
+Configuration.Error.Line.line.expected.expect.found.value.=組態錯誤: \n\t行 {0}: 預期的 [{1}], 發現 [{2}]
+Configuration.Error.Line.line.expected.expect.=組態錯誤: \n\t行 {0}: 預期的 [{1}]
+Configuration.Error.Line.line.system.property.value.expanded.to.empty.value=組態錯誤: \n\t行 {0}: 系統屬性 [{1}] 擴充至空值
+
+# com.sun.security.auth.module.JndiLoginModule
+username.=使用者名稱:\u0020
+password.=密碼:\u0020
+
+# com.sun.security.auth.module.KeyStoreLoginModule
+Please.enter.keystore.information=請輸入金鑰儲存庫資訊
+Keystore.alias.=金鑰儲存庫別名:\u0020
+Keystore.password.=金鑰儲存庫密碼:\u0020
+Private.key.password.optional.=私人金鑰密碼 (選擇性的):\u0020
+# com.sun.security.auth.module.Krb5LoginModule
+Kerberos.username.defUsername.=Kerberos 使用者名稱 [{0}]:\u0020
+Kerberos.password.for.username.=Kerberos 密碼 {0}:\u0020
diff --git a/src/java.base/share/classes/sun/security/util/resources/security.properties b/src/java.base/share/classes/sun/security/util/resources/security.properties
new file mode 100644
index 00000000000..9533b4b8eee
--- /dev/null
+++ b/src/java.base/share/classes/sun/security/util/resources/security.properties
@@ -0,0 +1,76 @@
+#
+# Copyright (c) 2000, 2025, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute 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.
+#
+
+# javax.security.auth.PrivateCredentialPermission
+invalid.null.input.s.=invalid null input(s)
+actions.can.only.be.read.=actions can only be 'read'
+permission.name.name.syntax.invalid.=permission name [{0}] syntax invalid:\u0020
+Credential.Class.not.followed.by.a.Principal.Class.and.Name=Credential Class not followed by a Principal Class and Name
+Principal.Class.not.followed.by.a.Principal.Name=Principal Class not followed by a Principal Name
+Principal.Name.must.be.surrounded.by.quotes=Principal Name must be surrounded by quotes
+Principal.Name.missing.end.quote=Principal Name missing end quote
+PrivateCredentialPermission.Principal.Class.can.not.be.a.wildcard.value.if.Principal.Name.is.not.a.wildcard.value=PrivateCredentialPermission Principal Class can not be a wildcard (*) value if Principal Name is not a wildcard (*) value
+CredOwner.Principal.Class.class.Principal.Name.name=CredOwner:\n\tPrincipal Class = {0}\n\tPrincipal Name = {1}
+
+# javax.security.auth.x500
+provided.null.name=provided null name
+provided.null.keyword.map=provided null keyword map
+provided.null.OID.map=provided null OID map
+
+# javax.security.auth.Subject
+NEWLINE=\n
+invalid.null.action.provided=invalid null action provided
+invalid.null.Class.provided=invalid null Class provided
+Subject.=Subject:\n
+.Principal.=\tPrincipal:\u0020
+.Public.Credential.=\tPublic Credential:\u0020
+.Private.Credential.=\tPrivate Credential:\u0020
+.Private.Credential.inaccessible.=\tPrivate Credential inaccessible\n
+Subject.is.read.only=Subject is read-only
+attempting.to.add.an.object.which.is.not.an.instance.of.java.security.Principal.to.a.Subject.s.Principal.Set=attempting to add an object which is not an instance of java.security.Principal to a Subject's Principal Set
+attempting.to.add.an.object.which.is.not.an.instance.of.class=attempting to add an object which is not an instance of {0}
+
+# javax.security.auth.login.AppConfigurationEntry
+LoginModuleControlFlag.=LoginModuleControlFlag:\u0020
+
+# javax.security.auth.login.LoginContext
+Invalid.null.input.name=Invalid null input: name
+No.LoginModules.configured.for.name=No LoginModules configured for {0}
+invalid.null.Subject.provided=invalid null Subject provided
+invalid.null.CallbackHandler.provided=invalid null CallbackHandler provided
+null.subject.logout.called.before.login=null subject - logout called before login
+Login.Failure.all.modules.ignored=Login Failure: all modules ignored
+
+# sun.security.provider.PolicyParser
+duplicate.keystore.domain.name=duplicate keystore domain name: {0}
+duplicate.keystore.name=duplicate keystore name: {0}
+number.=number\u0020
+expected.expect.read.end.of.file.=expected [{0}], read [end of file]
+expected.read.end.of.file.=expected [;], read [end of file]
+line.number.msg=line {0}: {1}
+line.number.expected.expect.found.actual.=line {0}: expected [{1}], found [{2}]
+
+# sun.security.pkcs11.SunPKCS11
+PKCS11.Token.providerName.Password.=PKCS11 Token [{0}] Password:\u0020
diff --git a/src/java.base/share/classes/sun/security/util/resources/security_de.properties b/src/java.base/share/classes/sun/security/util/resources/security_de.properties
new file mode 100644
index 00000000000..a431268831b
--- /dev/null
+++ b/src/java.base/share/classes/sun/security/util/resources/security_de.properties
@@ -0,0 +1,76 @@
+#
+# Copyright (c) 2000, 2025, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute 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.
+#
+
+# javax.security.auth.PrivateCredentialPermission
+invalid.null.input.s.=Ungültige Nulleingabe(n)
+actions.can.only.be.read.=Aktionen können nur "lesen" sein
+permission.name.name.syntax.invalid.=Syntax für Berechtigungsnamen [{0}] ungültig:\u0020
+Credential.Class.not.followed.by.a.Principal.Class.and.Name=Nach Zugangsdatenklasse folgt keine Principal-Klasse und kein Name
+Principal.Class.not.followed.by.a.Principal.Name=Nach Principal-Klasse folgt kein Principal-Name
+Principal.Name.must.be.surrounded.by.quotes=Principal-Name muss in Anführungszeichen stehen
+Principal.Name.missing.end.quote=Abschließendes Anführungszeichen für Principal-Name fehlt
+PrivateCredentialPermission.Principal.Class.can.not.be.a.wildcard.value.if.Principal.Name.is.not.a.wildcard.value=Principal-Klasse PrivateCredentialPermission kann kein Platzhalterwert (*) sein, wenn der Principal-Name kein Platzhalterwert (*) ist
+CredOwner.Principal.Class.class.Principal.Name.name=CredOwner:\n\tPrincipal-Klasse = {0}\n\tPrincipal-Name = {1}
+
+# javax.security.auth.x500
+provided.null.name=Nullname angegeben
+provided.null.keyword.map=Null-Schlüsselwortzuordnung angegeben
+provided.null.OID.map=Null-OID-Zuordnung angegeben
+
+# javax.security.auth.Subject
+NEWLINE=\n
+invalid.null.action.provided=Ungültige Nullaktion angegeben
+invalid.null.Class.provided=Ungültige Nullklasse angegeben
+Subject.=Subjekt:\n
+.Principal.=\tPrincipal:\u0020
+.Public.Credential.=\tÖffentliche Zugangsdaten:\u0020
+.Private.Credential.=\tPrivate Zugangsdaten:\u0020
+.Private.Credential.inaccessible.=\tKein Zugriff auf private Zugangsdaten\n
+Subject.is.read.only=Subjekt ist schreibgeschützt
+attempting.to.add.an.object.which.is.not.an.instance.of.java.security.Principal.to.a.Subject.s.Principal.Set=Es wird versucht, ein Objekt hinzuzufügen, das keine Instanz von java.security.Principal für eine Principal-Gruppe eines Subjekts ist
+attempting.to.add.an.object.which.is.not.an.instance.of.class=Es wird versucht, ein Objekt hinzuzufügen, das keine Instanz von {0} ist
+
+# javax.security.auth.login.AppConfigurationEntry
+LoginModuleControlFlag.=LoginModuleControlFlag:\u0020
+
+# javax.security.auth.login.LoginContext
+Invalid.null.input.name=Ungültige Nulleingabe: Name
+No.LoginModules.configured.for.name=Für {0} sind keine LoginModules konfiguriert
+invalid.null.Subject.provided=Ungültiges Nullsubjekt angegeben
+invalid.null.CallbackHandler.provided=Ungültiger Nullwert für CallbackHandler angegeben
+null.subject.logout.called.before.login=Nullsubjekt - Abmeldung vor Anmeldung aufgerufen
+Login.Failure.all.modules.ignored=Anmeldefehler: Alle Module werden ignoriert
+
+# sun.security.provider.PolicyParser
+duplicate.keystore.domain.name=Keystore-Domainname doppelt vorhanden: {0}
+duplicate.keystore.name=Keystore-Name doppelt vorhanden: {0}
+number.=Nummer\u0020
+expected.expect.read.end.of.file.=[{0}] erwartet, [Dateiende] gelesen
+expected.read.end.of.file.=[;] erwartet, [Dateiende] gelesen
+line.number.msg=Zeile {0}: {1}
+line.number.expected.expect.found.actual.=Zeile {0}: [{1}] erwartet, [{2}] gefunden
+
+# sun.security.pkcs11.SunPKCS11
+PKCS11.Token.providerName.Password.=Kennwort für PKCS11-Token [{0}]:\u0020
diff --git a/src/java.base/share/classes/sun/security/util/resources/security_es.properties b/src/java.base/share/classes/sun/security/util/resources/security_es.properties
new file mode 100644
index 00000000000..ba36793202a
--- /dev/null
+++ b/src/java.base/share/classes/sun/security/util/resources/security_es.properties
@@ -0,0 +1,110 @@
+#
+# Copyright (c) 2000, 2025, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute 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.
+#
+
+# javax.security.auth.PrivateCredentialPermission
+invalid.null.input.s.=entradas nulas no válidas
+actions.can.only.be.read.=las acciones sólo pueden 'leerse'
+permission.name.name.syntax.invalid.=sintaxis de nombre de permiso [{0}] no válida:\u0020
+Credential.Class.not.followed.by.a.Principal.Class.and.Name=La clase de credencial no va seguida de una clase y nombre de principal
+Principal.Class.not.followed.by.a.Principal.Name=La clase de principal no va seguida de un nombre de principal
+Principal.Name.must.be.surrounded.by.quotes=El nombre de principal debe ir entre comillas
+Principal.Name.missing.end.quote=Faltan las comillas finales en el nombre de principal
+PrivateCredentialPermission.Principal.Class.can.not.be.a.wildcard.value.if.Principal.Name.is.not.a.wildcard.value=La clase de principal PrivateCredentialPermission no puede ser un valor comodín (*) si el nombre de principal no lo es también
+CredOwner.Principal.Class.class.Principal.Name.name=CredOwner:\n\tClase de Principal = {0}\n\tNombre de Principal = {1}
+
+# javax.security.auth.x500
+provided.null.name=se ha proporcionado un nombre nulo
+provided.null.keyword.map=mapa de palabras clave proporcionado nulo
+provided.null.OID.map=mapa de OID proporcionado nulo
+
+# javax.security.auth.Subject
+NEWLINE=\n
+invalid.null.AccessControlContext.provided=se ha proporcionado un AccessControlContext nulo no válido
+invalid.null.action.provided=se ha proporcionado una acción nula no válida
+invalid.null.Class.provided=se ha proporcionado una clase nula no válida
+Subject.=Asunto:\n
+.Principal.=\tPrincipal:\u0020
+.Public.Credential.=\tCredencial Pública:\u0020
+.Private.Credentials.inaccessible.=\tCredenciales Privadas Inaccesibles\n
+.Private.Credential.=\tCredencial Privada:\u0020
+.Private.Credential.inaccessible.=\tCredencial Privada Inaccesible\n
+Subject.is.read.only=El asunto es de sólo lectura
+attempting.to.add.an.object.which.is.not.an.instance.of.java.security.Principal.to.a.Subject.s.Principal.Set=intentando agregar un objeto que no es una instancia de java.security.Principal al juego principal de un asunto
+attempting.to.add.an.object.which.is.not.an.instance.of.class=intentando agregar un objeto que no es una instancia de {0}
+
+# javax.security.auth.login.AppConfigurationEntry
+LoginModuleControlFlag.=LoginModuleControlFlag:\u0020
+
+# javax.security.auth.login.LoginContext
+Invalid.null.input.name=Entrada nula no válida: nombre
+No.LoginModules.configured.for.name=No se han configurado LoginModules para {0}
+invalid.null.Subject.provided=se ha proporcionado un asunto nulo no válido
+invalid.null.CallbackHandler.provided=se ha proporcionado CallbackHandler nulo no válido
+null.subject.logout.called.before.login=asunto nulo - se ha llamado al cierre de sesión antes del inicio de sesión
+unable.to.instantiate.LoginModule.module.because.it.does.not.provide.a.no.argument.constructor=no se ha podido instanciar LoginModule, {0}, porque no incluye un constructor sin argumentos
+unable.to.instantiate.LoginModule=no se ha podido instanciar LoginModule
+unable.to.instantiate.LoginModule.=no se ha podido instanciar LoginModule:\u0020
+unable.to.find.LoginModule.class.=no se ha encontrado la clase LoginModule:\u0020
+unable.to.access.LoginModule.=no se ha podido acceder a LoginModule:\u0020
+Login.Failure.all.modules.ignored=Fallo en inicio de sesión: se han ignorado todos los módulos
+
+# sun.security.provider.PolicyFile
+
+java.security.policy.error.parsing.policy.message=java.security.policy: error de análisis de {0}:\n\t{1}
+java.security.policy.error.adding.Permission.perm.message=java.security.policy: error al agregar un permiso, {0}:\n\t{1}
+java.security.policy.error.adding.Entry.message=java.security.policy: error al agregar una entrada:\n\t{0}
+alias.name.not.provided.pe.name.=no se ha proporcionado el nombre de alias ({0})
+unable.to.perform.substitution.on.alias.suffix=no se puede realizar la sustitución en el alias, {0}
+substitution.value.prefix.unsupported=valor de sustitución, {0}, no soportado
+SPACE=\u0020
+LPARAM=(
+RPARAM=)
+type.can.t.be.null=el tipo no puede ser nulo
+
+# sun.security.provider.PolicyParser
+keystorePasswordURL.can.not.be.specified.without.also.specifying.keystore=keystorePasswordURL no puede especificarse sin especificar también el almacén de claves
+expected.keystore.type=se esperaba un tipo de almacén de claves
+expected.keystore.provider=se esperaba un proveedor de almacén de claves
+multiple.Codebase.expressions=expresiones múltiples de CodeBase
+multiple.SignedBy.expressions=expresiones múltiples de SignedBy
+duplicate.keystore.domain.name=nombre de dominio de almacén de claves duplicado: {0}
+duplicate.keystore.name=nombre de almacén de claves duplicado: {0}
+SignedBy.has.empty.alias=SignedBy tiene un alias vacío
+can.not.specify.Principal.with.a.wildcard.class.without.a.wildcard.name=no se puede especificar Principal con una clase de comodín sin un nombre de comodín
+expected.codeBase.or.SignedBy.or.Principal=se esperaba codeBase o SignedBy o Principal
+expected.permission.entry=se esperaba un permiso de entrada
+number.=número\u0020
+expected.expect.read.end.of.file.=se esperaba [{0}], se ha leído [final de archivo]
+expected.read.end.of.file.=se esperaba [;], se ha leído [final de archivo]
+line.number.msg=línea {0}: {1}
+line.number.expected.expect.found.actual.=línea {0}: se esperaba [{1}], se ha encontrado [{2}]
+null.principalClass.or.principalName=principalClass o principalName nulos
+
+# sun.security.pkcs11.SunPKCS11
+PKCS11.Token.providerName.Password.=Contraseña del Token PKCS11 [{0}]:\u0020
+
+# --- DEPRECATED ---
+# javax.security.auth.Policy
+unable.to.instantiate.Subject.based.policy=no se ha podido instanciar una política basada en asunto
diff --git a/src/java.base/share/classes/sun/security/util/resources/security_fr.properties b/src/java.base/share/classes/sun/security/util/resources/security_fr.properties
new file mode 100644
index 00000000000..49468dead53
--- /dev/null
+++ b/src/java.base/share/classes/sun/security/util/resources/security_fr.properties
@@ -0,0 +1,110 @@
+#
+# Copyright (c) 2000, 2025, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute 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.
+#
+
+# javax.security.auth.PrivateCredentialPermission
+invalid.null.input.s.=entrées NULL non valides
+actions.can.only.be.read.=les actions sont accessibles en lecture uniquement
+permission.name.name.syntax.invalid.=syntaxe de nom de droit [{0}] non valide :\u0020
+Credential.Class.not.followed.by.a.Principal.Class.and.Name=Classe Credential non suivie d'une classe et d'un nom de principal
+Principal.Class.not.followed.by.a.Principal.Name=Classe de principal non suivie d'un nom de principal
+Principal.Name.must.be.surrounded.by.quotes=Le nom de principal doit être indiqué entre guillemets
+Principal.Name.missing.end.quote=Guillemet fermant manquant pour le nom de principal
+PrivateCredentialPermission.Principal.Class.can.not.be.a.wildcard.value.if.Principal.Name.is.not.a.wildcard.value=La classe de principal PrivateCredentialPermission ne peut pas être une valeur générique (*) si le nom de principal n'est pas une valeur générique (*)
+CredOwner.Principal.Class.class.Principal.Name.name=CredOwner :\n\tClasse de principal = {0}\n\tNom de principal = {1}
+
+# javax.security.auth.x500
+provided.null.name=nom NULL fourni
+provided.null.keyword.map=mappage de mots-clés NULL fourni
+provided.null.OID.map=mappage OID NULL fourni
+
+# javax.security.auth.Subject
+NEWLINE=\n
+invalid.null.AccessControlContext.provided=AccessControlContext NULL fourni non valide
+invalid.null.action.provided=action NULL fournie non valide
+invalid.null.Class.provided=classe NULL fournie non valide
+Subject.=Objet :\n
+.Principal.=\tPrincipal :\u0020
+.Public.Credential.=\tInformations d'identification publiques :\u0020
+.Private.Credentials.inaccessible.=\tInformations d'identification privées inaccessibles\n
+.Private.Credential.=\tInformations d'identification privées :\u0020
+.Private.Credential.inaccessible.=\tInformations d'identification privées inaccessibles\n
+Subject.is.read.only=Sujet en lecture seule
+attempting.to.add.an.object.which.is.not.an.instance.of.java.security.Principal.to.a.Subject.s.Principal.Set=tentative d'ajout d'un objet qui n'est pas une instance de java.security.Principal dans un ensemble de principaux du sujet
+attempting.to.add.an.object.which.is.not.an.instance.of.class=tentative d''ajout d''un objet qui n''est pas une instance de {0}
+
+# javax.security.auth.login.AppConfigurationEntry
+LoginModuleControlFlag.=LoginModuleControlFlag :\u0020
+
+# javax.security.auth.login.LoginContext
+Invalid.null.input.name=Entrée NULL non valide : nom
+No.LoginModules.configured.for.name=Aucun LoginModule configuré pour {0}
+invalid.null.Subject.provided=sujet NULL fourni non valide
+invalid.null.CallbackHandler.provided=CallbackHandler NULL fourni non valide
+null.subject.logout.called.before.login=sujet NULL - Tentative de déconnexion avant la connexion
+unable.to.instantiate.LoginModule.module.because.it.does.not.provide.a.no.argument.constructor=impossible d''instancier LoginModule {0} car il ne fournit pas de constructeur sans argument
+unable.to.instantiate.LoginModule=impossible d'instancier LoginModule
+unable.to.instantiate.LoginModule.=impossible d'instancier LoginModule :\u0020
+unable.to.find.LoginModule.class.=classe LoginModule introuvable :\u0020
+unable.to.access.LoginModule.=impossible d'accéder à LoginModule :\u0020
+Login.Failure.all.modules.ignored=Echec de connexion : tous les modules ont été ignorés
+
+# sun.security.provider.PolicyFile
+
+java.security.policy.error.parsing.policy.message=java.security.policy : erreur d''analyse de {0} :\n\t{1}
+java.security.policy.error.adding.Permission.perm.message=java.security.policy : erreur d''ajout de droit, {0} :\n\t{1}
+java.security.policy.error.adding.Entry.message=java.security.policy : erreur d''ajout d''entrée :\n\t{0}
+alias.name.not.provided.pe.name.=nom d''alias non fourni ({0})
+unable.to.perform.substitution.on.alias.suffix=impossible d''effectuer une substitution pour l''alias, {0}
+substitution.value.prefix.unsupported=valeur de substitution, {0}, non prise en charge
+SPACE=\u0020
+LPARAM=(
+RPARAM=)
+type.can.t.be.null=le type ne peut être NULL
+
+# sun.security.provider.PolicyParser
+keystorePasswordURL.can.not.be.specified.without.also.specifying.keystore=Impossible de spécifier keystorePasswordURL sans indiquer aussi le fichier de clés
+expected.keystore.type=type de fichier de clés attendu
+expected.keystore.provider=fournisseur de fichier de clés attendu
+multiple.Codebase.expressions=expressions Codebase multiples
+multiple.SignedBy.expressions=expressions SignedBy multiples
+duplicate.keystore.domain.name=nom de domaine de fichier de clés en double : {0}
+duplicate.keystore.name=nom de fichier de clés en double : {0}
+SignedBy.has.empty.alias=SignedBy possède un alias vide
+can.not.specify.Principal.with.a.wildcard.class.without.a.wildcard.name=impossible de spécifier le principal avec une classe générique sans nom générique
+expected.codeBase.or.SignedBy.or.Principal=codeBase, SignedBy ou Principal attendu
+expected.permission.entry=entrée de droit attendue
+number.=nombre\u0020
+expected.expect.read.end.of.file.=attendu [{0}], lu [fin de fichier]
+expected.read.end.of.file.=attendu [;], lu [fin de fichier]
+line.number.msg=ligne {0} : {1}
+line.number.expected.expect.found.actual.=ligne {0} : attendu [{1}], trouvé [{2}]
+null.principalClass.or.principalName=principalClass ou principalName NULL
+
+# sun.security.pkcs11.SunPKCS11
+PKCS11.Token.providerName.Password.=Mot de passe PKCS11 Token [{0}] :\u0020
+
+# --- DEPRECATED ---
+# javax.security.auth.Policy
+unable.to.instantiate.Subject.based.policy=impossible d'instancier les règles basées sur le sujet
diff --git a/src/java.base/share/classes/sun/security/util/resources/security_it.properties b/src/java.base/share/classes/sun/security/util/resources/security_it.properties
new file mode 100644
index 00000000000..628d4411274
--- /dev/null
+++ b/src/java.base/share/classes/sun/security/util/resources/security_it.properties
@@ -0,0 +1,110 @@
+#
+# Copyright (c) 2000, 2025, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute 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.
+#
+
+# javax.security.auth.PrivateCredentialPermission
+invalid.null.input.s.=input nullo/i non valido/i
+actions.can.only.be.read.=le azioni possono essere solamente 'lette'
+permission.name.name.syntax.invalid.=sintassi [{0}] non valida per il nome autorizzazione:\u0020
+Credential.Class.not.followed.by.a.Principal.Class.and.Name=la classe di credenziali non è seguita da un nome e una classe di principal
+Principal.Class.not.followed.by.a.Principal.Name=la classe di principal non è seguita da un nome principal
+Principal.Name.must.be.surrounded.by.quotes=il nome principal deve essere compreso tra apici
+Principal.Name.missing.end.quote=apice di chiusura del nome principal mancante
+PrivateCredentialPermission.Principal.Class.can.not.be.a.wildcard.value.if.Principal.Name.is.not.a.wildcard.value=la classe principal PrivateCredentialPermission non può essere un valore carattere jolly (*) se il nome principal a sua volta non è un valore carattere jolly (*)
+CredOwner.Principal.Class.class.Principal.Name.name=CredOwner:\n\tclasse Principal = {0}\n\tNome Principal = {1}
+
+# javax.security.auth.x500
+provided.null.name=il nome fornito è nullo
+provided.null.keyword.map=specificata mappa parole chiave null
+provided.null.OID.map=specificata mappa OID null
+
+# javax.security.auth.Subject
+NEWLINE=\n
+invalid.null.AccessControlContext.provided=fornito un valore nullo non valido per AccessControlContext
+invalid.null.action.provided=fornita un'azione nulla non valida
+invalid.null.Class.provided=fornita una classe nulla non valida
+Subject.=Oggetto:\n
+.Principal.=\tPrincipal:\u0020
+.Public.Credential.=\tCredenziale pubblica:\u0020
+.Private.Credentials.inaccessible.=\tImpossibile accedere alle credenziali private\n
+.Private.Credential.=\tCredenziale privata:\u0020
+.Private.Credential.inaccessible.=\tImpossibile accedere alla credenziale privata\n
+Subject.is.read.only=L'oggetto è di sola lettura
+attempting.to.add.an.object.which.is.not.an.instance.of.java.security.Principal.to.a.Subject.s.Principal.Set=si è tentato di aggiungere un oggetto che non è un'istanza di java.security.Principal a un set principal dell'oggetto
+attempting.to.add.an.object.which.is.not.an.instance.of.class=si è tentato di aggiungere un oggetto che non è un''istanza di {0}
+
+# javax.security.auth.login.AppConfigurationEntry
+LoginModuleControlFlag.=LoginModuleControlFlag:\u0020
+
+# javax.security.auth.login.LoginContext
+Invalid.null.input.name=Input nullo non valido: nome
+No.LoginModules.configured.for.name=Nessun LoginModules configurato per {0}
+invalid.null.Subject.provided=fornito un valore nullo non valido per l'oggetto
+invalid.null.CallbackHandler.provided=fornito un valore nullo non valido per CallbackHandler
+null.subject.logout.called.before.login=oggetto nullo - il logout è stato richiamato prima del login
+unable.to.instantiate.LoginModule.module.because.it.does.not.provide.a.no.argument.constructor=impossibile creare un''istanza di LoginModule {0} in quanto non restituisce un argomento vuoto per il costruttore
+unable.to.instantiate.LoginModule=impossibile creare un'istanza di LoginModule
+unable.to.instantiate.LoginModule.=impossibile creare un'istanza di LoginModule:\u0020
+unable.to.find.LoginModule.class.=impossibile trovare la classe LoginModule:\u0020
+unable.to.access.LoginModule.=impossibile accedere a LoginModule\u0020
+Login.Failure.all.modules.ignored=Errore di login: tutti i moduli sono stati ignorati
+
+# sun.security.provider.PolicyFile
+
+java.security.policy.error.parsing.policy.message=java.security.policy: errore durante l''analisi di {0}:\n\t{1}
+java.security.policy.error.adding.Permission.perm.message=java.security.policy: errore durante l''aggiunta dell''autorizzazione {0}:\n\t{1}
+java.security.policy.error.adding.Entry.message=java.security.policy: errore durante l''aggiunta della voce:\n\t{0}
+alias.name.not.provided.pe.name.=impossibile fornire nome alias ({0})
+unable.to.perform.substitution.on.alias.suffix=impossibile eseguire una sostituzione sull''alias, {0}
+substitution.value.prefix.unsupported=valore sostituzione, {0}, non supportato
+SPACE=\u0020
+LPARAM=(
+RPARAM=)
+type.can.t.be.null=il tipo non può essere nullo
+
+# sun.security.provider.PolicyParser
+keystorePasswordURL.can.not.be.specified.without.also.specifying.keystore=Impossibile specificare keystorePasswordURL senza specificare anche il keystore
+expected.keystore.type=tipo keystore previsto
+expected.keystore.provider=provider di keystore previsto
+multiple.Codebase.expressions=espressioni Codebase multiple
+multiple.SignedBy.expressions=espressioni SignedBy multiple
+duplicate.keystore.domain.name=nome dominio keystore duplicato: {0}
+duplicate.keystore.name=nome keystore duplicato: {0}
+SignedBy.has.empty.alias=SignedBy presenta un alias vuoto
+can.not.specify.Principal.with.a.wildcard.class.without.a.wildcard.name=impossibile specificare un principal con una classe carattere jolly senza un nome carattere jolly
+expected.codeBase.or.SignedBy.or.Principal=previsto codeBase o SignedBy o principal
+expected.permission.entry=prevista voce di autorizzazione
+number.=numero\u0020
+expected.expect.read.end.of.file.=previsto [{0}], letto [end of file]
+expected.read.end.of.file.=previsto [;], letto [end of file]
+line.number.msg=riga {0}: {1}
+line.number.expected.expect.found.actual.=riga {0}: previsto [{1}], trovato [{2}]
+null.principalClass.or.principalName=principalClass o principalName nullo
+
+# sun.security.pkcs11.SunPKCS11
+PKCS11.Token.providerName.Password.=Password per token PKCS11 [{0}]:\u0020
+
+# --- DEPRECATED ---
+# javax.security.auth.Policy
+unable.to.instantiate.Subject.based.policy=impossibile creare un'istanza dei criteri basati sull'oggetto
diff --git a/src/java.base/share/classes/sun/security/util/resources/security_ja.properties b/src/java.base/share/classes/sun/security/util/resources/security_ja.properties
new file mode 100644
index 00000000000..b9ec0a82cb9
--- /dev/null
+++ b/src/java.base/share/classes/sun/security/util/resources/security_ja.properties
@@ -0,0 +1,76 @@
+#
+# Copyright (c) 2000, 2025, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute 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.
+#
+
+# javax.security.auth.PrivateCredentialPermission
+invalid.null.input.s.=nullの入力は無効です
+actions.can.only.be.read.=アクションは'読込み'のみ可能です
+permission.name.name.syntax.invalid.=アクセス権名[{0}]の構文が無効です:\u0020
+Credential.Class.not.followed.by.a.Principal.Class.and.Name=Credentialクラスの次にPrincipalクラスおよび名前がありません
+Principal.Class.not.followed.by.a.Principal.Name=Principalクラスの次にプリンシパル名がありません
+Principal.Name.must.be.surrounded.by.quotes=プリンシパル名は引用符で囲む必要があります
+Principal.Name.missing.end.quote=プリンシパル名の最後に引用符がありません
+PrivateCredentialPermission.Principal.Class.can.not.be.a.wildcard.value.if.Principal.Name.is.not.a.wildcard.value=プリンシパル名がワイルドカード(*)値でない場合、PrivateCredentialPermissionのPrincipalクラスをワイルドカード(*)値にすることはできません
+CredOwner.Principal.Class.class.Principal.Name.name=CredOwner:\n\tPrincipalクラス={0}\n\tプリンシパル名={1}
+
+# javax.security.auth.x500
+provided.null.name=nullの名前が指定されました
+provided.null.keyword.map=nullのキーワード・マップが指定されました
+provided.null.OID.map=nullのOIDマップが指定されました
+
+# javax.security.auth.Subject
+NEWLINE=\n
+invalid.null.action.provided=無効なnullアクションが指定されました
+invalid.null.Class.provided=無効なnullクラスが指定されました
+Subject.=サブジェクト:\n
+.Principal.=\tプリンシパル:\u0020
+.Public.Credential.=\t公開資格:\u0020
+.Private.Credential.=\t非公開資格:\u0020
+.Private.Credential.inaccessible.=\t非公開資格にはアクセスできません\n
+Subject.is.read.only=サブジェクトは読取り専用です
+attempting.to.add.an.object.which.is.not.an.instance.of.java.security.Principal.to.a.Subject.s.Principal.Set=java.security.Principalのインスタンスではないオブジェクトを、サブジェクトのプリンシパル・セットに追加しようとしました
+attempting.to.add.an.object.which.is.not.an.instance.of.class={0}のインスタンスではないオブジェクトを追加しようとしました
+
+# javax.security.auth.login.AppConfigurationEntry
+LoginModuleControlFlag.=LoginModuleControlFlag:\u0020
+
+# javax.security.auth.login.LoginContext
+Invalid.null.input.name=無効なnull入力: 名前
+No.LoginModules.configured.for.name={0}用に構成されたLoginModulesはありません
+invalid.null.Subject.provided=無効なnullサブジェクトが指定されました
+invalid.null.CallbackHandler.provided=無効なnull CallbackHandlerが指定されました
+null.subject.logout.called.before.login=nullサブジェクト - ログインする前にログアウトが呼び出されました
+Login.Failure.all.modules.ignored=ログイン失敗: すべてのモジュールは無視されます
+
+# sun.security.provider.PolicyParser
+duplicate.keystore.domain.name=重複するキーストア・ドメイン名: {0}
+duplicate.keystore.name=重複するキーストア名: {0}
+number.=数\u0020
+expected.expect.read.end.of.file.=[{0}]ではなく[ファイルの終わり]が読み込まれました
+expected.read.end.of.file.=[;]ではなく[ファイルの終わり]が読み込まれました
+line.number.msg=行{0}: {1}
+line.number.expected.expect.found.actual.=行{0}: [{1}]ではなく[{2}]が検出されました
+
+# sun.security.pkcs11.SunPKCS11
+PKCS11.Token.providerName.Password.=PKCS11トークン[{0}]パスワード:\u0020
diff --git a/src/java.base/share/classes/sun/security/util/resources/security_ko.properties b/src/java.base/share/classes/sun/security/util/resources/security_ko.properties
new file mode 100644
index 00000000000..7f275dfca47
--- /dev/null
+++ b/src/java.base/share/classes/sun/security/util/resources/security_ko.properties
@@ -0,0 +1,110 @@
+#
+# Copyright (c) 2000, 2025, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute 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.
+#
+
+# javax.security.auth.PrivateCredentialPermission
+invalid.null.input.s.=널 입력값이 부적합합니다.
+actions.can.only.be.read.=작업은 '읽기' 전용입니다.
+permission.name.name.syntax.invalid.=권한 이름 [{0}] 구문이 부적합함:\u0020
+Credential.Class.not.followed.by.a.Principal.Class.and.Name=인증서 클래스 다음에 주체 클래스와 이름이 없습니다.
+Principal.Class.not.followed.by.a.Principal.Name=주체 클래스 다음에 주체 이름이 없습니다.
+Principal.Name.must.be.surrounded.by.quotes=주체 이름은 따옴표로 묶어야 합니다.
+Principal.Name.missing.end.quote=주체 이름에 닫는 따옴표가 누락되었습니다.
+PrivateCredentialPermission.Principal.Class.can.not.be.a.wildcard.value.if.Principal.Name.is.not.a.wildcard.value=주체 이름이 와일드 카드 문자(*) 값이 아닌 경우 PrivateCredentialPermission 주체 클래스는 와일드 카드 문자(*) 값일 수 없습니다.
+CredOwner.Principal.Class.class.Principal.Name.name=CredOwner:\n\t주체 클래스 = {0}\n\t주체 이름 = {1}
+
+# javax.security.auth.x500
+provided.null.name=널 이름을 제공했습니다.
+provided.null.keyword.map=널 키워드 맵을 제공했습니다.
+provided.null.OID.map=널 OID 맵을 제공했습니다.
+
+# javax.security.auth.Subject
+NEWLINE=\n
+invalid.null.AccessControlContext.provided=부적합한 널 AccessControlContext가 제공되었습니다.
+invalid.null.action.provided=부적합한 널 작업이 제공되었습니다.
+invalid.null.Class.provided=부적합한 널 클래스가 제공되었습니다.
+Subject.=제목:\n
+.Principal.=\t주체:\u0020
+.Public.Credential.=\t공용 인증서:\u0020
+.Private.Credentials.inaccessible.=\t전용 인증서에 액세스할 수 없습니다.\n
+.Private.Credential.=\t전용 인증서:\u0020
+.Private.Credential.inaccessible.=\t전용 인증서에 액세스할 수 없습니다.\n
+Subject.is.read.only=제목이 읽기 전용입니다.
+attempting.to.add.an.object.which.is.not.an.instance.of.java.security.Principal.to.a.Subject.s.Principal.Set=java.security.Principal의 인스턴스가 아닌 객체를 제목의 주체 집합에 추가하려고 시도하는 중
+attempting.to.add.an.object.which.is.not.an.instance.of.class={0}의 인스턴스가 아닌 객체를 추가하려고 시도하는 중
+
+# javax.security.auth.login.AppConfigurationEntry
+LoginModuleControlFlag.=LoginModuleControlFlag:\u0020
+
+# javax.security.auth.login.LoginContext
+Invalid.null.input.name=부적합한 널 입력값: 이름
+No.LoginModules.configured.for.name={0}에 대해 구성된 LoginModules가 없습니다.
+invalid.null.Subject.provided=부적합한 널 제목이 제공되었습니다.
+invalid.null.CallbackHandler.provided=부적합한 널 CallbackHandler가 제공되었습니다.
+null.subject.logout.called.before.login=널 제목 - 로그인 전에 로그아웃이 호출되었습니다.
+unable.to.instantiate.LoginModule.module.because.it.does.not.provide.a.no.argument.constructor=인수가 없는 생성자를 제공하지 않아 LoginModule {0}을(를) 인스턴스화할 수 없습니다.
+unable.to.instantiate.LoginModule=LoginModule을 인스턴스화할 수 없습니다.
+unable.to.instantiate.LoginModule.=LoginModule을 인스턴스화할 수 없음:\u0020
+unable.to.find.LoginModule.class.=LoginModule 클래스를 찾을 수 없음:\u0020
+unable.to.access.LoginModule.=LoginModule에 액세스할 수 없음:\u0020
+Login.Failure.all.modules.ignored=로그인 실패: 모든 모듈이 무시되었습니다.
+
+# sun.security.provider.PolicyFile
+
+java.security.policy.error.parsing.policy.message=java.security.policy: {0}의 구문을 분석하는 중 오류 발생:\n\t{1}
+java.security.policy.error.adding.Permission.perm.message=java.security.policy: {0} 권한을 추가하는 중 오류 발생:\n\t{1}
+java.security.policy.error.adding.Entry.message=java.security.policy: 항목을 추가하는 중 오류 발생:\n\t{0}
+alias.name.not.provided.pe.name.=별칭 이름이 제공되지 않습니다({0}).
+unable.to.perform.substitution.on.alias.suffix={0} 별칭을 대체할 수 없습니다.
+substitution.value.prefix.unsupported=대체 값 {0}은(는) 지원되지 않습니다.
+SPACE=\u0020
+LPARAM=(
+RPARAM=)
+type.can.t.be.null=유형은 널일 수 없습니다.
+
+# sun.security.provider.PolicyParser
+keystorePasswordURL.can.not.be.specified.without.also.specifying.keystore=키 저장소를 지정하지 않고 keystorePasswordURL을 지정할 수 없습니다.
+expected.keystore.type=키 저장소 유형이 필요합니다.
+expected.keystore.provider=키 저장소 제공자가 필요합니다.
+multiple.Codebase.expressions=Codebase 표현식이 여러 개입니다.
+multiple.SignedBy.expressions=SignedBy 표현식이 여러 개입니다.
+duplicate.keystore.domain.name=중복된 키 저장소 도메인 이름: {0}
+duplicate.keystore.name=중복된 키 저장소 이름: {0}
+SignedBy.has.empty.alias=SignedBy의 별칭이 비어 있습니다.
+can.not.specify.Principal.with.a.wildcard.class.without.a.wildcard.name=와일드 카드 문자 이름 없이 와일드 카드 문자 클래스를 사용하는 주체를 지정할 수 없습니다.
+expected.codeBase.or.SignedBy.or.Principal=codeBase, SignedBy 또는 주체가 필요합니다.
+expected.permission.entry=권한 항목이 필요합니다.
+number.=숫자\u0020
+expected.expect.read.end.of.file.=[{0}]이(가) 필요하지만 [파일의 끝]까지 읽었습니다.
+expected.read.end.of.file.=[;]이 필요하지만 [파일의 끝]까지 읽었습니다.
+line.number.msg={0} 행: {1}
+line.number.expected.expect.found.actual.={0} 행: [{1}]이(가) 필요하지만 [{2}]이(가) 발견되었습니다.
+null.principalClass.or.principalName=principalClass 또는 principalName이 널입니다.
+
+# sun.security.pkcs11.SunPKCS11
+PKCS11.Token.providerName.Password.=PKCS11 토큰 [{0}] 비밀번호:\u0020
+
+# --- DEPRECATED ---
+# javax.security.auth.Policy
+unable.to.instantiate.Subject.based.policy=제목 기반 정책을 인스턴스화할 수 없습니다.
diff --git a/src/java.base/share/classes/sun/security/util/resources/security_pt_BR.properties b/src/java.base/share/classes/sun/security/util/resources/security_pt_BR.properties
new file mode 100644
index 00000000000..eb49895c605
--- /dev/null
+++ b/src/java.base/share/classes/sun/security/util/resources/security_pt_BR.properties
@@ -0,0 +1,110 @@
+#
+# Copyright (c) 2000, 2025, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute 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.
+#
+
+# javax.security.auth.PrivateCredentialPermission
+invalid.null.input.s.=entrada(s) nula(s) inválida(s)
+actions.can.only.be.read.=as ações só podem ser 'lidas'
+permission.name.name.syntax.invalid.=sintaxe inválida do nome da permissão [{0}]:\u0020
+Credential.Class.not.followed.by.a.Principal.Class.and.Name=Classe da Credencial não seguida por um Nome e uma Classe do Principal
+Principal.Class.not.followed.by.a.Principal.Name=Classe do Principal não seguida por um Nome do Principal
+Principal.Name.must.be.surrounded.by.quotes=O Nome do Principal deve estar entre aspas
+Principal.Name.missing.end.quote=Faltam as aspas finais no Nome do Principal
+PrivateCredentialPermission.Principal.Class.can.not.be.a.wildcard.value.if.Principal.Name.is.not.a.wildcard.value=A Classe do Principal PrivateCredentialPermission não pode ser um valor curinga (*) se o Nome do Principal não for um valor curinga (*)
+CredOwner.Principal.Class.class.Principal.Name.name=CredOwner:\n\tClasse do Principal = {0}\n\tNome do Principal = {1}
+
+# javax.security.auth.x500
+provided.null.name=nome nulo fornecido
+provided.null.keyword.map=mapa de palavra-chave nulo fornecido
+provided.null.OID.map=mapa OID nulo fornecido
+
+# javax.security.auth.Subject
+NEWLINE=\n
+invalid.null.AccessControlContext.provided=AccessControlContext nulo inválido fornecido
+invalid.null.action.provided=ação nula inválida fornecida
+invalid.null.Class.provided=Classe nula inválida fornecida
+Subject.=Assunto:\n
+.Principal.=\tPrincipal:\u0020
+.Public.Credential.=\tCredencial Pública:\u0020
+.Private.Credentials.inaccessible.=\tCredenciais Privadas inacessíveis\n
+.Private.Credential.=\tCredencial Privada:\u0020
+.Private.Credential.inaccessible.=\tCredencial Privada inacessível\n
+Subject.is.read.only=O Assunto é somente para leitura
+attempting.to.add.an.object.which.is.not.an.instance.of.java.security.Principal.to.a.Subject.s.Principal.Set=tentativa de adicionar um objeto que não é uma instância de java.security.Principal a um conjunto de principais do Subject
+attempting.to.add.an.object.which.is.not.an.instance.of.class=tentativa de adicionar um objeto que não é uma instância de {0}
+
+# javax.security.auth.login.AppConfigurationEntry
+LoginModuleControlFlag.=LoginModuleControlFlag:\u0020
+
+# javax.security.auth.login.LoginContext
+Invalid.null.input.name=Entrada nula inválida: nome
+No.LoginModules.configured.for.name=Nenhum LoginModule configurado para {0}
+invalid.null.Subject.provided=Subject nulo inválido fornecido
+invalid.null.CallbackHandler.provided=CallbackHandler nulo inválido fornecido
+null.subject.logout.called.before.login=Subject nulo - log-out chamado antes do log-in
+unable.to.instantiate.LoginModule.module.because.it.does.not.provide.a.no.argument.constructor=não é possível instanciar LoginModule, {0}, porque ele não fornece um construtor sem argumento
+unable.to.instantiate.LoginModule=não é possível instanciar LoginModule
+unable.to.instantiate.LoginModule.=não é possível instanciar LoginModule:\u0020
+unable.to.find.LoginModule.class.=não é possível localizar a classe LoginModule:\u0020
+unable.to.access.LoginModule.=não é possível acessar LoginModule:\u0020
+Login.Failure.all.modules.ignored=Falha de Log-in: todos os módulos ignorados
+
+# sun.security.provider.PolicyFile
+
+java.security.policy.error.parsing.policy.message=java.security.policy: erro durante o parsing de {0}:\n\t{1}
+java.security.policy.error.adding.Permission.perm.message=java.security.policy: erro ao adicionar a permissão, {0}:\n\t{1}
+java.security.policy.error.adding.Entry.message=java.security.policy: erro ao adicionar a Entrada:\n\t{0}
+alias.name.not.provided.pe.name.=nome de alias não fornecido ({0})
+unable.to.perform.substitution.on.alias.suffix=não é possível realizar a substituição no alias, {0}
+substitution.value.prefix.unsupported=valor da substituição, {0}, não suportado
+SPACE=\u0020
+LPARAM=(
+RPARAM=)
+type.can.t.be.null=o tipo não pode ser nulo
+
+# sun.security.provider.PolicyParser
+keystorePasswordURL.can.not.be.specified.without.also.specifying.keystore=keystorePasswordURL não pode ser especificado sem que a área de armazenamento de chaves também seja especificada
+expected.keystore.type=tipo de armazenamento de chaves esperado
+expected.keystore.provider=fornecedor da área de armazenamento de chaves esperado
+multiple.Codebase.expressions=várias expressões CodeBase
+multiple.SignedBy.expressions=várias expressões SignedBy
+duplicate.keystore.domain.name=nome do domínio da área de armazenamento de teclas duplicado: {0}
+duplicate.keystore.name=nome da área de armazenamento de chaves duplicado: {0}
+SignedBy.has.empty.alias=SignedBy tem alias vazio
+can.not.specify.Principal.with.a.wildcard.class.without.a.wildcard.name=não é possível especificar um principal com uma classe curinga sem um nome curinga
+expected.codeBase.or.SignedBy.or.Principal=CodeBase ou SignedBy ou Principal esperado
+expected.permission.entry=entrada de permissão esperada
+number.=número\u0020
+expected.expect.read.end.of.file.=esperado [{0}], lido [fim do arquivo]
+expected.read.end.of.file.=esperado [;], lido [fim do arquivo]
+line.number.msg=linha {0}: {1}
+line.number.expected.expect.found.actual.=linha {0}: esperada [{1}], encontrada [{2}]
+null.principalClass.or.principalName=principalClass ou principalName nulo
+
+# sun.security.pkcs11.SunPKCS11
+PKCS11.Token.providerName.Password.=Senha PKCS11 de Token [{0}]:\u0020
+
+# --- DEPRECATED ---
+# javax.security.auth.Policy
+unable.to.instantiate.Subject.based.policy=não é possível instanciar a política com base em Subject
diff --git a/src/java.base/share/classes/sun/security/util/resources/security_sv.properties b/src/java.base/share/classes/sun/security/util/resources/security_sv.properties
new file mode 100644
index 00000000000..b06ea96456b
--- /dev/null
+++ b/src/java.base/share/classes/sun/security/util/resources/security_sv.properties
@@ -0,0 +1,110 @@
+#
+# Copyright (c) 2000, 2025, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute 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.
+#
+
+# javax.security.auth.PrivateCredentialPermission
+invalid.null.input.s.=ogiltiga null-indata
+actions.can.only.be.read.=åtgärder kan endast 'läsas'
+permission.name.name.syntax.invalid.=syntaxen för behörighetsnamnet [{0}] är ogiltig:\u0020
+Credential.Class.not.followed.by.a.Principal.Class.and.Name=Inloggningsuppgiftsklassen följs inte av klass eller namn för identitetshavare
+Principal.Class.not.followed.by.a.Principal.Name=Identitetshavareklassen följs inte av något identitetshavarenamn
+Principal.Name.must.be.surrounded.by.quotes=Identitetshavarenamnet måste anges inom citattecken
+Principal.Name.missing.end.quote=Identitetshavarenamnet saknar avslutande citattecken
+PrivateCredentialPermission.Principal.Class.can.not.be.a.wildcard.value.if.Principal.Name.is.not.a.wildcard.value=Identitetshavareklassen PrivateCredentialPermission kan inte ha något jokertecken (*) om inte namnet på identitetshavaren anges med jokertecken (*)
+CredOwner.Principal.Class.class.Principal.Name.name=CredOwner:\n\tIdentitetshavareklass = {0}\n\tIdentitetshavarenamn = {1}
+
+# javax.security.auth.x500
+provided.null.name=null-namn angavs
+provided.null.keyword.map=nullnyckelordsmappning angavs
+provided.null.OID.map=null-OID-mappning angavs
+
+# javax.security.auth.Subject
+NEWLINE=\n
+invalid.null.AccessControlContext.provided=ogiltigt null-AccessControlContext
+invalid.null.action.provided=ogiltig null-funktion
+invalid.null.Class.provided=ogiltig null-klass
+Subject.=Innehavare:\n
+.Principal.=\tIdentitetshavare:\u0020
+.Public.Credential.=\tOffentlig inloggning:\u0020
+.Private.Credentials.inaccessible.=\tPrivat inloggning är inte tillgänglig\n
+.Private.Credential.=\tPrivat inloggning:\u0020
+.Private.Credential.inaccessible.=\tPrivat inloggning är inte tillgänglig\n
+Subject.is.read.only=Innehavare är skrivskyddad
+attempting.to.add.an.object.which.is.not.an.instance.of.java.security.Principal.to.a.Subject.s.Principal.Set=försök att lägga till ett objekt som inte är en instans av java.security.Principal till ett subjekts uppsättning av identitetshavare
+attempting.to.add.an.object.which.is.not.an.instance.of.class=försöker lägga till ett objekt som inte är en instans av {0}
+
+# javax.security.auth.login.AppConfigurationEntry
+LoginModuleControlFlag.=LoginModuleControlFlag:\u0020
+
+# javax.security.auth.login.LoginContext
+Invalid.null.input.name=Ogiltiga null-indata: namn
+No.LoginModules.configured.for.name=Inga inloggningsmoduler har konfigurerats för {0}
+invalid.null.Subject.provided=ogiltig null-subjekt
+invalid.null.CallbackHandler.provided=ogiltig null-CallbackHandler
+null.subject.logout.called.before.login=null-subjekt - utloggning anropades före inloggning
+unable.to.instantiate.LoginModule.module.because.it.does.not.provide.a.no.argument.constructor=kan inte instansiera LoginModule, {0}, eftersom den inte tillhandahåller någon icke-argumentskonstruktor
+unable.to.instantiate.LoginModule=kan inte instansiera LoginModule
+unable.to.instantiate.LoginModule.=kan inte instansiera LoginModule:\u0020
+unable.to.find.LoginModule.class.=hittar inte LoginModule-klassen:\u0020
+unable.to.access.LoginModule.=ingen åtkomst till LoginModule:\u0020
+Login.Failure.all.modules.ignored=Inloggningsfel: alla moduler ignoreras
+
+# sun.security.provider.PolicyFile
+
+java.security.policy.error.parsing.policy.message=java.security.policy: fel vid tolkning av {0}:\n\t{1}
+java.security.policy.error.adding.Permission.perm.message=java.security.policy: fel vid tillägg av behörighet, {0}:\n\t{1}
+java.security.policy.error.adding.Entry.message=java.security.policy: fel vid tillägg av post:\n\t{0}
+alias.name.not.provided.pe.name.=aliasnamn ej angivet ({0})
+unable.to.perform.substitution.on.alias.suffix=kan ej ersätta alias, {0}
+substitution.value.prefix.unsupported=ersättningsvärde, {0}, stöds ej
+SPACE=\u0020
+LPARAM=(
+RPARAM=)
+type.can.t.be.null=typen kan inte vara null
+
+# sun.security.provider.PolicyParser
+keystorePasswordURL.can.not.be.specified.without.also.specifying.keystore=kan inte ange keystorePasswordURL utan att ange nyckellager
+expected.keystore.type=förväntad nyckellagertyp
+expected.keystore.provider=nyckellagerleverantör förväntades
+multiple.Codebase.expressions=flera CodeBase-uttryck
+multiple.SignedBy.expressions=flera SignedBy-uttryck
+duplicate.keystore.domain.name=domännamn för dubbelt nyckellager: {0}
+duplicate.keystore.name=namn för dubbelt nyckellager: {0}
+SignedBy.has.empty.alias=SignedBy har ett tomt alias
+can.not.specify.Principal.with.a.wildcard.class.without.a.wildcard.name=kan inte ange identitetshavare med en jokerteckenklass utan ett jokerteckennamn
+expected.codeBase.or.SignedBy.or.Principal=förväntad codeBase eller SignedBy eller identitetshavare
+expected.permission.entry=förväntade behörighetspost
+number.=nummer
+expected.expect.read.end.of.file.=förväntade [{0}], läste [filslut]
+expected.read.end.of.file.=förväntade [;], läste [filslut]
+line.number.msg=rad {0}: {1}
+line.number.expected.expect.found.actual.=rad {0}: förväntade [{1}], hittade [{2}]
+null.principalClass.or.principalName=null-principalClass eller -principalName
+
+# sun.security.pkcs11.SunPKCS11
+PKCS11.Token.providerName.Password.=Lösenord för PKCS11-token [{0}]:\u0020
+
+# --- DEPRECATED ---
+# javax.security.auth.Policy
+unable.to.instantiate.Subject.based.policy=kan inte instansiera subjektbaserad policy
diff --git a/src/java.base/share/classes/sun/security/util/resources/security_zh_CN.properties b/src/java.base/share/classes/sun/security/util/resources/security_zh_CN.properties
new file mode 100644
index 00000000000..0653fbdca52
--- /dev/null
+++ b/src/java.base/share/classes/sun/security/util/resources/security_zh_CN.properties
@@ -0,0 +1,76 @@
+#
+# Copyright (c) 2000, 2025, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute 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.
+#
+
+# javax.security.auth.PrivateCredentialPermission
+invalid.null.input.s.=无效的空输入
+actions.can.only.be.read.=操作只能为 '读取'
+permission.name.name.syntax.invalid.=权限名称 [{0}] 语法无效:\u0020
+Credential.Class.not.followed.by.a.Principal.Class.and.Name=身份证明类后面未跟随主用户类及名称
+Principal.Class.not.followed.by.a.Principal.Name=主用户类后面未跟随主用户名称
+Principal.Name.must.be.surrounded.by.quotes=主用户名称必须放在引号内
+Principal.Name.missing.end.quote=主用户名称缺少右引号
+PrivateCredentialPermission.Principal.Class.can.not.be.a.wildcard.value.if.Principal.Name.is.not.a.wildcard.value=如果主用户名称不是通配符 (*) 值, 那么 PrivateCredentialPermission 主用户类不能是通配符 (*) 值
+CredOwner.Principal.Class.class.Principal.Name.name=CredOwner:\n\t主用户类 = {0}\n\t主用户名称 = {1}
+
+# javax.security.auth.x500
+provided.null.name=提供的名称为空值
+provided.null.keyword.map=提供的关键字映射为空值
+provided.null.OID.map=提供的 OID 映射为空值
+
+# javax.security.auth.Subject
+NEWLINE=\n
+invalid.null.action.provided=提供了无效的空操作
+invalid.null.Class.provided=提供了无效的空类
+Subject.=主体: \n
+.Principal.=\t主用户:\u0020
+.Public.Credential.=\t公共身份证明:\u0020
+.Private.Credential.=\t专用身份证明:\u0020
+.Private.Credential.inaccessible.=\t无法访问专用身份证明\n
+Subject.is.read.only=主体为只读
+attempting.to.add.an.object.which.is.not.an.instance.of.java.security.Principal.to.a.Subject.s.Principal.Set=正在尝试将一个非 java.security.Principal 实例的对象添加到主体的主用户集中
+attempting.to.add.an.object.which.is.not.an.instance.of.class=正在尝试添加一个非{0}实例的对象
+
+# javax.security.auth.login.AppConfigurationEntry
+LoginModuleControlFlag.=LoginModuleControlFlag:\u0020
+
+# javax.security.auth.login.LoginContext
+Invalid.null.input.name=无效空输入: 名称
+No.LoginModules.configured.for.name=没有为{0}配置 LoginModules
+invalid.null.Subject.provided=提供了无效的空主体
+invalid.null.CallbackHandler.provided=提供了无效的空 CallbackHandler
+null.subject.logout.called.before.login=空主体 - 在登录之前调用了注销
+Login.Failure.all.modules.ignored=登录失败: 忽略所有模块
+
+# sun.security.provider.PolicyParser
+duplicate.keystore.domain.name=密钥库域名重复: {0}
+duplicate.keystore.name=密钥库名称重复: {0}
+number.=编号\u0020
+expected.expect.read.end.of.file.=应为 [{0}], 读取的是 [文件结尾]
+expected.read.end.of.file.=应为 [;], 读取的是 [文件结尾]
+line.number.msg=列{0}: {1}
+line.number.expected.expect.found.actual.=行号 {0}: 应为 [{1}], 找到 [{2}]
+
+# sun.security.pkcs11.SunPKCS11
+PKCS11.Token.providerName.Password.=PKCS11 标记 [{0}] 口令:\u0020
diff --git a/src/java.base/share/classes/sun/security/util/resources/security_zh_TW.properties b/src/java.base/share/classes/sun/security/util/resources/security_zh_TW.properties
new file mode 100644
index 00000000000..efcf19cc598
--- /dev/null
+++ b/src/java.base/share/classes/sun/security/util/resources/security_zh_TW.properties
@@ -0,0 +1,110 @@
+#
+# Copyright (c) 2000, 2025, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute 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.
+#
+
+# javax.security.auth.PrivateCredentialPermission
+invalid.null.input.s.=無效空值輸入
+actions.can.only.be.read.=動作只能被「讀取」
+permission.name.name.syntax.invalid.=權限名稱 [{0}] 是無效的語法:\u0020
+Credential.Class.not.followed.by.a.Principal.Class.and.Name=Credential 類別後面不是 Principal 類別及名稱
+Principal.Class.not.followed.by.a.Principal.Name=Principal 類別後面不是 Principal 名稱
+Principal.Name.must.be.surrounded.by.quotes=Principal 名稱必須以引號圈住
+Principal.Name.missing.end.quote=Principal 名稱缺少下引號
+PrivateCredentialPermission.Principal.Class.can.not.be.a.wildcard.value.if.Principal.Name.is.not.a.wildcard.value=如果 Principal 名稱不是一個萬用字元 (*) 值，那麼 PrivateCredentialPermission Principal 類別就不能是萬用字元 (*) 值
+CredOwner.Principal.Class.class.Principal.Name.name=CredOwner:\n\tPrincipal 類別 = {0}\n\tPrincipal 名稱 = {1}
+
+# javax.security.auth.x500
+provided.null.name=提供空值名稱
+provided.null.keyword.map=提供空值關鍵字對映
+provided.null.OID.map=提供空值 OID 對映
+
+# javax.security.auth.Subject
+NEWLINE=\n
+invalid.null.AccessControlContext.provided=提供無效的空值 AccessControlContext
+invalid.null.action.provided=提供無效的空值動作
+invalid.null.Class.provided=提供無效的空值類別
+Subject.=主題:\n
+.Principal.=\tPrincipal:\u0020
+.Public.Credential.=\t公用證明資料:\u0020
+.Private.Credentials.inaccessible.=\t私人證明資料無法存取\n
+.Private.Credential.=\t私人證明資料:\u0020
+.Private.Credential.inaccessible.=\t私人證明資料無法存取\n
+Subject.is.read.only=主題為唯讀
+attempting.to.add.an.object.which.is.not.an.instance.of.java.security.Principal.to.a.Subject.s.Principal.Set=試圖新增一個非 java.security.Principal 執行處理的物件至主題的 Principal 群中
+attempting.to.add.an.object.which.is.not.an.instance.of.class=試圖新增一個非 {0} 執行處理的物件
+
+# javax.security.auth.login.AppConfigurationEntry
+LoginModuleControlFlag.=LoginModuleControlFlag:\u0020
+
+# javax.security.auth.login.LoginContext
+Invalid.null.input.name=無效空值輸入: 名稱
+No.LoginModules.configured.for.name=無針對 {0} 設定的 LoginModules
+invalid.null.Subject.provided=提供無效空值主題
+invalid.null.CallbackHandler.provided=提供無效空值 CallbackHandler
+null.subject.logout.called.before.login=空值主題 - 在登入之前即呼叫登出
+unable.to.instantiate.LoginModule.module.because.it.does.not.provide.a.no.argument.constructor=無法創設 LoginModule，{0}，因為它並未提供非引數的建構子
+unable.to.instantiate.LoginModule=無法建立 LoginModule
+unable.to.instantiate.LoginModule.=無法建立 LoginModule:\u0020
+unable.to.find.LoginModule.class.=找不到 LoginModule 類別:\u0020
+unable.to.access.LoginModule.=無法存取 LoginModule:\u0020
+Login.Failure.all.modules.ignored=登入失敗: 忽略所有模組
+
+# sun.security.provider.PolicyFile
+
+java.security.policy.error.parsing.policy.message=java.security.policy: 剖析錯誤 {0}: \n\t{1}
+java.security.policy.error.adding.Permission.perm.message=java.security.policy: 新增權限錯誤 {0}: \n\t{1}
+java.security.policy.error.adding.Entry.message=java.security.policy: 新增項目錯誤: \n\t{0}
+alias.name.not.provided.pe.name.=未提供別名名稱 ({0})
+unable.to.perform.substitution.on.alias.suffix=無法對別名執行替換，{0}
+substitution.value.prefix.unsupported=不支援的替換值，{0}
+SPACE=\u0020
+LPARAM=(
+RPARAM=)
+type.can.t.be.null=輸入不能為空值
+
+# sun.security.provider.PolicyParser
+keystorePasswordURL.can.not.be.specified.without.also.specifying.keystore=指定 keystorePasswordURL 需要同時指定金鑰儲存庫
+expected.keystore.type=預期的金鑰儲存庫類型
+expected.keystore.provider=預期的金鑰儲存庫提供者
+multiple.Codebase.expressions=多重 Codebase 表示式
+multiple.SignedBy.expressions=多重 SignedBy 表示式
+duplicate.keystore.domain.name=重複的金鑰儲存庫網域名稱: {0}
+duplicate.keystore.name=重複的金鑰儲存庫名稱: {0}
+SignedBy.has.empty.alias=SignedBy 有空別名
+can.not.specify.Principal.with.a.wildcard.class.without.a.wildcard.name=沒有萬用字元名稱，無法指定含有萬用字元類別的 Principal
+expected.codeBase.or.SignedBy.or.Principal=預期的 codeBase 或 SignedBy 或 Principal
+expected.permission.entry=預期的權限項目
+number.=號碼\u0020
+expected.expect.read.end.of.file.=預期的 [{0}], 讀取 [end of file]
+expected.read.end.of.file.=預期的 [;], 讀取 [end of file]
+line.number.msg=行 {0}: {1}
+line.number.expected.expect.found.actual.=行 {0}: 預期的 [{1}]，發現 [{2}]
+null.principalClass.or.principalName=空值 principalClass 或 principalName
+
+# sun.security.pkcs11.SunPKCS11
+PKCS11.Token.providerName.Password.=PKCS11 記號 [{0}] 密碼:\u0020
+
+# --- DEPRECATED ---
+# javax.security.auth.Policy
+unable.to.instantiate.Subject.based.policy=無法建立主題式的原則
diff --git a/src/jdk.jartool/share/classes/sun/security/tools/jarsigner/Main.java b/src/jdk.jartool/share/classes/sun/security/tools/jarsigner/Main.java
index 5931e943e30..ab5d8fc6842 100644
--- a/src/jdk.jartool/share/classes/sun/security/tools/jarsigner/Main.java
+++ b/src/jdk.jartool/share/classes/sun/security/tools/jarsigner/Main.java
@@ -89,7 +89,7 @@ public class Main {
     // for i18n
     private static final java.util.ResourceBundle rb =
         java.util.ResourceBundle.getBundle
-        ("sun.security.tools.jarsigner.Resources");
+        ("sun.security.tools.jarsigner.resources.jarsigner");
     private static final Collator collator = Collator.getInstance();
     static {
         // this is for case insensitive string comparisions
diff --git a/src/jdk.jartool/share/classes/sun/security/tools/jarsigner/Resources.java b/src/jdk.jartool/share/classes/sun/security/tools/jarsigner/Resources.java
deleted file mode 100644
index 82d3fb0a2ae..00000000000
--- a/src/jdk.jartool/share/classes/sun/security/tools/jarsigner/Resources.java
+++ /dev/null
@@ -1,340 +0,0 @@
-/*
- * Copyright (c) 2000, 2025, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute 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.tools.jarsigner;
-
-/**
- * <p> This class represents the <code>ResourceBundle</code>
- * for JarSigner.
- *
- */
-public class Resources extends java.util.ListResourceBundle {
-
-    private static final Object[][] contents = {
-
-        // shared (from jarsigner)
-        {"SPACE", " "},
-        {"6SPACE", "      "},
-        {"COMMA", ", "},
-
-        {"provclass.not.a.provider", "%s not a provider"},
-        {"provider.name.not.found", "Provider named \"%s\" not found"},
-        {"provider.class.not.found", "Provider \"%s\" not found"},
-        {"jarsigner.error.", "jarsigner error: "},
-        {"Illegal.option.", "Illegal option: "},
-        {".keystore.must.be.NONE.if.storetype.is.{0}",
-                "-keystore must be NONE if -storetype is {0}"},
-        {".keypass.can.not.be.specified.if.storetype.is.{0}",
-                "-keypass can not be specified if -storetype is {0}"},
-        {"If.protected.is.specified.then.storepass.and.keypass.must.not.be.specified",
-                "If -protected is specified, then -storepass and -keypass must not be specified"},
-        {"If.keystore.is.not.password.protected.then.storepass.and.keypass.must.not.be.specified",
-                 "If keystore is not password protected, then -storepass and -keypass must not be specified"},
-        {"Usage.jarsigner.options.jar.file.alias",
-                "Usage: jarsigner [options] jar-file alias"},
-        {".jarsigner.verify.options.jar.file.alias.",
-                "       jarsigner -verify [options] jar-file [alias...]"},
-        {".jarsigner.version",
-                "       jarsigner -version"},
-        {".keystore.url.keystore.location",
-                "[-keystore <url>]           keystore location"},
-        {".storepass.password.password.for.keystore.integrity",
-            "[-storepass <password>]     password for keystore integrity"},
-        {".storetype.type.keystore.type",
-                "[-storetype <type>]         keystore type"},
-        {".keypass.password.password.for.private.key.if.different.",
-                "[-keypass <password>]       password for private key (if different)"},
-        {".certchain.file.name.of.alternative.certchain.file",
-                "[-certchain <file>]         name of alternative certchain file"},
-        {".sigfile.file.name.of.SF.DSA.file",
-                "[-sigfile <file>]           name of .SF/.DSA file"},
-        {".signedjar.file.name.of.signed.JAR.file",
-                "[-signedjar <file>]         name of signed JAR file"},
-        {".digestalg.algorithm.name.of.digest.algorithm",
-                "[-digestalg <algorithm>]    name of digest algorithm"},
-        {".sigalg.algorithm.name.of.signature.algorithm",
-                "[-sigalg <algorithm>]       name of signature algorithm"},
-        {".verify.verify.a.signed.JAR.file",
-                "[-verify]                   verify a signed JAR file"},
-        {".version.print.the.program.version",
-                "[-version]                  print the program version"},
-        {".verbose.suboptions.verbose.output.when.signing.verifying.",
-                "[-verbose[:suboptions]]     verbose output when signing/verifying."},
-        {".suboptions.can.be.all.grouped.or.summary",
-                "                            suboptions can be all, grouped or summary"},
-        {".certs.display.certificates.when.verbose.and.verifying",
-                "[-certs]                    display certificates when verbose and verifying"},
-        {".certs.revocation.check",
-                "[-revCheck]                 Enable certificate revocation check"},
-        {".tsa.url.location.of.the.Timestamping.Authority",
-                "[-tsa <url>]                location of the Timestamping Authority"},
-        {".tsacert.alias.public.key.certificate.for.Timestamping.Authority",
-                "[-tsacert <alias>]          public key certificate for Timestamping Authority"},
-        {".tsapolicyid.tsapolicyid.for.Timestamping.Authority",
-                "[-tsapolicyid <oid>]        TSAPolicyID for Timestamping Authority"},
-        {".tsadigestalg.algorithm.of.digest.data.in.timestamping.request",
-                "[-tsadigestalg <algorithm>] algorithm of digest data in timestamping request"},
-        {".internalsf.include.the.SF.file.inside.the.signature.block",
-                "[-internalsf]               include the .SF file inside the signature block"},
-        {".sectionsonly.don.t.compute.hash.of.entire.manifest",
-                "[-sectionsonly]             don't compute hash of entire manifest"},
-        {".protected.keystore.has.protected.authentication.path",
-                "[-protected]                keystore has protected authentication path"},
-        {".providerName.name.provider.name",
-                "[-providerName <name>]      provider name"},
-        {".add.provider.option",
-                "[-addprovider <name>        add security provider by name (e.g. SunPKCS11)"},
-        {".providerArg.option.1",
-                "  [-providerArg <arg>]] ... configure argument for -addprovider"},
-        {".providerClass.option",
-                "[-providerClass <class>     add security provider by fully-qualified class name"},
-        {".providerArg.option.2",
-                "  [-providerArg <arg>]] ... configure argument for -providerClass"},
-        {".providerPath.option",
-                "[-providerPath <list>]      provider classpath"},
-        {".strict.treat.warnings.as.errors",
-                "[-strict]                   treat warnings as errors"},
-        {".conf.url.specify.a.pre.configured.options.file",
-                "[-conf <url>]               specify a pre-configured options file"},
-        {".print.this.help.message",
-                "[-? -h --help]              Print this help message"},
-        {"Option.lacks.argument", "Option lacks argument"},
-        {"Please.type.jarsigner.help.for.usage", "Please type jarsigner --help for usage"},
-        {"Please.specify.jarfile.name", "Please specify jarfile name"},
-        {"Please.specify.alias.name", "Please specify alias name"},
-        {"Only.one.alias.can.be.specified", "Only one alias can be specified"},
-        {"This.jar.contains.signed.entries.which.is.not.signed.by.the.specified.alias.es.",
-                 "This jar contains signed entries which are not signed by the specified alias(es)."},
-        {"This.jar.contains.signed.entries.that.s.not.signed.by.alias.in.this.keystore.",
-                  "This jar contains signed entries that are not signed by alias in this keystore."},
-        {"s", "s"},
-        {"m", "m"},
-        {"k", "k"},
-        {"X", "X"},
-        {"q", "?"},
-        {".and.d.more.", "(and %d more)"},
-        {".s.signature.was.verified.",
-                "  s = signature was verified "},
-        {".m.entry.is.listed.in.manifest",
-                "  m = entry is listed in manifest"},
-        {".k.at.least.one.certificate.was.found.in.keystore",
-                "  k = at least one certificate was found in keystore"},
-        {".X.not.signed.by.specified.alias.es.",
-                "  X = not signed by specified alias(es)"},
-        {".q.unsigned.entry",
-                "  ? = unsigned entry"},
-        {"no.manifest.", "no manifest."},
-        {".Signature.related.entries.","(Signature related entries)"},
-        {".Unsigned.entries.", "(Unsigned entries)"},
-        {".Directory.entries.", "(Directory entries)"},
-        {"jar.is.unsigned",
-                "jar is unsigned."},
-        {"jar.treated.unsigned",
-                "WARNING: Signature is either not parsable or not verifiable, and the jar will be treated as unsigned. For more information, re-run jarsigner with debug enabled (-J-Djava.security.debug=jar)."},
-        {"jar.treated.unsigned.see.weak",
-                "The jar will be treated as unsigned, because it is signed with a weak algorithm that is now disabled.\n\nRe-run jarsigner with the -verbose option for more details."},
-        {"jar.treated.unsigned.see.weak.verbose",
-                "WARNING: The jar will be treated as unsigned, because it is signed with a weak algorithm that is now disabled by the security property:"},
-        {"jar.signed.", "jar signed."},
-        {"jar.signed.with.signer.errors.", "jar signed, with signer errors."},
-        {"jar.verified.", "jar verified."},
-        {"jar.verified.with.signer.errors.", "jar verified, with signer errors."},
-
-        {"history.with.ts", "- Signed by \"%1$s\"\n    Digest algorithm: %2$s\n    Signature algorithm: %3$s, %4$s\n  Timestamped by \"%6$s\" on %5$tc\n    Timestamp digest algorithm: %7$s\n    Timestamp signature algorithm: %8$s, %9$s"},
-        {"history.without.ts", "- Signed by \"%1$s\"\n    Digest algorithm: %2$s\n    Signature algorithm: %3$s, %4$s"},
-        {"history.nonexistent.entries", "    Warning: nonexistent signed entries: "},
-        {"history.unparsable", "- Unparsable signature-related file %s"},
-        {"history.nosf", "- Missing signature-related file META-INF/%s.SF"},
-        {"history.nobk", "- Missing block file for signature-related file META-INF/%s.SF"},
-
-        {"with.weak", "%s (weak)"},
-        {"with.algparams.weak", "%1$s using %2$s (weak)"},
-        {"with.disabled", "%s (disabled)"},
-        {"with.algparams.disabled", "%1$s using %2$s (disabled)"},
-        {"key.bit", "%s key"},
-        {"key.bit.weak", "%s key (weak)"},
-        {"key.bit.disabled", "%s key (disabled)"},
-        {"nonexistent.entries.found", "This jar contains signed entries for files that do not exist. See the -verbose output for more details."},
-        {"external.file.attributes.detected", "POSIX file permission and/or symlink attributes detected. These attributes are ignored when signing and are not protected by the signature."},
-
-        {"jarsigner.", "jarsigner: "},
-        {"signature.filename.must.consist.of.the.following.characters.A.Z.0.9.or.",
-                "signature filename must consist of the following characters: A-Z, 0-9, _ or -"},
-        {"unable.to.open.jar.file.", "unable to open jar file: "},
-        {"unable.to.create.", "unable to create: "},
-        {".adding.", "   adding: "},
-        {".updating.", " updating: "},
-        {".signing.", "  signing: "},
-        {"attempt.to.rename.signedJarFile.to.jarFile.failed",
-                "attempt to rename {0} to {1} failed"},
-        {"attempt.to.rename.jarFile.to.origJar.failed",
-                "attempt to rename {0} to {1} failed"},
-        {"unable.to.sign.jar.", "unable to sign jar: "},
-        {"Enter.Passphrase.for.keystore.", "Enter Passphrase for keystore: "},
-        {"keystore.load.", "keystore load: "},
-        {"certificate.exception.", "certificate exception: "},
-        {"unable.to.instantiate.keystore.class.",
-                "unable to instantiate keystore class: "},
-        {"Certificate.chain.not.found.for.alias.alias.must.reference.a.valid.KeyStore.key.entry.containing.a.private.key.and",
-                "Certificate chain not found for: {0}.  {1} must reference a valid KeyStore key entry containing a private key and corresponding public key certificate chain."},
-        {"File.specified.by.certchain.does.not.exist",
-                "File specified by -certchain does not exist"},
-        {"Cannot.restore.certchain.from.file.specified",
-                "Cannot restore certchain from file specified"},
-        {"Certificate.chain.not.found.in.the.file.specified.",
-                "Certificate chain not found in the file specified."},
-        {"found.non.X.509.certificate.in.signer.s.chain",
-                "found non-X.509 certificate in signer's chain"},
-        {"Enter.key.password.for.alias.", "Enter key password for {0}: "},
-        {"unable.to.recover.key.from.keystore",
-                "unable to recover key from keystore"},
-        {"key.associated.with.alias.not.a.private.key",
-                "key associated with {0} not a private key"},
-        {"you.must.enter.key.password", "you must enter key password"},
-        {"unable.to.read.password.", "unable to read password: "},
-        {"certificate.is.valid.from", "certificate is valid from {0} to {1}"},
-        {"certificate.expired.on", "certificate expired on {0}"},
-        {"certificate.is.not.valid.until",
-                "certificate is not valid until {0}"},
-        {"certificate.will.expire.on", "certificate will expire on {0}"},
-        {".Invalid.certificate.chain.", "[Invalid certificate chain: "},
-        {".Invalid.TSA.certificate.chain.", "[Invalid TSA certificate chain: "},
-        {"requesting.a.signature.timestamp",
-                "requesting a signature timestamp"},
-        {"TSA.location.", "TSA location: "},
-        {"TSA.certificate.", "TSA certificate: "},
-        {"no.response.from.the.Timestamping.Authority.",
-                "no response from the Timestamping Authority. When connecting"
-                + " from behind a firewall an HTTP or HTTPS proxy may need to"
-                + " be specified. Supply the following options to jarsigner:"},
-        {"or", "or"},
-        {"Certificate.not.found.for.alias.alias.must.reference.a.valid.KeyStore.entry.containing.an.X.509.public.key.certificate.for.the",
-                "Certificate not found for: {0}.  {1} must reference a valid KeyStore entry containing an X.509 public key certificate for the Timestamping Authority."},
-        {"entry.was.signed.on", "entry was signed on {0}"},
-        {"Warning.", "Warning: "},
-        {"Error.", "Error: "},
-        {"...Signer", ">>> Signer"},
-        {"...TSA", ">>> TSA"},
-        {"trusted.certificate", "trusted certificate"},
-        {"This.jar.contains.unsigned.entries.which.have.not.been.integrity.checked.",
-                "This jar contains unsigned entries which have not been integrity-checked. "},
-        {"This.jar.contains.entries.whose.signer.certificate.has.expired.",
-                "This jar contains entries whose signer certificate has expired. "},
-        {"This.jar.contains.entries.whose.signer.certificate.will.expire.within.six.months.",
-                "This jar contains entries whose signer certificate will expire within six months. "},
-        {"This.jar.contains.entries.whose.signer.certificate.is.not.yet.valid.",
-                "This jar contains entries whose signer certificate is not yet valid. "},
-        {"This.jar.contains.entries.whose.signer.certificate.is.self.signed.",
-                "This jar contains entries whose signer certificate is self-signed."},
-        {"Re.run.with.the.verbose.and.certs.options.for.more.details.",
-                "Re-run with the -verbose and -certs options for more details."},
-        {"The.signer.certificate.has.expired.",
-                "The signer certificate has expired."},
-        {"The.timestamp.expired.1.but.usable.2",
-                "The timestamp expired on %1$tY-%1$tm-%1$td. However, the JAR will be valid until the signer certificate expires on %2$tY-%2$tm-%2$td."},
-        {"The.timestamp.has.expired.",
-                "The timestamp has expired."},
-        {"The.signer.certificate.will.expire.within.six.months.",
-                "The signer certificate will expire within six months."},
-        {"The.timestamp.will.expire.within.one.year.on.1",
-                "The timestamp will expire within one year on %1$tY-%1$tm-%1$td."},
-        {"The.timestamp.will.expire.within.one.year.on.1.but.2",
-                "The timestamp will expire within one year on %1$tY-%1$tm-%1$td. However, the JAR will be valid until the signer certificate expires on %2$tY-%2$tm-%2$td."},
-        {"The.signer.certificate.is.not.yet.valid.",
-                "The signer certificate is not yet valid."},
-        {"The.signer.certificate.s.KeyUsage.extension.doesn.t.allow.code.signing.",
-                 "The signer certificate's KeyUsage extension doesn't allow code signing."},
-        {"The.signer.certificate.s.ExtendedKeyUsage.extension.doesn.t.allow.code.signing.",
-                 "The signer certificate's ExtendedKeyUsage extension doesn't allow code signing."},
-        {"The.signer.certificate.s.NetscapeCertType.extension.doesn.t.allow.code.signing.",
-                 "The signer certificate's NetscapeCertType extension doesn't allow code signing."},
-        {"This.jar.contains.entries.whose.signer.certificate.s.KeyUsage.extension.doesn.t.allow.code.signing.",
-                 "This jar contains entries whose signer certificate's KeyUsage extension doesn't allow code signing."},
-        {"This.jar.contains.entries.whose.signer.certificate.s.ExtendedKeyUsage.extension.doesn.t.allow.code.signing.",
-                 "This jar contains entries whose signer certificate's ExtendedKeyUsage extension doesn't allow code signing."},
-        {"This.jar.contains.entries.whose.signer.certificate.s.NetscapeCertType.extension.doesn.t.allow.code.signing.",
-                 "This jar contains entries whose signer certificate's NetscapeCertType extension doesn't allow code signing."},
-        {".{0}.extension.does.not.support.code.signing.",
-                 "[{0} extension does not support code signing]"},
-        {"The.signer.s.certificate.chain.is.invalid.reason.1",
-                "The signer's certificate chain is invalid. Reason: %s"},
-        {"The.tsa.certificate.chain.is.invalid.reason.1",
-                "The TSA certificate chain is invalid. Reason: %s"},
-        {"The.signer.s.certificate.is.self.signed.",
-                "The signer's certificate is self-signed."},
-        {"The.1.algorithm.specified.for.the.2.option.is.considered.a.security.risk..This.algorithm.will.be.disabled.in.a.future.update.",
-                "The %1$s algorithm specified for the %2$s option is considered a security risk. This algorithm will be disabled in a future update."},
-        {"The.1.algorithm.specified.for.the.2.option.is.considered.a.security.risk.and.is.disabled.",
-                "The %1$s algorithm specified for the %2$s option is considered a security risk and is disabled."},
-        {"The.timestamp.digest.algorithm.1.is.considered.a.security.risk..This.algorithm.will.be.disabled.in.a.future.update.",
-                "The %1$s timestamp digest algorithm is considered a security risk. This algorithm will be disabled in a future update."},
-        {"The.digest.algorithm.1.is.considered.a.security.risk..This.algorithm.will.be.disabled.in.a.future.update.",
-                "The %1$s digest algorithm is considered a security risk. This algorithm will be disabled in a future update."},
-        {"The.signature.algorithm.1.is.considered.a.security.risk..This.algorithm.will.be.disabled.in.a.future.update.",
-                "The %1$s signature algorithm is considered a security risk. This algorithm will be disabled in a future update."},
-        {"size.bit.alg",
-                "%1$d-bit %2$s"},
-        {"The.full.keyAlgName.signing.key.is.considered.a.security.risk..It.will.be.disabled.in.a.future.update.",
-                "The %s signing key is considered a security risk. It will be disabled in a future update."},
-        {"The.full.keyAlgName.signing.key.is.considered.a.security.risk.and.is.disabled.",
-                "The %s signing key is considered a security risk and is disabled."},
-        {"This.jar.contains.entries.whose.certificate.chain.is.invalid.reason.1",
-                 "This jar contains entries whose certificate chain is invalid. Reason: %s"},
-        {"This.jar.contains.entries.whose.tsa.certificate.chain.is.invalid.reason.1",
-                "This jar contains entries whose TSA certificate chain is invalid. Reason: %s"},
-        {"no.timestamp.signing",
-                "No -tsa or -tsacert is provided and this jar is not timestamped. Without a timestamp, users may not be able to validate this jar after the signer certificate's expiration date (%1$tY-%1$tm-%1$td)."},
-        {"invalid.timestamp.signing",
-                "The timestamp is invalid. Without a valid timestamp, users may not be able to validate this jar after the signer certificate's expiration date (%1$tY-%1$tm-%1$td)."},
-        {"no.timestamp.verifying",
-                "This jar contains signatures that do not include a timestamp. Without a timestamp, users may not be able to validate this jar after any of the signer certificates expire (as early as %1$tY-%1$tm-%1$td)."},
-        {"bad.timestamp.verifying",
-                "This jar contains signatures that include an invalid timestamp. Without a valid timestamp, users may not be able to validate this jar after any of the signer certificates expire (as early as %1$tY-%1$tm-%1$td).\nRerun jarsigner with -J-Djava.security.debug=jar for more information."},
-        {"The.signer.certificate.will.expire.on.1.",
-                "The signer certificate will expire on %1$tY-%1$tm-%1$td."},
-        {"The.timestamp.will.expire.on.1.",
-                "The timestamp will expire on %1$tY-%1$tm-%1$td."},
-        {"signer.cert.expired.1.but.timestamp.good.2.",
-                "The signer certificate expired on %1$tY-%1$tm-%1$td. However, the JAR will be valid until the timestamp expires on %2$tY-%2$tm-%2$td."},
-        {"Unknown.password.type.", "Unknown password type: "},
-        {"Cannot.find.environment.variable.",
-                "Cannot find environment variable: "},
-        {"Cannot.find.file.", "Cannot find file: "},
-        {"event.ocsp.check", "Contacting OCSP server at %s ..."},
-        {"event.crl.check", "Downloading CRL from %s ..."},
-    };
-
-    /**
-     * Returns the contents of this <code>ResourceBundle</code>.
-     *
-     * <p>
-     *
-     * @return the contents of this <code>ResourceBundle</code>.
-     */
-    @Override
-    public Object[][] getContents() {
-        return contents;
-    }
-}
diff --git a/src/jdk.jartool/share/classes/sun/security/tools/jarsigner/Resources_de.java b/src/jdk.jartool/share/classes/sun/security/tools/jarsigner/Resources_de.java
deleted file mode 100644
index ec3f3b1cce5..00000000000
--- a/src/jdk.jartool/share/classes/sun/security/tools/jarsigner/Resources_de.java
+++ /dev/null
@@ -1,338 +0,0 @@
-/*
- * Copyright (c) 2000, 2025, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute 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.tools.jarsigner;
-
-/**
- * <p> This class represents the <code>ResourceBundle</code>
- * for JarSigner.
- *
- */
-public class Resources_de extends java.util.ListResourceBundle {
-
-    private static final Object[][] contents = {
-
-        // shared (from jarsigner)
-        {"SPACE", " "},
-        {"6SPACE", "      "},
-        {"COMMA", ", "},
-
-        {"provclass.not.a.provider", "%s kein Provider"},
-        {"provider.name.not.found", "Provider namens \"%s\" nicht gefunden"},
-        {"provider.class.not.found", "Provider \"%s\" nicht gefunden"},
-        {"jarsigner.error.", "jarsigner-Fehler: "},
-        {"Illegal.option.", "Unzul\u00E4ssige Option: "},
-        {".keystore.must.be.NONE.if.storetype.is.{0}",
-                "-keystore muss NONE sein, wenn -storetype {0} ist"},
-        {".keypass.can.not.be.specified.if.storetype.is.{0}",
-                "-keypass kann nicht angegeben werden, wenn -storetype \"{0}\" ist"},
-        {"If.protected.is.specified.then.storepass.and.keypass.must.not.be.specified",
-                "Wenn -protected angegeben ist, d\u00FCrfen -storepass und -keypass nicht angegeben werden"},
-        {"If.keystore.is.not.password.protected.then.storepass.and.keypass.must.not.be.specified",
-                 "Wenn der Keystore nicht kennwortgesch\u00FCtzt ist, d\u00FCrfen -storepass und -keypass nicht angegeben werden"},
-        {"Usage.jarsigner.options.jar.file.alias",
-                "Verwendung: jarsigner [options] jar-file alias"},
-        {".jarsigner.verify.options.jar.file.alias.",
-                "       jarsigner -verify [options] jar-file [alias...]"},
-        {".jarsigner.version",
-                "       jarsigner -version"},
-        {".keystore.url.keystore.location",
-                "[-keystore <URL>]           Keystore-Speicherort"},
-        {".storepass.password.password.for.keystore.integrity",
-            "[-storepass <Kennwort>]     Kennwort f\u00FCr Keystore-Integrit\u00E4t"},
-        {".storetype.type.keystore.type",
-                "[-storetype <Typ>]         Keystore-Typ"},
-        {".keypass.password.password.for.private.key.if.different.",
-                "[-keypass <Kennwort>]       Kennwort f\u00FCr Private Key (falls unterschiedlich)"},
-        {".certchain.file.name.of.alternative.certchain.file",
-                "[-certchain <Datei>]         Name der alternativen certchain-Datei"},
-        {".sigfile.file.name.of.SF.DSA.file",
-                "[-sigfile <Datei>]           Name der SF/DSA-Datei"},
-        {".signedjar.file.name.of.signed.JAR.file",
-                "[-signedjar <Datei>]         Name der signierten JAR-Datei"},
-        {".digestalg.algorithm.name.of.digest.algorithm",
-                "[-digestalg <Algorithmus>]    Name des Digestalgorithmus"},
-        {".sigalg.algorithm.name.of.signature.algorithm",
-                "[-sigalg <Algorithmus>]       Name des Signaturalgorithmus"},
-        {".verify.verify.a.signed.JAR.file",
-                "[-verify]                   Verifiziert eine signierte JAR-Datei"},
-        {".version.print.the.program.version",
-                "[-version]                  Gibt die Programmversion aus"},
-        {".verbose.suboptions.verbose.output.when.signing.verifying.",
-                "[-verbose[:suboptions]]     Verbose-Ausgabe beim Signieren/Verifizieren."},
-        {".suboptions.can.be.all.grouped.or.summary",
-                "                            Als Unteroptionen sind \"all\", \"grouped\" und \"summary\" m\u00F6glich"},
-        {".certs.display.certificates.when.verbose.and.verifying",
-                "[-certs]                    Zeigt Zertifikate bei Verbose und Verifizierung an"},
-        {".certs.revocation.check",
-                "[-revCheck]                 Aktiviert die Zertifikatswiderrufpr\u00FCfung"},
-        {".tsa.url.location.of.the.Timestamping.Authority",
-                "[-tsa <URL>]                Ort der Zeitstempelautorit\u00E4t"},
-        {".tsacert.alias.public.key.certificate.for.Timestamping.Authority",
-                "[-tsacert <Alias>]          Public-Key-Zertifikat f\u00FCr Zeitstempelautorit\u00E4t"},
-        {".tsapolicyid.tsapolicyid.for.Timestamping.Authority",
-                "[-tsapolicyid <OID>]        TSAPolicyID f\u00FCr Zeitstempelautorit\u00E4t"},
-        {".tsadigestalg.algorithm.of.digest.data.in.timestamping.request",
-                "[-tsadigestalg <Algorithmus>] Algorithmus der Digestdaten in Zeitstempelanforderung"},
-        {".internalsf.include.the.SF.file.inside.the.signature.block",
-                "[-internalsf]               SF-Datei in Signaturblock aufnehmen"},
-        {".sectionsonly.don.t.compute.hash.of.entire.manifest",
-                "[-sectionsonly]             Berechnet nicht den Hash des gesamten Manifests"},
-        {".protected.keystore.has.protected.authentication.path",
-                "[-protected]                Keystore hat gesch\u00FCtzten Authentifizierungspfad"},
-        {".providerName.name.provider.name",
-                "[-providerName <Name>]      Providername"},
-        {".add.provider.option",
-                "[-addprovider <Name>        F\u00FCgt einen Sicherheitsprovider nach Name hinzu (z.B. SunPKCS11)"},
-        {".providerArg.option.1",
-                "  [-providerArg <Argument>]] ... Konfiguriert Argument f\u00FCr -addprovider"},
-        {".providerClass.option",
-                "[-providerClass <Klasse>     F\u00FCgt einen Sicherheitsprovider nach vollqualifiziertem Klassennamen hinzu"},
-        {".providerArg.option.2",
-                "  [-providerArg <Argument>]] ... Konfiguriert Argument f\u00FCr -providerClass"},
-        {".providerPath.option",
-                "[-providerPath <list>]      Provider-Classpath"},
-        {".strict.treat.warnings.as.errors",
-                "[-strict]                   Behandelt Warnungen als Fehler"},
-        {".conf.url.specify.a.pre.configured.options.file",
-                "[-conf <URL>]               Vorkonfigurierte Optionsdatei angeben"},
-        {".print.this.help.message",
-                "[-? -h --help]              Gibt diese Hilfemeldung aus"},
-        {"Option.lacks.argument", "Argument fehlt in Option"},
-        {"Please.type.jarsigner.help.for.usage", "Geben Sie jarsigner --help ein, um Verwendungsinformationen anzuzeigen"},
-        {"Please.specify.jarfile.name", "Geben Sie den Namen der JAR-Datei an"},
-        {"Please.specify.alias.name", "Geben Sie einen Aliasnamen an"},
-        {"Only.one.alias.can.be.specified", "Nur ein Alias kann angegeben werden"},
-        {"This.jar.contains.signed.entries.which.is.not.signed.by.the.specified.alias.es.",
-                 "Diese JAR-Datei enth\u00E4lt signierte Eintr\u00E4ge, die nicht von den angegebenen Aliasnamen signiert wurden."},
-        {"This.jar.contains.signed.entries.that.s.not.signed.by.alias.in.this.keystore.",
-                  "Diese JAR-Datei enth\u00E4lt signierte Eintr\u00E4ge, die nicht vom Alias in diesem Keystore signiert wurden."},
-        {"s", "s"},
-        {"m", "m"},
-        {"k", "k"},
-        {"X", "X"},
-        {"q", "?"},
-        {".and.d.more.", "(und %d mehr)"},
-        {".s.signature.was.verified.",
-                "  s = Signatur wurde verifiziert "},
-        {".m.entry.is.listed.in.manifest",
-                "  m = Eintrag ist in Manifest aufgef\u00FChrt"},
-        {".k.at.least.one.certificate.was.found.in.keystore",
-                "  k = Mindestens ein Zertifikat im Keystore gefunden"},
-        {".X.not.signed.by.specified.alias.es.",
-                "  X = Nicht von den angegebenen Aliasnamen signiert"},
-        {".q.unsigned.entry",
-                "  ? = Nicht signierter Eintrag"},
-        {"no.manifest.", "Kein Manifest."},
-        {".Signature.related.entries.","(Signaturbezogene Eintr\u00E4ge)"},
-        {".Unsigned.entries.", "(Nicht signierte Eintr\u00E4ge)"},
-        {".Directory.entries.", "(Verzeichniseintr\u00E4ge)"},
-        {"jar.is.unsigned",
-                "JAR-Datei ist nicht signiert."},
-        {"jar.treated.unsigned",
-                "Warnung: Signatur kann entweder nicht geparst oder nicht verifiziert werden. Die JAR-Datei wird als nicht signiert behandelt. Weitere Informationen erhalten Sie, indem Sie \"jarsigner\" mit aktiviertem Debugging erneut ausf\u00FChren (-J-Djava.security.debug=jar)."},
-        {"jar.treated.unsigned.see.weak",
-                "Die JAR-Datei wird als nicht signiert behandelt, da sie mit einem schwachen Algorithmus signiert wurde, der jetzt deaktiviert ist.\n\nF\u00FChren Sie \"jarsigner\" mit der Option \"-verbose\" erneut aus, um weitere Einzelheiten zu erhalten."},
-        {"jar.treated.unsigned.see.weak.verbose",
-                "Warnung: Die JAR-Datei wird als nicht signiert behandelt, da sie mit einem schwachen Algorithmus signiert wurde, der mittlerweile von der folgenden Sicherheitseigenschaft deaktiviert wurde:"},
-        {"jar.signed.", "JAR-Datei signiert."},
-        {"jar.signed.with.signer.errors.", "JAR-Datei signiert, mit Signaturgeberfehlern."},
-        {"jar.verified.", "JAR-Datei verifiziert."},
-        {"jar.verified.with.signer.errors.", "JAR-Datei verifiziert, mit Signaturgeberfehlern."},
-
-        {"history.with.ts", "- Von \"%1$s\" signiert\n    Digestalgorithmus: %2$s\n    Signaturalgorithmus: %3$s, %4$s\n  Zeitstempel von \"%6$s\" am %5$tc\n    Digestalgorithmus f\u00FCr Zeitstempel: %7$s\n    Signaturalgorithmus f\u00FCr Zeitstempel: %8$s, %9$s"},
-        {"history.without.ts", "- Von \"%1$s\" signiert\n    Digestalgorithmus: %2$s\n    Signaturalgorithmus: %3$s, %4$s"},
-        {"history.nonexistent.entries", "    Warnung: Nicht vorhandene signierte Eintr\u00E4ge: "},
-        {"history.unparsable", "- Signaturbezogene Datei %s kann nicht geparst werden"},
-        {"history.nosf", "- Signaturbezogene Datei META-INF/%s.SF fehlt"},
-        {"history.nobk", "- Blockdatei f\u00FCr signaturbezogene Datei META-INF/%s.SF fehlt"},
-
-        {"with.weak", "%s (schwach)"},
-        {"with.algparams.weak", "%1$s mit %2$s (schwach)"},
-        {"with.disabled", "%s (deaktiviert)"},
-        {"with.algparams.disabled", "%1$s mit %2$s (deaktiviert)"},
-        {"key.bit", "%s-Schl\u00FCssel"},
-        {"key.bit.weak", "%s Schl\u00FCssel (schwach)"},
-        {"key.bit.disabled", "%s Schl\u00FCssel (deaktiviert)"},
-        {"nonexistent.entries.found", "Diese JAR-Datei enth\u00E4lt signierte Eintr\u00E4ge f\u00FCr Dateien, die nicht vorhanden sind. Weitere Details finden Sie in der Verbose-Ausgabe (-verbose)."},
-        {"external.file.attributes.detected", "POSIX-Dateiberechtigung und/oder Symlink-Attribute erkannt. Diese Attribute werden bei der Signatur ignoriert und sind nicht durch die Signatur gesch\u00FCtzt."},
-
-        {"jarsigner.", "jarsigner: "},
-        {"signature.filename.must.consist.of.the.following.characters.A.Z.0.9.or.",
-                "Signaturdateiname muss aus den folgenden Zeichen bestehen: A-Z, 0-9, _ oder -"},
-        {"unable.to.open.jar.file.", "JAR-Datei kann nicht ge\u00F6ffnet werden: "},
-        {"unable.to.create.", "Erstellen nicht m\u00F6glich: "},
-        {".adding.", "   Wird hinzugef\u00FCgt: "},
-        {".updating.", " Wird aktualisiert: "},
-        {".signing.", "  Wird signiert: "},
-        {"attempt.to.rename.signedJarFile.to.jarFile.failed",
-                "Der Versuch, {0} in {1} umzubenennen, war nicht erfolgreich"},
-        {"attempt.to.rename.jarFile.to.origJar.failed",
-                "Der Versuch, {0} in {1} umzubenennen, war nicht erfolgreich"},
-        {"unable.to.sign.jar.", "JAR-Datei kann nicht signiert werden: "},
-        {"Enter.Passphrase.for.keystore.", "Passphrase f\u00FCr Keystore eingeben: "},
-        {"keystore.load.", "Keystore-Ladevorgang: "},
-        {"certificate.exception.", "Zertifikatsausnahme: "},
-        {"unable.to.instantiate.keystore.class.",
-                "Keystore-Klasse kann nicht instanziiert werden: "},
-        {"Certificate.chain.not.found.for.alias.alias.must.reference.a.valid.KeyStore.key.entry.containing.a.private.key.and",
-                "Zertifikatskette nicht gefunden f\u00FCr: {0}. {1} muss einen g\u00FCltigen Keystore-Schl\u00FCssel referenzieren, der einen Private Key und eine zugeh\u00F6rige Public-Key-Zertifikatskette enth\u00E4lt."},
-        {"File.specified.by.certchain.does.not.exist",
-                "Von -certchain angegebene Datei ist nicht vorhanden"},
-        {"Cannot.restore.certchain.from.file.specified",
-                "Zertifikatskette kann nicht aus angegebener Datei wiederhergestellt werden"},
-        {"Certificate.chain.not.found.in.the.file.specified.",
-                "Zertifikatskette nicht in der angegebenen Datei gefunden."},
-        {"found.non.X.509.certificate.in.signer.s.chain",
-                "Nicht-X.509-Zertifikat in Kette des Signaturgebers gefunden"},
-        {"Enter.key.password.for.alias.", "Schl\u00FCsselkennwort f\u00FCr {0} eingeben: "},
-        {"unable.to.recover.key.from.keystore",
-                "Schl\u00FCssel kann nicht aus Keystore wiederhergestellt werden"},
-        {"key.associated.with.alias.not.a.private.key",
-                "Mit {0} verkn\u00FCpfter Schl\u00FCssel ist kein Private Key"},
-        {"you.must.enter.key.password", "Sie m\u00FCssen ein Schl\u00FCsselkennwort eingeben"},
-        {"unable.to.read.password.", "Kennwort kann nicht gelesen werden: "},
-        {"certificate.is.valid.from", "Zertifikat ist von {0} bis {1} g\u00FCltig"},
-        {"certificate.expired.on", "Zertifikat ist am {0} abgelaufen"},
-        {"certificate.is.not.valid.until",
-                "Zertifikat ist erst ab {0} g\u00FCltig"},
-        {"certificate.will.expire.on", "Zertifikat l\u00E4uft am {0} ab"},
-        {".Invalid.certificate.chain.", "[Ung\u00FCltige Zertifikatskette: "},
-        {".Invalid.TSA.certificate.chain.", "[Ung\u00FCltige TSA-Zertifikatskette: "},
-        {"requesting.a.signature.timestamp",
-                "Signaturzeitstempel wird angefordert"},
-        {"TSA.location.", "TSA-Ort: "},
-        {"TSA.certificate.", "TSA-Zertifikat: "},
-        {"no.response.from.the.Timestamping.Authority.",
-                "Keine Antwort von der Zeitstempelautorit\u00E4t. Bei Verbindungen hinter einer Firewall muss m\u00F6glicherweise ein HTTP- oder HTTPS-Proxy angegeben werden. Geben Sie die folgenden Optionen f\u00FCr \"jarsigner\" an:"},
-        {"or", "oder"},
-        {"Certificate.not.found.for.alias.alias.must.reference.a.valid.KeyStore.entry.containing.an.X.509.public.key.certificate.for.the",
-                "Zertifikat nicht gefunden f\u00FCr: {0}. {1} muss einen g\u00FCltigen Keystore-Eintrag referenzieren, der ein X.509-Public-Key-Zertifikat f\u00FCr die Zeitstempelautorit\u00E4t enth\u00E4lt."},
-        {"entry.was.signed.on", "Eintrag wurde signiert am {0}"},
-        {"Warning.", "Warnung: "},
-        {"Error.", "Fehler: "},
-        {"...Signer", ">>> Signaturgeber"},
-        {"...TSA", ">>> TSA"},
-        {"trusted.certificate", "vertrauensw\u00FCrdiges Zertifikat"},
-        {"This.jar.contains.unsigned.entries.which.have.not.been.integrity.checked.",
-                "Diese JAR-Datei enth\u00E4lt nicht signierte Eintr\u00E4ge, deren Integrit\u00E4t nicht gepr\u00FCft wurde. "},
-        {"This.jar.contains.entries.whose.signer.certificate.has.expired.",
-                "Diese JAR-Datei enth\u00E4lt Eintr\u00E4ge, deren Signaturgeberzertifikat abgelaufen ist."},
-        {"This.jar.contains.entries.whose.signer.certificate.will.expire.within.six.months.",
-                "Diese JAR-Datei enth\u00E4lt Eintr\u00E4ge, deren Signaturgeberzertifikat innerhalb der n\u00E4chsten sechs Monate abl\u00E4uft. "},
-        {"This.jar.contains.entries.whose.signer.certificate.is.not.yet.valid.",
-                "Diese JAR-Datei enth\u00E4lt Eintr\u00E4ge, deren Signaturgeberzertifikat noch nicht g\u00FCltig ist. "},
-        {"This.jar.contains.entries.whose.signer.certificate.is.self.signed.",
-                "Diese JAR-Datei enth\u00E4lt Eintr\u00E4ge, deren Signaturgeberzertifikat selbstsigniert ist."},
-        {"Re.run.with.the.verbose.and.certs.options.for.more.details.",
-                "F\u00FChren Sie den Befehl erneut mit den Optionen -verbose und -certs aus, um weitere Details zu erhalten."},
-        {"The.signer.certificate.has.expired.",
-                "Das Signaturgeberzertifikat ist abgelaufen."},
-        {"The.timestamp.expired.1.but.usable.2",
-                "Der Zeitstempel ist am %1$tY-%1$tm-%1$td abgelaufen. Die JAR-Datei bleibt aber g\u00FCltig, bis das Signaturgeberzertifikat am %2$tY-%2$tm-%2$td abl\u00E4uft."},
-        {"The.timestamp.has.expired.",
-                "Der Zeitstempel ist abgelaufen."},
-        {"The.signer.certificate.will.expire.within.six.months.",
-                "Das Signaturgeberzertifikat l\u00E4uft innerhalb der n\u00E4chsten sechs Monate ab."},
-        {"The.timestamp.will.expire.within.one.year.on.1",
-                "Der Zeitstempel l\u00E4uft innerhalb des n\u00E4chsten Jahres am %1$tY-%1$tm-%1$td ab."},
-        {"The.timestamp.will.expire.within.one.year.on.1.but.2",
-                "Der Zeitstempel l\u00E4uft innerhalb des n\u00E4chsten Jahres am %1$tY-%1$tm-%1$td ab. Die JAR-Datei bleibt aber g\u00FCltig, bis das Signaturgeberzertifikat am %2$tY-%2$tm-%2$td abl\u00E4uft."},
-        {"The.signer.certificate.is.not.yet.valid.",
-                "Das Signaturgeberzertifikat ist noch nicht g\u00FCltig."},
-        {"The.signer.certificate.s.KeyUsage.extension.doesn.t.allow.code.signing.",
-                 "Die KeyUsage-Erweiterung des Signaturgeberzertifikats l\u00E4sst keine Codesignatur zu."},
-        {"The.signer.certificate.s.ExtendedKeyUsage.extension.doesn.t.allow.code.signing.",
-                 "Die ExtendedKeyUsage-Erweiterung des Signaturgeberzertifikats l\u00E4sst keine Codesignatur zu."},
-        {"The.signer.certificate.s.NetscapeCertType.extension.doesn.t.allow.code.signing.",
-                 "Die NetscapeCertType-Erweiterung des Signaturgeberzertifikats l\u00E4sst keine Codesignatur zu."},
-        {"This.jar.contains.entries.whose.signer.certificate.s.KeyUsage.extension.doesn.t.allow.code.signing.",
-                 "Diese JAR-Datei enth\u00E4lt Eintr\u00E4ge, bei denen die KeyUsage-Erweiterung des Signaturgeberzertifikats keine Codesignatur zul\u00E4sst."},
-        {"This.jar.contains.entries.whose.signer.certificate.s.ExtendedKeyUsage.extension.doesn.t.allow.code.signing.",
-                 "Diese JAR-Datei enth\u00E4lt Eintr\u00E4ge, bei denen die ExtendedKeyUsage-Erweiterung des Signaturgeberzertifikats keine Codesignatur zul\u00E4sst."},
-        {"This.jar.contains.entries.whose.signer.certificate.s.NetscapeCertType.extension.doesn.t.allow.code.signing.",
-                 "Diese JAR-Datei enth\u00E4lt Eintr\u00E4ge, bei denen die NetscapeCertType-Erweiterung des Signaturgeberzertifikats keine Codesignatur zul\u00E4sst."},
-        {".{0}.extension.does.not.support.code.signing.",
-                 "[{0}-Erweiterung unterst\u00FCtzt keine Codesignatur]"},
-        {"The.signer.s.certificate.chain.is.invalid.reason.1",
-                "Die Zertifikatskette des Signaturgebers ist ung\u00FCltig. Grund: %s"},
-        {"The.tsa.certificate.chain.is.invalid.reason.1",
-                "Die TSA-Zertifikatskette ist ung\u00FCltig. Grund: %s"},
-        {"The.signer.s.certificate.is.self.signed.",
-                "Das Zertifikat des Signaturgebers ist selbstsigniert."},
-        {"The.1.algorithm.specified.for.the.2.option.is.considered.a.security.risk..This.algorithm.will.be.disabled.in.a.future.update.",
-                "Der f\u00FCr die Option %2$s angegebene %1$s-Algorithmus gilt als Sicherheitsrisiko. Dieser Algorithmus wird in einem zuk\u00FCnftigen Update deaktiviert."},
-        {"The.1.algorithm.specified.for.the.2.option.is.considered.a.security.risk.and.is.disabled.",
-                "Der f\u00FCr die Option %2$s angegebene %1$s-Algorithmus gilt als Sicherheitsrisiko und ist deaktiviert."},
-        {"The.timestamp.digest.algorithm.1.is.considered.a.security.risk..This.algorithm.will.be.disabled.in.a.future.update.",
-                "Der %1$s-Digestalgorithmus des Zeitstempels gilt als Sicherheitsrisiko. Dieser Algorithmus wird in einem zuk\u00FCnftigen Update deaktiviert."},
-        {"The.digest.algorithm.1.is.considered.a.security.risk..This.algorithm.will.be.disabled.in.a.future.update.",
-                "Der %1$s-Digestalgorithmus gilt als Sicherheitsrisiko. Dieser Algorithmus wird in einem zuk\u00FCnftigen Update deaktiviert."},
-        {"The.signature.algorithm.1.is.considered.a.security.risk..This.algorithm.will.be.disabled.in.a.future.update.",
-                "Der %1$s-Signaturalgorithmus gilt als Sicherheitsrisiko. Dieser Algorithmus wird in einem zuk\u00FCnftigen Update deaktiviert."},
-        {"size.bit.alg",
-                "%1$d-Bit %2$s"},
-        {"The.full.keyAlgName.signing.key.is.considered.a.security.risk..It.will.be.disabled.in.a.future.update.",
-                "Der %s Signaturschl\u00FCssel wird als Sicherheitsrisiko betrachtet. Wird in einem zuk\u00FCnftigen Update deaktiviert."},
-        {"The.full.keyAlgName.signing.key.is.considered.a.security.risk.and.is.disabled.",
-                "Der %s Signaturschl\u00FCssel wird als Sicherheitsrisiko betrachtet und ist deaktiviert."},
-        {"This.jar.contains.entries.whose.certificate.chain.is.invalid.reason.1",
-                 "Diese JAR-Datei enth\u00E4lt Eintr\u00E4ge, deren Zertifikatskette ung\u00FCltig ist. Grund: %s"},
-        {"This.jar.contains.entries.whose.tsa.certificate.chain.is.invalid.reason.1",
-                "Diese JAR-Datei enth\u00E4lt Eintr\u00E4ge, deren TSA-Zertifikatskette ung\u00FCltig ist. Grund: %s"},
-        {"no.timestamp.signing",
-                "Weder -tsa noch -tsacert wurde angegeben, und diese JAR-Datei hat keinen Zeitstempel. Ohne Zeitstempel k\u00F6nnen Benutzer diese JAR-Datei nach dem Ablaufdatum des Signaturgeberzertifikats (%1$tY-%1$tm-%1$td) m\u00F6glicherweise nicht mehr validieren."},
-        {"invalid.timestamp.signing",
-                "Der Zeitstempel ist ung\u00FCltig. Ohne einen g\u00FCltigen Zeitstempel k\u00F6nnen Benutzer diese JAR-Datei nach dem Ablaufdatum des Signaturgeberzertifikats (%1$tY-%1$tm-%1$td) m\u00F6glicherweise nicht mehr validieren."},
-        {"no.timestamp.verifying",
-                "Diese JAR-Datei enth\u00E4lt Signaturen ohne Zeitstempel. Ohne einen Zeitstempel k\u00F6nnen Benutzer diese JAR-Datei nach dem Ablauf eines Signaturgeberzertifikats (fr\u00FChestens %1$tY-%1$tm-%1$td) m\u00F6glicherweise nicht mehr validieren."},
-        {"bad.timestamp.verifying",
-                "Diese JAR-Datei enth\u00E4lt Signaturen mit einem ung\u00FCltigen Zeitstempel. Ohne einen g\u00FCltigen Zeitstempel k\u00F6nnen Benutzer diese JAR-Datei nach dem Ablauf eines Signaturgeberzertifikats (fr\u00FChestens %1$tY-%1$tm-%1$td) m\u00F6glicherweise nicht mehr validieren.\nF\u00FChren Sie \"jarsigner\" mit -J-Djava.security.debug=jar erneut aus, um weitere Informationen zu erhalten."},
-        {"The.signer.certificate.will.expire.on.1.",
-                "Das Signaturgeberzertifikat l\u00E4uft am %1$tY-%1$tm-%1$td ab."},
-        {"The.timestamp.will.expire.on.1.",
-                "Der Zeitstempel l\u00E4uft am %1$tY-%1$tm-%1$td ab."},
-        {"signer.cert.expired.1.but.timestamp.good.2.",
-                "Das Signaturgeberzertifikat ist am %1$tY-%1$tm-%1$td abgelaufen. Die JAR-Datei bleibt aber g\u00FCltig, bis der Zeitstempel am %2$tY-%2$tm-%2$td abl\u00E4uft."},
-        {"Unknown.password.type.", "Unbekannter Kennworttyp: "},
-        {"Cannot.find.environment.variable.",
-                "Umgebungsvariable kann nicht gefunden werden: "},
-        {"Cannot.find.file.", "Datei kann nicht gefunden werden: "},
-        {"event.ocsp.check", "Verbindung zu OCSP-Server bei %s wird hergestellt..."},
-        {"event.crl.check", "CRL wird von %s heruntergeladen..."},
-    };
-
-    /**
-     * Returns the contents of this <code>ResourceBundle</code>.
-     *
-     * <p>
-     *
-     * @return the contents of this <code>ResourceBundle</code>.
-     */
-    @Override
-    public Object[][] getContents() {
-        return contents;
-    }
-}
diff --git a/src/jdk.jartool/share/classes/sun/security/tools/jarsigner/Resources_ja.java b/src/jdk.jartool/share/classes/sun/security/tools/jarsigner/Resources_ja.java
deleted file mode 100644
index e8f63ea5566..00000000000
--- a/src/jdk.jartool/share/classes/sun/security/tools/jarsigner/Resources_ja.java
+++ /dev/null
@@ -1,338 +0,0 @@
-/*
- * Copyright (c) 2000, 2025, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute 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.tools.jarsigner;
-
-/**
- * <p> This class represents the <code>ResourceBundle</code>
- * for JarSigner.
- *
- */
-public class Resources_ja extends java.util.ListResourceBundle {
-
-    private static final Object[][] contents = {
-
-        // shared (from jarsigner)
-        {"SPACE", " "},
-        {"6SPACE", "      "},
-        {"COMMA", ", "},
-
-        {"provclass.not.a.provider", "%s\u306F\u30D7\u30ED\u30D0\u30A4\u30C0\u3067\u306F\u3042\u308A\u307E\u305B\u3093"},
-        {"provider.name.not.found", "\u30D7\u30ED\u30D0\u30A4\u30C0\u540D\"%s\"\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093"},
-        {"provider.class.not.found", "\u30D7\u30ED\u30D0\u30A4\u30C0\"%s\"\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093"},
-        {"jarsigner.error.", "jarsigner\u30A8\u30E9\u30FC: "},
-        {"Illegal.option.", "\u4E0D\u6B63\u306A\u30AA\u30D7\u30B7\u30E7\u30F3: "},
-        {".keystore.must.be.NONE.if.storetype.is.{0}",
-                "-storetype\u304C{0}\u306E\u5834\u5408\u3001-keystore\u306FNONE\u3067\u3042\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059"},
-        {".keypass.can.not.be.specified.if.storetype.is.{0}",
-                "-storetype\u304C{0}\u306E\u5834\u5408\u3001-keypass\u306F\u6307\u5B9A\u3067\u304D\u307E\u305B\u3093"},
-        {"If.protected.is.specified.then.storepass.and.keypass.must.not.be.specified",
-                "-protected\u3092\u6307\u5B9A\u3059\u308B\u5834\u5408\u306F\u3001-storepass\u304A\u3088\u3073-keypass\u3092\u6307\u5B9A\u3057\u306A\u3044\u3067\u304F\u3060\u3055\u3044"},
-        {"If.keystore.is.not.password.protected.then.storepass.and.keypass.must.not.be.specified",
-                 "\u30AD\u30FC\u30B9\u30C8\u30A2\u304C\u30D1\u30B9\u30EF\u30FC\u30C9\u3067\u4FDD\u8B77\u3055\u308C\u3066\u3044\u306A\u3044\u5834\u5408\u3001-storepass\u304A\u3088\u3073-keypass\u3092\u6307\u5B9A\u3057\u306A\u3044\u3067\u304F\u3060\u3055\u3044"},
-        {"Usage.jarsigner.options.jar.file.alias",
-                "\u4F7F\u7528\u65B9\u6CD5: jarsigner [options] jar-file alias"},
-        {".jarsigner.verify.options.jar.file.alias.",
-                "       jarsigner -verify [options] jar-file [alias...]"},
-        {".jarsigner.version",
-                "       jarsigner -version"},
-        {".keystore.url.keystore.location",
-                "[-keystore <url>]           \u30AD\u30FC\u30B9\u30C8\u30A2\u306E\u4F4D\u7F6E"},
-        {".storepass.password.password.for.keystore.integrity",
-            "[-storepass <password>]     \u30AD\u30FC\u30B9\u30C8\u30A2\u6574\u5408\u6027\u306E\u305F\u3081\u306E\u30D1\u30B9\u30EF\u30FC\u30C9"},
-        {".storetype.type.keystore.type",
-                "[-storetype <type>]         \u30AD\u30FC\u30B9\u30C8\u30A2\u306E\u578B"},
-        {".keypass.password.password.for.private.key.if.different.",
-                "[-keypass <password>]       \u79D8\u5BC6\u30AD\u30FC\u306E\u30D1\u30B9\u30EF\u30FC\u30C9(\u7570\u306A\u308B\u5834\u5408)"},
-        {".certchain.file.name.of.alternative.certchain.file",
-                "[-certchain <file>]         \u4EE3\u66FF\u8A3C\u660E\u66F8\u30C1\u30A7\u30FC\u30F3\u30FB\u30D5\u30A1\u30A4\u30EB\u306E\u540D\u524D"},
-        {".sigfile.file.name.of.SF.DSA.file",
-                "[-sigfile <file>]           .SF/.DSA\u30D5\u30A1\u30A4\u30EB\u306E\u540D\u524D"},
-        {".signedjar.file.name.of.signed.JAR.file",
-                "[-signedjar <file>]         \u7F72\u540D\u4ED8\u304DJAR\u30D5\u30A1\u30A4\u30EB\u306E\u540D\u524D"},
-        {".digestalg.algorithm.name.of.digest.algorithm",
-                "[-digestalg <algorithm>]    \u30C0\u30A4\u30B8\u30A7\u30B9\u30C8\u30FB\u30A2\u30EB\u30B4\u30EA\u30BA\u30E0\u306E\u540D\u524D"},
-        {".sigalg.algorithm.name.of.signature.algorithm",
-                "[-sigalg <algorithm>]       \u30B7\u30B0\u30CD\u30C1\u30E3\u30FB\u30A2\u30EB\u30B4\u30EA\u30BA\u30E0\u306E\u540D\u524D"},
-        {".verify.verify.a.signed.JAR.file",
-                "[-verify]                   \u7F72\u540D\u4ED8\u304DJAR\u30D5\u30A1\u30A4\u30EB\u306E\u691C\u8A3C"},
-        {".version.print.the.program.version",
-                "[-version]                  \u30D7\u30ED\u30B0\u30E9\u30E0\u30FB\u30D0\u30FC\u30B8\u30E7\u30F3\u3092\u51FA\u529B\u3057\u307E\u3059"},
-        {".verbose.suboptions.verbose.output.when.signing.verifying.",
-                "[-verbose[:suboptions]]     \u7F72\u540D/\u691C\u8A3C\u6642\u306E\u8A73\u7D30\u51FA\u529B\u3002"},
-        {".suboptions.can.be.all.grouped.or.summary",
-                "                            \u30B5\u30D6\u30AA\u30D7\u30B7\u30E7\u30F3\u3068\u3057\u3066\u3001all\u3001grouped\u307E\u305F\u306Fsummary\u3092\u4F7F\u7528\u3067\u304D\u307E\u3059"},
-        {".certs.display.certificates.when.verbose.and.verifying",
-                "[-certs]                    \u8A73\u7D30\u51FA\u529B\u304A\u3088\u3073\u691C\u8A3C\u6642\u306B\u8A3C\u660E\u66F8\u3092\u8868\u793A"},
-        {".certs.revocation.check",
-                "[-revCheck]                 \u8A3C\u660E\u66F8\u5931\u52B9\u30C1\u30A7\u30C3\u30AF\u306E\u6709\u52B9\u5316"},
-        {".tsa.url.location.of.the.Timestamping.Authority",
-                "[-tsa <url>]                \u30BF\u30A4\u30E0\u30B9\u30BF\u30F3\u30D7\u5C40\u306E\u5834\u6240"},
-        {".tsacert.alias.public.key.certificate.for.Timestamping.Authority",
-                "[-tsacert <alias>]          \u30BF\u30A4\u30E0\u30B9\u30BF\u30F3\u30D7\u5C40\u306E\u516C\u958B\u30AD\u30FC\u8A3C\u660E\u66F8"},
-        {".tsapolicyid.tsapolicyid.for.Timestamping.Authority",
-                "[-tsapolicyid <oid>]        \u30BF\u30A4\u30E0\u30B9\u30BF\u30F3\u30D7\u5C40\u306ETSAPolicyID"},
-        {".tsadigestalg.algorithm.of.digest.data.in.timestamping.request",
-                "[-tsadigestalg <algorithm>] \u30BF\u30A4\u30E0\u30B9\u30BF\u30F3\u30D7\u30FB\u30EA\u30AF\u30A8\u30B9\u30C8\u306E\u30C0\u30A4\u30B8\u30A7\u30B9\u30C8\u30FB\u30C7\u30FC\u30BF\u306E\u30A2\u30EB\u30B4\u30EA\u30BA\u30E0"},
-        {".internalsf.include.the.SF.file.inside.the.signature.block",
-                "[-internalsf]               \u30B7\u30B0\u30CD\u30C1\u30E3\u30FB\u30D6\u30ED\u30C3\u30AF\u306B.SF\u30D5\u30A1\u30A4\u30EB\u3092\u542B\u3081\u308B"},
-        {".sectionsonly.don.t.compute.hash.of.entire.manifest",
-                "[-sectionsonly]             \u30DE\u30CB\u30D5\u30A7\u30B9\u30C8\u5168\u4F53\u306E\u30CF\u30C3\u30B7\u30E5\u306F\u8A08\u7B97\u3057\u306A\u3044"},
-        {".protected.keystore.has.protected.authentication.path",
-                "[-protected]                \u30AD\u30FC\u30B9\u30C8\u30A2\u306B\u306F\u4FDD\u8B77\u3055\u308C\u305F\u8A8D\u8A3C\u30D1\u30B9\u304C\u3042\u308B"},
-        {".providerName.name.provider.name",
-                "[-providerName <name>]      \u30D7\u30ED\u30D0\u30A4\u30C0\u540D"},
-        {".add.provider.option",
-                "[-addprovider <name>        \u540D\u524D\u3067\u30BB\u30AD\u30E5\u30EA\u30C6\u30A3\u30FB\u30D7\u30ED\u30D0\u30A4\u30C0\u3092\u8FFD\u52A0\u3059\u308B(SunPKCS11\u306A\u3069)"},
-        {".providerArg.option.1",
-                "  [-providerArg <arg>]] ... -addprovider\u306E\u5F15\u6570\u3092\u69CB\u6210\u3059\u308B"},
-        {".providerClass.option",
-                "[-providerClass <class>     \u5B8C\u5168\u4FEE\u98FE\u30AF\u30E9\u30B9\u540D\u3067\u30BB\u30AD\u30E5\u30EA\u30C6\u30A3\u30FB\u30D7\u30ED\u30D0\u30A4\u30C0\u3092\u8FFD\u52A0\u3059\u308B"},
-        {".providerArg.option.2",
-                "  [-providerArg <arg>]] ... -providerClass\u306E\u5F15\u6570\u3092\u69CB\u6210\u3059\u308B"},
-        {".providerPath.option",
-                "[-providerPath <list>]      \u30D7\u30ED\u30D0\u30A4\u30C0\u30FB\u30AF\u30E9\u30B9\u30D1\u30B9"},
-        {".strict.treat.warnings.as.errors",
-                "[-strict]                   \u8B66\u544A\u3092\u30A8\u30E9\u30FC\u3068\u3057\u3066\u51E6\u7406"},
-        {".conf.url.specify.a.pre.configured.options.file",
-                "[-conf <url>]               \u4E8B\u524D\u69CB\u6210\u6E08\u306E\u30AA\u30D7\u30B7\u30E7\u30F3\u30FB\u30D5\u30A1\u30A4\u30EB\u3092\u6307\u5B9A\u3059\u308B"},
-        {".print.this.help.message",
-                "[-? -h --help]              \u3053\u306E\u30D8\u30EB\u30D7\u30FB\u30E1\u30C3\u30BB\u30FC\u30B8\u3092\u51FA\u529B\u3057\u307E\u3059"},
-        {"Option.lacks.argument", "\u30AA\u30D7\u30B7\u30E7\u30F3\u306B\u5F15\u6570\u304C\u3042\u308A\u307E\u305B\u3093"},
-        {"Please.type.jarsigner.help.for.usage", "\u4F7F\u7528\u65B9\u6CD5\u306B\u3064\u3044\u3066\u306Fjarsigner --help\u3068\u5165\u529B\u3057\u3066\u304F\u3060\u3055\u3044"},
-        {"Please.specify.jarfile.name", "jarfile\u540D\u3092\u6307\u5B9A\u3057\u3066\u304F\u3060\u3055\u3044"},
-        {"Please.specify.alias.name", "\u5225\u540D\u3092\u6307\u5B9A\u3057\u3066\u304F\u3060\u3055\u3044"},
-        {"Only.one.alias.can.be.specified", "\u5225\u540D\u306F1\u3064\u306E\u307F\u6307\u5B9A\u3067\u304D\u307E\u3059"},
-        {"This.jar.contains.signed.entries.which.is.not.signed.by.the.specified.alias.es.",
-                 "\u3053\u306Ejar\u306B\u542B\u307E\u308C\u308B\u7F72\u540D\u6E08\u30A8\u30F3\u30C8\u30EA\u306F\u3001\u6307\u5B9A\u3055\u308C\u305F\u5225\u540D\u306B\u3088\u3063\u3066\u7F72\u540D\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002"},
-        {"This.jar.contains.signed.entries.that.s.not.signed.by.alias.in.this.keystore.",
-                  "\u3053\u306Ejar\u306B\u542B\u307E\u308C\u308B\u7F72\u540D\u6E08\u30A8\u30F3\u30C8\u30EA\u306F\u3001\u3053\u306E\u30AD\u30FC\u30B9\u30C8\u30A2\u5185\u306E\u5225\u540D\u306B\u3088\u3063\u3066\u7F72\u540D\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002"},
-        {"s", "s"},
-        {"m", "m"},
-        {"k", "k"},
-        {"X", "X"},
-        {"q", "?"},
-        {".and.d.more.", "(\u4ED6\u306B\u3082%d\u500B)"},
-        {".s.signature.was.verified.",
-                "  s=\u30B7\u30B0\u30CD\u30C1\u30E3\u304C\u691C\u8A3C\u3055\u308C\u307E\u3057\u305F "},
-        {".m.entry.is.listed.in.manifest",
-                "  m=\u30A8\u30F3\u30C8\u30EA\u304C\u30DE\u30CB\u30D5\u30A7\u30B9\u30C8\u5185\u306B\u30EA\u30B9\u30C8\u3055\u308C\u307E\u3059"},
-        {".k.at.least.one.certificate.was.found.in.keystore",
-                "  k=1\u3064\u4EE5\u4E0A\u306E\u8A3C\u660E\u66F8\u304C\u30AD\u30FC\u30B9\u30C8\u30A2\u3067\u691C\u51FA\u3055\u308C\u307E\u3057\u305F"},
-        {".X.not.signed.by.specified.alias.es.",
-                "  X =\u6307\u5B9A\u3057\u305F\u5225\u540D\u3067\u7F72\u540D\u3055\u308C\u3066\u3044\u307E\u305B\u3093"},
-        {".q.unsigned.entry",
-                "  ? = \u7F72\u540D\u306A\u3057\u306E\u30A8\u30F3\u30C8\u30EA"},
-        {"no.manifest.", "\u30DE\u30CB\u30D5\u30A7\u30B9\u30C8\u306F\u5B58\u5728\u3057\u307E\u305B\u3093\u3002"},
-        {".Signature.related.entries.","(\u30B7\u30B0\u30CD\u30C1\u30E3\u95A2\u9023\u30A8\u30F3\u30C8\u30EA)"},
-        {".Unsigned.entries.", "(\u7F72\u540D\u306A\u3057\u306E\u30A8\u30F3\u30C8\u30EA)"},
-        {".Directory.entries.", "(\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u30FB\u30A8\u30F3\u30C8\u30EA)"},
-        {"jar.is.unsigned",
-                "jar\u306F\u7F72\u540D\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002"},
-        {"jar.treated.unsigned",
-                "\u8B66\u544A: \u7F72\u540D\u304C\u69CB\u6587\u89E3\u6790\u3067\u304D\u306A\u3044\u304B\u691C\u8A3C\u3067\u304D\u306A\u3044\u305F\u3081\u3001\u3053\u306Ejar\u306F\u7F72\u540D\u306A\u3057\u3068\u3057\u3066\u6271\u308F\u308C\u307E\u3059\u3002\u8A73\u7D30\u306F\u3001\u30C7\u30D0\u30C3\u30B0\u3092\u6709\u52B9\u306B\u3057\u3066(-J-Djava.security.debug=jar) jarsigner\u3092\u518D\u5B9F\u884C\u3057\u3066\u304F\u3060\u3055\u3044\u3002"},
-        {"jar.treated.unsigned.see.weak",
-                "\u3053\u306Ejar\u306F\u3001\u73FE\u5728\u7121\u52B9\u306B\u306A\u3063\u3066\u3044\u308B\u5F31\u3044\u30A2\u30EB\u30B4\u30EA\u30BA\u30E0\u3067\u7F72\u540D\u3055\u308C\u3066\u3044\u308B\u305F\u3081\u3001\u7F72\u540D\u306A\u3057\u3068\u3057\u3066\u6271\u308F\u308C\u307E\u3059\u3002\n\n\u8A73\u7D30\u306F\u3001-verbose\u30AA\u30D7\u30B7\u30E7\u30F3\u3092\u4F7F\u7528\u3057\u3066jarsigner\u3092\u518D\u5B9F\u884C\u3057\u3066\u304F\u3060\u3055\u3044\u3002"},
-        {"jar.treated.unsigned.see.weak.verbose",
-                "\u8B66\u544A: \u3053\u306Ejar\u306F\u3001\u30BB\u30AD\u30E5\u30EA\u30C6\u30A3\u30FB\u30D7\u30ED\u30D1\u30C6\u30A3\u306B\u3088\u3063\u3066\u73FE\u5728\u7121\u52B9\u306B\u306A\u3063\u3066\u3044\u308B\u5F31\u3044\u30A2\u30EB\u30B4\u30EA\u30BA\u30E0\u3067\u7F72\u540D\u3055\u308C\u3066\u3044\u308B\u305F\u3081\u3001\u7F72\u540D\u306A\u3057\u3068\u3057\u3066\u6271\u308F\u308C\u307E\u3059:"},
-        {"jar.signed.", "jar\u306F\u7F72\u540D\u3055\u308C\u307E\u3057\u305F\u3002"},
-        {"jar.signed.with.signer.errors.", "jar\u306F\u7F72\u540D\u3055\u308C\u307E\u3057\u305F - \u7F72\u540D\u8005\u30A8\u30E9\u30FC\u304C\u3042\u308A\u307E\u3059\u3002"},
-        {"jar.verified.", "jar\u304C\u691C\u8A3C\u3055\u308C\u307E\u3057\u305F\u3002"},
-        {"jar.verified.with.signer.errors.", "jar\u306F\u691C\u8A3C\u3055\u308C\u307E\u3057\u305F - \u7F72\u540D\u8005\u30A8\u30E9\u30FC\u304C\u3042\u308A\u307E\u3059\u3002"},
-
-        {"history.with.ts", "- \u7F72\u540D\u8005: \"%1$s\"\n    \u30C0\u30A4\u30B8\u30A7\u30B9\u30C8\u30FB\u30A2\u30EB\u30B4\u30EA\u30BA\u30E0: %2$s\n    \u7F72\u540D\u30A2\u30EB\u30B4\u30EA\u30BA\u30E0: %3$s\u3001%4$s\n  \u30BF\u30A4\u30E0\u30B9\u30BF\u30F3\u30D7\u4ED8\u52A0\u8005: \"%6$s\" \u65E5\u6642: %5$tc\n    \u30BF\u30A4\u30E0\u30B9\u30BF\u30F3\u30D7\u306E\u30C0\u30A4\u30B8\u30A7\u30B9\u30C8\u30FB\u30A2\u30EB\u30B4\u30EA\u30BA\u30E0: %7$s\n    \u30BF\u30A4\u30E0\u30B9\u30BF\u30F3\u30D7\u306E\u7F72\u540D\u30A2\u30EB\u30B4\u30EA\u30BA\u30E0: %8$s\u3001%9$s"},
-        {"history.without.ts", "- \u7F72\u540D\u8005: \"%1$s\"\n    \u30C0\u30A4\u30B8\u30A7\u30B9\u30C8\u30FB\u30A2\u30EB\u30B4\u30EA\u30BA\u30E0: %2$s\n    \u7F72\u540D\u30A2\u30EB\u30B4\u30EA\u30BA\u30E0: %3$s\u3001%4$s"},
-        {"history.nonexistent.entries", "    \u8B66\u544A: \u5B58\u5728\u3057\u306A\u3044\u7F72\u540D\u6E08\u30A8\u30F3\u30C8\u30EA: "},
-        {"history.unparsable", "- \u7F72\u540D\u95A2\u9023\u30D5\u30A1\u30A4\u30EB%s\u3092\u89E3\u6790\u3067\u304D\u307E\u305B\u3093"},
-        {"history.nosf", "- \u7F72\u540D\u95A2\u9023\u30D5\u30A1\u30A4\u30EBMETA-INF/%s.SF\u304C\u3042\u308A\u307E\u305B\u3093"},
-        {"history.nobk", "- \u7F72\u540D\u95A2\u9023\u30D5\u30A1\u30A4\u30EBMETA-INF/%s.SF\u306E\u30D6\u30ED\u30C3\u30AF\u30FB\u30D5\u30A1\u30A4\u30EB\u304C\u3042\u308A\u307E\u305B\u3093"},
-
-        {"with.weak", "%s (\u5F31)"},
-        {"with.algparams.weak", "%2$s\u3092\u4F7F\u7528\u3057\u305F%1$s (\u5F31)"},
-        {"with.disabled", "%s (\u7121\u52B9)"},
-        {"with.algparams.disabled", "%2$s\u3092\u4F7F\u7528\u3057\u305F%1$s (\u7121\u52B9)"},
-        {"key.bit", "%s\u30AD\u30FC"},
-        {"key.bit.weak", "%s\u30AD\u30FC(\u5F31\u3044)"},
-        {"key.bit.disabled", "%s\u30AD\u30FC(\u7121\u52B9)"},
-        {"nonexistent.entries.found", "\u3053\u306Ejar\u306B\u306F\u3001\u5B58\u5728\u3057\u306A\u3044\u30D5\u30A1\u30A4\u30EB\u306E\u7F72\u540D\u6E08\u30A8\u30F3\u30C8\u30EA\u304C\u542B\u307E\u308C\u307E\u3059\u3002\u8A73\u7D30\u306F\u3001-verbose\u51FA\u529B\u3092\u53C2\u7167\u3057\u3066\u304F\u3060\u3055\u3044\u3002"},
-        {"external.file.attributes.detected", "POSIX\u30D5\u30A1\u30A4\u30EB\u6A29\u9650\u307E\u305F\u306Fsymlink(\u3042\u308B\u3044\u306F\u305D\u306E\u4E21\u65B9)\u306E\u5C5E\u6027\u304C\u691C\u51FA\u3055\u308C\u307E\u3057\u305F\u3002\u7F72\u540D\u4E2D\u306F\u3053\u308C\u3089\u306E\u5C5E\u6027\u306F\u7121\u8996\u3055\u308C\u3001\u7F72\u540D\u306B\u3088\u3063\u3066\u4FDD\u8B77\u3055\u308C\u307E\u305B\u3093\u3002"},
-
-        {"jarsigner.", "jarsigner: "},
-        {"signature.filename.must.consist.of.the.following.characters.A.Z.0.9.or.",
-                "\u30B7\u30B0\u30CD\u30C1\u30E3\u306E\u30D5\u30A1\u30A4\u30EB\u540D\u306B\u4F7F\u7528\u3067\u304D\u308B\u6587\u5B57\u306F\u3001A-Z\u30010-9\u3001_\u3001- \u306E\u307F\u3067\u3059\u3002"},
-        {"unable.to.open.jar.file.", "\u6B21\u306Ejar\u30D5\u30A1\u30A4\u30EB\u3092\u958B\u304F\u3053\u3068\u304C\u3067\u304D\u307E\u305B\u3093: "},
-        {"unable.to.create.", "\u4F5C\u6210\u3067\u304D\u307E\u305B\u3093: "},
-        {".adding.", "   \u8FFD\u52A0\u4E2D: "},
-        {".updating.", " \u66F4\u65B0\u4E2D: "},
-        {".signing.", "  \u7F72\u540D\u4E2D: "},
-        {"attempt.to.rename.signedJarFile.to.jarFile.failed",
-                "{0}\u306E\u540D\u524D\u3092{1}\u306B\u5909\u66F4\u3057\u3088\u3046\u3068\u3057\u307E\u3057\u305F\u304C\u5931\u6557\u3057\u307E\u3057\u305F"},
-        {"attempt.to.rename.jarFile.to.origJar.failed",
-                "{0}\u306E\u540D\u524D\u3092{1}\u306B\u5909\u66F4\u3057\u3088\u3046\u3068\u3057\u307E\u3057\u305F\u304C\u5931\u6557\u3057\u307E\u3057\u305F"},
-        {"unable.to.sign.jar.", "jar\u306B\u7F72\u540D\u3067\u304D\u307E\u305B\u3093: "},
-        {"Enter.Passphrase.for.keystore.", "\u30AD\u30FC\u30B9\u30C8\u30A2\u306E\u30D1\u30B9\u30EF\u30FC\u30C9\u3092\u5165\u529B\u3057\u3066\u304F\u3060\u3055\u3044: "},
-        {"keystore.load.", "\u30AD\u30FC\u30B9\u30C8\u30A2\u306E\u30ED\u30FC\u30C9: "},
-        {"certificate.exception.", "\u8A3C\u660E\u66F8\u4F8B\u5916: "},
-        {"unable.to.instantiate.keystore.class.",
-                "\u30AD\u30FC\u30B9\u30C8\u30A2\u30FB\u30AF\u30E9\u30B9\u306E\u30A4\u30F3\u30B9\u30BF\u30F3\u30B9\u3092\u751F\u6210\u3067\u304D\u307E\u305B\u3093: "},
-        {"Certificate.chain.not.found.for.alias.alias.must.reference.a.valid.KeyStore.key.entry.containing.a.private.key.and",
-                "\u6B21\u306E\u8A3C\u660E\u66F8\u30C1\u30A7\u30FC\u30F3\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093: {0}\u3002{1}\u306F\u3001\u79D8\u5BC6\u30AD\u30FC\u304A\u3088\u3073\u5BFE\u5FDC\u3059\u308B\u516C\u958B\u30AD\u30FC\u8A3C\u660E\u66F8\u30C1\u30A7\u30FC\u30F3\u3092\u542B\u3080\u6709\u52B9\u306AKeyStore\u30AD\u30FC\u30FB\u30A8\u30F3\u30C8\u30EA\u3092\u53C2\u7167\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002"},
-        {"File.specified.by.certchain.does.not.exist",
-                "-certchain\u3067\u6307\u5B9A\u3055\u308C\u3066\u3044\u308B\u30D5\u30A1\u30A4\u30EB\u306F\u5B58\u5728\u3057\u307E\u305B\u3093"},
-        {"Cannot.restore.certchain.from.file.specified",
-                "\u6307\u5B9A\u3055\u308C\u305F\u30D5\u30A1\u30A4\u30EB\u304B\u3089\u8A3C\u660E\u66F8\u30C1\u30A7\u30FC\u30F3\u3092\u5FA9\u5143\u3067\u304D\u307E\u305B\u3093"},
-        {"Certificate.chain.not.found.in.the.file.specified.",
-                "\u8A3C\u660E\u66F8\u30C1\u30A7\u30FC\u30F3\u306F\u6307\u5B9A\u3055\u308C\u305F\u30D5\u30A1\u30A4\u30EB\u306B\u898B\u3064\u304B\u308A\u307E\u305B\u3093\u3002"},
-        {"found.non.X.509.certificate.in.signer.s.chain",
-                "\u7F72\u540D\u8005\u306E\u9023\u9396\u5185\u3067\u975EX.509\u8A3C\u660E\u66F8\u304C\u691C\u51FA\u3055\u308C\u307E\u3057\u305F"},
-        {"Enter.key.password.for.alias.", "{0}\u306E\u30AD\u30FC\u30FB\u30D1\u30B9\u30EF\u30FC\u30C9\u3092\u5165\u529B\u3057\u3066\u304F\u3060\u3055\u3044: "},
-        {"unable.to.recover.key.from.keystore",
-                "\u30AD\u30FC\u30B9\u30C8\u30A2\u304B\u3089\u30AD\u30FC\u3092\u5FA9\u5143\u3067\u304D\u307E\u305B\u3093"},
-        {"key.associated.with.alias.not.a.private.key",
-                "{0}\u3068\u95A2\u9023\u4ED8\u3051\u3089\u308C\u305F\u30AD\u30FC\u306F\u3001\u79D8\u5BC6\u30AD\u30FC\u3067\u306F\u3042\u308A\u307E\u305B\u3093"},
-        {"you.must.enter.key.password", "\u30AD\u30FC\u30FB\u30D1\u30B9\u30EF\u30FC\u30C9\u3092\u5165\u529B\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059"},
-        {"unable.to.read.password.", "\u30D1\u30B9\u30EF\u30FC\u30C9\u3092\u8AAD\u307F\u8FBC\u3081\u307E\u305B\u3093: "},
-        {"certificate.is.valid.from", "\u8A3C\u660E\u66F8\u306F{0}\u304B\u3089{1}\u307E\u3067\u6709\u52B9\u3067\u3059"},
-        {"certificate.expired.on", "\u8A3C\u660E\u66F8\u306F{0}\u306B\u5931\u52B9\u3057\u307E\u3057\u305F"},
-        {"certificate.is.not.valid.until",
-                "\u8A3C\u660E\u66F8\u306F{0}\u307E\u3067\u6709\u52B9\u3067\u306F\u3042\u308A\u307E\u305B\u3093"},
-        {"certificate.will.expire.on", "\u8A3C\u660E\u66F8\u306F{0}\u306B\u5931\u52B9\u3057\u307E\u3059"},
-        {".Invalid.certificate.chain.", "[\u7121\u52B9\u306A\u8A3C\u660E\u66F8\u30C1\u30A7\u30FC\u30F3: "},
-        {".Invalid.TSA.certificate.chain.", "[\u7121\u52B9\u306ATSA\u8A3C\u660E\u66F8\u30C1\u30A7\u30FC\u30F3: "},
-        {"requesting.a.signature.timestamp",
-                "\u30B7\u30B0\u30CD\u30C1\u30E3\u30FB\u30BF\u30A4\u30E0\u30B9\u30BF\u30F3\u30D7\u306E\u30EA\u30AF\u30A8\u30B9\u30C8"},
-        {"TSA.location.", "TSA\u306E\u5834\u6240: "},
-        {"TSA.certificate.", "TSA\u8A3C\u660E\u66F8: "},
-        {"no.response.from.the.Timestamping.Authority.",
-                "\u30BF\u30A4\u30E0\u30B9\u30BF\u30F3\u30D7\u5C40\u304B\u3089\u306E\u30EC\u30B9\u30DD\u30F3\u30B9\u304C\u3042\u308A\u307E\u305B\u3093\u3002\u30D5\u30A1\u30A4\u30A2\u30A6\u30A9\u30FC\u30EB\u3092\u4ECB\u3057\u3066\u63A5\u7D9A\u3059\u308B\u3068\u304D\u306F\u3001\u5FC5\u8981\u306B\u5FDC\u3058\u3066HTTP\u307E\u305F\u306FHTTPS\u30D7\u30ED\u30AD\u30B7\u3092\u6307\u5B9A\u3057\u3066\u304F\u3060\u3055\u3044\u3002jarsigner\u306B\u6B21\u306E\u30AA\u30D7\u30B7\u30E7\u30F3\u3092\u6307\u5B9A\u3057\u3066\u304F\u3060\u3055\u3044:"},
-        {"or", "\u307E\u305F\u306F"},
-        {"Certificate.not.found.for.alias.alias.must.reference.a.valid.KeyStore.entry.containing.an.X.509.public.key.certificate.for.the",
-                "\u8A3C\u660E\u66F8\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093\u3067\u3057\u305F: {0}\u3002{1}\u306F\u30BF\u30A4\u30E0\u30B9\u30BF\u30F3\u30D7\u5C40\u306EX.509\u516C\u958B\u30AD\u30FC\u8A3C\u660E\u66F8\u304C\u542B\u307E\u308C\u3066\u3044\u308B\u6709\u52B9\u306AKeyStore\u30A8\u30F3\u30C8\u30EA\u3092\u53C2\u7167\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002"},
-        {"entry.was.signed.on", "\u30A8\u30F3\u30C8\u30EA\u306F{0}\u306B\u7F72\u540D\u3055\u308C\u307E\u3057\u305F"},
-        {"Warning.", "\u8B66\u544A: "},
-        {"Error.", "\u30A8\u30E9\u30FC: "},
-        {"...Signer", ">>> \u7F72\u540D\u8005"},
-        {"...TSA", ">>> TSA"},
-        {"trusted.certificate", "\u4FE1\u983C\u3067\u304D\u308B\u8A3C\u660E\u66F8"},
-        {"This.jar.contains.unsigned.entries.which.have.not.been.integrity.checked.",
-                "\u3053\u306Ejar\u306B\u306F\u3001\u6574\u5408\u6027\u30C1\u30A7\u30C3\u30AF\u3092\u3057\u3066\u3044\u306A\u3044\u7F72\u540D\u306A\u3057\u306E\u30A8\u30F3\u30C8\u30EA\u304C\u542B\u307E\u308C\u3066\u3044\u307E\u3059\u3002 "},
-        {"This.jar.contains.entries.whose.signer.certificate.has.expired.",
-                "\u3053\u306Ejar\u306B\u306F\u3001\u7F72\u540D\u8005\u306E\u8A3C\u660E\u66F8\u304C\u671F\u9650\u5207\u308C\u306E\u30A8\u30F3\u30C8\u30EA\u304C\u542B\u307E\u308C\u3066\u3044\u307E\u3059\u3002 "},
-        {"This.jar.contains.entries.whose.signer.certificate.will.expire.within.six.months.",
-                "\u3053\u306Ejar\u306B\u306F\u3001\u7F72\u540D\u8005\u306E\u8A3C\u660E\u66F8\u304C6\u304B\u6708\u4EE5\u5185\u306B\u671F\u9650\u5207\u308C\u3068\u306A\u308B\u30A8\u30F3\u30C8\u30EA\u304C\u542B\u307E\u308C\u3066\u3044\u307E\u3059\u3002 "},
-        {"This.jar.contains.entries.whose.signer.certificate.is.not.yet.valid.",
-                "\u3053\u306Ejar\u306B\u306F\u3001\u7F72\u540D\u8005\u306E\u8A3C\u660E\u66F8\u304C\u307E\u3060\u6709\u52B9\u306B\u306A\u3063\u3066\u3044\u306A\u3044\u30A8\u30F3\u30C8\u30EA\u304C\u542B\u307E\u308C\u3066\u3044\u307E\u3059\u3002 "},
-        {"This.jar.contains.entries.whose.signer.certificate.is.self.signed.",
-                "\u3053\u306Ejar\u306B\u306F\u3001\u7F72\u540D\u8005\u306E\u8A3C\u660E\u66F8\u304C\u81EA\u5DF1\u7F72\u540D\u3055\u308C\u3066\u3044\u308B\u30A8\u30F3\u30C8\u30EA\u304C\u542B\u307E\u308C\u3066\u3044\u307E\u3059\u3002 "},
-        {"Re.run.with.the.verbose.and.certs.options.for.more.details.",
-                "\u8A73\u7D30\u306F\u3001-verbose\u304A\u3088\u3073-certs\u30AA\u30D7\u30B7\u30E7\u30F3\u3092\u4F7F\u7528\u3057\u3066\u518D\u5B9F\u884C\u3057\u3066\u304F\u3060\u3055\u3044\u3002"},
-        {"The.signer.certificate.has.expired.",
-                "\u7F72\u540D\u8005\u306E\u8A3C\u660E\u66F8\u306F\u671F\u9650\u5207\u308C\u3067\u3059\u3002"},
-        {"The.timestamp.expired.1.but.usable.2",
-                "\u30BF\u30A4\u30E0\u30B9\u30BF\u30F3\u30D7\u306F%1$tY-%1$tm-%1$td\u306B\u671F\u9650\u5207\u308C\u306B\u306A\u308A\u307E\u3059\u3002\u305F\u3060\u3057\u3001JAR\u306F\u7F72\u540D\u8005\u306E\u8A3C\u660E\u66F8\u304C%2$tY-%2$tm-%2$td\u306B\u671F\u9650\u5207\u308C\u306B\u306A\u308B\u307E\u3067\u6709\u52B9\u3067\u3059\u3002"},
-        {"The.timestamp.has.expired.",
-                "\u30BF\u30A4\u30E0\u30B9\u30BF\u30F3\u30D7\u306F\u671F\u9650\u5207\u308C\u306B\u306A\u308A\u307E\u3057\u305F\u3002"},
-        {"The.signer.certificate.will.expire.within.six.months.",
-                "\u7F72\u540D\u8005\u306E\u8A3C\u660E\u66F8\u306F6\u304B\u6708\u4EE5\u5185\u306B\u671F\u9650\u5207\u308C\u306B\u306A\u308A\u307E\u3059\u3002"},
-        {"The.timestamp.will.expire.within.one.year.on.1",
-                "\u30BF\u30A4\u30E0\u30B9\u30BF\u30F3\u30D7\u306F1\u5E74\u4EE5\u5185\u306E%1$tY-%1$tm-%1$td\u306B\u671F\u9650\u5207\u308C\u306B\u306A\u308A\u307E\u3059\u3002"},
-        {"The.timestamp.will.expire.within.one.year.on.1.but.2",
-                "\u30BF\u30A4\u30E0\u30B9\u30BF\u30F3\u30D7\u306F1\u5E74\u4EE5\u5185\u306E%1$tY-%1$tm-%1$td\u306B\u671F\u9650\u5207\u308C\u306B\u306A\u308A\u307E\u3059\u3002\u305F\u3060\u3057\u3001JAR\u306F\u7F72\u540D\u8005\u306E\u8A3C\u660E\u66F8\u304C%2$tY-%2$tm-%2$td\u306B\u671F\u9650\u5207\u308C\u306B\u306A\u308B\u307E\u3067\u6709\u52B9\u3067\u3059\u3002"},
-        {"The.signer.certificate.is.not.yet.valid.",
-                "\u7F72\u540D\u8005\u306E\u8A3C\u660E\u66F8\u306F\u307E\u3060\u6709\u52B9\u306B\u306A\u3063\u3066\u3044\u307E\u305B\u3093\u3002"},
-        {"The.signer.certificate.s.KeyUsage.extension.doesn.t.allow.code.signing.",
-                 "\u7F72\u540D\u8005\u8A3C\u660E\u66F8\u306EKeyUsage\u62E1\u5F35\u6A5F\u80FD\u3067\u306F\u3001\u30B3\u30FC\u30C9\u7F72\u540D\u306F\u8A31\u53EF\u3055\u308C\u307E\u305B\u3093\u3002"},
-        {"The.signer.certificate.s.ExtendedKeyUsage.extension.doesn.t.allow.code.signing.",
-                 "\u7F72\u540D\u8005\u8A3C\u660E\u66F8\u306EExtendedKeyUsage\u62E1\u5F35\u6A5F\u80FD\u3067\u306F\u3001\u30B3\u30FC\u30C9\u7F72\u540D\u306F\u8A31\u53EF\u3055\u308C\u307E\u305B\u3093\u3002"},
-        {"The.signer.certificate.s.NetscapeCertType.extension.doesn.t.allow.code.signing.",
-                 "\u7F72\u540D\u8005\u8A3C\u660E\u66F8\u306ENetscapeCertType\u62E1\u5F35\u6A5F\u80FD\u3067\u306F\u3001\u30B3\u30FC\u30C9\u7F72\u540D\u306F\u8A31\u53EF\u3055\u308C\u307E\u305B\u3093\u3002"},
-        {"This.jar.contains.entries.whose.signer.certificate.s.KeyUsage.extension.doesn.t.allow.code.signing.",
-                 "\u3053\u306Ejar\u306B\u306F\u3001\u7F72\u540D\u8005\u8A3C\u660E\u66F8\u306EKeyUsage\u62E1\u5F35\u6A5F\u80FD\u304C\u30B3\u30FC\u30C9\u7F72\u540D\u3092\u8A31\u53EF\u3057\u306A\u3044\u30A8\u30F3\u30C8\u30EA\u304C\u542B\u307E\u308C\u3066\u3044\u307E\u3059\u3002"},
-        {"This.jar.contains.entries.whose.signer.certificate.s.ExtendedKeyUsage.extension.doesn.t.allow.code.signing.",
-                 "\u3053\u306Ejar\u306B\u306F\u3001\u7F72\u540D\u8005\u8A3C\u660E\u66F8\u306EExtendedKeyUsage\u62E1\u5F35\u6A5F\u80FD\u304C\u30B3\u30FC\u30C9\u7F72\u540D\u3092\u8A31\u53EF\u3057\u306A\u3044\u30A8\u30F3\u30C8\u30EA\u304C\u542B\u307E\u308C\u3066\u3044\u307E\u3059\u3002"},
-        {"This.jar.contains.entries.whose.signer.certificate.s.NetscapeCertType.extension.doesn.t.allow.code.signing.",
-                 "\u3053\u306Ejar\u306B\u306F\u3001\u7F72\u540D\u8005\u8A3C\u660E\u66F8\u306ENetscapeCertType\u62E1\u5F35\u6A5F\u80FD\u304C\u30B3\u30FC\u30C9\u7F72\u540D\u3092\u8A31\u53EF\u3057\u306A\u3044\u30A8\u30F3\u30C8\u30EA\u304C\u542B\u307E\u308C\u3066\u3044\u307E\u3059\u3002"},
-        {".{0}.extension.does.not.support.code.signing.",
-                 "[{0}\u62E1\u5F35\u6A5F\u80FD\u306F\u30B3\u30FC\u30C9\u7F72\u540D\u3092\u30B5\u30DD\u30FC\u30C8\u3057\u3066\u3044\u307E\u305B\u3093]"},
-        {"The.signer.s.certificate.chain.is.invalid.reason.1",
-                "\u7F72\u540D\u8005\u306E\u8A3C\u660E\u66F8\u30C1\u30A7\u30FC\u30F3\u304C\u7121\u52B9\u3067\u3059\u3002\u7406\u7531: %s"},
-        {"The.tsa.certificate.chain.is.invalid.reason.1",
-                "TSA\u8A3C\u660E\u66F8\u30C1\u30A7\u30FC\u30F3\u304C\u7121\u52B9\u3067\u3059\u3002\u7406\u7531: %s"},
-        {"The.signer.s.certificate.is.self.signed.",
-                "\u7F72\u540D\u8005\u306E\u8A3C\u660E\u66F8\u306F\u81EA\u5DF1\u7F72\u540D\u3055\u308C\u3066\u3044\u307E\u3059\u3002"},
-        {"The.1.algorithm.specified.for.the.2.option.is.considered.a.security.risk..This.algorithm.will.be.disabled.in.a.future.update.",
-                "%1$s\u30A2\u30EB\u30B4\u30EA\u30BA\u30E0(%2$s\u30AA\u30D7\u30B7\u30E7\u30F3\u306B\u6307\u5B9A)\u306F\u3001\u30BB\u30AD\u30E5\u30EA\u30C6\u30A3\u30FB\u30EA\u30B9\u30AF\u3068\u307F\u306A\u3055\u308C\u307E\u3059\u3002\u3053\u306E\u30A2\u30EB\u30B4\u30EA\u30BA\u30E0\u306F\u5C06\u6765\u306E\u66F4\u65B0\u3067\u7121\u52B9\u5316\u3055\u308C\u307E\u3059\u3002"},
-        {"The.1.algorithm.specified.for.the.2.option.is.considered.a.security.risk.and.is.disabled.",
-                "%1$s\u30A2\u30EB\u30B4\u30EA\u30BA\u30E0(%2$s\u30AA\u30D7\u30B7\u30E7\u30F3\u306B\u6307\u5B9A)\u306F\u3001\u30BB\u30AD\u30E5\u30EA\u30C6\u30A3\u30FB\u30EA\u30B9\u30AF\u3068\u307F\u306A\u3055\u308C\u3001\u7121\u52B9\u5316\u3055\u308C\u3066\u3044\u307E\u3059\u3002"},
-        {"The.timestamp.digest.algorithm.1.is.considered.a.security.risk..This.algorithm.will.be.disabled.in.a.future.update.",
-                "%1$s\u30BF\u30A4\u30E0\u30B9\u30BF\u30F3\u30D7\u30FB\u30C0\u30A4\u30B8\u30A7\u30B9\u30C8\u30FB\u30A2\u30EB\u30B4\u30EA\u30BA\u30E0\u306F\u3001\u30BB\u30AD\u30E5\u30EA\u30C6\u30A3\u30FB\u30EA\u30B9\u30AF\u3068\u307F\u306A\u3055\u308C\u307E\u3059\u3002\u3053\u306E\u30A2\u30EB\u30B4\u30EA\u30BA\u30E0\u306F\u5C06\u6765\u306E\u66F4\u65B0\u3067\u7121\u52B9\u5316\u3055\u308C\u307E\u3059\u3002"},
-        {"The.digest.algorithm.1.is.considered.a.security.risk..This.algorithm.will.be.disabled.in.a.future.update.",
-                "%1$s\u30C0\u30A4\u30B8\u30A7\u30B9\u30C8\u30FB\u30A2\u30EB\u30B4\u30EA\u30BA\u30E0\u306F\u3001\u30BB\u30AD\u30E5\u30EA\u30C6\u30A3\u30FB\u30EA\u30B9\u30AF\u3068\u307F\u306A\u3055\u308C\u307E\u3059\u3002\u3053\u306E\u30A2\u30EB\u30B4\u30EA\u30BA\u30E0\u306F\u5C06\u6765\u306E\u66F4\u65B0\u3067\u7121\u52B9\u5316\u3055\u308C\u307E\u3059\u3002"},
-        {"The.signature.algorithm.1.is.considered.a.security.risk..This.algorithm.will.be.disabled.in.a.future.update.",
-                "%1$s\u7F72\u540D\u30A2\u30EB\u30B4\u30EA\u30BA\u30E0\u306F\u3001\u30BB\u30AD\u30E5\u30EA\u30C6\u30A3\u30FB\u30EA\u30B9\u30AF\u3068\u307F\u306A\u3055\u308C\u307E\u3059\u3002\u3053\u306E\u30A2\u30EB\u30B4\u30EA\u30BA\u30E0\u306F\u5C06\u6765\u306E\u66F4\u65B0\u3067\u7121\u52B9\u5316\u3055\u308C\u307E\u3059\u3002"},
-        {"size.bit.alg",
-                "%1$d\u30D3\u30C3\u30C8%2$s"},
-        {"The.full.keyAlgName.signing.key.is.considered.a.security.risk..It.will.be.disabled.in.a.future.update.",
-                "%s\u7F72\u540D\u30AD\u30FC\u306F\u30BB\u30AD\u30E5\u30EA\u30C6\u30A3\u30FB\u30EA\u30B9\u30AF\u3068\u307F\u306A\u3055\u308C\u307E\u3059\u3002\u4ECA\u5F8C\u306E\u66F4\u65B0\u3067\u306F\u7121\u52B9\u306B\u306A\u308A\u307E\u3059\u3002"},
-        {"The.full.keyAlgName.signing.key.is.considered.a.security.risk.and.is.disabled.",
-                "%s\u7F72\u540D\u30AD\u30FC\u306F\u30BB\u30AD\u30E5\u30EA\u30C6\u30A3\u30FB\u30EA\u30B9\u30AF\u3068\u307F\u306A\u3055\u308C\u3001\u7121\u52B9\u306B\u306A\u3063\u3066\u3044\u307E\u3059\u3002"},
-        {"This.jar.contains.entries.whose.certificate.chain.is.invalid.reason.1",
-                 "\u3053\u306Ejar\u306B\u306F\u3001\u8A3C\u660E\u66F8\u30C1\u30A7\u30FC\u30F3\u304C\u7121\u52B9\u306A\u30A8\u30F3\u30C8\u30EA\u304C\u542B\u307E\u308C\u3066\u3044\u307E\u3059\u3002\u7406\u7531: %s"},
-        {"This.jar.contains.entries.whose.tsa.certificate.chain.is.invalid.reason.1",
-                "\u3053\u306Ejar\u306B\u306F\u3001TSA\u8A3C\u660E\u66F8\u30C1\u30A7\u30FC\u30F3\u304C\u7121\u52B9\u306A\u30A8\u30F3\u30C8\u30EA\u304C\u542B\u307E\u308C\u3066\u3044\u307E\u3059\u3002\u7406\u7531: %s"},
-        {"no.timestamp.signing",
-                "-tsa\u307E\u305F\u306F-tsacert\u304C\u6307\u5B9A\u3055\u308C\u3066\u3044\u306A\u3044\u305F\u3081\u3001\u3053\u306Ejar\u306B\u306F\u30BF\u30A4\u30E0\u30B9\u30BF\u30F3\u30D7\u304C\u4ED8\u52A0\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002\u30BF\u30A4\u30E0\u30B9\u30BF\u30F3\u30D7\u304C\u306A\u3044\u3068\u3001\u7F72\u540D\u8005\u8A3C\u660E\u66F8\u306E\u6709\u52B9\u671F\u9650(%1$tY-%1$tm-%1$td)\u5F8C\u306B\u3001\u30E6\u30FC\u30B6\u30FC\u306F\u3053\u306Ejar\u3092\u691C\u8A3C\u3067\u304D\u306A\u3044\u53EF\u80FD\u6027\u304C\u3042\u308A\u307E\u3059\u3002"},
-        {"invalid.timestamp.signing",
-                "\u30BF\u30A4\u30E0\u30B9\u30BF\u30F3\u30D7\u304C\u7121\u52B9\u3067\u3059\u3002\u6709\u52B9\u306A\u30BF\u30A4\u30E0\u30B9\u30BF\u30F3\u30D7\u304C\u306A\u3044\u3068\u3001\u7F72\u540D\u8005\u8A3C\u660E\u66F8\u306E\u6709\u52B9\u671F\u9650(%1$tY-%1$tm-%1$td)\u5F8C\u306B\u3001\u30E6\u30FC\u30B6\u30FC\u306F\u3053\u306Ejar\u3092\u691C\u8A3C\u3067\u304D\u306A\u3044\u53EF\u80FD\u6027\u304C\u3042\u308A\u307E\u3059\u3002"},
-        {"no.timestamp.verifying",
-                "\u3053\u306Ejar\u306B\u306F\u3001\u30BF\u30A4\u30E0\u30B9\u30BF\u30F3\u30D7\u304C\u306A\u3044\u7F72\u540D\u304C\u542B\u307E\u308C\u3066\u3044\u307E\u3059\u3002\u30BF\u30A4\u30E0\u30B9\u30BF\u30F3\u30D7\u304C\u306A\u3044\u3068\u3001\u3044\u305A\u308C\u304B\u306E\u7F72\u540D\u8005\u8A3C\u660E\u66F8\u306E\u6709\u52B9\u671F\u9650\u5F8C\u306B(\u65E9\u3051\u308C\u3070%1$tY-%1$tm-%1$td)\u30E6\u30FC\u30B6\u30FC\u306F\u3053\u306Ejar\u3092\u691C\u8A3C\u3067\u304D\u306A\u3044\u53EF\u80FD\u6027\u304C\u3042\u308A\u307E\u3059\u3002"},
-        {"bad.timestamp.verifying",
-                "\u3053\u306Ejar\u306B\u306F\u3001\u7121\u52B9\u306A\u30BF\u30A4\u30E0\u30B9\u30BF\u30F3\u30D7\u306E\u3042\u308B\u7F72\u540D\u304C\u542B\u307E\u308C\u3066\u3044\u307E\u3059\u3002\u6709\u52B9\u306A\u30BF\u30A4\u30E0\u30B9\u30BF\u30F3\u30D7\u304C\u306A\u3044\u3068\u3001\u3044\u305A\u308C\u304B\u306E\u7F72\u540D\u8005\u8A3C\u660E\u66F8\u306E\u6709\u52B9\u671F\u9650\u5F8C\u306B(\u65E9\u3051\u308C\u3070%1$tY-%1$tm-%1$td)\u30E6\u30FC\u30B6\u30FC\u306F\u3053\u306Ejar\u3092\u691C\u8A3C\u3067\u304D\u306A\u3044\u53EF\u80FD\u6027\u304C\u3042\u308A\u307E\u3059\u3002\n\u8A73\u7D30\u306F\u3001-J-Djava.security.debug=jar\u3092\u6307\u5B9A\u3057\u3066jarsigner\u3092\u518D\u5B9F\u884C\u3057\u3066\u304F\u3060\u3055\u3044\u3002"},
-        {"The.signer.certificate.will.expire.on.1.",
-                "\u7F72\u540D\u8005\u306E\u8A3C\u660E\u66F8\u306F%1$tY-%1$tm-%1$td\u306B\u671F\u9650\u5207\u308C\u306B\u306A\u308A\u307E\u3059\u3002"},
-        {"The.timestamp.will.expire.on.1.",
-                "\u30BF\u30A4\u30E0\u30B9\u30BF\u30F3\u30D7\u306F%1$tY-%1$tm-%1$td\u306B\u671F\u9650\u5207\u308C\u306B\u306A\u308A\u307E\u3059\u3002"},
-        {"signer.cert.expired.1.but.timestamp.good.2.",
-                "\u7F72\u540D\u8005\u306E\u8A3C\u660E\u66F8\u306F%1$tY-%1$tm-%1$td\u306B\u671F\u9650\u5207\u308C\u306B\u306A\u308A\u307E\u3059\u3002\u305F\u3060\u3057\u3001JAR\u306F\u30BF\u30A4\u30E0\u30B9\u30BF\u30F3\u30D7\u304C%2$tY-%2$tm-%2$td\u306B\u671F\u9650\u5207\u308C\u306B\u306A\u308B\u307E\u3067\u6709\u52B9\u3067\u3059\u3002"},
-        {"Unknown.password.type.", "\u4E0D\u660E\u306A\u30D1\u30B9\u30EF\u30FC\u30C9\u30FB\u30BF\u30A4\u30D7: "},
-        {"Cannot.find.environment.variable.",
-                "\u74B0\u5883\u5909\u6570\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093: "},
-        {"Cannot.find.file.", "\u30D5\u30A1\u30A4\u30EB\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093: "},
-        {"event.ocsp.check", "%s\u306EOCSP\u30B5\u30FC\u30D0\u30FC\u306B\u63A5\u7D9A\u3057\u3066\u3044\u307E\u3059..."},
-        {"event.crl.check", "%s\u304B\u3089CRL\u3092\u30C0\u30A6\u30F3\u30ED\u30FC\u30C9\u3057\u3066\u3044\u307E\u3059..."},
-    };
-
-    /**
-     * Returns the contents of this <code>ResourceBundle</code>.
-     *
-     * <p>
-     *
-     * @return the contents of this <code>ResourceBundle</code>.
-     */
-    @Override
-    public Object[][] getContents() {
-        return contents;
-    }
-}
diff --git a/src/jdk.jartool/share/classes/sun/security/tools/jarsigner/Resources_zh_CN.java b/src/jdk.jartool/share/classes/sun/security/tools/jarsigner/Resources_zh_CN.java
deleted file mode 100644
index 44fa18f3541..00000000000
--- a/src/jdk.jartool/share/classes/sun/security/tools/jarsigner/Resources_zh_CN.java
+++ /dev/null
@@ -1,338 +0,0 @@
-/*
- * Copyright (c) 2000, 2025, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute 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.tools.jarsigner;
-
-/**
- * <p> This class represents the <code>ResourceBundle</code>
- * for JarSigner.
- *
- */
-public class Resources_zh_CN extends java.util.ListResourceBundle {
-
-    private static final Object[][] contents = {
-
-        // shared (from jarsigner)
-        {"SPACE", " "},
-        {"6SPACE", "      "},
-        {"COMMA", ", "},
-
-        {"provclass.not.a.provider", "%s\u4E0D\u662F\u63D0\u4F9B\u65B9"},
-        {"provider.name.not.found", "\u672A\u627E\u5230\u540D\u4E3A \"%s\" \u7684\u63D0\u4F9B\u65B9"},
-        {"provider.class.not.found", "\u672A\u627E\u5230\u63D0\u4F9B\u65B9 \"%s\""},
-        {"jarsigner.error.", "jarsigner \u9519\u8BEF: "},
-        {"Illegal.option.", "\u975E\u6CD5\u9009\u9879: "},
-        {".keystore.must.be.NONE.if.storetype.is.{0}",
-                "\u5982\u679C -storetype \u4E3A {0}, \u5219 -keystore \u5FC5\u987B\u4E3A NONE"},
-        {".keypass.can.not.be.specified.if.storetype.is.{0}",
-                "\u5982\u679C -storetype \u4E3A {0}, \u5219\u4E0D\u80FD\u6307\u5B9A -keypass"},
-        {"If.protected.is.specified.then.storepass.and.keypass.must.not.be.specified",
-                "\u5982\u679C\u6307\u5B9A\u4E86 -protected, \u5219\u4E0D\u80FD\u6307\u5B9A -storepass \u548C -keypass"},
-        {"If.keystore.is.not.password.protected.then.storepass.and.keypass.must.not.be.specified",
-                 "\u5982\u679C\u5BC6\u94A5\u5E93\u672A\u53D7\u53E3\u4EE4\u4FDD\u62A4, \u5219\u4E0D\u80FD\u6307\u5B9A -storepass \u548C -keypass"},
-        {"Usage.jarsigner.options.jar.file.alias",
-                "\u7528\u6CD5: jarsigner [\u9009\u9879] jar-file \u522B\u540D"},
-        {".jarsigner.verify.options.jar.file.alias.",
-                "       jarsigner -verify [\u9009\u9879] jar-file [\u522B\u540D...]"},
-        {".jarsigner.version",
-                "       jarsigner -version"},
-        {".keystore.url.keystore.location",
-                "[-keystore <url>]           \u5BC6\u94A5\u5E93\u4F4D\u7F6E"},
-        {".storepass.password.password.for.keystore.integrity",
-            "[-storepass <\u53E3\u4EE4>]         \u7528\u4E8E\u5BC6\u94A5\u5E93\u5B8C\u6574\u6027\u7684\u53E3\u4EE4"},
-        {".storetype.type.keystore.type",
-                "[-storetype <\u7C7B\u578B>]         \u5BC6\u94A5\u5E93\u7C7B\u578B"},
-        {".keypass.password.password.for.private.key.if.different.",
-                "[-keypass <\u53E3\u4EE4>]           \u79C1\u6709\u5BC6\u94A5\u7684\u53E3\u4EE4 (\u5982\u679C\u4E0D\u540C)"},
-        {".certchain.file.name.of.alternative.certchain.file",
-                "[-certchain <\u6587\u4EF6>]         \u66FF\u4EE3\u8BC1\u4E66\u94FE\u6587\u4EF6\u7684\u540D\u79F0"},
-        {".sigfile.file.name.of.SF.DSA.file",
-                "[-sigfile <\u6587\u4EF6>]           .SF/.DSA \u6587\u4EF6\u7684\u540D\u79F0"},
-        {".signedjar.file.name.of.signed.JAR.file",
-                "[-signedjar <\u6587\u4EF6>]         \u5DF2\u7B7E\u540D\u7684 JAR \u6587\u4EF6\u7684\u540D\u79F0"},
-        {".digestalg.algorithm.name.of.digest.algorithm",
-                "[-digestalg <\u7B97\u6CD5>]        \u6458\u8981\u7B97\u6CD5\u7684\u540D\u79F0"},
-        {".sigalg.algorithm.name.of.signature.algorithm",
-                "[-sigalg <\u7B97\u6CD5>]           \u7B7E\u540D\u7B97\u6CD5\u7684\u540D\u79F0"},
-        {".verify.verify.a.signed.JAR.file",
-                "[-verify]                   \u9A8C\u8BC1\u5DF2\u7B7E\u540D\u7684 JAR \u6587\u4EF6"},
-        {".version.print.the.program.version",
-                "[-version]                  \u8F93\u51FA\u7A0B\u5E8F\u7248\u672C"},
-        {".verbose.suboptions.verbose.output.when.signing.verifying.",
-                "[-verbose[:suboptions]]     \u7B7E\u540D/\u9A8C\u8BC1\u65F6\u8F93\u51FA\u8BE6\u7EC6\u4FE1\u606F\u3002"},
-        {".suboptions.can.be.all.grouped.or.summary",
-                "                            \u5B50\u9009\u9879\u53EF\u4EE5\u662F all, grouped \u6216 summary"},
-        {".certs.display.certificates.when.verbose.and.verifying",
-                "[-certs]                    \u8F93\u51FA\u8BE6\u7EC6\u4FE1\u606F\u548C\u9A8C\u8BC1\u65F6\u663E\u793A\u8BC1\u4E66"},
-        {".certs.revocation.check",
-                "[-revCheck]                 \u542F\u7528\u8BC1\u4E66\u64A4\u6D88\u68C0\u67E5"},
-        {".tsa.url.location.of.the.Timestamping.Authority",
-                "[-tsa <url>]                \u65F6\u95F4\u6233\u9881\u53D1\u673A\u6784\u7684\u4F4D\u7F6E"},
-        {".tsacert.alias.public.key.certificate.for.Timestamping.Authority",
-                "[-tsacert <\u522B\u540D>]           \u65F6\u95F4\u6233\u9881\u53D1\u673A\u6784\u7684\u516C\u5171\u5BC6\u94A5\u8BC1\u4E66"},
-        {".tsapolicyid.tsapolicyid.for.Timestamping.Authority",
-                "[-tsapolicyid <oid>]        \u65F6\u95F4\u6233\u9881\u53D1\u673A\u6784\u7684 TSAPolicyID"},
-        {".tsadigestalg.algorithm.of.digest.data.in.timestamping.request",
-                "[-tsadigestalg <\u7B97\u6CD5>]      \u65F6\u95F4\u6233\u8BF7\u6C42\u4E2D\u7684\u6458\u8981\u6570\u636E\u7684\u7B97\u6CD5"},
-        {".internalsf.include.the.SF.file.inside.the.signature.block",
-                "[-internalsf]               \u5728\u7B7E\u540D\u5757\u5185\u5305\u542B .SF \u6587\u4EF6"},
-        {".sectionsonly.don.t.compute.hash.of.entire.manifest",
-                "[-sectionsonly]             \u4E0D\u8BA1\u7B97\u6574\u4E2A\u6E05\u5355\u7684\u6563\u5217"},
-        {".protected.keystore.has.protected.authentication.path",
-                "[-protected]                \u5BC6\u94A5\u5E93\u5177\u6709\u53D7\u4FDD\u62A4\u9A8C\u8BC1\u8DEF\u5F84"},
-        {".providerName.name.provider.name",
-                "[-providerName <\u540D\u79F0>]      \u63D0\u4F9B\u65B9\u540D\u79F0"},
-        {".add.provider.option",
-                "[-addprovider <\u540D\u79F0>        \u6309\u540D\u79F0 (\u4F8B\u5982 SunPKCS11) \u6DFB\u52A0\u5B89\u5168\u63D0\u4F9B\u65B9"},
-        {".providerArg.option.1",
-                "  [-providerArg <\u53C2\u6570>]] ... \u914D\u7F6E -addprovider \u7684\u53C2\u6570"},
-        {".providerClass.option",
-                "[-providerClass <\u7C7B>     \u6309\u5168\u9650\u5B9A\u7C7B\u540D\u6DFB\u52A0\u5B89\u5168\u63D0\u4F9B\u65B9"},
-        {".providerArg.option.2",
-                "  [-providerArg <\u53C2\u6570>]] ... \u914D\u7F6E -providerClass \u7684\u53C2\u6570"},
-        {".providerPath.option",
-                "[-providerPath <list>]      \u63D0\u4F9B\u65B9\u7C7B\u8DEF\u5F84"},
-        {".strict.treat.warnings.as.errors",
-                "[-strict]                   \u5C06\u8B66\u544A\u89C6\u4E3A\u9519\u8BEF"},
-        {".conf.url.specify.a.pre.configured.options.file",
-                "[-conf <url>]               \u6307\u5B9A\u9884\u914D\u7F6E\u7684\u9009\u9879\u6587\u4EF6"},
-        {".print.this.help.message",
-                "[-? -h --help]              \u8F93\u51FA\u6B64\u5E2E\u52A9\u6D88\u606F"},
-        {"Option.lacks.argument", "\u9009\u9879\u7F3A\u5C11\u53C2\u6570"},
-        {"Please.type.jarsigner.help.for.usage", "\u8BF7\u952E\u5165 jarsigner --help \u4EE5\u4E86\u89E3\u7528\u6CD5"},
-        {"Please.specify.jarfile.name", "\u8BF7\u6307\u5B9A jarfile \u540D\u79F0"},
-        {"Please.specify.alias.name", "\u8BF7\u6307\u5B9A\u522B\u540D"},
-        {"Only.one.alias.can.be.specified", "\u53EA\u80FD\u6307\u5B9A\u4E00\u4E2A\u522B\u540D"},
-        {"This.jar.contains.signed.entries.which.is.not.signed.by.the.specified.alias.es.",
-                 "\u6B64 jar \u5305\u542B\u672A\u7531\u6307\u5B9A\u522B\u540D\u7B7E\u540D\u7684\u5DF2\u7B7E\u540D\u6761\u76EE\u3002"},
-        {"This.jar.contains.signed.entries.that.s.not.signed.by.alias.in.this.keystore.",
-                  "\u6B64 jar \u5305\u542B\u672A\u7531\u6B64\u5BC6\u94A5\u5E93\u4E2D\u7684\u522B\u540D\u7B7E\u540D\u7684\u5DF2\u7B7E\u540D\u6761\u76EE\u3002"},
-        {"s", "s"},
-        {"m", "m"},
-        {"k", "k"},
-        {"X", "X"},
-        {"q", "?"},
-        {".and.d.more.", "(%d \u53CA\u4EE5\u4E0A)"},
-        {".s.signature.was.verified.",
-                "  s = \u5DF2\u9A8C\u8BC1\u7B7E\u540D "},
-        {".m.entry.is.listed.in.manifest",
-                "  m = \u5728\u6E05\u5355\u4E2D\u5217\u51FA\u6761\u76EE"},
-        {".k.at.least.one.certificate.was.found.in.keystore",
-                "  k = \u5728\u5BC6\u94A5\u5E93\u4E2D\u81F3\u5C11\u627E\u5230\u4E86\u4E00\u4E2A\u8BC1\u4E66"},
-        {".X.not.signed.by.specified.alias.es.",
-                "  X = \u672A\u7531\u6307\u5B9A\u522B\u540D\u7B7E\u540D"},
-        {".q.unsigned.entry",
-                "  ? = \u672A\u7B7E\u540D\u6761\u76EE"},
-        {"no.manifest.", "\u6CA1\u6709\u6E05\u5355\u3002"},
-        {".Signature.related.entries.","(\u4E0E\u7B7E\u540D\u76F8\u5173\u7684\u6761\u76EE)"},
-        {".Unsigned.entries.", "(\u672A\u7B7E\u540D\u6761\u76EE)"},
-        {".Directory.entries.", "\uFF08\u76EE\u5F55\u6761\u76EE\uFF09"},
-        {"jar.is.unsigned",
-                "jar \u672A\u7B7E\u540D\u3002"},
-        {"jar.treated.unsigned",
-                "\u8B66\u544A: \u7B7E\u540D\u65E0\u6CD5\u89E3\u6790\u6216\u9A8C\u8BC1, \u8BE5 jar \u5C06\u88AB\u89C6\u4E3A\u672A\u7B7E\u540D\u3002\u6709\u5173\u8BE6\u7EC6\u4FE1\u606F, \u8BF7\u5728\u542F\u7528\u8C03\u8BD5\u7684\u60C5\u51B5\u4E0B\u91CD\u65B0\u8FD0\u884C jarsigner (-J-Djava.security.debug=jar)\u3002"},
-        {"jar.treated.unsigned.see.weak",
-                "\u7531\u4E8E\u8BE5 jar \u662F\u4F7F\u7528\u76EE\u524D\u5DF2\u7981\u7528\u7684\u5F31\u7B97\u6CD5\u7B7E\u540D\u7684, \u56E0\u6B64\u8BE5 jar \u5C06\u88AB\u89C6\u4E3A\u672A\u7B7E\u540D\u3002\n\n\u6709\u5173\u8BE6\u7EC6\u4FE1\u606F, \u8BF7\u4F7F\u7528 -verbose \u9009\u9879\u91CD\u65B0\u8FD0\u884C jarsigner\u3002"},
-        {"jar.treated.unsigned.see.weak.verbose",
-                "\u8B66\u544A: \u8BE5 jar \u5C06\u88AB\u89C6\u4E3A\u672A\u7B7E\u540D, \u56E0\u4E3A\u5B83\u662F\u7531\u76EE\u524D\u5B89\u5168\u5C5E\u6027\u7981\u7528\u7684\u5F31\u7B97\u6CD5\u7B7E\u540D\u7684:"},
-        {"jar.signed.", "jar \u5DF2\u7B7E\u540D\u3002"},
-        {"jar.signed.with.signer.errors.", "jar \u5DF2\u7B7E\u540D, \u4F46\u51FA\u73B0\u7B7E\u540D\u8005\u9519\u8BEF\u3002"},
-        {"jar.verified.", "jar \u5DF2\u9A8C\u8BC1\u3002"},
-        {"jar.verified.with.signer.errors.", "jar \u5DF2\u9A8C\u8BC1, \u4F46\u51FA\u73B0\u7B7E\u540D\u8005\u9519\u8BEF\u3002"},
-
-        {"history.with.ts", "- \u7531 \"%1$s\" \u7B7E\u540D\n    \u6458\u8981\u7B97\u6CD5: %2$s\n    \u7B7E\u540D\u7B97\u6CD5: %3$s, %4$s\n  \u7531 \"%6$s\" \u4E8E %5$tc \u52A0\u65F6\u95F4\u6233\n    \u65F6\u95F4\u6233\u6458\u8981\u7B97\u6CD5: %7$s\n    \u65F6\u95F4\u6233\u7B7E\u540D\u7B97\u6CD5: %8$s, %9$s"},
-        {"history.without.ts", "- \u7531 \"%1$s\" \u7B7E\u540D\n    \u6458\u8981\u7B97\u6CD5: %2$s\n    \u7B7E\u540D\u7B97\u6CD5: %3$s, %4$s"},
-        {"history.nonexistent.entries", "\u8B66\u544A\uFF1A\u4E0D\u5B58\u5728\u7684\u7B7E\u540D\u6761\u76EE\uFF1A "},
-        {"history.unparsable", "- \u65E0\u6CD5\u89E3\u6790\u7684\u4E0E\u7B7E\u540D\u76F8\u5173\u7684\u6587\u4EF6 %s"},
-        {"history.nosf", "- \u7F3A\u5C11\u4E0E\u7B7E\u540D\u76F8\u5173\u7684\u6587\u4EF6 META-INF/%s.SF"},
-        {"history.nobk", "- \u4E0E\u7B7E\u540D\u76F8\u5173\u7684\u6587\u4EF6 META-INF/%s.SF \u7F3A\u5C11\u5757\u6587\u4EF6"},
-
-        {"with.weak", "%s (\u5F31)"},
-        {"with.algparams.weak", "%1$s \u4F7F\u7528 %2$s\uFF08\u5F31\uFF09"},
-        {"with.disabled", "%s\uFF08\u7981\u7528\uFF09"},
-        {"with.algparams.disabled", "%1$s \u4F7F\u7528 %2$s\uFF08\u7981\u7528\uFF09"},
-        {"key.bit", "%s \u5BC6\u94A5"},
-        {"key.bit.weak", "%s \u5BC6\u94A5\uFF08\u5F31\uFF09"},
-        {"key.bit.disabled", "%s \u5BC6\u94A5\uFF08\u5DF2\u7981\u7528\uFF09"},
-        {"nonexistent.entries.found", "\u6B64 jar \u7684\u6587\u4EF6\u5305\u542B\u4E0D\u5B58\u5728\u7684\u7B7E\u540D\u6761\u76EE\u3002\u6709\u5173\u66F4\u591A\u8BE6\u7EC6\u4FE1\u606F\uFF0C\u8BF7\u53C2\u89C1 -verbose \u8F93\u51FA\u3002"},
-        {"external.file.attributes.detected", "\u68C0\u6D4B\u5230 POSIX \u6587\u4EF6\u6743\u9650\u548C/\u6216 symlink \u5C5E\u6027\u3002\u8FD9\u4E9B\u5C5E\u6027\u5728\u8FDB\u884C\u7B7E\u540D\u65F6\u4F1A\u88AB\u5FFD\u7565\uFF0C\u4E0D\u53D7\u8BE5\u7B7E\u540D\u7684\u4FDD\u62A4\u3002"},
-
-        {"jarsigner.", "jarsigner: "},
-        {"signature.filename.must.consist.of.the.following.characters.A.Z.0.9.or.",
-                "\u7B7E\u540D\u6587\u4EF6\u540D\u5FC5\u987B\u5305\u542B\u4EE5\u4E0B\u5B57\u7B26: A-Z, 0-9, _ \u6216 -"},
-        {"unable.to.open.jar.file.", "\u65E0\u6CD5\u6253\u5F00 jar \u6587\u4EF6: "},
-        {"unable.to.create.", "\u65E0\u6CD5\u521B\u5EFA: "},
-        {".adding.", "   \u6B63\u5728\u6DFB\u52A0: "},
-        {".updating.", " \u6B63\u5728\u66F4\u65B0: "},
-        {".signing.", "  \u6B63\u5728\u7B7E\u540D: "},
-        {"attempt.to.rename.signedJarFile.to.jarFile.failed",
-                "\u5C1D\u8BD5\u5C06{0}\u91CD\u547D\u540D\u4E3A{1}\u65F6\u5931\u8D25"},
-        {"attempt.to.rename.jarFile.to.origJar.failed",
-                "\u5C1D\u8BD5\u5C06{0}\u91CD\u547D\u540D\u4E3A{1}\u65F6\u5931\u8D25"},
-        {"unable.to.sign.jar.", "\u65E0\u6CD5\u5BF9 jar \u8FDB\u884C\u7B7E\u540D: "},
-        {"Enter.Passphrase.for.keystore.", "\u8F93\u5165\u5BC6\u94A5\u5E93\u7684\u5BC6\u7801\u77ED\u8BED: "},
-        {"keystore.load.", "\u5BC6\u94A5\u5E93\u52A0\u8F7D: "},
-        {"certificate.exception.", "\u8BC1\u4E66\u5F02\u5E38\u9519\u8BEF: "},
-        {"unable.to.instantiate.keystore.class.",
-                "\u65E0\u6CD5\u5B9E\u4F8B\u5316\u5BC6\u94A5\u5E93\u7C7B: "},
-        {"Certificate.chain.not.found.for.alias.alias.must.reference.a.valid.KeyStore.key.entry.containing.a.private.key.and",
-                "\u627E\u4E0D\u5230{0}\u7684\u8BC1\u4E66\u94FE\u3002{1}\u5FC5\u987B\u5F15\u7528\u5305\u542B\u79C1\u6709\u5BC6\u94A5\u548C\u76F8\u5E94\u7684\u516C\u5171\u5BC6\u94A5\u8BC1\u4E66\u94FE\u7684\u6709\u6548\u5BC6\u94A5\u5E93\u5BC6\u94A5\u6761\u76EE\u3002"},
-        {"File.specified.by.certchain.does.not.exist",
-                "\u7531 -certchain \u6307\u5B9A\u7684\u6587\u4EF6\u4E0D\u5B58\u5728"},
-        {"Cannot.restore.certchain.from.file.specified",
-                "\u65E0\u6CD5\u4ECE\u6307\u5B9A\u7684\u6587\u4EF6\u8FD8\u539F certchain"},
-        {"Certificate.chain.not.found.in.the.file.specified.",
-                "\u5728\u6307\u5B9A\u7684\u6587\u4EF6\u4E2D\u627E\u4E0D\u5230\u8BC1\u4E66\u94FE\u3002"},
-        {"found.non.X.509.certificate.in.signer.s.chain",
-                "\u5728\u7B7E\u540D\u8005\u7684\u94FE\u4E2D\u627E\u5230\u975E X.509 \u8BC1\u4E66"},
-        {"Enter.key.password.for.alias.", "\u8F93\u5165{0}\u7684\u5BC6\u94A5\u53E3\u4EE4: "},
-        {"unable.to.recover.key.from.keystore",
-                "\u65E0\u6CD5\u4ECE\u5BC6\u94A5\u5E93\u4E2D\u6062\u590D\u5BC6\u94A5"},
-        {"key.associated.with.alias.not.a.private.key",
-                "\u4E0E{0}\u5173\u8054\u7684\u5BC6\u94A5\u4E0D\u662F\u79C1\u6709\u5BC6\u94A5"},
-        {"you.must.enter.key.password", "\u5FC5\u987B\u8F93\u5165\u5BC6\u94A5\u53E3\u4EE4"},
-        {"unable.to.read.password.", "\u65E0\u6CD5\u8BFB\u53D6\u53E3\u4EE4: "},
-        {"certificate.is.valid.from", "\u8BC1\u4E66\u7684\u6709\u6548\u671F\u4E3A{0}\u81F3{1}"},
-        {"certificate.expired.on", "\u8BC1\u4E66\u5230\u671F\u65E5\u671F\u4E3A {0}"},
-        {"certificate.is.not.valid.until",
-                "\u76F4\u5230{0}, \u8BC1\u4E66\u624D\u6709\u6548"},
-        {"certificate.will.expire.on", "\u8BC1\u4E66\u5C06\u5728{0}\u5230\u671F"},
-        {".Invalid.certificate.chain.", "[\u65E0\u6548\u7684\u8BC1\u4E66\u94FE: "},
-        {".Invalid.TSA.certificate.chain.", "[\u65E0\u6548 TSA \u7684\u8BC1\u4E66\u94FE: "},
-        {"requesting.a.signature.timestamp",
-                "\u6B63\u5728\u8BF7\u6C42\u7B7E\u540D\u65F6\u95F4\u6233"},
-        {"TSA.location.", "TSA \u4F4D\u7F6E: "},
-        {"TSA.certificate.", "TSA \u8BC1\u4E66: "},
-        {"no.response.from.the.Timestamping.Authority.",
-                "\u65F6\u95F4\u6233\u9881\u53D1\u673A\u6784\u6CA1\u6709\u54CD\u5E94\u3002\u5982\u679C\u8981\u4ECE\u9632\u706B\u5899\u540E\u9762\u8FDE\u63A5, \u5219\u53EF\u80FD\u9700\u8981\u6307\u5B9A HTTP \u6216 HTTPS \u4EE3\u7406\u3002\u8BF7\u4E3A jarsigner \u63D0\u4F9B\u4EE5\u4E0B\u9009\u9879: "},
-        {"or", "\u6216"},
-        {"Certificate.not.found.for.alias.alias.must.reference.a.valid.KeyStore.entry.containing.an.X.509.public.key.certificate.for.the",
-                "\u627E\u4E0D\u5230{0}\u7684\u8BC1\u4E66\u3002{1}\u5FC5\u987B\u5F15\u7528\u5305\u542B\u65F6\u95F4\u6233\u9881\u53D1\u673A\u6784\u7684 X.509 \u516C\u5171\u5BC6\u94A5\u8BC1\u4E66\u7684\u6709\u6548\u5BC6\u94A5\u5E93\u6761\u76EE\u3002"},
-        {"entry.was.signed.on", "\u6761\u76EE\u7684\u7B7E\u540D\u65E5\u671F\u4E3A {0}"},
-        {"Warning.", "\u8B66\u544A: "},
-        {"Error.", "\u9519\u8BEF: "},
-        {"...Signer", ">>> \u7B7E\u540D\u8005"},
-        {"...TSA", ">>> TSA"},
-        {"trusted.certificate", "\u53EF\u4FE1\u8BC1\u4E66"},
-        {"This.jar.contains.unsigned.entries.which.have.not.been.integrity.checked.",
-                "\u6B64 jar \u5305\u542B\u5C1A\u672A\u8FDB\u884C\u5B8C\u6574\u6027\u68C0\u67E5\u7684\u672A\u7B7E\u540D\u6761\u76EE\u3002 "},
-        {"This.jar.contains.entries.whose.signer.certificate.has.expired.",
-                "\u6B64 jar \u5305\u542B\u7B7E\u540D\u8005\u8BC1\u4E66\u5DF2\u8FC7\u671F\u7684\u6761\u76EE\u3002 "},
-        {"This.jar.contains.entries.whose.signer.certificate.will.expire.within.six.months.",
-                "\u6B64 jar \u5305\u542B\u7B7E\u540D\u8005\u8BC1\u4E66\u5C06\u5728\u516D\u4E2A\u6708\u5185\u8FC7\u671F\u7684\u6761\u76EE\u3002 "},
-        {"This.jar.contains.entries.whose.signer.certificate.is.not.yet.valid.",
-                "\u6B64 jar \u5305\u542B\u7B7E\u540D\u8005\u8BC1\u4E66\u4ECD\u65E0\u6548\u7684\u6761\u76EE\u3002 "},
-        {"This.jar.contains.entries.whose.signer.certificate.is.self.signed.",
-                "\u6B64 jar \u5305\u542B\u5176\u7B7E\u540D\u8005\u8BC1\u4E66\u4E3A\u81EA\u7B7E\u540D\u8BC1\u4E66\u7684\u6761\u76EE\u3002"},
-        {"Re.run.with.the.verbose.and.certs.options.for.more.details.",
-                "\u6709\u5173\u8BE6\u7EC6\u4FE1\u606F, \u8BF7\u4F7F\u7528 -verbose \u548C -certs \u9009\u9879\u91CD\u65B0\u8FD0\u884C\u3002"},
-        {"The.signer.certificate.has.expired.",
-                "\u7B7E\u540D\u8005\u8BC1\u4E66\u5DF2\u8FC7\u671F\u3002"},
-        {"The.timestamp.expired.1.but.usable.2",
-                "\u65F6\u95F4\u6233\u5230\u671F\u65E5\u671F\u4E3A %1$tY-%1$tm-%1$td\u3002\u4E0D\u8FC7\uFF0C\u5728\u7B7E\u540D\u8005\u8BC1\u4E66\u4E8E %2$tY-%2$tm-%2$td \u5230\u671F\u4E4B\u524D\uFF0CJAR \u5C06\u6709\u6548\u3002"},
-        {"The.timestamp.has.expired.",
-                "\u65F6\u95F4\u6233\u5DF2\u5230\u671F\u3002"},
-        {"The.signer.certificate.will.expire.within.six.months.",
-                "\u7B7E\u540D\u8005\u8BC1\u4E66\u5C06\u5728\u516D\u4E2A\u6708\u5185\u8FC7\u671F\u3002"},
-        {"The.timestamp.will.expire.within.one.year.on.1",
-                "\u65F6\u95F4\u6233\u5C06\u5728\u4E00\u5E74\u5185\u4E8E %1$tY-%1$tm-%1$td \u5230\u671F\u3002"},
-        {"The.timestamp.will.expire.within.one.year.on.1.but.2",
-                "\u65F6\u95F4\u6233\u5C06\u5728\u4E00\u5E74\u5185\u4E8E %1$tY-%1$tm-%1$td \u5230\u671F\u3002\u4E0D\u8FC7\uFF0C\u5728\u7B7E\u540D\u8005\u8BC1\u4E66\u4E8E %2$tY-%2$tm-%2$td \u5230\u671F\u4E4B\u524D\uFF0CJAR \u5C06\u6709\u6548\u3002"},
-        {"The.signer.certificate.is.not.yet.valid.",
-                "\u7B7E\u540D\u8005\u8BC1\u4E66\u4ECD\u65E0\u6548\u3002"},
-        {"The.signer.certificate.s.KeyUsage.extension.doesn.t.allow.code.signing.",
-                 "\u7531\u4E8E\u7B7E\u540D\u8005\u8BC1\u4E66\u7684 KeyUsage \u6269\u5C55\u800C\u65E0\u6CD5\u8FDB\u884C\u4EE3\u7801\u7B7E\u540D\u3002"},
-        {"The.signer.certificate.s.ExtendedKeyUsage.extension.doesn.t.allow.code.signing.",
-                 "\u7531\u4E8E\u7B7E\u540D\u8005\u8BC1\u4E66\u7684 ExtendedKeyUsage \u6269\u5C55\u800C\u65E0\u6CD5\u8FDB\u884C\u4EE3\u7801\u7B7E\u540D\u3002"},
-        {"The.signer.certificate.s.NetscapeCertType.extension.doesn.t.allow.code.signing.",
-                 "\u7531\u4E8E\u7B7E\u540D\u8005\u8BC1\u4E66\u7684 NetscapeCertType \u6269\u5C55\u800C\u65E0\u6CD5\u8FDB\u884C\u4EE3\u7801\u7B7E\u540D\u3002"},
-        {"This.jar.contains.entries.whose.signer.certificate.s.KeyUsage.extension.doesn.t.allow.code.signing.",
-                 "\u6B64 jar \u5305\u542B\u7531\u4E8E\u7B7E\u540D\u8005\u8BC1\u4E66\u7684 KeyUsage \u6269\u5C55\u800C\u65E0\u6CD5\u8FDB\u884C\u4EE3\u7801\u7B7E\u540D\u7684\u6761\u76EE\u3002"},
-        {"This.jar.contains.entries.whose.signer.certificate.s.ExtendedKeyUsage.extension.doesn.t.allow.code.signing.",
-                 "\u6B64 jar \u5305\u542B\u7531\u4E8E\u7B7E\u540D\u8005\u8BC1\u4E66\u7684 ExtendedKeyUsage \u6269\u5C55\u800C\u65E0\u6CD5\u8FDB\u884C\u4EE3\u7801\u7B7E\u540D\u7684\u6761\u76EE\u3002"},
-        {"This.jar.contains.entries.whose.signer.certificate.s.NetscapeCertType.extension.doesn.t.allow.code.signing.",
-                 "\u6B64 jar \u5305\u542B\u7531\u4E8E\u7B7E\u540D\u8005\u8BC1\u4E66\u7684 NetscapeCertType \u6269\u5C55\u800C\u65E0\u6CD5\u8FDB\u884C\u4EE3\u7801\u7B7E\u540D\u7684\u6761\u76EE\u3002"},
-        {".{0}.extension.does.not.support.code.signing.",
-                 "[{0} \u6269\u5C55\u4E0D\u652F\u6301\u4EE3\u7801\u7B7E\u540D]"},
-        {"The.signer.s.certificate.chain.is.invalid.reason.1",
-                "\u7B7E\u540D\u8005\u8BC1\u4E66\u94FE\u65E0\u6548\u3002\u539F\u56E0: %s"},
-        {"The.tsa.certificate.chain.is.invalid.reason.1",
-                "TSA \u8BC1\u4E66\u94FE\u65E0\u6548\u3002\u539F\u56E0: %s"},
-        {"The.signer.s.certificate.is.self.signed.",
-                "\u7B7E\u540D\u8005\u8BC1\u4E66\u4E3A\u81EA\u7B7E\u540D\u8BC1\u4E66\u3002"},
-        {"The.1.algorithm.specified.for.the.2.option.is.considered.a.security.risk..This.algorithm.will.be.disabled.in.a.future.update.",
-                "\u4E3A %2$s \u9009\u9879\u6307\u5B9A\u7684 %1$s \u7B97\u6CD5\u88AB\u89C6\u4E3A\u5B58\u5728\u5B89\u5168\u98CE\u9669\u3002\u6B64\u7B97\u6CD5\u5C06\u5728\u672A\u6765\u7684\u66F4\u65B0\u4E2D\u88AB\u7981\u7528\u3002"},
-        {"The.1.algorithm.specified.for.the.2.option.is.considered.a.security.risk.and.is.disabled.",
-                "\u4E3A %2$s \u9009\u9879\u6307\u5B9A\u7684 %1$s \u7B97\u6CD5\u88AB\u89C6\u4E3A\u5B58\u5728\u5B89\u5168\u98CE\u9669\u800C\u4E14\u88AB\u7981\u7528\u3002"},
-        {"The.timestamp.digest.algorithm.1.is.considered.a.security.risk..This.algorithm.will.be.disabled.in.a.future.update.",
-                "%1$s \u65F6\u95F4\u6233\u6458\u8981\u7B97\u6CD5\u88AB\u89C6\u4E3A\u5B58\u5728\u5B89\u5168\u98CE\u9669\u3002\u6B64\u7B97\u6CD5\u5C06\u5728\u672A\u6765\u7684\u66F4\u65B0\u4E2D\u88AB\u7981\u7528\u3002"},
-        {"The.digest.algorithm.1.is.considered.a.security.risk..This.algorithm.will.be.disabled.in.a.future.update.",
-                "%1$s \u6458\u8981\u7B97\u6CD5\u88AB\u89C6\u4E3A\u5B58\u5728\u5B89\u5168\u98CE\u9669\u3002\u6B64\u7B97\u6CD5\u5C06\u5728\u672A\u6765\u7684\u66F4\u65B0\u4E2D\u88AB\u7981\u7528\u3002"},
-        {"The.signature.algorithm.1.is.considered.a.security.risk..This.algorithm.will.be.disabled.in.a.future.update.",
-                "%1$s \u7B7E\u540D\u7B97\u6CD5\u88AB\u89C6\u4E3A\u5B58\u5728\u5B89\u5168\u98CE\u9669\u3002\u6B64\u7B97\u6CD5\u5C06\u5728\u672A\u6765\u7684\u66F4\u65B0\u4E2D\u88AB\u7981\u7528\u3002"},
-        {"size.bit.alg",
-                "%1$d \u4F4D %2$s"},
-        {"The.full.keyAlgName.signing.key.is.considered.a.security.risk..It.will.be.disabled.in.a.future.update.",
-                "%s \u7B7E\u540D\u5BC6\u94A5\u88AB\u89C6\u4E3A\u5B89\u5168\u98CE\u9669\u3002\u5728\u5C06\u6765\u7684\u66F4\u65B0\u4E2D\u5C06\u7981\u7528\u5B83\u3002"},
-        {"The.full.keyAlgName.signing.key.is.considered.a.security.risk.and.is.disabled.",
-                "%s \u7B7E\u540D\u5BC6\u94A5\u88AB\u89C6\u4E3A\u5B89\u5168\u98CE\u9669\u5E76\u88AB\u7981\u7528\u3002"},
-        {"This.jar.contains.entries.whose.certificate.chain.is.invalid.reason.1",
-                 "\u6B64 jar \u5305\u542B\u5176\u8BC1\u4E66\u94FE\u65E0\u6548\u7684\u6761\u76EE\u3002\u539F\u56E0: %s"},
-        {"This.jar.contains.entries.whose.tsa.certificate.chain.is.invalid.reason.1",
-                "\u6B64 jar \u5305\u542B\u5176 TSA \u8BC1\u4E66\u94FE\u65E0\u6548\u7684\u6761\u76EE\u3002\u539F\u56E0: %s"},
-        {"no.timestamp.signing",
-                "\u672A\u63D0\u4F9B -tsa \u6216 -tsacert, \u6B64 jar \u6CA1\u6709\u65F6\u95F4\u6233\u3002\u5982\u679C\u6CA1\u6709\u65F6\u95F4\u6233, \u5219\u5728\u7B7E\u540D\u8005\u8BC1\u4E66\u7684\u5230\u671F\u65E5\u671F (%1$tY-%1$tm-%1$td) \u4E4B\u540E, \u7528\u6237\u53EF\u80FD\u65E0\u6CD5\u9A8C\u8BC1\u6B64 jar\u3002"},
-        {"invalid.timestamp.signing",
-                "\u65F6\u95F4\u6233\u65E0\u6548\u3002\u5982\u679C\u6CA1\u6709\u6709\u6548\u7684\u65F6\u95F4\u6233\uFF0C\u5219\u5728\u7B7E\u540D\u8005\u8BC1\u4E66\u7684\u5230\u671F\u65E5\u671F (%1$tY-%1$tm-%1$td) \u4E4B\u540E\uFF0C\u7528\u6237\u53EF\u80FD\u65E0\u6CD5\u9A8C\u8BC1\u6B64 jar\u3002"},
-        {"no.timestamp.verifying",
-                "\u6B64 jar \u5305\u542B\u7684\u7B7E\u540D\u6CA1\u6709\u65F6\u95F4\u6233\u3002\u5982\u679C\u6CA1\u6709\u65F6\u95F4\u6233, \u5219\u5728\u5176\u4E2D\u4EFB\u4E00\u7B7E\u540D\u8005\u8BC1\u4E66\u5230\u671F (\u6700\u65E9\u4E3A %1$tY-%1$tm-%1$td) \u4E4B\u540E, \u7528\u6237\u53EF\u80FD\u65E0\u6CD5\u9A8C\u8BC1\u6B64 jar\u3002"},
-        {"bad.timestamp.verifying",
-                "\u6B64 jar \u5305\u542B\u5E26\u6709\u65E0\u6548\u65F6\u95F4\u6233\u7684\u7B7E\u540D\u3002\u5982\u679C\u6CA1\u6709\u6709\u6548\u65F6\u95F4\u6233, \u5219\u5728\u5176\u4E2D\u4EFB\u4E00\u7B7E\u540D\u8005\u8BC1\u4E66\u5230\u671F (\u6700\u65E9\u4E3A %1$tY-%1$tm-%1$td) \u4E4B\u540E, \u7528\u6237\u53EF\u80FD\u65E0\u6CD5\u9A8C\u8BC1\u6B64 jar\u3002\n\u6709\u5173\u8BE6\u7EC6\u4FE1\u606F, \u8BF7\u4F7F\u7528 -J-Djava.security.debug=jar \u91CD\u65B0\u8FD0\u884C jarsigner\u3002"},
-        {"The.signer.certificate.will.expire.on.1.",
-                "\u7B7E\u540D\u8005\u8BC1\u4E66\u5C06\u4E8E %1$tY-%1$tm-%1$td \u5230\u671F\u3002"},
-        {"The.timestamp.will.expire.on.1.",
-                "\u65F6\u95F4\u6233\u5C06\u4E8E %1$tY-%1$tm-%1$td \u5230\u671F\u3002"},
-        {"signer.cert.expired.1.but.timestamp.good.2.",
-                "\u7B7E\u540D\u8005\u8BC1\u4E66\u5230\u671F\u65E5\u671F\u4E3A %1$tY-%1$tm-%1$td\u3002\u4E0D\u8FC7\uFF0C\u5728\u65F6\u95F4\u6233\u4E8E %2$tY-%2$tm-%2$td \u5230\u671F\u4E4B\u524D\uFF0CJAR \u5C06\u6709\u6548\u3002"},
-        {"Unknown.password.type.", "\u672A\u77E5\u53E3\u4EE4\u7C7B\u578B: "},
-        {"Cannot.find.environment.variable.",
-                "\u627E\u4E0D\u5230\u73AF\u5883\u53D8\u91CF: "},
-        {"Cannot.find.file.", "\u627E\u4E0D\u5230\u6587\u4EF6: "},
-        {"event.ocsp.check", "\u6B63\u5728\u8054\u7CFB\u4F4D\u4E8E %s \u7684 OCSP \u670D\u52A1\u5668..."},
-        {"event.crl.check", "\u6B63\u5728\u4ECE %s \u4E0B\u8F7D CRL..."},
-    };
-
-    /**
-     * Returns the contents of this <code>ResourceBundle</code>.
-     *
-     * <p>
-     *
-     * @return the contents of this <code>ResourceBundle</code>.
-     */
-    @Override
-    public Object[][] getContents() {
-        return contents;
-    }
-}
diff --git a/src/jdk.jartool/share/classes/sun/security/tools/jarsigner/resources/jarsigner.properties b/src/jdk.jartool/share/classes/sun/security/tools/jarsigner/resources/jarsigner.properties
new file mode 100644
index 00000000000..6721dbc837b
--- /dev/null
+++ b/src/jdk.jartool/share/classes/sun/security/tools/jarsigner/resources/jarsigner.properties
@@ -0,0 +1,209 @@
+#
+# Copyright (c) 2000, 2025, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute 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.
+#
+
+# shared (from jarsigner)
+SPACE=\u0020
+6SPACE=\u0020    \u0020
+COMMA=,\u0020
+provclass.not.a.provider=%s not a provider
+provider.name.not.found=Provider named "%s" not found
+provider.class.not.found=Provider "%s" not found
+jarsigner.error.=jarsigner error:\u0020
+Illegal.option.=Illegal option:\u0020
+.keystore.must.be.NONE.if.storetype.is.{0}=-keystore must be NONE if -storetype is {0}
+.keypass.can.not.be.specified.if.storetype.is.{0}=-keypass can not be specified if -storetype is {0}
+If.protected.is.specified.then.storepass.and.keypass.must.not.be.specified=If -protected is specified, then -storepass and -keypass must not be specified
+If.keystore.is.not.password.protected.then.storepass.and.keypass.must.not.be.specified=If keystore is not password protected, then -storepass and -keypass must not be specified
+Usage.jarsigner.options.jar.file.alias=Usage: jarsigner [options] jar-file alias
+.jarsigner.verify.options.jar.file.alias.=\u0020      jarsigner -verify [options] jar-file [alias...]
+.jarsigner.version=\u0020      jarsigner -version
+.keystore.url.keystore.location=[-keystore <url>]           keystore location
+.storepass.password.password.for.keystore.integrity=[-storepass <password>]     password for keystore integrity
+.storetype.type.keystore.type=[-storetype <type>]         keystore type
+.keypass.password.password.for.private.key.if.different.=[-keypass <password>]       password for private key (if different)
+.certchain.file.name.of.alternative.certchain.file=[-certchain <file>]         name of alternative certchain file
+.sigfile.file.name.of.SF.DSA.file=[-sigfile <file>]           name of .SF/.DSA file
+.signedjar.file.name.of.signed.JAR.file=[-signedjar <file>]         name of signed JAR file
+.digestalg.algorithm.name.of.digest.algorithm=[-digestalg <algorithm>]    name of digest algorithm
+.sigalg.algorithm.name.of.signature.algorithm=[-sigalg <algorithm>]       name of signature algorithm
+.verify.verify.a.signed.JAR.file=[-verify]                   verify a signed JAR file
+.version.print.the.program.version=[-version]                  print the program version
+.verbose.suboptions.verbose.output.when.signing.verifying.=[-verbose[:suboptions]]     verbose output when signing/verifying.
+.suboptions.can.be.all.grouped.or.summary=\u0020                           suboptions can be all, grouped or summary
+.certs.display.certificates.when.verbose.and.verifying=[-certs]                    display certificates when verbose and verifying
+.certs.revocation.check=[-revCheck]                 Enable certificate revocation check
+.tsa.url.location.of.the.Timestamping.Authority=[-tsa <url>]                location of the Timestamping Authority
+.tsacert.alias.public.key.certificate.for.Timestamping.Authority=[-tsacert <alias>]          public key certificate for Timestamping Authority
+.tsapolicyid.tsapolicyid.for.Timestamping.Authority=[-tsapolicyid <oid>]        TSAPolicyID for Timestamping Authority
+.tsadigestalg.algorithm.of.digest.data.in.timestamping.request=[-tsadigestalg <algorithm>] algorithm of digest data in timestamping request
+.internalsf.include.the.SF.file.inside.the.signature.block=[-internalsf]               include the .SF file inside the signature block
+.sectionsonly.don.t.compute.hash.of.entire.manifest=[-sectionsonly]             don't compute hash of entire manifest
+.protected.keystore.has.protected.authentication.path=[-protected]                keystore has protected authentication path
+.providerName.name.provider.name=[-providerName <name>]      provider name
+.add.provider.option=[-addprovider <name>        add security provider by name (e.g. SunPKCS11)
+.providerArg.option.1=\u0020 [-providerArg <arg>]] ... configure argument for -addprovider
+.providerClass.option=[-providerClass <class>     add security provider by fully-qualified class name
+.providerArg.option.2=\u0020 [-providerArg <arg>]] ... configure argument for -providerClass
+.providerPath.option=[-providerPath <list>]      provider classpath
+.strict.treat.warnings.as.errors=[-strict]                   treat warnings as errors
+.conf.url.specify.a.pre.configured.options.file=[-conf <url>]               specify a pre-configured options file
+.print.this.help.message=[-? -h --help]              Print this help message
+Option.lacks.argument=Option lacks argument
+Please.type.jarsigner.help.for.usage=Please type jarsigner --help for usage
+Please.specify.jarfile.name=Please specify jarfile name
+Please.specify.alias.name=Please specify alias name
+Only.one.alias.can.be.specified=Only one alias can be specified
+This.jar.contains.signed.entries.which.is.not.signed.by.the.specified.alias.es.=This jar contains signed entries which are not signed by the specified alias(es).
+This.jar.contains.signed.entries.that.s.not.signed.by.alias.in.this.keystore.=This jar contains signed entries that are not signed by alias in this keystore.
+s=s
+m=m
+k=k
+X=X
+q=?
+.and.d.more.=(and %d more)
+.s.signature.was.verified.=\u0020 s = signature was verified\u0020
+.m.entry.is.listed.in.manifest=\u0020 m = entry is listed in manifest
+.k.at.least.one.certificate.was.found.in.keystore=\u0020 k = at least one certificate was found in keystore
+.X.not.signed.by.specified.alias.es.=\u0020 X = not signed by specified alias(es)
+.q.unsigned.entry=\u0020 ? = unsigned entry
+no.manifest.=no manifest.
+.Signature.related.entries.=(Signature related entries)
+.Unsigned.entries.=(Unsigned entries)
+.Directory.entries.=(Directory entries)
+jar.is.unsigned=jar is unsigned.
+jar.treated.unsigned=WARNING: Signature is either not parsable or not verifiable, and the jar will be treated as unsigned. For more information, re-run jarsigner with debug enabled (-J-Djava.security.debug=jar).
+jar.treated.unsigned.see.weak=The jar will be treated as unsigned, because it is signed with a weak algorithm that is now disabled.\n\nRe-run jarsigner with the -verbose option for more details.
+jar.treated.unsigned.see.weak.verbose=WARNING: The jar will be treated as unsigned, because it is signed with a weak algorithm that is now disabled by the security property:
+jar.signed.=jar signed.
+jar.signed.with.signer.errors.=jar signed, with signer errors.
+jar.verified.=jar verified.
+jar.verified.with.signer.errors.=jar verified, with signer errors.
+
+history.with.ts=- Signed by "%1$s"\n    Digest algorithm: %2$s\n    Signature algorithm: %3$s, %4$s\n  Timestamped by "%6$s" on %5$tc\n    Timestamp digest algorithm: %7$s\n    Timestamp signature algorithm: %8$s, %9$s
+history.without.ts=- Signed by "%1$s"\n    Digest algorithm: %2$s\n    Signature algorithm: %3$s, %4$s
+history.nonexistent.entries=\u0020   Warning: nonexistent signed entries:\u0020
+history.unparsable=- Unparsable signature-related file %s
+history.nosf=- Missing signature-related file META-INF/%s.SF
+history.nobk=- Missing block file for signature-related file META-INF/%s.SF
+
+with.weak=%s (weak)
+with.algparams.weak=%1$s using %2$s (weak)
+with.disabled=%s (disabled)
+with.algparams.disabled=%1$s using %2$s (disabled)
+key.bit=%s key
+key.bit.weak=%s key (weak)
+key.bit.disabled=%s key (disabled)
+nonexistent.entries.found=This jar contains signed entries for files that do not exist. See the -verbose output for more details.
+external.file.attributes.detected=POSIX file permission and/or symlink attributes detected. These attributes are ignored when signing and are not protected by the signature.
+
+jarsigner.=jarsigner:\u0020
+signature.filename.must.consist.of.the.following.characters.A.Z.0.9.or.=signature filename must consist of the following characters: A-Z, 0-9, _ or -
+unable.to.open.jar.file.=unable to open jar file:\u0020
+unable.to.create.=unable to create:\u0020
+.adding.=\u0020  adding:\u0020
+.updating.=\u0020updating:\u0020
+.signing.=\u0020 signing:\u0020
+attempt.to.rename.signedJarFile.to.jarFile.failed=attempt to rename {0} to {1} failed
+attempt.to.rename.jarFile.to.origJar.failed=attempt to rename {0} to {1} failed
+unable.to.sign.jar.=unable to sign jar:\u0020
+Enter.Passphrase.for.keystore.=Enter Passphrase for keystore:\u0020
+keystore.load.=keystore load:\u0020
+certificate.exception.=certificate exception:\u0020
+unable.to.instantiate.keystore.class.=unable to instantiate keystore class:\u0020
+Certificate.chain.not.found.for.alias.alias.must.reference.a.valid.KeyStore.key.entry.containing.a.private.key.and=Certificate chain not found for: {0}.  {1} must reference a valid KeyStore key entry containing a private key and corresponding public key certificate chain.
+File.specified.by.certchain.does.not.exist=File specified by -certchain does not exist
+Cannot.restore.certchain.from.file.specified=Cannot restore certchain from file specified
+Certificate.chain.not.found.in.the.file.specified.=Certificate chain not found in the file specified.
+found.non.X.509.certificate.in.signer.s.chain=found non-X.509 certificate in signer's chain
+Enter.key.password.for.alias.=Enter key password for {0}:\u0020
+unable.to.recover.key.from.keystore=unable to recover key from keystore
+key.associated.with.alias.not.a.private.key=key associated with {0} not a private key
+you.must.enter.key.password=you must enter key password
+unable.to.read.password.=unable to read password:\u0020
+certificate.is.valid.from=certificate is valid from {0} to {1}
+certificate.expired.on=certificate expired on {0}
+certificate.is.not.valid.until=certificate is not valid until {0}
+certificate.will.expire.on=certificate will expire on {0}
+.Invalid.certificate.chain.=[Invalid certificate chain:\u0020
+.Invalid.TSA.certificate.chain.=[Invalid TSA certificate chain:\u0020
+requesting.a.signature.timestamp=requesting a signature timestamp
+TSA.location.=TSA location:\u0020
+TSA.certificate.=TSA certificate:\u0020
+no.response.from.the.Timestamping.Authority.=no response from the Timestamping Authority. When connecting \
+from behind a firewall an HTTP or HTTPS proxy may need to \
+be specified. Supply the following options to jarsigner:
+or=or
+Certificate.not.found.for.alias.alias.must.reference.a.valid.KeyStore.entry.containing.an.X.509.public.key.certificate.for.the=Certificate not found for: {0}.  {1} must reference a valid KeyStore entry containing an X.509 public key certificate for the Timestamping Authority.
+entry.was.signed.on=entry was signed on {0}
+Warning.=Warning:\u0020
+Error.=Error:\u0020
+...Signer=>>> Signer
+...TSA=>>> TSA
+trusted.certificate=trusted certificate
+This.jar.contains.unsigned.entries.which.have.not.been.integrity.checked.=This jar contains unsigned entries which have not been integrity-checked.\u0020
+This.jar.contains.entries.whose.signer.certificate.has.expired.=This jar contains entries whose signer certificate has expired.\u0020
+This.jar.contains.entries.whose.signer.certificate.will.expire.within.six.months.=This jar contains entries whose signer certificate will expire within six months.\u0020
+This.jar.contains.entries.whose.signer.certificate.is.not.yet.valid.=This jar contains entries whose signer certificate is not yet valid.\u0020
+This.jar.contains.entries.whose.signer.certificate.is.self.signed.=This jar contains entries whose signer certificate is self-signed.
+Re.run.with.the.verbose.and.certs.options.for.more.details.=Re-run with the -verbose and -certs options for more details.
+The.signer.certificate.has.expired.=The signer certificate has expired.
+The.timestamp.expired.1.but.usable.2=The timestamp expired on %1$tY-%1$tm-%1$td. However, the JAR will be valid until the signer certificate expires on %2$tY-%2$tm-%2$td.
+The.timestamp.has.expired.=The timestamp has expired.
+The.signer.certificate.will.expire.within.six.months.=The signer certificate will expire within six months.
+The.timestamp.will.expire.within.one.year.on.1=The timestamp will expire within one year on %1$tY-%1$tm-%1$td.
+The.timestamp.will.expire.within.one.year.on.1.but.2=The timestamp will expire within one year on %1$tY-%1$tm-%1$td. However, the JAR will be valid until the signer certificate expires on %2$tY-%2$tm-%2$td.
+The.signer.certificate.is.not.yet.valid.=The signer certificate is not yet valid.
+The.signer.certificate.s.KeyUsage.extension.doesn.t.allow.code.signing.=The signer certificate's KeyUsage extension doesn't allow code signing.
+The.signer.certificate.s.ExtendedKeyUsage.extension.doesn.t.allow.code.signing.=The signer certificate's ExtendedKeyUsage extension doesn't allow code signing.
+The.signer.certificate.s.NetscapeCertType.extension.doesn.t.allow.code.signing.=The signer certificate's NetscapeCertType extension doesn't allow code signing.
+This.jar.contains.entries.whose.signer.certificate.s.KeyUsage.extension.doesn.t.allow.code.signing.=This jar contains entries whose signer certificate's KeyUsage extension doesn't allow code signing.
+This.jar.contains.entries.whose.signer.certificate.s.ExtendedKeyUsage.extension.doesn.t.allow.code.signing.=This jar contains entries whose signer certificate's ExtendedKeyUsage extension doesn't allow code signing.
+This.jar.contains.entries.whose.signer.certificate.s.NetscapeCertType.extension.doesn.t.allow.code.signing.=This jar contains entries whose signer certificate's NetscapeCertType extension doesn't allow code signing.
+.{0}.extension.does.not.support.code.signing.=[{0} extension does not support code signing]
+The.signer.s.certificate.chain.is.invalid.reason.1=The signer's certificate chain is invalid. Reason: %s
+The.tsa.certificate.chain.is.invalid.reason.1=The TSA certificate chain is invalid. Reason: %s
+The.signer.s.certificate.is.self.signed.=The signer's certificate is self-signed.
+The.1.algorithm.specified.for.the.2.option.is.considered.a.security.risk..This.algorithm.will.be.disabled.in.a.future.update.=The %1$s algorithm specified for the %2$s option is considered a security risk. This algorithm will be disabled in a future update.
+The.1.algorithm.specified.for.the.2.option.is.considered.a.security.risk.and.is.disabled.=The %1$s algorithm specified for the %2$s option is considered a security risk and is disabled.
+The.timestamp.digest.algorithm.1.is.considered.a.security.risk..This.algorithm.will.be.disabled.in.a.future.update.=The %1$s timestamp digest algorithm is considered a security risk. This algorithm will be disabled in a future update.
+The.digest.algorithm.1.is.considered.a.security.risk..This.algorithm.will.be.disabled.in.a.future.update.=The %1$s digest algorithm is considered a security risk. This algorithm will be disabled in a future update.
+The.signature.algorithm.1.is.considered.a.security.risk..This.algorithm.will.be.disabled.in.a.future.update.=The %1$s signature algorithm is considered a security risk. This algorithm will be disabled in a future update.
+size.bit.alg=%1$d-bit %2$s
+The.full.keyAlgName.signing.key.is.considered.a.security.risk..It.will.be.disabled.in.a.future.update.=The %s signing key is considered a security risk. It will be disabled in a future update.
+The.full.keyAlgName.signing.key.is.considered.a.security.risk.and.is.disabled.=The %s signing key is considered a security risk and is disabled.
+This.jar.contains.entries.whose.certificate.chain.is.invalid.reason.1=This jar contains entries whose certificate chain is invalid. Reason: %s
+This.jar.contains.entries.whose.tsa.certificate.chain.is.invalid.reason.1=This jar contains entries whose TSA certificate chain is invalid. Reason: %s
+no.timestamp.signing=No -tsa or -tsacert is provided and this jar is not timestamped. Without a timestamp, users may not be able to validate this jar after the signer certificate's expiration date (%1$tY-%1$tm-%1$td).
+invalid.timestamp.signing=The timestamp is invalid. Without a valid timestamp, users may not be able to validate this jar after the signer certificate's expiration date (%1$tY-%1$tm-%1$td).
+no.timestamp.verifying=This jar contains signatures that do not include a timestamp. Without a timestamp, users may not be able to validate this jar after any of the signer certificates expire (as early as %1$tY-%1$tm-%1$td).
+bad.timestamp.verifying=This jar contains signatures that include an invalid timestamp. Without a valid timestamp, users may not be able to validate this jar after any of the signer certificates expire (as early as %1$tY-%1$tm-%1$td).\nRerun jarsigner with -J-Djava.security.debug=jar for more information.
+The.signer.certificate.will.expire.on.1.=The signer certificate will expire on %1$tY-%1$tm-%1$td.
+The.timestamp.will.expire.on.1.=The timestamp will expire on %1$tY-%1$tm-%1$td.
+signer.cert.expired.1.but.timestamp.good.2.=The signer certificate expired on %1$tY-%1$tm-%1$td. However, the JAR will be valid until the timestamp expires on %2$tY-%2$tm-%2$td.
+Unknown.password.type.=Unknown password type:\u0020
+Cannot.find.environment.variable.=Cannot find environment variable:\u0020
+Cannot.find.file.=Cannot find file:\u0020
+event.ocsp.check=Contacting OCSP server at %s ...
+event.crl.check=Downloading CRL from %s ...
diff --git a/src/jdk.jartool/share/classes/sun/security/tools/jarsigner/resources/jarsigner_de.properties b/src/jdk.jartool/share/classes/sun/security/tools/jarsigner/resources/jarsigner_de.properties
new file mode 100644
index 00000000000..fe4ff9b50c4
--- /dev/null
+++ b/src/jdk.jartool/share/classes/sun/security/tools/jarsigner/resources/jarsigner_de.properties
@@ -0,0 +1,207 @@
+#
+# Copyright (c) 2000, 2025, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute 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.
+#
+
+# shared (from jarsigner)
+SPACE=\u0020
+6SPACE=\u0020    \u0020
+COMMA=,\u0020
+provclass.not.a.provider=%s kein Provider
+provider.name.not.found=Provider namens "%s" nicht gefunden
+provider.class.not.found=Provider "%s" nicht gefunden
+jarsigner.error.=jarsigner-Fehler:\u0020
+Illegal.option.=Unzulässige Option:\u0020
+.keystore.must.be.NONE.if.storetype.is.{0}=-keystore muss NONE sein, wenn -storetype {0} ist
+.keypass.can.not.be.specified.if.storetype.is.{0}=-keypass kann nicht angegeben werden, wenn -storetype "{0}" ist
+If.protected.is.specified.then.storepass.and.keypass.must.not.be.specified=Wenn -protected angegeben ist, dürfen -storepass und -keypass nicht angegeben werden
+If.keystore.is.not.password.protected.then.storepass.and.keypass.must.not.be.specified=Wenn der Keystore nicht kennwortgeschützt ist, dürfen -storepass und -keypass nicht angegeben werden
+Usage.jarsigner.options.jar.file.alias=Verwendung: jarsigner [options] jar-file alias
+.jarsigner.verify.options.jar.file.alias.=\u0020      jarsigner -verify [options] jar-file [alias...]
+.jarsigner.version=\u0020      jarsigner -version
+.keystore.url.keystore.location=[-keystore <URL>]           Keystore-Speicherort
+.storepass.password.password.for.keystore.integrity=[-storepass <Kennwort>]     Kennwort für Keystore-Integrität
+.storetype.type.keystore.type=[-storetype <Typ>]         Keystore-Typ
+.keypass.password.password.for.private.key.if.different.=[-keypass <Kennwort>]       Kennwort für Private Key (falls unterschiedlich)
+.certchain.file.name.of.alternative.certchain.file=[-certchain <Datei>]         Name der alternativen certchain-Datei
+.sigfile.file.name.of.SF.DSA.file=[-sigfile <Datei>]           Name der SF/DSA-Datei
+.signedjar.file.name.of.signed.JAR.file=[-signedjar <Datei>]         Name der signierten JAR-Datei
+.digestalg.algorithm.name.of.digest.algorithm=[-digestalg <Algorithmus>]    Name des Digestalgorithmus
+.sigalg.algorithm.name.of.signature.algorithm=[-sigalg <Algorithmus>]       Name des Signaturalgorithmus
+.verify.verify.a.signed.JAR.file=[-verify]                   Verifiziert eine signierte JAR-Datei
+.version.print.the.program.version=[-version]                  Gibt die Programmversion aus
+.verbose.suboptions.verbose.output.when.signing.verifying.=[-verbose[:suboptions]]     Verbose-Ausgabe beim Signieren/Verifizieren.
+.suboptions.can.be.all.grouped.or.summary=\u0020                           Als Unteroptionen sind "all", "grouped" und "summary" möglich
+.certs.display.certificates.when.verbose.and.verifying=[-certs]                    Zeigt Zertifikate bei Verbose und Verifizierung an
+.certs.revocation.check=[-revCheck]                 Aktiviert die Zertifikatswiderrufprüfung
+.tsa.url.location.of.the.Timestamping.Authority=[-tsa <URL>]                Ort der Zeitstempelautorität
+.tsacert.alias.public.key.certificate.for.Timestamping.Authority=[-tsacert <Alias>]          Public-Key-Zertifikat für Zeitstempelautorität
+.tsapolicyid.tsapolicyid.for.Timestamping.Authority=[-tsapolicyid <OID>]        TSAPolicyID für Zeitstempelautorität
+.tsadigestalg.algorithm.of.digest.data.in.timestamping.request=[-tsadigestalg <Algorithmus>] Algorithmus der Digestdaten in Zeitstempelanforderung
+.internalsf.include.the.SF.file.inside.the.signature.block=[-internalsf]               SF-Datei in Signaturblock aufnehmen
+.sectionsonly.don.t.compute.hash.of.entire.manifest=[-sectionsonly]             Berechnet nicht den Hash des gesamten Manifests
+.protected.keystore.has.protected.authentication.path=[-protected]                Keystore hat geschützten Authentifizierungspfad
+.providerName.name.provider.name=[-providerName <Name>]      Providername
+.add.provider.option=[-addprovider <Name>        Fügt einen Sicherheitsprovider nach Name hinzu (z.B. SunPKCS11)
+.providerArg.option.1=\u0020 [-providerArg <Argument>]] ... Konfiguriert Argument für -addprovider
+.providerClass.option=[-providerClass <Klasse>     Fügt einen Sicherheitsprovider nach vollqualifiziertem Klassennamen hinzu
+.providerArg.option.2=\u0020 [-providerArg <Argument>]] ... Konfiguriert Argument für -providerClass
+.providerPath.option=[-providerPath <list>]      Provider-Classpath
+.strict.treat.warnings.as.errors=[-strict]                   Behandelt Warnungen als Fehler
+.conf.url.specify.a.pre.configured.options.file=[-conf <URL>]               Vorkonfigurierte Optionsdatei angeben
+.print.this.help.message=[-? -h --help]              Gibt diese Hilfemeldung aus
+Option.lacks.argument=Argument fehlt in Option
+Please.type.jarsigner.help.for.usage=Geben Sie jarsigner --help ein, um Verwendungsinformationen anzuzeigen
+Please.specify.jarfile.name=Geben Sie den Namen der JAR-Datei an
+Please.specify.alias.name=Geben Sie einen Aliasnamen an
+Only.one.alias.can.be.specified=Nur ein Alias kann angegeben werden
+This.jar.contains.signed.entries.which.is.not.signed.by.the.specified.alias.es.=Diese JAR-Datei enthält signierte Einträge, die nicht von den angegebenen Aliasnamen signiert wurden.
+This.jar.contains.signed.entries.that.s.not.signed.by.alias.in.this.keystore.=Diese JAR-Datei enthält signierte Einträge, die nicht vom Alias in diesem Keystore signiert wurden.
+s=s
+m=m
+k=k
+X=X
+q=?
+.and.d.more.=(und %d mehr)
+.s.signature.was.verified.=\u0020 s = Signatur wurde verifiziert\u0020
+.m.entry.is.listed.in.manifest=\u0020 m = Eintrag ist in Manifest aufgeführt
+.k.at.least.one.certificate.was.found.in.keystore=\u0020 k = Mindestens ein Zertifikat im Keystore gefunden
+.X.not.signed.by.specified.alias.es.=\u0020 X = Nicht von den angegebenen Aliasnamen signiert
+.q.unsigned.entry=\u0020 ? = Nicht signierter Eintrag
+no.manifest.=Kein Manifest.
+.Signature.related.entries.=(Signaturbezogene Einträge)
+.Unsigned.entries.=(Nicht signierte Einträge)
+.Directory.entries.=(Verzeichniseinträge)
+jar.is.unsigned=JAR-Datei ist nicht signiert.
+jar.treated.unsigned=Warnung: Signatur kann entweder nicht geparst oder nicht verifiziert werden. Die JAR-Datei wird als nicht signiert behandelt. Weitere Informationen erhalten Sie, indem Sie "jarsigner" mit aktiviertem Debugging erneut ausführen (-J-Djava.security.debug=jar).
+jar.treated.unsigned.see.weak=Die JAR-Datei wird als nicht signiert behandelt, da sie mit einem schwachen Algorithmus signiert wurde, der jetzt deaktiviert ist.\n\nFühren Sie "jarsigner" mit der Option "-verbose" erneut aus, um weitere Einzelheiten zu erhalten.
+jar.treated.unsigned.see.weak.verbose=Warnung: Die JAR-Datei wird als nicht signiert behandelt, da sie mit einem schwachen Algorithmus signiert wurde, der mittlerweile von der folgenden Sicherheitseigenschaft deaktiviert wurde:
+jar.signed.=JAR-Datei signiert.
+jar.signed.with.signer.errors.=JAR-Datei signiert, mit Signaturgeberfehlern.
+jar.verified.=JAR-Datei verifiziert.
+jar.verified.with.signer.errors.=JAR-Datei verifiziert, mit Signaturgeberfehlern.
+
+history.with.ts=- Von "%1$s" signiert\n    Digestalgorithmus: %2$s\n    Signaturalgorithmus: %3$s, %4$s\n  Zeitstempel von "%6$s" am %5$tc\n    Digestalgorithmus für Zeitstempel: %7$s\n    Signaturalgorithmus für Zeitstempel: %8$s, %9$s
+history.without.ts=- Von "%1$s" signiert\n    Digestalgorithmus: %2$s\n    Signaturalgorithmus: %3$s, %4$s
+history.nonexistent.entries=\u0020   Warnung: Nicht vorhandene signierte Einträge:\u0020
+history.unparsable=- Signaturbezogene Datei %s kann nicht geparst werden
+history.nosf=- Signaturbezogene Datei META-INF/%s.SF fehlt
+history.nobk=- Blockdatei für signaturbezogene Datei META-INF/%s.SF fehlt
+
+with.weak=%s (schwach)
+with.algparams.weak=%1$s mit %2$s (schwach)
+with.disabled=%s (deaktiviert)
+with.algparams.disabled=%1$s mit %2$s (deaktiviert)
+key.bit=%s-Schlüssel
+key.bit.weak=%s Schlüssel (schwach)
+key.bit.disabled=%s Schlüssel (deaktiviert)
+nonexistent.entries.found=Diese JAR-Datei enthält signierte Einträge für Dateien, die nicht vorhanden sind. Weitere Details finden Sie in der Verbose-Ausgabe (-verbose).
+external.file.attributes.detected=POSIX-Dateiberechtigung und/oder Symlink-Attribute erkannt. Diese Attribute werden bei der Signatur ignoriert und sind nicht durch die Signatur geschützt.
+
+jarsigner.=jarsigner:\u0020
+signature.filename.must.consist.of.the.following.characters.A.Z.0.9.or.=Signaturdateiname muss aus den folgenden Zeichen bestehen: A-Z, 0-9, _ oder -
+unable.to.open.jar.file.=JAR-Datei kann nicht geöffnet werden:\u0020
+unable.to.create.=Erstellen nicht möglich:\u0020
+.adding.=\u0020  Wird hinzugefügt:\u0020
+.updating.=\u0020Wird aktualisiert:\u0020
+.signing.=\u0020 Wird signiert:\u0020
+attempt.to.rename.signedJarFile.to.jarFile.failed=Der Versuch, {0} in {1} umzubenennen, war nicht erfolgreich
+attempt.to.rename.jarFile.to.origJar.failed=Der Versuch, {0} in {1} umzubenennen, war nicht erfolgreich
+unable.to.sign.jar.=JAR-Datei kann nicht signiert werden:\u0020
+Enter.Passphrase.for.keystore.=Passphrase für Keystore eingeben:\u0020
+keystore.load.=Keystore-Ladevorgang:\u0020
+certificate.exception.=Zertifikatsausnahme:\u0020
+unable.to.instantiate.keystore.class.=Keystore-Klasse kann nicht instanziiert werden:\u0020
+Certificate.chain.not.found.for.alias.alias.must.reference.a.valid.KeyStore.key.entry.containing.a.private.key.and=Zertifikatskette nicht gefunden für: {0}. {1} muss einen gültigen Keystore-Schlüssel referenzieren, der einen Private Key und eine zugehörige Public-Key-Zertifikatskette enthält.
+File.specified.by.certchain.does.not.exist=Von -certchain angegebene Datei ist nicht vorhanden
+Cannot.restore.certchain.from.file.specified=Zertifikatskette kann nicht aus angegebener Datei wiederhergestellt werden
+Certificate.chain.not.found.in.the.file.specified.=Zertifikatskette nicht in der angegebenen Datei gefunden.
+found.non.X.509.certificate.in.signer.s.chain=Nicht-X.509-Zertifikat in Kette des Signaturgebers gefunden
+Enter.key.password.for.alias.=Schlüsselkennwort für {0} eingeben:\u0020
+unable.to.recover.key.from.keystore=Schlüssel kann nicht aus Keystore wiederhergestellt werden
+key.associated.with.alias.not.a.private.key=Mit {0} verknüpfter Schlüssel ist kein Private Key
+you.must.enter.key.password=Sie müssen ein Schlüsselkennwort eingeben
+unable.to.read.password.=Kennwort kann nicht gelesen werden:\u0020
+certificate.is.valid.from=Zertifikat ist von {0} bis {1} gültig
+certificate.expired.on=Zertifikat ist am {0} abgelaufen
+certificate.is.not.valid.until=Zertifikat ist erst ab {0} gültig
+certificate.will.expire.on=Zertifikat läuft am {0} ab
+.Invalid.certificate.chain.=[Ungültige Zertifikatskette:\u0020
+.Invalid.TSA.certificate.chain.=[Ungültige TSA-Zertifikatskette:\u0020
+requesting.a.signature.timestamp=Signaturzeitstempel wird angefordert
+TSA.location.=TSA-Ort:\u0020
+TSA.certificate.=TSA-Zertifikat:\u0020
+no.response.from.the.Timestamping.Authority.=Keine Antwort von der Zeitstempelautorität. Bei Verbindungen hinter einer Firewall muss möglicherweise ein HTTP- oder HTTPS-Proxy angegeben werden. Geben Sie die folgenden Optionen für "jarsigner" an:
+or=oder
+Certificate.not.found.for.alias.alias.must.reference.a.valid.KeyStore.entry.containing.an.X.509.public.key.certificate.for.the=Zertifikat nicht gefunden für: {0}. {1} muss einen gültigen Keystore-Eintrag referenzieren, der ein X.509-Public-Key-Zertifikat für die Zeitstempelautorität enthält.
+entry.was.signed.on=Eintrag wurde signiert am {0}
+Warning.=Warnung:\u0020
+Error.=Fehler:\u0020
+...Signer=>>> Signaturgeber
+...TSA=>>> TSA
+trusted.certificate=vertrauenswürdiges Zertifikat
+This.jar.contains.unsigned.entries.which.have.not.been.integrity.checked.=Diese JAR-Datei enthält nicht signierte Einträge, deren Integrität nicht geprüft wurde.\u0020
+This.jar.contains.entries.whose.signer.certificate.has.expired.=Diese JAR-Datei enthält Einträge, deren Signaturgeberzertifikat abgelaufen ist.
+This.jar.contains.entries.whose.signer.certificate.will.expire.within.six.months.=Diese JAR-Datei enthält Einträge, deren Signaturgeberzertifikat innerhalb der nächsten sechs Monate abläuft.\u0020
+This.jar.contains.entries.whose.signer.certificate.is.not.yet.valid.=Diese JAR-Datei enthält Einträge, deren Signaturgeberzertifikat noch nicht gültig ist.\u0020
+This.jar.contains.entries.whose.signer.certificate.is.self.signed.=Diese JAR-Datei enthält Einträge, deren Signaturgeberzertifikat selbstsigniert ist.
+Re.run.with.the.verbose.and.certs.options.for.more.details.=Führen Sie den Befehl erneut mit den Optionen -verbose und -certs aus, um weitere Details zu erhalten.
+The.signer.certificate.has.expired.=Das Signaturgeberzertifikat ist abgelaufen.
+The.timestamp.expired.1.but.usable.2=Der Zeitstempel ist am %1$tY-%1$tm-%1$td abgelaufen. Die JAR-Datei bleibt aber gültig, bis das Signaturgeberzertifikat am %2$tY-%2$tm-%2$td abläuft.
+The.timestamp.has.expired.=Der Zeitstempel ist abgelaufen.
+The.signer.certificate.will.expire.within.six.months.=Das Signaturgeberzertifikat läuft innerhalb der nächsten sechs Monate ab.
+The.timestamp.will.expire.within.one.year.on.1=Der Zeitstempel läuft innerhalb des nächsten Jahres am %1$tY-%1$tm-%1$td ab.
+The.timestamp.will.expire.within.one.year.on.1.but.2=Der Zeitstempel läuft innerhalb des nächsten Jahres am %1$tY-%1$tm-%1$td ab. Die JAR-Datei bleibt aber gültig, bis das Signaturgeberzertifikat am %2$tY-%2$tm-%2$td abläuft.
+The.signer.certificate.is.not.yet.valid.=Das Signaturgeberzertifikat ist noch nicht gültig.
+The.signer.certificate.s.KeyUsage.extension.doesn.t.allow.code.signing.=Die KeyUsage-Erweiterung des Signaturgeberzertifikats lässt keine Codesignatur zu.
+The.signer.certificate.s.ExtendedKeyUsage.extension.doesn.t.allow.code.signing.=Die ExtendedKeyUsage-Erweiterung des Signaturgeberzertifikats lässt keine Codesignatur zu.
+The.signer.certificate.s.NetscapeCertType.extension.doesn.t.allow.code.signing.=Die NetscapeCertType-Erweiterung des Signaturgeberzertifikats lässt keine Codesignatur zu.
+This.jar.contains.entries.whose.signer.certificate.s.KeyUsage.extension.doesn.t.allow.code.signing.=Diese JAR-Datei enthält Einträge, bei denen die KeyUsage-Erweiterung des Signaturgeberzertifikats keine Codesignatur zulässt.
+This.jar.contains.entries.whose.signer.certificate.s.ExtendedKeyUsage.extension.doesn.t.allow.code.signing.=Diese JAR-Datei enthält Einträge, bei denen die ExtendedKeyUsage-Erweiterung des Signaturgeberzertifikats keine Codesignatur zulässt.
+This.jar.contains.entries.whose.signer.certificate.s.NetscapeCertType.extension.doesn.t.allow.code.signing.=Diese JAR-Datei enthält Einträge, bei denen die NetscapeCertType-Erweiterung des Signaturgeberzertifikats keine Codesignatur zulässt.
+.{0}.extension.does.not.support.code.signing.=[{0}-Erweiterung unterstützt keine Codesignatur]
+The.signer.s.certificate.chain.is.invalid.reason.1=Die Zertifikatskette des Signaturgebers ist ungültig. Grund: %s
+The.tsa.certificate.chain.is.invalid.reason.1=Die TSA-Zertifikatskette ist ungültig. Grund: %s
+The.signer.s.certificate.is.self.signed.=Das Zertifikat des Signaturgebers ist selbstsigniert.
+The.1.algorithm.specified.for.the.2.option.is.considered.a.security.risk..This.algorithm.will.be.disabled.in.a.future.update.=Der für die Option %2$s angegebene %1$s-Algorithmus gilt als Sicherheitsrisiko. Dieser Algorithmus wird in einem zukünftigen Update deaktiviert.
+The.1.algorithm.specified.for.the.2.option.is.considered.a.security.risk.and.is.disabled.=Der für die Option %2$s angegebene %1$s-Algorithmus gilt als Sicherheitsrisiko und ist deaktiviert.
+The.timestamp.digest.algorithm.1.is.considered.a.security.risk..This.algorithm.will.be.disabled.in.a.future.update.=Der %1$s-Digestalgorithmus des Zeitstempels gilt als Sicherheitsrisiko. Dieser Algorithmus wird in einem zukünftigen Update deaktiviert.
+The.digest.algorithm.1.is.considered.a.security.risk..This.algorithm.will.be.disabled.in.a.future.update.=Der %1$s-Digestalgorithmus gilt als Sicherheitsrisiko. Dieser Algorithmus wird in einem zukünftigen Update deaktiviert.
+The.signature.algorithm.1.is.considered.a.security.risk..This.algorithm.will.be.disabled.in.a.future.update.=Der %1$s-Signaturalgorithmus gilt als Sicherheitsrisiko. Dieser Algorithmus wird in einem zukünftigen Update deaktiviert.
+size.bit.alg=%1$d-Bit %2$s
+The.full.keyAlgName.signing.key.is.considered.a.security.risk..It.will.be.disabled.in.a.future.update.=Der %s Signaturschlüssel wird als Sicherheitsrisiko betrachtet. Wird in einem zukünftigen Update deaktiviert.
+The.full.keyAlgName.signing.key.is.considered.a.security.risk.and.is.disabled.=Der %s Signaturschlüssel wird als Sicherheitsrisiko betrachtet und ist deaktiviert.
+This.jar.contains.entries.whose.certificate.chain.is.invalid.reason.1=Diese JAR-Datei enthält Einträge, deren Zertifikatskette ungültig ist. Grund: %s
+This.jar.contains.entries.whose.tsa.certificate.chain.is.invalid.reason.1=Diese JAR-Datei enthält Einträge, deren TSA-Zertifikatskette ungültig ist. Grund: %s
+no.timestamp.signing=Weder -tsa noch -tsacert wurde angegeben, und diese JAR-Datei hat keinen Zeitstempel. Ohne Zeitstempel können Benutzer diese JAR-Datei nach dem Ablaufdatum des Signaturgeberzertifikats (%1$tY-%1$tm-%1$td) möglicherweise nicht mehr validieren.
+invalid.timestamp.signing=Der Zeitstempel ist ungültig. Ohne einen gültigen Zeitstempel können Benutzer diese JAR-Datei nach dem Ablaufdatum des Signaturgeberzertifikats (%1$tY-%1$tm-%1$td) möglicherweise nicht mehr validieren.
+no.timestamp.verifying=Diese JAR-Datei enthält Signaturen ohne Zeitstempel. Ohne einen Zeitstempel können Benutzer diese JAR-Datei nach dem Ablauf eines Signaturgeberzertifikats (frühestens %1$tY-%1$tm-%1$td) möglicherweise nicht mehr validieren.
+bad.timestamp.verifying=Diese JAR-Datei enthält Signaturen mit einem ungültigen Zeitstempel. Ohne einen gültigen Zeitstempel können Benutzer diese JAR-Datei nach dem Ablauf eines Signaturgeberzertifikats (frühestens %1$tY-%1$tm-%1$td) möglicherweise nicht mehr validieren.\nFühren Sie "jarsigner" mit -J-Djava.security.debug=jar erneut aus, um weitere Informationen zu erhalten.
+The.signer.certificate.will.expire.on.1.=Das Signaturgeberzertifikat läuft am %1$tY-%1$tm-%1$td ab.
+The.timestamp.will.expire.on.1.=Der Zeitstempel läuft am %1$tY-%1$tm-%1$td ab.
+signer.cert.expired.1.but.timestamp.good.2.=Das Signaturgeberzertifikat ist am %1$tY-%1$tm-%1$td abgelaufen. Die JAR-Datei bleibt aber gültig, bis der Zeitstempel am %2$tY-%2$tm-%2$td abläuft.
+Unknown.password.type.=Unbekannter Kennworttyp:\u0020
+Cannot.find.environment.variable.=Umgebungsvariable kann nicht gefunden werden:\u0020
+Cannot.find.file.=Datei kann nicht gefunden werden:\u0020
+event.ocsp.check=Verbindung zu OCSP-Server bei %s wird hergestellt...
+event.crl.check=CRL wird von %s heruntergeladen...
diff --git a/src/jdk.jartool/share/classes/sun/security/tools/jarsigner/resources/jarsigner_ja.properties b/src/jdk.jartool/share/classes/sun/security/tools/jarsigner/resources/jarsigner_ja.properties
new file mode 100644
index 00000000000..e13d8b5a471
--- /dev/null
+++ b/src/jdk.jartool/share/classes/sun/security/tools/jarsigner/resources/jarsigner_ja.properties
@@ -0,0 +1,207 @@
+#
+# Copyright (c) 2000, 2025, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute 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.
+#
+
+# shared (from jarsigner)
+SPACE=\u0020
+6SPACE=\u0020    \u0020
+COMMA=,\u0020
+provclass.not.a.provider=%sはプロバイダではありません
+provider.name.not.found=プロバイダ名"%s"が見つかりません
+provider.class.not.found=プロバイダ"%s"が見つかりません
+jarsigner.error.=jarsignerエラー:\u0020
+Illegal.option.=不正なオプション:\u0020
+.keystore.must.be.NONE.if.storetype.is.{0}=-storetypeが{0}の場合、-keystoreはNONEである必要があります
+.keypass.can.not.be.specified.if.storetype.is.{0}=-storetypeが{0}の場合、-keypassは指定できません
+If.protected.is.specified.then.storepass.and.keypass.must.not.be.specified=-protectedを指定する場合は、-storepassおよび-keypassを指定しないでください
+If.keystore.is.not.password.protected.then.storepass.and.keypass.must.not.be.specified=キーストアがパスワードで保護されていない場合、-storepassおよび-keypassを指定しないでください
+Usage.jarsigner.options.jar.file.alias=使用方法: jarsigner [options] jar-file alias
+.jarsigner.verify.options.jar.file.alias.=\u0020      jarsigner -verify [options] jar-file [alias...]
+.jarsigner.version=\u0020      jarsigner -version
+.keystore.url.keystore.location=[-keystore <url>]           キーストアの位置
+.storepass.password.password.for.keystore.integrity=[-storepass <password>]     キーストア整合性のためのパスワード
+.storetype.type.keystore.type=[-storetype <type>]         キーストアの型
+.keypass.password.password.for.private.key.if.different.=[-keypass <password>]       秘密キーのパスワード(異なる場合)
+.certchain.file.name.of.alternative.certchain.file=[-certchain <file>]         代替証明書チェーン・ファイルの名前
+.sigfile.file.name.of.SF.DSA.file=[-sigfile <file>]           .SF/.DSAファイルの名前
+.signedjar.file.name.of.signed.JAR.file=[-signedjar <file>]         署名付きJARファイルの名前
+.digestalg.algorithm.name.of.digest.algorithm=[-digestalg <algorithm>]    ダイジェスト・アルゴリズムの名前
+.sigalg.algorithm.name.of.signature.algorithm=[-sigalg <algorithm>]       シグネチャ・アルゴリズムの名前
+.verify.verify.a.signed.JAR.file=[-verify]                   署名付きJARファイルの検証
+.version.print.the.program.version=[-version]                  プログラム・バージョンを出力します
+.verbose.suboptions.verbose.output.when.signing.verifying.=[-verbose[:suboptions]]     署名/検証時の詳細出力。
+.suboptions.can.be.all.grouped.or.summary=\u0020                           サブオプションとして、all、groupedまたはsummaryを使用できます
+.certs.display.certificates.when.verbose.and.verifying=[-certs]                    詳細出力および検証時に証明書を表示
+.certs.revocation.check=[-revCheck]                 証明書失効チェックの有効化
+.tsa.url.location.of.the.Timestamping.Authority=[-tsa <url>]                タイムスタンプ局の場所
+.tsacert.alias.public.key.certificate.for.Timestamping.Authority=[-tsacert <alias>]          タイムスタンプ局の公開キー証明書
+.tsapolicyid.tsapolicyid.for.Timestamping.Authority=[-tsapolicyid <oid>]        タイムスタンプ局のTSAPolicyID
+.tsadigestalg.algorithm.of.digest.data.in.timestamping.request=[-tsadigestalg <algorithm>] タイムスタンプ・リクエストのダイジェスト・データのアルゴリズム
+.internalsf.include.the.SF.file.inside.the.signature.block=[-internalsf]               シグネチャ・ブロックに.SFファイルを含める
+.sectionsonly.don.t.compute.hash.of.entire.manifest=[-sectionsonly]             マニフェスト全体のハッシュは計算しない
+.protected.keystore.has.protected.authentication.path=[-protected]                キーストアには保護された認証パスがある
+.providerName.name.provider.name=[-providerName <name>]      プロバイダ名
+.add.provider.option=[-addprovider <name>        名前でセキュリティ・プロバイダを追加する(SunPKCS11など)
+.providerArg.option.1=\u0020 [-providerArg <arg>]] ... -addproviderの引数を構成する
+.providerClass.option=[-providerClass <class>     完全修飾クラス名でセキュリティ・プロバイダを追加する
+.providerArg.option.2=\u0020 [-providerArg <arg>]] ... -providerClassの引数を構成する
+.providerPath.option=[-providerPath <list>]      プロバイダ・クラスパス
+.strict.treat.warnings.as.errors=[-strict]                   警告をエラーとして処理
+.conf.url.specify.a.pre.configured.options.file=[-conf <url>]               事前構成済のオプション・ファイルを指定する
+.print.this.help.message=[-? -h --help]              このヘルプ・メッセージを出力します
+Option.lacks.argument=オプションに引数がありません
+Please.type.jarsigner.help.for.usage=使用方法についてはjarsigner --helpと入力してください
+Please.specify.jarfile.name=jarfile名を指定してください
+Please.specify.alias.name=別名を指定してください
+Only.one.alias.can.be.specified=別名は1つのみ指定できます
+This.jar.contains.signed.entries.which.is.not.signed.by.the.specified.alias.es.=このjarに含まれる署名済エントリは、指定された別名によって署名されていません。
+This.jar.contains.signed.entries.that.s.not.signed.by.alias.in.this.keystore.=このjarに含まれる署名済エントリは、このキーストア内の別名によって署名されていません。
+s=s
+m=m
+k=k
+X=X
+q=?
+.and.d.more.=(他にも%d個)
+.s.signature.was.verified.=\u0020 s=シグネチャが検証されました\u0020
+.m.entry.is.listed.in.manifest=\u0020 m=エントリがマニフェスト内にリストされます
+.k.at.least.one.certificate.was.found.in.keystore=\u0020 k=1つ以上の証明書がキーストアで検出されました
+.X.not.signed.by.specified.alias.es.=\u0020 X =指定した別名で署名されていません
+.q.unsigned.entry=\u0020 ? = 署名なしのエントリ
+no.manifest.=マニフェストは存在しません。
+.Signature.related.entries.=(シグネチャ関連エントリ)
+.Unsigned.entries.=(署名なしのエントリ)
+.Directory.entries.=(ディレクトリ・エントリ)
+jar.is.unsigned=jarは署名されていません。
+jar.treated.unsigned=警告: 署名が構文解析できないか検証できないため、このjarは署名なしとして扱われます。詳細は、デバッグを有効にして(-J-Djava.security.debug=jar) jarsignerを再実行してください。
+jar.treated.unsigned.see.weak=このjarは、現在無効になっている弱いアルゴリズムで署名されているため、署名なしとして扱われます。\n\n詳細は、-verboseオプションを使用してjarsignerを再実行してください。
+jar.treated.unsigned.see.weak.verbose=警告: このjarは、セキュリティ・プロパティによって現在無効になっている弱いアルゴリズムで署名されているため、署名なしとして扱われます:
+jar.signed.=jarは署名されました。
+jar.signed.with.signer.errors.=jarは署名されました - 署名者エラーがあります。
+jar.verified.=jarが検証されました。
+jar.verified.with.signer.errors.=jarは検証されました - 署名者エラーがあります。
+
+history.with.ts=- 署名者: "%1$s"\n    ダイジェスト・アルゴリズム: %2$s\n    署名アルゴリズム: %3$s、%4$s\n  タイムスタンプ付加者: "%6$s" 日時: %5$tc\n    タイムスタンプのダイジェスト・アルゴリズム: %7$s\n    タイムスタンプの署名アルゴリズム: %8$s、%9$s
+history.without.ts=- 署名者: "%1$s"\n    ダイジェスト・アルゴリズム: %2$s\n    署名アルゴリズム: %3$s、%4$s
+history.nonexistent.entries=\u0020   警告: 存在しない署名済エントリ:\u0020
+history.unparsable=- 署名関連ファイル%sを解析できません
+history.nosf=- 署名関連ファイルMETA-INF/%s.SFがありません
+history.nobk=- 署名関連ファイルMETA-INF/%s.SFのブロック・ファイルがありません
+
+with.weak=%s (弱)
+with.algparams.weak=%2$sを使用した%1$s (弱)
+with.disabled=%s (無効)
+with.algparams.disabled=%2$sを使用した%1$s (無効)
+key.bit=%sキー
+key.bit.weak=%sキー(弱い)
+key.bit.disabled=%sキー(無効)
+nonexistent.entries.found=このjarには、存在しないファイルの署名済エントリが含まれます。詳細は、-verbose出力を参照してください。
+external.file.attributes.detected=POSIXファイル権限またはsymlink(あるいはその両方)の属性が検出されました。署名中はこれらの属性は無視され、署名によって保護されません。
+
+jarsigner.=jarsigner:\u0020
+signature.filename.must.consist.of.the.following.characters.A.Z.0.9.or.=シグネチャのファイル名に使用できる文字は、A-Z、0-9、_、- のみです。
+unable.to.open.jar.file.=次のjarファイルを開くことができません:\u0020
+unable.to.create.=作成できません:\u0020
+.adding.=\u0020  追加中:\u0020
+.updating.=\u0020更新中:\u0020
+.signing.=\u0020 署名中:\u0020
+attempt.to.rename.signedJarFile.to.jarFile.failed={0}の名前を{1}に変更しようとしましたが失敗しました
+attempt.to.rename.jarFile.to.origJar.failed={0}の名前を{1}に変更しようとしましたが失敗しました
+unable.to.sign.jar.=jarに署名できません:\u0020
+Enter.Passphrase.for.keystore.=キーストアのパスワードを入力してください:\u0020
+keystore.load.=キーストアのロード:\u0020
+certificate.exception.=証明書例外:\u0020
+unable.to.instantiate.keystore.class.=キーストア・クラスのインスタンスを生成できません:\u0020
+Certificate.chain.not.found.for.alias.alias.must.reference.a.valid.KeyStore.key.entry.containing.a.private.key.and=次の証明書チェーンが見つかりません: {0}。{1}は、秘密キーおよび対応する公開キー証明書チェーンを含む有効なKeyStoreキー・エントリを参照する必要があります。
+File.specified.by.certchain.does.not.exist=-certchainで指定されているファイルは存在しません
+Cannot.restore.certchain.from.file.specified=指定されたファイルから証明書チェーンを復元できません
+Certificate.chain.not.found.in.the.file.specified.=証明書チェーンは指定されたファイルに見つかりません。
+found.non.X.509.certificate.in.signer.s.chain=署名者の連鎖内で非X.509証明書が検出されました
+Enter.key.password.for.alias.={0}のキー・パスワードを入力してください:\u0020
+unable.to.recover.key.from.keystore=キーストアからキーを復元できません
+key.associated.with.alias.not.a.private.key={0}と関連付けられたキーは、秘密キーではありません
+you.must.enter.key.password=キー・パスワードを入力する必要があります
+unable.to.read.password.=パスワードを読み込めません:\u0020
+certificate.is.valid.from=証明書は{0}から{1}まで有効です
+certificate.expired.on=証明書は{0}に失効しました
+certificate.is.not.valid.until=証明書は{0}まで有効ではありません
+certificate.will.expire.on=証明書は{0}に失効します
+.Invalid.certificate.chain.=[無効な証明書チェーン:\u0020
+.Invalid.TSA.certificate.chain.=[無効なTSA証明書チェーン:\u0020
+requesting.a.signature.timestamp=シグネチャ・タイムスタンプのリクエスト
+TSA.location.=TSAの場所:\u0020
+TSA.certificate.=TSA証明書:\u0020
+no.response.from.the.Timestamping.Authority.=タイムスタンプ局からのレスポンスがありません。ファイアウォールを介して接続するときは、必要に応じてHTTPまたはHTTPSプロキシを指定してください。jarsignerに次のオプションを指定してください:
+or=または
+Certificate.not.found.for.alias.alias.must.reference.a.valid.KeyStore.entry.containing.an.X.509.public.key.certificate.for.the=証明書が見つかりませんでした: {0}。{1}はタイムスタンプ局のX.509公開キー証明書が含まれている有効なKeyStoreエントリを参照する必要があります。
+entry.was.signed.on=エントリは{0}に署名されました
+Warning.=警告:\u0020
+Error.=エラー:\u0020
+...Signer=>>> 署名者
+...TSA=>>> TSA
+trusted.certificate=信頼できる証明書
+This.jar.contains.unsigned.entries.which.have.not.been.integrity.checked.=このjarには、整合性チェックをしていない署名なしのエントリが含まれています。\u0020
+This.jar.contains.entries.whose.signer.certificate.has.expired.=このjarには、署名者の証明書が期限切れのエントリが含まれています。\u0020
+This.jar.contains.entries.whose.signer.certificate.will.expire.within.six.months.=このjarには、署名者の証明書が6か月以内に期限切れとなるエントリが含まれています。\u0020
+This.jar.contains.entries.whose.signer.certificate.is.not.yet.valid.=このjarには、署名者の証明書がまだ有効になっていないエントリが含まれています。\u0020
+This.jar.contains.entries.whose.signer.certificate.is.self.signed.=このjarには、署名者の証明書が自己署名されているエントリが含まれています。\u0020
+Re.run.with.the.verbose.and.certs.options.for.more.details.=詳細は、-verboseおよび-certsオプションを使用して再実行してください。
+The.signer.certificate.has.expired.=署名者の証明書は期限切れです。
+The.timestamp.expired.1.but.usable.2=タイムスタンプは%1$tY-%1$tm-%1$tdに期限切れになります。ただし、JARは署名者の証明書が%2$tY-%2$tm-%2$tdに期限切れになるまで有効です。
+The.timestamp.has.expired.=タイムスタンプは期限切れになりました。
+The.signer.certificate.will.expire.within.six.months.=署名者の証明書は6か月以内に期限切れになります。
+The.timestamp.will.expire.within.one.year.on.1=タイムスタンプは1年以内の%1$tY-%1$tm-%1$tdに期限切れになります。
+The.timestamp.will.expire.within.one.year.on.1.but.2=タイムスタンプは1年以内の%1$tY-%1$tm-%1$tdに期限切れになります。ただし、JARは署名者の証明書が%2$tY-%2$tm-%2$tdに期限切れになるまで有効です。
+The.signer.certificate.is.not.yet.valid.=署名者の証明書はまだ有効になっていません。
+The.signer.certificate.s.KeyUsage.extension.doesn.t.allow.code.signing.=署名者証明書のKeyUsage拡張機能では、コード署名は許可されません。
+The.signer.certificate.s.ExtendedKeyUsage.extension.doesn.t.allow.code.signing.=署名者証明書のExtendedKeyUsage拡張機能では、コード署名は許可されません。
+The.signer.certificate.s.NetscapeCertType.extension.doesn.t.allow.code.signing.=署名者証明書のNetscapeCertType拡張機能では、コード署名は許可されません。
+This.jar.contains.entries.whose.signer.certificate.s.KeyUsage.extension.doesn.t.allow.code.signing.=このjarには、署名者証明書のKeyUsage拡張機能がコード署名を許可しないエントリが含まれています。
+This.jar.contains.entries.whose.signer.certificate.s.ExtendedKeyUsage.extension.doesn.t.allow.code.signing.=このjarには、署名者証明書のExtendedKeyUsage拡張機能がコード署名を許可しないエントリが含まれています。
+This.jar.contains.entries.whose.signer.certificate.s.NetscapeCertType.extension.doesn.t.allow.code.signing.=このjarには、署名者証明書のNetscapeCertType拡張機能がコード署名を許可しないエントリが含まれています。
+.{0}.extension.does.not.support.code.signing.=[{0}拡張機能はコード署名をサポートしていません]
+The.signer.s.certificate.chain.is.invalid.reason.1=署名者の証明書チェーンが無効です。理由: %s
+The.tsa.certificate.chain.is.invalid.reason.1=TSA証明書チェーンが無効です。理由: %s
+The.signer.s.certificate.is.self.signed.=署名者の証明書は自己署名されています。
+The.1.algorithm.specified.for.the.2.option.is.considered.a.security.risk..This.algorithm.will.be.disabled.in.a.future.update.=%1$sアルゴリズム(%2$sオプションに指定)は、セキュリティ・リスクとみなされます。このアルゴリズムは将来の更新で無効化されます。
+The.1.algorithm.specified.for.the.2.option.is.considered.a.security.risk.and.is.disabled.=%1$sアルゴリズム(%2$sオプションに指定)は、セキュリティ・リスクとみなされ、無効化されています。
+The.timestamp.digest.algorithm.1.is.considered.a.security.risk..This.algorithm.will.be.disabled.in.a.future.update.=%1$sタイムスタンプ・ダイジェスト・アルゴリズムは、セキュリティ・リスクとみなされます。このアルゴリズムは将来の更新で無効化されます。
+The.digest.algorithm.1.is.considered.a.security.risk..This.algorithm.will.be.disabled.in.a.future.update.=%1$sダイジェスト・アルゴリズムは、セキュリティ・リスクとみなされます。このアルゴリズムは将来の更新で無効化されます。
+The.signature.algorithm.1.is.considered.a.security.risk..This.algorithm.will.be.disabled.in.a.future.update.=%1$s署名アルゴリズムは、セキュリティ・リスクとみなされます。このアルゴリズムは将来の更新で無効化されます。
+size.bit.alg=%1$dビット%2$s
+The.full.keyAlgName.signing.key.is.considered.a.security.risk..It.will.be.disabled.in.a.future.update.=%s署名キーはセキュリティ・リスクとみなされます。今後の更新では無効になります。
+The.full.keyAlgName.signing.key.is.considered.a.security.risk.and.is.disabled.=%s署名キーはセキュリティ・リスクとみなされ、無効になっています。
+This.jar.contains.entries.whose.certificate.chain.is.invalid.reason.1=このjarには、証明書チェーンが無効なエントリが含まれています。理由: %s
+This.jar.contains.entries.whose.tsa.certificate.chain.is.invalid.reason.1=このjarには、TSA証明書チェーンが無効なエントリが含まれています。理由: %s
+no.timestamp.signing=-tsaまたは-tsacertが指定されていないため、このjarにはタイムスタンプが付加されていません。タイムスタンプがないと、署名者証明書の有効期限(%1$tY-%1$tm-%1$td)後に、ユーザーはこのjarを検証できない可能性があります。
+invalid.timestamp.signing=タイムスタンプが無効です。有効なタイムスタンプがないと、署名者証明書の有効期限(%1$tY-%1$tm-%1$td)後に、ユーザーはこのjarを検証できない可能性があります。
+no.timestamp.verifying=このjarには、タイムスタンプがない署名が含まれています。タイムスタンプがないと、いずれかの署名者証明書の有効期限後に(早ければ%1$tY-%1$tm-%1$td)ユーザーはこのjarを検証できない可能性があります。
+bad.timestamp.verifying=このjarには、無効なタイムスタンプのある署名が含まれています。有効なタイムスタンプがないと、いずれかの署名者証明書の有効期限後に(早ければ%1$tY-%1$tm-%1$td)ユーザーはこのjarを検証できない可能性があります。\n詳細は、-J-Djava.security.debug=jarを指定してjarsignerを再実行してください。
+The.signer.certificate.will.expire.on.1.=署名者の証明書は%1$tY-%1$tm-%1$tdに期限切れになります。
+The.timestamp.will.expire.on.1.=タイムスタンプは%1$tY-%1$tm-%1$tdに期限切れになります。
+signer.cert.expired.1.but.timestamp.good.2.=署名者の証明書は%1$tY-%1$tm-%1$tdに期限切れになります。ただし、JARはタイムスタンプが%2$tY-%2$tm-%2$tdに期限切れになるまで有効です。
+Unknown.password.type.=不明なパスワード・タイプ:\u0020
+Cannot.find.environment.variable.=環境変数が見つかりません:\u0020
+Cannot.find.file.=ファイルが見つかりません:\u0020
+event.ocsp.check=%sのOCSPサーバーに接続しています...
+event.crl.check=%sからCRLをダウンロードしています...
diff --git a/src/jdk.jartool/share/classes/sun/security/tools/jarsigner/resources/jarsigner_zh_CN.properties b/src/jdk.jartool/share/classes/sun/security/tools/jarsigner/resources/jarsigner_zh_CN.properties
new file mode 100644
index 00000000000..2558239039f
--- /dev/null
+++ b/src/jdk.jartool/share/classes/sun/security/tools/jarsigner/resources/jarsigner_zh_CN.properties
@@ -0,0 +1,207 @@
+#
+# Copyright (c) 2000, 2025, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute 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.
+#
+
+# shared (from jarsigner)
+SPACE=\u0020
+6SPACE=\u0020    \u0020
+COMMA=,\u0020
+provclass.not.a.provider=%s不是提供方
+provider.name.not.found=未找到名为 "%s" 的提供方
+provider.class.not.found=未找到提供方 "%s"
+jarsigner.error.=jarsigner 错误:\u0020
+Illegal.option.=非法选项:\u0020
+.keystore.must.be.NONE.if.storetype.is.{0}=如果 -storetype 为 {0}, 则 -keystore 必须为 NONE
+.keypass.can.not.be.specified.if.storetype.is.{0}=如果 -storetype 为 {0}, 则不能指定 -keypass
+If.protected.is.specified.then.storepass.and.keypass.must.not.be.specified=如果指定了 -protected, 则不能指定 -storepass 和 -keypass
+If.keystore.is.not.password.protected.then.storepass.and.keypass.must.not.be.specified=如果密钥库未受口令保护, 则不能指定 -storepass 和 -keypass
+Usage.jarsigner.options.jar.file.alias=用法: jarsigner [选项] jar-file 别名
+.jarsigner.verify.options.jar.file.alias.=\u0020      jarsigner -verify [选项] jar-file [别名...]
+.jarsigner.version=\u0020      jarsigner -version
+.keystore.url.keystore.location=[-keystore <url>]           密钥库位置
+.storepass.password.password.for.keystore.integrity=[-storepass <口令>]         用于密钥库完整性的口令
+.storetype.type.keystore.type=[-storetype <类型>]         密钥库类型
+.keypass.password.password.for.private.key.if.different.=[-keypass <口令>]           私有密钥的口令 (如果不同)
+.certchain.file.name.of.alternative.certchain.file=[-certchain <文件>]         替代证书链文件的名称
+.sigfile.file.name.of.SF.DSA.file=[-sigfile <文件>]           .SF/.DSA 文件的名称
+.signedjar.file.name.of.signed.JAR.file=[-signedjar <文件>]         已签名的 JAR 文件的名称
+.digestalg.algorithm.name.of.digest.algorithm=[-digestalg <算法>]        摘要算法的名称
+.sigalg.algorithm.name.of.signature.algorithm=[-sigalg <算法>]           签名算法的名称
+.verify.verify.a.signed.JAR.file=[-verify]                   验证已签名的 JAR 文件
+.version.print.the.program.version=[-version]                  输出程序版本
+.verbose.suboptions.verbose.output.when.signing.verifying.=[-verbose[:suboptions]]     签名/验证时输出详细信息。
+.suboptions.can.be.all.grouped.or.summary=\u0020                           子选项可以是 all, grouped 或 summary
+.certs.display.certificates.when.verbose.and.verifying=[-certs]                    输出详细信息和验证时显示证书
+.certs.revocation.check=[-revCheck]                 启用证书撤消检查
+.tsa.url.location.of.the.Timestamping.Authority=[-tsa <url>]                时间戳颁发机构的位置
+.tsacert.alias.public.key.certificate.for.Timestamping.Authority=[-tsacert <别名>]           时间戳颁发机构的公共密钥证书
+.tsapolicyid.tsapolicyid.for.Timestamping.Authority=[-tsapolicyid <oid>]        时间戳颁发机构的 TSAPolicyID
+.tsadigestalg.algorithm.of.digest.data.in.timestamping.request=[-tsadigestalg <算法>]      时间戳请求中的摘要数据的算法
+.internalsf.include.the.SF.file.inside.the.signature.block=[-internalsf]               在签名块内包含 .SF 文件
+.sectionsonly.don.t.compute.hash.of.entire.manifest=[-sectionsonly]             不计算整个清单的散列
+.protected.keystore.has.protected.authentication.path=[-protected]                密钥库具有受保护验证路径
+.providerName.name.provider.name=[-providerName <名称>]      提供方名称
+.add.provider.option=[-addprovider <名称>        按名称 (例如 SunPKCS11) 添加安全提供方
+.providerArg.option.1=\u0020 [-providerArg <参数>]] ... 配置 -addprovider 的参数
+.providerClass.option=[-providerClass <类>     按全限定类名添加安全提供方
+.providerArg.option.2=\u0020 [-providerArg <参数>]] ... 配置 -providerClass 的参数
+.providerPath.option=[-providerPath <list>]      提供方类路径
+.strict.treat.warnings.as.errors=[-strict]                   将警告视为错误
+.conf.url.specify.a.pre.configured.options.file=[-conf <url>]               指定预配置的选项文件
+.print.this.help.message=[-? -h --help]              输出此帮助消息
+Option.lacks.argument=选项缺少参数
+Please.type.jarsigner.help.for.usage=请键入 jarsigner --help 以了解用法
+Please.specify.jarfile.name=请指定 jarfile 名称
+Please.specify.alias.name=请指定别名
+Only.one.alias.can.be.specified=只能指定一个别名
+This.jar.contains.signed.entries.which.is.not.signed.by.the.specified.alias.es.=此 jar 包含未由指定别名签名的已签名条目。
+This.jar.contains.signed.entries.that.s.not.signed.by.alias.in.this.keystore.=此 jar 包含未由此密钥库中的别名签名的已签名条目。
+s=s
+m=m
+k=k
+X=X
+q=?
+.and.d.more.=(%d 及以上)
+.s.signature.was.verified.=\u0020 s = 已验证签名\u0020
+.m.entry.is.listed.in.manifest=\u0020 m = 在清单中列出条目
+.k.at.least.one.certificate.was.found.in.keystore=\u0020 k = 在密钥库中至少找到了一个证书
+.X.not.signed.by.specified.alias.es.=\u0020 X = 未由指定别名签名
+.q.unsigned.entry=\u0020 ? = 未签名条目
+no.manifest.=没有清单。
+.Signature.related.entries.=(与签名相关的条目)
+.Unsigned.entries.=(未签名条目)
+.Directory.entries.=（目录条目）
+jar.is.unsigned=jar 未签名。
+jar.treated.unsigned=警告: 签名无法解析或验证, 该 jar 将被视为未签名。有关详细信息, 请在启用调试的情况下重新运行 jarsigner (-J-Djava.security.debug=jar)。
+jar.treated.unsigned.see.weak=由于该 jar 是使用目前已禁用的弱算法签名的, 因此该 jar 将被视为未签名。\n\n有关详细信息, 请使用 -verbose 选项重新运行 jarsigner。
+jar.treated.unsigned.see.weak.verbose=警告: 该 jar 将被视为未签名, 因为它是由目前安全属性禁用的弱算法签名的:
+jar.signed.=jar 已签名。
+jar.signed.with.signer.errors.=jar 已签名, 但出现签名者错误。
+jar.verified.=jar 已验证。
+jar.verified.with.signer.errors.=jar 已验证, 但出现签名者错误。
+
+history.with.ts=- 由 "%1$s" 签名\n    摘要算法: %2$s\n    签名算法: %3$s, %4$s\n  由 "%6$s" 于 %5$tc 加时间戳\n    时间戳摘要算法: %7$s\n    时间戳签名算法: %8$s, %9$s
+history.without.ts=- 由 "%1$s" 签名\n    摘要算法: %2$s\n    签名算法: %3$s, %4$s
+history.nonexistent.entries=警告：不存在的签名条目：\u0020
+history.unparsable=- 无法解析的与签名相关的文件 %s
+history.nosf=- 缺少与签名相关的文件 META-INF/%s.SF
+history.nobk=- 与签名相关的文件 META-INF/%s.SF 缺少块文件
+
+with.weak=%s (弱)
+with.algparams.weak=%1$s 使用 %2$s（弱）
+with.disabled=%s（禁用）
+with.algparams.disabled=%1$s 使用 %2$s（禁用）
+key.bit=%s 密钥
+key.bit.weak=%s 密钥（弱）
+key.bit.disabled=%s 密钥（已禁用）
+nonexistent.entries.found=此 jar 的文件包含不存在的签名条目。有关更多详细信息，请参见 -verbose 输出。
+external.file.attributes.detected=检测到 POSIX 文件权限和/或 symlink 属性。这些属性在进行签名时会被忽略，不受该签名的保护。
+
+jarsigner.=jarsigner:\u0020
+signature.filename.must.consist.of.the.following.characters.A.Z.0.9.or.=签名文件名必须包含以下字符: A-Z, 0-9, _ 或 -
+unable.to.open.jar.file.=无法打开 jar 文件:\u0020
+unable.to.create.=无法创建:\u0020
+.adding.=\u0020  正在添加:\u0020
+.updating.=\u0020正在更新:\u0020
+.signing.=\u0020 正在签名:\u0020
+attempt.to.rename.signedJarFile.to.jarFile.failed=尝试将{0}重命名为{1}时失败
+attempt.to.rename.jarFile.to.origJar.failed=尝试将{0}重命名为{1}时失败
+unable.to.sign.jar.=无法对 jar 进行签名:\u0020
+Enter.Passphrase.for.keystore.=输入密钥库的密码短语:\u0020
+keystore.load.=密钥库加载:\u0020
+certificate.exception.=证书异常错误:\u0020
+unable.to.instantiate.keystore.class.=无法实例化密钥库类:\u0020
+Certificate.chain.not.found.for.alias.alias.must.reference.a.valid.KeyStore.key.entry.containing.a.private.key.and=找不到{0}的证书链。{1}必须引用包含私有密钥和相应的公共密钥证书链的有效密钥库密钥条目。
+File.specified.by.certchain.does.not.exist=由 -certchain 指定的文件不存在
+Cannot.restore.certchain.from.file.specified=无法从指定的文件还原 certchain
+Certificate.chain.not.found.in.the.file.specified.=在指定的文件中找不到证书链。
+found.non.X.509.certificate.in.signer.s.chain=在签名者的链中找到非 X.509 证书
+Enter.key.password.for.alias.=输入{0}的密钥口令:\u0020
+unable.to.recover.key.from.keystore=无法从密钥库中恢复密钥
+key.associated.with.alias.not.a.private.key=与{0}关联的密钥不是私有密钥
+you.must.enter.key.password=必须输入密钥口令
+unable.to.read.password.=无法读取口令:\u0020
+certificate.is.valid.from=证书的有效期为{0}至{1}
+certificate.expired.on=证书到期日期为 {0}
+certificate.is.not.valid.until=直到{0}, 证书才有效
+certificate.will.expire.on=证书将在{0}到期
+.Invalid.certificate.chain.=[无效的证书链:\u0020
+.Invalid.TSA.certificate.chain.=[无效 TSA 的证书链:\u0020
+requesting.a.signature.timestamp=正在请求签名时间戳
+TSA.location.=TSA 位置:\u0020
+TSA.certificate.=TSA 证书:\u0020
+no.response.from.the.Timestamping.Authority.=时间戳颁发机构没有响应。如果要从防火墙后面连接, 则可能需要指定 HTTP 或 HTTPS 代理。请为 jarsigner 提供以下选项:\u0020
+or=或
+Certificate.not.found.for.alias.alias.must.reference.a.valid.KeyStore.entry.containing.an.X.509.public.key.certificate.for.the=找不到{0}的证书。{1}必须引用包含时间戳颁发机构的 X.509 公共密钥证书的有效密钥库条目。
+entry.was.signed.on=条目的签名日期为 {0}
+Warning.=警告:\u0020
+Error.=错误:\u0020
+...Signer=>>> 签名者
+...TSA=>>> TSA
+trusted.certificate=可信证书
+This.jar.contains.unsigned.entries.which.have.not.been.integrity.checked.=此 jar 包含尚未进行完整性检查的未签名条目。\u0020
+This.jar.contains.entries.whose.signer.certificate.has.expired.=此 jar 包含签名者证书已过期的条目。\u0020
+This.jar.contains.entries.whose.signer.certificate.will.expire.within.six.months.=此 jar 包含签名者证书将在六个月内过期的条目。\u0020
+This.jar.contains.entries.whose.signer.certificate.is.not.yet.valid.=此 jar 包含签名者证书仍无效的条目。\u0020
+This.jar.contains.entries.whose.signer.certificate.is.self.signed.=此 jar 包含其签名者证书为自签名证书的条目。
+Re.run.with.the.verbose.and.certs.options.for.more.details.=有关详细信息, 请使用 -verbose 和 -certs 选项重新运行。
+The.signer.certificate.has.expired.=签名者证书已过期。
+The.timestamp.expired.1.but.usable.2=时间戳到期日期为 %1$tY-%1$tm-%1$td。不过，在签名者证书于 %2$tY-%2$tm-%2$td 到期之前，JAR 将有效。
+The.timestamp.has.expired.=时间戳已到期。
+The.signer.certificate.will.expire.within.six.months.=签名者证书将在六个月内过期。
+The.timestamp.will.expire.within.one.year.on.1=时间戳将在一年内于 %1$tY-%1$tm-%1$td 到期。
+The.timestamp.will.expire.within.one.year.on.1.but.2=时间戳将在一年内于 %1$tY-%1$tm-%1$td 到期。不过，在签名者证书于 %2$tY-%2$tm-%2$td 到期之前，JAR 将有效。
+The.signer.certificate.is.not.yet.valid.=签名者证书仍无效。
+The.signer.certificate.s.KeyUsage.extension.doesn.t.allow.code.signing.=由于签名者证书的 KeyUsage 扩展而无法进行代码签名。
+The.signer.certificate.s.ExtendedKeyUsage.extension.doesn.t.allow.code.signing.=由于签名者证书的 ExtendedKeyUsage 扩展而无法进行代码签名。
+The.signer.certificate.s.NetscapeCertType.extension.doesn.t.allow.code.signing.=由于签名者证书的 NetscapeCertType 扩展而无法进行代码签名。
+This.jar.contains.entries.whose.signer.certificate.s.KeyUsage.extension.doesn.t.allow.code.signing.=此 jar 包含由于签名者证书的 KeyUsage 扩展而无法进行代码签名的条目。
+This.jar.contains.entries.whose.signer.certificate.s.ExtendedKeyUsage.extension.doesn.t.allow.code.signing.=此 jar 包含由于签名者证书的 ExtendedKeyUsage 扩展而无法进行代码签名的条目。
+This.jar.contains.entries.whose.signer.certificate.s.NetscapeCertType.extension.doesn.t.allow.code.signing.=此 jar 包含由于签名者证书的 NetscapeCertType 扩展而无法进行代码签名的条目。
+.{0}.extension.does.not.support.code.signing.=[{0} 扩展不支持代码签名]
+The.signer.s.certificate.chain.is.invalid.reason.1=签名者证书链无效。原因: %s
+The.tsa.certificate.chain.is.invalid.reason.1=TSA 证书链无效。原因: %s
+The.signer.s.certificate.is.self.signed.=签名者证书为自签名证书。
+The.1.algorithm.specified.for.the.2.option.is.considered.a.security.risk..This.algorithm.will.be.disabled.in.a.future.update.=为 %2$s 选项指定的 %1$s 算法被视为存在安全风险。此算法将在未来的更新中被禁用。
+The.1.algorithm.specified.for.the.2.option.is.considered.a.security.risk.and.is.disabled.=为 %2$s 选项指定的 %1$s 算法被视为存在安全风险而且被禁用。
+The.timestamp.digest.algorithm.1.is.considered.a.security.risk..This.algorithm.will.be.disabled.in.a.future.update.=%1$s 时间戳摘要算法被视为存在安全风险。此算法将在未来的更新中被禁用。
+The.digest.algorithm.1.is.considered.a.security.risk..This.algorithm.will.be.disabled.in.a.future.update.=%1$s 摘要算法被视为存在安全风险。此算法将在未来的更新中被禁用。
+The.signature.algorithm.1.is.considered.a.security.risk..This.algorithm.will.be.disabled.in.a.future.update.=%1$s 签名算法被视为存在安全风险。此算法将在未来的更新中被禁用。
+size.bit.alg=%1$d 位 %2$s
+The.full.keyAlgName.signing.key.is.considered.a.security.risk..It.will.be.disabled.in.a.future.update.=%s 签名密钥被视为安全风险。在将来的更新中将禁用它。
+The.full.keyAlgName.signing.key.is.considered.a.security.risk.and.is.disabled.=%s 签名密钥被视为安全风险并被禁用。
+This.jar.contains.entries.whose.certificate.chain.is.invalid.reason.1=此 jar 包含其证书链无效的条目。原因: %s
+This.jar.contains.entries.whose.tsa.certificate.chain.is.invalid.reason.1=此 jar 包含其 TSA 证书链无效的条目。原因: %s
+no.timestamp.signing=未提供 -tsa 或 -tsacert, 此 jar 没有时间戳。如果没有时间戳, 则在签名者证书的到期日期 (%1$tY-%1$tm-%1$td) 之后, 用户可能无法验证此 jar。
+invalid.timestamp.signing=时间戳无效。如果没有有效的时间戳，则在签名者证书的到期日期 (%1$tY-%1$tm-%1$td) 之后，用户可能无法验证此 jar。
+no.timestamp.verifying=此 jar 包含的签名没有时间戳。如果没有时间戳, 则在其中任一签名者证书到期 (最早为 %1$tY-%1$tm-%1$td) 之后, 用户可能无法验证此 jar。
+bad.timestamp.verifying=此 jar 包含带有无效时间戳的签名。如果没有有效时间戳, 则在其中任一签名者证书到期 (最早为 %1$tY-%1$tm-%1$td) 之后, 用户可能无法验证此 jar。\n有关详细信息, 请使用 -J-Djava.security.debug=jar 重新运行 jarsigner。
+The.signer.certificate.will.expire.on.1.=签名者证书将于 %1$tY-%1$tm-%1$td 到期。
+The.timestamp.will.expire.on.1.=时间戳将于 %1$tY-%1$tm-%1$td 到期。
+signer.cert.expired.1.but.timestamp.good.2.=签名者证书到期日期为 %1$tY-%1$tm-%1$td。不过，在时间戳于 %2$tY-%2$tm-%2$td 到期之前，JAR 将有效。
+Unknown.password.type.=未知口令类型:\u0020
+Cannot.find.environment.variable.=找不到环境变量:\u0020
+Cannot.find.file.=找不到文件:\u0020
+event.ocsp.check=正在联系位于 %s 的 OCSP 服务器...
+event.crl.check=正在从 %s 下载 CRL...
diff --git a/test/jdk/sun/security/util/Resources/Usages.java b/test/jdk/sun/security/util/Resources/Usages.java
index 7b08ce4a616..1e0a7d7ef70 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, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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,13 @@
 
 /*
  * @test
- * @bug 8215937
+ * @bug 8215937 8345940
  * @modules java.base/sun.security.util
- *          java.base/sun.security.tools.keytool
- *          jdk.jartool/sun.security.tools.jarsigner
+ *          java.base/sun.security.util.resources
+ *          java.base/sun.security.tools.keytool.resources
+ *          jdk.jartool/sun.security.tools.jarsigner.resources
  * @summary Check usages of security-related Resources files
+ * @run main/othervm Usages
  */
 
 import java.io.IOException;
@@ -106,17 +108,22 @@ public class Usages {
 
     // For each Resources file, where and how the strings are used.
     static Map<ListResourceBundle, List<Pair>> MAP = Map.of(
-            new sun.security.tools.keytool.Resources(), List.of(
+            new sun.security.tools.keytool.resources.keytool(),
+            List.of(
                     new Pair("java.base/share/classes/sun/security/tools/keytool/Main.java",
                             List.of(RB_GETSTRING, KT_ENUM)),
                     new Pair("java.base/share/classes/sun/security/tools/KeyStoreUtil.java",
                             List.of(RB_GETSTRING))),
-            new sun.security.util.AuthResources(), List.of(
+
+            new sun.security.util.resources.auth(),
+            List.of(
                     new Pair("java.base/share/classes/sun/security/provider/ConfigFile.java",
                             List.of(GETAUTHSTRING, IOEXCEPTION)),
                     new Pair("jdk.security.auth/share/classes/com/sun/security/auth/",
                             List.of(GETAUTHSTRING))),
-            new sun.security.tools.jarsigner.Resources(), List.of(
+
+            new sun.security.tools.jarsigner.resources.jarsigner(),
+            List.of(
                     new Pair("jdk.jartool/share/classes/sun/security/tools/jarsigner/Main.java",
                             List.of(RB_GETSTRING)),
                     new Pair("java.base/share/classes/sun/security/provider/certpath/OCSP.java",
@@ -125,7 +132,9 @@ public class Usages {
                             List.of(EVENT_OCSP_CRL)),
                     new Pair("java.base/share/classes/sun/security/tools/KeyStoreUtil.java",
                             List.of(RB_GETSTRING))),
-            new sun.security.util.Resources(), List.of(
+
+            new sun.security.util.resources.security(),
+            List.of(
                     new Pair("jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/SunPKCS11.java",
                             List.of(MGR_GETSTRING)),
                     new Pair("java.base/share/classes/sun/security/provider/PolicyParser.java",
diff --git a/test/jdk/sun/security/util/Resources/customSysClassLoader/MessageFormatting.java b/test/jdk/sun/security/util/Resources/customSysClassLoader/MessageFormatting.java
index 63d1f47aa89..d10958341a8 100644
--- a/test/jdk/sun/security/util/Resources/customSysClassLoader/MessageFormatting.java
+++ b/test/jdk/sun/security/util/Resources/customSysClassLoader/MessageFormatting.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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.*;
-import sun.security.util.Resources;
 import sun.security.util.LocalizedMessage;
 import java.text.MessageFormat;
 
@@ -32,6 +31,7 @@ import java.text.MessageFormat;
  * @summary Ensure that security message formatting code is capable of
  *     displaying all messages.
  * @modules java.base/sun.security.util
+ *          java.base/sun.security.util.resources
  * @run main MessageFormatting
  * @run main/othervm -Duser.country=SA -Duser.language=ar MessageFormatting
  */
@@ -42,7 +42,7 @@ public class MessageFormatting {
 
     public static void main(String[] args) throws Exception {
 
-        Resources resources = new Resources();
+        ListResourceBundle resources = new sun.security.util.resources.security();
         Enumeration<String> keys = resources.getKeys();
         while (keys.hasMoreElements()) {
             String curKey = keys.nextElement();

From 64464eab6291ee498fe677e90bcb8980fe8a9a3c Mon Sep 17 00:00:00 2001
From: Coleen Phillimore <coleenp@openjdk.org>
Date: Tue, 11 Mar 2025 20:32:21 +0000
Subject: [PATCH 306/587] 8351673: Clean up a case of if (LockingMode ==
 LM_LIGHTWEIGHT) in a legacy-only locking mode function

Reviewed-by: pchilanomate
---
 src/hotspot/share/runtime/synchronizer.cpp | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/hotspot/share/runtime/synchronizer.cpp b/src/hotspot/share/runtime/synchronizer.cpp
index 90d857e1669..e4ecf4d8b27 100644
--- a/src/hotspot/share/runtime/synchronizer.cpp
+++ b/src/hotspot/share/runtime/synchronizer.cpp
@@ -407,10 +407,6 @@ bool ObjectSynchronizer::quick_enter_legacy(oop obj, BasicLock* lock, JavaThread
     return false;  // Slow path
   }
 
-  if (LockingMode == LM_LIGHTWEIGHT) {
-    return LightweightSynchronizer::quick_enter(obj, lock, current);
-  }
-
   assert(LockingMode == LM_LEGACY, "legacy mode below");
 
   const markWord mark = obj->mark();

From 1dd9cf1018f33af34f1f822cb0d1dc706353bbdf Mon Sep 17 00:00:00 2001
From: Karm Michal Babacek <karm@redhat.com>
Date: Tue, 11 Mar 2025 21:16:14 +0000
Subject: [PATCH 307/587] 8349099:
 java/awt/Headless/HeadlessMalfunctionTest.java fails on CI with Compilation
 error

Reviewed-by: aivanov, sgehwolf, prr
---
 test/jdk/ProblemList.txt                      |  1 -
 .../Headless/HeadlessMalfunctionAgent.java    | 58 +++++++++----------
 .../awt/Headless/HeadlessMalfunctionTest.java | 14 ++---
 3 files changed, 33 insertions(+), 40 deletions(-)

diff --git a/test/jdk/ProblemList.txt b/test/jdk/ProblemList.txt
index 65037b644c8..d7bed319ebe 100644
--- a/test/jdk/ProblemList.txt
+++ b/test/jdk/ProblemList.txt
@@ -462,7 +462,6 @@ java/awt/PopupMenu/PopupMenuLocation.java 8259913,8315878 windows-all,macosx-aar
 java/awt/GridLayout/ComponentPreferredSize/ComponentPreferredSize.java 8238720,8324782 windows-all,macosx-all
 java/awt/GridLayout/ChangeGridSize/ChangeGridSize.java   8238720,8324782 windows-all,macosx-all
 java/awt/event/MouseEvent/FrameMouseEventAbsoluteCoordsTest/FrameMouseEventAbsoluteCoordsTest.java 8238720 windows-all
-java/awt/Headless/HeadlessMalfunctionTest.java 8349099 generic-all
 
 # Several tests which fail sometimes on macos11
 java/awt/Window/MainKeyWindowTest/TestMainKeyWindow.java 8265985 macosx-all
diff --git a/test/jdk/java/awt/Headless/HeadlessMalfunctionAgent.java b/test/jdk/java/awt/Headless/HeadlessMalfunctionAgent.java
index dc422581fa9..d4ee66ab714 100644
--- a/test/jdk/java/awt/Headless/HeadlessMalfunctionAgent.java
+++ b/test/jdk/java/awt/Headless/HeadlessMalfunctionAgent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2024, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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,9 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-import jdk.internal.org.objectweb.asm.ClassReader;
-import jdk.internal.org.objectweb.asm.ClassVisitor;
-import jdk.internal.org.objectweb.asm.ClassWriter;
-import jdk.internal.org.objectweb.asm.MethodVisitor;
-import jdk.internal.org.objectweb.asm.Opcodes;
 
+import java.lang.classfile.ClassFile;
+import java.lang.classfile.MethodModel;
 import java.lang.instrument.ClassFileTransformer;
 import java.lang.instrument.Instrumentation;
 import java.security.ProtectionDomain;
@@ -37,34 +34,31 @@ public class HeadlessMalfunctionAgent {
 
     public static void premain(String agentArgs, Instrumentation inst) {
         inst.addTransformer(new ClassFileTransformer() {
-
             @Override
-            public byte[] transform(ClassLoader loader, String className, Class<?> classBeingRedefined,
-                                    ProtectionDomain pd, byte[] cb) {
-                if ("java/awt/GraphicsEnvironment".equals(className)) {
-                    System.out.println("Transforming java.awt.GraphicsEnvironment.");
-                    try {
-                        final ClassReader cr = new ClassReader(cb);
-                        final ClassWriter cw = new ClassWriter(cr, 0);
-                        cr.accept(new ClassVisitor(Opcodes.ASM9, cw) {
-
-                            @Override
-                            public MethodVisitor visitMethod(int access, String name, String descriptor, String signature,
-                                                             String[] exceptions) {
-                                if ("isHeadless".equals(name) && "()Z".equals(descriptor)) {
-                                    System.out.println("isHeadless removed from java.awt.GraphicsEnvironment.");
-                                    // WHACK! Remove the isHeadless method.
-                                    return null;
-                                }
-                                return super.visitMethod(access, name, descriptor, signature, exceptions);
-                            }
-                        }, 0);
-                        return cw.toByteArray();
-                    } catch (Exception e) {
-                        e.printStackTrace();
-                    }
+            public byte[] transform(ClassLoader loader,
+                                    String className,
+                                    Class<?> classBeingRedefined,
+                                    ProtectionDomain pd,
+                                    byte[] cb) {
+                if (!"java/awt/GraphicsEnvironment".equals(className)) {
+                    return null;
+                }
+                System.out.println("Transforming java.awt.GraphicsEnvironment.");
+                try {
+                    return ClassFile.of().transformClass(ClassFile.of().parse(cb), (classBuilder, element) -> {
+                        if (element instanceof MethodModel method) {
+                            if ("isHeadless".equals(method.methodName().stringValue()) &&
+                                    "()Z".equals(method.methodType().stringValue())) {
+                                System.out.println("isHeadless removed from java.awt.GraphicsEnvironment.");
+                                return;
+                            }
+                        }
+                        classBuilder.with(element);
+                    });
+                } catch (Exception e) {
+                    e.printStackTrace();
+                    return null;
                 }
-                return null;
             }
         });
     }
diff --git a/test/jdk/java/awt/Headless/HeadlessMalfunctionTest.java b/test/jdk/java/awt/Headless/HeadlessMalfunctionTest.java
index 1d1a9c0eec0..61ebf1df3e8 100644
--- a/test/jdk/java/awt/Headless/HeadlessMalfunctionTest.java
+++ b/test/jdk/java/awt/Headless/HeadlessMalfunctionTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2024, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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,12 +33,11 @@ import java.nio.file.Path;
  * @bug 8336382
  * @summary Test that in absence of isHeadless method, the JDK throws a meaningful error message.
  * @library /test/lib
- * @modules java.base/jdk.internal.org.objectweb.asm
+ * @requires os.family == "linux"
  * @build HeadlessMalfunctionAgent
  * @run driver  jdk.test.lib.helpers.ClassFileInstaller
  *              HeadlessMalfunctionAgent
  *              HeadlessMalfunctionAgent$1
- *              HeadlessMalfunctionAgent$1$1
  * @run driver HeadlessMalfunctionTest
  */
 public class HeadlessMalfunctionTest {
@@ -49,19 +48,20 @@ public class HeadlessMalfunctionTest {
         final ProcessBuilder pbJar = new ProcessBuilder()
                 .command(JDKToolFinder.getJDKTool("jar"), "cmf", "MANIFEST.MF", "agent.jar",
                         "HeadlessMalfunctionAgent.class",
-                        "HeadlessMalfunctionAgent$1.class",
-                        "HeadlessMalfunctionAgent$1$1.class");
+                        "HeadlessMalfunctionAgent$1.class");
         ProcessTools.executeProcess(pbJar).shouldHaveExitValue(0);
 
         // Run test
         final ProcessBuilder pbJava = ProcessTools.createTestJavaProcessBuilder(
-                "--add-opens",
-                "java.base/jdk.internal.org.objectweb.asm=ALL-UNNAMED",
                 "-javaagent:agent.jar",
                 "HeadlessMalfunctionTest$Runner"
         );
         final OutputAnalyzer output = ProcessTools.executeProcess(pbJava);
         // Unpatched JDK logs: "FATAL ERROR in native method: Could not allocate library name"
+        // Patched should mention that isHeadless is missing, log message differs between OSes;
+        // e.g. LWCToolkit toolkit path on MacOS and Win32GraphicsEnvironment code path on Windows
+        // logs "java.lang.NoSuchMethodError: 'boolean java.awt.GraphicsEnvironment.isHeadless()'",
+        // whereas Linux logs "FATAL ERROR in native method: GetStaticMethodID isHeadless failed"
         output.shouldContain("FATAL ERROR in native method: GetStaticMethodID isHeadless failed");
         output.shouldNotHaveExitValue(0);
     }

From 4412c079fccefbb235b22651206089f5bac47d18 Mon Sep 17 00:00:00 2001
From: Jaikiran Pai <jpai@openjdk.org>
Date: Wed, 12 Mar 2025 06:55:04 +0000
Subject: [PATCH 308/587] 8351639: Improve debuggability of
 test/langtools/jdk/jshell/JdiHangingListenExecutionControlTest.java test

Reviewed-by: jlahoda
---
 .../jdk/jshell/JdiHangingListenExecutionControlTest.java  | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/test/langtools/jdk/jshell/JdiHangingListenExecutionControlTest.java b/test/langtools/jdk/jshell/JdiHangingListenExecutionControlTest.java
index 6f1c86b950c..2e9b04a634b 100644
--- a/test/langtools/jdk/jshell/JdiHangingListenExecutionControlTest.java
+++ b/test/langtools/jdk/jshell/JdiHangingListenExecutionControlTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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,11 @@ public class JdiHangingListenExecutionControlTest {
             System.err.printf("Unexpected return value: %s\n",
                     HangingRemoteAgent.state(false, null).eval("33;"));
         } catch (IllegalStateException ex) {
-            assertTrue(ex.getMessage().startsWith(EXPECTED_ERROR), ex.getMessage());
+            if (!ex.getMessage().startsWith(EXPECTED_ERROR)) {
+                // unexpected message in the exception, rethrow the original exception
+                throw ex;
+            }
+            // received expected exception
             return;
         }
         fail("Expected IllegalStateException");

From 1d147ccb4cfcb1da23664ac941e56ac542a7ac61 Mon Sep 17 00:00:00 2001
From: Aleksey Shipilev <shade@openjdk.org>
Date: Wed, 12 Mar 2025 07:20:48 +0000
Subject: [PATCH 309/587] 8351484: Race condition in max stats in
 MonitorList::add

Reviewed-by: pchilanomate, zgu
---
 src/hotspot/share/runtime/synchronizer.cpp    | 12 ++++--
 src/hotspot/share/runtime/synchronizer.hpp    |  1 +
 .../gtest/runtime/test_synchronizer.cpp       | 39 +++++++++++++++++++
 3 files changed, 48 insertions(+), 4 deletions(-)

diff --git a/src/hotspot/share/runtime/synchronizer.cpp b/src/hotspot/share/runtime/synchronizer.cpp
index e4ecf4d8b27..e3faba0754d 100644
--- a/src/hotspot/share/runtime/synchronizer.cpp
+++ b/src/hotspot/share/runtime/synchronizer.cpp
@@ -76,10 +76,14 @@ void MonitorList::add(ObjectMonitor* m) {
     m->set_next_om(head);
   } while (Atomic::cmpxchg(&_head, head, m) != head);
 
-  size_t count = Atomic::add(&_count, 1u);
-  if (count > max()) {
-    Atomic::inc(&_max);
-  }
+  size_t count = Atomic::add(&_count, 1u, memory_order_relaxed);
+  size_t old_max;
+  do {
+    old_max = Atomic::load(&_max);
+    if (count <= old_max) {
+      break;
+    }
+  } while (Atomic::cmpxchg(&_max, old_max, count, memory_order_relaxed) != old_max);
 }
 
 size_t MonitorList::count() const {
diff --git a/src/hotspot/share/runtime/synchronizer.hpp b/src/hotspot/share/runtime/synchronizer.hpp
index d3d1f4ee4ce..5d5a123a2b1 100644
--- a/src/hotspot/share/runtime/synchronizer.hpp
+++ b/src/hotspot/share/runtime/synchronizer.hpp
@@ -47,6 +47,7 @@ private:
   volatile size_t _max;
 
 public:
+  MonitorList() : _head(nullptr), _count(0), _max(0) {};
   void add(ObjectMonitor* monitor);
   size_t unlink_deflated(size_t deflated_count,
                          GrowableArray<ObjectMonitor*>* unlinked_list,
diff --git a/test/hotspot/gtest/runtime/test_synchronizer.cpp b/test/hotspot/gtest/runtime/test_synchronizer.cpp
index 165a0fe80ba..acda3566db3 100644
--- a/test/hotspot/gtest/runtime/test_synchronizer.cpp
+++ b/test/hotspot/gtest/runtime/test_synchronizer.cpp
@@ -21,9 +21,14 @@
  * questions.
  */
 
+#include "classfile/vmClasses.hpp"
 #include "memory/allocation.hpp"
+#include "memory/universe.hpp"
+#include "runtime/interfaceSupport.inline.hpp"
+#include "runtime/objectMonitor.hpp"
 #include "runtime/synchronizer.hpp"
 #include "runtime/vm_version.hpp"
+#include "threadHelper.inline.hpp"
 #include "unittest.hpp"
 
 class SynchronizerTest : public ::testing::Test {
@@ -66,3 +71,37 @@ TEST_VM(SynchronizerTest, sanity) {
             << "sharing.";
   }
 }
+
+TEST_VM(SynchronizerTest, monitorListStats) {
+  JavaThread* THREAD = JavaThread::current();
+  ThreadInVMfromNative invm(THREAD);
+  ResourceMark rm(THREAD);
+
+  // Something to reference in OM. It makes no difference which oop it is,
+  // as long as it is correct.
+  oop obj = vmClasses::Byte_klass()->allocate_instance(THREAD);
+
+  HandleMark hm(THREAD);
+  Handle h_obj(THREAD, obj);
+
+  // Test various combinations of thread counts, including single-threaded test.
+  static const int MIN_THREADS = 1;
+  static const int MAX_THREADS = 16;
+  static const int OM_PER_THREAD = 1000;
+
+  for (int threads = MIN_THREADS; threads <= MAX_THREADS; threads *= 2) {
+    MonitorList list;
+
+    auto work = [&](Thread*, int) {
+      for (int c = 0; c < OM_PER_THREAD; c++) {
+        list.add(new ObjectMonitor(h_obj()));
+      }
+    };
+    TestThreadGroup<decltype(work)> workers{work, threads};
+    workers.doit();
+    workers.join();
+
+    EXPECT_EQ(list.count(), (size_t)(threads*OM_PER_THREAD));
+    EXPECT_EQ(list.max(), (size_t)(threads*OM_PER_THREAD));
+  }
+}

From 1fe45265e446eeca5dc496085928ce20863a3172 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Manuel=20H=C3=A4ssig?= <manuel.hassig@oracle.com>
Date: Wed, 12 Mar 2025 08:43:58 +0000
Subject: [PATCH 310/587] 8350194: Last 2 parameters of ReturnNode::ReturnNode
 are swapped in the declaration

Reviewed-by: thartmann, epeter
---
 src/hotspot/share/opto/callnode.hpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/hotspot/share/opto/callnode.hpp b/src/hotspot/share/opto/callnode.hpp
index 2f1aad60e6f..1126db86cf6 100644
--- a/src/hotspot/share/opto/callnode.hpp
+++ b/src/hotspot/share/opto/callnode.hpp
@@ -116,7 +116,7 @@ public:
 // Return from subroutine node
 class ReturnNode : public Node {
 public:
-  ReturnNode( uint edges, Node *cntrl, Node *i_o, Node *memory, Node *retadr, Node *frameptr );
+  ReturnNode(uint edges, Node* cntrl, Node* i_o, Node* memory, Node* frameptr, Node* retadr);
   virtual int Opcode() const;
   virtual bool  is_CFG() const { return true; }
   virtual uint hash() const { return NO_HASH; }  // CFG nodes do not hash

From 4be502ea38b37d5fb532b64e5b82363805bfe657 Mon Sep 17 00:00:00 2001
From: David Linus Briemann <david.briemann@sap.com>
Date: Wed, 12 Mar 2025 10:22:44 +0000
Subject: [PATCH 311/587] 8350642: Interpreter: Upgrade CountBytecodes to 64
 bit on 64 bit platforms

Reviewed-by: lmesnik, mdoerr, shade
---
 .../templateInterpreterGenerator_aarch64.cpp  |  4 +-
 .../ppc/templateInterpreterGenerator_ppc.cpp  | 12 +--
 .../templateInterpreterGenerator_riscv.cpp    |  2 +-
 .../templateInterpreterGenerator_s390.cpp     |  6 +-
 .../x86/templateInterpreterGenerator_x86.cpp  |  9 +++
 .../share/interpreter/bytecodeHistogram.cpp   |  4 +-
 .../share/interpreter/bytecodeHistogram.hpp   |  4 +-
 .../share/interpreter/bytecodeTracer.cpp      |  4 +-
 src/hotspot/share/runtime/globals.hpp         |  6 +-
 src/hotspot/share/runtime/java.cpp            |  2 +-
 test/hotspot/jtreg/TEST.groups                |  1 +
 .../interpreter/CountBytecodesTest.java       | 77 +++++++++++++++++++
 12 files changed, 109 insertions(+), 22 deletions(-)
 create mode 100644 test/hotspot/jtreg/runtime/interpreter/CountBytecodesTest.java

diff --git a/src/hotspot/cpu/aarch64/templateInterpreterGenerator_aarch64.cpp b/src/hotspot/cpu/aarch64/templateInterpreterGenerator_aarch64.cpp
index fbe06a6d781..b84e793a935 100644
--- a/src/hotspot/cpu/aarch64/templateInterpreterGenerator_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/templateInterpreterGenerator_aarch64.cpp
@@ -2102,7 +2102,7 @@ address TemplateInterpreterGenerator::generate_trace_code(TosState state) {
 
 void TemplateInterpreterGenerator::count_bytecode() {
   __ mov(r10, (address) &BytecodeCounter::_counter_value);
-  __ atomic_addw(noreg, 1, r10);
+  __ atomic_add(noreg, 1, r10);
 }
 
 void TemplateInterpreterGenerator::histogram_bytecode(Template* t) {
@@ -2150,7 +2150,7 @@ void TemplateInterpreterGenerator::stop_interpreter_at() {
   __ mov(rscratch1, (address) &BytecodeCounter::_counter_value);
   __ ldr(rscratch1, Address(rscratch1));
   __ mov(rscratch2, StopInterpreterAt);
-  __ cmpw(rscratch1, rscratch2);
+  __ cmp(rscratch1, rscratch2);
   __ br(Assembler::NE, L);
   __ brk(0);
   __ bind(L);
diff --git a/src/hotspot/cpu/ppc/templateInterpreterGenerator_ppc.cpp b/src/hotspot/cpu/ppc/templateInterpreterGenerator_ppc.cpp
index f3614894390..14d7155b9e2 100644
--- a/src/hotspot/cpu/ppc/templateInterpreterGenerator_ppc.cpp
+++ b/src/hotspot/cpu/ppc/templateInterpreterGenerator_ppc.cpp
@@ -2328,11 +2328,11 @@ address TemplateInterpreterGenerator::generate_trace_code(TosState state) {
   // Support short-cut for TraceBytecodesAt.
   // Don't call into the VM if we don't want to trace to speed up things.
   Label Lskip_vm_call;
-  if (TraceBytecodesAt > 0 && TraceBytecodesAt < max_intx) {
+  if (TraceBytecodesAt > 0) {
     int offs1 = __ load_const_optimized(R11_scratch1, (address) &TraceBytecodesAt, R0, true);
     int offs2 = __ load_const_optimized(R12_scratch2, (address) &BytecodeCounter::_counter_value, R0, true);
     __ ld(R11_scratch1, offs1, R11_scratch1);
-    __ lwa(R12_scratch2, offs2, R12_scratch2);
+    __ ld(R12_scratch2, offs2, R12_scratch2);
     __ cmpd(CR0, R12_scratch2, R11_scratch1);
     __ blt(CR0, Lskip_vm_call);
   }
@@ -2346,7 +2346,7 @@ address TemplateInterpreterGenerator::generate_trace_code(TosState state) {
   __ mtlr(R31);
   __ pop(state);
 
-  if (TraceBytecodesAt > 0 && TraceBytecodesAt < max_intx) {
+  if (TraceBytecodesAt > 0) {
     __ bind(Lskip_vm_call);
   }
   __ blr();
@@ -2356,9 +2356,9 @@ address TemplateInterpreterGenerator::generate_trace_code(TosState state) {
 
 void TemplateInterpreterGenerator::count_bytecode() {
   int offs = __ load_const_optimized(R11_scratch1, (address) &BytecodeCounter::_counter_value, R12_scratch2, true);
-  __ lwz(R12_scratch2, offs, R11_scratch1);
+  __ ld(R12_scratch2, offs, R11_scratch1);
   __ addi(R12_scratch2, R12_scratch2, 1);
-  __ stw(R12_scratch2, offs, R11_scratch1);
+  __ std(R12_scratch2, offs, R11_scratch1);
 }
 
 void TemplateInterpreterGenerator::histogram_bytecode(Template* t) {
@@ -2407,7 +2407,7 @@ void TemplateInterpreterGenerator::stop_interpreter_at() {
   int offs1 = __ load_const_optimized(R11_scratch1, (address) &StopInterpreterAt, R0, true);
   int offs2 = __ load_const_optimized(R12_scratch2, (address) &BytecodeCounter::_counter_value, R0, true);
   __ ld(R11_scratch1, offs1, R11_scratch1);
-  __ lwa(R12_scratch2, offs2, R12_scratch2);
+  __ ld(R12_scratch2, offs2, R12_scratch2);
   __ cmpd(CR0, R12_scratch2, R11_scratch1);
   __ bne(CR0, L);
   __ illtrap();
diff --git a/src/hotspot/cpu/riscv/templateInterpreterGenerator_riscv.cpp b/src/hotspot/cpu/riscv/templateInterpreterGenerator_riscv.cpp
index 79de9becbae..3787c5812eb 100644
--- a/src/hotspot/cpu/riscv/templateInterpreterGenerator_riscv.cpp
+++ b/src/hotspot/cpu/riscv/templateInterpreterGenerator_riscv.cpp
@@ -1846,7 +1846,7 @@ address TemplateInterpreterGenerator::generate_trace_code(TosState state) {
 
 void TemplateInterpreterGenerator::count_bytecode() {
   __ mv(x7, (address) &BytecodeCounter::_counter_value);
-  __ atomic_addw(noreg, 1, x7);
+  __ atomic_add(noreg, 1, x7);
 }
 
 void TemplateInterpreterGenerator::histogram_bytecode(Template* t) {
diff --git a/src/hotspot/cpu/s390/templateInterpreterGenerator_s390.cpp b/src/hotspot/cpu/s390/templateInterpreterGenerator_s390.cpp
index 06ff4b363f5..e549434dc12 100644
--- a/src/hotspot/cpu/s390/templateInterpreterGenerator_s390.cpp
+++ b/src/hotspot/cpu/s390/templateInterpreterGenerator_s390.cpp
@@ -2329,7 +2329,7 @@ address TemplateInterpreterGenerator::generate_trace_code(TosState state) {
     // Skip runtime call, if the trace threshold is not yet reached.
     __ load_absolute_address(Z_tmp_1, (address)&BytecodeCounter::_counter_value);
     __ load_absolute_address(Z_tmp_2, (address)&TraceBytecodesAt);
-    __ load_sized_value(Z_tmp_1, Address(Z_tmp_1), 4, false /*signed*/);
+    __ load_sized_value(Z_tmp_1, Address(Z_tmp_1), 8, false /*signed*/);
     __ load_sized_value(Z_tmp_2, Address(Z_tmp_2), 8, false /*signed*/);
     __ compareU64_and_branch(Z_tmp_1, Z_tmp_2, Assembler::bcondLow, counter_below_trace_threshold);
   }
@@ -2359,7 +2359,7 @@ address TemplateInterpreterGenerator::generate_trace_code(TosState state) {
 // Make feasible for old CPUs.
 void TemplateInterpreterGenerator::count_bytecode() {
   __ load_absolute_address(Z_R1_scratch, (address) &BytecodeCounter::_counter_value);
-  __ add2mem_32(Address(Z_R1_scratch), 1, Z_R0_scratch);
+  __ add2mem_64(Address(Z_R1_scratch), 1, Z_R0_scratch);
 }
 
 void TemplateInterpreterGenerator::histogram_bytecode(Template * t) {
@@ -2406,7 +2406,7 @@ void TemplateInterpreterGenerator::stop_interpreter_at() {
 
   __ load_absolute_address(Z_tmp_1, (address)&BytecodeCounter::_counter_value);
   __ load_absolute_address(Z_tmp_2, (address)&StopInterpreterAt);
-  __ load_sized_value(Z_tmp_1, Address(Z_tmp_1), 4, false /*signed*/);
+  __ load_sized_value(Z_tmp_1, Address(Z_tmp_1), 8, false /*signed*/);
   __ load_sized_value(Z_tmp_2, Address(Z_tmp_2), 8, false /*signed*/);
   __ compareU64_and_branch(Z_tmp_1, Z_tmp_2, Assembler::bcondLow, L);
   assert(Z_tmp_1->is_nonvolatile(), "must be nonvolatile to preserve Z_tos");
diff --git a/src/hotspot/cpu/x86/templateInterpreterGenerator_x86.cpp b/src/hotspot/cpu/x86/templateInterpreterGenerator_x86.cpp
index 548243cba83..d912518e4b0 100644
--- a/src/hotspot/cpu/x86/templateInterpreterGenerator_x86.cpp
+++ b/src/hotspot/cpu/x86/templateInterpreterGenerator_x86.cpp
@@ -1874,7 +1874,11 @@ address TemplateInterpreterGenerator::generate_trace_code(TosState state) {
 }
 
 void TemplateInterpreterGenerator::count_bytecode() {
+  #ifndef _LP64
   __ incrementl(ExternalAddress((address) &BytecodeCounter::_counter_value), rscratch1);
+  #else
+  __ incrementq(ExternalAddress((address) &BytecodeCounter::_counter_value), rscratch1);
+  #endif
 }
 
 void TemplateInterpreterGenerator::histogram_bytecode(Template* t) {
@@ -1914,9 +1918,14 @@ void TemplateInterpreterGenerator::trace_bytecode(Template* t) {
 
 void TemplateInterpreterGenerator::stop_interpreter_at() {
   Label L;
+  #ifndef _LP64
   __ cmp32(ExternalAddress((address) &BytecodeCounter::_counter_value),
            StopInterpreterAt,
            rscratch1);
+  #else
+  __ mov64(rscratch1, StopInterpreterAt);
+  __ cmp64(rscratch1, ExternalAddress((address) &BytecodeCounter::_counter_value), rscratch2);
+  #endif
   __ jcc(Assembler::notEqual, L);
   __ int3();
   __ bind(L);
diff --git a/src/hotspot/share/interpreter/bytecodeHistogram.cpp b/src/hotspot/share/interpreter/bytecodeHistogram.cpp
index e416aa40e7b..cbc21f7a1f3 100644
--- a/src/hotspot/share/interpreter/bytecodeHistogram.cpp
+++ b/src/hotspot/share/interpreter/bytecodeHistogram.cpp
@@ -33,7 +33,7 @@
 
 // Implementation of BytecodeCounter
 
-int   BytecodeCounter::_counter_value = 0;
+uintx BytecodeCounter::_counter_value = 0;
 jlong BytecodeCounter::_reset_time    = 0;
 
 
@@ -55,7 +55,7 @@ double BytecodeCounter::frequency() {
 
 void BytecodeCounter::print() {
   tty->print_cr(
-    "%d bytecodes executed in %.1fs (%.3fMHz)",
+    "%zu bytecodes executed in %.1fs (%.3fMHz)",
     counter_value(),
     elapsed_time(),
     frequency() / 1000000.0
diff --git a/src/hotspot/share/interpreter/bytecodeHistogram.hpp b/src/hotspot/share/interpreter/bytecodeHistogram.hpp
index 214d074541f..dfa712f9f04 100644
--- a/src/hotspot/share/interpreter/bytecodeHistogram.hpp
+++ b/src/hotspot/share/interpreter/bytecodeHistogram.hpp
@@ -32,7 +32,7 @@
 
 class BytecodeCounter: AllStatic {
  private:
-  NOT_PRODUCT(static int   _counter_value;)
+  NOT_PRODUCT(static uintx _counter_value;)
   NOT_PRODUCT(static jlong _reset_time;)
 
   friend class TemplateInterpreterGenerator;
@@ -43,7 +43,7 @@ class BytecodeCounter: AllStatic {
   static void reset()                      PRODUCT_RETURN;
 
   // Counter info (all info since last reset)
-  static int    counter_value()            PRODUCT_RETURN0 NOT_PRODUCT({ return _counter_value; });
+  static uintx  counter_value()            PRODUCT_RETURN0 NOT_PRODUCT({ return _counter_value; });
   static double elapsed_time()             PRODUCT_RETURN0; // in seconds
   static double frequency()                PRODUCT_RETURN0; // bytecodes/seconds
 
diff --git a/src/hotspot/share/interpreter/bytecodeTracer.cpp b/src/hotspot/share/interpreter/bytecodeTracer.cpp
index f576ad2f07f..4115a2bede5 100644
--- a/src/hotspot/share/interpreter/bytecodeTracer.cpp
+++ b/src/hotspot/share/interpreter/bytecodeTracer.cpp
@@ -129,10 +129,10 @@ class BytecodePrinter {
       int bci = (int)(bcp - method->code_base());
       st->print("[%zu] ", Thread::current()->osthread()->thread_id_for_printing());
       if (Verbose) {
-        st->print("%8d  %4d  " INTPTR_FORMAT " " INTPTR_FORMAT " %s",
+        st->print("%8zu  %4d  " INTPTR_FORMAT " " INTPTR_FORMAT " %s",
             BytecodeCounter::counter_value(), bci, tos, tos2, Bytecodes::name(code));
       } else {
-        st->print("%8d  %4d  %s",
+        st->print("%8zu  %4d  %s",
             BytecodeCounter::counter_value(), bci, Bytecodes::name(code));
       }
       print_attributes(bci, st);
diff --git a/src/hotspot/share/runtime/globals.hpp b/src/hotspot/share/runtime/globals.hpp
index e58d8c2b5b1..bf5b2616265 100644
--- a/src/hotspot/share/runtime/globals.hpp
+++ b/src/hotspot/share/runtime/globals.hpp
@@ -1566,13 +1566,13 @@ const int ObjectAlignmentInBytes = 8;
           "Minimal number of lookupswitch entries for rewriting to binary " \
           "switch")                                                         \
                                                                             \
-  develop(intx, StopInterpreterAt, 0,                                       \
+  develop(uintx, StopInterpreterAt, 0,                                      \
           "Stop interpreter execution at specified bytecode number")        \
                                                                             \
-  develop(intx, TraceBytecodesAt, 0,                                        \
+  develop(uintx, TraceBytecodesAt, 0,                                       \
           "Trace bytecodes starting with specified bytecode number")        \
                                                                             \
-  develop(intx, TraceBytecodesStopAt, 0,                                    \
+  develop(uintx, TraceBytecodesStopAt, 0,                                   \
           "Stop bytecode tracing at the specified bytecode number")         \
                                                                             \
   /* Priorities */                                                          \
diff --git a/src/hotspot/share/runtime/java.cpp b/src/hotspot/share/runtime/java.cpp
index 45e63e90ffb..4aca8971cd8 100644
--- a/src/hotspot/share/runtime/java.cpp
+++ b/src/hotspot/share/runtime/java.cpp
@@ -231,7 +231,7 @@ static void print_method_invocation_histogram() {
 
 static void print_bytecode_count() {
   if (CountBytecodes || TraceBytecodes || StopInterpreterAt) {
-    tty->print_cr("[BytecodeCounter::counter_value = %d]", BytecodeCounter::counter_value());
+    tty->print_cr("[BytecodeCounter::counter_value = %zu]", BytecodeCounter::counter_value());
   }
 }
 
diff --git a/test/hotspot/jtreg/TEST.groups b/test/hotspot/jtreg/TEST.groups
index c71f5e2dfc9..71b9e497e25 100644
--- a/test/hotspot/jtreg/TEST.groups
+++ b/test/hotspot/jtreg/TEST.groups
@@ -363,6 +363,7 @@ tier1_runtime = \
  -runtime/ErrorHandling/ReattemptErrorTest.java \
  -runtime/ErrorHandling/TestHeapDumpOnOutOfMemoryError.java \
  -runtime/ErrorHandling/TimeoutInErrorHandlingTest.java \
+ -runtime/interpreter/CountBytecodesTest.java \
  -runtime/InvocationTests \
  -runtime/logging/MonitorMismatchTest.java \
  -runtime/memory/ReserveMemory.java \
diff --git a/test/hotspot/jtreg/runtime/interpreter/CountBytecodesTest.java b/test/hotspot/jtreg/runtime/interpreter/CountBytecodesTest.java
new file mode 100644
index 00000000000..f62627e4536
--- /dev/null
+++ b/test/hotspot/jtreg/runtime/interpreter/CountBytecodesTest.java
@@ -0,0 +1,77 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2025 SAP SE. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact 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 8350642
+ * @requires vm.debug & vm.bits == "64"
+ * @summary Test the output for CountBytecodes and validate that the counter
+ *          does not overflow for more than 2^32 bytecodes counted.
+ * @library /test/lib
+ * @run main/othervm/timeout=300 CountBytecodesTest
+ */
+
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import jdk.test.lib.Asserts;
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.process.ProcessTools;
+
+public class CountBytecodesTest {
+    private final static long iterations = (1L << 32) / 9;
+
+    public static void main(String args[]) throws Exception {
+        if (args.length == 1 && args[0].equals("test")) {
+            for (long i = 0; i < iterations; i++) {
+                // Just iterating is enough to execute and count bytecodes.
+                // According to javap -c this loop translates to the following 9 bytecodes:
+                // 19: lload_1
+                // 20: ldc2_w        #17
+                // 23: lcmp
+                // 24: ifge          34
+                // 27: lload_1
+                // 28: lconst_1
+                // 29: ladd
+                // 30: lstore_1
+                // 31: goto          19
+                //
+                // Thus we can divide the 2^32 by 9 to set the minimum number of iterations
+                // while maintaining execution of more than 2^32 bytecodes.
+            }
+        } else {
+            OutputAnalyzer output = ProcessTools.executeTestJava("-Xint", "-XX:+CountBytecodes", "CountBytecodesTest", "test");
+            output.shouldHaveExitValue(0);
+
+            // Output format: [BytecodeCounter::counter_value = 38676232802]
+            output.stdoutShouldContain("BytecodeCounter::counter_value");
+            String bytecodesStr = output.firstMatch("BytecodeCounter::counter_value\s*=\s*(\\d+)", 1);
+            long bytecodes = Long.parseLong(bytecodesStr);
+
+            System.out.println("Executed bytecodes: " + bytecodes);
+
+            Asserts.assertGTE(bytecodes, 4294967296L);
+        }
+    }
+}

From 84f87dd4e96bbea42b482a3a23383c8894a40868 Mon Sep 17 00:00:00 2001
From: Matthias Baesken <mbaesken@openjdk.org>
Date: Wed, 12 Mar 2025 12:21:28 +0000
Subject: [PATCH 312/587] 8351665: Remove unused UseNUMA in os_aix.cpp

Reviewed-by: mdoerr, jkern
---
 src/hotspot/os/aix/os_aix.cpp | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/src/hotspot/os/aix/os_aix.cpp b/src/hotspot/os/aix/os_aix.cpp
index 315c5fde157..aee15e4c55a 100644
--- a/src/hotspot/os/aix/os_aix.cpp
+++ b/src/hotspot/os/aix/os_aix.cpp
@@ -839,13 +839,6 @@ bool os::create_attached_thread(JavaThread* thread) {
 
   thread->set_osthread(osthread);
 
-  if (UseNUMA) {
-    int lgrp_id = os::numa_get_group_id();
-    if (lgrp_id != -1) {
-      thread->set_lgrp_id(lgrp_id);
-    }
-  }
-
   // initialize signal mask for this thread
   // and save the caller's signal mask
   PosixSignals::hotspot_sigmask(thread);

From 95b66d5a43a77b257a097afe5df369f92769abd2 Mon Sep 17 00:00:00 2001
From: Doug Simon <dnsimon@openjdk.org>
Date: Wed, 12 Mar 2025 12:31:37 +0000
Subject: [PATCH 313/587] 8351700: Remove code conditional on BarrierSetNMethod
 being null

Reviewed-by: shade, eosterlund, never
---
 src/hotspot/cpu/aarch64/aarch64.ad            | 36 +++++++++----------
 .../gc/shared/barrierSetAssembler_aarch64.cpp |  9 -----
 .../cpu/aarch64/stubGenerator_aarch64.cpp     |  5 +--
 src/hotspot/cpu/arm/arm.ad                    |  2 +-
 .../arm/gc/shared/barrierSetAssembler_arm.cpp |  4 ---
 src/hotspot/cpu/arm/stubGenerator_arm.cpp     |  6 +---
 .../ppc/gc/shared/barrierSetAssembler_ppc.cpp |  9 -----
 src/hotspot/cpu/ppc/stubGenerator_ppc.cpp     |  5 +--
 .../gc/shared/barrierSetAssembler_riscv.cpp   | 10 ------
 src/hotspot/cpu/riscv/riscv.ad                | 36 +++++++++----------
 src/hotspot/cpu/riscv/stubGenerator_riscv.cpp |  5 +--
 .../gc/shared/barrierSetAssembler_s390.cpp    |  4 ---
 src/hotspot/cpu/s390/stubGenerator_s390.cpp   |  5 +--
 src/hotspot/cpu/x86/c2_MacroAssembler_x86.cpp | 26 +++++++-------
 .../x86/gc/shared/barrierSetAssembler_x86.cpp | 12 -------
 src/hotspot/cpu/x86/stubGenerator_x86_32.cpp  |  5 +--
 src/hotspot/cpu/x86/stubGenerator_x86_64.cpp  |  5 +--
 src/hotspot/cpu/x86/x86_64.ad                 |  2 +-
 src/hotspot/share/code/codeCache.cpp          |  5 +--
 src/hotspot/share/code/nmethod.cpp            |  4 ---
 src/hotspot/share/gc/g1/g1NMethodClosure.cpp  |  8 ++---
 src/hotspot/share/gc/shared/barrierSet.cpp    |  4 +--
 .../gc/shenandoah/shenandoahBarrierSet.cpp    |  4 +--
 .../share/interpreter/interpreterRuntime.cpp  |  4 +--
 .../share/jvmci/jvmciCompilerToVMInit.cpp     | 12 +++----
 src/hotspot/share/jvmci/jvmciEnv.cpp          |  4 +--
 src/hotspot/share/memory/iterator.cpp         |  4 +--
 27 files changed, 69 insertions(+), 166 deletions(-)

diff --git a/src/hotspot/cpu/aarch64/aarch64.ad b/src/hotspot/cpu/aarch64/aarch64.ad
index b81fc82c3a4..5bfe697d12c 100644
--- a/src/hotspot/cpu/aarch64/aarch64.ad
+++ b/src/hotspot/cpu/aarch64/aarch64.ad
@@ -1742,7 +1742,7 @@ void MachPrologNode::format(PhaseRegAlloc *ra_, outputStream *st) const {
     st->print("mov  rscratch1, #%d\n\t", framesize - 2 * wordSize);
     st->print("sub  sp, sp, rscratch1");
   }
-  if (C->stub_function() == nullptr && BarrierSet::barrier_set()->barrier_set_nmethod() != nullptr) {
+  if (C->stub_function() == nullptr) {
     st->print("\n\t");
     st->print("ldr  rscratch1, [guard]\n\t");
     st->print("dmb ishld\n\t");
@@ -1792,25 +1792,23 @@ void MachPrologNode::emit(C2_MacroAssembler *masm, PhaseRegAlloc *ra_) const {
 
   if (C->stub_function() == nullptr) {
     BarrierSetAssembler* bs = BarrierSet::barrier_set()->barrier_set_assembler();
-    if (BarrierSet::barrier_set()->barrier_set_nmethod() != nullptr) {
-      // Dummy labels for just measuring the code size
-      Label dummy_slow_path;
-      Label dummy_continuation;
-      Label dummy_guard;
-      Label* slow_path = &dummy_slow_path;
-      Label* continuation = &dummy_continuation;
-      Label* guard = &dummy_guard;
-      if (!Compile::current()->output()->in_scratch_emit_size()) {
-        // Use real labels from actual stub when not emitting code for the purpose of measuring its size
-        C2EntryBarrierStub* stub = new (Compile::current()->comp_arena()) C2EntryBarrierStub();
-        Compile::current()->output()->add_stub(stub);
-        slow_path = &stub->entry();
-        continuation = &stub->continuation();
-        guard = &stub->guard();
-      }
-      // In the C2 code, we move the non-hot part of nmethod entry barriers out-of-line to a stub.
-      bs->nmethod_entry_barrier(masm, slow_path, continuation, guard);
+    // Dummy labels for just measuring the code size
+    Label dummy_slow_path;
+    Label dummy_continuation;
+    Label dummy_guard;
+    Label* slow_path = &dummy_slow_path;
+    Label* continuation = &dummy_continuation;
+    Label* guard = &dummy_guard;
+    if (!Compile::current()->output()->in_scratch_emit_size()) {
+      // Use real labels from actual stub when not emitting code for the purpose of measuring its size
+      C2EntryBarrierStub* stub = new (Compile::current()->comp_arena()) C2EntryBarrierStub();
+      Compile::current()->output()->add_stub(stub);
+      slow_path = &stub->entry();
+      continuation = &stub->continuation();
+      guard = &stub->guard();
     }
+    // In the C2 code, we move the non-hot part of nmethod entry barriers out-of-line to a stub.
+    bs->nmethod_entry_barrier(masm, slow_path, continuation, guard);
   }
 
   if (VerifyStackAtCalls) {
diff --git a/src/hotspot/cpu/aarch64/gc/shared/barrierSetAssembler_aarch64.cpp b/src/hotspot/cpu/aarch64/gc/shared/barrierSetAssembler_aarch64.cpp
index 828033975a0..869e26d3359 100644
--- a/src/hotspot/cpu/aarch64/gc/shared/barrierSetAssembler_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/gc/shared/barrierSetAssembler_aarch64.cpp
@@ -285,10 +285,6 @@ void BarrierSetAssembler::clear_patching_epoch() {
 void BarrierSetAssembler::nmethod_entry_barrier(MacroAssembler* masm, Label* slow_path, Label* continuation, Label* guard) {
   BarrierSetNMethod* bs_nm = BarrierSet::barrier_set()->barrier_set_nmethod();
 
-  if (bs_nm == nullptr) {
-    return;
-  }
-
   Label local_guard;
   Label skip_barrier;
   NMethodPatchingType patching_type = nmethod_patching_type();
@@ -361,11 +357,6 @@ void BarrierSetAssembler::nmethod_entry_barrier(MacroAssembler* masm, Label* slo
 }
 
 void BarrierSetAssembler::c2i_entry_barrier(MacroAssembler* masm) {
-  BarrierSetNMethod* bs = BarrierSet::barrier_set()->barrier_set_nmethod();
-  if (bs == nullptr) {
-    return;
-  }
-
   Label bad_call;
   __ cbz(rmethod, bad_call);
 
diff --git a/src/hotspot/cpu/aarch64/stubGenerator_aarch64.cpp b/src/hotspot/cpu/aarch64/stubGenerator_aarch64.cpp
index d5b23dc6843..7b8f5eca374 100644
--- a/src/hotspot/cpu/aarch64/stubGenerator_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/stubGenerator_aarch64.cpp
@@ -9900,10 +9900,7 @@ class StubGenerator: public StubCodeGenerator {
     // arraycopy stubs used by compilers
     generate_arraycopy_stubs();
 
-    BarrierSetNMethod* bs_nm = BarrierSet::barrier_set()->barrier_set_nmethod();
-    if (bs_nm != nullptr) {
-      StubRoutines::_method_entry_barrier = generate_method_entry_barrier();
-    }
+    StubRoutines::_method_entry_barrier = generate_method_entry_barrier();
 
     StubRoutines::aarch64::_spin_wait = generate_spin_wait();
 
diff --git a/src/hotspot/cpu/arm/arm.ad b/src/hotspot/cpu/arm/arm.ad
index 617745dee20..6a935c26d54 100644
--- a/src/hotspot/cpu/arm/arm.ad
+++ b/src/hotspot/cpu/arm/arm.ad
@@ -286,7 +286,7 @@ void MachPrologNode::format( PhaseRegAlloc *ra_, outputStream *st ) const {
     st->print   ("SUB    R_SP, R_SP, %zu", framesize);
   }
 
-  if (C->stub_function() == nullptr && BarrierSet::barrier_set()->barrier_set_nmethod() != nullptr) {
+  if (C->stub_function() == nullptr) {
     st->print("ldr t0, [guard]\n\t");
     st->print("ldr t1, [Rthread, #thread_disarmed_guard_value_offset]\n\t");
     st->print("cmp t0, t1\n\t");
diff --git a/src/hotspot/cpu/arm/gc/shared/barrierSetAssembler_arm.cpp b/src/hotspot/cpu/arm/gc/shared/barrierSetAssembler_arm.cpp
index 704ca71ce99..4492c9da33e 100644
--- a/src/hotspot/cpu/arm/gc/shared/barrierSetAssembler_arm.cpp
+++ b/src/hotspot/cpu/arm/gc/shared/barrierSetAssembler_arm.cpp
@@ -169,10 +169,6 @@ void BarrierSetAssembler::nmethod_entry_barrier(MacroAssembler* masm) {
   Register tmp0 = Rtemp;
   Register tmp1 = R5; // must be callee-save register
 
-  if (bs_nm == nullptr) {
-    return;
-  }
-
   // The are no GCs that require memory barrier on arm32 now
 #ifdef ASSERT
   NMethodPatchingType patching_type = nmethod_patching_type();
diff --git a/src/hotspot/cpu/arm/stubGenerator_arm.cpp b/src/hotspot/cpu/arm/stubGenerator_arm.cpp
index aad81e7891d..fc5bcb4e0e6 100644
--- a/src/hotspot/cpu/arm/stubGenerator_arm.cpp
+++ b/src/hotspot/cpu/arm/stubGenerator_arm.cpp
@@ -3176,11 +3176,7 @@ class StubGenerator: public StubCodeGenerator {
     // arraycopy stubs used by compilers
     generate_arraycopy_stubs();
 
-    BarrierSetNMethod* bs_nm = BarrierSet::barrier_set()->barrier_set_nmethod();
-    if (bs_nm != nullptr) {
-      StubRoutines::_method_entry_barrier = generate_method_entry_barrier();
-    }
-
+    StubRoutines::_method_entry_barrier = generate_method_entry_barrier();
   }
 
   void generate_compiler_stubs() {
diff --git a/src/hotspot/cpu/ppc/gc/shared/barrierSetAssembler_ppc.cpp b/src/hotspot/cpu/ppc/gc/shared/barrierSetAssembler_ppc.cpp
index fe10114a195..acf916c8c72 100644
--- a/src/hotspot/cpu/ppc/gc/shared/barrierSetAssembler_ppc.cpp
+++ b/src/hotspot/cpu/ppc/gc/shared/barrierSetAssembler_ppc.cpp
@@ -181,10 +181,6 @@ void BarrierSetAssembler::try_resolve_jobject_in_native(MacroAssembler* masm, Re
 
 void BarrierSetAssembler::nmethod_entry_barrier(MacroAssembler* masm, Register tmp) {
   BarrierSetNMethod* bs_nm = BarrierSet::barrier_set()->barrier_set_nmethod();
-  if (bs_nm == nullptr) {
-    return;
-  }
-
   assert_different_registers(tmp, R0);
 
   __ block_comment("nmethod_entry_barrier (nmethod_entry_barrier) {");
@@ -215,11 +211,6 @@ void BarrierSetAssembler::nmethod_entry_barrier(MacroAssembler* masm, Register t
 }
 
 void BarrierSetAssembler::c2i_entry_barrier(MacroAssembler *masm, Register tmp1, Register tmp2, Register tmp3) {
-  BarrierSetNMethod* bs_nm = BarrierSet::barrier_set()->barrier_set_nmethod();
-  if (bs_nm == nullptr) {
-    return;
-  }
-
   assert_different_registers(tmp1, tmp2, tmp3);
 
   __ block_comment("c2i_entry_barrier (c2i_entry_barrier) {");
diff --git a/src/hotspot/cpu/ppc/stubGenerator_ppc.cpp b/src/hotspot/cpu/ppc/stubGenerator_ppc.cpp
index 1749447d43b..fa356ec13ac 100644
--- a/src/hotspot/cpu/ppc/stubGenerator_ppc.cpp
+++ b/src/hotspot/cpu/ppc/stubGenerator_ppc.cpp
@@ -4881,10 +4881,7 @@ void generate_lookup_secondary_supers_table_stub() {
     StubRoutines::_verify_oop_subroutine_entry             = generate_verify_oop();
 
     // nmethod entry barriers for concurrent class unloading
-    BarrierSetNMethod* bs_nm = BarrierSet::barrier_set()->barrier_set_nmethod();
-    if (bs_nm != nullptr) {
-      StubRoutines::_method_entry_barrier            = generate_method_entry_barrier();
-    }
+    StubRoutines::_method_entry_barrier = generate_method_entry_barrier();
 
     // arraycopy stubs used by compilers
     generate_arraycopy_stubs();
diff --git a/src/hotspot/cpu/riscv/gc/shared/barrierSetAssembler_riscv.cpp b/src/hotspot/cpu/riscv/gc/shared/barrierSetAssembler_riscv.cpp
index c49c8406bef..d66a86c750a 100644
--- a/src/hotspot/cpu/riscv/gc/shared/barrierSetAssembler_riscv.cpp
+++ b/src/hotspot/cpu/riscv/gc/shared/barrierSetAssembler_riscv.cpp
@@ -226,11 +226,6 @@ void BarrierSetAssembler::clear_patching_epoch() {
 
 void BarrierSetAssembler::nmethod_entry_barrier(MacroAssembler* masm, Label* slow_path, Label* continuation, Label* guard) {
   BarrierSetNMethod* bs_nm = BarrierSet::barrier_set()->barrier_set_nmethod();
-
-  if (bs_nm == nullptr) {
-    return;
-  }
-
   Assembler::IncompressibleRegion ir(masm);  // Fixed length: see entry_barrier_offset()
 
   Label local_guard;
@@ -320,11 +315,6 @@ void BarrierSetAssembler::nmethod_entry_barrier(MacroAssembler* masm, Label* slo
 }
 
 void BarrierSetAssembler::c2i_entry_barrier(MacroAssembler* masm) {
-  BarrierSetNMethod* bs = BarrierSet::barrier_set()->barrier_set_nmethod();
-  if (bs == nullptr) {
-    return;
-  }
-
   Label bad_call;
   __ beqz(xmethod, bad_call);
 
diff --git a/src/hotspot/cpu/riscv/riscv.ad b/src/hotspot/cpu/riscv/riscv.ad
index b380e00999c..6ee1e284f2c 100644
--- a/src/hotspot/cpu/riscv/riscv.ad
+++ b/src/hotspot/cpu/riscv/riscv.ad
@@ -1348,7 +1348,7 @@ void MachPrologNode::format(PhaseRegAlloc *ra_, outputStream *st) const {
   if (PreserveFramePointer) { st->print("sub  fp, sp, #%d\n\t", 2 * wordSize); }
   st->print("sub sp, sp, #%d\n\t", framesize);
 
-  if (C->stub_function() == nullptr && BarrierSet::barrier_set()->barrier_set_nmethod() != nullptr) {
+  if (C->stub_function() == nullptr) {
     st->print("ld  t0, [guard]\n\t");
     st->print("membar LoadLoad\n\t");
     st->print("ld  t1, [xthread, #thread_disarmed_guard_value_offset]\n\t");
@@ -1398,25 +1398,23 @@ void MachPrologNode::emit(C2_MacroAssembler *masm, PhaseRegAlloc *ra_) const {
 
   if (C->stub_function() == nullptr) {
     BarrierSetAssembler* bs = BarrierSet::barrier_set()->barrier_set_assembler();
-    if (BarrierSet::barrier_set()->barrier_set_nmethod() != nullptr) {
-      // Dummy labels for just measuring the code size
-      Label dummy_slow_path;
-      Label dummy_continuation;
-      Label dummy_guard;
-      Label* slow_path = &dummy_slow_path;
-      Label* continuation = &dummy_continuation;
-      Label* guard = &dummy_guard;
-      if (!Compile::current()->output()->in_scratch_emit_size()) {
-        // Use real labels from actual stub when not emitting code for purpose of measuring its size
-        C2EntryBarrierStub* stub = new (Compile::current()->comp_arena()) C2EntryBarrierStub();
-        Compile::current()->output()->add_stub(stub);
-        slow_path = &stub->entry();
-        continuation = &stub->continuation();
-        guard = &stub->guard();
-      }
-      // In the C2 code, we move the non-hot part of nmethod entry barriers out-of-line to a stub.
-      bs->nmethod_entry_barrier(masm, slow_path, continuation, guard);
+    // Dummy labels for just measuring the code size
+    Label dummy_slow_path;
+    Label dummy_continuation;
+    Label dummy_guard;
+    Label* slow_path = &dummy_slow_path;
+    Label* continuation = &dummy_continuation;
+    Label* guard = &dummy_guard;
+    if (!Compile::current()->output()->in_scratch_emit_size()) {
+      // Use real labels from actual stub when not emitting code for purpose of measuring its size
+      C2EntryBarrierStub* stub = new (Compile::current()->comp_arena()) C2EntryBarrierStub();
+      Compile::current()->output()->add_stub(stub);
+      slow_path = &stub->entry();
+      continuation = &stub->continuation();
+      guard = &stub->guard();
     }
+    // In the C2 code, we move the non-hot part of nmethod entry barriers out-of-line to a stub.
+    bs->nmethod_entry_barrier(masm, slow_path, continuation, guard);
   }
 
   if (VerifyStackAtCalls) {
diff --git a/src/hotspot/cpu/riscv/stubGenerator_riscv.cpp b/src/hotspot/cpu/riscv/stubGenerator_riscv.cpp
index 249b871bd00..e9130590ae0 100644
--- a/src/hotspot/cpu/riscv/stubGenerator_riscv.cpp
+++ b/src/hotspot/cpu/riscv/stubGenerator_riscv.cpp
@@ -6544,10 +6544,7 @@ static const int64_t right_3_bits = right_n_bits(3);
     // arraycopy stubs used by compilers
     generate_arraycopy_stubs();
 
-    BarrierSetNMethod* bs_nm = BarrierSet::barrier_set()->barrier_set_nmethod();
-    if (bs_nm != nullptr) {
-      StubRoutines::_method_entry_barrier = generate_method_entry_barrier();
-    }
+    StubRoutines::_method_entry_barrier = generate_method_entry_barrier();
 
 #ifdef COMPILER2
     if (UseSecondarySupersTable) {
diff --git a/src/hotspot/cpu/s390/gc/shared/barrierSetAssembler_s390.cpp b/src/hotspot/cpu/s390/gc/shared/barrierSetAssembler_s390.cpp
index d6fe10ac9c2..e78906708af 100644
--- a/src/hotspot/cpu/s390/gc/shared/barrierSetAssembler_s390.cpp
+++ b/src/hotspot/cpu/s390/gc/shared/barrierSetAssembler_s390.cpp
@@ -171,10 +171,6 @@ void BarrierSetAssembler::try_resolve_jobject_in_native(MacroAssembler* masm, Re
 
 void BarrierSetAssembler::nmethod_entry_barrier(MacroAssembler* masm) {
   BarrierSetNMethod* bs_nm = BarrierSet::barrier_set()->barrier_set_nmethod();
-  if (bs_nm == nullptr) {
-    return;
-  }
-
   __ block_comment("nmethod_entry_barrier (nmethod_entry_barrier) {");
 
     // Load jump addr:
diff --git a/src/hotspot/cpu/s390/stubGenerator_s390.cpp b/src/hotspot/cpu/s390/stubGenerator_s390.cpp
index f542c125b36..b46393f543e 100644
--- a/src/hotspot/cpu/s390/stubGenerator_s390.cpp
+++ b/src/hotspot/cpu/s390/stubGenerator_s390.cpp
@@ -3217,10 +3217,7 @@ class StubGenerator: public StubCodeGenerator {
     generate_arraycopy_stubs();
 
     // nmethod entry barriers for concurrent class unloading
-    BarrierSetNMethod* bs_nm = BarrierSet::barrier_set()->barrier_set_nmethod();
-    if (bs_nm != nullptr) {
-      StubRoutines::_method_entry_barrier = generate_method_entry_barrier();
-    }
+    StubRoutines::_method_entry_barrier = generate_method_entry_barrier();
 
 #ifdef COMPILER2
     if (UseSecondarySupersTable) {
diff --git a/src/hotspot/cpu/x86/c2_MacroAssembler_x86.cpp b/src/hotspot/cpu/x86/c2_MacroAssembler_x86.cpp
index d63f230b970..f78f45f6f0b 100644
--- a/src/hotspot/cpu/x86/c2_MacroAssembler_x86.cpp
+++ b/src/hotspot/cpu/x86/c2_MacroAssembler_x86.cpp
@@ -134,21 +134,19 @@ void C2_MacroAssembler::verified_entry(int framesize, int stack_bang_size, bool
   if (!is_stub) {
     BarrierSetAssembler* bs = BarrierSet::barrier_set()->barrier_set_assembler();
  #ifdef _LP64
-    if (BarrierSet::barrier_set()->barrier_set_nmethod() != nullptr) {
-      // We put the non-hot code of the nmethod entry barrier out-of-line in a stub.
-      Label dummy_slow_path;
-      Label dummy_continuation;
-      Label* slow_path = &dummy_slow_path;
-      Label* continuation = &dummy_continuation;
-      if (!Compile::current()->output()->in_scratch_emit_size()) {
-        // Use real labels from actual stub when not emitting code for the purpose of measuring its size
-        C2EntryBarrierStub* stub = new (Compile::current()->comp_arena()) C2EntryBarrierStub();
-        Compile::current()->output()->add_stub(stub);
-        slow_path = &stub->entry();
-        continuation = &stub->continuation();
-      }
-      bs->nmethod_entry_barrier(this, slow_path, continuation);
+    // We put the non-hot code of the nmethod entry barrier out-of-line in a stub.
+    Label dummy_slow_path;
+    Label dummy_continuation;
+    Label* slow_path = &dummy_slow_path;
+    Label* continuation = &dummy_continuation;
+    if (!Compile::current()->output()->in_scratch_emit_size()) {
+      // Use real labels from actual stub when not emitting code for the purpose of measuring its size
+      C2EntryBarrierStub* stub = new (Compile::current()->comp_arena()) C2EntryBarrierStub();
+      Compile::current()->output()->add_stub(stub);
+      slow_path = &stub->entry();
+      continuation = &stub->continuation();
     }
+    bs->nmethod_entry_barrier(this, slow_path, continuation);
 #else
     // Don't bother with out-of-line nmethod entry barrier stub for x86_32.
     bs->nmethod_entry_barrier(this, nullptr /* slow_path */, nullptr /* continuation */);
diff --git a/src/hotspot/cpu/x86/gc/shared/barrierSetAssembler_x86.cpp b/src/hotspot/cpu/x86/gc/shared/barrierSetAssembler_x86.cpp
index 50dea42d5a3..5962609d08e 100644
--- a/src/hotspot/cpu/x86/gc/shared/barrierSetAssembler_x86.cpp
+++ b/src/hotspot/cpu/x86/gc/shared/barrierSetAssembler_x86.cpp
@@ -354,9 +354,6 @@ void BarrierSetAssembler::tlab_allocate(MacroAssembler* masm,
 #ifdef _LP64
 void BarrierSetAssembler::nmethod_entry_barrier(MacroAssembler* masm, Label* slow_path, Label* continuation) {
   BarrierSetNMethod* bs_nm = BarrierSet::barrier_set()->barrier_set_nmethod();
-  if (bs_nm == nullptr) {
-    return;
-  }
   Register thread = r15_thread;
   Address disarmed_addr(thread, in_bytes(bs_nm->thread_disarmed_guard_value_offset()));
   // The immediate is the last 4 bytes, so if we align the start of the cmp
@@ -381,10 +378,6 @@ void BarrierSetAssembler::nmethod_entry_barrier(MacroAssembler* masm, Label* slo
 #else
 void BarrierSetAssembler::nmethod_entry_barrier(MacroAssembler* masm, Label*, Label*) {
   BarrierSetNMethod* bs_nm = BarrierSet::barrier_set()->barrier_set_nmethod();
-  if (bs_nm == nullptr) {
-    return;
-  }
-
   Label continuation;
 
   Register tmp = rdi;
@@ -401,11 +394,6 @@ void BarrierSetAssembler::nmethod_entry_barrier(MacroAssembler* masm, Label*, La
 #endif
 
 void BarrierSetAssembler::c2i_entry_barrier(MacroAssembler* masm) {
-  BarrierSetNMethod* bs = BarrierSet::barrier_set()->barrier_set_nmethod();
-  if (bs == nullptr) {
-    return;
-  }
-
   Label bad_call;
   __ cmpptr(rbx, 0); // rbx contains the incoming method for c2i adapters.
   __ jcc(Assembler::equal, bad_call);
diff --git a/src/hotspot/cpu/x86/stubGenerator_x86_32.cpp b/src/hotspot/cpu/x86/stubGenerator_x86_32.cpp
index 27dc804a73d..9ec556777b0 100644
--- a/src/hotspot/cpu/x86/stubGenerator_x86_32.cpp
+++ b/src/hotspot/cpu/x86/stubGenerator_x86_32.cpp
@@ -4211,10 +4211,7 @@ class StubGenerator: public StubCodeGenerator {
     // arraycopy stubs used by compilers
     generate_arraycopy_stubs();
 
-    BarrierSetNMethod* bs_nm = BarrierSet::barrier_set()->barrier_set_nmethod();
-    if (bs_nm != nullptr) {
-      StubRoutines::_method_entry_barrier = generate_method_entry_barrier();
-    }
+    StubRoutines::_method_entry_barrier = generate_method_entry_barrier();
   }
 
   void generate_compiler_stubs() {
diff --git a/src/hotspot/cpu/x86/stubGenerator_x86_64.cpp b/src/hotspot/cpu/x86/stubGenerator_x86_64.cpp
index d2a0c81b2c9..a27748ac472 100644
--- a/src/hotspot/cpu/x86/stubGenerator_x86_64.cpp
+++ b/src/hotspot/cpu/x86/stubGenerator_x86_64.cpp
@@ -4136,10 +4136,7 @@ void StubGenerator::generate_final_stubs() {
   // arraycopy stubs used by compilers
   generate_arraycopy_stubs();
 
-  BarrierSetNMethod* bs_nm = BarrierSet::barrier_set()->barrier_set_nmethod();
-  if (bs_nm != nullptr) {
-    StubRoutines::_method_entry_barrier = generate_method_entry_barrier();
-  }
+  StubRoutines::_method_entry_barrier = generate_method_entry_barrier();
 
 #ifdef COMPILER2
   if (UseSecondarySupersTable) {
diff --git a/src/hotspot/cpu/x86/x86_64.ad b/src/hotspot/cpu/x86/x86_64.ad
index 8cc4a970bfd..1116908eff1 100644
--- a/src/hotspot/cpu/x86/x86_64.ad
+++ b/src/hotspot/cpu/x86/x86_64.ad
@@ -818,7 +818,7 @@ void MachPrologNode::format(PhaseRegAlloc* ra_, outputStream* st) const {
     st->print("# stack alignment check");
 #endif
   }
-  if (C->stub_function() != nullptr && BarrierSet::barrier_set()->barrier_set_nmethod() != nullptr) {
+  if (C->stub_function() != nullptr) {
     st->print("\n\t");
     st->print("cmpl    [r15_thread + #disarmed_guard_value_offset], #disarmed_guard_value\t");
     st->print("\n\t");
diff --git a/src/hotspot/share/code/codeCache.cpp b/src/hotspot/share/code/codeCache.cpp
index 3b237e9643e..e59417466d6 100644
--- a/src/hotspot/share/code/codeCache.cpp
+++ b/src/hotspot/share/code/codeCache.cpp
@@ -868,10 +868,7 @@ void CodeCache::on_gc_marking_cycle_finish() {
 }
 
 void CodeCache::arm_all_nmethods() {
-  BarrierSetNMethod* bs_nm = BarrierSet::barrier_set()->barrier_set_nmethod();
-  if (bs_nm != nullptr) {
-    bs_nm->arm_all_nmethods();
-  }
+  BarrierSet::barrier_set()->barrier_set_nmethod()->arm_all_nmethods();
 }
 
 // Mark nmethods for unloading if they contain otherwise unreachable oops.
diff --git a/src/hotspot/share/code/nmethod.cpp b/src/hotspot/share/code/nmethod.cpp
index 23a2dee4d35..9a7a16d1ee3 100644
--- a/src/hotspot/share/code/nmethod.cpp
+++ b/src/hotspot/share/code/nmethod.cpp
@@ -688,10 +688,6 @@ address nmethod::oops_reloc_begin() const {
     return code_begin() + frame_complete_offset();
   }
 
-  // It is not safe to read oops concurrently using entry barriers, if their
-  // location depend on whether the nmethod is entrant or not.
-  // assert(BarrierSet::barrier_set()->barrier_set_nmethod() == nullptr, "Not safe oop scan");
-
   address low_boundary = verified_entry_point();
   if (!is_in_use()) {
     low_boundary += NativeJump::instruction_size;
diff --git a/src/hotspot/share/gc/g1/g1NMethodClosure.cpp b/src/hotspot/share/gc/g1/g1NMethodClosure.cpp
index 8dca2d7cccf..8dc817f1452 100644
--- a/src/hotspot/share/gc/g1/g1NMethodClosure.cpp
+++ b/src/hotspot/share/gc/g1/g1NMethodClosure.cpp
@@ -84,9 +84,7 @@ void G1NMethodClosure::do_evacuation_and_fixup(nmethod* nm) {
     nm->mark_as_maybe_on_stack();
 
     BarrierSetNMethod* bs_nm = BarrierSet::barrier_set()->barrier_set_nmethod();
-    if (bs_nm != nullptr) {
-      bs_nm->disarm(nm);
-    }
+    bs_nm->disarm(nm);
   }
 
   nm->fix_oop_relocations();
@@ -100,9 +98,7 @@ void G1NMethodClosure::do_marking(nmethod* nm) {
   nm->mark_as_maybe_on_stack();
 
   BarrierSetNMethod* bs_nm = BarrierSet::barrier_set()->barrier_set_nmethod();
-  if (bs_nm != nullptr) {
-    bs_nm->disarm(nm);
-  }
+  bs_nm->disarm(nm);
 
   // The oops were only marked, no need to update oop relocations.
 }
diff --git a/src/hotspot/share/gc/shared/barrierSet.cpp b/src/hotspot/share/gc/shared/barrierSet.cpp
index 65ad476adc4..a30b23ce2d9 100644
--- a/src/hotspot/share/gc/shared/barrierSet.cpp
+++ b/src/hotspot/share/gc/shared/barrierSet.cpp
@@ -86,9 +86,7 @@ BarrierSet::BarrierSet(BarrierSetAssembler* barrier_set_assembler,
 
 void BarrierSet::on_thread_attach(Thread* thread) {
   BarrierSetNMethod* bs_nm = barrier_set_nmethod();
-  if (bs_nm != nullptr) {
-    thread->set_nmethod_disarmed_guard_value(bs_nm->disarmed_guard_value());
-  }
+  thread->set_nmethod_disarmed_guard_value(bs_nm->disarmed_guard_value());
 }
 
 // Called from init.cpp
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahBarrierSet.cpp b/src/hotspot/share/gc/shenandoah/shenandoahBarrierSet.cpp
index 7241869de56..446e1914407 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahBarrierSet.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahBarrierSet.cpp
@@ -125,9 +125,7 @@ void ShenandoahBarrierSet::on_thread_attach(Thread *thread) {
     ShenandoahThreadLocalData::initialize_gclab(thread);
 
     BarrierSetNMethod* bs_nm = barrier_set_nmethod();
-    if (bs_nm != nullptr) {
-      thread->set_nmethod_disarmed_guard_value(bs_nm->disarmed_guard_value());
-    }
+    thread->set_nmethod_disarmed_guard_value(bs_nm->disarmed_guard_value());
 
     if (ShenandoahStackWatermarkBarrier) {
       JavaThread* const jt = JavaThread::cast(thread);
diff --git a/src/hotspot/share/interpreter/interpreterRuntime.cpp b/src/hotspot/share/interpreter/interpreterRuntime.cpp
index 2377c748684..52eab4f796e 100644
--- a/src/hotspot/share/interpreter/interpreterRuntime.cpp
+++ b/src/hotspot/share/interpreter/interpreterRuntime.cpp
@@ -1033,7 +1033,7 @@ nmethod* InterpreterRuntime::frequency_counter_overflow(JavaThread* current, add
     int bci = method->bci_from(last_frame.bcp());
     nm = method->lookup_osr_nmethod_for(bci, CompLevel_none, false);
     BarrierSetNMethod* bs_nm = BarrierSet::barrier_set()->barrier_set_nmethod();
-    if (nm != nullptr && bs_nm != nullptr) {
+    if (nm != nullptr) {
       // in case the transition passed a safepoint we need to barrier this again
       if (!bs_nm->nmethod_osr_entry_barrier(nm)) {
         nm = nullptr;
@@ -1074,7 +1074,7 @@ JRT_ENTRY(nmethod*,
   nmethod* osr_nm = CompilationPolicy::event(method, method, branch_bci, bci, CompLevel_none, nullptr, CHECK_NULL);
 
   BarrierSetNMethod* bs_nm = BarrierSet::barrier_set()->barrier_set_nmethod();
-  if (osr_nm != nullptr && bs_nm != nullptr) {
+  if (osr_nm != nullptr) {
     if (!bs_nm->nmethod_osr_entry_barrier(osr_nm)) {
       osr_nm = nullptr;
     }
diff --git a/src/hotspot/share/jvmci/jvmciCompilerToVMInit.cpp b/src/hotspot/share/jvmci/jvmciCompilerToVMInit.cpp
index a2f6f7f6d52..a729e34a279 100644
--- a/src/hotspot/share/jvmci/jvmciCompilerToVMInit.cpp
+++ b/src/hotspot/share/jvmci/jvmciCompilerToVMInit.cpp
@@ -165,13 +165,11 @@ void CompilerToVM::Data::initialize(JVMCI_TRAPS) {
   SharedRuntime_throw_delayed_StackOverflowError_entry = SharedRuntime::throw_delayed_StackOverflowError_entry();
 
   BarrierSetNMethod* bs_nm = BarrierSet::barrier_set()->barrier_set_nmethod();
-  if (bs_nm != nullptr) {
-    thread_disarmed_guard_value_offset = in_bytes(bs_nm->thread_disarmed_guard_value_offset());
-    nmethod_entry_barrier = StubRoutines::method_entry_barrier();
-    BarrierSetAssembler* bs_asm = BarrierSet::barrier_set()->barrier_set_assembler();
-    AARCH64_ONLY(BarrierSetAssembler_nmethod_patching_type = (int) bs_asm->nmethod_patching_type());
-    AARCH64_ONLY(BarrierSetAssembler_patching_epoch_addr = bs_asm->patching_epoch_addr());
-  }
+  thread_disarmed_guard_value_offset = in_bytes(bs_nm->thread_disarmed_guard_value_offset());
+  nmethod_entry_barrier = StubRoutines::method_entry_barrier();
+  BarrierSetAssembler* bs_asm = BarrierSet::barrier_set()->barrier_set_assembler();
+  AARCH64_ONLY(BarrierSetAssembler_nmethod_patching_type = (int) bs_asm->nmethod_patching_type());
+  AARCH64_ONLY(BarrierSetAssembler_patching_epoch_addr = bs_asm->patching_epoch_addr());
 
 #if INCLUDE_ZGC
   if (UseZGC) {
diff --git a/src/hotspot/share/jvmci/jvmciEnv.cpp b/src/hotspot/share/jvmci/jvmciEnv.cpp
index 78f5bca4769..e628a1b2e51 100644
--- a/src/hotspot/share/jvmci/jvmciEnv.cpp
+++ b/src/hotspot/share/jvmci/jvmciEnv.cpp
@@ -1864,9 +1864,7 @@ CodeBlob* JVMCIEnv::get_code_blob(JVMCIObject obj) {
 
 void JVMCINMethodHandle::set_nmethod(nmethod* nm) {
   BarrierSetNMethod* bs_nm = BarrierSet::barrier_set()->barrier_set_nmethod();
-  if (bs_nm != nullptr) {
-    bs_nm->nmethod_entry_barrier(nm);
-  }
+  bs_nm->nmethod_entry_barrier(nm);
   _thread->set_live_nmethod(nm);
 }
 
diff --git a/src/hotspot/share/memory/iterator.cpp b/src/hotspot/share/memory/iterator.cpp
index 9569822e03f..961130c2b3f 100644
--- a/src/hotspot/share/memory/iterator.cpp
+++ b/src/hotspot/share/memory/iterator.cpp
@@ -58,9 +58,7 @@ void MarkingNMethodClosure::do_nmethod(nmethod* nm) {
       nm->mark_as_maybe_on_stack();
 
       BarrierSetNMethod* bs_nm = BarrierSet::barrier_set()->barrier_set_nmethod();
-      if (bs_nm != nullptr) {
-        bs_nm->disarm(nm);
-      }
+      bs_nm->disarm(nm);
     }
 
     if (_fix_relocations) {

From 3b189e0e78c867b75e984bfaabc92d12b9ff2b9e Mon Sep 17 00:00:00 2001
From: Hamlin Li <mli@openjdk.org>
Date: Wed, 12 Mar 2025 13:24:42 +0000
Subject: [PATCH 314/587] 8351345: [IR Framework] Improve reported disabled IR
 verification messages

Reviewed-by: chagedorn, epeter
---
 .../lib/ir_framework/TestFramework.java       | 62 ++++++++++++-------
 1 file changed, 39 insertions(+), 23 deletions(-)

diff --git a/test/hotspot/jtreg/compiler/lib/ir_framework/TestFramework.java b/test/hotspot/jtreg/compiler/lib/ir_framework/TestFramework.java
index 889bd39413b..919380cd91c 100644
--- a/test/hotspot/jtreg/compiler/lib/ir_framework/TestFramework.java
+++ b/test/hotspot/jtreg/compiler/lib/ir_framework/TestFramework.java
@@ -593,27 +593,42 @@ public class TestFramework {
      * Disable IR verification completely in certain cases.
      */
     private void disableIRVerificationIfNotFeasible() {
-        if (irVerificationPossible) {
-            irVerificationPossible = Platform.isDebugBuild() && !Platform.isInt() && !Platform.isComp();
-            if (!irVerificationPossible) {
-                System.out.println("IR verification disabled due to not running a debug build (required for PrintIdeal" +
-                                   "and PrintOptoAssembly), running with -Xint, or -Xcomp (use warm-up of 0 instead)");
-                return;
-            }
-
-            irVerificationPossible = hasIRAnnotations();
-            if (!irVerificationPossible) {
-                System.out.println("IR verification disabled due to test " + testClass + " not specifying any @IR annotations");
-                return;
-            }
-
-            // No IR verification is done if additional non-whitelisted JTreg VM or Javaoptions flag is specified.
-            irVerificationPossible = onlyWhitelistedJTregVMAndJavaOptsFlags();
-            if (!irVerificationPossible) {
-                System.out.println("IR verification disabled due to using non-whitelisted JTreg VM or Javaoptions flag(s)."
-                                   + System.lineSeparator());
-            }
+        if (!irVerificationPossible) {
+            return;
         }
+
+        boolean debugTest = Platform.isDebugBuild();
+        boolean intTest = !Platform.isInt();
+        boolean compTest = !Platform.isComp();
+        boolean irTest = hasIRAnnotations();
+        // No IR verification is done if additional non-whitelisted JTreg VM or Javaoptions flag is specified.
+        List<String> nonWhiteListedFlags = anyNonWhitelistedJTregVMAndJavaOptsFlags();
+        boolean nonWhiteListedTest = nonWhiteListedFlags.isEmpty();
+
+        irVerificationPossible = debugTest && intTest && compTest && irTest && nonWhiteListedTest;
+        if (irVerificationPossible) {
+            return;
+        }
+
+        System.out.println("IR verification disabled due to the following reason(s):");
+        if (!debugTest) {
+            System.out.println("- Not running a debug build (required for PrintIdeal and PrintOptoAssembly)");
+        }
+        if (!intTest) {
+            System.out.println("- Running with -Xint (no compilations)");
+        }
+        if (!compTest) {
+            System.out.println("- Running with -Xcomp (use warm-up of 0 instead)");
+        }
+        if (!irTest) {
+            System.out.println("- Test " + testClass + " not specifying any @IR annotations");
+        }
+        if (!nonWhiteListedTest) {
+            System.out.println("- Using non-whitelisted JTreg VM or Javaoptions flag(s):");
+            nonWhiteListedFlags.forEach((f) -> System.out.println("  - " + f));
+        }
+
+        System.out.println("");
     }
 
     /**
@@ -741,18 +756,19 @@ public class TestFramework {
         return Arrays.stream(testClass.getDeclaredMethods()).anyMatch(m -> m.getAnnotationsByType(IR.class).length > 0);
     }
 
-    private boolean onlyWhitelistedJTregVMAndJavaOptsFlags() {
+    private List<String> anyNonWhitelistedJTregVMAndJavaOptsFlags() {
         List<String> flags = Arrays.stream(Utils.getTestJavaOpts())
                                    .map(s -> s.replaceFirst("-XX:[+|-]?|-(?=[^D|^e])", ""))
                                    .collect(Collectors.toList());
+        List<String> nonWhiteListedFlags = new ArrayList();
         for (String flag : flags) {
             // Property flags (prefix -D), -ea and -esa are whitelisted.
             if (!flag.startsWith("-D") && !flag.startsWith("-e") && JTREG_WHITELIST_FLAGS.stream().noneMatch(flag::contains)) {
                 // Found VM flag that is not whitelisted
-                return false;
+                nonWhiteListedFlags.add(flag);
             }
         }
-        return true;
+        return nonWhiteListedFlags;
     }
 
     private void runTestVM(List<String> additionalFlags) {

From a21fa463c4f8d067c18c09a072f3cdfa772aea5e Mon Sep 17 00:00:00 2001
From: Jiangli Zhou <jiangli@openjdk.org>
Date: Wed, 12 Mar 2025 14:40:43 +0000
Subject: [PATCH 315/587] 8351309:
 test/hotspot/jtreg/runtime/posixSig/TestPosixSig.java fails on static-jdk

Reviewed-by: manc, ihse, stuefe
---
 make/modules/java.base/Lib.gmk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/make/modules/java.base/Lib.gmk b/make/modules/java.base/Lib.gmk
index 63a6b521e15..84ee309dadd 100644
--- a/make/modules/java.base/Lib.gmk
+++ b/make/modules/java.base/Lib.gmk
@@ -124,6 +124,7 @@ ifeq ($(call isTargetOsType, unix), true)
       DISABLED_WARNINGS_clang_jsig.c := unused-but-set-variable, \
       LIBS_linux := $(LIBDL), \
       LIBS_aix := $(LIBDL), \
+      ONLY_EXPORTED := true, \
   ))
 
   TARGETS += $(BUILD_LIBJSIG)

From f16a74260f329ccef51faa2e375bce5947057a49 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hannes=20Walln=C3=B6fer?= <hannesw@openjdk.org>
Date: Wed, 12 Mar 2025 15:53:54 +0000
Subject: [PATCH 316/587] 8351626: Update remaining icons to SVG format

Reviewed-by: nbenalla, jjg
---
 .../doclets/formats/html/HtmlDoclet.java       |   6 ++++--
 .../doclets/formats/html/TableOfContents.java  |   9 +++++++--
 .../doclets/formats/html/resources/glass.png   | Bin 499 -> 0 bytes
 .../doclets/formats/html/resources/glass.svg   |  13 +++++++++++++
 .../doclets/formats/html/resources/left.svg    |  12 ++++++++++++
 .../doclets/formats/html/resources/right.svg   |  12 ++++++++++++
 .../formats/html/resources/stylesheet.css      |  17 ++++++++++++-----
 .../doclets/formats/html/resources/x.png       | Bin 394 -> 0 bytes
 .../doclets/formats/html/resources/x.svg       |  13 +++++++++++++
 .../doclets/toolkit/util/DocPaths.java         |  14 ++++++++++----
 .../jdk/javadoc/internal/html/Entity.java      |   2 --
 .../CheckStylesheetClasses.java                |   2 +-
 .../javadoc/doclet/testFonts/TestFonts.java    |   6 +++---
 .../testPassthruFiles/TestPassThruFiles.java   |   8 +++-----
 .../javadoc/doclet/testSearch/TestSearch.java  |   4 ++--
 .../doclet/testStylesheet/TestStylesheet.java  |   2 +-
 .../jdk/javadoc/tool/api/basic/APITest.java    |  12 +++++++-----
 17 files changed, 100 insertions(+), 32 deletions(-)
 delete mode 100644 src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/glass.png
 create mode 100644 src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/glass.svg
 create mode 100644 src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/left.svg
 create mode 100644 src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/right.svg
 delete mode 100644 src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/x.png
 create mode 100644 src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/x.svg

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 fefe0ab191c..46ae80e78bd 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
@@ -317,14 +317,16 @@ public class HtmlDoclet extends AbstractDoclet {
             copyResource(DocPaths.STYLESHEET, DocPaths.RESOURCE_FILES.resolve(DocPaths.STYLESHEET), true);
         }
         copyResource(DocPaths.SCRIPT_JS_TEMPLATE, DocPaths.SCRIPT_FILES.resolve(DocPaths.SCRIPT_JS), true);
+        copyResource(DocPaths.LEFT_SVG, DocPaths.RESOURCE_FILES.resolve(DocPaths.LEFT_SVG), true);
+        copyResource(DocPaths.RIGHT_SVG, DocPaths.RESOURCE_FILES.resolve(DocPaths.RIGHT_SVG), true);
         copyResource(DocPaths.CLIPBOARD_SVG, DocPaths.RESOURCE_FILES.resolve(DocPaths.CLIPBOARD_SVG), true);
         copyResource(DocPaths.LINK_SVG, DocPaths.RESOURCE_FILES.resolve(DocPaths.LINK_SVG), true);
 
         if (options.createIndex()) {
             copyResource(DocPaths.SEARCH_JS_TEMPLATE, DocPaths.SCRIPT_FILES.resolve(DocPaths.SEARCH_JS), true);
             copyResource(DocPaths.SEARCH_PAGE_JS, DocPaths.SCRIPT_FILES.resolve(DocPaths.SEARCH_PAGE_JS), true);
-            copyResource(DocPaths.GLASS_IMG, DocPaths.RESOURCE_FILES.resolve(DocPaths.GLASS_IMG), false);
-            copyResource(DocPaths.X_IMG, DocPaths.RESOURCE_FILES.resolve(DocPaths.X_IMG), false);
+            copyResource(DocPaths.GLASS_SVG, DocPaths.RESOURCE_FILES.resolve(DocPaths.GLASS_SVG), false);
+            copyResource(DocPaths.X_SVG, DocPaths.RESOURCE_FILES.resolve(DocPaths.X_SVG), false);
             // No newline replacement for JQuery files
             copyResource(DocPaths.JQUERY_DIR.resolve(DocPaths.JQUERY_JS),
                     DocPaths.SCRIPT_FILES.resolve(DocPaths.JQUERY_JS), false);
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/TableOfContents.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/TableOfContents.java
index 6bb1961c232..a80e0e22b54 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/TableOfContents.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/TableOfContents.java
@@ -25,6 +25,7 @@
 package jdk.javadoc.internal.doclets.formats.html;
 
 import jdk.javadoc.internal.doclets.formats.html.markup.HtmlStyles;
+import jdk.javadoc.internal.doclets.toolkit.util.DocPaths;
 import jdk.javadoc.internal.html.Content;
 import jdk.javadoc.internal.html.Entity;
 import jdk.javadoc.internal.html.HtmlAttr;
@@ -107,9 +108,13 @@ public class TableOfContents {
         content.add(listBuilder);
         content.add(HtmlTree.BUTTON(HtmlStyles.hideSidebar)
                 .add(HtmlTree.SPAN(writer.contents.hideSidebar).add(Entity.NO_BREAK_SPACE))
-                .add(Entity.LEFT_POINTING_ANGLE));
+                .add(HtmlTree.of(HtmlTag.IMG)
+                        .put(HtmlAttr.SRC, writer.pathToRoot.resolve(DocPaths.RESOURCE_FILES)
+                                .resolve(DocPaths.LEFT_SVG).getPath())));
         content.add(HtmlTree.BUTTON(HtmlStyles.showSidebar)
-                .add(Entity.RIGHT_POINTING_ANGLE)
+                .add(HtmlTree.of(HtmlTag.IMG)
+                        .put(HtmlAttr.SRC, writer.pathToRoot.resolve(DocPaths.RESOURCE_FILES)
+                                .resolve(DocPaths.RIGHT_SVG).getPath()))
                 .add(HtmlTree.SPAN(Entity.NO_BREAK_SPACE).add(writer.contents.showSidebar)));
         return content;
     }
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/glass.png b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/glass.png
deleted file mode 100644
index a7f591f467a1c0c949bbc510156a0c1afb860a6e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 499
zcmV<P0Sx|$P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUzl}SWFRCwBA{Qv(y0|-RU-){({%7EAb
zhy{T7ArP+x;@;(nj_(+707j4jK+Q=&_Dmpt1jH+W_!SWAfXoHr*Ffw7G~^Ce10v?_
zGXv7cfOshorvVlIgh>JoRsvExf%rEN>jUL}qZ_~k#FbE+Q;{`;0FZwVNX2n-^JoI;
zP;4#$8DIy*Yk-P>VN(DUKmPse7mx+ExD4O|;?E5D0Z5($mjO3`*anwQU^s{ZDK#Lz
zj>~{qyaIx5K!t%=G&2IJNzg!ChRpyLkO7}Ry!QaotAHAMpbB3AF(}|_f!G-oI|uK6
z`id_dumai5K%C3Y$;tKS_iqMPHg<*|-@e`liWLAggVM!zAP#@l;=c>S03;{#04Z~5
zN_+ss=Yg6*hTr59mzMwZ@+l~q!+?ft!fF66AXT#wWavHt30bZWFCK%!BNk}LN?0Hg
z1VF_nfs`Lm^DjYZ1(1uD0u4<h+6721i2zbdgk+VN-#xwu(wIh)0Z>CSIr)XAaq<Z=
pynB52BgqCp4Jm;}@p6Cw0|4^LpB(^sAf*5R002ovPDHLkV1hXO#b5vc

diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/glass.svg b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/glass.svg
new file mode 100644
index 00000000000..ff7df85e8f6
--- /dev/null
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/glass.svg
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+
+ Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl/
+-->
+
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 100">
+    <path d="M66.37 55.005C64.415 58.958 60.147 63.321 56.153 66l32.478 33.456L99.377 88.99Z" style="baseline-shift:baseline;display:inline;overflow:visible;opacity:1;vector-effect:none;fill:#1a73a8;stop-color:#000;stop-opacity:1"/>
+    <circle cx="35.072" cy="35.072" r="30.635" style="fill:none;fill-opacity:1;stroke:#1a73a8;stroke-width:8;stroke-dasharray:none;stroke-opacity:1"/>
+</svg>
\ No newline at end of file
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/left.svg b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/left.svg
new file mode 100644
index 00000000000..9a090bf55dc
--- /dev/null
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/left.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+
+ Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl/
+-->
+
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 100">
+    <path d="m35.763 5.058 38.675 36.885a12.596 12.596 90 0 1 0 18.23L35.763 97.058v-18.32l27.055-25.431a2.975 2.975 90.09 0 0 .007-4.33L35.763 23.38Z" style="fill:#000;stroke-width:.285806" transform="matrix(-1 0 0 1 108.812 -1.058)"/>
+</svg>
\ No newline at end of file
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/right.svg b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/right.svg
new file mode 100644
index 00000000000..4b54939c31b
--- /dev/null
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/right.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+
+ Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl/
+-->
+
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 100">
+    <path d="m35.763 5.058 38.675 36.885a12.596 12.596 90 0 1 0 18.23L35.763 97.058v-18.32l27.055-25.431a2.975 2.975 90.09 0 0 .007-4.33L35.763 23.38Z" style="fill:#000;stroke-width:.285806" transform="translate(-5.292 -1.058)"/>
+</svg>
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/stylesheet.css b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/stylesheet.css
index 725de35ec28..21d983ccf75 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/stylesheet.css
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/stylesheet.css
@@ -278,8 +278,10 @@ ol.sub-nav-list li {
     scroll-snap-align: start;
 }
 ol.sub-nav-list li:not(:first-child) {
-    list-style-type: "> ";
-    margin-left: 19px;
+    background: url("right.svg") no-repeat 3px;
+    background-size: 10px;
+    padding-left: 17px;
+    list-style: none;
 }
 ol.sub-nav-list a {
     padding: 3px;
@@ -455,6 +457,11 @@ dl.name-value > dd {
     padding: 6px 10px;
     white-space: nowrap;
 }
+.main-grid nav.toc button > img {
+    vertical-align: middle;
+    width: 16px;
+    height: 16px;
+}
 .main-grid nav.toc button.hide-sidebar {
     right: 0;
 }
@@ -997,10 +1004,10 @@ li.ui-static-link a, li.ui-static-link a:visited {
     padding-bottom: 5px;
 }
 input[type="text"] {
-    background-image:url('glass.png');
+    background-image:url('glass.svg');
     background-size:13px;
     background-repeat:no-repeat;
-    background-position:3px 5px;
+    background-position:3px 4px;
     background-color: var(--search-input-background-color);
     color: var(--search-input-text-color);
     border-color: var(--border-color);
@@ -1026,7 +1033,7 @@ input.filter-input {
 }
 input#reset-search, input.reset-filter {
     background-color: transparent;
-    background-image:url('x.png');
+    background-image:url('x.svg');
     background-repeat:no-repeat;
     background-size:contain;
     border:0;
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/x.png b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/x.png
deleted file mode 100644
index 30548a756e151be4e927e8d28c508cc5b3514bf3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 394
zcmV;50d@X~P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUzEJ;K`RCwBAZ10)C00gB#Tm-~f6~+1M
z8SsFP-icvAY7!8)0M$-mc5(A40dl&5m<Nahj~qXF-Nwq|Iu6a@Kx!Ef^8&FKQ0;pr
zAfpyZ4I2<I2PzD~p?N6~Gb0ICfegq6;=f3OtmuZ|&<xU(#{wi40r7tzo{yw}1!@Q*
zkY>W6IT{!St5~1{i=i}zAy76p%_|w8rh@@c0Axr!ns=D-X+|*sY6!@wacG9%)Qn*O
zl0sa739kT-&_?#oVxXF6tOnqTD)cZ}2vi$`ZU8RLAlo8=_z#*P3xI~i!lEh+Pdu-L
zx{d*wgjtXbnGX_Yf@Tc7Q3YhLhPvc8noGJs2DA~1DySiA&<p{k-g=k|K>6V{5JzFt
ojAY1KXm~va;tU{v7C?Xj0BHw!K;2aXV*mgE07*qoM6N<$f;4TDA^-pY

diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/x.svg b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/x.svg
new file mode 100644
index 00000000000..1efb4109241
--- /dev/null
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/x.svg
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+
+ Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl/
+-->
+
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 100">
+    <path d="m8 8 84 84" style="fill:#c6c6c6;fill-opacity:1;stroke:#505050;stroke-width:15;stroke-dasharray:none;stroke-opacity:1"/>
+    <path d="M8 92 92 8" style="fill:#000;stroke:#505050;stroke-width:15;stroke-dasharray:none;stroke-opacity:1"/>
+</svg>
\ No newline at end of file
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 eb937b48e2e..cb2b7df761a 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
@@ -73,8 +73,8 @@ public class DocPaths {
     /** The name of the DejaVu web fonts CSS file. */
     public static final DocPath DEJAVU_CSS = DocPath.create("dejavu.css");
 
-    /** The name of the image file showing a magnifying glass on the search box. */
-    public static final DocPath GLASS_IMG = DocPath.create("glass.png");
+    /** The name of the svg file showing a magnifying glass on the search box. */
+    public static final DocPath GLASS_SVG = DocPath.create("glass.svg");
 
     /** The name of the file for help info. */
     public static final DocPath HELP_DOC = DocPath.create("help-doc.html");
@@ -106,9 +106,15 @@ public class DocPaths {
     /** The name of the copy-to-clipboard icon file. */
     public static final DocPath CLIPBOARD_SVG = DocPath.create("copy.svg");
 
+    /** The name of the left pointing angle icon. */
+    public static final DocPath LEFT_SVG = DocPath.create("left.svg");
+
     /** The name of the link icon file. */
     public static final DocPath LINK_SVG = DocPath.create("link.svg");
 
+    /** The name of the right pointing angle icon. */
+    public static final DocPath RIGHT_SVG = DocPath.create("right.svg");
+
     /** The name of the default jQuery directory. */
     public static final DocPath JQUERY_DIR = DocPath.create("jquery");
 
@@ -338,7 +344,7 @@ public class DocPaths {
     /** The name of the type search index js file. */
     public static final DocPath TYPE_SEARCH_INDEX_JS = DocPath.create("type-search-index.js");
 
-    /** The name of the image file for undo button on the search box. */
-    public static final DocPath X_IMG = DocPath.create("x.png");
+    /** The name of the svg file for undo button on the search box. */
+    public static final DocPath X_SVG = DocPath.create("x.svg");
 
 }
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/html/Entity.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/html/Entity.java
index fbc7e087616..5d080c19c67 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/html/Entity.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/html/Entity.java
@@ -36,8 +36,6 @@ public class Entity extends Content {
     public static final Entity GREATER_THAN = new Entity("&gt;");
     public static final Entity AMPERSAND = new Entity("&amp;");
     public static final Entity NO_BREAK_SPACE = new Entity("&nbsp;");
-    public static final Entity LEFT_POINTING_ANGLE = new Entity("&#10094;");
-    public static final Entity RIGHT_POINTING_ANGLE = new Entity("&#10095;");
 
     public final String text;
 
diff --git a/test/langtools/jdk/javadoc/doclet/checkStylesheetClasses/CheckStylesheetClasses.java b/test/langtools/jdk/javadoc/doclet/checkStylesheetClasses/CheckStylesheetClasses.java
index 5d86e317b9f..ff484b814ec 100644
--- a/test/langtools/jdk/javadoc/doclet/checkStylesheetClasses/CheckStylesheetClasses.java
+++ b/test/langtools/jdk/javadoc/doclet/checkStylesheetClasses/CheckStylesheetClasses.java
@@ -131,7 +131,7 @@ public class CheckStylesheetClasses {
         // or if they are unused and therefore candidates to be deleted.
 
         // false positives: file extensions and URL components
-        removeAll(styleSheetNames, "css", "png", "w3", "org");
+        removeAll(styleSheetNames, "css", "svg", "w3", "org");
 
         // for doc-comment authors; maybe worthy of inclusion in HtmlStyle, just to be documented
         removeAll(styleSheetNames, "borderless", "plain", "striped");
diff --git a/test/langtools/jdk/javadoc/doclet/testFonts/TestFonts.java b/test/langtools/jdk/javadoc/doclet/testFonts/TestFonts.java
index 6e1bdffc055..56b2bbfb786 100644
--- a/test/langtools/jdk/javadoc/doclet/testFonts/TestFonts.java
+++ b/test/langtools/jdk/javadoc/doclet/testFonts/TestFonts.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2024, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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,11 +110,11 @@ public class TestFonts extends JavadocTester {
                 src.resolve("Dummy.java").toString());
         checkExit(Exit.OK);
         checkFiles(true, "resource-files/copy.svg",
-                "resource-files/glass.png",
+                "resource-files/glass.svg",
                 "resource-files/jquery-ui.min.css",
                 "resource-files/link.svg",
                 "resource-files/stylesheet.css",
-                "resource-files/x.png");
+                "resource-files/x.svg");
         checkFiles(false, "resource-files/fonts");
     }
 }
diff --git a/test/langtools/jdk/javadoc/doclet/testPassthruFiles/TestPassThruFiles.java b/test/langtools/jdk/javadoc/doclet/testPassthruFiles/TestPassThruFiles.java
index 241c437ff81..71d683b2d54 100644
--- a/test/langtools/jdk/javadoc/doclet/testPassthruFiles/TestPassThruFiles.java
+++ b/test/langtools/jdk/javadoc/doclet/testPassthruFiles/TestPassThruFiles.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2024, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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      8323628
+ * @bug      8323628 8351626
  * @summary  Update license on "pass-through" files
  * @library  /tools/lib ../../lib
  * @modules jdk.javadoc/jdk.javadoc.internal.tool
@@ -60,8 +60,6 @@ public class TestPassThruFiles extends JavadocTester {
         checkExit(Exit.OK);
 
         var files = List.of(
-                "resource-files/copy.svg",
-                "resource-files/link.svg",
                 "resource-files/stylesheet.css",
                 "script-files/script.js",
                 "script-files/search.js",
@@ -116,6 +114,6 @@ public class TestPassThruFiles extends JavadocTester {
     private boolean requiresCheck(Path p) {
         var fn = p.getFileName().toString();
         return !fn.startsWith("jquery")
-                && !fn.endsWith(".png");
+                && !fn.endsWith(".svg");
     }
 }
diff --git a/test/langtools/jdk/javadoc/doclet/testSearch/TestSearch.java b/test/langtools/jdk/javadoc/doclet/testSearch/TestSearch.java
index 9a2bddb3cc4..a4855bf6f4d 100644
--- a/test/langtools/jdk/javadoc/doclet/testSearch/TestSearch.java
+++ b/test/langtools/jdk/javadoc/doclet/testSearch/TestSearch.java
@@ -675,8 +675,8 @@ public class TestSearch extends JavadocTester {
                 "script-files/jquery-3.7.1.min.js",
                 "script-files/jquery-ui.min.js",
                 "resource-files/jquery-ui.min.css",
-                "resource-files/x.png",
-                "resource-files/glass.png");
+                "resource-files/x.svg",
+                "resource-files/glass.svg");
     }
 
     void checkSearchJS() {
diff --git a/test/langtools/jdk/javadoc/doclet/testStylesheet/TestStylesheet.java b/test/langtools/jdk/javadoc/doclet/testStylesheet/TestStylesheet.java
index c2dd0d92b0b..13c89dc2dae 100644
--- a/test/langtools/jdk/javadoc/doclet/testStylesheet/TestStylesheet.java
+++ b/test/langtools/jdk/javadoc/doclet/testStylesheet/TestStylesheet.java
@@ -119,7 +119,7 @@ public class TestStylesheet extends JavadocTester {
                 """
                     input#reset-search, input.reset-filter {
                         background-color: transparent;
-                        background-image:url('x.png');
+                        background-image:url('x.svg');
                         background-repeat:no-repeat;
                         background-size:contain;
                         border:0;
diff --git a/test/langtools/jdk/javadoc/tool/api/basic/APITest.java b/test/langtools/jdk/javadoc/tool/api/basic/APITest.java
index cbb63bfd129..2d45d6c7a8f 100644
--- a/test/langtools/jdk/javadoc/tool/api/basic/APITest.java
+++ b/test/langtools/jdk/javadoc/tool/api/basic/APITest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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,11 +205,13 @@ class APITest {
             "pkg/package-summary.html",
             "pkg/package-tree.html",
             "resource-files/copy.svg",
-            "resource-files/glass.png",
+            "resource-files/glass.svg",
             "resource-files/jquery-ui.min.css",
+            "resource-files/left.svg",
             "resource-files/link.svg",
+            "resource-files/right.svg",
             "resource-files/stylesheet.css",
-            "resource-files/x.png",
+            "resource-files/x.svg",
             "resource-files/fonts/dejavu.css",
             "resource-files/fonts/DejaVuLGCSans-Bold.woff",
             "resource-files/fonts/DejaVuLGCSans-Bold.woff2",
@@ -248,9 +250,9 @@ class APITest {
             .filter(s ->
                             !s.endsWith("-search-index.js")
                          && !s.equals("index-all.html")
-                         && !s.equals("resource-files/glass.png")
+                         && !s.equals("resource-files/glass.svg")
                          && !s.equals("resource-files/jquery-ui.min.css")
-                         && !s.equals("resource-files/x.png")
+                         && !s.equals("resource-files/x.svg")
                          && !s.startsWith("script-files/jquery-")
                          && !s.equals("script-files/search.js")
                          && !s.equals("script-files/search-page.js")

From 2371696781edc040d8fa8133c78b284a2e3de1ed Mon Sep 17 00:00:00 2001
From: Rajan Halade <rhalade@openjdk.org>
Date: Wed, 12 Mar 2025 17:19:41 +0000
Subject: [PATCH 317/587] 8303770: Remove Baltimore root certificate expiring
 in May 2025

Reviewed-by: shade, mullan
---
 .../share/data/cacerts/baltimorecybertrustca  | 28 -------------------
 .../security/lib/cacerts/VerifyCACerts.java   | 10 +++----
 2 files changed, 4 insertions(+), 34 deletions(-)
 delete mode 100644 src/java.base/share/data/cacerts/baltimorecybertrustca

diff --git a/src/java.base/share/data/cacerts/baltimorecybertrustca b/src/java.base/share/data/cacerts/baltimorecybertrustca
deleted file mode 100644
index b3cf6547c16..00000000000
--- a/src/java.base/share/data/cacerts/baltimorecybertrustca
+++ /dev/null
@@ -1,28 +0,0 @@
-Owner: CN=Baltimore CyberTrust Root, OU=CyberTrust, O=Baltimore, C=IE
-Issuer: CN=Baltimore CyberTrust Root, OU=CyberTrust, O=Baltimore, C=IE
-Serial number: 20000b9
-Valid from: Fri May 12 18:46:00 GMT 2000 until: Mon May 12 23:59:00 GMT 2025
-Signature algorithm name: SHA1withRSA
-Subject Public Key Algorithm: 2048-bit RSA key
-Version: 3
------BEGIN CERTIFICATE-----
-MIIDdzCCAl+gAwIBAgIEAgAAuTANBgkqhkiG9w0BAQUFADBaMQswCQYDVQQGEwJJ
-RTESMBAGA1UEChMJQmFsdGltb3JlMRMwEQYDVQQLEwpDeWJlclRydXN0MSIwIAYD
-VQQDExlCYWx0aW1vcmUgQ3liZXJUcnVzdCBSb290MB4XDTAwMDUxMjE4NDYwMFoX
-DTI1MDUxMjIzNTkwMFowWjELMAkGA1UEBhMCSUUxEjAQBgNVBAoTCUJhbHRpbW9y
-ZTETMBEGA1UECxMKQ3liZXJUcnVzdDEiMCAGA1UEAxMZQmFsdGltb3JlIEN5YmVy
-VHJ1c3QgUm9vdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKMEuyKr
-mD1X6CZymrV51Cni4eiVgLGw41uOKymaZN+hXe2wCQVt2yguzmKiYv60iNoS6zjr
-IZ3AQSsBUnuId9Mcj8e6uYi1agnnc+gRQKfRzMpijS3ljwumUNKoUMMo6vWrJYeK
-mpYcqWe4PwzV9/lSEy/CG9VwcPCPwBLKBsua4dnKM3p31vjsufFoREJIE9LAwqSu
-XmD+tqYF/LTdB1kC1FkYmGP1pWPgkAx9XbIGevOF6uvUA65ehD5f/xXtabz5OTZy
-dc93Uk3zyZAsuT3lySNTPx8kmCFcB5kpvcY67Oduhjprl3RjM71oGDHweI12v/ye
-jl0qhqdNkNwnGjkCAwEAAaNFMEMwHQYDVR0OBBYEFOWdWTCCR1jMrPoIVDaGezq1
-BE3wMBIGA1UdEwEB/wQIMAYBAf8CAQMwDgYDVR0PAQH/BAQDAgEGMA0GCSqGSIb3
-DQEBBQUAA4IBAQCFDF2O5G9RaEIFoN27TyclhAO992T9Ldcw46QQF+vaKSm2eT92
-9hkTI7gQCvlYpNRhcL0EYWoSihfVCr3FvDB81ukMJY2GQE/szKN+OMY3EU/t3Wgx
-jkzSswF07r51XgdIGn9w/xZchMB5hbgF/X++ZRGjD8ACtPhSNzkE1akxehi/oCr0
-Epn3o0WC4zxe9Z2etciefC7IpJ5OCBRLbf1wbWsaY71k5h+3zvDyny67G7fyUIhz
-ksLi4xaNmjICq44Y3ekQEe5+NauQrz4wlHrQMz2nZQ/1/I6eYs9HRCwBXbsdtTLS
-R9I4LtD+gdwyah617jzV/OeBHRnDJELqYzmp
------END CERTIFICATE-----
diff --git a/test/jdk/sun/security/lib/cacerts/VerifyCACerts.java b/test/jdk/sun/security/lib/cacerts/VerifyCACerts.java
index d64c5d7c52b..f7fb48a3912 100644
--- a/test/jdk/sun/security/lib/cacerts/VerifyCACerts.java
+++ b/test/jdk/sun/security/lib/cacerts/VerifyCACerts.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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 @@
  *      8223499 8225392 8232019 8234245 8233223 8225068 8225069 8243321 8243320
  *      8243559 8225072 8258630 8259312 8256421 8225081 8225082 8225083 8245654
  *      8305975 8304760 8307134 8295894 8314960 8317373 8317374 8318759 8319187
- *      8321408 8316138 8341057
+ *      8321408 8316138 8341057 8303770
  * @summary Check root CA entries in cacerts file
  */
 import java.io.ByteArrayInputStream;
@@ -47,12 +47,12 @@ public class VerifyCACerts {
             + File.separator + "security" + File.separator + "cacerts";
 
     // The numbers of certs now.
-    private static final int COUNT = 112;
+    private static final int COUNT = 111;
 
     // SHA-256 of cacerts, can be generated with
     // shasum -a 256 cacerts | sed -e 's/../&:/g' | tr '[:lower:]' '[:upper:]' | cut -c1-95
     private static final String CHECKSUM
-            = "21:68:E7:16:5B:94:23:D2:60:5C:BB:F2:AF:C1:66:5C:EC:36:BC:20:FF:5C:54:AF:91:D1:2C:38:AE:55:D3:27";
+            = "F1:A9:C7:FE:48:ED:D7:AF:84:C8:9D:C3:88:8D:A3:C8:45:E5:37:4D:B9:18:86:97:AE:CF:6D:41:E6:0E:FB:1B";
 
     // Hex formatter to upper case with ":" delimiter
     private static final HexFormat HEX = HexFormat.ofDelimiter(":").withUpperCase();
@@ -95,8 +95,6 @@ public class VerifyCACerts {
                     "68:7F:A4:51:38:22:78:FF:F0:C8:B1:1F:8D:43:D5:76:67:1C:6E:B2:BC:EA:B4:13:FB:83:D9:65:D0:6D:2F:F2");
             put("addtrustqualifiedca [jdk]",
                     "80:95:21:08:05:DB:4B:BC:35:5E:44:28:D8:FD:6E:C2:CD:E3:AB:5F:B9:7A:99:42:98:8E:B8:F4:DC:D0:60:16");
-            put("baltimorecybertrustca [jdk]",
-                    "16:AF:57:A9:F6:76:B0:AB:12:60:95:AA:5E:BA:DE:F2:2A:B3:11:19:D6:44:AC:95:CD:4B:93:DB:F3:F2:6A:EB");
             put("digicertglobalrootca [jdk]",
                     "43:48:A0:E9:44:4C:78:CB:26:5E:05:8D:5E:89:44:B4:D8:4F:96:62:BD:26:DB:25:7F:89:34:A4:43:C7:01:61");
             put("digicertglobalrootg2 [jdk]",

From 02c850fca87372173eadba18dfa0231df33bebb0 Mon Sep 17 00:00:00 2001
From: Jiangli Zhou <jiangli@openjdk.org>
Date: Wed, 12 Mar 2025 17:20:16 +0000
Subject: [PATCH 318/587] 8350982: -server|-client causes fatal exception on
 static JDK

Reviewed-by: iklam, alanb
---
 .../jtreg/compiler/c2/TestReduceAllocationAndHeapDump.java   | 2 +-
 .../jtreg/compiler/c2/TestReduceAllocationAndLoadKlass.java  | 1 -
 .../compiler/c2/TestReduceAllocationAndNonExactAllocate.java | 1 -
 .../compiler/c2/TestReduceAllocationAndNullableLoads.java    | 2 +-
 .../c2/TestReduceAllocationAndPointerComparisons.java        | 2 +-
 .../jtreg/compiler/escapeAnalysis/TestIterativeEA.java       | 2 +-
 .../TestReduceAllocationAndNonReduciblePhi.java              | 1 -
 .../InlineBimorphicVirtualCallAfterMorphismChanged.java      | 3 ++-
 .../jtreg/compiler/intrinsics/math/TestMinMaxIntrinsics.java | 2 +-
 test/hotspot/jtreg/compiler/profiling/TestTypeProfiling.java | 4 ++--
 .../hotspot/jtreg/gc/stress/gcbasher/TestGCBasherWithG1.java | 2 +-
 .../jtreg/gc/stress/gcbasher/TestGCBasherWithParallel.java   | 2 +-
 .../jtreg/gc/stress/gcbasher/TestGCBasherWithSerial.java     | 2 +-
 .../hotspot/jtreg/runtime/CDSCompressedKPtrs/XShareAuto.java | 5 ++---
 14 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/test/hotspot/jtreg/compiler/c2/TestReduceAllocationAndHeapDump.java b/test/hotspot/jtreg/compiler/c2/TestReduceAllocationAndHeapDump.java
index e2d45d73161..9319da0e0b9 100644
--- a/test/hotspot/jtreg/compiler/c2/TestReduceAllocationAndHeapDump.java
+++ b/test/hotspot/jtreg/compiler/c2/TestReduceAllocationAndHeapDump.java
@@ -26,6 +26,7 @@
  * @bug 8319784
  * @summary Check that the JVM is able to dump the heap even when there are ReduceAllocationMerge in the scope.
  * @library /test/lib /
+ * @requires vm.flavor == "server" & !vm.emulatedClient
  * @run main/othervm compiler.c2.TestReduceAllocationAndHeapDump
  */
 
@@ -45,7 +46,6 @@ public class TestReduceAllocationAndHeapDump {
             }
 
             String[] dumperArgs = {
-                "-server",
                 "-XX:CompileThresholdScaling=0.01",
                 "-XX:+HeapDumpAfterFullGC",
                 "-XX:HeapDumpPath=" + dumpDirectory.getAbsolutePath(),
diff --git a/test/hotspot/jtreg/compiler/c2/TestReduceAllocationAndLoadKlass.java b/test/hotspot/jtreg/compiler/c2/TestReduceAllocationAndLoadKlass.java
index e3515eaa20b..5514ac25eda 100644
--- a/test/hotspot/jtreg/compiler/c2/TestReduceAllocationAndLoadKlass.java
+++ b/test/hotspot/jtreg/compiler/c2/TestReduceAllocationAndLoadKlass.java
@@ -36,7 +36,6 @@
  *                   -XX:-UseCompressedClassPointers
  *                   -Xbatch
  *                   -Xcomp
- *                   -server
  *                   compiler.c2.TestReduceAllocationAndLoadKlass
  */
 
diff --git a/test/hotspot/jtreg/compiler/c2/TestReduceAllocationAndNonExactAllocate.java b/test/hotspot/jtreg/compiler/c2/TestReduceAllocationAndNonExactAllocate.java
index 19b641036bd..2f4485d2553 100644
--- a/test/hotspot/jtreg/compiler/c2/TestReduceAllocationAndNonExactAllocate.java
+++ b/test/hotspot/jtreg/compiler/c2/TestReduceAllocationAndNonExactAllocate.java
@@ -36,7 +36,6 @@
  *                   -XX:-TieredCompilation
  *                   -Xbatch
  *                   -Xcomp
- *                   -server
  *                   compiler.c2.TestReduceAllocationAndNonExactAllocate
  */
 
diff --git a/test/hotspot/jtreg/compiler/c2/TestReduceAllocationAndNullableLoads.java b/test/hotspot/jtreg/compiler/c2/TestReduceAllocationAndNullableLoads.java
index bf8c5cd24d4..2a18520e026 100644
--- a/test/hotspot/jtreg/compiler/c2/TestReduceAllocationAndNullableLoads.java
+++ b/test/hotspot/jtreg/compiler/c2/TestReduceAllocationAndNullableLoads.java
@@ -30,7 +30,7 @@
  * @compile -XDstringConcat=inline TestReduceAllocationAndNullableLoads.java
  * @run main/othervm -XX:CompileCommand=compileonly,*TestReduceAllocationAndNullableLoads*::*
  *                   -XX:CompileCommand=dontinline,*TestReduceAllocationAndNullableLoads*::*
- *                   -XX:-TieredCompilation -Xcomp -server
+ *                   -XX:-TieredCompilation -Xcomp
  *                   compiler.c2.TestReduceAllocationAndNullableLoads
  */
 
diff --git a/test/hotspot/jtreg/compiler/c2/TestReduceAllocationAndPointerComparisons.java b/test/hotspot/jtreg/compiler/c2/TestReduceAllocationAndPointerComparisons.java
index 0cd4fbc0d12..e6309b50f56 100644
--- a/test/hotspot/jtreg/compiler/c2/TestReduceAllocationAndPointerComparisons.java
+++ b/test/hotspot/jtreg/compiler/c2/TestReduceAllocationAndPointerComparisons.java
@@ -28,7 +28,7 @@
  * @requires vm.flagless & vm.compiler2.enabled & vm.opt.final.EliminateAllocations
  * @run main/othervm -XX:CompileCommand=compileonly,*TestReduceAllocationAndPointerComparisons*::*
  *                   -XX:CompileCommand=dontinline,*TestReduceAllocationAndPointerComparisons*::*
- *                   -XX:-TieredCompilation -Xcomp -server
+ *                   -XX:-TieredCompilation -Xcomp
  *                   compiler.c2.TestReduceAllocationAndPointerComparisons
  * @run main compiler.c2.TestReduceAllocationAndPointerComparisons
  */
diff --git a/test/hotspot/jtreg/compiler/escapeAnalysis/TestIterativeEA.java b/test/hotspot/jtreg/compiler/escapeAnalysis/TestIterativeEA.java
index f0524368d70..299f98995a0 100644
--- a/test/hotspot/jtreg/compiler/escapeAnalysis/TestIterativeEA.java
+++ b/test/hotspot/jtreg/compiler/escapeAnalysis/TestIterativeEA.java
@@ -40,7 +40,7 @@ public class TestIterativeEA {
 
   public static void main(String[] args) throws Exception {
     ProcessBuilder pb = ProcessTools.createLimitedTestJavaProcessBuilder(
-                "-server", "-XX:-TieredCompilation", "-Xbatch", "-XX:+PrintEliminateAllocations",
+                 "-XX:-TieredCompilation", "-Xbatch", "-XX:+PrintEliminateAllocations",
                  Launcher.class.getName());
 
     OutputAnalyzer analyzer = new OutputAnalyzer(pb.start());
diff --git a/test/hotspot/jtreg/compiler/escapeAnalysis/TestReduceAllocationAndNonReduciblePhi.java b/test/hotspot/jtreg/compiler/escapeAnalysis/TestReduceAllocationAndNonReduciblePhi.java
index d5593a3af41..76c55a7b958 100644
--- a/test/hotspot/jtreg/compiler/escapeAnalysis/TestReduceAllocationAndNonReduciblePhi.java
+++ b/test/hotspot/jtreg/compiler/escapeAnalysis/TestReduceAllocationAndNonReduciblePhi.java
@@ -35,7 +35,6 @@
  *                   -XX:CompileCommand=inline,*Point*::*
  *                   -XX:CompileCommand=exclude,*::dummy*
  *                   -Xbatch
- *                   -server
  *                   compiler.escapeAnalysis.TestReduceAllocationAndNonReduciblePhi
  *
  * @run main compiler.escapeAnalysis.TestReduceAllocationAndNonReduciblePhi
diff --git a/test/hotspot/jtreg/compiler/inlining/InlineBimorphicVirtualCallAfterMorphismChanged.java b/test/hotspot/jtreg/compiler/inlining/InlineBimorphicVirtualCallAfterMorphismChanged.java
index 2f6f7f20d9d..6f1dadd6b80 100644
--- a/test/hotspot/jtreg/compiler/inlining/InlineBimorphicVirtualCallAfterMorphismChanged.java
+++ b/test/hotspot/jtreg/compiler/inlining/InlineBimorphicVirtualCallAfterMorphismChanged.java
@@ -29,6 +29,7 @@
  * @modules java.base/jdk.internal.misc
  * @library /test/lib
  * @requires vm.flagless
+ * @requires vm.flavor == "server" & !vm.emulatedClient
  *
  * @run driver compiler.inlining.InlineBimorphicVirtualCallAfterMorphismChanged
  */
@@ -93,7 +94,7 @@ public class InlineBimorphicVirtualCallAfterMorphismChanged {
 
     private static void test(String option) throws Exception {
         ProcessBuilder pb = ProcessTools.createLimitedTestJavaProcessBuilder(
-            "-server", "-XX:+UnlockDiagnosticVMOptions", "-XX:+PrintInlining",
+            "-XX:+UnlockDiagnosticVMOptions", "-XX:+PrintInlining",
             "-XX:CompileCommand=compileonly,*::callSiteHolder", option,
             AbstractBase.class.getName()
         );
diff --git a/test/hotspot/jtreg/compiler/intrinsics/math/TestMinMaxIntrinsics.java b/test/hotspot/jtreg/compiler/intrinsics/math/TestMinMaxIntrinsics.java
index 23b3133581a..8ced238f4d8 100644
--- a/test/hotspot/jtreg/compiler/intrinsics/math/TestMinMaxIntrinsics.java
+++ b/test/hotspot/jtreg/compiler/intrinsics/math/TestMinMaxIntrinsics.java
@@ -34,7 +34,7 @@
 * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox
 *
 * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
-*                   -server -XX:-BackgroundCompilation -XX:-UseOnStackReplacement
+*                   -XX:-BackgroundCompilation -XX:-UseOnStackReplacement
 *                   compiler.intrinsics.math.TestMinMaxIntrinsics
 */
 
diff --git a/test/hotspot/jtreg/compiler/profiling/TestTypeProfiling.java b/test/hotspot/jtreg/compiler/profiling/TestTypeProfiling.java
index 849bc17ca95..1ff63d63f72 100644
--- a/test/hotspot/jtreg/compiler/profiling/TestTypeProfiling.java
+++ b/test/hotspot/jtreg/compiler/profiling/TestTypeProfiling.java
@@ -39,13 +39,13 @@
   * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
   *                   -XX:-BackgroundCompilation -XX:-UseOnStackReplacement
   *                   -XX:CompileThreshold=10000
-  *                   -server -XX:-TieredCompilation -XX:TypeProfileLevel=020
+  *                   -XX:-TieredCompilation -XX:TypeProfileLevel=020
   *                   -XX:+UnlockExperimentalVMOptions -XX:PerMethodSpecTrapLimit=5000 -XX:PerMethodTrapLimit=100
   *                    compiler.profiling.TestTypeProfiling
   * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
   *                   -XX:-BackgroundCompilation -XX:-UseOnStackReplacement
   *                   -XX:CompileThreshold=10000
-  *                   -server -XX:-TieredCompilation -XX:TypeProfileLevel=200
+  *                   -XX:-TieredCompilation -XX:TypeProfileLevel=200
   *                   -XX:+UnlockExperimentalVMOptions -XX:PerMethodSpecTrapLimit=5000 -XX:PerMethodTrapLimit=100
   *                    compiler.profiling.TestTypeProfiling
   */
diff --git a/test/hotspot/jtreg/gc/stress/gcbasher/TestGCBasherWithG1.java b/test/hotspot/jtreg/gc/stress/gcbasher/TestGCBasherWithG1.java
index 287f581ce73..3e9e8599adc 100644
--- a/test/hotspot/jtreg/gc/stress/gcbasher/TestGCBasherWithG1.java
+++ b/test/hotspot/jtreg/gc/stress/gcbasher/TestGCBasherWithG1.java
@@ -33,7 +33,7 @@ import java.io.IOException;
  * @requires vm.gc.G1
  * @requires vm.flavor == "server" & !vm.emulatedClient
  * @summary Stress the G1 GC by trying to make old objects more likely to be garbage than young objects.
- * @run main/othervm/timeout=200 -Xlog:gc*=info -Xmx256m -server -XX:+UseG1GC gc.stress.gcbasher.TestGCBasherWithG1 120000
+ * @run main/othervm/timeout=200 -Xlog:gc*=info -Xmx256m -XX:+UseG1GC gc.stress.gcbasher.TestGCBasherWithG1 120000
  */
 public class TestGCBasherWithG1 {
     public static void main(String[] args) throws IOException {
diff --git a/test/hotspot/jtreg/gc/stress/gcbasher/TestGCBasherWithParallel.java b/test/hotspot/jtreg/gc/stress/gcbasher/TestGCBasherWithParallel.java
index da6f77df26c..21eb225534b 100644
--- a/test/hotspot/jtreg/gc/stress/gcbasher/TestGCBasherWithParallel.java
+++ b/test/hotspot/jtreg/gc/stress/gcbasher/TestGCBasherWithParallel.java
@@ -33,7 +33,7 @@ import java.io.IOException;
  * @requires vm.gc.Parallel
  * @requires vm.flavor == "server" & !vm.emulatedClient
  * @summary Stress the Parallel GC by trying to make old objects more likely to be garbage than young objects.
- * @run main/othervm/timeout=200 -Xlog:gc*=info -Xmx256m -server -XX:+UseParallelGC -XX:-UseGCOverheadLimit gc.stress.gcbasher.TestGCBasherWithParallel 120000
+ * @run main/othervm/timeout=200 -Xlog:gc*=info -Xmx256m -XX:+UseParallelGC -XX:-UseGCOverheadLimit gc.stress.gcbasher.TestGCBasherWithParallel 120000
  */
 public class TestGCBasherWithParallel {
     public static void main(String[] args) throws IOException {
diff --git a/test/hotspot/jtreg/gc/stress/gcbasher/TestGCBasherWithSerial.java b/test/hotspot/jtreg/gc/stress/gcbasher/TestGCBasherWithSerial.java
index f02f46369d4..68d36eb9394 100644
--- a/test/hotspot/jtreg/gc/stress/gcbasher/TestGCBasherWithSerial.java
+++ b/test/hotspot/jtreg/gc/stress/gcbasher/TestGCBasherWithSerial.java
@@ -33,7 +33,7 @@ import java.io.IOException;
  * @requires vm.gc.Serial
  * @requires vm.flavor == "server" & !vm.emulatedClient
  * @summary Stress the Serial GC by trying to make old objects more likely to be garbage than young objects.
- * @run main/othervm/timeout=200 -Xlog:gc*=info -Xmx256m -server -XX:+UseSerialGC gc.stress.gcbasher.TestGCBasherWithSerial 120000
+ * @run main/othervm/timeout=200 -Xlog:gc*=info -Xmx256m -XX:+UseSerialGC gc.stress.gcbasher.TestGCBasherWithSerial 120000
  */
 public class TestGCBasherWithSerial {
     public static void main(String[] args) throws IOException {
diff --git a/test/hotspot/jtreg/runtime/CDSCompressedKPtrs/XShareAuto.java b/test/hotspot/jtreg/runtime/CDSCompressedKPtrs/XShareAuto.java
index e53758a671a..25aff06d358 100644
--- a/test/hotspot/jtreg/runtime/CDSCompressedKPtrs/XShareAuto.java
+++ b/test/hotspot/jtreg/runtime/CDSCompressedKPtrs/XShareAuto.java
@@ -25,8 +25,7 @@
  * @test
  * @requires vm.cds
  * @requires vm.flagless
- * @bug 8005933
- * @summary -Xshare:auto is the default when -Xshare is not specified
+ * @summary -Xshare:auto is the default
  * @library /test/lib
  * @modules java.base/jdk.internal.misc
  *          java.management
@@ -40,7 +39,7 @@ import jdk.test.lib.process.OutputAnalyzer;
 public class XShareAuto {
     public static void main(String[] args) throws Exception {
         ProcessBuilder pb = ProcessTools.createLimitedTestJavaProcessBuilder(
-            "-server", "-XX:+UnlockDiagnosticVMOptions",
+            "-XX:+UnlockDiagnosticVMOptions",
             "-XX:SharedArchiveFile=./XShareAuto.jsa", "-Xshare:dump", "-Xlog:cds");
         OutputAnalyzer output = new OutputAnalyzer(pb.start());
         output.shouldContain("Loading classes to share");

From db531bf7df517eb6a07080aceb2a88a3b90d5e94 Mon Sep 17 00:00:00 2001
From: Nizar Benalla <nbenalla@openjdk.org>
Date: Wed, 12 Mar 2025 18:56:58 +0000
Subject: [PATCH 319/587] 8351881: Tidy complains about missing "alt" attribute

Reviewed-by: hannesw
---
 .../internal/doclets/formats/html/TableOfContents.java      | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/TableOfContents.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/TableOfContents.java
index a80e0e22b54..46470d27c58 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/TableOfContents.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/TableOfContents.java
@@ -110,11 +110,13 @@ public class TableOfContents {
                 .add(HtmlTree.SPAN(writer.contents.hideSidebar).add(Entity.NO_BREAK_SPACE))
                 .add(HtmlTree.of(HtmlTag.IMG)
                         .put(HtmlAttr.SRC, writer.pathToRoot.resolve(DocPaths.RESOURCE_FILES)
-                                .resolve(DocPaths.LEFT_SVG).getPath())));
+                                .resolve(DocPaths.LEFT_SVG).getPath())
+                        .put(HtmlAttr.ALT, writer.contents.hideSidebar.toString())));
         content.add(HtmlTree.BUTTON(HtmlStyles.showSidebar)
                 .add(HtmlTree.of(HtmlTag.IMG)
                         .put(HtmlAttr.SRC, writer.pathToRoot.resolve(DocPaths.RESOURCE_FILES)
-                                .resolve(DocPaths.RIGHT_SVG).getPath()))
+                                .resolve(DocPaths.RIGHT_SVG).getPath())
+                        .put(HtmlAttr.ALT, writer.contents.showSidebar.toString()))
                 .add(HtmlTree.SPAN(Entity.NO_BREAK_SPACE).add(writer.contents.showSidebar)));
         return content;
     }

From 895f64a18d7c752332ef9255c0b118bf25bdbb90 Mon Sep 17 00:00:00 2001
From: Aleksey Shipilev <shade@openjdk.org>
Date: Wed, 12 Mar 2025 19:25:08 +0000
Subject: [PATCH 320/587] 8351142: Add JFR monitor deflation and statistics
 events

Reviewed-by: egahlin, dholmes, lmesnik
---
 src/hotspot/share/jfr/metadata/metadata.xml   |   9 ++
 .../share/jfr/periodic/jfrPeriodic.cpp        |   6 ++
 .../share/runtime/lightweightSynchronizer.cpp |   6 +-
 src/hotspot/share/runtime/objectMonitor.cpp   |  26 +++--
 src/hotspot/share/runtime/objectMonitor.hpp   |   4 +
 .../share/runtime/objectMonitor.inline.hpp    |   7 ++
 src/hotspot/share/runtime/synchronizer.cpp    |  18 +++-
 src/hotspot/share/runtime/synchronizer.hpp    |   2 +
 src/jdk.jfr/share/conf/jfr/default.jfc        |  10 ++
 src/jdk.jfr/share/conf/jfr/profile.jfc        |  10 ++
 .../runtime/TestJavaMonitorDeflateEvent.java  |  90 ++++++++++++++++
 .../TestJavaMonitorStatisticsEvent.java       | 101 ++++++++++++++++++
 test/lib/jdk/test/lib/jfr/EventNames.java     |   2 +
 13 files changed, 280 insertions(+), 11 deletions(-)
 create mode 100644 test/jdk/jdk/jfr/event/runtime/TestJavaMonitorDeflateEvent.java
 create mode 100644 test/jdk/jdk/jfr/event/runtime/TestJavaMonitorStatisticsEvent.java

diff --git a/src/hotspot/share/jfr/metadata/metadata.xml b/src/hotspot/share/jfr/metadata/metadata.xml
index a4b9bc78900..3151ad72af1 100644
--- a/src/hotspot/share/jfr/metadata/metadata.xml
+++ b/src/hotspot/share/jfr/metadata/metadata.xml
@@ -116,6 +116,15 @@
     <Field type="InflateCause" name="cause" label="Monitor Inflation Cause" description="Cause of inflation" />
   </Event>
 
+  <Event name="JavaMonitorDeflate" category="Java Application" label="Java Monitor Deflated">
+    <Field type="Class" name="monitorClass" label="Monitor Class" />
+    <Field type="ulong" contentType="address" name="address" label="Monitor Address" relation="JavaMonitorAddress" />
+  </Event>
+
+  <Event name="JavaMonitorStatistics" category="Java Application, Statistics" label="Java Monitor Statistics" period="everyChunk">
+    <Field type="ulong" name="count" label="Monitors in Use" description="Current number of in-use monitors" />
+  </Event>
+
   <Event name="SyncOnValueBasedClass" category="Java Virtual Machine, Diagnostics" label="Value Based Class Synchronization" thread="true" stackTrace="true" startTime="false" experimental="true">
     <Field type="Class" name="valueBasedClass" label="Value Based Class" />
   </Event>
diff --git a/src/hotspot/share/jfr/periodic/jfrPeriodic.cpp b/src/hotspot/share/jfr/periodic/jfrPeriodic.cpp
index f22098bb52e..91a696c6aa5 100644
--- a/src/hotspot/share/jfr/periodic/jfrPeriodic.cpp
+++ b/src/hotspot/share/jfr/periodic/jfrPeriodic.cpp
@@ -739,3 +739,9 @@ TRACE_REQUEST_FUNC(NativeMemoryUsage) {
 TRACE_REQUEST_FUNC(NativeMemoryUsageTotal) {
   JfrNativeMemoryEvent::send_total_event(timestamp());
 }
+
+TRACE_REQUEST_FUNC(JavaMonitorStatistics) {
+  EventJavaMonitorStatistics event;
+  event.set_count(ObjectSynchronizer::in_use_list_count());
+  event.commit();
+}
diff --git a/src/hotspot/share/runtime/lightweightSynchronizer.cpp b/src/hotspot/share/runtime/lightweightSynchronizer.cpp
index 55d4a0c30f3..44d0cb32b56 100644
--- a/src/hotspot/share/runtime/lightweightSynchronizer.cpp
+++ b/src/hotspot/share/runtime/lightweightSynchronizer.cpp
@@ -369,7 +369,11 @@ static void post_monitor_inflate_event(EventJavaMonitorInflate* event,
                                        const oop obj,
                                        ObjectSynchronizer::InflateCause cause) {
   assert(event != nullptr, "invariant");
-  event->set_monitorClass(obj->klass());
+  const Klass* monitor_klass = obj->klass();
+  if (ObjectMonitor::is_jfr_excluded(monitor_klass)) {
+    return;
+  }
+  event->set_monitorClass(monitor_klass);
   event->set_address((uintptr_t)(void*)obj);
   event->set_cause((u1)cause);
   event->commit();
diff --git a/src/hotspot/share/runtime/objectMonitor.cpp b/src/hotspot/share/runtime/objectMonitor.cpp
index 7f09a1cea32..636172f371d 100644
--- a/src/hotspot/share/runtime/objectMonitor.cpp
+++ b/src/hotspot/share/runtime/objectMonitor.cpp
@@ -734,6 +734,18 @@ bool ObjectMonitor::try_lock_or_add_to_entry_list(JavaThread* current, ObjectWai
   }
 }
 
+static void post_monitor_deflate_event(EventJavaMonitorDeflate* event,
+                                       const oop obj) {
+  assert(event != nullptr, "invariant");
+  const Klass* monitor_klass = obj->klass();
+  if (ObjectMonitor::is_jfr_excluded(monitor_klass)) {
+    return;
+  }
+  event->set_monitorClass(monitor_klass);
+  event->set_address((uintptr_t)(void*)obj);
+  event->commit();
+}
+
 // Deflate the specified ObjectMonitor if not in-use. Returns true if it
 // was deflated and false otherwise.
 //
@@ -753,6 +765,8 @@ bool ObjectMonitor::deflate_monitor(Thread* current) {
     return false;
   }
 
+  EventJavaMonitorDeflate event;
+
   const oop obj = object_peek();
 
   if (obj == nullptr) {
@@ -826,6 +840,10 @@ bool ObjectMonitor::deflate_monitor(Thread* current) {
     install_displaced_markword_in_object(obj);
   }
 
+  if (event.should_commit()) {
+    post_monitor_deflate_event(&event, obj);
+  }
+
   // We leave owner == DEFLATER_MARKER and contentions < 0
   // to force any racing threads to retry.
   return true;  // Success, ObjectMonitor has been deflated.
@@ -1628,12 +1646,6 @@ bool ObjectMonitor::check_owner(TRAPS) {
              "current thread is not owner", false);
 }
 
-static inline bool is_excluded(const Klass* monitor_klass) {
-  assert(monitor_klass != nullptr, "invariant");
-  NOT_JFR_RETURN_(false);
-  JFR_ONLY(return vmSymbols::jdk_jfr_internal_management_HiddenWait() == monitor_klass->name();)
-}
-
 static void post_monitor_wait_event(EventJavaMonitorWait* event,
                                     ObjectMonitor* monitor,
                                     uint64_t notifier_tid,
@@ -1642,7 +1654,7 @@ static void post_monitor_wait_event(EventJavaMonitorWait* event,
   assert(event != nullptr, "invariant");
   assert(monitor != nullptr, "invariant");
   const Klass* monitor_klass = monitor->object()->klass();
-  if (is_excluded(monitor_klass)) {
+  if (ObjectMonitor::is_jfr_excluded(monitor_klass)) {
     return;
   }
   event->set_monitorClass(monitor_klass);
diff --git a/src/hotspot/share/runtime/objectMonitor.hpp b/src/hotspot/share/runtime/objectMonitor.hpp
index b8409f2a054..e3af2422eb7 100644
--- a/src/hotspot/share/runtime/objectMonitor.hpp
+++ b/src/hotspot/share/runtime/objectMonitor.hpp
@@ -463,6 +463,10 @@ class ObjectMonitor : public CHeapObj<mtObjectMonitor> {
   bool      deflate_monitor(Thread* current);
  private:
   void      install_displaced_markword_in_object(const oop obj);
+
+  // JFR support
+public:
+  static bool is_jfr_excluded(const Klass* monitor_klass);
 };
 
 // RAII object to ensure that ObjectMonitor::is_being_async_deflated() is
diff --git a/src/hotspot/share/runtime/objectMonitor.inline.hpp b/src/hotspot/share/runtime/objectMonitor.inline.hpp
index d8d7b3f7633..e5cad9b365a 100644
--- a/src/hotspot/share/runtime/objectMonitor.inline.hpp
+++ b/src/hotspot/share/runtime/objectMonitor.inline.hpp
@@ -27,6 +27,7 @@
 
 #include "runtime/objectMonitor.hpp"
 
+#include "classfile/vmSymbols.hpp"
 #include "logging/log.hpp"
 #include "oops/access.inline.hpp"
 #include "oops/markWord.hpp"
@@ -286,4 +287,10 @@ inline bool ObjectMonitor::object_refers_to(oop obj) const {
   return _object.peek() == obj;
 }
 
+inline bool ObjectMonitor::is_jfr_excluded(const Klass* monitor_klass) {
+  assert(monitor_klass != nullptr, "invariant");
+  NOT_JFR_RETURN_(false);
+  JFR_ONLY(return vmSymbols::jdk_jfr_internal_management_HiddenWait() == monitor_klass->name();)
+}
+
 #endif // SHARE_RUNTIME_OBJECTMONITOR_INLINE_HPP
diff --git a/src/hotspot/share/runtime/synchronizer.cpp b/src/hotspot/share/runtime/synchronizer.cpp
index e3faba0754d..2a97dba7119 100644
--- a/src/hotspot/share/runtime/synchronizer.cpp
+++ b/src/hotspot/share/runtime/synchronizer.cpp
@@ -1312,6 +1312,14 @@ static bool monitors_used_above_threshold(MonitorList* list) {
   return false;
 }
 
+size_t ObjectSynchronizer::in_use_list_count() {
+  return _in_use_list.count();
+}
+
+size_t ObjectSynchronizer::in_use_list_max() {
+  return _in_use_list.max();
+}
+
 size_t ObjectSynchronizer::in_use_list_ceiling() {
   return _in_use_list_ceiling;
 }
@@ -1419,7 +1427,11 @@ static void post_monitor_inflate_event(EventJavaMonitorInflate* event,
                                        const oop obj,
                                        ObjectSynchronizer::InflateCause cause) {
   assert(event != nullptr, "invariant");
-  event->set_monitorClass(obj->klass());
+  const Klass* monitor_klass = obj->klass();
+  if (ObjectMonitor::is_jfr_excluded(monitor_klass)) {
+    return;
+  }
+  event->set_monitorClass(monitor_klass);
   event->set_address((uintptr_t)(void*)obj);
   event->set_cause((u1)cause);
   event->commit();
@@ -1710,8 +1722,8 @@ class ObjectMonitorDeflationLogging: public StackObj {
   elapsedTimer                             _timer;
 
   size_t ceiling() const { return ObjectSynchronizer::in_use_list_ceiling(); }
-  size_t count() const   { return ObjectSynchronizer::_in_use_list.count(); }
-  size_t max() const     { return ObjectSynchronizer::_in_use_list.max(); }
+  size_t count() const   { return ObjectSynchronizer::in_use_list_count(); }
+  size_t max() const     { return ObjectSynchronizer::in_use_list_max(); }
 
 public:
   ObjectMonitorDeflationLogging()
diff --git a/src/hotspot/share/runtime/synchronizer.hpp b/src/hotspot/share/runtime/synchronizer.hpp
index 5d5a123a2b1..089a432a8b5 100644
--- a/src/hotspot/share/runtime/synchronizer.hpp
+++ b/src/hotspot/share/runtime/synchronizer.hpp
@@ -188,6 +188,8 @@ public:
 
   // Deflate idle monitors:
   static size_t deflate_monitor_list(ObjectMonitorDeflationSafepointer* safepointer);
+  static size_t in_use_list_count();
+  static size_t in_use_list_max();
   static size_t in_use_list_ceiling();
   static void dec_in_use_list_ceiling();
   static void inc_in_use_list_ceiling();
diff --git a/src/jdk.jfr/share/conf/jfr/default.jfc b/src/jdk.jfr/share/conf/jfr/default.jfc
index c9bdb0828a6..2335911926e 100644
--- a/src/jdk.jfr/share/conf/jfr/default.jfc
+++ b/src/jdk.jfr/share/conf/jfr/default.jfc
@@ -101,6 +101,16 @@
       <setting name="threshold">0 ms</setting>
     </event>
 
+    <event name="jdk.JavaMonitorDeflate">
+      <setting name="enabled">false</setting>
+      <setting name="threshold">0 ms</setting>
+    </event>
+
+    <event name="jdk.JavaMonitorStatistics">
+      <setting name="enabled">true</setting>
+      <setting name="period">everyChunk</setting>
+    </event>
+
     <event name="jdk.SyncOnValueBasedClass">
       <setting name="enabled">true</setting>
       <setting name="stackTrace">true</setting>
diff --git a/src/jdk.jfr/share/conf/jfr/profile.jfc b/src/jdk.jfr/share/conf/jfr/profile.jfc
index 44b11e4d150..1af316bfe81 100644
--- a/src/jdk.jfr/share/conf/jfr/profile.jfc
+++ b/src/jdk.jfr/share/conf/jfr/profile.jfc
@@ -101,6 +101,16 @@
       <setting name="threshold">0 ms</setting>
     </event>
 
+    <event name="jdk.JavaMonitorDeflate">
+      <setting name="enabled">false</setting>
+      <setting name="threshold">0 ms</setting>
+    </event>
+
+    <event name="jdk.JavaMonitorStatistics">
+      <setting name="enabled">true</setting>
+      <setting name="period">everyChunk</setting>
+    </event>
+
     <event name="jdk.SyncOnValueBasedClass">
       <setting name="enabled">true</setting>
       <setting name="stackTrace">true</setting>
diff --git a/test/jdk/jdk/jfr/event/runtime/TestJavaMonitorDeflateEvent.java b/test/jdk/jdk/jfr/event/runtime/TestJavaMonitorDeflateEvent.java
new file mode 100644
index 00000000000..2c10911179b
--- /dev/null
+++ b/test/jdk/jdk/jfr/event/runtime/TestJavaMonitorDeflateEvent.java
@@ -0,0 +1,90 @@
+/*
+ * Copyright (c) 2016, 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.jfr.event.runtime;
+
+import static jdk.test.lib.Asserts.assertFalse;
+
+import java.nio.file.Paths;
+import java.time.Duration;
+import java.util.List;
+import java.util.concurrent.CopyOnWriteArrayList;
+
+import jdk.jfr.Recording;
+import jdk.jfr.consumer.RecordingStream;
+import jdk.jfr.consumer.RecordedClass;
+import jdk.jfr.consumer.RecordedEvent;
+import jdk.test.lib.jfr.EventNames;
+import jdk.test.lib.jfr.Events;
+import jdk.test.lib.thread.TestThread;
+import jdk.test.lib.thread.XRun;
+
+/**
+ * @test TestJavaMonitorDeflateEvent
+ * @requires vm.flagless
+ * @requires vm.hasJFR
+ * @library /test/lib
+ * @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:GuaranteedAsyncDeflationInterval=100 jdk.jfr.event.runtime.TestJavaMonitorDeflateEvent
+ */
+public class TestJavaMonitorDeflateEvent {
+
+    private static final String FIELD_KLASS_NAME = "monitorClass.name";
+    private static final String FIELD_ADDRESS    = "address";
+
+    private static final String EVENT_NAME = EventNames.JavaMonitorDeflate;
+
+    static class Lock {
+    }
+
+    public static void main(String[] args) throws Exception {
+        final Lock lock = new Lock();
+        final String lockClassName = lock.getClass().getName().replace('.', '/');
+
+        List<RecordedEvent> events = new CopyOnWriteArrayList<>();
+        try (RecordingStream rs = new RecordingStream()) {
+            rs.enable(EVENT_NAME).withoutThreshold();
+            rs.onEvent(EVENT_NAME, e -> {
+                Object clazz = e.getValue(FIELD_KLASS_NAME);
+                if (clazz.equals(lockClassName)) {
+                    events.add(e);
+                    rs.close();
+                }
+            });
+            rs.startAsync();
+
+            synchronized (lock) {
+                // Causes lock inflation.
+                lock.wait(1);
+            }
+
+            // Wait for deflater thread to act.
+            rs.awaitTermination();
+
+            System.out.println(events);
+            assertFalse(events.isEmpty());
+            for (RecordedEvent ev : events) {
+                Events.assertField(ev, FIELD_ADDRESS).notEqual(0L);
+            }
+        }
+    }
+}
diff --git a/test/jdk/jdk/jfr/event/runtime/TestJavaMonitorStatisticsEvent.java b/test/jdk/jdk/jfr/event/runtime/TestJavaMonitorStatisticsEvent.java
new file mode 100644
index 00000000000..baf549bead0
--- /dev/null
+++ b/test/jdk/jdk/jfr/event/runtime/TestJavaMonitorStatisticsEvent.java
@@ -0,0 +1,101 @@
+/*
+ * Copyright (c) 2016, 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.jfr.event.runtime;
+
+import static jdk.test.lib.Asserts.assertFalse;
+import static jdk.test.lib.Asserts.assertTrue;
+
+import java.nio.file.Paths;
+import java.time.Duration;
+import java.util.List;
+import java.util.concurrent.CopyOnWriteArrayList;
+
+import jdk.jfr.Recording;
+import jdk.jfr.consumer.RecordingStream;
+import jdk.jfr.consumer.RecordedClass;
+import jdk.jfr.consumer.RecordedEvent;
+import jdk.test.lib.jfr.EventNames;
+import jdk.test.lib.jfr.Events;
+import jdk.test.lib.thread.TestThread;
+import jdk.test.lib.thread.XRun;
+
+/**
+ * @test TestJavaMonitorStatisticsEvent
+ * @requires vm.flagless
+ * @requires vm.hasJFR
+ * @library /test/lib
+ * @run main/othervm jdk.jfr.event.runtime.TestJavaMonitorStatisticsEvent
+ */
+public class TestJavaMonitorStatisticsEvent {
+
+    private static final String FIELD_COUNT = "count";
+
+    private static final String EVENT_NAME = EventNames.JavaMonitorStatistics;
+    private static final int NUM_LOCKS = 512;
+
+    static class Lock {
+    }
+
+    static final Lock[] LOCKS = new Lock[NUM_LOCKS];
+
+    static void lockNext(int idx, Runnable action) throws InterruptedException {
+        if (idx >= NUM_LOCKS) {
+            action.run();
+            return;
+        }
+        synchronized (LOCKS[idx]) {
+            LOCKS[idx].wait(1);
+            lockNext(idx + 1, action);
+        }
+    }
+
+    public static void main(String[] args) throws Exception {
+        List<RecordedEvent> events = new CopyOnWriteArrayList<>();
+        try (RecordingStream rs = new RecordingStream()) {
+            rs.enable(EVENT_NAME).with("period", "everyChunk");
+            rs.onEvent(EVENT_NAME, e -> events.add(e));
+            rs.startAsync();
+
+            // Recursively lock all, causing NUM_LOCKS monitors to exist.
+            // Stop the recording when holding all the locks, so that we
+            // get at least one event with NUM_LOCKS max.
+            for (int c = 0; c < NUM_LOCKS; c++) {
+                LOCKS[c] = new Lock();
+            }
+            lockNext(0, () -> rs.stop());
+
+            System.out.println(events);
+            assertFalse(events.isEmpty());
+
+            long globalCount = Long.MIN_VALUE;
+            for (RecordedEvent ev : events) {
+                long evCount = Events.assertField(ev, FIELD_COUNT).getValue();
+                assertTrue(evCount >= 0, "Count should be non-negative: " + evCount);
+                globalCount = Math.max(globalCount, evCount);
+            }
+
+            assertTrue(globalCount >= NUM_LOCKS, "Global count should be at least " + NUM_LOCKS + ": " + globalCount);
+        }
+    }
+}
diff --git a/test/lib/jdk/test/lib/jfr/EventNames.java b/test/lib/jdk/test/lib/jfr/EventNames.java
index 0ef1b5e6d3f..9aaa231b8a8 100644
--- a/test/lib/jdk/test/lib/jfr/EventNames.java
+++ b/test/lib/jdk/test/lib/jfr/EventNames.java
@@ -59,6 +59,8 @@ public class EventNames {
     public static final String JavaMonitorEnter = PREFIX + "JavaMonitorEnter";
     public static final String JavaMonitorWait = PREFIX + "JavaMonitorWait";
     public static final String JavaMonitorInflate = PREFIX + "JavaMonitorInflate";
+    public static final String JavaMonitorDeflate = PREFIX + "JavaMonitorDeflate";
+    public static final String JavaMonitorStatistics = PREFIX + "JavaMonitorStatistics";
     public static final String SyncOnValueBasedClass = PREFIX + "SyncOnValueBasedClass";
     public static final String ClassLoad = PREFIX + "ClassLoad";
     public static final String ClassDefine = PREFIX + "ClassDefine";

From 930455b59608b547017c9649efeb6bd381340c34 Mon Sep 17 00:00:00 2001
From: Aleksey Shipilev <shade@openjdk.org>
Date: Wed, 12 Mar 2025 19:45:31 +0000
Subject: [PATCH 321/587] 8351640: Print reason for making method not entrant

Co-authored-by: Vladimir Ivanov <vlivanov@openjdk.org>
Reviewed-by: vlivanov, kvn
---
 src/hotspot/share/c1/c1_Runtime1.cpp          |  8 ++---
 src/hotspot/share/ci/ciReplay.cpp             |  2 +-
 src/hotspot/share/code/codeCache.cpp          |  2 +-
 src/hotspot/share/code/nmethod.cpp            | 22 +++++++++-----
 src/hotspot/share/code/nmethod.hpp            |  6 ++--
 .../share/compiler/compilationPolicy.cpp      |  4 +--
 src/hotspot/share/jvmci/jvmciCompilerToVM.cpp |  4 +--
 src/hotspot/share/jvmci/jvmciEnv.cpp          |  4 +--
 src/hotspot/share/jvmci/jvmciRuntime.cpp      |  4 +--
 src/hotspot/share/oops/instanceKlass.cpp      |  2 +-
 src/hotspot/share/oops/method.cpp             |  2 +-
 src/hotspot/share/prims/whitebox.cpp          |  2 +-
 src/hotspot/share/runtime/deoptimization.cpp  |  4 +--
 src/hotspot/share/runtime/javaThread.cpp      |  2 +-
 .../sun/hotspot/tools/compiler/LogParser.java |  4 +++
 .../tools/compiler/MakeNotEntrantEvent.java   | 29 +++++++++++++++++--
 16 files changed, 68 insertions(+), 33 deletions(-)

diff --git a/src/hotspot/share/c1/c1_Runtime1.cpp b/src/hotspot/share/c1/c1_Runtime1.cpp
index 3a30c9846aa..e1602749439 100644
--- a/src/hotspot/share/c1/c1_Runtime1.cpp
+++ b/src/hotspot/share/c1/c1_Runtime1.cpp
@@ -795,7 +795,7 @@ JRT_ENTRY(void, Runtime1::deoptimize(JavaThread* current, jint trap_request))
   Deoptimization::DeoptReason reason = Deoptimization::trap_request_reason(trap_request);
 
   if (action == Deoptimization::Action_make_not_entrant) {
-    if (nm->make_not_entrant()) {
+    if (nm->make_not_entrant("C1 deoptimize")) {
       if (reason == Deoptimization::Reason_tenured) {
         MethodData* trap_mdo = Deoptimization::get_method_data(current, method, true /*create_if_missing*/);
         if (trap_mdo != nullptr) {
@@ -1087,7 +1087,7 @@ JRT_ENTRY(void, Runtime1::patch_code(JavaThread* current, C1StubId stub_id ))
     // safepoint, but if it's still alive then make it not_entrant.
     nmethod* nm = CodeCache::find_nmethod(caller_frame.pc());
     if (nm != nullptr) {
-      nm->make_not_entrant();
+      nm->make_not_entrant("C1 code patch");
     }
 
     Deoptimization::deoptimize_frame(current, caller_frame.id());
@@ -1335,7 +1335,7 @@ void Runtime1::patch_code(JavaThread* current, C1StubId stub_id) {
     // Make sure the nmethod is invalidated, i.e. made not entrant.
     nmethod* nm = CodeCache::find_nmethod(caller_frame.pc());
     if (nm != nullptr) {
-      nm->make_not_entrant();
+      nm->make_not_entrant("C1 deoptimize for patching");
     }
   }
 
@@ -1463,7 +1463,7 @@ JRT_ENTRY(void, Runtime1::predicate_failed_trap(JavaThread* current))
 
   nmethod* nm = CodeCache::find_nmethod(caller_frame.pc());
   assert (nm != nullptr, "no more nmethod?");
-  nm->make_not_entrant();
+  nm->make_not_entrant("C1 predicate failed trap");
 
   methodHandle m(current, nm->method());
   MethodData* mdo = m->method_data();
diff --git a/src/hotspot/share/ci/ciReplay.cpp b/src/hotspot/share/ci/ciReplay.cpp
index 1385bb637a9..669f316463c 100644
--- a/src/hotspot/share/ci/ciReplay.cpp
+++ b/src/hotspot/share/ci/ciReplay.cpp
@@ -802,7 +802,7 @@ class CompileReplay : public StackObj {
     // Make sure the existence of a prior compile doesn't stop this one
     nmethod* nm = (entry_bci != InvocationEntryBci) ? method->lookup_osr_nmethod_for(entry_bci, comp_level, true) : method->code();
     if (nm != nullptr) {
-      nm->make_not_entrant();
+      nm->make_not_entrant("CI replay");
     }
     replay_state = this;
     CompileBroker::compile_method(methodHandle(THREAD, method), entry_bci, comp_level,
diff --git a/src/hotspot/share/code/codeCache.cpp b/src/hotspot/share/code/codeCache.cpp
index e59417466d6..902d4345622 100644
--- a/src/hotspot/share/code/codeCache.cpp
+++ b/src/hotspot/share/code/codeCache.cpp
@@ -1361,7 +1361,7 @@ void CodeCache::make_marked_nmethods_deoptimized() {
   while(iter.next()) {
     nmethod* nm = iter.method();
     if (nm->is_marked_for_deoptimization() && !nm->has_been_deoptimized() && nm->can_be_deoptimized()) {
-      nm->make_not_entrant();
+      nm->make_not_entrant("marked for deoptimization");
       nm->make_deoptimized();
     }
   }
diff --git a/src/hotspot/share/code/nmethod.cpp b/src/hotspot/share/code/nmethod.cpp
index 9a7a16d1ee3..01ace66f4de 100644
--- a/src/hotspot/share/code/nmethod.cpp
+++ b/src/hotspot/share/code/nmethod.cpp
@@ -1964,21 +1964,27 @@ void nmethod::invalidate_osr_method() {
   }
 }
 
-void nmethod::log_state_change() const {
+void nmethod::log_state_change(const char* reason) const {
+  assert(reason != nullptr, "Must provide a reason");
+
   if (LogCompilation) {
     if (xtty != nullptr) {
       ttyLocker ttyl;  // keep the following output all in one block
-      xtty->begin_elem("make_not_entrant thread='%zu'",
-                       os::current_thread_id());
+      xtty->begin_elem("make_not_entrant thread='%zu' reason='%s'",
+                       os::current_thread_id(), reason);
       log_identity(xtty);
       xtty->stamp();
       xtty->end_elem();
     }
   }
 
-  CompileTask::print_ul(this, "made not entrant");
+  ResourceMark rm;
+  stringStream ss(NEW_RESOURCE_ARRAY(char, 256), 256);
+  ss.print("made not entrant: %s", reason);
+
+  CompileTask::print_ul(this, ss.freeze());
   if (PrintCompilation) {
-    print_on_with_msg(tty, "made not entrant");
+    print_on_with_msg(tty, ss.freeze());
   }
 }
 
@@ -1989,7 +1995,9 @@ void nmethod::unlink_from_method() {
 }
 
 // Invalidate code
-bool nmethod::make_not_entrant() {
+bool nmethod::make_not_entrant(const char* reason) {
+  assert(reason != nullptr, "Must provide a reason");
+
   // This can be called while the system is already at a safepoint which is ok
   NoSafepointVerifier nsv;
 
@@ -2047,7 +2055,7 @@ bool nmethod::make_not_entrant() {
     assert(success, "Transition can't fail");
 
     // Log the transition once
-    log_state_change();
+    log_state_change(reason);
 
     // Remove nmethod from method.
     unlink_from_method();
diff --git a/src/hotspot/share/code/nmethod.hpp b/src/hotspot/share/code/nmethod.hpp
index ed520d4f847..7b19cf75a76 100644
--- a/src/hotspot/share/code/nmethod.hpp
+++ b/src/hotspot/share/code/nmethod.hpp
@@ -631,8 +631,8 @@ public:
   // alive.  It is used when an uncommon trap happens.  Returns true
   // if this thread changed the state of the nmethod or false if
   // another thread performed the transition.
-  bool  make_not_entrant();
-  bool  make_not_used()    { return make_not_entrant(); }
+  bool  make_not_entrant(const char* reason);
+  bool  make_not_used()    { return make_not_entrant("not used"); }
 
   bool  is_marked_for_deoptimization() const { return deoptimization_status() != not_marked; }
   bool  has_been_deoptimized() const { return deoptimization_status() == deoptimize_done; }
@@ -945,7 +945,7 @@ public:
   // Logging
   void log_identity(xmlStream* log) const;
   void log_new_nmethod() const;
-  void log_state_change() const;
+  void log_state_change(const char* reason) const;
 
   // Prints block-level comments, including nmethod specific block labels:
   void print_nmethod_labels(outputStream* stream, address block_begin, bool print_section_labels=true) const;
diff --git a/src/hotspot/share/compiler/compilationPolicy.cpp b/src/hotspot/share/compiler/compilationPolicy.cpp
index 82061d92daa..e9ae528d0a0 100644
--- a/src/hotspot/share/compiler/compilationPolicy.cpp
+++ b/src/hotspot/share/compiler/compilationPolicy.cpp
@@ -796,7 +796,7 @@ void CompilationPolicy::compile(const methodHandle& mh, int bci, CompLevel level
         nmethod* osr_nm = mh->lookup_osr_nmethod_for(bci, CompLevel_simple, false);
         if (osr_nm != nullptr && osr_nm->comp_level() > CompLevel_simple) {
           // Invalidate the existing OSR nmethod so that a compile at CompLevel_simple is permitted.
-          osr_nm->make_not_entrant();
+          osr_nm->make_not_entrant("OSR invalidation for compiling with C1");
         }
         compile(mh, bci, CompLevel_simple, THREAD);
       }
@@ -1201,7 +1201,7 @@ void CompilationPolicy::method_back_branch_event(const methodHandle& mh, const m
               int osr_bci = nm->is_osr_method() ? nm->osr_entry_bci() : InvocationEntryBci;
               print_event(MAKE_NOT_ENTRANT, mh(), mh(), osr_bci, level);
             }
-            nm->make_not_entrant();
+            nm->make_not_entrant("OSR invalidation, back branch");
           }
         }
         // Fix up next_level if necessary to avoid deopts
diff --git a/src/hotspot/share/jvmci/jvmciCompilerToVM.cpp b/src/hotspot/share/jvmci/jvmciCompilerToVM.cpp
index f2807dbecd7..2e42d5df55b 100644
--- a/src/hotspot/share/jvmci/jvmciCompilerToVM.cpp
+++ b/src/hotspot/share/jvmci/jvmciCompilerToVM.cpp
@@ -1369,7 +1369,7 @@ C2V_VMENTRY(void, reprofile, (JNIEnv* env, jobject, ARGUMENT_PAIR(method)))
 
   nmethod* code = method->code();
   if (code != nullptr) {
-    code->make_not_entrant();
+    code->make_not_entrant("JVMCI reprofile");
   }
 
   MethodData* method_data = method->method_data();
@@ -1809,7 +1809,7 @@ C2V_VMENTRY(void, materializeVirtualObjects, (JNIEnv* env, jobject, jobject _hs_
     if (!fst.current()->is_compiled_frame()) {
       JVMCI_THROW_MSG(IllegalStateException, "compiled stack frame expected");
     }
-    fst.current()->cb()->as_nmethod()->make_not_entrant();
+    fst.current()->cb()->as_nmethod()->make_not_entrant("JVMCI materialize virtual objects");
   }
   Deoptimization::deoptimize(thread, *fst.current(), Deoptimization::Reason_none);
   // look for the frame again as it has been updated by deopt (pc, deopt state...)
diff --git a/src/hotspot/share/jvmci/jvmciEnv.cpp b/src/hotspot/share/jvmci/jvmciEnv.cpp
index e628a1b2e51..c9c98508dc7 100644
--- a/src/hotspot/share/jvmci/jvmciEnv.cpp
+++ b/src/hotspot/share/jvmci/jvmciEnv.cpp
@@ -1775,7 +1775,7 @@ void JVMCIEnv::invalidate_nmethod_mirror(JVMCIObject mirror, bool deoptimize, JV
 
   if (!deoptimize) {
     // Prevent future executions of the nmethod but let current executions complete.
-    nm->make_not_entrant();
+    nm->make_not_entrant("JVMCI invalidate nmethod mirror");
 
     // Do not clear the address field here as the Java code may still
     // want to later call this method with deoptimize == true. That requires
@@ -1784,7 +1784,7 @@ void JVMCIEnv::invalidate_nmethod_mirror(JVMCIObject mirror, bool deoptimize, JV
     // Deoptimize the nmethod immediately.
     DeoptimizationScope deopt_scope;
     deopt_scope.mark(nm);
-    nm->make_not_entrant();
+    nm->make_not_entrant("JVMCI invalidate nmethod mirror");
     nm->make_deoptimized();
     deopt_scope.deoptimize_marked();
 
diff --git a/src/hotspot/share/jvmci/jvmciRuntime.cpp b/src/hotspot/share/jvmci/jvmciRuntime.cpp
index c88a4390590..018824a03e9 100644
--- a/src/hotspot/share/jvmci/jvmciRuntime.cpp
+++ b/src/hotspot/share/jvmci/jvmciRuntime.cpp
@@ -2195,8 +2195,8 @@ JVMCI::CodeInstallResult JVMCIRuntime::register_method(JVMCIEnv* JVMCIENV,
               char *method_name = method->name_and_sig_as_C_string();
               tty->print_cr("Replacing method %s", method_name);
             }
-            if (old != nullptr ) {
-              old->make_not_entrant();
+            if (old != nullptr) {
+              old->make_not_entrant("JVMCI register method");
             }
 
             LogTarget(Info, nmethod, install) lt;
diff --git a/src/hotspot/share/oops/instanceKlass.cpp b/src/hotspot/share/oops/instanceKlass.cpp
index fb1b84b826a..36b7b8778a0 100644
--- a/src/hotspot/share/oops/instanceKlass.cpp
+++ b/src/hotspot/share/oops/instanceKlass.cpp
@@ -3503,7 +3503,7 @@ void InstanceKlass::add_osr_nmethod(nmethod* n) {
   for (int l = CompLevel_limited_profile; l < n->comp_level(); l++) {
     nmethod *inv = lookup_osr_nmethod(n->method(), n->osr_entry_bci(), l, true);
     if (inv != nullptr && inv->is_in_use()) {
-      inv->make_not_entrant();
+      inv->make_not_entrant("OSR invalidation of lower levels");
     }
   }
 }
diff --git a/src/hotspot/share/oops/method.cpp b/src/hotspot/share/oops/method.cpp
index 1a3b908434f..012420aaf50 100644
--- a/src/hotspot/share/oops/method.cpp
+++ b/src/hotspot/share/oops/method.cpp
@@ -970,7 +970,7 @@ void Method::set_native_function(address function, bool post_event_flag) {
   // If so, we have to make it not_entrant.
   nmethod* nm = code(); // Put it into local variable to guard against concurrent updates
   if (nm != nullptr) {
-    nm->make_not_entrant();
+    nm->make_not_entrant("set native function");
   }
 }
 
diff --git a/src/hotspot/share/prims/whitebox.cpp b/src/hotspot/share/prims/whitebox.cpp
index dd5a23f9209..4f57718f200 100644
--- a/src/hotspot/share/prims/whitebox.cpp
+++ b/src/hotspot/share/prims/whitebox.cpp
@@ -783,7 +783,7 @@ class VM_WhiteBoxDeoptimizeFrames : public VM_WhiteBoxOperation {
             if (_make_not_entrant) {
                 nmethod* nm = CodeCache::find_nmethod(f->pc());
                 assert(nm != nullptr, "did not find nmethod");
-                nm->make_not_entrant();
+                nm->make_not_entrant("Whitebox deoptimization");
             }
             ++_result;
           }
diff --git a/src/hotspot/share/runtime/deoptimization.cpp b/src/hotspot/share/runtime/deoptimization.cpp
index 167b3095fa9..748cd0d7939 100644
--- a/src/hotspot/share/runtime/deoptimization.cpp
+++ b/src/hotspot/share/runtime/deoptimization.cpp
@@ -1807,7 +1807,7 @@ void Deoptimization::deoptimize(JavaThread* thread, frame fr, DeoptReason reason
 #if INCLUDE_JVMCI
 address Deoptimization::deoptimize_for_missing_exception_handler(nmethod* nm) {
   // there is no exception handler for this pc => deoptimize
-  nm->make_not_entrant();
+  nm->make_not_entrant("missing exception handler");
 
   // Use Deoptimization::deoptimize for all of its side-effects:
   // gathering traps statistics, logging...
@@ -2436,7 +2436,7 @@ JRT_ENTRY(void, Deoptimization::uncommon_trap_inner(JavaThread* current, jint tr
 
     // Recompile
     if (make_not_entrant) {
-      if (!nm->make_not_entrant()) {
+      if (!nm->make_not_entrant("uncommon trap")) {
         return; // the call did not change nmethod's state
       }
 
diff --git a/src/hotspot/share/runtime/javaThread.cpp b/src/hotspot/share/runtime/javaThread.cpp
index 029c9845114..9579737396a 100644
--- a/src/hotspot/share/runtime/javaThread.cpp
+++ b/src/hotspot/share/runtime/javaThread.cpp
@@ -1342,7 +1342,7 @@ void JavaThread::make_zombies() {
       // it is a Java nmethod
       nmethod* nm = CodeCache::find_nmethod(fst.current()->pc());
       assert(nm != nullptr, "did not find nmethod");
-      nm->make_not_entrant();
+      nm->make_not_entrant("zombie");
     }
   }
 }
diff --git a/src/utils/LogCompilation/src/main/java/com/sun/hotspot/tools/compiler/LogParser.java b/src/utils/LogCompilation/src/main/java/com/sun/hotspot/tools/compiler/LogParser.java
index e1e305abe10..61cbc054200 100644
--- a/src/utils/LogCompilation/src/main/java/com/sun/hotspot/tools/compiler/LogParser.java
+++ b/src/utils/LogCompilation/src/main/java/com/sun/hotspot/tools/compiler/LogParser.java
@@ -1099,6 +1099,10 @@ public class LogParser extends DefaultHandler implements ErrorHandler {
             e.setCompileKind(compileKind);
             String level = atts.getValue("level");
             e.setLevel(level);
+            String reason = atts.getValue("reason");
+            if (reason != null) {
+              e.setReason(reason);
+            }
             events.add(e);
         } else if (qname.equals("uncommon_trap")) {
             String id = atts.getValue("compile_id");
diff --git a/src/utils/LogCompilation/src/main/java/com/sun/hotspot/tools/compiler/MakeNotEntrantEvent.java b/src/utils/LogCompilation/src/main/java/com/sun/hotspot/tools/compiler/MakeNotEntrantEvent.java
index b4015537c74..d230f1b4336 100644
--- a/src/utils/LogCompilation/src/main/java/com/sun/hotspot/tools/compiler/MakeNotEntrantEvent.java
+++ b/src/utils/LogCompilation/src/main/java/com/sun/hotspot/tools/compiler/MakeNotEntrantEvent.java
@@ -47,6 +47,11 @@ class MakeNotEntrantEvent extends BasicLogEvent {
      */
     private String level;
 
+    /**
+     * The reason of invalidation.
+     */
+    private String reason;
+
     /**
      * The compile kind.
      */
@@ -64,10 +69,14 @@ class MakeNotEntrantEvent extends BasicLogEvent {
 
     public void print(PrintStream stream, boolean printID) {
         if (isZombie()) {
-            stream.printf("%s make_zombie\n", getId());
+            stream.printf("%s make_zombie", getId());
         } else {
-            stream.printf("%s make_not_entrant\n", getId());
+            stream.printf("%s make_not_entrant", getId());
         }
+        if (getReason() != null) {
+            stream.printf(": %s", getReason());
+        }
+        stream.println();
     }
 
     public boolean isZombie() {
@@ -88,7 +97,21 @@ class MakeNotEntrantEvent extends BasicLogEvent {
       this.level = level;
   }
 
-    /**
+  /**
+   * @return the reason
+   */
+  public String getReason() {
+      return reason;
+  }
+
+  /**
+   * @param reason the reason to set
+   */
+  public void setReason(String reason) {
+      this.reason = reason;
+  }
+
+  /**
    * @return the compileKind
    */
   public String getCompileKind() {

From cdf7632f8a85611077a27c91ad928ed8ea116f95 Mon Sep 17 00:00:00 2001
From: William Kemper <wkemper@openjdk.org>
Date: Wed, 12 Mar 2025 20:12:53 +0000
Subject: [PATCH 322/587] 8351444: Shenandoah: Class Unloading may encounter
 recycled oops

Reviewed-by: shade, rkennke
---
 .../shenandoahBarrierSet.inline.hpp           |  5 ++-
 .../gc/shenandoah/shenandoahConcurrentGC.cpp  | 21 ++++++------
 .../share/gc/shenandoah/shenandoahFreeSet.cpp |  5 ++-
 .../share/gc/shenandoah/shenandoahHeap.cpp    | 33 +++++++++++++------
 4 files changed, 40 insertions(+), 24 deletions(-)

diff --git a/src/hotspot/share/gc/shenandoah/shenandoahBarrierSet.inline.hpp b/src/hotspot/share/gc/shenandoah/shenandoahBarrierSet.inline.hpp
index 5d00688f671..4f114690f53 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahBarrierSet.inline.hpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahBarrierSet.inline.hpp
@@ -121,10 +121,9 @@ inline oop ShenandoahBarrierSet::load_reference_barrier(DecoratorSet decorators,
     return nullptr;
   }
 
-  // Prevent resurrection of unreachable objects that are visited during
-  // concurrent class-unloading.
+  // Allow runtime to see unreachable objects that are visited during concurrent class-unloading.
   if ((decorators & AS_NO_KEEPALIVE) != 0 &&
-      _heap->is_evacuation_in_progress() &&
+      _heap->is_concurrent_weak_root_in_progress() &&
       !_heap->marking_context()->is_marked(obj)) {
     return obj;
   }
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahConcurrentGC.cpp b/src/hotspot/share/gc/shenandoah/shenandoahConcurrentGC.cpp
index 62150a20db8..29fd4002578 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahConcurrentGC.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahConcurrentGC.cpp
@@ -150,15 +150,22 @@ bool ShenandoahConcurrentGC::collect(GCCause::Cause cause) {
     return false;
   }
 
+  assert(heap->is_concurrent_weak_root_in_progress(), "Must be doing weak roots now");
+
   // Concurrent stack processing
   if (heap->is_evacuation_in_progress()) {
     entry_thread_roots();
   }
 
-  // Process weak roots that might still point to regions that would be broken by cleanup
-  if (heap->is_concurrent_weak_root_in_progress()) {
-    entry_weak_refs();
-    entry_weak_roots();
+  // Process weak roots that might still point to regions that would be broken by cleanup.
+  // We cannot recycle regions because weak roots need to know what is marked in trashed regions.
+  entry_weak_refs();
+  entry_weak_roots();
+
+  // Perform concurrent class unloading before any regions get recycled. Class unloading may
+  // need to inspect unmarked objects in trashed regions.
+  if (heap->unload_classes()) {
+    entry_class_unloading();
   }
 
   // Final mark might have reclaimed some immediate garbage, kick cleanup to reclaim
@@ -168,12 +175,6 @@ bool ShenandoahConcurrentGC::collect(GCCause::Cause cause) {
 
   heap->free_set()->log_status_under_lock();
 
-  // Perform concurrent class unloading
-  if (heap->unload_classes() &&
-      heap->is_concurrent_weak_root_in_progress()) {
-    entry_class_unloading();
-  }
-
   // Processing strong roots
   // This may be skipped if there is nothing to update/evacuate.
   // If so, strong_root_in_progress would be unset.
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahFreeSet.cpp b/src/hotspot/share/gc/shenandoah/shenandoahFreeSet.cpp
index 138e0320748..8a3eeb6a74d 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahFreeSet.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahFreeSet.cpp
@@ -999,7 +999,10 @@ HeapWord* ShenandoahFreeSet::try_allocate_in(ShenandoahHeapRegion* r, Shenandoah
   assert (has_alloc_capacity(r), "Performance: should avoid full regions on this path: %zu", r->index());
   if (_heap->is_concurrent_weak_root_in_progress() && r->is_trash()) {
     // We cannot use this region for allocation when weak roots are in progress because the collector may need
-    // to reference unmarked oops during concurrent classunloading.
+    // to reference unmarked oops during concurrent classunloading. The collector also needs accurate marking
+    // information to determine which weak handles need to be null'd out. If the region is recycled before weak
+    // roots processing has finished, weak root processing may fail to null out a handle into a trashed region.
+    // This turns the handle into a dangling pointer and will crash or corrupt the heap.
     return nullptr;
   }
   HeapWord* result = nullptr;
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahHeap.cpp b/src/hotspot/share/gc/shenandoah/shenandoahHeap.cpp
index fc1ff230688..ad09aecbe68 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahHeap.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahHeap.cpp
@@ -818,18 +818,31 @@ size_t ShenandoahHeap::initial_capacity() const {
 }
 
 bool ShenandoahHeap::is_in(const void* p) const {
-  if (is_in_reserved(p)) {
-    if (is_full_gc_move_in_progress()) {
-      // Full GC move is running, we do not have a consistent region
-      // information yet. But we know the pointer is in heap.
-      return true;
-    }
-    // Now check if we point to a live section in active region.
-    ShenandoahHeapRegion* r = heap_region_containing(p);
-    return (r->is_active() && p < r->top());
-  } else {
+  if (!is_in_reserved(p)) {
     return false;
   }
+
+  if (is_full_gc_move_in_progress()) {
+    // Full GC move is running, we do not have a consistent region
+    // information yet. But we know the pointer is in heap.
+    return true;
+  }
+
+  // Now check if we point to a live section in active region.
+  const ShenandoahHeapRegion* r = heap_region_containing(p);
+  if (p >= r->top()) {
+    return false;
+  }
+
+  if (r->is_active()) {
+    return true;
+  }
+
+  // The region is trash, but won't be recycled until after concurrent weak
+  // roots. We also don't allow mutators to allocate from trash regions
+  // during weak roots. Concurrent class unloading may access unmarked oops
+  // in trash regions.
+  return r->is_trash() && is_concurrent_weak_root_in_progress();
 }
 
 void ShenandoahHeap::notify_soft_max_changed() {

From 5502ce733e77efa9f40116dd0e34d4d2333a48dc Mon Sep 17 00:00:00 2001
From: Chris Plummer <cjplummer@openjdk.org>
Date: Wed, 12 Mar 2025 20:39:38 +0000
Subject: [PATCH 323/587] 8351699: Problem list
 com/sun/jdi/JdbStopInNotificationThreadTest.java with ZGC

Reviewed-by: amenkov
---
 test/jdk/ProblemList-zgc.txt | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/test/jdk/ProblemList-zgc.txt b/test/jdk/ProblemList-zgc.txt
index e81ac813747..2bd7691be10 100644
--- a/test/jdk/ProblemList-zgc.txt
+++ b/test/jdk/ProblemList-zgc.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2020, 2025, Oracle and/or its affiliates. All rights reserved.
 # 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,4 +37,5 @@ sun/tools/jhsdb/SAGetoptTest.java                  8307393   generic-all
 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
+com/sun/jdi/ThreadMemoryLeakTest.java              8307402   generic-all
+com/sun/jdi/JdbStopInNotificationThreadTest.java   8351607   linux-all

From a347ecdedc098bd23598ba6acf28d77db01be066 Mon Sep 17 00:00:00 2001
From: William Kemper <wkemper@openjdk.org>
Date: Wed, 12 Mar 2025 20:42:41 +0000
Subject: [PATCH 324/587] 8350905: Shenandoah: Releasing a WeakHandle's
 referent may extend its lifetime

Reviewed-by: shade, ysr
---
 .../gc/shenandoah/shenandoahBarrierSet.inline.hpp      | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/src/hotspot/share/gc/shenandoah/shenandoahBarrierSet.inline.hpp b/src/hotspot/share/gc/shenandoah/shenandoahBarrierSet.inline.hpp
index 4f114690f53..20937b9d08e 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahBarrierSet.inline.hpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahBarrierSet.inline.hpp
@@ -152,10 +152,19 @@ inline void ShenandoahBarrierSet::enqueue(oop obj) {
 
 template <DecoratorSet decorators, typename T>
 inline void ShenandoahBarrierSet::satb_barrier(T *field) {
+  // Uninitialized and no-keepalive stores do not need barrier.
   if (HasDecorator<decorators, IS_DEST_UNINITIALIZED>::value ||
       HasDecorator<decorators, AS_NO_KEEPALIVE>::value) {
     return;
   }
+
+  // Stores to weak/phantom require no barrier. The original references would
+  // have been enqueued in the SATB buffer by the load barrier if they were needed.
+  if (HasDecorator<decorators, ON_WEAK_OOP_REF>::value ||
+      HasDecorator<decorators, ON_PHANTOM_OOP_REF>::value) {
+    return;
+  }
+
   if (ShenandoahSATBBarrier && _heap->is_concurrent_mark_in_progress()) {
     T heap_oop = RawAccess<>::oop_load(field);
     if (!CompressedOops::is_null(heap_oop)) {
@@ -260,6 +269,7 @@ inline void ShenandoahBarrierSet::AccessBarrier<decorators, BarrierSetT>::oop_st
 template <DecoratorSet decorators, typename BarrierSetT>
 template <typename T>
 inline void ShenandoahBarrierSet::AccessBarrier<decorators, BarrierSetT>::oop_store_not_in_heap(T* addr, oop value) {
+  assert((decorators & ON_UNKNOWN_OOP_REF) == 0, "Reference strength must be known");
   oop_store_common(addr, value);
 }
 

From 41cc049f425e0b7c90ad3870102366a836eb2209 Mon Sep 17 00:00:00 2001
From: Jatin Bhateja <jbhateja@openjdk.org>
Date: Thu, 13 Mar 2025 03:36:50 +0000
Subject: [PATCH 325/587] 8350840: C2: x64 Assembler::vpcmpeqq assert: failed:
 XMM register should be 0-15

Reviewed-by: sviswanathan, kvn
---
 src/hotspot/cpu/x86/c2_MacroAssembler_x86.cpp | 4 ++--
 test/jdk/ProblemList.txt                      | 1 -
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/hotspot/cpu/x86/c2_MacroAssembler_x86.cpp b/src/hotspot/cpu/x86/c2_MacroAssembler_x86.cpp
index f78f45f6f0b..8cf721f5b20 100644
--- a/src/hotspot/cpu/x86/c2_MacroAssembler_x86.cpp
+++ b/src/hotspot/cpu/x86/c2_MacroAssembler_x86.cpp
@@ -6855,7 +6855,7 @@ void C2_MacroAssembler::vpsign_extend_dq(BasicType elem_bt, XMMRegister dst, XMM
 
 void C2_MacroAssembler::vpgenmax_value(BasicType elem_bt, XMMRegister dst, XMMRegister allones, int vlen_enc, bool compute_allones) {
   if (compute_allones) {
-    if (vlen_enc == Assembler::AVX_512bit) {
+    if (VM_Version::supports_avx512vl() || vlen_enc == Assembler::AVX_512bit) {
       vpternlogd(allones, 0xff, allones, allones, vlen_enc);
     } else {
       vpcmpeqq(allones, allones, allones, vlen_enc);
@@ -6871,7 +6871,7 @@ void C2_MacroAssembler::vpgenmax_value(BasicType elem_bt, XMMRegister dst, XMMRe
 
 void C2_MacroAssembler::vpgenmin_value(BasicType elem_bt, XMMRegister dst, XMMRegister allones, int vlen_enc, bool compute_allones) {
   if (compute_allones) {
-    if (vlen_enc == Assembler::AVX_512bit) {
+    if (VM_Version::supports_avx512vl() || vlen_enc == Assembler::AVX_512bit) {
       vpternlogd(allones, 0xff, allones, allones, vlen_enc);
     } else {
       vpcmpeqq(allones, allones, allones, vlen_enc);
diff --git a/test/jdk/ProblemList.txt b/test/jdk/ProblemList.txt
index d7bed319ebe..8e2a9e9e2ca 100644
--- a/test/jdk/ProblemList.txt
+++ b/test/jdk/ProblemList.txt
@@ -748,7 +748,6 @@ sun/tools/jstat/jstatLineCounts4.sh                             8248691,8268211
 
 jdk/incubator/vector/ShortMaxVectorTests.java                   8306592 generic-i586
 jdk/incubator/vector/LoadJsvmlTest.java                         8305390 windows-x64
-jdk/incubator/vector/Long256VectorTests.java                    8350840 generic-x64
 
 ############################################################################
 

From a7ad4144c8663ed54b9b22cad5fc677273ae9e5c Mon Sep 17 00:00:00 2001
From: Ioi Lam <iklam@openjdk.org>
Date: Thu, 13 Mar 2025 04:57:43 +0000
Subject: [PATCH 326/587] 8351327: -XX:AOTMode=record interferes with
 application execution

Reviewed-by: shade, kvn, matsaave
---
 src/hotspot/share/cds/cdsConfig.cpp           |  2 +-
 src/hotspot/share/cds/metaspaceShared.cpp     |  4 +-
 .../appcds/aotClassLinking/TrainingRun.java   | 98 +++++++++++++++++++
 test/lib/jdk/test/lib/cds/CDSAppTester.java   | 25 ++++-
 4 files changed, 124 insertions(+), 5 deletions(-)
 create mode 100644 test/hotspot/jtreg/runtime/cds/appcds/aotClassLinking/TrainingRun.java

diff --git a/src/hotspot/share/cds/cdsConfig.cpp b/src/hotspot/share/cds/cdsConfig.cpp
index f50ae446363..da1d7af32db 100644
--- a/src/hotspot/share/cds/cdsConfig.cpp
+++ b/src/hotspot/share/cds/cdsConfig.cpp
@@ -561,7 +561,7 @@ bool CDSConfig::is_dumping_final_static_archive() {
 
 bool CDSConfig::allow_only_single_java_thread() {
   // See comments in JVM_StartThread()
-  return is_dumping_static_archive();
+  return is_dumping_classic_static_archive() || is_dumping_final_static_archive();
 }
 
 bool CDSConfig::is_using_archive() {
diff --git a/src/hotspot/share/cds/metaspaceShared.cpp b/src/hotspot/share/cds/metaspaceShared.cpp
index ee877c474b9..3658a28c102 100644
--- a/src/hotspot/share/cds/metaspaceShared.cpp
+++ b/src/hotspot/share/cds/metaspaceShared.cpp
@@ -823,8 +823,10 @@ void MetaspaceShared::preload_and_dump(TRAPS) {
 
   if (CDSConfig::new_aot_flags_used()) {
     if (CDSConfig::is_dumping_preimage_static_archive()) {
+      // We are in the JVM that runs the training run. Continue execution,
+      // so that it can finish all clean-up and return the correct exit
+      // code to the OS.
       tty->print_cr("AOTConfiguration recorded: %s", AOTConfiguration);
-      vm_exit(0);
     } else {
       // The JLI launcher only recognizes the "old" -Xshare:dump flag.
       // When the new -XX:AOTMode=create flag is used, we can't return
diff --git a/test/hotspot/jtreg/runtime/cds/appcds/aotClassLinking/TrainingRun.java b/test/hotspot/jtreg/runtime/cds/appcds/aotClassLinking/TrainingRun.java
new file mode 100644
index 00000000000..fd896fd6958
--- /dev/null
+++ b/test/hotspot/jtreg/runtime/cds/appcds/aotClassLinking/TrainingRun.java
@@ -0,0 +1,98 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact 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 -XX:AOTMode=record should not interfere with app execution: (1) thread creation; (2) exit code
+ * @bug 8351327
+ * @requires vm.cds.supports.aot.class.linking
+ * @comment work around JDK-8345635
+ * @requires !vm.jvmci.enabled
+ * @library /test/jdk/lib/testlibrary /test/lib
+ * @build TrainingRun
+ * @run driver jdk.test.lib.helpers.ClassFileInstaller -jar app.jar MyTestApp
+ * @run driver TrainingRun AOT
+ */
+
+import jdk.test.lib.cds.CDSAppTester;
+import jdk.test.lib.helpers.ClassFileInstaller;
+import jdk.test.lib.process.OutputAnalyzer;
+
+public class TrainingRun {
+    static final String appJar = ClassFileInstaller.getJarPath("app.jar");
+    static final String mainClass = "MyTestApp";
+
+    public static void main(String[] args) throws Exception {
+        (new Tester()).run(args);
+    }
+
+    static class Tester extends CDSAppTester {
+        public Tester() {
+            super(mainClass);
+
+            // CDSAppTester usually wants the app to return exit value 0, but this test
+            // checks whether the training run can return 2.
+            setCheckExitValue(false);
+        }
+
+        @Override
+        public String classpath(RunMode runMode) {
+            return appJar;
+        }
+
+        @Override
+        public String[] appCommandLine(RunMode runMode) {
+            return new String[] {
+                mainClass,
+            };
+        }
+
+        @Override
+        public void checkExecution(OutputAnalyzer out, RunMode runMode) {
+            if (runMode.isApplicationExecuted()) {
+                out.shouldHaveExitValue(2);
+                out.shouldContain("Hello: x is 1");
+            }
+        }
+    }
+}
+
+class MyTestApp {
+    volatile static int x = 0;
+
+    public static void main(String args[]) throws Exception {
+        Thread t = new Thread(() -> {
+                x = 1;
+        });
+        t.start();
+        t.join();
+
+        if (x != 1) {
+            throw new RuntimeException("x should be 1 but is " + x);
+        }
+        System.out.println("Hello: x is " + x);
+        System.out.println("I am calling System.exit(2)");
+        System.exit(2);
+    }
+}
diff --git a/test/lib/jdk/test/lib/cds/CDSAppTester.java b/test/lib/jdk/test/lib/cds/CDSAppTester.java
index 7b4ad6eb5c4..d9f28ed2455 100644
--- a/test/lib/jdk/test/lib/cds/CDSAppTester.java
+++ b/test/lib/jdk/test/lib/cds/CDSAppTester.java
@@ -56,7 +56,6 @@ abstract public class CDSAppTester {
             throw new SkippedException("Tests based on CDSAppTester should be excluded when -Dtest.dynamic.cds.archive is specified");
         }
 
-        // Old workflow
         this.name = name;
         classListFile = name() + ".classlist";
         classListFileLog = classListFile + ".log";
@@ -89,7 +88,7 @@ abstract public class CDSAppTester {
         TRAINING,       // -XX:DumpLoadedClassList OR {-XX:AOTMode=create -XX:AOTConfiguration}
         DUMP_STATIC,    // -Xshare:dump
         DUMP_DYNAMIC,   // -XX:ArchiveClassesArExit
-        ASSEMBLY,       // JEP 483
+        ASSEMBLY,       // JEP 483 (assembly phase, app logic not executed)
         PRODUCTION;     // Running with the CDS archive produced from the above steps
 
         public boolean isStaticDump() {
@@ -98,6 +97,24 @@ abstract public class CDSAppTester {
         public boolean isProductionRun() {
             return this == PRODUCTION;
         }
+
+        // When <code>CDSAppTester::checkExecution(out, runMode)</code> is called, has the application been
+        // executed? If so, <code>out</code> should contain logs printed by the application's own logic.
+        public boolean isApplicationExecuted() {
+            return (this != ASSEMBLY) && (this != DUMP_STATIC);
+        }
+    }
+
+    public boolean isDumping(RunMode runMode) {
+        if (isStaticWorkflow()) {
+            return runMode == RunMode.DUMP_STATIC;
+        } else if (isDynamicWorkflow()) {
+            return runMode == RunMode.DUMP_DYNAMIC;
+        } else if (isAOTWorkflow()) {
+            return runMode == RunMode.TRAINING || runMode == RunMode.ASSEMBLY;
+        } else {
+            return false;
+        }
     }
 
     public final String name() {
@@ -184,7 +201,9 @@ abstract public class CDSAppTester {
                                                    "-XX:AOTConfiguration=" + aotConfigurationFile,
                                                    "-cp", classpath(runMode),
                                                    logToFile(aotConfigurationFileLog,
-                                                             "class+load=debug"));
+                                                             "class+load=debug",
+                                                             "cds=debug",
+                                                             "cds+class=debug"));
         cmdLine = StringArrayUtils.concat(cmdLine, appCommandLine(runMode));
         return executeAndCheck(cmdLine, runMode, aotConfigurationFile, aotConfigurationFileLog);
     }

From 0e7d460e4f95cb0209f9b815fe8c9846de4c9b7e Mon Sep 17 00:00:00 2001
From: Hamlin Li <mli@openjdk.org>
Date: Thu, 13 Mar 2025 08:12:38 +0000
Subject: [PATCH 327/587] 8351662: [Test] RISC-V: enable bunch of IR test

Reviewed-by: fyang, rehn, tonyp
---
 .../RotateLeftNodeIntIdealizationTests.java   |  2 +-
 .../RotateLeftNodeLongIdealizationTests.java  |  2 +-
 .../irTests/TestAutoVecCountingDownLoop.java  |  2 +-
 .../irTests/TestAutoVectorization2DArray.java |  2 +-
 .../jtreg/compiler/c2/irTests/TestIRAbs.java  |  2 +-
 .../c2/irTests/TestMinMaxIdentities.java      | 24 ++++++++-----
 .../irTests/TestPhiDuplicatedConversion.java  |  4 +--
 .../TestVectorizationMismatchedAccess.java    | 32 ++++++++---------
 .../irTests/TestVectorizationMultiInvar.java  |  2 +-
 .../c2/irTests/TestVectorizationNotRun.java   |  2 +-
 .../irTests/TestVectorizeTypeConversion.java  |  2 +-
 .../vectorization/TestAutoVecIntMinMax.java   |  7 ++--
 .../TestBufferVectorization.java              | 10 +++---
 .../vectorization/TestOptionVectorizeIR.java  | 28 +++++++--------
 .../vectorization/TestPopulateIndex.java      |  3 +-
 .../vectorization/runner/ArrayCopyTest.java   | 24 ++++++-------
 .../runner/ArrayIndexFillTest.java            | 28 +++++++--------
 .../runner/ArrayInvariantFillTest.java        | 36 +++++++++----------
 .../runner/ArrayTypeConvertTest.java          | 32 ++++++++---------
 .../runner/BasicBooleanOpTest.java            |  6 ++--
 .../vectorization/runner/BasicByteOpTest.java | 22 ++++++------
 .../vectorization/runner/BasicCharOpTest.java | 27 +++++++-------
 .../runner/BasicFloatOpTest.java              | 30 +++++++++++-----
 .../vectorization/runner/BasicLongOpTest.java | 24 ++++++-------
 .../runner/BasicShortOpTest.java              | 27 +++++++-------
 .../runner/LoopCombinedOpTest.java            | 32 ++++++++---------
 .../runner/LoopControlFlowTest.java           |  2 +-
 .../runner/LoopLiveOutNodesTest.java          | 10 +++---
 .../runner/LoopRangeStrideTest.java           | 20 +++++------
 .../runner/LoopReductionOpTest.java           | 10 +++---
 .../runner/MultipleLoopsTest.java             | 10 +++---
 .../runner/StripMinedLoopTest.java            |  2 +-
 32 files changed, 241 insertions(+), 225 deletions(-)

diff --git a/test/hotspot/jtreg/compiler/c2/irTests/RotateLeftNodeIntIdealizationTests.java b/test/hotspot/jtreg/compiler/c2/irTests/RotateLeftNodeIntIdealizationTests.java
index 7ec9d98aae0..e3651129daa 100644
--- a/test/hotspot/jtreg/compiler/c2/irTests/RotateLeftNodeIntIdealizationTests.java
+++ b/test/hotspot/jtreg/compiler/c2/irTests/RotateLeftNodeIntIdealizationTests.java
@@ -31,7 +31,7 @@ import compiler.lib.ir_framework.*;
  * @summary Test that Ideal transformations of RotateLeftNode* are being performed as expected.
  * @library /test/lib /
  * @run driver compiler.c2.irTests.RotateLeftNodeIntIdealizationTests
- * @requires os.arch == "x86_64" | os.arch == "aarch64" | (os.arch == "riscv64" & vm.opt.UseZbb == true)
+ * @requires os.arch == "x86_64" | os.arch == "aarch64" | (os.arch == "riscv64" & vm.cpu.features ~= ".*zbb.*")
  */
 public class RotateLeftNodeIntIdealizationTests {
 
diff --git a/test/hotspot/jtreg/compiler/c2/irTests/RotateLeftNodeLongIdealizationTests.java b/test/hotspot/jtreg/compiler/c2/irTests/RotateLeftNodeLongIdealizationTests.java
index dcc69d5721a..190f08d348c 100644
--- a/test/hotspot/jtreg/compiler/c2/irTests/RotateLeftNodeLongIdealizationTests.java
+++ b/test/hotspot/jtreg/compiler/c2/irTests/RotateLeftNodeLongIdealizationTests.java
@@ -31,7 +31,7 @@ import compiler.lib.ir_framework.*;
  * @summary Test that Ideal transformations of RotateLeftNode* are being performed as expected.
  * @library /test/lib /
  * @run driver compiler.c2.irTests.RotateLeftNodeLongIdealizationTests
- * @requires os.arch == "x86_64" | os.arch == "aarch64" | (os.arch == "riscv64" & vm.opt.UseZbb == true)
+ * @requires os.arch == "x86_64" | os.arch == "aarch64" | (os.arch == "riscv64" & vm.cpu.features ~= ".*zbb.*")
  */
 public class RotateLeftNodeLongIdealizationTests {
 
diff --git a/test/hotspot/jtreg/compiler/c2/irTests/TestAutoVecCountingDownLoop.java b/test/hotspot/jtreg/compiler/c2/irTests/TestAutoVecCountingDownLoop.java
index 994ec1e9cc0..e1db414602d 100644
--- a/test/hotspot/jtreg/compiler/c2/irTests/TestAutoVecCountingDownLoop.java
+++ b/test/hotspot/jtreg/compiler/c2/irTests/TestAutoVecCountingDownLoop.java
@@ -29,7 +29,7 @@ import compiler.lib.ir_framework.*;
  * @test
  * @bug 8284981
  * @summary Auto-vectorization enhancement for special counting down loops
- * @requires os.arch=="amd64" | os.arch=="x86_64" | os.arch=="aarch64"
+ * @requires os.arch=="amd64" | os.arch=="x86_64" | os.arch=="aarch64" | os.arch=="riscv64"
  * @library /test/lib /
  * @run driver compiler.c2.irTests.TestAutoVecCountingDownLoop
  */
diff --git a/test/hotspot/jtreg/compiler/c2/irTests/TestAutoVectorization2DArray.java b/test/hotspot/jtreg/compiler/c2/irTests/TestAutoVectorization2DArray.java
index c9b2904d91c..9aedc64eff6 100644
--- a/test/hotspot/jtreg/compiler/c2/irTests/TestAutoVectorization2DArray.java
+++ b/test/hotspot/jtreg/compiler/c2/irTests/TestAutoVectorization2DArray.java
@@ -31,7 +31,7 @@ import compiler.lib.ir_framework.*;
  * @summary Auto-vectorization enhancement for two-dimensional array operations
  * @requires ((os.arch == "x86" | os.arch == "i386") & (vm.opt.UseSSE == "null" | vm.opt.UseSSE >= 2))
  *           | (os.arch != "x86" & os.arch != "i386" & os.arch != "riscv64")
- *           | (os.arch == "riscv64" & vm.opt.UseRVV == true)
+ *           | (os.arch == "riscv64" & vm.cpu.features ~= ".*rvv.*")
  * @library /test/lib /
  * @run driver compiler.c2.irTests.TestAutoVectorization2DArray
  */
diff --git a/test/hotspot/jtreg/compiler/c2/irTests/TestIRAbs.java b/test/hotspot/jtreg/compiler/c2/irTests/TestIRAbs.java
index 8ba786d6f20..a40c9eab12f 100644
--- a/test/hotspot/jtreg/compiler/c2/irTests/TestIRAbs.java
+++ b/test/hotspot/jtreg/compiler/c2/irTests/TestIRAbs.java
@@ -30,7 +30,7 @@ import compiler.lib.ir_framework.*;
  * @test
  * @bug 8276673 8280089
  * @summary Test abs nodes optimization in C2.
- * @requires os.arch=="amd64" | os.arch=="x86_64" | os.arch=="aarch64"
+ * @requires os.arch=="amd64" | os.arch=="x86_64" | os.arch=="aarch64" | os.arch=="riscv64"
  * @library /test/lib /
  * @run driver compiler.c2.irTests.TestIRAbs
  */
diff --git a/test/hotspot/jtreg/compiler/c2/irTests/TestMinMaxIdentities.java b/test/hotspot/jtreg/compiler/c2/irTests/TestMinMaxIdentities.java
index ef2a47ee614..05845fa4e88 100644
--- a/test/hotspot/jtreg/compiler/c2/irTests/TestMinMaxIdentities.java
+++ b/test/hotspot/jtreg/compiler/c2/irTests/TestMinMaxIdentities.java
@@ -143,13 +143,15 @@ public class TestMinMaxIdentities {
     // Floats
 
     @Test
-    @IR(applyIfCPUFeatureOr = {"avx", "true", "asimd", "true", "rvv", "true"}, counts = { IRNode.MIN_F, "1" })
+    @IR(applyIfCPUFeatureOr = {"avx", "true", "asimd", "true"}, counts = { IRNode.MIN_F, "1" })
+    @IR(applyIfPlatform = { "riscv64", "true" }, counts = { IRNode.MIN_F, "1" })
     public float floatMinMin(float a, float b) {
         return Math.min(a, Math.min(a, b));
     }
 
     @Test
-    @IR(applyIfCPUFeatureOr = {"avx", "true", "asimd", "true", "rvv", "true"}, counts = { IRNode.MAX_F, "1" })
+    @IR(applyIfCPUFeatureOr = {"avx", "true", "asimd", "true"}, counts = { IRNode.MAX_F, "1" })
+    @IR(applyIfPlatform = { "riscv64", "true" }, counts = { IRNode.MAX_F, "1" })
     public float floatMaxMax(float a, float b) {
         return Math.max(a, Math.max(a, b));
     }
@@ -157,13 +159,15 @@ public class TestMinMaxIdentities {
     // Doubles
 
     @Test
-    @IR(applyIfCPUFeatureOr = {"avx", "true", "asimd", "true", "rvv", "true"}, counts = { IRNode.MIN_D, "1" })
+    @IR(applyIfCPUFeatureOr = {"avx", "true", "asimd", "true"}, counts = { IRNode.MIN_D, "1" })
+    @IR(applyIfPlatform = { "riscv64", "true" }, counts = { IRNode.MIN_D, "1" })
     public double doubleMinMin(double a, double b) {
         return Math.min(a, Math.min(a, b));
     }
 
     @Test
-    @IR(applyIfCPUFeatureOr = {"avx", "true", "asimd", "true", "rvv", "true"}, counts = { IRNode.MAX_D, "1" })
+    @IR(applyIfCPUFeatureOr = {"avx", "true", "asimd", "true"}, counts = { IRNode.MAX_D, "1" })
+    @IR(applyIfPlatform = { "riscv64", "true" }, counts = { IRNode.MAX_D, "1" })
     public double doubleMaxMax(double a, double b) {
         return Math.max(a, Math.max(a, b));
     }
@@ -171,25 +175,29 @@ public class TestMinMaxIdentities {
     // Float and double identities that cannot be simplified due to NaN
 
     @Test
-    @IR(applyIfCPUFeatureOr = {"avx", "true", "asimd", "true", "rvv", "true"}, counts = { IRNode.MIN_F, "1", IRNode.MAX_F, "1" })
+    @IR(applyIfCPUFeatureOr = {"avx", "true", "asimd", "true"}, counts = { IRNode.MIN_F, "1", IRNode.MAX_F, "1" })
+    @IR(applyIfPlatform = { "riscv64", "true" }, counts = { IRNode.MIN_F, "1", IRNode.MAX_F, "1" })
     public float floatMinMax(float a, float b) {
         return Math.min(a, Math.max(a, b));
     }
 
     @Test
-    @IR(applyIfCPUFeatureOr = {"avx", "true", "asimd", "true", "rvv", "true"}, counts = { IRNode.MIN_F, "1", IRNode.MAX_F, "1" })
+    @IR(applyIfCPUFeatureOr = {"avx", "true", "asimd", "true"}, counts = { IRNode.MIN_F, "1", IRNode.MAX_F, "1" })
+    @IR(applyIfPlatform = { "riscv64", "true" }, counts = { IRNode.MIN_F, "1", IRNode.MAX_F, "1" })
     public float floatMaxMin(float a, float b) {
         return Math.max(a, Math.min(a, b));
     }
 
     @Test
-    @IR(applyIfCPUFeatureOr = {"avx", "true", "asimd", "true", "rvv", "true"}, counts = { IRNode.MIN_D, "1", IRNode.MAX_D, "1" })
+    @IR(applyIfCPUFeatureOr = {"avx", "true", "asimd", "true"}, counts = { IRNode.MIN_D, "1", IRNode.MAX_D, "1" })
+    @IR(applyIfPlatform = { "riscv64", "true" }, counts = { IRNode.MIN_D, "1", IRNode.MAX_D, "1" })
     public double doubleMinMax(double a, double b) {
         return Math.min(a, Math.max(a, b));
     }
 
     @Test
-    @IR(applyIfCPUFeatureOr = {"avx", "true", "asimd", "true", "rvv", "true"}, counts = { IRNode.MIN_D, "1", IRNode.MAX_D, "1" })
+    @IR(applyIfCPUFeatureOr = {"avx", "true", "asimd", "true"}, counts = { IRNode.MIN_D, "1", IRNode.MAX_D, "1" })
+    @IR(applyIfPlatform = { "riscv64", "true" }, counts = { IRNode.MIN_D, "1", IRNode.MAX_D, "1" })
     public double doubleMaxMin(double a, double b) {
         return Math.max(a, Math.min(a, b));
     }
diff --git a/test/hotspot/jtreg/compiler/c2/irTests/TestPhiDuplicatedConversion.java b/test/hotspot/jtreg/compiler/c2/irTests/TestPhiDuplicatedConversion.java
index 359b42f0fa2..b11bf6b7570 100644
--- a/test/hotspot/jtreg/compiler/c2/irTests/TestPhiDuplicatedConversion.java
+++ b/test/hotspot/jtreg/compiler/c2/irTests/TestPhiDuplicatedConversion.java
@@ -114,13 +114,13 @@ public class TestPhiDuplicatedConversion {
     }
 
     @Test
-    @IR(counts = {IRNode.CONV, "1"}, applyIfCPUFeatureOr = {"f16c", "true", "avx512vl", "true", "asimd", "true"})
+    @IR(counts = {IRNode.CONV, "1"}, applyIfCPUFeatureOr = {"f16c", "true", "avx512vl", "true", "asimd", "true", "rvv", "true"})
     public static short float2HalfFloat(boolean c, float a, float b) {
         return c ? Float.floatToFloat16(a) : Float.floatToFloat16(b);
     }
 
     @Test
-    @IR(counts = {IRNode.CONV, "1"}, applyIfCPUFeatureOr = {"f16c", "true", "avx512vl", "true", "asimd", "true"})
+    @IR(counts = {IRNode.CONV, "1"}, applyIfCPUFeatureOr = {"f16c", "true", "avx512vl", "true", "asimd", "true", "rvv", "true"})
     public static float halfFloat2Float(boolean c, short a, short b) {
         return c ? Float.float16ToFloat(a) : Float.float16ToFloat(b);
     }
diff --git a/test/hotspot/jtreg/compiler/c2/irTests/TestVectorizationMismatchedAccess.java b/test/hotspot/jtreg/compiler/c2/irTests/TestVectorizationMismatchedAccess.java
index c891145b08d..2a48e76ee67 100644
--- a/test/hotspot/jtreg/compiler/c2/irTests/TestVectorizationMismatchedAccess.java
+++ b/test/hotspot/jtreg/compiler/c2/irTests/TestVectorizationMismatchedAccess.java
@@ -166,7 +166,7 @@ public class TestVectorizationMismatchedAccess {
     @Test
     @IR(counts = { IRNode.LOAD_VECTOR_L, ">=1", IRNode.STORE_VECTOR, ">=1" },
         applyIfOr = {"UseCompactObjectHeaders", "false", "AlignVector", "false"},
-        applyIfCPUFeatureOr = {"sse2", "true", "asimd", "true"},
+        applyIfCPUFeatureOr = {"sse2", "true", "asimd", "true", "rvv", "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).
     //         might get fixed with JDK-8325155.
@@ -184,7 +184,7 @@ public class TestVectorizationMismatchedAccess {
     @Test
     @IR(counts = { IRNode.LOAD_VECTOR_L, ">=1", IRNode.STORE_VECTOR, ">=1" },
         applyIfOr = {"UseCompactObjectHeaders", "false", "AlignVector", "false"},
-        applyIfCPUFeatureOr = {"sse2", "true", "asimd", "true"},
+        applyIfCPUFeatureOr = {"sse2", "true", "asimd", "true", "rvv", "true"},
         applyIfPlatform = {"64-bit", "true"})
     // 32-bit: address has ConvL2I for cast of long to address, not supported.
     public static void testByteLong1b(byte[] dest, long[] src) {
@@ -200,7 +200,7 @@ public class TestVectorizationMismatchedAccess {
 
     @Test
     @IR(counts = { IRNode.LOAD_VECTOR_L, ">=1", IRNode.STORE_VECTOR, ">=1" },
-        applyIfCPUFeatureOr = {"sse2", "true", "asimd", "true"})
+        applyIfCPUFeatureOr = {"sse2", "true", "asimd", "true", "rvv", "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)
         for (int i = 0; i < src.length - 8; i++) {
@@ -215,7 +215,7 @@ public class TestVectorizationMismatchedAccess {
 
     @Test
     @IR(counts = { IRNode.LOAD_VECTOR_L, ">=1", IRNode.STORE_VECTOR, ">=1" },
-        applyIfCPUFeatureOr = {"sse2", "true", "asimd", "true"},
+        applyIfCPUFeatureOr = {"sse2", "true", "asimd", "true", "rvv", "true"},
         applyIfPlatform = {"64-bit", "true"})
     // 32-bit: address has ConvL2I for cast of long to address, not supported.
     public static void testByteLong1d(byte[] dest, long[] src) {
@@ -241,7 +241,7 @@ public class TestVectorizationMismatchedAccess {
     @Test
     @IR(counts = { IRNode.LOAD_VECTOR_L, ">=1", IRNode.STORE_VECTOR, ">=1" },
         applyIfOr = {"UseCompactObjectHeaders", "false", "AlignVector", "false"},
-        applyIfCPUFeatureOr = {"sse2", "true", "asimd", "true"},
+        applyIfCPUFeatureOr = {"sse2", "true", "asimd", "true", "rvv", "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).
     //         might get fixed with JDK-8325155.
@@ -259,7 +259,7 @@ public class TestVectorizationMismatchedAccess {
     @Test
     @IR(counts = { IRNode.LOAD_VECTOR_L, ">=1", IRNode.STORE_VECTOR, ">=1" },
         applyIfOr = {"UseCompactObjectHeaders", "false", "AlignVector", "false"},
-        applyIfCPUFeatureOr = {"sse2", "true", "asimd", "true"},
+        applyIfCPUFeatureOr = {"sse2", "true", "asimd", "true", "rvv", "true"},
         applyIfPlatform = {"64-bit", "true"})
     // 32-bit: address has ConvL2I for cast of long to address, not supported.
     public static void testByteLong2b(byte[] dest, long[] src) {
@@ -282,7 +282,7 @@ public class TestVectorizationMismatchedAccess {
     @Test
     @IR(counts = { IRNode.LOAD_VECTOR_L, ">=1", IRNode.STORE_VECTOR, ">=1" },
         applyIfOr = {"UseCompactObjectHeaders", "false", "AlignVector", "false"},
-        applyIfCPUFeatureOr = {"sse2", "true", "asimd", "true"},
+        applyIfCPUFeatureOr = {"sse2", "true", "asimd", "true", "rvv", "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).
     //         might get fixed with JDK-8325155.
@@ -300,7 +300,7 @@ public class TestVectorizationMismatchedAccess {
     @Test
     @IR(counts = { IRNode.LOAD_VECTOR_L, ">=1", IRNode.STORE_VECTOR, ">=1" },
         applyIfOr = {"UseCompactObjectHeaders", "false", "AlignVector", "false"},
-        applyIfCPUFeatureOr = {"sse2", "true", "asimd", "true"},
+        applyIfCPUFeatureOr = {"sse2", "true", "asimd", "true", "rvv", "true"},
         applyIfPlatform = {"64-bit", "true"})
     // 32-bit: address has ConvL2I for cast of long to address, not supported.
     public static void testByteLong3b(byte[] dest, long[] src) {
@@ -322,7 +322,7 @@ public class TestVectorizationMismatchedAccess {
 
     @Test
     @IR(counts = { IRNode.LOAD_VECTOR_L, ">=1", IRNode.STORE_VECTOR, ">=1" },
-        applyIfCPUFeatureOr = {"sse2", "true", "asimd", "true"},
+        applyIfCPUFeatureOr = {"sse2", "true", "asimd", "true", "rvv", "true"},
         applyIfPlatform = {"64-bit", "true"},
         applyIf = {"AlignVector", "false"})
     // 32-bit: offsets are badly aligned (UNSAFE.ARRAY_BYTE_BASE_OFFSET is 4 byte aligned, but not 8 byte aligned).
@@ -336,7 +336,7 @@ public class TestVectorizationMismatchedAccess {
 
     @Test
     @IR(counts = { IRNode.LOAD_VECTOR_L, ">=1", IRNode.STORE_VECTOR, ">=1" },
-        applyIfCPUFeatureOr = {"sse2", "true", "asimd", "true"},
+        applyIfCPUFeatureOr = {"sse2", "true", "asimd", "true", "rvv", "true"},
         applyIfPlatform = {"64-bit", "true"},
         applyIf = {"AlignVector", "false"})
     // 32-bit: address has ConvL2I for cast of long to address, not supported.
@@ -357,7 +357,7 @@ public class TestVectorizationMismatchedAccess {
     @Test
     @IR(counts = { IRNode.LOAD_VECTOR_L, ">=1", IRNode.STORE_VECTOR, ">=1" },
         applyIfOr = {"UseCompactObjectHeaders", "false", "AlignVector", "false"},
-        applyIfCPUFeatureOr = {"sse2", "true", "asimd", "true"},
+        applyIfCPUFeatureOr = {"sse2", "true", "asimd", "true", "rvv", "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).
     //         might get fixed with JDK-8325155.
@@ -375,7 +375,7 @@ public class TestVectorizationMismatchedAccess {
     @Test
     @IR(counts = { IRNode.LOAD_VECTOR_L, ">=1", IRNode.STORE_VECTOR, ">=1" },
         applyIfOr = {"UseCompactObjectHeaders", "false", "AlignVector", "false"},
-        applyIfCPUFeatureOr = {"sse2", "true", "asimd", "true"},
+        applyIfCPUFeatureOr = {"sse2", "true", "asimd", "true", "rvv", "true"},
         applyIfPlatform = {"64-bit", "true"})
     // 32-bit: address has ConvL2I for cast of long to address, not supported.
     public static void testByteLong5b(byte[] dest, long[] src, int start, int stop) {
@@ -399,7 +399,7 @@ public class TestVectorizationMismatchedAccess {
     @Test
     @IR(counts = { IRNode.LOAD_VECTOR_L, ">=1", IRNode.STORE_VECTOR, ">=1" },
         applyIfOr = {"UseCompactObjectHeaders", "false", "AlignVector", "false"},
-        applyIfCPUFeatureOr = {"sse2", "true", "asimd", "true"},
+        applyIfCPUFeatureOr = {"sse2", "true", "asimd", "true", "rvv", "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).
     //         might get fixed with JDK-8325155.
@@ -417,7 +417,7 @@ public class TestVectorizationMismatchedAccess {
     @Test
     @IR(counts = { IRNode.LOAD_VECTOR_L, ">=1", IRNode.STORE_VECTOR, ">=1" },
         applyIfOr = {"UseCompactObjectHeaders", "false", "AlignVector", "false"},
-        applyIfCPUFeatureOr = {"sse2", "true", "asimd", "true"},
+        applyIfCPUFeatureOr = {"sse2", "true", "asimd", "true", "rvv", "true"},
         applyIfPlatform = {"64-bit", "true"})
     // 32-bit: address has ConvL2I for cast of long to address, not supported.
     public static void testByteByte1b(byte[] dest, byte[] src) {
@@ -440,7 +440,7 @@ public class TestVectorizationMismatchedAccess {
     @Test
     @IR(counts = { IRNode.LOAD_VECTOR_L, ">=1", IRNode.STORE_VECTOR, ">=1" },
         applyIfOr = {"UseCompactObjectHeaders", "false", "AlignVector", "false"},
-        applyIfCPUFeatureOr = {"sse2", "true", "asimd", "true"},
+        applyIfCPUFeatureOr = {"sse2", "true", "asimd", "true", "rvv", "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).
     //         might get fixed with JDK-8325155.
@@ -458,7 +458,7 @@ public class TestVectorizationMismatchedAccess {
     @Test
     @IR(counts = { IRNode.LOAD_VECTOR_L, ">=1", IRNode.STORE_VECTOR, ">=1" },
         applyIfOr = {"UseCompactObjectHeaders", "false", "AlignVector", "false"},
-        applyIfCPUFeatureOr = {"sse2", "true", "asimd", "true"},
+        applyIfCPUFeatureOr = {"sse2", "true", "asimd", "true", "rvv", "true"},
         applyIfPlatform = {"64-bit", "true"})
     // 32-bit: address has ConvL2I for cast of long to address, not supported.
     public static void testByteByte2b(byte[] dest, byte[] src) {
diff --git a/test/hotspot/jtreg/compiler/c2/irTests/TestVectorizationMultiInvar.java b/test/hotspot/jtreg/compiler/c2/irTests/TestVectorizationMultiInvar.java
index 72276254ab2..1496a72bc3c 100644
--- a/test/hotspot/jtreg/compiler/c2/irTests/TestVectorizationMultiInvar.java
+++ b/test/hotspot/jtreg/compiler/c2/irTests/TestVectorizationMultiInvar.java
@@ -33,7 +33,7 @@ import java.util.Random;
 /*
  * @test
  * @bug 8300257
- * @requires (os.simpleArch == "x64") | (os.simpleArch == "aarch64")
+ * @requires (os.simpleArch == "x64") | (os.simpleArch == "aarch64") | (os.simpleArch == "riscv64")
  * @summary C2: vectorization fails on some simple Memory Segment loops
  * @modules java.base/jdk.internal.misc
  * @library /test/lib /
diff --git a/test/hotspot/jtreg/compiler/c2/irTests/TestVectorizationNotRun.java b/test/hotspot/jtreg/compiler/c2/irTests/TestVectorizationNotRun.java
index 27456bf9200..a69fdf76bb2 100644
--- a/test/hotspot/jtreg/compiler/c2/irTests/TestVectorizationNotRun.java
+++ b/test/hotspot/jtreg/compiler/c2/irTests/TestVectorizationNotRun.java
@@ -65,7 +65,7 @@ public class TestVectorizationNotRun {
     @IR(counts = { IRNode.LOAD_VECTOR_L, ">=1", IRNode.STORE_VECTOR, ">=1" },
         applyIfOr = { "UseCompactObjectHeaders", "false", "AlignVector", "false" },
         applyIfPlatform = {"64-bit", "true"},
-        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"})
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true", "rvv", "true"})
     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/hotspot/jtreg/compiler/c2/irTests/TestVectorizeTypeConversion.java b/test/hotspot/jtreg/compiler/c2/irTests/TestVectorizeTypeConversion.java
index 899be4bbc9c..01f52cae175 100644
--- a/test/hotspot/jtreg/compiler/c2/irTests/TestVectorizeTypeConversion.java
+++ b/test/hotspot/jtreg/compiler/c2/irTests/TestVectorizeTypeConversion.java
@@ -32,7 +32,7 @@ import jdk.test.lib.Utils;
  * @test
  * @bug 8283091
  * @summary Auto-vectorization enhancement for type conversion between different data sizes.
- * @requires (os.simpleArch == "x64" & vm.cpu.features ~= ".*avx2.*") | os.arch=="aarch64"
+ * @requires (os.simpleArch == "x64" & vm.cpu.features ~= ".*avx2.*") | os.arch=="aarch64" | os.arch=="riscv64"
  * @library /test/lib /
  * @run driver compiler.c2.irTests.TestVectorizeTypeConversion
  */
diff --git a/test/hotspot/jtreg/compiler/vectorization/TestAutoVecIntMinMax.java b/test/hotspot/jtreg/compiler/vectorization/TestAutoVecIntMinMax.java
index e3baed37804..6d868b48dd7 100644
--- a/test/hotspot/jtreg/compiler/vectorization/TestAutoVecIntMinMax.java
+++ b/test/hotspot/jtreg/compiler/vectorization/TestAutoVecIntMinMax.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, Arm Limited. All rights reserved.
+ * Copyright (c) 2022, 2025, Arm Limited. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -33,8 +33,9 @@ import jdk.test.lib.Utils;
  * @summary Auto-vectorization enhancement for integer Math.max/Math.min operations
  * @library /test/lib /
  * @requires vm.compiler2.enabled
- * @requires (os.simpleArch == "x64" & (vm.opt.UseSSE == "null" | vm.opt.UseSSE > 3))
- *           | os.arch == "aarch64" | (os.arch == "riscv64" & vm.opt.UseRVV == true)
+ * @requires (os.simpleArch == "x64" & (vm.opt.UseSSE == "null" | vm.opt.UseSSE > 3)) |
+ *           os.arch == "aarch64" |
+ *           (os.simpleArch == "riscv64" & vm.cpu.features ~= ".*rvv.*")
  * @run driver compiler.c2.irTests.TestAutoVecIntMinMax
  */
 
diff --git a/test/hotspot/jtreg/compiler/vectorization/TestBufferVectorization.java b/test/hotspot/jtreg/compiler/vectorization/TestBufferVectorization.java
index 76251ba99c8..fc44a476fc0 100644
--- a/test/hotspot/jtreg/compiler/vectorization/TestBufferVectorization.java
+++ b/test/hotspot/jtreg/compiler/vectorization/TestBufferVectorization.java
@@ -72,7 +72,7 @@ public class TestBufferVectorization {
                   IRNode.LOAD_VECTOR_I, ">0",
                   IRNode.ADD_VI,        ">0",
                   IRNode.STORE_VECTOR,  ">0"},
-        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"})
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true", "rvv", "true"})
     public static void testArray(int[] array) {
         for(int k = 0; k < array.length; k++) {
             array[k] += 1;
@@ -110,7 +110,7 @@ public class TestBufferVectorization {
                   IRNode.LOAD_VECTOR_I, ">0",
                   IRNode.ADD_VI,        ">0",
                   IRNode.STORE_VECTOR,  ">0"},
-        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"})
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true", "rvv", "true"})
     public static void testArrayOffset(int[] array, int offset) {
         int l = array.length - offset;
         for(int k = 0; k < l; k++) {
@@ -131,7 +131,7 @@ public class TestBufferVectorization {
                   IRNode.LOAD_VECTOR_I, ">0",
                   IRNode.ADD_VI,        ">0",
                   IRNode.STORE_VECTOR,  ">0"},
-        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"})
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true", "rvv", "true"})
     public static void testBuffer(IntBuffer buffer) {
         for (int k = 0; k < buffer.limit(); k++) {
             buffer.put(k, buffer.get(k) + 1);
@@ -151,7 +151,7 @@ public class TestBufferVectorization {
                   IRNode.LOAD_VECTOR_I, IRNode.VECTOR_SIZE_ANY, ">0",
                   IRNode.ADD_VI,        IRNode.VECTOR_SIZE_ANY, ">0",
                   IRNode.STORE_VECTOR,                          ">0"},
-        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"},
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true", "rvv", "true"},
         applyIf = {"AlignVector", "false"},
         applyIfPlatform = {"64-bit", "true"})
     // VECTOR_SIZE_ANY: Unrolling does not always seem to go far enough to reach maximum vector size.
@@ -226,7 +226,7 @@ public class TestBufferVectorization {
                   IRNode.LOAD_VECTOR_I, ">0",
                   IRNode.ADD_VI,        ">0",
                   IRNode.STORE_VECTOR,  ">0"},
-        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"})
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true", "rvv", "true"})
     public static void testArrayView(byte[] b_arr) {
         for (int k = 0; k < b_arr.length; k += 4) {
             int v = (int) VH_arr_view.get(b_arr, k);
diff --git a/test/hotspot/jtreg/compiler/vectorization/TestOptionVectorizeIR.java b/test/hotspot/jtreg/compiler/vectorization/TestOptionVectorizeIR.java
index 7d100704013..adb843dcf6f 100644
--- a/test/hotspot/jtreg/compiler/vectorization/TestOptionVectorizeIR.java
+++ b/test/hotspot/jtreg/compiler/vectorization/TestOptionVectorizeIR.java
@@ -222,7 +222,7 @@ public class TestOptionVectorizeIR {
     @Test
     @IR(counts = {IRNode.LOAD_VECTOR_I, "> 0", IRNode.ADD_VI, "> 0", IRNode.STORE_VECTOR, "> 0"},
         applyIf = {"AlignVector", "false"},
-        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"})
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true", "rvv", "true"})
     static void test2(int[] data) {
        for (int j = 0; j < RANGE - 1; j++) {
            // Only vectorizes if forced, because of offset by 1
@@ -233,7 +233,7 @@ public class TestOptionVectorizeIR {
     @Test
     @IR(counts = {IRNode.LOAD_VECTOR_I, "> 0", IRNode.REPLICATE_I, "> 0", IRNode.ADD_VI, "> 0", IRNode.MUL_VI, "> 0", IRNode.STORE_VECTOR, "> 0"},
         applyIf = {"AlignVector", "false"},
-        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"})
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true", "rvv", "true"})
     static void test3(int[] data, int A, int B) {
        for (int j = 0; j < RANGE - 1; j++) {
            // Only vectorizes if forced, because of offset by 1
@@ -275,7 +275,7 @@ public class TestOptionVectorizeIR {
     @Test
     @IR(counts = {IRNode.LOAD_VECTOR_L, "> 0", IRNode.ADD_VL, "> 0", IRNode.STORE_VECTOR, "> 0"},
         applyIf = {"AlignVector", "false"},
-        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"})
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true", "rvv", "true"})
     static void test10(long[] data) {
        for (int j = 2; j < RANGE - 2; j++) {
            data[j] += data[j + 2];
@@ -285,7 +285,7 @@ public class TestOptionVectorizeIR {
     @Test
     @IR(counts = {IRNode.LOAD_VECTOR_L, "> 0", IRNode.ADD_VL, "> 0", IRNode.STORE_VECTOR, "> 0"},
         applyIf = {"AlignVector", "false"},
-        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"})
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true", "rvv", "true"})
     static void test11(long[] data) {
        for (int j = 2; j < RANGE - 2; j++) {
            data[j] += data[j + 1];
@@ -349,7 +349,7 @@ public class TestOptionVectorizeIR {
     @Test
     @IR(counts = {IRNode.LOAD_VECTOR_S, "> 0", IRNode.ADD_VS, "> 0", IRNode.STORE_VECTOR, "> 0"},
         applyIf = {"AlignVector", "false"},
-        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"})
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true", "rvv", "true"})
     static void test20(short[] data) {
        for (int j = 2; j < RANGE - 2; j++) {
            data[j] += data[j + 2];
@@ -359,7 +359,7 @@ public class TestOptionVectorizeIR {
     @Test
     @IR(counts = {IRNode.LOAD_VECTOR_S, "> 0", IRNode.ADD_VS, "> 0", IRNode.STORE_VECTOR, "> 0"},
         applyIf = {"AlignVector", "false"},
-        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"})
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true", "rvv", "true"})
     static void test21(short[] data) {
        for (int j = 2; j < RANGE - 2; j++) {
            data[j] += data[j + 1];
@@ -422,7 +422,7 @@ public class TestOptionVectorizeIR {
     @Test
     @IR(counts = {IRNode.LOAD_VECTOR_B, "> 0", IRNode.ADD_VB, "> 0", IRNode.STORE_VECTOR, "> 0"},
         applyIf = {"AlignVector", "false"},
-        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"})
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true", "rvv", "true"})
     static void test30(byte[] data) {
        for (int j = 2; j < RANGE - 2; j++) {
            data[j] += data[j + 2];
@@ -432,7 +432,7 @@ public class TestOptionVectorizeIR {
     @Test
     @IR(counts = {IRNode.LOAD_VECTOR_B, "> 0", IRNode.ADD_VB, "> 0", IRNode.STORE_VECTOR, "> 0"},
         applyIf = {"AlignVector", "false"},
-        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"})
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true", "rvv", "true"})
     static void test31(byte[] data) {
        for (int j = 2; j < RANGE - 2; j++) {
            data[j] += data[j + 1];
@@ -495,7 +495,7 @@ public class TestOptionVectorizeIR {
     @Test
     @IR(counts = {IRNode.LOAD_VECTOR_C, "> 0", IRNode.ADD_VS, "> 0", IRNode.STORE_VECTOR, "> 0"},
         applyIf = {"AlignVector", "false"},
-        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"})
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true", "rvv", "true"})
     static void test40(char[] data) {
        for (int j = 2; j < RANGE - 2; j++) {
            data[j] += data[j + 2];
@@ -505,7 +505,7 @@ public class TestOptionVectorizeIR {
     @Test
     @IR(counts = {IRNode.LOAD_VECTOR_C, "> 0", IRNode.ADD_VS, "> 0", IRNode.STORE_VECTOR, "> 0"},
         applyIf = {"AlignVector", "false"},
-        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"})
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true", "rvv", "true"})
     static void test41(char[] data) {
        for (int j = 2; j < RANGE - 2; j++) {
            data[j] += data[j + 1];
@@ -567,7 +567,7 @@ public class TestOptionVectorizeIR {
     @Test
     @IR(counts = {IRNode.LOAD_VECTOR_F, "> 0", IRNode.ADD_VF, "> 0", IRNode.STORE_VECTOR, "> 0"},
         applyIf = {"AlignVector", "false"},
-        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"})
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true", "rvv", "true"})
     static void test50(float[] data) {
        for (int j = 2; j < RANGE - 2; j++) {
            data[j] += data[j + 2];
@@ -577,7 +577,7 @@ public class TestOptionVectorizeIR {
     @Test
     @IR(counts = {IRNode.LOAD_VECTOR_F, "> 0", IRNode.ADD_VF, "> 0", IRNode.STORE_VECTOR, "> 0"},
         applyIf = {"AlignVector", "false"},
-        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"})
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true", "rvv", "true"})
     static void test51(float[] data) {
        for (int j = 2; j < RANGE - 2; j++) {
            data[j] += data[j + 1];
@@ -639,7 +639,7 @@ public class TestOptionVectorizeIR {
     @Test
     @IR(counts = {IRNode.LOAD_VECTOR_D, "> 0", IRNode.ADD_VD, "> 0", IRNode.STORE_VECTOR, "> 0"},
         applyIf = {"AlignVector", "false"},
-        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"})
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true", "rvv", "true"})
     static void test60(double[] data) {
        for (int j = 2; j < RANGE - 2; j++) {
            data[j] += data[j + 2];
@@ -649,7 +649,7 @@ public class TestOptionVectorizeIR {
     @Test
     @IR(counts = {IRNode.LOAD_VECTOR_D, "> 0", IRNode.ADD_VD, "> 0", IRNode.STORE_VECTOR, "> 0"},
         applyIf = {"AlignVector", "false"},
-        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"})
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true", "rvv", "true"})
     static void test61(double[] data) {
        for (int j = 2; j < RANGE - 2; j++) {
            data[j] += data[j + 1];
diff --git a/test/hotspot/jtreg/compiler/vectorization/TestPopulateIndex.java b/test/hotspot/jtreg/compiler/vectorization/TestPopulateIndex.java
index afe733bad4b..c21e117f93a 100644
--- a/test/hotspot/jtreg/compiler/vectorization/TestPopulateIndex.java
+++ b/test/hotspot/jtreg/compiler/vectorization/TestPopulateIndex.java
@@ -27,7 +27,8 @@
 * @summary Test vectorization of loop induction variable usage in the loop
 * @requires vm.compiler2.enabled
 * @requires (os.simpleArch == "x64" & vm.cpu.features ~= ".*avx2.*") |
-*           (os.simpleArch == "aarch64" & vm.cpu.features ~= ".*sve.*")
+*           (os.simpleArch == "aarch64" & vm.cpu.features ~= ".*sve.*") |
+*           (os.simpleArch == "riscv64" & vm.cpu.features ~= ".*rvv.*")
 * @library /test/lib /
 * @run driver compiler.vectorization.TestPopulateIndex
 */
diff --git a/test/hotspot/jtreg/compiler/vectorization/runner/ArrayCopyTest.java b/test/hotspot/jtreg/compiler/vectorization/runner/ArrayCopyTest.java
index f334b4226a3..48b2ff754ad 100644
--- a/test/hotspot/jtreg/compiler/vectorization/runner/ArrayCopyTest.java
+++ b/test/hotspot/jtreg/compiler/vectorization/runner/ArrayCopyTest.java
@@ -75,7 +75,7 @@ public class ArrayCopyTest extends VectorizationTestRunner {
 
     // ---------------- Simple Copy ----------------
     @Test
-    @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse2", "true"},
+    @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse2", "true", "rvv", "true"},
         counts = {IRNode.STORE_VECTOR, ">0"})
     public byte[] copyByteArray() {
         byte[] res = new byte[SIZE];
@@ -86,7 +86,7 @@ public class ArrayCopyTest extends VectorizationTestRunner {
     }
 
     @Test
-    @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse2", "true"},
+    @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse2", "true", "rvv", "true"},
         counts = {IRNode.STORE_VECTOR, ">0"})
     public short[] copyShortArray() {
         short[] res = new short[SIZE];
@@ -97,7 +97,7 @@ public class ArrayCopyTest extends VectorizationTestRunner {
     }
 
     @Test
-    @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse2", "true"},
+    @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse2", "true", "rvv", "true"},
         counts = {IRNode.STORE_VECTOR, ">0"})
     public char[] copyCharArray() {
         char[] res = new char[SIZE];
@@ -108,7 +108,7 @@ public class ArrayCopyTest extends VectorizationTestRunner {
     }
 
     @Test
-    @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse2", "true"},
+    @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse2", "true", "rvv", "true"},
         counts = {IRNode.STORE_VECTOR, ">0"})
     public int[] copyIntArray() {
         int[] res = new int[SIZE];
@@ -119,7 +119,7 @@ public class ArrayCopyTest extends VectorizationTestRunner {
     }
 
     @Test
-    @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse2", "true"},
+    @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse2", "true", "rvv", "true"},
         counts = {IRNode.STORE_VECTOR, ">0"})
     public long[] copyLongArray() {
         long[] res = new long[SIZE];
@@ -130,7 +130,7 @@ public class ArrayCopyTest extends VectorizationTestRunner {
     }
 
     @Test
-    @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse2", "true"},
+    @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse2", "true", "rvv", "true"},
         counts = {IRNode.STORE_VECTOR, ">0"})
     public float[] copyFloatArray() {
         float[] res = new float[SIZE];
@@ -141,7 +141,7 @@ public class ArrayCopyTest extends VectorizationTestRunner {
     }
 
     @Test
-    @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse2", "true"},
+    @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse2", "true", "rvv", "true"},
         counts = {IRNode.STORE_VECTOR, ">0"})
     public double[] copyDoubleArray() {
         double[] res = new double[SIZE];
@@ -153,7 +153,7 @@ public class ArrayCopyTest extends VectorizationTestRunner {
 
     // ---------------- Multiple Copies ----------------
     @Test
-    @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse2", "true"},
+    @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse2", "true", "rvv", "true"},
         counts = {IRNode.STORE_VECTOR, ">0"})
     public float[] chainedCopy() {
         float[] res1 = new float[SIZE];
@@ -165,7 +165,7 @@ public class ArrayCopyTest extends VectorizationTestRunner {
     }
 
     @Test
-    @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse2", "true"},
+    @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse2", "true", "rvv", "true"},
         counts = {IRNode.STORE_VECTOR, ">0"})
     public int[] copy2ArraysSameSize() {
         int[] res1 = new int[SIZE];
@@ -178,7 +178,7 @@ public class ArrayCopyTest extends VectorizationTestRunner {
     }
 
     @Test
-    @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse2", "true"},
+    @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse2", "true", "rvv", "true"},
         counts = {IRNode.STORE_VECTOR, ">0"})
     public double[] copy2ArraysDifferentSizes() {
         int[] res1 = new int[SIZE];
@@ -192,7 +192,7 @@ public class ArrayCopyTest extends VectorizationTestRunner {
 
     // ---------------- Copy Between Signed & Unsigned ----------------
     @Test
-    @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse2", "true"},
+    @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse2", "true", "rvv", "true"},
         counts = {IRNode.STORE_VECTOR, ">0"})
     public char[] copyFromSignedToUnsigned() {
         char[] res = new char[SIZE];
@@ -203,7 +203,7 @@ public class ArrayCopyTest extends VectorizationTestRunner {
     }
 
     @Test
-    @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse2", "true"},
+    @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse2", "true", "rvv", "true"},
         counts = {IRNode.STORE_VECTOR, ">0"})
     public short[] copyFromUnsignedToSigned() {
         short[] res = new short[SIZE];
diff --git a/test/hotspot/jtreg/compiler/vectorization/runner/ArrayIndexFillTest.java b/test/hotspot/jtreg/compiler/vectorization/runner/ArrayIndexFillTest.java
index 5c9fc7d4f5c..16334103614 100644
--- a/test/hotspot/jtreg/compiler/vectorization/runner/ArrayIndexFillTest.java
+++ b/test/hotspot/jtreg/compiler/vectorization/runner/ArrayIndexFillTest.java
@@ -36,7 +36,7 @@
  *                   -XX:+WhiteBoxAPI
  *                   compiler.vectorization.runner.ArrayIndexFillTest
  *
- * @requires (os.simpleArch == "x64") | (os.simpleArch == "aarch64")
+ * @requires (os.simpleArch == "x64") | (os.simpleArch == "aarch64") | (os.simpleArch == "riscv64")
  * @requires vm.compiler2.enabled
  */
 
@@ -60,7 +60,7 @@ public class ArrayIndexFillTest extends VectorizationTestRunner {
     }
 
     @Test
-    @IR(applyIfCPUFeatureOr = {"sve", "true", "avx2", "true"},
+    @IR(applyIfCPUFeatureOr = {"sve", "true", "avx2", "true", "rvv", "true"},
         counts = {IRNode.POPULATE_INDEX, ">0"})
     public byte[] fillByteArray() {
         byte[] res = new byte[SIZE];
@@ -71,7 +71,7 @@ public class ArrayIndexFillTest extends VectorizationTestRunner {
     }
 
     @Test
-    @IR(applyIfCPUFeatureOr = {"sve", "true", "avx2", "true"},
+    @IR(applyIfCPUFeatureOr = {"sve", "true", "avx2", "true", "rvv", "true"},
         counts = {IRNode.POPULATE_INDEX, ">0"})
     public short[] fillShortArray() {
         short[] res = new short[SIZE];
@@ -82,7 +82,7 @@ public class ArrayIndexFillTest extends VectorizationTestRunner {
     }
 
     @Test
-    @IR(applyIfCPUFeatureOr = {"sve", "true", "avx2", "true"},
+    @IR(applyIfCPUFeatureOr = {"sve", "true", "avx2", "true", "rvv", "true"},
         counts = {IRNode.POPULATE_INDEX, ">0"})
     public char[] fillCharArray() {
         char[] res = new char[SIZE];
@@ -93,7 +93,7 @@ public class ArrayIndexFillTest extends VectorizationTestRunner {
     }
 
     @Test
-    @IR(applyIfCPUFeatureOr = {"sve", "true", "avx2", "true"},
+    @IR(applyIfCPUFeatureOr = {"sve", "true", "avx2", "true", "rvv", "true"},
         counts = {IRNode.POPULATE_INDEX, ">0"})
     public int[] fillIntArray() {
         int[] res = new int[SIZE];
@@ -104,7 +104,7 @@ public class ArrayIndexFillTest extends VectorizationTestRunner {
     }
 
     @Test
-    @IR(applyIfCPUFeatureOr = {"sve", "true", "avx2", "true"},
+    @IR(applyIfCPUFeatureOr = {"sve", "true", "avx2", "true", "rvv", "true"},
         counts = {IRNode.POPULATE_INDEX, "=0"})
     // The ConvI2L can be split through the AddI, creating a mix of
     // ConvI2L(AddI) and AddL(ConvI2L) cases, which do not vectorize.
@@ -118,7 +118,7 @@ public class ArrayIndexFillTest extends VectorizationTestRunner {
     }
 
     @Test
-    @IR(applyIfCPUFeatureOr = {"sve", "true", "avx2", "true"},
+    @IR(applyIfCPUFeatureOr = {"sve", "true", "avx2", "true", "rvv", "true"},
         counts = {IRNode.POPULATE_INDEX, ">0"})
     // The variable init/limit has the consequence that we do not split
     // the ConvI2L through the AddI.
@@ -131,7 +131,7 @@ public class ArrayIndexFillTest extends VectorizationTestRunner {
     }
 
     @Test
-    @IR(applyIfCPUFeatureOr = {"sve", "true", "avx2", "true"},
+    @IR(applyIfCPUFeatureOr = {"sve", "true", "avx2", "true", "rvv", "true"},
         counts = {IRNode.POPULATE_INDEX, "=0"})
     // See: JDK-8332878
     public float[] fillFloatArray() {
@@ -143,7 +143,7 @@ public class ArrayIndexFillTest extends VectorizationTestRunner {
     }
 
     @Test
-    @IR(applyIfCPUFeatureOr = {"sve", "true", "avx2", "true"},
+    @IR(applyIfCPUFeatureOr = {"sve", "true", "avx2", "true", "rvv", "true"},
         counts = {IRNode.POPULATE_INDEX, ">0"})
     public float[] fillFloatArray2() {
         float[] res = new float[SIZE];
@@ -154,7 +154,7 @@ public class ArrayIndexFillTest extends VectorizationTestRunner {
     }
 
     @Test
-    @IR(applyIfCPUFeatureOr = {"sve", "true", "avx2", "true"},
+    @IR(applyIfCPUFeatureOr = {"sve", "true", "avx2", "true", "rvv", "true"},
         counts = {IRNode.POPULATE_INDEX, "=0"})
     // See: JDK-8332878
     public double[] fillDoubleArray() {
@@ -166,7 +166,7 @@ public class ArrayIndexFillTest extends VectorizationTestRunner {
     }
 
     @Test
-    @IR(applyIfCPUFeatureOr = {"sve", "true", "avx2", "true"},
+    @IR(applyIfCPUFeatureOr = {"sve", "true", "avx2", "true", "rvv", "true"},
         counts = {IRNode.POPULATE_INDEX, ">0"})
     public double[] fillDoubleArray2() {
         double[] res = new double[SIZE];
@@ -177,7 +177,7 @@ public class ArrayIndexFillTest extends VectorizationTestRunner {
     }
 
     @Test
-    @IR(applyIfCPUFeatureOr = {"sve", "true", "avx2", "true"},
+    @IR(applyIfCPUFeatureOr = {"sve", "true", "avx2", "true", "rvv", "true"},
         counts = {IRNode.POPULATE_INDEX, ">0"})
     public short[] fillShortArrayWithShortIndex() {
         short[] res = new short[SIZE];
@@ -188,7 +188,7 @@ public class ArrayIndexFillTest extends VectorizationTestRunner {
     }
 
     @Test
-    @IR(applyIfCPUFeatureOr = {"sve", "true", "avx2", "true"},
+    @IR(applyIfCPUFeatureOr = {"sve", "true", "avx2", "true", "rvv", "true"},
         counts = {IRNode.POPULATE_INDEX, ">0"})
     public int[] fillMultipleArraysDifferentTypes1() {
         int[] res1 = new int[SIZE];
@@ -201,7 +201,7 @@ public class ArrayIndexFillTest extends VectorizationTestRunner {
     }
 
     @Test
-    @IR(applyIfCPUFeatureOr = {"sve", "true", "avx2", "true"},
+    @IR(applyIfCPUFeatureOr = {"sve", "true", "avx2", "true", "rvv", "true"},
         counts = {IRNode.POPULATE_INDEX, ">0"})
     public char[] fillMultipleArraysDifferentTypes2() {
         int[] res1 = new int[SIZE];
diff --git a/test/hotspot/jtreg/compiler/vectorization/runner/ArrayInvariantFillTest.java b/test/hotspot/jtreg/compiler/vectorization/runner/ArrayInvariantFillTest.java
index 2e7302bba05..b7044b1c79d 100644
--- a/test/hotspot/jtreg/compiler/vectorization/runner/ArrayInvariantFillTest.java
+++ b/test/hotspot/jtreg/compiler/vectorization/runner/ArrayInvariantFillTest.java
@@ -41,7 +41,7 @@
  *                   -XX:+OptimizeFill
  *                   compiler.vectorization.runner.ArrayInvariantFillTest
  *
- * @requires (os.simpleArch == "x64") | (os.simpleArch == "aarch64")
+ * @requires (os.simpleArch == "x64") | (os.simpleArch == "aarch64") | (os.simpleArch == "riscv64")
  * @requires vm.compiler2.enabled
  */
 
@@ -70,10 +70,10 @@ public class ArrayInvariantFillTest extends VectorizationTestRunner {
 
     // ---------------- Simple Fill ----------------
     @Test
-    @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse2", "true"},
+    @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse2", "true", "rvv", "true"},
         applyIf = {"OptimizeFill", "false"},
         counts = {IRNode.REPLICATE_B, ">0"})
-    @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse2", "true"},
+    @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse2", "true", "rvv", "true"},
         applyIf = {"OptimizeFill", "true"},
         counts = {IRNode.REPLICATE_B, "0"})
     public byte[] fillByteArray() {
@@ -85,10 +85,10 @@ public class ArrayInvariantFillTest extends VectorizationTestRunner {
     }
 
     @Test
-    @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse2", "true"},
+    @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse2", "true", "rvv", "true"},
         applyIf = {"OptimizeFill", "false"},
         counts = {IRNode.REPLICATE_S, ">0"})
-    @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse2", "true"},
+    @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse2", "true", "rvv", "true"},
         applyIf = {"OptimizeFill", "true"},
         counts = {IRNode.REPLICATE_S, "0"})
     public short[] fillShortArray() {
@@ -100,10 +100,10 @@ public class ArrayInvariantFillTest extends VectorizationTestRunner {
     }
 
     @Test
-    @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse2", "true"},
+    @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse2", "true", "rvv", "true"},
         applyIf = {"OptimizeFill", "false"},
         counts = {IRNode.REPLICATE_S, ">0"})
-    @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse2", "true"},
+    @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse2", "true", "rvv", "true"},
         applyIf = {"OptimizeFill", "true"},
         counts = {IRNode.REPLICATE_S, "0"})
     public char[] fillCharArray() {
@@ -115,10 +115,10 @@ public class ArrayInvariantFillTest extends VectorizationTestRunner {
     }
 
     @Test
-    @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse2", "true"},
+    @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse2", "true", "rvv", "true"},
         applyIf = {"OptimizeFill", "false"},
         counts = {IRNode.REPLICATE_I, ">0"})
-    @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse2", "true"},
+    @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse2", "true", "rvv", "true"},
         applyIf = {"OptimizeFill", "true"},
         counts = {IRNode.REPLICATE_I, "0"})
     public int[] fillIntArray() {
@@ -130,7 +130,7 @@ public class ArrayInvariantFillTest extends VectorizationTestRunner {
     }
 
     @Test
-    @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse2", "true"},
+    @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse2", "true", "rvv", "true"},
         counts = {IRNode.REPLICATE_L, ">0"})
     public long[] fillLongArray() {
         long[] res = new long[SIZE];
@@ -141,10 +141,10 @@ public class ArrayInvariantFillTest extends VectorizationTestRunner {
     }
 
     @Test
-    @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse2", "true"},
+    @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse2", "true", "rvv", "true"},
         applyIf = {"OptimizeFill", "false"},
         counts = {IRNode.REPLICATE_F, ">0"})
-    @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse2", "true"},
+    @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse2", "true", "rvv", "true"},
         applyIf = {"OptimizeFill", "true"},
         counts = {IRNode.REPLICATE_F, "0"})
     public float[] fillFloatArray() {
@@ -156,7 +156,7 @@ public class ArrayInvariantFillTest extends VectorizationTestRunner {
     }
 
     @Test
-    @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse2", "true"},
+    @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse2", "true", "rvv", "true"},
         counts = {IRNode.REPLICATE_D, ">0"})
     public double[] fillDoubleArray() {
         double[] res = new double[SIZE];
@@ -168,7 +168,7 @@ public class ArrayInvariantFillTest extends VectorizationTestRunner {
 
     // ---------------- Fill With Type Change ----------------
     @Test
-    @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse2", "true"},
+    @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse2", "true", "rvv", "true"},
         counts = {IRNode.REPLICATE_L, ">0"})
     public long[] fillLongArrayWithInt() {
         long[] res = new long[SIZE];
@@ -179,7 +179,7 @@ public class ArrayInvariantFillTest extends VectorizationTestRunner {
     }
 
     @Test
-    @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse2", "true"},
+    @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse2", "true", "rvv", "true"},
         counts = {IRNode.REPLICATE_L, ">0"})
     public long[] fillLongArrayWithUnsigned() {
         long[] res = new long[SIZE];
@@ -190,7 +190,7 @@ public class ArrayInvariantFillTest extends VectorizationTestRunner {
     }
 
     @Test
-    @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse2", "true"},
+    @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse2", "true", "rvv", "true"},
         counts = {IRNode.REPLICATE_L, ">0"})
     public long[] fillLongArrayWithFloat() {
         long[] res = new long[SIZE];
@@ -201,10 +201,10 @@ public class ArrayInvariantFillTest extends VectorizationTestRunner {
     }
 
     @Test
-    @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse2", "true"},
+    @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse2", "true", "rvv", "true"},
         applyIf = {"OptimizeFill", "false"},
         counts = {IRNode.REPLICATE_I, ">0"})
-    @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse2", "true"},
+    @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse2", "true", "rvv", "true"},
         applyIf = {"OptimizeFill", "true"},
         counts = {IRNode.REPLICATE_I, "0"})
     public int[] fillIntArrayWithDouble() {
diff --git a/test/hotspot/jtreg/compiler/vectorization/runner/ArrayTypeConvertTest.java b/test/hotspot/jtreg/compiler/vectorization/runner/ArrayTypeConvertTest.java
index 0da101a8fb7..0deec2627d8 100644
--- a/test/hotspot/jtreg/compiler/vectorization/runner/ArrayTypeConvertTest.java
+++ b/test/hotspot/jtreg/compiler/vectorization/runner/ArrayTypeConvertTest.java
@@ -188,7 +188,7 @@ public class ArrayTypeConvertTest extends VectorizationTestRunner {
 
     // ---------------- Convert I/L to F/D ----------------
     @Test
-    @IR(applyIfCPUFeatureOr = {"asimd", "true", "avx", "true"},
+    @IR(applyIfCPUFeatureOr = {"asimd", "true", "avx", "true", "rvv", "true"},
         counts = {IRNode.VECTOR_CAST_I2F, IRNode.VECTOR_SIZE + "min(max_int, max_float)", ">0"})
     public float[] convertIntToFloat() {
         float[] res = new float[SIZE];
@@ -199,7 +199,7 @@ public class ArrayTypeConvertTest extends VectorizationTestRunner {
     }
 
     @Test
-    @IR(applyIfCPUFeatureOr = {"asimd", "true", "avx", "true"},
+    @IR(applyIfCPUFeatureOr = {"asimd", "true", "avx", "true", "rvv", "true"},
         counts = {IRNode.VECTOR_CAST_I2D, IRNode.VECTOR_SIZE + "min(max_int, max_double)", ">0"})
     public double[] convertIntToDouble() {
         double[] res = new double[SIZE];
@@ -210,7 +210,7 @@ public class ArrayTypeConvertTest extends VectorizationTestRunner {
     }
 
     @Test
-    @IR(applyIfCPUFeatureOr = {"sve", "true", "avx512dq", "true"},
+    @IR(applyIfCPUFeatureOr = {"sve", "true", "avx512dq", "true", "rvv", "true"},
         counts = {IRNode.VECTOR_CAST_L2F, IRNode.VECTOR_SIZE + "min(max_long, max_float)", ">0"})
     public float[] convertLongToFloat() {
         float[] res = new float[SIZE];
@@ -221,7 +221,7 @@ public class ArrayTypeConvertTest extends VectorizationTestRunner {
     }
 
     @Test
-    @IR(applyIfCPUFeatureOr = {"asimd", "true", "avx512dq", "true"},
+    @IR(applyIfCPUFeatureOr = {"asimd", "true", "avx512dq", "true", "rvv", "true"},
         counts = {IRNode.VECTOR_CAST_L2D, IRNode.VECTOR_SIZE + "min(max_long, max_double)", ">0"})
     public double[] convertLongToDouble() {
         double[] res = new double[SIZE];
@@ -233,7 +233,7 @@ public class ArrayTypeConvertTest extends VectorizationTestRunner {
 
     // ---------------- Convert Subword-I to F/D ----------------
     @Test
-    @IR(applyIfCPUFeatureOr = {"asimd", "true", "avx2", "true"},
+    @IR(applyIfCPUFeatureOr = {"asimd", "true", "avx2", "true", "rvv", "true"},
         applyIfOr = {"AlignVector", "false", "UseCompactObjectHeaders", "false"},
         counts = {IRNode.VECTOR_CAST_S2F, IRNode.VECTOR_SIZE + "min(max_short, max_float)", ">0"})
     public float[] convertShortToFloat() {
@@ -252,7 +252,7 @@ public class ArrayTypeConvertTest extends VectorizationTestRunner {
     }
 
     @Test
-    @IR(applyIfCPUFeatureOr = {"sve", "true", "avx2", "true"},
+    @IR(applyIfCPUFeatureOr = {"sve", "true", "avx2", "true", "rvv", "true"},
         applyIf = {"MaxVectorSize", ">=32"},
         counts = {IRNode.VECTOR_CAST_S2D, IRNode.VECTOR_SIZE + "min(max_short, max_double)", ">0"})
     public double[] convertShortToDouble() {
@@ -291,7 +291,7 @@ public class ArrayTypeConvertTest extends VectorizationTestRunner {
 
     // ---------------- Convert F/D to I/L ----------------
     @Test
-    @IR(applyIfCPUFeatureOr = {"asimd", "true", "avx", "true"},
+    @IR(applyIfCPUFeatureOr = {"asimd", "true", "avx", "true", "rvv", "true"},
         counts = {IRNode.VECTOR_CAST_F2I, IRNode.VECTOR_SIZE + "min(max_float, max_int)", ">0"})
     public int[] convertFloatToInt() {
         int[] res = new int[SIZE];
@@ -302,7 +302,7 @@ public class ArrayTypeConvertTest extends VectorizationTestRunner {
     }
 
     @Test
-    @IR(applyIfCPUFeatureOr = {"asimd", "true", "avx512dq", "true"},
+    @IR(applyIfCPUFeatureOr = {"asimd", "true", "avx512dq", "true", "rvv", "true"},
         counts = {IRNode.VECTOR_CAST_F2L, IRNode.VECTOR_SIZE + "min(max_float, max_long)", ">0"})
     public long[] convertFloatToLong() {
         long[] res = new long[SIZE];
@@ -313,7 +313,7 @@ public class ArrayTypeConvertTest extends VectorizationTestRunner {
     }
 
     @Test
-    @IR(applyIfCPUFeatureOr = {"sve", "true", "avx", "true"},
+    @IR(applyIfCPUFeatureOr = {"sve", "true", "avx", "true", "rvv", "true"},
         counts = {IRNode.VECTOR_CAST_D2I, IRNode.VECTOR_SIZE + "min(max_double, max_int)", ">0"})
     public int[] convertDoubleToInt() {
         int[] res = new int[SIZE];
@@ -324,7 +324,7 @@ public class ArrayTypeConvertTest extends VectorizationTestRunner {
     }
 
     @Test
-    @IR(applyIfCPUFeatureOr = {"asimd", "true", "avx512dq", "true"},
+    @IR(applyIfCPUFeatureOr = {"asimd", "true", "avx512dq", "true", "rvv", "true"},
         counts = {IRNode.VECTOR_CAST_D2L, IRNode.VECTOR_SIZE + "min(max_double, max_long)", ">0"})
     public long[] convertDoubleToLong() {
         long[] res = new long[SIZE];
@@ -336,7 +336,7 @@ public class ArrayTypeConvertTest extends VectorizationTestRunner {
 
     // ---------------- Convert F/D to Subword-I ----------------
     @Test
-    @IR(applyIfCPUFeatureOr = {"asimd", "true", "avx2", "true"},
+    @IR(applyIfCPUFeatureOr = {"asimd", "true", "avx2", "true", "rvv", "true"},
         applyIfOr = {"AlignVector", "false", "UseCompactObjectHeaders", "false"},
         counts = {IRNode.VECTOR_CAST_F2S, IRNode.VECTOR_SIZE + "min(max_float, max_short)", ">0"})
     public short[] convertFloatToShort() {
@@ -355,7 +355,7 @@ public class ArrayTypeConvertTest extends VectorizationTestRunner {
     }
 
     @Test
-    @IR(applyIfCPUFeatureOr = {"asimd", "true", "avx2", "true"},
+    @IR(applyIfCPUFeatureOr = {"asimd", "true", "avx2", "true", "rvv", "true"},
         applyIfOr = {"AlignVector", "false", "UseCompactObjectHeaders", "false"},
         counts = {IRNode.VECTOR_CAST_F2S, IRNode.VECTOR_SIZE + "min(max_float, max_char)", ">0"})
     public char[] convertFloatToChar() {
@@ -374,7 +374,7 @@ public class ArrayTypeConvertTest extends VectorizationTestRunner {
     }
 
     @Test
-    @IR(applyIfCPUFeatureOr = {"sve", "true", "avx", "true"},
+    @IR(applyIfCPUFeatureOr = {"sve", "true", "avx", "true", "rvv", "true"},
         applyIf = {"MaxVectorSize", ">=32"},
         counts = {IRNode.VECTOR_CAST_D2S, IRNode.VECTOR_SIZE + "min(max_double, max_short)", ">0"})
     public short[] convertDoubleToShort() {
@@ -386,7 +386,7 @@ public class ArrayTypeConvertTest extends VectorizationTestRunner {
     }
 
     @Test
-    @IR(applyIfCPUFeatureOr = {"sve", "true", "avx", "true"},
+    @IR(applyIfCPUFeatureOr = {"sve", "true", "avx", "true", "rvv", "true"},
         applyIf = {"MaxVectorSize", ">=32"},
         counts = {IRNode.VECTOR_CAST_D2S, IRNode.VECTOR_SIZE + "min(max_double, max_char)", ">0"})
     public char[] convertDoubleToChar() {
@@ -399,7 +399,7 @@ public class ArrayTypeConvertTest extends VectorizationTestRunner {
 
     // ---------------- Convert Between F & D ----------------
     @Test
-    @IR(applyIfCPUFeatureOr = {"asimd", "true", "avx", "true"},
+    @IR(applyIfCPUFeatureOr = {"asimd", "true", "avx", "true", "rvv", "true"},
         counts = {IRNode.VECTOR_CAST_F2D, IRNode.VECTOR_SIZE + "min(max_float, max_double)", ">0"})
     public double[] convertFloatToDouble() {
         double[] res = new double[SIZE];
@@ -410,7 +410,7 @@ public class ArrayTypeConvertTest extends VectorizationTestRunner {
     }
 
     @Test
-    @IR(applyIfCPUFeatureOr = {"asimd", "true", "avx", "true"},
+    @IR(applyIfCPUFeatureOr = {"asimd", "true", "avx", "true", "rvv", "true"},
         counts = {IRNode.VECTOR_CAST_D2F, IRNode.VECTOR_SIZE + "min(max_double, max_float)", ">0"})
     public float[] convertDoubleToFloat() {
         float[] res = new float[SIZE];
diff --git a/test/hotspot/jtreg/compiler/vectorization/runner/BasicBooleanOpTest.java b/test/hotspot/jtreg/compiler/vectorization/runner/BasicBooleanOpTest.java
index 18e7721e0d6..918752c5b89 100644
--- a/test/hotspot/jtreg/compiler/vectorization/runner/BasicBooleanOpTest.java
+++ b/test/hotspot/jtreg/compiler/vectorization/runner/BasicBooleanOpTest.java
@@ -73,7 +73,7 @@ public class BasicBooleanOpTest extends VectorizationTestRunner {
     }
 
     @Test
-    @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse2", "true"},
+    @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse2", "true", "rvv", "true"},
         phase = CompilePhase.BEFORE_MACRO_EXPANSION,
         counts = {IRNode.AND_VB, ">0"})
     public boolean[] vectorAnd() {
@@ -85,7 +85,7 @@ public class BasicBooleanOpTest extends VectorizationTestRunner {
     }
 
     @Test
-    @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse2", "true"},
+    @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse2", "true", "rvv", "true"},
         counts = {IRNode.OR_VB, ">0"})
     public boolean[] vectorOr() {
         boolean[] res = new boolean[SIZE];
@@ -96,7 +96,7 @@ public class BasicBooleanOpTest extends VectorizationTestRunner {
     }
 
     @Test
-    @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse2", "true"},
+    @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse2", "true", "rvv", "true"},
         counts = {IRNode.XOR_VB, ">0"})
     public boolean[] vectorXor() {
         boolean[] res = new boolean[SIZE];
diff --git a/test/hotspot/jtreg/compiler/vectorization/runner/BasicByteOpTest.java b/test/hotspot/jtreg/compiler/vectorization/runner/BasicByteOpTest.java
index c3ff910b03c..428a7f22331 100644
--- a/test/hotspot/jtreg/compiler/vectorization/runner/BasicByteOpTest.java
+++ b/test/hotspot/jtreg/compiler/vectorization/runner/BasicByteOpTest.java
@@ -66,7 +66,7 @@ public class BasicByteOpTest extends VectorizationTestRunner {
 
     // ---------------- Arithmetic ----------------
     @Test
-    @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse2", "true"},
+    @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse2", "true", "rvv", "true"},
         counts = {IRNode.SUB_VB, ">0"})
     public byte[] vectorNeg() {
         byte[] res = new byte[SIZE];
@@ -77,7 +77,7 @@ public class BasicByteOpTest extends VectorizationTestRunner {
     }
 
     @Test
-    @IR(applyIfCPUFeatureOr = {"asimd", "true", "ssse3", "true"},
+    @IR(applyIfCPUFeatureOr = {"asimd", "true", "ssse3", "true", "rvv", "true"},
         counts = {IRNode.ABS_VB, ">0"})
     public byte[] vectorAbs() {
         byte[] res = new byte[SIZE];
@@ -88,7 +88,7 @@ public class BasicByteOpTest extends VectorizationTestRunner {
     }
 
     @Test
-    @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse2", "true"},
+    @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse2", "true", "rvv", "true"},
         counts = {IRNode.ADD_VB, ">0"})
     public byte[] vectorAdd() {
         byte[] res = new byte[SIZE];
@@ -99,7 +99,7 @@ public class BasicByteOpTest extends VectorizationTestRunner {
     }
 
     @Test
-    @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse2", "true"},
+    @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse2", "true", "rvv", "true"},
         counts = {IRNode.SUB_VB, ">0"})
     public byte[] vectorSub() {
         byte[] res = new byte[SIZE];
@@ -110,7 +110,7 @@ public class BasicByteOpTest extends VectorizationTestRunner {
     }
 
     @Test
-    @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse4.1", "true"},
+    @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse4.1", "true", "rvv", "true"},
         counts = {IRNode.MUL_VB, ">0"})
     public byte[] vectorMul() {
         byte[] res = new byte[SIZE];
@@ -121,7 +121,7 @@ public class BasicByteOpTest extends VectorizationTestRunner {
     }
 
     @Test
-    @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse4.1", "true"},
+    @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse4.1", "true", "rvv", "true"},
         counts = {IRNode.MUL_VB, ">0", IRNode.ADD_VB, ">0"})
     public byte[] vectorMulAdd() {
         byte[] res = new byte[SIZE];
@@ -132,7 +132,7 @@ public class BasicByteOpTest extends VectorizationTestRunner {
     }
 
     @Test
-    @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse4.1", "true"},
+    @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse4.1", "true", "rvv", "true"},
         counts = {IRNode.MUL_VB, ">0", IRNode.SUB_VB, ">0"})
     public byte[] vectorMulSub() {
         byte[] res = new byte[SIZE];
@@ -144,7 +144,7 @@ public class BasicByteOpTest extends VectorizationTestRunner {
 
     // ---------------- Logic ----------------
     @Test
-    @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse2", "true"},
+    @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse2", "true", "rvv", "true"},
         counts = {IRNode.XOR_VB, ">0"})
     public byte[] vectorNot() {
         byte[] res = new byte[SIZE];
@@ -155,7 +155,7 @@ public class BasicByteOpTest extends VectorizationTestRunner {
     }
 
     @Test
-    @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse2", "true"},
+    @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse2", "true", "rvv", "true"},
         counts = {IRNode.AND_VB, ">0"})
     public byte[] vectorAnd() {
         byte[] res = new byte[SIZE];
@@ -166,7 +166,7 @@ public class BasicByteOpTest extends VectorizationTestRunner {
     }
 
     @Test
-    @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse2", "true"},
+    @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse2", "true", "rvv", "true"},
         counts = {IRNode.OR_VB, ">0"})
     public byte[] vectorOr() {
         byte[] res = new byte[SIZE];
@@ -177,7 +177,7 @@ public class BasicByteOpTest extends VectorizationTestRunner {
     }
 
     @Test
-    @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse2", "true"},
+    @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse2", "true", "rvv", "true"},
         counts = {IRNode.XOR_VB, ">0"})
     public byte[] vectorXor() {
         byte[] res = new byte[SIZE];
diff --git a/test/hotspot/jtreg/compiler/vectorization/runner/BasicCharOpTest.java b/test/hotspot/jtreg/compiler/vectorization/runner/BasicCharOpTest.java
index 8c20b879d59..4211d5eec5e 100644
--- a/test/hotspot/jtreg/compiler/vectorization/runner/BasicCharOpTest.java
+++ b/test/hotspot/jtreg/compiler/vectorization/runner/BasicCharOpTest.java
@@ -66,7 +66,7 @@ public class BasicCharOpTest extends VectorizationTestRunner {
 
     // ---------------- Arithmetic ----------------
     @Test
-    @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse2", "true"},
+    @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse2", "true", "rvv", "true"},
         counts = {IRNode.SUB_VS, ">0"})
     public char[] vectorNeg() {
         char[] res = new char[SIZE];
@@ -77,7 +77,7 @@ public class BasicCharOpTest extends VectorizationTestRunner {
     }
 
     @Test
-    @IR(applyIfCPUFeatureOr = {"asimd", "true", "ssse3", "true"},
+    @IR(applyIfCPUFeatureOr = {"asimd", "true", "ssse3", "true", "rvv", "true"},
         counts = {IRNode.STORE_VECTOR, ">0"})
     @IR(failOn = {IRNode.ABS_VI, IRNode.ABS_VB, IRNode.ABS_VL}) // AVS_VC does not exist
     public char[] vectorAbs() {
@@ -89,7 +89,7 @@ public class BasicCharOpTest extends VectorizationTestRunner {
     }
 
     @Test
-    @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse2", "true"},
+    @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse2", "true", "rvv", "true"},
         counts = {IRNode.ADD_VS, ">0"}) // char add same as for short
     public char[] vectorAdd() {
         char[] res = new char[SIZE];
@@ -100,7 +100,7 @@ public class BasicCharOpTest extends VectorizationTestRunner {
     }
 
     @Test
-    @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse2", "true"},
+    @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse2", "true", "rvv", "true"},
         counts = {IRNode.SUB_VS, ">0"})
     public char[] vectorSub() {
         char[] res = new char[SIZE];
@@ -111,7 +111,7 @@ public class BasicCharOpTest extends VectorizationTestRunner {
     }
 
     @Test
-    @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse2", "true"},
+    @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse2", "true", "rvv", "true"},
         counts = {IRNode.MUL_VS, ">0"})
     public char[] vectorMul() {
         char[] res = new char[SIZE];
@@ -122,7 +122,7 @@ public class BasicCharOpTest extends VectorizationTestRunner {
     }
 
     @Test
-    @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse2", "true"},
+    @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse2", "true", "rvv", "true"},
         counts = {IRNode.MUL_VS, ">0",
                   IRNode.ADD_VS, ">0"}) // char add same as for short
     public char[] vectorMulAdd() {
@@ -134,7 +134,7 @@ public class BasicCharOpTest extends VectorizationTestRunner {
     }
 
     @Test
-    @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse2", "true"},
+    @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse2", "true", "rvv", "true"},
         counts = {IRNode.MUL_VS, ">0", IRNode.SUB_VS, ">0"})
     public char[] vectorMulSub() {
         char[] res = new char[SIZE];
@@ -146,7 +146,7 @@ public class BasicCharOpTest extends VectorizationTestRunner {
 
     // ---------------- Logic ----------------
     @Test
-    @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse2", "true"},
+    @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse2", "true", "rvv", "true"},
         counts = {IRNode.XOR_VS, ">0"})
     public char[] vectorNot() {
         char[] res = new char[SIZE];
@@ -157,7 +157,7 @@ public class BasicCharOpTest extends VectorizationTestRunner {
     }
 
     @Test
-    @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse2", "true"},
+    @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse2", "true", "rvv", "true"},
         counts = {IRNode.AND_VS, ">0"})
     public char[] vectorAnd() {
         char[] res = new char[SIZE];
@@ -168,7 +168,7 @@ public class BasicCharOpTest extends VectorizationTestRunner {
     }
 
     @Test
-    @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse2", "true"},
+    @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse2", "true", "rvv", "true"},
         counts = {IRNode.OR_VS, ">0"})
     public char[] vectorOr() {
         char[] res = new char[SIZE];
@@ -179,7 +179,7 @@ public class BasicCharOpTest extends VectorizationTestRunner {
     }
 
     @Test
-    @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse2", "true"},
+    @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse2", "true", "rvv", "true"},
         counts = {IRNode.XOR_VS, ">0"})
     public char[] vectorXor() {
         char[] res = new char[SIZE];
@@ -225,10 +225,7 @@ public class BasicCharOpTest extends VectorizationTestRunner {
 
     // ------------- ReverseBytes -------------
     @Test
-    @IR(applyIfCPUFeatureOr = {"asimd", "true", "avx2", "true"},
-        counts = {IRNode.REVERSE_BYTES_VS, ">0"})
-    @IR(applyIfPlatform = {"riscv64", "true"},
-        applyIfCPUFeature = {"zvbb", "true"},
+    @IR(applyIfCPUFeatureOr = {"asimd", "true", "avx2", "true", "zvbb", "true"},
         counts = {IRNode.REVERSE_BYTES_VS, ">0"})
     public char[] reverseBytesWithChar() {
         char[] res = new char[SIZE];
diff --git a/test/hotspot/jtreg/compiler/vectorization/runner/BasicFloatOpTest.java b/test/hotspot/jtreg/compiler/vectorization/runner/BasicFloatOpTest.java
index e2bf0492d2a..d1d7b981712 100644
--- a/test/hotspot/jtreg/compiler/vectorization/runner/BasicFloatOpTest.java
+++ b/test/hotspot/jtreg/compiler/vectorization/runner/BasicFloatOpTest.java
@@ -126,7 +126,7 @@ public class BasicFloatOpTest extends VectorizationTestRunner {
 
     // ---------------- Arithmetic ----------------
     @Test
-    @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse", "true"},
+    @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse", "true", "rvv", "true"},
         counts = {IRNode.NEG_VF, ">0"})
     public float[] vectorNeg() {
         float[] res = new float[SIZE];
@@ -137,7 +137,7 @@ public class BasicFloatOpTest extends VectorizationTestRunner {
     }
 
     @Test
-    @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse", "true"},
+    @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse", "true", "rvv", "true"},
         counts = {IRNode.ABS_VF, ">0"})
     public float[] vectorAbs() {
         float[] res = new float[SIZE];
@@ -148,7 +148,7 @@ public class BasicFloatOpTest extends VectorizationTestRunner {
     }
 
     @Test
-    @IR(applyIfCPUFeatureOr = {"asimd", "true", "avx", "true"},
+    @IR(applyIfCPUFeatureOr = {"asimd", "true", "avx", "true", "rvv", "true"},
         counts = {IRNode.SQRT_VF, ">0"})
     public float[] vectorSqrt() {
         float[] res = new float[SIZE];
@@ -159,7 +159,7 @@ public class BasicFloatOpTest extends VectorizationTestRunner {
     }
 
     @Test
-    @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse2", "true"},
+    @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse2", "true", "rvv", "true"},
         counts = {IRNode.ADD_VF, ">0"})
     public float[] vectorAdd() {
         float[] res = new float[SIZE];
@@ -170,7 +170,7 @@ public class BasicFloatOpTest extends VectorizationTestRunner {
     }
 
     @Test
-    @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse2", "true"},
+    @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse2", "true", "rvv", "true"},
         counts = {IRNode.SUB_VF, ">0"})
     public float[] vectorSub() {
         float[] res = new float[SIZE];
@@ -181,7 +181,7 @@ public class BasicFloatOpTest extends VectorizationTestRunner {
     }
 
     @Test
-    @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse2", "true"},
+    @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse2", "true", "rvv", "true"},
         counts = {IRNode.MUL_VF, ">0"})
     public float[] vectorMul() {
         float[] res = new float[SIZE];
@@ -192,7 +192,7 @@ public class BasicFloatOpTest extends VectorizationTestRunner {
     }
 
     @Test
-    @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse2", "true"},
+    @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse2", "true", "rvv", "true"},
         counts = {IRNode.DIV_VF, ">0"})
     public float[] vectorDiv() {
         float[] res = new float[SIZE];
@@ -203,7 +203,7 @@ public class BasicFloatOpTest extends VectorizationTestRunner {
     }
 
     @Test
-    @IR(applyIfCPUFeatureOr = {"asimd", "true", "avx", "true"},
+    @IR(applyIfCPUFeatureOr = {"asimd", "true", "avx", "true", "rvv", "true"},
         counts = {IRNode.MAX_VF, ">0"})
     public float[] vectorMax() {
         float[] res = new float[SIZE];
@@ -214,7 +214,7 @@ public class BasicFloatOpTest extends VectorizationTestRunner {
     }
 
     @Test
-    @IR(applyIfCPUFeatureOr = {"asimd", "true", "avx", "true"},
+    @IR(applyIfCPUFeatureOr = {"asimd", "true", "avx", "true", "rvv", "true"},
         counts = {IRNode.MIN_VF, ">0"})
     public float[] vectorMin() {
         float[] res = new float[SIZE];
@@ -229,6 +229,8 @@ public class BasicFloatOpTest extends VectorizationTestRunner {
         counts = {IRNode.FMA_VF, ">0", IRNode.VFMLA, ">0"})
     @IR(applyIfCPUFeatureAnd = {"fma", "true", "avx", "true"},
         counts = {IRNode.FMA_VF, ">0"})
+    @IR(applyIfCPUFeature = {"rvv", "true"},
+        counts = {IRNode.FMA_VF, ">0"})
     public float[] vectorMulAdd() {
         float[] res = new float[SIZE];
         for (int i = 0; i < SIZE; i++) {
@@ -242,6 +244,8 @@ public class BasicFloatOpTest extends VectorizationTestRunner {
         counts = {IRNode.FMA_VF, ">0", IRNode.VFMLS, ">0"})
     @IR(applyIfCPUFeatureAnd = {"fma", "true", "avx", "true"},
         counts = {IRNode.FMA_VF, ">0"})
+    @IR(applyIfCPUFeature = {"rvv", "true"},
+        counts = {IRNode.FMA_VF, ">0"})
     public float[] vectorMulSub1() {
         float[] res = new float[SIZE];
         for (int i = 0; i < SIZE; i++) {
@@ -255,6 +259,8 @@ public class BasicFloatOpTest extends VectorizationTestRunner {
         counts = {IRNode.FMA_VF, ">0", IRNode.VFMLS, ">0"})
     @IR(applyIfCPUFeatureAnd = {"fma", "true", "avx", "true"},
         counts = {IRNode.FMA_VF, ">0"})
+    @IR(applyIfCPUFeature = {"rvv", "true"},
+        counts = {IRNode.FMA_VF, ">0"})
     public float[] vectorMulSub2() {
         float[] res = new float[SIZE];
         for (int i = 0; i < SIZE; i++) {
@@ -270,6 +276,8 @@ public class BasicFloatOpTest extends VectorizationTestRunner {
         counts = {IRNode.VFNMLA, ">0"})
     @IR(applyIfCPUFeatureAnd = {"fma", "true", "avx", "true"},
         counts = {IRNode.FMA_VF, ">0"})
+    @IR(applyIfCPUFeature = {"rvv", "true"},
+        counts = {IRNode.FMA_VF, ">0"})
     public float[] vectorNegateMulAdd1() {
         float[] res = new float[SIZE];
         for (int i = 0; i < SIZE; i++) {
@@ -285,6 +293,8 @@ public class BasicFloatOpTest extends VectorizationTestRunner {
         counts = {IRNode.VFNMLA, ">0"})
     @IR(applyIfCPUFeatureAnd = {"fma", "true", "avx", "true"},
         counts = {IRNode.FMA_VF, ">0"})
+    @IR(applyIfCPUFeature = {"rvv", "true"},
+        counts = {IRNode.FMA_VF, ">0"})
     public float[] vectorNegateMulAdd2() {
         float[] res = new float[SIZE];
         for (int i = 0; i < SIZE; i++) {
@@ -298,6 +308,8 @@ public class BasicFloatOpTest extends VectorizationTestRunner {
         counts = {IRNode.FMA_VF, ">0"})
     @IR(applyIfCPUFeatureAnd = {"fma", "true", "avx", "true"},
         counts = {IRNode.FMA_VF, ">0"})
+    @IR(applyIfCPUFeature = {"rvv", "true"},
+        counts = {IRNode.FMA_VF, ">0"})
     public float[] vectorNegateMulSub() {
         float[] res = new float[SIZE];
         for (int i = 0; i < SIZE; i++) {
diff --git a/test/hotspot/jtreg/compiler/vectorization/runner/BasicLongOpTest.java b/test/hotspot/jtreg/compiler/vectorization/runner/BasicLongOpTest.java
index 8a2b50ea676..23b6b116376 100644
--- a/test/hotspot/jtreg/compiler/vectorization/runner/BasicLongOpTest.java
+++ b/test/hotspot/jtreg/compiler/vectorization/runner/BasicLongOpTest.java
@@ -65,7 +65,7 @@ public class BasicLongOpTest extends VectorizationTestRunner {
 
     // ---------------- Arithmetic ----------------
     @Test
-    @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse2", "true"},
+    @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse2", "true", "rvv", "true"},
         counts = {IRNode.SUB_VL, ">0"})
     public long[] vectorNeg() {
         long[] res = new long[SIZE];
@@ -76,7 +76,7 @@ public class BasicLongOpTest extends VectorizationTestRunner {
     }
 
     @Test
-    @IR(applyIfCPUFeatureOr = {"asimd", "true", "avx512vl", "true"},
+    @IR(applyIfCPUFeatureOr = {"asimd", "true", "avx512vl", "true", "rvv", "true"},
         counts = {IRNode.ABS_VL, ">0"})
     public long[] vectorAbs() {
         long[] res = new long[SIZE];
@@ -87,7 +87,7 @@ public class BasicLongOpTest extends VectorizationTestRunner {
     }
 
     @Test
-    @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse2", "true"},
+    @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse2", "true", "rvv", "true"},
         counts = {IRNode.ADD_VL, ">0"})
     public long[] vectorAdd() {
         long[] res = new long[SIZE];
@@ -98,7 +98,7 @@ public class BasicLongOpTest extends VectorizationTestRunner {
     }
 
     @Test
-    @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse2", "true"},
+    @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse2", "true", "rvv", "true"},
         counts = {IRNode.SUB_VL, ">0"})
     public long[] vectorSub() {
         long[] res = new long[SIZE];
@@ -109,7 +109,7 @@ public class BasicLongOpTest extends VectorizationTestRunner {
     }
 
     @Test
-    @IR(applyIfCPUFeatureOr = {"sve", "true", "avx512dq", "true"},
+    @IR(applyIfCPUFeatureOr = {"sve", "true", "avx512dq", "true", "rvv", "true"},
         counts = {IRNode.MUL_VL, ">0"})
     public long[] vectorMul() {
         long[] res = new long[SIZE];
@@ -120,9 +120,9 @@ public class BasicLongOpTest extends VectorizationTestRunner {
     }
 
     @Test
-    @IR(applyIfCPUFeatureOr = {"sve", "true", "sse4.1", "true"},
+    @IR(applyIfCPUFeatureOr = {"sve", "true", "sse4.1", "true", "rvv", "true"},
         counts = {IRNode.ADD_VL, ">0"})
-    @IR(applyIfCPUFeatureOr = {"sve", "true", "sse4.1", "true"},
+    @IR(applyIfCPUFeatureOr = {"sve", "true", "sse4.1", "true", "rvv", "true"},
         counts = {IRNode.MUL_VL, ">0"})
     public long[] vectorMulAdd() {
         long[] res = new long[SIZE];
@@ -133,7 +133,7 @@ public class BasicLongOpTest extends VectorizationTestRunner {
     }
 
     @Test
-    @IR(applyIfCPUFeatureOr = {"sve", "true", "sse4.1", "true"},
+    @IR(applyIfCPUFeatureOr = {"sve", "true", "sse4.1", "true", "rvv", "true"},
         counts = {IRNode.MUL_VL, ">0", IRNode.SUB_VL, ">0"})
     public long[] vectorMulSub() {
         long[] res = new long[SIZE];
@@ -145,7 +145,7 @@ public class BasicLongOpTest extends VectorizationTestRunner {
 
     // ---------------- Logic ----------------
     @Test
-    @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse2", "true"},
+    @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse2", "true", "rvv", "true"},
         counts = {IRNode.XOR_VL, ">0"})
     public long[] vectorNot() {
         long[] res = new long[SIZE];
@@ -156,7 +156,7 @@ public class BasicLongOpTest extends VectorizationTestRunner {
     }
 
     @Test
-    @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse2", "true"},
+    @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse2", "true", "rvv", "true"},
         counts = {IRNode.AND_VL, ">0"})
     public long[] vectorAnd() {
         long[] res = new long[SIZE];
@@ -167,7 +167,7 @@ public class BasicLongOpTest extends VectorizationTestRunner {
     }
 
     @Test
-    @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse2", "true"},
+    @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse2", "true", "rvv", "true"},
         counts = {IRNode.OR_VL, ">0"})
     public long[] vectorOr() {
         long[] res = new long[SIZE];
@@ -178,7 +178,7 @@ public class BasicLongOpTest extends VectorizationTestRunner {
     }
 
     @Test
-    @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse2", "true"},
+    @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse2", "true", "rvv", "true"},
         counts = {IRNode.XOR_VL, ">0"})
     public long[] vectorXor() {
         long[] res = new long[SIZE];
diff --git a/test/hotspot/jtreg/compiler/vectorization/runner/BasicShortOpTest.java b/test/hotspot/jtreg/compiler/vectorization/runner/BasicShortOpTest.java
index 3e5097edf47..63739584558 100644
--- a/test/hotspot/jtreg/compiler/vectorization/runner/BasicShortOpTest.java
+++ b/test/hotspot/jtreg/compiler/vectorization/runner/BasicShortOpTest.java
@@ -66,7 +66,7 @@ public class BasicShortOpTest extends VectorizationTestRunner {
 
     // ---------------- Arithmetic ----------------
     @Test
-    @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse2", "true"},
+    @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse2", "true", "rvv", "true"},
         counts = {IRNode.SUB_VS, ">0"})
     public short[] vectorNeg() {
         short[] res = new short[SIZE];
@@ -77,7 +77,7 @@ public class BasicShortOpTest extends VectorizationTestRunner {
     }
 
     @Test
-    @IR(applyIfCPUFeatureOr = {"asimd", "true", "ssse3", "true"},
+    @IR(applyIfCPUFeatureOr = {"asimd", "true", "ssse3", "true", "rvv", "true"},
         counts = {IRNode.ABS_VS, ">0"})
     public short[] vectorAbs() {
         short[] res = new short[SIZE];
@@ -88,7 +88,7 @@ public class BasicShortOpTest extends VectorizationTestRunner {
     }
 
     @Test
-    @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse2", "true"},
+    @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse2", "true", "rvv", "true"},
         counts = {IRNode.ADD_VS, ">0"})
     public short[] vectorAdd() {
         short[] res = new short[SIZE];
@@ -99,7 +99,7 @@ public class BasicShortOpTest extends VectorizationTestRunner {
     }
 
     @Test
-    @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse2", "true"},
+    @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse2", "true", "rvv", "true"},
         counts = {IRNode.SUB_VS, ">0"})
     public short[] vectorSub() {
         short[] res = new short[SIZE];
@@ -110,7 +110,7 @@ public class BasicShortOpTest extends VectorizationTestRunner {
     }
 
     @Test
-    @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse2", "true"},
+    @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse2", "true", "rvv", "true"},
         counts = {IRNode.MUL_VS, ">0"})
     public short[] vectorMul() {
         short[] res = new short[SIZE];
@@ -121,7 +121,7 @@ public class BasicShortOpTest extends VectorizationTestRunner {
     }
 
     @Test
-    @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse2", "true"},
+    @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse2", "true", "rvv", "true"},
         counts = {IRNode.MUL_VS, ">0", IRNode.ADD_VS, ">0"})
     public short[] vectorMulAdd() {
         short[] res = new short[SIZE];
@@ -132,7 +132,7 @@ public class BasicShortOpTest extends VectorizationTestRunner {
     }
 
     @Test
-    @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse2", "true"},
+    @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse2", "true", "rvv", "true"},
         counts = {IRNode.MUL_VS, ">0", IRNode.SUB_VS, ">0"})
     public short[] vectorMulSub() {
         short[] res = new short[SIZE];
@@ -144,7 +144,7 @@ public class BasicShortOpTest extends VectorizationTestRunner {
 
     // ---------------- Logic ----------------
     @Test
-    @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse2", "true"},
+    @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse2", "true", "rvv", "true"},
         counts = {IRNode.XOR_VS, ">0"})
     public short[] vectorNot() {
         short[] res = new short[SIZE];
@@ -155,7 +155,7 @@ public class BasicShortOpTest extends VectorizationTestRunner {
     }
 
     @Test
-    @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse2", "true"},
+    @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse2", "true", "rvv", "true"},
         counts = {IRNode.AND_VS, ">0"})
     public short[] vectorAnd() {
         short[] res = new short[SIZE];
@@ -166,7 +166,7 @@ public class BasicShortOpTest extends VectorizationTestRunner {
     }
 
     @Test
-    @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse2", "true"},
+    @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse2", "true", "rvv", "true"},
         counts = {IRNode.OR_VS, ">0"})
     public short[] vectorOr() {
         short[] res = new short[SIZE];
@@ -177,7 +177,7 @@ public class BasicShortOpTest extends VectorizationTestRunner {
     }
 
     @Test
-    @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse2", "true"},
+    @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse2", "true", "rvv", "true"},
         counts = {IRNode.XOR_VS, ">0"})
     public short[] vectorXor() {
         short[] res = new short[SIZE];
@@ -247,10 +247,7 @@ public class BasicShortOpTest extends VectorizationTestRunner {
 
     // ------------- ReverseBytes -------------
     @Test
-    @IR(applyIfCPUFeatureOr = {"asimd", "true", "avx2", "true"},
-        counts = {IRNode.REVERSE_BYTES_VS, ">0"})
-    @IR(applyIfPlatform = {"riscv64", "true"},
-        applyIfCPUFeature = {"zvbb", "true"},
+    @IR(applyIfCPUFeatureOr = {"asimd", "true", "avx2", "true", "zvbb", "true"},
         counts = {IRNode.REVERSE_BYTES_VS, ">0"})
     public short[] reverseBytesWithShort() {
         short[] res = new short[SIZE];
diff --git a/test/hotspot/jtreg/compiler/vectorization/runner/LoopCombinedOpTest.java b/test/hotspot/jtreg/compiler/vectorization/runner/LoopCombinedOpTest.java
index 2fd6a053de7..872a2e4d7e7 100644
--- a/test/hotspot/jtreg/compiler/vectorization/runner/LoopCombinedOpTest.java
+++ b/test/hotspot/jtreg/compiler/vectorization/runner/LoopCombinedOpTest.java
@@ -111,7 +111,7 @@ public class LoopCombinedOpTest extends VectorizationTestRunner {
     }
 
     @Test
-    @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse2", "true"},
+    @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse2", "true", "rvv", "true"},
         counts = {IRNode.STORE_VECTOR, ">0",
                   IRNode.LOAD_VECTOR_I, "> 0"})
     public int[] opWithConstant() {
@@ -123,7 +123,7 @@ public class LoopCombinedOpTest extends VectorizationTestRunner {
     }
 
     @Test
-    @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse4.1", "true"},
+    @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse4.1", "true", "rvv", "true"},
         counts = {IRNode.STORE_VECTOR, ">0",
                   IRNode.LOAD_VECTOR_I, "> 0"})
     public int[] opWithLoopInvariant() {
@@ -135,7 +135,7 @@ public class LoopCombinedOpTest extends VectorizationTestRunner {
     }
 
     @Test
-    @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse4.1", "true"},
+    @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse4.1", "true", "rvv", "true"},
         counts = {IRNode.STORE_VECTOR, ">0",
                   IRNode.LOAD_VECTOR_I, "> 0"})
     public int[] opWithConstantAndLoopInvariant() {
@@ -147,7 +147,7 @@ public class LoopCombinedOpTest extends VectorizationTestRunner {
     }
 
     @Test
-    @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse2", "true"},
+    @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse2", "true", "rvv", "true"},
         counts = {IRNode.STORE_VECTOR, ">0",
                   IRNode.LOAD_VECTOR_I, "> 0"})
     public int[] multipleOps() {
@@ -159,7 +159,7 @@ public class LoopCombinedOpTest extends VectorizationTestRunner {
     }
 
     @Test
-    @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse4.1", "true"},
+    @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse4.1", "true", "rvv", "true"},
         counts = {IRNode.STORE_VECTOR, ">0",
                   IRNode.LOAD_VECTOR_I, "> 0"})
     public int[] multipleOpsWithMultipleConstants() {
@@ -171,7 +171,7 @@ public class LoopCombinedOpTest extends VectorizationTestRunner {
     }
 
     @Test
-    @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse4.1", "true"},
+    @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse4.1", "true", "rvv", "true"},
         counts = {IRNode.STORE_VECTOR, ">0",
                   IRNode.LOAD_VECTOR_I, "> 0"})
     // With sse2, the MulI does not vectorize. This means we have vectorized stores
@@ -190,7 +190,7 @@ public class LoopCombinedOpTest extends VectorizationTestRunner {
     }
 
     @Test
-    @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse4.1", "true"},
+    @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse4.1", "true", "rvv", "true"},
         counts = {IRNode.STORE_VECTOR, ">0",
                   IRNode.LOAD_VECTOR_I, "> 0"})
     public int[] multipleStoresWithCommonSubExpression() {
@@ -206,7 +206,7 @@ public class LoopCombinedOpTest extends VectorizationTestRunner {
     }
 
     @Test
-    @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse2", "true"},
+    @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse2", "true", "rvv", "true"},
         applyIfOr = { "UseCompactObjectHeaders", "false", "AlignVector", "false"},
         counts = {IRNode.STORE_VECTOR, ">0",
                   IRNode.LOAD_VECTOR_S, "> 0",
@@ -239,7 +239,7 @@ public class LoopCombinedOpTest extends VectorizationTestRunner {
     }
 
     @Test
-    @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse2", "true"},
+    @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse2", "true", "rvv", "true"},
         applyIfOr = { "UseCompactObjectHeaders", "false", "AlignVector", "false"},
         counts = {IRNode.STORE_VECTOR, ">0",
                   IRNode.LOAD_VECTOR_I, IRNode.VECTOR_SIZE_ANY, "> 0",
@@ -274,7 +274,7 @@ public class LoopCombinedOpTest extends VectorizationTestRunner {
     }
 
     @Test
-    @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse2", "true"},
+    @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse2", "true", "rvv", "true"},
         counts = {IRNode.STORE_VECTOR, ">0",
                   IRNode.LOAD_VECTOR_S, IRNode.VECTOR_SIZE_ANY, "> 0",
                   IRNode.LOAD_VECTOR_L,                         "> 0"})
@@ -289,7 +289,7 @@ public class LoopCombinedOpTest extends VectorizationTestRunner {
     }
 
     @Test
-    @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse2", "true"},
+    @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse2", "true", "rvv", "true"},
         applyIfOr = { "UseCompactObjectHeaders", "false", "AlignVector", "false"},
         counts = {IRNode.STORE_VECTOR, ">0",
                   IRNode.LOAD_VECTOR_S, "> 0",
@@ -322,7 +322,7 @@ public class LoopCombinedOpTest extends VectorizationTestRunner {
     }
 
     @Test
-    @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse4.1", "true"},
+    @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse4.1", "true", "rvv", "true"},
         applyIfOr = { "UseCompactObjectHeaders", "false", "AlignVector", "false"},
         counts = {IRNode.STORE_VECTOR, ">0",
                   IRNode.LOAD_VECTOR_S, "> 0",
@@ -355,7 +355,7 @@ public class LoopCombinedOpTest extends VectorizationTestRunner {
     }
 
     @Test
-    @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse4.1", "true"},
+    @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse4.1", "true", "rvv", "true"},
         applyIfOr = { "UseCompactObjectHeaders", "false", "AlignVector", "false"},
         counts = {IRNode.STORE_VECTOR, ">0",
                   IRNode.LOAD_VECTOR_S, "> 0",
@@ -372,7 +372,7 @@ public class LoopCombinedOpTest extends VectorizationTestRunner {
     }
 
     @Test
-    @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse3", "true"},
+    @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse3", "true", "rvv", "true"},
         applyIfOr = { "UseCompactObjectHeaders", "false", "AlignVector", "false"},
         counts = {IRNode.STORE_VECTOR, ">0",
                   IRNode.LOAD_VECTOR_S, "> 0",
@@ -446,7 +446,7 @@ public class LoopCombinedOpTest extends VectorizationTestRunner {
     }
 
     @Test
-    @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse4.1", "true"},
+    @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse4.1", "true", "rvv", "true"},
         applyIfOr = { "UseCompactObjectHeaders", "false", "AlignVector", "false"},
         counts = {IRNode.STORE_VECTOR, ">0"})
     public int[] manuallyUnrolledStride2() {
@@ -468,7 +468,7 @@ public class LoopCombinedOpTest extends VectorizationTestRunner {
     }
 
     @Test
-    @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse4.1", "true"},
+    @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse4.1", "true", "rvv", "true"},
         counts = {IRNode.STORE_VECTOR, ">0",
                   IRNode.LOAD_VECTOR_I, "> 0"})
     public int partialVectorizableLoop() {
diff --git a/test/hotspot/jtreg/compiler/vectorization/runner/LoopControlFlowTest.java b/test/hotspot/jtreg/compiler/vectorization/runner/LoopControlFlowTest.java
index f0436332bdd..e36e4097813 100644
--- a/test/hotspot/jtreg/compiler/vectorization/runner/LoopControlFlowTest.java
+++ b/test/hotspot/jtreg/compiler/vectorization/runner/LoopControlFlowTest.java
@@ -64,7 +64,7 @@ public class LoopControlFlowTest extends VectorizationTestRunner {
     }
 
     @Test
-    @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse2", "true"},
+    @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse2", "true", "rvv", "true"},
         counts = {IRNode.STORE_VECTOR, ">0"})
     public int[] loopInvariantCondition() {
         int[] res = new int[SIZE];
diff --git a/test/hotspot/jtreg/compiler/vectorization/runner/LoopLiveOutNodesTest.java b/test/hotspot/jtreg/compiler/vectorization/runner/LoopLiveOutNodesTest.java
index 8b5e62a9d21..1b5edede781 100644
--- a/test/hotspot/jtreg/compiler/vectorization/runner/LoopLiveOutNodesTest.java
+++ b/test/hotspot/jtreg/compiler/vectorization/runner/LoopLiveOutNodesTest.java
@@ -68,7 +68,7 @@ public class LoopLiveOutNodesTest extends VectorizationTestRunner {
     }
 
     @Test
-    @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse4.1", "true"},
+    @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse4.1", "true", "rvv", "true"},
         counts = {IRNode.STORE_VECTOR, ">0"})
     public int SimpleIvUsed() {
         int i = 0;
@@ -80,7 +80,7 @@ public class LoopLiveOutNodesTest extends VectorizationTestRunner {
     }
 
     @Test
-    @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse2", "true"},
+    @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse2", "true", "rvv", "true"},
         counts = {IRNode.STORE_VECTOR, ">0"})
     public int indexedByIvUsed() {
         int i = 0;
@@ -92,7 +92,7 @@ public class LoopLiveOutNodesTest extends VectorizationTestRunner {
     }
 
     @Test
-    @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse2", "true"},
+    @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse2", "true", "rvv", "true"},
         counts = {IRNode.STORE_VECTOR, ">0"})
     public int ivUsedMultiple() {
         int i = 0;
@@ -104,7 +104,7 @@ public class LoopLiveOutNodesTest extends VectorizationTestRunner {
     }
 
     @Test
-    @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse2", "true"},
+    @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse2", "true", "rvv", "true"},
         counts = {IRNode.STORE_VECTOR, ">0"})
     public int ivUsedComplexExpr() {
         int i = 0;
@@ -116,7 +116,7 @@ public class LoopLiveOutNodesTest extends VectorizationTestRunner {
     }
 
     @Test
-    @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse2", "true"},
+    @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse2", "true", "rvv", "true"},
         counts = {IRNode.STORE_VECTOR, ">0"})
     public int[] ivUsedAnotherLoop() {
         int i = 0;
diff --git a/test/hotspot/jtreg/compiler/vectorization/runner/LoopRangeStrideTest.java b/test/hotspot/jtreg/compiler/vectorization/runner/LoopRangeStrideTest.java
index cfc87206c5d..46e52102c31 100644
--- a/test/hotspot/jtreg/compiler/vectorization/runner/LoopRangeStrideTest.java
+++ b/test/hotspot/jtreg/compiler/vectorization/runner/LoopRangeStrideTest.java
@@ -36,7 +36,7 @@
  *                   -XX:+WhiteBoxAPI
  *                   compiler.vectorization.runner.LoopRangeStrideTest
  *
- * @requires (os.simpleArch == "x64") | (os.simpleArch == "aarch64")
+ * @requires (os.simpleArch == "x64") | (os.simpleArch == "aarch64") | (os.simpleArch == "riscv64")
  * @requires vm.compiler2.enabled
  */
 
@@ -79,7 +79,7 @@ public class LoopRangeStrideTest extends VectorizationTestRunner {
     }
 
     @Test
-    @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse2", "true"},
+    @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse2", "true", "rvv", "true"},
         counts = {IRNode.STORE_VECTOR, ">0"})
     public int[] nonConstantRange() {
         int[] res = new int[SIZE];
@@ -90,7 +90,7 @@ public class LoopRangeStrideTest extends VectorizationTestRunner {
     }
 
     @Test
-    @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse2", "true"},
+    @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse2", "true", "rvv", "true"},
         counts = {IRNode.STORE_VECTOR, ">0"})
     public int[] crossZeroRange() {
         int[] res = new int[SIZE];
@@ -101,7 +101,7 @@ public class LoopRangeStrideTest extends VectorizationTestRunner {
     }
 
     @Test
-    @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse2", "true"},
+    @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse2", "true", "rvv", "true"},
         counts = {IRNode.STORE_VECTOR, ">0"})
     public int[] nonEqualTestRange() {
         int[] res = new int[SIZE];
@@ -112,7 +112,7 @@ public class LoopRangeStrideTest extends VectorizationTestRunner {
     }
 
     @Test
-    @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse4.1", "true"},
+    @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse4.1", "true", "rvv", "true"},
         counts = {IRNode.STORE_VECTOR, ">0"})
     public int[] shortInductionLoop() {
         int[] res = new int[SIZE];
@@ -123,7 +123,7 @@ public class LoopRangeStrideTest extends VectorizationTestRunner {
     }
 
     @Test
-    @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse2", "true"},
+    @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse2", "true", "rvv", "true"},
         counts = {IRNode.STORE_VECTOR, ">0"})
     public int[] whileLoop() {
         int[] res = new int[SIZE];
@@ -136,7 +136,7 @@ public class LoopRangeStrideTest extends VectorizationTestRunner {
     }
 
     @Test
-    @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse2", "true"},
+    @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse2", "true", "rvv", "true"},
         counts = {IRNode.STORE_VECTOR, ">0"})
     public int[] doWhileLoop() {
         int[] res = new int[SIZE];
@@ -177,7 +177,7 @@ public class LoopRangeStrideTest extends VectorizationTestRunner {
     }
 
     @Test
-    @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse4.1", "true"},
+    @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse4.1", "true", "rvv", "true"},
         counts = {IRNode.STORE_VECTOR, ">0"})
     public int[] countDownLoop() {
         int[] res = new int[SIZE];
@@ -198,7 +198,7 @@ public class LoopRangeStrideTest extends VectorizationTestRunner {
 
     // ---------- Stride with scale ----------
     @Test
-    @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse4.1", "true"},
+    @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse4.1", "true", "rvv", "true"},
         counts = {IRNode.STORE_VECTOR, ">0"})
     public int[] countupLoopWithNegScale() {
         int[] res = new int[SIZE];
@@ -209,7 +209,7 @@ public class LoopRangeStrideTest extends VectorizationTestRunner {
     }
 
     @Test
-    @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse4.1", "true"},
+    @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse4.1", "true", "rvv", "true"},
         counts = {IRNode.STORE_VECTOR, ">0"})
     public int[] countDownLoopWithNegScale() {
         int[] res = new int[SIZE];
diff --git a/test/hotspot/jtreg/compiler/vectorization/runner/LoopReductionOpTest.java b/test/hotspot/jtreg/compiler/vectorization/runner/LoopReductionOpTest.java
index f1c8fea059b..ac8be6bc0ec 100644
--- a/test/hotspot/jtreg/compiler/vectorization/runner/LoopReductionOpTest.java
+++ b/test/hotspot/jtreg/compiler/vectorization/runner/LoopReductionOpTest.java
@@ -35,7 +35,7 @@
  *                   -XX:+WhiteBoxAPI
  *                   compiler.vectorization.runner.LoopReductionOpTest
  *
- * @requires (os.simpleArch == "x64") | (os.simpleArch == "aarch64")
+ * @requires (os.simpleArch == "x64") | (os.simpleArch == "aarch64") | (os.simpleArch == "riscv64")
  * @requires vm.compiler2.enabled
  *
  */
@@ -78,7 +78,7 @@ public class LoopReductionOpTest extends VectorizationTestRunner {
     }
 
     @Test
-    @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse3", "true"},
+    @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse3", "true", "rvv", "true"},
         counts = {IRNode.LOAD_VECTOR_I, ">0",
                   IRNode.ADD_REDUCTION_V, ">0"})
     public int reductionAddSumOfArray() {
@@ -119,7 +119,7 @@ public class LoopReductionOpTest extends VectorizationTestRunner {
     }
 
     @Test
-    @IR(applyIfCPUFeatureOr = {"sve", "true", "avx2", "true"},
+    @IR(applyIfCPUFeatureOr = {"sve", "true", "avx2", "true", "rvv", "true"},
         counts = {IRNode.LOAD_VECTOR_I, ">0",
                   IRNode.ADD_REDUCTION_V, ">0"})
     public int reductionAddSumOfMultiple() {
@@ -175,9 +175,9 @@ public class LoopReductionOpTest extends VectorizationTestRunner {
     }
 
     @Test
-    @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse2", "true"},
+    @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse2", "true", "rvv", "true"},
         counts = {IRNode.STORE_VECTOR, ">0"})
-    @IR(applyIfCPUFeatureOr = {"avx2", "true"},
+    @IR(applyIfCPUFeatureOr = {"avx2", "true", "rvv", "true"},
         counts = {IRNode.ADD_REDUCTION_V, ">0"})
     public long reductionWithNonReductionDifferentSizes() {
         long res = 0L;
diff --git a/test/hotspot/jtreg/compiler/vectorization/runner/MultipleLoopsTest.java b/test/hotspot/jtreg/compiler/vectorization/runner/MultipleLoopsTest.java
index 61648c2e810..d4e67e50208 100644
--- a/test/hotspot/jtreg/compiler/vectorization/runner/MultipleLoopsTest.java
+++ b/test/hotspot/jtreg/compiler/vectorization/runner/MultipleLoopsTest.java
@@ -63,7 +63,7 @@ public class MultipleLoopsTest extends VectorizationTestRunner {
     }
 
     @Test
-    @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse2", "true"},
+    @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse2", "true", "rvv", "true"},
         counts = {IRNode.STORE_VECTOR, ">0"})
     public int[] consecutiveLoops() {
         int[] res1 = new int[SIZE];
@@ -82,7 +82,7 @@ public class MultipleLoopsTest extends VectorizationTestRunner {
     }
 
     @Test
-    @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse2", "true"},
+    @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse2", "true", "rvv", "true"},
         counts = {IRNode.STORE_VECTOR, ">0"})
     public int[] consecutiveLoopsNested() {
         int[] res = new int[SIZE];
@@ -98,7 +98,7 @@ public class MultipleLoopsTest extends VectorizationTestRunner {
     }
 
     @Test
-    @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse4.1", "true"},
+    @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse4.1", "true", "rvv", "true"},
         counts = {IRNode.STORE_VECTOR, ">0"})
     public int[] nestedLoopOuterNonCounted() {
         int i = 1;
@@ -114,7 +114,7 @@ public class MultipleLoopsTest extends VectorizationTestRunner {
     }
 
     @Test
-    @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse4.1", "true"},
+    @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse4.1", "true", "rvv", "true"},
         counts = {IRNode.STORE_VECTOR, ">0"})
     public int[] nestedLoopIndexCompute() {
         int[] res = new int[SIZE];
@@ -127,7 +127,7 @@ public class MultipleLoopsTest extends VectorizationTestRunner {
     }
 
     @Test
-    @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse2", "true"},
+    @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse2", "true", "rvv", "true"},
         counts = {IRNode.STORE_VECTOR, ">0"})
     public float reductionLoopWithAnotherReductionInput() {
         float res = 0.0F;
diff --git a/test/hotspot/jtreg/compiler/vectorization/runner/StripMinedLoopTest.java b/test/hotspot/jtreg/compiler/vectorization/runner/StripMinedLoopTest.java
index dc906540f88..dbc999647ad 100644
--- a/test/hotspot/jtreg/compiler/vectorization/runner/StripMinedLoopTest.java
+++ b/test/hotspot/jtreg/compiler/vectorization/runner/StripMinedLoopTest.java
@@ -60,7 +60,7 @@ public class StripMinedLoopTest extends VectorizationTestRunner {
     }
 
     @Test
-    @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse2", "true"},
+    @IR(applyIfCPUFeatureOr = {"asimd", "true", "sse2", "true", "rvv", "true"},
         counts = {IRNode.STORE_VECTOR, ">0"})
     public int[] stripMinedVectorLoop() {
         int[] res = new int[SIZE];

From 6241d09657fdd2bbd4f02cf6361df8bd07216147 Mon Sep 17 00:00:00 2001
From: Hamlin Li <mli@openjdk.org>
Date: Thu, 13 Mar 2025 08:12:56 +0000
Subject: [PATCH 328/587] 8351861: RISC-V: add simple assert at arrays_equals_v

Reviewed-by: fyang
---
 src/hotspot/cpu/riscv/c2_MacroAssembler_riscv.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/hotspot/cpu/riscv/c2_MacroAssembler_riscv.cpp b/src/hotspot/cpu/riscv/c2_MacroAssembler_riscv.cpp
index c7427a91527..d203ec3dfdb 100644
--- a/src/hotspot/cpu/riscv/c2_MacroAssembler_riscv.cpp
+++ b/src/hotspot/cpu/riscv/c2_MacroAssembler_riscv.cpp
@@ -2614,6 +2614,9 @@ void C2_MacroAssembler::clear_array_v(Register base, Register cnt) {
 
 void C2_MacroAssembler::arrays_equals_v(Register a1, Register a2, Register result,
                                         Register cnt1, int elem_size) {
+  assert(elem_size == 1 || elem_size == 2, "must be char or byte");
+  assert_different_registers(a1, a2, result, cnt1, t0, t1);
+
   Label DONE;
   Register tmp1 = t0;
   Register tmp2 = t1;

From a33b1f7f640e0a9e76d2a686734e472a87d809bf Mon Sep 17 00:00:00 2001
From: Hamlin Li <mli@openjdk.org>
Date: Thu, 13 Mar 2025 08:16:53 +0000
Subject: [PATCH 329/587] 8345298: RISC-V: Add riscv backend for Float16
 operations - scalar

Reviewed-by: rehn, fyang
---
 src/hotspot/cpu/riscv/assembler_riscv.hpp     |  41 ++++
 .../cpu/riscv/c2_MacroAssembler_riscv.cpp     |  77 ++++++--
 .../cpu/riscv/c2_MacroAssembler_riscv.hpp     |   8 +-
 .../cpu/riscv/macroAssembler_riscv.hpp        |   1 +
 src/hotspot/cpu/riscv/riscv.ad                | 187 +++++++++++++++++-
 src/hotspot/cpu/riscv/stubGenerator_riscv.cpp | 104 ++++++++++
 src/hotspot/cpu/riscv/vm_version_riscv.cpp    |  16 ++
 src/hotspot/cpu/riscv/vm_version_riscv.hpp    |   7 +
 .../c2/irTests/ConvF2HFIdealizationTests.java |   2 +-
 .../irTests/MulHFNodeIdealizationTests.java   |   2 +-
 .../irTests/TestFloat16ScalarOperations.java  |  46 ++---
 .../ir_framework/test/IREncodingPrinter.java  |   1 +
 .../TestFloat16VectorConvChain.java           |   2 -
 13 files changed, 444 insertions(+), 50 deletions(-)

diff --git a/src/hotspot/cpu/riscv/assembler_riscv.hpp b/src/hotspot/cpu/riscv/assembler_riscv.hpp
index 3a638357f0b..a08550b7137 100644
--- a/src/hotspot/cpu/riscv/assembler_riscv.hpp
+++ b/src/hotspot/cpu/riscv/assembler_riscv.hpp
@@ -1316,6 +1316,7 @@ enum operand_size { int8, int16, int32, uint32, int64 };
 
  public:
 
+  void  flh(FloatRegister Rd, Register Rs, const int32_t offset) { fp_load<0b001>(Rd, Rs, offset); }
   void  flw(FloatRegister Rd, Register Rs, const int32_t offset) { fp_load<0b010>(Rd, Rs, offset); }
   void _fld(FloatRegister Rd, Register Rs, const int32_t offset) { fp_load<0b011>(Rd, Rs, offset); }
 
@@ -1397,6 +1398,46 @@ enum operand_size { int8, int16, int32, uint32, int64 };
     fp_base<H_16_hp, 0b11100>(Rd, Rs1, 0b00000, 0b000);
   }
 
+  void fadd_h(FloatRegister Rd, FloatRegister Rs1, FloatRegister Rs2, RoundingMode rm = rne) {
+    assert_cond(UseZfh);
+    fp_base<H_16_hp, 0b00000>(Rd, Rs1, Rs2, rm);
+  }
+
+  void fsub_h(FloatRegister Rd, FloatRegister Rs1, FloatRegister Rs2, RoundingMode rm = rne) {
+    assert_cond(UseZfh);
+    fp_base<H_16_hp, 0b00001>(Rd, Rs1, Rs2, rm);
+  }
+
+  void fmul_h(FloatRegister Rd, FloatRegister Rs1, FloatRegister Rs2, RoundingMode rm = rne) {
+    assert_cond(UseZfh);
+    fp_base<H_16_hp, 0b00010>(Rd, Rs1, Rs2, rm);
+  }
+
+  void fdiv_h(FloatRegister Rd, FloatRegister Rs1, FloatRegister Rs2, RoundingMode rm = rne) {
+    assert_cond(UseZfh);
+    fp_base<H_16_hp, 0b00011>(Rd, Rs1, Rs2, rm);
+  }
+
+  void fsqrt_h(FloatRegister Rd, FloatRegister Rs1, RoundingMode rm = rne) {
+    assert_cond(UseZfh);
+    fp_base<H_16_hp, 0b01011>(Rd, Rs1, 0b00000, rm);
+  }
+
+  void fmin_h(FloatRegister Rd, FloatRegister Rs1, FloatRegister Rs2) {
+    assert_cond(UseZfh);
+    fp_base<H_16_hp, 0b00101>(Rd, Rs1, Rs2, 0b000);
+  }
+
+  void fmax_h(FloatRegister Rd, FloatRegister Rs1, FloatRegister Rs2) {
+    assert_cond(UseZfh);
+    fp_base<H_16_hp, 0b00101>(Rd, Rs1, Rs2, 0b001);
+  }
+
+  void fmadd_h(FloatRegister Rd, FloatRegister Rs1, FloatRegister Rs2, FloatRegister Rs3, RoundingMode rm = rne)  {
+    assert_cond(UseZfh);
+    fp_fm<H_16_hp, 0b1000011>(Rd, Rs1, Rs2, Rs3, rm);
+  }
+
 // --------------  ZFA Instruction Definitions  --------------
 // Zfa Extension for Additional Floating-Point Instructions
   void _fli_s(FloatRegister Rd, uint8_t Rs1) {
diff --git a/src/hotspot/cpu/riscv/c2_MacroAssembler_riscv.cpp b/src/hotspot/cpu/riscv/c2_MacroAssembler_riscv.cpp
index d203ec3dfdb..4eabe966672 100644
--- a/src/hotspot/cpu/riscv/c2_MacroAssembler_riscv.cpp
+++ b/src/hotspot/cpu/riscv/c2_MacroAssembler_riscv.cpp
@@ -2159,27 +2159,68 @@ void C2_MacroAssembler::enc_cmove(int cmpFlag, Register op1, Register op2, Regis
 
 // Set dst to NaN if any NaN input.
 void C2_MacroAssembler::minmax_fp(FloatRegister dst, FloatRegister src1, FloatRegister src2,
-                                  bool is_double, bool is_min) {
+                                  FLOAT_TYPE ft, bool is_min) {
+  assert_cond((ft != FLOAT_TYPE::half_precision) || UseZfh);
+
   Label Done, Compare;
 
-  is_double ? fclass_d(t0, src1)
-            : fclass_s(t0, src1);
-  is_double ? fclass_d(t1, src2)
-            : fclass_s(t1, src2);
-  orr(t0, t0, t1);
-  andi(t0, t0, FClassBits::nan); // if src1 or src2 is quiet or signaling NaN then return NaN
-  beqz(t0, Compare);
-  is_double ? fadd_d(dst, src1, src2)
-            : fadd_s(dst, src1, src2);
-  j(Done);
+  switch (ft) {
+    case FLOAT_TYPE::half_precision:
+      fclass_h(t0, src1);
+      fclass_h(t1, src2);
 
-  bind(Compare);
-  if (is_double) {
-    is_min ? fmin_d(dst, src1, src2)
-           : fmax_d(dst, src1, src2);
-  } else {
-    is_min ? fmin_s(dst, src1, src2)
-           : fmax_s(dst, src1, src2);
+      orr(t0, t0, t1);
+      andi(t0, t0, FClassBits::nan); // if src1 or src2 is quiet or signaling NaN then return NaN
+      beqz(t0, Compare);
+
+      fadd_h(dst, src1, src2);
+      j(Done);
+
+      bind(Compare);
+      if (is_min) {
+        fmin_h(dst, src1, src2);
+      } else {
+        fmax_h(dst, src1, src2);
+      }
+      break;
+    case FLOAT_TYPE::single_precision:
+      fclass_s(t0, src1);
+      fclass_s(t1, src2);
+
+      orr(t0, t0, t1);
+      andi(t0, t0, FClassBits::nan); // if src1 or src2 is quiet or signaling NaN then return NaN
+      beqz(t0, Compare);
+
+      fadd_s(dst, src1, src2);
+      j(Done);
+
+      bind(Compare);
+      if (is_min) {
+        fmin_s(dst, src1, src2);
+      } else {
+        fmax_s(dst, src1, src2);
+      }
+      break;
+    case FLOAT_TYPE::double_precision:
+      fclass_d(t0, src1);
+      fclass_d(t1, src2);
+
+      orr(t0, t0, t1);
+      andi(t0, t0, FClassBits::nan); // if src1 or src2 is quiet or signaling NaN then return NaN
+      beqz(t0, Compare);
+
+      fadd_d(dst, src1, src2);
+      j(Done);
+
+      bind(Compare);
+      if (is_min) {
+        fmin_d(dst, src1, src2);
+      } else {
+        fmax_d(dst, src1, src2);
+      }
+      break;
+    default:
+      ShouldNotReachHere();
   }
 
   bind(Done);
diff --git a/src/hotspot/cpu/riscv/c2_MacroAssembler_riscv.hpp b/src/hotspot/cpu/riscv/c2_MacroAssembler_riscv.hpp
index 72f3c1460f3..a650174d90f 100644
--- a/src/hotspot/cpu/riscv/c2_MacroAssembler_riscv.hpp
+++ b/src/hotspot/cpu/riscv/c2_MacroAssembler_riscv.hpp
@@ -172,9 +172,15 @@
     }
   }
 
+  enum class FLOAT_TYPE {
+    half_precision,
+    single_precision,
+    double_precision
+  };
+
   void minmax_fp(FloatRegister dst,
                  FloatRegister src1, FloatRegister src2,
-                 bool is_double, bool is_min);
+                 FLOAT_TYPE ft, bool is_min);
 
   void round_double_mode(FloatRegister dst, FloatRegister src, int round_mode,
                          Register tmp1, Register tmp2, Register tmp3);
diff --git a/src/hotspot/cpu/riscv/macroAssembler_riscv.hpp b/src/hotspot/cpu/riscv/macroAssembler_riscv.hpp
index 41ccd0c4b2f..f5dd4025185 100644
--- a/src/hotspot/cpu/riscv/macroAssembler_riscv.hpp
+++ b/src/hotspot/cpu/riscv/macroAssembler_riscv.hpp
@@ -1080,6 +1080,7 @@ public:
     }                                                                                              \
   }
 
+  INSN(flh);
   INSN(flw);
   INSN(fld);
 
diff --git a/src/hotspot/cpu/riscv/riscv.ad b/src/hotspot/cpu/riscv/riscv.ad
index 6ee1e284f2c..cecca0a5402 100644
--- a/src/hotspot/cpu/riscv/riscv.ad
+++ b/src/hotspot/cpu/riscv/riscv.ad
@@ -1916,7 +1916,19 @@ bool Matcher::match_rule_supported(int opcode) {
 
     case Op_ConvHF2F:
     case Op_ConvF2HF:
+      return VM_Version::supports_float16_float_conversion();
+    case Op_ReinterpretS2HF:
+    case Op_ReinterpretHF2S:
       return UseZfh || UseZfhmin;
+    case Op_AddHF:
+    case Op_DivHF:
+    case Op_FmaHF:
+    case Op_MaxHF:
+    case Op_MinHF:
+    case Op_MulHF:
+    case Op_SubHF:
+    case Op_SqrtHF:
+      return UseZfh;
   }
 
   return true; // Per default match rules are supported.
@@ -3056,6 +3068,27 @@ operand immF0()
   interface(CONST_INTER);
 %}
 
+// Half Float Immediate
+operand immH()
+%{
+  match(ConH);
+
+  op_cost(0);
+  format %{ %}
+  interface(CONST_INTER);
+%}
+
+// Half Float Immediate: +0.0f.
+operand immH0()
+%{
+  predicate(jint_cast(n->geth()) == 0);
+  match(ConH);
+
+  op_cost(0);
+  format %{ %}
+  interface(CONST_INTER);
+%}
+
 operand immIOffset()
 %{
   predicate(Assembler::is_simm12(n->get_int()));
@@ -4907,6 +4940,39 @@ instruct loadConNKlass(iRegNNoSp dst, immNKlass con)
   ins_pipe(ialu_imm);
 %}
 
+// Load Half Float Constant
+instruct loadConH(fRegF dst, immH con) %{
+  match(Set dst con);
+
+  ins_cost(LOAD_COST);
+  format %{
+    "flh $dst, [$constantaddress]\t# load from constant table: float=$con, #@loadConH"
+  %}
+
+  ins_encode %{
+    assert(UseZfh || UseZfhmin, "must");
+    __ flh(as_FloatRegister($dst$$reg), $constantaddress($con));
+    // TODO: add zfa instructions for half float, and optimize here.
+  %}
+
+  ins_pipe(fp_load_constant_s);
+%}
+
+instruct loadConH0(fRegF dst, immH0 con) %{
+  match(Set dst con);
+
+  ins_cost(XFER_COST);
+
+  format %{ "fmv.h.x $dst, zr\t# float, #@loadConH0" %}
+
+  ins_encode %{
+    assert(UseZfh || UseZfhmin, "must");
+    __ fmv_h_x(as_FloatRegister($dst$$reg), zr);
+  %}
+
+  ins_pipe(fp_load_constant_s);
+%}
+
 // Load Float Constant
 instruct loadConF(fRegF dst, immF con) %{
   match(Set dst con);
@@ -7291,7 +7357,7 @@ instruct maxF_reg_reg(fRegF dst, fRegF src1, fRegF src2, rFlagsReg cr) %{
   ins_encode %{
     __ minmax_fp(as_FloatRegister($dst$$reg),
                  as_FloatRegister($src1$$reg), as_FloatRegister($src2$$reg),
-                 false /* is_double */, false /* is_min */);
+                 __ FLOAT_TYPE::single_precision, false /* is_min */);
   %}
 
   ins_pipe(pipe_class_default);
@@ -7307,7 +7373,7 @@ instruct minF_reg_reg(fRegF dst, fRegF src1, fRegF src2, rFlagsReg cr) %{
   ins_encode %{
     __ minmax_fp(as_FloatRegister($dst$$reg),
                  as_FloatRegister($src1$$reg), as_FloatRegister($src2$$reg),
-                 false /* is_double */, true /* is_min */);
+                 __ FLOAT_TYPE::single_precision, true /* is_min */);
   %}
 
   ins_pipe(pipe_class_default);
@@ -7323,7 +7389,7 @@ instruct maxD_reg_reg(fRegD dst, fRegD src1, fRegD src2, rFlagsReg cr) %{
   ins_encode %{
     __ minmax_fp(as_FloatRegister($dst$$reg),
                  as_FloatRegister($src1$$reg), as_FloatRegister($src2$$reg),
-                 true /* is_double */, false /* is_min */);
+                 __ FLOAT_TYPE::double_precision, false /* is_min */);
   %}
 
   ins_pipe(pipe_class_default);
@@ -7339,7 +7405,7 @@ instruct minD_reg_reg(fRegD dst, fRegD src1, fRegD src2, rFlagsReg cr) %{
   ins_encode %{
     __ minmax_fp(as_FloatRegister($dst$$reg),
                  as_FloatRegister($src1$$reg), as_FloatRegister($src2$$reg),
-                 true /* is_double */, true /* is_min */);
+                 __ FLOAT_TYPE::double_precision, true /* is_min */);
   %}
 
   ins_pipe(pipe_class_default);
@@ -8009,6 +8075,17 @@ instruct checkCastPP(iRegPNoSp dst)
   ins_pipe(pipe_class_empty);
 %}
 
+instruct castHH(fRegF dst)
+%{
+  match(Set dst (CastHH dst));
+
+  size(0);
+  format %{ "# castHH of $dst" %}
+  ins_encode(/* empty encoding */);
+  ins_cost(0);
+  ins_pipe(pipe_class_empty);
+%}
+
 instruct castFF(fRegF dst)
 %{
   match(Set dst (CastFF dst));
@@ -8171,6 +8248,108 @@ instruct convF2HF_reg_reg(iRegINoSp dst, fRegF src, fRegF ftmp, iRegINoSp xtmp)
   ins_pipe(pipe_slow);
 %}
 
+// half precision operations
+
+instruct reinterpretS2HF(fRegF dst, iRegI src)
+%{
+  match(Set dst (ReinterpretS2HF src));
+  format %{ "fmv.h.x $dst, $src" %}
+  ins_encode %{
+    __ fmv_h_x($dst$$FloatRegister, $src$$Register);
+  %}
+  ins_pipe(fp_i2f);
+%}
+
+instruct convF2HFAndS2HF(fRegF dst, fRegF src)
+%{
+  match(Set dst (ReinterpretS2HF (ConvF2HF src)));
+  format %{ "convF2HFAndS2HF $dst, $src" %}
+  ins_encode %{
+    __ fcvt_h_s($dst$$FloatRegister, $src$$FloatRegister);
+  %}
+  ins_pipe(fp_uop_s);
+%}
+
+instruct reinterpretHF2S(iRegINoSp dst, fRegF src)
+%{
+  match(Set dst (ReinterpretHF2S src));
+  format %{ "fmv.x.h $dst, $src" %}
+  ins_encode %{
+    __ fmv_x_h($dst$$Register, $src$$FloatRegister);
+  %}
+  ins_pipe(fp_f2i);
+%}
+
+instruct convHF2SAndHF2F(fRegF dst, fRegF src)
+%{
+  match(Set dst (ConvHF2F (ReinterpretHF2S src)));
+  format %{ "convHF2SAndHF2F $dst, $src" %}
+  ins_encode %{
+    __ fcvt_s_h($dst$$FloatRegister, $src$$FloatRegister);
+  %}
+  ins_pipe(fp_uop_s);
+%}
+
+instruct sqrt_HF_reg(fRegF dst, fRegF src)
+%{
+  match(Set dst (SqrtHF src));
+  format %{ "fsqrt.h $dst, $src" %}
+  ins_encode %{
+    __ fsqrt_h($dst$$FloatRegister, $src$$FloatRegister);
+  %}
+  ins_pipe(fp_sqrt_s);
+%}
+
+instruct binOps_HF_reg(fRegF dst, fRegF src1, fRegF src2)
+%{
+  match(Set dst (AddHF src1 src2));
+  match(Set dst (SubHF src1 src2));
+  match(Set dst (MulHF src1 src2));
+  match(Set dst (DivHF src1 src2));
+  format %{ "binop_hf $dst, $src1, $src2" %}
+  ins_encode %{
+    int opcode = this->ideal_Opcode();
+    switch(opcode) {
+      case Op_AddHF: __ fadd_h($dst$$FloatRegister, $src1$$FloatRegister, $src2$$FloatRegister); break;
+      case Op_SubHF: __ fsub_h($dst$$FloatRegister, $src1$$FloatRegister, $src2$$FloatRegister); break;
+      case Op_MulHF: __ fmul_h($dst$$FloatRegister, $src1$$FloatRegister, $src2$$FloatRegister); break;
+      case Op_DivHF: __ fdiv_h($dst$$FloatRegister, $src1$$FloatRegister, $src2$$FloatRegister); break;
+      default: assert(false, "%s is not supported here", NodeClassNames[opcode]); break;
+    }
+  %}
+  ins_pipe(fp_dop_reg_reg_s);
+%}
+
+instruct min_max_HF_reg(fRegF dst, fRegF src1, fRegF src2)
+%{
+  match(Set dst (MinHF src1 src2));
+  match(Set dst (MaxHF src1 src2));
+  format %{ "min_max_hf $dst, $src1, $src2" %}
+  ins_encode %{
+    int opcode = this->ideal_Opcode();
+    switch(opcode) {
+      case Op_MinHF: __ minmax_fp($dst$$FloatRegister, $src1$$FloatRegister, $src2$$FloatRegister,
+                                  __ FLOAT_TYPE::half_precision, true);
+                     break;
+      case Op_MaxHF: __ minmax_fp($dst$$FloatRegister, $src1$$FloatRegister, $src2$$FloatRegister,
+                                  __ FLOAT_TYPE::half_precision, false);
+                     break;
+      default: assert(false, "%s is not supported here", NodeClassNames[opcode]); break;
+    }
+  %}
+  ins_pipe(pipe_class_default);
+%}
+
+instruct fma_HF_reg(fRegF dst, fRegF src1, fRegF src2, fRegF src3)
+%{
+  match(Set dst (FmaHF src3 (Binary src1 src2)));
+  format %{ "fmadd.h $dst, $src1, $src2, $src3\t# $dst = $src1 * $src2 + $src3 fma packedH" %}
+  ins_encode %{
+    __ fmadd_h($dst$$FloatRegister, $src1$$FloatRegister, $src2$$FloatRegister, $src3$$FloatRegister);
+  %}
+  ins_pipe(pipe_class_default);
+%}
+
 // float <-> int
 
 instruct convF2I_reg_reg(iRegINoSp dst, fRegF src) %{
diff --git a/src/hotspot/cpu/riscv/stubGenerator_riscv.cpp b/src/hotspot/cpu/riscv/stubGenerator_riscv.cpp
index e9130590ae0..235dd8f13d8 100644
--- a/src/hotspot/cpu/riscv/stubGenerator_riscv.cpp
+++ b/src/hotspot/cpu/riscv/stubGenerator_riscv.cpp
@@ -6156,6 +6156,104 @@ class StubGenerator: public StubCodeGenerator {
     return start;
   }
 
+  // x10 = input (float16)
+  // f10 = result (float)
+  // t1  = temporary register
+  address generate_float16ToFloat() {
+    __ align(CodeEntryAlignment);
+    StubGenStubId stub_id = StubGenStubId::hf2f_id;
+    StubCodeMark mark(this, stub_id);
+    address entry = __ pc();
+    BLOCK_COMMENT("float16ToFloat:");
+
+    FloatRegister dst = f10;
+    Register src = x10;
+    Label NaN_SLOW;
+
+    assert(VM_Version::supports_float16_float_conversion(), "must");
+
+    // On riscv, NaN needs a special process as fcvt does not work in that case.
+    // On riscv, Inf does not need a special process as fcvt can handle it correctly.
+    // but we consider to get the slow path to process NaN and Inf at the same time,
+    // as both of them are rare cases, and if we try to get the slow path to handle
+    // only NaN case it would sacrifise the performance for normal cases,
+    // i.e. non-NaN and non-Inf cases.
+
+    // check whether it's a NaN or +/- Inf.
+    __ mv(t0, 0x7c00);
+    __ andr(t1, src, t0);
+    // jump to stub processing NaN and Inf cases.
+    __ beq(t0, t1, NaN_SLOW);
+
+    // non-NaN or non-Inf cases, just use built-in instructions.
+    __ fmv_h_x(dst, src);
+    __ fcvt_s_h(dst, dst);
+    __ ret();
+
+    __ bind(NaN_SLOW);
+    // following instructions mainly focus on NaN, as riscv does not handle
+    // NaN well with fcvt, but the code also works for Inf at the same time.
+
+    // construct a NaN in 32 bits from the NaN in 16 bits,
+    // we need the payloads of non-canonical NaNs to be preserved.
+    __ mv(t1, 0x7f800000);
+    // sign-bit was already set via sign-extension if necessary.
+    __ slli(t0, src, 13);
+    __ orr(t1, t0, t1);
+    __ fmv_w_x(dst, t1);
+
+    __ ret();
+    return entry;
+  }
+
+  // f10 = input (float)
+  // x10 = result (float16)
+  // f11 = temporary float register
+  // t1  = temporary register
+  address generate_floatToFloat16() {
+    __ align(CodeEntryAlignment);
+    StubGenStubId stub_id = StubGenStubId::f2hf_id;
+    StubCodeMark mark(this, stub_id);
+    address entry = __ pc();
+    BLOCK_COMMENT("floatToFloat16:");
+
+    Register dst = x10;
+    FloatRegister src = f10, ftmp = f11;
+    Label NaN_SLOW;
+
+    assert(VM_Version::supports_float16_float_conversion(), "must");
+
+    // On riscv, NaN needs a special process as fcvt does not work in that case.
+
+    // check whether it's a NaN.
+    // replace fclass with feq as performance optimization.
+    __ feq_s(t0, src, src);
+    // jump to stub processing NaN cases.
+    __ beqz(t0, NaN_SLOW);
+
+    // non-NaN cases, just use built-in instructions.
+    __ fcvt_h_s(ftmp, src);
+    __ fmv_x_h(dst, ftmp);
+    __ ret();
+
+    __ bind(NaN_SLOW);
+    __ fmv_x_w(dst, src);
+
+    // preserve the payloads of non-canonical NaNs.
+    __ srai(dst, dst, 13);
+    // preserve the sign bit.
+    __ srai(t1, dst, 13);
+    __ slli(t1, t1, 10);
+    __ mv(t0, 0x3ff);
+    __ orr(t1, t1, t0);
+
+    // get the result by merging sign bit and payloads of preserved non-canonical NaNs.
+    __ andr(dst, dst, t1);
+
+    __ ret();
+    return entry;
+  }
+
 #endif // COMPILER2_OR_JVMCI
 
 #ifdef COMPILER2
@@ -6525,6 +6623,12 @@ static const int64_t right_3_bits = right_n_bits(3);
       StubRoutines::_crc_table_adr = (address)StubRoutines::riscv::_crc_table;
       StubRoutines::_updateBytesCRC32 = generate_updateBytesCRC32();
     }
+
+    if (vmIntrinsics::is_intrinsic_available(vmIntrinsics::_float16ToFloat) &&
+        vmIntrinsics::is_intrinsic_available(vmIntrinsics::_floatToFloat16)) {
+      StubRoutines::_hf2f = generate_float16ToFloat();
+      StubRoutines::_f2hf = generate_floatToFloat16();
+    }
   }
 
   void generate_continuation_stubs() {
diff --git a/src/hotspot/cpu/riscv/vm_version_riscv.cpp b/src/hotspot/cpu/riscv/vm_version_riscv.cpp
index 389af3a06e3..7b17d30447b 100644
--- a/src/hotspot/cpu/riscv/vm_version_riscv.cpp
+++ b/src/hotspot/cpu/riscv/vm_version_riscv.cpp
@@ -24,6 +24,7 @@
  *
  */
 
+#include "classfile/vmIntrinsics.hpp"
 #include "runtime/java.hpp"
 #include "runtime/os.inline.hpp"
 #include "runtime/vm_version.hpp"
@@ -464,3 +465,18 @@ void VM_Version::initialize_cpu_information(void) {
   snprintf(_cpu_desc, CPU_DETAILED_DESC_BUF_SIZE, "RISCV64 %s", features_string());
   _initialized = true;
 }
+
+bool VM_Version::is_intrinsic_supported(vmIntrinsicID id) {
+  assert(id != vmIntrinsics::_none, "must be a VM intrinsic");
+  switch (id) {
+  case vmIntrinsics::_floatToFloat16:
+  case vmIntrinsics::_float16ToFloat:
+    if (!supports_float16_float_conversion()) {
+      return false;
+    }
+    break;
+  default:
+    break;
+  }
+  return true;
+}
diff --git a/src/hotspot/cpu/riscv/vm_version_riscv.hpp b/src/hotspot/cpu/riscv/vm_version_riscv.hpp
index 68665d12378..dc9d143cea9 100644
--- a/src/hotspot/cpu/riscv/vm_version_riscv.hpp
+++ b/src/hotspot/cpu/riscv/vm_version_riscv.hpp
@@ -297,6 +297,13 @@ class VM_Version : public Abstract_VM_Version {
   // RISCV64 supports fast class initialization checks
   static bool supports_fast_class_init_checks() { return true; }
   static bool supports_fencei_barrier() { return ext_Zifencei.enabled(); }
+
+  static bool supports_float16_float_conversion() {
+    return UseZfh || UseZfhmin;
+  }
+
+  // Check intrinsic support
+  static bool is_intrinsic_supported(vmIntrinsicID id);
 };
 
 #endif // CPU_RISCV_VM_VERSION_RISCV_HPP
diff --git a/test/hotspot/jtreg/compiler/c2/irTests/ConvF2HFIdealizationTests.java b/test/hotspot/jtreg/compiler/c2/irTests/ConvF2HFIdealizationTests.java
index f24fca1d87e..d7b927778df 100644
--- a/test/hotspot/jtreg/compiler/c2/irTests/ConvF2HFIdealizationTests.java
+++ b/test/hotspot/jtreg/compiler/c2/irTests/ConvF2HFIdealizationTests.java
@@ -54,7 +54,7 @@ public class ConvF2HFIdealizationTests {
     @Test
     @IR(counts = {IRNode.REINTERPRET_S2HF, ">=1", IRNode.REINTERPRET_HF2S, ">=1", IRNode.ADD_HF, ">=1" },
         failOn = {IRNode.ADD_F, IRNode.CONV_HF2F, IRNode.CONV_F2HF},
-        applyIfCPUFeature = {"avx512_fp16", "true"})
+        applyIfCPUFeatureOr = {"avx512_fp16", "true", "zfh", "true"})
     // Test pattern - ConvHF2F -> AddF -> ConvF2HF is optimized to ReinterpretS2HF -> AddHF -> ReinterpretHF2S
     public void test1() {
         for (int i = 0; i < SIZE; i++) {
diff --git a/test/hotspot/jtreg/compiler/c2/irTests/MulHFNodeIdealizationTests.java b/test/hotspot/jtreg/compiler/c2/irTests/MulHFNodeIdealizationTests.java
index dd98c80d629..eab220dc196 100644
--- a/test/hotspot/jtreg/compiler/c2/irTests/MulHFNodeIdealizationTests.java
+++ b/test/hotspot/jtreg/compiler/c2/irTests/MulHFNodeIdealizationTests.java
@@ -54,7 +54,7 @@ public class MulHFNodeIdealizationTests {
 
     @Test
     @IR(counts = {IRNode.ADD_HF, "1"},
-        applyIfCPUFeature = {"avx512_fp16", "true"},
+        applyIfCPUFeatureOr = {"avx512_fp16", "true", "zfh", "true"},
         failOn = {IRNode.MUL_HF})
     public void test1() {
         dst = multiply(src, valueOf(2.0f));
diff --git a/test/hotspot/jtreg/compiler/c2/irTests/TestFloat16ScalarOperations.java b/test/hotspot/jtreg/compiler/c2/irTests/TestFloat16ScalarOperations.java
index 17a3e4b4c56..014c660dfb2 100644
--- a/test/hotspot/jtreg/compiler/c2/irTests/TestFloat16ScalarOperations.java
+++ b/test/hotspot/jtreg/compiler/c2/irTests/TestFloat16ScalarOperations.java
@@ -101,7 +101,7 @@ public class TestFloat16ScalarOperations {
 
     @Test
     @IR(counts = {"convHF2SAndHF2F", " >0 "}, phase = {CompilePhase.FINAL_CODE},
-        applyIfCPUFeature = {"avx512_fp16", "true"})
+        applyIfCPUFeatureOr = {"avx512_fp16", "true", "zfh", "true"})
     public void testEliminateIntermediateHF2S() {
         Float16 res = shortBitsToFloat16((short)0);
         for (int i = 0; i < count; i++) {
@@ -114,7 +114,7 @@ public class TestFloat16ScalarOperations {
 
     @Test
     @IR(counts = {IRNode.ADD_HF, " >0 ", IRNode.REINTERPRET_S2HF, " >0 ", IRNode.REINTERPRET_HF2S, " >0 "},
-        applyIfCPUFeature = {"avx512_fp16", "true"})
+        applyIfCPUFeatureOr = {"avx512_fp16", "true", "zfh", "true"})
     public void testAdd1() {
         Float16 res = shortBitsToFloat16((short)0);
         for (int i = 0; i < count; i++) {
@@ -125,7 +125,7 @@ public class TestFloat16ScalarOperations {
 
     @Test
     @IR(failOn = {IRNode.ADD_HF, IRNode.REINTERPRET_S2HF, IRNode.REINTERPRET_HF2S},
-        applyIfCPUFeature = {"avx512_fp16", "true"})
+        applyIfCPUFeatureOr = {"avx512_fp16", "true", "zfh", "true"})
     public void testAdd2() {
         Float16 hf0 = shortBitsToFloat16((short)0);
         Float16 hf1 = shortBitsToFloat16((short)15360);
@@ -137,7 +137,7 @@ public class TestFloat16ScalarOperations {
 
     @Test
     @IR(counts = {IRNode.SUB_HF, " >0 ", IRNode.REINTERPRET_S2HF, " >0 ", IRNode.REINTERPRET_HF2S, " >0 "},
-        applyIfCPUFeature = {"avx512_fp16", "true"})
+        applyIfCPUFeatureOr = {"avx512_fp16", "true", "zfh", "true"})
     public void testSub() {
         Float16 res = shortBitsToFloat16((short)0);
         for (int i = 0; i < count; i++) {
@@ -148,7 +148,7 @@ public class TestFloat16ScalarOperations {
 
     @Test
     @IR(counts = {IRNode.MUL_HF, " >0 ", IRNode.REINTERPRET_S2HF, " >0 ", IRNode.REINTERPRET_HF2S, " >0 "},
-        applyIfCPUFeature = {"avx512_fp16", "true"})
+        applyIfCPUFeatureOr = {"avx512_fp16", "true", "zfh", "true"})
     public void testMul() {
         Float16 res = shortBitsToFloat16((short)0);
         for (int i = 0; i < count; i++) {
@@ -159,7 +159,7 @@ public class TestFloat16ScalarOperations {
 
     @Test
     @IR(counts = {IRNode.DIV_HF, " >0 ", IRNode.REINTERPRET_S2HF, " >0 ", IRNode.REINTERPRET_HF2S, " >0 "},
-        applyIfCPUFeature = {"avx512_fp16", "true"})
+        applyIfCPUFeatureOr = {"avx512_fp16", "true", "zfh", "true"})
     public void testDiv() {
         Float16 res = shortBitsToFloat16((short)0);
         for (int i = 0; i < count; i++) {
@@ -170,7 +170,7 @@ public class TestFloat16ScalarOperations {
 
     @Test
     @IR(counts = {IRNode.DIV_HF, " 0 ", IRNode.REINTERPRET_S2HF, " 0 ", IRNode.REINTERPRET_HF2S, " 0 "},
-        applyIfCPUFeature = {"avx512_fp16", "true"})
+        applyIfCPUFeatureOr = {"avx512_fp16", "true", "zfh", "true"})
     public void testDivByOne() {
         Float16 res = shortBitsToFloat16((short)0);
         for (int i = 0; i < count; i++) {
@@ -181,7 +181,7 @@ public class TestFloat16ScalarOperations {
 
     @Test
     @IR(counts = {IRNode.MAX_HF, " >0 ", IRNode.REINTERPRET_S2HF, " >0 ", IRNode.REINTERPRET_HF2S, " >0 "},
-        applyIfCPUFeature = {"avx512_fp16", "true"})
+        applyIfCPUFeatureOr = {"avx512_fp16", "true", "zfh", "true"})
     public void testMax() {
         Float16 res = shortBitsToFloat16((short)0);
         for (int i = 0; i < count; i++) {
@@ -192,7 +192,7 @@ public class TestFloat16ScalarOperations {
 
     @Test
     @IR(counts = {IRNode.MIN_HF, " >0 ", IRNode.REINTERPRET_S2HF, " >0 ", IRNode.REINTERPRET_HF2S, " >0 "},
-        applyIfCPUFeature = {"avx512_fp16", "true"})
+        applyIfCPUFeatureOr = {"avx512_fp16", "true", "zfh", "true"})
     public void testMin() {
         Float16 res = shortBitsToFloat16((short)0);
         for (int i = 0; i < count; i++) {
@@ -203,7 +203,7 @@ public class TestFloat16ScalarOperations {
 
     @Test
     @IR(counts = {IRNode.SQRT_HF, " >0 ", IRNode.REINTERPRET_S2HF, " >0 ", IRNode.REINTERPRET_HF2S, " >0 "},
-        applyIfCPUFeature = {"avx512_fp16", "true"})
+        applyIfCPUFeatureOr = {"avx512_fp16", "true", "zfh", "true"})
     public void testSqrt() {
         Float16 res = shortBitsToFloat16((short)0);
         for (int i = 0; i < count; i++) {
@@ -214,7 +214,7 @@ public class TestFloat16ScalarOperations {
 
     @Test
     @IR(counts = {IRNode.FMA_HF, " >0 ", IRNode.REINTERPRET_S2HF, " >0 ", IRNode.REINTERPRET_HF2S, " >0 "},
-        applyIfCPUFeature = {"avx512_fp16", "true"})
+        applyIfCPUFeatureOr = {"avx512_fp16", "true", "zfh", "true"})
     public void testFma() {
         Float16 res = shortBitsToFloat16((short)0);
         for (int i = 0; i < count; i++) {
@@ -226,7 +226,7 @@ public class TestFloat16ScalarOperations {
 
     @Test
     @IR(counts = {IRNode.MUL_HF, " >0 ", IRNode.REINTERPRET_S2HF, " >0 ", IRNode.REINTERPRET_HF2S, " >0 "},
-        applyIfCPUFeature = {"avx512_fp16", "true"})
+        applyIfCPUFeatureOr = {"avx512_fp16", "true", "zfh", "true"})
     public void testDivByPOT() {
         Float16 res = valueOf(0.0f);
         for (int i = 0; i < 50; i++) {
@@ -243,7 +243,7 @@ public class TestFloat16ScalarOperations {
 
     @Test
     @IR(counts = {IRNode.MUL_HF, " 0 ", IRNode.ADD_HF, " >0 ", IRNode.REINTERPRET_S2HF, " >0 ", IRNode.REINTERPRET_HF2S, " >0 "},
-        applyIfCPUFeature = {"avx512_fp16", "true"})
+        applyIfCPUFeatureOr = {"avx512_fp16", "true", "zfh", "true"})
     public void testMulByTWO() {
         Float16 res = valueOf(0.0f);
         Float16 multiplier = valueOf(2.0f);
@@ -280,7 +280,7 @@ public class TestFloat16ScalarOperations {
 
     @Test
     @IR(counts = {IRNode.ADD_HF, " 0 ", IRNode.REINTERPRET_S2HF, " 0 ", IRNode.REINTERPRET_HF2S, " 0 "},
-        applyIfCPUFeature = {"avx512_fp16", "true"})
+        applyIfCPUFeatureOr = {"avx512_fp16", "true", "zfh", "true"})
     public void testAddConstantFolding() {
         // If either value is NaN, then the result is NaN.
         assertResult(add(Float16.NaN, valueOf(2.0f)).floatValue(), Float.NaN, "testAddConstantFolding");
@@ -323,7 +323,7 @@ public class TestFloat16ScalarOperations {
 
     @Test
     @IR(counts = {IRNode.SUB_HF, " 0 ", IRNode.REINTERPRET_S2HF, " 0 ", IRNode.REINTERPRET_HF2S, " 0 "},
-        applyIfCPUFeature = {"avx512_fp16", "true"})
+        applyIfCPUFeatureOr = {"avx512_fp16", "true", "zfh", "true"})
     public void testSubConstantFolding() {
         // If either value is NaN, then the result is NaN.
         assertResult(subtract(Float16.NaN, valueOf(2.0f)).floatValue(), Float.NaN, "testAddConstantFolding");
@@ -356,7 +356,7 @@ public class TestFloat16ScalarOperations {
     @Test
     @Warmup(value = 10000)
     @IR(counts = {IRNode.MAX_HF, " 0 ", IRNode.REINTERPRET_S2HF, " 0 ", IRNode.REINTERPRET_HF2S, " 0 "},
-        applyIfCPUFeature = {"avx512_fp16", "true"})
+        applyIfCPUFeatureOr = {"avx512_fp16", "true", "zfh", "true"})
     public void testMaxConstantFolding() {
         // If either value is NaN, then the result is NaN.
         assertResult(max(valueOf(2.0f), Float16.NaN).floatValue(), Float.NaN, "testMaxConstantFolding");
@@ -374,7 +374,7 @@ public class TestFloat16ScalarOperations {
 
     @Test
     @IR(counts = {IRNode.MIN_HF, " 0 ", IRNode.REINTERPRET_S2HF, " 0 ", IRNode.REINTERPRET_HF2S, " 0 "},
-        applyIfCPUFeature = {"avx512_fp16", "true"})
+        applyIfCPUFeatureOr = {"avx512_fp16", "true", "zfh", "true"})
     public void testMinConstantFolding() {
         // If either value is NaN, then the result is NaN.
         assertResult(min(valueOf(2.0f), Float16.NaN).floatValue(), Float.NaN, "testMinConstantFolding");
@@ -391,7 +391,7 @@ public class TestFloat16ScalarOperations {
 
     @Test
     @IR(counts = {IRNode.DIV_HF, " 0 ", IRNode.REINTERPRET_S2HF, " 0 ", IRNode.REINTERPRET_HF2S, " 0 "},
-        applyIfCPUFeature = {"avx512_fp16", "true"})
+        applyIfCPUFeatureOr = {"avx512_fp16", "true", "zfh", "true"})
     public void testDivConstantFolding() {
         // If either value is NaN, then the result is NaN.
         assertResult(divide(Float16.NaN, POSITIVE_ZERO).floatValue(), Float.NaN, "testDivConstantFolding");
@@ -431,7 +431,7 @@ public class TestFloat16ScalarOperations {
 
     @Test
     @IR(counts = {IRNode.MUL_HF, " 0 ", IRNode.REINTERPRET_S2HF, " 0 ", IRNode.REINTERPRET_HF2S, " 0 "},
-        applyIfCPUFeature = {"avx512_fp16", "true"})
+        applyIfCPUFeatureOr = {"avx512_fp16", "true", "zfh", "true"})
     public void testMulConstantFolding() {
         // If any operand is NaN, the result is NaN.
         assertResult(multiply(Float16.NaN, valueOf(4.0f)).floatValue(), Float.NaN, "testMulConstantFolding");
@@ -454,7 +454,7 @@ public class TestFloat16ScalarOperations {
 
     @Test
     @IR(counts = {IRNode.SQRT_HF, " 0 ", IRNode.REINTERPRET_S2HF, " 0 ", IRNode.REINTERPRET_HF2S, " 0 "},
-        applyIfCPUFeature = {"avx512_fp16", "true"})
+        applyIfCPUFeatureOr = {"avx512_fp16", "true", "zfh", "true"})
     public void testSqrtConstantFolding() {
         // If the argument is NaN or less than zero, then the result is NaN.
         assertResult(sqrt(Float16.NaN).floatValue(), Float.NaN, "testSqrtConstantFolding");
@@ -473,7 +473,7 @@ public class TestFloat16ScalarOperations {
 
     @Test
     @IR(counts = {IRNode.FMA_HF, " 0 ", IRNode.REINTERPRET_S2HF, " 0 ", IRNode.REINTERPRET_HF2S, " 0 "},
-        applyIfCPUFeature = {"avx512_fp16", "true"})
+        applyIfCPUFeatureOr = {"avx512_fp16", "true", "zfh", "true"})
     public void testFMAConstantFolding() {
         // If any argument is NaN, the result is NaN.
         assertResult(fma(Float16.NaN, valueOf(2.0f), valueOf(3.0f)).floatValue(), Float.NaN, "testFMAConstantFolding");
@@ -508,7 +508,7 @@ public class TestFloat16ScalarOperations {
 
     @Test
     @IR(failOn = {IRNode.ADD_HF, IRNode.SUB_HF, IRNode.MUL_HF, IRNode.DIV_HF, IRNode.SQRT_HF, IRNode.FMA_HF},
-        applyIfCPUFeature = {"avx512_fp16", "true"})
+        applyIfCPUFeatureOr = {"avx512_fp16", "true", "zfh", "true"})
     public void testRounding1() {
         dst[0] = float16ToRawShortBits(add(RANDOM1, RANDOM2));
         dst[1] = float16ToRawShortBits(subtract(RANDOM2, RANDOM3));
@@ -547,7 +547,7 @@ public class TestFloat16ScalarOperations {
     @Test
     @IR(counts = {IRNode.ADD_HF, " >0 ", IRNode.SUB_HF, " >0 ", IRNode.MUL_HF, " >0 ",
                   IRNode.DIV_HF, " >0 ", IRNode.SQRT_HF, " >0 ", IRNode.FMA_HF, " >0 "},
-        applyIfCPUFeature = {"avx512_fp16", "true"})
+        applyIfCPUFeatureOr = {"avx512_fp16", "true", "zfh", "true"})
     public void testRounding2() {
         dst[0] = float16ToRawShortBits(add(RANDOM1_VAR, RANDOM2_VAR));
         dst[1] = float16ToRawShortBits(subtract(RANDOM2_VAR, RANDOM3_VAR));
diff --git a/test/hotspot/jtreg/compiler/lib/ir_framework/test/IREncodingPrinter.java b/test/hotspot/jtreg/compiler/lib/ir_framework/test/IREncodingPrinter.java
index 0b7dcbae9d9..023bd7b815d 100644
--- a/test/hotspot/jtreg/compiler/lib/ir_framework/test/IREncodingPrinter.java
+++ b/test/hotspot/jtreg/compiler/lib/ir_framework/test/IREncodingPrinter.java
@@ -110,6 +110,7 @@ public class IREncodingPrinter {
         "sve",
         // Riscv64
         "rvv",
+        "zfh",
         "zvbb",
         "zvfh"
     ));
diff --git a/test/hotspot/jtreg/compiler/vectorization/TestFloat16VectorConvChain.java b/test/hotspot/jtreg/compiler/vectorization/TestFloat16VectorConvChain.java
index 4cf656620bc..2cb04c3889b 100644
--- a/test/hotspot/jtreg/compiler/vectorization/TestFloat16VectorConvChain.java
+++ b/test/hotspot/jtreg/compiler/vectorization/TestFloat16VectorConvChain.java
@@ -45,8 +45,6 @@ public class TestFloat16VectorConvChain {
         counts = {IRNode.VECTOR_CAST_HF2F, IRNode.VECTOR_SIZE_ANY, ">= 1", IRNode.VECTOR_CAST_F2HF, IRNode.VECTOR_SIZE_ANY, " >= 1"})
     @IR(applyIfCPUFeatureAnd = {"avx512_fp16", "false", "f16c", "true"},
         counts = {IRNode.VECTOR_CAST_HF2F, IRNode.VECTOR_SIZE_ANY, ">= 1", IRNode.VECTOR_CAST_F2HF, IRNode.VECTOR_SIZE_ANY, " >= 1"})
-    @IR(applyIfCPUFeature = {"zvfh", "true"},
-        counts = {IRNode.VECTOR_CAST_HF2F, IRNode.VECTOR_SIZE_ANY, ">= 1", IRNode.VECTOR_CAST_F2HF, IRNode.VECTOR_SIZE_ANY, " >= 1"})
     public static void test(short [] res, short [] src1, short [] src2) {
         for (int i = 0; i < res.length; i++) {
             res[i] = (short)Float.float16ToFloat(Float.floatToFloat16(Float.float16ToFloat(src1[i]) + Float.float16ToFloat(src2[i])));

From 86860cac044e6f464732753670b14a80c1fef438 Mon Sep 17 00:00:00 2001
From: Casper Norrbin <cnorrbin@openjdk.org>
Date: Thu, 13 Mar 2025 09:35:59 +0000
Subject: [PATCH 330/587] 8346916: [REDO] align_up has potential overflow

Reviewed-by: ayang, kbarrett, dlong
---
 src/hotspot/share/cds/metaspaceShared.cpp   | 29 ++------
 src/hotspot/share/gc/parallel/psOldGen.cpp  | 13 ++--
 src/hotspot/share/runtime/globals.hpp       |  2 +-
 src/hotspot/share/runtime/os.cpp            |  4 +-
 src/hotspot/share/utilities/align.hpp       | 15 +++-
 test/hotspot/gtest/utilities/test_align.cpp | 77 ++++++++++++++++++++-
 6 files changed, 103 insertions(+), 37 deletions(-)

diff --git a/src/hotspot/share/cds/metaspaceShared.cpp b/src/hotspot/share/cds/metaspaceShared.cpp
index 3658a28c102..6fe1c820bec 100644
--- a/src/hotspot/share/cds/metaspaceShared.cpp
+++ b/src/hotspot/share/cds/metaspaceShared.cpp
@@ -216,30 +216,9 @@ void MetaspaceShared::dump_loaded_classes(const char* file_name, TRAPS) {
   }
 }
 
-// If p is not aligned, move it up to the next address that's aligned with alignment.
-// If this is not possible (because p is too high), return nullptr. Example:
-//     p = 0xffffffffffff0000, alignment= 0x10000    => return nullptr.
-static char* align_up_or_null(char* p, size_t alignment) {
-  assert(p != nullptr, "sanity");
-  if (is_aligned(p, alignment)) {
-    return p;
-  }
-
-  char* down = align_down(p, alignment);
-  if (max_uintx - uintx(down) < uintx(alignment)) {
-    // Run out of address space to align up.
-    return nullptr;
-  }
-
-  char* aligned = align_up(p, alignment);
-  assert(aligned >= p, "sanity");
-  assert(aligned != nullptr, "sanity");
-  return aligned;
-}
-
 static bool shared_base_too_high(char* specified_base, char* aligned_base, size_t cds_max) {
-  // Caller should have checked if align_up_or_null( returns nullptr (comparing specified_base
-  // with nullptr is UB).
+  // Caller should have checked that aligned_base was successfully aligned and is not nullptr.
+  // Comparing specified_base with nullptr is UB.
   assert(aligned_base != nullptr, "sanity");
   assert(aligned_base >= specified_base, "sanity");
 
@@ -263,7 +242,9 @@ static char* compute_shared_base(size_t cds_max) {
     return specified_base;
   }
 
-  char* aligned_base = align_up_or_null(specified_base, alignment);
+  char* aligned_base = can_align_up(specified_base, alignment)
+                           ? align_up(specified_base, alignment)
+                           : nullptr;
 
   if (aligned_base != specified_base) {
     log_info(cds)("SharedBaseAddress (" INTPTR_FORMAT ") aligned up to " INTPTR_FORMAT,
diff --git a/src/hotspot/share/gc/parallel/psOldGen.cpp b/src/hotspot/share/gc/parallel/psOldGen.cpp
index 0a95a55b648..dece8f89edf 100644
--- a/src/hotspot/share/gc/parallel/psOldGen.cpp
+++ b/src/hotspot/share/gc/parallel/psOldGen.cpp
@@ -189,8 +189,12 @@ bool PSOldGen::expand(size_t bytes) {
   assert_locked_or_safepoint(Heap_lock);
   assert(bytes > 0, "precondition");
 #endif
+  const size_t remaining_bytes = virtual_space()->uncommitted_size();
+  if (remaining_bytes == 0) {
+    return false;
+  }
   const size_t alignment = virtual_space()->alignment();
-  size_t aligned_bytes  = align_up(bytes, alignment);
+  size_t aligned_bytes = align_up(MIN2(bytes, remaining_bytes), alignment);
   size_t aligned_expand_bytes = align_up(MinHeapDeltaBytes, alignment);
 
   if (UseNUMA) {
@@ -198,13 +202,6 @@ bool PSOldGen::expand(size_t bytes) {
     // providing a page per lgroup. Alignment is larger or equal to the page size.
     aligned_expand_bytes = MAX2(aligned_expand_bytes, alignment * os::numa_get_groups_num());
   }
-  if (aligned_bytes == 0) {
-    // The alignment caused the number of bytes to wrap.  A call to expand
-    // implies a best effort to expand by "bytes" but not a guarantee.  Align
-    // down to give a best effort.  This is likely the most that the generation
-    // can expand since it has some capacity to start with.
-    aligned_bytes = align_down(bytes, alignment);
-  }
 
   bool success = false;
   if (aligned_expand_bytes > aligned_bytes) {
diff --git a/src/hotspot/share/runtime/globals.hpp b/src/hotspot/share/runtime/globals.hpp
index bf5b2616265..ab975b1b375 100644
--- a/src/hotspot/share/runtime/globals.hpp
+++ b/src/hotspot/share/runtime/globals.hpp
@@ -1430,7 +1430,7 @@ const int ObjectAlignmentInBytes = 8;
                                                                             \
   product(size_t, MinHeapDeltaBytes, ScaleForWordSize(128*K),               \
           "The minimum change in heap space due to GC (in bytes)")          \
-          range(0, max_uintx)                                               \
+          range(0, max_uintx / 2 + 1)                                       \
                                                                             \
   product(size_t, MinMetaspaceExpansion, ScaleForWordSize(256*K),           \
           "The minimum expansion of Metaspace (in bytes)")                  \
diff --git a/src/hotspot/share/runtime/os.cpp b/src/hotspot/share/runtime/os.cpp
index d266b632ed1..be9b0eef455 100644
--- a/src/hotspot/share/runtime/os.cpp
+++ b/src/hotspot/share/runtime/os.cpp
@@ -2011,10 +2011,10 @@ char* os::attempt_reserve_memory_between(char* min, char* max, size_t bytes, siz
   const size_t alignment_adjusted = MAX2(alignment, system_allocation_granularity);
 
   // Calculate first and last possible attach points:
-  char* const lo_att = align_up(MAX2(absolute_min, min), alignment_adjusted);
-  if (lo_att == nullptr) {
+  if (!can_align_up(MAX2(absolute_min, min), alignment_adjusted)) {
     return nullptr; // overflow
   }
+  char* const lo_att = align_up(MAX2(absolute_min, min), alignment_adjusted);
 
   char* const hi_end = MIN2(max, absolute_max);
   if ((uintptr_t)hi_end <= bytes) {
diff --git a/src/hotspot/share/utilities/align.hpp b/src/hotspot/share/utilities/align.hpp
index b67e61036a0..69dd1a3052b 100644
--- a/src/hotspot/share/utilities/align.hpp
+++ b/src/hotspot/share/utilities/align.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -70,8 +70,15 @@ constexpr T align_down(T size, A alignment) {
   return result;
 }
 
+// Checks whether it is possible to align size to alignment without overflowing.
+template<typename T, typename A, ENABLE_IF(std::is_integral<T>::value)>
+constexpr bool can_align_up(T size, A alignment) {
+  return align_down(std::numeric_limits<T>::max(), alignment) >= size;
+}
+
 template<typename T, typename A, ENABLE_IF(std::is_integral<T>::value)>
 constexpr T align_up(T size, A alignment) {
+  assert(can_align_up(size, alignment), "precondition");
   T adjusted = checked_cast<T>(size + alignment_mask(alignment));
   return align_down(adjusted, alignment);
 }
@@ -85,6 +92,12 @@ constexpr T align_down_bounded(T size, A alignment) {
 
 // Align pointers and check for alignment.
 
+template <typename A>
+inline bool can_align_up(void* ptr, A alignment) {
+  static_assert(sizeof(ptr) == sizeof(uintptr_t), "assumption");
+  return can_align_up((uintptr_t)ptr, alignment);
+}
+
 template <typename T, typename A>
 inline T* align_up(T* ptr, A alignment) {
   return (T*)align_up((uintptr_t)ptr, alignment);
diff --git a/test/hotspot/gtest/utilities/test_align.cpp b/test/hotspot/gtest/utilities/test_align.cpp
index 3c03fd5f24d..7413e58e7ab 100644
--- a/test/hotspot/gtest/utilities/test_align.cpp
+++ b/test/hotspot/gtest/utilities/test_align.cpp
@@ -29,7 +29,7 @@
 #include <limits>
 
 // A few arbitrarily chosen values to test the align functions on.
-static constexpr uint64_t values[] = {1, 3, 10, 345, 1023, 1024, 1025, 23909034, INT_MAX, uint64_t(-1) / 2, uint64_t(-1) / 2 + 100, uint64_t(-1)};
+static constexpr uint64_t values[] = {1, 3, 10, 345, 1023, 1024, 1025, 23909034, INT_MAX, uint64_t(-1) / 2, uint64_t(-1) / 2 + 100, ~(uint64_t(1) << 62)};
 
 template <typename T>
 static constexpr T max_alignment() {
@@ -194,3 +194,78 @@ TEST(Align, alignments) {
 
   test_alignments<int8_t, int8_t>();
 }
+
+template<typename T, typename A>
+static constexpr void test_can_align_up() {
+  int alignment_value = 4;
+  int small_value = 63;
+  A alignment = static_cast<A>(alignment_value);
+
+  ASSERT_TRUE(can_align_up(static_cast<T>(small_value), alignment));
+  ASSERT_TRUE(can_align_up(static_cast<T>(-small_value), alignment));
+  ASSERT_TRUE(can_align_up(std::numeric_limits<T>::min(), alignment));
+  ASSERT_FALSE(can_align_up(std::numeric_limits<T>::max(), alignment));
+  ASSERT_FALSE(can_align_up(std::numeric_limits<T>::max() - 1, alignment));
+  ASSERT_TRUE(can_align_up(align_down(std::numeric_limits<T>::max(), alignment), alignment));
+  ASSERT_FALSE(can_align_up(align_down(std::numeric_limits<T>::max(), alignment) + 1, alignment));
+  if (std::is_signed<T>::value) {
+    ASSERT_TRUE(can_align_up(static_cast<T>(-1), alignment));
+    ASSERT_TRUE(can_align_up(align_down(static_cast<T>(-1), alignment), alignment));
+    ASSERT_TRUE(can_align_up(align_down(static_cast<T>(-1) + 1, alignment), alignment));
+  }
+}
+
+TEST(Align, test_can_align_up_int32_int32) {
+  test_can_align_up<int32_t, int32_t>();
+}
+
+TEST(Align, test_can_align_up_uint32_uint32) {
+  test_can_align_up<uint32_t, uint32_t>();
+}
+
+TEST(Align, test_can_align_up_int32_uint32) {
+  test_can_align_up<int32_t, uint32_t>();
+}
+
+TEST(Align, test_can_align_up_uint32_int32) {
+  test_can_align_up<uint32_t, int32_t>();
+}
+
+TEST(Align, test_can_align_up_ptr) {
+  uint alignment = 4;
+  char buffer[8];
+
+  ASSERT_TRUE(can_align_up(buffer, alignment));
+  ASSERT_FALSE(can_align_up(reinterpret_cast<void*>(UINTPTR_MAX), alignment));
+}
+
+#ifdef ASSERT
+template <typename T, typename A>
+static void test_fail_alignment() {
+  A alignment = max_alignment<A>();
+  T value = align_down(std::numeric_limits<T>::max(), alignment) + 1;
+  // Aligning value to alignment would now overflow.
+  // Assert inside align_up expected.
+  T aligned = align_up(value, alignment);
+}
+
+TEST_VM_ASSERT(Align, fail_alignments_same_size) {
+  test_fail_alignment<uint64_t, uint64_t>();
+}
+
+TEST_VM_ASSERT(Align, fail_alignments_unsigned_signed) {
+  test_fail_alignment<uint32_t, int32_t>();
+}
+
+TEST_VM_ASSERT(Align, fail_alignments_signed_unsigned) {
+  test_fail_alignment<int64_t, uint32_t>();
+}
+
+TEST_VM_ASSERT(Align, fail_alignments_small_large) {
+  test_fail_alignment<uint8_t, uint64_t>();
+}
+
+TEST_VM_ASSERT(Align, fail_alignments_large_small) {
+  test_fail_alignment<uint64_t, uint8_t>();
+}
+#endif // ASSERT

From c18494d3c9eebd9d97d95fbca712d59ccab2f124 Mon Sep 17 00:00:00 2001
From: Jeremy Wood <mickleness@gmail.com>
Date: Thu, 13 Mar 2025 10:08:49 +0000
Subject: [PATCH 331/587] 8351108: ImageIO.write(..) fails with exception when
 writing JPEG with IndexColorModel

Reviewed-by: aivanov, prr, azvegint
---
 .../javax/imageio/ImageTypeSpecifier.java     |  5 +-
 ...iterWriteNonOpaqueIndexColorModelTest.java | 86 +++++++++++++++++++
 2 files changed, 89 insertions(+), 2 deletions(-)
 create mode 100644 test/jdk/javax/imageio/plugins/jpeg/JpegWriterWriteNonOpaqueIndexColorModelTest.java

diff --git a/src/java.desktop/share/classes/javax/imageio/ImageTypeSpecifier.java b/src/java.desktop/share/classes/javax/imageio/ImageTypeSpecifier.java
index b94b7709d2b..14823950951 100644
--- a/src/java.desktop/share/classes/javax/imageio/ImageTypeSpecifier.java
+++ b/src/java.desktop/share/classes/javax/imageio/ImageTypeSpecifier.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -919,7 +919,8 @@ public class ImageTypeSpecifier {
 
         if (image instanceof BufferedImage) {
             int bufferedImageType = ((BufferedImage)image).getType();
-            if (bufferedImageType != BufferedImage.TYPE_CUSTOM) {
+            if (bufferedImageType != BufferedImage.TYPE_CUSTOM
+                    && bufferedImageType != BufferedImage.TYPE_BYTE_INDEXED) {
                 return getSpecifier(bufferedImageType);
             }
         }
diff --git a/test/jdk/javax/imageio/plugins/jpeg/JpegWriterWriteNonOpaqueIndexColorModelTest.java b/test/jdk/javax/imageio/plugins/jpeg/JpegWriterWriteNonOpaqueIndexColorModelTest.java
new file mode 100644
index 00000000000..d1bf5153ffd
--- /dev/null
+++ b/test/jdk/javax/imageio/plugins/jpeg/JpegWriterWriteNonOpaqueIndexColorModelTest.java
@@ -0,0 +1,86 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact 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 8351108
+ * @summary This test verifies that attempting to write a JPEG using
+ *          ImageIO.write(..) fails by returning `false` for
+ *          translucent IndexColorModels.
+ */
+
+import javax.imageio.ImageIO;
+import java.awt.Transparency;
+import java.awt.image.BufferedImage;
+import java.awt.image.IndexColorModel;
+import java.io.ByteArrayOutputStream;
+
+public class JpegWriterWriteNonOpaqueIndexColorModelTest {
+    public static void main(String[] args) {
+        boolean b1 = testJpegWriter(Transparency.OPAQUE, "OPAQUE", true);
+        boolean b2 = testJpegWriter(Transparency.BITMASK, "BITMASK", false);
+        boolean b3 = testJpegWriter(Transparency.TRANSLUCENT, "TRANSLUCENT", false);
+        if (!(b1 && b2 && b3)) {
+            throw new Error("Test failed");
+        }
+    }
+
+    private static boolean testJpegWriter(int imageType, String name, boolean expectedWriteReturnValue) {
+        System.out.println();
+        System.out.println("TESTING " + name);
+        try {
+            byte[] gray = new byte[256];
+            for (int a = 0; a < gray.length; a++) {
+                gray[a] = (byte) a;
+            }
+
+            byte[] alpha = new byte[256];
+            if (imageType == Transparency.OPAQUE || imageType == Transparency.BITMASK) {
+                for (int a = 0; a < alpha.length; a++) {
+                    alpha[a] = -1;
+                }
+                if (imageType == Transparency.BITMASK) {
+                    alpha[0] = 0;
+                }
+            } else if (imageType == Transparency.TRANSLUCENT) {
+                for (int a = 0; a < alpha.length; a++) {
+                    alpha[a] = (byte) a;
+                }
+            }
+
+            IndexColorModel indexColorModel = new IndexColorModel(8, 256, gray, gray, gray, alpha);
+            System.out.println("colorModel.getTransparency() = " + indexColorModel.getTransparency());
+            BufferedImage bi = new BufferedImage(10, 10, BufferedImage.TYPE_BYTE_INDEXED, indexColorModel);
+            boolean result = ImageIO.write(bi, "jpg", new ByteArrayOutputStream());
+            if (result != expectedWriteReturnValue) {
+                throw new Exception("ImageIO.write(..) returned " + result + " but we expected " + expectedWriteReturnValue);
+            }
+            System.out.println("Tested passed");
+            return true;
+        } catch (Exception e) {
+            System.err.println(name + " test failed");
+            e.printStackTrace();
+            return false;
+        }
+    }
+}

From 9c00331465fe83e491f6dd1e6df4df1fb790f2fc Mon Sep 17 00:00:00 2001
From: Saranya Natarajan <saranya.natarajan@oracle.com>
Date: Thu, 13 Mar 2025 11:02:44 +0000
Subject: [PATCH 332/587] 8330469: C2: Remove or change "PrintOpto &&
 VerifyLoopOptimizations" as printing code condition

Reviewed-by: chagedorn, rcastanedalo
---
 src/hotspot/share/opto/loopTransform.cpp | 13 +++----------
 src/hotspot/share/opto/loopopts.cpp      |  9 +--------
 src/hotspot/share/opto/split_if.cpp      | 20 --------------------
 3 files changed, 4 insertions(+), 38 deletions(-)

diff --git a/src/hotspot/share/opto/loopTransform.cpp b/src/hotspot/share/opto/loopTransform.cpp
index 436d8758df3..45b50592a26 100644
--- a/src/hotspot/share/opto/loopTransform.cpp
+++ b/src/hotspot/share/opto/loopTransform.cpp
@@ -751,9 +751,8 @@ void PhaseIdealLoop::do_peeling(IdealLoopTree *loop, Node_List &old_new) {
         cl->set_no_multiversion();
       }
 #ifndef PRODUCT
-      if (PrintOpto && VerifyLoopOptimizations) {
+      if (TraceLoopOpts) {
         tty->print("Peeling a 'main' loop; resetting to 'normal' ");
-        loop->dump_head();
       }
 #endif
     }
@@ -1809,10 +1808,7 @@ void PhaseIdealLoop::do_unroll(IdealLoopTree *loop, Node_List &old_new, bool adj
   C->print_method(PHASE_BEFORE_LOOP_UNROLLING, 4, loop_head);
 
 #ifndef PRODUCT
-  if (PrintOpto && VerifyLoopOptimizations) {
-    tty->print("Unrolling ");
-    loop->dump_head();
-  } else if (TraceLoopOpts) {
+  if (TraceLoopOpts) {
     if (loop_head->trip_count() < (uint)LoopUnrollLimit) {
       tty->print("Unroll %d(%2d) ", loop_head->unrolled_count()*2, loop_head->trip_count());
     } else {
@@ -2488,10 +2484,7 @@ bool PhaseIdealLoop::is_scaled_iv_plus_extra_offset(Node* exp1, Node* offset3, N
 // Eliminate range-checks and other trip-counter vs loop-invariant tests.
 void PhaseIdealLoop::do_range_check(IdealLoopTree* loop) {
 #ifndef PRODUCT
-  if (PrintOpto && VerifyLoopOptimizations) {
-    tty->print("Range Check Elimination ");
-    loop->dump_head();
-  } else if (TraceLoopOpts) {
+  if (TraceLoopOpts) {
     tty->print("RangeCheck   ");
     loop->dump_head();
   }
diff --git a/src/hotspot/share/opto/loopopts.cpp b/src/hotspot/share/opto/loopopts.cpp
index 36545870ad8..72f3722c096 100644
--- a/src/hotspot/share/opto/loopopts.cpp
+++ b/src/hotspot/share/opto/loopopts.cpp
@@ -846,7 +846,6 @@ Node *PhaseIdealLoop::conditional_move( Node *region ) {
     if (phi == nullptr || _igvn.type(phi) == Type::TOP) {
       break;
     }
-    if (PrintOpto && VerifyLoopOptimizations) { tty->print_cr("CMOV"); }
     // Move speculative ops
     wq.push(phi);
     while (wq.size() > 0) {
@@ -854,12 +853,6 @@ Node *PhaseIdealLoop::conditional_move( Node *region ) {
       for (uint j = 1; j < n->req(); j++) {
         Node* m = n->in(j);
         if (m != nullptr && !is_dominator(get_ctrl(m), cmov_ctrl)) {
-#ifndef PRODUCT
-          if (PrintOpto && VerifyLoopOptimizations) {
-            tty->print("  speculate: ");
-            m->dump();
-          }
-#endif
           set_ctrl(m, cmov_ctrl);
           wq.push(m);
         }
@@ -1491,7 +1484,7 @@ void PhaseIdealLoop::split_if_with_blocks_post(Node *n) {
 
     // Now split the IF
     C->print_method(PHASE_BEFORE_SPLIT_IF, 4, iff);
-    if ((PrintOpto && VerifyLoopOptimizations) || TraceLoopOpts) {
+    if (TraceLoopOpts) {
       tty->print_cr("Split-If");
     }
     do_split_if(iff);
diff --git a/src/hotspot/share/opto/split_if.cpp b/src/hotspot/share/opto/split_if.cpp
index d94d4759173..7c51ae0f827 100644
--- a/src/hotspot/share/opto/split_if.cpp
+++ b/src/hotspot/share/opto/split_if.cpp
@@ -135,14 +135,6 @@ bool PhaseIdealLoop::split_up( Node *n, Node *blk1, Node *blk2 ) {
     }
   }
 
-  // Found some other Node; must clone it up
-#ifndef PRODUCT
-  if( PrintOpto && VerifyLoopOptimizations ) {
-    tty->print("Cloning up: ");
-    n->dump();
-  }
-#endif
-
   // ConvI2L may have type information on it which becomes invalid if
   // it moves up in the graph so change any clones so widen the type
   // to TypeLong::INT when pushing it up.
@@ -308,12 +300,6 @@ bool PhaseIdealLoop::clone_cmp_down(Node* n, const Node* blk1, const Node* blk2)
            at_relevant_ctrl(cmov, blk1, blk2)))) {
 
       // Must clone down
-#ifndef PRODUCT
-      if( PrintOpto && VerifyLoopOptimizations ) {
-        tty->print("Cloning down: ");
-        n->dump();
-      }
-#endif
       if (!n->is_FastLock()) {
         // Clone down any block-local BoolNode uses of this CmpNode
         for (DUIterator i = n->outs(); n->has_out(i); i++) {
@@ -343,12 +329,6 @@ bool PhaseIdealLoop::clone_cmp_down(Node* n, const Node* blk1, const Node* blk2)
           }
           if (at_relevant_ctrl(bol, blk1, blk2)) {
             // Recursively sink any BoolNode
-#ifndef PRODUCT
-            if( PrintOpto && VerifyLoopOptimizations ) {
-              tty->print("Cloning down: ");
-              bol->dump();
-            }
-#endif
             for (DUIterator j = bol->outs(); bol->has_out(j); j++) {
               Node* u = bol->out(j);
               // Uses are either IfNodes, CMoves, OpaqueNotNull, or Opaque*AssertionPredicate

From 4c5956d7481e043c35f5dc78f095516288a00a2e Mon Sep 17 00:00:00 2001
From: David Linus Briemann <david.briemann@sap.com>
Date: Thu, 13 Mar 2025 11:14:52 +0000
Subject: [PATCH 333/587] 8350866: [x86] Add C1 intrinsics for CRC32-C

Reviewed-by: mdoerr, kvn
---
 src/hotspot/cpu/x86/c1_LIRGenerator_x86.cpp | 69 ++++++++++++++++++++-
 src/hotspot/share/c1/c1_Compiler.cpp        |  2 +-
 src/hotspot/share/opto/library_call.cpp     |  6 +-
 3 files changed, 71 insertions(+), 6 deletions(-)

diff --git a/src/hotspot/cpu/x86/c1_LIRGenerator_x86.cpp b/src/hotspot/cpu/x86/c1_LIRGenerator_x86.cpp
index 7e28b288f71..d0064b62dd8 100644
--- a/src/hotspot/cpu/x86/c1_LIRGenerator_x86.cpp
+++ b/src/hotspot/cpu/x86/c1_LIRGenerator_x86.cpp
@@ -1054,7 +1054,7 @@ void LIRGenerator::do_ArrayCopy(Intrinsic* x) {
 }
 
 void LIRGenerator::do_update_CRC32(Intrinsic* x) {
-  assert(UseCRC32Intrinsics, "need AVX and LCMUL instructions support");
+  assert(UseCRC32Intrinsics, "need AVX and CLMUL instructions support");
   // Make all state_for calls early since they can emit code
   LIR_Opr result = rlock_result(x);
   int flags = 0;
@@ -1131,7 +1131,72 @@ void LIRGenerator::do_update_CRC32(Intrinsic* x) {
 }
 
 void LIRGenerator::do_update_CRC32C(Intrinsic* x) {
-  Unimplemented();
+  assert(UseCRC32CIntrinsics, "need AVX and CLMUL instructions support");
+  LIR_Opr result = rlock_result(x);
+
+  switch (x->id()) {
+    case vmIntrinsics::_updateBytesCRC32C:
+    case vmIntrinsics::_updateDirectByteBufferCRC32C: {
+      bool is_updateBytes = (x->id() == vmIntrinsics::_updateBytesCRC32C);
+
+      LIRItem crc(x->argument_at(0), this);
+      LIRItem buf(x->argument_at(1), this);
+      LIRItem off(x->argument_at(2), this);
+      LIRItem end(x->argument_at(3), this);
+      buf.load_item();
+      off.load_nonconstant();
+      end.load_nonconstant();
+
+      // len = end - off
+      LIR_Opr len  = end.result();
+      LIR_Opr tmpA = new_register(T_INT);
+      LIR_Opr tmpB = new_register(T_INT);
+      __ move(end.result(), tmpA);
+      __ move(off.result(), tmpB);
+      __ sub(tmpA, tmpB, tmpA);
+      len = tmpA;
+
+      LIR_Opr index = off.result();
+      int offset = is_updateBytes ? arrayOopDesc::base_offset_in_bytes(T_BYTE) : 0;
+      if (off.result()->is_constant()) {
+        index = LIR_OprFact::illegalOpr;
+        offset += off.result()->as_jint();
+      }
+      LIR_Opr base_op = buf.result();
+      LIR_Address* a = nullptr;
+
+      if (index->is_valid()) {
+        LIR_Opr tmp = new_register(T_LONG);
+        __ convert(Bytecodes::_i2l, index, tmp);
+        index = tmp;
+        a = new LIR_Address(base_op, index, offset, T_BYTE);
+      } else {
+        a = new LIR_Address(base_op, offset, T_BYTE);
+      }
+
+      BasicTypeList signature(3);
+      signature.append(T_INT);
+      signature.append(T_ADDRESS);
+      signature.append(T_INT);
+      CallingConvention* cc = frame_map()->c_calling_convention(&signature);
+      const LIR_Opr result_reg = result_register_for(x->type());
+
+      LIR_Opr arg1 = cc->at(0),
+              arg2 = cc->at(1),
+              arg3 = cc->at(2);
+
+      crc.load_item_force(arg1);
+      __ leal(LIR_OprFact::address(a), arg2);
+      __ move(len, arg3);
+
+      __ call_runtime_leaf(StubRoutines::updateBytesCRC32C(), getThreadTemp(), result_reg, cc->args());
+      __ move(result_reg, result);
+      break;
+    }
+    default: {
+      ShouldNotReachHere();
+    }
+  }
 }
 
 void LIRGenerator::do_vectorizedMismatch(Intrinsic* x) {
diff --git a/src/hotspot/share/c1/c1_Compiler.cpp b/src/hotspot/share/c1/c1_Compiler.cpp
index eb7c42e4576..1024b903550 100644
--- a/src/hotspot/share/c1/c1_Compiler.cpp
+++ b/src/hotspot/share/c1/c1_Compiler.cpp
@@ -222,7 +222,7 @@ bool Compiler::is_intrinsic_supported(vmIntrinsics::ID id) {
   case vmIntrinsics::_updateCRC32:
   case vmIntrinsics::_updateBytesCRC32:
   case vmIntrinsics::_updateByteBufferCRC32:
-#if defined(S390) || defined(PPC64) || defined(AARCH64)
+#if defined(S390) || defined(PPC64) || defined(AARCH64) || defined(AMD64)
   case vmIntrinsics::_updateBytesCRC32C:
   case vmIntrinsics::_updateDirectByteBufferCRC32C:
 #endif
diff --git a/src/hotspot/share/opto/library_call.cpp b/src/hotspot/share/opto/library_call.cpp
index 05efda3c64b..80a4f4e3503 100644
--- a/src/hotspot/share/opto/library_call.cpp
+++ b/src/hotspot/share/opto/library_call.cpp
@@ -6564,7 +6564,7 @@ bool LibraryCallKit::inline_vectorizedHashCode() {
  * int java.util.zip.CRC32.update(int crc, int b)
  */
 bool LibraryCallKit::inline_updateCRC32() {
-  assert(UseCRC32Intrinsics, "need AVX and LCMUL instructions support");
+  assert(UseCRC32Intrinsics, "need AVX and CLMUL instructions support");
   assert(callee()->signature()->size() == 2, "update has 2 parameters");
   // no receiver since it is static method
   Node* crc  = argument(0); // type: int
@@ -6599,7 +6599,7 @@ bool LibraryCallKit::inline_updateCRC32() {
  * int java.util.zip.CRC32.updateBytes(int crc, byte[] buf, int off, int len)
  */
 bool LibraryCallKit::inline_updateBytesCRC32() {
-  assert(UseCRC32Intrinsics, "need AVX and LCMUL instructions support");
+  assert(UseCRC32Intrinsics, "need AVX and CLMUL instructions support");
   assert(callee()->signature()->size() == 4, "updateBytes has 4 parameters");
   // no receiver since it is static method
   Node* crc     = argument(0); // type: int
@@ -6643,7 +6643,7 @@ bool LibraryCallKit::inline_updateBytesCRC32() {
  * int java.util.zip.CRC32.updateByteBuffer(int crc, long buf, int off, int len)
  */
 bool LibraryCallKit::inline_updateByteBufferCRC32() {
-  assert(UseCRC32Intrinsics, "need AVX and LCMUL instructions support");
+  assert(UseCRC32Intrinsics, "need AVX and CLMUL instructions support");
   assert(callee()->signature()->size() == 5, "updateByteBuffer has 4 parameters and one is long");
   // no receiver since it is static method
   Node* crc     = argument(0); // type: int

From 375722f4ab62865c45d8d76f01dc9c7209be57c8 Mon Sep 17 00:00:00 2001
From: Fei Yang <fyang@openjdk.org>
Date: Thu, 13 Mar 2025 12:06:17 +0000
Subject: [PATCH 334/587] 8351839: RISC-V: Fix base offset calculation
 introduced in JDK-8347489

Reviewed-by: mli, fjiang
---
 .../cpu/riscv/c2_MacroAssembler_riscv.cpp       |  5 ++---
 src/hotspot/cpu/riscv/stubGenerator_riscv.cpp   | 17 ++++++-----------
 2 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/src/hotspot/cpu/riscv/c2_MacroAssembler_riscv.cpp b/src/hotspot/cpu/riscv/c2_MacroAssembler_riscv.cpp
index 4eabe966672..99cbcedb8ff 100644
--- a/src/hotspot/cpu/riscv/c2_MacroAssembler_riscv.cpp
+++ b/src/hotspot/cpu/riscv/c2_MacroAssembler_riscv.cpp
@@ -1385,8 +1385,7 @@ void C2_MacroAssembler::string_compare_long_same_encoding(Register result, Regis
                                                   const int STUB_THRESHOLD, Label *STUB, Label *SHORT_STRING, Label *DONE) {
   Label TAIL_CHECK, TAIL, NEXT_WORD, DIFFERENCE;
 
-  const int base_offset = isLL ? arrayOopDesc::base_offset_in_bytes(T_BYTE)
-                               : arrayOopDesc::base_offset_in_bytes(T_CHAR);
+  const int base_offset = arrayOopDesc::base_offset_in_bytes(T_BYTE);
   assert((base_offset % (UseCompactObjectHeaders ? 4 :
                         (UseCompressedClassPointers ? 8 : 4))) == 0, "Must be");
 
@@ -1480,7 +1479,7 @@ void C2_MacroAssembler::string_compare_long_different_encoding(Register result,
                                                const int STUB_THRESHOLD, Label *STUB, Label *DONE) {
   Label TAIL, NEXT_WORD, DIFFERENCE;
 
-  const int base_offset = arrayOopDesc::base_offset_in_bytes(T_CHAR);
+  const int base_offset = arrayOopDesc::base_offset_in_bytes(T_BYTE);
   assert((base_offset % (UseCompactObjectHeaders ? 4 :
                           (UseCompressedClassPointers ? 8 : 4))) == 0, "Must be");
 
diff --git a/src/hotspot/cpu/riscv/stubGenerator_riscv.cpp b/src/hotspot/cpu/riscv/stubGenerator_riscv.cpp
index 235dd8f13d8..e0157b0e599 100644
--- a/src/hotspot/cpu/riscv/stubGenerator_riscv.cpp
+++ b/src/hotspot/cpu/riscv/stubGenerator_riscv.cpp
@@ -2436,8 +2436,7 @@ class StubGenerator: public StubCodeGenerator {
                              Register strL, Register strU, Label& DIFF) {
     const Register tmp = x30, tmpLval = x12;
 
-    int base_offset = arrayOopDesc::base_offset_in_bytes(T_CHAR);
-
+    int base_offset = arrayOopDesc::base_offset_in_bytes(T_BYTE);
     assert((base_offset % (UseCompactObjectHeaders ? 4 :
                            (UseCompressedClassPointers ? 8 : 4))) == 0, "Must be");
 
@@ -2495,25 +2494,21 @@ class StubGenerator: public StubCodeGenerator {
     const Register result = x10, str1 = x11, str2 = x13, cnt2 = x14,
                    tmp1 = x28, tmp2 = x29, tmp3 = x30, tmp4 = x12;
 
-    int base_offset1 = arrayOopDesc::base_offset_in_bytes(T_BYTE);
-    int base_offset2 = arrayOopDesc::base_offset_in_bytes(T_CHAR);
-
-    assert((base_offset1 % (UseCompactObjectHeaders ? 4 :
-                            (UseCompressedClassPointers ? 8 : 4))) == 0, "Must be");
-    assert((base_offset2 % (UseCompactObjectHeaders ? 4 :
-                            (UseCompressedClassPointers ? 8 : 4))) == 0, "Must be");
+    int base_offset = arrayOopDesc::base_offset_in_bytes(T_BYTE);
+    assert((base_offset % (UseCompactObjectHeaders ? 4 :
+                           (UseCompressedClassPointers ? 8 : 4))) == 0, "Must be");
 
     Register strU = isLU ? str2 : str1,
              strL = isLU ? str1 : str2,
              tmpU = isLU ? tmp2 : tmp1, // where to keep U for comparison
              tmpL = isLU ? tmp1 : tmp2; // where to keep L for comparison
 
-    if (AvoidUnalignedAccesses && (base_offset1 % 8) != 0) {
+    if (AvoidUnalignedAccesses && (base_offset % 8) != 0) {
       // Load 4 bytes from strL to make sure main loop is 8-byte aligned
       // cnt2 is >= 68 here, no need to check it for >= 0
       __ lwu(tmpL, Address(strL));
       __ addi(strL, strL, wordSize / 2);
-      __ load_long_misaligned(tmpU, Address(strU), tmp4, (base_offset2 % 8) != 0 ? 4 : 8);
+      __ load_long_misaligned(tmpU, Address(strU), tmp4, (base_offset % 8) != 0 ? 4 : 8);
       __ addi(strU, strU, wordSize);
       __ inflate_lo32(tmp3, tmpL);
       __ mv(tmpL, tmp3);

From c3db667156f7e6b7d05c76370973b9f2db9f0d55 Mon Sep 17 00:00:00 2001
From: Matthias Baesken <mbaesken@openjdk.org>
Date: Thu, 13 Mar 2025 12:41:57 +0000
Subject: [PATCH 335/587] 8351542: LIBMANAGEMENT_OPTIMIZATION remove special
 optimization settings

Reviewed-by: ihse, kevinw
---
 make/modules/java.management/Lib.gmk | 7 +------
 make/modules/jdk.management/Lib.gmk  | 7 +------
 2 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/make/modules/java.management/Lib.gmk b/make/modules/java.management/Lib.gmk
index cfa96b012c9..283b7f574d4 100644
--- a/make/modules/java.management/Lib.gmk
+++ b/make/modules/java.management/Lib.gmk
@@ -31,14 +31,9 @@ include LibCommon.gmk
 ## Build libmanagement
 ################################################################################
 
-LIBMANAGEMENT_OPTIMIZATION := HIGH
-ifeq ($(call isTargetOs, linux)+$(COMPILE_WITH_DEBUG_SYMBOLS), true+true)
-  LIBMANAGEMENT_OPTIMIZATION := LOW
-endif
-
 $(eval $(call SetupJdkLibrary, BUILD_LIBMANAGEMENT, \
     NAME := management, \
-    OPTIMIZATION := $(LIBMANAGEMENT_OPTIMIZATION), \
+    OPTIMIZATION := HIGH, \
     DISABLED_WARNINGS_gcc_VMManagementImpl.c := unused-variable, \
     DISABLED_WARNINGS_clang_VMManagementImpl.c := unused-variable, \
     JDK_LIBS := java.base:libjava java.base:libjvm, \
diff --git a/make/modules/jdk.management/Lib.gmk b/make/modules/jdk.management/Lib.gmk
index fd9345e8b8a..8991414b44e 100644
--- a/make/modules/jdk.management/Lib.gmk
+++ b/make/modules/jdk.management/Lib.gmk
@@ -38,14 +38,9 @@ ifeq ($(call isTargetOs, windows), true)
   LIBMANAGEMENT_EXT_CFLAGS := -DPSAPI_VERSION=1
 endif
 
-LIBMANAGEMENT_EXT_OPTIMIZATION := HIGH
-ifeq ($(call isTargetOs, linux)+$(COMPILE_WITH_DEBUG_SYMBOLS), true+true)
-  LIBMANAGEMENT_EXT_OPTIMIZATION := LOW
-endif
-
 $(eval $(call SetupJdkLibrary, BUILD_LIBMANAGEMENT_EXT, \
     NAME := management_ext, \
-    OPTIMIZATION := $(LIBMANAGEMENT_EXT_OPTIMIZATION), \
+    OPTIMIZATION := HIGH, \
     DISABLED_WARNINGS_gcc_DiagnosticCommandImpl.c := unused-variable, \
     DISABLED_WARNINGS_clang_DiagnosticCommandImpl.c := unused-variable, \
     DISABLED_WARNINGS_clang_UnixOperatingSystem.c := format-nonliteral, \

From 82eb78069ffbaf66ae479d41d850d5999055e0e1 Mon Sep 17 00:00:00 2001
From: Sean Mullan <mullan@openjdk.org>
Date: Thu, 13 Mar 2025 12:43:04 +0000
Subject: [PATCH 336/587] 8351349: GSSUtil.createSubject has outdated access
 control context and policy related text

Reviewed-by: weijun
---
 .../com/sun/security/jgss/GSSUtil.java        | 54 +++++++++----------
 1 file changed, 26 insertions(+), 28 deletions(-)

diff --git a/src/jdk.security.jgss/share/classes/com/sun/security/jgss/GSSUtil.java b/src/jdk.security.jgss/share/classes/com/sun/security/jgss/GSSUtil.java
index 0aca9771d6d..3dde0b0ac68 100644
--- a/src/jdk.security.jgss/share/classes/com/sun/security/jgss/GSSUtil.java
+++ b/src/jdk.security.jgss/share/classes/com/sun/security/jgss/GSSUtil.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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,8 @@ import org.ietf.jgss.GSSName;
 import org.ietf.jgss.GSSCredential;
 
 /**
- * GSS-API Utilities for using in conjunction with Sun Microsystem's
- * implementation of Java GSS-API.
+ * GSS-API Utilities for use in conjunction with the JDK implementation
+ * of Java GSS-API.
  *
  * @since 1.4
  */
@@ -42,37 +42,35 @@ public class GSSUtil {
     private GSSUtil() {}
 
     /**
-     * Use this method to convert a GSSName and GSSCredential into a
-     * Subject. Typically this would be done by a server that wants to
-     * impersonate a client thread at the Java level by setting a client
-     * Subject in the current access control context. If the server is merely
-     * interested in using a principal based policy in its local JVM, then
-     * it only needs to provide the GSSName of the client.
+     * Use this method to convert a {@code GSSName} and {@code GSSCredential}
+     * into a {@code Subject}. Typically this would be used by a server that
+     * wants to impersonate a client.
      *
-     * The elements from the GSSName are placed in the principals set of this
-     * Subject and those from the GSSCredential are placed in the private
-     * credentials set of the Subject. Any Kerberos specific elements that
-     * are added to the subject will be instances of the standard Kerberos
-     * implementation classes defined in javax.security.auth.kerberos.
+     * The elements from the {@code GSSName} are placed in the principals set
+     * of this {@code Subject} and those from the {@code GSSCredential} are
+     * placed in the private credentials set of the {@code Subject}. Any
+     * Kerberos specific elements that are added to the subject will be
+     * instances of the standard Kerberos implementation classes defined in
+     * {@link javax.security.auth.kerberos}.
      *
-     * @return a Subject with the entries that contain elements from the
-     * given GSSName and GSSCredential.
+     * @param principals a {@code GSSName} containing one or more mechanism
+     * specific representations of the same entity. These mechanism specific
+     * representations will be populated in the returned {@code Subject}'s
+     * principal set.
      *
-     * @param principals a GSSName containing one or more mechanism specific
-     * representations of the same entity. These mechanism specific
-     * representations will be populated in the returned Subject's principal
-     * set.
+     * @param credentials a {@code GSSCredential} containing one or more
+     * mechanism specific credentials for the same entity. These mechanism
+     * specific credentials will be populated in the returned {@code Subject}'s
+     * private credential set. Passing in a value of {@code null} will imply
+     * that the private credential set should be left empty.
      *
-     * @param credentials a GSSCredential containing one or more mechanism
-     * specific credentials for the same entity. These mechanism specific
-     * credentials will be populated in the returned Subject's private
-     * credential set. Passing in a value of null will imply that the private
-     * credential set should be left empty.
+     * @return a {@code Subject} with the entries that contain elements from
+     * the given {@code GSSName} and {@code GSSCredential}.
      */
     public static Subject createSubject(GSSName principals,
-                                     GSSCredential credentials) {
+                                        GSSCredential credentials) {
 
-        return  sun.security.jgss.GSSUtil.getSubject(principals,
-                                                     credentials);
+        return sun.security.jgss.GSSUtil.getSubject(principals,
+                                                    credentials);
     }
 }

From 7e3bc81e885071352fceab01015d7deef067a27a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joel=20Sikstr=C3=B6m?= <jsikstro@openjdk.org>
Date: Thu, 13 Mar 2025 13:21:57 +0000
Subject: [PATCH 337/587] 8351216: ZGC: Store NUMA node count

Reviewed-by: tschatzl, sjohanss, eosterlund
---
 src/hotspot/os/bsd/gc/z/zNUMA_bsd.cpp         |  5 +----
 src/hotspot/os/linux/gc/z/zNUMA_linux.cpp     | 16 +++++-----------
 src/hotspot/os/windows/gc/z/zNUMA_windows.cpp |  5 +----
 src/hotspot/share/gc/z/zNUMA.cpp              |  3 ++-
 src/hotspot/share/gc/z/zNUMA.hpp              |  5 +++--
 src/hotspot/share/gc/z/zNUMA.inline.hpp       |  6 +++++-
 src/hotspot/share/gc/z/zPageCache.cpp         |  2 +-
 7 files changed, 18 insertions(+), 24 deletions(-)

diff --git a/src/hotspot/os/bsd/gc/z/zNUMA_bsd.cpp b/src/hotspot/os/bsd/gc/z/zNUMA_bsd.cpp
index 3cd9338f1d6..ac723483637 100644
--- a/src/hotspot/os/bsd/gc/z/zNUMA_bsd.cpp
+++ b/src/hotspot/os/bsd/gc/z/zNUMA_bsd.cpp
@@ -26,10 +26,7 @@
 
 void ZNUMA::pd_initialize() {
   _enabled = false;
-}
-
-uint32_t ZNUMA::count() {
-  return 1;
+  _count = 1;
 }
 
 uint32_t ZNUMA::id() {
diff --git a/src/hotspot/os/linux/gc/z/zNUMA_linux.cpp b/src/hotspot/os/linux/gc/z/zNUMA_linux.cpp
index 3ae0c6ab719..5a5db428548 100644
--- a/src/hotspot/os/linux/gc/z/zNUMA_linux.cpp
+++ b/src/hotspot/os/linux/gc/z/zNUMA_linux.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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,15 +32,9 @@
 
 void ZNUMA::pd_initialize() {
   _enabled = UseNUMA;
-}
-
-uint32_t ZNUMA::count() {
-  if (!_enabled) {
-    // NUMA support not enabled
-    return 1;
-  }
-
-  return os::Linux::numa_max_node() + 1;
+  _count = UseNUMA
+      ? os::Linux::numa_max_node() + 1
+      : 1;
 }
 
 uint32_t ZNUMA::id() {
@@ -65,7 +59,7 @@ uint32_t ZNUMA::memory_id(uintptr_t addr) {
     fatal("Failed to get NUMA id for memory at " PTR_FORMAT " (%s)", addr, err.to_string());
   }
 
-  assert(id < count(), "Invalid NUMA id");
+  assert(id < _count, "Invalid NUMA id");
 
   return id;
 }
diff --git a/src/hotspot/os/windows/gc/z/zNUMA_windows.cpp b/src/hotspot/os/windows/gc/z/zNUMA_windows.cpp
index 8a93b66f389..afe8f18c392 100644
--- a/src/hotspot/os/windows/gc/z/zNUMA_windows.cpp
+++ b/src/hotspot/os/windows/gc/z/zNUMA_windows.cpp
@@ -25,10 +25,7 @@
 
 void ZNUMA::pd_initialize() {
   _enabled = false;
-}
-
-uint32_t ZNUMA::count() {
-  return 1;
+  _count = 1;
 }
 
 uint32_t ZNUMA::id() {
diff --git a/src/hotspot/share/gc/z/zNUMA.cpp b/src/hotspot/share/gc/z/zNUMA.cpp
index 2c37b25f87b..a302a1843bb 100644
--- a/src/hotspot/share/gc/z/zNUMA.cpp
+++ b/src/hotspot/share/gc/z/zNUMA.cpp
@@ -25,13 +25,14 @@
 #include "gc/z/zNUMA.hpp"
 
 bool ZNUMA::_enabled;
+uint32_t ZNUMA::_count;
 
 void ZNUMA::initialize() {
   pd_initialize();
 
   log_info_p(gc, init)("NUMA Support: %s", to_string());
   if (_enabled) {
-    log_info_p(gc, init)("NUMA Nodes: %u", count());
+    log_info_p(gc, init)("NUMA Nodes: %u", _count);
   }
 }
 
diff --git a/src/hotspot/share/gc/z/zNUMA.hpp b/src/hotspot/share/gc/z/zNUMA.hpp
index fb29e1faaa7..ac614247522 100644
--- a/src/hotspot/share/gc/z/zNUMA.hpp
+++ b/src/hotspot/share/gc/z/zNUMA.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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,8 @@
 
 class ZNUMA : public AllStatic {
 private:
-  static bool _enabled;
+  static bool     _enabled;
+  static uint32_t _count;
 
   static void pd_initialize();
 
diff --git a/src/hotspot/share/gc/z/zNUMA.inline.hpp b/src/hotspot/share/gc/z/zNUMA.inline.hpp
index 65fbd1040dc..4596c8f090b 100644
--- a/src/hotspot/share/gc/z/zNUMA.inline.hpp
+++ b/src/hotspot/share/gc/z/zNUMA.inline.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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,4 +30,8 @@ inline bool ZNUMA::is_enabled() {
   return _enabled;
 }
 
+inline uint32_t ZNUMA::count() {
+  return _count;
+}
+
 #endif // SHARE_GC_Z_ZNUMA_INLINE_HPP
diff --git a/src/hotspot/share/gc/z/zPageCache.cpp b/src/hotspot/share/gc/z/zPageCache.cpp
index b689a274de0..c8e8ec9bdbd 100644
--- a/src/hotspot/share/gc/z/zPageCache.cpp
+++ b/src/hotspot/share/gc/z/zPageCache.cpp
@@ -23,7 +23,7 @@
 
 #include "gc/z/zGlobals.hpp"
 #include "gc/z/zList.inline.hpp"
-#include "gc/z/zNUMA.hpp"
+#include "gc/z/zNUMA.inline.hpp"
 #include "gc/z/zPage.inline.hpp"
 #include "gc/z/zPageCache.hpp"
 #include "gc/z/zStat.hpp"

From 4e51a8c9ad4e5345d05cf32ce1e82b7158f80e93 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Galder=20Zamarre=C3=B1o?= <galder@openjdk.org>
Date: Thu, 13 Mar 2025 13:53:54 +0000
Subject: [PATCH 338/587] 8307513: C2: intrinsify Math.max(long,long) and
 Math.min(long,long)

Reviewed-by: roland, epeter, chagedorn, darcy
---
 src/hotspot/share/classfile/vmIntrinsics.hpp  |   2 +
 src/hotspot/share/opto/c2compiler.cpp         |   2 +
 src/hotspot/share/opto/library_call.cpp       | 193 +++++------
 src/hotspot/share/opto/library_call.hpp       |   2 -
 .../share/classes/java/lang/Math.java         |   2 +
 .../c2/irTests/TestMinMaxIdentities.java      |  10 +-
 .../intrinsics/math/TestMinMaxInlining.java   | 175 ++++++++++
 .../loopopts/superword/MinMaxRed_Long.java    | 170 ++++++++++
 .../openjdk/bench/java/lang/MinMaxVector.java | 300 ++++++++++++++++++
 9 files changed, 737 insertions(+), 119 deletions(-)
 create mode 100644 test/hotspot/jtreg/compiler/intrinsics/math/TestMinMaxInlining.java
 create mode 100644 test/hotspot/jtreg/compiler/loopopts/superword/MinMaxRed_Long.java
 create mode 100644 test/micro/org/openjdk/bench/java/lang/MinMaxVector.java

diff --git a/src/hotspot/share/classfile/vmIntrinsics.hpp b/src/hotspot/share/classfile/vmIntrinsics.hpp
index 7dbfb862ac2..a5846ee3a19 100644
--- a/src/hotspot/share/classfile/vmIntrinsics.hpp
+++ b/src/hotspot/share/classfile/vmIntrinsics.hpp
@@ -189,6 +189,8 @@ class methodHandle;
   do_intrinsic(_minF,                     java_lang_Math,         min_name,           float2_float_signature,    F_S)   \
   do_intrinsic(_maxD,                     java_lang_Math,         max_name,           double2_double_signature,  F_S)   \
   do_intrinsic(_minD,                     java_lang_Math,         min_name,           double2_double_signature,  F_S)   \
+  do_intrinsic(_maxL,                     java_lang_Math,         max_name,           long2_long_signature,      F_S)   \
+  do_intrinsic(_minL,                     java_lang_Math,         min_name,           long2_long_signature,      F_S)   \
   do_intrinsic(_roundD,                   java_lang_Math,         round_name,         double_long_signature,     F_S)   \
   do_intrinsic(_roundF,                   java_lang_Math,         round_name,         float_int_signature,       F_S)   \
   do_intrinsic(_dcopySign,                java_lang_Math,         copySign_name,      double2_double_signature,  F_S)   \
diff --git a/src/hotspot/share/opto/c2compiler.cpp b/src/hotspot/share/opto/c2compiler.cpp
index 790512d310d..3effa8eee04 100644
--- a/src/hotspot/share/opto/c2compiler.cpp
+++ b/src/hotspot/share/opto/c2compiler.cpp
@@ -633,6 +633,8 @@ bool C2Compiler::is_intrinsic_supported(vmIntrinsics::ID id) {
   case vmIntrinsics::_max:
   case vmIntrinsics::_min_strict:
   case vmIntrinsics::_max_strict:
+  case vmIntrinsics::_maxL:
+  case vmIntrinsics::_minL:
   case vmIntrinsics::_arraycopy:
   case vmIntrinsics::_arraySort:
   case vmIntrinsics::_arrayPartition:
diff --git a/src/hotspot/share/opto/library_call.cpp b/src/hotspot/share/opto/library_call.cpp
index 80a4f4e3503..d5e33e7f9ed 100644
--- a/src/hotspot/share/opto/library_call.cpp
+++ b/src/hotspot/share/opto/library_call.cpp
@@ -691,17 +691,17 @@ bool LibraryCallKit::try_to_inline(int predicate) {
   case vmIntrinsics::_max:
   case vmIntrinsics::_min_strict:
   case vmIntrinsics::_max_strict:
-    return inline_min_max(intrinsic_id());
-
-  case vmIntrinsics::_maxF:
+  case vmIntrinsics::_minL:
+  case vmIntrinsics::_maxL:
   case vmIntrinsics::_minF:
-  case vmIntrinsics::_maxD:
+  case vmIntrinsics::_maxF:
   case vmIntrinsics::_minD:
-  case vmIntrinsics::_maxF_strict:
+  case vmIntrinsics::_maxD:
   case vmIntrinsics::_minF_strict:
-  case vmIntrinsics::_maxD_strict:
+  case vmIntrinsics::_maxF_strict:
   case vmIntrinsics::_minD_strict:
-      return inline_fp_min_max(intrinsic_id());
+  case vmIntrinsics::_maxD_strict:
+    return inline_min_max(intrinsic_id());
 
   case vmIntrinsics::_VectorUnaryOp:
     return inline_vector_nary_operation(1);
@@ -1942,7 +1942,78 @@ bool LibraryCallKit::inline_notify(vmIntrinsics::ID id) {
 
 //----------------------------inline_min_max-----------------------------------
 bool LibraryCallKit::inline_min_max(vmIntrinsics::ID id) {
-  set_result(generate_min_max(id, argument(0), argument(1)));
+  Node* a = nullptr;
+  Node* b = nullptr;
+  Node* n = nullptr;
+  switch (id) {
+    case vmIntrinsics::_min:
+    case vmIntrinsics::_max:
+    case vmIntrinsics::_minF:
+    case vmIntrinsics::_maxF:
+    case vmIntrinsics::_minF_strict:
+    case vmIntrinsics::_maxF_strict:
+    case vmIntrinsics::_min_strict:
+    case vmIntrinsics::_max_strict:
+      assert(callee()->signature()->size() == 2, "minF/maxF has 2 parameters of size 1 each.");
+      a = argument(0);
+      b = argument(1);
+      break;
+    case vmIntrinsics::_minD:
+    case vmIntrinsics::_maxD:
+    case vmIntrinsics::_minD_strict:
+    case vmIntrinsics::_maxD_strict:
+      assert(callee()->signature()->size() == 4, "minD/maxD has 2 parameters of size 2 each.");
+      a = round_double_node(argument(0));
+      b = round_double_node(argument(2));
+      break;
+    case vmIntrinsics::_minL:
+    case vmIntrinsics::_maxL:
+      assert(callee()->signature()->size() == 4, "minL/maxL has 2 parameters of size 2 each.");
+      a = argument(0);
+      b = argument(2);
+      break;
+    default:
+      fatal_unexpected_iid(id);
+      break;
+  }
+
+  switch (id) {
+    case vmIntrinsics::_min:
+    case vmIntrinsics::_min_strict:
+      n = new MinINode(a, b);
+      break;
+    case vmIntrinsics::_max:
+    case vmIntrinsics::_max_strict:
+      n = new MaxINode(a, b);
+      break;
+    case vmIntrinsics::_minF:
+    case vmIntrinsics::_minF_strict:
+      n = new MinFNode(a, b);
+      break;
+    case vmIntrinsics::_maxF:
+    case vmIntrinsics::_maxF_strict:
+      n = new MaxFNode(a, b);
+      break;
+    case vmIntrinsics::_minD:
+    case vmIntrinsics::_minD_strict:
+      n = new MinDNode(a, b);
+      break;
+    case vmIntrinsics::_maxD:
+    case vmIntrinsics::_maxD_strict:
+      n = new MaxDNode(a, b);
+      break;
+    case vmIntrinsics::_minL:
+      n = new MinLNode(_gvn.C, a, b);
+      break;
+    case vmIntrinsics::_maxL:
+      n = new MaxLNode(_gvn.C, a, b);
+      break;
+    default:
+      fatal_unexpected_iid(id);
+      break;
+  }
+
+  set_result(_gvn.transform(n));
   return true;
 }
 
@@ -2021,25 +2092,6 @@ bool LibraryCallKit::inline_math_unsignedMultiplyHigh() {
   return true;
 }
 
-Node*
-LibraryCallKit::generate_min_max(vmIntrinsics::ID id, Node* x0, Node* y0) {
-  Node* result_val = nullptr;
-  switch (id) {
-  case vmIntrinsics::_min:
-  case vmIntrinsics::_min_strict:
-    result_val = _gvn.transform(new MinINode(x0, y0));
-    break;
-  case vmIntrinsics::_max:
-  case vmIntrinsics::_max_strict:
-    result_val = _gvn.transform(new MaxINode(x0, y0));
-    break;
-  default:
-    fatal_unexpected_iid(id);
-    break;
-  }
-  return result_val;
-}
-
 inline int
 LibraryCallKit::classify_unsafe_addr(Node* &base, Node* &offset, BasicType type) {
   const TypePtr* base_type = TypePtr::NULL_PTR;
@@ -4456,7 +4508,7 @@ bool LibraryCallKit::inline_array_copyOf(bool is_copyOfRange) {
     if (!stopped()) {
       // How many elements will we copy from the original?
       // The answer is MinI(orig_tail, length).
-      Node* moved = generate_min_max(vmIntrinsics::_min, orig_tail, length);
+      Node* moved = _gvn.transform(new MinINode(orig_tail, length));
 
       // Generate a direct call to the right arraycopy function(s).
       // We know the copy is disjoint but we might not know if the
@@ -8477,91 +8529,6 @@ bool LibraryCallKit::inline_character_compare(vmIntrinsics::ID id) {
   return true;
 }
 
-//------------------------------inline_fp_min_max------------------------------
-bool LibraryCallKit::inline_fp_min_max(vmIntrinsics::ID id) {
-/* DISABLED BECAUSE METHOD DATA ISN'T COLLECTED PER CALL-SITE, SEE JDK-8015416.
-
-  // The intrinsic should be used only when the API branches aren't predictable,
-  // the last one performing the most important comparison. The following heuristic
-  // uses the branch statistics to eventually bail out if necessary.
-
-  ciMethodData *md = callee()->method_data();
-
-  if ( md != nullptr && md->is_mature() && md->invocation_count() > 0 ) {
-    ciCallProfile cp = caller()->call_profile_at_bci(bci());
-
-    if ( ((double)cp.count()) / ((double)md->invocation_count()) < 0.8 ) {
-      // Bail out if the call-site didn't contribute enough to the statistics.
-      return false;
-    }
-
-    uint taken = 0, not_taken = 0;
-
-    for (ciProfileData *p = md->first_data(); md->is_valid(p); p = md->next_data(p)) {
-      if (p->is_BranchData()) {
-        taken = ((ciBranchData*)p)->taken();
-        not_taken = ((ciBranchData*)p)->not_taken();
-      }
-    }
-
-    double balance = (((double)taken) - ((double)not_taken)) / ((double)md->invocation_count());
-    balance = balance < 0 ? -balance : balance;
-    if ( balance > 0.2 ) {
-      // Bail out if the most important branch is predictable enough.
-      return false;
-    }
-  }
-*/
-
-  Node *a = nullptr;
-  Node *b = nullptr;
-  Node *n = nullptr;
-  switch (id) {
-  case vmIntrinsics::_maxF:
-  case vmIntrinsics::_minF:
-  case vmIntrinsics::_maxF_strict:
-  case vmIntrinsics::_minF_strict:
-    assert(callee()->signature()->size() == 2, "minF/maxF has 2 parameters of size 1 each.");
-    a = argument(0);
-    b = argument(1);
-    break;
-  case vmIntrinsics::_maxD:
-  case vmIntrinsics::_minD:
-  case vmIntrinsics::_maxD_strict:
-  case vmIntrinsics::_minD_strict:
-    assert(callee()->signature()->size() == 4, "minD/maxD has 2 parameters of size 2 each.");
-    a = round_double_node(argument(0));
-    b = round_double_node(argument(2));
-    break;
-  default:
-    fatal_unexpected_iid(id);
-    break;
-  }
-  switch (id) {
-  case vmIntrinsics::_maxF:
-  case vmIntrinsics::_maxF_strict:
-    n = new MaxFNode(a, b);
-    break;
-  case vmIntrinsics::_minF:
-  case vmIntrinsics::_minF_strict:
-    n = new MinFNode(a, b);
-    break;
-  case vmIntrinsics::_maxD:
-  case vmIntrinsics::_maxD_strict:
-    n = new MaxDNode(a, b);
-    break;
-  case vmIntrinsics::_minD:
-  case vmIntrinsics::_minD_strict:
-    n = new MinDNode(a, b);
-    break;
-  default:
-    fatal_unexpected_iid(id);
-    break;
-  }
-  set_result(_gvn.transform(n));
-  return true;
-}
-
 bool LibraryCallKit::inline_profileBoolean() {
   Node* counts = argument(1);
   const TypeAryPtr* ary = nullptr;
diff --git a/src/hotspot/share/opto/library_call.hpp b/src/hotspot/share/opto/library_call.hpp
index afc8d329228..790c03be7ca 100644
--- a/src/hotspot/share/opto/library_call.hpp
+++ b/src/hotspot/share/opto/library_call.hpp
@@ -223,7 +223,6 @@ class LibraryCallKit : public GraphKit {
   bool inline_math_subtractExactL(bool is_decrement);
   bool inline_min_max(vmIntrinsics::ID id);
   bool inline_notify(vmIntrinsics::ID id);
-  Node* generate_min_max(vmIntrinsics::ID id, Node* x, Node* y);
   // This returns Type::AnyPtr, RawPtr, or OopPtr.
   int classify_unsafe_addr(Node* &base, Node* &offset, BasicType type);
   Node* make_unsafe_address(Node*& base, Node* offset, BasicType type = T_ILLEGAL, bool can_cast = false);
@@ -354,7 +353,6 @@ class LibraryCallKit : public GraphKit {
   bool inline_vectorizedMismatch();
   bool inline_fma(vmIntrinsics::ID id);
   bool inline_character_compare(vmIntrinsics::ID id);
-  bool inline_fp_min_max(vmIntrinsics::ID id);
   bool inline_galoisCounterMode_AESCrypt();
   Node* inline_galoisCounterMode_AESCrypt_predicate();
 
diff --git a/src/java.base/share/classes/java/lang/Math.java b/src/java.base/share/classes/java/lang/Math.java
index 6403524a49e..5f664b54cdf 100644
--- a/src/java.base/share/classes/java/lang/Math.java
+++ b/src/java.base/share/classes/java/lang/Math.java
@@ -2033,6 +2033,7 @@ public final class Math {
      * @param   b   another argument.
      * @return  the larger of {@code a} and {@code b}.
      */
+    @IntrinsicCandidate
     public static long max(long a, long b) {
         return (a >= b) ? a : b;
     }
@@ -2128,6 +2129,7 @@ public final class Math {
      * @param   b   another argument.
      * @return  the smaller of {@code a} and {@code b}.
      */
+    @IntrinsicCandidate
     public static long min(long a, long b) {
         return (a <= b) ? a : b;
     }
diff --git a/test/hotspot/jtreg/compiler/c2/irTests/TestMinMaxIdentities.java b/test/hotspot/jtreg/compiler/c2/irTests/TestMinMaxIdentities.java
index 05845fa4e88..e23c02c8c61 100644
--- a/test/hotspot/jtreg/compiler/c2/irTests/TestMinMaxIdentities.java
+++ b/test/hotspot/jtreg/compiler/c2/irTests/TestMinMaxIdentities.java
@@ -112,9 +112,11 @@ public class TestMinMaxIdentities {
 
     // Longs
 
-    // As Math.min/max(LL) is not intrinsified, it first needs to be transformed into CMoveL and then MinL/MaxL before
+    // As Math.min/max(LL) is not intrinsified in the backend, it first needs to be transformed into CMoveL and then MinL/MaxL before
     // the identity can be matched. However, the outer min/max is not transformed into CMove because of the CMove cost model.
-    // As JDK-8307513 adds intrinsics for the methods, the tests will be updated then.
+    // JDK-8307513 adds intrinsics for the methods such that MinL/MaxL replace the ternary operations,
+    // and this enables identities to be matched.
+    // Note that before JDK-8307513 MinL/MaxL nodes were already present before macro expansion.
 
     @Test
     @IR(applyIfPlatform = { "riscv64", "false" }, phase = { CompilePhase.BEFORE_MACRO_EXPANSION }, counts = { IRNode.MIN_L, "1" })
@@ -123,13 +125,13 @@ public class TestMinMaxIdentities {
     }
 
     @Test
-    @IR(applyIfPlatform = { "riscv64", "false" }, phase = { CompilePhase.BEFORE_MACRO_EXPANSION }, counts = { IRNode.MIN_L, "1" })
+    @IR(failOn = { IRNode.MIN_L, IRNode.MAX_L })
     public long longMinMax(long a, long b) {
         return Math.min(a, Math.max(a, b));
     }
 
     @Test
-    @IR(applyIfPlatform = { "riscv64", "false" }, phase = { CompilePhase.BEFORE_MACRO_EXPANSION }, counts = { IRNode.MAX_L, "1" })
+    @IR(failOn = { IRNode.MIN_L, IRNode.MAX_L })
     public long longMaxMin(long a, long b) {
         return Math.max(a, Math.min(a, b));
     }
diff --git a/test/hotspot/jtreg/compiler/intrinsics/math/TestMinMaxInlining.java b/test/hotspot/jtreg/compiler/intrinsics/math/TestMinMaxInlining.java
new file mode 100644
index 00000000000..f85d0cdb9f7
--- /dev/null
+++ b/test/hotspot/jtreg/compiler/intrinsics/math/TestMinMaxInlining.java
@@ -0,0 +1,175 @@
+/*
+ * Copyright (c) 2025, 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 8307513
+ * @summary Test min and max IR inlining decisions
+ * @library /test/lib /
+ * @run driver compiler.intrinsics.math.TestMinMaxInlining
+ */
+
+package compiler.intrinsics.math;
+
+import compiler.lib.ir_framework.Argument;
+import compiler.lib.ir_framework.Arguments;
+import compiler.lib.ir_framework.Check;
+import compiler.lib.ir_framework.CompilePhase;
+import compiler.lib.ir_framework.IR;
+import compiler.lib.ir_framework.IRNode;
+import compiler.lib.ir_framework.Test;
+import compiler.lib.ir_framework.TestFramework;
+
+public class TestMinMaxInlining {
+    public static void main(String[] args) {
+        TestFramework.run();
+    }
+
+    @Test
+    @Arguments(values = { Argument.NUMBER_MINUS_42, Argument.NUMBER_42 })
+    @IR(counts = { IRNode.MIN_I, "1" })
+    private static int testIntMin(int a, int b) {
+        return Math.min(a, b);
+    }
+
+    @Check(test = "testIntMin")
+    public static void checkTestIntMin(int result) {
+        if (result != -42) {
+            throw new RuntimeException("Incorrect result: " + result);
+        }
+    }
+
+    @Test
+    @Arguments(values = { Argument.NUMBER_MINUS_42, Argument.NUMBER_42 })
+    @IR(counts = { IRNode.MAX_I, "1" })
+    private static int testIntMax(int a, int b) {
+        return Math.max(a, b);
+    }
+
+    @Check(test = "testIntMax")
+    public static void checkTestIntMax(int result) {
+        if (result != 42) {
+            throw new RuntimeException("Incorrect result: " + result);
+        }
+    }
+
+    // JDK-8307513 does not change the way MinL/MaxL nodes intrinsified in backend.
+    // So they are still transformed into CmpL + CMoveL nodes after macro expansion.
+    // This is the reason for the different before/after macro expansion assertions below.
+
+    // MinL is not implemented in the backed, so at macro expansion it gets transformed into a CMoveL.
+    // The IR asserts verify that before macro expansion MinL exists,
+    // but after macro expansion the node disappears.
+    @Test
+    @Arguments(values = { Argument.NUMBER_MINUS_42, Argument.NUMBER_42 })
+    @IR(phase = { CompilePhase.BEFORE_MACRO_EXPANSION }, counts = { IRNode.MIN_L, "1" })
+    @IR(phase = { CompilePhase.AFTER_MACRO_EXPANSION }, counts = { IRNode.MIN_L, "0" })
+    private static long testLongMin(long a, long b) {
+        return Math.min(a, b);
+    }
+
+    @Check(test = "testLongMin")
+    public static void checkTestLongMin(long result) {
+        if (result != -42L) {
+            throw new RuntimeException("Incorrect result: " + result);
+        }
+    }
+
+    // MaxL is not implemented in the backed, so at macro expansion it gets transformed into a CMoveL.
+    // The IR asserts verify that before macro expansion MinL exists,
+    // but after macro expansion the node disappears.
+    @Test
+    @Arguments(values = { Argument.NUMBER_MINUS_42, Argument.NUMBER_42 })
+    @IR(phase = { CompilePhase.BEFORE_MACRO_EXPANSION }, counts = { IRNode.MAX_L, "1" })
+    @IR(phase = { CompilePhase.AFTER_MACRO_EXPANSION }, counts = { IRNode.MAX_L, "0" })
+    private static long testLongMax(long a, long b) {
+        return Math.max(a, b);
+    }
+
+    @Check(test = "testLongMax")
+    public static void checkTestLongMax(long result) {
+        if (result != 42L) {
+            throw new RuntimeException("Incorrect result: " + result);
+        }
+    }
+
+    @Test
+    @Arguments(values = { Argument.NUMBER_MINUS_42, Argument.NUMBER_42 })
+    @IR(counts = { IRNode.MIN_F, "1" },
+        applyIfCPUFeatureOr = {"avx", "true", "asimd", "true"})
+    private static float testFloatMin(float a, float b) {
+        return Math.min(a, b);
+    }
+
+    @Check(test = "testFloatMin")
+    public static void checkTestFloatMin(float result) {
+        if (result != -42f) {
+            throw new RuntimeException("Incorrect result: " + result);
+        }
+    }
+
+    @Test
+    @Arguments(values = { Argument.NUMBER_MINUS_42, Argument.NUMBER_42 })
+    @IR(counts = { IRNode.MAX_F, "1" },
+       applyIfCPUFeatureOr = {"avx", "true", "asimd", "true"})
+    private static float testFloatMax(float a, float b) {
+        return Math.max(a, b);
+    }
+
+    @Check(test = "testFloatMax")
+    public static void checkTestFloatMax(float result) {
+        if (result != 42f) {
+            throw new RuntimeException("Incorrect result: " + result);
+        }
+    }
+
+    @Test
+    @Arguments(values = { Argument.NUMBER_MINUS_42, Argument.NUMBER_42 })
+    @IR(counts = { IRNode.MIN_D, "1" },
+        applyIfCPUFeatureOr = {"avx", "true", "asimd", "true"})
+    private static double testDoubleMin(double a, double b) {
+        return Math.min(a, b);
+    }
+
+    @Check(test = "testDoubleMin")
+    public static void checkTestDoubleMin(double result) {
+        if (result != -42D) {
+            throw new RuntimeException("Incorrect result: " + result);
+        }
+    }
+
+    @Test
+    @Arguments(values = { Argument.NUMBER_MINUS_42, Argument.NUMBER_42 })
+    @IR(counts = { IRNode.MAX_D, "1" },
+        applyIfCPUFeatureOr = {"avx", "true", "asimd", "true"})
+    private static double testDoubleMax(double a, double b) {
+        return Math.max(a, b);
+    }
+
+    @Check(test = "testDoubleMax")
+    public static void checkTestDoubleMax(double result) {
+        if (result != 42D) {
+            throw new RuntimeException("Incorrect result: " + result);
+        }
+    }
+}
diff --git a/test/hotspot/jtreg/compiler/loopopts/superword/MinMaxRed_Long.java b/test/hotspot/jtreg/compiler/loopopts/superword/MinMaxRed_Long.java
new file mode 100644
index 00000000000..9c3e2c7bc5d
--- /dev/null
+++ b/test/hotspot/jtreg/compiler/loopopts/superword/MinMaxRed_Long.java
@@ -0,0 +1,170 @@
+/*
+ * Copyright (c) 2025, 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 8307513
+ * @summary [SuperWord] MaxReduction and MinReduction should vectorize for long
+ * @library /test/lib /
+ * @run driver compiler.loopopts.superword.MinMaxRed_Long
+ */
+
+package compiler.loopopts.superword;
+
+import compiler.lib.ir_framework.*;
+import jdk.test.lib.Utils;
+
+import java.util.Arrays;
+import java.util.Random;
+import java.util.stream.LongStream;
+
+public class MinMaxRed_Long {
+
+    private static final Random random = Utils.getRandomInstance();
+
+    public static void main(String[] args) throws Exception {
+        TestFramework framework = new TestFramework();
+        framework.addFlags("-XX:+IgnoreUnrecognizedVMOptions",
+                           "-XX:LoopUnrollLimit=250",
+                           "-XX:CompileThresholdScaling=0.1");
+        framework.start();
+    }
+
+    @Run(test = {"maxReductionImplement"},
+         mode = RunMode.STANDALONE)
+    public void runMaxTest() {
+        runMaxTest(50);
+        runMaxTest(80);
+        runMaxTest(100);
+    }
+
+    private static void runMaxTest(int probability) {
+        long[] longs = reductionInit(probability);
+        long res = 0;
+        for (int j = 0; j < 2000; j++) {
+            res = maxReductionImplement(longs, res);
+        }
+        if (res == 11 * Arrays.stream(longs).max().getAsLong()) {
+            System.out.println("Success");
+        } else {
+            throw new AssertionError("Failed");
+        }
+    }
+
+    @Run(test = {"minReductionImplement"},
+         mode = RunMode.STANDALONE)
+    public void runMinTest() {
+        runMinTest(50);
+        runMinTest(80);
+        runMinTest(100);
+    }
+
+    private static void runMinTest(int probability) {
+        long[] longs = reductionInit(probability);
+        // Negating the values generated for controlling max branching
+        // allows same logic to be used for min tests.
+        longs = negate(longs);
+        long res = 0;
+        for (int j = 0; j < 2000; j++) {
+            res = minReductionImplement(longs, res);
+        }
+        if (res == 11 * Arrays.stream(longs).min().getAsLong()) {
+            System.out.println("Success");
+        } else {
+            throw new AssertionError("Failed");
+        }
+    }
+
+    static long[] negate(long[] nums) {
+        return LongStream.of(nums).map(l -> -l).toArray();
+    }
+
+    public static long[] reductionInit(int probability) {
+        int aboveCount, abovePercent;
+        long[] longs = new long[1024];
+
+        // Generates an array of numbers such that as the array is iterated
+        // there is P probability of finding a new max value,
+        // and 100-P probability of not finding a new max value.
+        // The algorithm loops around if the distribution does not match the probability,
+        // but it approximates the probability as the array sizes increase.
+        // The worst case of this algorithm is when the desired array size is 100
+        // and the aim is to get 50% of probability, which can only be satisfied
+        // with 50 elements being a new max. This situation can take 15 rounds.
+        // As sizes increase, say 10'000 elements,
+        // the number of elements that have to satisfy 50% increases,
+        // so the algorithm will stop as an example when 5027 elements are a new max values.
+        // Also, probability values in the edges will achieve their objective quicker,
+        // with 0% or 100% probability doing it in a single loop.
+        // To support the same algorithm for min calculations,
+        // negating the array elements achieves the same objective.
+        do {
+            long max = random.nextLong(10);
+            longs[0] = max;
+
+            aboveCount = 0;
+            for (int i = 1; i < longs.length; i++) {
+                long value;
+                if (random.nextLong(101) <= probability) {
+                    long increment = random.nextLong(10);
+                    value = max + increment;
+                    aboveCount++;
+                } else {
+                    // Decrement by at least 1
+                    long diffToMax = random.nextLong(10) + 1;
+                    value = max - diffToMax;
+                }
+                longs[i] = value;
+                max = Math.max(max, value);
+            }
+
+            abovePercent = ((aboveCount + 1) * 100) / longs.length;
+        } while (abovePercent != probability);
+
+        return longs;
+    }
+
+    @Test
+    @IR(applyIfAnd = {"SuperWordReductions", "true", "MaxVectorSize", ">=32"},
+        applyIfCPUFeatureOr = {"avx512", "true", "asimd" , "true"},
+        counts = {IRNode.MIN_REDUCTION_V, " > 0"})
+    public static long minReductionImplement(long[] a, long res) {
+        for (int i = 0; i < a.length; i++) {
+            final long v = 11 * a[i];
+            res = Math.min(res, v);
+        }
+        return res;
+    }
+
+    @Test
+    @IR(applyIfAnd = {"SuperWordReductions", "true", "MaxVectorSize", ">=32"},
+        applyIfCPUFeatureOr = {"avx512", "true", "asimd" , "true"},
+        counts = {IRNode.MAX_REDUCTION_V, " > 0"})
+    public static long maxReductionImplement(long[] a, long res) {
+        for (int i = 0; i < a.length; i++) {
+            final long v = 11 * a[i];
+            res = Math.max(res, v);
+        }
+        return res;
+    }
+}
diff --git a/test/micro/org/openjdk/bench/java/lang/MinMaxVector.java b/test/micro/org/openjdk/bench/java/lang/MinMaxVector.java
new file mode 100644
index 00000000000..fa42d0be834
--- /dev/null
+++ b/test/micro/org/openjdk/bench/java/lang/MinMaxVector.java
@@ -0,0 +1,300 @@
+package org.openjdk.bench.java.lang;
+
+import org.openjdk.jmh.annotations.Benchmark;
+import org.openjdk.jmh.annotations.BenchmarkMode;
+import org.openjdk.jmh.annotations.Fork;
+import org.openjdk.jmh.annotations.Measurement;
+import org.openjdk.jmh.annotations.Mode;
+import org.openjdk.jmh.annotations.OutputTimeUnit;
+import org.openjdk.jmh.annotations.Param;
+import org.openjdk.jmh.annotations.Scope;
+import org.openjdk.jmh.annotations.Setup;
+import org.openjdk.jmh.annotations.State;
+import org.openjdk.jmh.annotations.Warmup;
+
+import java.util.Arrays;
+import java.util.IntSummaryStatistics;
+import java.util.LongSummaryStatistics;
+import java.util.Random;
+import java.util.concurrent.ThreadLocalRandom;
+import java.util.concurrent.TimeUnit;
+import java.util.stream.LongStream;
+
+@Warmup(iterations = 3, time = 5)
+@Measurement(iterations = 4, time = 5)
+@Fork(2)
+@OutputTimeUnit(TimeUnit.MILLISECONDS)
+@BenchmarkMode(Mode.Throughput)
+public class MinMaxVector
+{
+    @State(Scope.Thread)
+    public static class LoopState {
+        @Param({"2048"})
+        int size;
+
+        /**
+         * Probability of one of the min/max branches being taken.
+         * For max, this value represents the percentage of branches in which
+         * the value will be bigger or equal than the current max.
+         * For min, this value represents the percentage of branches in which
+         * the value will be smaller or equal than the current min.
+         */
+        @Param({"50", "80", "100"})
+        int probability;
+
+        int[] minIntA;
+        int[] minIntB;
+        long[] minLongA;
+        long[] minLongB;
+        int[] maxIntA;
+        int[] maxIntB;
+        long[] maxLongA;
+        long[] maxLongB;
+        int[] resultIntArray;
+        long[] resultLongArray;
+
+        @Setup
+        public void setup() {
+            final long[][] longs = distributeLongRandomIncrement(size, probability);
+            maxLongA = longs[0];
+            maxLongB = longs[1];
+            maxIntA = toInts(maxLongA);
+            maxIntB = toInts(maxLongB);
+            minLongA = negate(maxLongA);
+            minLongB = negate(maxLongB);
+            minIntA = toInts(minLongA);
+            minIntB = toInts(minLongB);
+            resultIntArray = new int[size];
+            resultLongArray = new long[size];
+        }
+
+        static long[] negate(long[] nums) {
+            return LongStream.of(nums).map(l -> -l).toArray();
+        }
+
+        static int[] toInts(long[] nums) {
+            return Arrays.stream(nums).mapToInt(i -> (int) i).toArray();
+        }
+
+        static long[][] distributeLongRandomIncrement(int size, int probability) {
+            long[][] result;
+            int aboveCount, abovePercent;
+
+            // This algorithm generates 2 arrays of numbers.
+            // The first array is created such that as the array is iterated,
+            // there is P probability of finding a new min/max value,
+            // and 100-P probability of not finding a new min/max value.
+            // This first array is used on its own for tests that iterate an array to reduce it to a single value,
+            // e.g. the min or max value in the array.
+            // The second array is loaded with values relative to the first array,
+            // such that when the values in the same index are compared for min/max,
+            // the probability that a new min/max value is found has the probability P.
+            do {
+                long max = ThreadLocalRandom.current().nextLong(10);
+                result = new long[2][size];
+                result[0][0] = max;
+                result[1][0] = max - 1;
+
+                aboveCount = 0;
+                for (int i = 1; i < result[0].length; i++) {
+                    long value;
+                    if (ThreadLocalRandom.current().nextLong(101) <= probability) {
+                        long increment = ThreadLocalRandom.current().nextLong(10);
+                        value = max + increment;
+                        aboveCount++;
+                    } else {
+                        // Decrement by at least 1
+                        long diffToMax = ThreadLocalRandom.current().nextLong(10) + 1;
+                        value = max - diffToMax;
+                    }
+                    result[0][i] = value;
+                    result[1][i] = max;
+                    max = Math.max(max, value);
+                }
+
+                abovePercent = ((aboveCount + 1) * 100) / size;
+            } while (abovePercent != probability);
+
+            return result;
+        }
+    }
+
+    @State(Scope.Thread)
+    public static class RangeState
+    {
+        @Param({"1000"})
+        int size;
+
+        /**
+         * Define range of values to clip as a percentage.
+         * For example, if value is 100, then all values are considered in the range,
+         * and so the highest value would be the max value and the lowest value the min value in the array.
+         * If the value is 90, then highest would be 10% lower than the max value,
+         * and the min value would be 10% higher than the min value.
+         */
+        @Param({"90", "100"})
+        int range;
+
+        @Param("0")
+        int seed;
+
+        int[] ints;
+        int[] resultInts;
+        long[] longs;
+        long[] resultLongs;
+        int highestInt;
+        int lowestInt;
+        long highestLong;
+        long lowestLong;
+        Random r = new Random(seed);
+
+        @Setup
+        public void setup() {
+            ints = new int[size];
+            resultInts = new int[size];
+            longs = new long[size];
+            resultLongs = new long[size];
+
+            for (int i = 0; i < size; i++) {
+                ints[i] = r.nextInt();
+                longs[i] = r.nextLong();
+            }
+
+            final IntSummaryStatistics intStats = Arrays.stream(ints).summaryStatistics();
+            highestInt = (intStats.getMax() * range) / 100;
+            lowestInt = intStats.getMin() + (intStats.getMax() - highestInt);
+
+            final LongSummaryStatistics longStats = Arrays.stream(longs).summaryStatistics();
+            highestLong = (longStats.getMax() * range) / 100;
+            lowestLong = longStats.getMin() + (longStats.getMax() - highestLong);
+        }
+    }
+
+    @Benchmark
+    public int[] intClippingRange(RangeState state) {
+        for (int i = 0; i < state.size; i++) {
+            state.resultInts[i] = Math.min(Math.max(state.ints[i], state.lowestInt), state.highestInt);
+        }
+        return state.resultInts;
+    }
+
+    @Benchmark
+    public int[] intLoopMin(LoopState state) {
+        for (int i = 0; i < state.size; i++) {
+            state.resultIntArray[i] = Math.min(state.minIntA[i], state.minIntB[i]);
+        }
+        return state.resultIntArray;
+    }
+
+    @Benchmark
+    public int[] intLoopMax(LoopState state) {
+        for (int i = 0; i < state.size; i++) {
+            state.resultIntArray[i] = Math.max(state.maxIntA[i], state.maxIntB[i]);
+        }
+        return state.resultIntArray;
+    }
+
+    @Benchmark
+    public int intReductionMultiplyMin(LoopState state) {
+        int result = 0;
+        for (int i = 0; i < state.size; i++) {
+            final int v = 11 * state.minIntA[i];
+            result = Math.min(result, v);
+        }
+        return result;
+    }
+
+    @Benchmark
+    public int intReductionSimpleMin(LoopState state) {
+        int result = 0;
+        for (int i = 0; i < state.size; i++) {
+            final int v = state.minIntA[i];
+            result = Math.min(result, v);
+        }
+        return result;
+    }
+
+    @Benchmark
+    public int intReductionMultiplyMax(LoopState state) {
+        int result = 0;
+        for (int i = 0; i < state.size; i++) {
+            final int v = 11 * state.maxIntA[i];
+            result = Math.max(result, v);
+        }
+        return result;
+    }
+
+    @Benchmark
+    public int intReductionSimpleMax(LoopState state) {
+        int result = 0;
+        for (int i = 0; i < state.size; i++) {
+            final int v = state.maxIntA[i];
+            result = Math.max(result, v);
+        }
+        return result;
+    }
+
+    @Benchmark
+    public long[] longClippingRange(RangeState state) {
+        for (int i = 0; i < state.size; i++) {
+            state.resultLongs[i] = Math.min(Math.max(state.longs[i], state.lowestLong), state.highestLong);
+        }
+        return state.resultLongs;
+    }
+
+    @Benchmark
+    public long[] longLoopMin(LoopState state) {
+        for (int i = 0; i < state.size; i++) {
+            state.resultLongArray[i] = Math.min(state.minLongA[i], state.minLongB[i]);
+        }
+        return state.resultLongArray;
+    }
+
+    @Benchmark
+    public long[] longLoopMax(LoopState state) {
+        for (int i = 0; i < state.size; i++) {
+            state.resultLongArray[i] = Math.max(state.maxLongA[i], state.maxLongB[i]);
+        }
+        return state.resultLongArray;
+    }
+
+    @Benchmark
+    public long longReductionMultiplyMin(LoopState state) {
+        long result = 0;
+        for (int i = 0; i < state.size; i++) {
+            final long v = 11 * state.minLongA[i];
+            result = Math.min(result, v);
+        }
+        return result;
+    }
+
+    @Benchmark
+    public long longReductionSimpleMin(LoopState state) {
+        long result = 0;
+        for (int i = 0; i < state.size; i++) {
+            final long v = state.minLongA[i];
+            result = Math.min(result, v);
+        }
+        return result;
+    }
+
+    @Benchmark
+    public long longReductionMultiplyMax(LoopState state) {
+        long result = 0;
+        for (int i = 0; i < state.size; i++) {
+            final long v = 11 * state.maxLongA[i];
+            result = Math.max(result, v);
+        }
+        return result;
+    }
+
+    @Benchmark
+    public long longReductionSimpleMax(LoopState state) {
+        long result = 0;
+        for (int i = 0; i < state.size; i++) {
+            final long v = state.maxLongA[i];
+            result = Math.max(result, v);
+        }
+        return result;
+    }
+}

From 37ec796255ae857588a5c7e0d572407dd81cbec9 Mon Sep 17 00:00:00 2001
From: Thomas Stuefe <stuefe@openjdk.org>
Date: Thu, 13 Mar 2025 16:08:08 +0000
Subject: [PATCH 339/587] 8351500: G1: NUMA migrations cause crashes in region
 allocation

Reviewed-by: rkennke, sjohanss, tschatzl
---
 src/hotspot/share/gc/g1/g1Allocator.cpp       | 24 ++++++++---------
 src/hotspot/share/gc/g1/g1Allocator.hpp       | 26 ++++++++++---------
 .../share/gc/g1/g1Allocator.inline.hpp        |  8 +++---
 src/hotspot/share/gc/g1/g1CollectedHeap.cpp   | 18 ++++++++-----
 src/hotspot/share/gc/g1/g1CollectedHeap.hpp   |  2 +-
 5 files changed, 42 insertions(+), 36 deletions(-)

diff --git a/src/hotspot/share/gc/g1/g1Allocator.cpp b/src/hotspot/share/gc/g1/g1Allocator.cpp
index 56dbeb9eac1..49a4958f718 100644
--- a/src/hotspot/share/gc/g1/g1Allocator.cpp
+++ b/src/hotspot/share/gc/g1/g1Allocator.cpp
@@ -212,10 +212,10 @@ size_t G1Allocator::used_in_alloc_regions() {
 
 
 HeapWord* G1Allocator::par_allocate_during_gc(G1HeapRegionAttr dest,
-                                              size_t word_size,
-                                              uint node_index) {
+                                              uint node_index,
+                                              size_t word_size) {
   size_t temp = 0;
-  HeapWord* result = par_allocate_during_gc(dest, word_size, word_size, &temp, node_index);
+  HeapWord* result = par_allocate_during_gc(dest, node_index, word_size, word_size, &temp);
   assert(result == nullptr || temp == word_size,
          "Requested %zu words, but got %zu at " PTR_FORMAT,
          word_size, temp, p2i(result));
@@ -223,13 +223,13 @@ HeapWord* G1Allocator::par_allocate_during_gc(G1HeapRegionAttr dest,
 }
 
 HeapWord* G1Allocator::par_allocate_during_gc(G1HeapRegionAttr dest,
+                                              uint node_index,
                                               size_t min_word_size,
                                               size_t desired_word_size,
-                                              size_t* actual_word_size,
-                                              uint node_index) {
+                                              size_t* actual_word_size) {
   switch (dest.type()) {
     case G1HeapRegionAttr::Young:
-      return survivor_attempt_allocation(min_word_size, desired_word_size, actual_word_size, node_index);
+      return survivor_attempt_allocation(node_index, min_word_size, desired_word_size, actual_word_size);
     case G1HeapRegionAttr::Old:
       return old_attempt_allocation(min_word_size, desired_word_size, actual_word_size);
     default:
@@ -238,10 +238,10 @@ HeapWord* G1Allocator::par_allocate_during_gc(G1HeapRegionAttr dest,
   }
 }
 
-HeapWord* G1Allocator::survivor_attempt_allocation(size_t min_word_size,
+HeapWord* G1Allocator::survivor_attempt_allocation(uint node_index,
+                                                   size_t min_word_size,
                                                    size_t desired_word_size,
-                                                   size_t* actual_word_size,
-                                                   uint node_index) {
+                                                   size_t* actual_word_size) {
   assert(!_g1h->is_humongous(desired_word_size),
          "we should not be seeing humongous-size allocations in this path");
 
@@ -397,10 +397,10 @@ HeapWord* G1PLABAllocator::allocate_direct_or_new_plab(G1HeapRegionAttr dest,
 
     size_t actual_plab_size = 0;
     HeapWord* buf = _allocator->par_allocate_during_gc(dest,
+                                                       node_index,
                                                        required_in_plab,
                                                        plab_word_size,
-                                                       &actual_plab_size,
-                                                       node_index);
+                                                       &actual_plab_size);
 
     assert(buf == nullptr || ((actual_plab_size >= required_in_plab) && (actual_plab_size <= plab_word_size)),
            "Requested at minimum %zu, desired %zu words, but got %zu at " PTR_FORMAT,
@@ -419,7 +419,7 @@ HeapWord* G1PLABAllocator::allocate_direct_or_new_plab(G1HeapRegionAttr dest,
     *plab_refill_failed = true;
   }
   // Try direct allocation.
-  HeapWord* result = _allocator->par_allocate_during_gc(dest, word_sz, node_index);
+  HeapWord* result = _allocator->par_allocate_during_gc(dest, node_index, word_sz);
   if (result != nullptr) {
     plab_data->_direct_allocated += word_sz;
     plab_data->_num_direct_allocations++;
diff --git a/src/hotspot/share/gc/g1/g1Allocator.hpp b/src/hotspot/share/gc/g1/g1Allocator.hpp
index 26b1f9996b5..8c382824b27 100644
--- a/src/hotspot/share/gc/g1/g1Allocator.hpp
+++ b/src/hotspot/share/gc/g1/g1Allocator.hpp
@@ -78,19 +78,16 @@ private:
   inline OldGCAllocRegion* old_gc_alloc_region();
 
   // Allocation attempt during GC for a survivor object / PLAB.
-  HeapWord* survivor_attempt_allocation(size_t min_word_size,
+  HeapWord* survivor_attempt_allocation(uint node_index,
+                                        size_t min_word_size,
                                         size_t desired_word_size,
-                                        size_t* actual_word_size,
-                                        uint node_index);
+                                        size_t* actual_word_size);
 
   // Allocation attempt during GC for an old object / PLAB.
   HeapWord* old_attempt_allocation(size_t min_word_size,
                                    size_t desired_word_size,
                                    size_t* actual_word_size);
 
-  // Node index of current thread.
-  inline uint current_node_index() const;
-
 public:
   G1Allocator(G1CollectedHeap* heap);
   ~G1Allocator();
@@ -110,16 +107,20 @@ public:
   void abandon_gc_alloc_regions();
   bool is_retained_old_region(G1HeapRegion* hr);
 
+  // Node index of current thread.
+  inline uint current_node_index() const;
+
   // Allocate blocks of memory during mutator time.
 
   // Attempt allocation in the current alloc region.
-  inline HeapWord* attempt_allocation(size_t min_word_size,
+  inline HeapWord* attempt_allocation(uint node_index,
+                                      size_t min_word_size,
                                       size_t desired_word_size,
                                       size_t* actual_word_size);
 
   // This is to be called when holding an appropriate lock. It first tries in the
   // current allocation region, and then attempts an allocation using a new region.
-  inline HeapWord* attempt_allocation_locked(size_t word_size);
+  inline HeapWord* attempt_allocation_locked(uint node_index, size_t word_size);
 
   size_t unsafe_max_tlab_alloc();
   size_t used_in_alloc_regions();
@@ -129,14 +130,15 @@ public:
   // heap, and then allocate a block of the given size. The block
   // may not be a humongous - it must fit into a single heap region.
   HeapWord* par_allocate_during_gc(G1HeapRegionAttr dest,
-                                   size_t word_size,
-                                   uint node_index);
+                                   uint node_index,
+                                   size_t word_size
+                                   );
 
   HeapWord* par_allocate_during_gc(G1HeapRegionAttr dest,
+                                   uint node_index,
                                    size_t min_word_size,
                                    size_t desired_word_size,
-                                   size_t* actual_word_size,
-                                   uint node_index);
+                                   size_t* actual_word_size);
 };
 
 // Manages the PLABs used during garbage collection. Interface for allocation from PLABs.
diff --git a/src/hotspot/share/gc/g1/g1Allocator.inline.hpp b/src/hotspot/share/gc/g1/g1Allocator.inline.hpp
index 7595efab3c1..f1e4d29c0e8 100644
--- a/src/hotspot/share/gc/g1/g1Allocator.inline.hpp
+++ b/src/hotspot/share/gc/g1/g1Allocator.inline.hpp
@@ -49,11 +49,10 @@ inline OldGCAllocRegion* G1Allocator::old_gc_alloc_region() {
   return &_old_gc_alloc_region;
 }
 
-inline HeapWord* G1Allocator::attempt_allocation(size_t min_word_size,
+inline HeapWord* G1Allocator::attempt_allocation(uint node_index,
+                                                 size_t min_word_size,
                                                  size_t desired_word_size,
                                                  size_t* actual_word_size) {
-  uint node_index = current_node_index();
-
   HeapWord* result = mutator_alloc_region(node_index)->attempt_retained_allocation(min_word_size, desired_word_size, actual_word_size);
   if (result != nullptr) {
     return result;
@@ -62,8 +61,7 @@ inline HeapWord* G1Allocator::attempt_allocation(size_t min_word_size,
   return mutator_alloc_region(node_index)->attempt_allocation(min_word_size, desired_word_size, actual_word_size);
 }
 
-inline HeapWord* G1Allocator::attempt_allocation_locked(size_t word_size) {
-  uint node_index = current_node_index();
+inline HeapWord* G1Allocator::attempt_allocation_locked(uint node_index, size_t word_size) {
   HeapWord* result = mutator_alloc_region(node_index)->attempt_allocation_locked(word_size);
 
   assert(result != nullptr || mutator_alloc_region(node_index)->get() == nullptr,
diff --git a/src/hotspot/share/gc/g1/g1CollectedHeap.cpp b/src/hotspot/share/gc/g1/g1CollectedHeap.cpp
index 6cd4cd07dd8..4c0436ad1e2 100644
--- a/src/hotspot/share/gc/g1/g1CollectedHeap.cpp
+++ b/src/hotspot/share/gc/g1/g1CollectedHeap.cpp
@@ -402,7 +402,7 @@ G1CollectedHeap::mem_allocate(size_t word_size,
   return attempt_allocation(word_size, word_size, &dummy);
 }
 
-HeapWord* G1CollectedHeap::attempt_allocation_slow(size_t word_size) {
+HeapWord* G1CollectedHeap::attempt_allocation_slow(uint node_index, size_t word_size) {
   ResourceMark rm; // For retrieving the thread names in log messages.
 
   // Make sure you read the note in attempt_allocation_humongous().
@@ -426,7 +426,7 @@ HeapWord* G1CollectedHeap::attempt_allocation_slow(size_t word_size) {
 
       // Now that we have the lock, we first retry the allocation in case another
       // thread changed the region while we were waiting to acquire the lock.
-      result = _allocator->attempt_allocation_locked(word_size);
+      result = _allocator->attempt_allocation_locked(node_index, word_size);
       if (result != nullptr) {
         return result;
       }
@@ -453,7 +453,7 @@ HeapWord* G1CollectedHeap::attempt_allocation_slow(size_t word_size) {
     // here and the follow-on attempt will be at the start of the next loop
     // iteration (after taking the Heap_lock).
     size_t dummy = 0;
-    result = _allocator->attempt_allocation(word_size, word_size, &dummy);
+    result = _allocator->attempt_allocation(node_index, word_size, word_size, &dummy);
     if (result != nullptr) {
       return result;
     }
@@ -587,11 +587,14 @@ inline HeapWord* G1CollectedHeap::attempt_allocation(size_t min_word_size,
   assert(!is_humongous(desired_word_size), "attempt_allocation() should not "
          "be called for humongous allocation requests");
 
-  HeapWord* result = _allocator->attempt_allocation(min_word_size, desired_word_size, actual_word_size);
+  // Fix NUMA node association for the duration of this allocation
+  const uint node_index = _allocator->current_node_index();
+
+  HeapWord* result = _allocator->attempt_allocation(node_index, min_word_size, desired_word_size, actual_word_size);
 
   if (result == nullptr) {
     *actual_word_size = desired_word_size;
-    result = attempt_allocation_slow(desired_word_size);
+    result = attempt_allocation_slow(node_index, desired_word_size);
   }
 
   assert_heap_not_locked();
@@ -698,8 +701,11 @@ HeapWord* G1CollectedHeap::attempt_allocation_at_safepoint(size_t word_size,
   assert(!_allocator->has_mutator_alloc_region() || !expect_null_mutator_alloc_region,
          "the current alloc region was unexpectedly found to be non-null");
 
+  // Fix NUMA node association for the duration of this allocation
+  const uint node_index = _allocator->current_node_index();
+
   if (!is_humongous(word_size)) {
-    return _allocator->attempt_allocation_locked(word_size);
+    return _allocator->attempt_allocation_locked(node_index, word_size);
   } else {
     HeapWord* result = humongous_obj_allocate(word_size);
     if (result != nullptr && policy()->need_to_start_conc_mark("STW humongous allocation")) {
diff --git a/src/hotspot/share/gc/g1/g1CollectedHeap.hpp b/src/hotspot/share/gc/g1/g1CollectedHeap.hpp
index 16d73537d5c..d1e81205cef 100644
--- a/src/hotspot/share/gc/g1/g1CollectedHeap.hpp
+++ b/src/hotspot/share/gc/g1/g1CollectedHeap.hpp
@@ -450,7 +450,7 @@ private:
   // Second-level mutator allocation attempt: take the Heap_lock and
   // retry the allocation attempt, potentially scheduling a GC
   // pause. This should only be used for non-humongous allocations.
-  HeapWord* attempt_allocation_slow(size_t word_size);
+  HeapWord* attempt_allocation_slow(uint node_index, size_t word_size);
 
   // Takes the Heap_lock and attempts a humongous allocation. It can
   // potentially schedule a GC pause.

From 0ff1c0832e7d2ca70f344e933d86a5d16fdcabe0 Mon Sep 17 00:00:00 2001
From: Henry Jen <henryjen@openjdk.org>
Date: Thu, 13 Mar 2025 16:44:06 +0000
Subject: [PATCH 340/587] 8349984: (jdeps) jdeps can use String.repeat instead
 of String.replaceAll

Reviewed-by: alanb
---
 .../share/classes/com/sun/tools/jdeps/JdepsTask.java        | 6 +++---
 .../jdk/tools/jlink/internal/ImageResourcesTree.java        | 4 ++--
 .../tools/jlink/internal/plugins/IncludeLocalesPlugin.java  | 6 +++---
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/JdepsTask.java b/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/JdepsTask.java
index 3ebb26f0e58..b73daee66de 100644
--- a/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/JdepsTask.java
+++ b/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/JdepsTask.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -790,8 +790,8 @@ class JdepsTask {
                     String replacementApiTitle = getMessage("public.api.replacement.column.header");
                     log.format("%-40s %s%n", internalApiTitle, replacementApiTitle);
                     log.format("%-40s %s%n",
-                               internalApiTitle.replaceAll(".", "-"),
-                               replacementApiTitle.replaceAll(".", "-"));
+                               "-".repeat(internalApiTitle.codePointCount(0, internalApiTitle.length())),
+                               "-".repeat(replacementApiTitle.codePointCount(0, replacementApiTitle.length())));
                     jdkInternals.entrySet()
                         .forEach(e -> {
                             String key = e.getKey();
diff --git a/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/ImageResourcesTree.java b/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/ImageResourcesTree.java
index 96f2be83638..8a4288f0cfd 100644
--- a/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/ImageResourcesTree.java
+++ b/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/ImageResourcesTree.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -300,7 +300,7 @@ public final class ImageResourcesTree {
                 return null;
             }
             String pkg = removeRadical(path, module + "/");
-            return pkg.replaceAll("/", ".");
+            return pkg.replace('/', '.');
         }
 
         public String removeRadical(Node node) {
diff --git a/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/IncludeLocalesPlugin.java b/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/IncludeLocalesPlugin.java
index 9b9e7ad1ce8..2b87b1ceee3 100644
--- a/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/IncludeLocalesPlugin.java
+++ b/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/IncludeLocalesPlugin.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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,7 +217,7 @@ public final class IncludeLocalesPlugin extends AbstractPlugin implements Resour
             available = Stream.concat(module.entries()
                                         .map(md -> p.matcher(md.path()))
                                         .filter(Matcher::matches)
-                                        .map(m -> m.group("tag").replaceAll("_", "-")),
+                                        .map(m -> m.group("tag").replace('_', '-')),
                                     Stream.of(jaJPJPTag, thTHTHTag, "und"))
                 .distinct()
                 .sorted()
@@ -250,7 +250,7 @@ public final class IncludeLocalesPlugin extends AbstractPlugin implements Resour
             return List.of();
         }
 
-        List<String> files = new ArrayList<>(includeLocaleFiles(tag.replaceAll("-", "_")));
+        List<String> files = new ArrayList<>(includeLocaleFiles(tag.replace('-', '_')));
 
         // Add Thai BreakIterator related data files
         if (tag.equals("th")) {

From 771e160da4daa98bfe37bf1acba65454c088910c Mon Sep 17 00:00:00 2001
From: Harald Eilertsen <haraldei@anduin.net>
Date: Thu, 13 Mar 2025 16:54:54 +0000
Subject: [PATCH 341/587] 8351323: Parameterize compiler and linker flags for
 iconv

Reviewed-by: ihse, erikj
---
 make/autoconf/libraries.m4                        | 14 ++++++++++++++
 make/autoconf/spec.gmk.template                   |  3 +++
 make/modules/java.desktop/lib/ClientLibraries.gmk | 13 ++++++++-----
 make/modules/java.instrument/Lib.gmk              |  7 +++++--
 make/modules/jdk.jdwp.agent/Lib.gmk               |  6 +++---
 5 files changed, 33 insertions(+), 10 deletions(-)

diff --git a/make/autoconf/libraries.m4 b/make/autoconf/libraries.m4
index 70d52d189f4..b946be97d96 100644
--- a/make/autoconf/libraries.m4
+++ b/make/autoconf/libraries.m4
@@ -205,6 +205,20 @@ AC_DEFUN_ONCE([LIB_SETUP_MISC_LIBS],
   fi
   AC_SUBST(LIBPTHREAD)
 
+  # Setup libiconv flags and library
+  if test "x$OPENJDK_TARGET_OS" == "xaix" || test "x$OPENJDK_TARGET_OS" == "xmacosx"; then
+    ICONV_CFLAGS=
+    ICONV_LDFLAGS=
+    ICONV_LIBS=-liconv
+  else
+    ICONV_CFLAGS=
+    ICONV_LDFLAGS=
+    ICONV_LIBS=
+  fi
+  AC_SUBST(ICONV_CFLAGS)
+  AC_SUBST(ICONV_LDFLAGS)
+  AC_SUBST(ICONV_LIBS)
+
   # Control if libzip can use mmap. Available for purposes of overriding.
   LIBZIP_CAN_USE_MMAP=true
   AC_SUBST(LIBZIP_CAN_USE_MMAP)
diff --git a/make/autoconf/spec.gmk.template b/make/autoconf/spec.gmk.template
index e502f5e281b..92ee1c93287 100644
--- a/make/autoconf/spec.gmk.template
+++ b/make/autoconf/spec.gmk.template
@@ -427,6 +427,9 @@ LIBFFI_LIBS := @LIBFFI_LIBS@
 LIBFFI_CFLAGS := @LIBFFI_CFLAGS@
 ENABLE_LIBFFI_BUNDLING := @ENABLE_LIBFFI_BUNDLING@
 LIBFFI_LIB_FILE := @LIBFFI_LIB_FILE@
+ICONV_CFLAGS := @ICONV_CFLAGS@
+ICONV_LDFLAGS := @ICONV_LDFLAGS@
+ICONV_LIBS := @ICONV_LIBS@
 FILE_MACRO_CFLAGS := @FILE_MACRO_CFLAGS@
 REPRODUCIBLE_CFLAGS := @REPRODUCIBLE_CFLAGS@
 
diff --git a/make/modules/java.desktop/lib/ClientLibraries.gmk b/make/modules/java.desktop/lib/ClientLibraries.gmk
index 330b914b7e5..5587b13a6c9 100644
--- a/make/modules/java.desktop/lib/ClientLibraries.gmk
+++ b/make/modules/java.desktop/lib/ClientLibraries.gmk
@@ -228,9 +228,11 @@ ifeq ($(ENABLE_HEADLESS_ONLY), false)
       EXCLUDES := $(LIBSPLASHSCREEN_EXCLUDES), \
       OPTIMIZATION := SIZE, \
       CFLAGS := $(LIBSPLASHSCREEN_CFLAGS) \
-          $(GIFLIB_CFLAGS) $(LIBJPEG_CFLAGS) $(PNG_CFLAGS) $(LIBZ_CFLAGS), \
+          $(GIFLIB_CFLAGS) $(LIBJPEG_CFLAGS) $(PNG_CFLAGS) $(LIBZ_CFLAGS) \
+          $(ICONV_CFLAGS), \
       CXXFLAGS := $(LIBSPLASHSCREEN_CFLAGS) \
-          $(GIFLIB_CFLAGS) $(LIBJPEG_CFLAGS) $(PNG_CFLAGS) $(LIBZ_CFLAGS), \
+          $(GIFLIB_CFLAGS) $(LIBJPEG_CFLAGS) $(PNG_CFLAGS) $(LIBZ_CFLAGS) \
+          $(ICONV_CFLAGS), \
       EXTRA_HEADER_DIRS := $(LIBSPLASHSCREEN_HEADER_DIRS), \
       DISABLED_WARNINGS_gcc_dgif_lib.c := sign-compare, \
       DISABLED_WARNINGS_gcc_jcmaster.c := implicit-fallthrough, \
@@ -256,19 +258,20 @@ ifeq ($(ENABLE_HEADLESS_ONLY), false)
       DISABLED_WARNINGS_microsoft_splashscreen_impl.c := 4018 4267 4244, \
       DISABLED_WARNINGS_microsoft_splashscreen_png.c := 4267, \
       DISABLED_WARNINGS_microsoft_splashscreen_sys.c := 4267 4244, \
+      LDFLAGS := $(ICONV_LDFLAGS), \
       LDFLAGS_windows := -delayload:user32.dll, \
       JDK_LIBS_windows := java.base:libjava, \
       JDK_LIBS_macosx := libosxapp, \
-      LIBS := $(GIFLIB_LIBS) $(LIBJPEG_LIBS) $(LIBZ_LIBS) $(PNG_LIBS), \
+      LIBS := $(GIFLIB_LIBS) $(LIBJPEG_LIBS) $(LIBZ_LIBS) $(PNG_LIBS) $(ICONV_LIBS), \
       LIBS_unix := $(LIBM) $(LIBPTHREAD), \
       LIBS_linux := $(LIBDL) $(X_LIBS) -lX11 -lXext, \
-      LIBS_macosx := -liconv \
+      LIBS_macosx := \
           -framework ApplicationServices \
           -framework Cocoa \
           -framework Foundation \
           -framework Metal \
           -framework Security, \
-      LIBS_aix := $(LIBDL) -liconv $(X_LIBS) -lX11 -lXext, \
+      LIBS_aix := $(LIBDL) $(X_LIBS) -lX11 -lXext, \
       LIBS_windows := delayimp.lib gdi32.lib kernel32.lib user32.lib, \
       STATIC_LIB_EXCLUDE_OBJS := $(LIBSPLASHSCREEN_STATIC_LIB_EXCLUDE_OBJS), \
   ))
diff --git a/make/modules/java.instrument/Lib.gmk b/make/modules/java.instrument/Lib.gmk
index 0d1a3d81b50..609814c86ed 100644
--- a/make/modules/java.instrument/Lib.gmk
+++ b/make/modules/java.instrument/Lib.gmk
@@ -35,14 +35,17 @@ include LibCommon.gmk
 $(eval $(call SetupJdkLibrary, BUILD_LIBINSTRUMENT, \
     NAME := instrument, \
     OPTIMIZATION := LOW, \
+    CFLAGS := $(ICONV_CFLAGS), \
     CFLAGS_windows := -Dstrcasecmp=stricmp, \
     CFLAGS_debug := -DJPLIS_LOGGING, \
     CFLAGS_release := -DNO_JPLIS_LOGGING, \
+    LDFLAGS := $(ICONV_LDFLAGS), \
     JDK_LIBS := java.base:libjava java.base:libjli java.base:libjvm, \
+    LIBS := $(ICONV_LIBS), \
     LIBS_unix := $(LIBZ_LIBS), \
     LIBS_linux := $(LIBDL), \
-    LIBS_aix := $(LIBDL) -liconv, \
-    LIBS_macosx := -liconv \
+    LIBS_aix := $(LIBDL), \
+    LIBS_macosx := \
         -framework ApplicationServices \
         -framework Cocoa \
         -framework Security, \
diff --git a/make/modules/jdk.jdwp.agent/Lib.gmk b/make/modules/jdk.jdwp.agent/Lib.gmk
index b4a8cc622c6..8fe7787d76e 100644
--- a/make/modules/jdk.jdwp.agent/Lib.gmk
+++ b/make/modules/jdk.jdwp.agent/Lib.gmk
@@ -53,7 +53,7 @@ TARGETS += $(BUILD_LIBDT_SOCKET)
 $(eval $(call SetupJdkLibrary, BUILD_LIBJDWP, \
     NAME := jdwp, \
     OPTIMIZATION := LOW, \
-    CFLAGS := -DJDWP_LOGGING, \
+    CFLAGS := -DJDWP_LOGGING $(ICONV_CFLAGS), \
     DISABLED_WARNINGS_gcc_eventFilter.c := unused-variable, \
     DISABLED_WARNINGS_gcc_SDE.c := unused-function, \
     DISABLED_WARNINGS_gcc_threadControl.c := unused-but-set-variable \
@@ -68,14 +68,14 @@ $(eval $(call SetupJdkLibrary, BUILD_LIBJDWP, \
     DISABLED_WARNINGS_clang_threadControl.c := unused-but-set-variable \
         unused-variable, \
     DISABLED_WARNINGS_clang_utf_util.c := unused-but-set-variable, \
+    LDFLAGS := $(ICONV_LDFLAGS), \
     EXTRA_HEADER_DIRS := \
         include \
         libjdwp/export \
         java.base:libjava, \
     JDK_LIBS := java.base:libjvm, \
+    LIBS := $(ICONV_LIBS), \
     LIBS_linux := $(LIBDL), \
-    LIBS_macosx := -liconv, \
-    LIBS_aix := -liconv, \
 ))
 
 TARGETS += $(BUILD_LIBJDWP)

From b50fe9b8cc39730d3339e45a83b365ab3dd8a5da Mon Sep 17 00:00:00 2001
From: Rajat Mahajan <rmahajan@openjdk.org>
Date: Thu, 13 Mar 2025 17:09:17 +0000
Subject: [PATCH 342/587] 8280818: Expand bug8033699.java to iterate over all
 LaFs

Reviewed-by: dnguyen, aivanov, honkar, abhiscxk
---
 .../JRadioButton/8033699/bug8033699.java      | 126 ++++++++++--------
 1 file changed, 71 insertions(+), 55 deletions(-)

diff --git a/test/jdk/javax/swing/JRadioButton/8033699/bug8033699.java b/test/jdk/javax/swing/JRadioButton/8033699/bug8033699.java
index 30d83a0538e..471d30c5c19 100644
--- a/test/jdk/javax/swing/JRadioButton/8033699/bug8033699.java
+++ b/test/jdk/javax/swing/JRadioButton/8033699/bug8033699.java
@@ -43,9 +43,9 @@ import javax.swing.JPanel;
 import javax.swing.JRadioButton;
 import javax.swing.SwingUtilities;
 import javax.swing.UIManager;
+import javax.swing.UnsupportedLookAndFeelException;
 
 public class bug8033699 {
-
     private static JFrame mainFrame;
     private static Robot robot;
     private static JButton btnStart;
@@ -57,64 +57,80 @@ public class bug8033699 {
     private static JRadioButton radioBtnSingle;
 
     public static void main(String[] args) throws Throwable {
-        SwingUtilities.invokeAndWait(() -> {
-            changeLAF();
-            createAndShowGUI();
-        });
-
         robot = new Robot();
-        robot.waitForIdle();
-        robot.delay(1000);
 
-        // tab key test grouped radio button
-        runTest1();
-        robot.delay(100);
-
-        // tab key test non-grouped radio button
-        runTest2();
-        robot.delay(100);
-
-        // shift tab key test grouped and non-grouped radio button
-        runTest3();
-        robot.delay(100);
-
-        // left/up key test in grouped radio button
-        runTest4();
-        robot.delay(100);
-
-        // down/right key test in grouped radio button
-        runTest5();
-        robot.delay(100);
-
-        // tab from radio button in group to next component in the middle of button group layout
-        runTest6();
-        robot.delay(100);
-
-        // tab to radio button in group from component in the middle of button group layout
-        runTest7();
-        robot.delay(100);
-
-        // down key circle back to first button in grouped radio button
-        runTest8();
-        robot.delay(100);
-
-        // Verify that ActionListener is called when a RadioButton is selected using arrow key.
-        runTest9();
-        robot.delay(100);
-
-        SwingUtilities.invokeAndWait(() -> mainFrame.dispose());
+        // Get all installed Look and Feels
+        UIManager.LookAndFeelInfo[] lafs = UIManager.getInstalledLookAndFeels();
+        for (UIManager.LookAndFeelInfo laf : lafs) {
+            testLaF(laf);
+        }
     }
 
-    private static void changeLAF() {
-        String currentLAF = UIManager.getLookAndFeel().toString();
-        System.out.println(currentLAF);
-        currentLAF = currentLAF.toLowerCase();
-        if (currentLAF.contains("nimbus")) {
-            try {
-                UIManager.setLookAndFeel("javax.swing.plaf.metal.MetalLookAndFeel");
-            } catch (Exception ex) {
-                ex.printStackTrace();
-            }
+    private static void testLaF(UIManager.LookAndFeelInfo laf) throws Exception {
+        try {
+            System.out.println("Testing LaF: " + laf.getName());
+            SwingUtilities.invokeAndWait(() -> {
+                setLookAndFeel(laf);
+                createAndShowGUI();
+            });
+
+            robot.waitForIdle();
+            robot.delay(1000);
+
+            // tab key test grouped radio button
+            runTest1();
+            robot.delay(100);
+
+            // tab key test non-grouped radio button
+            runTest2();
+            robot.delay(100);
+
+            // shift tab key test grouped and non-grouped radio button
+            runTest3();
+            robot.delay(100);
+
+            // left/up key test in grouped radio button
+            runTest4();
+            robot.delay(100);
+
+            // down/right key test in grouped radio button
+            runTest5();
+            robot.delay(100);
+
+            // tab from radio button in group to next component in the middle of button group layout
+            runTest6();
+            robot.delay(100);
+
+            // tab to radio button in group from component in the middle of button group layout
+            runTest7();
+            robot.delay(100);
+
+            // down key circle back to first button in grouped radio button
+            runTest8();
+            robot.delay(100);
+
+            // Verify that ActionListener is called when a RadioButton is selected using arrow key.
+            runTest9();
+            robot.delay(100);
+        } catch (Exception e) {
+            throw new RuntimeException("Error testing LaF: " + laf.getName(), e);
+        } finally {
+            SwingUtilities.invokeAndWait(() -> {
+                if (mainFrame != null) {
+                    mainFrame.dispose();
+                    mainFrame = null;
+                }
+            });
+        }
+    }
+
+    private static void setLookAndFeel(UIManager.LookAndFeelInfo laf) {
+        try {
+            UIManager.setLookAndFeel(laf.getClassName());
+        } catch (ClassNotFoundException | InstantiationException |
+                 IllegalAccessException | UnsupportedLookAndFeelException e) {
+            System.err.println("Error setting LaF: " + laf.getName());
+            throw new RuntimeException("Failed to set look and feel", e);
         }
     }
 

From 03ef79cf05bdcfc3bb126d004f8f039fb2f4ba9f Mon Sep 17 00:00:00 2001
From: Eric Caspole <ecaspole@openjdk.org>
Date: Thu, 13 Mar 2025 18:32:15 +0000
Subject: [PATCH 343/587] 8346470: Improve WriteBarrier JMH to have
 old-to-young refs

Reviewed-by: tschatzl
---
 .../bench/vm/compiler/WriteBarrier.java       | 95 ++++++++++++++++++-
 1 file changed, 93 insertions(+), 2 deletions(-)

diff --git a/test/micro/org/openjdk/bench/vm/compiler/WriteBarrier.java b/test/micro/org/openjdk/bench/vm/compiler/WriteBarrier.java
index 683c597cba9..3306974257c 100644
--- a/test/micro/org/openjdk/bench/vm/compiler/WriteBarrier.java
+++ b/test/micro/org/openjdk/bench/vm/compiler/WriteBarrier.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,12 +26,14 @@ import org.openjdk.jmh.annotations.Benchmark;
 import org.openjdk.jmh.annotations.BenchmarkMode;
 import org.openjdk.jmh.annotations.CompilerControl;
 import org.openjdk.jmh.annotations.Fork;
+import org.openjdk.jmh.annotations.Level;
 import org.openjdk.jmh.annotations.Measurement;
 import org.openjdk.jmh.annotations.Mode;
 import org.openjdk.jmh.annotations.OutputTimeUnit;
 import org.openjdk.jmh.annotations.Scope;
 import org.openjdk.jmh.annotations.Setup;
 import org.openjdk.jmh.annotations.State;
+import org.openjdk.jmh.annotations.TearDown;
 import org.openjdk.jmh.annotations.Warmup;
 
 import java.util.Random;
@@ -56,12 +58,18 @@ public abstract class WriteBarrier {
     private Object[] theArrayLarge;
     private int[] indicesLarge;
 
+    private Object[] youngArraySmall;
+    private Object[] youngArrayLarge;
+
     private Object nullRef;
     private Object realRef;
+    private Object youngRef;
 
     // For field update tests
     public Referencer head = null;
     public Referencer tail = null;
+    public Referencer youngHead = null;
+    public Referencer youngTail = null;
 
     // For random number generation
     private int m_w;
@@ -81,7 +89,7 @@ public abstract class WriteBarrier {
         }
     }
 
-    @Setup
+    @Setup(Level.Trial)
     public void setup() {
         theArraySmall = new Object[NUM_REFERENCES_SMALL];
         indicesSmall = new int[NUM_REFERENCES_SMALL];
@@ -114,6 +122,16 @@ public abstract class WriteBarrier {
         System.gc();
     }
 
+    @Setup(Level.Iteration)
+    public void setupIteration() {
+        // Reallocate target objects each iteration to ensure they are in young gen.
+        youngArraySmall = new Object[NUM_REFERENCES_SMALL];
+        youngArrayLarge = new Object[NUM_REFERENCES_LARGE];
+        youngRef = new Object();
+        this.youngHead = new Referencer();
+        this.youngTail = new Referencer();
+    }
+
     private int get_random() {
         m_z = 36969 * (m_z & 65535) + (m_z >> 16);
         m_w = 18000 * (m_w & 65535) + (m_w >> 16);
@@ -133,6 +151,70 @@ public abstract class WriteBarrier {
         }
     }
 
+    @Benchmark
+    @CompilerControl(CompilerControl.Mode.DONT_INLINE)
+    public void testArrayWriteBarrierFastPathOldToYoungSmall() {
+        for (int i = 0; i < NUM_REFERENCES_SMALL; i++) {
+            youngArraySmall[indicesSmall[NUM_REFERENCES_SMALL - i - 1]] = realRef;
+        }
+    }
+
+    @Benchmark
+    @CompilerControl(CompilerControl.Mode.DONT_INLINE)
+    public void testArrayWriteBarrierFastPathYoungToOldSmall() {
+        for (int i = 0; i < NUM_REFERENCES_SMALL; i++) {
+            theArraySmall[indicesSmall[NUM_REFERENCES_SMALL - i - 1]] = youngRef;
+        }
+    }
+
+    @Benchmark
+    @CompilerControl(CompilerControl.Mode.DONT_INLINE)
+    public void testArrayWriteBarrierFastPathYoungToYoungSmall() {
+        for (int i = 0; i < NUM_REFERENCES_SMALL; i++) {
+            youngArraySmall[indicesSmall[NUM_REFERENCES_SMALL - i - 1]] = youngRef;
+        }
+    }
+
+    @Benchmark
+    @CompilerControl(CompilerControl.Mode.DONT_INLINE)
+    public void testArrayWriteBarrierFastPathNullYoungSmall() {
+        for (int i = 0; i < NUM_REFERENCES_SMALL; i++) {
+            youngArraySmall[indicesSmall[NUM_REFERENCES_SMALL - i - 1]] = nullRef;
+        }
+    }
+
+    @Benchmark
+    @CompilerControl(CompilerControl.Mode.DONT_INLINE)
+    public void testArrayWriteBarrierFastPathOldToYoungLarge() {
+        for (int i = 0; i < NUM_REFERENCES_LARGE; i++) {
+            youngArrayLarge[indicesLarge[NUM_REFERENCES_LARGE - i - 1]] = realRef;
+        }
+    }
+
+    @Benchmark
+    @CompilerControl(CompilerControl.Mode.DONT_INLINE)
+    public void testArrayWriteBarrierFastPathYoungToYoungLarge() {
+        for (int i = 0; i < NUM_REFERENCES_LARGE; i++) {
+            youngArrayLarge[indicesLarge[NUM_REFERENCES_LARGE - i - 1]] = youngRef;
+        }
+    }
+
+    @Benchmark
+    @CompilerControl(CompilerControl.Mode.DONT_INLINE)
+    public void testArrayWriteBarrierFastPathNullYoungLarge() {
+        for (int i = 0; i < NUM_REFERENCES_LARGE; i++) {
+            youngArrayLarge[indicesLarge[NUM_REFERENCES_LARGE - i - 1]] = nullRef;
+        }
+    }
+
+    @Benchmark
+    @CompilerControl(CompilerControl.Mode.DONT_INLINE)
+    public void testArrayWriteBarrierFastPathYoungToOldLarge() {
+        for (int i = 0; i < NUM_REFERENCES_LARGE; i++) {
+            theArrayLarge[indicesLarge[NUM_REFERENCES_LARGE - i - 1]] = youngRef;
+        }
+    }
+
     @Benchmark
     @CompilerControl(CompilerControl.Mode.DONT_INLINE)
     public void testArrayWriteBarrierFastPathNullSmall() {
@@ -166,6 +248,15 @@ public abstract class WriteBarrier {
         this.tail.clear();
     }
 
+    @Benchmark()
+    public void testFieldWriteBarrierFastPathYoungRef() {
+        // Shuffle everything around
+        this.tail.append(this.youngHead);
+        this.head.clear();
+        this.head.append(this.youngTail);
+        this.tail.clear();
+    }
+
     // This run is useful to compare different GC barrier models without being
     // affected by C2 unrolling the main loop differently for each model.
     @Fork(value = 3, jvmArgs = {"-XX:LoopUnrollLimit=1"})

From 248c373b5b066b6b3eaa5a7461f30733f30b0a13 Mon Sep 17 00:00:00 2001
From: Erik Gahlin <egahlin@openjdk.org>
Date: Thu, 13 Mar 2025 19:21:11 +0000
Subject: [PATCH 344/587] 8351266: JFR: -XX:StartFlightRecording:report-on-exit

Reviewed-by: mgronlun
---
 src/java.base/share/man/java.md               |   6 +
 .../jdk/jfr/internal/PlatformRecorder.java    |  17 ++-
 .../jdk/jfr/internal/PlatformRecording.java   |  15 ++-
 .../consumer/AbstractEventStream.java         |   9 ++
 .../consumer/EventDirectoryStream.java        |   2 +-
 .../jdk/jfr/internal/dcmd/AbstractDCmd.java   |   6 +-
 .../jdk/jfr/internal/dcmd/DCmdQuery.java      |   3 +-
 .../jdk/jfr/internal/dcmd/DCmdStart.java      |  60 ++++++++-
 .../jdk/jfr/internal/dcmd/DCmdView.java       |   3 +-
 .../jdk/jfr/internal/dcmd/QueryRecording.java |  14 ++-
 .../jdk/jfr/internal/query/Configuration.java |   7 +-
 .../jdk/jfr/internal/query/QueryPrinter.java  |   4 +-
 .../jdk/jfr/internal/query/Report.java        |  64 ++++++++++
 .../jdk/jfr/internal/query/ViewPrinter.java   |   4 +-
 .../startupargs/TestStartReportOnExit.java    | 114 ++++++++++++++++++
 15 files changed, 311 insertions(+), 17 deletions(-)
 create mode 100644 src/jdk.jfr/share/classes/jdk/jfr/internal/query/Report.java
 create mode 100644 test/jdk/jdk/jfr/startupargs/TestStartReportOnExit.java

diff --git a/src/java.base/share/man/java.md b/src/java.base/share/man/java.md
index 32280f2c516..987dbf64159 100644
--- a/src/java.base/share/man/java.md
+++ b/src/java.base/share/man/java.md
@@ -1447,6 +1447,12 @@ These `java` options control the runtime behavior of the Java HotSpot VM.
         the potential leaking object was allocated is included in the
         information collected.
 
+    `report-on-exit=`*identifier*
+    :   Specifies the name of the view to display when the Java Virtual Machine
+        (JVM) shuts down. This option is not available if the disk option is set
+        to false. For a list of available views, see `jfr help view`. By default,
+        no report is generated.
+
     `settings=`*path*
     :   Specifies the path and name of the event settings file (of type JFC).
         By default, the `default.jfc` file is used, which is located in
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/PlatformRecorder.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/PlatformRecorder.java
index cc22850bcf9..ee25a491ad3 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/PlatformRecorder.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/PlatformRecorder.java
@@ -54,6 +54,7 @@ import jdk.jfr.events.ActiveRecordingEvent;
 import jdk.jfr.events.ActiveSettingEvent;
 import jdk.jfr.internal.consumer.EventLog;
 import jdk.jfr.internal.periodic.PeriodicEvents;
+import jdk.jfr.internal.query.Report;
 import jdk.jfr.internal.util.Utils;
 
 public final class PlatformRecorder {
@@ -63,7 +64,6 @@ public final class PlatformRecorder {
     private static final List<FlightRecorderListener> changeListeners = new ArrayList<>();
     private final Repository repository;
     private final Thread shutdownHook;
-
     private Timer timer;
     private long recordingCounter = 0;
     private RepositoryChunk currentChunk;
@@ -154,6 +154,10 @@ public final class PlatformRecorder {
         this.inShutdown = true;
     }
 
+    synchronized boolean isInShutDown() {
+        return this.inShutdown;
+    }
+
     // called by shutdown hook
     synchronized void destroy() {
         try {
@@ -174,6 +178,7 @@ public final class PlatformRecorder {
             }
         }
 
+        writeReports();
         JDKEvents.remove();
 
         if (JVMSupport.hasJFR()) {
@@ -185,6 +190,16 @@ public final class PlatformRecorder {
         repository.clear();
     }
 
+    private void writeReports() {
+        for (PlatformRecording recording : getRecordings()) {
+            if (recording.isToDisk() && recording.getState() == RecordingState.STOPPED) {
+                for (Report report : recording.getReports()) {
+                    report.print(recording.getStartTime(), recording.getStopTime());
+                }
+            }
+        }
+    }
+
     synchronized long start(PlatformRecording recording) {
         // State can only be NEW or DELAYED because of previous checks
         Instant startTime = null;
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/PlatformRecording.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/PlatformRecording.java
index 025b2878253..794121678ef 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/PlatformRecording.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/PlatformRecording.java
@@ -56,6 +56,7 @@ import jdk.jfr.Configuration;
 import jdk.jfr.FlightRecorderListener;
 import jdk.jfr.Recording;
 import jdk.jfr.RecordingState;
+import jdk.jfr.internal.query.Report;
 import jdk.jfr.internal.util.Utils;
 import jdk.jfr.internal.util.ValueFormatter;
 
@@ -83,6 +84,7 @@ public final class PlatformRecording implements AutoCloseable {
     private RecordingState state = RecordingState.NEW;
     private long size;
     private final LinkedList<RepositoryChunk> chunks = new LinkedList<>();
+    private final List<Report> reports = new ArrayList<>();
     private volatile Recording recording;
     private TimerTask stopTask;
     private TimerTask startTask;
@@ -171,7 +173,10 @@ public final class PlatformRecording implements AutoCloseable {
                 dumpStopped(dest);
                 Logger.log(LogTag.JFR, LogLevel.INFO, "Wrote recording \"" + getName() + "\" (" + getId() + ") to " + dest.getRealPathText());
                 notifyIfStateChanged(newState, oldState);
-                close(); // remove if copied out
+                boolean reportOnExit = recorder.isInShutDown() && !reports.isEmpty();
+                if (!reportOnExit) {
+                    close(); // remove if copied out, unless we are in shutdown and there are reports to report.
+                }
             } catch(IOException e) {
                 Logger.log(LogTag.JFR, LogLevel.ERROR,
                            "Unable to complete I/O operation when dumping recording \"" + getName() + "\" (" + getId() + ")");
@@ -922,4 +927,12 @@ public final class PlatformRecording implements AutoCloseable {
             }
         }
     }
+
+    public void addReport(Report report) {
+       reports.add(report);
+    }
+
+    public List<Report> getReports() {
+        return reports;
+    }
 }
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/consumer/AbstractEventStream.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/consumer/AbstractEventStream.java
index b9994c1e51c..141fd58ca80 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/consumer/AbstractEventStream.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/consumer/AbstractEventStream.java
@@ -57,6 +57,7 @@ public abstract class AbstractEventStream implements EventStream {
     private final List<Configuration> configurations;
     private final ParserState parserState = new ParserState();
     private volatile boolean closeOnComplete = true;
+    private volatile boolean waitForChunks = true;
     private Dispatcher dispatcher;
     private boolean daemon = false;
 
@@ -109,6 +110,14 @@ public abstract class AbstractEventStream implements EventStream {
         this.closeOnComplete = closeOnComplete;
     }
 
+    public final void setWaitForChunks(boolean wait) {
+        waitForChunks = wait;
+    }
+
+    protected final boolean getWaitForChunks() {
+        return waitForChunks;
+    }
+
     @Override
     public final void setStartTime(Instant startTime) {
         Objects.requireNonNull(startTime, "startTime");
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/consumer/EventDirectoryStream.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/consumer/EventDirectoryStream.java
index 8560efb9347..46dab564ac0 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/consumer/EventDirectoryStream.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/consumer/EventDirectoryStream.java
@@ -206,7 +206,7 @@ public final class EventDirectoryStream extends AbstractEventStream {
                         Logger.log(LogTag.JFR_SYSTEM_PARSER, LogLevel.INFO, "Unexpected chunk with 0 ns duration");
                     }
                 }
-                path = repositoryFiles.nextPath(currentChunkStartNanos + durationNanos, true);
+                path = repositoryFiles.nextPath(currentChunkStartNanos + durationNanos, getWaitForChunks());
                 if (path == null) {
                     logStreamEnd("no more chunk files found.");
                     return;
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/dcmd/AbstractDCmd.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/dcmd/AbstractDCmd.java
index e5b70f40a6c..701bc0396c6 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/dcmd/AbstractDCmd.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/dcmd/AbstractDCmd.java
@@ -76,7 +76,7 @@ abstract class AbstractDCmd {
             if (log) {
                 Logger.log(LogTag.JFR_DCMD, LogLevel.DEBUG, "Executing " + this.getClass().getSimpleName() + ": " + arg);
             }
-            ArgumentParser parser = new ArgumentParser(getArgumentInfos(), arg, delimiter);
+            ArgumentParser parser = new ArgumentParser(getParseArguments(source), arg, delimiter);
             parser.parse();
             if (log) {
                 Logger.log(LogTag.JFR_DCMD, LogLevel.DEBUG, "DCMD options: " + parser.getOptions());
@@ -98,6 +98,10 @@ abstract class AbstractDCmd {
        }
     }
 
+    protected Argument[] getParseArguments(String source) {
+        return getArgumentInfos();
+    }
+
     // Diagnostic commands that are meant to be used interactively
     // should turn off events to avoid noise in the output.
     protected boolean isInteractive() {
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/dcmd/DCmdQuery.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/dcmd/DCmdQuery.java
index b2e9aecda38..f125f729fd5 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/dcmd/DCmdQuery.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/dcmd/DCmdQuery.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -52,6 +52,7 @@ public final class DCmdQuery extends AbstractDCmd {
         Configuration configuration = new Configuration();
         configuration.output = getOutput();
         configuration.endTime = Instant.now().minusSeconds(1);
+        configuration.verboseTimespan = true;
         Boolean verbose = parser.getOption("verbose");
         if (verbose != null) {
             configuration.verboseHeaders = verbose;
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/dcmd/DCmdStart.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/dcmd/DCmdStart.java
index 634bcd33315..9cc3bdaf101 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/dcmd/DCmdStart.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/dcmd/DCmdStart.java
@@ -31,6 +31,8 @@ import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.text.ParseException;
 import java.time.Duration;
+import java.util.Arrays;
+import java.util.HashMap;
 import java.util.HashSet;
 import java.util.LinkedHashMap;
 import java.util.List;
@@ -51,6 +53,7 @@ import jdk.jfr.internal.jfc.JFC;
 import jdk.jfr.internal.jfc.model.JFCModel;
 import jdk.jfr.internal.jfc.model.JFCModelException;
 import jdk.jfr.internal.jfc.model.XmlInput;
+import jdk.jfr.internal.query.Report;
 import jdk.jfr.internal.util.Utils;
 
 /**
@@ -82,6 +85,7 @@ final class DCmdStart extends AbstractDCmd {
         Long flush = parser.getOption("flush-interval");
         Boolean dumpOnExit = parser.getOption("dumponexit");
         Boolean pathToGcRoots = parser.getOption("path-to-gc-roots");
+        List<String> reports = parser.getOption("report-on-exit");
 
         if (name != null) {
             try {
@@ -156,6 +160,7 @@ final class DCmdStart extends AbstractDCmd {
         if (duration != null && path == null) {
             path = resolvePath(recording, null).toString();
         }
+        PlatformRecording pr = PrivateAccess.getInstance().getPlatformRecording(recording);
 
         if (path != null) {
             try {
@@ -168,7 +173,6 @@ final class DCmdStart extends AbstractDCmd {
                     // Decide destination filename at dump time
                     // Purposely avoid generating filename in Recording#setDestination due to
                     // security concerns
-                    PlatformRecording pr = PrivateAccess.getInstance().getPlatformRecording(recording);
                     pr.setDumpDirectory(p);
                 } else {
                     dumpPath = resolvePath(recording, path);
@@ -185,8 +189,7 @@ final class DCmdStart extends AbstractDCmd {
         }
 
         if (flush != null) {
-            PlatformRecording p = PrivateAccess.getInstance().getPlatformRecording(recording);
-            p.setFlushInterval(Duration.ofNanos(flush));
+            pr.setFlushInterval(Duration.ofNanos(flush));
         }
 
         if (maxSize != null) {
@@ -201,6 +204,10 @@ final class DCmdStart extends AbstractDCmd {
             recording.setDumpOnExit(dumpOnExit);
         }
 
+        if (reports != null) {
+            addReports(pr, reports);
+        }
+
         if (delay != null) {
             Duration dDelay = Duration.ofNanos(delay);
             recording.scheduleStart(dDelay);
@@ -236,6 +243,20 @@ final class DCmdStart extends AbstractDCmd {
         }
     }
 
+    // Add report-on-exit for -XX:StartFlightRecording
+    @Override
+    protected Argument[] getParseArguments(String source) {
+        Argument[] argumentInfo = getArgumentInfos();;
+        if (!"internal".equals(source)) {
+            return argumentInfo;
+        }
+        Argument[] newArray = Arrays.copyOf(argumentInfo, argumentInfo.length + 1);
+        newArray[argumentInfo.length] = new Argument("report-on-exit",
+                "Display views on exit. See 'jfr help view' for available views to report.",
+                "STRING SET", false, true, null, true);
+        return newArray;
+    }
+
     private LinkedHashMap<String, String> configureStandard(String[] settings) throws DCmdException {
         LinkedHashMap<String, String> s = LinkedHashMap.newLinkedHashMap(settings.length);
         for (String configName : settings) {
@@ -248,6 +269,24 @@ final class DCmdStart extends AbstractDCmd {
         return s;
     }
 
+    private void addReports(PlatformRecording recording, List<String> reportNames) throws DCmdException {
+        if (!recording.isToDisk()) {
+            throw new DCmdException("Option report-on-exit can only be used when recording to disk.");
+        }
+        Map<String, Report> reportLookup = new HashMap<>();
+        for (Report report : Report.getReports()) {
+            reportLookup.put(report.name(), report);
+        }
+        for (String name : reportNames) {
+            Report report = reportLookup.get(name);
+            if (report != null) {
+                recording.addReport(report);
+            } else {
+                throw new DCmdException("Unknown view '" + name + "' specified for report-on-exit. Use 'jfr help view' to see a list of available views.");
+            }
+        }
+    }
+
     private LinkedHashMap<String, String> configureExtended(String[] settings, ArgumentParser parser) throws DCmdException {
         JFCModel model = new JFCModel(l -> logWarning(l));
         for (String setting : settings) {
@@ -322,6 +361,7 @@ final class DCmdStart extends AbstractDCmd {
             "$DELIMITER", ",",
             "$DELIMITER_NAME", "comma",
             "$DIRECTORY", exampleDirectory(),
+            "$REPORT_ON_EXIT", reportOnExit(),
             "$JFC_OPTIONS", jfcOptions()
         );
         return Utils.format(helpTemplate(), parameters).lines().toArray(String[]::new);
@@ -336,6 +376,7 @@ final class DCmdStart extends AbstractDCmd {
            "$DELIMITER", " ",
            "$DELIMITER_NAME", "whitespace",
            "$DIRECTORY", exampleDirectory(),
+           "$REPORT_ON_EXIT", "",
            "$JFC_OPTIONS", jfcOptions()
         );
         return Utils.format(helpTemplate(), parameters).lines().toArray(String[]::new);
@@ -404,7 +445,7 @@ final class DCmdStart extends AbstractDCmd {
                                   'profile', then the information collected includes the stack
                                   trace from where the potential leaking object was allocated.
                                   (BOOLEAN, false)
-
+                 $REPORT_ON_EXIT
                  settings         (Optional) Name of the settings file that identifies which events
                                   to record. To specify more than one file, use the settings
                                   parameter repeatedly. Include the path if the file is not in
@@ -456,6 +497,17 @@ final class DCmdStart extends AbstractDCmd {
                """;
     }
 
+    private static String reportOnExit() {
+        return
+        """
+
+          report-on-exit   Specifies the name of the view to display when the Java Virtual
+                           Machine (JVM) shuts down. This option is not available if the
+                           disk option is set to false. For a list of available views,
+                           see 'jfr help view'. By default, no report is generated.
+        """;
+    }
+
     private static String jfcOptions() {
         try {
             StringBuilder sb = new StringBuilder();
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/dcmd/DCmdView.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/dcmd/DCmdView.java
index 8d1c45b64c9..da70d30e62b 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/dcmd/DCmdView.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/dcmd/DCmdView.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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 @@ public class DCmdView extends AbstractDCmd {
             return;
         }
         Configuration configuration = new Configuration();
+        configuration.verboseTimespan = true;
         configuration.output = getOutput();
         configuration.endTime = Instant.now().minusSeconds(1);
         String view = parser.getOption("view");
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/dcmd/QueryRecording.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/dcmd/QueryRecording.java
index fa60079b522..9fa934d1b52 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/dcmd/QueryRecording.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/dcmd/QueryRecording.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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,7 @@ import jdk.jfr.internal.util.UserDataException;
  * Helper class that holds recording chunks alive during a query. It also helps
  * out with configuration shared by DCmdView and DCmdQuery
  */
-final class QueryRecording implements AutoCloseable {
+public final class QueryRecording implements AutoCloseable {
     private final long DEFAULT_MAX_SIZE = 32 * 1024 * 1024L;
     private final long DEFAULT_MAX_AGE = 60 * 10;
 
@@ -52,6 +52,16 @@ final class QueryRecording implements AutoCloseable {
     private final EventStream eventStream;
     private final Instant endTime;
 
+    public QueryRecording(Instant startTime, Instant endTime) throws IOException {
+        this.recorder = PrivateAccess.getInstance().getPlatformRecorder();
+        this.endTime = endTime;
+        this.chunks = acquireChunks(startTime);
+        if (chunks.isEmpty()) {
+            throw new IOException("No recording data found on disk.");
+        }
+        eventStream = makeStream(startTime);
+    }
+
     public QueryRecording(Configuration configuration, ArgumentParser parser) throws IOException, DCmdException, UserDataException {
         if (!FlightRecorder.isInitialized()) {
             throw new DCmdException("No recording data available. Start a recording with JFR.start.");
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/query/Configuration.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/query/Configuration.java
index eb325bc5e2b..8fd3c8d7125 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/query/Configuration.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/query/Configuration.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -83,6 +83,11 @@ public final class Configuration {
      */
     public boolean verboseHeaders;
 
+    /**
+     * If the timespan of the table or form should be printed.
+     */
+    public boolean verboseTimespan;
+
     /**
      * If the title of the table or form should be printed.
      */
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/query/QueryPrinter.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/query/QueryPrinter.java
index 35879de2c4d..0d0310dae5b 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/query/QueryPrinter.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/query/QueryPrinter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -118,7 +118,7 @@ public final class QueryPrinter {
                 out.println();
                 out.println("Execution: " + stopWatch.toString());
             }
-            if (configuration.startTime != null) {
+            if (configuration.verboseTimespan) {
                 String s = ValueFormatter.formatTimestamp(configuration.startTime);
                 String e = ValueFormatter.formatTimestamp(configuration.endTime);
                 out.println();
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/query/Report.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/query/Report.java
new file mode 100644
index 00000000000..43374fa598c
--- /dev/null
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/query/Report.java
@@ -0,0 +1,64 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute 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.internal.query;
+
+import java.io.IOException;
+import java.time.Instant;
+import java.util.List;
+
+import jdk.jfr.internal.LogLevel;
+import jdk.jfr.internal.LogTag;
+import jdk.jfr.internal.Logger;
+import jdk.jfr.internal.consumer.AbstractEventStream;
+import jdk.jfr.internal.dcmd.QueryRecording;
+import jdk.jfr.internal.util.Output.BufferedPrinter;
+import jdk.jfr.internal.util.UserDataException;
+import jdk.jfr.internal.util.UserSyntaxException;
+
+public record Report(String name) {
+
+    public static List<Report> getReports() {
+        return ViewFile.getDefault().getViewConfigurations() .stream().map(view -> new Report(view.name())).toList();
+    }
+
+    public void print(Instant startTime, Instant endTime) {
+        Logger.log(LogTag.JFR, LogLevel.DEBUG, "Writing report " + name);
+        BufferedPrinter output = new BufferedPrinter(System.out);
+        try (QueryRecording qr = new QueryRecording(startTime, endTime)) {
+            AbstractEventStream stream = (AbstractEventStream) qr.getStream();
+            stream.setWaitForChunks(false);
+            Configuration configuration = new Configuration();
+            configuration.startTime = startTime;
+            configuration.endTime = endTime;
+            configuration.output = output;
+            ViewPrinter printer = new ViewPrinter(configuration, stream);
+            printer.execute(name);
+            Logger.log(LogTag.JFR, LogLevel.DEBUG, "Report " + name + " written successfully.");
+        } catch (IOException | UserDataException | UserSyntaxException e) {
+            Logger.log(LogTag.JFR, LogLevel.WARN, "Error writing report " + name + " on exit: " + e.getMessage());
+        }
+        output.flush();
+    }
+}
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/query/ViewPrinter.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/query/ViewPrinter.java
index 57c38544b83..4c7ab651a7b 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/query/ViewPrinter.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/query/ViewPrinter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -218,7 +218,7 @@ public final class ViewPrinter {
     }
 
     private void printTimespan() {
-        if (configuration.startTime != null) {
+        if (configuration.verboseTimespan) {
             String start = ValueFormatter.formatTimestamp(configuration.startTime);
             String end = ValueFormatter.formatTimestamp(configuration.endTime);
             out.println();
diff --git a/test/jdk/jdk/jfr/startupargs/TestStartReportOnExit.java b/test/jdk/jdk/jfr/startupargs/TestStartReportOnExit.java
new file mode 100644
index 00000000000..c31366ec42e
--- /dev/null
+++ b/test/jdk/jdk/jfr/startupargs/TestStartReportOnExit.java
@@ -0,0 +1,114 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.jfr.startupargs;
+
+import java.nio.file.Files;
+import java.nio.file.Path;
+
+import jdk.jfr.consumer.RecordingFile;
+import jdk.test.lib.Asserts;
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.process.ProcessTools;
+
+/**
+ * @test
+ * @requires vm.flagless
+ * @requires vm.hasJFR
+ * @library /test/lib /test/jdk
+ * @run main jdk.jfr.startupargs.TestStartReportOnExit
+ */
+public class TestStartReportOnExit {
+
+    public static void main(String[] args) throws Exception {
+        testSingleReport();
+        testMultipleReports();
+        testMultipleRecordings();
+        testUnstopped();
+        testInvalidName();
+        testWithDump();
+        testWithMemory();
+    }
+
+    private static void testSingleReport() throws Exception {
+        OutputAnalyzer out = launch("-XX:StartFlightRecording:report-on-exit=jvm-information", "-version");
+        expectJVMInformation(out);
+        out.shouldHaveExitValue(0);
+    }
+
+    private static void testMultipleReports() throws Exception {
+        OutputAnalyzer out = launch("-XX:StartFlightRecording:report-on-exit=jvm-information,report-on-exit=system-properties", "-version");
+        expectJVMInformation(out);
+        expectSystemProperties(out);
+        out.shouldHaveExitValue(0);
+    }
+
+    private static void testMultipleRecordings() throws Exception {
+        OutputAnalyzer out = launch("-XX:StartFlightRecording:report-on-exit=jvm-information", "-XX:StartFlightRecording:report-on-exit=system-properties", "-version");
+        expectJVMInformation(out);
+        expectSystemProperties(out);
+        out.shouldHaveExitValue(0);
+    }
+
+    private static void testUnstopped() throws Exception {
+        OutputAnalyzer out = launch("-XX:StartFlightRecording:delay=20h,report-on-exit=jvm-information", "-version");
+        out.shouldNotContain("JVM Information");
+        out.shouldHaveExitValue(0);
+    }
+
+    private static void testInvalidName() throws Exception {
+        OutputAnalyzer out = launch("-XX:StartFlightRecording:report-on-exit=invalid", "-version");
+        out.shouldContain("Unknown view 'invalid' specified for report-on-exit");
+        out.shouldNotHaveExitValue(0);
+    }
+
+    private static void testWithDump() throws Exception {
+        Path path = Path.of("dump.jfr").toAbsolutePath();
+        OutputAnalyzer out = launch("-XX:StartFlightRecording:filename=" + path.toString() + ",report-on-exit=jvm-information", "-version");
+        expectJVMInformation(out);
+        out.shouldHaveExitValue(0);
+        RecordingFile.readAllEvents(path);
+    }
+
+    private static void testWithMemory() throws Exception {
+        OutputAnalyzer out = launch("-XX:StartFlightRecording:report-on-exit=jvm-information,disk=false", "-version");
+        out.shouldContain("Option report-on-exit can only be used when recording to disk.");
+        out.shouldNotHaveExitValue(0);
+    }
+
+    private static void expectJVMInformation(OutputAnalyzer out) throws Exception {
+        out.shouldContain("JVM Information");
+        out.shouldContain("PID:");
+        out.shouldContain("Program Arguments:");
+    }
+
+    private static void expectSystemProperties(OutputAnalyzer out) throws Exception {
+        out.shouldContain("System Properties at Startup");
+        out.shouldContain("java.vm.specification.name");
+    }
+
+    private static OutputAnalyzer launch(String... arguments) throws Exception {
+        ProcessBuilder pb = ProcessTools.createTestJavaProcessBuilder(arguments);
+        return ProcessTools.executeProcess(pb);
+    }
+}

From cd1be9175714186b8881a4d08628fdfcc9382bbc Mon Sep 17 00:00:00 2001
From: Alex Menkov <amenkov@openjdk.org>
Date: Thu, 13 Mar 2025 20:05:49 +0000
Subject: [PATCH 345/587] 8319055: JCMD should not buffer the whole output of
 commands

Reviewed-by: stuefe, jsjolen
---
 src/hotspot/os/posix/attachListener_posix.cpp |  16 +-
 .../os/windows/attachListener_windows.cpp     |  18 +-
 src/hotspot/share/services/attachListener.cpp | 316 +++++++++++++++---
 src/hotspot/share/services/attachListener.hpp |  72 ++--
 .../share/services/diagnosticFramework.cpp    |  18 +-
 .../share/services/diagnosticFramework.hpp    |  15 +-
 .../sun/tools/attach/VirtualMachineImpl.java  |   8 +-
 .../sun/tools/attach/VirtualMachineImpl.java  |   7 +-
 .../tools/attach/HotSpotVirtualMachine.java   | 100 +++++-
 .../sun/tools/attach/VirtualMachineImpl.java  |  20 +-
 .../AttachAPIv2/StreamingOutputTest.java      |  97 ++++++
 .../compiler/CodeHeapAnalyticsParams.java     |   8 +-
 12 files changed, 563 insertions(+), 132 deletions(-)
 create mode 100644 test/hotspot/jtreg/serviceability/attach/AttachAPIv2/StreamingOutputTest.java

diff --git a/src/hotspot/os/posix/attachListener_posix.cpp b/src/hotspot/os/posix/attachListener_posix.cpp
index 27728d0ca1f..a4bc49c6bf3 100644
--- a/src/hotspot/os/posix/attachListener_posix.cpp
+++ b/src/hotspot/os/posix/attachListener_posix.cpp
@@ -114,6 +114,7 @@ public:
 
   void close() {
     if (opened()) {
+      ::shutdown(_socket, SHUT_RDWR);
       ::close(_socket);
       _socket = -1;
     }
@@ -132,9 +133,8 @@ public:
     RESTARTABLE(::write(_socket, buffer, size), n);
     return checked_cast<int>(n);
   }
-  // called after writing all data
+
   void flush() override {
-    ::shutdown(_socket, SHUT_RDWR);
   }
 };
 
@@ -144,13 +144,16 @@ class PosixAttachOperation: public AttachOperation {
   SocketChannel _socket_channel;
 
  public:
+  PosixAttachOperation(int socket) : AttachOperation(), _socket_channel(socket) {}
+
   void complete(jint res, bufferedStream* st) override;
 
-  PosixAttachOperation(int socket) : AttachOperation(), _socket_channel(socket) {
+  ReplyWriter* get_reply_writer() override {
+    return &_socket_channel;
   }
 
   bool read_request() {
-    return AttachOperation::read_request(&_socket_channel, &_socket_channel);
+    return _socket_channel.read_request(this, &_socket_channel);
   }
 };
 
@@ -318,11 +321,6 @@ PosixAttachOperation* PosixAttachListener::dequeue() {
 // socket could be made non-blocking and a timeout could be used.
 
 void PosixAttachOperation::complete(jint result, bufferedStream* st) {
-  JavaThread* thread = JavaThread::current();
-  ThreadBlockInVM tbivm(thread);
-
-  write_reply(&_socket_channel, result, st);
-
   delete this;
 }
 
diff --git a/src/hotspot/os/windows/attachListener_windows.cpp b/src/hotspot/os/windows/attachListener_windows.cpp
index 4e6f39b8f81..2dbb0391290 100644
--- a/src/hotspot/os/windows/attachListener_windows.cpp
+++ b/src/hotspot/os/windows/attachListener_windows.cpp
@@ -92,6 +92,7 @@ public:
 
   void close() {
     if (opened()) {
+      FlushFileBuffers(_hPipe);
       CloseHandle(_hPipe);
       _hPipe = INVALID_HANDLE_VALUE;
     }
@@ -123,15 +124,13 @@ public:
                               &written,
                               nullptr);  // not overlapped
     if (!fSuccess) {
-        log_error(attach)("pipe write error (%d)", GetLastError());
-        return -1;
+      log_error(attach)("pipe write error (%d)", GetLastError());
+      return -1;
     }
     return (int)written;
   }
 
   void flush() override {
-    assert(opened(), "must be");
-    FlushFileBuffers(_hPipe);
   }
 };
 
@@ -151,11 +150,15 @@ public:
   }
 
   bool read_request() {
-    return AttachOperation::read_request(&_pipe, &_pipe);
+    return _pipe.read_request(this, &_pipe);
   }
 
 public:
   void complete(jint result, bufferedStream* result_stream) override;
+
+  ReplyWriter* get_reply_writer() override {
+    return &_pipe;
+  }
 };
 
 
@@ -432,11 +435,6 @@ Win32AttachOperation* Win32AttachListener::dequeue() {
 }
 
 void Win32AttachOperation::complete(jint result, bufferedStream* result_stream) {
-  JavaThread* thread = JavaThread::current();
-  ThreadBlockInVM tbivm(thread);
-
-  write_reply(&_pipe, result, result_stream);
-
   delete this;
 }
 
diff --git a/src/hotspot/share/services/attachListener.cpp b/src/hotspot/share/services/attachListener.cpp
index d08965c0b20..e3a6a034935 100644
--- a/src/hotspot/share/services/attachListener.cpp
+++ b/src/hotspot/share/services/attachListener.cpp
@@ -36,6 +36,7 @@
 #include "runtime/flags/jvmFlag.hpp"
 #include "runtime/globals.hpp"
 #include "runtime/handles.inline.hpp"
+#include "runtime/interfaceSupport.inline.hpp"
 #include "runtime/java.hpp"
 #include "runtime/javaCalls.hpp"
 #include "runtime/os.hpp"
@@ -47,10 +48,130 @@
 #include "utilities/debug.hpp"
 #include "utilities/formatBuffer.hpp"
 
+
+// Stream for printing attach operation results.
+// Supports buffered and streaming output for commands which can produce lengthy reply.
+//
+// A platform implementation supports streaming output if it implements AttachOperation::get_reply_writer().
+// Streaming is enabled if the allow_streaming in the constructor is set to true.
+//
+// Initially attachStream works in buffered mode.
+// To switch to the streaming mode attach command handler need to call attachStream::set_result().
+// The method flushes buffered output and consequent printing goes directly to ReplyWriter.
+class attachStream : public bufferedStream {
+  AttachOperation::ReplyWriter* _reply_writer;
+  const bool _allow_streaming;
+  enum class ResultState { Unset, Set, Written };
+  ResultState _result_state;
+  jint _result;
+  bool _error;
+
+  enum : size_t {
+    INITIAL_BUFFER_SIZE = 1 * M,
+    MAXIMUM_BUFFER_SIZE = 3 * G,
+  };
+
+  bool is_streaming() const {
+    return _result_state != ResultState::Unset && _allow_streaming;
+  }
+
+  void flush_reply() {
+    if (_error) {
+      return;
+    }
+
+    if (_result_state != ResultState::Written) {
+      if (_reply_writer->write_reply(_result, this)) {
+        _result_state = ResultState::Written;
+        reset();
+      } else {
+        _error = true;
+        return;
+      }
+    } else {
+      _error = !_reply_writer->write_fully(base(), (int)size());
+      reset();
+    }
+  }
+
+public:
+  attachStream(AttachOperation::ReplyWriter* reply_writer, bool allow_streaming)
+    : bufferedStream(INITIAL_BUFFER_SIZE, MAXIMUM_BUFFER_SIZE),
+      _reply_writer(reply_writer),
+      _allow_streaming(reply_writer == nullptr ? false : allow_streaming),
+      _result_state(ResultState::Unset), _result(JNI_OK),
+      _error(false)
+    {}
+
+  virtual ~attachStream() {}
+
+  void set_result(jint result) {
+    if (_result_state == ResultState::Unset) {
+      _result = result;
+      _result_state = ResultState::Set;
+      if (_allow_streaming) {
+        // switch to streaming mode
+        flush_reply();
+      }
+    }
+  }
+
+  jint get_result() const {
+    return _result;
+  }
+
+  bufferedStream* get_buffered_stream() {
+    return this;
+  }
+
+  // Called after the operation is completed.
+  // If reply_writer is provided, writes the results.
+  void complete() {
+    JavaThread* thread = JavaThread::current();
+    ThreadBlockInVM tbivm(thread);
+    flush_reply();
+  }
+
+  virtual void write(const char* str, size_t len) override {
+    if (is_streaming()) {
+      if (!_error) {
+        _error = !_reply_writer->write_fully(str, (int)len);
+      }
+    } else {
+      bufferedStream::write(str, len);
+    }
+  }
+
+  virtual void flush() override {
+    // flush if streaming output is enabled
+    if (_allow_streaming) {
+      flush_reply();
+    } else {
+      bufferedStream::flush();
+    }
+  }
+};
+
+// Attach operation handler.
+// Handler can set operation result in 2 ways:
+// - return the result;
+// - call out->set_result();
+//   this turns on streaming output, returned value is ignored.
+typedef jint(*AttachOperationFunction)(AttachOperation* op, attachStream* out);
+
+struct AttachOperationFunctionInfo {
+    const char* name;
+    AttachOperationFunction func;
+};
+
+
 volatile AttachListenerState AttachListener::_state = AL_NOT_INITIALIZED;
 
 AttachAPIVersion AttachListener::_supported_version = ATTACH_API_V1;
 
+// Default is false (if jdk.attach.vm.streaming property is not set).
+bool AttachListener::_default_streaming_output = false;
+
 static bool get_bool_sys_prop(const char* name, bool default_value, TRAPS) {
   ResourceMark rm(THREAD);
   HandleMark hm(THREAD);
@@ -95,7 +216,7 @@ static InstanceKlass* load_and_initialize_klass(Symbol* sh, TRAPS) {
   return ik;
 }
 
-static jint get_properties(AttachOperation* op, outputStream* out, Symbol* serializePropertiesMethod) {
+static jint get_properties(AttachOperation* op, attachStream* out, Symbol* serializePropertiesMethod) {
   JavaThread* THREAD = JavaThread::current(); // For exception macros.
   HandleMark hm(THREAD);
 
@@ -131,16 +252,17 @@ static jint get_properties(AttachOperation* op, outputStream* out, Symbol* seria
   assert(res->is_typeArray(), "just checking");
   assert(TypeArrayKlass::cast(res->klass())->element_type() == T_BYTE, "just checking");
 
+  out->set_result(JNI_OK);
+
   // copy the bytes to the output stream
   typeArrayOop ba = typeArrayOop(res);
   jbyte* addr = typeArrayOop(res)->byte_at_addr(0);
   out->print_raw((const char*)addr, ba->length());
-
   return JNI_OK;
 }
 
 // Implementation of "load" command.
-static jint load_agent(AttachOperation* op, outputStream* out) {
+static jint load_agent(AttachOperation* op, attachStream* out) {
   // get agent name and options
   const char* agent = op->arg(0);
   const char* absParam = op->arg(1);
@@ -176,12 +298,12 @@ static jint load_agent(AttachOperation* op, outputStream* out) {
 
 // Implementation of "properties" command.
 // See also: PrintSystemPropertiesDCmd class
-static jint get_system_properties(AttachOperation* op, outputStream* out) {
+static jint get_system_properties(AttachOperation* op, attachStream* out) {
   return get_properties(op, out, vmSymbols::serializePropertiesToByteArray_name());
 }
 
 // Implementation of "agent_properties" command.
-static jint get_agent_properties(AttachOperation* op, outputStream* out) {
+static jint get_agent_properties(AttachOperation* op, attachStream* out) {
   return get_properties(op, out, vmSymbols::serializeAgentPropertiesToByteArray_name());
 }
 
@@ -192,7 +314,8 @@ static jint get_agent_properties(AttachOperation* op, outputStream* out) {
 // JVMTI environment that has enabled this event. However it's useful to
 // trigger the SIGBREAK handler.
 
-static jint data_dump(AttachOperation* op, outputStream* out) {
+static jint data_dump(AttachOperation* op, attachStream* out) {
+  out->set_result(JNI_OK); // allow streaming output
   if (!ReduceSignalUsage) {
     AttachListener::pd_data_dump();
   } else {
@@ -206,7 +329,7 @@ static jint data_dump(AttachOperation* op, outputStream* out) {
 // Implementation of "threaddump" command - essentially a remote ctrl-break
 // See also: ThreadDumpDCmd class
 //
-static jint thread_dump(AttachOperation* op, outputStream* out) {
+static jint thread_dump(AttachOperation* op, attachStream* out) {
   bool print_concurrent_locks = false;
   bool print_extended_info = false;
   if (op->arg(0) != nullptr) {
@@ -220,6 +343,8 @@ static jint thread_dump(AttachOperation* op, outputStream* out) {
     }
   }
 
+  out->set_result(JNI_OK); // allow streaming output
+
   // thread stacks and JNI global handles
   VM_PrintThreads op1(out, print_concurrent_locks, print_extended_info, true /* print JNI handle info */);
   VMThread::execute(&op1);
@@ -233,12 +358,46 @@ static jint thread_dump(AttachOperation* op, outputStream* out) {
 
 // A jcmd attach operation request was received, which will now
 // dispatch to the diagnostic commands used for serviceability functions.
-static jint jcmd(AttachOperation* op, outputStream* out) {
+static jint jcmd(AttachOperation* op, attachStream* out) {
   JavaThread* THREAD = JavaThread::current(); // For exception macros.
+
   // All the supplied jcmd arguments are stored as a single
   // string (op->arg(0)). This is parsed by the Dcmd framework.
-  DCmd::parse_and_execute(DCmd_Source_AttachAPI, out, op->arg(0), ' ', THREAD);
+
+  // Overridden DCmd::Executor to switch output to "streaming" mode
+  // before execute the command.
+
+  bool allow_streaming_output = true;
+  // Special case for ManagementAgent.start and ManagementAgent.start_local commands
+  // used by HotSpotVirtualMachine.startManagementAgent and startLocalManagementAgent.
+  // The commands report error if the agent failed to load, so we need to disable streaming output.
+  const char* jmx_prefix = "ManagementAgent.";
+  if (strncmp(op->arg(0), jmx_prefix, strlen(jmx_prefix)) == 0) {
+    allow_streaming_output = false;
+  }
+
+  class Executor: public DCmd::Executor {
+  private:
+    attachStream* _attach_stream;
+    const bool _allow_streaming_output;
+  public:
+    Executor(DCmdSource source, attachStream* out, bool allow_streaming_output)
+        : DCmd::Executor(source, out), _attach_stream(out), _allow_streaming_output(allow_streaming_output) {}
+  protected:
+    virtual void execute(DCmd* command, TRAPS) override {
+      if (_allow_streaming_output) {
+          _attach_stream->set_result(JNI_OK);
+      }
+      DCmd::Executor::execute(command, CHECK);
+    }
+  } executor(DCmd_Source_AttachAPI, out, allow_streaming_output);
+
+  executor.parse_and_execute(op->arg(0), ' ', THREAD);
   if (HAS_PENDING_EXCEPTION) {
+    // We can get an exception during command execution.
+    // In the case _attach_stream->set_result() is already called and the operation result code
+    // is sent to the client.
+    // Repeated out->set_result() is a no-op, just report exception message.
     java_lang_Throwable::print(PENDING_EXCEPTION, out);
     out->cr();
     CLEAR_PENDING_EXCEPTION;
@@ -254,7 +413,7 @@ static jint jcmd(AttachOperation* op, outputStream* out) {
 //   arg0: Name of the dump file
 //   arg1: "-live" or "-all"
 //   arg2: Compress level
-static jint dump_heap(AttachOperation* op, outputStream* out) {
+static jint dump_heap(AttachOperation* op, attachStream* out) {
   const char* path = op->arg(0);
   if (path == nullptr || path[0] == '\0') {
     out->print_cr("No dump file specified");
@@ -281,6 +440,7 @@ static jint dump_heap(AttachOperation* op, outputStream* out) {
       }
     }
 
+    out->set_result(JNI_OK); // allow streaming output
     // Request a full GC before heap dump if live_objects_only = true
     // This helps reduces the amount of unreachable objects in the dump
     // and makes it easier to browse.
@@ -297,7 +457,7 @@ static jint dump_heap(AttachOperation* op, outputStream* out) {
 //   arg0: "-live" or "-all"
 //   arg1: Name of the dump file or null
 //   arg2: parallel thread number
-static jint heap_inspection(AttachOperation* op, outputStream* out) {
+static jint heap_inspection(AttachOperation* op, attachStream* out) {
   bool live_objects_only = true;   // default is true to retain the behavior before this change is made
   outputStream* os = out;   // if path not specified or path is null, use out
   fileStream* fs = nullptr;
@@ -332,6 +492,8 @@ static jint heap_inspection(AttachOperation* op, outputStream* out) {
     parallel_thread_num = num == 0 ? parallel_thread_num : num;
   }
 
+  out->set_result(JNI_OK);
+
   VM_GC_HeapInspection heapop(os, live_objects_only /* request full gc */, parallel_thread_num);
   VMThread::execute(&heapop);
   if (os != nullptr && os != out) {
@@ -342,7 +504,7 @@ static jint heap_inspection(AttachOperation* op, outputStream* out) {
 }
 
 // Implementation of "setflag" command
-static jint set_flag(AttachOperation* op, outputStream* out) {
+static jint set_flag(AttachOperation* op, attachStream* out) {
 
   const char* name = nullptr;
   if ((name = op->arg(0)) == nullptr) {
@@ -366,7 +528,7 @@ static jint set_flag(AttachOperation* op, outputStream* out) {
 
 // Implementation of "printflag" command
 // See also: PrintVMFlagsDCmd class
-static jint print_flag(AttachOperation* op, outputStream* out) {
+static jint print_flag(AttachOperation* op, attachStream* out) {
   const char* name = nullptr;
   if ((name = op->arg(0)) == nullptr) {
     out->print_cr("flag name is missing");
@@ -383,8 +545,14 @@ static jint print_flag(AttachOperation* op, outputStream* out) {
 }
 
 // Implementation of "getversion" command
-static jint get_version(AttachOperation* op, outputStream* out) {
+static jint get_version(AttachOperation* op, attachStream* out) {
   out->print("%d", (int)AttachListener::get_supported_version());
+
+  const char* arg0 = op->arg(0);
+  if (strcmp(arg0, "options") == 0) {
+      // print supported options: "option1,option2..."
+      out->print(" streaming");
+  }
   return JNI_OK;
 }
 
@@ -419,10 +587,17 @@ void AttachListenerThread::thread_entry(JavaThread* thread, TRAPS) {
   assert(thread->stack_base() != nullptr && thread->stack_size() > 0,
          "Should already be setup");
 
+  AttachListener::set_default_streaming(
+      get_bool_sys_prop("jdk.attach.vm.streaming",
+                        AttachListener::get_default_streaming(),
+                        thread));
+  log_debug(attach)("default streaming output: %d", AttachListener::get_default_streaming() ? 1 : 0);
+
   if (AttachListener::pd_init() != 0) {
     AttachListener::set_state(AL_NOT_INITIALIZED);
     return;
   }
+
   AttachListener::set_initialized();
 
   for (;;) {
@@ -433,14 +608,7 @@ void AttachListenerThread::thread_entry(JavaThread* thread, TRAPS) {
     }
 
     ResourceMark rm;
-    // jcmd output can get lengthy. As long as we miss jcmd continuous streaming output
-    // and instead just send the output in bulk, make sure large command output does not
-    // cause asserts. We still retain a max cap, but dimensioned in a way that makes it
-    // highly unlikely we should ever hit it under normal conditions.
-    constexpr size_t initial_size = 1 * M;
-    constexpr size_t max_size = 3 * G;
-    bufferedStream st(initial_size, max_size);
-    jint res = JNI_OK;
+    attachStream st(op->get_reply_writer(), op->streaming_output());
 
     // handle special detachall operation
     if (strcmp(op->name(), AttachOperation::detachall_operation_name()) == 0) {
@@ -458,16 +626,22 @@ void AttachListenerThread::thread_entry(JavaThread* thread, TRAPS) {
       }
 
       if (info != nullptr) {
+        log_debug(attach)("executing command %s, streaming output: %d (supported by impl: %d)",
+                         op->name(),
+                         op->streaming_output() ? 1 : 0,
+                         op->get_reply_writer() != nullptr ? 1 : 0);
         // dispatch to the function that implements this operation
-        res = (info->func)(op, &st);
+        // If the operation handler hasn't set result by using st.set_result(), set it now.
+        // If the result is already set, this is no-op.
+        st.set_result(info->func(op, &st));
       } else {
+        st.set_result(JNI_ERR);
         st.print("Operation %s not recognized!", op->name());
-        res = JNI_ERR;
       }
+      st.complete();
     }
 
-    // operation complete - send result and output to client
-    op->complete(res, &st);
+    op->complete(st.get_result(), st.get_buffered_stream());
   }
 
   ShouldNotReachHere();
@@ -559,7 +733,7 @@ int AttachOperation::RequestReader::read_uint(bool may_be_empty) {
 // buffer_size: maximum data size;
 // min_str_count: minimum number of strings in the request (name + arguments);
 // min_read_size: minimum data size.
-bool AttachOperation::read_request_data(AttachOperation::RequestReader* reader,
+bool AttachOperation::RequestReader::read_request_data(AttachOperation* op,
                                         int buffer_size, int min_str_count, int min_read_size) {
   char* buffer = (char*)os::malloc(buffer_size, mtServiceability);
   int str_count = 0;
@@ -568,7 +742,7 @@ bool AttachOperation::read_request_data(AttachOperation::RequestReader* reader,
 
   // Read until all (expected) strings or expected bytes have been read, the buffer is full, or EOF.
   do {
-    int n = reader->read(buffer + off, left);
+    int n = read(buffer + off, left);
     if (n < 0) {
       os::free(buffer);
       return false;
@@ -600,15 +774,24 @@ bool AttachOperation::read_request_data(AttachOperation::RequestReader* reader,
   }
 
   // Parse request.
-  // Command name is the 1st string.
-  set_name(buffer);
+  // Arguments start at 2nd string. Save it now (option parser can modify 1st argument).
+  char* arguments = strchr(buffer, '\0') + 1;
+  // The first string contains command name and (possibly) options.
+  char* end_of_name = strchr(buffer, ' ');
+
+  if (end_of_name != nullptr) {
+    parse_options(op, end_of_name + 1);
+    // zero-terminate command name
+    *end_of_name = '\0';
+  }
+  op->set_name(buffer);
   log_debug(attach)("read request: cmd = %s", buffer);
 
   // Arguments.
   char* end = buffer + off;
-  for (char* cur = strchr(buffer, '\0') + 1; cur < end; cur = strchr(cur, '\0') + 1) {
+  for (char* cur = arguments; cur < end; cur = strchr(cur, '\0') + 1) {
     log_debug(attach)("read request: arg = %s", cur);
-    append_arg(cur);
+    op->append_arg(cur);
   }
 
   os::free(buffer);
@@ -616,8 +799,48 @@ bool AttachOperation::read_request_data(AttachOperation::RequestReader* reader,
   return true;
 }
 
-bool AttachOperation::read_request(RequestReader* reader, ReplyWriter* error_writer) {
-  int ver = reader->read_uint(true); // do not log error if this is "empty" connection
+void AttachOperation::RequestReader::parse_options(AttachOperation* op, char* str) {
+  while (*str != '\0') {
+    char *name, *value;
+    str = get_option(str, &name, &value);
+    log_debug(attach)("option: %s, value: %s", name, value);
+
+    // handle known options
+    if (strcmp(name, "streaming") == 0) {
+      if (strcmp(value, "1") == 0) {
+        op->set_streaming_output(true);
+      } else if (strcmp(value, "0") == 0) {
+        op->set_streaming_output(false);
+      }
+    }
+  }
+}
+
+char* AttachOperation::RequestReader::get_option(char* src, char** name, char** value) {
+  static char empty[] = "";
+  // "option1=value1,option2=value2..."
+  *name = src;
+  char* end_of_option = strchr(src, ',');
+  if (end_of_option != nullptr) {
+    // terminate the option
+    *end_of_option = '\0';
+    // set to next option
+    src = end_of_option + 1;
+  } else {
+    src = empty;
+  }
+  char* delim = strchr(*name, '=');
+
+  if (delim != nullptr) {
+    // terminate option name
+    *delim = '\0';
+  }
+  *value = delim == nullptr ? empty : (delim + 1);
+  return src;
+}
+
+bool AttachOperation::RequestReader::read_request(AttachOperation* op, ReplyWriter* error_writer) {
+  int ver = read_uint(true); // do not log error if this is "empty" connection
   if (ver < 0) {
     return false;
   }
@@ -635,12 +858,12 @@ bool AttachOperation::read_request(RequestReader* reader, ReplyWriter* error_wri
   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 or disabled");
-        write_reply(error_writer, ATTACH_ERROR_BADVERSION, "v2 is unsupported or disabled");
+        error_writer->write_reply(ATTACH_ERROR_BADVERSION, "v2 is unsupported or disabled");
         return false;
     }
 
     // read size of the data
-    buffer_size = reader->read_uint();
+    buffer_size = read_uint();
     if (buffer_size < 0) {
       log_error(attach)("Failed to read request: negative request size (%d)", buffer_size);
       return false;
@@ -657,20 +880,20 @@ bool AttachOperation::read_request(RequestReader* reader, ReplyWriter* error_wri
     break;
   default:
     log_error(attach)("Failed to read request: unknown version (%d)", ver);
-    write_reply(error_writer, ATTACH_ERROR_BADVERSION, "unknown version");
+    error_writer->write_reply(ATTACH_ERROR_BADVERSION, "unknown version");
     return false;
   }
 
-  bool result = read_request_data(reader, buffer_size, min_str_count, min_read_size);
+  bool result = read_request_data(op, buffer_size, min_str_count, min_read_size);
   if (result && ver == ATTACH_API_V1) {
     // We know the whole request does not exceed buffer_size,
     // for v1 also name/arguments should not exceed name_length_max/arg_length_max.
-    if (strlen(name()) > AttachOperation::name_length_max) {
+    if (strlen(op->name()) > AttachOperation::name_length_max) {
       log_error(attach)("Failed to read request: operation name is too long");
       return false;
     }
-    for (int i = 0; i < arg_count(); i++) {
-      if (strlen(arg(i)) > AttachOperation::arg_length_max) {
+    for (int i = 0; i < op->arg_count(); i++) {
+      if (strlen(op->arg(i)) > AttachOperation::arg_length_max) {
         log_error(attach)("Failed to read request: operation argument is too long");
         return false;
       }
@@ -692,23 +915,22 @@ bool AttachOperation::ReplyWriter::write_fully(const void* buffer, int size) {
   return true;
 }
 
-bool AttachOperation::write_reply(ReplyWriter * writer, jint result, const char* message, int message_len) {
+bool AttachOperation::ReplyWriter::write_reply(jint result, const char* message, int message_len) {
   if (message_len < 0) {
     message_len = (int)strlen(message);
   }
   char buf[32];
   os::snprintf_checked(buf, sizeof(buf), "%d\n", result);
-  if (!writer->write_fully(buf, (int)strlen(buf))) {
+  if (!write_fully(buf, (int)strlen(buf))) {
     return false;
   }
-  if (!writer->write_fully(message, message_len)) {
+  if (!write_fully(message, message_len)) {
     return false;
   }
-  writer->flush();
   return true;
 }
 
-bool AttachOperation::write_reply(ReplyWriter* writer, jint result, bufferedStream* result_stream) {
-  return write_reply(writer, result, result_stream->base(), (int)result_stream->size());
+bool AttachOperation::ReplyWriter::write_reply(jint result, bufferedStream* result_stream) {
+  return write_reply(result, result_stream->base(), (int)result_stream->size());
 }
 
diff --git a/src/hotspot/share/services/attachListener.hpp b/src/hotspot/share/services/attachListener.hpp
index c98491b6ec6..31be87184c1 100644
--- a/src/hotspot/share/services/attachListener.hpp
+++ b/src/hotspot/share/services/attachListener.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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,16 +44,8 @@
 // properties names and values to the output stream). When the function
 // complets the result value and any result data is returned to the client
 // tool.
-
 class AttachOperation;
 
-typedef jint (*AttachOperationFunction)(AttachOperation* op, outputStream* out);
-
-struct AttachOperationFunctionInfo {
-  const char* name;
-  AttachOperationFunction func;
-};
-
 enum AttachListenerState {
   AL_NOT_INITIALIZED,
   AL_INITIALIZING,
@@ -68,6 +60,13 @@ Version 2 (since jdk24): attach operations may have any number of arguments of a
   To detect if target VM supports version 2, client sends "getversion" command.
   Old VM reports "Operation not recognized" error, newer VM reports version supported by the implementation.
   If the target VM does not support version 2, client uses version 1 to enqueue operations.
+jdk25 update: client may specify additional options in the attach operation request.
+  The options are passed as part of the operation command name: "command option1,option2,option3".
+  "getversion" command with "options" argument returns list of comma-separated options
+  supported by the target VM.
+  Option "streaming":
+    - "streaming=1" turns on streaming output. Output data are sent as they become available.
+    - "streaming=0" turns off streaming output. Output is buffered and sent after the operation is complete.
 */
 enum AttachAPIVersion: int {
   ATTACH_API_V1 = 1,
@@ -110,10 +109,19 @@ class AttachListener: AllStatic {
 
   static AttachAPIVersion _supported_version;
 
+  static bool _default_streaming_output;
+
  public:
   static void set_supported_version(AttachAPIVersion version);
   static AttachAPIVersion get_supported_version();
 
+  static void set_default_streaming(bool value) {
+    _default_streaming_output = value;
+  }
+  static bool get_default_streaming() {
+    return _default_streaming_output;
+  }
+
   static void set_state(AttachListenerState new_state) {
     Atomic::store(&_state, new_state);
   }
@@ -176,6 +184,7 @@ public:
 private:
   char* _name;
   GrowableArrayCHeap<char*, mtServiceability> _args;
+  bool _streaming; // streaming output is requested
 
   static char* copy_str(const char* value) {
     return value == nullptr ? nullptr : os::strdup(value, mtServiceability);
@@ -198,8 +207,7 @@ public:
   const char* arg(int i) const {
     // Historically clients expect empty string for absent or null arguments.
     if (i >= _args.length() || _args.at(i) == nullptr) {
-      static char empty_str[] = "";
-      return empty_str;
+      return "";
     }
     return _args.at(i);
   }
@@ -214,15 +222,22 @@ public:
     _args.at_put_grow(i, copy_str(arg), nullptr);
   }
 
+  bool streaming_output() const {
+    return _streaming;
+  }
+  void set_streaming_output(bool value) {
+    _streaming = value;
+  }
+
   // create an v1 operation of a given name (for compatibility, deprecated)
-  AttachOperation(const char* name) : _name(nullptr) {
+  AttachOperation(const char* name) : _name(nullptr), _streaming(AttachListener::get_default_streaming()) {
     set_name(name);
     for (int i = 0; i < arg_count_max; i++) {
       set_arg(i, nullptr);
     }
   }
 
-  AttachOperation() : _name(nullptr) {
+  AttachOperation() : _name(nullptr), _streaming(AttachListener::get_default_streaming()) {
   }
 
   virtual ~AttachOperation() {
@@ -250,11 +265,22 @@ public:
     // In that case we get "premature EOF" error.
     // If may_be_empty is true, the error is not logged.
     int read_uint(bool may_be_empty = false);
+
+
+    // Reads standard operation request (v1 or v2), sets properties of the provided AttachOperation.
+    // Some errors known by clients are reported to error_writer.
+    bool read_request(AttachOperation* op, ReplyWriter* error_writer);
+
+  private:
+    bool read_request_data(AttachOperation* op, int buffer_size, int min_str_count, int min_read_size);
+    // Parses options.
+    // Note: the buffer is modified to zero-terminate option names and values.
+    void parse_options(AttachOperation* op, char* str);
+    // Gets option name and value.
+    // Returns pointer to the next option.
+    char* get_option(char* src, char** name, char** value);
   };
 
-  // Reads standard operation request (v1 or v2).
-  // Some errors known by clients are reported to error_writer.
-  bool read_request(RequestReader* reader, ReplyWriter* error_writer);
 
   class ReplyWriter {
   public:
@@ -264,14 +290,16 @@ public:
     virtual void flush() {}
 
     bool write_fully(const void* buffer, int size);
+
+    // Writes standard operation reply.
+    bool write_reply(jint result, const char* message, int message_len = -1);
+    bool write_reply(jint result, bufferedStream* result_stream);
   };
 
-  // Writes standard operation reply (to be called from 'complete' method).
-  bool write_reply(ReplyWriter* writer, jint result, const char* message, int message_len = -1);
-  bool write_reply(ReplyWriter* writer, jint result, bufferedStream* result_stream);
-
-private:
-  bool read_request_data(AttachOperation::RequestReader* reader, int buffer_size, int min_str_count, int min_read_size);
+  // Platform implementation needs to implement the method to support streaming output.
+  virtual ReplyWriter* get_reply_writer() {
+    return nullptr;
+  }
 
 };
 
diff --git a/src/hotspot/share/services/diagnosticFramework.cpp b/src/hotspot/share/services/diagnosticFramework.cpp
index 47284cd9c05..7cf41750f5d 100644
--- a/src/hotspot/share/services/diagnosticFramework.cpp
+++ b/src/hotspot/share/services/diagnosticFramework.cpp
@@ -379,15 +379,14 @@ GrowableArray<DCmdArgumentInfo*>* DCmdParser::argument_info_array() const {
 DCmdFactory* DCmdFactory::_DCmdFactoryList = nullptr;
 bool DCmdFactory::_has_pending_jmx_notification = false;
 
-void DCmd::parse_and_execute(DCmdSource source, outputStream* out,
-                             const char* cmdline, char delim, TRAPS) {
+void DCmd::Executor::parse_and_execute(const char* cmdline, char delim, TRAPS) {
 
   if (cmdline == nullptr) return; // Nothing to do!
   DCmdIter iter(cmdline, '\n');
 
   int count = 0;
   while (iter.has_next()) {
-    if(source == DCmd_Source_MBean && count > 0) {
+    if (_source == DCmd_Source_MBean && count > 0) {
       // When diagnostic commands are invoked via JMX, each command line
       // must contains one and only one command because of the Permission
       // checks performed by the DiagnosticCommandMBean
@@ -408,16 +407,25 @@ void DCmd::parse_and_execute(DCmdSource source, outputStream* out,
         line = updated_cmd;
       }
 
-      DCmd* command = DCmdFactory::create_local_DCmd(source, line, out, CHECK);
+      DCmd* command = DCmdFactory::create_local_DCmd(_source, line, _out, CHECK);
       assert(command != nullptr, "command error must be handled before this line");
       DCmdMark mark(command);
       command->parse(&line, delim, CHECK);
-      command->execute(source, CHECK);
+      execute(command, CHECK);
     }
     count++;
   }
 }
 
+void DCmd::Executor::execute(DCmd* command, TRAPS) {
+  command->execute(_source, CHECK);
+}
+
+void DCmd::parse_and_execute(DCmdSource source, outputStream* out,
+                             const char* cmdline, char delim, TRAPS) {
+  Executor(source, out).parse_and_execute(cmdline, delim, CHECK);
+}
+
 bool DCmd::reorder_help_cmd(CmdLine line, stringStream &updated_line) {
   stringStream args;
   args.print("%s", line.args_addr());
diff --git a/src/hotspot/share/services/diagnosticFramework.hpp b/src/hotspot/share/services/diagnosticFramework.hpp
index 16a7ecbe48e..bd45780e1e5 100644
--- a/src/hotspot/share/services/diagnosticFramework.hpp
+++ b/src/hotspot/share/services/diagnosticFramework.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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,6 +278,19 @@ public:
     return array;
   }
 
+  // helper class to invoke the framework
+  class Executor : public StackObj {
+    DCmdSource _source;
+    outputStream* _out;
+  public:
+    Executor(DCmdSource source, outputStream* out): _source(source), _out(out) {}
+
+    void parse_and_execute(const char* cmdline, char delim, TRAPS);
+
+  protected:
+    virtual void execute(DCmd* command, TRAPS);
+  };
+
   // main method to invoke the framework
   static void parse_and_execute(DCmdSource source, outputStream* out, const char* cmdline,
                                 char delim, TRAPS);
diff --git a/src/jdk.attach/linux/classes/sun/tools/attach/VirtualMachineImpl.java b/src/jdk.attach/linux/classes/sun/tools/attach/VirtualMachineImpl.java
index 52cfd97d7c2..820af57ec37 100644
--- a/src/jdk.attach/linux/classes/sun/tools/attach/VirtualMachineImpl.java
+++ b/src/jdk.attach/linux/classes/sun/tools/attach/VirtualMachineImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -56,7 +56,7 @@ public class VirtualMachineImpl extends HotSpotVirtualMachine {
     private static final Path ROOT_TMP = Path.of("root/tmp");
 
     String socket_path;
-    private int ver = VERSION_1;        // updated in ctor depending on detectVersion result
+    private OperationProperties props = new OperationProperties(VERSION_1); // updated in ctor
 
     /**
      * Attaches to the target VM
@@ -124,7 +124,7 @@ public class VirtualMachineImpl extends HotSpotVirtualMachine {
         checkPermissions(socket_path);
 
         if (isAPIv2Enabled()) {
-            ver = detectVersion();
+            props = getDefaultProps();
         } else {
             // Check that we can connect to the process
             // - this ensures we throw the permission denied error now rather than
@@ -178,7 +178,7 @@ public class VirtualMachineImpl extends HotSpotVirtualMachine {
         // connected - write request
         try {
             SocketOutputStream writer = new SocketOutputStream(s);
-            writeCommand(writer, ver, cmd, args);
+            writeCommand(writer, props, cmd, args);
         } catch (IOException x) {
             ioe = x;
         }
diff --git a/src/jdk.attach/macosx/classes/sun/tools/attach/VirtualMachineImpl.java b/src/jdk.attach/macosx/classes/sun/tools/attach/VirtualMachineImpl.java
index e869c08cd91..ad6bc14d91d 100644
--- a/src/jdk.attach/macosx/classes/sun/tools/attach/VirtualMachineImpl.java
+++ b/src/jdk.attach/macosx/classes/sun/tools/attach/VirtualMachineImpl.java
@@ -48,7 +48,7 @@ public class VirtualMachineImpl extends HotSpotVirtualMachine {
     // Any changes to this needs to be synchronized with HotSpot.
     private static final String tmpdir;
     String socket_path;
-    private int ver = VERSION_1;        // updated in ctor depending on detectVersion result
+    private OperationProperties props = new OperationProperties(VERSION_1); // updated in ctor
 
     /**
      * Attaches to the target VM
@@ -109,7 +109,7 @@ public class VirtualMachineImpl extends HotSpotVirtualMachine {
         checkPermissions(socket_path);
 
         if (isAPIv2Enabled()) {
-            ver = detectVersion();
+            props = getDefaultProps();
         } else {
             // Check that we can connect to the process
             // - this ensures we throw the permission denied error now rather than
@@ -161,10 +161,9 @@ public class VirtualMachineImpl extends HotSpotVirtualMachine {
         IOException ioe = null;
 
         // connected - write request
-        // <ver> <cmd> <args...>
         try {
             SocketOutputStream writer = new SocketOutputStream(s);
-            writeCommand(writer, ver, cmd, args);
+            writeCommand(writer, props, cmd, args);
         } catch (IOException x) {
             ioe = x;
         }
diff --git a/src/jdk.attach/share/classes/sun/tools/attach/HotSpotVirtualMachine.java b/src/jdk.attach/share/classes/sun/tools/attach/HotSpotVirtualMachine.java
index ace00100aab..e0ac0edda51 100644
--- a/src/jdk.attach/share/classes/sun/tools/attach/HotSpotVirtualMachine.java
+++ b/src/jdk.attach/share/classes/sun/tools/attach/HotSpotVirtualMachine.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -38,6 +38,8 @@ import java.io.InputStream;
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.security.PrivilegedAction;
+import java.util.HashMap;
+import java.util.Map;
 import java.util.Properties;
 import java.util.stream.Collectors;
 
@@ -57,11 +59,17 @@ public abstract class HotSpotVirtualMachine extends VirtualMachine {
     }
 
     private static final boolean ALLOW_ATTACH_SELF;
+    private static final boolean ALLOW_STREAMING_OUTPUT;
     static {
         String s = VM.getSavedProperty("jdk.attach.allowAttachSelf");
         ALLOW_ATTACH_SELF = "".equals(s) || Boolean.parseBoolean(s);
+        // For now the default is false.
+        String s2 = VM.getSavedProperty("jdk.attach.allowStreamingOutput");
+        ALLOW_STREAMING_OUTPUT = "".equals(s2) || Boolean.parseBoolean(s2);
     }
 
+    private final boolean selfAttach;
+
     HotSpotVirtualMachine(AttachProvider provider, String id)
         throws AttachNotSupportedException, IOException
     {
@@ -74,9 +82,10 @@ public abstract class HotSpotVirtualMachine extends VirtualMachine {
             throw new AttachNotSupportedException("Invalid process identifier: " + id);
         }
 
+        selfAttach = pid == 0 || pid == CURRENT_PID;
         // The tool should be a different VM to the target. This check will
         // eventually be enforced by the target VM.
-        if (!ALLOW_ATTACH_SELF && (pid == 0 || pid == CURRENT_PID)) {
+        if (!ALLOW_ATTACH_SELF && selfAttach) {
             throw new IOException("Can not attach to current VM");
         }
     }
@@ -331,27 +340,67 @@ public abstract class HotSpotVirtualMachine extends VirtualMachine {
     protected static final int VERSION_1 = 1;
     protected static final int VERSION_2 = 2;
 
+    // Attach operation properties.
+    protected static class OperationProperties {
+        public final static String STREAMING = "streaming";
+
+        private int ver;
+        private Map<String, String> options = new HashMap<>();
+
+        OperationProperties(int ver) {
+            this.ver = ver;
+        }
+
+        int version() {
+            return ver;
+        }
+
+        void setOption(String name, String value) {
+            options.put(name, value);
+        }
+
+        String options() {
+            return options.entrySet().stream()
+                          .map(e -> e.getKey() + "=" + e.getValue())
+                          .collect(Collectors.joining(","));
+        }
+    }
+
     /*
-     * Detects Attach API version supported by target VM.
+     * Detects Attach API properties supported by target VM.
      */
-    protected int detectVersion() throws IOException {
+    protected OperationProperties getDefaultProps() throws IOException {
         try {
-            InputStream reply = execute("getversion");
+            InputStream reply = execute("getversion", "options");
             String message = readMessage(reply);
             reply.close();
-            try {
-                int supportedVersion = Integer.parseUnsignedInt(message);
-                // we expect only VERSION_2
-                if (supportedVersion == VERSION_2) {
-                    return VERSION_2;
+
+            // Reply is "<ver> option1,option2...".
+            int delimPos = message.indexOf(' ');
+            String ver = delimPos < 0 ? message : message.substring(0, delimPos);
+
+            int supportedVersion = Integer.parseUnsignedInt(ver);
+
+            // VERSION_2 supports options.
+            if (supportedVersion == VERSION_2) {
+                OperationProperties result = new OperationProperties(supportedVersion);
+                // Parse known options, ignore unknown.
+                String options = delimPos < 0 ? "" : message.substring(delimPos + 1);
+                String[] parts = options.split(",");
+                for (String s: parts) {
+                    if (OperationProperties.STREAMING.equals(s)) {
+                        result.setOption(OperationProperties.STREAMING,
+                                         (isStreamingEnabled() ? "1" : "0"));
+                    }
                 }
-            } catch (NumberFormatException nfe) {
-                // bad reply - fallback to VERSION_1
+                return result;
             }
         } catch (AttachOperationFailedException | AgentLoadException ex) {
             // the command is not supported, the VM supports VERSION_1 only
+        } catch (NumberFormatException nfe) {
+            // bad version number - fallback to VERSION_1
         }
-        return VERSION_1;
+        return new OperationProperties(VERSION_1);
     }
 
     /*
@@ -362,6 +411,17 @@ public abstract class HotSpotVirtualMachine extends VirtualMachine {
         return !Boolean.getBoolean("jdk.attach.compat");
     }
 
+    /*
+     * Streaming output.
+     */
+    protected boolean isStreamingEnabled() {
+        // Disable streaming for self-attach.
+        if (selfAttach) {
+            return false;
+        }
+        return ALLOW_STREAMING_OUTPUT;
+    }
+
     /*
      * Utility method to read an 'int' from the input stream. Ideally
      * we should be using java.util.Scanner here but this implementation
@@ -478,9 +538,15 @@ public abstract class HotSpotVirtualMachine extends VirtualMachine {
         writer.write(b, 0, 1);
     }
 
-    protected void writeCommand(AttachOutputStream writer, int ver, String cmd, Object ... args) throws IOException {
-        writeString(writer, ver);
-        if (ver == VERSION_2) {
+    protected void writeCommand(AttachOutputStream writer, OperationProperties props,
+                                String cmd, Object ... args) throws IOException {
+        writeString(writer, props.version());
+        if (props.version() == VERSION_2) {
+            // add options to the command name (if specified)
+            String options = props.options();
+            if (!options.isEmpty()) {
+                cmd += " " + options;
+            }
             // for v2 write size of the data
             int size = dataSize(cmd);
             for (Object arg: args) {
@@ -490,7 +556,7 @@ public abstract class HotSpotVirtualMachine extends VirtualMachine {
         }
         writeString(writer, cmd);
         // v1 commands always write 3 arguments
-        int argNumber = ver == VERSION_1 ? 3 : args.length;
+        int argNumber = props.version() == VERSION_1 ? 3 : args.length;
         for (int i = 0; i < argNumber; i++) {
             writeString(writer, i < args.length ? args[i] : null);
         }
diff --git a/src/jdk.attach/windows/classes/sun/tools/attach/VirtualMachineImpl.java b/src/jdk.attach/windows/classes/sun/tools/attach/VirtualMachineImpl.java
index f344be99ccb..b04d476b0a4 100644
--- a/src/jdk.attach/windows/classes/sun/tools/attach/VirtualMachineImpl.java
+++ b/src/jdk.attach/windows/classes/sun/tools/attach/VirtualMachineImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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,7 @@ public class VirtualMachineImpl extends HotSpotVirtualMachine {
     private static byte[] stub;
 
     private volatile long hProcess;     // handle to the process
-    private int ver = VERSION_1;        // updated in ctor depending on detectVersion result
+    private OperationProperties props = new OperationProperties(VERSION_1); // updated in ctor
 
     VirtualMachineImpl(AttachProvider provider, String id)
         throws AttachNotSupportedException, IOException
@@ -55,7 +55,7 @@ public class VirtualMachineImpl extends HotSpotVirtualMachine {
 
         try {
             if (isAPIv2Enabled()) {
-                ver = detectVersion();
+                props = getDefaultProps();
             } else {
                 // The target VM might be a pre-6.0 VM so we enqueue a "null" command
                 // which minimally tests that the enqueue function exists in the target
@@ -88,12 +88,12 @@ public class VirtualMachineImpl extends HotSpotVirtualMachine {
         String pipename = pipeprefix + r;
         long hPipe;
         try {
-            hPipe = createPipe(ver, pipename);
+            hPipe = createPipe(props.version(), pipename);
         } catch (IOException ce) {
             // Retry with another random pipe name.
             r = rnd.nextInt();
             pipename = pipeprefix + r;
-            hPipe = createPipe(ver, pipename);
+            hPipe = createPipe(props.version(), pipename);
         }
 
         // check if we are detached - in theory it's possible that detach is invoked
@@ -105,11 +105,11 @@ public class VirtualMachineImpl extends HotSpotVirtualMachine {
 
         try {
             // enqueue the command to the process.
-            if (ver == VERSION_1) {
-                enqueue(hProcess, stub, ver, cmd, pipename, args);
+            if (props.version() == VERSION_1) {
+                enqueue(hProcess, stub, props.version(), cmd, pipename, args);
             } else {
                 // for v2 operations request contains only pipe name.
-                enqueue(hProcess, stub, ver, null, pipename);
+                enqueue(hProcess, stub, props.version(), null, pipename);
             }
 
             // wait for the target VM to connect to the pipe.
@@ -117,11 +117,11 @@ public class VirtualMachineImpl extends HotSpotVirtualMachine {
 
             IOException ioe = null;
 
-            if (ver == VERSION_2) {
+            if (props.version() == VERSION_2) {
                 PipeOutputStream writer = new PipeOutputStream(hPipe);
 
                 try {
-                    writeCommand(writer, ver, cmd, args);
+                    writeCommand(writer, props, cmd, args);
                 } catch (IOException x) {
                     ioe = x;
                 }
diff --git a/test/hotspot/jtreg/serviceability/attach/AttachAPIv2/StreamingOutputTest.java b/test/hotspot/jtreg/serviceability/attach/AttachAPIv2/StreamingOutputTest.java
new file mode 100644
index 00000000000..7c5c8bcc630
--- /dev/null
+++ b/test/hotspot/jtreg/serviceability/attach/AttachAPIv2/StreamingOutputTest.java
@@ -0,0 +1,97 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact 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 Sanity test for streaming output support
+ * @bug 8319055
+ * @library /test/lib
+ * @modules jdk.attach/sun.tools.attach
+ *
+ * @run main/othervm -Djdk.attach.allowStreamingOutput=true StreamingOutputTest
+ * @run main/othervm -Djdk.attach.allowStreamingOutput=false StreamingOutputTest
+ */
+
+import java.io.BufferedReader;
+import java.io.InputStreamReader;
+import java.io.IOException;
+
+import com.sun.tools.attach.VirtualMachine;
+import sun.tools.attach.HotSpotVirtualMachine;
+
+import jdk.test.lib.apps.LingeredApp;
+
+public class StreamingOutputTest {
+
+    public static void main(String[] args) throws Exception {
+        boolean clientStreaming = System.getProperty("jdk.attach.allowStreamingOutput").equals("true");
+        test(clientStreaming, false);
+        test(clientStreaming, true);
+    }
+
+    private static void test(boolean clientStreaming, boolean vmStreaming) throws Exception {
+        System.out.println("Testing: clientStreaming=" + clientStreaming + ", vmStreaming=" + vmStreaming);
+        LingeredApp app = null;
+        try {
+            app = LingeredApp.startApp("-Xlog:attach=trace",
+                                       "-Djdk.attach.vm.streaming=" + String.valueOf(vmStreaming));
+            attach(app);
+        } finally {
+            LingeredApp.stopApp(app);
+        }
+
+        verify(clientStreaming, vmStreaming, app.getProcessStdout());
+
+        System.out.println("Testing: end");
+        System.out.println();
+    }
+
+    private static void attach(LingeredApp app) throws Exception {
+        HotSpotVirtualMachine vm = (HotSpotVirtualMachine)VirtualMachine.attach(String.valueOf(app.getPid()));
+        try {
+            try (BufferedReader replyReader = new BufferedReader(
+                    new InputStreamReader(vm.setFlag("HeapDumpPath", "the_path")))) {
+                System.out.println("vm.setFlag reply:");
+                String line;
+                while ((line = replyReader.readLine()) != null) {
+                    System.out.println("setFlag reply: " + line);
+                }
+            }
+        } finally {
+            vm.detach();
+        }
+    }
+
+    private static void verify(boolean clientStreaming, boolean vmStreaming, String out) throws Exception {
+        System.out.println("Target VM output:");
+        System.out.println(out);
+        String expected = "executing command setflag, streaming output: " + (clientStreaming ? "1" : "0");
+        if (!out.contains(expected)) {
+            throw new Exception("VM did not logged expected '" + expected + "'");
+        }
+        expected = "default streaming output: " + (vmStreaming ? "1" : "0");
+        if (!out.contains(expected)) {
+            throw new Exception("VM did not logged expected '" + expected + "'");
+        }
+    }
+}
diff --git a/test/hotspot/jtreg/serviceability/dcmd/compiler/CodeHeapAnalyticsParams.java b/test/hotspot/jtreg/serviceability/dcmd/compiler/CodeHeapAnalyticsParams.java
index 070a3edc7b9..5e1addcb298 100644
--- a/test/hotspot/jtreg/serviceability/dcmd/compiler/CodeHeapAnalyticsParams.java
+++ b/test/hotspot/jtreg/serviceability/dcmd/compiler/CodeHeapAnalyticsParams.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@ import jdk.test.lib.dcmd.PidJcmdExecutor;
 
 /*
  * @test CodeHeapAnalyticsParams
+ * @bug 8225388
  * @summary Test the Compiler.CodeHeap_Analytics command
  * @requires vm.flagless
  * @library /test/lib
@@ -38,7 +39,8 @@ public class CodeHeapAnalyticsParams {
     public static void main(String args[]) throws Exception {
         PidJcmdExecutor executor = new PidJcmdExecutor();
         executor.execute("Compiler.CodeHeap_Analytics all 1").shouldHaveExitValue(0);
-        executor.execute("Compiler.CodeHeap_Analytics all 0").shouldHaveExitValue(1);
-        executor.execute("Compiler.CodeHeap_Analytics all k").shouldHaveExitValue(1);
+        // invalid argument should report exception, and don't crash
+        executor.execute("Compiler.CodeHeap_Analytics all 0").shouldContain("IllegalArgumentException");
+        executor.execute("Compiler.CodeHeap_Analytics all k").shouldContain("IllegalArgumentException");
     }
 }

From aa047ee02472c65297cc8a153458e634c5e4f350 Mon Sep 17 00:00:00 2001
From: Phil Race <prr@openjdk.org>
Date: Thu, 13 Mar 2025 20:13:29 +0000
Subject: [PATCH 346/587] 8319192: Remove
 javax.swing.plaf.synth.SynthLookAndFeel.load(URL url)

Reviewed-by: azvegint, tr
---
 .../swing/plaf/synth/SynthLookAndFeel.java    | 51 +------------------
 .../javax/swing/plaf/synth/SynthParser.java   | 44 ++--------------
 .../plaf/synth/doc-files/synthFileFormat.html | 41 ++-------------
 3 files changed, 10 insertions(+), 126 deletions(-)

diff --git a/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthLookAndFeel.java b/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthLookAndFeel.java
index ca58ca7968b..6cb4803c65f 100644
--- a/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthLookAndFeel.java
+++ b/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthLookAndFeel.java
@@ -45,7 +45,6 @@ import java.io.Serial;
 import java.io.Serializable;
 import java.lang.ref.ReferenceQueue;
 import java.lang.ref.WeakReference;
-import java.net.URL;
 import java.text.ParseException;
 import java.util.HashMap;
 import java.util.Locale;
@@ -604,55 +603,7 @@ public class SynthLookAndFeel extends BasicLookAndFeel {
         }
 
         new SynthParser().parse(input, (DefaultSynthStyleFactory) factory,
-                                null, resourceBase, defaultsMap);
-    }
-
-    /**
-     * Loads the set of <code>SynthStyle</code>s that will be used by
-     * this <code>SynthLookAndFeel</code>. Path based resources are resolved
-     * relatively to the specified <code>URL</code> of the style. For example
-     * an <code>Image</code> would be resolved by
-     * <code>new URL(synthFile, path)</code>. Refer to
-     * <a href="doc-files/synthFileFormat.html">Synth File Format</a> for more
-     * information.
-     * <p>
-     * Whilst this API may be safe for loading local resources that are
-     * delivered with a {@code LookAndFeel} or application, and so have an
-     * equal level of trust with application code, using it to load from
-     * remote resources, particularly any which may have a lower level of
-     * trust, is strongly discouraged.
-     * The alternative mechanisms to load styles from an {@code InputStream}
-     * {@linkplain #load(InputStream, Class)}
-     * using resources co-located with the application or by providing a
-     * {@code SynthStyleFactory} to
-     * {@linkplain #setStyleFactory setStyleFactory(SynthStyleFactory)}
-     * are preferred.
-     * Consequently this method is deprecated and will be removed in a future
-     * release.
-     *
-     * @param url the <code>URL</code> to load the set of
-     *     <code>SynthStyle</code> from
-     * @throws ParseException if there is an error in parsing
-     * @throws IllegalArgumentException if synthSet is <code>null</code>
-     * @throws IOException if synthSet cannot be opened as an <code>InputStream</code>
-     * @since 1.6
-     * @deprecated Use {@link #load(InputStream, Class)} or
-     * {@link #setStyleFactory setStyleFactory(SynthStyleFactory)} instead
-     */
-    @Deprecated(since = "21", forRemoval = true)
-    public void load(URL url) throws ParseException, IOException {
-        if (url == null) {
-            throw new IllegalArgumentException(
-                "You must supply a valid Synth set URL");
-        }
-
-        if (defaultsMap == null) {
-            defaultsMap = new HashMap<String, Object>();
-        }
-
-        InputStream input = url.openStream();
-        new SynthParser().parse(input, (DefaultSynthStyleFactory) factory,
-                                url, null, defaultsMap);
+                                resourceBase, defaultsMap);
     }
 
     /**
diff --git a/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthParser.java b/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthParser.java
index 6334c0649bf..869460d59b8 100644
--- a/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthParser.java
+++ b/src/java.desktop/share/classes/javax/swing/plaf/synth/SynthParser.java
@@ -34,7 +34,6 @@ import java.awt.Toolkit;
 import java.io.BufferedInputStream;
 import java.io.IOException;
 import java.io.InputStream;
-import java.net.MalformedURLException;
 import java.net.URL;
 import java.net.URLClassLoader;
 import java.text.ParseException;
@@ -165,11 +164,6 @@ class SynthParser extends DefaultHandler {
      */
     private Map<String,Object> _mapping;
 
-    /**
-     * Based URL used to resolve paths.
-     */
-    private URL _urlResourceBase;
-
     /**
      * Based class used to resolve paths.
      */
@@ -213,26 +207,21 @@ class SynthParser extends DefaultHandler {
      *
      * @param inputStream XML document containing the styles to read
      * @param factory DefaultSynthStyleFactory that new styles are added to
-     * @param urlResourceBase the URL used to resolve any resources, such as Images
      * @param classResourceBase the Class used to resolve any resources, such as Images
      * @param defaultsMap Map that UIDefaults properties are placed in
      */
     public void parse(InputStream inputStream,
                       DefaultSynthStyleFactory factory,
-                      URL urlResourceBase, Class<?> classResourceBase,
+                      Class<?> classResourceBase,
                       Map<String, Object> defaultsMap)
                       throws ParseException, IllegalArgumentException {
-        if (inputStream == null || factory == null ||
-            (urlResourceBase == null && classResourceBase == null)) {
+        if (inputStream == null || factory == null || classResourceBase == null) {
             throw new IllegalArgumentException(
-                "You must supply an InputStream, StyleFactory and Class or URL");
+                "You must supply an InputStream, StyleFactory and Class");
         }
 
-        assert(!(urlResourceBase != null && classResourceBase != null));
-
         _factory = factory;
         _classResourceBase = classResourceBase;
-        _urlResourceBase = urlResourceBase;
         _defaultsMap = defaultsMap;
         try {
             try {
@@ -255,17 +244,7 @@ class SynthParser extends DefaultHandler {
      * Returns the path to a resource.
      */
     private URL getResource(String path) {
-        if (_classResourceBase != null) {
-            return _classResourceBase.getResource(path);
-        } else {
-            try {
-                @SuppressWarnings("deprecation")
-                var result = new URL(_urlResourceBase, path);
-                return result;
-            } catch (MalformedURLException mue) {
-                return null;
-            }
-        }
+        return _classResourceBase.getResource(path);
     }
 
     /**
@@ -294,20 +273,7 @@ class SynthParser extends DefaultHandler {
     private DocumentHandler getHandler() {
         if (_handler == null) {
             _handler = new DocumentHandler();
-            if (_urlResourceBase != null) {
-                // getHandler() is never called before parse() so it is safe
-                // to create a URLClassLoader with _resourceBase.
-                //
-                // getResource(".") is called to ensure we have the directory
-                // containing the resources in the case the resource base is a
-                // .class file.
-                URL[] urls = new URL[] { getResource(".") };
-                ClassLoader parent = Thread.currentThread().getContextClassLoader();
-                ClassLoader urlLoader = new URLClassLoader(urls, parent);
-                _handler.setClassLoader(urlLoader);
-            } else {
-                _handler.setClassLoader(_classResourceBase.getClassLoader());
-            }
+            _handler.setClassLoader(_classResourceBase.getClassLoader());
 
             for (String key : _mapping.keySet()) {
                 _handler.setVariable(key, _mapping.get(key));
diff --git a/src/java.desktop/share/classes/javax/swing/plaf/synth/doc-files/synthFileFormat.html b/src/java.desktop/share/classes/javax/swing/plaf/synth/doc-files/synthFileFormat.html
index b3c8118b404..87c5e747374 100644
--- a/src/java.desktop/share/classes/javax/swing/plaf/synth/doc-files/synthFileFormat.html
+++ b/src/java.desktop/share/classes/javax/swing/plaf/synth/doc-files/synthFileFormat.html
@@ -53,9 +53,7 @@ div.example {
       necessary to create your own look and feel. A synth file is
       loaded by way of the <A
         HREF="../../../../../javax/swing/plaf/synth/SynthLookAndFeel.html#load(java.io.InputStream,java.lang.Class)">
-      SynthLookAndFeel.load(InputStream, Class)</a> or
-      <a href="../../../../../javax/swing/plaf/synth/SynthLookAndFeel.html#load(java.net.URL)">
-        SynthLookAndFeel.load(URL)</a> methods.
+      SynthLookAndFeel.load(InputStream, Class)</a> method.
       The following example uses the <code>load</code> method to configure
       a <code>SynthLookAndFeel</code> and sets it as the current look
       and feel:
@@ -71,36 +69,6 @@ div.example {
       This example loads the look and feel from an input stream, using
       the specified class as the resource base to resolve paths.
     </p>
-    <p>
-      It is also possible to load a look and feel from an arbitrary URL
-      as in the following example.
-    </p>
-    <div class="example">
-      <pre>
-  SynthLookAndFeel laf = new SynthLookAndFeel();
-  laf.load(new URL("file:///C:/java/synth/laf/laf.xml"));
-  UIManager.setLookAndFeel(laf);
-      </pre>
-    </div>
-    <p>
-      The method <a
-        href="../../../../../javax/swing/plaf/synth/SynthLookAndFeel.html#load(java.net.URL)">
-      SynthLookAndFeel.load(URL)</a> can be used, for instance, to load a look
-      and feel from any of the following:
-    </p>
-    <ul>
-      <li>File, e.g. <code>file:///C:/java/synth/laf/laf.xml</code></li>
-      <li>Web server, e.g. <code>http://host/laf.xml</code></li>
-      <li>JAR file, e.g.
-        <code>jar:file:///C:/synth-laf.jar!/laf.xml</code></li>
-      <li>Remote JAR file, e.g.
-        <code>jar:http://host/synth-laf.jar!/laf.xml</code></li>
-    </ul>
-    <p>Note: Synth's file format allows for the definition of code to be executed.
-       Loading any code from a remote location should be used only
-       with extreme caution from a trusted source over a secure connection.
-       It is strongly discouraged for an application or a LookAndFeel to do so.
-    </p>
     <p>
       While the DTD for synth is specified, the parser is not validating.
       Parsing will fail only if a necessary attribute is not
@@ -880,10 +848,9 @@ div.example {
 	a direction or orientation. If this is not specified the image is
 	used for all directions.</dd>
       <dt><a id="imagePainter.path"><samp>path</samp></a></dt>
-      <dd>Path to the image.  If SynthLookAndFeel.load is
-    passed a Class this will use the Class method getResource (with the
-    Class supplied to the load method). If load is passed a URL this will use the
-    URL constructor URL(context, path) to resolve the path.</dd>
+      <dd>Path to the image.  SynthLookAndFeel.load 
+    will use the Class method getResource (with the
+    Class supplied to the load method) to resolve the path.
       <dt><a id="imagePainter.sourceInsets"><samp>sourceInsets</samp></a></dt>
       <dd>Insets on the source image. This is top, left, bottom, right with
 	each component separated by a space.</dd>

From 3da5e3fe10350f9bf0ff8c6b8d9aad3f50646364 Mon Sep 17 00:00:00 2001
From: Gennadiy Krivoshein <gennadiy.krivoshein@bell-sw.com>
Date: Thu, 13 Mar 2025 20:27:13 +0000
Subject: [PATCH 347/587] 8349350: Unable to print using InputSlot and
 OutputBin print attributes at the same time

Reviewed-by: prr, kizune, psadhukhan
---
 .../share/classes/sun/print/PSPrinterJob.java |   2 +-
 .../unix/classes/sun/print/UnixPrintJob.java  |   8 +-
 .../javax/print/PrintExecCmdOptionTest.java   | 101 +++++++++++
 .../javax/print/UnixPrintJobOptionsTest.java  | 163 ++++++++++++++++++
 4 files changed, 270 insertions(+), 4 deletions(-)
 create mode 100644 test/jdk/javax/print/PrintExecCmdOptionTest.java
 create mode 100644 test/jdk/javax/print/UnixPrintJobOptionsTest.java

diff --git a/src/java.desktop/share/classes/sun/print/PSPrinterJob.java b/src/java.desktop/share/classes/sun/print/PSPrinterJob.java
index 61af64a3d58..7404c6c3948 100644
--- a/src/java.desktop/share/classes/sun/print/PSPrinterJob.java
+++ b/src/java.desktop/share/classes/sun/print/PSPrinterJob.java
@@ -1579,7 +1579,7 @@ public class PSPrinterJob extends RasterPrinterJob {
         }
         if (options != null && !options.isEmpty()) {
             pFlags |= OPTIONS;
-            ncomps+=1;
+            ncomps+=options.trim().split(" ").length;
         }
         if (jobTitle != null && !jobTitle.isEmpty()) {
             pFlags |= JOBTITLE;
diff --git a/src/java.desktop/unix/classes/sun/print/UnixPrintJob.java b/src/java.desktop/unix/classes/sun/print/UnixPrintJob.java
index ffb3c68ecb7..3cd353141a4 100644
--- a/src/java.desktop/unix/classes/sun/print/UnixPrintJob.java
+++ b/src/java.desktop/unix/classes/sun/print/UnixPrintJob.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -836,7 +836,7 @@ public class UnixPrintJob implements CancelablePrintJob {
         }
         if (options != null && !options.isEmpty()) {
             pFlags |= OPTIONS;
-            ncomps+=1;
+            ncomps+=options.trim().split(" ").length;
         }
         if (jobTitle != null && !jobTitle.isEmpty()) {
             pFlags |= JOBTITLE;
@@ -871,7 +871,9 @@ public class UnixPrintJob implements CancelablePrintJob {
             execCmd[n++] = "-o job-sheets=standard";
         }
         if ((pFlags & OPTIONS) != 0) {
-            execCmd[n++] = "-o" + options;
+            for (String option : options.trim().split(" ")) {
+                execCmd[n++] = "-o " + option;
+            }
         }
         execCmd[n++] = spoolFile;
         if (IPPPrintService.debugPrint) {
diff --git a/test/jdk/javax/print/PrintExecCmdOptionTest.java b/test/jdk/javax/print/PrintExecCmdOptionTest.java
new file mode 100644
index 00000000000..61503af75d1
--- /dev/null
+++ b/test/jdk/javax/print/PrintExecCmdOptionTest.java
@@ -0,0 +1,101 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2025, BELLSOFT. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please 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.print.PrintService;
+import javax.print.PrintServiceLookup;
+import javax.print.attribute.HashPrintRequestAttributeSet;
+import javax.print.attribute.PrintRequestAttributeSet;
+import javax.print.attribute.standard.Media;
+import javax.print.attribute.standard.MediaTray;
+import javax.print.attribute.standard.OutputBin;
+import java.awt.Graphics;
+import java.awt.print.PageFormat;
+import java.awt.print.Printable;
+import java.awt.print.PrinterException;
+import java.awt.print.PrinterJob;
+
+/*
+ * @test
+ * @bug 8349350
+ * @key printer
+ * @summary no ArrayIndexOutOfBoundsException with multiple print options
+ * @run main PrintExecCmdOptionTest
+ */
+
+public class PrintExecCmdOptionTest {
+
+    public static void main(String[] args) throws PrinterException {
+        PrintService[] printServices = PrintServiceLookup.lookupPrintServices(null, null);
+        if (printServices.length == 0) {
+            System.out.println("No print service found");
+            return;
+        }
+
+        PrintService testPrintService = null;
+        OutputBin outputBin = null;
+        MediaTray mediaTray = null;
+        for (PrintService ps : printServices) {
+            mediaTray = null;
+            Media[] medias = (Media[]) ps.
+                    getSupportedAttributeValues(Media.class, null, null);
+            if (medias != null) {
+                for (Media m : medias) {
+                    if (m instanceof MediaTray) {
+                        mediaTray = (MediaTray) m;
+                        break;
+                    }
+                }
+            }
+            if (mediaTray == null) {
+                continue;
+            }
+            OutputBin[] outputBins = (OutputBin[]) ps.
+                    getSupportedAttributeValues(OutputBin.class, null, null);
+            if (outputBins != null && outputBins.length > 0) {
+                outputBin = outputBins[0];
+                testPrintService = ps;
+                break;
+            }
+        }
+        if (testPrintService == null) {
+            System.out.println("Test print service not found");
+            return;
+        }
+
+        PrinterJob printerJob = PrinterJob.getPrinterJob();
+        printerJob.setPrintService(testPrintService);
+
+        PrintRequestAttributeSet attributeSet = new HashPrintRequestAttributeSet();
+        attributeSet.add(outputBin);
+        attributeSet.add(mediaTray);
+
+        printerJob.setPrintable(new Printable() {
+            @Override
+            public int print(Graphics graphics, PageFormat pageFormat, int pageIndex) {
+                return NO_SUCH_PAGE;
+            }
+        });
+        printerJob.print(attributeSet);
+    }
+}
diff --git a/test/jdk/javax/print/UnixPrintJobOptionsTest.java b/test/jdk/javax/print/UnixPrintJobOptionsTest.java
new file mode 100644
index 00000000000..40ad6fffc74
--- /dev/null
+++ b/test/jdk/javax/print/UnixPrintJobOptionsTest.java
@@ -0,0 +1,163 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2025, BELLSOFT. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please 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.print.DocFlavor;
+import javax.print.DocPrintJob;
+import javax.print.PrintException;
+import javax.print.PrintService;
+import javax.print.PrintServiceLookup;
+import javax.print.SimpleDoc;
+import javax.print.attribute.HashDocAttributeSet;
+import javax.print.attribute.HashPrintRequestAttributeSet;
+import javax.print.attribute.PrintRequestAttribute;
+import javax.print.attribute.PrintRequestAttributeSet;
+import javax.print.attribute.standard.NumberUp;
+import javax.print.attribute.standard.OrientationRequested;
+import javax.print.attribute.standard.Sides;
+import java.io.ByteArrayOutputStream;
+import java.io.PrintStream;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.regex.Pattern;
+
+/*
+ * @test
+ * @bug 8349350
+ * @key printer
+ * @requires (os.family == "linux" | os.family == "mac")
+ * @summary lpr command syntax for options. lpr [ -o option[=value] ]
+ * @run main/manual/othervm -Dsun.print.ippdebug=true UnixPrintJobOptionsTest
+ */
+
+public class UnixPrintJobOptionsTest {
+
+    static final DocFlavor docFlavor = DocFlavor.STRING.TEXT_PLAIN;
+    static final List<Class<? extends PrintRequestAttribute>> requiredAttributes = new ArrayList<>();
+    static {
+        requiredAttributes.add(NumberUp.class);
+        requiredAttributes.add(OrientationRequested.class);
+        requiredAttributes.add(Sides.class);
+    }
+    static Map<PrintService,Class<? extends PrintRequestAttribute>[]> printerSupportedAttrs = new HashMap<>();
+
+    public static void main(String[] args) {
+        initializeTestPrintServices();
+        if (printerSupportedAttrs.isEmpty()) {
+            System.out.println("Print services not found");
+            return;
+        }
+
+        PrintStream origPrintStream = System.out;
+        ByteArrayOutputStream debugOutputStream = new ByteArrayOutputStream();
+        PrintStream printStream = new PrintStream(debugOutputStream);
+        System.setOut(printStream);
+        try {
+            if (!executeTest(debugOutputStream)) {
+                System.out.println("Acceptable print service not found");
+            }
+        } finally {
+            System.setOut(origPrintStream);
+            System.out.println(debugOutputStream.toString());
+        }
+    }
+
+    /**
+     * Tries to execute the test on one of the available print services
+     * @param debugOutputStream 'standard' output stream
+     * @return true - test was run and pass, false - test was not run
+     */
+    private static boolean executeTest(ByteArrayOutputStream debugOutputStream) {
+        for (PrintService testPrintService : printerSupportedAttrs.keySet()) {
+            String patternStr = "/usr/bin/lpr\\s+.*";
+            PrintRequestAttributeSet attributeSet = new HashPrintRequestAttributeSet();
+            for (Class<? extends PrintRequestAttribute> attrClass : printerSupportedAttrs.get(testPrintService)) {
+                Object supportedValues = testPrintService
+                        .getSupportedAttributeValues(attrClass, docFlavor, attributeSet);
+                if (supportedValues == null || ((Object[]) supportedValues).length == 0) {
+                    continue;
+                }
+                if (attrClass == NumberUp.class) {
+                    NumberUp numberUp = ((NumberUp[]) supportedValues)[0];
+                    patternStr = patternStr + "\\s-o number-up=" + numberUp.getValue();
+                    attributeSet.add(numberUp);
+                } else if (attrClass == OrientationRequested.class) {
+                    for (OrientationRequested orientationRequested : ((OrientationRequested[]) supportedValues)) {
+                        if (orientationRequested != OrientationRequested.PORTRAIT) {
+                            patternStr = patternStr + "\\s-o orientation-requested=" + orientationRequested.getValue();
+                            attributeSet.add(orientationRequested);
+                            break;
+                        }
+                    }
+                } else if (attrClass == Sides.class) {
+                    Sides s = ((Sides[]) supportedValues)[0];
+                    patternStr = patternStr + "\\s-o sides=" + s.toString();
+                    attributeSet.add(s);
+                }
+            }
+
+            if (attributeSet.size() < 2) {
+                continue;
+            }
+            System.out.println("Debug pattern: " + patternStr);
+            DocPrintJob docPrintJob = testPrintService.createPrintJob();
+            try {
+                docPrintJob.print(new SimpleDoc("UnixPrintJob options test",
+                        docFlavor, new HashDocAttributeSet()), attributeSet);
+            } catch (PrintException ex) {
+                throw new RuntimeException(ex);
+            }
+            String debug = debugOutputStream.toString();
+            Pattern pattern = Pattern.compile(patternStr);
+            if (!pattern.matcher(debug).find()) {
+                throw new RuntimeException("Output does not contain necessary options");
+            } else {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    private static void initializeTestPrintServices() {
+        PrintService[] printServices = PrintServiceLookup.lookupPrintServices(docFlavor, null);
+        if (printServices == null || printServices.length == 0) {
+            return;
+        }
+
+        List<Class<? extends PrintRequestAttribute>> printerAttrs;
+        for (PrintService ps : printServices) {
+            printerAttrs = new ArrayList<>();
+            for (Class<? extends PrintRequestAttribute> attr : requiredAttributes) {
+                if (ps.isAttributeCategorySupported(attr)) {
+                    printerAttrs.add(attr);
+                }
+            }
+            if (printerAttrs.size() > 1) {
+                printerSupportedAttrs.put(ps, printerAttrs.toArray(new Class[0]));
+            }
+        }
+    }
+
+}

From 7fc776e2ace920a3b1b319c021e6d3d440305b5e Mon Sep 17 00:00:00 2001
From: Daniel Gredler <dgredler@openjdk.org>
Date: Thu, 13 Mar 2025 20:27:27 +0000
Subject: [PATCH 348/587] 8270265: LineBreakMeasurer calculates incorrect line
 breaks with zero-width characters

Reviewed-by: achung, prr
---
 .../share/classes/sun/font/ExtendedTextSourceLabel.java  | 9 ++++-----
 src/java.desktop/share/native/libfontmanager/HBShaper.c  | 3 ++-
 .../share/native/libfontmanager/HBShaper_Panama.c        | 3 ++-
 src/java.desktop/share/native/libfontmanager/hb-jdk-p.h  | 4 +++-
 src/java.desktop/share/native/libfontmanager/hb-jdk.h    | 5 ++++-
 .../java/awt/font/TextLayout/FormatCharAdvanceTest.java  | 8 +++++++-
 6 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/src/java.desktop/share/classes/sun/font/ExtendedTextSourceLabel.java b/src/java.desktop/share/classes/sun/font/ExtendedTextSourceLabel.java
index 03022658c54..cb45be73f68 100644
--- a/src/java.desktop/share/classes/sun/font/ExtendedTextSourceLabel.java
+++ b/src/java.desktop/share/classes/sun/font/ExtendedTextSourceLabel.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -493,10 +493,9 @@ class ExtendedTextSourceLabel extends ExtendedTextLabel implements Decoration.La
     --start;
     while (width >= -epsilon && ++start < length) {
       int cidx = l2v(start) * numvals + advx;
-      if (cidx >= charinfo.length) {
-          break; // layout bailed for some reason
-      }
-      float adv = charinfo[cidx];
+      float adv = cidx < charinfo.length ?
+                  charinfo[cidx] : // layout provided info for this glyph
+                  0; // glyph info omitted, assume no advance
       if (adv != 0) {
           width -= adv + advTracking;
       }
diff --git a/src/java.desktop/share/native/libfontmanager/HBShaper.c b/src/java.desktop/share/native/libfontmanager/HBShaper.c
index ffb3419286d..1da79bd78ed 100644
--- a/src/java.desktop/share/native/libfontmanager/HBShaper.c
+++ b/src/java.desktop/share/native/libfontmanager/HBShaper.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -272,6 +272,7 @@ JNIEXPORT jboolean JNICALL Java_sun_font_SunLayoutEngine_shape
 
      buffer = hb_buffer_create();
      hb_buffer_set_script(buffer, getHBScriptCode(script));
+     hb_buffer_set_invisible_glyph(buffer, INVISIBLE_GLYPH_ID);
      hb_buffer_set_language(buffer,
                             hb_ot_tag_to_language(HB_OT_TAG_DEFAULT_LANGUAGE));
      if ((flags & TYPO_RTL) != 0) {
diff --git a/src/java.desktop/share/native/libfontmanager/HBShaper_Panama.c b/src/java.desktop/share/native/libfontmanager/HBShaper_Panama.c
index de067736c8c..f6f4c357c31 100644
--- a/src/java.desktop/share/native/libfontmanager/HBShaper_Panama.c
+++ b/src/java.desktop/share/native/libfontmanager/HBShaper_Panama.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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,6 +107,7 @@ JDKEXPORT void jdk_hb_shape(
 
      buffer = hb_buffer_create();
      hb_buffer_set_script(buffer, getHBScriptCode(script));
+     hb_buffer_set_invisible_glyph(buffer, INVISIBLE_GLYPH_ID);
      hb_buffer_set_language(buffer,
                             hb_ot_tag_to_language(HB_OT_TAG_DEFAULT_LANGUAGE));
      if ((flags & TYPO_RTL) != 0) {
diff --git a/src/java.desktop/share/native/libfontmanager/hb-jdk-p.h b/src/java.desktop/share/native/libfontmanager/hb-jdk-p.h
index 890e3cabdd9..47d36e8b02f 100644
--- a/src/java.desktop/share/native/libfontmanager/hb-jdk-p.h
+++ b/src/java.desktop/share/native/libfontmanager/hb-jdk-p.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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,8 @@
 extern "C" {
 #endif
 
+// Matches sun.font.CharToGlyphMapper.INVISIBLE_GLYPH_ID
+#define INVISIBLE_GLYPH_ID 0xffff
 
 hb_font_t* jdk_font_create_hbp(
                hb_face_t* face,
diff --git a/src/java.desktop/share/native/libfontmanager/hb-jdk.h b/src/java.desktop/share/native/libfontmanager/hb-jdk.h
index dc5788fc734..bf58bbf60e1 100644
--- a/src/java.desktop/share/native/libfontmanager/hb-jdk.h
+++ b/src/java.desktop/share/native/libfontmanager/hb-jdk.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -50,6 +50,9 @@ typedef struct JDKFontInfo_Struct {
 #define HBFloatToFixedScale ((float)(1 << 16))
 #define HBFloatToFixed(f) ((unsigned int)((f) * HBFloatToFixedScale))
 
+// Matches sun.font.CharToGlyphMapper.INVISIBLE_GLYPH_ID
+#define INVISIBLE_GLYPH_ID 0xffff
+
 /*
  * Note:
  *
diff --git a/test/jdk/java/awt/font/TextLayout/FormatCharAdvanceTest.java b/test/jdk/java/awt/font/TextLayout/FormatCharAdvanceTest.java
index d166a1b824b..b37f7e02707 100644
--- a/test/jdk/java/awt/font/TextLayout/FormatCharAdvanceTest.java
+++ b/test/jdk/java/awt/font/TextLayout/FormatCharAdvanceTest.java
@@ -23,7 +23,7 @@
 
 /**
  * @test
- * @bug 8208377 6562489
+ * @bug 8208377 6562489 8270265
  * @summary Confirm that format-category glyphs are not rendered or measured.
  */
 
@@ -275,6 +275,12 @@ public class FormatCharAdvanceTest {
         g2d.drawString(as2.getIterator(), w / 2, h / 2);
         ab2 = findTextBoundingBox(image).width;
         assertEqual(ab1, ab2, "drawString (using AttributedCharacterIterator)", c, font);
+
+        int max = metrics.stringWidth("AB") + 2; // add a little wiggle room to the max width
+        LineBreakMeasurer measurer1 = new LineBreakMeasurer(as1.getIterator(), frc);
+        LineBreakMeasurer measurer2 = new LineBreakMeasurer(as2.getIterator(), frc);
+        assertEqual(2, measurer1.nextOffset(max), "nextOffset 1", c, font);
+        assertEqual(7, measurer2.nextOffset(max), "nextOffset 2", c, font);
     }
 
     private static void assertEqual(int i1, int i2, String scenario, char c, Font font) {

From be36b234319f1ed89ea4f4ee29471b01c1dc89f2 Mon Sep 17 00:00:00 2001
From: Ioi Lam <iklam@openjdk.org>
Date: Thu, 13 Mar 2025 21:06:00 +0000
Subject: [PATCH 349/587] 8351778: JIT compiler fails when running
 -XX:AOTMode=create

Reviewed-by: shade, kvn, vlivanov
---
 src/hotspot/share/classfile/symbolTable.cpp | 32 +++++++--------------
 1 file changed, 11 insertions(+), 21 deletions(-)

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

From 0454406417701341dafa0d733cd480c145673d32 Mon Sep 17 00:00:00 2001
From: David Holmes <dholmes@openjdk.org>
Date: Thu, 13 Mar 2025 22:29:42 +0000
Subject: [PATCH 350/587] 8351987: ProblemList the failing JFR streaming tests
 on macOS

Reviewed-by: egahlin
---
 test/jdk/ProblemList.txt | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/test/jdk/ProblemList.txt b/test/jdk/ProblemList.txt
index 8e2a9e9e2ca..d954b95b520 100644
--- a/test/jdk/ProblemList.txt
+++ b/test/jdk/ProblemList.txt
@@ -757,6 +757,9 @@ jdk/jfr/event/compiler/TestCodeSweeper.java                     8338127 generic-
 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
+jdk/jfr/api/consumer/streaming/TestJVMCrash.java                8344671 macosx-all
+jdk/jfr/api/consumer/streaming/TestJVMExit.java                 8344671 macosx-all
+jdk/jfr/api/consumer/streaming/TestOutOfProcessMigration.java   8344671 macosx-all
 
 ############################################################################
 

From a7a09f69abc6c4730599d3de9067c2fde75c5172 Mon Sep 17 00:00:00 2001
From: Anjian-Wen <wenanjian@bytedance.com>
Date: Fri, 14 Mar 2025 05:53:04 +0000
Subject: [PATCH 351/587] =?UTF-8?q?8349632:=20RISC-V:=20Add=20Zfa=C2=A0fmi?=
 =?UTF-8?q?nm/fmaxm?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Reviewed-by: fyang
---
 src/hotspot/cpu/riscv/assembler_riscv.hpp | 20 ++++++++
 src/hotspot/cpu/riscv/riscv.ad            | 60 +++++++++++++++++++++++
 2 files changed, 80 insertions(+)

diff --git a/src/hotspot/cpu/riscv/assembler_riscv.hpp b/src/hotspot/cpu/riscv/assembler_riscv.hpp
index a08550b7137..8b4d013b0d7 100644
--- a/src/hotspot/cpu/riscv/assembler_riscv.hpp
+++ b/src/hotspot/cpu/riscv/assembler_riscv.hpp
@@ -1450,6 +1450,26 @@ enum operand_size { int8, int16, int32, uint32, int64 };
     fp_base<D_64_dp, 0b11110>(Rd, Rs1, 0b00001, 0b000);
   }
 
+  void fminm_s(FloatRegister Rd, FloatRegister Rs1, FloatRegister Rs2) {
+    assert_cond(UseZfa);
+    fp_base<S_32_sp, 0b00101>(Rd, Rs1, Rs2, 0b010);
+  }
+
+  void fmaxm_s(FloatRegister Rd, FloatRegister Rs1, FloatRegister Rs2) {
+    assert_cond(UseZfa);
+    fp_base<S_32_sp, 0b00101>(Rd, Rs1, Rs2, 0b011);
+  }
+
+  void fminm_d(FloatRegister Rd, FloatRegister Rs1, FloatRegister Rs2) {
+    assert_cond(UseZfa);
+    fp_base<D_64_dp, 0b00101>(Rd, Rs1, Rs2, 0b010);
+  }
+
+  void fmaxm_d(FloatRegister Rd, FloatRegister Rs1, FloatRegister Rs2) {
+    assert_cond(UseZfa);
+    fp_base<D_64_dp, 0b00101>(Rd, Rs1, Rs2, 0b011);
+  }
+
 // ==========================
 // RISC-V Vector Extension
 // ==========================
diff --git a/src/hotspot/cpu/riscv/riscv.ad b/src/hotspot/cpu/riscv/riscv.ad
index cecca0a5402..08b777085b1 100644
--- a/src/hotspot/cpu/riscv/riscv.ad
+++ b/src/hotspot/cpu/riscv/riscv.ad
@@ -7349,6 +7349,7 @@ instruct nmaddD_reg_reg(fRegD dst, fRegD src1, fRegD src2, fRegD src3) %{
 
 // Math.max(FF)F
 instruct maxF_reg_reg(fRegF dst, fRegF src1, fRegF src2, rFlagsReg cr) %{
+  predicate(!UseZfa);
   match(Set dst (MaxF src1 src2));
   effect(KILL cr);
 
@@ -7363,8 +7364,23 @@ instruct maxF_reg_reg(fRegF dst, fRegF src1, fRegF src2, rFlagsReg cr) %{
   ins_pipe(pipe_class_default);
 %}
 
+instruct maxF_reg_reg_zfa(fRegF dst, fRegF src1, fRegF src2) %{
+  predicate(UseZfa);
+  match(Set dst (MaxF src1 src2));
+
+  format %{ "maxF $dst, $src1, $src2" %}
+
+  ins_encode %{
+    __ fmaxm_s(as_FloatRegister($dst$$reg),
+               as_FloatRegister($src1$$reg), as_FloatRegister($src2$$reg));
+  %}
+
+  ins_pipe(pipe_class_default);
+%}
+
 // Math.min(FF)F
 instruct minF_reg_reg(fRegF dst, fRegF src1, fRegF src2, rFlagsReg cr) %{
+  predicate(!UseZfa);
   match(Set dst (MinF src1 src2));
   effect(KILL cr);
 
@@ -7379,8 +7395,23 @@ instruct minF_reg_reg(fRegF dst, fRegF src1, fRegF src2, rFlagsReg cr) %{
   ins_pipe(pipe_class_default);
 %}
 
+instruct minF_reg_reg_zfa(fRegF dst, fRegF src1, fRegF src2) %{
+  predicate(UseZfa);
+  match(Set dst (MinF src1 src2));
+
+  format %{ "minF $dst, $src1, $src2" %}
+
+  ins_encode %{
+    __ fminm_s(as_FloatRegister($dst$$reg),
+               as_FloatRegister($src1$$reg), as_FloatRegister($src2$$reg));
+  %}
+
+  ins_pipe(pipe_class_default);
+%}
+
 // Math.max(DD)D
 instruct maxD_reg_reg(fRegD dst, fRegD src1, fRegD src2, rFlagsReg cr) %{
+  predicate(!UseZfa);
   match(Set dst (MaxD src1 src2));
   effect(KILL cr);
 
@@ -7395,8 +7426,23 @@ instruct maxD_reg_reg(fRegD dst, fRegD src1, fRegD src2, rFlagsReg cr) %{
   ins_pipe(pipe_class_default);
 %}
 
+instruct maxD_reg_reg_zfa(fRegD dst, fRegD src1, fRegD src2) %{
+  predicate(UseZfa);
+  match(Set dst (MaxD src1 src2));
+
+  format %{ "maxD $dst, $src1, $src2" %}
+
+  ins_encode %{
+    __ fmaxm_d(as_FloatRegister($dst$$reg),
+               as_FloatRegister($src1$$reg), as_FloatRegister($src2$$reg));
+  %}
+
+  ins_pipe(pipe_class_default);
+%}
+
 // Math.min(DD)D
 instruct minD_reg_reg(fRegD dst, fRegD src1, fRegD src2, rFlagsReg cr) %{
+  predicate(!UseZfa);
   match(Set dst (MinD src1 src2));
   effect(KILL cr);
 
@@ -7411,6 +7457,20 @@ instruct minD_reg_reg(fRegD dst, fRegD src1, fRegD src2, rFlagsReg cr) %{
   ins_pipe(pipe_class_default);
 %}
 
+instruct minD_reg_reg_zfa(fRegD dst, fRegD src1, fRegD src2) %{
+  predicate(UseZfa);
+  match(Set dst (MinD src1 src2));
+
+  format %{ "minD $dst, $src1, $src2" %}
+
+  ins_encode %{
+    __ fminm_d(as_FloatRegister($dst$$reg),
+               as_FloatRegister($src1$$reg), as_FloatRegister($src2$$reg));
+  %}
+
+  ins_pipe(pipe_class_default);
+%}
+
 // Float.isInfinite
 instruct isInfiniteF_reg_reg(iRegINoSp dst, fRegF src)
 %{

From e3c29c9e6cff7648952c0ba359b0763a0ea8da18 Mon Sep 17 00:00:00 2001
From: Aleksey Shipilev <shade@openjdk.org>
Date: Fri, 14 Mar 2025 07:46:46 +0000
Subject: [PATCH 352/587] 8351556: Optimize
 Location.locationFor/isModuleOrientedLocation

Reviewed-by: liach, jlahoda
---
 .../classes/javax/tools/JavaFileManager.java  |  2 +-
 .../classes/javax/tools/StandardLocation.java | 65 ++++++++++----
 .../tools/javac/api/location/LocationFor.java | 85 +++++++++++++++++++
 .../bench/javax/tools/LocationFor.java        | 52 ++++++++++++
 .../bench/javax/tools/LocationProps.java      | 57 +++++++++++++
 5 files changed, 245 insertions(+), 16 deletions(-)
 create mode 100644 test/langtools/tools/javac/api/location/LocationFor.java
 create mode 100644 test/micro/org/openjdk/bench/javax/tools/LocationFor.java
 create mode 100644 test/micro/org/openjdk/bench/javax/tools/LocationProps.java

diff --git a/src/java.compiler/share/classes/javax/tools/JavaFileManager.java b/src/java.compiler/share/classes/javax/tools/JavaFileManager.java
index ef9b0be21a2..92c002fd3e7 100644
--- a/src/java.compiler/share/classes/javax/tools/JavaFileManager.java
+++ b/src/java.compiler/share/classes/javax/tools/JavaFileManager.java
@@ -170,7 +170,7 @@ public interface JavaFileManager extends Closeable, Flushable, OptionChecker {
          * @since 9
          */
         default boolean isModuleOrientedLocation() {
-            return getName().matches("\\bMODULE\\b");
+            return StandardLocation.computeIsModuleOrientedLocation(getName());
         }
     }
 
diff --git a/src/java.compiler/share/classes/javax/tools/StandardLocation.java b/src/java.compiler/share/classes/javax/tools/StandardLocation.java
index 389f3410f4e..92459d4cb24 100644
--- a/src/java.compiler/share/classes/javax/tools/StandardLocation.java
+++ b/src/java.compiler/share/classes/javax/tools/StandardLocation.java
@@ -27,7 +27,9 @@ package javax.tools;
 
 import javax.tools.JavaFileManager.Location;
 
+import java.util.Objects;
 import java.util.concurrent.*;
+import java.util.regex.Pattern;
 
 /**
  * Standard locations of file objects.
@@ -109,6 +111,22 @@ public enum StandardLocation implements Location {
      */
     PATCH_MODULE_PATH;
 
+    /**
+     * Canonical location instances.
+     */
+    private static final ConcurrentHashMap<String, Location> LOCATIONS = new ConcurrentHashMap<>();
+
+    private static class LazyPatternHolder {
+        /**
+         * Regexp that checks for the word "MODULE".
+         */
+        static final Pattern MODULE_WORD_PATTERN = Pattern.compile("\\bMODULE\\b");
+    }
+
+    /* package private */ static final boolean computeIsModuleOrientedLocation(String name) {
+        return LazyPatternHolder.MODULE_WORD_PATTERN.matcher(name).matches();
+    }
+
     /**
      * Returns a location object with the given name.  The following
      * property must hold: {@code locationFor(x) ==
@@ -122,23 +140,40 @@ public enum StandardLocation implements Location {
      * @return a location
      */
     public static Location locationFor(final String name) {
-        if (locations.isEmpty()) {
-            // can't use valueOf which throws IllegalArgumentException
-            for (Location location : values())
-                locations.putIfAbsent(location.getName(), location);
+        Objects.requireNonNull(name, "name");
+
+        // Check for immediate hit.
+        Location loc = LOCATIONS.get(name);
+        if (loc != null) {
+            return loc;
         }
-        name.getClass(); /* null-check */
-        locations.putIfAbsent(name, new Location() {
-                @Override
-                public String getName() { return name; }
-                @Override
-                public boolean isOutputLocation() { return name.endsWith("_OUTPUT"); }
-            });
-        return locations.get(name);
+
+        // Need to create the cache entry.
+        Location newLoc = null;
+
+        // See if this is one of the known Locations first.
+        for (Location location : values()) {
+            if (location.getName().equals(name)) {
+                newLoc = location;
+                break;
+            }
+        }
+
+        // Compute the fitting instance for unknown location, if needed.
+        if (newLoc == null) {
+            boolean isOutputLocation = name.endsWith("_OUTPUT");
+            boolean isModuleOrientedLocation = computeIsModuleOrientedLocation(name);
+            newLoc = new Location() {
+                @Override public String getName() { return name; }
+                @Override public boolean isOutputLocation() { return isOutputLocation; }
+                @Override public boolean isModuleOrientedLocation() { return isModuleOrientedLocation; }
+            };
+        }
+
+        // Thread-safe install.
+        Location exist = LOCATIONS.putIfAbsent(name, newLoc);
+        return (exist != null) ? exist : newLoc;
     }
-    //where
-        private static final ConcurrentMap<String,Location> locations
-            = new ConcurrentHashMap<>();
 
     @Override
     public String getName() { return name(); }
diff --git a/test/langtools/tools/javac/api/location/LocationFor.java b/test/langtools/tools/javac/api/location/LocationFor.java
new file mode 100644
index 00000000000..d3fdb29577d
--- /dev/null
+++ b/test/langtools/tools/javac/api/location/LocationFor.java
@@ -0,0 +1,85 @@
+/*
+ * 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
+ * @bug 8351556
+ * @summary Test Location.locationFor
+ * @modules java.compiler jdk.compiler
+ * @run main LocationFor
+ */
+
+import javax.tools.JavaFileManager.Location;
+import javax.tools.StandardLocation;
+
+public class LocationFor {
+
+    public static void main(String... args) throws Exception {
+        // Non-output, non-module location.
+        {
+            Location loc = StandardLocation.locationFor("MY_LOCATION");
+            assertFalse(loc.isOutputLocation());
+            assertFalse(loc.isModuleOrientedLocation());
+        }
+
+        // Output, non-module location.
+        {
+            Location loc = StandardLocation.locationFor("MY_LOCATION_OUTPUT");
+            assertTrue(loc.isOutputLocation());
+            assertFalse(loc.isModuleOrientedLocation());
+        }
+
+        // Non-output, module location.
+        {
+            Location loc = StandardLocation.locationFor("MODULE");
+            assertFalse(loc.isOutputLocation());
+            assertTrue(loc.isModuleOrientedLocation());
+        }
+
+        // Output, module location.
+        if (false) { // JDK-8351561
+            Location loc = StandardLocation.locationFor("MODULE_OUTPUT");
+            assertTrue(loc.isOutputLocation());
+            assertTrue(loc.isModuleOrientedLocation());
+        }
+
+        // Test standard locations identity.
+        for (Location loc : StandardLocation.values()) {
+            Location cached = StandardLocation.locationFor(loc.getName());
+            assertTrue(loc == cached);
+        }
+    }
+
+    private static void assertFalse(boolean cond) {
+        if (cond) {
+            throw new AssertionError("Assertion failed");
+        }
+    }
+
+    private static void assertTrue(boolean cond) {
+        if (!cond) {
+            throw new AssertionError("Assertion failed");
+        }
+    }
+
+}
diff --git a/test/micro/org/openjdk/bench/javax/tools/LocationFor.java b/test/micro/org/openjdk/bench/javax/tools/LocationFor.java
new file mode 100644
index 00000000000..1140bf65b84
--- /dev/null
+++ b/test/micro/org/openjdk/bench/javax/tools/LocationFor.java
@@ -0,0 +1,52 @@
+/*
+ * Copyright Amazon.com Inc. or its affiliates. All Rights Reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package org.openjdk.bench.javax.tools;
+
+import org.openjdk.jmh.annotations.*;
+import org.openjdk.jmh.infra.Blackhole;
+
+import java.util.concurrent.TimeUnit;
+import javax.tools.JavaFileManager.Location;
+import javax.tools.StandardLocation;
+
+@Warmup(iterations = 3, time = 1)
+@Measurement(iterations = 3, time = 1)
+@Fork(3)
+@BenchmarkMode(Mode.AverageTime)
+@OutputTimeUnit(TimeUnit.NANOSECONDS)
+@State(Scope.Thread)
+public class LocationFor {
+
+    @Benchmark
+    public void standard(Blackhole bh) {
+        for (Location loc : StandardLocation.values()) {
+            bh.consume(StandardLocation.locationFor(loc.getName()));
+        }
+    }
+
+    @Benchmark
+    public Location custom() {
+        return StandardLocation.locationFor("MY_LOCATION");
+    }
+
+}
diff --git a/test/micro/org/openjdk/bench/javax/tools/LocationProps.java b/test/micro/org/openjdk/bench/javax/tools/LocationProps.java
new file mode 100644
index 00000000000..d6112119083
--- /dev/null
+++ b/test/micro/org/openjdk/bench/javax/tools/LocationProps.java
@@ -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.
+ */
+package org.openjdk.bench.javax.tools;
+
+import org.openjdk.jmh.annotations.*;
+import org.openjdk.jmh.infra.Blackhole;
+
+import java.util.concurrent.TimeUnit;
+import javax.tools.JavaFileManager.Location;
+import javax.tools.StandardLocation;
+
+@Warmup(iterations = 3, time = 1)
+@Measurement(iterations = 3, time = 1)
+@Fork(3)
+@BenchmarkMode(Mode.AverageTime)
+@OutputTimeUnit(TimeUnit.NANOSECONDS)
+@State(Scope.Thread)
+public class LocationProps {
+
+    @Benchmark
+    public void standard(Blackhole bh) {
+        for (Location loc : StandardLocation.values()) {
+            bh.consume(loc.getName());
+            bh.consume(loc.isModuleOrientedLocation());
+            bh.consume(loc.isOutputLocation());
+        }
+    }
+
+    @Benchmark
+    public void custom(Blackhole bh) {
+        Location loc = StandardLocation.locationFor("MY_LOCATION");
+        bh.consume(loc.getName());
+        bh.consume(loc.isModuleOrientedLocation());
+        bh.consume(loc.isOutputLocation());
+    }
+
+}

From 65c5282f4b83343062571736b7d34ddb147ea39c Mon Sep 17 00:00:00 2001
From: Christian Hagedorn <chagedorn@openjdk.org>
Date: Fri, 14 Mar 2025 12:13:18 +0000
Subject: [PATCH 353/587] 8351938: C2: Print compilation bailouts with
 PrintCompilation compile command

Reviewed-by: epeter, thartmann, kvn, galder
---
 src/hotspot/share/compiler/compileBroker.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/hotspot/share/compiler/compileBroker.cpp b/src/hotspot/share/compiler/compileBroker.cpp
index c34d9eb785e..1bb184ef77a 100644
--- a/src/hotspot/share/compiler/compileBroker.cpp
+++ b/src/hotspot/share/compiler/compileBroker.cpp
@@ -2374,7 +2374,7 @@ void CompileBroker::invoke_compiler_on_method(CompileTask* task) {
     if (CompilationLog::log() != nullptr) {
       CompilationLog::log()->log_failure(thread, task, failure_reason, retry_message);
     }
-    if (PrintCompilation) {
+    if (PrintCompilation || task->directive()->PrintCompilationOption) {
       FormatBufferResource msg = retry_message != nullptr ?
         FormatBufferResource("COMPILE SKIPPED: %s (%s)", failure_reason, retry_message) :
         FormatBufferResource("COMPILE SKIPPED: %s",      failure_reason);

From 86b24339dc05422f61e10023f97a9013e2c03a15 Mon Sep 17 00:00:00 2001
From: Tobias Hartmann <thartmann@openjdk.org>
Date: Fri, 14 Mar 2025 12:46:18 +0000
Subject: [PATCH 354/587] 8352050: Problem list compiler/ciReplay/* test until
 JDK-8349191 is fixed

Reviewed-by: chagedorn
---
 test/hotspot/jtreg/ProblemList.txt | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/test/hotspot/jtreg/ProblemList.txt b/test/hotspot/jtreg/ProblemList.txt
index 8f3366d16e7..cac1d404168 100644
--- a/test/hotspot/jtreg/ProblemList.txt
+++ b/test/hotspot/jtreg/ProblemList.txt
@@ -76,6 +76,9 @@ compiler/codecache/CodeCacheFullCountTest.java 8332954 generic-all
 
 compiler/interpreter/Test6833129.java 8335266 generic-i586
 
+compiler/ciReplay/TestInliningProtectionDomain.java 8349191 generic-all
+compiler/ciReplay/TestIncrementalInlining.java 8349191 generic-all
+
 #############################################################################
 
 # :hotspot_gc

From 985ca1270e8d9bc041e50c2e9dd22bfeb0113e6e Mon Sep 17 00:00:00 2001
From: Fei Yang <fyang@openjdk.org>
Date: Fri, 14 Mar 2025 13:44:29 +0000
Subject: [PATCH 355/587] 8352011: RISC-V: Two IR tests fail after JDK-8351662

Reviewed-by: syan, mli
---
 .../jtreg/compiler/c2/irTests/TestAutoVecCountingDownLoop.java | 3 ++-
 .../jtreg/compiler/c2/irTests/TestVectorizeTypeConversion.java | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/test/hotspot/jtreg/compiler/c2/irTests/TestAutoVecCountingDownLoop.java b/test/hotspot/jtreg/compiler/c2/irTests/TestAutoVecCountingDownLoop.java
index e1db414602d..41d20a06448 100644
--- a/test/hotspot/jtreg/compiler/c2/irTests/TestAutoVecCountingDownLoop.java
+++ b/test/hotspot/jtreg/compiler/c2/irTests/TestAutoVecCountingDownLoop.java
@@ -29,7 +29,8 @@ import compiler.lib.ir_framework.*;
  * @test
  * @bug 8284981
  * @summary Auto-vectorization enhancement for special counting down loops
- * @requires os.arch=="amd64" | os.arch=="x86_64" | os.arch=="aarch64" | os.arch=="riscv64"
+ * @requires os.arch=="amd64" | os.arch=="x86_64" | os.arch=="aarch64" |
+             (os.arch == "riscv64" & vm.cpu.features ~= ".*rvv.*")
  * @library /test/lib /
  * @run driver compiler.c2.irTests.TestAutoVecCountingDownLoop
  */
diff --git a/test/hotspot/jtreg/compiler/c2/irTests/TestVectorizeTypeConversion.java b/test/hotspot/jtreg/compiler/c2/irTests/TestVectorizeTypeConversion.java
index 01f52cae175..2cc2d2081b4 100644
--- a/test/hotspot/jtreg/compiler/c2/irTests/TestVectorizeTypeConversion.java
+++ b/test/hotspot/jtreg/compiler/c2/irTests/TestVectorizeTypeConversion.java
@@ -32,7 +32,8 @@ import jdk.test.lib.Utils;
  * @test
  * @bug 8283091
  * @summary Auto-vectorization enhancement for type conversion between different data sizes.
- * @requires (os.simpleArch == "x64" & vm.cpu.features ~= ".*avx2.*") | os.arch=="aarch64" | os.arch=="riscv64"
+ * @requires (os.simpleArch == "x64" & vm.cpu.features ~= ".*avx2.*") | os.arch=="aarch64" |
+             (os.arch == "riscv64" & vm.cpu.features ~= ".*rvv.*")
  * @library /test/lib /
  * @run driver compiler.c2.irTests.TestVectorizeTypeConversion
  */

From 712a70c5c44ac1fe916ceb1fff854d689b79b126 Mon Sep 17 00:00:00 2001
From: Hamlin Li <mli@openjdk.org>
Date: Fri, 14 Mar 2025 15:07:29 +0000
Subject: [PATCH 356/587] 8318220: RISC-V: C2 ReverseI 8318221: RISC-V: C2
 ReverseL

Reviewed-by: fyang, luhenry
---
 src/hotspot/cpu/riscv/assembler_riscv.hpp     |   1 +
 src/hotspot/cpu/riscv/globals_riscv.hpp       |   1 +
 src/hotspot/cpu/riscv/riscv.ad                |   4 +
 src/hotspot/cpu/riscv/riscv_b.ad              |  27 ++++
 src/hotspot/cpu/riscv/vm_version_riscv.hpp    |   1 +
 .../c2/riscv64/TestIntegerReverse.java        | 131 ++++++++++++++++++
 .../compiler/c2/riscv64/TestLongReverse.java  |  95 +++++++++++++
 .../compiler/lib/golden/GoldenReverse.java    |  62 +++++++++
 .../ir_framework/test/IREncodingPrinter.java  |   1 +
 9 files changed, 323 insertions(+)
 create mode 100644 test/hotspot/jtreg/compiler/c2/riscv64/TestIntegerReverse.java
 create mode 100644 test/hotspot/jtreg/compiler/c2/riscv64/TestLongReverse.java
 create mode 100644 test/hotspot/jtreg/compiler/lib/golden/GoldenReverse.java

diff --git a/src/hotspot/cpu/riscv/assembler_riscv.hpp b/src/hotspot/cpu/riscv/assembler_riscv.hpp
index 8b4d013b0d7..8658aedcbe7 100644
--- a/src/hotspot/cpu/riscv/assembler_riscv.hpp
+++ b/src/hotspot/cpu/riscv/assembler_riscv.hpp
@@ -2384,6 +2384,7 @@ enum Nf {
     emit(insn);                                         \
   }
 
+  INSN(brev8,  0b0010011, 0b101, 0b011010000111);
   INSN(rev8,   0b0010011, 0b101, 0b011010111000);
   INSN(_sext_b, 0b0010011, 0b001, 0b011000000100);
   INSN(_sext_h, 0b0010011, 0b001, 0b011000000101);
diff --git a/src/hotspot/cpu/riscv/globals_riscv.hpp b/src/hotspot/cpu/riscv/globals_riscv.hpp
index 36c32d90cb3..a7d77d2c55d 100644
--- a/src/hotspot/cpu/riscv/globals_riscv.hpp
+++ b/src/hotspot/cpu/riscv/globals_riscv.hpp
@@ -102,6 +102,7 @@ define_pd_global(intx, InlineSmallCode,          1000);
   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, UseZbkb, false, EXPERIMENTAL, "Use Zbkb instructions")           \
   product(bool, UseZbs, false, DIAGNOSTIC, "Use Zbs instructions")               \
   product(bool, UseZfa, false, EXPERIMENTAL, "Use Zfa instructions")             \
   product(bool, UseZfh, false, DIAGNOSTIC, "Use Zfh instructions")               \
diff --git a/src/hotspot/cpu/riscv/riscv.ad b/src/hotspot/cpu/riscv/riscv.ad
index 08b777085b1..86e4e7d1de8 100644
--- a/src/hotspot/cpu/riscv/riscv.ad
+++ b/src/hotspot/cpu/riscv/riscv.ad
@@ -1896,6 +1896,10 @@ bool Matcher::match_rule_supported(int opcode) {
     case Op_PopCountL:
       return UsePopCountInstruction;
 
+    case Op_ReverseI:
+    case Op_ReverseL:
+      return UseZbkb;
+
     case Op_ReverseBytesI:
     case Op_ReverseBytesL:
     case Op_ReverseBytesS:
diff --git a/src/hotspot/cpu/riscv/riscv_b.ad b/src/hotspot/cpu/riscv/riscv_b.ad
index 990d9eab87c..ed9fca13a1b 100644
--- a/src/hotspot/cpu/riscv/riscv_b.ad
+++ b/src/hotspot/cpu/riscv/riscv_b.ad
@@ -245,6 +245,33 @@ instruct bytes_reverse_short_b(iRegINoSp dst, iRegIorL2I src) %{
   ins_pipe(ialu_reg);
 %}
 
+// Reverse bits instruction
+instruct bits_reverse_I(iRegINoSp dst, iRegIorL2I src)
+%{
+  match(Set dst (ReverseI src));
+  ins_cost(ALU_COST * 3);
+  format %{ "bits_reverse_I  $dst, $src" %}
+  ins_encode %{
+    __ rev8($dst$$Register, $src$$Register);
+    __ brev8($dst$$Register, $dst$$Register);
+    __ srai($dst$$Register, $dst$$Register, 32);
+  %}
+  ins_pipe(ialu_reg);
+%}
+
+instruct bits_reverse_L(iRegLNoSp dst, iRegL src)
+%{
+  match(Set dst (ReverseL src));
+  ins_cost(ALU_COST * 2);
+  format %{ "bits_reverse_L  $dst, $src" %}
+  ins_encode %{
+    __ rev8($dst$$Register, $src$$Register);
+    __ brev8($dst$$Register, $dst$$Register);
+  %}
+  ins_pipe(ialu_reg);
+%}
+
+
 // Shift Add Pointer
 instruct shaddP_reg_reg_b(iRegPNoSp dst, iRegP src1, iRegL src2, immIScale imm) %{
   predicate(UseZba);
diff --git a/src/hotspot/cpu/riscv/vm_version_riscv.hpp b/src/hotspot/cpu/riscv/vm_version_riscv.hpp
index dc9d143cea9..1db1371ec79 100644
--- a/src/hotspot/cpu/riscv/vm_version_riscv.hpp
+++ b/src/hotspot/cpu/riscv/vm_version_riscv.hpp
@@ -156,6 +156,7 @@ class VM_Version : public Abstract_VM_Version {
   decl(ext_Zbb         , "Zbb"         , RV_NO_FLAG_BIT, true , UPDATE_DEFAULT(UseZbb))         \
   decl(ext_Zbc         , "Zbc"         , RV_NO_FLAG_BIT, true , NO_UPDATE_DEFAULT)              \
   decl(ext_Zbs         , "Zbs"         , RV_NO_FLAG_BIT, true , UPDATE_DEFAULT(UseZbs))         \
+  decl(ext_Zbkb        , "Zbkb"        , RV_NO_FLAG_BIT, true , UPDATE_DEFAULT(UseZbkb))        \
   decl(ext_Zcb         , "Zcb"         , RV_NO_FLAG_BIT, true , UPDATE_DEFAULT(UseZcb))         \
   decl(ext_Zfa         , "Zfa"         , RV_NO_FLAG_BIT, true , UPDATE_DEFAULT(UseZfa))         \
   decl(ext_Zfh         , "Zfh"         , RV_NO_FLAG_BIT, true , UPDATE_DEFAULT(UseZfh))         \
diff --git a/test/hotspot/jtreg/compiler/c2/riscv64/TestIntegerReverse.java b/test/hotspot/jtreg/compiler/c2/riscv64/TestIntegerReverse.java
new file mode 100644
index 00000000000..8b3abbb0300
--- /dev/null
+++ b/test/hotspot/jtreg/compiler/c2/riscv64/TestIntegerReverse.java
@@ -0,0 +1,131 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2025, Rivos 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
+ * @key randomness
+ * @bug 8318220
+ * @summary Test ReverseI intrinsic
+ *
+ * @library /test/lib /
+ * @requires os.arch == "riscv64" & vm.cpu.features ~= ".*zbkb.*"
+ * @run main/othervm compiler.c2.riscv64.TestIntegerReverse
+ */
+
+package compiler.c2.riscv64;
+
+import compiler.lib.ir_framework.*;
+import java.util.Random;
+import jdk.test.lib.Asserts;
+import jdk.test.lib.Utils;
+
+import static compiler.lib.golden.GoldenReverse.golden_reverse_integer;
+
+public class TestIntegerReverse {
+
+  static Random r = Utils.getRandomInstance();
+  static final int ITERS  = 11000;
+  static final int ARRLEN = 997;
+  static int input[] = new int[ARRLEN];
+  static int outputI[] = new int[ARRLEN];
+  static long outputL[] = new long[ARRLEN];
+  static int err;
+
+  public static void main(String args[]) {
+    TestFramework.runWithFlags("-XX:-TieredCompilation", "-XX:CompileThresholdScaling=0.3",
+                               "-XX:+UnlockDiagnosticVMOptions", "-XX:-UseRVV"); // Only test scalar version
+  }
+
+  @Test
+  @IR(counts = {IRNode.REVERSE_I, "> 0"})
+  static void test_reverse_ia(int[] input, int[] outputI) {
+    for (int i = 0; i < input.length; i+=1) {
+      outputI[i] = Integer.reverse(input[i]);
+    }
+  }
+
+  @Test
+  @IR(counts = {IRNode.REVERSE_I, "> 0"})
+  static void test_reverse_la(int[] input, long[] outputL) {
+    for (int i = 0; i < input.length; i+=1) {
+      outputL[i] = Integer.reverse(input[i]);
+    }
+  }
+
+  @Test
+  @IR(counts = {IRNode.REVERSE_I, "> 0"})
+  static void test_reverse_l(int input, long expected) {
+    if (Integer.reverse(input) != expected) {
+      err++;
+      System.out.println("Test failure, input: " + input +
+                         ", actual: " + Integer.reverse(input) +
+                         ", expected: " + expected);
+    }
+  }
+
+  @Run(test = {"test_reverse_ia", "test_reverse_la", "test_reverse_l"})
+  @Warmup(ITERS)
+  static void test(RunInfo runInfo) {
+    // Initialize
+    for (int i = 0; i < ARRLEN; i++) {
+      input[i] = r.nextInt();
+    }
+    input[0] = 0;
+    input[1] = 1;
+    input[2] = -1;
+    input[3] = Integer.MIN_VALUE;
+    input[4] = Integer.MAX_VALUE;
+
+    test_reverse_ia(input, outputI);
+    test_reverse_la(input, outputL);
+    for (int i = 0; i < ARRLEN; i++) {
+      test_reverse_l(input[i], golden_reverse_integer(input[i]));
+    }
+    // skip test/verify when warming up
+    if (runInfo.isWarmUp()) {
+      return;
+    }
+
+    test_reverse_ia(input, outputI);
+    test_reverse_la(input, outputL);
+
+    for (int i = 0; i < ARRLEN; i++) {
+      int golden_val = golden_reverse_integer(input[i]);
+      Asserts.assertEquals(outputI[i], golden_val,
+                          "Test failure (integer array), input: " + input[i] +
+                          ", actual: " + outputI[i] +
+                          ", expected: " + golden_val);
+      Asserts.assertEquals(outputL[i], (long)golden_val,
+                          "Test failure (long array), input: " + input[i] +
+                          ", actual: " + outputL[i] +
+                          ", expected: " + (long)golden_val);
+    }
+
+    err = 0;
+    for (int i = 0; i < ARRLEN; i++) {
+      test_reverse_l(input[i], golden_reverse_integer(input[i]));
+    }
+    Asserts.assertTrue(err == 0, "Some tests(" + err + ") failed, check previous log for details");
+  }
+}
diff --git a/test/hotspot/jtreg/compiler/c2/riscv64/TestLongReverse.java b/test/hotspot/jtreg/compiler/c2/riscv64/TestLongReverse.java
new file mode 100644
index 00000000000..01c3b871ffa
--- /dev/null
+++ b/test/hotspot/jtreg/compiler/c2/riscv64/TestLongReverse.java
@@ -0,0 +1,95 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2025, Rivos 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
+ * @key randomness
+ * @bug 8318221
+ * @summary Test ReverseL intrinsic
+ *
+ * @library /test/lib /
+ * @requires os.arch == "riscv64" & vm.cpu.features ~= ".*zbkb.*"
+ * @run main/othervm compiler.c2.riscv64.TestLongReverse
+ */
+
+package compiler.c2.riscv64;
+
+import compiler.lib.ir_framework.*;
+import java.util.Random;
+import jdk.test.lib.Asserts;
+import jdk.test.lib.Utils;
+
+import static compiler.lib.golden.GoldenReverse.golden_reverse_long;
+
+public class TestLongReverse {
+
+  static Random r = Utils.getRandomInstance();
+  static final int ITERS  = 11000;
+  static final int ARRLEN = 997;
+  static long input[] = new long[ARRLEN];
+  static long output[] = new long[ARRLEN];
+
+  public static void main(String args[]) {
+    TestFramework.runWithFlags("-XX:-TieredCompilation", "-XX:CompileThresholdScaling=0.3",
+                               "-XX:+UnlockDiagnosticVMOptions", "-XX:-UseRVV"); // Only test scalar version
+  }
+
+  @Test
+  @IR(counts = {IRNode.REVERSE_L, "> 0"})
+  static void test_reverse(long[] input, long[] output) {
+    for (int i = 0; i < input.length; i+=1) {
+      output[i] = Long.reverse(input[i]);
+    }
+  }
+
+  @Run(test = "test_reverse")
+  @Warmup(ITERS)
+  static void test(RunInfo runInfo) {
+    // Initialize
+    for (int i = 0; i < ARRLEN; i++) {
+      input[i] = r.nextLong();
+    }
+    input[0] = 0L;
+    input[1] = 1L;
+    input[2] = -1L;
+    input[3] = Long.MIN_VALUE;
+    input[4] = Long.MAX_VALUE;
+
+    test_reverse(input, output);
+    // skip test/verify when warming up
+    if (runInfo.isWarmUp()) {
+      return;
+    }
+
+    test_reverse(input, output);
+
+    for (int i = 0; i < ARRLEN; i++) {
+      long golden_val = golden_reverse_long(input[i]);
+      Asserts.assertEquals(output[i], golden_val,
+                          "Test failure, input: " + input[i] +
+                          ", actual: " + output[i] +
+                          ", expected: " + golden_val);
+    }
+  }
+}
diff --git a/test/hotspot/jtreg/compiler/lib/golden/GoldenReverse.java b/test/hotspot/jtreg/compiler/lib/golden/GoldenReverse.java
new file mode 100644
index 00000000000..3d8158e1fa3
--- /dev/null
+++ b/test/hotspot/jtreg/compiler/lib/golden/GoldenReverse.java
@@ -0,0 +1,62 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2025, Rivos Inc. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package compiler.lib.golden;
+
+public class GoldenReverse {
+  // The code is copied from java.lang.Integer.reverse(int i)
+  public static int golden_reverse_integer(int i) {
+    // HD, Figure 7-1
+    i = (i & 0x55555555) << 1 | (i >>> 1) & 0x55555555;
+    i = (i & 0x33333333) << 2 | (i >>> 2) & 0x33333333;
+    i = (i & 0x0f0f0f0f) << 4 | (i >>> 4) & 0x0f0f0f0f;
+
+    return golden_reverseBytes_integer(i);
+  }
+
+  // The code is copied from java.lang.Integer.reverseBytes(int i)
+  static int golden_reverseBytes_integer(int i) {
+    return (i << 24)            |
+           ((i & 0xff00) << 8)  |
+           ((i >>> 8) & 0xff00) |
+           (i >>> 24);
+  }
+
+  // The code is copied from java.lang.Long.reverse(long i)
+  public static long golden_reverse_long(long i) {
+    // HD, Figure 7-1
+    i = (i & 0x5555555555555555L) << 1 | (i >>> 1) & 0x5555555555555555L;
+    i = (i & 0x3333333333333333L) << 2 | (i >>> 2) & 0x3333333333333333L;
+    i = (i & 0x0f0f0f0f0f0f0f0fL) << 4 | (i >>> 4) & 0x0f0f0f0f0f0f0f0fL;
+
+    return golden_reverseBytes_long(i);
+  }
+
+  // The code is copied from java.lang.Long.reverseBytes(long i)
+  static long golden_reverseBytes_long(long i) {
+    i = (i & 0x00ff00ff00ff00ffL) << 8 | (i >>> 8) & 0x00ff00ff00ff00ffL;
+    return (i << 48) | ((i & 0xffff0000L) << 16) |
+        ((i >>> 16) & 0xffff0000L) | (i >>> 48);
+  }
+}
diff --git a/test/hotspot/jtreg/compiler/lib/ir_framework/test/IREncodingPrinter.java b/test/hotspot/jtreg/compiler/lib/ir_framework/test/IREncodingPrinter.java
index 023bd7b815d..03847e8f761 100644
--- a/test/hotspot/jtreg/compiler/lib/ir_framework/test/IREncodingPrinter.java
+++ b/test/hotspot/jtreg/compiler/lib/ir_framework/test/IREncodingPrinter.java
@@ -110,6 +110,7 @@ public class IREncodingPrinter {
         "sve",
         // Riscv64
         "rvv",
+        "zbkb",
         "zfh",
         "zvbb",
         "zvfh"

From 7f42804148fca3fb6ff669c35c4086c9fafc7ad3 Mon Sep 17 00:00:00 2001
From: Jiangli Zhou <jiangli@openjdk.org>
Date: Fri, 14 Mar 2025 16:25:23 +0000
Subject: [PATCH 357/587] 8350524: Some hotspot/jtreg/serviceability/dcmd/vm
 tier1 tests fail on static JDK

Reviewed-by: stuefe
---
 .../serviceability/dcmd/vm/DynLibsTest.java   | 23 +++++++--
 .../dcmd/vm/SystemDumpMapTest.java            |  8 +--
 .../serviceability/dcmd/vm/SystemMapTest.java | 12 +++--
 .../dcmd/vm/SystemMapTestBase.java            | 50 +++++++++++++++----
 4 files changed, 72 insertions(+), 21 deletions(-)

diff --git a/test/hotspot/jtreg/serviceability/dcmd/vm/DynLibsTest.java b/test/hotspot/jtreg/serviceability/dcmd/vm/DynLibsTest.java
index 696101a329e..2f6ac7289bc 100644
--- a/test/hotspot/jtreg/serviceability/dcmd/vm/DynLibsTest.java
+++ b/test/hotspot/jtreg/serviceability/dcmd/vm/DynLibsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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 jdk.test.lib.process.OutputAnalyzer;
 import jdk.test.lib.Platform;
 import jdk.test.lib.dcmd.CommandExecutor;
 import jdk.test.lib.dcmd.JMXExecutor;
+import jdk.test.whitebox.WhiteBox;
 
 /*
  * @test
@@ -37,16 +38,28 @@ import jdk.test.lib.dcmd.JMXExecutor;
  *          java.compiler
  *          java.management
  *          jdk.internal.jvmstat/sun.jvmstat.monitor
- * @run testng DynLibsTest
+ * @build jdk.test.whitebox.WhiteBox
+ * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox
+ * @run testng/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI DynLibsTest
  */
 
 public class DynLibsTest {
 
     public void run(CommandExecutor executor) {
         OutputAnalyzer output = executor.execute("VM.dynlibs");
-        output.shouldContain(Platform.buildSharedLibraryName("jvm"));
-        output.shouldContain(Platform.buildSharedLibraryName("java"));
-        output.shouldContain(Platform.buildSharedLibraryName("management"));
+        if (WhiteBox.getWhiteBox().isStatic()) {
+            // On static JDK, JDK/VM native libraries are statically
+            // linked with the launcher. There is no separate mapping
+            // for libjvm, libjava, etc.
+            output.shouldContain("java");
+            output.shouldNotContain(Platform.buildSharedLibraryName("jvm"));
+            output.shouldNotContain(Platform.buildSharedLibraryName("java"));
+            output.shouldNotContain(Platform.buildSharedLibraryName("management"));
+        } else {
+            output.shouldContain(Platform.buildSharedLibraryName("jvm"));
+            output.shouldContain(Platform.buildSharedLibraryName("java"));
+            output.shouldContain(Platform.buildSharedLibraryName("management"));
+        }
     }
 
     @Test
diff --git a/test/hotspot/jtreg/serviceability/dcmd/vm/SystemDumpMapTest.java b/test/hotspot/jtreg/serviceability/dcmd/vm/SystemDumpMapTest.java
index 1bfec79e9df..6d6104da57e 100644
--- a/test/hotspot/jtreg/serviceability/dcmd/vm/SystemDumpMapTest.java
+++ b/test/hotspot/jtreg/serviceability/dcmd/vm/SystemDumpMapTest.java
@@ -1,6 +1,6 @@
 /*
- * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2023, 2024, Red Hat, Inc. and/or its affiliates.
+ * Copyright (c) 2023, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2025, Red Hat, Inc. and/or its affiliates.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -40,7 +40,9 @@ import java.util.regex.Pattern;
  *          java.compiler
  *          java.management
  *          jdk.internal.jvmstat/sun.jvmstat.monitor
- * @run testng/othervm -XX:+UsePerfData SystemDumpMapTest
+ * @build jdk.test.whitebox.WhiteBox
+ * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox
+ * @run testng/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:+UsePerfData SystemDumpMapTest
  */
 public class SystemDumpMapTest extends SystemMapTestBase {
 
diff --git a/test/hotspot/jtreg/serviceability/dcmd/vm/SystemMapTest.java b/test/hotspot/jtreg/serviceability/dcmd/vm/SystemMapTest.java
index 7f5d09de8e5..283dd4bae72 100644
--- a/test/hotspot/jtreg/serviceability/dcmd/vm/SystemMapTest.java
+++ b/test/hotspot/jtreg/serviceability/dcmd/vm/SystemMapTest.java
@@ -1,6 +1,6 @@
 /*
- * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2023, 2024, Red Hat, Inc. and/or its affiliates.
+ * Copyright (c) 2023, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2025, Red Hat, Inc. and/or its affiliates.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -36,7 +36,9 @@ import jdk.test.lib.process.OutputAnalyzer;
  *          java.compiler
  *          java.management
  *          jdk.internal.jvmstat/sun.jvmstat.monitor
- * @run testng/othervm -XX:+UsePerfData SystemMapTest
+ * @build jdk.test.whitebox.WhiteBox
+ * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox
+ * @run testng/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:+UsePerfData SystemMapTest
  */
 
 /*
@@ -49,7 +51,9 @@ import jdk.test.lib.process.OutputAnalyzer;
  *          java.compiler
  *          java.management
  *          jdk.internal.jvmstat/sun.jvmstat.monitor
- * @run testng/othervm -XX:+UsePerfData -XX:+UseZGC SystemMapTest
+ * @build jdk.test.whitebox.WhiteBox
+ * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox
+ * @run testng/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:+UsePerfData -XX:+UseZGC SystemMapTest
  */
 public class SystemMapTest extends SystemMapTestBase {
     public void run(CommandExecutor executor) {
diff --git a/test/hotspot/jtreg/serviceability/dcmd/vm/SystemMapTestBase.java b/test/hotspot/jtreg/serviceability/dcmd/vm/SystemMapTestBase.java
index 46fb0cb2b06..47590ec3d54 100644
--- a/test/hotspot/jtreg/serviceability/dcmd/vm/SystemMapTestBase.java
+++ b/test/hotspot/jtreg/serviceability/dcmd/vm/SystemMapTestBase.java
@@ -1,6 +1,6 @@
 /*
- * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2024, Red Hat, Inc. and/or its affiliates.
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2025, Red Hat, Inc. and/or its affiliates.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,6 +23,8 @@
  */
 
 import jdk.test.lib.Platform;
+import jdk.test.lib.StringArrayUtils;
+import jdk.test.whitebox.WhiteBox;
 
 public class SystemMapTestBase {
 
@@ -82,14 +84,17 @@ public class SystemMapTestBase {
         static final String shouldMatchUnconditionally_linux[] = {
             // java launcher
             regexBase_committed + "/bin/java",
-            // libjvm
-            regexBase_committed + "/lib/.*/libjvm.so",
             // heap segment, should be part of all user space apps on all architectures OpenJDK supports.
             regexBase_committed + "\\[heap\\]",
             // we should see the hs-perf data file, and it should appear as shared as well as committed
             regexBase_shared_and_committed + "hsperfdata_.*"
         };
 
+        static final String shouldMatch_linux_libjvm[] = {
+            // libjvm
+            regexBase_committed + "/lib/.*/libjvm.so"
+        };
+
         static final String shouldMatchIfNMTIsEnabled_linux[] = {
             regexBase_java_heap + "JAVAHEAP.*",
             // metaspace
@@ -103,7 +108,14 @@ public class SystemMapTestBase {
         };
 
         public String[] shouldMatchUnconditionally() {
-            return shouldMatchUnconditionally_linux;
+            if (WhiteBox.getWhiteBox().isStatic()) {
+                // On static JDK, libjvm is statically linked with the 'java'
+                // launcher. There is no separate mapping for libjvm.
+                return shouldMatchUnconditionally_linux;
+            } else {
+                return StringArrayUtils.concat(shouldMatchUnconditionally_linux,
+                                               shouldMatch_linux_libjvm);
+            }
         }
 
         public String[] shouldMatchIfNMTIsEnabled() {
@@ -125,6 +137,9 @@ public class SystemMapTestBase {
         static final String shouldMatchUnconditionally_windows[] = {
             // java launcher
             winimage + ".*[\\/\\\\]bin[\\/\\\\]java[.]exe",
+        };
+
+        static final String shouldMatch_windows_libjvm[] = {
             // libjvm
             winimage + ".*[\\/\\\\]bin[\\/\\\\].*[\\/\\\\]jvm.dll"
         };
@@ -142,7 +157,14 @@ public class SystemMapTestBase {
         };
 
         public String[] shouldMatchUnconditionally() {
-            return shouldMatchUnconditionally_windows;
+            if (WhiteBox.getWhiteBox().isStatic()) {
+                // On static JDK, libjvm is statically linked with the 'java'
+                // launcher. There is no separate mapping for libjvm.
+                return shouldMatchUnconditionally_windows;
+            } else {
+                return StringArrayUtils.concat(shouldMatchUnconditionally_windows,
+                                               shouldMatch_windows_libjvm);
+            }
         }
 
         public String[] shouldMatchIfNMTIsEnabled() {
@@ -165,12 +187,15 @@ public class SystemMapTestBase {
         static final String shouldMatchUnconditionally_macOS[] = {
             // java launcher
             macOSbase + macow + space + someNumber + space + "/.*/bin/java",
-            // libjvm
-            macOSbase + macow + space + someNumber + space + "/.*/lib/server/libjvm.dylib",
             // we should see the hs-perf data file, and it should appear as shared as well as committed
             macOSbase + macprivate + space + someNumber + space + ".*/.*/hsperfdata_.*"
         };
 
+        static final String shouldMatch_macOS_libjvm[] = {
+            // libjvm
+            macOSbase + macow + space + someNumber + space + "/.*/lib/server/libjvm.dylib",
+        };
+
         static final String shouldMatchIfNMTIsEnabled_macOS[] = {
             // heap is private with G1GC, shared with ZGC
             macOSbase + macprivate_or_shared + space + someNumber + space + "JAVAHEAP.*",
@@ -183,7 +208,14 @@ public class SystemMapTestBase {
         };
 
         public String[] shouldMatchUnconditionally() {
-            return shouldMatchUnconditionally_macOS;
+            if (WhiteBox.getWhiteBox().isStatic()) {
+                // On static JDK, libjvm is statically linked with the 'java'
+                // launcher. There is no separate mapping for libjvm.
+                return shouldMatchUnconditionally_macOS;
+            } else {
+                return StringArrayUtils.concat(shouldMatchUnconditionally_macOS,
+                                               shouldMatch_macOS_libjvm);
+            }
         }
 
         public String[] shouldMatchIfNMTIsEnabled() {

From 0460978e7c769624cacdb528277a99914b327e30 Mon Sep 17 00:00:00 2001
From: Ian Graves <igraves@openjdk.org>
Date: Fri, 14 Mar 2025 17:50:42 +0000
Subject: [PATCH 358/587] 8351096: Typos in Vector API doc

Reviewed-by: psandoz
---
 .../jdk/incubator/vector/AbstractVector.java  |  7 +--
 .../jdk/incubator/vector/ByteVector.java      | 20 ++++----
 .../jdk/incubator/vector/DoubleVector.java    |  6 +--
 .../classes/jdk/incubator/vector/Float16.java |  6 +--
 .../jdk/incubator/vector/FloatVector.java     |  6 +--
 .../jdk/incubator/vector/IntVector.java       | 20 ++++----
 .../jdk/incubator/vector/LongVector.java      | 18 ++++----
 .../jdk/incubator/vector/ShortVector.java     | 20 ++++----
 .../classes/jdk/incubator/vector/Vector.java  | 46 +++++++++----------
 .../jdk/incubator/vector/VectorMask.java      |  6 +--
 .../jdk/incubator/vector/VectorMath.java      | 32 ++++++-------
 .../jdk/incubator/vector/VectorSpecies.java   |  6 +--
 .../incubator/vector/X-Vector.java.template   | 28 +++++------
 .../jdk/incubator/vector/package-info.java    |  2 +-
 14 files changed, 112 insertions(+), 111 deletions(-)

diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/AbstractVector.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/AbstractVector.java
index 867d74dd6b3..45773cd29db 100644
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/AbstractVector.java
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/AbstractVector.java
@@ -44,7 +44,7 @@ abstract class AbstractVector<E> extends Vector<E> {
     /**
      * The order of vector bytes when stored in natural,
      * array elements of the same lane type.
-     * This is the also the behavior of the
+     * This is also the behavior of the
      * VectorSupport load/store instructions.
      * If these instructions gain the capability to do
      * byte swapping on the fly, add a bit to those
@@ -302,8 +302,9 @@ abstract class AbstractVector<E> extends Vector<E> {
     Vector<F> convert(Conversion<E,F> conv, int part) {
         // Shape invariance is simple to implement.
         // It's part of the API because shape invariance
-        // is the default mode of operation, and shape
-        // shifting operations must advertise themselves.
+        // is the default mode of operation, and
+        // shape-shifting operations must advertise
+        // themselves.
         ConversionImpl<E,F> c = (ConversionImpl<E,F>) conv;
         @SuppressWarnings("unchecked")
         VectorSpecies<F> rsp = (VectorSpecies<F>)
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 678ae25f29a..ed8d273ff37 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
@@ -84,7 +84,7 @@ public abstract class ByteVector extends AbstractVector<Byte> {
     //       super.bOp((Byte128Vector) o);
     // The purpose of that is to forcibly inline
     // the generic definition from this file
-    // into a sharply type- and size-specific
+    // into a sharply-typed and size-specific
     // wrapper in the subclass file, so that
     // the JIT can specialize the code.
     // The code is only inlined and expanded
@@ -554,7 +554,7 @@ public abstract class ByteVector extends AbstractVector<Byte> {
     // Note: A surprising behavior in javadoc
     // sometimes makes a lone /** {@inheritDoc} */
     // comment drop the method altogether,
-    // apparently if the method mentions an
+    // apparently if the method mentions a
     // parameter or return type of Vector<Byte>
     // instead of Vector<E> as originally specified.
     // Adding an empty HTML fragment appears to
@@ -1748,7 +1748,7 @@ public abstract class ByteVector extends AbstractVector<Byte> {
      * Computes the bitwise logical conjunction ({@code &})
      * of this vector and a second input vector.
      *
-     * This is a lane-wise binary operation which applies the
+     * This is a lane-wise binary operation which applies
      * the primitive bitwise "and" operation ({@code &})
      * to each pair of corresponding lane values.
      *
@@ -1781,7 +1781,7 @@ public abstract class ByteVector extends AbstractVector<Byte> {
      * Computes the bitwise logical conjunction ({@code &})
      * of this vector and a scalar.
      *
-     * This is a lane-wise binary operation which applies the
+     * This is a lane-wise binary operation which applies
      * the primitive bitwise "and" operation ({@code &})
      * to each pair of corresponding lane values.
      *
@@ -1805,7 +1805,7 @@ public abstract class ByteVector extends AbstractVector<Byte> {
      * Computes the bitwise logical disjunction ({@code |})
      * of this vector and a second input vector.
      *
-     * This is a lane-wise binary operation which applies the
+     * This is a lane-wise binary operation which applies
      * the primitive bitwise "or" operation ({@code |})
      * to each pair of corresponding lane values.
      *
@@ -1838,7 +1838,7 @@ public abstract class ByteVector extends AbstractVector<Byte> {
      * Computes the bitwise logical disjunction ({@code |})
      * of this vector and a scalar.
      *
-     * This is a lane-wise binary operation which applies the
+     * This is a lane-wise binary operation which applies
      * the primitive bitwise "or" operation ({@code |})
      * to each pair of corresponding lane values.
      *
@@ -1906,7 +1906,7 @@ public abstract class ByteVector extends AbstractVector<Byte> {
      * Computes the bitwise logical complement ({@code ~})
      * of this vector.
      *
-     * This is a lane-wise binary operation which applies the
+     * This is a lane-wise binary operation which applies
      * the primitive bitwise "not" operation ({@code ~})
      * to each lane value.
      *
@@ -2950,7 +2950,7 @@ public abstract class ByteVector extends AbstractVector<Byte> {
 
     /** {@inheritDoc} <!--workaround-->
      * @implNote
-     * When this method is used on used on vectors
+     * When this method is used on vectors
      * of type {@code ByteVector},
      * there will be no loss of precision or range,
      * and so no {@code UnsupportedOperationException} will
@@ -2970,7 +2970,7 @@ public abstract class ByteVector extends AbstractVector<Byte> {
 
     /** {@inheritDoc} <!--workaround-->
      * @implNote
-     * When this method is used on used on vectors
+     * When this method is used on vectors
      * of type {@code ByteVector},
      * there will be no loss of precision or range,
      * and so no {@code UnsupportedOperationException} will
@@ -2990,7 +2990,7 @@ public abstract class ByteVector extends AbstractVector<Byte> {
 
     /** {@inheritDoc} <!--workaround-->
      * @implNote
-     * When this method is used on used on vectors
+     * When this method is used on vectors
      * of type {@code ByteVector},
      * there will be no loss of precision.
      */
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 9f1e7f9ece4..5fbf02f87bd 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
@@ -84,7 +84,7 @@ public abstract class DoubleVector extends AbstractVector<Double> {
     //       super.bOp((Byte128Vector) o);
     // The purpose of that is to forcibly inline
     // the generic definition from this file
-    // into a sharply type- and size-specific
+    // into a sharply-typed and size-specific
     // wrapper in the subclass file, so that
     // the JIT can specialize the code.
     // The code is only inlined and expanded
@@ -543,7 +543,7 @@ public abstract class DoubleVector extends AbstractVector<Double> {
     // Note: A surprising behavior in javadoc
     // sometimes makes a lone /** {@inheritDoc} */
     // comment drop the method altogether,
-    // apparently if the method mentions an
+    // apparently if the method mentions a
     // parameter or return type of Vector<Double>
     // instead of Vector<E> as originally specified.
     // Adding an empty HTML fragment appears to
@@ -2771,7 +2771,7 @@ public abstract class DoubleVector extends AbstractVector<Double> {
     /** {@inheritDoc} <!--workaround-->
      * @implNote
      * This is an alias for {@link #toArray()}
-     * When this method is used on used on vectors
+     * When this method is used on vectors
      * of type {@code DoubleVector},
      * there will be no loss of precision.
      */
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
index fce71e4589e..5d6a4bbfecb 100644
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Float16.java
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Float16.java
@@ -2262,7 +2262,7 @@ public final class Float16
          * &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.
+         * Otherwise, the result is undefined.
          *
          * @param e The exponent of 2, which should meet
          *          |{@code e}| &le; 6_432_162 for safe results.
@@ -2279,7 +2279,7 @@ public final class Float16
          * <p>
          * The result is correct when
          * -3_606_689 &le; {@code e} &le; 3_150_619.
-         * Otherwise the result is undefined.
+         * 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.
@@ -2296,7 +2296,7 @@ public final class Float16
          * &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.
+         * Otherwise, the result is undefined.
          *
          * @param e The exponent of 10, which should meet
          *          |{@code e}| &le; 1_838_394 for safe results.
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 cef1b431bf0..26fbe64742d 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
@@ -84,7 +84,7 @@ public abstract class FloatVector extends AbstractVector<Float> {
     //       super.bOp((Byte128Vector) o);
     // The purpose of that is to forcibly inline
     // the generic definition from this file
-    // into a sharply type- and size-specific
+    // into a sharply-typed and size-specific
     // wrapper in the subclass file, so that
     // the JIT can specialize the code.
     // The code is only inlined and expanded
@@ -543,7 +543,7 @@ public abstract class FloatVector extends AbstractVector<Float> {
     // Note: A surprising behavior in javadoc
     // sometimes makes a lone /** {@inheritDoc} */
     // comment drop the method altogether,
-    // apparently if the method mentions an
+    // apparently if the method mentions a
     // parameter or return type of Vector<Float>
     // instead of Vector<E> as originally specified.
     // Adding an empty HTML fragment appears to
@@ -2790,7 +2790,7 @@ public abstract class FloatVector extends AbstractVector<Float> {
 
     /** {@inheritDoc} <!--workaround-->
      * @implNote
-     * When this method is used on used on vectors
+     * When this method is used on vectors
      * of type {@code FloatVector},
      * there will be no loss of precision.
      */
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 e11381e82c5..076a66ed6a5 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
@@ -84,7 +84,7 @@ public abstract class IntVector extends AbstractVector<Integer> {
     //       super.bOp((Byte128Vector) o);
     // The purpose of that is to forcibly inline
     // the generic definition from this file
-    // into a sharply type- and size-specific
+    // into a sharply-typed and size-specific
     // wrapper in the subclass file, so that
     // the JIT can specialize the code.
     // The code is only inlined and expanded
@@ -554,7 +554,7 @@ public abstract class IntVector extends AbstractVector<Integer> {
     // Note: A surprising behavior in javadoc
     // sometimes makes a lone /** {@inheritDoc} */
     // comment drop the method altogether,
-    // apparently if the method mentions an
+    // apparently if the method mentions a
     // parameter or return type of Vector<Integer>
     // instead of Vector<E> as originally specified.
     // Adding an empty HTML fragment appears to
@@ -1751,7 +1751,7 @@ public abstract class IntVector extends AbstractVector<Integer> {
      * Computes the bitwise logical conjunction ({@code &})
      * of this vector and a second input vector.
      *
-     * This is a lane-wise binary operation which applies the
+     * This is a lane-wise binary operation which applies
      * the primitive bitwise "and" operation ({@code &})
      * to each pair of corresponding lane values.
      *
@@ -1784,7 +1784,7 @@ public abstract class IntVector extends AbstractVector<Integer> {
      * Computes the bitwise logical conjunction ({@code &})
      * of this vector and a scalar.
      *
-     * This is a lane-wise binary operation which applies the
+     * This is a lane-wise binary operation which applies
      * the primitive bitwise "and" operation ({@code &})
      * to each pair of corresponding lane values.
      *
@@ -1808,7 +1808,7 @@ public abstract class IntVector extends AbstractVector<Integer> {
      * Computes the bitwise logical disjunction ({@code |})
      * of this vector and a second input vector.
      *
-     * This is a lane-wise binary operation which applies the
+     * This is a lane-wise binary operation which applies
      * the primitive bitwise "or" operation ({@code |})
      * to each pair of corresponding lane values.
      *
@@ -1841,7 +1841,7 @@ public abstract class IntVector extends AbstractVector<Integer> {
      * Computes the bitwise logical disjunction ({@code |})
      * of this vector and a scalar.
      *
-     * This is a lane-wise binary operation which applies the
+     * This is a lane-wise binary operation which applies
      * the primitive bitwise "or" operation ({@code |})
      * to each pair of corresponding lane values.
      *
@@ -1891,7 +1891,7 @@ public abstract class IntVector extends AbstractVector<Integer> {
      * Computes the bitwise logical complement ({@code ~})
      * of this vector.
      *
-     * This is a lane-wise binary operation which applies the
+     * This is a lane-wise binary operation which applies
      * the primitive bitwise "not" operation ({@code ~})
      * to each lane value.
      *
@@ -2936,7 +2936,7 @@ public abstract class IntVector extends AbstractVector<Integer> {
     /**
      * {@inheritDoc} <!--workaround-->
      * This is an alias for {@link #toArray()}
-     * When this method is used on used on vectors
+     * When this method is used on vectors
      * of type {@code IntVector},
      * there will be no loss of range or precision.
      */
@@ -2948,7 +2948,7 @@ public abstract class IntVector extends AbstractVector<Integer> {
 
     /** {@inheritDoc} <!--workaround-->
      * @implNote
-     * When this method is used on used on vectors
+     * When this method is used on vectors
      * of type {@code IntVector},
      * there will be no loss of precision or range,
      * and so no {@code UnsupportedOperationException} will
@@ -2968,7 +2968,7 @@ public abstract class IntVector extends AbstractVector<Integer> {
 
     /** {@inheritDoc} <!--workaround-->
      * @implNote
-     * When this method is used on used on vectors
+     * When this method is used on vectors
      * of type {@code IntVector},
      * there will be no loss of precision.
      */
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 4d54fbf7ad3..21903aa6794 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
@@ -84,7 +84,7 @@ public abstract class LongVector extends AbstractVector<Long> {
     //       super.bOp((Byte128Vector) o);
     // The purpose of that is to forcibly inline
     // the generic definition from this file
-    // into a sharply type- and size-specific
+    // into a sharply-typed and size-specific
     // wrapper in the subclass file, so that
     // the JIT can specialize the code.
     // The code is only inlined and expanded
@@ -554,7 +554,7 @@ public abstract class LongVector extends AbstractVector<Long> {
     // Note: A surprising behavior in javadoc
     // sometimes makes a lone /** {@inheritDoc} */
     // comment drop the method altogether,
-    // apparently if the method mentions an
+    // apparently if the method mentions a
     // parameter or return type of Vector<Long>
     // instead of Vector<E> as originally specified.
     // Adding an empty HTML fragment appears to
@@ -1664,7 +1664,7 @@ public abstract class LongVector extends AbstractVector<Long> {
      * Computes the bitwise logical conjunction ({@code &})
      * of this vector and a second input vector.
      *
-     * This is a lane-wise binary operation which applies the
+     * This is a lane-wise binary operation which applies
      * the primitive bitwise "and" operation ({@code &})
      * to each pair of corresponding lane values.
      *
@@ -1697,7 +1697,7 @@ public abstract class LongVector extends AbstractVector<Long> {
      * Computes the bitwise logical conjunction ({@code &})
      * of this vector and a scalar.
      *
-     * This is a lane-wise binary operation which applies the
+     * This is a lane-wise binary operation which applies
      * the primitive bitwise "and" operation ({@code &})
      * to each pair of corresponding lane values.
      *
@@ -1721,7 +1721,7 @@ public abstract class LongVector extends AbstractVector<Long> {
      * Computes the bitwise logical disjunction ({@code |})
      * of this vector and a second input vector.
      *
-     * This is a lane-wise binary operation which applies the
+     * This is a lane-wise binary operation which applies
      * the primitive bitwise "or" operation ({@code |})
      * to each pair of corresponding lane values.
      *
@@ -1754,7 +1754,7 @@ public abstract class LongVector extends AbstractVector<Long> {
      * Computes the bitwise logical disjunction ({@code |})
      * of this vector and a scalar.
      *
-     * This is a lane-wise binary operation which applies the
+     * This is a lane-wise binary operation which applies
      * the primitive bitwise "or" operation ({@code |})
      * to each pair of corresponding lane values.
      *
@@ -1804,7 +1804,7 @@ public abstract class LongVector extends AbstractVector<Long> {
      * Computes the bitwise logical complement ({@code ~})
      * of this vector.
      *
-     * This is a lane-wise binary operation which applies the
+     * This is a lane-wise binary operation which applies
      * the primitive bitwise "not" operation ({@code ~})
      * to each lane value.
      *
@@ -2816,7 +2816,7 @@ public abstract class LongVector extends AbstractVector<Long> {
     /**
      * {@inheritDoc} <!--workaround-->
      * This is an alias for {@link #toArray()}
-     * When this method is used on used on vectors
+     * When this method is used on vectors
      * of type {@code LongVector},
      * there will be no loss of range or precision.
      */
@@ -2828,7 +2828,7 @@ public abstract class LongVector extends AbstractVector<Long> {
 
     /** {@inheritDoc} <!--workaround-->
      * @implNote
-     * When this method is used on used on vectors
+     * When this method is used on vectors
      * of type {@code LongVector},
      * up to nine bits of precision may be lost
      * for lane values of large magnitude.
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 92ca4b1ca70..0bb97da8244 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
@@ -84,7 +84,7 @@ public abstract class ShortVector extends AbstractVector<Short> {
     //       super.bOp((Byte128Vector) o);
     // The purpose of that is to forcibly inline
     // the generic definition from this file
-    // into a sharply type- and size-specific
+    // into a sharply-typed and size-specific
     // wrapper in the subclass file, so that
     // the JIT can specialize the code.
     // The code is only inlined and expanded
@@ -554,7 +554,7 @@ public abstract class ShortVector extends AbstractVector<Short> {
     // Note: A surprising behavior in javadoc
     // sometimes makes a lone /** {@inheritDoc} */
     // comment drop the method altogether,
-    // apparently if the method mentions an
+    // apparently if the method mentions a
     // parameter or return type of Vector<Short>
     // instead of Vector<E> as originally specified.
     // Adding an empty HTML fragment appears to
@@ -1748,7 +1748,7 @@ public abstract class ShortVector extends AbstractVector<Short> {
      * Computes the bitwise logical conjunction ({@code &})
      * of this vector and a second input vector.
      *
-     * This is a lane-wise binary operation which applies the
+     * This is a lane-wise binary operation which applies
      * the primitive bitwise "and" operation ({@code &})
      * to each pair of corresponding lane values.
      *
@@ -1781,7 +1781,7 @@ public abstract class ShortVector extends AbstractVector<Short> {
      * Computes the bitwise logical conjunction ({@code &})
      * of this vector and a scalar.
      *
-     * This is a lane-wise binary operation which applies the
+     * This is a lane-wise binary operation which applies
      * the primitive bitwise "and" operation ({@code &})
      * to each pair of corresponding lane values.
      *
@@ -1805,7 +1805,7 @@ public abstract class ShortVector extends AbstractVector<Short> {
      * Computes the bitwise logical disjunction ({@code |})
      * of this vector and a second input vector.
      *
-     * This is a lane-wise binary operation which applies the
+     * This is a lane-wise binary operation which applies
      * the primitive bitwise "or" operation ({@code |})
      * to each pair of corresponding lane values.
      *
@@ -1838,7 +1838,7 @@ public abstract class ShortVector extends AbstractVector<Short> {
      * Computes the bitwise logical disjunction ({@code |})
      * of this vector and a scalar.
      *
-     * This is a lane-wise binary operation which applies the
+     * This is a lane-wise binary operation which applies
      * the primitive bitwise "or" operation ({@code |})
      * to each pair of corresponding lane values.
      *
@@ -1907,7 +1907,7 @@ public abstract class ShortVector extends AbstractVector<Short> {
      * Computes the bitwise logical complement ({@code ~})
      * of this vector.
      *
-     * This is a lane-wise binary operation which applies the
+     * This is a lane-wise binary operation which applies
      * the primitive bitwise "not" operation ({@code ~})
      * to each lane value.
      *
@@ -2951,7 +2951,7 @@ public abstract class ShortVector extends AbstractVector<Short> {
 
     /** {@inheritDoc} <!--workaround-->
      * @implNote
-     * When this method is used on used on vectors
+     * When this method is used on vectors
      * of type {@code ShortVector},
      * there will be no loss of precision or range,
      * and so no {@code UnsupportedOperationException} will
@@ -2971,7 +2971,7 @@ public abstract class ShortVector extends AbstractVector<Short> {
 
     /** {@inheritDoc} <!--workaround-->
      * @implNote
-     * When this method is used on used on vectors
+     * When this method is used on vectors
      * of type {@code ShortVector},
      * there will be no loss of precision or range,
      * and so no {@code UnsupportedOperationException} will
@@ -2991,7 +2991,7 @@ public abstract class ShortVector extends AbstractVector<Short> {
 
     /** {@inheritDoc} <!--workaround-->
      * @implNote
-     * When this method is used on used on vectors
+     * When this method is used on vectors
      * of type {@code ShortVector},
      * there will be no loss of precision.
      */
diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Vector.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Vector.java
index 76d6392e48a..0e4516efa86 100644
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Vector.java
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Vector.java
@@ -146,7 +146,7 @@ import java.util.Arrays;
  * {@code VSHAPE}.  Each possible {@code VSHAPE} is represented by
  * a member of the {@link VectorShape} enumeration, and represents
  * an implementation format shared in common by all vectors of
- * that shape.  Thus, the {@linkplain #bitSize() size in bits} of
+ * that shape.  Thus, the {@linkplain #bitSize() size in bits}
  * of a vector is determined by appealing to its vector shape.
  *
  * <p> Some Java platforms give special support to only one shape,
@@ -195,12 +195,12 @@ import java.util.Arrays;
  * <h2><a id="subtypes"></a>Vector subtypes</h2>
  *
  * Vector declares a set of vector operations (methods) that are common to all
- * element types (such as addition).  Sub-classes of Vector with a concrete
+ * element types (such as addition).  Subclasses of Vector with a concrete
  * element type declare further operations that are specific to that
  * element type (such as access to element values in lanes, logical operations
  * on values of integral elements types, or transcendental operations on values
  * of floating point element types).
- * There are six abstract sub-classes of Vector corresponding to the supported set
+ * There are six abstract subclasses of Vector corresponding to the supported set
  * of element types, {@link ByteVector}, {@link ShortVector},
  * {@link IntVector}, {@link LongVector}, {@link FloatVector}, and
  * {@link DoubleVector}. Along with type-specific operations these classes
@@ -325,7 +325,7 @@ import java.util.Arrays;
  * this API has no support for
  * lane-wise n-ary operations.
  *
- * For each lane of all of the input vectors {@code v[j]},
+ * For each lane of all the input vectors {@code v[j]},
  * the underlying scalar operator is applied to the lane values.
  * The result is placed into the vector result in the same lane.
  * The following pseudocode illustrates the behavior of this operation
@@ -555,7 +555,7 @@ import java.util.Arrays;
  * <p> An operation suppressed by a mask will never cause an exception
  * or side effect of any sort, even if the underlying scalar operator
  * can potentially do so.  For example, an unset lane that seems to
- * access an out of bounds array element or divide an integral value
+ * access an out-of-bounds array element or divide an integral value
  * by zero will simply be ignored.  Values in suppressed lanes never
  * participate or appear in the result of the overall operation.
  *
@@ -578,7 +578,7 @@ import java.util.Arrays;
  * does not exist (because it is out of an array's index range).</li>
  *
  * <li>If the operation is a cross-lane operation with an operand
- * which supplies lane indexes (of type {@code VectorShuffle} or
+ * which supplies lane indexes (of type {@code VectorShuffle}) or
  * {@code Vector}, suppressed lanes are not computed, and are filled
  * with the zero default value.  Normally, invalid lane indexes elicit
  * an {@code IndexOutOfBoundsException}, but if a lane is unset, the
@@ -739,11 +739,11 @@ import java.util.Arrays;
  * byte order is slightly preferable to an equivalent big-endian
  * fiction, because some related formulas are much simpler,
  * specifically those which renumber bytes after lane structure
- * changes.  The earliest byte is invariantly earliest across all lane
- * structure changes, but only if little-endian convention are used.
+ * changes.  The earliest byte is invariantly the earliest across all
+ * lane structure changes, but only if little-endian convention are used.
  * The root cause of this is that bytes in scalars are numbered from
  * the least significant (rightmost) to the most significant
- * (leftmost), and almost never vice-versa.  If we habitually numbered
+ * (leftmost), and almost never vice versa.  If we habitually numbered
  * sign bits as zero (as on some computers) then this API would reach
  * for big-endian fictions to create unified addressing of vector
  * bytes.
@@ -983,7 +983,7 @@ import java.util.Arrays;
  * {@linkplain #bitSize() vector bit-size} of its input is
  * crammed into a smaller (respectively, dropped into a larger)
  * output container by a factor of {@code M}.
- * Otherwise it is an in-place operation.
+ * Otherwise, it is an in-place operation.
  *
  * Since this method is a reinterpretation cast that can erase and
  * redraw lane boundaries as well as modify shape, the input vector's
@@ -1035,7 +1035,7 @@ import java.util.Arrays;
  * methods, which select an arbitrary set of {@code VLENGTH} lanes
  * from one or two input vectors, and assemble them in an arbitrary
  * order.  The selection and order of lanes is controlled by a
- * {@code VectorShuffle} object, which acts as an routing table
+ * {@code VectorShuffle} object, which acts as a routing table
  * mapping source lanes to destination lanes.  A {@code VectorShuffle}
  * can encode a mathematical permutation as well as many other
  * patterns of data movement.
@@ -1111,7 +1111,7 @@ import java.util.Arrays;
  *
  * <li> ARM AArch64 platforms supporting NEON.  Although the API has
  * been designed to ensure ARM SVE instructions can be supported
- * (vector sizes between 128 to 2048 bits) there is currently no
+ * (vector sizes between 128 and 2048 bits) there is currently no
  * implementation of such instructions and the general masking
  * capability.
  *
@@ -1941,14 +1941,14 @@ public abstract class Vector<E> extends jdk.internal.vm.vector.VectorSupport.Vec
      * of the vector's native {@code ETYPE}.
      * (In the case of floating point types, the value
      * {@code NEGATIVE_INFINITY} is used, and will appear
-     * after casting as {@code Long.MIN_VALUE}.
+     * after casting as {@code Long.MIN_VALUE}.)
      * <li>
      * If the operation is {@code MIN},
      * then the identity value is the {@code MAX_VALUE}
      * of the vector's native {@code ETYPE}.
      * (In the case of floating point types, the value
      * {@code POSITIVE_INFINITY} is used, and will appear
-     * after casting as {@code Long.MAX_VALUE}.
+     * after casting as {@code Long.MAX_VALUE}.)
      * </ul>
      * <p>
      * In the case of operations {@code ADD} and {@code MUL},
@@ -2257,7 +2257,7 @@ public abstract class Vector<E> extends jdk.internal.vm.vector.VectorSupport.Vec
      * in lane {@code N} of the current vector.
      *
      * <p> The scale must not be so large, and the element size must
-     * not be so small, that that there would be an overflow when
+     * not be so small, that there would be an overflow when
      * computing any of the {@code N*scale} or {@code VLENGTH*scale},
      * when the result is represented using the vector
      * lane type {@code ETYPE}.
@@ -2339,7 +2339,7 @@ public abstract class Vector<E> extends jdk.internal.vm.vector.VectorSupport.Vec
      *
      * <li>To shift lanes backward to the back of the vector, supply a
      * zero vector for the <em>first</em> operand, and specify the
-     * negative shift count as the origin (modulo {@code VLENGTH}.
+     * negative shift count as the origin (modulo {@code VLENGTH}).
      * For example: {@code v.broadcast(0).slice(v.length()-shift, v)}.
      *
      * <li>To rotate lanes forward toward the front end of the vector,
@@ -2354,7 +2354,7 @@ public abstract class Vector<E> extends jdk.internal.vm.vector.VectorSupport.Vec
      * {@code v.slice(v.length() - rotate, v)}.
      *
      * <li>
-     * Since {@code origin} values less then zero or more than
+     * Since {@code origin} values less than zero or more than
      * {@code VLENGTH} will be rejected, if you need to rotate
      * by an unpredictable multiple of {@code VLENGTH}, be sure
      * to reduce the origin value into the required range.
@@ -2426,7 +2426,7 @@ public abstract class Vector<E> extends jdk.internal.vm.vector.VectorSupport.Vec
      * @see #slice(int,Vector)
      * @see #unslice(int,Vector,int,VectorMask)
      */
-    // This doesn't pull its weight, but its symmetrical with
+    // This doesn't pull its weight, but it's symmetrical with
     // masked unslice, and might cause questions if missing.
     // It could make for clearer code.
     public abstract Vector<E> slice(int origin, Vector<E> v1, VectorMask<E> m);
@@ -2636,7 +2636,7 @@ public abstract class Vector<E> extends jdk.internal.vm.vector.VectorSupport.Vec
      * source index {@code I=s.wrapIndex(s.laneSource(N))} in the shuffle,
      * the output lane {@code N} obtains the value from
      * the input vector at lane {@code I} if the mask is set.
-     * Otherwise the output lane {@code N} is set to zero.
+     * Otherwise, the output lane {@code N} is set to zero.
      *
      * <p> This method returns the value of this pseudocode:
      * <pre>{@code
@@ -2868,7 +2868,7 @@ public abstract class Vector<E> extends jdk.internal.vm.vector.VectorSupport.Vec
      *
      * @apiNote
      * Subtypes improve on this method by sharpening
-     * the method return type and
+     * the method return type
      * and the type of the scalar parameter {@code e}.
      *
      * @param e the value to broadcast
@@ -2934,7 +2934,7 @@ public abstract class Vector<E> extends jdk.internal.vm.vector.VectorSupport.Vec
      * <p>
      * The underlying bits of this vector are copied to the resulting
      * vector without modification, but those bits, before copying,
-     * may be truncated if the this vector's bit-size is greater than
+     * may be truncated if this vector's bit-size is greater than
      * desired vector's bit size, or filled with zero bits if this
      * vector's bit-size is less than desired vector's bit-size.
      *
@@ -3187,7 +3187,7 @@ public abstract class Vector<E> extends jdk.internal.vm.vector.VectorSupport.Vec
      * documented, conversion operations <em>never change vector
      * shape</em>, regardless of how they may change <em>lane sizes</em>.
      *
-     * Therefore an <em>expanding</em> conversion cannot store all of its
+     * Therefore, an <em>expanding</em> conversion cannot store all of its
      * results in its output vector, because the output vector has fewer
      * lanes of larger size, in order to have the same overall bit-size as
      * its input.
@@ -3199,7 +3199,7 @@ public abstract class Vector<E> extends jdk.internal.vm.vector.VectorSupport.Vec
      * <p> As an example, a conversion from {@code byte} to {@code long}
      * ({@code M=8}) will discard 87.5% of the input values in order to
      * convert the remaining 12.5% into the roomy {@code long} lanes of
-     * the output vector. The inverse conversion will convert back all of
+     * the output vector. The inverse conversion will convert back all
      * the large results, but will waste 87.5% of the lanes in the output
      * vector.
      *
diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/VectorMask.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/VectorMask.java
index cdf5b589be7..5695dff62fb 100644
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/VectorMask.java
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/VectorMask.java
@@ -342,9 +342,9 @@ public abstract class VectorMask<E> extends jdk.internal.vm.vector.VectorSupport
     public abstract boolean anyTrue();
 
     /**
-     * Returns {@code true} if all of the mask lanes are set.
+     * Returns {@code true} if all the mask lanes are set.
      *
-     * @return {@code true} if all of the mask lanes are set, otherwise
+     * @return {@code true} if all the mask lanes are set, otherwise
      * {@code false}.
      */
     public abstract boolean allTrue();
@@ -528,7 +528,7 @@ public abstract class VectorMask<E> extends jdk.internal.vm.vector.VectorSupport
      * For each mask lane, where {@code N} is the mask lane index, if
      * the mask lane is set at {@code N} then the specific non-default
      * value {@code -1} is placed into the resulting vector at lane
-     * index {@code N}.  Otherwise the default element value {@code 0}
+     * index {@code N}.  Otherwise, the default element value {@code 0}
      * is placed into the resulting vector at lane index {@code N}.
      *
      * Whether the element type ({@code ETYPE}) of this mask is
diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/VectorMath.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/VectorMath.java
index 0d590d2d49a..67c9387dfd6 100644
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/VectorMath.java
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/VectorMath.java
@@ -67,7 +67,7 @@ public final class VectorMath {
 
     /**
      * Adds two {@code long} values using saturation
-     * arithemetic. The lower and upper (inclusive) bounds are
+     * arithmetic. The lower and upper (inclusive) bounds are
      * {@code Long.MIN_VALUE} and {@code Long.MAX_VALUE}, respectively.
      * <p>
      * If the result of the addition would otherwise overflow from
@@ -94,7 +94,7 @@ public final class VectorMath {
 
     /**
      * Subtracts two {@code long} values using saturation
-     * arithemetic. The lower and upper (inclusive) bounds are
+     * arithmetic. The lower and upper (inclusive) bounds are
      * {@code Long.MIN_VALUE} and {@code Long.MAX_VALUE}, respectively.
      * <p>
      * If the result of the subtraction would otherwise overflow from
@@ -122,7 +122,7 @@ public final class VectorMath {
 
     /**
      * Adds two {@code long} values using saturation
-     * arithemetic and numerically treating the values
+     * arithmetic and numerically treating the values
      * as unsigned. The lower and upper (inclusive) bounds
      * are {@code 0L} and {@code 0xFFFFFFFF_FFFFFFFFL}, respectively,
      * numerically treating them as unsigned.
@@ -148,7 +148,7 @@ public final class VectorMath {
 
     /**
      * Subtracts two {@code long} values using saturation
-     * arithemetic and numerically treating the values
+     * arithmetic and numerically treating the values
      * as unsigned. The lower and upper (inclusive) bounds
      * are {@code 0L} and {@code 0xFFFFFFFF_FFFFFFFFL}, respectively,
      * numerically treating them as unsigned.
@@ -204,7 +204,7 @@ public final class VectorMath {
 
     /**
      * Adds two {@code int} values using saturation
-     * arithemetic. The lower and upper (inclusive) bounds are
+     * arithmetic. The lower and upper (inclusive) bounds are
      * {@code Integer.MIN_VALUE} and {@code Integer.MAX_VALUE}, respectively.
      * <p>
      * If the result of the addition would otherwise overflow from
@@ -232,7 +232,7 @@ public final class VectorMath {
 
     /**
      * Subtracts two {@code int} values using saturation
-     * arithemetic. The lower and upper (inclusive) bounds are
+     * arithmetic. The lower and upper (inclusive) bounds are
      * {@code Integer.MIN_VALUE} and {@code Integer.MAX_VALUE}, respectively.
      * <p>
      * If the result of the subtraction would otherwise overflow from
@@ -260,7 +260,7 @@ public final class VectorMath {
 
     /**
      * Adds two {@code int} values using saturation
-     * arithemetic and numerically treating the values
+     * arithmetic and numerically treating the values
      * as unsigned. The lower and upper (inclusive) bounds
      * are {@code 0} and {@code 0xFFFFFFFF}, respectively,
      * numerically treating them as unsigned.
@@ -286,7 +286,7 @@ public final class VectorMath {
 
     /**
      * Subtracts two {@code int} values using saturation
-     * arithemetic and numerically treating the values
+     * arithmetic and numerically treating the values
      * as unsigned. The lower and upper (inclusive) bounds
      * are {@code 0} and {@code -0xFFFFFFFF}, respectively,
      * numerically treating them as unsigned.
@@ -342,7 +342,7 @@ public final class VectorMath {
 
     /**
      * Adds two {@code short} values using saturation
-     * arithemetic. The lower and upper (inclusive) bounds are
+     * arithmetic. The lower and upper (inclusive) bounds are
      * {@code Short.MIN_VALUE} and {@code Short.MAX_VALUE}, respectively.
      * <p>
      * If the result of the addition would otherwise overflow from
@@ -370,7 +370,7 @@ public final class VectorMath {
 
     /**
      * Subtracts two {@code short} values using saturation
-     * arithemetic. The lower and upper (inclusive) bounds are
+     * arithmetic. The lower and upper (inclusive) bounds are
      * {@code Short.MIN_VALUE} and {@code Short.MAX_VALUE}, respectively.
      * <p>
      * If the result of the subtraction would otherwise overflow from
@@ -398,7 +398,7 @@ public final class VectorMath {
 
     /**
      * Adds two {@code short} values using saturation
-     * arithemetic and numerically treating the values
+     * arithmetic and numerically treating the values
      * as unsigned. The lower and upper (inclusive) bounds
      * are {@code 0} and {@code 0xFFFF}, respectively,
      * numerically treating them as unsigned.
@@ -424,7 +424,7 @@ public final class VectorMath {
 
     /**
      * Subtracts two {@code short} values using saturation
-     * arithemetic and numerically treating the values
+     * arithmetic and numerically treating the values
      * as unsigned. The lower and upper (inclusive) bounds
      * are {@code 0} and {@code 0xFFFF}, respectively,
      * numerically treating them as unsigned.
@@ -480,7 +480,7 @@ public final class VectorMath {
 
     /**
      * Adds two {@code byte} values using saturation
-     * arithemetic. The lower and upper (inclusive) bounds are
+     * arithmetic. The lower and upper (inclusive) bounds are
      * {@code Byte.MIN_VALUE} and {@code Byte.MAX_VALUE}, respectively.
      * <p>
      * If the result of the addition would otherwise overflow from
@@ -508,7 +508,7 @@ public final class VectorMath {
 
     /**
      * Subtracts two {@code byte} values using saturation
-     * arithemetic. The lower and upper (inclusive) bounds are
+     * arithmetic. The lower and upper (inclusive) bounds are
      * {@code Byte.MIN_VALUE} and {@code Byte.MAX_VALUE}, respectively.
      * <p>
      * If the result of the subtraction would otherwise overflow from
@@ -536,7 +536,7 @@ public final class VectorMath {
 
     /**
      * Adds two {@code byte} values using saturation
-     * arithemetic and numerically treating the values
+     * arithmetic and numerically treating the values
      * as unsigned. The lower and upper (inclusive) bounds
      * are {@code 0} and {@code 0xFF}, respectively,
      * numerically treating them as unsigned.
@@ -562,7 +562,7 @@ public final class VectorMath {
 
     /**
      * Subtracts two {@code byte} values using saturation
-     * arithemetic and numerically treating the values
+     * arithmetic and numerically treating the values
      * as unsigned. The lower and upper (inclusive) bounds
      * are {@code 0} and {@code 0xFF}, respectively,
      * numerically treating them as unsigned.
diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/VectorSpecies.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/VectorSpecies.java
index 03cb0ae559e..e14cdecbc4a 100644
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/VectorSpecies.java
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/VectorSpecies.java
@@ -272,7 +272,7 @@ public interface VectorSpecies<E> {
      * viewed as measuring the proportion of "dropped input bits"
      * which must be deleted from the input in order for the result to
      * fit in the output vector.  It is also the <em>part limit</em>,
-     * a upper exclusive limit on the {@code part} parameter to a
+     * an upper exclusive limit on the {@code part} parameter to a
      * method that would transform the input species to the output
      * species.
      *
@@ -392,7 +392,7 @@ public interface VectorSpecies<E> {
      * <li>{@linkplain Vector#reinterpretShape(VectorSpecies, int) Reinterpretation casts}
      * between vectors of preferred species will neither truncate
      * lanes nor fill them with default values.
-     * <li>For any particular element type, some platform might possibly
+     * <li>For any particular element type, some platform might
      * provide a {@linkplain #ofLargestShape(Class) larger vector shape}
      * that (as a trade-off) does not support all possible element types.
      * </ul>
@@ -548,7 +548,7 @@ public interface VectorSpecies<E> {
      *
      * <p> This method returns the value of this expression:
      * {@code EVector.broadcast(this, (ETYPE)e)}, where
-     * {@code EVector} is the vector class specific to the
+     * {@code EVector} is the vector class specific to
      * the {@code ETYPE} of this species.
      * The {@code long} value must be accurately representable
      * by {@code ETYPE}, so that {@code e==(long)(ETYPE)e}.
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 235641b57a0..8084cc307e8 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
@@ -88,7 +88,7 @@ public abstract class $abstractvectortype$ extends AbstractVector<$Boxtype$> {
     //       super.bOp((Byte128Vector) o);
     // The purpose of that is to forcibly inline
     // the generic definition from this file
-    // into a sharply type- and size-specific
+    // into a sharply-typed and size-specific
     // wrapper in the subclass file, so that
     // the JIT can specialize the code.
     // The code is only inlined and expanded
@@ -568,7 +568,7 @@ public abstract class $abstractvectortype$ extends AbstractVector<$Boxtype$> {
     // Note: A surprising behavior in javadoc
     // sometimes makes a lone /** {@inheritDoc} */
     // comment drop the method altogether,
-    // apparently if the method mentions an
+    // apparently if the method mentions a
     // parameter or return type of Vector<$Boxtype$>
     // instead of Vector<E> as originally specified.
     // Adding an empty HTML fragment appears to
@@ -1942,7 +1942,7 @@ public abstract class $abstractvectortype$ extends AbstractVector<$Boxtype$> {
      * Computes the bitwise logical conjunction ({@code &})
      * of this vector and a second input vector.
      *
-     * This is a lane-wise binary operation which applies the
+     * This is a lane-wise binary operation which applies
      * the primitive bitwise "and" operation ({@code &})
      * to each pair of corresponding lane values.
      *
@@ -1975,7 +1975,7 @@ public abstract class $abstractvectortype$ extends AbstractVector<$Boxtype$> {
      * Computes the bitwise logical conjunction ({@code &})
      * of this vector and a scalar.
      *
-     * This is a lane-wise binary operation which applies the
+     * This is a lane-wise binary operation which applies
      * the primitive bitwise "and" operation ({@code &})
      * to each pair of corresponding lane values.
      *
@@ -1999,7 +1999,7 @@ public abstract class $abstractvectortype$ extends AbstractVector<$Boxtype$> {
      * Computes the bitwise logical disjunction ({@code |})
      * of this vector and a second input vector.
      *
-     * This is a lane-wise binary operation which applies the
+     * This is a lane-wise binary operation which applies
      * the primitive bitwise "or" operation ({@code |})
      * to each pair of corresponding lane values.
      *
@@ -2032,7 +2032,7 @@ public abstract class $abstractvectortype$ extends AbstractVector<$Boxtype$> {
      * Computes the bitwise logical disjunction ({@code |})
      * of this vector and a scalar.
      *
-     * This is a lane-wise binary operation which applies the
+     * This is a lane-wise binary operation which applies
      * the primitive bitwise "or" operation ({@code |})
      * to each pair of corresponding lane values.
      *
@@ -2202,7 +2202,7 @@ public abstract class $abstractvectortype$ extends AbstractVector<$Boxtype$> {
      * Computes the bitwise logical complement ({@code ~})
      * of this vector.
      *
-     * This is a lane-wise binary operation which applies the
+     * This is a lane-wise binary operation which applies
      * the primitive bitwise "not" operation ({@code ~})
      * to each lane value.
      *
@@ -3499,7 +3499,7 @@ public abstract class $abstractvectortype$ extends AbstractVector<$Boxtype$> {
     /**
      * {@inheritDoc} <!--workaround-->
      * This is an alias for {@link #toArray()}
-     * When this method is used on used on vectors
+     * When this method is used on vectors
      * of type {@code $abstractvectortype$},
      * there will be no loss of range or precision.
      */
@@ -3513,7 +3513,7 @@ public abstract class $abstractvectortype$ extends AbstractVector<$Boxtype$> {
 #if[!FP]
 #if[!long]
      * @implNote
-     * When this method is used on used on vectors
+     * When this method is used on vectors
      * of type {@code $abstractvectortype$},
      * there will be no loss of precision or range,
      * and so no {@code UnsupportedOperationException} will
@@ -3538,7 +3538,7 @@ public abstract class $abstractvectortype$ extends AbstractVector<$Boxtype$> {
     /**
      * {@inheritDoc} <!--workaround-->
      * This is an alias for {@link #toArray()}
-     * When this method is used on used on vectors
+     * When this method is used on vectors
      * of type {@code $abstractvectortype$},
      * there will be no loss of range or precision.
      */
@@ -3551,7 +3551,7 @@ public abstract class $abstractvectortype$ extends AbstractVector<$Boxtype$> {
     /** {@inheritDoc} <!--workaround-->
 #if[!FP]
      * @implNote
-     * When this method is used on used on vectors
+     * When this method is used on vectors
      * of type {@code $abstractvectortype$},
      * there will be no loss of precision or range,
      * and so no {@code UnsupportedOperationException} will
@@ -3575,7 +3575,7 @@ public abstract class $abstractvectortype$ extends AbstractVector<$Boxtype$> {
     /** {@inheritDoc} <!--workaround-->
      * @implNote
      * This is an alias for {@link #toArray()}
-     * When this method is used on used on vectors
+     * When this method is used on vectors
      * of type {@code $abstractvectortype$},
      * there will be no loss of precision.
      */
@@ -3588,13 +3588,13 @@ public abstract class $abstractvectortype$ extends AbstractVector<$Boxtype$> {
     /** {@inheritDoc} <!--workaround-->
 #if[long]
      * @implNote
-     * When this method is used on used on vectors
+     * When this method is used on vectors
      * of type {@code $abstractvectortype$},
      * up to nine bits of precision may be lost
      * for lane values of large magnitude.
 #else[long]
      * @implNote
-     * When this method is used on used on vectors
+     * When this method is used on vectors
      * of type {@code $abstractvectortype$},
      * there will be no loss of precision.
 #end[long]
diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/package-info.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/package-info.java
index 3c509f60769..859c66c5f63 100644
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/package-info.java
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/package-info.java
@@ -141,7 +141,7 @@
  * to prevent reading/writing past the array length.
  * The first {@code a.length / SPECIES.length()} iterations will have a mask
  * with all lanes set. Only the final iteration (if {@code a.length}
- * is not a multiple of {@code SPECIES.length()} will have a mask with
+ * is not a multiple of {@code SPECIES.length()}) will have a mask with
  * the first {@code a.length % SPECIES.length()} lanes set.
  *
  * Since a mask is used in all iterations, the above implementation

From 06289f3d90577d220de5509a3892f7ed260c24b9 Mon Sep 17 00:00:00 2001
From: Matthias Baesken <mbaesken@openjdk.org>
Date: Sun, 16 Mar 2025 13:04:45 +0000
Subject: [PATCH 359/587] 8351821: VMManagementImpl.c avoid switching off
 warnings

Reviewed-by: ihse, kevinw
---
 make/modules/java.management/Lib.gmk                      | 2 --
 .../share/native/libmanagement/VMManagementImpl.c         | 8 ++------
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/make/modules/java.management/Lib.gmk b/make/modules/java.management/Lib.gmk
index 283b7f574d4..89c99266fcc 100644
--- a/make/modules/java.management/Lib.gmk
+++ b/make/modules/java.management/Lib.gmk
@@ -34,8 +34,6 @@ include LibCommon.gmk
 $(eval $(call SetupJdkLibrary, BUILD_LIBMANAGEMENT, \
     NAME := management, \
     OPTIMIZATION := HIGH, \
-    DISABLED_WARNINGS_gcc_VMManagementImpl.c := unused-variable, \
-    DISABLED_WARNINGS_clang_VMManagementImpl.c := unused-variable, \
     JDK_LIBS := java.base:libjava java.base:libjvm, \
     LIBS_aix := -lperfstat, \
     LIBS_windows := advapi32.lib psapi.lib, \
diff --git a/src/java.management/share/native/libmanagement/VMManagementImpl.c b/src/java.management/share/native/libmanagement/VMManagementImpl.c
index 46f3b03b18e..f1a566676dc 100644
--- a/src/java.management/share/native/libmanagement/VMManagementImpl.c
+++ b/src/java.management/share/native/libmanagement/VMManagementImpl.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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,9 @@ Java_sun_management_VMManagementImpl_getVersion0
 {
     char buf[MAX_VERSION_LEN];
     jstring version_string = NULL;
-
     unsigned int major = ((unsigned int) jmm_version & 0x0FFF0000) >> 16;
     unsigned int minor = ((unsigned int) jmm_version & 0xFF00) >> 8;
 
-    // for internal use
-    unsigned int micro = (unsigned int) jmm_version & 0xFF;
-
     snprintf(buf, sizeof(buf), "%d.%d", major, minor);
     version_string = (*env)->NewStringUTF(env, buf);
     return version_string;
@@ -64,7 +60,7 @@ Java_sun_management_VMManagementImpl_initOptionalSupportFields
   (JNIEnv *env, jclass cls)
 {
     jmmOptionalSupport mos;
-    jint ret = jmm_interface->GetOptionalSupport(env, &mos);
+    jmm_interface->GetOptionalSupport(env, &mos);
 
     jboolean value;
 

From 63bf79183d27d79333c4ab58dbec1820e935f426 Mon Sep 17 00:00:00 2001
From: Erik Gahlin <egahlin@openjdk.org>
Date: Sun, 16 Mar 2025 21:47:25 +0000
Subject: [PATCH 360/587] 8351992: JFR: Improve robustness of the
 SettingControl examples

Reviewed-by: mgronlun
---
 .../share/classes/jdk/jfr/SettingControl.java |  2 +-
 .../jdk/jfr/snippet-files/Snippets.java       | 55 +++++++++++++++----
 2 files changed, 44 insertions(+), 13 deletions(-)

diff --git a/src/jdk.jfr/share/classes/jdk/jfr/SettingControl.java b/src/jdk.jfr/share/classes/jdk/jfr/SettingControl.java
index ac73f6d4c12..dd2c111e6e8 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/SettingControl.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/SettingControl.java
@@ -30,7 +30,7 @@ import java.util.Set;
 /**
  * Base class to extend to create setting controls.
  * <p>
- * The following example shows a naive implementation of a setting control for
+ * The following example shows an implementation of a setting control for
  * regular expressions:
  *
  * {@snippet class="Snippets" region="SettingControlOverview1"}
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/snippet-files/Snippets.java b/src/jdk.jfr/share/classes/jdk/jfr/snippet-files/Snippets.java
index b2f3f62fbe7..a8cb6f0111d 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/snippet-files/Snippets.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/snippet-files/Snippets.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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 @@ import java.util.Set;
 import java.util.StringJoiner;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.regex.Pattern;
+import java.util.regex.PatternSyntaxException;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
@@ -97,16 +98,26 @@ public class Snippets {
     @Label("Rollback")
     @Description("Include transactions that are rollbacked")
     public static class RollbackSetting extends SettingControl {
+        private static final String DEFAULT_VALUE = "true";
         private boolean value = true;
 
         @Override
         public String combine(Set<String> values) {
-            return values.contains("true") ? "true" : "false";
+            if (values.contains("true")) {
+                return "true";
+            }
+            if (values.contains("false")) {
+                return "false";
+            }
+            return DEFAULT_VALUE;
         }
 
         @Override
-        public void setValue(String settingValue) {
-            value = "true".equals(settingValue);
+        public void setValue(String value) {
+            // Ignore invalid values
+            if ("true".equals(value) || "false".equals(value)) {
+                this.value = "true".equals(value);
+            }
         }
 
         @Override
@@ -507,21 +518,41 @@ public class Snippets {
 
  // @start region="SettingControlOverview1"
  final class RegExpControl extends SettingControl {
-     private Pattern pattern = Pattern.compile(".*");
-
-     @Override
-     public void setValue(String value) {
-         this.pattern = Pattern.compile(value);
-     }
+     private static final String DEFAULT_VALUE = ".*";
+     private Pattern pattern = Pattern.compile(DEFAULT_VALUE);
 
      @Override
      public String combine(Set<String> values) {
-         return String.join("|", values);
+         List<String> valid = new ArrayList<>();
+         for (String value : values) {
+             try {
+                 Pattern.compile(value);
+                 valid.add(value);
+             } catch (PatternSyntaxException pse) {
+                 // Ignore invalid patterns
+             }
+         }
+         if (valid.isEmpty()) {
+             return DEFAULT_VALUE;
+         }
+         if (valid.size() == 1) {
+             return valid.getFirst();
+         }
+         return "(" + String.join(")|(", valid) + ")";
+     }
+
+     @Override
+     public void setValue(String value) {
+         try {
+             this.pattern = Pattern.compile(value);
+         } catch (PatternSyntaxException pse) {
+             // Ignore invalid patterns
+         }
      }
 
      @Override
      public String getValue() {
-         return pattern.toString();
+         return pattern.pattern();
      }
 
      public boolean matches(String s) {

From 2672c40bf10a6597ae861e2183e7558ffed43dba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joel=20Sikstr=C3=B6m?= <jsikstro@openjdk.org>
Date: Mon, 17 Mar 2025 07:55:44 +0000
Subject: [PATCH 361/587] 8351167: ZGC: Lazily initialize livemap

Reviewed-by: sjohanss, eosterlund, tschatzl
---
 src/hotspot/share/gc/z/zLiveMap.cpp        | 19 ++++++++++++++++---
 src/hotspot/share/gc/z/zLiveMap.hpp        |  5 ++++-
 src/hotspot/share/gc/z/zLiveMap.inline.hpp |  4 ++--
 src/hotspot/share/gc/z/zPage.inline.hpp    |  4 ++--
 4 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/src/hotspot/share/gc/z/zLiveMap.cpp b/src/hotspot/share/gc/z/zLiveMap.cpp
index cc7271f99a7..ef125af9c2e 100644
--- a/src/hotspot/share/gc/z/zLiveMap.cpp
+++ b/src/hotspot/share/gc/z/zLiveMap.cpp
@@ -45,9 +45,16 @@ ZLiveMap::ZLiveMap(uint32_t size)
     _live_bytes(0),
     _segment_live_bits(0),
     _segment_claim_bits(0),
-    _bitmap(bitmap_size(size, NumSegments)),
+    _bitmap_size(bitmap_size(size, NumSegments)),
+    _bitmap(0),
     _segment_shift(log2i_exact(segment_size())) {}
 
+void ZLiveMap::allocate_bitmap() {
+  if (_bitmap.size() != _bitmap_size) {
+    _bitmap.initialize(_bitmap_size, false /* clear */);
+  }
+}
+
 void ZLiveMap::reset(ZGenerationId id) {
   ZGeneration* const generation = ZGeneration::generation(id);
   const uint32_t seqnum_initializing = (uint32_t)-1;
@@ -64,6 +71,10 @@ void ZLiveMap::reset(ZGenerationId id) {
       _live_bytes = 0;
       _live_objects = 0;
 
+      // We lazily initialize the bitmap the first time the page is
+      // marked, i.e. a bit is about to be set for the first time.
+      allocate_bitmap();
+
       // Clear segment claimed/live bits
       segment_live_bits().clear();
       segment_claim_bits().clear();
@@ -127,8 +138,10 @@ void ZLiveMap::reset_segment(BitMap::idx_t segment) {
 
 void ZLiveMap::resize(uint32_t size) {
   const size_t new_bitmap_size = bitmap_size(size, NumSegments);
-  if (_bitmap.size() != new_bitmap_size) {
+  _bitmap_size = new_bitmap_size;
+  _segment_shift = log2i_exact(segment_size());
+
+  if (_bitmap.size() != 0 && _bitmap.size() != new_bitmap_size) {
     _bitmap.reinitialize(new_bitmap_size, false /* clear */);
-    _segment_shift = log2i_exact(segment_size());
   }
 }
diff --git a/src/hotspot/share/gc/z/zLiveMap.hpp b/src/hotspot/share/gc/z/zLiveMap.hpp
index 7c18e1db060..9f6514b574f 100644
--- a/src/hotspot/share/gc/z/zLiveMap.hpp
+++ b/src/hotspot/share/gc/z/zLiveMap.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -42,6 +42,7 @@ private:
   volatile size_t   _live_bytes;
   BitMap::bm_word_t _segment_live_bits;
   BitMap::bm_word_t _segment_claim_bits;
+  size_t            _bitmap_size;
   ZBitMap           _bitmap;
   int               _segment_shift;
 
@@ -65,6 +66,8 @@ private:
 
   bool claim_segment(BitMap::idx_t segment);
 
+  void allocate_bitmap();
+
   void reset(ZGenerationId id);
   void reset_segment(BitMap::idx_t segment);
 
diff --git a/src/hotspot/share/gc/z/zLiveMap.inline.hpp b/src/hotspot/share/gc/z/zLiveMap.inline.hpp
index 9a5529dac04..fdbbdfaba0e 100644
--- a/src/hotspot/share/gc/z/zLiveMap.inline.hpp
+++ b/src/hotspot/share/gc/z/zLiveMap.inline.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -88,7 +88,7 @@ inline BitMap::idx_t ZLiveMap::next_live_segment(BitMap::idx_t segment) const {
 }
 
 inline BitMap::idx_t ZLiveMap::segment_size() const {
-  return _bitmap.size() / NumSegments;
+  return _bitmap_size / NumSegments;
 }
 
 inline BitMap::idx_t ZLiveMap::index_to_segment(BitMap::idx_t index) const {
diff --git a/src/hotspot/share/gc/z/zPage.inline.hpp b/src/hotspot/share/gc/z/zPage.inline.hpp
index d8ecad57190..5d476f273d3 100644
--- a/src/hotspot/share/gc/z/zPage.inline.hpp
+++ b/src/hotspot/share/gc/z/zPage.inline.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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,7 +76,7 @@ inline uint32_t ZPage::object_max_count() const {
     return 1;
 
   default:
-    return (uint32_t)(size() >> object_alignment_shift());
+    return checked_cast<uint32_t>(size() >> object_alignment_shift());
   }
 }
 

From 9f8d833f8654cb4280d002ef86ce3ae9d709eddc Mon Sep 17 00:00:00 2001
From: Thomas Schatzl <tschatzl@openjdk.org>
Date: Mon, 17 Mar 2025 07:57:45 +0000
Subject: [PATCH 362/587] 8346194: Improve G1 pre-barrier C2 cost estimate
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Roberto Castañeda Lozano <rcastanedalo@openjdk.org>
Reviewed-by: rcastanedalo, ayang
---
 src/hotspot/share/gc/g1/c2/g1BarrierSetC2.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/hotspot/share/gc/g1/c2/g1BarrierSetC2.cpp b/src/hotspot/share/gc/g1/c2/g1BarrierSetC2.cpp
index 71fd3ec6610..57e481668f8 100644
--- a/src/hotspot/share/gc/g1/c2/g1BarrierSetC2.cpp
+++ b/src/hotspot/share/gc/g1/c2/g1BarrierSetC2.cpp
@@ -287,15 +287,15 @@ bool G1BarrierSetC2::expand_barriers(Compile* C, PhaseIterGVN& igvn) const {
 }
 
 uint G1BarrierSetC2::estimated_barrier_size(const Node* node) const {
-  // These Ideal node counts are extracted from the pre-matching Ideal graph
-  // generated when compiling the following method with early barrier expansion:
-  //   static void write(MyObject obj1, Object o) {
-  //     obj1.o1 = o;
-  //   }
   uint8_t barrier_data = MemNode::barrier_data(node);
   uint nodes = 0;
   if ((barrier_data & G1C2BarrierPre) != 0) {
-    nodes += 50;
+    // Only consider the fast path for the barrier that is
+    // actually inlined into the main code stream.
+    // The slow path is laid out separately and does not
+    // directly affect performance.
+    // It has a cost of 6 (AddP, LoadB, Cmp, Bool, If, IfProj).
+    nodes += 6;
   }
   if ((barrier_data & G1C2BarrierPost) != 0) {
     nodes += 60;

From e29d405504560eee46b4d98b90476deb45c32668 Mon Sep 17 00:00:00 2001
From: Christian Hagedorn <chagedorn@openjdk.org>
Date: Mon, 17 Mar 2025 08:00:41 +0000
Subject: [PATCH 363/587] 8352110: [BACKOUT] C2: Print compilation bailouts
 with PrintCompilation compile command

Reviewed-by: thartmann, syan
---
 src/hotspot/share/compiler/compileBroker.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/hotspot/share/compiler/compileBroker.cpp b/src/hotspot/share/compiler/compileBroker.cpp
index 1bb184ef77a..c34d9eb785e 100644
--- a/src/hotspot/share/compiler/compileBroker.cpp
+++ b/src/hotspot/share/compiler/compileBroker.cpp
@@ -2374,7 +2374,7 @@ void CompileBroker::invoke_compiler_on_method(CompileTask* task) {
     if (CompilationLog::log() != nullptr) {
       CompilationLog::log()->log_failure(thread, task, failure_reason, retry_message);
     }
-    if (PrintCompilation || task->directive()->PrintCompilationOption) {
+    if (PrintCompilation) {
       FormatBufferResource msg = retry_message != nullptr ?
         FormatBufferResource("COMPILE SKIPPED: %s (%s)", failure_reason, retry_message) :
         FormatBufferResource("COMPILE SKIPPED: %s",      failure_reason);

From c8913d2c9cd2ec522dc660cce01eb555e95dc775 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hannes=20Walln=C3=B6fer?= <hannesw@openjdk.org>
Date: Mon, 17 Mar 2025 09:00:50 +0000
Subject: [PATCH 364/587] 8345555: Improve layout of search results

Reviewed-by: liach, nbenalla
---
 .../formats/html/HtmlDocletWriter.java        |   4 +-
 .../doclets/formats/html/IndexWriter.java     |  14 +-
 .../doclets/formats/html/SearchWriter.java    |  97 ++++--
 .../formats/html/resources/search-page.js     | 235 +++++++++-----
 .../formats/html/resources/search.js.template | 302 ++++++++++++------
 .../html/resources/standard.properties        |  19 +-
 .../formats/html/resources/stylesheet.css     | 161 ++++++++--
 .../formats/html/taglets/SpecTaglet.java      |   4 +-
 .../html/taglets/SystemPropertyTaglet.java    |   5 +-
 .../formats/html/taglets/TagletWriter.java    |   4 +-
 .../toolkit/resources/doclets.properties      |   5 +
 .../doclets/toolkit/util/IndexItem.java       | 201 +++++++++---
 .../jdk/javadoc/internal/html/HtmlAttr.java   |   4 +-
 .../jdk/javadoc/internal/html/HtmlTag.java    |   8 +-
 .../jdk/javadoc/internal/html/HtmlTree.java   |   2 +-
 .../CheckStylesheetClasses.java               |  10 +-
 .../testAutoHeaderId/TestAutoHeaderId.java    |  66 ++--
 .../doclet/testErasure/TestErasure.java       |  12 +-
 .../javadoc/doclet/testIndex/TestIndex.java   |  12 +-
 .../TestIndexInDocFiles.java                  |  14 +-
 .../TestIndexInherited.java                   |  10 +-
 .../TestMemberInheritance.java                |   6 +-
 .../testModules/TestModulePackages.java       |   6 +-
 .../doclet/testModules/TestModules.java       |   4 +-
 .../doclet/testNewApiList/TestNewApiList.java |  55 ++--
 .../TestNewLanguageFeatures.java              |   6 +-
 .../testPackagePage/TestPackagePage.java      |   6 +-
 .../doclet/testPreview/TestPreview.java       |  13 +-
 .../javadoc/doclet/testSearch/TestSearch.java |  29 +-
 .../doclet/testSpecTag/TestSpecTag.java       |   9 +-
 .../doclet/testStylesheet/TestStylesheet.java |   2 +-
 .../TestSystemPropertyTaglet.java             | 136 ++++----
 .../TestUnnamedPackage.java                   |  12 +-
 33 files changed, 945 insertions(+), 528 deletions(-)

diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlDocletWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlDocletWriter.java
index c2b048b54e0..589abbda561 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlDocletWriter.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlDocletWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -1882,7 +1882,7 @@ public abstract class HtmlDocletWriter {
             String tagText = headingContent.replaceAll("\\s+", " ");
             IndexItem item = IndexItem.of(element, node, tagText,
                     getTagletWriterInstance(context).getHolderName(element),
-                    resources.getText("doclet.Section"),
+                    "",
                     new DocLink(path, id));
             configuration.indexBuilder.add(item);
         }
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/IndexWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/IndexWriter.java
index 87d0fa95bf3..14cf7f2daea 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/IndexWriter.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/IndexWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -200,9 +200,6 @@ public class IndexWriter extends HtmlDocletWriter {
 
             case PACKAGE -> {
                 dt = HtmlTree.DT(getPackageLink((PackageElement) element, Text.of(label)));
-                if (configuration.showModules) {
-                    item.setContainingModule(utils.getFullyQualifiedName(utils.containingModule(element)));
-                }
                 dt.add(" - ").add(contents.package_).add(" " + label);
             }
 
@@ -259,7 +256,14 @@ public class IndexWriter extends HtmlDocletWriter {
         var labelLink = HtmlTree.A(itemPath, Text.of(item.getLabel()));
         var dt = HtmlTree.DT(labelLink.setStyle(HtmlStyles.searchTagLink));
         dt.add(" - ");
-        dt.add(contents.getContent("doclet.Search_tag_in", item.getHolder()));
+        var tagKindKey = switch (item.getKind()) {
+            case SEARCH_ITEM -> "doclet.Search_tag_in";
+            case SYSTEM_PROPERTY -> "doclet.System_property_in";
+            case SECTION -> "doclet.Section_in";
+            case EXTERNAL_SPEC -> "doclet.External_specification_in";
+            default -> throw new Error();
+        };
+        dt.add(contents.getContent(tagKindKey, item.getHolder()));
         target.add(dt);
         var dd = HtmlTree.DD();
         if (item.getDescription().isEmpty()) {
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/SearchWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/SearchWriter.java
index 673bd35049f..7d97dd71865 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/SearchWriter.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/SearchWriter.java
@@ -39,6 +39,8 @@ import jdk.javadoc.internal.html.HtmlTag;
 import jdk.javadoc.internal.html.HtmlTree;
 import jdk.javadoc.internal.html.Text;
 
+import javax.lang.model.element.ModuleElement;
+
 /**
  * Generates the search landing page for the generated API documentation.
  */
@@ -70,16 +72,8 @@ public class SearchWriter extends HtmlDocletWriter {
      */
     protected void addSearchFileContents(Content contentTree) {
 
-        String copyText = resources.getText("doclet.Copy_to_clipboard");
-        String copiedText = resources.getText("doclet.Copied_to_clipboard");
-        String copyUrlText = resources.getText("doclet.Copy_url_to_clipboard");
-        Content helpSection = Text.EMPTY;
-        // Suppress link to help page if no help page is generated or a custom help page is used.
-        HtmlOptions options = configuration.getOptions();
-        if (!options.noHelp() && options.helpFile().isEmpty()) {
-            Content helpLink = HtmlTree.A("help-doc.html#search", contents.getContent("doclet.search.help_page_link"));
-            helpSection = HtmlTree.P(contents.getContent("doclet.search.help_page_info", helpLink));
-        }
+        var moduleSelector = createModuleSelector();
+        var resourceSection = createResourceSection();
 
         contentTree.add(HtmlTree.HEADING(Headings.PAGE_TITLE_HEADING, HtmlStyles.title,
                         contents.getContent("doclet.search.main_heading")))
@@ -89,31 +83,13 @@ public class SearchWriter extends HtmlDocletWriter {
                                 .put(HtmlAttr.AUTOCOMPLETE, "off")
                                 .put(HtmlAttr.SPELLCHECK, "false"))
                         .add(HtmlTree.INPUT(HtmlAttr.InputType.RESET, HtmlId.of("page-search-reset"))
-                                .put(HtmlAttr.VALUE, resources.getText("doclet.search_reset"))
-                                .put(HtmlAttr.STYLE, "margin: 6px;"))
+                                .put(HtmlAttr.TABINDEX, "-1")
+                                .put(HtmlAttr.VALUE, resources.getText("doclet.search_reset")))
+                        .add(moduleSelector)
                         .add(HtmlTree.DETAILS(HtmlStyles.pageSearchDetails)
                                 .add(HtmlTree.SUMMARY(contents.getContent("doclet.search.show_more"))
                                         .setId(HtmlId.of("page-search-expand")))))
-                .add(HtmlTree.DIV(HtmlStyles.pageSearchInfo, helpSection)
-                        .add(HtmlTree.P(contents.getContent("doclet.search.keyboard_info",
-                                HtmlTree.KBD(Text.of("Ctrl")), HtmlTree.KBD(Text.of("Cmd")),
-                                new ContentBuilder(HtmlTree.KBD(Entity.of("leftarrow")), Text.of("/"),
-                                        HtmlTree.KBD(Entity.of("rightarrow"))))))
-                        .add(HtmlTree.P(contents.getContent("doclet.search.browser_info")))
-                        .add(HtmlTree.SPAN(Text.of("link"))
-                                .setId(HtmlId.of("page-search-link")))
-                        .add(HtmlTree.BUTTON(HtmlId.of("page-search-copy"))
-                                .add(HtmlTree.of(HtmlTag.IMG)
-                                        .put(HtmlAttr.SRC, pathToRoot.resolve(DocPaths.RESOURCE_FILES)
-                                                                     .resolve(DocPaths.CLIPBOARD_SVG).getPath())
-                                        .put(HtmlAttr.ALT, copyUrlText))
-                                .add(HtmlTree.SPAN(Text.of(copyText))
-                                        .put(HtmlAttr.DATA_COPIED, copiedText))
-                                .addStyle(HtmlStyles.copy)
-                                .put(HtmlAttr.ARIA_LABEL, copyUrlText))
-                        .add(HtmlTree.P(HtmlTree.INPUT(HtmlAttr.InputType.CHECKBOX, HtmlId.of("search-redirect")))
-                                .add(HtmlTree.LABEL("search-redirect",
-                                        contents.getContent("doclet.search.redirect")))))
+                .add(resourceSection)
                 .add(HtmlTree.P(contents.getContent("doclet.search.loading"))
                         .setId(HtmlId.of("page-search-notify")))
                 .add(HtmlTree.DIV(HtmlTree.DIV(HtmlId.of("result-container"))
@@ -123,4 +99,61 @@ public class SearchWriter extends HtmlDocletWriter {
                         .add(HtmlTree.SCRIPT(pathToRoot.resolve(DocPaths.SCRIPT_FILES)
                                                        .resolve(DocPaths.SEARCH_PAGE_JS).getPath())));
     }
+
+    private Content createModuleSelector() {
+
+        if (!configuration.showModules) {
+            return Text.EMPTY;
+        }
+
+        var select = HtmlTree.of(HtmlTag.SELECT)
+                .setId(HtmlId.of("search-modules"))
+                .add(HtmlTree.of(HtmlTag.OPTION)
+                        .put(HtmlAttr.VALUE, "")
+                        .add(contents.getContent("doclet.search.all_modules")));
+
+        for (ModuleElement module : configuration.modules) {
+            select.add(HtmlTree.of(HtmlTag.OPTION)
+                    .put(HtmlAttr.VALUE, module.getQualifiedName().toString())
+                    .add(Text.of(module.getQualifiedName().toString())));
+        }
+        return new ContentBuilder(contents.getContent("doclet.search.in", select));
+    }
+
+    private Content createResourceSection() {
+
+        String copyText = resources.getText("doclet.Copy_to_clipboard");
+        String copiedText = resources.getText("doclet.Copied_to_clipboard");
+        String copyUrlText = resources.getText("doclet.Copy_url_to_clipboard");
+        Content helpSection = Text.EMPTY;
+
+        // Suppress link to help page if no help page is generated or a custom help page is used.
+        HtmlOptions options = configuration.getOptions();
+        if (!options.noHelp() && options.helpFile().isEmpty()) {
+            Content helpLink = HtmlTree.A("help-doc.html#search", contents.getContent("doclet.search.help_page_link"));
+            helpSection = HtmlTree.P(contents.getContent("doclet.search.help_page_info", helpLink));
+        }
+
+        return HtmlTree.DIV(HtmlStyles.pageSearchInfo, helpSection)
+                .add(HtmlTree.P(contents.getContent("doclet.search.keyboard_info",
+                        HtmlTree.KBD(Entity.of("downarrow")), HtmlTree.KBD(Entity.of("uparrow")),
+                        new ContentBuilder(HtmlTree.KBD(Entity.of("leftarrow")), Text.of("/"),
+                                HtmlTree.KBD(Entity.of("rightarrow"))))))
+                .add(HtmlTree.P(contents.getContent("doclet.search.browser_info")))
+                .add(HtmlTree.SPAN(Text.of("link"))
+                        .setId(HtmlId.of("page-search-link")))
+                .add(HtmlTree.BUTTON(HtmlId.of("page-search-copy"))
+                        .add(HtmlTree.of(HtmlTag.IMG)
+                                .put(HtmlAttr.SRC, pathToRoot.resolve(DocPaths.RESOURCE_FILES)
+                                        .resolve(DocPaths.CLIPBOARD_SVG).getPath())
+                                .put(HtmlAttr.ALT, copyUrlText))
+                        .add(HtmlTree.SPAN(Text.of(copyText))
+                                .put(HtmlAttr.DATA_COPIED, copiedText))
+                        .addStyle(HtmlStyles.copy)
+                        .put(HtmlAttr.ARIA_LABEL, copyUrlText))
+                .add(HtmlTree.P(HtmlTree.INPUT(HtmlAttr.InputType.CHECKBOX, HtmlId.of("search-redirect")))
+                        .add(HtmlTree.LABEL("search-redirect",
+                                contents.getContent("doclet.search.redirect"))));
+    }
+
 }
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/search-page.js b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/search-page.js
index dbfb00a1a1a..ec0d815eea4 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/search-page.js
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/search-page.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl/
@@ -24,32 +24,35 @@ $(function() {
         copyToClipboard(this.previousSibling.innerText);
         switchCopyLabel(this, this.lastElementChild);
     }
-    copy.click(copyLink);
+    copy.on("click", copyLink);
     copy[0].onmouseenter = function() {};
-    redirect.click(setSearchUrlTemplate);
+    redirect.on("click", setSearchUrlTemplate);
     setSearchUrlTemplate();
     copy.prop("disabled", false);
     redirect.prop("disabled", false);
-    expand.click(function (e) {
+    expand.on("click", function (e) {
         var searchInfo = $("div.page-search-info");
         if(this.parentElement.hasAttribute("open")) {
-            searchInfo.attr("style", "border-width: 0;");
+            searchInfo.attr("style", " display:none;");
         } else {
-            searchInfo.attr("style", "border-width: 1px;").height(searchInfo.prop("scrollHeight"));
+            searchInfo.attr("style", "display:block;");
         }
     });
 });
 $(window).on("load", function() {
     var input = $("#page-search-input");
     var reset = $("#page-search-reset");
+    var modules = $("#search-modules");
     var notify = $("#page-search-notify");
     var resultSection = $("div#result-section");
     var resultContainer = $("div#result-container");
+    var selectedLink;
     var searchTerm = "";
     var activeTab = "";
     var fixedTab = false;
     var visibleTabs = [];
     var feelingLucky = false;
+    const MIN_TABBED_RESULTS = 10;
     function renderResults(result) {
         if (!result.length) {
             notify.html(messages.noResult);
@@ -71,14 +74,8 @@ $(window).on("load", function() {
             var arr = r[item.category];
             arr.push(item);
         }
-        if (!activeTab || r[activeTab].length === 0 || !fixedTab) {
-            Object.keys(r).reduce(function(prev, curr) {
-                if (r[curr].length > 0 && r[curr][0].score > prev) {
-                    activeTab = curr;
-                    return r[curr][0].score;
-                }
-                return prev;
-            }, 0);
+        if (!activeTab || r[activeTab].length === 0) {
+            activeTab = Object.keys(r).find(category => r[category].length > 0);
         }
         if (feelingLucky && activeTab) {
             notify.html(messages.redirecting)
@@ -86,13 +83,11 @@ $(window).on("load", function() {
             window.location = getURL(firstItem.indexItem, firstItem.category);
             return;
         }
-        if (result.length > 20) {
-            if (searchTerm[searchTerm.length - 1] === ".") {
-                if (activeTab === "types" && r["members"].length > r["types"].length) {
-                    activeTab = "members";
-                } else if (activeTab === "packages" && r["types"].length > r["packages"].length) {
-                    activeTab = "types";
-                }
+        if (searchTerm.endsWith(".") && result.length > MIN_TABBED_RESULTS) {
+            if (activeTab === "types" && r["members"].length > r["types"].length) {
+                activeTab = "members";
+            } else if (activeTab === "packages" && r["types"].length > r["packages"].length) {
+                activeTab = "types";
             }
         }
         var categoryCount = Object.keys(r).reduce(function(prev, curr) {
@@ -104,87 +99,94 @@ $(window).on("load", function() {
             var id = "#result-tab-" + key.replace("searchTags", "search_tags");
             if (r[key].length) {
                 var count = r[key].length >= 1000 ? "999+" : r[key].length;
-                if (result.length > 20 && categoryCount > 1) {
-                    var button = $("<button id='result-tab-" + key
-                        + "' class='page-search-header'><span>" + categories[key] + "</span>"
-                        + "<span style='font-weight: normal'> (" + count + ")</span></button>").appendTo(tabContainer);
-                    button.click(key, function(e) {
-                        fixedTab = true;
-                        renderResult(e.data, $(this));
-                    });
+                if (result.length > MIN_TABBED_RESULTS && categoryCount > 1) {
+                    let button = $("<button/>")
+                        .attr("id", "result-tab-" + key)
+                        .attr("tabIndex", "-1")
+                        .addClass("page-search-header")
+                        .append($("<span/>")
+                            .html(categories[key])
+                            .append($("<span/>")
+                                .attr("style", "font-weight:normal;")
+                                .html(" (" + count + ")")))
+                        .on("click", null, key, function(e) {
+                            fixedTab = true;
+                            renderResult(e.data, $(this));
+                        }).appendTo(tabContainer);
                     visibleTabs.push(key);
                 } else {
                     $("<span class='page-search-header'>" + categories[key]
                         + "<span style='font-weight: normal'> (" + count + ")</span></span>").appendTo(tabContainer);
                     renderTable(key, r[key]).appendTo(resultContainer);
                     tabContainer = $("<div class='table-tabs'></div>").appendTo(resultContainer);
-
                 }
             }
         }
-        if (activeTab && result.length > 20 && categoryCount > 1) {
-            $("button#result-tab-" + activeTab).addClass("active-table-tab");
+        if (activeTab && result.length > MIN_TABBED_RESULTS && categoryCount > 1) {
+            $("button#result-tab-" + activeTab).addClass("active-table-tab").attr("tabIndex", "0");
             renderTable(activeTab, r[activeTab]).appendTo(resultContainer);
         }
         resultSection.show();
         function renderResult(category, button) {
             activeTab = category;
             setSearchUrl();
-            resultContainer.find("div.summary-table").remove();
+            resultContainer.find("div.result-table").remove();
             renderTable(activeTab, r[activeTab]).appendTo(resultContainer);
-            button.siblings().removeClass("active-table-tab");
-            button.addClass("active-table-tab");
+            button.siblings().removeClass("active-table-tab").attr("tabIndex", "-1");
+            button.addClass("active-table-tab").attr("tabIndex", "0");
         }
     }
     function selectTab(category) {
-        $("button#result-tab-" + category).click();
+        $("button#result-tab-" + category).focus().trigger("click");
     }
     function renderTable(category, items) {
-        var table = $("<div class='summary-table'>")
-            .addClass(category === "modules"
-                ? "one-column-search-results"
-                : "two-column-search-results");
+        var table = $("<div class='result-table'>");
         var col1, col2;
         if (category === "modules") {
-            col1 = "Module";
+            col1 = mdlDesc;
         } else if (category === "packages") {
-            col1 = "Module";
-            col2 = "Package";
+            col1 = pkgDesc;
         } else if (category === "types") {
-            col1 = "Package";
-            col2 = "Class"
+            col1 = clsDesc;
         } else if (category === "members") {
-            col1 = "Class";
-            col2 = "Member";
+            col1 = mbrDesc;
         } else if (category === "searchTags") {
-            col1 = "Location";
-            col2 = "Name";
-        }
-        $("<div class='table-header col-plain'>" + col1 + "</div>").appendTo(table);
-        if (category !== "modules") {
-            $("<div class='table-header col-plain'>" + col2 + "</div>").appendTo(table);
+            col1 = tagDesc;
         }
+        col2 = descDesc;
+        $("<div class='table-header'/>")
+            .append($("<span class='table-header'/>").html(col1))
+            .append($("<span class='table-header'/>").html(col2))
+            .appendTo(table);
         $.each(items, function(index, item) {
-            var rowColor = index % 2 ? "odd-row-color" : "even-row-color";
-            renderItem(item, table, rowColor);
+            renderItem(item, table);
         });
         return table;
     }
-    function renderItem(item, table, rowColor) {
-        var label = getHighlightedText(item.input, item.boundaries, item.prefix.length, item.input.length);
+    function select() {
+        if (!this.classList.contains("selected")) {
+            setSelected(this);
+        }
+    }
+    function unselect() {
+        if (this.classList.contains("selected")) {
+            setSelected(null);
+        }
+    }
+    function renderItem(item, table) {
+        var label = getResultLabel(item);
+        var desc = getResultDescription(item);
         var link = $("<a/>")
             .attr("href",  getURL(item.indexItem, item.category))
             .attr("tabindex", "0")
-            .addClass("search-result-link")
-            .html(label);
-        var container = getHighlightedText(item.input, item.boundaries, 0, item.prefix.length - 1);
-        if (item.category === "searchTags") {
-            container = item.indexItem.h || "";
-        }
-        if (item.category !== "modules") {
-            $("<div/>").html(container).addClass("col-plain").addClass(rowColor).appendTo(table);
-        }
-        $("<div/>").html(link).addClass("col-last").addClass(rowColor).appendTo(table);
+            .addClass("search-result-link");
+        link.on("mousemove", select.bind(link[0]))
+            .on("focus", select.bind(link[0]))
+            .on("mouseleave", unselect.bind(link[0]))
+            .on("blur", unselect.bind(link[0]))
+            .append($("<span/>").addClass("search-result-label").html(label))
+            .append($("<span/>").addClass("search-result-desc").html(desc))
+            .appendTo(table);
     }
     var timeout;
     function schedulePageSearch() {
@@ -206,7 +208,8 @@ $(window).on("load", function() {
             resultSection.hide();
         } else {
             notify.html(messages.searching);
-            doSearch({ term: term, maxResults: 1200 }, renderResults);
+            var module = modules.val();
+            doSearch({ term: term, maxResults: 1200, module: module}, renderResults);
         }
     }
     function setSearchUrl() {
@@ -217,24 +220,81 @@ $(window).on("load", function() {
             if (activeTab && fixedTab) {
                 url += "&c=" + activeTab;
             }
+            if (modules.val()) {
+                url += "&m=" + modules.val();
+            }
         }
         history.replaceState({query: query}, "", url);
     }
     input.on("input", function(e) {
         feelingLucky = false;
+        reset.css("visibility", input.val() ? "visible" : "hidden");
         schedulePageSearch();
     });
-    $(document).keydown(function(e) {
-        if ((e.ctrlKey || e.metaKey) && (e.key === "ArrowLeft" || e.key === "ArrowRight")) {
-            if (activeTab && visibleTabs.length > 1) {
-                var idx = visibleTabs.indexOf(activeTab);
-                idx += e.key === "ArrowLeft" ? visibleTabs.length - 1 : 1;
-                selectTab(visibleTabs[idx % visibleTabs.length]);
-                return false;
+    function setSelected(link) {
+        if (selectedLink) {
+            selectedLink.classList.remove("selected");
+            selectedLink.blur();
+        }
+        if (link) {
+            link.classList.add("selected");
+            link.focus({focusVisible: true});
+        }
+        selectedLink = link;
+    }
+    document.addEventListener("keydown", e => {
+        if (e.ctrlKey || e.altKey || e.metaKey) {
+            return;
+        }
+        if (e.key === "Escape" && input.val()) {
+            input.val("").focus();
+            doPageSearch();
+            e.preventDefault();
+        }
+        if (e.target === modules[0]) {
+            return;
+        }
+        if (e.key === "ArrowLeft" || e.key === "ArrowRight") {
+            if (activeTab && visibleTabs.length > 1 && e.target !== input[0]) {
+                var tab = visibleTabs.indexOf(activeTab);
+                var newTab = e.key === "ArrowLeft"
+                    ? Math.max(0, tab - 1)
+                    : Math.min(visibleTabs.length - 1, tab + 1);
+                if (newTab !== tab) {
+                    selectTab(visibleTabs[newTab]);
+                }
+                e.preventDefault();
             }
+        } else if (e.key === "ArrowUp" || e.key === "ArrowDown") {
+            let links = Array.from(
+                document.querySelectorAll("div.result-table > a.search-result-link"));
+            let current = links.indexOf(selectedLink);
+            let activeButton = document.querySelector("button.active-table-tab");
+            if (e.key === "ArrowUp" || (e.key === "Tab" && e.shiftKey)) {
+                if (current > 0) {
+                    setSelected(links[current - 1]);
+                } else {
+                    setSelected(null);
+                    if (activeButton && current === 0) {
+                        activeButton.focus();
+                    } else {
+                        input.focus();
+                    }
+                }
+            } else if (e.key === "ArrowDown") {
+                if (document.activeElement === input[0] && activeButton) {
+                    activeButton.focus();
+                } else if (current < links.length - 1) {
+                    setSelected(links[current + 1]);
+                }
+            }
+            e.preventDefault();
+        } else if (e.key.length === 1 || e.key === "Backspace") {
+            setSelected(null);
+            input.focus();
         }
     });
-    reset.click(function() {
+    reset.on("click", function() {
         notify.html(messages.enterTerm);
         resultSection.hide();
         activeTab = "";
@@ -243,13 +303,34 @@ $(window).on("load", function() {
         input.val('').focus();
         setSearchUrl();
     });
+    modules.on("change", function() {
+        if (input.val()) {
+            doPageSearch();
+        }
+        input.focus();
+        try {
+            localStorage.setItem("search-modules", modules.val());
+        } catch (unsupported) {}
+    });
+
     input.prop("disabled", false);
     input.attr("autocapitalize", "off");
     reset.prop("disabled", false);
 
     var urlParams = new URLSearchParams(window.location.search);
+    if (urlParams.has("m")) {
+        modules.val(urlParams.get("m"));
+    } else {
+        try {
+            var searchModules = localStorage.getItem("search-modules");
+            if (searchModules) {
+                modules.val(searchModules);
+            }
+        } catch (unsupported) {}
+    }
     if (urlParams.has("q")) {
-        input.val(urlParams.get("q"))
+        input.val(urlParams.get("q"));
+        reset.css("visibility", input.val() ? "visible" : "hidden");
     }
     if (urlParams.has("c")) {
         activeTab = urlParams.get("c");
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/search.js.template b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/search.js.template
index a84fadf90d7..5a36ee06819 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/search.js.template
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/search.js.template
@@ -21,7 +21,42 @@ const categories = {
     members: "##REPLACE:doclet.search.members##",
     searchTags: "##REPLACE:doclet.search.search_tags##"
 };
-const highlight = "<span class='result-highlight'>$&</span>";
+// Localized element descriptors must match values in enum IndexItem.Kind.
+const itemDesc = [
+    // Members
+    ["##REPLACE:doclet.Enum_constant_in##"],
+    ["##REPLACE:doclet.Variable_in##"],
+    ["##REPLACE:doclet.Static_variable_in##"],
+    ["##REPLACE:doclet.Constructor_for##"],
+    ["##REPLACE:doclet.Element_in##"],
+    ["##REPLACE:doclet.Method_in##"],
+    ["##REPLACE:doclet.Static_method_in##"],
+    ["##REPLACE:doclet.Record_component_in##"],
+    // Types in upper and lower case
+    ["##REPLACE:doclet.AnnotationType##", "##REPLACE:doclet.annotationtype##"],
+    ["##REPLACE:doclet.Enum##",           "##REPLACE:doclet.enum##"],
+    ["##REPLACE:doclet.Interface##",      "##REPLACE:doclet.interface##"],
+    ["##REPLACE:doclet.RecordClass##",    "##REPLACE:doclet.recordclass##"],
+    ["##REPLACE:doclet.Class##",          "##REPLACE:doclet.class##"],
+    ["##REPLACE:doclet.ExceptionClass##", "##REPLACE:doclet.exceptionclass##"],
+    // Tags
+    ["##REPLACE:doclet.Search_tag_in##"],
+    ["##REPLACE:doclet.System_property_in##"],
+    ["##REPLACE:doclet.Section_in##"],
+    ["##REPLACE:doclet.External_specification_in##"],
+    // Other
+    ["##REPLACE:doclet.Summary_Page##"],
+];
+const mbrDesc = "##REPLACE:doclet.Member##";
+const clsDesc = "##REPLACE:doclet.Class##"
+const pkgDesc = "##REPLACE:doclet.Package##";
+const mdlDesc = "##REPLACE:doclet.Module##";
+const pkgDescLower = "##REPLACE:doclet.package##";
+const mdlDescLower = "##REPLACE:doclet.module##";
+const tagDesc = "##REPLACE:doclet.searchTag##";
+const inDesc = "##REPLACE:doclet.in##";
+const descDesc = "##REPLACE:doclet.Description##";
+const linkLabel = "##REPLACE:doclet.search.linkSearchPageLabel##";
 const NO_MATCH = {};
 const MAX_RESULTS = 300;
 const UNICODE_LETTER = 0;
@@ -65,6 +100,8 @@ function getURLPrefix(item, category) {
             $.each(packageSearchIndex, function(index, it) {
                 if (it.m && item.p === it.l) {
                     urlPrefix = it.m + slash;
+                    item.m = it.m;
+                    return false;
                 }
             });
         }
@@ -116,27 +153,21 @@ function createMatcher(term, camelCase) {
             // ',' and '?' are the only delimiters commonly followed by space in java signatures
             pattern += "(" + escapeUnicodeRegex(s).replace(/[,?]/g, "$&\\s*?") + ")";
             upperCase.push(false);
-            var isWordToken =  /[\p{L}\p{Nd}_]$/u.test(s);
-            if (isWordToken) {
-                if (i === tokens.length - 1 && index < array.length - 1) {
-                    // space in query string matches all delimiters
-                    pattern += "(.*?)";
-                    upperCase.push(isUpperCase(s[0]));
-                } else {
-                    if (!camelCase && isUpperCase(s) && s.length === 1) {
-                        pattern += "()";
-                    } else {
-                        pattern += "([\\p{L}\\p{Nd}\\p{Sc}<>?[\\]]*?)";
-                    }
-                    upperCase.push(isUpperCase(s[0]));
-                }
+            if (i === tokens.length - 1 && index < array.length - 1) {
+                // space in query string matches all delimiters
+                pattern += "(.*?)";
+                upperCase.push(isUpperCase(s[0]));
             } else {
-                pattern += "()";
-                upperCase.push(false);
+                if (!camelCase && isUpperCase(s) && s.length === 1) {
+                    pattern += "()";
+                } else {
+                    pattern += "([\\p{L}\\p{Nd}\\p{Sc}<>?[\\]]*?)";
+                }
+                upperCase.push(isUpperCase(s[0]));
             }
         }
     });
-    var re = new RegExp(pattern, "gui");
+    var re = new RegExp(pattern, camelCase ? "gu" : "gui");
     re.upperCase = upperCase;
     return re;
 }
@@ -144,7 +175,7 @@ function createMatcher(term, camelCase) {
 function escapeUnicodeRegex(pattern) {
     return pattern.replace(/[\[\]{}()*+?.\\^$|\s]/g, '\\$&');
 }
-function findMatch(matcher, input, startOfName, endOfName) {
+function findMatch(matcher, input, startOfName, endOfName, prefixLength) {
     var from = startOfName;
     matcher.lastIndex = from;
     var match = matcher.exec(input);
@@ -164,47 +195,64 @@ function findMatch(matcher, input, startOfName, endOfName) {
     var prevEnd = -1;
     for (var i = 1; i < match.length; i += 2) {
         var charType = getCharType(input[start]);
-        var isMatcherUpper = matcher.upperCase[i];
         // capturing groups come in pairs, match and non-match
         boundaries.push(start, start + match[i].length);
-        // make sure groups are anchored on a left word boundary
         var prevChar = input[start - 1] || "";
         var nextChar = input[start + 1] || "";
-        if (start !== 0) {
+        // make sure group is anchored on a word boundary
+        if (start !== 0 && start !== startOfName) {
             if (charType === UNICODE_DIGIT && getCharType(prevChar) === UNICODE_DIGIT) {
-                return NO_MATCH;
+                return NO_MATCH; // Numeric token must match at first digit
             } else if (charType === UNICODE_LETTER && getCharType(prevChar) === UNICODE_LETTER) {
-                var isUpper = isUpperCase(input[start]);
-                if (isUpper && (isLowerCase(prevChar) || isLowerCase(nextChar))) {
-                    score -= 0.1;
-                } else if (isMatcherUpper && start === prevEnd) {
-                    score -= isUpper ? 0.1 : 1.0;
-                } else {
-                    return NO_MATCH;
+                if (!isUpperCase(input[start]) || (!isLowerCase(prevChar) && !isLowerCase(nextChar))) {
+                    // Not returning NO_MATCH below is to enable upper-case query strings
+                    if (!matcher.upperCase[i] || start !== prevEnd) {
+                        return NO_MATCH;
+                    } else if (!isUpperCase(input[start])) {
+                        score -= 1.0;
+                    }
                 }
             }
         }
         prevEnd = start + match[i].length;
         start += match[i].length + match[i + 1].length;
 
-        // lower score for parts of the name that are missing
-        if (match[i + 1] && prevEnd < endOfName) {
-            score -= rateNoise(match[i + 1]);
+        // Lower score for unmatched parts between matches
+        if (match[i + 1]) {
+            score -= rateDistance(match[i + 1]);
         }
     }
-    // lower score if a type name contains unmatched camel-case parts
-    if (input[matchEnd - 1] !== "." && endOfName > matchEnd)
-        score -= rateNoise(input.slice(matchEnd, endOfName));
-    score -= rateNoise(input.slice(0, Math.max(startOfName, match.index)));
 
-    if (score <= 0) {
-        return NO_MATCH;
+    // Lower score for unmatched leading part of name
+    if (startOfName < match.index) {
+        score -= rateDistance(input.substring(startOfName, match.index));
     }
-    return {
+    // Favor child or parent variety depending on whether parent is included in search
+    var matchIncludesContaining = match.index < startOfName;
+    // Lower score for unmatched trailing part of name, but exclude member listings
+    if (matchEnd < endOfName && input[matchEnd - 1] !== ".") {
+        let factor = matchIncludesContaining ? 0.1 : 0.8;
+        score -= rateDistance(input.substring(matchEnd, endOfName)) * factor;
+    }
+    // Lower score for unmatched prefix in member class name
+    if (prefixLength < match.index && prefixLength < startOfName) {
+        let factor = matchIncludesContaining ? 0.8 : 0.4;
+        score -= rateDistance(input.substring(prefixLength, Math.min(match.index, startOfName))) * factor;
+    }
+    // Rank qualified names by package name
+    if (prefixLength > 0) {
+        score -= rateDistance(input.substring(0, prefixLength)) * 0.2;
+    }
+    // Reduce score of constructors in member listings
+    if (matchEnd === prefixLength) {
+        score -= 0.1;
+    }
+
+    return score > 0 ? {
         input: input,
         score: score,
         boundaries: boundaries
-    };
+    } : NO_MATCH;
 }
 function isLetter(s) {
     return /\p{L}/u.test(s);
@@ -227,14 +275,16 @@ function getCharType(s) {
         return UNICODE_OTHER;
     }
 }
-function rateNoise(str) {
-    return (str.match(/([.(])/g) || []).length / 5
-         + (str.match(/(\p{Lu}+)/gu) || []).length / 10
-         +  str.length / 20;
+function rateDistance(str) {
+    // Rate distance of string by counting word boundaries and camel-case tokens
+    return !str ? 0
+        : (str.split(/\b|(?<=[\p{Ll}_])\p{Lu}/u).length * 0.1
+            + (isUpperCase(str[0]) ? 0.08 : 0));
 }
 function doSearch(request, response) {
     var term = request.term.trim();
     var maxResults = request.maxResults || MAX_RESULTS;
+    var module = checkUnnamed(request.module, "/");
     var matcher = {
         plainMatcher: createMatcher(term, false),
         camelCaseMatcher: createMatcher(term, true)
@@ -246,23 +296,17 @@ function doSearch(request, response) {
             case "packages":
                 return checkUnnamed(item.m, "/");
             case "types":
-                return checkUnnamed(item.p, ".");
             case "members":
-                return checkUnnamed(item.p, ".") + item.c + ".";
+                return checkUnnamed(item.p, ".");
             default:
                 return "";
         }
     }
-    function useQualifiedName(category) {
-        switch (category) {
-            case "packages":
-                return /[\s/]/.test(term);
-            case "types":
-            case "members":
-                return /[\s.]/.test(term);
-            default:
-                return false;
+    function getClassPrefix(item, category) {
+        if (category === "members" && (!item.k || (item.k < 8 && item.k !== "3"))) {
+            return item.c + ".";
         }
+        return "";
     }
     function searchIndex(indexArray, category) {
         var matches = [];
@@ -273,34 +317,46 @@ function doSearch(request, response) {
             return matches;
         }
         $.each(indexArray, function (i, item) {
+            if (module) {
+                var modulePrefix = getURLPrefix(item, category) || item.u;
+                if (modulePrefix.indexOf("/") > -1 && !modulePrefix.startsWith(module)) {
+                    return;
+                }
+            }
             var prefix = getPrefix(item, category);
-            var simpleName = item.l;
-            var qualifiedName = prefix + simpleName;
-            var useQualified = useQualifiedName(category);
-            var input = useQualified ? qualifiedName : simpleName;
-            var startOfName = useQualified ? prefix.length : 0;
-            var endOfName = category === "members" && input.indexOf("(", startOfName) > -1
-                ? input.indexOf("(", startOfName) : input.length;
-            var m = findMatch(matcher.plainMatcher, input, startOfName, endOfName);
+            var classPrefix = getClassPrefix(item, category);
+            var simpleName = classPrefix + item.l;
+            if (item.d) {
+                simpleName += " - " + item.d;
+            }
+            var qualName = prefix + simpleName;
+            var startOfName = classPrefix.length + prefix.length;
+            var endOfName = category === "members" && qualName.indexOf("(", startOfName) > -1
+                ? qualName.indexOf("(", startOfName) : qualName.length;
+            var m = findMatch(matcher.plainMatcher, qualName, startOfName, endOfName, prefix.length);
             if (m === NO_MATCH && matcher.camelCaseMatcher) {
-                m = findMatch(matcher.camelCaseMatcher, input, startOfName, endOfName);
+                m = findMatch(matcher.camelCaseMatcher, qualName, startOfName, endOfName, prefix.length);
             }
             if (m !== NO_MATCH) {
                 m.indexItem = item;
-                m.prefix = prefix;
+                m.name = simpleName;
                 m.category = category;
-                if (!useQualified) {
-                    m.input = qualifiedName;
+                if (m.boundaries[0] < prefix.length) {
+                    m.name = qualName;
+                } else {
                     m.boundaries = m.boundaries.map(function(b) {
-                        return b + prefix.length;
+                        return b - prefix.length;
                     });
                 }
+                // m.name = m.name + " " + m.score.toFixed(3);
                 matches.push(m);
             }
             return true;
         });
         return matches.sort(function(e1, e2) {
-            return e2.score - e1.score;
+            return e2.score - e1.score
+                || (category !== "members"
+                    ? e1.name.localeCompare(e2.name) : 0);
         }).slice(0, maxResults);
     }
 
@@ -360,29 +416,91 @@ $.widget("custom.catcomplete", $.ui.autocomplete, {
             }
             li.attr("class", "result-item");
         });
-        ul.append("<li class='ui-static-link'><a href='" + pathtoroot + "search.html?q="
-            + encodeURI(widget.term) + "'>Go to search page</a></li>");
+        ul.append("<li class='ui-static-link'><div><a href='" + pathtoroot + "search.html?q="
+            + encodeURI(widget.term) + "'>" + linkLabel + "</a></div></li>");
     },
     _renderItem: function(ul, item) {
-        var li = $("<li/>").appendTo(ul);
-        var div = $("<div/>").appendTo(li);
-        var label = item.l
-            ? item.l
-            : getHighlightedText(item.input, item.boundaries, 0, item.input.length);
-        var idx = item.indexItem;
-        if (item.category === "searchTags" && idx && idx.h) {
-            if (idx.d) {
-                div.html(label + "<span class='search-tag-holder-result'> (" + idx.h + ")</span><br><span class='search-tag-desc-result'>"
-                    + idx.d + "</span><br>");
-            } else {
-                div.html(label + "<span class='search-tag-holder-result'> (" + idx.h + ")</span>");
+        var label = getResultLabel(item);
+        var resultDesc = getResultDescription(item);
+        return $("<li/>")
+            .append($("<div/>")
+                .append($("<span/>").addClass("search-result-label").html(label))
+                .append($("<span/>").addClass("search-result-desc").html(resultDesc)))
+            .appendTo(ul);
+    },
+    _resizeMenu: function () {
+        var ul = this.menu.element;
+        var missing = 0;
+        ul.children().each((i, e) => {
+            if (e.hasChildNodes() && e.firstChild.hasChildNodes()) {
+                var label = e.firstChild.firstChild;
+                missing = Math.max(missing, label.scrollWidth - label.clientWidth);
             }
-        } else {
-            div.html(label);
-        }
-        return li;
+        });
+        ul.outerWidth( Math.max(
+            ul.width("").outerWidth() + missing + 40,
+            this.element.outerWidth()
+        ));
     }
 });
+function getResultLabel(item) {
+    if (item.l) {
+        return item.l;
+    }
+    return getHighlightedText(item.name, item.boundaries, 0, item.name.length);
+}
+function getResultDescription(item) {
+    if (!item.indexItem) {
+        return "";
+    }
+    var kind;
+    switch (item.category) {
+        case "members":
+            var typeName = checkUnnamed(item.indexItem.p, ".") + item.indexItem.c;
+            var typeDesc = getEnclosingTypeDesc(item.indexItem);
+            kind = itemDesc[item.indexItem.k || 5][0];
+            return kind.replace("{0}", typeDesc + " " + typeName);
+        case "types":
+            var pkgName = checkUnnamed(item.indexItem.p, "");
+            kind = itemDesc[item.indexItem.k || 12][0];
+            if (!pkgName) {
+                // Handle "All Classes" summary page and unnamed package
+                return item.indexItem.k === "18" ? kind : kind + " " + item.indexItem.l;
+            }
+            return getEnclosingDescription(kind, pkgDescLower, pkgName);
+        case "packages":
+            if (item.indexItem.k === "18") {
+                return itemDesc[item.indexItem.k][0]; // "All Packages" summary page
+            } else if (!item.indexItem.m) {
+                return pkgDesc + " " + item.indexItem.l;
+            }
+            var mdlName = item.indexItem.m;
+            return getEnclosingDescription(pkgDesc, mdlDescLower, mdlName);
+        case "modules":
+            return mdlDesc + " " + item.indexItem.l;
+        case "searchTags":
+            if (item.indexItem) {
+                var holder = item.indexItem.h;
+                kind = itemDesc[item.indexItem.k || 14][0];
+                return holder ? kind.replace("{0}", holder) : kind;
+            }
+    }
+    return "";
+}
+function getEnclosingDescription(elem, desc, label) {
+    return inDesc.replace("{0}", elem).replace("{1}", desc + " " + label);
+}
+function getEnclosingTypeDesc(item) {
+    if (!item.typeDesc) {
+        $.each(typeSearchIndex, function(index, it) {
+            if (it.l === item.c && it.p === item.p && it.m === item.m) {
+                item.typeDesc = itemDesc[it.k || 12][1];
+                return false;
+            }
+        });
+    }
+    return item.typeDesc || "";
+}
 $(function() {
     var search = $("#search-input");
     var reset = $("#reset-search");
@@ -393,13 +511,16 @@ $(function() {
             if (request.term.trim() === "") {
                 return this.close();
             }
+            // Prevent selection of item at current mouse position
+            this.menu.previousFilter = "_";
+            this.menu.filterTimer = this.menu._delay(function() {
+                delete this.previousFilter;
+            }, 1000);
             return doSearch(request, response);
         },
         response: function(event, ui) {
             if (!ui.content.length) {
                 ui.content.push({ l: messages.noResult });
-            } else {
-                $("#search-input").empty();
             }
         },
         autoFocus: true,
@@ -413,6 +534,7 @@ $(function() {
             if (ui.item.indexItem) {
                 var url = getURL(ui.item.indexItem, ui.item.category);
                 window.location.href = pathtoroot + url;
+                search.blur();
             }
         }
     });
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 18c16894e56..e4365b04cab 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
@@ -97,6 +97,9 @@ doclet.Record_component_in=Record component of {0}
 doclet.Static_method_in=Static method in {0}
 doclet.Search_tag_in=Search tag in {0}
 doclet.Method_in=Method in {0}
+doclet.System_property_in=System property in {0}
+doclet.External_specification_in=External specification in {0}
+doclet.Section_in=Section in {0}
 doclet.module=module
 doclet.package=package
 doclet.MalformedURL=Malformed URL: {0}
@@ -176,13 +179,11 @@ 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
 doclet.External_Specifications=External Specifications
 doclet.External_Specifications.All_Specifications=All Specifications
 doclet.External_Specifications.no-host=Local
 doclet.Specification=Specification
-doclet.System_Property=System Property
+doclet.Summary_Page=Summary Page
 doclet.systemProperties=System Properties
 doclet.systemPropertiesSummary=System Properties Summary
 doclet.Window_Source_title=Source code
@@ -198,15 +199,13 @@ doclet.search.help_page_link=help page
 # 0: a link to the help page with text above
 doclet.search.help_page_info= \
     The {0} provides an introduction to the scope and syntax of JavaDoc search.
-# 0: [Ctrl] 1: [Cmd] 2: [<]/[>] (left and right arrow keys)
+# 0: [V] 1: [^] 2: [<]/[>] (down, up, left and right arrow keys)
 doclet.search.keyboard_info= \
-    You can use the {0} or {1} key in combination with the {2} arrow \
-    keys to switch between result tabs in this page while searching.
+    Use the {0}/{1} keys to move between search results and the {2} keys to \
+    switch between result tabs.
 doclet.search.browser_info= \
-    The URL template below may be used to configure this page as a search engine \
-    in browsers that support this feature. It has been tested to work in Google \
-    Chrome and Mozilla Firefox. Note that other browsers may not support this \
-    feature or require a different URL format.
+    The URL template below may be useful to configure this page as a search engine \
+    or bookmarklet in browsers that support this feature.
 doclet.search.redirect=Redirect to first result
 
 # 0: a date
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/stylesheet.css b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/stylesheet.css
index 21d983ccf75..5ddca2b7315 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/stylesheet.css
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/stylesheet.css
@@ -615,6 +615,9 @@ ul.preview-feature-list {
     padding:0.1em;
     line-height: 1.6;
 }
+ul.preview-feature-list input {
+    margin-right: 8px;
+}
 /*
  * Styles for tables.
  */
@@ -701,7 +704,7 @@ div.checkboxes > label {
     white-space: nowrap;
 }
 div.checkboxes > label > input {
-    margin: 0 2px;
+    margin: 0 6px 0 2px;
 }
 .two-column-summary {
     display: grid;
@@ -948,15 +951,15 @@ main, nav, header, footer, section {
 .ui-autocomplete-category {
     font-weight:bold;
     font-size:15px;
-    padding:7px 0 7px 3px;
+    padding:7px 8px;
     background-color:var(--navbar-background-color);
     color:var(--navbar-text-color);
     box-sizing: border-box;
 }
 .ui-autocomplete {
-    max-height:85%;
-    max-width:65%;
-    overflow:auto;
+    max-height:calc(98vh - var(--nav-height));
+    max-width:min(75vw, calc(var(--max-content-width) * 0.748));
+    overflow-y:auto;
     white-space:nowrap;
     box-shadow: 0 3px 6px rgba(0,0,0,0.16), 0 3px 6px rgba(0,0,0,0.23);
     overscroll-behavior: contain;
@@ -980,7 +983,7 @@ ul.ui-autocomplete li.ui-static-link {
     padding: 5px 0;
     font-family: var(--body-font-family);
     font-size: 0.93em;
-    font-weight: bolder;
+    font-weight: bold;
     z-index: 10;
 }
 li.ui-static-link a, li.ui-static-link a:visited {
@@ -989,19 +992,50 @@ li.ui-static-link a, li.ui-static-link a:visited {
     float:right;
     margin-right:20px;
 }
-.ui-autocomplete .result-item {
-    font-size: inherit;
+.ui-autocomplete > li.result-item:nth-child(even) {
+    background-color: var(--even-row-color)
+}
+.ui-autocomplete > li.result-item:nth-child(odd) {
+    background-color: var(--odd-row-color)
+}
+.ui-autocomplete {
+    display: grid;
+    grid-template-columns: auto auto;
+}
+.ui-autocomplete > li,
+.ui-autocomplete > li > div {
+    grid-column: 1 / 3;
+}
+.ui-autocomplete > li.result-item,
+.ui-autocomplete > li.result-item > div {
+    display: grid;
+    grid-template-columns: subgrid;
+}
+.ui-autocomplete > li.result-item {
+    font-family: var(--body-font-family);
+    font-size: var(--body-font-size);
+    line-height: 1.7;
+}
+.ui-autocomplete .search-result-label {
+    padding: 1px 4px;
+    overflow: hidden;
+    text-overflow: ellipsis;
+}
+.ui-autocomplete .search-result-desc {
+    font-size: var(--nav-font-size);
+    padding: 2px 4px;
+    color: #404040;
+    overflow: hidden;
+    text-overflow: ellipsis;
 }
 .ui-autocomplete .result-highlight {
     font-weight:bold;
 }
-.ui-menu .ui-menu-item-wrapper {
-    padding-top: 0.4em;
-    padding-bottom: 0.4em;
+.ui-menu .ui-state-active .search-result-desc {
+    color: #383838;
 }
 .ui-menu .ui-menu-item-wrapper {
-    padding-top: 5px;
-    padding-bottom: 5px;
+    padding: 3px 4px;
 }
 input[type="text"] {
     background-image:url('glass.svg');
@@ -1013,6 +1047,7 @@ input[type="text"] {
     border-color: var(--border-color);
     border-radius: 4px;
     padding-left:20px;
+    padding-right: 18px;
     font-size: var(--nav-font-size);
     height: 19px;
 }
@@ -1022,16 +1057,14 @@ input#page-search-input {
 }
 input#search-input {
     width: 270px;
-    padding-right: 18px;
     margin: 0;
 }
 input.filter-input {
     min-width: 40px;
     width: 180px;
     margin: 0 -8px 0 5px;
-    padding-right: 18px;
 }
-input#reset-search, input.reset-filter {
+input#reset-search, input.reset-filter, input#page-search-reset {
     background-color: transparent;
     background-image:url('x.svg');
     background-repeat:no-repeat;
@@ -1055,6 +1088,11 @@ input.reset-filter {
     right: 10px;
     top: 0;
 }
+input#page-search-reset {
+    position: relative;
+    right: 18px;
+    top: -5px;
+}
 input::placeholder {
     color:var(--search-input-placeholder-color);
     opacity: 1;
@@ -1062,6 +1100,14 @@ input::placeholder {
 input:focus::placeholder {
     color: transparent;
 }
+select#search-modules {
+    margin: 0 10px 0 2px;
+    font-size: var(--nav-font-size);
+    padding: 3px 5px;
+    border-radius: 4px;
+    background: #f0f0f0;
+    border: 1px solid #909090;
+}
 kbd {
     background-color: #eeeeee;
     border: 1px solid #b0b0b0;
@@ -1071,14 +1117,6 @@ kbd {
     font-size: 0.9em;
     font-weight: bold;
 }
-.search-tag-desc-result {
-    font-style:italic;
-    font-size:11px;
-}
-.search-tag-holder-result {
-    font-style:italic;
-    font-size:12px;
-}
 .search-tag-result:target {
     background-color:var(--search-tag-highlight-color);
 }
@@ -1096,21 +1134,61 @@ details.page-search-details {
 div#result-container {
     font-size: 1em;
 }
-div#result-container a.search-result-link {
-    padding: 0;
-    margin: 4px 0;
-    width: 100%;
-}
 #result-container .result-highlight {
-    font-weight:bolder;
+    font-weight:bold;
+}
+#result-container div.result-table {
+    display: grid;
+    grid-template-columns: minmax(40%, max-content) minmax(40%, auto);
+}
+#result-container div.result-table > div.table-header,
+#result-container div.result-table > a.search-result-link {
+    display: grid;
+    grid-template-columns: subgrid;
+    grid-column: 1 / 3;
+    margin: 0;
+}
+#result-container div.result-table > div.table-header > span {
+    padding: 5px 12px;
+    font-size: 0.93em;
+    background-color: var(--subnav-background-color);
+}
+#result-container div.result-table > a.search-result-link > span {
+    padding: 8px 12px;
+}
+#result-container div.result-table > a.search-result-link:nth-child(odd) {
+    background-color: var(--odd-row-color)
+}
+#result-container div.result-table > a.search-result-link:nth-child(even) {
+    background-color: var(--even-row-color)
+}
+#result-container div.result-table > a.search-result-link {
+    color: var(--block-text-color);
+    white-space: nowrap;
+}
+#result-container div.result-table > a.search-result-link:focus-visible,
+#result-container div.result-table > a.search-result-link.selected {
+    background-color: var(--selected-background-color);
+    outline: none;
+}
+#result-container div.result-table > a.search-result-link .search-result-label {
+    overflow: hidden;
+    text-overflow: ellipsis;
+}
+#result-container div.result-table > a.search-result-link .search-result-desc {
+    font-size: var(--nav-font-size);
+    color: #404040;
+    overflow: hidden;
+    text-overflow: ellipsis;
 }
 .page-search-info {
     background-color: var(--subnav-background-color);
     border-radius: 3px;
     border: 0 solid var(--border-color);
     padding: 0 8px;
+    margin: 8px 0;
     overflow: hidden;
-    height: 0;
+    display: none;
     transition: all 0.2s ease;
 }
 div.table-tabs > button.table-tab {
@@ -1524,6 +1602,27 @@ table.striped > tbody > tr > th {
         transform-origin: 10% 90%;
         width: 26px;
     }
+    .ui-autocomplete {
+        display: block;
+        grid-template-columns: none;
+    }
+    .ui-autocomplete > li,
+    .ui-autocomplete > li > div,
+    .ui-autocomplete > li.result-item,
+    .ui-autocomplete > li.result-item > div {
+        grid-column: unset;
+        display: block;
+        grid-template-columns: none;
+    }
+    .ui-autocomplete > li.result-item {
+        line-height: 1.45;
+    }
+    .ui-autocomplete .search-result-label {
+        display: block;
+    }
+    .ui-autocomplete .search-result-desc {
+        display: block;
+    }
 }
 @media screen and (max-width: 800px) {
     .about-language {
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/taglets/SpecTaglet.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/taglets/SpecTaglet.java
index b408d30b168..6baca04b667 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/taglets/SpecTaglet.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/taglets/SpecTaglet.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -173,7 +173,7 @@ public class SpecTaglet extends BaseTaglet implements InheritableTaglet {
         Content titleWithAnchor = tagletWriter.createAnchorAndSearchIndex(holder,
                 searchText,
                 title,
-                resources.getText("doclet.External_Specification"),
+                "",
                 docTree);
 
         if (specURI == null) {
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/taglets/SystemPropertyTaglet.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/taglets/SystemPropertyTaglet.java
index cac058aabdc..277d818f78a 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/taglets/SystemPropertyTaglet.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/taglets/SystemPropertyTaglet.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -62,7 +62,6 @@ public class SystemPropertyTaglet extends BaseTaglet {
      */
     private Content systemPropertyTagOutput(Element element, SystemPropertyTree tag) {
         String tagText = tag.getPropertyName().toString();
-        return HtmlTree.CODE(tagletWriter.createAnchorAndSearchIndex(element, tagText,
-                resources.getText("doclet.System_Property"), tag));
+        return HtmlTree.CODE(tagletWriter.createAnchorAndSearchIndex(element, tagText, "", tag));
     }
 }
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 e0712e2f771..0d28c7d6e5d 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
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -409,7 +409,7 @@ public class TagletWriter {
             public String visitExecutable(ExecutableElement e, Void p) {
                 return utils.getFullyQualifiedName(utils.getEnclosingTypeElement(e))
                         + "." + utils.getSimpleName(e)
-                        + utils.flatSignature(e, htmlWriter.getCurrentTypeElement());
+                        + utils.makeSignature(e, htmlWriter.getCurrentTypeElement(), false, true);
             }
 
             @Override
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/doclets.properties b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/doclets.properties
index 8ce2c9c6125..9836c58843b 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/doclets.properties
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/doclets.properties
@@ -236,6 +236,7 @@ doclet.search=Search
 doclet.search_placeholder=Search documentation (type /)
 doclet.search_in_documentation=Search in documentation
 doclet.search_reset=Reset
+doclet.Member=Member
 doclet.Field=Field
 doclet.Property=Property
 doclet.Constructor=Constructor
@@ -371,12 +372,16 @@ doclet.search.many_results=Found {0} results
 doclet.search.loading=Loading search index...
 doclet.search.searching=Searching...
 doclet.search.redirecting=Redirecting to first result...
+# {0} is a select input containing all_modules message below and module names
+doclet.search.in=in {0}
+doclet.search.all_modules=all modules
 doclet.search.modules=Modules
 doclet.search.packages=Packages
 doclet.search.classes_and_interfaces=Classes and Interfaces
 doclet.search.types=Types
 doclet.search.members=Members
 doclet.search.search_tags=Search Tags
+doclet.search.linkSearchPageLabel=Go to search page
 
 doclet.snippet.contents.none=\
  @snippet does not specify contents
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/IndexItem.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/IndexItem.java
index 2b853a0593f..e2b4c16c584 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/IndexItem.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/IndexItem.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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,6 +89,73 @@ public class IndexItem {
         TAGS
     }
 
+    /**
+     * The kind of index item. Index items can represent program elements,
+     * various doc comment tags, or other resources such as summary pages.
+     *
+     * Values in this enum must match elements in array itemDesc in
+     * JavaScript file search.js.template!
+     */
+    public enum Kind {
+        // Members
+        ENUM_CONSTANT,
+        FIELD,
+        STATIC_FIELD,
+        CONSTRUCTOR,
+        ANNOTATION_ELEMENT,
+        METHOD,
+        STATIC_METHOD,
+        RECORD_COMPONENT,
+        // Types
+        ANNOTATION_TYPE,
+        ENUM,
+        INTERFACE,
+        RECORD,
+        CLASS,
+        EXCEPTION_CLASS,
+        // Tags
+        SEARCH_ITEM,
+        SYSTEM_PROPERTY,
+        SECTION,
+        EXTERNAL_SPEC,
+        // Other
+        SUMMARY_PAGE;
+
+        /**
+         * {@return the kind of index item for a program element}
+         */
+        public static Kind ofElement(Element elem, Utils utils) {
+            return switch (elem.getKind()) {
+                case ENUM_CONSTANT -> ENUM_CONSTANT;
+                case FIELD -> utils.isStatic(elem) ? STATIC_FIELD : FIELD;
+                case CONSTRUCTOR -> CONSTRUCTOR;
+                case METHOD -> utils.isAnnotationInterface(elem.getEnclosingElement())
+                        ? ANNOTATION_ELEMENT
+                        : utils.isStatic(elem) ? STATIC_METHOD : METHOD;
+                case RECORD_COMPONENT -> RECORD_COMPONENT;
+                case ANNOTATION_TYPE -> ANNOTATION_TYPE;
+                case ENUM -> ENUM;
+                case CLASS -> utils.isThrowable((TypeElement) elem) ? EXCEPTION_CLASS : CLASS;
+                case INTERFACE -> INTERFACE;
+                case RECORD -> RECORD;
+                default -> throw new IllegalArgumentException(elem.toString());
+            };
+        }
+
+        /**
+         * {@return the kind of index item for a doc comment tag}
+         */
+        public static Kind ofDocTree(DocTree tree) {
+            return switch (tree.getKind()) {
+                case DocTree.Kind.INDEX -> SEARCH_ITEM;
+                case DocTree.Kind.SYSTEM_PROPERTY -> SYSTEM_PROPERTY;
+                case DocTree.Kind.SPEC -> EXTERNAL_SPEC;
+                case DocTree.Kind.START_ELEMENT -> SECTION;
+                default -> throw new IllegalArgumentException(tree.getKind().toString());
+            };
+        }
+    }
+
     /**
      * The presentation string for the item. It must be non-empty.
      */
@@ -124,6 +191,11 @@ public class IndexItem {
      */
     private String containingClass = "";
 
+    /**
+     * The kind of the item.
+     */
+    private final Kind kind;
+
     /**
      * Creates an index item for a module element.
      *
@@ -133,7 +205,7 @@ public class IndexItem {
      * @return the item
      */
     public static IndexItem of(ModuleElement moduleElement, Utils utils) {
-        return new IndexItem(moduleElement, utils.getFullyQualifiedName(moduleElement));
+        return new IndexItem(moduleElement, utils.getFullyQualifiedName(moduleElement), null);
     }
 
     /**
@@ -145,7 +217,7 @@ public class IndexItem {
      * @return the item
      */
     public static IndexItem of(PackageElement packageElement, Utils utils) {
-        return new IndexItem(packageElement, utils.getPackageName(packageElement));
+        return new IndexItem(packageElement, utils.getPackageName(packageElement), null);
     }
 
     /**
@@ -158,7 +230,7 @@ public class IndexItem {
      * @return the item
      */
     public static IndexItem of(TypeElement typeElement, Utils utils) {
-        return new IndexItem(typeElement, utils.getSimpleName(typeElement));
+        return new IndexItem(typeElement, utils.getSimpleName(typeElement), Kind.ofElement(typeElement, utils));
     }
 
     /**
@@ -178,9 +250,9 @@ public class IndexItem {
         String name = utils.getSimpleName(member);
         if (utils.isExecutableElement(member)) {
             ExecutableElement ee = (ExecutableElement)member;
-            name += utils.flatSignature(ee, typeElement);
+            name += utils.makeSignature(ee, typeElement, false, true);
         }
-        return new IndexItem(member, name) {
+        return new IndexItem(member, name, Kind.ofElement(member, utils)) {
             @Override
             public TypeElement getContainingTypeElement() {
                 return typeElement;
@@ -205,7 +277,6 @@ public class IndexItem {
                                String holder, String description, DocLink link) {
         Objects.requireNonNull(element);
         Objects.requireNonNull(holder);
-        Objects.requireNonNull(description);
         Objects.requireNonNull(link);
 
         switch (docTree.getKind()) {
@@ -213,7 +284,7 @@ public class IndexItem {
             default -> throw new IllegalArgumentException(docTree.getKind().toString());
         }
 
-        return new IndexItem(element, label, link.toString()) {
+        return new IndexItem(element, label, Kind.ofDocTree(docTree), link.toString()) {
             @Override
             public DocTree getDocTree() {
                 return docTree;
@@ -245,11 +316,7 @@ public class IndexItem {
      */
     public static IndexItem of(Category category, String label, DocPath path) {
         Objects.requireNonNull(category);
-        return new IndexItem(null, label, path.getPath()) {
-            @Override
-            public DocTree getDocTree() {
-                return null;
-            }
+        return new IndexItem(null, label, Kind.SUMMARY_PAGE, path.getPath()) {
             @Override
             public Category getCategory() {
                 return category;
@@ -258,14 +325,10 @@ public class IndexItem {
             public String getHolder() {
                 return "";
             }
-            @Override
-            public String getDescription() {
-                return "";
-            }
         };
     }
 
-    private IndexItem(Element element, String label) {
+    private IndexItem(Element element, String label, Kind kind) {
         if (label.isEmpty()) {
             throw new IllegalArgumentException();
         }
@@ -275,10 +338,11 @@ public class IndexItem {
 
         this.element = element;
         this.label = label;
+        this.kind = kind;
     }
 
-    private IndexItem(Element element, String label, String url) {
-        this(element, label);
+    private IndexItem(Element element, String label, Kind kind, String url) {
+        this(element, label, kind);
         setUrl(url);
     }
 
@@ -495,13 +559,22 @@ public class IndexItem {
     }
 
     /**
-     * Returns a description of the tag for this item or {@code null} if this is not a item
-     * for a tag for an item in a documentation tag.
+     * Returns the kind of this item.
+     *
+     * @return the item kind
+     */
+    public Kind getKind() {
+        return kind;
+    }
+
+    /**
+     * Returns a description of the tag for this item or an empty string if no
+     * description is available for this item.
      *
      * @return the description of the tag
      */
     public String getDescription() {
-        return null;
+        return "";
     }
 
     /**
@@ -511,76 +584,98 @@ public class IndexItem {
      */
     public String toJSON() {
         // TODO: Additional processing is required, see JDK-8238495
-        StringBuilder item = new StringBuilder();
+        JSONBuilder builder = new JSONBuilder();
         Category category = getCategory();
         switch (category) {
             case MODULES:
-                item.append("{")
-                        .append("\"l\":\"").append(label).append("\"")
-                        .append("}");
+                builder.append("l", label);
                 break;
 
             case PACKAGES:
-                item.append("{");
                 if (!containingModule.isEmpty()) {
-                    item.append("\"m\":\"").append(containingModule).append("\",");
+                    builder.append("m", containingModule);
                 }
-                item.append("\"l\":\"").append(label).append("\"");
+                builder.append("l", label);
                 if (!url.isEmpty()) {
-                    item.append(",\"u\":\"").append(url).append("\"");
+                    builder.append("u", url);
+                }
+                if (kind != null) {
+                    builder.append("k", kind.ordinal());
                 }
-                item.append("}");
                 break;
 
             case TYPES:
-                item.append("{");
                 if (!containingPackage.isEmpty()) {
-                    item.append("\"p\":\"").append(containingPackage).append("\",");
+                    builder.append("p", containingPackage);
                 }
                 if (!containingModule.isEmpty()) {
-                    item.append("\"m\":\"").append(containingModule).append("\",");
+                    builder.append("m", containingModule);
                 }
-                item.append("\"l\":\"").append(label).append("\"");
+                builder.append("l", label);
                 if (!url.isEmpty()) {
-                    item.append(",\"u\":\"").append(url).append("\"");
+                    builder.append("u", url);
+                }
+                if (kind != null && kind != Kind.CLASS) {
+                    builder.append("k", kind.ordinal());
                 }
-                item.append("}");
                 break;
 
             case MEMBERS:
-                item.append("{");
                 if (!containingModule.isEmpty()) {
-                    item.append("\"m\":\"").append(containingModule).append("\",");
+                    builder.append("m", containingModule);
                 }
-                item.append("\"p\":\"").append(containingPackage).append("\",")
-                        .append("\"c\":\"").append(containingClass).append("\",")
-                        .append("\"l\":\"").append(label).append("\"");
+                builder.append("p", containingPackage)
+                        .append("c", containingClass)
+                        .append("l", label);
                 if (!url.isEmpty()) {
-                    item.append(",\"u\":\"").append(url).append("\"");
+                    builder.append("u", url);
+                }
+                if (kind != null && kind != Kind.METHOD) {
+                    builder.append("k", kind.ordinal());
                 }
-                item.append("}");
                 break;
 
             case TAGS:
                 String holder = getHolder();
                 String description = getDescription();
-                item.append("{")
-                        .append("\"l\":\"").append(escapeQuotes(label)).append("\",")
-                        .append("\"h\":\"").append(holder).append("\",");
+                builder.append("l", escapeQuotes(label))
+                       .append("h", holder);
                 if (!description.isEmpty()) {
-                    item.append("\"d\":\"").append(escapeQuotes(description)).append("\",");
+                    builder.append("d", escapeQuotes(description));
                 }
-                item.append("\"u\":\"").append(escapeQuotes(url)).append("\"")
-                        .append("}");
+                if (kind != null && kind != Kind.SEARCH_ITEM) {
+                    builder.append("k", kind.ordinal());
+                }
+                builder.append("u", escapeQuotes(url));
                 break;
 
             default:
                 throw new AssertionError("Unexpected category: " + category);
         }
-        return item.toString();
+        return builder.toString();
     }
 
-    private String escapeQuotes(String s) {
+    private static String escapeQuotes(String s) {
         return s.replace("\\", "\\\\").replace("\"", "\\\"");
     }
+
+    // Simple JSON object string builder class
+    private static class JSONBuilder {
+
+        StringBuilder b = new StringBuilder("{");
+
+        public JSONBuilder append(String name, Object value) {
+            if (b.length() > 1) {
+                b.append(",");
+            }
+            b.append("\"").append(name).append("\":\"").append(value).append("\"");
+            return this;
+        }
+
+        @Override
+        public String toString() {
+            b.append("}");
+            return b.toString();
+        }
+    }
  }
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/html/HtmlAttr.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/html/HtmlAttr.java
index ccb193d6ab9..10aa7c0c57b 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/html/HtmlAttr.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/html/HtmlAttr.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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,7 @@ public enum HtmlAttr {
     ITEMREF(true),
     ITEMSCOPE(true),
     ITEMTYPE(true),
+    LABEL,
     LANG(true),
     LINK,
     LONGDESC,
@@ -136,6 +137,7 @@ public enum HtmlAttr {
     SCHEME,
     SCOPE,
     SCROLLING,
+    SELECTED,
     SHAPE,
     SIZE,
     SPACE,
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/html/HtmlTag.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/html/HtmlTag.java
index 7b198a06631..c88fd867965 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/html/HtmlTag.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/html/HtmlTag.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -257,6 +257,9 @@ public enum HtmlTag {
         }
     },
 
+    OPTION(BlockType.OTHER, EndKind.OPTIONAL,
+            attrs(AttrKind.OK, HtmlAttr.LABEL, SELECTED, VALUE)),
+
     P(BlockType.BLOCK, EndKind.OPTIONAL,
             EnumSet.of(Flag.EXPECT_CONTENT),
             attrs(AttrKind.HTML4, ALIGN)),
@@ -285,6 +288,9 @@ public enum HtmlTag {
     SCRIPT(BlockType.INLINE, EndKind.REQUIRED,
             attrs(AttrKind.OK, SRC, TYPE)),
 
+    SELECT(BlockType.INLINE, EndKind.REQUIRED,
+            attrs(AttrKind.OK, NAME, SIZE, VALUE)),
+
     SECTION(BlockType.BLOCK, EndKind.REQUIRED,
             EnumSet.of(Flag.ACCEPTS_BLOCK, Flag.ACCEPTS_INLINE)),
 
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/html/HtmlTree.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/html/HtmlTree.java
index 2cdafcd9c5e..ef34d83a75d 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/html/HtmlTree.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/html/HtmlTree.java
@@ -1218,7 +1218,7 @@ public class HtmlTree extends Content {
      */
     public boolean isInline() {
         return switch (tag) {
-            case A, BUTTON, BR, CODE, EM, I, IMG, LABEL, SMALL, SPAN, STRONG, SUB, SUP, WBR -> true;
+            case A, BUTTON, BR, CODE, EM, I, IMG, INPUT, LABEL, SELECT, SMALL, SPAN, STRONG, SUB, SUP, WBR -> true;
             default -> false;
         };
     }
diff --git a/test/langtools/jdk/javadoc/doclet/checkStylesheetClasses/CheckStylesheetClasses.java b/test/langtools/jdk/javadoc/doclet/checkStylesheetClasses/CheckStylesheetClasses.java
index ff484b814ec..ee1fa538a57 100644
--- a/test/langtools/jdk/javadoc/doclet/checkStylesheetClasses/CheckStylesheetClasses.java
+++ b/test/langtools/jdk/javadoc/doclet/checkStylesheetClasses/CheckStylesheetClasses.java
@@ -137,11 +137,11 @@ public class CheckStylesheetClasses {
         removeAll(styleSheetNames, "borderless", "plain", "striped");
 
         // used in search.js and search-page.js; may be worth documenting in HtmlStyle
-        removeAll(styleSheetNames, "result-highlight", "result-item", "anchor-link",
-                "search-tag-desc-result", "search-tag-holder-result", "page-search-header",
-                "ui-autocomplete", "ui-autocomplete-category", "ui-state-active", "ui-menu",
-                "ui-menu-item-wrapper", "ui-static-link", "expanded", "search-result-link",
-                "two-column-search-results", "sort-asc", "sort-desc", "visible");
+        removeAll(styleSheetNames, "result-highlight", "result-item", "anchor-link", "expanded",
+                "page-search-header", "result-table", "ui-autocomplete", "ui-autocomplete-category",
+                "ui-state-active", "ui-menu", "ui-menu-item-wrapper", "ui-static-link",
+                "search-result-desc", "search-result-label", "search-result-link", "selected",
+                "sort-asc", "sort-desc", "two-column-search-results", "visible");
 
         // very JDK specific
         styleSheetNames.remove("module-graph");
diff --git a/test/langtools/jdk/javadoc/doclet/testAutoHeaderId/TestAutoHeaderId.java b/test/langtools/jdk/javadoc/doclet/testAutoHeaderId/TestAutoHeaderId.java
index d88af521ab9..e81fe545a4c 100644
--- a/test/langtools/jdk/javadoc/doclet/testAutoHeaderId/TestAutoHeaderId.java
+++ b/test/langtools/jdk/javadoc/doclet/testAutoHeaderId/TestAutoHeaderId.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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 8289332 8286470 8309471
+ * @bug 8289332 8286470 8309471 8345555
  * @summary Auto-generate ids for user-defined headings
  * @library /tools/lib ../../lib
  * @modules jdk.javadoc/jdk.javadoc.internal.tool
@@ -140,26 +140,26 @@ public class TestAutoHeaderId extends JavadocTester {
     private void checkSearchIndex() {
         checkOutput("tag-search-index.js", true,
                 """
-                    {"l":"Duplicate Text","h":"class p.C","d":"Section","u":"p/C.html#duplicate-text-heading"}""",
+                    {"l":"Duplicate Text","h":"class p.C","k":"16","u":"p/C.html#duplicate-text-heading"}""",
                 """
-                    {"l":"Duplicate Text","h":"class p.C","d":"Section","u":"p/C.html#duplicate-text-heading1"}""",
+                    {"l":"Duplicate Text","h":"class p.C","k":"16","u":"p/C.html#duplicate-text-heading1"}""",
                 """
-                    {"l":"Embedded A-Tag with ID","h":"class p.C","d":"Section","u":"p/C.html#fixed-id-2"}""",
+                    {"l":"Embedded A-Tag with ID","h":"class p.C","k":"16","u":"p/C.html#fixed-id-2"}""",
                 """
-                    {"l":"Embedded Code Tag","h":"class p.C","d":"Section","u":"p/C.html#embedded-code-tag-heading"}""",
+                    {"l":"Embedded Code Tag","h":"class p.C","k":"16","u":"p/C.html#embedded-code-tag-heading"}""",
                 """
-                    {"l":"Embedded Link Tag","h":"class p.C","d":"Section","u":"p/C.html#embedded-link-tag-heading"}""",
+                    {"l":"Embedded Link Tag","h":"class p.C","k":"16","u":"p/C.html#embedded-link-tag-heading"}""",
                 """
-                    {"l":"2.0 Extra (#*!. chars","h":"class p.C","d":"Section","u":"p/C.html#2-0-extra-chars-heading"}""",
+                    {"l":"2.0 Extra (#*!. chars","h":"class p.C","k":"16","u":"p/C.html#2-0-extra-chars-heading"}""",
                 """
-                    {"l":"1.0 First Header","h":"class p.C","d":"Section","u":"p/C.html#1-0-first-header-heading"}""",
+                    {"l":"1.0 First Header","h":"class p.C","k":"16","u":"p/C.html#1-0-first-header-heading"}""",
                 """
-                    {"l":"1.1 Header with ID","h":"class p.C","d":"Section","u":"p/C.html#fixed-id-1"}""",
+                    {"l":"1.1 Header with ID","h":"class p.C","k":"16","u":"p/C.html#fixed-id-1"}""",
                 """
-                    {"l":"3.0 Multi-line heading with extra whitespace","h":"class p.C","d":"Section","u":"p/C.html\
+                    {"l":"3.0 Multi-line heading with extra whitespace","h":"class p.C","k":"16","u":"p/C.html\
                     #3-0-multi-line-heading-with-extra-whitespace-heading"}""",
                 """
-                    {"l":"Other attributes","h":"class p.C","d":"Section","u":"p/C.html#other-attributes-heading"}""");
+                    {"l":"Other attributes","h":"class p.C","k":"16","u":"p/C.html#other-attributes-heading"}""");
     }
 
     private void checkHtmlIndex() {
@@ -182,50 +182,50 @@ public class TestAutoHeaderId extends JavadocTester {
                     <h2 class="title" id="I:D">D</h2>
                     <dl class="index">
                     <dt><a href="p/C.html#duplicate-text-heading" class="search-tag-link">Duplicate Text</a> \
-                    - Search tag in class p.C</dt>
-                    <dd>Section</dd>
+                    - Section in class p.C</dt>
+                    <dd>&nbsp;</dd>
                     <dt><a href="p/C.html#duplicate-text-heading1" class="search-tag-link">Duplicate Text</a>\
-                     - Search tag in class p.C</dt>
-                    <dd>Section</dd>
+                     - Section in class p.C</dt>
+                    <dd>&nbsp;</dd>
                     </dl>
                     <h2 class="title" id="I:E">E</h2>
                     <dl class="index">
                     <dt><a href="p/C.html#2-0-extra-chars-heading" class="search-tag-link">2.0 Extra (#*!. ch\
-                    ars</a> - Search tag in class p.C</dt>
-                    <dd>Section</dd>
+                    ars</a> - Section in class p.C</dt>
+                    <dd>&nbsp;</dd>
                     <dt><a href="p/C.html#fixed-id-2" class="search-tag-link">Embedded A-Tag with ID</a> - Se\
-                    arch tag in class p.C</dt>
-                    <dd>Section</dd>
+                    ction in class p.C</dt>
+                    <dd>&nbsp;</dd>
                     <dt><a href="p/C.html#embedded-code-tag-heading" class="search-tag-link">Embedded Code Ta\
-                    g</a> - Search tag in class p.C</dt>
-                    <dd>Section</dd>
+                    g</a> - Section in class p.C</dt>
+                    <dd>&nbsp;</dd>
                     <dt><a href="p/C.html#embedded-link-tag-heading" class="search-tag-link">Embedded Link Ta\
-                    g</a> - Search tag in class p.C</dt>
-                    <dd>Section</dd>
+                    g</a> - Section in class p.C</dt>
+                    <dd>&nbsp;</dd>
                     </dl>
                     <h2 class="title" id="I:F">F</h2>
                     <dl class="index">
                     <dt><a href="p/C.html#1-0-first-header-heading" class="search-tag-link">1.0 First Header<\
-                    /a> - Search tag in class p.C</dt>
-                    <dd>Section</dd>
+                    /a> - Section in class p.C</dt>
+                    <dd>&nbsp;</dd>
                     </dl>
                     <h2 class="title" id="I:H">H</h2>
                     <dl class="index">
-                    <dt><a href="p/C.html#fixed-id-1" class="search-tag-link">1.1 Header with ID</a> - Search\
-                     tag in class p.C</dt>
-                    <dd>Section</dd>
+                    <dt><a href="p/C.html#fixed-id-1" class="search-tag-link">1.1 Header with ID</a> - Sectio\
+                    n in class p.C</dt>
+                    <dd>&nbsp;</dd>
                     </dl>
                     <h2 class="title" id="I:M">M</h2>
                     <dl class="index">
                     <dt><a href="p/C.html#3-0-multi-line-heading-with-extra-whitespace-heading" class="search\
-                    -tag-link">3.0 Multi-line heading with extra whitespace</a> - Search tag in class p.C</dt>
-                    <dd>Section</dd>
+                    -tag-link">3.0 Multi-line heading with extra whitespace</a> - Section in class p.C</dt>
+                    <dd>&nbsp;</dd>
                     </dl>
                     <h2 class="title" id="I:O">O</h2>
                     <dl class="index">
                     <dt><a href="p/C.html#other-attributes-heading" class="search-tag-link">Other attributes<\
-                    /a> - Search tag in class p.C</dt>
-                    <dd>Section</dd>
+                    /a> - Section in class p.C</dt>
+                    <dd>&nbsp;</dd>
                     </dl>
                     <h2 class="title" id="I:P">P</h2>
                     <dl class="index">
diff --git a/test/langtools/jdk/javadoc/doclet/testErasure/TestErasure.java b/test/langtools/jdk/javadoc/doclet/testErasure/TestErasure.java
index 416d0cd2ec2..ffa8a530859 100644
--- a/test/langtools/jdk/javadoc/doclet/testErasure/TestErasure.java
+++ b/test/langtools/jdk/javadoc/doclet/testErasure/TestErasure.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2024, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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,9 +119,9 @@ public class TestErasure extends JavadocTester {
                  - Constructor for class <a href="Foo.html" title="class in Unnamed Package">Foo</a></dt>
                 <dd>&nbsp;</dd>""");
         checkOutput("member-search-index.js", true, """
-                {"p":"<Unnamed>","c":"Foo","l":"Foo(T)","u":"%3Cinit%3E(T)"},\
-                {"p":"<Unnamed>","c":"Foo","l":"Foo(T)","u":"%3Cinit%3E(X)"},\
-                {"p":"<Unnamed>","c":"Foo","l":"Foo(T)","u":"%3Cinit%3E(Y)"}""");
+                {"p":"<Unnamed>","c":"Foo","l":"Foo(T)","u":"%3Cinit%3E(T)","k":"3"},\
+                {"p":"<Unnamed>","c":"Foo","l":"Foo(T)","u":"%3Cinit%3E(X)","k":"3"},\
+                {"p":"<Unnamed>","c":"Foo","l":"Foo(T)","u":"%3Cinit%3E(Y)","k":"3"}""");
         // methods
         checkOutput("Foo.html", true, """
                 <div class="col-first even-row-color method-summary-table method-summary-table-tab2 \
@@ -222,8 +222,8 @@ public class TestErasure extends JavadocTester {
                  - Constructor for class <a href="Foo.html" title="class in Unnamed Package">Foo</a></dt>
                 <dd>&nbsp;</dd>""");
         checkOutput("member-search-index.js", true, """
-                {"p":"<Unnamed>","c":"Foo","l":"Foo(T)","u":"%3Cinit%3E(T)"},\
-                {"p":"<Unnamed>","c":"Foo","l":"Foo(T)","u":"%3Cinit%3E(X)"}""");
+                {"p":"<Unnamed>","c":"Foo","l":"Foo(T)","u":"%3Cinit%3E(T)","k":"3"},\
+                {"p":"<Unnamed>","c":"Foo","l":"Foo(T)","u":"%3Cinit%3E(X)","k":"3"}""");
         // methods
         checkOutput("Foo.html", true, """
                 <div class="col-first even-row-color method-summary-table method-summary-table-tab2 \
diff --git a/test/langtools/jdk/javadoc/doclet/testIndex/TestIndex.java b/test/langtools/jdk/javadoc/doclet/testIndex/TestIndex.java
index cd3fd43d666..b50ef9fbe42 100644
--- a/test/langtools/jdk/javadoc/doclet/testIndex/TestIndex.java
+++ b/test/langtools/jdk/javadoc/doclet/testIndex/TestIndex.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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      4852280 4517115 4973608 4994589 8026567 8071982 8196202 8234746
- *           8311264
+ *           8311264 8345555
  * @summary  Perform tests on index.html file.
  *           Also test that index-all.html has the appropriate output.
  *           Test for unnamed package in index.
@@ -60,8 +60,8 @@ public class TestIndex extends JavadocTester {
                     <a href="pkg/C.html#c()" class="member-name-link">c()</a> - Method in class pkg.\
                     <a href="pkg/C.html" title="class in pkg">C</a>""",
                 """
-                    <a href="pkg/C.html#c-heading" class="search-tag-link">C</a> - Search tag in cla\
-                    ss pkg.C""",
+                    <a href="pkg/C.html#c-heading" class="search-tag-link">C</a> - Section in class \
+                    pkg.C""",
                 """
                     <a href="pkg/C.html" class="type-name-link" title="class in pkg">C</a> - Class i\
                     n <a href="pkg/package-summary.html">pkg</a>""",
@@ -78,8 +78,8 @@ public class TestIndex extends JavadocTester {
                     <a href="pkg/C.html#c/d" class="search-tag-link">c/d</a> - Search tag in class p\
                     kg.C""",
                 """
-                    <a href="pkg/C.html#c-d-heading" class="search-tag-link">C/D</a> - Search tag in\
-                     class pkg.C""",
+                    <a href="pkg/C.html#c-d-heading" class="search-tag-link">C/D</a> - Section in cl\
+                    ass pkg.C""",
                 """
                     <a href="pkg/Coin.html" class="type-name-link" title="enum class in pkg">Coin</a\
                     > - Enum Class in <a href="pkg/package-summary.html">pkg</a>""",
diff --git a/test/langtools/jdk/javadoc/doclet/testIndexInDocFiles/TestIndexInDocFiles.java b/test/langtools/jdk/javadoc/doclet/testIndexInDocFiles/TestIndexInDocFiles.java
index 1f724cf83fe..0e7e941ea81 100644
--- a/test/langtools/jdk/javadoc/doclet/testIndexInDocFiles/TestIndexInDocFiles.java
+++ b/test/langtools/jdk/javadoc/doclet/testIndexInDocFiles/TestIndexInDocFiles.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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 8235414
+ * @bug 8235414 8345555
  * @summary Module level doc-files show "unnamed package" as holder
  * @library /tools/lib ../../lib
  * @modules jdk.javadoc/jdk.javadoc.internal.tool
@@ -114,12 +114,11 @@ public class TestIndexInDocFiles extends JavadocTester {
                 """
                     {"l":"package-index","h":"package p.q","d":"additional info","u":"p/q/doc-files/package-file.html#package-index"}""",
                 """
-                    {"l":"package.property","h":"package p.q","d":"System Property","u":"p/q/doc-files/package-file.html#package.property"}""",
+                    {"l":"package.property","h":"package p.q","k":"15","u":"p/q/doc-files/package-file.html#package.property"}""",
                 """
                     {"l":"top-level-index","h":"unnamed package","d":"additional info","u":"doc-files/top-level-file.html#top-level-index"}""",
                 """
-                    {"l":"top.level.property","h":"unnamed package","d":"System Property","u":"doc-f\
-                    iles/top-level-file.html#top.level.property"}""");
+                    {"l":"top.level.property","h":"unnamed package","k":"15","u":"doc-files/top-level-file.html#top.level.property"}""");
     }
 
     /**
@@ -186,9 +185,8 @@ public class TestIndexInDocFiles extends JavadocTester {
                 """
                     {"l":"package-index","h":"package p.q","d":"additional info","u":"m.n/p/q/doc-files/package-file.html#package-index"}""",
                 """
-                    {"l":"module.property","h":"module m.n","d":"System Property","u":"m.n/doc-files/module-file.html#module.property"}""",
+                    {"l":"module.property","h":"module m.n","k":"15","u":"m.n/doc-files/module-file.html#module.property"}""",
                 """
-                    {"l":"package.property","h":"package p.q","d":"System Property","u":"m.n/p/q/doc\
-                    -files/package-file.html#package.property"}""");
+                    {"l":"package.property","h":"package p.q","k":"15","u":"m.n/p/q/doc-files/package-file.html#package.property"}""");
     }
 }
diff --git a/test/langtools/jdk/javadoc/doclet/testIndexInherited/TestIndexInherited.java b/test/langtools/jdk/javadoc/doclet/testIndexInherited/TestIndexInherited.java
index 8743b4a62a6..7a8e95cca47 100644
--- a/test/langtools/jdk/javadoc/doclet/testIndexInherited/TestIndexInherited.java
+++ b/test/langtools/jdk/javadoc/doclet/testIndexInherited/TestIndexInherited.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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      8292892
+ * @bug      8292892 8345555
  * @summary  Tests that members inherited from classes with package access are
  *           documented in the index as though they were declared in the
  *           inheriting class.
@@ -73,8 +73,8 @@ public class TestIndexInherited extends JavadocTester {
     private static final String[] SEARCH_INHERITED = {"""
         {"p":"pkg1","c":"ClassB","l":"methodA()"}""", """
         {"p":"pkg2","c":"ClassC","l":"methodA()"}""", """
-        {"p":"pkg1","c":"ClassB","l":"STRING_A"}""", """
-        {"p":"pkg2","c":"ClassC","l":"STRING_A"}"""};
+        {"p":"pkg1","c":"ClassB","l":"STRING_A","k":"2"}""", """
+        {"p":"pkg2","c":"ClassC","l":"STRING_A","k":"2"}"""};
 
     /**
      * Index entries for members declared by the superclass.
@@ -92,7 +92,7 @@ public class TestIndexInherited extends JavadocTester {
      */
     private static final String[] SEARCH_DECLARED = {"""
         {"p":"pkg1","c":"ClassA","l":"methodA()"}""", """
-        {"p":"pkg1","c":"ClassA","l":"STRING_A"}"""};
+        {"p":"pkg1","c":"ClassA","l":"STRING_A","k":"2"}"""};
 
     /**
      * Sole constructor.
diff --git a/test/langtools/jdk/javadoc/doclet/testMemberInheritance/TestMemberInheritance.java b/test/langtools/jdk/javadoc/doclet/testMemberInheritance/TestMemberInheritance.java
index 91eda7db191..f01f5ffef00 100644
--- a/test/langtools/jdk/javadoc/doclet/testMemberInheritance/TestMemberInheritance.java
+++ b/test/langtools/jdk/javadoc/doclet/testMemberInheritance/TestMemberInheritance.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -216,7 +216,7 @@ public class TestMemberInheritance extends JavadocTester {
                     </dd>""");
         checkOutput("member-search-index.js", true,
                 """
-                    {"p":"pkg2","c":"DocumentedNonGenericChild","l":"parentField"}""",
+                    {"p":"pkg2","c":"DocumentedNonGenericChild","l":"parentField","k":"1"}""",
                 """
                     {"p":"pkg2","c":"DocumentedNonGenericChild","l":"parentMethod(String)","u":"parentMethod(T)"}""");
         // Search tags from inherited doc comments are not added to the index (8341904).
@@ -265,7 +265,7 @@ public class TestMemberInheritance extends JavadocTester {
                     </dd>""");
         checkOutput("member-search-index.js", true,
                 """
-                    {"p":"pkg2","c":"DocumentedNonGenericChild","l":"parentField"}""",
+                    {"p":"pkg2","c":"DocumentedNonGenericChild","l":"parentField","k":"1"}""",
                 """
                     {"p":"pkg2","c":"DocumentedNonGenericChild","l":"parentMethod(String)","u":"parentMethod(T)"}""");
         // Search tags from inherited doc comments are not added to the index (8341904).
diff --git a/test/langtools/jdk/javadoc/doclet/testModules/TestModulePackages.java b/test/langtools/jdk/javadoc/doclet/testModules/TestModulePackages.java
index 61b88e7057c..11355274c32 100644
--- a/test/langtools/jdk/javadoc/doclet/testModules/TestModulePackages.java
+++ b/test/langtools/jdk/javadoc/doclet/testModules/TestModulePackages.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -184,9 +184,9 @@ public class TestModulePackages extends JavadocTester {
                      {"p":"p","m":"m","l":"C"},{"p":"p","m":"o","l":"C"}""");
         checkOutput("member-search-index.js", true,
                 """
-                     {"m":"m","p":"p","c":"C","l":"C()","u":"%3Cinit%3E()"}""",
+                     {"m":"m","p":"p","c":"C","l":"C()","u":"%3Cinit%3E()","k":"3"}""",
                 """
-                     {"m":"o","p":"p","c":"C","l":"C()","u":"%3Cinit%3E()"}""");
+                     {"m":"o","p":"p","c":"C","l":"C()","u":"%3Cinit%3E()","k":"3"}""");
     }
 
     @Test
diff --git a/test/langtools/jdk/javadoc/doclet/testModules/TestModules.java b/test/langtools/jdk/javadoc/doclet/testModules/TestModules.java
index 73afa9839f4..612db74f93e 100644
--- a/test/langtools/jdk/javadoc/doclet/testModules/TestModules.java
+++ b/test/langtools/jdk/javadoc/doclet/testModules/TestModules.java
@@ -1437,10 +1437,10 @@ public class TestModules extends JavadocTester {
                     <table summary="Package Summary table, listing packages, and an explanation">""");
         checkOutput("type-search-index.js", true,
                 """
-                    {"l":"All Classes and Interfaces","u":"allclasses-index.html"}""");
+                    {"l":"All Classes and Interfaces","u":"allclasses-index.html","k":"18"}""");
         checkOutput("package-search-index.js", true,
                 """
-                    {"l":"All Packages","u":"allpackages-index.html"}""");
+                    {"l":"All Packages","u":"allpackages-index.html","k":"18"}""");
         checkOutput("index-all.html", true,
                 """
                     <br><a href="allclasses-index.html">All&nbsp;Classes&nbsp;and&nbsp;Interfaces</a\
diff --git a/test/langtools/jdk/javadoc/doclet/testNewApiList/TestNewApiList.java b/test/langtools/jdk/javadoc/doclet/testNewApiList/TestNewApiList.java
index 5398502bcd0..1d3dda52fc4 100644
--- a/test/langtools/jdk/javadoc/doclet/testNewApiList/TestNewApiList.java
+++ b/test/langtools/jdk/javadoc/doclet/testNewApiList/TestNewApiList.java
@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @bug      8263468 8269401 8268422 8287524 8325874 8331873
+ * @bug      8263468 8269401 8268422 8287524 8325874 8331873 8345555
  * @summary  New page for "recent" new API
  * @library  ../../lib
  * @modules  jdk.javadoc/jdk.javadoc.internal.tool
@@ -103,21 +103,7 @@ public class TestNewApiList extends JavadocTester {
             """
                 <h1 title="New API in recent releases" class="title">New API in recent releases</h1>
                 </div>
-                <div class="checkboxes">Show API added in: <label for="release-1">
-                <input type="checkbox" id="release-1" disabled checked onclick="toggleGlobal(this, '1', 3)">
-                <span>0.9</span></label> <label for="release-2">
-                <input type="checkbox" id="release-2" disabled checked onclick="toggleGlobal(this, '2', 3)">
-                <span>v1.0</span></label> <label for="release-3">
-                <input type="checkbox" id="release-3" disabled checked onclick="toggleGlobal(this, '3', 3)">
-                <span>1.2</span></label> <label for="release-4">
-                <input type="checkbox" id="release-4" disabled checked onclick="toggleGlobal(this, '4', 3)">
-                <span>2.0b</span></label> <label for="release-5">
-                <input type="checkbox" id="release-5" disabled checked onclick="toggleGlobal(this, '5', 3)">
-                <span>3.2</span></label> <label for="release-6">
-                <input type="checkbox" id="release-6" disabled checked onclick="toggleGlobal(this, '6', 3)">
-                <span>5</span></label> <label for="release-all">
-                <input type="checkbox" id="release-all" disabled checked onclick="toggleGlobal(this, 'all', 3)">
-                <span>Toggle all</span></label></div>
+                <div class="checkboxes">Show API added in: <label for="release-1"><input type="checkbox" id="release-1" disabled checked onclick="toggleGlobal(this, '1', 3)"><span>0.9</span></label> <label for="release-2"><input type="checkbox" id="release-2" disabled checked onclick="toggleGlobal(this, '2', 3)"><span>v1.0</span></label> <label for="release-3"><input type="checkbox" id="release-3" disabled checked onclick="toggleGlobal(this, '3', 3)"><span>1.2</span></label> <label for="release-4"><input type="checkbox" id="release-4" disabled checked onclick="toggleGlobal(this, '4', 3)"><span>2.0b</span></label> <label for="release-5"><input type="checkbox" id="release-5" disabled checked onclick="toggleGlobal(this, '5', 3)"><span>3.2</span></label> <label for="release-6"><input type="checkbox" id="release-6" disabled checked onclick="toggleGlobal(this, '6', 3)"><span>5</span></label> <label for="release-all"><input type="checkbox" id="release-all" disabled checked onclick="toggleGlobal(this, 'all', 3)"><span>Toggle all</span></label></div>
                 <h2 title="Contents">Contents</h2>
                 <ul class="contents-list">
                 <li id="contents-module"><a href="#module">Modules</a></li>
@@ -604,13 +590,12 @@ public class TestNewApiList extends JavadocTester {
             """
                 <h1 title="Deprecated API" class="title">Deprecated API</h1>
                 </div>
-                <div class="checkboxes">Show API deprecated in: <label for="release-1">
-                <input type="checkbox" id="release-1" disabled checked onclick="toggleGlobal(this, '1', 3)">
-                <span>5</span></label> <label for="release-other">
-                <input type="checkbox" id="release-other" disabled checked onclick="toggleGlobal(this, 'other', 3)">
-                <span>other</span></label> <label for="release-all">
-                <input type="checkbox" id="release-all" disabled checked onclick="toggleGlobal(this, 'all', 3)">
-                <span>Toggle all</span></label></div>
+                <div class="checkboxes">Show API deprecated in: <label for="release-1"><input type="\
+                checkbox" id="release-1" disabled checked onclick="toggleGlobal(this, '1', 3)"><span\
+                >5</span></label> <label for="release-other"><input type="checkbox" id="release-othe\
+                r" disabled checked onclick="toggleGlobal(this, 'other', 3)"><span>other</span></lab\
+                el> <label for="release-all"><input type="checkbox" id="release-all" disabled checke\
+                d onclick="toggleGlobal(this, 'all', 3)"><span>Toggle all</span></label></div>
                 <h2 title="Contents">Contents</h2>
                 <ul class="contents-list">
                 <li id="contents-for-removal"><a href="#for-removal">Terminally Deprecated</a></li>
@@ -671,19 +656,17 @@ public class TestNewApiList extends JavadocTester {
             """
                 <h1 title="New API" class="title">New API</h1>
                 </div>
-                <div class="checkboxes">Show API added in: <label for="release-1">
-                <input type="checkbox" id="release-1" disabled checked onclick="toggleGlobal(this, '1', 3)">
-                <span>1.2</span></label> <label for="release-2">
-                <input type="checkbox" id="release-2" disabled checked onclick="toggleGlobal(this, '2', 3)">
-                <span>2.0b</span></label> <label for="release-3">
-                <input type="checkbox" id="release-3" disabled checked onclick="toggleGlobal(this, '3', 3)">
-                <span>3.2</span></label> <label for="release-4">
-                <input type="checkbox" id="release-4" disabled checked onclick="toggleGlobal(this, '4', 3)">
-                <span>5</span></label> <label for="release-5">
-                <input type="checkbox" id="release-5" disabled checked onclick="toggleGlobal(this, '5', 3)">
-                <span>6</span></label> <label for="release-all">
-                <input type="checkbox" id="release-all" disabled checked onclick="toggleGlobal(this, 'all', 3)">
-                <span>Toggle all</span></label></div>
+                <div class="checkboxes">Show API added in: <label for="release-1"><input type="check\
+                box" id="release-1" disabled checked onclick="toggleGlobal(this, '1', 3)"><span>1.2<\
+                /span></label> <label for="release-2"><input type="checkbox" id="release-2" disabled\
+                 checked onclick="toggleGlobal(this, '2', 3)"><span>2.0b</span></label> <label for="\
+                release-3"><input type="checkbox" id="release-3" disabled checked onclick="toggleGlo\
+                bal(this, '3', 3)"><span>3.2</span></label> <label for="release-4"><input type="chec\
+                kbox" id="release-4" disabled checked onclick="toggleGlobal(this, '4', 3)"><span>5</\
+                span></label> <label for="release-5"><input type="checkbox" id="release-5" disabled \
+                checked onclick="toggleGlobal(this, '5', 3)"><span>6</span></label> <label for="rele\
+                ase-all"><input type="checkbox" id="release-all" disabled checked onclick="toggleGlo\
+                bal(this, 'all', 3)"><span>Toggle all</span></label></div>
                 <h2 title="Contents">Contents</h2>
                 <ul class="contents-list">
                 <li id="contents-class"><a href="#class">Classes</a></li>
diff --git a/test/langtools/jdk/javadoc/doclet/testNewLanguageFeatures/TestNewLanguageFeatures.java b/test/langtools/jdk/javadoc/doclet/testNewLanguageFeatures/TestNewLanguageFeatures.java
index af98f1fd07a..8a5aac96108 100644
--- a/test/langtools/jdk/javadoc/doclet/testNewLanguageFeatures/TestNewLanguageFeatures.java
+++ b/test/langtools/jdk/javadoc/doclet/testNewLanguageFeatures/TestNewLanguageFeatures.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -464,7 +464,7 @@ public class TestNewLanguageFeatures extends JavadocTester {
         //=================================
         checkOutput("index-all.html", true,
                 """
-                    <a href="pkg2/Foo.html#method(java.util.Vector)" class="member-name-link">method(Vector&lt;Object&gt;)</a>"""
+                    <a href="pkg2/Foo.html#method(java.util.Vector)" class="member-name-link">method(Vector)</a>"""
         );
 
         // TODO: duplicate of previous case; left in delibarately for now to simplify comparison testing
@@ -473,7 +473,7 @@ public class TestNewLanguageFeatures extends JavadocTester {
         //=================================
         checkOutput("index-all.html", true,
                 """
-                    <a href="pkg2/Foo.html#method(java.util.Vector)" class="member-name-link">method(Vector&lt;Object&gt;)</a>"""
+                    <a href="pkg2/Foo.html#method(java.util.Vector)" class="member-name-link">method(Vector)</a>"""
         );
 
     }
diff --git a/test/langtools/jdk/javadoc/doclet/testPackagePage/TestPackagePage.java b/test/langtools/jdk/javadoc/doclet/testPackagePage/TestPackagePage.java
index 0e8e8d74560..d732c5667cc 100644
--- a/test/langtools/jdk/javadoc/doclet/testPackagePage/TestPackagePage.java
+++ b/test/langtools/jdk/javadoc/doclet/testPackagePage/TestPackagePage.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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,10 +101,10 @@ public class TestPackagePage extends JavadocTester {
                     """);
         checkOutput("type-search-index.js", true,
                 """
-                    {"l":"All Classes and Interfaces","u":"allclasses-index.html"}""");
+                    {"l":"All Classes and Interfaces","u":"allclasses-index.html","k":"18"}""");
         checkOutput("package-search-index.js", true,
                 """
-                    {"l":"All Packages","u":"allpackages-index.html"}""");
+                    {"l":"All Packages","u":"allpackages-index.html","k":"18"}""");
         checkOutput("index-all.html", true,
                 """
                     <br><a href="allclasses-index.html">All&nbsp;Classes&nbsp;and&nbsp;Interfaces</a\
diff --git a/test/langtools/jdk/javadoc/doclet/testPreview/TestPreview.java b/test/langtools/jdk/javadoc/doclet/testPreview/TestPreview.java
index df0e0910151..cda99b7eb30 100644
--- a/test/langtools/jdk/javadoc/doclet/testPreview/TestPreview.java
+++ b/test/langtools/jdk/javadoc/doclet/testPreview/TestPreview.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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,12 +88,11 @@ public class TestPreview extends JavadocTester {
         checkOutput("preview-list.html", true,
                 """
                     <ul class="preview-feature-list checkboxes">
-                    <li><label for="feature-1">
-                    <input type="checkbox" id="feature-1" disabled checked onclick="toggleGlobal(this, '1', 3)">
-                    <span>2147483647: <a href="https://openjdk.org/jeps/2147483647">Test Feature (Preview)</a></span></label></li>
-                    <li><label for="feature-all">
-                    <input type="checkbox" id="feature-all" disabled checked onclick="toggleGlobal(this, 'all', 3)">
-                    <span>Toggle all</span></label></li>
+                    <li><label for="feature-1"><input type="checkbox" id="feature-1" disabled checked onclick="tog\
+                    gleGlobal(this, '1', 3)"><span>2147483647: <a href="https://openjdk.org/jeps/2147483647">Test \
+                    Feature (Preview)</a></span></label></li>
+                    <li><label for="feature-all"><input type="checkbox" id="feature-all" disabled checked onclick=\
+                    "toggleGlobal(this, 'all', 3)"><span>Toggle all</span></label></li>
                     </ul>
                     <h2 title="Contents">Contents</h2>
                     <ul class="contents-list">
diff --git a/test/langtools/jdk/javadoc/doclet/testSearch/TestSearch.java b/test/langtools/jdk/javadoc/doclet/testSearch/TestSearch.java
index a4855bf6f4d..8615d9f1e64 100644
--- a/test/langtools/jdk/javadoc/doclet/testSearch/TestSearch.java
+++ b/test/langtools/jdk/javadoc/doclet/testSearch/TestSearch.java
@@ -26,7 +26,7 @@
  * @bug 8141492 8071982 8141636 8147890 8166175 8168965 8176794 8175218 8147881
  *      8181622 8182263 8074407 8187521 8198522 8182765 8199278 8196201 8196202
  *      8184205 8214468 8222548 8223378 8234746 8241219 8254627 8247994 8263528
- *      8266808 8248863 8305710 8318082 8347058 8350638
+ *      8266808 8248863 8305710 8318082 8347058 8350638 8345555
  * @summary Test the search feature of javadoc.
  * @library ../../lib
  * @modules jdk.javadoc/jdk.javadoc.internal.tool
@@ -392,20 +392,20 @@ public class TestSearch extends JavadocTester {
     void checkSearchIndex() {
         checkOutput("member-search-index.js", true,
                 """
-                    {"p":"pkg","c":"AnotherClass","l":"AnotherClass()","u":"%3Cinit%3E()"}""",
+                    {"p":"pkg","c":"AnotherClass","l":"AnotherClass()","u":"%3Cinit%3E()","k":"3"}""",
                 """
-                    {"p":"pkg1","c":"RegClass","l":"RegClass()","u":"%3Cinit%3E()"}""",
+                    {"p":"pkg1","c":"RegClass","l":"RegClass()","u":"%3Cinit%3E()","k":"3"}""",
                 """
-                    {"p":"pkg2","c":"TestError","l":"TestError()","u":"%3Cinit%3E()"}""",
+                    {"p":"pkg2","c":"TestError","l":"TestError()","u":"%3Cinit%3E()","k":"3"}""",
                 """
                     {"p":"pkg","c":"AnotherClass","l":"method(byte[], int, String)","u":"method(byte[],int,java.lang.String)"}""");
         checkOutput("member-search-index.js", false,
                 """
                     {"p":"pkg","c":"AnotherClass","l":"method(RegClass)","u":"method-pkg1.RegClass-"}""",
+               """
+                    {"p":"pkg2","c":"TestClass","l":"TestClass()","u":"TestClass--","k":"3"}""",
                 """
-                    {"p":"pkg2","c":"TestClass","l":"TestClass()","u":"TestClass--"}""",
-                """
-                    {"p":"pkg","c":"TestError","l":"TestError()","u":"TestError--"}""",
+                    {"p":"pkg","c":"TestError","l":"TestError()","u":"TestError--","k":"3"}""",
                 """
                     {"p":"pkg","c":"AnotherClass","l":"method(byte[], int, String)","u":"method-byte:A-int-java.lang.String-"}""");
     }
@@ -432,11 +432,10 @@ public class TestSearch extends JavadocTester {
                 """
                     <li><a href="search.html">Search</a></li>""",
                 """
-                    <div class="nav-list-search">
-                    <input type="text" id="search-input" disabled placeholder="Search documentation \
-                    (type /)" aria-label="Search in documentation" autocomplete="off" spellcheck="false">
-                    <input type="reset" id="reset-search" disabled value="Reset">
-                    </div>""");
+                    <div class="nav-list-search"><input type="text" id="search-input" disabled place\
+                    holder="Search documentation (type /)" aria-label="Search in documentation" auto\
+                    complete="off" spellcheck="false"><input type="reset" id="reset-search" disabled\
+                     value="Reset"></div>""");
     }
 
     void checkSingleIndex() {
@@ -797,10 +796,10 @@ public class TestSearch extends JavadocTester {
                     """);
         checkOutput("type-search-index.js", true,
                 """
-                    {"l":"All Classes and Interfaces","u":"allclasses-index.html"}""");
+                    {"l":"All Classes and Interfaces","u":"allclasses-index.html","k":"18"}""");
         checkOutput("package-search-index.js", true,
                 """
-                    {"l":"All Packages","u":"allpackages-index.html"}""");
+                    {"l":"All Packages","u":"allpackages-index.html","k":"18"}""");
         checkOutput("index-all.html", true,
                 """
                     <br><a href="allclasses-index.html">All&nbsp;Classes&nbsp;and&nbsp;Interface\
@@ -835,7 +834,7 @@ public class TestSearch extends JavadocTester {
                 """
                     {"l":"SearchWordWithDescription","h":"pkg1.RegClass.CONSTANT_FIELD_1","d":"search word with desc","u":"pkg1/RegClass.html#SearchWordWithDescription"}""",
                 """
-                    {"l":"Serialized Form","h":"","u":"serialized-form.html"},{"l":"SingleWord","h":"package pkg","u":"pkg/package-summary.html#SingleWord"}""",
+                    {"l":"Serialized Form","h":"","k":"18","u":"serialized-form.html"},{"l":"SingleWord","h":"package pkg","u":"pkg/package-summary.html#SingleWord"}""",
                 """
                     {"l":"trailing","h":"pkg.AnotherClass.method(byte[], int, String)","d":"backslash\\\\","u":"pkg/AnotherClass.html#trailing"}]""");
     }
diff --git a/test/langtools/jdk/javadoc/doclet/testSpecTag/TestSpecTag.java b/test/langtools/jdk/javadoc/doclet/testSpecTag/TestSpecTag.java
index 491f8a5d8aa..98b9b2232a2 100644
--- a/test/langtools/jdk/javadoc/doclet/testSpecTag/TestSpecTag.java
+++ b/test/langtools/jdk/javadoc/doclet/testSpecTag/TestSpecTag.java
@@ -132,11 +132,10 @@ public class TestSpecTag extends JavadocTester {
                     <div class="sub-nav">
                     <div class="nav-content">
                     <ol class="sub-nav-list"></ol>
-                    <div class="nav-list-search">
-                    <input type="text" id="search-input" disabled placeholder="Search documentation \
-                    (type /)" aria-label="Search in documentation" autocomplete="off" spellcheck="false">
-                    <input type="reset" id="reset-search" disabled value="Reset">
-                    </div>
+                    <div class="nav-list-search"><input type="text" id="search-input" disabled place\
+                    holder="Search documentation (type /)" aria-label="Search in documentation" auto\
+                    complete="off" spellcheck="false"><input type="reset" id="reset-search" disabled\
+                     value="Reset"></div>
                     </div>
                     </div>
                     <!-- ========= END OF TOP NAVBAR ========= -->
diff --git a/test/langtools/jdk/javadoc/doclet/testStylesheet/TestStylesheet.java b/test/langtools/jdk/javadoc/doclet/testStylesheet/TestStylesheet.java
index 13c89dc2dae..3fdf553c772 100644
--- a/test/langtools/jdk/javadoc/doclet/testStylesheet/TestStylesheet.java
+++ b/test/langtools/jdk/javadoc/doclet/testStylesheet/TestStylesheet.java
@@ -117,7 +117,7 @@ public class TestStylesheet extends JavadocTester {
                         display:inline-block;
                     }""",
                 """
-                    input#reset-search, input.reset-filter {
+                    input#reset-search, input.reset-filter, input#page-search-reset {
                         background-color: transparent;
                         background-image:url('x.svg');
                         background-repeat:no-repeat;
diff --git a/test/langtools/jdk/javadoc/doclet/testSystemPropertyTaglet/TestSystemPropertyTaglet.java b/test/langtools/jdk/javadoc/doclet/testSystemPropertyTaglet/TestSystemPropertyTaglet.java
index 0bf2e5876cc..28e51313c41 100644
--- a/test/langtools/jdk/javadoc/doclet/testSystemPropertyTaglet/TestSystemPropertyTaglet.java
+++ b/test/langtools/jdk/javadoc/doclet/testSystemPropertyTaglet/TestSystemPropertyTaglet.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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 5076751 8234746
+ * @bug 5076751 8234746 8345555
  * @summary System properties documentation needed in javadoc
  * @library /tools/lib ../../lib
  * @modules jdk.javadoc/jdk.javadoc.internal.tool
@@ -166,169 +166,163 @@ public class TestSystemPropertyTaglet extends JavadocTester {
                        <h2 class="title" id="I:T">T</h2>""",
                    """
                        <dt><a href="mymodule/mypackage/MyAnnotation.html#\
-                       test.property" class="search-tag-link">test.property</a> - Search tag in annotation interface mypackag\
+                       test.property" class="search-tag-link">test.property</a> - System property in annotation interface mypackag\
                        e.MyAnnotation</dt>
-                       <dd>System Property</dd>""",
+                       <dd>&nbsp;</dd>""",
                    """
                        <dt><a href="mymodule/mypackage/MyClass.html#test.\
-                       property" class="search-tag-link">test.property</a> - Search tag in class mypackage.MyClass</dt>
-                       <dd>System Property</dd>""",
+                       property" class="search-tag-link">test.property</a> - System property in class mypackage.MyClass</dt>
+                       <dd>&nbsp;</dd>""",
                    """
                        <dt><a href="mymodule/mypackage/MyEnum.html#test.p\
-                       roperty" class="search-tag-link">test.property</a> - Search tag in enum class mypackage.MyEnum</dt>
-                       <dd>System Property</dd>""",
+                       roperty" class="search-tag-link">test.property</a> - System property in enum class mypackage.MyEnum</dt>
+                       <dd>&nbsp;</dd>""",
                    """
                        <dt><a href="mymodule/mypackage/MyError.html#test.\
-                       property" class="search-tag-link">test.property</a> - Search tag in exception class mypackage.MyE\
+                       property" class="search-tag-link">test.property</a> - System property in exception class mypackage.MyE\
                        rror</dt>
-                       <dd>System Property</dd>""",
+                       <dd>&nbsp;</dd>""",
                    """
                        <dt><a href="mymodule/mypackage/MyException.html#t\
-                       est.property" class="search-tag-link">test.property</a> - Search tag in exception class mypackage\
+                       est.property" class="search-tag-link">test.property</a> - System property in exception class mypackage\
                        .MyException</dt>
-                       <dd>System Property</dd>""",
+                       <dd>&nbsp;</dd>""",
                    """
                        <dt><a href="mymodule/mypackage/MyInterface.html#t\
-                       est.property" class="search-tag-link">test.property</a> - Search tag in interface mypackage.MyInt\
+                       est.property" class="search-tag-link">test.property</a> - System property in interface mypackage.MyInt\
                        erface</dt>
-                       <dd>System Property</dd>""",
+                       <dd>&nbsp;</dd>""",
                    """
                        <dt><a href="mymodule/module-summary.html#test.pro\
-                       perty" class="search-tag-link">test.property</a> - Search tag in module mymodule</dt>
-                       <dd>System Property</dd>""",
+                       perty" class="search-tag-link">test.property</a> - System property in module mymodule</dt>
+                       <dd>&nbsp;</dd>""",
                    """
                        <dt><a href="mymodule/mypackage/MyAnnotation.html#\
-                       test.property-1" class="search-tag-link">test.property</a> - Search tag in mypackage.MyAnnotation\
+                       test.property-1" class="search-tag-link">test.property</a> - System property in mypackage.MyAnnotation\
                        .value()</dt>
-                       <dd>System Property</dd>""",
+                       <dd>&nbsp;</dd>""",
                    """
                        <dt><a href="mymodule/mypackage/MyClass.html#test.\
-                       property-2" class="search-tag-link">test.property</a> - Search tag in mypackage.MyClass.INT_CONST\
+                       property-2" class="search-tag-link">test.property</a> - System property in mypackage.MyClass.INT_CONST\
                        ANT</dt>
-                       <dd>System Property</dd>""",
+                       <dd>&nbsp;</dd>""",
                    """
                        <dt><a href="mymodule/mypackage/MyClass.html#test.\
-                       property-3" class="search-tag-link">test.property</a> - Search tag in mypackage.MyClass.MyClass()\
+                       property-3" class="search-tag-link">test.property</a> - System property in mypackage.MyClass.MyClass()\
                        </dt>
-                       <dd>System Property</dd>""",
+                       <dd>&nbsp;</dd>""",
                    """
                        <dt><a href="mymodule/mypackage/MyClass.html#test.\
-                       property-1" class="search-tag-link">test.property</a> - Search tag in mypackage.MyClass.intField<\
+                       property-1" class="search-tag-link">test.property</a> - System property in mypackage.MyClass.intField<\
                        /dt>
-                       <dd>System Property</dd>""",
+                       <dd>&nbsp;</dd>""",
                    """
                        <dt><a href="mymodule/mypackage/MyClass.html#test.\
-                       property-5" class="search-tag-link">test.property</a> - Search tag in mypackage.MyClass.run()</dt\
+                       property-5" class="search-tag-link">test.property</a> - System property in mypackage.MyClass.run()</dt\
                        >
-                       <dd>System Property</dd>""",
+                       <dd>&nbsp;</dd>""",
                    """
                        <dt><a href="mymodule/mypackage/MyClass.html#test.\
-                       property-4" class="search-tag-link">test.property</a> - Search tag in mypackage.MyClass.value()</\
+                       property-4" class="search-tag-link">test.property</a> - System property in mypackage.MyClass.value()</\
                        dt>
-                       <dd>System Property</dd>""",
+                       <dd>&nbsp;</dd>""",
                    """
                        <dt><a href="mymodule/mypackage/MyEnum.html#test.p\
-                       roperty-1" class="search-tag-link">test.property</a> - Search tag in mypackage.MyEnum.X</dt>
-                       <dd>System Property</dd>""",
+                       roperty-1" class="search-tag-link">test.property</a> - System property in mypackage.MyEnum.X</dt>
+                       <dd>&nbsp;</dd>""",
                    """
                        <dt><a href="mymodule/mypackage/MyEnum.html#test.p\
-                       roperty-2" class="search-tag-link">test.property</a> - Search tag in mypackage.MyEnum.m()</dt>
-                       <dd>System Property</dd>""",
+                       roperty-2" class="search-tag-link">test.property</a> - System property in mypackage.MyEnum.m()</dt>
+                       <dd>&nbsp;</dd>""",
                    """
                        <dt><a href="mymodule/mypackage/MyError.html#test.\
-                       property-1" class="search-tag-link">test.property</a> - Search tag in mypackage.MyError.MyError()\
+                       property-1" class="search-tag-link">test.property</a> - System property in mypackage.MyError.MyError()\
                        </dt>
-                       <dd>System Property</dd>""",
+                       <dd>&nbsp;</dd>""",
                    """
                        <dt><a href="mymodule/mypackage/MyException.html#t\
-                       est.property-1" class="search-tag-link">test.property</a> - Search tag in mypackage.MyException.M\
+                       est.property-1" class="search-tag-link">test.property</a> - System property in mypackage.MyException.M\
                        yException()</dt>
-                       <dd>System Property</dd>""",
+                       <dd>&nbsp;</dd>""",
                    """
                        <dt><a href="mymodule/mypackage/MyInterface.html#t\
-                       est.property-1" class="search-tag-link">test.property</a> - Search tag in mypackage.MyInterface.I\
+                       est.property-1" class="search-tag-link">test.property</a> - System property in mypackage.MyInterface.I\
                        NT_CONSTANT</dt>
-                       <dd>System Property</dd>""",
+                       <dd>&nbsp;</dd>""",
                    """
                        <dt><a href="mymodule/mypackage/MyInterface.html#t\
-                       est.property-2" class="search-tag-link">test.property</a> - Search tag in mypackage.MyInterface.m\
+                       est.property-2" class="search-tag-link">test.property</a> - System property in mypackage.MyInterface.m\
                        ()</dt>
-                       <dd>System Property</dd>""",
+                       <dd>&nbsp;</dd>""",
                    """
                        <dt><a href="mymodule/mypackage/MyInterface.html#t\
-                       est.property-3" class="search-tag-link">test.property</a> - Search tag in mypackage.MyInterface.m\
+                       est.property-3" class="search-tag-link">test.property</a> - System property in mypackage.MyInterface.m\
                        (String...)</dt>
-                       <dd>System Property</dd>""",
+                       <dd>&nbsp;</dd>""",
                    """
                        <dt><a href="mymodule/mypackage/package-summary.ht\
-                       ml#test.property" class="search-tag-link">test.property</a> - Search tag in package mypackage</dt\
+                       ml#test.property" class="search-tag-link">test.property</a> - System property in package mypackage</dt\
                        >
-                       <dd>System Property</dd>""",
+                       <dd>&nbsp;</dd>""",
                    "");
 
         checkOutput("tag-search-index.js", true,
                     """
-                        {"l":"test.property","h":"annotation interface mypackage.MyAnnotation","d":"System Pr\
-                        operty","u":"mymodule/mypackage/MyAnnotation.html#test.property"}""",
+                        {"l":"test.property","h":"annotation interface mypackage.MyAnnotation","k":"15","u":"mymodule/mypackage/MyAnnotation.html#test.property"}""",
                     """
-                        {"l":"test.property","h":"class mypackage.MyClass","d":"System Property","u":"my\
+                        {"l":"test.property","h":"class mypackage.MyClass","k":"15","u":"my\
                         module/mypackage/MyClass.html#test.property"}""",
                     """
-                        {"l":"test.property","h":"enum class mypackage.MyEnum","d":"System Property","u"\
+                        {"l":"test.property","h":"enum class mypackage.MyEnum","k":"15","u"\
                         :"mymodule/mypackage/MyEnum.html#test.property"}""",
                     """
-                        {"l":"test.property","h":"exception class mypackage.MyError","d":"System Propert\
-                        y","u":"mymodule/mypackage/MyError.html#test.property"}""",
+                        {"l":"test.property","h":"exception class mypackage.MyError","k":"15","u":"mymodule/mypackage/MyError.html#test.property"}""",
                     """
-                        {"l":"test.property","h":"exception class mypackage.MyException","d":"System Pro\
-                        perty","u":"mymodule/mypackage/MyException.html#test.property"}""",
+                        {"l":"test.property","h":"exception class mypackage.MyException","k":"15","u":"mymodule/mypackage/MyException.html#test.property"}""",
                     """
-                        {"l":"test.property","h":"interface mypackage.MyInterface","d":"System Property"\
+                        {"l":"test.property","h":"interface mypackage.MyInterface","k":"15"\
                         ,"u":"mymodule/mypackage/MyInterface.html#test.property"}""",
                     """
-                        {"l":"test.property","h":"module mymodule","d":"System Property","u":"mymodule/m\
+                        {"l":"test.property","h":"module mymodule","k":"15","u":"mymodule/m\
                         odule-summary.html#test.property"}""",
                     """
-                        {"l":"test.property","h":"mypackage.MyAnnotation.value()","d":"System Property",\
+                        {"l":"test.property","h":"mypackage.MyAnnotation.value()","k":"15",\
                         "u":"mymodule/mypackage/MyAnnotation.html#test.property-1"}""",
                     """
-                        {"l":"test.property","h":"mypackage.MyClass.INT_CONSTANT","d":"System Property",\
+                        {"l":"test.property","h":"mypackage.MyClass.INT_CONSTANT","k":"15",\
                         "u":"mymodule/mypackage/MyClass.html#test.property-2"}""",
                     """
-                        {"l":"test.property","h":"mypackage.MyClass.MyClass()","d":"System Property","u"\
+                        {"l":"test.property","h":"mypackage.MyClass.MyClass()","k":"15","u"\
                         :"mymodule/mypackage/MyClass.html#test.property-3"}""",
                     """
-                        {"l":"test.property","h":"mypackage.MyClass.intField","d":"System Property","u":\
+                        {"l":"test.property","h":"mypackage.MyClass.intField","k":"15","u":\
                         "mymodule/mypackage/MyClass.html#test.property-1"}""",
                     """
-                        {"l":"test.property","h":"mypackage.MyClass.run()","d":"System Property","u":"my\
+                        {"l":"test.property","h":"mypackage.MyClass.run()","k":"15","u":"my\
                         module/mypackage/MyClass.html#test.property-5"}""",
                     """
-                        {"l":"test.property","h":"mypackage.MyClass.value()","d":"System Property","u":"\
+                        {"l":"test.property","h":"mypackage.MyClass.value()","k":"15","u":"\
                         mymodule/mypackage/MyClass.html#test.property-4"}""",
                     """
-                        {"l":"test.property","h":"mypackage.MyEnum.X","d":"System Property","u":"mymodul\
+                        {"l":"test.property","h":"mypackage.MyEnum.X","k":"15","u":"mymodul\
                         e/mypackage/MyEnum.html#test.property-1"}""",
                     """
-                        {"l":"test.property","h":"mypackage.MyEnum.m()","d":"System Property","u":"mymod\
+                        {"l":"test.property","h":"mypackage.MyEnum.m()","k":"15","u":"mymod\
                         ule/mypackage/MyEnum.html#test.property-2"}""",
                     """
-                        {"l":"test.property","h":"mypackage.MyError.MyError()","d":"System Property","u"\
+                        {"l":"test.property","h":"mypackage.MyError.MyError()","k":"15","u"\
                         :"mymodule/mypackage/MyError.html#test.property-1"}""",
                     """
-                        {"l":"test.property","h":"mypackage.MyException.MyException()","d":"System Prope\
-                        rty","u":"mymodule/mypackage/MyException.html#test.property-1"}""",
+                        {"l":"test.property","h":"mypackage.MyException.MyException()","k":"15","u":"mymodule/mypackage/MyException.html#test.property-1"}""",
                     """
-                        {"l":"test.property","h":"mypackage.MyInterface.INT_CONSTANT","d":"System Proper\
-                        ty","u":"mymodule/mypackage/MyInterface.html#test.property-1"}""",
+                        {"l":"test.property","h":"mypackage.MyInterface.INT_CONSTANT","k":"15","u":"mymodule/mypackage/MyInterface.html#test.property-1"}""",
                     """
-                        {"l":"test.property","h":"mypackage.MyInterface.m()","d":"System Property","u":"\
+                        {"l":"test.property","h":"mypackage.MyInterface.m()","k":"15","u":"\
                         mymodule/mypackage/MyInterface.html#test.property-2"}""",
                     """
-                        {"l":"test.property","h":"mypackage.MyInterface.m(String...)","d":"System Proper\
-                        ty","u":"mymodule/mypackage/MyInterface.html#test.property-3"}""",
+                        {"l":"test.property","h":"mypackage.MyInterface.m(String...)","k":"15","u":"mymodule/mypackage/MyInterface.html#test.property-3"}""",
                     """
-                        {"l":"test.property","h":"package mypackage","d":"System Property","u":"mymodule\
+                        {"l":"test.property","h":"package mypackage","k":"15","u":"mymodule\
                         /mypackage/package-summary.html#test.property"}""",
                     "");
     }
diff --git a/test/langtools/jdk/javadoc/doclet/testUnnamedPackage/TestUnnamedPackage.java b/test/langtools/jdk/javadoc/doclet/testUnnamedPackage/TestUnnamedPackage.java
index 688d89ee2d0..0b2e5d32a32 100644
--- a/test/langtools/jdk/javadoc/doclet/testUnnamedPackage/TestUnnamedPackage.java
+++ b/test/langtools/jdk/javadoc/doclet/testUnnamedPackage/TestUnnamedPackage.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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,11 +103,11 @@ public class TestUnnamedPackage extends JavadocTester {
 
         checkOutput("type-search-index.js", true,
                 """
-                    {"l":"All Classes and Interfaces","u":"allclasses-index.html"}""");
+                    {"l":"All Classes and Interfaces","u":"allclasses-index.html","k":"18"}""");
 
         checkOutput("package-search-index.js", true,
                 """
-                    {"l":"All Packages","u":"allpackages-index.html"}""");
+                    {"l":"All Packages","u":"allpackages-index.html","k":"18"}""");
 
         checkOutput("index-all.html", true,
                 """
@@ -117,17 +117,17 @@ public class TestUnnamedPackage extends JavadocTester {
 
         checkOutput("type-search-index.js", true,
                 """
-                    {"l":"All Classes and Interfaces","u":"allclasses-index.html"}""",
+                    {"l":"All Classes and Interfaces","u":"allclasses-index.html","k":"18"}""",
                 """
                     {"p":"<Unnamed>","l":"C"}""");
 
         checkOutput("member-search-index.js", true,
                 """
-                    {"p":"<Unnamed>","c":"C","l":"C()","u":"%3Cinit%3E()"}""");
+                    {"p":"<Unnamed>","c":"C","l":"C()","u":"%3Cinit%3E()","k":"3"}""");
 
         checkOutput("package-search-index.js", true,
                 """
-                    {"l":"All Packages","u":"allpackages-index.html"}""");
+                    {"l":"All Packages","u":"allpackages-index.html","k":"18"}""");
 
         checkOutput("package-search-index.js", false, "Unnamed");
 

From 2eecf159afac32fe3a8141aec467d83cb63ef92b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Markus=20Gr=C3=B6nlund?= <mgronlun@openjdk.org>
Date: Mon, 17 Mar 2025 09:56:10 +0000
Subject: [PATCH 365/587] 8351967: JFR: AnnotationIterator should handle
 num_annotations = 0

Reviewed-by: egahlin
---
 .../share/jfr/instrumentation/jfrEventClassTransformer.cpp      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/hotspot/share/jfr/instrumentation/jfrEventClassTransformer.cpp b/src/hotspot/share/jfr/instrumentation/jfrEventClassTransformer.cpp
index 8c3b895345f..5e4e4a5cf5f 100644
--- a/src/hotspot/share/jfr/instrumentation/jfrEventClassTransformer.cpp
+++ b/src/hotspot/share/jfr/instrumentation/jfrEventClassTransformer.cpp
@@ -338,7 +338,7 @@ class AnnotationIterator : public StackObj {
                                                                      _buffer(_limit > 2 ? ar->adr_at(2) : nullptr),
                                                                      _current(0),
                                                                      _next(0) {
-    if (_buffer != nullptr) {
+    if (_limit >= 2) {
       _limit -= 2; // subtract sizeof(u2) number of annotations field
     }
   }

From e5666f56ff6993cbfe52d91e5cadcb4d0b8f4ec2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Markus=20Gr=C3=B6nlund?= <mgronlun@openjdk.org>
Date: Mon, 17 Mar 2025 10:03:53 +0000
Subject: [PATCH 366/587] 8351976: assert(vthread_epoch == current_epoch)
 failed: invariant

Reviewed-by: egahlin
---
 src/hotspot/share/jfr/support/jfrThreadLocal.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/hotspot/share/jfr/support/jfrThreadLocal.cpp b/src/hotspot/share/jfr/support/jfrThreadLocal.cpp
index e1f72606c50..0a14e23b87c 100644
--- a/src/hotspot/share/jfr/support/jfrThreadLocal.cpp
+++ b/src/hotspot/share/jfr/support/jfrThreadLocal.cpp
@@ -298,7 +298,9 @@ void JfrThreadLocal::exclude_vthread(const JavaThread* jt) {
 }
 
 void JfrThreadLocal::include_vthread(const JavaThread* jt) {
-  set(&jt->jfr_thread_local()->_vthread_excluded, false);
+  JfrThreadLocal* const tl = jt->jfr_thread_local();
+  Atomic::store(&tl->_vthread_epoch, static_cast<u2>(0));
+  set(&tl->_vthread_excluded, false);
   JfrJavaEventWriter::include(vthread_id(jt), jt);
 }
 

From 0450ba9b65d0a41d086d04554e3f9c3852345267 Mon Sep 17 00:00:00 2001
From: Erik Gahlin <egahlin@openjdk.org>
Date: Mon, 17 Mar 2025 10:32:11 +0000
Subject: [PATCH 367/587] 8351999: JFR: Incorrect scaling of throttled values

Reviewed-by: shade
---
 .../classes/jdk/jfr/internal/settings/ThrottleSetting.java      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/settings/ThrottleSetting.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/settings/ThrottleSetting.java
index 0527d7e8689..ab08d2fea1d 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/settings/ThrottleSetting.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/settings/ThrottleSetting.java
@@ -94,7 +94,7 @@ public final class ThrottleSetting extends SettingControl {
             // if unit is less than 1 s, scale samples
             if (unit.nanos < SECONDS.nanos) {
                 long perSecond = SECONDS.nanos / unit.nanos;
-                samples *= Utils.multiplyOverflow(samples, perSecond, Long.MAX_VALUE);
+                samples = Utils.multiplyOverflow(samples, perSecond, Long.MAX_VALUE);
             }
             eventType.setThrottle(samples, millis);
             this.value = value;

From d207ed3f7cb810e3c0c8a8cd4d9aaa65164c6d16 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Markus=20Gr=C3=B6nlund?= <mgronlun@openjdk.org>
Date: Mon, 17 Mar 2025 10:47:18 +0000
Subject: [PATCH 368/587] 8352066: JVM.commit() and JVM.flush() exhibit race
 conditions against JFR epochs

Reviewed-by: egahlin
---
 src/hotspot/share/jfr/jni/jfrJniMethod.cpp    | 12 ++++----
 .../checkpoint/jfrCheckpointManager.hpp       |  2 +-
 .../recorder/service/jfrRecorderService.cpp   |  5 ++--
 .../stacktrace/jfrStackTraceRepository.cpp    |  6 +---
 .../stacktrace/jfrStackTraceRepository.hpp    |  3 +-
 .../share/jfr/support/jfrIntrinsics.cpp       | 30 +++----------------
 .../share/jfr/writers/jfrJavaEventWriter.cpp  | 19 +++++-------
 .../share/jfr/writers/jfrJavaEventWriter.hpp  |  2 +-
 8 files changed, 23 insertions(+), 56 deletions(-)

diff --git a/src/hotspot/share/jfr/jni/jfrJniMethod.cpp b/src/hotspot/share/jfr/jni/jfrJniMethod.cpp
index e0e6979a4e6..cc618e3cfbc 100644
--- a/src/hotspot/share/jfr/jni/jfrJniMethod.cpp
+++ b/src/hotspot/share/jfr/jni/jfrJniMethod.cpp
@@ -300,13 +300,13 @@ JVM_ENTRY_NO_ENV(jobject, jfr_new_event_writer(JNIEnv* env, jclass jvm))
   return JfrJavaEventWriter::new_event_writer(thread);
 JVM_END
 
-NO_TRANSITION(void, jfr_event_writer_flush(JNIEnv* env, jclass jvm, jobject writer, jint used_size, jint requested_size))
-  JfrJavaEventWriter::flush(writer, used_size, requested_size, JavaThread::current());
-NO_TRANSITION_END
+JVM_ENTRY_NO_ENV(void, jfr_event_writer_flush(JNIEnv* env, jclass jvm, jobject writer, jint used_size, jint requested_size))
+  JfrJavaEventWriter::flush(writer, used_size, requested_size, thread);
+JVM_END
 
-NO_TRANSITION(jlong, jfr_commit(JNIEnv* env, jclass jvm, jlong next_position))
-  return JfrJavaEventWriter::commit(next_position);
-NO_TRANSITION_END
+JVM_ENTRY_NO_ENV(jlong, jfr_commit(JNIEnv* env, jclass jvm, jlong next_position))
+  return JfrJavaEventWriter::commit(next_position, thread);
+JVM_END
 
 JVM_ENTRY_NO_ENV(void, jfr_flush(JNIEnv* env, jclass jvm))
   JfrRepository::flush(thread);
diff --git a/src/hotspot/share/jfr/recorder/checkpoint/jfrCheckpointManager.hpp b/src/hotspot/share/jfr/recorder/checkpoint/jfrCheckpointManager.hpp
index 8dd3ed34e97..8a8582eb6f2 100644
--- a/src/hotspot/share/jfr/recorder/checkpoint/jfrCheckpointManager.hpp
+++ b/src/hotspot/share/jfr/recorder/checkpoint/jfrCheckpointManager.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/share/jfr/recorder/service/jfrRecorderService.cpp b/src/hotspot/share/jfr/recorder/service/jfrRecorderService.cpp
index 31b2311af6c..07fe019c9af 100644
--- a/src/hotspot/share/jfr/recorder/service/jfrRecorderService.cpp
+++ b/src/hotspot/share/jfr/recorder/service/jfrRecorderService.cpp
@@ -486,6 +486,7 @@ void JfrRecorderService::safepoint_clear() {
   assert(SafepointSynchronize::is_at_safepoint(), "invariant");
   _checkpoint_manager.begin_epoch_shift();
   _storage.clear();
+  _checkpoint_manager.notify_threads();
   _chunkwriter.set_time_stamp();
   JfrDeprecationManager::on_safepoint_clear();
   JfrStackTraceRepository::clear();
@@ -650,9 +651,7 @@ size_t JfrRecorderService::flush() {
   if (_string_pool.is_modified()) {
     total_elements += flush_stringpool(_string_pool, _chunkwriter);
   }
-  if (_stack_trace_repository.is_modified()) {
-    total_elements += flush_stacktrace(_stack_trace_repository, _chunkwriter);
-  }
+  total_elements += flush_stacktrace(_stack_trace_repository, _chunkwriter);
   return flush_typeset(_checkpoint_manager, _chunkwriter) + total_elements;
 }
 
diff --git a/src/hotspot/share/jfr/recorder/stacktrace/jfrStackTraceRepository.cpp b/src/hotspot/share/jfr/recorder/stacktrace/jfrStackTraceRepository.cpp
index a30c0d8f262..c5909d49b9e 100644
--- a/src/hotspot/share/jfr/recorder/stacktrace/jfrStackTraceRepository.cpp
+++ b/src/hotspot/share/jfr/recorder/stacktrace/jfrStackTraceRepository.cpp
@@ -92,13 +92,9 @@ void JfrStackTraceRepository::destroy() {
   _leak_profiler_instance = nullptr;
 }
 
-bool JfrStackTraceRepository::is_modified() const {
-  return _last_entries != _entries;
-}
-
 size_t JfrStackTraceRepository::write(JfrChunkWriter& sw, bool clear) {
   MutexLocker lock(JfrStacktrace_lock, Mutex::_no_safepoint_check_flag);
-  if (_entries == 0) {
+  if ((_entries == _last_entries) && !clear) {
     return 0;
   }
   int count = 0;
diff --git a/src/hotspot/share/jfr/recorder/stacktrace/jfrStackTraceRepository.hpp b/src/hotspot/share/jfr/recorder/stacktrace/jfrStackTraceRepository.hpp
index 84c11d159f1..5e2ba316588 100644
--- a/src/hotspot/share/jfr/recorder/stacktrace/jfrStackTraceRepository.hpp
+++ b/src/hotspot/share/jfr/recorder/stacktrace/jfrStackTraceRepository.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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 JfrStackTraceRepository : public JfrCHeapObj {
   static void destroy();
   bool initialize();
 
-  bool is_modified() const;
   static size_t clear();
   static size_t clear(JfrStackTraceRepository& repo);
   size_t write(JfrChunkWriter& cw, bool clear);
diff --git a/src/hotspot/share/jfr/support/jfrIntrinsics.cpp b/src/hotspot/share/jfr/support/jfrIntrinsics.cpp
index 306e223ee2e..54208b4aebf 100644
--- a/src/hotspot/share/jfr/support/jfrIntrinsics.cpp
+++ b/src/hotspot/share/jfr/support/jfrIntrinsics.cpp
@@ -37,35 +37,14 @@ static void assert_precondition(JavaThread* jt) {
   DEBUG_ONLY(JfrJavaSupport::check_java_thread_in_java(jt);)
   assert(jt->has_last_Java_frame(), "invariant");
 }
-
-static void assert_epoch_identity(JavaThread* jt, u2 current_epoch) {
-  assert_precondition(jt);
-  // Verify the epoch updates got written through also to the vthread object.
-  const u2 epoch_raw = ThreadIdAccess::epoch(jt->vthread());
-  const bool excluded = epoch_raw & excluded_bit;
-  assert(!excluded, "invariant");
-  assert(!JfrThreadLocal::is_excluded(jt), "invariant");
-  const u2 vthread_epoch = epoch_raw & epoch_mask;
-  assert(vthread_epoch == current_epoch, "invariant");
-}
-#endif // ASSERT
+#endif
 
 void* JfrIntrinsicSupport::write_checkpoint(JavaThread* jt) {
   DEBUG_ONLY(assert_precondition(jt);)
   assert(JfrThreadLocal::is_vthread(jt), "invariant");
-  const u2 vthread_thread_local_epoch = JfrThreadLocal::vthread_epoch(jt);
-  const u2 current_epoch = ThreadIdAccess::current_epoch();
-  MACOS_AARCH64_ONLY(ThreadWXEnable __wx(WXWrite, jt));
-  if (vthread_thread_local_epoch == current_epoch) {
-    // After the epoch test in the intrinsic, the thread sampler interleaved
-    // and suspended the thread. As part of taking a sample, it updated
-    // the vthread object and the thread local "for us". We are good.
-    DEBUG_ONLY(assert_epoch_identity(jt, current_epoch);)
-    ThreadInVMfromJava transition(jt);
-    return JfrJavaEventWriter::event_writer(jt);
-  }
   const traceid vthread_tid = JfrThreadLocal::vthread_id(jt);
-  // Transition before reading the epoch generation anew, now as _thread_in_vm. Can safepoint here.
+  // Transition before reading the epoch generation, now as _thread_in_vm.
+  MACOS_AARCH64_ONLY(ThreadWXEnable __wx(WXWrite, jt));
   ThreadInVMfromJava transition(jt);
   JfrThreadLocal::set_vthread_epoch(jt, vthread_tid, ThreadIdAccess::current_epoch());
   return JfrJavaEventWriter::event_writer(jt);
@@ -74,12 +53,11 @@ void* JfrIntrinsicSupport::write_checkpoint(JavaThread* jt) {
 void* JfrIntrinsicSupport::return_lease(JavaThread* jt) {
   DEBUG_ONLY(assert_precondition(jt);)
   MACOS_AARCH64_ONLY(ThreadWXEnable __wx(WXWrite, jt));
-  ThreadStateTransition::transition_from_java(jt, _thread_in_native);
+  ThreadInVMfromJava transition(jt);
   assert(jt->jfr_thread_local()->has_java_event_writer(), "invariant");
   assert(jt->jfr_thread_local()->shelved_buffer() != nullptr, "invariant");
   JfrJavaEventWriter::flush(jt->jfr_thread_local()->java_event_writer(), 0, 0, jt);
   assert(jt->jfr_thread_local()->shelved_buffer() == nullptr, "invariant");
-  ThreadStateTransition::transition_from_native(jt, _thread_in_Java);
   return nullptr;
 }
 
diff --git a/src/hotspot/share/jfr/writers/jfrJavaEventWriter.cpp b/src/hotspot/share/jfr/writers/jfrJavaEventWriter.cpp
index 7f2d931623b..3a70d416058 100644
--- a/src/hotspot/share/jfr/writers/jfrJavaEventWriter.cpp
+++ b/src/hotspot/share/jfr/writers/jfrJavaEventWriter.cpp
@@ -118,7 +118,7 @@ bool JfrJavaEventWriter::initialize() {
 }
 
 void JfrJavaEventWriter::flush(jobject writer, jint used, jint requested, JavaThread* jt) {
-  DEBUG_ONLY(JfrJavaSupport::check_java_thread_in_native(jt));
+  DEBUG_ONLY(JfrJavaSupport::check_java_thread_in_vm(jt));
   assert(writer != nullptr, "invariant");
   JfrBuffer* const current = jt->jfr_thread_local()->java_buffer();
   assert(current != nullptr, "invariant");
@@ -130,9 +130,6 @@ void JfrJavaEventWriter::flush(jobject writer, jint used, jint requested, JavaTh
   const bool is_valid = buffer->free_size() >= (size_t)(used + requested);
   u1* const new_current_position = is_valid ? buffer->pos() + used : buffer->pos();
   assert(start_pos_offset != invalid_offset, "invariant");
-  // can safepoint here
-  MACOS_AARCH64_ONLY(ThreadWXEnable __wx(WXWrite, jt));
-  ThreadInVMfromNative transition(jt);
   oop const w = JNIHandles::resolve_non_null(writer);
   assert(w != nullptr, "invariant");
   w->long_field_put(start_pos_offset, (jlong)buffer->pos());
@@ -147,11 +144,10 @@ void JfrJavaEventWriter::flush(jobject writer, jint used, jint requested, JavaTh
   }
 }
 
-jlong JfrJavaEventWriter::commit(jlong next_position) {
+jlong JfrJavaEventWriter::commit(jlong next_position, JavaThread* jt) {
   assert(next_position != 0, "invariant");
-  JavaThread* const jt = JavaThread::current();
   assert(jt != nullptr, "invariant");
-  DEBUG_ONLY(JfrJavaSupport::check_java_thread_in_native(jt));
+  DEBUG_ONLY(JfrJavaSupport::check_java_thread_in_vm(jt));
   JfrThreadLocal* const tl = jt->jfr_thread_local();
   assert(tl != nullptr, "invariant");
   assert(tl->has_java_event_writer(), "invariant");
@@ -167,12 +163,11 @@ jlong JfrJavaEventWriter::commit(jlong next_position) {
   }
   // set_pos() has release semantics
   current->set_pos(next);
-  if (!current->lease()) {
-    return next_position;
+  if (current->lease()) {
+    flush(tl->java_event_writer(), 0, 0, jt);
+    return 0; // signals that the buffer lease was returned.
   }
-  assert(current->lease(), "invariant");
-  flush(tl->java_event_writer(), 0, 0, jt);
-  return 0; // signals that the buffer lease was returned.
+  return next_position;
 }
 
 class JfrJavaEventWriterNotificationClosure : public ThreadClosure {
diff --git a/src/hotspot/share/jfr/writers/jfrJavaEventWriter.hpp b/src/hotspot/share/jfr/writers/jfrJavaEventWriter.hpp
index 92a9a7a693e..36067bd3870 100644
--- a/src/hotspot/share/jfr/writers/jfrJavaEventWriter.hpp
+++ b/src/hotspot/share/jfr/writers/jfrJavaEventWriter.hpp
@@ -50,7 +50,7 @@ class JfrJavaEventWriter : AllStatic {
   static jobject event_writer(JavaThread* t);
   static jobject new_event_writer(TRAPS);
   static void flush(jobject writer, jint used, jint requested, JavaThread* jt);
-  static jlong commit(jlong next_position);
+  static jlong commit(jlong next_position, JavaThread* jt);
 };
 
 #endif // SHARE_JFR_WRITERS_JFRJAVAEVENTWRITER_HPP

From dbf47d6c6c9573a143e0158a0664dd3bbab8e251 Mon Sep 17 00:00:00 2001
From: Hamlin Li <mli@openjdk.org>
Date: Mon, 17 Mar 2025 11:47:18 +0000
Subject: [PATCH 369/587] 8351876: RISC-V: enable and fix some float round
 tests

Reviewed-by: fyang
---
 .../compiler/vectorization/TestRoundVectFloat.java   | 12 +++++++++---
 .../compiler/vectorization/TestRoundVectRiscv64.java |  6 ++++--
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/test/hotspot/jtreg/compiler/vectorization/TestRoundVectFloat.java b/test/hotspot/jtreg/compiler/vectorization/TestRoundVectFloat.java
index 7cf4ae17cb4..65f12be111a 100644
--- a/test/hotspot/jtreg/compiler/vectorization/TestRoundVectFloat.java
+++ b/test/hotspot/jtreg/compiler/vectorization/TestRoundVectFloat.java
@@ -26,8 +26,8 @@
  * @bug 8279508
  * @summary Auto-vectorize Math.round API
  * @requires vm.compiler2.enabled
- * @requires vm.cpu.features ~= ".*avx.*"
- * @requires os.simpleArch == "x64"
+ * @requires (os.simpleArch == "x64" & vm.cpu.features ~= ".*avx.*") |
+ *           (os.simpleArch == "riscv64" & vm.cpu.features ~= ".*rvv.*")
  * @library /test/lib /
  * @run driver compiler.vectorization.TestRoundVectFloat
  */
@@ -49,7 +49,13 @@ public class TestRoundVectFloat {
   }
 
   @Test
-  @IR(applyIf = {"UseAVX", " > 1"}, counts = {IRNode.ROUND_VF , " > 0 "})
+  @IR(applyIfPlatform = {"x64", "true"},
+      applyIf = {"UseAVX", " > 1"},
+      counts = {IRNode.ROUND_VF , " > 0 "})
+  @IR(applyIfPlatform = {"riscv64", "true"},
+      applyIfCPUFeature = {"rvv", "true"},
+      applyIf = {"MaxVectorSize", ">= 32"},
+      counts = {IRNode.ROUND_VF , " > 0 "})
   public void test_round_float(int[] iout, float[] finp) {
       for (int i = 0; i < finp.length; i+=1) {
           iout[i] = Math.round(finp[i]);
diff --git a/test/hotspot/jtreg/compiler/vectorization/TestRoundVectRiscv64.java b/test/hotspot/jtreg/compiler/vectorization/TestRoundVectRiscv64.java
index 530befbe2bc..252f1f1c166 100644
--- a/test/hotspot/jtreg/compiler/vectorization/TestRoundVectRiscv64.java
+++ b/test/hotspot/jtreg/compiler/vectorization/TestRoundVectRiscv64.java
@@ -53,7 +53,8 @@ public class TestRoundVectRiscv64 {
   }
 
   @Test
-  @IR(counts = {IRNode.ROUND_VD, "> 0"})
+  @IR(counts = {IRNode.ROUND_VD, "> 0"},
+      applyIf = {"MaxVectorSize", ">= 64"})
   public void test_round_double(long[] lout, double[] dinp) {
       for (int i = 0; i < lout.length; i+=1) {
           lout[i] = Math.round(dinp[i]);
@@ -73,7 +74,8 @@ public class TestRoundVectRiscv64 {
   }
 
   @Test
-  @IR(counts = {IRNode.ROUND_VF, "> 0"})
+  @IR(counts = {IRNode.ROUND_VF, "> 0"},
+      applyIf = {"MaxVectorSize", ">= 32"})
   public void test_round_float(int[] iout, float[] finp) {
       for (int i = 0; i < finp.length; i+=1) {
           iout[i] = Math.round(finp[i]);

From e62becc6ce8e1b777c3e5b78a9d9406b6389cd25 Mon Sep 17 00:00:00 2001
From: Matthew Donovan <mdonovan@openjdk.org>
Date: Mon, 17 Mar 2025 11:59:16 +0000
Subject: [PATCH 370/587] 8350964: Add an ArtifactResolver.fetch(clazz) method

Reviewed-by: weijun
---
 test/jdk/sun/security/pkcs11/PKCS11Test.java  | 37 +++----------------
 test/jdk/sun/security/pkcs11/SecmodTest.java  |  4 +-
 .../pkcs12/KeytoolOpensslInteropTest.java     | 17 ++-------
 .../sun/security/provider/acvp/Launcher.java  | 19 +---------
 .../test/lib/artifacts/ArtifactResolver.java  | 34 +++++++++++++++++
 .../lib/security/OpensslArtifactFetcher.java  | 36 ++++++++----------
 6 files changed, 61 insertions(+), 86 deletions(-)

diff --git a/test/jdk/sun/security/pkcs11/PKCS11Test.java b/test/jdk/sun/security/pkcs11/PKCS11Test.java
index a371effc72f..efae619314d 100644
--- a/test/jdk/sun/security/pkcs11/PKCS11Test.java
+++ b/test/jdk/sun/security/pkcs11/PKCS11Test.java
@@ -31,7 +31,6 @@ import java.io.StringReader;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.nio.file.Paths;
 import java.nio.file.StandardCopyOption;
 import java.security.AlgorithmParameters;
 import java.security.InvalidAlgorithmParameterException;
@@ -63,7 +62,6 @@ 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;
 import jtreg.SkippedException;
 
 public abstract class PKCS11Test {
@@ -232,10 +230,6 @@ public abstract class PKCS11Test {
 
     static String getNSSLibDir(String library) throws Exception {
         Path libPath = getNSSLibPath(library);
-        if (libPath == null) {
-            return null;
-        }
-
         String libDir = String.valueOf(libPath.getParent()) + File.separatorChar;
         System.out.println("nssLibDir: " + libDir);
         System.setProperty("pkcs11test.nss.libdir", libDir);
@@ -249,12 +243,7 @@ public abstract class PKCS11Test {
     static Path getNSSLibPath(String library) throws Exception {
         String osid = getOsId();
         Path libraryName = Path.of(System.mapLibraryName(library));
-        Path nssLibPath = fetchNssLib(osid, libraryName);
-        if (nssLibPath == null) {
-            throw new SkippedException("Warning: unsupported OS: " + osid
-                    + ", please initialize NSS library location, skipping test");
-        }
-        return nssLibPath;
+        return fetchNssLib(osid, libraryName);
     }
 
     private static String getOsId() {
@@ -715,7 +704,7 @@ public abstract class PKCS11Test {
         return data;
     }
 
-    private static Path fetchNssLib(String osId, Path libraryName) {
+    private static Path fetchNssLib(String osId, Path libraryName) throws IOException {
         switch (osId) {
             case "Windows-amd64-64":
                 return fetchNssLib(WINDOWS_X64.class, libraryName);
@@ -740,27 +729,13 @@ public abstract class PKCS11Test {
                     return fetchNssLib(LINUX_AARCH64.class, libraryName);
                 }
             default:
-                return null;
+                throw new SkippedException("Unsupported OS: " + osId);
         }
     }
 
-    private static Path fetchNssLib(Class<?> clazz, Path libraryName) {
-        Path path = null;
-        try {
-            Path p = ArtifactResolver.resolve(clazz).entrySet().stream()
-                    .findAny().get().getValue();
-            path = findNSSLibrary(p, libraryName);
-        } catch (ArtifactResolverException | IOException e) {
-            Throwable cause = e.getCause();
-            if (cause == null) {
-                System.out.println("Cannot resolve artifact, "
-                        + "please check if JIB jar is present in classpath.");
-            } else {
-                throw new RuntimeException("Fetch artifact failed: " + clazz
-                        + "\nPlease make sure the artifact is available.", e);
-            }
-        }
-        return path;
+    private static Path fetchNssLib(Class<?> clazz, Path libraryName) throws IOException {
+        Path p = ArtifactResolver.fetchOne(clazz);
+        return findNSSLibrary(p, libraryName);
     }
 
     private static Path findNSSLibrary(Path path, Path libraryName) throws IOException {
diff --git a/test/jdk/sun/security/pkcs11/SecmodTest.java b/test/jdk/sun/security/pkcs11/SecmodTest.java
index c1b5e4471ba..8201548bf9d 100644
--- a/test/jdk/sun/security/pkcs11/SecmodTest.java
+++ b/test/jdk/sun/security/pkcs11/SecmodTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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 @@ public class SecmodTest extends PKCS11Test {
         useNSS();
         LIBPATH = getNSSLibDir();
         // load all the libraries except libnss3 into memory
-        if ((LIBPATH == null) || (!loadNSPR(LIBPATH))) {
+        if (!loadNSPR(LIBPATH)) {
             throw new SkippedException("Failed to load NSS libraries");
         }
 
diff --git a/test/jdk/sun/security/pkcs12/KeytoolOpensslInteropTest.java b/test/jdk/sun/security/pkcs12/KeytoolOpensslInteropTest.java
index 846f036cd5f..facdbc8a187 100644
--- a/test/jdk/sun/security/pkcs12/KeytoolOpensslInteropTest.java
+++ b/test/jdk/sun/security/pkcs12/KeytoolOpensslInteropTest.java
@@ -56,7 +56,6 @@ import jdk.test.lib.SecurityTools;
 import jdk.test.lib.process.ProcessTools;
 import jdk.test.lib.process.OutputAnalyzer;
 import jdk.test.lib.security.OpensslArtifactFetcher;
-import jtreg.SkippedException;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -82,19 +81,9 @@ public class KeytoolOpensslInteropTest {
         boolean generatePKCS12 = Boolean.parseBoolean(args[0]);
         if (generatePKCS12) {
             String opensslPath = OpensslArtifactFetcher.getOpensslPath();
-            if (opensslPath != null) {
-                // if the current version of openssl is available, perform all
-                // keytool <-> openssl interop tests
-                generateInitialKeystores(opensslPath);
-                testWithJavaCommands();
-                testWithOpensslCommands(opensslPath);
-            } else {
-                String exMsg = "Can't find the version: "
-                        + OpensslArtifactFetcher.getTestOpensslBundleVersion()
-                        + " of openssl binary on this machine, please install"
-                        + " and set openssl path with property 'test.openssl.path'";
-                throw new SkippedException(exMsg);
-            }
+            generateInitialKeystores(opensslPath);
+            testWithJavaCommands();
+            testWithOpensslCommands(opensslPath);
         } else {
             // since this scenario is using preexisting PKCS12, skip all
             // openssl command dependent tests
diff --git a/test/jdk/sun/security/provider/acvp/Launcher.java b/test/jdk/sun/security/provider/acvp/Launcher.java
index 1405847de5d..0dfa16678d8 100644
--- a/test/jdk/sun/security/provider/acvp/Launcher.java
+++ b/test/jdk/sun/security/provider/acvp/Launcher.java
@@ -23,9 +23,7 @@
 
 import jdk.test.lib.artifacts.Artifact;
 import jdk.test.lib.artifacts.ArtifactResolver;
-import jdk.test.lib.artifacts.ArtifactResolverException;
 import jdk.test.lib.json.JSONValue;
-import jtreg.SkippedException;
 
 import java.io.InputStream;
 import java.nio.file.Path;
@@ -106,7 +104,7 @@ public class Launcher {
 
     public static void main(String[] args) throws Exception {
 
-        Path archivePath = fetchACVPServerTests(ACVP_SERVER_TESTS.class);
+        Path archivePath = ArtifactResolver.fetchOne(ACVP_SERVER_TESTS.class);
         System.out.println("Data path: " + archivePath);
 
         if (PROVIDER != null) {
@@ -178,21 +176,6 @@ public class Launcher {
         }
     }
 
-    private static Path fetchACVPServerTests(Class<?> clazz) {
-        try {
-            return ArtifactResolver.resolve(clazz).entrySet().stream()
-                    .findAny().get().getValue();
-        } catch (ArtifactResolverException e) {
-            Throwable cause = e.getCause();
-            if (cause == null) {
-                throw new SkippedException("Cannot resolve artifact, "
-                        + "please check if JIB jar is present in classpath.", e);
-            }
-
-            throw new SkippedException("Fetch artifact failed: " + clazz, e);
-        }
-    }
-
     @Artifact(
             organization = ACVP_BUNDLE_LOC,
             name = ACVP_BUNDLE_NAME,
diff --git a/test/lib/jdk/test/lib/artifacts/ArtifactResolver.java b/test/lib/jdk/test/lib/artifacts/ArtifactResolver.java
index cac371b482b..83e381356a0 100644
--- a/test/lib/jdk/test/lib/artifacts/ArtifactResolver.java
+++ b/test/lib/jdk/test/lib/artifacts/ArtifactResolver.java
@@ -23,6 +23,8 @@
 
 package jdk.test.lib.artifacts;
 
+import jtreg.SkippedException;
+
 import java.nio.file.Path;
 import java.util.HashMap;
 import java.util.Map;
@@ -68,6 +70,38 @@ public class ArtifactResolver {
         return  manager.resolve(name, artifactDescription, unpack);
     }
 
+    /**
+     * Retrieve an artifact/library/file from a repository or local file system.
+     * <p>
+     * Artifacts are defined with the {@link jdk.test.lib.artifacts.Artifact}
+     * annotation.
+     * <p>
+     * If you have a local version of a dependency that you want to use, you can
+     * specify that by setting the system property:
+     * <code>jdk.test.lib.artifacts.ARTIFACT_NAME</code>. Where ARTIFACT_NAME
+     * is the name field of the Artifact annotation.
+     * <p>
+     * Generally, tests that use this method should be run with <code>make test</code>.
+     * However, tests can also be run with <code>jtreg</code> but you must have a
+     * local copy of the artifact and the system property must be set as specified
+     * above.
+     *
+     * @param klass a class annotated with {@link jdk.test.lib.artifacts.Artifact}
+     * @return the local path to the artifact. If the artifact is a compressed
+     * file that gets unpacked, this path will point to the root
+     * directory of the uncompressed file(s).
+     * @throws SkippedException thrown if the artifact cannot be found
+     */
+    public static Path fetchOne(Class<?> klass) {
+        try {
+            return ArtifactResolver.resolve(klass).entrySet().stream()
+                    .findAny().get().getValue();
+        } catch (ArtifactResolverException e) {
+            Artifact artifact = klass.getAnnotation(Artifact.class);
+            throw new SkippedException("Cannot find the artifact " + artifact.name(), e);
+        }
+    }
+
     private static String artifactName(Artifact artifact) {
         // Format of the artifact name is <organization>.<name>-<revision>(-<classifier>)
         String name = String.format("%s.%s-%s", artifact.organization(), artifact.name(), artifact.revision());
diff --git a/test/lib/jdk/test/lib/security/OpensslArtifactFetcher.java b/test/lib/jdk/test/lib/security/OpensslArtifactFetcher.java
index 14b63abdd69..99b7a5fd8d1 100644
--- a/test/lib/jdk/test/lib/security/OpensslArtifactFetcher.java
+++ b/test/lib/jdk/test/lib/security/OpensslArtifactFetcher.java
@@ -23,14 +23,12 @@
 
 package jdk.test.lib.security;
 
-import java.io.File;
-
 import java.nio.file.Path;
 import jdk.test.lib.Platform;
 import jdk.test.lib.process.ProcessTools;
 import jdk.test.lib.artifacts.Artifact;
 import jdk.test.lib.artifacts.ArtifactResolver;
-import jdk.test.lib.artifacts.ArtifactResolverException;
+import jtreg.SkippedException;
 
 public class OpensslArtifactFetcher {
 
@@ -50,6 +48,7 @@ public class OpensslArtifactFetcher {
            and return that path, if download fails then return null.
      *
      * @return openssl binary path of the current version
+     * @throws SkippedException if a valid version of OpenSSL cannot be found
      */
     public static String getOpensslPath() {
         String path = getOpensslFromSystemProp(OPENSSL_BUNDLE_VERSION);
@@ -76,7 +75,16 @@ public class OpensslArtifactFetcher {
                 path = fetchOpenssl(MACOSX_AARCH64.class);
             }
         }
-        return verifyOpensslVersion(path, OPENSSL_BUNDLE_VERSION) ? path : null;
+
+        if (!verifyOpensslVersion(path, OPENSSL_BUNDLE_VERSION)) {
+            String exMsg = "Can't find the version: "
+                    + OpensslArtifactFetcher.getTestOpensslBundleVersion()
+                    + " of openssl binary on this machine, please install"
+                    + " and set openssl path with property 'test.openssl.path'";
+            throw new SkippedException(exMsg);
+        } else {
+            return path;
+        }
     }
 
     private static String getOpensslFromSystemProp(String version) {
@@ -112,23 +120,9 @@ public class OpensslArtifactFetcher {
     }
 
     private static String fetchOpenssl(Class<?> clazz) {
-        String path = null;
-        try {
-            path = ArtifactResolver.resolve(clazz).entrySet().stream()
-                    .findAny().get().getValue() + File.separator + "openssl"
-                    + File.separator + "bin" + File.separator + "openssl";
-            System.out.println("path: " + path);
-        } catch (ArtifactResolverException e) {
-            Throwable cause = e.getCause();
-            if (cause == null) {
-                System.out.println("Cannot resolve artifact, "
-                        + "please check if JIB jar is present in classpath.");
-            } else {
-                throw new RuntimeException("Fetch artifact failed: " + clazz
-                        + "\nPlease make sure the artifact is available.", e);
-            }
-        }
-        return path;
+        return ArtifactResolver.fetchOne(clazz)
+                .resolve("openssl", "bin", "openssl")
+                .toString();
     }
 
     // retrieve the provider directory path from <OPENSSL_HOME>/bin/openssl

From d68775d7118c926cacb7e9e4c02b85bdb0705521 Mon Sep 17 00:00:00 2001
From: Erik Gahlin <egahlin@openjdk.org>
Date: Mon, 17 Mar 2025 15:29:14 +0000
Subject: [PATCH 371/587] 8351995: JFR: Leftovers from removal of Security
 Manager

Reviewed-by: mgronlun
---
 .../jfr/internal/EventInstrumentation.java    |   1 -
 .../jdk/jfr/internal/EventWriterKey.java      | 122 ------------------
 .../classes/jdk/jfr/internal/JVMUpcalls.java  |   2 +-
 .../jdk/jfr/internal/PlatformRecording.java   |   1 -
 .../jdk/jfr/internal/ShutdownHook.java        |   2 +-
 .../jfr/FlightRecorderMXBeanImpl.java         |   2 -
 .../management/jfr/RemoteRecordingStream.java |   1 -
 7 files changed, 2 insertions(+), 129 deletions(-)
 delete mode 100644 src/jdk.jfr/share/classes/jdk/jfr/internal/EventWriterKey.java

diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/EventInstrumentation.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/EventInstrumentation.java
index 636ae3756e6..7567aea664c 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/EventInstrumentation.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/EventInstrumentation.java
@@ -48,7 +48,6 @@ import java.lang.classfile.CodeBuilder.BlockCodeBuilder;
 import java.lang.classfile.FieldModel;
 import java.lang.classfile.Label;
 import java.lang.classfile.MethodModel;
-import java.lang.classfile.Opcode;
 import java.lang.classfile.TypeKind;
 import java.lang.classfile.attribute.RuntimeVisibleAnnotationsAttribute;
 import jdk.jfr.internal.event.EventConfiguration;
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/EventWriterKey.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/EventWriterKey.java
deleted file mode 100644
index 8301de748da..00000000000
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/EventWriterKey.java
+++ /dev/null
@@ -1,122 +0,0 @@
-/*
- * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-package jdk.jfr.internal;
-
-import java.io.InputStream;
-
-// Purpose of this class is NOT to create a cryptographically
-// strong random number. but to quickly generate a value hard to guess
-// without the need to load classes or have an impact on security
-// related events, like SecureRandom::getAlgorithm("NativePRNGNonBlocking") does
-public final class EventWriterKey {
-    private static final long KEY = createKey();
-    private static boolean loaded;
-    private static boolean logged;
-
-    public static long getKey() {
-        return KEY;
-    }
-
-    private static long createKey() {
-        long r = mixMurmur64(System.identityHashCode(new Object()));
-        r = 31 * r + mixMurmur64(JVM.getPid().hashCode());
-        r = 31 * r + mixMurmur64(System.nanoTime());
-        r = 31 * r + mixMurmur64(Thread.currentThread().threadId());
-        r = 31 * r + mixMurmur64(System.currentTimeMillis());
-        r = 31 * r + mixMurmur64(JVM.getTypeId(JVM.class));
-        r = 31 * r + mixMurmur64(JVM.counterTime());
-        return mixMurmur64(r);
-    }
-
-    // Copied from jdk.internal.util.random.RandomSupport.mixMurmur64(long)
-    private static long mixMurmur64(long z) {
-        z = (z ^ (z >>> 33)) * 0xff51afd7ed558ccdL;
-        z = (z ^ (z >>> 33)) * 0xc4ceb9fe1a85ec53L;
-        return z ^ (z >>> 33);
-    }
-
-    public static void ensureEventWriterFactory() {
-        if (loaded) {
-            return;
-        }
-        String name = "/jdk/jfr/internal/EventWriterFactoryRecipe.class";
-        try (InputStream is = EventWriterKey.class.getResourceAsStream(name)) {
-            byte[] bytes = is.readAllBytes();
-            bytes = replace(bytes,
-                    "jdk/jfr/internal/EventWriterFactoryRecipe",
-                    "jdk/jfr/internal/event/EventWriterFactory");
-            Class<?> c = Class.forName("jdk.jfr.internal.event.EventWriter");
-            SecuritySupport.defineClass(c, bytes);
-            loaded = true;
-        } catch (Throwable e) {
-           throw new InternalError("Could not read bytecode for " + name, e);
-        }
-        Logger.log(LogTag.JFR_SYSTEM, LogLevel.DEBUG, "EventWriterFactory created");
-    }
-
-    // Starve the system of resources to prevent further attempts.
-    // Note, code that have the capability to invoke this method
-    // could spin in a loop anyway. Alternatives, such as System.exit(1),
-    // may provide caller with additional capabilities.
-    public static void block() {
-        // Making this field variable a local variable leads to CTW failure
-        logged = false;
-        while (true) {
-            try {
-                if (!logged) {
-                    // Only log once to prevent flooding of log.
-                    logged = true;
-                    // Purposely don't call Thread::getName() since it can be overridden
-                    Logger.log(LogTag.JFR, LogLevel.ERROR, "Malicious attempt to access JFR buffers. Stopping thread from further execution.");
-                }
-            } catch (Throwable t) {
-                // Ensure code can't break out and retry
-            }
-        }
-    }
-
-    private static byte[] replace(byte[] bytes, String match, String replacement) {
-        if (match.length() != replacement.length()) {
-            throw new IllegalArgumentException("Match must be same size as replacement");
-        }
-        for (int i = 0; i < bytes.length - match.length(); i++) {
-            if (match(bytes, i, match)) {
-                for (int j = 0; j < replacement.length(); j++) {
-                    bytes[i + j] = (byte) replacement.charAt(j);
-                }
-            }
-        }
-        return bytes;
-    }
-
-    private static boolean match(byte[] bytes, int offset, String text) {
-        for (int i = 0; i < text.length(); i++) {
-            if (bytes[offset + i] != text.charAt(i)) {
-                return false;
-            }
-        }
-        return true;
-    }
-}
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/JVMUpcalls.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/JVMUpcalls.java
index 7adafce6768..36dc2259be9 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/JVMUpcalls.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/JVMUpcalls.java
@@ -128,7 +128,7 @@ final class JVMUpcalls {
             Bytecode.log(ei.getClassName() + "(" + traceId + ")", bytes);
             return bytes;
         } catch (Throwable t) {
-            Logger.log(LogTag.JFR_SYSTEM, LogLevel.WARN, "Unexpected error when adding instrumentation for event type " + eventName);
+            Logger.log(LogTag.JFR_SYSTEM, LogLevel.WARN, "Unexpected error when adding instrumentation for event type " + eventName + ". " + t.getMessage());
             return oldBytes;
         }
     }
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/PlatformRecording.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/PlatformRecording.java
index 794121678ef..d71c20968a0 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/PlatformRecording.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/PlatformRecording.java
@@ -93,7 +93,6 @@ public final class PlatformRecording implements AutoCloseable {
     private long finalStartChunkNanos = Long.MIN_VALUE;
     private long startNanos = -1;
 
-    @SuppressWarnings("removal")
     PlatformRecording(PlatformRecorder recorder, long id) {
         this.id = id;
         this.recorder = recorder;
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/ShutdownHook.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/ShutdownHook.java
index ef9e5d53bf9..df9fdc2815b 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/ShutdownHook.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/ShutdownHook.java
@@ -67,7 +67,7 @@ final class ShutdownHook extends Thread {
             }
         } catch (Exception e) {
             if (Logger.shouldLog(LogTag.JFR, LogLevel.DEBUG)) {
-                Logger.log(LogTag.JFR, LogLevel.DEBUG, "Could not dump recording " + recording.getName() + " on exit.");
+                Logger.log(LogTag.JFR, LogLevel.DEBUG, "Could not dump recording " + recording.getName() + " on exit. " + e.getMessage());
             }
         }
     }
diff --git a/src/jdk.management.jfr/share/classes/jdk/management/jfr/FlightRecorderMXBeanImpl.java b/src/jdk.management.jfr/share/classes/jdk/management/jfr/FlightRecorderMXBeanImpl.java
index bb2470d5a0b..467ff05e513 100644
--- a/src/jdk.management.jfr/share/classes/jdk/management/jfr/FlightRecorderMXBeanImpl.java
+++ b/src/jdk.management.jfr/share/classes/jdk/management/jfr/FlightRecorderMXBeanImpl.java
@@ -77,14 +77,12 @@ final class FlightRecorderMXBeanImpl extends StandardEmitterMBean implements Fli
         private final NotificationFilter filter;
         private final Object handback;
 
-        @SuppressWarnings("removal")
         public MXBeanListener(NotificationListener listener, NotificationFilter filter, Object handback) {
             this.listener = listener;
             this.filter = filter;
             this.handback = handback;
         }
 
-        @SuppressWarnings("removal")
         public void recordingStateChanged(Recording recording) {
             sendNotification(createNotification(recording));
         }
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 662fe891244..862781802fc 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
@@ -196,7 +196,6 @@ public final class RemoteRecordingStream implements EventStream {
         this(connection, directory, false);
     }
 
-    @SuppressWarnings("removal")
     private RemoteRecordingStream(MBeanServerConnection connection, Path directory, boolean delete) throws IOException {
         Objects.requireNonNull(connection, "connection");
         Objects.requireNonNull(directory, "directory");

From 4c6a523e89e077a6697abb30863eb70bc977757c Mon Sep 17 00:00:00 2001
From: Leonid Mesnik <lmesnik@openjdk.org>
Date: Mon, 17 Mar 2025 16:07:52 +0000
Subject: [PATCH 372/587] 8352096: Test
 jdk/jfr/event/profiling/TestFullStackTrace.java shouldn't be executed with
 -XX:+DeoptimizeALot

Reviewed-by: egahlin
---
 test/jdk/jdk/jfr/event/profiling/TestFullStackTrace.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/jdk/jdk/jfr/event/profiling/TestFullStackTrace.java b/test/jdk/jdk/jfr/event/profiling/TestFullStackTrace.java
index 13cf709f018..b06f9eed03d 100644
--- a/test/jdk/jdk/jfr/event/profiling/TestFullStackTrace.java
+++ b/test/jdk/jdk/jfr/event/profiling/TestFullStackTrace.java
@@ -39,6 +39,7 @@ import jdk.test.lib.jfr.RecurseThread;
 /**
  * @test
  * @requires vm.hasJFR
+ * @requires vm.opt.DeoptimizeALot != true
  * @library /test/lib
  * @run main/othervm jdk.jfr.event.profiling.TestFullStackTrace
  */

From 2674a31bb85a3f7b2dcca9a9bb10a79fba026da0 Mon Sep 17 00:00:00 2001
From: Jiangli Zhou <jiangli@openjdk.org>
Date: Mon, 17 Mar 2025 16:36:20 +0000
Subject: [PATCH 373/587] 8351891: Disable
 TestBreakSignalThreadDump.java#with_jsig and XCheckJSig.java on static JDK

Reviewed-by: manc, dholmes
---
 .../jtreg/runtime/Thread/TestBreakSignalThreadDump.java       | 4 +++-
 test/hotspot/jtreg/runtime/XCheckJniJsig/XCheckJSig.java      | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/test/hotspot/jtreg/runtime/Thread/TestBreakSignalThreadDump.java b/test/hotspot/jtreg/runtime/Thread/TestBreakSignalThreadDump.java
index aecf3fdb5a6..b985e15bd17 100644
--- a/test/hotspot/jtreg/runtime/Thread/TestBreakSignalThreadDump.java
+++ b/test/hotspot/jtreg/runtime/Thread/TestBreakSignalThreadDump.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2025, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2022, Google and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -36,6 +36,8 @@
  * @bug 8292695
  * @summary Check that Ctrl-\ causes HotSpot VM to print a full thread dump when signal chaining is used.
  * @requires os.family != "windows" & os.family != "aix"
+ * @comment TODO: Decide libjsig support on static JDK with 8351367
+ * @requires !jdk.static
  * @library /vmTestbase
  *          /test/lib
  * @run driver TestBreakSignalThreadDump load_libjsig
diff --git a/test/hotspot/jtreg/runtime/XCheckJniJsig/XCheckJSig.java b/test/hotspot/jtreg/runtime/XCheckJniJsig/XCheckJSig.java
index aae401df963..a8010506d96 100644
--- a/test/hotspot/jtreg/runtime/XCheckJniJsig/XCheckJSig.java
+++ b/test/hotspot/jtreg/runtime/XCheckJniJsig/XCheckJSig.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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,8 @@
  * @modules java.base/jdk.internal.misc
  *          java.management
  * @requires os.family == "linux" | os.family == "mac"
+ * @comment TODO: Decide libjsig support on static JDK with 8351367
+ * @requires !jdk.static
  * @run driver XCheckJSig
  */
 

From 6b82b42a2116900b2125e03c1ffa0824d6062757 Mon Sep 17 00:00:00 2001
From: Harshitha Onkar <honkar@openjdk.org>
Date: Mon, 17 Mar 2025 16:50:33 +0000
Subject: [PATCH 374/587] 8348598: Update Libpng to 1.6.47

Reviewed-by: azvegint, prr, erikj
---
 .../java.desktop/lib/ClientLibraries.gmk      |    3 +-
 src/java.desktop/share/legal/libpng.md        |    7 +-
 .../native/libsplashscreen/libpng/CHANGES     |   55 +
 .../native/libsplashscreen/libpng/LICENSE     |    4 +-
 .../native/libsplashscreen/libpng/README      |    4 +-
 .../share/native/libsplashscreen/libpng/png.c | 1471 +++++--------
 .../share/native/libsplashscreen/libpng/png.h |  143 +-
 .../native/libsplashscreen/libpng/pngconf.h   |   10 +-
 .../native/libsplashscreen/libpng/pngerror.c  |   35 +-
 .../native/libsplashscreen/libpng/pngget.c    |  308 ++-
 .../native/libsplashscreen/libpng/pnginfo.h   |   52 +-
 .../libsplashscreen/libpng/pnglibconf.h       |    4 +-
 .../native/libsplashscreen/libpng/pngmem.c    |   37 +-
 .../native/libsplashscreen/libpng/pngpread.c  |  204 +-
 .../native/libsplashscreen/libpng/pngpriv.h   |  465 ++--
 .../native/libsplashscreen/libpng/pngread.c   |  351 +--
 .../native/libsplashscreen/libpng/pngrtran.c  |  337 +--
 .../native/libsplashscreen/libpng/pngrutil.c  | 1892 +++++++++--------
 .../native/libsplashscreen/libpng/pngset.c    |  295 ++-
 .../native/libsplashscreen/libpng/pngstruct.h |   96 +-
 20 files changed, 2742 insertions(+), 3031 deletions(-)

diff --git a/make/modules/java.desktop/lib/ClientLibraries.gmk b/make/modules/java.desktop/lib/ClientLibraries.gmk
index 5587b13a6c9..8dbf48563fe 100644
--- a/make/modules/java.desktop/lib/ClientLibraries.gmk
+++ b/make/modules/java.desktop/lib/ClientLibraries.gmk
@@ -237,7 +237,7 @@ ifeq ($(ENABLE_HEADLESS_ONLY), false)
       DISABLED_WARNINGS_gcc_dgif_lib.c := sign-compare, \
       DISABLED_WARNINGS_gcc_jcmaster.c := implicit-fallthrough, \
       DISABLED_WARNINGS_gcc_jdphuff.c := shift-negative-value, \
-      DISABLED_WARNINGS_gcc_png.c := maybe-uninitialized, \
+      DISABLED_WARNINGS_gcc_png.c := maybe-uninitialized unused-function, \
       DISABLED_WARNINGS_gcc_pngerror.c := maybe-uninitialized, \
       DISABLED_WARNINGS_gcc_splashscreen_gfx_impl.c := implicit-fallthrough \
           maybe-uninitialized, \
@@ -248,6 +248,7 @@ ifeq ($(ENABLE_HEADLESS_ONLY), false)
       DISABLED_WARNINGS_clang := deprecated-non-prototype, \
       DISABLED_WARNINGS_clang_dgif_lib.c := sign-compare, \
       DISABLED_WARNINGS_clang_gzwrite.c := format-nonliteral, \
+      DISABLED_WARNINGS_clang_png.c := unused-function, \
       DISABLED_WARNINGS_clang_splashscreen_impl.c := sign-compare \
           unused-but-set-variable unused-function, \
       DISABLED_WARNINGS_clang_splashscreen_png.c := \
diff --git a/src/java.desktop/share/legal/libpng.md b/src/java.desktop/share/legal/libpng.md
index cbffed81332..d43ccf2e8e4 100644
--- a/src/java.desktop/share/legal/libpng.md
+++ b/src/java.desktop/share/legal/libpng.md
@@ -1,4 +1,4 @@
-## libpng v1.6.43
+## libpng v1.6.47
 
 ### libpng License
 <pre>
@@ -9,8 +9,8 @@ COPYRIGHT NOTICE, DISCLAIMER, and LICENSE
 PNG Reference Library License version 2
 ---------------------------------------
 
-Copyright (C) 1995-2024 The PNG Reference Library Authors.
-Copyright (C) 2018-2024 Cosmin Truta
+Copyright (c) 1995-2025 The PNG Reference Library Authors.
+Copyright (C) 2018-2025 Cosmin Truta
 Copyright (C) 1998-2018 Glenn Randers-Pehrson
 Copyright (C) 1996-1997 Andreas Dilger
 Copyright (C) 1995-1996 Guy Eric Schalnat, Group 42, Inc.
@@ -170,6 +170,7 @@ Authors, for copyright and licensing purposes.
  * James Yu
  * John Bowler
  * Kevin Bracey
+ * Lucas Chollet
  * Magnus Holmgren
  * Mandar Sahastrabuddhe
  * Mans Rullgard
diff --git a/src/java.desktop/share/native/libsplashscreen/libpng/CHANGES b/src/java.desktop/share/native/libsplashscreen/libpng/CHANGES
index 441b57ecf1a..834b5e19277 100644
--- a/src/java.desktop/share/native/libsplashscreen/libpng/CHANGES
+++ b/src/java.desktop/share/native/libsplashscreen/libpng/CHANGES
@@ -6196,6 +6196,61 @@ Version 1.6.43 [February 23, 2024]
     consistency verification and text linting.
   Added version consistency verification to pngtest.c also.
 
+Version 1.6.44 [September 12, 2024]
+  Hardened calculations in chroma handling to prevent overflows, and
+    relaxed a constraint in cHRM validation to accomodate the standard
+    ACES AP1 set of color primaries.
+    (Contributed by John Bowler)
+  Removed the ASM implementation of ARM Neon optimizations and updated
+    the build accordingly. Only the remaining C implementation shall be
+    used from now on, thus ensuring the support of the PAC/BTI security
+    features on ARM64.
+    (Contributed by Ross Burton and John Bowler)
+  Fixed the pickup of the PNG_HARDWARE_OPTIMIZATIONS option in the
+    CMake build on FreeBSD/amd64. This is an important performance fix
+    on this platform.
+  Applied various fixes and improvements to the CMake build.
+    (Contributed by Eric Riff, Benjamin Buch and Erik Scholz)
+  Added fuzzing targets for the simplified read API.
+    (Contributed by Mikhail Khachayants)
+  Fixed a build error involving pngtest.c under a custom config.
+    This was a regression introduced in a code cleanup in libpng-1.6.43.
+    (Contributed by Ben Wagner)
+  Fixed and improved the config files for AppVeyor CI and Travis CI.
+
+Version 1.6.45 [January 7, 2025]
+  Added support for the cICP chunk.
+    (Contributed by Lucas Chollet and John Bowler)
+  Adjusted and improved various checks in colorspace calculations.
+    (Contributed by John Bowler)
+  Rearranged the write order of colorspace chunks for better conformance
+    with the PNG v3 draft specification.
+    (Contributed by John Bowler)
+  Raised the minimum required CMake version from 3.6 to 3.14.
+  Forked off a development branch for libpng version 1.8.
+
+Version 1.6.46 [January 23, 2025]
+  Added support for the mDCV and cLLI chunks.
+    (Contributed by John Bowler)
+  Fixed a build issue affecting C89 compilers.
+    This was a regression introduced in libpng-1.6.45.
+    (Contributed by John Bowler)
+  Added makefile.c89, specifically for testing C89 compilers.
+  Cleaned up contrib/pngminus: corrected an old typo, removed an old
+    workaround, and updated the CMake file.
+
+Version 1.6.47 [February 18, 2025]
+  Modified the behaviour of colorspace chunks in order to adhere
+    to the new precedence rules formulated in the latest draft of
+    the PNG Specification.
+    (Contributed by John Bowler)
+  Fixed a latent bug in `png_write_iCCP`.
+    This would have been a read-beyond-end-of-malloc vulnerability,
+    introduced early in the libpng-1.6.0 development, yet (fortunately!)
+    it was inaccessible before the above-mentioned modification of the
+    colorspace precedence rules, due to pre-existing colorspace checks.
+    (Reported by Bob Friesenhahn; fixed by John Bowler)
+
 Send comments/corrections/commendations to png-mng-implement at lists.sf.net.
 Subscription is required; visit
 https://lists.sourceforge.net/lists/listinfo/png-mng-implement
diff --git a/src/java.desktop/share/native/libsplashscreen/libpng/LICENSE b/src/java.desktop/share/native/libsplashscreen/libpng/LICENSE
index 25f298f0fcf..ea6df986cb6 100644
--- a/src/java.desktop/share/native/libsplashscreen/libpng/LICENSE
+++ b/src/java.desktop/share/native/libsplashscreen/libpng/LICENSE
@@ -4,8 +4,8 @@ COPYRIGHT NOTICE, DISCLAIMER, and LICENSE
 PNG Reference Library License version 2
 ---------------------------------------
 
- * Copyright (c) 1995-2024 The PNG Reference Library Authors.
- * Copyright (c) 2018-2024 Cosmin Truta.
+ * Copyright (c) 1995-2025 The PNG Reference Library Authors.
+ * Copyright (c) 2018-2025 Cosmin Truta.
  * Copyright (c) 2000-2002, 2004, 2006-2018 Glenn Randers-Pehrson.
  * Copyright (c) 1996-1997 Andreas Dilger.
  * Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.
diff --git a/src/java.desktop/share/native/libsplashscreen/libpng/README b/src/java.desktop/share/native/libsplashscreen/libpng/README
index a6ca3ae9f94..57952fb215a 100644
--- a/src/java.desktop/share/native/libsplashscreen/libpng/README
+++ b/src/java.desktop/share/native/libsplashscreen/libpng/README
@@ -1,4 +1,4 @@
-README for libpng version 1.6.43
+README for libpng version 1.6.47
 ================================
 
 See the note about version numbers near the top of `png.h`.
@@ -157,8 +157,6 @@ Files included in this distribution
                           "PNG: The Definitive Guide" by Greg Roelofs,
                           O'Reilly, 1999
         libtests/     =>  Test programs
-        oss-fuzz/     =>  Files used by the OSS-Fuzz project for fuzz-testing
-                          libpng
         pngexif/      =>  Program to inspect the EXIF information in PNG files
         pngminim/     =>  Minimal decoder, encoder, and progressive decoder
                           programs demonstrating the use of pngusr.dfa
diff --git a/src/java.desktop/share/native/libsplashscreen/libpng/png.c b/src/java.desktop/share/native/libsplashscreen/libpng/png.c
index 232dff876c7..7b6de2f8ec3 100644
--- a/src/java.desktop/share/native/libsplashscreen/libpng/png.c
+++ b/src/java.desktop/share/native/libsplashscreen/libpng/png.c
@@ -29,7 +29,7 @@
  * However, the following notice accompanied the original version of this
  * file and, per its terms, should not be removed:
  *
- * Copyright (c) 2018-2024 Cosmin Truta
+ * Copyright (c) 2018-2025 Cosmin Truta
  * Copyright (c) 1998-2002,2004,2006-2018 Glenn Randers-Pehrson
  * Copyright (c) 1996-1997 Andreas Dilger
  * Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.
@@ -42,7 +42,34 @@
 #include "pngpriv.h"
 
 /* Generate a compiler error if there is an old png.h in the search path. */
-typedef png_libpng_version_1_6_43 Your_png_h_is_not_version_1_6_43;
+typedef png_libpng_version_1_6_47 Your_png_h_is_not_version_1_6_47;
+
+/* Sanity check the chunks definitions - PNG_KNOWN_CHUNKS from pngpriv.h and the
+ * corresponding macro definitions.  This causes a compile time failure if
+ * something is wrong but generates no code.
+ *
+ * (1) The first check is that the PNG_CHUNK(cHNK, index) 'index' values must
+ * increment from 0 to the last value.
+ */
+#define PNG_CHUNK(cHNK, index) != (index) || ((index)+1)
+
+#if 0 PNG_KNOWN_CHUNKS < 0
+#  error PNG_KNOWN_CHUNKS chunk definitions are not in order
+#endif
+
+#undef PNG_CHUNK
+
+/* (2) The chunk name macros, png_cHNK, must all be valid and defined.  Since
+ * this is a preprocessor test undefined pp-tokens come out as zero and will
+ * fail this test.
+ */
+#define PNG_CHUNK(cHNK, index) !PNG_CHUNK_NAME_VALID(png_ ## cHNK) ||
+
+#if PNG_KNOWN_CHUNKS 0
+#  error png_cHNK not defined for some known cHNK
+#endif
+
+#undef PNG_CHUNK
 
 /* Tells libpng that we have already handled the first "num_bytes" bytes
  * of the PNG file signature.  If the PNG data is embedded into another
@@ -270,21 +297,23 @@ png_create_png_struct,(png_const_charp user_png_ver, png_voidp error_ptr,
     */
    memset(&create_struct, 0, (sizeof create_struct));
 
-   /* Added at libpng-1.2.6 */
 #  ifdef PNG_USER_LIMITS_SUPPORTED
       create_struct.user_width_max = PNG_USER_WIDTH_MAX;
       create_struct.user_height_max = PNG_USER_HEIGHT_MAX;
 
 #     ifdef PNG_USER_CHUNK_CACHE_MAX
-      /* Added at libpng-1.2.43 and 1.4.0 */
       create_struct.user_chunk_cache_max = PNG_USER_CHUNK_CACHE_MAX;
 #     endif
 
-#     ifdef PNG_USER_CHUNK_MALLOC_MAX
-      /* Added at libpng-1.2.43 and 1.4.1, required only for read but exists
-       * in png_struct regardless.
-       */
+#     if PNG_USER_CHUNK_MALLOC_MAX > 0 /* default to compile-time limit */
       create_struct.user_chunk_malloc_max = PNG_USER_CHUNK_MALLOC_MAX;
+
+      /* No compile-time limit, so initialize to the system limit: */
+#     elif defined PNG_MAX_MALLOC_64K /* legacy system limit */
+      create_struct.user_chunk_malloc_max = 65536U;
+
+#     else /* modern system limit SIZE_MAX (C99) */
+      create_struct.user_chunk_malloc_max = PNG_SIZE_MAX;
 #     endif
 #  endif
 
@@ -626,13 +655,6 @@ png_free_data(png_const_structrp png_ptr, png_inforp info_ptr, png_uint_32 mask,
    /* Free any eXIf entry */
    if (((mask & PNG_FREE_EXIF) & info_ptr->free_me) != 0)
    {
-# ifdef PNG_READ_eXIf_SUPPORTED
-      if (info_ptr->eXIf_buf)
-      {
-         png_free(png_ptr, info_ptr->eXIf_buf);
-         info_ptr->eXIf_buf = NULL;
-      }
-# endif
       if (info_ptr->exif)
       {
          png_free(png_ptr, info_ptr->exif);
@@ -822,8 +844,8 @@ png_get_copyright(png_const_structrp png_ptr)
    return PNG_STRING_COPYRIGHT
 #else
    return PNG_STRING_NEWLINE \
-      "libpng version 1.6.43" PNG_STRING_NEWLINE \
-      "Copyright (c) 2018-2024 Cosmin Truta" PNG_STRING_NEWLINE \
+      "libpng version 1.6.47" PNG_STRING_NEWLINE \
+      "Copyright (c) 2018-2025 Cosmin Truta" PNG_STRING_NEWLINE \
       "Copyright (c) 1998-2002,2004,2006-2018 Glenn Randers-Pehrson" \
       PNG_STRING_NEWLINE \
       "Copyright (c) 1996-1997 Andreas Dilger" PNG_STRING_NEWLINE \
@@ -1067,210 +1089,132 @@ png_zstream_error(png_structrp png_ptr, int ret)
    }
 }
 
-/* png_convert_size: a PNGAPI but no longer in png.h, so deleted
- * at libpng 1.5.5!
- */
-
-/* Added at libpng version 1.2.34 and 1.4.0 (moved from pngset.c) */
-#ifdef PNG_GAMMA_SUPPORTED /* always set if COLORSPACE */
-static int
-png_colorspace_check_gamma(png_const_structrp png_ptr,
-    png_colorspacerp colorspace, png_fixed_point gAMA, int from)
-   /* This is called to check a new gamma value against an existing one.  The
-    * routine returns false if the new gamma value should not be written.
-    *
-    * 'from' says where the new gamma value comes from:
-    *
-    *    0: the new gamma value is the libpng estimate for an ICC profile
-    *    1: the new gamma value comes from a gAMA chunk
-    *    2: the new gamma value comes from an sRGB chunk
-    */
-{
-   png_fixed_point gtest;
-
-   if ((colorspace->flags & PNG_COLORSPACE_HAVE_GAMMA) != 0 &&
-       (png_muldiv(&gtest, colorspace->gamma, PNG_FP_1, gAMA) == 0  ||
-      png_gamma_significant(gtest) != 0))
-   {
-      /* Either this is an sRGB image, in which case the calculated gamma
-       * approximation should match, or this is an image with a profile and the
-       * value libpng calculates for the gamma of the profile does not match the
-       * value recorded in the file.  The former, sRGB, case is an error, the
-       * latter is just a warning.
-       */
-      if ((colorspace->flags & PNG_COLORSPACE_FROM_sRGB) != 0 || from == 2)
-      {
-         png_chunk_report(png_ptr, "gamma value does not match sRGB",
-             PNG_CHUNK_ERROR);
-         /* Do not overwrite an sRGB value */
-         return from == 2;
-      }
-
-      else /* sRGB tag not involved */
-      {
-         png_chunk_report(png_ptr, "gamma value does not match libpng estimate",
-             PNG_CHUNK_WARNING);
-         return from == 1;
-      }
-   }
-
-   return 1;
-}
-
-void /* PRIVATE */
-png_colorspace_set_gamma(png_const_structrp png_ptr,
-    png_colorspacerp colorspace, png_fixed_point gAMA)
-{
-   /* Changed in libpng-1.5.4 to limit the values to ensure overflow can't
-    * occur.  Since the fixed point representation is asymmetrical it is
-    * possible for 1/gamma to overflow the limit of 21474 and this means the
-    * gamma value must be at least 5/100000 and hence at most 20000.0.  For
-    * safety the limits here are a little narrower.  The values are 0.00016 to
-    * 6250.0, which are truly ridiculous gamma values (and will produce
-    * displays that are all black or all white.)
-    *
-    * In 1.6.0 this test replaces the ones in pngrutil.c, in the gAMA chunk
-    * handling code, which only required the value to be >0.
-    */
-   png_const_charp errmsg;
-
-   if (gAMA < 16 || gAMA > 625000000)
-      errmsg = "gamma value out of range";
-
-#  ifdef PNG_READ_gAMA_SUPPORTED
-   /* Allow the application to set the gamma value more than once */
-   else if ((png_ptr->mode & PNG_IS_READ_STRUCT) != 0 &&
-      (colorspace->flags & PNG_COLORSPACE_FROM_gAMA) != 0)
-      errmsg = "duplicate";
-#  endif
-
-   /* Do nothing if the colorspace is already invalid */
-   else if ((colorspace->flags & PNG_COLORSPACE_INVALID) != 0)
-      return;
-
-   else
-   {
-      if (png_colorspace_check_gamma(png_ptr, colorspace, gAMA,
-          1/*from gAMA*/) != 0)
-      {
-         /* Store this gamma value. */
-         colorspace->gamma = gAMA;
-         colorspace->flags |=
-            (PNG_COLORSPACE_HAVE_GAMMA | PNG_COLORSPACE_FROM_gAMA);
-      }
-
-      /* At present if the check_gamma test fails the gamma of the colorspace is
-       * not updated however the colorspace is not invalidated.  This
-       * corresponds to the case where the existing gamma comes from an sRGB
-       * chunk or profile.  An error message has already been output.
-       */
-      return;
-   }
-
-   /* Error exit - errmsg has been set. */
-   colorspace->flags |= PNG_COLORSPACE_INVALID;
-   png_chunk_report(png_ptr, errmsg, PNG_CHUNK_WRITE_ERROR);
-}
-
-void /* PRIVATE */
-png_colorspace_sync_info(png_const_structrp png_ptr, png_inforp info_ptr)
-{
-   if ((info_ptr->colorspace.flags & PNG_COLORSPACE_INVALID) != 0)
-   {
-      /* Everything is invalid */
-      info_ptr->valid &= ~(PNG_INFO_gAMA|PNG_INFO_cHRM|PNG_INFO_sRGB|
-         PNG_INFO_iCCP);
-
-#     ifdef PNG_COLORSPACE_SUPPORTED
-      /* Clean up the iCCP profile now if it won't be used. */
-      png_free_data(png_ptr, info_ptr, PNG_FREE_ICCP, -1/*not used*/);
-#     else
-      PNG_UNUSED(png_ptr)
-#     endif
-   }
-
-   else
-   {
-#     ifdef PNG_COLORSPACE_SUPPORTED
-      /* Leave the INFO_iCCP flag set if the pngset.c code has already set
-       * it; this allows a PNG to contain a profile which matches sRGB and
-       * yet still have that profile retrievable by the application.
-       */
-      if ((info_ptr->colorspace.flags & PNG_COLORSPACE_MATCHES_sRGB) != 0)
-         info_ptr->valid |= PNG_INFO_sRGB;
-
-      else
-         info_ptr->valid &= ~PNG_INFO_sRGB;
-
-      if ((info_ptr->colorspace.flags & PNG_COLORSPACE_HAVE_ENDPOINTS) != 0)
-         info_ptr->valid |= PNG_INFO_cHRM;
-
-      else
-         info_ptr->valid &= ~PNG_INFO_cHRM;
-#     endif
-
-      if ((info_ptr->colorspace.flags & PNG_COLORSPACE_HAVE_GAMMA) != 0)
-         info_ptr->valid |= PNG_INFO_gAMA;
-
-      else
-         info_ptr->valid &= ~PNG_INFO_gAMA;
-   }
-}
-
-#ifdef PNG_READ_SUPPORTED
-void /* PRIVATE */
-png_colorspace_sync(png_const_structrp png_ptr, png_inforp info_ptr)
-{
-   if (info_ptr == NULL) /* reduce code size; check here not in the caller */
-      return;
-
-   info_ptr->colorspace = png_ptr->colorspace;
-   png_colorspace_sync_info(png_ptr, info_ptr);
-}
-#endif
-#endif /* GAMMA */
-
 #ifdef PNG_COLORSPACE_SUPPORTED
+static png_int_32
+png_fp_add(png_int_32 addend0, png_int_32 addend1, int *error)
+{
+   /* Safely add two fixed point values setting an error flag and returning 0.5
+    * on overflow.
+    * IMPLEMENTATION NOTE: ANSI requires signed overflow not to occur, therefore
+    * relying on addition of two positive values producing a negative one is not
+    * safe.
+    */
+   if (addend0 > 0)
+   {
+      if (0x7fffffff - addend0 >= addend1)
+         return addend0+addend1;
+   }
+   else if (addend0 < 0)
+   {
+      if (-0x7fffffff - addend0 <= addend1)
+         return addend0+addend1;
+   }
+   else
+      return addend1;
+
+   *error = 1;
+   return PNG_FP_1/2;
+}
+
+static png_int_32
+png_fp_sub(png_int_32 addend0, png_int_32 addend1, int *error)
+{
+   /* As above but calculate addend0-addend1. */
+   if (addend1 > 0)
+   {
+      if (-0x7fffffff + addend1 <= addend0)
+         return addend0-addend1;
+   }
+   else if (addend1 < 0)
+   {
+      if (0x7fffffff + addend1 >= addend0)
+         return addend0-addend1;
+   }
+   else
+      return addend0;
+
+   *error = 1;
+   return PNG_FP_1/2;
+}
+
+static int
+png_safe_add(png_int_32 *addend0_and_result, png_int_32 addend1,
+      png_int_32 addend2)
+{
+   /* Safely add three integers.  Returns 0 on success, 1 on overflow.  Does not
+    * set the result on overflow.
+    */
+   int error = 0;
+   int result = png_fp_add(*addend0_and_result,
+                           png_fp_add(addend1, addend2, &error),
+                           &error);
+   if (!error) *addend0_and_result = result;
+   return error;
+}
+
 /* Added at libpng-1.5.5 to support read and write of true CIEXYZ values for
  * cHRM, as opposed to using chromaticities.  These internal APIs return
  * non-zero on a parameter error.  The X, Y and Z values are required to be
  * positive and less than 1.0.
  */
-static int
+int /* PRIVATE */
 png_xy_from_XYZ(png_xy *xy, const png_XYZ *XYZ)
 {
-   png_int_32 d, dwhite, whiteX, whiteY;
+   /* NOTE: returns 0 on success, 1 means error. */
+   png_int_32 d, dred, dgreen, dblue, dwhite, whiteX, whiteY;
 
-   d = XYZ->red_X + XYZ->red_Y + XYZ->red_Z;
-   if (png_muldiv(&xy->redx, XYZ->red_X, PNG_FP_1, d) == 0)
+   /* 'd' in each of the blocks below is just X+Y+Z for each component,
+    * x, y and z are X,Y,Z/(X+Y+Z).
+    */
+   d = XYZ->red_X;
+   if (png_safe_add(&d, XYZ->red_Y, XYZ->red_Z))
       return 1;
-   if (png_muldiv(&xy->redy, XYZ->red_Y, PNG_FP_1, d) == 0)
+   dred = d;
+   if (png_muldiv(&xy->redx, XYZ->red_X, PNG_FP_1, dred) == 0)
+      return 1;
+   if (png_muldiv(&xy->redy, XYZ->red_Y, PNG_FP_1, dred) == 0)
+      return 1;
+
+   d = XYZ->green_X;
+   if (png_safe_add(&d, XYZ->green_Y, XYZ->green_Z))
+      return 1;
+   dgreen = d;
+   if (png_muldiv(&xy->greenx, XYZ->green_X, PNG_FP_1, dgreen) == 0)
+      return 1;
+   if (png_muldiv(&xy->greeny, XYZ->green_Y, PNG_FP_1, dgreen) == 0)
+      return 1;
+
+   d = XYZ->blue_X;
+   if (png_safe_add(&d, XYZ->blue_Y, XYZ->blue_Z))
+      return 1;
+   dblue = d;
+   if (png_muldiv(&xy->bluex, XYZ->blue_X, PNG_FP_1, dblue) == 0)
+      return 1;
+   if (png_muldiv(&xy->bluey, XYZ->blue_Y, PNG_FP_1, dblue) == 0)
+      return 1;
+
+   /* The reference white is simply the sum of the end-point (X,Y,Z) vectors so
+    * the fillowing calculates (X+Y+Z) of the reference white (media white,
+    * encoding white) itself:
+    */
+   d = dblue;
+   if (png_safe_add(&d, dred, dgreen))
       return 1;
    dwhite = d;
-   whiteX = XYZ->red_X;
-   whiteY = XYZ->red_Y;
 
-   d = XYZ->green_X + XYZ->green_Y + XYZ->green_Z;
-   if (png_muldiv(&xy->greenx, XYZ->green_X, PNG_FP_1, d) == 0)
-      return 1;
-   if (png_muldiv(&xy->greeny, XYZ->green_Y, PNG_FP_1, d) == 0)
-      return 1;
-   dwhite += d;
-   whiteX += XYZ->green_X;
-   whiteY += XYZ->green_Y;
-
-   d = XYZ->blue_X + XYZ->blue_Y + XYZ->blue_Z;
-   if (png_muldiv(&xy->bluex, XYZ->blue_X, PNG_FP_1, d) == 0)
-      return 1;
-   if (png_muldiv(&xy->bluey, XYZ->blue_Y, PNG_FP_1, d) == 0)
-      return 1;
-   dwhite += d;
-   whiteX += XYZ->blue_X;
-   whiteY += XYZ->blue_Y;
-
-   /* The reference white is simply the sum of the end-point (X,Y,Z) vectors,
-    * thus:
+   /* Find the white X,Y values from the sum of the red, green and blue X,Y
+    * values.
     */
+   d = XYZ->red_X;
+   if (png_safe_add(&d, XYZ->green_X, XYZ->blue_X))
+      return 1;
+   whiteX = d;
+
+   d = XYZ->red_Y;
+   if (png_safe_add(&d, XYZ->green_Y, XYZ->blue_Y))
+      return 1;
+   whiteY = d;
+
    if (png_muldiv(&xy->whitex, whiteX, PNG_FP_1, dwhite) == 0)
       return 1;
    if (png_muldiv(&xy->whitey, whiteY, PNG_FP_1, dwhite) == 0)
@@ -1279,9 +1223,10 @@ png_xy_from_XYZ(png_xy *xy, const png_XYZ *XYZ)
    return 0;
 }
 
-static int
+int /* PRIVATE */
 png_XYZ_from_xy(png_XYZ *XYZ, const png_xy *xy)
 {
+   /* NOTE: returns 0 on success, 1 means error. */
    png_fixed_point red_inverse, green_inverse, blue_scale;
    png_fixed_point left, right, denominator;
 
@@ -1289,15 +1234,24 @@ png_XYZ_from_xy(png_XYZ *XYZ, const png_xy *xy)
     * have end points with 0 tristimulus values (these are impossible end
     * points, but they are used to cover the possible colors).  We check
     * xy->whitey against 5, not 0, to avoid a possible integer overflow.
+    *
+    * The limits here will *not* accept ACES AP0, where bluey is -7700
+    * (-0.0770) because the PNG spec itself requires the xy values to be
+    * unsigned.  whitey is also required to be 5 or more to avoid overflow.
+    *
+    * Instead the upper limits have been relaxed to accomodate ACES AP1 where
+    * redz ends up as -600 (-0.006).  ProPhotoRGB was already "in range."
+    * The new limit accomodates the AP0 and AP1 ranges for z but not AP0 redy.
     */
-   if (xy->redx   < 0 || xy->redx > PNG_FP_1) return 1;
-   if (xy->redy   < 0 || xy->redy > PNG_FP_1-xy->redx) return 1;
-   if (xy->greenx < 0 || xy->greenx > PNG_FP_1) return 1;
-   if (xy->greeny < 0 || xy->greeny > PNG_FP_1-xy->greenx) return 1;
-   if (xy->bluex  < 0 || xy->bluex > PNG_FP_1) return 1;
-   if (xy->bluey  < 0 || xy->bluey > PNG_FP_1-xy->bluex) return 1;
-   if (xy->whitex < 0 || xy->whitex > PNG_FP_1) return 1;
-   if (xy->whitey < 5 || xy->whitey > PNG_FP_1-xy->whitex) return 1;
+   const png_fixed_point fpLimit = PNG_FP_1+(PNG_FP_1/10);
+   if (xy->redx   < 0 || xy->redx > fpLimit) return 1;
+   if (xy->redy   < 0 || xy->redy > fpLimit-xy->redx) return 1;
+   if (xy->greenx < 0 || xy->greenx > fpLimit) return 1;
+   if (xy->greeny < 0 || xy->greeny > fpLimit-xy->greenx) return 1;
+   if (xy->bluex  < 0 || xy->bluex > fpLimit) return 1;
+   if (xy->bluey  < 0 || xy->bluey > fpLimit-xy->bluex) return 1;
+   if (xy->whitex < 0 || xy->whitex > fpLimit) return 1;
+   if (xy->whitey < 5 || xy->whitey > fpLimit-xy->whitex) return 1;
 
    /* The reverse calculation is more difficult because the original tristimulus
     * value had 9 independent values (red,green,blue)x(X,Y,Z) however only 8
@@ -1442,18 +1396,23 @@ png_XYZ_from_xy(png_XYZ *XYZ, const png_xy *xy)
     *  (green-x - blue-x)*(red-y - blue-y)-(green-y - blue-y)*(red-x - blue-x)
     *
     * Accuracy:
-    * The input values have 5 decimal digits of accuracy.  The values are all in
-    * the range 0 < value < 1, so simple products are in the same range but may
-    * need up to 10 decimal digits to preserve the original precision and avoid
-    * underflow.  Because we are using a 32-bit signed representation we cannot
-    * match this; the best is a little over 9 decimal digits, less than 10.
+    * The input values have 5 decimal digits of accuracy.
+    *
+    * In the previous implementation the values were all in the range 0 < value
+    * < 1, so simple products are in the same range but may need up to 10
+    * decimal digits to preserve the original precision and avoid underflow.
+    * Because we are using a 32-bit signed representation we cannot match this;
+    * the best is a little over 9 decimal digits, less than 10.
+    *
+    * This range has now been extended to allow values up to 1.1, or 110,000 in
+    * fixed point.
     *
     * The approach used here is to preserve the maximum precision within the
     * signed representation.  Because the red-scale calculation above uses the
-    * difference between two products of values that must be in the range -1..+1
-    * it is sufficient to divide the product by 7; ceil(100,000/32767*2).  The
-    * factor is irrelevant in the calculation because it is applied to both
-    * numerator and denominator.
+    * difference between two products of values that must be in the range
+    * -1.1..+1.1 it is sufficient to divide the product by 8;
+    * ceil(121,000/32767*2).  The factor is irrelevant in the calculation
+    * because it is applied to both numerator and denominator.
     *
     * Note that the values of the differences of the products of the
     * chromaticities in the above equations tend to be small, for example for
@@ -1475,49 +1434,64 @@ png_XYZ_from_xy(png_XYZ *XYZ, const png_xy *xy)
     *  Adobe Wide Gamut RGB
     *    0.258728243040113 0.724682314948566 0.016589442011321
     */
-   /* By the argument, above overflow should be impossible here. The return
-    * value of 2 indicates an internal error to the caller.
+   {
+      int error = 0;
+
+      /* By the argument above overflow should be impossible here, however the
+       * code now simply returns a failure code.  The xy subtracts in the
+       * arguments to png_muldiv are *not* checked for overflow because the
+       * checks at the start guarantee they are in the range 0..110000 and
+       * png_fixed_point is a 32-bit signed number.
+       */
+      if (png_muldiv(&left, xy->greenx-xy->bluex, xy->redy - xy->bluey, 8) == 0)
+         return 1;
+      if (png_muldiv(&right, xy->greeny-xy->bluey, xy->redx - xy->bluex, 8) ==
+            0)
+         return 1;
+      denominator = png_fp_sub(left, right, &error);
+      if (error) return 1;
+
+      /* Now find the red numerator. */
+      if (png_muldiv(&left, xy->greenx-xy->bluex, xy->whitey-xy->bluey, 8) == 0)
+         return 1;
+      if (png_muldiv(&right, xy->greeny-xy->bluey, xy->whitex-xy->bluex, 8) ==
+            0)
+         return 1;
+
+      /* Overflow is possible here and it indicates an extreme set of PNG cHRM
+       * chunk values.  This calculation actually returns the reciprocal of the
+       * scale value because this allows us to delay the multiplication of
+       * white-y into the denominator, which tends to produce a small number.
+       */
+      if (png_muldiv(&red_inverse, xy->whitey, denominator,
+                     png_fp_sub(left, right, &error)) == 0 || error ||
+          red_inverse <= xy->whitey /* r+g+b scales = white scale */)
+         return 1;
+
+      /* Similarly for green_inverse: */
+      if (png_muldiv(&left, xy->redy-xy->bluey, xy->whitex-xy->bluex, 8) == 0)
+         return 1;
+      if (png_muldiv(&right, xy->redx-xy->bluex, xy->whitey-xy->bluey, 8) == 0)
+         return 1;
+      if (png_muldiv(&green_inverse, xy->whitey, denominator,
+                     png_fp_sub(left, right, &error)) == 0 || error ||
+          green_inverse <= xy->whitey)
+         return 1;
+
+      /* And the blue scale, the checks above guarantee this can't overflow but
+       * it can still produce 0 for extreme cHRM values.
+       */
+      blue_scale = png_fp_sub(png_fp_sub(png_reciprocal(xy->whitey),
+                                         png_reciprocal(red_inverse), &error),
+                              png_reciprocal(green_inverse), &error);
+      if (error || blue_scale <= 0)
+         return 1;
+   }
+
+   /* And fill in the png_XYZ.  Again the subtracts are safe because of the
+    * checks on the xy values at the start (the subtracts just calculate the
+    * corresponding z values.)
     */
-   if (png_muldiv(&left, xy->greenx-xy->bluex, xy->redy - xy->bluey, 7) == 0)
-      return 2;
-   if (png_muldiv(&right, xy->greeny-xy->bluey, xy->redx - xy->bluex, 7) == 0)
-      return 2;
-   denominator = left - right;
-
-   /* Now find the red numerator. */
-   if (png_muldiv(&left, xy->greenx-xy->bluex, xy->whitey-xy->bluey, 7) == 0)
-      return 2;
-   if (png_muldiv(&right, xy->greeny-xy->bluey, xy->whitex-xy->bluex, 7) == 0)
-      return 2;
-
-   /* Overflow is possible here and it indicates an extreme set of PNG cHRM
-    * chunk values.  This calculation actually returns the reciprocal of the
-    * scale value because this allows us to delay the multiplication of white-y
-    * into the denominator, which tends to produce a small number.
-    */
-   if (png_muldiv(&red_inverse, xy->whitey, denominator, left-right) == 0 ||
-       red_inverse <= xy->whitey /* r+g+b scales = white scale */)
-      return 1;
-
-   /* Similarly for green_inverse: */
-   if (png_muldiv(&left, xy->redy-xy->bluey, xy->whitex-xy->bluex, 7) == 0)
-      return 2;
-   if (png_muldiv(&right, xy->redx-xy->bluex, xy->whitey-xy->bluey, 7) == 0)
-      return 2;
-   if (png_muldiv(&green_inverse, xy->whitey, denominator, left-right) == 0 ||
-       green_inverse <= xy->whitey)
-      return 1;
-
-   /* And the blue scale, the checks above guarantee this can't overflow but it
-    * can still produce 0 for extreme cHRM values.
-    */
-   blue_scale = png_reciprocal(xy->whitey) - png_reciprocal(red_inverse) -
-       png_reciprocal(green_inverse);
-   if (blue_scale <= 0)
-      return 1;
-
-
-   /* And fill in the png_XYZ: */
    if (png_muldiv(&XYZ->red_X, xy->redx, PNG_FP_1, red_inverse) == 0)
       return 1;
    if (png_muldiv(&XYZ->red_Y, xy->redy, PNG_FP_1, red_inverse) == 0)
@@ -1544,250 +1518,9 @@ png_XYZ_from_xy(png_XYZ *XYZ, const png_xy *xy)
 
    return 0; /*success*/
 }
+#endif /* COLORSPACE */
 
-static int
-png_XYZ_normalize(png_XYZ *XYZ)
-{
-   png_int_32 Y;
-
-   if (XYZ->red_Y < 0 || XYZ->green_Y < 0 || XYZ->blue_Y < 0 ||
-      XYZ->red_X < 0 || XYZ->green_X < 0 || XYZ->blue_X < 0 ||
-      XYZ->red_Z < 0 || XYZ->green_Z < 0 || XYZ->blue_Z < 0)
-      return 1;
-
-   /* Normalize by scaling so the sum of the end-point Y values is PNG_FP_1.
-    * IMPLEMENTATION NOTE: ANSI requires signed overflow not to occur, therefore
-    * relying on addition of two positive values producing a negative one is not
-    * safe.
-    */
-   Y = XYZ->red_Y;
-   if (0x7fffffff - Y < XYZ->green_X)
-      return 1;
-   Y += XYZ->green_Y;
-   if (0x7fffffff - Y < XYZ->blue_X)
-      return 1;
-   Y += XYZ->blue_Y;
-
-   if (Y != PNG_FP_1)
-   {
-      if (png_muldiv(&XYZ->red_X, XYZ->red_X, PNG_FP_1, Y) == 0)
-         return 1;
-      if (png_muldiv(&XYZ->red_Y, XYZ->red_Y, PNG_FP_1, Y) == 0)
-         return 1;
-      if (png_muldiv(&XYZ->red_Z, XYZ->red_Z, PNG_FP_1, Y) == 0)
-         return 1;
-
-      if (png_muldiv(&XYZ->green_X, XYZ->green_X, PNG_FP_1, Y) == 0)
-         return 1;
-      if (png_muldiv(&XYZ->green_Y, XYZ->green_Y, PNG_FP_1, Y) == 0)
-         return 1;
-      if (png_muldiv(&XYZ->green_Z, XYZ->green_Z, PNG_FP_1, Y) == 0)
-         return 1;
-
-      if (png_muldiv(&XYZ->blue_X, XYZ->blue_X, PNG_FP_1, Y) == 0)
-         return 1;
-      if (png_muldiv(&XYZ->blue_Y, XYZ->blue_Y, PNG_FP_1, Y) == 0)
-         return 1;
-      if (png_muldiv(&XYZ->blue_Z, XYZ->blue_Z, PNG_FP_1, Y) == 0)
-         return 1;
-   }
-
-   return 0;
-}
-
-static int
-png_colorspace_endpoints_match(const png_xy *xy1, const png_xy *xy2, int delta)
-{
-   /* Allow an error of +/-0.01 (absolute value) on each chromaticity */
-   if (PNG_OUT_OF_RANGE(xy1->whitex, xy2->whitex,delta) ||
-       PNG_OUT_OF_RANGE(xy1->whitey, xy2->whitey,delta) ||
-       PNG_OUT_OF_RANGE(xy1->redx,   xy2->redx,  delta) ||
-       PNG_OUT_OF_RANGE(xy1->redy,   xy2->redy,  delta) ||
-       PNG_OUT_OF_RANGE(xy1->greenx, xy2->greenx,delta) ||
-       PNG_OUT_OF_RANGE(xy1->greeny, xy2->greeny,delta) ||
-       PNG_OUT_OF_RANGE(xy1->bluex,  xy2->bluex, delta) ||
-       PNG_OUT_OF_RANGE(xy1->bluey,  xy2->bluey, delta))
-      return 0;
-   return 1;
-}
-
-/* Added in libpng-1.6.0, a different check for the validity of a set of cHRM
- * chunk chromaticities.  Earlier checks used to simply look for the overflow
- * condition (where the determinant of the matrix to solve for XYZ ends up zero
- * because the chromaticity values are not all distinct.)  Despite this it is
- * theoretically possible to produce chromaticities that are apparently valid
- * but that rapidly degrade to invalid, potentially crashing, sets because of
- * arithmetic inaccuracies when calculations are performed on them.  The new
- * check is to round-trip xy -> XYZ -> xy and then check that the result is
- * within a small percentage of the original.
- */
-static int
-png_colorspace_check_xy(png_XYZ *XYZ, const png_xy *xy)
-{
-   int result;
-   png_xy xy_test;
-
-   /* As a side-effect this routine also returns the XYZ endpoints. */
-   result = png_XYZ_from_xy(XYZ, xy);
-   if (result != 0)
-      return result;
-
-   result = png_xy_from_XYZ(&xy_test, XYZ);
-   if (result != 0)
-      return result;
-
-   if (png_colorspace_endpoints_match(xy, &xy_test,
-       5/*actually, the math is pretty accurate*/) != 0)
-      return 0;
-
-   /* Too much slip */
-   return 1;
-}
-
-/* This is the check going the other way.  The XYZ is modified to normalize it
- * (another side-effect) and the xy chromaticities are returned.
- */
-static int
-png_colorspace_check_XYZ(png_xy *xy, png_XYZ *XYZ)
-{
-   int result;
-   png_XYZ XYZtemp;
-
-   result = png_XYZ_normalize(XYZ);
-   if (result != 0)
-      return result;
-
-   result = png_xy_from_XYZ(xy, XYZ);
-   if (result != 0)
-      return result;
-
-   XYZtemp = *XYZ;
-   return png_colorspace_check_xy(&XYZtemp, xy);
-}
-
-/* Used to check for an endpoint match against sRGB */
-static const png_xy sRGB_xy = /* From ITU-R BT.709-3 */
-{
-   /* color      x       y */
-   /* red   */ 64000, 33000,
-   /* green */ 30000, 60000,
-   /* blue  */ 15000,  6000,
-   /* white */ 31270, 32900
-};
-
-static int
-png_colorspace_set_xy_and_XYZ(png_const_structrp png_ptr,
-    png_colorspacerp colorspace, const png_xy *xy, const png_XYZ *XYZ,
-    int preferred)
-{
-   if ((colorspace->flags & PNG_COLORSPACE_INVALID) != 0)
-      return 0;
-
-   /* The consistency check is performed on the chromaticities; this factors out
-    * variations because of the normalization (or not) of the end point Y
-    * values.
-    */
-   if (preferred < 2 &&
-       (colorspace->flags & PNG_COLORSPACE_HAVE_ENDPOINTS) != 0)
-   {
-      /* The end points must be reasonably close to any we already have.  The
-       * following allows an error of up to +/-.001
-       */
-      if (png_colorspace_endpoints_match(xy, &colorspace->end_points_xy,
-          100) == 0)
-      {
-         colorspace->flags |= PNG_COLORSPACE_INVALID;
-         png_benign_error(png_ptr, "inconsistent chromaticities");
-         return 0; /* failed */
-      }
-
-      /* Only overwrite with preferred values */
-      if (preferred == 0)
-         return 1; /* ok, but no change */
-   }
-
-   colorspace->end_points_xy = *xy;
-   colorspace->end_points_XYZ = *XYZ;
-   colorspace->flags |= PNG_COLORSPACE_HAVE_ENDPOINTS;
-
-   /* The end points are normally quoted to two decimal digits, so allow +/-0.01
-    * on this test.
-    */
-   if (png_colorspace_endpoints_match(xy, &sRGB_xy, 1000) != 0)
-      colorspace->flags |= PNG_COLORSPACE_ENDPOINTS_MATCH_sRGB;
-
-   else
-      colorspace->flags &= PNG_COLORSPACE_CANCEL(
-         PNG_COLORSPACE_ENDPOINTS_MATCH_sRGB);
-
-   return 2; /* ok and changed */
-}
-
-int /* PRIVATE */
-png_colorspace_set_chromaticities(png_const_structrp png_ptr,
-    png_colorspacerp colorspace, const png_xy *xy, int preferred)
-{
-   /* We must check the end points to ensure they are reasonable - in the past
-    * color management systems have crashed as a result of getting bogus
-    * colorant values, while this isn't the fault of libpng it is the
-    * responsibility of libpng because PNG carries the bomb and libpng is in a
-    * position to protect against it.
-    */
-   png_XYZ XYZ;
-
-   switch (png_colorspace_check_xy(&XYZ, xy))
-   {
-      case 0: /* success */
-         return png_colorspace_set_xy_and_XYZ(png_ptr, colorspace, xy, &XYZ,
-             preferred);
-
-      case 1:
-         /* We can't invert the chromaticities so we can't produce value XYZ
-          * values.  Likely as not a color management system will fail too.
-          */
-         colorspace->flags |= PNG_COLORSPACE_INVALID;
-         png_benign_error(png_ptr, "invalid chromaticities");
-         break;
-
-      default:
-         /* libpng is broken; this should be a warning but if it happens we
-          * want error reports so for the moment it is an error.
-          */
-         colorspace->flags |= PNG_COLORSPACE_INVALID;
-         png_error(png_ptr, "internal error checking chromaticities");
-   }
-
-   return 0; /* failed */
-}
-
-int /* PRIVATE */
-png_colorspace_set_endpoints(png_const_structrp png_ptr,
-    png_colorspacerp colorspace, const png_XYZ *XYZ_in, int preferred)
-{
-   png_XYZ XYZ = *XYZ_in;
-   png_xy xy;
-
-   switch (png_colorspace_check_XYZ(&xy, &XYZ))
-   {
-      case 0:
-         return png_colorspace_set_xy_and_XYZ(png_ptr, colorspace, &xy, &XYZ,
-             preferred);
-
-      case 1:
-         /* End points are invalid. */
-         colorspace->flags |= PNG_COLORSPACE_INVALID;
-         png_benign_error(png_ptr, "invalid end points");
-         break;
-
-      default:
-         colorspace->flags |= PNG_COLORSPACE_INVALID;
-         png_error(png_ptr, "internal error checking chromaticities");
-   }
-
-   return 0; /* failed */
-}
-
-#if defined(PNG_sRGB_SUPPORTED) || defined(PNG_iCCP_SUPPORTED)
+#ifdef PNG_iCCP_SUPPORTED
 /* Error message generation */
 static char
 png_icc_tag_char(png_uint_32 byte)
@@ -1827,15 +1560,12 @@ is_ICC_signature(png_alloc_size_t it)
 }
 
 static int
-png_icc_profile_error(png_const_structrp png_ptr, png_colorspacerp colorspace,
-    png_const_charp name, png_alloc_size_t value, png_const_charp reason)
+png_icc_profile_error(png_const_structrp png_ptr, png_const_charp name,
+   png_alloc_size_t value, png_const_charp reason)
 {
    size_t pos;
    char message[196]; /* see below for calculation */
 
-   if (colorspace != NULL)
-      colorspace->flags |= PNG_COLORSPACE_INVALID;
-
    pos = png_safecat(message, (sizeof message), 0, "profile '"); /* 9 chars */
    pos = png_safecat(message, pos+79, pos, name); /* Truncate to 79 chars */
    pos = png_safecat(message, (sizeof message), pos, "': "); /* +2 = 90 */
@@ -1862,109 +1592,13 @@ png_icc_profile_error(png_const_structrp png_ptr, png_colorspacerp colorspace,
    pos = png_safecat(message, (sizeof message), pos, reason);
    PNG_UNUSED(pos)
 
-   /* This is recoverable, but make it unconditionally an app_error on write to
-    * avoid writing invalid ICC profiles into PNG files (i.e., we handle them
-    * on read, with a warning, but on write unless the app turns off
-    * application errors the PNG won't be written.)
-    */
-   png_chunk_report(png_ptr, message,
-       (colorspace != NULL) ? PNG_CHUNK_ERROR : PNG_CHUNK_WRITE_ERROR);
+   png_chunk_benign_error(png_ptr, message);
 
    return 0;
 }
-#endif /* sRGB || iCCP */
+#endif /* iCCP */
 
-#ifdef PNG_sRGB_SUPPORTED
-int /* PRIVATE */
-png_colorspace_set_sRGB(png_const_structrp png_ptr, png_colorspacerp colorspace,
-    int intent)
-{
-   /* sRGB sets known gamma, end points and (from the chunk) intent. */
-   /* IMPORTANT: these are not necessarily the values found in an ICC profile
-    * because ICC profiles store values adapted to a D50 environment; it is
-    * expected that the ICC profile mediaWhitePointTag will be D50; see the
-    * checks and code elsewhere to understand this better.
-    *
-    * These XYZ values, which are accurate to 5dp, produce rgb to gray
-    * coefficients of (6968,23435,2366), which are reduced (because they add up
-    * to 32769 not 32768) to (6968,23434,2366).  These are the values that
-    * libpng has traditionally used (and are the best values given the 15bit
-    * algorithm used by the rgb to gray code.)
-    */
-   static const png_XYZ sRGB_XYZ = /* D65 XYZ (*not* the D50 adapted values!) */
-   {
-      /* color      X      Y      Z */
-      /* red   */ 41239, 21264,  1933,
-      /* green */ 35758, 71517, 11919,
-      /* blue  */ 18048,  7219, 95053
-   };
-
-   /* Do nothing if the colorspace is already invalidated. */
-   if ((colorspace->flags & PNG_COLORSPACE_INVALID) != 0)
-      return 0;
-
-   /* Check the intent, then check for existing settings.  It is valid for the
-    * PNG file to have cHRM or gAMA chunks along with sRGB, but the values must
-    * be consistent with the correct values.  If, however, this function is
-    * called below because an iCCP chunk matches sRGB then it is quite
-    * conceivable that an older app recorded incorrect gAMA and cHRM because of
-    * an incorrect calculation based on the values in the profile - this does
-    * *not* invalidate the profile (though it still produces an error, which can
-    * be ignored.)
-    */
-   if (intent < 0 || intent >= PNG_sRGB_INTENT_LAST)
-      return png_icc_profile_error(png_ptr, colorspace, "sRGB",
-          (png_alloc_size_t)intent, "invalid sRGB rendering intent");
-
-   if ((colorspace->flags & PNG_COLORSPACE_HAVE_INTENT) != 0 &&
-       colorspace->rendering_intent != intent)
-      return png_icc_profile_error(png_ptr, colorspace, "sRGB",
-         (png_alloc_size_t)intent, "inconsistent rendering intents");
-
-   if ((colorspace->flags & PNG_COLORSPACE_FROM_sRGB) != 0)
-   {
-      png_benign_error(png_ptr, "duplicate sRGB information ignored");
-      return 0;
-   }
-
-   /* If the standard sRGB cHRM chunk does not match the one from the PNG file
-    * warn but overwrite the value with the correct one.
-    */
-   if ((colorspace->flags & PNG_COLORSPACE_HAVE_ENDPOINTS) != 0 &&
-       !png_colorspace_endpoints_match(&sRGB_xy, &colorspace->end_points_xy,
-       100))
-      png_chunk_report(png_ptr, "cHRM chunk does not match sRGB",
-         PNG_CHUNK_ERROR);
-
-   /* This check is just done for the error reporting - the routine always
-    * returns true when the 'from' argument corresponds to sRGB (2).
-    */
-   (void)png_colorspace_check_gamma(png_ptr, colorspace, PNG_GAMMA_sRGB_INVERSE,
-       2/*from sRGB*/);
-
-   /* intent: bugs in GCC force 'int' to be used as the parameter type. */
-   colorspace->rendering_intent = (png_uint_16)intent;
-   colorspace->flags |= PNG_COLORSPACE_HAVE_INTENT;
-
-   /* endpoints */
-   colorspace->end_points_xy = sRGB_xy;
-   colorspace->end_points_XYZ = sRGB_XYZ;
-   colorspace->flags |=
-      (PNG_COLORSPACE_HAVE_ENDPOINTS|PNG_COLORSPACE_ENDPOINTS_MATCH_sRGB);
-
-   /* gamma */
-   colorspace->gamma = PNG_GAMMA_sRGB_INVERSE;
-   colorspace->flags |= PNG_COLORSPACE_HAVE_GAMMA;
-
-   /* Finally record that we have an sRGB profile */
-   colorspace->flags |=
-      (PNG_COLORSPACE_MATCHES_sRGB|PNG_COLORSPACE_FROM_sRGB);
-
-   return 1; /* set */
-}
-#endif /* sRGB */
-
-#ifdef PNG_iCCP_SUPPORTED
+#ifdef PNG_READ_iCCP_SUPPORTED
 /* Encoded value of D50 as an ICC XYZNumber.  From the ICC 2010 spec the value
  * is XYZ(0.9642,1.0,0.8249), which scales to:
  *
@@ -1974,21 +1608,19 @@ static const png_byte D50_nCIEXYZ[12] =
    { 0x00, 0x00, 0xf6, 0xd6, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0xd3, 0x2d };
 
 static int /* bool */
-icc_check_length(png_const_structrp png_ptr, png_colorspacerp colorspace,
-    png_const_charp name, png_uint_32 profile_length)
+icc_check_length(png_const_structrp png_ptr, png_const_charp name,
+   png_uint_32 profile_length)
 {
    if (profile_length < 132)
-      return png_icc_profile_error(png_ptr, colorspace, name, profile_length,
-          "too short");
+      return png_icc_profile_error(png_ptr, name, profile_length, "too short");
    return 1;
 }
 
-#ifdef PNG_READ_iCCP_SUPPORTED
 int /* PRIVATE */
-png_icc_check_length(png_const_structrp png_ptr, png_colorspacerp colorspace,
-    png_const_charp name, png_uint_32 profile_length)
+png_icc_check_length(png_const_structrp png_ptr, png_const_charp name,
+   png_uint_32 profile_length)
 {
-   if (!icc_check_length(png_ptr, colorspace, name, profile_length))
+   if (!icc_check_length(png_ptr, name, profile_length))
       return 0;
 
    /* This needs to be here because the 'normal' check is in
@@ -1997,30 +1629,17 @@ png_icc_check_length(png_const_structrp png_ptr, png_colorspacerp colorspace,
     * the caller supplies the profile buffer so libpng doesn't allocate it.  See
     * the call to icc_check_length below (the write case).
     */
-#  ifdef PNG_SET_USER_LIMITS_SUPPORTED
-      else if (png_ptr->user_chunk_malloc_max > 0 &&
-               png_ptr->user_chunk_malloc_max < profile_length)
-         return png_icc_profile_error(png_ptr, colorspace, name, profile_length,
-             "exceeds application limits");
-#  elif PNG_USER_CHUNK_MALLOC_MAX > 0
-      else if (PNG_USER_CHUNK_MALLOC_MAX < profile_length)
-         return png_icc_profile_error(png_ptr, colorspace, name, profile_length,
-             "exceeds libpng limits");
-#  else /* !SET_USER_LIMITS */
-      /* This will get compiled out on all 32-bit and better systems. */
-      else if (PNG_SIZE_MAX < profile_length)
-         return png_icc_profile_error(png_ptr, colorspace, name, profile_length,
-             "exceeds system limits");
-#  endif /* !SET_USER_LIMITS */
+   if (profile_length > png_chunk_max(png_ptr))
+      return png_icc_profile_error(png_ptr, name, profile_length,
+            "profile too long");
 
    return 1;
 }
-#endif /* READ_iCCP */
 
 int /* PRIVATE */
-png_icc_check_header(png_const_structrp png_ptr, png_colorspacerp colorspace,
-    png_const_charp name, png_uint_32 profile_length,
-    png_const_bytep profile/* first 132 bytes only */, int color_type)
+png_icc_check_header(png_const_structrp png_ptr, png_const_charp name,
+   png_uint_32 profile_length,
+   png_const_bytep profile/* first 132 bytes only */, int color_type)
 {
    png_uint_32 temp;
 
@@ -2031,18 +1650,18 @@ png_icc_check_header(png_const_structrp png_ptr, png_colorspacerp colorspace,
     */
    temp = png_get_uint_32(profile);
    if (temp != profile_length)
-      return png_icc_profile_error(png_ptr, colorspace, name, temp,
+      return png_icc_profile_error(png_ptr, name, temp,
           "length does not match profile");
 
    temp = (png_uint_32) (*(profile+8));
    if (temp > 3 && (profile_length & 3))
-      return png_icc_profile_error(png_ptr, colorspace, name, profile_length,
+      return png_icc_profile_error(png_ptr, name, profile_length,
           "invalid length");
 
    temp = png_get_uint_32(profile+128); /* tag count: 12 bytes/tag */
    if (temp > 357913930 || /* (2^32-4-132)/12: maximum possible tag count */
       profile_length < 132+12*temp) /* truncated tag table */
-      return png_icc_profile_error(png_ptr, colorspace, name, temp,
+      return png_icc_profile_error(png_ptr, name, temp,
           "tag count too large");
 
    /* The 'intent' must be valid or we can't store it, ICC limits the intent to
@@ -2050,14 +1669,14 @@ png_icc_check_header(png_const_structrp png_ptr, png_colorspacerp colorspace,
     */
    temp = png_get_uint_32(profile+64);
    if (temp >= 0xffff) /* The ICC limit */
-      return png_icc_profile_error(png_ptr, colorspace, name, temp,
+      return png_icc_profile_error(png_ptr, name, temp,
           "invalid rendering intent");
 
    /* This is just a warning because the profile may be valid in future
     * versions.
     */
    if (temp >= PNG_sRGB_INTENT_LAST)
-      (void)png_icc_profile_error(png_ptr, NULL, name, temp,
+      (void)png_icc_profile_error(png_ptr, name, temp,
           "intent outside defined range");
 
    /* At this point the tag table can't be checked because it hasn't necessarily
@@ -2074,7 +1693,7 @@ png_icc_check_header(png_const_structrp png_ptr, png_colorspacerp colorspace,
     */
    temp = png_get_uint_32(profile+36); /* signature 'ascp' */
    if (temp != 0x61637370)
-      return png_icc_profile_error(png_ptr, colorspace, name, temp,
+      return png_icc_profile_error(png_ptr, name, temp,
           "invalid signature");
 
    /* Currently the PCS illuminant/adopted white point (the computational
@@ -2085,7 +1704,7 @@ png_icc_check_header(png_const_structrp png_ptr, png_colorspacerp colorspace,
     * following is just a warning.
     */
    if (memcmp(profile+68, D50_nCIEXYZ, 12) != 0)
-      (void)png_icc_profile_error(png_ptr, NULL, name, 0/*no tag value*/,
+      (void)png_icc_profile_error(png_ptr, name, 0/*no tag value*/,
           "PCS illuminant is not D50");
 
    /* The PNG spec requires this:
@@ -2113,18 +1732,18 @@ png_icc_check_header(png_const_structrp png_ptr, png_colorspacerp colorspace,
    {
       case 0x52474220: /* 'RGB ' */
          if ((color_type & PNG_COLOR_MASK_COLOR) == 0)
-            return png_icc_profile_error(png_ptr, colorspace, name, temp,
+            return png_icc_profile_error(png_ptr, name, temp,
                 "RGB color space not permitted on grayscale PNG");
          break;
 
       case 0x47524159: /* 'GRAY' */
          if ((color_type & PNG_COLOR_MASK_COLOR) != 0)
-            return png_icc_profile_error(png_ptr, colorspace, name, temp,
+            return png_icc_profile_error(png_ptr, name, temp,
                 "Gray color space not permitted on RGB PNG");
          break;
 
       default:
-         return png_icc_profile_error(png_ptr, colorspace, name, temp,
+         return png_icc_profile_error(png_ptr, name, temp,
              "invalid ICC profile color space");
    }
 
@@ -2149,7 +1768,7 @@ png_icc_check_header(png_const_structrp png_ptr, png_colorspacerp colorspace,
 
       case 0x61627374: /* 'abst' */
          /* May not be embedded in an image */
-         return png_icc_profile_error(png_ptr, colorspace, name, temp,
+         return png_icc_profile_error(png_ptr, name, temp,
              "invalid embedded Abstract ICC profile");
 
       case 0x6c696e6b: /* 'link' */
@@ -2159,7 +1778,7 @@ png_icc_check_header(png_const_structrp png_ptr, png_colorspacerp colorspace,
           * therefore a DeviceLink profile should not be found embedded in a
           * PNG.
           */
-         return png_icc_profile_error(png_ptr, colorspace, name, temp,
+         return png_icc_profile_error(png_ptr, name, temp,
              "unexpected DeviceLink ICC profile class");
 
       case 0x6e6d636c: /* 'nmcl' */
@@ -2167,7 +1786,7 @@ png_icc_check_header(png_const_structrp png_ptr, png_colorspacerp colorspace,
           * contain an AToB0 tag that is open to misinterpretation.  Almost
           * certainly it will fail the tests below.
           */
-         (void)png_icc_profile_error(png_ptr, NULL, name, temp,
+         (void)png_icc_profile_error(png_ptr, name, temp,
              "unexpected NamedColor ICC profile class");
          break;
 
@@ -2177,7 +1796,7 @@ png_icc_check_header(png_const_structrp png_ptr, png_colorspacerp colorspace,
           * tag content to ensure they are backward compatible with one of the
           * understood profiles.
           */
-         (void)png_icc_profile_error(png_ptr, NULL, name, temp,
+         (void)png_icc_profile_error(png_ptr, name, temp,
              "unrecognized ICC profile class");
          break;
    }
@@ -2193,7 +1812,7 @@ png_icc_check_header(png_const_structrp png_ptr, png_colorspacerp colorspace,
          break;
 
       default:
-         return png_icc_profile_error(png_ptr, colorspace, name, temp,
+         return png_icc_profile_error(png_ptr, name, temp,
              "unexpected ICC PCS encoding");
    }
 
@@ -2201,9 +1820,9 @@ png_icc_check_header(png_const_structrp png_ptr, png_colorspacerp colorspace,
 }
 
 int /* PRIVATE */
-png_icc_check_tag_table(png_const_structrp png_ptr, png_colorspacerp colorspace,
-    png_const_charp name, png_uint_32 profile_length,
-    png_const_bytep profile /* header plus whole tag table */)
+png_icc_check_tag_table(png_const_structrp png_ptr, png_const_charp name,
+   png_uint_32 profile_length,
+   png_const_bytep profile /* header plus whole tag table */)
 {
    png_uint_32 tag_count = png_get_uint_32(profile+128);
    png_uint_32 itag;
@@ -2229,7 +1848,7 @@ png_icc_check_tag_table(png_const_structrp png_ptr, png_colorspacerp colorspace,
        * profile.
        */
       if (tag_start > profile_length || tag_length > profile_length - tag_start)
-         return png_icc_profile_error(png_ptr, colorspace, name, tag_id,
+         return png_icc_profile_error(png_ptr, name, tag_id,
              "ICC profile tag outside profile");
 
       if ((tag_start & 3) != 0)
@@ -2238,307 +1857,132 @@ png_icc_check_tag_table(png_const_structrp png_ptr, png_colorspacerp colorspace,
           * only a warning here because libpng does not care about the
           * alignment.
           */
-         (void)png_icc_profile_error(png_ptr, NULL, name, tag_id,
+         (void)png_icc_profile_error(png_ptr, name, tag_id,
              "ICC profile tag start not a multiple of 4");
       }
    }
 
    return 1; /* success, maybe with warnings */
 }
-
-#ifdef PNG_sRGB_SUPPORTED
-#if PNG_sRGB_PROFILE_CHECKS >= 0
-/* Information about the known ICC sRGB profiles */
-static const struct
-{
-   png_uint_32 adler, crc, length;
-   png_uint_32 md5[4];
-   png_byte    have_md5;
-   png_byte    is_broken;
-   png_uint_16 intent;
-
-#  define PNG_MD5(a,b,c,d) { a, b, c, d }, (a!=0)||(b!=0)||(c!=0)||(d!=0)
-#  define PNG_ICC_CHECKSUM(adler, crc, md5, intent, broke, date, length, fname)\
-      { adler, crc, length, md5, broke, intent },
-
-} png_sRGB_checks[] =
-{
-   /* This data comes from contrib/tools/checksum-icc run on downloads of
-    * all four ICC sRGB profiles from www.color.org.
-    */
-   /* adler32, crc32, MD5[4], intent, date, length, file-name */
-   PNG_ICC_CHECKSUM(0x0a3fd9f6, 0x3b8772b9,
-       PNG_MD5(0x29f83dde, 0xaff255ae, 0x7842fae4, 0xca83390d), 0, 0,
-       "2009/03/27 21:36:31", 3048, "sRGB_IEC61966-2-1_black_scaled.icc")
-
-   /* ICC sRGB v2 perceptual no black-compensation: */
-   PNG_ICC_CHECKSUM(0x4909e5e1, 0x427ebb21,
-       PNG_MD5(0xc95bd637, 0xe95d8a3b, 0x0df38f99, 0xc1320389), 1, 0,
-       "2009/03/27 21:37:45", 3052, "sRGB_IEC61966-2-1_no_black_scaling.icc")
-
-   PNG_ICC_CHECKSUM(0xfd2144a1, 0x306fd8ae,
-       PNG_MD5(0xfc663378, 0x37e2886b, 0xfd72e983, 0x8228f1b8), 0, 0,
-       "2009/08/10 17:28:01", 60988, "sRGB_v4_ICC_preference_displayclass.icc")
-
-   /* ICC sRGB v4 perceptual */
-   PNG_ICC_CHECKSUM(0x209c35d2, 0xbbef7812,
-       PNG_MD5(0x34562abf, 0x994ccd06, 0x6d2c5721, 0xd0d68c5d), 0, 0,
-       "2007/07/25 00:05:37", 60960, "sRGB_v4_ICC_preference.icc")
-
-   /* The following profiles have no known MD5 checksum. If there is a match
-    * on the (empty) MD5 the other fields are used to attempt a match and
-    * a warning is produced.  The first two of these profiles have a 'cprt' tag
-    * which suggests that they were also made by Hewlett Packard.
-    */
-   PNG_ICC_CHECKSUM(0xa054d762, 0x5d5129ce,
-       PNG_MD5(0x00000000, 0x00000000, 0x00000000, 0x00000000), 1, 0,
-       "2004/07/21 18:57:42", 3024, "sRGB_IEC61966-2-1_noBPC.icc")
-
-   /* This is a 'mntr' (display) profile with a mediaWhitePointTag that does not
-    * match the D50 PCS illuminant in the header (it is in fact the D65 values,
-    * so the white point is recorded as the un-adapted value.)  The profiles
-    * below only differ in one byte - the intent - and are basically the same as
-    * the previous profile except for the mediaWhitePointTag error and a missing
-    * chromaticAdaptationTag.
-    */
-   PNG_ICC_CHECKSUM(0xf784f3fb, 0x182ea552,
-       PNG_MD5(0x00000000, 0x00000000, 0x00000000, 0x00000000), 0, 1/*broken*/,
-       "1998/02/09 06:49:00", 3144, "HP-Microsoft sRGB v2 perceptual")
-
-   PNG_ICC_CHECKSUM(0x0398f3fc, 0xf29e526d,
-       PNG_MD5(0x00000000, 0x00000000, 0x00000000, 0x00000000), 1, 1/*broken*/,
-       "1998/02/09 06:49:00", 3144, "HP-Microsoft sRGB v2 media-relative")
-};
-
-static int
-png_compare_ICC_profile_with_sRGB(png_const_structrp png_ptr,
-    png_const_bytep profile, uLong adler)
-{
-   /* The quick check is to verify just the MD5 signature and trust the
-    * rest of the data.  Because the profile has already been verified for
-    * correctness this is safe.  png_colorspace_set_sRGB will check the 'intent'
-    * field too, so if the profile has been edited with an intent not defined
-    * by sRGB (but maybe defined by a later ICC specification) the read of
-    * the profile will fail at that point.
-    */
-
-   png_uint_32 length = 0;
-   png_uint_32 intent = 0x10000; /* invalid */
-#if PNG_sRGB_PROFILE_CHECKS > 1
-   uLong crc = 0; /* the value for 0 length data */
-#endif
-   unsigned int i;
-
-#ifdef PNG_SET_OPTION_SUPPORTED
-   /* First see if PNG_SKIP_sRGB_CHECK_PROFILE has been set to "on" */
-   if (((png_ptr->options >> PNG_SKIP_sRGB_CHECK_PROFILE) & 3) ==
-               PNG_OPTION_ON)
-      return 0;
-#endif
-
-   for (i=0; i < (sizeof png_sRGB_checks) / (sizeof png_sRGB_checks[0]); ++i)
-   {
-      if (png_get_uint_32(profile+84) == png_sRGB_checks[i].md5[0] &&
-         png_get_uint_32(profile+88) == png_sRGB_checks[i].md5[1] &&
-         png_get_uint_32(profile+92) == png_sRGB_checks[i].md5[2] &&
-         png_get_uint_32(profile+96) == png_sRGB_checks[i].md5[3])
-      {
-         /* This may be one of the old HP profiles without an MD5, in that
-          * case we can only use the length and Adler32 (note that these
-          * are not used by default if there is an MD5!)
-          */
-#        if PNG_sRGB_PROFILE_CHECKS == 0
-            if (png_sRGB_checks[i].have_md5 != 0)
-               return 1+png_sRGB_checks[i].is_broken;
-#        endif
-
-         /* Profile is unsigned or more checks have been configured in. */
-         if (length == 0)
-         {
-            length = png_get_uint_32(profile);
-            intent = png_get_uint_32(profile+64);
-         }
-
-         /* Length *and* intent must match */
-         if (length == (png_uint_32) png_sRGB_checks[i].length &&
-            intent == (png_uint_32) png_sRGB_checks[i].intent)
-         {
-            /* Now calculate the adler32 if not done already. */
-            if (adler == 0)
-            {
-               adler = adler32(0, NULL, 0);
-               adler = adler32(adler, profile, length);
-            }
-
-            if (adler == png_sRGB_checks[i].adler)
-            {
-               /* These basic checks suggest that the data has not been
-                * modified, but if the check level is more than 1 perform
-                * our own crc32 checksum on the data.
-                */
-#              if PNG_sRGB_PROFILE_CHECKS > 1
-                  if (crc == 0)
-                  {
-                     crc = crc32(0, NULL, 0);
-                     crc = crc32(crc, profile, length);
-                  }
-
-                  /* So this check must pass for the 'return' below to happen.
-                   */
-                  if (crc == png_sRGB_checks[i].crc)
-#              endif
-               {
-                  if (png_sRGB_checks[i].is_broken != 0)
-                  {
-                     /* These profiles are known to have bad data that may cause
-                      * problems if they are used, therefore attempt to
-                      * discourage their use, skip the 'have_md5' warning below,
-                      * which is made irrelevant by this error.
-                      */
-                     png_chunk_report(png_ptr, "known incorrect sRGB profile",
-                         PNG_CHUNK_ERROR);
-                  }
-
-                  /* Warn that this being done; this isn't even an error since
-                   * the profile is perfectly valid, but it would be nice if
-                   * people used the up-to-date ones.
-                   */
-                  else if (png_sRGB_checks[i].have_md5 == 0)
-                  {
-                     png_chunk_report(png_ptr,
-                         "out-of-date sRGB profile with no signature",
-                         PNG_CHUNK_WARNING);
-                  }
-
-                  return 1+png_sRGB_checks[i].is_broken;
-               }
-            }
-
-# if PNG_sRGB_PROFILE_CHECKS > 0
-         /* The signature matched, but the profile had been changed in some
-          * way.  This probably indicates a data error or uninformed hacking.
-          * Fall through to "no match".
-          */
-         png_chunk_report(png_ptr,
-             "Not recognizing known sRGB profile that has been edited",
-             PNG_CHUNK_WARNING);
-         break;
-# endif
-         }
-      }
-   }
-
-   return 0; /* no match */
-}
-
-void /* PRIVATE */
-png_icc_set_sRGB(png_const_structrp png_ptr,
-    png_colorspacerp colorspace, png_const_bytep profile, uLong adler)
-{
-   /* Is this profile one of the known ICC sRGB profiles?  If it is, just set
-    * the sRGB information.
-    */
-   if (png_compare_ICC_profile_with_sRGB(png_ptr, profile, adler) != 0)
-      (void)png_colorspace_set_sRGB(png_ptr, colorspace,
-         (int)/*already checked*/png_get_uint_32(profile+64));
-}
-#endif /* PNG_sRGB_PROFILE_CHECKS >= 0 */
-#endif /* sRGB */
-
-int /* PRIVATE */
-png_colorspace_set_ICC(png_const_structrp png_ptr, png_colorspacerp colorspace,
-    png_const_charp name, png_uint_32 profile_length, png_const_bytep profile,
-    int color_type)
-{
-   if ((colorspace->flags & PNG_COLORSPACE_INVALID) != 0)
-      return 0;
-
-   if (icc_check_length(png_ptr, colorspace, name, profile_length) != 0 &&
-       png_icc_check_header(png_ptr, colorspace, name, profile_length, profile,
-           color_type) != 0 &&
-       png_icc_check_tag_table(png_ptr, colorspace, name, profile_length,
-           profile) != 0)
-   {
-#     if defined(PNG_sRGB_SUPPORTED) && PNG_sRGB_PROFILE_CHECKS >= 0
-         /* If no sRGB support, don't try storing sRGB information */
-         png_icc_set_sRGB(png_ptr, colorspace, profile, 0);
-#     endif
-      return 1;
-   }
-
-   /* Failure case */
-   return 0;
-}
-#endif /* iCCP */
+#endif /* READ_iCCP */
 
 #ifdef PNG_READ_RGB_TO_GRAY_SUPPORTED
-void /* PRIVATE */
-png_colorspace_set_rgb_coefficients(png_structrp png_ptr)
+#if (defined PNG_READ_mDCV_SUPPORTED) || (defined PNG_READ_cHRM_SUPPORTED)
+static int
+have_chromaticities(png_const_structrp png_ptr)
 {
-   /* Set the rgb_to_gray coefficients from the colorspace. */
-   if (png_ptr->rgb_to_gray_coefficients_set == 0 &&
-      (png_ptr->colorspace.flags & PNG_COLORSPACE_HAVE_ENDPOINTS) != 0)
+   /* Handle new PNGv3 chunks and the precedence rules to determine whether
+    * png_struct::chromaticities must be processed.  Only required for RGB to
+    * gray.
+    *
+    * mDCV: this is the mastering colour space and it is independent of the
+    *       encoding so it needs to be used regardless of the encoded space.
+    *
+    * cICP: first in priority but not yet implemented - the chromaticities come
+    *       from the 'primaries'.
+    *
+    * iCCP: not supported by libpng (so ignored)
+    *
+    * sRGB: the defaults match sRGB
+    *
+    * cHRM: calculate the coefficients
+    */
+#  ifdef PNG_READ_mDCV_SUPPORTED
+      if (png_has_chunk(png_ptr, mDCV))
+         return 1;
+#     define check_chromaticities 1
+#  endif /*mDCV*/
+
+#  ifdef PNG_READ_sRGB_SUPPORTED
+      if (png_has_chunk(png_ptr, sRGB))
+         return 0;
+#  endif /*sRGB*/
+
+#  ifdef PNG_READ_cHRM_SUPPORTED
+      if (png_has_chunk(png_ptr, cHRM))
+         return 1;
+#     define check_chromaticities 1
+#  endif /*cHRM*/
+
+   return 0; /* sRGB defaults */
+}
+#endif /* READ_mDCV || READ_cHRM */
+
+void /* PRIVATE */
+png_set_rgb_coefficients(png_structrp png_ptr)
+{
+   /* Set the rgb_to_gray coefficients from the colorspace if available.  Note
+    * that '_set' means that png_rgb_to_gray was called **and** it successfully
+    * set up the coefficients.
+    */
+   if (png_ptr->rgb_to_gray_coefficients_set == 0)
    {
-      /* png_set_background has not been called, get the coefficients from the Y
-       * values of the colorspace colorants.
-       */
-      png_fixed_point r = png_ptr->colorspace.end_points_XYZ.red_Y;
-      png_fixed_point g = png_ptr->colorspace.end_points_XYZ.green_Y;
-      png_fixed_point b = png_ptr->colorspace.end_points_XYZ.blue_Y;
-      png_fixed_point total = r+g+b;
+#  if check_chromaticities
+      png_XYZ xyz;
 
-      if (total > 0 &&
-         r >= 0 && png_muldiv(&r, r, 32768, total) && r >= 0 && r <= 32768 &&
-         g >= 0 && png_muldiv(&g, g, 32768, total) && g >= 0 && g <= 32768 &&
-         b >= 0 && png_muldiv(&b, b, 32768, total) && b >= 0 && b <= 32768 &&
-         r+g+b <= 32769)
+      if (have_chromaticities(png_ptr) &&
+          png_XYZ_from_xy(&xyz, &png_ptr->chromaticities) == 0)
       {
-         /* We allow 0 coefficients here.  r+g+b may be 32769 if two or
-          * all of the coefficients were rounded up.  Handle this by
-          * reducing the *largest* coefficient by 1; this matches the
-          * approach used for the default coefficients in pngrtran.c
+         /* png_set_rgb_to_gray has not set the coefficients, get them from the
+          * Y * values of the colorspace colorants.
           */
-         int add = 0;
+         png_fixed_point r = xyz.red_Y;
+         png_fixed_point g = xyz.green_Y;
+         png_fixed_point b = xyz.blue_Y;
+         png_fixed_point total = r+g+b;
 
-         if (r+g+b > 32768)
-            add = -1;
-         else if (r+g+b < 32768)
-            add = 1;
-
-         if (add != 0)
+         if (total > 0 &&
+            r >= 0 && png_muldiv(&r, r, 32768, total) && r >= 0 && r <= 32768 &&
+            g >= 0 && png_muldiv(&g, g, 32768, total) && g >= 0 && g <= 32768 &&
+            b >= 0 && png_muldiv(&b, b, 32768, total) && b >= 0 && b <= 32768 &&
+            r+g+b <= 32769)
          {
-            if (g >= r && g >= b)
-               g += add;
-            else if (r >= g && r >= b)
-               r += add;
+            /* We allow 0 coefficients here.  r+g+b may be 32769 if two or
+             * all of the coefficients were rounded up.  Handle this by
+             * reducing the *largest* coefficient by 1; this matches the
+             * approach used for the default coefficients in pngrtran.c
+             */
+            int add = 0;
+
+            if (r+g+b > 32768)
+               add = -1;
+            else if (r+g+b < 32768)
+               add = 1;
+
+            if (add != 0)
+            {
+               if (g >= r && g >= b)
+                  g += add;
+               else if (r >= g && r >= b)
+                  r += add;
+               else
+                  b += add;
+            }
+
+            /* Check for an internal error. */
+            if (r+g+b != 32768)
+               png_error(png_ptr,
+                   "internal error handling cHRM coefficients");
+
             else
-               b += add;
-         }
-
-         /* Check for an internal error. */
-         if (r+g+b != 32768)
-            png_error(png_ptr,
-                "internal error handling cHRM coefficients");
-
-         else
-         {
-            png_ptr->rgb_to_gray_red_coeff   = (png_uint_16)r;
-            png_ptr->rgb_to_gray_green_coeff = (png_uint_16)g;
+            {
+               png_ptr->rgb_to_gray_red_coeff   = (png_uint_16)r;
+               png_ptr->rgb_to_gray_green_coeff = (png_uint_16)g;
+            }
          }
       }
-
-      /* This is a png_error at present even though it could be ignored -
-       * it should never happen, but it is important that if it does, the
-       * bug is fixed.
-       */
       else
-         png_error(png_ptr, "internal error handling cHRM->XYZ");
+#  endif /* check_chromaticities */
+      {
+         /* Use the historical REC 709 (etc) values: */
+         png_ptr->rgb_to_gray_red_coeff   = 6968;
+         png_ptr->rgb_to_gray_green_coeff = 23434;
+         /* png_ptr->rgb_to_gray_blue_coeff  = 2366; */
+      }
    }
 }
 #endif /* READ_RGB_TO_GRAY */
 
-#endif /* COLORSPACE */
-
 void /* PRIVATE */
 png_check_IHDR(png_const_structrp png_ptr,
     png_uint_32 width, png_uint_32 height, int bit_depth,
@@ -3320,7 +2764,27 @@ png_fixed(png_const_structrp png_ptr, double fp, png_const_charp text)
 }
 #endif
 
-#if defined(PNG_GAMMA_SUPPORTED) || defined(PNG_COLORSPACE_SUPPORTED) ||\
+#if defined(PNG_FLOATING_POINT_SUPPORTED) && \
+   !defined(PNG_FIXED_POINT_MACRO_SUPPORTED) && \
+   (defined(PNG_cLLI_SUPPORTED) || defined(PNG_mDCV_SUPPORTED))
+png_uint_32
+png_fixed_ITU(png_const_structrp png_ptr, double fp, png_const_charp text)
+{
+   double r = floor(10000 * fp + .5);
+
+   if (r > 2147483647. || r < 0)
+      png_fixed_error(png_ptr, text);
+
+#  ifndef PNG_ERROR_TEXT_SUPPORTED
+   PNG_UNUSED(text)
+#  endif
+
+   return (png_uint_32)r;
+}
+#endif
+
+
+#if defined(PNG_READ_GAMMA_SUPPORTED) || defined(PNG_COLORSPACE_SUPPORTED) ||\
     defined(PNG_INCH_CONVERSIONS_SUPPORTED) || defined(PNG_READ_pHYs_SUPPORTED)
 /* muldiv functions */
 /* This API takes signed arguments and rounds the result to the nearest
@@ -3328,7 +2792,7 @@ png_fixed(png_const_structrp png_ptr, double fp, png_const_charp text)
  * the nearest .00001).  Overflow and divide by zero are signalled in
  * the result, a boolean - true on success, false on overflow.
  */
-int
+int /* PRIVATE */
 png_muldiv(png_fixed_point_p res, png_fixed_point a, png_int_32 times,
     png_int_32 divisor)
 {
@@ -3442,27 +2906,7 @@ png_muldiv(png_fixed_point_p res, png_fixed_point a, png_int_32 times,
 
    return 0;
 }
-#endif /* READ_GAMMA || INCH_CONVERSIONS */
 
-#if defined(PNG_READ_GAMMA_SUPPORTED) || defined(PNG_INCH_CONVERSIONS_SUPPORTED)
-/* The following is for when the caller doesn't much care about the
- * result.
- */
-png_fixed_point
-png_muldiv_warn(png_const_structrp png_ptr, png_fixed_point a, png_int_32 times,
-    png_int_32 divisor)
-{
-   png_fixed_point result;
-
-   if (png_muldiv(&result, a, times, divisor) != 0)
-      return result;
-
-   png_warning(png_ptr, "fixed point overflow ignored");
-   return 0;
-}
-#endif
-
-#ifdef PNG_GAMMA_SUPPORTED /* more fixed point functions for gamma */
 /* Calculate a reciprocal, return 0 on div-by-zero or overflow. */
 png_fixed_point
 png_reciprocal(png_fixed_point a)
@@ -3481,26 +2925,38 @@ png_reciprocal(png_fixed_point a)
 
    return 0; /* error/overflow */
 }
+#endif /* READ_GAMMA || COLORSPACE || INCH_CONVERSIONS || READ_pHYS */
 
+#ifdef PNG_READ_GAMMA_SUPPORTED
 /* This is the shared test on whether a gamma value is 'significant' - whether
  * it is worth doing gamma correction.
  */
 int /* PRIVATE */
 png_gamma_significant(png_fixed_point gamma_val)
 {
+   /* sRGB:       1/2.2 == 0.4545(45)
+    * AdobeRGB:   1/(2+51/256) ~= 0.45471 5dp
+    *
+    * So the correction from AdobeRGB to sRGB (output) is:
+    *
+    *    2.2/(2+51/256) == 1.00035524
+    *
+    * I.e. vanishly small (<4E-4) but still detectable in 16-bit linear (+/-
+    * 23).  Note that the Adobe choice seems to be something intended to give an
+    * exact number with 8 binary fractional digits - it is the closest to 2.2
+    * that is possible a base 2 .8p representation.
+    */
    return gamma_val < PNG_FP_1 - PNG_GAMMA_THRESHOLD_FIXED ||
        gamma_val > PNG_FP_1 + PNG_GAMMA_THRESHOLD_FIXED;
 }
-#endif
 
-#ifdef PNG_READ_GAMMA_SUPPORTED
-#ifdef PNG_16BIT_SUPPORTED
+#ifndef PNG_FLOATING_ARITHMETIC_SUPPORTED
 /* A local convenience routine. */
 static png_fixed_point
 png_product2(png_fixed_point a, png_fixed_point b)
 {
-   /* The required result is 1/a * 1/b; the following preserves accuracy. */
-#ifdef PNG_FLOATING_ARITHMETIC_SUPPORTED
+   /* The required result is a * b; the following preserves accuracy. */
+#ifdef PNG_FLOATING_ARITHMETIC_SUPPORTED /* Should now be unused */
    double r = a * 1E-5;
    r *= b;
    r = floor(r+.5);
@@ -3516,9 +2972,8 @@ png_product2(png_fixed_point a, png_fixed_point b)
 
    return 0; /* overflow */
 }
-#endif /* 16BIT */
+#endif /* FLOATING_ARITHMETIC */
 
-/* The inverse of the above. */
 png_fixed_point
 png_reciprocal2(png_fixed_point a, png_fixed_point b)
 {
@@ -4171,10 +3626,27 @@ png_destroy_gamma_table(png_structrp png_ptr)
  * tables, we don't make a full table if we are reducing to 8-bit in
  * the future.  Note also how the gamma_16 tables are segmented so that
  * we don't need to allocate > 64K chunks for a full 16-bit table.
+ *
+ * TODO: move this to pngrtran.c and make it static.  Better yet create
+ * pngcolor.c and put all the PNG_COLORSPACE stuff in there.
  */
+#if defined(PNG_READ_BACKGROUND_SUPPORTED) || \
+   defined(PNG_READ_ALPHA_MODE_SUPPORTED) || \
+   defined(PNG_READ_RGB_TO_GRAY_SUPPORTED)
+#  define GAMMA_TRANSFORMS 1 /* #ifdef CSE */
+#else
+#  define GAMMA_TRANSFORMS 0
+#endif
+
 void /* PRIVATE */
 png_build_gamma_table(png_structrp png_ptr, int bit_depth)
 {
+   png_fixed_point file_gamma, screen_gamma;
+   png_fixed_point correction;
+#  if GAMMA_TRANSFORMS
+      png_fixed_point file_to_linear, linear_to_screen;
+#  endif
+
    png_debug(1, "in png_build_gamma_table");
 
    /* Remove any existing table; this copes with multiple calls to
@@ -4189,27 +3661,44 @@ png_build_gamma_table(png_structrp png_ptr, int bit_depth)
       png_destroy_gamma_table(png_ptr);
    }
 
+   /* The following fields are set, finally, in png_init_read_transformations.
+    * If file_gamma is 0 (unset) nothing can be done otherwise if screen_gamma
+    * is 0 (unset) there is no gamma correction but to/from linear is possible.
+    */
+   file_gamma = png_ptr->file_gamma;
+   screen_gamma = png_ptr->screen_gamma;
+#  if GAMMA_TRANSFORMS
+      file_to_linear = png_reciprocal(file_gamma);
+#  endif
+
+   if (screen_gamma > 0)
+   {
+#     if GAMMA_TRANSFORMS
+         linear_to_screen = png_reciprocal(screen_gamma);
+#     endif
+      correction = png_reciprocal2(screen_gamma, file_gamma);
+   }
+   else /* screen gamma unknown */
+   {
+#     if GAMMA_TRANSFORMS
+         linear_to_screen = file_gamma;
+#     endif
+      correction = PNG_FP_1;
+   }
+
    if (bit_depth <= 8)
    {
-      png_build_8bit_table(png_ptr, &png_ptr->gamma_table,
-          png_ptr->screen_gamma > 0 ?
-          png_reciprocal2(png_ptr->colorspace.gamma,
-          png_ptr->screen_gamma) : PNG_FP_1);
+      png_build_8bit_table(png_ptr, &png_ptr->gamma_table, correction);
 
-#if defined(PNG_READ_BACKGROUND_SUPPORTED) || \
-   defined(PNG_READ_ALPHA_MODE_SUPPORTED) || \
-   defined(PNG_READ_RGB_TO_GRAY_SUPPORTED)
+#if GAMMA_TRANSFORMS
       if ((png_ptr->transformations & (PNG_COMPOSE | PNG_RGB_TO_GRAY)) != 0)
       {
-         png_build_8bit_table(png_ptr, &png_ptr->gamma_to_1,
-             png_reciprocal(png_ptr->colorspace.gamma));
+         png_build_8bit_table(png_ptr, &png_ptr->gamma_to_1, file_to_linear);
 
          png_build_8bit_table(png_ptr, &png_ptr->gamma_from_1,
-             png_ptr->screen_gamma > 0 ?
-             png_reciprocal(png_ptr->screen_gamma) :
-             png_ptr->colorspace.gamma/* Probably doing rgb_to_gray */);
+            linear_to_screen);
       }
-#endif /* READ_BACKGROUND || READ_ALPHA_MODE || RGB_TO_GRAY */
+#endif /* GAMMA_TRANSFORMS */
    }
 #ifdef PNG_16BIT_SUPPORTED
    else
@@ -4275,32 +3764,26 @@ png_build_gamma_table(png_structrp png_ptr, int bit_depth)
        * reduced to 8 bits.
        */
       if ((png_ptr->transformations & (PNG_16_TO_8 | PNG_SCALE_16_TO_8)) != 0)
-          png_build_16to8_table(png_ptr, &png_ptr->gamma_16_table, shift,
-          png_ptr->screen_gamma > 0 ? png_product2(png_ptr->colorspace.gamma,
-          png_ptr->screen_gamma) : PNG_FP_1);
-
+         png_build_16to8_table(png_ptr, &png_ptr->gamma_16_table, shift,
+            png_reciprocal(correction));
       else
-          png_build_16bit_table(png_ptr, &png_ptr->gamma_16_table, shift,
-          png_ptr->screen_gamma > 0 ? png_reciprocal2(png_ptr->colorspace.gamma,
-          png_ptr->screen_gamma) : PNG_FP_1);
+         png_build_16bit_table(png_ptr, &png_ptr->gamma_16_table, shift,
+            correction);
 
-#if defined(PNG_READ_BACKGROUND_SUPPORTED) || \
-   defined(PNG_READ_ALPHA_MODE_SUPPORTED) || \
-   defined(PNG_READ_RGB_TO_GRAY_SUPPORTED)
+#  if GAMMA_TRANSFORMS
       if ((png_ptr->transformations & (PNG_COMPOSE | PNG_RGB_TO_GRAY)) != 0)
       {
          png_build_16bit_table(png_ptr, &png_ptr->gamma_16_to_1, shift,
-             png_reciprocal(png_ptr->colorspace.gamma));
+            file_to_linear);
 
          /* Notice that the '16 from 1' table should be full precision, however
           * the lookup on this table still uses gamma_shift, so it can't be.
           * TODO: fix this.
           */
          png_build_16bit_table(png_ptr, &png_ptr->gamma_16_from_1, shift,
-             png_ptr->screen_gamma > 0 ? png_reciprocal(png_ptr->screen_gamma) :
-             png_ptr->colorspace.gamma/* Probably doing rgb_to_gray */);
+            linear_to_screen);
       }
-#endif /* READ_BACKGROUND || READ_ALPHA_MODE || RGB_TO_GRAY */
+#endif /* GAMMA_TRANSFORMS */
    }
 #endif /* 16BIT */
 }
diff --git a/src/java.desktop/share/native/libsplashscreen/libpng/png.h b/src/java.desktop/share/native/libsplashscreen/libpng/png.h
index 9f61a773c1d..ede12c34fe6 100644
--- a/src/java.desktop/share/native/libsplashscreen/libpng/png.h
+++ b/src/java.desktop/share/native/libsplashscreen/libpng/png.h
@@ -29,9 +29,9 @@
  * However, the following notice accompanied the original version of this
  * file and, per its terms, should not be removed:
  *
- * libpng version 1.6.43
+ * libpng version 1.6.47
  *
- * Copyright (c) 2018-2024 Cosmin Truta
+ * Copyright (c) 2018-2025 Cosmin Truta
  * Copyright (c) 1998-2002,2004,2006-2018 Glenn Randers-Pehrson
  * Copyright (c) 1996-1997 Andreas Dilger
  * Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.
@@ -43,7 +43,7 @@
  *   libpng versions 0.89, June 1996, through 0.96, May 1997: Andreas Dilger
  *   libpng versions 0.97, January 1998, through 1.6.35, July 2018:
  *     Glenn Randers-Pehrson
- *   libpng versions 1.6.36, December 2018, through 1.6.43, February 2024:
+ *   libpng versions 1.6.36, December 2018, through 1.6.47, February 2025:
  *     Cosmin Truta
  *   See also "Contributing Authors", below.
  */
@@ -55,8 +55,8 @@
  * PNG Reference Library License version 2
  * ---------------------------------------
  *
- *  * Copyright (c) 1995-2024 The PNG Reference Library Authors.
- *  * Copyright (c) 2018-2024 Cosmin Truta.
+ *  * Copyright (c) 1995-2025 The PNG Reference Library Authors.
+ *  * Copyright (c) 2018-2025 Cosmin Truta.
  *  * Copyright (c) 2000-2002, 2004, 2006-2018 Glenn Randers-Pehrson.
  *  * Copyright (c) 1996-1997 Andreas Dilger.
  *  * Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.
@@ -267,7 +267,7 @@
  *    ...
  *    1.5.30                  15    10530  15.so.15.30[.0]
  *    ...
- *    1.6.43                  16    10643  16.so.16.43[.0]
+ *    1.6.47                  16    10647  16.so.16.47[.0]
  *
  *    Henceforth the source version will match the shared-library major and
  *    minor numbers; the shared-library major version number will be used for
@@ -303,7 +303,7 @@
  */
 
 /* Version information for png.h - this should match the version in png.c */
-#define PNG_LIBPNG_VER_STRING "1.6.43"
+#define PNG_LIBPNG_VER_STRING "1.6.47"
 #define PNG_HEADER_VERSION_STRING " libpng version " PNG_LIBPNG_VER_STRING "\n"
 
 /* The versions of shared library builds should stay in sync, going forward */
@@ -314,18 +314,18 @@
 /* These should match the first 3 components of PNG_LIBPNG_VER_STRING: */
 #define PNG_LIBPNG_VER_MAJOR   1
 #define PNG_LIBPNG_VER_MINOR   6
-#define PNG_LIBPNG_VER_RELEASE 43
+#define PNG_LIBPNG_VER_RELEASE 47
 
 /* This should be zero for a public release, or non-zero for a
  * development version.
  */
-#define PNG_LIBPNG_VER_BUILD  0
+#define PNG_LIBPNG_VER_BUILD 0
 
 /* Release Status */
-#define PNG_LIBPNG_BUILD_ALPHA    1
-#define PNG_LIBPNG_BUILD_BETA     2
-#define PNG_LIBPNG_BUILD_RC       3
-#define PNG_LIBPNG_BUILD_STABLE   4
+#define PNG_LIBPNG_BUILD_ALPHA               1
+#define PNG_LIBPNG_BUILD_BETA                2
+#define PNG_LIBPNG_BUILD_RC                  3
+#define PNG_LIBPNG_BUILD_STABLE              4
 #define PNG_LIBPNG_BUILD_RELEASE_STATUS_MASK 7
 
 /* Release-Specific Flags */
@@ -345,7 +345,7 @@
  * From version 1.0.1 it is:
  * XXYYZZ, where XX=major, YY=minor, ZZ=release
  */
-#define PNG_LIBPNG_VER 10643 /* 1.6.43 */
+#define PNG_LIBPNG_VER 10647 /* 1.6.47 */
 
 /* Library configuration: these options cannot be changed after
  * the library has been built.
@@ -455,7 +455,7 @@ extern "C" {
 /* This triggers a compiler error in png.c, if png.c and png.h
  * do not agree upon the version number.
  */
-typedef char* png_libpng_version_1_6_43;
+typedef char* png_libpng_version_1_6_47;
 
 /* Basic control structions.  Read libpng-manual.txt or libpng.3 for more info.
  *
@@ -773,6 +773,21 @@ typedef png_unknown_chunk * * png_unknown_chunkpp;
 #define PNG_INFO_sCAL 0x4000U  /* ESR, 1.0.6 */
 #define PNG_INFO_IDAT 0x8000U  /* ESR, 1.0.6 */
 #define PNG_INFO_eXIf 0x10000U /* GR-P, 1.6.31 */
+#define PNG_INFO_cICP 0x20000U /* PNGv3: 1.6.45 */
+#define PNG_INFO_cLLI 0x40000U /* PNGv3: 1.6.45 */
+#define PNG_INFO_mDCV 0x80000U /* PNGv3: 1.6.45 */
+/* APNG: these chunks are stored as unknown, these flags are never set
+ * however they are provided as a convenience for implementors of APNG and
+ * avoids any merge conflicts.
+ *
+ * Private chunks: these chunk names violate the chunk name recommendations
+ * because the chunk definitions have no signature and because the private
+ * chunks with these names have been reserved.  Private definitions should
+ * avoid them.
+ */
+#define PNG_INFO_acTL 0x100000U /* PNGv3: 1.6.45: unknown */
+#define PNG_INFO_fcTL 0x200000U /* PNGv3: 1.6.45: unknown */
+#define PNG_INFO_fdAT 0x400000U /* PNGv3: 1.6.45: unknown */
 
 /* This is used for the transformation routines, as some of them
  * change these values for the row.  It also should enable using
@@ -852,7 +867,7 @@ typedef PNG_CALLBACK(int, *png_user_chunk_ptr, (png_structp,
  * your compiler.  This may be very difficult - try using a different compiler
  * to build the library!
  */
-PNG_FUNCTION(void, (PNGCAPI *png_longjmp_ptr), PNGARG((jmp_buf, int)), typedef);
+PNG_FUNCTION(void, (PNGCAPI *png_longjmp_ptr), (jmp_buf, int), typedef);
 #endif
 
 /* Transform masks for the high-level interface */
@@ -2002,6 +2017,46 @@ PNG_FIXED_EXPORT(233, void, png_set_cHRM_XYZ_fixed, (png_const_structrp png_ptr,
     png_fixed_point int_blue_Z))
 #endif
 
+#ifdef PNG_cICP_SUPPORTED
+PNG_EXPORT(250, png_uint_32, png_get_cICP, (png_const_structrp png_ptr,
+    png_const_inforp info_ptr, png_bytep colour_primaries,
+    png_bytep transfer_function, png_bytep matrix_coefficients,
+    png_bytep video_full_range_flag));
+#endif
+
+#ifdef PNG_cICP_SUPPORTED
+PNG_EXPORT(251, void, png_set_cICP, (png_const_structrp png_ptr,
+    png_inforp info_ptr, png_byte colour_primaries,
+    png_byte transfer_function, png_byte matrix_coefficients,
+    png_byte video_full_range_flag));
+#endif
+
+#ifdef PNG_cLLI_SUPPORTED
+PNG_FP_EXPORT(252, png_uint_32, png_get_cLLI, (png_const_structrp png_ptr,
+         png_const_inforp info_ptr, double *maximum_content_light_level,
+         double *maximum_frame_average_light_level))
+PNG_FIXED_EXPORT(253, png_uint_32, png_get_cLLI_fixed,
+    (png_const_structrp png_ptr, png_const_inforp info_ptr,
+    /* The values below are in cd/m2 (nits) and are scaled by 10,000; not
+     * 100,000 as in the case of png_fixed_point.
+     */
+    png_uint_32p maximum_content_light_level_scaled_by_10000,
+    png_uint_32p maximum_frame_average_light_level_scaled_by_10000))
+#endif
+
+#ifdef PNG_cLLI_SUPPORTED
+PNG_FP_EXPORT(254, void, png_set_cLLI, (png_const_structrp png_ptr,
+         png_inforp info_ptr, double maximum_content_light_level,
+         double maximum_frame_average_light_level))
+PNG_FIXED_EXPORT(255, void, png_set_cLLI_fixed, (png_const_structrp png_ptr,
+    png_inforp info_ptr,
+    /* The values below are in cd/m2 (nits) and are scaled by 10,000; not
+     * 100,000 as in the case of png_fixed_point.
+     */
+    png_uint_32 maximum_content_light_level_scaled_by_10000,
+    png_uint_32 maximum_frame_average_light_level_scaled_by_10000))
+#endif
+
 #ifdef PNG_eXIf_SUPPORTED
 PNG_EXPORT(246, png_uint_32, png_get_eXIf, (png_const_structrp png_ptr,
     png_inforp info_ptr, png_bytep *exif));
@@ -2046,6 +2101,60 @@ PNG_EXPORT(144, void, png_set_IHDR, (png_const_structrp png_ptr,
     int color_type, int interlace_method, int compression_method,
     int filter_method));
 
+#ifdef PNG_mDCV_SUPPORTED
+PNG_FP_EXPORT(256, png_uint_32, png_get_mDCV, (png_const_structrp png_ptr,
+    png_const_inforp info_ptr,
+    /* The chromaticities of the mastering display.  As cHRM, but independent of
+     * the encoding endpoints in cHRM, or cICP, or iCCP.  These values will
+     * always be in the range 0 to 1.3107.
+     */
+    double *white_x, double *white_y, double *red_x, double *red_y,
+    double *green_x, double *green_y, double *blue_x, double *blue_y,
+    /* Mastering display luminance in cd/m2 (nits). */
+    double *mastering_display_maximum_luminance,
+    double *mastering_display_minimum_luminance))
+
+PNG_FIXED_EXPORT(257, png_uint_32, png_get_mDCV_fixed,
+    (png_const_structrp png_ptr, png_const_inforp info_ptr,
+    png_fixed_point *int_white_x, png_fixed_point *int_white_y,
+    png_fixed_point *int_red_x, png_fixed_point *int_red_y,
+    png_fixed_point *int_green_x, png_fixed_point *int_green_y,
+    png_fixed_point *int_blue_x, png_fixed_point *int_blue_y,
+    /* Mastering display luminance in cd/m2 (nits) multiplied (scaled) by
+     * 10,000.
+     */
+    png_uint_32p mastering_display_maximum_luminance_scaled_by_10000,
+    png_uint_32p mastering_display_minimum_luminance_scaled_by_10000))
+#endif
+
+#ifdef PNG_mDCV_SUPPORTED
+PNG_FP_EXPORT(258, void, png_set_mDCV, (png_const_structrp png_ptr,
+    png_inforp info_ptr,
+    /* The chromaticities of the mastering display.  As cHRM, but independent of
+     * the encoding endpoints in cHRM, or cICP, or iCCP.
+     */
+    double white_x, double white_y, double red_x, double red_y, double green_x,
+    double green_y, double blue_x, double blue_y,
+    /* Mastering display luminance in cd/m2 (nits). */
+    double mastering_display_maximum_luminance,
+    double mastering_display_minimum_luminance))
+
+PNG_FIXED_EXPORT(259, void, png_set_mDCV_fixed, (png_const_structrp png_ptr,
+    png_inforp info_ptr,
+    /* The admissible range of these values is not the full range of a PNG
+     * fixed point value.  Negative values cannot be encoded and the maximum
+     * value is about 1.3 */
+    png_fixed_point int_white_x, png_fixed_point int_white_y,
+    png_fixed_point int_red_x, png_fixed_point int_red_y,
+    png_fixed_point int_green_x, png_fixed_point int_green_y,
+    png_fixed_point int_blue_x, png_fixed_point int_blue_y,
+    /* These are PNG unsigned 4 byte values: 31-bit unsigned values.  The MSB
+     * must be zero.
+     */
+    png_uint_32 mastering_display_maximum_luminance_scaled_by_10000,
+    png_uint_32 mastering_display_minimum_luminance_scaled_by_10000))
+#endif
+
 #ifdef PNG_oFFs_SUPPORTED
 PNG_EXPORT(145, png_uint_32, png_get_oFFs, (png_const_structrp png_ptr,
    png_const_inforp info_ptr, png_int_32 *offset_x, png_int_32 *offset_y,
@@ -3266,7 +3375,7 @@ PNG_EXPORT(244, int, png_set_option, (png_structrp png_ptr, int option,
  * one to use is one more than this.)
  */
 #ifdef PNG_EXPORT_LAST_ORDINAL
-  PNG_EXPORT_LAST_ORDINAL(249);
+  PNG_EXPORT_LAST_ORDINAL(259);
 #endif
 
 #ifdef __cplusplus
diff --git a/src/java.desktop/share/native/libsplashscreen/libpng/pngconf.h b/src/java.desktop/share/native/libsplashscreen/libpng/pngconf.h
index b3b441b1122..70bca6fa1c9 100644
--- a/src/java.desktop/share/native/libsplashscreen/libpng/pngconf.h
+++ b/src/java.desktop/share/native/libsplashscreen/libpng/pngconf.h
@@ -29,9 +29,9 @@
  * However, the following notice accompanied the original version of this
  * file and, per its terms, should not be removed:
  *
- * libpng version 1.6.43
+ * libpng version 1.6.47
  *
- * Copyright (c) 2018-2024 Cosmin Truta
+ * Copyright (c) 2018-2025 Cosmin Truta
  * Copyright (c) 1998-2002,2004,2006-2016,2018 Glenn Randers-Pehrson
  * Copyright (c) 1996-1997 Andreas Dilger
  * Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.
@@ -116,7 +116,7 @@
 
 /* The PNGARG macro was used in versions of libpng prior to 1.6.0 to protect
  * against legacy (pre ISOC90) compilers that did not understand function
- * prototypes.  It is not required for modern C compilers.
+ * prototypes.  [Deprecated.]
  */
 #ifndef PNGARG
 #  define PNGARG(arglist) arglist
@@ -326,7 +326,7 @@
 
 #ifndef PNG_EXPORTA
 #  define PNG_EXPORTA(ordinal, type, name, args, attributes) \
-      PNG_FUNCTION(PNG_EXPORT_TYPE(type), (PNGAPI name), PNGARG(args), \
+      PNG_FUNCTION(PNG_EXPORT_TYPE(type), (PNGAPI name), args, \
       PNG_LINKAGE_API attributes)
 #endif
 
@@ -344,7 +344,7 @@
 #endif
 
 #ifndef PNG_CALLBACK
-#  define PNG_CALLBACK(type, name, args) type (PNGCBAPI name) PNGARG(args)
+#  define PNG_CALLBACK(type, name, args) type (PNGCBAPI name) args
 #endif
 
 /* Support for compiler specific function attributes.  These are used
diff --git a/src/java.desktop/share/native/libsplashscreen/libpng/pngerror.c b/src/java.desktop/share/native/libsplashscreen/libpng/pngerror.c
index ea8dd172197..ea0103331d3 100644
--- a/src/java.desktop/share/native/libsplashscreen/libpng/pngerror.c
+++ b/src/java.desktop/share/native/libsplashscreen/libpng/pngerror.c
@@ -48,13 +48,14 @@
 
 #if defined(PNG_READ_SUPPORTED) || defined(PNG_WRITE_SUPPORTED)
 
-static PNG_FUNCTION(void, png_default_error,PNGARG((png_const_structrp png_ptr,
-    png_const_charp error_message)),PNG_NORETURN);
+static PNG_FUNCTION(void /* PRIVATE */,
+png_default_error,(png_const_structrp png_ptr, png_const_charp error_message),
+    PNG_NORETURN);
 
 #ifdef PNG_WARNINGS_SUPPORTED
 static void /* PRIVATE */
-png_default_warning PNGARG((png_const_structrp png_ptr,
-    png_const_charp warning_message));
+png_default_warning(png_const_structrp png_ptr,
+    png_const_charp warning_message);
 #endif /* WARNINGS */
 
 /* This function is called whenever there is a fatal error.  This function
@@ -963,23 +964,37 @@ png_safe_warning(png_structp png_nonconst_ptr, png_const_charp warning_message)
 int /* PRIVATE */
 png_safe_execute(png_imagep image, int (*function)(png_voidp), png_voidp arg)
 {
-   png_voidp saved_error_buf = image->opaque->error_buf;
+   const png_voidp saved_error_buf = image->opaque->error_buf;
    jmp_buf safe_jmpbuf;
-   int result;
 
    /* Safely execute function(arg), with png_error returning back here. */
    if (setjmp(safe_jmpbuf) == 0)
    {
+      int result;
+
       image->opaque->error_buf = safe_jmpbuf;
       result = function(arg);
       image->opaque->error_buf = saved_error_buf;
-      return result;
+
+      if (result)
+         return 1; /* success */
    }
 
-   /* On png_error, return via longjmp, pop the jmpbuf, and free the image. */
+   /* The function failed either because of a caught png_error and a regular
+    * return of false above or because of an uncaught png_error from the
+    * function itself.  Ensure that the error_buf is always set back to the
+    * value saved above:
+    */
    image->opaque->error_buf = saved_error_buf;
-   png_image_free(image);
-   return 0;
+
+   /* On the final false return, when about to return control to the caller, the
+    * image is freed (png_image_free does this check but it is duplicated here
+    * for clarity:
+    */
+   if (saved_error_buf == NULL)
+      png_image_free(image);
+
+   return 0; /* failure */
 }
 #endif /* SIMPLIFIED READ || SIMPLIFIED_WRITE */
 #endif /* READ || WRITE */
diff --git a/src/java.desktop/share/native/libsplashscreen/libpng/pngget.c b/src/java.desktop/share/native/libsplashscreen/libpng/pngget.c
index 41e0a5abc3a..d67adbae247 100644
--- a/src/java.desktop/share/native/libsplashscreen/libpng/pngget.c
+++ b/src/java.desktop/share/native/libsplashscreen/libpng/pngget.c
@@ -409,7 +409,13 @@ png_fixed_inches_from_microns(png_const_structrp png_ptr, png_int_32 microns)
     * Notice that this can overflow - a warning is output and 0 is
     * returned.
     */
-   return png_muldiv_warn(png_ptr, microns, 500, 127);
+   png_fixed_point result;
+
+   if (png_muldiv(&result, microns, 500, 127) != 0)
+      return result;
+
+   png_warning(png_ptr, "fixed point overflow ignored");
+   return 0;
 }
 
 png_fixed_point PNGAPI
@@ -419,7 +425,7 @@ png_get_x_offset_inches_fixed(png_const_structrp png_ptr,
    return png_fixed_inches_from_microns(png_ptr,
        png_get_x_offset_microns(png_ptr, info_ptr));
 }
-#endif
+#endif /* FIXED_POINT */
 
 #ifdef PNG_FIXED_POINT_SUPPORTED
 png_fixed_point PNGAPI
@@ -547,44 +553,31 @@ png_get_bKGD(png_const_structrp png_ptr, png_inforp info_ptr,
 #  ifdef PNG_FLOATING_POINT_SUPPORTED
 png_uint_32 PNGAPI
 png_get_cHRM(png_const_structrp png_ptr, png_const_inforp info_ptr,
-    double *white_x, double *white_y, double *red_x, double *red_y,
-    double *green_x, double *green_y, double *blue_x, double *blue_y)
+    double *whitex, double *whitey, double *redx, double *redy,
+    double *greenx, double *greeny, double *bluex, double *bluey)
 {
    png_debug1(1, "in %s retrieval function", "cHRM");
 
-   /* Quiet API change: this code used to only return the end points if a cHRM
-    * chunk was present, but the end points can also come from iCCP or sRGB
-    * chunks, so in 1.6.0 the png_get_ APIs return the end points regardless and
-    * the png_set_ APIs merely check that set end points are mutually
-    * consistent.
-    */
+   /* PNGv3: this just returns the values store from the cHRM, if any. */
    if (png_ptr != NULL && info_ptr != NULL &&
-      (info_ptr->colorspace.flags & PNG_COLORSPACE_HAVE_ENDPOINTS) != 0)
+       (info_ptr->valid & PNG_INFO_cHRM) != 0)
    {
-      if (white_x != NULL)
-         *white_x = png_float(png_ptr,
-             info_ptr->colorspace.end_points_xy.whitex, "cHRM white X");
-      if (white_y != NULL)
-         *white_y = png_float(png_ptr,
-             info_ptr->colorspace.end_points_xy.whitey, "cHRM white Y");
-      if (red_x != NULL)
-         *red_x = png_float(png_ptr, info_ptr->colorspace.end_points_xy.redx,
-             "cHRM red X");
-      if (red_y != NULL)
-         *red_y = png_float(png_ptr, info_ptr->colorspace.end_points_xy.redy,
-             "cHRM red Y");
-      if (green_x != NULL)
-         *green_x = png_float(png_ptr,
-             info_ptr->colorspace.end_points_xy.greenx, "cHRM green X");
-      if (green_y != NULL)
-         *green_y = png_float(png_ptr,
-             info_ptr->colorspace.end_points_xy.greeny, "cHRM green Y");
-      if (blue_x != NULL)
-         *blue_x = png_float(png_ptr, info_ptr->colorspace.end_points_xy.bluex,
-             "cHRM blue X");
-      if (blue_y != NULL)
-         *blue_y = png_float(png_ptr, info_ptr->colorspace.end_points_xy.bluey,
-             "cHRM blue Y");
+      if (whitex != NULL)
+         *whitex = png_float(png_ptr, info_ptr->cHRM.whitex, "cHRM wx");
+      if (whitey != NULL)
+         *whitey = png_float(png_ptr, info_ptr->cHRM.whitey, "cHRM wy");
+      if (redx   != NULL)
+         *redx   = png_float(png_ptr, info_ptr->cHRM.redx,   "cHRM rx");
+      if (redy   != NULL)
+         *redy   = png_float(png_ptr, info_ptr->cHRM.redy,   "cHRM ry");
+      if (greenx != NULL)
+         *greenx = png_float(png_ptr, info_ptr->cHRM.greenx, "cHRM gx");
+      if (greeny != NULL)
+         *greeny = png_float(png_ptr, info_ptr->cHRM.greeny, "cHRM gy");
+      if (bluex  != NULL)
+         *bluex  = png_float(png_ptr, info_ptr->cHRM.bluex,  "cHRM bx");
+      if (bluey  != NULL)
+         *bluey  = png_float(png_ptr, info_ptr->cHRM.bluey,  "cHRM by");
       return PNG_INFO_cHRM;
    }
 
@@ -597,38 +590,31 @@ png_get_cHRM_XYZ(png_const_structrp png_ptr, png_const_inforp info_ptr,
     double *green_Y, double *green_Z, double *blue_X, double *blue_Y,
     double *blue_Z)
 {
+   png_XYZ XYZ;
    png_debug1(1, "in %s retrieval function", "cHRM_XYZ(float)");
 
    if (png_ptr != NULL && info_ptr != NULL &&
-       (info_ptr->colorspace.flags & PNG_COLORSPACE_HAVE_ENDPOINTS) != 0)
+       (info_ptr->valid & PNG_INFO_cHRM) != 0 &&
+       png_XYZ_from_xy(&XYZ, &info_ptr->cHRM) == 0)
    {
       if (red_X != NULL)
-         *red_X = png_float(png_ptr, info_ptr->colorspace.end_points_XYZ.red_X,
-             "cHRM red X");
+         *red_X = png_float(png_ptr, XYZ.red_X, "cHRM red X");
       if (red_Y != NULL)
-         *red_Y = png_float(png_ptr, info_ptr->colorspace.end_points_XYZ.red_Y,
-             "cHRM red Y");
+         *red_Y = png_float(png_ptr, XYZ.red_Y, "cHRM red Y");
       if (red_Z != NULL)
-         *red_Z = png_float(png_ptr, info_ptr->colorspace.end_points_XYZ.red_Z,
-             "cHRM red Z");
+         *red_Z = png_float(png_ptr, XYZ.red_Z, "cHRM red Z");
       if (green_X != NULL)
-         *green_X = png_float(png_ptr,
-             info_ptr->colorspace.end_points_XYZ.green_X, "cHRM green X");
+         *green_X = png_float(png_ptr, XYZ.green_X, "cHRM green X");
       if (green_Y != NULL)
-         *green_Y = png_float(png_ptr,
-             info_ptr->colorspace.end_points_XYZ.green_Y, "cHRM green Y");
+         *green_Y = png_float(png_ptr, XYZ.green_Y, "cHRM green Y");
       if (green_Z != NULL)
-         *green_Z = png_float(png_ptr,
-             info_ptr->colorspace.end_points_XYZ.green_Z, "cHRM green Z");
+         *green_Z = png_float(png_ptr, XYZ.green_Z, "cHRM green Z");
       if (blue_X != NULL)
-         *blue_X = png_float(png_ptr,
-             info_ptr->colorspace.end_points_XYZ.blue_X, "cHRM blue X");
+         *blue_X = png_float(png_ptr, XYZ.blue_X, "cHRM blue X");
       if (blue_Y != NULL)
-         *blue_Y = png_float(png_ptr,
-             info_ptr->colorspace.end_points_XYZ.blue_Y, "cHRM blue Y");
+         *blue_Y = png_float(png_ptr, XYZ.blue_Y, "cHRM blue Y");
       if (blue_Z != NULL)
-         *blue_Z = png_float(png_ptr,
-             info_ptr->colorspace.end_points_XYZ.blue_Z, "cHRM blue Z");
+         *blue_Z = png_float(png_ptr, XYZ.blue_Z, "cHRM blue Z");
       return PNG_INFO_cHRM;
    }
 
@@ -645,29 +631,22 @@ png_get_cHRM_XYZ_fixed(png_const_structrp png_ptr, png_const_inforp info_ptr,
     png_fixed_point *int_blue_X, png_fixed_point *int_blue_Y,
     png_fixed_point *int_blue_Z)
 {
+   png_XYZ XYZ;
    png_debug1(1, "in %s retrieval function", "cHRM_XYZ");
 
    if (png_ptr != NULL && info_ptr != NULL &&
-      (info_ptr->colorspace.flags & PNG_COLORSPACE_HAVE_ENDPOINTS) != 0)
+       (info_ptr->valid & PNG_INFO_cHRM) != 0U &&
+       png_XYZ_from_xy(&XYZ, &info_ptr->cHRM) == 0)
    {
-      if (int_red_X != NULL)
-         *int_red_X = info_ptr->colorspace.end_points_XYZ.red_X;
-      if (int_red_Y != NULL)
-         *int_red_Y = info_ptr->colorspace.end_points_XYZ.red_Y;
-      if (int_red_Z != NULL)
-         *int_red_Z = info_ptr->colorspace.end_points_XYZ.red_Z;
-      if (int_green_X != NULL)
-         *int_green_X = info_ptr->colorspace.end_points_XYZ.green_X;
-      if (int_green_Y != NULL)
-         *int_green_Y = info_ptr->colorspace.end_points_XYZ.green_Y;
-      if (int_green_Z != NULL)
-         *int_green_Z = info_ptr->colorspace.end_points_XYZ.green_Z;
-      if (int_blue_X != NULL)
-         *int_blue_X = info_ptr->colorspace.end_points_XYZ.blue_X;
-      if (int_blue_Y != NULL)
-         *int_blue_Y = info_ptr->colorspace.end_points_XYZ.blue_Y;
-      if (int_blue_Z != NULL)
-         *int_blue_Z = info_ptr->colorspace.end_points_XYZ.blue_Z;
+      if (int_red_X != NULL) *int_red_X = XYZ.red_X;
+      if (int_red_Y != NULL) *int_red_Y = XYZ.red_Y;
+      if (int_red_Z != NULL) *int_red_Z = XYZ.red_Z;
+      if (int_green_X != NULL) *int_green_X = XYZ.green_X;
+      if (int_green_Y != NULL) *int_green_Y = XYZ.green_Y;
+      if (int_green_Z != NULL) *int_green_Z = XYZ.green_Z;
+      if (int_blue_X != NULL) *int_blue_X = XYZ.blue_X;
+      if (int_blue_Y != NULL) *int_blue_Y = XYZ.blue_Y;
+      if (int_blue_Z != NULL) *int_blue_Z = XYZ.blue_Z;
       return PNG_INFO_cHRM;
    }
 
@@ -676,31 +655,24 @@ png_get_cHRM_XYZ_fixed(png_const_structrp png_ptr, png_const_inforp info_ptr,
 
 png_uint_32 PNGAPI
 png_get_cHRM_fixed(png_const_structrp png_ptr, png_const_inforp info_ptr,
-    png_fixed_point *white_x, png_fixed_point *white_y, png_fixed_point *red_x,
-    png_fixed_point *red_y, png_fixed_point *green_x, png_fixed_point *green_y,
-    png_fixed_point *blue_x, png_fixed_point *blue_y)
+    png_fixed_point *whitex, png_fixed_point *whitey, png_fixed_point *redx,
+    png_fixed_point *redy, png_fixed_point *greenx, png_fixed_point *greeny,
+    png_fixed_point *bluex, png_fixed_point *bluey)
 {
    png_debug1(1, "in %s retrieval function", "cHRM");
 
+   /* PNGv3: this just returns the values store from the cHRM, if any. */
    if (png_ptr != NULL && info_ptr != NULL &&
-      (info_ptr->colorspace.flags & PNG_COLORSPACE_HAVE_ENDPOINTS) != 0)
+       (info_ptr->valid & PNG_INFO_cHRM) != 0)
    {
-      if (white_x != NULL)
-         *white_x = info_ptr->colorspace.end_points_xy.whitex;
-      if (white_y != NULL)
-         *white_y = info_ptr->colorspace.end_points_xy.whitey;
-      if (red_x != NULL)
-         *red_x = info_ptr->colorspace.end_points_xy.redx;
-      if (red_y != NULL)
-         *red_y = info_ptr->colorspace.end_points_xy.redy;
-      if (green_x != NULL)
-         *green_x = info_ptr->colorspace.end_points_xy.greenx;
-      if (green_y != NULL)
-         *green_y = info_ptr->colorspace.end_points_xy.greeny;
-      if (blue_x != NULL)
-         *blue_x = info_ptr->colorspace.end_points_xy.bluex;
-      if (blue_y != NULL)
-         *blue_y = info_ptr->colorspace.end_points_xy.bluey;
+      if (whitex != NULL) *whitex = info_ptr->cHRM.whitex;
+      if (whitey != NULL) *whitey = info_ptr->cHRM.whitey;
+      if (redx   != NULL) *redx   = info_ptr->cHRM.redx;
+      if (redy   != NULL) *redy   = info_ptr->cHRM.redy;
+      if (greenx != NULL) *greenx = info_ptr->cHRM.greenx;
+      if (greeny != NULL) *greeny = info_ptr->cHRM.greeny;
+      if (bluex  != NULL) *bluex  = info_ptr->cHRM.bluex;
+      if (bluey  != NULL) *bluey  = info_ptr->cHRM.bluey;
       return PNG_INFO_cHRM;
    }
 
@@ -717,11 +689,11 @@ png_get_gAMA_fixed(png_const_structrp png_ptr, png_const_inforp info_ptr,
 {
    png_debug1(1, "in %s retrieval function", "gAMA");
 
+   /* PNGv3 compatibility: only report gAMA if it is really present. */
    if (png_ptr != NULL && info_ptr != NULL &&
-       (info_ptr->colorspace.flags & PNG_COLORSPACE_HAVE_GAMMA) != 0 &&
-       file_gamma != NULL)
+       (info_ptr->valid & PNG_INFO_gAMA) != 0)
    {
-      *file_gamma = info_ptr->colorspace.gamma;
+      if (file_gamma != NULL) *file_gamma = info_ptr->gamma;
       return PNG_INFO_gAMA;
    }
 
@@ -736,12 +708,13 @@ png_get_gAMA(png_const_structrp png_ptr, png_const_inforp info_ptr,
 {
    png_debug1(1, "in %s retrieval function", "gAMA(float)");
 
+   /* PNGv3 compatibility: only report gAMA if it is really present. */
    if (png_ptr != NULL && info_ptr != NULL &&
-      (info_ptr->colorspace.flags & PNG_COLORSPACE_HAVE_GAMMA) != 0 &&
-      file_gamma != NULL)
+       (info_ptr->valid & PNG_INFO_gAMA) != 0)
    {
-      *file_gamma = png_float(png_ptr, info_ptr->colorspace.gamma,
-          "png_get_gAMA");
+      if (file_gamma != NULL)
+         *file_gamma = png_float(png_ptr, info_ptr->gamma, "gAMA");
+
       return PNG_INFO_gAMA;
    }
 
@@ -758,9 +731,10 @@ png_get_sRGB(png_const_structrp png_ptr, png_const_inforp info_ptr,
    png_debug1(1, "in %s retrieval function", "sRGB");
 
    if (png_ptr != NULL && info_ptr != NULL &&
-      (info_ptr->valid & PNG_INFO_sRGB) != 0 && file_srgb_intent != NULL)
+      (info_ptr->valid & PNG_INFO_sRGB) != 0)
    {
-      *file_srgb_intent = info_ptr->colorspace.rendering_intent;
+      if (file_srgb_intent != NULL)
+         *file_srgb_intent = info_ptr->rendering_intent;
       return PNG_INFO_sRGB;
    }
 
@@ -813,6 +787,136 @@ png_get_sPLT(png_const_structrp png_ptr, png_inforp info_ptr,
 }
 #endif
 
+#ifdef PNG_cICP_SUPPORTED
+png_uint_32 PNGAPI
+png_get_cICP(png_const_structrp png_ptr,
+             png_const_inforp info_ptr, png_bytep colour_primaries,
+             png_bytep transfer_function, png_bytep matrix_coefficients,
+             png_bytep video_full_range_flag)
+{
+    png_debug1(1, "in %s retrieval function", "cICP");
+
+    if (png_ptr != NULL && info_ptr != NULL &&
+        (info_ptr->valid & PNG_INFO_cICP) != 0 &&
+        colour_primaries != NULL && transfer_function != NULL &&
+        matrix_coefficients != NULL && video_full_range_flag != NULL)
+    {
+        *colour_primaries = info_ptr->cicp_colour_primaries;
+        *transfer_function = info_ptr->cicp_transfer_function;
+        *matrix_coefficients = info_ptr->cicp_matrix_coefficients;
+        *video_full_range_flag = info_ptr->cicp_video_full_range_flag;
+        return (PNG_INFO_cICP);
+    }
+
+    return 0;
+}
+#endif
+
+#ifdef PNG_cLLI_SUPPORTED
+#  ifdef PNG_FIXED_POINT_SUPPORTED
+png_uint_32 PNGAPI
+png_get_cLLI_fixed(png_const_structrp png_ptr, png_const_inforp info_ptr,
+    png_uint_32p maxCLL,
+    png_uint_32p maxFALL)
+{
+   png_debug1(1, "in %s retrieval function", "cLLI");
+
+   if (png_ptr != NULL && info_ptr != NULL &&
+       (info_ptr->valid & PNG_INFO_cLLI) != 0)
+   {
+      if (maxCLL != NULL) *maxCLL = info_ptr->maxCLL;
+      if (maxFALL != NULL) *maxFALL = info_ptr->maxFALL;
+      return PNG_INFO_cLLI;
+   }
+
+   return 0;
+}
+#  endif
+
+#  ifdef PNG_FLOATING_POINT_SUPPORTED
+png_uint_32 PNGAPI
+png_get_cLLI(png_const_structrp png_ptr, png_const_inforp info_ptr,
+      double *maxCLL, double *maxFALL)
+{
+   png_debug1(1, "in %s retrieval function", "cLLI(float)");
+
+   if (png_ptr != NULL && info_ptr != NULL &&
+       (info_ptr->valid & PNG_INFO_cLLI) != 0)
+   {
+      if (maxCLL != NULL) *maxCLL = info_ptr->maxCLL * .0001;
+      if (maxFALL != NULL) *maxFALL = info_ptr->maxFALL * .0001;
+      return PNG_INFO_cLLI;
+   }
+
+   return 0;
+}
+#  endif
+#endif /* cLLI */
+
+#ifdef PNG_mDCV_SUPPORTED
+#  ifdef PNG_FIXED_POINT_SUPPORTED
+png_uint_32 PNGAPI
+png_get_mDCV_fixed(png_const_structrp png_ptr, png_const_inforp info_ptr,
+    png_fixed_point *white_x, png_fixed_point *white_y,
+    png_fixed_point *red_x, png_fixed_point *red_y,
+    png_fixed_point *green_x, png_fixed_point *green_y,
+    png_fixed_point *blue_x, png_fixed_point *blue_y,
+    png_uint_32p mastering_maxDL, png_uint_32p mastering_minDL)
+{
+   png_debug1(1, "in %s retrieval function", "mDCV");
+
+   if (png_ptr != NULL && info_ptr != NULL &&
+       (info_ptr->valid & PNG_INFO_mDCV) != 0)
+   {
+      if (white_x != NULL) *white_x = info_ptr->mastering_white_x * 2;
+      if (white_y != NULL) *white_y = info_ptr->mastering_white_y * 2;
+      if (red_x != NULL) *red_x = info_ptr->mastering_red_x * 2;
+      if (red_y != NULL) *red_y = info_ptr->mastering_red_y * 2;
+      if (green_x != NULL) *green_x = info_ptr->mastering_green_x * 2;
+      if (green_y != NULL) *green_y = info_ptr->mastering_green_y * 2;
+      if (blue_x != NULL) *blue_x = info_ptr->mastering_blue_x * 2;
+      if (blue_y != NULL) *blue_y = info_ptr->mastering_blue_y * 2;
+      if (mastering_maxDL != NULL) *mastering_maxDL = info_ptr->mastering_maxDL;
+      if (mastering_minDL != NULL) *mastering_minDL = info_ptr->mastering_minDL;
+      return PNG_INFO_mDCV;
+   }
+
+   return 0;
+}
+#  endif
+
+#  ifdef PNG_FLOATING_POINT_SUPPORTED
+png_uint_32 PNGAPI
+png_get_mDCV(png_const_structrp png_ptr, png_const_inforp info_ptr,
+    double *white_x, double *white_y, double *red_x, double *red_y,
+    double *green_x, double *green_y, double *blue_x, double *blue_y,
+    double *mastering_maxDL, double *mastering_minDL)
+{
+   png_debug1(1, "in %s retrieval function", "mDCV(float)");
+
+   if (png_ptr != NULL && info_ptr != NULL &&
+       (info_ptr->valid & PNG_INFO_mDCV) != 0)
+   {
+      if (white_x != NULL) *white_x = info_ptr->mastering_white_x * .00002;
+      if (white_y != NULL) *white_y = info_ptr->mastering_white_y * .00002;
+      if (red_x != NULL) *red_x = info_ptr->mastering_red_x * .00002;
+      if (red_y != NULL) *red_y = info_ptr->mastering_red_y * .00002;
+      if (green_x != NULL) *green_x = info_ptr->mastering_green_x * .00002;
+      if (green_y != NULL) *green_y = info_ptr->mastering_green_y * .00002;
+      if (blue_x != NULL) *blue_x = info_ptr->mastering_blue_x * .00002;
+      if (blue_y != NULL) *blue_y = info_ptr->mastering_blue_y * .00002;
+      if (mastering_maxDL != NULL)
+         *mastering_maxDL = info_ptr->mastering_maxDL * .0001;
+      if (mastering_minDL != NULL)
+         *mastering_minDL = info_ptr->mastering_minDL * .0001;
+      return PNG_INFO_mDCV;
+   }
+
+   return 0;
+}
+#  endif /* FLOATING_POINT */
+#endif /* mDCV */
+
 #ifdef PNG_eXIf_SUPPORTED
 png_uint_32 PNGAPI
 png_get_eXIf(png_const_structrp png_ptr, png_inforp info_ptr,
diff --git a/src/java.desktop/share/native/libsplashscreen/libpng/pnginfo.h b/src/java.desktop/share/native/libsplashscreen/libpng/pnginfo.h
index d241eaebffb..bc6ed3d09c9 100644
--- a/src/java.desktop/share/native/libsplashscreen/libpng/pnginfo.h
+++ b/src/java.desktop/share/native/libsplashscreen/libpng/pnginfo.h
@@ -115,18 +115,12 @@ struct png_info_def
     * and initialize the appropriate fields below.
     */
 
-#if defined(PNG_COLORSPACE_SUPPORTED) || defined(PNG_GAMMA_SUPPORTED)
-   /* png_colorspace only contains 'flags' if neither GAMMA or COLORSPACE are
-    * defined.  When COLORSPACE is switched on all the colorspace-defining
-    * chunks should be enabled, when GAMMA is switched on all the gamma-defining
-    * chunks should be enabled.  If this is not done it becomes possible to read
-    * inconsistent PNG files and assign a probably incorrect interpretation to
-    * the information.  (In other words, by carefully choosing which chunks to
-    * recognize the system configuration can select an interpretation for PNG
-    * files containing ambiguous data and this will result in inconsistent
-    * behavior between different libpng builds!)
-    */
-   png_colorspace colorspace;
+#ifdef PNG_cICP_SUPPORTED
+   /* cICP chunk data */
+   png_byte cicp_colour_primaries;
+   png_byte cicp_transfer_function;
+   png_byte cicp_matrix_coefficients;
+   png_byte cicp_video_full_range_flag;
 #endif
 
 #ifdef PNG_iCCP_SUPPORTED
@@ -136,6 +130,24 @@ struct png_info_def
    png_uint_32 iccp_proflen;  /* ICC profile data length */
 #endif
 
+#ifdef PNG_cLLI_SUPPORTED
+   png_uint_32 maxCLL;  /* cd/m2 (nits) * 10,000 */
+   png_uint_32 maxFALL;
+#endif
+
+#ifdef PNG_mDCV_SUPPORTED
+   png_uint_16 mastering_red_x;  /* CIE (xy) x * 50,000 */
+   png_uint_16 mastering_red_y;
+   png_uint_16 mastering_green_x;
+   png_uint_16 mastering_green_y;
+   png_uint_16 mastering_blue_x;
+   png_uint_16 mastering_blue_y;
+   png_uint_16 mastering_white_x;
+   png_uint_16 mastering_white_y;
+   png_uint_32 mastering_maxDL; /* cd/m2 (nits) * 10,000 */
+   png_uint_32 mastering_minDL;
+#endif
+
 #ifdef PNG_TEXT_SUPPORTED
    /* The tEXt, and zTXt chunks contain human-readable textual data in
     * uncompressed, compressed, and optionally compressed forms, respectively.
@@ -214,11 +226,8 @@ defined(PNG_READ_BACKGROUND_SUPPORTED)
 #endif
 
 #ifdef PNG_eXIf_SUPPORTED
-   int num_exif;  /* Added at libpng-1.6.31 */
+   png_uint_32 num_exif;  /* Added at libpng-1.6.31 */
    png_bytep exif;
-# ifdef PNG_READ_eXIf_SUPPORTED
-   png_bytep eXIf_buf;  /* Added at libpng-1.6.32 */
-# endif
 #endif
 
 #ifdef PNG_hIST_SUPPORTED
@@ -291,5 +300,16 @@ defined(PNG_READ_BACKGROUND_SUPPORTED)
    png_bytepp row_pointers;        /* the image bits */
 #endif
 
+#ifdef PNG_cHRM_SUPPORTED
+   png_xy cHRM;
+#endif
+
+#ifdef PNG_gAMA_SUPPORTED
+   png_fixed_point gamma;
+#endif
+
+#ifdef PNG_sRGB_SUPPORTED
+   int rendering_intent;
+#endif
 };
 #endif /* PNGINFO_H */
diff --git a/src/java.desktop/share/native/libsplashscreen/libpng/pnglibconf.h b/src/java.desktop/share/native/libsplashscreen/libpng/pnglibconf.h
index e238ccdb9a4..906f855db0e 100644
--- a/src/java.desktop/share/native/libsplashscreen/libpng/pnglibconf.h
+++ b/src/java.desktop/share/native/libsplashscreen/libpng/pnglibconf.h
@@ -31,9 +31,9 @@
  * However, the following notice accompanied the original version of this
  * file and, per its terms, should not be removed:
  */
-/* libpng version 1.6.43 */
+/* libpng version 1.6.47 */
 
-/* Copyright (c) 2018-2023 Cosmin Truta */
+/* Copyright (c) 2018-2025 Cosmin Truta */
 /* Copyright (c) 1998-2002,2004,2006-2018 Glenn Randers-Pehrson */
 
 /* This code is released under the libpng license. */
diff --git a/src/java.desktop/share/native/libsplashscreen/libpng/pngmem.c b/src/java.desktop/share/native/libsplashscreen/libpng/pngmem.c
index d5ad0735f37..ba9eb4df402 100644
--- a/src/java.desktop/share/native/libsplashscreen/libpng/pngmem.c
+++ b/src/java.desktop/share/native/libsplashscreen/libpng/pngmem.c
@@ -101,30 +101,29 @@ png_malloc_base,(png_const_structrp png_ptr, png_alloc_size_t size),
     * to implement a user memory handler.  This checks to be sure it isn't
     * called with big numbers.
     */
-#ifndef PNG_USER_MEM_SUPPORTED
-   PNG_UNUSED(png_ptr)
-#endif
+#  ifdef PNG_MAX_MALLOC_64K
+      /* This is support for legacy systems which had segmented addressing
+       * limiting the maximum allocation size to 65536.  It takes precedence
+       * over PNG_SIZE_MAX which is set to 65535 on true 16-bit systems.
+       *
+       * TODO: libpng-1.8: finally remove both cases.
+       */
+      if (size > 65536U) return NULL;
+#  endif
 
-   /* Some compilers complain that this is always true.  However, it
-    * can be false when integer overflow happens.
+   /* This is checked too because the system malloc call below takes a (size_t).
     */
-   if (size > 0 && size <= PNG_SIZE_MAX
-#     ifdef PNG_MAX_MALLOC_64K
-         && size <= 65536U
-#     endif
-      )
-   {
-#ifdef PNG_USER_MEM_SUPPORTED
+   if (size > PNG_SIZE_MAX) return NULL;
+
+#  ifdef PNG_USER_MEM_SUPPORTED
       if (png_ptr != NULL && png_ptr->malloc_fn != NULL)
          return png_ptr->malloc_fn(png_constcast(png_structrp,png_ptr), size);
+#  else
+      PNG_UNUSED(png_ptr)
+#  endif
 
-      else
-#endif
-         return malloc((size_t)size); /* checked for truncation above */
-   }
-
-   else
-      return NULL;
+   /* Use the system malloc */
+   return malloc((size_t)/*SAFE*/size); /* checked for truncation above */
 }
 
 #if defined(PNG_TEXT_SUPPORTED) || defined(PNG_sPLT_SUPPORTED) ||\
diff --git a/src/java.desktop/share/native/libsplashscreen/libpng/pngpread.c b/src/java.desktop/share/native/libsplashscreen/libpng/pngpread.c
index 816631cae18..86d0c7aaa64 100644
--- a/src/java.desktop/share/native/libsplashscreen/libpng/pngpread.c
+++ b/src/java.desktop/share/native/libsplashscreen/libpng/pngpread.c
@@ -60,6 +60,21 @@ if (png_ptr->push_length + 4 > png_ptr->buffer_size) \
 if (png_ptr->buffer_size < N) \
    { png_push_save_buffer(png_ptr); return; }
 
+#ifdef PNG_READ_INTERLACING_SUPPORTED
+/* Arrays to facilitate interlacing - use pass (0 - 6) as index. */
+
+/* Start of interlace block */
+static const png_byte png_pass_start[7] = {0, 4, 0, 2, 0, 1, 0};
+/* Offset to next interlace block */
+static const png_byte png_pass_inc[7] = {8, 8, 4, 4, 2, 2, 1};
+/* Start of interlace block in the y direction */
+static const png_byte png_pass_ystart[7] = {0, 0, 4, 0, 2, 0, 1};
+/* Offset to next interlace block in the y direction */
+static const png_byte png_pass_yinc[7] = {8, 8, 8, 4, 4, 2, 2};
+
+/* TODO: Move these arrays to a common utility module to avoid duplication. */
+#endif
+
 void PNGAPI
 png_process_data(png_structrp png_ptr, png_inforp info_ptr,
     png_bytep buffer, size_t buffer_size)
@@ -207,17 +222,8 @@ png_push_read_chunk(png_structrp png_ptr, png_inforp info_ptr)
     */
    if ((png_ptr->mode & PNG_HAVE_CHUNK_HEADER) == 0)
    {
-      png_byte chunk_length[4];
-      png_byte chunk_tag[4];
-
       PNG_PUSH_SAVE_BUFFER_IF_LT(8)
-      png_push_fill_buffer(png_ptr, chunk_length, 4);
-      png_ptr->push_length = png_get_uint_31(png_ptr, chunk_length);
-      png_reset_crc(png_ptr);
-      png_crc_read(png_ptr, chunk_tag, 4);
-      png_ptr->chunk_name = PNG_CHUNK_FROM_STRING(chunk_tag);
-      png_check_chunk_name(png_ptr, png_ptr->chunk_name);
-      png_check_chunk_length(png_ptr, png_ptr->push_length);
+      png_ptr->push_length = png_read_chunk_header(png_ptr);
       png_ptr->mode |= PNG_HAVE_CHUNK_HEADER;
    }
 
@@ -258,13 +264,13 @@ png_push_read_chunk(png_structrp png_ptr, png_inforp info_ptr)
          png_error(png_ptr, "Invalid IHDR length");
 
       PNG_PUSH_SAVE_BUFFER_IF_FULL
-      png_handle_IHDR(png_ptr, info_ptr, png_ptr->push_length);
+      png_handle_chunk(png_ptr, info_ptr, png_ptr->push_length);
    }
 
    else if (chunk_name == png_IEND)
    {
       PNG_PUSH_SAVE_BUFFER_IF_FULL
-      png_handle_IEND(png_ptr, info_ptr, png_ptr->push_length);
+      png_handle_chunk(png_ptr, info_ptr, png_ptr->push_length);
 
       png_ptr->process_mode = PNG_READ_DONE_MODE;
       png_push_have_end(png_ptr, info_ptr);
@@ -281,12 +287,6 @@ png_push_read_chunk(png_structrp png_ptr, png_inforp info_ptr)
    }
 #endif
 
-   else if (chunk_name == png_PLTE)
-   {
-      PNG_PUSH_SAVE_BUFFER_IF_FULL
-      png_handle_PLTE(png_ptr, info_ptr, png_ptr->push_length);
-   }
-
    else if (chunk_name == png_IDAT)
    {
       png_ptr->idat_size = png_ptr->push_length;
@@ -299,155 +299,10 @@ png_push_read_chunk(png_structrp png_ptr, png_inforp info_ptr)
       return;
    }
 
-#ifdef PNG_READ_gAMA_SUPPORTED
-   else if (png_ptr->chunk_name == png_gAMA)
-   {
-      PNG_PUSH_SAVE_BUFFER_IF_FULL
-      png_handle_gAMA(png_ptr, info_ptr, png_ptr->push_length);
-   }
-
-#endif
-#ifdef PNG_READ_sBIT_SUPPORTED
-   else if (png_ptr->chunk_name == png_sBIT)
-   {
-      PNG_PUSH_SAVE_BUFFER_IF_FULL
-      png_handle_sBIT(png_ptr, info_ptr, png_ptr->push_length);
-   }
-
-#endif
-#ifdef PNG_READ_cHRM_SUPPORTED
-   else if (png_ptr->chunk_name == png_cHRM)
-   {
-      PNG_PUSH_SAVE_BUFFER_IF_FULL
-      png_handle_cHRM(png_ptr, info_ptr, png_ptr->push_length);
-   }
-
-#endif
-#ifdef PNG_READ_eXIf_SUPPORTED
-   else if (png_ptr->chunk_name == png_eXIf)
-   {
-      PNG_PUSH_SAVE_BUFFER_IF_FULL
-      png_handle_eXIf(png_ptr, info_ptr, png_ptr->push_length);
-   }
-
-#endif
-#ifdef PNG_READ_sRGB_SUPPORTED
-   else if (chunk_name == png_sRGB)
-   {
-      PNG_PUSH_SAVE_BUFFER_IF_FULL
-      png_handle_sRGB(png_ptr, info_ptr, png_ptr->push_length);
-   }
-
-#endif
-#ifdef PNG_READ_iCCP_SUPPORTED
-   else if (png_ptr->chunk_name == png_iCCP)
-   {
-      PNG_PUSH_SAVE_BUFFER_IF_FULL
-      png_handle_iCCP(png_ptr, info_ptr, png_ptr->push_length);
-   }
-
-#endif
-#ifdef PNG_READ_sPLT_SUPPORTED
-   else if (chunk_name == png_sPLT)
-   {
-      PNG_PUSH_SAVE_BUFFER_IF_FULL
-      png_handle_sPLT(png_ptr, info_ptr, png_ptr->push_length);
-   }
-
-#endif
-#ifdef PNG_READ_tRNS_SUPPORTED
-   else if (chunk_name == png_tRNS)
-   {
-      PNG_PUSH_SAVE_BUFFER_IF_FULL
-      png_handle_tRNS(png_ptr, info_ptr, png_ptr->push_length);
-   }
-
-#endif
-#ifdef PNG_READ_bKGD_SUPPORTED
-   else if (chunk_name == png_bKGD)
-   {
-      PNG_PUSH_SAVE_BUFFER_IF_FULL
-      png_handle_bKGD(png_ptr, info_ptr, png_ptr->push_length);
-   }
-
-#endif
-#ifdef PNG_READ_hIST_SUPPORTED
-   else if (chunk_name == png_hIST)
-   {
-      PNG_PUSH_SAVE_BUFFER_IF_FULL
-      png_handle_hIST(png_ptr, info_ptr, png_ptr->push_length);
-   }
-
-#endif
-#ifdef PNG_READ_pHYs_SUPPORTED
-   else if (chunk_name == png_pHYs)
-   {
-      PNG_PUSH_SAVE_BUFFER_IF_FULL
-      png_handle_pHYs(png_ptr, info_ptr, png_ptr->push_length);
-   }
-
-#endif
-#ifdef PNG_READ_oFFs_SUPPORTED
-   else if (chunk_name == png_oFFs)
-   {
-      PNG_PUSH_SAVE_BUFFER_IF_FULL
-      png_handle_oFFs(png_ptr, info_ptr, png_ptr->push_length);
-   }
-#endif
-
-#ifdef PNG_READ_pCAL_SUPPORTED
-   else if (chunk_name == png_pCAL)
-   {
-      PNG_PUSH_SAVE_BUFFER_IF_FULL
-      png_handle_pCAL(png_ptr, info_ptr, png_ptr->push_length);
-   }
-
-#endif
-#ifdef PNG_READ_sCAL_SUPPORTED
-   else if (chunk_name == png_sCAL)
-   {
-      PNG_PUSH_SAVE_BUFFER_IF_FULL
-      png_handle_sCAL(png_ptr, info_ptr, png_ptr->push_length);
-   }
-
-#endif
-#ifdef PNG_READ_tIME_SUPPORTED
-   else if (chunk_name == png_tIME)
-   {
-      PNG_PUSH_SAVE_BUFFER_IF_FULL
-      png_handle_tIME(png_ptr, info_ptr, png_ptr->push_length);
-   }
-
-#endif
-#ifdef PNG_READ_tEXt_SUPPORTED
-   else if (chunk_name == png_tEXt)
-   {
-      PNG_PUSH_SAVE_BUFFER_IF_FULL
-      png_handle_tEXt(png_ptr, info_ptr, png_ptr->push_length);
-   }
-
-#endif
-#ifdef PNG_READ_zTXt_SUPPORTED
-   else if (chunk_name == png_zTXt)
-   {
-      PNG_PUSH_SAVE_BUFFER_IF_FULL
-      png_handle_zTXt(png_ptr, info_ptr, png_ptr->push_length);
-   }
-
-#endif
-#ifdef PNG_READ_iTXt_SUPPORTED
-   else if (chunk_name == png_iTXt)
-   {
-      PNG_PUSH_SAVE_BUFFER_IF_FULL
-      png_handle_iTXt(png_ptr, info_ptr, png_ptr->push_length);
-   }
-#endif
-
    else
    {
       PNG_PUSH_SAVE_BUFFER_IF_FULL
-      png_handle_unknown(png_ptr, info_ptr, png_ptr->push_length,
-          PNG_HANDLE_CHUNK_AS_DEFAULT);
+      png_handle_chunk(png_ptr, info_ptr, png_ptr->push_length);
    }
 
    png_ptr->mode &= ~PNG_HAVE_CHUNK_HEADER;
@@ -1004,27 +859,6 @@ png_push_process_row(png_structrp png_ptr)
 void /* PRIVATE */
 png_read_push_finish_row(png_structrp png_ptr)
 {
-#ifdef PNG_READ_INTERLACING_SUPPORTED
-   /* Arrays to facilitate easy interlacing - use pass (0 - 6) as index */
-
-   /* Start of interlace block */
-   static const png_byte png_pass_start[] = {0, 4, 0, 2, 0, 1, 0};
-
-   /* Offset to next interlace block */
-   static const png_byte png_pass_inc[] = {8, 8, 4, 4, 2, 2, 1};
-
-   /* Start of interlace block in the y direction */
-   static const png_byte png_pass_ystart[] = {0, 0, 4, 0, 2, 0, 1};
-
-   /* Offset to next interlace block in the y direction */
-   static const png_byte png_pass_yinc[] = {8, 8, 8, 4, 4, 2, 2};
-
-   /* Height of interlace block.  This is not currently used - if you need
-    * it, uncomment it here and in png.h
-   static const png_byte png_pass_height[] = {8, 8, 4, 4, 2, 2, 1};
-   */
-#endif
-
    png_ptr->row_number++;
    if (png_ptr->row_number < png_ptr->num_rows)
       return;
diff --git a/src/java.desktop/share/native/libsplashscreen/libpng/pngpriv.h b/src/java.desktop/share/native/libsplashscreen/libpng/pngpriv.h
index 18424542b00..25bac4b9e69 100644
--- a/src/java.desktop/share/native/libsplashscreen/libpng/pngpriv.h
+++ b/src/java.desktop/share/native/libsplashscreen/libpng/pngpriv.h
@@ -168,47 +168,6 @@
     * callbacks to do this.
     */
 #  define PNG_FILTER_OPTIMIZATIONS png_init_filter_functions_neon
-
-   /* By default the 'intrinsics' code in arm/filter_neon_intrinsics.c is used
-    * if possible - if __ARM_NEON__ is set and the compiler version is not known
-    * to be broken.  This is controlled by PNG_ARM_NEON_IMPLEMENTATION which can
-    * be:
-    *
-    *    1  The intrinsics code (the default with __ARM_NEON__)
-    *    2  The hand coded assembler (the default without __ARM_NEON__)
-    *
-    * It is possible to set PNG_ARM_NEON_IMPLEMENTATION in CPPFLAGS, however
-    * this is *NOT* supported and may cease to work even after a minor revision
-    * to libpng.  It *is* valid to do this for testing purposes, e.g. speed
-    * testing or a new compiler, but the results should be communicated to the
-    * libpng implementation list for incorporation in the next minor release.
-    */
-#  ifndef PNG_ARM_NEON_IMPLEMENTATION
-#     if defined(__ARM_NEON__) || defined(__ARM_NEON)
-#        if defined(__clang__)
-            /* At present it is unknown by the libpng developers which versions
-             * of clang support the intrinsics, however some or perhaps all
-             * versions do not work with the assembler so this may be
-             * irrelevant, so just use the default (do nothing here.)
-             */
-#        elif defined(__GNUC__)
-            /* GCC 4.5.4 NEON support is known to be broken.  4.6.3 is known to
-             * work, so if this *is* GCC, or G++, look for a version >4.5
-             */
-#           if __GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 6)
-#              define PNG_ARM_NEON_IMPLEMENTATION 2
-#           endif /* no GNUC support */
-#        endif /* __GNUC__ */
-#     else /* !defined __ARM_NEON__ */
-         /* The 'intrinsics' code simply won't compile without this -mfpu=neon:
-          */
-#        if !defined(__aarch64__) && !defined(_M_ARM64)
-            /* The assembler code currently does not work on ARM64 */
-#          define PNG_ARM_NEON_IMPLEMENTATION 2
-#        endif /* __aarch64__ */
-#     endif /* __ARM_NEON__ */
-#  endif /* !PNG_ARM_NEON_IMPLEMENTATION */
-
 #  ifndef PNG_ARM_NEON_IMPLEMENTATION
       /* Use the intrinsics code by default. */
 #     define PNG_ARM_NEON_IMPLEMENTATION 1
@@ -741,7 +700,7 @@
 #define PNG_FLAG_CRC_ANCILLARY_NOWARN     0x0200U
 #define PNG_FLAG_CRC_CRITICAL_USE         0x0400U
 #define PNG_FLAG_CRC_CRITICAL_IGNORE      0x0800U
-#define PNG_FLAG_ASSUME_sRGB              0x1000U /* Added to libpng-1.5.4 */
+/*      PNG_FLAG_ASSUME_sRGB unused       0x1000U  * Added to libpng-1.5.4 */
 #define PNG_FLAG_OPTIMIZE_ALPHA           0x2000U /* Added to libpng-1.5.4 */
 #define PNG_FLAG_DETECT_UNINITIALIZED     0x4000U /* Added to libpng-1.5.4 */
 /* #define PNG_FLAG_KEEP_UNKNOWN_CHUNKS      0x8000U */
@@ -852,6 +811,8 @@
 #ifdef PNG_FIXED_POINT_MACRO_SUPPORTED
 #define png_fixed(png_ptr, fp, s) ((fp) <= 21474 && (fp) >= -21474 ?\
     ((png_fixed_point)(100000 * (fp))) : (png_fixed_error(png_ptr, s),0))
+#define png_fixed_ITU(png_ptr, fp, s) ((fp) <= 214748 && (fp) >= 0 ?\
+    ((png_uint_32)(10000 * (fp))) : (png_fixed_error(png_ptr, s),0))
 #endif
 /* else the corresponding function is defined below, inside the scope of the
  * cplusplus test.
@@ -870,11 +831,31 @@
  *
  * PNG_32b correctly produces a value shifted by up to 24 bits, even on
  * architectures where (int) is only 16 bits.
+ *
+ * 1.6.47: PNG_32b was made into a preprocessor evaluable macro by replacing the
+ * static_cast with a promoting binary operation using a guaranteed 32-bit
+ * (minimum) unsigned value.
  */
-#define PNG_32b(b,s) ((png_uint_32)(b) << (s))
+#define PNG_32b(b,s) (((0xFFFFFFFFU)&(b)) << (s))
 #define PNG_U32(b1,b2,b3,b4) \
    (PNG_32b(b1,24) | PNG_32b(b2,16) | PNG_32b(b3,8) | PNG_32b(b4,0))
 
+/* Chunk name validation.  When using these macros all the arguments should be
+ * constants, otherwise code bloat may well occur.  The macros are provided
+ * primarily for use in #if checks.
+ *
+ * PNG_32to8 produces a byte value with the right shift; used to extract the
+ * byte value from a chunk name.
+ */
+#define PNG_32to8(cn,s) (((cn) >> (s)) & 0xffU)
+#define PNG_CN_VALID_UPPER(b) ((b) >= 65 && (b) <= 90) /* upper-case ASCII */
+#define PNG_CN_VALID_ASCII(b) PNG_CN_VALID_UPPER((b) & ~32U)
+#define PNG_CHUNK_NAME_VALID(cn) (\
+   PNG_CN_VALID_ASCII(PNG_32to8(cn,24)) && /* critical, !ancillary */\
+   PNG_CN_VALID_ASCII(PNG_32to8(cn,16)) && /* public, !privately defined */\
+   PNG_CN_VALID_UPPER(PNG_32to8(cn, 8)) && /* VALID, !reserved */\
+   PNG_CN_VALID_ASCII(PNG_32to8(cn, 0))   /* data-dependent, !copy ok */)
+
 /* Constants for known chunk types.
  *
  * MAINTAINERS: If you need to add a chunk, define the name here.
@@ -902,9 +883,14 @@
 #define png_IEND PNG_U32( 73,  69,  78,  68)
 #define png_IHDR PNG_U32( 73,  72,  68,  82)
 #define png_PLTE PNG_U32( 80,  76,  84,  69)
+#define png_acTL PNG_U32( 97,  99,  84,  76) /* PNGv3: APNG */
 #define png_bKGD PNG_U32( 98,  75,  71,  68)
 #define png_cHRM PNG_U32( 99,  72,  82,  77)
+#define png_cICP PNG_U32( 99,  73,  67,  80) /* PNGv3 */
+#define png_cLLI PNG_U32( 99,  76,  76,  73) /* PNGv3 */
 #define png_eXIf PNG_U32(101,  88,  73, 102) /* registered July 2017 */
+#define png_fcTL PNG_U32(102,  99,  84,  76) /* PNGv3: APNG */
+#define png_fdAT PNG_U32(102, 100,  65,  84) /* PNGv3: APNG */
 #define png_fRAc PNG_U32(102,  82,  65,  99) /* registered, not defined */
 #define png_gAMA PNG_U32(103,  65,  77,  65)
 #define png_gIFg PNG_U32(103,  73,  70, 103)
@@ -913,6 +899,7 @@
 #define png_hIST PNG_U32(104,  73,  83,  84)
 #define png_iCCP PNG_U32(105,  67,  67,  80)
 #define png_iTXt PNG_U32(105,  84,  88, 116)
+#define png_mDCV PNG_U32(109,  68,  67,  86) /* PNGv3 */
 #define png_oFFs PNG_U32(111,  70,  70, 115)
 #define png_pCAL PNG_U32(112,  67,  65,  76)
 #define png_pHYs PNG_U32(112,  72,  89, 115)
@@ -953,11 +940,74 @@
 #define PNG_CHUNK_RESERVED(c)     (1 & ((c) >> 13))
 #define PNG_CHUNK_SAFE_TO_COPY(c) (1 & ((c) >>  5))
 
+/* Known chunks.  All supported chunks must be listed here.  The macro PNG_CHUNK
+ * contains the four character ASCII name by which the chunk is identified.  The
+ * macro is implemented as required to build tables or switch statements which
+ * require entries for every known chunk.  The macro also contains an index
+ * value which should be in order (this is checked in png.c).
+ *
+ * Notice that "known" does not require "SUPPORTED"; tables should be built in
+ * such a way that chunks unsupported in a build require no more than the table
+ * entry (which should be small.)  In particular function pointers for
+ * unsupported chunks should be NULL.
+ *
+ * At present these index values are not exported (not part of the public API)
+ * so can be changed at will.  For convenience the names are in lexical sort
+ * order but with the critical chunks at the start in the order of occurence in
+ * a PNG.
+ *
+ * PNG_INFO_ values do not exist for every one of these chunk handles; for
+ * example PNG_INFO_{IDAT,IEND,tEXt,iTXt,zTXt} and possibly other chunks in the
+ * future.
+ */
+#define PNG_KNOWN_CHUNKS\
+   PNG_CHUNK(IHDR,  0)\
+   PNG_CHUNK(PLTE,  1)\
+   PNG_CHUNK(IDAT,  2)\
+   PNG_CHUNK(IEND,  3)\
+   PNG_CHUNK(acTL,  4)\
+   PNG_CHUNK(bKGD,  5)\
+   PNG_CHUNK(cHRM,  6)\
+   PNG_CHUNK(cICP,  7)\
+   PNG_CHUNK(cLLI,  8)\
+   PNG_CHUNK(eXIf,  9)\
+   PNG_CHUNK(fcTL, 10)\
+   PNG_CHUNK(fdAT, 11)\
+   PNG_CHUNK(gAMA, 12)\
+   PNG_CHUNK(hIST, 13)\
+   PNG_CHUNK(iCCP, 14)\
+   PNG_CHUNK(iTXt, 15)\
+   PNG_CHUNK(mDCV, 16)\
+   PNG_CHUNK(oFFs, 17)\
+   PNG_CHUNK(pCAL, 18)\
+   PNG_CHUNK(pHYs, 19)\
+   PNG_CHUNK(sBIT, 20)\
+   PNG_CHUNK(sCAL, 21)\
+   PNG_CHUNK(sPLT, 22)\
+   PNG_CHUNK(sRGB, 23)\
+   PNG_CHUNK(tEXt, 24)\
+   PNG_CHUNK(tIME, 25)\
+   PNG_CHUNK(tRNS, 26)\
+   PNG_CHUNK(zTXt, 27)
+
 /* Gamma values (new at libpng-1.5.4): */
 #define PNG_GAMMA_MAC_OLD 151724  /* Assume '1.8' is really 2.2/1.45! */
 #define PNG_GAMMA_MAC_INVERSE 65909
 #define PNG_GAMMA_sRGB_INVERSE 45455
 
+/* gamma sanity check.  libpng cannot implement gamma transforms outside a
+ * certain limit because of its use of 16-bit fixed point intermediate values.
+ * Gamma values that are too large or too small will zap the 16-bit values all
+ * to 0 or 65535 resulting in an obvious 'bad' image.
+ *
+ * In libpng 1.6.0 the limits were changed from 0.07..3 to 0.01..100 to
+ * accommodate the optimal 16-bit gamma of 36 and its reciprocal.
+ *
+ * These are png_fixed_point integral values:
+ */
+#define PNG_LIB_GAMMA_MIN 1000
+#define PNG_LIB_GAMMA_MAX 10000000
+
 /* Almost everything below is C specific; the #defines above can be used in
  * non-C code (so long as it is C-preprocessed) the rest of this stuff cannot.
  */
@@ -1021,7 +1071,6 @@ extern "C" {
  *
  * All of these functions must be declared with PNG_INTERNAL_FUNCTION.
  */
-
 /* Zlib support */
 #define PNG_UNEXPECTED_ZLIB_RETURN (-7)
 PNG_INTERNAL_FUNCTION(void, png_zstream_error,(png_structrp png_ptr, int ret),
@@ -1040,6 +1089,7 @@ PNG_INTERNAL_FUNCTION(void,png_free_buffer_list,(png_structrp png_ptr,
    !defined(PNG_FIXED_POINT_MACRO_SUPPORTED) && \
    (defined(PNG_gAMA_SUPPORTED) || defined(PNG_cHRM_SUPPORTED) || \
    defined(PNG_sCAL_SUPPORTED) || defined(PNG_READ_BACKGROUND_SUPPORTED) || \
+   defined(PNG_mDCV_SUPPORTED) || \
    defined(PNG_READ_RGB_TO_GRAY_SUPPORTED)) || \
    (defined(PNG_sCAL_SUPPORTED) && \
    defined(PNG_FLOATING_ARITHMETIC_SUPPORTED))
@@ -1047,12 +1097,38 @@ PNG_INTERNAL_FUNCTION(png_fixed_point,png_fixed,(png_const_structrp png_ptr,
    double fp, png_const_charp text),PNG_EMPTY);
 #endif
 
+#if defined(PNG_FLOATING_POINT_SUPPORTED) && \
+   !defined(PNG_FIXED_POINT_MACRO_SUPPORTED) && \
+   (defined(PNG_cLLI_SUPPORTED) || defined(PNG_mDCV_SUPPORTED))
+PNG_INTERNAL_FUNCTION(png_uint_32,png_fixed_ITU,(png_const_structrp png_ptr,
+   double fp, png_const_charp text),PNG_EMPTY);
+#endif
+
 /* Check the user version string for compatibility, returns false if the version
  * numbers aren't compatible.
  */
 PNG_INTERNAL_FUNCTION(int,png_user_version_check,(png_structrp png_ptr,
    png_const_charp user_png_ver),PNG_EMPTY);
 
+#ifdef PNG_READ_SUPPORTED /* should only be used on read */
+/* Security: read limits on the largest allocations while reading a PNG.  This
+ * avoids very large allocations caused by PNG files with damaged or altered
+ * chunk 'length' fields.
+ */
+#ifdef PNG_SET_USER_LIMITS_SUPPORTED /* run-time limit */
+#  define png_chunk_max(png_ptr) ((png_ptr)->user_chunk_malloc_max)
+
+#elif PNG_USER_CHUNK_MALLOC_MAX > 0 /* compile-time limit */
+#  define png_chunk_max(png_ptr) ((void)png_ptr, PNG_USER_CHUNK_MALLOC_MAX)
+
+#elif (defined PNG_MAX_MALLOC_64K)  /* legacy system limit */
+#  define png_chunk_max(png_ptr) ((void)png_ptr, 65536U)
+
+#else                               /* modern system limit SIZE_MAX (C99) */
+#  define png_chunk_max(png_ptr) ((void)png_ptr, PNG_SIZE_MAX)
+#endif
+#endif /* READ */
+
 /* Internal base allocator - no messages, NULL on failure to allocate.  This
  * does, however, call the application provided allocator and that could call
  * png_error (although that would be a bug in the application implementation.)
@@ -1152,9 +1228,6 @@ PNG_INTERNAL_FUNCTION(void,png_crc_read,(png_structrp png_ptr, png_bytep buf,
 PNG_INTERNAL_FUNCTION(int,png_crc_finish,(png_structrp png_ptr,
    png_uint_32 skip),PNG_EMPTY);
 
-/* Read the CRC from the file and compare it to the libpng calculated CRC */
-PNG_INTERNAL_FUNCTION(int,png_crc_error,(png_structrp png_ptr),PNG_EMPTY);
-
 /* Calculate the CRC over a section of data.  Note that we are only
  * passing a maximum of 64K on systems that have this as a memory limit,
  * since this is the maximum buffer size we can specify.
@@ -1200,6 +1273,26 @@ PNG_INTERNAL_FUNCTION(void,png_write_cHRM_fixed,(png_structrp png_ptr,
    /* The xy value must have been previously validated */
 #endif
 
+#ifdef PNG_WRITE_cICP_SUPPORTED
+PNG_INTERNAL_FUNCTION(void,png_write_cICP,(png_structrp png_ptr,
+    png_byte colour_primaries, png_byte transfer_function,
+    png_byte matrix_coefficients, png_byte video_full_range_flag), PNG_EMPTY);
+#endif
+
+#ifdef PNG_WRITE_cLLI_SUPPORTED
+PNG_INTERNAL_FUNCTION(void,png_write_cLLI_fixed,(png_structrp png_ptr,
+   png_uint_32 maxCLL, png_uint_32 maxFALL), PNG_EMPTY);
+#endif
+
+#ifdef PNG_WRITE_mDCV_SUPPORTED
+PNG_INTERNAL_FUNCTION(void,png_write_mDCV_fixed,(png_structrp png_ptr,
+   png_uint_16 red_x, png_uint_16 red_y,
+   png_uint_16 green_x, png_uint_16 green_y,
+   png_uint_16 blue_x, png_uint_16 blue_y,
+   png_uint_16 white_x, png_uint_16 white_y,
+   png_uint_32 maxDL, png_uint_32 minDL), PNG_EMPTY);
+#endif
+
 #ifdef PNG_WRITE_sRGB_SUPPORTED
 PNG_INTERNAL_FUNCTION(void,png_write_sRGB,(png_structrp png_ptr,
     int intent),PNG_EMPTY);
@@ -1212,10 +1305,10 @@ PNG_INTERNAL_FUNCTION(void,png_write_eXIf,(png_structrp png_ptr,
 
 #ifdef PNG_WRITE_iCCP_SUPPORTED
 PNG_INTERNAL_FUNCTION(void,png_write_iCCP,(png_structrp png_ptr,
-   png_const_charp name, png_const_bytep profile), PNG_EMPTY);
-   /* The profile must have been previously validated for correctness, the
-    * length comes from the first four bytes.  Only the base, deflate,
-    * compression is supported.
+   png_const_charp name, png_const_bytep profile, png_uint_32 proflen),
+   PNG_EMPTY);
+   /* Writes a previously 'set' profile.  The profile argument is **not**
+    * compressed.
     */
 #endif
 
@@ -1524,119 +1617,36 @@ PNG_INTERNAL_FUNCTION(void,png_do_bgr,(png_row_infop row_info,
 /* The following decodes the appropriate chunks, and does error correction,
  * then calls the appropriate callback for the chunk if it is valid.
  */
+typedef enum
+{
+   /* Result of a call to png_handle_chunk made to handle the current chunk
+    * png_struct::chunk_name on read.  Always informational, either the stream
+    * is read for the next chunk or the routine will call png_error.
+    *
+    * NOTE: order is important internally.  handled_saved and above are regarded
+    * as handling the chunk.
+    */
+   handled_error = 0,  /* bad crc or known and bad format or too long */
+   handled_discarded,  /* not saved in the unknown chunk list */
+   handled_saved,      /* saved in the unknown chunk list */
+   handled_ok          /* known, supported and handled without error */
+} png_handle_result_code;
 
-/* Decode the IHDR chunk */
-PNG_INTERNAL_FUNCTION(void,png_handle_IHDR,(png_structrp png_ptr,
-    png_inforp info_ptr, png_uint_32 length),PNG_EMPTY);
-PNG_INTERNAL_FUNCTION(void,png_handle_PLTE,(png_structrp png_ptr,
-    png_inforp info_ptr, png_uint_32 length),PNG_EMPTY);
-PNG_INTERNAL_FUNCTION(void,png_handle_IEND,(png_structrp png_ptr,
-    png_inforp info_ptr, png_uint_32 length),PNG_EMPTY);
-
-#ifdef PNG_READ_bKGD_SUPPORTED
-PNG_INTERNAL_FUNCTION(void,png_handle_bKGD,(png_structrp png_ptr,
-    png_inforp info_ptr, png_uint_32 length),PNG_EMPTY);
-#endif
-
-#ifdef PNG_READ_cHRM_SUPPORTED
-PNG_INTERNAL_FUNCTION(void,png_handle_cHRM,(png_structrp png_ptr,
-    png_inforp info_ptr, png_uint_32 length),PNG_EMPTY);
-#endif
-
-#ifdef PNG_READ_eXIf_SUPPORTED
-PNG_INTERNAL_FUNCTION(void,png_handle_eXIf,(png_structrp png_ptr,
-    png_inforp info_ptr, png_uint_32 length),PNG_EMPTY);
-#endif
-
-#ifdef PNG_READ_gAMA_SUPPORTED
-PNG_INTERNAL_FUNCTION(void,png_handle_gAMA,(png_structrp png_ptr,
-    png_inforp info_ptr, png_uint_32 length),PNG_EMPTY);
-#endif
-
-#ifdef PNG_READ_hIST_SUPPORTED
-PNG_INTERNAL_FUNCTION(void,png_handle_hIST,(png_structrp png_ptr,
-    png_inforp info_ptr, png_uint_32 length),PNG_EMPTY);
-#endif
-
-#ifdef PNG_READ_iCCP_SUPPORTED
-PNG_INTERNAL_FUNCTION(void,png_handle_iCCP,(png_structrp png_ptr,
-    png_inforp info_ptr, png_uint_32 length),PNG_EMPTY);
-#endif /* READ_iCCP */
-
-#ifdef PNG_READ_iTXt_SUPPORTED
-PNG_INTERNAL_FUNCTION(void,png_handle_iTXt,(png_structrp png_ptr,
-    png_inforp info_ptr, png_uint_32 length),PNG_EMPTY);
-#endif
-
-#ifdef PNG_READ_oFFs_SUPPORTED
-PNG_INTERNAL_FUNCTION(void,png_handle_oFFs,(png_structrp png_ptr,
-    png_inforp info_ptr, png_uint_32 length),PNG_EMPTY);
-#endif
-
-#ifdef PNG_READ_pCAL_SUPPORTED
-PNG_INTERNAL_FUNCTION(void,png_handle_pCAL,(png_structrp png_ptr,
-    png_inforp info_ptr, png_uint_32 length),PNG_EMPTY);
-#endif
-
-#ifdef PNG_READ_pHYs_SUPPORTED
-PNG_INTERNAL_FUNCTION(void,png_handle_pHYs,(png_structrp png_ptr,
-    png_inforp info_ptr, png_uint_32 length),PNG_EMPTY);
-#endif
-
-#ifdef PNG_READ_sBIT_SUPPORTED
-PNG_INTERNAL_FUNCTION(void,png_handle_sBIT,(png_structrp png_ptr,
-    png_inforp info_ptr, png_uint_32 length),PNG_EMPTY);
-#endif
-
-#ifdef PNG_READ_sCAL_SUPPORTED
-PNG_INTERNAL_FUNCTION(void,png_handle_sCAL,(png_structrp png_ptr,
-    png_inforp info_ptr, png_uint_32 length),PNG_EMPTY);
-#endif
-
-#ifdef PNG_READ_sPLT_SUPPORTED
-PNG_INTERNAL_FUNCTION(void,png_handle_sPLT,(png_structrp png_ptr,
-    png_inforp info_ptr, png_uint_32 length),PNG_EMPTY);
-#endif /* READ_sPLT */
-
-#ifdef PNG_READ_sRGB_SUPPORTED
-PNG_INTERNAL_FUNCTION(void,png_handle_sRGB,(png_structrp png_ptr,
-    png_inforp info_ptr, png_uint_32 length),PNG_EMPTY);
-#endif
-
-#ifdef PNG_READ_tEXt_SUPPORTED
-PNG_INTERNAL_FUNCTION(void,png_handle_tEXt,(png_structrp png_ptr,
-    png_inforp info_ptr, png_uint_32 length),PNG_EMPTY);
-#endif
-
-#ifdef PNG_READ_tIME_SUPPORTED
-PNG_INTERNAL_FUNCTION(void,png_handle_tIME,(png_structrp png_ptr,
-    png_inforp info_ptr, png_uint_32 length),PNG_EMPTY);
-#endif
-
-#ifdef PNG_READ_tRNS_SUPPORTED
-PNG_INTERNAL_FUNCTION(void,png_handle_tRNS,(png_structrp png_ptr,
-    png_inforp info_ptr, png_uint_32 length),PNG_EMPTY);
-#endif
-
-#ifdef PNG_READ_zTXt_SUPPORTED
-PNG_INTERNAL_FUNCTION(void,png_handle_zTXt,(png_structrp png_ptr,
-    png_inforp info_ptr, png_uint_32 length),PNG_EMPTY);
-#endif
-
-PNG_INTERNAL_FUNCTION(void,png_check_chunk_name,(png_const_structrp png_ptr,
-    png_uint_32 chunk_name),PNG_EMPTY);
-
-PNG_INTERNAL_FUNCTION(void,png_check_chunk_length,(png_const_structrp png_ptr,
-    png_uint_32 chunk_length),PNG_EMPTY);
-
-PNG_INTERNAL_FUNCTION(void,png_handle_unknown,(png_structrp png_ptr,
-    png_inforp info_ptr, png_uint_32 length, int keep),PNG_EMPTY);
+PNG_INTERNAL_FUNCTION(png_handle_result_code,png_handle_unknown,
+    (png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length, int keep),
+    PNG_EMPTY);
    /* This is the function that gets called for unknown chunks.  The 'keep'
     * argument is either non-zero for a known chunk that has been set to be
     * handled as unknown or zero for an unknown chunk.  By default the function
     * just skips the chunk or errors out if it is critical.
     */
 
+PNG_INTERNAL_FUNCTION(png_handle_result_code,png_handle_chunk,
+    (png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length),PNG_EMPTY);
+   /* This handles the current chunk png_ptr->chunk_name with unread
+    * data[length] and returns one of the above result codes.
+    */
+
 #if defined(PNG_READ_UNKNOWN_CHUNKS_SUPPORTED) ||\
     defined(PNG_HANDLE_AS_UNKNOWN_SUPPORTED)
 PNG_INTERNAL_FUNCTION(int,png_chunk_unknown_handling,
@@ -1676,8 +1686,6 @@ PNG_INTERNAL_FUNCTION(void,png_process_IDAT_data,(png_structrp png_ptr,
     png_bytep buffer, size_t buffer_length),PNG_EMPTY);
 PNG_INTERNAL_FUNCTION(void,png_push_process_row,(png_structrp png_ptr),
     PNG_EMPTY);
-PNG_INTERNAL_FUNCTION(void,png_push_handle_unknown,(png_structrp png_ptr,
-   png_inforp info_ptr, png_uint_32 length),PNG_EMPTY);
 PNG_INTERNAL_FUNCTION(void,png_push_have_info,(png_structrp png_ptr,
    png_inforp info_ptr),PNG_EMPTY);
 PNG_INTERNAL_FUNCTION(void,png_push_have_end,(png_structrp png_ptr,
@@ -1690,109 +1698,28 @@ PNG_INTERNAL_FUNCTION(void,png_process_some_data,(png_structrp png_ptr,
     png_inforp info_ptr),PNG_EMPTY);
 PNG_INTERNAL_FUNCTION(void,png_read_push_finish_row,(png_structrp png_ptr),
     PNG_EMPTY);
-#  ifdef PNG_READ_tEXt_SUPPORTED
-PNG_INTERNAL_FUNCTION(void,png_push_handle_tEXt,(png_structrp png_ptr,
-    png_inforp info_ptr, png_uint_32 length),PNG_EMPTY);
-PNG_INTERNAL_FUNCTION(void,png_push_read_tEXt,(png_structrp png_ptr,
-    png_inforp info_ptr),PNG_EMPTY);
-#  endif
-#  ifdef PNG_READ_zTXt_SUPPORTED
-PNG_INTERNAL_FUNCTION(void,png_push_handle_zTXt,(png_structrp png_ptr,
-    png_inforp info_ptr, png_uint_32 length),PNG_EMPTY);
-PNG_INTERNAL_FUNCTION(void,png_push_read_zTXt,(png_structrp png_ptr,
-    png_inforp info_ptr),PNG_EMPTY);
-#  endif
-#  ifdef PNG_READ_iTXt_SUPPORTED
-PNG_INTERNAL_FUNCTION(void,png_push_handle_iTXt,(png_structrp png_ptr,
-    png_inforp info_ptr, png_uint_32 length),PNG_EMPTY);
-PNG_INTERNAL_FUNCTION(void,png_push_read_iTXt,(png_structrp png_ptr,
-    png_inforp info_ptr),PNG_EMPTY);
-#  endif
-
 #endif /* PROGRESSIVE_READ */
 
-/* Added at libpng version 1.6.0 */
-#ifdef PNG_GAMMA_SUPPORTED
-PNG_INTERNAL_FUNCTION(void,png_colorspace_set_gamma,(png_const_structrp png_ptr,
-    png_colorspacerp colorspace, png_fixed_point gAMA), PNG_EMPTY);
-   /* Set the colorspace gamma with a value provided by the application or by
-    * the gAMA chunk on read.  The value will override anything set by an ICC
-    * profile.
-    */
-
-PNG_INTERNAL_FUNCTION(void,png_colorspace_sync_info,(png_const_structrp png_ptr,
-    png_inforp info_ptr), PNG_EMPTY);
-   /* Synchronize the info 'valid' flags with the colorspace */
-
-PNG_INTERNAL_FUNCTION(void,png_colorspace_sync,(png_const_structrp png_ptr,
-    png_inforp info_ptr), PNG_EMPTY);
-   /* Copy the png_struct colorspace to the info_struct and call the above to
-    * synchronize the flags.  Checks for NULL info_ptr and does nothing.
-    */
-#endif
-
-/* Added at libpng version 1.4.0 */
-#ifdef PNG_COLORSPACE_SUPPORTED
-/* These internal functions are for maintaining the colorspace structure within
- * a png_info or png_struct (or, indeed, both).
- */
-PNG_INTERNAL_FUNCTION(int,png_colorspace_set_chromaticities,
-   (png_const_structrp png_ptr, png_colorspacerp colorspace, const png_xy *xy,
-    int preferred), PNG_EMPTY);
-
-PNG_INTERNAL_FUNCTION(int,png_colorspace_set_endpoints,
-   (png_const_structrp png_ptr, png_colorspacerp colorspace, const png_XYZ *XYZ,
-    int preferred), PNG_EMPTY);
-
-#ifdef PNG_sRGB_SUPPORTED
-PNG_INTERNAL_FUNCTION(int,png_colorspace_set_sRGB,(png_const_structrp png_ptr,
-   png_colorspacerp colorspace, int intent), PNG_EMPTY);
-   /* This does set the colorspace gAMA and cHRM values too, but doesn't set the
-    * flags to write them, if it returns false there was a problem and an error
-    * message has already been output (but the colorspace may still need to be
-    * synced to record the invalid flag).
-    */
-#endif /* sRGB */
-
 #ifdef PNG_iCCP_SUPPORTED
-PNG_INTERNAL_FUNCTION(int,png_colorspace_set_ICC,(png_const_structrp png_ptr,
-   png_colorspacerp colorspace, png_const_charp name,
-   png_uint_32 profile_length, png_const_bytep profile, int color_type),
-   PNG_EMPTY);
-   /* The 'name' is used for information only */
-
 /* Routines for checking parts of an ICC profile. */
 #ifdef PNG_READ_iCCP_SUPPORTED
 PNG_INTERNAL_FUNCTION(int,png_icc_check_length,(png_const_structrp png_ptr,
-   png_colorspacerp colorspace, png_const_charp name,
-   png_uint_32 profile_length), PNG_EMPTY);
+   png_const_charp name, png_uint_32 profile_length), PNG_EMPTY);
 #endif /* READ_iCCP */
 PNG_INTERNAL_FUNCTION(int,png_icc_check_header,(png_const_structrp png_ptr,
-   png_colorspacerp colorspace, png_const_charp name,
-   png_uint_32 profile_length,
+   png_const_charp name, png_uint_32 profile_length,
    png_const_bytep profile /* first 132 bytes only */, int color_type),
    PNG_EMPTY);
 PNG_INTERNAL_FUNCTION(int,png_icc_check_tag_table,(png_const_structrp png_ptr,
-   png_colorspacerp colorspace, png_const_charp name,
-   png_uint_32 profile_length,
+   png_const_charp name, png_uint_32 profile_length,
    png_const_bytep profile /* header plus whole tag table */), PNG_EMPTY);
-#ifdef PNG_sRGB_SUPPORTED
-PNG_INTERNAL_FUNCTION(void,png_icc_set_sRGB,(
-   png_const_structrp png_ptr, png_colorspacerp colorspace,
-   png_const_bytep profile, uLong adler), PNG_EMPTY);
-   /* 'adler' is the Adler32 checksum of the uncompressed profile data. It may
-    * be zero to indicate that it is not available.  It is used, if provided,
-    * as a fast check on the profile when checking to see if it is sRGB.
-    */
-#endif
 #endif /* iCCP */
 
 #ifdef PNG_READ_RGB_TO_GRAY_SUPPORTED
-PNG_INTERNAL_FUNCTION(void,png_colorspace_set_rgb_coefficients,
-   (png_structrp png_ptr), PNG_EMPTY);
-   /* Set the rgb_to_gray coefficients from the colorspace Y values */
+PNG_INTERNAL_FUNCTION(void,png_set_rgb_coefficients, (png_structrp png_ptr),
+   PNG_EMPTY);
+   /* Set the rgb_to_gray coefficients from the cHRM Y values (if unset) */
 #endif /* READ_RGB_TO_GRAY */
-#endif /* COLORSPACE */
 
 /* Added at libpng version 1.4.0 */
 PNG_INTERNAL_FUNCTION(void,png_check_IHDR,(png_const_structrp png_ptr,
@@ -2054,8 +1981,10 @@ PNG_INTERNAL_FUNCTION(int,png_check_fp_string,(png_const_charp string,
    size_t size),PNG_EMPTY);
 #endif /* pCAL || sCAL */
 
-#if defined(PNG_GAMMA_SUPPORTED) ||\
-    defined(PNG_INCH_CONVERSIONS_SUPPORTED) || defined(PNG_READ_pHYs_SUPPORTED)
+#if defined(PNG_READ_GAMMA_SUPPORTED) ||\
+    defined(PNG_COLORSPACE_SUPPORTED) ||\
+    defined(PNG_INCH_CONVERSIONS_SUPPORTED) ||\
+    defined(PNG_READ_pHYs_SUPPORTED)
 /* Added at libpng version 1.5.0 */
 /* This is a utility to provide a*times/div (rounded) and indicate
  * if there is an overflow.  The result is a boolean - false (0)
@@ -2064,22 +1993,14 @@ PNG_INTERNAL_FUNCTION(int,png_check_fp_string,(png_const_charp string,
  */
 PNG_INTERNAL_FUNCTION(int,png_muldiv,(png_fixed_point_p res, png_fixed_point a,
    png_int_32 multiplied_by, png_int_32 divided_by),PNG_EMPTY);
-#endif
 
-#if defined(PNG_READ_GAMMA_SUPPORTED) || defined(PNG_INCH_CONVERSIONS_SUPPORTED)
-/* Same deal, but issue a warning on overflow and return 0. */
-PNG_INTERNAL_FUNCTION(png_fixed_point,png_muldiv_warn,
-   (png_const_structrp png_ptr, png_fixed_point a, png_int_32 multiplied_by,
-   png_int_32 divided_by),PNG_EMPTY);
-#endif
-
-#ifdef PNG_GAMMA_SUPPORTED
 /* Calculate a reciprocal - used for gamma values.  This returns
  * 0 if the argument is 0 in order to maintain an undefined value;
  * there are no warnings.
  */
 PNG_INTERNAL_FUNCTION(png_fixed_point,png_reciprocal,(png_fixed_point a),
    PNG_EMPTY);
+#endif
 
 #ifdef PNG_READ_GAMMA_SUPPORTED
 /* The same but gives a reciprocal of the product of two fixed point
@@ -2088,14 +2009,22 @@ PNG_INTERNAL_FUNCTION(png_fixed_point,png_reciprocal,(png_fixed_point a),
  */
 PNG_INTERNAL_FUNCTION(png_fixed_point,png_reciprocal2,(png_fixed_point a,
    png_fixed_point b),PNG_EMPTY);
-#endif
 
 /* Return true if the gamma value is significantly different from 1.0 */
 PNG_INTERNAL_FUNCTION(int,png_gamma_significant,(png_fixed_point gamma_value),
    PNG_EMPTY);
-#endif
 
-#ifdef PNG_READ_GAMMA_SUPPORTED
+/* PNGv3: 'resolve' the file gamma according to the new PNGv3 rules for colour
+ * space information.
+ *
+ * NOTE: this uses precisely those chunks that libpng supports.  For example it
+ * doesn't use iCCP and it can only use cICP for known and manageable
+ * transforms.  For this reason a gamma specified by png_set_gamma always takes
+ * precedence.
+ */
+PNG_INTERNAL_FUNCTION(png_fixed_point,png_resolve_file_gamma,
+   (png_const_structrp png_ptr),PNG_EMPTY);
+
 /* Internal fixed point gamma correction.  These APIs are called as
  * required to convert single values - they don't need to be fast,
  * they are not used when processing image pixel values.
@@ -2113,6 +2042,22 @@ PNG_INTERNAL_FUNCTION(void,png_destroy_gamma_table,(png_structrp png_ptr),
    PNG_EMPTY);
 PNG_INTERNAL_FUNCTION(void,png_build_gamma_table,(png_structrp png_ptr,
    int bit_depth),PNG_EMPTY);
+#endif /* READ_GAMMA */
+
+#ifdef PNG_READ_RGB_TO_GRAY_SUPPORTED
+/* Set the RGB coefficients if not already set by png_set_rgb_to_gray */
+PNG_INTERNAL_FUNCTION(void,png_set_rgb_coefficients,(png_structrp png_ptr),
+   PNG_EMPTY);
+#endif
+
+#if defined(PNG_cHRM_SUPPORTED) || defined(PNG_READ_RGB_TO_GRAY_SUPPORTED)
+PNG_INTERNAL_FUNCTION(int,png_XYZ_from_xy,(png_XYZ *XYZ, const png_xy *xy),
+   PNG_EMPTY);
+#endif /* cHRM || READ_RGB_TO_GRAY */
+
+#ifdef PNG_COLORSPACE_SUPPORTED
+PNG_INTERNAL_FUNCTION(int,png_xy_from_XYZ,(png_xy *xy, const png_XYZ *XYZ),
+   PNG_EMPTY);
 #endif
 
 /* SIMPLIFIED READ/WRITE SUPPORT */
diff --git a/src/java.desktop/share/native/libsplashscreen/libpng/pngread.c b/src/java.desktop/share/native/libsplashscreen/libpng/pngread.c
index e9e94477545..8a6381e1b3e 100644
--- a/src/java.desktop/share/native/libsplashscreen/libpng/pngread.c
+++ b/src/java.desktop/share/native/libsplashscreen/libpng/pngread.c
@@ -29,7 +29,7 @@
  * However, the following notice accompanied the original version of this
  * file and, per its terms, should not be removed:
  *
- * Copyright (c) 2018-2024 Cosmin Truta
+ * Copyright (c) 2018-2025 Cosmin Truta
  * Copyright (c) 1998-2002,2004,2006-2018 Glenn Randers-Pehrson
  * Copyright (c) 1996-1997 Andreas Dilger
  * Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.
@@ -160,14 +160,11 @@ png_read_info(png_structrp png_ptr, png_inforp info_ptr)
          png_ptr->mode |= PNG_AFTER_IDAT;
       }
 
-      /* This should be a binary subdivision search or a hash for
-       * matching the chunk name rather than a linear search.
-       */
       if (chunk_name == png_IHDR)
-         png_handle_IHDR(png_ptr, info_ptr, length);
+         png_handle_chunk(png_ptr, info_ptr, length);
 
       else if (chunk_name == png_IEND)
-         png_handle_IEND(png_ptr, info_ptr, length);
+         png_handle_chunk(png_ptr, info_ptr, length);
 
 #ifdef PNG_HANDLE_AS_UNKNOWN_SUPPORTED
       else if ((keep = png_chunk_unknown_handling(png_ptr, chunk_name)) != 0)
@@ -184,8 +181,6 @@ png_read_info(png_structrp png_ptr, png_inforp info_ptr)
          }
       }
 #endif
-      else if (chunk_name == png_PLTE)
-         png_handle_PLTE(png_ptr, info_ptr, length);
 
       else if (chunk_name == png_IDAT)
       {
@@ -193,99 +188,8 @@ png_read_info(png_structrp png_ptr, png_inforp info_ptr)
          break;
       }
 
-#ifdef PNG_READ_bKGD_SUPPORTED
-      else if (chunk_name == png_bKGD)
-         png_handle_bKGD(png_ptr, info_ptr, length);
-#endif
-
-#ifdef PNG_READ_cHRM_SUPPORTED
-      else if (chunk_name == png_cHRM)
-         png_handle_cHRM(png_ptr, info_ptr, length);
-#endif
-
-#ifdef PNG_READ_eXIf_SUPPORTED
-      else if (chunk_name == png_eXIf)
-         png_handle_eXIf(png_ptr, info_ptr, length);
-#endif
-
-#ifdef PNG_READ_gAMA_SUPPORTED
-      else if (chunk_name == png_gAMA)
-         png_handle_gAMA(png_ptr, info_ptr, length);
-#endif
-
-#ifdef PNG_READ_hIST_SUPPORTED
-      else if (chunk_name == png_hIST)
-         png_handle_hIST(png_ptr, info_ptr, length);
-#endif
-
-#ifdef PNG_READ_oFFs_SUPPORTED
-      else if (chunk_name == png_oFFs)
-         png_handle_oFFs(png_ptr, info_ptr, length);
-#endif
-
-#ifdef PNG_READ_pCAL_SUPPORTED
-      else if (chunk_name == png_pCAL)
-         png_handle_pCAL(png_ptr, info_ptr, length);
-#endif
-
-#ifdef PNG_READ_sCAL_SUPPORTED
-      else if (chunk_name == png_sCAL)
-         png_handle_sCAL(png_ptr, info_ptr, length);
-#endif
-
-#ifdef PNG_READ_pHYs_SUPPORTED
-      else if (chunk_name == png_pHYs)
-         png_handle_pHYs(png_ptr, info_ptr, length);
-#endif
-
-#ifdef PNG_READ_sBIT_SUPPORTED
-      else if (chunk_name == png_sBIT)
-         png_handle_sBIT(png_ptr, info_ptr, length);
-#endif
-
-#ifdef PNG_READ_sRGB_SUPPORTED
-      else if (chunk_name == png_sRGB)
-         png_handle_sRGB(png_ptr, info_ptr, length);
-#endif
-
-#ifdef PNG_READ_iCCP_SUPPORTED
-      else if (chunk_name == png_iCCP)
-         png_handle_iCCP(png_ptr, info_ptr, length);
-#endif
-
-#ifdef PNG_READ_sPLT_SUPPORTED
-      else if (chunk_name == png_sPLT)
-         png_handle_sPLT(png_ptr, info_ptr, length);
-#endif
-
-#ifdef PNG_READ_tEXt_SUPPORTED
-      else if (chunk_name == png_tEXt)
-         png_handle_tEXt(png_ptr, info_ptr, length);
-#endif
-
-#ifdef PNG_READ_tIME_SUPPORTED
-      else if (chunk_name == png_tIME)
-         png_handle_tIME(png_ptr, info_ptr, length);
-#endif
-
-#ifdef PNG_READ_tRNS_SUPPORTED
-      else if (chunk_name == png_tRNS)
-         png_handle_tRNS(png_ptr, info_ptr, length);
-#endif
-
-#ifdef PNG_READ_zTXt_SUPPORTED
-      else if (chunk_name == png_zTXt)
-         png_handle_zTXt(png_ptr, info_ptr, length);
-#endif
-
-#ifdef PNG_READ_iTXt_SUPPORTED
-      else if (chunk_name == png_iTXt)
-         png_handle_iTXt(png_ptr, info_ptr, length);
-#endif
-
       else
-         png_handle_unknown(png_ptr, info_ptr, length,
-             PNG_HANDLE_CHUNK_AS_DEFAULT);
+         png_handle_chunk(png_ptr, info_ptr, length);
    }
 }
 #endif /* SEQUENTIAL_READ */
@@ -830,10 +734,10 @@ png_read_end(png_structrp png_ptr, png_inforp info_ptr)
          png_ptr->mode |= PNG_HAVE_CHUNK_AFTER_IDAT;
 
       if (chunk_name == png_IEND)
-         png_handle_IEND(png_ptr, info_ptr, length);
+         png_handle_chunk(png_ptr, info_ptr, length);
 
       else if (chunk_name == png_IHDR)
-         png_handle_IHDR(png_ptr, info_ptr, length);
+         png_handle_chunk(png_ptr, info_ptr, length);
 
       else if (info_ptr == NULL)
          png_crc_finish(png_ptr, length);
@@ -867,102 +771,9 @@ png_read_end(png_structrp png_ptr, png_inforp info_ptr)
 
          png_crc_finish(png_ptr, length);
       }
-      else if (chunk_name == png_PLTE)
-         png_handle_PLTE(png_ptr, info_ptr, length);
-
-#ifdef PNG_READ_bKGD_SUPPORTED
-      else if (chunk_name == png_bKGD)
-         png_handle_bKGD(png_ptr, info_ptr, length);
-#endif
-
-#ifdef PNG_READ_cHRM_SUPPORTED
-      else if (chunk_name == png_cHRM)
-         png_handle_cHRM(png_ptr, info_ptr, length);
-#endif
-
-#ifdef PNG_READ_eXIf_SUPPORTED
-      else if (chunk_name == png_eXIf)
-         png_handle_eXIf(png_ptr, info_ptr, length);
-#endif
-
-#ifdef PNG_READ_gAMA_SUPPORTED
-      else if (chunk_name == png_gAMA)
-         png_handle_gAMA(png_ptr, info_ptr, length);
-#endif
-
-#ifdef PNG_READ_hIST_SUPPORTED
-      else if (chunk_name == png_hIST)
-         png_handle_hIST(png_ptr, info_ptr, length);
-#endif
-
-#ifdef PNG_READ_oFFs_SUPPORTED
-      else if (chunk_name == png_oFFs)
-         png_handle_oFFs(png_ptr, info_ptr, length);
-#endif
-
-#ifdef PNG_READ_pCAL_SUPPORTED
-      else if (chunk_name == png_pCAL)
-         png_handle_pCAL(png_ptr, info_ptr, length);
-#endif
-
-#ifdef PNG_READ_sCAL_SUPPORTED
-      else if (chunk_name == png_sCAL)
-         png_handle_sCAL(png_ptr, info_ptr, length);
-#endif
-
-#ifdef PNG_READ_pHYs_SUPPORTED
-      else if (chunk_name == png_pHYs)
-         png_handle_pHYs(png_ptr, info_ptr, length);
-#endif
-
-#ifdef PNG_READ_sBIT_SUPPORTED
-      else if (chunk_name == png_sBIT)
-         png_handle_sBIT(png_ptr, info_ptr, length);
-#endif
-
-#ifdef PNG_READ_sRGB_SUPPORTED
-      else if (chunk_name == png_sRGB)
-         png_handle_sRGB(png_ptr, info_ptr, length);
-#endif
-
-#ifdef PNG_READ_iCCP_SUPPORTED
-      else if (chunk_name == png_iCCP)
-         png_handle_iCCP(png_ptr, info_ptr, length);
-#endif
-
-#ifdef PNG_READ_sPLT_SUPPORTED
-      else if (chunk_name == png_sPLT)
-         png_handle_sPLT(png_ptr, info_ptr, length);
-#endif
-
-#ifdef PNG_READ_tEXt_SUPPORTED
-      else if (chunk_name == png_tEXt)
-         png_handle_tEXt(png_ptr, info_ptr, length);
-#endif
-
-#ifdef PNG_READ_tIME_SUPPORTED
-      else if (chunk_name == png_tIME)
-         png_handle_tIME(png_ptr, info_ptr, length);
-#endif
-
-#ifdef PNG_READ_tRNS_SUPPORTED
-      else if (chunk_name == png_tRNS)
-         png_handle_tRNS(png_ptr, info_ptr, length);
-#endif
-
-#ifdef PNG_READ_zTXt_SUPPORTED
-      else if (chunk_name == png_zTXt)
-         png_handle_zTXt(png_ptr, info_ptr, length);
-#endif
-
-#ifdef PNG_READ_iTXt_SUPPORTED
-      else if (chunk_name == png_iTXt)
-         png_handle_iTXt(png_ptr, info_ptr, length);
-#endif
 
       else
-         png_handle_unknown(png_ptr, info_ptr, length,
-             PNG_HANDLE_CHUNK_AS_DEFAULT);
+         png_handle_chunk(png_ptr, info_ptr, length);
    } while ((png_ptr->mode & PNG_HAVE_IEND) == 0);
 }
 #endif /* SEQUENTIAL_READ */
@@ -1413,6 +1224,31 @@ png_image_format(png_structrp png_ptr)
    return format;
 }
 
+static int
+chromaticities_match_sRGB(const png_xy *xy)
+{
+#  define sRGB_TOLERANCE 1000
+   static const png_xy sRGB_xy = /* From ITU-R BT.709-3 */
+   {
+      /* color      x       y */
+      /* red   */ 64000, 33000,
+      /* green */ 30000, 60000,
+      /* blue  */ 15000,  6000,
+      /* white */ 31270, 32900
+   };
+
+   if (PNG_OUT_OF_RANGE(xy->whitex, sRGB_xy.whitex,sRGB_TOLERANCE) ||
+       PNG_OUT_OF_RANGE(xy->whitey, sRGB_xy.whitey,sRGB_TOLERANCE) ||
+       PNG_OUT_OF_RANGE(xy->redx,   sRGB_xy.redx,  sRGB_TOLERANCE) ||
+       PNG_OUT_OF_RANGE(xy->redy,   sRGB_xy.redy,  sRGB_TOLERANCE) ||
+       PNG_OUT_OF_RANGE(xy->greenx, sRGB_xy.greenx,sRGB_TOLERANCE) ||
+       PNG_OUT_OF_RANGE(xy->greeny, sRGB_xy.greeny,sRGB_TOLERANCE) ||
+       PNG_OUT_OF_RANGE(xy->bluex,  sRGB_xy.bluex, sRGB_TOLERANCE) ||
+       PNG_OUT_OF_RANGE(xy->bluey,  sRGB_xy.bluey, sRGB_TOLERANCE))
+      return 0;
+   return 1;
+}
+
 /* Is the given gamma significantly different from sRGB?  The test is the same
  * one used in pngrtran.c when deciding whether to do gamma correction.  The
  * arithmetic optimizes the division by using the fact that the inverse of the
@@ -1421,22 +1257,44 @@ png_image_format(png_structrp png_ptr)
 static int
 png_gamma_not_sRGB(png_fixed_point g)
 {
-   if (g < PNG_FP_1)
-   {
-      /* An uninitialized gamma is assumed to be sRGB for the simplified API. */
-      if (g == 0)
-         return 0;
+   /* 1.6.47: use the same sanity checks as used in pngrtran.c */
+   if (g < PNG_LIB_GAMMA_MIN || g > PNG_LIB_GAMMA_MAX)
+      return 0; /* Includes the uninitialized value 0 */
 
-      return png_gamma_significant((g * 11 + 2)/5 /* i.e. *2.2, rounded */);
-   }
-
-   return 1;
+   return png_gamma_significant((g * 11 + 2)/5 /* i.e. *2.2, rounded */);
 }
 
 /* Do the main body of a 'png_image_begin_read' function; read the PNG file
  * header and fill in all the information.  This is executed in a safe context,
  * unlike the init routine above.
  */
+static int
+png_image_is_not_sRGB(png_const_structrp png_ptr)
+{
+   /* Does the colorspace **not** match sRGB?  The flag is only set if the
+    * answer can be determined reliably.
+    *
+    * png_struct::chromaticities always exists since the simplified API
+    * requires rgb-to-gray.  The mDCV, cICP and cHRM chunks may all set it to
+    * a non-sRGB value, so it needs to be checked but **only** if one of
+    * those chunks occured in the file.
+    */
+   /* Highest priority: check to be safe. */
+   if (png_has_chunk(png_ptr, cICP) || png_has_chunk(png_ptr, mDCV))
+      return !chromaticities_match_sRGB(&png_ptr->chromaticities);
+
+   /* If the image is marked as sRGB then it is... */
+   if (png_has_chunk(png_ptr, sRGB))
+      return 0;
+
+   /* Last stop: cHRM, must check: */
+   if (png_has_chunk(png_ptr, cHRM))
+      return !chromaticities_match_sRGB(&png_ptr->chromaticities);
+
+   /* Else default to sRGB */
+   return 0;
+}
+
 static int
 png_image_read_header(png_voidp argument)
 {
@@ -1458,17 +1316,13 @@ png_image_read_header(png_voidp argument)
 
       image->format = format;
 
-#ifdef PNG_COLORSPACE_SUPPORTED
-      /* Does the colorspace match sRGB?  If there is no color endpoint
-       * (colorant) information assume yes, otherwise require the
-       * 'ENDPOINTS_MATCHP_sRGB' colorspace flag to have been set.  If the
-       * colorspace has been determined to be invalid ignore it.
+      /* Greyscale images don't (typically) have colour space information and
+       * using it is pretty much impossible, so use sRGB for grayscale (it
+       * doesn't matter r==g==b so the transform is irrelevant.)
        */
-      if ((format & PNG_FORMAT_FLAG_COLOR) != 0 && ((png_ptr->colorspace.flags
-         & (PNG_COLORSPACE_HAVE_ENDPOINTS|PNG_COLORSPACE_ENDPOINTS_MATCH_sRGB|
-            PNG_COLORSPACE_INVALID)) == PNG_COLORSPACE_HAVE_ENDPOINTS))
+      if ((format & PNG_FORMAT_FLAG_COLOR) != 0 &&
+          png_image_is_not_sRGB(png_ptr))
          image->flags |= PNG_IMAGE_FLAG_COLORSPACE_NOT_sRGB;
-#endif
    }
 
    /* We need the maximum number of entries regardless of the format the
@@ -1656,21 +1510,18 @@ png_image_skip_unused_chunks(png_structrp png_ptr)
     * potential vulnerability to security problems in the unused chunks.
     *
     * At present the iCCP chunk data isn't used, so iCCP chunk can be ignored
-    * too.  This allows the simplified API to be compiled without iCCP support,
-    * however if the support is there the chunk is still checked to detect
-    * errors (which are unfortunately quite common.)
+    * too.  This allows the simplified API to be compiled without iCCP support.
     */
    {
          static const png_byte chunks_to_process[] = {
             98,  75,  71,  68, '\0',  /* bKGD */
             99,  72,  82,  77, '\0',  /* cHRM */
+            99,  73,  67,  80, '\0',  /* cICP */
            103,  65,  77,  65, '\0',  /* gAMA */
-#        ifdef PNG_READ_iCCP_SUPPORTED
-           105,  67,  67,  80, '\0',  /* iCCP */
-#        endif
+           109,  68,  67,  86, '\0',  /* mDCV */
            115,  66,  73,  84, '\0',  /* sBIT */
            115,  82,  71,  66, '\0',  /* sRGB */
-           };
+         };
 
        /* Ignore unknown chunks and all other chunks except for the
         * IHDR, PLTE, tRNS, IDAT, and IEND chunks.
@@ -1699,7 +1550,15 @@ png_image_skip_unused_chunks(png_structrp png_ptr)
 static void
 set_file_encoding(png_image_read_control *display)
 {
-   png_fixed_point g = display->image->opaque->png_ptr->colorspace.gamma;
+   png_structrp png_ptr = display->image->opaque->png_ptr;
+   png_fixed_point g = png_resolve_file_gamma(png_ptr);
+
+   /* PNGv3: the result may be 0 however the 'default_gamma' should have been
+    * set before this is called so zero is an error:
+    */
+   if (g == 0)
+      png_error(png_ptr, "internal: default gamma not set");
+
    if (png_gamma_significant(g) != 0)
    {
       if (png_gamma_not_sRGB(g) != 0)
@@ -2187,24 +2046,18 @@ png_image_read_colormap(png_voidp argument)
    /* Default the input file gamma if required - this is necessary because
     * libpng assumes that if no gamma information is present the data is in the
     * output format, but the simplified API deduces the gamma from the input
-    * format.
+    * format.  The 'default' gamma value is also set by png_set_alpha_mode, but
+    * this is happening before any such call, so:
+    *
+    * TODO: should be an internal API and all this code should be copied into a
+    * single common gamma+colorspace file.
     */
-   if ((png_ptr->colorspace.flags & PNG_COLORSPACE_HAVE_GAMMA) == 0)
-   {
-      /* Do this directly, not using the png_colorspace functions, to ensure
-       * that it happens even if the colorspace is invalid (though probably if
-       * it is the setting will be ignored)  Note that the same thing can be
-       * achieved at the application interface with png_set_gAMA.
-       */
-      if (png_ptr->bit_depth == 16 &&
-         (image->flags & PNG_IMAGE_FLAG_16BIT_sRGB) == 0)
-         png_ptr->colorspace.gamma = PNG_GAMMA_LINEAR;
+   if (png_ptr->bit_depth == 16 &&
+      (image->flags & PNG_IMAGE_FLAG_16BIT_sRGB) == 0)
+      png_ptr->default_gamma = PNG_GAMMA_LINEAR;
 
-      else
-         png_ptr->colorspace.gamma = PNG_GAMMA_sRGB_INVERSE;
-
-      png_ptr->colorspace.flags |= PNG_COLORSPACE_HAVE_GAMMA;
-   }
+   else
+      png_ptr->default_gamma = PNG_GAMMA_sRGB_INVERSE;
 
    /* Decide what to do based on the PNG color type of the input data.  The
     * utility function png_create_colormap_entry deals with most aspects of the
@@ -2582,6 +2435,8 @@ png_image_read_colormap(png_voidp argument)
 
             else
             {
+               const png_fixed_point gamma = png_resolve_file_gamma(png_ptr);
+
                /* Either the input or the output has no alpha channel, so there
                 * will be no non-opaque pixels in the color-map; it will just be
                 * grayscale.
@@ -2596,10 +2451,13 @@ png_image_read_colormap(png_voidp argument)
                 * this case and doing it in the palette; this will result in
                 * duplicate palette entries, but that's better than the
                 * alternative of double gamma correction.
+                *
+                * NOTE: PNGv3: check the resolved result of all the potentially
+                * different colour space chunks.
                 */
                if ((png_ptr->color_type == PNG_COLOR_TYPE_RGB_ALPHA ||
                   png_ptr->num_trans > 0) &&
-                  png_gamma_not_sRGB(png_ptr->colorspace.gamma) != 0)
+                  png_gamma_not_sRGB(gamma) != 0)
                {
                   cmap_entries = (unsigned int)make_gray_file_colormap(display);
                   data_encoding = P_FILE;
@@ -2631,8 +2489,8 @@ png_image_read_colormap(png_voidp argument)
                      if (output_encoding == P_sRGB)
                         gray = png_sRGB_table[gray]; /* now P_LINEAR */
 
-                     gray = PNG_DIV257(png_gamma_16bit_correct(gray,
-                         png_ptr->colorspace.gamma)); /* now P_FILE */
+                     gray = PNG_DIV257(png_gamma_16bit_correct(gray, gamma));
+                        /* now P_FILE */
 
                      /* And make sure the corresponding palette entry contains
                       * exactly the required sRGB value.
@@ -3763,6 +3621,12 @@ png_image_read_direct(png_voidp argument)
       /* Set the gamma appropriately, linear for 16-bit input, sRGB otherwise.
        */
       {
+         /* This is safe but should no longer be necessary as
+          * png_ptr->default_gamma should have been set after the
+          * info-before-IDAT was read in png_image_read_header.
+          *
+          * TODO: 1.8: remove this and see what happens.
+          */
          png_fixed_point input_gamma_default;
 
          if ((base_format & PNG_FORMAT_FLAG_LINEAR) != 0 &&
@@ -3818,8 +3682,9 @@ png_image_read_direct(png_voidp argument)
           * yet; it's set below.  png_struct::gamma, however, is set to the
           * final value.
           */
-         if (png_muldiv(&gtest, output_gamma, png_ptr->colorspace.gamma,
-             PNG_FP_1) != 0 && png_gamma_significant(gtest) == 0)
+         if (png_muldiv(&gtest, output_gamma,
+                  png_resolve_file_gamma(png_ptr), PNG_FP_1) != 0 &&
+             png_gamma_significant(gtest) == 0)
             do_local_background = 0;
 
          else if (mode == PNG_ALPHA_STANDARD)
diff --git a/src/java.desktop/share/native/libsplashscreen/libpng/pngrtran.c b/src/java.desktop/share/native/libsplashscreen/libpng/pngrtran.c
index a393de4b79d..4f31f8f07bc 100644
--- a/src/java.desktop/share/native/libsplashscreen/libpng/pngrtran.c
+++ b/src/java.desktop/share/native/libsplashscreen/libpng/pngrtran.c
@@ -247,9 +247,59 @@ png_set_strip_alpha(png_structrp png_ptr)
 #endif
 
 #if defined(PNG_READ_ALPHA_MODE_SUPPORTED) || defined(PNG_READ_GAMMA_SUPPORTED)
+/* PNGv3 conformance: this private API exists to resolve the now mandatory error
+ * resolution when multiple conflicting sources of gamma or colour space
+ * information are available.
+ *
+ * Terminology (assuming power law, "gamma", encodings):
+ *    "screen" gamma: a power law imposed by the output device when digital
+ *    samples are converted to visible light output.  The EOTF - volage to
+ *    luminance on output.
+ *
+ *    "file" gamma: a power law used to encode luminance levels from the input
+ *    data (the scene or the mastering display system) into digital voltages.
+ *    The OETF - luminance to voltage on input.
+ *
+ *    gamma "correction": a power law matching the **inverse** of the overall
+ *    transfer function from input luminance levels to output levels.  The
+ *    **inverse** of the OOTF; the correction "corrects" for the OOTF by aiming
+ *    to make the overall OOTF (including the correction) linear.
+ *
+ * It is important to understand this terminology because the defined terms are
+ * scattered throughout the libpng code and it is very easy to end up with the
+ * inverse of the power law required.
+ *
+ * Variable and struct::member names:
+ *    file_gamma        OETF  how the PNG data was encoded
+ *
+ *    screen_gamma      EOTF  how the screen will decode digital levels
+ *
+ *    -- not used --    OOTF  the net effect OETF x EOTF
+ *    gamma_correction        the inverse of OOTF to make the result linear
+ *
+ * All versions of libpng require a call to "png_set_gamma" to establish the
+ * "screen" gamma, the power law representing the EOTF.  png_set_gamma may also
+ * set or default the "file" gamma; the OETF.  gamma_correction is calculated
+ * internally.
+ *
+ * The earliest libpng versions required file_gamma to be supplied to set_gamma.
+ * Later versions started allowing png_set_gamma and, later, png_set_alpha_mode,
+ * to cause defaulting from the file data.
+ *
+ * PNGv3 mandated a particular form for this defaulting, one that is compatible
+ * with what libpng did except that if libpng detected inconsistencies it marked
+ * all the chunks as "invalid".  PNGv3 effectively invalidates this prior code.
+ *
+ * Behaviour implemented below:
+ *    translate_gamma_flags(gamma, is_screen)
+ *       The libpng-1.6 API for the gamma parameters to libpng APIs
+ *       (png_set_gamma and png_set_alpha_mode at present).  This allows the
+ *       'gamma' value to be passed as a png_fixed_point number or as one of a
+ *       set of integral values for specific "well known" examples of transfer
+ *       functions.  This is compatible with PNGv3.
+ */
 static png_fixed_point
-translate_gamma_flags(png_structrp png_ptr, png_fixed_point output_gamma,
-    int is_screen)
+translate_gamma_flags(png_fixed_point output_gamma, int is_screen)
 {
    /* Check for flag values.  The main reason for having the old Mac value as a
     * flag is that it is pretty near impossible to work out what the correct
@@ -259,14 +309,6 @@ translate_gamma_flags(png_structrp png_ptr, png_fixed_point output_gamma,
    if (output_gamma == PNG_DEFAULT_sRGB ||
       output_gamma == PNG_FP_1 / PNG_DEFAULT_sRGB)
    {
-      /* If there is no sRGB support this just sets the gamma to the standard
-       * sRGB value.  (This is a side effect of using this function!)
-       */
-#     ifdef PNG_READ_sRGB_SUPPORTED
-         png_ptr->flags |= PNG_FLAG_ASSUME_sRGB;
-#     else
-         PNG_UNUSED(png_ptr)
-#     endif
       if (is_screen != 0)
          output_gamma = PNG_GAMMA_sRGB;
       else
@@ -308,6 +350,33 @@ convert_gamma_value(png_structrp png_ptr, double output_gamma)
    return (png_fixed_point)output_gamma;
 }
 #  endif
+
+static int
+unsupported_gamma(png_structrp png_ptr, png_fixed_point gamma, int warn)
+{
+   /* Validate a gamma value to ensure it is in a reasonable range.  The value
+    * is expected to be 1 or greater, but this range test allows for some
+    * viewing correction values.  The intent is to weed out the API users
+    * who might use the inverse of the gamma value accidentally!
+    *
+    * 1.6.47: apply the test in png_set_gamma as well but only warn and return
+    * false if it fires.
+    *
+    * TODO: 1.8: make this an app_error in png_set_gamma as well.
+    */
+   if (gamma < PNG_LIB_GAMMA_MIN || gamma > PNG_LIB_GAMMA_MAX)
+   {
+#     define msg "gamma out of supported range"
+      if (warn)
+         png_app_warning(png_ptr, msg);
+      else
+         png_app_error(png_ptr, msg);
+      return 1;
+#     undef msg
+   }
+
+   return 0;
+}
 #endif /* READ_ALPHA_MODE || READ_GAMMA */
 
 #ifdef PNG_READ_ALPHA_MODE_SUPPORTED
@@ -315,31 +384,29 @@ void PNGFAPI
 png_set_alpha_mode_fixed(png_structrp png_ptr, int mode,
     png_fixed_point output_gamma)
 {
-   int compose = 0;
    png_fixed_point file_gamma;
+   int compose = 0;
 
    png_debug(1, "in png_set_alpha_mode_fixed");
 
    if (png_rtran_ok(png_ptr, 0) == 0)
       return;
 
-   output_gamma = translate_gamma_flags(png_ptr, output_gamma, 1/*screen*/);
-
-   /* Validate the value to ensure it is in a reasonable range.  The value
-    * is expected to be 1 or greater, but this range test allows for some
-    * viewing correction values.  The intent is to weed out the API users
-    * who might use the inverse of the gamma value accidentally!
-    *
-    * In libpng 1.6.0, we changed from 0.07..3 to 0.01..100, to accommodate
-    * the optimal 16-bit gamma of 36 and its reciprocal.
-    */
-   if (output_gamma < 1000 || output_gamma > 10000000)
-      png_error(png_ptr, "output gamma out of expected range");
+   output_gamma = translate_gamma_flags(output_gamma, 1/*screen*/);
+   if (unsupported_gamma(png_ptr, output_gamma, 0/*error*/))
+      return;
 
    /* The default file gamma is the inverse of the output gamma; the output
-    * gamma may be changed below so get the file value first:
+    * gamma may be changed below so get the file value first.  The default_gamma
+    * is set here and from the simplified API (which uses a different algorithm)
+    * so don't overwrite a set value:
     */
-   file_gamma = png_reciprocal(output_gamma);
+   file_gamma = png_ptr->default_gamma;
+   if (file_gamma == 0)
+   {
+      file_gamma = png_reciprocal(output_gamma);
+      png_ptr->default_gamma = file_gamma;
+   }
 
    /* There are really 8 possibilities here, composed of any combination
     * of:
@@ -390,17 +457,7 @@ png_set_alpha_mode_fixed(png_structrp png_ptr, int mode,
          png_error(png_ptr, "invalid alpha mode");
    }
 
-   /* Only set the default gamma if the file gamma has not been set (this has
-    * the side effect that the gamma in a second call to png_set_alpha_mode will
-    * be ignored.)
-    */
-   if (png_ptr->colorspace.gamma == 0)
-   {
-      png_ptr->colorspace.gamma = file_gamma;
-      png_ptr->colorspace.flags |= PNG_COLORSPACE_HAVE_GAMMA;
-   }
-
-   /* But always set the output gamma: */
+   /* Set the screen gamma values: */
    png_ptr->screen_gamma = output_gamma;
 
    /* Finally, if pre-multiplying, set the background fields to achieve the
@@ -410,7 +467,7 @@ png_set_alpha_mode_fixed(png_structrp png_ptr, int mode,
    {
       /* And obtain alpha pre-multiplication by composing on black: */
       memset(&png_ptr->background, 0, (sizeof png_ptr->background));
-      png_ptr->background_gamma = png_ptr->colorspace.gamma; /* just in case */
+      png_ptr->background_gamma = file_gamma; /* just in case */
       png_ptr->background_gamma_type = PNG_BACKGROUND_GAMMA_FILE;
       png_ptr->transformations &= ~PNG_BACKGROUND_EXPAND;
 
@@ -848,8 +905,8 @@ png_set_gamma_fixed(png_structrp png_ptr, png_fixed_point scrn_gamma,
       return;
 
    /* New in libpng-1.5.4 - reserve particular negative values as flags. */
-   scrn_gamma = translate_gamma_flags(png_ptr, scrn_gamma, 1/*screen*/);
-   file_gamma = translate_gamma_flags(png_ptr, file_gamma, 0/*file*/);
+   scrn_gamma = translate_gamma_flags(scrn_gamma, 1/*screen*/);
+   file_gamma = translate_gamma_flags(file_gamma, 0/*file*/);
 
    /* Checking the gamma values for being >0 was added in 1.5.4 along with the
     * premultiplied alpha support; this actually hides an undocumented feature
@@ -863,17 +920,19 @@ png_set_gamma_fixed(png_structrp png_ptr, png_fixed_point scrn_gamma,
     * libpng-1.6.0.
     */
    if (file_gamma <= 0)
-      png_error(png_ptr, "invalid file gamma in png_set_gamma");
-
+      png_app_error(png_ptr, "invalid file gamma in png_set_gamma");
    if (scrn_gamma <= 0)
-      png_error(png_ptr, "invalid screen gamma in png_set_gamma");
+      png_app_error(png_ptr, "invalid screen gamma in png_set_gamma");
 
-   /* Set the gamma values unconditionally - this overrides the value in the PNG
-    * file if a gAMA chunk was present.  png_set_alpha_mode provides a
-    * different, easier, way to default the file gamma.
+   if (unsupported_gamma(png_ptr, file_gamma, 1/*warn*/) ||
+       unsupported_gamma(png_ptr, scrn_gamma, 1/*warn*/))
+      return;
+
+   /* 1.6.47: png_struct::file_gamma and png_struct::screen_gamma are now only
+    * written by this API.  This removes dependencies on the order of API calls
+    * and allows the complex gamma checks to be delayed until needed.
     */
-   png_ptr->colorspace.gamma = file_gamma;
-   png_ptr->colorspace.flags |= PNG_COLORSPACE_HAVE_GAMMA;
+   png_ptr->file_gamma = file_gamma;
    png_ptr->screen_gamma = scrn_gamma;
 }
 
@@ -1051,26 +1110,9 @@ png_set_rgb_to_gray_fixed(png_structrp png_ptr, int error_action,
          png_ptr->rgb_to_gray_coefficients_set = 1;
       }
 
-      else
-      {
-         if (red >= 0 && green >= 0)
-            png_app_warning(png_ptr,
-                "ignoring out of range rgb_to_gray coefficients");
-
-         /* Use the defaults, from the cHRM chunk if set, else the historical
-          * values which are close to the sRGB/HDTV/ITU-Rec 709 values.  See
-          * png_do_rgb_to_gray for more discussion of the values.  In this case
-          * the coefficients are not marked as 'set' and are not overwritten if
-          * something has already provided a default.
-          */
-         if (png_ptr->rgb_to_gray_red_coeff == 0 &&
-             png_ptr->rgb_to_gray_green_coeff == 0)
-         {
-            png_ptr->rgb_to_gray_red_coeff   = 6968;
-            png_ptr->rgb_to_gray_green_coeff = 23434;
-            /* png_ptr->rgb_to_gray_blue_coeff  = 2366; */
-         }
-      }
+      else if (red >= 0 && green >= 0)
+         png_app_warning(png_ptr,
+               "ignoring out of range rgb_to_gray coefficients");
    }
 }
 
@@ -1311,6 +1353,80 @@ png_init_rgb_transformations(png_structrp png_ptr)
 #endif /* READ_EXPAND && READ_BACKGROUND */
 }
 
+#ifdef PNG_READ_GAMMA_SUPPORTED
+png_fixed_point /* PRIVATE */
+png_resolve_file_gamma(png_const_structrp png_ptr)
+{
+   png_fixed_point file_gamma;
+
+   /* The file gamma is determined by these precedence rules, in this order
+    * (i.e. use the first value found):
+    *
+    *    png_set_gamma; png_struct::file_gammma if not zero, then:
+    *    png_struct::chunk_gamma if not 0 (determined the PNGv3 rules), then:
+    *    png_set_gamma; 1/png_struct::screen_gamma if not zero
+    *
+    *    0 (i.e. do no gamma handling)
+    */
+   file_gamma = png_ptr->file_gamma;
+   if (file_gamma != 0)
+      return file_gamma;
+
+   file_gamma = png_ptr->chunk_gamma;
+   if (file_gamma != 0)
+      return file_gamma;
+
+   file_gamma = png_ptr->default_gamma;
+   if (file_gamma != 0)
+      return file_gamma;
+
+   /* If png_reciprocal oveflows it returns 0 which indicates to the caller that
+    * there is no usable file gamma.  (The checks added to png_set_gamma and
+    * png_set_alpha_mode should prevent a screen_gamma which would overflow.)
+    */
+   if (png_ptr->screen_gamma != 0)
+      file_gamma = png_reciprocal(png_ptr->screen_gamma);
+
+   return file_gamma;
+}
+
+static int
+png_init_gamma_values(png_structrp png_ptr)
+{
+   /* The following temporary indicates if overall gamma correction is
+    * required.
+    */
+   int gamma_correction = 0;
+   png_fixed_point file_gamma, screen_gamma;
+
+   /* Resolve the file_gamma.  See above: if png_ptr::screen_gamma is set
+    * file_gamma will always be set here:
+    */
+   file_gamma = png_resolve_file_gamma(png_ptr);
+   screen_gamma = png_ptr->screen_gamma;
+
+   if (file_gamma > 0) /* file has been set */
+   {
+      if (screen_gamma > 0) /* screen set too */
+         gamma_correction = png_gamma_threshold(file_gamma, screen_gamma);
+
+      else
+         /* Assume the output matches the input; a long time default behavior
+          * of libpng, although the standard has nothing to say about this.
+          */
+         screen_gamma = png_reciprocal(file_gamma);
+   }
+
+   else /* both unset, prevent corrections: */
+      file_gamma = screen_gamma = PNG_FP_1;
+
+   png_ptr->file_gamma = file_gamma;
+   png_ptr->screen_gamma = screen_gamma;
+   return gamma_correction;
+
+}
+#endif /* READ_GAMMA */
+
 void /* PRIVATE */
 png_init_read_transformations(png_structrp png_ptr)
 {
@@ -1330,59 +1446,22 @@ png_init_read_transformations(png_structrp png_ptr)
     * the test needs to be performed later - here.  In addition prior to 1.5.4
     * the tests were repeated for the PALETTE color type here - this is no
     * longer necessary (and doesn't seem to have been necessary before.)
+    *
+    * PNGv3: the new mandatory precedence/priority rules for colour space chunks
+    * are handled here (by calling the above function).
+    *
+    * Turn the gamma transformation on or off as appropriate.  Notice that
+    * PNG_GAMMA just refers to the file->screen correction.  Alpha composition
+    * may independently cause gamma correction because it needs linear data
+    * (e.g. if the file has a gAMA chunk but the screen gamma hasn't been
+    * specified.)  In any case this flag may get turned off in the code
+    * immediately below if the transform can be handled outside the row loop.
     */
-   {
-      /* The following temporary indicates if overall gamma correction is
-       * required.
-       */
-      int gamma_correction = 0;
+   if (png_init_gamma_values(png_ptr) != 0)
+      png_ptr->transformations |= PNG_GAMMA;
 
-      if (png_ptr->colorspace.gamma != 0) /* has been set */
-      {
-         if (png_ptr->screen_gamma != 0) /* screen set too */
-            gamma_correction = png_gamma_threshold(png_ptr->colorspace.gamma,
-                png_ptr->screen_gamma);
-
-         else
-            /* Assume the output matches the input; a long time default behavior
-             * of libpng, although the standard has nothing to say about this.
-             */
-            png_ptr->screen_gamma = png_reciprocal(png_ptr->colorspace.gamma);
-      }
-
-      else if (png_ptr->screen_gamma != 0)
-         /* The converse - assume the file matches the screen, note that this
-          * perhaps undesirable default can (from 1.5.4) be changed by calling
-          * png_set_alpha_mode (even if the alpha handling mode isn't required
-          * or isn't changed from the default.)
-          */
-         png_ptr->colorspace.gamma = png_reciprocal(png_ptr->screen_gamma);
-
-      else /* neither are set */
-         /* Just in case the following prevents any processing - file and screen
-          * are both assumed to be linear and there is no way to introduce a
-          * third gamma value other than png_set_background with 'UNIQUE', and,
-          * prior to 1.5.4
-          */
-         png_ptr->screen_gamma = png_ptr->colorspace.gamma = PNG_FP_1;
-
-      /* We have a gamma value now. */
-      png_ptr->colorspace.flags |= PNG_COLORSPACE_HAVE_GAMMA;
-
-      /* Now turn the gamma transformation on or off as appropriate.  Notice
-       * that PNG_GAMMA just refers to the file->screen correction.  Alpha
-       * composition may independently cause gamma correction because it needs
-       * linear data (e.g. if the file has a gAMA chunk but the screen gamma
-       * hasn't been specified.)  In any case this flag may get turned off in
-       * the code immediately below if the transform can be handled outside the
-       * row loop.
-       */
-      if (gamma_correction != 0)
-         png_ptr->transformations |= PNG_GAMMA;
-
-      else
-         png_ptr->transformations &= ~PNG_GAMMA;
-   }
+   else
+      png_ptr->transformations &= ~PNG_GAMMA;
 #endif
 
    /* Certain transformations have the effect of preventing other
@@ -1454,7 +1533,7 @@ png_init_read_transformations(png_structrp png_ptr)
     * appropriately.
     */
    if ((png_ptr->transformations & PNG_RGB_TO_GRAY) != 0)
-      png_colorspace_set_rgb_coefficients(png_ptr);
+      png_set_rgb_coefficients(png_ptr);
 #endif
 
 #ifdef PNG_READ_GRAY_TO_RGB_SUPPORTED
@@ -1597,10 +1676,10 @@ png_init_read_transformations(png_structrp png_ptr)
     */
    if ((png_ptr->transformations & PNG_GAMMA) != 0 ||
        ((png_ptr->transformations & PNG_RGB_TO_GRAY) != 0 &&
-        (png_gamma_significant(png_ptr->colorspace.gamma) != 0 ||
+        (png_gamma_significant(png_ptr->file_gamma) != 0 ||
          png_gamma_significant(png_ptr->screen_gamma) != 0)) ||
         ((png_ptr->transformations & PNG_COMPOSE) != 0 &&
-         (png_gamma_significant(png_ptr->colorspace.gamma) != 0 ||
+         (png_gamma_significant(png_ptr->file_gamma) != 0 ||
           png_gamma_significant(png_ptr->screen_gamma) != 0
 #  ifdef PNG_READ_BACKGROUND_SUPPORTED
          || (png_ptr->background_gamma_type == PNG_BACKGROUND_GAMMA_UNIQUE &&
@@ -1656,8 +1735,8 @@ png_init_read_transformations(png_structrp png_ptr)
                      break;
 
                   case PNG_BACKGROUND_GAMMA_FILE:
-                     g = png_reciprocal(png_ptr->colorspace.gamma);
-                     gs = png_reciprocal2(png_ptr->colorspace.gamma,
+                     g = png_reciprocal(png_ptr->file_gamma);
+                     gs = png_reciprocal2(png_ptr->file_gamma,
                          png_ptr->screen_gamma);
                      break;
 
@@ -1765,8 +1844,8 @@ png_init_read_transformations(png_structrp png_ptr)
                   break;
 
                case PNG_BACKGROUND_GAMMA_FILE:
-                  g = png_reciprocal(png_ptr->colorspace.gamma);
-                  gs = png_reciprocal2(png_ptr->colorspace.gamma,
+                  g = png_reciprocal(png_ptr->file_gamma);
+                  gs = png_reciprocal2(png_ptr->file_gamma,
                       png_ptr->screen_gamma);
                   break;
 
@@ -2016,11 +2095,11 @@ png_read_transform_info(png_structrp png_ptr, png_inforp info_ptr)
     * been called before this from png_read_update_info->png_read_start_row
     * sometimes does the gamma transform and cancels the flag.
     *
-    * TODO: this looks wrong; the info_ptr should end up with a gamma equal to
-    * the screen_gamma value.  The following probably results in weirdness if
-    * the info_ptr is used by the app after the rows have been read.
+    * TODO: this is confusing.  It only changes the result of png_get_gAMA and,
+    * yes, it does return the value that the transformed data effectively has
+    * but does any app really understand this?
     */
-   info_ptr->colorspace.gamma = png_ptr->colorspace.gamma;
+   info_ptr->gamma = png_ptr->file_gamma;
 #endif
 
    if (info_ptr->bit_depth == 16)
diff --git a/src/java.desktop/share/native/libsplashscreen/libpng/pngrutil.c b/src/java.desktop/share/native/libsplashscreen/libpng/pngrutil.c
index 5280140d12b..6cf466d182a 100644
--- a/src/java.desktop/share/native/libsplashscreen/libpng/pngrutil.c
+++ b/src/java.desktop/share/native/libsplashscreen/libpng/pngrutil.c
@@ -46,6 +46,26 @@
 
 #ifdef PNG_READ_SUPPORTED
 
+/* The minimum 'zlib' stream is assumed to be just the 2 byte header, 5 bytes
+ * minimum 'deflate' stream, and the 4 byte checksum.
+ */
+#define LZ77Min  (2U+5U+4U)
+
+#ifdef PNG_READ_INTERLACING_SUPPORTED
+/* Arrays to facilitate interlacing - use pass (0 - 6) as index. */
+
+/* Start of interlace block */
+static const png_byte png_pass_start[7] = {0, 4, 0, 2, 0, 1, 0};
+/* Offset to next interlace block */
+static const png_byte png_pass_inc[7] = {8, 8, 4, 4, 2, 2, 1};
+/* Start of interlace block in the y direction */
+static const png_byte png_pass_ystart[7] = {0, 0, 4, 0, 2, 0, 1};
+/* Offset to next interlace block in the y direction */
+static const png_byte png_pass_yinc[7] = {8, 8, 8, 4, 4, 2, 2};
+
+/* TODO: Move these arrays to a common utility module to avoid duplication. */
+#endif
+
 png_uint_32 PNGAPI
 png_get_uint_31(png_const_structrp png_ptr, png_const_bytep buf)
 {
@@ -57,30 +77,6 @@ png_get_uint_31(png_const_structrp png_ptr, png_const_bytep buf)
    return uval;
 }
 
-#if defined(PNG_READ_gAMA_SUPPORTED) || defined(PNG_READ_cHRM_SUPPORTED)
-/* The following is a variation on the above for use with the fixed
- * point values used for gAMA and cHRM.  Instead of png_error it
- * issues a warning and returns (-1) - an invalid value because both
- * gAMA and cHRM use *unsigned* integers for fixed point values.
- */
-#define PNG_FIXED_ERROR (-1)
-
-static png_fixed_point /* PRIVATE */
-png_get_fixed_point(png_structrp png_ptr, png_const_bytep buf)
-{
-   png_uint_32 uval = png_get_uint_32(buf);
-
-   if (uval <= PNG_UINT_31_MAX)
-      return (png_fixed_point)uval; /* known to be in range */
-
-   /* The caller can turn off the warning by passing NULL. */
-   if (png_ptr != NULL)
-      png_warning(png_ptr, "PNG fixed point integer out of range");
-
-   return PNG_FIXED_ERROR;
-}
-#endif
-
 #ifdef PNG_READ_INT_FUNCTIONS_SUPPORTED
 /* NOTE: the read macros will obscure these definitions, so that if
  * PNG_USE_READ_MACROS is set the library will not use them internally,
@@ -177,6 +173,38 @@ png_read_sig(png_structrp png_ptr, png_inforp info_ptr)
       png_ptr->mode |= PNG_HAVE_PNG_SIGNATURE;
 }
 
+/* This function is called to verify that a chunk name is valid.
+ * Do this using the bit-whacking approach from contrib/tools/pngfix.c
+ *
+ * Copied from libpng 1.7.
+ */
+static int
+check_chunk_name(png_uint_32 name)
+{
+   png_uint_32 t;
+
+   /* Remove bit 5 from all but the reserved byte; this means
+    * every 8-bit unit must be in the range 65-90 to be valid.
+    * So bit 5 must be zero, bit 6 must be set and bit 7 zero.
+    */
+   name &= ~PNG_U32(32,32,0,32);
+   t = (name & ~0x1f1f1f1fU) ^ 0x40404040U;
+
+   /* Subtract 65 for each 8-bit quantity, this must not
+    * overflow and each byte must then be in the range 0-25.
+    */
+   name -= PNG_U32(65,65,65,65);
+   t |= name;
+
+   /* Subtract 26, handling the overflow which should set the
+    * top three bits of each byte.
+    */
+   name -= PNG_U32(25,25,25,26);
+   t |= ~name;
+
+   return (t & 0xe0e0e0e0U) == 0U;
+}
+
 /* Read the chunk header (length + type name).
  * Put the type name into png_ptr->chunk_name, and return the length.
  */
@@ -184,33 +212,36 @@ png_uint_32 /* PRIVATE */
 png_read_chunk_header(png_structrp png_ptr)
 {
    png_byte buf[8];
-   png_uint_32 length;
+   png_uint_32 chunk_name, length;
 
 #ifdef PNG_IO_STATE_SUPPORTED
    png_ptr->io_state = PNG_IO_READING | PNG_IO_CHUNK_HDR;
 #endif
 
-   /* Read the length and the chunk name.
-    * This must be performed in a single I/O call.
+   /* Read the length and the chunk name.  png_struct::chunk_name is immediately
+    * updated even if they are detectably wrong.  This aids error message
+    * handling by allowing png_chunk_error to be used.
     */
    png_read_data(png_ptr, buf, 8);
    length = png_get_uint_31(png_ptr, buf);
-
-   /* Put the chunk name into png_ptr->chunk_name. */
-   png_ptr->chunk_name = PNG_CHUNK_FROM_STRING(buf+4);
-
-   png_debug2(0, "Reading chunk typeid = 0x%lx, length = %lu",
-       (unsigned long)png_ptr->chunk_name, (unsigned long)length);
+   png_ptr->chunk_name = chunk_name = PNG_CHUNK_FROM_STRING(buf+4);
 
    /* Reset the crc and run it over the chunk name. */
    png_reset_crc(png_ptr);
    png_calculate_crc(png_ptr, buf + 4, 4);
 
-   /* Check to see if chunk name is valid. */
-   png_check_chunk_name(png_ptr, png_ptr->chunk_name);
+   png_debug2(0, "Reading chunk typeid = 0x%lx, length = %lu",
+       (unsigned long)png_ptr->chunk_name, (unsigned long)length);
 
-   /* Check for too-large chunk length */
-   png_check_chunk_length(png_ptr, length);
+   /* Sanity check the length (first by <= 0x80) and the chunk name.  An error
+    * here indicates a broken stream and libpng has no recovery from this.
+    */
+   if (buf[0] >= 0x80U)
+      png_chunk_error(png_ptr, "bad header (invalid length)");
+
+   /* Check to see if chunk name is valid. */
+   if (!check_chunk_name(chunk_name))
+      png_chunk_error(png_ptr, "bad header (invalid type)");
 
 #ifdef PNG_IO_STATE_SUPPORTED
    png_ptr->io_state = PNG_IO_READING | PNG_IO_CHUNK_DATA;
@@ -230,59 +261,43 @@ png_crc_read(png_structrp png_ptr, png_bytep buf, png_uint_32 length)
    png_calculate_crc(png_ptr, buf, length);
 }
 
-/* Optionally skip data and then check the CRC.  Depending on whether we
- * are reading an ancillary or critical chunk, and how the program has set
- * things up, we may calculate the CRC on the data and print a message.
- * Returns '1' if there was a CRC error, '0' otherwise.
- */
-int /* PRIVATE */
-png_crc_finish(png_structrp png_ptr, png_uint_32 skip)
-{
-   /* The size of the local buffer for inflate is a good guess as to a
-    * reasonable size to use for buffering reads from the application.
-    */
-   while (skip > 0)
-   {
-      png_uint_32 len;
-      png_byte tmpbuf[PNG_INFLATE_BUF_SIZE];
-
-      len = (sizeof tmpbuf);
-      if (len > skip)
-         len = skip;
-      skip -= len;
-
-      png_crc_read(png_ptr, tmpbuf, len);
-   }
-
-   if (png_crc_error(png_ptr) != 0)
-   {
-      if (PNG_CHUNK_ANCILLARY(png_ptr->chunk_name) != 0 ?
-          (png_ptr->flags & PNG_FLAG_CRC_ANCILLARY_NOWARN) == 0 :
-          (png_ptr->flags & PNG_FLAG_CRC_CRITICAL_USE) != 0)
-      {
-         png_chunk_warning(png_ptr, "CRC error");
-      }
-
-      else
-         png_chunk_error(png_ptr, "CRC error");
-
-      return 1;
-   }
-
-   return 0;
-}
-
 /* Compare the CRC stored in the PNG file with that calculated by libpng from
  * the data it has read thus far.
  */
-int /* PRIVATE */
-png_crc_error(png_structrp png_ptr)
+static int
+png_crc_error(png_structrp png_ptr, int handle_as_ancillary)
 {
    png_byte crc_bytes[4];
    png_uint_32 crc;
    int need_crc = 1;
 
-   if (PNG_CHUNK_ANCILLARY(png_ptr->chunk_name) != 0)
+   /* There are four flags two for ancillary and two for critical chunks.  The
+    * default setting of these flags is all zero.
+    *
+    * PNG_FLAG_CRC_ANCILLARY_USE
+    * PNG_FLAG_CRC_ANCILLARY_NOWARN
+    *  USE+NOWARN: no CRC calculation (implemented here), else;
+    *  NOWARN:     png_chunk_error on error (implemented in png_crc_finish)
+    *  else:       png_chunk_warning on error (implemented in png_crc_finish)
+    *              This is the default.
+    *
+    *    I.e. NOWARN without USE produces png_chunk_error.  The default setting
+    *    where neither are set does the same thing.
+    *
+    * PNG_FLAG_CRC_CRITICAL_USE
+    * PNG_FLAG_CRC_CRITICAL_IGNORE
+    *  IGNORE: no CRC calculation (implemented here), else;
+    *  USE:    png_chunk_warning on error (implemented in png_crc_finish)
+    *  else:   png_chunk_error on error (implemented in png_crc_finish)
+    *          This is the default.
+    *
+    * This arose because of original mis-implementation and has persisted for
+    * compatibility reasons.
+    *
+    * TODO: the flag names are internal so maybe this can be changed to
+    * something comprehensible.
+    */
+   if (handle_as_ancillary || PNG_CHUNK_ANCILLARY(png_ptr->chunk_name) != 0)
    {
       if ((png_ptr->flags & PNG_FLAG_CRC_ANCILLARY_MASK) ==
           (PNG_FLAG_CRC_ANCILLARY_USE | PNG_FLAG_CRC_ANCILLARY_NOWARN))
@@ -312,21 +327,87 @@ png_crc_error(png_structrp png_ptr)
       return 0;
 }
 
+/* Optionally skip data and then check the CRC.  Depending on whether we
+ * are reading an ancillary or critical chunk, and how the program has set
+ * things up, we may calculate the CRC on the data and print a message.
+ * Returns '1' if there was a CRC error, '0' otherwise.
+ *
+ * There is one public version which is used in most places and another which
+ * takes the value for the 'critical' flag to check.  This allows PLTE and IEND
+ * handling code to ignore the CRC error and removes some confusing code
+ * duplication.
+ */
+static int
+png_crc_finish_critical(png_structrp png_ptr, png_uint_32 skip,
+      int handle_as_ancillary)
+{
+   /* The size of the local buffer for inflate is a good guess as to a
+    * reasonable size to use for buffering reads from the application.
+    */
+   while (skip > 0)
+   {
+      png_uint_32 len;
+      png_byte tmpbuf[PNG_INFLATE_BUF_SIZE];
+
+      len = (sizeof tmpbuf);
+      if (len > skip)
+         len = skip;
+      skip -= len;
+
+      png_crc_read(png_ptr, tmpbuf, len);
+   }
+
+   /* If 'handle_as_ancillary' has been requested and this is a critical chunk
+    * but PNG_FLAG_CRC_CRITICAL_IGNORE was set then png_read_crc did not, in
+    * fact, calculate the CRC so the ANCILLARY settings should not be used
+    * instead.
+    */
+   if (handle_as_ancillary &&
+       (png_ptr->flags & PNG_FLAG_CRC_CRITICAL_IGNORE) != 0)
+      handle_as_ancillary = 0;
+
+   /* TODO: this might be more comprehensible if png_crc_error was inlined here.
+    */
+   if (png_crc_error(png_ptr, handle_as_ancillary) != 0)
+   {
+      /* See above for the explanation of how the flags work. */
+      if (handle_as_ancillary || PNG_CHUNK_ANCILLARY(png_ptr->chunk_name) != 0 ?
+          (png_ptr->flags & PNG_FLAG_CRC_ANCILLARY_NOWARN) == 0 :
+          (png_ptr->flags & PNG_FLAG_CRC_CRITICAL_USE) != 0)
+         png_chunk_warning(png_ptr, "CRC error");
+
+      else
+         png_chunk_error(png_ptr, "CRC error");
+
+      return 1;
+   }
+
+   return 0;
+}
+
+int /* PRIVATE */
+png_crc_finish(png_structrp png_ptr, png_uint_32 skip)
+{
+   return png_crc_finish_critical(png_ptr, skip, 0/*critical handling*/);
+}
+
 #if defined(PNG_READ_iCCP_SUPPORTED) || defined(PNG_READ_iTXt_SUPPORTED) ||\
     defined(PNG_READ_pCAL_SUPPORTED) || defined(PNG_READ_sCAL_SUPPORTED) ||\
     defined(PNG_READ_sPLT_SUPPORTED) || defined(PNG_READ_tEXt_SUPPORTED) ||\
-    defined(PNG_READ_zTXt_SUPPORTED) || defined(PNG_SEQUENTIAL_READ_SUPPORTED)
+    defined(PNG_READ_zTXt_SUPPORTED) || defined(PNG_READ_eXIf_SUPPORTED) ||\
+    defined(PNG_SEQUENTIAL_READ_SUPPORTED)
 /* Manage the read buffer; this simply reallocates the buffer if it is not small
  * enough (or if it is not allocated).  The routine returns a pointer to the
  * buffer; if an error occurs and 'warn' is set the routine returns NULL, else
- * it will call png_error (via png_malloc) on failure.  (warn == 2 means
- * 'silent').
+ * it will call png_error on failure.
  */
 static png_bytep
-png_read_buffer(png_structrp png_ptr, png_alloc_size_t new_size, int warn)
+png_read_buffer(png_structrp png_ptr, png_alloc_size_t new_size)
 {
    png_bytep buffer = png_ptr->read_buffer;
 
+   if (new_size > png_chunk_max(png_ptr)) return NULL;
+
    if (buffer != NULL && new_size > png_ptr->read_buffer_size)
    {
       png_ptr->read_buffer = NULL;
@@ -341,24 +422,17 @@ png_read_buffer(png_structrp png_ptr, png_alloc_size_t new_size, int warn)
 
       if (buffer != NULL)
       {
-         memset(buffer, 0, new_size); /* just in case */
+#        ifndef PNG_NO_MEMZERO /* for detecting UIM bugs **only** */
+            memset(buffer, 0, new_size); /* just in case */
+#        endif
          png_ptr->read_buffer = buffer;
          png_ptr->read_buffer_size = new_size;
       }
-
-      else if (warn < 2) /* else silent */
-      {
-         if (warn != 0)
-             png_chunk_warning(png_ptr, "insufficient memory to read chunk");
-
-         else
-             png_chunk_error(png_ptr, "insufficient memory to read chunk");
-      }
    }
 
    return buffer;
 }
-#endif /* READ_iCCP|iTXt|pCAL|sCAL|sPLT|tEXt|zTXt|SEQUENTIAL_READ */
+#endif /* READ_iCCP|iTXt|pCAL|sCAL|sPLT|tEXt|zTXt|eXIf|SEQUENTIAL_READ */
 
 /* png_inflate_claim: claim the zstream for some nefarious purpose that involves
  * decompression.  Returns Z_OK on success, else a zlib error code.  It checks
@@ -645,16 +719,7 @@ png_decompress_chunk(png_structrp png_ptr,
     * maybe a '\0' terminator too.  We have to assume that 'prefix_size' is
     * limited only by the maximum chunk size.
     */
-   png_alloc_size_t limit = PNG_SIZE_MAX;
-
-# ifdef PNG_SET_USER_LIMITS_SUPPORTED
-   if (png_ptr->user_chunk_malloc_max > 0 &&
-       png_ptr->user_chunk_malloc_max < limit)
-      limit = png_ptr->user_chunk_malloc_max;
-# elif PNG_USER_CHUNK_MALLOC_MAX > 0
-   if (PNG_USER_CHUNK_MALLOC_MAX < limit)
-      limit = PNG_USER_CHUNK_MALLOC_MAX;
-# endif
+   png_alloc_size_t limit = png_chunk_max(png_ptr);
 
    if (limit >= prefix_size + (terminate != 0))
    {
@@ -859,9 +924,9 @@ png_inflate_read(png_structrp png_ptr, png_bytep read_buffer, uInt read_size,
 }
 #endif /* READ_iCCP */
 
+/* CHUNK HANDLING */
 /* Read and check the IDHR chunk */
-
-void /* PRIVATE */
+static png_handle_result_code
 png_handle_IHDR(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
 {
    png_byte buf[13];
@@ -871,12 +936,7 @@ png_handle_IHDR(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
 
    png_debug(1, "in png_handle_IHDR");
 
-   if ((png_ptr->mode & PNG_HAVE_IHDR) != 0)
-      png_chunk_error(png_ptr, "out of place");
-
-   /* Check the length */
-   if (length != 13)
-      png_chunk_error(png_ptr, "invalid");
+   /* Length and position are checked by the caller. */
 
    png_ptr->mode |= PNG_HAVE_IHDR;
 
@@ -930,257 +990,196 @@ png_handle_IHDR(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
    png_debug1(3, "bit_depth = %d", png_ptr->bit_depth);
    png_debug1(3, "channels = %d", png_ptr->channels);
    png_debug1(3, "rowbytes = %lu", (unsigned long)png_ptr->rowbytes);
+
+   /* Rely on png_set_IHDR to completely validate the data and call png_error if
+    * it's wrong.
+    */
    png_set_IHDR(png_ptr, info_ptr, width, height, bit_depth,
        color_type, interlace_type, compression_type, filter_type);
+
+   return handled_ok;
+   PNG_UNUSED(length)
 }
 
 /* Read and check the palette */
-void /* PRIVATE */
+/* TODO: there are several obvious errors in this code when handling
+ * out-of-place chunks and there is much over-complexity caused by trying to
+ * patch up the problems.
+ */
+static png_handle_result_code
 png_handle_PLTE(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
 {
-   png_color palette[PNG_MAX_PALETTE_LENGTH];
-   int max_palette_length, num, i;
-#ifdef PNG_POINTER_INDEXING_SUPPORTED
-   png_colorp pal_ptr;
-#endif
+   png_const_charp errmsg = NULL;
 
    png_debug(1, "in png_handle_PLTE");
 
-   if ((png_ptr->mode & PNG_HAVE_IHDR) == 0)
-      png_chunk_error(png_ptr, "missing IHDR");
-
-   /* Moved to before the 'after IDAT' check below because otherwise duplicate
-    * PLTE chunks are potentially ignored (the spec says there shall not be more
-    * than one PLTE, the error is not treated as benign, so this check trumps
-    * the requirement that PLTE appears before IDAT.)
+   /* 1.6.47: consistency.  This used to be especially treated as a critical
+    * error even in an image which is not colour mapped, there isn't a good
+    * justification for treating some errors here one way and others another so
+    * everything uses the same logic.
     */
-   else if ((png_ptr->mode & PNG_HAVE_PLTE) != 0)
-      png_chunk_error(png_ptr, "duplicate");
+   if ((png_ptr->mode & PNG_HAVE_PLTE) != 0)
+      errmsg = "duplicate";
 
    else if ((png_ptr->mode & PNG_HAVE_IDAT) != 0)
-   {
-      /* This is benign because the non-benign error happened before, when an
-       * IDAT was encountered in a color-mapped image with no PLTE.
-       */
-      png_crc_finish(png_ptr, length);
-      png_chunk_benign_error(png_ptr, "out of place");
-      return;
-   }
+      errmsg = "out of place";
 
-   png_ptr->mode |= PNG_HAVE_PLTE;
+   else if ((png_ptr->color_type & PNG_COLOR_MASK_COLOR) == 0)
+      errmsg = "ignored in grayscale PNG";
 
-   if ((png_ptr->color_type & PNG_COLOR_MASK_COLOR) == 0)
-   {
-      png_crc_finish(png_ptr, length);
-      png_chunk_benign_error(png_ptr, "ignored in grayscale PNG");
-      return;
-   }
+   else if (length > 3*PNG_MAX_PALETTE_LENGTH || (length % 3) != 0)
+      errmsg = "invalid";
 
-#ifndef PNG_READ_OPT_PLTE_SUPPORTED
-   if (png_ptr->color_type != PNG_COLOR_TYPE_PALETTE)
-   {
-      png_crc_finish(png_ptr, length);
-      return;
-   }
-#endif
-
-   if (length > 3*PNG_MAX_PALETTE_LENGTH || length % 3)
-   {
-      png_crc_finish(png_ptr, length);
-
-      if (png_ptr->color_type != PNG_COLOR_TYPE_PALETTE)
-         png_chunk_benign_error(png_ptr, "invalid");
-
-      else
-         png_chunk_error(png_ptr, "invalid");
-
-      return;
-   }
-
-   /* The cast is safe because 'length' is less than 3*PNG_MAX_PALETTE_LENGTH */
-   num = (int)length / 3;
-
-   /* If the palette has 256 or fewer entries but is too large for the bit
-    * depth, we don't issue an error, to preserve the behavior of previous
-    * libpng versions. We silently truncate the unused extra palette entries
-    * here.
+   /* This drops PLTE in favour of tRNS or bKGD because both of those chunks
+    * can have an effect on the rendering of the image whereas PLTE only matters
+    * in the case of an 8-bit display with a decoder which controls the palette.
+    *
+    * The alternative here is to ignore the error and store the palette anyway;
+    * destroying the tRNS will definately cause problems.
+    *
+    * NOTE: the case of PNG_COLOR_TYPE_PALETTE need not be considered because
+    * the png_handle_ routines for the three 'after PLTE' chunks tRNS, bKGD and
+    * hIST all check for a preceding PLTE in these cases.
     */
-   if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE)
-      max_palette_length = (1 << png_ptr->bit_depth);
+   else if (png_ptr->color_type != PNG_COLOR_TYPE_PALETTE &&
+            (png_has_chunk(png_ptr, tRNS) || png_has_chunk(png_ptr, bKGD)))
+      errmsg = "out of place";
+
    else
-      max_palette_length = PNG_MAX_PALETTE_LENGTH;
-
-   if (num > max_palette_length)
-      num = max_palette_length;
-
-#ifdef PNG_POINTER_INDEXING_SUPPORTED
-   for (i = 0, pal_ptr = palette; i < num; i++, pal_ptr++)
    {
-      png_byte buf[3];
-
-      png_crc_read(png_ptr, buf, 3);
-      pal_ptr->red = buf[0];
-      pal_ptr->green = buf[1];
-      pal_ptr->blue = buf[2];
-   }
-#else
-   for (i = 0; i < num; i++)
-   {
-      png_byte buf[3];
-
-      png_crc_read(png_ptr, buf, 3);
-      /* Don't depend upon png_color being any order */
-      palette[i].red = buf[0];
-      palette[i].green = buf[1];
-      palette[i].blue = buf[2];
-   }
-#endif
-
-   /* If we actually need the PLTE chunk (ie for a paletted image), we do
-    * whatever the normal CRC configuration tells us.  However, if we
-    * have an RGB image, the PLTE can be considered ancillary, so
-    * we will act as though it is.
-    */
-#ifndef PNG_READ_OPT_PLTE_SUPPORTED
-   if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE)
-#endif
-   {
-      png_crc_finish(png_ptr, (png_uint_32) (length - (unsigned int)num * 3));
-   }
-
-#ifndef PNG_READ_OPT_PLTE_SUPPORTED
-   else if (png_crc_error(png_ptr) != 0)  /* Only if we have a CRC error */
-   {
-      /* If we don't want to use the data from an ancillary chunk,
-       * we have two options: an error abort, or a warning and we
-       * ignore the data in this chunk (which should be OK, since
-       * it's considered ancillary for a RGB or RGBA image).
-       *
-       * IMPLEMENTATION NOTE: this is only here because png_crc_finish uses the
-       * chunk type to determine whether to check the ancillary or the critical
-       * flags.
+      /* If the palette has 256 or fewer entries but is too large for the bit
+       * depth we don't issue an error to preserve the behavior of previous
+       * libpng versions. We silently truncate the unused extra palette entries
+       * here.
        */
-      if ((png_ptr->flags & PNG_FLAG_CRC_ANCILLARY_USE) == 0)
-      {
-         if ((png_ptr->flags & PNG_FLAG_CRC_ANCILLARY_NOWARN) != 0)
-            return;
+      const unsigned max_palette_length =
+         (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE) ?
+            1U << png_ptr->bit_depth : PNG_MAX_PALETTE_LENGTH;
 
-         else
-            png_chunk_error(png_ptr, "CRC error");
+      /* The cast is safe because 'length' is less than
+       * 3*PNG_MAX_PALETTE_LENGTH
+       */
+      const unsigned num = (length > 3U*max_palette_length) ?
+         max_palette_length : (unsigned)length / 3U;
+
+      unsigned i, j;
+      png_byte buf[3*PNG_MAX_PALETTE_LENGTH];
+      png_color palette[PNG_MAX_PALETTE_LENGTH];
+
+      /* Read the chunk into the buffer then read to the end of the chunk. */
+      png_crc_read(png_ptr, buf, num*3U);
+      png_crc_finish_critical(png_ptr, length - 3U*num,
+            /* Handle as ancillary if PLTE is optional: */
+            png_ptr->color_type != PNG_COLOR_TYPE_PALETTE);
+
+      for (i = 0U, j = 0U; i < num; i++)
+      {
+         palette[i].red = buf[j++];
+         palette[i].green = buf[j++];
+         palette[i].blue = buf[j++];
       }
 
-      /* Otherwise, we (optionally) emit a warning and use the chunk. */
-      else if ((png_ptr->flags & PNG_FLAG_CRC_ANCILLARY_NOWARN) == 0)
-         png_chunk_warning(png_ptr, "CRC error");
-   }
-#endif
+      /* A valid PLTE chunk has been read */
+      png_ptr->mode |= PNG_HAVE_PLTE;
 
-   /* TODO: png_set_PLTE has the side effect of setting png_ptr->palette to its
-    * own copy of the palette.  This has the side effect that when png_start_row
-    * is called (this happens after any call to png_read_update_info) the
-    * info_ptr palette gets changed.  This is extremely unexpected and
-    * confusing.
-    *
-    * Fix this by not sharing the palette in this way.
-    */
-   png_set_PLTE(png_ptr, info_ptr, palette, num);
-
-   /* The three chunks, bKGD, hIST and tRNS *must* appear after PLTE and before
-    * IDAT.  Prior to 1.6.0 this was not checked; instead the code merely
-    * checked the apparent validity of a tRNS chunk inserted before PLTE on a
-    * palette PNG.  1.6.0 attempts to rigorously follow the standard and
-    * therefore does a benign error if the erroneous condition is detected *and*
-    * cancels the tRNS if the benign error returns.  The alternative is to
-    * amend the standard since it would be rather hypocritical of the standards
-    * maintainers to ignore it.
-    */
-#ifdef PNG_READ_tRNS_SUPPORTED
-   if (png_ptr->num_trans > 0 ||
-       (info_ptr != NULL && (info_ptr->valid & PNG_INFO_tRNS) != 0))
-   {
-      /* Cancel this because otherwise it would be used if the transforms
-       * require it.  Don't cancel the 'valid' flag because this would prevent
-       * detection of duplicate chunks.
+      /* TODO: png_set_PLTE has the side effect of setting png_ptr->palette to
+       * its own copy of the palette.  This has the side effect that when
+       * png_start_row is called (this happens after any call to
+       * png_read_update_info) the info_ptr palette gets changed.  This is
+       * extremely unexpected and confusing.
+       *
+       * REVIEW: there have been consistent bugs in the past about gamma and
+       * similar transforms to colour mapped images being useless because the
+       * modified palette cannot be accessed because of the above.
+       *
+       * CONSIDER: Fix this by not sharing the palette in this way.  But does
+       * this completely fix the problem?
        */
-      png_ptr->num_trans = 0;
-
-      if (info_ptr != NULL)
-         info_ptr->num_trans = 0;
-
-      png_chunk_benign_error(png_ptr, "tRNS must be after");
+      png_set_PLTE(png_ptr, info_ptr, palette, num);
+      return handled_ok;
    }
-#endif
 
-#ifdef PNG_READ_hIST_SUPPORTED
-   if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_hIST) != 0)
-      png_chunk_benign_error(png_ptr, "hIST must be after");
-#endif
+   /* Here on error: errmsg is non NULL. */
+   if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE)
+   {
+      png_crc_finish(png_ptr, length);
+      png_chunk_error(png_ptr, errmsg);
+   }
 
-#ifdef PNG_READ_bKGD_SUPPORTED
-   if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_bKGD) != 0)
-      png_chunk_benign_error(png_ptr, "bKGD must be after");
-#endif
+   else /* not critical to this image */
+   {
+      png_crc_finish_critical(png_ptr, length, 1/*handle as ancillary*/);
+      png_chunk_benign_error(png_ptr, errmsg);
+   }
+
+   /* Because PNG_UNUSED(errmsg) does not work if all the uses are compiled out
+    * (this does happen).
+    */
+   return errmsg != NULL ? handled_error : handled_error;
 }
 
-void /* PRIVATE */
+/* On read the IDAT chunk is always handled specially, even if marked for
+ * unknown handling (this is allowed), so:
+ */
+#define png_handle_IDAT NULL
+
+static png_handle_result_code
 png_handle_IEND(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
 {
    png_debug(1, "in png_handle_IEND");
 
-   if ((png_ptr->mode & PNG_HAVE_IHDR) == 0 ||
-       (png_ptr->mode & PNG_HAVE_IDAT) == 0)
-      png_chunk_error(png_ptr, "out of place");
-
    png_ptr->mode |= (PNG_AFTER_IDAT | PNG_HAVE_IEND);
 
-   png_crc_finish(png_ptr, length);
-
    if (length != 0)
       png_chunk_benign_error(png_ptr, "invalid");
 
+   png_crc_finish_critical(png_ptr, length, 1/*handle as ancillary*/);
+
+   return handled_ok;
    PNG_UNUSED(info_ptr)
 }
 
 #ifdef PNG_READ_gAMA_SUPPORTED
-void /* PRIVATE */
+static png_handle_result_code
 png_handle_gAMA(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
 {
-   png_fixed_point igamma;
+   png_uint_32 ugamma;
    png_byte buf[4];
 
    png_debug(1, "in png_handle_gAMA");
 
-   if ((png_ptr->mode & PNG_HAVE_IHDR) == 0)
-      png_chunk_error(png_ptr, "missing IHDR");
-
-   else if ((png_ptr->mode & (PNG_HAVE_IDAT|PNG_HAVE_PLTE)) != 0)
-   {
-      png_crc_finish(png_ptr, length);
-      png_chunk_benign_error(png_ptr, "out of place");
-      return;
-   }
-
-   if (length != 4)
-   {
-      png_crc_finish(png_ptr, length);
-      png_chunk_benign_error(png_ptr, "invalid");
-      return;
-   }
-
    png_crc_read(png_ptr, buf, 4);
 
    if (png_crc_finish(png_ptr, 0) != 0)
-      return;
+      return handled_error;
 
-   igamma = png_get_fixed_point(NULL, buf);
+   ugamma = png_get_uint_32(buf);
 
-   png_colorspace_set_gamma(png_ptr, &png_ptr->colorspace, igamma);
-   png_colorspace_sync(png_ptr, info_ptr);
+   if (ugamma > PNG_UINT_31_MAX)
+   {
+      png_chunk_benign_error(png_ptr, "invalid");
+      return handled_error;
+   }
+
+   png_set_gAMA_fixed(png_ptr, info_ptr, (png_fixed_point)/*SAFE*/ugamma);
+
+#ifdef PNG_READ_GAMMA_SUPPORTED
+      /* PNGv3: chunk precedence for gamma is cICP, [iCCP], sRGB, gAMA.  gAMA is
+       * at the end of the chain so simply check for an unset value.
+       */
+      if (png_ptr->chunk_gamma == 0)
+         png_ptr->chunk_gamma = (png_fixed_point)/*SAFE*/ugamma;
+#endif /*READ_GAMMA*/
+
+   return handled_ok;
+   PNG_UNUSED(length)
 }
+#else
+#  define png_handle_gAMA NULL
 #endif
 
 #ifdef PNG_READ_sBIT_SUPPORTED
-void /* PRIVATE */
+static png_handle_result_code /* PRIVATE */
 png_handle_sBIT(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
 {
    unsigned int truelen, i;
@@ -1189,23 +1188,6 @@ png_handle_sBIT(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
 
    png_debug(1, "in png_handle_sBIT");
 
-   if ((png_ptr->mode & PNG_HAVE_IHDR) == 0)
-      png_chunk_error(png_ptr, "missing IHDR");
-
-   else if ((png_ptr->mode & (PNG_HAVE_IDAT|PNG_HAVE_PLTE)) != 0)
-   {
-      png_crc_finish(png_ptr, length);
-      png_chunk_benign_error(png_ptr, "out of place");
-      return;
-   }
-
-   if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_sBIT) != 0)
-   {
-      png_crc_finish(png_ptr, length);
-      png_chunk_benign_error(png_ptr, "duplicate");
-      return;
-   }
-
    if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE)
    {
       truelen = 3;
@@ -1218,25 +1200,25 @@ png_handle_sBIT(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
       sample_depth = png_ptr->bit_depth;
    }
 
-   if (length != truelen || length > 4)
+   if (length != truelen)
    {
-      png_chunk_benign_error(png_ptr, "invalid");
       png_crc_finish(png_ptr, length);
-      return;
+      png_chunk_benign_error(png_ptr, "bad length");
+      return handled_error;
    }
 
    buf[0] = buf[1] = buf[2] = buf[3] = sample_depth;
    png_crc_read(png_ptr, buf, truelen);
 
    if (png_crc_finish(png_ptr, 0) != 0)
-      return;
+      return handled_error;
 
    for (i=0; i<truelen; ++i)
    {
       if (buf[i] == 0 || buf[i] > sample_depth)
       {
          png_chunk_benign_error(png_ptr, "invalid");
-         return;
+         return handled_error;
       }
    }
 
@@ -1248,7 +1230,7 @@ png_handle_sBIT(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
       png_ptr->sig_bit.alpha = buf[3];
    }
 
-   else
+   else /* grayscale */
    {
       png_ptr->sig_bit.gray = buf[0];
       png_ptr->sig_bit.red = buf[0];
@@ -1258,133 +1240,132 @@ png_handle_sBIT(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
    }
 
    png_set_sBIT(png_ptr, info_ptr, &(png_ptr->sig_bit));
+   return handled_ok;
 }
+#else
+#  define png_handle_sBIT NULL
 #endif
 
 #ifdef PNG_READ_cHRM_SUPPORTED
-void /* PRIVATE */
+static png_int_32
+png_get_int_32_checked(png_const_bytep buf, int *error)
+{
+   png_uint_32 uval = png_get_uint_32(buf);
+   if ((uval & 0x80000000) == 0) /* non-negative */
+      return (png_int_32)uval;
+
+   uval = (uval ^ 0xffffffff) + 1;  /* 2's complement: -x = ~x+1 */
+   if ((uval & 0x80000000) == 0) /* no overflow */
+      return -(png_int_32)uval;
+
+   /* This version of png_get_int_32 has a way of returning the error to the
+    * caller, so:
+    */
+   *error = 1;
+   return 0; /* Safe */
+}
+
+static png_handle_result_code /* PRIVATE */
 png_handle_cHRM(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
 {
-   png_byte buf[32];
+   int error = 0;
    png_xy xy;
+   png_byte buf[32];
 
    png_debug(1, "in png_handle_cHRM");
 
-   if ((png_ptr->mode & PNG_HAVE_IHDR) == 0)
-      png_chunk_error(png_ptr, "missing IHDR");
-
-   else if ((png_ptr->mode & (PNG_HAVE_IDAT|PNG_HAVE_PLTE)) != 0)
-   {
-      png_crc_finish(png_ptr, length);
-      png_chunk_benign_error(png_ptr, "out of place");
-      return;
-   }
-
-   if (length != 32)
-   {
-      png_crc_finish(png_ptr, length);
-      png_chunk_benign_error(png_ptr, "invalid");
-      return;
-   }
-
    png_crc_read(png_ptr, buf, 32);
 
    if (png_crc_finish(png_ptr, 0) != 0)
-      return;
+      return handled_error;
 
-   xy.whitex = png_get_fixed_point(NULL, buf);
-   xy.whitey = png_get_fixed_point(NULL, buf + 4);
-   xy.redx   = png_get_fixed_point(NULL, buf + 8);
-   xy.redy   = png_get_fixed_point(NULL, buf + 12);
-   xy.greenx = png_get_fixed_point(NULL, buf + 16);
-   xy.greeny = png_get_fixed_point(NULL, buf + 20);
-   xy.bluex  = png_get_fixed_point(NULL, buf + 24);
-   xy.bluey  = png_get_fixed_point(NULL, buf + 28);
+   xy.whitex = png_get_int_32_checked(buf +  0, &error);
+   xy.whitey = png_get_int_32_checked(buf +  4, &error);
+   xy.redx   = png_get_int_32_checked(buf +  8, &error);
+   xy.redy   = png_get_int_32_checked(buf + 12, &error);
+   xy.greenx = png_get_int_32_checked(buf + 16, &error);
+   xy.greeny = png_get_int_32_checked(buf + 20, &error);
+   xy.bluex  = png_get_int_32_checked(buf + 24, &error);
+   xy.bluey  = png_get_int_32_checked(buf + 28, &error);
 
-   if (xy.whitex == PNG_FIXED_ERROR ||
-       xy.whitey == PNG_FIXED_ERROR ||
-       xy.redx   == PNG_FIXED_ERROR ||
-       xy.redy   == PNG_FIXED_ERROR ||
-       xy.greenx == PNG_FIXED_ERROR ||
-       xy.greeny == PNG_FIXED_ERROR ||
-       xy.bluex  == PNG_FIXED_ERROR ||
-       xy.bluey  == PNG_FIXED_ERROR)
+   if (error)
    {
-      png_chunk_benign_error(png_ptr, "invalid values");
-      return;
+      png_chunk_benign_error(png_ptr, "invalid");
+      return handled_error;
    }
 
-   /* If a colorspace error has already been output skip this chunk */
-   if ((png_ptr->colorspace.flags & PNG_COLORSPACE_INVALID) != 0)
-      return;
+   /* png_set_cHRM may complain about some of the values but this doesn't matter
+    * because it was a cHRM and it did have vaguely (if, perhaps, ridiculous)
+    * values.  Ridiculousity will be checked if the values are used later.
+    */
+   png_set_cHRM_fixed(png_ptr, info_ptr, xy.whitex, xy.whitey, xy.redx, xy.redy,
+         xy.greenx, xy.greeny, xy.bluex, xy.bluey);
 
-   if ((png_ptr->colorspace.flags & PNG_COLORSPACE_FROM_cHRM) != 0)
-   {
-      png_ptr->colorspace.flags |= PNG_COLORSPACE_INVALID;
-      png_colorspace_sync(png_ptr, info_ptr);
-      png_chunk_benign_error(png_ptr, "duplicate");
-      return;
-   }
+   /* We only use 'chromaticities' for RGB to gray */
+#  ifdef PNG_READ_RGB_TO_GRAY_SUPPORTED
+      /* There is no need to check sRGB here, cICP is NYI and iCCP is not
+       * supported so just check mDCV.
+       */
+      if (!png_has_chunk(png_ptr, mDCV))
+      {
+         png_ptr->chromaticities = xy;
+      }
+#  endif /* READ_RGB_TO_GRAY */
 
-   png_ptr->colorspace.flags |= PNG_COLORSPACE_FROM_cHRM;
-   (void)png_colorspace_set_chromaticities(png_ptr, &png_ptr->colorspace, &xy,
-       1/*prefer cHRM values*/);
-   png_colorspace_sync(png_ptr, info_ptr);
+   return handled_ok;
+   PNG_UNUSED(length)
 }
+#else
+#  define png_handle_cHRM NULL
 #endif
 
 #ifdef PNG_READ_sRGB_SUPPORTED
-void /* PRIVATE */
+static png_handle_result_code /* PRIVATE */
 png_handle_sRGB(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
 {
    png_byte intent;
 
    png_debug(1, "in png_handle_sRGB");
 
-   if ((png_ptr->mode & PNG_HAVE_IHDR) == 0)
-      png_chunk_error(png_ptr, "missing IHDR");
-
-   else if ((png_ptr->mode & (PNG_HAVE_IDAT|PNG_HAVE_PLTE)) != 0)
-   {
-      png_crc_finish(png_ptr, length);
-      png_chunk_benign_error(png_ptr, "out of place");
-      return;
-   }
-
-   if (length != 1)
-   {
-      png_crc_finish(png_ptr, length);
-      png_chunk_benign_error(png_ptr, "invalid");
-      return;
-   }
-
    png_crc_read(png_ptr, &intent, 1);
 
    if (png_crc_finish(png_ptr, 0) != 0)
-      return;
+      return handled_error;
 
-   /* If a colorspace error has already been output skip this chunk */
-   if ((png_ptr->colorspace.flags & PNG_COLORSPACE_INVALID) != 0)
-      return;
-
-   /* Only one sRGB or iCCP chunk is allowed, use the HAVE_INTENT flag to detect
-    * this.
+   /* This checks the range of the "rendering intent" because it is specified in
+    * the PNG spec itself; the "reserved" values will result in the chunk not
+    * being accepted, just as they do with the various "reserved" values in
+    * IHDR.
     */
-   if ((png_ptr->colorspace.flags & PNG_COLORSPACE_HAVE_INTENT) != 0)
+   if (intent > 3/*PNGv3 spec*/)
    {
-      png_ptr->colorspace.flags |= PNG_COLORSPACE_INVALID;
-      png_colorspace_sync(png_ptr, info_ptr);
-      png_chunk_benign_error(png_ptr, "too many profiles");
-      return;
+      png_chunk_benign_error(png_ptr, "invalid");
+      return handled_error;
    }
 
-   (void)png_colorspace_set_sRGB(png_ptr, &png_ptr->colorspace, intent);
-   png_colorspace_sync(png_ptr, info_ptr);
+   png_set_sRGB(png_ptr, info_ptr, intent);
+   /* NOTE: png_struct::chromaticities is not set here because the RGB to gray
+    * coefficients are known without a need for the chromaticities.
+    */
+
+#ifdef PNG_READ_GAMMA_SUPPORTED
+      /* PNGv3: chunk precedence for gamma is cICP, [iCCP], sRGB, gAMA.  iCCP is
+       * not supported by libpng so the only requirement is to check for cICP
+       * setting the gamma (this is NYI, but this check is safe.)
+       */
+      if (!png_has_chunk(png_ptr, cICP) || png_ptr->chunk_gamma == 0)
+         png_ptr->chunk_gamma = PNG_GAMMA_sRGB_INVERSE;
+#endif /*READ_GAMMA*/
+
+   return handled_ok;
+   PNG_UNUSED(length)
 }
+#else
+#  define png_handle_sRGB NULL
 #endif /* READ_sRGB */
 
 #ifdef PNG_READ_iCCP_SUPPORTED
-void /* PRIVATE */
+static png_handle_result_code /* PRIVATE */
 png_handle_iCCP(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
 /* Note: this does not properly handle profiles that are > 64K under DOS */
 {
@@ -1393,44 +1374,10 @@ png_handle_iCCP(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
 
    png_debug(1, "in png_handle_iCCP");
 
-   if ((png_ptr->mode & PNG_HAVE_IHDR) == 0)
-      png_chunk_error(png_ptr, "missing IHDR");
-
-   else if ((png_ptr->mode & (PNG_HAVE_IDAT|PNG_HAVE_PLTE)) != 0)
-   {
-      png_crc_finish(png_ptr, length);
-      png_chunk_benign_error(png_ptr, "out of place");
-      return;
-   }
-
-   /* Consistent with all the above colorspace handling an obviously *invalid*
-    * chunk is just ignored, so does not invalidate the color space.  An
-    * alternative is to set the 'invalid' flags at the start of this routine
-    * and only clear them in they were not set before and all the tests pass.
+   /* PNGv3: allow PNG files with both sRGB and iCCP because the PNG spec only
+    * ever said that there "should" be only one, not "shall" and the PNGv3
+    * colour chunk precedence rules give a handling for this case anyway.
     */
-
-   /* The keyword must be at least one character and there is a
-    * terminator (0) byte and the compression method byte, and the
-    * 'zlib' datastream is at least 11 bytes.
-    */
-   if (length < 14)
-   {
-      png_crc_finish(png_ptr, length);
-      png_chunk_benign_error(png_ptr, "too short");
-      return;
-   }
-
-   /* If a colorspace error has already been output skip this chunk */
-   if ((png_ptr->colorspace.flags & PNG_COLORSPACE_INVALID) != 0)
-   {
-      png_crc_finish(png_ptr, length);
-      return;
-   }
-
-   /* Only one sRGB or iCCP chunk is allowed, use the HAVE_INTENT flag to detect
-    * this.
-    */
-   if ((png_ptr->colorspace.flags & PNG_COLORSPACE_HAVE_INTENT) == 0)
    {
       uInt read_length, keyword_length;
       char keyword[81];
@@ -1440,19 +1387,16 @@ png_handle_iCCP(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
        */
       read_length = 81; /* maximum */
       if (read_length > length)
-         read_length = (uInt)length;
+         read_length = (uInt)/*SAFE*/length;
 
       png_crc_read(png_ptr, (png_bytep)keyword, read_length);
       length -= read_length;
 
-      /* The minimum 'zlib' stream is assumed to be just the 2 byte header,
-       * 5 bytes minimum 'deflate' stream, and the 4 byte checksum.
-       */
-      if (length < 11)
+      if (length < LZ77Min)
       {
          png_crc_finish(png_ptr, length);
          png_chunk_benign_error(png_ptr, "too short");
-         return;
+         return handled_error;
       }
 
       keyword_length = 0;
@@ -1489,15 +1433,14 @@ png_handle_iCCP(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
                    */
                   png_uint_32 profile_length = png_get_uint_32(profile_header);
 
-                  if (png_icc_check_length(png_ptr, &png_ptr->colorspace,
-                      keyword, profile_length) != 0)
+                  if (png_icc_check_length(png_ptr, keyword, profile_length) !=
+                      0)
                   {
                      /* The length is apparently ok, so we can check the 132
                       * byte header.
                       */
-                     if (png_icc_check_header(png_ptr, &png_ptr->colorspace,
-                         keyword, profile_length, profile_header,
-                         png_ptr->color_type) != 0)
+                     if (png_icc_check_header(png_ptr, keyword, profile_length,
+                              profile_header, png_ptr->color_type) != 0)
                      {
                         /* Now read the tag table; a variable size buffer is
                          * needed at this point, allocate one for the whole
@@ -1507,7 +1450,7 @@ png_handle_iCCP(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
                         png_uint_32 tag_count =
                            png_get_uint_32(profile_header + 128);
                         png_bytep profile = png_read_buffer(png_ptr,
-                            profile_length, 2/*silent*/);
+                              profile_length);
 
                         if (profile != NULL)
                         {
@@ -1526,8 +1469,7 @@ png_handle_iCCP(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
                            if (size == 0)
                            {
                               if (png_icc_check_tag_table(png_ptr,
-                                  &png_ptr->colorspace, keyword, profile_length,
-                                  profile) != 0)
+                                       keyword, profile_length, profile) != 0)
                               {
                                  /* The profile has been validated for basic
                                   * security issues, so read the whole thing in.
@@ -1559,13 +1501,6 @@ png_handle_iCCP(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
                                     png_crc_finish(png_ptr, length);
                                     finished = 1;
 
-# if defined(PNG_sRGB_SUPPORTED) && PNG_sRGB_PROFILE_CHECKS >= 0
-                                    /* Check for a match against sRGB */
-                                    png_icc_set_sRGB(png_ptr,
-                                        &png_ptr->colorspace, profile,
-                                        png_ptr->zstream.adler);
-# endif
-
                                     /* Steal the profile for info_ptr. */
                                     if (info_ptr != NULL)
                                     {
@@ -1588,11 +1523,7 @@ png_handle_iCCP(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
                                        }
 
                                        else
-                                       {
-                                          png_ptr->colorspace.flags |=
-                                             PNG_COLORSPACE_INVALID;
                                           errmsg = "out of memory";
-                                       }
                                     }
 
                                     /* else the profile remains in the read
@@ -1600,13 +1531,10 @@ png_handle_iCCP(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
                                      * chunks.
                                      */
 
-                                    if (info_ptr != NULL)
-                                       png_colorspace_sync(png_ptr, info_ptr);
-
                                     if (errmsg == NULL)
                                     {
                                        png_ptr->zowner = 0;
-                                       return;
+                                       return handled_ok;
                                     }
                                  }
                                  if (errmsg == NULL)
@@ -1647,22 +1575,21 @@ png_handle_iCCP(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
          errmsg = "bad keyword";
    }
 
-   else
-      errmsg = "too many profiles";
-
    /* Failure: the reason is in 'errmsg' */
    if (finished == 0)
       png_crc_finish(png_ptr, length);
 
-   png_ptr->colorspace.flags |= PNG_COLORSPACE_INVALID;
-   png_colorspace_sync(png_ptr, info_ptr);
    if (errmsg != NULL) /* else already output */
       png_chunk_benign_error(png_ptr, errmsg);
+
+   return handled_error;
 }
+#else
+#  define png_handle_iCCP NULL
 #endif /* READ_iCCP */
 
 #ifdef PNG_READ_sPLT_SUPPORTED
-void /* PRIVATE */
+static png_handle_result_code /* PRIVATE */
 png_handle_sPLT(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
 /* Note: this does not properly handle chunks that are > 64K under DOS */
 {
@@ -1683,43 +1610,24 @@ png_handle_sPLT(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
       if (png_ptr->user_chunk_cache_max == 1)
       {
          png_crc_finish(png_ptr, length);
-         return;
+         return handled_error;
       }
 
       if (--png_ptr->user_chunk_cache_max == 1)
       {
          png_warning(png_ptr, "No space in chunk cache for sPLT");
          png_crc_finish(png_ptr, length);
-         return;
+         return handled_error;
       }
    }
 #endif
 
-   if ((png_ptr->mode & PNG_HAVE_IHDR) == 0)
-      png_chunk_error(png_ptr, "missing IHDR");
-
-   else if ((png_ptr->mode & PNG_HAVE_IDAT) != 0)
-   {
-      png_crc_finish(png_ptr, length);
-      png_chunk_benign_error(png_ptr, "out of place");
-      return;
-   }
-
-#ifdef PNG_MAX_MALLOC_64K
-   if (length > 65535U)
-   {
-      png_crc_finish(png_ptr, length);
-      png_chunk_benign_error(png_ptr, "too large to fit in memory");
-      return;
-   }
-#endif
-
-   buffer = png_read_buffer(png_ptr, length+1, 2/*silent*/);
+   buffer = png_read_buffer(png_ptr, length+1);
    if (buffer == NULL)
    {
       png_crc_finish(png_ptr, length);
       png_chunk_benign_error(png_ptr, "out of memory");
-      return;
+      return handled_error;
    }
 
 
@@ -1730,7 +1638,7 @@ png_handle_sPLT(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
    png_crc_read(png_ptr, buffer, length);
 
    if (png_crc_finish(png_ptr, skip) != 0)
-      return;
+      return handled_error;
 
    buffer[length] = 0;
 
@@ -1743,7 +1651,7 @@ png_handle_sPLT(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
    if (length < 2U || entry_start > buffer + (length - 2U))
    {
       png_warning(png_ptr, "malformed sPLT chunk");
-      return;
+      return handled_error;
    }
 
    new_palette.depth = *entry_start++;
@@ -1757,7 +1665,7 @@ png_handle_sPLT(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
    if ((data_length % (unsigned int)entry_size) != 0)
    {
       png_warning(png_ptr, "sPLT chunk has bad length");
-      return;
+      return handled_error;
    }
 
    dl = (png_uint_32)(data_length / (unsigned int)entry_size);
@@ -1766,7 +1674,7 @@ png_handle_sPLT(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
    if (dl > max_dl)
    {
       png_warning(png_ptr, "sPLT chunk too long");
-      return;
+      return handled_error;
    }
 
    new_palette.nentries = (png_int_32)(data_length / (unsigned int)entry_size);
@@ -1777,10 +1685,9 @@ png_handle_sPLT(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
    if (new_palette.entries == NULL)
    {
       png_warning(png_ptr, "sPLT chunk requires too much memory");
-      return;
+      return handled_error;
    }
 
-#ifdef PNG_POINTER_INDEXING_SUPPORTED
    for (i = 0; i < new_palette.nentries; i++)
    {
       pp = new_palette.entries + i;
@@ -1803,31 +1710,6 @@ png_handle_sPLT(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
 
       pp->frequency = png_get_uint_16(entry_start); entry_start += 2;
    }
-#else
-   pp = new_palette.entries;
-
-   for (i = 0; i < new_palette.nentries; i++)
-   {
-
-      if (new_palette.depth == 8)
-      {
-         pp[i].red   = *entry_start++;
-         pp[i].green = *entry_start++;
-         pp[i].blue  = *entry_start++;
-         pp[i].alpha = *entry_start++;
-      }
-
-      else
-      {
-         pp[i].red   = png_get_uint_16(entry_start); entry_start += 2;
-         pp[i].green = png_get_uint_16(entry_start); entry_start += 2;
-         pp[i].blue  = png_get_uint_16(entry_start); entry_start += 2;
-         pp[i].alpha = png_get_uint_16(entry_start); entry_start += 2;
-      }
-
-      pp[i].frequency = png_get_uint_16(entry_start); entry_start += 2;
-   }
-#endif
 
    /* Discard all chunk data except the name and stash that */
    new_palette.name = (png_charp)buffer;
@@ -1835,34 +1717,20 @@ png_handle_sPLT(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
    png_set_sPLT(png_ptr, info_ptr, &new_palette, 1);
 
    png_free(png_ptr, new_palette.entries);
+   return handled_ok;
 }
+#else
+#  define png_handle_sPLT NULL
 #endif /* READ_sPLT */
 
 #ifdef PNG_READ_tRNS_SUPPORTED
-void /* PRIVATE */
+static png_handle_result_code /* PRIVATE */
 png_handle_tRNS(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
 {
    png_byte readbuf[PNG_MAX_PALETTE_LENGTH];
 
    png_debug(1, "in png_handle_tRNS");
 
-   if ((png_ptr->mode & PNG_HAVE_IHDR) == 0)
-      png_chunk_error(png_ptr, "missing IHDR");
-
-   else if ((png_ptr->mode & PNG_HAVE_IDAT) != 0)
-   {
-      png_crc_finish(png_ptr, length);
-      png_chunk_benign_error(png_ptr, "out of place");
-      return;
-   }
-
-   else if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_tRNS) != 0)
-   {
-      png_crc_finish(png_ptr, length);
-      png_chunk_benign_error(png_ptr, "duplicate");
-      return;
-   }
-
    if (png_ptr->color_type == PNG_COLOR_TYPE_GRAY)
    {
       png_byte buf[2];
@@ -1871,7 +1739,7 @@ png_handle_tRNS(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
       {
          png_crc_finish(png_ptr, length);
          png_chunk_benign_error(png_ptr, "invalid");
-         return;
+         return handled_error;
       }
 
       png_crc_read(png_ptr, buf, 2);
@@ -1887,7 +1755,7 @@ png_handle_tRNS(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
       {
          png_crc_finish(png_ptr, length);
          png_chunk_benign_error(png_ptr, "invalid");
-         return;
+         return handled_error;
       }
 
       png_crc_read(png_ptr, buf, length);
@@ -1901,10 +1769,9 @@ png_handle_tRNS(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
    {
       if ((png_ptr->mode & PNG_HAVE_PLTE) == 0)
       {
-         /* TODO: is this actually an error in the ISO spec? */
          png_crc_finish(png_ptr, length);
          png_chunk_benign_error(png_ptr, "out of place");
-         return;
+         return handled_error;
       }
 
       if (length > (unsigned int) png_ptr->num_palette ||
@@ -1913,7 +1780,7 @@ png_handle_tRNS(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
       {
          png_crc_finish(png_ptr, length);
          png_chunk_benign_error(png_ptr, "invalid");
-         return;
+         return handled_error;
       }
 
       png_crc_read(png_ptr, readbuf, length);
@@ -1924,13 +1791,13 @@ png_handle_tRNS(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
    {
       png_crc_finish(png_ptr, length);
       png_chunk_benign_error(png_ptr, "invalid with alpha channel");
-      return;
+      return handled_error;
    }
 
    if (png_crc_finish(png_ptr, 0) != 0)
    {
       png_ptr->num_trans = 0;
-      return;
+      return handled_error;
    }
 
    /* TODO: this is a horrible side effect in the palette case because the
@@ -1939,11 +1806,14 @@ png_handle_tRNS(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
     */
    png_set_tRNS(png_ptr, info_ptr, readbuf, png_ptr->num_trans,
        &(png_ptr->trans_color));
+   return handled_ok;
 }
+#else
+#  define png_handle_tRNS NULL
 #endif
 
 #ifdef PNG_READ_bKGD_SUPPORTED
-void /* PRIVATE */
+static png_handle_result_code /* PRIVATE */
 png_handle_bKGD(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
 {
    unsigned int truelen;
@@ -1952,27 +1822,17 @@ png_handle_bKGD(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
 
    png_debug(1, "in png_handle_bKGD");
 
-   if ((png_ptr->mode & PNG_HAVE_IHDR) == 0)
-      png_chunk_error(png_ptr, "missing IHDR");
-
-   else if ((png_ptr->mode & PNG_HAVE_IDAT) != 0 ||
-       (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE &&
-       (png_ptr->mode & PNG_HAVE_PLTE) == 0))
-   {
-      png_crc_finish(png_ptr, length);
-      png_chunk_benign_error(png_ptr, "out of place");
-      return;
-   }
-
-   else if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_bKGD) != 0)
-   {
-      png_crc_finish(png_ptr, length);
-      png_chunk_benign_error(png_ptr, "duplicate");
-      return;
-   }
-
    if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE)
+   {
+      if ((png_ptr->mode & PNG_HAVE_PLTE) == 0)
+      {
+         png_crc_finish(png_ptr, length);
+         png_chunk_benign_error(png_ptr, "out of place");
+         return handled_error;
+      }
+
       truelen = 1;
+   }
 
    else if ((png_ptr->color_type & PNG_COLOR_MASK_COLOR) != 0)
       truelen = 6;
@@ -1984,13 +1844,13 @@ png_handle_bKGD(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
    {
       png_crc_finish(png_ptr, length);
       png_chunk_benign_error(png_ptr, "invalid");
-      return;
+      return handled_error;
    }
 
    png_crc_read(png_ptr, buf, truelen);
 
    if (png_crc_finish(png_ptr, 0) != 0)
-      return;
+      return handled_error;
 
    /* We convert the index value into RGB components so that we can allow
     * arbitrary RGB values for background when we have transparency, and
@@ -2006,7 +1866,7 @@ png_handle_bKGD(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
          if (buf[0] >= info_ptr->num_palette)
          {
             png_chunk_benign_error(png_ptr, "invalid index");
-            return;
+            return handled_error;
          }
 
          background.red = (png_uint_16)png_ptr->palette[buf[0]].red;
@@ -2027,7 +1887,7 @@ png_handle_bKGD(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
          if (buf[0] != 0 || buf[1] >= (unsigned int)(1 << png_ptr->bit_depth))
          {
             png_chunk_benign_error(png_ptr, "invalid gray level");
-            return;
+            return handled_error;
          }
       }
 
@@ -2045,7 +1905,7 @@ png_handle_bKGD(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
          if (buf[0] != 0 || buf[2] != 0 || buf[4] != 0)
          {
             png_chunk_benign_error(png_ptr, "invalid color");
-            return;
+            return handled_error;
          }
       }
 
@@ -2057,75 +1917,174 @@ png_handle_bKGD(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
    }
 
    png_set_bKGD(png_ptr, info_ptr, &background);
+   return handled_ok;
 }
+#else
+#  define png_handle_bKGD NULL
+#endif
+
+#ifdef PNG_READ_cICP_SUPPORTED
+static png_handle_result_code /* PRIVATE */
+png_handle_cICP(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
+{
+   png_byte buf[4];
+
+   png_debug(1, "in png_handle_cICP");
+
+   png_crc_read(png_ptr, buf, 4);
+
+   if (png_crc_finish(png_ptr, 0) != 0)
+      return handled_error;
+
+   png_set_cICP(png_ptr, info_ptr, buf[0], buf[1],  buf[2], buf[3]);
+
+   /* We only use 'chromaticities' for RGB to gray */
+#  ifdef PNG_READ_RGB_TO_GRAY_SUPPORTED
+      if (!png_has_chunk(png_ptr, mDCV))
+      {
+         /* TODO: png_ptr->chromaticities = chromaticities; */
+      }
+#  endif /* READ_RGB_TO_GRAY */
+
+#ifdef PNG_READ_GAMMA_SUPPORTED
+      /* PNGv3: chunk precedence for gamma is cICP, [iCCP], sRGB, gAMA.  cICP is
+       * at the head so simply set the gamma if it can be determined.  If not
+       * chunk_gamma remains unchanged; sRGB and gAMA handling check it for
+       * being zero.
+       */
+      /* TODO: set png_struct::chunk_gamma when possible */
+#endif /*READ_GAMMA*/
+
+   return handled_ok;
+   PNG_UNUSED(length)
+}
+#else
+#  define png_handle_cICP NULL
+#endif
+
+#ifdef PNG_READ_cLLI_SUPPORTED
+static png_handle_result_code /* PRIVATE */
+png_handle_cLLI(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
+{
+   png_byte buf[8];
+
+   png_debug(1, "in png_handle_cLLI");
+
+   png_crc_read(png_ptr, buf, 8);
+
+   if (png_crc_finish(png_ptr, 0) != 0)
+      return handled_error;
+
+   /* The error checking happens here, this puts it in just one place: */
+   png_set_cLLI_fixed(png_ptr, info_ptr, png_get_uint_32(buf),
+         png_get_uint_32(buf+4));
+   return handled_ok;
+   PNG_UNUSED(length)
+}
+#else
+#  define png_handle_cLLI NULL
+#endif
+
+#ifdef PNG_READ_mDCV_SUPPORTED
+static png_handle_result_code /* PRIVATE */
+png_handle_mDCV(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
+{
+   png_xy chromaticities;
+   png_byte buf[24];
+
+   png_debug(1, "in png_handle_mDCV");
+
+   png_crc_read(png_ptr, buf, 24);
+
+   if (png_crc_finish(png_ptr, 0) != 0)
+      return handled_error;
+
+   /* The error checking happens here, this puts it in just one place.  The
+    * odd /50000 scaling factor makes it more difficult but the (x.y) values are
+    * only two bytes so a <<1 is safe.
+    *
+    * WARNING: the PNG specification defines the cHRM chunk to **start** with
+    * the white point (x,y).  The W3C PNG v3 specification puts the white point
+    * **after* R,G,B.  The x,y values in mDCV are also scaled by 50,000 and
+    * stored in just two bytes, whereas those in cHRM are scaled by 100,000 and
+    * stored in four bytes.  This is very, very confusing.  These APIs remove
+    * the confusion by copying the existing, well established, API.
+    */
+   chromaticities.redx   = png_get_uint_16(buf+ 0U) << 1; /* red x */
+   chromaticities.redy   = png_get_uint_16(buf+ 2U) << 1; /* red y */
+   chromaticities.greenx = png_get_uint_16(buf+ 4U) << 1; /* green x */
+   chromaticities.greeny = png_get_uint_16(buf+ 6U) << 1; /* green y */
+   chromaticities.bluex  = png_get_uint_16(buf+ 8U) << 1; /* blue x */
+   chromaticities.bluey  = png_get_uint_16(buf+10U) << 1; /* blue y */
+   chromaticities.whitex = png_get_uint_16(buf+12U) << 1; /* white x */
+   chromaticities.whitey = png_get_uint_16(buf+14U) << 1; /* white y */
+
+   png_set_mDCV_fixed(png_ptr, info_ptr,
+         chromaticities.whitex, chromaticities.whitey,
+         chromaticities.redx, chromaticities.redy,
+         chromaticities.greenx, chromaticities.greeny,
+         chromaticities.bluex, chromaticities.bluey,
+         png_get_uint_32(buf+16U), /* peak luminance */
+         png_get_uint_32(buf+20U));/* minimum perceivable luminance */
+
+   /* We only use 'chromaticities' for RGB to gray */
+#  ifdef PNG_READ_RGB_TO_GRAY_SUPPORTED
+      png_ptr->chromaticities = chromaticities;
+#  endif /* READ_RGB_TO_GRAY */
+
+   return handled_ok;
+   PNG_UNUSED(length)
+}
+#else
+#  define png_handle_mDCV NULL
 #endif
 
 #ifdef PNG_READ_eXIf_SUPPORTED
-void /* PRIVATE */
+static png_handle_result_code /* PRIVATE */
 png_handle_eXIf(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
 {
-   unsigned int i;
+   png_bytep buffer = NULL;
 
    png_debug(1, "in png_handle_eXIf");
 
-   if ((png_ptr->mode & PNG_HAVE_IHDR) == 0)
-      png_chunk_error(png_ptr, "missing IHDR");
+   buffer = png_read_buffer(png_ptr, length);
 
-   if (length < 2)
-   {
-      png_crc_finish(png_ptr, length);
-      png_chunk_benign_error(png_ptr, "too short");
-      return;
-   }
-
-   else if (info_ptr == NULL || (info_ptr->valid & PNG_INFO_eXIf) != 0)
-   {
-      png_crc_finish(png_ptr, length);
-      png_chunk_benign_error(png_ptr, "duplicate");
-      return;
-   }
-
-   info_ptr->free_me |= PNG_FREE_EXIF;
-
-   info_ptr->eXIf_buf = png_voidcast(png_bytep,
-             png_malloc_warn(png_ptr, length));
-
-   if (info_ptr->eXIf_buf == NULL)
+   if (buffer == NULL)
    {
       png_crc_finish(png_ptr, length);
       png_chunk_benign_error(png_ptr, "out of memory");
-      return;
+      return handled_error;
    }
 
-   for (i = 0; i < length; i++)
+   png_crc_read(png_ptr, buffer, length);
+
+   if (png_crc_finish(png_ptr, 0) != 0)
+      return handled_error;
+
+   /* PNGv3: the code used to check the byte order mark at the start for MM or
+    * II, however PNGv3 states that the the first 4 bytes should be checked.
+    * The caller ensures that there are four bytes available.
+    */
    {
-      png_byte buf[1];
-      png_crc_read(png_ptr, buf, 1);
-      info_ptr->eXIf_buf[i] = buf[0];
-      if (i == 1)
+      png_uint_32 header = png_get_uint_32(buffer);
+
+      /* These numbers are copied from the PNGv3 spec: */
+      if (header != 0x49492A00 && header != 0x4D4D002A)
       {
-         if ((buf[0] != 'M' && buf[0] != 'I') ||
-             (info_ptr->eXIf_buf[0] != buf[0]))
-         {
-            png_crc_finish(png_ptr, length - 2);
-            png_chunk_benign_error(png_ptr, "incorrect byte-order specifier");
-            png_free(png_ptr, info_ptr->eXIf_buf);
-            info_ptr->eXIf_buf = NULL;
-            return;
-         }
+         png_chunk_benign_error(png_ptr, "invalid");
+         return handled_error;
       }
    }
 
-   if (png_crc_finish(png_ptr, 0) == 0)
-      png_set_eXIf_1(png_ptr, info_ptr, length, info_ptr->eXIf_buf);
-
-   png_free(png_ptr, info_ptr->eXIf_buf);
-   info_ptr->eXIf_buf = NULL;
+   png_set_eXIf_1(png_ptr, info_ptr, length, buffer);
+   return handled_ok;
 }
+#else
+#  define png_handle_eXIf NULL
 #endif
 
 #ifdef PNG_READ_hIST_SUPPORTED
-void /* PRIVATE */
+static png_handle_result_code /* PRIVATE */
 png_handle_hIST(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
 {
    unsigned int num, i;
@@ -2133,25 +2092,13 @@ png_handle_hIST(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
 
    png_debug(1, "in png_handle_hIST");
 
-   if ((png_ptr->mode & PNG_HAVE_IHDR) == 0)
-      png_chunk_error(png_ptr, "missing IHDR");
-
-   else if ((png_ptr->mode & PNG_HAVE_IDAT) != 0 ||
-       (png_ptr->mode & PNG_HAVE_PLTE) == 0)
-   {
-      png_crc_finish(png_ptr, length);
-      png_chunk_benign_error(png_ptr, "out of place");
-      return;
-   }
-
-   else if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_hIST) != 0)
-   {
-      png_crc_finish(png_ptr, length);
-      png_chunk_benign_error(png_ptr, "duplicate");
-      return;
-   }
-
-   num = length / 2 ;
+   /* This cast is safe because the chunk definition limits the length to a
+    * maximum of 1024 bytes.
+    *
+    * TODO: maybe use png_uint_32 anyway, not unsigned int, to reduce the
+    * casts.
+    */
+   num = (unsigned int)length / 2 ;
 
    if (length != num * 2 ||
        num != (unsigned int)png_ptr->num_palette ||
@@ -2159,7 +2106,7 @@ png_handle_hIST(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
    {
       png_crc_finish(png_ptr, length);
       png_chunk_benign_error(png_ptr, "invalid");
-      return;
+      return handled_error;
    }
 
    for (i = 0; i < num; i++)
@@ -2171,14 +2118,17 @@ png_handle_hIST(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
    }
 
    if (png_crc_finish(png_ptr, 0) != 0)
-      return;
+      return handled_error;
 
    png_set_hIST(png_ptr, info_ptr, readbuf);
+   return handled_ok;
 }
+#else
+#  define png_handle_hIST NULL
 #endif
 
 #ifdef PNG_READ_pHYs_SUPPORTED
-void /* PRIVATE */
+static png_handle_result_code /* PRIVATE */
 png_handle_pHYs(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
 {
    png_byte buf[9];
@@ -2187,44 +2137,24 @@ png_handle_pHYs(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
 
    png_debug(1, "in png_handle_pHYs");
 
-   if ((png_ptr->mode & PNG_HAVE_IHDR) == 0)
-      png_chunk_error(png_ptr, "missing IHDR");
-
-   else if ((png_ptr->mode & PNG_HAVE_IDAT) != 0)
-   {
-      png_crc_finish(png_ptr, length);
-      png_chunk_benign_error(png_ptr, "out of place");
-      return;
-   }
-
-   else if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_pHYs) != 0)
-   {
-      png_crc_finish(png_ptr, length);
-      png_chunk_benign_error(png_ptr, "duplicate");
-      return;
-   }
-
-   if (length != 9)
-   {
-      png_crc_finish(png_ptr, length);
-      png_chunk_benign_error(png_ptr, "invalid");
-      return;
-   }
-
    png_crc_read(png_ptr, buf, 9);
 
    if (png_crc_finish(png_ptr, 0) != 0)
-      return;
+      return handled_error;
 
    res_x = png_get_uint_32(buf);
    res_y = png_get_uint_32(buf + 4);
    unit_type = buf[8];
    png_set_pHYs(png_ptr, info_ptr, res_x, res_y, unit_type);
+   return handled_ok;
+   PNG_UNUSED(length)
 }
+#else
+#  define png_handle_pHYs NULL
 #endif
 
 #ifdef PNG_READ_oFFs_SUPPORTED
-void /* PRIVATE */
+static png_handle_result_code /* PRIVATE */
 png_handle_oFFs(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
 {
    png_byte buf[9];
@@ -2233,45 +2163,25 @@ png_handle_oFFs(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
 
    png_debug(1, "in png_handle_oFFs");
 
-   if ((png_ptr->mode & PNG_HAVE_IHDR) == 0)
-      png_chunk_error(png_ptr, "missing IHDR");
-
-   else if ((png_ptr->mode & PNG_HAVE_IDAT) != 0)
-   {
-      png_crc_finish(png_ptr, length);
-      png_chunk_benign_error(png_ptr, "out of place");
-      return;
-   }
-
-   else if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_oFFs) != 0)
-   {
-      png_crc_finish(png_ptr, length);
-      png_chunk_benign_error(png_ptr, "duplicate");
-      return;
-   }
-
-   if (length != 9)
-   {
-      png_crc_finish(png_ptr, length);
-      png_chunk_benign_error(png_ptr, "invalid");
-      return;
-   }
-
    png_crc_read(png_ptr, buf, 9);
 
    if (png_crc_finish(png_ptr, 0) != 0)
-      return;
+      return handled_error;
 
    offset_x = png_get_int_32(buf);
    offset_y = png_get_int_32(buf + 4);
    unit_type = buf[8];
    png_set_oFFs(png_ptr, info_ptr, offset_x, offset_y, unit_type);
+   return handled_ok;
+   PNG_UNUSED(length)
 }
+#else
+#  define png_handle_oFFs NULL
 #endif
 
 #ifdef PNG_READ_pCAL_SUPPORTED
 /* Read the pCAL chunk (described in the PNG Extensions document) */
-void /* PRIVATE */
+static png_handle_result_code /* PRIVATE */
 png_handle_pCAL(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
 {
    png_int_32 X0, X1;
@@ -2281,40 +2191,22 @@ png_handle_pCAL(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
    int i;
 
    png_debug(1, "in png_handle_pCAL");
-
-   if ((png_ptr->mode & PNG_HAVE_IHDR) == 0)
-      png_chunk_error(png_ptr, "missing IHDR");
-
-   else if ((png_ptr->mode & PNG_HAVE_IDAT) != 0)
-   {
-      png_crc_finish(png_ptr, length);
-      png_chunk_benign_error(png_ptr, "out of place");
-      return;
-   }
-
-   else if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_pCAL) != 0)
-   {
-      png_crc_finish(png_ptr, length);
-      png_chunk_benign_error(png_ptr, "duplicate");
-      return;
-   }
-
    png_debug1(2, "Allocating and reading pCAL chunk data (%u bytes)",
        length + 1);
 
-   buffer = png_read_buffer(png_ptr, length+1, 2/*silent*/);
+   buffer = png_read_buffer(png_ptr, length+1);
 
    if (buffer == NULL)
    {
       png_crc_finish(png_ptr, length);
       png_chunk_benign_error(png_ptr, "out of memory");
-      return;
+      return handled_error;
    }
 
    png_crc_read(png_ptr, buffer, length);
 
    if (png_crc_finish(png_ptr, 0) != 0)
-      return;
+      return handled_error;
 
    buffer[length] = 0; /* Null terminate the last string */
 
@@ -2330,7 +2222,7 @@ png_handle_pCAL(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
    if (endptr - buf <= 12)
    {
       png_chunk_benign_error(png_ptr, "invalid");
-      return;
+      return handled_error;
    }
 
    png_debug(3, "Reading pCAL X0, X1, type, nparams, and units");
@@ -2350,7 +2242,7 @@ png_handle_pCAL(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
        (type == PNG_EQUATION_HYPERBOLIC && nparams != 4))
    {
       png_chunk_benign_error(png_ptr, "invalid parameter count");
-      return;
+      return handled_error;
    }
 
    else if (type >= PNG_EQUATION_LAST)
@@ -2369,7 +2261,7 @@ png_handle_pCAL(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
    if (params == NULL)
    {
       png_chunk_benign_error(png_ptr, "out of memory");
-      return;
+      return handled_error;
    }
 
    /* Get pointers to the start of each parameter string. */
@@ -2387,20 +2279,29 @@ png_handle_pCAL(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
       {
          png_free(png_ptr, params);
          png_chunk_benign_error(png_ptr, "invalid data");
-         return;
+         return handled_error;
       }
    }
 
    png_set_pCAL(png_ptr, info_ptr, (png_charp)buffer, X0, X1, type, nparams,
        (png_charp)units, params);
 
+   /* TODO: BUG: png_set_pCAL calls png_chunk_report which, in this case, calls
+    * png_benign_error and that can error out.
+    *
+    * png_read_buffer needs to be allocated with space for both nparams and the
+    * parameter strings.  Not hard to do.
+    */
    png_free(png_ptr, params);
+   return handled_ok;
 }
+#else
+#  define png_handle_pCAL NULL
 #endif
 
 #ifdef PNG_READ_sCAL_SUPPORTED
 /* Read the sCAL chunk */
-void /* PRIVATE */
+static png_handle_result_code /* PRIVATE */
 png_handle_sCAL(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
 {
    png_bytep buffer;
@@ -2408,55 +2309,29 @@ png_handle_sCAL(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
    int state;
 
    png_debug(1, "in png_handle_sCAL");
-
-   if ((png_ptr->mode & PNG_HAVE_IHDR) == 0)
-      png_chunk_error(png_ptr, "missing IHDR");
-
-   else if ((png_ptr->mode & PNG_HAVE_IDAT) != 0)
-   {
-      png_crc_finish(png_ptr, length);
-      png_chunk_benign_error(png_ptr, "out of place");
-      return;
-   }
-
-   else if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_sCAL) != 0)
-   {
-      png_crc_finish(png_ptr, length);
-      png_chunk_benign_error(png_ptr, "duplicate");
-      return;
-   }
-
-   /* Need unit type, width, \0, height: minimum 4 bytes */
-   else if (length < 4)
-   {
-      png_crc_finish(png_ptr, length);
-      png_chunk_benign_error(png_ptr, "invalid");
-      return;
-   }
-
    png_debug1(2, "Allocating and reading sCAL chunk data (%u bytes)",
        length + 1);
 
-   buffer = png_read_buffer(png_ptr, length+1, 2/*silent*/);
+   buffer = png_read_buffer(png_ptr, length+1);
 
    if (buffer == NULL)
    {
-      png_chunk_benign_error(png_ptr, "out of memory");
       png_crc_finish(png_ptr, length);
-      return;
+      png_chunk_benign_error(png_ptr, "out of memory");
+      return handled_error;
    }
 
    png_crc_read(png_ptr, buffer, length);
    buffer[length] = 0; /* Null terminate the last string */
 
    if (png_crc_finish(png_ptr, 0) != 0)
-      return;
+      return handled_error;
 
    /* Validate the unit. */
    if (buffer[0] != 1 && buffer[0] != 2)
    {
       png_chunk_benign_error(png_ptr, "invalid unit");
-      return;
+      return handled_error;
    }
 
    /* Validate the ASCII numbers, need two ASCII numbers separated by
@@ -2485,15 +2360,22 @@ png_handle_sCAL(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
          png_chunk_benign_error(png_ptr, "non-positive height");
 
       else
+      {
          /* This is the (only) success case. */
          png_set_sCAL_s(png_ptr, info_ptr, buffer[0],
              (png_charp)buffer+1, (png_charp)buffer+heighti);
+         return handled_ok;
+      }
    }
+
+   return handled_error;
 }
+#else
+#  define png_handle_sCAL NULL
 #endif
 
 #ifdef PNG_READ_tIME_SUPPORTED
-void /* PRIVATE */
+static png_handle_result_code /* PRIVATE */
 png_handle_tIME(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
 {
    png_byte buf[7];
@@ -2501,30 +2383,17 @@ png_handle_tIME(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
 
    png_debug(1, "in png_handle_tIME");
 
-   if ((png_ptr->mode & PNG_HAVE_IHDR) == 0)
-      png_chunk_error(png_ptr, "missing IHDR");
-
-   else if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_tIME) != 0)
-   {
-      png_crc_finish(png_ptr, length);
-      png_chunk_benign_error(png_ptr, "duplicate");
-      return;
-   }
-
+   /* TODO: what is this doing here?  It should be happened in pngread.c and
+    * pngpread.c, although it could be moved to png_handle_chunk below and
+    * thereby avoid some code duplication.
+    */
    if ((png_ptr->mode & PNG_HAVE_IDAT) != 0)
       png_ptr->mode |= PNG_AFTER_IDAT;
 
-   if (length != 7)
-   {
-      png_crc_finish(png_ptr, length);
-      png_chunk_benign_error(png_ptr, "invalid");
-      return;
-   }
-
    png_crc_read(png_ptr, buf, 7);
 
    if (png_crc_finish(png_ptr, 0) != 0)
-      return;
+      return handled_error;
 
    mod_time.second = buf[6];
    mod_time.minute = buf[5];
@@ -2534,12 +2403,16 @@ png_handle_tIME(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
    mod_time.year = png_get_uint_16(buf);
 
    png_set_tIME(png_ptr, info_ptr, &mod_time);
+   return handled_ok;
+   PNG_UNUSED(length)
 }
+#else
+#  define png_handle_tIME NULL
 #endif
 
 #ifdef PNG_READ_tEXt_SUPPORTED
 /* Note: this does not properly handle chunks that are > 64K under DOS */
-void /* PRIVATE */
+static png_handle_result_code /* PRIVATE */
 png_handle_tEXt(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
 {
    png_text  text_info;
@@ -2556,45 +2429,35 @@ png_handle_tEXt(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
       if (png_ptr->user_chunk_cache_max == 1)
       {
          png_crc_finish(png_ptr, length);
-         return;
+         return handled_error;
       }
 
       if (--png_ptr->user_chunk_cache_max == 1)
       {
          png_crc_finish(png_ptr, length);
          png_chunk_benign_error(png_ptr, "no space in chunk cache");
-         return;
+         return handled_error;
       }
    }
 #endif
 
-   if ((png_ptr->mode & PNG_HAVE_IHDR) == 0)
-      png_chunk_error(png_ptr, "missing IHDR");
-
+   /* TODO: this doesn't work and shouldn't be necessary. */
    if ((png_ptr->mode & PNG_HAVE_IDAT) != 0)
       png_ptr->mode |= PNG_AFTER_IDAT;
 
-#ifdef PNG_MAX_MALLOC_64K
-   if (length > 65535U)
-   {
-      png_crc_finish(png_ptr, length);
-      png_chunk_benign_error(png_ptr, "too large to fit in memory");
-      return;
-   }
-#endif
-
-   buffer = png_read_buffer(png_ptr, length+1, 1/*warn*/);
+   buffer = png_read_buffer(png_ptr, length+1);
 
    if (buffer == NULL)
    {
+      png_crc_finish(png_ptr, length);
       png_chunk_benign_error(png_ptr, "out of memory");
-      return;
+      return handled_error;
    }
 
    png_crc_read(png_ptr, buffer, length);
 
    if (png_crc_finish(png_ptr, skip) != 0)
-      return;
+      return handled_error;
 
    key = (png_charp)buffer;
    key[length] = 0;
@@ -2613,14 +2476,19 @@ png_handle_tEXt(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
    text_info.text = text;
    text_info.text_length = strlen(text);
 
-   if (png_set_text_2(png_ptr, info_ptr, &text_info, 1) != 0)
-      png_warning(png_ptr, "Insufficient memory to process text chunk");
+   if (png_set_text_2(png_ptr, info_ptr, &text_info, 1) == 0)
+      return handled_ok;
+
+   png_chunk_benign_error(png_ptr, "out of memory");
+   return handled_error;
 }
+#else
+#  define png_handle_tEXt NULL
 #endif
 
 #ifdef PNG_READ_zTXt_SUPPORTED
 /* Note: this does not correctly handle chunks that are > 64K under DOS */
-void /* PRIVATE */
+static png_handle_result_code /* PRIVATE */
 png_handle_zTXt(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
 {
    png_const_charp errmsg = NULL;
@@ -2635,40 +2503,39 @@ png_handle_zTXt(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
       if (png_ptr->user_chunk_cache_max == 1)
       {
          png_crc_finish(png_ptr, length);
-         return;
+         return handled_error;
       }
 
       if (--png_ptr->user_chunk_cache_max == 1)
       {
          png_crc_finish(png_ptr, length);
          png_chunk_benign_error(png_ptr, "no space in chunk cache");
-         return;
+         return handled_error;
       }
    }
 #endif
 
-   if ((png_ptr->mode & PNG_HAVE_IHDR) == 0)
-      png_chunk_error(png_ptr, "missing IHDR");
-
+   /* TODO: should not be necessary. */
    if ((png_ptr->mode & PNG_HAVE_IDAT) != 0)
       png_ptr->mode |= PNG_AFTER_IDAT;
 
    /* Note, "length" is sufficient here; we won't be adding
-    * a null terminator later.
+    * a null terminator later.  The limit check in png_handle_chunk should be
+    * sufficient.
     */
-   buffer = png_read_buffer(png_ptr, length, 2/*silent*/);
+   buffer = png_read_buffer(png_ptr, length);
 
    if (buffer == NULL)
    {
       png_crc_finish(png_ptr, length);
       png_chunk_benign_error(png_ptr, "out of memory");
-      return;
+      return handled_error;
    }
 
    png_crc_read(png_ptr, buffer, length);
 
    if (png_crc_finish(png_ptr, 0) != 0)
-      return;
+      return handled_error;
 
    /* TODO: also check that the keyword contents match the spec! */
    for (keyword_length = 0;
@@ -2721,8 +2588,10 @@ png_handle_zTXt(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
             text.lang = NULL;
             text.lang_key = NULL;
 
-            if (png_set_text_2(png_ptr, info_ptr, &text, 1) != 0)
-               errmsg = "insufficient memory";
+            if (png_set_text_2(png_ptr, info_ptr, &text, 1) == 0)
+               return handled_ok;
+
+            errmsg = "out of memory";
          }
       }
 
@@ -2730,14 +2599,16 @@ png_handle_zTXt(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
          errmsg = png_ptr->zstream.msg;
    }
 
-   if (errmsg != NULL)
-      png_chunk_benign_error(png_ptr, errmsg);
+   png_chunk_benign_error(png_ptr, errmsg);
+   return handled_error;
 }
+#else
+#  define png_handle_zTXt NULL
 #endif
 
 #ifdef PNG_READ_iTXt_SUPPORTED
 /* Note: this does not correctly handle chunks that are > 64K under DOS */
-void /* PRIVATE */
+static png_handle_result_code /* PRIVATE */
 png_handle_iTXt(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
 {
    png_const_charp errmsg = NULL;
@@ -2752,37 +2623,35 @@ png_handle_iTXt(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
       if (png_ptr->user_chunk_cache_max == 1)
       {
          png_crc_finish(png_ptr, length);
-         return;
+         return handled_error;
       }
 
       if (--png_ptr->user_chunk_cache_max == 1)
       {
          png_crc_finish(png_ptr, length);
          png_chunk_benign_error(png_ptr, "no space in chunk cache");
-         return;
+         return handled_error;
       }
    }
 #endif
 
-   if ((png_ptr->mode & PNG_HAVE_IHDR) == 0)
-      png_chunk_error(png_ptr, "missing IHDR");
-
+   /* TODO: should not be necessary. */
    if ((png_ptr->mode & PNG_HAVE_IDAT) != 0)
       png_ptr->mode |= PNG_AFTER_IDAT;
 
-   buffer = png_read_buffer(png_ptr, length+1, 1/*warn*/);
+   buffer = png_read_buffer(png_ptr, length+1);
 
    if (buffer == NULL)
    {
       png_crc_finish(png_ptr, length);
       png_chunk_benign_error(png_ptr, "out of memory");
-      return;
+      return handled_error;
    }
 
    png_crc_read(png_ptr, buffer, length);
 
    if (png_crc_finish(png_ptr, 0) != 0)
-      return;
+      return handled_error;
 
    /* First the keyword. */
    for (prefix_length=0;
@@ -2872,8 +2741,10 @@ png_handle_iTXt(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
          text.text_length = 0;
          text.itxt_length = uncompressed_length;
 
-         if (png_set_text_2(png_ptr, info_ptr, &text, 1) != 0)
-            errmsg = "insufficient memory";
+         if (png_set_text_2(png_ptr, info_ptr, &text, 1) == 0)
+            return handled_ok;
+
+         errmsg = "out of memory";
       }
    }
 
@@ -2882,7 +2753,10 @@ png_handle_iTXt(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
 
    if (errmsg != NULL)
       png_chunk_benign_error(png_ptr, errmsg);
+   return handled_error;
 }
+#else
+#  define png_handle_iTXt NULL
 #endif
 
 #ifdef PNG_READ_UNKNOWN_CHUNKS_SUPPORTED
@@ -2890,7 +2764,7 @@ png_handle_iTXt(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
 static int
 png_cache_unknown_chunk(png_structrp png_ptr, png_uint_32 length)
 {
-   png_alloc_size_t limit = PNG_SIZE_MAX;
+   const png_alloc_size_t limit = png_chunk_max(png_ptr);
 
    if (png_ptr->unknown_chunk.data != NULL)
    {
@@ -2898,16 +2772,6 @@ png_cache_unknown_chunk(png_structrp png_ptr, png_uint_32 length)
       png_ptr->unknown_chunk.data = NULL;
    }
 
-#  ifdef PNG_SET_USER_LIMITS_SUPPORTED
-   if (png_ptr->user_chunk_malloc_max > 0 &&
-       png_ptr->user_chunk_malloc_max < limit)
-      limit = png_ptr->user_chunk_malloc_max;
-
-#  elif PNG_USER_CHUNK_MALLOC_MAX > 0
-   if (PNG_USER_CHUNK_MALLOC_MAX < limit)
-      limit = PNG_USER_CHUNK_MALLOC_MAX;
-#  endif
-
    if (length <= limit)
    {
       PNG_CSTRING_FROM_CHUNK(png_ptr->unknown_chunk.name, png_ptr->chunk_name);
@@ -2946,11 +2810,11 @@ png_cache_unknown_chunk(png_structrp png_ptr, png_uint_32 length)
 #endif /* READ_UNKNOWN_CHUNKS */
 
 /* Handle an unknown, or known but disabled, chunk */
-void /* PRIVATE */
+png_handle_result_code /*PRIVATE*/
 png_handle_unknown(png_structrp png_ptr, png_inforp info_ptr,
     png_uint_32 length, int keep)
 {
-   int handled = 0; /* the chunk was handled */
+   png_handle_result_code handled = handled_discarded; /* the default */
 
    png_debug(1, "in png_handle_unknown");
 
@@ -2997,7 +2861,7 @@ png_handle_unknown(png_structrp png_ptr, png_inforp info_ptr,
           *           error at this point unless it is to be saved.
           * positive: The chunk was handled, libpng will ignore/discard it.
           */
-         if (ret < 0)
+         if (ret < 0) /* handled_error */
             png_chunk_error(png_ptr, "error in user chunk");
 
          else if (ret == 0)
@@ -3031,7 +2895,7 @@ png_handle_unknown(png_structrp png_ptr, png_inforp info_ptr,
 
          else /* chunk was handled */
          {
-            handled = 1;
+            handled = handled_ok;
             /* Critical chunks can be safely discarded at this point. */
             keep = PNG_HANDLE_CHUNK_NEVER;
          }
@@ -3116,7 +2980,7 @@ png_handle_unknown(png_structrp png_ptr, png_inforp info_ptr,
              */
             png_set_unknown_chunks(png_ptr, info_ptr,
                 &png_ptr->unknown_chunk, 1);
-            handled = 1;
+            handled = handled_saved;
 #  ifdef PNG_USER_LIMITS_SUPPORTED
             break;
       }
@@ -3142,79 +3006,267 @@ png_handle_unknown(png_structrp png_ptr, png_inforp info_ptr,
 #endif /* !READ_UNKNOWN_CHUNKS */
 
    /* Check for unhandled critical chunks */
-   if (handled == 0 && PNG_CHUNK_CRITICAL(png_ptr->chunk_name))
+   if (handled < handled_saved && PNG_CHUNK_CRITICAL(png_ptr->chunk_name))
       png_chunk_error(png_ptr, "unhandled critical chunk");
+
+   return handled;
 }
 
-/* This function is called to verify that a chunk name is valid.
- * This function can't have the "critical chunk check" incorporated
- * into it, since in the future we will need to be able to call user
- * functions to handle unknown critical chunks after we check that
- * the chunk name itself is valid.
- */
-
-/* Bit hacking: the test for an invalid byte in the 4 byte chunk name is:
+/* APNG handling: the minimal implementation of APNG handling in libpng 1.6
+ * requires that those significant applications which already handle APNG not
+ * get hosed.  To do this ensure the code here will have to ensure than APNG
+ * data by default (at least in 1.6) gets stored in the unknown chunk list.
+ * Maybe this can be relaxed in a few years but at present it's just the only
+ * safe way.
  *
- * ((c) < 65 || (c) > 122 || ((c) > 90 && (c) < 97))
+ * ATM just cause unknown handling for all three chunks:
  */
+#define png_handle_acTL NULL
+#define png_handle_fcTL NULL
+#define png_handle_fdAT NULL
 
-void /* PRIVATE */
-png_check_chunk_name(png_const_structrp png_ptr, png_uint_32 chunk_name)
+/*
+ * 1.6.47: This is the new table driven interface to all the chunk handling.
+ *
+ * The table describes the PNG standard rules for **reading** known chunks -
+ * every chunk which has an entry in PNG_KNOWN_CHUNKS.  The table contains an
+ * entry for each PNG_INDEX_cHNK describing the rules.
+ *
+ * In this initial version the only information in the entry is the
+ * png_handle_cHNK function for the chunk in question.  When chunk support is
+ * compiled out the entry will be NULL.
+ */
+static const struct
 {
-   int i;
-   png_uint_32 cn=chunk_name;
+   png_handle_result_code (*handler)(
+         png_structrp, png_inforp, png_uint_32 length);
+      /* A chunk-specific 'handler', NULL if the chunk is not supported in this
+       * build.
+       */
 
-   png_debug(1, "in png_check_chunk_name");
+   /* Crushing these values helps on modern 32-bit architectures because the
+    * pointer and the following bit fields both end up requiring 32 bits.
+    * Typically this will halve the table size.  On 64-bit architectures the
+    * table entries will typically be 8 bytes.
+    */
+   png_uint_32 max_length :12; /* Length min, max in bytes */
+   png_uint_32 min_length :8;
+      /* Length errors on critical chunks have special handling to preserve the
+       * existing behaviour in libpng 1.6.  Anciallary chunks are checked below
+       * and produce a 'benign' error.
+       */
+   png_uint_32 pos_before :4; /* PNG_HAVE_ values chunk must precede */
+   png_uint_32 pos_after  :4; /* PNG_HAVE_ values chunk must follow */
+      /* NOTE: PLTE, tRNS and bKGD require special handling which depends on
+       * the colour type of the base image.
+       */
+   png_uint_32 multiple   :1; /* Multiple occurences permitted */
+      /* This is enabled for PLTE because PLTE may, in practice, be optional */
+}
+read_chunks[PNG_INDEX_unknown] =
+{
+   /* Definitions as above but done indirectly by #define so that
+    * PNG_KNOWN_CHUNKS can be used safely to build the table in order.
+    *
+    * Each CDcHNK definition lists the values for the parameters **after**
+    * the first, 'handler', function.  'handler' is NULL when the chunk has no
+    * compiled in support.
+    */
+#  define NoCheck 0x801U      /* Do not check the maximum length */
+#  define Limit   0x802U      /* Limit to png_chunk_max bytes */
+#  define LKMin   3U+LZ77Min  /* Minimum length of keyword+LZ77 */
 
-   for (i=1; i<=4; ++i)
+#define hIHDR PNG_HAVE_IHDR
+#define hPLTE PNG_HAVE_PLTE
+#define hIDAT PNG_HAVE_IDAT
+   /* For the two chunks, tRNS and bKGD which can occur in PNGs without a PLTE
+    * but must occur after the PLTE use this and put the check in the handler
+    * routine for colour mapped images were PLTE is required.  Also put a check
+    * in PLTE for other image types to drop the PLTE if tRNS or bKGD have been
+    * seen.
+    */
+#define hCOL  (PNG_HAVE_PLTE|PNG_HAVE_IDAT)
+   /* Used for the decoding chunks which must be before PLTE. */
+#define aIDAT PNG_AFTER_IDAT
+
+   /* Chunks from W3C PNG v3: */
+   /*       cHNK  max_len,   min, before, after, multiple */
+#  define CDIHDR      13U,   13U,  hIHDR,     0,        0
+#  define CDPLTE  NoCheck,    0U,      0, hIHDR,        1
+      /* PLTE errors are only critical for colour-map images, consequently the
+       * hander does all the checks.
+       */
+#  define CDIDAT  NoCheck,    0U,  aIDAT, hIHDR,        1
+#  define CDIEND  NoCheck,    0U,      0, aIDAT,        0
+      /* Historically data was allowed in IEND */
+#  define CDtRNS     256U,    0U,  hIDAT, hIHDR,        0
+#  define CDcHRM      32U,   32U,   hCOL, hIHDR,        0
+#  define CDgAMA       4U,    4U,   hCOL, hIHDR,        0
+#  define CDiCCP  NoCheck, LKMin,   hCOL, hIHDR,        0
+#  define CDsBIT       4U,    1U,   hCOL, hIHDR,        0
+#  define CDsRGB       1U,    1U,   hCOL, hIHDR,        0
+#  define CDcICP       4U,    4U,   hCOL, hIHDR,        0
+#  define CDmDCV      24U,   24U,   hCOL, hIHDR,        0
+#  define CDeXIf    Limit,    4U,      0, hIHDR,        0
+#  define CDcLLI       8U,    8U,   hCOL, hIHDR,        0
+#  define CDtEXt  NoCheck,    2U,      0, hIHDR,        1
+      /* Allocates 'length+1'; checked in the handler */
+#  define CDzTXt    Limit, LKMin,      0, hIHDR,        1
+#  define CDiTXt  NoCheck,    6U,      0, hIHDR,        1
+      /* Allocates 'length+1'; checked in the handler */
+#  define CDbKGD       6U,    1U,  hIDAT, hIHDR,        0
+#  define CDhIST    1024U,    0U,  hPLTE, hIHDR,        0
+#  define CDpHYs       9U,    9U,  hIDAT, hIHDR,        0
+#  define CDsPLT  NoCheck,    3U,  hIDAT, hIHDR,        1
+      /* Allocates 'length+1'; checked in the handler */
+#  define CDtIME       7U,    7U,      0, hIHDR,        0
+#  define CDacTL       8U,    8U,  hIDAT, hIHDR,        0
+#  define CDfcTL      25U,   26U,      0, hIHDR,        1
+#  define CDfdAT    Limit,    4U,  hIDAT, hIHDR,        1
+   /* Supported chunks from PNG extensions 1.5.0, NYI so limit */
+#  define CDoFFs       9U,    9U,  hIDAT, hIHDR,        0
+#  define CDpCAL  NoCheck,   14U,  hIDAT, hIHDR,        0
+      /* Allocates 'length+1'; checked in the handler */
+#  define CDsCAL    Limit,    4U,  hIDAT, hIHDR,        0
+      /* Allocates 'length+1'; checked in the handler */
+
+#  define PNG_CHUNK(cHNK, index) { png_handle_ ## cHNK, CD ## cHNK },
+   PNG_KNOWN_CHUNKS
+#  undef PNG_CHUNK
+};
+
+
+static png_index
+png_chunk_index_from_name(png_uint_32 chunk_name)
+{
+   /* For chunk png_cHNK return PNG_INDEX_cHNK.  Return PNG_INDEX_unknown if
+    * chunk_name is not known.  Notice that in a particular build "known" does
+    * not necessarily mean "supported", although the inverse applies.
+    */
+   switch (chunk_name)
    {
-      int c = cn & 0xff;
+#     define PNG_CHUNK(cHNK, index)\
+         case png_ ## cHNK: return PNG_INDEX_ ## cHNK; /* == index */
 
-      if (c < 65 || c > 122 || (c > 90 && c < 97))
-         png_chunk_error(png_ptr, "invalid chunk type");
+      PNG_KNOWN_CHUNKS
 
-      cn >>= 8;
+#     undef PNG_CHUNK
+
+      default: return PNG_INDEX_unknown;
    }
 }
 
-void /* PRIVATE */
-png_check_chunk_length(png_const_structrp png_ptr, png_uint_32 length)
+png_handle_result_code /*PRIVATE*/
+png_handle_chunk(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
 {
-   png_alloc_size_t limit = PNG_UINT_31_MAX;
+   /* CSE: these things don't change, these autos are just to save typing and
+    * make the code more clear.
+    */
+   const png_uint_32 chunk_name = png_ptr->chunk_name;
+   const png_index chunk_index = png_chunk_index_from_name(chunk_name);
 
-# ifdef PNG_SET_USER_LIMITS_SUPPORTED
-   if (png_ptr->user_chunk_malloc_max > 0 &&
-       png_ptr->user_chunk_malloc_max < limit)
-      limit = png_ptr->user_chunk_malloc_max;
-# elif PNG_USER_CHUNK_MALLOC_MAX > 0
-   if (PNG_USER_CHUNK_MALLOC_MAX < limit)
-      limit = PNG_USER_CHUNK_MALLOC_MAX;
-# endif
-   if (png_ptr->chunk_name == png_IDAT)
+   png_handle_result_code handled = handled_error;
+   png_const_charp errmsg = NULL;
+
+   /* Is this a known chunk?  If not there are no checks performed here;
+    * png_handle_unknown does the correct checks.  This means that the values
+    * for known but unsupported chunks in the above table are not used here
+    * however the chunks_seen fields in png_struct are still set.
+    */
+   if (chunk_index == PNG_INDEX_unknown ||
+       read_chunks[chunk_index].handler == NULL)
    {
-      png_alloc_size_t idat_limit = PNG_UINT_31_MAX;
-      size_t row_factor =
-         (size_t)png_ptr->width
-         * (size_t)png_ptr->channels
-         * (png_ptr->bit_depth > 8? 2: 1)
-         + 1
-         + (png_ptr->interlaced? 6: 0);
-      if (png_ptr->height > PNG_UINT_32_MAX/row_factor)
-         idat_limit = PNG_UINT_31_MAX;
-      else
-         idat_limit = png_ptr->height * row_factor;
-      row_factor = row_factor > 32566? 32566 : row_factor;
-      idat_limit += 6 + 5*(idat_limit/row_factor+1); /* zlib+deflate overhead */
-      idat_limit=idat_limit < PNG_UINT_31_MAX? idat_limit : PNG_UINT_31_MAX;
-      limit = limit < idat_limit? idat_limit : limit;
+      handled = png_handle_unknown(
+            png_ptr, info_ptr, length, PNG_HANDLE_CHUNK_AS_DEFAULT);
    }
 
-   if (length > limit)
+   /* First check the position.   The first check is historical; the stream must
+    * start with IHDR and anything else causes libpng to give up immediately.
+    */
+   else if (chunk_index != PNG_INDEX_IHDR &&
+            (png_ptr->mode & PNG_HAVE_IHDR) == 0)
+      png_chunk_error(png_ptr, "missing IHDR"); /* NORETURN */
+
+   /* Before all the pos_before chunks, after all the pos_after chunks. */
+   else if (((png_ptr->mode & read_chunks[chunk_index].pos_before) != 0) ||
+            ((png_ptr->mode & read_chunks[chunk_index].pos_after) !=
+             read_chunks[chunk_index].pos_after))
    {
-      png_debug2(0," length = %lu, limit = %lu",
-         (unsigned long)length,(unsigned long)limit);
-      png_benign_error(png_ptr, "chunk data is too large");
+      errmsg = "out of place";
    }
+
+   /* Now check for duplicates: duplicated critical chunks also produce a
+    * full error.
+    */
+   else if (read_chunks[chunk_index].multiple == 0 &&
+            png_file_has_chunk(png_ptr, chunk_index))
+   {
+      errmsg = "duplicate";
+   }
+
+   else if (length < read_chunks[chunk_index].min_length)
+      errmsg = "too short";
+   else
+   {
+      /* NOTE: apart from IHDR the critical chunks (PLTE, IDAT and IEND) are set
+       * up above not to do any length checks.
+       *
+       * The png_chunk_max check ensures that the variable length chunks are
+       * always checked at this point for being within the system allocation
+       * limits.
+       */
+      unsigned max_length = read_chunks[chunk_index].max_length;
+
+      switch (max_length)
+      {
+         case Limit:
+            /* png_read_chunk_header has already png_error'ed chunks with a
+             * length exceeding the 31-bit PNG limit, so just check the memory
+             * limit:
+             */
+            if (length <= png_chunk_max(png_ptr))
+               goto MeetsLimit;
+
+            errmsg = "length exceeds libpng limit";
+            break;
+
+         default:
+            if (length <= max_length)
+               goto MeetsLimit;
+
+            errmsg = "too long";
+            break;
+
+         case NoCheck:
+         MeetsLimit:
+            handled = read_chunks[chunk_index].handler(
+                  png_ptr, info_ptr, length);
+            break;
+      }
+   }
+
+   /* If there was an error or the chunk was simply skipped it is not counted as
+    * 'seen'.
+    */
+   if (errmsg != NULL)
+   {
+      if (PNG_CHUNK_CRITICAL(chunk_name)) /* stop immediately */
+         png_chunk_error(png_ptr, errmsg);
+      else /* ancillary chunk */
+      {
+         /* The chunk data is skipped: */
+         png_crc_finish(png_ptr, length);
+         png_chunk_benign_error(png_ptr, errmsg);
+      }
+   }
+
+   else if (handled >= handled_saved)
+   {
+      if (chunk_index != PNG_INDEX_unknown)
+         png_file_add_chunk(png_ptr, chunk_index);
+   }
+
+   return handled;
 }
 
 /* Combines the row recently read in with the existing pixels in the row.  This
@@ -3712,10 +3764,6 @@ void /* PRIVATE */
 png_do_read_interlace(png_row_infop row_info, png_bytep row, int pass,
     png_uint_32 transformations /* Because these may affect the byte layout */)
 {
-   /* Arrays to facilitate easy interlacing - use pass (0 - 6) as index */
-   /* Offset to next interlace block */
-   static const unsigned int png_pass_inc[7] = {8, 8, 4, 4, 2, 2, 1};
-
    png_debug(1, "in png_do_read_interlace");
    if (row != NULL && row_info != NULL)
    {
@@ -4208,6 +4256,9 @@ png_read_IDAT_data(png_structrp png_ptr, png_bytep output,
 
          avail_in = png_ptr->IDAT_read_size;
 
+         if (avail_in > png_chunk_max(png_ptr))
+            avail_in = (uInt)/*SAFE*/png_chunk_max(png_ptr);
+
          if (avail_in > png_ptr->idat_size)
             avail_in = (uInt)png_ptr->idat_size;
 
@@ -4215,8 +4266,13 @@ png_read_IDAT_data(png_structrp png_ptr, png_bytep output,
           * to minimize memory usage by causing lots of re-allocs, but
           * realistically doing IDAT_read_size re-allocs is not likely to be a
           * big problem.
+          *
+          * An error here corresponds to the system being out of memory.
           */
-         buffer = png_read_buffer(png_ptr, avail_in, 0/*error*/);
+         buffer = png_read_buffer(png_ptr, avail_in);
+
+         if (buffer == NULL)
+            png_chunk_error(png_ptr, "out of memory");
 
          png_crc_read(png_ptr, buffer, avail_in);
          png_ptr->idat_size -= avail_in;
@@ -4353,20 +4409,6 @@ png_read_finish_IDAT(png_structrp png_ptr)
 void /* PRIVATE */
 png_read_finish_row(png_structrp png_ptr)
 {
-   /* Arrays to facilitate easy interlacing - use pass (0 - 6) as index */
-
-   /* Start of interlace block */
-   static const png_byte png_pass_start[7] = {0, 4, 0, 2, 0, 1, 0};
-
-   /* Offset to next interlace block */
-   static const png_byte png_pass_inc[7] = {8, 8, 4, 4, 2, 2, 1};
-
-   /* Start of interlace block in the y direction */
-   static const png_byte png_pass_ystart[7] = {0, 0, 4, 0, 2, 0, 1};
-
-   /* Offset to next interlace block in the y direction */
-   static const png_byte png_pass_yinc[7] = {8, 8, 8, 4, 4, 2, 2};
-
    png_debug(1, "in png_read_finish_row");
    png_ptr->row_number++;
    if (png_ptr->row_number < png_ptr->num_rows)
@@ -4418,20 +4460,6 @@ png_read_finish_row(png_structrp png_ptr)
 void /* PRIVATE */
 png_read_start_row(png_structrp png_ptr)
 {
-   /* Arrays to facilitate easy interlacing - use pass (0 - 6) as index */
-
-   /* Start of interlace block */
-   static const png_byte png_pass_start[7] = {0, 4, 0, 2, 0, 1, 0};
-
-   /* Offset to next interlace block */
-   static const png_byte png_pass_inc[7] = {8, 8, 4, 4, 2, 2, 1};
-
-   /* Start of interlace block in the y direction */
-   static const png_byte png_pass_ystart[7] = {0, 0, 4, 0, 2, 0, 1};
-
-   /* Offset to next interlace block in the y direction */
-   static const png_byte png_pass_yinc[7] = {8, 8, 8, 4, 4, 2, 2};
-
    unsigned int max_pixel_depth;
    size_t row_bytes;
 
diff --git a/src/java.desktop/share/native/libsplashscreen/libpng/pngset.c b/src/java.desktop/share/native/libsplashscreen/libpng/pngset.c
index f53ab6fa1d1..1bfd292bd46 100644
--- a/src/java.desktop/share/native/libsplashscreen/libpng/pngset.c
+++ b/src/java.desktop/share/native/libsplashscreen/libpng/pngset.c
@@ -29,7 +29,7 @@
  * However, the following notice accompanied the original version of this
  * file and, per its terms, should not be removed:
  *
- * Copyright (c) 2018-2024 Cosmin Truta
+ * Copyright (c) 2018-2025 Cosmin Truta
  * Copyright (c) 1998-2018 Glenn Randers-Pehrson
  * Copyright (c) 1996-1997 Andreas Dilger
  * Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.
@@ -70,27 +70,21 @@ png_set_cHRM_fixed(png_const_structrp png_ptr, png_inforp info_ptr,
     png_fixed_point red_y, png_fixed_point green_x, png_fixed_point green_y,
     png_fixed_point blue_x, png_fixed_point blue_y)
 {
-   png_xy xy;
-
    png_debug1(1, "in %s storage function", "cHRM fixed");
 
    if (png_ptr == NULL || info_ptr == NULL)
       return;
 
-   xy.redx = red_x;
-   xy.redy = red_y;
-   xy.greenx = green_x;
-   xy.greeny = green_y;
-   xy.bluex = blue_x;
-   xy.bluey = blue_y;
-   xy.whitex = white_x;
-   xy.whitey = white_y;
+   info_ptr->cHRM.redx = red_x;
+   info_ptr->cHRM.redy = red_y;
+   info_ptr->cHRM.greenx = green_x;
+   info_ptr->cHRM.greeny = green_y;
+   info_ptr->cHRM.bluex = blue_x;
+   info_ptr->cHRM.bluey = blue_y;
+   info_ptr->cHRM.whitex = white_x;
+   info_ptr->cHRM.whitey = white_y;
 
-   if (png_colorspace_set_chromaticities(png_ptr, &info_ptr->colorspace, &xy,
-       2/* override with app values*/) != 0)
-      info_ptr->colorspace.flags |= PNG_COLORSPACE_FROM_cHRM;
-
-   png_colorspace_sync_info(png_ptr, info_ptr);
+   info_ptr->valid |= PNG_INFO_cHRM;
 }
 
 void PNGFAPI
@@ -102,6 +96,7 @@ png_set_cHRM_XYZ_fixed(png_const_structrp png_ptr, png_inforp info_ptr,
     png_fixed_point int_blue_Z)
 {
    png_XYZ XYZ;
+   png_xy xy;
 
    png_debug1(1, "in %s storage function", "cHRM XYZ fixed");
 
@@ -118,11 +113,14 @@ png_set_cHRM_XYZ_fixed(png_const_structrp png_ptr, png_inforp info_ptr,
    XYZ.blue_Y = int_blue_Y;
    XYZ.blue_Z = int_blue_Z;
 
-   if (png_colorspace_set_endpoints(png_ptr, &info_ptr->colorspace,
-       &XYZ, 2) != 0)
-      info_ptr->colorspace.flags |= PNG_COLORSPACE_FROM_cHRM;
+   if (png_xy_from_XYZ(&xy, &XYZ) == 0)
+   {
+      info_ptr->cHRM = xy;
+      info_ptr->valid |= PNG_INFO_cHRM;
+   }
 
-   png_colorspace_sync_info(png_ptr, info_ptr);
+   else
+      png_app_error(png_ptr, "invalid cHRM XYZ");
 }
 
 #  ifdef PNG_FLOATING_POINT_SUPPORTED
@@ -162,6 +160,192 @@ png_set_cHRM_XYZ(png_const_structrp png_ptr, png_inforp info_ptr, double red_X,
 
 #endif /* cHRM */
 
+#ifdef PNG_cICP_SUPPORTED
+void PNGAPI
+png_set_cICP(png_const_structrp png_ptr, png_inforp info_ptr,
+             png_byte colour_primaries, png_byte transfer_function,
+             png_byte matrix_coefficients, png_byte video_full_range_flag)
+{
+   png_debug1(1, "in %s storage function", "cICP");
+
+   if (png_ptr == NULL || info_ptr == NULL)
+      return;
+
+   info_ptr->cicp_colour_primaries = colour_primaries;
+   info_ptr->cicp_transfer_function = transfer_function;
+   info_ptr->cicp_matrix_coefficients = matrix_coefficients;
+   info_ptr->cicp_video_full_range_flag = video_full_range_flag;
+
+   if (info_ptr->cicp_matrix_coefficients != 0)
+   {
+      png_warning(png_ptr, "Invalid cICP matrix coefficients");
+      return;
+   }
+
+   info_ptr->valid |= PNG_INFO_cICP;
+}
+#endif /* cICP */
+
+#ifdef PNG_cLLI_SUPPORTED
+void PNGFAPI
+png_set_cLLI_fixed(png_const_structrp png_ptr, png_inforp info_ptr,
+    /* The values below are in cd/m2 (nits) and are scaled by 10,000; not
+     * 100,000 as in the case of png_fixed_point.
+     */
+    png_uint_32 maxCLL, png_uint_32 maxFALL)
+{
+   png_debug1(1, "in %s storage function", "cLLI");
+
+   if (png_ptr == NULL || info_ptr == NULL)
+      return;
+
+   /* Check the light level range: */
+   if (maxCLL > 0x7FFFFFFFU || maxFALL > 0x7FFFFFFFU)
+   {
+      /* The limit is 200kcd/m2; somewhat bright but not inconceivable because
+       * human vision is said to run up to 100Mcd/m2.  The sun is about 2Gcd/m2.
+       *
+       * The reference sRGB monitor is 80cd/m2 and the limit of PQ encoding is
+       * 2kcd/m2.
+       */
+      png_chunk_report(png_ptr, "cLLI light level exceeds PNG limit",
+            PNG_CHUNK_WRITE_ERROR);
+      return;
+   }
+
+   info_ptr->maxCLL = maxCLL;
+   info_ptr->maxFALL = maxFALL;
+   info_ptr->valid |= PNG_INFO_cLLI;
+}
+
+#  ifdef PNG_FLOATING_POINT_SUPPORTED
+void PNGAPI
+png_set_cLLI(png_const_structrp png_ptr, png_inforp info_ptr,
+   double maxCLL, double maxFALL)
+{
+   png_set_cLLI_fixed(png_ptr, info_ptr,
+       png_fixed_ITU(png_ptr, maxCLL, "png_set_cLLI(maxCLL)"),
+       png_fixed_ITU(png_ptr, maxFALL, "png_set_cLLI(maxFALL)"));
+}
+#  endif /* FLOATING_POINT */
+#endif /* cLLI */
+
+#ifdef PNG_mDCV_SUPPORTED
+static png_uint_16
+png_ITU_fixed_16(int *error, png_fixed_point v)
+{
+   /* Return a safe uint16_t value scaled according to the ITU H273 rules for
+    * 16-bit display chromaticities.  Functions like the corresponding
+    * png_fixed() internal function with regard to errors: it's an error on
+    * write, a chunk_benign_error on read: See the definition of
+    * png_chunk_report in pngpriv.h.
+    */
+   v /= 2; /* rounds to 0 in C: avoids insignificant arithmetic errors */
+   if (v > 65535 || v < 0)
+   {
+      *error = 1;
+      return 0;
+   }
+
+   return (png_uint_16)/*SAFE*/v;
+}
+
+void PNGAPI
+png_set_mDCV_fixed(png_const_structrp png_ptr, png_inforp info_ptr,
+    png_fixed_point white_x, png_fixed_point white_y,
+    png_fixed_point red_x, png_fixed_point red_y,
+    png_fixed_point green_x, png_fixed_point green_y,
+    png_fixed_point blue_x, png_fixed_point blue_y,
+    png_uint_32 maxDL,
+    png_uint_32 minDL)
+{
+   png_uint_16 rx, ry, gx, gy, bx, by, wx, wy;
+   int error;
+
+   png_debug1(1, "in %s storage function", "mDCV");
+
+   if (png_ptr == NULL || info_ptr == NULL)
+      return;
+
+   /* Check the input values to ensure they are in the expected range: */
+   error = 0;
+   rx = png_ITU_fixed_16(&error, red_x);
+   ry = png_ITU_fixed_16(&error, red_y);
+   gx = png_ITU_fixed_16(&error, green_x);
+   gy = png_ITU_fixed_16(&error, green_y);
+   bx = png_ITU_fixed_16(&error, blue_x);
+   by = png_ITU_fixed_16(&error, blue_y);
+   wx = png_ITU_fixed_16(&error, white_x);
+   wy = png_ITU_fixed_16(&error, white_y);
+
+   if (error)
+   {
+      png_chunk_report(png_ptr,
+         "mDCV chromaticities outside representable range",
+         PNG_CHUNK_WRITE_ERROR);
+      return;
+   }
+
+   /* Check the light level range: */
+   if (maxDL > 0x7FFFFFFFU || minDL > 0x7FFFFFFFU)
+   {
+      /* The limit is 200kcd/m2; somewhat bright but not inconceivable because
+       * human vision is said to run up to 100Mcd/m2.  The sun is about 2Gcd/m2.
+       *
+       * The reference sRGB monitor is 80cd/m2 and the limit of PQ encoding is
+       * 2kcd/m2.
+       */
+      png_chunk_report(png_ptr, "mDCV display light level exceeds PNG limit",
+            PNG_CHUNK_WRITE_ERROR);
+      return;
+   }
+
+   /* All values are safe, the settings are accepted.
+    *
+    * IMPLEMENTATION NOTE: in practice the values can be checked and assigned
+    * but the result is confusing if a writing app calls png_set_mDCV more than
+    * once, the second time with an invalid value.  This approach is more
+    * obviously correct at the cost of typing and a very slight machine
+    * overhead.
+    */
+   info_ptr->mastering_red_x = rx;
+   info_ptr->mastering_red_y = ry;
+   info_ptr->mastering_green_x = gx;
+   info_ptr->mastering_green_y = gy;
+   info_ptr->mastering_blue_x = bx;
+   info_ptr->mastering_blue_y = by;
+   info_ptr->mastering_white_x = wx;
+   info_ptr->mastering_white_y = wy;
+   info_ptr->mastering_maxDL = maxDL;
+   info_ptr->mastering_minDL = minDL;
+   info_ptr->valid |= PNG_INFO_mDCV;
+}
+
+#  ifdef PNG_FLOATING_POINT_SUPPORTED
+void PNGAPI
+png_set_mDCV(png_const_structrp png_ptr, png_inforp info_ptr,
+    double white_x, double white_y, double red_x, double red_y, double green_x,
+    double green_y, double blue_x, double blue_y,
+    double maxDL, double minDL)
+{
+   png_set_mDCV_fixed(png_ptr, info_ptr,
+      /* The ITU approach is to scale by 50,000, not 100,000 so just divide
+       * the input values by 2 and use png_fixed:
+       */
+      png_fixed(png_ptr, white_x / 2, "png_set_mDCV(white(x))"),
+      png_fixed(png_ptr, white_y / 2, "png_set_mDCV(white(y))"),
+      png_fixed(png_ptr, red_x / 2, "png_set_mDCV(red(x))"),
+      png_fixed(png_ptr, red_y / 2, "png_set_mDCV(red(y))"),
+      png_fixed(png_ptr, green_x / 2, "png_set_mDCV(green(x))"),
+      png_fixed(png_ptr, green_y / 2, "png_set_mDCV(green(y))"),
+      png_fixed(png_ptr, blue_x / 2, "png_set_mDCV(blue(x))"),
+      png_fixed(png_ptr, blue_y / 2, "png_set_mDCV(blue(y))"),
+      png_fixed_ITU(png_ptr, maxDL, "png_set_mDCV(maxDL)"),
+      png_fixed_ITU(png_ptr, minDL, "png_set_mDCV(minDL)"));
+}
+#  endif /* FLOATING_POINT */
+#endif /* mDCV */
+
 #ifdef PNG_eXIf_SUPPORTED
 void PNGAPI
 png_set_eXIf(png_const_structrp png_ptr, png_inforp info_ptr,
@@ -213,8 +397,8 @@ png_set_gAMA_fixed(png_const_structrp png_ptr, png_inforp info_ptr,
    if (png_ptr == NULL || info_ptr == NULL)
       return;
 
-   png_colorspace_set_gamma(png_ptr, &info_ptr->colorspace, file_gamma);
-   png_colorspace_sync_info(png_ptr, info_ptr);
+   info_ptr->gamma = file_gamma;
+   info_ptr->valid |= PNG_INFO_gAMA;
 }
 
 #  ifdef PNG_FLOATING_POINT_SUPPORTED
@@ -673,8 +857,8 @@ png_set_sRGB(png_const_structrp png_ptr, png_inforp info_ptr, int srgb_intent)
    if (png_ptr == NULL || info_ptr == NULL)
       return;
 
-   (void)png_colorspace_set_sRGB(png_ptr, &info_ptr->colorspace, srgb_intent);
-   png_colorspace_sync_info(png_ptr, info_ptr);
+   info_ptr->rendering_intent = srgb_intent;
+   info_ptr->valid |= PNG_INFO_sRGB;
 }
 
 void PNGAPI
@@ -686,15 +870,20 @@ png_set_sRGB_gAMA_and_cHRM(png_const_structrp png_ptr, png_inforp info_ptr,
    if (png_ptr == NULL || info_ptr == NULL)
       return;
 
-   if (png_colorspace_set_sRGB(png_ptr, &info_ptr->colorspace,
-       srgb_intent) != 0)
-   {
-      /* This causes the gAMA and cHRM to be written too */
-      info_ptr->colorspace.flags |=
-         PNG_COLORSPACE_FROM_gAMA|PNG_COLORSPACE_FROM_cHRM;
-   }
+   png_set_sRGB(png_ptr, info_ptr, srgb_intent);
 
-   png_colorspace_sync_info(png_ptr, info_ptr);
+#  ifdef PNG_gAMA_SUPPORTED
+      png_set_gAMA_fixed(png_ptr, info_ptr, PNG_GAMMA_sRGB_INVERSE);
+#  endif /* gAMA */
+
+#  ifdef PNG_cHRM_SUPPORTED
+      png_set_cHRM_fixed(png_ptr, info_ptr,
+         /* color      x       y */
+         /* white */ 31270, 32900,
+         /* red   */ 64000, 33000,
+         /* green */ 30000, 60000,
+         /* blue  */ 15000,  6000);
+#  endif /* cHRM */
 }
 #endif /* sRGB */
 
@@ -717,27 +906,6 @@ png_set_iCCP(png_const_structrp png_ptr, png_inforp info_ptr,
    if (compression_type != PNG_COMPRESSION_TYPE_BASE)
       png_app_error(png_ptr, "Invalid iCCP compression method");
 
-   /* Set the colorspace first because this validates the profile; do not
-    * override previously set app cHRM or gAMA here (because likely as not the
-    * application knows better than libpng what the correct values are.)  Pass
-    * the info_ptr color_type field to png_colorspace_set_ICC because in the
-    * write case it has not yet been stored in png_ptr.
-    */
-   {
-      int result = png_colorspace_set_ICC(png_ptr, &info_ptr->colorspace, name,
-          proflen, profile, info_ptr->color_type);
-
-      png_colorspace_sync_info(png_ptr, info_ptr);
-
-      /* Don't do any of the copying if the profile was bad, or inconsistent. */
-      if (result == 0)
-         return;
-
-      /* But do write the gAMA and cHRM chunks from the profile. */
-      info_ptr->colorspace.flags |=
-         PNG_COLORSPACE_FROM_gAMA|PNG_COLORSPACE_FROM_cHRM;
-   }
-
    length = strlen(name)+1;
    new_iccp_name = png_voidcast(png_charp, png_malloc_warn(png_ptr, length));
 
@@ -1423,11 +1591,14 @@ png_set_keep_unknown_chunks(png_structrp png_ptr, int keep,
       static const png_byte chunks_to_ignore[] = {
          98,  75,  71,  68, '\0',  /* bKGD */
          99,  72,  82,  77, '\0',  /* cHRM */
+         99,  73,  67,  80, '\0',  /* cICP */
+         99,  76,  76,  73, '\0',  /* cLLI */
         101,  88,  73, 102, '\0',  /* eXIf */
         103,  65,  77,  65, '\0',  /* gAMA */
         104,  73,  83,  84, '\0',  /* hIST */
         105,  67,  67,  80, '\0',  /* iCCP */
         105,  84,  88, 116, '\0',  /* iTXt */
+        109,  68,  67,  86, '\0',  /* mDCV */
         111,  70,  70, 115, '\0',  /* oFFs */
         112,  67,  65,  76, '\0',  /* pCAL */
         112,  72,  89, 115, '\0',  /* pHYs */
@@ -1689,8 +1860,24 @@ png_set_chunk_malloc_max(png_structrp png_ptr,
 {
    png_debug(1, "in png_set_chunk_malloc_max");
 
+   /* pngstruct::user_chunk_malloc_max is initialized to a non-zero value in
+    * png.c.  This API supports '0' for unlimited, make sure the correct
+    * (unlimited) value is set here to avoid a need to check for 0 everywhere
+    * the parameter is used.
+    */
    if (png_ptr != NULL)
-      png_ptr->user_chunk_malloc_max = user_chunk_malloc_max;
+   {
+      if (user_chunk_malloc_max == 0U) /* unlimited */
+      {
+#        ifdef PNG_MAX_MALLOC_64K
+            png_ptr->user_chunk_malloc_max = 65536U;
+#        else
+            png_ptr->user_chunk_malloc_max = PNG_SIZE_MAX;
+#        endif
+      }
+      else
+         png_ptr->user_chunk_malloc_max = user_chunk_malloc_max;
+   }
 }
 #endif /* ?SET_USER_LIMITS */
 
diff --git a/src/java.desktop/share/native/libsplashscreen/libpng/pngstruct.h b/src/java.desktop/share/native/libsplashscreen/libpng/pngstruct.h
index f153bdec602..d6c446564d1 100644
--- a/src/java.desktop/share/native/libsplashscreen/libpng/pngstruct.h
+++ b/src/java.desktop/share/native/libsplashscreen/libpng/pngstruct.h
@@ -98,13 +98,7 @@ typedef struct png_compression_buffer
 
 /* Colorspace support; structures used in png_struct, png_info and in internal
  * functions to hold and communicate information about the color space.
- *
- * PNG_COLORSPACE_SUPPORTED is only required if the application will perform
- * colorspace corrections, otherwise all the colorspace information can be
- * skipped and the size of libpng can be reduced (significantly) by compiling
- * out the colorspace support.
  */
-#ifdef PNG_COLORSPACE_SUPPORTED
 /* The chromaticities of the red, green and blue colorants and the chromaticity
  * of the corresponding white point (i.e. of rgb(1.0,1.0,1.0)).
  */
@@ -125,48 +119,36 @@ typedef struct png_XYZ
    png_fixed_point green_X, green_Y, green_Z;
    png_fixed_point blue_X, blue_Y, blue_Z;
 } png_XYZ;
-#endif /* COLORSPACE */
 
-#if defined(PNG_COLORSPACE_SUPPORTED) || defined(PNG_GAMMA_SUPPORTED)
-/* A colorspace is all the above plus, potentially, profile information;
- * however at present libpng does not use the profile internally so it is only
- * stored in the png_info struct (if iCCP is supported.)  The rendering intent
- * is retained here and is checked.
- *
- * The file gamma encoding information is also stored here and gamma correction
- * is done by libpng, whereas color correction must currently be done by the
- * application.
+/* Chunk index values as an enum, PNG_INDEX_unknown is also a count of the
+ * number of chunks.
  */
-typedef struct png_colorspace
+#define PNG_CHUNK(cHNK, i) PNG_INDEX_ ## cHNK = (i),
+typedef enum
 {
-#ifdef PNG_GAMMA_SUPPORTED
-   png_fixed_point gamma;        /* File gamma */
-#endif
+   PNG_KNOWN_CHUNKS
+   PNG_INDEX_unknown
+} png_index;
+#undef PNG_CHUNK
 
-#ifdef PNG_COLORSPACE_SUPPORTED
-   png_xy      end_points_xy;    /* End points as chromaticities */
-   png_XYZ     end_points_XYZ;   /* End points as CIE XYZ colorant values */
-   png_uint_16 rendering_intent; /* Rendering intent of a profile */
-#endif
+/* Chunk flag values.  These are (png_uint_32 values) with exactly one bit set
+ * and can be combined into a flag set with bitwise 'or'.
+ *
+ * TODO: C23: convert these macros to C23 inlines (which are static).
+ */
+#define png_chunk_flag_from_index(i) (0x80000000U >> (31 - (i)))
+   /* The flag coresponding to the given png_index enum value.  This is defined
+    * for png_unknown as well (until it reaches the value 32) but this should
+    * not be relied on.
+    */
 
-   /* Flags are always defined to simplify the code. */
-   png_uint_16 flags;            /* As defined below */
-} png_colorspace, * PNG_RESTRICT png_colorspacerp;
+#define png_file_has_chunk(png_ptr, i)\
+   (((png_ptr)->chunks & png_chunk_flag_from_index(i)) != 0)
+   /* The chunk has been recorded in png_struct */
 
-typedef const png_colorspace * PNG_RESTRICT png_const_colorspacerp;
-
-/* General flags for the 'flags' field */
-#define PNG_COLORSPACE_HAVE_GAMMA           0x0001
-#define PNG_COLORSPACE_HAVE_ENDPOINTS       0x0002
-#define PNG_COLORSPACE_HAVE_INTENT          0x0004
-#define PNG_COLORSPACE_FROM_gAMA            0x0008
-#define PNG_COLORSPACE_FROM_cHRM            0x0010
-#define PNG_COLORSPACE_FROM_sRGB            0x0020
-#define PNG_COLORSPACE_ENDPOINTS_MATCH_sRGB 0x0040
-#define PNG_COLORSPACE_MATCHES_sRGB         0x0080 /* exact match on profile */
-#define PNG_COLORSPACE_INVALID              0x8000
-#define PNG_COLORSPACE_CANCEL(flags)        (0xffff ^ (flags))
-#endif /* COLORSPACE || GAMMA */
+#define png_file_add_chunk(pnt_ptr, i)\
+   ((void)((png_ptr)->chunks |= png_chunk_flag_from_index(i)))
+   /* Record the chunk in the png_struct */
 
 struct png_struct_def
 {
@@ -238,6 +220,11 @@ struct png_struct_def
    int zlib_set_strategy;
 #endif
 
+   png_uint_32 chunks; /* PNG_CF_ for every chunk read or (NYI) written */
+#  define png_has_chunk(png_ptr, cHNK)\
+      png_file_has_chunk(png_ptr, PNG_INDEX_ ## cHNK)
+      /* Convenience accessor - use this to check for a known chunk by name */
+
    png_uint_32 width;         /* width of image in pixels */
    png_uint_32 height;        /* height of image in pixels */
    png_uint_32 num_rows;      /* number of rows in current pass */
@@ -314,9 +301,16 @@ struct png_struct_def
    png_uint_32 flush_rows;    /* number of rows written since last flush */
 #endif
 
+#ifdef PNG_READ_RGB_TO_GRAY_SUPPORTED
+   png_xy          chromaticities; /* From mDVC, cICP, [iCCP], sRGB or cHRM */
+#endif
+
 #ifdef PNG_READ_GAMMA_SUPPORTED
    int gamma_shift;      /* number of "insignificant" bits in 16-bit gamma */
-   png_fixed_point screen_gamma; /* screen gamma value (display_exponent) */
+   png_fixed_point screen_gamma; /* screen gamma value (display exponent) */
+   png_fixed_point file_gamma;   /* file gamma value (encoding exponent) */
+   png_fixed_point chunk_gamma;  /* from cICP, iCCP, sRGB or gAMA */
+   png_fixed_point default_gamma;/* from png_set_alpha_mode */
 
    png_bytep gamma_table;     /* gamma table for 8-bit depth files */
    png_uint_16pp gamma_16_table; /* gamma table for 16-bit depth files */
@@ -328,7 +322,7 @@ struct png_struct_def
    png_uint_16pp gamma_16_from_1; /* converts from 1.0 to screen */
    png_uint_16pp gamma_16_to_1; /* converts from file to 1.0 */
 #endif /* READ_BACKGROUND || READ_ALPHA_MODE || RGB_TO_GRAY */
-#endif
+#endif /* READ_GAMMA */
 
 #if defined(PNG_READ_GAMMA_SUPPORTED) || defined(PNG_sBIT_SUPPORTED)
    png_color_8 sig_bit;       /* significant bits in each available channel */
@@ -378,8 +372,8 @@ struct png_struct_def
 /* To do: remove this from libpng-1.7 */
 #ifdef PNG_TIME_RFC1123_SUPPORTED
    char time_buffer[29]; /* String to hold RFC 1123 time text */
-#endif
-#endif
+#endif /* TIME_RFC1123 */
+#endif /* LIBPNG_VER < 10700 */
 
 /* New members added in libpng-1.0.6 */
 
@@ -389,8 +383,8 @@ struct png_struct_def
    png_voidp user_chunk_ptr;
 #ifdef PNG_READ_USER_CHUNKS_SUPPORTED
    png_user_chunk_ptr read_user_chunk_fn; /* user read chunk handler */
-#endif
-#endif
+#endif /* READ_USER_CHUNKS */
+#endif /* USER_CHUNKS */
 
 #ifdef PNG_SET_UNKNOWN_CHUNKS_SUPPORTED
    int          unknown_default; /* As PNG_HANDLE_* */
@@ -497,11 +491,5 @@ struct png_struct_def
 /* New member added in libpng-1.5.7 */
    void (*read_filter[PNG_FILTER_VALUE_LAST-1])(png_row_infop row_info,
       png_bytep row, png_const_bytep prev_row);
-
-#ifdef PNG_READ_SUPPORTED
-#if defined(PNG_COLORSPACE_SUPPORTED) || defined(PNG_GAMMA_SUPPORTED)
-   png_colorspace   colorspace;
-#endif
-#endif
 };
 #endif /* PNGSTRUCT_H */

From 47c19609659a85397e3eed7c2a3a918ff6055edc Mon Sep 17 00:00:00 2001
From: Jiangli Zhou <jiangli@openjdk.org>
Date: Mon, 17 Mar 2025 16:55:41 +0000
Subject: [PATCH 375/587] 8351689: -Xshare:dump with default classlist fails on
 static JDK

Reviewed-by: iklam, dholmes
---
 src/hotspot/share/cds/metaspaceShared.cpp | 31 ++++-------------------
 1 file changed, 5 insertions(+), 26 deletions(-)

diff --git a/src/hotspot/share/cds/metaspaceShared.cpp b/src/hotspot/share/cds/metaspaceShared.cpp
index 6fe1c820bec..3af2277a50b 100644
--- a/src/hotspot/share/cds/metaspaceShared.cpp
+++ b/src/hotspot/share/cds/metaspaceShared.cpp
@@ -844,37 +844,16 @@ void MetaspaceShared::adjust_heap_sizes_for_dumping() {
 #endif // INCLUDE_CDS_JAVA_HEAP && _LP64
 
 void MetaspaceShared::get_default_classlist(char* default_classlist, const size_t buf_size) {
-  // Construct the path to the class list (in jre/lib)
-  // Walk up two directories from the location of the VM and
-  // optionally tack on "lib" (depending on platform)
-  os::jvm_path(default_classlist, (jint)(buf_size));
-  for (int i = 0; i < 3; i++) {
-    char *end = strrchr(default_classlist, *os::file_separator());
-    if (end != nullptr) *end = '\0';
-  }
-  size_t classlist_path_len = strlen(default_classlist);
-  if (classlist_path_len >= 3) {
-    if (strcmp(default_classlist + classlist_path_len - 3, "lib") != 0) {
-      if (classlist_path_len < buf_size - 4) {
-        jio_snprintf(default_classlist + classlist_path_len,
-                     buf_size - classlist_path_len,
-                     "%slib", os::file_separator());
-        classlist_path_len += 4;
-      }
-    }
-  }
-  if (classlist_path_len < buf_size - 10) {
-    jio_snprintf(default_classlist + classlist_path_len,
-                 buf_size - classlist_path_len,
-                 "%sclasslist", os::file_separator());
-  }
+  const char* filesep = os::file_separator();
+  jio_snprintf(default_classlist, buf_size, "%s%slib%sclasslist",
+               Arguments::get_java_home(), filesep, filesep);
 }
 
 void MetaspaceShared::preload_classes(TRAPS) {
   char default_classlist[JVM_MAXPATHLEN];
   const char* classlist_path;
 
-  get_default_classlist(default_classlist, sizeof(default_classlist));
+  get_default_classlist(default_classlist, JVM_MAXPATHLEN);
   if (SharedClassListFile == nullptr) {
     classlist_path = default_classlist;
   } else {
@@ -929,7 +908,7 @@ void MetaspaceShared::preload_and_dump_impl(StaticArchiveBuilder& builder, TRAPS
   if (CDSConfig::is_dumping_preimage_static_archive()) {
     log_info(cds)("Reading lambda form invokers from JDK default classlist ...");
     char default_classlist[JVM_MAXPATHLEN];
-    get_default_classlist(default_classlist, sizeof(default_classlist));
+    get_default_classlist(default_classlist, JVM_MAXPATHLEN);
     struct stat statbuf;
     if (os::stat(default_classlist, &statbuf) == 0) {
       ClassListParser::parse_classlist(default_classlist,

From 3239919a5a5910922ea4cb6109f94a24c5f6b4f2 Mon Sep 17 00:00:00 2001
From: Sandhya Viswanathan <sviswanathan@openjdk.org>
Date: Mon, 17 Mar 2025 17:50:34 +0000
Subject: [PATCH 376/587] 8350835: C2 SuperWord: assert/wrong result when using
 Float.float16ToFloat with byte instead of short input

Reviewed-by: epeter, kvn
---
 src/hotspot/share/opto/vectornode.cpp         |   4 +-
 .../vectorization/TestFloat16ToFloatConv.java | 181 ++++++++++++++++++
 2 files changed, 184 insertions(+), 1 deletion(-)
 create mode 100644 test/hotspot/jtreg/compiler/vectorization/TestFloat16ToFloatConv.java

diff --git a/src/hotspot/share/opto/vectornode.cpp b/src/hotspot/share/opto/vectornode.cpp
index dc7fd18a8d0..0e5739f39c2 100644
--- a/src/hotspot/share/opto/vectornode.cpp
+++ b/src/hotspot/share/opto/vectornode.cpp
@@ -1497,7 +1497,9 @@ int VectorCastNode::opcode(int sopc, BasicType bt, bool is_signed) {
   // Handle special case for to/from Half Float conversions
   switch (sopc) {
     case Op_ConvHF2F:
-      assert(bt == T_SHORT, "");
+      if (!is_signed || (bt != T_SHORT)) {
+        return 0;
+      }
       return Op_VectorCastHF2F;
     case Op_ConvF2HF:
       assert(bt == T_FLOAT, "");
diff --git a/test/hotspot/jtreg/compiler/vectorization/TestFloat16ToFloatConv.java b/test/hotspot/jtreg/compiler/vectorization/TestFloat16ToFloatConv.java
new file mode 100644
index 00000000000..0cf0e44ad03
--- /dev/null
+++ b/test/hotspot/jtreg/compiler/vectorization/TestFloat16ToFloatConv.java
@@ -0,0 +1,181 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact 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 randomness
+* @bug 8350835
+* @summary Test bug fix for JDK-8350835 discovered through Template Framework
+* @library /test/lib /
+* @run driver compiler.vectorization.TestFloat16ToFloatConv
+*/
+
+package compiler.vectorization;
+
+import compiler.lib.ir_framework.*;
+import jdk.test.lib.Utils;
+import java.util.Random;
+
+import static compiler.lib.generators.Generators.G;
+
+public class TestFloat16ToFloatConv {
+    private static final Random RANDOM = Utils.getRandomInstance();
+    private static final int SIZE = 1024;
+    private static byte[] aB = new byte[SIZE];
+    private static char[] aC = new char[SIZE];
+    private static short[] aS = new short[SIZE];
+    private static int[] aI = new int[SIZE];
+    private static long[] aL = new long[SIZE];
+    private static float[] goldB, goldC, goldS, goldI, goldL;
+
+    static {
+        // Fill int and long array using Generators
+        G.fill(G.ints(), aI);
+        G.fill(G.longs(), aL);
+        // Generators do not support byte, char, short array currently so perform manual random fill
+        for (int i = 0; i < aB.length; i++) {
+            aB[i] = (byte)RANDOM.nextInt();
+            aC[i] = (char)RANDOM.nextInt();
+            aS[i] = (short)RANDOM.nextInt();
+        }
+        goldB = testByteKernel(aB);
+        goldC = testCharKernel(aC);
+        goldS = testShortKernel(aS);
+        goldI = testIntKernel(aI);
+        goldL = testLongKernel(aL);
+    }
+
+    @Test
+    // Scalar IR for loop body: LoadB, ConvHF2F, StoreF
+    // Vectorized IR: LoadVector, VectorCastHF2F , StoreVector
+    // Vectorization disabled as input to VectorCastHF2F would have been a byte vector instead of short vector
+    // but the VectorCastHF2F expects short vector as input
+    // See JDK-8352093 for details
+    @IR(failOn = { IRNode.VECTOR_CAST_HF2F })
+    public static float[] testByteKernel(byte[] barr) {
+        float[] res = new float[barr.length];
+        for (int i = 0; i < barr.length; i++) {
+            res[i] = Float.float16ToFloat(barr[i]);
+        }
+        return res;
+    }
+
+    @Test
+    @IR(counts = {IRNode.VECTOR_CAST_HF2F, "> 0"},
+        applyIfOr = {"UseCompactObjectHeaders", "false", "AlignVector", "false"},
+        applyIfPlatformOr = {"x64", "true", "aarch64", "true", "riscv64", "true"},
+        applyIfCPUFeatureOr = {"f16c", "true", "avx512f", "true", "zvfh", "true", "asimd", "true", "sve", "true"})
+    public static float[] testCharKernel(char[] carr) {
+        float[] res = new float[carr.length];
+        for (int i = 0; i < carr.length; i++) {
+            res[i] = Float.float16ToFloat((short)carr[i]);
+        }
+        return res;
+    }
+
+    @Test
+    @IR(counts = {IRNode.VECTOR_CAST_HF2F, "> 0"},
+        applyIfOr = {"UseCompactObjectHeaders", "false", "AlignVector", "false"},
+        applyIfPlatformOr = {"x64", "true", "aarch64", "true", "riscv64", "true"},
+        applyIfCPUFeatureOr = {"f16c", "true", "avx512f", "true", "zvfh", "true", "asimd", "true", "sve", "true"})
+    public static float[] testShortKernel(short[] sarr) {
+        float[] res = new float[sarr.length];
+        for (int i = 0; i < sarr.length; i++) {
+            res[i] = Float.float16ToFloat(sarr[i]);
+        }
+        return res;
+    }
+
+    @Test
+    // Scalar IR for loop body: LoadI, LShiftI by 16, RShiftI by 16, ConvHF2F, StoreF
+    // Vectorized IR: LoadVector, LShiftVI, RShiftVI, VectorCastHF2F, StoreVector
+    // Vectorization disabled as input to VectorCastHF2F would have been an int vector instead of short vector
+    // but the VectorCastHF2F expects short vector as input
+    // See JDK-8352093 for details
+    @IR(failOn = { IRNode.VECTOR_CAST_HF2F })
+    public static float[] testIntKernel(int[] iarr) {
+        float[] res = new float[iarr.length];
+        for (int i = 0; i < iarr.length; i++) {
+            res[i] = Float.float16ToFloat((short)iarr[i]);
+        }
+        return res;
+    }
+
+    @Test
+    // Scalar IR for loop body: ConvL2I, LoadI, LShiftI by 16, RShiftI by 16, ConvHF2F, StoreF
+    // Vectorized IR: VectorCastL2X, LoadVector, LShiftVI, RShiftVI, VectorCastHF2F, StoreVector
+    // Vectorization disabled as input to VectorCastHF2F would have been an int vector instead of short vector
+    // but the VectorCastHF2F expects short vector as input
+    // See JDK-8352093 for details
+    @IR(failOn = { IRNode.VECTOR_CAST_HF2F })
+    public static float[] testLongKernel(long[] larr) {
+        float[] res = new float[larr.length];
+        for (int i = 0; i < larr.length; i++) {
+            res[i] = Float.float16ToFloat((short)larr[i]);
+        }
+        return res;
+    }
+
+    public static void checkResult(float[] res, float[] gold) {
+        for (int i = 0; i < res.length; i++) {
+            if (Float.floatToIntBits(res[i]) != Float.floatToIntBits(gold[i])) {
+                throw new RuntimeException("wrong value: " + Float.floatToRawIntBits(res[i]) + " " + Float.floatToRawIntBits(gold[i]));
+            }
+        }
+    }
+
+    @Run(test = {"testByteKernel"})
+    public static void testByte() {
+        float[] farr = testByteKernel(aB);
+        checkResult(farr, goldB);
+    }
+
+    @Run(test = {"testCharKernel"})
+    public static void testChar() {
+        float[] farr = testCharKernel(aC);
+        checkResult(farr, goldC);
+    }
+
+    @Run(test = {"testShortKernel"})
+    public static void testShort() {
+        float[] farr = testShortKernel(aS);
+        checkResult(farr, goldS);
+    }
+
+    @Run(test = {"testIntKernel"})
+    public static void testInt() {
+        float[] farr = testIntKernel(aI);
+        checkResult(farr, goldI);
+    }
+
+    @Run(test = {"testLongKernel"})
+    public static void testLong() {
+        float[] farr = testLongKernel(aL);
+        checkResult(farr, goldL);
+    }
+
+    public static void main(String [] args) {
+        TestFramework.run(TestFloat16ToFloatConv.class);
+    }
+}
+

From 3aa6d62afecbea5684618bc82425e59404233be5 Mon Sep 17 00:00:00 2001
From: Alexey Semenyuk <asemenyuk@openjdk.org>
Date: Mon, 17 Mar 2025 18:38:28 +0000
Subject: [PATCH 377/587] 8351372: Improve negative tests coverage of jpackage

Reviewed-by: almatvee
---
 .../jdk/jpackage/internal/DeployParams.java   |   5 +-
 .../jdk/jpackage/internal/DottedVersion.java  |  32 +-
 .../jdk/jpackage/internal/LauncherData.java   |   6 +-
 .../jpackage/internal/util/TokenReplace.java  | 197 +++++
 .../share/classes/jdk/jpackage/main/Main.java |  17 +-
 .../jdk/jpackage/test/PackageTestTest.java    |  16 +-
 .../jpackage/test/CannedFormattedString.java  |  60 +-
 .../helpers/jdk/jpackage/test/Executor.java   |  34 +-
 .../helpers/jdk/jpackage/test/HelloApp.java   |  17 +
 .../jdk/jpackage/test/JPackageCommand.java    |  98 ++-
 .../jpackage/test/JPackageStringBundle.java   |   4 +-
 .../helpers/jdk/jpackage/test/Main.java       |  19 +-
 .../jdk/jpackage/test/PackageTest.java        |  14 +-
 .../jdk/jpackage/test/PackageType.java        |  49 +-
 .../jdk/jpackage/test/TestInstance.java       |  15 +-
 .../jdk/jpackage/test/WindowsHelper.java      |  20 +-
 .../jpackage/internal/DottedVersionTest.java  |  74 +-
 .../internal/util/TokenReplaceTest.java       | 290 ++++++++
 .../jpackage/linux/LinuxResourceTest.java     | 156 ++--
 .../macosx/MacAppStoreJlinkOptionsTest.java   |  15 +-
 .../macosx/MacAppStoreRuntimeTest.java        | 100 ---
 .../jpackage/macosx/SigningAppImageTest.java  |  16 +-
 .../jpackage/macosx/SigningPackageTest.java   |  21 +-
 .../jpackage/macosx/base/SigningBase.java     |  20 +-
 .../jpackage/share/AppImagePackageTest.java   |  70 +-
 .../tools/jpackage/share/AppVersionTest.java  |  25 -
 test/jdk/tools/jpackage/share/BasicTest.java  |   6 +-
 test/jdk/tools/jpackage/share/ErrorTest.java  | 671 +++++++++++++++---
 .../jpackage/share/FileAssociationsTest.java  |  44 +-
 .../jpackage/share/JLinkOptionsTest.java      |   2 +-
 .../jpackage/share/JavaOptionsEqualsTest.java |  14 +-
 .../tools/jpackage/share/JavaOptionsTest.java |   3 +-
 .../tools/jpackage/share/MainClassTest.java   |  22 +-
 .../tools/jpackage/share/ModulePathTest.java  |  23 +-
 .../tools/jpackage/share/NonExistentTest.java |  91 ---
 .../share/PredefinedAppImageErrorTest.java    | 118 ---
 .../jpackage/share/RuntimePackageTest.java    |  22 +-
 37 files changed, 1662 insertions(+), 744 deletions(-)
 create mode 100644 src/jdk.jpackage/share/classes/jdk/jpackage/internal/util/TokenReplace.java
 create mode 100644 test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/util/TokenReplaceTest.java
 delete mode 100644 test/jdk/tools/jpackage/macosx/MacAppStoreRuntimeTest.java
 delete mode 100644 test/jdk/tools/jpackage/share/NonExistentTest.java
 delete mode 100644 test/jdk/tools/jpackage/share/PredefinedAppImageErrorTest.java

diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/DeployParams.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/DeployParams.java
index 18645f17a6d..c95edbbad0a 100644
--- a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/DeployParams.java
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/DeployParams.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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,7 @@ public class DeployParams {
                 }
             } else {
                 if (!hasInput && !hasAppImage) {
-                    throw new PackagerException(
-                           "ERR_MissingArgument", "--input");
+                    throw new PackagerException("error.no-input-parameter");
                 }
             }
         } else {
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/DottedVersion.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/DottedVersion.java
index 91c0a4915fd..b188a9b552c 100644
--- a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/DottedVersion.java
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/DottedVersion.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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,9 +57,7 @@ final class DottedVersion {
                             if (!greedy) {
                                 return null;
                             } else {
-                                throw new IllegalArgumentException(MessageFormat.format(I18N.
-                                        getString("error.version-string-zero-length-component"),
-                                        version));
+                                ds.throwException();
                             }
                         }
 
@@ -77,8 +75,7 @@ final class DottedVersion {
                     }).takeWhile(Objects::nonNull).toArray(BigInteger[]::new);
             suffix = ds.getUnprocessedString();
             if (!suffix.isEmpty() && greedy) {
-                throw new IllegalArgumentException(MessageFormat.format(I18N.getString(
-                        "error.version-string-invalid-component"), version, suffix));
+                ds.throwException();
             }
         }
     }
@@ -89,7 +86,7 @@ final class DottedVersion {
             this.input = input;
         }
 
-        public String getNextDigits() {
+        String getNextDigits() {
             if (stoped) {
                 return null;
             }
@@ -130,10 +127,29 @@ final class DottedVersion {
             return sb.toString();
         }
 
-        public String getUnprocessedString() {
+        String getUnprocessedString() {
             return input.substring(cursor);
         }
 
+        void throwException() {
+            final String tail;
+            if (lastDotPos >= 0) {
+                tail = input.substring(lastDotPos + 1);
+            } else {
+                tail = getUnprocessedString();
+            }
+
+            final String errMessage;
+            if (tail.isEmpty()) {
+                errMessage = MessageFormat.format(I18N.getString(
+                        "error.version-string-zero-length-component"), input);
+            } else {
+                errMessage = MessageFormat.format(I18N.getString(
+                        "error.version-string-invalid-component"), input, tail);
+            }
+            throw new IllegalArgumentException(errMessage);
+        }
+
         private int cursor;
         private int lastDotPos = -1;
         private boolean stoped;
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/LauncherData.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/LauncherData.java
index ce6813de28b..c5a74ac09cc 100644
--- a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/LauncherData.java
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/LauncherData.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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,10 +185,6 @@ final class LauncherData {
         }
 
         Path mainJarDir = StandardBundlerParam.SOURCE_DIR.fetchFrom(params);
-        if (mainJarDir == null && launcherData.qualifiedClassName == null) {
-            throw new ConfigException(I18N.getString("error.no-input-parameter"),
-                    null);
-        }
 
         final Path mainJarPath;
         if (launcherData.mainJarName != null && mainJarDir != null) {
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/util/TokenReplace.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/util/TokenReplace.java
new file mode 100644
index 00000000000..24c13db1aa7
--- /dev/null
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/util/TokenReplace.java
@@ -0,0 +1,197 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute 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.jpackage.internal.util;
+
+import static java.util.stream.Collectors.joining;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.function.Function;
+import java.util.function.Predicate;
+import java.util.function.Supplier;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import java.util.stream.IntStream;
+import java.util.stream.Stream;
+
+public final class TokenReplace {
+
+    private record TokenCut(String[] main, String[] sub) {
+        static String[] orderTokens(String... tokens) {
+            if (tokens.length == 0) {
+                throw new IllegalArgumentException("Empty token list");
+            }
+
+            final var orderedTokens = Stream.of(tokens)
+                    .sorted(Comparator.<String>naturalOrder().thenComparing(Comparator.comparingInt(String::length)))
+                    .distinct()
+                    .toArray(String[]::new);
+
+            if (orderedTokens[0].isEmpty()) {
+                throw new IllegalArgumentException("Empty token in the list of tokens");
+            }
+
+            return orderedTokens;
+        }
+
+        static TokenCut createFromOrderedTokens(String... tokens) {
+            final List<Integer> subTokens = new ArrayList<>();
+
+            for (var i = 0; i < tokens.length - 1; ++i) {
+                final var x = tokens[i];
+                for (var j = i + 1; j < tokens.length; ++j) {
+                    final var y = tokens[j];
+                    if (y.contains(x)) {
+                        subTokens.add(i);
+                    }
+                }
+            }
+
+            if (subTokens.isEmpty()) {
+                return new TokenCut(tokens, null);
+            } else {
+                final var main = IntStream.range(0, tokens.length)
+                        .mapToObj(Integer::valueOf)
+                        .filter(Predicate.not(subTokens::contains))
+                        .map(i -> {
+                            return tokens[i];
+                        }).toArray(String[]::new);
+                final var sub = subTokens.stream().map(i -> {
+                    return tokens[i];
+                }).toArray(String[]::new);
+                return new TokenCut(main, sub);
+            }
+        }
+
+        @Override
+        public String toString() {
+            return String.format("TokenCut(main=%s, sub=%s)", Arrays.toString(main), Arrays.toString(sub));
+        }
+    }
+
+    public TokenReplace(String... tokens) {
+        tokens = TokenCut.orderTokens(tokens);
+
+        this.tokens = tokens;
+        regexps = new ArrayList<>();
+
+        for(;;) {
+            final var tokenCut = TokenCut.createFromOrderedTokens(tokens);
+            regexps.add(Pattern.compile(Stream.of(tokenCut.main()).map(Pattern::quote).collect(joining("|", "(", ")"))));
+
+            if (tokenCut.sub() == null) {
+                break;
+            }
+
+            tokens = tokenCut.sub();
+        }
+    }
+
+    public String applyTo(String str, Function<String, Object> tokenValueSupplier) {
+        Objects.requireNonNull(str);
+        Objects.requireNonNull(tokenValueSupplier);
+        for (final var regexp : regexps) {
+            str = regexp.matcher(str).replaceAll(mr -> {
+                final var token = mr.group();
+                return Matcher.quoteReplacement(Objects.requireNonNull(tokenValueSupplier.apply(token), () -> {
+                    return String.format("Null value for token [%s]", token);
+                }).toString());
+            });
+        }
+        return str;
+    }
+
+    public String recursiveApplyTo(String str, Function<String, Object> tokenValueSupplier) {
+        String newStr;
+        int counter = tokens.length + 1;
+        while (!(newStr = applyTo(str, tokenValueSupplier)).equals(str)) {
+            str = newStr;
+            if (counter-- == 0) {
+                throw new IllegalStateException("Infinite recursion");
+            }
+        }
+        return newStr;
+    }
+
+    @Override
+    public int hashCode() {
+        // Auto generated code
+        final int prime = 31;
+        int result = 1;
+        result = prime * result + Arrays.hashCode(tokens);
+        return result;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        // Auto generated code
+        if (this == obj)
+            return true;
+        if (obj == null)
+            return false;
+        if (getClass() != obj.getClass())
+            return false;
+        TokenReplace other = (TokenReplace) obj;
+        return Arrays.equals(tokens, other.tokens);
+    }
+
+    @Override
+    public String toString() {
+        return "TokenReplace(" + String.join("|", tokens) + ")";
+    }
+
+    public static TokenReplace combine(TokenReplace x, TokenReplace y) {
+        return new TokenReplace(Stream.of(x.tokens, y.tokens).flatMap(Stream::of).toArray(String[]::new));
+    }
+
+    public static Function<String, Object> createCachingTokenValueSupplier(Map<String, Supplier<Object>> tokenValueSuppliers) {
+        Objects.requireNonNull(tokenValueSuppliers);
+        final Map<String, Object> cache = new HashMap<>();
+        return token -> {
+            final var value = cache.computeIfAbsent(token, k -> {
+                final var tokenValueSupplier = Objects.requireNonNull(tokenValueSuppliers.get(token), () -> {
+                    return String.format("No token value supplier for token [%s]", token);
+                });
+                return Optional.ofNullable(tokenValueSupplier.get()).orElse(NULL_SUPPLIED);
+            });
+
+            if (value == NULL_SUPPLIED) {
+                throw new NullPointerException(String.format("Null value for token [%s]", token));
+            }
+
+            return value;
+        };
+    }
+
+    private final String[] tokens;
+    private final transient List<Pattern> regexps;
+    private final static Object NULL_SUPPLIED = new Object();
+}
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/main/Main.java b/src/jdk.jpackage/share/classes/jdk/jpackage/main/Main.java
index 97b1faee249..9ead69890cc 100644
--- a/src/jdk.jpackage/share/classes/jdk/jpackage/main/Main.java
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/main/Main.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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,15 +25,16 @@
 
 package jdk.jpackage.main;
 
-import jdk.internal.opt.CommandLine;
-import jdk.jpackage.internal.Arguments;
-import jdk.jpackage.internal.Log;
-import jdk.jpackage.internal.CLIHelp;
-import java.io.PrintWriter;
-import java.util.ResourceBundle;
 import java.io.FileNotFoundException;
 import java.io.IOException;
+import java.io.PrintWriter;
+import java.nio.file.NoSuchFileException;
 import java.text.MessageFormat;
+import java.util.ResourceBundle;
+import jdk.internal.opt.CommandLine;
+import jdk.jpackage.internal.Arguments;
+import jdk.jpackage.internal.CLIHelp;
+import jdk.jpackage.internal.Log;
 
 public class Main {
 
@@ -69,7 +70,7 @@ public class Main {
             String[] newArgs;
             try {
                 newArgs = CommandLine.parse(args);
-            } catch (FileNotFoundException fnfe) {
+            } catch (FileNotFoundException|NoSuchFileException fnfe) {
                 Log.fatalError(MessageFormat.format(I18N.getString(
                         "ERR_CannotParseOptions"), fnfe.getMessage()));
                 return 1;
diff --git a/test/jdk/tools/jpackage/helpers-test/jdk/jpackage/test/PackageTestTest.java b/test/jdk/tools/jpackage/helpers-test/jdk/jpackage/test/PackageTestTest.java
index 433db6fc6f6..3e14022a70e 100644
--- a/test/jdk/tools/jpackage/helpers-test/jdk/jpackage/test/PackageTestTest.java
+++ b/test/jdk/tools/jpackage/helpers-test/jdk/jpackage/test/PackageTestTest.java
@@ -97,12 +97,12 @@ public class PackageTestTest extends JUnitAdapter {
         private final int tickCount;
     }
 
-    private final static int ERROR_EXIT_CODE_JPACKAGE = 35;
-    private final static int ERROR_EXIT_CODE_INSTALL = 27;
+    private static final int ERROR_EXIT_CODE_JPACKAGE = 35;
+    private static final int ERROR_EXIT_CODE_INSTALL = 27;
 
-    private final static CallbackFactory NEVER = new CallbackFactory(0);
-    private final static CallbackFactory ONCE = new CallbackFactory(1);
-    private final static CallbackFactory TWICE = new CallbackFactory(2);
+    private static final CallbackFactory NEVER = new CallbackFactory(0);
+    private static final CallbackFactory ONCE = new CallbackFactory(1);
+    private static final CallbackFactory TWICE = new CallbackFactory(2);
 
     enum BundleVerifier {
         ONCE_SUCCESS(ONCE),
@@ -238,7 +238,7 @@ public class PackageTestTest extends JUnitAdapter {
         private final int expectedJPackageExitCode;
     }
 
-    private final static class CountingInstaller extends TickCounter implements Function<JPackageCommand, Integer> {
+    private static final class CountingInstaller extends TickCounter implements Function<JPackageCommand, Integer> {
 
         @Override
         public Integer apply(JPackageCommand cmd) {
@@ -376,7 +376,7 @@ public class PackageTestTest extends JUnitAdapter {
                 };
             }).setExpectedExitCode(expectedJPackageExitCode)
                     .setExpectedInstallExitCode(handlersSpec.installExitCode)
-                    .isPackageTypeSupported(type -> true)
+                    .isPackageTypeEnabled(type -> true)
                     .forTypes().packageHandlers(handlers);
         }
 
@@ -439,7 +439,7 @@ public class PackageTestTest extends JUnitAdapter {
         }
     }
 
-    private final static class TestSpecBuilder {
+    private static final class TestSpecBuilder {
 
         TestSpecBuilder type(PackageType v) {
             type = Objects.requireNonNull(v);
diff --git a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/CannedFormattedString.java b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/CannedFormattedString.java
index 8b28049b7b1..940dd47e06d 100644
--- a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/CannedFormattedString.java
+++ b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/CannedFormattedString.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2024, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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,60 @@
  */
 package jdk.jpackage.test;
 
+import java.nio.file.Path;
 import java.util.List;
+import java.util.Objects;
 import java.util.function.BiFunction;
+import java.util.function.Supplier;
+import java.util.stream.Stream;
 
-public final class CannedFormattedString {
+public record CannedFormattedString(BiFunction<String, Object[], String> formatter, String key, Object[] args) {
 
-    CannedFormattedString(BiFunction<String, Object[], String> formatter,
-            String key, Object[] args) {
-        this.formatter = formatter;
-        this.key = key;
-        this.args = args;
+    @FunctionalInterface
+    public interface CannedArgument {
+        public String value();
+    }
+
+    public static Object cannedArgument(Supplier<Object> supplier, String label) {
+        Objects.requireNonNull(supplier);
+        Objects.requireNonNull(label);
+        return new CannedArgument() {
+
+            @Override
+            public String value() {
+                return supplier.get().toString();
+            }
+
+            @Override
+            public String toString( ) {
+                return label;
+            }
+        };
+    }
+
+    public static Object cannedAbsolutePath(Path v) {
+        return cannedArgument(() -> v.toAbsolutePath(), String.format("AbsolutePath(%s)", v));
+    }
+
+    public static Object cannedAbsolutePath(String v) {
+        return cannedAbsolutePath(Path.of(v));
+    }
+
+    public CannedFormattedString {
+        Objects.requireNonNull(formatter);
+        Objects.requireNonNull(key);
+        Objects.requireNonNull(args);
+        List.of(args).forEach(Objects::requireNonNull);
     }
 
     public String getValue() {
-        return formatter.apply(key, args);
+        return formatter.apply(key, Stream.of(args).map(arg -> {
+            if (arg instanceof CannedArgument cannedArg) {
+                return cannedArg.value();
+            } else {
+                return arg;
+            }
+        }).toArray());
     }
 
     @Override
@@ -46,8 +86,4 @@ public final class CannedFormattedString {
             return String.format("%s+%s", key, List.of(args));
         }
     }
-
-    private final BiFunction<String, Object[], String> formatter;
-    private final String key;
-    private final Object[] args;
 }
diff --git a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/Executor.java b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/Executor.java
index a8a849cb9e7..66cd422203b 100644
--- a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/Executor.java
+++ b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/Executor.java
@@ -33,8 +33,10 @@ import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.Arrays;
 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;
@@ -92,6 +94,13 @@ public final class Executor extends CommandArguments<Executor> {
 
     public Executor removeEnvVar(String envVarName) {
         removeEnvVars.add(Objects.requireNonNull(envVarName));
+        setEnvVars.remove(envVarName);
+        return this;
+    }
+
+    public Executor setEnvVar(String envVarName, String envVarValue) {
+        setEnvVars.put(Objects.requireNonNull(envVarName), Objects.requireNonNull(envVarValue));
+        removeEnvVars.remove(envVarName);
         return this;
     }
 
@@ -370,11 +379,27 @@ public final class Executor extends CommandArguments<Executor> {
             builder.directory(directory.toFile());
             sb.append(String.format("; in directory [%s]", directory));
         }
-        if (!removeEnvVars.isEmpty()) {
-            final var envComm = Comm.compare(builder.environment().keySet(), removeEnvVars);
-            builder.environment().keySet().removeAll(envComm.common());
+        if (!setEnvVars.isEmpty()) {
+            final var defaultEnv = builder.environment();
+            final var envComm = Comm.compare(defaultEnv.keySet(), setEnvVars.keySet());
+            envComm.unique2().forEach(envVar -> {
+                trace(String.format("Adding %s=[%s] to environment", envVar, setEnvVars.get(envVar)));
+            });
             envComm.common().forEach(envVar -> {
-                TKit.trace(String.format("Clearing %s in environment", envVar));
+                final var curValue = defaultEnv.get(envVar);
+                final var newValue = setEnvVars.get(envVar);
+                if (!curValue.equals(newValue)) {
+                    trace(String.format("Setting %s=[%s] in environment", envVar, setEnvVars.get(envVar)));
+                }
+            });
+            defaultEnv.putAll(setEnvVars);
+        }
+        if (!removeEnvVars.isEmpty()) {
+            final var defaultEnv = builder.environment().keySet();
+            final var envComm = Comm.compare(defaultEnv, removeEnvVars);
+            defaultEnv.removeAll(envComm.common());
+            envComm.common().forEach(envVar -> {
+                trace(String.format("Clearing %s in environment", envVar));
             });
         }
 
@@ -515,6 +540,7 @@ public final class Executor extends CommandArguments<Executor> {
     private Set<SaveOutputType> saveOutputType;
     private Path directory;
     private Set<String> removeEnvVars = new HashSet<>();
+    private Map<String, String> setEnvVars = new HashMap<>();
     private boolean winEnglishOutput;
     private String winTmpDir = null;
 
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 224a3f752cf..7ac4159c2a6 100644
--- a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/HelloApp.java
+++ b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/HelloApp.java
@@ -31,6 +31,7 @@ import java.util.Comparator;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Optional;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.function.Predicate;
@@ -350,6 +351,7 @@ public final class HelloApp {
             this.launcherPath = helloAppLauncher;
             this.outputFilePath = TKit.workDir().resolve(OUTPUT_FILENAME);
             this.params = new HashMap<>();
+            this.env = new HashMap<>();
             this.defaultLauncherArgs = new ArrayList<>();
         }
 
@@ -363,6 +365,16 @@ public final class HelloApp {
             return this;
         }
 
+        public AppOutputVerifier addEnvironment(Map<String, String> v) {
+            env.putAll(v);
+            return this;
+        }
+
+        public AppOutputVerifier addEnvironmentVar(String name, String value) {
+            env.put(Objects.requireNonNull(name), Objects.requireNonNull(name));
+            return this;
+        }
+
         public AppOutputVerifier addDefaultArguments(String... v) {
             return addDefaultArguments(List.of(v));
         }
@@ -466,6 +478,10 @@ public final class HelloApp {
                     .setExecutable(executablePath)
                     .addArguments(List.of(args));
 
+            env.forEach((envVarName, envVarValue) -> {
+                executor.setEnvVar(envVarName, envVarValue);
+            });
+
             return configureEnvironment(executor);
         }
 
@@ -476,6 +492,7 @@ public final class HelloApp {
         private int expectedExitCode;
         private final List<String> defaultLauncherArgs;
         private final Map<String, String> params;
+        private final Map<String, String> env;
     }
 
     public static AppOutputVerifier assertApp(Path helloAppLauncher) {
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 efcd0041579..1a6fd9ac6ca 100644
--- a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/JPackageCommand.java
+++ b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/JPackageCommand.java
@@ -76,7 +76,7 @@ public class JPackageCommand extends CommandArguments<JPackageCommand> {
         prerequisiteActions = new Actions(cmd.prerequisiteActions);
         verifyActions = new Actions(cmd.verifyActions);
         appLayoutAsserts = cmd.appLayoutAsserts;
-        outputValidator = cmd.outputValidator;
+        outputValidators = cmd.outputValidators;
         executeInDirectory = cmd.executeInDirectory;
         winMsiLogFile = cmd.winMsiLogFile;
     }
@@ -218,26 +218,27 @@ public class JPackageCommand extends CommandArguments<JPackageCommand> {
     }
 
     public String name() {
-        String appImage = getArgumentValue("--app-image");
-        if (appImage != null) {
-            String name = AppImageFile.load(Path.of(appImage)).mainLauncherName();
-            // can be null if using foreign app-image
-            return ((name != null) ? name : getArgumentValue("--name"));
-        }
-        return getArgumentValue("--name", () -> getArgumentValue("--main-class"));
+        return nameFromAppImage().or(this::nameFromBasicArgs).or(this::nameFromRuntimeImage).orElseThrow();
     }
 
     public String installerName() {
         verifyIsOfType(PackageType.NATIVE);
-        String installerName = getArgumentValue("--name",
-                () -> getArgumentValue("--main-class", () -> null));
-        if (installerName == null) {
-            String appImage = getArgumentValue("--app-image");
-            if (appImage != null) {
-                installerName = AppImageFile.load(Path.of(appImage)).mainLauncherName();
-            }
-        }
-        return installerName;
+        return nameFromBasicArgs().or(this::nameFromAppImage).or(this::nameFromRuntimeImage).orElseThrow();
+    }
+
+    private Optional<String> nameFromAppImage() {
+        return Optional.ofNullable(getArgumentValue("--app-image"))
+                .map(Path::of).map(AppImageFile::load).map(AppImageFile::mainLauncherName);
+    }
+
+    private Optional<String> nameFromRuntimeImage() {
+        return Optional.ofNullable(getArgumentValue("--runtime-image"))
+                .map(Path::of).map(Path::getFileName).map(Path::toString);
+    }
+
+    private Optional<String> nameFromBasicArgs() {
+        return Optional.ofNullable(getArgumentValue("--name")).or(
+                () -> Optional.ofNullable(getArgumentValue("--main-class")));
     }
 
     public boolean isRuntime() {
@@ -273,7 +274,7 @@ public class JPackageCommand extends CommandArguments<JPackageCommand> {
         };
 
         addPrerequisiteAction(cmd -> {
-            Path fakeRuntimeDir = TKit.workDir().resolve("fake_runtime");
+            Path fakeRuntimeDir = TKit.createTempDirectory("fake_runtime");
 
             TKit.trace(String.format("Init fake runtime in [%s] directory",
                     fakeRuntimeDir));
@@ -703,21 +704,53 @@ public class JPackageCommand extends CommandArguments<JPackageCommand> {
     }
 
     public JPackageCommand validateOutput(TKit.TextStreamVerifier validator) {
-        return JPackageCommand.this.validateOutput(validator::apply);
+        return validateOutput(validator::apply);
     }
 
     public JPackageCommand validateOutput(Consumer<Stream<String>> validator) {
-        if (validator != null) {
-            saveConsoleOutput(true);
-            outputValidator = validator;
-        } else {
-            outputValidator = null;
-        }
+        Objects.requireNonNull(validator);
+        saveConsoleOutput(true);
+        outputValidators.add(validator);
         return this;
     }
 
-    public JPackageCommand validateOutput(CannedFormattedString str) {
-        return JPackageCommand.this.validateOutput(TKit.assertTextStream(str.getValue()));
+    @FunctionalInterface
+    public interface CannedArgument {
+        public String value(JPackageCommand cmd);
+    }
+
+    public static Object cannedArgument(Function<JPackageCommand, Object> supplier, String label) {
+        Objects.requireNonNull(supplier);
+        Objects.requireNonNull(label);
+        return new CannedArgument() {
+            @Override
+            public String value(JPackageCommand cmd) {
+                return supplier.apply(cmd).toString();
+            }
+
+            @Override
+            public String toString( ) {
+                return label;
+            }
+        };
+    }
+
+    public String getValue(CannedFormattedString str) {
+        return new CannedFormattedString(str.formatter(), str.key(), Stream.of(str.args()).map(arg -> {
+            if (arg instanceof CannedArgument cannedArg) {
+                return cannedArg.value(this);
+            } else {
+                return arg;
+            }
+        }).toArray()).getValue();
+    }
+
+    public JPackageCommand validateOutput(CannedFormattedString... str) {
+        // Will look up the given errors in the order they are specified.
+        return validateOutput(Stream.of(str)
+                .map(this::getValue)
+                .map(TKit::assertTextStream)
+                .reduce(TKit.TextStreamVerifier::andThen).get());
     }
 
     public boolean isWithToolProvider() {
@@ -798,7 +831,7 @@ public class JPackageCommand extends CommandArguments<JPackageCommand> {
                 .createExecutor()
                 .execute(expectedExitCode);
 
-        if (outputValidator != null) {
+        for (final var outputValidator: outputValidators) {
             outputValidator.accept(result.getOutput().stream());
         }
 
@@ -876,6 +909,9 @@ public class JPackageCommand extends CommandArguments<JPackageCommand> {
             copy.immutable = false;
             copy.removeArgumentWithValue("--runtime-image");
             copy.dmgInstallDir = cmd.appInstallationDirectory();
+            if (!copy.hasArgument("--name")) {
+                copy.addArguments("--name", cmd.nameFromRuntimeImage().orElseThrow());
+            }
             return copy;
         }
 
@@ -1022,7 +1058,7 @@ public class JPackageCommand extends CommandArguments<JPackageCommand> {
             // to allow the jlink process to print exception stacktraces on any failure
             addArgument("-J-Djlink.debug=true");
         }
-        if (!hasArgument("--runtime-image") && !hasArgument("--app-image") && DEFAULT_RUNTIME_IMAGE != null && !ignoreDefaultRuntime) {
+        if (!hasArgument("--runtime-image") && !hasArgument("--jlink-options") && !hasArgument("--app-image") && DEFAULT_RUNTIME_IMAGE != null && !ignoreDefaultRuntime) {
             addArguments("--runtime-image", DEFAULT_RUNTIME_IMAGE);
         }
 
@@ -1195,14 +1231,14 @@ public class JPackageCommand extends CommandArguments<JPackageCommand> {
     private Path executeInDirectory;
     private Path winMsiLogFile;
     private Set<AppLayoutAssert> appLayoutAsserts = Set.of(AppLayoutAssert.values());
-    private Consumer<Stream<String>> outputValidator;
+    private List<Consumer<Stream<String>>> outputValidators = new ArrayList<>();
     private static boolean defaultWithToolProvider;
 
     private static final Map<String, PackageType> PACKAGE_TYPES = Functional.identity(
             () -> {
                 Map<String, PackageType> reply = new HashMap<>();
                 for (PackageType type : PackageType.values()) {
-                    reply.put(type.getName(), type);
+                    reply.put(type.getType(), type);
                 }
                 return reply;
             }).get();
diff --git a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/JPackageStringBundle.java b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/JPackageStringBundle.java
index fff08d35410..cdf2855faef 100644
--- a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/JPackageStringBundle.java
+++ b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/JPackageStringBundle.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2024, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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 @@ public enum JPackageStringBundle {
         }
     }
 
-    public CannedFormattedString cannedFormattedString(String key, String ... args) {
+    public CannedFormattedString cannedFormattedString(String key, Object ... args) {
         return new CannedFormattedString(this::getFormattedString, key, args);
     }
 
diff --git a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/Main.java b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/Main.java
index 439479a666e..e7f06b0d608 100644
--- a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/Main.java
+++ b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/Main.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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,10 @@
 
 package jdk.jpackage.test;
 
+import static java.util.stream.Collectors.toCollection;
+import static java.util.stream.Collectors.toMap;
+import static jdk.jpackage.test.TestBuilder.CMDLINE_ARG_PREFIX;
+
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.ArrayDeque;
@@ -32,9 +36,7 @@ import java.util.Deque;
 import java.util.List;
 import java.util.function.Function;
 import java.util.function.Predicate;
-import static java.util.stream.Collectors.toCollection;
 import java.util.stream.Stream;
-import static jdk.jpackage.test.TestBuilder.CMDLINE_ARG_PREFIX;
 
 
 public final class Main {
@@ -88,9 +90,7 @@ public final class Main {
                     TKit.unbox(throwable);
                 } finally {
                     if (!success) {
-                        TKit.log(
-                                String.format("Error processing parameter=[%s]",
-                                        arg));
+                        TKit.log(String.format("Error processing parameter=[%s]", arg));
                     }
                 }
             }
@@ -104,6 +104,13 @@ public final class Main {
             // Just list the tests
             orderedTests.forEach(test -> System.out.println(String.format(
                     "%s; workDir=[%s]", test.fullName(), test.workDir())));
+        }
+
+        orderedTests.stream().collect(toMap(TestInstance::fullName, x -> x, (x, y) -> {
+            throw new IllegalArgumentException(String.format("Multiple tests with the same description: [%s]", x.fullName()));
+        }));
+
+        if (listTests) {
             return;
         }
 
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 e7b3f3e3a44..5500b670fbc 100644
--- a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/PackageTest.java
+++ b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/PackageTest.java
@@ -71,7 +71,7 @@ import jdk.jpackage.internal.util.function.ThrowingRunnable;
 public final class PackageTest extends RunnablePackageTest {
 
     public PackageTest() {
-        isPackageTypeSupported = PackageType::isSupported;
+        isPackageTypeEnabled = PackageType::isEnabled;
         jpackageFactory = JPackageCommand::new;
         packageHandlers = new HashMap<>();
         disabledInstallers = new HashSet<>();
@@ -102,7 +102,7 @@ public final class PackageTest extends RunnablePackageTest {
             newTypes = Stream.of(types).collect(Collectors.toSet());
         }
         currentTypes = newTypes.stream()
-                .filter(isPackageTypeSupported)
+                .filter(isPackageTypeEnabled)
                 .filter(Predicate.not(excludeTypes::contains))
                 .collect(Collectors.toUnmodifiableSet());
         return this;
@@ -394,9 +394,9 @@ public final class PackageTest extends RunnablePackageTest {
         return this;
     }
 
-    PackageTest isPackageTypeSupported(Predicate<PackageType> v) {
+    PackageTest isPackageTypeEnabled(Predicate<PackageType> v) {
         Objects.requireNonNull(v);
-        isPackageTypeSupported = v;
+        isPackageTypeEnabled = v;
         return this;
     }
 
@@ -505,7 +505,7 @@ public final class PackageTest extends RunnablePackageTest {
                 case UNPACK -> {
                     cmd.setUnpackedPackageLocation(null);
                     final var unpackRootDir = TKit.createTempDirectory(
-                            String.format("unpacked-%s", type.getName()));
+                            String.format("unpacked-%s", type.getType()));
                     final Path unpackDir = packageHandlers.unpack(cmd, unpackRootDir);
                     if (!unpackDir.startsWith(TKit.workDir())) {
                         state.deleteUnpackDirs.add(unpackDir);
@@ -618,7 +618,7 @@ public final class PackageTest extends RunnablePackageTest {
             return processed(Action.UNPACK) && packageHandlers.unpackHandler().isEmpty();
         }
 
-        private final static class State {
+        private static final class State {
             private final Set<Action> packageActions = new HashSet<>();
             private final List<Path> deleteUnpackDirs = new ArrayList<>();
         }
@@ -918,7 +918,7 @@ public final class PackageTest extends RunnablePackageTest {
     private final Map<PackageType, PackageHandlers> packageHandlers;
     private final Set<PackageType> disabledInstallers;
     private final Set<PackageType> disabledUninstallers;
-    private Predicate<PackageType> isPackageTypeSupported;
+    private Predicate<PackageType> isPackageTypeEnabled;
     private Supplier<JPackageCommand> jpackageFactory;
     private boolean ignoreBundleOutputDir;
     private boolean createMsiLog;
diff --git a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/PackageType.java b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/PackageType.java
index 4d85f82df9b..f6c2b84057a 100644
--- a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/PackageType.java
+++ b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/PackageType.java
@@ -26,6 +26,7 @@ import java.io.PrintWriter;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.util.Collections;
+import java.util.Objects;
 import java.util.Optional;
 import java.util.Set;
 import java.util.concurrent.atomic.AtomicBoolean;
@@ -48,19 +49,23 @@ public enum PackageType {
             TKit.isLinux() ? "jdk.jpackage.internal.LinuxRpmBundler" : null),
     MAC_DMG(".dmg", TKit.isOSX() ? "jdk.jpackage.internal.MacDmgBundler" : null),
     MAC_PKG(".pkg", TKit.isOSX() ? "jdk.jpackage.internal.MacPkgBundler" : null),
-    IMAGE("app-image", null, null);
+    IMAGE;
+
+    PackageType() {
+        type  = "app-image";
+        suffix = null;
+        supported = true;
+        enabled = true;
+    }
 
     PackageType(String packageName, String bundleSuffix, String bundlerClass) {
-        name  = packageName;
-        suffix = bundleSuffix;
-        if (bundlerClass != null && !Inner.DISABLED_PACKAGERS.contains(getName())) {
-            supported = isBundlerSupported(bundlerClass);
-        } else {
-            supported = false;
-        }
+        type  = Objects.requireNonNull(packageName);
+        suffix = Objects.requireNonNull(bundleSuffix);
+        supported = Optional.ofNullable(bundlerClass).map(PackageType::isBundlerSupported).orElse(false);
+        enabled = supported && !Inner.DISABLED_PACKAGERS.contains(getType());
 
-        if (suffix != null && supported) {
-            TKit.trace(String.format("Bundler %s supported", getName()));
+        if (suffix != null && enabled) {
+            TKit.trace(String.format("Bundler %s enabled", getType()));
         }
     }
 
@@ -69,30 +74,23 @@ public enum PackageType {
     }
 
     void applyTo(JPackageCommand cmd) {
-        cmd.setArgumentValue("--type", getName());
+        cmd.setArgumentValue("--type", getType());
     }
 
     String getSuffix() {
-        return suffix;
+        return Optional.ofNullable(suffix).orElseThrow(UnsupportedOperationException::new);
     }
 
-    boolean isSupported() {
+    public boolean isSupported() {
         return supported;
     }
 
-    String getName() {
-        return name;
+    public boolean isEnabled() {
+        return supported;
     }
 
-    static PackageType fromSuffix(String packageFilename) {
-        if (packageFilename != null) {
-            for (PackageType v : values()) {
-                if (packageFilename.endsWith(v.getSuffix())) {
-                    return v;
-                }
-            }
-        }
-        return null;
+    public String getType() {
+        return type;
     }
 
     private static boolean isBundlerSupportedImpl(String bundlerClass) {
@@ -133,8 +131,9 @@ public enum PackageType {
         return reply.get();
     }
 
-    private final String name;
+    private final String type;
     private final String suffix;
+    private final boolean enabled;
     private final boolean supported;
 
     public static final Set<PackageType> LINUX = Set.of(LINUX_DEB, LINUX_RPM);
diff --git a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/TestInstance.java b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/TestInstance.java
index ca9523d5760..159a46c96c2 100644
--- a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/TestInstance.java
+++ b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/TestInstance.java
@@ -31,6 +31,7 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashSet;
+import java.util.HexFormat;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
@@ -119,12 +120,24 @@ final class TestInstance implements ThrowingRunnable {
                         return String.format("%s(length=%d)", asString, Array.getLength(v));
                     }
                     return String.format("%s", v);
-                }).collect(Collectors.joining(", "));
+                }).collect(Collectors.joining(", ")).transform(str -> {
+                    final var sb = new StringBuilder();
+                    for (var chr : str.toCharArray()) {
+                        if (chr != ' ' && (Character.isWhitespace(chr) || Character.isISOControl(chr))) {
+                            sb.append("\\u").append(ARGS_CHAR_FORMATTER.toHexDigits(chr));
+                        } else {
+                            sb.append(chr);
+                        }
+                    }
+                    return sb.toString();
+                });
             }
 
             private List<Object> ctorArgs;
             private List<Object> methodArgs;
             private Method method;
+
+            private static final HexFormat ARGS_CHAR_FORMATTER = HexFormat.of().withUpperCase();
         }
 
         static TestDesc create(Method m, Object... args) {
diff --git a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/WindowsHelper.java b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/WindowsHelper.java
index 91705afd5fe..bc67f6e417d 100644
--- a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/WindowsHelper.java
+++ b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/WindowsHelper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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,7 +107,7 @@ public class WindowsHelper {
         final Optional<Path> msiLogFile;
         if (createMsiLog) {
             msiLogFile = Optional.of(TKit.createTempFile(String.format("logs\\%s-msi.log",
-                    cmd.packageType().getName())));
+                    cmd.packageType().getType())));
         } else {
             msiLogFile = Optional.empty();
         }
@@ -175,13 +175,19 @@ public class WindowsHelper {
                 Path installationSubDirectory = getInstallationSubDirectory(cmd);
                 Path from = Path.of(extraPathComponent).resolve(installationSubDirectory);
                 Path to = installationSubDirectory;
-                TKit.trace(String.format("Convert [%s] into [%s] in [%s] directory", from, to,
-                        unpackDir));
+
                 ThrowingRunnable.toRunnable(() -> {
                     Files.createDirectories(unpackDir.resolve(to).getParent());
-                    Files.move(unpackDir.resolve(from), unpackDir.resolve(to));
-                    TKit.deleteDirectoryRecursive(unpackDir.resolve(extraPathComponent));
                 }).run();
+
+                // Files.move() occasionally results into java.nio.file.AccessDeniedException
+                Executor.tryRunMultipleTimes(ThrowingRunnable.toRunnable(() -> {
+                    TKit.trace(String.format("Convert [%s] into [%s] in [%s] directory", from, to, unpackDir));
+                    final var dstDir = unpackDir.resolve(to);
+                    TKit.deleteDirectoryRecursive(dstDir);
+                    Files.move(unpackDir.resolve(from), dstDir);
+                    TKit.deleteDirectoryRecursive(unpackDir.resolve(extraPathComponent));
+                }), 3, 5);
             }
         }
         return destinationDir;
@@ -656,7 +662,7 @@ public class WindowsHelper {
         private final RegValuePath reg;
         private final Optional<SpecialFolderDotNet> alt;
 
-        private final static Map<SpecialFolder, Path> CACHE = new ConcurrentHashMap<>();
+        private static final Map<SpecialFolder, Path> CACHE = new ConcurrentHashMap<>();
     }
 
     private static final class ShortPathUtils {
diff --git a/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/DottedVersionTest.java b/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/DottedVersionTest.java
index c9c2b018556..82567824189 100644
--- a/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/DottedVersionTest.java
+++ b/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/DottedVersionTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,10 @@
  */
 package jdk.jpackage.internal;
 
+import java.text.MessageFormat;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Objects;
 import java.util.function.Function;
 import java.util.stream.Stream;
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -112,28 +114,57 @@ public class DottedVersionTest {
         return data;
     }
 
-    @ParameterizedTest
-    @MethodSource
-    public void testInvalid(String str) {
-        assertThrowsExactly(IllegalArgumentException.class, () -> new DottedVersion(str));
+    record InvalidVersionTestSpec(String version, String invalidComponent) {
+        public InvalidVersionTestSpec {
+            Objects.requireNonNull(version);
+            Objects.requireNonNull(invalidComponent);
+        }
+
+        InvalidVersionTestSpec(String version) {
+            this(version, "");
+        }
+
+        void run() {
+            final String expectedErrorMsg;
+            if (invalidComponent.isEmpty()) {
+                expectedErrorMsg = MessageFormat.format(I18N.getString("error.version-string-zero-length-component"), version);
+            } else {
+                expectedErrorMsg = MessageFormat.format(I18N.getString("error.version-string-invalid-component"), version, invalidComponent);
+            }
+
+            final var ex = assertThrowsExactly(IllegalArgumentException.class, () -> new DottedVersion(version));
+
+            assertEquals(expectedErrorMsg, ex.getMessage());
+        }
     }
 
-    private static Stream<String> testInvalid() {
+    @ParameterizedTest
+    @MethodSource
+    public void testInvalid(InvalidVersionTestSpec testSpec) {
+        testSpec.run();
+    }
+
+    private static Stream<InvalidVersionTestSpec> testInvalid() {
         return Stream.of(
-                "1.-1",
-                "5.",
-                "4.2.",
-                "3..2",
-                "2.a",
-                "0a",
-                ".",
-                " ",
-                " 1",
-                "1. 2",
-                "+1",
-                "-1",
-                "-0",
-                "+0"
+                new InvalidVersionTestSpec("1.-1", "-1"),
+                new InvalidVersionTestSpec("5."),
+                new InvalidVersionTestSpec("4.2."),
+                new InvalidVersionTestSpec("3..2", ".2"),
+                new InvalidVersionTestSpec("3...2", "..2"),
+                new InvalidVersionTestSpec("2.a", "a"),
+                new InvalidVersionTestSpec("0a", "a"),
+                new InvalidVersionTestSpec("1.0a", "0a"),
+                new InvalidVersionTestSpec(".", "."),
+                new InvalidVersionTestSpec("..", ".."),
+                new InvalidVersionTestSpec(".a.b", ".a.b"),
+                new InvalidVersionTestSpec(".1.2", ".1.2"),
+                new InvalidVersionTestSpec(" ", " "),
+                new InvalidVersionTestSpec(" 1", " 1"),
+                new InvalidVersionTestSpec("1. 2", " 2"),
+                new InvalidVersionTestSpec("+1", "+1"),
+                new InvalidVersionTestSpec("-1", "-1"),
+                new InvalidVersionTestSpec("-0", "-0"),
+                new InvalidVersionTestSpec("+0", "+0")
         );
     }
 
@@ -145,7 +176,8 @@ public class DottedVersionTest {
 
     @Test
     public void testEmptyGreedy() {
-        assertThrowsExactly(IllegalArgumentException.class, () -> DottedVersion.greedy(""), "Version may not be empty string");
+        final var ex = assertThrowsExactly(IllegalArgumentException.class, () -> DottedVersion.greedy(""));
+        assertEquals(I18N.getString("error.version-string-empty"), ex.getMessage());
     }
 
     @Test
diff --git a/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/util/TokenReplaceTest.java b/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/util/TokenReplaceTest.java
new file mode 100644
index 00000000000..01d1d10ef9d
--- /dev/null
+++ b/test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/util/TokenReplaceTest.java
@@ -0,0 +1,290 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please 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.internal.util;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.function.Supplier;
+import java.util.stream.Stream;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
+
+public class TokenReplaceTest {
+
+    public record TestSpec(String str, Optional<String> expectedStr, Optional<Exception> expectedCtorException,
+            Optional<Exception> expectedApplyToException, Map<String, String> tokenWithValues, boolean recursive) {
+
+        public TestSpec {
+            Objects.requireNonNull(expectedStr);
+            Objects.requireNonNull(expectedCtorException);
+            Objects.requireNonNull(expectedApplyToException);
+            Objects.requireNonNull(tokenWithValues);
+            tokenWithValues.values().forEach(Objects::requireNonNull);
+
+            if (expectedStr.isPresent()) {
+                if (!(expectedCtorException.isEmpty() && expectedApplyToException.isEmpty())) {
+                    throw new IllegalArgumentException();
+                }
+            } else if (expectedCtorException.isEmpty() == expectedApplyToException.isEmpty()) {
+                throw new IllegalArgumentException();
+            }
+        }
+
+        static final class Builder {
+
+            Builder str(String v) {
+                str = v;
+                return this;
+            }
+
+            Builder recursive(boolean v) {
+                recursive = v;
+                return this;
+            }
+
+            Builder recursive() {
+                return recursive(true);
+            }
+
+            Builder expect(String v) {
+                expectedStr = v;
+                return this;
+            }
+
+            Builder expectCtorThrow(String v) {
+                expectedCtorException = new IllegalArgumentException(v);
+                return this;
+            }
+
+            Builder expectApplyToNPE() {
+                expectedApplyToException = new NullPointerException();
+                return this;
+            }
+
+            Builder expectInfiniteRecursion() {
+                expectedApplyToException = new IllegalStateException("Infinite recursion");
+                return this;
+            }
+
+            Builder token(String token, String value) {
+                tokenWithValues.put(token, value);
+                return this;
+            }
+
+            TestSpec create() {
+                return new TestSpec(str, expectedStr(), Optional.ofNullable(expectedCtorException),
+                        Optional.ofNullable(expectedApplyToException), tokenWithValues, recursive);
+            }
+
+            private Optional<String> expectedStr() {
+                if (expectedCtorException == null && expectedApplyToException == null) {
+                    return Optional.ofNullable(expectedStr).or(() -> Optional.of(str));
+                } else {
+                    return Optional.empty();
+                }
+            }
+
+            private boolean recursive;
+            private String str;
+            private String expectedStr;
+            private Exception expectedCtorException;
+            private Exception expectedApplyToException;
+            private final Map<String, String> tokenWithValues = new HashMap<>();
+        }
+
+        void test() {
+            final var tokens = tokenWithValues.keySet().toArray(String[]::new);
+            expectedStr.ifPresent(expected -> {
+                final var tokenReplace = new TokenReplace(tokens);
+                final String actual;
+                if (recursive) {
+                    actual = tokenReplace.recursiveApplyTo(str, tokenWithValues::get);
+                } else {
+                    actual = tokenReplace.applyTo(str, tokenWithValues::get);
+                }
+                assertEquals(expected, actual);
+            });
+
+            expectedCtorException.ifPresent(expected -> {
+                final var ex = assertThrows(expected.getClass(), () -> {
+                    new TokenReplace(tokens);
+                });
+                assertEquals(expected.getMessage(), ex.getMessage());
+            });
+
+            expectedApplyToException.ifPresent(expected -> {
+                final var tokenReplace = new TokenReplace(tokens);
+                final var ex = assertThrows(expected.getClass(), () -> {
+                    if (recursive) {
+                        tokenReplace.recursiveApplyTo(str, tokenWithValues::get);
+                    } else {
+                        tokenReplace.applyTo(str, tokenWithValues::get);
+                    }
+                });
+                assertEquals(expected.getMessage(), ex.getMessage());
+            });
+        }
+    }
+
+    @ParameterizedTest
+    @MethodSource
+    public void test(TestSpec spec) {
+        spec.test();
+    }
+
+    public static Stream<TestSpec> test() {
+        return Stream.of(
+                testSpec("foo").token("", "B").expectCtorThrow("Empty token in the list of tokens"),
+                testSpec("foo").expectCtorThrow("Empty token list"),
+                testSpec("a").expect("a").token("b", "B"),
+                testSpec("a").expect("A").token("a", "A"),
+                testSpec("aaa").expect("AAA").token("a", "A"),
+                testSpec("aaa").recursive().expect("{B}{B}{B}").token("a", "b").token("b", "{B}"),
+                testSpec("aaa").token("a", "aa").token("aa", "C").expect("Caa"),
+                testSpec("aaa").token("a", "aa").token("aa", "C").expect("CC").recursive(),
+                testSpec("aaa").expect("A2A").token("a", "A").token("aa", "A2"),
+                testSpec("aaa").token("a", "b").token("b", "c").token("c", "a").expect("bbb"),
+                testSpec("aaa").token("a", "b").token("b", "").recursive().expect(""),
+                testSpec("aaa").token("a", "").recursive().expect(""),
+                testSpec("aaa").token("a", "b").token("b", "c").token("c", "a").expectInfiniteRecursion().recursive(),
+                testSpec(null).token("a", "b").expectApplyToNPE(),
+                testSpec("abc").expect("abc").token(".", "A"),
+                testSpec("abc.").expect("abcD").token(".", "D")
+        ).map(TestSpec.Builder::create);
+    }
+
+    private static final class CountingSupplier implements Supplier<Object> {
+
+        CountingSupplier(Object value, int expectedCount) {
+            this.value = value;
+            this.expectedCount = expectedCount;
+        }
+
+        @Override
+        public Object get() {
+            counter++;
+            return value;
+        }
+
+        public Object value() {
+            return value;
+        }
+
+        void verifyCount() {
+            assertEquals(expectedCount, counter);
+        }
+
+        private final Object value;
+        private int counter;
+        private final int expectedCount;
+    }
+
+    @Test
+    public void testCombine() {
+        final var x = new TokenReplace("a");
+        final var y = new TokenReplace("aa");
+
+        final var xy = TokenReplace.combine(x, y);
+
+        assertEquals(xy, new TokenReplace("aa", "a"));
+        assertEquals(xy, new TokenReplace("a", "aa"));
+    }
+
+    @Test
+    public void testCombine2() {
+        final var x = new TokenReplace("a");
+        final var y = new TokenReplace("a");
+
+        final var xy = TokenReplace.combine(x, y);
+
+        assertEquals(xy, new TokenReplace("a", "a"));
+        assertEquals(xy, new TokenReplace("a"));
+        assertEquals(xy, x);
+        assertEquals(xy, y);
+    }
+
+    @Test
+    public void testCombine3() {
+        final var x = new TokenReplace("a");
+        final var y = new TokenReplace("b");
+
+        final var xy = TokenReplace.combine(x, y);
+
+        assertEquals(xy, new TokenReplace("a", "b"));
+        assertEquals(xy, new TokenReplace("b", "a"));
+    }
+
+    @Test
+    public void testEquals() {
+        final var x = new TokenReplace("x");
+        final var y = new TokenReplace("y");
+        final var y2 = new TokenReplace("y");
+
+        assertNotEquals(x, y);
+        assertNotEquals(x, null);
+        assertNotEquals(null, x);
+        assertNotEquals(x, "x");
+
+        assertEquals(y, y2);
+        assertEquals(y, y);
+    }
+
+    @Test
+    public void testCreateCachingTokenValueSupplier() {
+        final var neverCalledSupplier = new CountingSupplier("", 0);
+        final var calledOnceSupplier = new CountingSupplier("foo", 1);
+        final var calledOnceNullSupplier = new CountingSupplier(null, 1);
+
+        final var supplier = TokenReplace.createCachingTokenValueSupplier(Map.of(
+                "never", neverCalledSupplier,
+                "once", calledOnceSupplier,
+                "onceNull", calledOnceNullSupplier
+        ));
+
+        for (int i = 0; i != 2; i++) {
+            assertEquals(calledOnceSupplier.value(), supplier.apply("once"));
+
+            final var ex = assertThrows(NullPointerException.class, () -> supplier.apply("onceNull"));
+            assertEquals("Null value for token [onceNull]", ex.getMessage());
+        }
+
+        final var ex = assertThrows(NullPointerException.class, () -> supplier.apply("foo"));
+        assertEquals("No token value supplier for token [foo]", ex.getMessage());
+
+        neverCalledSupplier.verifyCount();
+        calledOnceSupplier.verifyCount();
+        calledOnceNullSupplier.verifyCount();
+    }
+
+    private static TestSpec.Builder testSpec(String str) {
+        return new TestSpec.Builder().str(str);
+    }
+}
diff --git a/test/jdk/tools/jpackage/linux/LinuxResourceTest.java b/test/jdk/tools/jpackage/linux/LinuxResourceTest.java
index 1dc8dee3c97..8371dc01e43 100644
--- a/test/jdk/tools/jpackage/linux/LinuxResourceTest.java
+++ b/test/jdk/tools/jpackage/linux/LinuxResourceTest.java
@@ -21,14 +21,19 @@
  * questions.
  */
 
+import static jdk.jpackage.test.JPackageStringBundle.MAIN;
+
 import java.io.IOException;
 import java.nio.file.Path;
-import jdk.jpackage.test.TKit;
+import java.util.List;
+import java.util.Objects;
+import jdk.jpackage.test.Annotations.Test;
+import jdk.jpackage.test.JPackageCommand;
+import jdk.jpackage.test.LinuxHelper;
 import jdk.jpackage.test.PackageTest;
 import jdk.jpackage.test.PackageType;
-import jdk.jpackage.test.LinuxHelper;
-import jdk.jpackage.test.Annotations.Test;
-import java.util.List;
+import jdk.jpackage.test.RunnablePackageTest.Action;
+import jdk.jpackage.test.TKit;
 
 /*
  * @test
@@ -55,48 +60,47 @@ public class LinuxResourceTest {
         })
         .forTypes(PackageType.LINUX_DEB)
         .addInitializer(cmd -> {
-            Path controlFile = Path.of(cmd.getArgumentValue("--resource-dir"),
-                    "control");
+            Path controlFile = Path.of(cmd.getArgumentValue("--resource-dir"), "control");
+
+            final var packageProp = property("Package", "dont-install-me");
+            final var verProp = property("Version", "1.2.3-R2");
+            final var arhProp = property("Architecture", "bar");
+
             TKit.createTextFile(controlFile, List.of(
-                "Package: dont-install-me",
-                "Version: 1.2.3-R2",
+                packageProp.format(),
+                verProp.format(),
                 "Section: APPLICATION_SECTION",
                 "Maintainer: APPLICATION_MAINTAINER",
                 "Priority: optional",
-                "Architecture: bar",
+                arhProp.format(),
                 "Provides: dont-install-me",
                 "Description: APPLICATION_DESCRIPTION",
                 "Installed-Size: APPLICATION_INSTALLED_SIZE",
                 "Depends: PACKAGE_DEFAULT_DEPENDENCIES"
             ));
-        })
-        .addBundleVerifier((cmd, result) -> {
-            TKit.assertTextStream("Using custom package resource [DEB control file]")
-                    .predicate(String::contains)
-                    .apply(result.getOutput().stream());
-            TKit.assertTextStream(String.format(
-                    "Expected value of \"Package\" property is [%s]. Actual value in output package is [dont-install-me]",
-                    LinuxHelper.getPackageName(cmd)))
-                    .predicate(String::contains)
-                    .apply(result.getOutput().stream());
-            TKit.assertTextStream(
-                    "Expected value of \"Version\" property is [1.0]. Actual value in output package is [1.2.3-R2]")
-                    .predicate(String::contains)
-                    .apply(result.getOutput().stream());
-            TKit.assertTextStream(String.format(
-                    "Expected value of \"Architecture\" property is [%s]. Actual value in output package is [bar]",
-                    LinuxHelper.getDefaultPackageArch(cmd.packageType())))
-                    .predicate(String::contains)
-                    .apply(result.getOutput().stream());
+
+            cmd.validateOutput(MAIN.cannedFormattedString(
+                    "message.using-custom-resource",
+                    String.format("[%s]", MAIN.cannedFormattedString("resource.deb-control-file").getValue()),
+                    controlFile.getFileName()));
+
+            packageProp.expectedValue(LinuxHelper.getPackageName(cmd)).token("APPLICATION_PACKAGE").resourceDirFile(controlFile).validateOutput(cmd);
+            verProp.expectedValue(cmd.version()).token("APPLICATION_VERSION_WITH_RELEASE").resourceDirFile(controlFile).validateOutput(cmd);
+            arhProp.expectedValue(LinuxHelper.getDefaultPackageArch(cmd.packageType())).token("APPLICATION_ARCH").resourceDirFile(controlFile).validateOutput(cmd);
         })
         .forTypes(PackageType.LINUX_RPM)
         .addInitializer(cmd -> {
             Path specFile = Path.of(cmd.getArgumentValue("--resource-dir"),
                     LinuxHelper.getPackageName(cmd) + ".spec");
+
+            final var packageProp = property("Name", "dont-install-me");
+            final var verProp = property("Version", "1.2.3");
+            final var releaseProp = property("Release", "R2");
+
             TKit.createTextFile(specFile, List.of(
-                "Name: dont-install-me",
-                "Version: 1.2.3",
-                "Release: R2",
+                packageProp.format(),
+                verProp.format(),
+                releaseProp.format(),
                 "Summary: APPLICATION_SUMMARY",
                 "License: APPLICATION_LICENSE_TYPE",
                 "Prefix: %{dirname:APPLICATION_DIRECTORY}",
@@ -113,25 +117,77 @@ public class LinuxResourceTest {
                 "%files",
                 "APPLICATION_DIRECTORY"
             ));
+
+            cmd.validateOutput(MAIN.cannedFormattedString(
+                    "message.using-custom-resource",
+                    String.format("[%s]", MAIN.cannedFormattedString("resource.rpm-spec-file").getValue()),
+                    specFile.getFileName()));
+
+            packageProp.expectedValue(LinuxHelper.getPackageName(cmd)).token("APPLICATION_PACKAGE").resourceDirFile(specFile).validateOutput(cmd);
+            verProp.expectedValue(cmd.version()).token("APPLICATION_VERSION").resourceDirFile(specFile).validateOutput(cmd);
+            releaseProp.expectedValue("1").token("APPLICATION_RELEASE").resourceDirFile(specFile).validateOutput(cmd);
         })
-        .addBundleVerifier((cmd, result) -> {
-            TKit.assertTextStream("Using custom package resource [RPM spec file]")
-                    .predicate(String::contains)
-                    .apply(result.getOutput().stream());
-            TKit.assertTextStream(String.format(
-                    "Expected value of \"Name\" property is [%s]. Actual value in output package is [dont-install-me]",
-                    LinuxHelper.getPackageName(cmd)))
-                    .predicate(String::contains)
-                    .apply(result.getOutput().stream());
-            TKit.assertTextStream(
-                    "Expected value of \"Version\" property is [1.0]. Actual value in output package is [1.2.3]")
-                    .predicate(String::contains)
-                    .apply(result.getOutput().stream());
-            TKit.assertTextStream(
-                    "Expected value of \"Release\" property is [1]. Actual value in output package is [R2]")
-                    .predicate(String::contains)
-                    .apply(result.getOutput().stream());
-        })
-        .run();
+        .run(Action.CREATE);
+    }
+
+    private static final class PropertyValidator {
+
+        PropertyValidator name(String v) {
+            name = v;
+            return this;
+        }
+
+        PropertyValidator customValue(String v) {
+            customValue = v;
+            return this;
+        }
+
+        PropertyValidator expectedValue(String v) {
+            expectedValue = v;
+            return this;
+        }
+
+        PropertyValidator token(String v) {
+            token = v;
+            return this;
+        }
+
+        PropertyValidator resourceDirFile(Path v) {
+            resourceDirFile = v;
+            return this;
+        }
+
+        String format() {
+            Objects.requireNonNull(name);
+            Objects.requireNonNull(customValue);
+            return String.format("%s: %s", name, customValue);
+        }
+
+        void validateOutput(JPackageCommand cmd) {
+            Objects.requireNonNull(name);
+            Objects.requireNonNull(customValue);
+            Objects.requireNonNull(expectedValue);
+            Objects.requireNonNull(token);
+            Objects.requireNonNull(resourceDirFile);
+
+            final var customResourcePath = customResourcePath();
+            cmd.validateOutput(
+                    MAIN.cannedFormattedString("error.unexpected-package-property", name, expectedValue, customValue, customResourcePath),
+                    MAIN.cannedFormattedString("error.unexpected-package-property.advice", token, customValue, name, customResourcePath));
+        }
+
+        private Path customResourcePath() {
+            return resourceDirFile.getFileName();
+        }
+
+        private String name;
+        private String customValue;
+        private String expectedValue;
+        private String token;
+        private Path resourceDirFile;
+    }
+
+    private static PropertyValidator property(String name, String customValue) {
+        return new PropertyValidator().name(name).customValue(customValue);
     }
 }
diff --git a/test/jdk/tools/jpackage/macosx/MacAppStoreJlinkOptionsTest.java b/test/jdk/tools/jpackage/macosx/MacAppStoreJlinkOptionsTest.java
index 1501fd15d8f..0f7534aa88d 100644
--- a/test/jdk/tools/jpackage/macosx/MacAppStoreJlinkOptionsTest.java
+++ b/test/jdk/tools/jpackage/macosx/MacAppStoreJlinkOptionsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,9 +25,7 @@ import jdk.jpackage.test.JPackageCommand;
 import jdk.jpackage.test.Annotations.Test;
 
 /**
- * Tests generation of app image with --mac-app-store and --jlink-options. jpackage should able
- * to generate app image if "--strip-native-commands" is specified for --jlink-options and should
- * fail if it is not specified.
+ * Tests generation of app image with --mac-app-store and --jlink-options.
  */
 
 /*
@@ -50,13 +48,4 @@ public class MacAppStoreJLinkOptionsTest {
 
         cmd.executeAndAssertHelloAppImageCreated();
     }
-
-    @Test
-    public static void testWithoutStripNativeCommands() throws Exception {
-        JPackageCommand cmd = JPackageCommand.helloAppImage();
-        cmd.addArguments("--mac-app-store", "--jlink-options",
-                "--strip-debug --no-man-pages --no-header-files");
-
-        cmd.execute(1);
-    }
 }
diff --git a/test/jdk/tools/jpackage/macosx/MacAppStoreRuntimeTest.java b/test/jdk/tools/jpackage/macosx/MacAppStoreRuntimeTest.java
deleted file mode 100644
index ab8b8590b33..00000000000
--- a/test/jdk/tools/jpackage/macosx/MacAppStoreRuntimeTest.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * 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.
- */
-
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-
-import jdk.jpackage.test.JPackageCommand;
-import jdk.jpackage.test.Executor;
-import jdk.jpackage.test.TKit;
-import jdk.jpackage.test.JavaTool;
-import jdk.jpackage.test.Annotations.Test;
-import jdk.jpackage.test.Annotations.Parameter;
-
-
-/**
- * Tests generation of app image with --mac-app-store and --runtime-image. jpackage should able
- * to generate app image if runtime image does not have "bin" folder and fail otherwise.
- */
-
-/*
- * @test
- * @summary jpackage with --mac-app-store and --runtime-image
- * @library /test/jdk/tools/jpackage/helpers
- * @build jdk.jpackage.test.*
- * @build MacAppStoreRuntimeTest
- * @requires (os.family == "mac")
- * @run main/othervm -Xmx512m jdk.jpackage.test.Main
- *  --jpt-run=MacAppStoreRuntimeTest
- */
-public class MacAppStoreRuntimeTest {
-
-    private static String getRuntimeImage(boolean stripNativeCommands) throws IOException {
-        final Path workDir = TKit.createTempDirectory("runtime").resolve("data");
-        final Path jlinkOutputDir = workDir.resolve("temp.runtime");
-        Files.createDirectories(jlinkOutputDir.getParent());
-
-        // List of modules required for test app.
-        final var modules = new String[] {
-            "java.base",
-            "java.desktop"
-        };
-
-        List<String> jlinkArgs = new ArrayList<>();
-        jlinkArgs.add("--output");
-        jlinkArgs.add(jlinkOutputDir.toString());
-        jlinkArgs.add("--add-modules");
-        jlinkArgs.add(String.join(",", modules));
-        jlinkArgs.add("--strip-debug");
-        jlinkArgs.add("--no-header-files");
-        jlinkArgs.add("--no-man-pages");
-        if (stripNativeCommands) {
-            jlinkArgs.add("--strip-native-commands");
-        }
-
-        new Executor()
-                .setToolProvider(JavaTool.JLINK)
-                .dumpOutput()
-                .addArguments(jlinkArgs)
-                .execute();
-
-        return jlinkOutputDir.toString();
-    }
-
-    @Test
-    @Parameter("true")
-    @Parameter("false")
-    public static void test(boolean stripNativeCommands) throws Exception {
-        JPackageCommand cmd = JPackageCommand.helloAppImage();
-        cmd.addArguments("--mac-app-store", "--runtime-image", getRuntimeImage(stripNativeCommands));
-
-        if (stripNativeCommands) {
-            cmd.executeAndAssertHelloAppImageCreated();
-        } else {
-            cmd.execute(1);
-        }
-    }
-}
diff --git a/test/jdk/tools/jpackage/macosx/SigningAppImageTest.java b/test/jdk/tools/jpackage/macosx/SigningAppImageTest.java
index 959f6d710b6..e27f6c8729b 100644
--- a/test/jdk/tools/jpackage/macosx/SigningAppImageTest.java
+++ b/test/jdk/tools/jpackage/macosx/SigningAppImageTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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,17 +62,15 @@ public class SigningAppImageTest {
     @Test
     // ({"sign or not", "signing-key or sign-identity", "certificate index"})
     // Sign, signing-key and ASCII certificate
-    @Parameter({"true", "true", SigningBase.ASCII_INDEX})
+    @Parameter({"true", "true", "ASCII_INDEX"})
     // Sign, signing-key and UNICODE certificate
-    @Parameter({"true", "true", SigningBase.UNICODE_INDEX})
+    @Parameter({"true", "true", "UNICODE_INDEX"})
     // Sign, signing-indentity and UNICODE certificate
-    @Parameter({"true", "false", SigningBase.UNICODE_INDEX})
+    @Parameter({"true", "false", "UNICODE_INDEX"})
     // Unsigned
-    @Parameter({"false", "true", "-1"})
-    public void test(String... testArgs) throws Exception {
-        boolean doSign = Boolean.parseBoolean(testArgs[0]);
-        boolean signingKey = Boolean.parseBoolean(testArgs[1]);
-        int certIndex = Integer.parseInt(testArgs[2]);
+    @Parameter({"false", "true", "INVALID_INDEX"})
+    public void test(boolean doSign, boolean signingKey, SigningBase.CertIndex certEnum) throws Exception {
+        final var certIndex = certEnum.value();
 
         SigningCheck.checkCertificates(certIndex);
 
diff --git a/test/jdk/tools/jpackage/macosx/SigningPackageTest.java b/test/jdk/tools/jpackage/macosx/SigningPackageTest.java
index 46a3dad2af8..c56f01e192e 100644
--- a/test/jdk/tools/jpackage/macosx/SigningPackageTest.java
+++ b/test/jdk/tools/jpackage/macosx/SigningPackageTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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,27 +110,24 @@ public class SigningPackageTest {
             return SigningBase.getDevNameIndex(devName);
         } else {
             // Signing-indentity
-            return Integer.valueOf(SigningBase.UNICODE_INDEX);
+            return SigningBase.CertIndex.UNICODE_INDEX.value();
         }
     }
 
     @Test
     // ("signing-key or sign-identity", "sign app-image", "sign pkg", "certificate index"})
     // Signing-key and ASCII certificate
-    @Parameter({"true", "true", "true", SigningBase.ASCII_INDEX})
+    @Parameter({"true", "true", "true", "ASCII_INDEX"})
     // Signing-key and UNICODE certificate
-    @Parameter({"true", "true", "true", SigningBase.UNICODE_INDEX})
+    @Parameter({"true", "true", "true", "UNICODE_INDEX"})
     // Signing-indentity and UNICODE certificate
-    @Parameter({"false", "true", "true", SigningBase.UNICODE_INDEX})
+    @Parameter({"false", "true", "true", "UNICODE_INDEX"})
     // Signing-indentity, but sign app-image only and UNICODE certificate
-    @Parameter({"false", "true", "false", SigningBase.UNICODE_INDEX})
+    @Parameter({"false", "true", "false", "UNICODE_INDEX"})
     // Signing-indentity, but sign pkg only and UNICODE certificate
-    @Parameter({"false", "false", "true", SigningBase.UNICODE_INDEX})
-    public static void test(String... testArgs) throws Exception {
-        boolean signingKey = Boolean.parseBoolean(testArgs[0]);
-        boolean signAppImage = Boolean.parseBoolean(testArgs[1]);
-        boolean signPKG = Boolean.parseBoolean(testArgs[2]);
-        int certIndex = Integer.parseInt(testArgs[3]);
+    @Parameter({"false", "false", "true", "UNICODE_INDEX"})
+    public static void test(boolean signingKey, boolean signAppImage, boolean signPKG, SigningBase.CertIndex certEnum) throws Exception {
+        final var certIndex = certEnum.value();
 
         SigningCheck.checkCertificates(certIndex);
 
diff --git a/test/jdk/tools/jpackage/macosx/base/SigningBase.java b/test/jdk/tools/jpackage/macosx/base/SigningBase.java
index 254aa306b52..021a19bb82f 100644
--- a/test/jdk/tools/jpackage/macosx/base/SigningBase.java
+++ b/test/jdk/tools/jpackage/macosx/base/SigningBase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -32,9 +32,23 @@ import jdk.jpackage.test.Executor.Result;
 
 public class SigningBase {
 
+    enum CertIndex {
+        ASCII_INDEX(0),
+        UNICODE_INDEX(1),
+        INVALID_INDEX(-1);
+
+        CertIndex(int value) {
+            this.value = value;
+        }
+
+        int value() {
+            return value;
+        }
+
+        private final int value;
+    }
+
     public static int DEFAULT_INDEX = 0;
-    public static final String ASCII_INDEX = "0";
-    public static final String UNICODE_INDEX = "0";
     private static String [] DEV_NAMES = {
         "jpackage.openjdk.java.net",
         "jpackage.openjdk.java.net (ö)",
diff --git a/test/jdk/tools/jpackage/share/AppImagePackageTest.java b/test/jdk/tools/jpackage/share/AppImagePackageTest.java
index fc545cc1f55..34a418c6f9e 100644
--- a/test/jdk/tools/jpackage/share/AppImagePackageTest.java
+++ b/test/jdk/tools/jpackage/share/AppImagePackageTest.java
@@ -25,10 +25,13 @@ import java.nio.file.Path;
 import java.nio.file.Files;
 import java.io.IOException;
 import java.util.List;
+import jdk.jpackage.internal.util.XmlUtils;
 import jdk.jpackage.test.AppImageFile;
 import jdk.jpackage.test.Annotations.Parameter;
+import jdk.jpackage.test.CannedFormattedString;
 import jdk.jpackage.test.TKit;
 import jdk.jpackage.test.JPackageCommand;
+import jdk.jpackage.test.JPackageStringBundle;
 import jdk.jpackage.test.PackageTest;
 import jdk.jpackage.test.RunnablePackageTest.Action;
 import jdk.jpackage.test.Annotations.Test;
@@ -106,17 +109,16 @@ public class AppImagePackageTest {
     public static void testBadAppImage() throws IOException {
         Path appImageDir = TKit.createTempDirectory("appimage");
         Files.createFile(appImageDir.resolve("foo"));
-        configureAppImageWithoutJPackageXMLFile(appImageDir).addInitializer(
-                cmd -> {
-                    cmd.removeArgumentWithValue("--name");
-                }).run(Action.CREATE);
+        configureBadAppImage(appImageDir).addInitializer(cmd -> {
+            cmd.removeArgumentWithValue("--name");
+        }).run(Action.CREATE);
     }
 
     @Test
     public static void testBadAppImage2() throws IOException {
         Path appImageDir = TKit.createTempDirectory("appimage");
         Files.createFile(appImageDir.resolve("foo"));
-        configureAppImageWithoutJPackageXMLFile(appImageDir).run(Action.CREATE);
+        configureBadAppImage(appImageDir).run(Action.CREATE);
     }
 
     @Test
@@ -126,29 +128,45 @@ public class AppImagePackageTest {
         JPackageCommand appImageCmd = JPackageCommand.helloAppImage().
                 setFakeRuntime().setArgumentValue("--dest", appImageDir);
 
-        configureAppImageWithoutJPackageXMLFile(appImageCmd.outputBundle()).
-                addRunOnceInitializer(() -> {
-                    appImageCmd.execute();
-                    Files.delete(AppImageFile.getPathInAppImage(appImageCmd.
-                            outputBundle()));
-                }).run(Action.CREATE);
+        configureBadAppImage(appImageCmd.outputBundle()).addRunOnceInitializer(() -> {
+            appImageCmd.execute();
+            Files.delete(AppImageFile.getPathInAppImage(appImageCmd.outputBundle()));
+        }).run(Action.CREATE);
     }
 
-    private static PackageTest configureAppImageWithoutJPackageXMLFile(
-            Path appImageDir) {
-        return new PackageTest()
-                .addInitializer(cmd -> {
-                    cmd.saveConsoleOutput(true);
-                    cmd.addArguments("--app-image", appImageDir);
-                    cmd.removeArgumentWithValue("--input");
-                    cmd.ignoreDefaultVerbose(true); // no "--verbose" option
-                })
-                .addBundleVerifier((cmd, result) -> {
-                    TKit.assertTextStream(
-                    "Error: Missing .jpackage.xml file in app-image dir").apply(
-                            result.getOutput().stream());
-                })
-                .setExpectedExitCode(1);
+    @Test
+    public static void testBadAppImageFile() throws IOException {
+        final var appImageRoot = TKit.createTempDirectory("appimage");
+
+        final var appImageCmd = JPackageCommand.helloAppImage().
+                setFakeRuntime().setArgumentValue("--dest", appImageRoot);
+
+        final var appImageDir = appImageCmd.outputBundle();
+
+        final var expectedError = JPackageStringBundle.MAIN.cannedFormattedString(
+                "error.invalid-app-image", appImageDir, AppImageFile.getPathInAppImage(appImageDir));
+
+        configureBadAppImage(appImageDir, expectedError).addRunOnceInitializer(() -> {
+            appImageCmd.execute();
+            XmlUtils.createXml(AppImageFile.getPathInAppImage(appImageDir), xml -> {
+                xml.writeStartElement("jpackage-state");
+                xml.writeEndElement();
+            });
+        }).run(Action.CREATE);
+    }
+
+    private static PackageTest configureBadAppImage(Path appImageDir) {
+        return configureBadAppImage(appImageDir,
+                JPackageStringBundle.MAIN.cannedFormattedString("error.foreign-app-image", appImageDir));
+    }
+
+    private static PackageTest configureBadAppImage(Path appImageDir, CannedFormattedString expectedError) {
+        return new PackageTest().addInitializer(cmd -> {
+            cmd.addArguments("--app-image", appImageDir);
+            cmd.removeArgumentWithValue("--input");
+            cmd.ignoreDefaultVerbose(true); // no "--verbose" option
+            cmd.validateOutput(expectedError);
+        }).setExpectedExitCode(1);
     }
 
     private static Path iconPath(String name) {
diff --git a/test/jdk/tools/jpackage/share/AppVersionTest.java b/test/jdk/tools/jpackage/share/AppVersionTest.java
index e81b1eae9cf..c9e66cbd7a1 100644
--- a/test/jdk/tools/jpackage/share/AppVersionTest.java
+++ b/test/jdk/tools/jpackage/share/AppVersionTest.java
@@ -31,7 +31,6 @@ import jdk.jpackage.test.AppImageFile;
 import jdk.jpackage.test.Annotations.Parameters;
 import jdk.jpackage.test.Annotations.Test;
 import jdk.jpackage.test.JPackageCommand;
-import jdk.jpackage.test.PackageTest;
 import jdk.jpackage.test.TKit;
 
 /*
@@ -70,19 +69,6 @@ public final class AppVersionTest {
                 "--app-version", "7.5.81"}}
         }));
 
-        // These are invalid version strings.
-        // Don't need to test all invalid input as this is handled in
-        // PlatformVersionTest unit test
-        if (TKit.isWindows()) {
-            data.addAll(List.of(new Object[][]{
-                {null, "Hello", new String[]{"--app-version", "256"}}
-            }));
-        } else if (TKit.isOSX()) {
-            data.addAll(List.of(new Object[][]{
-                {null, "Hello", new String[]{"--app-version", "0.2"}}
-            }));
-        }
-
         return data;
     }
 
@@ -95,17 +81,6 @@ public final class AppVersionTest {
 
     @Test
     public void test() throws XPathExpressionException, IOException {
-        if (expectedVersion == null) {
-            new PackageTest()
-            .setExpectedExitCode(1)
-            .configureHelloApp(javaAppDesc)
-            .addInitializer(cmd -> {
-                cmd.addArguments(jpackageArgs);
-            })
-            .run();
-            return;
-        }
-
         JPackageCommand cmd = JPackageCommand.helloAppImage(javaAppDesc);
         if (jpackageArgs != null) {
             cmd.addArguments(jpackageArgs);
diff --git a/test/jdk/tools/jpackage/share/BasicTest.java b/test/jdk/tools/jpackage/share/BasicTest.java
index 94e0a335d18..fe988533a28 100644
--- a/test/jdk/tools/jpackage/share/BasicTest.java
+++ b/test/jdk/tools/jpackage/share/BasicTest.java
@@ -36,6 +36,7 @@ import java.util.regex.Pattern;
 import java.util.stream.Stream;
 import jdk.jpackage.test.TKit;
 import jdk.jpackage.test.JPackageCommand;
+import jdk.jpackage.test.JPackageStringBundle;
 import jdk.jpackage.test.JavaAppDesc;
 import jdk.jpackage.test.PackageTest;
 import jdk.jpackage.test.HelloApp;
@@ -381,7 +382,10 @@ public final class BasicTest {
         );
 
         if (TestTempType.TEMPDIR_NOT_EMPTY.equals(type)) {
-            pkgTest.setExpectedExitCode(1).addBundleVerifier(cmd -> {
+            pkgTest.setExpectedExitCode(1).addInitializer(cmd -> {
+                cmd.validateOutput(JPackageStringBundle.MAIN.cannedFormattedString(
+                        "ERR_BuildRootInvalid", cmd.getArgumentValue("--temp")));
+            }).addBundleVerifier(cmd -> {
                 // Check jpackage didn't use the supplied directory.
                 Path tempDir = Path.of(cmd.getArgumentValue("--temp"));
                 TKit.assertDirectoryContent(tempDir).match(Path.of("foo.txt"));
diff --git a/test/jdk/tools/jpackage/share/ErrorTest.java b/test/jdk/tools/jpackage/share/ErrorTest.java
index f28fe0a4152..5260dceae32 100644
--- a/test/jdk/tools/jpackage/share/ErrorTest.java
+++ b/test/jdk/tools/jpackage/share/ErrorTest.java
@@ -22,19 +22,32 @@
  */
 
 
+import static java.util.stream.Collectors.toMap;
+import static jdk.internal.util.OperatingSystem.LINUX;
+import static jdk.internal.util.OperatingSystem.MACOS;
+import static jdk.internal.util.OperatingSystem.WINDOWS;
+import static jdk.jpackage.test.CannedFormattedString.cannedAbsolutePath;
+
+import java.nio.file.Path;
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
+import java.util.Map;
+import java.util.Objects;
 import java.util.Optional;
+import java.util.function.Function;
+import java.util.function.Supplier;
+import java.util.regex.Pattern;
 import java.util.stream.Stream;
+import jdk.jpackage.internal.util.TokenReplace;
+import jdk.jpackage.test.Annotations.Parameter;
 import jdk.jpackage.test.Annotations.ParameterSupplier;
 import jdk.jpackage.test.Annotations.Test;
 import jdk.jpackage.test.CannedFormattedString;
 import jdk.jpackage.test.JPackageCommand;
 import jdk.jpackage.test.JPackageStringBundle;
-import jdk.jpackage.test.PackageTest;
-import jdk.jpackage.test.RunnablePackageTest;
+import jdk.jpackage.test.PackageType;
 import jdk.jpackage.test.TKit;
-import static jdk.internal.util.OperatingSystem.WINDOWS;
 
 /*
  * @test
@@ -42,7 +55,7 @@ import static jdk.internal.util.OperatingSystem.WINDOWS;
  * @library /test/jdk/tools/jpackage/helpers
  * @build jdk.jpackage.test.*
  * @compile -Xlint:all -Werror ErrorTest.java
- * @run main/othervm/timeout=360 -Xmx512m jdk.jpackage.test.Main
+ * @run main/othervm/timeout=720 -Xmx512m jdk.jpackage.test.Main
  *  --jpt-run=ErrorTest
  *  --jpt-before-run=jdk.jpackage.test.JPackageCommand.useExecutableByDefault
  */
@@ -53,101 +66,566 @@ import static jdk.internal.util.OperatingSystem.WINDOWS;
  * @library /test/jdk/tools/jpackage/helpers
  * @build jdk.jpackage.test.*
  * @compile -Xlint:all -Werror ErrorTest.java
- * @run main/othervm/timeout=360 -Xmx512m jdk.jpackage.test.Main
+ * @run main/othervm/timeout=720 -Xmx512m jdk.jpackage.test.Main
  *  --jpt-run=ErrorTest
  *  --jpt-before-run=jdk.jpackage.test.JPackageCommand.useToolProviderByDefault
  */
 
 public final class ErrorTest {
 
-    public static Collection<?> input() {
-        return List.of(new Object[][]{
+    enum Token {
+        JAVA_HOME(cmd -> {
+            return System.getProperty("java.home");
+        }),
+        APP_IMAGE(cmd -> {
+            final var appImageRoot = TKit.createTempDirectory("appimage");
+
+            final var appImageCmd = JPackageCommand.helloAppImage()
+                    .setFakeRuntime().setArgumentValue("--dest", appImageRoot);
+
+            appImageCmd.execute();
+
+            return appImageCmd.outputBundle().toString();
+        }),
+        ADD_LAUNCHER_PROPERTY_FILE;
+
+        private Token() {
+            this.valueSupplier = Optional.empty();
+        }
+
+        private Token(Function<JPackageCommand, Object> valueSupplier) {
+            this.valueSupplier = Optional.of(valueSupplier);
+        }
+
+        String token() {
+            return makeToken(name());
+        }
+
+        TokenReplace asTokenReplace() {
+            return tokenReplace;
+        }
+
+        Optional<Object> expand(JPackageCommand cmd) {
+            return valueSupplier.map(func -> func.apply(cmd));
+        }
+
+        private static String makeToken(String v) {
+            Objects.requireNonNull(v);
+            return String.format("@@%s@@", v);
+        }
+
+        private final Optional<Function<JPackageCommand, Object>> valueSupplier;
+        private final TokenReplace tokenReplace = new TokenReplace(token());
+    }
+
+    public record TestSpec(Optional<PackageType> type, Optional<String> appDesc, List<String> addArgs,
+            List<String> removeArgs, List<CannedFormattedString> expectedErrors) {
+
+        static final class Builder {
+
+            Builder type(PackageType v) {
+                type = v;
+                return this;
+            }
+
+            Builder notype() {
+                return type(null);
+            }
+
+            Builder nativeType() {
+                return type(NATIVE_TYPE);
+            }
+
+            Builder appDesc(String v) {
+                appDesc = v;
+                return this;
+            }
+
+            Builder noAppDesc() {
+                return appDesc(null);
+            }
+
+            Builder setAddArgs(List<String> v) {
+                addArgs.clear();
+                addArgs.addAll(v);
+                return this;
+            }
+
+            Builder setAddArgs(String... v) {
+                return setAddArgs(List.of(v));
+            }
+
+            Builder addArgs(List<String> v) {
+                addArgs.addAll(v);
+                return this;
+            }
+
+            Builder addArgs(String... v) {
+                return addArgs(List.of(v));
+            }
+
+            Builder setRemoveArgs(List<String> v) {
+                removeArgs.clear();
+                removeArgs.addAll(v);
+                return this;
+            }
+
+            Builder setRemoveArgs(String... v) {
+                return setRemoveArgs(List.of(v));
+            }
+
+            Builder removeArgs(List<String> v) {
+                removeArgs.addAll(v);
+                return this;
+            }
+
+            Builder removeArgs(String... v) {
+                return removeArgs(List.of(v));
+            }
+
+            Builder setErrors(List<CannedFormattedString> v) {
+                expectedErrors = v;
+                return this;
+            }
+
+            Builder setErrors(CannedFormattedString... v) {
+                return setErrors(List.of(v));
+            }
+
+            Builder errors(List<CannedFormattedString> v) {
+                expectedErrors.addAll(v);
+                return this;
+            }
+
+            Builder errors(CannedFormattedString... v) {
+                return errors(List.of(v));
+            }
+
+            Builder error(String key, Object ... args) {
+                return errors(JPackageStringBundle.MAIN.cannedFormattedString(key, args));
+            }
+
+            Builder invalidTypeArg(String arg, String... otherArgs) {
+                return addArgs(arg).addArgs(otherArgs).error("ERR_InvalidTypeOption", arg, type.getType());
+            }
+
+            Builder unsupportedPlatformOption(String arg, String ... otherArgs) {
+                return addArgs(arg).addArgs(otherArgs).error("ERR_UnsupportedOption", arg);
+            }
+
+            TestSpec create() {
+                return new TestSpec(Optional.ofNullable(type), Optional.ofNullable(appDesc),
+                        List.copyOf(addArgs), List.copyOf(removeArgs), List.copyOf(expectedErrors));
+            }
+
+            private PackageType type = PackageType.IMAGE;
+            private String appDesc = DEFAULT_APP_DESC;
+            private List<String> addArgs = new ArrayList<>();
+            private List<String> removeArgs = new ArrayList<>();
+            private List<CannedFormattedString> expectedErrors = new ArrayList<>();
+        }
+
+        public TestSpec {
+            Objects.requireNonNull(type);
+            Objects.requireNonNull(appDesc);
+            Objects.requireNonNull(addArgs);
+            addArgs.forEach(Objects::requireNonNull);
+            Objects.requireNonNull(removeArgs);
+            removeArgs.forEach(Objects::requireNonNull);
+            if (expectedErrors.isEmpty()) {
+                throw new IllegalArgumentException("The list of expected errors must be non-empty");
+            }
+        }
+
+        void test() {
+            test(Map.of());
+        }
+
+        void test(Map<Token, Function<JPackageCommand, Object>> tokenValueSuppliers) {
+            final var cmd = appDesc.map(JPackageCommand::helloAppImage).orElseGet(JPackageCommand::new);
+            type.ifPresent(cmd::setPackageType);
+
+            removeArgs.forEach(cmd::removeArgumentWithValue);
+            cmd.addArguments(addArgs);
+
+            final var tokenValueSupplier = TokenReplace.createCachingTokenValueSupplier(Stream.of(Token.values()).collect(toMap(Token::token, token -> {
+                return () -> {
+                    return token.expand(cmd).orElseGet(() -> {
+                        final var tvs = Objects.requireNonNull(tokenValueSuppliers.get(token), () -> {
+                            return String.format("No token value supplier for token [%s]", token);
+                        });
+                        return tvs.apply(cmd);
+                    });
+                };
+            })));
+
+            for (final var token : Token.values()) {
+                final var newArgs = cmd.getAllArguments().stream().map(arg -> {
+                    return token.asTokenReplace().applyTo(arg, tokenValueSupplier);
+                }).toList();
+                cmd.clearArguments().addArguments(newArgs);
+            }
+
+            defaultInit(cmd, expectedErrors);
+            cmd.execute(1);
+        }
+
+        @Override
+        public final String toString() {
+            final var sb = new StringBuilder();
+            type.ifPresent(v -> {
+                sb.append(v).append("; ");
+            });
+            appDesc.ifPresent(v -> {
+                sb.append("app-desc=").append(v).append("; ");
+            });
+            if (!addArgs.isEmpty()) {
+                sb.append("args-add=").append(addArgs).append("; ");
+            }
+            if (!removeArgs.isEmpty()) {
+                sb.append("args-del=").append(removeArgs).append("; ");
+            }
+            sb.append("errors=").append(expectedErrors);
+            return sb.toString();
+        }
+
+        private static final String DEFAULT_APP_DESC = "Hello";
+    }
+
+    private static TestSpec.Builder testSpec() {
+        return new TestSpec.Builder();
+    }
+
+    public static Collection<Object[]> basic() {
+        final List<TestSpec> testCases = new ArrayList<>();
+
+        testCases.addAll(Stream.of(
             // non-existent arg
-            {"Hello",
-                    new String[]{"--no-such-argument"},
-                    null,
-                    JPackageStringBundle.MAIN.cannedFormattedString("ERR_InvalidOption", "--no-such-argument")},
+            testSpec().addArgs("--no-such-argument")
+                    .error("ERR_InvalidOption", "--no-such-argument"),
             // no main jar
-            {"Hello",
-                    null,
-                    new String[]{"--main-jar"},
-                    JPackageStringBundle.MAIN.cannedFormattedString("ERR_NoEntryPoint")},
+            testSpec().removeArgs("--main-jar").error("ERR_NoEntryPoint"),
             // no main-class
-            {"Hello",
-                    null,
-                    new String[]{"--main-class"},
-                    JPackageStringBundle.MAIN.cannedFormattedString("error.no-main-class-with-main-jar", "hello.jar"),
-                    JPackageStringBundle.MAIN.cannedFormattedString("error.no-main-class-with-main-jar.advice", "hello.jar")},
+            testSpec().removeArgs("--main-class")
+                    .error("error.no-main-class-with-main-jar", "hello.jar")
+                    .error("error.no-main-class-with-main-jar.advice", "hello.jar"),
             // non-existent main jar
-            {"Hello",
-                    new String[]{"--main-jar", "non-existent.jar"},
-                    null,
-                    JPackageStringBundle.MAIN.cannedFormattedString("error.main-jar-does-not-exist", "non-existent.jar")},
+            testSpec().addArgs("--main-jar", "non-existent.jar")
+                    .error("error.main-jar-does-not-exist", "non-existent.jar"),
             // non-existent runtime
-            {"Hello",
-                    new String[]{"--runtime-image", "non-existent.runtime"},
-                    null,
-                    JPackageStringBundle.MAIN.cannedFormattedString("message.runtime-image-dir-does-not-exist", "runtime-image", "non-existent.runtime")},
+            testSpec().addArgs("--runtime-image", "non-existent.runtime")
+                    .error("message.runtime-image-dir-does-not-exist", "runtime-image", "non-existent.runtime"),
+            // non-existent app image
+            testSpec().noAppDesc().nativeType().addArgs("--name", "foo", "--app-image", "non-existent.appimage")
+                    .error("ERR_AppImageNotExist", "non-existent.appimage"),
             // non-existent resource-dir
-            {"Hello",
-                    new String[]{"--resource-dir", "non-existent.dir"},
-                    null,
-                    JPackageStringBundle.MAIN.cannedFormattedString("message.resource-dir-does-not-exist", "resource-dir", "non-existent.dir")},
+            testSpec().addArgs("--resource-dir", "non-existent.dir")
+                    .error("message.resource-dir-does-not-exist", "resource-dir", "non-existent.dir"),
+            // non-existent icon
+            testSpec().addArgs("--icon", "non-existent.icon")
+                    .error("ERR_IconFileNotExit", cannedAbsolutePath("non-existent.icon")),
+            // non-existent license file
+            testSpec().nativeType().addArgs("--license-file", "non-existent.license")
+                    .error("ERR_LicenseFileNotExit"),
             // invalid type
-            {"Hello",
-                    new String[]{"--type", "invalid-type"},
-                    null,
-                    JPackageStringBundle.MAIN.cannedFormattedString("ERR_InvalidInstallerType", "invalid-type")},
-            // no --input
-            {"Hello",
-                    null,
-                    new String[]{"--input"},
-                    JPackageStringBundle.MAIN.cannedFormattedString("ERR_MissingArgument", "--input")},
+            testSpec().addArgs("--type", "invalid-type")
+                    .error("ERR_InvalidInstallerType", "invalid-type"),
+            // no --input for non-mudular app
+            testSpec().removeArgs("--input").error("error.no-input-parameter"),
             // no --module-path
-            {"com.other/com.other.Hello",
-                    null,
-                    new String[]{"--module-path"},
-                    JPackageStringBundle.MAIN.cannedFormattedString("ERR_MissingArgument", "--runtime-image or --module-path")},
-        });
+            testSpec().appDesc("com.other/com.other.Hello").removeArgs("--module-path")
+                    .error("ERR_MissingArgument", "--runtime-image or --module-path"),
+            // no main class in module path
+            testSpec().noAppDesc().addArgs("--module", "java.base", "--runtime-image", Token.JAVA_HOME.token())
+                    .error("ERR_NoMainClass"),
+            // no module in module path
+            testSpec().noAppDesc().addArgs("--module", "com.foo.bar", "--runtime-image", Token.JAVA_HOME.token())
+                    .error("error.no-module-in-path", "com.foo.bar"),
+            // --main-jar and --module-name
+            testSpec().noAppDesc().addArgs("--main-jar", "foo.jar", "--module", "foo.bar")
+                    .error("ERR_BothMainJarAndModule"),
+            // non-existing argument file
+            testSpec().noAppDesc().notype().addArgs("@foo")
+                    .error("ERR_CannotParseOptions", "foo"),
+            // invalid jlink option
+            testSpec().addArgs("--jlink-options", "--foo")
+                    .error("error.jlink.failed", "Error: unknown option: --foo")
+        ).map(TestSpec.Builder::create).toList());
+
+        // forbidden jlink options
+        testCases.addAll(Stream.of("--output", "--add-modules", "--module-path").map(opt -> {
+            return testSpec().addArgs("--jlink-options", opt).error("error.blocked.option", opt);
+        }).map(TestSpec.Builder::create).toList());
+
+        // --runtime-image and --app-image are mutually-exclusive
+        testCases.addAll(createRuntimeMutuallyExclusive("--app-image", "app-image"));
+        // --runtime-image and --app-modules are mutually-exclusive
+        testCases.addAll(createRuntimeMutuallyExclusive("--add-modules", "foo.bar", "--module", "foo.bar"));
+        // --runtime-image and --jlink-options are mutually-exclusive
+        testCases.addAll(createRuntimeMutuallyExclusive("--jlink-options", "--bind-services", "--module", "foo.bar"));
+
+        return toTestArgs(testCases.stream());
+    }
+
+    record ArgumentGroup(String arg, String... otherArgs) {
+        ArgumentGroup {
+            Objects.requireNonNull(arg);
+            List.of(otherArgs).forEach(Objects::requireNonNull);
+        }
+
+        String[] asArray() {
+            return Stream.concat(Stream.of(arg), Stream.of(otherArgs)).toArray(String[]::new);
+        }
+    }
+
+    private static List<TestSpec> createRuntimeMutuallyExclusive(String arg, String... otherArgs) {
+        return createMutuallyExclusive(
+                new ArgumentGroup("--runtime-image", Token.JAVA_HOME.token()),
+                new ArgumentGroup(arg, otherArgs)
+        ).map(TestSpec.Builder::noAppDesc).map(TestSpec.Builder::nativeType).map(TestSpec.Builder::create).toList();
+    }
+
+    private static Stream<TestSpec.Builder> createMutuallyExclusive(ArgumentGroup firstGroup, ArgumentGroup secondGroup) {
+        final Supplier<TestSpec.Builder> createBuilder = () -> {
+            return testSpec().error("ERR_MutuallyExclusiveOptions", firstGroup.arg(), secondGroup.arg());
+        };
+        return Stream.of(
+                createBuilder.get().addArgs(firstGroup.asArray()).addArgs(secondGroup.asArray()),
+                createBuilder.get().addArgs(secondGroup.asArray()).addArgs(firstGroup.asArray()));
+    }
+
+    public static Collection<Object[]> invalidAppVersion() {
+        return fromTestSpecBuilders(Stream.of(
+                // Invalid app version. Just cover all different error messages.
+                // Extensive testing of invalid version strings is done in DottedVersionTest unit test.
+                testSpec().addArgs("--app-version", "").error("error.version-string-empty"),
+                testSpec().addArgs("--app-version", "1.").error("error.version-string-zero-length-component", "1."),
+                testSpec().addArgs("--app-version", "1.b.3").error("error.version-string-invalid-component", "1.b.3", "b.3")
+        ));
     }
 
     @Test
-    @ParameterSupplier("input")
-    public static void test(String javaAppDesc, String[] jpackageArgs,
-            String[] removeArgs, CannedFormattedString... expectedErrors) {
-        // Init default jpackage test command line.
-        var cmd = JPackageCommand.helloAppImage(javaAppDesc);
-
-        defaultInit(cmd, expectedErrors);
-
-        // Add arguments if requested.
-        Optional.ofNullable(jpackageArgs).ifPresent(cmd::addArguments);
-
-        // Remove arguments if requested.
-        Optional.ofNullable(removeArgs).map(List::of).ifPresent(
-                args -> args.forEach(cmd::removeArgumentWithValue));
-
-        cmd.execute(1);
+    @ParameterSupplier("basic")
+    @ParameterSupplier(value="testWindows", ifOS = WINDOWS)
+    @ParameterSupplier(value="testMac", ifOS = MACOS)
+    @ParameterSupplier(value="winOption", ifNotOS = WINDOWS)
+    @ParameterSupplier(value="linuxOption", ifNotOS = LINUX)
+    @ParameterSupplier(value="macOption", ifNotOS = MACOS)
+    @ParameterSupplier(value="invalidAppVersion", ifOS = {WINDOWS,MACOS})
+    public static void test(TestSpec spec) {
+        spec.test();
     }
 
-    @Test(ifOS = WINDOWS)
-    public static void testWinService() {
-
-        CannedFormattedString[] expectedErrors = new CannedFormattedString[] {
-            JPackageStringBundle.MAIN.cannedFormattedString("error.missing-service-installer"),
-            JPackageStringBundle.MAIN.cannedFormattedString("error.missing-service-installer.advice")
-        };
-
-        new PackageTest().configureHelloApp()
-                .addInitializer(cmd -> {
-                    defaultInit(cmd, expectedErrors);
-                    cmd.addArgument("--launcher-as-service");
-                })
-                .setExpectedExitCode(1)
-                .run(RunnablePackageTest.Action.CREATE);
+    @Test
+    @Parameter({"--input", "foo"})
+    @Parameter({"--module-path", "dir"})
+    @Parameter({"--add-modules", "java.base"})
+    @Parameter({"--main-class", "Hello"})
+    @Parameter({"--arguments", "foo"})
+    @Parameter({"--java-options", "-Dfoo.bar=10"})
+    @Parameter({"--add-launcher", "foo=foo.properties"})
+    @Parameter({"--app-content", "dir"})
+    @Parameter(value="--win-console", ifOS = WINDOWS)
+    public static void testRuntimeInstallerInvalidOptions(String... args) {
+        testSpec().noAppDesc().nativeType().addArgs("--runtime-image", Token.JAVA_HOME.token()).addArgs(args)
+                .error("ERR_NoInstallerEntryPoint", args[0]).create().test();
     }
 
-    private static void defaultInit(JPackageCommand cmd, CannedFormattedString... expectedErrors) {
+    @Test
+    @ParameterSupplier
+    public static void testAdditionLaunchers(TestSpec spec) {
+        final Path propsFile = TKit.createTempFile("add-launcher.properties");
+        TKit.createPropertiesFile(propsFile, Map.of());
+        spec.test(Map.of(Token.ADD_LAUNCHER_PROPERTY_FILE, cmd -> propsFile));
+    }
+
+    public static Collection<Object[]> testAdditionLaunchers() {
+        return fromTestSpecBuilders(Stream.of(
+            testSpec().addArgs("--add-launcher", Token.ADD_LAUNCHER_PROPERTY_FILE.token())
+                    .error("ERR_NoAddLauncherName"),
+            testSpec().removeArgs("--name").addArgs("--name", "foo", "--add-launcher", "foo=" + Token.ADD_LAUNCHER_PROPERTY_FILE.token())
+                    .error("ERR_NoUniqueName")
+        ));
+    }
+
+    @Test
+    @ParameterSupplier("invalidNames")
+    public static void testInvalidAppName(String name) {
+        testSpec().removeArgs("--name").addArgs("--name", name)
+                .error("ERR_InvalidAppName", adjustTextStreamVerifierArg(name)).create().test();
+    }
+
+    @Test
+    @ParameterSupplier("invalidNames")
+    public static void testInvalidAddLauncherName(String name) {
+        testAdditionLaunchers(testSpec()
+                .addArgs("--add-launcher", name + "=" + Token.ADD_LAUNCHER_PROPERTY_FILE.token())
+                .error("ERR_InvalidSLName", adjustTextStreamVerifierArg(name))
+                .create());
+    }
+
+    public static Collection<Object[]> invalidNames() {
+        final List<String> data = new ArrayList<>();
+        data.addAll(List.of("", "foo/bar", "foo\tbar", "foo\rbar", "foo\nbar"));
+        if (TKit.isWindows()) {
+            data.add("foo\\bar");
+        }
+        return toTestArgs(data.stream());
+    }
+
+    public static Collection<Object[]> testWindows() {
+        final List<TestSpec> testCases = new ArrayList<>();
+
+        testCases.addAll(PackageType.WINDOWS.stream().map(type -> {
+            return Stream.of(
+                    testSpec().type(type).addArgs("--launcher-as-service")
+                            .error("error.missing-service-installer")
+                            .error("error.missing-service-installer.advice"),
+                    // The below version strings are invalid for msi and exe packaging.
+                    // They are valid for app image packaging.
+                    testSpec().type(type).addArgs("--app-version", "1234")
+                            .error("error.msi-product-version-components", "1234")
+                            .error("error.version-string-wrong-format.advice"),
+                    testSpec().type(type).addArgs("--app-version", "1.2.3.4.5")
+                            .error("error.msi-product-version-components", "1.2.3.4.5")
+                            .error("error.version-string-wrong-format.advice"),
+                    testSpec().type(type).addArgs("--app-version", "256.1")
+                            .error("error.msi-product-version-major-out-of-range", "256.1")
+                            .error("error.version-string-wrong-format.advice"),
+                    testSpec().type(type).addArgs("--app-version", "1.256")
+                            .error("error.msi-product-version-minor-out-of-range", "1.256")
+                            .error("error.version-string-wrong-format.advice"),
+                    testSpec().type(type).addArgs("--app-version", "1.2.65536")
+                            .error("error.msi-product-version-build-out-of-range", "1.2.65536")
+                            .error("error.version-string-wrong-format.advice")
+            );
+        }).flatMap(x -> x).map(TestSpec.Builder::create).toList());
+
+        return toTestArgs(testCases.stream());
+    }
+
+    public static Collection<Object[]> testMac() {
+        final List<TestSpec> testCases = new ArrayList<>();
+
+        testCases.addAll(Stream.of(
+                testSpec().addArgs("--app-version", "0.2")
+                        .error("message.version-string-first-number-not-zero")
+                        .error("error.invalid-cfbundle-version.advice"),
+                testSpec().addArgs("--app-version", "1.2.3.4")
+                        .error("message.version-string-too-many-components")
+                        .error("error.invalid-cfbundle-version.advice"),
+                testSpec().invalidTypeArg("--mac-installer-sign-identity", "foo"),
+                testSpec().type(PackageType.MAC_DMG).invalidTypeArg("--mac-installer-sign-identity", "foo"),
+                testSpec().invalidTypeArg("--mac-dmg-content", "foo"),
+                testSpec().type(PackageType.MAC_PKG).invalidTypeArg("--mac-dmg-content", "foo"),
+                testSpec().noAppDesc().addArgs("--app-image", Token.APP_IMAGE.token())
+                        .error("error.app-image.mac-sign.required"),
+                testSpec().type(PackageType.MAC_PKG).addArgs("--mac-package-identifier", "#1")
+                        .error("message.invalid-identifier", "#1"),
+                // Bundle for mac app store should not have runtime commands
+                testSpec().nativeType().addArgs("--mac-app-store", "--jlink-options", "--bind-services")
+                        .error("ERR_MissingJLinkOptMacAppStore", "--strip-native-commands"),
+                testSpec().nativeType().addArgs("--mac-app-store", "--runtime-image", Token.JAVA_HOME.token())
+                        .error("ERR_MacAppStoreRuntimeBinExists", JPackageCommand.cannedArgument(cmd -> {
+                            return Path.of(cmd.getArgumentValue("--runtime-image")).toAbsolutePath();
+                        }, Token.JAVA_HOME.token()))
+        ).map(TestSpec.Builder::create).toList());
+
+        // Test a few app-image options that should not be used when signing external app image
+        testCases.addAll(Stream.of(
+                new ArgumentGroup("--app-version", "2.0"),
+                new ArgumentGroup("--name", "foo"),
+                new ArgumentGroup("--mac-app-store")
+        ).map(argGroup -> {
+            return testSpec().noAppDesc().addArgs(argGroup.asArray()).addArgs("--app-image", Token.APP_IMAGE.token())
+                    .error("ERR_InvalidOptionWithAppImageSigning", argGroup.arg());
+        }).<TestSpec>mapMulti((builder, acc) -> {
+            // It should bail out with the same error message regardless of `--mac-sign` option.
+            acc.accept(builder.create());
+            acc.accept(builder.addArgs("--mac-sign").create());
+        }).toList());
+
+        testCases.addAll(createMutuallyExclusive(
+                new ArgumentGroup("--mac-signing-key-user-name", "foo"),
+                new ArgumentGroup("--mac-app-image-sign-identity", "bar")
+        ).map(TestSpec.Builder::create).toList());
+
+        testCases.addAll(createMutuallyExclusive(
+                new ArgumentGroup("--mac-signing-key-user-name", "foo"),
+                new ArgumentGroup("--mac-installer-sign-identity", "bar")
+        ).map(TestSpec.Builder::nativeType).map(TestSpec.Builder::create).toList());
+
+        return toTestArgs(testCases.stream());
+    }
+
+    private record UnsupportedPlatformOption(String name, Optional<String> value) {
+        UnsupportedPlatformOption {
+            Objects.requireNonNull(name);
+            Objects.requireNonNull(value);
+        }
+
+        UnsupportedPlatformOption(String name) {
+            this(name, Optional.empty());
+        }
+
+        UnsupportedPlatformOption(String name, String value) {
+            this(name, Optional.of(value));
+        }
+
+        TestSpec toTestSpec() {
+            return value.map(v -> testSpec().unsupportedPlatformOption(name, v)).orElseGet(
+                    () -> testSpec().unsupportedPlatformOption(name)).create();
+        }
+
+        static Collection<Object[]> createTestArgs(UnsupportedPlatformOption... options) {
+            return toTestArgs(Stream.of(options).map(UnsupportedPlatformOption::toTestSpec));
+        }
+    }
+
+    public static Collection<Object[]> winOption() {
+        return UnsupportedPlatformOption.createTestArgs(
+                new UnsupportedPlatformOption("--win-console"),
+                new UnsupportedPlatformOption("--win-dir-chooser"),
+                new UnsupportedPlatformOption("--win-help-url", "url"),
+                new UnsupportedPlatformOption("--win-menu"),
+                new UnsupportedPlatformOption("--win-menu-group", "name"),
+                new UnsupportedPlatformOption("--win-per-user-install"),
+                new UnsupportedPlatformOption("--win-shortcut"),
+                new UnsupportedPlatformOption("--win-shortcut-prompt"),
+                new UnsupportedPlatformOption("--win-update-url", "url"),
+                new UnsupportedPlatformOption("--win-upgrade-uuid", "uuid")
+        );
+    }
+
+    public static Collection<Object[]> linuxOption() {
+        return UnsupportedPlatformOption.createTestArgs(
+                new UnsupportedPlatformOption("--linux-package-name", "name"),
+                new UnsupportedPlatformOption("--linux-deb-maintainer", "email-address"),
+                new UnsupportedPlatformOption("--linux-menu-group", "menu-group-name"),
+                new UnsupportedPlatformOption("--linux-package-deps", "deps"),
+                new UnsupportedPlatformOption("--linux-rpm-license-type", "type"),
+                new UnsupportedPlatformOption("--linux-app-release", "release"),
+                new UnsupportedPlatformOption("--linux-app-category", "category-value"),
+                new UnsupportedPlatformOption("--linux-shortcut")
+        );
+    }
+
+    public static Collection<Object[]> macOption() {
+        return UnsupportedPlatformOption.createTestArgs(
+                new UnsupportedPlatformOption("--mac-package-identifier", "identifier"),
+                new UnsupportedPlatformOption("--mac-package-name", "name"),
+                new UnsupportedPlatformOption("--mac-package-signing-prefix", "prefix"),
+                new UnsupportedPlatformOption("--mac-sign"),
+                new UnsupportedPlatformOption("--mac-signing-keychain", "keychain-name"),
+                new UnsupportedPlatformOption("--mac-signing-key-user-name", "name"),
+                new UnsupportedPlatformOption("--mac-app-store"),
+                new UnsupportedPlatformOption("--mac-entitlements", "path"),
+                new UnsupportedPlatformOption("--mac-app-category", "category"),
+                new UnsupportedPlatformOption("--mac-dmg-content", "additional-content")
+        );
+    }
+
+    private static void defaultInit(JPackageCommand cmd, List<CannedFormattedString> expectedErrors) {
 
         // Disable default logic adding `--verbose` option
         // to jpackage command line.
@@ -158,11 +636,36 @@ public final class ErrorTest {
         // with jpackage arguments in this test.
         cmd.ignoreDefaultRuntime(true);
 
-        // Configure jpackage output verifier to look up the list of provided
-        // errors in the order they are specified.
-        cmd.validateOutput(Stream.of(expectedErrors)
-                .map(CannedFormattedString::getValue)
-                .map(TKit::assertTextStream)
-                .reduce(TKit.TextStreamVerifier::andThen).get());
+        cmd.validateOutput(expectedErrors.toArray(CannedFormattedString[]::new));
     }
+
+    private static PackageType defaultNativeType() {
+        if (TKit.isLinux()) {
+            return PackageType.LINUX.stream().filter(PackageType::isSupported).findFirst().orElseThrow();
+        } else if (TKit.isOSX()) {
+            return PackageType.MAC_DMG;
+        } else if (TKit.isWindows()) {
+            return PackageType.WIN_MSI;
+        } else {
+            throw new UnsupportedOperationException();
+        }
+    }
+
+    private static <T> Collection<Object[]> toTestArgs(Stream<T> stream) {
+        return stream.map(v -> {
+            return new Object[] {v};
+        }).toList();
+    }
+
+    private static Collection<Object[]> fromTestSpecBuilders(Stream<TestSpec.Builder> stream) {
+        return toTestArgs(stream.map(TestSpec.Builder::create));
+    }
+
+    private static String adjustTextStreamVerifierArg(String str) {
+        return LINE_SEP_REGEXP.split(str)[0];
+    }
+
+    private static final Pattern LINE_SEP_REGEXP = Pattern.compile("\\R");
+
+    private static final PackageType NATIVE_TYPE = defaultNativeType();
 }
diff --git a/test/jdk/tools/jpackage/share/FileAssociationsTest.java b/test/jdk/tools/jpackage/share/FileAssociationsTest.java
index 08578ab8027..2257c5dbc65 100644
--- a/test/jdk/tools/jpackage/share/FileAssociationsTest.java
+++ b/test/jdk/tools/jpackage/share/FileAssociationsTest.java
@@ -21,12 +21,14 @@
  * questions.
  */
 
+import static jdk.jpackage.test.JPackageStringBundle.MAIN;
+
 import java.nio.file.Path;
 import java.util.Map;
-
 import jdk.jpackage.test.Annotations.Parameter;
 import jdk.jpackage.test.Annotations.Test;
 import jdk.jpackage.test.FileAssociations;
+import jdk.jpackage.test.JPackageCommand;
 import jdk.jpackage.test.PackageTest;
 import jdk.jpackage.test.PackageType;
 import jdk.jpackage.test.TKit;
@@ -111,22 +113,16 @@ public class FileAssociationsTest {
     public static void testNoMime() {
         final Path propFile = TKit.workDir().resolve("fa.properties");
 
-        PackageTest packageTest = new PackageTest().excludeTypes(PackageType.MAC);
-
-        packageTest.configureHelloApp().addRunOnceInitializer(() -> {
+        initPackageTest().addRunOnceInitializer(() -> {
             TKit.createPropertiesFile(propFile, Map.of(
                 "extension", "foo",
                 "description", "bar"
             ));
         }).addInitializer(cmd -> {
-            cmd.addArguments("--file-associations", propFile).saveConsoleOutput(true);
-        }).setExpectedExitCode(1).addBundleVerifier((cmd, result) -> {
-           TKit.assertTextStream(
-                   "No MIME types were specified for File Association number 1")
-                   .apply(result.getOutput().stream());
-           TKit.assertTextStream(
-                   "Advice to fix: Specify MIME type for File Association number 1")
-                   .apply(result.getOutput().stream());
+            cmd.addArguments("--file-associations", propFile);
+            cmd.validateOutput(
+                    MAIN.cannedFormattedString("error.no-content-types-for-file-association", 1),
+                    MAIN.cannedFormattedString("error.no-content-types-for-file-association.advice", 1));
         }).run();
     }
 
@@ -134,23 +130,25 @@ public class FileAssociationsTest {
     public static void testTooManyMimes() {
         final Path propFile = TKit.workDir().resolve("fa.properties");
 
-        PackageTest packageTest = new PackageTest().excludeTypes(PackageType.MAC);
-
-        packageTest.configureHelloApp().addRunOnceInitializer(() -> {
+        initPackageTest().addRunOnceInitializer(() -> {
             TKit.createPropertiesFile(propFile, Map.of(
                 "mime-type", "application/x-jpackage-foo, application/x-jpackage-bar",
                 "extension", "foo",
                 "description", "bar"
             ));
         }).addInitializer(cmd -> {
-            cmd.addArguments("--file-associations", propFile).saveConsoleOutput(true);
-        }).setExpectedExitCode(1).addBundleVerifier((cmd, result) -> {
-           TKit.assertTextStream(
-                   "More than one MIME types was specified for File Association number 1")
-                   .apply(result.getOutput().stream());
-           TKit.assertTextStream(
-                   "Advice to fix: Specify only one MIME type for File Association number 1")
-                   .apply(result.getOutput().stream());
+            cmd.addArguments("--file-associations", propFile);
+            cmd.validateOutput(
+                    MAIN.cannedFormattedString("error.too-many-content-types-for-file-association", 1),
+                    MAIN.cannedFormattedString("error.too-many-content-types-for-file-association.advice", 1));
         }).run();
     }
+
+    private static PackageTest initPackageTest() {
+        return new PackageTest()
+                .excludeTypes(PackageType.MAC)
+                .configureHelloApp()
+                .addInitializer(JPackageCommand::setFakeRuntime)
+                .setExpectedExitCode(1);
+    }
 }
diff --git a/test/jdk/tools/jpackage/share/JLinkOptionsTest.java b/test/jdk/tools/jpackage/share/JLinkOptionsTest.java
index 7c110a25014..a882fd15f18 100644
--- a/test/jdk/tools/jpackage/share/JLinkOptionsTest.java
+++ b/test/jdk/tools/jpackage/share/JLinkOptionsTest.java
@@ -154,7 +154,7 @@ public final class JLinkOptionsTest {
     }
 
     private final JPackageCommand createJPackageCommand(String javaAppDesc) {
-        return JPackageCommand.helloAppImage(javaAppDesc).ignoreDefaultRuntime(true);
+        return JPackageCommand.helloAppImage(javaAppDesc);
     }
 
     private final Set<String> getModulesInRuntime(String ... jlinkOptions) {
diff --git a/test/jdk/tools/jpackage/share/JavaOptionsEqualsTest.java b/test/jdk/tools/jpackage/share/JavaOptionsEqualsTest.java
index a4c2a26944a..220c55b5e50 100644
--- a/test/jdk/tools/jpackage/share/JavaOptionsEqualsTest.java
+++ b/test/jdk/tools/jpackage/share/JavaOptionsEqualsTest.java
@@ -54,13 +54,13 @@ import jdk.jpackage.test.TKit;
 
 public class JavaOptionsEqualsTest {
 
-    private final static String OPTION1 =
+    private static final String OPTION1 =
         "--add-exports=java.base/sun.util=me.mymodule.foo,ALL-UNNAMED";
-    private final static String OPTION2 =
+    private static final String OPTION2 =
         "--add-exports=java.base/sun.security.util=other.mod.bar,ALL-UNNAMED";
-    private final static String WARNING1 =
+    private static final String WARNING1 =
         "WARNING: Unknown module: me.mymodule.foo";
-    private final static String WARNING2 =
+    private static final String WARNING2 =
         "WARNING: Unknown module: other.mod.bar";
 
     private final JPackageCommand cmd;
@@ -75,17 +75,13 @@ public class JavaOptionsEqualsTest {
     }
 
     public JavaOptionsEqualsTest(String javaAppDesc, String[] jpackageArgs) {
-        cmd = JPackageCommand.helloAppImage(javaAppDesc);
-        if (jpackageArgs != null) {
-            cmd.addArguments(jpackageArgs);
-        }
+        cmd = JPackageCommand.helloAppImage(javaAppDesc).addArguments(jpackageArgs).ignoreFakeRuntime();
     }
 
     @Test
     public void test() {
         cmd.executeAndAssertHelloAppImageCreated();
         List<String> output = HelloApp.executeLauncher(cmd).getOutput();
-        TKit.assertNotNull(output, "output is null");
         TKit.assertTextStream(WARNING1).apply(output.stream());
         TKit.assertTextStream(WARNING2).apply(output.stream());
     }
diff --git a/test/jdk/tools/jpackage/share/JavaOptionsTest.java b/test/jdk/tools/jpackage/share/JavaOptionsTest.java
index e15dc02eac6..014a9434cad 100644
--- a/test/jdk/tools/jpackage/share/JavaOptionsTest.java
+++ b/test/jdk/tools/jpackage/share/JavaOptionsTest.java
@@ -76,7 +76,7 @@ public class JavaOptionsTest {
 
     public JavaOptionsTest(String javaAppDesc, String[] jpackageArgs,
             String[] expectedParams) {
-        cmd = JPackageCommand.helloAppImage(javaAppDesc);
+        cmd = JPackageCommand.helloAppImage(javaAppDesc).ignoreFakeRuntime();
         if (jpackageArgs != null) {
             cmd.addArguments(jpackageArgs);
         }
@@ -90,7 +90,6 @@ public class JavaOptionsTest {
 
         // 2.) run the launcher it generated
         List<String> output = HelloApp.executeLauncher(cmd).getOutput();
-        TKit.assertNotNull(output, "output is null");
         for (String expect : expected) {
             TKit.assertTextStream(expect).apply(output.stream());
         }
diff --git a/test/jdk/tools/jpackage/share/MainClassTest.java b/test/jdk/tools/jpackage/share/MainClassTest.java
index 7ac72c2c87b..15d4e0999c5 100644
--- a/test/jdk/tools/jpackage/share/MainClassTest.java
+++ b/test/jdk/tools/jpackage/share/MainClassTest.java
@@ -39,10 +39,13 @@ import java.util.stream.Stream;
 import jdk.jpackage.internal.util.function.ThrowingConsumer;
 import jdk.jpackage.test.Annotations.Parameters;
 import jdk.jpackage.test.Annotations.Test;
+import jdk.jpackage.test.CannedFormattedString;
+import jdk.jpackage.test.JPackageStringBundle;
 import jdk.jpackage.test.CfgFile;
 import jdk.jpackage.test.Executor;
 import jdk.jpackage.test.HelloApp;
 import jdk.jpackage.test.JPackageCommand;
+import static jdk.jpackage.test.JPackageCommand.cannedArgument;
 import jdk.jpackage.test.JavaAppDesc;
 import jdk.jpackage.test.JavaTool;
 import jdk.jpackage.test.TKit;
@@ -87,8 +90,8 @@ public final class MainClassTest {
             return this;
         }
 
-        Script expectedErrorMessage(String v) {
-            expectedErrorMessage = v;
+        Script expectedErrorMessage(String key, Object... args) {
+            expectedErrorMessage = JPackageStringBundle.MAIN.cannedFormattedString(key, args);
             return this;
         }
 
@@ -131,7 +134,7 @@ public final class MainClassTest {
         private boolean withJLink;
         private MainClassType mainClass;
         private MainClassType jarMainClass;
-        private String expectedErrorMessage;
+        private CannedFormattedString expectedErrorMessage;
     }
 
     public MainClassTest(Script script) {
@@ -194,11 +197,12 @@ public final class MainClassTest {
                         if (withMainClass.contains(jarMainClass)
                                 || withMainClass.contains(mainClass)) {
                         } else if (modular) {
-                            script.expectedErrorMessage(
-                                    "Error: Main application class is missing");
+                            script.expectedErrorMessage("ERR_NoMainClass");
                         } else {
                             script.expectedErrorMessage(
-                                    "A main class was not specified nor was one found in the jar");
+                                    "error.no-main-class-with-main-jar", cannedArgument(cmd -> {
+                                        return cmd.getArgumentValue("--main-jar");
+                                    }, "MAIN-JAR"));
                         }
 
                         scripts.add(new Script[]{script});
@@ -218,11 +222,7 @@ public final class MainClassTest {
         if (script.expectedErrorMessage != null) {
             // This is the case when main class is not found nor in jar
             // file nor on command line.
-            List<String> output = cmd
-                    .saveConsoleOutput(true)
-                    .execute(1)
-                    .getOutput();
-            TKit.assertTextStream(script.expectedErrorMessage).apply(output.stream());
+            cmd.validateOutput(script.expectedErrorMessage).execute(1);
             return;
         }
 
diff --git a/test/jdk/tools/jpackage/share/ModulePathTest.java b/test/jdk/tools/jpackage/share/ModulePathTest.java
index 9fd07a95c23..06b30ec89e7 100644
--- a/test/jdk/tools/jpackage/share/ModulePathTest.java
+++ b/test/jdk/tools/jpackage/share/ModulePathTest.java
@@ -30,10 +30,12 @@ import java.util.List;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
+import jdk.jpackage.test.CannedFormattedString;
 import jdk.jpackage.test.TKit;
 import jdk.jpackage.test.JavaAppDesc;
 import jdk.jpackage.test.HelloApp;
 import jdk.jpackage.test.JPackageCommand;
+import jdk.jpackage.test.JPackageStringBundle;
 import jdk.jpackage.test.PackageType;
 import jdk.jpackage.test.Annotations.Parameter;
 import jdk.jpackage.test.Annotations.Parameters;
@@ -121,25 +123,22 @@ public final class ModulePathTest {
         if (withGoodPath) {
             cmd.executeAndAssertHelloAppImageCreated();
         } else {
-            final String expectedErrorMessage;
+            final CannedFormattedString expectedErrorMessage;
             if (modulePathArgs.isEmpty()) {
-                expectedErrorMessage = "Error: Missing argument: --runtime-image or --module-path";
+                expectedErrorMessage = JPackageStringBundle.MAIN.cannedFormattedString(
+                        "ERR_MissingArgument", "--runtime-image or --module-path");
             } else {
-                expectedErrorMessage = String.format(
-                        "Failed to find %s module in module path", appDesc.moduleName());
+                expectedErrorMessage = JPackageStringBundle.MAIN.cannedFormattedString(
+                        "error.no-module-in-path", appDesc.moduleName());
             }
 
-            List<String> output = cmd
-                    .saveConsoleOutput(true)
-                    .execute(1)
-                    .getOutput();
-            TKit.assertTextStream(expectedErrorMessage).apply(output.stream());
+            cmd.validateOutput(expectedErrorMessage).execute(1);
         }
     }
 
     private final List<String> modulePathArgs;
 
-    private final static String GOOD_PATH = "@GoodPath@";
-    private final static String EMPTY_DIR = "@EmptyDir@";
-    private final static String NON_EXISTING_DIR = "@NonExistingDir@";
+    private static final String GOOD_PATH = "@GoodPath@";
+    private static final String EMPTY_DIR = "@EmptyDir@";
+    private static final String NON_EXISTING_DIR = "@NonExistingDir@";
 }
diff --git a/test/jdk/tools/jpackage/share/NonExistentTest.java b/test/jdk/tools/jpackage/share/NonExistentTest.java
deleted file mode 100644
index 3c87d3c6411..00000000000
--- a/test/jdk/tools/jpackage/share/NonExistentTest.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- * Copyright (c) 2020, 2025, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please 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.Collection;
-import java.util.List;
-import jdk.jpackage.test.Annotations.Parameters;
-import jdk.jpackage.test.Annotations.Test;
-import jdk.jpackage.test.JPackageCommand;
-import jdk.jpackage.test.TKit;
-
-/*
- * @test
- * @summary jpackage application version testing
- * @library /test/jdk/tools/jpackage/helpers
- * @build jdk.jpackage.test.*
- * @compile -Xlint:all -Werror NonExistentTest.java
- * @run main/othervm/timeout=360 -Xmx512m jdk.jpackage.test.Main
- *  --jpt-run=NonExistentTest
- */
-
-public final class NonExistentTest {
-
-    private final String expectedError;
-    private final JPackageCommand cmd;
-
-    @Parameters
-    public static Collection<?> input() {
-        return List.of(new Object[][]{
-            // non-existent icon
-            {"Hello",
-                    new String[]{"--icon", "non-existent"},
-                    "Error:"},
-            {"com.other/com.other.Hello",
-                    new String[]{"--icon", "non-existent"},
-                    "Error:"},
-            // non-existent input
-            {"Hello",
-                    new String[]{"--input", "non-existent"},
-                    "Exception:"},
-            {"com.other/com.other.Hello",
-                    new String[]{"--input", "non-existent"},
-                    "Exception:"},
-            // non-existent resource-dir
-            {"Hello",
-                    new String[]{"--resource-dir", "non-existent"},
-                    "Specified resource directory"},
-            {"com.other/com.other.Hello",
-                    new String[]{"--resource-dir", "non-existent"},
-                    "Specified resource directory"},
-        });
-    }
-
-    public NonExistentTest(String javaAppDesc, String[] jpackageArgs,
-                String expectedError) {
-        this.expectedError = expectedError;
-
-        cmd = JPackageCommand.helloAppImage(javaAppDesc)
-                .saveConsoleOutput(true).dumpOutput(true);
-        if (jpackageArgs != null) {
-            cmd.addArguments(jpackageArgs);
-        }
-    }
-
-    @Test
-    public void test() {
-        List<String> output = cmd.execute(1).getOutput();
-        TKit.assertNotNull(output, "output is null");
-        TKit.assertTextStream(expectedError).apply(output.stream());
-    }
-}
diff --git a/test/jdk/tools/jpackage/share/PredefinedAppImageErrorTest.java b/test/jdk/tools/jpackage/share/PredefinedAppImageErrorTest.java
deleted file mode 100644
index a415f0370cc..00000000000
--- a/test/jdk/tools/jpackage/share/PredefinedAppImageErrorTest.java
+++ /dev/null
@@ -1,118 +0,0 @@
-/*
- * Copyright (c) 2022, 2025, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please 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.nio.file.Files;
-import java.util.Collection;
-import java.util.List;
-
-import jdk.jpackage.test.AppImageFile;
-import jdk.jpackage.test.Annotations.Parameters;
-import jdk.jpackage.test.Annotations.Test;
-import jdk.jpackage.test.JPackageCommand;
-import jdk.jpackage.test.TKit;
-
-/*
- * @test
- * @summary Test jpackage output for erroneous input with --type "app-image" and --app-image
- * @library /test/jdk/tools/jpackage/helpers
- * @build jdk.jpackage.test.*
- * @compile -Xlint:all -Werror PredefinedAppImageErrorTest.java
- *
- * @run main/othervm/timeout=360 -Xmx512m jdk.jpackage.test.Main
- *  --jpt-run=PredefinedAppImageErrorTest
- *  --jpt-before-run=jdk.jpackage.test.JPackageCommand.useExecutableByDefault
- *
- * @run main/othervm/timeout=360 -Xmx512m jdk.jpackage.test.Main
- *  --jpt-run=PredefinedAppImageErrorTest
- *  --jpt-before-run=jdk.jpackage.test.JPackageCommand.useToolProviderByDefault
- */
-
-public final class PredefinedAppImageErrorTest {
-
-    private final String expectedError;
-    private final JPackageCommand cmd;
-
-    @Parameters
-    public static Collection<?> input() throws IOException {
-        return List.of(new Object[][]{
-            // --mac-sign is required
-            {"Hello",
-                    null,
-                    new String[]{"--input", "--dest", "--name", "--main-jar", "--main-class"},
-                    TKit.isOSX() ?
-                            "--mac-sign option is required" :
-                            "Option [--app-image] is not valid with type [app-image]"
-                            },
-            // --mac-app-store is required
-            {"Hello",
-                    new String[]{"--mac-sign", "--mac-app-store", "--mac-app-image-sign-identity", "test"},
-                    new String[]{"--input", "--dest", "--name", "--main-jar", "--main-class"},
-                    TKit.isOSX() ?
-                            "Option [--mac-app-store] is not valid" :
-                            "Option [--mac-sign] is not valid on this platform"
-                            },
-        });
-    }
-
-    public PredefinedAppImageErrorTest(String javaAppDesc, String[] jpackageArgs,
-                String[] removeArgs,
-                String expectedError) {
-        this.expectedError = expectedError;
-
-        cmd = JPackageCommand.helloAppImage(javaAppDesc)
-                .saveConsoleOutput(true).dumpOutput(true);
-        if (jpackageArgs != null) {
-            cmd.addArguments(jpackageArgs);
-        }
-        if (removeArgs != null) {
-            for (String arg : removeArgs) {
-                cmd.removeArgumentWithValue(arg);
-            }
-        }
-    }
-
-    @Test
-    public void test() throws IOException {
-        getDummyAppImage(cmd);
-
-        List<String> output = cmd.execute(1).getOutput();
-        TKit.assertNotNull(output, "output is null");
-        TKit.assertTextStream(expectedError).apply(output.stream());
-    }
-
-    private void getDummyAppImage(JPackageCommand cmd) throws IOException {
-        Path dummyAppFolder
-            = TKit.createTempDirectory("DummyAppImage").toAbsolutePath();
-
-        Path dummyAppFile
-            = dummyAppFolder.resolve("DummyAppFile").toAbsolutePath();
-        Files.createFile(dummyAppFile);
-
-        cmd.addArguments("--app-image", dummyAppFolder.toString());
-        new AppImageFile("PredefinedAppImageErrorTest", "Hello").save(dummyAppFolder);
-    }
-
-}
diff --git a/test/jdk/tools/jpackage/share/RuntimePackageTest.java b/test/jdk/tools/jpackage/share/RuntimePackageTest.java
index 7b0e88a5ae7..9eb4f8d231e 100644
--- a/test/jdk/tools/jpackage/share/RuntimePackageTest.java
+++ b/test/jdk/tools/jpackage/share/RuntimePackageTest.java
@@ -29,10 +29,12 @@ import java.util.Set;
 import java.util.function.Predicate;
 import java.util.stream.Collectors;
 import jdk.jpackage.test.PackageType;
+import jdk.jpackage.test.RunnablePackageTest.Action;
 import jdk.jpackage.test.PackageTest;
 import jdk.jpackage.test.JPackageCommand;
 import jdk.jpackage.test.TKit;
 import jdk.jpackage.test.Annotations.Test;
+import jdk.jpackage.test.Annotations.Parameter;
 import jdk.jpackage.test.Executor;
 import jdk.jpackage.test.JavaTool;
 import jdk.jpackage.test.LinuxHelper;
@@ -83,17 +85,24 @@ public class RuntimePackageTest {
     }
 
     @Test
-    public static void testUsrInstallDir() {
+    @Parameter("/usr")
+    @Parameter("/usr/lib/Java")
+    public static void testUsrInstallDir(String installDir) {
         init(PackageType.LINUX)
         .addInitializer(cmd -> cmd.addArguments("--install-dir", "/usr"))
         .run();
     }
 
     @Test
-    public static void testUsrInstallDir2() {
-        init(PackageType.LINUX)
-        .addInitializer(cmd -> cmd.addArguments("--install-dir", "/usr/lib/Java"))
-        .run();
+    public static void testName() {
+        // Test that jpackage can derive package name from the path to runtime image.
+        init(PackageType.NATIVE)
+        .addInitializer(cmd -> cmd.removeArgumentWithValue("--name"))
+        // Don't attempt to install this package as it may have an odd name derived from
+        // the runtime image path. Say, on Linux for `--runtime-image foo/bar/sed`
+        // command line jpackage will create a package named 'sed' that will conflict
+        // with the default 'sed' package.
+        .run(Action.CREATE_AND_UNPACK);
     }
 
     private static PackageTest init(Set<PackageType> types) {
@@ -157,7 +166,8 @@ public class RuntimePackageTest {
                         "Check the package doesn't deliver [%s] copyright file",
                         copyright));
             }
-        });
+        })
+        .forTypes(types);
     }
 
     private static Set<Path> listFiles(Path root) throws IOException {

From 19154f7af34bf6f13d61d7a9f05d6277964845d8 Mon Sep 17 00:00:00 2001
From: Roger Riggs <rriggs@openjdk.org>
Date: Mon, 17 Mar 2025 18:55:19 +0000
Subject: [PATCH 378/587] 8351970: Retire JavaLangAccess::exit

Reviewed-by: rgiulietti, liach, djelinski
---
 src/java.base/share/classes/java/lang/System.java           | 5 -----
 .../share/classes/jdk/internal/access/JavaLangAccess.java   | 6 ------
 .../share/classes/jdk/internal/foreign/abi/SharedUtils.java | 3 +--
 3 files changed, 1 insertion(+), 13 deletions(-)

diff --git a/src/java.base/share/classes/java/lang/System.java b/src/java.base/share/classes/java/lang/System.java
index 67a03efa10b..241e479458d 100644
--- a/src/java.base/share/classes/java/lang/System.java
+++ b/src/java.base/share/classes/java/lang/System.java
@@ -2196,11 +2196,6 @@ public final class System {
                 return ClassLoader.nativeLibrariesFor(loader);
             }
 
-            @Override
-            public void exit(int statusCode) {
-                Shutdown.exit(statusCode);
-            }
-
             public Thread[] getAllThreads() {
                 return Thread.getAllThreads();
             }
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 db73083433f..077683a3bf2 100644
--- a/src/java.base/share/classes/jdk/internal/access/JavaLangAccess.java
+++ b/src/java.base/share/classes/jdk/internal/access/JavaLangAccess.java
@@ -477,12 +477,6 @@ public interface JavaLangAccess {
      */
     NativeLibraries nativeLibrariesFor(ClassLoader loader);
 
-    /**
-     * Direct access to Shutdown.exit to avoid security manager checks
-     * @param statusCode the status code
-     */
-    void exit(int statusCode);
-
     /**
      * Returns an array of all platform threads.
      */
diff --git a/src/java.base/share/classes/jdk/internal/foreign/abi/SharedUtils.java b/src/java.base/share/classes/jdk/internal/foreign/abi/SharedUtils.java
index 17324894ac5..125730560a2 100644
--- a/src/java.base/share/classes/jdk/internal/foreign/abi/SharedUtils.java
+++ b/src/java.base/share/classes/jdk/internal/foreign/abi/SharedUtils.java
@@ -72,7 +72,6 @@ public final class SharedUtils {
     private SharedUtils() {
     }
 
-    private static final JavaLangAccess JLA = SharedSecrets.getJavaLangAccess();
     private static final JavaLangInvokeAccess JLIA = SharedSecrets.getJavaLangInvokeAccess();
 
     private static final MethodHandle MH_ALLOC_BUFFER;
@@ -310,7 +309,7 @@ public final class SharedUtils {
                 t.printStackTrace();
                 System.err.println("Unrecoverable uncaught exception encountered. The VM will now exit");
             } finally {
-                JLA.exit(1);
+                System.exit(1);
             }
         }
     }

From 38499b3fbfcd22252ddf860d42b9eb0bf6f77235 Mon Sep 17 00:00:00 2001
From: Ioi Lam <iklam@openjdk.org>
Date: Tue, 18 Mar 2025 00:49:36 +0000
Subject: [PATCH 379/587] 8352084: Add more test code in TestSetupAOT.java

Reviewed-by: erikj, kvn, lmesnik
---
 make/RunTests.gmk                             |  25 +--
 make/test/BuildTestSetupAOT.gmk               |   6 +-
 .../cds/appcds/applications/JavacBench.java   |   6 +-
 .../JavacBenchApp.java                        |   0
 test/setup_aot/TestSetupAOT.java              | 173 +++++++++++++++++-
 5 files changed, 184 insertions(+), 26 deletions(-)
 rename test/{hotspot/jtreg/runtime/cds/appcds/applications => setup_aot}/JavacBenchApp.java (100%)

diff --git a/make/RunTests.gmk b/make/RunTests.gmk
index 37193fb8171..4f81c096a33 100644
--- a/make/RunTests.gmk
+++ b/make/RunTests.gmk
@@ -732,14 +732,16 @@ endef
 #
 SetupAOT = $(NamedParamsMacroTemplate)
 define SetupAOTBody
-  $1_AOT_JDK_CONF := $$($1_TEST_SUPPORT_DIR)/aot/jdk.aotconf
-  $1_AOT_JDK_CACHE := $$($1_TEST_SUPPORT_DIR)/aot/jdk.aotcache
-  $1_AOT_JDK_LOG := $$($1_TEST_SUPPORT_DIR)/aot/TestSetupAOT.log
+  $1_AOT_JDK_OUTPUT_DIR := $$($1_TEST_SUPPORT_DIR)/aot
+  $1_AOT_JDK_CONF := $$($1_AOT_JDK_OUTPUT_DIR)/jdk.aotconf
+  $1_AOT_JDK_CACHE := $$($1_AOT_JDK_OUTPUT_DIR)/jdk.aotcache
+  $1_AOT_JDK_LOG := $$($1_AOT_JDK_OUTPUT_DIR)/TestSetupAOT.log
 
-  # We execute the training run with $(TEST_IMAGE_DIR)/setup_aot/TestSetupAOT.class
+  # We execute the training run with the TestSetupAOT class from $(TEST_IMAGE_DIR)/setup_aot/TestSetupAOT.jar
   # to touch a fair number of classes inside the JDK. Note that we can't specify a classpath,
   # or else the AOT cache cannot be used with jtreg test cases that use a different value
-  # for their classpaths. Instead, we run in the $(TEST_IMAGE_DIR)/setup_aot/ directory.
+  # for their classpaths. Instead, we cd in the $$($1_AOT_JDK_OUTPUT_DIR) directory,
+  # extract the TestSetupAOT.jar there, and run in that directory without specifying a classpath.
   # The "java" launcher will have an implicit classpath of ".", so it can pick up the TestSetupAOT
   # class from the JVM's current directory.
   #
@@ -748,19 +750,20 @@ define SetupAOTBody
   # only classes from the JDK.
 
   $$($1_AOT_JDK_CACHE): $$(JDK_IMAGE_DIR)/release
-	$$(call MakeDir, $$($1_TEST_SUPPORT_DIR)/aot)
+	$$(call MakeDir, $$($1_AOT_JDK_OUTPUT_DIR))
 
 	$$(call LogWarn, AOT: Create cache configuration) \
-	$$(call ExecuteWithLog, $$($1_TEST_SUPPORT_DIR)/aot, ( \
-	    $(CD) $(TEST_IMAGE_DIR)/setup_aot; \
+	$$(call ExecuteWithLog, $$($1_AOT_JDK_OUTPUT_DIR), ( \
+            cd $$($1_AOT_JDK_OUTPUT_DIR); \
+	    $(JAR) --extract --file $(TEST_IMAGE_DIR)/setup_aot/TestSetupAOT.jar; \
 	    $$(FIXPATH) $(JDK_UNDER_TEST)/bin/java $$($1_VM_OPTIONS) \
-	        -Xlog:cds,cds+class=debug:file=$$($1_AOT_JDK_CONF).log  -Xlog:cds*=error \
+	        -Xlog:class+load,cds,cds+class=debug:file=$$($1_AOT_JDK_CONF).log  -Xlog:cds*=error \
 	        -XX:AOTMode=record -XX:AOTConfiguration=$$($1_AOT_JDK_CONF) \
-	        TestSetupAOT > $$($1_AOT_JDK_LOG) \
+	        TestSetupAOT $$($1_AOT_JDK_OUTPUT_DIR) > $$($1_AOT_JDK_LOG) \
 	))
 
 	$$(call LogWarn, AOT: Generate AOT cache $$($1_AOT_JDK_CACHE) with flags: $$($1_VM_OPTIONS))
-	$$(call ExecuteWithLog, $$($1_TEST_SUPPORT_DIR)/aot, ( \
+	$$(call ExecuteWithLog, $$($1_AOT_JDK_OUTPUT_DIR), ( \
 	    $$(FIXPATH) $(JDK_UNDER_TEST)/bin/java \
 	        $$($1_VM_OPTIONS) -Xlog:cds,cds+class=debug:file=$$($1_AOT_JDK_CACHE).log -Xlog:cds*=error \
 	        -XX:ExtraSharedClassListFile=$(JDK_UNDER_TEST)/lib/classlist \
diff --git a/make/test/BuildTestSetupAOT.gmk b/make/test/BuildTestSetupAOT.gmk
index 46b18005366..0b6376c0d89 100644
--- a/make/test/BuildTestSetupAOT.gmk
+++ b/make/test/BuildTestSetupAOT.gmk
@@ -37,12 +37,13 @@ include JavaCompilation.gmk
 
 SETUP_AOT_BASEDIR := $(TOPDIR)/test/setup_aot
 SETUP_AOT_SUPPORT := $(SUPPORT_OUTPUTDIR)/test/setup_aot
-SETUP_AOT_CLASS := $(SETUP_AOT_SUPPORT)/classes/TestSetupAOT.class
+SETUP_AOT_JAR := $(SETUP_AOT_SUPPORT)/TestSetupAOT.jar
 
 $(eval $(call SetupJavaCompilation, BUILD_SETUP_AOT, \
     TARGET_RELEASE := $(TARGET_RELEASE_NEWJDK_UPGRADED), \
     SRC := $(SETUP_AOT_BASEDIR), \
     BIN := $(SETUP_AOT_SUPPORT)/classes, \
+    JAR := $(SETUP_AOT_JAR), \
 ))
 
 TARGETS += $(BUILD_SETUP_AOT)
@@ -53,9 +54,8 @@ TARGETS += $(BUILD_SETUP_AOT)
 
 # Copy to hotspot jtreg test image
 $(eval $(call SetupCopyFiles, COPY_SETUP_AOT, \
-    SRC := $(SETUP_AOT_SUPPORT)/classes, \
     DEST := $(TEST_IMAGE_DIR)/setup_aot, \
-    FILES := TestSetupAOT.class, \
+    FILES := $(SETUP_AOT_JAR), \
 ))
 
 IMAGES_TARGETS += $(COPY_SETUP_AOT)
diff --git a/test/hotspot/jtreg/runtime/cds/appcds/applications/JavacBench.java b/test/hotspot/jtreg/runtime/cds/appcds/applications/JavacBench.java
index 332f2fc909e..3034a7e92ae 100644
--- a/test/hotspot/jtreg/runtime/cds/appcds/applications/JavacBench.java
+++ b/test/hotspot/jtreg/runtime/cds/appcds/applications/JavacBench.java
@@ -26,7 +26,7 @@
  * @test id=static
  * @summary Run JavacBenchApp with the classic static archive workflow
  * @requires vm.cds
- * @library /test/lib
+ * @library /test/lib /test/setup_aot
  * @run driver JavacBench STATIC
  */
 
@@ -34,7 +34,7 @@
  * @test id=dynamic
  * @summary Run JavacBenchApp with the classic dynamic archive workflow
  * @requires vm.cds
- * @library /test/lib
+ * @library /test/lib /test/setup_aot
  * @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:. JavacBench DYNAMIC
@@ -45,7 +45,7 @@
  * @requires vm.cds.supports.aot.class.linking
  * @summary Run JavacBenchApp with AOT cache (JEP 483)
  * @requires vm.cds
- * @library /test/lib
+ * @library /test/lib /test/setup_aot
  * @run driver JavacBench AOT
  */
 
diff --git a/test/hotspot/jtreg/runtime/cds/appcds/applications/JavacBenchApp.java b/test/setup_aot/JavacBenchApp.java
similarity index 100%
rename from test/hotspot/jtreg/runtime/cds/appcds/applications/JavacBenchApp.java
rename to test/setup_aot/JavacBenchApp.java
diff --git a/test/setup_aot/TestSetupAOT.java b/test/setup_aot/TestSetupAOT.java
index 1cae8bae246..89a6dd30c72 100644
--- a/test/setup_aot/TestSetupAOT.java
+++ b/test/setup_aot/TestSetupAOT.java
@@ -23,7 +23,15 @@
  * questions.
  */
 
+import java.io.File;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Locale;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 import java.util.spi.ToolProvider;
+import java.util.stream.Stream;
+import static java.util.stream.Collectors.*;
 
 // This program is executed by make/RunTests.gmk to support running HotSpot tests
 // in the "AOT mode", for example:
@@ -44,16 +52,163 @@ import java.util.spi.ToolProvider;
 // the customized AOT cache contains *only* classes from the JDK itself.
 
 public class TestSetupAOT {
+    private static final Logger LOGGER = Logger.getLogger("Hello");
+
     public static void main(String[] args) throws Throwable {
-        String[] tools = {
-            "javac", "javap", "jlink", "jar",
-        };
-        // TODO: we should do more substantial work than just running with "--help".
-        // E.g., use javac to compile a program.
-        for (String tool : tools) {
-            ToolProvider t = ToolProvider.findFirst(tool)
-                .orElseThrow(() -> new RuntimeException(tool + " not found"));
-            t.run(System.out, System.out, "--help");
+        runJDKTools(args);
+        invokedynamicTests(args);
+        LOGGER.log(Level.FINE, "Done");
+    }
+
+    static void runJDKTools(String[] args) throws Throwable {
+        String tmpDir = args[0];
+        System.out.println("Working Directory = " + System.getProperty("user.dir"));
+        System.out.println("Temp output dir = " + tmpDir);
+
+        // ------------------------------
+        // javac
+
+        execTool("javac", "--help");
+
+        JavacBenchApp.main(new String[] {"5"});
+
+        // ------------------------------
+        // javap
+
+        execTool("javap", "--help");
+        execTool("javap", "-c", "-private", "-v", "-verify",
+                 "java.lang.System",
+                 "java/util/stream/IntStream",
+                 "jdk.internal.module.ModuleBootstrap");
+
+        // ------------------------------
+        // jlink
+
+        String jlinkOutput = tmpDir + File.separator + "jlinkOutput";
+
+        execTool("jlink", "--help");
+        execTool("jlink", "--list-plugins");
+
+        deleteAll(jlinkOutput);
+        execTool("jlink", "--add-modules", "java.base", "--strip-debug", "--output", jlinkOutput);
+        deleteAll(jlinkOutput);
+
+        // ------------------------------
+        // jar
+
+        String jarOutput = tmpDir + File.separator + "tmp.jar";
+
+        execTool("jar", "--help");
+
+        deleteAll(jarOutput);
+        execTool("jar", "cvf", jarOutput, "TestSetupAOT.class");
+        execTool("jar", "uvf", jarOutput, "TestSetupAOT.class");
+        execTool("jar", "tvf", jarOutput);
+        execTool("jar", "--describe-module", "--file=" + jarOutput);
+        deleteAll(jarOutput);
+
+        // ------------------------------
+        // jdeps
+
+        execTool("jdeps", "--help");
+        execTool("jdeps", "-v", "TestSetupAOT.class");
+    }
+
+    static void deleteAll(String f) {
+        deleteAll(new File(f));
+    }
+
+    static void deleteAll(File f) {
+        File[] files = f.listFiles();
+        if (files != null) {
+            for (File file : files) {
+                deleteAll(file);
+            }
         }
+        System.out.println("Deleting: " + f);
+        f.delete();
+    }
+
+    static void execTool(String tool, String... args) throws Throwable {
+        System.out.println("== Running tool ======================================================");
+        System.out.print(tool);
+        for (String s : args) {
+            System.out.print(" " + s);
+        }
+        System.out.println();
+        System.out.println("======================================================================");
+
+        ToolProvider t = ToolProvider.findFirst(tool)
+            .orElseThrow(() -> new RuntimeException(tool + " not found"));
+        t.run(System.out, System.out, args);
+    }
+
+
+    // Run some operations with java.util.stream, lambda expressions and string concatenation. This
+    // will lead to AOT resolution of invokedynamic call sites.
+    static void invokedynamicTests(String args[]) {
+        List<String> strings = Arrays.asList("Hello", "World!");
+
+        String helloWorld = strings.parallelStream()
+                .filter(s -> s.contains("o"))
+                .map(s -> s.toLowerCase(Locale.ROOT))
+                .collect(joining(","));
+
+        Stream.of(helloWorld.split("([,x-z]{1,3})([\\s]*)"))
+                .map(String::toString)
+                .forEach(System.out::println);
+
+        // Common concatenation patterns
+        int i = args.length * 12357; // Seed with this so javac will not perform constant folding.
+        String s = String.valueOf(i);
+
+        String SS     = s + s;
+        String CS     = "string" + s;
+        String SC     = s + "string";
+        String SCS    = s + "string" + s;
+        String CSS    = "string" + s + s;
+        String CSC    = "string" + s + "string";
+        String SSC    = s + s + "string";
+        String CSCS   = "string" + s + "string" + s;
+        String SCSC   = s + "string" + s + "string";
+        String CSCSC  = "string" + s + "string" + s + "string";
+        String SCSCS  = s + "string" + s + "string" + s;
+        String SSCSS  = s + s + "string" + s + s;
+        String S5     = s + s + s + s + s;
+        String S6     = s + s + s + s + s + s;
+        String S7     = s + s + s + s + s + s + s;
+        String S8     = s + s + s + s + s + s + s + s;
+        String S9     = s + s + s + s + s + s + s + s + s;
+        String S10    = s + s + s + s + s + s + s + s + s + s;
+
+        String CI     = "string" + i;
+        String IC     = i + "string";
+        String SI     = s + i;
+        String IS     = i + s;
+        String CIS    = "string" + i + s;
+        String CSCI   = "string" + s + "string" + i;
+        String CIC    = "string" + i + "string";
+        String CICI   = "string" + i + "string" + i;
+
+        float f = 0.1f;
+        String CF     = "string" + f;
+        String CFS    = "string" + f + s;
+        String CSCF   = "string" + s + "string" + f;
+
+        char c = 'a';
+        String CC     = "string" + c;
+        String CCS    = "string" + c + s;
+        String CSCC   = "string" + s + "string" + c;
+
+        long l = i + 12345678;
+        String CJ     = "string" + l;
+        String JC     = l + "string";
+        String CJC    = "string" + l + "string";
+        String CJCJ   = "string" + l + "string" + l;
+        String CJCJC  = "string" + l + "string" + l + "string";
+        double d = i / 2.0;
+        String CD     = "string" + d;
+        String CDS    = "string" + d + s;
+        String CSCD   = "string" + s + "string" + d;
     }
 }

From f4ddac5e58322a801182eda005a9592c78128569 Mon Sep 17 00:00:00 2001
From: Afshin Zafari <azafari@openjdk.org>
Date: Tue, 18 Mar 2025 08:10:24 +0000
Subject: [PATCH 380/587] 8331201: UBSAN enabled  build reports on Linux x86_64
 runtime error: shift exponent 65 is too large for 64-bit type 'long unsigned
 int'

Reviewed-by: dlong, aboldtch
---
 src/hotspot/share/runtime/signature.cpp |  2 +-
 src/hotspot/share/runtime/signature.hpp | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/hotspot/share/runtime/signature.cpp b/src/hotspot/share/runtime/signature.cpp
index 8dc7b85c14d..fb649b8c872 100644
--- a/src/hotspot/share/runtime/signature.cpp
+++ b/src/hotspot/share/runtime/signature.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/hotspot/share/runtime/signature.hpp b/src/hotspot/share/runtime/signature.hpp
index ef18b0f03d3..eddc21d2444 100644
--- a/src/hotspot/share/runtime/signature.hpp
+++ b/src/hotspot/share/runtime/signature.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2021, Azul Systems, Inc. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -28,8 +28,6 @@
 
 #include "memory/allocation.hpp"
 #include "oops/method.hpp"
-#include "sanitizers/ub.hpp"
-
 
 // Static routines and parsing loops for processing field and method
 // descriptors.  In the HotSpot sources we call them "signatures".
@@ -339,11 +337,13 @@ class Fingerprinter: public SignatureIterator {
   void do_type_calling_convention(BasicType type);
 
   friend class SignatureIterator;  // so do_parameters_on can call do_type
-  ATTRIBUTE_NO_UBSAN
+
   void do_type(BasicType type) {
     assert(fp_is_valid_type(type), "bad parameter type");
-    _accumulator |= ((fingerprint_t)type << _shift_count);
-    _shift_count += fp_parameter_feature_size;
+    if (_param_size <= fp_max_size_of_parameters) {
+      _accumulator |= ((fingerprint_t)type << _shift_count);
+      _shift_count += fp_parameter_feature_size;
+    }
     _param_size += (is_double_word_type(type) ? 2 : 1);
     do_type_calling_convention(type);
   }

From e1bcff3ada9214940e9c71ba4ed5ba93d0218af2 Mon Sep 17 00:00:00 2001
From: Quan Anh Mai <qamai@openjdk.org>
Date: Tue, 18 Mar 2025 08:59:48 +0000
Subject: [PATCH 381/587] 8345687: Improve the implementation of
 SegmentFactories::allocateSegment

Reviewed-by: jvernee, mcimadamore
---
 .../jdk/internal/foreign/ArenaImpl.java       |  7 +--
 .../internal/foreign/SegmentFactories.java    | 61 +++++++++++++------
 .../share/classes/jdk/internal/misc/VM.java   | 10 ++-
 .../bench/java/lang/foreign/AllocTest.java    | 22 ++-----
 4 files changed, 55 insertions(+), 45 deletions(-)

diff --git a/src/java.base/share/classes/jdk/internal/foreign/ArenaImpl.java b/src/java.base/share/classes/jdk/internal/foreign/ArenaImpl.java
index da8a6c26666..169f27abf65 100644
--- a/src/java.base/share/classes/jdk/internal/foreign/ArenaImpl.java
+++ b/src/java.base/share/classes/jdk/internal/foreign/ArenaImpl.java
@@ -48,14 +48,11 @@ public final class ArenaImpl implements Arena {
     }
 
     public NativeMemorySegmentImpl allocateNoInit(long byteSize, long byteAlignment) {
-        Utils.checkAllocationSizeAndAlign(byteSize, byteAlignment);
-        return SegmentFactories.allocateSegment(byteSize, byteAlignment, session, shouldReserveMemory);
+        return SegmentFactories.allocateNativeSegment(byteSize, byteAlignment, session, shouldReserveMemory, false);
     }
 
     @Override
     public NativeMemorySegmentImpl allocate(long byteSize, long byteAlignment) {
-        NativeMemorySegmentImpl segment = allocateNoInit(byteSize, byteAlignment);
-        segment.fill((byte)0);
-        return segment;
+        return SegmentFactories.allocateNativeSegment(byteSize, byteAlignment, session, shouldReserveMemory, true);
     }
 }
diff --git a/src/java.base/share/classes/jdk/internal/foreign/SegmentFactories.java b/src/java.base/share/classes/jdk/internal/foreign/SegmentFactories.java
index 4ab14aa845f..f4ea2ed8c74 100644
--- a/src/java.base/share/classes/jdk/internal/foreign/SegmentFactories.java
+++ b/src/java.base/share/classes/jdk/internal/foreign/SegmentFactories.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -35,6 +35,7 @@ import jdk.internal.foreign.HeapMemorySegmentImpl.OfLong;
 import jdk.internal.foreign.HeapMemorySegmentImpl.OfShort;
 import jdk.internal.misc.Unsafe;
 import jdk.internal.misc.VM;
+import jdk.internal.vm.annotation.DontInline;
 import jdk.internal.vm.annotation.ForceInline;
 
 import java.lang.foreign.MemorySegment;
@@ -175,39 +176,63 @@ public class SegmentFactories {
         return new OfDouble(offset, base, length, readOnly, bufferScope);
     }
 
-    public static NativeMemorySegmentImpl allocateSegment(long byteSize, long byteAlignment, MemorySessionImpl sessionImpl,
-                                                          boolean shouldReserve) {
+    public static NativeMemorySegmentImpl allocateNativeSegment(long byteSize, long byteAlignment, MemorySessionImpl sessionImpl,
+                                                                boolean shouldReserve, boolean init) {
+        long address = SegmentFactories.allocateNativeInternal(byteSize, byteAlignment, sessionImpl, shouldReserve, init);
+        return new NativeMemorySegmentImpl(address, byteSize, false, sessionImpl);
+    }
+
+    private static long allocateNativeInternal(long byteSize, long byteAlignment, MemorySessionImpl sessionImpl,
+                                               boolean shouldReserve, boolean init) {
         ensureInitialized();
+        Utils.checkAllocationSizeAndAlign(byteSize, byteAlignment);
         sessionImpl.checkValidState();
         if (VM.isDirectMemoryPageAligned()) {
             byteAlignment = Math.max(byteAlignment, AbstractMemorySegmentImpl.NIO_ACCESS.pageSize());
         }
-        long alignedSize = Math.max(1L, byteAlignment > MAX_MALLOC_ALIGN ?
-                byteSize + (byteAlignment - 1) :
-                byteSize);
+        // Align the allocation size up to a multiple of 8 so we can init the memory with longs
+        long alignedSize = init ? Utils.alignUp(byteSize, Long.BYTES) : byteSize;
 
-        if (shouldReserve) {
-            AbstractMemorySegmentImpl.NIO_ACCESS.reserveMemory(alignedSize, byteSize);
+        long allocationSize;
+        long allocationBase;
+        long result;
+        if (byteAlignment > MAX_MALLOC_ALIGN) {
+            allocationSize = alignedSize + byteAlignment - MAX_MALLOC_ALIGN;
+            if (shouldReserve) {
+                AbstractMemorySegmentImpl.NIO_ACCESS.reserveMemory(allocationSize, byteSize);
+            }
+
+            allocationBase = allocateMemoryWrapper(allocationSize);
+            result = Utils.alignUp(allocationBase, byteAlignment);
+        } else {
+            allocationSize = alignedSize;
+            if (shouldReserve) {
+                AbstractMemorySegmentImpl.NIO_ACCESS.reserveMemory(allocationSize, byteSize);
+            }
+
+            allocationBase = allocateMemoryWrapper(allocationSize);
+            result = allocationBase;
         }
 
-        long buf = allocateMemoryWrapper(alignedSize);
-        long alignedBuf = Utils.alignUp(buf, byteAlignment);
-        NativeMemorySegmentImpl segment = new NativeMemorySegmentImpl(buf, alignedSize,
-                false, sessionImpl);
+        if (init) {
+            initNativeMemory(result, alignedSize);
+        }
         sessionImpl.addOrCleanupIfFail(new MemorySessionImpl.ResourceList.ResourceCleanup() {
             @Override
             public void cleanup() {
-                UNSAFE.freeMemory(buf);
+                UNSAFE.freeMemory(allocationBase);
                 if (shouldReserve) {
-                    AbstractMemorySegmentImpl.NIO_ACCESS.unreserveMemory(alignedSize, byteSize);
+                    AbstractMemorySegmentImpl.NIO_ACCESS.unreserveMemory(allocationSize, byteSize);
                 }
             }
         });
-        if (alignedSize != byteSize) {
-            long delta = alignedBuf - buf;
-            segment = (NativeMemorySegmentImpl) segment.asSlice(delta, byteSize);
+        return result;
+    }
+
+    private static void initNativeMemory(long address, long byteSize) {
+        for (long i = 0; i < byteSize; i += Long.BYTES) {
+            UNSAFE.putLongUnaligned(null, address + i, 0);
         }
-        return segment;
     }
 
     private static long allocateMemoryWrapper(long size) {
diff --git a/src/java.base/share/classes/jdk/internal/misc/VM.java b/src/java.base/share/classes/jdk/internal/misc/VM.java
index 1c31ef5a184..db57b1f9da5 100644
--- a/src/java.base/share/classes/jdk/internal/misc/VM.java
+++ b/src/java.base/share/classes/jdk/internal/misc/VM.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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,12 @@ public class VM {
     // aligned. The "-XX:+PageAlignDirectMemory" option can be used to force
     // buffers, allocated by ByteBuffer.allocateDirect, to be page aligned.
     @Stable
-    private static boolean pageAlignDirectMemory;
+    private static Boolean pageAlignDirectMemory;
 
     // Returns {@code true} if the direct buffers should be page aligned. This
     // variable is initialized by saveAndRemoveProperties.
     public static boolean isDirectMemoryPageAligned() {
-        return pageAlignDirectMemory;
+        return pageAlignDirectMemory != null && pageAlignDirectMemory;
     }
 
     /**
@@ -261,9 +261,7 @@ public class VM {
         }
 
         // Check if direct buffers should be page aligned
-        s = props.get("sun.nio.PageAlignDirectMemory");
-        if ("true".equals(s))
-            pageAlignDirectMemory = true;
+        pageAlignDirectMemory = "true".equals(props.get("sun.nio.PageAlignDirectMemory"));
     }
 
     // Initialize any miscellaneous operating system settings that need to be
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 4ae78d6d99e..1ee6aecbbd3 100644
--- a/test/micro/org/openjdk/bench/java/lang/foreign/AllocTest.java
+++ b/test/micro/org/openjdk/bench/java/lang/foreign/AllocTest.java
@@ -30,9 +30,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.Setup;
 import org.openjdk.jmh.annotations.State;
-import org.openjdk.jmh.annotations.TearDown;
 import org.openjdk.jmh.annotations.Warmup;
 
 import java.lang.foreign.Arena;
@@ -40,7 +38,6 @@ import java.lang.foreign.FunctionDescriptor;
 import java.lang.foreign.Linker;
 import java.lang.foreign.MemorySegment;
 import java.lang.foreign.MemorySegment.Scope;
-import java.lang.foreign.SegmentAllocator;
 import java.lang.foreign.ValueLayout;
 import java.lang.invoke.MethodHandle;
 import java.util.concurrent.TimeUnit;
@@ -53,16 +50,9 @@ import java.util.concurrent.TimeUnit;
 @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();
-
-    @Param({"5", "20", "100", "500", "1000"})
+    @Param({"5", "20", "100", "500", "2000", "8000"})
     public int size;
 
-    @TearDown
-    public void tearDown() {
-        arena.close();
-    }
-
     @Benchmark
     public long alloc_confined() {
         try (Arena arena = Arena.ofConfined()) {
@@ -84,7 +74,7 @@ public class AllocTest extends CLayouts {
         }
     }
 
-    public static class CallocArena implements Arena {
+    private static class CallocArena implements Arena {
 
         static final MethodHandle CALLOC = Linker.nativeLinker()
                 .downcallHandle(
@@ -118,7 +108,7 @@ public class AllocTest extends CLayouts {
         }
     }
 
-    public static class UnsafeArena implements Arena {
+    private static class UnsafeArena implements Arena {
 
         final Arena arena = Arena.ofConfined();
 
@@ -134,9 +124,9 @@ public class AllocTest extends CLayouts {
 
         @Override
         public MemorySegment allocate(long byteSize, long byteAlignment) {
-            MemorySegment segment = MemorySegment.ofAddress(Utils.unsafe.allocateMemory(byteSize));
-            Utils.unsafe.setMemory(segment.address(), byteSize, (byte)0);
-            return segment.reinterpret(byteSize, arena, ms -> Utils.unsafe.freeMemory(segment.address()));
+            long address = Utils.unsafe.allocateMemory(byteSize);
+            Utils.unsafe.setMemory(address, byteSize, (byte)0);
+            return MemorySegment.ofAddress(address).reinterpret(byteSize, arena, ms -> Utils.unsafe.freeMemory(ms.address()));
         }
     }
 }

From f8c2122b306df72883673f4af9b297b553db247f Mon Sep 17 00:00:00 2001
From: Thomas Schatzl <tschatzl@openjdk.org>
Date: Tue, 18 Mar 2025 09:28:43 +0000
Subject: [PATCH 382/587] 8352138: G1: Remove G1AddMetaspaceDependency.java
 test

Reviewed-by: ayang, shade
---
 .../metaspace/G1AddMetaspaceDependency.java   | 125 ------------------
 1 file changed, 125 deletions(-)
 delete mode 100644 test/hotspot/jtreg/gc/metaspace/G1AddMetaspaceDependency.java

diff --git a/test/hotspot/jtreg/gc/metaspace/G1AddMetaspaceDependency.java b/test/hotspot/jtreg/gc/metaspace/G1AddMetaspaceDependency.java
deleted file mode 100644
index 2fa74089c8b..00000000000
--- a/test/hotspot/jtreg/gc/metaspace/G1AddMetaspaceDependency.java
+++ /dev/null
@@ -1,125 +0,0 @@
-/*
- * Copyright (c) 2013, 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 gc.metaspace;
-
-/*
- * @test G1AddMetaspaceDependency
- * @bug 8010196
- * @requires vm.gc.G1
- * @library /
- * @summary Checks that we don't get locking problems when adding metaspace dependencies with the G1 update buffer monitor
- * @run main/othervm -XX:+UseG1GC -XX:G1UpdateBufferSize=1 gc.metaspace.G1AddMetaspaceDependency
- */
-
-import java.io.InputStream;
-
-public class G1AddMetaspaceDependency {
-
-  static byte[] getClassBytes(String name) {
-    byte[] b = null;
-    try (InputStream is = ClassLoader.getSystemResourceAsStream(name)) {
-      byte[] tmp = new byte[is.available()];
-      is.read(tmp);
-      b = tmp;
-    } finally {
-      if (b == null) {
-        throw new RuntimeException("Unable to load class file");
-      }
-      return b;
-    }
-  }
-
-  static final String a_name = A.class.getName();
-  static final String b_name = B.class.getName();
-
-  public static void main(String... args) throws Exception {
-    final byte[] a_bytes = getClassBytes(a_name.replace('.', '/') + ".class");
-    final byte[] b_bytes = getClassBytes(b_name.replace('.', '/') + ".class");
-
-    for (int i = 0; i < 1000; i += 1) {
-      runTest(a_bytes, b_bytes);
-    }
-  }
-
-  static class Loader extends ClassLoader {
-    private final String myClass;
-    private final byte[] myBytes;
-    private final String friendClass;
-    private final ClassLoader friendLoader;
-
-    Loader(String myClass, byte[] myBytes,
-           String friendClass, ClassLoader friendLoader) {
-      this.myClass = myClass;
-      this.myBytes = myBytes;
-      this.friendClass = friendClass;
-      this.friendLoader = friendLoader;
-    }
-
-    Loader(String myClass, byte[] myBytes) {
-      this(myClass, myBytes, null, null);
-    }
-
-    @Override
-    public Class<?> loadClass(String name) throws ClassNotFoundException {
-      Class<?> c = findLoadedClass(name);
-      if (c != null) {
-        return c;
-      }
-
-      if (name.equals(friendClass)) {
-        return friendLoader.loadClass(name);
-      }
-
-      if (name.equals(myClass)) {
-        c = defineClass(name, myBytes, 0, myBytes.length);
-        resolveClass(c);
-        return c;
-      }
-
-      return findSystemClass(name);
-    }
-
-  }
-
-  private static void runTest(final byte[] a_bytes, final byte[] b_bytes) throws Exception {
-    Loader a_loader = new Loader(a_name, a_bytes);
-    Loader b_loader = new Loader(b_name, b_bytes, a_name, a_loader);
-    Loader c_loader = new Loader(b_name, b_bytes, a_name, a_loader);
-    Loader d_loader = new Loader(b_name, b_bytes, a_name, a_loader);
-    Loader e_loader = new Loader(b_name, b_bytes, a_name, a_loader);
-    Loader f_loader = new Loader(b_name, b_bytes, a_name, a_loader);
-    Loader g_loader = new Loader(b_name, b_bytes, a_name, a_loader);
-
-    b_loader.loadClass(b_name);
-    c_loader.loadClass(b_name);
-    d_loader.loadClass(b_name);
-    e_loader.loadClass(b_name);
-    f_loader.loadClass(b_name);
-    g_loader.loadClass(b_name);
-  }
-  public class A {
-  }
-  class B extends A {
-  }
-}

From 558c015c995dbe65d876c1c5761030588773271c Mon Sep 17 00:00:00 2001
From: Thomas Schatzl <tschatzl@openjdk.org>
Date: Tue, 18 Mar 2025 09:29:51 +0000
Subject: [PATCH 383/587] 8351921: G1: Pinned regions with pinned objects only
 reachable by native code crash VM

Reviewed-by: ayang, iwalulya
---
 src/hotspot/share/gc/g1/g1Policy.cpp          |  7 --
 src/hotspot/share/gc/g1/g1YoungCollector.cpp  | 32 +++++--
 src/hotspot/share/gc/g1/g1YoungCollector.hpp  |  3 +-
 .../gc/g1/pinnedobjs/TestPinnedEvacEmpty.java | 89 +++++++++++++++++++
 4 files changed, 116 insertions(+), 15 deletions(-)
 create mode 100644 test/hotspot/jtreg/gc/g1/pinnedobjs/TestPinnedEvacEmpty.java

diff --git a/src/hotspot/share/gc/g1/g1Policy.cpp b/src/hotspot/share/gc/g1/g1Policy.cpp
index 8e81327b42d..67860f74569 100644
--- a/src/hotspot/share/gc/g1/g1Policy.cpp
+++ b/src/hotspot/share/gc/g1/g1Policy.cpp
@@ -660,13 +660,6 @@ void G1Policy::record_concurrent_refinement_stats(size_t pending_cards,
 
 bool G1Policy::should_retain_evac_failed_region(uint index) const {
   size_t live_bytes = _g1h->region_at(index)->live_bytes();
-
-#ifdef ASSERT
-  G1HeapRegion* r = _g1h->region_at(index);
-  assert(live_bytes != 0,
-         "live bytes not set for %u used %zu garbage %zu cm-live %zu pinned %d",
-         index, r->used(), r->garbage_bytes(), live_bytes, r->has_pinned_objects());
-#endif
   size_t threshold = G1RetainRegionLiveThresholdPercent * G1HeapRegion::GrainBytes / 100;
   return live_bytes < threshold;
 }
diff --git a/src/hotspot/share/gc/g1/g1YoungCollector.cpp b/src/hotspot/share/gc/g1/g1YoungCollector.cpp
index 2223d667998..8e550228152 100644
--- a/src/hotspot/share/gc/g1/g1YoungCollector.cpp
+++ b/src/hotspot/share/gc/g1/g1YoungCollector.cpp
@@ -287,6 +287,8 @@ class G1PrepareEvacuationTask : public WorkerTask {
   class G1PrepareRegionsClosure : public G1HeapRegionClosure {
     G1CollectedHeap* _g1h;
     G1PrepareEvacuationTask* _parent_task;
+    G1EvacFailureRegions* _evac_failure_regions;
+    uint _worker_id;
     uint _worker_humongous_total;
     uint _worker_humongous_candidates;
 
@@ -361,9 +363,14 @@ class G1PrepareEvacuationTask : public WorkerTask {
     }
 
   public:
-    G1PrepareRegionsClosure(G1CollectedHeap* g1h, G1PrepareEvacuationTask* parent_task) :
+    G1PrepareRegionsClosure(G1CollectedHeap* g1h,
+                            G1PrepareEvacuationTask* parent_task,
+                            G1EvacFailureRegions* evac_failure_regions,
+                            uint worker_id) :
       _g1h(g1h),
       _parent_task(parent_task),
+      _evac_failure_regions(evac_failure_regions),
+      _worker_id(worker_id),
       _worker_humongous_total(0),
       _worker_humongous_candidates(0) { }
 
@@ -373,6 +380,13 @@ class G1PrepareEvacuationTask : public WorkerTask {
     }
 
     virtual bool do_heap_region(G1HeapRegion* hr) {
+      // All pinned regions in the collection set must be registered as failed
+      // regions here as there is no guarantee that there is a reference
+      // reachable by Java code (i.e. only by native code).
+      if (hr->in_collection_set() && hr->has_pinned_objects()) {
+        _evac_failure_regions->record(_worker_id, hr->hrm_index(), true /* cause_pinned */);
+      }
+
       // First prepare the region for scanning
       _g1h->rem_set()->prepare_region_for_scan(hr);
 
@@ -415,6 +429,7 @@ class G1PrepareEvacuationTask : public WorkerTask {
   };
 
   G1CollectedHeap* _g1h;
+  G1EvacFailureRegions* _evac_failure_regions;
   G1HeapRegionClaimer _claimer;
   volatile uint _humongous_total;
   volatile uint _humongous_candidates;
@@ -422,15 +437,17 @@ class G1PrepareEvacuationTask : public WorkerTask {
   G1MonotonicArenaMemoryStats _all_card_set_stats;
 
 public:
-  G1PrepareEvacuationTask(G1CollectedHeap* g1h) :
+  G1PrepareEvacuationTask(G1CollectedHeap* g1h, G1EvacFailureRegions* evac_failure_regions) :
     WorkerTask("Prepare Evacuation"),
     _g1h(g1h),
+    _evac_failure_regions(evac_failure_regions),
     _claimer(_g1h->workers()->active_workers()),
     _humongous_total(0),
-    _humongous_candidates(0) { }
+    _humongous_candidates(0),
+    _all_card_set_stats() { }
 
   void work(uint worker_id) {
-    G1PrepareRegionsClosure cl(_g1h, this);
+    G1PrepareRegionsClosure cl(_g1h, this, _evac_failure_regions, worker_id);
     _g1h->heap_region_par_iterate_from_worker_offset(&cl, &_claimer, worker_id);
 
     MutexLocker x(G1RareEvent_lock, Mutex::_no_safepoint_check_flag);
@@ -472,7 +489,8 @@ void G1YoungCollector::set_young_collection_default_active_worker_threads(){
   log_info(gc,task)("Using %u workers of %u for evacuation", active_workers, workers()->max_workers());
 }
 
-void G1YoungCollector::pre_evacuate_collection_set(G1EvacInfo* evacuation_info) {
+void G1YoungCollector::pre_evacuate_collection_set(G1EvacInfo* evacuation_info,
+                                                   G1EvacFailureRegions* evac_failure_regions) {
   // Flush various data in thread-local buffers to be able to determine the collection
   // set
   {
@@ -511,7 +529,7 @@ void G1YoungCollector::pre_evacuate_collection_set(G1EvacInfo* evacuation_info)
   }
 
   {
-    G1PrepareEvacuationTask g1_prep_task(_g1h);
+    G1PrepareEvacuationTask g1_prep_task(_g1h, evac_failure_regions);
     Tickspan task_time = run_task_timed(&g1_prep_task);
 
     G1MonotonicArenaMemoryStats sampled_card_set_stats = g1_prep_task.all_card_set_stats();
@@ -1104,7 +1122,7 @@ void G1YoungCollector::collect() {
     // other trivial setup above).
     policy()->record_young_collection_start();
 
-    pre_evacuate_collection_set(jtm.evacuation_info());
+    pre_evacuate_collection_set(jtm.evacuation_info(), &_evac_failure_regions);
 
     G1ParScanThreadStateSet per_thread_states(_g1h,
                                               workers()->active_workers(),
diff --git a/src/hotspot/share/gc/g1/g1YoungCollector.hpp b/src/hotspot/share/gc/g1/g1YoungCollector.hpp
index d6835389801..9b304d61d6f 100644
--- a/src/hotspot/share/gc/g1/g1YoungCollector.hpp
+++ b/src/hotspot/share/gc/g1/g1YoungCollector.hpp
@@ -95,7 +95,8 @@ class G1YoungCollector {
 
   void set_young_collection_default_active_worker_threads();
 
-  void pre_evacuate_collection_set(G1EvacInfo* evacuation_info);
+  void pre_evacuate_collection_set(G1EvacInfo* evacuation_info,
+                                   G1EvacFailureRegions* evac_failure_regions);
   // Actually do the work of evacuating the parts of the collection set.
   // The has_optional_evacuation_work flag for the initial collection set
   // evacuation indicates whether one or more optional evacuation steps may
diff --git a/test/hotspot/jtreg/gc/g1/pinnedobjs/TestPinnedEvacEmpty.java b/test/hotspot/jtreg/gc/g1/pinnedobjs/TestPinnedEvacEmpty.java
new file mode 100644
index 00000000000..dbc05ad57e2
--- /dev/null
+++ b/test/hotspot/jtreg/gc/g1/pinnedobjs/TestPinnedEvacEmpty.java
@@ -0,0 +1,89 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact 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 pinned regions with no Java references into them
+ *          do not make the garbage collector reclaim that region.
+ *          This test simulates this behavior using Whitebox/Unsafe methods
+ *          to pin a Java object in a region with no other pinnable objects and
+*           lose the reference to it before the garbage collection.
+ * @requires vm.gc.G1
+ * @requires vm.debug
+ * @library /test/lib
+ * @modules java.base/jdk.internal.misc:+open
+ *          java.management
+ * @build jdk.test.whitebox.WhiteBox
+ * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox
+ * @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:+UseG1GC
+ *      -Xbootclasspath/a:. -Xlog:gc=debug,gc+ergo+cset=trace,gc+phases=debug -XX:G1HeapRegionSize=1m -Xms30m  gc.g1.pinnedobjs.TestPinnedEvacEmpty
+ */
+
+package gc.g1.pinnedobjs;
+
+import jdk.internal.misc.Unsafe;
+
+import jdk.test.lib.Asserts;
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.process.ProcessTools;
+import jdk.test.whitebox.WhiteBox;
+
+public class TestPinnedEvacEmpty {
+
+    private static final jdk.internal.misc.Unsafe unsafe = Unsafe.getUnsafe();
+    private static final WhiteBox wb = WhiteBox.getWhiteBox();
+
+    private static final long objSize = wb.getObjectSize(new Object());
+
+    // How many j.l.Object should we allocate when creating garbage.
+    private static final long numAllocations = 1024 * 1024 * 3 / objSize;
+
+    public static void main(String[] args) throws Exception {
+        // Remove garbage from VM initialization.
+        wb.fullGC();
+
+        // Allocate garbage so that the target object will be in a new region.
+        for (int i = 0; i < numAllocations; i++) {
+          Object z = new Object();
+        }
+        int[] o = new int[100];  // The target object to pin.
+        // Further allocate garbage so that any additional allocations of potentially
+        // pinned objects can not be allocated in the same region as the target object.
+        for (int i = 0; i < numAllocations; i++) {
+          Object z = new Object();
+        }
+
+        Asserts.assertTrue(!wb.isObjectInOldGen(o), "should not be in old gen already");
+
+        // Pin the object.
+        wb.pinObject(o);
+
+        // And forget the (Java) reference to the int array. After this, the garbage
+        // collection should find a completely empty pinned region. The collector
+        // must not collect/free it.
+        o = null;
+
+        // Do garbage collection to zap the data in the pinned region.
+        wb.youngGC();
+    }
+}
+

From 46b3d1d8cfd03e01d993be19d725cdbcafef7865 Mon Sep 17 00:00:00 2001
From: Sergey Chernyshev <schernyshev@openjdk.org>
Date: Tue, 18 Mar 2025 09:37:45 +0000
Subject: [PATCH 384/587] 8351382: New test
 containers/docker/TestMemoryWithSubgroups.java is failing

Reviewed-by: sgehwolf, dholmes
---
 .../docker/TestMemoryWithSubgroups.java         | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/test/hotspot/jtreg/containers/docker/TestMemoryWithSubgroups.java b/test/hotspot/jtreg/containers/docker/TestMemoryWithSubgroups.java
index e7989874d7a..2245090ac55 100644
--- a/test/hotspot/jtreg/containers/docker/TestMemoryWithSubgroups.java
+++ b/test/hotspot/jtreg/containers/docker/TestMemoryWithSubgroups.java
@@ -21,6 +21,7 @@
  * questions.
  */
 
+import jdk.test.lib.Container;
 import jdk.test.lib.containers.docker.Common;
 import jdk.test.lib.containers.docker.DockerTestUtils;
 import jdk.test.lib.containers.docker.DockerRunOptions;
@@ -46,6 +47,19 @@ public class TestMemoryWithSubgroups {
 
     private static final String imageName = Common.imageName("subgroup");
 
+    static String getEngineInfo(String format) throws Exception {
+        return DockerTestUtils.execute(Container.ENGINE_COMMAND, "info", "-f", format)
+            .getStdout();
+    }
+
+    static boolean isRootless() throws Exception {
+        // Docker and Podman have different INFO structures.
+        // The node path for Podman is .Host.Security.Rootless, that also holds for
+        // Podman emulating Docker CLI. The node path for Docker is .SecurityOptions.
+        return (getEngineInfo("{{.Host.Security.Rootless}}").contains("true") ||
+                getEngineInfo("{{.SecurityOptions}}").contains("name=rootless"));
+    }
+
     public static void main(String[] args) throws Exception {
         Metrics metrics = Metrics.systemMetrics();
         if (metrics == null) {
@@ -56,6 +70,9 @@ public class TestMemoryWithSubgroups {
             System.out.println("Unable to run docker tests.");
             return;
         }
+        if (isRootless()) {
+            throw new SkippedException("Test skipped in rootless mode");
+        }
         Common.prepareWhiteBox();
         DockerTestUtils.buildJdkContainerImage(imageName);
 

From 20f1bca0770b6b4d935b068e7f6a742cef4f5449 Mon Sep 17 00:00:00 2001
From: Aleksey Shipilev <shade@openjdk.org>
Date: Tue, 18 Mar 2025 10:17:54 +0000
Subject: [PATCH 385/587] 8351187: Add JFR monitor notification event

Reviewed-by: dholmes, lmesnik, mgronlun
---
 src/hotspot/share/jfr/metadata/metadata.xml   |   6 +
 src/hotspot/share/runtime/objectMonitor.cpp   |  43 ++++++-
 src/hotspot/share/runtime/objectMonitor.hpp   |   2 +-
 src/jdk.jfr/share/conf/jfr/default.jfc        |   6 +
 src/jdk.jfr/share/conf/jfr/profile.jfc        |   6 +
 .../runtime/TestJavaMonitorNotifyEvent.java   | 110 ++++++++++++++++++
 test/lib/jdk/test/lib/jfr/EventNames.java     |   1 +
 7 files changed, 168 insertions(+), 6 deletions(-)
 create mode 100644 test/jdk/jdk/jfr/event/runtime/TestJavaMonitorNotifyEvent.java

diff --git a/src/hotspot/share/jfr/metadata/metadata.xml b/src/hotspot/share/jfr/metadata/metadata.xml
index 3151ad72af1..f430c43eb62 100644
--- a/src/hotspot/share/jfr/metadata/metadata.xml
+++ b/src/hotspot/share/jfr/metadata/metadata.xml
@@ -110,6 +110,12 @@
     <Field type="ulong" contentType="address" name="address" label="Monitor Address" description="Address of object waited on" relation="JavaMonitorAddress" />
   </Event>
 
+  <Event name="JavaMonitorNotify" category="Java Application" label="Java Monitor Notify" description="Notifying a Java monitor" thread="true" stackTrace="true">
+    <Field type="Class" name="monitorClass" label="Monitor Class" description="Class of object waited on" />
+    <Field type="uint" name="notifiedCount" label="Notified Threads" description="Number of actually notified threads" />
+    <Field type="ulong" contentType="address" name="address" label="Monitor Address" description="Address of object waited on" relation="JavaMonitorAddress" />
+  </Event>
+
   <Event name="JavaMonitorInflate" category="Java Application" label="Java Monitor Inflated" thread="true" stackTrace="true">
     <Field type="Class" name="monitorClass" label="Monitor Class" />
     <Field type="ulong" contentType="address" name="address" label="Monitor Address" relation="JavaMonitorAddress" />
diff --git a/src/hotspot/share/runtime/objectMonitor.cpp b/src/hotspot/share/runtime/objectMonitor.cpp
index 636172f371d..510b5cca5f4 100644
--- a/src/hotspot/share/runtime/objectMonitor.cpp
+++ b/src/hotspot/share/runtime/objectMonitor.cpp
@@ -1955,7 +1955,8 @@ void ObjectMonitor::wait(jlong millis, bool interruptible, TRAPS) {
 // then instead of transferring a thread from the wait_set to the entry_list
 // we might just dequeue a thread from the wait_set and directly unpark() it.
 
-void ObjectMonitor::notify_internal(JavaThread* current) {
+bool ObjectMonitor::notify_internal(JavaThread* current) {
+  bool did_notify = false;
   Thread::SpinAcquire(&_wait_set_lock, "wait_set - notify");
   ObjectWaiter* iterator = dequeue_waiter();
   if (iterator != nullptr) {
@@ -1980,6 +1981,7 @@ void ObjectMonitor::notify_internal(JavaThread* current) {
 
     iterator->_notified = true;
     iterator->_notifier_tid = JFR_THREAD_ID(current);
+    did_notify = true;
     add_to_entry_list(current, iterator);
 
     // _wait_set_lock protects the wait queue, not the entry_list.  We could
@@ -1995,6 +1997,25 @@ void ObjectMonitor::notify_internal(JavaThread* current) {
     }
   }
   Thread::SpinRelease(&_wait_set_lock);
+  return did_notify;
+}
+
+static void post_monitor_notify_event(EventJavaMonitorNotify* event,
+                                      ObjectMonitor* monitor,
+                                      int notified_count) {
+  assert(event != nullptr, "invariant");
+  assert(monitor != nullptr, "invariant");
+  const Klass* monitor_klass = monitor->object()->klass();
+  if (ObjectMonitor::is_jfr_excluded(monitor_klass)) {
+    return;
+  }
+  event->set_monitorClass(monitor_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)monitor);
+  event->set_notifiedCount(notified_count);
+  event->commit();
 }
 
 // Consider: a not-uncommon synchronization bug is to use notify() when
@@ -2013,9 +2034,15 @@ void ObjectMonitor::notify(TRAPS) {
   if (_wait_set == nullptr) {
     return;
   }
+
+  EventJavaMonitorNotify event;
   DTRACE_MONITOR_PROBE(notify, this, object(), current);
-  notify_internal(current);
-  OM_PERFDATA_OP(Notifications, inc(1));
+  int tally = notify_internal(current) ? 1 : 0;
+  OM_PERFDATA_OP(Notifications, inc(tally));
+
+  if ((tally > 0) && event.should_commit()) {
+    post_monitor_notify_event(&event, this, /* notified_count = */ tally);
+  }
 }
 
 // notifyAll() transfers the waiters one-at-a-time from the waitset to
@@ -2031,14 +2058,20 @@ void ObjectMonitor::notifyAll(TRAPS) {
     return;
   }
 
+  EventJavaMonitorNotify event;
   DTRACE_MONITOR_PROBE(notifyAll, this, object(), current);
   int tally = 0;
   while (_wait_set != nullptr) {
-    tally++;
-    notify_internal(current);
+    if (notify_internal(current)) {
+      tally++;
+    }
   }
 
   OM_PERFDATA_OP(Notifications, inc(tally));
+
+  if ((tally > 0) && event.should_commit()) {
+    post_monitor_notify_event(&event, this, /* notified_count = */ tally);
+  }
 }
 
 void ObjectMonitor::vthread_wait(JavaThread* current, jlong millis) {
diff --git a/src/hotspot/share/runtime/objectMonitor.hpp b/src/hotspot/share/runtime/objectMonitor.hpp
index e3af2422eb7..e7f964ee4e5 100644
--- a/src/hotspot/share/runtime/objectMonitor.hpp
+++ b/src/hotspot/share/runtime/objectMonitor.hpp
@@ -436,7 +436,7 @@ class ObjectMonitor : public CHeapObj<mtObjectMonitor> {
  private:
   void      add_to_entry_list(JavaThread* current, ObjectWaiter* node);
   void      add_waiter(ObjectWaiter* waiter);
-  void      notify_internal(JavaThread* current);
+  bool      notify_internal(JavaThread* current);
   ObjectWaiter* dequeue_waiter();
   void      dequeue_specific_waiter(ObjectWaiter* waiter);
   void      enter_internal(JavaThread* current);
diff --git a/src/jdk.jfr/share/conf/jfr/default.jfc b/src/jdk.jfr/share/conf/jfr/default.jfc
index 2335911926e..35d24655351 100644
--- a/src/jdk.jfr/share/conf/jfr/default.jfc
+++ b/src/jdk.jfr/share/conf/jfr/default.jfc
@@ -95,6 +95,12 @@
       <setting name="threshold" control="locking-threshold">20 ms</setting>
     </event>
 
+    <event name="jdk.JavaMonitorNotify">
+      <setting name="enabled">false</setting>
+      <setting name="stackTrace">true</setting>
+      <setting name="threshold">0 ms</setting>
+    </event>
+
     <event name="jdk.JavaMonitorInflate">
       <setting name="enabled">false</setting>
       <setting name="stackTrace">true</setting>
diff --git a/src/jdk.jfr/share/conf/jfr/profile.jfc b/src/jdk.jfr/share/conf/jfr/profile.jfc
index 1af316bfe81..ca4c1cfd90c 100644
--- a/src/jdk.jfr/share/conf/jfr/profile.jfc
+++ b/src/jdk.jfr/share/conf/jfr/profile.jfc
@@ -95,6 +95,12 @@
       <setting name="threshold" control="locking-threshold">10 ms</setting>
     </event>
 
+    <event name="jdk.JavaMonitorNotify">
+      <setting name="enabled">false</setting>
+      <setting name="stackTrace">true</setting>
+      <setting name="threshold">0 ms</setting>
+    </event>
+
     <event name="jdk.JavaMonitorInflate">
       <setting name="enabled">false</setting>
       <setting name="stackTrace">true</setting>
diff --git a/test/jdk/jdk/jfr/event/runtime/TestJavaMonitorNotifyEvent.java b/test/jdk/jdk/jfr/event/runtime/TestJavaMonitorNotifyEvent.java
new file mode 100644
index 00000000000..515f1279cc2
--- /dev/null
+++ b/test/jdk/jdk/jfr/event/runtime/TestJavaMonitorNotifyEvent.java
@@ -0,0 +1,110 @@
+/*
+ * Copyright (c) 2013, 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.jfr.event.runtime;
+
+import static jdk.test.lib.Asserts.assertFalse;
+import static jdk.test.lib.Asserts.assertTrue;
+
+import java.time.Duration;
+import java.util.List;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.CopyOnWriteArrayList;
+
+import jdk.jfr.Recording;
+import jdk.jfr.consumer.RecordingStream;
+import jdk.jfr.consumer.RecordedClass;
+import jdk.jfr.consumer.RecordedEvent;
+import jdk.test.lib.jfr.EventNames;
+import jdk.test.lib.jfr.Events;
+import jdk.test.lib.thread.TestThread;
+import jdk.test.lib.thread.XRun;
+
+/**
+ * @test
+ * @requires vm.flagless
+ * @requires vm.hasJFR
+ * @library /test/lib
+ * @run main/othervm jdk.jfr.event.runtime.TestJavaMonitorNotifyEvent
+ */
+public class TestJavaMonitorNotifyEvent {
+
+    private static final String FIELD_KLASS_NAME = "monitorClass.name";
+    private static final String FIELD_ADDRESS    = "address";
+    private static final String FIELD_NOTIFIED_COUNT = "notifiedCount";
+
+    private final static String EVENT_NAME = EventNames.JavaMonitorNotify;
+    private static final long WAIT_TIME = 123456;
+
+    static class Lock {
+    }
+
+    public static void main(String[] args) throws Throwable {
+        final Lock lock = new Lock();
+        final String lockClassName = lock.getClass().getName().replace('.', '/');
+        final long mainThreadId = Thread.currentThread().threadId();
+
+        List<RecordedEvent> events = new CopyOnWriteArrayList<>();
+        try (RecordingStream rs = new RecordingStream()) {
+            rs.enable(EVENT_NAME).withoutThreshold();
+            rs.onEvent(EVENT_NAME, e -> {
+                long threadId = e.getThread().getJavaThreadId();
+                Object clazz = e.getValue(FIELD_KLASS_NAME);
+                if (clazz.equals(lockClassName) && (threadId == mainThreadId)) {
+                    events.add(e);
+                    rs.close();
+                }
+            });
+            rs.startAsync();
+
+            final CountDownLatch latch = new CountDownLatch(1);
+            TestThread waitThread = new TestThread(new XRun() {
+                @Override
+                public void xrun() throws Throwable {
+                    synchronized (lock) {
+                        latch.countDown();
+                        lock.wait(WAIT_TIME);
+                    }
+                }
+            });
+            try {
+                waitThread.start();
+                latch.await();
+                synchronized (lock) {
+                    lock.notifyAll();
+                }
+            } finally {
+                waitThread.join();
+            }
+
+            rs.awaitTermination();
+
+            System.out.println(events);
+            assertFalse(events.isEmpty());
+            for (RecordedEvent ev : events) {
+                Events.assertField(ev, FIELD_ADDRESS).notEqual(0L);
+                Events.assertField(ev, FIELD_NOTIFIED_COUNT).equal(1);
+            }
+        }
+    }
+}
diff --git a/test/lib/jdk/test/lib/jfr/EventNames.java b/test/lib/jdk/test/lib/jfr/EventNames.java
index 9aaa231b8a8..ef3528d2d8d 100644
--- a/test/lib/jdk/test/lib/jfr/EventNames.java
+++ b/test/lib/jdk/test/lib/jfr/EventNames.java
@@ -58,6 +58,7 @@ public class EventNames {
     public static final String ThreadPark = PREFIX + "ThreadPark";
     public static final String JavaMonitorEnter = PREFIX + "JavaMonitorEnter";
     public static final String JavaMonitorWait = PREFIX + "JavaMonitorWait";
+    public static final String JavaMonitorNotify = PREFIX + "JavaMonitorNotify";
     public static final String JavaMonitorInflate = PREFIX + "JavaMonitorInflate";
     public static final String JavaMonitorDeflate = PREFIX + "JavaMonitorDeflate";
     public static final String JavaMonitorStatistics = PREFIX + "JavaMonitorStatistics";

From b891bfa7e67c21478475642e2bfa2cdc65a3bffe Mon Sep 17 00:00:00 2001
From: Anjian-Wen <wenanjian@bytedance.com>
Date: Tue, 18 Mar 2025 11:01:18 +0000
Subject: [PATCH 386/587] 8352022: RISC-V: Support Zfa fminm_h/fmaxm_h for
 float16

Reviewed-by: fyang, mli
---
 src/hotspot/cpu/riscv/assembler_riscv.hpp | 10 ++++++++
 src/hotspot/cpu/riscv/riscv.ad            | 31 +++++++++++++++++++++++
 2 files changed, 41 insertions(+)

diff --git a/src/hotspot/cpu/riscv/assembler_riscv.hpp b/src/hotspot/cpu/riscv/assembler_riscv.hpp
index 8658aedcbe7..c9b2551302b 100644
--- a/src/hotspot/cpu/riscv/assembler_riscv.hpp
+++ b/src/hotspot/cpu/riscv/assembler_riscv.hpp
@@ -1450,6 +1450,16 @@ enum operand_size { int8, int16, int32, uint32, int64 };
     fp_base<D_64_dp, 0b11110>(Rd, Rs1, 0b00001, 0b000);
   }
 
+  void fminm_h(FloatRegister Rd, FloatRegister Rs1, FloatRegister Rs2) {
+    assert_cond(UseZfa);
+    fp_base<H_16_hp, 0b00101>(Rd, Rs1, Rs2, 0b010);
+  }
+
+  void fmaxm_h(FloatRegister Rd, FloatRegister Rs1, FloatRegister Rs2) {
+    assert_cond(UseZfa);
+    fp_base<H_16_hp, 0b00101>(Rd, Rs1, Rs2, 0b011);
+  }
+
   void fminm_s(FloatRegister Rd, FloatRegister Rs1, FloatRegister Rs2) {
     assert_cond(UseZfa);
     fp_base<S_32_sp, 0b00101>(Rd, Rs1, Rs2, 0b010);
diff --git a/src/hotspot/cpu/riscv/riscv.ad b/src/hotspot/cpu/riscv/riscv.ad
index 86e4e7d1de8..eb202f14ba1 100644
--- a/src/hotspot/cpu/riscv/riscv.ad
+++ b/src/hotspot/cpu/riscv/riscv.ad
@@ -8386,6 +8386,7 @@ instruct binOps_HF_reg(fRegF dst, fRegF src1, fRegF src2)
 
 instruct min_max_HF_reg(fRegF dst, fRegF src1, fRegF src2)
 %{
+  predicate(!UseZfa);
   match(Set dst (MinHF src1 src2));
   match(Set dst (MaxHF src1 src2));
   format %{ "min_max_hf $dst, $src1, $src2" %}
@@ -8404,6 +8405,36 @@ instruct min_max_HF_reg(fRegF dst, fRegF src1, fRegF src2)
   ins_pipe(pipe_class_default);
 %}
 
+instruct minHF_reg_zfa(fRegF dst, fRegF src1, fRegF src2)
+%{
+  predicate(UseZfa);
+  match(Set dst (MinHF src1 src2));
+
+  format %{ "min_hf $dst, $src1, $src2" %}
+
+  ins_encode %{
+    __ fminm_h(as_FloatRegister($dst$$reg),
+               as_FloatRegister($src1$$reg), as_FloatRegister($src2$$reg));
+  %}
+
+  ins_pipe(pipe_class_default);
+%}
+
+instruct maxHF_reg_zfa(fRegF dst, fRegF src1, fRegF src2)
+%{
+  predicate(UseZfa);
+  match(Set dst (MaxHF src1 src2));
+
+  format %{ "max_hf $dst, $src1, $src2" %}
+
+  ins_encode %{
+    __ fmaxm_h(as_FloatRegister($dst$$reg),
+               as_FloatRegister($src1$$reg), as_FloatRegister($src2$$reg));
+  %}
+
+  ins_pipe(pipe_class_default);
+%}
+
 instruct fma_HF_reg(fRegF dst, fRegF src1, fRegF src2, fRegF src3)
 %{
   match(Set dst (FmaHF src3 (Binary src1 src2)));

From a37d8434ab991507bf8085ecf7816d0cd41ab584 Mon Sep 17 00:00:00 2001
From: Matthias Baesken <mbaesken@openjdk.org>
Date: Tue, 18 Mar 2025 12:59:29 +0000
Subject: [PATCH 387/587] 8352015: LIBVERIFY_OPTIMIZATION remove special
 optimization settings

Reviewed-by: erikj, ihse
---
 make/modules/java.base/lib/CoreLibraries.gmk | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/make/modules/java.base/lib/CoreLibraries.gmk b/make/modules/java.base/lib/CoreLibraries.gmk
index b35e2e03bb8..1046b8f846c 100644
--- a/make/modules/java.base/lib/CoreLibraries.gmk
+++ b/make/modules/java.base/lib/CoreLibraries.gmk
@@ -32,14 +32,9 @@ ifeq ($(INCLUDE), true)
 ## Build libverify
 ################################################################################
 
-LIBVERIFY_OPTIMIZATION := HIGH
-ifeq ($(call isTargetOs, linux)+$(COMPILE_WITH_DEBUG_SYMBOLS), true+true)
-  LIBVERIFY_OPTIMIZATION := LOW
-endif
-
 $(eval $(call SetupJdkLibrary, BUILD_LIBVERIFY, \
     NAME := verify, \
-    OPTIMIZATION := $(LIBVERIFY_OPTIMIZATION), \
+    OPTIMIZATION := HIGH, \
     DISABLED_WARNINGS_gcc_check_code.c := unused-variable, \
     DISABLED_WARNINGS_clang_check_code.c := unused-variable, \
     EXTRA_HEADER_DIRS := libjava, \

From b025d8c2e062210b6148da43f11517666b0b4932 Mon Sep 17 00:00:00 2001
From: Patrick Zhang <qpzhang@openjdk.org>
Date: Tue, 18 Mar 2025 15:44:28 +0000
Subject: [PATCH 388/587] 8350663: AArch64: Enable UseSignumIntrinsic by
 default

Reviewed-by: adinn
---
 src/hotspot/cpu/aarch64/vm_version_aarch64.cpp | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/hotspot/cpu/aarch64/vm_version_aarch64.cpp b/src/hotspot/cpu/aarch64/vm_version_aarch64.cpp
index 91930f6bc26..0f04fee7922 100644
--- a/src/hotspot/cpu/aarch64/vm_version_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/vm_version_aarch64.cpp
@@ -161,9 +161,6 @@ void VM_Version::initialize() {
         (_model == CPU_MODEL_AMPERE_1A || _model == CPU_MODEL_AMPERE_1B)) {
       FLAG_SET_DEFAULT(CodeEntryAlignment, 32);
     }
-    if (FLAG_IS_DEFAULT(UseSignumIntrinsic)) {
-      FLAG_SET_DEFAULT(UseSignumIntrinsic, true);
-    }
   }
 
   // ThunderX
@@ -243,7 +240,7 @@ void VM_Version::initialize() {
     }
   }
 
-  if (_cpu == CPU_ARM) {
+  if (_features & (CPU_FP | CPU_ASIMD)) {
     if (FLAG_IS_DEFAULT(UseSignumIntrinsic)) {
       FLAG_SET_DEFAULT(UseSignumIntrinsic, true);
     }

From 53c5b93ca528ec21628c2b03dd6064e02f7ac408 Mon Sep 17 00:00:00 2001
From: Alex Menkov <amenkov@openjdk.org>
Date: Tue, 18 Mar 2025 17:54:38 +0000
Subject: [PATCH 389/587] 8352180: AttachListenerThread causes many tests to
 timeout on Windows

Reviewed-by: dholmes, alanb
---
 src/hotspot/os/windows/attachListener_windows.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/hotspot/os/windows/attachListener_windows.cpp b/src/hotspot/os/windows/attachListener_windows.cpp
index 2dbb0391290..2cc9d192ce5 100644
--- a/src/hotspot/os/windows/attachListener_windows.cpp
+++ b/src/hotspot/os/windows/attachListener_windows.cpp
@@ -92,6 +92,7 @@ public:
 
   void close() {
     if (opened()) {
+      ThreadBlockInVM tbivm(JavaThread::current());
       FlushFileBuffers(_hPipe);
       CloseHandle(_hPipe);
       _hPipe = INVALID_HANDLE_VALUE;

From a3540be502ef2f93c0fdc3fb2496c29ae7c8b041 Mon Sep 17 00:00:00 2001
From: Alex Menkov <amenkov@openjdk.org>
Date: Tue, 18 Mar 2025 17:59:01 +0000
Subject: [PATCH 390/587] 8352163: [AIX] SIGILL in
 AttachOperation::ReplyWriter::write_fully after 8319055

Reviewed-by: dholmes, mdoerr
---
 src/hotspot/share/services/attachListener.cpp | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/hotspot/share/services/attachListener.cpp b/src/hotspot/share/services/attachListener.cpp
index e3a6a034935..b57e357e897 100644
--- a/src/hotspot/share/services/attachListener.cpp
+++ b/src/hotspot/share/services/attachListener.cpp
@@ -127,9 +127,11 @@ public:
   // Called after the operation is completed.
   // If reply_writer is provided, writes the results.
   void complete() {
-    JavaThread* thread = JavaThread::current();
-    ThreadBlockInVM tbivm(thread);
-    flush_reply();
+    if (_reply_writer != nullptr) {
+      JavaThread* thread = JavaThread::current();
+      ThreadBlockInVM tbivm(thread);
+      flush_reply();
+    }
   }
 
   virtual void write(const char* str, size_t len) override {

From 355b2f3bdd99b28c97c7a20ef25ad862012b5007 Mon Sep 17 00:00:00 2001
From: Kim Barrett <kbarrett@openjdk.org>
Date: Tue, 18 Mar 2025 18:59:42 +0000
Subject: [PATCH 391/587] 8351374: Improve comment about queue.remove timeout
 in CleanerImpl.run

Reviewed-by: rriggs, shade
---
 .../share/classes/jdk/internal/ref/CleanerImpl.java  | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/java.base/share/classes/jdk/internal/ref/CleanerImpl.java b/src/java.base/share/classes/jdk/internal/ref/CleanerImpl.java
index 96b06e27498..a9e38ae7b4b 100644
--- a/src/java.base/share/classes/jdk/internal/ref/CleanerImpl.java
+++ b/src/java.base/share/classes/jdk/internal/ref/CleanerImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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,14 @@ public final class CleanerImpl implements Runnable {
                 mlThread.eraseThreadLocals();
             }
             try {
-                // Wait for a Ref, with a timeout to avoid getting hung
-                // due to a race with clear/clean
+                // Wait for a Ref, with a timeout to avoid a potential hang.
+                // The Cleaner may become unreachable and its cleanable run,
+                // while there are registered cleanables for other objects.
+                // If the application explicitly calls clean() on all remaining
+                // Cleanables, there won't be any references enqueued to unblock
+                // this.  Using a timeout is simpler than unblocking this by
+                // having cleaning of the last registered cleanable enqueue a
+                // dummy reference.
                 Cleanable ref = (Cleanable) queue.remove(60 * 1000L);
                 if (ref != null) {
                     ref.clean();

From 4a02de82923545f18590f8509c55129a4aa20842 Mon Sep 17 00:00:00 2001
From: Jiangli Zhou <jiangli@openjdk.org>
Date: Tue, 18 Mar 2025 19:04:08 +0000
Subject: [PATCH 392/587] 8352098: -Xrunjdwp fails on static JDK

Reviewed-by: cjplummer, dholmes
---
 src/hotspot/share/prims/jvmtiAgent.cpp | 49 ++++++++++++++------------
 1 file changed, 27 insertions(+), 22 deletions(-)

diff --git a/src/hotspot/share/prims/jvmtiAgent.cpp b/src/hotspot/share/prims/jvmtiAgent.cpp
index 3f7a36e13ac..97883e5c6a4 100644
--- a/src/hotspot/share/prims/jvmtiAgent.cpp
+++ b/src/hotspot/share/prims/jvmtiAgent.cpp
@@ -318,14 +318,21 @@ extern "C" {
 }
 
 // Find the OnLoad entry point for -agentlib:  -agentpath:   -Xrun agents.
-static OnLoadEntry_t lookup_On_Load_entry_point(JvmtiAgent* agent, const char* on_load_symbol) {
+static OnLoadEntry_t lookup_On_Load_entry_point(JvmtiAgent* agent, const char* on_load_symbol,
+                                                bool vm_exit_on_error) {
   assert(agent != nullptr, "invariant");
   if (!agent->is_loaded()) {
     if (!load_agent_from_executable(agent, on_load_symbol)) {
-      void* const library = load_library(agent, /* vm exit on error */ true);
-      assert(library != nullptr, "invariant");
-      agent->set_os_lib(library);
-      agent->set_loaded();
+      void* const library = load_library(agent, vm_exit_on_error);
+      assert(library != nullptr || !vm_exit_on_error, "invariant");
+      if (library != nullptr) {
+        agent->set_os_lib(library);
+        agent->set_loaded();
+      } else {
+        // Did not load agent from the executable or library.
+        assert(!vm_exit_on_error, "invariant");
+        return nullptr;
+      }
     }
   }
   assert(agent->is_loaded(), "invariant");
@@ -333,26 +340,28 @@ static OnLoadEntry_t lookup_On_Load_entry_point(JvmtiAgent* agent, const char* o
   return CAST_TO_FN_PTR(OnLoadEntry_t, os::find_agent_function(agent, false, on_load_symbol));
 }
 
-static OnLoadEntry_t lookup_JVM_OnLoad_entry_point(JvmtiAgent* lib) {
-  return lookup_On_Load_entry_point(lib, "JVM_OnLoad");
+static OnLoadEntry_t lookup_JVM_OnLoad_entry_point(JvmtiAgent* lib, bool vm_exit_on_error) {
+  return lookup_On_Load_entry_point(lib, "JVM_OnLoad", vm_exit_on_error);
 }
 
-static OnLoadEntry_t lookup_Agent_OnLoad_entry_point(JvmtiAgent* agent) {
-  return lookup_On_Load_entry_point(agent, "Agent_OnLoad");
+static OnLoadEntry_t lookup_Agent_OnLoad_entry_point(JvmtiAgent* agent, bool vm_exit_on_error) {
+  return lookup_On_Load_entry_point(agent, "Agent_OnLoad", vm_exit_on_error);
 }
 
 void JvmtiAgent::convert_xrun_agent() {
   assert(is_xrun(), "invariant");
   assert(!is_loaded(), "invariant");
   assert(JvmtiEnvBase::get_phase() == JVMTI_PHASE_PRIMORDIAL, "invalid init sequence");
-  OnLoadEntry_t on_load_entry = lookup_JVM_OnLoad_entry_point(this);
+
+  // Don't report any error and bail out too early in
+  // lookup_JVM_OnLoad_entry_point if it does not succeed, since we want
+  // to try lookup_Agent_OnLoad_entry_point for Agent_OnLoad as well.
+  OnLoadEntry_t on_load_entry = lookup_JVM_OnLoad_entry_point(this, /* vm exit on error */ false);
   // If there is an JVM_OnLoad function it will get called later,
   // otherwise see if there is an Agent_OnLoad.
   if (on_load_entry == nullptr) {
-    on_load_entry = lookup_Agent_OnLoad_entry_point(this);
-    if (on_load_entry == nullptr) {
-      vm_exit_during_initialization("Could not find JVM_OnLoad or Agent_OnLoad function in the library", name());
-    }
+    on_load_entry = lookup_Agent_OnLoad_entry_point(this, /* vm exit on error */ true);
+    assert(on_load_entry != nullptr, "invariant");
     _xrun = false; // converted
   }
 }
@@ -362,10 +371,8 @@ static bool invoke_JVM_OnLoad(JvmtiAgent* agent) {
   assert(agent != nullptr, "invariant");
   assert(agent->is_xrun(), "invariant");
   assert(JvmtiEnvBase::get_phase() == JVMTI_PHASE_PRIMORDIAL, "invalid init sequence");
-  OnLoadEntry_t on_load_entry = lookup_JVM_OnLoad_entry_point(agent);
-  if (on_load_entry == nullptr) {
-    vm_exit_during_initialization("Could not find JVM_OnLoad function in -Xrun library", agent->name());
-  }
+  OnLoadEntry_t on_load_entry = lookup_JVM_OnLoad_entry_point(agent, /* vm exit on error */ true);
+  assert(on_load_entry != nullptr, "invariant");
   // Invoke the JVM_OnLoad function
   JavaThread* thread = JavaThread::current();
   ThreadToNativeFromVM ttn(thread);
@@ -594,10 +601,8 @@ static bool invoke_Agent_OnLoad(JvmtiAgent* agent) {
   if (CDSConfig::is_dumping_archive()) {
     check_cds_dump(agent);
   }
-  OnLoadEntry_t on_load_entry = lookup_Agent_OnLoad_entry_point(agent);
-  if (on_load_entry == nullptr) {
-    vm_exit_during_initialization("Could not find Agent_OnLoad function in the agent library", agent->name());
-  }
+  OnLoadEntry_t on_load_entry = lookup_Agent_OnLoad_entry_point(agent, /* vm exit on error */ true);
+  assert(on_load_entry != nullptr, "invariant");
   // Invoke the Agent_OnLoad function
   extern struct JavaVM_ main_vm;
   if ((*on_load_entry)(&main_vm, const_cast<char*>(agent->options()), nullptr) != JNI_OK) {

From c8a11f28dff58382f943b3615ca8c7e33d6eab8e Mon Sep 17 00:00:00 2001
From: Alexey Semenyuk <asemenyuk@openjdk.org>
Date: Tue, 18 Mar 2025 21:35:54 +0000
Subject: [PATCH 393/587] 8352293: jpackage tests build rpm packages on Ubuntu
 test machines after JDK-8351372

Reviewed-by: almatvee
---
 .../tools/jpackage/helpers/jdk/jpackage/test/PackageType.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/PackageType.java b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/PackageType.java
index f6c2b84057a..017796705bf 100644
--- a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/PackageType.java
+++ b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/PackageType.java
@@ -86,7 +86,7 @@ public enum PackageType {
     }
 
     public boolean isEnabled() {
-        return supported;
+        return enabled;
     }
 
     public String getType() {

From 8e530633a9d99d7ce585cafd5573cb89212feee7 Mon Sep 17 00:00:00 2001
From: Alexey Semenyuk <asemenyuk@openjdk.org>
Date: Tue, 18 Mar 2025 23:07:09 +0000
Subject: [PATCH 394/587] 8352275: Clean up dead code in jpackage revealed with
 improved negative test coverage

Reviewed-by: almatvee
---
 .../internal/MacBaseInstallerBundler.java     | 16 ---------------
 .../jdk/jpackage/internal/MacPkgBundler.java  |  7 +------
 .../resources/MacResources.properties         |  6 ------
 .../jdk/jpackage/internal/Arguments.java      |  5 +----
 .../jdk/jpackage/internal/LauncherData.java   |  5 -----
 .../internal/StandardBundlerParam.java        | 20 +------------------
 .../resources/MainResources.properties        | 16 ++++-----------
 .../jdk/jpackage/internal/WinMsiBundler.java  |  7 ++-----
 .../resources/WinResources.properties         |  1 -
 9 files changed, 9 insertions(+), 74 deletions(-)

diff --git a/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacBaseInstallerBundler.java b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacBaseInstallerBundler.java
index beb8072ea37..1947cc0afda 100644
--- a/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacBaseInstallerBundler.java
+++ b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacBaseInstallerBundler.java
@@ -141,22 +141,6 @@ public abstract class MacBaseInstallerBundler extends AbstractBundler {
             Map<String, ? super Object> params) throws ConfigException {
         if (PREDEFINED_APP_IMAGE.fetchFrom(params) != null) {
             Path applicationImage = PREDEFINED_APP_IMAGE.fetchFrom(params);
-            if (!IOUtils.exists(applicationImage)) {
-                throw new ConfigException(
-                        MessageFormat.format(I18N.getString(
-                                "message.app-image-dir-does-not-exist"),
-                                PREDEFINED_APP_IMAGE.getID(),
-                                applicationImage.toString()),
-                        MessageFormat.format(I18N.getString(
-                                "message.app-image-dir-does-not-exist.advice"),
-                                PREDEFINED_APP_IMAGE.getID()));
-            }
-            if (APP_NAME.fetchFrom(params) == null) {
-                throw new ConfigException(
-                        I18N.getString("message.app-image-requires-app-name"),
-                        I18N.getString(
-                            "message.app-image-requires-app-name.advice"));
-            }
             if (AppImageFile.load(applicationImage).isSigned()) {
                 if (!Files.exists(
                         PackageFile.getPathInAppImage(applicationImage))) {
diff --git a/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacPkgBundler.java b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacPkgBundler.java
index c2bd0576a38..8eb40b87419 100644
--- a/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacPkgBundler.java
+++ b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacPkgBundler.java
@@ -685,6 +685,7 @@ public class MacPkgBundler extends MacBaseInstallerBundler {
     }
 
     private static boolean isValidBundleIdentifier(String id) {
+        Objects.requireNonNull(id);
         for (int i = 0; i < id.length(); i++) {
             char a = id.charAt(i);
             // We check for ASCII codes first which we accept. If check fails,
@@ -709,12 +710,6 @@ public class MacPkgBundler extends MacBaseInstallerBundler {
             validateAppImageAndBundeler(params);
 
             String identifier = MAC_CF_BUNDLE_IDENTIFIER.fetchFrom(params);
-            if (identifier == null) {
-                throw new ConfigException(
-                        I18N.getString("message.app-image-requires-identifier"),
-                        I18N.getString(
-                            "message.app-image-requires-identifier.advice"));
-            }
             if (!isValidBundleIdentifier(identifier)) {
                 throw new ConfigException(
                         MessageFormat.format(I18N.getString(
diff --git a/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/resources/MacResources.properties b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/resources/MacResources.properties
index 2f6d5b02bb6..29b24251e20 100644
--- a/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/resources/MacResources.properties
+++ b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/resources/MacResources.properties
@@ -72,12 +72,6 @@ message.ignoring.symlink=Warning: codesign is skipping the symlink {0}.
 message.already.signed=File already signed: {0}.
 message.keychain.error=Error: unable to get keychain list.
 message.building-bundle=Building Mac App Store Package for {0}.
-message.app-image-dir-does-not-exist=Specified application image directory {0}: {1} does not exists.
-message.app-image-dir-does-not-exist.advice=Confirm that the value for {0} exists.
-message.app-image-requires-app-name=When using an external app image you must specify the app name.
-message.app-image-requires-app-name.advice=Set the app name via the -name CLI flag, the fx:application/@name ANT attribute, or via the 'appName' bundler argument.
-message.app-image-requires-identifier=Unable to extract identifier from app image.
-message.app-image-requires-identifier.advice=Use "--verbose" for extended error message or specify it via "--mac-package-identifier".
 message.invalid-identifier=invalid mac bundle identifier [{0}].
 message.invalid-identifier.advice=specify identifier with "--mac-package-identifier".
 message.building-dmg=Building DMG package for {0}.
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/Arguments.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/Arguments.java
index 52579f50296..85af649470c 100644
--- a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/Arguments.java
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/Arguments.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -547,9 +547,6 @@ public class Arguments {
                 }
                 usedNames.add(slName);
             }
-            if (runtimeInstaller && bp.getName() == null) {
-                throw new PackagerException("ERR_NoJreInstallerName");
-            }
 
             generateBundle(bp.getBundleParamsAsMap());
             return true;
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/LauncherData.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/LauncherData.java
index c5a74ac09cc..d4509b553f9 100644
--- a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/LauncherData.java
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/LauncherData.java
@@ -178,11 +178,6 @@ final class LauncherData {
         launcherData.qualifiedClassName = getMainClass(params);
 
         launcherData.mainJarName = getMainJarName(params);
-        if (launcherData.mainJarName == null && launcherData.qualifiedClassName
-                == null) {
-            throw new ConfigException(I18N.getString("error.no-main-jar-parameter"),
-                    null);
-        }
 
         Path mainJarDir = StandardBundlerParam.SOURCE_DIR.fetchFrom(params);
 
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/StandardBundlerParam.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/StandardBundlerParam.java
index ec5b1aceaab..6562d3425d9 100644
--- a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/StandardBundlerParam.java
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/StandardBundlerParam.java
@@ -567,30 +567,12 @@ class StandardBundlerParam<T> extends BundlerParamInfo<T> {
     }
 
     static Path getPredefinedAppImage(Map<String, ? super Object> params) {
-        Path applicationImage = PREDEFINED_APP_IMAGE.fetchFrom(params);
-        if (applicationImage != null && !IOUtils.exists(applicationImage)) {
-            throw new RuntimeException(
-                    MessageFormat.format(I18N.getString(
-                            "message.app-image-dir-does-not-exist"),
-                            PREDEFINED_APP_IMAGE.getID(),
-                            applicationImage.toString()));
-        }
-        return applicationImage;
+        return PREDEFINED_APP_IMAGE.fetchFrom(params);
     }
 
     static void copyPredefinedRuntimeImage(Map<String, ? super Object> params,
             ApplicationLayout appLayout) throws IOException, ConfigException {
         Path topImage = PREDEFINED_RUNTIME_IMAGE.fetchFrom(params);
-        if (!IOUtils.exists(topImage)) {
-            throw new ConfigException(
-                    MessageFormat.format(I18N.getString(
-                    "message.runtime-image-dir-does-not-exist"),
-                    PREDEFINED_RUNTIME_IMAGE.getID(),
-                    topImage.toString()),
-                    MessageFormat.format(I18N.getString(
-                    "message.runtime-image-dir-does-not-exist.advice"),
-                    PREDEFINED_RUNTIME_IMAGE.getID()));
-        }
 
         if (OperatingSystem.isMacOS()) {
             // On Mac topImage can be runtime root or runtime home.
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/MainResources.properties b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/MainResources.properties
index 4c5d51d5bcc..037b38d36fd 100644
--- a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/MainResources.properties
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/MainResources.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2017, 2023, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -35,19 +35,16 @@ message.no-default-resource=no default package resource {0} {1} (add {2} to the
 message.using-custom-resource-from-file=Using custom package resource {0} (loaded from file {1}).
 message.using-custom-resource=Using custom package resource {0} (loaded from {1}).
 message.creating-app-bundle=Creating app package: {0} in {1}
-message.app-image-dir-does-not-exist=Specified application image directory {0}: {1} does not exist
-message.app-image-dir-does-not-exist.advice=Confirm that the value for {0} exists
 message.runtime-image-dir-does-not-exist=Specified runtime image directory {0}: {1} does not exist
-message.runtime-image-dir-does-not-exist.advice=Confirm that the value for {0} exists
 message.resource-dir-does-not-exist=Specified resource directory {0}: {1} does not exist
 message.debug-working-directory=Kept working directory for debug: {0}
 message.bundle-created=Succeeded in building {0} package
 message.module-version=Using version "{0}" from module "{1}" as application version
 message.module-class=Using class "{0}" from module "{1}" as application main class
 
-error.version-string-empty="Version may not be empty string"
-error.version-string-zero-length-component="Version [{0}] contains a zero length component"
-error.version-string-invalid-component="Version [{0}] contains invalid component [{1}]"
+error.version-string-empty=Version may not be empty string
+error.version-string-zero-length-component=Version [{0}] contains a zero length component
+error.version-string-invalid-component=Version [{0}] contains invalid component [{1}]
 
 error.cannot-create-output-dir=Destination directory {0} cannot be created
 error.cannot-write-to-output-dir=Destination directory {0} is not writable
@@ -61,7 +58,6 @@ error.main-jar-does-not-exist.advice=The main jar must be specified relative to
 error.no-module-in-path="Failed to find {0} module in module path"
 error.not-path-parameter="Invalid value of {0} parameter: {1}"
 error.no-input-parameter="Missing --input parameter for non modular application"
-error.no-main-jar-parameter="Missing --main-jar parameter for non modular application"
 
 error.no-content-types-for-file-association=No MIME types were specified for File Association number {0}
 error.no-content-types-for-file-association.advice=Specify MIME type for File Association number {0}
@@ -97,11 +93,9 @@ ERR_InvalidOptionWithAppImageSigning=Error: Option [{0}] is not valid when signi
 
 ERR_MissingArgument=Error: Missing argument: {0}
 ERR_MissingRequiredArgument=Error: {0} argument requires at least one of [{1}] argument(s)
-ERR_MissingAppResources=Error: No application jars found
 ERR_AppImageNotExist=Error: App image directory "{0}" does not exist
 ERR_NoAddLauncherName=Error: --add-launcher option requires a name and a file path (--add-launcher <name>=<file path>)
 ERR_NoUniqueName=Error: --add-launcher <name>=<file path> requires a unique name
-ERR_NoJreInstallerName=Error: Jre Installers require a name parameter
 ERR_InvalidAppName=Error: Invalid Application name: {0}
 ERR_InvalidSLName=Error: Invalid Add Launcher name: {0}
 ERR_IconFileNotExit=Error: Specified icon file [{0}] does not exist
@@ -111,8 +105,6 @@ ERR_InvalidOption=Error: Invalid Option: [{0}]
 ERR_InvalidInstallerType=Error: Invalid or unsupported type: [{0}]
 ERR_BothMainJarAndModule=Error: Cannot have both --main-jar and --module Options
 ERR_NoEntryPoint=Error: creating application image requires --main-jar or --module Option
-ERR_InputNotDirectory=Error: Input directory specified is not a directory: {0}
-ERR_CannotReadInputDir=Error: No permission to read from input directory: {0}
 ERR_CannotParseOptions=Error: Processing @filename option: {0}
 ERR_MissingJLinkOptMacAppStore=Error: --mac-app-store argument requires a {0} option for --jlink-options argument
 ERR_MacAppStoreRuntimeBinExists=Error: Runtime image "{0}" should not contain "bin" folder. Use --strip-native-commands jlink option when generating runtime image used with --mac-app-store argument.
diff --git a/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WinMsiBundler.java b/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WinMsiBundler.java
index 3b2e7569db3..a17df722f16 100644
--- a/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WinMsiBundler.java
+++ b/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WinMsiBundler.java
@@ -41,6 +41,7 @@ import java.util.HashMap;
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Optional;
 import java.util.Set;
 import java.util.UUID;
@@ -349,12 +350,8 @@ public class WinMsiBundler  extends AbstractBundler {
     private void prepareProto(Map<String, ? super Object> params)
                 throws PackagerException, IOException {
         Path appImage = StandardBundlerParam.getPredefinedAppImage(params);
-        String appName = APP_NAME.fetchFrom(params);
+        String appName = Objects.requireNonNull(APP_NAME.fetchFrom(params));
         Path appDir;
-        if (appName == null) {
-            // Can happen when no name is given, and using a foreign app-image
-            throw new PackagerException("error.no.name");
-        }
 
         // we either have an application image or need to build one
         if (appImage != null) {
diff --git a/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/resources/WinResources.properties b/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/resources/WinResources.properties
index 91fc8806e10..d8f5194b4f6 100644
--- a/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/resources/WinResources.properties
+++ b/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/resources/WinResources.properties
@@ -68,7 +68,6 @@ message.output-location=Installer (.exe) saved to: {0}
 message.tool-version=Detected [{0}] version [{1}].
 message.creating-association-with-null-extension=Creating association with null extension.
 message.wrong-tool-version=Detected [{0}] version {1} but version {2} is required.
-message.version-string-too-many-components=Version string may have up to 3 components - major.minor.build .
 message.use-wix36-features=WiX {0} detected. Enabling advanced cleanup action.
 message.product-code=MSI ProductCode: {0}.
 message.upgrade-code=MSI UpgradeCode: {0}.

From 20d4fe3a574a33784dc02e7cc653cdb248b697a2 Mon Sep 17 00:00:00 2001
From: William Kemper <wkemper@openjdk.org>
Date: Wed, 19 Mar 2025 00:30:25 +0000
Subject: [PATCH 395/587] 8351464: Shenandoah: Hang on
 ShenandoahController::handle_alloc_failure when run test
 TestAllocHumongousFragment#generational

Reviewed-by: xpeng, ysr
---
 src/hotspot/share/gc/shenandoah/shenandoahControlThread.cpp   | 4 ++--
 .../gc/shenandoah/shenandoahGenerationalControlThread.cpp     | 4 ++--
 test/hotspot/jtreg/ProblemList.txt                            | 1 -
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/hotspot/share/gc/shenandoah/shenandoahControlThread.cpp b/src/hotspot/share/gc/shenandoah/shenandoahControlThread.cpp
index 4848a69a6f3..e0a6ff3a3b3 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahControlThread.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahControlThread.cpp
@@ -167,8 +167,8 @@ void ShenandoahControlThread::run_service() {
         notify_gc_waiters();
       }
 
-      // If this was the allocation failure GC cycle, notify waiters about it
-      if (alloc_failure_pending) {
+      // If this cycle completed without being cancelled, notify waiters about it
+      if (!heap->cancelled_gc()) {
         notify_alloc_failure_waiters();
       }
 
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahGenerationalControlThread.cpp b/src/hotspot/share/gc/shenandoah/shenandoahGenerationalControlThread.cpp
index cabe51edc51..e149272570d 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahGenerationalControlThread.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahGenerationalControlThread.cpp
@@ -277,8 +277,8 @@ void ShenandoahGenerationalControlThread::run_gc_cycle(const ShenandoahGCRequest
     notify_gc_waiters();
   }
 
-  // If this was an allocation failure GC cycle, notify waiters about it
-  if (ShenandoahCollectorPolicy::is_allocation_failure(request.cause)) {
+  // If this cycle completed successfully, notify threads waiting to retry allocation
+  if (!_heap->cancelled_gc()) {
     notify_alloc_failure_waiters();
   }
 
diff --git a/test/hotspot/jtreg/ProblemList.txt b/test/hotspot/jtreg/ProblemList.txt
index cac1d404168..b866df3020a 100644
--- a/test/hotspot/jtreg/ProblemList.txt
+++ b/test/hotspot/jtreg/ProblemList.txt
@@ -100,7 +100,6 @@ gc/TestAlwaysPreTouchBehavior.java#Z 8334513 generic-all
 gc/TestAlwaysPreTouchBehavior.java#Epsilon 8334513 generic-all
 gc/shenandoah/oom/TestAllocOutOfMemory.java#large 8344312 linux-ppc64le
 gc/shenandoah/TestEvilSyncBug.java#generational 8345501 generic-all
-gc/TestAllocHumongousFragment.java#generational 8351464 generic-all
 
 #############################################################################
 

From 577ede73d8e916bac9050d3bee80d2f18cc833a7 Mon Sep 17 00:00:00 2001
From: Weijun Wang <weijun@openjdk.org>
Date: Wed, 19 Mar 2025 02:20:07 +0000
Subject: [PATCH 396/587] 8352302: Test
 sun/security/tools/jarsigner/TimestampCheck.java is failing

Reviewed-by: dholmes
---
 test/jdk/sun/security/tools/jarsigner/TimestampCheck.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/jdk/sun/security/tools/jarsigner/TimestampCheck.java b/test/jdk/sun/security/tools/jarsigner/TimestampCheck.java
index bddc8c0e5fb..1c81543e435 100644
--- a/test/jdk/sun/security/tools/jarsigner/TimestampCheck.java
+++ b/test/jdk/sun/security/tools/jarsigner/TimestampCheck.java
@@ -905,7 +905,7 @@ public class TimestampCheck {
         }
 
         gencert("tsold", "-ext eku:critical=ts -startdate -40d -validity 500");
-        gencert("tsbefore2019", "-ext eku:critical=ts -startdate 2018/01/01 -validity 3000");
+        gencert("tsbefore2019", "-ext eku:critical=ts -startdate 2018/01/01 -validity 5000");
 
         gencert("tsweak", "-ext eku:critical=ts");
         gencert("tsdisabled", "-ext eku:critical=ts");

From e57b2725065eaa79db7f9132f4152cbae9279f8e Mon Sep 17 00:00:00 2001
From: Christian Hagedorn <chagedorn@openjdk.org>
Date: Wed, 19 Mar 2025 07:41:07 +0000
Subject: [PATCH 397/587] 8350578: Refactor useless Parse and Template
 Assertion Predicate elimination code by using a PredicateVisitor

Reviewed-by: epeter, kvn, roland
---
 src/hotspot/share/opto/cfgnode.hpp          |  26 ++--
 src/hotspot/share/opto/compile.cpp          |  11 +-
 src/hotspot/share/opto/compile.hpp          |  31 +++--
 src/hotspot/share/opto/ifnode.cpp           |  18 ++-
 src/hotspot/share/opto/loopnode.cpp         | 109 +--------------
 src/hotspot/share/opto/loopnode.hpp         |  13 +-
 src/hotspot/share/opto/node.cpp             |   5 +-
 src/hotspot/share/opto/opaquenode.cpp       |  13 +-
 src/hotspot/share/opto/opaquenode.hpp       |  30 ++--
 src/hotspot/share/opto/predicates.cpp       | 143 ++++++++++++++++++--
 src/hotspot/share/opto/predicates.hpp       |  61 ++++++---
 src/hotspot/share/opto/predicates_enums.hpp |  54 ++++++++
 12 files changed, 317 insertions(+), 197 deletions(-)
 create mode 100644 src/hotspot/share/opto/predicates_enums.hpp

diff --git a/src/hotspot/share/opto/cfgnode.hpp b/src/hotspot/share/opto/cfgnode.hpp
index 7e117dbd88d..6786089a203 100644
--- a/src/hotspot/share/opto/cfgnode.hpp
+++ b/src/hotspot/share/opto/cfgnode.hpp
@@ -28,6 +28,7 @@
 #include "opto/multnode.hpp"
 #include "opto/node.hpp"
 #include "opto/opcodes.hpp"
+#include "opto/predicates_enums.hpp"
 #include "opto/type.hpp"
 
 // Portions of code courtesy of Clifford Click
@@ -58,10 +59,7 @@ class       JumpProjNode;
 class     SCMemProjNode;
 class PhaseIdealLoop;
 enum class AssertionPredicateType;
-
-// The success projection of a Parse Predicate is always an IfTrueNode and the uncommon projection an IfFalseNode
-typedef IfTrueNode ParsePredicateSuccessProj;
-typedef IfFalseNode ParsePredicateUncommonProj;
+enum class PredicateState;
 
 //------------------------------RegionNode-------------------------------------
 // The class of RegionNodes, which can be mapped to basic blocks in the
@@ -488,7 +486,11 @@ public:
 // More information about predicates can be found in loopPredicate.cpp.
 class ParsePredicateNode : public IfNode {
   Deoptimization::DeoptReason _deopt_reason;
-  bool _useless; // If the associated loop dies, this parse predicate becomes useless and can be cleaned up by Value().
+
+  // When a Parse Predicate loses its connection to a loop head, it will be marked useless by
+  // EliminateUselessPredicates and cleaned up by Value(). It can also become useless when cloning it to both loops
+  // during Loop Multiversioning - we no longer use the old version.
+  PredicateState _predicate_state;
  public:
   ParsePredicateNode(Node* control, Deoptimization::DeoptReason deopt_reason, PhaseGVN* gvn);
   virtual int Opcode() const;
@@ -499,15 +501,21 @@ class ParsePredicateNode : public IfNode {
   }
 
   bool is_useless() const {
-    return _useless;
+    return _predicate_state == PredicateState::Useless;
   }
 
-  void mark_useless() {
-    _useless = true;
+  void mark_useless(PhaseIterGVN& igvn);
+
+  void mark_maybe_useful() {
+    _predicate_state = PredicateState::MaybeUseful;
+  }
+
+  bool is_useful() const {
+    return _predicate_state == PredicateState::Useful;
   }
 
   void mark_useful() {
-    _useless = false;
+    _predicate_state = PredicateState::Useful;
   }
 
   // Return the uncommon trap If projection of this Parse Predicate.
diff --git a/src/hotspot/share/opto/compile.cpp b/src/hotspot/share/opto/compile.cpp
index 026aa1ba4fb..5294315fe74 100644
--- a/src/hotspot/share/opto/compile.cpp
+++ b/src/hotspot/share/opto/compile.cpp
@@ -67,6 +67,7 @@
 #include "opto/mulnode.hpp"
 #include "opto/narrowptrnode.hpp"
 #include "opto/node.hpp"
+#include "opto/opaquenode.hpp"
 #include "opto/opcodes.hpp"
 #include "opto/output.hpp"
 #include "opto/parse.hpp"
@@ -394,7 +395,7 @@ void Compile::remove_useless_node(Node* dead) {
     remove_expensive_node(dead);
   }
   if (dead->is_OpaqueTemplateAssertionPredicate()) {
-    remove_template_assertion_predicate_opaq(dead);
+    remove_template_assertion_predicate_opaque(dead->as_OpaqueTemplateAssertionPredicate());
   }
   if (dead->is_ParsePredicate()) {
     remove_parse_predicate(dead->as_ParsePredicate());
@@ -453,7 +454,8 @@ void Compile::disconnect_useless_nodes(Unique_Node_List& useful, Unique_Node_Lis
 
   remove_useless_nodes(_macro_nodes,        useful); // remove useless macro nodes
   remove_useless_nodes(_parse_predicates,   useful); // remove useless Parse Predicate nodes
-  remove_useless_nodes(_template_assertion_predicate_opaqs, useful); // remove useless Assertion Predicate opaque nodes
+  // Remove useless Template Assertion Predicate opaque nodes
+  remove_useless_nodes(_template_assertion_predicate_opaques, useful);
   remove_useless_nodes(_expensive_nodes,    useful); // remove useless expensive nodes
   remove_useless_nodes(_for_post_loop_igvn, useful); // remove useless node recorded for post loop opts IGVN pass
   remove_useless_nodes(_for_merge_stores_igvn, useful); // remove useless node recorded for merge stores IGVN pass
@@ -653,7 +655,7 @@ Compile::Compile(ciEnv* ci_env, ciMethod* target, int osr_bci,
       _intrinsics(comp_arena(), 0, 0, nullptr),
       _macro_nodes(comp_arena(), 8, 0, nullptr),
       _parse_predicates(comp_arena(), 8, 0, nullptr),
-      _template_assertion_predicate_opaqs(comp_arena(), 8, 0, nullptr),
+      _template_assertion_predicate_opaques(comp_arena(), 8, 0, nullptr),
       _expensive_nodes(comp_arena(), 8, 0, nullptr),
       _for_post_loop_igvn(comp_arena(), 8, 0, nullptr),
       _for_merge_stores_igvn(comp_arena(), 8, 0, nullptr),
@@ -1832,8 +1834,7 @@ void Compile::mark_parse_predicate_nodes_useless(PhaseIterGVN& igvn) {
   }
   for (int i = 0; i < parse_predicate_count(); i++) {
     ParsePredicateNode* parse_predicate = _parse_predicates.at(i);
-    parse_predicate->mark_useless();
-    igvn._worklist.push(parse_predicate);
+    parse_predicate->mark_useless(igvn);
   }
   _parse_predicates.clear();
 }
diff --git a/src/hotspot/share/opto/compile.hpp b/src/hotspot/share/opto/compile.hpp
index 7be23e01440..4c97b26bb25 100644
--- a/src/hotspot/share/opto/compile.hpp
+++ b/src/hotspot/share/opto/compile.hpp
@@ -71,6 +71,7 @@ class Node_List;
 class Node_Notes;
 class NodeHash;
 class NodeCloneInfo;
+class OpaqueTemplateAssertionPredicateNode;
 class OptoReg;
 class ParsePredicateNode;
 class PhaseCFG;
@@ -371,8 +372,9 @@ class Compile : public Phase {
   GrowableArray<CallGenerator*> _intrinsics;    // List of intrinsics.
   GrowableArray<Node*>  _macro_nodes;           // List of nodes which need to be expanded before matching.
   GrowableArray<ParsePredicateNode*> _parse_predicates; // List of Parse Predicates.
-  // List of OpaqueTemplateAssertionPredicateNode nodes for Template Assertion Predicates.
-  GrowableArray<Node*>  _template_assertion_predicate_opaqs;
+  // List of OpaqueTemplateAssertionPredicateNode nodes for Template Assertion Predicates which can be seen as list
+  // of Template Assertion Predicates themselves.
+  GrowableArray<OpaqueTemplateAssertionPredicateNode*>  _template_assertion_predicate_opaques;
   GrowableArray<Node*>  _expensive_nodes;       // List of nodes that are expensive to compute and that we'd better not let the GVN freely common
   GrowableArray<Node*>  _for_post_loop_igvn;    // List of nodes for IGVN after loop opts are over
   GrowableArray<Node*>  _for_merge_stores_igvn; // List of nodes for IGVN merge stores
@@ -683,18 +685,21 @@ public:
   static IdealGraphPrinter* debug_network_printer() { return _debug_network_printer; }
 #endif
 
+  const GrowableArray<ParsePredicateNode*>& parse_predicates() const {
+    return _parse_predicates;
+  }
+
+  const GrowableArray<OpaqueTemplateAssertionPredicateNode*>& template_assertion_predicate_opaques() const {
+    return _template_assertion_predicate_opaques;
+  }
+
   int           macro_count()             const { return _macro_nodes.length(); }
   int           parse_predicate_count()   const { return _parse_predicates.length(); }
-  int           template_assertion_predicate_count() const { return _template_assertion_predicate_opaqs.length(); }
+  int           template_assertion_predicate_count() const { return _template_assertion_predicate_opaques.length(); }
   int           expensive_count()         const { return _expensive_nodes.length(); }
   int           coarsened_count()         const { return _coarsened_locks.length(); }
 
   Node*         macro_node(int idx)       const { return _macro_nodes.at(idx); }
-  ParsePredicateNode* parse_predicate(int idx) const { return _parse_predicates.at(idx); }
-
-  Node* template_assertion_predicate_opaq_node(int idx) const {
-    return _template_assertion_predicate_opaqs.at(idx);
-  }
 
   Node*         expensive_node(int idx)   const { return _expensive_nodes.at(idx); }
 
@@ -730,15 +735,15 @@ public:
     }
   }
 
-  void add_template_assertion_predicate_opaq(Node* n) {
-    assert(!_template_assertion_predicate_opaqs.contains(n),
+  void add_template_assertion_predicate_opaque(OpaqueTemplateAssertionPredicateNode* n) {
+    assert(!_template_assertion_predicate_opaques.contains(n),
            "Duplicate entry in Template Assertion Predicate OpaqueTemplateAssertionPredicate list");
-    _template_assertion_predicate_opaqs.append(n);
+    _template_assertion_predicate_opaques.append(n);
   }
 
-  void remove_template_assertion_predicate_opaq(Node* n) {
+  void remove_template_assertion_predicate_opaque(OpaqueTemplateAssertionPredicateNode* n) {
     if (template_assertion_predicate_count() > 0) {
-      _template_assertion_predicate_opaqs.remove_if_existing(n);
+      _template_assertion_predicate_opaques.remove_if_existing(n);
     }
   }
   void add_coarsened_locks(GrowableArray<AbstractLockNode*>& locks);
diff --git a/src/hotspot/share/opto/ifnode.cpp b/src/hotspot/share/opto/ifnode.cpp
index 5da8993306f..5d349caf103 100644
--- a/src/hotspot/share/opto/ifnode.cpp
+++ b/src/hotspot/share/opto/ifnode.cpp
@@ -31,7 +31,7 @@
 #include "opto/connode.hpp"
 #include "opto/loopnode.hpp"
 #include "opto/phaseX.hpp"
-#include "opto/predicates.hpp"
+#include "opto/predicates_enums.hpp"
 #include "opto/runtime.hpp"
 #include "opto/rootnode.hpp"
 #include "opto/subnode.hpp"
@@ -2169,7 +2169,7 @@ Node* RangeCheckNode::Ideal(PhaseGVN *phase, bool can_reshape) {
 ParsePredicateNode::ParsePredicateNode(Node* control, Deoptimization::DeoptReason deopt_reason, PhaseGVN* gvn)
     : IfNode(control, gvn->intcon(1), PROB_MAX, COUNT_UNKNOWN),
       _deopt_reason(deopt_reason),
-      _useless(false) {
+      _predicate_state(PredicateState::Useful) {
   init_class_id(Class_ParsePredicate);
   gvn->C->add_parse_predicate(this);
   gvn->C->record_for_post_loop_opts_igvn(this);
@@ -2186,6 +2186,11 @@ ParsePredicateNode::ParsePredicateNode(Node* control, Deoptimization::DeoptReaso
 #endif // ASSERT
 }
 
+void ParsePredicateNode::mark_useless(PhaseIterGVN& igvn) {
+  _predicate_state = PredicateState::Useless;
+  igvn._worklist.push(this);
+}
+
 Node* ParsePredicateNode::uncommon_trap() const {
   ParsePredicateUncommonProj* uncommon_proj = proj_out(0)->as_IfFalse();
   Node* uct_region_or_call = uncommon_proj->unique_ctrl_out();
@@ -2195,14 +2200,15 @@ Node* ParsePredicateNode::uncommon_trap() const {
 
 // Fold this node away once it becomes useless or at latest in post loop opts IGVN.
 const Type* ParsePredicateNode::Value(PhaseGVN* phase) const {
+  assert(_predicate_state != PredicateState::MaybeUseful, "should only be MaybeUseful when eliminating useless "
+                                                          "predicates during loop opts");
   if (phase->type(in(0)) == Type::TOP) {
     return Type::TOP;
   }
-  if (_useless || phase->C->post_loop_opts_phase()) {
+  if (_predicate_state == PredicateState::Useless || phase->C->post_loop_opts_phase()) {
     return TypeTuple::IFTRUE;
-  } else {
-    return bottom_type();
   }
+  return bottom_type();
 }
 
 #ifndef PRODUCT
@@ -2224,7 +2230,7 @@ void ParsePredicateNode::dump_spec(outputStream* st) const {
     default:
       fatal("unknown kind");
   }
-  if (_useless) {
+  if (_predicate_state == PredicateState::Useless) {
     st->print("#useless ");
   }
 }
diff --git a/src/hotspot/share/opto/loopnode.cpp b/src/hotspot/share/opto/loopnode.cpp
index 7d83d602ac9..cb3bcee7194 100644
--- a/src/hotspot/share/opto/loopnode.cpp
+++ b/src/hotspot/share/opto/loopnode.cpp
@@ -4399,116 +4399,13 @@ void PhaseIdealLoop::log_loop_tree() {
 
 // Eliminate all Parse and Template Assertion Predicates that are not associated with a loop anymore. The eliminated
 // predicates will be removed during the next round of IGVN.
-void PhaseIdealLoop::eliminate_useless_predicates() {
+void PhaseIdealLoop::eliminate_useless_predicates() const {
   if (C->parse_predicate_count() == 0 && C->template_assertion_predicate_count() == 0) {
     return; // No predicates left.
   }
 
-  eliminate_useless_parse_predicates();
-  eliminate_useless_template_assertion_predicates();
-}
-
-// Eliminate all Parse Predicates that do not belong to a loop anymore by marking them useless. These will be removed
-// during the next round of IGVN.
-void PhaseIdealLoop::eliminate_useless_parse_predicates() {
-  mark_all_parse_predicates_useless();
-  if (C->has_loops()) {
-    mark_loop_associated_parse_predicates_useful();
-  }
-  add_useless_parse_predicates_to_igvn_worklist();
-}
-
-void PhaseIdealLoop::mark_all_parse_predicates_useless() const {
-  for (int i = 0; i < C->parse_predicate_count(); i++) {
-    C->parse_predicate(i)->mark_useless();
-  }
-}
-
-void PhaseIdealLoop::mark_loop_associated_parse_predicates_useful() {
-  for (LoopTreeIterator iterator(_ltree_root); !iterator.done(); iterator.next()) {
-    IdealLoopTree* loop = iterator.current();
-    if (loop->can_apply_loop_predication()) {
-      mark_useful_parse_predicates_for_loop(loop);
-    }
-  }
-}
-
-// This visitor marks all visited Parse Predicates useful.
-class ParsePredicateUsefulMarker : public PredicateVisitor {
- public:
-  using PredicateVisitor::visit;
-
-  void visit(const ParsePredicate& parse_predicate) override {
-    parse_predicate.head()->mark_useful();
-  }
-};
-
-void PhaseIdealLoop::mark_useful_parse_predicates_for_loop(IdealLoopTree* loop) {
-  Node* entry = loop->_head->as_Loop()->skip_strip_mined()->in(LoopNode::EntryControl);
-  const PredicateIterator predicate_iterator(entry);
-  ParsePredicateUsefulMarker useful_marker;
-  predicate_iterator.for_each(useful_marker);
-}
-
-void PhaseIdealLoop::add_useless_parse_predicates_to_igvn_worklist() {
-  for (int i = 0; i < C->parse_predicate_count(); i++) {
-    ParsePredicateNode* parse_predicate_node = C->parse_predicate(i);
-    if (parse_predicate_node->is_useless()) {
-      _igvn._worklist.push(parse_predicate_node);
-    }
-  }
-}
-
-
-// Eliminate all Template Assertion Predicates that do not belong to their originally associated loop anymore by
-// replacing the OpaqueTemplateAssertionPredicate node of the If node with true. These nodes will be removed during the
-// next round of IGVN.
-void PhaseIdealLoop::eliminate_useless_template_assertion_predicates() {
-  Unique_Node_List useful_predicates;
-  if (C->has_loops()) {
-    collect_useful_template_assertion_predicates(useful_predicates);
-  }
-  eliminate_useless_template_assertion_predicates(useful_predicates);
-}
-
-void PhaseIdealLoop::collect_useful_template_assertion_predicates(Unique_Node_List& useful_predicates) {
-  for (LoopTreeIterator iterator(_ltree_root); !iterator.done(); iterator.next()) {
-    IdealLoopTree* loop = iterator.current();
-    if (loop->can_apply_loop_predication()) {
-      collect_useful_template_assertion_predicates_for_loop(loop, useful_predicates);
-    }
-  }
-}
-
-void PhaseIdealLoop::collect_useful_template_assertion_predicates_for_loop(IdealLoopTree* loop,
-                                                                           Unique_Node_List &useful_predicates) {
-  Node* entry = loop->_head->as_Loop()->skip_strip_mined()->in(LoopNode::EntryControl);
-  const Predicates predicates(entry);
-  if (UseProfiledLoopPredicate) {
-    const PredicateBlock* profiled_loop_predicate_block = predicates.profiled_loop_predicate_block();
-    if (profiled_loop_predicate_block->has_parse_predicate()) {
-      ParsePredicateSuccessProj* parse_predicate_proj = profiled_loop_predicate_block->parse_predicate_success_proj();
-      get_opaque_template_assertion_predicate_nodes(parse_predicate_proj, useful_predicates);
-    }
-  }
-
-  if (UseLoopPredicate) {
-    const PredicateBlock* loop_predicate_block = predicates.loop_predicate_block();
-    if (loop_predicate_block->has_parse_predicate()) {
-      ParsePredicateSuccessProj* parse_predicate_proj = loop_predicate_block->parse_predicate_success_proj();
-      get_opaque_template_assertion_predicate_nodes(parse_predicate_proj, useful_predicates);
-    }
-  }
-}
-
-void PhaseIdealLoop::eliminate_useless_template_assertion_predicates(Unique_Node_List& useful_predicates) const {
-  for (int i = C->template_assertion_predicate_count(); i > 0; i--) {
-    OpaqueTemplateAssertionPredicateNode* opaque_node =
-        C->template_assertion_predicate_opaq_node(i - 1)->as_OpaqueTemplateAssertionPredicate();
-    if (!useful_predicates.member(opaque_node)) { // not in the useful list
-      opaque_node->mark_useless(_igvn);
-    }
-  }
+  EliminateUselessPredicates eliminate_useless_predicates(_igvn, _ltree_root);
+  eliminate_useless_predicates.eliminate();
 }
 
 // If a post or main loop is removed due to an assert predicate, the opaque that guards the loop is not needed anymore
diff --git a/src/hotspot/share/opto/loopnode.hpp b/src/hotspot/share/opto/loopnode.hpp
index f28ad41aad5..f2ef38c5b67 100644
--- a/src/hotspot/share/opto/loopnode.hpp
+++ b/src/hotspot/share/opto/loopnode.hpp
@@ -1442,18 +1442,7 @@ public:
   void eliminate_hoisted_range_check(IfTrueNode* hoisted_check_proj, IfTrueNode* template_assertion_predicate_proj);
 
   // Helper function to collect predicate for eliminating the useless ones
-  void eliminate_useless_predicates();
-
-  void eliminate_useless_parse_predicates();
-  void mark_all_parse_predicates_useless() const;
-  void mark_loop_associated_parse_predicates_useful();
-  static void mark_useful_parse_predicates_for_loop(IdealLoopTree* loop);
-  void add_useless_parse_predicates_to_igvn_worklist();
-
-  void eliminate_useless_template_assertion_predicates();
-  void collect_useful_template_assertion_predicates(Unique_Node_List& useful_predicates);
-  static void collect_useful_template_assertion_predicates_for_loop(IdealLoopTree* loop, Unique_Node_List& useful_predicates);
-  void eliminate_useless_template_assertion_predicates(Unique_Node_List& useful_predicates) const;
+  void eliminate_useless_predicates() const;
 
   void eliminate_useless_zero_trip_guard();
   void eliminate_useless_multiversion_if();
diff --git a/src/hotspot/share/opto/node.cpp b/src/hotspot/share/opto/node.cpp
index fa836eac459..441343fb2e7 100644
--- a/src/hotspot/share/opto/node.cpp
+++ b/src/hotspot/share/opto/node.cpp
@@ -516,6 +516,9 @@ Node *Node::clone() const {
   if (n->is_ParsePredicate()) {
     C->add_parse_predicate(n->as_ParsePredicate());
   }
+  if (n->is_OpaqueTemplateAssertionPredicate()) {
+    C->add_template_assertion_predicate_opaque(n->as_OpaqueTemplateAssertionPredicate());
+  }
 
   BarrierSetC2* bs = BarrierSet::barrier_set()->barrier_set_c2();
   bs->register_potential_barrier_node(n);
@@ -612,7 +615,7 @@ void Node::destruct(PhaseValues* phase) {
     compile->remove_expensive_node(this);
   }
   if (is_OpaqueTemplateAssertionPredicate()) {
-    compile->remove_template_assertion_predicate_opaq(this);
+    compile->remove_template_assertion_predicate_opaque(as_OpaqueTemplateAssertionPredicate());
   }
   if (is_ParsePredicate()) {
     compile->remove_parse_predicate(as_ParsePredicate());
diff --git a/src/hotspot/share/opto/opaquenode.cpp b/src/hotspot/share/opto/opaquenode.cpp
index f0730374045..f6ef79a5379 100644
--- a/src/hotspot/share/opto/opaquenode.cpp
+++ b/src/hotspot/share/opto/opaquenode.cpp
@@ -112,6 +112,11 @@ const Type* OpaqueNotNullNode::Value(PhaseGVN* phase) const {
   return phase->type(in(1));
 }
 
+OpaqueTemplateAssertionPredicateNode::OpaqueTemplateAssertionPredicateNode(BoolNode* bol): Node(nullptr, bol),
+  _predicate_state(PredicateState::Useful) {
+  init_class_id(Class_OpaqueTemplateAssertionPredicate);
+}
+
 Node* OpaqueTemplateAssertionPredicateNode::Identity(PhaseGVN* phase) {
   if (!phase->C->post_loop_opts_phase()) {
     // Record Template Assertion Predicates for post loop opts IGVN. We can remove them when there is no more loop
@@ -123,7 +128,9 @@ Node* OpaqueTemplateAssertionPredicateNode::Identity(PhaseGVN* phase) {
 }
 
 const Type* OpaqueTemplateAssertionPredicateNode::Value(PhaseGVN* phase) const {
-  if (_useless || phase->C->post_loop_opts_phase()) {
+  assert(_predicate_state != PredicateState::MaybeUseful, "should only be MaybeUseful when eliminating useless "
+                                                          "predicates during loop opts");
+  if (is_useless() || phase->C->post_loop_opts_phase()) {
     // Template Assertion Predicates only serve as templates to create Initialized Assertion Predicates when splitting
     // a loop during loop opts. They are not used anymore once loop opts are over and can then be removed. They feed
     // into the bool input of an If node and can thus be replaced by the success path to let the Template Assertion
@@ -135,13 +142,13 @@ const Type* OpaqueTemplateAssertionPredicateNode::Value(PhaseGVN* phase) const {
 }
 
 void OpaqueTemplateAssertionPredicateNode::mark_useless(PhaseIterGVN& igvn) {
-  _useless = true;
+  _predicate_state = PredicateState::Useless;
   igvn._worklist.push(this);
 }
 
 #ifndef PRODUCT
 void OpaqueTemplateAssertionPredicateNode::dump_spec(outputStream* st) const {
-  if (_useless) {
+  if (is_useless()) {
     st->print("#useless ");
   }
 }
diff --git a/src/hotspot/share/opto/opaquenode.hpp b/src/hotspot/share/opto/opaquenode.hpp
index a8a0781f0cc..b15bebda636 100644
--- a/src/hotspot/share/opto/opaquenode.hpp
+++ b/src/hotspot/share/opto/opaquenode.hpp
@@ -26,8 +26,10 @@
 #define SHARE_OPTO_OPAQUENODE_HPP
 
 #include "opto/node.hpp"
-#include "opto/opcodes.hpp"
-#include "subnode.hpp"
+#include "opto/predicates_enums.hpp"
+#include "opto/subnode.hpp"
+
+enum class PredicateState;
 
 //------------------------------Opaque1Node------------------------------------
 // A node to prevent unwanted optimizations.  Allows constant folding.
@@ -149,10 +151,11 @@ class OpaqueNotNullNode : public Node {
 // after loop opts and thus is never converted to actual code. In the post loop opts IGVN phase, the
 // OpaqueTemplateAssertionPredicateNode is replaced by true in order to fold the Template Assertion Predicate away.
 class OpaqueTemplateAssertionPredicateNode : public Node {
+
   // When splitting a loop or when the associated loop dies, the Template Assertion Predicate with this
   // OpaqueTemplateAssertionPredicateNode also needs to be removed. We set this flag and then clean this node up in the
   // next IGVN phase by checking this flag in Value().
-  bool _useless;
+  PredicateState _predicate_state;
 
   // OpaqueTemplateAssertionPredicateNodes are unique to a Template Assertion Predicate expression and should never
   // common up. We still make sure of that by returning NO_HASH here.
@@ -161,10 +164,7 @@ class OpaqueTemplateAssertionPredicateNode : public Node {
   }
 
  public:
-  OpaqueTemplateAssertionPredicateNode(BoolNode* bol) : Node(nullptr, bol),
-      _useless(false) {
-    init_class_id(Class_OpaqueTemplateAssertionPredicate);
-  }
+  OpaqueTemplateAssertionPredicateNode(BoolNode* bol);
 
   virtual int Opcode() const;
   virtual uint size_of() const { return sizeof(*this); }
@@ -172,11 +172,25 @@ class OpaqueTemplateAssertionPredicateNode : public Node {
   virtual const Type* Value(PhaseGVN* phase) const;
   virtual const Type* bottom_type() const { return TypeInt::BOOL; }
 
+
   bool is_useless() const {
-    return _useless;
+    return _predicate_state == PredicateState::Useless;
   }
 
   void mark_useless(PhaseIterGVN& igvn);
+
+  void mark_maybe_useful() {
+    _predicate_state = PredicateState::MaybeUseful;
+  }
+
+  bool is_useful() const {
+    return _predicate_state == PredicateState::Useful;
+  }
+
+  void mark_useful() {
+    _predicate_state = PredicateState::Useful;
+  }
+
   NOT_PRODUCT(void dump_spec(outputStream* st) const);
 };
 
diff --git a/src/hotspot/share/opto/predicates.cpp b/src/hotspot/share/opto/predicates.cpp
index 69559edefb0..03d369f7af0 100644
--- a/src/hotspot/share/opto/predicates.cpp
+++ b/src/hotspot/share/opto/predicates.cpp
@@ -51,7 +51,7 @@ bool AssertionPredicate::is_predicate(const Node* maybe_success_proj) {
   if (!may_be_assertion_predicate_if(maybe_success_proj)) {
     return false;
   }
-  return has_assertion_predicate_opaque(maybe_success_proj) && has_halt(maybe_success_proj);
+  return has_assertion_predicate_opaque(maybe_success_proj) && has_halt(maybe_success_proj->as_IfTrue());
 }
 
 // Check if the If node of `predicate_proj` has an OpaqueTemplateAssertionPredicate (Template Assertion Predicate) or
@@ -63,8 +63,8 @@ bool AssertionPredicate::has_assertion_predicate_opaque(const Node* predicate_pr
 }
 
 // Check if the other projection (UCT projection) of `success_proj` has a Halt node as output.
-bool AssertionPredicate::has_halt(const Node* success_proj) {
-  ProjNode* other_proj = success_proj->as_IfProj()->other_if_proj();
+bool AssertionPredicate::has_halt(const IfTrueNode* success_proj) {
+  ProjNode* other_proj = success_proj->other_if_proj();
   return other_proj->outcnt() == 1 && other_proj->unique_out()->Opcode() == Op_Halt;
 }
 
@@ -90,6 +90,11 @@ ParsePredicate ParsePredicate::clone_to_unswitched_loop(Node* new_control, const
   return ParsePredicate(success_proj, _parse_predicate_node->deopt_reason());
 }
 
+// Kills this Parse Predicate by marking it useless. Will be folded away in the next IGVN round.
+void ParsePredicate::kill(PhaseIterGVN& igvn) const {
+  _parse_predicate_node->mark_useless(igvn);
+}
+
 #ifndef PRODUCT
 void ParsePredicate::trace_cloned_parse_predicate(const bool is_false_path_loop,
                                                   const ParsePredicateSuccessProj* success_proj) {
@@ -161,13 +166,16 @@ void TemplateAssertionPredicate::rewire_loop_data_dependencies(IfTrueNode* targe
   }
 }
 
-// Template Assertion Predicates always have the dedicated OpaqueTemplateAssertionPredicate to identify them.
-bool TemplateAssertionPredicate::is_predicate(const Node* node) {
-  if (!may_be_assertion_predicate_if(node)) {
+// A Template Assertion Predicate always has a dedicated OpaqueTemplateAssertionPredicate to identify it.
+bool TemplateAssertionPredicate::is_predicate(const Node* maybe_success_proj) {
+  if (!may_be_assertion_predicate_if(maybe_success_proj)) {
     return false;
   }
-  IfNode* if_node = node->in(0)->as_If();
-  return if_node->in(1)->is_OpaqueTemplateAssertionPredicate();
+  IfNode* if_node = maybe_success_proj->in(0)->as_If();
+  bool is_template_assertion_predicate = if_node->in(1)->is_OpaqueTemplateAssertionPredicate();
+  assert(!is_template_assertion_predicate || AssertionPredicate::has_halt(maybe_success_proj->as_IfTrue()),
+         "Template Assertion Predicate must have a Halt Node on the failing path");
+  return is_template_assertion_predicate;
 }
 
 // Clone this Template Assertion Predicate without modifying any OpaqueLoop*Node inputs.
@@ -293,16 +301,43 @@ void InitializedAssertionPredicate::verify() const {
 }
 #endif // ASSERT
 
-// Initialized Assertion Predicates always have the dedicated OpaqueInitiailizedAssertionPredicate node to identify
-// them.
-bool InitializedAssertionPredicate::is_predicate(const Node* node) {
-  if (!may_be_assertion_predicate_if(node)) {
+// An Initialized Assertion Predicate always has a dedicated OpaqueInitializedAssertionPredicate node to identify it.
+bool InitializedAssertionPredicate::is_predicate(const Node* maybe_success_proj) {
+  if (!may_be_assertion_predicate_if(maybe_success_proj)) {
     return false;
   }
-  IfNode* if_node = node->in(0)->as_If();
-  return if_node->in(1)->is_OpaqueInitializedAssertionPredicate();
+  IfNode* if_node = maybe_success_proj->in(0)->as_If();
+  bool is_initialized_assertion_predicate = if_node->in(1)->is_OpaqueInitializedAssertionPredicate();
+  assert(!is_initialized_assertion_predicate || has_halt(maybe_success_proj->as_IfTrue()),
+         "Initialized Assertion Predicate must have a Halt Node on the failing path");
+  return is_initialized_assertion_predicate;
 }
 
+#ifdef ASSERT
+bool InitializedAssertionPredicate::has_halt(const IfTrueNode* success_proj) {
+  ProjNode* other_proj = success_proj->other_if_proj();
+  if (other_proj->outcnt() != 1) {
+    return false;
+  }
+
+  Node* out = other_proj->unique_out();
+  // Either the Halt node is directly the unique output.
+  if (out->is_Halt()) {
+    return true;
+  }
+  // Or we have a Region that merges serval paths to a single Halt node. Even though OpaqueInitializedAssertionPredicate
+  // nodes do not common up (i.e. NO_HASH), we could have Initialized Assertion Predicates from already folded loops
+  // being now part of the innermost loop. When then further splitting this loop, we could be cloning the If node
+  // of the Initialized Assertion Predicate (part of the loop body) while the OpaqueInitializedAssertionPredicate is not
+  // cloned because it's outside the loop body. We end up sharing the OpaqueInitializedAssertionPredicate between the
+  // original and the cloned If. This should be fine.
+  if (out->is_Region() && out->outcnt() == 2) {
+    return out->find_out_with(Op_Halt);
+  }
+  return false;
+}
+#endif // ASSERT
+
 // Kills this Initialized Assertion Predicate by marking the associated OpaqueInitializedAssertionPredicate node useless.
 // It will then be folded away in the next IGVN round.
 void InitializedAssertionPredicate::kill(PhaseIterGVN& igvn) const {
@@ -619,7 +654,7 @@ class AssertionPredicateExpressionCreator : public StackObj {
  private:
   OpaqueTemplateAssertionPredicateNode* create_opaque_node(Node* new_control, BoolNode* bool_for_expression) const {
     OpaqueTemplateAssertionPredicateNode* new_expression = new OpaqueTemplateAssertionPredicateNode(bool_for_expression);
-    _phase->C->add_template_assertion_predicate_opaq(new_expression);
+    _phase->C->add_template_assertion_predicate_opaque(new_expression);
     _phase->register_new_node(new_expression, new_control);
     return new_expression;
   }
@@ -1135,3 +1170,81 @@ void UpdateStrideForAssertionPredicates::connect_initialized_assertion_predicate
     _phase->replace_control(new_control_out, initialized_assertion_predicate_success_proj);
   }
 }
+
+// Do the following to find and eliminate useless Parse and Template Assertion Predicates:
+// 1. Mark all Parse and Template Assertion Predicates "maybe useful".
+// 2. Walk through the loop tree and iterate over all Predicates above each loop head. All found Parse and Template
+//    Assertion Predicates are marked "useful".
+// 3. Those Parse and Template Assertion Predicates that are still marked "maybe useful" are now marked "useless" and
+//    removed in the next round of IGVN.
+//
+// Note that we only mark Predicates useless and not actually replace them now. We leave this work for IGVN which is
+// better suited for this kind of graph surgery. We also not want to replace conditions with a constant to avoid
+// interference with Predicate matching code when iterating through them.
+void EliminateUselessPredicates::eliminate() const {
+  mark_all_predicates_maybe_useful();
+  if (C->has_loops()) {
+    mark_loop_associated_predicates_useful();
+  }
+  mark_maybe_useful_predicates_useless();
+}
+
+void EliminateUselessPredicates::mark_all_predicates_maybe_useful() const {
+  mark_predicates_on_list_maybe_useful(_parse_predicates);
+  mark_predicates_on_list_maybe_useful(_template_assertion_predicate_opaques);
+}
+
+template<class PredicateList>
+void EliminateUselessPredicates::mark_predicates_on_list_maybe_useful(const PredicateList& predicate_list) {
+  for (int i = 0; i < predicate_list.length(); i++) {
+    predicate_list.at(i)->mark_maybe_useful();
+  }
+}
+
+void EliminateUselessPredicates::mark_loop_associated_predicates_useful() const {
+  for (LoopTreeIterator iterator(_ltree_root); !iterator.done(); iterator.next()) {
+    IdealLoopTree* loop = iterator.current();
+    if (loop->can_apply_loop_predication()) {
+      mark_useful_predicates_for_loop(loop);
+    }
+  }
+}
+
+// This visitor marks all visited Parse and Template Assertion Predicates useful.
+class PredicateUsefulMarkerVisitor : public PredicateVisitor {
+ public:
+  using PredicateVisitor::visit;
+
+  void visit(const ParsePredicate& parse_predicate) override {
+    parse_predicate.head()->mark_useful();
+  }
+
+  // We actually mark the associated OpaqueTemplateAssertionPredicate node useful.
+  void visit(const TemplateAssertionPredicate& template_assertion_predicate) override {
+    template_assertion_predicate.opaque_node()->mark_useful();
+  }
+};
+
+void EliminateUselessPredicates::mark_useful_predicates_for_loop(IdealLoopTree* loop) {
+  Node* loop_entry = loop->_head->as_Loop()->skip_strip_mined()->in(LoopNode::EntryControl);
+  const PredicateIterator predicate_iterator(loop_entry);
+  PredicateUsefulMarkerVisitor predicate_useful_marker_visitor;
+  predicate_iterator.for_each(predicate_useful_marker_visitor);
+}
+
+// All Predicates still being marked MaybeUseful could not be found and thus are now marked useless.
+void EliminateUselessPredicates::mark_maybe_useful_predicates_useless() const {
+  mark_maybe_useful_predicates_on_list_useless(_parse_predicates);
+  mark_maybe_useful_predicates_on_list_useless(_template_assertion_predicate_opaques);
+}
+
+template<class PredicateList>
+void EliminateUselessPredicates::mark_maybe_useful_predicates_on_list_useless(
+    const PredicateList& predicate_list) const {
+  for (int i = 0; i < predicate_list.length(); i++) {
+    auto predicate_node = predicate_list.at(i);
+    if (!predicate_node->is_useful()) {
+      predicate_node->mark_useless(_igvn);
+    }
+  }
+}
diff --git a/src/hotspot/share/opto/predicates.hpp b/src/hotspot/share/opto/predicates.hpp
index aff72d38831..3d1cbe3a89c 100644
--- a/src/hotspot/share/opto/predicates.hpp
+++ b/src/hotspot/share/opto/predicates.hpp
@@ -27,6 +27,7 @@
 
 #include "opto/cfgnode.hpp"
 #include "opto/opaquenode.hpp"
+#include "opto/predicates_enums.hpp"
 
 class IdealLoopTree;
 class InitializedAssertionPredicate;
@@ -200,16 +201,6 @@ class TemplateAssertionPredicate;
  * Main Loop Head
  */
 
-// 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 {
-  None, // Not an Assertion Predicate
-  InitValue,
-  LastValue,
-  // Used for the Initialized Assertion Predicate emitted during Range Check Elimination for the final IV value.
-  FinalIv
-};
-
 // Interface to represent a C2 predicate. A predicate is always represented by two CFG nodes:
 // - An If node (head)
 // - An IfProj node representing the success projection of the If node (tail).
@@ -273,9 +264,10 @@ class AssertionPredicates : public StackObj {
 // - An Initialized Assertion Predicate.
 class AssertionPredicate : public StackObj {
   static bool has_assertion_predicate_opaque(const Node* predicate_proj);
-  static bool has_halt(const Node* success_proj);
+
  public:
   static bool is_predicate(const Node* maybe_success_proj);
+  static bool has_halt(const IfTrueNode* success_proj);
 };
 
 // Utility class representing a Regular Predicate which is either a Runtime Predicate or an Assertion Predicate.
@@ -311,10 +303,11 @@ class ParsePredicate : public Predicate {
     return _entry;
   }
 
-  // This Parse Predicate is valid if the node passed to the constructor is a projection of a ParsePredicateNode and the
-  // deopt_reason of the uncommon trap of the ParsePredicateNode matches the passed deopt_reason to the constructor.
+  // This Parse Predicate is valid if the node passed to the constructor is a projection of a ParsePredicateNode, the
+  // deopt_reason of the uncommon trap of the ParsePredicateNode matches the passed deopt_reason to the constructor and
+  // the ParsePredicateNode is not marked useless.
   bool is_valid() const {
-    return _parse_predicate_node != nullptr;
+    return _parse_predicate_node != nullptr && !_parse_predicate_node->is_useless();
   }
 
   ParsePredicateNode* head() const override {
@@ -330,11 +323,7 @@ class ParsePredicate : public Predicate {
   ParsePredicate clone_to_unswitched_loop(Node* new_control, bool is_false_path_loop,
                                           PhaseIdealLoop* phase) const;
 
-  // Kills this Parse Predicate by marking it useless. Will be folded away in the next IGVN round.
-  void kill(const PhaseIterGVN& igvn) const {
-    _parse_predicate_node->mark_useless();
-    igvn._worklist.push(_parse_predicate_node);
-  }
+  void kill(PhaseIterGVN& igvn) const;
 };
 
 // Class to represent a Runtime Predicate which always has an associated UCT on the failing path.
@@ -433,6 +422,8 @@ class InitializedAssertionPredicate : public Predicate {
   IfTrueNode* const _success_proj;
   IfNode* const _if_node;
 
+  DEBUG_ONLY(static bool has_halt(const IfTrueNode* success_proj);)
+
  public:
   explicit InitializedAssertionPredicate(IfTrueNode* success_proj)
       : _success_proj(success_proj),
@@ -1237,4 +1228,36 @@ class UpdateStrideForAssertionPredicates : public PredicateVisitor {
   void visit(const TemplateAssertionPredicate& template_assertion_predicate) override;
   void visit(const InitializedAssertionPredicate& initialized_assertion_predicate) override;
 };
+
+// Eliminate all useless Parse and Template Assertion Predicates. They become useless when they can no longer be found
+// from a loop head. We mark these useless to clean them up later during IGVN. A Predicate that is marked useless will
+// no longer be visited by a PredicateVisitor.
+class EliminateUselessPredicates : public StackObj {
+  Compile* const C;
+  const GrowableArray<ParsePredicateNode*>& _parse_predicates;
+  const GrowableArray<OpaqueTemplateAssertionPredicateNode*>& _template_assertion_predicate_opaques;
+  PhaseIterGVN& _igvn;
+  IdealLoopTree* const _ltree_root;
+
+  void mark_all_predicates_maybe_useful() const;
+  template <class PredicateList>
+  static void mark_predicates_on_list_maybe_useful(const PredicateList& predicate_list);
+
+  void mark_loop_associated_predicates_useful() const;
+  static void mark_useful_predicates_for_loop(IdealLoopTree* loop);
+
+  void mark_maybe_useful_predicates_useless() const;
+  template <class PredicateList>
+  void mark_maybe_useful_predicates_on_list_useless(const PredicateList& predicate_list) const;
+
+ public:
+  EliminateUselessPredicates(PhaseIterGVN& igvn, IdealLoopTree* ltree_root)
+      : C(igvn.C), _parse_predicates(igvn.C->parse_predicates()),
+        _template_assertion_predicate_opaques(igvn.C->template_assertion_predicate_opaques()),
+        _igvn(igvn),
+        _ltree_root(ltree_root) {}
+
+  void eliminate() const;
+};
+
 #endif // SHARE_OPTO_PREDICATES_HPP
diff --git a/src/hotspot/share/opto/predicates_enums.hpp b/src/hotspot/share/opto/predicates_enums.hpp
new file mode 100644
index 00000000000..b051b2c416b
--- /dev/null
+++ b/src/hotspot/share/opto/predicates_enums.hpp
@@ -0,0 +1,54 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please 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_OPTO_PREDICATES_ENUMS_HPP
+#define SHARE_OPTO_PREDICATES_ENUMS_HPP
+
+// The success projection of a Parse Predicate is always an IfTrueNode and the uncommon projection an IfFalseNode
+typedef IfTrueNode ParsePredicateSuccessProj;
+typedef IfFalseNode ParsePredicateUncommonProj;
+
+// 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 {
+  None, // Not an Assertion Predicate
+  InitValue,
+  LastValue,
+  // Used for the Initialized Assertion Predicate emitted during Range Check Elimination for the final IV value.
+  FinalIv
+};
+
+enum class PredicateState {
+  // The Predicate is useless and will be cleaned up in the next round of IGVN. A useless Predicate is not visited
+  // anymore by PredicateVisitors. If a Predicate loses its connection to a loop head, it will be marked useless by
+  // EliminateUselessPredicates and cleaned up by the Value() methods of the associated Predicate IR nodes.
+  Useless,
+  // This state is used by EliminateUselessPredicates to temporarily mark a Predicate as neither useless nor useful.
+  // Outside EliminateUselessPredicates, a Predicate should never be MaybeUseful.
+  MaybeUseful,
+  // Default state: The Predicate is useful and will be visited by PredicateVisitors.
+  Useful
+};
+
+#endif // SHARE_OPTO_PREDICATES_ENUMS_HPP

From c2be19c261ba45df29865077b511c49bb61433a6 Mon Sep 17 00:00:00 2001
From: Hamlin Li <mli@openjdk.org>
Date: Wed, 19 Mar 2025 09:42:22 +0000
Subject: [PATCH 398/587] 8351902: RISC-V: Several tests fail after JDK-8351145

Reviewed-by: rehn, fyang, syan
---
 .../sha/cli/TestUseMD5IntrinsicsOptionOnSupportedCPU.java       | 2 ++
 .../sha/cli/TestUseSHA1IntrinsicsOptionOnSupportedCPU.java      | 2 ++
 .../intrinsics/sha/cli/TestUseSHAOptionOnSupportedCPU.java      | 2 ++
 3 files changed, 6 insertions(+)

diff --git a/test/hotspot/jtreg/compiler/intrinsics/sha/cli/TestUseMD5IntrinsicsOptionOnSupportedCPU.java b/test/hotspot/jtreg/compiler/intrinsics/sha/cli/TestUseMD5IntrinsicsOptionOnSupportedCPU.java
index 3561be3b33b..eeff351f737 100644
--- a/test/hotspot/jtreg/compiler/intrinsics/sha/cli/TestUseMD5IntrinsicsOptionOnSupportedCPU.java
+++ b/test/hotspot/jtreg/compiler/intrinsics/sha/cli/TestUseMD5IntrinsicsOptionOnSupportedCPU.java
@@ -25,8 +25,10 @@
  * @test
  * @bug 8035968
  * @summary Verify UseMD5Intrinsics option processing on supported CPU.
+ *          ( Disable this test on riscv, because on riscv UseMD5Intrinsics depends on !AvoidUnalignedAccesses. )
  * @library /test/lib /
  * @requires vm.flagless
+ * @requires os.arch != "riscv64"
  *
  * @build jdk.test.whitebox.WhiteBox
  * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox
diff --git a/test/hotspot/jtreg/compiler/intrinsics/sha/cli/TestUseSHA1IntrinsicsOptionOnSupportedCPU.java b/test/hotspot/jtreg/compiler/intrinsics/sha/cli/TestUseSHA1IntrinsicsOptionOnSupportedCPU.java
index 71ed3b3cac9..1ce2c4b1f87 100644
--- a/test/hotspot/jtreg/compiler/intrinsics/sha/cli/TestUseSHA1IntrinsicsOptionOnSupportedCPU.java
+++ b/test/hotspot/jtreg/compiler/intrinsics/sha/cli/TestUseSHA1IntrinsicsOptionOnSupportedCPU.java
@@ -25,8 +25,10 @@
  * @test
  * @bug 8035968
  * @summary Verify UseSHA1Intrinsics option processing on supported CPU.
+ *          ( Disable this test on riscv, because on riscv UseSHA1Intrinsics depends on !AvoidUnalignedAccesses. )
  * @library /test/lib /
  * @requires vm.flagless
+ * @requires os.arch != "riscv64"
  *
  * @build jdk.test.whitebox.WhiteBox
  * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox
diff --git a/test/hotspot/jtreg/compiler/intrinsics/sha/cli/TestUseSHAOptionOnSupportedCPU.java b/test/hotspot/jtreg/compiler/intrinsics/sha/cli/TestUseSHAOptionOnSupportedCPU.java
index 55b17e597c3..5324cc6b210 100644
--- a/test/hotspot/jtreg/compiler/intrinsics/sha/cli/TestUseSHAOptionOnSupportedCPU.java
+++ b/test/hotspot/jtreg/compiler/intrinsics/sha/cli/TestUseSHAOptionOnSupportedCPU.java
@@ -25,8 +25,10 @@
  * @test
  * @bug 8035968
  * @summary Verify UseSHA option processing on supported CPU.
+ *          ( Disable this test on riscv, because on riscv UseSHA could depend UseSHA1Intrinsics which depends on !AvoidUnalignedAccesses. )
  * @library /test/lib /
  * @requires vm.flagless
+ * @requires os.arch != "riscv64"
  *
  * @build jdk.test.whitebox.WhiteBox
  * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox

From 8f64ccc01b8c692b59e81255c59c333cc23e834d Mon Sep 17 00:00:00 2001
From: Saranya Natarajan <saranya.natarajan@oracle.com>
Date: Wed, 19 Mar 2025 09:59:15 +0000
Subject: [PATCH 399/587] 8350485: C2: factor out common code in Node::grow()
 and Node::out_grow()

Reviewed-by: thartmann, rcastanedalo
---
 src/hotspot/share/opto/node.cpp | 66 ++++++++++++++-------------------
 src/hotspot/share/opto/node.hpp |  5 ++-
 2 files changed, 32 insertions(+), 39 deletions(-)

diff --git a/src/hotspot/share/opto/node.cpp b/src/hotspot/share/opto/node.cpp
index 441343fb2e7..37f6e95d502 100644
--- a/src/hotspot/share/opto/node.cpp
+++ b/src/hotspot/share/opto/node.cpp
@@ -675,55 +675,45 @@ void Node::destruct(PhaseValues* phase) {
   }
 }
 
-//------------------------------grow-------------------------------------------
-// Grow the input array, making space for more edges
-void Node::grow(uint len) {
+// Resize input or output array to grow it to the next larger power-of-2 bigger
+// than len.
+void Node::resize_array(Node**& array, node_idx_t& max_size, uint len, bool needs_clearing) {
   Arena* arena = Compile::current()->node_arena();
-  uint new_max = _max;
-  if( new_max == 0 ) {
-    _max = 4;
-    _in = (Node**)arena->Amalloc(4*sizeof(Node*));
-    Node** to = _in;
-    to[0] = nullptr;
-    to[1] = nullptr;
-    to[2] = nullptr;
-    to[3] = nullptr;
+  uint new_max = max_size;
+  if (new_max == 0) {
+    max_size = 4;
+    array = (Node**)arena->Amalloc(4 * sizeof(Node*));
+    if (needs_clearing) {
+      array[0] = nullptr;
+      array[1] = nullptr;
+      array[2] = nullptr;
+      array[3] = nullptr;
+    }
     return;
   }
   new_max = next_power_of_2(len);
-  // Trimming to limit allows a uint8 to handle up to 255 edges.
-  // Previously I was using only powers-of-2 which peaked at 128 edges.
-  //if( new_max >= limit ) new_max = limit-1;
-  _in = (Node**)arena->Arealloc(_in, _max*sizeof(Node*), new_max*sizeof(Node*));
-  Copy::zero_to_bytes(&_in[_max], (new_max-_max)*sizeof(Node*)); // null all new space
-  _max = new_max;               // Record new max length
+  assert(needs_clearing || (array != nullptr && array != NO_OUT_ARRAY), "out must have sensible value");
+  array = (Node**)arena->Arealloc(array, max_size * sizeof(Node*), new_max * sizeof(Node*));
+  if (needs_clearing) {
+    Copy::zero_to_bytes(&array[max_size], (new_max - max_size) * sizeof(Node*)); // null all new space
+  }
+  max_size = new_max;               // Record new max length
   // This assertion makes sure that Node::_max is wide enough to
   // represent the numerical value of new_max.
-  assert(_max == new_max && _max > len, "int width of _max is too small");
+  assert(max_size > len, "int width of _max or _outmax is too small");
+}
+
+//------------------------------grow-------------------------------------------
+// Grow the input array, making space for more edges
+void Node::grow(uint len) {
+  resize_array(_in, _max, len, true);
 }
 
 //-----------------------------out_grow----------------------------------------
 // Grow the input array, making space for more edges
-void Node::out_grow( uint len ) {
+void Node::out_grow(uint len) {
   assert(!is_top(), "cannot grow a top node's out array");
-  Arena* arena = Compile::current()->node_arena();
-  uint new_max = _outmax;
-  if( new_max == 0 ) {
-    _outmax = 4;
-    _out = (Node **)arena->Amalloc(4*sizeof(Node*));
-    return;
-  }
-  new_max = next_power_of_2(len);
-  // Trimming to limit allows a uint8 to handle up to 255 edges.
-  // Previously I was using only powers-of-2 which peaked at 128 edges.
-  //if( new_max >= limit ) new_max = limit-1;
-  assert(_out != nullptr && _out != NO_OUT_ARRAY, "out must have sensible value");
-  _out = (Node**)arena->Arealloc(_out,_outmax*sizeof(Node*),new_max*sizeof(Node*));
-  //Copy::zero_to_bytes(&_out[_outmax], (new_max-_outmax)*sizeof(Node*)); // null all new space
-  _outmax = new_max;               // Record new max length
-  // This assertion makes sure that Node::_max is wide enough to
-  // represent the numerical value of new_max.
-  assert(_outmax == new_max && _outmax > len, "int width of _outmax is too small");
+  resize_array(_out, _outmax, len, false);
 }
 
 #ifdef ASSERT
diff --git a/src/hotspot/share/opto/node.hpp b/src/hotspot/share/opto/node.hpp
index f128a2eca1d..32478961ba1 100644
--- a/src/hotspot/share/opto/node.hpp
+++ b/src/hotspot/share/opto/node.hpp
@@ -335,8 +335,11 @@ protected:
   void grow( uint len );
   // Grow the output array to the next larger power-of-2 bigger than len.
   void out_grow( uint len );
+  // Resize input or output array to grow it to the next larger power-of-2
+  // bigger than len.
+  void resize_array(Node**& array, node_idx_t& max_size, uint len, bool needs_clearing);
 
- public:
+public:
   // Each Node is assigned a unique small/dense number. This number is used
   // to index into auxiliary arrays of data and bit vectors.
   // The value of _idx can be changed using the set_idx() method.

From fed34e46b89bc9b0462d9b5f5e5ab5516fe18c6e Mon Sep 17 00:00:00 2001
From: Dmitry Chuyko <dchuyko@openjdk.org>
Date: Wed, 19 Mar 2025 11:35:26 +0000
Subject: [PATCH 400/587] 8351933: Inaccurate masking of TC subfield decrement
 in ForkJoinPool

Reviewed-by: dl, alanb, liach
---
 .../share/classes/java/util/concurrent/ForkJoinPool.java       | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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 73fa3eea1bd..61e9f0e3ffa 100644
--- a/src/java.base/share/classes/java/util/concurrent/ForkJoinPool.java
+++ b/src/java.base/share/classes/java/util/concurrent/ForkJoinPool.java
@@ -2077,7 +2077,8 @@ public class ForkJoinPool extends AbstractExecutorService {
         else if (deadline - System.currentTimeMillis() >= TIMEOUT_SLOP)
             stat = 0;                       // spurious wakeup
         else if (!compareAndSetCtl(
-                     c, nc = (w.stackPred & LMASK) | (UMASK & (c - TC_UNIT))))
+                     c, nc = ((w.stackPred & LMASK) | (RC_MASK & c) |
+                               (TC_MASK & (c - TC_UNIT)))))
             stat = -1;                      // lost race to signaller
         else {
             stat = 1;

From c7f333888be052aa37fe878bfc2785fc47fbeaaa Mon Sep 17 00:00:00 2001
From: Manukumar V S <mvs@openjdk.org>
Date: Wed, 19 Mar 2025 15:25:22 +0000
Subject: [PATCH 401/587] 8352109: java/awt/Desktop/MailTest.java fails in
 platforms where Action.MAIL is not supported

Reviewed-by: aivanov
---
 test/jdk/java/awt/Desktop/MailTest.java | 42 ++++++++++++-------------
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/test/jdk/java/awt/Desktop/MailTest.java b/test/jdk/java/awt/Desktop/MailTest.java
index 15e5c0769a0..2775a671310 100644
--- a/test/jdk/java/awt/Desktop/MailTest.java
+++ b/test/jdk/java/awt/Desktop/MailTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -21,21 +21,23 @@
  * questions.
  */
 
-/*
- * @test
- * @bug 6255196
- * @summary Verifies the function of methods mail() and mail(java.net.URI uri).
- * @library /java/awt/regtesthelpers
- * @build PassFailJFrame
- * @run main/manual MailTest
- */
-
 import java.awt.Desktop;
 import java.io.IOException;
 import java.lang.reflect.InvocationTargetException;
 import java.net.URI;
 import javax.swing.JPanel;
 
+import jtreg.SkippedException;
+
+/*
+ * @test
+ * @bug 6255196
+ * @summary Verifies the function of methods mail() and mail(java.net.URI uri).
+ * @library /java/awt/regtesthelpers /test/lib
+ * @build PassFailJFrame jtreg.SkippedException
+ * @run main/manual MailTest
+ */
+
 public class MailTest extends JPanel {
 
     static final String INSTRUCTIONS = """
@@ -48,18 +50,7 @@ public class MailTest extends JPanel {
             """;
 
     private MailTest() {
-        if (!Desktop.isDesktopSupported()) {
-            PassFailJFrame.log("Class java.awt.Desktop is not supported on " +
-                    "current platform. Farther testing will not be performed");
-            PassFailJFrame.forcePass();
-        }
-
         Desktop desktop = Desktop.getDesktop();
-        if (!desktop.isSupported(Desktop.Action.MAIL)) {
-            PassFailJFrame.log("Action.MAIL is not supported.");
-            PassFailJFrame.forcePass();
-        }
-
         /*
          * Part 1: launch the mail composing window without a mailto URI.
          */
@@ -103,6 +94,15 @@ public class MailTest extends JPanel {
 
     public static void main(String[] args) throws InterruptedException,
             InvocationTargetException {
+        if (!Desktop.isDesktopSupported()) {
+            throw new SkippedException("Class java.awt.Desktop is not supported " +
+                    "on current platform. Further testing will not be performed");
+        }
+
+        if (!Desktop.getDesktop().isSupported(Desktop.Action.MAIL)) {
+            throw new SkippedException("Action.MAIL is not supported.");
+        }
+
         PassFailJFrame.builder()
                 .title("Mail Test")
                 .splitUI(MailTest::new)

From 8e999b83a42a163800a5895268943e7077a4b7cc Mon Sep 17 00:00:00 2001
From: Joe Wang <joehw@openjdk.org>
Date: Wed, 19 Mar 2025 16:37:05 +0000
Subject: [PATCH 402/587] 8351969: Add Public Identifiers to the JDK built-in
 Catalog

Reviewed-by: rriggs, lancea, iris, naoto
---
 .../xml/internal/jdkcatalog/JDKCatalog.xml    |  15 +-
 .../jdkcatalog/w3c/dtd/schema10/XMLSchema.dtd | 247 +++++-------------
 .../jdkcatalog/w3c/dtd/schema10/datatypes.dtd |  41 +--
 .../common/jdkcatalog/JDKCatalogTest.java     |  74 ++++--
 4 files changed, 143 insertions(+), 234 deletions(-)

diff --git a/src/java.xml/share/classes/jdk/xml/internal/jdkcatalog/JDKCatalog.xml b/src/java.xml/share/classes/jdk/xml/internal/jdkcatalog/JDKCatalog.xml
index 74ba0032501..65aa754c38b 100644
--- a/src/java.xml/share/classes/jdk/xml/internal/jdkcatalog/JDKCatalog.xml
+++ b/src/java.xml/share/classes/jdk/xml/internal/jdkcatalog/JDKCatalog.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 /*
- * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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,10 @@
         <system systemId="http://java.sun.com/dtd/preferences.dtd" uri="preferences.dtd"/>
         <system systemId="http://java.sun.com/dtd/properties.dtd" uri="properties.dtd"/>
     </group>
-    
+
     <!-- W3C DTDs -->
     <group id="xhtml11" prefer = "system" xml:base = "w3c/dtd/xhtml11/">
+        <public publicId="-//W3C//DTD XHTML 1.1//EN" uri="xhtml11.dtd"/>
         <system systemId="http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd" uri="xhtml11.dtd"/>
         <systemSuffix systemIdSuffix="xhtml-attribs-1.mod" uri="xhtml-attribs-1.mod"/>
         <systemSuffix systemIdSuffix="xhtml-base-1.mod" uri="xhtml-base-1.mod"/>
@@ -81,8 +82,11 @@
         <systemSuffix systemIdSuffix="xhtml-text-1.mod" uri="xhtml-text-1.mod"/>
         <systemSuffix systemIdSuffix="xhtml11-model-1.mod" uri="xhtml11-model-1.mod"/>
     </group>
-    
+
     <group id="xhtml1" prefer = "system" xml:base = "w3c/dtd/xhtml10/">
+        <public publicId="-//W3C//DTD XHTML 1.0 Strict//EN" uri="xhtml1-strict.dtd"/>
+        <public publicId="-//W3C//DTD XHTML 1.0 Transitional//EN" uri="xhtml1-transitional.dtd"/>
+        <public publicId="-//W3C//DTD XHTML 1.0 Frameset//EN" uri="xhtml1-frameset.dtd"/>
         <systemSuffix systemIdSuffix="xhtml1-strict.dtd" uri="xhtml1-strict.dtd"/>
         <systemSuffix systemIdSuffix="xhtml1-transitional.dtd" uri="xhtml1-transitional.dtd"/>
         <systemSuffix systemIdSuffix="xhtml1-frameset.dtd" uri="xhtml1-frameset.dtd"/>
@@ -97,11 +101,12 @@
         <public publicId="datatypes" uri="datatypes.dtd"/>
         <public publicId="-//W3C//DTD XMLSCHEMA 200102//EN" uri="XMLSchema.dtd"/>
     </group>
-    
+
     <group id="xmlspec" prefer = "system" xml:base = "w3c/dtd/">
+        <public publicId="-//W3C//DTD Specification V2.10//EN" uri="xmlspec2_10/xmlspec.dtd"/>
         <system systemId="http://www.w3.org/2002/xmlspec/dtd/2.10/xmlspec.dtd" uri="xmlspec2_10/xmlspec.dtd"/>
     </group>
-    
+
     <!-- W3C XSDs -->
     <group id="w3cxsd" prefer = "system" xml:base = "w3c/xsd/">
         <systemSuffix systemIdSuffix="XMLSchema.xsd" uri="schema10/XMLSchema.xsd"/>
diff --git a/src/java.xml/share/classes/jdk/xml/internal/jdkcatalog/w3c/dtd/schema10/XMLSchema.dtd b/src/java.xml/share/classes/jdk/xml/internal/jdkcatalog/w3c/dtd/schema10/XMLSchema.dtd
index 64aa2d97019..3481ba68d24 100644
--- a/src/java.xml/share/classes/jdk/xml/internal/jdkcatalog/w3c/dtd/schema10/XMLSchema.dtd
+++ b/src/java.xml/share/classes/jdk/xml/internal/jdkcatalog/w3c/dtd/schema10/XMLSchema.dtd
@@ -1,21 +1,23 @@
-<!-- DTD for XML Schema Definition Language Part 1: Structures
-     Public Identifier: "-//W3C//DTD XSD 1.1//EN"
-     Official Location: http://www.w3.org/2009/XMLSchema/XMLSchema.dtd -->
-<!-- Id: structures.dtd,v 1.1 2003/08/28 13:30:52 ht Exp  -->
+<!-- DTD for XML Schemas: Part 1: Structures
+     Public Identifier: "-//W3C//DTD XMLSCHEMA 200102//EN"
+     Official Location: http://www.w3.org/2001/XMLSchema.dtd -->
+<!-- $Id: XMLSchema.dtd,v 1.31 2001/10/24 15:50:16 ht Exp $ -->
+<!-- Note this DTD is NOT normative, or even definitive. -->           <!--d-->
+<!-- prose copy in the structures REC is the definitive version -->    <!--d-->
+<!-- (which shouldn't differ from this one except for this -->         <!--d-->
+<!-- comment and entity expansions, but just in case) -->              <!--d-->
 <!-- With the exception of cases with multiple namespace
-     prefixes for the XSD namespace, any XML document which is
+     prefixes for the XML Schema namespace, any XML document which is
      not valid per this DTD given redefinitions in its internal subset of the
      'p' and 's' parameter entities below appropriate to its namespace
-     declaration of the XSD namespace is almost certainly not
-     a valid schema document. -->
+     declaration of the XML Schema namespace is almost certainly not
+     a valid schema. -->
 
-<!-- See below (at the bottom of this document) for information about
-      the revision and namespace-versioning policy governing this DTD. -->
 <!-- The simpleType element and its constituent parts
-     are defined in XML Schema Definition Language Part 2: Datatypes -->
-<!ENTITY % xs-datatypes PUBLIC '-//W3C//DTD XSD 1.1 Datatypes//EN' 'datatypes.dtd' >
+     are defined in XML Schema: Part 2: Datatypes -->
+<!ENTITY % xs-datatypes PUBLIC 'datatypes' 'datatypes.dtd' >
 
-<!ENTITY % p 'xs:'> <!-- can be overridden in the internal subset of a
+<!ENTITY % p 'xs:'> <!-- can be overriden in the internal subset of a
                          schema document to establish a different
                          namespace prefix -->
 <!ENTITY % s ':xs'> <!-- if %p is defined (e.g. as foo:) then you must
@@ -25,14 +27,11 @@
 
 <!-- Define all the element names, with optional prefix -->
 <!ENTITY % schema "%p;schema">
-<!ENTITY % defaultOpenContent "%p;defaultOpenContent">
 <!ENTITY % complexType "%p;complexType">
 <!ENTITY % complexContent "%p;complexContent">
-<!ENTITY % openContent "%p;openContent">
 <!ENTITY % simpleContent "%p;simpleContent">
 <!ENTITY % extension "%p;extension">
 <!ENTITY % element "%p;element">
-<!ENTITY % alternative "%p;alternative">
 <!ENTITY % unique "%p;unique">
 <!ENTITY % key "%p;key">
 <!ENTITY % keyref "%p;keyref">
@@ -49,10 +48,7 @@
 <!ENTITY % include "%p;include">
 <!ENTITY % import "%p;import">
 <!ENTITY % redefine "%p;redefine">
-<!ENTITY % override "%p;override">
 <!ENTITY % notation "%p;notation">
-<!ENTITY % assert   "%p;assert">
-
 
 <!-- annotation elements -->
 <!ENTITY % annotation "%p;annotation">
@@ -61,14 +57,11 @@
 
 <!-- Customisation entities for the ATTLIST of each element type.
      Define one of these if your schema takes advantage of the
-     anyAttribute='##other' in the
-     schema for schema documents -->
+     anyAttribute='##other' in the schema for schemas -->
 
 <!ENTITY % schemaAttrs ''>
-<!ENTITY % defaultOpenContentAttrs ''>
 <!ENTITY % complexTypeAttrs ''>
 <!ENTITY % complexContentAttrs ''>
-<!ENTITY % openContentAttrs ''>
 <!ENTITY % simpleContentAttrs ''>
 <!ENTITY % extensionAttrs ''>
 <!ENTITY % elementAttrs ''>
@@ -85,12 +78,9 @@
 <!ENTITY % keyrefAttrs ''>
 <!ENTITY % selectorAttrs ''>
 <!ENTITY % fieldAttrs ''>
-<!ENTITY % assertAttrs ''>
-
 <!ENTITY % includeAttrs ''>
 <!ENTITY % importAttrs ''>
 <!ENTITY % redefineAttrs ''>
-<!ENTITY % overrideAttrs ''>
 <!ENTITY % notationAttrs ''>
 <!ENTITY % annotationAttrs ''>
 <!ENTITY % appinfoAttrs ''>
@@ -102,7 +92,6 @@
       <!-- #all or space-separated list drawn from
                       derivationChoice + 'substitution' -->
 
-<!ENTITY % composition '%include; | %import; | %override; | %redefine;'>
 <!ENTITY % mgs '%all; | %choice; | %sequence;'>
 <!ENTITY % cs '%choice; | %sequence;'>
 <!ENTITY % formValues '(qualified|unqualified)'>
@@ -110,20 +99,16 @@
 
 <!ENTITY % attrDecls    '((%attribute;| %attributeGroup;)*,(%anyAttribute;)?)'>
 
-<!ENTITY % assertions   '(%assert;)*'>
-
-<!ENTITY % particleAndAttrs '(%openContent;?, (%mgs; | %group;)?,
-                              %attrDecls;, %assertions;)'>
+<!ENTITY % particleAndAttrs '((%mgs; | %group;)?, %attrDecls;)'>
 
 <!-- This is used in part2 -->
-<!ENTITY % restriction1 '(%openContent;?, (%mgs; | %group;)?)'>
+<!ENTITY % restriction1 '((%mgs; | %group;)?)'>
 
 %xs-datatypes;
 
 <!-- the duplication below is to produce an unambiguous content model
      which allows annotation everywhere -->
-<!ELEMENT %schema; ((%composition; | %annotation;)*,
-                    (%defaultOpenContent;, (%annotation;)*)?,
+<!ELEMENT %schema; ((%include; | %import; | %redefine; | %annotation;)*,
                     ((%simpleType; | %complexType;
                       | %element; | %attribute;
                       | %attributeGroup; | %group;
@@ -139,28 +124,18 @@
    id                   ID                     #IMPLIED
    elementFormDefault   %formValues;           'unqualified'
    attributeFormDefault %formValues;           'unqualified'
-   defaultAttributes    CDATA                  #IMPLIED
-   xpathDefaultNamespace    CDATA       '##local'
    xml:lang             CDATA                  #IMPLIED
    %schemaAttrs;>
-<!-- Note the xmlns declaration is NOT in the
-     schema for schema documents,
+<!-- Note the xmlns declaration is NOT in the Schema for Schemas,
      because at the Infoset level where schemas operate,
      xmlns(:prefix) is NOT an attribute! -->
 <!-- The declaration of xmlns is a convenience for schema authors -->
- 
+
 <!-- The id attribute here and below is for use in external references
      from non-schemas using simple fragment identifiers.
      It is NOT used for schema-to-schema reference, internal or
      external. -->
 
-<!ELEMENT %defaultOpenContent; ((%annotation;)?, %any;)>
-<!ATTLIST %defaultOpenContent;
-          appliesToEmpty  (true|false)           'false'
-          mode            (interleave|suffix)    'interleave'
-          id              ID                     #IMPLIED
-          %defaultOpenContentAttrs;>
-
 <!-- a type is a named content type specification which allows attribute
      declarations-->
 <!-- -->
@@ -170,17 +145,17 @@
                           %particleAndAttrs;))>
 
 <!ATTLIST %complexType;
-          name                    %NCName;                 #IMPLIED
-          id                      ID                       #IMPLIED
-          abstract                %boolean;                #IMPLIED
-          final                   %complexDerivationSet;   #IMPLIED
-          block                   %complexDerivationSet;   #IMPLIED
-          mixed                   (true|false)             'false'
-          defaultAttributesApply  %boolean;                'true'
+          name      %NCName;                        #IMPLIED
+          id        ID                              #IMPLIED
+          abstract  %boolean;                       #IMPLIED
+          final     %complexDerivationSet;          #IMPLIED
+          block     %complexDerivationSet;          #IMPLIED
+          mixed (true|false) 'false'
           %complexTypeAttrs;>
 
 <!-- particleAndAttrs is shorthand for a root type -->
-<!-- mixed is disallowed if simpleContent, overridden if complexContent has one too. -->
+<!-- mixed is disallowed if simpleContent, overriden if complexContent
+     has one too. -->
 
 <!-- If anyAttribute appears in one or more referenced attributeGroups
      and/or explicitly, the intersection of the permissions is used -->
@@ -191,12 +166,6 @@
           id    ID           #IMPLIED
           %complexContentAttrs;>
 
-<!ELEMENT %openContent; ((%annotation;)?, (%any;)?)>
-<!ATTLIST %openContent;
-          mode            (none|interleave|suffix)  'interleave'
-          id              ID                        #IMPLIED
-          %openContentAttrs;>
-
 <!-- restriction should use the branch defined above, not the simple
      one from part2; extension should use the full model  -->
 
@@ -205,14 +174,13 @@
           id    ID           #IMPLIED
           %simpleContentAttrs;>
 
-<!-- restriction should use the simple branch from part2, not the 
+<!-- restriction should use the simple branch from part2, not the
      one defined above; extension should have no particle  -->
 
 <!ELEMENT %extension; ((%annotation;)?, (%particleAndAttrs;))>
 <!ATTLIST %extension;
-          base  %QName;               #REQUIRED
-          id    ID                    #IMPLIED
-          
+          base  %QName;      #REQUIRED
+          id    ID           #IMPLIED
           %extensionAttrs;>
 
 <!-- an element is declared by either:
@@ -220,7 +188,6 @@
  or a ref to an existing element declaration -->
 
 <!ELEMENT %element; ((%annotation;)?, (%complexType;| %simpleType;)?,
-                     (%alternative;)*,
                      (%unique; | %key; | %keyref;)*)>
 <!-- simpleType or complexType only if no type|ref attribute -->
 <!-- ref not allowed at top level -->
@@ -239,25 +206,15 @@
             default            CDATA                  #IMPLIED
             fixed              CDATA                  #IMPLIED
             form               %formValues;           #IMPLIED
-            targetNamespace    %URIref;               #IMPLIED
             %elementAttrs;>
 <!-- type and ref are mutually exclusive.
      name and ref are mutually exclusive, one is required -->
 <!-- In the absence of type AND ref, type defaults to type of
-     substitutionGroup, if any, else xs:anyType, i.e. unconstrained -->
+     substitutionGroup, if any, else the ur-type, i.e. unconstrained -->
 <!-- default and fixed are mutually exclusive -->
 
-<!ELEMENT %alternative; ((%annotation;)?, 
-            (%simpleType; | %complexType;)?) >
-<!ATTLIST %alternative; 
-            test                     CDATA     #IMPLIED
-            type                     %QName;   #IMPLIED
-            xpathDefaultNamespace    CDATA     #IMPLIED
-            id                       ID        #IMPLIED >
-
-
 <!ELEMENT %group; ((%annotation;)?,(%mgs;)?)>
-<!ATTLIST %group; 
+<!ATTLIST %group;
           name        %NCName;               #IMPLIED
           ref         %QName;                #IMPLIED
           minOccurs   %nonNegativeInteger;   #IMPLIED
@@ -265,10 +222,10 @@
           id          ID                     #IMPLIED
           %groupAttrs;>
 
-<!ELEMENT %all; ((%annotation;)?, (%element;| %group;| %any;)*)>
+<!ELEMENT %all; ((%annotation;)?, (%element;)*)>
 <!ATTLIST %all;
-          minOccurs   (0 | 1)                #IMPLIED
-          maxOccurs   (0 | 1)                #IMPLIED
+          minOccurs   (1)                    #IMPLIED
+          maxOccurs   (1)                    #IMPLIED
           id          ID                     #IMPLIED
           %allAttrs;>
 
@@ -289,12 +246,15 @@
 <!-- an anonymous grouping in a model, or
      a top-level named group definition, or a reference to same -->
 
+<!-- Note that if order is 'all', group is not allowed inside.
+     If order is 'all' THIS group must be alone (or referenced alone) at
+     the top level of a content model -->
+<!-- If order is 'all', minOccurs==maxOccurs==1 on element/any inside -->
+<!-- Should allow minOccurs=0 inside order='all' . . . -->
 
 <!ELEMENT %any; (%annotation;)?>
 <!ATTLIST %any;
-            namespace       CDATA                  #IMPLIED
-            notNamespace    CDATA                  #IMPLIED
-            notQName        CDATA                  ''
+            namespace       CDATA                  '##any'
             processContents (skip|lax|strict)      'strict'
             minOccurs       %nonNegativeInteger;   '1'
             maxOccurs       CDATA                  '1'
@@ -315,39 +275,26 @@
                   ##targetNamespace ##local may appear in the above list,
                     with the obvious meaning -->
 
-<!-- notNamespace is interpreted as follows:
-                  ##local    - - any unqualified non-conflicting WFXML/attribute
-                  one or     - - any non-conflicting WFXML from
-                  more URI        the listed namespaces
-                  references
-
-                  ##targetNamespace ##local may appear in the above list,
-                    with the obvious meaning -->
-
 <!ELEMENT %anyAttribute; (%annotation;)?>
 <!ATTLIST %anyAttribute;
-            namespace       CDATA              #IMPLIED
-            notNamespace    CDATA              #IMPLIED
-            notQName        CDATA              ''
+            namespace       CDATA              '##any'
             processContents (skip|lax|strict)  'strict'
             id              ID                 #IMPLIED
             %anyAttributeAttrs;>
-<!-- namespace and notNamespace are interpreted as for 'any' above -->
+<!-- namespace is interpreted as for 'any' above -->
 
 <!-- simpleType only if no type|ref attribute -->
 <!-- ref not allowed at top level, name iff at top level -->
 <!ELEMENT %attribute; ((%annotation;)?, (%simpleType;)?)>
 <!ATTLIST %attribute;
-          name              %NCName;      #IMPLIED
-          id                ID            #IMPLIED
-          ref               %QName;       #IMPLIED
-          type              %QName;       #IMPLIED
-          use               (prohibited|optional|required) #IMPLIED
-          default           CDATA         #IMPLIED
-          fixed             CDATA         #IMPLIED
-          form              %formValues;  #IMPLIED
-          targetNamespace   %URIref;      #IMPLIED
-          inheritable       %boolean;      #IMPLIED
+          name      %NCName;      #IMPLIED
+          id        ID            #IMPLIED
+          ref       %QName;       #IMPLIED
+          type      %QName;       #IMPLIED
+          use       (prohibited|optional|required) #IMPLIED
+          default   CDATA         #IMPLIED
+          fixed     CDATA         #IMPLIED
+          form      %formValues;  #IMPLIED
           %attributeAttrs;>
 <!-- type and ref are mutually exclusive.
      name and ref are mutually exclusive, one is required -->
@@ -371,48 +318,34 @@
 <!-- better reference mechanisms -->
 <!ELEMENT %unique; ((%annotation;)?, %selector;, (%field;)+)>
 <!ATTLIST %unique;
-          name                     %NCName;       #IMPLIED
-          ref                      %QName;        #IMPLIED
-          id                       ID             #IMPLIED
+          name     %NCName;       #REQUIRED
+          id       ID             #IMPLIED
           %uniqueAttrs;>
 
 <!ELEMENT %key;    ((%annotation;)?, %selector;, (%field;)+)>
 <!ATTLIST %key;
-          name                     %NCName;       #IMPLIED
-          ref                      %QName;        #IMPLIED
-          id                       ID             #IMPLIED
+          name     %NCName;       #REQUIRED
+          id       ID             #IMPLIED
           %keyAttrs;>
 
 <!ELEMENT %keyref; ((%annotation;)?, %selector;, (%field;)+)>
 <!ATTLIST %keyref;
-          name                     %NCName;       #IMPLIED
-          ref                      %QName;        #IMPLIED
-          refer                    %QName;        #IMPLIED
-          id                       ID             #IMPLIED
+          name     %NCName;       #REQUIRED
+          refer    %QName;        #REQUIRED
+          id       ID             #IMPLIED
           %keyrefAttrs;>
 
 <!ELEMENT %selector; ((%annotation;)?)>
 <!ATTLIST %selector;
-          xpath                    %XPathExpr; #REQUIRED
-          xpathDefaultNamespace    CDATA       #IMPLIED
-          id                       ID          #IMPLIED
+          xpath %XPathExpr; #REQUIRED
+          id    ID          #IMPLIED
           %selectorAttrs;>
 <!ELEMENT %field; ((%annotation;)?)>
 <!ATTLIST %field;
-          xpath                    %XPathExpr; #REQUIRED
-          xpathDefaultNamespace    CDATA       #IMPLIED
-          id                       ID          #IMPLIED
+          xpath %XPathExpr; #REQUIRED
+          id    ID          #IMPLIED
           %fieldAttrs;>
 
-<!-- co-constraint assertions -->
-<!ELEMENT %assert; ((%annotation;)?)>
-<!ATTLIST %assert;
-          test                     %XPathExpr; #REQUIRED
-          id                       ID          #IMPLIED
-          xpathDefaultNamespace    CDATA       #IMPLIED
-          %assertAttrs;>
-
-
 <!-- Schema combination mechanisms -->
 <!ELEMENT %include; (%annotation;)?>
 <!ATTLIST %include;
@@ -434,21 +367,13 @@
           id             ID       #IMPLIED
           %redefineAttrs;>
 
-<!ELEMENT %override; ((%annotation;)?,
-                      ((%simpleType; | %complexType; | %group; | %attributeGroup;) |
-                       %element; | %attribute; | %notation;)*)>
-<!ATTLIST %override;
-          schemaLocation %URIref; #REQUIRED
-          id             ID       #IMPLIED
-          %overrideAttrs;>
-
 <!ELEMENT %notation; (%annotation;)?>
 <!ATTLIST %notation;
-	  name        %NCName;    #REQUIRED
-	  id          ID          #IMPLIED
-	  public      CDATA       #REQUIRED
-	  system      %URIref;    #IMPLIED
-	  %notationAttrs;>
+          name        %NCName;    #REQUIRED
+          id          ID          #IMPLIED
+          public      CDATA       #REQUIRED
+          system      %URIref;    #IMPLIED
+          %notationAttrs;>
 
 <!-- Annotation is either application information or documentation -->
 <!-- By having these here they are available for datatypes as well
@@ -475,39 +400,3 @@
            'structures' 'http://www.w3.org/2001/XMLSchema.xsd' >
 <!NOTATION XML PUBLIC
            'REC-xml-1998-0210' 'http://www.w3.org/TR/1998/REC-xml-19980210' >
-
-<!-- 
-      In keeping with the XML Schema WG's standard versioning policy, 
-      this DTD will persist at the URI
-      http://www.w3.org/2012/04/XMLSchema.dtd.
-
-      At the date of issue it can also be found at the URI
-      http://www.w3.org/2009/XMLSchema/XMLSchema.dtd.
-
-      The schema document at that URI may however change in the future, 
-      in order to remain compatible with the latest version of XSD 
-      and its namespace.  In other words, if XSD or the XML Schema 
-      namespace change, the version of this document at 
-      http://www.w3.org/2009/XMLSchema/XMLSchema.dtd will change accordingly; 
-      the version at http://www.w3.org/2012/04/XMLSchema.dtd 
-      will not change.
-
-      Previous dated (and unchanging) versions of this DTD include:
-
-       http://www.w3.org/2012/01/XMLSchema.dtd
-          (XSD 1.1 Proposed Recommendation)
-
-
-        http://www.w3.org/2011/07/XMLSchema.dtd
-          (XSD 1.1 Candidate Recommendation)
-
-        http://www.w3.org/2009/04/XMLSchema.dtd 
-          (XSD 1.1 Candidate Recommendation)
-
-        http://www.w3.org/2004/10/XMLSchema.dtd
-          (XSD 1.0 Recommendation, Second Edition)
-
-        http://www.w3.org/2001/05/XMLSchema.dtd
-          (XSD 1.0 Recommendation, First Edition)
-
--->
diff --git a/src/java.xml/share/classes/jdk/xml/internal/jdkcatalog/w3c/dtd/schema10/datatypes.dtd b/src/java.xml/share/classes/jdk/xml/internal/jdkcatalog/w3c/dtd/schema10/datatypes.dtd
index f9352bae1c4..ed07e4e9493 100644
--- a/src/java.xml/share/classes/jdk/xml/internal/jdkcatalog/w3c/dtd/schema10/datatypes.dtd
+++ b/src/java.xml/share/classes/jdk/xml/internal/jdkcatalog/w3c/dtd/schema10/datatypes.dtd
@@ -1,8 +1,10 @@
 <!--
         DTD for XML Schemas: Part 2: Datatypes
-        
-        Id: datatypes.dtd,v 1.1.2.4 2005/01/31 18:40:42 cmsmcq Exp 
-        Note this DTD is NOT normative, or even definitive.
+        $Id: datatypes.dtd,v 1.23 2001/03/16 17:36:30 ht Exp $
+        Note this DTD is NOT normative, or even definitive. - - the
+        prose copy in the datatypes REC is the definitive version
+        (which shouldn't differ from this one except for this comment
+        and entity expansions, but just in case)
   -->
 
 <!--
@@ -21,7 +23,6 @@
 <!ENTITY % minInclusive "%p;minInclusive">
 <!ENTITY % totalDigits "%p;totalDigits">
 <!ENTITY % fractionDigits "%p;fractionDigits">
-
 <!ENTITY % length "%p;length">
 <!ENTITY % minLength "%p;minLength">
 <!ENTITY % maxLength "%p;maxLength">
@@ -29,13 +30,8 @@
 <!ENTITY % whiteSpace "%p;whiteSpace">
 <!ENTITY % pattern "%p;pattern">
 
-<!ENTITY % assertion "%p;assertion">
-
-<!ENTITY % explicitTimezone "%p;explicitTimezone">
-
-
 <!--
-        Customization entities for the ATTLIST of each element
+        Customisation entities for the ATTLIST of each element
         type. Define one of these if your schema takes advantage
         of the anyAttribute='##other' in the schema for schemas
   -->
@@ -53,12 +49,9 @@
 <!ENTITY % lengthAttrs "">
 <!ENTITY % minLengthAttrs "">
 <!ENTITY % maxLengthAttrs "">
-
 <!ENTITY % enumerationAttrs "">
 <!ENTITY % whiteSpaceAttrs "">
 <!ENTITY % patternAttrs "">
-<!ENTITY % assertionAttrs "">
-<!ENTITY % explicitTimezoneAttrs "">
 
 <!-- Define some entities for informative use as attribute
         types -->
@@ -82,20 +75,18 @@
         length, maxLength, minLength within datatype,
         and the min- and max- variants of Inclusive and Exclusive
         are mutually exclusive. On the other hand,  pattern and
-        enumeration and assertion may repeat.
+        enumeration may repeat.
   -->
 <!ENTITY % minBound "(%minInclusive; | %minExclusive;)">
 <!ENTITY % maxBound "(%maxInclusive; | %maxExclusive;)">
 <!ENTITY % bounds "%minBound; | %maxBound;">
-<!ENTITY % numeric "%totalDigits; | %fractionDigits;"> 
+<!ENTITY % numeric "%totalDigits; | %fractionDigits;">
 <!ENTITY % ordered "%bounds; | %numeric;">
 <!ENTITY % unordered
    "%pattern; | %enumeration; | %whiteSpace; | %length; |
-   %maxLength; | %minLength; | %assertion;
-   | %explicitTimezone;">
-<!ENTITY % implementation-defined-facets "">
-<!ENTITY % facet "%ordered; | %unordered; %implementation-defined-facets;">
-<!ENTITY % facetAttr 
+   %maxLength; | %minLength;">
+<!ENTITY % facet "%ordered; | %unordered;">
+<!ENTITY % facetAttr
         "value CDATA #REQUIRED
         id ID #IMPLIED">
 <!ENTITY % fixedAttr "fixed %boolean; #IMPLIED">
@@ -210,13 +201,3 @@
 <!ATTLIST %pattern;
         %facetAttr;
         %patternAttrs;>
-
-<!ELEMENT %assertion; %facetModel;>
-<!ATTLIST %assertion;
-        %facetAttr;
-        %assertionAttrs;>
-
-<!ELEMENT %explicitTimezone; %facetModel;>
-<!ATTLIST %explicitTimezone;
-        %facetAttr;
-        %explicitTimezoneAttrs;>
diff --git a/test/jaxp/javax/xml/jaxp/unittest/common/jdkcatalog/JDKCatalogTest.java b/test/jaxp/javax/xml/jaxp/unittest/common/jdkcatalog/JDKCatalogTest.java
index 0f4c0aec2de..ffc2f313e89 100644
--- a/test/jaxp/javax/xml/jaxp/unittest/common/jdkcatalog/JDKCatalogTest.java
+++ b/test/jaxp/javax/xml/jaxp/unittest/common/jdkcatalog/JDKCatalogTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2024, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,16 +23,20 @@
 package common.jdkcatalog;
 
 import java.io.StringReader;
+import java.net.URI;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.stream.Collectors;
 import javax.xml.XMLConstants;
+import javax.xml.catalog.Catalog;
 import javax.xml.catalog.CatalogFeatures;
+import javax.xml.catalog.CatalogManager;
 import javax.xml.parsers.SAXParserFactory;
 import javax.xml.transform.sax.SAXSource;
 import javax.xml.validation.SchemaFactory;
 import javax.xml.validation.Validator;
+import jaxp.library.JAXPTestUtilities;
 import org.testng.Assert;
 import org.testng.Assert.ThrowingRunnable;
 import org.testng.annotations.DataProvider;
@@ -44,25 +48,42 @@ import org.xml.sax.helpers.DefaultHandler;
 
 /*
  * @test
- * @bug 8344800 8345353
+ * @bug 8344800 8345353 8351969
+ * @library /javax/xml/jaxp/libs
  * @run testng/othervm common.jdkcatalog.JDKCatalogTest
  * @summary Verifies the W3C DTDs and XSDs in the JDK built-in catalog.
  */
 public class JDKCatalogTest {
-    static String CLS_DIR = System.getProperty("test.classes");
-    static String SRC_DIR = System.getProperty("test.src");
-    public static boolean isWindows = false;
-    static {
-        if (System.getProperty("os.name").contains("Windows")) {
-            isWindows = true;
-        }
-    };
-    public static final String JDKCATALOG_RESOLVE = "jdk.xml.jdkcatalog.resolve";
-    static final String PUBLIC_ID = "{{publicId}}";
-    static final String SYSTEM_ID = "{{systemId}}";
-    static final String XSD_LOCATION = "{{SCHEMA_LOCATION}}";
-    static final String TARGET_NAMESPACE = "{{targetNamespace}}";
-    static final String ROOT_ELEMENT = "{{rootElement}}";
+    private static final String JDKCATALOG_RESOLVE = "jdk.xml.jdkcatalog.resolve";
+    private static final String PUBLIC_ID = "{{publicId}}";
+    private static final String SYSTEM_ID = "{{systemId}}";
+    private static final String XSD_LOCATION = "{{SCHEMA_LOCATION}}";
+    private static final String TARGET_NAMESPACE = "{{targetNamespace}}";
+    private static final String ROOT_ELEMENT = "{{rootElement}}";
+    private static final String JDKCATALOG_URL = "jrt:/java.xml/jdk/xml/internal/jdkcatalog/JDKCatalog.xml";
+
+    private Catalog catalog = CatalogManager.catalog(CatalogFeatures.defaults(), URI.create(JDKCATALOG_URL));
+
+    /*
+     * DataProvider: DTDs in the JDK built-in Catalog
+     * Data provided: public and system Ids, see test testDTDsInJDKCatalog
+     */
+    @DataProvider(name = "DTDsInJDKCatalog")
+    public Object[][] getDTDsInJDKCatalog() {
+        return new Object[][]{
+            // Schema 1.0
+            {"-//W3C//DTD XMLSCHEMA 200102//EN", "http://www.w3.org/2001/XMLSchema.dtd"},
+            {"datatypes", "http://www.w3.org/2001/datatypes.dtd"},
+            // XHTML 1.0
+            {"-//W3C//DTD XHTML 1.0 Frameset//EN", "http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd"},
+            {"-//W3C//DTD XHTML 1.0 Strict//EN", "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"},
+            {"-//W3C//DTD XHTML 1.0 Transitional//EN", "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"},
+            // XHTML 1.1
+            {"-//W3C//DTD XHTML 1.1//EN", "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"},
+            // DTD for W3C specifications
+            {"-//W3C//DTD Specification V2.10//EN", "http://www.w3.org/2002/xmlspec/dtd/2.10/xmlspec.dtd"},
+        };
+    }
 
     /*
      * DataProvider: for verifying DTDs in the JDKCatalog
@@ -106,6 +127,19 @@ public class JDKCatalogTest {
         };
     }
 
+    /**
+     * Verifies that the JDK built-in Catalog supports both the Public and System
+     * identifiers for DTDs.
+     * @param publicId the public Id
+     * @param systemId the system Id
+     */
+    @Test(dataProvider = "DTDsInJDKCatalog")
+    public void testDTDsInJDKCatalog(String publicId, String systemId) {
+        String matchingPubId = catalog.matchPublic(publicId);
+        String matchingSysId = catalog.matchSystem(systemId);
+        Assert.assertEquals(matchingPubId, matchingSysId);
+    }
+
     /**
      * Verifies that references to the W3C DTDs are resolved by the JDK built-in
      * catalog.
@@ -146,10 +180,10 @@ public class JDKCatalogTest {
     public void testXSD(String xmlTemplate, String xsdLocation, String targetNS, String rootElement, String catalog,
             Class<Throwable> expectedThrow)
             throws Exception {
-        String xmlSrcPath = SRC_DIR + "/" + xmlTemplate;
+        String xmlSrcPath = JAXPTestUtilities.SRC_DIR + "/" + xmlTemplate;
         final String xmlSrcId = getSysId(xmlSrcPath);
 
-        final String customCatalog = getSysId((catalog != null) ? SRC_DIR + "/" + catalog : null);
+        final String customCatalog = getSysId((catalog != null) ? JAXPTestUtilities.SRC_DIR + "/" + catalog : null);
 
         final String xmlString = generateXMLWithXSDRef(xmlSrcPath, xsdLocation,
                 targetNS, rootElement);
@@ -207,7 +241,7 @@ public class JDKCatalogTest {
      */
     private String generateXMLWithDTDRef(String publicId, String systemId)
             throws Exception {
-        Path path = Paths.get(SRC_DIR + "/dtdtest.xml");
+        Path path = Paths.get(JAXPTestUtilities.SRC_DIR + "/dtdtest.xml");
         String xmlString = Files.lines(path).map(line -> {
             line = line.replace(PUBLIC_ID, publicId);
             line = line.replace(SYSTEM_ID, systemId);
@@ -249,7 +283,7 @@ public class JDKCatalogTest {
     private String getSysId(String path) {
         if (path == null) return null;
         String xmlSysId = "file://" + path;
-        if (isWindows) {
+        if (JAXPTestUtilities.isWindows) {
             path = path.replace('\\', '/');
             xmlSysId = "file:///" + path;
         }

From 8a1c85eaa902500d49ca82c67b6838d39cb5b24f Mon Sep 17 00:00:00 2001
From: William Kemper <wkemper@openjdk.org>
Date: Wed, 19 Mar 2025 16:56:53 +0000
Subject: [PATCH 403/587] 8350898: Shenandoah: Eliminate final roots safepoint

Reviewed-by: rkennke, kdnilsen, cslucas
---
 .../gc/shenandoah/shenandoahClosures.hpp      |   9 +
 .../shenandoah/shenandoahClosures.inline.hpp  |   7 +
 .../gc/shenandoah/shenandoahConcurrentGC.cpp  | 166 ++++++++++++------
 .../gc/shenandoah/shenandoahConcurrentGC.hpp  |  23 ++-
 .../shenandoah/shenandoahConcurrentMark.cpp   |  13 --
 .../gc/shenandoah/shenandoahDegeneratedGC.cpp |   2 +-
 .../share/gc/shenandoah/shenandoahHeap.cpp    |  43 ++++-
 .../share/gc/shenandoah/shenandoahHeap.hpp    |   5 +-
 .../share/gc/shenandoah/shenandoahOldGC.cpp   |   2 +-
 .../gc/shenandoah/shenandoahOldGeneration.cpp |  53 +++++-
 .../gc/shenandoah/shenandoahOldGeneration.hpp |   3 +-
 .../gc/shenandoah/shenandoahPhaseTimings.cpp  |   1 +
 .../gc/shenandoah/shenandoahPhaseTimings.hpp  |  16 +-
 .../gc/shenandoah/shenandoahVMOperations.cpp  |   2 +-
 14 files changed, 248 insertions(+), 97 deletions(-)

diff --git a/src/hotspot/share/gc/shenandoah/shenandoahClosures.hpp b/src/hotspot/share/gc/shenandoah/shenandoahClosures.hpp
index fa7887145df..0c223ee3128 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahClosures.hpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahClosures.hpp
@@ -36,6 +36,7 @@ class ShenandoahBarrierSet;
 class ShenandoahHeap;
 class ShenandoahMarkingContext;
 class ShenandoahReferenceProcessor;
+class SATBMarkQueueSet;
 
 //
 // ========= Super
@@ -55,6 +56,14 @@ public:
 // ========= Marking
 //
 
+class ShenandoahFlushSATBHandshakeClosure : public HandshakeClosure {
+private:
+  SATBMarkQueueSet& _qset;
+public:
+  inline explicit ShenandoahFlushSATBHandshakeClosure(SATBMarkQueueSet& qset);
+  inline void do_thread(Thread* thread) override;
+};
+
 class ShenandoahMarkRefsSuperClosure : public ShenandoahSuperClosure {
 private:
   ShenandoahObjToScanQueue* _queue;
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahClosures.inline.hpp b/src/hotspot/share/gc/shenandoah/shenandoahClosures.inline.hpp
index a9c6a3395eb..c08c9501201 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahClosures.inline.hpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahClosures.inline.hpp
@@ -59,6 +59,13 @@ void ShenandoahSuperClosure::do_nmethod(nmethod* nm) {
 //
 // ========= Marking
 //
+ShenandoahFlushSATBHandshakeClosure::ShenandoahFlushSATBHandshakeClosure(SATBMarkQueueSet& qset) :
+  HandshakeClosure("Shenandoah Flush SATB"),
+  _qset(qset) {}
+
+void ShenandoahFlushSATBHandshakeClosure::do_thread(Thread* thread) {
+  _qset.flush_queue(ShenandoahThreadLocalData::satb_mark_queue(thread));
+}
 
 ShenandoahMarkRefsSuperClosure::ShenandoahMarkRefsSuperClosure(ShenandoahObjToScanQueue* q,
                                                                ShenandoahReferenceProcessor* rp,
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahConcurrentGC.cpp b/src/hotspot/share/gc/shenandoah/shenandoahConcurrentGC.cpp
index 29fd4002578..c2d33c396da 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahConcurrentGC.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahConcurrentGC.cpp
@@ -102,6 +102,16 @@ ShenandoahGC::ShenandoahDegenPoint ShenandoahConcurrentGC::degen_point() const {
   return _degen_point;
 }
 
+void ShenandoahConcurrentGC::entry_concurrent_update_refs_prepare(ShenandoahHeap* const heap) {
+  TraceCollectorStats tcs(heap->monitoring_support()->concurrent_collection_counters());
+  const char* msg = conc_init_update_refs_event_message();
+  ShenandoahConcurrentPhase gc_phase(msg, ShenandoahPhaseTimings::conc_update_refs_prepare);
+  EventMark em("%s", msg);
+
+  // Evacuation is complete, retire gc labs and change gc state
+  heap->concurrent_prepare_for_update_refs();
+}
+
 bool ShenandoahConcurrentGC::collect(GCCause::Cause cause) {
   ShenandoahHeap* const heap = ShenandoahHeap::heap();
 
@@ -192,8 +202,7 @@ bool ShenandoahConcurrentGC::collect(GCCause::Cause cause) {
       return false;
     }
 
-    // Evacuation is complete, retire gc labs
-    heap->concurrent_prepare_for_update_refs();
+    entry_concurrent_update_refs_prepare(heap);
 
     // Perform update-refs phase.
     if (ShenandoahVerify || ShenandoahPacing) {
@@ -216,24 +225,14 @@ bool ShenandoahConcurrentGC::collect(GCCause::Cause cause) {
     // Update references freed up collection set, kick the cleanup to reclaim the space.
     entry_cleanup_complete();
   } else {
-    // We chose not to evacuate because we found sufficient immediate garbage.
-    // However, there may still be regions to promote in place, so do that now.
-    if (has_in_place_promotions(heap)) {
-      entry_promote_in_place();
-
-      // If the promote-in-place operation was cancelled, we can have the degenerated
-      // cycle complete the operation. It will see that no evacuations are in progress,
-      // and that there are regions wanting promotion. The risk with not handling the
-      // cancellation would be failing to restore top for these regions and leaving
-      // them unable to serve allocations for the old generation.
-      if (check_cancellation_and_abort(ShenandoahDegenPoint::_degenerated_evac)) {
-        return false;
-      }
+    if (!entry_final_roots()) {
+      assert(_degen_point != _degenerated_unset, "Need to know where to start degenerated cycle");
+      return false;
     }
 
-    // At this point, the cycle is effectively complete. If the cycle has been cancelled here,
-    // the control thread will detect it on its next iteration and run a degenerated young cycle.
-    vmop_entry_final_roots();
+    if (VerifyAfterGC) {
+      vmop_entry_verify_final_roots();
+    }
     _abbreviated = true;
   }
 
@@ -251,6 +250,52 @@ bool ShenandoahConcurrentGC::collect(GCCause::Cause cause) {
   return true;
 }
 
+bool ShenandoahConcurrentGC::complete_abbreviated_cycle() {
+  shenandoah_assert_generational();
+
+  ShenandoahGenerationalHeap* const heap = ShenandoahGenerationalHeap::heap();
+
+  // We chose not to evacuate because we found sufficient immediate garbage.
+  // However, there may still be regions to promote in place, so do that now.
+  if (heap->old_generation()->has_in_place_promotions()) {
+    entry_promote_in_place();
+
+    // If the promote-in-place operation was cancelled, we can have the degenerated
+    // cycle complete the operation. It will see that no evacuations are in progress,
+    // and that there are regions wanting promotion. The risk with not handling the
+    // cancellation would be failing to restore top for these regions and leaving
+    // them unable to serve allocations for the old generation.This will leave the weak
+    // roots flag set (the degenerated cycle will unset it).
+    if (check_cancellation_and_abort(ShenandoahDegenPoint::_degenerated_evac)) {
+      return false;
+    }
+  }
+
+  // At this point, the cycle is effectively complete. If the cycle has been cancelled here,
+  // the control thread will detect it on its next iteration and run a degenerated young cycle.
+  if (!_generation->is_old()) {
+    heap->update_region_ages(_generation->complete_marking_context());
+  }
+
+  if (!heap->is_concurrent_old_mark_in_progress()) {
+    heap->concurrent_final_roots();
+  } else {
+    // Since the cycle was shortened for having enough immediate garbage, this will be
+    // the last phase before concurrent marking of old resumes. We must be sure
+    // that old mark threads don't see any pointers to garbage in the SATB queues. Even
+    // though nothing was evacuated, overwriting unreachable weak roots with null may still
+    // put pointers to regions that become trash in the SATB queues. The following will
+    // piggyback flushing the thread local SATB queues on the same handshake that propagates
+    // the gc state change.
+    ShenandoahSATBMarkQueueSet& satb_queues = ShenandoahBarrierSet::satb_mark_queue_set();
+    ShenandoahFlushSATBHandshakeClosure complete_thread_local_satb_buffers(satb_queues);
+    heap->concurrent_final_roots(&complete_thread_local_satb_buffers);
+    heap->old_generation()->concurrent_transfer_pointers_from_satb();
+  }
+  return true;
+}
+
+
 void ShenandoahConcurrentGC::vmop_entry_init_mark() {
   ShenandoahHeap* const heap = ShenandoahHeap::heap();
   TraceCollectorStats tcs(heap->monitoring_support()->stw_collection_counters());
@@ -291,7 +336,7 @@ void ShenandoahConcurrentGC::vmop_entry_final_update_refs() {
   VMThread::execute(&op);
 }
 
-void ShenandoahConcurrentGC::vmop_entry_final_roots() {
+void ShenandoahConcurrentGC::vmop_entry_verify_final_roots() {
   ShenandoahHeap* const heap = ShenandoahHeap::heap();
   TraceCollectorStats tcs(heap->monitoring_support()->stw_collection_counters());
   ShenandoahTimingsTracker timing(ShenandoahPhaseTimings::final_roots_gross);
@@ -347,12 +392,12 @@ void ShenandoahConcurrentGC::entry_final_update_refs() {
   op_final_update_refs();
 }
 
-void ShenandoahConcurrentGC::entry_final_roots() {
-  const char* msg = final_roots_event_message();
+void ShenandoahConcurrentGC::entry_verify_final_roots() {
+  const char* msg = verify_final_roots_event_message();
   ShenandoahPausePhase gc_phase(msg, ShenandoahPhaseTimings::final_roots);
   EventMark em("%s", msg);
 
-  op_final_roots();
+  op_verify_final_roots();
 }
 
 void ShenandoahConcurrentGC::entry_reset() {
@@ -526,19 +571,12 @@ void ShenandoahConcurrentGC::entry_evacuate() {
   op_evacuate();
 }
 
-void ShenandoahConcurrentGC::entry_promote_in_place() {
+void ShenandoahConcurrentGC::entry_promote_in_place() const {
   shenandoah_assert_generational();
 
-  ShenandoahHeap* const heap = ShenandoahHeap::heap();
-  TraceCollectorStats tcs(heap->monitoring_support()->concurrent_collection_counters());
-
-  static const char* msg = "Promote in place";
-  ShenandoahConcurrentPhase gc_phase(msg, ShenandoahPhaseTimings::promote_in_place);
-  EventMark em("%s", msg);
-
-  ShenandoahWorkerScope scope(heap->workers(),
-                              ShenandoahWorkerPolicy::calc_workers_for_conc_evac(),
-                              "promote in place");
+  ShenandoahTimingsTracker timing(ShenandoahPhaseTimings::promote_in_place);
+  ShenandoahGCWorkerPhase worker_phase(ShenandoahPhaseTimings::promote_in_place);
+  EventMark em("%s", "Promote in place");
 
   ShenandoahGenerationalHeap::heap()->promote_regions_in_place(true);
 }
@@ -663,6 +701,7 @@ void ShenandoahConcurrentGC::op_init_mark() {
   }
 
   if (ShenandoahVerify) {
+    ShenandoahTimingsTracker v(ShenandoahPhaseTimings::init_mark_verify);
     heap->verifier()->verify_before_concmark();
   }
 
@@ -751,6 +790,7 @@ void ShenandoahConcurrentGC::op_final_mark() {
       }
 
       if (ShenandoahVerify) {
+        ShenandoahTimingsTracker v(ShenandoahPhaseTimings::final_mark_verify);
         heap->verifier()->verify_before_evacuation();
       }
 
@@ -767,6 +807,7 @@ void ShenandoahConcurrentGC::op_final_mark() {
       }
     } else {
       if (ShenandoahVerify) {
+        ShenandoahTimingsTracker v(ShenandoahPhaseTimings::final_mark_verify);
         if (has_in_place_promotions(heap)) {
           heap->verifier()->verify_after_concmark_with_promotions();
         } else {
@@ -1088,6 +1129,7 @@ void ShenandoahConcurrentGC::op_evacuate() {
 void ShenandoahConcurrentGC::op_init_update_refs() {
   ShenandoahHeap* const heap = ShenandoahHeap::heap();
   if (ShenandoahVerify) {
+    ShenandoahTimingsTracker v(ShenandoahPhaseTimings::init_update_refs_verify);
     heap->verifier()->verify_before_update_refs();
   }
   if (ShenandoahPacing) {
@@ -1175,6 +1217,7 @@ void ShenandoahConcurrentGC::op_final_update_refs() {
   }
 
   if (ShenandoahVerify) {
+    ShenandoahTimingsTracker v(ShenandoahPhaseTimings::final_update_refs_verify);
     heap->verifier()->verify_after_update_refs();
   }
 
@@ -1190,33 +1233,32 @@ void ShenandoahConcurrentGC::op_final_update_refs() {
   }
 }
 
-void ShenandoahConcurrentGC::op_final_roots() {
+bool ShenandoahConcurrentGC::entry_final_roots() {
+  ShenandoahHeap* const heap = ShenandoahHeap::heap();
+  TraceCollectorStats tcs(heap->monitoring_support()->concurrent_collection_counters());
 
-  ShenandoahHeap *heap = ShenandoahHeap::heap();
-  heap->set_concurrent_weak_root_in_progress(false);
-  heap->set_evacuation_in_progress(false);
 
-  if (heap->mode()->is_generational()) {
-    // If the cycle was shortened for having enough immediate garbage, this could be
-    // the last GC safepoint before concurrent marking of old resumes. We must be sure
-    // that old mark threads don't see any pointers to garbage in the SATB buffers.
-    if (heap->is_concurrent_old_mark_in_progress()) {
-      heap->old_generation()->transfer_pointers_from_satb();
-    }
+  const char* msg = conc_final_roots_event_message();
+  ShenandoahConcurrentPhase gc_phase(msg, ShenandoahPhaseTimings::conc_final_roots);
+  EventMark em("%s", msg);
+  ShenandoahWorkerScope scope(heap->workers(),
+                              ShenandoahWorkerPolicy::calc_workers_for_conc_evac(),
+                              msg);
 
-    if (!_generation->is_old()) {
-      ShenandoahGenerationalHeap::heap()->update_region_ages(_generation->complete_marking_context());
+  if (!heap->mode()->is_generational()) {
+    heap->concurrent_final_roots();
+  } else {
+    if (!complete_abbreviated_cycle()) {
+      return false;
     }
   }
+  return true;
+}
 
+void ShenandoahConcurrentGC::op_verify_final_roots() {
   if (VerifyAfterGC) {
     Universe::verify();
   }
-
-  {
-    ShenandoahTimingsTracker timing(ShenandoahPhaseTimings::final_roots_propagate_gc_state);
-    heap->propagate_gc_state_to_all_threads();
-  }
 }
 
 void ShenandoahConcurrentGC::op_cleanup_complete() {
@@ -1301,11 +1343,19 @@ const char* ShenandoahConcurrentGC::conc_reset_after_collect_event_message() con
   }
 }
 
-const char* ShenandoahConcurrentGC::final_roots_event_message() const {
+const char* ShenandoahConcurrentGC::verify_final_roots_event_message() const {
   if (ShenandoahHeap::heap()->unload_classes()) {
-    SHENANDOAH_RETURN_EVENT_MESSAGE(_generation->type(), "Pause Final Roots", " (unload classes)");
+    SHENANDOAH_RETURN_EVENT_MESSAGE(_generation->type(), "Pause Verify Final Roots", " (unload classes)");
   } else {
-    SHENANDOAH_RETURN_EVENT_MESSAGE(_generation->type(), "Pause Final Roots", "");
+    SHENANDOAH_RETURN_EVENT_MESSAGE(_generation->type(), "Pause Verify Final Roots", "");
+  }
+}
+
+const char* ShenandoahConcurrentGC::conc_final_roots_event_message() const {
+  if (ShenandoahHeap::heap()->unload_classes()) {
+    SHENANDOAH_RETURN_EVENT_MESSAGE(_generation->type(), "Concurrent Final Roots", " (unload classes)");
+  } else {
+    SHENANDOAH_RETURN_EVENT_MESSAGE(_generation->type(), "Concurrent Final Roots", "");
   }
 }
 
@@ -1332,3 +1382,11 @@ const char* ShenandoahConcurrentGC::conc_cleanup_event_message() const {
     SHENANDOAH_RETURN_EVENT_MESSAGE(_generation->type(), "Concurrent cleanup", "");
   }
 }
+
+const char* ShenandoahConcurrentGC::conc_init_update_refs_event_message() const {
+  if (ShenandoahHeap::heap()->unload_classes()) {
+    SHENANDOAH_RETURN_EVENT_MESSAGE(_generation->type(), "Concurrent Init Update Refs", " (unload classes)");
+  } else {
+    SHENANDOAH_RETURN_EVENT_MESSAGE(_generation->type(), "Concurrent Init Update Refs", "");
+  }
+}
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahConcurrentGC.hpp b/src/hotspot/share/gc/shenandoah/shenandoahConcurrentGC.hpp
index 0b2e42fb6c6..d81c49363a2 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahConcurrentGC.hpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahConcurrentGC.hpp
@@ -56,9 +56,12 @@ private:
 
 public:
   ShenandoahConcurrentGC(ShenandoahGeneration* generation, bool do_old_gc_bootstrap);
+
   bool collect(GCCause::Cause cause) override;
   ShenandoahDegenPoint degen_point() const;
 
+  void entry_concurrent_update_refs_prepare(ShenandoahHeap* heap);
+
   // Return true if this cycle found enough immediate garbage to skip evacuation
   bool abbreviated() const { return _abbreviated; }
 
@@ -69,7 +72,7 @@ protected:
   void vmop_entry_final_mark();
   void vmop_entry_init_update_refs();
   void vmop_entry_final_update_refs();
-  void vmop_entry_final_roots();
+  void vmop_entry_verify_final_roots();
 
   // Entry methods to normally STW GC operations. These set up logging, monitoring
   // and workers for next VM operation
@@ -77,7 +80,7 @@ protected:
   void entry_final_mark();
   void entry_init_update_refs();
   void entry_final_update_refs();
-  void entry_final_roots();
+  void entry_verify_final_roots();
 
   // Entry methods to normally concurrent GC operations. These set up logging, monitoring
   // for concurrent operation.
@@ -96,8 +99,11 @@ protected:
   void entry_update_refs();
   void entry_cleanup_complete();
 
+  // This is the last phase of a cycle which performs no evacuations
+  bool entry_final_roots();
+
   // Called when the collection set is empty, but the generational mode has regions to promote in place
-  void entry_promote_in_place();
+  void entry_promote_in_place() const;
 
   // Actual work for the phases
   void op_reset();
@@ -116,7 +122,8 @@ protected:
   void op_update_refs();
   void op_update_thread_roots();
   void op_final_update_refs();
-  void op_final_roots();
+
+  void op_verify_final_roots();
   void op_cleanup_complete();
   void op_reset_after_collect();
 
@@ -129,19 +136,23 @@ protected:
 private:
   void start_mark();
 
-  static bool has_in_place_promotions(ShenandoahHeap* heap) ;
+  bool complete_abbreviated_cycle();
+
+  static bool has_in_place_promotions(ShenandoahHeap* heap);
 
   // Messages for GC trace events, they have to be immortal for
   // passing around the logging/tracing systems
   const char* init_mark_event_message() const;
   const char* final_mark_event_message() const;
-  const char* final_roots_event_message() const;
+  const char* verify_final_roots_event_message() const;
+  const char* conc_final_roots_event_message() const;
   const char* conc_mark_event_message() const;
   const char* conc_reset_event_message() const;
   const char* conc_reset_after_collect_event_message() const;
   const char* conc_weak_refs_event_message() const;
   const char* conc_weak_roots_event_message() const;
   const char* conc_cleanup_event_message() const;
+  const char* conc_init_update_refs_event_message() const;
 };
 
 #endif // SHARE_GC_SHENANDOAH_SHENANDOAHCONCURRENTGC_HPP
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahConcurrentMark.cpp b/src/hotspot/share/gc/shenandoah/shenandoahConcurrentMark.cpp
index 1feb19f6e4a..4a0f43226d7 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahConcurrentMark.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahConcurrentMark.cpp
@@ -212,19 +212,6 @@ void ShenandoahConcurrentMark::mark_concurrent_roots() {
   }
 }
 
-class ShenandoahFlushSATBHandshakeClosure : public HandshakeClosure {
-private:
-  SATBMarkQueueSet& _qset;
-public:
-  ShenandoahFlushSATBHandshakeClosure(SATBMarkQueueSet& qset) :
-    HandshakeClosure("Shenandoah Flush SATB"),
-    _qset(qset) {}
-
-  void do_thread(Thread* thread) {
-    _qset.flush_queue(ShenandoahThreadLocalData::satb_mark_queue(thread));
-  }
-};
-
 void ShenandoahConcurrentMark::concurrent_mark() {
   ShenandoahHeap* const heap = ShenandoahHeap::heap();
   WorkerThreads* workers = heap->workers();
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahDegeneratedGC.cpp b/src/hotspot/share/gc/shenandoah/shenandoahDegeneratedGC.cpp
index 436ba154e5a..8cc4e2de8ea 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahDegeneratedGC.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahDegeneratedGC.cpp
@@ -409,7 +409,7 @@ void ShenandoahDegenGC::op_evacuate() {
 void ShenandoahDegenGC::op_init_update_refs() {
   // Evacuation has completed
   ShenandoahHeap* const heap = ShenandoahHeap::heap();
-  heap->prepare_update_heap_references(false /*concurrent*/);
+  heap->prepare_update_heap_references();
   heap->set_update_refs_in_progress(true);
 }
 
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahHeap.cpp b/src/hotspot/share/gc/shenandoah/shenandoahHeap.cpp
index ad09aecbe68..c506c418d6d 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahHeap.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahHeap.cpp
@@ -1247,9 +1247,11 @@ public:
   }
 };
 
-class ShenandoahGCStatePropagator : public ThreadClosure {
+class ShenandoahGCStatePropagator : public HandshakeClosure {
 public:
-  explicit ShenandoahGCStatePropagator(char gc_state) : _gc_state(gc_state) {}
+  explicit ShenandoahGCStatePropagator(char gc_state) :
+    HandshakeClosure("Shenandoah GC State Change"),
+    _gc_state(gc_state) {}
 
   void do_thread(Thread* thread) override {
     ShenandoahThreadLocalData::set_gc_state(thread, _gc_state);
@@ -1306,6 +1308,37 @@ void ShenandoahHeap::concurrent_prepare_for_update_refs() {
   _update_refs_iterator.reset();
 }
 
+class ShenandoahCompositeHandshakeClosure : public HandshakeClosure {
+  HandshakeClosure* _handshake_1;
+  HandshakeClosure* _handshake_2;
+  public:
+    ShenandoahCompositeHandshakeClosure(HandshakeClosure* handshake_1, HandshakeClosure* handshake_2) :
+      HandshakeClosure(handshake_2->name()),
+      _handshake_1(handshake_1), _handshake_2(handshake_2) {}
+
+  void do_thread(Thread* thread) override {
+      _handshake_1->do_thread(thread);
+      _handshake_2->do_thread(thread);
+    }
+};
+
+void ShenandoahHeap::concurrent_final_roots(HandshakeClosure* handshake_closure) {
+  {
+    assert(!is_evacuation_in_progress(), "Should not evacuate for abbreviated or old cycles");
+    MutexLocker lock(Threads_lock);
+    set_gc_state_concurrent(WEAK_ROOTS, false);
+  }
+
+  ShenandoahGCStatePropagator propagator(_gc_state.raw_value());
+  Threads::non_java_threads_do(&propagator);
+  if (handshake_closure == nullptr) {
+    Handshake::execute(&propagator);
+  } else {
+    ShenandoahCompositeHandshakeClosure composite(&propagator, handshake_closure);
+    Handshake::execute(&composite);
+  }
+}
+
 oop ShenandoahHeap::evacuate_object(oop p, Thread* thread) {
   assert(thread == Thread::current(), "Expected thread parameter to be current thread.");
   if (ShenandoahThreadLocalData::is_oom_during_evac(thread)) {
@@ -2019,16 +2052,14 @@ void ShenandoahHeap::stw_weak_refs(bool full_gc) {
   gc_generation()->ref_processor()->process_references(phase, workers(), false /* concurrent */);
 }
 
-void ShenandoahHeap::prepare_update_heap_references(bool concurrent) {
+void ShenandoahHeap::prepare_update_heap_references() {
   assert(ShenandoahSafepoint::is_at_shenandoah_safepoint(), "must be at safepoint");
 
   // Evacuation is over, no GCLABs are needed anymore. GCLABs are under URWM, so we need to
   // make them parsable for update code to work correctly. Plus, we can compute new sizes
   // for future GCLABs here.
   if (UseTLAB) {
-    ShenandoahGCPhase phase(concurrent ?
-                            ShenandoahPhaseTimings::init_update_refs_manage_gclabs :
-                            ShenandoahPhaseTimings::degen_gc_init_update_refs_manage_gclabs);
+    ShenandoahGCPhase phase(ShenandoahPhaseTimings::degen_gc_init_update_refs_manage_gclabs);
     gclabs_retire(ResizeTLAB);
   }
 
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahHeap.hpp b/src/hotspot/share/gc/shenandoah/shenandoahHeap.hpp
index 33d2db0b2f1..d9508beac20 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahHeap.hpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahHeap.hpp
@@ -481,11 +481,14 @@ private:
   // Concurrent class unloading support
   void do_class_unloading();
   // Reference updating
-  void prepare_update_heap_references(bool concurrent);
+  void prepare_update_heap_references();
 
   // Retires LABs used for evacuation
   void concurrent_prepare_for_update_refs();
 
+  // Turn off weak roots flag, purge old satb buffers in generational mode
+  void concurrent_final_roots(HandshakeClosure* handshake_closure = nullptr);
+
   virtual void update_heap_references(bool concurrent);
   // Final update region states
   void update_heap_region_states(bool concurrent);
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahOldGC.cpp b/src/hotspot/share/gc/shenandoah/shenandoahOldGC.cpp
index 2f5abf99200..7c28378bf24 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahOldGC.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahOldGC.cpp
@@ -142,7 +142,7 @@ bool ShenandoahOldGC::collect(GCCause::Cause cause) {
   // return from here with weak roots in progress. This is not a valid gc state
   // for any young collections (or allocation failures) that interrupt the old
   // collection.
-  vmop_entry_final_roots();
+  heap->concurrent_final_roots();
 
   // We do not rebuild_free following increments of old marking because memory has not been reclaimed. However, we may
   // need to transfer memory to OLD in order to efficiently support the mixed evacuations that might immediately follow.
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahOldGeneration.cpp b/src/hotspot/share/gc/shenandoah/shenandoahOldGeneration.cpp
index 9b030905b6d..b0c42c7b40f 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahOldGeneration.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahOldGeneration.cpp
@@ -23,7 +23,6 @@
  *
  */
 
-#include "gc/shared/strongRootsScope.hpp"
 #include "gc/shenandoah/heuristics/shenandoahOldHeuristics.hpp"
 #include "gc/shenandoah/shenandoahAsserts.hpp"
 #include "gc/shenandoah/shenandoahCardTable.hpp"
@@ -94,6 +93,8 @@ public:
 class ShenandoahPurgeSATBTask : public WorkerTask {
 private:
   ShenandoahObjToScanQueueSet* _mark_queues;
+  // Keep track of the number of oops that are not transferred to mark queues.
+  // This is volatile because workers update it, but the vm thread reads it.
   volatile size_t             _trashed_oops;
 
 public:
@@ -124,6 +125,35 @@ public:
   }
 };
 
+class ShenandoahTransferOldSATBTask : public WorkerTask {
+  ShenandoahSATBMarkQueueSet&  _satb_queues;
+  ShenandoahObjToScanQueueSet* _mark_queues;
+  // Keep track of the number of oops that are not transferred to mark queues.
+  // This is volatile because workers update it, but the control thread reads it.
+  volatile size_t              _trashed_oops;
+
+public:
+  explicit ShenandoahTransferOldSATBTask(ShenandoahSATBMarkQueueSet& satb_queues, ShenandoahObjToScanQueueSet* mark_queues) :
+    WorkerTask("Transfer SATB"),
+    _satb_queues(satb_queues),
+    _mark_queues(mark_queues),
+    _trashed_oops(0) {}
+
+  ~ShenandoahTransferOldSATBTask() {
+    if (_trashed_oops > 0) {
+      log_debug(gc)("Purged %zu oops from old generation SATB buffers", _trashed_oops);
+    }
+  }
+
+  void work(uint worker_id) override {
+    ShenandoahObjToScanQueue* mark_queue = _mark_queues->queue(worker_id);
+    ShenandoahProcessOldSATB processor(mark_queue);
+    while (_satb_queues.apply_closure_to_completed_buffer(&processor)) {}
+
+    Atomic::add(&_trashed_oops, processor.trashed_oops());
+  }
+};
+
 class ShenandoahConcurrentCoalesceAndFillTask : public WorkerTask {
 private:
   uint                    _nworkers;
@@ -423,14 +453,25 @@ bool ShenandoahOldGeneration::coalesce_and_fill() {
   }
 }
 
-void ShenandoahOldGeneration::transfer_pointers_from_satb() {
-  ShenandoahHeap* heap = ShenandoahHeap::heap();
-  shenandoah_assert_safepoint();
+void ShenandoahOldGeneration::concurrent_transfer_pointers_from_satb() const {
+  const ShenandoahHeap* heap = ShenandoahHeap::heap();
   assert(heap->is_concurrent_old_mark_in_progress(), "Only necessary during old marking.");
   log_debug(gc)("Transfer SATB buffers");
-  uint nworkers = heap->workers()->active_workers();
-  StrongRootsScope scope(nworkers);
 
+  // Step 1. All threads need to 'complete' partially filled, thread local SATB buffers. This
+  // is accomplished in ShenandoahConcurrentGC::complete_abbreviated_cycle using a Handshake
+  // operation.
+  // Step 2. Use worker threads to transfer oops from old, active regions in the completed
+  // SATB buffers to old generation mark queues.
+  ShenandoahSATBMarkQueueSet& satb_queues = ShenandoahBarrierSet::satb_mark_queue_set();
+  ShenandoahTransferOldSATBTask transfer_task(satb_queues, task_queues());
+  heap->workers()->run_task(&transfer_task);
+}
+
+void ShenandoahOldGeneration::transfer_pointers_from_satb() const {
+  const ShenandoahHeap* heap = ShenandoahHeap::heap();
+  assert(heap->is_concurrent_old_mark_in_progress(), "Only necessary during old marking.");
+  log_debug(gc)("Transfer SATB buffers");
   ShenandoahPurgeSATBTask purge_satb_task(task_queues());
   heap->workers()->run_task(&purge_satb_task);
 }
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahOldGeneration.hpp b/src/hotspot/share/gc/shenandoah/shenandoahOldGeneration.hpp
index ed12650b8ce..b70a8d33b95 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahOldGeneration.hpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahOldGeneration.hpp
@@ -232,7 +232,8 @@ public:
   // Alternatively, we could inspect the state of the heap and the age of the
   // object at the barrier, but we reject this approach because it is likely
   // the performance impact would be too severe.
-  void transfer_pointers_from_satb();
+  void transfer_pointers_from_satb() const;
+  void concurrent_transfer_pointers_from_satb() const;
 
   // True if there are old regions waiting to be selected for a mixed collection
   bool has_unprocessed_collection_candidates();
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahPhaseTimings.cpp b/src/hotspot/share/gc/shenandoah/shenandoahPhaseTimings.cpp
index b25edfd3cb7..e16275b480a 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahPhaseTimings.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahPhaseTimings.cpp
@@ -121,6 +121,7 @@ bool ShenandoahPhaseTimings::is_worker_phase(Phase phase) {
     case conc_weak_refs:
     case conc_strong_roots:
     case conc_coalesce_and_fill:
+    case promote_in_place:
       return true;
     default:
       return false;
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahPhaseTimings.hpp b/src/hotspot/share/gc/shenandoah/shenandoahPhaseTimings.hpp
index 20c59cce69b..9100ad2b220 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahPhaseTimings.hpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahPhaseTimings.hpp
@@ -54,6 +54,7 @@ class outputStream;
   f(conc_reset_old,                                 "Concurrent Reset (OLD)")          \
   f(init_mark_gross,                                "Pause Init Mark (G)")             \
   f(init_mark,                                      "Pause Init Mark (N)")             \
+  f(init_mark_verify,                               "  Verify")                        \
   f(init_manage_tlabs,                              "  Manage TLABs")                  \
   f(init_swap_rset,                                 "  Swap Remembered Set")           \
   f(init_transfer_satb,                             "  Transfer Old From SATB")        \
@@ -71,6 +72,7 @@ class outputStream;
                                                                                        \
   f(final_mark_gross,                               "Pause Final Mark (G)")            \
   f(final_mark,                                     "Pause Final Mark (N)")            \
+  f(final_mark_verify,                              "  Verify")                        \
   f(finish_mark,                                    "  Finish Mark")                   \
   f(final_mark_propagate_gc_state,                  "  Propagate GC State")            \
   SHENANDOAH_PAR_PHASE_DO(finish_mark_,             "    FM: ", f)                     \
@@ -107,21 +109,22 @@ class outputStream;
   f(conc_strong_roots,                              "Concurrent Strong Roots")         \
   SHENANDOAH_PAR_PHASE_DO(conc_strong_roots_,       "  CSR: ", f)                      \
   f(conc_evac,                                      "Concurrent Evacuation")           \
-  f(promote_in_place,                               "Concurrent Promote Regions")      \
-  f(final_roots_gross,                              "Pause Final Roots (G)")           \
-  f(final_roots,                                    "Pause Final Roots (N)")           \
-  f(final_roots_propagate_gc_state,                 "  Propagate GC State")            \
+  f(conc_final_roots,                               "Concurrent Final Roots")          \
+  f(promote_in_place,                               "  Promote Regions")               \
+  f(final_roots_gross,                              "Pause Verify Final Roots (G)")    \
+  f(final_roots,                                    "Pause Verify Final Roots (N)")    \
                                                                                        \
   f(init_update_refs_gross,                         "Pause Init Update Refs (G)")      \
   f(init_update_refs,                               "Pause Init Update Refs (N)")      \
-  f(init_update_refs_manage_gclabs,                 "  Manage GCLABs")                 \
+  f(init_update_refs_verify,                        "  Verify")                        \
                                                                                        \
+  f(conc_update_refs_prepare,                       "Concurrent Update Refs Prepare")  \
   f(conc_update_refs,                               "Concurrent Update Refs")          \
   f(conc_update_thread_roots,                       "Concurrent Update Thread Roots")  \
                                                                                        \
   f(final_update_refs_gross,                        "Pause Final Update Refs (G)")     \
   f(final_update_refs,                              "Pause Final Update Refs (N)")     \
-  f(final_update_refs_finish_work,                  "  Finish Work")                   \
+  f(final_update_refs_verify,                       "  Verify")                        \
   f(final_update_refs_update_region_states,         "  Update Region States")          \
   f(final_update_refs_trash_cset,                   "  Trash Collection Set")          \
   f(final_update_refs_rebuild_freeset,              "  Rebuild Free Set")              \
@@ -152,7 +155,6 @@ class outputStream;
   f(degen_gc_stw_evac,                              "  Evacuation")                    \
   f(degen_gc_init_update_refs_manage_gclabs,        "  Manage GCLABs")                 \
   f(degen_gc_update_refs,                           "  Update References")             \
-  f(degen_gc_final_update_refs_finish_work,         "  Finish Work")                   \
   f(degen_gc_final_update_refs_update_region_states,"  Update Region States")          \
   f(degen_gc_final_update_refs_trash_cset,          "  Trash Collection Set")          \
   f(degen_gc_final_update_refs_rebuild_freeset,     "  Rebuild Free Set")              \
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahVMOperations.cpp b/src/hotspot/share/gc/shenandoah/shenandoahVMOperations.cpp
index bb9c3498a06..0137492f06f 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahVMOperations.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahVMOperations.cpp
@@ -116,5 +116,5 @@ void VM_ShenandoahFinalUpdateRefs::doit() {
 void VM_ShenandoahFinalRoots::doit() {
   ShenandoahGCPauseMark mark(_gc_id, "Final Roots", SvcGCMarker::CONCURRENT);
   set_active_generation();
-  _gc->entry_final_roots();
+  _gc->entry_verify_final_roots();
 }

From ac3ad03a3f946fbff147732c5f403c8dc445eed8 Mon Sep 17 00:00:00 2001
From: Andrew Dinn <adinn@openjdk.org>
Date: Wed, 19 Mar 2025 17:23:23 +0000
Subject: [PATCH 404/587] 8350589: Investigate cleaner implementation of
 AArch64 ML-DSA intrinsic introduced in JDK-8348561

Reviewed-by: dlong
---
 src/hotspot/cpu/aarch64/register_aarch64.cpp  |   20 +
 src/hotspot/cpu/aarch64/register_aarch64.hpp  |   68 +
 .../cpu/aarch64/stubGenerator_aarch64.cpp     | 1149 +++++++++--------
 3 files changed, 666 insertions(+), 571 deletions(-)

diff --git a/src/hotspot/cpu/aarch64/register_aarch64.cpp b/src/hotspot/cpu/aarch64/register_aarch64.cpp
index 82683daae4f..349845154e2 100644
--- a/src/hotspot/cpu/aarch64/register_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/register_aarch64.cpp
@@ -58,3 +58,23 @@ const char* PRegister::PRegisterImpl::name() const {
   };
   return is_valid() ? names[encoding()] : "pnoreg";
 }
+
+// convenience methods for splitting 8-way vector register sequences
+// in half -- needed because vector operations can normally only be
+// benefit from 4-way instruction parallelism
+
+VSeq<4> vs_front(const VSeq<8>& v) {
+  return VSeq<4>(v.base(), v.delta());
+}
+
+VSeq<4> vs_back(const VSeq<8>& v) {
+  return VSeq<4>(v.base() + 4 * v.delta(), v.delta());
+}
+
+VSeq<4> vs_even(const VSeq<8>& v) {
+  return VSeq<4>(v.base(), v.delta() * 2);
+}
+
+VSeq<4> vs_odd(const VSeq<8>& v) {
+  return VSeq<4>(v.base() + 1, v.delta() * 2);
+}
diff --git a/src/hotspot/cpu/aarch64/register_aarch64.hpp b/src/hotspot/cpu/aarch64/register_aarch64.hpp
index ab635e1be90..45578336cfe 100644
--- a/src/hotspot/cpu/aarch64/register_aarch64.hpp
+++ b/src/hotspot/cpu/aarch64/register_aarch64.hpp
@@ -412,4 +412,72 @@ inline Register as_Register(FloatRegister reg) {
 // High-level register class of an OptoReg or a VMReg register.
 enum RC { rc_bad, rc_int, rc_float, rc_predicate, rc_stack };
 
+// AArch64 Vector Register Sequence management support
+//
+// VSeq implements an indexable (by operator[]) vector register
+// sequence starting from a fixed base register and with a fixed delta
+// (defaulted to 1, but sometimes 0 or 2) e.g. VSeq<4>(16) will return
+// registers v16, ... v19 for indices 0, ... 3.
+//
+// Generator methods may iterate across sets of VSeq<4> to schedule an
+// operation 4 times using distinct input and output registers,
+// profiting from 4-way instruction parallelism.
+//
+// A VSeq<2> can be used to specify registers loaded with special
+// constants e.g. <v30, v31> --> <MONT_Q, MONT_Q_INV_MOD_R>.
+//
+// A VSeq with base n and delta 0 can be used to generate code that
+// combines values in another VSeq with the constant in register vn.
+//
+// A VSeq with base n and delta 2 can be used to select an odd or even
+// indexed set of registers.
+//
+// Methods which accept arguments of type VSeq<8>, may split their
+// inputs into front and back halves or odd and even halves (see
+// convenience methods below).
+
+template<int N> class VSeq {
+  static_assert(N >= 2, "vector sequence length must be greater than 1");
+  static_assert(N <= 8, "vector sequence length must not exceed 8");
+  static_assert((N & (N - 1)) == 0, "vector sequence length must be power of two");
+private:
+  int _base;  // index of first register in sequence
+  int _delta; // increment to derive successive indices
+public:
+  VSeq(FloatRegister base_reg, int delta = 1) : VSeq(base_reg->encoding(), delta) { }
+  VSeq(int base, int delta = 1) : _base(base), _delta(delta) {
+    assert (_base >= 0, "invalid base register");
+    assert (_delta >= 0, "invalid register delta");
+    assert ((_base + (N - 1) * _delta) < 32, "range exceeded");
+  }
+  // indexed access to sequence
+  FloatRegister operator [](int i) const {
+    assert (0 <= i && i < N, "index out of bounds");
+    return as_FloatRegister(_base + i * _delta);
+  }
+  int mask() const {
+    int m = 0;
+    int bit = 1 << _base;
+    for (int i = 0; i < N; i++) {
+      m |= bit << (i * _delta);
+    }
+    return m;
+  }
+  int base() const { return _base; }
+  int delta() const { return _delta; }
+};
+
+// declare convenience methods for splitting vector register sequences
+
+VSeq<4> vs_front(const VSeq<8>& v);
+VSeq<4> vs_back(const VSeq<8>& v);
+VSeq<4> vs_even(const VSeq<8>& v);
+VSeq<4> vs_odd(const VSeq<8>& v);
+
+// methods for use in asserts to check VSeq inputs and oupts are
+// either disjoint or equal
+
+template<int N, int M> bool vs_disjoint(const VSeq<N>& n, const VSeq<M>& m) { return (n.mask() & m.mask()) == 0; }
+template<int N> bool vs_same(const VSeq<N>& n, const VSeq<N>& m) { return n.mask() == m.mask(); }
+
 #endif // CPU_AARCH64_REGISTER_AARCH64_HPP
diff --git a/src/hotspot/cpu/aarch64/stubGenerator_aarch64.cpp b/src/hotspot/cpu/aarch64/stubGenerator_aarch64.cpp
index 7b8f5eca374..f0f145e3d76 100644
--- a/src/hotspot/cpu/aarch64/stubGenerator_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/stubGenerator_aarch64.cpp
@@ -4643,144 +4643,290 @@ class StubGenerator: public StubCodeGenerator {
     return start;
   }
 
-  void dilithium_load16zetas(int o0, Register zetas) {
-    __ ldpq(as_FloatRegister(o0), as_FloatRegister(o0 + 1), __ post (zetas, 32));
-    __ ldpq(as_FloatRegister(o0 + 2), as_FloatRegister(o0 + 3), __ post (zetas, 32));
+  // Helpers to schedule parallel operation bundles across vector
+  // register sequences of size 2, 4 or 8.
 
+  // Implement various primitive computations across vector sequences
+
+  template<int N>
+  void vs_addv(const VSeq<N>& v, Assembler::SIMD_Arrangement T,
+               const VSeq<N>& v1, const VSeq<N>& v2) {
+    for (int i = 0; i < N; i++) {
+      __ addv(v[i], T, v1[i], v2[i]);
+    }
   }
 
-  void dilithium_load32zetas(Register zetas) {
-    dilithium_load16zetas(16, zetas);
-    dilithium_load16zetas(20, zetas);
+  template<int N>
+  void vs_subv(const VSeq<N>& v, Assembler::SIMD_Arrangement T,
+               const VSeq<N>& v1, const VSeq<N>& v2) {
+    for (int i = 0; i < N; i++) {
+      __ subv(v[i], T, v1[i], v2[i]);
+    }
   }
 
-  // 2x16 32-bit Montgomery multiplications in parallel
+  template<int N>
+  void vs_mulv(const VSeq<N>& v, Assembler::SIMD_Arrangement T,
+               const VSeq<N>& v1, const VSeq<N>& v2) {
+    for (int i = 0; i < N; i++) {
+      __ mulv(v[i], T, v1[i], v2[i]);
+    }
+  }
+
+  template<int N>
+  void vs_negr(const VSeq<N>& v, Assembler::SIMD_Arrangement T, const VSeq<N>& v1) {
+    for (int i = 0; i < N; i++) {
+      __ negr(v[i], T, v1[i]);
+    }
+  }
+
+  template<int N>
+  void vs_sshr(const VSeq<N>& v, Assembler::SIMD_Arrangement T,
+               const VSeq<N>& v1, int shift) {
+    for (int i = 0; i < N; i++) {
+      __ sshr(v[i], T, v1[i], shift);
+    }
+  }
+
+  template<int N>
+  void vs_andr(const VSeq<N>& v, const VSeq<N>& v1, const VSeq<N>& v2) {
+    for (int i = 0; i < N; i++) {
+      __ andr(v[i], __ T16B, v1[i], v2[i]);
+    }
+  }
+
+  template<int N>
+  void vs_orr(const VSeq<N>& v, const VSeq<N>& v1, const VSeq<N>& v2) {
+    for (int i = 0; i < N; i++) {
+      __ orr(v[i], __ T16B, v1[i], v2[i]);
+    }
+  }
+
+  template<int N>
+    void vs_notr(const VSeq<N>& v, const VSeq<N>& v1) {
+    for (int i = 0; i < N; i++) {
+      __ notr(v[i], __ T16B, v1[i]);
+    }
+  }
+
+  // load N/2 successive pairs of quadword values from memory in order
+  // into N successive vector registers of the sequence via the
+  // address supplied in base.
+  template<int N>
+  void vs_ldpq(const VSeq<N>& v, Register base) {
+    for (int i = 0; i < N; i += 2) {
+      __ ldpq(v[i], v[i+1], Address(base, 32 * i));
+    }
+  }
+
+  // load N/2 successive pairs of quadword values from memory in order
+  // into N vector registers of the sequence via the address supplied
+  // in base using post-increment addressing
+  template<int N>
+  void vs_ldpq_post(const VSeq<N>& v, Register base) {
+    for (int i = 0; i < N; i += 2) {
+      __ ldpq(v[i], v[i+1], __ post(base, 32));
+    }
+  }
+
+  // store N successive vector registers of the sequence into N/2
+  // successive pairs of quadword memory locations via the address
+  // supplied in base using post-increment addressing
+  template<int N>
+  void vs_stpq_post(const VSeq<N>& v, Register base) {
+    for (int i = 0; i < N; i += 2) {
+      __ stpq(v[i], v[i+1], __ post(base, 32));
+    }
+  }
+
+  // load N/2 pairs of quadword values from memory into N vector
+  // registers via the address supplied in base with each pair indexed
+  // using the the start offset plus the corresponding entry in the
+  // offsets array
+  template<int N>
+  void vs_ldpq_indexed(const VSeq<N>& v, Register base, int start, int (&offsets)[N/2]) {
+    for (int i = 0; i < N/2; i++) {
+      __ ldpq(v[2*i], v[2*i+1], Address(base, start + offsets[i]));
+    }
+  }
+
+  // store N vector registers into N/2 pairs of quadword memory
+  // locations via the address supplied in base with each pair indexed
+  // using the the start offset plus the corresponding entry in the
+  // offsets array
+  template<int N>
+  void vs_stpq_indexed(const VSeq<N>& v, Register base, int start, int offsets[N/2]) {
+    for (int i = 0; i < N/2; i++) {
+      __ stpq(v[2*i], v[2*i+1], Address(base, start + offsets[i]));
+    }
+  }
+
+  // load N single quadword values from memory into N vector registers
+  // via the address supplied in base with each value indexed using
+  // the the start offset plus the corresponding entry in the offsets
+  // array
+  template<int N>
+  void vs_ldr_indexed(const VSeq<N>& v, Assembler::SIMD_RegVariant T, Register base,
+                      int start, int (&offsets)[N]) {
+    for (int i = 0; i < N; i++) {
+      __ ldr(v[i], T, Address(base, start + offsets[i]));
+    }
+  }
+
+  // store N vector registers into N single quadword memory locations
+  // via the address supplied in base with each value indexed using
+  // the the start offset plus the corresponding entry in the offsets
+  // array
+  template<int N>
+  void vs_str_indexed(const VSeq<N>& v, Assembler::SIMD_RegVariant T, Register base,
+                      int start, int (&offsets)[N]) {
+    for (int i = 0; i < N; i++) {
+      __ str(v[i], T, Address(base, start + offsets[i]));
+    }
+  }
+
+  // load N/2 pairs of quadword values from memory de-interleaved into
+  // N vector registers 2 at a time via the address supplied in base
+  // with each pair indexed using the the start offset plus the
+  // corresponding entry in the offsets array
+  template<int N>
+  void vs_ld2_indexed(const VSeq<N>& v, Assembler::SIMD_Arrangement T, Register base,
+                      Register tmp, int start, int (&offsets)[N/2]) {
+    for (int i = 0; i < N/2; i++) {
+      __ add(tmp, base, start + offsets[i]);
+      __ ld2(v[2*i], v[2*i+1], T, tmp);
+    }
+  }
+
+  // store N vector registers 2 at a time interleaved into N/2 pairs
+  // of quadword memory locations via the address supplied in base
+  // with each pair indexed using the the start offset plus the
+  // corresponding entry in the offsets array
+  template<int N>
+  void vs_st2_indexed(const VSeq<N>& v, Assembler::SIMD_Arrangement T, Register base,
+                      Register tmp, int start, int (&offsets)[N/2]) {
+    for (int i = 0; i < N/2; i++) {
+      __ add(tmp, base, start + offsets[i]);
+      __ st2(v[2*i], v[2*i+1], T, tmp);
+    }
+  }
+
+  // Helper routines for various flavours of dilithium montgomery
+  // multiply
+
+  // Perform 16 32-bit Montgomery multiplications in parallel
   // See the montMul() method of the sun.security.provider.ML_DSA class.
-  // Here MONT_R_BITS is 32, so the right shift by it is implicit.
-  // The constants qInv = MONT_Q_INV_MOD_R and q = MONT_Q are loaded in
-  // (all 32-bit chunks of) vector registers v30 and v31, resp.
-  // The inputs are b[i]s in v0-v7 and c[i]s v16-v23 and
-  // the results are a[i]s in v16-v23, four 32-bit values in each register
-  // and we do a_i = b_i * c_i * 2^-32 mod MONT_Q for all
-  void dilithium_montmul32(bool by_constant) {
-    FloatRegister vr0 = by_constant ? v29 : v0;
-    FloatRegister vr1 = by_constant ? v29 : v1;
-    FloatRegister vr2 = by_constant ? v29 : v2;
-    FloatRegister vr3 = by_constant ? v29 : v3;
-    FloatRegister vr4 = by_constant ? v29 : v4;
-    FloatRegister vr5 = by_constant ? v29 : v5;
-    FloatRegister vr6 = by_constant ? v29 : v6;
-    FloatRegister vr7 = by_constant ? v29 : v7;
+  //
+  // Computes 4x4S results
+  //    a = b * c * 2^-32 mod MONT_Q
+  // Inputs:  vb, vc - 4x4S vector register sequences
+  //          vq - 2x4S constants <MONT_Q, MONT_Q_INV_MOD_R>
+  // Temps:   vtmp - 4x4S vector sequence trashed after call
+  // Outputs: va - 4x4S vector register sequences
+  // vb, vc, vtmp and vq must all be disjoint
+  // va must be disjoint from all other inputs/temps or must equal vc
+  // n.b. MONT_R_BITS is 32, so the right shift by it is implicit.
+  void dilithium_montmul16(const VSeq<4>& va, const VSeq<4>& vb, const VSeq<4>& vc,
+                    const VSeq<4>& vtmp, const VSeq<2>& vq) {
+    assert(vs_disjoint(vb, vc), "vb and vc overlap");
+    assert(vs_disjoint(vb, vq), "vb and vq overlap");
+    assert(vs_disjoint(vb, vtmp), "vb and vtmp overlap");
 
-    __ sqdmulh(v24, __ T4S, vr0, v16); // aHigh = hi32(2 * b * c)
-    __ mulv(v16, __ T4S, vr0, v16);    // aLow = lo32(b * c)
-    __ sqdmulh(v25, __ T4S, vr1, v17);
-    __ mulv(v17, __ T4S, vr1, v17);
-    __ sqdmulh(v26, __ T4S, vr2, v18);
-    __ mulv(v18, __ T4S, vr2, v18);
-    __ sqdmulh(v27, __ T4S, vr3, v19);
-    __ mulv(v19, __ T4S, vr3, v19);
+    assert(vs_disjoint(vc, vq), "vc and vq overlap");
+    assert(vs_disjoint(vc, vtmp), "vc and vtmp overlap");
 
-    __ mulv(v16, __ T4S, v16, v30);     // m = aLow * qinv
-    __ mulv(v17, __ T4S, v17, v30);
-    __ mulv(v18, __ T4S, v18, v30);
-    __ mulv(v19, __ T4S, v19, v30);
+    assert(vs_disjoint(vq, vtmp), "vq and vtmp overlap");
 
-    __ sqdmulh(v16, __ T4S, v16, v31);  // n = hi32(2 * m * q)
-    __ sqdmulh(v17, __ T4S, v17, v31);
-    __ sqdmulh(v18, __ T4S, v18, v31);
-    __ sqdmulh(v19, __ T4S, v19, v31);
+    assert(vs_disjoint(va, vc) || vs_same(va, vc), "va and vc neither disjoint nor equal");
+    assert(vs_disjoint(va, vb), "va and vb overlap");
+    assert(vs_disjoint(va, vq), "va and vq overlap");
+    assert(vs_disjoint(va, vtmp), "va and vtmp overlap");
 
-    __ shsubv(v16, __ T4S, v24, v16);   // a = (aHigh - n) / 2
-    __ shsubv(v17, __ T4S, v25, v17);
-    __ shsubv(v18, __ T4S, v26, v18);
-    __ shsubv(v19, __ T4S, v27, v19);
+    // schedule 4 streams of instructions across the vector sequences
+    for (int i = 0; i < 4; i++) {
+      __ sqdmulh(vtmp[i], __ T4S, vb[i], vc[i]); // aHigh = hi32(2 * b * c)
+      __ mulv(va[i], __ T4S, vb[i], vc[i]);    // aLow = lo32(b * c)
+    }
 
-    __ sqdmulh(v24, __ T4S, vr4, v20);
-    __ mulv(v20, __ T4S, vr4, v20);
-    __ sqdmulh(v25, __ T4S, vr5, v21);
-    __ mulv(v21, __ T4S, vr5, v21);
-    __ sqdmulh(v26, __ T4S, vr6, v22);
-    __ mulv(v22, __ T4S, vr6, v22);
-    __ sqdmulh(v27, __ T4S, vr7, v23);
-    __ mulv(v23, __ T4S, vr7, v23);
+    for (int i = 0; i < 4; i++) {
+      __ mulv(va[i], __ T4S, va[i], vq[0]);     // m = aLow * qinv
+    }
 
-    __ mulv(v20, __ T4S, v20, v30);
-    __ mulv(v21, __ T4S, v21, v30);
-    __ mulv(v22, __ T4S, v22, v30);
-    __ mulv(v23, __ T4S, v23, v30);
+    for (int i = 0; i < 4; i++) {
+      __ sqdmulh(va[i], __ T4S, va[i], vq[1]);  // n = hi32(2 * m * q)
+    }
 
-    __ sqdmulh(v20, __ T4S, v20, v31);
-    __ sqdmulh(v21, __ T4S, v21, v31);
-    __ sqdmulh(v22, __ T4S, v22, v31);
-    __ sqdmulh(v23, __ T4S, v23, v31);
-
-    __ shsubv(v20, __ T4S, v24, v20);
-    __ shsubv(v21, __ T4S, v25, v21);
-    __ shsubv(v22, __ T4S, v26, v22);
-    __ shsubv(v23, __ T4S, v27, v23);
+    for (int i = 0; i < 4; i++) {
+      __ shsubv(va[i], __ T4S, vtmp[i], va[i]);   // a = (aHigh - n) / 2
+    }
   }
 
- // Do the addition and subtraction done in the ntt algorithm.
- // See sun.security.provider.ML_DSA.implDilithiumAlmostNttJava()
-  void dilithium_add_sub32() {
-    __ addv(v24, __ T4S, v0, v16); // coeffs[j] = coeffs[j] + tmp;
-    __ addv(v25, __ T4S, v1, v17);
-    __ addv(v26, __ T4S, v2, v18);
-    __ addv(v27, __ T4S, v3, v19);
-    __ addv(v28, __ T4S, v4, v20);
-    __ addv(v29, __ T4S, v5, v21);
-    __ addv(v30, __ T4S, v6, v22);
-    __ addv(v31, __ T4S, v7, v23);
+  // Perform 2x16 32-bit Montgomery multiplications in parallel
+  // See the montMul() method of the sun.security.provider.ML_DSA class.
+  //
+  // Computes 8x4S results
+  //    a = b * c * 2^-32 mod MONT_Q
+  // Inputs:  vb, vc - 8x4S vector register sequences
+  //          vq - 2x4S constants <MONT_Q, MONT_Q_INV_MOD_R>
+  // Temps:   vtmp - 4x4S vector sequence trashed after call
+  // Outputs: va - 8x4S vector register sequences
+  // vb, vc, vtmp and vq must all be disjoint
+  // va must be disjoint from all other inputs/temps or must equal vc
+  // n.b. MONT_R_BITS is 32, so the right shift by it is implicit.
+  void vs_montmul32(const VSeq<8>& va, const VSeq<8>& vb, const VSeq<8>& vc,
+                    const VSeq<4>& vtmp, const VSeq<2>& vq) {
+    // vb, vc, vtmp and vq must be disjoint. va must either be
+    // disjoint from all other registers or equal vc
 
-    __ subv(v0, __ T4S, v0, v16);  // coeffs[j + l] = coeffs[j] - tmp;
-    __ subv(v1, __ T4S, v1, v17);
-    __ subv(v2, __ T4S, v2, v18);
-    __ subv(v3, __ T4S, v3, v19);
-    __ subv(v4, __ T4S, v4, v20);
-    __ subv(v5, __ T4S, v5, v21);
-    __ subv(v6, __ T4S, v6, v22);
-    __ subv(v7, __ T4S, v7, v23);
+    assert(vs_disjoint(vb, vc), "vb and vc overlap");
+    assert(vs_disjoint(vb, vq), "vb and vq overlap");
+    assert(vs_disjoint(vb, vtmp), "vb and vtmp overlap");
+
+    assert(vs_disjoint(vc, vq), "vc and vq overlap");
+    assert(vs_disjoint(vc, vtmp), "vc and vtmp overlap");
+
+    assert(vs_disjoint(vq, vtmp), "vq and vtmp overlap");
+
+    assert(vs_disjoint(va, vc) || vs_same(va, vc), "va and vc neither disjoint nor equal");
+    assert(vs_disjoint(va, vb), "va and vb overlap");
+    assert(vs_disjoint(va, vq), "va and vq overlap");
+    assert(vs_disjoint(va, vtmp), "va and vtmp overlap");
+
+    // we need to multiply the front and back halves of each sequence
+    // 4x4S at a time because
+    //
+    // 1) we are currently only able to get 4-way instruction
+    // parallelism at best
+    //
+    // 2) we need registers for the constants in vq and temporary
+    // scratch registers to hold intermediate results so vtmp can only
+    // be a VSeq<4> which means we only have 4 scratch slots
+
+    dilithium_montmul16(vs_front(va), vs_front(vb), vs_front(vc), vtmp, vq);
+    dilithium_montmul16(vs_back(va), vs_back(vb), vs_back(vc), vtmp, vq);
   }
 
-  // Do the same computation that
-  // dilithium_montmul32() and dilithium_add_sub32() does,
-  // except for only 4x4 32-bit vector elements and with
-  // different register usage.
-  void dilithium_montmul_sub_add16() {
-    __ sqdmulh(v24, __ T4S, v1, v16);
-    __ mulv(v16, __ T4S, v1, v16);
-    __ sqdmulh(v25, __ T4S, v3, v17);
-    __ mulv(v17, __ T4S, v3, v17);
-    __ sqdmulh(v26, __ T4S, v5, v18);
-    __ mulv(v18, __ T4S, v5, v18);
-    __ sqdmulh(v27, __ T4S, v7, v19);
-    __ mulv(v19, __ T4S, v7, v19);
+  // perform combined montmul then add/sub on 4x4S vectors
 
-    __ mulv(v16, __ T4S, v16, v30);
-    __ mulv(v17, __ T4S, v17, v30);
-    __ mulv(v18, __ T4S, v18, v30);
-    __ mulv(v19, __ T4S, v19, v30);
+  void dilithium_montmul16_sub_add(const VSeq<4>& va0, const VSeq<4>& va1, const VSeq<4>& vc,
+                                   const VSeq<4>& vtmp, const VSeq<2>& vq) {
+    // compute a = montmul(a1, c)
+    dilithium_montmul16(vc, va1, vc, vtmp, vq);
+    // ouptut a1 = a0 - a
+    vs_subv(va1, __ T4S, va0, vc);
+    //    and a0 = a0 + a
+    vs_addv(va0, __ T4S, va0, vc);
+  }
 
-    __ sqdmulh(v16, __ T4S, v16, v31);
-    __ sqdmulh(v17, __ T4S, v17, v31);
-    __ sqdmulh(v18, __ T4S, v18, v31);
-    __ sqdmulh(v19, __ T4S, v19, v31);
+  // perform combined add/sub then montul on 4x4S vectors
 
-    __ shsubv(v16, __ T4S, v24, v16);
-    __ shsubv(v17, __ T4S, v25, v17);
-    __ shsubv(v18, __ T4S, v26, v18);
-    __ shsubv(v19, __ T4S, v27, v19);
-
-    __ subv(v1, __ T4S, v0, v16);
-    __ subv(v3, __ T4S, v2, v17);
-    __ subv(v5, __ T4S, v4, v18);
-    __ subv(v7, __ T4S, v6, v19);
-
-    __ addv(v0, __ T4S, v0, v16);
-    __ addv(v2, __ T4S, v2, v17);
-    __ addv(v4, __ T4S, v4, v18);
-    __ addv(v6, __ T4S, v6, v19);
+  void dilithium_sub_add_montmul16(const VSeq<4>& va0, const VSeq<4>& va1, const VSeq<4>& vb,
+                                   const VSeq<4>& vtmp1, const VSeq<4>& vtmp2, const VSeq<2>& vq) {
+    // compute c = a0 - a1
+    vs_subv(vtmp1, __ T4S, va0, va1);
+    // output a0 = a0 + a1
+    vs_addv(va0, __ T4S, va0, va1);
+    // output a1 = b montmul c
+    dilithium_montmul16(va1, vtmp1, vb, vtmp2, vq);
   }
 
   // At these levels, the indices that correspond to the 'j's (and 'j+l's)
@@ -4798,44 +4944,47 @@ class StubGenerator: public StubCodeGenerator {
     int c1 = 0;
     int c2 = 512;
     int startIncr;
-    int incr1 = 32;
-    int incr2 = 64;
-    int incr3 = 96;
+    // don't use callee save registers v8 - v15
+    VSeq<8> vs1(0), vs2(16), vs3(24);  // 3 sets of 8x4s inputs/outputs
+    VSeq<4> vtmp = vs_front(vs3);         // n.b. tmp registers overlap vs3
+    VSeq<2> vq(30);                    // n.b. constants overlap vs3
+    int offsets[4] = { 0, 32, 64, 96 };
 
     for (int level = 0; level < 5; level++) {
       int c1Start = c1;
       int c2Start = c2;
       if (level == 3) {
-        incr1 = 32;
-        incr2 = 128;
-        incr3 = 160;
+        offsets[1] = 32;
+        offsets[2] = 128;
+        offsets[3] = 160;
       } else if (level == 4) {
-        incr1 = 64;
-        incr2 = 128;
-        incr3 = 192;
+        offsets[1] = 64;
+        offsets[2] = 128;
+        offsets[3] = 192;
       }
 
+      // for levels 1 - 4 we simply load 2 x 4 adjacent values at a
+      // time at 4 different offsets and multiply them in order by the
+      // next set of input values. So we employ indexed load and store
+      // pair instructions with arrangement 4S
       for (int i = 0; i < 4; i++) {
-        __ ldpq(v30, v31, Address(dilithiumConsts, 0)); // qInv, q
-        __ ldpq(v0, v1, Address(coeffs, c2Start));
-        __ ldpq(v2, v3, Address(coeffs, c2Start + incr1));
-        __ ldpq(v4, v5, Address(coeffs, c2Start + incr2));
-        __ ldpq(v6, v7, Address(coeffs, c2Start + incr3));
-        dilithium_load32zetas(zetas);
-        dilithium_montmul32(false);
-        __ ldpq(v0, v1, Address(coeffs, c1Start));
-        __ ldpq(v2, v3, Address(coeffs, c1Start + incr1));
-        __ ldpq(v4, v5, Address(coeffs, c1Start + incr2));
-        __ ldpq(v6, v7, Address(coeffs, c1Start + incr3));
-        dilithium_add_sub32();
-        __ stpq(v24, v25, Address(coeffs, c1Start));
-        __ stpq(v26, v27, Address(coeffs, c1Start + incr1));
-        __ stpq(v28, v29, Address(coeffs, c1Start + incr2));
-        __ stpq(v30, v31, Address(coeffs, c1Start + incr3));
-        __ stpq(v0, v1, Address(coeffs, c2Start));
-        __ stpq(v2, v3, Address(coeffs, c2Start + incr1));
-        __ stpq(v4, v5, Address(coeffs, c2Start + incr2));
-        __ stpq(v6, v7, Address(coeffs, c2Start + incr3));
+        // reload q and qinv
+        vs_ldpq(vq, dilithiumConsts); // qInv, q
+        // load 8x4S coefficients via second start pos == c2
+        vs_ldpq_indexed(vs1, coeffs, c2Start, offsets);
+        // load next 8x4S inputs == b
+        vs_ldpq_post(vs2, zetas);
+        // compute a == c2 * b mod MONT_Q
+        vs_montmul32(vs2, vs1, vs2, vtmp, vq);
+        // load 8x4s coefficients via first start pos == c1
+        vs_ldpq_indexed(vs1, coeffs, c1Start, offsets);
+        // compute a1 =  c1 + a
+        vs_addv(vs3, __ T4S, vs1, vs2);
+        // compute a2 =  c1 - a
+        vs_subv(vs1, __ T4S, vs1, vs2);
+        // output a1 and a2
+        vs_stpq_indexed(vs3, coeffs, c1Start, offsets);
+        vs_stpq_indexed(vs1, coeffs, c2Start, offsets);
 
         int k = 4 * level + i;
 
@@ -4876,7 +5025,13 @@ class StubGenerator: public StubCodeGenerator {
     const Register tmpAddr = r9;
     const Register dilithiumConsts = r10;
     const Register result = r11;
-
+    // don't use callee save registers v8 - v15
+    VSeq<8> vs1(0), vs2(16), vs3(24);  // 3 sets of 8x4s inputs/outputs
+    VSeq<4> vtmp = vs_front(vs3);         // n.b. tmp registers overlap vs3
+    VSeq<2> vq(30);                    // n.b. constants overlap vs3
+    int offsets[4] = {0, 32, 64, 96};
+    int offsets1[8] = {16, 48, 80, 112, 144, 176, 208, 240 };
+    int offsets2[8] = { 0, 32, 64, 96, 128, 160, 192, 224 };
     __ add(result, coeffs, 0);
     __ lea(dilithiumConsts, ExternalAddress((address) StubRoutines::aarch64::_dilithiumConsts));
 
@@ -4886,200 +5041,156 @@ class StubGenerator: public StubCodeGenerator {
     dilithiumNttLevel0_4(dilithiumConsts, coeffs, zetas);
 
     // level 5
+
+    // at level 5 the coefficients we need to combine with the zetas
+    // are grouped in memory in blocks of size 4. So, for both sets of
+    // coefficients we load 4 adjacent values at 8 different offsets
+    // using an indexed ldr with register variant Q and multiply them
+    // in sequence order by the next set of inputs. Likewise we store
+    // the resuls using an indexed str with register variant Q.
     for (int i = 0; i < 1024; i += 256) {
-      __ ldpq(v30, v31, Address(dilithiumConsts, 0));  // qInv, q
-      __ ldr(v0, __ Q, Address(coeffs, i + 16));
-      __ ldr(v1, __ Q, Address(coeffs, i + 48));
-      __ ldr(v2, __ Q, Address(coeffs, i + 80));
-      __ ldr(v3, __ Q, Address(coeffs, i + 112));
-      __ ldr(v4, __ Q, Address(coeffs, i + 144));
-      __ ldr(v5, __ Q, Address(coeffs, i + 176));
-      __ ldr(v6, __ Q, Address(coeffs, i + 208));
-      __ ldr(v7, __ Q, Address(coeffs, i + 240));
-      dilithium_load32zetas(zetas);
-      dilithium_montmul32(false);
-      __ ldr(v0, __ Q, Address(coeffs, i));
-      __ ldr(v1, __ Q, Address(coeffs, i + 32));
-      __ ldr(v2, __ Q, Address(coeffs, i + 64));
-      __ ldr(v3, __ Q, Address(coeffs, i + 96));
-      __ ldr(v4, __ Q, Address(coeffs, i + 128));
-      __ ldr(v5, __ Q, Address(coeffs, i + 160));
-      __ ldr(v6, __ Q, Address(coeffs, i + 192));
-      __ ldr(v7, __ Q, Address(coeffs, i + 224));
-      dilithium_add_sub32();
-      __ str(v24, __ Q, Address(coeffs, i));
-      __ str(v25, __ Q, Address(coeffs, i + 32));
-      __ str(v26, __ Q, Address(coeffs, i + 64));
-      __ str(v27, __ Q, Address(coeffs, i + 96));
-      __ str(v28, __ Q, Address(coeffs, i + 128));
-      __ str(v29, __ Q, Address(coeffs, i + 160));
-      __ str(v30, __ Q, Address(coeffs, i + 192));
-      __ str(v31, __ Q, Address(coeffs, i + 224));
-      __ str(v0, __ Q, Address(coeffs, i + 16));
-      __ str(v1, __ Q, Address(coeffs, i + 48));
-      __ str(v2, __ Q, Address(coeffs, i + 80));
-      __ str(v3, __ Q, Address(coeffs, i + 112));
-      __ str(v4, __ Q, Address(coeffs, i + 144));
-      __ str(v5, __ Q, Address(coeffs, i + 176));
-      __ str(v6, __ Q, Address(coeffs, i + 208));
-      __ str(v7, __ Q, Address(coeffs, i + 240));
+      // reload constants q, qinv each iteration as they get clobbered later
+      vs_ldpq(vq, dilithiumConsts); // qInv, q
+      // load 32 (8x4S) coefficients via first offsets = c1
+      vs_ldr_indexed(vs1, __ Q, coeffs, i, offsets1);
+      // load next 32 (8x4S) inputs = b
+      vs_ldpq_post(vs2, zetas);
+      // a = b montul c1
+      vs_montmul32(vs2, vs1, vs2, vtmp, vq);
+      // load 32 (8x4S) coefficients via second offsets = c2
+      vs_ldr_indexed(vs1, __ Q, coeffs, i, offsets2);
+      // add/sub with result of multiply
+      vs_addv(vs3, __ T4S, vs1, vs2);     // a1 = a - c2
+      vs_subv(vs1, __ T4S, vs1, vs2);     // a0 = a + c1
+      // write back new coefficients using same offsets
+      vs_str_indexed(vs3, __ Q, coeffs, i, offsets2);
+      vs_str_indexed(vs1, __ Q, coeffs, i, offsets1);
     }
 
     // level 6
+    // at level 6 the coefficients we need to combine with the zetas
+    // are grouped in memory in pairs, the first two being montmul
+    // inputs and the second add/sub inputs. We can still implement
+    // the montmul+sub+add using 4-way parallelism but only if we
+    // combine the coefficients with the zetas 16 at a time. We load 8
+    // adjacent values at 4 different offsets using an ld2 load with
+    // arrangement 2D. That interleaves the lower and upper halves of
+    // each pair of quadwords into successive vector registers. We
+    // then need to montmul the 4 even elements of the coefficients
+    // register sequence by the zetas in order and then add/sub the 4
+    // odd elements of the coefficients register sequence. We use an
+    // equivalent st2 operation to store the results back into memory
+    // de-interleaved.
     for (int i = 0; i < 1024; i += 128) {
-      __ ldpq(v30, v31, Address(dilithiumConsts, 0));  // qInv, q
-      __ add(tmpAddr, coeffs, i);
-      __ ld2(v0, v1, __ T2D, tmpAddr);
-      __ add(tmpAddr, coeffs, i + 32);
-      __ ld2(v2, v3, __ T2D, tmpAddr);
-      __ add(tmpAddr, coeffs, i + 64);
-      __ ld2(v4, v5, __ T2D, tmpAddr);
-      __ add(tmpAddr, coeffs, i + 96);
-      __ ld2(v6, v7, __ T2D, tmpAddr);
-      dilithium_load16zetas(16, zetas);
-      dilithium_montmul_sub_add16();
-      __ add(tmpAddr, coeffs, i);
-      __ st2(v0, v1, __ T2D, tmpAddr);
-      __ add(tmpAddr, coeffs, i + 32);
-      __ st2(v2, v3, __ T2D, tmpAddr);
-      __ add(tmpAddr, coeffs, i + 64);
-      __ st2(v4, v5, __ T2D, tmpAddr);
-      __ add(tmpAddr, coeffs, i + 96);
-      __ st2(v6, v7, __ T2D, tmpAddr);
+      // reload constants q, qinv each iteration as they get clobbered later
+      vs_ldpq(vq, dilithiumConsts); // qInv, q
+      // load interleaved 16 (4x2D) coefficients via offsets
+      vs_ld2_indexed(vs1, __ T2D, coeffs, tmpAddr, i, offsets);
+      // load next 16 (4x4S) inputs
+      vs_ldpq_post(vs_front(vs2), zetas);
+      // mont multiply odd elements of vs1 by vs2 and add/sub into odds/evens
+      dilithium_montmul16_sub_add(vs_even(vs1), vs_odd(vs1),
+                                  vs_front(vs2), vtmp, vq);
+      // store interleaved 16 (4x2D) coefficients via offsets
+      vs_st2_indexed(vs1, __ T2D, coeffs, tmpAddr, i, offsets);
     }
 
     // level 7
+    // at level 7 the coefficients we need to combine with the zetas
+    // occur singly with montmul inputs alterating with add/sub
+    // inputs. Once again we can use 4-way parallelism to combine 16
+    // zetas at a time. However, we have to load 8 adjacent values at
+    // 4 different offsets using an ld2 load with arrangement 4S. That
+    // interleaves the the odd words of each pair into one
+    // coefficients vector register and the even words of the pair
+    // into the next register. We then need to montmul the 4 even
+    // elements of the coefficients register sequence by the zetas in
+    // order and then add/sub the 4 odd elements of the coefficients
+    // register sequence. We use an equivalent st2 operation to store
+    // the results back into memory de-interleaved.
+
     for (int i = 0; i < 1024; i += 128) {
-      __ ldpq(v30, v31, Address(dilithiumConsts, 0));  // qInv, q
-      __ add(tmpAddr, coeffs, i);
-      __ ld2(v0, v1, __ T4S, tmpAddr);
-      __ add(tmpAddr, coeffs, i + 32);
-      __ ld2(v2, v3, __ T4S, tmpAddr);
-      __ add(tmpAddr, coeffs, i + 64);
-      __ ld2(v4, v5, __ T4S, tmpAddr);
-      __ add(tmpAddr, coeffs, i + 96);
-      __ ld2(v6, v7, __ T4S, tmpAddr);
-      dilithium_load16zetas(16, zetas);
-      dilithium_montmul_sub_add16();
-      __ add(tmpAddr, coeffs, i);
-      __ st2(v0, v1, __ T4S, tmpAddr);
-      __ add(tmpAddr, coeffs, i + 32);
-      __ st2(v2, v3, __ T4S, tmpAddr);
-      __ add(tmpAddr, coeffs, i + 64);
-      __ st2(v4, v5, __ T4S, tmpAddr);
-      __ add(tmpAddr, coeffs, i + 96);
-      __ st2(v6, v7, __ T4S, tmpAddr);
+      // reload constants q, qinv each iteration as they get clobbered later
+      vs_ldpq(vq, dilithiumConsts); // qInv, q
+      // load interleaved 16 (4x4S) coefficients via offsets
+      vs_ld2_indexed(vs1, __ T4S, coeffs, tmpAddr, i, offsets);
+      // load next 16 (4x4S) inputs
+      vs_ldpq_post(vs_front(vs2), zetas);
+      // mont multiply odd elements of vs1 by vs2 and add/sub into odds/evens
+      dilithium_montmul16_sub_add(vs_even(vs1), vs_odd(vs1),
+                                  vs_front(vs2), vtmp, vq);
+      // store interleaved 16 (4x4S) coefficients via offsets
+      vs_st2_indexed(vs1, __ T4S, coeffs, tmpAddr, i, offsets);
     }
     __ leave(); // required for proper stackwalking of RuntimeStub frame
     __ mov(r0, zr); // return 0
     __ ret(lr);
 
     return start;
-
-  }
-
-  // Do the computations that can be found in the body of the loop in
-  // sun.security.provider.ML_DSA.implDilithiumAlmostInverseNttJava()
-  // for 16 coefficients in parallel:
-  // tmp = coeffs[j];
-  // coeffs[j] = (tmp + coeffs[j + l]);
-  // coeffs[j + l] = montMul(tmp - coeffs[j + l], -MONT_ZETAS_FOR_NTT[m]);
-  // coefss[j]s are loaded in v0, v2, v4 and v6,
-  // coeffs[j + l]s in v1, v3, v5 and v7,
-  // the corresponding zetas in v16, v17, v18 and v19.
-  void dilithium_sub_add_montmul16() {
-    __ subv(v20, __ T4S, v0, v1);
-    __ subv(v21, __ T4S, v2, v3);
-    __ subv(v22, __ T4S, v4, v5);
-    __ subv(v23, __ T4S, v6, v7);
-
-    __ addv(v0, __ T4S, v0, v1);
-    __ addv(v2, __ T4S, v2, v3);
-    __ addv(v4, __ T4S, v4, v5);
-    __ addv(v6, __ T4S, v6, v7);
-
-    __ sqdmulh(v24, __ T4S, v20, v16); // aHigh = hi32(2 * b * c)
-    __ mulv(v1, __ T4S, v20, v16);     // aLow = lo32(b * c)
-    __ sqdmulh(v25, __ T4S, v21, v17);
-    __ mulv(v3, __ T4S, v21, v17);
-    __ sqdmulh(v26, __ T4S, v22, v18);
-    __ mulv(v5, __ T4S, v22, v18);
-    __ sqdmulh(v27, __ T4S, v23, v19);
-    __ mulv(v7, __ T4S, v23, v19);
-
-    __ mulv(v1, __ T4S, v1, v30);      // m = (aLow * q)
-    __ mulv(v3, __ T4S, v3, v30);
-    __ mulv(v5, __ T4S, v5, v30);
-    __ mulv(v7, __ T4S, v7, v30);
-
-    __ sqdmulh(v1, __ T4S, v1, v31);  // n = hi32(2 * m * q)
-    __ sqdmulh(v3, __ T4S, v3, v31);
-    __ sqdmulh(v5, __ T4S, v5, v31);
-    __ sqdmulh(v7, __ T4S, v7, v31);
-
-    __ shsubv(v1, __ T4S, v24, v1);  // a = (aHigh  - n) / 2
-    __ shsubv(v3, __ T4S, v25, v3);
-    __ shsubv(v5, __ T4S, v26, v5);
-    __ shsubv(v7, __ T4S, v27, v7);
   }
 
   // At these levels, the indices that correspond to the 'j's (and 'j+l's)
   // in the Java implementation come in sequences of at least 8, so we
   // can use ldpq to collect the corresponding data into pairs of vector
   // registers
-  // We collect the coefficients that correspond to the 'j's into v0-v7
-  // the coefficiets that correspond to the 'j+l's into v16-v23 then
-  // do the additions into v24-v31 and the subtractions into v0-v7 then
-  // save the result of the additions, load the zetas into v16-v23
-  // do the (Montgomery) multiplications by zeta in parallel into v16-v23
+  // We collect the coefficients that correspond to the 'j's into vs1
+  // the coefficiets that correspond to the 'j+l's into vs2 then
+  // do the additions into vs3 and the subtractions into vs1 then
+  // save the result of the additions, load the zetas into vs2
+  // do the (Montgomery) multiplications by zeta in parallel into vs2
   // finally save the results back to the coeffs array
   void dilithiumInverseNttLevel3_7(const Register dilithiumConsts,
     const Register coeffs, const Register zetas) {
     int c1 = 0;
     int c2 = 32;
     int startIncr;
-    int incr1;
-    int incr2;
-    int incr3;
+    int offsets[4];
+    VSeq<8> vs1(0), vs2(16), vs3(24);  // 3 sets of 8x4s inputs/outputs
+    VSeq<4> vtmp = vs_front(vs3);      // n.b. tmp registers overlap vs3
+    VSeq<2> vq(30);                    // n.b. constants overlap vs3
+
+    offsets[0] = 0;
 
     for (int level = 3; level < 8; level++) {
       int c1Start = c1;
       int c2Start = c2;
       if (level == 3) {
-        incr1 = 64;
-        incr2 = 128;
-        incr3 = 192;
+        offsets[1] = 64;
+        offsets[2] = 128;
+        offsets[3] = 192;
       } else if (level == 4) {
-        incr1 = 32;
-        incr2 = 128;
-        incr3 = 160;
+        offsets[1] = 32;
+        offsets[2] = 128;
+        offsets[3] = 160;
       } else {
-        incr1 = 32;
-        incr2 = 64;
-        incr3 = 96;
+        offsets[1] = 32;
+        offsets[2] = 64;
+        offsets[3] = 96;
       }
 
+      // for levels 3 - 7 we simply load 2 x 4 adjacent values at a
+      // time at 4 different offsets and multiply them in order by the
+      // next set of input values. So we employ indexed load and store
+      // pair instructions with arrangement 4S
       for (int i = 0; i < 4; i++) {
-        __ ldpq(v0, v1, Address(coeffs, c1Start));
-        __ ldpq(v2, v3, Address(coeffs, c1Start + incr1));
-        __ ldpq(v4, v5, Address(coeffs, c1Start + incr2));
-        __ ldpq(v6, v7, Address(coeffs, c1Start + incr3));
-        __ ldpq(v16, v17, Address(coeffs, c2Start));
-        __ ldpq(v18, v19, Address(coeffs, c2Start + incr1));
-        __ ldpq(v20, v21, Address(coeffs, c2Start + incr2));
-        __ ldpq(v22, v23, Address(coeffs, c2Start + incr3));
-        dilithium_add_sub32();
-        __ stpq(v24, v25, Address(coeffs, c1Start));
-        __ stpq(v26, v27, Address(coeffs, c1Start + incr1));
-        __ stpq(v28, v29, Address(coeffs, c1Start + incr2));
-        __ stpq(v30, v31, Address(coeffs, c1Start + incr3));
-        __ ldpq(v30, v31, Address(dilithiumConsts, 0));   // qInv, q
-        dilithium_load32zetas(zetas);
-        dilithium_montmul32(false);
-        __ stpq(v16, v17, Address(coeffs, c2Start));
-        __ stpq(v18, v19, Address(coeffs, c2Start + incr1));
-        __ stpq(v20, v21, Address(coeffs, c2Start + incr2));
-        __ stpq(v22, v23, Address(coeffs, c2Start + incr3));
+        // load v1 32 (8x4S) coefficients relative to first start index
+        vs_ldpq_indexed(vs1, coeffs, c1Start, offsets);
+        // load v2 32 (8x4S) coefficients relative to second start index
+        vs_ldpq_indexed(vs2, coeffs, c2Start, offsets);
+        // a0 = v1 + v2 -- n.b. clobbers vqs
+        vs_addv(vs3, __ T4S, vs1, vs2);
+        // a1 = v1 - v2
+        vs_subv(vs1, __ T4S, vs1, vs2);
+        // save a1 relative to first start index
+        vs_stpq_indexed(vs3, coeffs, c1Start, offsets);
+        // load constants q, qinv each iteration as they get clobbered above
+        vs_ldpq(vq, dilithiumConsts); // qInv, q
+        // load b next 32 (8x4S) inputs
+        vs_ldpq_post(vs2, zetas);
+        // a = a1 montmul b
+        vs_montmul32(vs2, vs1, vs2, vtmp, vq);
+        // save a relative to second start index
+        vs_stpq_indexed(vs2, coeffs, c2Start, offsets);
 
         int k = 4 * level + i;
 
@@ -5120,94 +5231,84 @@ class StubGenerator: public StubCodeGenerator {
     const Register tmpAddr = r9;
     const Register dilithiumConsts = r10;
     const Register result = r11;
+    VSeq<8> vs1(0), vs2(16), vs3(24);  // 3 sets of 8x4s inputs/outputs
+    VSeq<4> vtmp = vs_front(vs3);     // n.b. tmp registers overlap vs3
+    VSeq<2> vq(30);                    // n.b. constants overlap vs3
+    int offsets[4] = { 0, 32, 64, 96 };
+    int offsets1[8] = { 0, 32, 64, 96, 128, 160, 192, 224 };
+    int offsets2[8] = { 16, 48, 80, 112, 144, 176, 208, 240 };
 
     __ add(result, coeffs, 0);
     __ lea(dilithiumConsts, ExternalAddress((address) StubRoutines::aarch64::_dilithiumConsts));
 
     // Each level represents one iteration of the outer for loop of the Java version
     // level0
+
+    // level 0
+    // At level 0 we need to interleave adjacent quartets of
+    // coefficients before we multiply and add/sub by the next 16
+    // zetas just as we did for level 7 in the multiply code. So we
+    // load and store the values using an ld2/st2 with arrangement 4S
     for (int i = 0; i < 1024; i += 128) {
-      __ ldpq(v30, v31, Address(dilithiumConsts, 0));  // qInv, q
-      __ add(tmpAddr, coeffs, i);
-      __ ld2(v0, v1, __ T4S, tmpAddr);
-      __ add(tmpAddr, coeffs, i + 32);
-      __ ld2(v2, v3, __ T4S, tmpAddr);
-      __ add(tmpAddr, coeffs, i + 64);
-      __ ld2(v4, v5, __ T4S, tmpAddr);
-      __ add(tmpAddr, coeffs, i + 96);
-      __ ld2(v6, v7, __ T4S, tmpAddr);
-      dilithium_load16zetas(16, zetas);
-      dilithium_sub_add_montmul16();
-      __ add(tmpAddr, coeffs, i);
-      __ st2(v0, v1, __ T4S, tmpAddr);
-      __ add(tmpAddr, coeffs, i + 32);
-      __ st2(v2, v3, __ T4S, tmpAddr);
-      __ add(tmpAddr, coeffs, i + 64);
-      __ st2(v4, v5, __ T4S, tmpAddr);
-      __ add(tmpAddr, coeffs, i + 96);
-      __ st2(v6, v7, __ T4S, tmpAddr);
+      // load constants q, qinv
+      // n.b. this can be moved out of the loop as they do not get
+      // clobbered by first two loops
+      vs_ldpq(vq, dilithiumConsts); // qInv, q
+      // a0/a1 load interleaved 32 (8x4S) coefficients
+      vs_ld2_indexed(vs1, __ T4S, coeffs, tmpAddr, i, offsets);
+      // b load next 32 (8x4S) inputs
+      vs_ldpq_post(vs_front(vs2), zetas);
+      // compute in parallel (a0, a1) = (a0 + a1, (a0 - a1) montmul b)
+      // n.b. second half of vs2 provides temporary register storage
+      dilithium_sub_add_montmul16(vs_even(vs1), vs_odd(vs1),
+                                  vs_front(vs2), vs_back(vs2), vtmp, vq);
+      // a0/a1 store interleaved 32 (8x4S) coefficients
+      vs_st2_indexed(vs1, __ T4S, coeffs, tmpAddr, i, offsets);
     }
 
     // level 1
+    // At level 1 we need to interleave pairs of adjacent pairs of
+    // coefficients before we multiply by the next 16 zetas just as we
+    // did for level 6 in the multiply code. So we load and store the
+    // values an ld2/st2 with arrangement 2D
     for (int i = 0; i < 1024; i += 128) {
-      __ add(tmpAddr, coeffs, i);
-      __ ld2(v0, v1, __ T2D, tmpAddr);
-      __ add(tmpAddr, coeffs, i + 32);
-      __ ld2(v2, v3, __ T2D, tmpAddr);
-      __ add(tmpAddr, coeffs, i + 64);
-      __ ld2(v4, v5, __ T2D, tmpAddr);
-      __ add(tmpAddr, coeffs, i + 96);
-      __ ld2(v6, v7, __ T2D, tmpAddr);
-      dilithium_load16zetas(16, zetas);
-      dilithium_sub_add_montmul16();
-      __ add(tmpAddr, coeffs, i);
-      __ st2(v0, v1, __ T2D, tmpAddr);
-      __ add(tmpAddr, coeffs, i + 32);
-      __ st2(v2, v3, __ T2D, tmpAddr);
-      __ add(tmpAddr, coeffs, i + 64);
-      __ st2(v4, v5, __ T2D, tmpAddr);
-      __ add(tmpAddr, coeffs, i + 96);
-      __ st2(v6, v7, __ T2D, tmpAddr);
+      // a0/a1 load interleaved 32 (8x2D) coefficients
+      vs_ld2_indexed(vs1, __ T2D, coeffs, tmpAddr, i, offsets);
+      // b load next 16 (4x4S) inputs
+      vs_ldpq_post(vs_front(vs2), zetas);
+      // compute in parallel (a0, a1) = (a0 + a1, (a0 - a1) montmul b)
+      // n.b. second half of vs2 provides temporary register storage
+      dilithium_sub_add_montmul16(vs_even(vs1), vs_odd(vs1),
+                                  vs_front(vs2), vs_back(vs2), vtmp, vq);
+      // a0/a1 store interleaved 32 (8x2D) coefficients
+      vs_st2_indexed(vs1, __ T2D, coeffs, tmpAddr, i, offsets);
     }
 
-    //level 2
+    // level 2
+    // At level 2 coefficients come in blocks of 4. So, we load 4
+    // adjacent coefficients at 8 distinct offsets for both the first
+    // and second coefficient sequences, using an ldr with register
+    // variant Q then combine them with next set of 32 zetas. Likewise
+    // we store the results using an str with register variant Q.
     for (int i = 0; i < 1024; i += 256) {
-      __ ldr(v0, __ Q, Address(coeffs, i));
-      __ ldr(v1, __ Q, Address(coeffs, i + 32));
-      __ ldr(v2, __ Q, Address(coeffs, i + 64));
-      __ ldr(v3, __ Q, Address(coeffs, i + 96));
-      __ ldr(v4, __ Q, Address(coeffs, i + 128));
-      __ ldr(v5, __ Q, Address(coeffs, i + 160));
-      __ ldr(v6, __ Q, Address(coeffs, i + 192));
-      __ ldr(v7, __ Q, Address(coeffs, i + 224));
-      __ ldr(v16, __ Q, Address(coeffs, i + 16));
-      __ ldr(v17, __ Q, Address(coeffs, i + 48));
-      __ ldr(v18, __ Q, Address(coeffs, i + 80));
-      __ ldr(v19, __ Q, Address(coeffs, i + 112));
-      __ ldr(v20, __ Q, Address(coeffs, i + 144));
-      __ ldr(v21, __ Q, Address(coeffs, i + 176));
-      __ ldr(v22, __ Q, Address(coeffs, i + 208));
-      __ ldr(v23, __ Q, Address(coeffs, i + 240));
-      dilithium_add_sub32();
-      __ str(v24, __ Q, Address(coeffs, i));
-      __ str(v25, __ Q, Address(coeffs, i + 32));
-      __ str(v26, __ Q, Address(coeffs, i + 64));
-      __ str(v27, __ Q, Address(coeffs, i + 96));
-      __ str(v28, __ Q, Address(coeffs, i + 128));
-      __ str(v29, __ Q, Address(coeffs, i + 160));
-      __ str(v30, __ Q, Address(coeffs, i + 192));
-      __ str(v31, __ Q, Address(coeffs, i + 224));
-      dilithium_load32zetas(zetas);
-      __ ldpq(v30, v31, Address(dilithiumConsts, 0));  // qInv, q
-      dilithium_montmul32(false);
-      __ str(v16, __ Q, Address(coeffs, i + 16));
-      __ str(v17, __ Q, Address(coeffs, i + 48));
-      __ str(v18, __ Q, Address(coeffs, i + 80));
-      __ str(v19, __ Q, Address(coeffs, i + 112));
-      __ str(v20, __ Q, Address(coeffs, i + 144));
-      __ str(v21, __ Q, Address(coeffs, i + 176));
-      __ str(v22, __ Q, Address(coeffs, i + 208));
-      __ str(v23, __ Q, Address(coeffs, i + 240));
+      // c0 load 32 (8x4S) coefficients via first offsets
+      vs_ldr_indexed(vs1, __ Q, coeffs, i, offsets1);
+      // c1 load 32 (8x4S) coefficients via second offsets
+      vs_ldr_indexed(vs2, __ Q,coeffs, i, offsets2);
+      // a0 = c0 + c1  n.b. clobbers vq which overlaps vs3
+      vs_addv(vs3, __ T4S, vs1, vs2);
+      // c = c0 - c1
+      vs_subv(vs1, __ T4S, vs1, vs2);
+      // store a0 32 (8x4S) coefficients via first offsets
+      vs_str_indexed(vs3, __ Q, coeffs, i, offsets1);
+      // b load 32 (8x4S) next inputs
+      vs_ldpq_post(vs2, zetas);
+      // reload constants q, qinv -- they were clobbered earlier
+      vs_ldpq(vq, dilithiumConsts); // qInv, q
+      // compute a1 = b montmul c
+      vs_montmul32(vs2, vs1, vs2, vtmp, vq);
+      // store a1 32 (8x4S) coefficients via second offsets
+      vs_str_indexed(vs2, __ Q, coeffs, i, offsets2);
     }
 
     // level 3-7
@@ -5232,7 +5333,7 @@ class StubGenerator: public StubCodeGenerator {
   // poly2 (int[256]) = c_rarg2
   address generate_dilithiumNttMult() {
 
-    __ align(CodeEntryAlignment);
+        __ align(CodeEntryAlignment);
     StubGenStubId stub_id = StubGenStubId::dilithiumNttMult_id;
     StubCodeMark mark(this, stub_id);
     address start = __ pc();
@@ -5247,9 +5348,16 @@ class StubGenerator: public StubCodeGenerator {
     const Register dilithiumConsts = r10;
     const Register len = r11;
 
+    VSeq<8> vs1(0), vs2(16), vs3(24);  // 3 sets of 8x4s inputs/outputs
+    VSeq<4> vtmp = vs_front(vs3);         // n.b. tmp registers overlap vs3
+    VSeq<2> vq(30);                    // n.b. constants overlap vs3
+    VSeq<8> vrsquare(29, 0);           // for montmul by constant RSQUARE
+
     __ lea(dilithiumConsts, ExternalAddress((address) StubRoutines::aarch64::_dilithiumConsts));
 
-    __ ldpq(v30, v31, Address(dilithiumConsts, 0));   // qInv, q
+    // load constants q, qinv
+    vs_ldpq(vq, dilithiumConsts); // qInv, q
+    // load constant rSquare into v29
     __ ldr(v29, __ Q, Address(dilithiumConsts, 48));  // rSquare
 
     __ mov(len, zr);
@@ -5257,20 +5365,16 @@ class StubGenerator: public StubCodeGenerator {
 
     __ BIND(L_loop);
 
-    __ ldpq(v0, v1, __ post(poly1, 32));
-    __ ldpq(v2, v3, __ post(poly1, 32));
-    __ ldpq(v4, v5, __ post(poly1, 32));
-    __ ldpq(v6, v7, __ post(poly1, 32));
-    __ ldpq(v16, v17, __ post(poly2, 32));
-    __ ldpq(v18, v19, __ post(poly2, 32));
-    __ ldpq(v20, v21, __ post(poly2, 32));
-    __ ldpq(v22, v23, __ post(poly2, 32));
-    dilithium_montmul32(false);
-    dilithium_montmul32(true);
-    __ stpq(v16, v17, __ post(result, 32));
-    __ stpq(v18, v19, __ post(result, 32));
-    __ stpq(v20, v21, __ post(result, 32));
-    __ stpq(v22, v23, __ post(result, 32));
+    // b load 32 (8x4S) next inputs from poly1
+    vs_ldpq_post(vs1, poly1);
+    // c load 32 (8x4S) next inputs from poly2
+    vs_ldpq_post(vs2, poly2);
+    // compute a = b montmul c
+    vs_montmul32(vs2, vs1, vs2, vtmp, vq);
+    // compute a = rsquare montmul a
+    vs_montmul32(vs2, vrsquare, vs2, vtmp, vq);
+    // save a 32 (8x4S) results
+    vs_stpq_post(vs2, result);
 
     __ sub(len, len, 128);
     __ cmp(len, (u1)128);
@@ -5308,25 +5412,30 @@ class StubGenerator: public StubCodeGenerator {
     const Register result = r11;
     const Register len = r12;
 
+    VSeq<8> vs1(0), vs2(16), vs3(24);  // 3 sets of 8x4s inputs/outputs
+    VSeq<4> vtmp = vs_front(vs3);         // n.b. tmp registers overlap vs3
+    VSeq<2> vq(30);                    // n.b. constants overlap vs3
+    VSeq<8> vconst(29, 0);             // for montmul by constant
+
+    // results track inputs
     __ add(result, coeffs, 0);
     __ lea(dilithiumConsts, ExternalAddress((address) StubRoutines::aarch64::_dilithiumConsts));
 
-    __ ldpq(v30, v31, Address(dilithiumConsts, 0));   // qInv, q
-    __ dup(v29, __ T4S, constant);
+    // load constants q, qinv -- they do not get clobbered by first two loops
+    vs_ldpq(vq, dilithiumConsts); // qInv, q
+    // copy caller supplied constant across vconst
+    __ dup(vconst[0], __ T4S, constant);
     __ mov(len, zr);
     __ add(len, len, 1024);
 
     __ BIND(L_loop);
 
-    __ ldpq(v16, v17, __ post(coeffs, 32));
-    __ ldpq(v18, v19, __ post(coeffs, 32));
-    __ ldpq(v20, v21, __ post(coeffs, 32));
-    __ ldpq(v22, v23, __ post(coeffs, 32));
-    dilithium_montmul32(true);
-    __ stpq(v16, v17, __ post(result, 32));
-    __ stpq(v18, v19, __ post(result, 32));
-    __ stpq(v20, v21, __ post(result, 32));
-    __ stpq(v22, v23, __ post(result, 32));
+    // load next 32 inputs
+    vs_ldpq_post(vs2, coeffs);
+    // mont mul by constant
+    vs_montmul32(vs2, vconst, vs2, vtmp, vq);
+    // write next 32 results
+    vs_stpq_post(vs2, result);
 
     __ sub(len, len, 128);
     __ cmp(len, (u1)128);
@@ -5337,6 +5446,7 @@ class StubGenerator: public StubCodeGenerator {
     __ ret(lr);
 
     return start;
+
   }
 
   // Dilithium decompose poly.
@@ -5355,8 +5465,6 @@ class StubGenerator: public StubCodeGenerator {
     StubGenStubId stub_id = StubGenStubId::dilithiumDecomposePoly_id;
     StubCodeMark mark(this, stub_id);
     address start = __ pc();
-    __ enter();
-
     Label L_loop;
 
     const Register input = c_rarg0;
@@ -5369,6 +5477,18 @@ class StubGenerator: public StubCodeGenerator {
     const Register dilithiumConsts = r10;
     const Register tmp = r11;
 
+    VSeq<4> vs1(0), vs2(4), vs3(8); // 6 independent sets of 4x4s values
+    VSeq<4> vs4(12), vs5(16), vtmp(20);
+    VSeq<4> one(25, 0);            // 7 constants for cross-multiplying
+    VSeq<4> qminus1(26, 0);
+    VSeq<4> g2(27, 0);
+    VSeq<4> twog2(28, 0);
+    VSeq<4> mult(29, 0);
+    VSeq<4> q(30, 0);
+    VSeq<4> qadd(31, 0);
+
+    __ enter();
+
     __ lea(dilithiumConsts, ExternalAddress((address) StubRoutines::aarch64::_dilithiumConsts));
 
     // save callee-saved registers
@@ -5377,208 +5497,94 @@ class StubGenerator: public StubCodeGenerator {
     __ stpd(v12, v13, Address(sp, 32));
     __ stpd(v14, v15, Address(sp, 48));
 
-
+    // populate constant registers
     __ mov(tmp, zr);
     __ add(tmp, tmp, 1);
-    __ dup(v25, __ T4S, tmp); // 1
-    __ ldr(v30, __ Q, Address(dilithiumConsts, 16)); // q
-    __ ldr(v31, __ Q, Address(dilithiumConsts, 64)); // addend for mod q reduce
-    __ dup(v28, __ T4S, twoGamma2); // 2 * gamma2
-    __ dup(v29, __ T4S, multiplier); // multiplier for mod 2 * gamma reduce
-    __ subv(v26, __ T4S, v30, v25); // q - 1
-    __ sshr(v27, __ T4S, v28, 1); // gamma2
+    __ dup(one[0], __ T4S, tmp); // 1
+    __ ldr(q[0], __ Q, Address(dilithiumConsts, 16)); // q
+    __ ldr(qadd[0], __ Q, Address(dilithiumConsts, 64)); // addend for mod q reduce
+    __ dup(twog2[0], __ T4S, twoGamma2); // 2 * gamma2
+    __ dup(mult[0], __ T4S, multiplier); // multiplier for mod 2 * gamma reduce
+    __ subv(qminus1[0], __ T4S, v30, v25); // q - 1
+    __ sshr(g2[0], __ T4S, v28, 1); // gamma2
 
     __ mov(len, zr);
     __ add(len, len, 1024);
 
     __ BIND(L_loop);
 
-    __ ld4(v0, v1, v2, v3, __ T4S, __ post(input, 64));
+    // load next 4x4S inputs interleaved: rplus --> vs1
+    __ ld4(vs1[0], vs1[1], vs1[2], vs1[3], __ T4S, __ post(input, 64));
 
-    // rplus in v0
-    //  rplus = rplus - ((rplus + 5373807) >> 23) * dilithium_q;
-    __ addv(v4, __ T4S, v0, v31);
-    __ addv(v5, __ T4S, v1, v31);
-    __ addv(v6, __ T4S, v2, v31);
-    __ addv(v7, __ T4S, v3, v31);
+    //  rplus = rplus - ((rplus + qadd) >> 23) * q
+    vs_addv(vtmp, __ T4S, vs1, qadd);
+    vs_sshr(vtmp, __ T4S, vtmp, 23);
+    vs_mulv(vtmp, __ T4S, vtmp, q);
+    vs_subv(vs1, __ T4S, vs1, vtmp);
 
-    __ sshr(v4, __ T4S, v4, 23);
-    __ sshr(v5, __ T4S, v5, 23);
-    __ sshr(v6, __ T4S, v6, 23);
-    __ sshr(v7, __ T4S, v7, 23);
-
-    __ mulv(v4, __ T4S, v4, v30);
-    __ mulv(v5, __ T4S, v5, v30);
-    __ mulv(v6, __ T4S, v6, v30);
-    __ mulv(v7, __ T4S, v7, v30);
-
-    __ subv(v0, __ T4S, v0, v4);
-    __ subv(v1, __ T4S, v1, v5);
-    __ subv(v2, __ T4S, v2, v6);
-    __ subv(v3, __ T4S, v3, v7);
-
-    // rplus in v0
     // rplus = rplus + ((rplus >> 31) & dilithium_q);
-    __ sshr(v4, __ T4S, v0, 31);
-    __ sshr(v5, __ T4S, v1, 31);
-    __ sshr(v6, __ T4S, v2, 31);
-    __ sshr(v7, __ T4S, v3, 31);
+    vs_sshr(vtmp, __ T4S, vs1, 31);
+    vs_andr(vtmp, vtmp, q);
+    vs_addv(vs1, __ T4S, vs1, vtmp);
 
-    __ andr(v4, __ T16B, v4, v30);
-    __ andr(v5, __ T16B, v5, v30);
-    __ andr(v6, __ T16B, v6, v30);
-    __ andr(v7, __ T16B, v7, v30);
-
-    __ addv(v0, __ T4S, v0, v4);
-    __ addv(v1, __ T4S, v1, v5);
-    __ addv(v2, __ T4S, v2, v6);
-    __ addv(v3, __ T4S, v3, v7);
-
-    // rplus in v0
+    // quotient --> vs2
     // int quotient = (rplus * multiplier) >> 22;
-    __ mulv(v4, __ T4S, v0, v29);
-    __ mulv(v5, __ T4S, v1, v29);
-    __ mulv(v6, __ T4S, v2, v29);
-    __ mulv(v7, __ T4S, v3, v29);
+    vs_mulv(vtmp, __ T4S, vs1, mult);
+    vs_sshr(vs2, __ T4S, vtmp, 22);
 
-    __ sshr(v4, __ T4S, v4, 22);
-    __ sshr(v5, __ T4S, v5, 22);
-    __ sshr(v6, __ T4S, v6, 22);
-    __ sshr(v7, __ T4S, v7, 22);
-
-    // quotient in v4
+    // r0 --> vs3
     // int r0 = rplus - quotient * twoGamma2;
-    __ mulv(v8, __ T4S, v4, v28);
-    __ mulv(v9, __ T4S, v5, v28);
-    __ mulv(v10, __ T4S, v6, v28);
-    __ mulv(v11, __ T4S, v7, v28);
+    vs_mulv(vtmp, __ T4S, vs2, twog2);
+    vs_subv(vs3, __ T4S, vs1, vtmp);
 
-    __ subv(v8, __ T4S, v0, v8);
-    __ subv(v9, __ T4S, v1, v9);
-    __ subv(v10, __ T4S, v2, v10);
-    __ subv(v11, __ T4S, v3, v11);
-
-    // r0 in v8
+    // mask --> vs4
     // int mask = (twoGamma2 - r0) >> 22;
-    __ subv(v12, __ T4S, v28, v8);
-    __ subv(v13, __ T4S, v28, v9);
-    __ subv(v14, __ T4S, v28, v10);
-    __ subv(v15, __ T4S, v28, v11);
+    vs_subv(vtmp, __ T4S, twog2, vs3);
+    vs_sshr(vs4, __ T4S, vtmp, 22);
 
-    __ sshr(v12, __ T4S, v12, 22);
-    __ sshr(v13, __ T4S, v13, 22);
-    __ sshr(v14, __ T4S, v14, 22);
-    __ sshr(v15, __ T4S, v15, 22);
-
-    // mask in v12
     // r0 -= (mask & twoGamma2);
-    __ andr(v16, __ T16B, v12, v28);
-    __ andr(v17, __ T16B, v13, v28);
-    __ andr(v18, __ T16B, v14, v28);
-    __ andr(v19, __ T16B, v15, v28);
+    vs_andr(vtmp, vs4, twog2);
+    vs_subv(vs3, __ T4S, vs3, vtmp);
 
-    __ subv(v8, __ T4S, v8, v16);
-    __ subv(v9, __ T4S, v9, v17);
-    __ subv(v10, __ T4S, v10, v18);
-    __ subv(v11, __ T4S, v11, v19);
-
-    // r0 in v8
     //  quotient += (mask & 1);
-    __ andr(v16, __ T16B, v12, v25);
-    __ andr(v17, __ T16B, v13, v25);
-    __ andr(v18, __ T16B, v14, v25);
-    __ andr(v19, __ T16B, v15, v25);
-
-    __ addv(v4, __ T4S, v4, v16);
-    __ addv(v5, __ T4S, v5, v17);
-    __ addv(v6, __ T4S, v6, v18);
-    __ addv(v7, __ T4S, v7, v19);
+    vs_andr(vtmp, vs4, one);
+    vs_addv(vs2, __ T4S, vs2, vtmp);
 
     // mask = (twoGamma2 / 2 - r0) >> 31;
-    __ subv(v12, __ T4S, v27, v8);
-    __ subv(v13, __ T4S, v27, v9);
-    __ subv(v14, __ T4S, v27, v10);
-    __ subv(v15, __ T4S, v27, v11);
-
-    __ sshr(v12, __ T4S, v12, 31);
-    __ sshr(v13, __ T4S, v13, 31);
-    __ sshr(v14, __ T4S, v14, 31);
-    __ sshr(v15, __ T4S, v15, 31);
+    vs_subv(vtmp, __ T4S, g2, vs3);
+    vs_sshr(vs4, __ T4S, vtmp, 31);
 
     // r0 -= (mask & twoGamma2);
-    __ andr(v16, __ T16B, v12, v28);
-    __ andr(v17, __ T16B, v13, v28);
-    __ andr(v18, __ T16B, v14, v28);
-    __ andr(v19, __ T16B, v15, v28);
-
-    __ subv(v8, __ T4S, v8, v16);
-    __ subv(v9, __ T4S, v9, v17);
-    __ subv(v10, __ T4S, v10, v18);
-    __ subv(v11, __ T4S, v11, v19);
+    vs_andr(vtmp, vs4, twog2);
+    vs_subv(vs3, __ T4S, vs3, vtmp);
 
     // quotient += (mask & 1);
-    __ andr(v16, __ T16B, v12, v25);
-    __ andr(v17, __ T16B, v13, v25);
-    __ andr(v18, __ T16B, v14, v25);
-    __ andr(v19, __ T16B, v15, v25);
-
-    __ addv(v4, __ T4S, v4, v16);
-    __ addv(v5, __ T4S, v5, v17);
-    __ addv(v6, __ T4S, v6, v18);
-    __ addv(v7, __ T4S, v7, v19);
+    vs_andr(vtmp, vs4, one);
+    vs_addv(vs2, __ T4S, vs2, vtmp);
 
+    // r1 --> vs5
     // int r1 = rplus - r0 - (dilithium_q - 1);
-    __ subv(v16, __ T4S, v0, v8);
-    __ subv(v17, __ T4S, v1, v9);
-    __ subv(v18, __ T4S, v2, v10);
-    __ subv(v19, __ T4S, v3, v11);
+    vs_subv(vtmp, __ T4S, vs1, vs3);
+    vs_subv(vs5, __ T4S, vtmp, qminus1);
 
-    __ subv(v16, __ T4S, v16, v26);
-    __ subv(v17, __ T4S, v17, v26);
-    __ subv(v18, __ T4S, v18, v26);
-    __ subv(v19, __ T4S, v19, v26);
-
-    // r1 in v16
+    // r1 --> vs1 (overwriting rplus)
     // r1 = (r1 | (-r1)) >> 31; // 0 if rplus - r0 == (dilithium_q - 1), -1 otherwise
-    __ negr(v20, __ T4S, v16);
-    __ negr(v21, __ T4S, v17);
-    __ negr(v22, __ T4S, v18);
-    __ negr(v23, __ T4S, v19);
+    vs_negr(vtmp, __ T4S, vs5);
+    vs_orr(vtmp, vs5, vtmp);
+    vs_sshr(vs1, __ T4S, vtmp, 31);
 
-    __ orr(v16, __ T16B, v16, v20);
-    __ orr(v17, __ T16B, v17, v21);
-    __ orr(v18, __ T16B, v18, v22);
-    __ orr(v19, __ T16B, v19, v23);
-
-    __ sshr(v0, __ T4S, v16, 31);
-    __ sshr(v1, __ T4S, v17, 31);
-    __ sshr(v2, __ T4S, v18, 31);
-    __ sshr(v3, __ T4S, v19, 31);
-
-    // r1 in v0
     // r0 += ~r1;
-    __ notr(v20, __ T16B, v0);
-    __ notr(v21, __ T16B, v1);
-    __ notr(v22, __ T16B, v2);
-    __ notr(v23, __ T16B, v3);
+    vs_notr(vtmp, vs1);
+    vs_addv(vs3, __ T4S, vs3, vtmp);
 
-    __ addv(v8, __ T4S, v8, v20);
-    __ addv(v9, __ T4S, v9, v21);
-    __ addv(v10, __ T4S, v10, v22);
-    __ addv(v11, __ T4S, v11, v23);
-
-    // r0 in v8
     // r1 = r1 & quotient;
-    __ andr(v0, __ T16B, v4, v0);
-    __ andr(v1, __ T16B, v5, v1);
-    __ andr(v2, __ T16B, v6, v2);
-    __ andr(v3, __ T16B, v7, v3);
+    vs_andr(vs1, vs2, vs1);
 
-    // r1 in v0
+    // store results inteleaved
     // lowPart[m] = r0;
     // highPart[m] = r1;
-    __ st4(v8, v9, v10, v11, __ T4S, __ post(lowPart, 64));
-    __ st4(v0, v1, v2, v3, __ T4S, __ post(highPart, 64));
+    __ st4(vs3[0], vs3[1], vs3[2], vs3[3], __ T4S, __ post(lowPart, 64));
+    __ st4(vs1[0], vs1[1], vs1[2], vs1[3], __ T4S, __ post(highPart, 64));
 
 
     __ sub(len, len, 64);
@@ -5596,6 +5602,7 @@ class StubGenerator: public StubCodeGenerator {
     __ ret(lr);
 
     return start;
+
   }
 
   /**

From fcc2a24291d499f7149debad1250903ddc369d91 Mon Sep 17 00:00:00 2001
From: Alexander Zuev <kizune@openjdk.org>
Date: Wed, 19 Mar 2025 20:05:44 +0000
Subject: [PATCH 405/587] 8350813: Rendering of bulky sound bank from MIDI
 sequence can cause OutOfMemoryError

Reviewed-by: honkar, prr
---
 .../media/sound/AudioFileSoundbankReader.java |  9 +++-
 .../midi/BulkSoundBank/BulkSoundBank.java     | 53 +++++++++++++++++++
 2 files changed, 61 insertions(+), 1 deletion(-)
 create mode 100644 test/jdk/javax/sound/midi/BulkSoundBank/BulkSoundBank.java

diff --git a/src/java.desktop/share/classes/com/sun/media/sound/AudioFileSoundbankReader.java b/src/java.desktop/share/classes/com/sun/media/sound/AudioFileSoundbankReader.java
index 6431c06a906..dbc58966973 100644
--- a/src/java.desktop/share/classes/com/sun/media/sound/AudioFileSoundbankReader.java
+++ b/src/java.desktop/share/classes/com/sun/media/sound/AudioFileSoundbankReader.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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,6 +90,13 @@ public final class AudioFileSoundbankReader extends SoundbankReader {
                         "Can not allocate enough memory to read audio data.");
             }
 
+            long maximumHeapSize = (long) ((Runtime.getRuntime().maxMemory() -
+                    (Runtime.getRuntime().totalMemory() - Runtime.getRuntime().freeMemory())) * 0.9);
+            if (totalSize > maximumHeapSize) {
+                throw new InvalidMidiDataException(
+                        "Insufficient heap size to render audio data.");
+            }
+
             if (ais.getFrameLength() == -1 || totalSize > MEGABYTE) {
                 ByteArrayOutputStream baos = new ByteArrayOutputStream();
                 byte[] buff = new byte[DEFAULT_BUFFER_SIZE - (DEFAULT_BUFFER_SIZE % frameSize)];
diff --git a/test/jdk/javax/sound/midi/BulkSoundBank/BulkSoundBank.java b/test/jdk/javax/sound/midi/BulkSoundBank/BulkSoundBank.java
new file mode 100644
index 00000000000..259b5b5283c
--- /dev/null
+++ b/test/jdk/javax/sound/midi/BulkSoundBank/BulkSoundBank.java
@@ -0,0 +1,53 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please 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.sound.midi.InvalidMidiDataException;
+import javax.sound.midi.MidiSystem;
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+
+/**
+ * @test
+ * @bug 8350813
+ * @summary Rendering of bulky sound bank from MIDI sequence can cause OutOfMemoryError.
+ * @run main/othervm -Xmx1g BulkSoundBank
+ */
+
+public class BulkSoundBank {
+    static final byte[] midi = {77, 84, 104, 100, 0, 0, 0, 6, 0, 0, 0, 1, 1,
+            -32, 77, 84, 114, 107, 0, 0, 0, 50, 0, -1, 88, 4, 4, 2, 24, 8, 0, -1,
+            81, 3, 7, -95, 32, 0, -112, 60, 64, -125, 96, -128, 60, 64, -125, -44,
+            -51, 32, -112, 48, 64, 1, -128, 48, 64, -127, -64, -45, 127, -112, 60,
+            64, 1, -128, 60, 64, 0, -1, 47, 0};
+
+    public static void main(String[] args) throws IOException {
+        try (ByteArrayInputStream bis = new ByteArrayInputStream(midi)) {
+            MidiSystem.getSoundbank(bis);
+            throw new RuntimeException("Test should throw InvalidMidiDataException"
+                                       + " but it did not.");
+        } catch (InvalidMidiDataException imda) {
+            System.out.println("Caught InvalidMidiDataException as expected");
+        }
+    }
+}
+

From 74df384a9870431efb184158bba032c79c35356e Mon Sep 17 00:00:00 2001
From: Kelvin Nilsen <kdnilsen@openjdk.org>
Date: Thu, 20 Mar 2025 00:53:33 +0000
Subject: [PATCH 406/587] 8352428: GenShen: Old-gen cycles are still looping

Reviewed-by: wkemper, shade
---
 .../share/gc/shenandoah/heuristics/shenandoahHeuristics.cpp      | 1 +
 src/hotspot/share/gc/shenandoah/shenandoahRegulatorThread.cpp    | 1 +
 2 files changed, 2 insertions(+)

diff --git a/src/hotspot/share/gc/shenandoah/heuristics/shenandoahHeuristics.cpp b/src/hotspot/share/gc/shenandoah/heuristics/shenandoahHeuristics.cpp
index f5bc74b2b1b..0f570078150 100644
--- a/src/hotspot/share/gc/shenandoah/heuristics/shenandoahHeuristics.cpp
+++ b/src/hotspot/share/gc/shenandoah/heuristics/shenandoahHeuristics.cpp
@@ -188,6 +188,7 @@ void ShenandoahHeuristics::record_cycle_end() {
 
 bool ShenandoahHeuristics::should_start_gc() {
   if (_start_gc_is_pending) {
+    log_trigger("GC start is already pending");
     return true;
   }
   // Perform GC to cleanup metaspace
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahRegulatorThread.cpp b/src/hotspot/share/gc/shenandoah/shenandoahRegulatorThread.cpp
index f9e6f714c7f..bf309af9743 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahRegulatorThread.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahRegulatorThread.cpp
@@ -80,6 +80,7 @@ void ShenandoahRegulatorThread::regulate_young_and_old_cycles() {
           }
         } else if (_old_heuristics->should_resume_old_cycle() || _old_heuristics->should_start_gc()) {
           if (request_concurrent_gc(_heap->old_generation())) {
+            _old_heuristics->cancel_trigger_request();
             log_debug(gc)("Heuristics request to resume old collection accepted");
           }
         }

From a5d06a18762c81eda5883c07b42621278b9209c9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hannes=20Walln=C3=B6fer?= <hannesw@openjdk.org>
Date: Thu, 20 Mar 2025 05:59:18 +0000
Subject: [PATCH 407/587] 8352249: Remove incidental whitespace in traditional
 doc comments

Reviewed-by: liach
---
 .../com/sun/tools/javac/api/JavacTrees.java   |   7 +-
 .../tools/javac/parser/DocCommentParser.java  |   4 +-
 .../sun/tools/javac/parser/JavaTokenizer.java |  15 +
 .../tools/javac/parser/JavadocTokenizer.java  | 161 ++++++++++-
 .../com/sun/tools/javac/parser/Tokens.java    |   3 +-
 .../com/sun/tools/javac/tree/DocPretty.java   |   2 +-
 .../sun/tools/javac/tree/DocTreeMaker.java    |   5 +-
 .../testAutoHeaderId/TestAutoHeaderId.java    |   4 +-
 .../testBreakIterator/TestBreakIterator.java  |   8 +-
 .../TestCRLineSeparator.java                  |   4 +-
 .../TestDirectedInheritance.java              |   6 +-
 .../testDocRootLink/TestDocRootLink.java      |  10 +-
 .../doclet/testDocTreeDiags/MyTaglet.java     |   3 +-
 .../testDocTreeDiags/TestDocTreeDiags.java    |   6 +-
 .../TestGenericTypeLink.java                  |  14 +-
 .../TestHtmlDefinitionListTag.java            |  28 +-
 .../doclet/testHtmlTag/TestHtmlTag.java       | 126 ++++-----
 .../javadoc/doclet/testJavaFX/TestJavaFX.java |  10 +-
 .../testLeadingSpaces/LeadingSpaces.java      |  19 +-
 .../doclet/testLinkOption/TestLinkOption.java |  26 +-
 .../doclet/testLinkTaglet/TestLinkTaglet.java |  36 +--
 .../TestLinkTagletPrimitive.java              |  14 +-
 .../TestLinkTagletWithModule.java             |  74 ++---
 .../TestLiteralCodeInPre.java                 |  58 ++--
 .../doclet/testModules/TestModules.java       |   6 +-
 .../doclet/testPreview/TestPreview.java       |   2 +-
 .../testRecordLinks/TestRecordLinks.java      |   6 +-
 .../TestRelativeModuleLinks.java              |  12 +-
 .../TestSerializedFormDeprecationInfo.java    |  10 +-
 .../TestSnippetUnnamedPackage.java            |   7 +-
 .../doclet/testSourceTab/SingleTab/C.java     |   4 +-
 .../doclet/testStylesheet/TestStylesheet.java |   4 +-
 .../tools/javac/doctree/AtEscapeTest.java     |  54 ++--
 .../tools/javac/doctree/AttrTest.java         | 162 +++++------
 .../tools/javac/doctree/CodeTest.java         |  30 +-
 .../tools/javac/doctree/DeprecatedTest.java   |  14 +-
 .../tools/javac/doctree/DocCommentTester.java |  61 +---
 .../tools/javac/doctree/ElementTest.java      |  94 +++----
 .../tools/javac/doctree/EntityTest.java       |  68 ++---
 .../tools/javac/doctree/ExceptionTest.java    |  18 +-
 .../javac/doctree/FirstSentenceTest.java      | 264 ++++++++++++------
 .../tools/javac/doctree/HiddenTest.java       |  14 +-
 .../tools/javac/doctree/InPreTest.java        |  86 +++---
 .../tools/javac/doctree/IndexTest.java        | 149 +++++-----
 .../tools/javac/doctree/LinkPlainTest.java    | 110 ++++----
 .../tools/javac/doctree/LinkTest.java         | 110 ++++----
 .../tools/javac/doctree/LiteralTest.java      |  23 +-
 .../tools/javac/doctree/ParamTest.java        |  22 +-
 .../tools/javac/doctree/ProvidesTest.java     |  22 +-
 .../tools/javac/doctree/ReturnTest.java       |  10 +-
 .../tools/javac/doctree/SeeTest.java          | 100 +++----
 .../tools/javac/doctree/SerialDataTest.java   |  10 +-
 .../tools/javac/doctree/SerialFieldTest.java  |  30 +-
 .../tools/javac/doctree/SerialTest.java       |  26 +-
 .../tools/javac/doctree/SinceTest.java        |  16 +-
 .../tools/javac/doctree/SnippetTest.java      |  14 +-
 .../tools/javac/doctree/SpecTest.java         |  26 +-
 .../tools/javac/doctree/SummaryTest.java      | 112 ++++----
 .../javac/doctree/SystemPropertyTest.java     |  28 +-
 .../tools/javac/doctree/TagTest.java          |  64 ++---
 .../tools/javac/doctree/ThrowableTest.java    |  26 +-
 .../tools/javac/doctree/UsesTest.java         |  22 +-
 .../tools/javac/doctree/ValueTest.java        |  86 +++---
 .../tools/javac/doctree/VersionTest.java      |  10 +-
 64 files changed, 1395 insertions(+), 1180 deletions(-)

diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/api/JavacTrees.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/api/JavacTrees.java
index ce719230455..4fb3caba7be 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/api/JavacTrees.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/api/JavacTrees.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -1070,6 +1070,11 @@ public class JavacTrees extends DocTrees {
                 return "";
             }
 
+            @Override
+            public Comment stripIndent() {
+                return this;
+            }
+
             @Override
             public JCDiagnostic.DiagnosticPosition getPos() {
                 return null;
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/DocCommentParser.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/DocCommentParser.java
index 3f7e27ca267..017c39b3c54 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/DocCommentParser.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/DocCommentParser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -158,7 +158,7 @@ public class DocCommentParser {
         this.fac = fac;
         this.diags = fac.log.diags;
         this.diagSource = diagSource;
-        this.comment = comment;
+        this.comment = comment.stripIndent();
         names = fac.names;
         this.isHtmlFile = isHtmlFile;
         textKind = isHtmlFile ? DocTree.Kind.TEXT : getTextKind(comment);
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/JavaTokenizer.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/JavaTokenizer.java
index 2cec3549c7a..db675e3d0b3 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/JavaTokenizer.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/JavaTokenizer.java
@@ -1265,6 +1265,21 @@ public class JavaTokenizer extends UnicodeReader {
             return null;
         }
 
+        /**
+         * Return a version of this comment with incidental whitespace removed,
+         * or this comment if the operation is not supported.
+         *
+         * @return comment with removed whitespace or this comment
+         */
+        public Comment stripIndent() {
+            return this;
+        }
+
+        /**
+         * Return the diagnostic position of this comment.
+         *
+         * @return diagnostic position
+         */
         public DiagnosticPosition getPos() {
             return pos;
         }
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/JavadocTokenizer.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/JavadocTokenizer.java
index 3d01e45f9b2..5dcb4cc36d4 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/JavadocTokenizer.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/JavadocTokenizer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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,11 +27,11 @@ package com.sun.tools.javac.parser;
 
 import com.sun.tools.javac.parser.Tokens.Comment;
 import com.sun.tools.javac.parser.Tokens.Comment.CommentStyle;
-import com.sun.tools.javac.util.*;
+import com.sun.tools.javac.util.JCDiagnostic;
+import com.sun.tools.javac.util.Position;
 
 import java.nio.CharBuffer;
 import java.util.Arrays;
-import java.util.regex.Pattern;
 
 /**
  * An extension to the base lexical analyzer (JavaTokenizer) that
@@ -170,6 +170,11 @@ public class JavadocTokenizer extends JavaTokenizer {
                 offsetMap.trim();
             }
         }
+
+        @Override
+        public Comment stripIndent() {
+            return StrippedComment.of(this);
+        }
     }
 
     /**
@@ -354,4 +359,154 @@ public class JavadocTokenizer extends JavaTokenizer {
             return map[startScaled + POS_OFFSET] + (pos - map[startScaled + SB_OFFSET]);
         }
     }
+
+    /**
+     * A Comment derived from a JavadocComment with leading whitespace removed from all lines.
+     * A new OffsetMap is used in combination with the OffsetMap of the original comment to
+     * translate comment locations to positions in the source file.
+     *
+     * Note: This class assumes new lines are encoded as {@code '\n'}, which is the case
+     * for comments created by {@code JavadocTokenizer}.
+     */
+    static class StrippedComment implements Comment {
+        String text;
+        final OffsetMap strippedMap;
+        final OffsetMap sourceMap;
+        // Copy these fields to not hold a reference to the original comment with its text
+        final JCDiagnostic.DiagnosticPosition diagPos;
+        final CommentStyle style;
+        final boolean deprecated;
+
+        /**
+         * Returns a stripped version of the comment, or the comment itself if there is no
+         * whitespace that can be stripped.
+         *
+         * @param comment the original comment
+         * @return stripped or original comment
+         */
+        static Comment of(JavadocComment comment) {
+            if (comment.getStyle() != CommentStyle.JAVADOC_BLOCK) {
+                return comment;
+            }
+            int indent = getIndent(comment);
+            return indent > 0 ? new StrippedComment(comment, indent) : comment;
+        }
+
+        private StrippedComment(JavadocComment comment, int indent) {
+            this.diagPos = comment.getPos();
+            this.style = comment.getStyle();
+            this.deprecated = comment.isDeprecated();
+            this.strippedMap = new OffsetMap();
+            this.sourceMap = comment.offsetMap;
+            stripComment(comment, indent);
+        }
+
+        /**
+         * Determines the number of leading whitespace characters that can be removed from
+         * all non-blank lines of the original comment.
+         *
+         * @param comment the original comment
+         * @return number of leading whitespace characters that can be reomved
+         */
+        static int getIndent(Comment comment) {
+            String txt = comment.getText();
+            int len = txt.length();
+            int indent = Integer.MAX_VALUE;
+
+            for (int i = 0; i < len; ) {
+                int next;
+                boolean inIndent = true;
+                for (next = i; next < len && txt.charAt(next) != '\n'; next++) {
+                    if (inIndent && !Character.isWhitespace(txt.charAt(next))) {
+                        indent = Math.min(indent, next - i);
+                        inIndent = false;
+                    }
+                }
+                i = next + 1;
+            }
+
+            return indent == Integer.MAX_VALUE ? 0 : indent;
+        }
+
+        /**
+         * Strips {@code indent} whitespace characters from every line of the original comment
+         * and initializes an OffsetMap to translate positions to the original comment's OffsetMap.
+         * This method does not distinguish between blank and non-blank lines except for the fact
+         * that blank lines are not required to contain the number of leading whitespace indicated
+         * by {@indent}.
+         *
+         * @param comment the original comment
+         * @param indent number of whitespace characters to remove from each non-blank line
+         */
+        private void stripComment(JavadocComment comment, int indent) {
+            String txt = comment.getText();
+            int len = txt.length();
+            StringBuilder sb = new StringBuilder(len);
+
+            for (int i = 0; i < len; ) {
+                int startOfLine = i;
+                // Advance till start of stripped line, or \n if line is blank
+                while (startOfLine < len
+                        && startOfLine < i + indent
+                        && txt.charAt(startOfLine) != '\n') {
+                    assert(Character.isWhitespace(txt.charAt(startOfLine)));
+                    startOfLine++;
+                }
+                if (startOfLine == len) {
+                    break;
+                }
+
+                // Copy stripped line (terminated by \n or end of input)
+                i = startOfLine + 1;
+                while (i < len && txt.charAt(i - 1) != '\n') {
+                    i++;
+                }
+                // Add new offset if necessary
+                strippedMap.add(sb.length(), startOfLine);
+                sb.append(txt, startOfLine, i);
+            }
+
+            text = sb.toString();
+            strippedMap.trim();
+        }
+
+        @Override
+        public String getText() {
+            return text;
+        }
+
+        @Override
+        public Comment stripIndent() {
+            return this;
+        }
+
+        @Override
+        public int getSourcePos(int pos) {
+            if (pos == Position.NOPOS) {
+                return Position.NOPOS;
+            }
+
+            if (pos < 0 || pos > text.length()) {
+                throw new StringIndexOutOfBoundsException(String.valueOf(pos));
+            }
+
+            return sourceMap.getSourcePos(strippedMap.getSourcePos(pos));
+        }
+
+        @Override
+        public JCDiagnostic.DiagnosticPosition getPos() {
+            return diagPos;
+        }
+
+        @Override
+        public CommentStyle getStyle() {
+            return style;
+        }
+
+        @Override
+        public boolean isDeprecated() {
+            return deprecated;
+        }
+    }
+
 }
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/Tokens.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/Tokens.java
index 963b545b8b3..4abd9378cbe 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/Tokens.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/Tokens.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -281,6 +281,7 @@ public class Tokens {
         }
 
         String getText();
+        Comment stripIndent();
         JCDiagnostic.DiagnosticPosition getPos();
         int getSourcePos(int index);
         CommentStyle getStyle();
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/DocPretty.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/DocPretty.java
index aac2647db3c..2d0d53b94ae 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/DocPretty.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/DocPretty.java
@@ -345,7 +345,7 @@ public class DocPretty implements DocTreeVisitor<Void,Void> {
             print('{');
             printTagName(node);
             String body = node.getBody().getBody();
-            if (!body.isEmpty() && !Character.isWhitespace(body.charAt(0))) {
+            if (!body.isEmpty() && body.charAt(0) != '\n') {
                 print(' ');
             }
             print(node.getBody());
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/DocTreeMaker.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/DocTreeMaker.java
index 9e0767b6e21..2f05f0d277e 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/DocTreeMaker.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/DocTreeMaker.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -236,6 +236,9 @@ public class DocTreeMaker implements DocTreeFactory {
                 throw new UnsupportedOperationException(getClass() + ".getText");
             }
 
+            @Override
+            public Comment stripIndent() { return this; }
+
             @Override
             public CommentStyle getStyle() {
                 throw new UnsupportedOperationException(getClass() + ".getStyle");
diff --git a/test/langtools/jdk/javadoc/doclet/testAutoHeaderId/TestAutoHeaderId.java b/test/langtools/jdk/javadoc/doclet/testAutoHeaderId/TestAutoHeaderId.java
index e81fe545a4c..3e1f853e8b1 100644
--- a/test/langtools/jdk/javadoc/doclet/testAutoHeaderId/TestAutoHeaderId.java
+++ b/test/langtools/jdk/javadoc/doclet/testAutoHeaderId/TestAutoHeaderId.java
@@ -133,8 +133,8 @@ public class TestAutoHeaderId extends JavadocTester {
                     """,
                 """
                     <h2 id="3-0-multi-line-heading-with-extra-whitespace-heading"> 3.0 Multi-line
-                           heading   with extra
-                                     whitespace</h2>""");
+                          heading   with extra
+                                    whitespace</h2>""");
     }
 
     private void checkSearchIndex() {
diff --git a/test/langtools/jdk/javadoc/doclet/testBreakIterator/TestBreakIterator.java b/test/langtools/jdk/javadoc/doclet/testBreakIterator/TestBreakIterator.java
index ec5e2c214ed..d83a96c2f3f 100644
--- a/test/langtools/jdk/javadoc/doclet/testBreakIterator/TestBreakIterator.java
+++ b/test/langtools/jdk/javadoc/doclet/testBreakIterator/TestBreakIterator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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,16 +70,16 @@ public class TestBreakIterator extends JavadocTester {
         checkOutput("pkg/BreakIteratorTest.html", true,
                 """
                     <div class="block">with an anchor for the
-                     <a href="../index-all.html">top level index</a>.</div>""");
+                    <a href="../index-all.html">top level index</a>.</div>""");
 
         checkOutput("pkg/BreakIteratorTest.html", true,
                 """
                     <div class="block">A constant indicating that the keyLocation is indeterminate
-                     or not relevant.</div>""");
+                    or not relevant.</div>""");
 
         checkOutput("pkg/BreakIteratorTest.html", true,
                 """
                     <div class="block">Inline tags <i><a href="../index-all.html">extending
-                     beyond the first sentence.</a></i></div>""");
+                    beyond the first sentence.</a></i></div>""");
     }
 }
diff --git a/test/langtools/jdk/javadoc/doclet/testCRLineSeparator/TestCRLineSeparator.java b/test/langtools/jdk/javadoc/doclet/testCRLineSeparator/TestCRLineSeparator.java
index 5a0840f4f19..e4a15e46893 100644
--- a/test/langtools/jdk/javadoc/doclet/testCRLineSeparator/TestCRLineSeparator.java
+++ b/test/langtools/jdk/javadoc/doclet/testCRLineSeparator/TestCRLineSeparator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -53,7 +53,7 @@ public class TestCRLineSeparator extends JavadocTester {
 
         checkOutput("pkg/MyClass.html", true,
                 "Line 1\n"
-                + " Line 2");
+                + "Line 2");
     }
 
     // recursively copy files from fromDir to toDir, replacing newlines
diff --git a/test/langtools/jdk/javadoc/doclet/testDirectedInheritance/TestDirectedInheritance.java b/test/langtools/jdk/javadoc/doclet/testDirectedInheritance/TestDirectedInheritance.java
index 0f2b398e626..5115db98810 100644
--- a/test/langtools/jdk/javadoc/doclet/testDirectedInheritance/TestDirectedInheritance.java
+++ b/test/langtools/jdk/javadoc/doclet/testDirectedInheritance/TestDirectedInheritance.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -220,8 +220,8 @@ public class TestDirectedInheritance extends JavadocTester {
         checkExit(Exit.OK);
         new OutputChecker("x/E1.html").check("""
                 <div class="block">E1: main description
-                 I2: main description
-                 I1: main description</div>""", """
+                I2: main description
+                I1: main description</div>""", """
                 <dt>Throws:</dt>
                 <dd><code>F</code> - E1: description of an exception</dd>
                 <dd><code>F</code> - I2: first description of an exception</dd>
diff --git a/test/langtools/jdk/javadoc/doclet/testDocRootLink/TestDocRootLink.java b/test/langtools/jdk/javadoc/doclet/testDocRootLink/TestDocRootLink.java
index 2a534495e56..8c113cb5103 100644
--- a/test/langtools/jdk/javadoc/doclet/testDocRootLink/TestDocRootLink.java
+++ b/test/langtools/jdk/javadoc/doclet/testDocRootLink/TestDocRootLink.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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,10 +59,10 @@ public class TestDocRootLink extends JavadocTester {
                 Refer <a href="../../technotes/guides/index.html">Here</a>""",
             """
                 This <a href="../pkg2/C2.html">Here</a> should not be replaced
-                 with an absolute link.""",
+                with an absolute link.""",
             """
                 Testing <a href="../technotes/guides/index.html">Link 1</a> and
-                 <a href="../pkg2/C2.html">Link 2</a>.""");
+                <a href="../pkg2/C2.html">Link 2</a>.""");
 
         checkOutput("pkg1/package-summary.html", true,
             """
@@ -102,10 +102,10 @@ public class TestDocRootLink extends JavadocTester {
                 Refer <a href="http://download.oracle.com/javase/7/docs/technotes/guides/index.html">Here</a>""",
             """
                 This <a href="../pkg1/C1.html">Here</a> should not be replaced
-                 with an absolute link.""",
+                with an absolute link.""",
             """
                 Testing <a href="../technotes/guides/index.html">Link 1</a> and
-                 <a href="../pkg1/C1.html">Link 2</a>.""");
+                <a href="../pkg1/C1.html">Link 2</a>.""");
 
         checkOutput("pkg2/package-summary.html", true,
             """
diff --git a/test/langtools/jdk/javadoc/doclet/testDocTreeDiags/MyTaglet.java b/test/langtools/jdk/javadoc/doclet/testDocTreeDiags/MyTaglet.java
index c5aa3e3b78f..54efaf4c71f 100644
--- a/test/langtools/jdk/javadoc/doclet/testDocTreeDiags/MyTaglet.java
+++ b/test/langtools/jdk/javadoc/doclet/testDocTreeDiags/MyTaglet.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -155,6 +155,7 @@ public class MyTaglet implements Taglet {
                 assert (s.length() > 2 * pad + 3) : ">>>" + s + "<<<";
                 int mid = s.length() / 2;
                 String detail = s.substring(mid - pad, mid) + "[" + s.charAt(mid) + "]" + s.substring(mid + 1, mid + pad + 1);
+                assert (!detail.contains("\n")) : "Can't handle newline in details";
                 // The diagnostic is reported at a position in a range of characters
                 // in the middle of the string; the characters are encoded within the
                 // message of the diagnostic, with {@code [ ]} surrounding the character
diff --git a/test/langtools/jdk/javadoc/doclet/testDocTreeDiags/TestDocTreeDiags.java b/test/langtools/jdk/javadoc/doclet/testDocTreeDiags/TestDocTreeDiags.java
index 4172e2ef815..2a21ebf5663 100644
--- a/test/langtools/jdk/javadoc/doclet/testDocTreeDiags/TestDocTreeDiags.java
+++ b/test/langtools/jdk/javadoc/doclet/testDocTreeDiags/TestDocTreeDiags.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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      8268420
+ * @bug      8268420 8352249
  * @summary  new Reporter method to report a diagnostic within a DocTree node
  * @library  /tools/lib ../../lib
  * @modules jdk.javadoc/jdk.javadoc.internal.tool
@@ -98,7 +98,7 @@ public class TestDocTreeDiags extends JavadocTester {
                         /**
                          * Sentence for method m(). More details for the method.
                          * Embedded {@link java.lang.Object} link.
-                         * And another <!-- unusual comment --> strange comment.
+                         * And yet another <!-- unusual comment --> strange comment.
                          * @scanMe
                          */
                          public void m() { }
diff --git a/test/langtools/jdk/javadoc/doclet/testGenericTypeLink/TestGenericTypeLink.java b/test/langtools/jdk/javadoc/doclet/testGenericTypeLink/TestGenericTypeLink.java
index 5b77a85a460..b6317a1e581 100644
--- a/test/langtools/jdk/javadoc/doclet/testGenericTypeLink/TestGenericTypeLink.java
+++ b/test/langtools/jdk/javadoc/doclet/testGenericTypeLink/TestGenericTypeLink.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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     8177280 8262992 8259499 8307377
+ * @bug     8177280 8262992 8259499 8307377 8352249
  * @summary see and link tag syntax should allow generic types
  * @library ../../lib
  * @modules jdk.javadoc/jdk.javadoc.internal.tool
@@ -56,13 +56,13 @@ public class TestGenericTypeLink extends JavadocTester {
                     ist.html" title="class or interface in java.util" class="external-link">List</a>&lt\
                     ;<a href="http://example.com/docs/api/java.base/java/lang/String.html" title="class\
                      or interface in java.lang" class="external-link">String</a>&gt;</code>
-                     <a href="http://example.com/docs/api/java.base/java/util/List.html" title="class o\
+                    <a href="http://example.com/docs/api/java.base/java/util/List.html" title="class o\
                     r interface in java.util" class="external-link">List</a>&lt;? extends <a href="http\
                     ://example.com/docs/api/java.base/java/lang/CharSequence.html" title="class or inte\
                     rface in java.lang" class="external-link">CharSequence</a>&gt;
-                     <a href="#someMethod(java.util.List,int)"><code>someMethod(ArrayList&lt;Integer&gt\
+                    <a href="#someMethod(java.util.List,int)"><code>someMethod(ArrayList&lt;Integer&gt\
                     ;, int)</code></a>
-                     <a href="#otherMethod(java.util.Map,double)"><code>otherMethod(Map&lt;String, Stri\
+                    <a href="#otherMethod(java.util.Map,double)"><code>otherMethod(Map&lt;String, Stri\
                     ngBuilder&gt;, double)</code></a></div>
                     """,
 
@@ -99,7 +99,7 @@ public class TestGenericTypeLink extends JavadocTester {
                     ttp://example.com/docs/api/java.base/java/lang/String.html" title="class or interfa\
                     ce in java.lang" class="external-link">String</a>, <a href="A.SomeException.htm\
                     l" title="class in pkg1">A.SomeException</a>&gt;</code>
-                     <a href="http://example.com/docs/api/java.base/java/util/Map.html" title="class or\
+                    <a href="http://example.com/docs/api/java.base/java/util/Map.html" title="class or\
                      interface in java.util" class="external-link">link to generic type with label</a>\
                     </div>""",
                 """
@@ -172,13 +172,11 @@ public class TestGenericTypeLink extends JavadocTester {
                     <pre><code>java.util.Foo&lt;String&gt;</code></pre>
                     </details>
 
-                    \s
                     <details class="invalid-tag">
                     <summary>invalid reference</summary>
                     <pre>Baz&lt;Object&gt;</pre>
                     </details>
 
-                    \s
                     <details class="invalid-tag">
                     <summary>invalid reference</summary>
                     <pre><code>#b(List&lt;Integer&gt;)</code></pre>
diff --git a/test/langtools/jdk/javadoc/doclet/testHtmlDefinitionListTag/TestHtmlDefinitionListTag.java b/test/langtools/jdk/javadoc/doclet/testHtmlDefinitionListTag/TestHtmlDefinitionListTag.java
index ac0331ef375..efb6f24f5dd 100644
--- a/test/langtools/jdk/javadoc/doclet/testHtmlDefinitionListTag/TestHtmlDefinitionListTag.java
+++ b/test/langtools/jdk/javadoc/doclet/testHtmlDefinitionListTag/TestHtmlDefinitionListTag.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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 6786690 6820360 8025633 8026567 8175200 8183511 8186332 8074407 8182765
- *      8230136
+ *      8230136 8352249
  * @summary This test verifies the nesting of definition list tags.
  * @library ../../lib
  * @modules jdk.javadoc/jdk.javadoc.internal.tool
@@ -184,15 +184,15 @@ public class TestHtmlDefinitionListTag extends JavadocTester {
                     <dd><code>test</code> - boolean value</dd>
                     <dt>Throws:</dt>
                     <dd><code>java.lang.IllegalArgumentException</code> - if the <code>owner</code>'s
-                         <code>GraphicsConfiguration</code> is not from a screen device</dd>
+                        <code>GraphicsConfiguration</code> is not from a screen device</dd>
                     <dd><code>java.awt.HeadlessException</code></dd>
                     </dl>""",
                 """
                     <dl class="notes">
                     <dt>Parameters:</dt>
                     <dd><code>undecorated</code> - <code>true</code> if no decorations are
-                             to be enabled;
-                             <code>false</code> if decorations are to be enabled.</dd>
+                            to be enabled;
+                            <code>false</code> if decorations are to be enabled.</dd>
                     <dt>Since:</dt>
                     <dd>1.4</dd>
                     <dt>See Also:</dt>
@@ -238,7 +238,7 @@ public class TestHtmlDefinitionListTag extends JavadocTester {
                 """
                     <span class="deprecated-label">Deprecated.</span>
                     <div class="deprecation-comment">As of JDK version 1.5, replaced by
-                     <a href="pkg1/C1.html#setUndecorated(boolean)"><code>setUndecorated(boolean)</code></a>.</div>
+                    <a href="pkg1/C1.html#setUndecorated(boolean)"><code>setUndecorated(boolean)</code></a>.</div>
                     </div>
                     <div class="block">This field indicates whether the C1 is undecorated.</div>
                     <dl class="notes">
@@ -254,7 +254,7 @@ public class TestHtmlDefinitionListTag extends JavadocTester {
                 """
                     <span class="deprecated-label">Deprecated.</span>
                     <div class="deprecation-comment">As of JDK version 1.5, replaced by
-                     <a href="pkg1/C1.html#setUndecorated(boolean)"><code>setUndecorated(boolean)</code></a>.</div>
+                    <a href="pkg1/C1.html#setUndecorated(boolean)"><code>setUndecorated(boolean)</code></a>.</div>
                     </div>
                     <div class="block">Reads the object stream.</div>
                     <dl class="notes">
@@ -303,15 +303,15 @@ public class TestHtmlDefinitionListTag extends JavadocTester {
                     <dd><code>test</code> - boolean value</dd>
                     <dt>Throws:</dt>
                     <dd><code>java.lang.IllegalArgumentException</code> - if the <code>owner</code>'s
-                         <code>GraphicsConfiguration</code> is not from a screen device</dd>
+                        <code>GraphicsConfiguration</code> is not from a screen device</dd>
                     <dd><code>java.awt.HeadlessException</code></dd>
                     </dl>""",
                 """
                     <dl class="notes">
                     <dt>Parameters:</dt>
                     <dd><code>undecorated</code> - <code>true</code> if no decorations are
-                             to be enabled;
-                             <code>false</code> if decorations are to be enabled.</dd>
+                            to be enabled;
+                            <code>false</code> if decorations are to be enabled.</dd>
                     <dt>Since:</dt>
                     <dd>1.4</dd>
                     <dt>See Also:</dt>
@@ -348,7 +348,7 @@ public class TestHtmlDefinitionListTag extends JavadocTester {
                 """
                     <span class="deprecated-label">Deprecated.</span>
                     <div class="deprecation-comment">As of JDK version 1.5, replaced by
-                     <a href="pkg1/C1.html#setUndecorated(boolean)"><code>setUndecorated(boolean)</code></a>.</div>
+                    <a href="pkg1/C1.html#setUndecorated(boolean)"><code>setUndecorated(boolean)</code></a>.</div>
                     </div>
                     <div class="block">This field indicates whether the C1 is undecorated.</div>
                     <dl class="notes">
@@ -364,7 +364,7 @@ public class TestHtmlDefinitionListTag extends JavadocTester {
                 """
                     <span class="deprecated-label">Deprecated.</span>
                     <div class="deprecation-comment">As of JDK version 1.5, replaced by
-                     <a href="pkg1/C1.html#setUndecorated(boolean)"><code>setUndecorated(boolean)</code></a>.</div>
+                    <a href="pkg1/C1.html#setUndecorated(boolean)"><code>setUndecorated(boolean)</code></a>.</div>
                     </div>
                     <div class="block">Reads the object stream.</div>
                     <dl class="notes">
@@ -412,13 +412,13 @@ public class TestHtmlDefinitionListTag extends JavadocTester {
                     <pre>boolean undecorated</pre>
                     <div class="deprecation-block"><span class="deprecated-label">Deprecated.</span>
                     <div class="deprecation-comment">As of JDK version 1.5, replaced by
-                     <a href="pkg1/C1.html#setUndecorated(boolean)"><code>setUndecorated(boolean)</code></a>.</div>
+                    <a href="pkg1/C1.html#setUndecorated(boolean)"><code>setUndecorated(boolean)</code></a>.</div>
                     </div>
                     </li>""",
                 """
                     <span class="deprecated-label">Deprecated.</span>
                     <div class="deprecation-comment">As of JDK version 1.5, replaced by
-                     <a href="pkg1/C1.html#setUndecorated(boolean)"><code>setUndecorated(boolean)</code></a>.</div>
+                    <a href="pkg1/C1.html#setUndecorated(boolean)"><code>setUndecorated(boolean)</code></a>.</div>
                     </div>
                     </li>""");
     }
diff --git a/test/langtools/jdk/javadoc/doclet/testHtmlTag/TestHtmlTag.java b/test/langtools/jdk/javadoc/doclet/testHtmlTag/TestHtmlTag.java
index 083bf94ed4d..3707567d414 100644
--- a/test/langtools/jdk/javadoc/doclet/testHtmlTag/TestHtmlTag.java
+++ b/test/langtools/jdk/javadoc/doclet/testHtmlTag/TestHtmlTag.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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 6786682 4649116 8182765 8261976
+ * @bug 6786682 4649116 8182765 8261976 8352249
  * @summary This test verifies the use of lang attribute by <HTML>.
  * @library ../../lib
  * @modules jdk.javadoc/jdk.javadoc.internal.tool
@@ -116,46 +116,46 @@ public class TestHtmlTag extends JavadocTester {
         checkOutput("pkg3/A.DatatypeFactory.html", true,
                 """
                     <div class="block"><p>
-                     Factory that creates new <code>javax.xml.datatype</code>
-                     <code>Object</code>s that map XML to/from Java <code>Object</code>s.</p>
+                    Factory that creates new <code>javax.xml.datatype</code>
+                    <code>Object</code>s that map XML to/from Java <code>Object</code>s.</p>
 
-                     <p id="DatatypeFactory.newInstance">
-                     A new instance of the <code>DatatypeFactory</code> is created through the
-                     <a href="#newInstance()"><code>newInstance()</code></a> method that uses the following implementation
-                     resolution mechanisms to determine an implementation:</p>
-                     <ol>
-                     <li>
-                     If the system property specified by <a href="#DATATYPEFACTORY_PROPERTY"><code>DATATYPEFACTORY_PROPERTY</code></a>,
-                     "<code>javax.xml.datatype.DatatypeFactory</code>", exists, a class with
-                     the name of the property value is instantiated. Any Exception thrown
-                     during the instantiation process is wrapped as a
-                     <code>IllegalStateException</code>.
-                     </li>
-                     <li>
-                     If the file ${JAVA_HOME}/lib/jaxp.properties exists, it is loaded in a
-                     <code>Properties</code> <code>Object</code>. The
-                     <code>Properties</code> <code>Object </code> is then queried for the
-                     property as documented in the prior step and processed as documented in
-                     the prior step.
-                     </li>
-                     <li>
-                     Uses the service-provider loading facilities, defined by the
-                     <code>ServiceLoader</code> class, to attempt to locate and load an
-                     implementation of the service using the default loading mechanism:
-                     the service-provider loading facility will use the current thread's context class loader
-                     to attempt to load the service. If the context class loader is null, the system class loader will be used.
-                     <br>
-                     In case of <code>service configuration error</code> a
-                     <code>DatatypeConfigurationException</code> will be thrown.
-                     </li>
-                     <li>
-                     The final mechanism is to attempt to instantiate the <code>Class</code>
-                     specified by <a href="#DATATYPEFACTORY_IMPLEMENTATION_CLASS"><code>DATATYPEFACT\
+                    <p id="DatatypeFactory.newInstance">
+                    A new instance of the <code>DatatypeFactory</code> is created through the
+                    <a href="#newInstance()"><code>newInstance()</code></a> method that uses the following implementation
+                    resolution mechanisms to determine an implementation:</p>
+                    <ol>
+                    <li>
+                    If the system property specified by <a href="#DATATYPEFACTORY_PROPERTY"><code>DATATYPEFACTORY_PROPERTY</code></a>,
+                    "<code>javax.xml.datatype.DatatypeFactory</code>", exists, a class with
+                    the name of the property value is instantiated. Any Exception thrown
+                    during the instantiation process is wrapped as a
+                    <code>IllegalStateException</code>.
+                    </li>
+                    <li>
+                    If the file ${JAVA_HOME}/lib/jaxp.properties exists, it is loaded in a
+                    <code>Properties</code> <code>Object</code>. The
+                    <code>Properties</code> <code>Object </code> is then queried for the
+                    property as documented in the prior step and processed as documented in
+                    the prior step.
+                    </li>
+                    <li>
+                    Uses the service-provider loading facilities, defined by the
+                    <code>ServiceLoader</code> class, to attempt to locate and load an
+                    implementation of the service using the default loading mechanism:
+                    the service-provider loading facility will use the current thread's context class loader
+                    to attempt to load the service. If the context class loader is null, the system class loader will be used.
+                    <br>
+                    In case of <code>service configuration error</code> a
+                    <code>DatatypeConfigurationException</code> will be thrown.
+                    </li>
+                    <li>
+                    The final mechanism is to attempt to instantiate the <code>Class</code>
+                    specified by <a href="#DATATYPEFACTORY_IMPLEMENTATION_CLASS"><code>DATATYPEFACT\
                     ORY_IMPLEMENTATION_CLASS</code></a>. Any Exception
-                     thrown during the instantiation process is wrapped as a
-                     <code>IllegalStateException</code>.
-                     </li>
-                     </ol></div>""");
+                    thrown during the instantiation process is wrapped as a
+                    <code>IllegalStateException</code>.
+                    </li>
+                    </ol></div>""");
 
         checkOutput("pkg3/A.ActivationDesc.html", true,
                 """
@@ -164,21 +164,21 @@ public class TestHtmlTag extends JavadocTester {
                     <span class="extends-implements">extends java.lang.Object
                     implements java.io.Serializable</span></div>
                     <div class="block">An activation descriptor contains the information necessary to activate
-                     an object: <ul>
-                     <li> the object's group identifier,
-                     <li> the object's fully-qualified class name,
-                     <li> the object's code location (the location of the class), a codebase
-                     URL path,
-                     <li> the object's restart "mode", and,
-                     <li> a "marshalled" object that can contain object specific
-                     initialization data. </ul>
+                    an object: <ul>
+                    <li> the object's group identifier,
+                    <li> the object's fully-qualified class name,
+                    <li> the object's code location (the location of the class), a codebase
+                    URL path,
+                    <li> the object's restart "mode", and,
+                    <li> a "marshalled" object that can contain object specific
+                    initialization data. </ul>
 
-                     <p>
-                     A descriptor registered with the activation system can be used to
-                     recreate/activate the object specified by the descriptor. The
-                     <code>MarshalledObject</code> in the object's descriptor is passed as the
-                     second argument to the remote object's constructor for object to use
-                     during reinitialization/activation.</div>""");
+                    <p>
+                    A descriptor registered with the activation system can be used to
+                    recreate/activate the object specified by the descriptor. The
+                    <code>MarshalledObject</code> in the object's descriptor is passed as the
+                    second argument to the remote object's constructor for object to use
+                    during reinitialization/activation.</div>""");
 
         checkOutput("pkg3/A.ActivationGroupID.html", true,
                 """
@@ -187,16 +187,16 @@ public class TestHtmlTag extends JavadocTester {
                     <span class="extends-implements">extends java.lang.Object
                     implements java.io.Serializable</span></div>
                     <div class="block">The identifier for a registered activation group serves several purposes:
-                     <ul>
-                     <li>identifies the group uniquely within the activation system, and
-                     <li>contains a reference to the group's activation system so that the
-                     group can contact its activation system when necessary.</ul><p>
+                    <ul>
+                    <li>identifies the group uniquely within the activation system, and
+                    <li>contains a reference to the group's activation system so that the
+                    group can contact its activation system when necessary.</ul><p>
 
-                     The <code>ActivationGroupID</code> is returned from the call to
-                     <code>ActivationSystem.registerGroup</code> and is used to identify the
-                     group within the activation system. This group id is passed as one of the
-                     arguments to the activation group's special constructor when an
-                     activation group is created/recreated.</div>
+                    The <code>ActivationGroupID</code> is returned from the call to
+                    <code>ActivationSystem.registerGroup</code> and is used to identify the
+                    group within the activation system. This group id is passed as one of the
+                    arguments to the activation group's special constructor when an
+                    activation group is created/recreated.</div>
                     <dl class="notes">""");
     }
 }
diff --git a/test/langtools/jdk/javadoc/doclet/testJavaFX/TestJavaFX.java b/test/langtools/jdk/javadoc/doclet/testJavaFX/TestJavaFX.java
index cc1706bb17d..e5d8e5309bc 100644
--- a/test/langtools/jdk/javadoc/doclet/testJavaFX/TestJavaFX.java
+++ b/test/langtools/jdk/javadoc/doclet/testJavaFX/TestJavaFX.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -89,7 +89,7 @@ public class TestJavaFX extends JavadocTester {
                     r-name-link">rate</a></code></div>
                     <div class="col-last odd-row-color">
                     <div class="block">Defines the direction/speed at which the <code>Timeline</code> is expected to
-                     be played.</div>""",
+                    be played.</div>""",
                 "<dt>Default value:</dt>",
                 """
                     <dt>Since:</dt>
@@ -154,7 +154,7 @@ public class TestJavaFX extends JavadocTester {
                     span class="return-type"><a href="C.DoubleProperty.html" title="class in pkg1">C\
                     .DoubleProperty</a></span>&nbsp;<span class="element-name">rateProperty</span></div>
                     <div class="block">Defines the direction/speed at which the <code>Timeline</code> is expected to
-                     be played. This is the second line.</div>""",
+                    be played. This is the second line.</div>""",
                 """
                     <section class="detail" id="setRate(double)">
                     <h3>setRate</h3>
@@ -166,7 +166,7 @@ public class TestJavaFX extends JavadocTester {
                     <dl class="notes">
                     <dt>Property description:</dt>
                     <dd>Defines the direction/speed at which the <code>Timeline</code> is expected to
-                     be played. This is the second line.</dd>
+                    be played. This is the second line.</dd>
                     <dt>Default value:</dt>
                     <dd>11</dd>
                     <dt>Parameters:</dt>
@@ -184,7 +184,7 @@ public class TestJavaFX extends JavadocTester {
                     <dl class="notes">
                     <dt>Property description:</dt>
                     <dd>Defines the direction/speed at which the <code>Timeline</code> is expected to
-                     be played. This is the second line.</dd>
+                    be played. This is the second line.</dd>
                     <dt>Default value:</dt>
                     <dd>11</dd>
                     <dt>Returns:</dt>
diff --git a/test/langtools/jdk/javadoc/doclet/testLeadingSpaces/LeadingSpaces.java b/test/langtools/jdk/javadoc/doclet/testLeadingSpaces/LeadingSpaces.java
index 34e8a0c6f6d..3ff2844d861 100644
--- a/test/langtools/jdk/javadoc/doclet/testLeadingSpaces/LeadingSpaces.java
+++ b/test/langtools/jdk/javadoc/doclet/testLeadingSpaces/LeadingSpaces.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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 4232882 8014636
+ * @bug 4232882 8014636 8352249
  * @summary Javadoc strips all of the leading spaces when the comment
  *    does not begin with a star.  This RFE allows users to
  *    begin their comment without a leading star without leading
@@ -54,13 +54,14 @@ public class LeadingSpaces extends JavadocTester {
         checkExit(Exit.OK);
         checkOutput("LeadingSpaces.html", true,
                   """
-                      \s       1
-                                2
-                                  3
-                                    4
-                                      5
-                                        6
-                                          7""");
+                      <pre>
+                       1
+                         2
+                           3
+                             4
+                               5
+                                 6
+                                   7""");
     }
 
     /**
diff --git a/test/langtools/jdk/javadoc/doclet/testLinkOption/TestLinkOption.java b/test/langtools/jdk/javadoc/doclet/testLinkOption/TestLinkOption.java
index 5e33aaf8491..a645ef31dec 100644
--- a/test/langtools/jdk/javadoc/doclet/testLinkOption/TestLinkOption.java
+++ b/test/langtools/jdk/javadoc/doclet/testLinkOption/TestLinkOption.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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,13 +104,13 @@ public class TestLinkOption extends JavadocTester {
                     <dd>
                     <ul class="tag-list-long">
                     <li><a href="http://www.ietf.org/rfc/rfc2279.txt"><i>RFC&nbsp;2279: UTF-8, a
-                     transformation format of ISO 10646</i></a></li>
+                    transformation format of ISO 10646</i></a></li>
                     <li><a href="http://www.ietf.org/rfc/rfc2373.txt"><i>RFC&nbsp;2373: IPv6 Addressing
-                     Architecture</i></a></li>
+                    Architecture</i></a></li>
                     <li><a href="http://www.ietf.org/rfc/rfc2396.txt"><i>RFC&nbsp;2396: Uniform
-                     Resource Identifiers (URI): Generic Syntax</i></a></li>
+                    Resource Identifiers (URI): Generic Syntax</i></a></li>
                     <li><a href="http://www.ietf.org/rfc/rfc2732.txt"><i>RFC&nbsp;2732: Format for
-                     Literal IPv6 Addresses in URLs</i></a></li>
+                    Literal IPv6 Addresses in URLs</i></a></li>
                     <li><a href="C.html">A nearby file</a></li>
                     </ul>
                     </dd>
@@ -167,11 +167,11 @@ public class TestLinkOption extends JavadocTester {
                     ass="element-name type-name-label">A</span>
                     <span class="extends-implements">extends java.lang.Object</span></div>
                     <div class="block">Test links.
-                     <br>
-                     <a href="../../out2/pkg2/C2.html" title="class or interface in pkg2" class="ext\
+                    <br>
+                    <a href="../../out2/pkg2/C2.html" title="class or interface in pkg2" class="ext\
                     ernal-link"><code>link to pkg2.C2</code></a>
-                     <br>
-                     <a href="../../out1/mylib/lang/StringBuilderChild.html" title="class or interfa\
+                    <br>
+                    <a href="../../out1/mylib/lang/StringBuilderChild.html" title="class or interfa\
                     ce in mylib.lang" class="external-link"><code>link to mylib.lang.StringBuilderCh\
                     ild</code></a>.</div>
                     """
@@ -192,11 +192,11 @@ public class TestLinkOption extends JavadocTester {
                     ass="element-name type-name-label">A</span>
                     <span class="extends-implements">extends java.lang.Object</span></div>
                     <div class="block">Test links.
-                     <br>
-                     <a href="../../copy/out2/pkg2/C2.html" title="class or interface in pkg2" class\
+                    <br>
+                    <a href="../../copy/out2/pkg2/C2.html" title="class or interface in pkg2" class\
                     ="external-link"><code>link to pkg2.C2</code></a>
-                     <br>
-                     <a href="../../copy/out1/mylib/lang/StringBuilderChild.html" title="class or in\
+                    <br>
+                    <a href="../../copy/out1/mylib/lang/StringBuilderChild.html" title="class or in\
                     terface in mylib.lang" class="external-link"><code>link to mylib.lang.StringBuil\
                     derChild</code></a>.</div>
                     """
diff --git a/test/langtools/jdk/javadoc/doclet/testLinkTaglet/TestLinkTaglet.java b/test/langtools/jdk/javadoc/doclet/testLinkTaglet/TestLinkTaglet.java
index 422b0fcddc8..b22d96ea6b2 100644
--- a/test/langtools/jdk/javadoc/doclet/testLinkTaglet/TestLinkTaglet.java
+++ b/test/langtools/jdk/javadoc/doclet/testLinkTaglet/TestLinkTaglet.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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      4732864 6280605 7064544 8014636 8016328 8025633 8071982 8182765
- *           8274781 8345664
+ *           8274781 8345664 8352249
  * @summary  Make sure that you can link from one member to another using
  *           non-qualified name, furthermore, ensure the right one is linked.
  * @library  ../../lib
@@ -53,31 +53,31 @@ public class TestLinkTaglet extends JavadocTester {
         checkOutput("pkg/package-summary.html", true,
                 """
                     Qualified Link: <a href="C.InnerC.html" title="class in pkg"><code>C.InnerC</code></a>.<br/>
-                     Unqualified Link1: <a href="C.InnerC.html" title="class in pkg"><code>C.InnerC</code></a>.<br/>
-                     Unqualified Link2: <a href="C.InnerC.html" title="class in pkg"><code>C.InnerC</code></a>.<br/>
-                     Qualified Link: <a href="C.html#method(pkg.C.InnerC,pkg.C.InnerC2)"><code>C.method(pkg.\
+                    Unqualified Link1: <a href="C.InnerC.html" title="class in pkg"><code>C.InnerC</code></a>.<br/>
+                    Unqualified Link2: <a href="C.InnerC.html" title="class in pkg"><code>C.InnerC</code></a>.<br/>
+                    Qualified Link: <a href="C.html#method(pkg.C.InnerC,pkg.C.InnerC2)"><code>C.method(pkg.\
                     C.InnerC, pkg.C.InnerC2)</code></a>.<br/>
-                     Unqualified Link: <a href="C.html#method(pkg.C.InnerC,pkg.C.InnerC2)"><code>C.method(C.InnerC, C.InnerC2)</code></a>.<br/>
-                     Unqualified Link: <a href="C.html#method(pkg.C.InnerC,pkg.C.InnerC2)"><code>C.method(InnerC, InnerC2)</code></a>.<br/>
-                     Link w/o Signature: <a href="C.html#method(pkg.C.InnerC,pkg.C.InnerC2)"><code>C.method(C.InnerC, C.InnerC2)</code></a>.<br/>
-                     Package Link: <a href="package-summary.html"><code>pkg</code></a>.<br/>""");
+                    Unqualified Link: <a href="C.html#method(pkg.C.InnerC,pkg.C.InnerC2)"><code>C.method(C.InnerC, C.InnerC2)</code></a>.<br/>
+                    Unqualified Link: <a href="C.html#method(pkg.C.InnerC,pkg.C.InnerC2)"><code>C.method(InnerC, InnerC2)</code></a>.<br/>
+                    Link w/o Signature: <a href="C.html#method(pkg.C.InnerC,pkg.C.InnerC2)"><code>C.method(C.InnerC, C.InnerC2)</code></a>.<br/>
+                    Package Link: <a href="package-summary.html"><code>pkg</code></a>.<br/>""");
         checkOutput("pkg/C.html", true,
                 """
                     Qualified Link: <a href="C.InnerC.html" title="class in pkg"><code>C.InnerC</code></a>.<br/>
-                     Unqualified Link1: <a href="C.InnerC.html" title="class in pkg"><code>C.InnerC</code></a>.<br/>
-                     Unqualified Link2: <a href="C.InnerC.html" title="class in pkg"><code>C.InnerC</code></a>.<br/>
-                     Qualified Link: <a href="#method(pkg.C.InnerC,pkg.C.InnerC2)"><code>method(pkg.\
+                    Unqualified Link1: <a href="C.InnerC.html" title="class in pkg"><code>C.InnerC</code></a>.<br/>
+                    Unqualified Link2: <a href="C.InnerC.html" title="class in pkg"><code>C.InnerC</code></a>.<br/>
+                    Qualified Link: <a href="#method(pkg.C.InnerC,pkg.C.InnerC2)"><code>method(pkg.\
                     C.InnerC, pkg.C.InnerC2)</code></a>.<br/>
-                     Unqualified Link: <a href="#method(pkg.C.InnerC,pkg.C.InnerC2)"><code>method(C.InnerC, C.InnerC2)</code></a>.<br/>
-                     Unqualified Link: <a href="#method(pkg.C.InnerC,pkg.C.InnerC2)"><code>method(InnerC, InnerC2)</code></a>.<br/>
-                     Link w/o Signature: <a href="#method(pkg.C.InnerC,pkg.C.InnerC2)"><code>method(C.InnerC, C.InnerC2)</code></a>.<br/>
-                     Package Link: <a href="package-summary.html"><code>pkg</code></a>.<br/>""");
+                    Unqualified Link: <a href="#method(pkg.C.InnerC,pkg.C.InnerC2)"><code>method(C.InnerC, C.InnerC2)</code></a>.<br/>
+                    Unqualified Link: <a href="#method(pkg.C.InnerC,pkg.C.InnerC2)"><code>method(InnerC, InnerC2)</code></a>.<br/>
+                    Link w/o Signature: <a href="#method(pkg.C.InnerC,pkg.C.InnerC2)"><code>method(C.InnerC, C.InnerC2)</code></a>.<br/>
+                    Package Link: <a href="package-summary.html"><code>pkg</code></a>.<br/>""");
 
         checkOutput("pkg/C.InnerC.html", true,
                 """
                     Link to member in outer class: <a href="C.html#MEMBER"><code>C.MEMBER</code></a> <br/>
-                     Link to member in inner class: <a href="C.InnerC2.html#MEMBER2"><code>C.InnerC2.MEMBER2</code></a> <br/>
-                     Link to another inner class: <a href="C.InnerC2.html" title="class in pkg"><code>C.InnerC2</code></a>""");
+                    Link to member in inner class: <a href="C.InnerC2.html#MEMBER2"><code>C.InnerC2.MEMBER2</code></a> <br/>
+                    Link to another inner class: <a href="C.InnerC2.html" title="class in pkg"><code>C.InnerC2</code></a>""");
 
         checkOutput("pkg/C.InnerC2.html", true,
                 """
diff --git a/test/langtools/jdk/javadoc/doclet/testLinkTaglet/TestLinkTagletPrimitive.java b/test/langtools/jdk/javadoc/doclet/testLinkTaglet/TestLinkTagletPrimitive.java
index bca3e909462..4be784f03dd 100644
--- a/test/langtools/jdk/javadoc/doclet/testLinkTaglet/TestLinkTagletPrimitive.java
+++ b/test/langtools/jdk/javadoc/doclet/testLinkTaglet/TestLinkTagletPrimitive.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -74,13 +74,13 @@ public class TestLinkTagletPrimitive extends JavadocTester {
         checkOutput("C.html", true,
                 """
                     <div class="block">Comment.
-                     Byte:\s
+                    Byte:\s
                     <details class="invalid-tag">
                     <summary>invalid reference</summary>
                     <pre><code>byte</code></pre>
                     </details>
 
-                     Void:\s
+                    Void:\s
                     <details class="invalid-tag">
                     <summary>invalid reference</summary>
                     <pre><code>void</code></pre>
@@ -119,13 +119,13 @@ public class TestLinkTagletPrimitive extends JavadocTester {
         checkOutput("C.html", true,
                 """
                     <div class="block">Comment.
-                     Double:\s
+                    Double:\s
                     <details class="invalid-tag">
                     <summary>invalid reference</summary>
                     <pre><code>double</code></pre>
                     </details>
 
-                     Void:\s
+                    Void:\s
                     <details class="invalid-tag">
                     <summary>invalid reference</summary>
                     <pre><code>void</code></pre>
@@ -172,7 +172,7 @@ public class TestLinkTagletPrimitive extends JavadocTester {
         checkOutput("C.html", true,
                 """
                     <div class="block">Comment.
-                     Byte[]:\s
+                    Byte[]:\s
                     <details class="invalid-tag">
                     <summary>invalid reference</summary>
                     <pre><code>byte[]</code></pre>
@@ -209,7 +209,7 @@ public class TestLinkTagletPrimitive extends JavadocTester {
         checkOutput("C.html", true,
                 """
                     <div class="block">Comment.
-                     Double[]:\s
+                    Double[]:\s
                     <details class="invalid-tag">
                     <summary>invalid reference</summary>
                     <pre><code>double[]</code></pre>
diff --git a/test/langtools/jdk/javadoc/doclet/testLinkTaglet/TestLinkTagletWithModule.java b/test/langtools/jdk/javadoc/doclet/testLinkTaglet/TestLinkTagletWithModule.java
index 86d678fbaa5..b10c746bde4 100644
--- a/test/langtools/jdk/javadoc/doclet/testLinkTaglet/TestLinkTagletWithModule.java
+++ b/test/langtools/jdk/javadoc/doclet/testLinkTaglet/TestLinkTagletWithModule.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -73,17 +73,17 @@ public class TestLinkTagletWithModule extends JavadocTester {
         checkOutput("m3/com/m3/app/App.html", true,
                 """
                     <div class="block"><a href="../../../../m1/module-summary.html"><code>m1</code></a>
-                     <a href="../../../../m1/module-summary.html"><code>m1</code></a>
-                     <a href="../../../../m1/com/m1/lib/package-summary.html"><code>package link</code></a>
-                     <a href="../../../../m1/com/m1/lib/Lib.html" title="class in com.m1.lib"><code>Lib</code></a>
-                     <a href="../../../../m1/com/m1/lib/Lib.html#method(java.lang.String)"><code>Lib.method(String)</code></a>
-                     <a href="../../../../m1/com/m1/lib/Lib.html#method(java.lang.String)"><code>Lib.method(String)</code></a>
-                     <a href="../../../../m2/module-summary.html">m2</a>
-                     <a href="../../../../m2/module-summary.html">m2</a>
-                     <a href="../../../../m2/com/m2/lib/package-summary.html">com.m2.lib</a>
-                     <a href="../../../../m2/com/m2/lib/Lib.html" title="class in com.m2.lib">Lib</a>
-                     <a href="../../../../m2/com/m2/lib/Lib.html#method(java.lang.String)">class link</a>
-                     <a href="../../../../m2/com/m2/lib/Lib.html#method(java.lang.String)">Lib.method(String)</a></div>
+                    <a href="../../../../m1/module-summary.html"><code>m1</code></a>
+                    <a href="../../../../m1/com/m1/lib/package-summary.html"><code>package link</code></a>
+                    <a href="../../../../m1/com/m1/lib/Lib.html" title="class in com.m1.lib"><code>Lib</code></a>
+                    <a href="../../../../m1/com/m1/lib/Lib.html#method(java.lang.String)"><code>Lib.method(String)</code></a>
+                    <a href="../../../../m1/com/m1/lib/Lib.html#method(java.lang.String)"><code>Lib.method(String)</code></a>
+                    <a href="../../../../m2/module-summary.html">m2</a>
+                    <a href="../../../../m2/module-summary.html">m2</a>
+                    <a href="../../../../m2/com/m2/lib/package-summary.html">com.m2.lib</a>
+                    <a href="../../../../m2/com/m2/lib/Lib.html" title="class in com.m2.lib">Lib</a>
+                    <a href="../../../../m2/com/m2/lib/Lib.html#method(java.lang.String)">class link</a>
+                    <a href="../../../../m2/com/m2/lib/Lib.html#method(java.lang.String)">Lib.method(String)</a></div>
                     """);
     }
 
@@ -105,21 +105,21 @@ public class TestLinkTagletWithModule extends JavadocTester {
         checkOutput("m3/com/m3/app/App.html", true,
                 """
                     <div class="block"><a href="../../../../../out1/m1/module-summary.html" class="external-link"><code>m1</code></a>
-                     <a href="../../../../../out1/m1/module-summary.html" class="external-link"><code>m1</code></a>
-                     <a href="../../../../../out1/m1/com/m1/lib/package-summary.html" class="external-link"><code>package link</code></a>
-                     <a href="../../../../../out1/m1/com/m1/lib/Lib.html" title="class or interface in com.m1.lib"\
+                    <a href="../../../../../out1/m1/module-summary.html" class="external-link"><code>m1</code></a>
+                    <a href="../../../../../out1/m1/com/m1/lib/package-summary.html" class="external-link"><code>package link</code></a>
+                    <a href="../../../../../out1/m1/com/m1/lib/Lib.html" title="class or interface in com.m1.lib"\
                      class="external-link"><code>Lib</code></a>
-                     <a href="../../../../../out1/m1/com/m1/lib/Lib.html#method(java.lang.String)" title="class or\
+                    <a href="../../../../../out1/m1/com/m1/lib/Lib.html#method(java.lang.String)" title="class or\
                      interface in com.m1.lib" class="external-link"><code>Lib.method(String)</code></a>
-                     <a href="../../../../../out1/m1/com/m1/lib/Lib.html#method(java.lang.String)" title="class or\
+                    <a href="../../../../../out1/m1/com/m1/lib/Lib.html#method(java.lang.String)" title="class or\
                      interface in com.m1.lib" class="external-link"><code>Lib.method(String)</code></a>
-                     <a href="../../../../../out1/m2/module-summary.html" class="external-link">m2</a>
-                     <a href="../../../../../out1/m2/module-summary.html" class="external-link">m2</a>
-                     <a href="../../../../../out1/m2/com/m2/lib/package-summary.html" class="external-link">m2/com.m2.lib</a>
-                     <a href="../../../../../out1/m2/com/m2/lib/Lib.html" title="class or interface in com.m2.lib" class="external-link">Lib</a>
-                     <a href="../../../../../out1/m2/com/m2/lib/Lib.html#method(java.lang.String)" title="class or\
+                    <a href="../../../../../out1/m2/module-summary.html" class="external-link">m2</a>
+                    <a href="../../../../../out1/m2/module-summary.html" class="external-link">m2</a>
+                    <a href="../../../../../out1/m2/com/m2/lib/package-summary.html" class="external-link">m2/com.m2.lib</a>
+                    <a href="../../../../../out1/m2/com/m2/lib/Lib.html" title="class or interface in com.m2.lib" class="external-link">Lib</a>
+                    <a href="../../../../../out1/m2/com/m2/lib/Lib.html#method(java.lang.String)" title="class or\
                      interface in com.m2.lib" class="external-link">class link</a>
-                     <a href="../../../../../out1/m2/com/m2/lib/Lib.html#method(java.lang.String)" title="class or\
+                    <a href="../../../../../out1/m2/com/m2/lib/Lib.html#method(java.lang.String)" title="class or\
                      interface in com.m2.lib" class="external-link">Lib.method(String)</a></div>
                     """);
     }
@@ -136,13 +136,13 @@ public class TestLinkTagletWithModule extends JavadocTester {
         checkOutput("com.ex2/com/ex2/B.html", true,
                 """
                     <div class="block"><a href="../../../com.ex1/com/ex1/package-summary.html"><code>package link</code></a>
-                     <a href="../../../com.ex1/module-summary.html"><code>module link</code></a>
-                     <a href="../../../com.ex1/com/ex1/package-summary.html"><code>com.ex1</code></a>
-                     <a href="../../../com.ex1/com/ex1/A.html" title="class in com.ex1"><code>class link</code></a>
-                     <a href="../../../com.ex1/com/ex1/A.html#m()"><code>A.m()</code></a>
-                     <a href="../../../com.ex1/com/ex1/A.html#m()"><code>A.m()</code></a>
-                     <a href="package-summary.html"><code>com.ex2</code></a>
-                     <a href="../../module-summary.html"><code>com.ex2</code></a></div>
+                    <a href="../../../com.ex1/module-summary.html"><code>module link</code></a>
+                    <a href="../../../com.ex1/com/ex1/package-summary.html"><code>com.ex1</code></a>
+                    <a href="../../../com.ex1/com/ex1/A.html" title="class in com.ex1"><code>class link</code></a>
+                    <a href="../../../com.ex1/com/ex1/A.html#m()"><code>A.m()</code></a>
+                    <a href="../../../com.ex1/com/ex1/A.html#m()"><code>A.m()</code></a>
+                    <a href="package-summary.html"><code>com.ex2</code></a>
+                    <a href="../../module-summary.html"><code>com.ex2</code></a></div>
                     """);
     }
 
@@ -162,13 +162,13 @@ public class TestLinkTagletWithModule extends JavadocTester {
         checkOutput("com.ex2/com/ex2/B.html", true,
                 """
                     <div class="block"><a href="../../../../out1/com.ex1/com/ex1/package-summary.html" class="external-link"><code>package link</code></a>
-                     <a href="../../../../out1/com.ex1/module-summary.html" class="external-link"><code>module link</code></a>
-                     <a href="../../../../out1/com.ex1/com/ex1/package-summary.html" class="external-link"><code>com.ex1/com.ex1</code></a>
-                     <a href="../../../../out1/com.ex1/com/ex1/A.html" title="class or interface in com.ex1" class="external-link"><code>class link</code></a>
-                     <a href="../../../../out1/com.ex1/com/ex1/A.html#m()" title="class or interface in com.ex1" class="external-link"><code>A.m()</code></a>
-                     <a href="../../../../out1/com.ex1/com/ex1/A.html#m()" title="class or interface in com.ex1" class="external-link"><code>A.m()</code></a>
-                     <a href="package-summary.html"><code>com.ex2</code></a>
-                     <a href="../../module-summary.html"><code>com.ex2</code></a></div>
+                    <a href="../../../../out1/com.ex1/module-summary.html" class="external-link"><code>module link</code></a>
+                    <a href="../../../../out1/com.ex1/com/ex1/package-summary.html" class="external-link"><code>com.ex1/com.ex1</code></a>
+                    <a href="../../../../out1/com.ex1/com/ex1/A.html" title="class or interface in com.ex1" class="external-link"><code>class link</code></a>
+                    <a href="../../../../out1/com.ex1/com/ex1/A.html#m()" title="class or interface in com.ex1" class="external-link"><code>A.m()</code></a>
+                    <a href="../../../../out1/com.ex1/com/ex1/A.html#m()" title="class or interface in com.ex1" class="external-link"><code>A.m()</code></a>
+                    <a href="package-summary.html"><code>com.ex2</code></a>
+                    <a href="../../module-summary.html"><code>com.ex2</code></a></div>
                     """);
     }
     void generateSources() throws Exception {
diff --git a/test/langtools/jdk/javadoc/doclet/testLiteralCodeInPre/TestLiteralCodeInPre.java b/test/langtools/jdk/javadoc/doclet/testLiteralCodeInPre/TestLiteralCodeInPre.java
index b1885937831..ac5259686f1 100644
--- a/test/langtools/jdk/javadoc/doclet/testLiteralCodeInPre/TestLiteralCodeInPre.java
+++ b/test/langtools/jdk/javadoc/doclet/testLiteralCodeInPre/TestLiteralCodeInPre.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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      8002387 8014636 8078320 8175200 8186332
+ * @bug      8002387 8014636 8078320 8175200 8186332 8352249
  * @summary  Improve rendered HTML formatting for {@code}
  * @library  ../../lib
  * @modules jdk.javadoc/jdk.javadoc.internal.tool
@@ -70,45 +70,45 @@ public class TestLiteralCodeInPre extends JavadocTester {
                 """
                     typical_usage_code</span>()</div>
                     <div class="block">Lorem ipsum dolor sit amet, consectetur adipiscing elit.
-                     Example:  <pre><code>
-                       line 0 @Override
-                       line 1 &lt;T&gt; void m(T t) {
-                       line 2     // do something with T
-                       line 3 }
-                     </code></pre>
-                     and so it goes.</div>""",
+                    Example:  <pre><code>
+                      line 0 @Override
+                      line 1 &lt;T&gt; void m(T t) {
+                      line 2     // do something with T
+                      line 3 }
+                    </code></pre>
+                    and so it goes.</div>""",
                 """
                     typical_usage_literal</span>()</div>
                     <div class="block">Lorem ipsum dolor sit amet, consectetur adipiscing elit.
-                     Example:  <pre>
-                       line 0 @Override
-                       line 1 &lt;T&gt; void m(T t) {
-                       line 2     // do something with T
-                       line 3 }
-                     </pre>
-                     and so it goes.</div>""",
+                    Example:  <pre>
+                      line 0 @Override
+                      line 1 &lt;T&gt; void m(T t) {
+                      line 2     // do something with T
+                      line 3 }
+                    </pre>
+                    and so it goes.</div>""",
                 """
                     recommended_usage_literal</span>()</div>
                     <div class="block">Lorem ipsum dolor sit amet, consectetur adipiscing elit.
-                     Example:  <pre>
-                       line 0 @Override
-                       line 1 &lt;T&gt; void m(T t) {
-                       line 2     // do something with T
-                       line 3 } </pre>
-                     and so it goes.</div>""",
+                    Example:  <pre>
+                      line 0 @Override
+                      line 1 &lt;T&gt; void m(T t) {
+                      line 2     // do something with T
+                      line 3 } </pre>
+                    and so it goes.</div>""",
                 """
                     <div class="block">Test for html in pre, note the spaces
-                     <PRE>
-                     <b>id           </b>
-                     </PRE></div>""",
+                    <PRE>
+                    <b>id           </b>
+                    </PRE></div>""",
                 """
                     <div class="member-signature"><span class="modifiers">public</span>&nbsp;<span c\
                     lass="return-type">void</span>&nbsp;<span class="element-name">htmlAttrInPre1</span>()</\
                     div>
                     <div class="block">More html tag outliers.
-                     <pre>
-                     @Override
-                     <code> some.function() </code>
-                     </pre></div>""");
+                    <pre>
+                    @Override
+                    <code> some.function() </code>
+                    </pre></div>""");
     }
 }
diff --git a/test/langtools/jdk/javadoc/doclet/testModules/TestModules.java b/test/langtools/jdk/javadoc/doclet/testModules/TestModules.java
index 612db74f93e..5f140cc2c03 100644
--- a/test/langtools/jdk/javadoc/doclet/testModules/TestModules.java
+++ b/test/langtools/jdk/javadoc/doclet/testModules/TestModules.java
@@ -889,11 +889,11 @@ public class TestModules extends JavadocTester {
                      href="moduletags/module-summary.html">moduletags</a></div>
                     <div class="col-last odd-row-color all-modules-table all-modules-table-tab1">
                     <div class="block">This is a test description for the moduletags module.<br>
-                     Type Link: <a href="moduletags/testpkgmdltags/TestClassInModuleTags.html" title\
+                    Type Link: <a href="moduletags/testpkgmdltags/TestClassInModuleTags.html" title\
                     ="class in testpkgmdltags"><code>TestClassInModuleTags</code></a>.<br>
-                     Member Link: <a href="moduletags/testpkgmdltags/TestClassInModuleTags.html#test\
+                    Member Link: <a href="moduletags/testpkgmdltags/TestClassInModuleTags.html#test\
                     Method(java.lang.String)"><code>TestClassInModuleTags.testMethod(String)</code></a>.<br>
-                     Package Link: <a href="moduletags/testpkgmdltags/package-summary.html"><code>testpkgmdltags</code></a>.<br></div>
+                    Package Link: <a href="moduletags/testpkgmdltags/package-summary.html"><code>testpkgmdltags</code></a>.<br></div>
                     </div>""");
         checkOutput("moduleA/module-summary.html", true,
                 """
diff --git a/test/langtools/jdk/javadoc/doclet/testPreview/TestPreview.java b/test/langtools/jdk/javadoc/doclet/testPreview/TestPreview.java
index cda99b7eb30..55c6e541ad7 100644
--- a/test/langtools/jdk/javadoc/doclet/testPreview/TestPreview.java
+++ b/test/langtools/jdk/javadoc/doclet/testPreview/TestPreview.java
@@ -176,7 +176,7 @@ public class TestPreview extends JavadocTester {
                     reRecord.html#preview-preview.CoreRecord">PREVIEW</a></sup>, <a href="CoreRecor\
                     d.html" title="class in preview"><code>core record</code></a><sup class="previe\
                     w-mark"><a href="CoreRecord.html#preview-preview.CoreRecord">PREVIEW</a></sup>,
-                     <a href="CoreRecord.html" title="class in preview">CoreRecord</a>, <a href="Co\
+                    <a href="CoreRecord.html" title="class in preview">CoreRecord</a>, <a href="Co\
                     reRecord.html" title="class in preview">core record</a>.</div>""",
                 """
                     <li><a href="CoreRecord.html" title="class in preview"><code>CoreRecord</code><\
diff --git a/test/langtools/jdk/javadoc/doclet/testRecordLinks/TestRecordLinks.java b/test/langtools/jdk/javadoc/doclet/testRecordLinks/TestRecordLinks.java
index 4f25eff6e59..43af080dd01 100644
--- a/test/langtools/jdk/javadoc/doclet/testRecordLinks/TestRecordLinks.java
+++ b/test/langtools/jdk/javadoc/doclet/testRecordLinks/TestRecordLinks.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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,7 +82,7 @@ public class TestRecordLinks  extends JavadocTester {
                     """,
                 """
                     <div class="block"><a href="#foo()"><code>foo()</code></a>
-                     <a href="JavadocTest.Bar.html" title="class in example"><code>JavadocTest.Bar</code></a></div>
+                    <a href="JavadocTest.Bar.html" title="class in example"><code>JavadocTest.Bar</code></a></div>
                     """);
 
         checkOutput("example/JavadocTest.Bar.html", true,
@@ -91,7 +91,7 @@ public class TestRecordLinks  extends JavadocTester {
                     """,
                 """
                     <div class="block"><a href="#bar()"><code>bar()</code></a>
-                     <a href="JavadocTest.Foo.html" title="class in example"><code>JavadocTest.Foo</code></a></div>
+                    <a href="JavadocTest.Foo.html" title="class in example"><code>JavadocTest.Foo</code></a></div>
                     """);
     }
 }
diff --git a/test/langtools/jdk/javadoc/doclet/testRelativeLinks/TestRelativeModuleLinks.java b/test/langtools/jdk/javadoc/doclet/testRelativeLinks/TestRelativeModuleLinks.java
index 14057cabaca..397ac2cf50d 100644
--- a/test/langtools/jdk/javadoc/doclet/testRelativeLinks/TestRelativeModuleLinks.java
+++ b/test/langtools/jdk/javadoc/doclet/testRelativeLinks/TestRelativeModuleLinks.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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,26 +90,26 @@ public class TestRelativeModuleLinks extends JavadocTester {
         checkOutput("index.html", true,
                 """
                 <div class="block"><a href="./ma/doc-files/file.html">relative module link</a>,
-                 <a href="./ma/module-summary.html#module-fragment">fragment module link</a>.</div>""");
+                <a href="./ma/module-summary.html#module-fragment">fragment module link</a>.</div>""");
 
         // Index page
         checkOutput("index-all.html", true,
                 """
                 <div class="block"><a href="./ma/doc-files/file.html">relative module link</a>,
-                 <a href="./ma/module-summary.html#module-fragment">fragment module link</a>.</div>""");
+                <a href="./ma/module-summary.html#module-fragment">fragment module link</a>.</div>""");
 
         // Own module page
         checkOutput("ma/module-summary.html", true,
                 """
                 <div class="block"><a href="doc-files/file.html">relative module link</a>,
-                 <a href="#module-fragment">fragment module link</a>.
-                 <a id="module-fragment">Module fragment</a>.</div>""");
+                <a href="#module-fragment">fragment module link</a>.
+                <a id="module-fragment">Module fragment</a>.</div>""");
 
         // Other module page
         checkOutput("mb/module-summary.html", true,
                 """
                 <div class="block"><a href="../ma/doc-files/file.html">relative module link</a>,
-                 <a href="../ma/module-summary.html#module-fragment">fragment module link</a>.</div>""");
+                <a href="../ma/module-summary.html#module-fragment">fragment module link</a>.</div>""");
     }
 }
 
diff --git a/test/langtools/jdk/javadoc/doclet/testSerializedFormDeprecationInfo/TestSerializedFormDeprecationInfo.java b/test/langtools/jdk/javadoc/doclet/testSerializedFormDeprecationInfo/TestSerializedFormDeprecationInfo.java
index b79634943c1..ac036f53e27 100644
--- a/test/langtools/jdk/javadoc/doclet/testSerializedFormDeprecationInfo/TestSerializedFormDeprecationInfo.java
+++ b/test/langtools/jdk/javadoc/doclet/testSerializedFormDeprecationInfo/TestSerializedFormDeprecationInfo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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,7 +107,7 @@ public class TestSerializedFormDeprecationInfo extends JavadocTester {
                 """
                     <span class="deprecated-label">Deprecated.</span>
                     <div class="deprecation-comment">As of JDK version 1.5, replaced by
-                     <a href="pkg1/C1.html#setUndecorated(boolean)"><code>setUndecorated(boolean)</code></a>.</div>
+                    <a href="pkg1/C1.html#setUndecorated(boolean)"><code>setUndecorated(boolean)</code></a>.</div>
                     </div>
                     <div class="block">This field indicates whether the C1 is undecorated.</div>
                     <dl class="notes">
@@ -123,7 +123,7 @@ public class TestSerializedFormDeprecationInfo extends JavadocTester {
                 """
                     <span class="deprecated-label">Deprecated.</span>
                     <div class="deprecation-comment">As of JDK version 1.5, replaced by
-                     <a href="pkg1/C1.html#setUndecorated(boolean)"><code>setUndecorated(boolean)</code></a>.</div>
+                    <a href="pkg1/C1.html#setUndecorated(boolean)"><code>setUndecorated(boolean)</code></a>.</div>
                     </div>
                     <div class="block">Reads the object stream.</div>
                     <dl class="notes">
@@ -146,13 +146,13 @@ public class TestSerializedFormDeprecationInfo extends JavadocTester {
                     <pre>boolean undecorated</pre>
                     <div class="deprecation-block"><span class="deprecated-label">Deprecated.</span>
                     <div class="deprecation-comment">As of JDK version 1.5, replaced by
-                     <a href="pkg1/C1.html#setUndecorated(boolean)"><code>setUndecorated(boolean)</code></a>.</div>
+                    <a href="pkg1/C1.html#setUndecorated(boolean)"><code>setUndecorated(boolean)</code></a>.</div>
                     </div>
                     </li>""",
                 """
                     <span class="deprecated-label">Deprecated.</span>
                     <div class="deprecation-comment">As of JDK version 1.5, replaced by
-                     <a href="pkg1/C1.html#setUndecorated(boolean)"><code>setUndecorated(boolean)</code></a>.</div>
+                    <a href="pkg1/C1.html#setUndecorated(boolean)"><code>setUndecorated(boolean)</code></a>.</div>
                     </div>
                     </li>""");
     }
diff --git a/test/langtools/jdk/javadoc/doclet/testSnippetTag/TestSnippetUnnamedPackage.java b/test/langtools/jdk/javadoc/doclet/testSnippetTag/TestSnippetUnnamedPackage.java
index 616eb3a7ed7..bd3accbb131 100644
--- a/test/langtools/jdk/javadoc/doclet/testSnippetTag/TestSnippetUnnamedPackage.java
+++ b/test/langtools/jdk/javadoc/doclet/testSnippetTag/TestSnippetUnnamedPackage.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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 8284037
+ * @bug 8284037 8352249
  * @summary Snippet-files subdirectory not automatically detected when in unnamed package
  * @library /tools/lib ../../lib
  * @modules jdk.compiler/com.sun.tools.javac.api
@@ -87,10 +87,9 @@ public class TestSnippetUnnamedPackage extends SnippetTester {
         checkOutput("C.html", useSourcePath,
                 """
                         Before.
-                        \s
                         %s
 
-                         After.""".formatted(getSnippetHtmlRepresentation("C.html",
+                        After.""".formatted(getSnippetHtmlRepresentation("C.html",
                         "public class S { }", Optional.of("java"), Optional.of("snippet-C1"))));
     }
 }
diff --git a/test/langtools/jdk/javadoc/doclet/testSourceTab/SingleTab/C.java b/test/langtools/jdk/javadoc/doclet/testSourceTab/SingleTab/C.java
index 71aaf080eb7..fc407da92b0 100644
--- a/test/langtools/jdk/javadoc/doclet/testSourceTab/SingleTab/C.java
+++ b/test/langtools/jdk/javadoc/doclet/testSourceTab/SingleTab/C.java
@@ -23,8 +23,8 @@
 
 /**
  * <pre>
- *\tThis source
- * \tis indented
+ * \tThis source
+ *  \tis indented
  * \twith tabs.
  * </pre>
  */
diff --git a/test/langtools/jdk/javadoc/doclet/testStylesheet/TestStylesheet.java b/test/langtools/jdk/javadoc/doclet/testStylesheet/TestStylesheet.java
index 3fdf553c772..481f5ab6e71 100644
--- a/test/langtools/jdk/javadoc/doclet/testStylesheet/TestStylesheet.java
+++ b/test/langtools/jdk/javadoc/doclet/testStylesheet/TestStylesheet.java
@@ -144,13 +144,13 @@ public class TestStylesheet extends JavadocTester {
                     <link rel="stylesheet" type="text/css" href="../resource-files/stylesheet.css">""",
                 """
                     <div class="block">Test comment for a class which has an <a name="named_anchor">anchor_with_name</a> and
-                     an <a id="named_anchor1">anchor_with_id</a>.</div>""");
+                    an <a id="named_anchor1">anchor_with_id</a>.</div>""");
 
         checkOutput("pkg/package-summary.html", true,
                 """
                     <div class="col-last even-row-color class-summary class-summary-tab2">
                     <div class="block">Test comment for a class which has an <a name="named_anchor">anchor_with_name</a> and
-                     an <a id="named_anchor1">anchor_with_id</a>.</div>
+                    an <a id="named_anchor1">anchor_with_id</a>.</div>
                     </div>""");
 
         checkOutput("index.html", true,
diff --git a/test/langtools/tools/javac/doctree/AtEscapeTest.java b/test/langtools/tools/javac/doctree/AtEscapeTest.java
index 83e1806f391..cf69e661ed7 100644
--- a/test/langtools/tools/javac/doctree/AtEscapeTest.java
+++ b/test/langtools/tools/javac/doctree/AtEscapeTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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 8300914
+ * @bug 8300914 8352249
  * @summary Allow `@` as an escape in documentation comments
  * @modules jdk.compiler/com.sun.tools.javac.api
  *          jdk.compiler/com.sun.tools.javac.file
@@ -41,11 +41,11 @@ class AtEscapeTest {
      */
     void escape_block_tag() { }
 /*
-DocComment[DOC_COMMENT, pos:1
+DocComment[DOC_COMMENT, pos:0
   firstSentence: 3
-    Text[TEXT, pos:1, abc|_]
-    Escape[ESCAPE, pos:6, @]
-    Text[TEXT, pos:8, tag|_def]
+    Text[TEXT, pos:0, abc|]
+    Escape[ESCAPE, pos:4, @]
+    Text[TEXT, pos:6, tag|def]
   body: empty
   block tags: empty
 ]
@@ -56,11 +56,11 @@ DocComment[DOC_COMMENT, pos:1
      */
     void escape_inline_tag() { }
 /*
-DocComment[DOC_COMMENT, pos:1
+DocComment[DOC_COMMENT, pos:0
   firstSentence: 3
-    Text[TEXT, pos:1, abc_{]
-    Escape[ESCAPE, pos:6, @]
-    Text[TEXT, pos:8, tag}_def]
+    Text[TEXT, pos:0, abc_{]
+    Escape[ESCAPE, pos:5, @]
+    Text[TEXT, pos:7, tag}_def]
   body: empty
   block tags: empty
 ]
@@ -71,11 +71,11 @@ DocComment[DOC_COMMENT, pos:1
      */
     void escape_end_comment() { }
 /*
-DocComment[DOC_COMMENT, pos:1
+DocComment[DOC_COMMENT, pos:0
   firstSentence: 3
-    Text[TEXT, pos:1, abc_/*_def_*]
-    Escape[ESCAPE, pos:13, /]
-    Text[TEXT, pos:15, _ghi]
+    Text[TEXT, pos:0, abc_/*_def_*]
+    Escape[ESCAPE, pos:12, /]
+    Text[TEXT, pos:14, _ghi]
   body: empty
   block tags: empty
 ]
@@ -87,11 +87,11 @@ DocComment[DOC_COMMENT, pos:1
      */
     void escape_asterisk() { }
 /*
-DocComment[DOC_COMMENT, pos:5
+DocComment[DOC_COMMENT, pos:0
   firstSentence: 3
-    Text[TEXT, pos:5, abc|_____]
-    Escape[ESCAPE, pos:14, *]
-    Text[TEXT, pos:16, _def|_____ghi]
+    Text[TEXT, pos:0, abc|]
+    Escape[ESCAPE, pos:4, *]
+    Text[TEXT, pos:6, _def|ghi]
   body: empty
   block tags: empty
 ]
@@ -104,11 +104,11 @@ DocComment[DOC_COMMENT, pos:5
      */
     void not_escaped_tag() { }
 /*
-DocComment[DOC_COMMENT, pos:1
+DocComment[DOC_COMMENT, pos:0
   firstSentence: 1
-    Text[TEXT, pos:1, abc.]
+    Text[TEXT, pos:0, abc.]
   body: 1
-    Text[TEXT, pos:7, not_an_escaped_tag_@@tag;|_xyz.]
+    Text[TEXT, pos:5, not_an_escaped_tag_@@tag;|xyz.]
   block tags: empty
 ]
 */
@@ -120,11 +120,11 @@ DocComment[DOC_COMMENT, pos:1
      */
     void not_escaped_asterisk() { }
 /*
-DocComment[DOC_COMMENT, pos:1
+DocComment[DOC_COMMENT, pos:0
   firstSentence: 1
-    Text[TEXT, pos:1, abc.]
+    Text[TEXT, pos:0, abc.]
   body: 1
-    Text[TEXT, pos:7, not_an_escaped_asterisk_@*;|_xyz.]
+    Text[TEXT, pos:5, not_an_escaped_asterisk_@*;|xyz.]
   block tags: empty
 ]
 */
@@ -136,11 +136,11 @@ DocComment[DOC_COMMENT, pos:1
      */
     void not_escaped_solidus() { }
 /*
-DocComment[DOC_COMMENT, pos:1
+DocComment[DOC_COMMENT, pos:0
   firstSentence: 1
-    Text[TEXT, pos:1, abc.]
+    Text[TEXT, pos:0, abc.]
   body: 1
-    Text[TEXT, pos:7, not_an_escaped_solidus_@/.|_xyz.]
+    Text[TEXT, pos:5, not_an_escaped_solidus_@/.|xyz.]
   block tags: empty
 ]
 */
diff --git a/test/langtools/tools/javac/doctree/AttrTest.java b/test/langtools/tools/javac/doctree/AttrTest.java
index ea5761d33ee..0b9d1f0ccf2 100644
--- a/test/langtools/tools/javac/doctree/AttrTest.java
+++ b/test/langtools/tools/javac/doctree/AttrTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @bug 7021614 8076026 8273244 8321500
+ * @bug 7021614 8076026 8273244 8321500 8352249
  * @summary extend com.sun.source API to support parsing javadoc comments
  * @modules jdk.compiler/com.sun.tools.javac.api
  *          jdk.compiler/com.sun.tools.javac.file
@@ -39,20 +39,20 @@ class AttrTest {
      */
     void unquoted_attr() { }
 /*
-DocComment[DOC_COMMENT, pos:1
+DocComment[DOC_COMMENT, pos:0
   firstSentence: 3
-    StartElement[START_ELEMENT, pos:1
+    StartElement[START_ELEMENT, pos:0
       name:a
       attributes: 1
-        Attribute[ATTRIBUTE, pos:4
+        Attribute[ATTRIBUTE, pos:3
           name: name
           vkind: UNQUOTED
           value: 1
-            Text[TEXT, pos:9, unquoted]
+            Text[TEXT, pos:8, unquoted]
         ]
     ]
-    Text[TEXT, pos:18, foo]
-    EndElement[END_ELEMENT, pos:21, a]
+    Text[TEXT, pos:17, foo]
+    EndElement[END_ELEMENT, pos:20, a]
   body: empty
   block tags: empty
 ]
@@ -63,20 +63,20 @@ DocComment[DOC_COMMENT, pos:1
      */
     void hyphened_attr() { }
 /*
-DocComment[DOC_COMMENT, pos:1
+DocComment[DOC_COMMENT, pos:0
   firstSentence: 3
-    StartElement[START_ELEMENT, pos:1
+    StartElement[START_ELEMENT, pos:0
       name:a
       attributes: 1
-        Attribute[ATTRIBUTE, pos:4
+        Attribute[ATTRIBUTE, pos:3
           name: name-test
           vkind: UNQUOTED
           value: 1
-            Text[TEXT, pos:14, hyphened]
+            Text[TEXT, pos:13, hyphened]
         ]
     ]
-    Text[TEXT, pos:23, foo]
-    EndElement[END_ELEMENT, pos:26, a]
+    Text[TEXT, pos:22, foo]
+    EndElement[END_ELEMENT, pos:25, a]
   body: empty
   block tags: empty
 ]
@@ -87,20 +87,20 @@ DocComment[DOC_COMMENT, pos:1
      */
     void double_quoted_attr() { }
 /*
-DocComment[DOC_COMMENT, pos:1
+DocComment[DOC_COMMENT, pos:0
   firstSentence: 3
-    StartElement[START_ELEMENT, pos:1
+    StartElement[START_ELEMENT, pos:0
       name:a
       attributes: 1
-        Attribute[ATTRIBUTE, pos:4
+        Attribute[ATTRIBUTE, pos:3
           name: name
           vkind: DOUBLE
           value: 1
-            Text[TEXT, pos:10, double_quoted]
+            Text[TEXT, pos:9, double_quoted]
         ]
     ]
-    Text[TEXT, pos:25, foo]
-    EndElement[END_ELEMENT, pos:28, a]
+    Text[TEXT, pos:24, foo]
+    EndElement[END_ELEMENT, pos:27, a]
   body: empty
   block tags: empty
 ]
@@ -111,20 +111,20 @@ DocComment[DOC_COMMENT, pos:1
      */
     void single_quoted_attr() { }
 /*
-DocComment[DOC_COMMENT, pos:1
+DocComment[DOC_COMMENT, pos:0
   firstSentence: 3
-    StartElement[START_ELEMENT, pos:1
+    StartElement[START_ELEMENT, pos:0
       name:a
       attributes: 1
-        Attribute[ATTRIBUTE, pos:4
+        Attribute[ATTRIBUTE, pos:3
           name: name
           vkind: SINGLE
           value: 1
-            Text[TEXT, pos:10, single_quoted]
+            Text[TEXT, pos:9, single_quoted]
         ]
     ]
-    Text[TEXT, pos:25, foo]
-    EndElement[END_ELEMENT, pos:28, a]
+    Text[TEXT, pos:24, foo]
+    EndElement[END_ELEMENT, pos:27, a]
   body: empty
   block tags: empty
 ]
@@ -135,16 +135,16 @@ DocComment[DOC_COMMENT, pos:1
      */
     void numeric_attr() { }
 /*
-DocComment[DOC_COMMENT, pos:1
+DocComment[DOC_COMMENT, pos:0
   firstSentence: 1
-    StartElement[START_ELEMENT, pos:1
+    StartElement[START_ELEMENT, pos:0
       name:hr
       attributes: 1
-        Attribute[ATTRIBUTE, pos:5
+        Attribute[ATTRIBUTE, pos:4
           name: size
           vkind: DOUBLE
           value: 1
-            Text[TEXT, pos:11, 3]
+            Text[TEXT, pos:10, 3]
         ]
     ]
   body: empty
@@ -157,17 +157,17 @@ DocComment[DOC_COMMENT, pos:1
      */
     void docRoot_attr() { }
 /*
-DocComment[DOC_COMMENT, pos:1
+DocComment[DOC_COMMENT, pos:0
   firstSentence: 1
-    StartElement[START_ELEMENT, pos:1
+    StartElement[START_ELEMENT, pos:0
       name:a
       attributes: 1
-        Attribute[ATTRIBUTE, pos:4
+        Attribute[ATTRIBUTE, pos:3
           name: href
           vkind: DOUBLE
           value: 2
-            DocRoot[DOC_ROOT, pos:10]
-            Text[TEXT, pos:20, /index.html]
+            DocRoot[DOC_ROOT, pos:9]
+            Text[TEXT, pos:19, /index.html]
         ]
     ]
   body: empty
@@ -180,18 +180,18 @@ DocComment[DOC_COMMENT, pos:1
      */
     void entity_attr() { }
 /*
-DocComment[DOC_COMMENT, pos:1
+DocComment[DOC_COMMENT, pos:0
   firstSentence: 1
-    StartElement[START_ELEMENT, pos:1
+    StartElement[START_ELEMENT, pos:0
       name:a
       attributes: 1
-        Attribute[ATTRIBUTE, pos:4
+        Attribute[ATTRIBUTE, pos:3
           name: name
           vkind: DOUBLE
           value: 3
-            Text[TEXT, pos:10, abc]
-            Entity[ENTITY, pos:13, quot]
-            Text[TEXT, pos:19, def]
+            Text[TEXT, pos:9, abc]
+            Entity[ENTITY, pos:12, quot]
+            Text[TEXT, pos:18, def]
         ]
     ]
   body: empty
@@ -204,12 +204,12 @@ DocComment[DOC_COMMENT, pos:1
      */
     void no_value_attr() { }
 /*
-DocComment[DOC_COMMENT, pos:1
+DocComment[DOC_COMMENT, pos:0
   firstSentence: 1
-    StartElement[START_ELEMENT, pos:1
+    StartElement[START_ELEMENT, pos:0
       name:hr
       attributes: 1
-        Attribute[ATTRIBUTE, pos:5
+        Attribute[ATTRIBUTE, pos:4
           name: noshade
           vkind: EMPTY
           value: null
@@ -225,17 +225,17 @@ DocComment[DOC_COMMENT, pos:1
      */
     void self_closing_attr_1() { }
 /*
-DocComment[DOC_COMMENT, pos:1
+DocComment[DOC_COMMENT, pos:0
   firstSentence: 2
-    Text[TEXT, pos:1, abc_]
-    StartElement[START_ELEMENT, pos:5
+    Text[TEXT, pos:0, abc_]
+    StartElement[START_ELEMENT, pos:4
       name:hr
       attributes: 1
-        Attribute[ATTRIBUTE, pos:9
+        Attribute[ATTRIBUTE, pos:8
           name: size
           vkind: SINGLE
           value: 1
-            Text[TEXT, pos:15, 3]
+            Text[TEXT, pos:14, 3]
         ]
     ]
   body: empty
@@ -248,17 +248,17 @@ DocComment[DOC_COMMENT, pos:1
      */
     void self_closing_attr_2() { }
 /*
-DocComment[DOC_COMMENT, pos:1
+DocComment[DOC_COMMENT, pos:0
   firstSentence: 2
-    Text[TEXT, pos:1, abc_]
-    StartElement[START_ELEMENT, pos:5
+    Text[TEXT, pos:0, abc_]
+    StartElement[START_ELEMENT, pos:4
       name:hr
       attributes: 1
-        Attribute[ATTRIBUTE, pos:9
+        Attribute[ATTRIBUTE, pos:8
           name: size
           vkind: UNQUOTED
           value: 1
-            Text[TEXT, pos:14, 3]
+            Text[TEXT, pos:13, 3]
         ]
     ]
   body: empty
@@ -271,14 +271,14 @@ DocComment[DOC_COMMENT, pos:1
      */
     void unterminated_attr_eoi() { }
 /*
-DocComment[DOC_COMMENT, pos:1
+DocComment[DOC_COMMENT, pos:0
   firstSentence: 3
-    Text[TEXT, pos:1, abc_]
-    Erroneous[ERRONEOUS, pos:5
+    Text[TEXT, pos:0, abc_]
+    Erroneous[ERRONEOUS, pos:4
       code: compiler.err.dc.malformed.html
       body: <
     ]
-    Text[TEXT, pos:6, hr_size="3]
+    Text[TEXT, pos:5, hr_size="3]
   body: empty
   block tags: empty
 ]
@@ -290,19 +290,19 @@ DocComment[DOC_COMMENT, pos:1
      */
     void unterminated_attr_block() { }
 /*
-DocComment[DOC_COMMENT, pos:1
+DocComment[DOC_COMMENT, pos:0
   firstSentence: 3
-    Text[TEXT, pos:1, abc_]
-    Erroneous[ERRONEOUS, pos:5
+    Text[TEXT, pos:0, abc_]
+    Erroneous[ERRONEOUS, pos:4
       code: compiler.err.dc.malformed.html
       body: <
     ]
-    Text[TEXT, pos:6, hr_size="3]
+    Text[TEXT, pos:5, hr_size="3]
   body: empty
   block tags: 1
-    Author[AUTHOR, pos:18
+    Author[AUTHOR, pos:16
       name: 1
-        Text[TEXT, pos:26, jjg]
+        Text[TEXT, pos:24, jjg]
     ]
 ]
 */
@@ -312,30 +312,30 @@ DocComment[DOC_COMMENT, pos:1
      */
     void multiple_attr() { }
 /*
-DocComment[DOC_COMMENT, pos:1
+DocComment[DOC_COMMENT, pos:0
   firstSentence: 1
-    StartElement[START_ELEMENT, pos:1
+    StartElement[START_ELEMENT, pos:0
       name:a
       attributes: 4
-        Attribute[ATTRIBUTE, pos:4
+        Attribute[ATTRIBUTE, pos:3
           name: name1
           vkind: DOUBLE
           value: 1
-            Text[TEXT, pos:11, val1]
+            Text[TEXT, pos:10, val1]
         ]
-        Attribute[ATTRIBUTE, pos:17
+        Attribute[ATTRIBUTE, pos:16
           name: name2
           vkind: SINGLE
           value: 1
-            Text[TEXT, pos:24, val2]
+            Text[TEXT, pos:23, val2]
         ]
-        Attribute[ATTRIBUTE, pos:30
+        Attribute[ATTRIBUTE, pos:29
           name: name3
           vkind: UNQUOTED
           value: 1
-            Text[TEXT, pos:36, val3]
+            Text[TEXT, pos:35, val3]
         ]
-        Attribute[ATTRIBUTE, pos:41
+        Attribute[ATTRIBUTE, pos:40
           name: name4
           vkind: EMPTY
           value: null
@@ -392,21 +392,21 @@ DocComment[DOC_COMMENT, pos:1
      */
     void unclosed_attr() { }
 /*
-DocComment[DOC_COMMENT, pos:1
+DocComment[DOC_COMMENT, pos:0
   firstSentence: 4
-    Erroneous[ERRONEOUS, pos:1
+    Erroneous[ERRONEOUS, pos:0
       code: compiler.err.dc.malformed.html
       body: <
     ]
-    Text[TEXT, pos:2, a_name1="]
-    Literal[LITERAL, pos:11, value]
-    Text[TEXT, pos:27, "_name2='@foo'_name3="abc]
+    Text[TEXT, pos:1, a_name1="]
+    Literal[LITERAL, pos:10, value]
+    Text[TEXT, pos:26, "_name2='@foo'_name3="abc]
   body: empty
   block tags: 1
-    See[SEE, pos:54
+    See[SEE, pos:52
       reference: 2
-        Reference[REFERENCE, pos:59, Ref]
-        Literal[LITERAL, pos:63, xyz]
+        Reference[REFERENCE, pos:57, Ref]
+        Literal[LITERAL, pos:61, xyz]
     ]
 ]
 */
diff --git a/test/langtools/tools/javac/doctree/CodeTest.java b/test/langtools/tools/javac/doctree/CodeTest.java
index 860d4aef714..b7770122715 100644
--- a/test/langtools/tools/javac/doctree/CodeTest.java
+++ b/test/langtools/tools/javac/doctree/CodeTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @bug 7021614 8241780 8273244 8284908
+ * @bug 7021614 8241780 8273244 8284908 8352249
  * @summary extend com.sun.source API to support parsing javadoc comments
  * @modules jdk.compiler/com.sun.tools.javac.api
  *          jdk.compiler/com.sun.tools.javac.file
@@ -76,9 +76,9 @@ DocComment[DOC_COMMENT, pos:0
      */
     void nested() { }
 /*
-DocComment[DOC_COMMENT, pos:1
+DocComment[DOC_COMMENT, pos:0
   firstSentence: 1
-    Literal[CODE, pos:1, {@code_nested}_]
+    Literal[CODE, pos:0, {@code_nested}_]
   body: empty
   block tags: empty
 ]
@@ -91,9 +91,9 @@ DocComment[DOC_COMMENT, pos:1
      */
     void embedded_newline() { }
 /*
-DocComment[DOC_COMMENT, pos:1
+DocComment[DOC_COMMENT, pos:0
   firstSentence: 1
-    Literal[CODE, pos:1, if_(a_<_b)_{|________}|_]
+    Literal[CODE, pos:0, if_(a_<_b)_{|_______}|]
   body: empty
   block tags: empty
 ]
@@ -106,9 +106,9 @@ DocComment[DOC_COMMENT, pos:1
      */
     void embedded_at() { }
 /*
-DocComment[DOC_COMMENT, pos:1
+DocComment[DOC_COMMENT, pos:0
   firstSentence: 1
-    Literal[CODE, pos:1, |_@tag|_]
+    Literal[CODE, pos:0, |@tag|]
   body: empty
   block tags: empty
 ]
@@ -122,15 +122,15 @@ DocComment[DOC_COMMENT, pos:1
      */
     void pre_at_code() { }
 /*
-DocComment[DOC_COMMENT, pos:1
+DocComment[DOC_COMMENT, pos:0
   firstSentence: 2
-    StartElement[START_ELEMENT, pos:1
+    StartElement[START_ELEMENT, pos:0
       name:pre
       attributes: empty
     ]
-    Literal[CODE, pos:6, |_____@Override|_____void_m()_{_}|_]
+    Literal[CODE, pos:5, |____@Override|____void_m()_{_}|]
   body: 1
-    EndElement[END_ELEMENT, pos:48, pre]
+    EndElement[END_ELEMENT, pos:44, pre]
   block tags: empty
 ]
 */
@@ -154,11 +154,11 @@ DocComment[DOC_COMMENT, pos:0
      * @author jjg */
     void unterminated_2() { }
 /*
-DocComment[DOC_COMMENT, pos:1
+DocComment[DOC_COMMENT, pos:0
   firstSentence: 1
-    Erroneous[ERRONEOUS, pos:1, prefPos:34
+    Erroneous[ERRONEOUS, pos:0, prefPos:32
       code: compiler.err.dc.unterminated.inline.tag
-      body: {@code_if_(a_<_b)_{_}|_@author_jjg
+      body: {@code_if_(a_<_b)_{_}|@author_jjg
     ]
   body: empty
   block tags: empty
diff --git a/test/langtools/tools/javac/doctree/DeprecatedTest.java b/test/langtools/tools/javac/doctree/DeprecatedTest.java
index ac5923afa19..8067d545580 100644
--- a/test/langtools/tools/javac/doctree/DeprecatedTest.java
+++ b/test/langtools/tools/javac/doctree/DeprecatedTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @bug 7021614 8273244
+ * @bug 7021614 8273244 8352249
  * @summary extend com.sun.source API to support parsing javadoc comments
  * @modules jdk.compiler/com.sun.tools.javac.api
  *          jdk.compiler/com.sun.tools.javac.file
@@ -39,11 +39,11 @@ class DeprecatedTest {
      */
     void deprecated() { }
 /*
-DocComment[DOC_COMMENT, pos:1
+DocComment[DOC_COMMENT, pos:0
   firstSentence: empty
   body: empty
   block tags: 1
-    Deprecated[DEPRECATED, pos:1
+    Deprecated[DEPRECATED, pos:0
       body: empty
     ]
 ]
@@ -54,13 +54,13 @@ DocComment[DOC_COMMENT, pos:1
      */
     void deprecated_text() { }
 /*
-DocComment[DOC_COMMENT, pos:1
+DocComment[DOC_COMMENT, pos:0
   firstSentence: empty
   body: empty
   block tags: 1
-    Deprecated[DEPRECATED, pos:1
+    Deprecated[DEPRECATED, pos:0
       body: 1
-        Text[TEXT, pos:13, text]
+        Text[TEXT, pos:12, text]
     ]
 ]
 */
diff --git a/test/langtools/tools/javac/doctree/DocCommentTester.java b/test/langtools/tools/javac/doctree/DocCommentTester.java
index d418005745a..3591fcbca2d 100644
--- a/test/langtools/tools/javac/doctree/DocCommentTester.java
+++ b/test/langtools/tools/javac/doctree/DocCommentTester.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -989,12 +989,11 @@ public class DocCommentTester {
             if (annos.contains("@PrettyCheck(false)")) {
                 return;
             }
-            boolean normalizeTags = !annos.contains("@NormalizeTags(false)");
 
             Elements.DocCommentKind ck = trees.getDocCommentKind(path);
             boolean isLineComment = ck == Elements.DocCommentKind.END_OF_LINE;
             String raw = trees.getDocComment(path).stripTrailing();
-            String normRaw = normalize(raw, isLineComment, normalizeTags);
+            String normRaw = normalize(raw, isLineComment);
 
             StringWriter out = new StringWriter();
             DocPretty dp = new DocPretty(out);
@@ -1014,66 +1013,20 @@ public class DocCommentTester {
 
         /**
          * Normalize whitespace in places where the tree does not preserve it.
-         * Maintain contents of inline tags unless {@code normalizeTags} is
-         * {@code false}. This should normally be {@code true}, but should be
-         * set to {@code false} when there is syntactically invalid content
-         * that might resemble an inline tag, but which is not so.
          *
          * @param s the comment text to be normalized
-         * @param normalizeTags whether to normalize inline tags
          * @return the normalized content
          */
-        String normalize(String s, boolean isLineComment, boolean normalizeTags) {
-            String s2 = (isLineComment ? s : s.trim())
-                    .replaceFirst("\\.\\s*\\n *@(?![@*])", ".\n@"); // Between block tags
-            StringBuilder sb = new StringBuilder();
-            Pattern p = Pattern.compile("(?i)\\{@([a-z][a-z0-9.:-]*)( )?");
-            Matcher m = p.matcher(s2);
-            int start = 0;
-            if (normalizeTags) {
-                while (m.find(start)) {
-                    sb.append(normalizeFragment(s2.substring(start, m.start())));
-                    sb.append(m.group().trim());
-                    start = copyLiteral(s2, m.end(), sb);
-                }
-            }
-            sb.append(normalizeFragment(s2.substring(start)));
-            return sb.toString()
+        String normalize(String s, boolean isLineComment) {
+            // See comment in MarkdownTest for explanation of dummy and Override
+            return (isLineComment ? s : s.stripIndent().trim())
+                    .replaceFirst("\\.\\s*\\n *@(?![@*])", ".\n@")  // Between block tags
+                    .replaceAll("\n[ \t]+@(?!([@*]|(dummy|Override)))", "\n@")
                     .replaceAll("(?i)\\{@([a-z][a-z0-9.:-]*)\\s+}", "{@$1}")
                     .replaceAll("(\\{@value\\s+[^}]+)\\s+(})", "$1$2");
         }
-
-        // See comment in MarkdownTest for explanation of dummy and Override
-        String normalizeFragment(String s) {
-            return s.replaceAll("\n[ \t]+@(?!([@*]|(dummy|Override)))", "\n@");
-        }
-
-        int copyLiteral(String s, int start, StringBuilder sb) {
-            int depth = 0;
-            for (int i = start; i < s.length(); i++) {
-                char ch = s.charAt(i);
-                if (i == start && !Character.isWhitespace(ch) && ch != '}') {
-                    sb.append(' ');
-                }
-                switch (ch) {
-                    case '{' ->
-                        depth++;
-
-                    case '}' -> {
-                        depth--;
-                        if (depth < 0) {
-                            sb.append(ch);
-                            return i + 1;
-                        }
-                    }
-                }
-                sb.append(ch);
-            }
-            return s.length();
-        }
     }
 
-
     /**
      * Verifies the general "left to right" constraints for the positions of
      * nodes in the DocTree AST.
diff --git a/test/langtools/tools/javac/doctree/ElementTest.java b/test/langtools/tools/javac/doctree/ElementTest.java
index db2829cdce2..d67a89c682d 100644
--- a/test/langtools/tools/javac/doctree/ElementTest.java
+++ b/test/langtools/tools/javac/doctree/ElementTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @bug 7021614 8078320 8247788 8273244 8298405
+ * @bug 7021614 8078320 8247788 8273244 8298405 8352249
  * @summary extend com.sun.source API to support parsing javadoc comments
  * @modules jdk.compiler/com.sun.tools.javac.api
  *          jdk.compiler/com.sun.tools.javac.file
@@ -39,15 +39,15 @@ class ElementTest {
      */
     void simple() { }
 /*
-DocComment[DOC_COMMENT, pos:1
+DocComment[DOC_COMMENT, pos:0
   firstSentence: 2
-    StartElement[START_ELEMENT, pos:1
+    StartElement[START_ELEMENT, pos:0
       name:p
       attributes: empty
     ]
-    Text[TEXT, pos:4, para]
+    Text[TEXT, pos:3, para]
   body: 1
-    EndElement[END_ELEMENT, pos:8, p]
+    EndElement[END_ELEMENT, pos:7, p]
   block tags: empty
 ]
 */
@@ -57,10 +57,10 @@ DocComment[DOC_COMMENT, pos:1
      */
     void self_closing() { }
 /*
-DocComment[DOC_COMMENT, pos:1
+DocComment[DOC_COMMENT, pos:0
   firstSentence: 2
-    Text[TEXT, pos:1, abc_]
-    StartElement[START_ELEMENT, pos:5
+    Text[TEXT, pos:0, abc_]
+    StartElement[START_ELEMENT, pos:4
       name:hr
       attributes: empty
     ]
@@ -74,14 +74,14 @@ DocComment[DOC_COMMENT, pos:1
      */
     void bad_lt() { }
 /*
-DocComment[DOC_COMMENT, pos:1
+DocComment[DOC_COMMENT, pos:0
   firstSentence: 3
-    Text[TEXT, pos:1, abc_]
-    Erroneous[ERRONEOUS, pos:5
+    Text[TEXT, pos:0, abc_]
+    Erroneous[ERRONEOUS, pos:4
       code: compiler.err.dc.malformed.html
       body: <
     ]
-    Text[TEXT, pos:6, _def]
+    Text[TEXT, pos:5, _def]
   body: empty
   block tags: empty
 ]
@@ -92,9 +92,9 @@ DocComment[DOC_COMMENT, pos:1
      */
     void bad_gt() { }
 /*
-DocComment[DOC_COMMENT, pos:1
+DocComment[DOC_COMMENT, pos:0
   firstSentence: 1
-    Text[TEXT, pos:1, abc_>_def]
+    Text[TEXT, pos:0, abc_>_def]
   body: empty
   block tags: empty
 ]
@@ -105,14 +105,14 @@ DocComment[DOC_COMMENT, pos:1
      */
     void bad_chars_start();
 /*
-DocComment[DOC_COMMENT, pos:1
+DocComment[DOC_COMMENT, pos:0
   firstSentence: 3
-    Text[TEXT, pos:1, abc_]
-    Erroneous[ERRONEOUS, pos:5
+    Text[TEXT, pos:0, abc_]
+    Erroneous[ERRONEOUS, pos:4
       code: compiler.err.dc.malformed.html
       body: <
     ]
-    Text[TEXT, pos:6, p_123>_def]
+    Text[TEXT, pos:5, p_123>_def]
   body: empty
   block tags: empty
 ]
@@ -123,14 +123,14 @@ DocComment[DOC_COMMENT, pos:1
      */
     void bad_chars_end();
 /*
-DocComment[DOC_COMMENT, pos:1
+DocComment[DOC_COMMENT, pos:0
   firstSentence: 3
-    Text[TEXT, pos:1, abc_]
-    Erroneous[ERRONEOUS, pos:5
+    Text[TEXT, pos:0, abc_]
+    Erroneous[ERRONEOUS, pos:4
       code: compiler.err.dc.malformed.html
       body: <
     ]
-    Text[TEXT, pos:6, /p_123>_def]
+    Text[TEXT, pos:5, /p_123>_def]
   body: empty
   block tags: empty
 ]
@@ -141,14 +141,14 @@ DocComment[DOC_COMMENT, pos:1
      */
     void unterminated_eoi() { }
 /*
-DocComment[DOC_COMMENT, pos:1
+DocComment[DOC_COMMENT, pos:0
   firstSentence: 3
-    Text[TEXT, pos:1, abc_]
-    Erroneous[ERRONEOUS, pos:5
+    Text[TEXT, pos:0, abc_]
+    Erroneous[ERRONEOUS, pos:4
       code: compiler.err.dc.malformed.html
       body: <
     ]
-    Text[TEXT, pos:6, hr]
+    Text[TEXT, pos:5, hr]
   body: empty
   block tags: empty
 ]
@@ -160,19 +160,19 @@ DocComment[DOC_COMMENT, pos:1
      */
     void unterminated_block() { }
 /*
-DocComment[DOC_COMMENT, pos:1
+DocComment[DOC_COMMENT, pos:0
   firstSentence: 3
-    Text[TEXT, pos:1, abc_]
-    Erroneous[ERRONEOUS, pos:5
+    Text[TEXT, pos:0, abc_]
+    Erroneous[ERRONEOUS, pos:4
       code: compiler.err.dc.malformed.html
       body: <
     ]
-    Text[TEXT, pos:6, hr]
+    Text[TEXT, pos:5, hr]
   body: empty
   block tags: 1
-    Author[AUTHOR, pos:10
+    Author[AUTHOR, pos:8
       name: 1
-        Text[TEXT, pos:18, jjg]
+        Text[TEXT, pos:16, jjg]
     ]
 ]
 */
@@ -183,14 +183,14 @@ DocComment[DOC_COMMENT, pos:1
      */
     void unterminated_end_eoi() { }
 /*
-DocComment[DOC_COMMENT, pos:1
+DocComment[DOC_COMMENT, pos:0
   firstSentence: 3
-    Text[TEXT, pos:1, abc_]
-    Erroneous[ERRONEOUS, pos:5
+    Text[TEXT, pos:0, abc_]
+    Erroneous[ERRONEOUS, pos:4
       code: compiler.err.dc.malformed.html
       body: <
     ]
-    Text[TEXT, pos:6, /p]
+    Text[TEXT, pos:5, /p]
   body: empty
   block tags: empty
 ]
@@ -202,19 +202,19 @@ DocComment[DOC_COMMENT, pos:1
      */
     void unterminated_end_block() { }
 /*
-DocComment[DOC_COMMENT, pos:1
+DocComment[DOC_COMMENT, pos:0
   firstSentence: 3
-    Text[TEXT, pos:1, abc_]
-    Erroneous[ERRONEOUS, pos:5
+    Text[TEXT, pos:0, abc_]
+    Erroneous[ERRONEOUS, pos:4
       code: compiler.err.dc.malformed.html
       body: <
     ]
-    Text[TEXT, pos:6, /p]
+    Text[TEXT, pos:5, /p]
   body: empty
   block tags: 1
-    Author[AUTHOR, pos:10
+    Author[AUTHOR, pos:8
       name: 1
-        Text[TEXT, pos:18, jjg]
+        Text[TEXT, pos:16, jjg]
     ]
 ]
 */
@@ -226,11 +226,11 @@ DocComment[DOC_COMMENT, pos:1
      */
     void comment() { }
 /*
-DocComment[DOC_COMMENT, pos:1
+DocComment[DOC_COMMENT, pos:0
   firstSentence: 3
-    Text[TEXT, pos:1, abc|_]
-    Comment[COMMENT, pos:6, <!--_comment_-->]
-    Text[TEXT, pos:22, |_def]
+    Text[TEXT, pos:0, abc|]
+    Comment[COMMENT, pos:4, <!--_comment_-->]
+    Text[TEXT, pos:20, |def]
   body: empty
   block tags: empty
 ]
diff --git a/test/langtools/tools/javac/doctree/EntityTest.java b/test/langtools/tools/javac/doctree/EntityTest.java
index 0b1db2c3409..ca0e2e99a18 100644
--- a/test/langtools/tools/javac/doctree/EntityTest.java
+++ b/test/langtools/tools/javac/doctree/EntityTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @bug 7021614 8273244 8284908 8298405
+ * @bug 7021614 8273244 8284908 8298405 8352249
  * @summary extend com.sun.source API to support parsing javadoc comments
  * @modules jdk.compiler/com.sun.tools.javac.api
  *          jdk.compiler/com.sun.tools.javac.file
@@ -39,11 +39,11 @@ class EntityTest {
      */
     public void name() { }
 /*
-DocComment[DOC_COMMENT, pos:2
+DocComment[DOC_COMMENT, pos:0
   firstSentence: 3
-    Text[TEXT, pos:2, abc_]
-    Entity[ENTITY, pos:6, lt]
-    Text[TEXT, pos:10, _def]
+    Text[TEXT, pos:0, abc_]
+    Entity[ENTITY, pos:4, lt]
+    Text[TEXT, pos:8, _def]
   body: empty
   block tags: empty
 ]
@@ -54,11 +54,11 @@ DocComment[DOC_COMMENT, pos:2
      */
     public void decimal_value() { }
 /*
-DocComment[DOC_COMMENT, pos:2
+DocComment[DOC_COMMENT, pos:0
   firstSentence: 3
-    Text[TEXT, pos:2, abc_]
-    Entity[ENTITY, pos:6, #160]
-    Text[TEXT, pos:12, _def]
+    Text[TEXT, pos:0, abc_]
+    Entity[ENTITY, pos:4, #160]
+    Text[TEXT, pos:10, _def]
   body: empty
   block tags: empty
 ]
@@ -69,11 +69,11 @@ DocComment[DOC_COMMENT, pos:2
      */
     public void lower_hex_value() { }
 /*
-DocComment[DOC_COMMENT, pos:2
+DocComment[DOC_COMMENT, pos:0
   firstSentence: 3
-    Text[TEXT, pos:2, abc_]
-    Entity[ENTITY, pos:6, #xa0]
-    Text[TEXT, pos:12, _def]
+    Text[TEXT, pos:0, abc_]
+    Entity[ENTITY, pos:4, #xa0]
+    Text[TEXT, pos:10, _def]
   body: empty
   block tags: empty
 ]
@@ -84,11 +84,11 @@ DocComment[DOC_COMMENT, pos:2
      */
     public void upper_hex_value() { }
 /*
-DocComment[DOC_COMMENT, pos:2
+DocComment[DOC_COMMENT, pos:0
   firstSentence: 3
-    Text[TEXT, pos:2, abc_]
-    Entity[ENTITY, pos:6, #XA0]
-    Text[TEXT, pos:12, _def]
+    Text[TEXT, pos:0, abc_]
+    Entity[ENTITY, pos:4, #XA0]
+    Text[TEXT, pos:10, _def]
   body: empty
   block tags: empty
 ]
@@ -99,14 +99,14 @@ DocComment[DOC_COMMENT, pos:2
      */
     public void bad_amp() { }
 /*
-DocComment[DOC_COMMENT, pos:2
+DocComment[DOC_COMMENT, pos:0
   firstSentence: 3
-    Text[TEXT, pos:2, abc_]
-    Erroneous[ERRONEOUS, pos:6
+    Text[TEXT, pos:0, abc_]
+    Erroneous[ERRONEOUS, pos:4
       code: compiler.err.dc.bad.entity
       body: &
     ]
-    Text[TEXT, pos:7, _def]
+    Text[TEXT, pos:5, _def]
   body: empty
   block tags: empty
 ]
@@ -117,14 +117,14 @@ DocComment[DOC_COMMENT, pos:2
      */
     public void bad_entity_name() { }
 /*
-DocComment[DOC_COMMENT, pos:2
+DocComment[DOC_COMMENT, pos:0
   firstSentence: 3
-    Text[TEXT, pos:2, abc_]
-    Erroneous[ERRONEOUS, pos:6
+    Text[TEXT, pos:0, abc_]
+    Erroneous[ERRONEOUS, pos:4
       code: compiler.err.dc.bad.entity
       body: &
     ]
-    Text[TEXT, pos:7, 1_def]
+    Text[TEXT, pos:5, 1_def]
   body: empty
   block tags: empty
 ]
@@ -135,14 +135,14 @@ DocComment[DOC_COMMENT, pos:2
      */
     public void bad_entity_decimal_value() { }
 /*
-DocComment[DOC_COMMENT, pos:2
+DocComment[DOC_COMMENT, pos:0
   firstSentence: 3
-    Text[TEXT, pos:2, abc_]
-    Erroneous[ERRONEOUS, pos:6, prefPos:10
+    Text[TEXT, pos:0, abc_]
+    Erroneous[ERRONEOUS, pos:4, prefPos:8
       code: compiler.err.dc.missing.semicolon
       body: &#012
     ]
-    Text[TEXT, pos:11, .3;_def]
+    Text[TEXT, pos:9, .3;_def]
   body: empty
   block tags: empty
 ]
@@ -153,14 +153,14 @@ DocComment[DOC_COMMENT, pos:2
      */
     public void bad_entity_hex_value() { }
 /*
-DocComment[DOC_COMMENT, pos:2
+DocComment[DOC_COMMENT, pos:0
   firstSentence: 3
-    Text[TEXT, pos:2, abc_]
-    Erroneous[ERRONEOUS, pos:6, prefPos:12
+    Text[TEXT, pos:0, abc_]
+    Erroneous[ERRONEOUS, pos:4, prefPos:10
       code: compiler.err.dc.missing.semicolon
       body: &#x012a
     ]
-    Text[TEXT, pos:13, zc;_def]
+    Text[TEXT, pos:11, zc;_def]
   body: empty
   block tags: empty
 ]
diff --git a/test/langtools/tools/javac/doctree/ExceptionTest.java b/test/langtools/tools/javac/doctree/ExceptionTest.java
index 600b428b4cf..f825ff2e113 100644
--- a/test/langtools/tools/javac/doctree/ExceptionTest.java
+++ b/test/langtools/tools/javac/doctree/ExceptionTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @bug 7021614 8273244
+ * @bug 7021614 8273244 8352249
  * @summary extend com.sun.source API to support parsing javadoc comments
  * @modules jdk.compiler/com.sun.tools.javac.api
  *          jdk.compiler/com.sun.tools.javac.file
@@ -39,13 +39,13 @@ class ExceptionTest {
      */
     void exception() throws Exception { }
 /*
-DocComment[DOC_COMMENT, pos:1
+DocComment[DOC_COMMENT, pos:0
   firstSentence: empty
   body: empty
   block tags: 1
-    Throws[EXCEPTION, pos:1
+    Throws[EXCEPTION, pos:0
       exceptionName:
-        Reference[REFERENCE, pos:12, Exception]
+        Reference[REFERENCE, pos:11, Exception]
       description: empty
     ]
 ]
@@ -56,15 +56,15 @@ DocComment[DOC_COMMENT, pos:1
      */
     void exception_text() throws Exception { }
 /*
-DocComment[DOC_COMMENT, pos:1
+DocComment[DOC_COMMENT, pos:0
   firstSentence: empty
   body: empty
   block tags: 1
-    Throws[EXCEPTION, pos:1
+    Throws[EXCEPTION, pos:0
       exceptionName:
-        Reference[REFERENCE, pos:12, Exception]
+        Reference[REFERENCE, pos:11, Exception]
       description: 1
-        Text[TEXT, pos:22, text]
+        Text[TEXT, pos:21, text]
     ]
 ]
 */
diff --git a/test/langtools/tools/javac/doctree/FirstSentenceTest.java b/test/langtools/tools/javac/doctree/FirstSentenceTest.java
index d69049fe8d6..c9835d4db6b 100644
--- a/test/langtools/tools/javac/doctree/FirstSentenceTest.java
+++ b/test/langtools/tools/javac/doctree/FirstSentenceTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @bug 7021614 8078320 8132096 8273244
+ * @bug 7021614 8078320 8132096 8273244 8352249
  * @summary extend com.sun.source API to support parsing javadoc comments
  * @modules jdk.compiler/com.sun.tools.javac.api
  *          jdk.compiler/com.sun.tools.javac.file
@@ -78,18 +78,18 @@ DocComment[DOC_COMMENT, pos:0
      */
     void no_body() { }
 /*
-DocComment[DOC_COMMENT, pos:1
+DocComment[DOC_COMMENT, pos:0
   firstSentence: 1
-    Text[TEXT, pos:1, abc_def_ghi.]
+    Text[TEXT, pos:0, abc_def_ghi.]
   body: empty
   block tags: empty
 ]
 */
 /*
 BREAK_ITERATOR
-DocComment[DOC_COMMENT, pos:1
+DocComment[DOC_COMMENT, pos:0
   firstSentence: 1
-    Text[TEXT, pos:1, abc_def_ghi.]
+    Text[TEXT, pos:0, abc_def_ghi.]
   body: empty
   block tags: empty
 ]
@@ -99,19 +99,19 @@ DocComment[DOC_COMMENT, pos:1
      */
     void dot_space() { }
 /*
-DocComment[DOC_COMMENT, pos:1
+DocComment[DOC_COMMENT, pos:0
   firstSentence: 1
-    Text[TEXT, pos:1, abc_def_ghi.]
+    Text[TEXT, pos:0, abc_def_ghi.]
   body: 1
-    Text[TEXT, pos:14, jkl_mno_pqr.]
+    Text[TEXT, pos:13, jkl_mno_pqr.]
   block tags: empty
 ]
 */
 /*
 BREAK_ITERATOR
-DocComment[DOC_COMMENT, pos:1
+DocComment[DOC_COMMENT, pos:0
   firstSentence: 1
-    Text[TEXT, pos:1, abc_def_ghi._jkl_mno_pqr.]
+    Text[TEXT, pos:0, abc_def_ghi._jkl_mno_pqr.]
   body: empty
   block tags: empty
 ]
@@ -122,21 +122,44 @@ DocComment[DOC_COMMENT, pos:1
      */
     void dot_newline() { }
 /*
-DocComment[DOC_COMMENT, pos:1
+DocComment[DOC_COMMENT, pos:0
   firstSentence: 1
-    Text[TEXT, pos:1, abc_def_ghi.]
+    Text[TEXT, pos:0, abc_def_ghi.]
   body: 1
-    Text[TEXT, pos:15, jkl_mno_pqr]
+    Text[TEXT, pos:13, jkl_mno_pqr]
   block tags: empty
 ]
 */
 /*
 BREAK_ITERATOR
-DocComment[DOC_COMMENT, pos:1
+DocComment[DOC_COMMENT, pos:0
   firstSentence: 1
-    Text[TEXT, pos:1, abc_def_ghi.]
+    Text[TEXT, pos:0, abc_def_ghi.|jkl_mno_pqr]
+  body: empty
+  block tags: empty
+]
+*/
+    /**
+     * abc def ghi.
+     * Jkl mno pqr
+     */
+    void dot_newline_upper() { }
+/*
+DocComment[DOC_COMMENT, pos:0
+  firstSentence: 1
+    Text[TEXT, pos:0, abc_def_ghi.]
   body: 1
-    Text[TEXT, pos:15, jkl_mno_pqr]
+    Text[TEXT, pos:13, Jkl_mno_pqr]
+  block tags: empty
+]
+*/
+/*
+BREAK_ITERATOR
+DocComment[DOC_COMMENT, pos:0
+  firstSentence: 1
+    Text[TEXT, pos:0, abc_def_ghi.]
+  body: 1
+    Text[TEXT, pos:13, Jkl_mno_pqr]
   block tags: empty
 ]
 */
@@ -146,29 +169,29 @@ DocComment[DOC_COMMENT, pos:1
      */
     void dot_p() { }
 /*
-DocComment[DOC_COMMENT, pos:1
+DocComment[DOC_COMMENT, pos:0
   firstSentence: 1
-    Text[TEXT, pos:1, abc_def_ghi]
+    Text[TEXT, pos:0, abc_def_ghi]
   body: 2
-    StartElement[START_ELEMENT, pos:14
+    StartElement[START_ELEMENT, pos:12
       name:p
       attributes: empty
     ]
-    Text[TEXT, pos:17, jkl_mno_pqr]
+    Text[TEXT, pos:15, jkl_mno_pqr]
   block tags: empty
 ]
 */
 /*
 BREAK_ITERATOR
-DocComment[DOC_COMMENT, pos:1
+DocComment[DOC_COMMENT, pos:0
   firstSentence: 1
-    Text[TEXT, pos:1, abc_def_ghi]
+    Text[TEXT, pos:0, abc_def_ghi]
   body: 2
-    StartElement[START_ELEMENT, pos:14
+    StartElement[START_ELEMENT, pos:12
       name:p
       attributes: empty
     ]
-    Text[TEXT, pos:17, jkl_mno_pqr]
+    Text[TEXT, pos:15, jkl_mno_pqr]
   block tags: empty
 ]
 */
@@ -179,29 +202,61 @@ DocComment[DOC_COMMENT, pos:1
      */
     void newline_p() { }
 /*
-DocComment[DOC_COMMENT, pos:2
+DocComment[DOC_COMMENT, pos:1
   firstSentence: 2
-    StartElement[START_ELEMENT, pos:2
+    StartElement[START_ELEMENT, pos:1
       name:p
       attributes: empty
     ]
-    Text[TEXT, pos:5, abc_def_ghi.]
+    Text[TEXT, pos:4, abc_def_ghi.]
   body: 1
-    Text[TEXT, pos:19, jdl_mno_pqf]
+    Text[TEXT, pos:17, jdl_mno_pqf]
   block tags: empty
 ]
 */
 /*
 BREAK_ITERATOR
-DocComment[DOC_COMMENT, pos:2
+DocComment[DOC_COMMENT, pos:1
   firstSentence: 2
-    StartElement[START_ELEMENT, pos:2
+    StartElement[START_ELEMENT, pos:1
       name:p
       attributes: empty
     ]
-    Text[TEXT, pos:5, abc_def_ghi.]
+    Text[TEXT, pos:4, abc_def_ghi.|jdl_mno_pqf]
+  body: empty
+  block tags: empty
+]
+*/
+    /**
+     *
+     * <p>abc def ghi.
+     * Jdl mno pqf
+     */
+    void newline_p_upper() { }
+/*
+DocComment[DOC_COMMENT, pos:1
+  firstSentence: 2
+    StartElement[START_ELEMENT, pos:1
+      name:p
+      attributes: empty
+    ]
+    Text[TEXT, pos:4, abc_def_ghi.]
   body: 1
-    Text[TEXT, pos:19, jdl_mno_pqf]
+    Text[TEXT, pos:17, Jdl_mno_pqf]
+  block tags: empty
+]
+*/
+/*
+BREAK_ITERATOR
+DocComment[DOC_COMMENT, pos:1
+  firstSentence: 2
+    StartElement[START_ELEMENT, pos:1
+      name:p
+      attributes: empty
+    ]
+    Text[TEXT, pos:4, abc_def_ghi.]
+  body: 1
+    Text[TEXT, pos:17, Jdl_mno_pqf]
   block tags: empty
 ]
 */
@@ -211,23 +266,23 @@ DocComment[DOC_COMMENT, pos:2
      */
     void dot_end_p() { }
 /*
-DocComment[DOC_COMMENT, pos:1
+DocComment[DOC_COMMENT, pos:0
   firstSentence: 1
-    Text[TEXT, pos:1, abc_def_ghi]
+    Text[TEXT, pos:0, abc_def_ghi]
   body: 2
-    EndElement[END_ELEMENT, pos:14, p]
-    Text[TEXT, pos:18, jkl_mno_pqr]
+    EndElement[END_ELEMENT, pos:12, p]
+    Text[TEXT, pos:16, jkl_mno_pqr]
   block tags: empty
 ]
 */
 /*
 BREAK_ITERATOR
-DocComment[DOC_COMMENT, pos:1
+DocComment[DOC_COMMENT, pos:0
   firstSentence: 1
-    Text[TEXT, pos:1, abc_def_ghi]
+    Text[TEXT, pos:0, abc_def_ghi]
   body: 2
-    EndElement[END_ELEMENT, pos:14, p]
-    Text[TEXT, pos:18, jkl_mno_pqr]
+    EndElement[END_ELEMENT, pos:12, p]
+    Text[TEXT, pos:16, jkl_mno_pqr]
   block tags: empty
 ]
 */
@@ -236,23 +291,23 @@ DocComment[DOC_COMMENT, pos:1
      */
     void entity() { }
 /*
-DocComment[DOC_COMMENT, pos:1
+DocComment[DOC_COMMENT, pos:0
   firstSentence: 3
-    Text[TEXT, pos:1, abc_]
-    Entity[ENTITY, pos:5, lt]
-    Text[TEXT, pos:9, _ghi.]
+    Text[TEXT, pos:0, abc_]
+    Entity[ENTITY, pos:4, lt]
+    Text[TEXT, pos:8, _ghi.]
   body: 1
-    Text[TEXT, pos:15, jkl_mno_pqr.]
+    Text[TEXT, pos:14, jkl_mno_pqr.]
   block tags: empty
 ]
 */
 /*
 BREAK_ITERATOR
-DocComment[DOC_COMMENT, pos:1
+DocComment[DOC_COMMENT, pos:0
   firstSentence: 3
-    Text[TEXT, pos:1, abc_]
-    Entity[ENTITY, pos:5, lt]
-    Text[TEXT, pos:9, _ghi._jkl_mno_pqr.]
+    Text[TEXT, pos:0, abc_]
+    Entity[ENTITY, pos:4, lt]
+    Text[TEXT, pos:8, _ghi._jkl_mno_pqr.]
   body: empty
   block tags: empty
 ]
@@ -262,23 +317,23 @@ DocComment[DOC_COMMENT, pos:1
      */
     void inline_tag() { }
 /*
-DocComment[DOC_COMMENT, pos:1
+DocComment[DOC_COMMENT, pos:0
   firstSentence: 3
-    Text[TEXT, pos:1, abc_]
-    Literal[CODE, pos:5, code]
-    Text[TEXT, pos:17, _ghi.]
+    Text[TEXT, pos:0, abc_]
+    Literal[CODE, pos:4, code]
+    Text[TEXT, pos:16, _ghi.]
   body: 1
-    Text[TEXT, pos:23, jkl_mno_pqr.]
+    Text[TEXT, pos:22, jkl_mno_pqr.]
   block tags: empty
 ]
 */
 /*
 BREAK_ITERATOR
-DocComment[DOC_COMMENT, pos:1
+DocComment[DOC_COMMENT, pos:0
   firstSentence: 3
-    Text[TEXT, pos:1, abc_]
-    Literal[CODE, pos:5, code]
-    Text[TEXT, pos:17, _ghi._jkl_mno_pqr.]
+    Text[TEXT, pos:0, abc_]
+    Literal[CODE, pos:4, code]
+    Text[TEXT, pos:16, _ghi._jkl_mno_pqr.]
   body: empty
   block tags: empty
 ]
@@ -289,27 +344,27 @@ DocComment[DOC_COMMENT, pos:1
      */
     void block_tag() { }
 /*
-DocComment[DOC_COMMENT, pos:1
+DocComment[DOC_COMMENT, pos:0
   firstSentence: 1
-    Text[TEXT, pos:1, abc_def_ghi]
+    Text[TEXT, pos:0, abc_def_ghi]
   body: empty
   block tags: 1
-    Author[AUTHOR, pos:14
+    Author[AUTHOR, pos:12
       name: 1
-        Text[TEXT, pos:22, jjg]
+        Text[TEXT, pos:20, jjg]
     ]
 ]
 */
 /*
 BREAK_ITERATOR
-DocComment[DOC_COMMENT, pos:1
+DocComment[DOC_COMMENT, pos:0
   firstSentence: 1
-    Text[TEXT, pos:1, abc_def_ghi]
+    Text[TEXT, pos:0, abc_def_ghi]
   body: empty
   block tags: 1
-    Author[AUTHOR, pos:14
+    Author[AUTHOR, pos:12
       name: 1
-        Text[TEXT, pos:22, jjg]
+        Text[TEXT, pos:20, jjg]
     ]
 ]
 */
@@ -318,25 +373,25 @@ DocComment[DOC_COMMENT, pos:1
      */
     void just_tag() { }
 /*
-DocComment[DOC_COMMENT, pos:1
+DocComment[DOC_COMMENT, pos:0
   firstSentence: empty
   body: empty
   block tags: 1
-    Author[AUTHOR, pos:1
+    Author[AUTHOR, pos:0
       name: 1
-        Text[TEXT, pos:9, jjg]
+        Text[TEXT, pos:8, jjg]
     ]
 ]
 */
 /*
 BREAK_ITERATOR
-DocComment[DOC_COMMENT, pos:1
+DocComment[DOC_COMMENT, pos:0
   firstSentence: empty
   body: empty
   block tags: 1
-    Author[AUTHOR, pos:1
+    Author[AUTHOR, pos:0
       name: 1
-        Text[TEXT, pos:9, jjg]
+        Text[TEXT, pos:8, jjg]
     ]
 ]
 */
@@ -346,29 +401,60 @@ DocComment[DOC_COMMENT, pos:1
      */
     void p_at_zero() { }
 /*
-DocComment[DOC_COMMENT, pos:1
+DocComment[DOC_COMMENT, pos:0
   firstSentence: 2
-    StartElement[START_ELEMENT, pos:1
+    StartElement[START_ELEMENT, pos:0
       name:p
       attributes: empty
     ]
-    Text[TEXT, pos:4, _abc_def.]
+    Text[TEXT, pos:3, _abc_def.]
   body: 1
-    Text[TEXT, pos:15, ghi_jkl]
+    Text[TEXT, pos:13, ghi_jkl]
   block tags: empty
 ]
 */
 /*
 BREAK_ITERATOR
-DocComment[DOC_COMMENT, pos:1
+DocComment[DOC_COMMENT, pos:0
   firstSentence: 2
-    StartElement[START_ELEMENT, pos:1
+    StartElement[START_ELEMENT, pos:0
       name:p
       attributes: empty
     ]
-    Text[TEXT, pos:4, _abc_def.]
+    Text[TEXT, pos:3, _abc_def.|ghi_jkl]
+  body: empty
+  block tags: empty
+]
+*/
+    /**
+     * <p> abc def.
+     * Ghi jkl
+     */
+    void p_at_zero_upper() { }
+/*
+DocComment[DOC_COMMENT, pos:0
+  firstSentence: 2
+    StartElement[START_ELEMENT, pos:0
+      name:p
+      attributes: empty
+    ]
+    Text[TEXT, pos:3, _abc_def.]
   body: 1
-    Text[TEXT, pos:15, ghi_jkl]
+    Text[TEXT, pos:13, Ghi_jkl]
+  block tags: empty
+]
+*/
+/*
+BREAK_ITERATOR
+DocComment[DOC_COMMENT, pos:0
+  firstSentence: 2
+    StartElement[START_ELEMENT, pos:0
+      name:p
+      attributes: empty
+    ]
+    Text[TEXT, pos:3, _abc_def.]
+  body: 1
+    Text[TEXT, pos:13, Ghi_jkl]
   block tags: empty
 ]
 */
@@ -378,29 +464,29 @@ DocComment[DOC_COMMENT, pos:1
      */
     void p_at_nonzero() { }
 /*
-DocComment[DOC_COMMENT, pos:1
+DocComment[DOC_COMMENT, pos:0
   firstSentence: 1
-    Text[TEXT, pos:1, abc]
+    Text[TEXT, pos:0, abc]
   body: 2
-    StartElement[START_ELEMENT, pos:5
+    StartElement[START_ELEMENT, pos:4
       name:p
       attributes: empty
     ]
-    Text[TEXT, pos:8, _def._ghi_jkl]
+    Text[TEXT, pos:7, _def._ghi_jkl]
   block tags: empty
 ]
 */
 /*
 BREAK_ITERATOR
-DocComment[DOC_COMMENT, pos:1
+DocComment[DOC_COMMENT, pos:0
   firstSentence: 1
-    Text[TEXT, pos:1, abc]
+    Text[TEXT, pos:0, abc]
   body: 2
-    StartElement[START_ELEMENT, pos:5
+    StartElement[START_ELEMENT, pos:4
       name:p
       attributes: empty
     ]
-    Text[TEXT, pos:8, _def._ghi_jkl]
+    Text[TEXT, pos:7, _def._ghi_jkl]
   block tags: empty
 ]
 */
diff --git a/test/langtools/tools/javac/doctree/HiddenTest.java b/test/langtools/tools/javac/doctree/HiddenTest.java
index 7ed981780e3..03cb8f45b93 100644
--- a/test/langtools/tools/javac/doctree/HiddenTest.java
+++ b/test/langtools/tools/javac/doctree/HiddenTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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 8073100 8273244
+ * @bug 8073100 8273244 8352249
  * @summary extend com.sun.source API to support parsing javadoc comments
  * @modules jdk.compiler/com.sun.tools.javac.api
  *          jdk.compiler/com.sun.tools.javac.file
@@ -39,11 +39,11 @@ class HiddenTest {
      */
     void hidden() { }
 /*
-DocComment[DOC_COMMENT, pos:1
+DocComment[DOC_COMMENT, pos:0
   firstSentence: empty
   body: empty
   block tags: 1
-    Hidden[HIDDEN, pos:1
+    Hidden[HIDDEN, pos:0
       body: empty
     ]
 ]
@@ -54,13 +54,13 @@ DocComment[DOC_COMMENT, pos:1
      */
     void hidden_text() { }
 /*
-DocComment[DOC_COMMENT, pos:1
+DocComment[DOC_COMMENT, pos:0
   firstSentence: empty
   body: empty
   block tags: 1
-    Hidden[HIDDEN, pos:1
+    Hidden[HIDDEN, pos:0
       body: 1
-        Text[TEXT, pos:9, text]
+        Text[TEXT, pos:8, text]
     ]
 ]
 */
diff --git a/test/langtools/tools/javac/doctree/InPreTest.java b/test/langtools/tools/javac/doctree/InPreTest.java
index 8d2a35bb68b..9203f56a0f2 100644
--- a/test/langtools/tools/javac/doctree/InPreTest.java
+++ b/test/langtools/tools/javac/doctree/InPreTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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 8078320 8273244 8284908
+ * @bug 8078320 8273244 8284908 8352249
  * @summary extend com.sun.source API to support parsing javadoc comments
  * @modules jdk.compiler/com.sun.tools.javac.api
  *          jdk.compiler/com.sun.tools.javac.file
@@ -39,19 +39,19 @@ class InPreTest {
      */
     public void after_pre() { }
 /*
-DocComment[DOC_COMMENT, pos:1
+DocComment[DOC_COMMENT, pos:0
   firstSentence: 1
-    Text[TEXT, pos:1, xyz]
+    Text[TEXT, pos:0, xyz]
   body: 6
-    StartElement[START_ELEMENT, pos:4
+    StartElement[START_ELEMENT, pos:3
       name:pre
       attributes: empty
     ]
-    Text[TEXT, pos:9, _pqr_]
-    EndElement[END_ELEMENT, pos:14, pre]
-    Text[TEXT, pos:20, _abc]
-    Literal[CODE, pos:24, _def__]
-    Text[TEXT, pos:38, ghi]
+    Text[TEXT, pos:8, _pqr_]
+    EndElement[END_ELEMENT, pos:13, pre]
+    Text[TEXT, pos:19, _abc]
+    Literal[CODE, pos:23, _def__]
+    Text[TEXT, pos:37, ghi]
   block tags: empty
 ]
 */
@@ -60,11 +60,11 @@ DocComment[DOC_COMMENT, pos:1
      */
     public void no_pre() { }
 /*
-DocComment[DOC_COMMENT, pos:1
+DocComment[DOC_COMMENT, pos:0
   firstSentence: 3
-    Text[TEXT, pos:1, abc]
-    Literal[CODE, pos:4, def]
-    Text[TEXT, pos:15, ghi]
+    Text[TEXT, pos:0, abc]
+    Literal[CODE, pos:3, def]
+    Text[TEXT, pos:14, ghi]
   body: empty
   block tags: empty
 ]
@@ -74,18 +74,18 @@ DocComment[DOC_COMMENT, pos:1
      */
     public void pre_after_text() {}
 /*
-DocComment[DOC_COMMENT, pos:1
+DocComment[DOC_COMMENT, pos:0
   firstSentence: 1
-    Text[TEXT, pos:1, xyz]
+    Text[TEXT, pos:0, xyz]
   body: 5
-    StartElement[START_ELEMENT, pos:4
+    StartElement[START_ELEMENT, pos:3
       name:pre
       attributes: empty
     ]
-    Text[TEXT, pos:9, _abc]
-    Literal[CODE, pos:13, _def__]
-    Text[TEXT, pos:27, ghi]
-    EndElement[END_ELEMENT, pos:30, pre]
+    Text[TEXT, pos:8, _abc]
+    Literal[CODE, pos:12, _def__]
+    Text[TEXT, pos:26, ghi]
+    EndElement[END_ELEMENT, pos:29, pre]
   block tags: empty
 ]
 */
@@ -95,11 +95,11 @@ DocComment[DOC_COMMENT, pos:1
      */
     public void no_pre_extra_whitespace() { }
 /*
-DocComment[DOC_COMMENT, pos:1
+DocComment[DOC_COMMENT, pos:0
   firstSentence: 3
-    Text[TEXT, pos:1, abc]
-    Literal[CODE, pos:4, _def__]
-    Text[TEXT, pos:18, ghi]
+    Text[TEXT, pos:0, abc]
+    Literal[CODE, pos:3, _def__]
+    Text[TEXT, pos:17, ghi]
   body: empty
   block tags: empty
 ]
@@ -109,17 +109,17 @@ DocComment[DOC_COMMENT, pos:1
      */
     public void in_pre() { }
 /*
-DocComment[DOC_COMMENT, pos:1
+DocComment[DOC_COMMENT, pos:0
   firstSentence: 4
-    StartElement[START_ELEMENT, pos:1
+    StartElement[START_ELEMENT, pos:0
       name:pre
       attributes: empty
     ]
-    Text[TEXT, pos:6, _abc]
-    Literal[CODE, pos:10, _def__]
-    Text[TEXT, pos:24, ghi]
+    Text[TEXT, pos:5, _abc]
+    Literal[CODE, pos:9, _def__]
+    Text[TEXT, pos:23, ghi]
   body: 1
-    EndElement[END_ELEMENT, pos:27, pre]
+    EndElement[END_ELEMENT, pos:26, pre]
   block tags: empty
 ]
 */
@@ -129,17 +129,17 @@ DocComment[DOC_COMMENT, pos:1
      */
     public void in_pre_with_space_nl() { }
 /*
-DocComment[DOC_COMMENT, pos:1
+DocComment[DOC_COMMENT, pos:0
   firstSentence: 4
-    StartElement[START_ELEMENT, pos:1
+    StartElement[START_ELEMENT, pos:0
       name:pre
       attributes: empty
     ]
-    Text[TEXT, pos:6, _abc]
-    Literal[CODE, pos:10, |_def__]
-    Text[TEXT, pos:24, ghi]
+    Text[TEXT, pos:5, _abc]
+    Literal[CODE, pos:9, |def__]
+    Text[TEXT, pos:22, ghi]
   body: 1
-    EndElement[END_ELEMENT, pos:27, pre]
+    EndElement[END_ELEMENT, pos:25, pre]
   block tags: empty
 ]
 */
@@ -169,10 +169,10 @@ DocComment[DOC_COMMENT, pos:1
      */
     public void bad_code_no_content() { }
 /*
-DocComment[DOC_COMMENT, pos:1
+DocComment[DOC_COMMENT, pos:0
   firstSentence: 2
-    Text[TEXT, pos:1, abc_]
-    Erroneous[ERRONEOUS, pos:5, prefPos:10
+    Text[TEXT, pos:0, abc_]
+    Erroneous[ERRONEOUS, pos:4, prefPos:9
       code: compiler.err.dc.unterminated.inline.tag
       body: {@code
     ]
@@ -185,10 +185,10 @@ DocComment[DOC_COMMENT, pos:1
      */
     public void bad_code_content() { }
 /*
-DocComment[DOC_COMMENT, pos:1
+DocComment[DOC_COMMENT, pos:0
   firstSentence: 2
-    Text[TEXT, pos:1, abc_]
-    Erroneous[ERRONEOUS, pos:5, prefPos:14
+    Text[TEXT, pos:0, abc_]
+    Erroneous[ERRONEOUS, pos:4, prefPos:13
       code: compiler.err.dc.unterminated.inline.tag
       body: {@code_abc
     ]
diff --git a/test/langtools/tools/javac/doctree/IndexTest.java b/test/langtools/tools/javac/doctree/IndexTest.java
index 024947f3c2e..b31630d04cf 100644
--- a/test/langtools/tools/javac/doctree/IndexTest.java
+++ b/test/langtools/tools/javac/doctree/IndexTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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 8144287 8273244 8284908 8305620
+ * @bug 8144287 8273244 8284908 8305620 8352249
  * @summary extend com.sun.source API to support parsing javadoc comments
  * @modules jdk.compiler/com.sun.tools.javac.api
  *          jdk.compiler/com.sun.tools.javac.file
@@ -39,15 +39,15 @@ class IndexTest {
      */
     void simple_term() {}
 /*
-DocComment[DOC_COMMENT, pos:1
+DocComment[DOC_COMMENT, pos:0
   firstSentence: 3
-    Text[TEXT, pos:1, abc_]
-    Index[INDEX, pos:5
+    Text[TEXT, pos:0, abc_]
+    Index[INDEX, pos:4
       term:
-        Text[TEXT, pos:13, xyz]
+        Text[TEXT, pos:12, xyz]
       description: empty
     ]
-    Text[TEXT, pos:17, _def]
+    Text[TEXT, pos:16, _def]
   body: empty
   block tags: empty
 ]
@@ -58,16 +58,16 @@ DocComment[DOC_COMMENT, pos:1
      */
     void simple_term_with_description() { }
 /*
-DocComment[DOC_COMMENT, pos:1
+DocComment[DOC_COMMENT, pos:0
   firstSentence: 3
-    Text[TEXT, pos:1, abc_]
-    Index[INDEX, pos:5
+    Text[TEXT, pos:0, abc_]
+    Index[INDEX, pos:4
       term:
-        Text[TEXT, pos:13, lmn]
+        Text[TEXT, pos:12, lmn]
       description: 1
-        Text[TEXT, pos:17, pqr_stu]
+        Text[TEXT, pos:16, pqr_stu]
     ]
-    Text[TEXT, pos:25, _def]
+    Text[TEXT, pos:24, _def]
   body: empty
   block tags: empty
 ]
@@ -78,16 +78,16 @@ DocComment[DOC_COMMENT, pos:1
      */
     void phrase_with_curly_description() { }
 /*
-DocComment[DOC_COMMENT, pos:1
+DocComment[DOC_COMMENT, pos:0
   firstSentence: 3
-    Text[TEXT, pos:1, abc_]
-    Index[INDEX, pos:5
+    Text[TEXT, pos:0, abc_]
+    Index[INDEX, pos:4
       term:
-        Text[TEXT, pos:13, ijk]
+        Text[TEXT, pos:12, ijk]
       description: 1
-        Text[TEXT, pos:17, {lmn_opq}_]
+        Text[TEXT, pos:16, {lmn_opq}_]
     ]
-    Text[TEXT, pos:28, _def]
+    Text[TEXT, pos:27, _def]
   body: empty
   block tags: empty
 ]
@@ -100,16 +100,16 @@ DocComment[DOC_COMMENT, pos:1
      */
     void phrase_with_nl_description() { }
 /*
-DocComment[DOC_COMMENT, pos:1
+DocComment[DOC_COMMENT, pos:0
   firstSentence: 3
-    Text[TEXT, pos:1, abc_]
-    Index[INDEX, pos:5
+    Text[TEXT, pos:0, abc_]
+    Index[INDEX, pos:4
       term:
-        Text[TEXT, pos:13, ijk]
+        Text[TEXT, pos:12, ijk]
       description: 1
-        Text[TEXT, pos:17, lmn|_opq|_rst|_]
+        Text[TEXT, pos:16, lmn|opq|rst|]
     ]
-    Text[TEXT, pos:33, _def]
+    Text[TEXT, pos:29, _def]
   body: empty
   block tags: empty
 ]
@@ -120,15 +120,15 @@ DocComment[DOC_COMMENT, pos:1
      */
     void phrase_no_description() { }
 /*
-DocComment[DOC_COMMENT, pos:1
+DocComment[DOC_COMMENT, pos:0
   firstSentence: 3
-    Text[TEXT, pos:1, abc_]
-    Index[INDEX, pos:5
+    Text[TEXT, pos:0, abc_]
+    Index[INDEX, pos:4
       term:
-        Text[TEXT, pos:13, "lmn_pqr"]
+        Text[TEXT, pos:12, "lmn_pqr"]
       description: empty
     ]
-    Text[TEXT, pos:23, _def]
+    Text[TEXT, pos:22, _def]
   body: empty
   block tags: empty
 ]
@@ -139,16 +139,16 @@ DocComment[DOC_COMMENT, pos:1
      */
     void phrase_with_description() { }
 /*
-DocComment[DOC_COMMENT, pos:1
+DocComment[DOC_COMMENT, pos:0
   firstSentence: 3
-    Text[TEXT, pos:1, abc_]
-    Index[INDEX, pos:5
+    Text[TEXT, pos:0, abc_]
+    Index[INDEX, pos:4
       term:
-        Text[TEXT, pos:13, "ijk_lmn"]
+        Text[TEXT, pos:12, "ijk_lmn"]
       description: 1
-        Text[TEXT, pos:23, pqr_xyz]
+        Text[TEXT, pos:22, pqr_xyz]
     ]
-    Text[TEXT, pos:31, _def]
+    Text[TEXT, pos:30, _def]
   body: empty
   block tags: empty
 ]
@@ -159,22 +159,22 @@ DocComment[DOC_COMMENT, pos:1
      */
     void term_and_description_with_nested_tag() {}
 /*
-DocComment[DOC_COMMENT, pos:1
+DocComment[DOC_COMMENT, pos:0
   firstSentence: 3
-    Text[TEXT, pos:1, abc_]
-    Index[INDEX, pos:5
+    Text[TEXT, pos:0, abc_]
+    Index[INDEX, pos:4
       term:
-        Text[TEXT, pos:13, {@xyz}]
+        Text[TEXT, pos:12, {@xyz}]
       description: 3
-        Text[TEXT, pos:20, "]
-        UnknownInlineTag[UNKNOWN_INLINE_TAG, pos:21
+        Text[TEXT, pos:19, "]
+        UnknownInlineTag[UNKNOWN_INLINE_TAG, pos:20
           tag:see
           content: 1
-            Text[TEXT, pos:27, xyz]
+            Text[TEXT, pos:26, xyz]
         ]
-        Text[TEXT, pos:31, "]
+        Text[TEXT, pos:30, "]
     ]
-    Text[TEXT, pos:33, _def]
+    Text[TEXT, pos:32, _def]
   body: empty
   block tags: empty
 ]
@@ -184,16 +184,16 @@ DocComment[DOC_COMMENT, pos:1
      */
     void term_with_at() { }
 /*
-DocComment[DOC_COMMENT, pos:1
+DocComment[DOC_COMMENT, pos:0
   firstSentence: 3
-    Text[TEXT, pos:1, abc_]
-    Index[INDEX, pos:5
+    Text[TEXT, pos:0, abc_]
+    Index[INDEX, pos:4
       term:
-        Text[TEXT, pos:13, @def]
+        Text[TEXT, pos:12, @def]
       description: 1
-        Text[TEXT, pos:18, lmn_]
+        Text[TEXT, pos:17, lmn_]
     ]
-    Text[TEXT, pos:23, _xyz]
+    Text[TEXT, pos:22, _xyz]
   body: empty
   block tags: empty
 ]
@@ -204,16 +204,16 @@ DocComment[DOC_COMMENT, pos:1
      */
     void term_with_text_at() { }
 /*
-DocComment[DOC_COMMENT, pos:1
+DocComment[DOC_COMMENT, pos:0
   firstSentence: 3
-    Text[TEXT, pos:1, abc_]
-    Index[INDEX, pos:5
+    Text[TEXT, pos:0, abc_]
+    Index[INDEX, pos:4
       term:
-        Text[TEXT, pos:13, ijk@lmn]
+        Text[TEXT, pos:12, ijk@lmn]
       description: 1
-        Text[TEXT, pos:21, pqr_]
+        Text[TEXT, pos:20, pqr_]
     ]
-    Text[TEXT, pos:26, _xyz]
+    Text[TEXT, pos:25, _xyz]
   body: empty
   block tags: empty
 ]
@@ -224,15 +224,15 @@ DocComment[DOC_COMMENT, pos:1
      */
     void empty_index_in_quotes() {}
 /*
-DocComment[DOC_COMMENT, pos:1
+DocComment[DOC_COMMENT, pos:0
   firstSentence: 3
-    Text[TEXT, pos:1, abc_]
-    Index[INDEX, pos:5
+    Text[TEXT, pos:0, abc_]
+    Index[INDEX, pos:4
       term:
-        Text[TEXT, pos:13, ""]
+        Text[TEXT, pos:12, ""]
       description: empty
     ]
-    Text[TEXT, pos:16, _def]
+    Text[TEXT, pos:15, _def]
   body: empty
   block tags: empty
 ]
@@ -242,21 +242,20 @@ DocComment[DOC_COMMENT, pos:1
      * abc {@index
      * @return def} xyz
      */
-    @NormalizeTags(false) // see DocCommentTester.PrettyChecker
     void bad_nl_at_in_term() {}
 /*
-DocComment[DOC_COMMENT, pos:1
+DocComment[DOC_COMMENT, pos:0
   firstSentence: 2
-    Text[TEXT, pos:1, abc_]
-    Erroneous[ERRONEOUS, pos:5, prefPos:11
+    Text[TEXT, pos:0, abc_]
+    Erroneous[ERRONEOUS, pos:4, prefPos:10
       code: compiler.err.dc.no.content
       body: {@index
     ]
   body: empty
   block tags: 1
-    Return[RETURN, pos:14
+    Return[RETURN, pos:12
       description: 1
-        Text[TEXT, pos:22, def}_xyz]
+        Text[TEXT, pos:20, def}_xyz]
     ]
 ]
 */
@@ -265,10 +264,10 @@ DocComment[DOC_COMMENT, pos:1
      */
     void bad_unbalanced_quote() {}
 /*
-DocComment[DOC_COMMENT, pos:1
+DocComment[DOC_COMMENT, pos:0
   firstSentence: 2
-    Text[TEXT, pos:1, abc_]
-    Erroneous[ERRONEOUS, pos:5, prefPos:22
+    Text[TEXT, pos:0, abc_]
+    Erroneous[ERRONEOUS, pos:4, prefPos:21
       code: compiler.err.dc.no.content
       body: {@index_"xyz_}_def
     ]
@@ -281,14 +280,14 @@ DocComment[DOC_COMMENT, pos:1
      */
     void bad_no_index() {}
 /*
-DocComment[DOC_COMMENT, pos:1
+DocComment[DOC_COMMENT, pos:0
   firstSentence: 3
-    Text[TEXT, pos:1, abc_]
-    Erroneous[ERRONEOUS, pos:5, prefPos:11
+    Text[TEXT, pos:0, abc_]
+    Erroneous[ERRONEOUS, pos:4, prefPos:10
       code: compiler.err.dc.no.content
       body: {@index
     ]
-    Text[TEXT, pos:12, }_def]
+    Text[TEXT, pos:11, }_def]
   body: empty
   block tags: empty
 ]
diff --git a/test/langtools/tools/javac/doctree/LinkPlainTest.java b/test/langtools/tools/javac/doctree/LinkPlainTest.java
index f40ffe91808..d8a177c6415 100644
--- a/test/langtools/tools/javac/doctree/LinkPlainTest.java
+++ b/test/langtools/tools/javac/doctree/LinkPlainTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @bug 7021614 8273244 8200337
+ * @bug 7021614 8273244 8200337 8352249
  * @summary extend com.sun.source API to support parsing javadoc comments
  * @modules jdk.compiler/com.sun.tools.javac.api
  *          jdk.compiler/com.sun.tools.javac.file
@@ -39,15 +39,15 @@ class LinkPlainTest {
       */
     void simple_name() { }
 /*
-DocComment[DOC_COMMENT, pos:1
+DocComment[DOC_COMMENT, pos:0
   firstSentence: 3
-    Text[TEXT, pos:1, abc_]
-    Link[LINK_PLAIN, pos:5
+    Text[TEXT, pos:0, abc_]
+    Link[LINK_PLAIN, pos:4
       reference:
-        Reference[REFERENCE, pos:17, String]
+        Reference[REFERENCE, pos:16, String]
       body: empty
     ]
-    Text[TEXT, pos:24, _def]
+    Text[TEXT, pos:23, _def]
   body: empty
   block tags: empty
 ]
@@ -58,16 +58,16 @@ DocComment[DOC_COMMENT, pos:1
      */
     void simple_name_desc() { }
 /*
-DocComment[DOC_COMMENT, pos:1
+DocComment[DOC_COMMENT, pos:0
   firstSentence: 3
-    Text[TEXT, pos:1, abc_]
-    Link[LINK_PLAIN, pos:5
+    Text[TEXT, pos:0, abc_]
+    Link[LINK_PLAIN, pos:4
       reference:
-        Reference[REFERENCE, pos:17, String]
+        Reference[REFERENCE, pos:16, String]
       body: 1
-        Text[TEXT, pos:24, desc]
+        Text[TEXT, pos:23, desc]
     ]
-    Text[TEXT, pos:29, _def]
+    Text[TEXT, pos:28, _def]
   body: empty
   block tags: empty
 ]
@@ -78,16 +78,16 @@ DocComment[DOC_COMMENT, pos:1
      */
     void pkg_name_desc() { }
 /*
-DocComment[DOC_COMMENT, pos:1
+DocComment[DOC_COMMENT, pos:0
   firstSentence: 3
-    Text[TEXT, pos:1, abc_]
-    Link[LINK_PLAIN, pos:5
+    Text[TEXT, pos:0, abc_]
+    Link[LINK_PLAIN, pos:4
       reference:
-        Reference[REFERENCE, pos:17, java.lang.String]
+        Reference[REFERENCE, pos:16, java.lang.String]
       body: 1
-        Text[TEXT, pos:34, desc]
+        Text[TEXT, pos:33, desc]
     ]
-    Text[TEXT, pos:39, _def]
+    Text[TEXT, pos:38, _def]
   body: empty
   block tags: empty
 ]
@@ -98,16 +98,16 @@ DocComment[DOC_COMMENT, pos:1
      */
     void method_desc() { }
 /*
-DocComment[DOC_COMMENT, pos:1
+DocComment[DOC_COMMENT, pos:0
   firstSentence: 3
-    Text[TEXT, pos:1, abc_]
-    Link[LINK_PLAIN, pos:5
+    Text[TEXT, pos:0, abc_]
+    Link[LINK_PLAIN, pos:4
       reference:
-        Reference[REFERENCE, pos:17, java.lang.String#isEmpty]
+        Reference[REFERENCE, pos:16, java.lang.String#isEmpty]
       body: 1
-        Text[TEXT, pos:42, desc]
+        Text[TEXT, pos:41, desc]
     ]
-    Text[TEXT, pos:47, _def]
+    Text[TEXT, pos:46, _def]
   body: empty
   block tags: empty
 ]
@@ -118,16 +118,16 @@ DocComment[DOC_COMMENT, pos:1
      */
     void method_0_args_desc() { }
 /*
-DocComment[DOC_COMMENT, pos:1
+DocComment[DOC_COMMENT, pos:0
   firstSentence: 3
-    Text[TEXT, pos:1, abc_]
-    Link[LINK_PLAIN, pos:5
+    Text[TEXT, pos:0, abc_]
+    Link[LINK_PLAIN, pos:4
       reference:
-        Reference[REFERENCE, pos:17, java.lang.String#isEmpty()]
+        Reference[REFERENCE, pos:16, java.lang.String#isEmpty()]
       body: 1
-        Text[TEXT, pos:44, desc]
+        Text[TEXT, pos:43, desc]
     ]
-    Text[TEXT, pos:49, _def]
+    Text[TEXT, pos:48, _def]
   body: empty
   block tags: empty
 ]
@@ -138,16 +138,16 @@ DocComment[DOC_COMMENT, pos:1
      */
     void method_1_args_desc() { }
 /*
-DocComment[DOC_COMMENT, pos:1
+DocComment[DOC_COMMENT, pos:0
   firstSentence: 3
-    Text[TEXT, pos:1, abc_]
-    Link[LINK_PLAIN, pos:5
+    Text[TEXT, pos:0, abc_]
+    Link[LINK_PLAIN, pos:4
       reference:
-        Reference[REFERENCE, pos:17, java.lang.String#substring(int)]
+        Reference[REFERENCE, pos:16, java.lang.String#substring(int)]
       body: 1
-        Text[TEXT, pos:49, desc]
+        Text[TEXT, pos:48, desc]
     ]
-    Text[TEXT, pos:54, _def]
+    Text[TEXT, pos:53, _def]
   body: empty
   block tags: empty
 ]
@@ -158,16 +158,16 @@ DocComment[DOC_COMMENT, pos:1
      */
     void method_2_args_desc() { }
 /*
-DocComment[DOC_COMMENT, pos:1
+DocComment[DOC_COMMENT, pos:0
   firstSentence: 3
-    Text[TEXT, pos:1, abc_]
-    Link[LINK_PLAIN, pos:5
+    Text[TEXT, pos:0, abc_]
+    Link[LINK_PLAIN, pos:4
       reference:
-        Reference[REFERENCE, pos:17, java.lang.String#substring(int,_int)]
+        Reference[REFERENCE, pos:16, java.lang.String#substring(int,_int)]
       body: 1
-        Text[TEXT, pos:54, desc]
+        Text[TEXT, pos:53, desc]
     ]
-    Text[TEXT, pos:59, _def]
+    Text[TEXT, pos:58, _def]
   body: empty
   block tags: empty
 ]
@@ -178,16 +178,16 @@ DocComment[DOC_COMMENT, pos:1
      */
     void pkg_name_typarams_desc() { }
 /*
-DocComment[DOC_COMMENT, pos:1
+DocComment[DOC_COMMENT, pos:0
   firstSentence: 3
-    Text[TEXT, pos:1, abc_]
-    Link[LINK_PLAIN, pos:5
+    Text[TEXT, pos:0, abc_]
+    Link[LINK_PLAIN, pos:4
       reference:
-        Reference[REFERENCE, pos:17, java.util.List<T>]
+        Reference[REFERENCE, pos:16, java.util.List<T>]
       body: 1
-        Text[TEXT, pos:35, desc]
+        Text[TEXT, pos:34, desc]
     ]
-    Text[TEXT, pos:40, _def]
+    Text[TEXT, pos:39, _def]
   body: empty
   block tags: empty
 ]
@@ -198,16 +198,16 @@ DocComment[DOC_COMMENT, pos:1
      */
     void fragment_desc() { }
 /*
-DocComment[DOC_COMMENT, pos:1
+DocComment[DOC_COMMENT, pos:0
   firstSentence: 3
-    Text[TEXT, pos:1, abc_]
-    Link[LINK_PLAIN, pos:5
+    Text[TEXT, pos:0, abc_]
+    Link[LINK_PLAIN, pos:4
       reference:
-        Reference[REFERENCE, pos:17, java.lang.String##fragment]
+        Reference[REFERENCE, pos:16, java.lang.String##fragment]
       body: 1
-        Text[TEXT, pos:44, desc]
+        Text[TEXT, pos:43, desc]
     ]
-    Text[TEXT, pos:49, _def]
+    Text[TEXT, pos:48, _def]
   body: empty
   block tags: empty
 ]
diff --git a/test/langtools/tools/javac/doctree/LinkTest.java b/test/langtools/tools/javac/doctree/LinkTest.java
index e619023a165..ed25f36e2a1 100644
--- a/test/langtools/tools/javac/doctree/LinkTest.java
+++ b/test/langtools/tools/javac/doctree/LinkTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @bug 7021614 8273244 8200337
+ * @bug 7021614 8273244 8200337 8352249
  * @summary extend com.sun.source API to support parsing javadoc comments
  * @modules jdk.compiler/com.sun.tools.javac.api
  *          jdk.compiler/com.sun.tools.javac.file
@@ -39,15 +39,15 @@ class LinkTest {
       */
     void simple_name() { }
 /*
-DocComment[DOC_COMMENT, pos:1
+DocComment[DOC_COMMENT, pos:0
   firstSentence: 3
-    Text[TEXT, pos:1, abc_]
-    Link[LINK, pos:5
+    Text[TEXT, pos:0, abc_]
+    Link[LINK, pos:4
       reference:
-        Reference[REFERENCE, pos:12, String]
+        Reference[REFERENCE, pos:11, String]
       body: empty
     ]
-    Text[TEXT, pos:19, _def]
+    Text[TEXT, pos:18, _def]
   body: empty
   block tags: empty
 ]
@@ -58,16 +58,16 @@ DocComment[DOC_COMMENT, pos:1
      */
     void simple_name_desc() { }
 /*
-DocComment[DOC_COMMENT, pos:1
+DocComment[DOC_COMMENT, pos:0
   firstSentence: 3
-    Text[TEXT, pos:1, abc_]
-    Link[LINK, pos:5
+    Text[TEXT, pos:0, abc_]
+    Link[LINK, pos:4
       reference:
-        Reference[REFERENCE, pos:12, String]
+        Reference[REFERENCE, pos:11, String]
       body: 1
-        Text[TEXT, pos:19, desc]
+        Text[TEXT, pos:18, desc]
     ]
-    Text[TEXT, pos:24, _def]
+    Text[TEXT, pos:23, _def]
   body: empty
   block tags: empty
 ]
@@ -78,16 +78,16 @@ DocComment[DOC_COMMENT, pos:1
      */
     void pkg_name_desc() { }
 /*
-DocComment[DOC_COMMENT, pos:1
+DocComment[DOC_COMMENT, pos:0
   firstSentence: 3
-    Text[TEXT, pos:1, abc_]
-    Link[LINK, pos:5
+    Text[TEXT, pos:0, abc_]
+    Link[LINK, pos:4
       reference:
-        Reference[REFERENCE, pos:12, java.lang.String]
+        Reference[REFERENCE, pos:11, java.lang.String]
       body: 1
-        Text[TEXT, pos:29, desc]
+        Text[TEXT, pos:28, desc]
     ]
-    Text[TEXT, pos:34, _def]
+    Text[TEXT, pos:33, _def]
   body: empty
   block tags: empty
 ]
@@ -98,16 +98,16 @@ DocComment[DOC_COMMENT, pos:1
      */
     void method_desc() { }
 /*
-DocComment[DOC_COMMENT, pos:1
+DocComment[DOC_COMMENT, pos:0
   firstSentence: 3
-    Text[TEXT, pos:1, abc_]
-    Link[LINK, pos:5
+    Text[TEXT, pos:0, abc_]
+    Link[LINK, pos:4
       reference:
-        Reference[REFERENCE, pos:12, java.lang.String#isEmpty]
+        Reference[REFERENCE, pos:11, java.lang.String#isEmpty]
       body: 1
-        Text[TEXT, pos:37, desc]
+        Text[TEXT, pos:36, desc]
     ]
-    Text[TEXT, pos:42, _def]
+    Text[TEXT, pos:41, _def]
   body: empty
   block tags: empty
 ]
@@ -118,16 +118,16 @@ DocComment[DOC_COMMENT, pos:1
      */
     void method_0_args_desc() { }
 /*
-DocComment[DOC_COMMENT, pos:1
+DocComment[DOC_COMMENT, pos:0
   firstSentence: 3
-    Text[TEXT, pos:1, abc_]
-    Link[LINK, pos:5
+    Text[TEXT, pos:0, abc_]
+    Link[LINK, pos:4
       reference:
-        Reference[REFERENCE, pos:12, java.lang.String#isEmpty()]
+        Reference[REFERENCE, pos:11, java.lang.String#isEmpty()]
       body: 1
-        Text[TEXT, pos:39, desc]
+        Text[TEXT, pos:38, desc]
     ]
-    Text[TEXT, pos:44, _def]
+    Text[TEXT, pos:43, _def]
   body: empty
   block tags: empty
 ]
@@ -138,16 +138,16 @@ DocComment[DOC_COMMENT, pos:1
      */
     void method_1_args_desc() { }
 /*
-DocComment[DOC_COMMENT, pos:1
+DocComment[DOC_COMMENT, pos:0
   firstSentence: 3
-    Text[TEXT, pos:1, abc_]
-    Link[LINK, pos:5
+    Text[TEXT, pos:0, abc_]
+    Link[LINK, pos:4
       reference:
-        Reference[REFERENCE, pos:12, java.lang.String#substring(int)]
+        Reference[REFERENCE, pos:11, java.lang.String#substring(int)]
       body: 1
-        Text[TEXT, pos:44, desc]
+        Text[TEXT, pos:43, desc]
     ]
-    Text[TEXT, pos:49, _def]
+    Text[TEXT, pos:48, _def]
   body: empty
   block tags: empty
 ]
@@ -158,16 +158,16 @@ DocComment[DOC_COMMENT, pos:1
      */
     void method_2_args_desc() { }
 /*
-DocComment[DOC_COMMENT, pos:1
+DocComment[DOC_COMMENT, pos:0
   firstSentence: 3
-    Text[TEXT, pos:1, abc_]
-    Link[LINK, pos:5
+    Text[TEXT, pos:0, abc_]
+    Link[LINK, pos:4
       reference:
-        Reference[REFERENCE, pos:12, java.lang.String#substring(int,_int)]
+        Reference[REFERENCE, pos:11, java.lang.String#substring(int,_int)]
       body: 1
-        Text[TEXT, pos:49, desc]
+        Text[TEXT, pos:48, desc]
     ]
-    Text[TEXT, pos:54, _def]
+    Text[TEXT, pos:53, _def]
   body: empty
   block tags: empty
 ]
@@ -178,16 +178,16 @@ DocComment[DOC_COMMENT, pos:1
      */
     void pkg_name_typarams_desc() { }
 /*
-DocComment[DOC_COMMENT, pos:1
+DocComment[DOC_COMMENT, pos:0
   firstSentence: 3
-    Text[TEXT, pos:1, abc_]
-    Link[LINK, pos:5
+    Text[TEXT, pos:0, abc_]
+    Link[LINK, pos:4
       reference:
-        Reference[REFERENCE, pos:12, java.util.List<T>]
+        Reference[REFERENCE, pos:11, java.util.List<T>]
       body: 1
-        Text[TEXT, pos:30, desc]
+        Text[TEXT, pos:29, desc]
     ]
-    Text[TEXT, pos:35, _def]
+    Text[TEXT, pos:34, _def]
   body: empty
   block tags: empty
 ]
@@ -198,16 +198,16 @@ DocComment[DOC_COMMENT, pos:1
      */
     void fragment_desc() { }
 /*
-DocComment[DOC_COMMENT, pos:1
+DocComment[DOC_COMMENT, pos:0
   firstSentence: 3
-    Text[TEXT, pos:1, abc_]
-    Link[LINK, pos:5
+    Text[TEXT, pos:0, abc_]
+    Link[LINK, pos:4
       reference:
-        Reference[REFERENCE, pos:12, java.lang.String##fragment]
+        Reference[REFERENCE, pos:11, java.lang.String##fragment]
       body: 1
-        Text[TEXT, pos:39, desc]
+        Text[TEXT, pos:38, desc]
     ]
-    Text[TEXT, pos:44, _def]
+    Text[TEXT, pos:43, _def]
   body: empty
   block tags: empty
 ]
diff --git a/test/langtools/tools/javac/doctree/LiteralTest.java b/test/langtools/tools/javac/doctree/LiteralTest.java
index dbfb368e119..45e5d60a170 100644
--- a/test/langtools/tools/javac/doctree/LiteralTest.java
+++ b/test/langtools/tools/javac/doctree/LiteralTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @bug 7021614  8241780 8273244 8284908
+ * @bug 7021614  8241780 8273244 8284908 8352249
  * @summary extend com.sun.source API to support parsing javadoc comments
  * @modules jdk.compiler/com.sun.tools.javac.api
  *          jdk.compiler/com.sun.tools.javac.file
@@ -76,9 +76,9 @@ DocComment[DOC_COMMENT, pos:0
      */
     void nested() { }
 /*
-DocComment[DOC_COMMENT, pos:1
+DocComment[DOC_COMMENT, pos:0
   firstSentence: 1
-    Literal[LITERAL, pos:1, {@literal_nested}_]
+    Literal[LITERAL, pos:0, {@literal_nested}_]
   body: empty
   block tags: empty
 ]
@@ -91,9 +91,9 @@ DocComment[DOC_COMMENT, pos:1
      */
     void embedded_newline() { }
 /*
-DocComment[DOC_COMMENT, pos:1
+DocComment[DOC_COMMENT, pos:0
   firstSentence: 1
-    Literal[LITERAL, pos:1, if_(a_<_b)_{|________}|_]
+    Literal[LITERAL, pos:0, if_(a_<_b)_{|_______}|]
   body: empty
   block tags: empty
 ]
@@ -106,15 +106,14 @@ DocComment[DOC_COMMENT, pos:1
      */
     void embedded_at() { }
 /*
-DocComment[DOC_COMMENT, pos:1
+DocComment[DOC_COMMENT, pos:0
   firstSentence: 1
-    Literal[LITERAL, pos:1, |_@tag|_]
+    Literal[LITERAL, pos:0, |@tag|]
   body: empty
   block tags: empty
 ]
 */
 
-
     /** {@literal if (a < b) { } */
     void unterminated_1() { }
 /*
@@ -134,11 +133,11 @@ DocComment[DOC_COMMENT, pos:0
      * @author jjg */
     void unterminated_2() { }
 /*
-DocComment[DOC_COMMENT, pos:1
+DocComment[DOC_COMMENT, pos:0
   firstSentence: 1
-    Erroneous[ERRONEOUS, pos:1, prefPos:37
+    Erroneous[ERRONEOUS, pos:0, prefPos:35
       code: compiler.err.dc.unterminated.inline.tag
-      body: {@literal_if_(a_<_b)_{_}|_@author_jjg
+      body: {@literal_if_(a_<_b)_{_}|@author_jjg
     ]
   body: empty
   block tags: empty
diff --git a/test/langtools/tools/javac/doctree/ParamTest.java b/test/langtools/tools/javac/doctree/ParamTest.java
index 42d9136871d..1f5332334a4 100644
--- a/test/langtools/tools/javac/doctree/ParamTest.java
+++ b/test/langtools/tools/javac/doctree/ParamTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @bug 7021614 8273244 8284908
+ * @bug 7021614 8273244 8284908 8352249
  * @summary extend com.sun.source API to support parsing javadoc comments
  * @modules jdk.compiler/com.sun.tools.javac.api
  *          jdk.compiler/com.sun.tools.javac.file
@@ -39,13 +39,13 @@ class ParamTest {
      */
     void no_description(int x) { }
 /*
-DocComment[DOC_COMMENT, pos:1
+DocComment[DOC_COMMENT, pos:0
   firstSentence: empty
   body: empty
   block tags: 1
-    Param[PARAM, pos:1
+    Param[PARAM, pos:0
       name:
-        Identifier[IDENTIFIER, pos:8, x]
+        Identifier[IDENTIFIER, pos:7, x]
       description: empty
     ]
 ]
@@ -56,15 +56,15 @@ DocComment[DOC_COMMENT, pos:1
      */
     void with_description(int x) { }
 /*
-DocComment[DOC_COMMENT, pos:1
+DocComment[DOC_COMMENT, pos:0
   firstSentence: empty
   body: empty
   block tags: 1
-    Param[PARAM, pos:1
+    Param[PARAM, pos:0
       name:
-        Identifier[IDENTIFIER, pos:8, x]
+        Identifier[IDENTIFIER, pos:7, x]
       description: 1
-        Text[TEXT, pos:10, description]
+        Text[TEXT, pos:9, description]
     ]
 ]
 */
@@ -73,11 +73,11 @@ DocComment[DOC_COMMENT, pos:1
      */
     <T> void type_param(int x) { }
 /*
-DocComment[DOC_COMMENT, pos:1
+DocComment[DOC_COMMENT, pos:0
   firstSentence: empty
   body: empty
   block tags: 1
-    Erroneous[ERRONEOUS, pos:1, prefPos:10
+    Erroneous[ERRONEOUS, pos:0, prefPos:9
       code: compiler.err.dc.gt.expected
       body: @param_<T_type
     ]
diff --git a/test/langtools/tools/javac/doctree/ProvidesTest.java b/test/langtools/tools/javac/doctree/ProvidesTest.java
index 132a29982b1..2a5068c66b1 100644
--- a/test/langtools/tools/javac/doctree/ProvidesTest.java
+++ b/test/langtools/tools/javac/doctree/ProvidesTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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 8160196 8273244
+ * @bug 8160196 8273244 8352249
  * @summary Module summary page should display information based on "api" or "detail" mode.
  * @modules jdk.compiler/com.sun.tools.javac.api
  *          jdk.compiler/com.sun.tools.javac.file
@@ -40,14 +40,14 @@ class ProvidesTest {
       */
     void simple_provides() { }
 /*
-DocComment[DOC_COMMENT, pos:1
+DocComment[DOC_COMMENT, pos:0
   firstSentence: 1
-    Text[TEXT, pos:1, abc.]
+    Text[TEXT, pos:0, abc.]
   body: empty
   block tags: 1
-    Provides[PROVIDES, pos:7
+    Provides[PROVIDES, pos:5
       serviceName:
-        Reference[REFERENCE, pos:17, UsesTest]
+        Reference[REFERENCE, pos:15, UsesTest]
       description: empty
     ]
 ]
@@ -59,16 +59,16 @@ DocComment[DOC_COMMENT, pos:1
       */
     void provides_with_description() { }
 /*
-DocComment[DOC_COMMENT, pos:1
+DocComment[DOC_COMMENT, pos:0
   firstSentence: 1
-    Text[TEXT, pos:1, abc.]
+    Text[TEXT, pos:0, abc.]
   body: empty
   block tags: 1
-    Provides[PROVIDES, pos:7
+    Provides[PROVIDES, pos:5
       serviceName:
-        Reference[REFERENCE, pos:17, UsesTest]
+        Reference[REFERENCE, pos:15, UsesTest]
       description: 1
-        Text[TEXT, pos:26, Test_description_for_provides.]
+        Text[TEXT, pos:24, Test_description_for_provides.]
     ]
 ]
 */
diff --git a/test/langtools/tools/javac/doctree/ReturnTest.java b/test/langtools/tools/javac/doctree/ReturnTest.java
index 3db7651dd9a..8586bb796c6 100644
--- a/test/langtools/tools/javac/doctree/ReturnTest.java
+++ b/test/langtools/tools/javac/doctree/ReturnTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @bug 7021614 8273244
+ * @bug 7021614 8273244 8352249
  * @summary extend com.sun.source API to support parsing javadoc comments
  * @modules jdk.compiler/com.sun.tools.javac.api
  *          jdk.compiler/com.sun.tools.javac.file
@@ -39,13 +39,13 @@ class ReturnTest {
      */
     int an_int() { }
 /*
-DocComment[DOC_COMMENT, pos:1
+DocComment[DOC_COMMENT, pos:0
   firstSentence: empty
   body: empty
   block tags: 1
-    Return[RETURN, pos:1
+    Return[RETURN, pos:0
       description: 1
-        Text[TEXT, pos:9, something]
+        Text[TEXT, pos:8, something]
     ]
 ]
 */
diff --git a/test/langtools/tools/javac/doctree/SeeTest.java b/test/langtools/tools/javac/doctree/SeeTest.java
index 5d3502914e2..42c8ecbd12a 100644
--- a/test/langtools/tools/javac/doctree/SeeTest.java
+++ b/test/langtools/tools/javac/doctree/SeeTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @bug 7021614 8031212 8273244 8284908 8200337 8288619
+ * @bug 7021614 8031212 8273244 8284908 8200337 8288619 8352249
  * @summary extend com.sun.source API to support parsing javadoc comments
  * @modules jdk.compiler/com.sun.tools.javac.api
  *          jdk.compiler/com.sun.tools.javac.file
@@ -40,14 +40,14 @@ class SeeTest {
      */
     void quoted_text() { }
 /*
-DocComment[DOC_COMMENT, pos:1
+DocComment[DOC_COMMENT, pos:0
   firstSentence: 1
-    Text[TEXT, pos:1, abc.]
+    Text[TEXT, pos:0, abc.]
   body: empty
   block tags: 1
-    See[SEE, pos:7
+    See[SEE, pos:5
       reference: 1
-        Text[TEXT, pos:12, "String"]
+        Text[TEXT, pos:10, "String"]
     ]
 ]
 */
@@ -58,14 +58,14 @@ DocComment[DOC_COMMENT, pos:1
      */
     void at_sign_in_quoted_string() { }
 /*
-DocComment[DOC_COMMENT, pos:1
+DocComment[DOC_COMMENT, pos:0
   firstSentence: 1
-    Text[TEXT, pos:1, Test_'@'_in_quoted_string.]
+    Text[TEXT, pos:0, Test_'@'_in_quoted_string.]
   body: empty
   block tags: 1
-    See[SEE, pos:29
+    See[SEE, pos:27
       reference: 1
-        Text[TEXT, pos:34, "{@code}"]
+        Text[TEXT, pos:32, "{@code}"]
     ]
 ]
 */
@@ -78,14 +78,14 @@ DocComment[DOC_COMMENT, pos:1
     @PrettyCheck(false)
     void new_line_before_quoted_string() { }
 /*
-DocComment[DOC_COMMENT, pos:1
+DocComment[DOC_COMMENT, pos:0
   firstSentence: 1
-    Text[TEXT, pos:1, Test_new_line_before_quoted_string.]
+    Text[TEXT, pos:0, Test_new_line_before_quoted_string.]
   body: empty
   block tags: 1
-    See[SEE, pos:38
+    See[SEE, pos:36
       reference: 1
-        Text[TEXT, pos:47, "{@code}"]
+        Text[TEXT, pos:44, "{@code}"]
     ]
 ]
 */
@@ -96,25 +96,25 @@ DocComment[DOC_COMMENT, pos:1
      */
     void url() { }
 /*
-DocComment[DOC_COMMENT, pos:1
+DocComment[DOC_COMMENT, pos:0
   firstSentence: 1
-    Text[TEXT, pos:1, abc.]
+    Text[TEXT, pos:0, abc.]
   body: empty
   block tags: 1
-    See[SEE, pos:7
+    See[SEE, pos:5
       reference: 3
-        StartElement[START_ELEMENT, pos:12
+        StartElement[START_ELEMENT, pos:10
           name:a
           attributes: 1
-            Attribute[ATTRIBUTE, pos:15
+            Attribute[ATTRIBUTE, pos:13
               name: href
               vkind: DOUBLE
               value: 1
-                Text[TEXT, pos:21, url]
+                Text[TEXT, pos:19, url]
             ]
         ]
-        Text[TEXT, pos:26, url]
-        EndElement[END_ELEMENT, pos:29, a]
+        Text[TEXT, pos:24, url]
+        EndElement[END_ELEMENT, pos:27, a]
     ]
 ]
 */
@@ -125,15 +125,15 @@ DocComment[DOC_COMMENT, pos:1
      */
     void string() { }
 /*
-DocComment[DOC_COMMENT, pos:1
+DocComment[DOC_COMMENT, pos:0
   firstSentence: 1
-    Text[TEXT, pos:1, abc.]
+    Text[TEXT, pos:0, abc.]
   body: empty
   block tags: 1
-    See[SEE, pos:7
+    See[SEE, pos:5
       reference: 2
-        Reference[REFERENCE, pos:12, String]
-        Text[TEXT, pos:19, text]
+        Reference[REFERENCE, pos:10, String]
+        Text[TEXT, pos:17, text]
     ]
 ]
 */
@@ -144,15 +144,15 @@ DocComment[DOC_COMMENT, pos:1
      */
     void j_l_string() { }
 /*
-DocComment[DOC_COMMENT, pos:1
+DocComment[DOC_COMMENT, pos:0
   firstSentence: 1
-    Text[TEXT, pos:1, abc.]
+    Text[TEXT, pos:0, abc.]
   body: empty
   block tags: 1
-    See[SEE, pos:7
+    See[SEE, pos:5
       reference: 2
-        Reference[REFERENCE, pos:12, java.lang.String]
-        Text[TEXT, pos:29, text]
+        Reference[REFERENCE, pos:10, java.lang.String]
+        Text[TEXT, pos:27, text]
     ]
 ]
 */
@@ -163,15 +163,15 @@ DocComment[DOC_COMMENT, pos:1
      */
     void j_l_string_length() { }
 /*
-DocComment[DOC_COMMENT, pos:1
+DocComment[DOC_COMMENT, pos:0
   firstSentence: 1
-    Text[TEXT, pos:1, abc.]
+    Text[TEXT, pos:0, abc.]
   body: empty
   block tags: 1
-    See[SEE, pos:7
+    See[SEE, pos:5
       reference: 2
-        Reference[REFERENCE, pos:12, java.lang.String#length]
-        Text[TEXT, pos:36, text]
+        Reference[REFERENCE, pos:10, java.lang.String#length]
+        Text[TEXT, pos:34, text]
     ]
 ]
 */
@@ -182,15 +182,15 @@ DocComment[DOC_COMMENT, pos:1
      */
     void j_l_string_matches() { }
 /*
-DocComment[DOC_COMMENT, pos:1
+DocComment[DOC_COMMENT, pos:0
   firstSentence: 1
-    Text[TEXT, pos:1, abc.]
+    Text[TEXT, pos:0, abc.]
   body: empty
   block tags: 1
-    See[SEE, pos:7
+    See[SEE, pos:5
       reference: 2
-        Reference[REFERENCE, pos:12, java.lang.String#matches(String_regex)]
-        Text[TEXT, pos:51, text]
+        Reference[REFERENCE, pos:10, java.lang.String#matches(String_regex)]
+        Text[TEXT, pos:49, text]
     ]
 ]
 */
@@ -201,15 +201,15 @@ DocComment[DOC_COMMENT, pos:1
      */
     void j_l_string_anchor() { }
 /*
-DocComment[DOC_COMMENT, pos:1
+DocComment[DOC_COMMENT, pos:0
   firstSentence: 1
-    Text[TEXT, pos:1, abc.]
+    Text[TEXT, pos:0, abc.]
   body: empty
   block tags: 1
-    See[SEE, pos:7
+    See[SEE, pos:5
       reference: 2
-        Reference[REFERENCE, pos:12, java.lang.String##fragment]
-        Text[TEXT, pos:39, text]
+        Reference[REFERENCE, pos:10, java.lang.String##fragment]
+        Text[TEXT, pos:37, text]
     ]
 ]
 */
@@ -220,12 +220,12 @@ DocComment[DOC_COMMENT, pos:1
      */
     void bad_numeric() { }
 /*
-DocComment[DOC_COMMENT, pos:1
+DocComment[DOC_COMMENT, pos:0
   firstSentence: 1
-    Text[TEXT, pos:1, abc.]
+    Text[TEXT, pos:0, abc.]
   body: empty
   block tags: 1
-    Erroneous[ERRONEOUS, pos:7, prefPos:19
+    Erroneous[ERRONEOUS, pos:5, prefPos:17
       code: compiler.err.dc.unexpected.content
       body: @see_123_text
     ]
diff --git a/test/langtools/tools/javac/doctree/SerialDataTest.java b/test/langtools/tools/javac/doctree/SerialDataTest.java
index f46af82eec4..b3b58383413 100644
--- a/test/langtools/tools/javac/doctree/SerialDataTest.java
+++ b/test/langtools/tools/javac/doctree/SerialDataTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @bug 7021614 8273244
+ * @bug 7021614 8273244 8352249
  * @summary extend com.sun.source API to support parsing javadoc comments
  * @modules jdk.compiler/com.sun.tools.javac.api
  *          jdk.compiler/com.sun.tools.javac.file
@@ -39,13 +39,13 @@ class SerialDataTest {
      */
     void writeObject(ObjectOutputStream stream) { }
 /*
-DocComment[DOC_COMMENT, pos:1
+DocComment[DOC_COMMENT, pos:0
   firstSentence: empty
   body: empty
   block tags: 1
-    SerialData[SERIAL_DATA, pos:1
+    SerialData[SERIAL_DATA, pos:0
       description: 1
-        Text[TEXT, pos:13, description]
+        Text[TEXT, pos:12, description]
     ]
 ]
 */
diff --git a/test/langtools/tools/javac/doctree/SerialFieldTest.java b/test/langtools/tools/javac/doctree/SerialFieldTest.java
index 4937ef26483..d0e25c24e50 100644
--- a/test/langtools/tools/javac/doctree/SerialFieldTest.java
+++ b/test/langtools/tools/javac/doctree/SerialFieldTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @bug 7021614 8273244
+ * @bug 7021614 8273244 8352249
  * @summary extend com.sun.source API to support parsing javadoc comments
  * @modules jdk.compiler/com.sun.tools.javac.api
  *          jdk.compiler/com.sun.tools.javac.file
@@ -40,15 +40,15 @@ class SerialFieldTest {
      */
     String f1;
 /*
-DocComment[DOC_COMMENT, pos:1
+DocComment[DOC_COMMENT, pos:0
   firstSentence: empty
   body: empty
   block tags: 1
-    SerialField[SERIAL_FIELD, pos:1
+    SerialField[SERIAL_FIELD, pos:0
       name:
-        Identifier[IDENTIFIER, pos:14, field]
+        Identifier[IDENTIFIER, pos:13, field]
       type:
-        Reference[REFERENCE, pos:20, String]
+        Reference[REFERENCE, pos:19, String]
       description: empty
     ]
 ]
@@ -59,17 +59,17 @@ DocComment[DOC_COMMENT, pos:1
      */
     String f2;
 /*
-DocComment[DOC_COMMENT, pos:1
+DocComment[DOC_COMMENT, pos:0
   firstSentence: empty
   body: empty
   block tags: 1
-    SerialField[SERIAL_FIELD, pos:1
+    SerialField[SERIAL_FIELD, pos:0
       name:
-        Identifier[IDENTIFIER, pos:14, field]
+        Identifier[IDENTIFIER, pos:13, field]
       type:
-        Reference[REFERENCE, pos:20, String]
+        Reference[REFERENCE, pos:19, String]
       description: 1
-        Text[TEXT, pos:27, f2_is_a_String]
+        Text[TEXT, pos:26, f2_is_a_String]
     ]
 ]
 */
@@ -79,11 +79,11 @@ DocComment[DOC_COMMENT, pos:1
      */
     String f3;
 /*
-DocComment[DOC_COMMENT, pos:1
+DocComment[DOC_COMMENT, pos:0
   firstSentence: empty
   body: empty
   block tags: 1
-    Erroneous[ERRONEOUS, pos:1, prefPos:26
+    Erroneous[ERRONEOUS, pos:0, prefPos:25
       code: compiler.err.dc.ref.unexpected.input
       body: @serialField_field_String#member_f3_is_a_String
     ]
@@ -95,11 +95,11 @@ DocComment[DOC_COMMENT, pos:1
      */
     String f4;
 /*
-DocComment[DOC_COMMENT, pos:1
+DocComment[DOC_COMMENT, pos:0
   firstSentence: empty
   body: empty
   block tags: 1
-    Erroneous[ERRONEOUS, pos:1, prefPos:26
+    Erroneous[ERRONEOUS, pos:0, prefPos:25
       code: compiler.err.dc.ref.unexpected.input
       body: @serialField_field_String##fragment_f4_is_a_String
     ]
diff --git a/test/langtools/tools/javac/doctree/SerialTest.java b/test/langtools/tools/javac/doctree/SerialTest.java
index d45e7173e4f..51999749c73 100644
--- a/test/langtools/tools/javac/doctree/SerialTest.java
+++ b/test/langtools/tools/javac/doctree/SerialTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @bug 7021614 8273244
+ * @bug 7021614 8273244 8352249
  * @summary extend com.sun.source API to support parsing javadoc comments
  * @modules jdk.compiler/com.sun.tools.javac.api
  *          jdk.compiler/com.sun.tools.javac.file
@@ -39,13 +39,13 @@ class SerialTest {
      */
     void include() { }
 /*
-DocComment[DOC_COMMENT, pos:1
+DocComment[DOC_COMMENT, pos:0
   firstSentence: empty
   body: empty
   block tags: 1
-    Serial[SERIAL, pos:1
+    Serial[SERIAL, pos:0
       description: 1
-        Text[TEXT, pos:9, include]
+        Text[TEXT, pos:8, include]
     ]
 ]
 */
@@ -55,13 +55,13 @@ DocComment[DOC_COMMENT, pos:1
      */
     void exclude() { }
 /*
-DocComment[DOC_COMMENT, pos:1
+DocComment[DOC_COMMENT, pos:0
   firstSentence: empty
   body: empty
   block tags: 1
-    Serial[SERIAL, pos:1
+    Serial[SERIAL, pos:0
       description: 1
-        Text[TEXT, pos:9, exclude]
+        Text[TEXT, pos:8, exclude]
     ]
 ]
 */
@@ -71,13 +71,13 @@ DocComment[DOC_COMMENT, pos:1
      */
     void description() { }
 /*
-DocComment[DOC_COMMENT, pos:1
+DocComment[DOC_COMMENT, pos:0
   firstSentence: empty
   body: empty
   block tags: 1
-    Serial[SERIAL, pos:1
+    Serial[SERIAL, pos:0
       description: 1
-        Text[TEXT, pos:9, description]
+        Text[TEXT, pos:8, description]
     ]
 ]
 */
@@ -87,11 +87,11 @@ DocComment[DOC_COMMENT, pos:1
      */
     void empty() { }
 /*
-DocComment[DOC_COMMENT, pos:1
+DocComment[DOC_COMMENT, pos:0
   firstSentence: empty
   body: empty
   block tags: 1
-    Serial[SERIAL, pos:1
+    Serial[SERIAL, pos:0
       description: empty
     ]
 ]
diff --git a/test/langtools/tools/javac/doctree/SinceTest.java b/test/langtools/tools/javac/doctree/SinceTest.java
index 9325efc4cac..6a2a6d87dab 100644
--- a/test/langtools/tools/javac/doctree/SinceTest.java
+++ b/test/langtools/tools/javac/doctree/SinceTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @bug 7021614 8273244
+ * @bug 7021614 8273244 8352249
  * @summary extend com.sun.source API to support parsing javadoc comments
  * @modules jdk.compiler/com.sun.tools.javac.api
  *          jdk.compiler/com.sun.tools.javac.file
@@ -40,16 +40,16 @@ class SinceTest {
      */
     void standard() { }
 /*
-DocComment[DOC_COMMENT, pos:1
+DocComment[DOC_COMMENT, pos:0
   firstSentence: 1
-    Text[TEXT, pos:1, abc.]
+    Text[TEXT, pos:0, abc.]
   body: empty
   block tags: 1
-    Since[SINCE, pos:7
+    Since[SINCE, pos:5
       body: 3
-        Text[TEXT, pos:14, then_]
-        Entity[ENTITY, pos:19, amp]
-        Text[TEXT, pos:24, _now.]
+        Text[TEXT, pos:12, then_]
+        Entity[ENTITY, pos:17, amp]
+        Text[TEXT, pos:22, _now.]
     ]
 ]
 */
diff --git a/test/langtools/tools/javac/doctree/SnippetTest.java b/test/langtools/tools/javac/doctree/SnippetTest.java
index d4e0ea447ac..cd46dfe1c4f 100644
--- a/test/langtools/tools/javac/doctree/SnippetTest.java
+++ b/test/langtools/tools/javac/doctree/SnippetTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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 8266666
+ * @bug 8266666 8352249
  * @summary Implementation for snippets
  * @modules jdk.compiler/com.sun.tools.javac.api
  *          jdk.compiler/com.sun.tools.javac.file
@@ -41,18 +41,18 @@ class SnippetTest {
      */
     void inline() { }
 /*
-DocComment[DOC_COMMENT, pos:1
+DocComment[DOC_COMMENT, pos:0
   firstSentence: 1
-    Snippet[SNIPPET, pos:1
+    Snippet[SNIPPET, pos:0
       attributes: 1
-        Attribute[ATTRIBUTE, pos:11
+        Attribute[ATTRIBUTE, pos:10
           name: attr1
           vkind: DOUBLE
           value: 1
-            Text[TEXT, pos:18, val1]
+            Text[TEXT, pos:17, val1]
         ]
       body:
-        Text[TEXT, pos:26, _____Hello,_Snippet!|_]
+        Text[TEXT, pos:25, ____Hello,_Snippet!|]
     ]
   body: empty
   block tags: empty
diff --git a/test/langtools/tools/javac/doctree/SpecTest.java b/test/langtools/tools/javac/doctree/SpecTest.java
index f7f6d43908d..a94fc2d15e2 100644
--- a/test/langtools/tools/javac/doctree/SpecTest.java
+++ b/test/langtools/tools/javac/doctree/SpecTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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 6251738 8226279
+ * @bug 6251738 8226279 8352249
  * @summary javadoc should support a new at-spec tag
  * @modules jdk.compiler/com.sun.tools.javac.api
  *          jdk.compiler/com.sun.tools.javac.file
@@ -41,16 +41,16 @@ class SpecTest {
      */
     void block() {}
 /*
-DocComment[DOC_COMMENT, pos:1
+DocComment[DOC_COMMENT, pos:0
   firstSentence: 1
-    Text[TEXT, pos:1, abc.]
+    Text[TEXT, pos:0, abc.]
   body: empty
   block tags: 1
-    Spec[SPEC, pos:7
+    Spec[SPEC, pos:5
       url:
-        Text[TEXT, pos:13, http://example.com]
+        Text[TEXT, pos:11, http://example.com]
       title: 1
-        Text[TEXT, pos:32, title]
+        Text[TEXT, pos:30, title]
     ]
 ]
 */
@@ -61,12 +61,12 @@ DocComment[DOC_COMMENT, pos:1
      */
     void bad_no_url() {}
 /*
-DocComment[DOC_COMMENT, pos:1
+DocComment[DOC_COMMENT, pos:0
   firstSentence: 1
-    Text[TEXT, pos:1, abc.]
+    Text[TEXT, pos:0, abc.]
   body: empty
   block tags: 1
-    Erroneous[ERRONEOUS, pos:7, prefPos:11
+    Erroneous[ERRONEOUS, pos:5, prefPos:9
       code: compiler.err.dc.no.url
       body: @spec
     ]
@@ -79,12 +79,12 @@ DocComment[DOC_COMMENT, pos:1
      */
     void bad_no_label() {}
 /*
-DocComment[DOC_COMMENT, pos:1
+DocComment[DOC_COMMENT, pos:0
   firstSentence: 1
-    Text[TEXT, pos:1, abc.]
+    Text[TEXT, pos:0, abc.]
   body: empty
   block tags: 1
-    Erroneous[ERRONEOUS, pos:7, prefPos:30
+    Erroneous[ERRONEOUS, pos:5, prefPos:28
       code: compiler.err.dc.no.title
       body: @spec_http://example.com
     ]
diff --git a/test/langtools/tools/javac/doctree/SummaryTest.java b/test/langtools/tools/javac/doctree/SummaryTest.java
index d2dfa334b66..8273876cf7a 100644
--- a/test/langtools/tools/javac/doctree/SummaryTest.java
+++ b/test/langtools/tools/javac/doctree/SummaryTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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 8173425 8273244
+ * @bug 8173425 8273244 8352249
  * @summary extend com.sun.source API to support parsing javadoc comments
  * @modules jdk.compiler/com.sun.tools.javac.api
  *          jdk.compiler/com.sun.tools.javac.file
@@ -39,13 +39,13 @@ class SummaryTest {
      */
     void empty() { }
 /*
-DocComment[DOC_COMMENT, pos:1
+DocComment[DOC_COMMENT, pos:0
   firstSentence: 1
-    Summary[SUMMARY, pos:1
+    Summary[SUMMARY, pos:0
       summary: empty
     ]
   body: 1
-    Text[TEXT, pos:11, _abc.]
+    Text[TEXT, pos:10, _abc.]
   block tags: empty
 ]
 */
@@ -54,14 +54,14 @@ DocComment[DOC_COMMENT, pos:1
      */
     void simple() { }
 /*
-DocComment[DOC_COMMENT, pos:1
+DocComment[DOC_COMMENT, pos:0
   firstSentence: 1
-    Summary[SUMMARY, pos:1
+    Summary[SUMMARY, pos:0
       summary: 1
-        Text[TEXT, pos:11, abc]
+        Text[TEXT, pos:10, abc]
     ]
   body: 1
-    Text[TEXT, pos:15, _def.]
+    Text[TEXT, pos:14, _def.]
   block tags: empty
 ]
 */
@@ -71,8 +71,30 @@ DocComment[DOC_COMMENT, pos:1
      */
     void leading_space() { }
 /*
-DocComment[DOC_COMMENT, pos:4
+DocComment[DOC_COMMENT, pos:0
   firstSentence: 1
+    Summary[SUMMARY, pos:0
+      summary: 1
+        Text[TEXT, pos:10, abc]
+    ]
+  body: 1
+    Text[TEXT, pos:14, _def]
+  block tags: empty
+]
+*/
+
+    /**
+     * <p> {@summary abc} def
+     */
+    void leading_html() { }
+/*
+DocComment[DOC_COMMENT, pos:0
+  firstSentence: 3
+    StartElement[START_ELEMENT, pos:0
+      name:p
+      attributes: empty
+    ]
+    Text[TEXT, pos:3, _]
     Summary[SUMMARY, pos:4
       summary: 1
         Text[TEXT, pos:14, abc]
@@ -81,28 +103,6 @@ DocComment[DOC_COMMENT, pos:4
     Text[TEXT, pos:18, _def]
   block tags: empty
 ]
-*/
-
-    /**
-     * <p> {@summary abc} def
-     */
-    void leading_html() { }
-/*
-DocComment[DOC_COMMENT, pos:1
-  firstSentence: 3
-    StartElement[START_ELEMENT, pos:1
-      name:p
-      attributes: empty
-    ]
-    Text[TEXT, pos:4, _]
-    Summary[SUMMARY, pos:5
-      summary: 1
-        Text[TEXT, pos:15, abc]
-    ]
-  body: 1
-    Text[TEXT, pos:19, _def]
-  block tags: empty
-]
 */
 
     /**
@@ -110,15 +110,15 @@ DocComment[DOC_COMMENT, pos:1
      */
     void leading_text() { }
 /*
-DocComment[DOC_COMMENT, pos:1
+DocComment[DOC_COMMENT, pos:0
   firstSentence: 2
-    Text[TEXT, pos:1, abc_]
-    Summary[SUMMARY, pos:5
+    Text[TEXT, pos:0, abc_]
+    Summary[SUMMARY, pos:4
       summary: 1
-        Text[TEXT, pos:15, def]
+        Text[TEXT, pos:14, def]
     ]
   body: 1
-    Text[TEXT, pos:19, _ghi]
+    Text[TEXT, pos:18, _ghi]
   block tags: empty
 ]
 */
@@ -128,15 +128,15 @@ DocComment[DOC_COMMENT, pos:1
      */
     void leading_text_with_break() { }
 /*
-DocComment[DOC_COMMENT, pos:1
+DocComment[DOC_COMMENT, pos:0
   firstSentence: 1
-    Text[TEXT, pos:1, abc.]
+    Text[TEXT, pos:0, abc.]
   body: 2
-    Summary[SUMMARY, pos:6
+    Summary[SUMMARY, pos:5
       summary: 1
-        Text[TEXT, pos:16, def]
+        Text[TEXT, pos:15, def]
     ]
-    Text[TEXT, pos:20, _ghi]
+    Text[TEXT, pos:19, _ghi]
   block tags: empty
 ]
 */
@@ -146,19 +146,19 @@ DocComment[DOC_COMMENT, pos:1
      */
     void trailing_html() { }
 /*
-DocComment[DOC_COMMENT, pos:1
+DocComment[DOC_COMMENT, pos:0
   firstSentence: 1
-    Summary[SUMMARY, pos:1
+    Summary[SUMMARY, pos:0
       summary: 1
-        Text[TEXT, pos:11, def]
+        Text[TEXT, pos:10, def]
     ]
   body: 3
-    Text[TEXT, pos:15, _]
-    StartElement[START_ELEMENT, pos:16
+    Text[TEXT, pos:14, _]
+    StartElement[START_ELEMENT, pos:15
       name:p
       attributes: empty
     ]
-    Text[TEXT, pos:19, _ghi]
+    Text[TEXT, pos:18, _ghi]
   block tags: empty
 ]
 */
@@ -168,18 +168,18 @@ DocComment[DOC_COMMENT, pos:1
      */
     void with_html() { }
 /*
-DocComment[DOC_COMMENT, pos:1
+DocComment[DOC_COMMENT, pos:0
   firstSentence: 1
-    Summary[SUMMARY, pos:1
+    Summary[SUMMARY, pos:0
       summary: 5
-        Text[TEXT, pos:11, abc_]
-        Entity[ENTITY, pos:15, lt]
-        Text[TEXT, pos:19, def]
-        Entity[ENTITY, pos:22, gt]
-        Text[TEXT, pos:26, _ghi]
+        Text[TEXT, pos:10, abc_]
+        Entity[ENTITY, pos:14, lt]
+        Text[TEXT, pos:18, def]
+        Entity[ENTITY, pos:21, gt]
+        Text[TEXT, pos:25, _ghi]
     ]
   body: 1
-    Text[TEXT, pos:31, _jkl]
+    Text[TEXT, pos:30, _jkl]
   block tags: empty
 ]
 */
diff --git a/test/langtools/tools/javac/doctree/SystemPropertyTest.java b/test/langtools/tools/javac/doctree/SystemPropertyTest.java
index b6e808c8c3d..2cd4f552d41 100644
--- a/test/langtools/tools/javac/doctree/SystemPropertyTest.java
+++ b/test/langtools/tools/javac/doctree/SystemPropertyTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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 5076751 8273244 8284908
+ * @bug 5076751 8273244 8284908 8352249
  * @summary System properties documentation needed in javadocs
  * @modules jdk.compiler/com.sun.tools.javac.api
  *          jdk.compiler/com.sun.tools.javac.file
@@ -39,13 +39,13 @@ class SystemPropertyTest {
      */
     void simple_term() {}
 /*
-DocComment[DOC_COMMENT, pos:1
+DocComment[DOC_COMMENT, pos:0
   firstSentence: 3
-    Text[TEXT, pos:1, abc_]
-    SystemProperty[SYSTEM_PROPERTY, pos:5
+    Text[TEXT, pos:0, abc_]
+    SystemProperty[SYSTEM_PROPERTY, pos:4
       property name: xyz.qwe
     ]
-    Text[TEXT, pos:30, _def]
+    Text[TEXT, pos:29, _def]
   body: empty
   block tags: empty
 ]
@@ -56,14 +56,14 @@ DocComment[DOC_COMMENT, pos:1
      */
     void bad_with_whitespace() {}
 /*
-DocComment[DOC_COMMENT, pos:1
+DocComment[DOC_COMMENT, pos:0
   firstSentence: 3
-    Text[TEXT, pos:1, abc_]
-    Erroneous[ERRONEOUS, pos:5, prefPos:26
+    Text[TEXT, pos:0, abc_]
+    Erroneous[ERRONEOUS, pos:4, prefPos:25
       code: compiler.err.dc.unexpected.content
       body: {@systemProperty_xyz_q
     ]
-    Text[TEXT, pos:27, we}]
+    Text[TEXT, pos:26, we}]
   body: empty
   block tags: empty
 ]
@@ -74,14 +74,14 @@ DocComment[DOC_COMMENT, pos:1
      */
     void bad_no_property() {}
 /*
-DocComment[DOC_COMMENT, pos:1
+DocComment[DOC_COMMENT, pos:0
   firstSentence: 3
-    Text[TEXT, pos:1, abc_]
-    Erroneous[ERRONEOUS, pos:5, prefPos:20
+    Text[TEXT, pos:0, abc_]
+    Erroneous[ERRONEOUS, pos:4, prefPos:19
       code: compiler.err.dc.no.content
       body: {@systemProperty
     ]
-    Text[TEXT, pos:21, }]
+    Text[TEXT, pos:20, }]
   body: empty
   block tags: empty
 ]
diff --git a/test/langtools/tools/javac/doctree/TagTest.java b/test/langtools/tools/javac/doctree/TagTest.java
index 99a293871b7..25304b0ca3a 100644
--- a/test/langtools/tools/javac/doctree/TagTest.java
+++ b/test/langtools/tools/javac/doctree/TagTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @bug 7021614 8078320 8273244 8284908 8301201 8301813
+ * @bug 7021614 8078320 8273244 8284908 8301201 8301813 8352249
  * @summary extend com.sun.source API to support parsing javadoc comments
  * @modules jdk.compiler/com.sun.tools.javac.api
  *          jdk.compiler/com.sun.tools.javac.file
@@ -39,14 +39,14 @@ class TagTest {
      */
     void custom_tag_with_a_colon() {}
 /*
-DocComment[DOC_COMMENT, pos:1
+DocComment[DOC_COMMENT, pos:0
   firstSentence: empty
   body: empty
   block tags: 1
-    UnknownBlockTag[UNKNOWN_BLOCK_TAG, pos:1
+    UnknownBlockTag[UNKNOWN_BLOCK_TAG, pos:0
       tag:tag:colon
       content: 1
-        Text[TEXT, pos:12, abc]
+        Text[TEXT, pos:11, abc]
     ]
 ]
 */
@@ -56,14 +56,14 @@ DocComment[DOC_COMMENT, pos:1
      */
     void custom_tag_with_a_hyphen() {}
 /*
-DocComment[DOC_COMMENT, pos:1
+DocComment[DOC_COMMENT, pos:0
   firstSentence: empty
   body: empty
   block tags: 1
-    UnknownBlockTag[UNKNOWN_BLOCK_TAG, pos:1
+    UnknownBlockTag[UNKNOWN_BLOCK_TAG, pos:0
       tag:tag-hyphen
       content: 1
-        Text[TEXT, pos:13, abc]
+        Text[TEXT, pos:12, abc]
     ]
 ]
 */
@@ -73,13 +73,13 @@ DocComment[DOC_COMMENT, pos:1
      */
     void simple_standard_block() { }
 /*
-DocComment[DOC_COMMENT, pos:1
+DocComment[DOC_COMMENT, pos:0
   firstSentence: empty
   body: empty
   block tags: 1
-    Author[AUTHOR, pos:1
+    Author[AUTHOR, pos:0
       name: 1
-        Text[TEXT, pos:9, jjg]
+        Text[TEXT, pos:8, jjg]
     ]
 ]
 */
@@ -89,11 +89,11 @@ DocComment[DOC_COMMENT, pos:1
      */
     void no_name_block() { }
 /*
-DocComment[DOC_COMMENT, pos:1
+DocComment[DOC_COMMENT, pos:0
   firstSentence: empty
   body: empty
   block tags: 1
-    Erroneous[ERRONEOUS, pos:1, prefPos:2
+    Erroneous[ERRONEOUS, pos:0, prefPos:1
       code: compiler.err.dc.no.tag.name
       body: @_abc
     ]
@@ -105,14 +105,14 @@ DocComment[DOC_COMMENT, pos:1
      */
     void unknown_name_block() { }
 /*
-DocComment[DOC_COMMENT, pos:1
+DocComment[DOC_COMMENT, pos:0
   firstSentence: empty
   body: empty
   block tags: 1
-    UnknownBlockTag[UNKNOWN_BLOCK_TAG, pos:1
+    UnknownBlockTag[UNKNOWN_BLOCK_TAG, pos:0
       tag:abc
       content: 1
-        Text[TEXT, pos:6, def_ghi]
+        Text[TEXT, pos:5, def_ghi]
     ]
 ]
 */
@@ -122,11 +122,11 @@ DocComment[DOC_COMMENT, pos:1
      */
     void simple_standard_inline() { }
 /*
-DocComment[DOC_COMMENT, pos:1
+DocComment[DOC_COMMENT, pos:0
   firstSentence: 1
-    Link[LINK, pos:1
+    Link[LINK, pos:0
       reference:
-        Reference[REFERENCE, pos:8, String]
+        Reference[REFERENCE, pos:7, String]
       body: empty
     ]
   body: empty
@@ -139,13 +139,13 @@ DocComment[DOC_COMMENT, pos:1
      */
     void no_name_inline() { }
 /*
-DocComment[DOC_COMMENT, pos:1
+DocComment[DOC_COMMENT, pos:0
   firstSentence: 2
-    Erroneous[ERRONEOUS, pos:1, prefPos:3
+    Erroneous[ERRONEOUS, pos:0, prefPos:2
       code: compiler.err.dc.no.tag.name
       body: {@
     ]
-    Text[TEXT, pos:3, _abc}]
+    Text[TEXT, pos:2, _abc}]
   body: empty
   block tags: empty
 ]
@@ -156,12 +156,12 @@ DocComment[DOC_COMMENT, pos:1
      */
     void unknown_name_inline() { }
 /*
-DocComment[DOC_COMMENT, pos:1
+DocComment[DOC_COMMENT, pos:0
   firstSentence: 1
-    UnknownInlineTag[UNKNOWN_INLINE_TAG, pos:1
+    UnknownInlineTag[UNKNOWN_INLINE_TAG, pos:0
       tag:abc
       content: 1
-        Text[TEXT, pos:7, def_ghi]
+        Text[TEXT, pos:6, def_ghi]
     ]
   body: empty
   block tags: empty
@@ -173,9 +173,9 @@ DocComment[DOC_COMMENT, pos:1
      */
     void unterminated_standard_inline() { }
 /*
-DocComment[DOC_COMMENT, pos:1
+DocComment[DOC_COMMENT, pos:0
   firstSentence: 1
-    Erroneous[ERRONEOUS, pos:1, prefPos:13
+    Erroneous[ERRONEOUS, pos:0, prefPos:12
       code: compiler.err.dc.unterminated.inline.tag
       body: {@abc_def_ghi
     ]
@@ -193,9 +193,9 @@ DocComment[DOC_COMMENT, pos:1
      */
     void inline_text_at() { }
 /*
-DocComment[DOC_COMMENT, pos:1
+DocComment[DOC_COMMENT, pos:0
   firstSentence: 1
-    Literal[CODE, pos:1, |_abc|_@def|_ghi|_]
+    Literal[CODE, pos:0, |abc|@def|ghi|]
   body: empty
   block tags: empty
 ]
@@ -209,12 +209,12 @@ DocComment[DOC_COMMENT, pos:1
      */
     void inline_content_at() { }
 /*
-DocComment[DOC_COMMENT, pos:1
+DocComment[DOC_COMMENT, pos:0
   firstSentence: 1
-    UnknownInlineTag[UNKNOWN_INLINE_TAG, pos:1
+    UnknownInlineTag[UNKNOWN_INLINE_TAG, pos:0
       tag:tag
       content: 1
-        Text[TEXT, pos:7, abc|_@def|_ghi|_]
+        Text[TEXT, pos:6, abc|@def|ghi|]
     ]
   body: empty
   block tags: empty
diff --git a/test/langtools/tools/javac/doctree/ThrowableTest.java b/test/langtools/tools/javac/doctree/ThrowableTest.java
index b1680121c32..65f053b158f 100644
--- a/test/langtools/tools/javac/doctree/ThrowableTest.java
+++ b/test/langtools/tools/javac/doctree/ThrowableTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @bug 7021614 8273244
+ * @bug 7021614 8273244 8352249
  * @summary extend com.sun.source API to support parsing javadoc comments
  * @modules jdk.compiler/com.sun.tools.javac.api
  *          jdk.compiler/com.sun.tools.javac.file
@@ -39,13 +39,13 @@ class ThrowableTest {
      */
     void exception() throws Exception { }
 /*
-DocComment[DOC_COMMENT, pos:1
+DocComment[DOC_COMMENT, pos:0
   firstSentence: empty
   body: empty
   block tags: 1
-    Throws[THROWS, pos:1
+    Throws[THROWS, pos:0
       exceptionName:
-        Reference[REFERENCE, pos:9, Exception]
+        Reference[REFERENCE, pos:8, Exception]
       description: empty
     ]
 ]
@@ -56,15 +56,15 @@ DocComment[DOC_COMMENT, pos:1
      */
     void exception_text() throws Exception { }
 /*
-DocComment[DOC_COMMENT, pos:1
+DocComment[DOC_COMMENT, pos:0
   firstSentence: empty
   body: empty
   block tags: 1
-    Throws[THROWS, pos:1
+    Throws[THROWS, pos:0
       exceptionName:
-        Reference[REFERENCE, pos:9, Exception]
+        Reference[REFERENCE, pos:8, Exception]
       description: 1
-        Text[TEXT, pos:19, text]
+        Text[TEXT, pos:18, text]
     ]
 ]
 */
@@ -74,11 +74,11 @@ DocComment[DOC_COMMENT, pos:1
      */
     void exception_member() throws Exception { }
 /*
-DocComment[DOC_COMMENT, pos:1
+DocComment[DOC_COMMENT, pos:0
   firstSentence: empty
   body: empty
   block tags: 1
-    Erroneous[ERRONEOUS, pos:1, prefPos:18
+    Erroneous[ERRONEOUS, pos:0, prefPos:17
       code: compiler.err.dc.ref.unexpected.input
       body: @throws_Exception#member_text
     ]
@@ -90,11 +90,11 @@ DocComment[DOC_COMMENT, pos:1
      */
     void exception_fragment() throws Exception { }
 /*
-DocComment[DOC_COMMENT, pos:1
+DocComment[DOC_COMMENT, pos:0
   firstSentence: empty
   body: empty
   block tags: 1
-    Erroneous[ERRONEOUS, pos:1, prefPos:18
+    Erroneous[ERRONEOUS, pos:0, prefPos:17
       code: compiler.err.dc.ref.unexpected.input
       body: @throws_Exception##fragment_text
     ]
diff --git a/test/langtools/tools/javac/doctree/UsesTest.java b/test/langtools/tools/javac/doctree/UsesTest.java
index bb4b7aecb98..a30d46cfa8f 100644
--- a/test/langtools/tools/javac/doctree/UsesTest.java
+++ b/test/langtools/tools/javac/doctree/UsesTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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 8160196 8273244
+ * @bug 8160196 8273244 8352249
  * @summary Module summary page should display information based on "api" or "detail" mode.
  * @modules jdk.compiler/com.sun.tools.javac.api
  *          jdk.compiler/com.sun.tools.javac.file
@@ -40,14 +40,14 @@ class UsesTest {
       */
     void simple_uses() { }
 /*
-DocComment[DOC_COMMENT, pos:1
+DocComment[DOC_COMMENT, pos:0
   firstSentence: 1
-    Text[TEXT, pos:1, abc.]
+    Text[TEXT, pos:0, abc.]
   body: empty
   block tags: 1
-    Uses[USES, pos:7
+    Uses[USES, pos:5
       serviceName:
-        Reference[REFERENCE, pos:13, ProvidesTest]
+        Reference[REFERENCE, pos:11, ProvidesTest]
       description: empty
     ]
 ]
@@ -59,16 +59,16 @@ DocComment[DOC_COMMENT, pos:1
       */
     void uses_with_description() { }
 /*
-DocComment[DOC_COMMENT, pos:1
+DocComment[DOC_COMMENT, pos:0
   firstSentence: 1
-    Text[TEXT, pos:1, abc.]
+    Text[TEXT, pos:0, abc.]
   body: empty
   block tags: 1
-    Uses[USES, pos:7
+    Uses[USES, pos:5
       serviceName:
-        Reference[REFERENCE, pos:13, ProvidesTest]
+        Reference[REFERENCE, pos:11, ProvidesTest]
       description: 1
-        Text[TEXT, pos:26, Test_description_for_uses.]
+        Text[TEXT, pos:24, Test_description_for_uses.]
     ]
 ]
 */
diff --git a/test/langtools/tools/javac/doctree/ValueTest.java b/test/langtools/tools/javac/doctree/ValueTest.java
index 74fb40cc0e9..3b69d53be58 100644
--- a/test/langtools/tools/javac/doctree/ValueTest.java
+++ b/test/langtools/tools/javac/doctree/ValueTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @bug 7021614 8273244 8284908
+ * @bug 7021614 8273244 8284908 8352249
  * @summary extend com.sun.source API to support parsing javadoc comments
  * @modules jdk.compiler/com.sun.tools.javac.api
  *          jdk.compiler/com.sun.tools.javac.file
@@ -39,10 +39,10 @@ class ValueTest {
      */
     int no_ref() { }
 /*
-DocComment[DOC_COMMENT, pos:1
+DocComment[DOC_COMMENT, pos:0
   firstSentence: 2
-    Text[TEXT, pos:1, abc_]
-    Value[VALUE, pos:5
+    Text[TEXT, pos:0, abc_]
+    Value[VALUE, pos:4
       format: null
       reference: null
     ]
@@ -56,13 +56,13 @@ DocComment[DOC_COMMENT, pos:1
      */
     int typical() { }
 /*
-DocComment[DOC_COMMENT, pos:1
+DocComment[DOC_COMMENT, pos:0
   firstSentence: 2
-    Text[TEXT, pos:1, abc_]
-    Value[VALUE, pos:5
+    Text[TEXT, pos:0, abc_]
+    Value[VALUE, pos:4
       format: null
       reference:
-        Reference[REFERENCE, pos:13, java.awt.Color#RED]
+        Reference[REFERENCE, pos:12, java.awt.Color#RED]
     ]
   body: empty
   block tags: empty
@@ -74,13 +74,13 @@ DocComment[DOC_COMMENT, pos:1
      */
     int trailing_ws() { }
 /*
-DocComment[DOC_COMMENT, pos:1
+DocComment[DOC_COMMENT, pos:0
   firstSentence: 2
-    Text[TEXT, pos:1, abc_]
-    Value[VALUE, pos:5
+    Text[TEXT, pos:0, abc_]
+    Value[VALUE, pos:4
       format: null
       reference:
-        Reference[REFERENCE, pos:13, java.awt.Color#RED]
+        Reference[REFERENCE, pos:12, java.awt.Color#RED]
     ]
   body: empty
   block tags: empty
@@ -92,14 +92,14 @@ DocComment[DOC_COMMENT, pos:1
      */
     int trailing_junk() { }
 /*
-DocComment[DOC_COMMENT, pos:1
+DocComment[DOC_COMMENT, pos:0
   firstSentence: 3
-    Text[TEXT, pos:1, abc_]
-    Erroneous[ERRONEOUS, pos:5, prefPos:32
+    Text[TEXT, pos:0, abc_]
+    Erroneous[ERRONEOUS, pos:4, prefPos:31
       code: compiler.err.dc.unexpected.content
       body: {@value_java.awt.Color#RED_j
     ]
-    Text[TEXT, pos:33, unk}]
+    Text[TEXT, pos:32, unk}]
   body: empty
   block tags: empty
 ]
@@ -110,14 +110,14 @@ DocComment[DOC_COMMENT, pos:1
      */
     int format_plain() { }
 /*
-DocComment[DOC_COMMENT, pos:1
+DocComment[DOC_COMMENT, pos:0
   firstSentence: 2
-    Text[TEXT, pos:1, abc_]
-    Value[VALUE, pos:5
+    Text[TEXT, pos:0, abc_]
+    Value[VALUE, pos:4
       format:
-        Text[TEXT, pos:13, %d]
+        Text[TEXT, pos:12, %d]
       reference:
-        Reference[REFERENCE, pos:16, java.awt.Color#RED]
+        Reference[REFERENCE, pos:15, java.awt.Color#RED]
     ]
   body: empty
   block tags: empty
@@ -129,14 +129,14 @@ DocComment[DOC_COMMENT, pos:1
      */
     int format_quoted() { }
 /*
-DocComment[DOC_COMMENT, pos:1
+DocComment[DOC_COMMENT, pos:0
   firstSentence: 2
-    Text[TEXT, pos:1, abc_]
-    Value[VALUE, pos:5
+    Text[TEXT, pos:0, abc_]
+    Value[VALUE, pos:4
       format:
-        Text[TEXT, pos:13, "%d"]
+        Text[TEXT, pos:12, "%d"]
       reference:
-        Reference[REFERENCE, pos:18, java.awt.Color#RED]
+        Reference[REFERENCE, pos:17, java.awt.Color#RED]
     ]
   body: empty
   block tags: empty
@@ -148,14 +148,14 @@ DocComment[DOC_COMMENT, pos:1
      */
     int format_invalid() { }
 /*
-DocComment[DOC_COMMENT, pos:1
+DocComment[DOC_COMMENT, pos:0
   firstSentence: 3
-    Text[TEXT, pos:1, abc_]
-    Erroneous[ERRONEOUS, pos:5, prefPos:13
+    Text[TEXT, pos:0, abc_]
+    Erroneous[ERRONEOUS, pos:4, prefPos:12
       code: compiler.err.dc.ref.unexpected.input
       body: {@value_0x%x4
     ]
-    Text[TEXT, pos:18, _java.awt.Color#RED}]
+    Text[TEXT, pos:17, _java.awt.Color#RED}]
   body: empty
   block tags: empty
 ]
@@ -166,14 +166,14 @@ DocComment[DOC_COMMENT, pos:1
      */
     int format_trailing_junk() { }
 /*
-DocComment[DOC_COMMENT, pos:1
+DocComment[DOC_COMMENT, pos:0
   firstSentence: 3
-    Text[TEXT, pos:1, abc_]
-    Erroneous[ERRONEOUS, pos:5, prefPos:37
+    Text[TEXT, pos:0, abc_]
+    Erroneous[ERRONEOUS, pos:4, prefPos:36
       code: compiler.err.dc.unexpected.content
       body: {@value_"%d"_java.awt.Color#RED_j
     ]
-    Text[TEXT, pos:38, unk}]
+    Text[TEXT, pos:37, unk}]
   body: empty
   block tags: empty
 ]
@@ -184,14 +184,14 @@ DocComment[DOC_COMMENT, pos:1
      */
     int type_reference() { }
 /*
-DocComment[DOC_COMMENT, pos:1
+DocComment[DOC_COMMENT, pos:0
   firstSentence: 3
-    Text[TEXT, pos:1, abc_]
-    Erroneous[ERRONEOUS, pos:5, prefPos:17
+    Text[TEXT, pos:0, abc_]
+    Erroneous[ERRONEOUS, pos:4, prefPos:16
       code: compiler.err.dc.ref.unexpected.input
       body: {@value_java.awt.Color
     ]
-    Text[TEXT, pos:27, }]
+    Text[TEXT, pos:26, }]
   body: empty
   block tags: empty
 ]
@@ -202,14 +202,14 @@ DocComment[DOC_COMMENT, pos:1
      */
     int anchor_reference() { }
 /*
-DocComment[DOC_COMMENT, pos:1
+DocComment[DOC_COMMENT, pos:0
   firstSentence: 3
-    Text[TEXT, pos:1, abc_]
-    Erroneous[ERRONEOUS, pos:5, prefPos:28
+    Text[TEXT, pos:0, abc_]
+    Erroneous[ERRONEOUS, pos:4, prefPos:27
       code: compiler.err.dc.ref.unexpected.input
       body: {@value_java.awt.Color##fragment
     ]
-    Text[TEXT, pos:37, }]
+    Text[TEXT, pos:36, }]
   body: empty
   block tags: empty
 ]
diff --git a/test/langtools/tools/javac/doctree/VersionTest.java b/test/langtools/tools/javac/doctree/VersionTest.java
index ce6fba6ccec..0a2f375920a 100644
--- a/test/langtools/tools/javac/doctree/VersionTest.java
+++ b/test/langtools/tools/javac/doctree/VersionTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @bug 7021614 8273244
+ * @bug 7021614 8273244 8352249
  * @summary extend com.sun.source API to support parsing javadoc comments
  * @modules jdk.compiler/com.sun.tools.javac.api
  *          jdk.compiler/com.sun.tools.javac.file
@@ -39,13 +39,13 @@ class VersionTest {
      */
     void version() { }
 /*
-DocComment[DOC_COMMENT, pos:1
+DocComment[DOC_COMMENT, pos:0
   firstSentence: empty
   body: empty
   block tags: 1
-    Version[VERSION, pos:1
+    Version[VERSION, pos:0
       body: 1
-        Text[TEXT, pos:10, 1.2]
+        Text[TEXT, pos:9, 1.2]
     ]
 ]
 */

From 3ed010ab7cf5b8c9bf8fa000e88ea95285351982 Mon Sep 17 00:00:00 2001
From: Emanuel Peter <epeter@openjdk.org>
Date: Thu, 20 Mar 2025 06:13:52 +0000
Subject: [PATCH 408/587] 8352020: [CompileFramework] enable compilation for
 VectorAPI

Reviewed-by: chagedorn, kvn
---
 .../lib/compile_framework/Compile.java        | 14 ++-
 .../compile_framework/CompileFramework.java   |  7 +-
 .../IRFrameworkWithVectorAPIExample.java      | 90 +++++++++++++++++++
 3 files changed, 105 insertions(+), 6 deletions(-)
 create mode 100644 test/hotspot/jtreg/testlibrary_tests/compile_framework/examples/IRFrameworkWithVectorAPIExample.java

diff --git a/test/hotspot/jtreg/compiler/lib/compile_framework/Compile.java b/test/hotspot/jtreg/compiler/lib/compile_framework/Compile.java
index 0f45d982af6..7fde22cd207 100644
--- a/test/hotspot/jtreg/compiler/lib/compile_framework/Compile.java
+++ b/test/hotspot/jtreg/compiler/lib/compile_framework/Compile.java
@@ -30,6 +30,7 @@ import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.concurrent.TimeUnit;
 import java.util.List;
 import jdk.test.lib.JDKToolFinder;
@@ -47,7 +48,7 @@ class Compile {
      * Compile all sources in {@code javaSources}. First write them to the {@code sourceDir},
      * then compile them to class-files which are stored in {@code classesDir}.
      */
-    public static void compileJavaSources(List<SourceCode> javaSources, Path sourceDir, Path classesDir) {
+    public static void compileJavaSources(List<SourceCode> javaSources, Path sourceDir, Path classesDir, String[] javacFlags) {
         if (javaSources.isEmpty()) {
             Utils.printlnVerbose("No java sources to compile.");
             return;
@@ -55,7 +56,7 @@ class Compile {
         Utils.printlnVerbose("Compiling Java sources: " + javaSources.size());
 
         List<Path> javaFilePaths = writeSourcesToFiles(javaSources, sourceDir);
-        compileJavaFiles(javaFilePaths, classesDir);
+        compileJavaFiles(javaFilePaths, classesDir, javacFlags);
         Utils.printlnVerbose("Java sources compiled.");
     }
 
@@ -63,10 +64,13 @@ class Compile {
      * Compile a list of files (i.e. {@code paths}) using javac and store
      * them in {@code classesDir}.
      */
-    private static void compileJavaFiles(List<Path> paths, Path classesDir) {
+    private static void compileJavaFiles(List<Path> paths, Path classesDir, String[] javacFlags) {
         List<String> command = new ArrayList<>();
 
         command.add(JAVAC_PATH);
+        if (javacFlags != null) {
+            command.addAll(Arrays.asList(javacFlags));
+        }
         command.add("-classpath");
         // Note: the backslashes from windows paths must be escaped!
         command.add(Utils.getEscapedClassPathAndClassesDir(classesDir));
@@ -192,8 +196,10 @@ class Compile {
             throw new CompileFrameworkException("InterruptedException during compilation", e);
         }
 
-        if (exitCode != 0 || !output.isEmpty()) {
+        // Note: the output can be non-empty even if the compilation succeeds, e.g. for warnings.
+        if (exitCode != 0) {
             System.err.println("Compilation failed.");
+            System.err.println("Command: " + command);
             System.err.println("Exit code: " + exitCode);
             System.err.println("Output: '" + output + "'");
             throw new CompileFrameworkException("Compilation failed.");
diff --git a/test/hotspot/jtreg/compiler/lib/compile_framework/CompileFramework.java b/test/hotspot/jtreg/compiler/lib/compile_framework/CompileFramework.java
index fe23d596f3c..b86d30ab528 100644
--- a/test/hotspot/jtreg/compiler/lib/compile_framework/CompileFramework.java
+++ b/test/hotspot/jtreg/compiler/lib/compile_framework/CompileFramework.java
@@ -71,8 +71,11 @@ public class CompileFramework {
      * Compile all sources: store the sources to the {@link sourceDir} directory, compile
      * Java and Jasm sources and store the generated class-files in the {@link classesDir}
      * directory.
+     *
+     * @param javacFlags: optional, list of additional flags for javac, e.g. to make modules
+     *                    visible.
      */
-    public void compile() {
+    public void compile(String... javacFlags) {
         if (classLoader != null) {
             throw new CompileFrameworkException("Cannot compile twice!");
         }
@@ -86,7 +89,7 @@ public class CompileFramework {
         System.out.println("Classes directory: " + classesDir);
 
         Compile.compileJasmSources(jasmSources, sourceDir, classesDir);
-        Compile.compileJavaSources(javaSources, sourceDir, classesDir);
+        Compile.compileJavaSources(javaSources, sourceDir, classesDir, javacFlags);
         classLoader = ClassLoaderBuilder.build(classesDir);
     }
 
diff --git a/test/hotspot/jtreg/testlibrary_tests/compile_framework/examples/IRFrameworkWithVectorAPIExample.java b/test/hotspot/jtreg/testlibrary_tests/compile_framework/examples/IRFrameworkWithVectorAPIExample.java
new file mode 100644
index 00000000000..7e1f289792b
--- /dev/null
+++ b/test/hotspot/jtreg/testlibrary_tests/compile_framework/examples/IRFrameworkWithVectorAPIExample.java
@@ -0,0 +1,90 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact 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 Example test to use the Compile Framework together with the IR Framework (i.e. TestFramework),
+ *          and the VectorAPI.
+ * @modules java.base/jdk.internal.misc
+ * @modules jdk.incubator.vector
+ * @library /test/lib /
+ * @compile ../../../compiler/lib/ir_framework/TestFramework.java
+ * @run driver compile_framework.examples.IRFrameworkWithVectorAPIExample
+ */
+
+package compile_framework.examples;
+
+import compiler.lib.compile_framework.*;
+import jdk.test.lib.Utils;
+import jdk.incubator.vector.IntVector;
+import jdk.test.lib.Platform;
+import java.lang.reflect.InvocationTargetException;
+
+/**
+ * This test shows that the IR verification can be done on code compiled by the Compile Framework.
+ * The "@compile" command for JTREG is required so that the IRFramework is compiled, other javac
+ * might not compile it because it is not present in the class, only in the dynamically compiled
+ * code.
+ * <p>
+ * Additionally, we must set the classpath for the Test-VM, so that it has access to all compiled
+ * classes (see {@link CompileFramework#getEscapedClassPathOfCompiledClasses}).
+ */
+public class IRFrameworkWithVectorAPIExample {
+
+    public static void main(String[] args) {
+        // Create a new CompileFramework instance.
+        CompileFramework comp = new CompileFramework();
+
+        // Add a java source file.
+        comp.addJavaSourceCode("InnerTest", generateInnerTest(comp));
+
+        // Compile the source file. "javac" needs to know that it is ok to compile with the
+        // VectorAPI module.
+        comp.compile("--add-modules=jdk.incubator.vector");
+
+        // InnerTest.main();
+        comp.invoke("InnerTest", "main", new Object[] {null});
+    }
+
+    // Generate a source java file as String
+    public static String generateInnerTest(CompileFramework comp) {
+        return String.format("""
+               import compiler.lib.ir_framework.*;
+               import jdk.incubator.vector.*;
+
+               public class InnerTest {
+                   public static void main(String args[]) {
+                       TestFramework framework = new TestFramework(InnerTest.class);
+                       // Also the TestFramework must allow the test VM to see the VectorAPI module.
+                       framework.addFlags("-classpath", "%s", "--add-modules=jdk.incubator.vector");
+                       framework.start();
+                   }
+
+                   @Test
+                   static Object test() {
+                       return IntVector.broadcast(IntVector.SPECIES_64, 42);
+                   }
+               }
+               """, comp.getEscapedClassPathOfCompiledClasses());
+    }
+}

From fb210e3a7174bca1da112216158b2c1dede6dc34 Mon Sep 17 00:00:00 2001
From: Emanuel Peter <epeter@openjdk.org>
Date: Thu, 20 Mar 2025 06:14:07 +0000
Subject: [PATCH 409/587] 8351952: [IR Framework]: allow ignoring methods that
 are not compilable

Co-authored-by: Christian Hagedorn <chagedorn@openjdk.org>
Reviewed-by: chagedorn, thartmann
---
 .../jtreg/compiler/lib/ir_framework/Test.java |  10 +-
 .../lib/ir_framework/TestFramework.java       |  18 +-
 .../ir_framework/driver/TestVMProcess.java    |  14 +-
 .../irmethod/NotCompilableIRMethod.java       |  61 ++++++
 .../NotCompilableIRMethodMatchResult.java     |  60 +++++
 .../irmatching/parser/IRMethodBuilder.java    |  17 +-
 .../irmatching/parser/TestClassParser.java    |   8 +-
 .../report/CompilationOutputBuilder.java      |   8 +-
 .../irmatching/report/FailCountVisitor.java   |   7 +-
 .../report/FailureMessageBuilder.java         |   7 +-
 .../visitor/MatchResultVisitor.java           |   3 +-
 .../shared/TestFrameworkSocket.java           |   1 +
 .../lib/ir_framework/test/AbstractTest.java   |  25 ++-
 .../lib/ir_framework/test/DeclaredTest.java   |  10 +-
 .../lib/ir_framework/test/TestVM.java         |   4 +-
 .../ir_framework/tests/TestNotCompilable.java | 205 ++++++++++++++++++
 .../tests/TestPhaseIRMatching.java            |  11 +-
 17 files changed, 442 insertions(+), 27 deletions(-)
 create mode 100644 test/hotspot/jtreg/compiler/lib/ir_framework/driver/irmatching/irmethod/NotCompilableIRMethod.java
 create mode 100644 test/hotspot/jtreg/compiler/lib/ir_framework/driver/irmatching/irmethod/NotCompilableIRMethodMatchResult.java
 create mode 100644 test/hotspot/jtreg/testlibrary_tests/ir_framework/tests/TestNotCompilable.java

diff --git a/test/hotspot/jtreg/compiler/lib/ir_framework/Test.java b/test/hotspot/jtreg/compiler/lib/ir_framework/Test.java
index 49b297f6b93..43569cb589e 100644
--- a/test/hotspot/jtreg/compiler/lib/ir_framework/Test.java
+++ b/test/hotspot/jtreg/compiler/lib/ir_framework/Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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,4 +84,12 @@ public @interface Test {
      * available level which is usually {@link CompLevel#C2}.
      */
     CompLevel compLevel() default CompLevel.ANY;
+
+    /**
+     * In rare cases, methods may not be compilable because of a compilation bailout. By default, this leads to a
+     * test failure. However, if such cases are expected in a specific test, this flag can be set to true, which
+     * allows the test to pass even if there is no compilation. Any associated {@link IR} rule is only executed
+     * if the test method was compiled, and else it is ignored silently.
+     */
+    boolean allowNotCompilable() default false;
 }
diff --git a/test/hotspot/jtreg/compiler/lib/ir_framework/TestFramework.java b/test/hotspot/jtreg/compiler/lib/ir_framework/TestFramework.java
index 919380cd91c..79c99352a32 100644
--- a/test/hotspot/jtreg/compiler/lib/ir_framework/TestFramework.java
+++ b/test/hotspot/jtreg/compiler/lib/ir_framework/TestFramework.java
@@ -175,6 +175,7 @@ public class TestFramework {
     private List<String> flags;
     private int defaultWarmup = -1;
     private boolean testClassesOnBootClassPath;
+    private boolean isAllowNotCompilable = false;
 
     /*
      * Public interface methods
@@ -409,6 +410,19 @@ public class TestFramework {
         return this;
     }
 
+    /**
+     * In rare cases, methods may not be compilable because of a compilation bailout. By default, this leads to a
+     * test failure. However, if such cases are expected in multiple methods in a test class, this flag can be set to
+     * true, which allows any test to pass even if there is a compilation bailout. If only selected methods are prone
+     * to bail out, it is preferred to use {@link Test#allowNotCompilable()} instead for more fine-grained control.
+     * By setting this flag, any associated {@link IR} rule of a test is only executed if the test method was compiled,
+     * and else it is ignored silently.
+     */
+    public TestFramework allowNotCompilable() {
+        this.isAllowNotCompilable = true;
+        return this;
+    }
+
     /**
      * Get the VM output of the test VM. Use {@code -DVerbose=true} to enable more debug information. If scenarios
      * were run, use {@link Scenario#getTestVMOutput()}.
@@ -773,10 +787,10 @@ public class TestFramework {
 
     private void runTestVM(List<String> additionalFlags) {
         TestVMProcess testVMProcess = new TestVMProcess(additionalFlags, testClass, helperClasses, defaultWarmup,
-                                                        testClassesOnBootClassPath);
+                                                        isAllowNotCompilable, testClassesOnBootClassPath);
         if (shouldVerifyIR) {
             try {
-                TestClassParser testClassParser = new TestClassParser(testClass);
+                TestClassParser testClassParser = new TestClassParser(testClass, isAllowNotCompilable);
                 Matchable testClassMatchable = testClassParser.parse(testVMProcess.getHotspotPidFileName(),
                                                                      testVMProcess.getIrEncoding());
                 IRMatcher matcher = new IRMatcher(testClassMatchable);
diff --git a/test/hotspot/jtreg/compiler/lib/ir_framework/driver/TestVMProcess.java b/test/hotspot/jtreg/compiler/lib/ir_framework/driver/TestVMProcess.java
index feb8fe9e530..fcdafc9618e 100644
--- a/test/hotspot/jtreg/compiler/lib/ir_framework/driver/TestVMProcess.java
+++ b/test/hotspot/jtreg/compiler/lib/ir_framework/driver/TestVMProcess.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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,11 +65,12 @@ public class TestVMProcess {
     private String irEncoding;
 
     public TestVMProcess(List<String> additionalFlags, Class<?> testClass, Set<Class<?>> helperClasses, int defaultWarmup,
-                         boolean testClassesOnBootClassPath) {
+                         boolean allowNotCompilable, boolean testClassesOnBootClassPath) {
         this.cmds = new ArrayList<>();
         TestFrameworkSocket socket = new TestFrameworkSocket();
         try (socket) {
-            prepareTestVMFlags(additionalFlags, socket, testClass, helperClasses, defaultWarmup, testClassesOnBootClassPath);
+            prepareTestVMFlags(additionalFlags, socket, testClass, helperClasses, defaultWarmup,
+                               allowNotCompilable, testClassesOnBootClassPath);
             start();
         }
         processSocketOutput(socket);
@@ -93,7 +94,8 @@ public class TestVMProcess {
     }
 
     private void prepareTestVMFlags(List<String> additionalFlags, TestFrameworkSocket socket, Class<?> testClass,
-                                    Set<Class<?>> helperClasses, int defaultWarmup, boolean testClassesOnBootClassPath) {
+                                    Set<Class<?>> helperClasses, int defaultWarmup, boolean allowNotCompilable,
+                                    boolean testClassesOnBootClassPath) {
         // Set java.library.path so JNI tests which rely on jtreg nativepath setting work
         cmds.add("-Djava.library.path=" + Utils.TEST_NATIVE_PATH);
         // Need White Box access in test VM.
@@ -128,6 +130,10 @@ public class TestVMProcess {
             cmds.add("-DWarmup=" + defaultWarmup);
         }
 
+        if (allowNotCompilable) {
+            cmds.add("-DAllowNotCompilable=true");
+        }
+
         cmds.add(TestVM.class.getName());
         cmds.add(testClass.getName());
         if (helperClasses != null) {
diff --git a/test/hotspot/jtreg/compiler/lib/ir_framework/driver/irmatching/irmethod/NotCompilableIRMethod.java b/test/hotspot/jtreg/compiler/lib/ir_framework/driver/irmatching/irmethod/NotCompilableIRMethod.java
new file mode 100644
index 00000000000..d74825c8d4f
--- /dev/null
+++ b/test/hotspot/jtreg/compiler/lib/ir_framework/driver/irmatching/irmethod/NotCompilableIRMethod.java
@@ -0,0 +1,61 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package compiler.lib.ir_framework.driver.irmatching.irmethod;
+
+import compiler.lib.ir_framework.IR;
+import compiler.lib.ir_framework.Run;
+import compiler.lib.ir_framework.RunMode;
+
+import java.lang.reflect.Method;
+
+/**
+ * This class represents a special IR method which was not compiled by the IR framework, but this was explicitly allowed
+ * by "allowNotCompilable". This happens when the compiler bails out of a compilation (i.e. no compilation) but we treat
+ * this as valid case. Any associated IR rules pass silently.
+ *
+ * @see IR
+ * @see Test
+ */
+public class NotCompilableIRMethod implements IRMethodMatchable {
+    private final Method method;
+    private final int ruleCount;
+
+    public NotCompilableIRMethod(Method method, int ruleCount) {
+        this.method = method;
+        this.ruleCount = ruleCount;
+    }
+
+    @Override
+    public String name() {
+        return method.getName();
+    }
+
+    /**
+     * Directly return a {@link NotCompilableIRMethodMatchResult} as we do not need to match IR rules individually.
+     */
+    @Override
+    public NotCompilableIRMethodMatchResult match() {
+        return new NotCompilableIRMethodMatchResult(method, ruleCount);
+    }
+}
diff --git a/test/hotspot/jtreg/compiler/lib/ir_framework/driver/irmatching/irmethod/NotCompilableIRMethodMatchResult.java b/test/hotspot/jtreg/compiler/lib/ir_framework/driver/irmatching/irmethod/NotCompilableIRMethodMatchResult.java
new file mode 100644
index 00000000000..011b596cc9e
--- /dev/null
+++ b/test/hotspot/jtreg/compiler/lib/ir_framework/driver/irmatching/irmethod/NotCompilableIRMethodMatchResult.java
@@ -0,0 +1,60 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package compiler.lib.ir_framework.driver.irmatching.irmethod;
+
+import compiler.lib.ir_framework.Run;
+import compiler.lib.ir_framework.RunMode;
+import compiler.lib.ir_framework.driver.irmatching.MatchResult;
+import compiler.lib.ir_framework.driver.irmatching.visitor.MatchResultVisitor;
+
+import java.lang.reflect.Method;
+
+/**
+ * This class represents a special matching result of an IR method where the compilation output was completely empty,
+ * but this was exlicitly allowed by "allowNotCompilable". This happens when the compiler bails out of a compilation
+ * (i.e. no compilation) but we treat this as valid case. Any associated IR rules pass silently.
+ *
+ * @see NotCompilableIRMethod
+ * @see Test
+ */
+public class NotCompilableIRMethodMatchResult implements MatchResult {
+    private final Method method;
+    private final int failedIRRules;
+
+    public NotCompilableIRMethodMatchResult(Method method, int failedIRRules) {
+        this.method = method;
+        this.failedIRRules = failedIRRules;
+    }
+
+    @Override
+    public boolean fail() {
+        return false;
+    }
+
+    @Override
+    public void accept(MatchResultVisitor visitor) {
+        visitor.visitMethodNotCompilable(method, failedIRRules);
+    }
+}
+
diff --git a/test/hotspot/jtreg/compiler/lib/ir_framework/driver/irmatching/parser/IRMethodBuilder.java b/test/hotspot/jtreg/compiler/lib/ir_framework/driver/irmatching/parser/IRMethodBuilder.java
index beed44a01c5..538680496e7 100644
--- a/test/hotspot/jtreg/compiler/lib/ir_framework/driver/irmatching/parser/IRMethodBuilder.java
+++ b/test/hotspot/jtreg/compiler/lib/ir_framework/driver/irmatching/parser/IRMethodBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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,13 @@
 
 package compiler.lib.ir_framework.driver.irmatching.parser;
 
+import compiler.lib.ir_framework.Test;
+import compiler.lib.ir_framework.TestFramework;
 import compiler.lib.ir_framework.driver.irmatching.Compilation;
 import compiler.lib.ir_framework.driver.irmatching.irmethod.IRMethod;
 import compiler.lib.ir_framework.driver.irmatching.irmethod.IRMethodMatchable;
 import compiler.lib.ir_framework.driver.irmatching.irmethod.NotCompiledIRMethod;
+import compiler.lib.ir_framework.driver.irmatching.irmethod.NotCompilableIRMethod;
 import compiler.lib.ir_framework.driver.irmatching.parser.hotspot.HotSpotPidFileParser;
 import compiler.lib.ir_framework.driver.irmatching.parser.hotspot.LoggedMethod;
 import compiler.lib.ir_framework.driver.irmatching.parser.hotspot.LoggedMethods;
@@ -41,10 +44,12 @@ import java.util.TreeSet;
 class IRMethodBuilder {
     private final Map<String, LoggedMethod> loggedMethods;
     private final TestMethods testMethods;
+    private final boolean allowNotCompilable;
 
-    public IRMethodBuilder(TestMethods testMethods, LoggedMethods loggedMethods) {
+    public IRMethodBuilder(TestMethods testMethods, LoggedMethods loggedMethods, boolean allowNotCompilable) {
         this.testMethods = testMethods;
         this.loggedMethods = loggedMethods.loggedMethods();
+        this.allowNotCompilable = allowNotCompilable;
     }
 
     /**
@@ -64,7 +69,13 @@ class IRMethodBuilder {
             return new IRMethod(testMethod.method(), testMethod.irRuleIds(), testMethod.irAnnos(),
                                 new Compilation(loggedMethod.compilationOutput()), vmInfo);
         } else {
-            return new NotCompiledIRMethod(testMethod.method(), testMethod.irRuleIds().length);
+            Test[] testAnnos = testMethod.method().getAnnotationsByType(Test.class);
+            boolean allowMethodNotCompilable = allowNotCompilable || testAnnos[0].allowNotCompilable();
+            if (allowMethodNotCompilable) {
+                return new NotCompilableIRMethod(testMethod.method(), testMethod.irRuleIds().length);
+            } else {
+                return new NotCompiledIRMethod(testMethod.method(), testMethod.irRuleIds().length);
+            }
         }
     }
 }
diff --git a/test/hotspot/jtreg/compiler/lib/ir_framework/driver/irmatching/parser/TestClassParser.java b/test/hotspot/jtreg/compiler/lib/ir_framework/driver/irmatching/parser/TestClassParser.java
index 776642d460c..b6c9920c2d1 100644
--- a/test/hotspot/jtreg/compiler/lib/ir_framework/driver/irmatching/parser/TestClassParser.java
+++ b/test/hotspot/jtreg/compiler/lib/ir_framework/driver/irmatching/parser/TestClassParser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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,11 @@ import java.util.SortedSet;
  */
 public class TestClassParser {
     private final Class<?> testClass;
+    private final boolean allowNotCompilable;
 
-    public TestClassParser(Class<?> testClass) {
+    public TestClassParser(Class<?> testClass, boolean allowNotCompilable) {
         this.testClass = testClass;
+        this.allowNotCompilable = allowNotCompilable;
     }
 
     /**
@@ -68,7 +70,7 @@ public class TestClassParser {
      * with the parsed compilation output from {@link HotSpotPidFileParser}.
      */
     private Matchable createTestClass(TestMethods testMethods, LoggedMethods loggedMethods, VMInfo vmInfo) {
-        IRMethodBuilder irMethodBuilder = new IRMethodBuilder(testMethods, loggedMethods);
+        IRMethodBuilder irMethodBuilder = new IRMethodBuilder(testMethods, loggedMethods, allowNotCompilable);
         SortedSet<IRMethodMatchable> irMethods = irMethodBuilder.build(vmInfo);
         TestFormat.throwIfAnyFailures();
         return new TestClass(irMethods);
diff --git a/test/hotspot/jtreg/compiler/lib/ir_framework/driver/irmatching/report/CompilationOutputBuilder.java b/test/hotspot/jtreg/compiler/lib/ir_framework/driver/irmatching/report/CompilationOutputBuilder.java
index e1c31a45ebb..037da604f4c 100644
--- a/test/hotspot/jtreg/compiler/lib/ir_framework/driver/irmatching/report/CompilationOutputBuilder.java
+++ b/test/hotspot/jtreg/compiler/lib/ir_framework/driver/irmatching/report/CompilationOutputBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@ package compiler.lib.ir_framework.driver.irmatching.report;
 
 import compiler.lib.ir_framework.CompilePhase;
 import compiler.lib.ir_framework.IR;
+import compiler.lib.ir_framework.shared.TestFrameworkException;
 import compiler.lib.ir_framework.driver.irmatching.MatchResult;
 import compiler.lib.ir_framework.driver.irmatching.irrule.checkattribute.CheckAttributeType;
 import compiler.lib.ir_framework.driver.irmatching.irrule.constraint.CountsConstraintFailure;
@@ -121,6 +122,11 @@ public class CompilationOutputBuilder implements MatchResultVisitor {
         output.append("<empty>").append(System.lineSeparator());
     }
 
+    @Override
+    public void visitMethodNotCompilable(Method method, int failedIRRules) {
+        throw new TestFrameworkException("Sould not reach here");
+    }
+
     @Override
     public void visitIRRule(AcceptChildren acceptChildren, int irRuleId, IR irAnno) {
         acceptChildren.accept(this);
diff --git a/test/hotspot/jtreg/compiler/lib/ir_framework/driver/irmatching/report/FailCountVisitor.java b/test/hotspot/jtreg/compiler/lib/ir_framework/driver/irmatching/report/FailCountVisitor.java
index 7fe2f5467af..9d1ea6fc408 100644
--- a/test/hotspot/jtreg/compiler/lib/ir_framework/driver/irmatching/report/FailCountVisitor.java
+++ b/test/hotspot/jtreg/compiler/lib/ir_framework/driver/irmatching/report/FailCountVisitor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -63,6 +63,11 @@ class FailCountVisitor implements MatchResultVisitor {
         irRuleCount += failedIRRules;
     }
 
+    @Override
+    public void visitMethodNotCompilable(Method method, int failedIRRules) {
+        irMethodCount++;
+    }
+
     public int getIrRuleCount() {
         return irRuleCount;
     }
diff --git a/test/hotspot/jtreg/compiler/lib/ir_framework/driver/irmatching/report/FailureMessageBuilder.java b/test/hotspot/jtreg/compiler/lib/ir_framework/driver/irmatching/report/FailureMessageBuilder.java
index 3fcb152b699..9cbba83e90b 100644
--- a/test/hotspot/jtreg/compiler/lib/ir_framework/driver/irmatching/report/FailureMessageBuilder.java
+++ b/test/hotspot/jtreg/compiler/lib/ir_framework/driver/irmatching/report/FailureMessageBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@ package compiler.lib.ir_framework.driver.irmatching.report;
 
 import compiler.lib.ir_framework.CompilePhase;
 import compiler.lib.ir_framework.IR;
+import compiler.lib.ir_framework.shared.TestFrameworkException;
 import compiler.lib.ir_framework.driver.irmatching.MatchResult;
 import compiler.lib.ir_framework.driver.irmatching.irrule.checkattribute.CheckAttributeType;
 import compiler.lib.ir_framework.driver.irmatching.irrule.constraint.CountsConstraintFailure;
@@ -97,6 +98,10 @@ public class FailureMessageBuilder implements MatchResultVisitor {
         indentation.sub();
     }
 
+    public void visitMethodNotCompilable(Method method, int failedIRRules) {
+        throw new TestFrameworkException("Sould not reach here");
+    }
+
     @Override
     public void visitIRRule(AcceptChildren acceptChildren, int irRuleId, IR irAnno) {
         indentation.add();
diff --git a/test/hotspot/jtreg/compiler/lib/ir_framework/driver/irmatching/visitor/MatchResultVisitor.java b/test/hotspot/jtreg/compiler/lib/ir_framework/driver/irmatching/visitor/MatchResultVisitor.java
index 6dd0234baae..8191cfd55c0 100644
--- a/test/hotspot/jtreg/compiler/lib/ir_framework/driver/irmatching/visitor/MatchResultVisitor.java
+++ b/test/hotspot/jtreg/compiler/lib/ir_framework/driver/irmatching/visitor/MatchResultVisitor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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 @@ public interface MatchResultVisitor {
     void visitTestClass(AcceptChildren acceptChildren);
     void visitIRMethod(AcceptChildren acceptChildren, Method method, int failedIRRules);
     void visitMethodNotCompiled(Method method, int failedIRRules);
+    void visitMethodNotCompilable(Method method, int failedIRRules);
     void visitIRRule(AcceptChildren acceptChildren, int irRuleId, IR irAnno);
     void visitCompilePhaseIRRule(AcceptChildren acceptChildren, CompilePhase compilePhase, String compilationOutput);
     void visitNoCompilePhaseCompilation(CompilePhase compilePhase);
diff --git a/test/hotspot/jtreg/compiler/lib/ir_framework/shared/TestFrameworkSocket.java b/test/hotspot/jtreg/compiler/lib/ir_framework/shared/TestFrameworkSocket.java
index 7f7aa3f5b32..a3a5f9ece8f 100644
--- a/test/hotspot/jtreg/compiler/lib/ir_framework/shared/TestFrameworkSocket.java
+++ b/test/hotspot/jtreg/compiler/lib/ir_framework/shared/TestFrameworkSocket.java
@@ -44,6 +44,7 @@ public class TestFrameworkSocket implements AutoCloseable {
     public static final String TESTLIST_TAG = "[TESTLIST]";
     public static final String DEFAULT_REGEX_TAG = "[DEFAULT_REGEX]";
     public static final String PRINT_TIMES_TAG = "[PRINT_TIMES]";
+    public static final String NOT_COMPILABLE_TAG = "[NOT_COMPILABLE]";
 
     // Static fields used for test VM only.
     private static final String SERVER_PORT_PROPERTY = "ir.framework.server.port";
diff --git a/test/hotspot/jtreg/compiler/lib/ir_framework/test/AbstractTest.java b/test/hotspot/jtreg/compiler/lib/ir_framework/test/AbstractTest.java
index 9d1bf62746f..4d227900e2e 100644
--- a/test/hotspot/jtreg/compiler/lib/ir_framework/test/AbstractTest.java
+++ b/test/hotspot/jtreg/compiler/lib/ir_framework/test/AbstractTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -32,6 +32,8 @@ import java.lang.reflect.Constructor;
 import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
 
+import compiler.lib.ir_framework.shared.TestFrameworkSocket;
+
 /**
  * Abstract super class for base, checked and custom run tests.
  */
@@ -109,7 +111,21 @@ abstract class AbstractTest {
 
     abstract protected void compileTest();
 
+    private class MethodNotCompilableException extends Exception {}
+
     protected void compileMethod(DeclaredTest test) {
+        try {
+            tryCompileMethod(test);
+        } catch (MethodNotCompilableException e) {
+            final Method testMethod = test.getTestMethod();
+            TestFrameworkSocket.write("Method not compilable: " + testMethod, TestFrameworkSocket.NOT_COMPILABLE_TAG, true);
+            TestRun.check(test.isAllowNotCompilable(),
+                          "Method " + testMethod + " not compilable (anymore) at level " + test.getCompLevel() +
+                          ". Most likely, this is not expected, but if it is, you can use 'allowNotCompilable'.");
+        }
+    }
+
+    private void tryCompileMethod(DeclaredTest test) throws MethodNotCompilableException {
         final Method testMethod = test.getTestMethod();
         if (TestFramework.VERBOSE) {
             System.out.println("Compile method " + testMethod + " after warm-up...");
@@ -151,10 +167,11 @@ abstract class AbstractTest {
         checkCompilationLevel(test);
     }
 
-    private void enqueueMethodForCompilation(DeclaredTest test) {
+    private void enqueueMethodForCompilation(DeclaredTest test) throws MethodNotCompilableException {
         final Method testMethod = test.getTestMethod();
-        TestRun.check(WHITE_BOX.isMethodCompilable(testMethod, test.getCompLevel().getValue(), false),
-                      "Method " + testMethod + " not compilable (anymore) at level " + test.getCompLevel());
+        if (!WHITE_BOX.isMethodCompilable(testMethod, test.getCompLevel().getValue(), false)) {
+            throw new MethodNotCompilableException();
+        }
         TestVM.enqueueForCompilation(testMethod, test.getCompLevel());
     }
 
diff --git a/test/hotspot/jtreg/compiler/lib/ir_framework/test/DeclaredTest.java b/test/hotspot/jtreg/compiler/lib/ir_framework/test/DeclaredTest.java
index d065a04b026..15cd68bd0e3 100644
--- a/test/hotspot/jtreg/compiler/lib/ir_framework/test/DeclaredTest.java
+++ b/test/hotspot/jtreg/compiler/lib/ir_framework/test/DeclaredTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -36,13 +36,15 @@ public class DeclaredTest {
     private final ArgumentsProvider argumentsProvider;
     private final int warmupIterations;
     private final CompLevel compLevel;
+    private final boolean allowNotCompilable;
     private Method attachedMethod;
 
-    public DeclaredTest(Method testMethod, ArgumentsProvider argumentsProvider, CompLevel compLevel, int warmupIterations) {
+    public DeclaredTest(Method testMethod, ArgumentsProvider argumentsProvider, CompLevel compLevel, int warmupIterations, boolean allowNotCompilable) {
         // Make sure we can also call non-public or public methods in package private classes
         testMethod.setAccessible(true);
         this.testMethod = testMethod;
         this.compLevel = compLevel;
+        this.allowNotCompilable = allowNotCompilable;
         this.argumentsProvider = argumentsProvider;
         this.warmupIterations = warmupIterations;
         this.attachedMethod = null;
@@ -60,6 +62,10 @@ public class DeclaredTest {
         return warmupIterations;
     }
 
+    public boolean isAllowNotCompilable() {
+        return allowNotCompilable;
+    }
+
     public Object[] getArguments(Object invocationTarget, int invocationCounter) {
         return argumentsProvider.getArguments(invocationTarget, invocationCounter);
     }
diff --git a/test/hotspot/jtreg/compiler/lib/ir_framework/test/TestVM.java b/test/hotspot/jtreg/compiler/lib/ir_framework/test/TestVM.java
index e4f49d494d2..8ccd0faa013 100644
--- a/test/hotspot/jtreg/compiler/lib/ir_framework/test/TestVM.java
+++ b/test/hotspot/jtreg/compiler/lib/ir_framework/test/TestVM.java
@@ -75,6 +75,7 @@ public class TestVM {
      */
     public static final int WARMUP_ITERATIONS = Integer.parseInt(System.getProperty("Warmup", "2000"));
 
+    private static final boolean ALLOW_METHOD_NOT_COMPILABLE = Boolean.getBoolean("AllowNotCompilable");
     private static final boolean TIERED_COMPILATION = (Boolean)WHITE_BOX.getVMFlag("TieredCompilation");
     private static final CompLevel TIERED_COMPILATION_STOP_AT_LEVEL;
     private static final boolean CLIENT_VM = Platform.isClient();
@@ -579,8 +580,9 @@ public class TestVM {
         if (EXCLUDE_RANDOM) {
             compLevel = compLevel.excludeCompilationRandomly(m);
         }
+        boolean allowNotCompilable = testAnno.allowNotCompilable() || ALLOW_METHOD_NOT_COMPILABLE;
         ArgumentsProvider argumentsProvider = ArgumentsProviderBuilder.build(m, setupMethodMap);
-        DeclaredTest test = new DeclaredTest(m, argumentsProvider, compLevel, warmupIterations);
+        DeclaredTest test = new DeclaredTest(m, argumentsProvider, compLevel, warmupIterations, allowNotCompilable);
         declaredTests.put(m, test);
         testMethodMap.put(m.getName(), m);
     }
diff --git a/test/hotspot/jtreg/testlibrary_tests/ir_framework/tests/TestNotCompilable.java b/test/hotspot/jtreg/testlibrary_tests/ir_framework/tests/TestNotCompilable.java
new file mode 100644
index 00000000000..760fc579910
--- /dev/null
+++ b/test/hotspot/jtreg/testlibrary_tests/ir_framework/tests/TestNotCompilable.java
@@ -0,0 +1,205 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package ir_framework.tests;
+
+import compiler.lib.ir_framework.*;
+import compiler.lib.ir_framework.shared.TestRunException;
+import compiler.lib.ir_framework.driver.TestVMException;
+import compiler.lib.ir_framework.driver.irmatching.IRViolationException;
+
+/*
+ * @test
+ * @requires vm.compiler2.enabled & vm.flagless
+ * @summary Test the functionality of allowNotCompilable.
+ * @library /test/lib /
+ * @run driver ir_framework.tests.TestNotCompilable
+ */
+
+public class TestNotCompilable {
+    public static void main(String[] args) throws Exception {
+        runTests(false);
+        runTests(true);
+    }
+
+    private static void runTests(boolean noWarmup) {
+        // Run without any flags -> should pass.
+        runNormal(TestClassA.class, noWarmup);
+        runNormal(TestClassB.class, noWarmup);
+        runNormal(TestClassC.class, noWarmup);
+        runNormal(TestClassD.class, noWarmup);
+        runNormal(TestClassE.class, noWarmup);
+        runNormal(TestClassF.class, noWarmup);
+
+        // Forbid compilation -> should throw exception, because "not compilable".
+        runWithExcludeExpectFailure(TestClassA.class, noWarmup);
+        runWithExcludeExpectFailure(TestClassB.class, noWarmup);
+        // Note: @Run does not fail, but the @IR detects that there is no compilation, and fails.
+        runWithExcludeExpectFailure(TestClassE.class, noWarmup);
+        runOptoNoExecuteExpectFailure(TestClassA.class, noWarmup);
+        runOptoNoExecuteExpectFailure(TestClassB.class, noWarmup);
+
+        // Forbid compilation -> annotation allows not compilable -> should pass.
+        runWithExcludeExpectSuccess(TestClassC.class, noWarmup);
+        runWithExcludeExpectSuccess(TestClassD.class, noWarmup);
+        runWithExcludeExpectSuccess(TestClassF.class, noWarmup);
+        runOptoNoExecuteExpectSuccess(TestClassC.class, noWarmup);
+        runOptoNoExecuteExpectSuccess(TestClassD.class, noWarmup);
+        // Note: @Run does not fail because of missing compilation. And OptoNoExecute does still
+        //       print IR before it bails out, and we can successfully match it.
+        runOptoNoExecuteExpectSuccess(TestClassE.class, noWarmup);
+        runOptoNoExecuteExpectSuccess(TestClassF.class, noWarmup);
+
+        // Forbid compilation, but allow methods not to compile -> should pass.
+        runWithExcludeAndGlobalAllowNotCompilable(TestClassA.class, noWarmup);
+        runWithExcludeAndGlobalAllowNotCompilable(TestClassB.class, noWarmup);
+        runWithExcludeAndGlobalAllowNotCompilable(TestClassC.class, noWarmup);
+        runWithExcludeAndGlobalAllowNotCompilable(TestClassD.class, noWarmup);
+        runWithExcludeAndGlobalAllowNotCompilable(TestClassE.class, noWarmup);
+        runWithExcludeAndGlobalAllowNotCompilable(TestClassF.class, noWarmup);
+        runOptoNoExecuteAndGlobalAllowNotCompilable(TestClassA.class, noWarmup);
+        runOptoNoExecuteAndGlobalAllowNotCompilable(TestClassB.class, noWarmup);
+        runOptoNoExecuteAndGlobalAllowNotCompilable(TestClassC.class, noWarmup);
+        runOptoNoExecuteAndGlobalAllowNotCompilable(TestClassD.class, noWarmup);
+        runOptoNoExecuteAndGlobalAllowNotCompilable(TestClassE.class, noWarmup);
+        runOptoNoExecuteAndGlobalAllowNotCompilable(TestClassF.class, noWarmup);
+    }
+
+    private static void runNormal(Class c, boolean noWarmup) {
+        TestFramework framework = new TestFramework(c);
+        if (noWarmup) { framework.setDefaultWarmup(0); }
+        framework.start();
+    }
+
+    private static void runWithExcludeExpectFailure(Class c, boolean noWarmup) {
+        TestFramework framework = new TestFramework(c);
+        framework.addFlags("-XX:CompileCommand=exclude,*TestClass*::test*");
+        if (noWarmup) { framework.setDefaultWarmup(0); }
+        try {
+            framework.start();
+            throw new RuntimeException("should have thrown TestRunException/TestVMException or IRViolationException");
+        } catch (TestVMException e) {
+            // Happens when we hit the issue during explicit compilation by the Framework.
+        } catch (IRViolationException e) {
+            // Happens in STANDALONE Run case, where the user is responsible for ensuring
+            // compilation. The failure happens during IR matching.
+        }
+    }
+
+    private static void runWithExcludeExpectSuccess(Class c, boolean noWarmup) {
+        TestFramework framework = new TestFramework(c);
+        framework.addFlags("-XX:CompileCommand=exclude,*TestClass*::test*");
+        if (noWarmup) { framework.setDefaultWarmup(0); }
+        framework.start();
+    }
+
+    private static void runOptoNoExecuteExpectFailure(Class c, boolean noWarmup) {
+        System.out.println("runOptoNoExecuteExpectFailure: " + c + ", noWarmup: " + noWarmup);
+        TestFramework framework = new TestFramework(c);
+        framework.addFlags("-XX:CompileCommand=compileonly,*TestClass*::test*", "-XX:+OptoNoExecute");
+        if (noWarmup) { framework.setDefaultWarmup(0); }
+        try {
+            framework.start();
+            throw new RuntimeException("should have thrown TestRunException/TestVMException");
+        } catch (TestVMException e) {}
+    }
+
+    private static void runOptoNoExecuteExpectSuccess(Class c, boolean noWarmup) {
+        TestFramework framework = new TestFramework(c);
+        framework.addFlags("-XX:CompileCommand=compileonly,*TestClass*::test*", "-XX:+OptoNoExecute");
+        if (noWarmup) { framework.setDefaultWarmup(0); }
+        framework.start();
+    }
+
+    private static void runWithExcludeAndGlobalAllowNotCompilable(Class c, boolean noWarmup) {
+        TestFramework framework = new TestFramework(c);
+        framework.addFlags("-XX:CompileCommand=exclude,*TestClass*::test*");
+        if (noWarmup) { framework.setDefaultWarmup(0); }
+        framework.allowNotCompilable();
+        framework.start();
+    }
+
+    private static void runOptoNoExecuteAndGlobalAllowNotCompilable(Class c, boolean noWarmup) {
+        TestFramework framework = new TestFramework(c);
+        framework.addFlags("-XX:CompileCommand=compileonly,*TestClass*::test*", "-XX:+OptoNoExecute");
+        if (noWarmup) { framework.setDefaultWarmup(0); }
+        framework.allowNotCompilable();
+        framework.start();
+    }
+}
+
+class TestClassA {
+    @Test
+    public void test() {}
+}
+
+class TestClassB {
+    @Test
+    @IR(failOn = IRNode.LOAD)
+    public void test() {}
+}
+
+class TestClassC {
+    @Test(allowNotCompilable = true)
+    public void test() {}
+}
+
+class TestClassD {
+    @Test(allowNotCompilable = true)
+    @IR(failOn = IRNode.LOAD)
+    public void test() {}
+}
+
+class TestClassE {
+    @Run(test = {"test1", "test2"}, mode = RunMode.STANDALONE)
+    public void run() {
+        for (int i = 0; i < 10_000; i++) {
+            test1(i);
+            test2(i);
+        }
+    }
+
+    @Test
+    public void test1(int i) {}
+
+    @Test
+    @IR(failOn = IRNode.LOAD)
+    public void test2(int i) {}
+}
+
+class TestClassF {
+    @Run(test = {"test1", "test2"}, mode = RunMode.STANDALONE)
+    public void run() {
+        for (int i = 0; i < 10_000; i++) {
+            test1(i);
+            test2(i);
+        }
+    }
+
+    @Test(allowNotCompilable = true)
+    public void test1(int i) {}
+
+    @Test(allowNotCompilable = true)
+    @IR(failOn = IRNode.LOAD)
+    public void test2(int i) {}
+}
diff --git a/test/hotspot/jtreg/testlibrary_tests/ir_framework/tests/TestPhaseIRMatching.java b/test/hotspot/jtreg/testlibrary_tests/ir_framework/tests/TestPhaseIRMatching.java
index 3c4b769eaae..ca0e37de166 100644
--- a/test/hotspot/jtreg/testlibrary_tests/ir_framework/tests/TestPhaseIRMatching.java
+++ b/test/hotspot/jtreg/testlibrary_tests/ir_framework/tests/TestPhaseIRMatching.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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,8 +66,8 @@ public class TestPhaseIRMatching {
         List<String> noAdditionalFlags = new ArrayList<>();
         FlagVMProcess flagVMProcess = new FlagVMProcess(testClass, noAdditionalFlags);
         List<String> testVMFlags = flagVMProcess.getTestVMFlags();
-        TestVMProcess testVMProcess = new TestVMProcess(testVMFlags, testClass, null, -1, false);
-        TestClassParser testClassParser = new TestClassParser(testClass);
+        TestVMProcess testVMProcess = new TestVMProcess(testVMFlags, testClass, null, -1, false, false);
+        TestClassParser testClassParser = new TestClassParser(testClass, false);
         Matchable testClassMatchable = testClassParser.parse(testVMProcess.getHotspotPidFileName(),
                                                              testVMProcess.getIrEncoding());
         MatchResult result = testClassMatchable.match();
@@ -398,6 +398,11 @@ class FailureBuilder implements MatchResultVisitor {
         failures.add(new Failure(methodName, -1, CompilePhase.DEFAULT, CheckAttributeType.FAIL_ON, -1));
     }
 
+    @Override
+    public void visitMethodNotCompilable(Method method, int failedIRRules) {
+        throw new RuntimeException("No test should bailout from compilation");
+    }
+
     @Override
     public void visitIRRule(AcceptChildren acceptChildren, int irRuleId, IR irAnno) {
         ruleId = irRuleId;

From 96305e0953a2a3b41bc32b1c584a1a29901a37fd Mon Sep 17 00:00:00 2001
From: Prasanta Sadhukhan <psadhukhan@openjdk.org>
Date: Thu, 20 Mar 2025 09:28:57 +0000
Subject: [PATCH 410/587] 4466930: JTable.selectAll boundary handling

Reviewed-by: abhiscxk, tr
---
 .../share/classes/javax/swing/JTable.java     |  70 +++++++-----
 .../swing/JTable/TestTableSelectAll.java      | 107 ++++++++++++++++++
 2 files changed, 148 insertions(+), 29 deletions(-)
 create mode 100644 test/jdk/javax/swing/JTable/TestTableSelectAll.java

diff --git a/src/java.desktop/share/classes/javax/swing/JTable.java b/src/java.desktop/share/classes/javax/swing/JTable.java
index 77d787172cf..3760bdac9ee 100644
--- a/src/java.desktop/share/classes/javax/swing/JTable.java
+++ b/src/java.desktop/share/classes/javax/swing/JTable.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -2146,42 +2146,54 @@ public class JTable extends JComponent implements TableModelListener, Scrollable
         return getRowSelectionAllowed() && getColumnSelectionAllowed();
     }
 
+    private void selectRows(int rowCount) {
+        ListSelectionModel selModel = selectionModel;
+        selModel.setValueIsAdjusting(true);
+        int oldLead = getAdjustedIndex(selModel.getLeadSelectionIndex(), true);
+        int oldAnchor = getAdjustedIndex(selModel.getAnchorSelectionIndex(), true);
+
+        setRowSelectionInterval(0, rowCount - 1);
+
+        // this is done to restore the anchor and lead
+        SwingUtilities2.setLeadAnchorWithoutSelection(selModel, oldLead, oldAnchor);
+
+        selModel.setValueIsAdjusting(false);
+    }
+
+    private void selectColumns(int columnCount) {
+        ListSelectionModel selModel = columnModel.getSelectionModel();
+        selModel.setValueIsAdjusting(true);
+        int oldLead = getAdjustedIndex(selModel.getLeadSelectionIndex(), false);
+        int oldAnchor = getAdjustedIndex(selModel.getAnchorSelectionIndex(), false);
+
+        setColumnSelectionInterval(0, columnCount - 1);
+
+        // this is done to restore the anchor and lead
+        SwingUtilities2.setLeadAnchorWithoutSelection(selModel, oldLead, oldAnchor);
+
+        selModel.setValueIsAdjusting(false);
+    }
+
     /**
      *  Selects all rows, columns, and cells in the table.
      */
     public void selectAll() {
+        int rowCount = getRowCount();
+        int columnCount = getColumnCount();
+
         // If I'm currently editing, then I should stop editing
         if (isEditing()) {
             removeEditor();
         }
-        if (getRowCount() > 0 && getColumnCount() > 0) {
-            int oldLead;
-            int oldAnchor;
-            ListSelectionModel selModel;
-
-            selModel = selectionModel;
-            selModel.setValueIsAdjusting(true);
-            oldLead = getAdjustedIndex(selModel.getLeadSelectionIndex(), true);
-            oldAnchor = getAdjustedIndex(selModel.getAnchorSelectionIndex(), true);
-
-            setRowSelectionInterval(0, getRowCount()-1);
-
-            // this is done to restore the anchor and lead
-            SwingUtilities2.setLeadAnchorWithoutSelection(selModel, oldLead, oldAnchor);
-
-            selModel.setValueIsAdjusting(false);
-
-            selModel = columnModel.getSelectionModel();
-            selModel.setValueIsAdjusting(true);
-            oldLead = getAdjustedIndex(selModel.getLeadSelectionIndex(), false);
-            oldAnchor = getAdjustedIndex(selModel.getAnchorSelectionIndex(), false);
-
-            setColumnSelectionInterval(0, getColumnCount()-1);
-
-            // this is done to restore the anchor and lead
-            SwingUtilities2.setLeadAnchorWithoutSelection(selModel, oldLead, oldAnchor);
-
-            selModel.setValueIsAdjusting(false);
+        if (rowCount > 0 && columnCount > 0) {
+            selectRows(rowCount);
+            selectColumns(columnCount);
+        } else if (rowCount > 0 && columnCount == 0
+                   && getRowSelectionAllowed()) {
+            selectRows(rowCount);
+        } else if (columnCount > 0  && rowCount == 0
+                   && getColumnSelectionAllowed()) {
+            selectColumns(columnCount);
         }
     }
 
diff --git a/test/jdk/javax/swing/JTable/TestTableSelectAll.java b/test/jdk/javax/swing/JTable/TestTableSelectAll.java
new file mode 100644
index 00000000000..26fb86648d5
--- /dev/null
+++ b/test/jdk/javax/swing/JTable/TestTableSelectAll.java
@@ -0,0 +1,107 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact 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 4466930
+ * @summary Verifies selectAll selects all available rows and columns
+ *          irrespective of presence of columns and rows respectively
+ * @run main TestTableSelectAll
+ */
+
+import javax.swing.JTable;
+import javax.swing.table.DefaultTableModel;
+
+public class TestTableSelectAll {
+
+    public static void main(String[] args) throws Exception {
+
+        testColumnSelect();
+        testRowSelect();
+    }
+
+    private static void testColumnSelect() {
+        boolean colSelNoRow;
+        boolean colSelWithRow;
+
+        // TableModel with no rows, but 10 columns
+        DefaultTableModel data = new DefaultTableModel(0, 10);
+
+        JTable table = new JTable(data);
+
+        // columns can be selected
+        table.setColumnSelectionAllowed(true);
+        table.setRowSelectionAllowed(false);
+
+        table.selectAll();
+
+        colSelNoRow = table.isColumnSelected(0);
+
+        // After selectAll(), I would expect all columns to be selected, no matter
+        // whether there are rows or not.
+        System.out.println("Column 0 is selected: " + colSelNoRow);
+
+        data.addRow(new Object[0]);
+
+        table.selectAll();
+
+        colSelWithRow = table.isColumnSelected(0);
+        System.out.println("Column 0 is selected: " + colSelWithRow);
+
+        if (!(colSelNoRow && colSelWithRow)) {
+            throw new RuntimeException("selectAll did not select column");
+        }
+    }
+
+    private static void testRowSelect() {
+        boolean rowSelNoColumn;
+        boolean rowSelWithColumn;
+
+        // TableModel with 10 rows, but no columns
+        DefaultTableModel data = new DefaultTableModel(10, 0);
+
+        JTable table = new JTable(data);
+
+        // rows can be selected
+        table.setRowSelectionAllowed(true);
+        table.setColumnSelectionAllowed(false);
+
+        table.selectAll();
+
+        rowSelNoColumn = table.isRowSelected(0);
+
+        // After selectAll(), I would expect all rows to be selected, no matter
+        // whether there are columns or not.
+        System.out.println("Row 0 is selected: " + rowSelNoColumn);
+
+        data.addColumn(new Object[0]);
+        table.selectAll();
+
+        rowSelWithColumn = table.isRowSelected(0);
+        System.out.println("Row 0 is selected: " + rowSelWithColumn);
+
+        if (!(rowSelNoColumn && rowSelWithColumn)) {
+            throw new RuntimeException("selectAll did not select row");
+        }
+    }
+}

From 73177d9c53ba02e9c358991774023619afe8379a Mon Sep 17 00:00:00 2001
From: Casper Norrbin <cnorrbin@openjdk.org>
Date: Thu, 20 Mar 2025 12:26:14 +0000
Subject: [PATCH 411/587] 8347734: Turning off PerfData logging doesn't work

Reviewed-by: dholmes, coleenp
---
 .../share/logging/logConfiguration.cpp        | 30 +++++++++++++++----
 .../share/logging/logConfiguration.hpp        |  9 ++++++
 src/hotspot/share/runtime/arguments.cpp       |  3 +-
 .../gtest/logging/test_logConfiguration.cpp   | 26 ++++++++++++++++
 4 files changed, 61 insertions(+), 7 deletions(-)

diff --git a/src/hotspot/share/logging/logConfiguration.cpp b/src/hotspot/share/logging/logConfiguration.cpp
index 194bd622b15..662c1f1c2bb 100644
--- a/src/hotspot/share/logging/logConfiguration.cpp
+++ b/src/hotspot/share/logging/logConfiguration.cpp
@@ -336,11 +336,9 @@ void LogConfiguration::disable_logging() {
   notify_update_listeners();
 }
 
-void LogConfiguration::configure_stdout(LogLevelType level, int exact_match, ...) {
+LogSelectionList LogConfiguration::create_selection_list(LogLevelType level, int exact_match, va_list ap) {
   size_t i;
-  va_list ap;
   LogTagType tags[LogTag::MaxTags];
-  va_start(ap, exact_match);
   for (i = 0; i < LogTag::MaxTags; i++) {
     LogTagType tag = static_cast<LogTagType>(va_arg(ap, int));
     tags[i] = tag;
@@ -351,12 +349,32 @@ void LogConfiguration::configure_stdout(LogLevelType level, int exact_match, ...
   }
   assert(i < LogTag::MaxTags || static_cast<LogTagType>(va_arg(ap, int)) == LogTag::__NO_TAG,
          "Too many tags specified! Can only have up to %zu tags in a tag set.", LogTag::MaxTags);
-  va_end(ap);
 
   LogSelection selection(tags, !exact_match, level);
   assert(selection.tag_sets_selected() > 0,
-         "configure_stdout() called with invalid/non-existing log selection");
-  LogSelectionList list(selection);
+         "create_selection_list() called with invalid/non-existing log selection");
+  return LogSelectionList(selection);
+}
+
+void LogConfiguration::disable_tags(int exact_match, ...) {
+  va_list ap;
+  va_start(ap, exact_match);
+  LogSelectionList list = create_selection_list(LogLevel::Off, exact_match, ap);
+  va_end(ap);
+
+  // Apply configuration to all outputs, with the same decorators as before.
+  ConfigurationLock cl;
+  for (size_t i = 0; i < _n_outputs; i++) {
+    configure_output(i, list, _outputs[i]->decorators());
+  }
+  notify_update_listeners();
+}
+
+void LogConfiguration::configure_stdout(LogLevelType level, int exact_match, ...) {
+  va_list ap;
+  va_start(ap, exact_match);
+  LogSelectionList list = create_selection_list(level, exact_match, ap);
+  va_end(ap);
 
   // Apply configuration to stdout (output #0), with the same decorators as before.
   ConfigurationLock cl;
diff --git a/src/hotspot/share/logging/logConfiguration.hpp b/src/hotspot/share/logging/logConfiguration.hpp
index 840f6a9af57..6e84199fdde 100644
--- a/src/hotspot/share/logging/logConfiguration.hpp
+++ b/src/hotspot/share/logging/logConfiguration.hpp
@@ -97,6 +97,8 @@ private:
   static void describe_available(outputStream* out);
   static void describe_current_configuration(outputStream* out);
 
+  // Create a LogSelectionList given a level and a set of tags
+  static LogSelectionList create_selection_list(LogLevelType level, int exact_match, va_list ap);
 
  public:
   // Initialization and finalization of log configuration, to be run at vm startup and shutdown respectively.
@@ -109,6 +111,13 @@ private:
   // Disable all logging, equivalent to -Xlog:disable.
   static void disable_logging();
 
+  // Disables logging on all outputs for the given tags.
+  // If exact_match is true, only tagsets with precisely the specified tags will be disabled
+  // (exact_match=false is the same as "-Xlog:<tags>*=off", and exact_match=true is "-Xlog:<tags>=off").
+  // Tags should be specified using the LOG_TAGS macro, e.g.
+  // LogConfiguration::disable_tags(<true/false>, LOG_TAGS(<tags>));
+  static void disable_tags(int exact_match, ...);
+
   // Configures logging on stdout for the given tags and level combination.
   // Intended for mappings between -XX: flags and Unified Logging configuration.
   // If exact_match is true, only tagsets with precisely the specified tags will be configured
diff --git a/src/hotspot/share/runtime/arguments.cpp b/src/hotspot/share/runtime/arguments.cpp
index c6651c46e02..8de6f427c3f 100644
--- a/src/hotspot/share/runtime/arguments.cpp
+++ b/src/hotspot/share/runtime/arguments.cpp
@@ -3800,7 +3800,8 @@ jint Arguments::apply_ergo() {
   if (log_is_enabled(Info, perf, class, link)) {
     if (!UsePerfData) {
       warning("Disabling -Xlog:perf+class+link since UsePerfData is turned off.");
-      LogConfiguration::configure_stdout(LogLevel::Off, false, LOG_TAGS(perf, class, link));
+      LogConfiguration::disable_tags(false, LOG_TAGS(perf, class, link));
+      assert(!log_is_enabled(Info, perf, class, link), "sanity");
     }
   }
 
diff --git a/test/hotspot/gtest/logging/test_logConfiguration.cpp b/test/hotspot/gtest/logging/test_logConfiguration.cpp
index 918c1c71cad..c5b15d2ac63 100644
--- a/test/hotspot/gtest/logging/test_logConfiguration.cpp
+++ b/test/hotspot/gtest/logging/test_logConfiguration.cpp
@@ -216,6 +216,32 @@ TEST_VM_F(LogConfigurationTest, disable_output) {
   }
 }
 
+TEST_VM_F(LogConfigurationTest, disable_tags) {
+  set_log_config("stdout", "logging*=info");
+  set_log_config(TestLogFileName, "logging*=info");
+
+  EXPECT_TRUE(log_is_enabled(Info, logging, gc));
+  LogConfiguration::disable_tags(true, LOG_TAGS(logging, gc));
+  EXPECT_FALSE(log_is_enabled(Info, logging, gc));
+  EXPECT_TRUE(log_is_enabled(Info, logging));
+
+  set_log_config("stdout", "logging*=info");
+  set_log_config(TestLogFileName, "logging*=info");
+
+  EXPECT_TRUE(log_is_enabled(Info, logging));
+  LogConfiguration::disable_tags(true, LOG_TAGS(logging));
+  EXPECT_TRUE(log_is_enabled(Info, logging, gc));
+  EXPECT_FALSE(log_is_enabled(Info, logging));
+
+  set_log_config("stdout", "logging*=info");
+  set_log_config(TestLogFileName, "logging*=info");
+
+  EXPECT_TRUE(log_is_enabled(Info, logging));
+  LogConfiguration::disable_tags(false, LOG_TAGS(logging));
+  EXPECT_FALSE(log_is_enabled(Info, logging, gc));
+  EXPECT_FALSE(log_is_enabled(Info, logging));
+}
+
 // Test reconfiguration of the selected decorators for an output
 TEST_VM_F(LogConfigurationTest, reconfigure_decorators) {
   // Configure stderr with all decorators

From 2560a63773ad8223e42d3ecf5bdcaaec30b001ee Mon Sep 17 00:00:00 2001
From: Christian Hagedorn <chagedorn@openjdk.org>
Date: Thu, 20 Mar 2025 12:32:22 +0000
Subject: [PATCH 412/587] 8352131: [REDO] C2: Print compilation bailouts with
 PrintCompilation compile command

Reviewed-by: thartmann, kvn, epeter
---
 src/hotspot/share/compiler/compileBroker.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/hotspot/share/compiler/compileBroker.cpp b/src/hotspot/share/compiler/compileBroker.cpp
index c34d9eb785e..bbdb3a536dd 100644
--- a/src/hotspot/share/compiler/compileBroker.cpp
+++ b/src/hotspot/share/compiler/compileBroker.cpp
@@ -2340,7 +2340,6 @@ void CompileBroker::invoke_compiler_on_method(CompileTask* task) {
       }
     }
 
-    DirectivesStack::release(directive);
 
     if (!ci_env.failing() && !task->is_success()) {
       assert(ci_env.failure_reason() != nullptr, "expect failure reason");
@@ -2374,7 +2373,7 @@ void CompileBroker::invoke_compiler_on_method(CompileTask* task) {
     if (CompilationLog::log() != nullptr) {
       CompilationLog::log()->log_failure(thread, task, failure_reason, retry_message);
     }
-    if (PrintCompilation) {
+    if (PrintCompilation || directive->PrintCompilationOption) {
       FormatBufferResource msg = retry_message != nullptr ?
         FormatBufferResource("COMPILE SKIPPED: %s (%s)", failure_reason, retry_message) :
         FormatBufferResource("COMPILE SKIPPED: %s",      failure_reason);
@@ -2382,6 +2381,8 @@ void CompileBroker::invoke_compiler_on_method(CompileTask* task) {
     }
   }
 
+  DirectivesStack::release(directive);
+
   methodHandle method(thread, task->method());
 
   DTRACE_METHOD_COMPILE_END_PROBE(method, compiler_name(task_level), task->is_success());

From 91836e181a789ef16e8d70bfde4c040e6f5031db Mon Sep 17 00:00:00 2001
From: Jiangli Zhou <jiangli@openjdk.org>
Date: Thu, 20 Mar 2025 15:09:03 +0000
Subject: [PATCH 413/587] 8352276: Skip jtreg tests using native executable
 with libjvm.so/libjli.so dependencies on static JDK

Reviewed-by: dholmes
---
 test/hotspot/jtreg/runtime/StackGap/TestStackGap.java            | 1 +
 .../jtreg/runtime/StackGuardPages/TestStackGuardPages.java       | 1 +
 test/hotspot/jtreg/runtime/TLS/TestTLS.java                      | 1 +
 .../jtreg/runtime/jni/daemonDestroy/TestDaemonDestroy.java       | 1 +
 .../runtime/jni/getCreatedJavaVMs/TestGetCreatedJavaVMs.java     | 1 +
 .../java/lang/reflect/exeCallerAccessTest/CallerAccessTest.java  | 1 +
 test/jdk/jni/nullCaller/NullCallerTest.java                      | 1 +
 test/jdk/tools/launcher/JniInvocationTest.java                   | 1 +
 8 files changed, 8 insertions(+)

diff --git a/test/hotspot/jtreg/runtime/StackGap/TestStackGap.java b/test/hotspot/jtreg/runtime/StackGap/TestStackGap.java
index 94f30d5f9b3..12d5c35b8bd 100644
--- a/test/hotspot/jtreg/runtime/StackGap/TestStackGap.java
+++ b/test/hotspot/jtreg/runtime/StackGap/TestStackGap.java
@@ -27,6 +27,7 @@
  * @modules java.base/jdk.internal.misc
  * @library /test/lib
  * @requires os.family == "linux"
+ * @requires !jdk.static
  * @compile T.java
  * @run main/native TestStackGap
  */
diff --git a/test/hotspot/jtreg/runtime/StackGuardPages/TestStackGuardPages.java b/test/hotspot/jtreg/runtime/StackGuardPages/TestStackGuardPages.java
index a9149a2e6c2..2dfb18447f1 100644
--- a/test/hotspot/jtreg/runtime/StackGuardPages/TestStackGuardPages.java
+++ b/test/hotspot/jtreg/runtime/StackGuardPages/TestStackGuardPages.java
@@ -27,6 +27,7 @@
  * @modules java.base/jdk.internal.misc
  * @library /test/lib
  * @requires os.family == "linux"
+ * @requires !jdk.static
  * @compile DoOverflow.java
  * @run main/native TestStackGuardPages
  */
diff --git a/test/hotspot/jtreg/runtime/TLS/TestTLS.java b/test/hotspot/jtreg/runtime/TLS/TestTLS.java
index eb9262f4453..2f9a559448b 100644
--- a/test/hotspot/jtreg/runtime/TLS/TestTLS.java
+++ b/test/hotspot/jtreg/runtime/TLS/TestTLS.java
@@ -28,6 +28,7 @@
  * @modules java.base/jdk.internal.misc
  * @library /test/lib
  * @requires os.family == "linux"
+ * @requires !jdk.static
  * @compile T.java
  * @run main/native TestTLS
  */
diff --git a/test/hotspot/jtreg/runtime/jni/daemonDestroy/TestDaemonDestroy.java b/test/hotspot/jtreg/runtime/jni/daemonDestroy/TestDaemonDestroy.java
index eb5769acc21..f74b7ed7ad9 100644
--- a/test/hotspot/jtreg/runtime/jni/daemonDestroy/TestDaemonDestroy.java
+++ b/test/hotspot/jtreg/runtime/jni/daemonDestroy/TestDaemonDestroy.java
@@ -29,6 +29,7 @@
  *          a daemon and non-daemon thread. The result should be the same in
  *          both cases.
  * @requires vm.flagless
+ * @requires !jdk.static
  * @library /test/lib
  * @build Main
  * @run main/native TestDaemonDestroy
diff --git a/test/hotspot/jtreg/runtime/jni/getCreatedJavaVMs/TestGetCreatedJavaVMs.java b/test/hotspot/jtreg/runtime/jni/getCreatedJavaVMs/TestGetCreatedJavaVMs.java
index a84f6d7b327..c80fdea70fa 100644
--- a/test/hotspot/jtreg/runtime/jni/getCreatedJavaVMs/TestGetCreatedJavaVMs.java
+++ b/test/hotspot/jtreg/runtime/jni/getCreatedJavaVMs/TestGetCreatedJavaVMs.java
@@ -25,6 +25,7 @@
  * @test
  * @library /test/lib
  * @requires os.family != "Windows"
+ * @requires !jdk.static
  * @run driver TestGetCreatedJavaVMs
  */
 import jdk.test.lib.Utils;
diff --git a/test/jdk/java/lang/reflect/exeCallerAccessTest/CallerAccessTest.java b/test/jdk/java/lang/reflect/exeCallerAccessTest/CallerAccessTest.java
index 749133bb581..bcd77af9ead 100644
--- a/test/jdk/java/lang/reflect/exeCallerAccessTest/CallerAccessTest.java
+++ b/test/jdk/java/lang/reflect/exeCallerAccessTest/CallerAccessTest.java
@@ -26,6 +26,7 @@
  * @test
  * @bug 8221530 8221642
  * @library /test/lib
+ * @requires !jdk.static
  * @run main/native CallerAccessTest
  */
 
diff --git a/test/jdk/jni/nullCaller/NullCallerTest.java b/test/jdk/jni/nullCaller/NullCallerTest.java
index 2e54760ace0..1ba6d6f0add 100644
--- a/test/jdk/jni/nullCaller/NullCallerTest.java
+++ b/test/jdk/jni/nullCaller/NullCallerTest.java
@@ -28,6 +28,7 @@
  * @summary Test uses custom launcher that starts VM using JNI that verifies
  *          various API called with a null caller class function properly.
  * @library /test/lib
+ * @requires !jdk.static
  * @modules java.base/jdk.internal.module
  *          jdk.compiler
  * @build NullCallerTest
diff --git a/test/jdk/tools/launcher/JniInvocationTest.java b/test/jdk/tools/launcher/JniInvocationTest.java
index 56b95ca0d70..e18dc8b137d 100644
--- a/test/jdk/tools/launcher/JniInvocationTest.java
+++ b/test/jdk/tools/launcher/JniInvocationTest.java
@@ -27,6 +27,7 @@
  * @bug 8213362
  * @comment Test uses custom launcher that starts VM using JNI via libjli, only for MacOS
  * @requires os.family == "mac"
+ * @requires !jdk.static
  * @library /test/lib
  * @run main/native JniInvocationTest
  */

From 9a17a6ff0f7b53e9d87bf5db85399aabeb2582c8 Mon Sep 17 00:00:00 2001
From: Jan Lahoda <jlahoda@openjdk.org>
Date: Thu, 20 Mar 2025 15:17:10 +0000
Subject: [PATCH 414/587] 8350749: Upgrade JLine to 3.29.0

Reviewed-by: liach
---
 .../internal/org/jline/reader/LineReader.java |  7 +-
 .../jline/reader/UserInterruptException.java  |  5 ++
 .../jline/reader/impl/DefaultHighlighter.java |  8 ++
 .../org/jline/reader/impl/LineReaderImpl.java | 15 ++--
 .../impl/completer/SystemCompleter.java       |  9 +-
 .../reader/impl/history/DefaultHistory.java   |  2 +-
 .../org/jline/terminal/TerminalBuilder.java   | 44 ++++++++++
 .../terminal/impl/AbstractPosixTerminal.java  |  9 ++
 .../jline/terminal/impl/AbstractTerminal.java |  8 ++
 .../org/jline/terminal/impl/Diag.java         | 85 +++++++++++++------
 .../org/jline/terminal/impl/exec/ExecPty.java |  2 +-
 .../impl/exec/ExecTerminalProvider.java       |  3 +
 .../org/jline/terminal/impl/ffm/Kernel32.java |  6 +-
 .../impl/ffm/NativeWinSysTerminal.java        |  2 +-
 .../jdk/internal/org/jline/utils/Display.java |  6 +-
 .../org/jline/utils/InputStreamReader.java    |  3 +-
 .../jdk/internal/org/jline/utils/Status.java  |  8 +-
 src/jdk.internal.le/share/legal/jline.md      |  2 +-
 18 files changed, 174 insertions(+), 50 deletions(-)

diff --git a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/LineReader.java b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/LineReader.java
index bc513f5f636..ca1c34ef4ee 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/LineReader.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/LineReader.java
@@ -10,6 +10,7 @@ package jdk.internal.org.jline.reader;
 
 import java.io.File;
 import java.io.InputStream;
+import java.nio.file.Path;
 import java.util.Collection;
 import java.util.Map;
 import java.util.function.IntConsumer;
@@ -766,7 +767,11 @@ public interface LineReader {
 
     void addCommandsInBuffer(Collection<String> commands);
 
-    void editAndAddInBuffer(File file) throws Exception;
+    default void editAndAddInBuffer(File file) throws Exception {
+        editAndAddInBuffer(file != null ? file.toPath() : null);
+    }
+
+    void editAndAddInBuffer(Path file) throws Exception;
 
     String getLastBinding();
 
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/UserInterruptException.java b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/UserInterruptException.java
index 68bec8041fa..e5bc5b3180c 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/UserInterruptException.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/UserInterruptException.java
@@ -19,6 +19,11 @@ public class UserInterruptException extends RuntimeException {
 
     private final String partialLine;
 
+    public UserInterruptException(Throwable cause) {
+        super(cause);
+        this.partialLine = null;
+    }
+
     public UserInterruptException(String partialLine) {
         this.partialLine = partialLine;
     }
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/impl/DefaultHighlighter.java b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/impl/DefaultHighlighter.java
index 55d39efde27..87bf06d0073 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/impl/DefaultHighlighter.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/impl/DefaultHighlighter.java
@@ -38,6 +38,7 @@ public class DefaultHighlighter implements Highlighter {
         int underlineEnd = -1;
         int negativeStart = -1;
         int negativeEnd = -1;
+        boolean first = true;
         String search = reader.getSearchTerm();
         if (search != null && search.length() > 0) {
             underlineStart = buffer.indexOf(search);
@@ -65,6 +66,7 @@ public class DefaultHighlighter implements Highlighter {
         }
 
         AttributedStringBuilder sb = new AttributedStringBuilder();
+        commandStyle(reader, sb, true);
         for (int i = 0; i < buffer.length(); i++) {
             if (i == underlineStart) {
                 sb.style(AttributedStyle::underline);
@@ -77,6 +79,10 @@ public class DefaultHighlighter implements Highlighter {
             }
 
             char c = buffer.charAt(i);
+            if (first && Character.isSpaceChar(c)) {
+                first = false;
+                commandStyle(reader, sb, false);
+            }
             if (c == '\t' || c == '\n') {
                 sb.append(c);
             } else if (c < 32) {
@@ -105,4 +111,6 @@ public class DefaultHighlighter implements Highlighter {
         }
         return sb.toAttributedString();
     }
+
+    protected void commandStyle(LineReader reader, AttributedStringBuilder sb, boolean enable) {}
 }
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/impl/LineReaderImpl.java b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/impl/LineReaderImpl.java
index da69d08b23c..302254ab61f 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/impl/LineReaderImpl.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/impl/LineReaderImpl.java
@@ -10,7 +10,6 @@ package jdk.internal.org.jline.reader.impl;
 
 import java.io.BufferedReader;
 import java.io.File;
-import java.io.FileReader;
 import java.io.FileWriter;
 import java.io.Flushable;
 import java.io.IOError;
@@ -1131,16 +1130,16 @@ public class LineReaderImpl implements LineReader, Flushable {
     }
 
     @Override
-    public void editAndAddInBuffer(File file) throws Exception {
+    public void editAndAddInBuffer(Path file) throws Exception {
         if (isSet(Option.BRACKETED_PASTE)) {
             terminal.writer().write(BRACKETED_PASTE_OFF);
         }
-        Constructor<?> ctor = Class.forName("org.jline.builtins.Nano").getConstructor(Terminal.class, File.class);
-        Editor editor = (Editor) ctor.newInstance(terminal, new File(file.getParent()));
+        Constructor<?> ctor = Class.forName("org.jline.builtins.Nano").getConstructor(Terminal.class, Path.class);
+        Editor editor = (Editor) ctor.newInstance(terminal, file.getParent());
         editor.setRestricted(true);
-        editor.open(Collections.singletonList(file.getName()));
+        editor.open(Collections.singletonList(file.getFileName().toString()));
         editor.run();
-        try (BufferedReader br = new BufferedReader(new FileReader(file))) {
+        try (BufferedReader br = Files.newBufferedReader(file)) {
             String line;
             commandsBuffer.clear();
             while ((line = br.readLine()) != null) {
@@ -3529,7 +3528,7 @@ public class LineReaderImpl implements LineReader, Flushable {
             buf.move(1);
             putString(yankBuffer);
             buf.move(-yankBuffer.length());
-        } else if (yankBuffer.length() != 0) {
+        } else if (!yankBuffer.isEmpty()) {
             if (buf.cursor() < buf.length()) {
                 buf.move(1);
             }
@@ -3547,7 +3546,7 @@ public class LineReaderImpl implements LineReader, Flushable {
                 ;
             putString(yankBuffer);
             buf.move(-yankBuffer.length());
-        } else if (yankBuffer.length() != 0) {
+        } else if (!yankBuffer.isEmpty()) {
             if (buf.cursor() > 0) {
                 buf.move(-1);
             }
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/impl/completer/SystemCompleter.java b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/impl/completer/SystemCompleter.java
index 2fe6f8df492..642cf275142 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/impl/completer/SystemCompleter.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/impl/completer/SystemCompleter.java
@@ -9,6 +9,8 @@
 package jdk.internal.org.jline.reader.impl.completer;
 
 import java.util.*;
+import java.util.function.Function;
+import java.util.stream.Collectors;
 
 import jdk.internal.org.jline.reader.Candidate;
 import jdk.internal.org.jline.reader.Completer;
@@ -24,6 +26,7 @@ import jdk.internal.org.jline.utils.AttributedString;
 public class SystemCompleter implements Completer {
     private Map<String, List<Completer>> completers = new HashMap<>();
     private Map<String, String> aliasCommand = new HashMap<>();
+    private Map<String, String> descriptions = new HashMap<>();
     private StringsCompleter commands;
     private boolean compiled = false;
 
@@ -124,6 +127,10 @@ public class SystemCompleter implements Completer {
     }
 
     public void compile() {
+        compile(s -> new Candidate(AttributedString.stripAnsi(s), s, null, null, null, null, true));
+    }
+
+    public void compile(Function<String, Candidate> candidateBuilder) {
         if (compiled) {
             return;
         }
@@ -139,7 +146,7 @@ public class SystemCompleter implements Completer {
         completers = compiledCompleters;
         Set<String> cmds = new HashSet<>(completers.keySet());
         cmds.addAll(aliasCommand.keySet());
-        commands = new StringsCompleter(cmds);
+        commands = new StringsCompleter(cmds.stream().map(candidateBuilder).collect(Collectors.toList()));
         compiled = true;
     }
 
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/impl/history/DefaultHistory.java b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/impl/history/DefaultHistory.java
index c696b33ba9e..ca275c43c6d 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/impl/history/DefaultHistory.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/reader/impl/history/DefaultHistory.java
@@ -200,7 +200,7 @@ public class DefaultHistory implements History {
     public void write(Path file, boolean incremental) throws IOException {
         Path path = file != null ? file : getPath();
         if (path != null && Files.exists(path)) {
-            path.toFile().delete();
+            Files.deleteIfExists(path);
         }
         internalWrite(path, incremental ? getLastLoaded(path) : 0);
     }
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/TerminalBuilder.java b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/TerminalBuilder.java
index 3b02ec2d8d8..d66b124448e 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/TerminalBuilder.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/TerminalBuilder.java
@@ -209,41 +209,85 @@ public final class TerminalBuilder {
         return this;
     }
 
+    /**
+     * Forces the usage of the give terminal provider.
+     *
+     * @param provider The {@link TerminalProvider}'s name to use when creating the Terminal.
+     * @return The builder.
+     */
     public TerminalBuilder provider(String provider) {
         this.provider = provider;
         return this;
     }
 
+    /**
+     * Sets the list of providers to try when creating the terminal.
+     * If not specified, the system property {@link #PROP_PROVIDERS} will be used if set.
+     * Else, the value {@link #PROP_PROVIDERS_DEFAULT} will be used.
+     *
+     * @param providers The list of {@link TerminalProvider}'s names to check when creating the Terminal.
+     * @return The builder.
+     */
     public TerminalBuilder providers(String providers) {
         this.providers = providers;
         return this;
     }
 
+    /**
+     * Enables or disables the {@link #PROP_PROVIDER_JNA}/{@code jna} terminal provider.
+     * If not specified, the system property {@link #PROP_JNA} will be used if set.
+     * If not specified, the provider will be checked.
+     */
     public TerminalBuilder jna(boolean jna) {
         this.jna = jna;
         return this;
     }
 
+    /**
+     * Enables or disables the {@link #PROP_PROVIDER_JANSI}/{@code jansi} terminal provider.
+     * If not specified, the system property {@link #PROP_JANSI} will be used if set.
+     * If not specified, the provider will be checked.
+     */
     public TerminalBuilder jansi(boolean jansi) {
         this.jansi = jansi;
         return this;
     }
 
+    /**
+     * Enables or disables the {@link #PROP_PROVIDER_JNI}/{@code jni} terminal provider.
+     * If not specified, the system property {@link #PROP_JNI} will be used if set.
+     * If not specified, the provider will be checked.
+     */
     public TerminalBuilder jni(boolean jni) {
         this.jni = jni;
         return this;
     }
 
+    /**
+     * Enables or disables the {@link #PROP_PROVIDER_EXEC}/{@code exec} terminal provider.
+     * If not specified, the system property {@link #PROP_EXEC} will be used if set.
+     * If not specified, the provider will be checked.
+     */
     public TerminalBuilder exec(boolean exec) {
         this.exec = exec;
         return this;
     }
 
+    /**
+     * Enables or disables the {@link #PROP_PROVIDER_FFM}/{@code ffm} terminal provider.
+     * If not specified, the system property {@link #PROP_FFM} will be used if set.
+     * If not specified, the provider will be checked.
+     */
     public TerminalBuilder ffm(boolean ffm) {
         this.ffm = ffm;
         return this;
     }
 
+    /**
+     * Enables or disables the {@link #PROP_PROVIDER_DUMB}/{@code dumb} terminal provider.
+     * If not specified, the system property {@link #PROP_DUMB} will be used if set.
+     * If not specified, the provider will be checked.
+     */
     public TerminalBuilder dumb(boolean dumb) {
         this.dumb = dumb;
         return this;
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/impl/AbstractPosixTerminal.java b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/impl/AbstractPosixTerminal.java
index 5d000d07083..862bf93cd46 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/impl/AbstractPosixTerminal.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/impl/AbstractPosixTerminal.java
@@ -94,4 +94,13 @@ public abstract class AbstractPosixTerminal extends AbstractTerminal {
     public SystemStream getSystemStream() {
         return getPty().getSystemStream();
     }
+
+    @Override
+    public String toString() {
+        return getKind() + "[" + "name='"
+                + name + '\'' + ", pty='"
+                + pty + '\'' + ", type='"
+                + type + '\'' + ", size='"
+                + getSize() + '\'' + ']';
+    }
 }
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/impl/AbstractTerminal.java b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/impl/AbstractTerminal.java
index 2608e2e5f37..34b07048790 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/impl/AbstractTerminal.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/impl/AbstractTerminal.java
@@ -287,4 +287,12 @@ public abstract class AbstractTerminal implements TerminalExt {
     public ColorPalette getPalette() {
         return palette;
     }
+
+    @Override
+    public String toString() {
+        return getKind() + "[" + "name='"
+                + name + '\'' + ", type='"
+                + type + '\'' + ", size='"
+                + getSize() + '\'' + ']';
+    }
 }
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/impl/Diag.java b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/impl/Diag.java
index dc54ea2157d..7b7d17499b6 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/impl/Diag.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/impl/Diag.java
@@ -10,7 +10,7 @@ package jdk.internal.org.jline.terminal.impl;
 
 import java.io.PrintStream;
 import java.nio.charset.StandardCharsets;
-import java.util.ServiceLoader;
+import java.util.Arrays;
 import java.util.concurrent.ForkJoinPool;
 import java.util.concurrent.ForkJoinTask;
 import java.util.concurrent.TimeUnit;
@@ -24,10 +24,26 @@ import jdk.internal.org.jline.utils.OSUtils;
 public class Diag {
 
     public static void main(String[] args) {
-        diag(System.out);
+        diag(System.out, Arrays.asList(args).contains("--verbose"));
     }
 
     public static void diag(PrintStream out) {
+        diag(out, true);
+    }
+
+    public static void diag(PrintStream out, boolean verbose) {
+        new Diag(out, verbose).run();
+    }
+
+    private final PrintStream out;
+    private final boolean verbose;
+
+    public Diag(PrintStream out, boolean verbose) {
+        this.out = out;
+        this.verbose = verbose;
+    }
+
+    public void run() {
         out.println("System properties");
         out.println("=================");
         out.println("os.name =         " + System.getProperty("os.name"));
@@ -56,9 +72,9 @@ public class Diag {
         out.println("=================");
         try {
             TerminalProvider provider = TerminalProvider.load("ffm");
-            testProvider(out, provider);
+            testProvider(provider);
         } catch (Throwable t) {
-            out.println("FFM support not available: " + t);
+            error("FFM support not available", t);
         }
         out.println();
 
@@ -66,9 +82,9 @@ public class Diag {
         out.println("=================");
         try {
             TerminalProvider provider = TerminalProvider.load("jna");
-            testProvider(out, provider);
+            testProvider(provider);
         } catch (Throwable t) {
-            out.println("JNA support not available: " + t);
+            error("JNA support not available", t);
         }
         out.println();
 
@@ -76,9 +92,9 @@ public class Diag {
         out.println("=================");
         try {
             TerminalProvider provider = TerminalProvider.load("jansi");
-            testProvider(out, provider);
+            testProvider(provider);
         } catch (Throwable t) {
-            out.println("Jansi 2 support not available: " + t);
+            error("Jansi 2 support not available", t);
         }
         out.println();
 
@@ -86,9 +102,9 @@ public class Diag {
         out.println("=================");
         try {
             TerminalProvider provider = TerminalProvider.load("jni");
-            testProvider(out, provider);
+            testProvider(provider);
         } catch (Throwable t) {
-            out.println("JNI support not available: " + t);
+            error("JNI support not available", t);
         }
         out.println();
 
@@ -97,26 +113,31 @@ public class Diag {
         out.println("=================");
         try {
             TerminalProvider provider = TerminalProvider.load("exec");
-            testProvider(out, provider);
+            testProvider(provider);
         } catch (Throwable t) {
-            out.println("Exec support not available: " + t);
+            error("Exec support not available", t);
+        }
+
+        if (!verbose) {
+            out.println();
+            out.println("Run with --verbose argument to print stack traces");
         }
     }
 
-    private static void testProvider(PrintStream out, TerminalProvider provider) {
+    private void testProvider(TerminalProvider provider) {
         try {
             out.println("StdIn stream =    " + provider.isSystemStream(SystemStream.Input));
             out.println("StdOut stream =   " + provider.isSystemStream(SystemStream.Output));
             out.println("StdErr stream =   " + provider.isSystemStream(SystemStream.Error));
-        } catch (Throwable t2) {
-            out.println("Unable to check stream: " + t2);
+        } catch (Throwable t) {
+            error("Unable to check stream", t);
         }
         try {
             out.println("StdIn stream name =     " + provider.systemStreamName(SystemStream.Input));
             out.println("StdOut stream name =    " + provider.systemStreamName(SystemStream.Output));
             out.println("StdErr stream name =    " + provider.systemStreamName(SystemStream.Error));
-        } catch (Throwable t2) {
-            out.println("Unable to check stream names: " + t2);
+        } catch (Throwable t) {
+            error("Unable to check stream names", t);
         }
         try (Terminal terminal = provider.sysTerminal(
                 "diag",
@@ -132,9 +153,14 @@ public class Diag {
                 Attributes attr = terminal.enterRawMode();
                 try {
                     out.println("Terminal size: " + terminal.getSize());
-                    ForkJoinTask<Integer> t =
-                            new ForkJoinPool(1).submit(() -> terminal.reader().read(1));
-                    int r = t.get(1000, TimeUnit.MILLISECONDS);
+                    ForkJoinPool forkJoinPool = new ForkJoinPool(1);
+                    try {
+                        ForkJoinTask<Integer> t =
+                                forkJoinPool.submit(() -> terminal.reader().read(1));
+                        t.get(1000, TimeUnit.MILLISECONDS);
+                    } finally {
+                        forkJoinPool.shutdown();
+                    }
                     StringBuilder sb = new StringBuilder();
                     sb.append("The terminal seems to work: ");
                     sb.append("terminal ").append(terminal.getClass().getName());
@@ -146,22 +172,25 @@ public class Diag {
                                         .getName());
                     }
                     out.println(sb);
-                } catch (Throwable t3) {
-                    out.println("Unable to read from terminal: " + t3);
-                    t3.printStackTrace();
+                } catch (Throwable t2) {
+                    error("Unable to read from terminal", t2);
                 } finally {
                     terminal.setAttributes(attr);
                 }
             } else {
                 out.println("Not supported by provider");
             }
-        } catch (Throwable t2) {
-            out.println("Unable to open terminal: " + t2);
-            t2.printStackTrace();
+        } catch (Throwable t) {
+            error("Unable to open terminal", t);
         }
     }
 
-    static <S> S load(Class<S> clazz) {
-        return ServiceLoader.load(clazz, clazz.getClassLoader()).iterator().next();
+    private void error(String message, Throwable cause) {
+        if (verbose) {
+            out.println(message);
+            cause.printStackTrace(out);
+        } else {
+            out.println(message + ": " + cause);
+        }
     }
 }
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/impl/exec/ExecPty.java b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/impl/exec/ExecPty.java
index c0a35cbd6a2..f21920160d6 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/impl/exec/ExecPty.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/impl/exec/ExecPty.java
@@ -278,7 +278,7 @@ public class ExecPty extends AbstractPty implements Pty {
                 return Integer.parseInt(matcher.group(1));
             }
         }
-        throw new IOException("Unable to parse " + name);
+        return 0;
     }
 
     @Override
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/impl/exec/ExecTerminalProvider.java b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/impl/exec/ExecTerminalProvider.java
index 418d3452d4a..74c68859a1e 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/impl/exec/ExecTerminalProvider.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/impl/exec/ExecTerminalProvider.java
@@ -46,6 +46,9 @@ public class ExecTerminalProvider implements TerminalProvider {
     }
 
     public Pty current(SystemStream systemStream) throws IOException {
+        if (!isSystemStream(systemStream)) {
+            throw new IOException("Not a system stream: " + systemStream);
+        }
         return ExecPty.current(this, systemStream);
     }
 
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/impl/ffm/Kernel32.java b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/impl/ffm/Kernel32.java
index 4e7adbe3355..baa4aad0ee0 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/impl/ffm/Kernel32.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/impl/ffm/Kernel32.java
@@ -19,7 +19,7 @@ final class Kernel32 {
 
     public static final int FORMAT_MESSAGE_FROM_SYSTEM = 0x00001000;
 
-    public static final int INVALID_HANDLE_VALUE = -1;
+    public static final long INVALID_HANDLE_VALUE = -1;
     public static final int STD_INPUT_HANDLE = -10;
     public static final int STD_OUTPUT_HANDLE = -11;
     public static final int STD_ERROR_HANDLE = -12;
@@ -235,8 +235,8 @@ final class Kernel32 {
             CHAR_INFO lpFill) {
         MethodHandle mh$ = requireNonNull(ScrollConsoleScreenBufferW$MH, "ScrollConsoleScreenBuffer");
         try {
-            return (int)
-                    mh$.invokeExact(hConsoleOutput, lpScrollRectangle.seg, lpClipRectangle.seg, dwDestinationOrigin.seg, lpFill.seg);
+            return (int) mh$.invokeExact(
+                    hConsoleOutput, lpScrollRectangle.seg, lpClipRectangle.seg, dwDestinationOrigin.seg, lpFill.seg);
         } catch (Throwable ex$) {
             throw new AssertionError("should not reach here", ex$);
         }
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/impl/ffm/NativeWinSysTerminal.java b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/impl/ffm/NativeWinSysTerminal.java
index 189fc2808d9..e4c123711f3 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/impl/ffm/NativeWinSysTerminal.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/terminal/impl/ffm/NativeWinSysTerminal.java
@@ -83,7 +83,7 @@ public class NativeWinSysTerminal extends AbstractWindowsTerminal<java.lang.fore
                 type = type != null ? type : OSUtils.IS_CONEMU ? TYPE_WINDOWS_CONEMU : TYPE_WINDOWS;
                 writer = new NativeWinConsoleWriter();
             } else {
-                int m = inMode.get(java.lang.foreign.ValueLayout.JAVA_INT, 0);
+                int m = outMode.get(java.lang.foreign.ValueLayout.JAVA_INT, 0);
                 if (enableVtp(console, m)) {
                     type = type != null ? type : TYPE_WINDOWS_VTP;
                     writer = new NativeWinConsoleWriter();
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/Display.java b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/Display.java
index 32663d414ce..f581b334d34 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/Display.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/Display.java
@@ -219,7 +219,8 @@ public class Display {
                 cursorPos++;
                 if (newLength == 0 || newLine.isHidden(0)) {
                     // go to next line column zero
-                    rawPrint(new AttributedString(" \b"));
+                    rawPrint(' ');
+                    terminal.puts(Capability.key_backspace);
                 } else {
                     AttributedString firstChar = newLine.substring(0, 1);
                     // go to next line column one
@@ -319,7 +320,8 @@ public class Display {
             } else if (atRight) {
                 if (this.wrapAtEol) {
                     if (!fullScreen || (fullScreen && lineIndex < numLines)) {
-                        terminal.writer().write(" \b");
+                        rawPrint(' ');
+                        terminal.puts(Capability.key_backspace);
                         cursorPos++;
                     }
                 } else {
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/InputStreamReader.java b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/InputStreamReader.java
index 449d6aa69c8..1198da4fe82 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/InputStreamReader.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/InputStreamReader.java
@@ -22,8 +22,7 @@ import java.nio.charset.CodingErrorAction;
 import java.nio.charset.MalformedInputException;
 import java.nio.charset.UnmappableCharacterException;
 
-/**
- *
+/*
  * NOTE for JLine: the default InputStreamReader that comes from the JRE
  * usually read more bytes than needed from the input stream, which
  * is not usable in a character per character model used in the terminal.
diff --git a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/Status.java b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/Status.java
index 7348b1ea1c5..d0ea5ef8962 100644
--- a/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/Status.java
+++ b/src/jdk.internal.le/share/classes/jdk/internal/org/jline/utils/Status.java
@@ -48,7 +48,8 @@ public class Status {
         this.supported = terminal.getStringCapability(Capability.change_scroll_region) != null
                 && terminal.getStringCapability(Capability.save_cursor) != null
                 && terminal.getStringCapability(Capability.restore_cursor) != null
-                && terminal.getStringCapability(Capability.cursor_address) != null;
+                && terminal.getStringCapability(Capability.cursor_address) != null
+                && isValid(terminal.getSize());
         if (supported) {
             display = new MovingCursorDisplay(terminal);
             resize();
@@ -57,6 +58,10 @@ public class Status {
         }
     }
 
+    private boolean isValid(Size size) {
+        return size.getRows() > 0 && size.getRows() < 1000 && size.getColumns() > 0 && size.getColumns() < 1000;
+    }
+
     public void close() {
         terminal.puts(Capability.save_cursor);
         terminal.puts(Capability.change_scroll_region, 0, display.rows - 1);
@@ -147,6 +152,7 @@ public class Status {
         if (newScrollRegion < scrollRegion) {
             // We need to scroll up to grow the status bar
             terminal.puts(Capability.save_cursor);
+            terminal.puts(Capability.cursor_address, scrollRegion, 0);
             for (int i = newScrollRegion; i < scrollRegion; i++) {
                 terminal.puts(Capability.cursor_down);
             }
diff --git a/src/jdk.internal.le/share/legal/jline.md b/src/jdk.internal.le/share/legal/jline.md
index 5b813c0af2f..17392e93659 100644
--- a/src/jdk.internal.le/share/legal/jline.md
+++ b/src/jdk.internal.le/share/legal/jline.md
@@ -1,4 +1,4 @@
-## JLine v3.26.1
+## JLine v3.29.0
 
 ### JLine License
 <pre>

From 2bc4f64c56ebc844d494a4ce8ba72a25643d4075 Mon Sep 17 00:00:00 2001
From: Marc Chevalier <marc.chevalier@oracle.com>
Date: Thu, 20 Mar 2025 15:50:23 +0000
Subject: [PATCH 415/587] 8335708: C2: Compile::verify_graph_edges must start
 at root and safepoints, just like CCP traversal

Reviewed-by: chagedorn, epeter
---
 src/hotspot/share/opto/compile.cpp            | 28 ++++++--
 src/hotspot/share/opto/compile.hpp            | 28 ++++++--
 src/hotspot/share/opto/node.hpp               |  2 +-
 src/hotspot/share/opto/phaseX.cpp             |  2 +-
 ...hEdgesWithDeadCodeCheckFromSafepoints.java | 70 +++++++++++++++++++
 5 files changed, 114 insertions(+), 16 deletions(-)
 create mode 100644 test/hotspot/jtreg/compiler/loopopts/VerifyGraphEdgesWithDeadCodeCheckFromSafepoints.java

diff --git a/src/hotspot/share/opto/compile.cpp b/src/hotspot/share/opto/compile.cpp
index 5294315fe74..56f57793fbb 100644
--- a/src/hotspot/share/opto/compile.cpp
+++ b/src/hotspot/share/opto/compile.cpp
@@ -421,7 +421,7 @@ void Compile::remove_useless_node(Node* dead) {
 }
 
 // Disconnect all useless nodes by disconnecting those at the boundary.
-void Compile::disconnect_useless_nodes(Unique_Node_List& useful, Unique_Node_List& worklist) {
+void Compile::disconnect_useless_nodes(Unique_Node_List& useful, Unique_Node_List& worklist, const Unique_Node_List* root_and_safepoints) {
   uint next = 0;
   while (next < useful.size()) {
     Node *n = useful.at(next++);
@@ -474,7 +474,7 @@ void Compile::disconnect_useless_nodes(Unique_Node_List& useful, Unique_Node_Lis
   remove_useless_late_inlines(         &_string_late_inlines, useful);
   remove_useless_late_inlines(         &_boxing_late_inlines, useful);
   remove_useless_late_inlines(&_vector_reboxing_late_inlines, useful);
-  debug_only(verify_graph_edges(true/*check for no_dead_code*/);)
+  debug_only(verify_graph_edges(true /*check for no_dead_code*/, root_and_safepoints);)
 }
 
 // ============================================================================
@@ -4253,11 +4253,25 @@ bool Compile::needs_clinit_barrier(ciInstanceKlass* holder, ciMethod* accessing_
 //------------------------------verify_bidirectional_edges---------------------
 // For each input edge to a node (ie - for each Use-Def edge), verify that
 // there is a corresponding Def-Use edge.
-void Compile::verify_bidirectional_edges(Unique_Node_List &visited) {
+void Compile::verify_bidirectional_edges(Unique_Node_List& visited, const Unique_Node_List* root_and_safepoints) const {
   // Allocate stack of size C->live_nodes()/16 to avoid frequent realloc
   uint stack_size = live_nodes() >> 4;
-  Node_List nstack(MAX2(stack_size, (uint)OptoNodeListSize));
-  nstack.push(_root);
+  Node_List nstack(MAX2(stack_size, (uint) OptoNodeListSize));
+  if (root_and_safepoints != nullptr) {
+    assert(root_and_safepoints->member(_root), "root is not in root_and_safepoints");
+    for (uint i = 0, limit = root_and_safepoints->size(); i < limit; i++) {
+      Node* root_or_safepoint = root_and_safepoints->at(i);
+      // If the node is a safepoint, let's check if it still has a control input
+      // Lack of control input signifies that this node was killed by CCP or
+      // recursively by remove_globally_dead_node and it shouldn't be a starting
+      // point.
+      if (!root_or_safepoint->is_SafePoint() || root_or_safepoint->in(0) != nullptr) {
+        nstack.push(root_or_safepoint);
+      }
+    }
+  } else {
+    nstack.push(_root);
+  }
 
   while (nstack.size() > 0) {
     Node* n = nstack.pop();
@@ -4307,12 +4321,12 @@ void Compile::verify_bidirectional_edges(Unique_Node_List &visited) {
 //------------------------------verify_graph_edges---------------------------
 // Walk the Graph and verify that there is a one-to-one correspondence
 // between Use-Def edges and Def-Use edges in the graph.
-void Compile::verify_graph_edges(bool no_dead_code) {
+void Compile::verify_graph_edges(bool no_dead_code, const Unique_Node_List* root_and_safepoints) const {
   if (VerifyGraphEdges) {
     Unique_Node_List visited;
 
     // Call graph walk to check edges
-    verify_bidirectional_edges(visited);
+    verify_bidirectional_edges(visited, root_and_safepoints);
     if (no_dead_code) {
       // Now make sure that no visited node is used by an unvisited node.
       bool dead_nodes = false;
diff --git a/src/hotspot/share/opto/compile.hpp b/src/hotspot/share/opto/compile.hpp
index 4c97b26bb25..bd998194ff7 100644
--- a/src/hotspot/share/opto/compile.hpp
+++ b/src/hotspot/share/opto/compile.hpp
@@ -1035,7 +1035,7 @@ public:
 
   void              identify_useful_nodes(Unique_Node_List &useful);
   void              update_dead_node_list(Unique_Node_List &useful);
-  void              disconnect_useless_nodes(Unique_Node_List& useful, Unique_Node_List& worklist);
+  void disconnect_useless_nodes(Unique_Node_List& useful, Unique_Node_List& worklist, const Unique_Node_List* root_and_safepoints = nullptr);
 
   void              remove_useless_node(Node* dead);
 
@@ -1242,14 +1242,28 @@ public:
   static void print_intrinsic_statistics() PRODUCT_RETURN;
 
   // Graph verification code
-  // Walk the node list, verifying that there is a one-to-one
-  // correspondence between Use-Def edges and Def-Use edges
-  // The option no_dead_code enables stronger checks that the
-  // graph is strongly connected from root in both directions.
-  void verify_graph_edges(bool no_dead_code = false) PRODUCT_RETURN;
+  // Walk the node list, verifying that there is a one-to-one correspondence
+  // between Use-Def edges and Def-Use edges. The option no_dead_code enables
+  // stronger checks that the graph is strongly connected from starting points
+  // in both directions.
+  // root_and_safepoints is used to give the starting points for the traversal.
+  // If not supplied, only root is used. When this check is called after CCP,
+  // we need to start traversal from Root and safepoints, just like CCP does its
+  // own traversal (see PhaseCCP::transform for reasons).
+  //
+  // To call this function, there are 2 ways to go:
+  // - give root_and_safepoints to start traversal everywhere needed (like after CCP)
+  // - if the whole graph is assumed to be reachable from Root's input,
+  //   root_and_safepoints is not needed (like in PhaseRemoveUseless).
+  //
+  // Failure to specify root_and_safepoints in case the graph is not fully
+  // reachable from Root's input make this check unsound (can miss inconsistencies)
+  // and even incomplete (can make up non-existing problems) if no_dead_code is
+  // true.
+  void verify_graph_edges(bool no_dead_code = false, const Unique_Node_List* root_and_safepoints = nullptr) const PRODUCT_RETURN;
 
   // Verify bi-directional correspondence of edges
-  void verify_bidirectional_edges(Unique_Node_List &visited);
+  void verify_bidirectional_edges(Unique_Node_List& visited, const Unique_Node_List* root_and_safepoints = nullptr) const;
 
   // End-of-run dumps.
   static void print_statistics() PRODUCT_RETURN;
diff --git a/src/hotspot/share/opto/node.hpp b/src/hotspot/share/opto/node.hpp
index 32478961ba1..3efe4ca0825 100644
--- a/src/hotspot/share/opto/node.hpp
+++ b/src/hotspot/share/opto/node.hpp
@@ -1745,7 +1745,7 @@ public:
   Unique_Node_List(Unique_Node_List&&) = default;
 
   void remove( Node *n );
-  bool member( Node *n ) { return _in_worklist.test(n->_idx) != 0; }
+  bool member(const Node* n) const { return _in_worklist.test(n->_idx) != 0; }
   VectorSet& member_set(){ return _in_worklist; }
 
   void push(Node* b) {
diff --git a/src/hotspot/share/opto/phaseX.cpp b/src/hotspot/share/opto/phaseX.cpp
index 397b1e52e93..0369143c7b0 100644
--- a/src/hotspot/share/opto/phaseX.cpp
+++ b/src/hotspot/share/opto/phaseX.cpp
@@ -2110,7 +2110,7 @@ Node *PhaseCCP::transform( Node *n ) {
   C->update_dead_node_list(useful);
   remove_useless_nodes(useful.member_set());
   _worklist.remove_useless_nodes(useful.member_set());
-  C->disconnect_useless_nodes(useful, _worklist);
+  C->disconnect_useless_nodes(useful, _worklist, &_root_and_safepoints);
 
   Node* new_root = node_map[n->_idx];
   assert(new_root->is_Root(), "transformed root node must be a root node");
diff --git a/test/hotspot/jtreg/compiler/loopopts/VerifyGraphEdgesWithDeadCodeCheckFromSafepoints.java b/test/hotspot/jtreg/compiler/loopopts/VerifyGraphEdgesWithDeadCodeCheckFromSafepoints.java
new file mode 100644
index 00000000000..c731ae6f770
--- /dev/null
+++ b/test/hotspot/jtreg/compiler/loopopts/VerifyGraphEdgesWithDeadCodeCheckFromSafepoints.java
@@ -0,0 +1,70 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact 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 8335708
+ * @summary Crash Compile::verify_graph_edges with dead code check when safepoints are reachable but not connected back to Root's inputs
+ * @library /test/lib
+ *
+ * @run driver compiler.loopopts.VerifyGraphEdgesWithDeadCodeCheckFromSafepoints
+ * @run main/othervm
+ *       -XX:+IgnoreUnrecognizedVMOptions
+ *       -XX:-TieredCompilation -XX:+VerifyGraphEdges
+ *       -XX:+StressIGVN -Xcomp
+ *       -XX:CompileCommand=compileonly,compiler.loopopts.VerifyGraphEdgesWithDeadCodeCheckFromSafepoints::mainTest
+ *       compiler.loopopts.VerifyGraphEdgesWithDeadCodeCheckFromSafepoints
+ *
+ */
+
+package compiler.loopopts;
+
+import jdk.test.lib.Utils;
+
+public class VerifyGraphEdgesWithDeadCodeCheckFromSafepoints {
+    public static void main(String[] args) throws Exception {
+        Thread thread = new Thread() {
+            public void run() {
+                VerifyGraphEdgesWithDeadCodeCheckFromSafepoints instance = new VerifyGraphEdgesWithDeadCodeCheckFromSafepoints();
+                byte[] a = new byte[997];
+                for (int i = 0; i < 100; ++i) {
+                    instance.mainTest(a, a);
+                }
+            }
+        };
+        // Give thread some time to trigger compilation
+        thread.setDaemon(true);
+        thread.start();
+        Thread.sleep(Utils.adjustTimeout(500));
+    }
+
+    public void mainTest(byte[] a, byte[] b) {
+        int i = 0;
+        while (i < (a.length - 4)) {
+            a[i] = b[i];
+        }
+        while (true) {
+            a[i] = b[i];
+        }
+    }
+}

From 56038fb5a156568cce2e80f5db18b10ad61c06e4 Mon Sep 17 00:00:00 2001
From: Jatin Bhateja <jbhateja@openjdk.org>
Date: Thu, 20 Mar 2025 18:56:25 +0000
Subject: [PATCH 416/587] 8352317: Assertion failure during size estimation of
 BoxLockNode with -XX:+UseAPX

Reviewed-by: thartmann
---
 src/hotspot/cpu/x86/x86_64.ad | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/hotspot/cpu/x86/x86_64.ad b/src/hotspot/cpu/x86/x86_64.ad
index 1116908eff1..10ea0c343a4 100644
--- a/src/hotspot/cpu/x86/x86_64.ad
+++ b/src/hotspot/cpu/x86/x86_64.ad
@@ -1547,7 +1547,11 @@ void BoxLockNode::emit(C2_MacroAssembler* masm, PhaseRegAlloc* ra_) const
 uint BoxLockNode::size(PhaseRegAlloc *ra_) const
 {
   int offset = ra_->reg2offset(in_RegMask(0).find_first_elem());
-  return (offset < 0x80) ? 5 : 8; // REX
+  if (ra_->get_encode(this) > 15) {
+    return (offset < 0x80) ? 6 : 9; // REX2
+  } else {
+    return (offset < 0x80) ? 5 : 8; // REX
+  }
 }
 
 //=============================================================================

From 06ba6cf3a137a6cdf572a876a46d18e51c248451 Mon Sep 17 00:00:00 2001
From: Magnus Ihse Bursie <ihse@openjdk.org>
Date: Thu, 20 Mar 2025 22:25:49 +0000
Subject: [PATCH 417/587] 8329173: LCMS_CFLAGS from configure are lost

Reviewed-by: erikj, azvegint
---
 make/modules/java.desktop/lib/ClientLibraries.gmk | 2 --
 1 file changed, 2 deletions(-)

diff --git a/make/modules/java.desktop/lib/ClientLibraries.gmk b/make/modules/java.desktop/lib/ClientLibraries.gmk
index 8dbf48563fe..a9511fba58b 100644
--- a/make/modules/java.desktop/lib/ClientLibraries.gmk
+++ b/make/modules/java.desktop/lib/ClientLibraries.gmk
@@ -67,8 +67,6 @@ ifeq ($(USE_EXTERNAL_LCMS), true)
   # If we're using an external library, we can't include our own SRC path
   # as includes, instead the system headers should be used.
   LIBLCMS_HEADERS_FROM_SRC := false
-  # FIXME: Keep old behavior and reset LCMS_CFLAGS. This is likely a bug.
-  LCMS_CFLAGS :=
 endif
 
 ifeq ($(TOOLCHAIN_TYPE)+$(TOOLCHAIN_VERSION), clang+10.1)

From 466f82a49996242d900a444931017261a427f9ea Mon Sep 17 00:00:00 2001
From: Marc Chevalier <marc.chevalier@oracle.com>
Date: Fri, 21 Mar 2025 08:53:56 +0000
Subject: [PATCH 418/587] 8314999: IR framework fails to detect allocation

Reviewed-by: chagedorn, thartmann
---
 src/hotspot/share/opto/callnode.cpp           |  22 ++++
 src/hotspot/share/opto/callnode.hpp           |   2 +
 .../compiler/lib/ir_framework/IRNode.java     |  54 +++++----
 .../ir_framework/tests/TestIRMatching.java    | 106 ++++++++++++++----
 4 files changed, 143 insertions(+), 41 deletions(-)

diff --git a/src/hotspot/share/opto/callnode.cpp b/src/hotspot/share/opto/callnode.cpp
index e330115a81d..68efabea15c 100644
--- a/src/hotspot/share/opto/callnode.cpp
+++ b/src/hotspot/share/opto/callnode.cpp
@@ -713,6 +713,28 @@ void CallNode::dump_spec(outputStream *st) const {
   if (_cnt != COUNT_UNKNOWN)  st->print(" C=%f",_cnt);
   if (jvms() != nullptr)  jvms()->dump_spec(st);
 }
+
+void AllocateNode::dump_spec(outputStream* st) const {
+  st->print(" ");
+  if (tf() != nullptr) {
+    tf()->dump_on(st);
+  }
+  if (_cnt != COUNT_UNKNOWN) {
+    st->print(" C=%f", _cnt);
+  }
+  const Node* const klass_node = in(KlassNode);
+  if (klass_node != nullptr) {
+    const TypeKlassPtr* const klass_ptr = klass_node->bottom_type()->isa_klassptr();
+
+    if (klass_ptr != nullptr && klass_ptr->klass_is_exact()) {
+      st->print(" allocationKlass:");
+      klass_ptr->exact_klass()->print_name_on(st);
+    }
+  }
+  if (jvms() != nullptr) {
+    jvms()->dump_spec(st);
+  }
+}
 #endif
 
 const Type *CallNode::bottom_type() const { return tf()->range(); }
diff --git a/src/hotspot/share/opto/callnode.hpp b/src/hotspot/share/opto/callnode.hpp
index 1126db86cf6..fc03ab5163b 100644
--- a/src/hotspot/share/opto/callnode.hpp
+++ b/src/hotspot/share/opto/callnode.hpp
@@ -1062,6 +1062,8 @@ public:
   bool is_allocation_MemBar_redundant() { return _is_allocation_MemBar_redundant; }
 
   Node* make_ideal_mark(PhaseGVN *phase, Node* obj, Node* control, Node* mem);
+
+  NOT_PRODUCT(virtual void dump_spec(outputStream* st) const;)
 };
 
 //------------------------------AllocateArray---------------------------------
diff --git a/test/hotspot/jtreg/compiler/lib/ir_framework/IRNode.java b/test/hotspot/jtreg/compiler/lib/ir_framework/IRNode.java
index 0a5f6c63c76..6f66b403a09 100644
--- a/test/hotspot/jtreg/compiler/lib/ir_framework/IRNode.java
+++ b/test/hotspot/jtreg/compiler/lib/ir_framework/IRNode.java
@@ -342,26 +342,45 @@ public class IRNode {
 
     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;
-        allocNodes(ALLOC, "Allocate", optoRegex);
+        String regex = START + "Allocate\\b" + MID + END;
+        macroNodes(ALLOC, regex);
     }
 
     public static final String ALLOC_OF = COMPOSITE_PREFIX + "ALLOC_OF" + POSTFIX;
     static {
-        String regex = "(.*precise .*" + IS_REPLACED + ":.*\\R((.*(?i:mov|mv|xorl|nop|spill).*|\\s*)\\R)*.*(?i:call,static).*wrapper for: C2 Runtime new_instance" + END;
-        optoOnly(ALLOC_OF, regex);
+        String regex = START + "Allocate\\b" + MID + "allocationKlass:.*\\b" + IS_REPLACED + "\\s.*" + END;
+        macroNodes(ALLOC_OF, regex);
     }
 
     public static final String ALLOC_ARRAY = PREFIX + "ALLOC_ARRAY" + POSTFIX;
     static {
-        String optoRegex = "(.*precise \\[.*\\R((.*(?i:mov|mv|xor|nop|spill).*|\\s*|.*(LGHI|LI).*)\\R)*.*(?i:call,static).*wrapper for: C2 Runtime new_array" + END;
-        allocNodes(ALLOC_ARRAY, "AllocateArray", optoRegex);
+        String regex = START + "AllocateArray\\b" + MID + END;
+        macroNodes(ALLOC_ARRAY,  regex);
     }
 
     public static final String ALLOC_ARRAY_OF = COMPOSITE_PREFIX + "ALLOC_ARRAY_OF" + POSTFIX;
     static {
-        String regex = "(.*precise \\[.*" + IS_REPLACED + ":.*\\R((.*(?i:mov|mv|xorl|nop|spill).*|\\s*|.*(LGHI|LI).*)\\R)*.*(?i:call,static).*wrapper for: C2 Runtime new_array" + END;
-        optoOnly(ALLOC_ARRAY_OF, regex);
+        // Assuming we are looking for an array of "some/package/MyClass". The printout is
+        // [Lsome/package/MyClass;
+        // or, with more dimensions
+        // [[[Lsome/package/MyClass;
+
+        // Case where the searched string is a not fully qualified name (but maybe partially qualified):
+        // package/MyClass or MyClass
+        // The ".*\\b" will eat the "some/" and "some/package/" resp.
+        String partial_name_prefix = ".+\\b";
+
+        // The thing after "allocationKlass:" (the name of the allocated class) is a sequence of:
+        // - a non-empty sequence of "["
+        // - a single character ("L"),
+        // - maybe a non-empty sequence of characters ending on a word boundary
+        //   this sequence is omitted if the given name is already fully qualified (exact match)
+        //   but will eat the package path prefix in the cases described above
+        // - the name we are looking for
+        // - the final ";".
+        String name_part = "\\[+.(" + partial_name_prefix + ")?" + IS_REPLACED + ";";
+        String regex = START + "AllocateArray\\b" + MID + "allocationKlass:" + name_part + ".*" + END;
+        macroNodes(ALLOC_ARRAY_OF, regex);
     }
 
     public static final String OR = PREFIX + "OR" + POSTFIX;
@@ -2558,12 +2577,14 @@ public class IRNode {
 
     public static final String MOD_F = PREFIX + "MOD_F" + POSTFIX;
     static {
-        macroNodes(MOD_F, "ModF");
+        String regex = START + "ModF" + MID + END;
+        macroNodes(MOD_F, regex);
     }
 
     public static final String MOD_D = PREFIX + "MOD_D" + POSTFIX;
     static {
-        macroNodes(MOD_D, "ModD");
+        String regex = START + "ModD" + MID + END;
+        macroNodes(MOD_D, regex);
     }
 
     /*
@@ -2601,21 +2622,10 @@ public class IRNode {
         VECTOR_NODE_TYPE.put(irNodePlaceholder, typeString);
     }
 
-    private static void allocNodes(String irNode, String irNodeName, String optoRegex) {
-        String idealIndependentRegex = START + irNodeName + "\\b" + MID + END;
-        Map<PhaseInterval, String> intervalToRegexMap = new HashMap<>();
-        intervalToRegexMap.put(new PhaseInterval(CompilePhase.BEFORE_REMOVEUSELESS, CompilePhase.PHASEIDEALLOOP_ITERATIONS),
-                               idealIndependentRegex);
-        intervalToRegexMap.put(new PhaseInterval(CompilePhase.PRINT_OPTO_ASSEMBLY), optoRegex);
-        MultiPhaseRangeEntry entry = new MultiPhaseRangeEntry(CompilePhase.PRINT_OPTO_ASSEMBLY, intervalToRegexMap);
-        IR_NODE_MAPPINGS.put(irNode, entry);
-    }
-
     /**
      * Apply {@code regex} on all ideal graph phases up to and including {@link CompilePhase#BEFORE_MACRO_EXPANSION}.
      */
-    private static void macroNodes(String irNodePlaceholder, String irNodeRegex) {
-        String regex = START + irNodeRegex + MID + END;
+    private static void macroNodes(String irNodePlaceholder, String regex) {
         IR_NODE_MAPPINGS.put(irNodePlaceholder, new SinglePhaseRangeEntry(CompilePhase.BEFORE_MACRO_EXPANSION, regex,
                                                                           CompilePhase.BEFORE_STRINGOPTS,
                                                                           CompilePhase.BEFORE_MACRO_EXPANSION));
diff --git a/test/hotspot/jtreg/testlibrary_tests/ir_framework/tests/TestIRMatching.java b/test/hotspot/jtreg/testlibrary_tests/ir_framework/tests/TestIRMatching.java
index f45f708070a..69690ae8e60 100644
--- a/test/hotspot/jtreg/testlibrary_tests/ir_framework/tests/TestIRMatching.java
+++ b/test/hotspot/jtreg/testlibrary_tests/ir_framework/tests/TestIRMatching.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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,7 +75,6 @@ public class TestIRMatching {
         runCheck(new String[] {"-XX:TLABRefillWasteFraction=50", "-XX:+UsePerfData", "-XX:+UseTLAB"}, BadFailOnConstraint.create(AndOr1.class, "test1(int)", 1, "CallStaticJava"));
         runCheck(new String[] {"-XX:TLABRefillWasteFraction=50", "-XX:-UsePerfData", "-XX:+UseTLAB"}, BadFailOnConstraint.create(AndOr1.class, "test2()", 1, "CallStaticJava"));
 
-        String[] allocMatches = { "MyClass", "wrapper for: C2 Runtime new_instance" };
         runCheck(BadFailOnConstraint.create(MultipleFailOnBad.class, "fail1()", 1, 1, "Store"),
                  BadFailOnConstraint.create(MultipleFailOnBad.class, "fail1()", 1,  3, "Store"),
                  GoodFailOnRegexConstraint.create(MultipleFailOnBad.class, "fail1()", 1,  2, 4),
@@ -88,12 +87,12 @@ public class TestIRMatching {
                  BadFailOnConstraint.create(MultipleFailOnBad.class, "fail5()", 1,  1, "Store"),
                  GoodFailOnRegexConstraint.create(MultipleFailOnBad.class, "fail5()", 1,  2, 3),
                  GoodFailOnRegexConstraint.create(MultipleFailOnBad.class, "fail6()", 1,  1),
-                 BadFailOnConstraint.create(MultipleFailOnBad.class, "fail6()", 1,  2, allocMatches),
+                 BadFailOnConstraint.create(MultipleFailOnBad.class, "fail6()", 1,  2, "MyClass"),
                  BadFailOnConstraint.create(MultipleFailOnBad.class, "fail6()", 1,  3, "CallStaticJava"),
                  GoodFailOnRegexConstraint.create(MultipleFailOnBad.class, "fail7()", 1,  1),
-                 BadFailOnConstraint.create(MultipleFailOnBad.class, "fail7()", 1,  2, allocMatches),
+                 BadFailOnConstraint.create(MultipleFailOnBad.class, "fail7()", 1,  2, "MyClass"),
                  GoodFailOnRegexConstraint.create(MultipleFailOnBad.class, "fail8()", 1,  1),
-                 BadFailOnConstraint.create(MultipleFailOnBad.class, "fail8()", 1,  2, allocMatches),
+                 BadFailOnConstraint.create(MultipleFailOnBad.class, "fail8()", 1,  2, "MyClass"),
                  BadFailOnConstraint.create(MultipleFailOnBad.class, "fail9()", 1,  1, "Store"),
                  BadFailOnConstraint.create(MultipleFailOnBad.class, "fail9()", 1,  2, "CallStaticJava"),
                  BadFailOnConstraint.create(MultipleFailOnBad.class, "fail10()", 1,  1, "Store", "iFld"),
@@ -114,12 +113,40 @@ public class TestIRMatching {
                  GoodRuleConstraint.create(Calls.class, "calls()", 3)
         );
 
-        String[] allocArrayMatches = { "MyClass", "wrapper for: C2 Runtime new_array"};
-        runCheck(BadFailOnConstraint.create(AllocArray.class, "allocArray()", 1, allocArrayMatches),
-                 BadFailOnConstraint.create(AllocArray.class, "allocArray()", 2,  allocArrayMatches),
+        runCheck(BadFailOnConstraint.create(AllocInstance.class, "allocInstance()", 1),
+                BadFailOnConstraint.create(AllocInstance.class, "allocInstance()", 2),
+                GoodFailOnConstraint.create(AllocInstance.class, "allocInstance()", 3),
+                GoodFailOnConstraint.create(AllocInstance.class, "allocInstance()", 4),
+                GoodFailOnConstraint.create(AllocInstance.class, "allocInstance()", 5),
+                BadFailOnConstraint.create(AllocInstance.class, "allocInstance()", 6),
+                BadFailOnConstraint.create(AllocInstance.class, "allocInstance()", 7),
+                GoodFailOnConstraint.create(AllocInstance.class, "allocInstance()", 8),
+                GoodFailOnConstraint.create(AllocInstance.class, "allocInstance()", 9),
+                GoodFailOnConstraint.create(AllocInstance.class, "allocInstance()", 10)
+        );
+
+        runCheck(BadFailOnConstraint.create(AllocArray.class, "allocArray()", 1),
+                 BadFailOnConstraint.create(AllocArray.class, "allocArray()", 2),
                  GoodFailOnConstraint.create(AllocArray.class, "allocArray()", 3),
                  GoodFailOnConstraint.create(AllocArray.class, "allocArray()", 4),
-                 BadFailOnConstraint.create(AllocArray.class, "allocArray()", 5,  allocArrayMatches)
+                 GoodFailOnConstraint.create(AllocArray.class, "allocArray()", 5),
+                 BadFailOnConstraint.create(AllocArray.class, "allocArray()", 6),
+                 BadFailOnConstraint.create(AllocArray.class, "allocArray()", 7),
+                 GoodFailOnConstraint.create(AllocArray.class, "allocArray()", 8),
+                 GoodFailOnConstraint.create(AllocArray.class, "allocArray()", 9),
+                 GoodFailOnConstraint.create(AllocArray.class, "allocArray()", 10)
+        );
+
+        runCheck(BadFailOnConstraint.create(AllocArray.class, "allocMultiArray()", 1),
+                 BadFailOnConstraint.create(AllocArray.class, "allocMultiArray()", 2),
+                 GoodFailOnConstraint.create(AllocArray.class, "allocMultiArray()", 3),
+                 GoodFailOnConstraint.create(AllocArray.class, "allocMultiArray()", 4),
+                 GoodFailOnConstraint.create(AllocArray.class, "allocMultiArray()", 5),
+                 BadFailOnConstraint.create(AllocArray.class, "allocMultiArray()", 6),
+                 BadFailOnConstraint.create(AllocArray.class, "allocMultiArray()", 7),
+                 GoodFailOnConstraint.create(AllocArray.class, "allocMultiArray()", 8),
+                 GoodFailOnConstraint.create(AllocArray.class, "allocMultiArray()", 9),
+                 GoodFailOnConstraint.create(AllocArray.class, "allocMultiArray()", 10)
         );
 
         runCheck(GoodRuleConstraint.create(RunTests.class, "good1()", 1),
@@ -266,8 +293,9 @@ public class TestIRMatching {
                     failures.append("- Could not find all ideal() methods, expected 7 but found ").append(count)
                             .append(System.lineSeparator());
                 }
-                pattern = Pattern.compile(compilationPrefix() + ".*opto\\d.*\\R> Phase \"PrintOptoAssembly\":(?:(?!"
-                                          + compilationPrefix()  + ")[\\S\\s])+");
+                pattern = Pattern.compile(compilationPrefix() + ".*macro\\d.*\\R> Phase \""
+                        + CompilePhase.BEFORE_MACRO_EXPANSION.getName()
+                        + "\":(?:(?!" + compilationPrefix() + ")[\\S\\s])+");
                 matcher = pattern.matcher(output);
                 count = 0;
                 while (matcher.find()) {
@@ -278,7 +306,7 @@ public class TestIRMatching {
                     count++;
                 }
                 if (count != 7) {
-                    failures.append("- Could not find all opto() methods, expected 7 but found ").append(count).append(System.lineSeparator());
+                    failures.append("- Could not find all macro() methods, expected 7 but found ").append(count).append(System.lineSeparator());
                 }
                 if (!failures.isEmpty()) {
                     addException(new RuntimeException(failures.toString()));
@@ -918,18 +946,58 @@ class Calls {
     public void forceInline() {}
 }
 
+class AllocInstance {
+    MyClass myClass;
+
+    @Test
+    @IR(failOn = {IRNode.ALLOC})
+    @IR(failOn = {IRNode.ALLOC_OF, "MyClass"})
+    @IR(failOn = {IRNode.ALLOC_OF, "Class"}) // Does not fail
+    @IR(failOn = {IRNode.ALLOC_OF, "MyClasss"}) // Does not fail
+    @IR(failOn = {IRNode.ALLOC_OF, "ir_framework/tests/MySubClass"}) // Does not fail
+    @IR(failOn = {IRNode.ALLOC_OF, "ir_framework/tests/MyClass"})
+    @IR(failOn = {IRNode.ALLOC_OF, "tests/MyClass"})
+    @IR(failOn = {IRNode.ALLOC_OF, "ests/MyClass"}) // Does not fail
+    @IR(failOn = {IRNode.ALLOC_OF, "Atests/MyClass"}) // Does not fail
+    @IR(failOn = {IRNode.ALLOC_OF, "tests"}) // Does not fail
+    public void allocInstance() {
+        myClass = new MyClass();
+    }
+}
+
 class AllocArray {
     MyClass[] myClassArray;
+    MyClass[][] myClassMultiArray;
 
     @Test
     @IR(failOn = {IRNode.ALLOC_ARRAY})
     @IR(failOn = {IRNode.ALLOC_ARRAY_OF, "MyClass"})
+    @IR(failOn = {IRNode.ALLOC_ARRAY_OF, "Class"}) // Does not fail
     @IR(failOn = {IRNode.ALLOC_ARRAY_OF, "MyClasss"}) // Does not fail
     @IR(failOn = {IRNode.ALLOC_ARRAY_OF, "ir_framework/tests/MySubClass"}) // Does not fail
     @IR(failOn = {IRNode.ALLOC_ARRAY_OF, "ir_framework/tests/MyClass"})
+    @IR(failOn = {IRNode.ALLOC_ARRAY_OF, "tests/MyClass"})
+    @IR(failOn = {IRNode.ALLOC_ARRAY_OF, "ests/MyClass"}) // Does not fail
+    @IR(failOn = {IRNode.ALLOC_ARRAY_OF, "Atests/MyClass"}) // Does not fail
+    @IR(failOn = {IRNode.ALLOC_ARRAY_OF, "tests"}) // Does not fail
     public void allocArray() {
         myClassArray = new MyClass[2];
     }
+
+    @Test
+    @IR(failOn = {IRNode.ALLOC_ARRAY})
+    @IR(failOn = {IRNode.ALLOC_ARRAY_OF, "MyClass"})
+    @IR(failOn = {IRNode.ALLOC_ARRAY_OF, "Class"}) // Does not fail
+    @IR(failOn = {IRNode.ALLOC_ARRAY_OF, "MyClasss"}) // Does not fail
+    @IR(failOn = {IRNode.ALLOC_ARRAY_OF, "ir_framework/tests/MySubClass"}) // Does not fail
+    @IR(failOn = {IRNode.ALLOC_ARRAY_OF, "ir_framework/tests/MyClass"})
+    @IR(failOn = {IRNode.ALLOC_ARRAY_OF, "tests/MyClass"})
+    @IR(failOn = {IRNode.ALLOC_ARRAY_OF, "ests/MyClass"}) // Does not fail
+    @IR(failOn = {IRNode.ALLOC_ARRAY_OF, "Atests/MyClass"}) // Does not fail
+    @IR(failOn = {IRNode.ALLOC_ARRAY_OF, "tests"}) // Does not fail
+    public void allocMultiArray() {
+        myClassMultiArray = new MyClass[2][3];
+    }
 }
 
 class Loads {
@@ -1392,21 +1460,21 @@ class CompilationOutputOfFails {
 
     @Test
     @IR(failOn = IRNode.ALLOC)
-    public void opto1() {
+    public void macro1() {
         obj = new Object();
     }
 
     @Test
     @IR(failOn = IRNode.ALLOC)
     @IR(failOn = IRNode.STORE_F) // not fail
-    public void opto2() {
+    public void macro2() {
         obj = new Object();
     }
 
     @Test
     @IR(failOn = IRNode.ALLOC)
     @IR(counts = {IRNode.COUNTED_LOOP, "1"}) // not fail
-    public void opto3() {
+    public void macro3() {
         for (int i = 0; i < 100; i++) {
             obj = new Object();
         }
@@ -1414,28 +1482,28 @@ class CompilationOutputOfFails {
 
     @Test
     @IR(counts = {IRNode.ALLOC, "0"})
-    public void opto4() {
+    public void macro4() {
         obj = new Object();
     }
 
     @Test
     @IR(failOn = IRNode.STORE_F) // not fail
     @IR(counts = {IRNode.ALLOC, "0"})
-    public void opto5() {
+    public void macro5() {
         obj = new Object();
     }
 
     @Test
     @IR(counts = {IRNode.STORE_F, "0"}) // not fail
     @IR(counts = {IRNode.ALLOC, "0"})
-    public void opto6() {
+    public void macro6() {
         obj = new Object();
     }
 
     @Test
     @IR(counts = {IRNode.ALLOC, "10"})
     @IR(counts = {IRNode.ALLOC, "0"})
-    public void opto7() {
+    public void macro7() {
         obj = new Object();
     }
 

From 1c0fa0af7847d80fd3fbe38f28207aab270609b3 Mon Sep 17 00:00:00 2001
From: David Linus Briemann <david.briemann@sap.com>
Date: Fri, 21 Mar 2025 09:23:30 +0000
Subject: [PATCH 419/587] 8352512: TestVectorZeroCount: counter not reset
 between iterations

Reviewed-by: mdoerr, chagedorn
---
 .../vectorization/TestVectorZeroCount.java        | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/test/hotspot/jtreg/compiler/vectorization/TestVectorZeroCount.java b/test/hotspot/jtreg/compiler/vectorization/TestVectorZeroCount.java
index a29ade54008..03a7beb35c0 100644
--- a/test/hotspot/jtreg/compiler/vectorization/TestVectorZeroCount.java
+++ b/test/hotspot/jtreg/compiler/vectorization/TestVectorZeroCount.java
@@ -50,8 +50,13 @@ public class TestVectorZeroCount {
     private static final long[] LONG_EXPECTED_TRAILING = new long[SIZE];
     private static final long[] LONG_RESULT_TRAILING = new long[SIZE];
 
-    private static int intCounter = Integer.MIN_VALUE;
-    private static int longIterations = 100_000_000;
+    private static final int INT_START_INDEX  = Integer.MIN_VALUE;
+    private static final int INT_END_INDEX    = Integer.MAX_VALUE;
+    private static final int LONG_START_INDEX = 0;
+    private static final int LONG_END_INDEX   = 100_000_000;
+
+    private static int intCounter;
+    private static int longCounter;
 
     public static boolean testInt() {
         boolean done = false;
@@ -59,7 +64,7 @@ public class TestVectorZeroCount {
         // Non-vectorized loop as baseline (not vectorized because source array is initialized)
         for (int i = 0; i < SIZE; ++i) {
             INT_VALUES[i] = intCounter++;
-            if (intCounter == Integer.MAX_VALUE) {
+            if (intCounter == INT_END_INDEX) {
                 done = true;
             }
             INT_EXPECTED_LEADING[i] = Integer.numberOfLeadingZeros(INT_VALUES[i]);
@@ -92,7 +97,7 @@ public class TestVectorZeroCount {
         for (int i = 0; i < SIZE; ++i) {
             // Use random values because the long range is too large to iterate over it
             LONG_VALUES[i] = RANDOM.nextLong();
-            if (longIterations-- == 0) {
+            if (longCounter++ == LONG_END_INDEX) {
                 done = true;
             }
             LONG_EXPECTED_LEADING[i] = Long.numberOfLeadingZeros(LONG_VALUES[i]);
@@ -121,6 +126,8 @@ public class TestVectorZeroCount {
     public static void main(String[] args) {
         // Run twice to make sure compiled code is used from the beginning
         for (int i = 0; i < 2; ++i) {
+            intCounter = INT_START_INDEX;
+            longCounter = LONG_START_INDEX;
             while (!testLong()) ;
             while (!testInt()) ;
         }

From b545b9e79ea6a1e616c35e584f333b47bd7bd6d6 Mon Sep 17 00:00:00 2001
From: Thomas Schatzl <tschatzl@openjdk.org>
Date: Fri, 21 Mar 2025 10:00:07 +0000
Subject: [PATCH 420/587] 8352584: [Backout] G1: Pinned regions with pinned
 objects only reachable by native code crash VM

Reviewed-by: shade
---
 src/hotspot/share/gc/g1/g1Policy.cpp          |  7 ++
 src/hotspot/share/gc/g1/g1YoungCollector.cpp  | 32 ++-----
 src/hotspot/share/gc/g1/g1YoungCollector.hpp  |  3 +-
 .../gc/g1/pinnedobjs/TestPinnedEvacEmpty.java | 89 -------------------
 4 files changed, 15 insertions(+), 116 deletions(-)
 delete mode 100644 test/hotspot/jtreg/gc/g1/pinnedobjs/TestPinnedEvacEmpty.java

diff --git a/src/hotspot/share/gc/g1/g1Policy.cpp b/src/hotspot/share/gc/g1/g1Policy.cpp
index 67860f74569..8e81327b42d 100644
--- a/src/hotspot/share/gc/g1/g1Policy.cpp
+++ b/src/hotspot/share/gc/g1/g1Policy.cpp
@@ -660,6 +660,13 @@ void G1Policy::record_concurrent_refinement_stats(size_t pending_cards,
 
 bool G1Policy::should_retain_evac_failed_region(uint index) const {
   size_t live_bytes = _g1h->region_at(index)->live_bytes();
+
+#ifdef ASSERT
+  G1HeapRegion* r = _g1h->region_at(index);
+  assert(live_bytes != 0,
+         "live bytes not set for %u used %zu garbage %zu cm-live %zu pinned %d",
+         index, r->used(), r->garbage_bytes(), live_bytes, r->has_pinned_objects());
+#endif
   size_t threshold = G1RetainRegionLiveThresholdPercent * G1HeapRegion::GrainBytes / 100;
   return live_bytes < threshold;
 }
diff --git a/src/hotspot/share/gc/g1/g1YoungCollector.cpp b/src/hotspot/share/gc/g1/g1YoungCollector.cpp
index 8e550228152..2223d667998 100644
--- a/src/hotspot/share/gc/g1/g1YoungCollector.cpp
+++ b/src/hotspot/share/gc/g1/g1YoungCollector.cpp
@@ -287,8 +287,6 @@ class G1PrepareEvacuationTask : public WorkerTask {
   class G1PrepareRegionsClosure : public G1HeapRegionClosure {
     G1CollectedHeap* _g1h;
     G1PrepareEvacuationTask* _parent_task;
-    G1EvacFailureRegions* _evac_failure_regions;
-    uint _worker_id;
     uint _worker_humongous_total;
     uint _worker_humongous_candidates;
 
@@ -363,14 +361,9 @@ class G1PrepareEvacuationTask : public WorkerTask {
     }
 
   public:
-    G1PrepareRegionsClosure(G1CollectedHeap* g1h,
-                            G1PrepareEvacuationTask* parent_task,
-                            G1EvacFailureRegions* evac_failure_regions,
-                            uint worker_id) :
+    G1PrepareRegionsClosure(G1CollectedHeap* g1h, G1PrepareEvacuationTask* parent_task) :
       _g1h(g1h),
       _parent_task(parent_task),
-      _evac_failure_regions(evac_failure_regions),
-      _worker_id(worker_id),
       _worker_humongous_total(0),
       _worker_humongous_candidates(0) { }
 
@@ -380,13 +373,6 @@ class G1PrepareEvacuationTask : public WorkerTask {
     }
 
     virtual bool do_heap_region(G1HeapRegion* hr) {
-      // All pinned regions in the collection set must be registered as failed
-      // regions here as there is no guarantee that there is a reference
-      // reachable by Java code (i.e. only by native code).
-      if (hr->in_collection_set() && hr->has_pinned_objects()) {
-        _evac_failure_regions->record(_worker_id, hr->hrm_index(), true /* cause_pinned */);
-      }
-
       // First prepare the region for scanning
       _g1h->rem_set()->prepare_region_for_scan(hr);
 
@@ -429,7 +415,6 @@ class G1PrepareEvacuationTask : public WorkerTask {
   };
 
   G1CollectedHeap* _g1h;
-  G1EvacFailureRegions* _evac_failure_regions;
   G1HeapRegionClaimer _claimer;
   volatile uint _humongous_total;
   volatile uint _humongous_candidates;
@@ -437,17 +422,15 @@ class G1PrepareEvacuationTask : public WorkerTask {
   G1MonotonicArenaMemoryStats _all_card_set_stats;
 
 public:
-  G1PrepareEvacuationTask(G1CollectedHeap* g1h, G1EvacFailureRegions* evac_failure_regions) :
+  G1PrepareEvacuationTask(G1CollectedHeap* g1h) :
     WorkerTask("Prepare Evacuation"),
     _g1h(g1h),
-    _evac_failure_regions(evac_failure_regions),
     _claimer(_g1h->workers()->active_workers()),
     _humongous_total(0),
-    _humongous_candidates(0),
-    _all_card_set_stats() { }
+    _humongous_candidates(0) { }
 
   void work(uint worker_id) {
-    G1PrepareRegionsClosure cl(_g1h, this, _evac_failure_regions, worker_id);
+    G1PrepareRegionsClosure cl(_g1h, this);
     _g1h->heap_region_par_iterate_from_worker_offset(&cl, &_claimer, worker_id);
 
     MutexLocker x(G1RareEvent_lock, Mutex::_no_safepoint_check_flag);
@@ -489,8 +472,7 @@ void G1YoungCollector::set_young_collection_default_active_worker_threads(){
   log_info(gc,task)("Using %u workers of %u for evacuation", active_workers, workers()->max_workers());
 }
 
-void G1YoungCollector::pre_evacuate_collection_set(G1EvacInfo* evacuation_info,
-                                                   G1EvacFailureRegions* evac_failure_regions) {
+void G1YoungCollector::pre_evacuate_collection_set(G1EvacInfo* evacuation_info) {
   // Flush various data in thread-local buffers to be able to determine the collection
   // set
   {
@@ -529,7 +511,7 @@ void G1YoungCollector::pre_evacuate_collection_set(G1EvacInfo* evacuation_info,
   }
 
   {
-    G1PrepareEvacuationTask g1_prep_task(_g1h, evac_failure_regions);
+    G1PrepareEvacuationTask g1_prep_task(_g1h);
     Tickspan task_time = run_task_timed(&g1_prep_task);
 
     G1MonotonicArenaMemoryStats sampled_card_set_stats = g1_prep_task.all_card_set_stats();
@@ -1122,7 +1104,7 @@ void G1YoungCollector::collect() {
     // other trivial setup above).
     policy()->record_young_collection_start();
 
-    pre_evacuate_collection_set(jtm.evacuation_info(), &_evac_failure_regions);
+    pre_evacuate_collection_set(jtm.evacuation_info());
 
     G1ParScanThreadStateSet per_thread_states(_g1h,
                                               workers()->active_workers(),
diff --git a/src/hotspot/share/gc/g1/g1YoungCollector.hpp b/src/hotspot/share/gc/g1/g1YoungCollector.hpp
index 9b304d61d6f..d6835389801 100644
--- a/src/hotspot/share/gc/g1/g1YoungCollector.hpp
+++ b/src/hotspot/share/gc/g1/g1YoungCollector.hpp
@@ -95,8 +95,7 @@ class G1YoungCollector {
 
   void set_young_collection_default_active_worker_threads();
 
-  void pre_evacuate_collection_set(G1EvacInfo* evacuation_info,
-                                   G1EvacFailureRegions* evac_failure_regions);
+  void pre_evacuate_collection_set(G1EvacInfo* evacuation_info);
   // Actually do the work of evacuating the parts of the collection set.
   // The has_optional_evacuation_work flag for the initial collection set
   // evacuation indicates whether one or more optional evacuation steps may
diff --git a/test/hotspot/jtreg/gc/g1/pinnedobjs/TestPinnedEvacEmpty.java b/test/hotspot/jtreg/gc/g1/pinnedobjs/TestPinnedEvacEmpty.java
deleted file mode 100644
index dbc05ad57e2..00000000000
--- a/test/hotspot/jtreg/gc/g1/pinnedobjs/TestPinnedEvacEmpty.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact 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 pinned regions with no Java references into them
- *          do not make the garbage collector reclaim that region.
- *          This test simulates this behavior using Whitebox/Unsafe methods
- *          to pin a Java object in a region with no other pinnable objects and
-*           lose the reference to it before the garbage collection.
- * @requires vm.gc.G1
- * @requires vm.debug
- * @library /test/lib
- * @modules java.base/jdk.internal.misc:+open
- *          java.management
- * @build jdk.test.whitebox.WhiteBox
- * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox
- * @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:+UseG1GC
- *      -Xbootclasspath/a:. -Xlog:gc=debug,gc+ergo+cset=trace,gc+phases=debug -XX:G1HeapRegionSize=1m -Xms30m  gc.g1.pinnedobjs.TestPinnedEvacEmpty
- */
-
-package gc.g1.pinnedobjs;
-
-import jdk.internal.misc.Unsafe;
-
-import jdk.test.lib.Asserts;
-import jdk.test.lib.process.OutputAnalyzer;
-import jdk.test.lib.process.ProcessTools;
-import jdk.test.whitebox.WhiteBox;
-
-public class TestPinnedEvacEmpty {
-
-    private static final jdk.internal.misc.Unsafe unsafe = Unsafe.getUnsafe();
-    private static final WhiteBox wb = WhiteBox.getWhiteBox();
-
-    private static final long objSize = wb.getObjectSize(new Object());
-
-    // How many j.l.Object should we allocate when creating garbage.
-    private static final long numAllocations = 1024 * 1024 * 3 / objSize;
-
-    public static void main(String[] args) throws Exception {
-        // Remove garbage from VM initialization.
-        wb.fullGC();
-
-        // Allocate garbage so that the target object will be in a new region.
-        for (int i = 0; i < numAllocations; i++) {
-          Object z = new Object();
-        }
-        int[] o = new int[100];  // The target object to pin.
-        // Further allocate garbage so that any additional allocations of potentially
-        // pinned objects can not be allocated in the same region as the target object.
-        for (int i = 0; i < numAllocations; i++) {
-          Object z = new Object();
-        }
-
-        Asserts.assertTrue(!wb.isObjectInOldGen(o), "should not be in old gen already");
-
-        // Pin the object.
-        wb.pinObject(o);
-
-        // And forget the (Java) reference to the int array. After this, the garbage
-        // collection should find a completely empty pinned region. The collector
-        // must not collect/free it.
-        o = null;
-
-        // Do garbage collection to zap the data in the pinned region.
-        wb.youngGC();
-    }
-}
-

From 07667ca2f40782bd50e2551ab9f24bee38ae2bfb Mon Sep 17 00:00:00 2001
From: Magnus Ihse Bursie <ihse@openjdk.org>
Date: Fri, 21 Mar 2025 10:20:29 +0000
Subject: [PATCH 421/587] 8352506: Simplify make/test/JtregNativeHotspot.gmk

Reviewed-by: erikj
---
 make/common/TestFilesCompilation.gmk |    7 +-
 make/test/JtregNativeHotspot.gmk     | 1571 ++------------------------
 2 files changed, 83 insertions(+), 1495 deletions(-)

diff --git a/make/common/TestFilesCompilation.gmk b/make/common/TestFilesCompilation.gmk
index 9e076590cf3..fd1c54eaf48 100644
--- a/make/common/TestFilesCompilation.gmk
+++ b/make/common/TestFilesCompilation.gmk
@@ -43,6 +43,9 @@ include JdkNativeCompilation.gmk
 #   OUTPUT_DIR Where to put the resulting files
 #   EXCLUDE A list of filenames to exclude from compilation
 #   EXTRA_FILES List of extra files not in SOURCE_DIRS
+#   CFLAGS List of extra CFLAGS to pass on for each test
+#   LDFLAGS List of extra LDFLAGS to pass on for each test
+#   LIBS List of extra LIBS to pass on for each test
 SetupTestFilesCompilation = $(NamedParamsMacroTemplate)
 define SetupTestFilesCompilationBody
 
@@ -108,7 +111,7 @@ define SetupTestFilesCompilationBody
         CFLAGS := $$(TEST_CFLAGS) $$($1_CFLAGS) $$($1_CFLAGS_$$(name)), \
         CXXFLAGS := $$(TEST_CFLAGS) $$($1_CFLAGS) $$($1_CFLAGS_$$(name)), \
         LD_SET_ORIGIN := $$($1_LD_SET_ORIGIN), \
-        LDFLAGS := $$($1_LDFLAGS_$$(name)), \
+        LDFLAGS := $$($1_LDFLAGS) $$($1_LDFLAGS_$$(name)), \
         DISABLED_WARNINGS_gcc := format undef unused-but-set-variable \
             unused-const-variable unused-function unused-value \
             unused-variable, \
@@ -117,7 +120,7 @@ define SetupTestFilesCompilationBody
             unused-but-set-variable unused-function unused-variable, \
         DEFAULT_LIBCXX := false, \
         JDK_LIBS := $$($1_JDK_LIBS_$$(name)), \
-        LIBS := $$($1_LIBS_$$(name)), \
+        LIBS := $$($1_LIBS) $$($1_LIBS_$$(name)), \
         DEFAULT_VERSIONINFO_RESOURCE := false, \
         OPTIMIZATION := $$(if $$($1_OPTIMIZATION_$$(name)), $$($1_OPTIMIZATION_$$(name)), LOW), \
         COPY_DEBUG_SYMBOLS := $$($1_COPY_DEBUG_SYMBOLS), \
diff --git a/make/test/JtregNativeHotspot.gmk b/make/test/JtregNativeHotspot.gmk
index e560ad6af70..207f82241aa 100644
--- a/make/test/JtregNativeHotspot.gmk
+++ b/make/test/JtregNativeHotspot.gmk
@@ -39,1530 +39,113 @@ include TestFilesCompilation.gmk
 ################################################################################
 
 # This might have been added to by a custom extension.
-BUILD_HOTSPOT_JTREG_NATIVE_SRC += $(TOPDIR)/test/hotspot/jtreg
-
-BUILD_HOTSPOT_JTREG_OUTPUT_DIR := $(OUTPUTDIR)/support/test/hotspot/jtreg/native
-
-BUILD_HOTSPOT_JTREG_IMAGE_DIR := $(TEST_IMAGE_DIR)/hotspot/jtreg
-
-################################################################################
-# Former VM TestBase tests.
-################################################################################
+HOTSPOT_JTREG_NATIVE_SRC += $(TOPDIR)/test/hotspot/jtreg
 
+HOTSPOT_JTREG_OUTPUT_DIR := $(OUTPUTDIR)/support/test/hotspot/jtreg/native
 VM_TESTBASE_DIR := $(TOPDIR)/test/hotspot/jtreg/vmTestbase
-
-VM_SHARE_INCLUDES := \
-    -I$(VM_TESTBASE_DIR)/vm/share \
-    -I$(VM_TESTBASE_DIR)/nsk/share/native \
-    -I$(VM_TESTBASE_DIR)/nsk/share/jni \
-    #
-
-NSK_MONITORING_INCLUDES := \
-    -I$(VM_TESTBASE_DIR)/nsk/share/native \
-    -I$(VM_TESTBASE_DIR)/nsk/share/jni \
-    #
-
-NSK_JDI_INCLUDES := \
-    -I$(VM_TESTBASE_DIR)/nsk/share/native \
-    #
-
-NSK_SHARE_JDI_INCLUDES := \
-    -I$(VM_TESTBASE_DIR)/nsk/share/native \
-    -I$(VM_TESTBASE_DIR)/nsk/share/jdi \
-    #
-
-NSK_SHARE_JNI_INCLUDES := \
-    -I$(VM_TESTBASE_DIR)/nsk/share/native \
-    -I$(VM_TESTBASE_DIR)/nsk/share/jni \
-    #
-
-RUNTIME_DEFMETH_INCLUDES := \
-    -I$(TOPDIR)/test/hotspot/jtreg/vmTestbase/nsk/share/jni \
-    -I$(TOPDIR)/test/hotspot/jtreg/vmTestbase/nsk/share/native \
-    -I$(TOPDIR)/test/hotspot/jtreg/vmTestbase/nsk/share/jvmti \
-    #
-
-NSK_SHARE_LOCKS_INCLUDES := \
-    -I$(VM_TESTBASE_DIR)/nsk/share/native \
-    -I$(VM_TESTBASE_DIR)/nsk/share/locks \
-    #
-
-MLVM_JVMTI_INCLUDES := \
-    -I$(VM_TESTBASE_DIR)/nsk/share/native \
-    -I$(VM_TESTBASE_DIR)/nsk/share/jni \
-    -I$(VM_TESTBASE_DIR)/nsk/share/jvmti \
-    -I$(VM_TESTBASE_DIR)/nsk/share/jvmti/agent_common \
-    -I$(VM_TESTBASE_DIR)/vm/mlvm/share \
-    #
-
-MLVM_STRESS_INCLUDES := \
-    -I$(VM_TESTBASE_DIR)/nsk/share/native \
-    -I$(VM_TESTBASE_DIR)/nsk/share/jni \
-    #
-
-NSK_GC_LOCK_JNI_INCLUDES := \
-    -I$(VM_TESTBASE_DIR)/nsk/share/gc/lock/jni \
-    -I$(VM_TESTBASE_DIR)/nsk/share/native \
-    -I$(VM_TESTBASE_DIR)/nsk/share/jni \
-    #
-
-NSK_GC_LOCK_REF_INCLUDES := \
-    -I$(VM_TESTBASE_DIR)/nsk/share/gc/lock/jniref \
-    -I$(VM_TESTBASE_DIR)/nsk/share/native \
-    -I$(VM_TESTBASE_DIR)/nsk/share/jni \
-    #
-
-NSK_STRACE_INCLUDES := \
-    -I$(VM_TESTBASE_DIR)/nsk/share/native \
-    -I$(VM_TESTBASE_DIR)/nsk/share/jni \
-    #
-
-NSK_STRESS_JNI_INCLUDES := \
-    -I$(VM_TESTBASE_DIR)/nsk/stress/jni \
-    #
-
-NSK_JVMTI_AGENT_INCLUDES := \
-    -I$(VM_TESTBASE_DIR)/nsk/share/jni \
-    -I$(VM_TESTBASE_DIR)/nsk/share/native \
-    -I$(VM_TESTBASE_DIR)/nsk/share/jvmti \
-    -I$(VM_TESTBASE_DIR)/nsk/share/jvmti/agent_common \
-    #
-
-NSK_JVMTI_AOD_INCLUDES := \
-    -I$(VM_TESTBASE_DIR)/nsk/share/jni \
-    -I$(VM_TESTBASE_DIR)/nsk/share/native \
-    -I$(VM_TESTBASE_DIR)/nsk/share/aod \
-    -I$(VM_TESTBASE_DIR)/nsk/share/jvmti \
-    -I$(VM_TESTBASE_DIR)/nsk/share/jvmti/aod \
-    #
-
-NSK_AOD_INCLUDES := \
-    -I$(VM_TESTBASE_DIR)/nsk/share/aod \
-    -I$(VM_TESTBASE_DIR)/nsk/share/native \
-    -I$(VM_TESTBASE_DIR)/nsk/share/jni \
-    #
-
-NO_FRAMEPOINTER_CFLAGS :=
-ifeq ($(call isTargetOs, linux), true)
-  NO_FRAMEPOINTER_CFLAGS := -fomit-frame-pointer
-endif
-
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libNoFramePointer := $(NO_FRAMEPOINTER_CFLAGS)
-# Optimization -O3 needed, HIGH == -O3
-BUILD_HOTSPOT_JTREG_LIBRARIES_OPTIMIZATION_libNoFramePointer := HIGH
-
-JVMTI_COMMON_INCLUDES = -I$(TOPDIR)/test/lib/jdk/test/lib/jvmti
-
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libProcessUtils := $(VM_SHARE_INCLUDES)
-
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libThreadController := $(NSK_MONITORING_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libDeadlock := $(NSK_MONITORING_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libRecursiveMonitoringThread := $(NSK_MONITORING_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libLockingThreads := $(NSK_MONITORING_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libStackTraceController := $(NSK_MONITORING_INCLUDES)
-
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libredefineClasses := $(RUNTIME_DEFMETH_INCLUDES)
-
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libforceEarlyReturn005a := $(NSK_JDI_INCLUDES)
-
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libMonitorEnterExecutor := $(NSK_SHARE_JDI_INCLUDES)
-
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libJNIreferences := $(NSK_SHARE_JNI_INCLUDES)
-
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libLockingThread := $(NSK_SHARE_LOCKS_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libJNIMonitorLocker := $(NSK_SHARE_LOCKS_INCLUDES)
-
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libstepBreakPopReturn := $(MLVM_JVMTI_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libIndyRedefineClass := $(MLVM_JVMTI_INCLUDES)
-
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libnativeAndMH := $(MLVM_STRESS_INCLUDES)
-
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libBooleanArrayCriticalLocker := $(NSK_GC_LOCK_JNI_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libByteArrayCriticalLocker := $(NSK_GC_LOCK_JNI_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libCharArrayCriticalLocker := $(NSK_GC_LOCK_JNI_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libDoubleArrayCriticalLocker := $(NSK_GC_LOCK_JNI_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libFloatArrayCriticalLocker := $(NSK_GC_LOCK_JNI_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libIntArrayCriticalLocker := $(NSK_GC_LOCK_JNI_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libLongArrayCriticalLocker := $(NSK_GC_LOCK_JNI_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libShortArrayCriticalLocker := $(NSK_GC_LOCK_JNI_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libStringCriticalLocker := $(NSK_GC_LOCK_JNI_INCLUDES)
-
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libJNIGlobalRefLocker := $(NSK_GC_LOCK_REF_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libJNILocalRefLocker := $(NSK_GC_LOCK_REF_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libJNIRefLocker := $(NSK_GC_LOCK_REF_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libJNIWeakGlobalRefLocker := $(NSK_GC_LOCK_REF_INCLUDES)
-
-
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libstrace003 := $(NSK_STRACE_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libstrace004 := $(NSK_STRACE_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libstrace005 := $(NSK_STRACE_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libstrace006 := $(NSK_STRACE_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libstrace008 := $(NSK_STRACE_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libstrace009 := $(NSK_STRACE_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libstrace011 := $(NSK_STRACE_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libstrace012 := $(NSK_STRACE_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libstrace014 := $(NSK_STRACE_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libstrace015 := $(NSK_STRACE_INCLUDES)
-
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libgcl001 := $(NSK_STRESS_JNI_INCLUDES)
-
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libbootclssearch_agent := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libsystemclssearch_agent := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libgetsysprop001 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libgetsysprop002 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libgetlocal001 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libgetlocal002 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libGetEnv001 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libgetvern001 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libgetfldecl002 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libgetfldecl004 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libgetfldecl001 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libloadedclss001 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libloadedclss002 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libextevents001 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libdatadumpreq001 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libtimerinfo001 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libthrstat002 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libthrstat005 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libthrstat004 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libthrstat003 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libthrstat001 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libframecnt001 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libframecnt002 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libframecnt003 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libcontmon003 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libcontmon002 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libcontmon001 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libthrtimerinfo001 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libsetenvstor001 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libsetenvstor002 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libsetenvstor003 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libframeloc002 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libframeloc003 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libframeloc001 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libredefclass009 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libredefclass031 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libredefclass001 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libredefclass006 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libredefclass030 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libredefclass008 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libredefclass015 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libredefclass012 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libredefclass024 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libredefclass023 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libredefclass022 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libredefclass025 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libredefclass013 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libredefclass014 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libstressRedefine := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libredefclass003 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libredefclass004 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libredefclass005 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libredefclass002 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libredefclass011 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libredefclass029 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libredefclass016 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libredefclass020 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libredefclass018 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libredefclass027 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libredefclass019 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libredefclass026 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libredefclass021 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libredefclass028 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libredefclass017 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libredefclass010 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libgetjlocfmt002 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libgetjlocfmt001 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libgetlocal003 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libgetlocal004 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libgetallstktr001 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libgetcpool001 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libextmech := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libagentthr := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libheapref := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_librefignore := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libIsSyntheticIssynth001 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_liblinetab004 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libgc := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_librawmonitor := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libfollowref002 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libfollowref005 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libfollowref004 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libfollowref003 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libfollowref006 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libfollowref001 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libclsldrclss00x := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libearlyretvoid := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libearlyretlong := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libearlyretint := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libearlyretbase := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libearlyretstr := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libearlyretobj := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libearlyretfp := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libgetavailproc001 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libgetclstat006 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libgetclstat007 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libgetclstat005 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libthrinfo002 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libthrinfo001 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libsetthrdstor002 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libsetthrdstor003 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libsetthrdstor001 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libobjsize001 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libaddcaps001 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libaddcaps002 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libaddcaps003 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libgetclmthd007 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libgetclmthd006 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libgetclmthd005 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libfieldacc003 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libfieldacc004 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libfieldacc002 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libfieldacc001 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libgetsrcfn006 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libgetsrcfn005 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libgetsrcfn004 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libgetthrdstor001 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libintrpthrd001 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libintrpthrd002 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libintrpthrd003 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libnativemethbind002 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libnativemethbind004 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libnativemethbind003 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libnativemethbind001 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libgetenvstor001 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libsetextevent001 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libgetpotcaps001 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libiterobjreachobj001 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libiterobjreachobj002 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libiterobjreachobj005 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libiterobjreachobj004 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libiterobjreachobj003 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libclrfldw002 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libclrfldw001 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libvminit001 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libsuspendthrd001 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libsuspendthrd002 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libsuspendthrd003 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libsuspendvthr001 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libdeclcls002 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libdeclcls003 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libdeclcls001 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libsetjniftab002 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libsetjniftab001 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libgeterrname002 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libgeterrname001 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libsettag001 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libstopthrd007 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libstopthrd006 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libgenevents001 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libgetfldmdf004 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libgetfldmdf003 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libresumethrdlst001 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libresumethrdlst002 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libsetbrk008 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libsetbrk007 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libsetbrk005 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libsetbrk002 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libsetbrk003 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libsuspendthrdlst001 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libsuspendthrdlst002 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libIsMethodSyntheticIssynth001 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libissynth002 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libagentonunload001 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libsetsysprop002 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libsetsysprop003 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libgettag001 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libnframepop001 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libnframepop003 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libnframepop002 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libvmobjalloc001 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libobjwithtags001 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_librawmnntfy004 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_librawmnntfy003 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_librawmnntfy002 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_librawmnntfy001 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libmethmod001 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libmethmod002 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libmentry002 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libmentry001 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libiterheap004 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libiterheap003 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libiterheap002 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libiterheap005 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libiterheap007 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libiterheap006 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libiterheap001 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libpopframe005 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libpopframe002 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libpopframe003 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libpopframe004 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libpopframe010 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libpopframe011 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libpopframe001 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libpopframe006 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libpopframe008 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libpopframe009 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libpopframe007 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libcurthrtimerinfo001 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_librawmnwait004 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_librawmnwait003 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_librawmnwait002 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_librawmnwait005 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_librawmnwait001 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libsetfldw001 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libsetfldw006 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libsetfldw003 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libsetfldw004 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libsetfldw005 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libsetfldw002 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libclrfmodw001 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libclrfmodw002 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libisnative002 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libisnative001 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libiterreachobj002 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libiterreachobj005 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libiterreachobj004 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libiterreachobj003 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libiterreachobj001 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_liballthr001 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_liballthr002 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libobjhashcode001 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libdyncodgen001 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libsetnotif001 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libmexit001 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libmexit002 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libmethloc002 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libmethloc001 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libbreakpoint001 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libgetcaps001 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libgetcaps002 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libclsldrclss001 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libclsldrclss002 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_liblinetab001 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_liblinetab003 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_liblinetab002 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libmaxloc001 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libmaxloc002 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libclassfloadhk002 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libclassfloadhk005 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libclassfloadhk004 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libclassfloadhk003 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libclassfloadhk008 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libclassfloadhk006 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libclassfloadhk001 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libclassfloadhk007 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libclassfloadhk009 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libgetintrf006 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libgetintrf007 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libgetintrf005 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libexcatch001 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libresumethrd002 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libresumethrd001 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libobjfree001 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libobjfree002 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libfieldmod002 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libfieldmod001 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libextfuncs001 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libSetNativeMethodPrefix002Main := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libSetNativeMethodPrefix002 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libSetNativeMethodPrefix001 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libclassprep001 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libsetvrbflag002 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libsetvrbflag001 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libmcontentered001 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libsetevntcallb001 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libsetevntcallb002 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libsetevntcallb003 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_librawmnntfyall002 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_librawmnntfyall004 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_librawmnntfyall003 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_librawmnntfyall001 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libgcfinish001 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libownmoninf002 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libownmoninf003 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libownmoninf001 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libgetfldnm003 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libgetfldnm004 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libgetfldnm005 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libgf08t001 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libgf08t002 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libgf08t003 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libgf01t001 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libgf06t001 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libgf04t001 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libbi02t002 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libbi02t001 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libbi03t002 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libbi03t001 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libbi04t002 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libbi01t002 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libbi01t001 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libex03t001 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libcm02t001 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libcm03t001 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libcm01t013 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libcm01t014 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libcm01t015 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libcm01t012 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libcm01t001 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libcm01t006 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libcm01t008 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libcm01t009 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libcm01t007 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libcm01t019 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libcm01t021 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libcm01t017 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libcm01t010 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libcm01t011 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libcm01t016 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libcm01t020 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libcm01t018 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libcm01t005 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libcm01t002 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libcm01t003 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libcm01t004 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libsp02t001 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libsp02t003 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libsp02t002 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libsp05t003 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libsp05t002 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libsp04t001 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libsp04t002 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libsp03t001 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libsp03t002 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libsp06t001 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libsp06t002 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libsp06t003 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libsp01t001 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libsp01t002 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libsp01t003 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libsp07t001 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libsp07t002 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libtc04t001 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libtc03t001 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libtc03t002 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libtc02t001 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libtc05t001 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libtc01t001 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libma08t001a := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libma08t001 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libma01t001 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libma01t001a := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libma06t001a := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libma06t001 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libma07t001a := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libma07t001 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libma05t001a := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libma05t001 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libma02t001a := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libma02t001 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libma03t001 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libma03t001a := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libma04t003 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libma04t003a := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libma04t002a := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libma04t002 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libma04t001a := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libma04t001 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libma10t003a := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libma10t003 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libma10t004a := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libma10t004 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libma10t005 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libma10t005a := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libma10t002 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libma10t002a := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libma10t007 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libma10t007a := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libma10t008 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libma10t008a := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libma10t001 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libma10t001a := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libma10t006 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libma10t006a := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libhs103t002 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libhs104t002 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libhs104t001 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libhs301t002 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libhs301t005 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libhs301t004 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libhs301t003 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libhs301t001 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libhs203t002 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libhs203t004 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libhs203t003 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libhs203t001 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libhs204t002 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libhs204t003 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libhs204t004 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libhs204t001 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libhs202t002 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libhs202t001 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libhs302t004 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libhs302t003 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libhs302t002 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libhs302t005 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libhs302t011 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libhs302t010 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libhs302t007 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libhs302t009 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libhs302t008 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libhs302t006 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libhs302t001 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libhs302t012 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libhs201t003 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libhs201t002 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libhs201t001 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libem06t001 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libem01t001 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libem01t002 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libem07t001 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libem07t002 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libem02t006 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libem02t001 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libem02t008 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libem02t009 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libem02t007 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libem02t012 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libem02t002 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libem02t005 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libem02t004 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libem02t003 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libem02t010 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libem02t011 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libem05t001 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libem05t002 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libem04t001 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libji01t001 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libji06t001 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libji03t003 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libji03t004 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libji03t002 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libji03t001 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libji05t001 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libap10t001 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libap11t001 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libap02t001 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libap05t001 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libap05t002 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libap04t001 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libap04t002 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libap04t003 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libap03t001 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libap12t001 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libap06t001 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libap01t001 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libap09t001 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libap07t001 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libap07t002 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libthreadstart001 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libthreadstart003 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libthreadstart002 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_librawmonenter002 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_librawmonenter003 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_librawmonenter004 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_librawmonenter001 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libdealloc001 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libisfldsin003 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libisfldsin002 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libthrgrpinfo001 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libthrgrpinfo002 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libAbort := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libCallbacks := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libNonConcreteKlassFilter := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libConcreteKlassFilter := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libHeapFilter := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libmcontenter001 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libclrbrk001 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libclrbrk002 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libclrbrk005 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libtopthrgrp002 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libtopthrgrp001 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libisarray004 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libisarray005 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libbytecodes003 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libbytecodes002 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libbytecodes001 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libthreadend001 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libthreadend002 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libgetthrdgrpchld001 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libmonitorwait001 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_liballoc001 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libsrcdebugex003 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libsrcdebugex002 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libsrcdebugex001 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libcrrawmon002 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libcrrawmon001 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libgetjniftab001 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libgetjniftab002 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libgetclsldr003 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libgetclsldr002 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libgetclsldr001 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libcurthrcputime001 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_librawmonexit001 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_librawmonexit002 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_librawmonexit005 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_librawmonexit003 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libisobsolete001 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libargsize001 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libargsize002 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libgetclfld007 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libgetclfld006 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libgetclfld005 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libgetstacktr006 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libgetstacktr001 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libgetstacktr008 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libgetstacktr009 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libgetstacktr007 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libgetstacktr002 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libgetstacktr005 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libgetstacktr004 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libgetstacktr003 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_liblocaltab001 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_liblocaltab004 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_liblocaltab003 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_liblocaltab002 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_liblocaltab005 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libclassload001 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libisintrf004 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libisintrf005 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libframepop001 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libframepop002 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libgetclsig005 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libgetclsig004 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libgetclsig006 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libdisposeenv002 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libdisposeenv001 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libexception001 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libexceptionjni001 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libresexhausted := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libgcstart001 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libgcstart002 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libiterinstcls005 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libiterinstcls002 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libiterinstcls003 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libiterinstcls004 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libiterinstcls001 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libiterinstcls006 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libiterinstcls007 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libmethname002 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libmethname003 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libmethname001 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libforcegc001 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libforcegc002 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libgettime001 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libobjmonusage004 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libobjmonusage003 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libobjmonusage002 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libobjmonusage005 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libobjmonusage006 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libobjmonusage001 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libagentonload001 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libagentonload002 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libagentonload003 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libthrcputime002 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libthrcputime001 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libmonitorwaited001 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libForceEarlyReturn001 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libagentthr003 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libagentthr002 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libagentthr001 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libcompmethunload001 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libretransform002 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libretransform004 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libretransform003 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libgetclmdf007 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libgetclmdf006 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libgetclmdf004 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libgetclmdf005 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libsetlocal001 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libsetlocal004 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libsetlocal003 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libsetlocal002 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libcompmethload001 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libgetsysprops001 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libgetsysprops002 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libdrrawmon003 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libdrrawmon004 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libdrrawmon001 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libsinglestep001 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libsinglestep003 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libsinglestep002 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_librelcaps001 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_librelcaps002 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libsetfmodw004 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libsetfmodw003 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libsetfmodw002 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libsetfmodw005 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libsetfmodw006 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libsetfmodw001 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libvmdeath001 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libgetphase001 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libgetphase002 := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libMethodBind := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libOnUnload := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libStackTrace := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libredefineCFLH := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libAddToBootstrapClassLoaderSearch := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libDispose := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libenvironment := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libnosuspendMonitorInfo := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libnosuspendStackTrace := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libsetNullVMInit := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libtimers := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libHeap := $(NSK_JVMTI_AGENT_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libHotSwap := $(NSK_JVMTI_AGENT_INCLUDES)
-
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libattach046Agent00 := $(NSK_JVMTI_AOD_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libattach041Agent00 := $(NSK_JVMTI_AOD_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libattach015Agent01 := $(NSK_JVMTI_AOD_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libattach015Target := $(NSK_JVMTI_AOD_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libattach015Agent00 := $(NSK_JVMTI_AOD_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libattach012Agent00 := $(NSK_JVMTI_AOD_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libattach040Agent00 := $(NSK_JVMTI_AOD_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libattach014Agent00 := $(NSK_JVMTI_AOD_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libattach022Agent00 := $(NSK_JVMTI_AOD_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libattach038Agent00 := $(NSK_JVMTI_AOD_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libattach009Agent00 := $(NSK_JVMTI_AOD_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libsimpleAgent00 := $(NSK_JVMTI_AOD_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libattach037Agent00 := $(NSK_JVMTI_AOD_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libattach008Agent00 := $(NSK_JVMTI_AOD_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libattach039Agent00 := $(NSK_JVMTI_AOD_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libattach020Agent00 := $(NSK_JVMTI_AOD_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libattach042Agent00 := $(NSK_JVMTI_AOD_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libattach045Agent00 := $(NSK_JVMTI_AOD_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libattach045Agent03 := $(NSK_JVMTI_AOD_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libattach045Agent02 := $(NSK_JVMTI_AOD_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libattach045Agent01 := $(NSK_JVMTI_AOD_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libattach002aAgent00 := $(NSK_JVMTI_AOD_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libattach021Agent00 := $(NSK_JVMTI_AOD_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libattach050Agent00 := $(NSK_JVMTI_AOD_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libattach002Agent00 := $(NSK_JVMTI_AOD_INCLUDES)
-
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libVirtualMachine07agent00 := $(NSK_AOD_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libVirtualMachine07agent01 := $(NSK_AOD_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libVirtualMachine07agent02 := $(NSK_AOD_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libVirtualMachine07agent03 := $(NSK_AOD_INCLUDES)
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libVirtualMachine09agent00 := $(NSK_AOD_INCLUDES)
+NSK_SHARE_DIR := $(VM_TESTBASE_DIR)/nsk/share
 
 ################################################################################
+# Platform independent setup
 
+# Optimization -O3 needed, HIGH == -O3
+HOTSPOT_JTREG_LIBRARIES_OPTIMIZATION_libNoFramePointer := HIGH
+
+HOTSPOT_JTREG_EXECUTABLES_JDK_LIBS_exesigtest := java.base:libjvm
+HOTSPOT_JTREG_EXECUTABLES_JDK_LIBS_exedaemonDestroy := java.base:libjvm
+
+################################################################################
 # Platform specific setup
+
 ifeq ($(call isTargetOs, linux), true)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LDFLAGS_libtest-rw := -z noexecstack
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LDFLAGS_libtest-rwx := -z execstack
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libstepBreakPopReturn := $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libIndyRedefineClass := $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libredefineClasses := $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_EXECUTABLES_JDK_LIBS_exeinvoke := java.base:libjvm
-  BUILD_HOTSPOT_JTREG_EXECUTABLES_JDK_LIBS_exestack-gap := java.base:libjvm
-  BUILD_HOTSPOT_JTREG_EXECUTABLES_JDK_LIBS_exestack-tls := java.base:libjvm
-  BUILD_HOTSPOT_JTREG_EXECUTABLES_LIBS_exeinvoke := $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_EXECUTABLES_LIBS_exestack-gap := $(LIBPTHREAD)
-  BUILD_TEST_exeinvoke_exeinvoke.c_OPTIMIZATION := NONE
-  BUILD_HOTSPOT_JTREG_EXECUTABLES_LIBS_exeFPRegs := -ldl
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libatExit += -ldl
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libAsyncGetCallTraceTest := -ldl
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LDFLAGS_libfast-math := -ffast-math
+  HOTSPOT_JTREG_LIBRARIES_CFLAGS_libNoFramePointer := -fomit-frame-pointer
+  HOTSPOT_JTREG_LIBRARIES_LDFLAGS_libtest-rw := -z noexecstack
+  HOTSPOT_JTREG_LIBRARIES_LDFLAGS_libtest-rwx := -z execstack
+  HOTSPOT_JTREG_EXECUTABLES_JDK_LIBS_exeinvoke := java.base:libjvm
+  HOTSPOT_JTREG_EXECUTABLES_JDK_LIBS_exestack-gap := java.base:libjvm
+  HOTSPOT_JTREG_EXECUTABLES_JDK_LIBS_exestack-tls := java.base:libjvm
+  TEST_exeinvoke_exeinvoke.c_OPTIMIZATION := NONE
+  HOTSPOT_JTREG_EXECUTABLES_LIBS_exeFPRegs := -ldl
+  HOTSPOT_JTREG_LIBRARIES_LIBS_libatExit += -ldl
+  HOTSPOT_JTREG_LIBRARIES_LIBS_libAsyncGetCallTraceTest := -ldl
+  HOTSPOT_JTREG_LIBRARIES_LDFLAGS_libfast-math := -ffast-math
 else
-  BUILD_HOTSPOT_JTREG_EXCLUDE += libtest-rw.c libtest-rwx.c \
+  HOTSPOT_JTREG_EXCLUDE += libtest-rw.c libtest-rwx.c \
       exeinvoke.c exestack-gap.c exestack-tls.c libAsyncGetCallTraceTest.cpp
 endif
 
-ifeq ($(call And, $(call isTargetOs, linux) $(call isTargetCpu, aarch64)), false)
-  BUILD_HOTSPOT_JTREG_EXCLUDE += libTestSVEWithJNI.c
+ifneq ($(call isTargetOs, linux)+$(call isTargetCpu, aarch64), true+true)
+  HOTSPOT_JTREG_EXCLUDE += libTestSVEWithJNI.c
 endif
 
-
-BUILD_HOTSPOT_JTREG_EXECUTABLES_JDK_LIBS_exesigtest := java.base:libjvm
-BUILD_HOTSPOT_JTREG_EXECUTABLES_JDK_LIBS_exedaemonDestroy := java.base:libjvm
-
 ifeq ($(call isTargetOs, windows), true)
-  BUILD_HOTSPOT_JTREG_EXECUTABLES_CFLAGS_exeFPRegs := -MT
-  BUILD_HOTSPOT_JTREG_EXCLUDE += exesigtest.c libterminatedThread.c libTestJNI.c libCompleteExit.c libMonitorWithDeadObjectTest.c libTestPsig.c exeGetCreatedJavaVMs.c libTestUnloadedClass.cpp
-  BUILD_HOTSPOT_JTREG_LIBRARIES_JDK_LIBS_libnativeStack := java.base:libjvm
+  HOTSPOT_JTREG_EXECUTABLES_CFLAGS_exeFPRegs := -MT
+  HOTSPOT_JTREG_LIBRARIES_JDK_LIBS_libnativeStack := java.base:libjvm
+
+  HOTSPOT_JTREG_EXCLUDE += exesigtest.c libterminatedThread.c libTestJNI.c \
+      libCompleteExit.c libMonitorWithDeadObjectTest.c libTestPsig.c \
+      exeGetCreatedJavaVMs.c libTestUnloadedClass.cpp
 else
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libbootclssearch_agent += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libsystemclssearch_agent += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libgetsysprop001 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libgetsysprop002 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libgetlocal001 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libgetlocal002 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libGetEnv001 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libgetvern001 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libgetfldecl002 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libgetfldecl004 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libgetfldecl001 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libloadedclss001 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libloadedclss002 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libextevents001 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libdatadumpreq001 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libtimerinfo001 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libthrstat002 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libthrstat005 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libthrstat004 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libthrstat003 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libthrstat001 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libframecnt001 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libframecnt002 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libframecnt003 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libcontmon003 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libcontmon002 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libcontmon001 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libthrtimerinfo001 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libsetenvstor001 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libsetenvstor002 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libsetenvstor003 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libframeloc002 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libframeloc003 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libframeloc001 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libredefclass009 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libredefclass031 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libredefclass001 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libredefclass006 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libredefclass030 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libredefclass008 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libredefclass015 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libredefclass012 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libredefclass024 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libredefclass023 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libredefclass022 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libredefclass025 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libredefclass013 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libredefclass014 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libstressRedefine += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libredefclass003 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libredefclass004 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libredefclass005 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libredefclass002 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libredefclass011 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libredefclass029 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libredefclass016 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libredefclass020 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libredefclass018 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libredefclass027 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libredefclass019 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libredefclass026 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libredefclass021 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libredefclass028 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libredefclass017 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libredefclass010 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libgetjlocfmt002 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libgetjlocfmt001 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libgetlocal003 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libgetlocal004 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libgetallstktr001 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libgetcpool001 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libextmech += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libagentthr += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libheapref += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_librefignore += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libIsSyntheticIssynth001 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_liblinetab004 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libgc += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_librawmonitor += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libfollowref002 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libfollowref005 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libfollowref004 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libfollowref003 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libfollowref006 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libfollowref001 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libclsldrclss00x += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libearlyretvoid += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libearlyretlong += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libearlyretint += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libearlyretbase += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libearlyretstr += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libearlyretobj += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libearlyretfp += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libgetavailproc001 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libgetclstat006 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libgetclstat007 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libgetclstat005 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libthrinfo002 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libthrinfo001 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libsetthrdstor002 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libsetthrdstor003 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libsetthrdstor001 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libobjsize001 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libaddcaps001 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libaddcaps002 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libaddcaps003 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libgetclmthd007 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libgetclmthd006 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libgetclmthd005 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libfieldacc003 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libfieldacc004 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libfieldacc002 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libfieldacc001 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libgetsrcfn006 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libgetsrcfn005 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libgetsrcfn004 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libgetthrdstor001 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libintrpthrd001 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libintrpthrd002 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libintrpthrd003 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libnativemethbind002 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libnativemethbind004 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libnativemethbind003 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libnativemethbind001 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libgetenvstor001 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libsetextevent001 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libgetpotcaps001 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libiterobjreachobj001 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libiterobjreachobj002 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libiterobjreachobj005 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libiterobjreachobj004 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libiterobjreachobj003 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libclrfldw002 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libclrfldw001 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libvminit001 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libsuspendthrd001 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libsuspendthrd002 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libsuspendthrd003 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libsuspendvthr001 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libdeclcls002 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libdeclcls003 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libdeclcls001 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libsetjniftab002 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libsetjniftab001 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libgeterrname002 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libgeterrname001 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libsettag001 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libstopthrd007 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libstopthrd006 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libgenevents001 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libgetfldmdf004 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libgetfldmdf003 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libresumethrdlst001 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libresumethrdlst002 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libsetbrk008 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libsetbrk007 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libsetbrk005 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libsetbrk002 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libsetbrk003 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libsuspendthrdlst001 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libsuspendthrdlst002 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libIsMethodSyntheticIssynth001 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libissynth002 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libagentonunload001 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libsetsysprop002 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libsetsysprop003 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libMethodBind += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libOnUnload += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libStackTrace += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libredefineCFLH += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libAddToBootstrapClassLoaderSearch += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libDispose += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libenvironment += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libnosuspendMonitorInfo += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libnosuspendStackTrace += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libsetNullVMInit += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libtimers += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libHeap += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libHotSwap += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libattach046Agent00 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libattach041Agent00 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libattach015Agent01 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libattach015Agent00 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libattach015Target += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libattach012Agent00 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libattach040Agent00 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libattach014Agent00 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libattach022Agent00 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libattach038Agent00 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libattach009Agent00 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libsimpleAgent00 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libattach037Agent00 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libattach008Agent00 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libattach039Agent00 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libattach020Agent00 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libattach042Agent00 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libattach045Agent00 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libattach045Agent03 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libattach045Agent02 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libattach045Agent01 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libattach002aAgent00 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libattach021Agent00 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libattach050Agent00 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libattach002Agent00 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libgettag001 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libnframepop001 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libnframepop003 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libnframepop002 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libvmobjalloc001 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libobjwithtags001 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_librawmnntfy004 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_librawmnntfy003 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_librawmnntfy002 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_librawmnntfy001 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libmethmod001 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libmethmod002 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libmentry002 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libmentry001 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libiterheap004 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libiterheap003 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libiterheap002 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libiterheap005 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libiterheap007 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libiterheap006 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libiterheap001 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libpopframe005 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libpopframe002 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libpopframe003 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libpopframe004 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libpopframe010 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libpopframe011 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libpopframe001 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libpopframe006 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libpopframe008 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libpopframe009 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libpopframe007 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libcurthrtimerinfo001 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_librawmnwait004 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_librawmnwait003 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_librawmnwait002 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_librawmnwait005 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_librawmnwait001 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libsetfldw001 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libsetfldw006 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libsetfldw003 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libsetfldw004 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libsetfldw005 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libsetfldw002 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libclrfmodw001 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libclrfmodw002 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libisnative002 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libisnative001 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libiterreachobj002 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libiterreachobj005 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libiterreachobj004 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libiterreachobj003 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libiterreachobj001 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_liballthr001 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_liballthr002 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libobjhashcode001 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libdyncodgen001 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libsetnotif001 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libmexit001 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libmexit002 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libmethloc002 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libmethloc001 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libbreakpoint001 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libgetcaps001 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libgetcaps002 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libclsldrclss001 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libclsldrclss002 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_liblinetab001 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_liblinetab003 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_liblinetab002 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libmaxloc001 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libmaxloc002 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libclassfloadhk002 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libclassfloadhk005 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libclassfloadhk004 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libclassfloadhk003 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libclassfloadhk008 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libclassfloadhk006 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libclassfloadhk001 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libclassfloadhk007 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libclassfloadhk009 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libgetintrf006 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libgetintrf007 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libgetintrf005 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libexcatch001 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libresumethrd002 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libresumethrd001 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libobjfree001 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libobjfree002 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libfieldmod002 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libfieldmod001 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libextfuncs001 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libSetNativeMethodPrefix002Main += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libSetNativeMethodPrefix002 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libSetNativeMethodPrefix001 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libclassprep001 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libsetvrbflag002 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libsetvrbflag001 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libmcontentered001 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libsetevntcallb001 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libsetevntcallb002 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libsetevntcallb003 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_librawmnntfyall002 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_librawmnntfyall004 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_librawmnntfyall003 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_librawmnntfyall001 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libgcfinish001 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libownmoninf002 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libownmoninf003 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libownmoninf001 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libgetfldnm003 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libgetfldnm004 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libgetfldnm005 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libgf08t001 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libgf08t002 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libgf08t003 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libgf01t001 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libgf06t001 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libgf04t001 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libbi02t002 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libbi02t001 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libbi03t002 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libbi03t001 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libbi04t002 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libbi01t002 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libbi01t001 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libex03t001 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libcm02t001 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libcm03t001 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libcm01t013 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libcm01t014 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libcm01t015 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libcm01t012 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libcm01t001 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libcm01t006 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libcm01t008 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libcm01t009 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libcm01t007 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libcm01t019 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libcm01t021 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libcm01t017 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libcm01t010 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libcm01t011 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libcm01t016 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libcm01t020 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libcm01t018 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libcm01t005 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libcm01t002 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libcm01t003 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libcm01t004 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libsp02t001 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libsp02t003 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libsp02t002 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libsp05t003 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libsp05t002 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libsp04t001 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libsp04t002 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libsp03t001 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libsp03t002 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libsp06t001 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libsp06t002 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libsp06t003 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libsp01t001 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libsp01t002 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libsp01t003 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libsp07t001 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libsp07t002 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libtc04t001 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libtc03t001 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libtc03t002 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libtc02t001 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libtc05t001 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libtc01t001 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libma08t001a += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libma08t001 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libma01t001 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libma01t001a += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libma06t001a += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libma06t001 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libma07t001a += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libma07t001 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libma05t001a += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libma05t001 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libma02t001a += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libma02t001 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libma03t001 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libma03t001a += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libma04t003a += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libma04t003 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libma04t002a += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libma04t002 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libma04t001a += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libma04t001 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libma10t003a += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libma10t003 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libma10t004a += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libma10t004 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libma10t005 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libma10t005a += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libma10t002 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libma10t002a += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libma10t007 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libma10t007a += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libma10t008 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libma10t008a += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libma10t001 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libma10t001a += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libma10t006 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libma10t006a += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libhs103t002 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libhs104t002 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libhs104t001 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libhs301t002 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libhs301t005 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libhs301t004 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libhs301t003 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libhs301t001 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libhs203t002 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libhs203t004 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libhs203t003 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libhs203t001 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libhs204t002 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libhs204t003 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libhs204t004 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libhs204t001 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libhs202t002 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libhs202t001 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_build += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libhs302t004 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libhs302t003 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libhs302t002 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libhs302t005 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libhs302t011 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libhs302t010 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libhs302t007 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libhs302t009 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libhs302t008 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libhs302t006 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libhs302t001 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libhs302t012 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libhs201t003 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libhs201t002 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libhs201t001 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libem06t001 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libem01t001 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libem01t002 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libem07t001 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libem07t002 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libem02t006 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libem02t001 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libem02t008 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libem02t009 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libem02t007 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libem02t012 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libem02t002 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libem02t005 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libem02t004 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libem02t003 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libem02t010 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libem02t011 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libem05t001 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libem05t002 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libem04t001 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libji01t001 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libji06t001 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libji03t003 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libji03t004 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libji03t002 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libji03t001 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libji05t001 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libap10t001 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libap11t001 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libap02t001 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libap05t001 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libap05t002 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libap04t001 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libap04t002 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libap04t003 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libap03t001 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libap12t001 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libap06t001 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libap01t001 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libap09t001 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libap07t001 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libap07t002 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libthreadstart001 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libthreadstart003 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libthreadstart002 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_librawmonenter002 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_librawmonenter003 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_librawmonenter004 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_librawmonenter001 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libdealloc001 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libexceptionjni001 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libisfldsin003 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libisfldsin002 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libthrgrpinfo001 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libthrgrpinfo002 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libAbort += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libCallbacks += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libNonConcreteKlassFilter += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libConcreteKlassFilter += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libHeapFilter += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libmcontenter001 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libclrbrk001 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libclrbrk002 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libclrbrk005 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libtopthrgrp002 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libtopthrgrp001 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libisarray004 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libisarray005 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libbytecodes003 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libbytecodes002 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libbytecodes001 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libthreadend001 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libthreadend002 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libgetthrdgrpchld001 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libmonitorwait001 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_liballoc001 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libsrcdebugex003 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libsrcdebugex002 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libsrcdebugex001 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libcrrawmon002 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libcrrawmon001 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libgetjniftab001 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libgetjniftab002 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libgetclsldr003 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libgetclsldr002 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libgetclsldr001 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libcurthrcputime001 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_librawmonexit001 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_librawmonexit002 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_librawmonexit005 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_librawmonexit003 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libisobsolete001 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libargsize001 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libargsize002 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libgetclfld007 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libgetclfld006 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libgetclfld005 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libgetstacktr006 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libgetstacktr001 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libgetstacktr008 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libgetstacktr009 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libgetstacktr007 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libgetstacktr002 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libgetstacktr005 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libgetstacktr004 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libgetstacktr003 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_liblocaltab001 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_liblocaltab004 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_liblocaltab003 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_liblocaltab002 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_liblocaltab005 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libclassload001 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libisintrf004 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libisintrf005 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libframepop001 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libframepop002 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libgetclsig005 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libgetclsig004 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libgetclsig006 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libdisposeenv002 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libdisposeenv001 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libexception001 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libresexhausted += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libgcstart001 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libgcstart002 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libiterinstcls005 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libiterinstcls002 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libiterinstcls003 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libiterinstcls004 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libiterinstcls001 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libiterinstcls006 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libiterinstcls007 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libmethname002 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libmethname003 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libmethname001 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libforcegc001 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libforcegc002 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libgettime001 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libobjmonusage004 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libobjmonusage003 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libobjmonusage002 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libobjmonusage005 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libobjmonusage006 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libobjmonusage001 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libagentonload001 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libagentonload002 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libagentonload003 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libthrcputime002 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libthrcputime001 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libmonitorwaited001 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libForceEarlyReturn001 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libagentthr003 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libagentthr002 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libagentthr001 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libcompmethunload001 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libretransform002 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libretransform004 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libretransform003 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libgetclmdf007 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libgetclmdf006 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libgetclmdf004 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libgetclmdf005 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libsetlocal001 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libsetlocal004 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libsetlocal003 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libsetlocal002 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libcompmethload001 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libgetsysprops001 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libgetsysprops002 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libdrrawmon003 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libdrrawmon004 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libdrrawmon001 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libsinglestep001 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libsinglestep003 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libsinglestep002 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_librelcaps001 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_librelcaps002 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libsetfmodw004 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libsetfmodw003 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libsetfmodw002 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libsetfmodw005 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libsetfmodw006 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libsetfmodw001 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libvmdeath001 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libgetphase001 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libgetphase002 += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libterminatedThread += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libCompleteExit += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libMonitorWithDeadObjectTest += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libnativeStack += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libTestUnloadedClass += $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_EXECUTABLES_LIBS_exeGetCreatedJavaVMs := $(LIBPTHREAD)
-  BUILD_HOTSPOT_JTREG_EXECUTABLES_JDK_LIBS_exeGetCreatedJavaVMs := java.base:libjvm
+  HOTSPOT_JTREG_EXECUTABLES_JDK_LIBS_exeGetCreatedJavaVMs := java.base:libjvm
 
-  BUILD_HOTSPOT_JTREG_EXCLUDE += libNativeException.c exeGetProcessorInfo.c
+  HOTSPOT_JTREG_EXCLUDE += libNativeException.c exeGetProcessorInfo.c
 endif
 
+################################################################################
+# Global setup
+
+  # Any executable which launches the JVM and uses a custom launcher needs to
+  # explicitly link in the default ASan and LSan options.
 ifeq ($(ASAN_ENABLED), true)
-  # Any executable which launches the JVM and uses a custom launcher needs to explicitly link in the
-  # default ASan options.
-  BUILD_HOTSPOT_JTREG_EXTRA_FILES += $(TOPDIR)/make/data/asan/asan_default_options.c
+  HOTSPOT_JTREG_EXTRA_FILES += $(TOPDIR)/make/data/asan/asan_default_options.c
 endif
-
 ifeq ($(LSAN_ENABLED), true)
-  # Any executable which launches the JVM and uses a custom launcher needs to explicitly link in the
-  # default LSan options.
-  BUILD_HOTSPOT_JTREG_EXTRA_FILES += $(TOPDIR)/make/data/lsan/lsan_default_options.c
+  HOTSPOT_JTREG_EXTRA_FILES += $(TOPDIR)/make/data/lsan/lsan_default_options.c
 endif
 
-# These apply to all tests
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS := -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS -D__STDC_CONSTANT_MACROS $(JVMTI_COMMON_INCLUDES)
-BUILD_HOTSPOT_JTREG_EXECUTABLES_CFLAGS := -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS -D__STDC_CONSTANT_MACROS $(JVMTI_COMMON_INCLUDES)
+HOTSPOT_JTREG_CFLAGS := \
+    -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS -D__STDC_CONSTANT_MACROS \
+    -I$(NSK_SHARE_DIR)/aod \
+    -I$(NSK_SHARE_DIR)/gc/lock/jni \
+    -I$(NSK_SHARE_DIR)/gc/lock/jniref \
+    -I$(NSK_SHARE_DIR)/jdi \
+    -I$(NSK_SHARE_DIR)/jni \
+    -I$(NSK_SHARE_DIR)/jvmti \
+    -I$(NSK_SHARE_DIR)/jvmti/agent_common \
+    -I$(NSK_SHARE_DIR)/jvmti/aod \
+    -I$(NSK_SHARE_DIR)/locks \
+    -I$(NSK_SHARE_DIR)/native \
+    -I$(TOPDIR)/test/lib/jdk/test/lib/jvmti \
+    -I$(VM_TESTBASE_DIR)/nsk/stress/jni \
+    -I$(VM_TESTBASE_DIR)/vm/mlvm/share \
+    -I$(VM_TESTBASE_DIR)/vm/share \
+    #
 
 # This evaluation is expensive and should only be done if this target was
 # explicitly called.
 ifneq ($(filter build-test-hotspot-jtreg-native, $(MAKECMDGOALS)), )
-  $(eval $(call SetupTestFilesCompilation, BUILD_HOTSPOT_JTREG_LIBRARIES, \
+  $(eval $(call SetupTestFilesCompilation, HOTSPOT_JTREG_LIBRARIES, \
       TYPE := LIBRARY, \
-      SOURCE_DIRS := $(BUILD_HOTSPOT_JTREG_NATIVE_SRC), \
-      OUTPUT_DIR := $(BUILD_HOTSPOT_JTREG_OUTPUT_DIR), \
-      EXCLUDE := $(BUILD_HOTSPOT_JTREG_EXCLUDE), \
+      SOURCE_DIRS := $(HOTSPOT_JTREG_NATIVE_SRC), \
+      OUTPUT_DIR := $(HOTSPOT_JTREG_OUTPUT_DIR), \
+      EXCLUDE := $(HOTSPOT_JTREG_EXCLUDE), \
+      CFLAGS := $(HOTSPOT_JTREG_CFLAGS), \
+      LIBS := $(LIBPTHREAD), \
   ))
 
-  $(eval $(call SetupTestFilesCompilation, BUILD_HOTSPOT_JTREG_EXECUTABLES, \
+  $(eval $(call SetupTestFilesCompilation, HOTSPOT_JTREG_EXECUTABLES, \
       TYPE := PROGRAM, \
-      SOURCE_DIRS := $(BUILD_HOTSPOT_JTREG_NATIVE_SRC), \
-      OUTPUT_DIR := $(BUILD_HOTSPOT_JTREG_OUTPUT_DIR), \
-      EXCLUDE := $(BUILD_HOTSPOT_JTREG_EXCLUDE), \
-      EXTRA_FILES := $(BUILD_HOTSPOT_JTREG_EXTRA_FILES), \
+      SOURCE_DIRS := $(HOTSPOT_JTREG_NATIVE_SRC), \
+      OUTPUT_DIR := $(HOTSPOT_JTREG_OUTPUT_DIR), \
+      EXCLUDE := $(HOTSPOT_JTREG_EXCLUDE), \
+      EXTRA_FILES := $(HOTSPOT_JTREG_EXTRA_FILES), \
+      CFLAGS := $(HOTSPOT_JTREG_CFLAGS), \
+      LIBS := $(LIBPTHREAD), \
   ))
 endif
 
-build-test-hotspot-jtreg-native: $(BUILD_HOTSPOT_JTREG_LIBRARIES) $(BUILD_HOTSPOT_JTREG_EXECUTABLES)
+build-test-hotspot-jtreg-native: $(HOTSPOT_JTREG_LIBRARIES) \
+    $(HOTSPOT_JTREG_EXECUTABLES)
 
 ################################################################################
 # Targets for building test-image.
@@ -1570,9 +153,10 @@ build-test-hotspot-jtreg-native: $(BUILD_HOTSPOT_JTREG_LIBRARIES) $(BUILD_HOTSPO
 
 # Copy to hotspot jtreg test image
 $(eval $(call SetupCopyFiles, COPY_HOTSPOT_JTREG_NATIVE, \
-    SRC := $(BUILD_HOTSPOT_JTREG_OUTPUT_DIR), \
+    SRC := $(HOTSPOT_JTREG_OUTPUT_DIR), \
     DEST := $(TEST_IMAGE_DIR)/hotspot/jtreg/native, \
-    FILES := $(wildcard $(addprefix $(BUILD_HOTSPOT_JTREG_OUTPUT_DIR), /bin/* /lib/*)), \
+    FILES := $(wildcard $(addprefix $(HOTSPOT_JTREG_OUTPUT_DIR), /bin/* \
+        /lib/*)), \
     FLATTEN := true, \
 ))
 
@@ -1581,7 +165,8 @@ test-image-hotspot-jtreg-native: $(COPY_HOTSPOT_JTREG_NATIVE)
 all: build-test-hotspot-jtreg-native
 test-image: test-image-hotspot-jtreg-native
 
-.PHONY: build-test-hotspot-jtreg-native test-image-hotspot-jtreg-native test-image
+.PHONY: build-test-hotspot-jtreg-native test-image-hotspot-jtreg-native \
+    test-image
 
 ################################################################################
 

From b32be18bf940eb6eb9805390fd72e0de175c912a Mon Sep 17 00:00:00 2001
From: Albert Mingkun Yang <ayang@openjdk.org>
Date: Fri, 21 Mar 2025 10:35:35 +0000
Subject: [PATCH 422/587] 8352178: Add precondition in VMThread::execute to
 prevent deadlock

Reviewed-by: pchilanomate, tschatzl, dholmes, shade
---
 src/hotspot/share/runtime/vmThread.cpp | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/hotspot/share/runtime/vmThread.cpp b/src/hotspot/share/runtime/vmThread.cpp
index 2cf32e65ddd..0ff5e5d227b 100644
--- a/src/hotspot/share/runtime/vmThread.cpp
+++ b/src/hotspot/share/runtime/vmThread.cpp
@@ -527,6 +527,13 @@ void VMThread::execute(VM_Operation* op) {
     return;
   }
 
+  // The current thread must not belong to the SuspendibleThreadSet, because an
+  // on-the-fly safepoint can be waiting for the current thread, and the
+  // current thread will be blocked in wait_until_executed, resulting in
+  // deadlock.
+  assert(!t->is_suspendible_thread(), "precondition");
+  assert(!t->is_indirectly_suspendible_thread(), "precondition");
+
   // Avoid re-entrant attempts to gc-a-lot
   SkipGCALot sgcalot(t);
 

From 28250f83b728c9b3395d9c4858568a3603172b8a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hannes=20Walln=C3=B6fer?= <hannesw@openjdk.org>
Date: Fri, 21 Mar 2025 11:50:26 +0000
Subject: [PATCH 423/587] 8352151: Fix display issues in javadoc-generated docs

Reviewed-by: liach, nbenalla
---
 .../formats/html/resources/script.js.template | 43 ++++------
 .../formats/html/resources/stylesheet.css     | 83 ++++++++-----------
 2 files changed, 50 insertions(+), 76 deletions(-)

diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/script.js.template b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/script.js.template
index 01b26c4ad06..4042119eb6c 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/script.js.template
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/script.js.template
@@ -464,7 +464,6 @@ document.addEventListener("DOMContentLoaded", function(e) {
         });
     var sections;
     var scrollTimeout;
-    var scrollTimeoutNeeded;
     var prevHash;
     function initSectionData() {
         bodyHeight = document.body.offsetHeight;
@@ -479,35 +478,30 @@ document.addEventListener("DOMContentLoaded", function(e) {
             }));
     }
     function setScrollTimeout() {
-        clearTimeout(scrollTimeout);
-        scrollTimeoutNeeded = false;
+        if (scrollTimeout) {
+            clearTimeout(scrollTimeout);
+        }
         scrollTimeout = setTimeout(() => {
             scrollTimeout = null;
-            handleScroll();
         }, 100);
     }
     function handleScroll() {
         if (!sidebar || !sidebar.offsetParent || sidebar.classList.contains("hide-sidebar")) {
             return;
         }
-        if (scrollTimeout || scrollTimeoutNeeded) {
+        if (scrollTimeout) {
             setScrollTimeout();
             return;
         }
         var scrollTop = document.documentElement.scrollTop;
         var scrollHeight = document.documentElement.scrollHeight;
         var currHash = null;
-        if (scrollHeight - scrollTop < window.innerHeight + 10) {
-            // Select last item if at bottom of the page
-            currHash = "#" + encodeURI(sections.at(-1).id);
-        } else {
-            for (var i = 0; i < sections.length; i++) {
-                var top = sections[i].top;
-                var bottom = sections[i + 1] ? sections[i + 1].top : scrollHeight;
-                if (top + ((bottom - top) / 2) > scrollTop || bottom > scrollTop + (window.innerHeight / 3)) {
-                    currHash = "#" + encodeURI(sections[i].id);
-                    break;
-                }
+        for (var i = 0; i < sections.length; i++) {
+            var top = sections[i].top;
+            var bottom = sections[i + 1] ? sections[i + 1].top : scrollHeight;
+            if (top + ((bottom - top) / 2) > scrollTop || bottom > scrollTop + (window.innerHeight / 3)) {
+                currHash = "#" + encodeURI(sections[i].id);
+                break;
             }
         }
         if (currHash !== prevHash) {
@@ -542,29 +536,26 @@ document.addEventListener("DOMContentLoaded", function(e) {
         document.querySelectorAll("a[href^='#']").forEach((link) => {
             link.addEventListener("click", (e) => {
                 link.blur();
-                scrollTimeoutNeeded = true;
+                setScrollTimeout();
                 setSelected(link.getAttribute("href"));
             })
         });
         sidebar.querySelector("button.hide-sidebar").addEventListener("click", hideSidebar);
         sidebar.querySelector("button.show-sidebar").addEventListener("click", showSidebar);
         window.addEventListener("hashchange", (e) => {
-            scrollTimeoutNeeded = true;
+            setScrollTimeout();
+            const hash = e.newURL.indexOf("#");
+            if (hash > -1) {
+                setSelected(e.newURL.substring(hash));
+            }
         });
         if (document.location.hash) {
-            scrollTimeoutNeeded = true;
+            setScrollTimeout();
             setSelected(document.location.hash);
         } else {
             handleScroll();
         }
         window.addEventListener("scroll", handleScroll);
-        window.addEventListener("scrollend", () => {
-            if (scrollTimeout) {
-                clearTimeout(scrollTimeout);
-                scrollTimeout = null;
-                handleScroll();
-            }
-        })
     }
     // Resize handler
     new ResizeObserver((entries) => {
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/stylesheet.css b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/stylesheet.css
index 5ddca2b7315..ac393e8a762 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/stylesheet.css
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/stylesheet.css
@@ -79,9 +79,10 @@
     --search-input-placeholder-color: #909090;
     /* Highlight color for active search tag target */
     --search-tag-highlight-color: #ffff66;
-    /* Adjustments for icon and active background colors of copy-to-clipboard buttons */
-    --copy-icon-brightness: 100%;
-    --copy-button-background-color-active: rgba(168, 168, 176, 0.3);
+    /* Copy button colors and filters */
+    --button-border-color: #b0b8c8;
+    --button-active-filter: brightness(96%);
+    --button-focus-filter: brightness(104%);
     /* Colors for invalid tag notifications */
     --invalid-tag-background-color: #ffe6e6;
     --invalid-tag-text-color: #000000;
@@ -536,6 +537,9 @@ nav.toc a {
 nav.toc ol.toc-list ol.toc-list a {
     padding-left: 24px;
 }
+nav.toc ol.toc-list ol.toc-list ol.toc-list a {
+    padding-left: 40px;
+}
 nav.toc a:hover {
     background-color: var(--toc-hover-color);
 }
@@ -1053,7 +1057,7 @@ input[type="text"] {
 }
 input#page-search-input {
     width: calc(180px + 10vw);
-    margin: 0;
+    margin: 10px 0;
 }
 input#search-input {
     width: 270px;
@@ -1101,7 +1105,7 @@ input:focus::placeholder {
     color: transparent;
 }
 select#search-modules {
-    margin: 0 10px 0 2px;
+    margin: 0 10px 10px 2px;
     font-size: var(--nav-font-size);
     padding: 3px 5px;
     border-radius: 4px;
@@ -1329,49 +1333,48 @@ a.anchor-link > img {
  * Styles for copy-to-clipboard buttons
  */
 button.copy {
-    opacity: 60%;
-    border: none;
+    font-size: var(--nav-font-size);
+    line-height: 1.2;
+    padding:0.3em;
+    background-color: transparent;
+    border: 1px solid transparent;
     border-radius: 3px;
     position: relative;
-    background:none;
-    transition: opacity 0.3s;
+    opacity: 80%;
+    transition: all 0.1s ease;
     cursor: pointer;
 }
-:hover > button.copy {
-    opacity: 70%;
-}
 button.copy:hover,
 button.copy:active,
-button.copy:focus-visible,
+button.copy:focus,
 button.copy.visible {
     opacity: 100%;
+    background-color: inherit;
+    border-color: var(--button-border-color);
+    filter: var(--button-focus-filter);
+}
+button.copy:active {
+    filter: var(--button-active-filter);
 }
 button.copy img {
     position: relative;
-    background: none;
-    filter: brightness(var(--copy-icon-brightness));
-}
-button.copy:active {
-    background-color: var(--copy-button-background-color-active);
 }
 button.copy span {
     color: var(--body-text-color);
     position: relative;
+    padding: 0.2em;
     top: -0.1em;
-    transition: all 0.1s;
-    font-size: 0.76rem;
-    line-height: 1.2;
+    transition: opacity 0.1s ease;
     opacity: 0;
 }
 button.copy:hover span,
-button.copy:focus-visible span,
+button.copy:focus span,
 button.copy.visible span {
     opacity: 100%;
 }
 /* search page copy button */
 button#page-search-copy {
     margin-left: 0.4em;
-    padding:0.3em;
     top:0.13em;
 }
 button#page-search-copy img {
@@ -1381,35 +1384,22 @@ button#page-search-copy img {
     top: 0.15em;
 }
 button#page-search-copy span {
-    color: var(--body-text-color);
-    line-height: 1.2;
-    padding: 0.2em;
     top: -0.18em;
 }
-div.page-search-info:hover button#page-search-copy span {
-    opacity: 100%;
-}
 /* snippet copy button */
 button.snippet-copy {
     position: absolute;
-    top: 6px;
-    right: 6px;
-    height: 1.7em;
-    padding: 2px;
+    top: 2px;
+    right: 2px;
+    height: 32px;
 }
 button.snippet-copy img {
     width: 18px;
     height: 18px;
-    padding: 0.05em 0;
+    padding: 2px 0;
 }
 button.snippet-copy span {
-    line-height: 1.2;
-    padding: 0.2em;
-    position: relative;
-    top: -0.5em;
-}
-div.snippet-container button.snippet-copy:hover span {
-    opacity: 100%;
+    top: -7px;
 }
 /*
  * Styles for user-provided tables.
@@ -1667,15 +1657,8 @@ pre.snippet {
 }
 div.snippet-container {
     position: relative;
-}
-@media screen and (max-width: 800px) {
-    pre.snippet {
-        padding-top: 26px;
-    }
-    button.snippet-copy {
-        top: 4px;
-        right: 4px;
-    }
+    padding-right: 30px;
+    background-color: var(--snippet-background-color);
 }
 pre.snippet .italic {
     font-style: italic;

From 84694584d54fccf3887a6e2aa3185f086f7e68b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hannes=20Walln=C3=B6fer?= <hannesw@openjdk.org>
Date: Fri, 21 Mar 2025 11:57:42 +0000
Subject: [PATCH 424/587] 8352511: Show additional level of headings in table
 of contents

Reviewed-by: liach
---
 .../formats/html/AbstractMemberWriter.java    |   5 +-
 .../html/AnnotationTypeMemberWriter.java      |   9 +-
 .../doclets/formats/html/ClassWriter.java     |   9 +-
 .../formats/html/ConstantsSummaryWriter.java  |  13 +-
 .../formats/html/ConstructorWriter.java       |  10 +-
 .../doclets/formats/html/DocFilesHandler.java |   7 +-
 .../formats/html/EnumConstantWriter.java      |  10 +-
 .../doclets/formats/html/FieldWriter.java     |  10 +-
 .../doclets/formats/html/HelpWriter.java      |  19 +--
 .../formats/html/HtmlDocletWriter.java        |  28 ++--
 .../doclets/formats/html/MethodWriter.java    |  10 +-
 .../doclets/formats/html/ModuleWriter.java    |  13 +-
 .../doclets/formats/html/PackageWriter.java   |  13 +-
 .../doclets/formats/html/PropertyWriter.java  |   9 +-
 .../doclets/formats/html/TableOfContents.java |  53 ++++---
 .../formats/html/resources/script.js.template |   3 +-
 .../javadoc/internal/html/ListBuilder.java    |  83 +++++++----
 .../testMarkdown/TestMarkdownHeadings.java    |  20 ++-
 .../testTOCHeadings/TestTOCHeadings.java      | 139 ++++++++++++++++++
 19 files changed, 325 insertions(+), 138 deletions(-)
 create mode 100644 test/langtools/jdk/javadoc/doclet/testTOCHeadings/TestTOCHeadings.java

diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AbstractMemberWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AbstractMemberWriter.java
index 4f2e17aa876..110a8866725 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AbstractMemberWriter.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AbstractMemberWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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,8 @@ public abstract class AbstractMemberWriter {
             Content member = getMemberSummaryHeader(target);
             summaryTreeList.forEach(member::add);
             buildSummary(target, member);
-            writer.tableOfContents.addLink(HtmlIds.forMemberSummary(kind), getSummaryLabel());
+            writer.tableOfContents.addLink(HtmlIds.forMemberSummary(kind), getSummaryLabel(),
+                    TableOfContents.Level.FIRST);
         }
     }
 
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AnnotationTypeMemberWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AnnotationTypeMemberWriter.java
index f1f63110231..18ab23aa294 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AnnotationTypeMemberWriter.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AnnotationTypeMemberWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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,8 +91,8 @@ public class AnnotationTypeMemberWriter extends AbstractMemberWriter {
             addAnnotationDetailsMarker(target);
             Content annotationDetailsHeader = getAnnotationDetailsHeader();
             Content memberList = getMemberList();
-            writer.tableOfContents.addLink(HtmlIds.ANNOTATION_TYPE_ELEMENT_DETAIL, contents.annotationTypeDetailsLabel);
-            writer.tableOfContents.pushNestedList();
+            writer.tableOfContents.addLink(HtmlIds.ANNOTATION_TYPE_ELEMENT_DETAIL,
+                    contents.annotationTypeDetailsLabel, TableOfContents.Level.FIRST);
 
             for (Element member : members) {
                 currentMember = member;
@@ -102,11 +102,10 @@ public class AnnotationTypeMemberWriter extends AbstractMemberWriter {
                 annotationContent.add(div);
                 memberList.add(writer.getMemberListItem(annotationContent));
                 writer.tableOfContents.addLink(htmlIds.forMember((ExecutableElement) member).getFirst(),
-                        Text.of(name(member)));
+                        Text.of(name(member)), TableOfContents.Level.SECOND);
             }
             Content annotationDetails = getAnnotationDetails(annotationDetailsHeader, memberList);
             target.add(annotationDetails);
-            writer.tableOfContents.popNestedList();
         }
     }
 
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ClassWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ClassWriter.java
index d56616dfc91..d301dd6e283 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ClassWriter.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ClassWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -516,13 +516,12 @@ public class ClassWriter extends SubWriterHolderWriter {
 
     protected void addClassDescription(Content classInfo) {
         addPreviewInfo(classInfo);
-        tableOfContents.addLink(HtmlIds.TOP_OF_PAGE, contents.descriptionLabel);
+        tableOfContents.addLink(HtmlIds.TOP_OF_PAGE, contents.descriptionLabel,
+                TableOfContents.Level.FIRST);
         if (!options.noComment()) {
             // generate documentation for the class.
             if (!utils.getFullBody(typeElement).isEmpty()) {
-                tableOfContents.pushNestedList();
                 addInlineComment(typeElement, classInfo);
-                tableOfContents.popNestedList();
             }
         }
     }
@@ -534,9 +533,7 @@ public class ClassWriter extends SubWriterHolderWriter {
     protected void addClassTagInfo(Content classInfo) {
         if (!options.noComment()) {
             // Print Information about all the tags here
-            tableOfContents.pushNestedList();
             addTagsInfo(typeElement, classInfo);
-            tableOfContents.popNestedList();
         }
     }
 
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ConstantsSummaryWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ConstantsSummaryWriter.java
index 9731cd14e88..3c191063e48 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ConstantsSummaryWriter.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ConstantsSummaryWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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,8 +144,8 @@ public class ConstantsSummaryWriter extends HtmlDocletWriter {
      * Builds the list of contents for the groups of packages appearing in the constants summary page.
      */
     protected void buildContents() {
-        tableOfContents.addLink(HtmlIds.TOP_OF_PAGE, Text.of(resources.getText("doclet.Constants_Summary")))
-                .pushNestedList();
+        tableOfContents.addLink(HtmlIds.TOP_OF_PAGE, Text.of(resources.getText("doclet.Constants_Summary")),
+                TableOfContents.Level.FIRST);
         packageGroupHeadings.clear();
         for (PackageElement pkg : configuration.packages) {
             String abbrevPackageName = getAbbrevPackageName(pkg);
@@ -154,7 +154,6 @@ public class ConstantsSummaryWriter extends HtmlDocletWriter {
                 packageGroupHeadings.add(abbrevPackageName);
             }
         }
-        tableOfContents.popNestedList();
         bodyContents.setSideContent(tableOfContents.toContent(true));
     }
 
@@ -341,9 +340,11 @@ public class ConstantsSummaryWriter extends HtmlDocletWriter {
 
     void addLinkToTableOfContents(String abbrevPackageName) {
         if (abbrevPackageName.isEmpty()) {
-            tableOfContents.addLink(HtmlIds.UNNAMED_PACKAGE_ANCHOR, contents.defaultPackageLabel);
+            tableOfContents.addLink(HtmlIds.UNNAMED_PACKAGE_ANCHOR, contents.defaultPackageLabel,
+                    TableOfContents.Level.SECOND);
         } else {
-            tableOfContents.addLink(HtmlId.of(abbrevPackageName), Text.of(abbrevPackageName + ".*"));
+            tableOfContents.addLink(HtmlId.of(abbrevPackageName), Text.of(abbrevPackageName + ".*"),
+                    TableOfContents.Level.SECOND);
         }
     }
 
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ConstructorWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ConstructorWriter.java
index d1d04d4f7f1..c2145c1791a 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ConstructorWriter.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ConstructorWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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,8 +106,8 @@ public class ConstructorWriter extends AbstractExecutableMemberWriter {
 
             Content constructorDetailsHeader = getConstructorDetailsHeader(target);
             Content memberList = getMemberList();
-            writer.tableOfContents.addLink(HtmlIds.CONSTRUCTOR_DETAIL, contents.constructorDetailsLabel);
-            writer.tableOfContents.pushNestedList();
+            writer.tableOfContents.addLink(HtmlIds.CONSTRUCTOR_DETAIL, contents.constructorDetailsLabel,
+                    TableOfContents.Level.FIRST);
 
             for (Element constructor : constructors) {
                 currentConstructor = (ExecutableElement)constructor;
@@ -122,11 +122,11 @@ public class ConstructorWriter extends AbstractExecutableMemberWriter {
                 memberList.add(getMemberListItem(constructorContent));
                 writer.tableOfContents.addLink(htmlIds.forMember(currentConstructor).getFirst(),
                         Text.of(utils.getSimpleName(constructor)
-                                + utils.makeSignature(currentConstructor, typeElement, false, true)));
+                                + utils.makeSignature(currentConstructor, typeElement, false, true)),
+                        TableOfContents.Level.SECOND);
             }
             Content constructorDetails = getConstructorDetails(constructorDetailsHeader, memberList);
             target.add(constructorDetails);
-            writer.tableOfContents.popNestedList();
         }
     }
 
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/DocFilesHandler.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/DocFilesHandler.java
index 5b39b08c22b..0851659946a 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/DocFilesHandler.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/DocFilesHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -235,6 +235,11 @@ public class DocFilesHandler {
             printHtmlDocument(List.of(), null, localTagsContent, List.of(), htmlContent);
         }
 
+        @Override
+        protected TableOfContents createTableOfContents() {
+            return null;
+        }
+
         private String getWindowTitle(HtmlDocletWriter docletWriter, DocFileElement element) {
             var t = docletWriter.getFileTitle(element);
             return docletWriter.getWindowTitle(t);
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/EnumConstantWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/EnumConstantWriter.java
index ff82b95fe4d..81c4f1ed87c 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/EnumConstantWriter.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/EnumConstantWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -70,8 +70,8 @@ public class EnumConstantWriter extends AbstractMemberWriter {
         if (!enumConstants.isEmpty()) {
             Content enumConstantsDetailsHeader = getEnumConstantsDetailsHeader(target);
             Content memberList = getMemberList();
-            writer.tableOfContents.addLink(HtmlIds.ENUM_CONSTANT_DETAIL, contents.enumConstantDetailLabel);
-            writer.tableOfContents.pushNestedList();
+            writer.tableOfContents.addLink(HtmlIds.ENUM_CONSTANT_DETAIL, contents.enumConstantDetailLabel,
+                    TableOfContents.Level.FIRST);
 
             for (Element enumConstant : enumConstants) {
                 currentElement = (VariableElement)enumConstant;
@@ -84,12 +84,12 @@ public class EnumConstantWriter extends AbstractMemberWriter {
                 buildTagInfo(div);
                 enumConstantContent.add(div);
                 memberList.add(getMemberListItem(enumConstantContent));
-                writer.tableOfContents.addLink(htmlIds.forMember(currentElement), Text.of(name(currentElement)));
+                writer.tableOfContents.addLink(htmlIds.forMember(currentElement), Text.of(name(currentElement)),
+                        TableOfContents.Level.SECOND);
             }
             Content enumConstantDetails = getEnumConstantsDetails(
                     enumConstantsDetailsHeader, memberList);
             target.add(enumConstantDetails);
-            writer.tableOfContents.popNestedList();
         }
     }
 
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/FieldWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/FieldWriter.java
index c71d62d57e4..e3eed570f41 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/FieldWriter.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/FieldWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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,8 +81,8 @@ public class FieldWriter extends AbstractMemberWriter {
         if (!fields.isEmpty()) {
             Content fieldDetailsHeader = getFieldDetailsHeader(target);
             Content memberList = getMemberList();
-            writer.tableOfContents.addLink(HtmlIds.FIELD_DETAIL, contents.fieldDetailsLabel);
-            writer.tableOfContents.pushNestedList();
+            writer.tableOfContents.addLink(HtmlIds.FIELD_DETAIL, contents.fieldDetailsLabel,
+                    TableOfContents.Level.FIRST);
 
             for (Element element : fields) {
                 currentElement = (VariableElement)element;
@@ -95,11 +95,11 @@ public class FieldWriter extends AbstractMemberWriter {
                 buildTagInfo(div);
                 fieldContent.add(div);
                 memberList.add(getMemberListItem(fieldContent));
-                writer.tableOfContents.addLink(htmlIds.forMember(currentElement), Text.of(name(element)));
+                writer.tableOfContents.addLink(htmlIds.forMember(currentElement), Text.of(name(element)),
+                        TableOfContents.Level.SECOND);
             }
             Content fieldDetails = getFieldDetails(fieldDetailsHeader, memberList);
             target.add(fieldDetails);
-            writer.tableOfContents.popNestedList();
         }
     }
 
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 1973f62faad..cdbb2a85d09 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
@@ -102,8 +102,7 @@ public class HelpWriter extends HtmlDocletWriter {
      */
     protected void addHelpFileContents(Content content) {
         var mainHeading = getContent("doclet.help.main_heading");
-        tableOfContents.addLink(HtmlIds.TOP_OF_PAGE, mainHeading);
-        tableOfContents.pushNestedList();
+        tableOfContents.addLink(HtmlIds.TOP_OF_PAGE, mainHeading, TableOfContents.Level.FIRST);
         content.add(HtmlTree.HEADING(Headings.PAGE_TITLE_HEADING, HtmlStyles.title, mainHeading))
                 .add(HtmlTree.HR())
                 .add(getNavigationSection())
@@ -116,7 +115,6 @@ public class HelpWriter extends HtmlDocletWriter {
                 .add(HtmlTree.HR())
                 .add(HtmlTree.SPAN(HtmlStyles.helpFootnote,
                         getContent("doclet.help.footnote")));
-        tableOfContents.popNestedList();
     }
 
     /**
@@ -149,8 +147,7 @@ public class HelpWriter extends HtmlDocletWriter {
         }
         content.add(navSection);
 
-        tableOfContents.addLink(HtmlIds.HELP_NAVIGATION, navHeading);
-        tableOfContents.pushNestedList();
+        tableOfContents.addLink(HtmlIds.HELP_NAVIGATION, navHeading, TableOfContents.Level.SECOND);
 
         HtmlTree section;
 
@@ -194,8 +191,6 @@ public class HelpWriter extends HtmlDocletWriter {
                 HtmlTree.KBD(Entity.of("leftarrow")), HtmlTree.KBD(Entity.of("rightarrow")))));
         navSection.add(section.add(keyboardList));
 
-        tableOfContents.popNestedList();
-
         return content;
     }
 
@@ -220,8 +215,7 @@ public class HelpWriter extends HtmlDocletWriter {
                 .add(HtmlTree.HEADING(Headings.CONTENT_HEADING, pageKindsHeading).setId(HtmlIds.HELP_PAGES))
                 .add(contents.getContent("doclet.help.page_kinds.intro"));
 
-        tableOfContents.addLink(HtmlIds.HELP_PAGES, pageKindsHeading);
-        tableOfContents.pushNestedList();
+        tableOfContents.addLink(HtmlIds.HELP_PAGES, pageKindsHeading, TableOfContents.Level.SECOND);
 
         HtmlTree section;
 
@@ -427,7 +421,6 @@ public class HelpWriter extends HtmlDocletWriter {
                     .add(HtmlTree.P(getContent("doclet.help.index.body", indexLink, links)));
             pageKindsSection.add(section);
         }
-        tableOfContents.popNestedList();
 
         return pageKindsSection;
     }
@@ -444,9 +437,7 @@ public class HelpWriter extends HtmlDocletWriter {
             releasesSection.add(HtmlTree.P(contents.getContent("doclet.help.releases.body.refer")));
         }
 
-        tableOfContents.addLink(HtmlIds.HELP_RELEASES, releasesHeading);
-        tableOfContents.pushNestedList();
-        tableOfContents.popNestedList();
+        tableOfContents.addLink(HtmlIds.HELP_RELEASES, releasesHeading, TableOfContents.Level.SECOND);
 
         return releasesSection;
 
@@ -465,7 +456,7 @@ public class HelpWriter extends HtmlDocletWriter {
     }
 
     private HtmlTree newHelpSection(Content headingContent, HtmlId id) {
-        tableOfContents.addLink(id, headingContent);
+        tableOfContents.addLink(id, headingContent, TableOfContents.Level.THIRD);
 
         return HtmlTree.SECTION(HtmlStyles.helpSection,
                 HtmlTree.HEADING(Headings.SUB_HEADING, headingContent))
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlDocletWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlDocletWriter.java
index 589abbda561..b83a60bbd81 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlDocletWriter.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlDocletWriter.java
@@ -237,7 +237,7 @@ public abstract class HtmlDocletWriter {
         this.pathToRoot = path.parent().invert();
         this.docPaths = configuration.docPaths;
         this.mainBodyScript = new Script();
-        this.tableOfContents = new TableOfContents(this);
+        this.tableOfContents = createTableOfContents();
 
         if (generating) {
             writeGenerating();
@@ -1563,7 +1563,8 @@ public abstract class HtmlDocletWriter {
                             super.visit(text);
                         }
                     }.visit(heading);
-                    tableOfContents.addLink(id, Text.of(headingContent));
+                    tableOfContents.addLink(id, Text.of(headingContent),
+                            TableOfContents.Level.forHeading(htag));
                 }
             }
 
@@ -1833,6 +1834,16 @@ public abstract class HtmlDocletWriter {
                  .findFirst();
     }
 
+    /**
+     * Creates table of contents for this writer. Can be overridden to return {@code null} in
+     * subclasses that don't require a table of contents.
+     *
+     * @return a table of contents
+     */
+    protected TableOfContents createTableOfContents() {
+        return new TableOfContents(this);
+    }
+
     private void createSectionIdAndIndex(StartElementTree node, List<? extends DocTree> trees, Content attrs,
                                          Element element, TagletWriter.Context context) {
         // Use existing id attribute if available
@@ -1886,16 +1897,15 @@ public abstract class HtmlDocletWriter {
                     new DocLink(path, id));
             configuration.indexBuilder.add(item);
         }
-        if (includeHeadingInTableOfContents(node.getName())) {
-            tableOfContents.addLink(HtmlId.of(id), Text.of(headingContent));
+        if (includeHeadingInTableOfContents(tagName)) {
+            tableOfContents.addLink(HtmlId.of(id), Text.of(headingContent),
+                    TableOfContents.Level.forHeading(tagName));
         }
     }
 
-    private boolean includeHeadingInTableOfContents(CharSequence tag) {
-        // Record second-level headings for use in table of contents
-        // TODO: maybe extend this to all headings up to a given level
-        return tableOfContents != null
-                && tag.toString().equalsIgnoreCase("h2");
+    private boolean includeHeadingInTableOfContents(String tag) {
+        // Record second- and third-level headings for use in table of contents
+        return tableOfContents != null &&  ("h2".equals(tag) || "h3".equals(tag));
     }
 
     /**
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/MethodWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/MethodWriter.java
index 1f3cfe26801..01ce1de2106 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/MethodWriter.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/MethodWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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,8 +101,8 @@ public class MethodWriter extends AbstractExecutableMemberWriter {
         if (!methods.isEmpty()) {
             Content methodDetailsHeader = getMethodDetailsHeader(detailsList);
             Content memberList = writer.getMemberList();
-            writer.tableOfContents.addLink(HtmlIds.METHOD_DETAIL, contents.methodDetailLabel);
-            writer.tableOfContents.pushNestedList();
+            writer.tableOfContents.addLink(HtmlIds.METHOD_DETAIL, contents.methodDetailLabel,
+                    TableOfContents.Level.FIRST);
 
             for (Element method : methods) {
                 currentMethod = (ExecutableElement)method;
@@ -118,11 +118,11 @@ public class MethodWriter extends AbstractExecutableMemberWriter {
                 memberList.add(writer.getMemberListItem(methodContent));
                 writer.tableOfContents.addLink(htmlIds.forMember(currentMethod).getFirst(),
                         Text.of(utils.getSimpleName(method)
-                                + utils.makeSignature(currentMethod, typeElement, false, true)));
+                                + utils.makeSignature(currentMethod, typeElement, false, true)),
+                        TableOfContents.Level.SECOND);
             }
             Content methodDetails = getMethodDetails(methodDetailsHeader, memberList);
             detailsList.add(methodDetails);
-            writer.tableOfContents.popNestedList();
         }
     }
 
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ModuleWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ModuleWriter.java
index cf4876f7421..020159bb599 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ModuleWriter.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ModuleWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -256,11 +256,10 @@ public class ModuleWriter extends HtmlDocletWriter {
      *                      be added
      */
     protected void buildModuleDescription(Content moduleContent) {
-        tableOfContents.addLink(HtmlIds.TOP_OF_PAGE, contents.navDescription);
+        tableOfContents.addLink(HtmlIds.TOP_OF_PAGE, contents.navDescription,
+                TableOfContents.Level.FIRST);
         if (!options.noComment()) {
-            tableOfContents.pushNestedList();
             addModuleDescription(moduleContent);
-            tableOfContents.popNestedList();
         }
     }
 
@@ -529,7 +528,7 @@ public class ModuleWriter extends HtmlDocletWriter {
 
     protected void addModulesSummary(Content summariesList) {
         if (display(requires) || display(indirectModules)) {
-            tableOfContents.addLink(HtmlIds.MODULES, contents.navModules);
+            tableOfContents.addLink(HtmlIds.MODULES, contents.navModules, TableOfContents.Level.FIRST);
             TableHeader requiresTableHeader =
                     new TableHeader(contents.modifierLabel, contents.moduleLabel,
                             contents.descriptionLabel);
@@ -574,7 +573,7 @@ public class ModuleWriter extends HtmlDocletWriter {
     protected void addPackagesSummary(Content summariesList) {
         if (display(packages)
                 || display(indirectPackages) || display(indirectOpenPackages)) {
-            tableOfContents.addLink(HtmlIds.PACKAGES, contents.navPackages);
+            tableOfContents.addLink(HtmlIds.PACKAGES, contents.navPackages, TableOfContents.Level.FIRST);
             var section = HtmlTree.SECTION(HtmlStyles.packagesSummary)
                     .setId(HtmlIds.PACKAGES);
             addSummaryHeader(MarkerComments.START_OF_PACKAGES_SUMMARY, contents.navPackages, section);
@@ -788,7 +787,7 @@ public class ModuleWriter extends HtmlDocletWriter {
         boolean haveProvides = displayServices(provides.keySet(), providesTrees);
 
         if (haveProvides || haveUses) {
-            tableOfContents.addLink(HtmlIds.SERVICES, contents.navServices);
+            tableOfContents.addLink(HtmlIds.SERVICES, contents.navServices, TableOfContents.Level.FIRST);
             var section = HtmlTree.SECTION(HtmlStyles.servicesSummary)
                     .setId(HtmlIds.SERVICES);
             addSummaryHeader(MarkerComments.START_OF_SERVICES_SUMMARY, contents.navServices, section);
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PackageWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PackageWriter.java
index d5683ec6e3c..c28ffe4ceef 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PackageWriter.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PackageWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -179,13 +179,12 @@ public class PackageWriter extends HtmlDocletWriter {
      *                       be added
      */
     protected void buildPackageDescription(Content packageContent) {
-        tableOfContents.addLink(HtmlIds.TOP_OF_PAGE, contents.navDescription);
+        tableOfContents.addLink(HtmlIds.TOP_OF_PAGE, contents.navDescription,
+                TableOfContents.Level.FIRST);
         if (options.noComment()) {
             return;
         }
-        tableOfContents.pushNestedList();
         addPackageDescription(packageContent);
-        tableOfContents.popNestedList();
     }
 
     /**
@@ -339,7 +338,8 @@ public class PackageWriter extends HtmlDocletWriter {
             }
         }
         if (!table.isEmpty()) {
-            tableOfContents.addLink(HtmlIds.CLASS_SUMMARY, contents.navClassesAndInterfaces);
+            tableOfContents.addLink(HtmlIds.CLASS_SUMMARY, contents.navClassesAndInterfaces,
+                    TableOfContents.Level.FIRST);
             target.add(HtmlTree.LI(table));
         }
     }
@@ -347,7 +347,8 @@ public class PackageWriter extends HtmlDocletWriter {
     protected void addRelatedPackageSummary(TableHeader tableHeader, Content summaryContent,
                                      boolean showModules) {
         if (!relatedPackages.isEmpty()) {
-            tableOfContents.addLink(HtmlIds.RELATED_PACKAGE_SUMMARY, contents.relatedPackages);
+            tableOfContents.addLink(HtmlIds.RELATED_PACKAGE_SUMMARY, contents.relatedPackages,
+                    TableOfContents.Level.FIRST);
             var table = new Table<Void>(HtmlStyles.summaryTable)
                     .setId(HtmlIds.RELATED_PACKAGE_SUMMARY)
                     .setCaption(contents.relatedPackages)
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PropertyWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PropertyWriter.java
index 294923f43a1..b6b0b064049 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PropertyWriter.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PropertyWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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,8 +75,8 @@ public class PropertyWriter extends AbstractMemberWriter {
         if (!properties.isEmpty()) {
             Content propertyDetailsHeader = getPropertyDetailsHeader(detailsList);
             Content memberList = getMemberList();
-            writer.tableOfContents.addLink(HtmlIds.PROPERTY_DETAIL, contents.propertyDetailsLabel);
-            writer.tableOfContents.pushNestedList();
+            writer.tableOfContents.addLink(HtmlIds.PROPERTY_DETAIL, contents.propertyDetailsLabel,
+                    TableOfContents.Level.FIRST);
 
             for (Element property : properties) {
                 currentProperty = (ExecutableElement)property;
@@ -90,11 +90,10 @@ public class PropertyWriter extends AbstractMemberWriter {
                 propertyContent.add(div);
                 memberList.add(getMemberListItem(propertyContent));
                 writer.tableOfContents.addLink(htmlIds.forProperty(currentProperty),
-                        Text.of(utils.getPropertyLabel(name(property))));
+                        Text.of(utils.getPropertyLabel(name(property))), TableOfContents.Level.SECOND);
             }
             Content propertyDetails = getPropertyDetails(propertyDetailsHeader, memberList);
             detailsList.add(propertyDetails);
-            writer.tableOfContents.popNestedList();
         }
     }
 
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/TableOfContents.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/TableOfContents.java
index 46470d27c58..a53e42ceb52 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/TableOfContents.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/TableOfContents.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2024, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -35,6 +35,8 @@ import jdk.javadoc.internal.html.HtmlTree;
 import jdk.javadoc.internal.html.ListBuilder;
 import jdk.javadoc.internal.html.Text;
 
+import java.util.Locale;
+
 /**
  * A class used by various {@link HtmlDocletWriter} subclasses to build tables of contents.
  */
@@ -42,39 +44,46 @@ public class TableOfContents {
     private final ListBuilder listBuilder;
     private final HtmlDocletWriter writer;
 
+    /**
+     * Supported hierarchy levels for entries in the table of contents.
+     */
+    public enum Level {
+        FIRST,
+        SECOND,
+        THIRD;
+
+        /**
+         * {@return the appropriate level to represent the given HTML heading}
+         */
+        public static Level forHeading(String tag) {
+            return switch (tag.toLowerCase(Locale.ROOT)) {
+                case "h1" -> FIRST;
+                case "h2" -> SECOND;
+                case "h3" -> THIRD;
+                default -> throw new IllegalArgumentException(tag);
+            };
+        }
+    }
+
     /**
      * Constructor
      * @param writer the writer
      */
     public TableOfContents(HtmlDocletWriter writer) {
         this.writer = writer;
-        listBuilder = new ListBuilder(HtmlTree.OL(HtmlStyles.tocList)
-                .put(HtmlAttr.TABINDEX, "-1"));
+        listBuilder = new ListBuilder(HtmlTag.OL, HtmlStyles.tocList);
     }
 
     /**
-     * Adds a link to the table of contents.
+     * Adds a link to the table of contents at the given level.
+     *
      * @param id the link fragment
      * @param label the link label
-     * @return this object
+     * @param level the hierarchical level of the link
      */
-    public TableOfContents addLink(HtmlId id, Content label) {
-        listBuilder.add(writer.links.createLink(id, label).put(HtmlAttr.TABINDEX, "0"));
-        return this;
-    }
-
-    /**
-     * Adds a new nested list to add new items to.
-     */
-    public void pushNestedList() {
-        listBuilder.pushNestedList(HtmlTree.OL(HtmlStyles.tocList));
-    }
-
-    /**
-     * Closes the current nested list and go back to the parent list.
-     */
-    public void popNestedList() {
-        listBuilder.popNestedList();
+    public void addLink(HtmlId id, Content label, Level level) {
+        listBuilder.addItem(writer.links.createLink(id, label).put(HtmlAttr.TABINDEX, "0"),
+                level.ordinal());
     }
 
     /**
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/script.js.template b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/script.js.template
index 4042119eb6c..662cca89dc6 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/script.js.template
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/script.js.template
@@ -467,7 +467,8 @@ document.addEventListener("DOMContentLoaded", function(e) {
     var prevHash;
     function initSectionData() {
         bodyHeight = document.body.offsetHeight;
-        sections = [{ id: "", top: 0 }].concat(Array.from(main.querySelectorAll("section[id], h2[id], h2 a[id], div[id]"))
+        sections = [{ id: "", top: 0 }].concat(Array.from(main.querySelectorAll(
+                "section[id], h2[id], h2 a[id], h3[id], h3 a[id], div[id]"))
             .filter((e) => {
                 return sidebar.querySelector("a[href=\"#" + encodeURI(e.getAttribute("id")) + "\"]") !== null
             }).map((e) => {
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/html/ListBuilder.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/html/ListBuilder.java
index 05c9f8388db..0ab5d1dbf4b 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/html/ListBuilder.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/html/ListBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
  * 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,76 +33,91 @@ import java.util.NoSuchElementException;
 import java.util.Objects;
 
 /**
- * A utility class for building nested HTML lists. This class is implemented as a
- * stack of nested list/item pairs where list items are added to the inner-most
- * list and nested lists are added to the current list item of the inner-most list.
- * Lists can be added to and removed from the stack using the {@link #pushNestedList}
- * and {@link #popNestedList} methods.
+ * A utility class for building nested HTML lists. The class maintains a
+ * stack of nested list trees which it adapts to obtain the desired nesting
+ * level of added items.
  */
 public class ListBuilder extends Content {
 
+    private final HtmlTag listTag;
+    private final HtmlStyle listStyle;
     private final HtmlTree root;
+
     private record Pair(HtmlTree list, HtmlTree item) {}
     private final Deque<Pair> stack = new ArrayDeque<>();
+
     private HtmlTree currentList;
     private HtmlTree currentItem;
 
+    final static int MAX_LEVEL = 5;
+
     /**
      * Creates a new list builder.
      *
-     * @param list the root list element
+     * @param listTag the tag to use for the list elements
+     * @param listStyle the style to use for list elements
      */
-    public ListBuilder(HtmlTree list) {
-        Objects.requireNonNull(list, "Root list element is required");
-        root = currentList = list;
+    public ListBuilder(HtmlTag listTag, HtmlStyle listStyle) {
+        Objects.requireNonNull(listTag, "List tag is required");
+        this.listTag = listTag;
+        this.listStyle = listStyle;
+        root = currentList = createList().put(HtmlAttr.TABINDEX, "-1");
     }
 
     /**
-     * Adds a new list item with the given content to the current list. The last added list item
-     * will also be used as container when pushing a new nested list.
+     * Adds a new list item with the given content to the current list at the given nesting level,
+     * which must be greater than or equal to 0 and less than or equal to {@code MAX_LEVEL}.
+     * If {@code level} is greater than the current nesting level new sublists are added
+     * until the level is reached. If {@code level} is less than the current level, sublists
+     * are closed to reach the level.
      *
-     * @param listItemContent the content for the new list item.
-     * @return this list builder
+     * @param listItemContent content for the new list item.
+     * @param level nesting level for the added item
      */
-    public ListBuilder add(Content listItemContent) {
+    public void addItem(Content listItemContent, int level) {
+        if (level < 0 || level > MAX_LEVEL) {
+            throw new IllegalArgumentException(String.valueOf(level));
+        }
+        while (level > stack.size()) {
+            pushNestedList();
+        }
+        while (level < stack.size()) {
+            popNestedList();
+        }
         currentItem = HtmlTree.LI(listItemContent);
         currentList.addUnchecked(currentItem);
-        return this;
     }
 
     /**
-     * Adds a new nested list to the current list item and makes it the recipient for new list items.
-     * Note that the nested list is added even if empty; use {@code addNested} to avoid adding empty
-     * lists.
-     *
-     * @param list the nested list
-     * @return this list builder
+     * Adds a new nested nested list to which new items will be added.
      */
-    public ListBuilder pushNestedList(HtmlTree list) {
-        Objects.requireNonNull(currentItem, "List item required for nested list");
+    private void pushNestedList() {
+        if (currentItem == null) {
+            currentItem = HtmlTree.LI();
+        }
         stack.push(new Pair(currentList, currentItem));
-        currentList = list;
+        currentList = createList();
         currentItem = null;
-        return this;
     }
 
     /**
-     * Pops the current list from the stack and returns to adding list items to the parent list.
+     * Closes the current nested list and makes its parent the current list.
      *
-     * @return this list builder
      * @throws NoSuchElementException if the stack is empty
      */
-    public ListBuilder popNestedList() {
+    private void popNestedList() {
         Pair pair = stack.pop();
         // First restore currentItem and add nested list to it before restoring currentList to outer list.
         currentItem = pair.item;
         currentItem.add(currentList);
         currentList = pair.list;
-        return this;
     }
 
     @Override
     public boolean write(Writer writer, String newline, boolean atNewline) throws IOException {
+        while (!stack.isEmpty()) {
+            popNestedList();
+        }
         return root.write(writer, newline, atNewline);
     }
 
@@ -110,4 +125,12 @@ public class ListBuilder extends Content {
     public boolean isEmpty() {
         return root.isEmpty();
     }
+
+    private HtmlTree createList() {
+        var list = HtmlTree.of(listTag);
+        if (listStyle != null) {
+            list.setStyle(listStyle);
+        }
+        return list;
+    }
 }
diff --git a/test/langtools/jdk/javadoc/doclet/testMarkdown/TestMarkdownHeadings.java b/test/langtools/jdk/javadoc/doclet/testMarkdown/TestMarkdownHeadings.java
index b10db5d5619..24d52ef740b 100644
--- a/test/langtools/jdk/javadoc/doclet/testMarkdown/TestMarkdownHeadings.java
+++ b/test/langtools/jdk/javadoc/doclet/testMarkdown/TestMarkdownHeadings.java
@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @bug      8298405
+ * @bug      8298405 8352511
  * @summary  Markdown support in the standard doclet
  * @library  /tools/lib ../../lib
  * @modules  jdk.javadoc/jdk.javadoc.internal.tool
@@ -287,6 +287,10 @@ public class TestMarkdownHeadings extends JavadocTester {
                     ///
                     /// Lorem ipsum
                     ///
+                    /// ### ATX Level 3 Heading
+                    ///
+                    /// Lorem ipsum
+                    ///
                     /// Setext heading
                     /// ==============
                     ///
@@ -312,13 +316,21 @@ public class TestMarkdownHeadings extends JavadocTester {
         checkExit(Exit.OK);
 
         checkOutput("p/C.html", true,
-                // note only the level 1 headings in the class description
+                // note only the level 1 and 2 headings in the class description
                 """
                     <ol class="toc-list" tabindex="-1">
                     <li><a href="#" tabindex="0">Description</a>
                     <ol class="toc-list">
-                    <li><a href="#atx-heading-code-underline-text-heading" tabindex="0">ATX heading code underline text</a></li>
-                    <li><a href="#setext-heading-heading" tabindex="0">Setext heading</a></li>
+                    <li><a href="#atx-heading-code-underline-text-heading" tabindex="0">ATX heading code underline text</a>
+                    <ol class="toc-list">
+                    <li><a href="#atx-subheading-heading" tabindex="0">ATX Subheading</a></li>
+                    </ol>
+                    </li>
+                    <li><a href="#setext-heading-heading" tabindex="0">Setext heading</a>
+                    <ol class="toc-list">
+                    <li><a href="#setext-subheading-heading" tabindex="0">Setext subheading</a></li>
+                    </ol>
+                    </li>
                     </ol>
                     </li>
                     <li><a href="#constructor-summary" tabindex="0">Constructor Summary</a></li>
diff --git a/test/langtools/jdk/javadoc/doclet/testTOCHeadings/TestTOCHeadings.java b/test/langtools/jdk/javadoc/doclet/testTOCHeadings/TestTOCHeadings.java
new file mode 100644
index 00000000000..98b7ee0c8b6
--- /dev/null
+++ b/test/langtools/jdk/javadoc/doclet/testTOCHeadings/TestTOCHeadings.java
@@ -0,0 +1,139 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact 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      8352511
+ * @summary  Show additional level of headings in table of contents
+ * @library  /tools/lib ../../lib
+ * @modules  jdk.javadoc/jdk.javadoc.internal.tool
+ * @build    toolbox.ToolBox javadoc.tester.*
+ * @run main TestTOCHeadings
+ */
+
+import javadoc.tester.JavadocTester;
+import toolbox.ToolBox;
+
+import java.nio.file.Path;
+
+public class TestTOCHeadings extends JavadocTester {
+
+    public static void main(String... args) throws Exception {
+        var tester = new TestTOCHeadings();
+        tester.runTests();
+    }
+
+    ToolBox tb = new ToolBox();
+
+    @Test
+    public void testHeadings(Path base) throws Exception {
+        Path src = base.resolve("src");
+
+        tb.writeJavaFiles(src,
+                """
+                    package p;
+                    /**
+                     * <h1>First Level Heading</h1>
+                     *
+                     * Lorem ipsum
+                     *
+                     * <h2>Second Level Heading</h2>
+                     *
+                     * Lorem ipsum
+                     *
+                     * <h3>Third Level Heading</h3>
+                     *
+                     * Lorem ipsum
+                     *
+                     * <h2>Other Second Level Heading</h2>
+                     *
+                     * Lorem ipsum
+                     *
+                     * <h3>Other Third Level Heading</h3>
+                     *
+                     * Lorem ipsum
+                     *
+                     * <h4>Fourth Level Heading</h4>
+                     *
+                     * Lorem ipsum
+                     *
+                     * <h5>Fifth Level Heading</h5>
+                     *
+                     * Lorem ipsum
+                     *
+                     * <h6>Sixth Level Heading</h6>
+                     *
+                     * Lorem ipsum
+                     */
+                    public class C {
+                        /**
+                         * Method m.
+                         *
+                         * <h4>Subheading in m()</h4>
+                         *
+                         * Lorem ipsum
+                         */
+                        public void m() { }
+                    }""");
+
+        javadoc("-d", base.resolve("api").toString(),
+                "-Xdoclint:none",
+                "--no-platform-links",
+                "--source-path", src.toString(),
+                "p");
+        checkExit(Exit.OK);
+
+        checkOutput("p/C.html", true,
+                // note only the level 2 and 3 headings in the class description
+                """
+                    <ol class="toc-list" tabindex="-1">
+                    <li><a href="#" tabindex="0">Description</a>
+                    <ol class="toc-list">
+                    <li><a href="#second-level-heading-heading" tabindex="0">Second Level Heading</a>
+                    <ol class="toc-list">
+                    <li><a href="#third-level-heading-heading" tabindex="0">Third Level Heading</a></li>
+                    </ol>
+                    </li>
+                    <li><a href="#other-second-level-heading-heading" tabindex="0">Other Second Level Heading</a>
+                    <ol class="toc-list">
+                    <li><a href="#other-third-level-heading-heading" tabindex="0">Other Third Level Heading</a></li>
+                    </ol>
+                    </li>
+                    </ol>
+                    </li>
+                    <li><a href="#constructor-summary" tabindex="0">Constructor Summary</a></li>
+                    <li><a href="#method-summary" tabindex="0">Method Summary</a></li>
+                    <li><a href="#constructor-detail" tabindex="0">Constructor Details</a>
+                    <ol class="toc-list">
+                    <li><a href="#%3Cinit%3E()" tabindex="0">C()</a></li>
+                    </ol>
+                    </li>
+                    <li><a href="#method-detail" tabindex="0">Method Details</a>
+                    <ol class="toc-list">
+                    <li><a href="#m()" tabindex="0">m()</a></li>
+                    </ol>
+                    </li>
+                    </ol>
+                    """);
+    }
+}
\ No newline at end of file

From 2b559795958a18d8a14d2e30d039488ad6f6ee5a Mon Sep 17 00:00:00 2001
From: Hamlin Li <mli@openjdk.org>
Date: Fri, 21 Mar 2025 12:07:33 +0000
Subject: [PATCH 425/587] 8352529: RISC-V: enable loopopts tests

Reviewed-by: fyang, luhenry, rehn
---
 .../loopopts/superword/TestAlignVector.java   | 140 +++++++++---------
 .../TestCompatibleUseDefTypeSize.java         |  22 +--
 .../superword/TestEquivalentInvariants.java   |  76 +++++-----
 .../superword/TestGeneralizedReductions.java  |  12 +-
 ...tIndependentPacksWithCyclicDependency.java |  10 +-
 .../loopopts/superword/TestMemorySegment.java |  46 +++---
 .../TestMemorySegmentUnalignedAddress.java    |  10 +-
 ...TestMultiversionRemoveUselessSlowLoop.java |   6 +-
 .../loopopts/superword/TestSplitPacks.java    |  56 +++----
 ...norderedReductionPartialVectorization.java |   2 +-
 10 files changed, 190 insertions(+), 190 deletions(-)

diff --git a/test/hotspot/jtreg/compiler/loopopts/superword/TestAlignVector.java b/test/hotspot/jtreg/compiler/loopopts/superword/TestAlignVector.java
index b3a668da27c..3b0489328d1 100644
--- a/test/hotspot/jtreg/compiler/loopopts/superword/TestAlignVector.java
+++ b/test/hotspot/jtreg/compiler/loopopts/superword/TestAlignVector.java
@@ -412,7 +412,7 @@ public class TestAlignVector {
                   IRNode.STORE_VECTOR, "> 0"},
         applyIf = {"MaxVectorSize", ">=8"},
         applyIfPlatform = {"64-bit", "true"},
-        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"})
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true", "rvv", "true"})
     static Object[] test0(byte[] a, byte[] b, byte mask) {
         for (int i = 0; i < RANGE; i+=8) {
             // Safe to vectorize with AlignVector
@@ -432,7 +432,7 @@ public class TestAlignVector {
         // UNSAFE.ARRAY_BYTE_BASE_OFFSET = 16, but with compact object headers UNSAFE.ARRAY_BYTE_BASE_OFFSET=12.
         // If AlignVector=true, we need the offset to be 8-byte aligned, else the vectors are filtered out.
         applyIfPlatform = {"64-bit", "true"},
-        applyIfCPUFeatureOr = {"avx2", "true", "asimd", "true"})
+        applyIfCPUFeatureOr = {"avx2", "true", "asimd", "true", "rvv", "true"})
     static Object[] test1a(byte[] a, byte[] b, byte mask) {
         for (int i = 0; i < RANGE; i+=8) {
             b[i+0] = (byte)(a[i+0] & mask); // adr = base + UNSAFE.ARRAY_BYTE_BASE_OFFSET + 0 + iter*8
@@ -455,7 +455,7 @@ public class TestAlignVector {
         // UNSAFE.ARRAY_BYTE_BASE_OFFSET = 16, but with compact object headers UNSAFE.ARRAY_BYTE_BASE_OFFSET=12.
         // If AlignVector=true, we need the offset to be 8-byte aligned, else the vectors are filtered out.
         applyIfPlatform = {"64-bit", "true"},
-        applyIfCPUFeatureOr = {"avx2", "true", "asimd", "true"})
+        applyIfCPUFeatureOr = {"avx2", "true", "asimd", "true", "rvv", "true"})
     static Object[] test1b(byte[] a, byte[] b, byte mask) {
         for (int i = 4; i < RANGE-8; i+=8) {
             b[i+0] = (byte)(a[i+0] & mask); // adr = base + UNSAFE.ARRAY_BYTE_BASE_OFFSET + 4 + iter*8
@@ -476,11 +476,11 @@ public class TestAlignVector {
                   IRNode.STORE_VECTOR, "> 0"},
         applyIfAnd = {"AlignVector", "false", "MaxVectorSize", ">=8"},
         applyIfPlatform = {"64-bit", "true"},
-        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"})
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true", "rvv", "true"})
     @IR(counts = {IRNode.LOAD_VECTOR_B, "= 0",
                   IRNode.AND_VB, "= 0",
                   IRNode.STORE_VECTOR, "= 0"},
-        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"},
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true", "rvv", "true"},
         applyIfPlatform = {"64-bit", "true"},
         applyIf = {"AlignVector", "true"})
     static Object[] test2(byte[] a, byte[] b, byte mask) {
@@ -500,11 +500,11 @@ public class TestAlignVector {
                   IRNode.STORE_VECTOR, "> 0"},
         applyIfAnd = {"AlignVector", "false", "MaxVectorSize", ">=8"},
         applyIfPlatform = {"64-bit", "true"},
-        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"})
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true", "rvv", "true"})
     @IR(counts = {IRNode.LOAD_VECTOR_B, "= 0",
                   IRNode.AND_VB, "= 0",
                   IRNode.STORE_VECTOR, "= 0"},
-        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"},
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true", "rvv", "true"},
         applyIfPlatform = {"64-bit", "true"},
         applyIf = {"AlignVector", "true"})
     static Object[] test3(byte[] a, byte[] b, byte mask) {
@@ -528,7 +528,7 @@ public class TestAlignVector {
                   IRNode.AND_VB,        IRNode.VECTOR_SIZE_4, "> 0",
                   IRNode.AND_VB,        IRNode.VECTOR_SIZE_8, "> 0",
                   IRNode.STORE_VECTOR, "> 0"},
-        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"},
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true", "rvv", "true"},
         applyIfPlatform = {"64-bit", "true"},
         applyIfAnd = {"AlignVector", "false", "MaxVectorSize", ">=16"})
     @IR(counts = {IRNode.LOAD_VECTOR_B, IRNode.VECTOR_SIZE_4, "> 0",
@@ -536,7 +536,7 @@ public class TestAlignVector {
                   IRNode.AND_VB,        IRNode.VECTOR_SIZE_4, "> 0",
                   IRNode.AND_VB,        IRNode.VECTOR_SIZE_8, "= 0",// unaligned
                   IRNode.STORE_VECTOR, "> 0"},
-        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"},
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true", "rvv", "true"},
         applyIfPlatform = {"64-bit", "true"},
         applyIfAnd = {"AlignVector", "true", "MaxVectorSize", ">=16"})
     static Object[] test4(byte[] a, byte[] b, byte mask) {
@@ -565,11 +565,11 @@ public class TestAlignVector {
                   IRNode.STORE_VECTOR, "> 0"},
         applyIfAnd = {"AlignVector", "false", "MaxVectorSize", ">=8"},
         applyIfPlatform = {"64-bit", "true"},
-        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"})
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true", "rvv", "true"})
     @IR(counts = {IRNode.LOAD_VECTOR_B, "= 0",
                   IRNode.AND_VB, "= 0",
                   IRNode.STORE_VECTOR, "= 0"},
-        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"},
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true", "rvv", "true"},
         applyIfPlatform = {"64-bit", "true"},
         applyIf = {"AlignVector", "true"})
     static Object[] test5(byte[] a, byte[] b, byte mask, int inv) {
@@ -591,11 +591,11 @@ public class TestAlignVector {
                   IRNode.STORE_VECTOR, "> 0"},
         applyIfAnd = {"AlignVector", "false", "MaxVectorSize", ">=8"},
         applyIfPlatform = {"64-bit", "true"},
-        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"})
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true", "rvv", "true"})
     @IR(counts = {IRNode.LOAD_VECTOR_B, "= 0",
                   IRNode.AND_VB, "= 0",
                   IRNode.STORE_VECTOR, "= 0"},
-        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"},
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true", "rvv", "true"},
         applyIfPlatform = {"64-bit", "true"},
         applyIf = {"AlignVector", "true"})
     static Object[] test6(byte[] a, byte[] b, byte mask) {
@@ -617,11 +617,11 @@ public class TestAlignVector {
                   IRNode.STORE_VECTOR, "> 0"},
         applyIfAnd = {"AlignVector", "false", "MaxVectorSize", ">=16"},
         applyIfPlatform = {"64-bit", "true"},
-        applyIfCPUFeatureOr = {"avx2", "true", "asimd", "true"})
+        applyIfCPUFeatureOr = {"avx2", "true", "asimd", "true", "rvv", "true"})
     @IR(counts = {IRNode.LOAD_VECTOR_S, "= 0",
                   IRNode.AND_VS, "= 0",
                   IRNode.STORE_VECTOR, "= 0"},
-        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"},
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true", "rvv", "true"},
         applyIfPlatform = {"64-bit", "true"},
         applyIf = {"AlignVector", "true"})
     static Object[] test7(short[] a, short[] b, short mask) {
@@ -643,11 +643,11 @@ public class TestAlignVector {
                   IRNode.STORE_VECTOR, "> 0"},
         applyIfAnd = {"AlignVector", "false", "MaxVectorSize", ">=8"},
         applyIfPlatform = {"64-bit", "true"},
-        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"})
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true", "rvv", "true"})
     @IR(counts = {IRNode.LOAD_VECTOR_B, "= 0",
                   IRNode.AND_VB, "= 0",
                   IRNode.STORE_VECTOR, "= 0"},
-        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"},
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true", "rvv", "true"},
         applyIfPlatform = {"64-bit", "true"},
         applyIf = {"AlignVector", "true"})
     static Object[] test8(byte[] a, byte[] b, byte mask, int init) {
@@ -669,7 +669,7 @@ public class TestAlignVector {
                   IRNode.STORE_VECTOR, "> 0"},
         applyIf = {"MaxVectorSize", ">=8"},
         applyIfPlatform = {"64-bit", "true"},
-        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"})
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true", "rvv", "true"})
     static Object[] test9(byte[] a, byte[] b, byte mask) {
         // known non-zero init value does not affect offset, but has implicit effect on iv
         for (int i = 13; i < RANGE-8; i+=8) {
@@ -687,13 +687,13 @@ public class TestAlignVector {
     @IR(counts = {IRNode.LOAD_VECTOR_B, IRNode.VECTOR_SIZE_4, "> 0",
                   IRNode.AND_VB,        IRNode.VECTOR_SIZE_4, "> 0",
                   IRNode.STORE_VECTOR, "> 0"},
-        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"},
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true", "rvv", "true"},
         applyIfPlatform = {"64-bit", "true"},
         applyIfAnd = {"AlignVector", "false", "MaxVectorSize", ">=8"})
     @IR(counts = {IRNode.LOAD_VECTOR_B, "= 0",
                   IRNode.AND_VB, "= 0",
                   IRNode.STORE_VECTOR, "= 0"},
-        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"},
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true", "rvv", "true"},
         applyIfPlatform = {"64-bit", "true"},
         applyIf = {"AlignVector", "true"})
     static Object[] test10a(byte[] a, byte[] b, byte mask) {
@@ -711,13 +711,13 @@ public class TestAlignVector {
     @IR(counts = {IRNode.LOAD_VECTOR_B, IRNode.VECTOR_SIZE_4, "> 0",
                   IRNode.AND_VB,        IRNode.VECTOR_SIZE_4, "> 0",
                   IRNode.STORE_VECTOR, "> 0"},
-        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"},
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true", "rvv", "true"},
         applyIfPlatform = {"64-bit", "true"},
         applyIfAnd = {"AlignVector", "false", "MaxVectorSize", ">=8"})
     @IR(counts = {IRNode.LOAD_VECTOR_B, "= 0",
                   IRNode.AND_VB, "= 0",
                   IRNode.STORE_VECTOR, "= 0"},
-        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"},
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true", "rvv", "true"},
         applyIfPlatform = {"64-bit", "true"},
         applyIf = {"AlignVector", "true"})
     static Object[] test10b(byte[] a, byte[] b, byte mask) {
@@ -736,13 +736,13 @@ public class TestAlignVector {
     @IR(counts = {IRNode.LOAD_VECTOR_S, IRNode.VECTOR_SIZE_4, "> 0",
                   IRNode.AND_VS,        IRNode.VECTOR_SIZE_4, "> 0",
                   IRNode.STORE_VECTOR, "> 0"},
-        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"},
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true", "rvv", "true"},
         applyIfPlatform = {"64-bit", "true"},
         applyIfAnd = {"AlignVector", "false", "MaxVectorSize", ">=16"})
     @IR(counts = {IRNode.LOAD_VECTOR_S, "= 0",
                   IRNode.AND_VS, "= 0",
                   IRNode.STORE_VECTOR, "= 0"},
-        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"},
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true", "rvv", "true"},
         applyIfPlatform = {"64-bit", "true"},
         applyIf = {"AlignVector", "true"})
     static Object[] test10c(short[] a, short[] b, short mask) {
@@ -765,7 +765,7 @@ public class TestAlignVector {
         // UNSAFE.ARRAY_BYTE_BASE_OFFSET = 16, but with compact object headers UNSAFE.ARRAY_BYTE_BASE_OFFSET=12.
         // If AlignVector=true, we need the offset to be 8-byte aligned, else the vectors are filtered out.
         applyIfPlatform = {"64-bit", "true"},
-        applyIfCPUFeatureOr = {"avx2", "true", "asimd", "true"})
+        applyIfCPUFeatureOr = {"avx2", "true", "asimd", "true", "rvv", "true"})
     static Object[] test10d(short[] a, short[] b, short mask) {
         for (int i = 13; i < RANGE-16; i+=8) {
             // adr = base + UNSAFE.ARRAY_SHORT_BASE_OFFSET + 2*(3 + 13) + iter*16
@@ -785,7 +785,7 @@ public class TestAlignVector {
         // UNSAFE.ARRAY_BYTE_BASE_OFFSET = 16, but with compact object headers UNSAFE.ARRAY_BYTE_BASE_OFFSET=12.
         // If AlignVector=true, we need the offset to be 8-byte aligned, else the vectors are filtered out.
         applyIfPlatform = {"64-bit", "true"},
-        applyIfCPUFeatureOr = {"avx2", "true", "asimd", "true"})
+        applyIfCPUFeatureOr = {"avx2", "true", "asimd", "true", "rvv", "true"})
     static Object[] test10e(short[] a, short[] b, short mask) {
         for (int i = 11; i < RANGE-16; i+=8) {
             // adr = base + UNSAFE.ARRAY_SHORT_BASE_OFFSET + 2*(3 + 11) + iter*16
@@ -802,7 +802,7 @@ public class TestAlignVector {
                   IRNode.AND_VB, "> 0",
                   IRNode.STORE_VECTOR, "> 0"},
         applyIfPlatform = {"64-bit", "true"},
-        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"})
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true", "rvv", "true"})
     static Object[] test11aB(byte[] a, byte[] b, byte mask) {
         for (int i = 0; i < RANGE; i++) {
             // always alignable
@@ -816,7 +816,7 @@ public class TestAlignVector {
                   IRNode.AND_VS, "> 0",
                   IRNode.STORE_VECTOR, "> 0"},
         applyIfPlatform = {"64-bit", "true"},
-        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"})
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true", "rvv", "true"})
     static Object[] test11aS(short[] a, short[] b, short mask) {
         for (int i = 0; i < RANGE; i++) {
             // always alignable
@@ -830,7 +830,7 @@ public class TestAlignVector {
                   IRNode.AND_VI, "> 0",
                   IRNode.STORE_VECTOR, "> 0"},
         applyIfPlatform = {"64-bit", "true"},
-        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"})
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true", "rvv", "true"})
     static Object[] test11aI(int[] a, int[] b, int mask) {
         for (int i = 0; i < RANGE; i++) {
             // always alignable
@@ -844,7 +844,7 @@ public class TestAlignVector {
                   IRNode.AND_VL, "> 0",
                   IRNode.STORE_VECTOR, "> 0"},
         applyIfPlatform = {"64-bit", "true"},
-        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"})
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true", "rvv", "true"})
     static Object[] test11aL(long[] a, long[] b, long mask) {
         for (int i = 0; i < RANGE; i++) {
             // always alignable
@@ -858,7 +858,7 @@ public class TestAlignVector {
                   IRNode.AND_VB, "> 0",
                   IRNode.STORE_VECTOR, "> 0"},
         applyIfPlatform = {"64-bit", "true"},
-        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"})
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true", "rvv", "true"})
     static Object[] test11bB(byte[] a, byte[] b, byte mask) {
         for (int i = 1; i < RANGE; i++) {
             // always alignable
@@ -872,7 +872,7 @@ public class TestAlignVector {
                   IRNode.AND_VS, "> 0",
                   IRNode.STORE_VECTOR, "> 0"},
         applyIfPlatform = {"64-bit", "true"},
-        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"})
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true", "rvv", "true"})
     static Object[] test11bS(short[] a, short[] b, short mask) {
         for (int i = 1; i < RANGE; i++) {
             // always alignable
@@ -886,7 +886,7 @@ public class TestAlignVector {
                   IRNode.AND_VI, "> 0",
                   IRNode.STORE_VECTOR, "> 0"},
         applyIfPlatform = {"64-bit", "true"},
-        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"})
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true", "rvv", "true"})
     static Object[] test11bI(int[] a, int[] b, int mask) {
         for (int i = 1; i < RANGE; i++) {
             // always alignable
@@ -900,7 +900,7 @@ public class TestAlignVector {
                   IRNode.AND_VL, "> 0",
                   IRNode.STORE_VECTOR, "> 0"},
         applyIfPlatform = {"64-bit", "true"},
-        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"})
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true", "rvv", "true"})
     static Object[] test11bL(long[] a, long[] b, long mask) {
         for (int i = 1; i < RANGE; i++) {
             // always alignable
@@ -913,13 +913,13 @@ public class TestAlignVector {
     @IR(counts = {IRNode.LOAD_VECTOR_B, "> 0",
                   IRNode.AND_VB, "> 0",
                   IRNode.STORE_VECTOR, "> 0"},
-        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"},
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true", "rvv", "true"},
         applyIfPlatform = {"64-bit", "true"},
         applyIf = {"AlignVector", "false"})
     @IR(counts = {IRNode.LOAD_VECTOR_B, "= 0",
                   IRNode.AND_VB, "= 0",
                   IRNode.STORE_VECTOR, "= 0"},
-        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"},
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true", "rvv", "true"},
         applyIfPlatform = {"64-bit", "true"},
         applyIf = {"AlignVector", "true"})
     static Object[] test11cB(byte[] a, byte[] b, byte mask) {
@@ -934,13 +934,13 @@ public class TestAlignVector {
     @IR(counts = {IRNode.LOAD_VECTOR_S, "> 0",
                   IRNode.AND_VS, "> 0",
                   IRNode.STORE_VECTOR, "> 0"},
-        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"},
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true", "rvv", "true"},
         applyIfPlatform = {"64-bit", "true"},
         applyIf = {"AlignVector", "false"})
     @IR(counts = {IRNode.LOAD_VECTOR_S, "= 0",
                   IRNode.AND_VS, "= 0",
                   IRNode.STORE_VECTOR, "= 0"},
-        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"},
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true", "rvv", "true"},
         applyIfPlatform = {"64-bit", "true"},
         applyIf = {"AlignVector", "true"})
     static Object[] test11cS(short[] a, short[] b, short mask) {
@@ -955,13 +955,13 @@ public class TestAlignVector {
     @IR(counts = {IRNode.LOAD_VECTOR_I, "> 0",
                   IRNode.AND_VI, "> 0",
                   IRNode.STORE_VECTOR, "> 0"},
-        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"},
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true", "rvv", "true"},
         applyIfPlatform = {"64-bit", "true"},
         applyIf = {"AlignVector", "false"})
     @IR(counts = {IRNode.LOAD_VECTOR_I, "= 0",
                   IRNode.AND_VI, "= 0",
                   IRNode.STORE_VECTOR, "= 0"},
-        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"},
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true", "rvv", "true"},
         applyIfPlatform = {"64-bit", "true"},
         applyIf = {"AlignVector", "true"})
     static Object[] test11cI(int[] a, int[] b, int mask) {
@@ -977,7 +977,7 @@ public class TestAlignVector {
                   IRNode.AND_VL, "> 0",
                   IRNode.STORE_VECTOR, "> 0"},
         applyIfPlatform = {"64-bit", "true"},
-        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"})
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true", "rvv", "true"})
     static Object[] test11cL(long[] a, long[] b, long mask) {
         for (int i = 1; i < RANGE-1; i++) {
             // always alignable (8 byte offset)
@@ -991,7 +991,7 @@ public class TestAlignVector {
                   IRNode.AND_VB, "> 0",
                   IRNode.STORE_VECTOR, "> 0"},
         applyIfPlatform = {"64-bit", "true"},
-        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"})
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true", "rvv", "true"})
     static Object[] test11dB(byte[] a, byte[] b, byte mask, int invar) {
         for (int i = 0; i < RANGE; i++) {
             b[i+0+invar] = (byte)(a[i+0+invar] & mask);
@@ -1004,7 +1004,7 @@ public class TestAlignVector {
                   IRNode.AND_VS, "> 0",
                   IRNode.STORE_VECTOR, "> 0"},
         applyIfPlatform = {"64-bit", "true"},
-        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"})
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true", "rvv", "true"})
     static Object[] test11dS(short[] a, short[] b, short mask, int invar) {
         for (int i = 0; i < RANGE; i++) {
             b[i+0+invar] = (short)(a[i+0+invar] & mask);
@@ -1017,7 +1017,7 @@ public class TestAlignVector {
                   IRNode.AND_VI, "> 0",
                   IRNode.STORE_VECTOR, "> 0"},
         applyIfPlatform = {"64-bit", "true"},
-        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"})
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true", "rvv", "true"})
     static Object[] test11dI(int[] a, int[] b, int mask, int invar) {
         for (int i = 0; i < RANGE; i++) {
             b[i+0+invar] = (int)(a[i+0+invar] & mask);
@@ -1030,7 +1030,7 @@ public class TestAlignVector {
                   IRNode.AND_VL, "> 0",
                   IRNode.STORE_VECTOR, "> 0"},
         applyIfPlatform = {"64-bit", "true"},
-        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"})
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true", "rvv", "true"})
     static Object[] test11dL(long[] a, long[] b, long mask, int invar) {
         for (int i = 0; i < RANGE; i++) {
             b[i+0+invar] = (long)(a[i+0+invar] & mask);
@@ -1044,7 +1044,7 @@ public class TestAlignVector {
                   IRNode.STORE_VECTOR,                                           "> 0"},
         applyIfPlatform = {"64-bit", "true"},
         applyIf = {"AlignVector", "false"},
-        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"})
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true", "rvv", "true"})
     static Object[] test12(byte[] a, byte[] b, byte mask) {
         for (int i = 0; i < RANGE/16; i++) {
             // Non-power-of-2 stride. Vectorization of 4 bytes, then 2-bytes gap.
@@ -1063,7 +1063,7 @@ public class TestAlignVector {
                   IRNode.ADD_VL, IRNode.VECTOR_SIZE + "min(max_int, max_long)", "> 0",
                   IRNode.STORE_VECTOR, "> 0"},
         applyIfPlatform = {"64-bit", "true"},
-        applyIfCPUFeatureOr = {"avx2", "true"})
+        applyIfCPUFeatureOr = {"avx2", "true", "rvv", "true"})
     // require avx to ensure vectors are larger than what unrolling produces
     static Object[] test13aIL(int[] a, long[] b) {
         for (int i = 0; i < RANGE; i++) {
@@ -1081,7 +1081,7 @@ public class TestAlignVector {
                   IRNode.STORE_VECTOR, "> 0"},
         applyIfOr = {"UseCompactObjectHeaders", "false", "AlignVector", "false"},
         applyIfPlatform = {"64-bit", "true"},
-        applyIfCPUFeatureOr = {"avx2", "true", "asimd", "true"})
+        applyIfCPUFeatureOr = {"avx2", "true", "asimd", "true", "rvv", "true"})
     static Object[] test13aIB(int[] a, byte[] b) {
         for (int i = 0; i < RANGE; i++) {
             // adr = base + UNSAFE.ARRAY_BYTE_BASE_OFFSET + 1*iter
@@ -1111,7 +1111,7 @@ public class TestAlignVector {
                   IRNode.STORE_VECTOR, "> 0"},
         applyIfOr = {"UseCompactObjectHeaders", "false", "AlignVector", "false"},
         applyIfPlatform = {"64-bit", "true"},
-        applyIfCPUFeatureOr = {"avx2", "true", "asimd", "true"})
+        applyIfCPUFeatureOr = {"avx2", "true", "asimd", "true", "rvv", "true"})
     static Object[] test13aIS(int[] a, short[] b) {
         for (int i = 0; i < RANGE; i++) {
             // adr = base + UNSAFE.ARRAY_BYTE_BASE_OFFSET + 4*iter
@@ -1145,7 +1145,7 @@ public class TestAlignVector {
                   IRNode.STORE_VECTOR, "> 0"},
         applyIfOr = {"UseCompactObjectHeaders", "false", "AlignVector", "false"},
         applyIfPlatform = {"64-bit", "true"},
-        applyIfCPUFeatureOr = {"avx2", "true", "asimd", "true"})
+        applyIfCPUFeatureOr = {"avx2", "true", "asimd", "true", "rvv", "true"})
     static Object[] test13aBSIL(byte[] a, short[] b, int[] c, long[] d) {
         for (int i = 0; i < RANGE; i++) {
             // adr = base + UNSAFE.ARRAY_BYTE_BASE_OFFSET + 1*iter
@@ -1175,7 +1175,7 @@ public class TestAlignVector {
                   IRNode.ADD_VL, IRNode.VECTOR_SIZE + "min(max_int, max_long)", "> 0",
                   IRNode.STORE_VECTOR, "> 0"},
         applyIfPlatform = {"64-bit", "true"},
-        applyIfCPUFeatureOr = {"avx2", "true"})
+        applyIfCPUFeatureOr = {"avx2", "true", "rvv", "true"})
     // require avx to ensure vectors are larger than what unrolling produces
     static Object[] test13bIL(int[] a, long[] b) {
         for (int i = 1; i < RANGE; i++) {
@@ -1193,7 +1193,7 @@ public class TestAlignVector {
                   IRNode.STORE_VECTOR, "> 0"},
         applyIfOr = {"UseCompactObjectHeaders", "false", "AlignVector", "false"},
         applyIfPlatform = {"64-bit", "true"},
-        applyIfCPUFeatureOr = {"avx2", "true", "asimd", "true"})
+        applyIfCPUFeatureOr = {"avx2", "true", "asimd", "true", "rvv", "true"})
     static Object[] test13bIB(int[] a, byte[] b) {
         for (int i = 1; i < RANGE; i++) {
             // adr = base + UNSAFE.ARRAY_INT_BASE_OFFSET + 4 + 4*iter
@@ -1218,7 +1218,7 @@ public class TestAlignVector {
                   IRNode.STORE_VECTOR, "> 0"},
         applyIfOr = {"UseCompactObjectHeaders", "false", "AlignVector", "false"},
         applyIfPlatform = {"64-bit", "true"},
-        applyIfCPUFeatureOr = {"avx2", "true", "asimd", "true"})
+        applyIfCPUFeatureOr = {"avx2", "true", "asimd", "true", "rvv", "true"})
     static Object[] test13bIS(int[] a, short[] b) {
         for (int i = 1; i < RANGE; i++) {
             // adr = base + UNSAFE.ARRAY_INT_BASE_OFFSET + 4 + 4*iter
@@ -1247,7 +1247,7 @@ public class TestAlignVector {
                   IRNode.STORE_VECTOR, "> 0"},
         applyIfOr = {"UseCompactObjectHeaders", "false", "AlignVector", "false"},
         applyIfPlatform = {"64-bit", "true"},
-        applyIfCPUFeatureOr = {"avx2", "true", "asimd", "true"})
+        applyIfCPUFeatureOr = {"avx2", "true", "asimd", "true", "rvv", "true"})
     static Object[] test13bBSIL(byte[] a, short[] b, int[] c, long[] d) {
         for (int i = 1; i < RANGE; i++) {
             // adr = base + UNSAFE.ARRAY_BYTE_BASE_OFFSET + 1 + 1*iter
@@ -1274,13 +1274,13 @@ public class TestAlignVector {
     @IR(counts = {IRNode.LOAD_VECTOR_B, "= 0",
                   IRNode.ADD_VB, "= 0",
                   IRNode.STORE_VECTOR, "= 0"},
-        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"},
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true", "rvv", "true"},
         applyIfPlatform = {"64-bit", "true"},
         applyIf = {"AlignVector", "false"})
     @IR(counts = {IRNode.LOAD_VECTOR_B, "= 0",
                   IRNode.ADD_VB, "= 0",
                   IRNode.STORE_VECTOR, "= 0"},
-        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"},
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true", "rvv", "true"},
         applyIfPlatform = {"64-bit", "true"},
         applyIf = {"AlignVector", "true"})
     static Object[] test14aB(byte[] a) {
@@ -1313,13 +1313,13 @@ public class TestAlignVector {
     @IR(counts = {IRNode.LOAD_VECTOR_B, "= 0",
                   IRNode.ADD_VB, "= 0",
                   IRNode.STORE_VECTOR, "= 0"},
-        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"},
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true", "rvv", "true"},
         applyIfPlatform = {"64-bit", "true"},
         applyIf = {"AlignVector", "false"})
     @IR(counts = {IRNode.LOAD_VECTOR_B, "= 0",
                   IRNode.ADD_VB, "= 0",
                   IRNode.STORE_VECTOR, "= 0"},
-        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"},
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true", "rvv", "true"},
         applyIfPlatform = {"64-bit", "true"},
         applyIf = {"AlignVector", "true"})
     static Object[] test14bB(byte[] a) {
@@ -1352,13 +1352,13 @@ public class TestAlignVector {
     @IR(counts = {IRNode.LOAD_VECTOR_B, "= 0",
                   IRNode.ADD_VB, "= 0",
                   IRNode.STORE_VECTOR, "= 0"},
-        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"},
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true", "rvv", "true"},
         applyIfPlatform = {"64-bit", "true"},
         applyIf = {"AlignVector", "false"})
     @IR(counts = {IRNode.LOAD_VECTOR_B, "= 0",
                   IRNode.ADD_VB, "= 0",
                   IRNode.STORE_VECTOR, "= 0"},
-        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"},
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true", "rvv", "true"},
         applyIfPlatform = {"64-bit", "true"},
         applyIf = {"AlignVector", "true"})
     static Object[] test14cB(byte[] a) {
@@ -1391,13 +1391,13 @@ public class TestAlignVector {
     @IR(counts = {IRNode.LOAD_VECTOR_B, IRNode.VECTOR_SIZE + "min(max_byte, 8)", "> 0",
                   IRNode.ADD_VB,        IRNode.VECTOR_SIZE + "min(max_byte, 8)", "> 0",
                   IRNode.STORE_VECTOR,                                           "> 0"},
-        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"},
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true", "rvv", "true"},
         applyIfPlatform = {"64-bit", "true"},
         applyIf = {"AlignVector", "false"})
     @IR(counts = {IRNode.LOAD_VECTOR_B, "= 0",
                   IRNode.ADD_VB, "= 0",
                   IRNode.STORE_VECTOR, "= 0"},
-        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"},
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true", "rvv", "true"},
         applyIfPlatform = {"64-bit", "true"},
         applyIf = {"AlignVector", "true"})
     static Object[] test14dB(byte[] a) {
@@ -1419,13 +1419,13 @@ public class TestAlignVector {
     @IR(counts = {IRNode.LOAD_VECTOR_B, IRNode.VECTOR_SIZE + "min(max_byte, 8)", "> 0",
                   IRNode.ADD_VB,        IRNode.VECTOR_SIZE + "min(max_byte, 8)", "> 0",
                   IRNode.STORE_VECTOR,                                           "> 0"},
-        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"},
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true", "rvv", "true"},
         applyIfPlatform = {"64-bit", "true"},
         applyIf = {"AlignVector", "false"})
     @IR(counts = {IRNode.LOAD_VECTOR_B, "= 0",
                   IRNode.ADD_VB, "= 0",
                   IRNode.STORE_VECTOR, "= 0"},
-        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"},
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true", "rvv", "true"},
         applyIfPlatform = {"64-bit", "true"},
         applyIf = {"AlignVector", "true"})
     static Object[] test14eB(byte[] a) {
@@ -1447,13 +1447,13 @@ public class TestAlignVector {
     @IR(counts = {IRNode.LOAD_VECTOR_B, IRNode.VECTOR_SIZE + "min(max_byte, 8)", "> 0",
                   IRNode.ADD_VB,        IRNode.VECTOR_SIZE + "min(max_byte, 8)", "> 0",
                   IRNode.STORE_VECTOR,                                           "> 0"},
-        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"},
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true", "rvv", "true"},
         applyIfPlatform = {"64-bit", "true"},
         applyIf = {"AlignVector", "false"})
     @IR(counts = {IRNode.LOAD_VECTOR_B, "= 0",
                   IRNode.ADD_VB, "= 0",
                   IRNode.STORE_VECTOR, "= 0"},
-        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"},
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true", "rvv", "true"},
         applyIfPlatform = {"64-bit", "true"},
         applyIf = {"AlignVector", "true"})
     static Object[] test14fB(byte[] a) {
@@ -1602,7 +1602,7 @@ public class TestAlignVector {
                   IRNode.ADD_VL, "> 0",
                   IRNode.STORE_VECTOR, "> 0"},
         applyIfPlatform = {"64-bit", "true"},
-        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"})
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true", "rvv", "true"})
     static Object[] test17a(long[] a) {
         // Unsafe: vectorizes with profiling (not xcomp)
         for (int i = 0; i < RANGE; i++) {
@@ -1631,7 +1631,7 @@ public class TestAlignVector {
                   IRNode.STORE_VECTOR, "> 0"},
         applyIf = {"MaxVectorSize", ">=32"},
         applyIfPlatform = {"64-bit", "true"},
-        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"})
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true", "rvv", "true"})
     static Object[] test17c(long[] a) {
         // Unsafe: aligned vectorizes
         for (int i = 0; i < RANGE-1; i+=4) {
@@ -1648,7 +1648,7 @@ public class TestAlignVector {
     @IR(counts = {IRNode.LOAD_VECTOR_L, IRNode.VECTOR_SIZE_2, "> 0",
                   IRNode.ADD_VL,        IRNode.VECTOR_SIZE_2, "> 0",
                   IRNode.STORE_VECTOR, "> 0"},
-        applyIfCPUFeatureOr = {"avx512", "true", "asimd", "true"},
+        applyIfCPUFeatureOr = {"avx512", "true", "asimd", "true", "rvv", "true"},
         applyIfPlatform = {"64-bit", "true"},
         applyIfAnd = {"AlignVector", "false", "MaxVectorSize", ">=64"})
     // Ensure vector width is large enough to fit 64 byte for longs:
@@ -1659,7 +1659,7 @@ public class TestAlignVector {
     @IR(counts = {IRNode.LOAD_VECTOR_L, "= 0",
                   IRNode.ADD_VL, "= 0",
                   IRNode.STORE_VECTOR, "= 0"},
-        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"},
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true", "rvv", "true"},
         applyIfPlatform = {"64-bit", "true"},
         applyIf = {"AlignVector", "true"})
     static Object[] test17d(long[] a) {
diff --git a/test/hotspot/jtreg/compiler/loopopts/superword/TestCompatibleUseDefTypeSize.java b/test/hotspot/jtreg/compiler/loopopts/superword/TestCompatibleUseDefTypeSize.java
index 43580f4dee2..f5445f3106b 100644
--- a/test/hotspot/jtreg/compiler/loopopts/superword/TestCompatibleUseDefTypeSize.java
+++ b/test/hotspot/jtreg/compiler/loopopts/superword/TestCompatibleUseDefTypeSize.java
@@ -315,7 +315,7 @@ public class TestCompatibleUseDefTypeSize {
     @Test
     @IR(counts = {IRNode.STORE_VECTOR, "= 0"},
         applyIfPlatform = {"64-bit", "true"},
-        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"})
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true", "rvv", "true"})
     // "inflate"  method: 1 byte -> 2 byte.
     // Java scalar code has no explicit conversion.
     // Vector code would need a conversion. We may add this in the future.
@@ -329,7 +329,7 @@ public class TestCompatibleUseDefTypeSize {
     @Test
     @IR(counts = {IRNode.STORE_VECTOR, "= 0"},
         applyIfPlatform = {"64-bit", "true"},
-        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"})
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true", "rvv", "true"})
     // "inflate"  method: 1 byte -> 2 byte.
     // Java scalar code has no explicit conversion.
     // Vector code would need a conversion. We may add this in the future.
@@ -343,7 +343,7 @@ public class TestCompatibleUseDefTypeSize {
     @Test
     @IR(counts = {IRNode.STORE_VECTOR, "= 0"},
         applyIfPlatform = {"64-bit", "true"},
-        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"})
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true", "rvv", "true"})
     // "deflate"  method: 2 byte -> 1 byte.
     // Java scalar code has no explicit conversion.
     // Vector code would need a conversion. We may add this in the future.
@@ -360,7 +360,7 @@ public class TestCompatibleUseDefTypeSize {
                   IRNode.STORE_VECTOR,  "> 0"},
         applyIfPlatform = {"64-bit", "true"},
         applyIf = {"AlignVector", "false"}, // a[i] and a[i+1] cannot both be aligned.
-        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"})
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true", "rvv", "true"})
     // Used to not vectorize because of "alignment boundaries".
     // Assume 64 byte vector width:
     // a[i+0:i+15] and a[i+1:i+16], each are 4 * 16 = 64 byte.
@@ -378,7 +378,7 @@ public class TestCompatibleUseDefTypeSize {
                   IRNode.STORE_VECTOR,  "> 0"},
         applyIfPlatform = {"64-bit", "true"},
         applyIf = {"AlignVector", "false"}, // a[i] and a[i+1] cannot both be aligned.
-        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"})
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true", "rvv", "true"})
     // same as test3, but hand-unrolled
     static Object[] test4(int[] a, int[] b) {
         for (int i = 0; i < a.length-2; i+=2) {
@@ -391,7 +391,7 @@ public class TestCompatibleUseDefTypeSize {
     @Test
     @IR(counts = {IRNode.STORE_VECTOR, "= 0"},
         applyIfPlatform = {"64-bit", "true"},
-        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"})
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true", "rvv", "true"})
     // In theory, one would expect this to be a simple 4byte -> 4byte conversion.
     // But there is a CmpF and CMove here because we check for isNaN. Plus a MoveF2I.
     //
@@ -406,7 +406,7 @@ public class TestCompatibleUseDefTypeSize {
     @Test
     @IR(counts = {IRNode.STORE_VECTOR, "= 0"},
         applyIfPlatform = {"64-bit", "true"},
-        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"})
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true", "rvv", "true"})
     // Missing support for MoveF2I
     static Object[] test6(int[] a, float[] b) {
         for (int i = 0; i < a.length; i++) {
@@ -418,7 +418,7 @@ public class TestCompatibleUseDefTypeSize {
     @Test
     @IR(counts = {IRNode.STORE_VECTOR, "= 0"},
         applyIfPlatform = {"64-bit", "true"},
-        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"})
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true", "rvv", "true"})
     // Missing support for MoveI2F
     static Object[] test7(int[] a, float[] b) {
         for (int i = 0; i < a.length; i++) {
@@ -430,7 +430,7 @@ public class TestCompatibleUseDefTypeSize {
     @Test
     @IR(counts = {IRNode.STORE_VECTOR, "= 0"},
         applyIfPlatform = {"64-bit", "true"},
-        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"})
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true", "rvv", "true"})
     // Missing support for Needs CmpD, CMove and MoveD2L
     static Object[] test8(long[] a, double[] b) {
         for (int i = 0; i < a.length; i++) {
@@ -442,7 +442,7 @@ public class TestCompatibleUseDefTypeSize {
     @Test
     @IR(counts = {IRNode.STORE_VECTOR, "= 0"},
         applyIfPlatform = {"64-bit", "true"},
-        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"})
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true", "rvv", "true"})
     // Missing support for MoveD2L
     static Object[] test9(long[] a, double[] b) {
         for (int i = 0; i < a.length; i++) {
@@ -454,7 +454,7 @@ public class TestCompatibleUseDefTypeSize {
     @Test
     @IR(counts = {IRNode.STORE_VECTOR, "= 0"},
         applyIfPlatform = {"64-bit", "true"},
-        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"})
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true", "rvv", "true"})
     // Missing support for MoveL2D
     static Object[] test10(long[] a, double[] b) {
         for (int i = 0; i < a.length; i++) {
diff --git a/test/hotspot/jtreg/compiler/loopopts/superword/TestEquivalentInvariants.java b/test/hotspot/jtreg/compiler/loopopts/superword/TestEquivalentInvariants.java
index b3032b1fa4e..7cec26d6532 100644
--- a/test/hotspot/jtreg/compiler/loopopts/superword/TestEquivalentInvariants.java
+++ b/test/hotspot/jtreg/compiler/loopopts/superword/TestEquivalentInvariants.java
@@ -383,7 +383,7 @@ public class TestEquivalentInvariants {
                   IRNode.ADD_VB,        "> 0",
                   IRNode.STORE_VECTOR,  "> 0"},
         applyIfPlatform = {"64-bit", "true"},
-        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"})
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true", "rvv", "true"})
     static Object[] testArrayBB(byte[] a, byte[] b) {
         for (int i = 0; i < a.length; i++) {
             b[i+0] = (byte)(a[i] + 1);
@@ -396,7 +396,7 @@ public class TestEquivalentInvariants {
                   IRNode.ADD_VB,        "> 0",
                   IRNode.STORE_VECTOR,  "> 0"},
         applyIfPlatform = {"64-bit", "true"},
-        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"})
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true", "rvv", "true"})
     // Same int invariant summands, but added in a different order.
     static Object[] testArrayBBInvar3(byte[] a, byte[] b, int invar1, int invar2, int invar3) {
         int i1 = invar1 + invar2 + invar3;
@@ -412,7 +412,7 @@ public class TestEquivalentInvariants {
                   IRNode.ADD_VB,        "> 0",
                   IRNode.STORE_VECTOR,  "> 0"},
         applyIfPlatform = {"64-bit", "true"},
-        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"})
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true", "rvv", "true"})
     // Just a simple pattern, without any (explicit) invariant.
     static Object[] testMemorySegmentB(MemorySegment m) {
         for (int i = 0; i < (int)m.byteSize(); i++) {
@@ -426,7 +426,7 @@ public class TestEquivalentInvariants {
     @IR(counts = {IRNode.LOAD_VECTOR_B, "= 0",
                   IRNode.STORE_VECTOR,  "= 0"},
         applyIfPlatform = {"64-bit", "true"},
-        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"})
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true", "rvv", "true"})
     // Does not vectorize: RangeChecks are not eliminated.
     // Filed RFE: JDK-8327209
     static Object[] testMemorySegmentBInvarI(MemorySegment m, int invar, int size) {
@@ -442,7 +442,7 @@ public class TestEquivalentInvariants {
                   IRNode.ADD_VB,        "> 0",
                   IRNode.STORE_VECTOR,  "> 0"},
         applyIfPlatform = {"64-bit", "true"},
-        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"})
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true", "rvv", "true"})
     // Has different invariants, before sorting:
     //
     //   3125 AddL = ((CastLL(Param 11) + ConvI2L(1460  Phi)) + 530  LoadL)
@@ -460,7 +460,7 @@ public class TestEquivalentInvariants {
     @IR(counts = {IRNode.LOAD_VECTOR_B, "= 0",
                   IRNode.STORE_VECTOR,  "= 0"},
         applyIfPlatform = {"64-bit", "true"},
-        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"})
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true", "rvv", "true"})
     // Does not vectorize: RangeChecks are not eliminated.
     // Filed RFE: JDK-8327209
     static Object[] testMemorySegmentBInvarIAdr(MemorySegment m, int invar, int size) {
@@ -477,7 +477,7 @@ public class TestEquivalentInvariants {
                   IRNode.ADD_VB,        "> 0",
                   IRNode.STORE_VECTOR,  "> 0"},
         applyIfPlatform = {"64-bit", "true"},
-        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"})
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true", "rvv", "true"})
     // Since we add "i + invar", the invariant is already equivalent without sorting.
     static Object[] testMemorySegmentBInvarLAdr(MemorySegment m, long invar, int size) {
         for (int i = 0; i < size; i++) {
@@ -493,7 +493,7 @@ public class TestEquivalentInvariants {
                   IRNode.ADD_VB,        "> 0",
                   IRNode.STORE_VECTOR,  "> 0"},
         applyIfPlatform = {"64-bit", "true"},
-        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"})
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true", "rvv", "true"})
     static Object[] testMemorySegmentBInvarI3a(MemorySegment m, int invar1, int invar2, int invar3, int size) {
         long i1 = (long)(invar1 + invar2 + invar3);
         long i2 = (long)(invar2 + invar3 + invar1); // equivalent
@@ -510,7 +510,7 @@ public class TestEquivalentInvariants {
                   IRNode.STORE_VECTOR,  "> 0"},
         applyIfPlatform = {"64-bit", "true"},
         applyIf = {"AlignVector", "false"},
-        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"})
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true", "rvv", "true"})
     static Object[] testMemorySegmentBInvarI3b(MemorySegment m, int invar1, int invar2, int invar3, int size) {
         long i1 = (long)(invar1 + invar2 + invar3);
         long i2 = (long)(invar2 + invar3 + invar1); // equivalent
@@ -541,7 +541,7 @@ public class TestEquivalentInvariants {
                   IRNode.STORE_VECTOR,  "> 0"},
         applyIfPlatform = {"64-bit", "true"},
         applyIf = {"AlignVector", "false"},
-        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"})
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true", "rvv", "true"})
     static Object[] testMemorySegmentBInvarI3d(MemorySegment m, int invar1, int invar2, int invar3, int size) {
         long i1 = (long)(invar1 + invar2 + invar3);
         long i2 = (long)(invar2 + invar3) + (long)(invar1);
@@ -559,7 +559,7 @@ public class TestEquivalentInvariants {
                   IRNode.ADD_VB,        "> 0",
                   IRNode.STORE_VECTOR,  "> 0"},
         applyIfPlatform = {"64-bit", "true"},
-        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"})
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true", "rvv", "true"})
     static Object[] testMemorySegmentBInvarI3e(MemorySegment m, int invar1, int invar2, int invar3, int size) {
         long i1 = (long)(invar1 + invar2 - invar3);
         long i2 = (long)(invar2 - invar3 + invar1); // equivalent
@@ -575,7 +575,7 @@ public class TestEquivalentInvariants {
                   IRNode.ADD_VB,        "> 0",
                   IRNode.STORE_VECTOR,  "> 0"},
         applyIfPlatform = {"64-bit", "true"},
-        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"})
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true", "rvv", "true"})
     static Object[] testMemorySegmentBInvarI3f(MemorySegment m, int invar1, int invar2, int invar3, int size) {
         long i1 = (long)(invar1 - (invar2 - invar3));
         long i2 = (long)(-invar2 + invar3 + invar1); // equivalent
@@ -591,7 +591,7 @@ public class TestEquivalentInvariants {
                   IRNode.ADD_VB,        "> 0",
                   IRNode.STORE_VECTOR,  "> 0"},
         applyIfPlatform = {"64-bit", "true"},
-        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"})
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true", "rvv", "true"})
     static Object[] testMemorySegmentBInvarL3g(MemorySegment m, long invar1, long invar2, long invar3, int size) {
         long i1 = invar1 - (invar2 - invar3);
         long i2 = -invar2 + invar3 + invar1; // equivalent
@@ -607,7 +607,7 @@ public class TestEquivalentInvariants {
                   IRNode.ADD_VB,        "> 0",
                   IRNode.STORE_VECTOR,  "> 0"},
         applyIfPlatform = {"64-bit", "true"},
-        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"})
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true", "rvv", "true"})
     static Object[] testMemorySegmentBInvarL3h(MemorySegment m, long invar1, long invar2, long invar3, int size) {
         long i1 = -invar1 - invar2 - invar3;
         long i2 = -invar2 - invar3 - invar1; // equivalent
@@ -623,7 +623,7 @@ public class TestEquivalentInvariants {
                   IRNode.ADD_VB,        "> 0",
                   IRNode.STORE_VECTOR,  "> 0"},
         applyIfPlatform = {"64-bit", "true"},
-        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"})
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true", "rvv", "true"})
     static Object[] testMemorySegmentBInvarL3k(MemorySegment m, long invar1, long invar2, long invar3, int size) {
         long i1 = -invar1 + invar2 + invar3;
         long i2 = invar2 + invar3 - invar1; // equivalent
@@ -640,7 +640,7 @@ public class TestEquivalentInvariants {
                   IRNode.STORE_VECTOR,  "> 0"},
         applyIfPlatform = {"64-bit", "true"},
         applyIf = {"AlignVector", "false"},
-        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"})
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true", "rvv", "true"})
     static Object[] testMemorySegmentIInvarL3a(MemorySegment m, long invar1, long invar2, long invar3, int size) {
         long i1 = invar1 + invar2 + invar3;
         long i2 = invar2 + invar3 + invar1; // equivalent
@@ -657,7 +657,7 @@ public class TestEquivalentInvariants {
                   IRNode.STORE_VECTOR,  "> 0"},
         applyIfPlatform = {"64-bit", "true"},
         applyIf = {"AlignVector", "false"},
-        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"})
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true", "rvv", "true"})
     static Object[] testMemorySegmentIInvarL3b(MemorySegment m, long invar1, long invar2, long invar3, int size) {
         long i1 = -invar1 - invar2 - invar3;
         long i2 = -invar2 - invar3 - invar1; // equivalent
@@ -674,7 +674,7 @@ public class TestEquivalentInvariants {
                   IRNode.STORE_VECTOR,  "> 0"},
         applyIfPlatform = {"64-bit", "true"},
         applyIf = {"AlignVector", "false"},
-        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"})
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true", "rvv", "true"})
     static Object[] testMemorySegmentIInvarL3c(MemorySegment m, long invar1, long invar2, long invar3, int size) {
         long i1 = -invar1 + invar2 + invar3;
         long i2 = invar2 + invar3 - invar1; // equivalent
@@ -690,12 +690,12 @@ public class TestEquivalentInvariants {
                   IRNode.STORE_VECTOR,  "> 0"},
         applyIfPlatform = {"64-bit", "true"},
         applyIf = {"AlignVector", "false"},
-        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"})
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true", "rvv", "true"})
     @IR(counts = {IRNode.LOAD_VECTOR_I, "= 0",
                   IRNode.STORE_VECTOR,  "= 0"},
         applyIfPlatform = {"64-bit", "true"},
         applyIf = {"AlignVector", "true"},
-        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"})
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true", "rvv", "true"})
     // With AlignVector (strict alignment requirements): we cannot prove that the invariants are alignable -> no vectorization.
     static Object[] testMemorySegmentIInvarL3d(MemorySegment m, int invar1, int invar2, int invar3, int size) {
         long i1 = (long)(-invar1 + invar2 + invar3);
@@ -714,12 +714,12 @@ public class TestEquivalentInvariants {
                   IRNode.STORE_VECTOR,  "> 0"},
         applyIfPlatform = {"64-bit", "true"},
         applyIf = {"AlignVector", "false"},
-        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"})
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true", "rvv", "true"})
     @IR(counts = {IRNode.LOAD_VECTOR_I, "= 0",
                   IRNode.STORE_VECTOR,  "= 0"},
         applyIfPlatform = {"64-bit", "true"},
         applyIf = {"AlignVector", "true"},
-        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"})
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true", "rvv", "true"})
     // With AlignVector (strict alignment requirements): we cannot prove that the invariants are alignable -> no vectorization.
     static Object[] testMemorySegmentIInvarL3d2(MemorySegment m, int invar1, int invar2, int invar3, int size) {
         long i1 = (long)(-invar1 + invar2 + invar3);
@@ -738,7 +738,7 @@ public class TestEquivalentInvariants {
                   IRNode.STORE_VECTOR,  "> 0"},
         applyIfPlatform = {"64-bit", "true"},
         applyIf = {"AlignVector", "false"},
-        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"})
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true", "rvv", "true"})
     // But here the "offsetPlain" is folded away
     static Object[] testMemorySegmentIInvarL3d3(MemorySegment m, int size) {
         for (int i = 0; i < size; i+=2) {
@@ -755,12 +755,12 @@ public class TestEquivalentInvariants {
                   IRNode.STORE_VECTOR,  "> 0"},
         applyIfPlatform = {"64-bit", "true"},
         applyIf = {"AlignVector", "false"},
-        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"})
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true", "rvv", "true"})
     @IR(counts = {IRNode.LOAD_VECTOR_I, "= 0",
                   IRNode.STORE_VECTOR,  "= 0"},
         applyIfPlatform = {"64-bit", "true"},
         applyIf = {"AlignVector", "true"},
-        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"})
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true", "rvv", "true"})
     // With AlignVector (strict alignment requirements): we cannot prove that the invariants are alignable -> no vectorization.
     static Object[] testMemorySegmentIInvarL3e(MemorySegment m, int invar1, int invar2, int invar3, int size) {
         long i1 = (long)(-invar1 + invar2 + invar3);
@@ -779,7 +779,7 @@ public class TestEquivalentInvariants {
     @IR(counts = {IRNode.LOAD_VECTOR_I, "= 0",
                   IRNode.STORE_VECTOR,  "= 0"},
         applyIfPlatform = {"64-bit", "true"},
-        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"})
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true", "rvv", "true"})
     // Should never vectorize, since i1 and i2 are not guaranteed to be adjacent
     // invar2 + invar3 could overflow, and the address be valid with and without overflow.
     // So both addresses are valid, and not adjacent.
@@ -801,7 +801,7 @@ public class TestEquivalentInvariants {
                   IRNode.STORE_VECTOR,  "> 0"},
         applyIfPlatform = {"64-bit", "true"},
         applyIf = {"AlignVector", "false"},
-        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"})
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true", "rvv", "true"})
     static Object[] testMemorySegmentIInvarL3g(MemorySegment m, long invar1, long invar2, long invar3, int size) {
         long i1 = -invar1 + invar2 + invar3;
         long i2 = invar2 + invar3 - invar1; // equivalent
@@ -819,7 +819,7 @@ public class TestEquivalentInvariants {
                   IRNode.STORE_VECTOR,  "> 0"},
         applyIfPlatform = {"64-bit", "true"},
         applyIf = {"AlignVector", "false"},
-        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"})
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true", "rvv", "true"})
     static Object[] testMemorySegmentLInvarL3a(MemorySegment m, long invar1, long invar2, long invar3, int size) {
         long i1 = invar1 + invar2 + invar3;
         long i2 = invar2 + invar3 + invar1; // equivalent
@@ -836,7 +836,7 @@ public class TestEquivalentInvariants {
                   IRNode.STORE_VECTOR,  "> 0"},
         applyIfPlatform = {"64-bit", "true"},
         applyIf = {"AlignVector", "false"},
-        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"})
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true", "rvv", "true"})
     static Object[] testMemorySegmentLInvarL3b(MemorySegment m, long invar1, long invar2, long invar3, int size) {
         long i1 = -invar1 - invar2 - invar3;
         long i2 = -invar2 - invar3 - invar1; // equivalent
@@ -853,7 +853,7 @@ public class TestEquivalentInvariants {
                   IRNode.STORE_VECTOR,  "> 0"},
         applyIfPlatform = {"64-bit", "true"},
         applyIf = {"AlignVector", "false"},
-        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"})
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true", "rvv", "true"})
     static Object[] testMemorySegmentLInvarL3c(MemorySegment m, long invar1, long invar2, long invar3, int size) {
         long i1 = -invar1 + invar2 + invar3;
         long i2 = invar2 + invar3 - invar1; // equivalent
@@ -869,12 +869,12 @@ public class TestEquivalentInvariants {
                   IRNode.STORE_VECTOR,  "> 0"},
         applyIfPlatform = {"64-bit", "true"},
         applyIf = {"AlignVector", "false"},
-        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"})
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true", "rvv", "true"})
     @IR(counts = {IRNode.LOAD_VECTOR_L, "= 0",
                   IRNode.STORE_VECTOR,  "= 0"},
         applyIfPlatform = {"64-bit", "true"},
         applyIf = {"AlignVector", "true"},
-        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"})
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true", "rvv", "true"})
     // With AlignVector (strict alignment requirements): we cannot prove that the invariants are alignable -> no vectorization.
     static Object[] testMemorySegmentLInvarL3d(MemorySegment m, int invar1, int invar2, int invar3, int size) {
         long i1 = (long)(-invar1 + invar2 + invar3);
@@ -893,12 +893,12 @@ public class TestEquivalentInvariants {
                   IRNode.STORE_VECTOR,  "> 0"},
         applyIfPlatform = {"64-bit", "true"},
         applyIf = {"AlignVector", "false"},
-        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"})
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true", "rvv", "true"})
     @IR(counts = {IRNode.LOAD_VECTOR_L, "= 0",
                   IRNode.STORE_VECTOR,  "= 0"},
         applyIfPlatform = {"64-bit", "true"},
         applyIf = {"AlignVector", "true"},
-        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"})
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true", "rvv", "true"})
     // With AlignVector (strict alignment requirements): we cannot prove that the invariants are alignable -> no vectorization.
     static Object[] testMemorySegmentLInvarL3d2(MemorySegment m, int invar1, int invar2, int invar3, int size) {
         long i1 = (long)(-invar1 + invar2 + invar3);
@@ -917,7 +917,7 @@ public class TestEquivalentInvariants {
                   IRNode.STORE_VECTOR,  "> 0"},
         applyIfPlatform = {"64-bit", "true"},
         applyIf = {"AlignVector", "false"},
-        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"})
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true", "rvv", "true"})
     // But here the "offsetPlain" is folded away
     static Object[] testMemorySegmentLInvarL3d3(MemorySegment m, int size) {
         for (int i = 0; i < size; i+=2) {
@@ -934,12 +934,12 @@ public class TestEquivalentInvariants {
                   IRNode.STORE_VECTOR,  "> 0"},
         applyIfPlatform = {"64-bit", "true"},
         applyIf = {"AlignVector", "false"},
-        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"})
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true", "rvv", "true"})
     @IR(counts = {IRNode.LOAD_VECTOR_L, "= 0",
                   IRNode.STORE_VECTOR,  "= 0"},
         applyIfPlatform = {"64-bit", "true"},
         applyIf = {"AlignVector", "true"},
-        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"})
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true", "rvv", "true"})
     // With AlignVector (strict alignment requirements): we cannot prove that the invariants are alignable -> no vectorization.
     static Object[] testMemorySegmentLInvarL3e(MemorySegment m, int invar1, int invar2, int invar3, int size) {
         long i1 = (long)(-invar1 + invar2 + invar3);
@@ -959,7 +959,7 @@ public class TestEquivalentInvariants {
                   IRNode.STORE_VECTOR,  "> 0"},
         applyIfPlatform = {"64-bit", "true"},
         applyIf = {"AlignVector", "false"},
-        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"})
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true", "rvv", "true"})
     static Object[] testMemorySegmentLInvarL3f(MemorySegment m, long invar1, long invar2, long invar3, int size) {
         long i1 = -invar1 + invar2 + invar3;
         long i2 = invar2 + invar3 - invar1; // equivalent
diff --git a/test/hotspot/jtreg/compiler/loopopts/superword/TestGeneralizedReductions.java b/test/hotspot/jtreg/compiler/loopopts/superword/TestGeneralizedReductions.java
index a0e4b58f509..92bc4f17446 100644
--- a/test/hotspot/jtreg/compiler/loopopts/superword/TestGeneralizedReductions.java
+++ b/test/hotspot/jtreg/compiler/loopopts/superword/TestGeneralizedReductions.java
@@ -81,7 +81,7 @@ public class TestGeneralizedReductions {
     }
 
     @Test
-    @IR(applyIfCPUFeature = {"avx2", "true"},
+    @IR(applyIfCPUFeatureOr = {"avx2", "true", "rvv", "true"},
         applyIf = {"SuperWordReductions", "true"},
         applyIfPlatform = {"64-bit", "true"},
         counts = {IRNode.ADD_REDUCTION_VI, ">= 1"})
@@ -94,7 +94,7 @@ public class TestGeneralizedReductions {
     }
 
     @Test
-    @IR(applyIfCPUFeature = {"avx2", "true"},
+    @IR(applyIfCPUFeatureOr = {"avx2", "true", "rvv", "true"},
         applyIf = {"SuperWordReductions", "true"},
         applyIfPlatform = {"64-bit", "true"},
         counts = {IRNode.ADD_REDUCTION_VI, ">= 1"})
@@ -108,7 +108,7 @@ public class TestGeneralizedReductions {
     }
 
     @Test
-    @IR(applyIfCPUFeature = {"avx2", "true"},
+    @IR(applyIfCPUFeatureOr = {"avx2", "true", "rvv", "true"},
         applyIf = {"SuperWordReductions", "true"},
         applyIfPlatform = {"64-bit", "true"},
         counts = {IRNode.ADD_REDUCTION_VI, ">= 1"})
@@ -133,7 +133,7 @@ public class TestGeneralizedReductions {
     // If this limitation is overcome in the future, the test case should be
     // turned into a positive one.
     @Test
-    @IR(applyIfCPUFeature = {"avx2", "true"},
+    @IR(applyIfCPUFeatureOr = {"avx2", "true", "rvv", "true"},
         applyIf = {"SuperWordReductions", "true"},
         applyIfPlatform = {"64-bit", "true"},
         failOn = {IRNode.ADD_REDUCTION_VI})
@@ -147,13 +147,13 @@ public class TestGeneralizedReductions {
     }
 
     @Test
-    @IR(applyIfCPUFeature = {"avx2", "true"},
+    @IR(applyIfCPUFeatureOr = {"avx2", "true"},
         applyIfAnd = {"SuperWordReductions", "true","UsePopCountInstruction", "true"},
         applyIfPlatform = {"64-bit", "true"},
         counts = {IRNode.ADD_REDUCTION_VI, ">= 1",
                   IRNode.POPCOUNT_VL, ">= 1"})
     @IR(applyIfPlatform = {"riscv64", "true"},
-        applyIfCPUFeature = {"zvbb", "true"},
+        applyIfCPUFeatureOr = {"zvbb", "true"},
         applyIfAnd = {"SuperWordReductions", "true","UsePopCountInstruction", "true"},
         counts = {IRNode.ADD_REDUCTION_VI, ">= 1",
                   IRNode.POPCOUNT_VL, ">= 1"})
diff --git a/test/hotspot/jtreg/compiler/loopopts/superword/TestIndependentPacksWithCyclicDependency.java b/test/hotspot/jtreg/compiler/loopopts/superword/TestIndependentPacksWithCyclicDependency.java
index 363ceeb28f6..f0d85c70b04 100644
--- a/test/hotspot/jtreg/compiler/loopopts/superword/TestIndependentPacksWithCyclicDependency.java
+++ b/test/hotspot/jtreg/compiler/loopopts/superword/TestIndependentPacksWithCyclicDependency.java
@@ -132,7 +132,7 @@ public class TestIndependentPacksWithCyclicDependency {
     @IR(counts = {IRNode.ADD_VI, "> 0", IRNode.MUL_VF, "> 0"},
         applyIfOr = {"UseCompactObjectHeaders", "false", "AlignVector", "false"},
         applyIfPlatform = {"64-bit", "true"},
-        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"})
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true", "rvv", "true"})
     static void test0(int[] dataIa, int[] dataIb, float[] dataFa, float[] dataFb) {
         for (int i = 0; i < RANGE; i+=2) {
             // Hand-unrolled 2x. Int and Float slice are completely separate.
@@ -162,7 +162,7 @@ public class TestIndependentPacksWithCyclicDependency {
     @IR(counts = {IRNode.ADD_VI, "> 0", IRNode.MUL_VF, "> 0", IRNode.VECTOR_CAST_F2I, "> 0", IRNode.VECTOR_CAST_I2F, "> 0"},
         applyIfOr = {"UseCompactObjectHeaders", "false", "AlignVector", "false"},
         applyIfPlatform = {"64-bit", "true"},
-        applyIfCPUFeatureOr = {"avx2", "true", "asimd", "true"})
+        applyIfCPUFeatureOr = {"avx2", "true", "asimd", "true", "rvv", "true"})
     static void test1(int[] dataIa, int[] dataIb, float[] dataFa, float[] dataFb) {
         for (int i = 0; i < RANGE; i+=2) {
             // Hand-unrolled 2x. Converst to and from. StoreF -> LoadF dependency.
@@ -191,7 +191,7 @@ public class TestIndependentPacksWithCyclicDependency {
     @IR(counts = {IRNode.ADD_VI, "> 0", IRNode.MUL_VI, "> 0"},
         applyIfOr = {"UseCompactObjectHeaders", "false", "AlignVector", "false"},
         applyIfPlatform = {"64-bit", "true"},
-        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"})
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true", "rvv", "true"})
     static void test2(int[] dataIa, int[] dataIb, float[] dataFa, float[] dataFb) {
         for (int i = 0; i < RANGE; i+=2) {
             // int and float arrays are two slices. But we pretend both are of type int.
@@ -221,7 +221,7 @@ public class TestIndependentPacksWithCyclicDependency {
     @IR(counts = {IRNode.ADD_VI, "> 0", IRNode.MUL_VF, "> 0"},
         applyIfOr = {"UseCompactObjectHeaders", "false", "AlignVector", "false"},
         applyIfPlatform = {"64-bit", "true"},
-        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"})
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true", "rvv", "true"})
     static void test3(int[] dataIa, int[] dataIb, float[] dataFa, float[] dataFb) {
         for (int i = 0; i < RANGE; i+=2) {
             // Inversion of orders. But because we operate on separate slices, this should
@@ -303,7 +303,7 @@ public class TestIndependentPacksWithCyclicDependency {
     @IR(counts = {IRNode.ADD_VI, "> 0", IRNode.MUL_VI, "> 0", IRNode.ADD_VF, "> 0"},
         applyIfOr = {"UseCompactObjectHeaders", "false", "AlignVector", "false"},
         applyIfPlatform = {"64-bit", "true"},
-        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"})
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true", "rvv", "true"})
     static void test6(int[] dataIa, int[] dataIb, float[] dataFa, float[] dataFb,
                       long[] dataLa, long[] dataLb) {
         for (int i = 0; i < RANGE; i+=2) {
diff --git a/test/hotspot/jtreg/compiler/loopopts/superword/TestMemorySegment.java b/test/hotspot/jtreg/compiler/loopopts/superword/TestMemorySegment.java
index bdba04d3b18..b4003cc5e73 100644
--- a/test/hotspot/jtreg/compiler/loopopts/superword/TestMemorySegment.java
+++ b/test/hotspot/jtreg/compiler/loopopts/superword/TestMemorySegment.java
@@ -431,7 +431,7 @@ class TestMemorySegmentImpl {
                   IRNode.ADD_VB,        "= 0",
                   IRNode.STORE_VECTOR,  "= 0"},
         applyIfPlatform = {"64-bit", "true"},
-        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"})
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true", "rvv", "true"})
     // FAILS
     // Exit check: iv < long_limit      ->     (long)iv < long_limit
     // Thus, we have an int-iv, but a long-exit-check.
@@ -450,7 +450,7 @@ class TestMemorySegmentImpl {
                   IRNode.ADD_VB,        "> 0",
                   IRNode.STORE_VECTOR,  "> 0"},
         applyIfPlatform = {"64-bit", "true"},
-        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"})
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true", "rvv", "true"})
     static Object[] testIntLoop_iv_byte(MemorySegment a) {
         for (int i = 0; i < (int)a.byteSize(); i++) {
             long adr = i;
@@ -465,7 +465,7 @@ class TestMemorySegmentImpl {
                   IRNode.ADD_VB,        "> 0",
                   IRNode.STORE_VECTOR,  "> 0"},
         applyIfPlatform = {"64-bit", "true"},
-        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"})
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true", "rvv", "true"})
     static Object[] testIntLoop_longIndex_intInvar_sameAdr_byte(MemorySegment a, int invar) {
         for (int i = 0; i < (int)a.byteSize(); i++) {
             long adr = (long)(i) + (long)(invar);
@@ -480,7 +480,7 @@ class TestMemorySegmentImpl {
                   IRNode.ADD_VB,        "> 0",
                   IRNode.STORE_VECTOR,  "> 0"},
         applyIfPlatform = {"64-bit", "true"},
-        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"})
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true", "rvv", "true"})
     static Object[] testIntLoop_longIndex_longInvar_sameAdr_byte(MemorySegment a, long invar) {
         for (int i = 0; i < (int)a.byteSize(); i++) {
             long adr = (long)(i) + (long)(invar);
@@ -495,7 +495,7 @@ class TestMemorySegmentImpl {
                   IRNode.ADD_VB,        "> 0",
                   IRNode.STORE_VECTOR,  "> 0"},
         applyIfPlatform = {"64-bit", "true"},
-        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"})
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true", "rvv", "true"})
     static Object[] testIntLoop_longIndex_intInvar_byte(MemorySegment a, int invar) {
         for (int i = 0; i < (int)a.byteSize(); i++) {
             long adr1 = (long)(i) + (long)(invar);
@@ -511,7 +511,7 @@ class TestMemorySegmentImpl {
                   IRNode.ADD_VB,        "> 0",
                   IRNode.STORE_VECTOR,  "> 0"},
         applyIfPlatform = {"64-bit", "true"},
-        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"})
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true", "rvv", "true"})
     static Object[] testIntLoop_longIndex_longInvar_byte(MemorySegment a, long invar) {
         for (int i = 0; i < (int)a.byteSize(); i++) {
             long adr1 = (long)(i) + (long)(invar);
@@ -527,7 +527,7 @@ class TestMemorySegmentImpl {
                   IRNode.ADD_VB,        "= 0",
                   IRNode.STORE_VECTOR,  "= 0"},
         applyIfPlatform = {"64-bit", "true"},
-        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"})
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true", "rvv", "true"})
     // FAILS: RangeCheck cannot be eliminated because of int_index
     static Object[] testIntLoop_intIndex_intInvar_byte(MemorySegment a, int invar) {
         for (int i = 0; i < (int)a.byteSize(); i++) {
@@ -544,7 +544,7 @@ class TestMemorySegmentImpl {
                   IRNode.STORE_VECTOR,  "> 0"},
         applyIfPlatform = {"64-bit", "true"},
         applyIf = {"AlignVector", "false"},
-        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"})
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true", "rvv", "true"})
     static Object[] testIntLoop_iv_int(MemorySegment a) {
         for (int i = 0; i < (int)a.byteSize()/4; i++ ) {
             long adr = 4L * i;
@@ -560,7 +560,7 @@ class TestMemorySegmentImpl {
                   IRNode.STORE_VECTOR,  "> 0"},
         applyIfPlatform = {"64-bit", "true"},
         applyIf = {"AlignVector", "false"},
-        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"})
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true", "rvv", "true"})
     static Object[] testIntLoop_longIndex_intInvar_sameAdr_int(MemorySegment a, int invar) {
         for (int i = 0; i < (int)a.byteSize()/4; i++) {
             long adr = 4L * (long)(i) + 4L * (long)(invar);
@@ -576,7 +576,7 @@ class TestMemorySegmentImpl {
                   IRNode.STORE_VECTOR,  "> 0"},
         applyIfPlatform = {"64-bit", "true"},
         applyIf = {"AlignVector", "false"},
-        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"})
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true", "rvv", "true"})
     static Object[] testIntLoop_longIndex_longInvar_sameAdr_int(MemorySegment a, long invar) {
         for (int i = 0; i < (int)a.byteSize()/4; i++) {
             long adr = 4L * (long)(i) + 4L * (long)(invar);
@@ -592,7 +592,7 @@ class TestMemorySegmentImpl {
                   IRNode.STORE_VECTOR,  "> 0"},
         applyIfPlatform = {"64-bit", "true"},
         applyIf = {"AlignVector", "false"},
-        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"})
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true", "rvv", "true"})
     static Object[] testIntLoop_longIndex_intInvar_int(MemorySegment a, int invar) {
         for (int i = 0; i < (int)a.byteSize()/4; i++) {
             long adr1 = 4L * (long)(i) + 4L * (long)(invar);
@@ -609,7 +609,7 @@ class TestMemorySegmentImpl {
                   IRNode.STORE_VECTOR,  "> 0"},
         applyIfPlatform = {"64-bit", "true"},
         applyIf = {"AlignVector", "false"},
-        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"})
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true", "rvv", "true"})
     static Object[] testIntLoop_longIndex_longInvar_int(MemorySegment a, long invar) {
         for (int i = 0; i < (int)a.byteSize()/4; i++) {
             long adr1 = 4L * (long)(i) + 4L * (long)(invar);
@@ -625,7 +625,7 @@ class TestMemorySegmentImpl {
                   IRNode.ADD_VI,        "= 0",
                   IRNode.STORE_VECTOR,  "= 0"},
         applyIfPlatform = {"64-bit", "true"},
-        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"})
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true", "rvv", "true"})
     // FAILS: RangeCheck cannot be eliminated because of int_index
     static Object[] testIntLoop_intIndex_intInvar_int(MemorySegment a, int invar) {
         for (int i = 0; i < (int)a.byteSize()/4; i++) {
@@ -641,7 +641,7 @@ class TestMemorySegmentImpl {
                   IRNode.ADD_VB,        "> 0",
                   IRNode.STORE_VECTOR,  "> 0"},
         applyIfPlatform = {"64-bit", "true"},
-        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"})
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true", "rvv", "true"})
     static Object[] testLongLoop_iv_byte(MemorySegment a) {
         for (long i = 0; i < a.byteSize(); i++) {
             long adr = i;
@@ -656,7 +656,7 @@ class TestMemorySegmentImpl {
                   IRNode.ADD_VB,        "> 0",
                   IRNode.STORE_VECTOR,  "> 0"},
         applyIfPlatform = {"64-bit", "true"},
-        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"})
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true", "rvv", "true"})
     static Object[] testLongLoop_longIndex_intInvar_sameAdr_byte(MemorySegment a, int invar) {
         for (long i = 0; i < a.byteSize(); i++) {
             long adr = (long)(i) + (long)(invar);
@@ -671,7 +671,7 @@ class TestMemorySegmentImpl {
                   IRNode.ADD_VB,        "> 0",
                   IRNode.STORE_VECTOR,  "> 0"},
         applyIfPlatform = {"64-bit", "true"},
-        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"})
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true", "rvv", "true"})
     static Object[] testLongLoop_longIndex_longInvar_sameAdr_byte(MemorySegment a, long invar) {
         for (long i = 0; i < a.byteSize(); i++) {
             long adr = (long)(i) + (long)(invar);
@@ -714,7 +714,7 @@ class TestMemorySegmentImpl {
                   IRNode.ADD_VB,        "= 0",
                   IRNode.STORE_VECTOR,  "= 0"},
         applyIfPlatform = {"64-bit", "true"},
-        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"})
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true", "rvv", "true"})
     // FAILS: RangeCheck cannot be eliminated because of int_index
     static Object[] testLongLoop_intIndex_intInvar_byte(MemorySegment a, int invar) {
         for (long i = 0; i < a.byteSize(); i++) {
@@ -731,7 +731,7 @@ class TestMemorySegmentImpl {
                   IRNode.STORE_VECTOR,  "> 0"},
         applyIfPlatform = {"64-bit", "true"},
         applyIf = {"AlignVector", "false"},
-        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"})
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true", "rvv", "true"})
     static Object[] testLongLoop_iv_int(MemorySegment a) {
         for (long i = 0; i < a.byteSize()/4; i++ ) {
             long adr = 4L * i;
@@ -747,7 +747,7 @@ class TestMemorySegmentImpl {
                   IRNode.STORE_VECTOR,  "> 0"},
         applyIfPlatform = {"64-bit", "true"},
         applyIf = {"AlignVector", "false"},
-        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"})
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true", "rvv", "true"})
     static Object[] testLongLoop_longIndex_intInvar_sameAdr_int(MemorySegment a, int invar) {
         for (long i = 0; i < a.byteSize()/4; i++) {
             long adr = 4L * (long)(i) + 4L * (long)(invar);
@@ -763,7 +763,7 @@ class TestMemorySegmentImpl {
                   IRNode.STORE_VECTOR,  "> 0"},
         applyIfPlatform = {"64-bit", "true"},
         applyIf = {"AlignVector", "false"},
-        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"})
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true", "rvv", "true"})
     static Object[] testLongLoop_longIndex_longInvar_sameAdr_int(MemorySegment a, long invar) {
         for (long i = 0; i < a.byteSize()/4; i++) {
             long adr = 4L * (long)(i) + 4L * (long)(invar);
@@ -778,7 +778,7 @@ class TestMemorySegmentImpl {
                   IRNode.ADD_VI,        "= 0",
                   IRNode.STORE_VECTOR,  "= 0"},
         applyIfPlatform = {"64-bit", "true"},
-        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"})
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true", "rvv", "true"})
     // FAILS: invariants are sorted differently, because of differently inserted Cast.
     // See: JDK-8331659
     static Object[] testLongLoop_longIndex_intInvar_int(MemorySegment a, int invar) {
@@ -796,7 +796,7 @@ class TestMemorySegmentImpl {
                   IRNode.ADD_VI,        "= 0",
                   IRNode.STORE_VECTOR,  "= 0"},
         applyIfPlatform = {"64-bit", "true"},
-        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"})
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true", "rvv", "true"})
     // FAILS: invariants are sorted differently, because of differently inserted Cast.
     // See: JDK-8331659
     static Object[] testLongLoop_longIndex_longInvar_int(MemorySegment a, long invar) {
@@ -814,7 +814,7 @@ class TestMemorySegmentImpl {
                   IRNode.ADD_VI,        "= 0",
                   IRNode.STORE_VECTOR,  "= 0"},
         applyIfPlatform = {"64-bit", "true"},
-        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"})
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true", "rvv", "true"})
     // FAILS: RangeCheck cannot be eliminated because of int_index
     static Object[] testLongLoop_intIndex_intInvar_int(MemorySegment a, int invar) {
         for (long i = 0; i < a.byteSize()/4; i++) {
diff --git a/test/hotspot/jtreg/compiler/loopopts/superword/TestMemorySegmentUnalignedAddress.java b/test/hotspot/jtreg/compiler/loopopts/superword/TestMemorySegmentUnalignedAddress.java
index 13fd9ff9b17..969014e2293 100644
--- a/test/hotspot/jtreg/compiler/loopopts/superword/TestMemorySegmentUnalignedAddress.java
+++ b/test/hotspot/jtreg/compiler/loopopts/superword/TestMemorySegmentUnalignedAddress.java
@@ -227,7 +227,7 @@ class TestMemorySegmentUnalignedAddressImpl {
                   IRNode.STORE_VECTOR,  "> 0",
                   "multiversion",       "= 0"},
         applyIfPlatform = {"64-bit", "true"},
-        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"},
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true", "rvv", "true"},
         phase = CompilePhase.PRINT_IDEAL)
     // We never fail the alignment check in the auto vectorization Predicate,
     // hence we never even create the multiversioned loops.
@@ -247,7 +247,7 @@ class TestMemorySegmentUnalignedAddressImpl {
                   "multiversion_slow",  "= 2"}, // main, post
         applyIf = {"AlignVector", "true"},
         applyIfPlatform = {"64-bit", "true"},
-        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"},
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true", "rvv", "true"},
         phase = CompilePhase.PRINT_IDEAL)
     // We add alignment checks to the auto vectorization Predicate. It fails
     // at runtime, deopts, and recompiles with multiversioning.
@@ -258,7 +258,7 @@ class TestMemorySegmentUnalignedAddressImpl {
                   "multiversion_slow",  "= 0"},
         applyIf = {"AlignVector", "false"},
         applyIfPlatform = {"64-bit", "true"},
-        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"},
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true", "rvv", "true"},
         phase = CompilePhase.PRINT_IDEAL)
     // We never add any conditions to the auto vectorization Predicate, so
     // we also never deopt and never end up multiversioning.
@@ -278,7 +278,7 @@ class TestMemorySegmentUnalignedAddressImpl {
                   "multiversion_slow",  "= 2"}, // main, post
         applyIf = {"AlignVector", "true"},
         applyIfPlatform = {"64-bit", "true"},
-        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"},
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true", "rvv", "true"},
         phase = CompilePhase.PRINT_IDEAL)
     // We add alignment checks to the auto vectorization Predicate. It fails
     // at runtime, deopts, and recompiles with multiversioning.
@@ -289,7 +289,7 @@ class TestMemorySegmentUnalignedAddressImpl {
                   "multiversion_slow",  "= 0"},
         applyIf = {"AlignVector", "false"},
         applyIfPlatform = {"64-bit", "true"},
-        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"},
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true", "rvv", "true"},
         phase = CompilePhase.PRINT_IDEAL)
     // We never add any conditions to the auto vectorization Predicate, so
     // we also never deopt and never end up multiversioning.
diff --git a/test/hotspot/jtreg/compiler/loopopts/superword/TestMultiversionRemoveUselessSlowLoop.java b/test/hotspot/jtreg/compiler/loopopts/superword/TestMultiversionRemoveUselessSlowLoop.java
index de98cc2fb25..405058f41e6 100644
--- a/test/hotspot/jtreg/compiler/loopopts/superword/TestMultiversionRemoveUselessSlowLoop.java
+++ b/test/hotspot/jtreg/compiler/loopopts/superword/TestMultiversionRemoveUselessSlowLoop.java
@@ -60,7 +60,7 @@ public class TestMultiversionRemoveUselessSlowLoop {
                   "multiversion",              "= 8", // nothing unexpected
                   IRNode.OPAQUE_MULTIVERSIONING, "= 2"}, // Both multiversion_if are still here
         applyIfPlatform = {"64-bit", "true"},
-        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"},
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true", "rvv", "true"},
         phase = CompilePhase.PHASEIDEALLOOP1)
     @IR(counts = {"pre .* multiversion_fast",  "= 2",
                   "main .* multiversion_fast", "= 1", // The first main loop is fully unrolled
@@ -69,7 +69,7 @@ public class TestMultiversionRemoveUselessSlowLoop {
                   "multiversion",              "= 7", // nothing unexpected
                   IRNode.OPAQUE_MULTIVERSIONING, "= 1"}, // The multiversion_if of the first loop was constant folded, because the main loop disappeared.
         applyIfPlatform = {"64-bit", "true"},
-        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"},
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true", "rvv", "true"},
         phase = CompilePhase.PHASEIDEALLOOP_ITERATIONS)
     @IR(counts = {"pre .* multiversion_fast.*", ">= 1", // In some cases, the pre loop of the first loop also disappears because it only has a single iteration
                   "pre .* multiversion_fast.*", "<= 2", // but not in other cases the pre loop of the first loop remains.
@@ -80,7 +80,7 @@ public class TestMultiversionRemoveUselessSlowLoop {
                   "multiversion",              "<= 6", // nothing unexpected
                   IRNode.OPAQUE_MULTIVERSIONING, "= 0"}, // After loop-opts, we also constant fold the multiversion_if of the second loop, as it is unused.
         applyIfPlatform = {"64-bit", "true"},
-        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"},
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true", "rvv", "true"},
         phase = CompilePhase.PRINT_IDEAL)
     public static void testIR() {
         // This loop is short, and the multiversion_fast main loop eventuall is fully unrolled.
diff --git a/test/hotspot/jtreg/compiler/loopopts/superword/TestSplitPacks.java b/test/hotspot/jtreg/compiler/loopopts/superword/TestSplitPacks.java
index 35514047ebc..7281ed945da 100644
--- a/test/hotspot/jtreg/compiler/loopopts/superword/TestSplitPacks.java
+++ b/test/hotspot/jtreg/compiler/loopopts/superword/TestSplitPacks.java
@@ -280,7 +280,7 @@ public class TestSplitPacks {
                   IRNode.STORE_VECTOR, "> 0"},
         applyIfAnd = {"MaxVectorSize", ">=32", "AlignVector", "false"},
         applyIfPlatform = {"64-bit", "true"},
-        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"})
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true", "rvv", "true"})
     @IR(counts = {IRNode.LOAD_VECTOR_I, IRNode.VECTOR_SIZE_2, "> 0",
                   IRNode.LOAD_VECTOR_I, IRNode.VECTOR_SIZE_4, "> 0",
                   IRNode.AND_VI,        IRNode.VECTOR_SIZE_2, "> 0",
@@ -288,7 +288,7 @@ public class TestSplitPacks {
                   IRNode.STORE_VECTOR, "> 0"},
         applyIfAnd = {"MaxVectorSize", ">=32", "UseCompactObjectHeaders", "false"},
         applyIfPlatform = {"64-bit", "true"},
-        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"})
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true", "rvv", "true"})
     // Load and store are already split
     //
     //  0 1 - - 4 5 6 7
@@ -327,7 +327,7 @@ public class TestSplitPacks {
                   IRNode.STORE_VECTOR, "> 0"},
         applyIfAnd = {"MaxVectorSize", ">=32", "AlignVector", "false"},
         applyIfPlatform = {"64-bit", "true"},
-        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"})
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true", "rvv", "true"})
     @IR(counts = {IRNode.LOAD_VECTOR_I, IRNode.VECTOR_SIZE_2, "> 0",
                   IRNode.LOAD_VECTOR_I, IRNode.VECTOR_SIZE_4, "> 0",
                   IRNode.ADD_VI,        IRNode.VECTOR_SIZE_4, "> 0",
@@ -335,7 +335,7 @@ public class TestSplitPacks {
                   IRNode.STORE_VECTOR, "> 0"},
         applyIfAnd = {"MaxVectorSize", ">=32", "UseCompactObjectHeaders", "false"},
         applyIfPlatform = {"64-bit", "true"},
-        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"})
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true", "rvv", "true"})
     // Adjacent Load and Store, but split by Add/Mul
     static Object[] test1a(int[] a, int[] b, int mask) {
         for (int i = 0; i < RANGE; i+=8) {
@@ -362,7 +362,7 @@ public class TestSplitPacks {
                   IRNode.STORE_VECTOR, "> 0"},
         applyIfAnd = {"MaxVectorSize", ">=32", "AlignVector", "false"},
         applyIfPlatform = {"64-bit", "true"},
-        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"})
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true", "rvv", "true"})
     @IR(counts = {IRNode.LOAD_VECTOR_I, IRNode.VECTOR_SIZE_2, "> 0",
                   IRNode.LOAD_VECTOR_I, IRNode.VECTOR_SIZE_4, "> 0",
                   IRNode.ADD_VI,        IRNode.VECTOR_SIZE_2, "> 0",
@@ -370,7 +370,7 @@ public class TestSplitPacks {
                   IRNode.STORE_VECTOR, "> 0"},
         applyIfAnd = {"MaxVectorSize", ">=32", "UseCompactObjectHeaders", "false"},
         applyIfPlatform = {"64-bit", "true"},
-        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"})
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true", "rvv", "true"})
     // Adjacent Load and Store, but split by Add/Mul
     static Object[] test1b(int[] a, int[] b, int mask) {
         for (int i = 0; i < RANGE; i+=8) {
@@ -397,7 +397,7 @@ public class TestSplitPacks {
                   IRNode.STORE_VECTOR, "> 0"},
         applyIfAnd = {"MaxVectorSize", ">=32", "AlignVector", "false"},
         applyIfPlatform = {"64-bit", "true"},
-        applyIfCPUFeatureOr = {"avx2", "true", "asimd", "true"})
+        applyIfCPUFeatureOr = {"avx2", "true", "asimd", "true", "rvv", "true"})
     @IR(counts = {IRNode.LOAD_VECTOR_I, IRNode.VECTOR_SIZE_2, "> 0",
                   IRNode.LOAD_VECTOR_I, IRNode.VECTOR_SIZE_4, "> 0",
                   IRNode.ADD_VI,        IRNode.VECTOR_SIZE_2, "> 0",
@@ -405,7 +405,7 @@ public class TestSplitPacks {
                   IRNode.STORE_VECTOR, "> 0"},
         applyIfAnd = {"MaxVectorSize", ">=32", "UseCompactObjectHeaders", "false"},
         applyIfPlatform = {"64-bit", "true"},
-        applyIfCPUFeatureOr = {"avx2", "true", "asimd", "true"})
+        applyIfCPUFeatureOr = {"avx2", "true", "asimd", "true", "rvv", "true"})
     // Adjacent Load and Store, but split by Add/Mul
     static Object[] test1c(int[] a, int[] b, int mask) {
         for (int i = 0; i < RANGE; i+=8) {
@@ -432,7 +432,7 @@ public class TestSplitPacks {
                   IRNode.STORE_VECTOR, "> 0"},
         applyIfAnd = {"MaxVectorSize", ">=32", "AlignVector", "false"},
         applyIfPlatform = {"64-bit", "true"},
-        applyIfCPUFeatureOr = {"avx2", "true", "asimd", "true"})
+        applyIfCPUFeatureOr = {"avx2", "true", "asimd", "true", "rvv", "true"})
     @IR(counts = {IRNode.LOAD_VECTOR_I, IRNode.VECTOR_SIZE_2, "> 0",
                   IRNode.LOAD_VECTOR_I, IRNode.VECTOR_SIZE_4, "> 0",
                   IRNode.ADD_VI,        IRNode.VECTOR_SIZE_4, "> 0",
@@ -440,7 +440,7 @@ public class TestSplitPacks {
                   IRNode.STORE_VECTOR, "> 0"},
         applyIfAnd = {"MaxVectorSize", ">=32", "UseCompactObjectHeaders", "false"},
         applyIfPlatform = {"64-bit", "true"},
-        applyIfCPUFeatureOr = {"avx2", "true", "asimd", "true"})
+        applyIfCPUFeatureOr = {"avx2", "true", "asimd", "true", "rvv", "true"})
     // Adjacent Load and Store, but split by Add/Mul
     static Object[] test1d(int[] a, int[] b, int mask) {
         for (int i = 0; i < RANGE; i+=8) {
@@ -467,7 +467,7 @@ public class TestSplitPacks {
                   IRNode.STORE_VECTOR, "> 0"},
         applyIfAnd = {"MaxVectorSize", ">=32", "AlignVector", "false"},
         applyIfPlatform = {"64-bit", "true"},
-        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"})
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true", "rvv", "true"})
     @IR(counts = {IRNode.LOAD_VECTOR_I, IRNode.VECTOR_SIZE_2, "> 0",
                   IRNode.LOAD_VECTOR_I, IRNode.VECTOR_SIZE_4, "> 0",
                   IRNode.AND_VI,        IRNode.VECTOR_SIZE_2, "> 0",
@@ -475,7 +475,7 @@ public class TestSplitPacks {
                   IRNode.STORE_VECTOR, "> 0"},
         applyIfAnd = {"MaxVectorSize", ">=32", "UseCompactObjectHeaders", "false"},
         applyIfPlatform = {"64-bit", "true"},
-        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"})
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true", "rvv", "true"})
     // Split the load
     //
     //  0 1 2 3 4 5 - -
@@ -516,7 +516,7 @@ public class TestSplitPacks {
                   IRNode.STORE_VECTOR, "> 0"},
         applyIfAnd = {"MaxVectorSize", ">=32", "AlignVector", "false"},
         applyIfPlatform = {"64-bit", "true"},
-        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"})
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true", "rvv", "true"})
     @IR(counts = {IRNode.LOAD_VECTOR_I, IRNode.VECTOR_SIZE_2, "> 0",
                   IRNode.LOAD_VECTOR_I, IRNode.VECTOR_SIZE_4, "> 0",
                   IRNode.AND_VI,        IRNode.VECTOR_SIZE_2, "> 0",
@@ -524,7 +524,7 @@ public class TestSplitPacks {
                   IRNode.STORE_VECTOR, "> 0"},
         applyIfAnd = {"MaxVectorSize", ">=32", "UseCompactObjectHeaders", "false"},
         applyIfPlatform = {"64-bit", "true"},
-        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"})
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true", "rvv", "true"})
     // Split the load
     //
     //  0 1 2 3 4 5 - -
@@ -565,7 +565,7 @@ public class TestSplitPacks {
                   IRNode.STORE_VECTOR, "> 0"},
         applyIfAnd = {"MaxVectorSize", ">=32", "AlignVector", "false"},
         applyIfPlatform = {"64-bit", "true"},
-        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"})
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true", "rvv", "true"})
     @IR(counts = {IRNode.LOAD_VECTOR_I, IRNode.VECTOR_SIZE_2, "> 0",
                   IRNode.LOAD_VECTOR_I, IRNode.VECTOR_SIZE_4, "> 0",
                   IRNode.AND_VI,        IRNode.VECTOR_SIZE_2, "> 0",
@@ -573,7 +573,7 @@ public class TestSplitPacks {
                   IRNode.STORE_VECTOR, "> 0"},
         applyIfAnd = {"MaxVectorSize", ">=32", "UseCompactObjectHeaders", "false"},
         applyIfPlatform = {"64-bit", "true"},
-        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"})
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true", "rvv", "true"})
     // Split the load
     //
     //  0 1 - - 4 5 6 7
@@ -614,7 +614,7 @@ public class TestSplitPacks {
                   IRNode.STORE_VECTOR, "> 0"},
         applyIfAnd = {"MaxVectorSize", ">=32", "AlignVector", "false"},
         applyIfPlatform = {"64-bit", "true"},
-        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"})
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true", "rvv", "true"})
     @IR(counts = {IRNode.LOAD_VECTOR_I, IRNode.VECTOR_SIZE_2, "> 0",
                   IRNode.LOAD_VECTOR_I, IRNode.VECTOR_SIZE_4, "> 0",
                   IRNode.AND_VI,        IRNode.VECTOR_SIZE_2, "> 0",
@@ -622,7 +622,7 @@ public class TestSplitPacks {
                   IRNode.STORE_VECTOR, "> 0"},
         applyIfAnd = {"MaxVectorSize", ">=32", "UseCompactObjectHeaders", "false"},
         applyIfPlatform = {"64-bit", "true"},
-        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"})
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true", "rvv", "true"})
     // Split the load
     //
     //  0 1 2 3 - - 6 7
@@ -660,12 +660,12 @@ public class TestSplitPacks {
                   IRNode.STORE_VECTOR, "> 0"},
         applyIfAnd = {"MaxVectorSize", ">=32", "AlignVector", "false"},
         applyIfPlatform = {"64-bit", "true"},
-        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"})
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true", "rvv", "true"})
     @IR(counts = {IRNode.LOAD_VECTOR_S, IRNode.VECTOR_SIZE_4, "> 0",
                   IRNode.STORE_VECTOR, "> 0"},
         applyIfAnd = {"MaxVectorSize", ">=32", "UseCompactObjectHeaders", "false"},
         applyIfPlatform = {"64-bit", "true"},
-        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"})
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true", "rvv", "true"})
     // 0 1 2 3 4 5 6 7 -
     // | | | | | | | |
     // | + + + | | | |
@@ -741,7 +741,7 @@ public class TestSplitPacks {
                   IRNode.STORE_VECTOR, "> 0"},
         applyIf = {"MaxVectorSize", ">=8"},
         applyIfPlatform = {"64-bit", "true"},
-        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"})
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true", "rvv", "true"})
     // Cyclic dependency with distance 4 -> split into 4-packs
     static Object[] test4c(short[] a, short[] b) {
         for (int i = 0; i < RANGE-64; i++) {
@@ -755,7 +755,7 @@ public class TestSplitPacks {
                   IRNode.STORE_VECTOR, "> 0"},
         applyIfAnd = {"MaxVectorSize", ">=8", "AlignVector", "false"},
         applyIfPlatform = {"64-bit", "true"},
-        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"})
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true", "rvv", "true"})
     // Cyclic dependency with distance 5 -> split into 4-packs
     static Object[] test4d(short[] a, short[] b) {
         for (int i = 0; i < RANGE-64; i++) {
@@ -769,7 +769,7 @@ public class TestSplitPacks {
                   IRNode.STORE_VECTOR, "> 0"},
         applyIfAnd = {"MaxVectorSize", ">=8", "AlignVector", "false"},
         applyIfPlatform = {"64-bit", "true"},
-        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"})
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true", "rvv", "true"})
     // Cyclic dependency with distance 6 -> split into 4-packs
     static Object[] test4e(short[] a, short[] b) {
         for (int i = 0; i < RANGE-64; i++) {
@@ -783,7 +783,7 @@ public class TestSplitPacks {
                   IRNode.STORE_VECTOR, "> 0"},
         applyIfAnd = {"MaxVectorSize", ">=8", "AlignVector", "false"},
         applyIfPlatform = {"64-bit", "true"},
-        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"})
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true", "rvv", "true"})
     // Cyclic dependency with distance 7 -> split into 4-packs
     static Object[] test4f(short[] a, short[] b) {
         for (int i = 0; i < RANGE-64; i++) {
@@ -797,7 +797,7 @@ public class TestSplitPacks {
                   IRNode.STORE_VECTOR, "> 0"},
         applyIf = {"MaxVectorSize", ">=32"},
         applyIfPlatform = {"64-bit", "true"},
-        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"})
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true", "rvv", "true"})
     // Cyclic dependency with distance 8 -> split into 8-packs
     static Object[] test4g(short[] a, short[] b) {
         for (int i = 0; i < RANGE-64; i++) {
@@ -860,7 +860,7 @@ public class TestSplitPacks {
                   IRNode.ADD_REDUCTION_V,                       "> 0"},
         applyIfAnd = {"MaxVectorSize", ">=32", "AlignVector", "false"},
         applyIfPlatform = {"64-bit", "true"},
-        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"})
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true", "rvv", "true"})
     @IR(counts = {IRNode.LOAD_VECTOR_I,   IRNode.VECTOR_SIZE_4, "> 0",
                   IRNode.MUL_VI,          IRNode.VECTOR_SIZE_4, "> 0",
                   IRNode.AND_VI,          IRNode.VECTOR_SIZE_4, "> 0",
@@ -868,7 +868,7 @@ public class TestSplitPacks {
                   IRNode.ADD_REDUCTION_V,                       "> 0"},
         applyIfAnd = {"MaxVectorSize", ">=32", "UseCompactObjectHeaders", "false"},
         applyIfPlatform = {"64-bit", "true"},
-        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true"})
+        applyIfCPUFeatureOr = {"sse4.1", "true", "asimd", "true", "rvv", "true"})
     // Split packs including reductions
     static Object[] test6a(int[] a, int[] b) {
         int s = 0;
@@ -895,7 +895,7 @@ public class TestSplitPacks {
                   IRNode.MUL_VI,         "> 0",
                   IRNode.POPULATE_INDEX, "> 0"},
         applyIfPlatform = {"64-bit", "true"},
-        applyIfCPUFeatureOr = {"avx2", "true", "sve", "true"})
+        applyIfCPUFeatureOr = {"avx2", "true", "sve", "true", "rvv", "true"})
     // Index Populate:
     // There can be an issue when all the (iv + 1), (iv + 2), ...
     // get packed, but not (iv). Then we have a pack that is one element
diff --git a/test/hotspot/jtreg/compiler/loopopts/superword/TestUnorderedReductionPartialVectorization.java b/test/hotspot/jtreg/compiler/loopopts/superword/TestUnorderedReductionPartialVectorization.java
index 6150e24cc5e..07ea005c27b 100644
--- a/test/hotspot/jtreg/compiler/loopopts/superword/TestUnorderedReductionPartialVectorization.java
+++ b/test/hotspot/jtreg/compiler/loopopts/superword/TestUnorderedReductionPartialVectorization.java
@@ -66,7 +66,7 @@ public class TestUnorderedReductionPartialVectorization {
                   IRNode.OR_REDUCTION_V,                                                 "> 0",},
         applyIfOr = {"AlignVector", "false", "UseCompactObjectHeaders", "false"},
         applyIfPlatform = {"64-bit", "true"},
-        applyIfCPUFeatureOr = {"avx2", "true"})
+        applyIfCPUFeatureOr = {"avx2", "true", "rvv", "true"})
     static long test1(int[] data, long sum) {
         for (int i = 0; i < data.length; i+=2) {
             // Mixing int and long ops means we only end up allowing half of the int

From d1cf232893615f1907bb84728cbc1f566a369757 Mon Sep 17 00:00:00 2001
From: Hamlin Li <mli@openjdk.org>
Date: Fri, 21 Mar 2025 12:08:53 +0000
Subject: [PATCH 426/587] 8352248: Check if CMoveX is supported

Reviewed-by: chagedorn, luhenry, rehn
---
 src/hotspot/share/opto/loopopts.cpp |  2 +-
 src/hotspot/share/opto/movenode.cpp | 21 ++++++++++++++++++---
 src/hotspot/share/opto/movenode.hpp |  1 +
 3 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/src/hotspot/share/opto/loopopts.cpp b/src/hotspot/share/opto/loopopts.cpp
index 72f3722c096..d6242d9f8b8 100644
--- a/src/hotspot/share/opto/loopopts.cpp
+++ b/src/hotspot/share/opto/loopopts.cpp
@@ -843,7 +843,7 @@ Node *PhaseIdealLoop::conditional_move( Node *region ) {
         break;
       }
     }
-    if (phi == nullptr || _igvn.type(phi) == Type::TOP) {
+    if (phi == nullptr || _igvn.type(phi) == Type::TOP || !CMoveNode::supported(_igvn.type(phi))) {
       break;
     }
     // Move speculative ops
diff --git a/src/hotspot/share/opto/movenode.cpp b/src/hotspot/share/opto/movenode.cpp
index 4b3b8547bec..b0db9c1d350 100644
--- a/src/hotspot/share/opto/movenode.cpp
+++ b/src/hotspot/share/opto/movenode.cpp
@@ -186,7 +186,7 @@ const Type* CMoveNode::Value(PhaseGVN* phase) const {
 // Make a correctly-flavored CMove.  Since _type is directly determined
 // from the inputs we do not need to specify it here.
 CMoveNode* CMoveNode::make(Node* bol, Node* left, Node* right, const Type* t) {
-  switch( t->basic_type() ) {
+  switch (t->basic_type()) {
     case T_INT:     return new CMoveINode(bol, left, right, t->is_int());
     case T_FLOAT:   return new CMoveFNode(bol, left, right, t);
     case T_DOUBLE:  return new CMoveDNode(bol, left, right, t);
@@ -195,8 +195,23 @@ CMoveNode* CMoveNode::make(Node* bol, Node* left, Node* right, const Type* t) {
     case T_ADDRESS: return new CMovePNode(bol, left, right, t->is_ptr());
     case T_NARROWOOP: return new CMoveNNode(bol, left, right, t);
     default:
-    ShouldNotReachHere();
-    return nullptr;
+      ShouldNotReachHere();
+      return nullptr;
+  }
+}
+
+bool CMoveNode::supported(const Type* t) {
+  switch (t->basic_type()) {
+    case T_INT:     return Matcher::match_rule_supported(Op_CMoveI);
+    case T_FLOAT:   return Matcher::match_rule_supported(Op_CMoveF);
+    case T_DOUBLE:  return Matcher::match_rule_supported(Op_CMoveD);
+    case T_LONG:    return Matcher::match_rule_supported(Op_CMoveL);
+    case T_OBJECT:  return Matcher::match_rule_supported(Op_CMoveP);
+    case T_ADDRESS: return Matcher::match_rule_supported(Op_CMoveP);
+    case T_NARROWOOP: return Matcher::match_rule_supported(Op_CMoveN);
+    default:
+      ShouldNotReachHere();
+      return false;
   }
 }
 
diff --git a/src/hotspot/share/opto/movenode.hpp b/src/hotspot/share/opto/movenode.hpp
index 59974f79702..92c59b6f6b1 100644
--- a/src/hotspot/share/opto/movenode.hpp
+++ b/src/hotspot/share/opto/movenode.hpp
@@ -48,6 +48,7 @@ class CMoveNode : public TypeNode {
   virtual const Type* Value(PhaseGVN* phase) const;
   virtual Node* Identity(PhaseGVN* phase);
   static CMoveNode* make(Node* bol, Node* left, Node* right, const Type* t);
+  static bool supported(const Type* t);
   // Helper function to spot cmove graph shapes
   static Node* is_cmove_id(PhaseTransform* phase, Node* cmp, Node* t, Node* f, BoolNode* b);
   static Node* Ideal_minmax(PhaseGVN* phase, CMoveNode* cmov);

From ac760dd106d88129f3c13520754f594b1d317a11 Mon Sep 17 00:00:00 2001
From: Hamlin Li <mli@openjdk.org>
Date: Fri, 21 Mar 2025 12:09:08 +0000
Subject: [PATCH 427/587] 8352423: RISC-V: simplify DivI/L ModI/L

Reviewed-by: fyang, luhenry, rehn
---
 .../cpu/riscv/c1_LIRAssembler_arith_riscv.cpp | 14 +--
 .../cpu/riscv/macroAssembler_riscv.cpp        | 65 --------------
 .../cpu/riscv/macroAssembler_riscv.hpp        |  6 --
 src/hotspot/cpu/riscv/riscv.ad                | 90 +++++--------------
 src/hotspot/cpu/riscv/templateTable_riscv.cpp |  8 +-
 .../jtreg/compiler/c2/TestDivModNodes.java    | 10 +--
 6 files changed, 40 insertions(+), 153 deletions(-)

diff --git a/src/hotspot/cpu/riscv/c1_LIRAssembler_arith_riscv.cpp b/src/hotspot/cpu/riscv/c1_LIRAssembler_arith_riscv.cpp
index f84c44d6fea..6d53282bba5 100644
--- a/src/hotspot/cpu/riscv/c1_LIRAssembler_arith_riscv.cpp
+++ b/src/hotspot/cpu/riscv/c1_LIRAssembler_arith_riscv.cpp
@@ -85,7 +85,11 @@ void LIR_Assembler::arithmetic_idiv(LIR_Code code, LIR_Opr left, LIR_Opr right,
     }
   } else {
     Register rreg = right->as_register();
-    __ corrected_idivl(dreg, lreg, rreg, is_irem, /* is_signed */ true);
+    if (is_irem) {
+      __ remw(dreg, lreg, rreg);
+    } else {
+      __ divw(dreg, lreg, rreg);
+    }
   }
 }
 
@@ -171,12 +175,8 @@ void LIR_Assembler::arith_op_double_cpu(LIR_Code code, LIR_Opr left, LIR_Opr rig
       case lir_add: __ add(dest->as_register_lo(), lreg_lo, rreg_lo); break;
       case lir_sub: __ sub(dest->as_register_lo(), lreg_lo, rreg_lo); break;
       case lir_mul: __ mul(dest->as_register_lo(), lreg_lo, rreg_lo); break;
-      case lir_div: __ corrected_idivq(dest->as_register_lo(), lreg_lo, rreg_lo,
-                                       /* want_remainder */ false, /* is_signed */ true);
-                    break;
-      case lir_rem: __ corrected_idivq(dest->as_register_lo(), lreg_lo, rreg_lo,
-                                       /* want_remainder */ true, /* is_signed */ true);
-                    break;
+      case lir_div: __ div(dest->as_register_lo(), lreg_lo, rreg_lo); break;
+      case lir_rem: __ rem(dest->as_register_lo(), lreg_lo, rreg_lo); break;
       default:
         ShouldNotReachHere();
     }
diff --git a/src/hotspot/cpu/riscv/macroAssembler_riscv.cpp b/src/hotspot/cpu/riscv/macroAssembler_riscv.cpp
index d3daef7664d..ee018f95091 100644
--- a/src/hotspot/cpu/riscv/macroAssembler_riscv.cpp
+++ b/src/hotspot/cpu/riscv/macroAssembler_riscv.cpp
@@ -3346,71 +3346,6 @@ void MacroAssembler::store_heap_oop_null(Address dst) {
   access_store_at(T_OBJECT, IN_HEAP, dst, noreg, noreg, noreg, noreg);
 }
 
-int MacroAssembler::corrected_idivl(Register result, Register rs1, Register rs2,
-                                    bool want_remainder, bool is_signed)
-{
-  // Full implementation of Java idiv and irem.  The function
-  // returns the (pc) offset of the div instruction - may be needed
-  // for implicit exceptions.
-  //
-  // input : rs1: dividend
-  //         rs2: divisor
-  //
-  // result: either
-  //         quotient  (= rs1 idiv rs2)
-  //         remainder (= rs1 irem rs2)
-
-
-  int idivl_offset = offset();
-  if (!want_remainder) {
-    if (is_signed) {
-      divw(result, rs1, rs2);
-    } else {
-      divuw(result, rs1, rs2);
-    }
-  } else {
-    // result = rs1 % rs2;
-    if (is_signed) {
-      remw(result, rs1, rs2);
-    } else {
-      remuw(result, rs1, rs2);
-    }
-  }
-  return idivl_offset;
-}
-
-int MacroAssembler::corrected_idivq(Register result, Register rs1, Register rs2,
-                                    bool want_remainder, bool is_signed)
-{
-  // Full implementation of Java ldiv and lrem.  The function
-  // returns the (pc) offset of the div instruction - may be needed
-  // for implicit exceptions.
-  //
-  // input : rs1: dividend
-  //         rs2: divisor
-  //
-  // result: either
-  //         quotient  (= rs1 idiv rs2)
-  //         remainder (= rs1 irem rs2)
-
-  int idivq_offset = offset();
-  if (!want_remainder) {
-    if (is_signed) {
-      div(result, rs1, rs2);
-    } else {
-      divu(result, rs1, rs2);
-    }
-  } else {
-    // result = rs1 % rs2;
-    if (is_signed) {
-      rem(result, rs1, rs2);
-    } else {
-      remu(result, rs1, rs2);
-    }
-  }
-  return idivq_offset;
-}
-
 // Look up the method for a megamorphic invokeinterface call.
 // The target method is determined by <intf_klass, itable_index>.
 // The receiver klass is in recv_klass.
diff --git a/src/hotspot/cpu/riscv/macroAssembler_riscv.hpp b/src/hotspot/cpu/riscv/macroAssembler_riscv.hpp
index f5dd4025185..e559292cfd6 100644
--- a/src/hotspot/cpu/riscv/macroAssembler_riscv.hpp
+++ b/src/hotspot/cpu/riscv/macroAssembler_riscv.hpp
@@ -242,12 +242,6 @@ class MacroAssembler: public Assembler {
   static bool needs_explicit_null_check(intptr_t offset);
   static bool uses_implicit_null_check(void* address);
 
-  // idiv variant which deals with MINLONG as dividend and -1 as divisor
-  int corrected_idivl(Register result, Register rs1, Register rs2,
-                      bool want_remainder, bool is_signed);
-  int corrected_idivq(Register result, Register rs1, Register rs2,
-                      bool want_remainder, bool is_signed);
-
   // interface method calling
   void lookup_interface_method(Register recv_klass,
                                Register intf_klass,
diff --git a/src/hotspot/cpu/riscv/riscv.ad b/src/hotspot/cpu/riscv/riscv.ad
index eb202f14ba1..25cea0d40c6 100644
--- a/src/hotspot/cpu/riscv/riscv.ad
+++ b/src/hotspot/cpu/riscv/riscv.ad
@@ -2485,64 +2485,6 @@ encode %{
     }
   %}
 
-  // arithmetic encodings
-
-  enc_class riscv_enc_divw(iRegI dst, iRegI src1, iRegI src2) %{
-    Register dst_reg = as_Register($dst$$reg);
-    Register src1_reg = as_Register($src1$$reg);
-    Register src2_reg = as_Register($src2$$reg);
-    __ corrected_idivl(dst_reg, src1_reg, src2_reg, /* want_remainder */ false, /* is_signed */ true);
-  %}
-
-  enc_class riscv_enc_divuw(iRegI dst, iRegI src1, iRegI src2) %{
-    Register dst_reg = as_Register($dst$$reg);
-    Register src1_reg = as_Register($src1$$reg);
-    Register src2_reg = as_Register($src2$$reg);
-    __ corrected_idivl(dst_reg, src1_reg, src2_reg, /* want_remainder */ false, /* is_signed */ false);
-  %}
-
-  enc_class riscv_enc_div(iRegI dst, iRegI src1, iRegI src2) %{
-    Register dst_reg = as_Register($dst$$reg);
-    Register src1_reg = as_Register($src1$$reg);
-    Register src2_reg = as_Register($src2$$reg);
-    __ corrected_idivq(dst_reg, src1_reg, src2_reg, /* want_remainder */ false, /* is_signed */ true);
-  %}
-
-  enc_class riscv_enc_divu(iRegI dst, iRegI src1, iRegI src2) %{
-    Register dst_reg = as_Register($dst$$reg);
-    Register src1_reg = as_Register($src1$$reg);
-    Register src2_reg = as_Register($src2$$reg);
-    __ corrected_idivq(dst_reg, src1_reg, src2_reg, /* want_remainder */ false, /* is_signed */ false);
-  %}
-
-  enc_class riscv_enc_modw(iRegI dst, iRegI src1, iRegI src2) %{
-    Register dst_reg = as_Register($dst$$reg);
-    Register src1_reg = as_Register($src1$$reg);
-    Register src2_reg = as_Register($src2$$reg);
-    __ corrected_idivl(dst_reg, src1_reg, src2_reg, /* want_remainder */ true, /* is_signed */ true);
-  %}
-
-  enc_class riscv_enc_moduw(iRegI dst, iRegI src1, iRegI src2) %{
-    Register dst_reg = as_Register($dst$$reg);
-    Register src1_reg = as_Register($src1$$reg);
-    Register src2_reg = as_Register($src2$$reg);
-    __ corrected_idivl(dst_reg, src1_reg, src2_reg, /* want_remainder */ true, /* is_signed */ false);
-  %}
-
-  enc_class riscv_enc_mod(iRegI dst, iRegI src1, iRegI src2) %{
-    Register dst_reg = as_Register($dst$$reg);
-    Register src1_reg = as_Register($src1$$reg);
-    Register src2_reg = as_Register($src2$$reg);
-    __ corrected_idivq(dst_reg, src1_reg, src2_reg, /* want_remainder */ true, /* is_signed */ true);
-  %}
-
-  enc_class riscv_enc_modu(iRegI dst, iRegI src1, iRegI src2) %{
-    Register dst_reg = as_Register($dst$$reg);
-    Register src1_reg = as_Register($src1$$reg);
-    Register src2_reg = as_Register($src2$$reg);
-    __ corrected_idivq(dst_reg, src1_reg, src2_reg, /* want_remainder */ true, /* is_signed */ false);
-  %}
-
   enc_class riscv_enc_tail_call(iRegP jump_target) %{
     Register target_reg = as_Register($jump_target$$reg);
     __ jr(target_reg);
@@ -6763,7 +6705,9 @@ instruct divI(iRegINoSp dst, iRegIorL2I src1, iRegIorL2I src2) %{
   ins_cost(IDIVSI_COST);
   format %{ "divw  $dst, $src1, $src2\t#@divI"%}
 
-  ins_encode(riscv_enc_divw(dst, src1, src2));
+  ins_encode %{
+    __ divw(as_Register($dst$$reg), as_Register($src1$$reg), as_Register($src2$$reg));
+  %}
   ins_pipe(idiv_reg_reg);
 %}
 
@@ -6772,7 +6716,9 @@ instruct UdivI(iRegINoSp dst, iRegIorL2I src1, iRegIorL2I src2) %{
   ins_cost(IDIVSI_COST);
   format %{ "divuw  $dst, $src1, $src2\t#@UdivI"%}
 
-  ins_encode(riscv_enc_divuw(dst, src1, src2));
+  ins_encode %{
+    __ divuw(as_Register($dst$$reg), as_Register($src1$$reg), as_Register($src2$$reg));
+  %}
   ins_pipe(idiv_reg_reg);
 %}
 
@@ -6794,7 +6740,9 @@ instruct divL(iRegLNoSp dst, iRegL src1, iRegL src2) %{
   ins_cost(IDIVDI_COST);
   format %{ "div  $dst, $src1, $src2\t#@divL" %}
 
-  ins_encode(riscv_enc_div(dst, src1, src2));
+  ins_encode %{
+    __ div(as_Register($dst$$reg), as_Register($src1$$reg), as_Register($src2$$reg));
+  %}
   ins_pipe(ldiv_reg_reg);
 %}
 
@@ -6804,7 +6752,9 @@ instruct UdivL(iRegLNoSp dst, iRegL src1, iRegL src2) %{
 
   format %{ "divu $dst, $src1, $src2\t#@UdivL" %}
 
-  ins_encode(riscv_enc_divu(dst, src1, src2));
+  ins_encode %{
+    __ divu(as_Register($dst$$reg), as_Register($src1$$reg), as_Register($src2$$reg));
+  %}
   ins_pipe(ldiv_reg_reg);
 %}
 
@@ -6826,7 +6776,9 @@ instruct modI(iRegINoSp dst, iRegIorL2I src1, iRegIorL2I src2) %{
   ins_cost(IDIVSI_COST);
   format %{ "remw  $dst, $src1, $src2\t#@modI" %}
 
-  ins_encode(riscv_enc_modw(dst, src1, src2));
+  ins_encode %{
+    __ remw(as_Register($dst$$reg), as_Register($src1$$reg), as_Register($src2$$reg));
+  %}
   ins_pipe(ialu_reg_reg);
 %}
 
@@ -6835,7 +6787,9 @@ instruct UmodI(iRegINoSp dst, iRegIorL2I src1, iRegIorL2I src2) %{
   ins_cost(IDIVSI_COST);
   format %{ "remuw  $dst, $src1, $src2\t#@UmodI" %}
 
-  ins_encode(riscv_enc_moduw(dst, src1, src2));
+  ins_encode %{
+    __ remuw(as_Register($dst$$reg), as_Register($src1$$reg), as_Register($src2$$reg));
+  %}
   ins_pipe(ialu_reg_reg);
 %}
 
@@ -6846,7 +6800,9 @@ instruct modL(iRegLNoSp dst, iRegL src1, iRegL src2) %{
   ins_cost(IDIVDI_COST);
   format %{ "rem  $dst, $src1, $src2\t#@modL" %}
 
-  ins_encode(riscv_enc_mod(dst, src1, src2));
+  ins_encode %{
+    __ rem(as_Register($dst$$reg), as_Register($src1$$reg), as_Register($src2$$reg));
+  %}
   ins_pipe(ialu_reg_reg);
 %}
 
@@ -6855,7 +6811,9 @@ instruct UmodL(iRegLNoSp dst, iRegL src1, iRegL src2) %{
   ins_cost(IDIVDI_COST);
   format %{ "remu  $dst, $src1, $src2\t#@UmodL" %}
 
-  ins_encode(riscv_enc_modu(dst, src1, src2));
+  ins_encode %{
+    __ remu(as_Register($dst$$reg), as_Register($src1$$reg), as_Register($src2$$reg));
+  %}
   ins_pipe(ialu_reg_reg);
 %}
 
diff --git a/src/hotspot/cpu/riscv/templateTable_riscv.cpp b/src/hotspot/cpu/riscv/templateTable_riscv.cpp
index cb4ded3c330..216cfdeed79 100644
--- a/src/hotspot/cpu/riscv/templateTable_riscv.cpp
+++ b/src/hotspot/cpu/riscv/templateTable_riscv.cpp
@@ -1324,7 +1324,7 @@ void TemplateTable::idiv() {
   __ bind(no_div0);
   __ pop_i(x11);
   // x10 <== x11 idiv x10
-  __ corrected_idivl(x10, x11, x10, /* want_remainder */ false, /* is_signed */ true);
+  __ divw(x10, x11, x10);
 }
 
 void TemplateTable::irem() {
@@ -1337,7 +1337,7 @@ void TemplateTable::irem() {
   __ bind(no_div0);
   __ pop_i(x11);
   // x10 <== x11 irem x10
-  __ corrected_idivl(x10, x11, x10, /* want_remainder */ true, /* is_signed */ true);
+  __ remw(x10, x11, x10);
 }
 
 void TemplateTable::lmul() {
@@ -1356,7 +1356,7 @@ void TemplateTable::ldiv() {
   __ bind(no_div0);
   __ pop_l(x11);
   // x10 <== x11 ldiv x10
-  __ corrected_idivq(x10, x11, x10, /* want_remainder */ false, /* is_signed */ true);
+  __ div(x10, x11, x10);
 }
 
 void TemplateTable::lrem() {
@@ -1369,7 +1369,7 @@ void TemplateTable::lrem() {
   __ bind(no_div0);
   __ pop_l(x11);
   // x10 <== x11 lrem x10
-  __ corrected_idivq(x10, x11, x10, /* want_remainder */ true, /* is_signed */ true);
+  __ rem(x10, x11, x10);
 }
 
 void TemplateTable::lshl() {
diff --git a/test/hotspot/jtreg/compiler/c2/TestDivModNodes.java b/test/hotspot/jtreg/compiler/c2/TestDivModNodes.java
index be7cf0a3836..3fdc37f3f32 100644
--- a/test/hotspot/jtreg/compiler/c2/TestDivModNodes.java
+++ b/test/hotspot/jtreg/compiler/c2/TestDivModNodes.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024 Red Hat and/or its affiliates. All rights reserved.
+ * Copyright (c) 2024, 2025, Red Hat and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -68,7 +68,7 @@ public class TestDivModNodes {
     @IR(applyIf = {"UseDivMod", "true"}, applyIfPlatform = {"x64", "true"},
             counts = {IRNode.DIV_MOD_I, "1"},
             failOn = {IRNode.DIV_I, IRNode.MOD_I})
-    @IR(applyIf = {"UseDivMod", "true"}, applyIfPlatform = {"aarch64", "true"},
+    @IR(applyIf = {"UseDivMod", "true"}, applyIfPlatformOr = {"aarch64", "true", "riscv64", "true"},
             counts = {IRNode.DIV_I, "1", IRNode.MUL_I, "1", IRNode.SUB_I, "1"},
             failOn = {IRNode.MOD_I})
     @IR(applyIf = {"UseDivMod", "false"},
@@ -94,7 +94,7 @@ public class TestDivModNodes {
     @IR(applyIf = {"UseDivMod", "true"}, applyIfPlatform = {"x64", "true"},
             counts = {IRNode.DIV_MOD_L, "1"},
             failOn = {IRNode.DIV_L, IRNode.MOD_L})
-    @IR(applyIf = {"UseDivMod", "true"}, applyIfPlatform = {"aarch64", "true"},
+    @IR(applyIf = {"UseDivMod", "true"}, applyIfPlatformOr = {"aarch64", "true", "riscv64", "true"},
             counts = {IRNode.DIV_L, "1", IRNode.MUL_L, "1", IRNode.SUB_L, "1"},
             failOn = {IRNode.MOD_L})
     @IR(applyIf = {"UseDivMod", "false"},
@@ -119,7 +119,7 @@ public class TestDivModNodes {
     @IR(applyIf = {"UseDivMod", "true"}, applyIfPlatform = {"x64", "true"},
             counts = {IRNode.UDIV_MOD_I, "1"},
             failOn = {IRNode.UDIV_I, IRNode.UMOD_I})
-    @IR(applyIf = {"UseDivMod", "true"}, applyIfPlatform = {"aarch64", "true"},
+    @IR(applyIf = {"UseDivMod", "true"}, applyIfPlatformOr = {"aarch64", "true", "riscv64", "true"},
             counts = {IRNode.UDIV_I, "1", IRNode.MUL_I, "1", IRNode.SUB_I, "1"},
             failOn = {IRNode.UMOD_I})
     @IR(applyIf = {"UseDivMod", "false"},
@@ -144,7 +144,7 @@ public class TestDivModNodes {
     @IR(applyIf = {"UseDivMod", "true"}, applyIfPlatform = {"x64", "true"},
             counts = {IRNode.UDIV_MOD_L, "1"},
             failOn = {IRNode.UDIV_L, IRNode.UMOD_L})
-    @IR(applyIf = {"UseDivMod", "true"}, applyIfPlatform = {"aarch64", "true"},
+    @IR(applyIf = {"UseDivMod", "true"}, applyIfPlatformOr = {"aarch64", "true", "riscv64", "true"},
             counts = {IRNode.UDIV_L, "1", IRNode.MUL_L, "1", IRNode.SUB_L, "1"},
             failOn = {IRNode.MOD_L})
     @IR(applyIf = {"UseDivMod", "false"},

From 04eac0c3e2ce1a37d0661de10907228e0ca48aab Mon Sep 17 00:00:00 2001
From: Hamlin Li <mli@openjdk.org>
Date: Fri, 21 Mar 2025 12:10:22 +0000
Subject: [PATCH 428/587] 8352159: RISC-V: add more zfa support

Reviewed-by: fyang, luhenry, rehn
---
 src/hotspot/cpu/riscv/assembler_riscv.hpp     | 57 +++++++++++++++-
 .../cpu/riscv/macroAssembler_riscv.cpp        | 19 ++++++
 .../cpu/riscv/macroAssembler_riscv.hpp        |  2 +
 src/hotspot/cpu/riscv/riscv.ad                | 66 +++++++++++--------
 4 files changed, 114 insertions(+), 30 deletions(-)

diff --git a/src/hotspot/cpu/riscv/assembler_riscv.hpp b/src/hotspot/cpu/riscv/assembler_riscv.hpp
index c9b2551302b..3c19673f1e7 100644
--- a/src/hotspot/cpu/riscv/assembler_riscv.hpp
+++ b/src/hotspot/cpu/riscv/assembler_riscv.hpp
@@ -371,7 +371,6 @@ protected:
     return -1;
   }
 
-
   static int zfa_zli_lookup_float(uint32_t value) {
     switch(value) {
       case 0xbf800000 : return  0;
@@ -411,8 +410,55 @@ protected:
     return -1;
   }
 
+  static int zfa_zli_lookup_half_float(uint16_t value) {
+    switch(value) {
+      case 0xbc00 : return  0;
+      case 0x0400 : return  1;
+      case 0x0100 : return  2;
+      case 0x0200 : return  3;
+      case 0x1c00 : return  4;
+      case 0x2000 : return  5;
+      case 0x2c00 : return  6;
+      case 0x3000 : return  7;
+      case 0x3400 : return  8;
+      case 0x3500 : return  9;
+      case 0x3600 : return 10;
+      case 0x3700 : return 11;
+      case 0x3800 : return 12;
+      case 0x3900 : return 13;
+      case 0x3a00 : return 14;
+      case 0x3b00 : return 15;
+      case 0x3c00 : return 16;
+      case 0x3d00 : return 17;
+      case 0x3e00 : return 18;
+      case 0x3f00 : return 19;
+      case 0x4000 : return 20;
+      case 0x4100 : return 21;
+      case 0x4200 : return 22;
+      case 0x4400 : return 23;
+      case 0x4800 : return 24;
+      case 0x4c00 : return 25;
+      case 0x5800 : return 26;
+      case 0x5c00 : return 27;
+      case 0x7800 : return 28;
+      case 0x7c00 : return 29;
+      // case 0x7c00 : return 30; // redundant with 29
+      case 0x7e00 : return 31;
+      default: break;
+    }
+    return -1;
+  }
+
  public:
 
+  static bool can_zfa_zli_half_float(jshort hf) {
+    if (!UseZfa || !UseZfh) {
+      return false;
+    }
+    uint16_t hf_bits = (uint16_t)hf;
+    return zfa_zli_lookup_half_float(hf_bits) != -1;
+  }
+
   static bool can_zfa_zli_float(jfloat f) {
     if (!UseZfa) {
       return false;
@@ -1440,6 +1486,11 @@ enum operand_size { int8, int16, int32, uint32, int64 };
 
 // --------------  ZFA Instruction Definitions  --------------
 // Zfa Extension for Additional Floating-Point Instructions
+  void _fli_h(FloatRegister Rd, uint8_t Rs1) {
+    assert_cond(UseZfa && UseZfh);
+    fp_base<H_16_hp, 0b11110>(Rd, Rs1, 0b00001, 0b000);
+  }
+
   void _fli_s(FloatRegister Rd, uint8_t Rs1) {
     assert_cond(UseZfa);
     fp_base<S_32_sp, 0b11110>(Rd, Rs1, 0b00001, 0b000);
@@ -1451,12 +1502,12 @@ enum operand_size { int8, int16, int32, uint32, int64 };
   }
 
   void fminm_h(FloatRegister Rd, FloatRegister Rs1, FloatRegister Rs2) {
-    assert_cond(UseZfa);
+    assert_cond(UseZfa && UseZfh);
     fp_base<H_16_hp, 0b00101>(Rd, Rs1, Rs2, 0b010);
   }
 
   void fmaxm_h(FloatRegister Rd, FloatRegister Rs1, FloatRegister Rs2) {
-    assert_cond(UseZfa);
+    assert_cond(UseZfa && UseZfh);
     fp_base<H_16_hp, 0b00101>(Rd, Rs1, Rs2, 0b011);
   }
 
diff --git a/src/hotspot/cpu/riscv/macroAssembler_riscv.cpp b/src/hotspot/cpu/riscv/macroAssembler_riscv.cpp
index ee018f95091..1916fbdeb18 100644
--- a/src/hotspot/cpu/riscv/macroAssembler_riscv.cpp
+++ b/src/hotspot/cpu/riscv/macroAssembler_riscv.cpp
@@ -2594,6 +2594,14 @@ void MacroAssembler::movptr2(Register Rd, uint64_t addr, int32_t &offset, Regist
 }
 
 // floating point imm move
+bool MacroAssembler::can_hf_imm_load(short imm) {
+  jshort h_bits = (jshort)imm;
+  if (h_bits == 0) {
+    return true;
+  }
+  return can_zfa_zli_half_float(imm);
+}
+
 bool MacroAssembler::can_fp_imm_load(float imm) {
   jint f_bits = jint_cast(imm);
   if (f_bits == 0) {
@@ -2610,6 +2618,17 @@ bool MacroAssembler::can_dp_imm_load(double imm) {
   return can_zfa_zli_double(imm);
 }
 
+void MacroAssembler::fli_h(FloatRegister Rd, short imm) {
+  jshort h_bits = (jshort)imm;
+  if (h_bits == 0) {
+    fmv_h_x(Rd, zr);
+    return;
+  }
+  int Rs = zfa_zli_lookup_half_float(h_bits);
+  assert(Rs != -1, "Must be");
+  _fli_h(Rd, Rs);
+}
+
 void MacroAssembler::fli_s(FloatRegister Rd, float imm) {
   jint f_bits = jint_cast(imm);
   if (f_bits == 0) {
diff --git a/src/hotspot/cpu/riscv/macroAssembler_riscv.hpp b/src/hotspot/cpu/riscv/macroAssembler_riscv.hpp
index e559292cfd6..5d36a5f6fcd 100644
--- a/src/hotspot/cpu/riscv/macroAssembler_riscv.hpp
+++ b/src/hotspot/cpu/riscv/macroAssembler_riscv.hpp
@@ -915,8 +915,10 @@ public:
   void movptr2(Register Rd, uintptr_t addr, int32_t &offset, Register tmp);
  public:
   // float imm move
+  static bool can_hf_imm_load(short imm);
   static bool can_fp_imm_load(float imm);
   static bool can_dp_imm_load(double imm);
+  void fli_h(FloatRegister Rd, short imm);
   void fli_s(FloatRegister Rd, float imm);
   void fli_d(FloatRegister Rd, double imm);
 
diff --git a/src/hotspot/cpu/riscv/riscv.ad b/src/hotspot/cpu/riscv/riscv.ad
index 25cea0d40c6..9435c0b562d 100644
--- a/src/hotspot/cpu/riscv/riscv.ad
+++ b/src/hotspot/cpu/riscv/riscv.ad
@@ -4897,8 +4897,11 @@ instruct loadConH(fRegF dst, immH con) %{
 
   ins_encode %{
     assert(UseZfh || UseZfhmin, "must");
-    __ flh(as_FloatRegister($dst$$reg), $constantaddress($con));
-    // TODO: add zfa instructions for half float, and optimize here.
+    if (MacroAssembler::can_hf_imm_load($con$$constant)) {
+      __ fli_h(as_FloatRegister($dst$$reg), $con$$constant);
+    } else {
+      __ flh(as_FloatRegister($dst$$reg), $constantaddress($con));
+    }
   %}
 
   ins_pipe(fp_load_constant_s);
@@ -4929,11 +4932,11 @@ instruct loadConF(fRegF dst, immF con) %{
   %}
 
   ins_encode %{
-      if (MacroAssembler::can_fp_imm_load($con$$constant)) {
-        __ fli_s(as_FloatRegister($dst$$reg), $con$$constant);
-      } else {
-        __ flw(as_FloatRegister($dst$$reg), $constantaddress($con));
-      }
+    if (MacroAssembler::can_fp_imm_load($con$$constant)) {
+      __ fli_s(as_FloatRegister($dst$$reg), $con$$constant);
+    } else {
+      __ flw(as_FloatRegister($dst$$reg), $constantaddress($con));
+    }
   %}
 
   ins_pipe(fp_load_constant_s);
@@ -4963,11 +4966,11 @@ instruct loadConD(fRegD dst, immD con) %{
   %}
 
   ins_encode %{
-      if (MacroAssembler::can_dp_imm_load($con$$constant)) {
-        __ fli_d(as_FloatRegister($dst$$reg), $con$$constant);
-      } else {
-        __ fld(as_FloatRegister($dst$$reg), $constantaddress($con));
-      }
+    if (MacroAssembler::can_dp_imm_load($con$$constant)) {
+      __ fli_d(as_FloatRegister($dst$$reg), $con$$constant);
+    } else {
+      __ fld(as_FloatRegister($dst$$reg), $constantaddress($con));
+    }
   %}
 
   ins_pipe(fp_load_constant_d);
@@ -8342,28 +8345,22 @@ instruct binOps_HF_reg(fRegF dst, fRegF src1, fRegF src2)
   ins_pipe(fp_dop_reg_reg_s);
 %}
 
-instruct min_max_HF_reg(fRegF dst, fRegF src1, fRegF src2)
+instruct min_HF_reg(fRegF dst, fRegF src1, fRegF src2, rFlagsReg cr)
 %{
   predicate(!UseZfa);
   match(Set dst (MinHF src1 src2));
-  match(Set dst (MaxHF src1 src2));
-  format %{ "min_max_hf $dst, $src1, $src2" %}
+  effect(KILL cr);
+
+  format %{ "min_hf $dst, $src1, $src2" %}
+
   ins_encode %{
-    int opcode = this->ideal_Opcode();
-    switch(opcode) {
-      case Op_MinHF: __ minmax_fp($dst$$FloatRegister, $src1$$FloatRegister, $src2$$FloatRegister,
-                                  __ FLOAT_TYPE::half_precision, true);
-                     break;
-      case Op_MaxHF: __ minmax_fp($dst$$FloatRegister, $src1$$FloatRegister, $src2$$FloatRegister,
-                                  __ FLOAT_TYPE::half_precision, false);
-                     break;
-      default: assert(false, "%s is not supported here", NodeClassNames[opcode]); break;
-    }
+    __ minmax_fp($dst$$FloatRegister, $src1$$FloatRegister, $src2$$FloatRegister,
+                 __ FLOAT_TYPE::half_precision, true /* is_min */);
   %}
   ins_pipe(pipe_class_default);
 %}
 
-instruct minHF_reg_zfa(fRegF dst, fRegF src1, fRegF src2)
+instruct min_HF_reg_zfa(fRegF dst, fRegF src1, fRegF src2)
 %{
   predicate(UseZfa);
   match(Set dst (MinHF src1 src2));
@@ -8378,7 +8375,22 @@ instruct minHF_reg_zfa(fRegF dst, fRegF src1, fRegF src2)
   ins_pipe(pipe_class_default);
 %}
 
-instruct maxHF_reg_zfa(fRegF dst, fRegF src1, fRegF src2)
+instruct max_HF_reg(fRegF dst, fRegF src1, fRegF src2, rFlagsReg cr)
+%{
+  predicate(!UseZfa);
+  match(Set dst (MaxHF src1 src2));
+  effect(KILL cr);
+
+  format %{ "max_hf $dst, $src1, $src2" %}
+
+  ins_encode %{
+    __ minmax_fp($dst$$FloatRegister, $src1$$FloatRegister, $src2$$FloatRegister,
+                 __ FLOAT_TYPE::half_precision, false /* is_min */);
+  %}
+  ins_pipe(pipe_class_default);
+%}
+
+instruct max_HF_reg_zfa(fRegF dst, fRegF src1, fRegF src2)
 %{
   predicate(UseZfa);
   match(Set dst (MaxHF src1 src2));

From 0cb110ebb7f8d184dd855f64c5dd7924c8202b3d Mon Sep 17 00:00:00 2001
From: Doug Simon <dnsimon@openjdk.org>
Date: Fri, 21 Mar 2025 13:00:25 +0000
Subject: [PATCH 429/587] 8350892: [JVMCI] Align
 ResolvedJavaType.getInstanceFields with Class.getDeclaredFields

Reviewed-by: yzheng, never, thartmann
---
 src/hotspot/share/ci/ciInstanceKlass.cpp      | 11 -----
 src/hotspot/share/ci/ciInstanceKlass.hpp      |  2 +-
 src/hotspot/share/runtime/deoptimization.cpp  | 46 +++++++++----------
 .../HotSpotResolvedObjectTypeImpl.java        |  9 ----
 .../jdk/vm/ci/meta/ResolvedJavaType.java      | 17 +++----
 .../ci/runtime/test/TestResolvedJavaType.java | 43 ++++++++++-------
 6 files changed, 57 insertions(+), 71 deletions(-)

diff --git a/src/hotspot/share/ci/ciInstanceKlass.cpp b/src/hotspot/share/ci/ciInstanceKlass.cpp
index 5799f30ad67..e8d71b32b68 100644
--- a/src/hotspot/share/ci/ciInstanceKlass.cpp
+++ b/src/hotspot/share/ci/ciInstanceKlass.cpp
@@ -400,9 +400,6 @@ ciField* ciInstanceKlass::get_field_by_offset(int field_offset, bool is_static)
       int  field_off = field->offset_in_bytes();
       if (field_off == field_offset)
         return field;
-      if (field_off > field_offset)
-        break;
-      // could do binary search or check bins, but probably not worth it
     }
     return nullptr;
   }
@@ -431,11 +428,6 @@ ciField* ciInstanceKlass::get_field_by_name(ciSymbol* name, ciSymbol* signature,
 }
 
 
-static int sort_field_by_offset(ciField** a, ciField** b) {
-  return (*a)->offset_in_bytes() - (*b)->offset_in_bytes();
-  // (no worries about 32-bit overflow...)
-}
-
 // ------------------------------------------------------------------
 // ciInstanceKlass::compute_nonstatic_fields
 int ciInstanceKlass::compute_nonstatic_fields() {
@@ -476,9 +468,6 @@ int ciInstanceKlass::compute_nonstatic_fields() {
 
   int flen = fields->length();
 
-  // Now sort them by offset, ascending.
-  // (In principle, they could mix with superclass fields.)
-  fields->sort(sort_field_by_offset);
   _nonstatic_fields = fields;
   return flen;
 }
diff --git a/src/hotspot/share/ci/ciInstanceKlass.hpp b/src/hotspot/share/ci/ciInstanceKlass.hpp
index 9c1c416780d..69b73152d37 100644
--- a/src/hotspot/share/ci/ciInstanceKlass.hpp
+++ b/src/hotspot/share/ci/ciInstanceKlass.hpp
@@ -67,7 +67,7 @@ private:
   ciInstance*            _java_mirror;
 
   ciConstantPoolCache*   _field_cache;  // cached map index->field
-  GrowableArray<ciField*>* _nonstatic_fields;
+  GrowableArray<ciField*>* _nonstatic_fields;  // ordered by JavaFieldStream
   int                    _has_injected_fields; // any non static injected fields? lazily initialized.
 
   // The possible values of the _implementor fall into following three cases:
diff --git a/src/hotspot/share/runtime/deoptimization.cpp b/src/hotspot/share/runtime/deoptimization.cpp
index 748cd0d7939..f7e0844639b 100644
--- a/src/hotspot/share/runtime/deoptimization.cpp
+++ b/src/hotspot/share/runtime/deoptimization.cpp
@@ -377,8 +377,9 @@ static bool rematerialize_objects(JavaThread* thread, int exec_mode, nmethod* co
       realloc_failures = Deoptimization::realloc_objects(thread, &deoptee, &map, objects, THREAD);
       JRT_END
     }
-    bool skip_internal = (compiled_method != nullptr) && !compiled_method->is_compiled_by_jvmci();
-    Deoptimization::reassign_fields(&deoptee, &map, objects, realloc_failures, skip_internal);
+    guarantee(compiled_method != nullptr, "deopt must be associated with an nmethod");
+    bool is_jvmci = compiled_method->is_compiled_by_jvmci();
+    Deoptimization::reassign_fields(&deoptee, &map, objects, realloc_failures, is_jvmci);
     if (TraceDeoptimization) {
       print_objects(deoptee_thread, objects, realloc_failures);
     }
@@ -1458,27 +1459,26 @@ public:
   }
 };
 
-static int compare(ReassignedField* left, ReassignedField* right) {
-  return left->_offset - right->_offset;
+// Gets the fields of `klass` that are eliminated by escape analysis and need to be reassigned
+static GrowableArray<ReassignedField>* get_reassigned_fields(InstanceKlass* klass, GrowableArray<ReassignedField>* fields, bool is_jvmci) {
+  InstanceKlass* super = klass->superklass();
+  if (super != nullptr) {
+    get_reassigned_fields(super, fields, is_jvmci);
+  }
+  for (AllFieldStream fs(klass); !fs.done(); fs.next()) {
+    if (!fs.access_flags().is_static() && (is_jvmci || !fs.field_flags().is_injected())) {
+      ReassignedField field;
+      field._offset = fs.offset();
+      field._type = Signature::basic_type(fs.signature());
+      fields->append(field);
+    }
+  }
+  return fields;
 }
 
-// Restore fields of an eliminated instance object using the same field order
-// returned by HotSpotResolvedObjectTypeImpl.getInstanceFields(true)
-static int reassign_fields_by_klass(InstanceKlass* klass, frame* fr, RegisterMap* reg_map, ObjectValue* sv, int svIndex, oop obj, bool skip_internal) {
-  GrowableArray<ReassignedField>* fields = new GrowableArray<ReassignedField>();
-  InstanceKlass* ik = klass;
-  while (ik != nullptr) {
-    for (AllFieldStream fs(ik); !fs.done(); fs.next()) {
-      if (!fs.access_flags().is_static() && (!skip_internal || !fs.field_flags().is_injected())) {
-        ReassignedField field;
-        field._offset = fs.offset();
-        field._type = Signature::basic_type(fs.signature());
-        fields->append(field);
-      }
-    }
-    ik = ik->superklass();
-  }
-  fields->sort(compare);
+// Restore fields of an eliminated instance object employing the same field order used by the compiler.
+static int reassign_fields_by_klass(InstanceKlass* klass, frame* fr, RegisterMap* reg_map, ObjectValue* sv, int svIndex, oop obj, bool is_jvmci) {
+  GrowableArray<ReassignedField>* fields = get_reassigned_fields(klass, new GrowableArray<ReassignedField>(), is_jvmci);
   for (int i = 0; i < fields->length(); i++) {
     ScopeValue* scope_field = sv->field_at(svIndex);
     StackValue* value = StackValue::create_stack_value(fr, reg_map, scope_field);
@@ -1560,7 +1560,7 @@ static int reassign_fields_by_klass(InstanceKlass* klass, frame* fr, RegisterMap
 }
 
 // restore fields of all eliminated objects and arrays
-void Deoptimization::reassign_fields(frame* fr, RegisterMap* reg_map, GrowableArray<ScopeValue*>* objects, bool realloc_failures, bool skip_internal) {
+void Deoptimization::reassign_fields(frame* fr, RegisterMap* reg_map, GrowableArray<ScopeValue*>* objects, bool realloc_failures, bool is_jvmci) {
   for (int i = 0; i < objects->length(); i++) {
     assert(objects->at(i)->is_object(), "invalid debug information");
     ObjectValue* sv = (ObjectValue*) objects->at(i);
@@ -1604,7 +1604,7 @@ void Deoptimization::reassign_fields(frame* fr, RegisterMap* reg_map, GrowableAr
     }
     if (k->is_instance_klass()) {
       InstanceKlass* ik = InstanceKlass::cast(k);
-      reassign_fields_by_klass(ik, fr, reg_map, sv, 0, obj(), skip_internal);
+      reassign_fields_by_klass(ik, fr, reg_map, sv, 0, obj(), is_jvmci);
     } else if (k->is_typeArray_klass()) {
       TypeArrayKlass* ak = TypeArrayKlass::cast(k);
       reassign_type_array_elements(fr, reg_map, sv, (typeArrayOop) obj(), ak->element_type());
diff --git a/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/HotSpotResolvedObjectTypeImpl.java b/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/HotSpotResolvedObjectTypeImpl.java
index 91c9e73b532..8d3b9f48b4c 100644
--- a/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/HotSpotResolvedObjectTypeImpl.java
+++ b/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/HotSpotResolvedObjectTypeImpl.java
@@ -67,7 +67,6 @@ final class HotSpotResolvedObjectTypeImpl extends HotSpotResolvedJavaType implem
 
     private static final HotSpotResolvedJavaField[] NO_FIELDS = new HotSpotResolvedJavaField[0];
     private static final int METHOD_CACHE_ARRAY_CAPACITY = 8;
-    private static final SortByOffset fieldSortingMethod = new SortByOffset();
 
     /**
      * The {@code Klass*} of this type.
@@ -782,12 +781,6 @@ final class HotSpotResolvedObjectTypeImpl extends HotSpotResolvedJavaType implem
         }
     }
 
-    static class SortByOffset implements Comparator<ResolvedJavaField> {
-        public int compare(ResolvedJavaField a, ResolvedJavaField b) {
-            return a.getOffset() - b.getOffset();
-        }
-    }
-
     @Override
     public ResolvedJavaField[] getInstanceFields(boolean includeSuperclasses) {
         if (instanceFields == null) {
@@ -817,7 +810,6 @@ final class HotSpotResolvedObjectTypeImpl extends HotSpotResolvedJavaType implem
                         result[i++] = f;
                     }
                 }
-                Arrays.sort(result, fieldSortingMethod);
                 return result;
             } else {
                 // The super classes of this class do not have any instance fields.
@@ -876,7 +868,6 @@ final class HotSpotResolvedObjectTypeImpl extends HotSpotResolvedJavaType implem
                 result[resultIndex++] = resolvedJavaField;
             }
         }
-        Arrays.sort(result, fieldSortingMethod);
         return result;
     }
 
diff --git a/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/meta/ResolvedJavaType.java b/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/meta/ResolvedJavaType.java
index 272f821b7ca..b5d29733a69 100644
--- a/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/meta/ResolvedJavaType.java
+++ b/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/meta/ResolvedJavaType.java
@@ -284,24 +284,21 @@ public interface ResolvedJavaType extends JavaType, ModifiersProvider, Annotated
     AssumptionResult<ResolvedJavaMethod> findUniqueConcreteMethod(ResolvedJavaMethod method);
 
     /**
-     * Returns the instance fields of this class, including
+     * Returns the non-static fields of this class, including
      * {@linkplain ResolvedJavaField#isInternal() internal} fields. A zero-length array is returned
-     * for array and primitive types. The order of fields returned by this method is stable. That
-     * is, for a single JVM execution the same order is returned each time this method is called. It
-     * is also the "natural" order, which means that the JVM would expect the fields in this order
-     * if no specific order is given.
+     * for array and primitive types. The order of fields declared by a single class returned by
+     * this method is the same as {@link Class#getDeclaredFields}.
      *
-     * @param includeSuperclasses if true, then instance fields for the complete hierarchy of this
-     *            type are included in the result
-     * @return an array of instance fields
+     * @param includeSuperclasses if true, then non-static fields for the complete hierarchy of this
+     *            type are included in the result with superclass fields coming before subclass fields
+     * @return an array of non-static fields
      */
     ResolvedJavaField[] getInstanceFields(boolean includeSuperclasses);
 
     /**
      * Returns the static fields of this class, including {@linkplain ResolvedJavaField#isInternal()
      * internal} fields. A zero-length array is returned for array and primitive types. The order of
-     * fields returned by this method is stable. That is, for a single JVM execution the same order
-     * is returned each time this method is called.
+     * fields returned by this method is the same as {@link Class#getDeclaredFields}.
      */
     ResolvedJavaField[] getStaticFields();
 
diff --git a/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/TestResolvedJavaType.java b/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/TestResolvedJavaType.java
index 52b52cf647f..456c4a5fd88 100644
--- a/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/TestResolvedJavaType.java
+++ b/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/TestResolvedJavaType.java
@@ -71,7 +71,9 @@ import java.lang.reflect.Constructor;
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
+import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collection;
 import java.util.Collections;
 import java.util.function.BiConsumer;
 import java.util.function.Supplier;
@@ -144,7 +146,7 @@ public class TestResolvedJavaType extends TypeUniverse {
     public void findInstanceFieldWithOffsetTest() {
         for (Class<?> c : classes) {
             ResolvedJavaType type = metaAccess.lookupJavaType(c);
-            Set<Field> reflectionFields = getInstanceFields(c, true);
+            Set<Field> reflectionFields = Set.copyOf(getInstanceFields(c, true));
             for (Field f : reflectionFields) {
                 ResolvedJavaField rf = lookupField(type.getInstanceFields(true), f);
                 assertNotNull(rf);
@@ -872,18 +874,20 @@ public class TestResolvedJavaType extends TypeUniverse {
         assertEquals(thisMethod, ucm);
     }
 
-    public static Set<Field> getInstanceFields(Class<?> c, boolean includeSuperclasses) {
+    public static List<Field> getInstanceFields(Class<?> c, boolean includeSuperclasses) {
         if (c.isArray() || c.isPrimitive() || c.isInterface()) {
-            return Collections.emptySet();
+            return List.of();
         }
-        Set<Field> result = new HashSet<>();
+        List<Field> result = new ArrayList<>();
         for (Field f : c.getDeclaredFields()) {
             if (!Modifier.isStatic(f.getModifiers())) {
                 result.add(f);
             }
         }
         if (includeSuperclasses && c != Object.class) {
-            result.addAll(getInstanceFields(c.getSuperclass(), true));
+            List<Field> allFields = getInstanceFields(c.getSuperclass(), true);
+            allFields.addAll(result);
+            result = allFields;
         }
         return result;
     }
@@ -912,7 +916,7 @@ public class TestResolvedJavaType extends TypeUniverse {
         return null;
     }
 
-    public Field lookupField(Set<Field> fields, ResolvedJavaField key) {
+    public Field lookupField(Collection<Field> fields, ResolvedJavaField key) {
         for (Field f : fields) {
             if (fieldsEqual(f, key)) {
                 return f;
@@ -922,9 +926,6 @@ public class TestResolvedJavaType extends TypeUniverse {
     }
 
     private static boolean isHiddenFromReflection(ResolvedJavaField f) {
-        if (f.getDeclaringClass().equals(metaAccess.lookupJavaType(Throwable.class)) && f.getName().equals("backtrace")) {
-            return true;
-        }
         if (f.getDeclaringClass().equals(metaAccess.lookupJavaType(ConstantPool.class)) && f.getName().equals("constantPoolOop")) {
             return true;
         }
@@ -955,20 +956,28 @@ public class TestResolvedJavaType extends TypeUniverse {
         for (Class<?> c : classes) {
             ResolvedJavaType type = metaAccess.lookupJavaType(c);
             for (boolean includeSuperclasses : new boolean[]{true, false}) {
-                Set<Field> expected = getInstanceFields(c, includeSuperclasses);
-                ResolvedJavaField[] actual = type.getInstanceFields(includeSuperclasses);
-                for (Field f : expected) {
-                    assertNotNull(lookupField(actual, f));
+                List<Field> reflectFields = getInstanceFields(c, includeSuperclasses);
+                ResolvedJavaField[] fields = type.getInstanceFields(includeSuperclasses);
+                int reflectFieldIndex = 0;
+                for (int i = 0; i < fields.length; i++) {
+                    ResolvedJavaField field = fields[i];
+                    if (field.isInternal() || isHiddenFromReflection(field)) {
+                        continue;
+                    }
+                    Field reflectField = reflectFields.get(reflectFieldIndex++);
+                    ResolvedJavaField field2 = lookupField(fields, reflectField);
+
+                    assertEquals("ResolvedJavaType.getInstanceFields order differs from Class.getDeclaredFields", field, field2);
                 }
-                for (ResolvedJavaField rf : actual) {
+                for (ResolvedJavaField rf : fields) {
                     if (!isHiddenFromReflection(rf)) {
-                        assertEquals(rf.toString(), lookupField(expected, rf) != null, !rf.isInternal());
+                        assertEquals(rf.toString(), lookupField(reflectFields, rf) != null, !rf.isInternal());
                     }
                 }
 
                 // Test stability of getInstanceFields
-                ResolvedJavaField[] actual2 = type.getInstanceFields(includeSuperclasses);
-                assertArrayEquals(actual, actual2);
+                ResolvedJavaField[] fields2 = type.getInstanceFields(includeSuperclasses);
+                assertArrayEquals(fields, fields2);
             }
         }
     }

From b8f3856389258bba7e267ac3ae275072daec31cd Mon Sep 17 00:00:00 2001
From: Doug Simon <dnsimon@openjdk.org>
Date: Fri, 21 Mar 2025 15:56:27 +0000
Subject: [PATCH 430/587] 8352420: [ubsan] codeBuffer.cpp:984:27: runtime
 error: applying non-zero offset 18446744073709486080 to null pointer

Reviewed-by: kvn, mbaesken
---
 src/hotspot/share/asm/codeBuffer.cpp | 1 +
 src/hotspot/share/asm/codeBuffer.hpp | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/hotspot/share/asm/codeBuffer.cpp b/src/hotspot/share/asm/codeBuffer.cpp
index 2aa77abc5f2..917569e2be6 100644
--- a/src/hotspot/share/asm/codeBuffer.cpp
+++ b/src/hotspot/share/asm/codeBuffer.cpp
@@ -980,6 +980,7 @@ void CodeBuffer::take_over_code_from(CodeBuffer* cb) {
 
 void CodeBuffer::verify_section_allocation() {
   address tstart = _total_start;
+  if (tstart == nullptr) return;  // ignore not fully initialized buffer
   if (tstart == badAddress)  return;  // smashed by set_blob(nullptr)
   address tend   = tstart + _total_size;
   if (_blob != nullptr) {
diff --git a/src/hotspot/share/asm/codeBuffer.hpp b/src/hotspot/share/asm/codeBuffer.hpp
index 025aa641d2c..f855d41b181 100644
--- a/src/hotspot/share/asm/codeBuffer.hpp
+++ b/src/hotspot/share/asm/codeBuffer.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -455,6 +455,8 @@ class CodeBuffer: public StackObj DEBUG_ONLY(COMMA private Scrubber) {
     _name            = name;
     _before_expand   = nullptr;
     _blob            = nullptr;
+    _total_start     = nullptr;
+    _total_size      = 0;
     _oop_recorder    = nullptr;
     _overflow_arena  = nullptr;
     _last_insn       = nullptr;

From 52c6ce6c73194762970fd9521121333713495fa3 Mon Sep 17 00:00:00 2001
From: William Kemper <wkemper@openjdk.org>
Date: Fri, 21 Mar 2025 16:04:33 +0000
Subject: [PATCH 431/587] 8352091: GenShen:
 assert(!(request.generation->is_old() &&
 _heap->old_generation()->is_doing_mixed_evacuations())) failed: Old heuristic
 should not request cycles while it waits for mixed evacuation

Reviewed-by: rkennke
---
 .../gc/shenandoah/shenandoahGenerationalControlThread.cpp      | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/hotspot/share/gc/shenandoah/shenandoahGenerationalControlThread.cpp b/src/hotspot/share/gc/shenandoah/shenandoahGenerationalControlThread.cpp
index e149272570d..e8b5bb40f0c 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahGenerationalControlThread.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahGenerationalControlThread.cpp
@@ -689,7 +689,8 @@ bool ShenandoahGenerationalControlThread::request_concurrent_gc(ShenandoahGenera
   }
 
   if (gc_mode() == none) {
-    while (gc_mode() == none) {
+    const size_t current_gc_id = get_gc_id();
+    while (gc_mode() == none && current_gc_id == get_gc_id()) {
       if (_requested_gc_cause != GCCause::_no_gc) {
         log_debug(gc, thread)("Reject request for concurrent gc because another gc is pending: %s", GCCause::to_string(_requested_gc_cause));
         return false;

From c2e14b1b304796753bea2eca81aa24ab4b3bf6db Mon Sep 17 00:00:00 2001
From: Abhishek Kumar <abhiscxk@openjdk.org>
Date: Fri, 21 Mar 2025 17:47:57 +0000
Subject: [PATCH 432/587] 8343891: Test
 javax/swing/JTabbedPane/TestJTabbedPaneBackgroundColor.java failed

Reviewed-by: aivanov, psadhukhan
---
 .../TestJTabbedPaneBackgroundColor.java       | 35 ++++++++++++-------
 1 file changed, 23 insertions(+), 12 deletions(-)

diff --git a/test/jdk/javax/swing/JTabbedPane/TestJTabbedPaneBackgroundColor.java b/test/jdk/javax/swing/JTabbedPane/TestJTabbedPaneBackgroundColor.java
index d4bed5ac2da..cc4ca41802c 100644
--- a/test/jdk/javax/swing/JTabbedPane/TestJTabbedPaneBackgroundColor.java
+++ b/test/jdk/javax/swing/JTabbedPane/TestJTabbedPaneBackgroundColor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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,9 @@ public class TestJTabbedPaneBackgroundColor {
     private static Robot robot;
     private static volatile Dimension dim;
     private static volatile Point loc;
+    private static volatile boolean isOpaque;
+    private static volatile Color c1 = null;
+    private static volatile Color c2 = null;
 
     public static void main(String[] args) throws Exception {
         robot = new Robot();
@@ -55,10 +58,12 @@ public class TestJTabbedPaneBackgroundColor {
         for (UIManager.LookAndFeelInfo laf :
                 UIManager.getInstalledLookAndFeels()) {
             System.out.println("Testing: " + laf.getName());
-            setLookAndFeel(laf);
 
             try {
-                SwingUtilities.invokeAndWait(TestJTabbedPaneBackgroundColor::createAndShowUI);
+                SwingUtilities.invokeAndWait(() -> {
+                    setLookAndFeel(laf);
+                    createAndShowUI();
+                });
                 robot.waitForIdle();
                 robot.delay(500);
 
@@ -70,10 +75,12 @@ public class TestJTabbedPaneBackgroundColor {
                 loc = new Point(loc.x + dim.width - 2, loc.y + 2);
                 doTesting(loc, laf);
 
-                if (!pane.isOpaque()) {
-                    pane.setOpaque(true);
-                    pane.repaint();
-                }
+                SwingUtilities.invokeAndWait(() -> {
+                    if (!pane.isOpaque()) {
+                        pane.setOpaque(true);
+                        pane.repaint();
+                    }
+                });
                 robot.waitForIdle();
                 robot.delay(500);
 
@@ -119,14 +126,18 @@ public class TestJTabbedPaneBackgroundColor {
         frame.setVisible(true);
     }
 
-    private static void doTesting(Point p, UIManager.LookAndFeelInfo laf) {
-        boolean isOpaque = pane.isOpaque();
+    private static void doTesting(Point p, UIManager.LookAndFeelInfo laf) throws Exception {
+        SwingUtilities.invokeAndWait(() -> {
+            isOpaque = pane.isOpaque();
+            c1 = pane.getBackground();
+            c2 = frame.getContentPane().getBackground();
+        });
         Color actual = robot.getPixelColor(p.x, p.y);
-        Color expected = isOpaque
-                ? pane.getBackground()
-                : frame.getContentPane().getBackground();
+        Color expected = isOpaque ? c1 : c2;
 
         if (!expected.equals(actual)) {
+            System.out.println("Expected Color : " + expected);
+            System.out.println("Actual Color : " + actual);
             addOpaqueError(laf.getName(), isOpaque);
         }
     }

From 22182f71ed520150b1ee05e5b788ecddfb0a6508 Mon Sep 17 00:00:00 2001
From: Vladimir Kozlov <kvn@openjdk.org>
Date: Fri, 21 Mar 2025 20:51:30 +0000
Subject: [PATCH 433/587] 8352112: [ubsan]
 hotspot/share/code/relocInfo.cpp:130:37: runtime error: applying non-zero
 offset 18446744073709551614 to null pointer

Reviewed-by: dlong, bulasevich
---
 src/hotspot/share/code/codeBlob.cpp | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/hotspot/share/code/codeBlob.cpp b/src/hotspot/share/code/codeBlob.cpp
index 79f6bf61ff1..72f0dd67a44 100644
--- a/src/hotspot/share/code/codeBlob.cpp
+++ b/src/hotspot/share/code/codeBlob.cpp
@@ -121,7 +121,7 @@ CodeBlob::CodeBlob(const char* name, CodeBlobKind kind, CodeBuffer* cb, int size
                    int mutable_data_size) :
   _oop_maps(nullptr), // will be set by set_oop_maps() call
   _name(name),
-  _mutable_data(nullptr),
+  _mutable_data(header_begin() + size), // default value is blob_end()
   _size(size),
   _relocation_size(align_up(cb->total_relocation_size(), oopSize)),
   _content_offset(CodeBlob::align_code_offset(header_size)),
@@ -151,6 +151,9 @@ CodeBlob::CodeBlob(const char* name, CodeBlobKind kind, CodeBuffer* cb, int size
     if (_mutable_data == nullptr) {
       vm_exit_out_of_memory(_mutable_data_size, OOM_MALLOC_ERROR, "codebuffer: no space for mutable data");
     }
+  } else {
+    // We need unique and valid not null address
+    assert(_mutable_data = blob_end(), "sanity");
   }
 
   set_oop_maps(oop_maps);
@@ -160,7 +163,7 @@ CodeBlob::CodeBlob(const char* name, CodeBlobKind kind, CodeBuffer* cb, int size
 CodeBlob::CodeBlob(const char* name, CodeBlobKind kind, int size, uint16_t header_size) :
   _oop_maps(nullptr),
   _name(name),
-  _mutable_data(nullptr),
+  _mutable_data(header_begin() + size), // default value is blob_end()
   _size(size),
   _relocation_size(0),
   _content_offset(CodeBlob::align_code_offset(header_size)),
@@ -175,12 +178,14 @@ CodeBlob::CodeBlob(const char* name, CodeBlobKind kind, int size, uint16_t heade
 {
   assert(is_aligned(size,            oopSize), "unaligned size");
   assert(is_aligned(header_size,     oopSize), "unaligned size");
+  assert(_mutable_data = blob_end(), "sanity");
 }
 
 void CodeBlob::purge() {
-  if (_mutable_data != nullptr) {
+  assert(_mutable_data != nullptr, "should never be null");
+  if (_mutable_data != blob_end()) {
     os::free(_mutable_data);
-    _mutable_data = nullptr;
+    _mutable_data = blob_end(); // Valid not null address
   }
   if (_oop_maps != nullptr) {
     delete _oop_maps;

From 74420391faff5614d3c9254be1fd2e764c3f0731 Mon Sep 17 00:00:00 2001
From: Shaojin Wen <swen@openjdk.org>
Date: Sat, 22 Mar 2025 01:35:09 +0000
Subject: [PATCH 434/587] 8337279: Share StringBuilder to format instant

Reviewed-by: naoto, liach
---
 .../share/classes/java/time/LocalDate.java    |  31 +---
 .../classes/java/time/LocalDateTime.java      |  13 +-
 .../share/classes/java/time/LocalTime.java    |  36 +---
 .../classes/java/time/OffsetDateTime.java     |   4 +-
 .../share/classes/java/time/OffsetTime.java   |   4 +-
 .../classes/java/time/ZonedDateTime.java      |   4 +-
 .../time/format/DateTimeFormatterBuilder.java | 105 +++++++-----
 .../jdk/internal/util/DateTimeHelper.java     | 103 ++++++++++++
 .../time/format/TCKInstantPrinterParser.java  | 154 +++++++++++++++++-
 .../bench/java/time/ToStringBench.java        |  11 +-
 10 files changed, 342 insertions(+), 123 deletions(-)
 create mode 100644 src/java.base/share/classes/jdk/internal/util/DateTimeHelper.java

diff --git a/src/java.base/share/classes/java/time/LocalDate.java b/src/java.base/share/classes/java/time/LocalDate.java
index caf6ccd6641..13478530301 100644
--- a/src/java.base/share/classes/java/time/LocalDate.java
+++ b/src/java.base/share/classes/java/time/LocalDate.java
@@ -103,6 +103,8 @@ import java.util.Objects;
 import java.util.stream.LongStream;
 import java.util.stream.Stream;
 
+import jdk.internal.util.DateTimeHelper;
+
 /**
  * A date without a time-zone in the ISO-8601 calendar system,
  * such as {@code 2007-12-03}.
@@ -2148,37 +2150,10 @@ public final class LocalDate
     @Override
     public String toString() {
         var buf = new StringBuilder(10);
-        formatTo(buf);
+        DateTimeHelper.formatTo(buf, this);
         return buf.toString();
     }
 
-    /**
-     * Prints the toString result to the given buf, avoiding extra string allocations.
-     * Requires extra capacity of 10 to avoid StringBuilder reallocation.
-     */
-    void formatTo(StringBuilder buf) {
-        int yearValue = year;
-        int monthValue = month;
-        int dayValue = day;
-        int absYear = Math.abs(yearValue);
-        if (absYear < 1000) {
-            if (yearValue < 0) {
-                buf.append('-');
-            }
-            buf.repeat('0', absYear < 10 ? 3 : absYear < 100 ? 2 : 1);
-            buf.append(absYear);
-        } else {
-            if (yearValue > 9999) {
-                buf.append('+');
-            }
-            buf.append(yearValue);
-        }
-        buf.append(monthValue < 10 ? "-0" : "-")
-           .append(monthValue)
-           .append(dayValue < 10 ? "-0" : "-")
-           .append(dayValue);
-    }
-
     //-----------------------------------------------------------------------
     /**
      * Writes the object using a
diff --git a/src/java.base/share/classes/java/time/LocalDateTime.java b/src/java.base/share/classes/java/time/LocalDateTime.java
index f8c814957dc..37932fe7a65 100644
--- a/src/java.base/share/classes/java/time/LocalDateTime.java
+++ b/src/java.base/share/classes/java/time/LocalDateTime.java
@@ -96,6 +96,8 @@ import java.time.temporal.ValueRange;
 import java.time.zone.ZoneRules;
 import java.util.Objects;
 
+import jdk.internal.util.DateTimeHelper;
+
 /**
  * A date-time without a time-zone in the ISO-8601 calendar system,
  * such as {@code 2007-12-03T10:15:30}.
@@ -1966,18 +1968,10 @@ public final class LocalDateTime
     @Override
     public String toString() {
         var buf = new StringBuilder(29);
-        formatTo(buf);
+        DateTimeHelper.formatTo(buf, this);
         return buf.toString();
     }
 
-    /**
-     * Prints the toString result to the given buf, avoiding extra string allocations.
-     */
-    void formatTo(StringBuilder buf) {
-        date.formatTo(buf);
-        buf.append('T');
-        time.formatTo(buf);
-    }
 
     //-----------------------------------------------------------------------
     /**
@@ -2018,5 +2012,4 @@ public final class LocalDateTime
         LocalTime time = LocalTime.readExternal(in);
         return LocalDateTime.of(date, time);
     }
-
 }
diff --git a/src/java.base/share/classes/java/time/LocalTime.java b/src/java.base/share/classes/java/time/LocalTime.java
index 06f408350ca..de2669752ec 100644
--- a/src/java.base/share/classes/java/time/LocalTime.java
+++ b/src/java.base/share/classes/java/time/LocalTime.java
@@ -92,7 +92,7 @@ import java.time.temporal.UnsupportedTemporalTypeException;
 import java.time.temporal.ValueRange;
 import java.util.Objects;
 
-import jdk.internal.util.DecimalDigits;
+import jdk.internal.util.DateTimeHelper;
 
 /**
  * A time without a time-zone in the ISO-8601 calendar system,
@@ -1632,42 +1632,10 @@ public final class LocalTime
     @Override
     public String toString() {
         var buf = new StringBuilder(18);
-        formatTo(buf);
+        DateTimeHelper.formatTo(buf, this);
         return buf.toString();
     }
 
-    /**
-     * Prints the toString result to the given buf, avoiding extra string allocations.
-     * Requires extra capacity of 18 to avoid StringBuilder reallocation.
-     */
-    void formatTo(StringBuilder buf) {
-        int hourValue = hour;
-        int minuteValue = minute;
-        int secondValue = second;
-        int nanoValue = nano;
-        buf.append(hourValue < 10 ? "0" : "").append(hourValue)
-            .append(minuteValue < 10 ? ":0" : ":").append(minuteValue);
-        if (secondValue > 0 || nanoValue > 0) {
-            buf.append(secondValue < 10 ? ":0" : ":").append(secondValue);
-            if (nanoValue > 0) {
-                buf.append('.');
-                int zeros = 9 - DecimalDigits.stringSize(nanoValue);
-                if (zeros > 0) {
-                    buf.repeat('0', zeros);
-                }
-                int digits;
-                if (nanoValue % 1_000_000 == 0) {
-                    digits = nanoValue / 1_000_000;
-                } else if (nanoValue % 1000 == 0) {
-                    digits = nanoValue / 1000;
-                } else {
-                    digits = nanoValue;
-                }
-                buf.append(digits);
-            }
-        }
-    }
-
     //-----------------------------------------------------------------------
     /**
      * Writes the object using a
diff --git a/src/java.base/share/classes/java/time/OffsetDateTime.java b/src/java.base/share/classes/java/time/OffsetDateTime.java
index 6f7005b9fa4..62ff8f23a15 100644
--- a/src/java.base/share/classes/java/time/OffsetDateTime.java
+++ b/src/java.base/share/classes/java/time/OffsetDateTime.java
@@ -93,6 +93,8 @@ import java.time.zone.ZoneRules;
 import java.util.Comparator;
 import java.util.Objects;
 
+import jdk.internal.util.DateTimeHelper;
+
 /**
  * A date-time with an offset from UTC/Greenwich in the ISO-8601 calendar system,
  * such as {@code 2007-12-03T10:15:30+01:00}.
@@ -1925,7 +1927,7 @@ public final class OffsetDateTime
     public String toString() {
         var offsetStr = offset.toString();
         var buf = new StringBuilder(29 + offsetStr.length());
-        dateTime.formatTo(buf);
+        DateTimeHelper.formatTo(buf, dateTime);
         return buf.append(offsetStr).toString();
     }
 
diff --git a/src/java.base/share/classes/java/time/OffsetTime.java b/src/java.base/share/classes/java/time/OffsetTime.java
index ad9781e2459..831043c47df 100644
--- a/src/java.base/share/classes/java/time/OffsetTime.java
+++ b/src/java.base/share/classes/java/time/OffsetTime.java
@@ -92,6 +92,8 @@ import java.time.temporal.ValueRange;
 import java.time.zone.ZoneRules;
 import java.util.Objects;
 
+import jdk.internal.util.DateTimeHelper;
+
 /**
  * A time with an offset from UTC/Greenwich in the ISO-8601 calendar system,
  * such as {@code 10:15:30+01:00}.
@@ -1400,7 +1402,7 @@ public final class OffsetTime
     public String toString() {
         var offsetStr = offset.toString();
         var buf = new StringBuilder(18 + offsetStr.length());
-        time.formatTo(buf);
+        DateTimeHelper.formatTo(buf, time);
         return buf.append(offsetStr).toString();
     }
 
diff --git a/src/java.base/share/classes/java/time/ZonedDateTime.java b/src/java.base/share/classes/java/time/ZonedDateTime.java
index 135d1a16ae7..962469b3225 100644
--- a/src/java.base/share/classes/java/time/ZonedDateTime.java
+++ b/src/java.base/share/classes/java/time/ZonedDateTime.java
@@ -91,6 +91,8 @@ import java.time.zone.ZoneRules;
 import java.util.List;
 import java.util.Objects;
 
+import jdk.internal.util.DateTimeHelper;
+
 /**
  * A date-time with a time-zone in the ISO-8601 calendar system,
  * such as {@code 2007-12-03T10:15:30+01:00 Europe/Paris}.
@@ -2222,7 +2224,7 @@ public final class ZonedDateTime
             length += zoneStr.length() + 2;
         }
         var buf = new StringBuilder(length);
-        dateTime.formatTo(buf);
+        DateTimeHelper.formatTo(buf, dateTime);
         buf.append(offsetStr);
         if (zoneStr != null) {
             buf.append('[').append(zoneStr).append(']');
diff --git a/src/java.base/share/classes/java/time/format/DateTimeFormatterBuilder.java b/src/java.base/share/classes/java/time/format/DateTimeFormatterBuilder.java
index 7c83de46c52..f5eeeec563c 100644
--- a/src/java.base/share/classes/java/time/format/DateTimeFormatterBuilder.java
+++ b/src/java.base/share/classes/java/time/format/DateTimeFormatterBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -121,6 +121,7 @@ import java.util.concurrent.ConcurrentMap;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
+import jdk.internal.util.DateTimeHelper;
 import jdk.internal.util.DecimalDigits;
 
 import sun.text.spi.JavaTimeDateTimePatternProvider;
@@ -161,7 +162,6 @@ import sun.util.locale.provider.TimeZoneNameUtility;
  * @since 1.8
  */
 public final class DateTimeFormatterBuilder {
-
     /**
      * Query for a time-zone that is region-only.
      */
@@ -3809,58 +3809,73 @@ public final class DateTimeFormatterBuilder {
             }
             long inSec = inSecs;
             int inNano = NANO_OF_SECOND.checkValidIntValue(inNanos != null ? inNanos : 0);
-            // format mostly using LocalDateTime.toString
+            if (fractionalDigits == 0) {
+                inNano = 0;
+            }
+            boolean printNanoInLocalDateTime = fractionalDigits == -2
+                    || (inNano == 0 && (fractionalDigits == 0 || fractionalDigits == -1));
             if (inSec >= -SECONDS_0000_TO_1970) {
-                // current era
-                long zeroSecs = inSec - SECONDS_PER_10000_YEARS + SECONDS_0000_TO_1970;
-                long hi = Math.floorDiv(zeroSecs, SECONDS_PER_10000_YEARS) + 1;
-                long lo = Math.floorMod(zeroSecs, SECONDS_PER_10000_YEARS);
-                LocalDateTime ldt = LocalDateTime.ofEpochSecond(lo - SECONDS_0000_TO_1970, 0, ZoneOffset.UTC);
-                if (hi > 0) {
-                    buf.append('+').append(hi);
-                }
-                buf.append(ldt);
-                if (ldt.getSecond() == 0) {
-                    buf.append(":00");
-                }
+                currentEra(buf, inSec, printNanoInLocalDateTime ? inNano : 0);
             } else {
-                // before current era
-                long zeroSecs = inSec + SECONDS_0000_TO_1970;
-                long hi = zeroSecs / SECONDS_PER_10000_YEARS;
-                long lo = zeroSecs % SECONDS_PER_10000_YEARS;
-                LocalDateTime ldt = LocalDateTime.ofEpochSecond(lo - SECONDS_0000_TO_1970, 0, ZoneOffset.UTC);
-                int pos = buf.length();
-                buf.append(ldt);
-                if (ldt.getSecond() == 0) {
-                    buf.append(":00");
-                }
-                if (hi < 0) {
-                    if (ldt.getYear() == -10_000) {
-                        buf.replace(pos, pos + 2, Long.toString(hi - 1));
-                    } else if (lo == 0) {
-                        buf.insert(pos, hi);
-                    } else {
-                        buf.insert(pos + 1, Math.abs(hi));
-                    }
-                }
+                beforeCurrentEra(buf, inSec, printNanoInLocalDateTime ? inNano : 0);
             }
             // add fraction
-            if ((fractionalDigits < 0 && inNano > 0) || fractionalDigits > 0) {
-                buf.append('.');
-                int div = 100_000_000;
-                for (int i = 0; ((fractionalDigits == -1 && inNano > 0) ||
-                                    (fractionalDigits == -2 && (inNano > 0 || (i % 3) != 0)) ||
-                                    i < fractionalDigits); i++) {
-                    int digit = inNano / div;
-                    buf.append((char) (digit + '0'));
-                    inNano = inNano - (digit * div);
-                    div = div / 10;
-                }
+            if (!printNanoInLocalDateTime) {
+                printNano(buf, inSec, inNano);
             }
             buf.append('Z');
             return true;
         }
 
+        private void printNano(StringBuilder buf, long inSec, int inNano) {
+            buf.append('.');
+            int div = 100_000_000;
+            int fractionalDigits = this.fractionalDigits;
+            for (int i = 0; ((fractionalDigits == -1 && inNano > 0) ||
+                    (fractionalDigits == -2 && (inNano > 0 || (i % 3) != 0)) ||
+                    i < fractionalDigits); i++) {
+                int digit = inNano / div;
+                buf.append((char) (digit + '0'));
+                inNano = inNano - (digit * div);
+                div = div / 10;
+            }
+        }
+
+        private static void currentEra(StringBuilder buf, long inSec, int inNano) {
+            long zeroSecs = inSec - SECONDS_PER_10000_YEARS + SECONDS_0000_TO_1970;
+            long hi = Math.floorDiv(zeroSecs, SECONDS_PER_10000_YEARS) + 1;
+            long lo = Math.floorMod(zeroSecs, SECONDS_PER_10000_YEARS);
+            LocalDateTime ldt = LocalDateTime.ofEpochSecond(lo - SECONDS_0000_TO_1970, inNano, ZoneOffset.UTC);
+            if (hi > 0) {
+                buf.append('+').append(hi);
+            }
+            DateTimeHelper.formatTo(buf, ldt);
+            if (ldt.getSecond() == 0 && inNano == 0) {
+                buf.append(":00");
+            }
+        }
+
+        private static void beforeCurrentEra(StringBuilder buf, long inSec, int inNano) {
+            long zeroSecs = inSec + SECONDS_0000_TO_1970;
+            long hi = zeroSecs / SECONDS_PER_10000_YEARS;
+            long lo = zeroSecs % SECONDS_PER_10000_YEARS;
+            LocalDateTime ldt = LocalDateTime.ofEpochSecond(lo - SECONDS_0000_TO_1970, inNano, ZoneOffset.UTC);
+            int pos = buf.length();
+            DateTimeHelper.formatTo(buf, ldt);
+            if (ldt.getSecond() == 0 && inNano == 0) {
+                buf.append(":00");
+            }
+            if (hi < 0) {
+                if (ldt.getYear() == -10_000) {
+                    buf.replace(pos, pos + 2, Long.toString(hi - 1));
+                } else if (lo == 0) {
+                    buf.insert(pos, hi);
+                } else {
+                    buf.insert(pos + 1, Math.abs(hi));
+                }
+            }
+        }
+
         @Override
         public int parse(DateTimeParseContext context, CharSequence text, int position) {
             // new context to avoid overwriting fields like year/month/day
diff --git a/src/java.base/share/classes/jdk/internal/util/DateTimeHelper.java b/src/java.base/share/classes/jdk/internal/util/DateTimeHelper.java
new file mode 100644
index 00000000000..bbb0b6738d1
--- /dev/null
+++ b/src/java.base/share/classes/jdk/internal/util/DateTimeHelper.java
@@ -0,0 +1,103 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2025, Alibaba Group Holding Limited. All Rights Reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package jdk.internal.util;
+
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+
+/**
+ * Helper for java.time
+ */
+public final class DateTimeHelper {
+    private DateTimeHelper() {
+    }
+    /**
+     * Prints the toString result to the given buf, avoiding extra string allocations.
+     */
+    public static void formatTo(StringBuilder buf, LocalDateTime dateTime) {
+        DateTimeHelper.formatTo(buf, dateTime.toLocalDate());
+        buf.append('T');
+        DateTimeHelper.formatTo(buf, dateTime.toLocalTime());
+    }
+
+    /**
+     * Prints the toString result to the given buf, avoiding extra string allocations.
+     * Requires extra capacity of 10 to avoid StringBuilder reallocation.
+     */
+    public static void formatTo(StringBuilder buf, LocalDate date) {
+        int year  = date.getYear(),
+            month = date.getMonthValue(),
+            day   = date.getDayOfMonth();
+        int absYear = Math.abs(year);
+        if (absYear < 1000) {
+            if (year < 0) {
+                buf.append('-');
+            }
+            buf.repeat('0', absYear < 10 ? 3 : absYear < 100 ? 2 : 1);
+            buf.append(absYear);
+        } else {
+            if (year > 9999) {
+                buf.append('+');
+            }
+            buf.append(year);
+        }
+        buf.append(month < 10 ? "-0" : "-").append(month)
+           .append(day < 10 ? "-0" : "-").append(day);
+    }
+
+    /**
+     * Prints the toString result to the given buf, avoiding extra string allocations.
+     * Requires extra capacity of 18 to avoid StringBuilder reallocation.
+     */
+    public static void formatTo(StringBuilder buf, LocalTime time) {
+        int hour   = time.getHour(),
+            minute = time.getMinute(),
+            second = time.getSecond(),
+            nano   = time.getNano();
+        buf.append(hour < 10 ? "0" : "").append(hour)
+           .append(minute < 10 ? ":0" : ":").append(minute);
+        if ((second | nano) > 0) {
+            buf.append(second < 10 ? ":0" : ":").append(second);
+            if (nano > 0) {
+                buf.append('.');
+                int zeros = 9 - DecimalDigits.stringSize(nano);
+                if (zeros > 0) {
+                    buf.repeat('0', zeros);
+                }
+                int digits;
+                if (nano % 1_000_000 == 0) {
+                    digits = nano / 1_000_000;
+                } else if (nano % 1000 == 0) {
+                    digits = nano / 1000;
+                } else {
+                    digits = nano;
+                }
+                buf.append(digits);
+            }
+        }
+    }
+}
diff --git a/test/jdk/java/time/tck/java/time/format/TCKInstantPrinterParser.java b/test/jdk/java/time/tck/java/time/format/TCKInstantPrinterParser.java
index 4c8c55f9e0c..49b772bf82b 100644
--- a/test/jdk/java/time/tck/java/time/format/TCKInstantPrinterParser.java
+++ b/test/jdk/java/time/tck/java/time/format/TCKInstantPrinterParser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -311,6 +311,158 @@ public class TCKInstantPrinterParser {
         }
     }
 
+    @Test
+    public void test_print_instant() {
+        DateTimeFormatter formatter = new DateTimeFormatterBuilder().appendInstant().toFormatter();
+        DateTimeFormatter formatter0 = new DateTimeFormatterBuilder().appendInstant(0).toFormatter();
+        DateTimeFormatter formatter1 = new DateTimeFormatterBuilder().appendInstant(1).toFormatter();
+        DateTimeFormatter formatter2 = new DateTimeFormatterBuilder().appendInstant(2).toFormatter();
+        DateTimeFormatter formatter3 = new DateTimeFormatterBuilder().appendInstant(3).toFormatter();
+        DateTimeFormatter formatter4 = new DateTimeFormatterBuilder().appendInstant(4).toFormatter();
+        DateTimeFormatter formatter5 = new DateTimeFormatterBuilder().appendInstant(5).toFormatter();
+        DateTimeFormatter formatter6 = new DateTimeFormatterBuilder().appendInstant(6).toFormatter();
+        DateTimeFormatter formatter7 = new DateTimeFormatterBuilder().appendInstant(7).toFormatter();
+        DateTimeFormatter formatter8 = new DateTimeFormatterBuilder().appendInstant(8).toFormatter();
+        DateTimeFormatter formatter9 = new DateTimeFormatterBuilder().appendInstant(9).toFormatter();
+        DateTimeFormatter formatterN1 = new DateTimeFormatterBuilder().appendInstant(-1).toFormatter();
+
+        {
+            Instant instant = Instant.ofEpochSecond(1111721337984L, 1);
+            assertEquals("+37199-01-18T02:46:24.000000001Z", formatter.format(instant));
+            assertEquals("+37199-01-18T02:46:24Z", formatter0.format(instant));
+            assertEquals("+37199-01-18T02:46:24.0Z", formatter1.format(instant));
+            assertEquals("+37199-01-18T02:46:24.00Z", formatter2.format(instant));
+            assertEquals("+37199-01-18T02:46:24.000Z", formatter3.format(instant));
+            assertEquals("+37199-01-18T02:46:24.0000Z", formatter4.format(instant));
+            assertEquals("+37199-01-18T02:46:24.00000Z", formatter5.format(instant));
+            assertEquals("+37199-01-18T02:46:24.000000Z", formatter6.format(instant));
+            assertEquals("+37199-01-18T02:46:24.0000000Z", formatter7.format(instant));
+            assertEquals("+37199-01-18T02:46:24.00000000Z", formatter8.format(instant));
+            assertEquals("+37199-01-18T02:46:24.000000001Z", formatter9.format(instant));
+            assertEquals("+37199-01-18T02:46:24.000000001Z", formatterN1.format(instant));
+        }
+        {
+            Instant instant = Instant.ofEpochSecond(1111721337984L, 10);
+            assertEquals("+37199-01-18T02:46:24.000000010Z", formatter.format(instant));
+            assertEquals("+37199-01-18T02:46:24Z", formatter0.format(instant));
+            assertEquals("+37199-01-18T02:46:24.0Z", formatter1.format(instant));
+            assertEquals("+37199-01-18T02:46:24.00Z", formatter2.format(instant));
+            assertEquals("+37199-01-18T02:46:24.000Z", formatter3.format(instant));
+            assertEquals("+37199-01-18T02:46:24.0000Z", formatter4.format(instant));
+            assertEquals("+37199-01-18T02:46:24.00000Z", formatter5.format(instant));
+            assertEquals("+37199-01-18T02:46:24.000000Z", formatter6.format(instant));
+            assertEquals("+37199-01-18T02:46:24.0000000Z", formatter7.format(instant));
+            assertEquals("+37199-01-18T02:46:24.00000001Z", formatter8.format(instant));
+            assertEquals("+37199-01-18T02:46:24.000000010Z", formatter9.format(instant));
+            assertEquals("+37199-01-18T02:46:24.00000001Z", formatterN1.format(instant));
+        }
+        {
+            Instant instant = Instant.ofEpochSecond(1111721337984L, 100);
+            assertEquals("+37199-01-18T02:46:24.000000100Z", formatter.format(instant));
+            assertEquals("+37199-01-18T02:46:24Z", formatter0.format(instant));
+            assertEquals("+37199-01-18T02:46:24.0Z", formatter1.format(instant));
+            assertEquals("+37199-01-18T02:46:24.00Z", formatter2.format(instant));
+            assertEquals("+37199-01-18T02:46:24.000Z", formatter3.format(instant));
+            assertEquals("+37199-01-18T02:46:24.0000Z", formatter4.format(instant));
+            assertEquals("+37199-01-18T02:46:24.00000Z", formatter5.format(instant));
+            assertEquals("+37199-01-18T02:46:24.000000Z", formatter6.format(instant));
+            assertEquals("+37199-01-18T02:46:24.0000001Z", formatter7.format(instant));
+            assertEquals("+37199-01-18T02:46:24.00000010Z", formatter8.format(instant));
+            assertEquals("+37199-01-18T02:46:24.000000100Z", formatter9.format(instant));
+            assertEquals("+37199-01-18T02:46:24.0000001Z", formatterN1.format(instant));
+        }
+        {
+            Instant instant = Instant.ofEpochSecond(1111721337984L, 1_000);
+            assertEquals("+37199-01-18T02:46:24.000001Z", formatter.format(instant));
+            assertEquals("+37199-01-18T02:46:24Z", formatter0.format(instant));
+            assertEquals("+37199-01-18T02:46:24.0Z", formatter1.format(instant));
+            assertEquals("+37199-01-18T02:46:24.00Z", formatter2.format(instant));
+            assertEquals("+37199-01-18T02:46:24.000Z", formatter3.format(instant));
+            assertEquals("+37199-01-18T02:46:24.0000Z", formatter4.format(instant));
+            assertEquals("+37199-01-18T02:46:24.00000Z", formatter5.format(instant));
+            assertEquals("+37199-01-18T02:46:24.000001Z", formatter6.format(instant));
+            assertEquals("+37199-01-18T02:46:24.0000010Z", formatter7.format(instant));
+            assertEquals("+37199-01-18T02:46:24.00000100Z", formatter8.format(instant));
+            assertEquals("+37199-01-18T02:46:24.000001000Z", formatter9.format(instant));
+            assertEquals("+37199-01-18T02:46:24.000001Z", formatterN1.format(instant));
+        }
+        {
+            Instant instant = Instant.ofEpochSecond(1721337984L, 10_000);
+            assertEquals("2024-07-18T21:26:24.000010Z", formatter.format(instant));
+            assertEquals("2024-07-18T21:26:24Z", formatter0.format(instant));
+            assertEquals("2024-07-18T21:26:24.0Z", formatter1.format(instant));
+            assertEquals("2024-07-18T21:26:24.00Z", formatter2.format(instant));
+            assertEquals("2024-07-18T21:26:24.000Z", formatter3.format(instant));
+            assertEquals("2024-07-18T21:26:24.0000Z", formatter4.format(instant));
+            assertEquals("2024-07-18T21:26:24.00001Z", formatter5.format(instant));
+            assertEquals("2024-07-18T21:26:24.000010Z", formatter6.format(instant));
+            assertEquals("2024-07-18T21:26:24.0000100Z", formatter7.format(instant));
+            assertEquals("2024-07-18T21:26:24.00001000Z", formatter8.format(instant));
+            assertEquals("2024-07-18T21:26:24.000010000Z", formatter9.format(instant));
+            assertEquals("2024-07-18T21:26:24.00001Z", formatterN1.format(instant));
+        }
+        {
+            Instant instant = Instant.ofEpochSecond(-1721337984L, 100_000);
+            assertEquals("1915-06-16T02:33:36.000100Z", formatter.format(instant));
+            assertEquals("1915-06-16T02:33:36Z", formatter0.format(instant));
+            assertEquals("1915-06-16T02:33:36.0Z", formatter1.format(instant));
+            assertEquals("1915-06-16T02:33:36.00Z", formatter2.format(instant));
+            assertEquals("1915-06-16T02:33:36.000Z", formatter3.format(instant));
+            assertEquals("1915-06-16T02:33:36.0001Z", formatter4.format(instant));
+            assertEquals("1915-06-16T02:33:36.00010Z", formatter5.format(instant));
+            assertEquals("1915-06-16T02:33:36.000100Z", formatter6.format(instant));
+            assertEquals("1915-06-16T02:33:36.0001000Z", formatter7.format(instant));
+            assertEquals("1915-06-16T02:33:36.00010000Z", formatter8.format(instant));
+            assertEquals("1915-06-16T02:33:36.000100000Z", formatter9.format(instant));
+            assertEquals("1915-06-16T02:33:36.0001Z", formatterN1.format(instant));
+        }
+        {
+            Instant instant = Instant.ofEpochSecond(-51721337984L, 1_000_000);
+            assertEquals("0331-01-07T09:40:16.001Z", formatter.format(instant));
+            assertEquals("0331-01-07T09:40:16Z", formatter0.format(instant));
+            assertEquals("0331-01-07T09:40:16.0Z", formatter1.format(instant));
+            assertEquals("0331-01-07T09:40:16.00Z", formatter2.format(instant));
+            assertEquals("0331-01-07T09:40:16.001Z", formatter3.format(instant));
+            assertEquals("0331-01-07T09:40:16.0010Z", formatter4.format(instant));
+            assertEquals("0331-01-07T09:40:16.00100Z", formatter5.format(instant));
+            assertEquals("0331-01-07T09:40:16.001000Z", formatter6.format(instant));
+            assertEquals("0331-01-07T09:40:16.0010000Z", formatter7.format(instant));
+            assertEquals("0331-01-07T09:40:16.00100000Z", formatter8.format(instant));
+            assertEquals("0331-01-07T09:40:16.001000000Z", formatter9.format(instant));
+            assertEquals("0331-01-07T09:40:16.001Z", formatterN1.format(instant));
+        }
+        {
+            Instant instant = Instant.ofEpochSecond(11337984L, 100_000_000);
+            assertEquals("1970-05-12T05:26:24.100Z", formatter.format(instant));
+            assertEquals("1970-05-12T05:26:24Z", formatter0.format(instant));
+            assertEquals("1970-05-12T05:26:24.1Z", formatter1.format(instant));
+            assertEquals("1970-05-12T05:26:24.10Z", formatter2.format(instant));
+            assertEquals("1970-05-12T05:26:24.100Z", formatter3.format(instant));
+            assertEquals("1970-05-12T05:26:24.1000Z", formatter4.format(instant));
+            assertEquals("1970-05-12T05:26:24.10000Z", formatter5.format(instant));
+            assertEquals("1970-05-12T05:26:24.100000Z", formatter6.format(instant));
+            assertEquals("1970-05-12T05:26:24.1000000Z", formatter7.format(instant));
+            assertEquals("1970-05-12T05:26:24.10000000Z", formatter8.format(instant));
+            assertEquals("1970-05-12T05:26:24.100000000Z", formatter9.format(instant));
+            assertEquals("1970-05-12T05:26:24.1Z", formatterN1.format(instant));
+        }
+        {
+            Instant instant = Instant.MAX;
+            assertEquals("+1000000000-12-31T23:59:59.999999999Z", formatter.format(instant));
+            assertEquals("+1000000000-12-31T23:59:59Z", formatter0.format(instant));
+            assertEquals("+1000000000-12-31T23:59:59.9Z", formatter1.format(instant));
+            assertEquals("+1000000000-12-31T23:59:59.99Z", formatter2.format(instant));
+            assertEquals("+1000000000-12-31T23:59:59.999Z", formatter3.format(instant));
+            assertEquals("+1000000000-12-31T23:59:59.9999Z", formatter4.format(instant));
+            assertEquals("+1000000000-12-31T23:59:59.99999Z", formatter5.format(instant));
+            assertEquals("+1000000000-12-31T23:59:59.999999Z", formatter6.format(instant));
+            assertEquals("+1000000000-12-31T23:59:59.9999999Z", formatter7.format(instant));
+            assertEquals("+1000000000-12-31T23:59:59.99999999Z", formatter8.format(instant));
+            assertEquals("+1000000000-12-31T23:59:59.999999999Z", formatter9.format(instant));
+            assertEquals("+1000000000-12-31T23:59:59.999999999Z", formatterN1.format(instant));
+        }
+    }
+
     //-----------------------------------------------------------------------
     @Test(expectedExceptions=IllegalArgumentException.class)
     public void test_appendInstant_tooSmall() {
diff --git a/test/micro/org/openjdk/bench/java/time/ToStringBench.java b/test/micro/org/openjdk/bench/java/time/ToStringBench.java
index 3d62e21ba8f..13f713b86c8 100644
--- a/test/micro/org/openjdk/bench/java/time/ToStringBench.java
+++ b/test/micro/org/openjdk/bench/java/time/ToStringBench.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024, Alibaba Group Holding Limited. All Rights Reserved.
+ * Copyright (c) 2025, Alibaba Group Holding Limited. All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -121,4 +121,11 @@ public class ToStringBench {
             bh.consume(localTime.toString());
         }
     }
-}
\ No newline at end of file
+
+    @Benchmark
+    public void instantToString(Blackhole bh) {
+        for (Instant instant : INSTANTS) {
+            bh.consume(instant.toString());
+        }
+    }
+}

From 334a1eec2375a4f9f3150bdb556c1c2432596b4b Mon Sep 17 00:00:00 2001
From: Leonid Mesnik <lmesnik@openjdk.org>
Date: Sat, 22 Mar 2025 01:59:59 +0000
Subject: [PATCH 435/587] 8351375: nsk/jvmti/ tests should fail when 
 nsk_jvmti_setFailStatus() is called

Reviewed-by: sspitsyn, cjplummer
---
 .../redefclass029/redefclass029.cpp           | 12 ++++++-
 .../events/EM04/em04t001/em04t001.cpp         | 34 ++++++++-----------
 .../multienv/MA10/ma10t006/ma10t006.cpp       | 11 +++++-
 .../nsk/share/jvmti/agent_tools.cpp           |  6 +++-
 .../nsk/share/jvmti/hotswap/HotSwap.cpp       | 12 ++++++-
 5 files changed, 51 insertions(+), 24 deletions(-)

diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass029/redefclass029.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass029/redefclass029.cpp
index d2b4b720c55..bb867b3d2b4 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass029/redefclass029.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass029/redefclass029.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -97,6 +97,16 @@ CompiledMethodLoad(jvmtiEnv *jvmti_env, jmethodID method, jint code_size,
         const void* compile_info) {
     char *name;
     char *sig;
+    jvmtiPhase phase;
+
+    if (!NSK_JVMTI_VERIFY(jvmti_env->GetPhase(&phase))) {
+        nsk_jvmti_setFailStatus();
+        return;
+    }
+    if (phase == JVMTI_PHASE_DEAD) {
+      NSK_DISPLAY0("CompiledMethodLoad event recieved in dead phase");
+      return;
+    }
 
     NSK_DISPLAY0("CompiledMethodLoad event received for:\n");
     if (!NSK_JVMTI_VERIFY(jvmti_env->GetMethodName(method, &name, &sig, nullptr))) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM04/em04t001/em04t001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM04/em04t001/em04t001.cpp
index a7244db3441..ca1e5ddb7db 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM04/em04t001/em04t001.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM04/em04t001/em04t001.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -116,6 +116,18 @@ cbDynamicCodeGenerated2(jvmtiEnv *jvmti_env, const char *name,
     NSK_DISPLAY3("NOT FOUND: 0x%p %7d %s\n", address, length, name);
     jvmti->RawMonitorExit(syncLock);
 
+}
+
+ void JNICALL
+cbVMDeath(jvmtiEnv* jvmti, JNIEnv* jni_env) {
+    if (!NSK_VERIFY(nsk_list_destroy(plist))) {
+        nsk_jvmti_setFailStatus();
+    }
+
+    if (!NSK_JVMTI_VERIFY(jvmti->DestroyRawMonitor(syncLock))) {
+        nsk_jvmti_setFailStatus();
+    }
+
 }
 
 /* ============================================================================= */
@@ -135,6 +147,7 @@ int setCallBacks(int stage) {
     jvmtiEventCallbacks eventCallbacks;
     memset(&eventCallbacks, 0, sizeof(eventCallbacks));
 
+    eventCallbacks.VMDeath = cbVMDeath;
     eventCallbacks.DynamicCodeGenerated = (stage == 1) ?
                             cbDynamicCodeGenerated1 : cbDynamicCodeGenerated2;
 
@@ -242,23 +255,4 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) {
     return JNI_OK;
 }
 
-/* ============================================================================= */
-
-JNIEXPORT void JNICALL
-#ifdef STATIC_BUILD
-Agent_OnUnload_em04t001(JavaVM *jvm)
-#else
-Agent_OnUnload(JavaVM *jvm)
-#endif
-{
-
-    if (!NSK_VERIFY(nsk_list_destroy(plist))) {
-        nsk_jvmti_setFailStatus();
-    }
-
-    if (!NSK_JVMTI_VERIFY(jvmti->DestroyRawMonitor(syncLock))) {
-        nsk_jvmti_setFailStatus();
-    }
-}
-
 }
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA10/ma10t006/ma10t006.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA10/ma10t006/ma10t006.cpp
index 2c6a186656e..c25f19b5f93 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA10/ma10t006/ma10t006.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA10/ma10t006/ma10t006.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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,9 +51,18 @@ CompiledMethodLoad(jvmtiEnv *jvmti_env, jmethodID method,
         const jvmtiAddrLocationMap* map, const void* compile_info) {
     char *name = nullptr;
     char *signature = nullptr;
+    jvmtiPhase phase;
 
     CompiledMethodLoadEventsCount++;
 
+    if (!NSK_JVMTI_VERIFY(jvmti_env->GetPhase(&phase))) {
+        nsk_jvmti_setFailStatus();
+        return;
+    }
+    if (phase == JVMTI_PHASE_DEAD) {
+      NSK_DISPLAY0("CompiledMethodLoad event recieved in dead phase");
+      return;
+    }
     if (!NSK_JVMTI_VERIFY(jvmti_env->GetMethodName(method, &name, &signature, nullptr))) {
         nsk_jvmti_setFailStatus();
         return;
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/share/jvmti/agent_tools.cpp b/test/hotspot/jtreg/vmTestbase/nsk/share/jvmti/agent_tools.cpp
index 0b43e5ac782..ae2fb040dde 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/share/jvmti/agent_tools.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/share/jvmti/agent_tools.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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.
  */
 
+#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
@@ -62,6 +63,9 @@ static volatile int currentAgentStatus = NSK_STATUS_PASSED;
 
 void nsk_jvmti_setFailStatus() {
     currentAgentStatus = NSK_STATUS_FAILED;
+    printf("Test failed by setFailStatus(). See log.");
+    fflush(stdout);
+    exit(97);
 }
 
 int nsk_jvmti_isFailStatus() {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/share/jvmti/hotswap/HotSwap.cpp b/test/hotspot/jtreg/vmTestbase/nsk/share/jvmti/hotswap/HotSwap.cpp
index b47be9bb74a..97105b6b9f0 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/share/jvmti/hotswap/HotSwap.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/share/jvmti/hotswap/HotSwap.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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,9 +141,19 @@ CompiledMethodLoad(jvmtiEnv *jvmti_env, jmethodID method,
         const jvmtiAddrLocationMap* map, const void* compile_info) {
     char *name = nullptr;
     char *signature = nullptr;
+    jvmtiPhase phase;
 
     CompiledMethodLoadEventsCount++;
 
+    // GetMethodName works in live phase only so just exit if the event is generated too late
+    if (!NSK_JVMTI_VERIFY(jvmti_env->GetPhase(&phase))) {
+        nsk_jvmti_setFailStatus();
+        return;
+    }
+    if (phase == JVMTI_PHASE_DEAD) {
+      NSK_DISPLAY0("CompiledMethodLoad event recieved in dead phase");
+      return;
+    }
     if (!NSK_JVMTI_VERIFY(jvmti_env->GetMethodName(method, &name, &signature, nullptr))) {
         nsk_jvmti_setFailStatus();
         return;

From 5dd0acb3cddb96845062c0b7cee1e384e69f43cb Mon Sep 17 00:00:00 2001
From: Fei Yang <fyang@openjdk.org>
Date: Sat, 22 Mar 2025 02:31:53 +0000
Subject: [PATCH 436/587] 8352477: RISC-V: Print warnings when unsupported
 intrinsics are enabled

Reviewed-by: mli, rehn, fjiang
---
 src/hotspot/cpu/riscv/vm_version_riscv.cpp | 29 ++++++++++++++--------
 1 file changed, 19 insertions(+), 10 deletions(-)

diff --git a/src/hotspot/cpu/riscv/vm_version_riscv.cpp b/src/hotspot/cpu/riscv/vm_version_riscv.cpp
index 7b17d30447b..bd84171d5cc 100644
--- a/src/hotspot/cpu/riscv/vm_version_riscv.cpp
+++ b/src/hotspot/cpu/riscv/vm_version_riscv.cpp
@@ -128,11 +128,11 @@ void VM_Version::common_initialize() {
   }
 
   if (FLAG_IS_DEFAULT(UseCopySignIntrinsic)) {
-      FLAG_SET_DEFAULT(UseCopySignIntrinsic, true);
+    FLAG_SET_DEFAULT(UseCopySignIntrinsic, true);
   }
 
   if (FLAG_IS_DEFAULT(UseSignumIntrinsic)) {
-      FLAG_SET_DEFAULT(UseSignumIntrinsic, true);
+    FLAG_SET_DEFAULT(UseSignumIntrinsic, true);
   }
 
   if (UseRVC && !ext_C.enabled()) {
@@ -150,8 +150,12 @@ void VM_Version::common_initialize() {
       unaligned_access.value() != MISALIGNED_FAST);
   }
 
-  if (FLAG_IS_DEFAULT(UsePoly1305Intrinsics) && !AvoidUnalignedAccesses) {
-    FLAG_SET_DEFAULT(UsePoly1305Intrinsics, true);
+  if (!AvoidUnalignedAccesses) {
+    if (FLAG_IS_DEFAULT(UsePoly1305Intrinsics)) {
+      FLAG_SET_DEFAULT(UsePoly1305Intrinsics, true);
+    }
+  } else if (UsePoly1305Intrinsics) {
+    warning("Intrinsics for Poly1305 crypto hash functions not available on this CPU.");
   }
 
   // See JDK-8026049
@@ -315,10 +319,6 @@ void VM_Version::c2_initialize() {
     FLAG_SET_DEFAULT(UseMontgomerySquareIntrinsic, true);
   }
 
-  if (FLAG_IS_DEFAULT(UseMD5Intrinsics) && !AvoidUnalignedAccesses) {
-    FLAG_SET_DEFAULT(UseMD5Intrinsics, true);
-  }
-
   // Adler32
   if (UseRVV) {
     if (FLAG_IS_DEFAULT(UseAdler32Intrinsics)) {
@@ -359,14 +359,23 @@ void VM_Version::c2_initialize() {
     FLAG_SET_DEFAULT(UseZvbc, false);
   }
 
+  if (!AvoidUnalignedAccesses) {
+    if (FLAG_IS_DEFAULT(UseMD5Intrinsics)) {
+      FLAG_SET_DEFAULT(UseMD5Intrinsics, true);
+    }
+  } else if (UseMD5Intrinsics) {
+    warning("Intrinsics for MD5 crypto hash functions not available on this CPU.");
+    FLAG_SET_DEFAULT(UseMD5Intrinsics, false);
+  }
+
   // SHA's
   if (FLAG_IS_DEFAULT(UseSHA)) {
     FLAG_SET_DEFAULT(UseSHA, true);
   }
 
   // SHA-1, no RVV required though.
-  if (UseSHA) {
-    if (FLAG_IS_DEFAULT(UseSHA1Intrinsics) && !AvoidUnalignedAccesses) {
+  if (UseSHA && !AvoidUnalignedAccesses) {
+    if (FLAG_IS_DEFAULT(UseSHA1Intrinsics)) {
       FLAG_SET_DEFAULT(UseSHA1Intrinsics, true);
     }
   } else if (UseSHA1Intrinsics) {

From df9210e6578acd53384ee1ac06601510c9a52696 Mon Sep 17 00:00:00 2001
From: Zihao Lin <linzihao1999@outlook.com>
Date: Sun, 23 Mar 2025 00:35:59 +0000
Subject: [PATCH 437/587] 8347706: jvmciEnv.cpp has jvmci includes out of order

Reviewed-by: dnsimon
---
 src/hotspot/share/jvmci/jvmciEnv.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/hotspot/share/jvmci/jvmciEnv.cpp b/src/hotspot/share/jvmci/jvmciEnv.cpp
index c9c98508dc7..8840863fc20 100644
--- a/src/hotspot/share/jvmci/jvmciEnv.cpp
+++ b/src/hotspot/share/jvmci/jvmciEnv.cpp
@@ -31,6 +31,9 @@
 #include "gc/shared/barrierSet.hpp"
 #include "gc/shared/barrierSetNMethod.hpp"
 #include "jvm_io.h"
+#include "jvmci/jniAccessMark.inline.hpp"
+#include "jvmci/jvmciCompiler.hpp"
+#include "jvmci/jvmciRuntime.hpp"
 #include "memory/oopFactory.hpp"
 #include "memory/resourceArea.hpp"
 #include "memory/universe.hpp"
@@ -43,9 +46,6 @@
 #include "runtime/jniHandles.inline.hpp"
 #include "runtime/javaCalls.hpp"
 #include "runtime/os.hpp"
-#include "jvmci/jniAccessMark.inline.hpp"
-#include "jvmci/jvmciCompiler.hpp"
-#include "jvmci/jvmciRuntime.hpp"
 
 JVMCICompileState::JVMCICompileState(CompileTask* task, JVMCICompiler* compiler):
   _task(task),

From ee1577b790cd29c0bee9f77829aa40d9e512e30f Mon Sep 17 00:00:00 2001
From: David Holmes <dholmes@openjdk.org>
Date: Mon, 24 Mar 2025 00:18:13 +0000
Subject: [PATCH 438/587] 8352652: [BACKOUT] nsk/jvmti/ tests should fail when
 nsk_jvmti_setFailStatus() is called

Reviewed-by: lmesnik
---
 .../redefclass029/redefclass029.cpp           | 12 +------
 .../events/EM04/em04t001/em04t001.cpp         | 34 +++++++++++--------
 .../multienv/MA10/ma10t006/ma10t006.cpp       | 11 +-----
 .../nsk/share/jvmti/agent_tools.cpp           |  6 +---
 .../nsk/share/jvmti/hotswap/HotSwap.cpp       | 12 +------
 5 files changed, 24 insertions(+), 51 deletions(-)

diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass029/redefclass029.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass029/redefclass029.cpp
index bb867b3d2b4..d2b4b720c55 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass029/redefclass029.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass029/redefclass029.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2025, 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
@@ -97,16 +97,6 @@ CompiledMethodLoad(jvmtiEnv *jvmti_env, jmethodID method, jint code_size,
         const void* compile_info) {
     char *name;
     char *sig;
-    jvmtiPhase phase;
-
-    if (!NSK_JVMTI_VERIFY(jvmti_env->GetPhase(&phase))) {
-        nsk_jvmti_setFailStatus();
-        return;
-    }
-    if (phase == JVMTI_PHASE_DEAD) {
-      NSK_DISPLAY0("CompiledMethodLoad event recieved in dead phase");
-      return;
-    }
 
     NSK_DISPLAY0("CompiledMethodLoad event received for:\n");
     if (!NSK_JVMTI_VERIFY(jvmti_env->GetMethodName(method, &name, &sig, nullptr))) {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM04/em04t001/em04t001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM04/em04t001/em04t001.cpp
index ca1e5ddb7db..a7244db3441 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM04/em04t001/em04t001.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM04/em04t001/em04t001.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2025, 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
@@ -116,18 +116,6 @@ cbDynamicCodeGenerated2(jvmtiEnv *jvmti_env, const char *name,
     NSK_DISPLAY3("NOT FOUND: 0x%p %7d %s\n", address, length, name);
     jvmti->RawMonitorExit(syncLock);
 
-}
-
- void JNICALL
-cbVMDeath(jvmtiEnv* jvmti, JNIEnv* jni_env) {
-    if (!NSK_VERIFY(nsk_list_destroy(plist))) {
-        nsk_jvmti_setFailStatus();
-    }
-
-    if (!NSK_JVMTI_VERIFY(jvmti->DestroyRawMonitor(syncLock))) {
-        nsk_jvmti_setFailStatus();
-    }
-
 }
 
 /* ============================================================================= */
@@ -147,7 +135,6 @@ int setCallBacks(int stage) {
     jvmtiEventCallbacks eventCallbacks;
     memset(&eventCallbacks, 0, sizeof(eventCallbacks));
 
-    eventCallbacks.VMDeath = cbVMDeath;
     eventCallbacks.DynamicCodeGenerated = (stage == 1) ?
                             cbDynamicCodeGenerated1 : cbDynamicCodeGenerated2;
 
@@ -255,4 +242,23 @@ jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved) {
     return JNI_OK;
 }
 
+/* ============================================================================= */
+
+JNIEXPORT void JNICALL
+#ifdef STATIC_BUILD
+Agent_OnUnload_em04t001(JavaVM *jvm)
+#else
+Agent_OnUnload(JavaVM *jvm)
+#endif
+{
+
+    if (!NSK_VERIFY(nsk_list_destroy(plist))) {
+        nsk_jvmti_setFailStatus();
+    }
+
+    if (!NSK_JVMTI_VERIFY(jvmti->DestroyRawMonitor(syncLock))) {
+        nsk_jvmti_setFailStatus();
+    }
+}
+
 }
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA10/ma10t006/ma10t006.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA10/ma10t006/ma10t006.cpp
index c25f19b5f93..2c6a186656e 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA10/ma10t006/ma10t006.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA10/ma10t006/ma10t006.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2025, 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
@@ -51,18 +51,9 @@ CompiledMethodLoad(jvmtiEnv *jvmti_env, jmethodID method,
         const jvmtiAddrLocationMap* map, const void* compile_info) {
     char *name = nullptr;
     char *signature = nullptr;
-    jvmtiPhase phase;
 
     CompiledMethodLoadEventsCount++;
 
-    if (!NSK_JVMTI_VERIFY(jvmti_env->GetPhase(&phase))) {
-        nsk_jvmti_setFailStatus();
-        return;
-    }
-    if (phase == JVMTI_PHASE_DEAD) {
-      NSK_DISPLAY0("CompiledMethodLoad event recieved in dead phase");
-      return;
-    }
     if (!NSK_JVMTI_VERIFY(jvmti_env->GetMethodName(method, &name, &signature, nullptr))) {
         nsk_jvmti_setFailStatus();
         return;
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/share/jvmti/agent_tools.cpp b/test/hotspot/jtreg/vmTestbase/nsk/share/jvmti/agent_tools.cpp
index ae2fb040dde..0b43e5ac782 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/share/jvmti/agent_tools.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/share/jvmti/agent_tools.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2025, 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
@@ -21,7 +21,6 @@
  * questions.
  */
 
-#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
@@ -63,9 +62,6 @@ static volatile int currentAgentStatus = NSK_STATUS_PASSED;
 
 void nsk_jvmti_setFailStatus() {
     currentAgentStatus = NSK_STATUS_FAILED;
-    printf("Test failed by setFailStatus(). See log.");
-    fflush(stdout);
-    exit(97);
 }
 
 int nsk_jvmti_isFailStatus() {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/share/jvmti/hotswap/HotSwap.cpp b/test/hotspot/jtreg/vmTestbase/nsk/share/jvmti/hotswap/HotSwap.cpp
index 97105b6b9f0..b47be9bb74a 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/share/jvmti/hotswap/HotSwap.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/share/jvmti/hotswap/HotSwap.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2025, 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
@@ -141,19 +141,9 @@ CompiledMethodLoad(jvmtiEnv *jvmti_env, jmethodID method,
         const jvmtiAddrLocationMap* map, const void* compile_info) {
     char *name = nullptr;
     char *signature = nullptr;
-    jvmtiPhase phase;
 
     CompiledMethodLoadEventsCount++;
 
-    // GetMethodName works in live phase only so just exit if the event is generated too late
-    if (!NSK_JVMTI_VERIFY(jvmti_env->GetPhase(&phase))) {
-        nsk_jvmti_setFailStatus();
-        return;
-    }
-    if (phase == JVMTI_PHASE_DEAD) {
-      NSK_DISPLAY0("CompiledMethodLoad event recieved in dead phase");
-      return;
-    }
     if (!NSK_JVMTI_VERIFY(jvmti_env->GetMethodName(method, &name, &signature, nullptr))) {
         nsk_jvmti_setFailStatus();
         return;

From adfb1206498987f43a4cf0cd6ba0cb6a5bb8e479 Mon Sep 17 00:00:00 2001
From: Ioi Lam <iklam@openjdk.org>
Date: Mon, 24 Mar 2025 06:42:02 +0000
Subject: [PATCH 439/587] 8351748: Add class init barrier to AOT-cached
 Method/Var Handles

Reviewed-by: vlivanov, liach
---
 src/hotspot/share/cds/aotClassInitializer.cpp |  47 +++-
 src/hotspot/share/cds/aotClassInitializer.hpp |   6 +-
 src/hotspot/share/cds/cdsConfig.cpp           |   1 +
 src/hotspot/share/cds/cdsConfig.hpp           |   8 +-
 src/hotspot/share/cds/cds_globals.hpp         |   4 +
 src/hotspot/share/cds/heapShared.cpp          |  27 +-
 src/hotspot/share/cds/metaspaceShared.cpp     |   2 +
 src/hotspot/share/include/jvm.h               |   3 +
 src/hotspot/share/prims/jvm.cpp               |  25 +-
 .../java/lang/invoke/DirectMethodHandle.java  |   7 +-
 .../classes/java/lang/invoke/VarHandles.java  |   3 +-
 .../share/classes/jdk/internal/misc/CDS.java  |  30 ++-
 src/java.base/share/native/libjava/CDS.c      |   8 +-
 .../aotClassLinking/MethodHandleTest.java     | 248 ++++++++++++++++++
 14 files changed, 397 insertions(+), 22 deletions(-)
 create mode 100644 test/hotspot/jtreg/runtime/cds/appcds/aotClassLinking/MethodHandleTest.java

diff --git a/src/hotspot/share/cds/aotClassInitializer.cpp b/src/hotspot/share/cds/aotClassInitializer.cpp
index c5ad36ac315..28e20acdc79 100644
--- a/src/hotspot/share/cds/aotClassInitializer.cpp
+++ b/src/hotspot/share/cds/aotClassInitializer.cpp
@@ -26,11 +26,16 @@
 #include "cds/archiveBuilder.hpp"
 #include "cds/cdsConfig.hpp"
 #include "cds/heapShared.hpp"
+#include "classfile/symbolTable.hpp"
+#include "classfile/systemDictionaryShared.hpp"
 #include "classfile/vmSymbols.hpp"
 #include "oops/instanceKlass.inline.hpp"
 #include "oops/symbol.hpp"
+#include "runtime/java.hpp"
 #include "runtime/javaCalls.hpp"
 
+DEBUG_ONLY(InstanceKlass* _aot_init_class = nullptr;)
+
 // Detector for class names we wish to handle specially.
 // It is either an exact string match or a string prefix match.
 class AOTClassInitializer::AllowedSpec {
@@ -93,12 +98,12 @@ bool AOTClassInitializer::is_allowed(AllowedSpec* specs, InstanceKlass* ik) {
 
 
 bool AOTClassInitializer::can_archive_initialized_mirror(InstanceKlass* ik) {
-  assert(!ArchiveBuilder::current()->is_in_buffer_space(ik), "must be source klass");
+  assert(!ArchiveBuilder::is_active() || !ArchiveBuilder::current()->is_in_buffer_space(ik), "must be source klass");
   if (!CDSConfig::is_initing_classes_at_dump_time()) {
     return false;
   }
 
-  if (!ik->is_initialized()) {
+  if (!ik->is_initialized() && !ik->is_being_initialized()) {
     return false;
   }
 
@@ -293,9 +298,11 @@ bool AOTClassInitializer::can_archive_initialized_mirror(InstanceKlass* ik) {
       {"java/lang/invoke/LambdaForm"},
       {"java/lang/invoke/LambdaForm$Holder"},                 // UNSAFE.ensureClassInitialized()
       {"java/lang/invoke/LambdaForm$NamedFunction"},
+      {"java/lang/invoke/LambdaMetafactory"},
       {"java/lang/invoke/MethodHandle"},
       {"java/lang/invoke/MethodHandles"},
       {"java/lang/invoke/SimpleMethodHandle"},
+      {"java/lang/invoke/StringConcatFactory"},
       {"java/util/Collections"},
       {"java/util/stream/Collectors"},
       {"jdk/internal/constant/ConstantUtils"},
@@ -315,6 +322,12 @@ bool AOTClassInitializer::can_archive_initialized_mirror(InstanceKlass* ik) {
     }
   }
 
+#ifdef ASSERT
+  if (ik == _aot_init_class) {
+    return true;
+  }
+#endif
+
   return false;
 }
 
@@ -345,3 +358,33 @@ void AOTClassInitializer::call_runtime_setup(JavaThread* current, InstanceKlass*
     }
   }
 }
+
+#ifdef ASSERT
+void AOTClassInitializer::init_test_class(TRAPS) {
+  // -XX:AOTInitTestClass is used in regression tests for adding additional AOT-initialized classes
+  // and heap objects into the AOT cache. The tests must be carefully written to avoid including
+  // any classes that cannot be AOT-initialized.
+  //
+  // -XX:AOTInitTestClass is NOT a general mechanism for including user-defined objects into
+  // the AOT cache. Therefore, this option is NOT available in product JVM.
+  if (AOTInitTestClass != nullptr && CDSConfig::is_initing_classes_at_dump_time()) {
+    log_info(cds)("Debug build only: force initialization of AOTInitTestClass %s", AOTInitTestClass);
+    TempNewSymbol class_name = SymbolTable::new_symbol(AOTInitTestClass);
+    Handle app_loader(THREAD, SystemDictionary::java_system_loader());
+    Klass* k = SystemDictionary::resolve_or_null(class_name, app_loader, CHECK);
+    if (k == nullptr) {
+      vm_exit_during_initialization("AOTInitTestClass not found", AOTInitTestClass);
+    }
+    if (!k->is_instance_klass()) {
+      vm_exit_during_initialization("Invalid name for AOTInitTestClass", AOTInitTestClass);
+    }
+
+    _aot_init_class = InstanceKlass::cast(k);
+    _aot_init_class->initialize(CHECK);
+  }
+}
+
+bool AOTClassInitializer::has_test_class() {
+  return _aot_init_class != nullptr;
+}
+#endif
diff --git a/src/hotspot/share/cds/aotClassInitializer.hpp b/src/hotspot/share/cds/aotClassInitializer.hpp
index c8693a0add3..d2f6d18ef3c 100644
--- a/src/hotspot/share/cds/aotClassInitializer.hpp
+++ b/src/hotspot/share/cds/aotClassInitializer.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2024, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -41,6 +41,10 @@ public:
 
   static bool is_runtime_setup_required(InstanceKlass* ik);
   static void call_runtime_setup(JavaThread* current, InstanceKlass* ik);
+
+  // Support for regression testing. Available in debug builds only.
+  static void init_test_class(TRAPS) NOT_DEBUG_RETURN;
+  static bool has_test_class() NOT_DEBUG({ return false; });
 };
 
 #endif // SHARE_CDS_AOTCLASSINITIALIZER_HPP
diff --git a/src/hotspot/share/cds/cdsConfig.cpp b/src/hotspot/share/cds/cdsConfig.cpp
index da1d7af32db..f714bdf9494 100644
--- a/src/hotspot/share/cds/cdsConfig.cpp
+++ b/src/hotspot/share/cds/cdsConfig.cpp
@@ -60,6 +60,7 @@ JavaThread* CDSConfig::_dumper_thread = nullptr;
 int CDSConfig::get_status() {
   assert(Universe::is_fully_initialized(), "status is finalized only after Universe is initialized");
   return (is_dumping_archive()              ? IS_DUMPING_ARCHIVE : 0) |
+         (is_dumping_method_handles()       ? IS_DUMPING_METHOD_HANDLES : 0) |
          (is_dumping_static_archive()       ? IS_DUMPING_STATIC_ARCHIVE : 0) |
          (is_logging_lambda_form_invokers() ? IS_LOGGING_LAMBDA_FORM_INVOKERS : 0) |
          (is_using_archive()                ? IS_USING_ARCHIVE : 0);
diff --git a/src/hotspot/share/cds/cdsConfig.hpp b/src/hotspot/share/cds/cdsConfig.hpp
index 753ed6b746a..525184be21b 100644
--- a/src/hotspot/share/cds/cdsConfig.hpp
+++ b/src/hotspot/share/cds/cdsConfig.hpp
@@ -68,9 +68,11 @@ class CDSConfig : public AllStatic {
 public:
   // Used by jdk.internal.misc.CDS.getCDSConfigStatus();
   static const int IS_DUMPING_ARCHIVE              = 1 << 0;
-  static const int IS_DUMPING_STATIC_ARCHIVE       = 1 << 1;
-  static const int IS_LOGGING_LAMBDA_FORM_INVOKERS = 1 << 2;
-  static const int IS_USING_ARCHIVE                = 1 << 3;
+  static const int IS_DUMPING_METHOD_HANDLES       = 1 << 1;
+  static const int IS_DUMPING_STATIC_ARCHIVE       = 1 << 2;
+  static const int IS_LOGGING_LAMBDA_FORM_INVOKERS = 1 << 3;
+  static const int IS_USING_ARCHIVE                = 1 << 4;
+
   static int get_status() NOT_CDS_RETURN_(0);
 
   // Initialization and command-line checking
diff --git a/src/hotspot/share/cds/cds_globals.hpp b/src/hotspot/share/cds/cds_globals.hpp
index bb9ffe2044b..2dae9b45221 100644
--- a/src/hotspot/share/cds/cds_globals.hpp
+++ b/src/hotspot/share/cds/cds_globals.hpp
@@ -71,6 +71,10 @@
           "\"archivedObjects\" of the specified class is stored in the "    \
           "CDS archive heap")                                               \
                                                                             \
+  develop(ccstr, AOTInitTestClass, nullptr,                                 \
+          "For JVM internal testing only. The specified class is stored "   \
+          "in the initialized state in the AOT cache ")                     \
+                                                                            \
   product(ccstr, DumpLoadedClassList, nullptr,                              \
           "Dump the names all loaded classes, that could be stored into "   \
           "the CDS archive, in the specified file")                         \
diff --git a/src/hotspot/share/cds/heapShared.cpp b/src/hotspot/share/cds/heapShared.cpp
index abb2071813f..ce98b2b93b7 100644
--- a/src/hotspot/share/cds/heapShared.cpp
+++ b/src/hotspot/share/cds/heapShared.cpp
@@ -138,7 +138,7 @@ static ArchivableStaticFieldInfo fmg_archive_subgraph_entry_fields[] = {
 KlassSubGraphInfo* HeapShared::_dump_time_special_subgraph;
 ArchivedKlassSubGraphInfoRecord* HeapShared::_run_time_special_subgraph;
 GrowableArrayCHeap<oop, mtClassShared>* HeapShared::_pending_roots = nullptr;
-GrowableArrayCHeap<OopHandle, mtClassShared>* HeapShared::_root_segments;
+GrowableArrayCHeap<OopHandle, mtClassShared>* HeapShared::_root_segments = nullptr;
 int HeapShared::_root_segment_max_size_elems;
 OopHandle HeapShared::_scratch_basic_type_mirrors[T_VOID+1];
 MetaspaceObjToOopHandleTable* HeapShared::_scratch_objects_table = nullptr;
@@ -225,10 +225,6 @@ int HeapShared::append_root(oop obj) {
   // No GC should happen since we aren't scanning _pending_roots.
   assert(Thread::current() == (Thread*)VMThread::vm_thread(), "should be in vm thread");
 
-  if (_pending_roots == nullptr) {
-    _pending_roots = new GrowableArrayCHeap<oop, mtClassShared>(500);
-  }
-
   return _pending_roots->append(obj);
 }
 
@@ -336,6 +332,12 @@ bool HeapShared::archive_object(oop obj, oop referrer, KlassSubGraphInfo* subgra
         if (mirror_k != nullptr) {
           AOTArtifactFinder::add_cached_class(mirror_k);
         }
+      } else if (java_lang_invoke_ResolvedMethodName::is_instance(obj)) {
+        Method* m = java_lang_invoke_ResolvedMethodName::vmtarget(obj);
+        if (m != nullptr) {
+          InstanceKlass* method_holder = m->method_holder();
+          AOTArtifactFinder::add_cached_class(method_holder);
+        }
       }
     }
 
@@ -402,6 +404,7 @@ objArrayOop HeapShared::scratch_resolved_references(ConstantPool* src) {
 
 void HeapShared::init_dumping() {
   _scratch_objects_table = new (mtClass)MetaspaceObjToOopHandleTable();
+  _pending_roots = new GrowableArrayCHeap<oop, mtClassShared>(500);
 }
 
 void HeapShared::init_scratch_objects_for_basic_type_mirrors(TRAPS) {
@@ -565,7 +568,7 @@ void HeapShared::copy_and_rescan_aot_inited_mirror(InstanceKlass* ik) {
     assert(success, "sanity");
   }
 
-  if (log_is_enabled(Info, cds, init)) {
+  if (log_is_enabled(Debug, cds, init)) {
     ResourceMark rm;
     log_debug(cds, init)("copied %3d field(s) in aot-initialized mirror %s%s%s", nfields, ik->external_name(),
                          ik->is_hidden() ? " (hidden)" : "",
@@ -781,8 +784,11 @@ void KlassSubGraphInfo::add_subgraph_object_klass(Klass* orig_k) {
 #ifdef ASSERT
     InstanceKlass* ik = InstanceKlass::cast(orig_k);
     if (CDSConfig::is_dumping_method_handles()) {
+      // -XX:AOTInitTestClass must be used carefully in regression tests to
+      // include only classes that are safe to aot-initialize.
       assert(ik->class_loader() == nullptr ||
-             HeapShared::is_lambda_proxy_klass(ik),
+             HeapShared::is_lambda_proxy_klass(ik) ||
+             AOTClassInitializer::has_test_class(),
             "we can archive only instances of boot classes or lambda proxy classes");
     } else {
       assert(ik->class_loader() == nullptr, "must be boot class");
@@ -827,6 +833,13 @@ void KlassSubGraphInfo::add_subgraph_object_klass(Klass* orig_k) {
 }
 
 void KlassSubGraphInfo::check_allowed_klass(InstanceKlass* ik) {
+#ifndef PRODUCT
+  if (AOTClassInitializer::has_test_class()) {
+    // The tests can cache arbitrary types of objects.
+    return;
+  }
+#endif
+
   if (ik->module()->name() == vmSymbols::java_base()) {
     assert(ik->package() != nullptr, "classes in java.base cannot be in unnamed package");
     return;
diff --git a/src/hotspot/share/cds/metaspaceShared.cpp b/src/hotspot/share/cds/metaspaceShared.cpp
index 3af2277a50b..0b9638dad1a 100644
--- a/src/hotspot/share/cds/metaspaceShared.cpp
+++ b/src/hotspot/share/cds/metaspaceShared.cpp
@@ -23,6 +23,7 @@
  */
 
 #include "cds/aotArtifactFinder.hpp"
+#include "cds/aotClassInitializer.hpp"
 #include "cds/aotClassLinker.hpp"
 #include "cds/aotClassLocation.hpp"
 #include "cds/aotConstantPoolResolver.hpp"
@@ -736,6 +737,7 @@ bool MetaspaceShared::link_class_for_cds(InstanceKlass* ik, TRAPS) {
 
 void MetaspaceShared::link_shared_classes(bool jcmd_request, TRAPS) {
   AOTClassLinker::initialize();
+  AOTClassInitializer::init_test_class(CHECK);
 
   if (!jcmd_request && !CDSConfig::is_dumping_final_static_archive()) {
     LambdaFormInvokers::regenerate_holder_classes(CHECK);
diff --git a/src/hotspot/share/include/jvm.h b/src/hotspot/share/include/jvm.h
index c1d20387d0d..61857ac3ccd 100644
--- a/src/hotspot/share/include/jvm.h
+++ b/src/hotspot/share/include/jvm.h
@@ -218,6 +218,9 @@ JVM_DumpClassListToFile(JNIEnv* env, jstring fileName);
 JNIEXPORT void JNICALL
 JVM_DumpDynamicArchive(JNIEnv* env, jstring archiveName);
 
+JNIEXPORT jboolean JNICALL
+JVM_NeedsClassInitBarrierForCDS(JNIEnv* env, jclass cls);
+
 /*
  * java.lang.Throwable
  */
diff --git a/src/hotspot/share/prims/jvm.cpp b/src/hotspot/share/prims/jvm.cpp
index 343940f086d..a2e5d21f99b 100644
--- a/src/hotspot/share/prims/jvm.cpp
+++ b/src/hotspot/share/prims/jvm.cpp
@@ -22,6 +22,7 @@
  *
  */
 
+#include "cds/aotClassInitializer.hpp"
 #include "cds/cdsConfig.hpp"
 #include "cds/classListParser.hpp"
 #include "cds/classListWriter.hpp"
@@ -3349,7 +3350,6 @@ JVM_END
 
 JVM_ENTRY(void, JVM_InitializeFromArchive(JNIEnv* env, jclass cls))
   Klass* k = java_lang_Class::as_Klass(JNIHandles::resolve(cls));
-  assert(k->is_klass(), "just checking");
   HeapShared::initialize_from_archived_subgraph(THREAD, k);
 JVM_END
 
@@ -3514,6 +3514,29 @@ JVM_ENTRY(void, JVM_DumpDynamicArchive(JNIEnv *env, jstring archiveName))
 #endif // INCLUDE_CDS
 JVM_END
 
+JVM_ENTRY(jboolean, JVM_NeedsClassInitBarrierForCDS(JNIEnv* env, jclass cls))
+#if INCLUDE_CDS
+  Klass* k = java_lang_Class::as_Klass(JNIHandles::resolve(cls));
+  if (!k->is_instance_klass()) {
+    return false;
+  } else {
+    if (InstanceKlass::cast(k)->is_enum_subclass() ||
+        AOTClassInitializer::can_archive_initialized_mirror(InstanceKlass::cast(k))) {
+      // This class will be cached in AOT-initialized state. No need for init barriers.
+      return false;
+    } else {
+      // If we cannot cache the class in AOT-initialized state, java.lang.invoke handles
+      // must emit barriers to ensure class initialization during production run.
+      ResourceMark rm(THREAD);
+      log_debug(cds)("NeedsClassInitBarrierForCDS: %s", k->external_name());
+      return true;
+    }
+  }
+#else
+  return false;
+#endif // INCLUDE_CDS
+JVM_END
+
 // Returns an array of all live Thread objects (VM internal JavaThreads,
 // jvmti agent threads, and JNI attaching threads  are skipped)
 // See CR 6404306 regarding JNI attaching threads
diff --git a/src/java.base/share/classes/java/lang/invoke/DirectMethodHandle.java b/src/java.base/share/classes/java/lang/invoke/DirectMethodHandle.java
index a33b1646d3c..0a943d253af 100644
--- a/src/java.base/share/classes/java/lang/invoke/DirectMethodHandle.java
+++ b/src/java.base/share/classes/java/lang/invoke/DirectMethodHandle.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@
 
 package java.lang.invoke;
 
+import jdk.internal.misc.CDS;
 import jdk.internal.misc.Unsafe;
 import jdk.internal.vm.annotation.ForceInline;
 import jdk.internal.vm.annotation.Stable;
@@ -367,9 +368,9 @@ sealed class DirectMethodHandle extends MethodHandle {
             // It is a system class.  It is probably in the process of
             // being initialized, but we will help it along just to be safe.
             UNSAFE.ensureClassInitialized(cls);
-            return false;
+            return CDS.needsClassInitBarrier(cls);
         }
-        return UNSAFE.shouldBeInitialized(cls);
+        return UNSAFE.shouldBeInitialized(cls) || CDS.needsClassInitBarrier(cls);
     }
 
     private void ensureInitialized() {
diff --git a/src/java.base/share/classes/java/lang/invoke/VarHandles.java b/src/java.base/share/classes/java/lang/invoke/VarHandles.java
index 298b2e7baa1..d57d2d2d2cd 100644
--- a/src/java.base/share/classes/java/lang/invoke/VarHandles.java
+++ b/src/java.base/share/classes/java/lang/invoke/VarHandles.java
@@ -25,6 +25,7 @@
 
 package java.lang.invoke;
 
+import jdk.internal.misc.CDS;
 import sun.invoke.util.Wrapper;
 
 import java.lang.foreign.MemoryLayout;
@@ -101,7 +102,7 @@ final class VarHandles {
         else {
             Class<?> decl = f.getDeclaringClass();
             var vh = makeStaticFieldVarHandle(decl, f, isWriteAllowedOnFinalFields);
-            return maybeAdapt(UNSAFE.shouldBeInitialized(decl)
+            return maybeAdapt((UNSAFE.shouldBeInitialized(decl) || CDS.needsClassInitBarrier(decl))
                     ? new LazyInitializingVarHandle(vh, decl)
                     : vh);
         }
diff --git a/src/java.base/share/classes/jdk/internal/misc/CDS.java b/src/java.base/share/classes/jdk/internal/misc/CDS.java
index e22baf72c82..f070738e0c7 100644
--- a/src/java.base/share/classes/jdk/internal/misc/CDS.java
+++ b/src/java.base/share/classes/jdk/internal/misc/CDS.java
@@ -48,9 +48,10 @@ import jdk.internal.util.StaticProperty;
 public class CDS {
     // Must be in sync with cdsConfig.hpp
     private static final int IS_DUMPING_ARCHIVE              = 1 << 0;
-    private static final int IS_DUMPING_STATIC_ARCHIVE       = 1 << 1;
-    private static final int IS_LOGGING_LAMBDA_FORM_INVOKERS = 1 << 2;
-    private static final int IS_USING_ARCHIVE                = 1 << 3;
+    private static final int IS_DUMPING_METHOD_HANDLES       = 1 << 1;
+    private static final int IS_DUMPING_STATIC_ARCHIVE       = 1 << 2;
+    private static final int IS_LOGGING_LAMBDA_FORM_INVOKERS = 1 << 3;
+    private static final int IS_USING_ARCHIVE                = 1 << 4;
     private static final int configStatus = getCDSConfigStatus();
 
     /**
@@ -342,6 +343,29 @@ public class CDS {
         return archiveFilePath;
     }
 
+    /**
+     * Detects if we need to emit explicit class initialization checks in
+     * AOT-cached MethodHandles and VarHandles before accessing static fields
+     * and methods.
+     * @see jdk.internal.misc.Unsafe::shouldBeInitialized
+     *
+     * @return false only if a call to {@code ensureClassInitialized} would have
+     * no effect during the application's production run.
+     */
+    public static boolean needsClassInitBarrier(Class<?> c) {
+        if (c == null) {
+            throw new NullPointerException();
+        }
+
+        if ((configStatus & IS_DUMPING_METHOD_HANDLES) == 0) {
+            return false;
+        } else {
+            return needsClassInitBarrier0(c);
+        }
+    }
+
+    private static native boolean needsClassInitBarrier0(Class<?> c);
+
     /**
      * This class is used only by native JVM code at CDS dump time for loading
      * "unregistered classes", which are archived classes that are intended to
diff --git a/src/java.base/share/native/libjava/CDS.c b/src/java.base/share/native/libjava/CDS.c
index 989b5aa9dbf..e779f4bd21c 100644
--- a/src/java.base/share/native/libjava/CDS.c
+++ b/src/java.base/share/native/libjava/CDS.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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,3 +63,9 @@ JNIEXPORT void JNICALL
 Java_jdk_internal_misc_CDS_dumpDynamicArchive(JNIEnv *env, jclass jcls, jstring archiveName) {
     JVM_DumpDynamicArchive(env, archiveName);
 }
+
+JNIEXPORT jboolean JNICALL
+Java_jdk_internal_misc_CDS_needsClassInitBarrier0(JNIEnv *env, jclass ignore,
+                                                jclass c) {
+    return JVM_NeedsClassInitBarrierForCDS(env, c);
+}
diff --git a/test/hotspot/jtreg/runtime/cds/appcds/aotClassLinking/MethodHandleTest.java b/test/hotspot/jtreg/runtime/cds/appcds/aotClassLinking/MethodHandleTest.java
new file mode 100644
index 00000000000..84f89ebe215
--- /dev/null
+++ b/test/hotspot/jtreg/runtime/cds/appcds/aotClassLinking/MethodHandleTest.java
@@ -0,0 +1,248 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+/*
+ * @test various test cases for archived MethodHandle and VarHandle objects.
+ * @requires vm.cds.write.archived.java.heap
+ * @requires vm.cds.supports.aot.class.linking
+ * @requires vm.debug
+ * @comment work around JDK-8345635
+ * @requires !vm.jvmci.enabled
+ * @library /test/jdk/lib/testlibrary /test/lib /test/hotspot/jtreg/runtime/cds/appcds
+ * @build MethodHandleTest
+ * @run driver jdk.test.lib.helpers.ClassFileInstaller -jar mh.jar
+ *             MethodHandleTestApp MethodHandleTestApp$A MethodHandleTestApp$B
+ * @run driver MethodHandleTest AOT
+ */
+
+import java.lang.invoke.MethodHandle;
+import java.lang.invoke.MethodHandles;
+import java.lang.invoke.MethodType;
+import java.lang.invoke.VarHandle;
+import jdk.test.lib.cds.CDSAppTester;
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.helpers.ClassFileInstaller;
+
+public class MethodHandleTest {
+    static final String appJar = ClassFileInstaller.getJarPath("mh.jar");
+    static final String mainClass = "MethodHandleTestApp";
+
+    public static void main(String[] args) throws Exception {
+        Tester t = new Tester();
+        t.run(args);
+    }
+
+    static class Tester extends CDSAppTester {
+        public Tester() {
+            super(mainClass);
+        }
+
+        @Override
+        public String classpath(RunMode runMode) {
+            return appJar;
+        }
+
+        @Override
+        public String[] vmArgs(RunMode runMode) {
+            if (runMode == RunMode.ASSEMBLY) {
+                return new String[] {
+                    "-Xlog:gc,cds+class=debug",
+                    "-XX:AOTInitTestClass=MethodHandleTestApp",
+                    "-Xlog:cds+map,cds+map+oops=trace:file=cds.oops.txt:none:filesize=0",
+                };
+            } else {
+                return new String[] {};
+            }
+        }
+
+        @Override
+        public String[] appCommandLine(RunMode runMode) {
+            return new String[] {
+                mainClass,
+                runMode.toString(),
+            };
+        }
+
+        @Override
+        public void checkExecution(OutputAnalyzer out, RunMode runMode) throws Exception {
+            out.shouldHaveExitValue(0);
+
+            if (!runMode.isProductionRun()) {
+                // MethodHandleTestApp should be initialized in the assembly phase as well,
+                // due to -XX:AOTInitTestClass.
+                out.shouldContain("MethodHandleTestApp.<clinit>");
+            } else {
+                // Make sure MethodHandleTestApp is aot-initialized in the production run.
+                out.shouldNotContain("MethodHandleTestApp.<clinit>");
+            }
+        }
+    }
+}
+
+// This class is cached in the AOT-initialized state. At the beginning of the production
+// run, all of the static fields in MethodHandleTestApp will retain their values
+// at the end of the assembly phase. MethodHandleTestApp::<clinit> is NOT executed in the
+// production run.
+//
+// Note that the inner classes A and B are NOT cached in the AOT-initialized state.
+class MethodHandleTestApp {
+    static int state_A;
+    static int state_B;
+
+    static class A {
+        public void virtualMethod() {}
+
+        public static void staticMethod() {
+            System.out.println("MethodHandleTestApp$A.staticMethod()");
+            state_A *= 2;
+        }
+
+        static {
+            System.out.println("MethodHandleTestApp$A.<clinit>");
+            state_A += 3;
+        }
+    }
+
+    static class B {
+        static long staticField;
+        long instanceField;
+
+        static {
+            System.out.println("MethodHandleTestApp$B.<clinit>");
+            staticField = state_B;
+            state_B += 1234;
+        }
+    }
+
+    static MethodHandle staticMH;
+    static MethodHandle virtualMH;
+
+    static VarHandle staticVH;
+    static VarHandle instanceVH;
+
+    static {
+        System.out.println("MethodHandleTestApp.<clinit>");
+
+        try {
+            setupCachedStatics();
+        } catch (Throwable t) {
+            throw new RuntimeException("Unexpected exception", t);
+        }
+    }
+
+    static void setupCachedStatics() throws Throwable {
+        MethodHandles.Lookup LOOKUP = MethodHandles.lookup();
+        virtualMH = LOOKUP.findVirtual(A.class, "virtualMethod", MethodType.methodType(void.class));
+        instanceVH = LOOKUP.findVarHandle(B.class, "instanceField", long.class);
+
+        // Make sure A is initialized before create staticMH, but the AOT-cached staticMH
+        // should still include the init barrier even if A was initialized in the assembly phase.
+        A.staticMethod();
+        staticMH = LOOKUP.findStatic(A.class, "staticMethod", MethodType.methodType(void.class));
+
+
+        // Make sure B is initialized before create staticVH, but the AOT-cached staticVH
+        // should still include the init barrier even if B was initialized in the assembly phase.
+        B.staticField += 5678;
+        staticVH = LOOKUP.findStaticVarHandle(B.class, "staticField", long.class);
+    }
+
+    private static Object invoke(MethodHandle mh, Object ... args) {
+        try {
+            for (Object o : args) {
+                mh = MethodHandles.insertArguments(mh, 0, o);
+            }
+            return mh.invoke();
+        } catch (Throwable t) {
+            throw new RuntimeException("Unexpected exception", t);
+        }
+    }
+
+    public static void main(String[] args) throws Throwable {
+        boolean isProduction = args[0].equals("PRODUCTION");
+
+        testMethodHandles(isProduction);
+        testVarHandles(isProduction);
+    }
+
+
+    static void testMethodHandles(boolean isProduction) throws Throwable {
+        state_A = 0;
+
+        // (1) Invoking virtual method handle should not initialize the class
+        try {
+            virtualMH.invoke(null);
+            throw new RuntimeException("virtualMH.invoke(null) must not succeed");
+        } catch (NullPointerException t) {
+            System.out.println("Expected: " + t);
+        }
+
+        if (isProduction) {
+            if (state_A != 0) {
+                throw new RuntimeException("state_A should be 0 but is: " + state_A);
+            }
+        }
+
+        // (2) Invoking static method handle must ensure A is initialized.
+        invoke(staticMH);
+        if (isProduction) {
+            if (state_A != 6) {
+                // A.<clinit> must be executed before A.staticMethod.
+                throw new RuntimeException("state_A should be 6 but is: " + state_A);
+            }
+        }
+    }
+
+    static void testVarHandles(boolean isProduction) throws Throwable {
+        int n = 3;
+        state_B = n;
+
+        // (1) Invoking virtual method handle should not initialize the class
+        try {
+            instanceVH.get(null);
+            throw new RuntimeException("instanceVH.get(null) must not succeed");
+        } catch (NullPointerException t) {
+            System.out.println("Expected: " + t);
+        }
+
+        if (isProduction) {
+            if (state_B != n) {
+                throw new RuntimeException("state_B should be " + n + " but is: " + state_B);
+            }
+        }
+
+        // (2) Invoking static method handle must ensure B is initialized.
+        long v = (long)staticVH.get();
+        if (isProduction) {
+            if (v != n) {
+                // If you get to here, B might have been incorrectly cached in the initialized state.
+                throw new RuntimeException("staticVH.get() should be " + n + " but is: " + v);
+            }
+            if (state_B != 1234 + n) {
+                // B.<clinit> must be executed before B.staticMethod.
+                throw new RuntimeException("state_B should be " + (1234 + n) + " but is: " + state_B);
+            }
+        }
+    }
+}

From e23e0f85ef0f959a68adda0cff9e721ba2173ffc Mon Sep 17 00:00:00 2001
From: Marc Chevalier <marc.chevalier@oracle.com>
Date: Mon, 24 Mar 2025 07:24:07 +0000
Subject: [PATCH 440/587] 8352591: Missing UnlockDiagnosticVMOptions in
 VerifyGraphEdgesWithDeadCodeCheckFromSafepoints test

Reviewed-by: kvn, chagedorn, syan
---
 .../VerifyGraphEdgesWithDeadCodeCheckFromSafepoints.java        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/hotspot/jtreg/compiler/loopopts/VerifyGraphEdgesWithDeadCodeCheckFromSafepoints.java b/test/hotspot/jtreg/compiler/loopopts/VerifyGraphEdgesWithDeadCodeCheckFromSafepoints.java
index c731ae6f770..eb95db72be6 100644
--- a/test/hotspot/jtreg/compiler/loopopts/VerifyGraphEdgesWithDeadCodeCheckFromSafepoints.java
+++ b/test/hotspot/jtreg/compiler/loopopts/VerifyGraphEdgesWithDeadCodeCheckFromSafepoints.java
@@ -29,7 +29,7 @@
  *
  * @run driver compiler.loopopts.VerifyGraphEdgesWithDeadCodeCheckFromSafepoints
  * @run main/othervm
- *       -XX:+IgnoreUnrecognizedVMOptions
+ *       -XX:+IgnoreUnrecognizedVMOptions -XX:+UnlockDiagnosticVMOptions
  *       -XX:-TieredCompilation -XX:+VerifyGraphEdges
  *       -XX:+StressIGVN -Xcomp
  *       -XX:CompileCommand=compileonly,compiler.loopopts.VerifyGraphEdgesWithDeadCodeCheckFromSafepoints::mainTest

From 56a4ffa62cdeb552589802042f18aa2a707d5cb0 Mon Sep 17 00:00:00 2001
From: Emanuel Peter <epeter@openjdk.org>
Date: Mon, 24 Mar 2025 07:57:14 +0000
Subject: [PATCH 441/587] 8352597: [IR Framework] test bug:
 TestNotCompilable.java fails on product build

Reviewed-by: fyang, syan, thartmann
---
 .../testlibrary_tests/ir_framework/tests/TestNotCompilable.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/hotspot/jtreg/testlibrary_tests/ir_framework/tests/TestNotCompilable.java b/test/hotspot/jtreg/testlibrary_tests/ir_framework/tests/TestNotCompilable.java
index 760fc579910..8ba72f1bd86 100644
--- a/test/hotspot/jtreg/testlibrary_tests/ir_framework/tests/TestNotCompilable.java
+++ b/test/hotspot/jtreg/testlibrary_tests/ir_framework/tests/TestNotCompilable.java
@@ -30,7 +30,7 @@ import compiler.lib.ir_framework.driver.irmatching.IRViolationException;
 
 /*
  * @test
- * @requires vm.compiler2.enabled & vm.flagless
+ * @requires vm.compiler2.enabled & vm.flagless & vm.debug == true
  * @summary Test the functionality of allowNotCompilable.
  * @library /test/lib /
  * @run driver ir_framework.tests.TestNotCompilable

From 5591f8a42997c7bbe99d26f7a75d494a53e436fa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Manuel=20H=C3=A4ssig?= <manuel@haessig.org>
Date: Mon, 24 Mar 2025 07:59:20 +0000
Subject: [PATCH 442/587] 8351515: C2 incorrectly removes double negation for
 double and float

Reviewed-by: thartmann, chagedorn
---
 src/hotspot/share/opto/subnode.cpp            | 13 ++-
 .../TestSubNodeFloatDoubleNegation.java       | 80 +++++++++++++++++++
 .../compiler/lib/ir_framework/IRNode.java     |  2 +-
 3 files changed, 90 insertions(+), 5 deletions(-)
 create mode 100644 test/hotspot/jtreg/compiler/floatingpoint/TestSubNodeFloatDoubleNegation.java

diff --git a/src/hotspot/share/opto/subnode.cpp b/src/hotspot/share/opto/subnode.cpp
index de0d2f7c8d0..7ba6ac7a385 100644
--- a/src/hotspot/share/opto/subnode.cpp
+++ b/src/hotspot/share/opto/subnode.cpp
@@ -53,11 +53,16 @@ Node* SubNode::Identity(PhaseGVN* phase) {
   assert(in(1) != this, "Must already have called Value");
   assert(in(2) != this, "Must already have called Value");
 
-  // Remove double negation
-  const Type *zero = add_id();
-  if( phase->type( in(1) )->higher_equal( zero ) &&
+  const Type* zero = add_id();
+
+  // Remove double negation if it is not a floating point number since negation
+  // is not the same as subtraction for floating point numbers
+  // (cf. JLS § 15.15.4). `0-(0-(-0.0))` must be equal to positive 0.0 according to
+  // JLS § 15.8.2, but would result in -0.0 if this folding would be applied.
+  if (phase->type(in(1))->higher_equal(zero) &&
       in(2)->Opcode() == Opcode() &&
-      phase->type( in(2)->in(1) )->higher_equal( zero ) ) {
+      phase->type(in(2)->in(1))->higher_equal(zero) &&
+      !phase->type(in(2)->in(2))->is_floatingpoint()) {
     return in(2)->in(2);
   }
 
diff --git a/test/hotspot/jtreg/compiler/floatingpoint/TestSubNodeFloatDoubleNegation.java b/test/hotspot/jtreg/compiler/floatingpoint/TestSubNodeFloatDoubleNegation.java
new file mode 100644
index 00000000000..66292e37b1c
--- /dev/null
+++ b/test/hotspot/jtreg/compiler/floatingpoint/TestSubNodeFloatDoubleNegation.java
@@ -0,0 +1,80 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact 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 8351515
+ * @summary The compiler must not fold `0-(0-x)` for x: float | double
+ * @library /test/lib /
+ * @modules jdk.incubator.vector
+ * @run driver compiler.floatingpoint.TestSubNodeFloatDoubleNegation
+ */
+package compiler.floatingpoint;
+
+import compiler.lib.ir_framework.*;
+import jdk.incubator.vector.Float16;
+import jdk.test.lib.Asserts;
+
+public class TestSubNodeFloatDoubleNegation {
+
+    public static void main(String[] args) {
+        TestFramework.runWithFlags("--add-modules=jdk.incubator.vector", "-XX:CompileCommand=inline,jdk.incubator.vector.Float16::*");
+    }
+
+    @Run(test = { "testHalfFloat", "testFloat", "testDouble" })
+    public static void assertResults() {
+        short halfFloatRes = Float16.float16ToShortBits(testHalfFloat(Float16.valueOf(-0.0f)));
+        int floatRes = Float.floatToIntBits(testFloat(-0.0f));
+        long doubleRes = Double.doubleToLongBits(testDouble(-0.0));
+
+        Asserts.assertEQ((short) 0, halfFloatRes);
+        Asserts.assertEQ((int) 0, floatRes);
+        Asserts.assertEQ((long) 0, doubleRes);
+    }
+
+    @Test
+    // Match a generic SubNode, because scalar Float16 operations are often
+    // performed as float operations.
+    @IR(counts = { IRNode.SUB, "2" })
+    // Checks that the subtractions in 0 - (0 - hf) do not get eliminiated
+    public static Float16 testHalfFloat(Float16 hf) {
+        return Float16.subtract(
+                Float16.shortBitsToFloat16((short) 0),
+                Float16.subtract(Float16.shortBitsToFloat16((short) 0), hf));
+    }
+
+    @Test
+    @IR(counts = { IRNode.SUB_F, "2" })
+    // Checks that the subtractions in 0 - (0 - f) do not get eliminated
+    public static float testFloat(float f) {
+        return 0 - (0 - f);
+    }
+
+    @Test
+    @IR(counts = { IRNode.SUB_D, "2" })
+    // Checks that the subtractions in 0 - (0 - d) do not get eliminated
+    public static double testDouble(double d) {
+        return 0 - (0 - d);
+    }
+
+}
diff --git a/test/hotspot/jtreg/compiler/lib/ir_framework/IRNode.java b/test/hotspot/jtreg/compiler/lib/ir_framework/IRNode.java
index 6f66b403a09..25204dc280d 100644
--- a/test/hotspot/jtreg/compiler/lib/ir_framework/IRNode.java
+++ b/test/hotspot/jtreg/compiler/lib/ir_framework/IRNode.java
@@ -1833,7 +1833,7 @@ public class IRNode {
 
     public static final String SUB = PREFIX + "SUB" + POSTFIX;
     static {
-        beforeMatchingNameRegex(SUB, "Sub(I|L|F|D)");
+        beforeMatchingNameRegex(SUB, "Sub(I|L|F|D|HF)");
     }
 
     public static final String SUB_D = PREFIX + "SUB_D" + POSTFIX;

From a8757332667df3fe41a29a7eedb2a7234d23c2a0 Mon Sep 17 00:00:00 2001
From: Matthias Baesken <mbaesken@openjdk.org>
Date: Mon, 24 Mar 2025 08:07:28 +0000
Subject: [PATCH 443/587] 8352486: [ubsan]
 compilationMemoryStatistic.cpp:659:21: runtime error: index 64 out of bounds
 for type const struct unnamed struct

Reviewed-by: kvn, mdoerr, stuefe
---
 src/hotspot/share/compiler/compilationMemoryStatistic.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/hotspot/share/compiler/compilationMemoryStatistic.cpp b/src/hotspot/share/compiler/compilationMemoryStatistic.cpp
index 41991567c9a..0c2822c94d2 100644
--- a/src/hotspot/share/compiler/compilationMemoryStatistic.cpp
+++ b/src/hotspot/share/compiler/compilationMemoryStatistic.cpp
@@ -656,7 +656,7 @@ class MemStatStore : public CHeapObj<mtCompiler> {
     assert_lock_strong(NMTCompilationCostHistory_lock);
     const unsigned stop_after = max_num_printed == -1 ? UINT_MAX : (unsigned)max_num_printed;
     result.num = result.num_c1 = result.num_c2 = result.num_filtered_out = 0;
-    for (int i = 0; _entries[i].e != nullptr && i < max_entries && result.num < stop_after; i++) {
+    for (int i = 0; i < max_entries && _entries[i].e != nullptr && result.num < stop_after; i++) {
       if (_entries[i].s >= minsize) {
         f(_entries[i].e);
         result.num++;

From de580090cd9ada313a878975b9f183045d293684 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Roberto=20Casta=C3=B1eda=20Lozano?=
 <rcastanedalo@openjdk.org>
Date: Mon, 24 Mar 2025 11:05:46 +0000
Subject: [PATCH 444/587] 8351468: C2: array fill optimization assigns wrong
 type to intrinsic call

Reviewed-by: epeter, thartmann, qamai
---
 src/hotspot/share/opto/loopTransform.cpp      |  17 +-
 .../loopopts/TestArrayFillAntiDependence.java | 212 ++++++++++++++
 .../loopopts/TestArrayFillIntrinsic.java      | 263 ++++++++++++++++++
 3 files changed, 489 insertions(+), 3 deletions(-)
 create mode 100644 test/hotspot/jtreg/compiler/loopopts/TestArrayFillAntiDependence.java
 create mode 100644 test/hotspot/jtreg/compiler/loopopts/TestArrayFillIntrinsic.java

diff --git a/src/hotspot/share/opto/loopTransform.cpp b/src/hotspot/share/opto/loopTransform.cpp
index 45b50592a26..9f3c4e2b152 100644
--- a/src/hotspot/share/opto/loopTransform.cpp
+++ b/src/hotspot/share/opto/loopTransform.cpp
@@ -3567,6 +3567,16 @@ bool PhaseIdealLoop::match_fill_loop(IdealLoopTree* lpt, Node*& store, Node*& st
     return false;
   }
 
+  if (msg == nullptr && store->as_Mem()->is_mismatched_access()) {
+    // This optimization does not currently support mismatched stores, where the
+    // type of the value to be stored differs from the element type of the
+    // destination array. Such patterns arise for example from memory segment
+    // initialization. This limitation could be overcome by extending this
+    // function's address matching logic and ensuring that the fill intrinsic
+    // implementations support mismatched array filling.
+    msg = "mismatched store";
+  }
+
   if (msg == nullptr && head->stride_con() != 1) {
     // could handle negative strides too
     if (head->stride_con() < 0) {
@@ -3589,7 +3599,8 @@ bool PhaseIdealLoop::match_fill_loop(IdealLoopTree* lpt, Node*& store, Node*& st
   }
 
   // Make sure there is an appropriate fill routine
-  BasicType t = store->as_Mem()->memory_type();
+  BasicType t = msg == nullptr ?
+    store->adr_type()->isa_aryptr()->elem()->array_element_basic_type() : T_VOID;
   const char* fill_name;
   if (msg == nullptr &&
       StubRoutines::select_fill_function(t, false, fill_name) == nullptr) {
@@ -3635,7 +3646,7 @@ bool PhaseIdealLoop::match_fill_loop(IdealLoopTree* lpt, Node*& store, Node*& st
       if (value != head->phi()) {
         msg = "unhandled shift in address";
       } else {
-        if (type2aelembytes(store->as_Mem()->memory_type(), true) != (1 << n->in(2)->get_int())) {
+        if (type2aelembytes(t, true) != (1 << n->in(2)->get_int())) {
           msg = "scale doesn't match";
         } else {
           found_index = true;
@@ -3841,7 +3852,7 @@ bool PhaseIdealLoop::intrinsify_fill(IdealLoopTree* lpt) {
 #endif
   }
 
-  BasicType t = store->as_Mem()->memory_type();
+  BasicType t = store->adr_type()->isa_aryptr()->elem()->array_element_basic_type();
   bool aligned = false;
   if (offset != nullptr && head->init_trip()->is_Con()) {
     int element_size = type2aelembytes(t);
diff --git a/test/hotspot/jtreg/compiler/loopopts/TestArrayFillAntiDependence.java b/test/hotspot/jtreg/compiler/loopopts/TestArrayFillAntiDependence.java
new file mode 100644
index 00000000000..bde15c03fd4
--- /dev/null
+++ b/test/hotspot/jtreg/compiler/loopopts/TestArrayFillAntiDependence.java
@@ -0,0 +1,212 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package compiler.loopopts;
+
+import jdk.test.lib.Asserts;
+
+/**
+ * @test
+ * @bug 8351468
+ * @summary Test that loads anti-dependent on array fill intrinsics are
+ *          scheduled correctly, for different load and array fill types.
+ *          See detailed comments in testShort() below.
+ * @library /test/lib
+ * @run main/othervm -XX:+IgnoreUnrecognizedVMOptions
+ *                   -Xbatch -XX:-TieredCompilation
+ *                   -XX:CompileOnly=compiler.loopopts.TestArrayFillAntiDependence::test*
+ *                   -XX:CompileCommand=quiet -XX:LoopUnrollLimit=0 -XX:+OptimizeFill
+ *                   compiler.loopopts.TestArrayFillAntiDependence
+ * @run main/othervm compiler.loopopts.TestArrayFillAntiDependence
+ */
+
+public class TestArrayFillAntiDependence {
+
+    static int N = 10;
+    static short M = 4;
+    static boolean BOOLEAN_VAL = true;
+    static char CHAR_VAL = 42;
+    static float FLOAT_VAL = 42.0f;
+    static double DOUBLE_VAL = 42.0;
+    static byte BYTE_VAL = 42;
+    static short SHORT_VAL = 42;
+    static int INT_VAL = 42;
+    static long LONG_VAL = 42;
+
+    static boolean testBoolean(int pos, int samePos) {
+        assert pos == samePos;
+        boolean total = false;
+        boolean[] array = new boolean[N];
+        array[pos] = BOOLEAN_VAL;
+        for (int i = 0; i < M; i++) {
+            total |= array[samePos];
+            for (int t = 0; t < array.length; t++) {
+                array[t] = false;
+            }
+        }
+        return total;
+    }
+
+    static char testChar(int pos, int samePos) {
+        assert pos == samePos;
+        char total = 0;
+        char[] array = new char[N];
+        array[pos] = CHAR_VAL;
+        for (int i = 0; i < M; i++) {
+            total += array[samePos];
+            for (int t = 0; t < array.length; t++) {
+                array[t] = 0;
+            }
+        }
+        return total;
+    }
+
+    static float testFloat(int pos, int samePos) {
+        assert pos == samePos;
+        float total = 0.0f;
+        float[] array = new float[N];
+        array[pos] = FLOAT_VAL;
+        for (int i = 0; i < M; i++) {
+            total += array[samePos];
+            for (int t = 0; t < array.length; t++) {
+                array[t] = 0.0f;
+            }
+        }
+        return total;
+    }
+
+    static double testDouble(int pos, int samePos) {
+        assert pos == samePos;
+        double total = 0.0;
+        double[] array = new double[N];
+        array[pos] = DOUBLE_VAL;
+        for (int i = 0; i < M; i++) {
+            total += array[samePos];
+            for (int t = 0; t < array.length; t++) {
+                array[t] = 0.0;
+            }
+        }
+        return total;
+    }
+
+    static byte testByte(int pos, int samePos) {
+        assert pos == samePos;
+        byte total = 0;
+        byte[] array = new byte[N];
+        array[pos] = BYTE_VAL;
+        for (int i = 0; i < M; i++) {
+            total += array[samePos];
+            for (int t = 0; t < array.length; t++) {
+                array[t] = 0;
+            }
+        }
+        return total;
+    }
+
+    static short testShort(int pos, int samePos) {
+        // This pre-condition is necessary to reproduce the miscompilation, but
+        // should not be exploited by C2 for optimization.
+        assert pos == samePos;
+        short total = 0;
+        short[] array = new short[N];
+        array[pos] = SHORT_VAL;
+        for (int i = 0; i < M; i++) {
+            // This load is wrongly scheduled after the loop below, which is
+            // transformed into a call to arrayof_jshort_fill and clears the
+            // entire array. As a consequence, the function returns 0 instead of
+            // the expected SHORT_VAL.
+            // The load is wrongly allowed to be moved beyond the loop
+            // (arrayof_jshort_fill call) because their anti-dependence is
+            // missed. This is because the call operates on a different memory
+            // slice (char[] instead of the expected short[]).
+            total += array[samePos];
+            for (int t = 0; t < array.length; t++) {
+                array[t] = 0;
+            }
+        }
+        return total;
+    }
+
+    static int testInt(int pos, int samePos) {
+        assert pos == samePos;
+        int total = 0;
+        int[] array = new int[N];
+        array[pos] = INT_VAL;
+        for (int i = 0; i < M; i++) {
+            total += array[samePos];
+            for (int t = 0; t < array.length; t++) {
+                array[t] = 0;
+            }
+        }
+        return total;
+    }
+
+    static long testLong(int pos, int samePos) {
+        assert pos == samePos;
+        long total = 0;
+        long[] array = new long[N];
+        array[pos] = LONG_VAL;
+        for (int i = 0; i < M; i++) {
+            total += array[samePos];
+            for (int t = 0; t < array.length; t++) {
+                array[t] = 0;
+            }
+        }
+        return total;
+    }
+
+    public static void main(String[] args) {
+        for (int i = 0; i < 10_000; i++) {
+            boolean result = testBoolean(0, 0);
+            Asserts.assertEquals(BOOLEAN_VAL, result);
+        }
+        for (int i = 0; i < 10_000; i++) {
+            char result = testChar(0, 0);
+            Asserts.assertEquals(CHAR_VAL, result);
+        }
+        for (int i = 0; i < 10_000; i++) {
+            float result = testFloat(0, 0);
+            Asserts.assertEquals(FLOAT_VAL, result);
+        }
+        for (int i = 0; i < 10_000; i++) {
+            double result = testDouble(0, 0);
+            Asserts.assertEquals(DOUBLE_VAL, result);
+        }
+        for (int i = 0; i < 10_000; i++) {
+            byte result = testByte(0, 0);
+            Asserts.assertEquals(BYTE_VAL, result);
+        }
+        for (int i = 0; i < 10_000; i++) {
+            short result = testShort(0, 0);
+            Asserts.assertEquals(SHORT_VAL, result);
+        }
+        for (int i = 0; i < 10_000; i++) {
+            int result = testInt(0, 0);
+            Asserts.assertEquals(INT_VAL, result);
+        }
+        for (int i = 0; i < 10_000; i++) {
+            long result = testLong(0, 0);
+            Asserts.assertEquals(LONG_VAL, result);
+        }
+    }
+}
diff --git a/test/hotspot/jtreg/compiler/loopopts/TestArrayFillIntrinsic.java b/test/hotspot/jtreg/compiler/loopopts/TestArrayFillIntrinsic.java
new file mode 100644
index 00000000000..a24e791f98d
--- /dev/null
+++ b/test/hotspot/jtreg/compiler/loopopts/TestArrayFillIntrinsic.java
@@ -0,0 +1,263 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package compiler.loopopts;
+
+import java.lang.foreign.*;
+import java.util.*;
+import jdk.test.lib.Asserts;
+import compiler.lib.ir_framework.*;
+
+/**
+ * @test
+ * @bug 8351468
+ * @summary Test replacement of array-filling loops with intrinsic calls in the
+ *          face of matching and mismatching stores.
+ * @library /test/lib /
+ * @run driver compiler.loopopts.TestArrayFillIntrinsic
+ */
+
+public class TestArrayFillIntrinsic {
+
+    public static void main(String[] args) {
+        // Disabling unrolling is necessary for test robustness, otherwise the
+        // compiler might decide to unroll the array-filling loop instead of
+        // replacing it with an intrinsic call even if OptimizeFill is enabled.
+        TestFramework framework = new TestFramework();
+        framework.addScenarios(new Scenario(0),
+                               new Scenario(1, "-XX:LoopUnrollLimit=0", "-XX:+OptimizeFill"));
+        framework.start();
+    }
+
+    @Test
+    @IR(applyIfPlatformOr = {"x64", "true", "aarch64", "true", "riscv64", "true"},
+        applyIfAnd = {"LoopUnrollLimit", "0", "OptimizeFill", "true"},
+        counts = {IRNode.CALL_OF, "(arrayof_)?jbyte_fill", "1"})
+    static void testFillBooleanArray(boolean[] array, boolean val) {
+        for (int i = 0; i < array.length; i++) {
+            array[i] = val;
+        }
+    }
+
+    @Test
+    @IR(applyIfPlatformOr = {"x64", "true", "aarch64", "true", "riscv64", "true"},
+        applyIfAnd = {"LoopUnrollLimit", "0", "OptimizeFill", "true"},
+        counts = {IRNode.CALL_OF, "(arrayof_)?jbyte_fill", "1"})
+    static void testFillByteArray(byte[] array, byte val) {
+        for (int i = 0; i < array.length; i++) {
+            array[i] = val;
+        }
+    }
+
+    @Test
+    @IR(applyIfPlatformOr = {"x64", "true", "aarch64", "true", "riscv64", "true"},
+        applyIfAnd = {"LoopUnrollLimit", "0", "OptimizeFill", "true"},
+        counts = {IRNode.CALL_OF, "(arrayof_)?jshort_fill", "1"})
+    static void testFillCharArray(char[] array, char val) {
+        for (int i = 0; i < array.length; i++) {
+            array[i] = val;
+        }
+    }
+
+    @Test
+    @IR(applyIfPlatformOr = {"x64", "true", "aarch64", "true", "riscv64", "true"},
+        applyIfAnd = {"LoopUnrollLimit", "0", "OptimizeFill", "true"},
+        counts = {IRNode.CALL_OF, "(arrayof_)?jshort_fill", "1"})
+    static void testFillShortArray(short[] array, short val) {
+        for (int i = 0; i < array.length; i++) {
+            array[i] = val;
+        }
+    }
+
+    @Test
+    @IR(applyIfPlatformOr = {"x64", "true", "aarch64", "true", "riscv64", "true"},
+        applyIfAnd = {"LoopUnrollLimit", "0", "OptimizeFill", "true"},
+        counts = {IRNode.CALL_OF, "(arrayof_)?jint_fill", "1"})
+    static void testFillIntArray(int[] array, int val) {
+        for (int i = 0; i < array.length; i++) {
+            array[i] = val;
+        }
+    }
+
+    @Test
+    @IR(applyIfPlatformOr = {"x64", "true", "aarch64", "true", "riscv64", "true"},
+        applyIfAnd = {"LoopUnrollLimit", "0", "OptimizeFill", "true"},
+        counts = {IRNode.CALL_OF, "(arrayof_)?jint_fill", "1"})
+    static void testFillFloatArray(float[] array, float val) {
+        for (int i = 0; i < array.length; i++) {
+            array[i] = val;
+        }
+    }
+
+    @Run(test = {"testFillByteArray",
+                 "testFillBooleanArray",
+                 "testFillCharArray",
+                 "testFillShortArray",
+                 "testFillIntArray",
+                 "testFillFloatArray"})
+    public void runPositiveTests() {
+        Random r = RunInfo.getRandom();
+        int N = r.ints(1, 1024).findFirst().getAsInt();
+        {
+            boolean[] array = new boolean[N];
+            boolean val = r.nextBoolean();
+            testFillBooleanArray(array, val);
+            for (int i = 0; i < array.length; i++) {
+                Asserts.assertEquals(val, array[i]);
+            }
+        }
+        {
+            byte[] array = new byte[N];
+            byte val = (byte)r.nextInt();
+            testFillByteArray(array, val);
+            for (int i = 0; i < array.length; i++) {
+                Asserts.assertEquals(val, array[i]);
+            }
+        }
+        {
+            char[] array = new char[N];
+            char val = (char)r.nextInt();
+            testFillCharArray(array, val);
+            for (int i = 0; i < array.length; i++) {
+                Asserts.assertEquals(val, array[i]);
+            }
+        }
+        {
+            short[] array = new short[N];
+            short val = (short)r.nextInt();
+            testFillShortArray(array, val);
+            for (int i = 0; i < array.length; i++) {
+                Asserts.assertEquals(val, array[i]);
+            }
+        }
+        {
+            int[] array = new int[N];
+            int val = r.nextInt();
+            testFillIntArray(array, val);
+            for (int i = 0; i < array.length; i++) {
+                Asserts.assertEquals(val, array[i]);
+            }
+        }
+        {
+            float[] array = new float[N];
+            float val = r.nextFloat();
+            testFillFloatArray(array, val);
+            for (int i = 0; i < array.length; i++) {
+                Asserts.assertEquals(val, array[i]);
+            }
+        }
+    }
+
+    @Test
+    @IR(failOn = {IRNode.CALL_OF, "(arrayof_)?.*_fill"})
+    static void testFillShortArrayWithByte(MemorySegment array, int n, byte val) {
+        for (int i = 0; i < n; i++) {
+            array.setAtIndex(ValueLayout.JAVA_BYTE, i, val);
+        }
+    }
+
+    @Test
+    @IR(failOn = {IRNode.CALL_OF, "(arrayof_)?.*_fill"})
+    static void testFillIntArrayWithByte(MemorySegment array, int n, byte val) {
+        for (int i = 0; i < n; i++) {
+            array.setAtIndex(ValueLayout.JAVA_BYTE, i, val);
+        }
+    }
+
+    @Test
+    @IR(failOn = {IRNode.CALL_OF, "(arrayof_)?.*_fill"})
+    static void testFillIntArrayWithShort(MemorySegment array, int n, short val) {
+        for (int i = 0; i < n; i++) {
+            array.setAtIndex(ValueLayout.JAVA_SHORT, i, val);
+        }
+    }
+
+    @Test
+    @IR(failOn = {IRNode.CALL_OF, "(arrayof_)?.*_fill"})
+    static void testFillByteArrayWithBoolean(MemorySegment array, int n, boolean val) {
+        for (int i = 0; i < n; i++) {
+            array.setAtIndex(ValueLayout.JAVA_BOOLEAN, i, val);
+        }
+    }
+
+    @Test
+    @IR(failOn = {IRNode.CALL_OF, "(arrayof_)?.*_fill"})
+    static void testFillShortArrayWithChar(MemorySegment array, int n, char val) {
+        for (int i = 0; i < n; i++) {
+            array.setAtIndex(ValueLayout.JAVA_CHAR, i, val);
+        }
+    }
+
+    @Test
+    @IR(failOn = {IRNode.CALL_OF, "(arrayof_)?.*_fill"})
+    static void testFillCharArrayWithShort(MemorySegment array, int n, short val) {
+        for (int i = 0; i < n; i++) {
+            array.setAtIndex(ValueLayout.JAVA_SHORT, i, val);
+        }
+    }
+
+    @Test
+    @IR(failOn = {IRNode.CALL_OF, "(arrayof_)?.*_fill"})
+    static void testFillIntArrayWithFloat(MemorySegment array, int n, float val) {
+        for (int i = 0; i < n; i++) {
+            array.setAtIndex(ValueLayout.JAVA_FLOAT, i, val);
+        }
+    }
+
+    @Test
+    @IR(failOn = {IRNode.CALL_OF, "(arrayof_)?.*_fill"})
+    static void testFillFloatArrayWithInt(MemorySegment array, int n, int val) {
+        for (int i = 0; i < n; i++) {
+            array.setAtIndex(ValueLayout.JAVA_INT, i, val);
+        }
+    }
+
+    @Run(test = {"testFillShortArrayWithByte",
+                 "testFillIntArrayWithByte",
+                 "testFillIntArrayWithShort",
+                 "testFillByteArrayWithBoolean",
+                 "testFillShortArrayWithChar",
+                 "testFillCharArrayWithShort",
+                 "testFillIntArrayWithFloat",
+                 "testFillFloatArrayWithInt"})
+    public void runTypeMismatchTests() {
+        Random r = RunInfo.getRandom();
+        int N = r.ints(1, 1024).findFirst().getAsInt();
+        testFillShortArrayWithByte(MemorySegment.ofArray(new short[N]), N,
+                                   (byte)r.nextInt());
+        testFillIntArrayWithByte(MemorySegment.ofArray(new int[N]), N,
+                                 (byte)r.nextInt());
+        testFillIntArrayWithShort(MemorySegment.ofArray(new int[N]), N,
+                                  (short)r.nextInt());
+        testFillByteArrayWithBoolean(MemorySegment.ofArray(new byte[N]), N,
+                                     r.nextBoolean());
+        testFillShortArrayWithChar(MemorySegment.ofArray(new short[N]), N,
+                                   (char)r.nextInt());
+        testFillCharArrayWithShort(MemorySegment.ofArray(new char[N]), N,
+                                   (short)r.nextInt());
+        testFillIntArrayWithFloat(MemorySegment.ofArray(new int[N]), N,
+                                  r.nextFloat());
+        testFillFloatArrayWithInt(MemorySegment.ofArray(new float[N]), N,
+                                  r.nextInt());
+    }
+}

From 02a4ce23f8353a9dd6400f2dd44f9cc1649626d3 Mon Sep 17 00:00:00 2001
From: Thomas Schatzl <tschatzl@openjdk.org>
Date: Mon, 24 Mar 2025 12:18:02 +0000
Subject: [PATCH 445/587] 8352147: G1:
 TestEagerReclaimHumongousRegionsClearMarkBits test takes very long

Reviewed-by: iwalulya, ayang
---
 ...rReclaimHumongousRegionsClearMarkBits.java | 142 ++++++------------
 1 file changed, 50 insertions(+), 92 deletions(-)

diff --git a/test/hotspot/jtreg/gc/g1/TestEagerReclaimHumongousRegionsClearMarkBits.java b/test/hotspot/jtreg/gc/g1/TestEagerReclaimHumongousRegionsClearMarkBits.java
index e30a396c275..9cd9e4a5533 100644
--- a/test/hotspot/jtreg/gc/g1/TestEagerReclaimHumongousRegionsClearMarkBits.java
+++ b/test/hotspot/jtreg/gc/g1/TestEagerReclaimHumongousRegionsClearMarkBits.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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,110 +28,68 @@ package gc.g1;
  * @bug 8051973
  * @summary Test to make sure that eager reclaim of humongous objects correctly clears
  * mark bitmaps at reclaim.
- * @key randomness
  * @requires vm.gc.G1
  * @requires vm.debug
- * @library /test/lib
+ * @library /test/lib /testlibrary /
  * @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 driver gc.g1.TestEagerReclaimHumongousRegionsClearMarkBits
  */
 
-import java.util.ArrayList;
-import java.util.LinkedList;
-import java.util.Random;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
+import jdk.test.lib.Asserts;
 import jdk.test.lib.process.OutputAnalyzer;
 import jdk.test.lib.process.ProcessTools;
-import jdk.test.lib.Utils;
-
-// An object that has a few references to other instances to slow down marking.
-class ObjectWithSomeRefs {
-    public ObjectWithSomeRefs other1;
-    public ObjectWithSomeRefs other2;
-    public ObjectWithSomeRefs other3;
-    public ObjectWithSomeRefs other4;
-}
-
-class TestEagerReclaimHumongousRegionsClearMarkBitsReclaimRegionFast {
-    public static final long MAX_NANOS_FOR_RUN = 50L * 1_000_000_000L; // The maximum runtime for the actual test.
-
-    public static final int M = 1024*1024;
-
-    public static LinkedList<Object> garbageList = new LinkedList<Object>();
-
-    public static void genGarbage(Object large) {
-        for (int i = 0; i < 64*1024; i++) {
-            Object[] garbage = new Object[50];
-            garbage[0] = large;
-            garbageList.add(garbage);
-        }
-        garbageList.clear();
-    }
-
-    public static ArrayList<ObjectWithSomeRefs> longList = new ArrayList<ObjectWithSomeRefs>();
-
-    public static void main(String[] args) {
-
-        for (int i = 0; i < 16*1024; i++) {
-             longList.add(new ObjectWithSomeRefs());
-        }
-
-        Random rnd = Utils.getRandomInstance();
-        for (int i = 0; i < longList.size(); i++) {
-             int len = longList.size();
-             longList.get(i).other1 = longList.get(rnd.nextInt(len));
-             longList.get(i).other2 = longList.get(rnd.nextInt(len));
-             longList.get(i).other3 = longList.get(rnd.nextInt(len));
-             longList.get(i).other4 = longList.get(rnd.nextInt(len));
-        }
-
-        int[] large1 = new int[M];
-        int[] large2 = null;
-        int[] large3 = null;
-        int[] large4 = null;
-
-        Object ref_from_stack = large1;
-
-        long start_nanos = System.nanoTime();
-
-        for (int i = 0; i < 20; i++) {
-            long current_nanos = System.nanoTime();
-            if ((current_nanos - start_nanos) > MAX_NANOS_FOR_RUN) {
-              System.out.println("Finishing test because maximum runtime exceeded");
-              break;
-            }
-            // A set of large objects that will be reclaimed eagerly - and hopefully marked.
-            large1 = new int[M - 20];
-            large2 = new int[M - 20];
-            large3 = new int[M - 20];
-            large4 = new int[M - 20];
-            genGarbage(large1);
-            // Make sure that the compiler cannot completely remove
-            // the allocation of the large object until here.
-            System.out.println(large1 + " " + large2 + " " + large3 + " " + large4);
-        }
-
-        // Keep the reference to the first object alive.
-        System.out.println(ref_from_stack);
-    }
-}
+import jdk.test.whitebox.WhiteBox;
 
 public class TestEagerReclaimHumongousRegionsClearMarkBits {
     public static void main(String[] args) throws Exception {
-        OutputAnalyzer output = ProcessTools.executeLimitedTestJava(
-            "-XX:+UseG1GC",
-            "-Xms128M",
-            "-Xmx128M",
-            "-Xmn2M",
-            "-XX:G1HeapRegionSize=1M",
-            "-XX:InitiatingHeapOccupancyPercent=0", // Want to have as much as possible mark cycles.
-            "-Xlog:gc",
-            "-XX:+UnlockDiagnosticVMOptions",
-            "-XX:+VerifyAfterGC",
-            "-XX:ConcGCThreads=1", // Want to make marking as slow as possible.
-            "-XX:+G1VerifyBitmaps",
-            TestEagerReclaimHumongousRegionsClearMarkBitsReclaimRegionFast.class.getName());
+        OutputAnalyzer output = ProcessTools.executeLimitedTestJava("-XX:+UseG1GC",
+                                                                    "-Xmx20M",
+                                                                    "-Xms20m",
+                                                                    "-XX:+UnlockDiagnosticVMOptions",
+                                                                    "-XX:+VerifyAfterGC",
+                                                                    "-Xbootclasspath/a:.",
+                                                                    "-Xlog:gc=debug,gc+humongous=debug",
+                                                                    "-XX:+UnlockDiagnosticVMOptions",
+                                                                    "-XX:+WhiteBoxAPI",
+                                                                    TestEagerReclaimHumongousRegionsClearMarkBitsRunner.class.getName());
+
+        String log = output.getStdout();
+        System.out.println(log);
         output.shouldHaveExitValue(0);
+
+        // Find the log output indicating that the humongous object has been reclaimed, and marked.
+        Pattern pattern = Pattern.compile("Humongous region .* marked 1 .* reclaim candidate 1 type array 1");
+        Asserts.assertTrue(pattern.matcher(log).find(), "Could not find log output matching marked humongous region.");
+
+        pattern = Pattern.compile("Reclaimed humongous region .*");
+        Asserts.assertTrue(pattern.matcher(log).find(), "Could not find log output reclaiming humongous region");
     }
 }
+
+class TestEagerReclaimHumongousRegionsClearMarkBitsRunner {
+    private static final WhiteBox WB = WhiteBox.getWhiteBox();
+    private static final int M = 1024 * 1024;
+
+    public static void main(String[] args) {
+        WB.fullGC();
+
+        Object largeObj = new int[M]; // Humongous object.
+
+        WB.concurrentGCAcquireControl();
+        WB.concurrentGCRunTo(WB.BEFORE_MARKING_COMPLETED);
+
+        System.out.println("Large object at " + largeObj);
+
+        largeObj = null;
+        WB.youngGC(); // Should reclaim marked humongous object.
+
+        WB.concurrentGCRunToIdle();
+    }
+}
+

From 5709f79cf86d532b38133a7fc11e6388af573723 Mon Sep 17 00:00:00 2001
From: Erik Gahlin <egahlin@openjdk.org>
Date: Mon, 24 Mar 2025 15:16:54 +0000
Subject: [PATCH 446/587] 8352648: JFR: 'jfr query' should not be available in
 product builds

Reviewed-by: mgronlun, shade
---
 src/hotspot/share/jfr/jni/jfrJniMethod.cpp                | 8 ++++++++
 src/hotspot/share/jfr/jni/jfrJniMethod.hpp                | 2 ++
 src/hotspot/share/jfr/jni/jfrJniMethodRegistration.cpp    | 3 ++-
 src/jdk.jfr/share/classes/jdk/jfr/internal/JVM.java       | 7 +++++++
 .../share/classes/jdk/jfr/internal/tool/Command.java      | 6 ++++--
 .../share/classes/jdk/jfr/internal/tool/Query.java        | 8 +++++++-
 6 files changed, 30 insertions(+), 4 deletions(-)

diff --git a/src/hotspot/share/jfr/jni/jfrJniMethod.cpp b/src/hotspot/share/jfr/jni/jfrJniMethod.cpp
index cc618e3cfbc..18a258cad75 100644
--- a/src/hotspot/share/jfr/jni/jfrJniMethod.cpp
+++ b/src/hotspot/share/jfr/jni/jfrJniMethod.cpp
@@ -429,3 +429,11 @@ JVM_END
 NO_TRANSITION(jlong, jfr_nanos_now(JNIEnv* env, jclass jvm))
   return JfrChunk::nanos_now();
 NO_TRANSITION_END
+
+NO_TRANSITION(jboolean, jfr_is_product(JNIEnv* env, jclass jvm))
+#ifdef PRODUCT
+  return true;
+#else
+  return false;
+#endif
+NO_TRANSITION_END
diff --git a/src/hotspot/share/jfr/jni/jfrJniMethod.hpp b/src/hotspot/share/jfr/jni/jfrJniMethod.hpp
index e6dfdf39d8e..4519b99891d 100644
--- a/src/hotspot/share/jfr/jni/jfrJniMethod.hpp
+++ b/src/hotspot/share/jfr/jni/jfrJniMethod.hpp
@@ -167,6 +167,8 @@ void JNICALL jfr_unregister_stack_filter(JNIEnv* env, jclass jvm, jlong id);
 
 jlong JNICALL jfr_nanos_now(JNIEnv* env, jclass jvm);
 
+jboolean JNICALL jfr_is_product(JNIEnv* env, jclass jvm);
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/src/hotspot/share/jfr/jni/jfrJniMethodRegistration.cpp b/src/hotspot/share/jfr/jni/jfrJniMethodRegistration.cpp
index d131d070de5..433da3e2f43 100644
--- a/src/hotspot/share/jfr/jni/jfrJniMethodRegistration.cpp
+++ b/src/hotspot/share/jfr/jni/jfrJniMethodRegistration.cpp
@@ -100,7 +100,8 @@ JfrJniMethodRegistration::JfrJniMethodRegistration(JNIEnv* env) {
       (char*)"emitDataLoss", (char*)"(J)V", (void*)jfr_emit_data_loss,
       (char*)"registerStackFilter", (char*)"([Ljava/lang/String;[Ljava/lang/String;)J", (void*)jfr_register_stack_filter,
       (char*)"unregisterStackFilter", (char*)"(J)V", (void*)jfr_unregister_stack_filter,
-      (char*)"nanosNow", (char*)"()J", (void*)jfr_nanos_now
+      (char*)"nanosNow", (char*)"()J", (void*)jfr_nanos_now,
+      (char*)"isProduct", (char*)"()Z", (void*)jfr_is_product
     };
 
     const size_t method_array_length = sizeof(method) / sizeof(JNINativeMethod);
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/JVM.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/JVM.java
index cc0ee05a948..1c6859990db 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/JVM.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/JVM.java
@@ -675,4 +675,11 @@ public final class JVM {
      * @param value
      */
     public static native void setMiscellaneous(long eventTypeId, long value);
+
+    /**
+     * Returns whether the current build is a product build.
+     *
+     * @return {@code true} if this is a product build, {@code false} otherwise.
+     */
+    public static native boolean isProduct();
 }
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/tool/Command.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/tool/Command.java
index d76f182a8a8..38c6bb4285e 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/tool/Command.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/tool/Command.java
@@ -42,6 +42,7 @@ import java.util.List;
 
 import jdk.jfr.internal.util.UserDataException;
 import jdk.jfr.internal.util.UserSyntaxException;
+import jdk.jfr.internal.JVM;
 
 abstract class Command {
     public static final String title = "Tool for working with Flight Recorder files";
@@ -51,8 +52,9 @@ abstract class Command {
     private static List<Command> createCommands() {
         List<Command> commands = new ArrayList<>();
         commands.add(new Print());
-        // Uncomment when developing new queries for the view command
-        commands.add(new Query());
+        if (!JVM.isProduct()) {
+            commands.add(new Query());
+        }
         commands.add(new View());
         commands.add(new Configure());
         commands.add(new Metadata());
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/tool/Query.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/tool/Query.java
index cd4496825c5..d350b4215bf 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/tool/Query.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/tool/Query.java
@@ -94,12 +94,18 @@ final class Query extends Command {
         p.println("                        WHERE B.when = 'Before GC' AND A.when = 'After GC'");
         p.println("                        GROUP BY gcId");
         p.println("                        ORDER BY G.startTime\" recording.jfr");
+        p.println();
+        p.println("************************************ WARNING ******************************************");
+        p.println("The query command is only available in debug builds and is targeted towards OpenJDK");
+        p.println("developers. The tool may be removed or its syntax changed at any time.");
+        p.println("***************************************************************************************");
+        p.println();
    }
 
     @Override
     public List<String> getOptionSyntax() {
         List<String> list = new ArrayList<>();
-        list.add("[--verbose] [--width <integer>] <query> <file>");
+        list.add("[--verbose] [--width <integer>] <query> <file> (in debug builds)");
         return list;
     }
 

From d8c2f59a1b28521ab9969fdf71c52726026d2a85 Mon Sep 17 00:00:00 2001
From: Joachim Kern <jkern@openjdk.org>
Date: Mon, 24 Mar 2025 16:15:36 +0000
Subject: [PATCH 447/587] 8352064: AIX: now also able to build static-jdk image
 with a statically linked launcher

Reviewed-by: mdoerr, mbaesken, ihse
---
 make/Main.gmk                                 |  5 +---
 make/StaticLibs.gmk                           | 20 ++++++++++++++
 make/modules/java.base/lib/CoreLibraries.gmk  |  8 ++++++
 .../modules/java.desktop/lib/AwtLibraries.gmk | 11 ++++++++
 src/hotspot/os/aix/loadlib_aix.cpp            | 26 ++++++++++++++++++-
 5 files changed, 65 insertions(+), 5 deletions(-)

diff --git a/make/Main.gmk b/make/Main.gmk
index f2f1bce0e10..eda3b79265a 100644
--- a/make/Main.gmk
+++ b/make/Main.gmk
@@ -1321,10 +1321,7 @@ endif
 ################################################################################
 
 # all-images builds all our deliverables as images.
-all-images: product-images test-image all-docs-images
-ifeq ($(call isTargetOs, linux macosx windows), true)
-  all-images: static-jdk-image
-endif
+all-images: product-images static-jdk-image test-image all-docs-images
 
 # all-bundles packages all our deliverables as tar.gz bundles.
 all-bundles: product-bundles test-bundles docs-bundles static-libs-bundles
diff --git a/make/StaticLibs.gmk b/make/StaticLibs.gmk
index 3fcbd0565c3..3cf2a4dd136 100644
--- a/make/StaticLibs.gmk
+++ b/make/StaticLibs.gmk
@@ -31,6 +31,7 @@ include CopyFiles.gmk
 include DebugInfoUtils.gmk
 include Modules.gmk
 include modules/LauncherCommon.gmk
+include Execute.gmk
 
 ################################################################################
 #
@@ -68,6 +69,10 @@ else ifeq ($(call isTargetOs, windows), true)
   BROKEN_STATIC_LIBS += sspi_bridge
   # dt_shmem define jdwpTransport_OnLoad which conflict with dt_socket
   BROKEN_STATIC_LIBS += dt_shmem
+else ifeq ($(call isTargetOs, aix), true)
+  # libsplashscreen has a name conflict with libawt in the function
+  # BitmapToYXBandedRectangles, so we exclude it for now.
+  BROKEN_STATIC_LIBS += splashscreen
 endif
 
 $(foreach module, $(STATIC_LIB_MODULES), \
@@ -99,6 +104,18 @@ else ifeq ($(call isTargetOs, linux), true)
   STATIC_LIBS := -Wl,--export-dynamic -Wl,--whole-archive $(STATIC_LIB_FILES) -Wl,--no-whole-archive
 else ifeq ($(call isTargetOs, windows), true)
   STATIC_LIBS := $(addprefix -wholearchive:, $(STATIC_LIB_FILES))
+else ifeq ($(call isTargetOs, aix), true)
+  # on AIX we have to generate export files for all static libs, because we have no whole-archive linker flag
+  $(foreach lib, $(STATIC_LIB_FILES), \
+    $(eval $(call SetupExecute, generate_export_list_$(notdir $(lib)), \
+      INFO := Generating export list for $(notdir $(lib)), \
+      DEPS :=  $(lib), \
+      OUTPUT_FILE := $(lib).exp, \
+      COMMAND := ( $(AR) $(ARFLAGS) -w $(lib) | $(GREP) -v '^\.' | $(AWK) '{print $$1}' | $(SORT) -u > $(lib).exp ), \
+    )) \
+    $(eval STATIC_LIB_EXPORT_FILES += $(lib).exp) \
+  )
+  STATIC_LIBS := -Wl,-bexpfull $(STATIC_LIB_FILES) $(addprefix -Wl$(COMMA)-bE:, $(STATIC_LIB_EXPORT_FILES))
 else
   $(error Unsupported platform)
 endif
@@ -118,6 +135,9 @@ $(eval $(call SetupBuildLauncher, java, \
 ))
 
 $(java): $(STATIC_LIB_FILES)
+ifeq ($(call isTargetOs, aix), true)
+  $(java): $(STATIC_LIB_EXPORT_FILES)
+endif
 
 TARGETS += $(java)
 
diff --git a/make/modules/java.base/lib/CoreLibraries.gmk b/make/modules/java.base/lib/CoreLibraries.gmk
index 1046b8f846c..316103be4cd 100644
--- a/make/modules/java.base/lib/CoreLibraries.gmk
+++ b/make/modules/java.base/lib/CoreLibraries.gmk
@@ -167,6 +167,14 @@ endif
 ifeq ($(call isTargetOs, aix), true)
   # AIX requires a static libjli because the compiler doesn't support '-rpath'
   BUILD_LIBJLI_TYPE := STATIC_LIBRARY
+
+  # This is the object file to provide the dladdr API, which is not
+  # part of AIX. It occurs several times in the jdk code base.
+  # Do not include it. When statically linking the java
+  # launcher with all JDK and VM static libraries, we use the
+  # --whole-archive linker option. The duplicate objects in different
+  # static libraries cause linking errors due to duplicate symbols.
+  LIBJLI_STATIC_EXCLUDE_OBJS += java_md_aix.o
 endif
 
 $(eval $(call SetupJdkLibrary, BUILD_LIBJLI, \
diff --git a/make/modules/java.desktop/lib/AwtLibraries.gmk b/make/modules/java.desktop/lib/AwtLibraries.gmk
index 23b1e6e9d59..5507c1d3edd 100644
--- a/make/modules/java.desktop/lib/AwtLibraries.gmk
+++ b/make/modules/java.desktop/lib/AwtLibraries.gmk
@@ -95,6 +95,16 @@ ifeq ($(call isTargetOs, windows), true)
       $(TOPDIR)/src/$(MODULE)/windows/native/libawt/windows/awt.rc
 endif
 
+# This is the object file to provide the dladdr API, which is not
+# part of AIX. It occurs several times in the jdk code base.
+# Do not include it. When statically linking the java
+# launcher with all JDK and VM static libraries, we use the
+# --whole-archive linker option. The duplicate objects in different
+# static libraries cause linking errors due to duplicate symbols.
+ifeq ($(call isTargetOs, aix), true)
+  LIBAWT_STATIC_EXCLUDE_OBJS := porting_aix.o
+endif
+
 # -fgcse-after-reload improves performance of MaskFill in Java2D by 20% for
 # some gcc
 $(eval $(call SetupJdkLibrary, BUILD_LIBAWT, \
@@ -140,6 +150,7 @@ $(eval $(call SetupJdkLibrary, BUILD_LIBAWT, \
         user32.lib uuid.lib winmm.lib winspool.lib, \
     VERSIONINFO_RESOURCE := $(LIBAWT_VERSIONINFO_RESOURCE), \
     EXTRA_RCFLAGS := $(LIBAWT_RCFLAGS), \
+    STATIC_LIB_EXCLUDE_OBJS := $(LIBAWT_STATIC_EXCLUDE_OBJS), \
 ))
 
 TARGETS += $(BUILD_LIBAWT)
diff --git a/src/hotspot/os/aix/loadlib_aix.cpp b/src/hotspot/os/aix/loadlib_aix.cpp
index 2c38e1b637c..90a7271ad6d 100644
--- a/src/hotspot/os/aix/loadlib_aix.cpp
+++ b/src/hotspot/os/aix/loadlib_aix.cpp
@@ -42,6 +42,9 @@
 // For loadquery()
 #include <sys/ldr.h>
 
+// For getargs()
+#include <procinfo.h>
+
 // Use raw malloc instead of os::malloc - this code gets used for error reporting.
 
 // A class to "intern" eternal strings.
@@ -205,6 +208,22 @@ static bool reload_table() {
 
   trcVerbose("loadquery buffer size is %zu.", buflen);
 
+  // the entry for the executable itself does not contain a path.
+  // instead we retrieve the path of the executable with the getargs API.
+  static char pgmpath[PATH_MAX+1] = "";
+  static char* pgmbase = nullptr;
+  if (pgmpath[0] == 0) {
+    procentry64 PInfo;
+    PInfo.pi_pid = ::getpid();
+    if (0 == ::getargs(&PInfo, sizeof(PInfo), (char*)pgmpath, PATH_MAX) && *pgmpath) {
+      pgmpath[PATH_MAX] = '\0';
+      pgmbase = strrchr(pgmpath, '/');
+      if (pgmbase != nullptr) {
+        pgmbase += 1;
+      }
+    }
+  }
+
   // Iterate over the loadquery result. For details see sys/ldr.h on AIX.
   ldi = (struct ld_info*) buffer;
 
@@ -223,7 +242,12 @@ static bool reload_table() {
     lm->data     = ldi->ldinfo_dataorg;
     lm->data_len = ldi->ldinfo_datasize;
 
-    lm->path = g_stringlist.add(ldi->ldinfo_filename);
+    if (pgmbase != nullptr && 0 == strcmp(pgmbase, ldi->ldinfo_filename)) {
+      lm->path = g_stringlist.add(pgmpath);
+    } else {
+      lm->path = g_stringlist.add(ldi->ldinfo_filename);
+    }
+
     if (!lm->path) {
       log_warning(os)("OOM.");
       free(lm);

From ddc431805363b4aa8f3d46f4c60517ce3dfd9074 Mon Sep 17 00:00:00 2001
From: Naoto Sato <naoto@openjdk.org>
Date: Mon, 24 Mar 2025 16:15:45 +0000
Subject: [PATCH 448/587] 8352628: Refine Grapheme test

Reviewed-by: jlu, joehw
---
 test/jdk/java/util/regex/RegExTest.java | 163 ++++++++++++------------
 1 file changed, 80 insertions(+), 83 deletions(-)

diff --git a/test/jdk/java/util/regex/RegExTest.java b/test/jdk/java/util/regex/RegExTest.java
index 17514521c06..3338b4f5c2d 100644
--- a/test/jdk/java/util/regex/RegExTest.java
+++ b/test/jdk/java/util/regex/RegExTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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,6 @@ import java.io.*;
 import java.math.BigInteger;
 import java.nio.CharBuffer;
 import java.nio.file.Files;
-import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.*;
 import java.util.function.Function;
@@ -62,8 +61,8 @@ import java.util.regex.PatternSyntaxException;
 import java.util.stream.IntStream;
 import java.util.stream.Stream;
 
+import org.testng.annotations.DataProvider;
 import org.testng.annotations.Test;
-import org.testng.Assert;
 
 
 import jdk.test.lib.RandomFactory;
@@ -4148,87 +4147,85 @@ public class RegExTest {
             Pattern.compile("(?imsducxU).(?-imsducxU).");
     }
 
-    @Test
-    public static void grapheme() throws Exception {
-        final int[] lineNumber = new int[1];
-        Stream.concat(Files.lines(UCDFiles.GRAPHEME_BREAK_TEST),
+    @DataProvider
+    private static String[] graphemeTestCases() throws Exception {
+        return Stream.concat(Files.lines(UCDFiles.GRAPHEME_BREAK_TEST),
                 Files.lines(Paths.get(System.getProperty("test.src", "."), "GraphemeTestCases.txt")))
-            .forEach( ln -> {
-                    lineNumber[0]++;
-                    if (ln.length() == 0 || ln.startsWith("#")) {
-                        return;
-                    }
-                    ln = ln.replaceAll("\\s+|\\([a-zA-Z]+\\)|\\[[a-zA-Z]]+\\]|#.*", "");
-                    // System.out.println(str);
-                    String[] strs = ln.split("\u00f7|\u00d7");
-                    StringBuilder src = new StringBuilder();
-                    ArrayList<String> graphemes = new ArrayList<>();
-                    StringBuilder buf = new StringBuilder();
-                    int offBk = 0;
-                    for (String str : strs) {
-                        if (str.length() == 0)  // first empty str
-                            continue;
-                        int cp = Integer.parseInt(str, 16);
-                        src.appendCodePoint(cp);
-                        buf.appendCodePoint(cp);
-                        offBk += (str.length() + 1);
-                        if (ln.charAt(offBk) == '\u00f7') {    // DIV
-                            graphemes.add(buf.toString());
-                            buf = new StringBuilder();
-                        }
-                    }
-                    Pattern p = Pattern.compile("\\X");
-                    // (1) test \X directly
-                    Matcher m = p.matcher(src.toString());
-                    for (String g : graphemes) {
-                        // System.out.printf("     grapheme:=[%s]%n", g);
-                        String group = null;
-                        if (!m.find() || !(group = m.group()).equals(g)) {
-                                 fail("Failed pattern \\X [" + ln + "] : "
-                                    + "expected: " + g + " - actual: " + group
-                                    + "(line " + lineNumber[0] + ")");
-                        }
-                    }
-                    assertFalse(m.find());
-                    // test \b{g} without \X via Pattern
-                    Pattern pbg = Pattern.compile("\\b{g}");
-                    m = pbg.matcher(src.toString());
-                    m.find();
-                    int prev = m.end();
-                    for (String g : graphemes) {
-                        String group = null;
-                        if (!m.find() || !(group = src.substring(prev, m.end())).equals(g)) {
-                                 fail("Failed pattern \\b{g} [" + ln + "] : "
-                                    + "expected: " + g + " - actual: " + group
-                                    + "(line " + lineNumber[0] + ")");
-                        }
-                        assertEquals("", m.group());
-                        prev = m.end();
-                    }
-                    assertFalse(m.find());
-                    // (2) test \b{g} + \X  via Scanner
-                    Scanner s = new Scanner(src.toString()).useDelimiter("\\b{g}");
-                    for (String g : graphemes) {
-                        String next = null;
-                        if (!s.hasNext(p) || !(next = s.next(p)).equals(g)) {
-                                 fail("Failed \\b{g} [" + ln + "] : "
-                                    + "expected: " + g + " - actual: " + next
-                                    + " (line " + lineNumber[0] + ")");
-                        }
-                    }
-                    assertFalse(s.hasNext(p));
-                    // test \b{g} without \X via Scanner
-                    s = new Scanner(src.toString()).useDelimiter("\\b{g}");
-                    for (String g : graphemes) {
-                        String next = null;
-                        if (!s.hasNext() || !(next = s.next()).equals(g)) {
-                                 fail("Failed \\b{g} [" + ln + "] : "
-                                    + "expected: " + g + " - actual: " + next
-                                    + " (line " + lineNumber[0] + ")");
-                        }
-                    }
-                    assertFalse(s.hasNext());
-                });
+            .filter(line -> !line.isEmpty() && !line.startsWith("#"))
+            .toArray(String[]::new);
+    }
+
+    @Test(dataProvider = "graphemeTestCases")
+    public static void grapheme(String line) throws Exception {
+        String tc = line.replaceAll("\\s+|\\([a-zA-Z]+\\)|\\[[a-zA-Z]]+]|#.*", "");
+        String[] strs = tc.split("\u00f7|\u00d7");
+        StringBuilder src = new StringBuilder();
+        ArrayList<String> graphemes = new ArrayList<>();
+        StringBuilder buf = new StringBuilder();
+        int offBk = 0;
+        for (String str : strs) {
+            if (str.length() == 0)  // first empty str
+                continue;
+            int cp = Integer.parseInt(str, 16);
+            src.appendCodePoint(cp);
+            buf.appendCodePoint(cp);
+            offBk += (str.length() + 1);
+            if (tc.charAt(offBk) == '\u00f7') {    // DIV
+                graphemes.add(buf.toString());
+                buf = new StringBuilder();
+            }
+        }
+        Pattern p = Pattern.compile("\\X");
+        // (1) test \X directly
+        Matcher m = p.matcher(src.toString());
+        for (String g : graphemes) {
+            // System.out.printf("     grapheme:=[%s]%n", g);
+            String group = null;
+            if (!m.find() || !(group = m.group()).equals(g)) {
+                fail("Failed pattern \\X [" + tc + "] : "
+                    + "expected: " + g + " - actual: " + group);
+            }
+        }
+        assertFalse(m.find());
+        // test \b{g} without \X via Pattern
+        Pattern pbg = Pattern.compile("\\b{g}");
+        m = pbg.matcher(src.toString());
+        m.find();
+        int prev = m.end();
+        for (String g : graphemes) {
+            String group = null;
+            if (!m.find() || !(group = src.substring(prev, m.end())).equals(g)) {
+                fail("Failed pattern \\b{g} [" + tc + "] : "
+                    + "expected: " + g + " - actual: " + group);
+            }
+            assertEquals("", m.group());
+            prev = m.end();
+        }
+        assertFalse(m.find());
+        // (2) test \b{g} + \X  via Scanner
+        Scanner s = new Scanner(src.toString()).useDelimiter("\\b{g}");
+        for (String g : graphemes) {
+            String next = null;
+            if (!s.hasNext(p) || !(next = s.next(p)).equals(g)) {
+                fail("Failed \\b{g} [" + tc + "] : "
+                    + "expected: " + g + " - actual: " + next);
+            }
+        }
+        assertFalse(s.hasNext(p));
+        // test \b{g} without \X via Scanner
+        s = new Scanner(src.toString()).useDelimiter("\\b{g}");
+        for (String g : graphemes) {
+            String next = null;
+            if (!s.hasNext() || !(next = s.next()).equals(g)) {
+                fail("Failed \\b{g} [" + tc + "] : "
+                    + "expected: " + g + " - actual: " + next);
+            }
+        }
+        assertFalse(s.hasNext());
+    }
+
+    @Test
+    public static void graphemeSanity() {
         // some sanity checks
         assertTrue(Pattern.compile("\\X{10}").matcher("abcdefghij").matches() &&
                    Pattern.compile("\\b{g}(?:\\X\\b{g}){5}\\b{g}").matcher("abcde").matches() &&

From 7d1fe0e03fbdc73920094ff7905208a57dc4ee65 Mon Sep 17 00:00:00 2001
From: Ian Graves <igraves@openjdk.org>
Date: Mon, 24 Mar 2025 16:24:56 +0000
Subject: [PATCH 449/587] 8339543: [vectorapi] laneHelper and withLaneHelper
 should be ForceInline

Reviewed-by: liach, psandoz
---
 .../share/classes/jdk/incubator/vector/Byte128Vector.java     | 2 ++
 .../share/classes/jdk/incubator/vector/Byte256Vector.java     | 2 ++
 .../share/classes/jdk/incubator/vector/Byte512Vector.java     | 2 ++
 .../share/classes/jdk/incubator/vector/Byte64Vector.java      | 2 ++
 .../share/classes/jdk/incubator/vector/ByteMaxVector.java     | 2 ++
 .../share/classes/jdk/incubator/vector/Double128Vector.java   | 2 ++
 .../share/classes/jdk/incubator/vector/Double256Vector.java   | 2 ++
 .../share/classes/jdk/incubator/vector/Double512Vector.java   | 2 ++
 .../share/classes/jdk/incubator/vector/Double64Vector.java    | 2 ++
 .../share/classes/jdk/incubator/vector/DoubleMaxVector.java   | 2 ++
 .../share/classes/jdk/incubator/vector/Float128Vector.java    | 2 ++
 .../share/classes/jdk/incubator/vector/Float256Vector.java    | 2 ++
 .../share/classes/jdk/incubator/vector/Float512Vector.java    | 2 ++
 .../share/classes/jdk/incubator/vector/Float64Vector.java     | 2 ++
 .../share/classes/jdk/incubator/vector/FloatMaxVector.java    | 2 ++
 .../share/classes/jdk/incubator/vector/Int128Vector.java      | 2 ++
 .../share/classes/jdk/incubator/vector/Int256Vector.java      | 2 ++
 .../share/classes/jdk/incubator/vector/Int512Vector.java      | 2 ++
 .../share/classes/jdk/incubator/vector/Int64Vector.java       | 2 ++
 .../share/classes/jdk/incubator/vector/IntMaxVector.java      | 2 ++
 .../share/classes/jdk/incubator/vector/Long128Vector.java     | 2 ++
 .../share/classes/jdk/incubator/vector/Long256Vector.java     | 2 ++
 .../share/classes/jdk/incubator/vector/Long512Vector.java     | 2 ++
 .../share/classes/jdk/incubator/vector/Long64Vector.java      | 2 ++
 .../share/classes/jdk/incubator/vector/LongMaxVector.java     | 2 ++
 .../share/classes/jdk/incubator/vector/Short128Vector.java    | 2 ++
 .../share/classes/jdk/incubator/vector/Short256Vector.java    | 2 ++
 .../share/classes/jdk/incubator/vector/Short512Vector.java    | 2 ++
 .../share/classes/jdk/incubator/vector/Short64Vector.java     | 2 ++
 .../share/classes/jdk/incubator/vector/ShortMaxVector.java    | 2 ++
 .../classes/jdk/incubator/vector/X-VectorBits.java.template   | 4 ++++
 31 files changed, 64 insertions(+)

diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Byte128Vector.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Byte128Vector.java
index a71a6212295..ae64fb83be3 100644
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Byte128Vector.java
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Byte128Vector.java
@@ -536,6 +536,7 @@ final class Byte128Vector extends ByteVector {
         }
     }
 
+    @ForceInline
     public byte laneHelper(int i) {
         return (byte) VectorSupport.extract(
                                 VCLASS, ETYPE, VLENGTH,
@@ -570,6 +571,7 @@ final class Byte128Vector extends ByteVector {
         }
     }
 
+    @ForceInline
     public Byte128Vector withLaneHelper(int i, byte e) {
         return VectorSupport.insert(
                                 VCLASS, ETYPE, VLENGTH,
diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Byte256Vector.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Byte256Vector.java
index 828c8bcb905..f2847f0bc20 100644
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Byte256Vector.java
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Byte256Vector.java
@@ -552,6 +552,7 @@ final class Byte256Vector extends ByteVector {
         }
     }
 
+    @ForceInline
     public byte laneHelper(int i) {
         return (byte) VectorSupport.extract(
                                 VCLASS, ETYPE, VLENGTH,
@@ -602,6 +603,7 @@ final class Byte256Vector extends ByteVector {
         }
     }
 
+    @ForceInline
     public Byte256Vector withLaneHelper(int i, byte e) {
         return VectorSupport.insert(
                                 VCLASS, ETYPE, VLENGTH,
diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Byte512Vector.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Byte512Vector.java
index a5c32ff6b1f..192013ef5a5 100644
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Byte512Vector.java
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Byte512Vector.java
@@ -584,6 +584,7 @@ final class Byte512Vector extends ByteVector {
         }
     }
 
+    @ForceInline
     public byte laneHelper(int i) {
         return (byte) VectorSupport.extract(
                                 VCLASS, ETYPE, VLENGTH,
@@ -666,6 +667,7 @@ final class Byte512Vector extends ByteVector {
         }
     }
 
+    @ForceInline
     public Byte512Vector withLaneHelper(int i, byte e) {
         return VectorSupport.insert(
                                 VCLASS, ETYPE, VLENGTH,
diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Byte64Vector.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Byte64Vector.java
index 222e6ec5e39..d99112d5e13 100644
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Byte64Vector.java
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Byte64Vector.java
@@ -528,6 +528,7 @@ final class Byte64Vector extends ByteVector {
         }
     }
 
+    @ForceInline
     public byte laneHelper(int i) {
         return (byte) VectorSupport.extract(
                                 VCLASS, ETYPE, VLENGTH,
@@ -554,6 +555,7 @@ final class Byte64Vector extends ByteVector {
         }
     }
 
+    @ForceInline
     public Byte64Vector withLaneHelper(int i, byte e) {
         return VectorSupport.insert(
                                 VCLASS, ETYPE, VLENGTH,
diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/ByteMaxVector.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/ByteMaxVector.java
index 774b351bebb..e59470ecc31 100644
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/ByteMaxVector.java
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/ByteMaxVector.java
@@ -521,6 +521,7 @@ final class ByteMaxVector extends ByteVector {
         return laneHelper(i);
     }
 
+    @ForceInline
     public byte laneHelper(int i) {
         return (byte) VectorSupport.extract(
                                 VCLASS, ETYPE, VLENGTH,
@@ -540,6 +541,7 @@ final class ByteMaxVector extends ByteVector {
         return withLaneHelper(i, e);
     }
 
+    @ForceInline
     public ByteMaxVector withLaneHelper(int i, byte e) {
         return VectorSupport.insert(
                                 VCLASS, ETYPE, VLENGTH,
diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Double128Vector.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Double128Vector.java
index 7d343d4e244..8b4285d50df 100644
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Double128Vector.java
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Double128Vector.java
@@ -511,6 +511,7 @@ final class Double128Vector extends DoubleVector {
         return Double.longBitsToDouble(bits);
     }
 
+    @ForceInline
     public long laneHelper(int i) {
         return (long) VectorSupport.extract(
                      VCLASS, ETYPE, VLENGTH,
@@ -531,6 +532,7 @@ final class Double128Vector extends DoubleVector {
         }
     }
 
+    @ForceInline
     public Double128Vector withLaneHelper(int i, double e) {
         return VectorSupport.insert(
                                 VCLASS, ETYPE, VLENGTH,
diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Double256Vector.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Double256Vector.java
index a8645badc27..c5a373b6098 100644
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Double256Vector.java
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Double256Vector.java
@@ -513,6 +513,7 @@ final class Double256Vector extends DoubleVector {
         return Double.longBitsToDouble(bits);
     }
 
+    @ForceInline
     public long laneHelper(int i) {
         return (long) VectorSupport.extract(
                      VCLASS, ETYPE, VLENGTH,
@@ -535,6 +536,7 @@ final class Double256Vector extends DoubleVector {
         }
     }
 
+    @ForceInline
     public Double256Vector withLaneHelper(int i, double e) {
         return VectorSupport.insert(
                                 VCLASS, ETYPE, VLENGTH,
diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Double512Vector.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Double512Vector.java
index 64535c67b19..1f71c257d18 100644
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Double512Vector.java
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Double512Vector.java
@@ -517,6 +517,7 @@ final class Double512Vector extends DoubleVector {
         return Double.longBitsToDouble(bits);
     }
 
+    @ForceInline
     public long laneHelper(int i) {
         return (long) VectorSupport.extract(
                      VCLASS, ETYPE, VLENGTH,
@@ -543,6 +544,7 @@ final class Double512Vector extends DoubleVector {
         }
     }
 
+    @ForceInline
     public Double512Vector withLaneHelper(int i, double e) {
         return VectorSupport.insert(
                                 VCLASS, ETYPE, VLENGTH,
diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Double64Vector.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Double64Vector.java
index 45b91ee88bf..6acb6f1b314 100644
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Double64Vector.java
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Double64Vector.java
@@ -510,6 +510,7 @@ final class Double64Vector extends DoubleVector {
         return Double.longBitsToDouble(bits);
     }
 
+    @ForceInline
     public long laneHelper(int i) {
         return (long) VectorSupport.extract(
                      VCLASS, ETYPE, VLENGTH,
@@ -529,6 +530,7 @@ final class Double64Vector extends DoubleVector {
         }
     }
 
+    @ForceInline
     public Double64Vector withLaneHelper(int i, double e) {
         return VectorSupport.insert(
                                 VCLASS, ETYPE, VLENGTH,
diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/DoubleMaxVector.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/DoubleMaxVector.java
index 03f9448f1ab..7c5d2be9ab5 100644
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/DoubleMaxVector.java
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/DoubleMaxVector.java
@@ -509,6 +509,7 @@ final class DoubleMaxVector extends DoubleVector {
         return Double.longBitsToDouble(bits);
     }
 
+    @ForceInline
     public long laneHelper(int i) {
         return (long) VectorSupport.extract(
                      VCLASS, ETYPE, VLENGTH,
@@ -528,6 +529,7 @@ final class DoubleMaxVector extends DoubleVector {
         return withLaneHelper(i, e);
     }
 
+    @ForceInline
     public DoubleMaxVector withLaneHelper(int i, double e) {
         return VectorSupport.insert(
                                 VCLASS, ETYPE, VLENGTH,
diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Float128Vector.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Float128Vector.java
index 77301e4c773..12119bb1198 100644
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Float128Vector.java
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Float128Vector.java
@@ -513,6 +513,7 @@ final class Float128Vector extends FloatVector {
         return Float.intBitsToFloat(bits);
     }
 
+    @ForceInline
     public int laneHelper(int i) {
         return (int) VectorSupport.extract(
                      VCLASS, ETYPE, VLENGTH,
@@ -535,6 +536,7 @@ final class Float128Vector extends FloatVector {
         }
     }
 
+    @ForceInline
     public Float128Vector withLaneHelper(int i, float e) {
         return VectorSupport.insert(
                                 VCLASS, ETYPE, VLENGTH,
diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Float256Vector.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Float256Vector.java
index f81a9adda42..2d150961f48 100644
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Float256Vector.java
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Float256Vector.java
@@ -517,6 +517,7 @@ final class Float256Vector extends FloatVector {
         return Float.intBitsToFloat(bits);
     }
 
+    @ForceInline
     public int laneHelper(int i) {
         return (int) VectorSupport.extract(
                      VCLASS, ETYPE, VLENGTH,
@@ -543,6 +544,7 @@ final class Float256Vector extends FloatVector {
         }
     }
 
+    @ForceInline
     public Float256Vector withLaneHelper(int i, float e) {
         return VectorSupport.insert(
                                 VCLASS, ETYPE, VLENGTH,
diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Float512Vector.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Float512Vector.java
index 1cf6afca4b4..519bf552868 100644
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Float512Vector.java
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Float512Vector.java
@@ -525,6 +525,7 @@ final class Float512Vector extends FloatVector {
         return Float.intBitsToFloat(bits);
     }
 
+    @ForceInline
     public int laneHelper(int i) {
         return (int) VectorSupport.extract(
                      VCLASS, ETYPE, VLENGTH,
@@ -559,6 +560,7 @@ final class Float512Vector extends FloatVector {
         }
     }
 
+    @ForceInline
     public Float512Vector withLaneHelper(int i, float e) {
         return VectorSupport.insert(
                                 VCLASS, ETYPE, VLENGTH,
diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Float64Vector.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Float64Vector.java
index 1974b93d0ae..3f1dad82b8b 100644
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Float64Vector.java
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Float64Vector.java
@@ -511,6 +511,7 @@ final class Float64Vector extends FloatVector {
         return Float.intBitsToFloat(bits);
     }
 
+    @ForceInline
     public int laneHelper(int i) {
         return (int) VectorSupport.extract(
                      VCLASS, ETYPE, VLENGTH,
@@ -531,6 +532,7 @@ final class Float64Vector extends FloatVector {
         }
     }
 
+    @ForceInline
     public Float64Vector withLaneHelper(int i, float e) {
         return VectorSupport.insert(
                                 VCLASS, ETYPE, VLENGTH,
diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/FloatMaxVector.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/FloatMaxVector.java
index 14981d02151..f4bedec2f48 100644
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/FloatMaxVector.java
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/FloatMaxVector.java
@@ -509,6 +509,7 @@ final class FloatMaxVector extends FloatVector {
         return Float.intBitsToFloat(bits);
     }
 
+    @ForceInline
     public int laneHelper(int i) {
         return (int) VectorSupport.extract(
                      VCLASS, ETYPE, VLENGTH,
@@ -528,6 +529,7 @@ final class FloatMaxVector extends FloatVector {
         return withLaneHelper(i, e);
     }
 
+    @ForceInline
     public FloatMaxVector withLaneHelper(int i, float e) {
         return VectorSupport.insert(
                                 VCLASS, ETYPE, VLENGTH,
diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Int128Vector.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Int128Vector.java
index a4660dd94c6..11b45f48e35 100644
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Int128Vector.java
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Int128Vector.java
@@ -524,6 +524,7 @@ final class Int128Vector extends IntVector {
         }
     }
 
+    @ForceInline
     public int laneHelper(int i) {
         return (int) VectorSupport.extract(
                                 VCLASS, ETYPE, VLENGTH,
@@ -546,6 +547,7 @@ final class Int128Vector extends IntVector {
         }
     }
 
+    @ForceInline
     public Int128Vector withLaneHelper(int i, int e) {
         return VectorSupport.insert(
                                 VCLASS, ETYPE, VLENGTH,
diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Int256Vector.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Int256Vector.java
index 284ee1cebca..a6a59207a04 100644
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Int256Vector.java
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Int256Vector.java
@@ -528,6 +528,7 @@ final class Int256Vector extends IntVector {
         }
     }
 
+    @ForceInline
     public int laneHelper(int i) {
         return (int) VectorSupport.extract(
                                 VCLASS, ETYPE, VLENGTH,
@@ -554,6 +555,7 @@ final class Int256Vector extends IntVector {
         }
     }
 
+    @ForceInline
     public Int256Vector withLaneHelper(int i, int e) {
         return VectorSupport.insert(
                                 VCLASS, ETYPE, VLENGTH,
diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Int512Vector.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Int512Vector.java
index f0c8ddabfae..f9a1c4413e7 100644
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Int512Vector.java
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Int512Vector.java
@@ -536,6 +536,7 @@ final class Int512Vector extends IntVector {
         }
     }
 
+    @ForceInline
     public int laneHelper(int i) {
         return (int) VectorSupport.extract(
                                 VCLASS, ETYPE, VLENGTH,
@@ -570,6 +571,7 @@ final class Int512Vector extends IntVector {
         }
     }
 
+    @ForceInline
     public Int512Vector withLaneHelper(int i, int e) {
         return VectorSupport.insert(
                                 VCLASS, ETYPE, VLENGTH,
diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Int64Vector.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Int64Vector.java
index 27963859a09..6099077cda9 100644
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Int64Vector.java
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Int64Vector.java
@@ -522,6 +522,7 @@ final class Int64Vector extends IntVector {
         }
     }
 
+    @ForceInline
     public int laneHelper(int i) {
         return (int) VectorSupport.extract(
                                 VCLASS, ETYPE, VLENGTH,
@@ -542,6 +543,7 @@ final class Int64Vector extends IntVector {
         }
     }
 
+    @ForceInline
     public Int64Vector withLaneHelper(int i, int e) {
         return VectorSupport.insert(
                                 VCLASS, ETYPE, VLENGTH,
diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/IntMaxVector.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/IntMaxVector.java
index d5140567ca0..fa9eadfdc71 100644
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/IntMaxVector.java
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/IntMaxVector.java
@@ -521,6 +521,7 @@ final class IntMaxVector extends IntVector {
         return laneHelper(i);
     }
 
+    @ForceInline
     public int laneHelper(int i) {
         return (int) VectorSupport.extract(
                                 VCLASS, ETYPE, VLENGTH,
@@ -540,6 +541,7 @@ final class IntMaxVector extends IntVector {
         return withLaneHelper(i, e);
     }
 
+    @ForceInline
     public IntMaxVector withLaneHelper(int i, int e) {
         return VectorSupport.insert(
                                 VCLASS, ETYPE, VLENGTH,
diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Long128Vector.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Long128Vector.java
index 8b57f1c498c..8db20c774b6 100644
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Long128Vector.java
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Long128Vector.java
@@ -512,6 +512,7 @@ final class Long128Vector extends LongVector {
         }
     }
 
+    @ForceInline
     public long laneHelper(int i) {
         return (long) VectorSupport.extract(
                                 VCLASS, ETYPE, VLENGTH,
@@ -532,6 +533,7 @@ final class Long128Vector extends LongVector {
         }
     }
 
+    @ForceInline
     public Long128Vector withLaneHelper(int i, long e) {
         return VectorSupport.insert(
                                 VCLASS, ETYPE, VLENGTH,
diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Long256Vector.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Long256Vector.java
index 3f808fe1a2f..8ca688424d0 100644
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Long256Vector.java
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Long256Vector.java
@@ -514,6 +514,7 @@ final class Long256Vector extends LongVector {
         }
     }
 
+    @ForceInline
     public long laneHelper(int i) {
         return (long) VectorSupport.extract(
                                 VCLASS, ETYPE, VLENGTH,
@@ -536,6 +537,7 @@ final class Long256Vector extends LongVector {
         }
     }
 
+    @ForceInline
     public Long256Vector withLaneHelper(int i, long e) {
         return VectorSupport.insert(
                                 VCLASS, ETYPE, VLENGTH,
diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Long512Vector.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Long512Vector.java
index 3d5e00b09c6..9abf3a50561 100644
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Long512Vector.java
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Long512Vector.java
@@ -518,6 +518,7 @@ final class Long512Vector extends LongVector {
         }
     }
 
+    @ForceInline
     public long laneHelper(int i) {
         return (long) VectorSupport.extract(
                                 VCLASS, ETYPE, VLENGTH,
@@ -544,6 +545,7 @@ final class Long512Vector extends LongVector {
         }
     }
 
+    @ForceInline
     public Long512Vector withLaneHelper(int i, long e) {
         return VectorSupport.insert(
                                 VCLASS, ETYPE, VLENGTH,
diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Long64Vector.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Long64Vector.java
index d34905dbce0..234bf839816 100644
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Long64Vector.java
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Long64Vector.java
@@ -511,6 +511,7 @@ final class Long64Vector extends LongVector {
         }
     }
 
+    @ForceInline
     public long laneHelper(int i) {
         return (long) VectorSupport.extract(
                                 VCLASS, ETYPE, VLENGTH,
@@ -530,6 +531,7 @@ final class Long64Vector extends LongVector {
         }
     }
 
+    @ForceInline
     public Long64Vector withLaneHelper(int i, long e) {
         return VectorSupport.insert(
                                 VCLASS, ETYPE, VLENGTH,
diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/LongMaxVector.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/LongMaxVector.java
index 84ff9d17444..71e490e6a92 100644
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/LongMaxVector.java
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/LongMaxVector.java
@@ -511,6 +511,7 @@ final class LongMaxVector extends LongVector {
         return laneHelper(i);
     }
 
+    @ForceInline
     public long laneHelper(int i) {
         return (long) VectorSupport.extract(
                                 VCLASS, ETYPE, VLENGTH,
@@ -530,6 +531,7 @@ final class LongMaxVector extends LongVector {
         return withLaneHelper(i, e);
     }
 
+    @ForceInline
     public LongMaxVector withLaneHelper(int i, long e) {
         return VectorSupport.insert(
                                 VCLASS, ETYPE, VLENGTH,
diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Short128Vector.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Short128Vector.java
index 17ec4f72d2e..c133d175648 100644
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Short128Vector.java
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Short128Vector.java
@@ -528,6 +528,7 @@ final class Short128Vector extends ShortVector {
         }
     }
 
+    @ForceInline
     public short laneHelper(int i) {
         return (short) VectorSupport.extract(
                                 VCLASS, ETYPE, VLENGTH,
@@ -554,6 +555,7 @@ final class Short128Vector extends ShortVector {
         }
     }
 
+    @ForceInline
     public Short128Vector withLaneHelper(int i, short e) {
         return VectorSupport.insert(
                                 VCLASS, ETYPE, VLENGTH,
diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Short256Vector.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Short256Vector.java
index e7505779f18..16cbef3eda3 100644
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Short256Vector.java
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Short256Vector.java
@@ -536,6 +536,7 @@ final class Short256Vector extends ShortVector {
         }
     }
 
+    @ForceInline
     public short laneHelper(int i) {
         return (short) VectorSupport.extract(
                                 VCLASS, ETYPE, VLENGTH,
@@ -570,6 +571,7 @@ final class Short256Vector extends ShortVector {
         }
     }
 
+    @ForceInline
     public Short256Vector withLaneHelper(int i, short e) {
         return VectorSupport.insert(
                                 VCLASS, ETYPE, VLENGTH,
diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Short512Vector.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Short512Vector.java
index 7ca0d00b37a..81ee0280f47 100644
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Short512Vector.java
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Short512Vector.java
@@ -552,6 +552,7 @@ final class Short512Vector extends ShortVector {
         }
     }
 
+    @ForceInline
     public short laneHelper(int i) {
         return (short) VectorSupport.extract(
                                 VCLASS, ETYPE, VLENGTH,
@@ -602,6 +603,7 @@ final class Short512Vector extends ShortVector {
         }
     }
 
+    @ForceInline
     public Short512Vector withLaneHelper(int i, short e) {
         return VectorSupport.insert(
                                 VCLASS, ETYPE, VLENGTH,
diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Short64Vector.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Short64Vector.java
index 4837bd3d687..fe92dd7d3f6 100644
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Short64Vector.java
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Short64Vector.java
@@ -524,6 +524,7 @@ final class Short64Vector extends ShortVector {
         }
     }
 
+    @ForceInline
     public short laneHelper(int i) {
         return (short) VectorSupport.extract(
                                 VCLASS, ETYPE, VLENGTH,
@@ -546,6 +547,7 @@ final class Short64Vector extends ShortVector {
         }
     }
 
+    @ForceInline
     public Short64Vector withLaneHelper(int i, short e) {
         return VectorSupport.insert(
                                 VCLASS, ETYPE, VLENGTH,
diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/ShortMaxVector.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/ShortMaxVector.java
index 9b90756c826..96369ea18d2 100644
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/ShortMaxVector.java
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/ShortMaxVector.java
@@ -521,6 +521,7 @@ final class ShortMaxVector extends ShortVector {
         return laneHelper(i);
     }
 
+    @ForceInline
     public short laneHelper(int i) {
         return (short) VectorSupport.extract(
                                 VCLASS, ETYPE, VLENGTH,
@@ -540,6 +541,7 @@ final class ShortMaxVector extends ShortVector {
         return withLaneHelper(i, e);
     }
 
+    @ForceInline
     public ShortMaxVector withLaneHelper(int i, short e) {
         return VectorSupport.insert(
                                 VCLASS, ETYPE, VLENGTH,
diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/X-VectorBits.java.template b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/X-VectorBits.java.template
index 216f28fde87..309c9bbf73d 100644
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/X-VectorBits.java.template
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/X-VectorBits.java.template
@@ -572,6 +572,7 @@ final class $vectortype$ extends $abstractvectortype$ {
         return $Type$.$bitstype$BitsTo$Fptype$(bits);
     }
 
+    @ForceInline
     public $bitstype$ laneHelper(int i) {
         return ($bitstype$) VectorSupport.extract(
                      VCLASS, ETYPE, VLENGTH,
@@ -621,6 +622,7 @@ final class $vectortype$ extends $abstractvectortype$ {
 #end[!Max]
     }
 
+    @ForceInline
     public $vectortype$ withLaneHelper(int i, $type$ e) {
         return VectorSupport.insert(
                                 VCLASS, ETYPE, VLENGTH,
@@ -723,6 +725,7 @@ final class $vectortype$ extends $abstractvectortype$ {
 #end[!Max]
     }
 
+    @ForceInline
     public $type$ laneHelper(int i) {
         return ($type$) VectorSupport.extract(
                                 VCLASS, ETYPE, VLENGTH,
@@ -824,6 +827,7 @@ final class $vectortype$ extends $abstractvectortype$ {
 #end[!Max]
     }
 
+    @ForceInline
     public $vectortype$ withLaneHelper(int i, $type$ e) {
         return VectorSupport.insert(
                                 VCLASS, ETYPE, VLENGTH,

From c87e1be0526fdd656bf0601542db6b92ccea567f Mon Sep 17 00:00:00 2001
From: Srinivas Vamsi Parasa <sparasa@openjdk.org>
Date: Mon, 24 Mar 2025 16:44:26 +0000
Subject: [PATCH 450/587] 8349582: APX NDD code generation for OpenJDK

Reviewed-by: epeter, jbhateja, sviswanathan
---
 src/hotspot/cpu/x86/assembler_x86.cpp |   35 +-
 src/hotspot/cpu/x86/assembler_x86.hpp |    1 +
 src/hotspot/cpu/x86/x86_64.ad         | 1774 ++++++++++++-
 test/hotspot/gtest/x86/asmtest.out.h  | 3358 +++++++++++++------------
 test/hotspot/gtest/x86/x86-asmtest.py |   16 +-
 5 files changed, 3575 insertions(+), 1609 deletions(-)

diff --git a/src/hotspot/cpu/x86/assembler_x86.cpp b/src/hotspot/cpu/x86/assembler_x86.cpp
index 085ae4a6ddd..f90dfb2aa5b 100644
--- a/src/hotspot/cpu/x86/assembler_x86.cpp
+++ b/src/hotspot/cpu/x86/assembler_x86.cpp
@@ -332,6 +332,21 @@ void Assembler::emit_arith(int op1, int op2, Register dst, int32_t imm32) {
   }
 }
 
+void Assembler::emit_arith_ndd(int op1, int op2, Register dst, int32_t imm32) {
+  assert(isByte(op1) && isByte(op2), "wrong opcode");
+  assert(op1 == 0x81, "Unexpected opcode");
+  // This code cache friendly optimization saves 3 bytes per encoding, which offsets the EVEX encoding penalty.
+  if (is8bit(imm32)) {
+    emit_int24(op1 | 0x02,        // set sign bit
+               op2 | encode(dst),
+               imm32 & 0xFF);
+  }
+  else {
+    emit_int16(op1, (op2 | encode(dst)));
+    emit_int32(imm32);
+  }
+}
+
 // Force generation of a 4 byte immediate value even if it fits into 8bit
 void Assembler::emit_arith_imm32(int op1, int op2, Register dst, int32_t imm32) {
   assert(isByte(op1) && isByte(op2), "wrong opcode");
@@ -1461,7 +1476,7 @@ void Assembler::addl(Register dst, int32_t imm32) {
 void Assembler::eaddl(Register dst, Register src, int32_t imm32, bool no_flags) {
   InstructionAttr attributes(AVX_128bit, /* vex_w */ false, /* legacy_mode */ false, /* no_mask_reg */ true, /* uses_vl */ false);
   (void) evex_prefix_and_encode_ndd(0, dst->encoding(), src->encoding(), VEX_SIMD_NONE, VEX_OPCODE_0F_3C, &attributes, no_flags);
-  emit_arith(0x81, 0xC0, src, imm32);
+  emit_arith_ndd(0x81, 0xC0, src, imm32);
 }
 
 void Assembler::addl(Register dst, Address src) {
@@ -1695,7 +1710,7 @@ void Assembler::andl(Register dst, int32_t imm32) {
 void Assembler::eandl(Register dst, Register src, int32_t imm32, bool no_flags) {
   InstructionAttr attributes(AVX_128bit, /* vex_w */ false, /* legacy_mode */ false, /* no_mask_reg */ true, /* uses_vl */ false);
   (void) evex_prefix_and_encode_ndd(0, dst->encoding(), src->encoding(), VEX_SIMD_NONE, VEX_OPCODE_0F_3C, &attributes, no_flags);
-  emit_arith(0x81, 0xE0, src, imm32);
+  emit_arith_ndd(0x81, 0xE0, src, imm32);
 }
 
 void Assembler::andl(Address dst, Register src) {
@@ -4532,7 +4547,7 @@ void Assembler::orl(Register dst, int32_t imm32) {
 void Assembler::eorl(Register dst, Register src, int32_t imm32, bool no_flags) {
   InstructionAttr attributes(AVX_128bit, /* vex_w */ false, /* legacy_mode */ false, /* no_mask_reg */ true, /* uses_vl */ false);
   evex_prefix_and_encode_ndd(0, dst->encoding(), src->encoding(), VEX_SIMD_NONE, VEX_OPCODE_0F_3C, &attributes, no_flags);
-  emit_arith(0x81, 0xC8, src, imm32);
+  emit_arith_ndd(0x81, 0xC8, src, imm32);
 }
 
 void Assembler::orl(Register dst, Address src) {
@@ -7171,7 +7186,7 @@ void Assembler::subl(Register dst, int32_t imm32) {
 void Assembler::esubl(Register dst, Register src, int32_t imm32, bool no_flags) {
   InstructionAttr attributes(AVX_128bit, /* vex_w */ false, /* legacy_mode */ false, /* no_mask_reg */ true, /* uses_vl */ false);
   (void) evex_prefix_and_encode_ndd(0, dst->encoding(), src->encoding(), VEX_SIMD_NONE, VEX_OPCODE_0F_3C, &attributes, no_flags);
-  emit_arith(0x81, 0xE8, src, imm32);
+  emit_arith_ndd(0x81, 0xE8, src, imm32);
 }
 
 // Force generation of a 4 byte immediate value even if it fits into 8bit
@@ -7512,7 +7527,7 @@ void Assembler::xorl(Register dst, int32_t imm32) {
 void Assembler::exorl(Register dst, Register src, int32_t imm32, bool no_flags) {
   InstructionAttr attributes(AVX_128bit, /* vex_w */ false, /* legacy_mode */ false, /* no_mask_reg */ true, /* uses_vl */ false);
   evex_prefix_and_encode_ndd(0, dst->encoding(), src->encoding(), VEX_SIMD_NONE, VEX_OPCODE_0F_3C, &attributes, no_flags);
-  emit_arith(0x81, 0xF0, src, imm32);
+  emit_arith_ndd(0x81, 0xF0, src, imm32);
 }
 
 void Assembler::xorl(Register dst, Address src) {
@@ -15158,7 +15173,7 @@ void Assembler::addq(Register dst, int32_t imm32) {
 void Assembler::eaddq(Register dst, Register src, int32_t imm32, bool no_flags) {
   InstructionAttr attributes(AVX_128bit, /* vex_w */ true, /* legacy_mode */ false, /* no_mask_reg */ true, /* uses_vl */ false);
   (void) evex_prefix_and_encode_ndd(0, dst->encoding(), src->encoding(), VEX_SIMD_NONE, VEX_OPCODE_0F_3C, &attributes, no_flags);
-  emit_arith(0x81, 0xC0, src, imm32);
+  emit_arith_ndd(0x81, 0xC0, src, imm32);
 }
 
 void Assembler::addq(Register dst, Address src) {
@@ -15255,7 +15270,7 @@ void Assembler::andq(Register dst, int32_t imm32) {
 void Assembler::eandq(Register dst, Register src, int32_t imm32, bool no_flags) {
   InstructionAttr attributes(AVX_128bit, /* vex_w */ true, /* legacy_mode */ false, /* no_mask_reg */ true, /* uses_vl */ false);
   evex_prefix_and_encode_ndd(0, dst->encoding(), src->encoding(), VEX_SIMD_NONE, VEX_OPCODE_0F_3C, &attributes, no_flags);
-  emit_arith(0x81, 0xE0, src, imm32);
+  emit_arith_ndd(0x81, 0xE0, src, imm32);
 }
 
 void Assembler::andq(Register dst, Address src) {
@@ -16142,7 +16157,7 @@ void Assembler::orq(Register dst, int32_t imm32) {
 void Assembler::eorq(Register dst, Register src, int32_t imm32, bool no_flags) {
   InstructionAttr attributes(AVX_128bit, /* vex_w */ true, /* legacy_mode */ false, /* no_mask_reg */ true, /* uses_vl */ false);
   evex_prefix_and_encode_ndd(0, dst->encoding(), src->encoding(), VEX_SIMD_NONE, VEX_OPCODE_0F_3C, &attributes, no_flags);
-  emit_arith(0x81, 0xC8, src, imm32);
+  emit_arith_ndd(0x81, 0xC8, src, imm32);
 }
 
 void Assembler::orq_imm32(Register dst, int32_t imm32) {
@@ -16830,7 +16845,7 @@ void Assembler::subq(Register dst, int32_t imm32) {
 void Assembler::esubq(Register dst, Register src, int32_t imm32, bool no_flags) {
   InstructionAttr attributes(AVX_128bit, /* vex_w */ true, /* legacy_mode */ false, /* no_mask_reg */ true, /* uses_vl */ false);
   (void) evex_prefix_and_encode_ndd(0, dst->encoding(), src->encoding(), VEX_SIMD_NONE, VEX_OPCODE_0F_3C, &attributes, no_flags);
-  emit_arith(0x81, 0xE8, src, imm32);
+  emit_arith_ndd(0x81, 0xE8, src, imm32);
 }
 
 // Force generation of a 4 byte immediate value even if it fits into 8bit
@@ -16961,7 +16976,7 @@ void Assembler::xorq(Register dst, int32_t imm32) {
 void Assembler::exorq(Register dst, Register src, int32_t imm32, bool no_flags) {
   InstructionAttr attributes(AVX_128bit, /* vex_w */ true, /* legacy_mode */ false, /* no_mask_reg */ true, /* uses_vl */ false);
   evex_prefix_and_encode_ndd(0, dst->encoding(), src->encoding(), VEX_SIMD_NONE, VEX_OPCODE_0F_3C, &attributes, no_flags);
-  emit_arith(0x81, 0xF0, src, imm32);
+  emit_arith_ndd(0x81, 0xF0, src, imm32);
 }
 
 void Assembler::xorq(Address dst, int32_t imm32) {
diff --git a/src/hotspot/cpu/x86/assembler_x86.hpp b/src/hotspot/cpu/x86/assembler_x86.hpp
index 1eb12fb93f0..4992661dce2 100644
--- a/src/hotspot/cpu/x86/assembler_x86.hpp
+++ b/src/hotspot/cpu/x86/assembler_x86.hpp
@@ -823,6 +823,7 @@ private:
   void emit_arith_b(int op1, int op2, Register dst, int imm8);
 
   void emit_arith(int op1, int op2, Register dst, int32_t imm32);
+  void emit_arith_ndd(int op1, int op2, Register dst, int32_t imm32);
   // Force generation of a 4 byte immediate value even if it fits into 8bit
   void emit_arith_imm32(int op1, int op2, Register dst, int32_t imm32);
   void emit_arith(int op1, int op2, Register dst, Register src);
diff --git a/src/hotspot/cpu/x86/x86_64.ad b/src/hotspot/cpu/x86/x86_64.ad
index 10ea0c343a4..b94ff7dbd9e 100644
--- a/src/hotspot/cpu/x86/x86_64.ad
+++ b/src/hotspot/cpu/x86/x86_64.ad
@@ -4381,16 +4381,21 @@ instruct loadNKlassCompactHeaders(rRegN dst, memory mem, rFlagsReg cr)
   predicate(UseCompactObjectHeaders);
   match(Set dst (LoadNKlass mem));
   effect(KILL cr);
-  ins_cost(125); // XXX
+  ins_cost(125);
   format %{
     "movl    $dst, $mem\t# compressed klass ptr, shifted\n\t"
     "shrl    $dst, markWord::klass_shift_at_offset"
   %}
   ins_encode %{
-    __ movl($dst$$Register, $mem$$Address);
-    __ shrl($dst$$Register, markWord::klass_shift_at_offset);
+    if (UseAPX) {
+      __ eshrl($dst$$Register, $mem$$Address, markWord::klass_shift_at_offset, false);
+    }
+    else {
+      __ movl($dst$$Register, $mem$$Address);
+      __ shrl($dst$$Register, markWord::klass_shift_at_offset);
+    }
   %}
-  ins_pipe(ialu_reg_mem); // XXX
+  ins_pipe(ialu_reg_mem);
 %}
 
 // Load Float
@@ -6140,6 +6145,7 @@ instruct cmovI_imm_01(rRegI dst, immI_1 src, rFlagsReg cr, cmpOp cop)
 
 instruct cmovI_reg(rRegI dst, rRegI src, rFlagsReg cr, cmpOp cop)
 %{
+  predicate(!UseAPX);
   match(Set dst (CMoveI (Binary cop cr) (Binary dst src)));
 
   ins_cost(200); // XXX
@@ -6150,6 +6156,19 @@ instruct cmovI_reg(rRegI dst, rRegI src, rFlagsReg cr, cmpOp cop)
   ins_pipe(pipe_cmov_reg);
 %}
 
+instruct cmovI_reg_ndd(rRegI dst, rRegI src1, rRegI src2, rFlagsReg cr, cmpOp cop)
+%{
+  predicate(UseAPX);
+  match(Set dst (CMoveI (Binary cop cr) (Binary src1 src2)));
+
+  ins_cost(200);
+  format %{ "ecmovl$cop $dst, $src1, $src2\t# signed, int ndd" %}
+  ins_encode %{
+    __ ecmovl((Assembler::Condition)($cop$$cmpcode), $dst$$Register, $src1$$Register, $src2$$Register);
+  %}
+  ins_pipe(pipe_cmov_reg);
+%}
+
 instruct cmovI_imm_01U(rRegI dst, immI_1 src, rFlagsRegU cr, cmpOpU cop)
 %{
   predicate(n->in(2)->in(2)->is_Con() && n->in(2)->in(2)->get_int() == 0);
@@ -6165,6 +6184,7 @@ instruct cmovI_imm_01U(rRegI dst, immI_1 src, rFlagsRegU cr, cmpOpU cop)
 %}
 
 instruct cmovI_regU(cmpOpU cop, rFlagsRegU cr, rRegI dst, rRegI src) %{
+  predicate(!UseAPX);
   match(Set dst (CMoveI (Binary cop cr) (Binary dst src)));
 
   ins_cost(200); // XXX
@@ -6175,6 +6195,18 @@ instruct cmovI_regU(cmpOpU cop, rFlagsRegU cr, rRegI dst, rRegI src) %{
   ins_pipe(pipe_cmov_reg);
 %}
 
+instruct cmovI_regU_ndd(rRegI dst, cmpOpU cop, rFlagsRegU cr, rRegI src1, rRegI src2) %{
+  predicate(UseAPX);
+  match(Set dst (CMoveI (Binary cop cr) (Binary src1 src2)));
+
+  ins_cost(200);
+  format %{ "ecmovl$cop $dst, $src1, $src2\t# unsigned, int ndd" %}
+  ins_encode %{
+    __ ecmovl((Assembler::Condition)($cop$$cmpcode), $dst$$Register, $src1$$Register, $src2$$Register);
+  %}
+  ins_pipe(pipe_cmov_reg);
+%}
+
 instruct cmovI_imm_01UCF(rRegI dst, immI_1 src, rFlagsRegUCF cr, cmpOpUCF cop)
 %{
   predicate(n->in(2)->in(2)->is_Con() && n->in(2)->in(2)->get_int() == 0);
@@ -6190,6 +6222,7 @@ instruct cmovI_imm_01UCF(rRegI dst, immI_1 src, rFlagsRegUCF cr, cmpOpUCF cop)
 %}
 
 instruct cmovI_regUCF(cmpOpUCF cop, rFlagsRegUCF cr, rRegI dst, rRegI src) %{
+  predicate(!UseAPX);
   match(Set dst (CMoveI (Binary cop cr) (Binary dst src)));
   ins_cost(200);
   expand %{
@@ -6197,8 +6230,19 @@ instruct cmovI_regUCF(cmpOpUCF cop, rFlagsRegUCF cr, rRegI dst, rRegI src) %{
   %}
 %}
 
+instruct cmovI_regUCF_ndd(rRegI dst, cmpOpUCF cop, rFlagsRegUCF cr, rRegI src1, rRegI src2) %{
+  predicate(UseAPX);
+  match(Set dst (CMoveI (Binary cop cr) (Binary src1 src2)));
+  ins_cost(200);
+  format %{ "ecmovl$cop $dst, $src1, $src2\t# unsigned, int ndd" %}
+  ins_encode %{
+    __ ecmovl((Assembler::Condition)($cop$$cmpcode), $dst$$Register, $src1$$Register, $src2$$Register);
+  %}
+  ins_pipe(pipe_cmov_reg);
+%}
+
 instruct cmovI_regUCF2_ne(cmpOpUCF2 cop, rFlagsRegUCF cr, rRegI dst, rRegI src) %{
-  predicate(n->in(1)->in(1)->as_Bool()->_test._test == BoolTest::ne);
+  predicate(!UseAPX && n->in(1)->in(1)->as_Bool()->_test._test == BoolTest::ne);
   match(Set dst (CMoveI (Binary cop cr) (Binary dst src)));
 
   ins_cost(200); // XXX
@@ -6211,10 +6255,24 @@ instruct cmovI_regUCF2_ne(cmpOpUCF2 cop, rFlagsRegUCF cr, rRegI dst, rRegI src)
   ins_pipe(pipe_cmov_reg);
 %}
 
+instruct cmovI_regUCF2_ne_ndd(cmpOpUCF2 cop, rFlagsRegUCF cr, rRegI dst, rRegI src1, rRegI src2) %{
+  predicate(UseAPX && n->in(1)->in(1)->as_Bool()->_test._test == BoolTest::ne);
+  match(Set dst (CMoveI (Binary cop cr) (Binary src1 src2)));
+
+  ins_cost(200);
+  format %{ "ecmovpl  $dst, $src1, $src2\n\t"
+            "ecmovnel $dst, $src1, $src2" %}
+  ins_encode %{
+    __ ecmovl(Assembler::parity, $dst$$Register, $src1$$Register, $src2$$Register);
+    __ ecmovl(Assembler::notEqual, $dst$$Register, $src1$$Register, $src2$$Register);
+  %}
+  ins_pipe(pipe_cmov_reg);
+%}
+
 // Since (x == y) == !(x != y), we can flip the sense of the test by flipping the
 // inputs of the CMove
 instruct cmovI_regUCF2_eq(cmpOpUCF2 cop, rFlagsRegUCF cr, rRegI dst, rRegI src) %{
-  predicate(n->in(1)->in(1)->as_Bool()->_test._test == BoolTest::eq);
+  predicate(!UseAPX && n->in(1)->in(1)->as_Bool()->_test._test == BoolTest::eq);
   match(Set dst (CMoveI (Binary cop cr) (Binary src dst)));
 
   ins_cost(200); // XXX
@@ -6227,8 +6285,25 @@ instruct cmovI_regUCF2_eq(cmpOpUCF2 cop, rFlagsRegUCF cr, rRegI dst, rRegI src)
   ins_pipe(pipe_cmov_reg);
 %}
 
+// We need this special handling for only eq / neq comparison since NaN == NaN is false,
+// and parity flag bit is set if any of the operand is a NaN.
+instruct cmovI_regUCF2_eq_ndd(cmpOpUCF2 cop, rFlagsRegUCF cr, rRegI dst, rRegI src1, rRegI src2) %{
+  predicate(UseAPX && n->in(1)->in(1)->as_Bool()->_test._test == BoolTest::eq);
+  match(Set dst (CMoveI (Binary cop cr) (Binary src1 src2)));
+
+  ins_cost(200);
+  format %{ "ecmovpl  $dst, $src1, $src2\n\t"
+            "ecmovnel $dst, $src1, $src2" %}
+  ins_encode %{
+    __ ecmovl(Assembler::parity, $dst$$Register, $src1$$Register, $src2$$Register);
+    __ ecmovl(Assembler::notEqual, $dst$$Register, $src1$$Register, $src2$$Register);
+  %}
+  ins_pipe(pipe_cmov_reg);
+%}
+
 // Conditional move
 instruct cmovI_mem(cmpOp cop, rFlagsReg cr, rRegI dst, memory src) %{
+  predicate(!UseAPX);
   match(Set dst (CMoveI (Binary cop cr) (Binary dst (LoadI src))));
 
   ins_cost(250); // XXX
@@ -6239,9 +6314,24 @@ instruct cmovI_mem(cmpOp cop, rFlagsReg cr, rRegI dst, memory src) %{
   ins_pipe(pipe_cmov_mem);
 %}
 
+// Conditional move
+instruct cmovI_rReg_rReg_mem_ndd(rRegI dst, cmpOp cop, rFlagsReg cr, rRegI src1, memory src2)
+%{
+  predicate(UseAPX);
+  match(Set dst (CMoveI (Binary cop cr) (Binary src1 (LoadI src2))));
+
+  ins_cost(250);
+  format %{ "ecmovl$cop $dst, $src1, $src2\t# signed, int ndd" %}
+  ins_encode %{
+    __ ecmovl((Assembler::Condition)($cop$$cmpcode), $dst$$Register, $src1$$Register, $src2$$Address);
+  %}
+  ins_pipe(pipe_cmov_mem);
+%}
+
 // Conditional move
 instruct cmovI_memU(cmpOpU cop, rFlagsRegU cr, rRegI dst, memory src)
 %{
+  predicate(!UseAPX);
   match(Set dst (CMoveI (Binary cop cr) (Binary dst (LoadI src))));
 
   ins_cost(250); // XXX
@@ -6253,6 +6343,7 @@ instruct cmovI_memU(cmpOpU cop, rFlagsRegU cr, rRegI dst, memory src)
 %}
 
 instruct cmovI_memUCF(cmpOpUCF cop, rFlagsRegUCF cr, rRegI dst, memory src) %{
+  predicate(!UseAPX);
   match(Set dst (CMoveI (Binary cop cr) (Binary dst (LoadI src))));
   ins_cost(250);
   expand %{
@@ -6260,9 +6351,35 @@ instruct cmovI_memUCF(cmpOpUCF cop, rFlagsRegUCF cr, rRegI dst, memory src) %{
   %}
 %}
 
+instruct cmovI_rReg_rReg_memU_ndd(rRegI dst, cmpOpU cop, rFlagsRegU cr, rRegI src1, memory src2)
+%{
+  predicate(UseAPX);
+  match(Set dst (CMoveI (Binary cop cr) (Binary src1 (LoadI src2))));
+
+  ins_cost(250);
+  format %{ "ecmovl$cop $dst, $src1, $src2\t# unsigned, int ndd" %}
+  ins_encode %{
+    __ ecmovl((Assembler::Condition)($cop$$cmpcode), $dst$$Register, $src1$$Register, $src2$$Address);
+  %}
+  ins_pipe(pipe_cmov_mem);
+%}
+
+instruct cmovI_rReg_rReg_memUCF_ndd(rRegI dst, cmpOpUCF cop, rFlagsRegUCF cr, rRegI src1, memory src2) 
+%{
+  predicate(UseAPX);
+  match(Set dst (CMoveI (Binary cop cr) (Binary src1 (LoadI src2))));
+  ins_cost(250);
+  format %{ "ecmovl$cop $dst, $src1, $src2\t# unsigned, int ndd" %}
+  ins_encode %{
+    __ ecmovl((Assembler::Condition)($cop$$cmpcode), $dst$$Register, $src1$$Register, $src2$$Address);
+  %}
+  ins_pipe(pipe_cmov_mem);
+%}
+
 // Conditional move
 instruct cmovN_reg(rRegN dst, rRegN src, rFlagsReg cr, cmpOp cop)
 %{
+  predicate(!UseAPX);
   match(Set dst (CMoveN (Binary cop cr) (Binary dst src)));
 
   ins_cost(200); // XXX
@@ -6273,9 +6390,24 @@ instruct cmovN_reg(rRegN dst, rRegN src, rFlagsReg cr, cmpOp cop)
   ins_pipe(pipe_cmov_reg);
 %}
 
+// Conditional move ndd
+instruct cmovN_reg_ndd(rRegN dst, rRegN src1, rRegN src2, rFlagsReg cr, cmpOp cop)
+%{
+  predicate(UseAPX);
+  match(Set dst (CMoveN (Binary cop cr) (Binary src1 src2)));
+
+  ins_cost(200);
+  format %{ "ecmovl$cop $dst, $src1, $src2\t# signed, compressed ptr ndd" %}
+  ins_encode %{
+    __ ecmovl((Assembler::Condition)($cop$$cmpcode), $dst$$Register, $src1$$Register, $src2$$Register);
+  %}
+  ins_pipe(pipe_cmov_reg);
+%}
+
 // Conditional move
 instruct cmovN_regU(cmpOpU cop, rFlagsRegU cr, rRegN dst, rRegN src)
 %{
+  predicate(!UseAPX);
   match(Set dst (CMoveN (Binary cop cr) (Binary dst src)));
 
   ins_cost(200); // XXX
@@ -6287,6 +6419,7 @@ instruct cmovN_regU(cmpOpU cop, rFlagsRegU cr, rRegN dst, rRegN src)
 %}
 
 instruct cmovN_regUCF(cmpOpUCF cop, rFlagsRegUCF cr, rRegN dst, rRegN src) %{
+  predicate(!UseAPX);
   match(Set dst (CMoveN (Binary cop cr) (Binary dst src)));
   ins_cost(200);
   expand %{
@@ -6294,6 +6427,31 @@ instruct cmovN_regUCF(cmpOpUCF cop, rFlagsRegUCF cr, rRegN dst, rRegN src) %{
   %}
 %}
 
+// Conditional move ndd
+instruct cmovN_regU_ndd(rRegN dst, cmpOpU cop, rFlagsRegU cr, rRegN src1, rRegN src2)
+%{
+  predicate(UseAPX);
+  match(Set dst (CMoveN (Binary cop cr) (Binary src1 src2)));
+
+  ins_cost(200);
+  format %{ "ecmovl$cop $dst, $src1, $src2\t# unsigned, compressed ptr ndd" %}
+  ins_encode %{
+    __ ecmovl((Assembler::Condition)($cop$$cmpcode), $dst$$Register, $src1$$Register, $src2$$Register);
+  %}
+  ins_pipe(pipe_cmov_reg);
+%}
+
+instruct cmovN_regUCF_ndd(rRegN dst, cmpOpUCF cop, rFlagsRegUCF cr, rRegN src1, rRegN src2) %{
+  predicate(UseAPX);
+  match(Set dst (CMoveN (Binary cop cr) (Binary src1 src2)));
+  ins_cost(200);
+  format %{ "ecmovl$cop $dst, $src1, $src2\t# unsigned, compressed ptr ndd" %}
+  ins_encode %{
+    __ ecmovl((Assembler::Condition)($cop$$cmpcode), $dst$$Register, $src1$$Register, $src2$$Register);
+  %}
+  ins_pipe(pipe_cmov_reg);
+%}
+
 instruct cmovN_regUCF2_ne(cmpOpUCF2 cop, rFlagsRegUCF cr, rRegN dst, rRegN src) %{
   predicate(n->in(1)->in(1)->as_Bool()->_test._test == BoolTest::ne);
   match(Set dst (CMoveN (Binary cop cr) (Binary dst src)));
@@ -6327,6 +6485,7 @@ instruct cmovN_regUCF2_eq(cmpOpUCF2 cop, rFlagsRegUCF cr, rRegN dst, rRegN src)
 // Conditional move
 instruct cmovP_reg(rRegP dst, rRegP src, rFlagsReg cr, cmpOp cop)
 %{
+  predicate(!UseAPX);
   match(Set dst (CMoveP (Binary cop cr) (Binary dst src)));
 
   ins_cost(200); // XXX
@@ -6337,9 +6496,24 @@ instruct cmovP_reg(rRegP dst, rRegP src, rFlagsReg cr, cmpOp cop)
   ins_pipe(pipe_cmov_reg);  // XXX
 %}
 
+// Conditional move ndd
+instruct cmovP_reg_ndd(rRegP dst, rRegP src1, rRegP src2, rFlagsReg cr, cmpOp cop)
+%{
+  predicate(UseAPX);
+  match(Set dst (CMoveP (Binary cop cr) (Binary src1 src2)));
+
+  ins_cost(200);
+  format %{ "ecmovq$cop $dst, $src1, $src2\t# signed, ptr ndd" %}
+  ins_encode %{
+    __ ecmovq((Assembler::Condition)($cop$$cmpcode), $dst$$Register, $src1$$Register, $src2$$Register);
+  %}
+  ins_pipe(pipe_cmov_reg);
+%}
+
 // Conditional move
 instruct cmovP_regU(cmpOpU cop, rFlagsRegU cr, rRegP dst, rRegP src)
 %{
+  predicate(!UseAPX);
   match(Set dst (CMoveP (Binary cop cr) (Binary dst src)));
 
   ins_cost(200); // XXX
@@ -6350,6 +6524,20 @@ instruct cmovP_regU(cmpOpU cop, rFlagsRegU cr, rRegP dst, rRegP src)
   ins_pipe(pipe_cmov_reg); // XXX
 %}
 
+// Conditional move ndd
+instruct cmovP_regU_ndd(rRegP dst, cmpOpU cop, rFlagsRegU cr, rRegP src1, rRegP src2)
+%{
+  predicate(UseAPX);
+  match(Set dst (CMoveP (Binary cop cr) (Binary src1 src2)));
+
+  ins_cost(200);
+  format %{ "ecmovq$cop $dst, $src1, $src2\t# unsigned, ptr ndd" %}
+  ins_encode %{
+    __ ecmovq((Assembler::Condition)($cop$$cmpcode), $dst$$Register, $src1$$Register, $src2$$Register);
+  %}
+  ins_pipe(pipe_cmov_reg);
+%}
+
 instruct cmovP_regUCF(cmpOpUCF cop, rFlagsRegUCF cr, rRegP dst, rRegP src) %{
   match(Set dst (CMoveP (Binary cop cr) (Binary dst src)));
   ins_cost(200);
@@ -6358,8 +6546,18 @@ instruct cmovP_regUCF(cmpOpUCF cop, rFlagsRegUCF cr, rRegP dst, rRegP src) %{
   %}
 %}
 
+instruct cmovP_regUCF_ndd(rRegP dst, cmpOpUCF cop, rFlagsRegUCF cr, rRegP src1, rRegP src2) %{
+  match(Set dst (CMoveP (Binary cop cr) (Binary src1 src2)));
+  ins_cost(200);
+  format %{ "ecmovq$cop $dst, $src1, $src2\t# unsigned, ptr ndd" %}
+  ins_encode %{
+    __ ecmovq((Assembler::Condition)($cop$$cmpcode), $dst$$Register, $src1$$Register, $src2$$Register);
+  %}
+  ins_pipe(pipe_cmov_reg);
+%}
+
 instruct cmovP_regUCF2_ne(cmpOpUCF2 cop, rFlagsRegUCF cr, rRegP dst, rRegP src) %{
-  predicate(n->in(1)->in(1)->as_Bool()->_test._test == BoolTest::ne);
+  predicate(!UseAPX && n->in(1)->in(1)->as_Bool()->_test._test == BoolTest::ne);
   match(Set dst (CMoveP (Binary cop cr) (Binary dst src)));
 
   ins_cost(200); // XXX
@@ -6372,10 +6570,24 @@ instruct cmovP_regUCF2_ne(cmpOpUCF2 cop, rFlagsRegUCF cr, rRegP dst, rRegP src)
   ins_pipe(pipe_cmov_reg);
 %}
 
+instruct cmovP_regUCF2_ne_ndd(cmpOpUCF2 cop, rFlagsRegUCF cr, rRegP dst, rRegP src1, rRegP src2) %{
+  predicate(UseAPX && n->in(1)->in(1)->as_Bool()->_test._test == BoolTest::ne);
+  match(Set dst (CMoveP (Binary cop cr) (Binary src1 src2)));
+
+  ins_cost(200);
+  format %{ "ecmovpq  $dst, $src1, $src2\n\t"
+            "ecmovneq $dst, $src1, $src2" %}
+  ins_encode %{
+    __ ecmovq(Assembler::parity, $dst$$Register, $src1$$Register, $src2$$Register);
+    __ ecmovq(Assembler::notEqual, $dst$$Register, $src1$$Register, $src2$$Register);
+  %}
+  ins_pipe(pipe_cmov_reg);
+%}
+
 // Since (x == y) == !(x != y), we can flip the sense of the test by flipping the
 // inputs of the CMove
 instruct cmovP_regUCF2_eq(cmpOpUCF2 cop, rFlagsRegUCF cr, rRegP dst, rRegP src) %{
-  predicate(n->in(1)->in(1)->as_Bool()->_test._test == BoolTest::eq);
+  predicate(!UseAPX && n->in(1)->in(1)->as_Bool()->_test._test == BoolTest::eq);
   match(Set dst (CMoveP (Binary cop cr) (Binary src dst)));
 
   ins_cost(200); // XXX
@@ -6388,6 +6600,20 @@ instruct cmovP_regUCF2_eq(cmpOpUCF2 cop, rFlagsRegUCF cr, rRegP dst, rRegP src)
   ins_pipe(pipe_cmov_reg);
 %}
 
+instruct cmovP_regUCF2_eq_ndd(cmpOpUCF2 cop, rFlagsRegUCF cr, rRegP dst, rRegP src1, rRegP src2) %{
+  predicate(UseAPX && n->in(1)->in(1)->as_Bool()->_test._test == BoolTest::eq);
+  match(Set dst (CMoveP (Binary cop cr) (Binary src1 src2)));
+
+  ins_cost(200);
+  format %{ "ecmovpq  $dst, $src1, $src2\n\t"
+            "ecmovneq $dst, $src1, $src2" %}
+  ins_encode %{
+    __ ecmovq(Assembler::parity, $dst$$Register, $src1$$Register, $src2$$Register);
+    __ ecmovq(Assembler::notEqual, $dst$$Register, $src1$$Register, $src2$$Register);
+  %}
+  ins_pipe(pipe_cmov_reg);
+%}
+
 instruct cmovL_imm_01(rRegL dst, immL1 src, rFlagsReg cr, cmpOp cop)
 %{
   predicate(n->in(2)->in(2)->is_Con() && n->in(2)->in(2)->get_long() == 0);
@@ -6404,6 +6630,7 @@ instruct cmovL_imm_01(rRegL dst, immL1 src, rFlagsReg cr, cmpOp cop)
 
 instruct cmovL_reg(cmpOp cop, rFlagsReg cr, rRegL dst, rRegL src)
 %{
+  predicate(!UseAPX);
   match(Set dst (CMoveL (Binary cop cr) (Binary dst src)));
 
   ins_cost(200); // XXX
@@ -6414,8 +6641,22 @@ instruct cmovL_reg(cmpOp cop, rFlagsReg cr, rRegL dst, rRegL src)
   ins_pipe(pipe_cmov_reg);  // XXX
 %}
 
+instruct cmovL_reg_ndd(rRegL dst, cmpOp cop, rFlagsReg cr, rRegL src1, rRegL src2)
+%{
+  predicate(UseAPX);
+  match(Set dst (CMoveL (Binary cop cr) (Binary src1 src2)));
+
+  ins_cost(200);
+  format %{ "ecmovq$cop $dst, $src1, $src2\t# signed, long ndd" %}
+  ins_encode %{
+    __ ecmovq((Assembler::Condition)($cop$$cmpcode), $dst$$Register, $src1$$Register, $src2$$Register);
+  %}
+  ins_pipe(pipe_cmov_reg);
+%}
+
 instruct cmovL_mem(cmpOp cop, rFlagsReg cr, rRegL dst, memory src)
 %{
+  predicate(!UseAPX);
   match(Set dst (CMoveL (Binary cop cr) (Binary dst (LoadL src))));
 
   ins_cost(200); // XXX
@@ -6426,6 +6667,19 @@ instruct cmovL_mem(cmpOp cop, rFlagsReg cr, rRegL dst, memory src)
   ins_pipe(pipe_cmov_mem);  // XXX
 %}
 
+instruct cmovL_rReg_rReg_mem_ndd(rRegL dst, cmpOp cop, rFlagsReg cr, rRegL src1, memory src2)
+%{
+  predicate(UseAPX);
+  match(Set dst (CMoveL (Binary cop cr) (Binary src1 (LoadL src2))));
+
+  ins_cost(200);
+  format %{ "ecmovq$cop $dst, $src1, $src2\t# signed, long ndd" %}
+  ins_encode %{
+    __ ecmovq((Assembler::Condition)($cop$$cmpcode), $dst$$Register, $src1$$Register, $src2$$Address);
+  %}
+  ins_pipe(pipe_cmov_mem);
+%}
+
 instruct cmovL_imm_01U(rRegL dst, immL1 src, rFlagsRegU cr, cmpOpU cop)
 %{
   predicate(n->in(2)->in(2)->is_Con() && n->in(2)->in(2)->get_long() == 0);
@@ -6442,6 +6696,7 @@ instruct cmovL_imm_01U(rRegL dst, immL1 src, rFlagsRegU cr, cmpOpU cop)
 
 instruct cmovL_regU(cmpOpU cop, rFlagsRegU cr, rRegL dst, rRegL src)
 %{
+  predicate(!UseAPX);
   match(Set dst (CMoveL (Binary cop cr) (Binary dst src)));
 
   ins_cost(200); // XXX
@@ -6452,6 +6707,19 @@ instruct cmovL_regU(cmpOpU cop, rFlagsRegU cr, rRegL dst, rRegL src)
   ins_pipe(pipe_cmov_reg); // XXX
 %}
 
+instruct cmovL_regU_ndd(rRegL dst, cmpOpU cop, rFlagsRegU cr, rRegL src1, rRegL src2)
+%{
+  predicate(UseAPX);
+  match(Set dst (CMoveL (Binary cop cr) (Binary src1 src2)));
+
+  ins_cost(200);
+  format %{ "ecmovq$cop $dst, $src1, $src2\t# unsigned, long ndd" %}
+  ins_encode %{
+    __ ecmovq((Assembler::Condition)($cop$$cmpcode), $dst$$Register, $src1$$Register, $src2$$Register);
+  %}
+  ins_pipe(pipe_cmov_reg);
+%}
+
 instruct cmovL_imm_01UCF(rRegL dst, immL1 src, rFlagsRegUCF cr, cmpOpUCF cop)
 %{
   predicate(n->in(2)->in(2)->is_Con() && n->in(2)->in(2)->get_long() == 0);
@@ -6467,6 +6735,7 @@ instruct cmovL_imm_01UCF(rRegL dst, immL1 src, rFlagsRegUCF cr, cmpOpUCF cop)
 %}
 
 instruct cmovL_regUCF(cmpOpUCF cop, rFlagsRegUCF cr, rRegL dst, rRegL src) %{
+  predicate(!UseAPX);
   match(Set dst (CMoveL (Binary cop cr) (Binary dst src)));
   ins_cost(200);
   expand %{
@@ -6474,8 +6743,20 @@ instruct cmovL_regUCF(cmpOpUCF cop, rFlagsRegUCF cr, rRegL dst, rRegL src) %{
   %}
 %}
 
+instruct cmovL_regUCF_ndd(rRegL dst, cmpOpUCF cop, rFlagsRegUCF cr, rRegL src1, rRegL src2) 
+%{
+  predicate(UseAPX);
+  match(Set dst (CMoveL (Binary cop cr) (Binary src1 src2)));
+  ins_cost(200);
+  format %{ "ecmovq$cop $dst, $src1, $src2\t# unsigned, long ndd" %}
+  ins_encode %{
+    __ ecmovq((Assembler::Condition)($cop$$cmpcode), $dst$$Register, $src1$$Register, $src2$$Register);
+  %}
+  ins_pipe(pipe_cmov_reg);
+%}
+
 instruct cmovL_regUCF2_ne(cmpOpUCF2 cop, rFlagsRegUCF cr, rRegL dst, rRegL src) %{
-  predicate(n->in(1)->in(1)->as_Bool()->_test._test == BoolTest::ne);
+  predicate(!UseAPX && n->in(1)->in(1)->as_Bool()->_test._test == BoolTest::ne);
   match(Set dst (CMoveL (Binary cop cr) (Binary dst src)));
 
   ins_cost(200); // XXX
@@ -6488,10 +6769,24 @@ instruct cmovL_regUCF2_ne(cmpOpUCF2 cop, rFlagsRegUCF cr, rRegL dst, rRegL src)
   ins_pipe(pipe_cmov_reg);
 %}
 
+instruct cmovL_regUCF2_ne_ndd(cmpOpUCF2 cop, rFlagsRegUCF cr, rRegL dst, rRegL src1, rRegL src2) %{
+  predicate(UseAPX && n->in(1)->in(1)->as_Bool()->_test._test == BoolTest::ne);
+  match(Set dst (CMoveL (Binary cop cr) (Binary src1 src2)));
+
+  ins_cost(200);
+  format %{ "ecmovpq  $dst, $src1, $src2\n\t"
+            "ecmovneq $dst, $src1, $src2" %}
+  ins_encode %{
+    __ ecmovq(Assembler::parity, $dst$$Register, $src1$$Register, $src2$$Register);
+    __ ecmovq(Assembler::notEqual, $dst$$Register, $src1$$Register, $src2$$Register);
+  %}
+  ins_pipe(pipe_cmov_reg);
+%}
+
 // Since (x == y) == !(x != y), we can flip the sense of the test by flipping the
 // inputs of the CMove
 instruct cmovL_regUCF2_eq(cmpOpUCF2 cop, rFlagsRegUCF cr, rRegL dst, rRegL src) %{
-  predicate(n->in(1)->in(1)->as_Bool()->_test._test == BoolTest::eq);
+  predicate(!UseAPX && n->in(1)->in(1)->as_Bool()->_test._test == BoolTest::eq);
   match(Set dst (CMoveL (Binary cop cr) (Binary src dst)));
 
   ins_cost(200); // XXX
@@ -6504,8 +6799,23 @@ instruct cmovL_regUCF2_eq(cmpOpUCF2 cop, rFlagsRegUCF cr, rRegL dst, rRegL src)
   ins_pipe(pipe_cmov_reg);
 %}
 
+instruct cmovL_regUCF2_eq_ndd(cmpOpUCF2 cop, rFlagsRegUCF cr, rRegL dst, rRegL src1, rRegL src2) %{
+  predicate(UseAPX && n->in(1)->in(1)->as_Bool()->_test._test == BoolTest::eq);
+  match(Set dst (CMoveL (Binary cop cr) (Binary src1 src2)));
+
+  ins_cost(200);
+  format %{ "ecmovpq  $dst, $src1, $src2\n\t"
+            "ecmovneq $dst, $src1, $src2" %}
+  ins_encode %{
+    __ ecmovq(Assembler::parity, $dst$$Register, $src1$$Register, $src2$$Register);
+    __ ecmovq(Assembler::notEqual, $dst$$Register, $src1$$Register, $src2$$Register);
+  %}
+  ins_pipe(pipe_cmov_reg);
+%}
+
 instruct cmovL_memU(cmpOpU cop, rFlagsRegU cr, rRegL dst, memory src)
 %{
+  predicate(!UseAPX);
   match(Set dst (CMoveL (Binary cop cr) (Binary dst (LoadL src))));
 
   ins_cost(200); // XXX
@@ -6517,6 +6827,7 @@ instruct cmovL_memU(cmpOpU cop, rFlagsRegU cr, rRegL dst, memory src)
 %}
 
 instruct cmovL_memUCF(cmpOpUCF cop, rFlagsRegUCF cr, rRegL dst, memory src) %{
+  predicate(!UseAPX);
   match(Set dst (CMoveL (Binary cop cr) (Binary dst (LoadL src))));
   ins_cost(200);
   expand %{
@@ -6524,6 +6835,31 @@ instruct cmovL_memUCF(cmpOpUCF cop, rFlagsRegUCF cr, rRegL dst, memory src) %{
   %}
 %}
 
+instruct cmovL_rReg_rReg_memU_ndd(rRegL dst, cmpOpU cop, rFlagsRegU cr, rRegL src1, memory src2)
+%{
+  predicate(UseAPX);
+  match(Set dst (CMoveL (Binary cop cr) (Binary src1 (LoadL src2))));
+
+  ins_cost(200);
+  format %{ "ecmovq$cop $dst, $src1, $src2\t# unsigned, long ndd" %}
+  ins_encode %{
+    __ ecmovq((Assembler::Condition)($cop$$cmpcode), $dst$$Register, $src1$$Register, $src2$$Address);
+  %}
+  ins_pipe(pipe_cmov_mem);
+%}
+
+instruct cmovL_rReg_rReg_memUCF_ndd(rRegL dst, cmpOpUCF cop, rFlagsRegUCF cr, rRegL src1, memory src2) 
+%{
+  predicate(UseAPX);
+  match(Set dst (CMoveL (Binary cop cr) (Binary src1 (LoadL src2))));
+  ins_cost(200);
+  format %{ "ecmovq$cop $dst, $src1, $src2\t# unsigned, long ndd" %}
+  ins_encode %{
+    __ ecmovq((Assembler::Condition)($cop$$cmpcode), $dst$$Register, $src1$$Register, $src2$$Address);
+  %}
+  ins_pipe(pipe_cmov_mem);
+%}
+
 instruct cmovF_reg(cmpOp cop, rFlagsReg cr, regF dst, regF src)
 %{
   match(Set dst (CMoveF (Binary cop cr) (Binary dst src)));
@@ -6617,6 +6953,7 @@ instruct cmovD_regUCF(cmpOpUCF cop, rFlagsRegUCF cr, regD dst, regD src) %{
 
 instruct addI_rReg(rRegI dst, rRegI src, rFlagsReg cr)
 %{
+  predicate(!UseAPX);
   match(Set dst (AddI dst src));
   effect(KILL cr);
   flag(PD::Flag_sets_overflow_flag, PD::Flag_sets_sign_flag, PD::Flag_sets_zero_flag, PD::Flag_sets_carry_flag, PD::Flag_sets_parity_flag);
@@ -6627,8 +6964,23 @@ instruct addI_rReg(rRegI dst, rRegI src, rFlagsReg cr)
   ins_pipe(ialu_reg_reg);
 %}
 
+instruct addI_rReg_ndd(rRegI dst, rRegI src1, rRegI src2, rFlagsReg cr)
+%{
+  predicate(UseAPX);
+  match(Set dst (AddI src1 src2));
+  effect(KILL cr);
+  flag(PD::Flag_sets_overflow_flag, PD::Flag_sets_sign_flag, PD::Flag_sets_zero_flag, PD::Flag_sets_carry_flag, PD::Flag_sets_parity_flag);
+
+  format %{ "eaddl    $dst, $src1, $src2\t# int ndd" %}
+  ins_encode %{
+    __ eaddl($dst$$Register, $src1$$Register, $src2$$Register, false);
+  %}
+  ins_pipe(ialu_reg_reg);
+%}
+
 instruct addI_rReg_imm(rRegI dst, immI src, rFlagsReg cr)
 %{
+  predicate(!UseAPX);
   match(Set dst (AddI dst src));
   effect(KILL cr);
   flag(PD::Flag_sets_overflow_flag, PD::Flag_sets_sign_flag, PD::Flag_sets_zero_flag, PD::Flag_sets_carry_flag, PD::Flag_sets_parity_flag);
@@ -6640,8 +6992,37 @@ instruct addI_rReg_imm(rRegI dst, immI src, rFlagsReg cr)
   ins_pipe( ialu_reg );
 %}
 
+instruct addI_rReg_rReg_imm_ndd(rRegI dst, rRegI src1, immI src2, rFlagsReg cr)
+%{
+  predicate(UseAPX);
+  match(Set dst (AddI src1 src2));
+  effect(KILL cr);
+  flag(PD::Flag_sets_overflow_flag, PD::Flag_sets_sign_flag, PD::Flag_sets_zero_flag, PD::Flag_sets_carry_flag, PD::Flag_sets_parity_flag);
+
+  format %{ "eaddl    $dst, $src1, $src2\t# int ndd" %}
+  ins_encode %{
+    __ eaddl($dst$$Register, $src1$$Register, $src2$$constant, false);
+  %}
+  ins_pipe( ialu_reg );
+%}
+
+instruct addI_rReg_mem_imm_ndd(rRegI dst, memory src1, immI src2, rFlagsReg cr)
+%{
+  predicate(UseAPX);
+  match(Set dst (AddI (LoadI src1) src2));
+  effect(KILL cr);
+  flag(PD::Flag_sets_overflow_flag, PD::Flag_sets_sign_flag, PD::Flag_sets_zero_flag, PD::Flag_sets_carry_flag, PD::Flag_sets_parity_flag);
+
+  format %{ "eaddl    $dst, $src1, $src2\t# int ndd" %}
+  ins_encode %{
+    __ eaddl($dst$$Register, $src1$$Address, $src2$$constant, false);
+  %}
+  ins_pipe( ialu_reg );
+%}
+
 instruct addI_rReg_mem(rRegI dst, memory src, rFlagsReg cr)
 %{
+  predicate(!UseAPX);
   match(Set dst (AddI dst (LoadI src)));
   effect(KILL cr);
   flag(PD::Flag_sets_overflow_flag, PD::Flag_sets_sign_flag, PD::Flag_sets_zero_flag, PD::Flag_sets_carry_flag, PD::Flag_sets_parity_flag);
@@ -6654,6 +7035,36 @@ instruct addI_rReg_mem(rRegI dst, memory src, rFlagsReg cr)
   ins_pipe(ialu_reg_mem);
 %}
 
+instruct addI_rReg_mem_rReg_ndd(rRegI dst, memory src1, rRegI src2, rFlagsReg cr)
+%{
+  predicate(UseAPX);
+  match(Set dst (AddI (LoadI src1) src2));
+  effect(KILL cr);
+  flag(PD::Flag_sets_overflow_flag, PD::Flag_sets_sign_flag, PD::Flag_sets_zero_flag, PD::Flag_sets_carry_flag, PD::Flag_sets_parity_flag);
+
+  ins_cost(150);
+  format %{ "eaddl    $dst, $src1, $src2\t# int ndd" %}
+  ins_encode %{
+    __ eaddl($dst$$Register, $src1$$Address, $src2$$Register, false);
+  %}
+  ins_pipe(ialu_reg_mem);
+%}
+
+instruct addI_rReg_rReg_mem_ndd(rRegI dst, rRegI src1, memory src2, rFlagsReg cr)
+%{
+  predicate(UseAPX);
+  match(Set dst (AddI src1 (LoadI src2)));
+  effect(KILL cr);
+  flag(PD::Flag_sets_overflow_flag, PD::Flag_sets_sign_flag, PD::Flag_sets_zero_flag, PD::Flag_sets_carry_flag, PD::Flag_sets_parity_flag);
+
+  ins_cost(150);
+  format %{ "eaddl    $dst, $src1, $src2\t# int ndd" %}
+  ins_encode %{
+    __ eaddl($dst$$Register, $src1$$Register, $src2$$Address, false);
+  %}
+  ins_pipe(ialu_reg_mem);
+%}
+
 instruct addI_mem_rReg(memory dst, rRegI src, rFlagsReg cr)
 %{
   match(Set dst (StoreI dst (AddI (LoadI dst) src)));
@@ -6685,7 +7096,7 @@ instruct addI_mem_imm(memory dst, immI src, rFlagsReg cr)
 
 instruct incI_rReg(rRegI dst, immI_1 src, rFlagsReg cr)
 %{
-  predicate(UseIncDec);
+  predicate(!UseAPX && UseIncDec);
   match(Set dst (AddI dst src));
   effect(KILL cr);
 
@@ -6696,6 +7107,32 @@ instruct incI_rReg(rRegI dst, immI_1 src, rFlagsReg cr)
   ins_pipe(ialu_reg);
 %}
 
+instruct incI_rReg_ndd(rRegI dst, rRegI src, immI_1 val, rFlagsReg cr)
+%{
+  predicate(UseAPX && UseIncDec);
+  match(Set dst (AddI src val));
+  effect(KILL cr);
+
+  format %{ "eincl    $dst, $src\t# int ndd" %}
+  ins_encode %{
+    __ eincl($dst$$Register, $src$$Register, false);
+  %}
+  ins_pipe(ialu_reg);
+%}
+
+instruct incI_rReg_mem_ndd(rRegI dst, memory src, immI_1 val, rFlagsReg cr)
+%{
+  predicate(UseAPX && UseIncDec);
+  match(Set dst (AddI (LoadI src) val));
+  effect(KILL cr);
+
+  format %{ "eincl    $dst, $src\t# int ndd" %}
+  ins_encode %{
+    __ eincl($dst$$Register, $src$$Address, false);
+  %}
+  ins_pipe(ialu_reg);
+%}
+
 instruct incI_mem(memory dst, immI_1 src, rFlagsReg cr)
 %{
   predicate(UseIncDec);
@@ -6713,7 +7150,7 @@ instruct incI_mem(memory dst, immI_1 src, rFlagsReg cr)
 // XXX why does that use AddI
 instruct decI_rReg(rRegI dst, immI_M1 src, rFlagsReg cr)
 %{
-  predicate(UseIncDec);
+  predicate(!UseAPX && UseIncDec);
   match(Set dst (AddI dst src));
   effect(KILL cr);
 
@@ -6724,6 +7161,32 @@ instruct decI_rReg(rRegI dst, immI_M1 src, rFlagsReg cr)
   ins_pipe(ialu_reg);
 %}
 
+instruct decI_rReg_ndd(rRegI dst, rRegI src, immI_M1 val, rFlagsReg cr)
+%{
+  predicate(UseAPX && UseIncDec);
+  match(Set dst (AddI src val));
+  effect(KILL cr);
+
+  format %{ "edecl    $dst, $src\t# int ndd" %}
+  ins_encode %{
+    __ edecl($dst$$Register, $src$$Register, false);
+  %}
+  ins_pipe(ialu_reg);
+%}
+
+instruct decI_rReg_mem_ndd(rRegI dst, memory src, immI_M1 val, rFlagsReg cr)
+%{
+  predicate(UseAPX && UseIncDec);
+  match(Set dst (AddI (LoadI src) val));
+  effect(KILL cr);
+
+  format %{ "edecl    $dst, $src\t# int ndd" %}
+  ins_encode %{
+    __ edecl($dst$$Register, $src$$Address, false);
+  %}
+  ins_pipe(ialu_reg);
+%}
+
 // XXX why does that use AddI
 instruct decI_mem(memory dst, immI_M1 src, rFlagsReg cr)
 %{
@@ -6792,6 +7255,7 @@ instruct leaI_rReg_rReg_immI2_immI(rRegI dst, rRegI base, rRegI index, immI2 sca
 
 instruct addL_rReg(rRegL dst, rRegL src, rFlagsReg cr)
 %{
+  predicate(!UseAPX);
   match(Set dst (AddL dst src));
   effect(KILL cr);
   flag(PD::Flag_sets_overflow_flag, PD::Flag_sets_sign_flag, PD::Flag_sets_zero_flag, PD::Flag_sets_carry_flag, PD::Flag_sets_parity_flag);
@@ -6803,8 +7267,23 @@ instruct addL_rReg(rRegL dst, rRegL src, rFlagsReg cr)
   ins_pipe(ialu_reg_reg);
 %}
 
+instruct addL_rReg_ndd(rRegL dst, rRegL src1, rRegL src2, rFlagsReg cr)
+%{
+  predicate(UseAPX);
+  match(Set dst (AddL src1 src2));
+  effect(KILL cr);
+  flag(PD::Flag_sets_overflow_flag, PD::Flag_sets_sign_flag, PD::Flag_sets_zero_flag, PD::Flag_sets_carry_flag, PD::Flag_sets_parity_flag);
+
+  format %{ "eaddq    $dst, $src1, $src2\t# long ndd" %}
+  ins_encode %{
+    __ eaddq($dst$$Register, $src1$$Register, $src2$$Register, false);
+  %}
+  ins_pipe(ialu_reg_reg);
+%}
+
 instruct addL_rReg_imm(rRegL dst, immL32 src, rFlagsReg cr)
 %{
+  predicate(!UseAPX);
   match(Set dst (AddL dst src));
   effect(KILL cr);
   flag(PD::Flag_sets_overflow_flag, PD::Flag_sets_sign_flag, PD::Flag_sets_zero_flag, PD::Flag_sets_carry_flag, PD::Flag_sets_parity_flag);
@@ -6816,8 +7295,37 @@ instruct addL_rReg_imm(rRegL dst, immL32 src, rFlagsReg cr)
   ins_pipe( ialu_reg );
 %}
 
+instruct addL_rReg_rReg_imm_ndd(rRegL dst, rRegL src1, immL32 src2, rFlagsReg cr)
+%{
+  predicate(UseAPX);
+  match(Set dst (AddL src1 src2));
+  effect(KILL cr);
+  flag(PD::Flag_sets_overflow_flag, PD::Flag_sets_sign_flag, PD::Flag_sets_zero_flag, PD::Flag_sets_carry_flag, PD::Flag_sets_parity_flag);
+
+  format %{ "eaddq    $dst, $src1, $src2\t# long ndd" %}
+  ins_encode %{
+    __ eaddq($dst$$Register, $src1$$Register, $src2$$constant, false);
+  %}
+  ins_pipe( ialu_reg );
+%}
+
+instruct addL_rReg_mem_imm_ndd(rRegL dst, memory src1, immL32 src2, rFlagsReg cr)
+%{
+  predicate(UseAPX);
+  match(Set dst (AddL (LoadL src1) src2));
+  effect(KILL cr);
+  flag(PD::Flag_sets_overflow_flag, PD::Flag_sets_sign_flag, PD::Flag_sets_zero_flag, PD::Flag_sets_carry_flag, PD::Flag_sets_parity_flag);
+
+  format %{ "eaddq    $dst, $src1, $src2\t# long ndd" %}
+  ins_encode %{
+    __ eaddq($dst$$Register, $src1$$Address, $src2$$constant, false);
+  %}
+  ins_pipe( ialu_reg );
+%}
+
 instruct addL_rReg_mem(rRegL dst, memory src, rFlagsReg cr)
 %{
+  predicate(!UseAPX);
   match(Set dst (AddL dst (LoadL src)));
   effect(KILL cr);
   flag(PD::Flag_sets_overflow_flag, PD::Flag_sets_sign_flag, PD::Flag_sets_zero_flag, PD::Flag_sets_carry_flag, PD::Flag_sets_parity_flag);
@@ -6830,6 +7338,36 @@ instruct addL_rReg_mem(rRegL dst, memory src, rFlagsReg cr)
   ins_pipe(ialu_reg_mem);
 %}
 
+instruct addL_rReg_rReg_mem_ndd(rRegL dst, rRegL src1, memory src2, rFlagsReg cr)
+%{
+  predicate(UseAPX);
+  match(Set dst (AddL src1 (LoadL src2)));
+  effect(KILL cr);
+  flag(PD::Flag_sets_overflow_flag, PD::Flag_sets_sign_flag, PD::Flag_sets_zero_flag, PD::Flag_sets_carry_flag, PD::Flag_sets_parity_flag);
+
+  ins_cost(150);
+  format %{ "eaddq    $dst, $src1, $src2\t# long ndd" %}
+  ins_encode %{
+    __ eaddq($dst$$Register, $src1$$Register, $src2$$Address, false);
+  %}
+  ins_pipe(ialu_reg_mem);
+%}
+
+instruct addL_rReg_mem_rReg_ndd(rRegL dst, memory src1, rRegL src2, rFlagsReg cr)
+%{
+  predicate(UseAPX);
+  match(Set dst (AddL (LoadL src1) src2));
+  effect(KILL cr);
+  flag(PD::Flag_sets_overflow_flag, PD::Flag_sets_sign_flag, PD::Flag_sets_zero_flag, PD::Flag_sets_carry_flag, PD::Flag_sets_parity_flag);
+
+  ins_cost(150);
+  format %{ "eaddq    $dst, $src1, $src2\t# long ndd" %}
+  ins_encode %{
+    __ eaddq($dst$$Register, $src1$$Address, $src2$$Register, false);
+  %}
+  ins_pipe(ialu_reg_mem);
+%}
+
 instruct addL_mem_rReg(memory dst, rRegL src, rFlagsReg cr)
 %{
   match(Set dst (StoreL dst (AddL (LoadL dst) src)));
@@ -6860,7 +7398,7 @@ instruct addL_mem_imm(memory dst, immL32 src, rFlagsReg cr)
 
 instruct incL_rReg(rRegI dst, immL1 src, rFlagsReg cr)
 %{
-  predicate(UseIncDec);
+  predicate(!UseAPX && UseIncDec);
   match(Set dst (AddL dst src));
   effect(KILL cr);
 
@@ -6871,6 +7409,32 @@ instruct incL_rReg(rRegI dst, immL1 src, rFlagsReg cr)
   ins_pipe(ialu_reg);
 %}
 
+instruct incL_rReg_ndd(rRegI dst, rRegI src, immL1 val, rFlagsReg cr)
+%{
+  predicate(UseAPX && UseIncDec);
+  match(Set dst (AddL src val));
+  effect(KILL cr);
+
+  format %{ "eincq    $dst, $src\t# long ndd" %}
+  ins_encode %{
+    __ eincq($dst$$Register, $src$$Register, false);
+  %}
+  ins_pipe(ialu_reg);
+%}
+
+instruct incL_rReg_mem_ndd(rRegI dst, memory src, immL1 val, rFlagsReg cr)
+%{
+  predicate(UseAPX && UseIncDec);
+  match(Set dst (AddL (LoadL src) val));
+  effect(KILL cr);
+
+  format %{ "eincq    $dst, $src\t# long ndd" %}
+  ins_encode %{
+    __ eincq($dst$$Register, $src$$Address, false);
+  %}
+  ins_pipe(ialu_reg);
+%}
+
 instruct incL_mem(memory dst, immL1 src, rFlagsReg cr)
 %{
   predicate(UseIncDec);
@@ -6888,7 +7452,7 @@ instruct incL_mem(memory dst, immL1 src, rFlagsReg cr)
 // XXX why does that use AddL
 instruct decL_rReg(rRegL dst, immL_M1 src, rFlagsReg cr)
 %{
-  predicate(UseIncDec);
+  predicate(!UseAPX && UseIncDec);
   match(Set dst (AddL dst src));
   effect(KILL cr);
 
@@ -6899,6 +7463,32 @@ instruct decL_rReg(rRegL dst, immL_M1 src, rFlagsReg cr)
   ins_pipe(ialu_reg);
 %}
 
+instruct decL_rReg_ndd(rRegL dst, rRegL src, immL_M1 val, rFlagsReg cr)
+%{
+  predicate(UseAPX && UseIncDec);
+  match(Set dst (AddL src val));
+  effect(KILL cr);
+
+  format %{ "edecq    $dst, $src\t# long ndd" %}
+  ins_encode %{
+    __ edecq($dst$$Register, $src$$Register, false);
+  %}
+  ins_pipe(ialu_reg);
+%}
+
+instruct decL_rReg_mem_ndd(rRegL dst, memory src, immL_M1 val, rFlagsReg cr)
+%{
+  predicate(UseAPX && UseIncDec);
+  match(Set dst (AddL (LoadL src) val));
+  effect(KILL cr);
+
+  format %{ "edecq    $dst, $src\t# long ndd" %}
+  ins_encode %{
+    __ edecq($dst$$Register, $src$$Address, false);
+  %}
+  ins_pipe(ialu_reg);
+%}
+
 // XXX why does that use AddL
 instruct decL_mem(memory dst, immL_M1 src, rFlagsReg cr)
 %{
@@ -7534,6 +8124,7 @@ instruct absL_rReg(rRegL dst, rRegL src, rFlagsReg cr)
 // Integer Subtraction Instructions
 instruct subI_rReg(rRegI dst, rRegI src, rFlagsReg cr)
 %{
+  predicate(!UseAPX);
   match(Set dst (SubI dst src));
   effect(KILL cr);
   flag(PD::Flag_sets_overflow_flag, PD::Flag_sets_sign_flag, PD::Flag_sets_zero_flag, PD::Flag_sets_carry_flag, PD::Flag_sets_parity_flag);
@@ -7545,8 +8136,51 @@ instruct subI_rReg(rRegI dst, rRegI src, rFlagsReg cr)
   ins_pipe(ialu_reg_reg);
 %}
 
+instruct subI_rReg_ndd(rRegI dst, rRegI src1, rRegI src2, rFlagsReg cr)
+%{
+  predicate(UseAPX);
+  match(Set dst (SubI src1 src2));
+  effect(KILL cr);
+  flag(PD::Flag_sets_overflow_flag, PD::Flag_sets_sign_flag, PD::Flag_sets_zero_flag, PD::Flag_sets_carry_flag, PD::Flag_sets_parity_flag);
+
+  format %{ "esubl    $dst, $src1, $src2\t# int ndd" %}
+  ins_encode %{
+    __ esubl($dst$$Register, $src1$$Register, $src2$$Register, false);
+  %}
+  ins_pipe(ialu_reg_reg);
+%}
+
+instruct subI_rReg_rReg_imm_ndd(rRegI dst, rRegI src1, immI src2, rFlagsReg cr)
+%{
+  predicate(UseAPX);
+  match(Set dst (SubI src1 src2));
+  effect(KILL cr);
+  flag(PD::Flag_sets_overflow_flag, PD::Flag_sets_sign_flag, PD::Flag_sets_zero_flag, PD::Flag_sets_carry_flag, PD::Flag_sets_parity_flag);
+
+  format %{ "esubl    $dst, $src1, $src2\t# int ndd" %}
+  ins_encode %{
+    __ esubl($dst$$Register, $src1$$Register, $src2$$constant, false);
+  %}
+  ins_pipe(ialu_reg_reg);
+%}
+
+instruct subI_rReg_mem_imm_ndd(rRegI dst, memory src1, immI src2, rFlagsReg cr)
+%{
+  predicate(UseAPX);
+  match(Set dst (SubI (LoadI src1) src2));
+  effect(KILL cr);
+  flag(PD::Flag_sets_overflow_flag, PD::Flag_sets_sign_flag, PD::Flag_sets_zero_flag, PD::Flag_sets_carry_flag, PD::Flag_sets_parity_flag);
+
+  format %{ "esubl    $dst, $src1, $src2\t# int ndd" %}
+  ins_encode %{
+    __ esubl($dst$$Register, $src1$$Address, $src2$$constant, false);
+  %}
+  ins_pipe(ialu_reg_reg);
+%}
+
 instruct subI_rReg_mem(rRegI dst, memory src, rFlagsReg cr)
 %{
+  predicate(!UseAPX);
   match(Set dst (SubI dst (LoadI src)));
   effect(KILL cr);
   flag(PD::Flag_sets_overflow_flag, PD::Flag_sets_sign_flag, PD::Flag_sets_zero_flag, PD::Flag_sets_carry_flag, PD::Flag_sets_parity_flag);
@@ -7559,6 +8193,36 @@ instruct subI_rReg_mem(rRegI dst, memory src, rFlagsReg cr)
   ins_pipe(ialu_reg_mem);
 %}
 
+instruct subI_rReg_rReg_mem_ndd(rRegI dst, rRegI src1, memory src2, rFlagsReg cr)
+%{
+  predicate(UseAPX);
+  match(Set dst (SubI src1 (LoadI src2)));
+  effect(KILL cr);
+  flag(PD::Flag_sets_overflow_flag, PD::Flag_sets_sign_flag, PD::Flag_sets_zero_flag, PD::Flag_sets_carry_flag, PD::Flag_sets_parity_flag);
+
+  ins_cost(150);
+  format %{ "esubl    $dst, $src1, $src2\t# int ndd" %}
+  ins_encode %{
+    __ esubl($dst$$Register, $src1$$Register, $src2$$Address, false);
+  %}
+  ins_pipe(ialu_reg_mem);
+%}
+
+instruct subI_rReg_mem_rReg_ndd(rRegI dst, memory src1, rRegI src2, rFlagsReg cr)
+%{
+  predicate(UseAPX);
+  match(Set dst (SubI (LoadI src1) src2));
+  effect(KILL cr);
+  flag(PD::Flag_sets_overflow_flag, PD::Flag_sets_sign_flag, PD::Flag_sets_zero_flag, PD::Flag_sets_carry_flag, PD::Flag_sets_parity_flag);
+
+  ins_cost(150);
+  format %{ "esubl    $dst, $src1, $src2\t# int ndd" %}
+  ins_encode %{
+    __ esubl($dst$$Register, $src1$$Address, $src2$$Register, false);
+  %}
+  ins_pipe(ialu_reg_mem);
+%}
+
 instruct subI_mem_rReg(memory dst, rRegI src, rFlagsReg cr)
 %{
   match(Set dst (StoreI dst (SubI (LoadI dst) src)));
@@ -7575,6 +8239,7 @@ instruct subI_mem_rReg(memory dst, rRegI src, rFlagsReg cr)
 
 instruct subL_rReg(rRegL dst, rRegL src, rFlagsReg cr)
 %{
+  predicate(!UseAPX);
   match(Set dst (SubL dst src));
   effect(KILL cr);
   flag(PD::Flag_sets_overflow_flag, PD::Flag_sets_sign_flag, PD::Flag_sets_zero_flag, PD::Flag_sets_carry_flag, PD::Flag_sets_parity_flag);
@@ -7586,8 +8251,51 @@ instruct subL_rReg(rRegL dst, rRegL src, rFlagsReg cr)
   ins_pipe(ialu_reg_reg);
 %}
 
+instruct subL_rReg_ndd(rRegL dst, rRegL src1, rRegL src2, rFlagsReg cr)
+%{
+  predicate(UseAPX);
+  match(Set dst (SubL src1 src2));
+  effect(KILL cr);
+  flag(PD::Flag_sets_overflow_flag, PD::Flag_sets_sign_flag, PD::Flag_sets_zero_flag, PD::Flag_sets_carry_flag, PD::Flag_sets_parity_flag);
+
+  format %{ "esubq    $dst, $src1, $src2\t# long ndd" %}
+  ins_encode %{
+    __ esubq($dst$$Register, $src1$$Register, $src2$$Register, false);
+  %}
+  ins_pipe(ialu_reg_reg);
+%}
+
+instruct subL_rReg_rReg_imm_ndd(rRegL dst, rRegL src1, immL32 src2, rFlagsReg cr)
+%{
+  predicate(UseAPX);
+  match(Set dst (SubL src1 src2));
+  effect(KILL cr);
+  flag(PD::Flag_sets_overflow_flag, PD::Flag_sets_sign_flag, PD::Flag_sets_zero_flag, PD::Flag_sets_carry_flag, PD::Flag_sets_parity_flag);
+
+  format %{ "esubq    $dst, $src1, $src2\t# long ndd" %}
+  ins_encode %{
+    __ esubq($dst$$Register, $src1$$Register, $src2$$constant, false);
+  %}
+  ins_pipe(ialu_reg_reg);
+%}
+
+instruct subL_rReg_mem_imm_ndd(rRegL dst, memory src1, immL32 src2, rFlagsReg cr)
+%{
+  predicate(UseAPX);
+  match(Set dst (SubL (LoadL src1) src2));
+  effect(KILL cr);
+  flag(PD::Flag_sets_overflow_flag, PD::Flag_sets_sign_flag, PD::Flag_sets_zero_flag, PD::Flag_sets_carry_flag, PD::Flag_sets_parity_flag);
+
+  format %{ "esubq    $dst, $src1, $src2\t# long ndd" %}
+  ins_encode %{
+    __ esubq($dst$$Register, $src1$$Address, $src2$$constant, false);
+  %}
+  ins_pipe(ialu_reg_reg);
+%}
+
 instruct subL_rReg_mem(rRegL dst, memory src, rFlagsReg cr)
 %{
+  predicate(!UseAPX);
   match(Set dst (SubL dst (LoadL src)));
   effect(KILL cr);
   flag(PD::Flag_sets_overflow_flag, PD::Flag_sets_sign_flag, PD::Flag_sets_zero_flag, PD::Flag_sets_carry_flag, PD::Flag_sets_parity_flag);
@@ -7600,6 +8308,36 @@ instruct subL_rReg_mem(rRegL dst, memory src, rFlagsReg cr)
   ins_pipe(ialu_reg_mem);
 %}
 
+instruct subL_rReg_rReg_mem_ndd(rRegL dst, rRegL src1, memory src2, rFlagsReg cr)
+%{
+  predicate(UseAPX);
+  match(Set dst (SubL src1 (LoadL src2)));
+  effect(KILL cr);
+  flag(PD::Flag_sets_overflow_flag, PD::Flag_sets_sign_flag, PD::Flag_sets_zero_flag, PD::Flag_sets_carry_flag, PD::Flag_sets_parity_flag);
+
+  ins_cost(150);
+  format %{ "esubq    $dst, $src1, $src2\t# long ndd" %}
+  ins_encode %{
+    __ esubq($dst$$Register, $src1$$Register, $src2$$Address, false);
+  %}
+  ins_pipe(ialu_reg_mem);
+%}
+
+instruct subL_rReg_mem_rReg_ndd(rRegL dst, memory src1, rRegL src2, rFlagsReg cr)
+%{
+  predicate(UseAPX);
+  match(Set dst (SubL (LoadL src1) src2));
+  effect(KILL cr);
+  flag(PD::Flag_sets_overflow_flag, PD::Flag_sets_sign_flag, PD::Flag_sets_zero_flag, PD::Flag_sets_carry_flag, PD::Flag_sets_parity_flag);
+
+  ins_cost(150);
+  format %{ "esubq    $dst, $src1, $src2\t# long ndd" %}
+  ins_encode %{
+    __ esubq($dst$$Register, $src1$$Address, $src2$$Register, false);
+  %}
+  ins_pipe(ialu_reg_mem);
+%}
+
 instruct subL_mem_rReg(memory dst, rRegL src, rFlagsReg cr)
 %{
   match(Set dst (StoreL dst (SubL (LoadL dst) src)));
@@ -7630,6 +8368,7 @@ instruct subP_rReg(rRegP dst, rRegI src, immI_0 zero, rFlagsReg cr)
 
 instruct negI_rReg(rRegI dst, immI_0 zero, rFlagsReg cr)
 %{
+  predicate(!UseAPX);
   match(Set dst (SubI zero dst));
   effect(KILL cr);
   flag(PD::Flag_sets_overflow_flag, PD::Flag_sets_sign_flag, PD::Flag_sets_zero_flag, PD::Flag_sets_parity_flag);
@@ -7641,8 +8380,23 @@ instruct negI_rReg(rRegI dst, immI_0 zero, rFlagsReg cr)
   ins_pipe(ialu_reg);
 %}
 
+instruct negI_rReg_ndd(rRegI dst, rRegI src, immI_0 zero, rFlagsReg cr)
+%{
+  predicate(UseAPX);
+  match(Set dst (SubI zero src));
+  effect(KILL cr);
+  flag(PD::Flag_sets_overflow_flag, PD::Flag_sets_sign_flag, PD::Flag_sets_zero_flag, PD::Flag_sets_parity_flag);
+
+  format %{ "enegl    $dst, $src\t# int ndd" %}
+  ins_encode %{
+    __ enegl($dst$$Register, $src$$Register, false);
+  %}
+  ins_pipe(ialu_reg);
+%}
+
 instruct negI_rReg_2(rRegI dst, rFlagsReg cr)
 %{
+  predicate(!UseAPX);
   match(Set dst (NegI dst));
   effect(KILL cr);
   flag(PD::Flag_sets_overflow_flag, PD::Flag_sets_sign_flag, PD::Flag_sets_zero_flag, PD::Flag_sets_parity_flag);
@@ -7654,6 +8408,20 @@ instruct negI_rReg_2(rRegI dst, rFlagsReg cr)
   ins_pipe(ialu_reg);
 %}
 
+instruct negI_rReg_2_ndd(rRegI dst, rRegI src, rFlagsReg cr)
+%{
+  predicate(UseAPX);
+  match(Set dst (NegI src));
+  effect(KILL cr);
+  flag(PD::Flag_sets_overflow_flag, PD::Flag_sets_sign_flag, PD::Flag_sets_zero_flag, PD::Flag_sets_parity_flag);
+
+  format %{ "enegl    $dst, $src\t# int ndd" %}
+  ins_encode %{
+    __ enegl($dst$$Register, $src$$Register, false);
+  %}
+  ins_pipe(ialu_reg);
+%}
+
 instruct negI_mem(memory dst, immI_0 zero, rFlagsReg cr)
 %{
   match(Set dst (StoreI dst (SubI zero (LoadI dst))));
@@ -7669,6 +8437,7 @@ instruct negI_mem(memory dst, immI_0 zero, rFlagsReg cr)
 
 instruct negL_rReg(rRegL dst, immL0 zero, rFlagsReg cr)
 %{
+  predicate(!UseAPX);
   match(Set dst (SubL zero dst));
   effect(KILL cr);
   flag(PD::Flag_sets_overflow_flag, PD::Flag_sets_sign_flag, PD::Flag_sets_zero_flag, PD::Flag_sets_parity_flag);
@@ -7680,8 +8449,23 @@ instruct negL_rReg(rRegL dst, immL0 zero, rFlagsReg cr)
   ins_pipe(ialu_reg);
 %}
 
+instruct negL_rReg_ndd(rRegL dst, rRegL src, immL0 zero, rFlagsReg cr)
+%{
+  predicate(UseAPX);
+  match(Set dst (SubL zero src));
+  effect(KILL cr);
+  flag(PD::Flag_sets_overflow_flag, PD::Flag_sets_sign_flag, PD::Flag_sets_zero_flag, PD::Flag_sets_parity_flag);
+
+  format %{ "enegq    $dst, $src\t# long ndd" %}
+  ins_encode %{
+    __ enegq($dst$$Register, $src$$Register, false);
+  %}
+  ins_pipe(ialu_reg);
+%}
+
 instruct negL_rReg_2(rRegL dst, rFlagsReg cr)
 %{
+  predicate(!UseAPX);
   match(Set dst (NegL dst));
   effect(KILL cr);
   flag(PD::Flag_sets_overflow_flag, PD::Flag_sets_sign_flag, PD::Flag_sets_zero_flag, PD::Flag_sets_parity_flag);
@@ -7693,6 +8477,20 @@ instruct negL_rReg_2(rRegL dst, rFlagsReg cr)
   ins_pipe(ialu_reg);
 %}
 
+instruct negL_rReg_2_ndd(rRegL dst, rRegL src, rFlagsReg cr)
+%{
+  predicate(UseAPX);
+  match(Set dst (NegL src));
+  effect(KILL cr);
+  flag(PD::Flag_sets_overflow_flag, PD::Flag_sets_sign_flag, PD::Flag_sets_zero_flag, PD::Flag_sets_parity_flag);
+
+  format %{ "enegq    $dst, $src\t# long ndd" %}
+  ins_encode %{
+    __ enegq($dst$$Register, $src$$Register, false);
+  %}
+  ins_pipe(ialu_reg);
+%}
+
 instruct negL_mem(memory dst, immL0 zero, rFlagsReg cr)
 %{
   match(Set dst (StoreL dst (SubL zero (LoadL dst))));
@@ -7712,6 +8510,7 @@ instruct negL_mem(memory dst, immL0 zero, rFlagsReg cr)
 
 instruct mulI_rReg(rRegI dst, rRegI src, rFlagsReg cr)
 %{
+  predicate(!UseAPX);
   match(Set dst (MulI dst src));
   effect(KILL cr);
 
@@ -7723,8 +8522,23 @@ instruct mulI_rReg(rRegI dst, rRegI src, rFlagsReg cr)
   ins_pipe(ialu_reg_reg_alu0);
 %}
 
+instruct mulI_rReg_ndd(rRegI dst, rRegI src1, rRegI src2, rFlagsReg cr)
+%{
+  predicate(UseAPX);
+  match(Set dst (MulI src1 src2));
+  effect(KILL cr);
+
+  ins_cost(300);
+  format %{ "eimull   $dst, $src1, $src2\t# int ndd" %}
+  ins_encode %{
+    __ eimull($dst$$Register, $src1$$Register, $src2$$Register, false);
+  %}
+  ins_pipe(ialu_reg_reg_alu0);
+%}
+
 instruct mulI_rReg_imm(rRegI dst, rRegI src, immI imm, rFlagsReg cr)
 %{
+  predicate(!UseAPX);
   match(Set dst (MulI src imm));
   effect(KILL cr);
 
@@ -7736,8 +8550,23 @@ instruct mulI_rReg_imm(rRegI dst, rRegI src, immI imm, rFlagsReg cr)
   ins_pipe(ialu_reg_reg_alu0);
 %}
 
+instruct mulI_rReg_rReg_imm_ndd(rRegI dst, rRegI src1, immI src2, rFlagsReg cr)
+%{
+  predicate(UseAPX);
+  match(Set dst (MulI src1 src2));
+  effect(KILL cr);
+
+  ins_cost(300);
+  format %{ "eimull   $dst, $src1, $src2\t# int ndd" %}
+  ins_encode %{
+    __ eimull($dst$$Register, $src1$$Register, $src2$$constant, false);
+  %}
+  ins_pipe(ialu_reg_reg_alu0);
+%}
+
 instruct mulI_mem(rRegI dst, memory src, rFlagsReg cr)
 %{
+  predicate(!UseAPX);
   match(Set dst (MulI dst (LoadI src)));
   effect(KILL cr);
 
@@ -7749,8 +8578,23 @@ instruct mulI_mem(rRegI dst, memory src, rFlagsReg cr)
   ins_pipe(ialu_reg_mem_alu0);
 %}
 
+instruct mulI_rReg_rReg_mem_ndd(rRegI dst, rRegI src1, memory src2, rFlagsReg cr)
+%{
+  predicate(UseAPX);
+  match(Set dst (MulI src1 (LoadI src2)));
+  effect(KILL cr);
+
+  ins_cost(350);
+  format %{ "eimull   $dst, $src1, $src2\t# int ndd" %}
+  ins_encode %{
+    __ eimull($dst$$Register, $src1$$Register, $src2$$Address, false);
+  %}
+  ins_pipe(ialu_reg_mem_alu0);
+%}
+
 instruct mulI_mem_imm(rRegI dst, memory src, immI imm, rFlagsReg cr)
 %{
+  predicate(!UseAPX);
   match(Set dst (MulI (LoadI src) imm));
   effect(KILL cr);
 
@@ -7762,6 +8606,20 @@ instruct mulI_mem_imm(rRegI dst, memory src, immI imm, rFlagsReg cr)
   ins_pipe(ialu_reg_mem_alu0);
 %}
 
+instruct mulI_rReg_mem_imm(rRegI dst, memory src1, immI src2, rFlagsReg cr)
+%{
+  predicate(UseAPX);
+  match(Set dst (MulI (LoadI src1) src2));
+  effect(KILL cr);
+
+  ins_cost(300);
+  format %{ "eimull   $dst, $src1, $src2\t# int ndd" %}
+  ins_encode %{
+    __ eimull($dst$$Register, $src1$$Address, $src2$$constant, false);
+  %}
+  ins_pipe(ialu_reg_mem_alu0);
+%}
+
 instruct mulAddS2I_rReg(rRegI dst, rRegI src1, rRegI src2, rRegI src3, rFlagsReg cr)
 %{
   match(Set dst (MulAddS2I (Binary dst src1) (Binary src2 src3)));
@@ -7774,6 +8632,7 @@ instruct mulAddS2I_rReg(rRegI dst, rRegI src1, rRegI src2, rRegI src3, rFlagsReg
 
 instruct mulL_rReg(rRegL dst, rRegL src, rFlagsReg cr)
 %{
+  predicate(!UseAPX);
   match(Set dst (MulL dst src));
   effect(KILL cr);
 
@@ -7785,8 +8644,23 @@ instruct mulL_rReg(rRegL dst, rRegL src, rFlagsReg cr)
   ins_pipe(ialu_reg_reg_alu0);
 %}
 
+instruct mulL_rReg_ndd(rRegL dst, rRegL src1, rRegL src2, rFlagsReg cr)
+%{
+  predicate(UseAPX);
+  match(Set dst (MulL src1 src2));
+  effect(KILL cr);
+
+  ins_cost(300);
+  format %{ "eimulq   $dst, $src1, $src2\t# long ndd" %}
+  ins_encode %{
+    __ eimulq($dst$$Register, $src1$$Register, $src2$$Register, false);
+  %}
+  ins_pipe(ialu_reg_reg_alu0);
+%}
+
 instruct mulL_rReg_imm(rRegL dst, rRegL src, immL32 imm, rFlagsReg cr)
 %{
+  predicate(!UseAPX);
   match(Set dst (MulL src imm));
   effect(KILL cr);
 
@@ -7798,8 +8672,23 @@ instruct mulL_rReg_imm(rRegL dst, rRegL src, immL32 imm, rFlagsReg cr)
   ins_pipe(ialu_reg_reg_alu0);
 %}
 
+instruct mulL_rReg_rReg_imm_ndd(rRegL dst, rRegL src1, immL32 src2, rFlagsReg cr)
+%{
+  predicate(UseAPX);
+  match(Set dst (MulL src1 src2));
+  effect(KILL cr);
+
+  ins_cost(300);
+  format %{ "eimulq   $dst, $src1, $src2\t# long ndd" %}
+  ins_encode %{
+    __ eimulq($dst$$Register, $src1$$Register, $src2$$constant, false);
+  %}
+  ins_pipe(ialu_reg_reg_alu0);
+%}
+
 instruct mulL_mem(rRegL dst, memory src, rFlagsReg cr)
 %{
+  predicate(!UseAPX);
   match(Set dst (MulL dst (LoadL src)));
   effect(KILL cr);
 
@@ -7811,8 +8700,23 @@ instruct mulL_mem(rRegL dst, memory src, rFlagsReg cr)
   ins_pipe(ialu_reg_mem_alu0);
 %}
 
+instruct mulL_rReg_rReg_mem_ndd(rRegL dst, rRegL src1, memory src2, rFlagsReg cr)
+%{
+  predicate(UseAPX);
+  match(Set dst (MulL src1 (LoadL src2)));
+  effect(KILL cr);
+
+  ins_cost(350);
+  format %{ "eimulq   $dst, $src1, $src2 \t# long" %}
+  ins_encode %{
+    __ eimulq($dst$$Register, $src1$$Register, $src2$$Address, false);
+  %}
+  ins_pipe(ialu_reg_mem_alu0);
+%}
+
 instruct mulL_mem_imm(rRegL dst, memory src, immL32 imm, rFlagsReg cr)
 %{
+  predicate(!UseAPX);
   match(Set dst (MulL (LoadL src) imm));
   effect(KILL cr);
 
@@ -7824,6 +8728,20 @@ instruct mulL_mem_imm(rRegL dst, memory src, immL32 imm, rFlagsReg cr)
   ins_pipe(ialu_reg_mem_alu0);
 %}
 
+instruct mulL_rReg_mem_imm_ndd(rRegL dst, memory src1, immL32 src2, rFlagsReg cr)
+%{
+  predicate(UseAPX);
+  match(Set dst (MulL (LoadL src1) src2));
+  effect(KILL cr);
+
+  ins_cost(300);
+  format %{ "eimulq   $dst, $src1, $src2\t# long ndd" %}
+  ins_encode %{
+    __ eimulq($dst$$Register, $src1$$Address, $src2$$constant, false);
+  %}
+  ins_pipe(ialu_reg_mem_alu0);
+%}
+
 instruct mulHiL_rReg(rdx_RegL dst, rRegL src, rax_RegL rax, rFlagsReg cr)
 %{
   match(Set dst (MulHiL src rax));
@@ -8059,6 +8977,35 @@ instruct umodL_rReg(rdx_RegL rdx, rax_RegL rax, no_rax_rdx_RegL div, rFlagsReg c
 // Shift Left by one, two, three
 instruct salI_rReg_immI2(rRegI dst, immI2 shift, rFlagsReg cr)
 %{
+  predicate(!UseAPX);
+  match(Set dst (LShiftI dst shift));
+  effect(KILL cr);
+
+  format %{ "sall    $dst, $shift" %}
+  ins_encode %{
+    __ sall($dst$$Register, $shift$$constant);
+  %}
+  ins_pipe(ialu_reg);
+%}
+
+// Shift Left by one, two, three
+instruct salI_rReg_immI2_ndd(rRegI dst, rRegI src, immI2 shift, rFlagsReg cr)
+%{
+  predicate(UseAPX);
+  match(Set dst (LShiftI src shift));
+  effect(KILL cr);
+
+  format %{ "esall    $dst, $src, $shift\t# int(ndd)" %}
+  ins_encode %{
+    __ esall($dst$$Register, $src$$Register, $shift$$constant, false);
+  %}
+  ins_pipe(ialu_reg);
+%}
+
+// Shift Left by 8-bit immediate
+instruct salI_rReg_imm(rRegI dst, immI8 shift, rFlagsReg cr)
+%{
+  predicate(!UseAPX);
   match(Set dst (LShiftI dst shift));
   effect(KILL cr);
 
@@ -8070,14 +9017,28 @@ instruct salI_rReg_immI2(rRegI dst, immI2 shift, rFlagsReg cr)
 %}
 
 // Shift Left by 8-bit immediate
-instruct salI_rReg_imm(rRegI dst, immI8 shift, rFlagsReg cr)
+instruct salI_rReg_imm_ndd(rRegI dst, rRegI src, immI8 shift, rFlagsReg cr)
 %{
-  match(Set dst (LShiftI dst shift));
+  predicate(UseAPX);
+  match(Set dst (LShiftI src shift));
   effect(KILL cr);
 
-  format %{ "sall    $dst, $shift" %}
+  format %{ "esall    $dst, $src, $shift\t# int (ndd)" %}
   ins_encode %{
-    __ sall($dst$$Register, $shift$$constant);
+    __ esall($dst$$Register, $src$$Register, $shift$$constant, false);
+  %}
+  ins_pipe(ialu_reg);
+%}
+
+instruct salI_rReg_mem_imm_ndd(rRegI dst, memory src, immI8 shift, rFlagsReg cr)
+%{
+  predicate(UseAPX);
+  match(Set dst (LShiftI (LoadI src) shift));
+  effect(KILL cr);
+
+  format %{ "esall    $dst, $src, $shift\t# int (ndd)" %}
+  ins_encode %{
+    __ esall($dst$$Register, $src$$Address, $shift$$constant, false);
   %}
   ins_pipe(ialu_reg);
 %}
@@ -8150,6 +9111,7 @@ instruct salI_mem_rReg(rRegI dst, memory src, rRegI shift)
 // Arithmetic Shift Right by 8-bit immediate
 instruct sarI_rReg_imm(rRegI dst, immI8 shift, rFlagsReg cr)
 %{
+  predicate(!UseAPX);
   match(Set dst (RShiftI dst shift));
   effect(KILL cr);
 
@@ -8160,6 +9122,33 @@ instruct sarI_rReg_imm(rRegI dst, immI8 shift, rFlagsReg cr)
   ins_pipe(ialu_mem_imm);
 %}
 
+// Arithmetic Shift Right by 8-bit immediate
+instruct sarI_rReg_imm_ndd(rRegI dst, rRegI src, immI8 shift, rFlagsReg cr)
+%{
+  predicate(UseAPX);
+  match(Set dst (RShiftI src shift));
+  effect(KILL cr);
+
+  format %{ "esarl    $dst, $src, $shift\t# int (ndd)" %}
+  ins_encode %{
+    __ esarl($dst$$Register, $src$$Register, $shift$$constant, false);
+  %}
+  ins_pipe(ialu_mem_imm);
+%}
+
+instruct sarI_rReg_mem_imm_ndd(rRegI dst, memory src, immI8 shift, rFlagsReg cr)
+%{
+  predicate(UseAPX);
+  match(Set dst (RShiftI (LoadI src) shift));
+  effect(KILL cr);
+
+  format %{ "esarl    $dst, $src, $shift\t# int (ndd)" %}
+  ins_encode %{
+    __ esarl($dst$$Register, $src$$Address, $shift$$constant, false);
+  %}
+  ins_pipe(ialu_mem_imm);
+%}
+
 // Arithmetic Shift Right by 8-bit immediate
 instruct sarI_mem_imm(memory dst, immI8 shift, rFlagsReg cr)
 %{
@@ -8228,6 +9217,7 @@ instruct sarI_mem_rReg(rRegI dst, memory src, rRegI shift)
 // Logical Shift Right by 8-bit immediate
 instruct shrI_rReg_imm(rRegI dst, immI8 shift, rFlagsReg cr)
 %{
+  predicate(!UseAPX);
   match(Set dst (URShiftI dst shift));
   effect(KILL cr);
 
@@ -8238,6 +9228,33 @@ instruct shrI_rReg_imm(rRegI dst, immI8 shift, rFlagsReg cr)
   ins_pipe(ialu_reg);
 %}
 
+// Logical Shift Right by 8-bit immediate
+instruct shrI_rReg_imm_ndd(rRegI dst, rRegI src, immI8 shift, rFlagsReg cr)
+%{
+  predicate(UseAPX);
+  match(Set dst (URShiftI src shift));
+  effect(KILL cr);
+
+  format %{ "eshrl    $dst, $src, $shift\t # int (ndd)" %}
+  ins_encode %{
+    __ eshrl($dst$$Register, $src$$Register, $shift$$constant, false);
+  %}
+  ins_pipe(ialu_reg);
+%}
+
+instruct shrI_rReg_mem_imm_ndd(rRegI dst, memory src, immI8 shift, rFlagsReg cr)
+%{
+  predicate(UseAPX);
+  match(Set dst (URShiftI (LoadI src) shift));
+  effect(KILL cr);
+
+  format %{ "eshrl    $dst, $src, $shift\t # int (ndd)" %}
+  ins_encode %{
+    __ eshrl($dst$$Register, $src$$Address, $shift$$constant, false);
+  %}
+  ins_pipe(ialu_reg);
+%}
+
 // Logical Shift Right by 8-bit immediate
 instruct shrI_mem_imm(memory dst, immI8 shift, rFlagsReg cr)
 %{
@@ -8307,6 +9324,35 @@ instruct shrI_mem_rReg(rRegI dst, memory src, rRegI shift)
 // Shift Left by one, two, three
 instruct salL_rReg_immI2(rRegL dst, immI2 shift, rFlagsReg cr)
 %{
+  predicate(!UseAPX);
+  match(Set dst (LShiftL dst shift));
+  effect(KILL cr);
+
+  format %{ "salq    $dst, $shift" %}
+  ins_encode %{
+    __ salq($dst$$Register, $shift$$constant);
+  %}
+  ins_pipe(ialu_reg);
+%}
+
+// Shift Left by one, two, three
+instruct salL_rReg_immI2_ndd(rRegL dst, rRegL src, immI2 shift, rFlagsReg cr)
+%{
+  predicate(UseAPX);
+  match(Set dst (LShiftL src shift));
+  effect(KILL cr);
+
+  format %{ "esalq    $dst, $src, $shift\t# long (ndd)" %}
+  ins_encode %{
+    __ esalq($dst$$Register, $src$$Register, $shift$$constant, false);
+  %}
+  ins_pipe(ialu_reg);
+%}
+
+// Shift Left by 8-bit immediate
+instruct salL_rReg_imm(rRegL dst, immI8 shift, rFlagsReg cr)
+%{
+  predicate(!UseAPX);
   match(Set dst (LShiftL dst shift));
   effect(KILL cr);
 
@@ -8318,14 +9364,28 @@ instruct salL_rReg_immI2(rRegL dst, immI2 shift, rFlagsReg cr)
 %}
 
 // Shift Left by 8-bit immediate
-instruct salL_rReg_imm(rRegL dst, immI8 shift, rFlagsReg cr)
+instruct salL_rReg_imm_ndd(rRegL dst, rRegL src, immI8 shift, rFlagsReg cr)
 %{
-  match(Set dst (LShiftL dst shift));
+  predicate(UseAPX);
+  match(Set dst (LShiftL src shift));
   effect(KILL cr);
 
-  format %{ "salq    $dst, $shift" %}
+  format %{ "esalq    $dst, $src, $shift\t# long (ndd)" %}
   ins_encode %{
-    __ salq($dst$$Register, $shift$$constant);
+    __ esalq($dst$$Register, $src$$Register, $shift$$constant, false);
+  %}
+  ins_pipe(ialu_reg);
+%}
+
+instruct salL_rReg_mem_imm_ndd(rRegL dst, memory src, immI8 shift, rFlagsReg cr)
+%{
+  predicate(UseAPX);
+  match(Set dst (LShiftL (LoadL src) shift));
+  effect(KILL cr);
+
+  format %{ "esalq    $dst, $src, $shift\t# long (ndd)" %}
+  ins_encode %{
+    __ esalq($dst$$Register, $src$$Address, $shift$$constant, false);
   %}
   ins_pipe(ialu_reg);
 %}
@@ -8398,6 +9458,7 @@ instruct salL_mem_rReg(rRegL dst, memory src, rRegI shift)
 // Arithmetic Shift Right by 8-bit immediate
 instruct sarL_rReg_imm(rRegL dst, immI shift, rFlagsReg cr)
 %{
+  predicate(!UseAPX);
   match(Set dst (RShiftL dst shift));
   effect(KILL cr);
 
@@ -8408,6 +9469,33 @@ instruct sarL_rReg_imm(rRegL dst, immI shift, rFlagsReg cr)
   ins_pipe(ialu_mem_imm);
 %}
 
+// Arithmetic Shift Right by 8-bit immediate
+instruct sarL_rReg_imm_ndd(rRegL dst, rRegL src, immI shift, rFlagsReg cr)
+%{
+  predicate(UseAPX);
+  match(Set dst (RShiftL src shift));
+  effect(KILL cr);
+
+  format %{ "esarq    $dst, $src, $shift\t# long (ndd)" %}
+  ins_encode %{
+    __ esarq($dst$$Register, $src$$Register, (unsigned char)($shift$$constant & 0x3F), false);
+  %}
+  ins_pipe(ialu_mem_imm);
+%}
+
+instruct sarL_rReg_mem_imm_ndd(rRegL dst, memory src, immI shift, rFlagsReg cr)
+%{
+  predicate(UseAPX);
+  match(Set dst (RShiftL (LoadL src) shift));
+  effect(KILL cr);
+
+  format %{ "esarq    $dst, $src, $shift\t# long (ndd)" %}
+  ins_encode %{
+    __ esarq($dst$$Register, $src$$Address, (unsigned char)($shift$$constant & 0x3F), false);
+  %}
+  ins_pipe(ialu_mem_imm);
+%}
+
 // Arithmetic Shift Right by 8-bit immediate
 instruct sarL_mem_imm(memory dst, immI shift, rFlagsReg cr)
 %{
@@ -8476,6 +9564,7 @@ instruct sarL_mem_rReg(rRegL dst, memory src, rRegI shift)
 // Logical Shift Right by 8-bit immediate
 instruct shrL_rReg_imm(rRegL dst, immI8 shift, rFlagsReg cr)
 %{
+  predicate(!UseAPX);
   match(Set dst (URShiftL dst shift));
   effect(KILL cr);
 
@@ -8486,6 +9575,33 @@ instruct shrL_rReg_imm(rRegL dst, immI8 shift, rFlagsReg cr)
   ins_pipe(ialu_reg);
 %}
 
+// Logical Shift Right by 8-bit immediate
+instruct shrL_rReg_imm_ndd(rRegL dst, rRegL src, immI8 shift, rFlagsReg cr)
+%{
+  predicate(UseAPX);
+  match(Set dst (URShiftL src shift));
+  effect(KILL cr);
+
+  format %{ "eshrq    $dst, $src, $shift\t# long (ndd)" %}
+  ins_encode %{
+    __ eshrq($dst$$Register, $src$$Register, $shift$$constant, false);
+  %}
+  ins_pipe(ialu_reg);
+%}
+
+instruct shrL_rReg_mem_imm_ndd(rRegL dst, memory src, immI8 shift, rFlagsReg cr)
+%{
+  predicate(UseAPX);
+  match(Set dst (URShiftL (LoadL src) shift));
+  effect(KILL cr);
+
+  format %{ "eshrq    $dst, $src, $shift\t# long (ndd)" %}
+  ins_encode %{
+    __ eshrq($dst$$Register, $src$$Address, $shift$$constant, false);
+  %}
+  ins_pipe(ialu_reg);
+%}
+
 // Logical Shift Right by 8-bit immediate
 instruct shrL_mem_imm(memory dst, immI8 shift, rFlagsReg cr)
 %{
@@ -8594,7 +9710,7 @@ instruct rolI_immI8_legacy(rRegI dst, immI8 shift, rFlagsReg cr)
 
 instruct rolI_immI8(rRegI dst, rRegI src, immI8 shift)
 %{
-  predicate(VM_Version::supports_bmi2() && n->bottom_type()->basic_type() == T_INT);
+  predicate(!UseAPX && VM_Version::supports_bmi2() && n->bottom_type()->basic_type() == T_INT);
   match(Set dst (RotateLeft src shift));
   format %{ "rolxl   $dst, $src, $shift" %}
   ins_encode %{
@@ -8620,7 +9736,7 @@ instruct rolI_mem_immI8(rRegI dst, memory src, immI8 shift)
 // Rotate Left by variable
 instruct rolI_rReg_Var(rRegI dst, rcx_RegI shift, rFlagsReg cr)
 %{
-  predicate(n->bottom_type()->basic_type() == T_INT);
+  predicate(!UseAPX && n->bottom_type()->basic_type() == T_INT);
   match(Set dst (RotateLeft dst shift));
   effect(KILL cr);
   format %{ "roll    $dst, $shift" %}
@@ -8630,6 +9746,20 @@ instruct rolI_rReg_Var(rRegI dst, rcx_RegI shift, rFlagsReg cr)
   ins_pipe(ialu_reg_reg);
 %}
 
+// Rotate Left by variable
+instruct rolI_rReg_Var_ndd(rRegI dst, rRegI src, rcx_RegI shift, rFlagsReg cr)
+%{
+  predicate(UseAPX && n->bottom_type()->basic_type() == T_INT);
+  match(Set dst (RotateLeft src shift));
+  effect(KILL cr);
+
+  format %{ "eroll    $dst, $src, $shift\t# rotate left (int ndd)" %}
+  ins_encode %{
+    __ eroll($dst$$Register, $src$$Register, false);
+  %}
+  ins_pipe(ialu_reg_reg);
+%}
+
 // Rotate Right by constant.
 instruct rorI_immI8_legacy(rRegI dst, immI8 shift, rFlagsReg cr)
 %{
@@ -8646,7 +9776,7 @@ instruct rorI_immI8_legacy(rRegI dst, immI8 shift, rFlagsReg cr)
 // Rotate Right by constant.
 instruct rorI_immI8(rRegI dst, rRegI src, immI8 shift)
 %{
-  predicate(VM_Version::supports_bmi2() && n->bottom_type()->basic_type() == T_INT);
+  predicate(!UseAPX && VM_Version::supports_bmi2() && n->bottom_type()->basic_type() == T_INT);
   match(Set dst (RotateRight src shift));
   format %{ "rorxl   $dst, $src, $shift" %}
   ins_encode %{
@@ -8670,7 +9800,7 @@ instruct rorI_mem_immI8(rRegI dst, memory src, immI8 shift)
 // Rotate Right by variable
 instruct rorI_rReg_Var(rRegI dst, rcx_RegI shift, rFlagsReg cr)
 %{
-  predicate(n->bottom_type()->basic_type() == T_INT);
+  predicate(!UseAPX && n->bottom_type()->basic_type() == T_INT);
   match(Set dst (RotateRight dst shift));
   effect(KILL cr);
   format %{ "rorl    $dst, $shift" %}
@@ -8680,6 +9810,20 @@ instruct rorI_rReg_Var(rRegI dst, rcx_RegI shift, rFlagsReg cr)
   ins_pipe(ialu_reg_reg);
 %}
 
+// Rotate Right by variable
+instruct rorI_rReg_Var_ndd(rRegI dst, rRegI src, rcx_RegI shift, rFlagsReg cr)
+%{
+  predicate(UseAPX && n->bottom_type()->basic_type() == T_INT);
+  match(Set dst (RotateRight src shift));
+  effect(KILL cr);
+
+  format %{ "erorl    $dst, $src, $shift\t# rotate right(int ndd)" %}
+  ins_encode %{
+    __ erorl($dst$$Register, $src$$Register, false);
+  %}
+  ins_pipe(ialu_reg_reg);
+%}
+
 // Rotate Left by constant.
 instruct rolL_immI8_legacy(rRegL dst, immI8 shift, rFlagsReg cr)
 %{
@@ -8695,7 +9839,7 @@ instruct rolL_immI8_legacy(rRegL dst, immI8 shift, rFlagsReg cr)
 
 instruct rolL_immI8(rRegL dst, rRegL src, immI8 shift)
 %{
-  predicate(VM_Version::supports_bmi2() && n->bottom_type()->basic_type() == T_LONG);
+  predicate(!UseAPX && VM_Version::supports_bmi2() && n->bottom_type()->basic_type() == T_LONG);
   match(Set dst (RotateLeft src shift));
   format %{ "rolxq   $dst, $src, $shift" %}
   ins_encode %{
@@ -8721,7 +9865,7 @@ instruct rolL_mem_immI8(rRegL dst, memory src, immI8 shift)
 // Rotate Left by variable
 instruct rolL_rReg_Var(rRegL dst, rcx_RegI shift, rFlagsReg cr)
 %{
-  predicate(n->bottom_type()->basic_type() == T_LONG);
+  predicate(!UseAPX && n->bottom_type()->basic_type() == T_LONG);
   match(Set dst (RotateLeft dst shift));
   effect(KILL cr);
   format %{ "rolq    $dst, $shift" %}
@@ -8731,6 +9875,20 @@ instruct rolL_rReg_Var(rRegL dst, rcx_RegI shift, rFlagsReg cr)
   ins_pipe(ialu_reg_reg);
 %}
 
+// Rotate Left by variable
+instruct rolL_rReg_Var_ndd(rRegL dst, rRegL src, rcx_RegI shift, rFlagsReg cr)
+%{
+  predicate(UseAPX && n->bottom_type()->basic_type() == T_LONG);
+  match(Set dst (RotateLeft src shift));
+  effect(KILL cr);
+
+  format %{ "erolq    $dst, $src, $shift\t# rotate left(long ndd)" %}
+  ins_encode %{
+    __ erolq($dst$$Register, $src$$Register, false);
+  %}
+  ins_pipe(ialu_reg_reg);
+%}
+
 // Rotate Right by constant.
 instruct rorL_immI8_legacy(rRegL dst, immI8 shift, rFlagsReg cr)
 %{
@@ -8771,7 +9929,7 @@ instruct rorL_mem_immI8(rRegL dst, memory src, immI8 shift)
 // Rotate Right by variable
 instruct rorL_rReg_Var(rRegL dst, rcx_RegI shift, rFlagsReg cr)
 %{
-  predicate(n->bottom_type()->basic_type() == T_LONG);
+  predicate(!UseAPX && n->bottom_type()->basic_type() == T_LONG);
   match(Set dst (RotateRight dst shift));
   effect(KILL cr);
   format %{ "rorq    $dst, $shift" %}
@@ -8781,6 +9939,20 @@ instruct rorL_rReg_Var(rRegL dst, rcx_RegI shift, rFlagsReg cr)
   ins_pipe(ialu_reg_reg);
 %}
 
+// Rotate Right by variable
+instruct rorL_rReg_Var_ndd(rRegL dst, rRegL src, rcx_RegI shift, rFlagsReg cr)
+%{
+  predicate(UseAPX && n->bottom_type()->basic_type() == T_LONG);
+  match(Set dst (RotateRight src shift));
+  effect(KILL cr);
+
+  format %{ "erorq    $dst, $src, $shift\t# rotate right(long ndd)" %}
+  ins_encode %{
+    __ erorq($dst$$Register, $src$$Register, false);
+  %}
+  ins_pipe(ialu_reg_reg);
+%}
+
 //----------------------------- CompressBits/ExpandBits ------------------------
 
 instruct compressBitsL_reg(rRegL dst, rRegL src, rRegL mask) %{
@@ -8832,6 +10004,7 @@ instruct expandBitsL_mem(rRegL dst, rRegL src, memory mask) %{
 // And Register with Register
 instruct andI_rReg(rRegI dst, rRegI src, rFlagsReg cr)
 %{
+  predicate(!UseAPX);
   match(Set dst (AndI dst src));
   effect(KILL cr);
   flag(PD::Flag_sets_sign_flag, PD::Flag_sets_zero_flag, PD::Flag_sets_parity_flag, PD::Flag_clears_overflow_flag, PD::Flag_clears_carry_flag);
@@ -8843,6 +10016,22 @@ instruct andI_rReg(rRegI dst, rRegI src, rFlagsReg cr)
   ins_pipe(ialu_reg_reg);
 %}
 
+// And Register with Register using New Data Destination (NDD)
+instruct andI_rReg_ndd(rRegI dst, rRegI src1, rRegI src2, rFlagsReg cr)
+%{
+  predicate(UseAPX);
+  match(Set dst (AndI src1 src2));
+  effect(KILL cr);
+  flag(PD::Flag_sets_sign_flag, PD::Flag_sets_zero_flag, PD::Flag_sets_parity_flag, PD::Flag_clears_overflow_flag, PD::Flag_clears_carry_flag);
+
+  format %{ "eandl     $dst, $src1, $src2\t# int ndd" %}
+  ins_encode %{
+    __ eandl($dst$$Register, $src1$$Register, $src2$$Register, false);
+
+  %}
+  ins_pipe(ialu_reg_reg);
+%}
+
 // And Register with Immediate 255
 instruct andI_rReg_imm255(rRegI dst, rRegI src, immI_255 mask)
 %{
@@ -8909,6 +10098,7 @@ instruct convI2LAndI_reg_immIbitmask(rRegL dst, rRegI src,  immI_Pow2M1 mask, rR
 // And Register with Immediate
 instruct andI_rReg_imm(rRegI dst, immI src, rFlagsReg cr)
 %{
+  predicate(!UseAPX);
   match(Set dst (AndI dst src));
   effect(KILL cr);
   flag(PD::Flag_sets_sign_flag, PD::Flag_sets_zero_flag, PD::Flag_sets_parity_flag, PD::Flag_clears_overflow_flag, PD::Flag_clears_carry_flag);
@@ -8920,9 +10110,38 @@ instruct andI_rReg_imm(rRegI dst, immI src, rFlagsReg cr)
   ins_pipe(ialu_reg);
 %}
 
+instruct andI_rReg_rReg_imm_ndd(rRegI dst, rRegI src1, immI src2, rFlagsReg cr)
+%{
+  predicate(UseAPX);
+  match(Set dst (AndI src1 src2));
+  effect(KILL cr);
+  flag(PD::Flag_sets_sign_flag, PD::Flag_sets_zero_flag, PD::Flag_sets_parity_flag, PD::Flag_clears_overflow_flag, PD::Flag_clears_carry_flag);
+
+  format %{ "eandl    $dst, $src1, $src2\t# int ndd" %}
+  ins_encode %{
+    __ eandl($dst$$Register, $src1$$Register, $src2$$constant, false);
+  %}
+  ins_pipe(ialu_reg);
+%}
+
+instruct andI_rReg_mem_imm_ndd(rRegI dst, memory src1, immI src2, rFlagsReg cr)
+%{
+  predicate(UseAPX);
+  match(Set dst (AndI (LoadI src1) src2));
+  effect(KILL cr);
+  flag(PD::Flag_sets_sign_flag, PD::Flag_sets_zero_flag, PD::Flag_sets_parity_flag, PD::Flag_clears_overflow_flag, PD::Flag_clears_carry_flag);
+
+  format %{ "eandl    $dst, $src1, $src2\t# int ndd" %}
+  ins_encode %{
+    __ eandl($dst$$Register, $src1$$Address, $src2$$constant, false);
+  %}
+  ins_pipe(ialu_reg);
+%}
+
 // And Register with Memory
 instruct andI_rReg_mem(rRegI dst, memory src, rFlagsReg cr)
 %{
+  predicate(!UseAPX);
   match(Set dst (AndI dst (LoadI src)));
   effect(KILL cr);
   flag(PD::Flag_sets_sign_flag, PD::Flag_sets_zero_flag, PD::Flag_sets_parity_flag, PD::Flag_clears_overflow_flag, PD::Flag_clears_carry_flag);
@@ -8935,6 +10154,21 @@ instruct andI_rReg_mem(rRegI dst, memory src, rFlagsReg cr)
   ins_pipe(ialu_reg_mem);
 %}
 
+instruct andI_rReg_rReg_mem_ndd(rRegI dst, rRegI src1, memory src2, rFlagsReg cr)
+%{
+  predicate(UseAPX);
+  match(Set dst (AndI src1 (LoadI src2)));
+  effect(KILL cr);
+  flag(PD::Flag_sets_sign_flag, PD::Flag_sets_zero_flag, PD::Flag_sets_parity_flag, PD::Flag_clears_overflow_flag, PD::Flag_clears_carry_flag);
+
+  ins_cost(150);
+  format %{ "eandl    $dst, $src1, $src2\t# int ndd" %}
+  ins_encode %{
+    __ eandl($dst$$Register, $src1$$Register, $src2$$Address, false);
+  %}
+  ins_pipe(ialu_reg_mem);
+%}
+
 // And Memory with Register
 instruct andB_mem_rReg(memory dst, rRegI src, rFlagsReg cr)
 %{
@@ -9107,6 +10341,7 @@ instruct blsrI_rReg_mem(rRegI dst, memory src, immI_M1 minus_1, rFlagsReg cr)
 // Or Register with Register
 instruct orI_rReg(rRegI dst, rRegI src, rFlagsReg cr)
 %{
+  predicate(!UseAPX);
   match(Set dst (OrI dst src));
   effect(KILL cr);
   flag(PD::Flag_sets_sign_flag, PD::Flag_sets_zero_flag, PD::Flag_sets_parity_flag, PD::Flag_clears_overflow_flag, PD::Flag_clears_carry_flag);
@@ -9118,9 +10353,25 @@ instruct orI_rReg(rRegI dst, rRegI src, rFlagsReg cr)
   ins_pipe(ialu_reg_reg);
 %}
 
+// Or Register with Register using New Data Destination (NDD)
+instruct orI_rReg_ndd(rRegI dst, rRegI src1, rRegI src2, rFlagsReg cr)
+%{
+  predicate(UseAPX);
+  match(Set dst (OrI src1 src2));
+  effect(KILL cr);
+  flag(PD::Flag_sets_sign_flag, PD::Flag_sets_zero_flag, PD::Flag_sets_parity_flag, PD::Flag_clears_overflow_flag, PD::Flag_clears_carry_flag);
+
+  format %{ "eorl     $dst, $src1, $src2\t# int ndd" %}
+  ins_encode %{
+    __ eorl($dst$$Register, $src1$$Register, $src2$$Register, false);
+  %}
+  ins_pipe(ialu_reg_reg);
+%}
+
 // Or Register with Immediate
 instruct orI_rReg_imm(rRegI dst, immI src, rFlagsReg cr)
 %{
+  predicate(!UseAPX);
   match(Set dst (OrI dst src));
   effect(KILL cr);
   flag(PD::Flag_sets_sign_flag, PD::Flag_sets_zero_flag, PD::Flag_sets_parity_flag, PD::Flag_clears_overflow_flag, PD::Flag_clears_carry_flag);
@@ -9132,9 +10383,52 @@ instruct orI_rReg_imm(rRegI dst, immI src, rFlagsReg cr)
   ins_pipe(ialu_reg);
 %}
 
+instruct orI_rReg_rReg_imm_ndd(rRegI dst, rRegI src1, immI src2, rFlagsReg cr)
+%{
+  predicate(UseAPX);
+  match(Set dst (OrI src1 src2));
+  effect(KILL cr);
+  flag(PD::Flag_sets_sign_flag, PD::Flag_sets_zero_flag, PD::Flag_sets_parity_flag, PD::Flag_clears_overflow_flag, PD::Flag_clears_carry_flag);
+
+  format %{ "eorl     $dst, $src1, $src2\t# int ndd" %}
+  ins_encode %{
+    __ eorl($dst$$Register, $src1$$Register, $src2$$constant, false);
+  %}
+  ins_pipe(ialu_reg);
+%}
+
+instruct orI_rReg_imm_rReg_ndd(rRegI dst, immI src1, rRegI src2, rFlagsReg cr)
+%{
+  predicate(UseAPX);
+  match(Set dst (OrI src1 src2));
+  effect(KILL cr);
+  flag(PD::Flag_sets_sign_flag, PD::Flag_sets_zero_flag, PD::Flag_sets_parity_flag, PD::Flag_clears_overflow_flag, PD::Flag_clears_carry_flag);
+
+  format %{ "eorl     $dst, $src2, $src1\t# int ndd" %}
+  ins_encode %{
+    __ eorl($dst$$Register, $src2$$Register, $src1$$constant, false);
+  %}
+  ins_pipe(ialu_reg);
+%}
+
+instruct orI_rReg_mem_imm_ndd(rRegI dst, memory src1, immI src2, rFlagsReg cr)
+%{
+  predicate(UseAPX);
+  match(Set dst (OrI (LoadI src1) src2));
+  effect(KILL cr);
+  flag(PD::Flag_sets_sign_flag, PD::Flag_sets_zero_flag, PD::Flag_sets_parity_flag, PD::Flag_clears_overflow_flag, PD::Flag_clears_carry_flag);
+
+  format %{ "eorl     $dst, $src1, $src2\t# int ndd" %}
+  ins_encode %{
+    __ eorl($dst$$Register, $src1$$Address, $src2$$constant, false);
+  %}
+  ins_pipe(ialu_reg);
+%}
+
 // Or Register with Memory
 instruct orI_rReg_mem(rRegI dst, memory src, rFlagsReg cr)
 %{
+  predicate(!UseAPX);
   match(Set dst (OrI dst (LoadI src)));
   effect(KILL cr);
   flag(PD::Flag_sets_sign_flag, PD::Flag_sets_zero_flag, PD::Flag_sets_parity_flag, PD::Flag_clears_overflow_flag, PD::Flag_clears_carry_flag);
@@ -9147,6 +10441,21 @@ instruct orI_rReg_mem(rRegI dst, memory src, rFlagsReg cr)
   ins_pipe(ialu_reg_mem);
 %}
 
+instruct orI_rReg_rReg_mem_ndd(rRegI dst, rRegI src1, memory src2, rFlagsReg cr)
+%{
+  predicate(UseAPX);
+  match(Set dst (OrI src1 (LoadI src2)));
+  effect(KILL cr);
+  flag(PD::Flag_sets_sign_flag, PD::Flag_sets_zero_flag, PD::Flag_sets_parity_flag, PD::Flag_clears_overflow_flag, PD::Flag_clears_carry_flag);
+
+  ins_cost(150);
+  format %{ "eorl     $dst, $src1, $src2\t# int ndd" %}
+  ins_encode %{
+    __ eorl($dst$$Register, $src1$$Register, $src2$$Address, false);
+  %}
+  ins_pipe(ialu_reg_mem);
+%}
+
 // Or Memory with Register
 instruct orB_mem_rReg(memory dst, rRegI src, rFlagsReg cr)
 %{
@@ -9195,6 +10504,7 @@ instruct orI_mem_imm(memory dst, immI src, rFlagsReg cr)
 // Xor Register with Register
 instruct xorI_rReg(rRegI dst, rRegI src, rFlagsReg cr)
 %{
+  predicate(!UseAPX);
   match(Set dst (XorI dst src));
   effect(KILL cr);
   flag(PD::Flag_sets_sign_flag, PD::Flag_sets_zero_flag, PD::Flag_sets_parity_flag, PD::Flag_clears_overflow_flag, PD::Flag_clears_carry_flag);
@@ -9206,20 +10516,50 @@ instruct xorI_rReg(rRegI dst, rRegI src, rFlagsReg cr)
   ins_pipe(ialu_reg_reg);
 %}
 
+// Xor Register with Register using New Data Destination (NDD)
+instruct xorI_rReg_ndd(rRegI dst, rRegI src1, rRegI src2, rFlagsReg cr)
+%{
+  predicate(UseAPX);
+  match(Set dst (XorI src1 src2));
+  effect(KILL cr);
+  flag(PD::Flag_sets_sign_flag, PD::Flag_sets_zero_flag, PD::Flag_sets_parity_flag, PD::Flag_clears_overflow_flag, PD::Flag_clears_carry_flag);
+
+  format %{ "exorl    $dst, $src1, $src2\t# int ndd" %}
+  ins_encode %{
+    __ exorl($dst$$Register, $src1$$Register, $src2$$Register, false);
+  %}
+  ins_pipe(ialu_reg_reg);
+%}
+
 // Xor Register with Immediate -1
-instruct xorI_rReg_im1(rRegI dst, immI_M1 imm) %{
+instruct xorI_rReg_im1(rRegI dst, immI_M1 imm)
+%{
+  predicate(!UseAPX);
   match(Set dst (XorI dst imm));
 
-  format %{ "not    $dst" %}
+  format %{ "notl    $dst" %}
   ins_encode %{
      __ notl($dst$$Register);
   %}
   ins_pipe(ialu_reg);
 %}
 
+instruct xorI_rReg_im1_ndd(rRegI dst, rRegI src, immI_M1 imm)
+%{
+  match(Set dst (XorI src imm));
+  predicate(UseAPX);
+
+  format %{ "enotl    $dst, $src" %}
+  ins_encode %{
+     __ enotl($dst$$Register, $src$$Register);
+  %}
+  ins_pipe(ialu_reg);
+%}
+
 // Xor Register with Immediate
 instruct xorI_rReg_imm(rRegI dst, immI src, rFlagsReg cr)
 %{
+  predicate(!UseAPX);
   match(Set dst (XorI dst src));
   effect(KILL cr);
   flag(PD::Flag_sets_sign_flag, PD::Flag_sets_zero_flag, PD::Flag_sets_parity_flag, PD::Flag_clears_overflow_flag, PD::Flag_clears_carry_flag);
@@ -9231,9 +10571,39 @@ instruct xorI_rReg_imm(rRegI dst, immI src, rFlagsReg cr)
   ins_pipe(ialu_reg);
 %}
 
+instruct xorI_rReg_rReg_imm_ndd(rRegI dst, rRegI src1, immI src2, rFlagsReg cr)
+%{
+  predicate(UseAPX);
+  match(Set dst (XorI src1 src2));
+  effect(KILL cr);
+  flag(PD::Flag_sets_sign_flag, PD::Flag_sets_zero_flag, PD::Flag_sets_parity_flag, PD::Flag_clears_overflow_flag, PD::Flag_clears_carry_flag);
+
+  format %{ "exorl    $dst, $src1, $src2\t# int ndd" %}
+  ins_encode %{
+    __ exorl($dst$$Register, $src1$$Register, $src2$$constant, false);
+  %}
+  ins_pipe(ialu_reg);
+%}
+
+// Xor Memory with Immediate
+instruct xorI_rReg_mem_imm_ndd(rRegI dst, memory src1, immI src2, rFlagsReg cr)
+%{
+  predicate(UseAPX);
+  match(Set dst (XorI (LoadI src1) src2));
+  effect(KILL cr);
+  flag(PD::Flag_sets_sign_flag, PD::Flag_sets_zero_flag, PD::Flag_sets_parity_flag, PD::Flag_clears_overflow_flag, PD::Flag_clears_carry_flag);
+
+  format %{ "exorl    $dst, $src1, $src2\t# int ndd" %}
+  ins_encode %{
+    __ exorl($dst$$Register, $src1$$Address, $src2$$constant, false);
+  %}
+  ins_pipe(ialu_reg);
+%}
+
 // Xor Register with Memory
 instruct xorI_rReg_mem(rRegI dst, memory src, rFlagsReg cr)
 %{
+  predicate(!UseAPX);
   match(Set dst (XorI dst (LoadI src)));
   effect(KILL cr);
   flag(PD::Flag_sets_sign_flag, PD::Flag_sets_zero_flag, PD::Flag_sets_parity_flag, PD::Flag_clears_overflow_flag, PD::Flag_clears_carry_flag);
@@ -9246,6 +10616,36 @@ instruct xorI_rReg_mem(rRegI dst, memory src, rFlagsReg cr)
   ins_pipe(ialu_reg_mem);
 %}
 
+instruct xorI_rReg_rReg_mem_ndd(rRegI dst, rRegI src1, memory src2, rFlagsReg cr)
+%{
+  predicate(UseAPX);
+  match(Set dst (XorI src1 (LoadI src2)));
+  effect(KILL cr);
+  flag(PD::Flag_sets_sign_flag, PD::Flag_sets_zero_flag, PD::Flag_sets_parity_flag, PD::Flag_clears_overflow_flag, PD::Flag_clears_carry_flag);
+
+  ins_cost(150);
+  format %{ "exorl    $dst, $src1, $src2\t# int ndd" %}
+  ins_encode %{
+    __ exorl($dst$$Register, $src1$$Register, $src2$$Address, false);
+  %}
+  ins_pipe(ialu_reg_mem);
+%}
+
+instruct xorI_rReg_mem_rReg_ndd(rRegI dst, memory src1, rRegI src2, rFlagsReg cr)
+%{
+  predicate(UseAPX);
+  match(Set dst (XorI (LoadI src1) src2));
+  effect(KILL cr);
+  flag(PD::Flag_sets_sign_flag, PD::Flag_sets_zero_flag, PD::Flag_sets_parity_flag, PD::Flag_clears_overflow_flag, PD::Flag_clears_carry_flag);
+
+  ins_cost(150);
+  format %{ "exorl    $dst, $src1, $src2\t# int ndd" %}
+  ins_encode %{
+    __ exorl($dst$$Register, $src1$$Address, $src2$$Register, false);
+  %}
+  ins_pipe(ialu_reg_mem);
+%}
+
 // Xor Memory with Register
 instruct xorB_mem_rReg(memory dst, rRegI src, rFlagsReg cr)
 %{
@@ -9297,6 +10697,7 @@ instruct xorI_mem_imm(memory dst, immI src, rFlagsReg cr)
 // And Register with Register
 instruct andL_rReg(rRegL dst, rRegL src, rFlagsReg cr)
 %{
+  predicate(!UseAPX);
   match(Set dst (AndL dst src));
   effect(KILL cr);
   flag(PD::Flag_sets_sign_flag, PD::Flag_sets_zero_flag, PD::Flag_sets_parity_flag, PD::Flag_clears_overflow_flag, PD::Flag_clears_carry_flag);
@@ -9308,6 +10709,22 @@ instruct andL_rReg(rRegL dst, rRegL src, rFlagsReg cr)
   ins_pipe(ialu_reg_reg);
 %}
 
+// And Register with Register using New Data Destination (NDD)
+instruct andL_rReg_ndd(rRegL dst, rRegL src1, rRegL src2, rFlagsReg cr)
+%{
+  predicate(UseAPX);
+  match(Set dst (AndL src1 src2));
+  effect(KILL cr);
+  flag(PD::Flag_sets_sign_flag, PD::Flag_sets_zero_flag, PD::Flag_sets_parity_flag, PD::Flag_clears_overflow_flag, PD::Flag_clears_carry_flag);
+
+  format %{ "eandq     $dst, $src1, $src2\t# long ndd" %}
+  ins_encode %{
+    __ eandq($dst$$Register, $src1$$Register, $src2$$Register, false);
+
+  %}
+  ins_pipe(ialu_reg_reg);
+%}
+
 // And Register with Immediate 255
 instruct andL_rReg_imm255(rRegL dst, rRegL src, immL_255 mask)
 %{
@@ -9337,6 +10754,7 @@ instruct andL_rReg_imm65535(rRegL dst, rRegL src, immL_65535 mask)
 // And Register with Immediate
 instruct andL_rReg_imm(rRegL dst, immL32 src, rFlagsReg cr)
 %{
+  predicate(!UseAPX);
   match(Set dst (AndL dst src));
   effect(KILL cr);
   flag(PD::Flag_sets_sign_flag, PD::Flag_sets_zero_flag, PD::Flag_sets_parity_flag, PD::Flag_clears_overflow_flag, PD::Flag_clears_carry_flag);
@@ -9348,9 +10766,38 @@ instruct andL_rReg_imm(rRegL dst, immL32 src, rFlagsReg cr)
   ins_pipe(ialu_reg);
 %}
 
+instruct andL_rReg_rReg_imm_ndd(rRegL dst, rRegL src1, immL32 src2, rFlagsReg cr)
+%{
+  predicate(UseAPX);
+  match(Set dst (AndL src1 src2));
+  effect(KILL cr);
+  flag(PD::Flag_sets_sign_flag, PD::Flag_sets_zero_flag, PD::Flag_sets_parity_flag, PD::Flag_clears_overflow_flag, PD::Flag_clears_carry_flag);
+
+  format %{ "eandq    $dst, $src1, $src2\t# long ndd" %}
+  ins_encode %{
+    __ eandq($dst$$Register, $src1$$Register, $src2$$constant, false);
+  %}
+  ins_pipe(ialu_reg);
+%}
+
+instruct andL_rReg_mem_imm_ndd(rRegL dst, memory src1, immL32 src2, rFlagsReg cr)
+%{
+  predicate(UseAPX);
+  match(Set dst (AndL (LoadL src1) src2));
+  effect(KILL cr);
+  flag(PD::Flag_sets_sign_flag, PD::Flag_sets_zero_flag, PD::Flag_sets_parity_flag, PD::Flag_clears_overflow_flag, PD::Flag_clears_carry_flag);
+
+  format %{ "eandq    $dst, $src1, $src2\t# long ndd" %}
+  ins_encode %{
+    __ eandq($dst$$Register, $src1$$Address, $src2$$constant, false);
+  %}
+  ins_pipe(ialu_reg);
+%}
+
 // And Register with Memory
 instruct andL_rReg_mem(rRegL dst, memory src, rFlagsReg cr)
 %{
+  predicate(!UseAPX);
   match(Set dst (AndL dst (LoadL src)));
   effect(KILL cr);
   flag(PD::Flag_sets_sign_flag, PD::Flag_sets_zero_flag, PD::Flag_sets_parity_flag, PD::Flag_clears_overflow_flag, PD::Flag_clears_carry_flag);
@@ -9363,6 +10810,36 @@ instruct andL_rReg_mem(rRegL dst, memory src, rFlagsReg cr)
   ins_pipe(ialu_reg_mem);
 %}
 
+instruct andL_rReg_rReg_mem_ndd(rRegL dst, rRegL src1, memory src2, rFlagsReg cr)
+%{
+  predicate(UseAPX);
+  match(Set dst (AndL src1 (LoadL src2)));
+  effect(KILL cr);
+  flag(PD::Flag_sets_sign_flag, PD::Flag_sets_zero_flag, PD::Flag_sets_parity_flag, PD::Flag_clears_overflow_flag, PD::Flag_clears_carry_flag);
+
+  ins_cost(150);
+  format %{ "eandq    $dst, $src1, $src2\t# long ndd" %}
+  ins_encode %{
+    __ eandq($dst$$Register, $src1$$Register, $src2$$Address, false);
+  %}
+  ins_pipe(ialu_reg_mem);
+%}
+
+instruct andL_rReg_mem_rReg_ndd(rRegL dst, memory src1, rRegL src2, rFlagsReg cr)
+%{
+  predicate(UseAPX);
+  match(Set dst (AndL (LoadL src1) src2));
+  effect(KILL cr);
+  flag(PD::Flag_sets_sign_flag, PD::Flag_sets_zero_flag, PD::Flag_sets_parity_flag, PD::Flag_clears_overflow_flag, PD::Flag_clears_carry_flag);
+
+  ins_cost(150);
+  format %{ "eandq    $dst, $src1, $src2\t# long ndd" %}
+  ins_encode %{
+    __ eandq($dst$$Register, $src1$$Address, $src2$$Register, false);
+  %}
+  ins_pipe(ialu_reg_mem);
+%}
+
 // And Memory with Register
 instruct andL_mem_rReg(memory dst, rRegL src, rFlagsReg cr)
 %{
@@ -9538,6 +11015,7 @@ instruct blsrL_rReg_mem(rRegL dst, memory src, immL_M1 minus_1, rFlagsReg cr)
 // Or Register with Register
 instruct orL_rReg(rRegL dst, rRegL src, rFlagsReg cr)
 %{
+  predicate(!UseAPX);
   match(Set dst (OrL dst src));
   effect(KILL cr);
   flag(PD::Flag_sets_sign_flag, PD::Flag_sets_zero_flag, PD::Flag_sets_parity_flag, PD::Flag_clears_overflow_flag, PD::Flag_clears_carry_flag);
@@ -9549,6 +11027,22 @@ instruct orL_rReg(rRegL dst, rRegL src, rFlagsReg cr)
   ins_pipe(ialu_reg_reg);
 %}
 
+// Or Register with Register using New Data Destination (NDD)
+instruct orL_rReg_ndd(rRegL dst, rRegL src1, rRegL src2, rFlagsReg cr)
+%{
+  predicate(UseAPX);
+  match(Set dst (OrL src1 src2));
+  effect(KILL cr);
+  flag(PD::Flag_sets_sign_flag, PD::Flag_sets_zero_flag, PD::Flag_sets_parity_flag, PD::Flag_clears_overflow_flag, PD::Flag_clears_carry_flag);
+
+  format %{ "eorq     $dst, $src1, $src2\t# long ndd" %}
+  ins_encode %{
+    __ eorq($dst$$Register, $src1$$Register, $src2$$Register, false);
+
+  %}
+  ins_pipe(ialu_reg_reg);
+%}
+
 // Use any_RegP to match R15 (TLS register) without spilling.
 instruct orL_rReg_castP2X(rRegL dst, any_RegP src, rFlagsReg cr) %{
   match(Set dst (OrL dst (CastP2X src)));
@@ -9562,10 +11056,22 @@ instruct orL_rReg_castP2X(rRegL dst, any_RegP src, rFlagsReg cr) %{
   ins_pipe(ialu_reg_reg);
 %}
 
+instruct orL_rReg_castP2X_ndd(rRegL dst, any_RegP src1, any_RegP src2, rFlagsReg cr) %{
+  match(Set dst (OrL src1 (CastP2X src2)));
+  effect(KILL cr);
+  flag(PD::Flag_sets_sign_flag, PD::Flag_sets_zero_flag, PD::Flag_sets_parity_flag, PD::Flag_clears_overflow_flag, PD::Flag_clears_carry_flag);
+
+  format %{ "eorq     $dst, $src1, $src2\t# long ndd" %}
+  ins_encode %{
+    __ eorq($dst$$Register, $src1$$Register, $src2$$Register, false);
+  %}
+  ins_pipe(ialu_reg_reg);
+%}
 
 // Or Register with Immediate
 instruct orL_rReg_imm(rRegL dst, immL32 src, rFlagsReg cr)
 %{
+  predicate(!UseAPX);
   match(Set dst (OrL dst src));
   effect(KILL cr);
   flag(PD::Flag_sets_sign_flag, PD::Flag_sets_zero_flag, PD::Flag_sets_parity_flag, PD::Flag_clears_overflow_flag, PD::Flag_clears_carry_flag);
@@ -9577,9 +11083,53 @@ instruct orL_rReg_imm(rRegL dst, immL32 src, rFlagsReg cr)
   ins_pipe(ialu_reg);
 %}
 
+instruct orL_rReg_rReg_imm_ndd(rRegL dst, rRegL src1, immL32 src2, rFlagsReg cr)
+%{
+  predicate(UseAPX);
+  match(Set dst (OrL src1 src2));
+  effect(KILL cr);
+  flag(PD::Flag_sets_sign_flag, PD::Flag_sets_zero_flag, PD::Flag_sets_parity_flag, PD::Flag_clears_overflow_flag, PD::Flag_clears_carry_flag);
+
+  format %{ "eorq     $dst, $src1, $src2\t# long ndd" %}
+  ins_encode %{
+    __ eorq($dst$$Register, $src1$$Register, $src2$$constant, false);
+  %}
+  ins_pipe(ialu_reg);
+%}
+
+instruct orL_rReg_imm_rReg_ndd(rRegL dst, immL32 src1, rRegL src2, rFlagsReg cr)
+%{
+  predicate(UseAPX);
+  match(Set dst (OrL src1 src2));
+  effect(KILL cr);
+  flag(PD::Flag_sets_sign_flag, PD::Flag_sets_zero_flag, PD::Flag_sets_parity_flag, PD::Flag_clears_overflow_flag, PD::Flag_clears_carry_flag);
+
+  format %{ "eorq     $dst, $src2, $src1\t# long ndd" %}
+  ins_encode %{
+    __ eorq($dst$$Register, $src2$$Register, $src1$$constant, false);
+  %}
+  ins_pipe(ialu_reg);
+%}
+
+// Or Memory with Immediate
+instruct orL_rReg_mem_imm_ndd(rRegL dst, memory src1, immL32 src2, rFlagsReg cr)
+%{
+  predicate(UseAPX);
+  match(Set dst (OrL (LoadL src1) src2));
+  effect(KILL cr);
+  flag(PD::Flag_sets_sign_flag, PD::Flag_sets_zero_flag, PD::Flag_sets_parity_flag, PD::Flag_clears_overflow_flag, PD::Flag_clears_carry_flag);
+
+  format %{ "eorq     $dst, $src1, $src2\t# long ndd" %}
+  ins_encode %{
+    __ eorq($dst$$Register, $src1$$Address, $src2$$constant, false);
+  %}
+  ins_pipe(ialu_reg);
+%}
+
 // Or Register with Memory
 instruct orL_rReg_mem(rRegL dst, memory src, rFlagsReg cr)
 %{
+  predicate(!UseAPX);
   match(Set dst (OrL dst (LoadL src)));
   effect(KILL cr);
   flag(PD::Flag_sets_sign_flag, PD::Flag_sets_zero_flag, PD::Flag_sets_parity_flag, PD::Flag_clears_overflow_flag, PD::Flag_clears_carry_flag);
@@ -9592,6 +11142,21 @@ instruct orL_rReg_mem(rRegL dst, memory src, rFlagsReg cr)
   ins_pipe(ialu_reg_mem);
 %}
 
+instruct orL_rReg_rReg_mem_ndd(rRegL dst, rRegL src1, memory src2, rFlagsReg cr)
+%{
+  predicate(UseAPX);
+  match(Set dst (OrL src1 (LoadL src2)));
+  effect(KILL cr);
+  flag(PD::Flag_sets_sign_flag, PD::Flag_sets_zero_flag, PD::Flag_sets_parity_flag, PD::Flag_clears_overflow_flag, PD::Flag_clears_carry_flag);
+
+  ins_cost(150);
+  format %{ "eorq     $dst, $src1, $src2\t# long ndd" %}
+  ins_encode %{
+    __ eorq($dst$$Register, $src1$$Register, $src2$$Address, false);
+  %}
+  ins_pipe(ialu_reg_mem);
+%}
+
 // Or Memory with Register
 instruct orL_mem_rReg(memory dst, rRegL src, rFlagsReg cr)
 %{
@@ -9643,6 +11208,7 @@ instruct btsL_mem_imm(memory dst, immL_Pow2 con, rFlagsReg cr)
 // Xor Register with Register
 instruct xorL_rReg(rRegL dst, rRegL src, rFlagsReg cr)
 %{
+  predicate(!UseAPX);
   match(Set dst (XorL dst src));
   effect(KILL cr);
   flag(PD::Flag_sets_sign_flag, PD::Flag_sets_zero_flag, PD::Flag_sets_parity_flag, PD::Flag_clears_overflow_flag, PD::Flag_clears_carry_flag);
@@ -9654,8 +11220,25 @@ instruct xorL_rReg(rRegL dst, rRegL src, rFlagsReg cr)
   ins_pipe(ialu_reg_reg);
 %}
 
+// Xor Register with Register using New Data Destination (NDD)
+instruct xorL_rReg_ndd(rRegL dst, rRegL src1, rRegL src2, rFlagsReg cr)
+%{
+  predicate(UseAPX);
+  match(Set dst (XorL src1 src2));
+  effect(KILL cr);
+  flag(PD::Flag_sets_sign_flag, PD::Flag_sets_zero_flag, PD::Flag_sets_parity_flag, PD::Flag_clears_overflow_flag, PD::Flag_clears_carry_flag);
+
+  format %{ "exorq    $dst, $src1, $src2\t# long ndd" %}
+  ins_encode %{
+    __ exorq($dst$$Register, $src1$$Register, $src2$$Register, false);
+  %}
+  ins_pipe(ialu_reg_reg);
+%}
+
 // Xor Register with Immediate -1
-instruct xorL_rReg_im1(rRegL dst, immL_M1 imm) %{
+instruct xorL_rReg_im1(rRegL dst, immL_M1 imm)
+%{
+  predicate(!UseAPX);
   match(Set dst (XorL dst imm));
 
   format %{ "notq   $dst" %}
@@ -9665,9 +11248,22 @@ instruct xorL_rReg_im1(rRegL dst, immL_M1 imm) %{
   ins_pipe(ialu_reg);
 %}
 
+instruct xorL_rReg_im1_ndd(rRegL dst,rRegL src, immL_M1 imm)
+%{
+  predicate(UseAPX);
+  match(Set dst (XorL src imm));
+
+  format %{ "enotq   $dst, $src" %}
+  ins_encode %{
+    __ enotq($dst$$Register, $src$$Register);
+  %}
+  ins_pipe(ialu_reg);
+%}
+
 // Xor Register with Immediate
 instruct xorL_rReg_imm(rRegL dst, immL32 src, rFlagsReg cr)
 %{
+  predicate(!UseAPX);
   match(Set dst (XorL dst src));
   effect(KILL cr);
   flag(PD::Flag_sets_sign_flag, PD::Flag_sets_zero_flag, PD::Flag_sets_parity_flag, PD::Flag_clears_overflow_flag, PD::Flag_clears_carry_flag);
@@ -9679,9 +11275,39 @@ instruct xorL_rReg_imm(rRegL dst, immL32 src, rFlagsReg cr)
   ins_pipe(ialu_reg);
 %}
 
+instruct xorL_rReg_rReg_imm(rRegL dst, rRegL src1, immL32 src2, rFlagsReg cr)
+%{
+  predicate(UseAPX);
+  match(Set dst (XorL src1 src2));
+  effect(KILL cr);
+  flag(PD::Flag_sets_sign_flag, PD::Flag_sets_zero_flag, PD::Flag_sets_parity_flag, PD::Flag_clears_overflow_flag, PD::Flag_clears_carry_flag);
+
+  format %{ "exorq    $dst, $src1, $src2\t# long ndd" %}
+  ins_encode %{
+    __ exorq($dst$$Register, $src1$$Register, $src2$$constant, false);
+  %}
+  ins_pipe(ialu_reg);
+%}
+
+// Xor Memory with Immediate
+instruct xorL_rReg_mem_imm(rRegL dst, memory src1, immL32 src2, rFlagsReg cr)
+%{
+  predicate(UseAPX);
+  match(Set dst (XorL (LoadL src1) src2));
+  effect(KILL cr);
+  flag(PD::Flag_sets_sign_flag, PD::Flag_sets_zero_flag, PD::Flag_sets_parity_flag, PD::Flag_clears_overflow_flag, PD::Flag_clears_carry_flag);
+
+  format %{ "exorq    $dst, $src1, $src2\t# long ndd" %}
+  ins_encode %{
+    __ exorq($dst$$Register, $src1$$Address, $src2$$constant, false);
+  %}
+  ins_pipe(ialu_reg);
+%}
+
 // Xor Register with Memory
 instruct xorL_rReg_mem(rRegL dst, memory src, rFlagsReg cr)
 %{
+  predicate(!UseAPX);
   match(Set dst (XorL dst (LoadL src)));
   effect(KILL cr);
   flag(PD::Flag_sets_sign_flag, PD::Flag_sets_zero_flag, PD::Flag_sets_parity_flag, PD::Flag_clears_overflow_flag, PD::Flag_clears_carry_flag);
@@ -9694,6 +11320,36 @@ instruct xorL_rReg_mem(rRegL dst, memory src, rFlagsReg cr)
   ins_pipe(ialu_reg_mem);
 %}
 
+instruct xorL_rReg_rReg_mem_ndd(rRegL dst, rRegL src1, memory src2, rFlagsReg cr)
+%{
+  predicate(UseAPX);
+  match(Set dst (XorL src1 (LoadL src2)));
+  effect(KILL cr);
+  flag(PD::Flag_sets_sign_flag, PD::Flag_sets_zero_flag, PD::Flag_sets_parity_flag, PD::Flag_clears_overflow_flag, PD::Flag_clears_carry_flag);
+
+  ins_cost(150);
+  format %{ "exorq    $dst, $src1, $src2\t# long ndd" %}
+  ins_encode %{
+    __ exorq($dst$$Register, $src1$$Register, $src2$$Address, false);
+  %}
+  ins_pipe(ialu_reg_mem);
+%}
+
+instruct xorL_rReg_mem_rReg_ndd(rRegL dst, memory src1, rRegL src2, rFlagsReg cr)
+%{
+  predicate(UseAPX);
+  match(Set dst (XorL (LoadL src1) src2));
+  effect(KILL cr);
+  flag(PD::Flag_sets_sign_flag, PD::Flag_sets_zero_flag, PD::Flag_sets_parity_flag, PD::Flag_clears_overflow_flag, PD::Flag_clears_carry_flag);
+
+  ins_cost(150);
+  format %{ "exorq    $dst, $src1, $src2\t# long ndd" %}
+  ins_encode %{
+    __ exorq($dst$$Register, $src1$$Address, $src1$$Register, false);
+  %}
+  ins_pipe(ialu_reg_mem);
+%}
+
 // Xor Memory with Register
 instruct xorL_mem_rReg(memory dst, rRegL src, rFlagsReg cr)
 %{
@@ -12007,6 +13663,7 @@ instruct testB_mem_imm(rFlagsReg cr, memory mem, immI8 imm, immI_0 zero)
 
 instruct cmovI_reg_g(rRegI dst, rRegI src, rFlagsReg cr)
 %{
+  predicate(!UseAPX);
   effect(USE_DEF dst, USE src, USE cr);
 
   format %{ "cmovlgt $dst, $src\t# min" %}
@@ -12016,9 +13673,21 @@ instruct cmovI_reg_g(rRegI dst, rRegI src, rFlagsReg cr)
   ins_pipe(pipe_cmov_reg);
 %}
 
+instruct cmovI_reg_g_ndd(rRegI dst, rRegI src1, rRegI src2, rFlagsReg cr)
+%{
+  predicate(UseAPX);
+  effect(DEF dst, USE src1, USE src2, USE cr);
+
+  format %{ "ecmovlgt $dst, $src1, $src2\t# min ndd" %}
+  ins_encode %{
+    __ ecmovl(Assembler::greater, $dst$$Register, $src1$$Register, $src2$$Register);
+  %}
+  ins_pipe(pipe_cmov_reg);
+%}
 
 instruct minI_rReg(rRegI dst, rRegI src)
 %{
+  predicate(!UseAPX);
   match(Set dst (MinI dst src));
 
   ins_cost(200);
@@ -12029,8 +13698,23 @@ instruct minI_rReg(rRegI dst, rRegI src)
   %}
 %}
 
+instruct minI_rReg_ndd(rRegI dst, rRegI src1, rRegI src2)
+%{
+  predicate(UseAPX);
+  match(Set dst (MinI src1 src2));
+  effect(DEF dst, USE src1, USE src2);
+
+  ins_cost(200);
+  expand %{
+    rFlagsReg cr;
+    compI_rReg(cr, src1, src2);
+    cmovI_reg_g_ndd(dst, src1, src2, cr);
+  %}
+%}
+
 instruct cmovI_reg_l(rRegI dst, rRegI src, rFlagsReg cr)
 %{
+  predicate(!UseAPX);
   effect(USE_DEF dst, USE src, USE cr);
 
   format %{ "cmovllt $dst, $src\t# max" %}
@@ -12040,9 +13724,21 @@ instruct cmovI_reg_l(rRegI dst, rRegI src, rFlagsReg cr)
   ins_pipe(pipe_cmov_reg);
 %}
 
+instruct cmovI_reg_l_ndd(rRegI dst, rRegI src1, rRegI src2, rFlagsReg cr)
+%{
+  predicate(UseAPX);
+  effect(DEF dst, USE src1, USE src2, USE cr);
+
+  format %{ "ecmovllt $dst, $src1, $src2\t# max ndd" %}
+  ins_encode %{
+    __ ecmovl(Assembler::less, $dst$$Register, $src1$$Register, $src2$$Register);
+  %}
+  ins_pipe(pipe_cmov_reg);
+%}
 
 instruct maxI_rReg(rRegI dst, rRegI src)
 %{
+  predicate(!UseAPX);
   match(Set dst (MaxI dst src));
 
   ins_cost(200);
@@ -12053,6 +13749,20 @@ instruct maxI_rReg(rRegI dst, rRegI src)
   %}
 %}
 
+instruct maxI_rReg_ndd(rRegI dst, rRegI src1, rRegI src2)
+%{
+  predicate(UseAPX);
+  match(Set dst (MaxI src1 src2));
+  effect(DEF dst, USE src1, USE src2);
+
+  ins_cost(200);
+  expand %{
+    rFlagsReg cr;
+    compI_rReg(cr, src1, src2);
+    cmovI_reg_l_ndd(dst, src1, src2, cr);
+  %}
+%}
+
 // ============================================================================
 // Branch Instructions
 
diff --git a/test/hotspot/gtest/x86/asmtest.out.h b/test/hotspot/gtest/x86/asmtest.out.h
index f43a9527e0f..ac4a8a21aeb 100644
--- a/test/hotspot/gtest/x86/asmtest.out.h
+++ b/test/hotspot/gtest/x86/asmtest.out.h
@@ -266,414 +266,472 @@
     __ 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
+    __ eaddl(rax, r11, 65536, false);                                           //    {EVEX}add eax, r11d, 65536    IID255
+    __ eaddl(r24, r16, 268435456, true);                                        //    {NF}add r24d, r16d, 268435456    IID256
+    __ eaddl(rax, r18, 268435456, true);                                        //    {NF}add eax, r18d, 268435456    IID257
+    __ eandl(r29, r13, 1, false);                                               //    {EVEX}and r29d, r13d, 1    IID258
+    __ eandl(rax, r13, 1, false);                                               //    {EVEX}and eax, r13d, 1    IID259
+    __ eandl(r31, r22, 1, true);                                                //    {NF}and r31d, r22d, 1    IID260
+    __ eandl(rax, r29, 1, true);                                                //    {NF}and eax, r29d, 1    IID261
+    __ eimull(r23, r29, 65536, false);                                          //    {EVEX}imul r23d, r29d, 65536    IID262
+    __ eimull(rax, r15, 65536, false);                                          //    {EVEX}imul eax, r15d, 65536    IID263
+    __ eimull(r21, r9, 268435456, true);                                        //    {NF}imul r21d, r9d, 268435456    IID264
+    __ eimull(rax, r15, 268435456, true);                                       //    {NF}imul eax, r15d, 268435456    IID265
+    __ eorl(rdx, r18, 65536, false);                                            //    {EVEX}or edx, r18d, 65536    IID266
+    __ eorl(rax, r15, 65536, false);                                            //    {EVEX}or eax, r15d, 65536    IID267
+    __ eorl(r8, r9, 256, true);                                                 //    {NF}or r8d, r9d, 256    IID268
+    __ eorl(rax, r27, 256, true);                                               //    {NF}or eax, r27d, 256    IID269
+    __ ercll(r9, r15, 8);                                                       //    {EVEX}rcl r9d, r15d, 8    IID270
+    __ ercll(rax, r18, 8);                                                      //    {EVEX}rcl eax, r18d, 8    IID271
+    __ eroll(r12, rbx, 16, false);                                              //    {EVEX}rol r12d, ebx, 16    IID272
+    __ eroll(rax, r19, 16, false);                                              //    {EVEX}rol eax, r19d, 16    IID273
+    __ eroll(r10, r11, 16, true);                                               //    {NF}rol r10d, r11d, 16    IID274
+    __ eroll(rax, r18, 16, true);                                               //    {NF}rol eax, r18d, 16    IID275
+    __ erorl(rdx, r14, 1, false);                                               //    {EVEX}ror edx, r14d, 1    IID276
+    __ erorl(rax, r22, 1, false);                                               //    {EVEX}ror eax, r22d, 1    IID277
+    __ erorl(r25, r31, 16, true);                                               //    {NF}ror r25d, r31d, 16    IID278
+    __ erorl(rax, r19, 16, true);                                               //    {NF}ror eax, r19d, 16    IID279
+    __ esall(r9, r15, 2, false);                                                //    {EVEX}sal r9d, r15d, 2    IID280
+    __ esall(rax, r13, 2, false);                                               //    {EVEX}sal eax, r13d, 2    IID281
+    __ esall(r21, r16, 1, true);                                                //    {NF}sal r21d, r16d, 1    IID282
+    __ esall(rax, r21, 1, true);                                                //    {NF}sal eax, r21d, 1    IID283
+    __ esarl(r26, r23, 8, false);                                               //    {EVEX}sar r26d, r23d, 8    IID284
+    __ esarl(rax, r28, 8, false);                                               //    {EVEX}sar eax, r28d, 8    IID285
+    __ esarl(r26, r14, 4, true);                                                //    {NF}sar r26d, r14d, 4    IID286
+    __ esarl(rax, r10, 4, true);                                                //    {NF}sar eax, r10d, 4    IID287
+    __ eshll(r22, r9, 1, false);                                                //    {EVEX}shl r22d, r9d, 1    IID288
+    __ eshll(rax, r18, 1, false);                                               //    {EVEX}shl eax, r18d, 1    IID289
+    __ eshll(r30, r24, 16, true);                                               //    {NF}shl r30d, r24d, 16    IID290
+    __ eshll(rax, r23, 16, true);                                               //    {NF}shl eax, r23d, 16    IID291
+    __ eshrl(r11, r8, 16, false);                                               //    {EVEX}shr r11d, r8d, 16    IID292
+    __ eshrl(rax, r16, 16, false);                                              //    {EVEX}shr eax, r16d, 16    IID293
+    __ eshrl(r11, r12, 8, true);                                                //    {NF}shr r11d, r12d, 8    IID294
+    __ eshrl(rax, r29, 8, true);                                                //    {NF}shr eax, r29d, 8    IID295
+    __ esubl(r16, r21, 1048576, false);                                         //    {EVEX}sub r16d, r21d, 1048576    IID296
+    __ esubl(rax, r15, 1048576, false);                                         //    {EVEX}sub eax, r15d, 1048576    IID297
+    __ esubl(r9, r18, 16777216, true);                                          //    {NF}sub r9d, r18d, 16777216    IID298
+#endif // _LP64
+    __ esubl(rax, rbx, 16777216, true);                                         //    {NF}sub eax, ebx, 16777216    IID299
+#ifdef _LP64
+    __ exorl(r19, r23, 65536, false);                                           //    {EVEX}xor r19d, r23d, 65536    IID300
+    __ exorl(rax, r17, 65536, false);                                           //    {EVEX}xor eax, r17d, 65536    IID301
+    __ exorl(r29, r18, 1048576, true);                                          //    {NF}xor r29d, r18d, 1048576    IID302
+    __ exorl(rax, r14, 1048576, true);                                          //    {NF}xor eax, r14d, 1048576    IID303
+    __ esubl_imm32(r19, r15, 16777216, false);                                  //    {EVEX}sub r19d, r15d, 16777216    IID304
+    __ esubl_imm32(rax, r27, 16777216, false);                                  //    {EVEX}sub eax, r27d, 16777216    IID305
+    __ esubl_imm32(r23, r27, 1073741824, true);                                 //    {NF}sub r23d, r27d, 1073741824    IID306
+    __ esubl_imm32(rax, r23, 1073741824, true);                                 //    {NF}sub eax, r23d, 1073741824    IID307
+    __ eaddl(r8, r12, Address(r28, r24, (Address::ScaleFactor)3, -0x6d6d7e68), false); //    {EVEX}add r8d, r12d, dword ptr [r28+r24*8-0x6d6d7e68]    IID308
+    __ eaddl(r24, r13, Address(r24, r25, (Address::ScaleFactor)3, +0x784673fd), true); //    {NF}add r24d, r13d, dword ptr [r24+r25*8+0x784673fd]    IID309
+    __ eandl(r24, r21, Address(r8, r13, (Address::ScaleFactor)2, -0x63663889), false); //    {EVEX}and r24d, r21d, dword ptr [r8+r13*4-0x63663889]    IID310
+    __ eandl(r12, r24, Address(r30, -0x67526556), true);                        //    {NF}and r12d, r24d, dword ptr [r30-0x67526556]    IID311
+    __ eimull(r13, r13, Address(rbx, r25, (Address::ScaleFactor)2, -0x5f394dd9), false); //    {EVEX}imul r13d, r13d, dword ptr [rbx+r25*4-0x5f394dd9]    IID312
+    __ eimull(r26, r25, Address(r25, rdx, (Address::ScaleFactor)3, -0x2e39f79a), true); //    {NF}imul r26d, r25d, dword ptr [r25+rdx*8-0x2e39f79a]    IID313
+    __ eorl(r28, r8, Address(rdx, r24, (Address::ScaleFactor)3, -0xed99a54), false); //    {EVEX}or r28d, r8d, dword ptr [rdx+r24*8-0xed99a54]    IID314
+    __ eorl(r31, r22, Address(r30, r20, (Address::ScaleFactor)3, +0x3ac41cbd), true); //    {NF}or r31d, r22d, dword ptr [r30+r20*8+0x3ac41cbd]    IID315
+    __ esubl(r24, r30, Address(r13, r17, (Address::ScaleFactor)1, +0x1efdc2e3), false); //    {EVEX}sub r24d, r30d, dword ptr [r13+r17*2+0x1efdc2e3]    IID316
+    __ esubl(r16, r16, Address(r9, r15, (Address::ScaleFactor)1, +0x769feb34), true); //    {NF}sub r16d, r16d, dword ptr [r9+r15*2+0x769feb34]    IID317
+    __ exorl(r19, r25, Address(r10, +0x2239b429), false);                       //    {EVEX}xor r19d, r25d, dword ptr [r10+0x2239b429]    IID318
+    __ exorl(r25, r19, Address(r16, r24, (Address::ScaleFactor)1, +0x1c71faea), true); //    {NF}xor r25d, r19d, dword ptr [r16+r24*2+0x1c71faea]    IID319
+    __ exorb(r19, r10, Address(r28, -0x299a0cfd), false);                       //    {EVEX}xor r19b, r10b, byte ptr [r28-0x299a0cfd]    IID320
+    __ exorb(rbx, r28, Address(r23, r24, (Address::ScaleFactor)1, -0x5d78ddd9), true); //    {NF}xor bl, r28b, byte ptr [r23+r24*2-0x5d78ddd9]    IID321
+    __ exorw(r10, r9, Address(r13, r30, (Address::ScaleFactor)2, +0x11151188), false); //    {EVEX}xor r10w, r9w, word ptr [r13+r30*4+0x11151188]    IID322
+    __ exorw(r16, r17, Address(rdx, r31, (Address::ScaleFactor)0, +0x61936ce7), true); //    {NF}xor r16w, r17w, word ptr [rdx+r31*1+0x61936ce7]    IID323
+    __ eaddl(r13, rbx, r28, false);                                             //    {load}{EVEX}add r13d, ebx, r28d    IID324
+    __ eaddl(rbx, r29, r22, true);                                              //    {load}{NF}add ebx, r29d, r22d    IID325
+    __ eandl(rbx, r8, r8, false);                                               //    {load}{EVEX}and ebx, r8d, r8d    IID326
+    __ eandl(r11, r16, r13, true);                                              //    {load}{NF}and r11d, r16d, r13d    IID327
+    __ eimull(r12, r15, r17, false);                                            //    {load}{EVEX}imul r12d, r15d, r17d    IID328
+    __ eimull(r23, r31, r20, true);                                             //    {load}{NF}imul r23d, r31d, r20d    IID329
+    __ eorw(r22, r26, r10, false);                                              //    {load}{EVEX}or r22w, r26w, r10w    IID330
+    __ eorw(r25, r19, r11, true);                                               //    {load}{NF}or r25w, r19w, r11w    IID331
+    __ eorl(r19, r30, r8, false);                                               //    {load}{EVEX}or r19d, r30d, r8d    IID332
+    __ eorl(r12, r10, rdx, true);                                               //    {load}{NF}or r12d, r10d, edx    IID333
+    __ eshldl(r22, r20, r30, false);                                            //    {load}{EVEX}shld r22d, r20d, r30d, cl    IID334
+    __ eshldl(r18, r19, r18, true);                                             //    {load}{NF}shld r18d, r19d, r18d, cl    IID335
+    __ eshrdl(r25, r18, rcx, false);                                            //    {load}{EVEX}shrd r25d, r18d, ecx, cl    IID336
+    __ eshrdl(r19, r16, r25, true);                                             //    {load}{NF}shrd r19d, r16d, r25d, cl    IID337
+    __ esubl(r11, r31, r24, false);                                             //    {load}{EVEX}sub r11d, r31d, r24d    IID338
+    __ esubl(r14, r30, r16, true);                                              //    {load}{NF}sub r14d, r30d, r16d    IID339
+    __ exorl(r9, r11, r26, false);                                              //    {load}{EVEX}xor r9d, r11d, r26d    IID340
+    __ exorl(r27, rdx, r31, true);                                              //    {load}{NF}xor r27d, edx, r31d    IID341
+    __ eshldl(r29, r10, rcx, 16, false);                                        //    {EVEX}shld r29d, r10d, ecx, 16    IID342
+    __ eshldl(r15, r23, r17, 16, true);                                         //    {NF}shld r15d, r23d, r17d, 16    IID343
+    __ eshrdl(r27, r13, r15, 8, false);                                         //    {EVEX}shrd r27d, r13d, r15d, 8    IID344
+    __ eshrdl(r15, r29, r26, 16, true);                                         //    {NF}shrd r15d, r29d, r26d, 16    IID345
+    __ ecmovl (Assembler::Condition::overflow, r18, r9, r9);                    //    cmovo r18d, r9d, r9d    IID346
+    __ ecmovl (Assembler::Condition::noOverflow, r22, r30, r23);                //    cmovno r22d, r30d, r23d    IID347
+    __ ecmovl (Assembler::Condition::below, r11, r20, r11);                     //    cmovb r11d, r20d, r11d    IID348
+    __ ecmovl (Assembler::Condition::aboveEqual, rbx, r28, r16);                //    cmovae ebx, r28d, r16d    IID349
+    __ ecmovl (Assembler::Condition::zero, r20, r17, r24);                      //    cmovz r20d, r17d, r24d    IID350
+    __ ecmovl (Assembler::Condition::notZero, r22, r16, r15);                   //    cmovnz r22d, r16d, r15d    IID351
+    __ ecmovl (Assembler::Condition::belowEqual, r15, r28, r29);                //    cmovbe r15d, r28d, r29d    IID352
+    __ ecmovl (Assembler::Condition::above, r16, r25, r25);                     //    cmova r16d, r25d, r25d    IID353
+    __ ecmovl (Assembler::Condition::negative, r17, r13, r17);                  //    cmovs r17d, r13d, r17d    IID354
+    __ ecmovl (Assembler::Condition::positive, r23, rbx, r30);                  //    cmovns r23d, ebx, r30d    IID355
+    __ ecmovl (Assembler::Condition::parity, r15, r22, r11);                    //    cmovp r15d, r22d, r11d    IID356
+    __ ecmovl (Assembler::Condition::noParity, r27, rdx, r22);                  //    cmovnp r27d, edx, r22d    IID357
+    __ ecmovl (Assembler::Condition::less, r9, r17, r28);                       //    cmovl r9d, r17d, r28d    IID358
+    __ ecmovl (Assembler::Condition::greaterEqual, r24, r11, r26);              //    cmovge r24d, r11d, r26d    IID359
+    __ ecmovl (Assembler::Condition::lessEqual, r12, rcx, rbx);                 //    cmovle r12d, ecx, ebx    IID360
+    __ ecmovl (Assembler::Condition::greater, r28, r22, r22);                   //    cmovg r28d, r22d, r22d    IID361
+    __ ecmovl (Assembler::Condition::overflow, r10, r14, Address(rcx, r17, (Address::ScaleFactor)3, -0x7857b23d)); //    cmovo r10d, r14d, dword ptr [rcx+r17*8-0x7857b23d]    IID362
+    __ ecmovl (Assembler::Condition::noOverflow, r17, r12, Address(r26, r24, (Address::ScaleFactor)3, +0x10642223)); //    cmovno r17d, r12d, dword ptr [r26+r24*8+0x10642223]    IID363
+    __ ecmovl (Assembler::Condition::below, r26, r8, Address(r31, -0xb2d2be4)); //    cmovb r26d, r8d, dword ptr [r31-0xb2d2be4]    IID364
+    __ ecmovl (Assembler::Condition::aboveEqual, r12, r20, Address(r12, r22, (Address::ScaleFactor)2, -0x667ff72b)); //    cmovae r12d, r20d, dword ptr [r12+r22*4-0x667ff72b]    IID365
+    __ ecmovl (Assembler::Condition::zero, r22, r9, Address(r27, r23, (Address::ScaleFactor)2, +0x66ce4d22)); //    cmovz r22d, r9d, dword ptr [r27+r23*4+0x66ce4d22]    IID366
+    __ ecmovl (Assembler::Condition::notZero, r12, r8, Address(r30, r27, (Address::ScaleFactor)3, -0x2b9676e1)); //    cmovnz r12d, r8d, dword ptr [r30+r27*8-0x2b9676e1]    IID367
+    __ ecmovl (Assembler::Condition::belowEqual, r17, r20, Address(r9, r30, (Address::ScaleFactor)3, -0x351022df)); //    cmovbe r17d, r20d, dword ptr [r9+r30*8-0x351022df]    IID368
+    __ ecmovl (Assembler::Condition::above, rdx, r8, Address(r14, +0x3d6b7a59)); //    cmova edx, r8d, dword ptr [r14+0x3d6b7a59]    IID369
+    __ ecmovl (Assembler::Condition::negative, rcx, r31, Address(r11, r14, (Address::ScaleFactor)2, +0x2cd585f2)); //    cmovs ecx, r31d, dword ptr [r11+r14*4+0x2cd585f2]    IID370
+    __ ecmovl (Assembler::Condition::positive, r25, r18, Address(r24, r11, (Address::ScaleFactor)2, -0x3f699c34)); //    cmovns r25d, r18d, dword ptr [r24+r11*4-0x3f699c34]    IID371
+    __ ecmovl (Assembler::Condition::parity, r18, r8, Address(r19, r17, (Address::ScaleFactor)2, -0x390da4c5)); //    cmovp r18d, r8d, dword ptr [r19+r17*4-0x390da4c5]    IID372
+    __ ecmovl (Assembler::Condition::noParity, r11, r29, Address(r29, rdx, (Address::ScaleFactor)2, +0x3a94a93f)); //    cmovnp r11d, r29d, dword ptr [r29+rdx*4+0x3a94a93f]    IID373
+    __ ecmovl (Assembler::Condition::less, r13, r29, Address(r15, r23, (Address::ScaleFactor)1, +0x76d43532)); //    cmovl r13d, r29d, dword ptr [r15+r23*2+0x76d43532]    IID374
+    __ ecmovl (Assembler::Condition::greaterEqual, r15, r12, Address(r13, r9, (Address::ScaleFactor)1, +0x16f7a5b)); //    cmovge r15d, r12d, dword ptr [r13+r9*2+0x16f7a5b]    IID375
+    __ ecmovl (Assembler::Condition::lessEqual, r9, rdx, Address(r17, r23, (Address::ScaleFactor)1, +0x43b6bfe1)); //    cmovle r9d, edx, dword ptr [r17+r23*2+0x43b6bfe1]    IID376
+    __ ecmovl (Assembler::Condition::greater, r28, r20, Address(r24, r10, (Address::ScaleFactor)0, -0x326e802f)); //    cmovg r28d, r20d, dword ptr [r24+r10*1-0x326e802f]    IID377
 #endif // _LP64
 #ifdef _LP64
-    __ 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
+    __ adcq(r27, rcx);                                                          //    {load}adc r27, rcx    IID378
+    __ cmpq(r22, r15);                                                          //    {load}cmp r22, r15    IID379
+    __ imulq(r31, r30);                                                         //    {load}imul r31, r30    IID380
+    __ popcntq(r19, r19);                                                       //    {load}popcnt r19, r19    IID381
+    __ sbbq(r26, r21);                                                          //    {load}sbb r26, r21    IID382
+    __ subq(r14, r26);                                                          //    {load}sub r14, r26    IID383
+    __ tzcntq(r20, r15);                                                        //    {load}tzcnt r20, r15    IID384
+    __ lzcntq(r12, r13);                                                        //    {load}lzcnt r12, r13    IID385
+    __ addq(r23, r28);                                                          //    {load}add r23, r28    IID386
+    __ andq(r20, r20);                                                          //    {load}and r20, r20    IID387
+    __ orq(r24, r11);                                                           //    {load}or r24, r11    IID388
+    __ xorq(r10, r15);                                                          //    {load}xor r10, r15    IID389
+    __ movq(r19, r20);                                                          //    {load}mov r19, r20    IID390
+    __ bsfq(r23, r15);                                                          //    {load}bsf r23, r15    IID391
+    __ bsrq(r26, r19);                                                          //    {load}bsr r26, r19    IID392
+    __ btq(r24, r23);                                                           //    {load}bt r24, r23    IID393
+    __ xchgq(r28, r11);                                                         //    {load}xchg r28, r11    IID394
+    __ testq(r13, r13);                                                         //    {load}test r13, r13    IID395
+    __ addq(Address(r31, r23, (Address::ScaleFactor)3, +0x59da0437), rdx);      //    add qword ptr [r31+r23*8+0x59da0437], rdx    IID396
+    __ andq(Address(r21, r20, (Address::ScaleFactor)3, +0x6fd0d557), r27);      //    and qword ptr [r21+r20*8+0x6fd0d557], r27    IID397
+    __ cmpq(Address(r21, +0x23ef6744), r11);                                    //    cmp qword ptr [r21+0x23ef6744], r11    IID398
+    __ orq(Address(r10, rcx, (Address::ScaleFactor)3, +0x7e8544ab), rcx);       //    or qword ptr [r10+rcx*8+0x7e8544ab], rcx    IID399
+    __ xorq(Address(rcx, r24, (Address::ScaleFactor)3, -0x79ca4889), rbx);      //    xor qword ptr [rcx+r24*8-0x79ca4889], rbx    IID400
+    __ subq(Address(r27, r31, (Address::ScaleFactor)0, +0x11f85f9a), r27);      //    sub qword ptr [r27+r31*1+0x11f85f9a], r27    IID401
+    __ movq(Address(r20, r16, (Address::ScaleFactor)3, +0x72158dda), r17);      //    mov qword ptr [r20+r16*8+0x72158dda], r17    IID402
+    __ xaddq(Address(r29, r9, (Address::ScaleFactor)2, +0x6e8febd1), r12);      //    xadd qword ptr [r29+r9*4+0x6e8febd1], r12    IID403
+    __ andq(Address(r15, -0x47c94ecd), 268435456);                              //    and qword ptr [r15-0x47c94ecd], 268435456    IID404
+    __ addq(Address(r23, r19, (Address::ScaleFactor)1, +0x32bfde3f), 256);      //    add qword ptr [r23+r19*2+0x32bfde3f], 256    IID405
+    __ cmpq(Address(r15, r11, (Address::ScaleFactor)3, +0x548e7560), 4096);     //    cmp qword ptr [r15+r11*8+0x548e7560], 4096    IID406
+    __ sarq(Address(r20, r14, (Address::ScaleFactor)1, +0x1b43fc34), 2);        //    sar qword ptr [r20+r14*2+0x1b43fc34], 2    IID407
+    __ salq(Address(r26, r21, (Address::ScaleFactor)0, -0x3bae50c3), 8);        //    sal qword ptr [r26+r21*1-0x3bae50c3], 8    IID408
+    __ sbbq(Address(r22, r10, (Address::ScaleFactor)3, +0x47e1403), 65536);     //    sbb qword ptr [r22+r10*8+0x47e1403], 65536    IID409
+    __ shrq(Address(rcx, rdx, (Address::ScaleFactor)2, +0x7ea3924d), 16);       //    shr qword ptr [rcx+rdx*4+0x7ea3924d], 16    IID410
+    __ subq(Address(rcx, r26, (Address::ScaleFactor)3, -0x356ea53e), 16);       //    sub qword ptr [rcx+r26*8-0x356ea53e], 16    IID411
+    __ xorq(Address(r30, r26, (Address::ScaleFactor)2, +0x78a12f5c), 16);       //    xor qword ptr [r30+r26*4+0x78a12f5c], 16    IID412
+    __ orq(Address(r11, r10, (Address::ScaleFactor)1, +0x3713b5b5), 268435456); //    or qword ptr [r11+r10*2+0x3713b5b5], 268435456    IID413
+    __ movq(Address(r30, r30, (Address::ScaleFactor)3, +0x2541a10), 65536);     //    mov qword ptr [r30+r30*8+0x2541a10], 65536    IID414
+    __ testq(Address(r16, r15, (Address::ScaleFactor)3, +0x558e3251), -16);     //    test qword ptr [r16+r15*8+0x558e3251], -16    IID415
+    __ addq(r27, Address(r8, r10, (Address::ScaleFactor)2, +0x635f732d));       //    add r27, qword ptr [r8+r10*4+0x635f732d]    IID416
+    __ andq(r21, Address(r12, r31, (Address::ScaleFactor)0, -0x75e8c4a0));      //    and r21, qword ptr [r12+r31*1-0x75e8c4a0]    IID417
+    __ cmpq(r18, Address(r19, r16, (Address::ScaleFactor)2, -0x120ae81e));      //    cmp r18, qword ptr [r19+r16*4-0x120ae81e]    IID418
+    __ lzcntq(rbx, Address(r31, r30, (Address::ScaleFactor)0, +0x1ec3265d));    //    lzcnt rbx, qword ptr [r31+r30*1+0x1ec3265d]    IID419
+    __ orq(r16, Address(rdx, r26, (Address::ScaleFactor)0, +0x3586831b));       //    or r16, qword ptr [rdx+r26*1+0x3586831b]    IID420
+    __ adcq(r12, Address(r18, -0x3c3e9f7a));                                    //    adc r12, qword ptr [r18-0x3c3e9f7a]    IID421
+    __ imulq(rcx, Address(r8, r21, (Address::ScaleFactor)3, +0x6b1515ab));      //    imul rcx, qword ptr [r8+r21*8+0x6b1515ab]    IID422
+    __ popcntq(r29, Address(rcx, r23, (Address::ScaleFactor)2, +0x4ff06c4d));   //    popcnt r29, qword ptr [rcx+r23*4+0x4ff06c4d]    IID423
+    __ sbbq(r26, Address(r24, r10, (Address::ScaleFactor)1, -0x75d9a189));      //    sbb r26, qword ptr [r24+r10*2-0x75d9a189]    IID424
+    __ subq(r17, Address(rbx, rbx, (Address::ScaleFactor)0, +0x4033d59c));      //    sub r17, qword ptr [rbx+rbx*1+0x4033d59c]    IID425
+    __ tzcntq(r18, Address(r22, r12, (Address::ScaleFactor)3, -0x3893347d));    //    tzcnt r18, qword ptr [r22+r12*8-0x3893347d]    IID426
+    __ xorq(r12, Address(r20, r23, (Address::ScaleFactor)3, +0x4b311560));      //    xor r12, qword ptr [r20+r23*8+0x4b311560]    IID427
+    __ movq(r29, Address(r10, r28, (Address::ScaleFactor)2, +0x5c3a2657));      //    mov r29, qword ptr [r10+r28*4+0x5c3a2657]    IID428
+    __ leaq(r22, Address(r13, r25, (Address::ScaleFactor)3, +0x1a3d6f3f));      //    lea r22, qword ptr [r13+r25*8+0x1a3d6f3f]    IID429
+    __ cvttsd2siq(r25, Address(r17, r24, (Address::ScaleFactor)3, -0x35addbd8)); //    cvttsd2si r25, qword ptr [r17+r24*8-0x35addbd8]    IID430
+    __ xchgq(r18, Address(r25, +0x632184c3));                                   //    xchg r18, qword ptr [r25+0x632184c3]    IID431
+    __ testq(r29, Address(r18, r13, (Address::ScaleFactor)1, -0x5039fd8a));     //    test r29, qword ptr [r18+r13*2-0x5039fd8a]    IID432
+    __ addq(r20, 4096);                                                         //    add r20, 4096    IID433
+    __ andq(r9, 16);                                                            //    and r9, 16    IID434
+    __ adcq(rdx, 256);                                                          //    adc rdx, 256    IID435
+    __ cmpq(r22, 16777216);                                                     //    cmp r22, 16777216    IID436
+    __ rclq(r17, 1);                                                            //    rcl r17, 1    IID437
+    __ rcrq(r31, 1);                                                            //    rcr r31, 1    IID438
+    __ rolq(r27, 4);                                                            //    rol r27, 4    IID439
+    __ rorq(r28, 2);                                                            //    ror r28, 2    IID440
+    __ sarq(rcx, 16);                                                           //    sar rcx, 16    IID441
+    __ salq(r31, 8);                                                            //    sal r31, 8    IID442
+    __ sbbq(r27, 1048576);                                                      //    sbb r27, 1048576    IID443
+    __ shlq(r20, 16);                                                           //    shl r20, 16    IID444
+    __ shrq(r31, 8);                                                            //    shr r31, 8    IID445
+    __ subq(r27, 1048576);                                                      //    sub r27, 1048576    IID446
+    __ xorq(r22, 4096);                                                         //    xor r22, 4096    IID447
+    __ movq(r8, 4096);                                                          //    mov r8, 4096    IID448
+    __ mov64(r28, 1099511627776);                                               //    mov r28, 1099511627776    IID449
+    __ btq(r13, 1);                                                             //    bt r13, 1    IID450
+    __ testq(r16, -1048576);                                                    //    test r16, -1048576    IID451
+    __ orq_imm32(r20, 262144);                                                  //    or r20, 262144    IID452
+    __ subq_imm32(r18, 1048576);                                                //    sub r18, 1048576    IID453
+    __ cmovq(Assembler::Condition::overflow, rbx, Address(r29, r8, (Address::ScaleFactor)0, +0x1d022615)); //    cmovo rbx, qword ptr [r29+r8*1+0x1d022615]    IID454
+    __ cmovq(Assembler::Condition::noOverflow, rdx, Address(r12, r28, (Address::ScaleFactor)1, -0x34c898e2)); //    cmovno rdx, qword ptr [r12+r28*2-0x34c898e2]    IID455
+    __ cmovq(Assembler::Condition::below, r27, Address(r10, rcx, (Address::ScaleFactor)3, -0x1ef7abf1)); //    cmovb r27, qword ptr [r10+rcx*8-0x1ef7abf1]    IID456
+    __ cmovq(Assembler::Condition::aboveEqual, r14, Address(r13, r29, (Address::ScaleFactor)2, -0x7c4c8369)); //    cmovae r14, qword ptr [r13+r29*4-0x7c4c8369]    IID457
+    __ cmovq(Assembler::Condition::zero, r15, Address(r23, rcx, (Address::ScaleFactor)2, -0x6bd22ccf)); //    cmovz r15, qword ptr [r23+rcx*4-0x6bd22ccf]    IID458
+    __ cmovq(Assembler::Condition::notZero, r24, Address(r15, r10, (Address::ScaleFactor)1, -0x7ffb3d09)); //    cmovnz r24, qword ptr [r15+r10*2-0x7ffb3d09]    IID459
+    __ cmovq(Assembler::Condition::belowEqual, r23, Address(r11, +0x276a863b)); //    cmovbe r23, qword ptr [r11+0x276a863b]    IID460
+    __ cmovq(Assembler::Condition::above, r28, Address(r29, +0x3fb4396e));      //    cmova r28, qword ptr [r29+0x3fb4396e]    IID461
+    __ cmovq(Assembler::Condition::negative, r26, Address(r27, rcx, (Address::ScaleFactor)3, +0x4ddea61c)); //    cmovs r26, qword ptr [r27+rcx*8+0x4ddea61c]    IID462
+    __ cmovq(Assembler::Condition::positive, r10, Address(r22, r19, (Address::ScaleFactor)1, +0x2a126966)); //    cmovns r10, qword ptr [r22+r19*2+0x2a126966]    IID463
+    __ cmovq(Assembler::Condition::parity, r12, Address(r10, +0x3d7c59f));      //    cmovp r12, qword ptr [r10+0x3d7c59f]    IID464
+    __ cmovq(Assembler::Condition::noParity, r10, Address(r8, r8, (Address::ScaleFactor)3, -0xe61862d)); //    cmovnp r10, qword ptr [r8+r8*8-0xe61862d]    IID465
+    __ cmovq(Assembler::Condition::less, r23, Address(r29, -0x777ed96d));       //    cmovl r23, qword ptr [r29-0x777ed96d]    IID466
+    __ cmovq(Assembler::Condition::greaterEqual, rcx, Address(rbx, r19, (Address::ScaleFactor)1, +0x53c601cb)); //    cmovge rcx, qword ptr [rbx+r19*2+0x53c601cb]    IID467
+    __ cmovq(Assembler::Condition::lessEqual, r14, Address(r17, rbx, (Address::ScaleFactor)0, -0x768bf073)); //    cmovle r14, qword ptr [r17+rbx*1-0x768bf073]    IID468
+    __ cmovq(Assembler::Condition::greater, r29, Address(r10, r19, (Address::ScaleFactor)1, +0x30c98d3c)); //    cmovg r29, qword ptr [r10+r19*2+0x30c98d3c]    IID469
+    __ call(r10);                                                               //    call r10    IID470
+    __ divq(r16);                                                               //    div r16    IID471
+    __ idivq(r27);                                                              //    idiv r27    IID472
+    __ imulq(r9);                                                               //    imul r9    IID473
+    __ mulq(r13);                                                               //    mul r13    IID474
+    __ negq(r14);                                                               //    neg r14    IID475
+    __ notq(r18);                                                               //    not r18    IID476
+    __ rolq(r28);                                                               //    rol r28, cl    IID477
+    __ rorq(r28);                                                               //    ror r28, cl    IID478
+    __ sarq(r22);                                                               //    sar r22, cl    IID479
+    __ salq(r8);                                                                //    sal r8, cl    IID480
+    __ shlq(r12);                                                               //    shl r12, cl    IID481
+    __ shrq(rbx);                                                               //    shr rbx, cl    IID482
+    __ incrementq(rcx);                                                         //    inc rcx    IID483
+    __ decrementq(r23);                                                         //    dec r23    IID484
+    __ pushp(rcx);                                                              //    pushp rcx    IID485
+    __ popp(r26);                                                               //    popp r26    IID486
+    __ call(Address(r29, r10, (Address::ScaleFactor)0, +0x5655bc9f));           //    call qword ptr [r29+r10*1+0x5655bc9f]    IID487
+    __ mulq(Address(rdx, r21, (Address::ScaleFactor)3, -0x6798a630));           //    mul qword ptr [rdx+r21*8-0x6798a630]    IID488
+    __ negq(Address(r31, r24, (Address::ScaleFactor)0, -0x20071802));           //    neg qword ptr [r31+r24*1-0x20071802]    IID489
+    __ sarq(Address(r21, rdx, (Address::ScaleFactor)2, -0x343cb9e5));           //    sar qword ptr [r21+rdx*4-0x343cb9e5], cl    IID490
+    __ salq(Address(r20, r24, (Address::ScaleFactor)3, +0xa667574));            //    sal qword ptr [r20+r24*8+0xa667574], cl    IID491
+    __ shrq(Address(r27, +0x76b77974));                                         //    shr qword ptr [r27+0x76b77974], cl    IID492
+    __ incrementq(Address(r25, -0x534e8d31));                                   //    inc qword ptr [r25-0x534e8d31]    IID493
+    __ decrementq(Address(r20, -0x180d3ea1));                                   //    dec qword ptr [r20-0x180d3ea1]    IID494
+    __ imulq(r17, Address(r16, -0x2af2fd58), 4096);                             //    imul r17, qword ptr [r16-0x2af2fd58], 4096    IID495
+    __ imulq(r28, r25, 16);                                                     //    imul r28, r25, 16    IID496
+    __ shldq(r27, r13, 16);                                                     //    shld r27, r13, 16    IID497
+    __ shrdq(r8, r10, 16);                                                      //    shrd r8, r10, 16    IID498
+    __ pop2(r14, r8);                                                           //    {load}pop2 r8, r14    IID499
+    __ pop2p(r18, rbx);                                                         //    {load}pop2p rbx, r18    IID500
+    __ push2(r23, r19);                                                         //    {load}push2 r19, r23    IID501
+    __ push2p(r12, rbx);                                                        //    {load}push2p rbx, r12    IID502
+    __ movzbq(r9, Address(r14, r23, (Address::ScaleFactor)3, -0x428d2646));     //    movzx r9, byte ptr [r14+r23*8-0x428d2646]    IID503
+    __ movzwq(r28, Address(r9, rcx, (Address::ScaleFactor)2, -0x72611661));     //    movzx r28, word ptr [r9+rcx*4-0x72611661]    IID504
+    __ movsbq(rbx, Address(r24, r21, (Address::ScaleFactor)2, +0x3a6be990));    //    movsx rbx, byte ptr [r24+r21*4+0x3a6be990]    IID505
+    __ movswq(r16, Address(r22, r10, (Address::ScaleFactor)0, +0x7ef8bdd));     //    movsx r16, word ptr [r22+r10*1+0x7ef8bdd]    IID506
+    __ movzbq(r28, r14);                                                        //    movzx r28, r14b    IID507
+    __ movzwq(r13, r28);                                                        //    movzx r13, r28w    IID508
+    __ movsbq(r11, rdx);                                                        //    movsx r11, dl    IID509
+    __ movswq(r12, r26);                                                        //    movsx r12, r26w    IID510
+    __ cmpxchgq(r20, Address(r10, -0xbd2a8da));                                 //    cmpxchg qword ptr [r10-0xbd2a8da], r20    IID511
+    __ eidivq(r15, false);                                                      //    {EVEX}idiv r15    IID512
+    __ eidivq(r23, true);                                                       //    {NF}idiv r23    IID513
+    __ edivq(r14, false);                                                       //    {EVEX}div r14    IID514
+    __ edivq(r14, true);                                                        //    {NF}div r14    IID515
+    __ eimulq(r15, false);                                                      //    {EVEX}imul r15    IID516
+    __ eimulq(r20, true);                                                       //    {NF}imul r20    IID517
+    __ emulq(rcx, false);                                                       //    {EVEX}mul rcx    IID518
+    __ emulq(r21, true);                                                        //    {NF}mul r21    IID519
+    __ emulq(Address(r16, r10, (Address::ScaleFactor)3, +0x5f66ac1e), false);   //    {EVEX}mul qword ptr [r16+r10*8+0x5f66ac1e]    IID520
+    __ emulq(Address(r21, r22, (Address::ScaleFactor)3, -0xbbc807d), true);     //    {NF}mul qword ptr [r21+r22*8-0xbbc807d]    IID521
+    __ eimulq(r22, r26, false);                                                 //    {EVEX}imul r22, r26    IID522
+    __ eimulq(r25, r21, true);                                                  //    {NF}imul r25, r21    IID523
+    __ elzcntq(r20, r13, false);                                                //    {EVEX}lzcnt r20, r13    IID524
+    __ elzcntq(r25, r19, true);                                                 //    {NF}lzcnt r25, r19    IID525
+    __ enegq(r21, r30, false);                                                  //    {EVEX}neg r21, r30    IID526
+    __ enegq(r29, r11, true);                                                   //    {NF}neg r29, r11    IID527
+    __ enotq(r22, r8);                                                          //    {EVEX}not r22, r8    IID528
+    __ epopcntq(r12, r19, false);                                               //    {EVEX}popcnt r12, r19    IID529
+    __ epopcntq(r29, r23, true);                                                //    {NF}popcnt r29, r23    IID530
+    __ erolq(r28, r24, false);                                                  //    {EVEX}rol r28, r24, cl    IID531
+    __ erolq(rdx, r20, true);                                                   //    {NF}rol rdx, r20, cl    IID532
+    __ erorq(rbx, r30, false);                                                  //    {EVEX}ror rbx, r30, cl    IID533
+    __ erorq(r10, r15, true);                                                   //    {NF}ror r10, r15, cl    IID534
+    __ esalq(r17, r13, false);                                                  //    {EVEX}sal r17, r13, cl    IID535
+    __ esalq(r21, r24, true);                                                   //    {NF}sal r21, r24, cl    IID536
+    __ esarq(r31, r12, false);                                                  //    {EVEX}sar r31, r12, cl    IID537
+    __ esarq(rdx, r24, true);                                                   //    {NF}sar rdx, r24, cl    IID538
+    __ edecq(r21, r24, false);                                                  //    {EVEX}dec r21, r24    IID539
+    __ edecq(r15, r31, true);                                                   //    {NF}dec r15, r31    IID540
+    __ eincq(r10, rbx, false);                                                  //    {EVEX}inc r10, rbx    IID541
+    __ eincq(r18, r8, true);                                                    //    {NF}inc r18, r8    IID542
+    __ eshlq(r10, r26, false);                                                  //    {EVEX}shl r10, r26, cl    IID543
+    __ eshlq(r28, r14, true);                                                   //    {NF}shl r28, r14, cl    IID544
+    __ eshrq(r10, r19, false);                                                  //    {EVEX}shr r10, r19, cl    IID545
+    __ eshrq(r28, r21, true);                                                   //    {NF}shr r28, r21, cl    IID546
+    __ etzcntq(r21, r22, false);                                                //    {EVEX}tzcnt r21, r22    IID547
+    __ etzcntq(r16, r23, true);                                                 //    {NF}tzcnt r16, r23    IID548
+    __ eimulq(r11, Address(r18, r9, (Address::ScaleFactor)2, -0x132285a1), false); //    {EVEX}imul r11, qword ptr [r18+r9*4-0x132285a1]    IID549
+    __ eimulq(r13, Address(r24, r15, (Address::ScaleFactor)3, +0x48f50ca0), true); //    {NF}imul r13, qword ptr [r24+r15*8+0x48f50ca0]    IID550
+    __ elzcntq(r9, Address(r13, +0x2115cf0e), false);                           //    {EVEX}lzcnt r9, qword ptr [r13+0x2115cf0e]    IID551
+    __ elzcntq(r27, Address(r30, +0x49cabbb), true);                            //    {NF}lzcnt r27, qword ptr [r30+0x49cabbb]    IID552
+    __ enegq(r21, Address(r13, r31, (Address::ScaleFactor)2, +0x50a8f4d2), false); //    {EVEX}neg r21, qword ptr [r13+r31*4+0x50a8f4d2]    IID553
+    __ enegq(r22, Address(r18, r20, (Address::ScaleFactor)1, -0x5da0584c), true); //    {NF}neg r22, qword ptr [r18+r20*2-0x5da0584c]    IID554
+    __ epopcntq(r14, Address(rbx, r22, (Address::ScaleFactor)2, -0x606349d1), false); //    {EVEX}popcnt r14, qword ptr [rbx+r22*4-0x606349d1]    IID555
+    __ epopcntq(r26, Address(r23, r22, (Address::ScaleFactor)3, -0x72c66c23), true); //    {NF}popcnt r26, qword ptr [r23+r22*8-0x72c66c23]    IID556
+    __ esalq(r26, Address(r9, +0x334aba09), false);                             //    {EVEX}sal r26, qword ptr [r9+0x334aba09], cl    IID557
+    __ esalq(r9, Address(r9, r30, (Address::ScaleFactor)3, -0x219a6102), true); //    {NF}sal r9, qword ptr [r9+r30*8-0x219a6102], cl    IID558
+    __ esarq(r25, Address(r20, -0x2131bab1), false);                            //    {EVEX}sar r25, qword ptr [r20-0x2131bab1], cl    IID559
+    __ esarq(r16, Address(r28, r16, (Address::ScaleFactor)1, +0x48c483b9), true); //    {NF}sar r16, qword ptr [r28+r16*2+0x48c483b9], cl    IID560
+    __ edecq(r30, Address(r9, r16, (Address::ScaleFactor)0, -0x88ce84f), false); //    {EVEX}dec r30, qword ptr [r9+r16*1-0x88ce84f]    IID561
+    __ edecq(r11, Address(r30, r29, (Address::ScaleFactor)2, +0x3eeb8fd0), true); //    {NF}dec r11, qword ptr [r30+r29*4+0x3eeb8fd0]    IID562
+    __ eincq(r26, Address(r29, r10, (Address::ScaleFactor)3, +0x3ef4822e), false); //    {EVEX}inc r26, qword ptr [r29+r10*8+0x3ef4822e]    IID563
+    __ eincq(r29, Address(r19, r20, (Address::ScaleFactor)2, -0x3f0f3db9), true); //    {NF}inc r29, qword ptr [r19+r20*4-0x3f0f3db9]    IID564
+    __ eshrq(r8, Address(r30, r20, (Address::ScaleFactor)0, +0x15b56a17), false); //    {EVEX}shr r8, qword ptr [r30+r20*1+0x15b56a17], cl    IID565
+    __ eshrq(r26, Address(r11, -0x2de86561), true);                             //    {NF}shr r26, qword ptr [r11-0x2de86561], cl    IID566
+    __ etzcntq(r11, Address(rcx, r30, (Address::ScaleFactor)1, -0x32ffb1c2), false); //    {EVEX}tzcnt r11, qword ptr [rcx+r30*2-0x32ffb1c2]    IID567
+    __ etzcntq(r23, Address(r9, r12, (Address::ScaleFactor)1, -0x54823e69), true); //    {NF}tzcnt r23, qword ptr [r9+r12*2-0x54823e69]    IID568
+    __ eaddq(r20, Address(r13, rcx, (Address::ScaleFactor)3, -0x46116c0d), r15, false); //    {EVEX}add r20, qword ptr [r13+rcx*8-0x46116c0d], r15    IID569
+    __ eaddq(r13, Address(r9, r23, (Address::ScaleFactor)1, -0x286c7605), r16, true); //    {NF}add r13, qword ptr [r9+r23*2-0x286c7605], r16    IID570
+    __ eandq(r21, Address(r30, r17, (Address::ScaleFactor)0, +0xf4e30b2), r29, false); //    {EVEX}and r21, qword ptr [r30+r17*1+0xf4e30b2], r29    IID571
+    __ eandq(r30, Address(r17, r31, (Address::ScaleFactor)0, +0x3ab9dec4), r17, true); //    {NF}and r30, qword ptr [r17+r31*1+0x3ab9dec4], r17    IID572
+    __ eorq(r10, Address(r27, r30, (Address::ScaleFactor)1, -0x197f1266), r28, false); //    {EVEX}or r10, qword ptr [r27+r30*2-0x197f1266], r28    IID573
+    __ eorq(r9, Address(r29, r30, (Address::ScaleFactor)0, -0x24ea9b08), r11, true); //    {NF}or r9, qword ptr [r29+r30*1-0x24ea9b08], r11    IID574
+    __ esubq(r15, Address(r14, -0x4f44bf90), r16, false);                       //    {EVEX}sub r15, qword ptr [r14-0x4f44bf90], r16    IID575
+    __ esubq(rcx, Address(r21, r18, (Address::ScaleFactor)1, -0x11d0ac8f), r28, true); //    {NF}sub rcx, qword ptr [r21+r18*2-0x11d0ac8f], r28    IID576
+    __ exorq(r19, Address(r19, r18, (Address::ScaleFactor)0, -0xa5e55ec), r8, false); //    {EVEX}xor r19, qword ptr [r19+r18*1-0xa5e55ec], r8    IID577
+    __ exorq(r28, Address(r17, r28, (Address::ScaleFactor)1, -0x6eb42fe0), r16, true); //    {NF}xor r28, qword ptr [r17+r28*2-0x6eb42fe0], r16    IID578
+    __ eaddq(r17, Address(r18, -0x60ab1105), 16777216, false);                  //    {EVEX}add r17, qword ptr [r18-0x60ab1105], 16777216    IID579
+    __ eaddq(r25, Address(r19, r25, (Address::ScaleFactor)0, +0x122444d9), 65536, true); //    {NF}add r25, qword ptr [r19+r25*1+0x122444d9], 65536    IID580
+    __ eandq(r30, Address(r9, r28, (Address::ScaleFactor)1, -0x25b00cf3), 4096, false); //    {EVEX}and r30, qword ptr [r9+r28*2-0x25b00cf3], 4096    IID581
+    __ eandq(r9, Address(r22, rbx, (Address::ScaleFactor)1, -0x7e465026), 268435456, true); //    {NF}and r9, qword ptr [r22+rbx*2-0x7e465026], 268435456    IID582
+    __ eimulq(r12, Address(r25, r25, (Address::ScaleFactor)1, -0x432d68cc), 1, false); //    {EVEX}imul r12, qword ptr [r25+r25*2-0x432d68cc], 1    IID583
+    __ eimulq(r15, Address(r17, r31, (Address::ScaleFactor)3, -0x2b97565e), 16, true); //    {NF}imul r15, qword ptr [r17+r31*8-0x2b97565e], 16    IID584
+    __ eorq(r28, Address(rdx, r31, (Address::ScaleFactor)0, +0x3f1363b1), 256, false); //    {EVEX}or r28, qword ptr [rdx+r31*1+0x3f1363b1], 256    IID585
+    __ eorq(r16, Address(r12, r23, (Address::ScaleFactor)3, -0x1785863c), 16777216, true); //    {NF}or r16, qword ptr [r12+r23*8-0x1785863c], 16777216    IID586
+    __ esalq(r8, Address(r14, r24, (Address::ScaleFactor)2, -0x714290a5), 2, false); //    {EVEX}sal r8, qword ptr [r14+r24*4-0x714290a5], 2    IID587
+    __ esalq(r8, Address(r15, r14, (Address::ScaleFactor)2, +0x21f13243), 16, true); //    {NF}sal r8, qword ptr [r15+r14*4+0x21f13243], 16    IID588
+    __ esarq(r10, Address(r13, r29, (Address::ScaleFactor)0, +0x7d04cb72), 2, false); //    {EVEX}sar r10, qword ptr [r13+r29*1+0x7d04cb72], 2    IID589
+    __ esarq(r11, Address(r21, r31, (Address::ScaleFactor)3, -0x2176b4dc), 8, true); //    {NF}sar r11, qword ptr [r21+r31*8-0x2176b4dc], 8    IID590
+    __ eshrq(rcx, Address(r16, r12, (Address::ScaleFactor)1, +0x260c9a38), 4, false); //    {EVEX}shr rcx, qword ptr [r16+r12*2+0x260c9a38], 4    IID591
+    __ eshrq(r22, Address(r26, r9, (Address::ScaleFactor)0, -0x5e56bb62), 8, true); //    {NF}shr r22, qword ptr [r26+r9*1-0x5e56bb62], 8    IID592
+    __ esubq(r31, Address(rbx, r28, (Address::ScaleFactor)1, +0x2b00bb10), 1, false); //    {EVEX}sub r31, qword ptr [rbx+r28*2+0x2b00bb10], 1    IID593
+    __ esubq(r21, Address(r31, -0x6c10f4ad), 4096, true);                       //    {NF}sub r21, qword ptr [r31-0x6c10f4ad], 4096    IID594
+    __ exorq(r11, Address(r23, r30, (Address::ScaleFactor)1, +0x51a6026b), 65536, false); //    {EVEX}xor r11, qword ptr [r23+r30*2+0x51a6026b], 65536    IID595
+    __ exorq(r14, Address(r27, r10, (Address::ScaleFactor)2, -0x34ad9bab), 16, true); //    {NF}xor r14, qword ptr [r27+r10*4-0x34ad9bab], 16    IID596
+    __ eaddq(r20, r23, 16777216, false);                                        //    {EVEX}add r20, r23, 16777216    IID597
+    __ eaddq(rax, r30, 16777216, false);                                        //    {EVEX}add rax, r30, 16777216    IID598
+    __ eaddq(r9, r21, 4096, true);                                              //    {NF}add r9, r21, 4096    IID599
+    __ eaddq(rax, rbx, 4096, true);                                             //    {NF}add rax, rbx, 4096    IID600
+    __ eandq(rdx, r21, 268435456, false);                                       //    {EVEX}and rdx, r21, 268435456    IID601
+    __ eandq(rax, r8, 268435456, false);                                        //    {EVEX}and rax, r8, 268435456    IID602
+    __ eandq(r19, r31, 65536, true);                                            //    {NF}and r19, r31, 65536    IID603
+    __ eandq(rax, rbx, 65536, true);                                            //    {NF}and rax, rbx, 65536    IID604
+    __ eimulq(r21, r9, 16777216, false);                                        //    {EVEX}imul r21, r9, 16777216    IID605
+    __ eimulq(rax, r30, 16777216, false);                                       //    {EVEX}imul rax, r30, 16777216    IID606
+    __ eimulq(r30, r18, 65536, true);                                           //    {NF}imul r30, r18, 65536    IID607
+    __ eimulq(rax, r19, 65536, true);                                           //    {NF}imul rax, r19, 65536    IID608
+    __ eorq(r20, r16, 1048576, false);                                          //    {EVEX}or r20, r16, 1048576    IID609
+    __ eorq(rax, r28, 1048576, false);                                          //    {EVEX}or rax, r28, 1048576    IID610
+    __ eorq(rbx, r24, 4096, true);                                              //    {NF}or rbx, r24, 4096    IID611
+    __ eorq(rax, r22, 4096, true);                                              //    {NF}or rax, r22, 4096    IID612
+    __ erclq(r20, r30, 4);                                                      //    {EVEX}rcl r20, r30, 4    IID613
+    __ erclq(rax, r22, 4);                                                      //    {EVEX}rcl rax, r22, 4    IID614
+    __ erolq(rcx, r28, 2, false);                                               //    {EVEX}rol rcx, r28, 2    IID615
+    __ erolq(rax, r21, 2, false);                                               //    {EVEX}rol rax, r21, 2    IID616
+    __ erolq(r26, r15, 4, true);                                                //    {NF}rol r26, r15, 4    IID617
+    __ erolq(rax, r19, 4, true);                                                //    {NF}rol rax, r19, 4    IID618
+    __ erorq(r24, r19, 8, false);                                               //    {EVEX}ror r24, r19, 8    IID619
+    __ erorq(rax, r28, 8, false);                                               //    {EVEX}ror rax, r28, 8    IID620
+    __ erorq(r25, r18, 4, true);                                                //    {NF}ror r25, r18, 4    IID621
+    __ erorq(rax, r13, 4, true);                                                //    {NF}ror rax, r13, 4    IID622
+    __ esalq(r27, r17, 2, false);                                               //    {EVEX}sal r27, r17, 2    IID623
+    __ esalq(rax, rdx, 2, false);                                               //    {EVEX}sal rax, rdx, 2    IID624
+    __ esalq(rbx, r28, 16, true);                                               //    {NF}sal rbx, r28, 16    IID625
+    __ esalq(rax, r15, 16, true);                                               //    {NF}sal rax, r15, 16    IID626
+    __ esarq(rbx, r12, 4, false);                                               //    {EVEX}sar rbx, r12, 4    IID627
+    __ esarq(rax, rbx, 4, false);                                               //    {EVEX}sar rax, rbx, 4    IID628
+    __ esarq(r17, rdx, 2, true);                                                //    {NF}sar r17, rdx, 2    IID629
+    __ esarq(rax, r31, 2, true);                                                //    {NF}sar rax, r31, 2    IID630
+    __ eshlq(r21, rbx, 4, false);                                               //    {EVEX}shl r21, rbx, 4    IID631
+    __ eshlq(rax, r24, 4, false);                                               //    {EVEX}shl rax, r24, 4    IID632
+    __ eshlq(r27, r13, 16, true);                                               //    {NF}shl r27, r13, 16    IID633
+    __ eshlq(rax, r25, 16, true);                                               //    {NF}shl rax, r25, 16    IID634
+    __ eshrq(rcx, r22, 16, false);                                              //    {EVEX}shr rcx, r22, 16    IID635
+    __ eshrq(rax, r14, 16, false);                                              //    {EVEX}shr rax, r14, 16    IID636
+    __ eshrq(r11, r30, 4, true);                                                //    {NF}shr r11, r30, 4    IID637
+    __ eshrq(rax, r24, 4, true);                                                //    {NF}shr rax, r24, 4    IID638
+    __ esubq(r20, r19, 256, false);                                             //    {EVEX}sub r20, r19, 256    IID639
+    __ esubq(rax, r17, 256, false);                                             //    {EVEX}sub rax, r17, 256    IID640
+    __ esubq(r31, r30, 65536, true);                                            //    {NF}sub r31, r30, 65536    IID641
+    __ esubq(rax, r18, 65536, true);                                            //    {NF}sub rax, r18, 65536    IID642
+    __ exorq(r18, r11, 4096, false);                                            //    {EVEX}xor r18, r11, 4096    IID643
+    __ exorq(rax, r10, 4096, false);                                            //    {EVEX}xor rax, r10, 4096    IID644
+    __ exorq(r24, r18, 268435456, true);                                        //    {NF}xor r24, r18, 268435456    IID645
+    __ exorq(rax, rbx, 268435456, true);                                        //    {NF}xor rax, rbx, 268435456    IID646
+    __ eorq_imm32(r26, r21, 4194304, false);                                    //    {EVEX}or r26, r21, 4194304    IID647
+    __ eorq_imm32(rax, r8, 4194304, false);                                     //    {EVEX}or rax, r8, 4194304    IID648
+    __ eorq_imm32(r22, r21, 262144, false);                                     //    {EVEX}or r22, r21, 262144    IID649
+    __ eorq_imm32(rax, r27, 262144, false);                                     //    {EVEX}or rax, r27, 262144    IID650
+    __ esubq_imm32(r16, r8, 4194304, false);                                    //    {EVEX}sub r16, r8, 4194304    IID651
+    __ esubq_imm32(rax, rdx, 4194304, false);                                   //    {EVEX}sub rax, rdx, 4194304    IID652
+    __ esubq_imm32(r20, r31, 1048576, true);                                    //    {NF}sub r20, r31, 1048576    IID653
+    __ esubq_imm32(rax, r21, 1048576, true);                                    //    {NF}sub rax, r21, 1048576    IID654
+    __ eaddq(r20, r14, Address(rcx, r16, (Address::ScaleFactor)0, +0x7c6654d9), false); //    {EVEX}add r20, r14, qword ptr [rcx+r16*1+0x7c6654d9]    IID655
+    __ eaddq(r29, rcx, Address(r15, r23, (Address::ScaleFactor)0, +0x45b7f72d), true); //    {NF}add r29, rcx, qword ptr [r15+r23*1+0x45b7f72d]    IID656
+    __ eandq(r19, r17, Address(r13, r22, (Address::ScaleFactor)1, -0x750c1996), false); //    {EVEX}and r19, r17, qword ptr [r13+r22*2-0x750c1996]    IID657
+    __ eandq(r13, r8, Address(r31, r23, (Address::ScaleFactor)1, -0x2211b6b2), true); //    {NF}and r13, r8, qword ptr [r31+r23*2-0x2211b6b2]    IID658
+    __ eorq(r11, r28, Address(r13, r11, (Address::ScaleFactor)3, +0x5c0013ab), false); //    {EVEX}or r11, r28, qword ptr [r13+r11*8+0x5c0013ab]    IID659
+    __ eorq(rdx, r18, Address(r18, rcx, (Address::ScaleFactor)0, +0x59557e71), true); //    {NF}or rdx, r18, qword ptr [r18+rcx*1+0x59557e71]    IID660
+    __ eimulq(r27, r11, Address(r22, -0x28469649), false);                      //    {EVEX}imul r27, r11, qword ptr [r22-0x28469649]    IID661
+    __ eimulq(r10, r9, Address(r24, +0x49691d54), true);                        //    {NF}imul r10, r9, qword ptr [r24+0x49691d54]    IID662
+    __ esubq(r24, r12, Address(r19, +0x22d529aa), false);                       //    {EVEX}sub r24, r12, qword ptr [r19+0x22d529aa]    IID663
+    __ esubq(r20, r18, Address(r9, r10, (Address::ScaleFactor)2, -0x264a7a48), true); //    {NF}sub r20, r18, qword ptr [r9+r10*4-0x264a7a48]    IID664
+    __ exorq(rbx, r9, Address(r14, r27, (Address::ScaleFactor)0, +0xf71c02f), false); //    {EVEX}xor rbx, r9, qword ptr [r14+r27*1+0xf71c02f]    IID665
+    __ exorq(r25, r15, Address(r10, r12, (Address::ScaleFactor)1, +0x732367bd), true); //    {NF}xor r25, r15, qword ptr [r10+r12*2+0x732367bd]    IID666
+    __ eaddq(r11, r9, r10, false);                                              //    {load}{EVEX}add r11, r9, r10    IID667
+    __ eaddq(r25, r13, r16, true);                                              //    {load}{NF}add r25, r13, r16    IID668
+    __ eadcxq(r11, r21, r25);                                                   //    {load}{EVEX}adcx r11, r21, r25    IID669
+    __ eadoxq(rdx, r20, rbx);                                                   //    {load}{EVEX}adox rdx, r20, rbx    IID670
+    __ eandq(r25, r21, r26, false);                                             //    {load}{EVEX}and r25, r21, r26    IID671
+    __ eandq(r23, r27, r21, true);                                              //    {load}{NF}and r23, r27, r21    IID672
+    __ eimulq(r10, r10, r12, false);                                            //    {load}{EVEX}imul r10, r10, r12    IID673
+    __ eimulq(r31, r12, r23, true);                                             //    {load}{NF}imul r31, r12, r23    IID674
+    __ eorq(r16, r29, r14, false);                                              //    {load}{EVEX}or r16, r29, r14    IID675
+    __ eorq(r19, r24, r23, true);                                               //    {load}{NF}or r19, r24, r23    IID676
+    __ esubq(r14, r21, r15, false);                                             //    {load}{EVEX}sub r14, r21, r15    IID677
+    __ esubq(r25, r9, r29, true);                                               //    {load}{NF}sub r25, r9, r29    IID678
+    __ exorq(rdx, r11, r25, false);                                             //    {load}{EVEX}xor rdx, r11, r25    IID679
+    __ exorq(r19, r10, r16, true);                                              //    {load}{NF}xor r19, r10, r16    IID680
+    __ eshldq(r8, r23, r31, 8, false);                                          //    {EVEX}shld r8, r23, r31, 8    IID681
+    __ eshldq(r31, rbx, r16, 2, true);                                          //    {NF}shld r31, rbx, r16, 2    IID682
+    __ eshrdq(r24, r10, r9, 2, false);                                          //    {EVEX}shrd r24, r10, r9, 2    IID683
+    __ eshrdq(r28, r26, r18, 16, true);                                         //    {NF}shrd r28, r26, r18, 16    IID684
+    __ ecmovq (Assembler::Condition::overflow, r25, r20, r16);                  //    cmovo r25, r20, r16    IID685
+    __ ecmovq (Assembler::Condition::noOverflow, r21, rbx, r28);                //    cmovno r21, rbx, r28    IID686
+    __ ecmovq (Assembler::Condition::below, r22, r19, r13);                     //    cmovb r22, r19, r13    IID687
+    __ ecmovq (Assembler::Condition::aboveEqual, r15, rdx, r8);                 //    cmovae r15, rdx, r8    IID688
+    __ ecmovq (Assembler::Condition::zero, r22, r14, r12);                      //    cmovz r22, r14, r12    IID689
+    __ ecmovq (Assembler::Condition::notZero, r24, r14, r24);                   //    cmovnz r24, r14, r24    IID690
+    __ ecmovq (Assembler::Condition::belowEqual, r13, r21, rbx);                //    cmovbe r13, r21, rbx    IID691
+    __ ecmovq (Assembler::Condition::above, rbx, r27, r14);                     //    cmova rbx, r27, r14    IID692
+    __ ecmovq (Assembler::Condition::negative, r24, r27, r17);                  //    cmovs r24, r27, r17    IID693
+    __ ecmovq (Assembler::Condition::positive, r21, r27, r27);                  //    cmovns r21, r27, r27    IID694
+    __ ecmovq (Assembler::Condition::parity, r27, r14, r24);                    //    cmovp r27, r14, r24    IID695
+    __ ecmovq (Assembler::Condition::noParity, r28, r29, r22);                  //    cmovnp r28, r29, r22    IID696
+    __ ecmovq (Assembler::Condition::less, r15, r13, r31);                      //    cmovl r15, r13, r31    IID697
+    __ ecmovq (Assembler::Condition::greaterEqual, r21, r15, r30);              //    cmovge r21, r15, r30    IID698
+    __ ecmovq (Assembler::Condition::lessEqual, r20, r8, r13);                  //    cmovle r20, r8, r13    IID699
+    __ ecmovq (Assembler::Condition::greater, r31, r25, r27);                   //    cmovg r31, r25, r27    IID700
+    __ ecmovq (Assembler::Condition::overflow, r31, r15, Address(r14, r13, (Address::ScaleFactor)1, -0x6e68556)); //    cmovo r31, r15, qword ptr [r14+r13*2-0x6e68556]    IID701
+    __ ecmovq (Assembler::Condition::noOverflow, r12, r28, Address(r30, r15, (Address::ScaleFactor)3, +0x3ba33f9e)); //    cmovno r12, r28, qword ptr [r30+r15*8+0x3ba33f9e]    IID702
+    __ ecmovq (Assembler::Condition::below, r16, r25, Address(r12, r9, (Address::ScaleFactor)0, -0x28e03b33)); //    cmovb r16, r25, qword ptr [r12+r9*1-0x28e03b33]    IID703
+    __ ecmovq (Assembler::Condition::aboveEqual, r8, r27, Address(r8, r25, (Address::ScaleFactor)3, -0x1e42bd95)); //    cmovae r8, r27, qword ptr [r8+r25*8-0x1e42bd95]    IID704
+    __ ecmovq (Assembler::Condition::zero, rcx, r20, Address(r27, rbx, (Address::ScaleFactor)2, +0x46823c58)); //    cmovz rcx, r20, qword ptr [r27+rbx*4+0x46823c58]    IID705
+    __ ecmovq (Assembler::Condition::notZero, rbx, r12, Address(r21, -0x635b8c8)); //    cmovnz rbx, r12, qword ptr [r21-0x635b8c8]    IID706
+    __ ecmovq (Assembler::Condition::belowEqual, r23, rbx, Address(r27, r26, (Address::ScaleFactor)3, +0x922bcc0)); //    cmovbe r23, rbx, qword ptr [r27+r26*8+0x922bcc0]    IID707
+    __ ecmovq (Assembler::Condition::above, r25, r9, Address(r23, +0xd2a14ec)); //    cmova r25, r9, qword ptr [r23+0xd2a14ec]    IID708
+    __ ecmovq (Assembler::Condition::negative, r11, r19, Address(r11, -0xfb95a9d)); //    cmovs r11, r19, qword ptr [r11-0xfb95a9d]    IID709
+    __ ecmovq (Assembler::Condition::positive, r13, r18, Address(r28, r19, (Address::ScaleFactor)0, +0x716b9b7e)); //    cmovns r13, r18, qword ptr [r28+r19*1+0x716b9b7e]    IID710
+    __ ecmovq (Assembler::Condition::parity, r21, r16, Address(rcx, r29, (Address::ScaleFactor)0, -0x5af0441e)); //    cmovp r21, r16, qword ptr [rcx+r29*1-0x5af0441e]    IID711
+    __ ecmovq (Assembler::Condition::noParity, r12, r31, Address(r20, r26, (Address::ScaleFactor)0, +0xe0b7fb1)); //    cmovnp r12, r31, qword ptr [r20+r26*1+0xe0b7fb1]    IID712
+    __ ecmovq (Assembler::Condition::less, r15, r24, Address(r30, +0x2d3b7b4f)); //    cmovl r15, r24, qword ptr [r30+0x2d3b7b4f]    IID713
+    __ ecmovq (Assembler::Condition::greaterEqual, r12, r15, Address(r14, r21, (Address::ScaleFactor)2, -0x1222aee8)); //    cmovge r12, r15, qword ptr [r14+r21*4-0x1222aee8]    IID714
+    __ ecmovq (Assembler::Condition::lessEqual, rbx, r31, Address(r23, r20, (Address::ScaleFactor)0, -0x96e4d6a)); //    cmovle rbx, r31, qword ptr [r23+r20*1-0x96e4d6a]    IID715
+    __ ecmovq (Assembler::Condition::greater, rdx, rdx, Address(r10, rdx, (Address::ScaleFactor)3, +0x3875f17c)); //    cmovg rdx, rdx, qword ptr [r10+rdx*8+0x3875f17c]    IID716
 #endif // _LP64
 
   static const uint8_t insns[] =
@@ -944,412 +1002,470 @@
     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
+    0x62, 0xd4, 0x7c, 0x18, 0x81, 0xc3, 0x00, 0x00, 0x01, 0x00,                      // IID255
+    0x62, 0xfc, 0x3c, 0x14, 0x81, 0xc0, 0x00, 0x00, 0x00, 0x10,                      // IID256
+    0x62, 0xfc, 0x7c, 0x1c, 0x81, 0xc2, 0x00, 0x00, 0x00, 0x10,                      // IID257
+    0x62, 0xd4, 0x14, 0x10, 0x83, 0xe5, 0x01,                                        // IID258
+    0x62, 0xd4, 0x7c, 0x18, 0x83, 0xe5, 0x01,                                        // IID259
+    0x62, 0xfc, 0x04, 0x14, 0x83, 0xe6, 0x01,                                        // IID260
+    0x62, 0xdc, 0x7c, 0x1c, 0x83, 0xe5, 0x01,                                        // IID261
+    0x62, 0xcc, 0x7c, 0x08, 0x69, 0xfd, 0x00, 0x00, 0x01, 0x00,                      // IID262
+    0x62, 0xd4, 0x7c, 0x08, 0x69, 0xc7, 0x00, 0x00, 0x01, 0x00,                      // IID263
+    0x62, 0xc4, 0x7c, 0x0c, 0x69, 0xe9, 0x00, 0x00, 0x00, 0x10,                      // IID264
+    0x62, 0xd4, 0x7c, 0x0c, 0x69, 0xc7, 0x00, 0x00, 0x00, 0x10,                      // IID265
+    0x62, 0xfc, 0x6c, 0x18, 0x81, 0xca, 0x00, 0x00, 0x01, 0x00,                      // IID266
+    0x62, 0xd4, 0x7c, 0x18, 0x81, 0xcf, 0x00, 0x00, 0x01, 0x00,                      // IID267
+    0x62, 0xd4, 0x3c, 0x1c, 0x81, 0xc9, 0x00, 0x01, 0x00, 0x00,                      // IID268
+    0x62, 0xdc, 0x7c, 0x1c, 0x81, 0xcb, 0x00, 0x01, 0x00, 0x00,                      // IID269
+    0x62, 0xd4, 0x34, 0x18, 0xc1, 0xd7, 0x08,                                        // IID270
+    0x62, 0xfc, 0x7c, 0x18, 0xc1, 0xd2, 0x08,                                        // IID271
+    0x62, 0xf4, 0x1c, 0x18, 0xc1, 0xc3, 0x10,                                        // IID272
+    0x62, 0xfc, 0x7c, 0x18, 0xc1, 0xc3, 0x10,                                        // IID273
+    0x62, 0xd4, 0x2c, 0x1c, 0xc1, 0xc3, 0x10,                                        // IID274
+    0x62, 0xfc, 0x7c, 0x1c, 0xc1, 0xc2, 0x10,                                        // IID275
+    0x62, 0xd4, 0x6c, 0x18, 0xd1, 0xce,                                              // IID276
+    0x62, 0xfc, 0x7c, 0x18, 0xd1, 0xce,                                              // IID277
+    0x62, 0xdc, 0x34, 0x14, 0xc1, 0xcf, 0x10,                                        // IID278
+    0x62, 0xfc, 0x7c, 0x1c, 0xc1, 0xcb, 0x10,                                        // IID279
+    0x62, 0xd4, 0x34, 0x18, 0xc1, 0xe7, 0x02,                                        // IID280
+    0x62, 0xd4, 0x7c, 0x18, 0xc1, 0xe5, 0x02,                                        // IID281
+    0x62, 0xfc, 0x54, 0x14, 0xd1, 0xe0,                                              // IID282
+    0x62, 0xfc, 0x7c, 0x1c, 0xd1, 0xe5,                                              // IID283
+    0x62, 0xfc, 0x2c, 0x10, 0xc1, 0xff, 0x08,                                        // IID284
+    0x62, 0xdc, 0x7c, 0x18, 0xc1, 0xfc, 0x08,                                        // IID285
+    0x62, 0xd4, 0x2c, 0x14, 0xc1, 0xfe, 0x04,                                        // IID286
+    0x62, 0xd4, 0x7c, 0x1c, 0xc1, 0xfa, 0x04,                                        // IID287
+    0x62, 0xd4, 0x4c, 0x10, 0xd1, 0xe1,                                              // IID288
+    0x62, 0xfc, 0x7c, 0x18, 0xd1, 0xe2,                                              // IID289
+    0x62, 0xdc, 0x0c, 0x14, 0xc1, 0xe0, 0x10,                                        // IID290
+    0x62, 0xfc, 0x7c, 0x1c, 0xc1, 0xe7, 0x10,                                        // IID291
+    0x62, 0xd4, 0x24, 0x18, 0xc1, 0xe8, 0x10,                                        // IID292
+    0x62, 0xfc, 0x7c, 0x18, 0xc1, 0xe8, 0x10,                                        // IID293
+    0x62, 0xd4, 0x24, 0x1c, 0xc1, 0xec, 0x08,                                        // IID294
+    0x62, 0xdc, 0x7c, 0x1c, 0xc1, 0xed, 0x08,                                        // IID295
+    0x62, 0xfc, 0x7c, 0x10, 0x81, 0xed, 0x00, 0x00, 0x10, 0x00,                      // IID296
+    0x62, 0xd4, 0x7c, 0x18, 0x81, 0xef, 0x00, 0x00, 0x10, 0x00,                      // IID297
+    0x62, 0xfc, 0x34, 0x1c, 0x81, 0xea, 0x00, 0x00, 0x00, 0x01,                      // IID298
+#endif // _LP64
+    0x62, 0xf4, 0x7c, 0x1c, 0x81, 0xeb, 0x00, 0x00, 0x00, 0x01,                      // IID299
+#ifdef _LP64
+    0x62, 0xfc, 0x64, 0x10, 0x81, 0xf7, 0x00, 0x00, 0x01, 0x00,                      // IID300
+    0x62, 0xfc, 0x7c, 0x18, 0x81, 0xf1, 0x00, 0x00, 0x01, 0x00,                      // IID301
+    0x62, 0xfc, 0x14, 0x14, 0x81, 0xf2, 0x00, 0x00, 0x10, 0x00,                      // IID302
+    0x62, 0xd4, 0x7c, 0x1c, 0x81, 0xf6, 0x00, 0x00, 0x10, 0x00,                      // IID303
+    0x62, 0xd4, 0x64, 0x10, 0x81, 0xef, 0x00, 0x00, 0x00, 0x01,                      // IID304
+    0x62, 0xdc, 0x7c, 0x18, 0x81, 0xeb, 0x00, 0x00, 0x00, 0x01,                      // IID305
+    0x62, 0xdc, 0x44, 0x14, 0x81, 0xeb, 0x00, 0x00, 0x00, 0x40,                      // IID306
+    0x62, 0xfc, 0x7c, 0x1c, 0x81, 0xef, 0x00, 0x00, 0x00, 0x40,                      // IID307
+    0x62, 0x1c, 0x38, 0x18, 0x03, 0xa4, 0xc4, 0x98, 0x81, 0x92, 0x92,                // IID308
+    0x62, 0x1c, 0x38, 0x14, 0x03, 0xac, 0xc8, 0xfd, 0x73, 0x46, 0x78,                // IID309
+    0x62, 0x84, 0x3c, 0x10, 0x23, 0xac, 0xa8, 0x77, 0xc7, 0x99, 0x9c,                // IID310
+    0x62, 0x4c, 0x1c, 0x1c, 0x23, 0x86, 0xaa, 0x9a, 0xad, 0x98,                      // IID311
+    0x62, 0x34, 0x10, 0x18, 0xaf, 0xac, 0x8b, 0x27, 0xb2, 0xc6, 0xa0,                // IID312
+    0x62, 0x4c, 0x2c, 0x14, 0xaf, 0x8c, 0xd1, 0x66, 0x08, 0xc6, 0xd1,                // IID313
+    0x62, 0x34, 0x18, 0x10, 0x0b, 0x84, 0xc2, 0xac, 0x65, 0x26, 0xf1,                // IID314
+    0x62, 0xcc, 0x00, 0x14, 0x0b, 0xb4, 0xe6, 0xbd, 0x1c, 0xc4, 0x3a,                // IID315
+    0x62, 0x44, 0x38, 0x10, 0x2b, 0xb4, 0x4d, 0xe3, 0xc2, 0xfd, 0x1e,                // IID316
+    0x62, 0x84, 0x7c, 0x14, 0x2b, 0x84, 0x79, 0x34, 0xeb, 0x9f, 0x76,                // IID317
+    0x62, 0x44, 0x64, 0x10, 0x33, 0x8a, 0x29, 0xb4, 0x39, 0x22,                      // IID318
+    0x62, 0xac, 0x30, 0x14, 0x33, 0x9c, 0x40, 0xea, 0xfa, 0x71, 0x1c,                // IID319
+    0x62, 0x5c, 0x64, 0x10, 0x32, 0x94, 0x24, 0x03, 0xf3, 0x65, 0xd6,                // IID320
+    0x62, 0x2c, 0x60, 0x1c, 0x32, 0xa4, 0x47, 0x27, 0x22, 0x87, 0xa2,                // IID321
+    0x62, 0x14, 0x29, 0x18, 0x33, 0x8c, 0xb5, 0x88, 0x11, 0x15, 0x11,                // IID322
+    0x62, 0xa4, 0x79, 0x14, 0x33, 0x8c, 0x3a, 0xe7, 0x6c, 0x93, 0x61,                // IID323
+    0x62, 0xdc, 0x14, 0x18, 0x03, 0xdc,                                              // IID324
+    0x62, 0x6c, 0x64, 0x1c, 0x03, 0xee,                                              // IID325
+    0x62, 0x54, 0x64, 0x18, 0x23, 0xc0,                                              // IID326
+    0x62, 0xc4, 0x24, 0x1c, 0x23, 0xc5,                                              // IID327
+    0x62, 0x7c, 0x1c, 0x18, 0xaf, 0xf9,                                              // IID328
+    0x62, 0x6c, 0x44, 0x14, 0xaf, 0xfc,                                              // IID329
+    0x62, 0x44, 0x4d, 0x10, 0x0b, 0xd2,                                              // IID330
+    0x62, 0xc4, 0x35, 0x14, 0x0b, 0xdb,                                              // IID331
+    0x62, 0x44, 0x64, 0x10, 0x0b, 0xf0,                                              // IID332
+    0x62, 0x74, 0x1c, 0x1c, 0x0b, 0xd2,                                              // IID333
+    0x62, 0x6c, 0x4c, 0x10, 0xa5, 0xf4,                                              // IID334
+    0x62, 0xec, 0x6c, 0x14, 0xa5, 0xd3,                                              // IID335
+    0x62, 0xfc, 0x34, 0x10, 0xad, 0xca,                                              // IID336
+    0x62, 0x6c, 0x64, 0x14, 0xad, 0xc8,                                              // IID337
+    0x62, 0x4c, 0x24, 0x18, 0x2b, 0xf8,                                              // IID338
+    0x62, 0x6c, 0x0c, 0x1c, 0x2b, 0xf0,                                              // IID339
+    0x62, 0x5c, 0x34, 0x18, 0x33, 0xda,                                              // IID340
+    0x62, 0xdc, 0x24, 0x14, 0x33, 0xd7,                                              // IID341
+    0x62, 0xd4, 0x14, 0x10, 0x24, 0xca, 0x10,                                        // IID342
+    0x62, 0xec, 0x04, 0x1c, 0x24, 0xcf, 0x10,                                        // IID343
+    0x62, 0x54, 0x24, 0x10, 0x2c, 0xfd, 0x08,                                        // IID344
+    0x62, 0x4c, 0x04, 0x1c, 0x2c, 0xd5, 0x10,                                        // IID345
+    0x62, 0x54, 0x6c, 0x10, 0x40, 0xc9,                                              // IID346
+    0x62, 0x6c, 0x4c, 0x10, 0x41, 0xf7,                                              // IID347
+    0x62, 0xc4, 0x24, 0x18, 0x42, 0xe3,                                              // IID348
+    0x62, 0x6c, 0x64, 0x18, 0x43, 0xe0,                                              // IID349
+    0x62, 0xcc, 0x5c, 0x10, 0x44, 0xc8,                                              // IID350
+    0x62, 0xc4, 0x4c, 0x10, 0x45, 0xc7,                                              // IID351
+    0x62, 0x4c, 0x04, 0x18, 0x46, 0xe5,                                              // IID352
+    0x62, 0x4c, 0x7c, 0x10, 0x47, 0xc9,                                              // IID353
+    0x62, 0x7c, 0x74, 0x10, 0x48, 0xe9,                                              // IID354
+    0x62, 0xdc, 0x44, 0x10, 0x49, 0xde,                                              // IID355
+    0x62, 0xc4, 0x04, 0x18, 0x4a, 0xf3,                                              // IID356
+    0x62, 0xfc, 0x24, 0x10, 0x4b, 0xd6,                                              // IID357
+    0x62, 0xcc, 0x34, 0x18, 0x4c, 0xcc,                                              // IID358
+    0x62, 0x5c, 0x3c, 0x10, 0x4d, 0xda,                                              // IID359
+    0x62, 0xf4, 0x1c, 0x18, 0x4e, 0xcb,                                              // IID360
+    0x62, 0xec, 0x1c, 0x10, 0x4f, 0xf6,                                              // IID361
+    0x62, 0x74, 0x28, 0x18, 0x40, 0xb4, 0xc9, 0xc3, 0x4d, 0xa8, 0x87,                // IID362
+    0x62, 0x1c, 0x70, 0x10, 0x41, 0xa4, 0xc2, 0x23, 0x22, 0x64, 0x10,                // IID363
+    0x62, 0x5c, 0x2c, 0x10, 0x42, 0x87, 0x1c, 0xd4, 0xd2, 0xf4,                      // IID364
+    0x62, 0xc4, 0x18, 0x18, 0x43, 0xa4, 0xb4, 0xd5, 0x08, 0x80, 0x99,                // IID365
+    0x62, 0x5c, 0x48, 0x10, 0x44, 0x8c, 0xbb, 0x22, 0x4d, 0xce, 0x66,                // IID366
+    0x62, 0x1c, 0x18, 0x18, 0x45, 0x84, 0xde, 0x1f, 0x89, 0x69, 0xd4,                // IID367
+    0x62, 0x84, 0x70, 0x10, 0x46, 0xa4, 0xf1, 0x21, 0xdd, 0xef, 0xca,                // IID368
+    0x62, 0x54, 0x6c, 0x18, 0x47, 0x86, 0x59, 0x7a, 0x6b, 0x3d,                      // IID369
+    0x62, 0x04, 0x74, 0x18, 0x48, 0xbc, 0xb3, 0xf2, 0x85, 0xd5, 0x2c,                // IID370
+    0x62, 0x8c, 0x34, 0x10, 0x49, 0x94, 0x98, 0xcc, 0x63, 0x96, 0xc0,                // IID371
+    0x62, 0x7c, 0x68, 0x10, 0x4a, 0x84, 0x8b, 0x3b, 0x5b, 0xf2, 0xc6,                // IID372
+    0x62, 0x4c, 0x24, 0x18, 0x4b, 0xac, 0x95, 0x3f, 0xa9, 0x94, 0x3a,                // IID373
+    0x62, 0x44, 0x10, 0x18, 0x4c, 0xac, 0x7f, 0x32, 0x35, 0xd4, 0x76,                // IID374
+    0x62, 0x14, 0x04, 0x18, 0x4d, 0xa4, 0x4d, 0x5b, 0x7a, 0x6f, 0x01,                // IID375
+    0x62, 0xfc, 0x30, 0x18, 0x4e, 0x94, 0x79, 0xe1, 0xbf, 0xb6, 0x43,                // IID376
+    0x62, 0x8c, 0x1c, 0x10, 0x4f, 0xa4, 0x10, 0xd1, 0x7f, 0x91, 0xcd,                // IID377
+    0xd5, 0x4c, 0x13, 0xd9,                                                          // IID378
+    0xd5, 0x49, 0x3b, 0xf7,                                                          // IID379
+    0xd5, 0xdd, 0xaf, 0xfe,                                                          // IID380
+    0xf3, 0xd5, 0xd8, 0xb8, 0xdb,                                                    // IID381
+    0xd5, 0x5c, 0x1b, 0xd5,                                                          // IID382
+    0xd5, 0x1d, 0x2b, 0xf2,                                                          // IID383
+    0xf3, 0xd5, 0xc9, 0xbc, 0xe7,                                                    // IID384
+    0xf3, 0x4d, 0x0f, 0xbd, 0xe5,                                                    // IID385
+    0xd5, 0x59, 0x03, 0xfc,                                                          // IID386
+    0xd5, 0x58, 0x23, 0xe4,                                                          // IID387
+    0xd5, 0x4d, 0x0b, 0xc3,                                                          // IID388
+    0x4d, 0x33, 0xd7,                                                                // IID389
+    0xd5, 0x58, 0x8b, 0xdc,                                                          // IID390
+    0xd5, 0xc9, 0xbc, 0xff,                                                          // IID391
+    0xd5, 0xdc, 0xbd, 0xd3,                                                          // IID392
+    0xd5, 0xd9, 0xa3, 0xf8,                                                          // IID393
+    0xd5, 0x4d, 0x87, 0xe3,                                                          // IID394
+    0x4d, 0x85, 0xed,                                                                // IID395
+    0xd5, 0x39, 0x01, 0x94, 0xff, 0x37, 0x04, 0xda, 0x59,                            // IID396
+    0xd5, 0x7c, 0x21, 0x9c, 0xe5, 0x57, 0xd5, 0xd0, 0x6f,                            // IID397
+    0xd5, 0x1c, 0x39, 0x9d, 0x44, 0x67, 0xef, 0x23,                                  // IID398
+    0x49, 0x09, 0x8c, 0xca, 0xab, 0x44, 0x85, 0x7e,                                  // IID399
+    0xd5, 0x2a, 0x31, 0x9c, 0xc1, 0x77, 0xb7, 0x35, 0x86,                            // IID400
+    0xd5, 0x7f, 0x29, 0x9c, 0x3b, 0x9a, 0x5f, 0xf8, 0x11,                            // IID401
+    0xd5, 0x78, 0x89, 0x8c, 0xc4, 0xda, 0x8d, 0x15, 0x72,                            // IID402
+    0xd5, 0x9f, 0xc1, 0xa4, 0x8d, 0xd1, 0xeb, 0x8f, 0x6e,                            // IID403
+    0x49, 0x81, 0xa7, 0x33, 0xb1, 0x36, 0xb8, 0x00, 0x00, 0x00, 0x10,                // IID404
+    0xd5, 0x38, 0x81, 0x84, 0x5f, 0x3f, 0xde, 0xbf, 0x32, 0x00, 0x01, 0x00, 0x00,    // IID405
+    0x4b, 0x81, 0xbc, 0xdf, 0x60, 0x75, 0x8e, 0x54, 0x00, 0x10, 0x00, 0x00,          // IID406
+    0xd5, 0x1a, 0xc1, 0xbc, 0x74, 0x34, 0xfc, 0x43, 0x1b, 0x02,                      // IID407
+    0xd5, 0x39, 0xc1, 0xa4, 0x2a, 0x3d, 0xaf, 0x51, 0xc4, 0x08,                      // IID408
+    0xd5, 0x1a, 0x81, 0x9c, 0xd6, 0x03, 0x14, 0x7e, 0x04, 0x00, 0x00, 0x01, 0x00,    // IID409
+    0x48, 0xc1, 0xac, 0x91, 0x4d, 0x92, 0xa3, 0x7e, 0x10,                            // IID410
+    0xd5, 0x2a, 0x83, 0xac, 0xd1, 0xc2, 0x5a, 0x91, 0xca, 0x10,                      // IID411
+    0xd5, 0x3b, 0x83, 0xb4, 0x96, 0x5c, 0x2f, 0xa1, 0x78, 0x10,                      // IID412
+    0x4b, 0x81, 0x8c, 0x53, 0xb5, 0xb5, 0x13, 0x37, 0x00, 0x00, 0x00, 0x10,          // IID413
+    0xd5, 0x3b, 0xc7, 0x84, 0xf6, 0x10, 0x1a, 0x54, 0x02, 0x00, 0x00, 0x01, 0x00,    // IID414
+    0xd5, 0x1a, 0xf7, 0x84, 0xf8, 0x51, 0x32, 0x8e, 0x55, 0xf0, 0xff, 0xff, 0xff,    // IID415
+    0xd5, 0x4f, 0x03, 0x9c, 0x90, 0x2d, 0x73, 0x5f, 0x63,                            // IID416
+    0xd5, 0x6b, 0x23, 0xac, 0x3c, 0x60, 0x3b, 0x17, 0x8a,                            // IID417
+    0xd5, 0x78, 0x3b, 0x94, 0x83, 0xe2, 0x17, 0xf5, 0xed,                            // IID418
+    0xf3, 0xd5, 0xbb, 0xbd, 0x9c, 0x37, 0x5d, 0x26, 0xc3, 0x1e,                      // IID419
+    0xd5, 0x6a, 0x0b, 0x84, 0x12, 0x1b, 0x83, 0x86, 0x35,                            // IID420
+    0xd5, 0x1c, 0x13, 0xa2, 0x86, 0x60, 0xc1, 0xc3,                                  // IID421
+    0xd5, 0xa9, 0xaf, 0x8c, 0xe8, 0xab, 0x15, 0x15, 0x6b,                            // IID422
+    0xf3, 0xd5, 0xec, 0xb8, 0xac, 0xb9, 0x4d, 0x6c, 0xf0, 0x4f,                      // IID423
+    0xd5, 0x5f, 0x1b, 0x94, 0x50, 0x77, 0x5e, 0x26, 0x8a,                            // IID424
+    0xd5, 0x48, 0x2b, 0x8c, 0x1b, 0x9c, 0xd5, 0x33, 0x40,                            // IID425
+    0xf3, 0xd5, 0xda, 0xbc, 0x94, 0xe6, 0x83, 0xcb, 0x6c, 0xc7,                      // IID426
+    0xd5, 0x3c, 0x33, 0xa4, 0xfc, 0x60, 0x15, 0x31, 0x4b,                            // IID427
+    0xd5, 0x6f, 0x8b, 0xac, 0xa2, 0x57, 0x26, 0x3a, 0x5c,                            // IID428
+    0xd5, 0x6b, 0x8d, 0xb4, 0xcd, 0x3f, 0x6f, 0x3d, 0x1a,                            // IID429
+    0xf2, 0xd5, 0xfe, 0x2c, 0x8c, 0xc1, 0x28, 0x24, 0x52, 0xca,                      // IID430
+    0xd5, 0x59, 0x87, 0x91, 0xc3, 0x84, 0x21, 0x63,                                  // IID431
+    0xd5, 0x5e, 0x85, 0xac, 0x6a, 0x76, 0x02, 0xc6, 0xaf,                            // IID432
+    0xd5, 0x18, 0x81, 0xc4, 0x00, 0x10, 0x00, 0x00,                                  // IID433
+    0x49, 0x83, 0xe1, 0x10,                                                          // IID434
+    0x48, 0x81, 0xd2, 0x00, 0x01, 0x00, 0x00,                                        // IID435
+    0xd5, 0x18, 0x81, 0xfe, 0x00, 0x00, 0x00, 0x01,                                  // IID436
+    0xd5, 0x18, 0xd1, 0xd1,                                                          // IID437
+    0xd5, 0x19, 0xd1, 0xdf,                                                          // IID438
+    0xd5, 0x19, 0xc1, 0xc3, 0x04,                                                    // IID439
+    0xd5, 0x19, 0xc1, 0xcc, 0x02,                                                    // IID440
+    0x48, 0xc1, 0xf9, 0x10,                                                          // IID441
+    0xd5, 0x19, 0xc1, 0xe7, 0x08,                                                    // IID442
+    0xd5, 0x19, 0x81, 0xdb, 0x00, 0x00, 0x10, 0x00,                                  // IID443
+    0xd5, 0x18, 0xc1, 0xe4, 0x10,                                                    // IID444
+    0xd5, 0x19, 0xc1, 0xef, 0x08,                                                    // IID445
+    0xd5, 0x19, 0x81, 0xeb, 0x00, 0x00, 0x10, 0x00,                                  // IID446
+    0xd5, 0x18, 0x81, 0xf6, 0x00, 0x10, 0x00, 0x00,                                  // IID447
+    0x49, 0xc7, 0xc0, 0x00, 0x10, 0x00, 0x00,                                        // IID448
+    0xd5, 0x19, 0xbc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00,                // IID449
+    0x49, 0x0f, 0xba, 0xe5, 0x01,                                                    // IID450
+    0xd5, 0x18, 0xf7, 0xc0, 0x00, 0x00, 0xf0, 0xff,                                  // IID451
+    0xd5, 0x18, 0x81, 0xcc, 0x00, 0x00, 0x04, 0x00,                                  // IID452
+    0xd5, 0x18, 0x81, 0xea, 0x00, 0x00, 0x10, 0x00,                                  // IID453
+    0xd5, 0x9b, 0x40, 0x9c, 0x05, 0x15, 0x26, 0x02, 0x1d,                            // IID454
+    0xd5, 0xab, 0x41, 0x94, 0x64, 0x1e, 0x67, 0x37, 0xcb,                            // IID455
+    0xd5, 0xcd, 0x42, 0x9c, 0xca, 0x0f, 0x54, 0x08, 0xe1,                            // IID456
+    0xd5, 0xaf, 0x43, 0xb4, 0xad, 0x97, 0x7c, 0xb3, 0x83,                            // IID457
+    0xd5, 0x9c, 0x44, 0xbc, 0x8f, 0x31, 0xd3, 0x2d, 0x94,                            // IID458
+    0xd5, 0xcf, 0x45, 0x84, 0x57, 0xf7, 0xc2, 0x04, 0x80,                            // IID459
+    0xd5, 0xc9, 0x46, 0xbb, 0x3b, 0x86, 0x6a, 0x27,                                  // IID460
+    0xd5, 0xdd, 0x47, 0xa5, 0x6e, 0x39, 0xb4, 0x3f,                                  // IID461
+    0xd5, 0xdd, 0x48, 0x94, 0xcb, 0x1c, 0xa6, 0xde, 0x4d,                            // IID462
+    0xd5, 0xbc, 0x49, 0x94, 0x5e, 0x66, 0x69, 0x12, 0x2a,                            // IID463
+    0x4d, 0x0f, 0x4a, 0xa2, 0x9f, 0xc5, 0xd7, 0x03,                                  // IID464
+    0x4f, 0x0f, 0x4b, 0x94, 0xc0, 0xd3, 0x79, 0x9e, 0xf1,                            // IID465
+    0xd5, 0xd9, 0x4c, 0xbd, 0x93, 0x26, 0x81, 0x88,                                  // IID466
+    0xd5, 0xa8, 0x4d, 0x8c, 0x5b, 0xcb, 0x01, 0xc6, 0x53,                            // IID467
+    0xd5, 0x9c, 0x4e, 0xb4, 0x19, 0x8d, 0x0f, 0x74, 0x89,                            // IID468
+    0xd5, 0xed, 0x4f, 0xac, 0x5a, 0x3c, 0x8d, 0xc9, 0x30,                            // IID469
+    0x41, 0xff, 0xd2,                                                                // IID470
+    0xd5, 0x18, 0xf7, 0xf0,                                                          // IID471
+    0xd5, 0x19, 0xf7, 0xfb,                                                          // IID472
+    0x49, 0xf7, 0xe9,                                                                // IID473
+    0x49, 0xf7, 0xe5,                                                                // IID474
+    0x49, 0xf7, 0xde,                                                                // IID475
+    0xd5, 0x18, 0xf7, 0xd2,                                                          // IID476
+    0xd5, 0x19, 0xd3, 0xc4,                                                          // IID477
+    0xd5, 0x19, 0xd3, 0xcc,                                                          // IID478
+    0xd5, 0x18, 0xd3, 0xfe,                                                          // IID479
+    0x49, 0xd3, 0xe0,                                                                // IID480
+    0x49, 0xd3, 0xe4,                                                                // IID481
+    0x48, 0xd3, 0xeb,                                                                // IID482
+    0x48, 0xff, 0xc1,                                                                // IID483
+    0xd5, 0x18, 0xff, 0xcf,                                                          // IID484
+    0xd5, 0x08, 0x51,                                                                // IID485
+    0xd5, 0x19, 0x5a,                                                                // IID486
+    0xd5, 0x13, 0xff, 0x94, 0x15, 0x9f, 0xbc, 0x55, 0x56,                            // IID487
+    0xd5, 0x28, 0xf7, 0xa4, 0xea, 0xd0, 0x59, 0x67, 0x98,                            // IID488
+    0xd5, 0x3b, 0xf7, 0x9c, 0x07, 0xfe, 0xe7, 0xf8, 0xdf,                            // IID489
+    0xd5, 0x18, 0xd3, 0xbc, 0x95, 0x1b, 0x46, 0xc3, 0xcb,                            // IID490
+    0xd5, 0x3a, 0xd3, 0xa4, 0xc4, 0x74, 0x75, 0x66, 0x0a,                            // IID491
+    0xd5, 0x19, 0xd3, 0xab, 0x74, 0x79, 0xb7, 0x76,                                  // IID492
+    0xd5, 0x19, 0xff, 0x81, 0xcf, 0x72, 0xb1, 0xac,                                  // IID493
+    0xd5, 0x18, 0xff, 0x8c, 0x24, 0x5f, 0xc1, 0xf2, 0xe7,                            // IID494
+    0xd5, 0x58, 0x69, 0x88, 0xa8, 0x02, 0x0d, 0xd5, 0x00, 0x10, 0x00, 0x00,          // IID495
+    0xd5, 0x5d, 0x6b, 0xe1, 0x10,                                                    // IID496
+    0xd5, 0x9d, 0xa4, 0xeb, 0x10,                                                    // IID497
+    0x4d, 0x0f, 0xac, 0xd0, 0x10,                                                    // IID498
+    0x62, 0xd4, 0x3c, 0x18, 0x8f, 0xc6,                                              // IID499
+    0x62, 0xfc, 0xe4, 0x18, 0x8f, 0xc2,                                              // IID500
+    0x62, 0xfc, 0x64, 0x10, 0xff, 0xf7,                                              // IID501
+    0x62, 0xd4, 0xe4, 0x18, 0xff, 0xf4,                                              // IID502
+    0xd5, 0xad, 0xb6, 0x8c, 0xfe, 0xba, 0xd9, 0x72, 0xbd,                            // IID503
+    0xd5, 0xcd, 0xb7, 0xa4, 0x89, 0x9f, 0xe9, 0x9e, 0x8d,                            // IID504
+    0xd5, 0xb9, 0xbe, 0x9c, 0xa8, 0x90, 0xe9, 0x6b, 0x3a,                            // IID505
+    0xd5, 0xda, 0xbf, 0x84, 0x16, 0xdd, 0x8b, 0xef, 0x07,                            // IID506
+    0xd5, 0xcd, 0xb6, 0xe6,                                                          // IID507
+    0xd5, 0x9d, 0xb7, 0xec,                                                          // IID508
+    0x4c, 0x0f, 0xbe, 0xda,                                                          // IID509
+    0xd5, 0x9d, 0xbf, 0xe2,                                                          // IID510
+    0xd5, 0xc9, 0xb1, 0xa2, 0x26, 0x57, 0x2d, 0xf4,                                  // IID511
+    0x62, 0xd4, 0xfc, 0x08, 0xf7, 0xff,                                              // IID512
+    0x62, 0xfc, 0xfc, 0x0c, 0xf7, 0xff,                                              // IID513
+    0x62, 0xd4, 0xfc, 0x08, 0xf7, 0xf6,                                              // IID514
+    0x62, 0xd4, 0xfc, 0x0c, 0xf7, 0xf6,                                              // IID515
+    0x62, 0xd4, 0xfc, 0x08, 0xf7, 0xef,                                              // IID516
+    0x62, 0xfc, 0xfc, 0x0c, 0xf7, 0xec,                                              // IID517
+    0x62, 0xf4, 0xfc, 0x08, 0xf7, 0xe1,                                              // IID518
+    0x62, 0xfc, 0xfc, 0x0c, 0xf7, 0xe5,                                              // IID519
+    0x62, 0xbc, 0xfc, 0x08, 0xf7, 0xa4, 0xd0, 0x1e, 0xac, 0x66, 0x5f,                // IID520
+    0x62, 0xfc, 0xf8, 0x0c, 0xf7, 0xa4, 0xf5, 0x83, 0x7f, 0x43, 0xf4,                // IID521
+    0x62, 0xcc, 0xfc, 0x08, 0xaf, 0xf2,                                              // IID522
+    0x62, 0x6c, 0xfc, 0x0c, 0xaf, 0xcd,                                              // IID523
+    0x62, 0xc4, 0xfc, 0x08, 0xf5, 0xe5,                                              // IID524
+    0x62, 0x6c, 0xfc, 0x0c, 0xf5, 0xcb,                                              // IID525
+    0x62, 0xdc, 0xd4, 0x10, 0xf7, 0xde,                                              // IID526
+    0x62, 0xd4, 0x94, 0x14, 0xf7, 0xdb,                                              // IID527
+    0x62, 0xd4, 0xcc, 0x10, 0xf7, 0xd0,                                              // IID528
+    0x62, 0x7c, 0xfc, 0x08, 0x88, 0xe3,                                              // IID529
+    0x62, 0x6c, 0xfc, 0x0c, 0x88, 0xef,                                              // IID530
+    0x62, 0xdc, 0x9c, 0x10, 0xd3, 0xc0,                                              // IID531
+    0x62, 0xfc, 0xec, 0x1c, 0xd3, 0xc4,                                              // IID532
+    0x62, 0xdc, 0xe4, 0x18, 0xd3, 0xce,                                              // IID533
+    0x62, 0xd4, 0xac, 0x1c, 0xd3, 0xcf,                                              // IID534
+    0x62, 0xd4, 0xf4, 0x10, 0xd3, 0xe5,                                              // IID535
+    0x62, 0xdc, 0xd4, 0x14, 0xd3, 0xe0,                                              // IID536
+    0x62, 0xd4, 0x84, 0x10, 0xd3, 0xfc,                                              // IID537
+    0x62, 0xdc, 0xec, 0x1c, 0xd3, 0xf8,                                              // IID538
+    0x62, 0xdc, 0xd4, 0x10, 0xff, 0xc8,                                              // IID539
+    0x62, 0xdc, 0x84, 0x1c, 0xff, 0xcf,                                              // IID540
+    0x62, 0xf4, 0xac, 0x18, 0xff, 0xc3,                                              // IID541
+    0x62, 0xd4, 0xec, 0x14, 0xff, 0xc0,                                              // IID542
+    0x62, 0xdc, 0xac, 0x18, 0xd3, 0xe2,                                              // IID543
+    0x62, 0xd4, 0x9c, 0x14, 0xd3, 0xe6,                                              // IID544
+    0x62, 0xfc, 0xac, 0x18, 0xd3, 0xeb,                                              // IID545
+    0x62, 0xfc, 0x9c, 0x14, 0xd3, 0xed,                                              // IID546
+    0x62, 0xec, 0xfc, 0x08, 0xf4, 0xee,                                              // IID547
+    0x62, 0xec, 0xfc, 0x0c, 0xf4, 0xc7,                                              // IID548
+    0x62, 0x3c, 0xfc, 0x08, 0xaf, 0x9c, 0x8a, 0x5f, 0x7a, 0xdd, 0xec,                // IID549
+    0x62, 0x1c, 0xfc, 0x0c, 0xaf, 0xac, 0xf8, 0xa0, 0x0c, 0xf5, 0x48,                // IID550
+    0x62, 0x54, 0xfc, 0x08, 0xf5, 0x8d, 0x0e, 0xcf, 0x15, 0x21,                      // IID551
+    0x62, 0x4c, 0xfc, 0x0c, 0xf5, 0x9e, 0xbb, 0xab, 0x9c, 0x04,                      // IID552
+    0x62, 0x94, 0xd0, 0x10, 0xf7, 0x9c, 0xbd, 0xd2, 0xf4, 0xa8, 0x50,                // IID553
+    0x62, 0xfc, 0xc8, 0x14, 0xf7, 0x9c, 0x62, 0xb4, 0xa7, 0x5f, 0xa2,                // IID554
+    0x62, 0x74, 0xf8, 0x08, 0x88, 0xb4, 0xb3, 0x2f, 0xb6, 0x9c, 0x9f,                // IID555
+    0x62, 0x6c, 0xf8, 0x0c, 0x88, 0x94, 0xf7, 0xdd, 0x93, 0x39, 0x8d,                // IID556
+    0x62, 0xd4, 0xac, 0x10, 0xd3, 0xa1, 0x09, 0xba, 0x4a, 0x33,                      // IID557
+    0x62, 0x94, 0xb0, 0x1c, 0xd3, 0xa4, 0xf1, 0xfe, 0x9e, 0x65, 0xde,                // IID558
+    0x62, 0xfc, 0xb4, 0x10, 0xd3, 0xbc, 0x24, 0x4f, 0x45, 0xce, 0xde,                // IID559
+    0x62, 0xdc, 0xf8, 0x14, 0xd3, 0xbc, 0x44, 0xb9, 0x83, 0xc4, 0x48,                // IID560
+    0x62, 0xd4, 0x88, 0x10, 0xff, 0x8c, 0x01, 0xb1, 0x17, 0x73, 0xf7,                // IID561
+    0x62, 0x9c, 0xa0, 0x1c, 0xff, 0x8c, 0xae, 0xd0, 0x8f, 0xeb, 0x3e,                // IID562
+    0x62, 0x9c, 0xac, 0x10, 0xff, 0x84, 0xd5, 0x2e, 0x82, 0xf4, 0x3e,                // IID563
+    0x62, 0xfc, 0x90, 0x14, 0xff, 0x84, 0xa3, 0x47, 0xc2, 0xf0, 0xc0,                // IID564
+    0x62, 0xdc, 0xb8, 0x18, 0xd3, 0xac, 0x26, 0x17, 0x6a, 0xb5, 0x15,                // IID565
+    0x62, 0xd4, 0xac, 0x14, 0xd3, 0xab, 0x9f, 0x9a, 0x17, 0xd2,                      // IID566
+    0x62, 0x34, 0xf8, 0x08, 0xf4, 0x9c, 0x71, 0x3e, 0x4e, 0x00, 0xcd,                // IID567
+    0x62, 0x84, 0xfc, 0x0c, 0xf4, 0xbc, 0x61, 0x97, 0xc1, 0x7d, 0xab,                // IID568
+    0x62, 0x54, 0xdc, 0x10, 0x01, 0xbc, 0xcd, 0xf3, 0x93, 0xee, 0xb9,                // IID569
+    0x62, 0xc4, 0x90, 0x1c, 0x01, 0x84, 0x79, 0xfb, 0x89, 0x93, 0xd7,                // IID570
+    0x62, 0x4c, 0xd0, 0x10, 0x21, 0xac, 0x0e, 0xb2, 0x30, 0x4e, 0x0f,                // IID571
+    0x62, 0xac, 0x88, 0x14, 0x21, 0x8c, 0x39, 0xc4, 0xde, 0xb9, 0x3a,                // IID572
+    0x62, 0x0c, 0xa8, 0x18, 0x09, 0xa4, 0x73, 0x9a, 0xed, 0x80, 0xe6,                // IID573
+    0x62, 0x1c, 0xb0, 0x1c, 0x09, 0x9c, 0x35, 0xf8, 0x64, 0x15, 0xdb,                // IID574
+    0x62, 0xc4, 0x84, 0x18, 0x29, 0x86, 0x70, 0x40, 0xbb, 0xb0,                      // IID575
+    0x62, 0x6c, 0xf0, 0x1c, 0x29, 0xa4, 0x55, 0x71, 0x53, 0x2f, 0xee,                // IID576
+    0x62, 0x7c, 0xe0, 0x10, 0x31, 0x84, 0x13, 0x14, 0xaa, 0xa1, 0xf5,                // IID577
+    0x62, 0xac, 0x98, 0x14, 0x31, 0x84, 0x61, 0x20, 0xd0, 0x4b, 0x91,                // IID578
+    0x62, 0xfc, 0xf4, 0x10, 0x81, 0x82, 0xfb, 0xee, 0x54, 0x9f, 0x00, 0x00, 0x00, 0x01, // IID579
+    0x62, 0xbc, 0xb0, 0x14, 0x81, 0x84, 0x0b, 0xd9, 0x44, 0x24, 0x12, 0x00, 0x00, 0x01, 0x00, // IID580
+    0x62, 0x94, 0x88, 0x10, 0x81, 0xa4, 0x61, 0x0d, 0xf3, 0x4f, 0xda, 0x00, 0x10, 0x00, 0x00, // IID581
+    0x62, 0xfc, 0xb4, 0x1c, 0x81, 0xa4, 0x5e, 0xda, 0xaf, 0xb9, 0x81, 0x00, 0x00, 0x00, 0x10, // IID582
+    0x62, 0x1c, 0xf8, 0x08, 0x6b, 0xa4, 0x49, 0x34, 0x97, 0xd2, 0xbc, 0x01,          // IID583
+    0x62, 0x3c, 0xf8, 0x0c, 0x6b, 0xbc, 0xf9, 0xa2, 0xa9, 0x68, 0xd4, 0x10,          // IID584
+    0x62, 0xb4, 0x98, 0x10, 0x81, 0x8c, 0x3a, 0xb1, 0x63, 0x13, 0x3f, 0x00, 0x01, 0x00, 0x00, // IID585
+    0x62, 0xd4, 0xf8, 0x14, 0x81, 0x8c, 0xfc, 0xc4, 0x79, 0x7a, 0xe8, 0x00, 0x00, 0x00, 0x01, // IID586
+    0x62, 0x94, 0xb8, 0x18, 0xc1, 0xa4, 0x86, 0x5b, 0x6f, 0xbd, 0x8e, 0x02,          // IID587
+    0x62, 0x94, 0xbc, 0x1c, 0xc1, 0xa4, 0xb7, 0x43, 0x32, 0xf1, 0x21, 0x10,          // IID588
+    0x62, 0x94, 0xa8, 0x18, 0xc1, 0xbc, 0x2d, 0x72, 0xcb, 0x04, 0x7d, 0x02,          // IID589
+    0x62, 0xbc, 0xa0, 0x1c, 0xc1, 0xbc, 0xfd, 0x24, 0x4b, 0x89, 0xde, 0x08,          // IID590
+    0x62, 0xbc, 0xf4, 0x18, 0xc1, 0xac, 0x60, 0x38, 0x9a, 0x0c, 0x26, 0x04,          // IID591
+    0x62, 0x9c, 0xcc, 0x14, 0xc1, 0xac, 0x0a, 0x9e, 0x44, 0xa9, 0xa1, 0x08,          // IID592
+    0x62, 0xb4, 0x80, 0x10, 0x83, 0xac, 0x63, 0x10, 0xbb, 0x00, 0x2b, 0x01,          // IID593
+    0x62, 0xdc, 0xd4, 0x14, 0x81, 0xaf, 0x53, 0x0b, 0xef, 0x93, 0x00, 0x10, 0x00, 0x00, // IID594
+    0x62, 0xbc, 0xa0, 0x18, 0x81, 0xb4, 0x77, 0x6b, 0x02, 0xa6, 0x51, 0x00, 0x00, 0x01, 0x00, // IID595
+    0x62, 0x9c, 0x8c, 0x1c, 0x83, 0xb4, 0x93, 0x55, 0x64, 0x52, 0xcb, 0x10,          // IID596
+    0x62, 0xfc, 0xdc, 0x10, 0x81, 0xc7, 0x00, 0x00, 0x00, 0x01,                      // IID597
+    0x62, 0xdc, 0xfc, 0x18, 0x81, 0xc6, 0x00, 0x00, 0x00, 0x01,                      // IID598
+    0x62, 0xfc, 0xb4, 0x1c, 0x81, 0xc5, 0x00, 0x10, 0x00, 0x00,                      // IID599
+    0x62, 0xf4, 0xfc, 0x1c, 0x81, 0xc3, 0x00, 0x10, 0x00, 0x00,                      // IID600
+    0x62, 0xfc, 0xec, 0x18, 0x81, 0xe5, 0x00, 0x00, 0x00, 0x10,                      // IID601
+    0x62, 0xd4, 0xfc, 0x18, 0x81, 0xe0, 0x00, 0x00, 0x00, 0x10,                      // IID602
+    0x62, 0xdc, 0xe4, 0x14, 0x81, 0xe7, 0x00, 0x00, 0x01, 0x00,                      // IID603
+    0x62, 0xf4, 0xfc, 0x1c, 0x81, 0xe3, 0x00, 0x00, 0x01, 0x00,                      // IID604
+    0x62, 0xc4, 0xfc, 0x08, 0x69, 0xe9, 0x00, 0x00, 0x00, 0x01,                      // IID605
+    0x62, 0xdc, 0xfc, 0x08, 0x69, 0xc6, 0x00, 0x00, 0x00, 0x01,                      // IID606
+    0x62, 0x6c, 0xfc, 0x0c, 0x69, 0xf2, 0x00, 0x00, 0x01, 0x00,                      // IID607
+    0x62, 0xfc, 0xfc, 0x0c, 0x69, 0xc3, 0x00, 0x00, 0x01, 0x00,                      // IID608
+    0x62, 0xfc, 0xdc, 0x10, 0x81, 0xc8, 0x00, 0x00, 0x10, 0x00,                      // IID609
+    0x62, 0xdc, 0xfc, 0x18, 0x81, 0xcc, 0x00, 0x00, 0x10, 0x00,                      // IID610
+    0x62, 0xdc, 0xe4, 0x1c, 0x81, 0xc8, 0x00, 0x10, 0x00, 0x00,                      // IID611
+    0x62, 0xfc, 0xfc, 0x1c, 0x81, 0xce, 0x00, 0x10, 0x00, 0x00,                      // IID612
+    0x62, 0xdc, 0xdc, 0x10, 0xc1, 0xd6, 0x04,                                        // IID613
+    0x62, 0xfc, 0xfc, 0x18, 0xc1, 0xd6, 0x04,                                        // IID614
+    0x62, 0xdc, 0xf4, 0x18, 0xc1, 0xc4, 0x02,                                        // IID615
+    0x62, 0xfc, 0xfc, 0x18, 0xc1, 0xc5, 0x02,                                        // IID616
+    0x62, 0xd4, 0xac, 0x14, 0xc1, 0xc7, 0x04,                                        // IID617
+    0x62, 0xfc, 0xfc, 0x1c, 0xc1, 0xc3, 0x04,                                        // IID618
+    0x62, 0xfc, 0xbc, 0x10, 0xc1, 0xcb, 0x08,                                        // IID619
+    0x62, 0xdc, 0xfc, 0x18, 0xc1, 0xcc, 0x08,                                        // IID620
+    0x62, 0xfc, 0xb4, 0x14, 0xc1, 0xca, 0x04,                                        // IID621
+    0x62, 0xd4, 0xfc, 0x1c, 0xc1, 0xcd, 0x04,                                        // IID622
+    0x62, 0xfc, 0xa4, 0x10, 0xc1, 0xe1, 0x02,                                        // IID623
+    0x62, 0xf4, 0xfc, 0x18, 0xc1, 0xe2, 0x02,                                        // IID624
+    0x62, 0xdc, 0xe4, 0x1c, 0xc1, 0xe4, 0x10,                                        // IID625
+    0x62, 0xd4, 0xfc, 0x1c, 0xc1, 0xe7, 0x10,                                        // IID626
+    0x62, 0xd4, 0xe4, 0x18, 0xc1, 0xfc, 0x04,                                        // IID627
+    0x62, 0xf4, 0xfc, 0x18, 0xc1, 0xfb, 0x04,                                        // IID628
+    0x62, 0xf4, 0xf4, 0x14, 0xc1, 0xfa, 0x02,                                        // IID629
+    0x62, 0xdc, 0xfc, 0x1c, 0xc1, 0xff, 0x02,                                        // IID630
+    0x62, 0xf4, 0xd4, 0x10, 0xc1, 0xe3, 0x04,                                        // IID631
+    0x62, 0xdc, 0xfc, 0x18, 0xc1, 0xe0, 0x04,                                        // IID632
+    0x62, 0xd4, 0xa4, 0x14, 0xc1, 0xe5, 0x10,                                        // IID633
+    0x62, 0xdc, 0xfc, 0x1c, 0xc1, 0xe1, 0x10,                                        // IID634
+    0x62, 0xfc, 0xf4, 0x18, 0xc1, 0xee, 0x10,                                        // IID635
+    0x62, 0xd4, 0xfc, 0x18, 0xc1, 0xee, 0x10,                                        // IID636
+    0x62, 0xdc, 0xa4, 0x1c, 0xc1, 0xee, 0x04,                                        // IID637
+    0x62, 0xdc, 0xfc, 0x1c, 0xc1, 0xe8, 0x04,                                        // IID638
+    0x62, 0xfc, 0xdc, 0x10, 0x81, 0xeb, 0x00, 0x01, 0x00, 0x00,                      // IID639
+    0x62, 0xfc, 0xfc, 0x18, 0x81, 0xe9, 0x00, 0x01, 0x00, 0x00,                      // IID640
+    0x62, 0xdc, 0x84, 0x14, 0x81, 0xee, 0x00, 0x00, 0x01, 0x00,                      // IID641
+    0x62, 0xfc, 0xfc, 0x1c, 0x81, 0xea, 0x00, 0x00, 0x01, 0x00,                      // IID642
+    0x62, 0xd4, 0xec, 0x10, 0x81, 0xf3, 0x00, 0x10, 0x00, 0x00,                      // IID643
+    0x62, 0xd4, 0xfc, 0x18, 0x81, 0xf2, 0x00, 0x10, 0x00, 0x00,                      // IID644
+    0x62, 0xfc, 0xbc, 0x14, 0x81, 0xf2, 0x00, 0x00, 0x00, 0x10,                      // IID645
+    0x62, 0xf4, 0xfc, 0x1c, 0x81, 0xf3, 0x00, 0x00, 0x00, 0x10,                      // IID646
+    0x62, 0xfc, 0xac, 0x10, 0x81, 0xcd, 0x00, 0x00, 0x40, 0x00,                      // IID647
+    0x62, 0xd4, 0xfc, 0x18, 0x81, 0xc8, 0x00, 0x00, 0x40, 0x00,                      // IID648
+    0x62, 0xfc, 0xcc, 0x10, 0x81, 0xcd, 0x00, 0x00, 0x04, 0x00,                      // IID649
+    0x62, 0xdc, 0xfc, 0x18, 0x81, 0xcb, 0x00, 0x00, 0x04, 0x00,                      // IID650
+    0x62, 0xd4, 0xfc, 0x10, 0x81, 0xe8, 0x00, 0x00, 0x40, 0x00,                      // IID651
+    0x62, 0xf4, 0xfc, 0x18, 0x81, 0xea, 0x00, 0x00, 0x40, 0x00,                      // IID652
+    0x62, 0xdc, 0xdc, 0x14, 0x81, 0xef, 0x00, 0x00, 0x10, 0x00,                      // IID653
+    0x62, 0xfc, 0xfc, 0x1c, 0x81, 0xed, 0x00, 0x00, 0x10, 0x00,                      // IID654
+    0x62, 0x74, 0xd8, 0x10, 0x03, 0xb4, 0x01, 0xd9, 0x54, 0x66, 0x7c,                // IID655
+    0x62, 0xd4, 0x90, 0x14, 0x03, 0x8c, 0x3f, 0x2d, 0xf7, 0xb7, 0x45,                // IID656
+    0x62, 0xc4, 0xe0, 0x10, 0x23, 0x8c, 0x75, 0x6a, 0xe6, 0xf3, 0x8a,                // IID657
+    0x62, 0x5c, 0x90, 0x1c, 0x23, 0x84, 0x7f, 0x4e, 0x49, 0xee, 0xdd,                // IID658
+    0x62, 0x04, 0xa4, 0x18, 0x0b, 0xa4, 0xdd, 0xab, 0x13, 0x00, 0x5c,                // IID659
+    0x62, 0xec, 0xec, 0x1c, 0x0b, 0x94, 0x0a, 0x71, 0x7e, 0x55, 0x59,                // IID660
+    0x62, 0x7c, 0xa4, 0x10, 0xaf, 0x9e, 0xb7, 0x69, 0xb9, 0xd7,                      // IID661
+    0x62, 0x5c, 0xac, 0x1c, 0xaf, 0x88, 0x54, 0x1d, 0x69, 0x49,                      // IID662
+    0x62, 0x7c, 0xbc, 0x10, 0x2b, 0xa3, 0xaa, 0x29, 0xd5, 0x22,                      // IID663
+    0x62, 0x84, 0xdc, 0x14, 0x2b, 0x94, 0x91, 0xb8, 0x85, 0xb5, 0xd9,                // IID664
+    0x62, 0x14, 0xe0, 0x18, 0x33, 0x8c, 0x1e, 0x2f, 0xc0, 0x71, 0x0f,                // IID665
+    0x62, 0x14, 0xb4, 0x14, 0x33, 0xbc, 0x62, 0xbd, 0x67, 0x23, 0x73,                // IID666
+    0x62, 0x54, 0xa4, 0x18, 0x03, 0xca,                                              // IID667
+    0x62, 0x7c, 0xb4, 0x14, 0x03, 0xe8,                                              // IID668
+    0x62, 0xcc, 0xa5, 0x18, 0x66, 0xe9,                                              // IID669
+    0x62, 0xe4, 0xee, 0x18, 0x66, 0xe3,                                              // IID670
+    0x62, 0xcc, 0xb4, 0x10, 0x23, 0xea,                                              // IID671
+    0x62, 0x6c, 0xc4, 0x14, 0x23, 0xdd,                                              // IID672
+    0x62, 0x54, 0xac, 0x18, 0xaf, 0xd4,                                              // IID673
+    0x62, 0x7c, 0x84, 0x14, 0xaf, 0xe7,                                              // IID674
+    0x62, 0x44, 0xfc, 0x10, 0x0b, 0xee,                                              // IID675
+    0x62, 0x6c, 0xe4, 0x14, 0x0b, 0xc7,                                              // IID676
+    0x62, 0xc4, 0x8c, 0x18, 0x2b, 0xef,                                              // IID677
+    0x62, 0x5c, 0xb4, 0x14, 0x2b, 0xcd,                                              // IID678
+    0x62, 0x5c, 0xec, 0x18, 0x33, 0xd9,                                              // IID679
+    0x62, 0x7c, 0xe4, 0x14, 0x33, 0xd0,                                              // IID680
+    0x62, 0x6c, 0xbc, 0x18, 0x24, 0xff, 0x08,                                        // IID681
+    0x62, 0xe4, 0x84, 0x14, 0x24, 0xc3, 0x02,                                        // IID682
+    0x62, 0x54, 0xbc, 0x10, 0x2c, 0xca, 0x02,                                        // IID683
+    0x62, 0xcc, 0x9c, 0x14, 0x2c, 0xd2, 0x10,                                        // IID684
+    0x62, 0xec, 0xb4, 0x10, 0x40, 0xe0,                                              // IID685
+    0x62, 0xdc, 0xd4, 0x10, 0x41, 0xdc,                                              // IID686
+    0x62, 0xc4, 0xcc, 0x10, 0x42, 0xdd,                                              // IID687
+    0x62, 0xd4, 0x84, 0x18, 0x43, 0xd0,                                              // IID688
+    0x62, 0x54, 0xcc, 0x10, 0x44, 0xf4,                                              // IID689
+    0x62, 0x5c, 0xbc, 0x10, 0x45, 0xf0,                                              // IID690
+    0x62, 0xe4, 0x94, 0x18, 0x46, 0xeb,                                              // IID691
+    0x62, 0x44, 0xe4, 0x18, 0x47, 0xde,                                              // IID692
+    0x62, 0x6c, 0xbc, 0x10, 0x48, 0xd9,                                              // IID693
+    0x62, 0x4c, 0xd4, 0x10, 0x49, 0xdb,                                              // IID694
+    0x62, 0x5c, 0xa4, 0x10, 0x4a, 0xf0,                                              // IID695
+    0x62, 0x6c, 0x9c, 0x10, 0x4b, 0xee,                                              // IID696
+    0x62, 0x5c, 0x84, 0x18, 0x4c, 0xef,                                              // IID697
+    0x62, 0x5c, 0xd4, 0x10, 0x4d, 0xfe,                                              // IID698
+    0x62, 0x54, 0xdc, 0x10, 0x4e, 0xc5,                                              // IID699
+    0x62, 0x4c, 0x84, 0x10, 0x4f, 0xcb,                                              // IID700
+    0x62, 0x14, 0x84, 0x10, 0x40, 0xbc, 0x6e, 0xaa, 0x7a, 0x19, 0xf9,                // IID701
+    0x62, 0x0c, 0x9c, 0x18, 0x41, 0xa4, 0xfe, 0x9e, 0x3f, 0xa3, 0x3b,                // IID702
+    0x62, 0x04, 0xfc, 0x10, 0x42, 0x8c, 0x0c, 0xcd, 0xc4, 0x1f, 0xd7,                // IID703
+    0x62, 0x04, 0xb8, 0x18, 0x43, 0x9c, 0xc8, 0x6b, 0x42, 0xbd, 0xe1,                // IID704
+    0x62, 0xcc, 0xf4, 0x18, 0x44, 0xa4, 0x9b, 0x58, 0x3c, 0x82, 0x46,                // IID705
+    0x62, 0x7c, 0xe4, 0x18, 0x45, 0xa5, 0x38, 0x47, 0xca, 0xf9,                      // IID706
+    0x62, 0x9c, 0xc0, 0x10, 0x46, 0x9c, 0xd3, 0xc0, 0xbc, 0x22, 0x09,                // IID707
+    0x62, 0x7c, 0xb4, 0x10, 0x47, 0x8f, 0xec, 0x14, 0x2a, 0x0d,                      // IID708
+    0x62, 0xc4, 0xa4, 0x18, 0x48, 0x9b, 0x63, 0xa5, 0x46, 0xf0,                      // IID709
+    0x62, 0xcc, 0x90, 0x18, 0x49, 0x94, 0x1c, 0x7e, 0x9b, 0x6b, 0x71,                // IID710
+    0x62, 0xa4, 0xd0, 0x10, 0x4a, 0x84, 0x29, 0xe2, 0xbb, 0x0f, 0xa5,                // IID711
+    0x62, 0x2c, 0x98, 0x18, 0x4b, 0xbc, 0x14, 0xb1, 0x7f, 0x0b, 0x0e,                // IID712
+    0x62, 0x4c, 0x84, 0x18, 0x4c, 0x86, 0x4f, 0x7b, 0x3b, 0x2d,                      // IID713
+    0x62, 0x54, 0x98, 0x18, 0x4d, 0xbc, 0xae, 0x18, 0x51, 0xdd, 0xed,                // IID714
+    0x62, 0x6c, 0xe0, 0x18, 0x4e, 0xbc, 0x27, 0x96, 0xb2, 0x91, 0xf6,                // IID715
+    0x62, 0xd4, 0xec, 0x18, 0x4f, 0x94, 0xd2, 0x7c, 0xf1, 0x75, 0x38,                // IID716
 #endif // _LP64
   };
 
@@ -1623,73 +1739,75 @@
     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
+    10,   // IID257
+    7,    // IID258
+    7,    // IID259
+    7,    // IID260
+    7,    // IID261
+    10,   // IID262
+    10,   // IID263
+    10,   // IID264
+    10,   // IID265
+    10,   // IID266
+    10,   // IID267
+    10,   // IID268
+    10,   // IID269
     7,    // IID270
     7,    // IID271
     7,    // IID272
     7,    // IID273
     7,    // IID274
-    10,   // IID275
-    10,   // IID276
-    10,   // IID277
+    7,    // IID275
+    6,    // IID276
+    6,    // 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
+    7,    // IID279
+    7,    // IID280
+    7,    // IID281
+    6,    // IID282
+    6,    // IID283
+    7,    // IID284
+    7,    // IID285
+    7,    // IID286
+    7,    // IID287
+    6,    // IID288
+    6,    // IID289
+    7,    // IID290
+    7,    // IID291
+    7,    // IID292
+    7,    // IID293
+    7,    // IID294
+    7,    // IID295
+    10,   // IID296
+    10,   // IID297
+    10,   // IID298
+#endif // _LP64
+    10,   // IID299
+#ifdef _LP64
+    10,   // IID300
+    10,   // IID301
+    10,   // IID302
+    10,   // IID303
+    10,   // IID304
+    10,   // IID305
+    10,   // IID306
+    10,   // IID307
+    11,   // IID308
+    11,   // IID309
+    11,   // IID310
+    10,   // IID311
+    11,   // IID312
+    11,   // IID313
+    11,   // IID314
+    11,   // IID315
+    11,   // IID316
+    11,   // IID317
+    10,   // IID318
+    11,   // IID319
+    11,   // IID320
+    11,   // IID321
+    11,   // IID322
+    11,   // IID323
     6,    // IID324
     6,    // IID325
     6,    // IID326
@@ -1701,183 +1819,183 @@
     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
+    6,    // IID335
+    6,    // IID336
+    6,    // IID337
+    6,    // IID338
+    6,    // IID339
+    6,    // IID340
+    6,    // IID341
+    7,    // IID342
+    7,    // IID343
+    7,    // IID344
+    7,    // IID345
+    6,    // IID346
+    6,    // IID347
+    6,    // IID348
+    6,    // IID349
+    6,    // IID350
+    6,    // IID351
+    6,    // IID352
+    6,    // IID353
+    6,    // IID354
+    6,    // IID355
+    6,    // IID356
+    6,    // IID357
+    6,    // IID358
+    6,    // IID359
+    6,    // IID360
+    6,    // IID361
+    11,   // IID362
+    11,   // IID363
+    10,   // IID364
+    11,   // IID365
+    11,   // IID366
+    11,   // IID367
+    11,   // IID368
+    10,   // IID369
+    11,   // IID370
+    11,   // IID371
+    11,   // IID372
+    11,   // IID373
+    11,   // IID374
+    11,   // IID375
+    11,   // IID376
+    11,   // IID377
+    4,    // IID378
+    4,    // IID379
+    4,    // IID380
+    5,    // IID381
+    4,    // IID382
+    4,    // IID383
+    5,    // IID384
+    5,    // IID385
+    4,    // IID386
+    4,    // IID387
+    4,    // IID388
+    3,    // IID389
+    4,    // IID390
+    4,    // IID391
+    4,    // IID392
+    4,    // IID393
+    4,    // IID394
+    3,    // IID395
     9,    // IID396
     9,    // IID397
-    9,    // IID398
-    10,   // IID399
+    8,    // IID398
+    8,    // 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
+    9,    // IID403
+    11,   // IID404
+    13,   // IID405
+    12,   // IID406
+    10,   // IID407
+    10,   // IID408
+    13,   // IID409
+    9,    // IID410
+    10,   // IID411
+    10,   // IID412
+    12,   // IID413
+    13,   // IID414
+    13,   // IID415
+    9,    // IID416
+    9,    // IID417
+    9,    // IID418
+    10,   // IID419
+    9,    // IID420
     8,    // IID421
-    11,   // IID422
-    5,    // IID423
-    7,    // IID424
-    8,    // IID425
-    7,    // IID426
-    8,    // IID427
+    9,    // IID422
+    10,   // IID423
+    9,    // IID424
+    9,    // IID425
+    10,   // IID426
+    9,    // IID427
     9,    // IID428
     9,    // IID429
-    9,    // IID430
-    9,    // IID431
+    10,   // IID430
+    8,    // 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,    // IID433
+    4,    // IID434
+    7,    // IID435
+    8,    // IID436
+    4,    // IID437
+    4,    // IID438
+    5,    // IID439
+    5,    // IID440
+    4,    // IID441
+    5,    // IID442
+    8,    // IID443
+    5,    // IID444
+    5,    // IID445
+    8,    // IID446
+    8,    // IID447
+    7,    // IID448
+    11,   // IID449
+    5,    // IID450
+    8,    // IID451
+    8,    // IID452
+    8,    // IID453
+    9,    // IID454
+    9,    // IID455
+    9,    // IID456
+    9,    // IID457
+    9,    // IID458
+    9,    // IID459
     8,    // IID460
-    9,    // IID461
+    8,    // IID461
     9,    // IID462
     9,    // IID463
-    9,    // IID464
+    8,    // 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
+    9,    // IID467
+    9,    // IID468
+    9,    // IID469
+    3,    // IID470
+    4,    // IID471
+    4,    // IID472
+    3,    // IID473
+    3,    // IID474
+    3,    // IID475
+    4,    // IID476
+    4,    // IID477
+    4,    // IID478
+    4,    // IID479
+    3,    // IID480
+    3,    // IID481
+    3,    // IID482
+    3,    // IID483
+    4,    // IID484
+    3,    // IID485
+    3,    // IID486
+    9,    // IID487
+    9,    // IID488
+    9,    // IID489
+    9,    // IID490
+    9,    // IID491
+    8,    // IID492
+    8,    // IID493
+    9,    // IID494
+    12,   // IID495
+    5,    // IID496
+    5,    // IID497
+    5,    // 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
+    9,    // IID503
+    9,    // IID504
+    9,    // IID505
+    9,    // IID506
+    4,    // IID507
+    4,    // IID508
+    4,    // IID509
+    4,    // IID510
+    8,    // IID511
     6,    // IID512
     6,    // IID513
     6,    // IID514
@@ -1886,147 +2004,203 @@
     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,   // IID520
+    11,   // IID521
+    6,    // IID522
+    6,    // IID523
+    6,    // IID524
+    6,    // IID525
+    6,    // IID526
+    6,    // IID527
+    6,    // IID528
+    6,    // IID529
+    6,    // IID530
+    6,    // IID531
+    6,    // IID532
+    6,    // IID533
+    6,    // IID534
+    6,    // IID535
+    6,    // IID536
+    6,    // IID537
+    6,    // IID538
+    6,    // IID539
+    6,    // IID540
+    6,    // IID541
+    6,    // IID542
+    6,    // IID543
+    6,    // IID544
+    6,    // IID545
+    6,    // IID546
+    6,    // IID547
+    6,    // 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,   // IID551
+    10,   // IID552
+    11,   // IID553
+    11,   // IID554
+    11,   // IID555
+    11,   // IID556
+    10,   // IID557
+    11,   // IID558
+    11,   // IID559
+    11,   // IID560
+    11,   // IID561
+    11,   // IID562
+    11,   // IID563
+    11,   // IID564
+    11,   // IID565
+    10,   // IID566
+    11,   // IID567
+    11,   // IID568
+    11,   // IID569
+    11,   // IID570
+    11,   // IID571
+    11,   // IID572
+    11,   // IID573
+    11,   // 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
+    11,   // IID576
+    11,   // IID577
+    11,   // IID578
+    14,   // IID579
+    15,   // IID580
+    15,   // IID581
+    15,   // IID582
+    12,   // IID583
+    12,   // IID584
+    15,   // IID585
+    15,   // IID586
+    12,   // IID587
+    12,   // IID588
+    12,   // IID589
+    12,   // IID590
+    12,   // IID591
+    12,   // IID592
+    12,   // IID593
+    14,   // IID594
+    15,   // IID595
+    12,   // IID596
     10,   // IID597
     10,   // IID598
-    11,   // IID599
-    11,   // IID600
-    11,   // IID601
-    11,   // IID602
-    11,   // IID603
-    11,   // IID604
-    11,   // IID605
-    11,   // IID606
-    11,   // IID607
+    10,   // IID599
+    10,   // IID600
+    10,   // IID601
+    10,   // IID602
+    10,   // IID603
+    10,   // IID604
+    10,   // IID605
+    10,   // IID606
+    10,   // 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
+    10,   // IID611
+    10,   // IID612
+    7,    // IID613
+    7,    // IID614
+    7,    // IID615
+    7,    // IID616
+    7,    // IID617
+    7,    // IID618
+    7,    // IID619
+    7,    // IID620
+    7,    // IID621
+    7,    // IID622
+    7,    // IID623
+    7,    // 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
+    7,    // IID629
+    7,    // IID630
+    7,    // IID631
+    7,    // IID632
+    7,    // IID633
+    7,    // IID634
+    7,    // IID635
+    7,    // IID636
+    7,    // IID637
+    7,    // IID638
+    10,   // IID639
+    10,   // IID640
+    10,   // IID641
+    10,   // IID642
+    10,   // IID643
+    10,   // IID644
+    10,   // IID645
+    10,   // IID646
+    10,   // IID647
+    10,   // IID648
+    10,   // IID649
+    10,   // IID650
+    10,   // IID651
+    10,   // IID652
     10,   // IID653
-    11,   // IID654
-    10,   // IID655
-    10,   // IID656
+    10,   // IID654
+    11,   // IID655
+    11,   // IID656
     11,   // IID657
     11,   // IID658
     11,   // IID659
-    10,   // IID660
+    11,   // IID660
+    10,   // IID661
+    10,   // IID662
+    10,   // IID663
+    11,   // IID664
+    11,   // IID665
+    11,   // IID666
+    6,    // IID667
+    6,    // IID668
+    6,    // IID669
+    6,    // IID670
+    6,    // IID671
+    6,    // IID672
+    6,    // IID673
+    6,    // IID674
+    6,    // IID675
+    6,    // IID676
+    6,    // IID677
+    6,    // IID678
+    6,    // IID679
+    6,    // IID680
+    7,    // IID681
+    7,    // IID682
+    7,    // IID683
+    7,    // IID684
+    6,    // IID685
+    6,    // IID686
+    6,    // IID687
+    6,    // IID688
+    6,    // IID689
+    6,    // IID690
+    6,    // IID691
+    6,    // IID692
+    6,    // IID693
+    6,    // IID694
+    6,    // IID695
+    6,    // IID696
+    6,    // IID697
+    6,    // IID698
+    6,    // IID699
+    6,    // IID700
+    11,   // IID701
+    11,   // IID702
+    11,   // IID703
+    11,   // IID704
+    11,   // IID705
+    10,   // IID706
+    11,   // IID707
+    10,   // IID708
+    10,   // IID709
+    11,   // IID710
+    11,   // IID711
+    11,   // IID712
+    10,   // IID713
+    11,   // IID714
+    11,   // IID715
+    11,   // IID716
 #endif // _LP64
   };
 
@@ -2298,412 +2472,470 @@
     "__ 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
+    "__ eaddl(rax, r11, 65536, false);",                                                  // IID255
+    "__ eaddl(r24, r16, 268435456, true);",                                               // IID256
+    "__ eaddl(rax, r18, 268435456, true);",                                               // IID257
+    "__ eandl(r29, r13, 1, false);",                                                      // IID258
+    "__ eandl(rax, r13, 1, false);",                                                      // IID259
+    "__ eandl(r31, r22, 1, true);",                                                       // IID260
+    "__ eandl(rax, r29, 1, true);",                                                       // IID261
+    "__ eimull(r23, r29, 65536, false);",                                                 // IID262
+    "__ eimull(rax, r15, 65536, false);",                                                 // IID263
+    "__ eimull(r21, r9, 268435456, true);",                                               // IID264
+    "__ eimull(rax, r15, 268435456, true);",                                              // IID265
+    "__ eorl(rdx, r18, 65536, false);",                                                   // IID266
+    "__ eorl(rax, r15, 65536, false);",                                                   // IID267
+    "__ eorl(r8, r9, 256, true);",                                                        // IID268
+    "__ eorl(rax, r27, 256, true);",                                                      // IID269
+    "__ ercll(r9, r15, 8);",                                                              // IID270
+    "__ ercll(rax, r18, 8);",                                                             // IID271
+    "__ eroll(r12, rbx, 16, false);",                                                     // IID272
+    "__ eroll(rax, r19, 16, false);",                                                     // IID273
+    "__ eroll(r10, r11, 16, true);",                                                      // IID274
+    "__ eroll(rax, r18, 16, true);",                                                      // IID275
+    "__ erorl(rdx, r14, 1, false);",                                                      // IID276
+    "__ erorl(rax, r22, 1, false);",                                                      // IID277
+    "__ erorl(r25, r31, 16, true);",                                                      // IID278
+    "__ erorl(rax, r19, 16, true);",                                                      // IID279
+    "__ esall(r9, r15, 2, false);",                                                       // IID280
+    "__ esall(rax, r13, 2, false);",                                                      // IID281
+    "__ esall(r21, r16, 1, true);",                                                       // IID282
+    "__ esall(rax, r21, 1, true);",                                                       // IID283
+    "__ esarl(r26, r23, 8, false);",                                                      // IID284
+    "__ esarl(rax, r28, 8, false);",                                                      // IID285
+    "__ esarl(r26, r14, 4, true);",                                                       // IID286
+    "__ esarl(rax, r10, 4, true);",                                                       // IID287
+    "__ eshll(r22, r9, 1, false);",                                                       // IID288
+    "__ eshll(rax, r18, 1, false);",                                                      // IID289
+    "__ eshll(r30, r24, 16, true);",                                                      // IID290
+    "__ eshll(rax, r23, 16, true);",                                                      // IID291
+    "__ eshrl(r11, r8, 16, false);",                                                      // IID292
+    "__ eshrl(rax, r16, 16, false);",                                                     // IID293
+    "__ eshrl(r11, r12, 8, true);",                                                       // IID294
+    "__ eshrl(rax, r29, 8, true);",                                                       // IID295
+    "__ esubl(r16, r21, 1048576, false);",                                                // IID296
+    "__ esubl(rax, r15, 1048576, false);",                                                // IID297
+    "__ esubl(r9, r18, 16777216, true);",                                                 // IID298
+#endif // _LP64
+    "__ esubl(rax, rbx, 16777216, true);",                                                // IID299
+#ifdef _LP64
+    "__ exorl(r19, r23, 65536, false);",                                                  // IID300
+    "__ exorl(rax, r17, 65536, false);",                                                  // IID301
+    "__ exorl(r29, r18, 1048576, true);",                                                 // IID302
+    "__ exorl(rax, r14, 1048576, true);",                                                 // IID303
+    "__ esubl_imm32(r19, r15, 16777216, false);",                                         // IID304
+    "__ esubl_imm32(rax, r27, 16777216, false);",                                         // IID305
+    "__ esubl_imm32(r23, r27, 1073741824, true);",                                        // IID306
+    "__ esubl_imm32(rax, r23, 1073741824, true);",                                        // IID307
+    "__ eaddl(r8, r12, Address(r28, r24, (Address::ScaleFactor)3, -0x6d6d7e68), false);", // IID308
+    "__ eaddl(r24, r13, Address(r24, r25, (Address::ScaleFactor)3, +0x784673fd), true);", // IID309
+    "__ eandl(r24, r21, Address(r8, r13, (Address::ScaleFactor)2, -0x63663889), false);", // IID310
+    "__ eandl(r12, r24, Address(r30, -0x67526556), true);",                               // IID311
+    "__ eimull(r13, r13, Address(rbx, r25, (Address::ScaleFactor)2, -0x5f394dd9), false);", // IID312
+    "__ eimull(r26, r25, Address(r25, rdx, (Address::ScaleFactor)3, -0x2e39f79a), true);", // IID313
+    "__ eorl(r28, r8, Address(rdx, r24, (Address::ScaleFactor)3, -0xed99a54), false);",   // IID314
+    "__ eorl(r31, r22, Address(r30, r20, (Address::ScaleFactor)3, +0x3ac41cbd), true);",  // IID315
+    "__ esubl(r24, r30, Address(r13, r17, (Address::ScaleFactor)1, +0x1efdc2e3), false);", // IID316
+    "__ esubl(r16, r16, Address(r9, r15, (Address::ScaleFactor)1, +0x769feb34), true);",  // IID317
+    "__ exorl(r19, r25, Address(r10, +0x2239b429), false);",                              // IID318
+    "__ exorl(r25, r19, Address(r16, r24, (Address::ScaleFactor)1, +0x1c71faea), true);", // IID319
+    "__ exorb(r19, r10, Address(r28, -0x299a0cfd), false);",                              // IID320
+    "__ exorb(rbx, r28, Address(r23, r24, (Address::ScaleFactor)1, -0x5d78ddd9), true);", // IID321
+    "__ exorw(r10, r9, Address(r13, r30, (Address::ScaleFactor)2, +0x11151188), false);", // IID322
+    "__ exorw(r16, r17, Address(rdx, r31, (Address::ScaleFactor)0, +0x61936ce7), true);", // IID323
+    "__ eaddl(r13, rbx, r28, false);",                                                    // IID324
+    "__ eaddl(rbx, r29, r22, true);",                                                     // IID325
+    "__ eandl(rbx, r8, r8, false);",                                                      // IID326
+    "__ eandl(r11, r16, r13, true);",                                                     // IID327
+    "__ eimull(r12, r15, r17, false);",                                                   // IID328
+    "__ eimull(r23, r31, r20, true);",                                                    // IID329
+    "__ eorw(r22, r26, r10, false);",                                                     // IID330
+    "__ eorw(r25, r19, r11, true);",                                                      // IID331
+    "__ eorl(r19, r30, r8, false);",                                                      // IID332
+    "__ eorl(r12, r10, rdx, true);",                                                      // IID333
+    "__ eshldl(r22, r20, r30, false);",                                                   // IID334
+    "__ eshldl(r18, r19, r18, true);",                                                    // IID335
+    "__ eshrdl(r25, r18, rcx, false);",                                                   // IID336
+    "__ eshrdl(r19, r16, r25, true);",                                                    // IID337
+    "__ esubl(r11, r31, r24, false);",                                                    // IID338
+    "__ esubl(r14, r30, r16, true);",                                                     // IID339
+    "__ exorl(r9, r11, r26, false);",                                                     // IID340
+    "__ exorl(r27, rdx, r31, true);",                                                     // IID341
+    "__ eshldl(r29, r10, rcx, 16, false);",                                               // IID342
+    "__ eshldl(r15, r23, r17, 16, true);",                                                // IID343
+    "__ eshrdl(r27, r13, r15, 8, false);",                                                // IID344
+    "__ eshrdl(r15, r29, r26, 16, true);",                                                // IID345
+    "__ ecmovl (Assembler::Condition::overflow, r18, r9, r9);",                           // IID346
+    "__ ecmovl (Assembler::Condition::noOverflow, r22, r30, r23);",                       // IID347
+    "__ ecmovl (Assembler::Condition::below, r11, r20, r11);",                            // IID348
+    "__ ecmovl (Assembler::Condition::aboveEqual, rbx, r28, r16);",                       // IID349
+    "__ ecmovl (Assembler::Condition::zero, r20, r17, r24);",                             // IID350
+    "__ ecmovl (Assembler::Condition::notZero, r22, r16, r15);",                          // IID351
+    "__ ecmovl (Assembler::Condition::belowEqual, r15, r28, r29);",                       // IID352
+    "__ ecmovl (Assembler::Condition::above, r16, r25, r25);",                            // IID353
+    "__ ecmovl (Assembler::Condition::negative, r17, r13, r17);",                         // IID354
+    "__ ecmovl (Assembler::Condition::positive, r23, rbx, r30);",                         // IID355
+    "__ ecmovl (Assembler::Condition::parity, r15, r22, r11);",                           // IID356
+    "__ ecmovl (Assembler::Condition::noParity, r27, rdx, r22);",                         // IID357
+    "__ ecmovl (Assembler::Condition::less, r9, r17, r28);",                              // IID358
+    "__ ecmovl (Assembler::Condition::greaterEqual, r24, r11, r26);",                     // IID359
+    "__ ecmovl (Assembler::Condition::lessEqual, r12, rcx, rbx);",                        // IID360
+    "__ ecmovl (Assembler::Condition::greater, r28, r22, r22);",                          // IID361
+    "__ ecmovl (Assembler::Condition::overflow, r10, r14, Address(rcx, r17, (Address::ScaleFactor)3, -0x7857b23d));", // IID362
+    "__ ecmovl (Assembler::Condition::noOverflow, r17, r12, Address(r26, r24, (Address::ScaleFactor)3, +0x10642223));", // IID363
+    "__ ecmovl (Assembler::Condition::below, r26, r8, Address(r31, -0xb2d2be4));",        // IID364
+    "__ ecmovl (Assembler::Condition::aboveEqual, r12, r20, Address(r12, r22, (Address::ScaleFactor)2, -0x667ff72b));", // IID365
+    "__ ecmovl (Assembler::Condition::zero, r22, r9, Address(r27, r23, (Address::ScaleFactor)2, +0x66ce4d22));", // IID366
+    "__ ecmovl (Assembler::Condition::notZero, r12, r8, Address(r30, r27, (Address::ScaleFactor)3, -0x2b9676e1));", // IID367
+    "__ ecmovl (Assembler::Condition::belowEqual, r17, r20, Address(r9, r30, (Address::ScaleFactor)3, -0x351022df));", // IID368
+    "__ ecmovl (Assembler::Condition::above, rdx, r8, Address(r14, +0x3d6b7a59));",       // IID369
+    "__ ecmovl (Assembler::Condition::negative, rcx, r31, Address(r11, r14, (Address::ScaleFactor)2, +0x2cd585f2));", // IID370
+    "__ ecmovl (Assembler::Condition::positive, r25, r18, Address(r24, r11, (Address::ScaleFactor)2, -0x3f699c34));", // IID371
+    "__ ecmovl (Assembler::Condition::parity, r18, r8, Address(r19, r17, (Address::ScaleFactor)2, -0x390da4c5));", // IID372
+    "__ ecmovl (Assembler::Condition::noParity, r11, r29, Address(r29, rdx, (Address::ScaleFactor)2, +0x3a94a93f));", // IID373
+    "__ ecmovl (Assembler::Condition::less, r13, r29, Address(r15, r23, (Address::ScaleFactor)1, +0x76d43532));", // IID374
+    "__ ecmovl (Assembler::Condition::greaterEqual, r15, r12, Address(r13, r9, (Address::ScaleFactor)1, +0x16f7a5b));", // IID375
+    "__ ecmovl (Assembler::Condition::lessEqual, r9, rdx, Address(r17, r23, (Address::ScaleFactor)1, +0x43b6bfe1));", // IID376
+    "__ ecmovl (Assembler::Condition::greater, r28, r20, Address(r24, r10, (Address::ScaleFactor)0, -0x326e802f));", // IID377
+    "__ adcq(r27, rcx);",                                                                 // IID378
+    "__ cmpq(r22, r15);",                                                                 // IID379
+    "__ imulq(r31, r30);",                                                                // IID380
+    "__ popcntq(r19, r19);",                                                              // IID381
+    "__ sbbq(r26, r21);",                                                                 // IID382
+    "__ subq(r14, r26);",                                                                 // IID383
+    "__ tzcntq(r20, r15);",                                                               // IID384
+    "__ lzcntq(r12, r13);",                                                               // IID385
+    "__ addq(r23, r28);",                                                                 // IID386
+    "__ andq(r20, r20);",                                                                 // IID387
+    "__ orq(r24, r11);",                                                                  // IID388
+    "__ xorq(r10, r15);",                                                                 // IID389
+    "__ movq(r19, r20);",                                                                 // IID390
+    "__ bsfq(r23, r15);",                                                                 // IID391
+    "__ bsrq(r26, r19);",                                                                 // IID392
+    "__ btq(r24, r23);",                                                                  // IID393
+    "__ xchgq(r28, r11);",                                                                // IID394
+    "__ testq(r13, r13);",                                                                // IID395
+    "__ addq(Address(r31, r23, (Address::ScaleFactor)3, +0x59da0437), rdx);",             // IID396
+    "__ andq(Address(r21, r20, (Address::ScaleFactor)3, +0x6fd0d557), r27);",             // IID397
+    "__ cmpq(Address(r21, +0x23ef6744), r11);",                                           // IID398
+    "__ orq(Address(r10, rcx, (Address::ScaleFactor)3, +0x7e8544ab), rcx);",              // IID399
+    "__ xorq(Address(rcx, r24, (Address::ScaleFactor)3, -0x79ca4889), rbx);",             // IID400
+    "__ subq(Address(r27, r31, (Address::ScaleFactor)0, +0x11f85f9a), r27);",             // IID401
+    "__ movq(Address(r20, r16, (Address::ScaleFactor)3, +0x72158dda), r17);",             // IID402
+    "__ xaddq(Address(r29, r9, (Address::ScaleFactor)2, +0x6e8febd1), r12);",             // IID403
+    "__ andq(Address(r15, -0x47c94ecd), 268435456);",                                     // IID404
+    "__ addq(Address(r23, r19, (Address::ScaleFactor)1, +0x32bfde3f), 256);",             // IID405
+    "__ cmpq(Address(r15, r11, (Address::ScaleFactor)3, +0x548e7560), 4096);",            // IID406
+    "__ sarq(Address(r20, r14, (Address::ScaleFactor)1, +0x1b43fc34), 2);",               // IID407
+    "__ salq(Address(r26, r21, (Address::ScaleFactor)0, -0x3bae50c3), 8);",               // IID408
+    "__ sbbq(Address(r22, r10, (Address::ScaleFactor)3, +0x47e1403), 65536);",            // IID409
+    "__ shrq(Address(rcx, rdx, (Address::ScaleFactor)2, +0x7ea3924d), 16);",              // IID410
+    "__ subq(Address(rcx, r26, (Address::ScaleFactor)3, -0x356ea53e), 16);",              // IID411
+    "__ xorq(Address(r30, r26, (Address::ScaleFactor)2, +0x78a12f5c), 16);",              // IID412
+    "__ orq(Address(r11, r10, (Address::ScaleFactor)1, +0x3713b5b5), 268435456);",        // IID413
+    "__ movq(Address(r30, r30, (Address::ScaleFactor)3, +0x2541a10), 65536);",            // IID414
+    "__ testq(Address(r16, r15, (Address::ScaleFactor)3, +0x558e3251), -16);",            // IID415
+    "__ addq(r27, Address(r8, r10, (Address::ScaleFactor)2, +0x635f732d));",              // IID416
+    "__ andq(r21, Address(r12, r31, (Address::ScaleFactor)0, -0x75e8c4a0));",             // IID417
+    "__ cmpq(r18, Address(r19, r16, (Address::ScaleFactor)2, -0x120ae81e));",             // IID418
+    "__ lzcntq(rbx, Address(r31, r30, (Address::ScaleFactor)0, +0x1ec3265d));",           // IID419
+    "__ orq(r16, Address(rdx, r26, (Address::ScaleFactor)0, +0x3586831b));",              // IID420
+    "__ adcq(r12, Address(r18, -0x3c3e9f7a));",                                           // IID421
+    "__ imulq(rcx, Address(r8, r21, (Address::ScaleFactor)3, +0x6b1515ab));",             // IID422
+    "__ popcntq(r29, Address(rcx, r23, (Address::ScaleFactor)2, +0x4ff06c4d));",          // IID423
+    "__ sbbq(r26, Address(r24, r10, (Address::ScaleFactor)1, -0x75d9a189));",             // IID424
+    "__ subq(r17, Address(rbx, rbx, (Address::ScaleFactor)0, +0x4033d59c));",             // IID425
+    "__ tzcntq(r18, Address(r22, r12, (Address::ScaleFactor)3, -0x3893347d));",           // IID426
+    "__ xorq(r12, Address(r20, r23, (Address::ScaleFactor)3, +0x4b311560));",             // IID427
+    "__ movq(r29, Address(r10, r28, (Address::ScaleFactor)2, +0x5c3a2657));",             // IID428
+    "__ leaq(r22, Address(r13, r25, (Address::ScaleFactor)3, +0x1a3d6f3f));",             // IID429
+    "__ cvttsd2siq(r25, Address(r17, r24, (Address::ScaleFactor)3, -0x35addbd8));",       // IID430
+    "__ xchgq(r18, Address(r25, +0x632184c3));",                                          // IID431
+    "__ testq(r29, Address(r18, r13, (Address::ScaleFactor)1, -0x5039fd8a));",            // IID432
+    "__ addq(r20, 4096);",                                                                // IID433
+    "__ andq(r9, 16);",                                                                   // IID434
+    "__ adcq(rdx, 256);",                                                                 // IID435
+    "__ cmpq(r22, 16777216);",                                                            // IID436
+    "__ rclq(r17, 1);",                                                                   // IID437
+    "__ rcrq(r31, 1);",                                                                   // IID438
+    "__ rolq(r27, 4);",                                                                   // IID439
+    "__ rorq(r28, 2);",                                                                   // IID440
+    "__ sarq(rcx, 16);",                                                                  // IID441
+    "__ salq(r31, 8);",                                                                   // IID442
+    "__ sbbq(r27, 1048576);",                                                             // IID443
+    "__ shlq(r20, 16);",                                                                  // IID444
+    "__ shrq(r31, 8);",                                                                   // IID445
+    "__ subq(r27, 1048576);",                                                             // IID446
+    "__ xorq(r22, 4096);",                                                                // IID447
+    "__ movq(r8, 4096);",                                                                 // IID448
+    "__ mov64(r28, 1099511627776);",                                                      // IID449
+    "__ btq(r13, 1);",                                                                    // IID450
+    "__ testq(r16, -1048576);",                                                           // IID451
+    "__ orq_imm32(r20, 262144);",                                                         // IID452
+    "__ subq_imm32(r18, 1048576);",                                                       // IID453
+    "__ cmovq(Assembler::Condition::overflow, rbx, Address(r29, r8, (Address::ScaleFactor)0, +0x1d022615));", // IID454
+    "__ cmovq(Assembler::Condition::noOverflow, rdx, Address(r12, r28, (Address::ScaleFactor)1, -0x34c898e2));", // IID455
+    "__ cmovq(Assembler::Condition::below, r27, Address(r10, rcx, (Address::ScaleFactor)3, -0x1ef7abf1));", // IID456
+    "__ cmovq(Assembler::Condition::aboveEqual, r14, Address(r13, r29, (Address::ScaleFactor)2, -0x7c4c8369));", // IID457
+    "__ cmovq(Assembler::Condition::zero, r15, Address(r23, rcx, (Address::ScaleFactor)2, -0x6bd22ccf));", // IID458
+    "__ cmovq(Assembler::Condition::notZero, r24, Address(r15, r10, (Address::ScaleFactor)1, -0x7ffb3d09));", // IID459
+    "__ cmovq(Assembler::Condition::belowEqual, r23, Address(r11, +0x276a863b));",        // IID460
+    "__ cmovq(Assembler::Condition::above, r28, Address(r29, +0x3fb4396e));",             // IID461
+    "__ cmovq(Assembler::Condition::negative, r26, Address(r27, rcx, (Address::ScaleFactor)3, +0x4ddea61c));", // IID462
+    "__ cmovq(Assembler::Condition::positive, r10, Address(r22, r19, (Address::ScaleFactor)1, +0x2a126966));", // IID463
+    "__ cmovq(Assembler::Condition::parity, r12, Address(r10, +0x3d7c59f));",             // IID464
+    "__ cmovq(Assembler::Condition::noParity, r10, Address(r8, r8, (Address::ScaleFactor)3, -0xe61862d));", // IID465
+    "__ cmovq(Assembler::Condition::less, r23, Address(r29, -0x777ed96d));",              // IID466
+    "__ cmovq(Assembler::Condition::greaterEqual, rcx, Address(rbx, r19, (Address::ScaleFactor)1, +0x53c601cb));", // IID467
+    "__ cmovq(Assembler::Condition::lessEqual, r14, Address(r17, rbx, (Address::ScaleFactor)0, -0x768bf073));", // IID468
+    "__ cmovq(Assembler::Condition::greater, r29, Address(r10, r19, (Address::ScaleFactor)1, +0x30c98d3c));", // IID469
+    "__ call(r10);",                                                                      // IID470
+    "__ divq(r16);",                                                                      // IID471
+    "__ idivq(r27);",                                                                     // IID472
+    "__ imulq(r9);",                                                                      // IID473
+    "__ mulq(r13);",                                                                      // IID474
+    "__ negq(r14);",                                                                      // IID475
+    "__ notq(r18);",                                                                      // IID476
+    "__ rolq(r28);",                                                                      // IID477
+    "__ rorq(r28);",                                                                      // IID478
+    "__ sarq(r22);",                                                                      // IID479
+    "__ salq(r8);",                                                                       // IID480
+    "__ shlq(r12);",                                                                      // IID481
+    "__ shrq(rbx);",                                                                      // IID482
+    "__ incrementq(rcx);",                                                                // IID483
+    "__ decrementq(r23);",                                                                // IID484
+    "__ pushp(rcx);",                                                                     // IID485
+    "__ popp(r26);",                                                                      // IID486
+    "__ call(Address(r29, r10, (Address::ScaleFactor)0, +0x5655bc9f));",                  // IID487
+    "__ mulq(Address(rdx, r21, (Address::ScaleFactor)3, -0x6798a630));",                  // IID488
+    "__ negq(Address(r31, r24, (Address::ScaleFactor)0, -0x20071802));",                  // IID489
+    "__ sarq(Address(r21, rdx, (Address::ScaleFactor)2, -0x343cb9e5));",                  // IID490
+    "__ salq(Address(r20, r24, (Address::ScaleFactor)3, +0xa667574));",                   // IID491
+    "__ shrq(Address(r27, +0x76b77974));",                                                // IID492
+    "__ incrementq(Address(r25, -0x534e8d31));",                                          // IID493
+    "__ decrementq(Address(r20, -0x180d3ea1));",                                          // IID494
+    "__ imulq(r17, Address(r16, -0x2af2fd58), 4096);",                                    // IID495
+    "__ imulq(r28, r25, 16);",                                                            // IID496
+    "__ shldq(r27, r13, 16);",                                                            // IID497
+    "__ shrdq(r8, r10, 16);",                                                             // IID498
+    "__ pop2(r14, r8);",                                                                  // IID499
+    "__ pop2p(r18, rbx);",                                                                // IID500
+    "__ push2(r23, r19);",                                                                // IID501
+    "__ push2p(r12, rbx);",                                                               // IID502
+    "__ movzbq(r9, Address(r14, r23, (Address::ScaleFactor)3, -0x428d2646));",            // IID503
+    "__ movzwq(r28, Address(r9, rcx, (Address::ScaleFactor)2, -0x72611661));",            // IID504
+    "__ movsbq(rbx, Address(r24, r21, (Address::ScaleFactor)2, +0x3a6be990));",           // IID505
+    "__ movswq(r16, Address(r22, r10, (Address::ScaleFactor)0, +0x7ef8bdd));",            // IID506
+    "__ movzbq(r28, r14);",                                                               // IID507
+    "__ movzwq(r13, r28);",                                                               // IID508
+    "__ movsbq(r11, rdx);",                                                               // IID509
+    "__ movswq(r12, r26);",                                                               // IID510
+    "__ cmpxchgq(r20, Address(r10, -0xbd2a8da));",                                        // IID511
+    "__ eidivq(r15, false);",                                                             // IID512
+    "__ eidivq(r23, true);",                                                              // IID513
+    "__ edivq(r14, false);",                                                              // IID514
+    "__ edivq(r14, true);",                                                               // IID515
+    "__ eimulq(r15, false);",                                                             // IID516
+    "__ eimulq(r20, true);",                                                              // IID517
+    "__ emulq(rcx, false);",                                                              // IID518
+    "__ emulq(r21, true);",                                                               // IID519
+    "__ emulq(Address(r16, r10, (Address::ScaleFactor)3, +0x5f66ac1e), false);",          // IID520
+    "__ emulq(Address(r21, r22, (Address::ScaleFactor)3, -0xbbc807d), true);",            // IID521
+    "__ eimulq(r22, r26, false);",                                                        // IID522
+    "__ eimulq(r25, r21, true);",                                                         // IID523
+    "__ elzcntq(r20, r13, false);",                                                       // IID524
+    "__ elzcntq(r25, r19, true);",                                                        // IID525
+    "__ enegq(r21, r30, false);",                                                         // IID526
+    "__ enegq(r29, r11, true);",                                                          // IID527
+    "__ enotq(r22, r8);",                                                                 // IID528
+    "__ epopcntq(r12, r19, false);",                                                      // IID529
+    "__ epopcntq(r29, r23, true);",                                                       // IID530
+    "__ erolq(r28, r24, false);",                                                         // IID531
+    "__ erolq(rdx, r20, true);",                                                          // IID532
+    "__ erorq(rbx, r30, false);",                                                         // IID533
+    "__ erorq(r10, r15, true);",                                                          // IID534
+    "__ esalq(r17, r13, false);",                                                         // IID535
+    "__ esalq(r21, r24, true);",                                                          // IID536
+    "__ esarq(r31, r12, false);",                                                         // IID537
+    "__ esarq(rdx, r24, true);",                                                          // IID538
+    "__ edecq(r21, r24, false);",                                                         // IID539
+    "__ edecq(r15, r31, true);",                                                          // IID540
+    "__ eincq(r10, rbx, false);",                                                         // IID541
+    "__ eincq(r18, r8, true);",                                                           // IID542
+    "__ eshlq(r10, r26, false);",                                                         // IID543
+    "__ eshlq(r28, r14, true);",                                                          // IID544
+    "__ eshrq(r10, r19, false);",                                                         // IID545
+    "__ eshrq(r28, r21, true);",                                                          // IID546
+    "__ etzcntq(r21, r22, false);",                                                       // IID547
+    "__ etzcntq(r16, r23, true);",                                                        // IID548
+    "__ eimulq(r11, Address(r18, r9, (Address::ScaleFactor)2, -0x132285a1), false);",     // IID549
+    "__ eimulq(r13, Address(r24, r15, (Address::ScaleFactor)3, +0x48f50ca0), true);",     // IID550
+    "__ elzcntq(r9, Address(r13, +0x2115cf0e), false);",                                  // IID551
+    "__ elzcntq(r27, Address(r30, +0x49cabbb), true);",                                   // IID552
+    "__ enegq(r21, Address(r13, r31, (Address::ScaleFactor)2, +0x50a8f4d2), false);",     // IID553
+    "__ enegq(r22, Address(r18, r20, (Address::ScaleFactor)1, -0x5da0584c), true);",      // IID554
+    "__ epopcntq(r14, Address(rbx, r22, (Address::ScaleFactor)2, -0x606349d1), false);",  // IID555
+    "__ epopcntq(r26, Address(r23, r22, (Address::ScaleFactor)3, -0x72c66c23), true);",   // IID556
+    "__ esalq(r26, Address(r9, +0x334aba09), false);",                                    // IID557
+    "__ esalq(r9, Address(r9, r30, (Address::ScaleFactor)3, -0x219a6102), true);",        // IID558
+    "__ esarq(r25, Address(r20, -0x2131bab1), false);",                                   // IID559
+    "__ esarq(r16, Address(r28, r16, (Address::ScaleFactor)1, +0x48c483b9), true);",      // IID560
+    "__ edecq(r30, Address(r9, r16, (Address::ScaleFactor)0, -0x88ce84f), false);",       // IID561
+    "__ edecq(r11, Address(r30, r29, (Address::ScaleFactor)2, +0x3eeb8fd0), true);",      // IID562
+    "__ eincq(r26, Address(r29, r10, (Address::ScaleFactor)3, +0x3ef4822e), false);",     // IID563
+    "__ eincq(r29, Address(r19, r20, (Address::ScaleFactor)2, -0x3f0f3db9), true);",      // IID564
+    "__ eshrq(r8, Address(r30, r20, (Address::ScaleFactor)0, +0x15b56a17), false);",      // IID565
+    "__ eshrq(r26, Address(r11, -0x2de86561), true);",                                    // IID566
+    "__ etzcntq(r11, Address(rcx, r30, (Address::ScaleFactor)1, -0x32ffb1c2), false);",   // IID567
+    "__ etzcntq(r23, Address(r9, r12, (Address::ScaleFactor)1, -0x54823e69), true);",     // IID568
+    "__ eaddq(r20, Address(r13, rcx, (Address::ScaleFactor)3, -0x46116c0d), r15, false);", // IID569
+    "__ eaddq(r13, Address(r9, r23, (Address::ScaleFactor)1, -0x286c7605), r16, true);",  // IID570
+    "__ eandq(r21, Address(r30, r17, (Address::ScaleFactor)0, +0xf4e30b2), r29, false);", // IID571
+    "__ eandq(r30, Address(r17, r31, (Address::ScaleFactor)0, +0x3ab9dec4), r17, true);", // IID572
+    "__ eorq(r10, Address(r27, r30, (Address::ScaleFactor)1, -0x197f1266), r28, false);", // IID573
+    "__ eorq(r9, Address(r29, r30, (Address::ScaleFactor)0, -0x24ea9b08), r11, true);",   // IID574
+    "__ esubq(r15, Address(r14, -0x4f44bf90), r16, false);",                              // IID575
+    "__ esubq(rcx, Address(r21, r18, (Address::ScaleFactor)1, -0x11d0ac8f), r28, true);", // IID576
+    "__ exorq(r19, Address(r19, r18, (Address::ScaleFactor)0, -0xa5e55ec), r8, false);",  // IID577
+    "__ exorq(r28, Address(r17, r28, (Address::ScaleFactor)1, -0x6eb42fe0), r16, true);", // IID578
+    "__ eaddq(r17, Address(r18, -0x60ab1105), 16777216, false);",                         // IID579
+    "__ eaddq(r25, Address(r19, r25, (Address::ScaleFactor)0, +0x122444d9), 65536, true);", // IID580
+    "__ eandq(r30, Address(r9, r28, (Address::ScaleFactor)1, -0x25b00cf3), 4096, false);", // IID581
+    "__ eandq(r9, Address(r22, rbx, (Address::ScaleFactor)1, -0x7e465026), 268435456, true);", // IID582
+    "__ eimulq(r12, Address(r25, r25, (Address::ScaleFactor)1, -0x432d68cc), 1, false);", // IID583
+    "__ eimulq(r15, Address(r17, r31, (Address::ScaleFactor)3, -0x2b97565e), 16, true);", // IID584
+    "__ eorq(r28, Address(rdx, r31, (Address::ScaleFactor)0, +0x3f1363b1), 256, false);", // IID585
+    "__ eorq(r16, Address(r12, r23, (Address::ScaleFactor)3, -0x1785863c), 16777216, true);", // IID586
+    "__ esalq(r8, Address(r14, r24, (Address::ScaleFactor)2, -0x714290a5), 2, false);",   // IID587
+    "__ esalq(r8, Address(r15, r14, (Address::ScaleFactor)2, +0x21f13243), 16, true);",   // IID588
+    "__ esarq(r10, Address(r13, r29, (Address::ScaleFactor)0, +0x7d04cb72), 2, false);",  // IID589
+    "__ esarq(r11, Address(r21, r31, (Address::ScaleFactor)3, -0x2176b4dc), 8, true);",   // IID590
+    "__ eshrq(rcx, Address(r16, r12, (Address::ScaleFactor)1, +0x260c9a38), 4, false);",  // IID591
+    "__ eshrq(r22, Address(r26, r9, (Address::ScaleFactor)0, -0x5e56bb62), 8, true);",    // IID592
+    "__ esubq(r31, Address(rbx, r28, (Address::ScaleFactor)1, +0x2b00bb10), 1, false);",  // IID593
+    "__ esubq(r21, Address(r31, -0x6c10f4ad), 4096, true);",                              // IID594
+    "__ exorq(r11, Address(r23, r30, (Address::ScaleFactor)1, +0x51a6026b), 65536, false);", // IID595
+    "__ exorq(r14, Address(r27, r10, (Address::ScaleFactor)2, -0x34ad9bab), 16, true);",  // IID596
+    "__ eaddq(r20, r23, 16777216, false);",                                               // IID597
+    "__ eaddq(rax, r30, 16777216, false);",                                               // IID598
+    "__ eaddq(r9, r21, 4096, true);",                                                     // IID599
+    "__ eaddq(rax, rbx, 4096, true);",                                                    // IID600
+    "__ eandq(rdx, r21, 268435456, false);",                                              // IID601
+    "__ eandq(rax, r8, 268435456, false);",                                               // IID602
+    "__ eandq(r19, r31, 65536, true);",                                                   // IID603
+    "__ eandq(rax, rbx, 65536, true);",                                                   // IID604
+    "__ eimulq(r21, r9, 16777216, false);",                                               // IID605
+    "__ eimulq(rax, r30, 16777216, false);",                                              // IID606
+    "__ eimulq(r30, r18, 65536, true);",                                                  // IID607
+    "__ eimulq(rax, r19, 65536, true);",                                                  // IID608
+    "__ eorq(r20, r16, 1048576, false);",                                                 // IID609
+    "__ eorq(rax, r28, 1048576, false);",                                                 // IID610
+    "__ eorq(rbx, r24, 4096, true);",                                                     // IID611
+    "__ eorq(rax, r22, 4096, true);",                                                     // IID612
+    "__ erclq(r20, r30, 4);",                                                             // IID613
+    "__ erclq(rax, r22, 4);",                                                             // IID614
+    "__ erolq(rcx, r28, 2, false);",                                                      // IID615
+    "__ erolq(rax, r21, 2, false);",                                                      // IID616
+    "__ erolq(r26, r15, 4, true);",                                                       // IID617
+    "__ erolq(rax, r19, 4, true);",                                                       // IID618
+    "__ erorq(r24, r19, 8, false);",                                                      // IID619
+    "__ erorq(rax, r28, 8, false);",                                                      // IID620
+    "__ erorq(r25, r18, 4, true);",                                                       // IID621
+    "__ erorq(rax, r13, 4, true);",                                                       // IID622
+    "__ esalq(r27, r17, 2, false);",                                                      // IID623
+    "__ esalq(rax, rdx, 2, false);",                                                      // IID624
+    "__ esalq(rbx, r28, 16, true);",                                                      // IID625
+    "__ esalq(rax, r15, 16, true);",                                                      // IID626
+    "__ esarq(rbx, r12, 4, false);",                                                      // IID627
+    "__ esarq(rax, rbx, 4, false);",                                                      // IID628
+    "__ esarq(r17, rdx, 2, true);",                                                       // IID629
+    "__ esarq(rax, r31, 2, true);",                                                       // IID630
+    "__ eshlq(r21, rbx, 4, false);",                                                      // IID631
+    "__ eshlq(rax, r24, 4, false);",                                                      // IID632
+    "__ eshlq(r27, r13, 16, true);",                                                      // IID633
+    "__ eshlq(rax, r25, 16, true);",                                                      // IID634
+    "__ eshrq(rcx, r22, 16, false);",                                                     // IID635
+    "__ eshrq(rax, r14, 16, false);",                                                     // IID636
+    "__ eshrq(r11, r30, 4, true);",                                                       // IID637
+    "__ eshrq(rax, r24, 4, true);",                                                       // IID638
+    "__ esubq(r20, r19, 256, false);",                                                    // IID639
+    "__ esubq(rax, r17, 256, false);",                                                    // IID640
+    "__ esubq(r31, r30, 65536, true);",                                                   // IID641
+    "__ esubq(rax, r18, 65536, true);",                                                   // IID642
+    "__ exorq(r18, r11, 4096, false);",                                                   // IID643
+    "__ exorq(rax, r10, 4096, false);",                                                   // IID644
+    "__ exorq(r24, r18, 268435456, true);",                                               // IID645
+    "__ exorq(rax, rbx, 268435456, true);",                                               // IID646
+    "__ eorq_imm32(r26, r21, 4194304, false);",                                           // IID647
+    "__ eorq_imm32(rax, r8, 4194304, false);",                                            // IID648
+    "__ eorq_imm32(r22, r21, 262144, false);",                                            // IID649
+    "__ eorq_imm32(rax, r27, 262144, false);",                                            // IID650
+    "__ esubq_imm32(r16, r8, 4194304, false);",                                           // IID651
+    "__ esubq_imm32(rax, rdx, 4194304, false);",                                          // IID652
+    "__ esubq_imm32(r20, r31, 1048576, true);",                                           // IID653
+    "__ esubq_imm32(rax, r21, 1048576, true);",                                           // IID654
+    "__ eaddq(r20, r14, Address(rcx, r16, (Address::ScaleFactor)0, +0x7c6654d9), false);", // IID655
+    "__ eaddq(r29, rcx, Address(r15, r23, (Address::ScaleFactor)0, +0x45b7f72d), true);", // IID656
+    "__ eandq(r19, r17, Address(r13, r22, (Address::ScaleFactor)1, -0x750c1996), false);", // IID657
+    "__ eandq(r13, r8, Address(r31, r23, (Address::ScaleFactor)1, -0x2211b6b2), true);",  // IID658
+    "__ eorq(r11, r28, Address(r13, r11, (Address::ScaleFactor)3, +0x5c0013ab), false);", // IID659
+    "__ eorq(rdx, r18, Address(r18, rcx, (Address::ScaleFactor)0, +0x59557e71), true);",  // IID660
+    "__ eimulq(r27, r11, Address(r22, -0x28469649), false);",                             // IID661
+    "__ eimulq(r10, r9, Address(r24, +0x49691d54), true);",                               // IID662
+    "__ esubq(r24, r12, Address(r19, +0x22d529aa), false);",                              // IID663
+    "__ esubq(r20, r18, Address(r9, r10, (Address::ScaleFactor)2, -0x264a7a48), true);",  // IID664
+    "__ exorq(rbx, r9, Address(r14, r27, (Address::ScaleFactor)0, +0xf71c02f), false);",  // IID665
+    "__ exorq(r25, r15, Address(r10, r12, (Address::ScaleFactor)1, +0x732367bd), true);", // IID666
+    "__ eaddq(r11, r9, r10, false);",                                                     // IID667
+    "__ eaddq(r25, r13, r16, true);",                                                     // IID668
+    "__ eadcxq(r11, r21, r25);",                                                          // IID669
+    "__ eadoxq(rdx, r20, rbx);",                                                          // IID670
+    "__ eandq(r25, r21, r26, false);",                                                    // IID671
+    "__ eandq(r23, r27, r21, true);",                                                     // IID672
+    "__ eimulq(r10, r10, r12, false);",                                                   // IID673
+    "__ eimulq(r31, r12, r23, true);",                                                    // IID674
+    "__ eorq(r16, r29, r14, false);",                                                     // IID675
+    "__ eorq(r19, r24, r23, true);",                                                      // IID676
+    "__ esubq(r14, r21, r15, false);",                                                    // IID677
+    "__ esubq(r25, r9, r29, true);",                                                      // IID678
+    "__ exorq(rdx, r11, r25, false);",                                                    // IID679
+    "__ exorq(r19, r10, r16, true);",                                                     // IID680
+    "__ eshldq(r8, r23, r31, 8, false);",                                                 // IID681
+    "__ eshldq(r31, rbx, r16, 2, true);",                                                 // IID682
+    "__ eshrdq(r24, r10, r9, 2, false);",                                                 // IID683
+    "__ eshrdq(r28, r26, r18, 16, true);",                                                // IID684
+    "__ ecmovq (Assembler::Condition::overflow, r25, r20, r16);",                         // IID685
+    "__ ecmovq (Assembler::Condition::noOverflow, r21, rbx, r28);",                       // IID686
+    "__ ecmovq (Assembler::Condition::below, r22, r19, r13);",                            // IID687
+    "__ ecmovq (Assembler::Condition::aboveEqual, r15, rdx, r8);",                        // IID688
+    "__ ecmovq (Assembler::Condition::zero, r22, r14, r12);",                             // IID689
+    "__ ecmovq (Assembler::Condition::notZero, r24, r14, r24);",                          // IID690
+    "__ ecmovq (Assembler::Condition::belowEqual, r13, r21, rbx);",                       // IID691
+    "__ ecmovq (Assembler::Condition::above, rbx, r27, r14);",                            // IID692
+    "__ ecmovq (Assembler::Condition::negative, r24, r27, r17);",                         // IID693
+    "__ ecmovq (Assembler::Condition::positive, r21, r27, r27);",                         // IID694
+    "__ ecmovq (Assembler::Condition::parity, r27, r14, r24);",                           // IID695
+    "__ ecmovq (Assembler::Condition::noParity, r28, r29, r22);",                         // IID696
+    "__ ecmovq (Assembler::Condition::less, r15, r13, r31);",                             // IID697
+    "__ ecmovq (Assembler::Condition::greaterEqual, r21, r15, r30);",                     // IID698
+    "__ ecmovq (Assembler::Condition::lessEqual, r20, r8, r13);",                         // IID699
+    "__ ecmovq (Assembler::Condition::greater, r31, r25, r27);",                          // IID700
+    "__ ecmovq (Assembler::Condition::overflow, r31, r15, Address(r14, r13, (Address::ScaleFactor)1, -0x6e68556));", // IID701
+    "__ ecmovq (Assembler::Condition::noOverflow, r12, r28, Address(r30, r15, (Address::ScaleFactor)3, +0x3ba33f9e));", // IID702
+    "__ ecmovq (Assembler::Condition::below, r16, r25, Address(r12, r9, (Address::ScaleFactor)0, -0x28e03b33));", // IID703
+    "__ ecmovq (Assembler::Condition::aboveEqual, r8, r27, Address(r8, r25, (Address::ScaleFactor)3, -0x1e42bd95));", // IID704
+    "__ ecmovq (Assembler::Condition::zero, rcx, r20, Address(r27, rbx, (Address::ScaleFactor)2, +0x46823c58));", // IID705
+    "__ ecmovq (Assembler::Condition::notZero, rbx, r12, Address(r21, -0x635b8c8));",     // IID706
+    "__ ecmovq (Assembler::Condition::belowEqual, r23, rbx, Address(r27, r26, (Address::ScaleFactor)3, +0x922bcc0));", // IID707
+    "__ ecmovq (Assembler::Condition::above, r25, r9, Address(r23, +0xd2a14ec));",        // IID708
+    "__ ecmovq (Assembler::Condition::negative, r11, r19, Address(r11, -0xfb95a9d));",    // IID709
+    "__ ecmovq (Assembler::Condition::positive, r13, r18, Address(r28, r19, (Address::ScaleFactor)0, +0x716b9b7e));", // IID710
+    "__ ecmovq (Assembler::Condition::parity, r21, r16, Address(rcx, r29, (Address::ScaleFactor)0, -0x5af0441e));", // IID711
+    "__ ecmovq (Assembler::Condition::noParity, r12, r31, Address(r20, r26, (Address::ScaleFactor)0, +0xe0b7fb1));", // IID712
+    "__ ecmovq (Assembler::Condition::less, r15, r24, Address(r30, +0x2d3b7b4f));",       // IID713
+    "__ ecmovq (Assembler::Condition::greaterEqual, r12, r15, Address(r14, r21, (Address::ScaleFactor)2, -0x1222aee8));", // IID714
+    "__ ecmovq (Assembler::Condition::lessEqual, rbx, r31, Address(r23, r20, (Address::ScaleFactor)0, -0x96e4d6a));", // IID715
+    "__ ecmovq (Assembler::Condition::greater, rdx, rdx, Address(r10, rdx, (Address::ScaleFactor)3, +0x3875f17c));", // IID716
 #endif // _LP64
   };
 // END  Generated code -- do not edit
diff --git a/test/hotspot/gtest/x86/x86-asmtest.py b/test/hotspot/gtest/x86/x86-asmtest.py
index 318bc50f6ef..51932988fb2 100644
--- a/test/hotspot/gtest/x86/x86-asmtest.py
+++ b/test/hotspot/gtest/x86/x86-asmtest.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2024, 2025, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -57,7 +57,7 @@ shift_rot_ops = {'sarl', 'sarq', 'sall', 'salq', 'shll', 'shlq', 'shrl', 'shrq',
 
 registers_mapping = {
     # skip rax, rsi, rdi, rsp, rbp as they have special encodings
-    # 'rax': {64: 'rax', 32: 'eax', 16: 'ax', 8: 'al'},
+    'rax': {64: 'rax', 32: 'eax', 16: 'ax', 8: 'al'},
     'rcx': {64: 'rcx', 32: 'ecx', 16: 'cx', 8: 'cl'},
     'rdx': {64: 'rdx', 32: 'edx', 16: 'dx', 8: 'dl'},
     'rbx': {64: 'rbx', 32: 'ebx', 16: 'bx', 8: 'bl'},
@@ -415,7 +415,7 @@ class RegRegRegImmNddInstruction(NFInstruction):
         self.imm = Immediate().generate(imm)
         self.generate_operands(self.reg1, self.reg2, self.reg3, self.imm)
 
-test_regs = list(registers_mapping.keys())
+test_regs = [key for key in registers_mapping.keys() if key != 'rax']
 
 immediates32 = [2 ** i for i in range(0, 32, 4)]
 immediates16 = [2 ** i for i in range(0, 16, 2)]
@@ -624,6 +624,14 @@ 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)
 
+                # additional tests with rax as destination
+                if RegOp in [RegRegImmNddInstruction]:
+                    test_reg1 = 'rax'
+                    test_reg2 = random.choice(test_regs)
+                    lp64_flag = handle_lp64_flag(lp64_flag, print_lp64_flag, test_reg1, test_reg2)
+                    instr = RegOp(*op, reg1=test_reg1, reg2=test_reg2, imm=imm)
+                    print_instruction(instr, lp64_flag, print_lp64_flag)
+
         elif RegOp in [RegMemImmInstruction, RegMemImmNddInstruction]:
             if full_set:
                 imm_list = get_immediate_list(op_name, width)
@@ -1466,4 +1474,4 @@ if __name__ == "__main__":
     print("// END  Generated code -- do not edit")
 
     for f in ["x86ops.s", "x86ops.o", "x86ops.bin"]:
-        os.remove(f)
\ No newline at end of file
+        os.remove(f)

From a54445f789c7e37c03b28e07a7fdaa83672e3edc Mon Sep 17 00:00:00 2001
From: Dhamoder Nalla <dhanalla@openjdk.org>
Date: Mon, 24 Mar 2025 17:40:42 +0000
Subject: [PATCH 451/587] 8350609: Cleanup unknown unwind opcode (0xB) for
 windows

Reviewed-by: sviswanathan, epeter
---
 .../windows/native/libjsvml/jsvml_d_atan2_windows_x86.S   | 8 ++------
 .../windows/native/libjsvml/jsvml_d_cos_windows_x86.S     | 6 +-----
 .../windows/native/libjsvml/jsvml_d_cosh_windows_x86.S    | 6 +-----
 .../windows/native/libjsvml/jsvml_d_expm1_windows_x86.S   | 6 +-----
 .../windows/native/libjsvml/jsvml_d_hypot_windows_x86.S   | 6 +-----
 .../windows/native/libjsvml/jsvml_d_log1p_windows_x86.S   | 6 +-----
 .../windows/native/libjsvml/jsvml_d_pow_windows_x86.S     | 6 +-----
 .../windows/native/libjsvml/jsvml_d_sin_windows_x86.S     | 6 +-----
 .../windows/native/libjsvml/jsvml_d_sinh_windows_x86.S    | 6 +-----
 .../windows/native/libjsvml/jsvml_d_tan_windows_x86.S     | 6 +-----
 .../windows/native/libjsvml/jsvml_d_tanh_windows_x86.S    | 6 +-----
 .../windows/native/libjsvml/jsvml_s_atan2_windows_x86.S   | 8 ++------
 .../windows/native/libjsvml/jsvml_s_cos_windows_x86.S     | 6 +-----
 .../windows/native/libjsvml/jsvml_s_cosh_windows_x86.S    | 6 +-----
 .../windows/native/libjsvml/jsvml_s_expm1_windows_x86.S   | 6 +-----
 .../windows/native/libjsvml/jsvml_s_hypot_windows_x86.S   | 6 +-----
 .../windows/native/libjsvml/jsvml_s_log1p_windows_x86.S   | 6 +-----
 .../windows/native/libjsvml/jsvml_s_pow_windows_x86.S     | 6 +-----
 .../windows/native/libjsvml/jsvml_s_sin_windows_x86.S     | 6 +-----
 .../windows/native/libjsvml/jsvml_s_sinh_windows_x86.S    | 6 +-----
 .../windows/native/libjsvml/jsvml_s_tan_windows_x86.S     | 6 +-----
 .../windows/native/libjsvml/jsvml_s_tanh_windows_x86.S    | 6 +-----
 22 files changed, 24 insertions(+), 112 deletions(-)

diff --git a/src/jdk.incubator.vector/windows/native/libjsvml/jsvml_d_atan2_windows_x86.S b/src/jdk.incubator.vector/windows/native/libjsvml/jsvml_d_atan2_windows_x86.S
index d7571c1ac2c..734660e6d8f 100644
--- a/src/jdk.incubator.vector/windows/native/libjsvml/jsvml_d_atan2_windows_x86.S
+++ b/src/jdk.incubator.vector/windows/native/libjsvml/jsvml_d_atan2_windows_x86.S
@@ -2695,7 +2695,7 @@ _TEXT   ENDS
 
         ALIGN 004H
 _unwind___jsvml_atan28_ha_z0_B1_B10:
-        DD      1873409
+        DD      1611265
         DD      6018198
         DD      4614286
         DD      3569795
@@ -2707,8 +2707,6 @@ _unwind___jsvml_atan28_ha_z0_B1_B10:
         DD      5167169
         DD      5433398
         DD      4913195
-        DD      11356960
-        DD      11426583
         DD      11469067
 
 .xdata  ENDS
@@ -2725,7 +2723,7 @@ _unwind___jsvml_atan28_ha_z0_B1_B10:
 
         ALIGN 004H
 _unwind___jsvml_atan28_ha_z0_B12_B16:
-        DD      1604897
+        DD      1342753
         DD      3757181
         DD      3568754
         DD      3630184
@@ -2736,8 +2734,6 @@ _unwind___jsvml_atan28_ha_z0_B12_B16:
         DD      927797
         DD      1185834
         DD      1443871
-        DD      3439380
-        DD      3500811
         DD      imagerel _B7_1
         DD      imagerel _B7_12
         DD      imagerel _unwind___jsvml_atan28_ha_z0_B1_B10
diff --git a/src/jdk.incubator.vector/windows/native/libjsvml/jsvml_d_cos_windows_x86.S b/src/jdk.incubator.vector/windows/native/libjsvml/jsvml_d_cos_windows_x86.S
index d4d2d9c39b0..204f27e1e65 100644
--- a/src/jdk.incubator.vector/windows/native/libjsvml/jsvml_d_cos_windows_x86.S
+++ b/src/jdk.incubator.vector/windows/native/libjsvml/jsvml_d_cos_windows_x86.S
@@ -925,7 +925,7 @@ _unwind___jsvml_cos8_ha_z0_B1_B10:
 
         ALIGN 004H
 _unwind___jsvml_cos8_ha_z0_B12_B16:
-        DD      3470081
+        DD      2945793
         DD      8606963
         DD      8418537
         DD      8479967
@@ -945,10 +945,6 @@ _unwind___jsvml_cos8_ha_z0_B12_B16:
         DD      3311688
         DD      3569725
         DD      3827762
-        DD      8157991
-        DD      8219422
-        DD      8280853
-        DD      8342284
         DD      5183488
         DD      10343424
         DD      10944768
diff --git a/src/jdk.incubator.vector/windows/native/libjsvml/jsvml_d_cosh_windows_x86.S b/src/jdk.incubator.vector/windows/native/libjsvml/jsvml_d_cosh_windows_x86.S
index 7c1ceffa322..88063c2d29d 100644
--- a/src/jdk.incubator.vector/windows/native/libjsvml/jsvml_d_cosh_windows_x86.S
+++ b/src/jdk.incubator.vector/windows/native/libjsvml/jsvml_d_cosh_windows_x86.S
@@ -622,7 +622,7 @@ _unwind___jsvml_cosh8_ha_z0_B1_B9:
 
         ALIGN 004H
 _unwind___jsvml_cosh8_ha_z0_B11_B15:
-        DD      3472641
+        DD      2948353
         DD      9131261
         DD      8942834
         DD      9004264
@@ -643,10 +643,6 @@ _unwind___jsvml_cosh8_ha_z0_B11_B15:
         DD      3573831
         DD      3831868
         DD      4089905
-        DD      8682278
-        DD      8743709
-        DD      8805140
-        DD      8866571
         DD      10867712
         DD      10944768
 
diff --git a/src/jdk.incubator.vector/windows/native/libjsvml/jsvml_d_expm1_windows_x86.S b/src/jdk.incubator.vector/windows/native/libjsvml/jsvml_d_expm1_windows_x86.S
index b90c1d6e91d..c51859e0920 100644
--- a/src/jdk.incubator.vector/windows/native/libjsvml/jsvml_d_expm1_windows_x86.S
+++ b/src/jdk.incubator.vector/windows/native/libjsvml/jsvml_d_expm1_windows_x86.S
@@ -1690,7 +1690,7 @@ _unwind___jsvml_expm18_ha_z0_B1_B9:
 
         ALIGN 004H
 _unwind___jsvml_expm18_ha_z0_B11_B15:
-        DD      3472641
+        DD      2948353
         DD      9131261
         DD      8942834
         DD      9004264
@@ -1711,10 +1711,6 @@ _unwind___jsvml_expm18_ha_z0_B11_B15:
         DD      3573831
         DD      3831868
         DD      4089905
-        DD      8682278
-        DD      8743709
-        DD      8805140
-        DD      8866571
         DD      10867712
         DD      10944768
 
diff --git a/src/jdk.incubator.vector/windows/native/libjsvml/jsvml_d_hypot_windows_x86.S b/src/jdk.incubator.vector/windows/native/libjsvml/jsvml_d_hypot_windows_x86.S
index 1eabab18eac..ca57f741b20 100644
--- a/src/jdk.incubator.vector/windows/native/libjsvml/jsvml_d_hypot_windows_x86.S
+++ b/src/jdk.incubator.vector/windows/native/libjsvml/jsvml_d_hypot_windows_x86.S
@@ -1611,7 +1611,7 @@ _unwind___jsvml_hypot8_ha_z0_B1_B9:
 
         ALIGN 004H
 _unwind___jsvml_hypot8_ha_z0_B11_B15:
-        DD      3472641
+        DD      2948353
         DD      9131261
         DD      8942834
         DD      9004264
@@ -1632,10 +1632,6 @@ _unwind___jsvml_hypot8_ha_z0_B11_B15:
         DD      3573831
         DD      3831868
         DD      4089905
-        DD      8682278
-        DD      8743709
-        DD      8805140
-        DD      8866571
         DD      11392000
         DD      11469056
 
diff --git a/src/jdk.incubator.vector/windows/native/libjsvml/jsvml_d_log1p_windows_x86.S b/src/jdk.incubator.vector/windows/native/libjsvml/jsvml_d_log1p_windows_x86.S
index 585053f16b6..8e1b5321e0e 100644
--- a/src/jdk.incubator.vector/windows/native/libjsvml/jsvml_d_log1p_windows_x86.S
+++ b/src/jdk.incubator.vector/windows/native/libjsvml/jsvml_d_log1p_windows_x86.S
@@ -1861,7 +1861,7 @@ _unwind___jsvml_log1p8_ha_z0_B1_B9:
 
         ALIGN 004H
 _unwind___jsvml_log1p8_ha_z0_B11_B15:
-        DD      3472641
+        DD      2948353
         DD      9131261
         DD      8942834
         DD      9004264
@@ -1882,10 +1882,6 @@ _unwind___jsvml_log1p8_ha_z0_B11_B15:
         DD      3573831
         DD      3831868
         DD      4089905
-        DD      8682278
-        DD      8743709
-        DD      8805140
-        DD      8866571
         DD      10867712
         DD      10944768
 
diff --git a/src/jdk.incubator.vector/windows/native/libjsvml/jsvml_d_pow_windows_x86.S b/src/jdk.incubator.vector/windows/native/libjsvml/jsvml_d_pow_windows_x86.S
index 1cd2678a441..8087b969efc 100644
--- a/src/jdk.incubator.vector/windows/native/libjsvml/jsvml_d_pow_windows_x86.S
+++ b/src/jdk.incubator.vector/windows/native/libjsvml/jsvml_d_pow_windows_x86.S
@@ -610,7 +610,7 @@ _unwind___jsvml_pow8_ha_z0_B1_B9:
 
         ALIGN 004H
 _unwind___jsvml_pow8_ha_z0_B11_B15:
-        DD      3472641
+        DD      2948353
         DD      9131261
         DD      8942834
         DD      9004264
@@ -631,10 +631,6 @@ _unwind___jsvml_pow8_ha_z0_B11_B15:
         DD      3573831
         DD      3831868
         DD      4089905
-        DD      8682278
-        DD      8743709
-        DD      8805140
-        DD      8866571
         DD      11392000
         DD      11469056
 
diff --git a/src/jdk.incubator.vector/windows/native/libjsvml/jsvml_d_sin_windows_x86.S b/src/jdk.incubator.vector/windows/native/libjsvml/jsvml_d_sin_windows_x86.S
index 830dae1807d..c525afd26a5 100644
--- a/src/jdk.incubator.vector/windows/native/libjsvml/jsvml_d_sin_windows_x86.S
+++ b/src/jdk.incubator.vector/windows/native/libjsvml/jsvml_d_sin_windows_x86.S
@@ -3872,7 +3872,7 @@ _unwind___jsvml_sin8_ha_z0_B1_B10:
 
         ALIGN 004H
 _unwind___jsvml_sin8_ha_z0_B12_B16:
-        DD      2943009
+        DD      2418721
         DD      8082664
         DD      7894238
         DD      7955668
@@ -3891,10 +3891,6 @@ _unwind___jsvml_sin8_ha_z0_B12_B16:
         DD      3053640
         DD      3307581
         DD      3565618
-        DD      7633703
-        DD      7695134
-        DD      7756565
-        DD      7817996
         DD      imagerel _B9_1
         DD      imagerel _B9_12
         DD      imagerel _unwind___jsvml_sin8_ha_z0_B1_B10
diff --git a/src/jdk.incubator.vector/windows/native/libjsvml/jsvml_d_sinh_windows_x86.S b/src/jdk.incubator.vector/windows/native/libjsvml/jsvml_d_sinh_windows_x86.S
index 3d1c7d903eb..a36099749d6 100644
--- a/src/jdk.incubator.vector/windows/native/libjsvml/jsvml_d_sinh_windows_x86.S
+++ b/src/jdk.incubator.vector/windows/native/libjsvml/jsvml_d_sinh_windows_x86.S
@@ -1942,7 +1942,7 @@ _unwind___jsvml_sinh8_ha_z0_B1_B9:
 
         ALIGN 004H
 _unwind___jsvml_sinh8_ha_z0_B11_B15:
-        DD      2808865
+        DD      2284577
         DD      7558364
         DD      7369937
         DD      7431367
@@ -1960,10 +1960,6 @@ _unwind___jsvml_sinh8_ha_z0_B11_B15:
         DD      2799687
         DD      3057724
         DD      3307569
-        DD      7109414
-        DD      7170845
-        DD      7232276
-        DD      7293707
         DD      imagerel _B9_1
         DD      imagerel _B9_11
         DD      imagerel _unwind___jsvml_sinh8_ha_z0_B1_B9
diff --git a/src/jdk.incubator.vector/windows/native/libjsvml/jsvml_d_tan_windows_x86.S b/src/jdk.incubator.vector/windows/native/libjsvml/jsvml_d_tan_windows_x86.S
index 7b8ffca0b70..336cdb74d37 100644
--- a/src/jdk.incubator.vector/windows/native/libjsvml/jsvml_d_tan_windows_x86.S
+++ b/src/jdk.incubator.vector/windows/native/libjsvml/jsvml_d_tan_windows_x86.S
@@ -2366,7 +2366,7 @@ _unwind___jsvml_tan8_ha_z0_B1_B10:
 
         ALIGN 004H
 _unwind___jsvml_tan8_ha_z0_B12_B16:
-        DD      2808865
+        DD      2284577
         DD      7558364
         DD      7369937
         DD      7431367
@@ -2384,10 +2384,6 @@ _unwind___jsvml_tan8_ha_z0_B12_B16:
         DD      2791495
         DD      3049532
         DD      3307569
-        DD      7109414
-        DD      7170845
-        DD      7232276
-        DD      7293707
         DD      imagerel _B5_1
         DD      imagerel _B5_12
         DD      imagerel _unwind___jsvml_tan8_ha_z0_B1_B10
diff --git a/src/jdk.incubator.vector/windows/native/libjsvml/jsvml_d_tanh_windows_x86.S b/src/jdk.incubator.vector/windows/native/libjsvml/jsvml_d_tanh_windows_x86.S
index 47d22ee3156..c1745686ab7 100644
--- a/src/jdk.incubator.vector/windows/native/libjsvml/jsvml_d_tanh_windows_x86.S
+++ b/src/jdk.incubator.vector/windows/native/libjsvml/jsvml_d_tanh_windows_x86.S
@@ -2133,7 +2133,7 @@ _unwind___jsvml_tanh8_ha_z0_B1_B9:
 
         ALIGN 004H
 _unwind___jsvml_tanh8_ha_z0_B11_B15:
-        DD      2674977
+        DD      2150689
         DD      7034065
         DD      6845638
         DD      6907068
@@ -2150,10 +2150,6 @@ _unwind___jsvml_tanh8_ha_z0_B11_B15:
         DD      2525255
         DD      2783292
         DD      3041329
-        DD      6585126
-        DD      6646557
-        DD      6707988
-        DD      6769419
         DD      imagerel _B9_1
         DD      imagerel _B9_11
         DD      imagerel _unwind___jsvml_tanh8_ha_z0_B1_B9
diff --git a/src/jdk.incubator.vector/windows/native/libjsvml/jsvml_s_atan2_windows_x86.S b/src/jdk.incubator.vector/windows/native/libjsvml/jsvml_s_atan2_windows_x86.S
index 6aba3a76273..dc7211c9df7 100644
--- a/src/jdk.incubator.vector/windows/native/libjsvml/jsvml_s_atan2_windows_x86.S
+++ b/src/jdk.incubator.vector/windows/native/libjsvml/jsvml_s_atan2_windows_x86.S
@@ -976,11 +976,10 @@ _TEXT   ENDS
 
         ALIGN 004H
 _unwind___jsvml_atan2f16_ha_z0_B1_B10:
-        DD      670721
+        DD      539649
         DD      11326524
         DD      5392436
         DD      5134377
-        DD      11430679
         DD      11469067
 
 .xdata  ENDS
@@ -997,7 +996,7 @@ _unwind___jsvml_atan2f16_ha_z0_B1_B10:
 
         ALIGN 004H
 _unwind___jsvml_atan2f16_ha_z0_B12_B16:
-        DD      2809377
+        DD      2416161
         DD      8017118
         DD      7828691
         DD      7890121
@@ -1016,9 +1015,6 @@ _unwind___jsvml_atan2f16_ha_z0_B12_B16:
         DD      3049534
         DD      3307571
         DD      3565608
-        DD      7633693
-        DD      7691028
-        DD      7752459
         DD      imagerel _B3_1
         DD      imagerel _B3_12
         DD      imagerel _unwind___jsvml_atan2f16_ha_z0_B1_B10
diff --git a/src/jdk.incubator.vector/windows/native/libjsvml/jsvml_s_cos_windows_x86.S b/src/jdk.incubator.vector/windows/native/libjsvml/jsvml_s_cos_windows_x86.S
index 0e5f59758fa..ca27e977a58 100644
--- a/src/jdk.incubator.vector/windows/native/libjsvml/jsvml_s_cos_windows_x86.S
+++ b/src/jdk.incubator.vector/windows/native/libjsvml/jsvml_s_cos_windows_x86.S
@@ -1172,7 +1172,7 @@ _unwind___jsvml_cosf16_ha_z0_B1_B9:
 
         ALIGN 004H
 _unwind___jsvml_cosf16_ha_z0_B11_B15:
-        DD      3472641
+        DD      2948353
         DD      9131261
         DD      8942834
         DD      9004264
@@ -1193,10 +1193,6 @@ _unwind___jsvml_cosf16_ha_z0_B11_B15:
         DD      3573831
         DD      3831868
         DD      4089905
-        DD      8682278
-        DD      8743709
-        DD      8805140
-        DD      8866571
         DD      10867712
         DD      10944768
 
diff --git a/src/jdk.incubator.vector/windows/native/libjsvml/jsvml_s_cosh_windows_x86.S b/src/jdk.incubator.vector/windows/native/libjsvml/jsvml_s_cosh_windows_x86.S
index 29988363c22..e656b1ec273 100644
--- a/src/jdk.incubator.vector/windows/native/libjsvml/jsvml_s_cosh_windows_x86.S
+++ b/src/jdk.incubator.vector/windows/native/libjsvml/jsvml_s_cosh_windows_x86.S
@@ -255,7 +255,7 @@ _unwind___jsvml_coshf16_ha_z0_B1_B9:
 
         ALIGN 004H
 _unwind___jsvml_coshf16_ha_z0_B11_B15:
-        DD      3472641
+        DD      2948353
         DD      9131261
         DD      8942834
         DD      9004264
@@ -276,10 +276,6 @@ _unwind___jsvml_coshf16_ha_z0_B11_B15:
         DD      3573831
         DD      3831868
         DD      4089905
-        DD      8682278
-        DD      8743709
-        DD      8805140
-        DD      8866571
         DD      10867712
         DD      10944768
 
diff --git a/src/jdk.incubator.vector/windows/native/libjsvml/jsvml_s_expm1_windows_x86.S b/src/jdk.incubator.vector/windows/native/libjsvml/jsvml_s_expm1_windows_x86.S
index 473dc9a64d1..df0799bc817 100644
--- a/src/jdk.incubator.vector/windows/native/libjsvml/jsvml_s_expm1_windows_x86.S
+++ b/src/jdk.incubator.vector/windows/native/libjsvml/jsvml_s_expm1_windows_x86.S
@@ -939,7 +939,7 @@ _unwind___jsvml_expm1f16_ha_z0_B1_B9:
 
         ALIGN 004H
 _unwind___jsvml_expm1f16_ha_z0_B11_B15:
-        DD      3472641
+        DD      2948353
         DD      9131261
         DD      8942834
         DD      9004264
@@ -960,10 +960,6 @@ _unwind___jsvml_expm1f16_ha_z0_B11_B15:
         DD      3573831
         DD      3831868
         DD      4089905
-        DD      8682278
-        DD      8743709
-        DD      8805140
-        DD      8866571
         DD      10867712
         DD      10944768
 
diff --git a/src/jdk.incubator.vector/windows/native/libjsvml/jsvml_s_hypot_windows_x86.S b/src/jdk.incubator.vector/windows/native/libjsvml/jsvml_s_hypot_windows_x86.S
index fb3ce4ac8a7..edb71226226 100644
--- a/src/jdk.incubator.vector/windows/native/libjsvml/jsvml_s_hypot_windows_x86.S
+++ b/src/jdk.incubator.vector/windows/native/libjsvml/jsvml_s_hypot_windows_x86.S
@@ -1043,7 +1043,7 @@ _unwind___jsvml_hypotf16_ha_z0_B1_B9:
 
         ALIGN 004H
 _unwind___jsvml_hypotf16_ha_z0_B11_B15:
-        DD      3472641
+        DD      2948353
         DD      9131261
         DD      8942834
         DD      9004264
@@ -1064,10 +1064,6 @@ _unwind___jsvml_hypotf16_ha_z0_B11_B15:
         DD      3573831
         DD      3831868
         DD      4089905
-        DD      8682278
-        DD      8743709
-        DD      8805140
-        DD      8866571
         DD      11392000
         DD      11469056
 
diff --git a/src/jdk.incubator.vector/windows/native/libjsvml/jsvml_s_log1p_windows_x86.S b/src/jdk.incubator.vector/windows/native/libjsvml/jsvml_s_log1p_windows_x86.S
index 65b906a72be..08cf7d0bf57 100644
--- a/src/jdk.incubator.vector/windows/native/libjsvml/jsvml_s_log1p_windows_x86.S
+++ b/src/jdk.incubator.vector/windows/native/libjsvml/jsvml_s_log1p_windows_x86.S
@@ -1117,7 +1117,7 @@ _unwind___jsvml_log1pf16_ha_z0_B1_B9:
 
         ALIGN 004H
 _unwind___jsvml_log1pf16_ha_z0_B11_B15:
-        DD      3472641
+        DD      2948353
         DD      9131261
         DD      8942834
         DD      9004264
@@ -1138,10 +1138,6 @@ _unwind___jsvml_log1pf16_ha_z0_B11_B15:
         DD      3573831
         DD      3831868
         DD      4089905
-        DD      8682278
-        DD      8743709
-        DD      8805140
-        DD      8866571
         DD      10867712
         DD      10944768
 
diff --git a/src/jdk.incubator.vector/windows/native/libjsvml/jsvml_s_pow_windows_x86.S b/src/jdk.incubator.vector/windows/native/libjsvml/jsvml_s_pow_windows_x86.S
index f84a1652a42..13060d27c21 100644
--- a/src/jdk.incubator.vector/windows/native/libjsvml/jsvml_s_pow_windows_x86.S
+++ b/src/jdk.incubator.vector/windows/native/libjsvml/jsvml_s_pow_windows_x86.S
@@ -291,7 +291,7 @@ _unwind___jsvml_powf16_ha_z0_B1_B9:
 
         ALIGN 004H
 _unwind___jsvml_powf16_ha_z0_B11_B15:
-        DD      3472641
+        DD      2948353
         DD      9131261
         DD      8942834
         DD      9004264
@@ -312,10 +312,6 @@ _unwind___jsvml_powf16_ha_z0_B11_B15:
         DD      3573831
         DD      3831868
         DD      4089905
-        DD      8682278
-        DD      8743709
-        DD      8805140
-        DD      8866571
         DD      11392000
         DD      11469056
 
diff --git a/src/jdk.incubator.vector/windows/native/libjsvml/jsvml_s_sin_windows_x86.S b/src/jdk.incubator.vector/windows/native/libjsvml/jsvml_s_sin_windows_x86.S
index 34532eec4c0..f3a386cac77 100644
--- a/src/jdk.incubator.vector/windows/native/libjsvml/jsvml_s_sin_windows_x86.S
+++ b/src/jdk.incubator.vector/windows/native/libjsvml/jsvml_s_sin_windows_x86.S
@@ -264,7 +264,7 @@ _unwind___jsvml_sinf16_ha_z0_B1_B9:
 
         ALIGN 004H
 _unwind___jsvml_sinf16_ha_z0_B11_B15:
-        DD      3472641
+        DD      2948353
         DD      9131261
         DD      8942834
         DD      9004264
@@ -285,10 +285,6 @@ _unwind___jsvml_sinf16_ha_z0_B11_B15:
         DD      3573831
         DD      3831868
         DD      4089905
-        DD      8682278
-        DD      8743709
-        DD      8805140
-        DD      8866571
         DD      10867712
         DD      10944768
 
diff --git a/src/jdk.incubator.vector/windows/native/libjsvml/jsvml_s_sinh_windows_x86.S b/src/jdk.incubator.vector/windows/native/libjsvml/jsvml_s_sinh_windows_x86.S
index 6ca8917e379..35db4b5a2cd 100644
--- a/src/jdk.incubator.vector/windows/native/libjsvml/jsvml_s_sinh_windows_x86.S
+++ b/src/jdk.incubator.vector/windows/native/libjsvml/jsvml_s_sinh_windows_x86.S
@@ -465,7 +465,7 @@ _unwind___jsvml_sinhf16_ha_z0_B1_B9:
 
         ALIGN 004H
 _unwind___jsvml_sinhf16_ha_z0_B11_B15:
-        DD      3472641
+        DD      2948353
         DD      9131261
         DD      8942834
         DD      9004264
@@ -486,10 +486,6 @@ _unwind___jsvml_sinhf16_ha_z0_B11_B15:
         DD      3573831
         DD      3831868
         DD      4089905
-        DD      8682278
-        DD      8743709
-        DD      8805140
-        DD      8866571
         DD      10867712
         DD      10944768
 
diff --git a/src/jdk.incubator.vector/windows/native/libjsvml/jsvml_s_tan_windows_x86.S b/src/jdk.incubator.vector/windows/native/libjsvml/jsvml_s_tan_windows_x86.S
index 092cc482368..4d329330fd2 100644
--- a/src/jdk.incubator.vector/windows/native/libjsvml/jsvml_s_tan_windows_x86.S
+++ b/src/jdk.incubator.vector/windows/native/libjsvml/jsvml_s_tan_windows_x86.S
@@ -661,7 +661,7 @@ _unwind___jsvml_tanf16_ha_z0_B1_B9:
 
         ALIGN 004H
 _unwind___jsvml_tanf16_ha_z0_B11_B15:
-        DD      3472641
+        DD      2948353
         DD      9131261
         DD      8942834
         DD      9004264
@@ -682,10 +682,6 @@ _unwind___jsvml_tanf16_ha_z0_B11_B15:
         DD      3573831
         DD      3831868
         DD      4089905
-        DD      8682278
-        DD      8743709
-        DD      8805140
-        DD      8866571
         DD      10867712
         DD      10944768
 
diff --git a/src/jdk.incubator.vector/windows/native/libjsvml/jsvml_s_tanh_windows_x86.S b/src/jdk.incubator.vector/windows/native/libjsvml/jsvml_s_tanh_windows_x86.S
index 4ecf23e1a10..16025e010ac 100644
--- a/src/jdk.incubator.vector/windows/native/libjsvml/jsvml_s_tanh_windows_x86.S
+++ b/src/jdk.incubator.vector/windows/native/libjsvml/jsvml_s_tanh_windows_x86.S
@@ -660,7 +660,7 @@ _unwind___jsvml_tanhf16_ha_z0_B1_B9:
 
         ALIGN 004H
 _unwind___jsvml_tanhf16_ha_z0_B11_B15:
-        DD      3472641
+        DD      2948353
         DD      9131261
         DD      8942834
         DD      9004264
@@ -681,10 +681,6 @@ _unwind___jsvml_tanhf16_ha_z0_B11_B15:
         DD      3573831
         DD      3831868
         DD      4089905
-        DD      8682278
-        DD      8743709
-        DD      8805140
-        DD      8866571
         DD      10867712
         DD      10944768
 

From b84b29278f710fabab703bc75dda1fa817bc13f6 Mon Sep 17 00:00:00 2001
From: Hamlin Li <mli@openjdk.org>
Date: Mon, 24 Mar 2025 18:11:26 +0000
Subject: [PATCH 452/587] 8352615: [Test] RISC-V:
 TestVectorizationMultiInvar.java fails on riscv64 without rvv support

Reviewed-by: fyang, rehn
---
 .../compiler/c2/irTests/TestVectorizationMultiInvar.java     | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/test/hotspot/jtreg/compiler/c2/irTests/TestVectorizationMultiInvar.java b/test/hotspot/jtreg/compiler/c2/irTests/TestVectorizationMultiInvar.java
index 1496a72bc3c..eb4b611e8eb 100644
--- a/test/hotspot/jtreg/compiler/c2/irTests/TestVectorizationMultiInvar.java
+++ b/test/hotspot/jtreg/compiler/c2/irTests/TestVectorizationMultiInvar.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, Red Hat, Inc. All rights reserved.
+ * Copyright (c) 2023, 2025, 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
@@ -33,7 +33,8 @@ import java.util.Random;
 /*
  * @test
  * @bug 8300257
- * @requires (os.simpleArch == "x64") | (os.simpleArch == "aarch64") | (os.simpleArch == "riscv64")
+ * @requires (os.simpleArch == "x64") | (os.simpleArch == "aarch64") |
+ *           (os.simpleArch == "riscv64" & vm.cpu.features ~= ".*rvv.*")
  * @summary C2: vectorization fails on some simple Memory Segment loops
  * @modules java.base/jdk.internal.misc
  * @library /test/lib /

From 6e6a39d35fda929300c7668fdf5d2f0fbfed0606 Mon Sep 17 00:00:00 2001
From: Phil Race <prr@openjdk.org>
Date: Mon, 24 Mar 2025 19:52:52 +0000
Subject: [PATCH 453/587] 8347321: [ubsan] CGGlyphImages.m:553:30: runtime
 error: nan is outside the range of representable values of type 'unsigned
 long'

Reviewed-by: kizune, azvegint, aivanov
---
 .../macosx/classes/sun/font/CStrike.java            | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/java.desktop/macosx/classes/sun/font/CStrike.java b/src/java.desktop/macosx/classes/sun/font/CStrike.java
index 323c6e86a72..cfab6a9f4c3 100644
--- a/src/java.desktop/macosx/classes/sun/font/CStrike.java
+++ b/src/java.desktop/macosx/classes/sun/font/CStrike.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -102,6 +102,17 @@ public final class CStrike extends PhysicalStrike {
         final double[] glyphTx = new double[6];
         desc.glyphTx.getMatrix(glyphTx);
 
+        for (int i = 0; i < 6; i++) {
+            if (Double.isFinite(glyphTx[i])) {
+                continue;
+            }
+            for (int j = 0; j < 6; j++) {
+                glyphTx[j] = 0;
+            }
+            invDevTx = null;
+            break;
+        }
+
         final double[] invDevTxMatrix = new double[6];
         if (invDevTx == null) {
             invDevTxMatrix[0] = 1;

From 2c60fc5189b9ecec8460c130a0c939195dfa5ffb Mon Sep 17 00:00:00 2001
From: Alexey Semenyuk <asemenyuk@openjdk.org>
Date: Mon, 24 Mar 2025 22:46:08 +0000
Subject: [PATCH 454/587] 8352176: Automate setting up environment for mac
 signing tests

Reviewed-by: almatvee
---
 test/jdk/tools/jpackage/TEST.properties       |   26 +-
 .../helpers/jdk/jpackage/test/MacSign.java    | 1043 +++++++++++++++++
 .../helpers/jdk/jpackage/test/TKit.java       |    5 +-
 .../jdk/jpackage/test/TestInstance.java       |    2 +-
 .../jpackage/macosx/base/SigningBase.java     |   87 +-
 .../jpackage/resources/sign-utils.applescript |  114 ++
 6 files changed, 1263 insertions(+), 14 deletions(-)
 create mode 100644 test/jdk/tools/jpackage/helpers/jdk/jpackage/test/MacSign.java
 create mode 100644 test/jdk/tools/jpackage/resources/sign-utils.applescript

diff --git a/test/jdk/tools/jpackage/TEST.properties b/test/jdk/tools/jpackage/TEST.properties
index 78f5fc88bc3..58a82a9444b 100644
--- a/test/jdk/tools/jpackage/TEST.properties
+++ b/test/jdk/tools/jpackage/TEST.properties
@@ -1,6 +1,11 @@
-keys=jpackagePlatformPackage
-requires.properties=jpackage.test.SQETest
-maxOutputSize=2000000
+keys = \
+    jpackagePlatformPackage
+
+requires.properties = \
+    jpackage.test.SQETest \
+    jpackage.test.MacSignTests
+
+maxOutputSize = 2000000
 
 # Run jpackage tests on windows platform sequentially.
 # Having "share" directory in the list affects tests on other platforms.
@@ -9,10 +14,13 @@ maxOutputSize=2000000
 #     exclusiveAccess.dirs=share windows
 #   }
 # but conditionals are not supported by jtreg configuration files.
-exclusiveAccess.dirs=share windows
+exclusiveAccess.dirs = \
+    share \
+    windows
 
-modules=jdk.jpackage/jdk.jpackage.internal:+open \
-        jdk.jpackage/jdk.jpackage.internal.util \
-        jdk.jpackage/jdk.jpackage.internal.util.function \
-        java.base/jdk.internal.util \
-        jdk.jlink/jdk.tools.jlink.internal
+modules = \
+    jdk.jpackage/jdk.jpackage.internal:+open \
+    jdk.jpackage/jdk.jpackage.internal.util \
+    jdk.jpackage/jdk.jpackage.internal.util.function \
+    java.base/jdk.internal.util \
+    jdk.jlink/jdk.tools.jlink.internal
diff --git a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/MacSign.java b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/MacSign.java
new file mode 100644
index 00000000000..1efae8a055c
--- /dev/null
+++ b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/MacSign.java
@@ -0,0 +1,1043 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please 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 static java.util.stream.Collectors.flatMapping;
+import static java.util.stream.Collectors.groupingBy;
+import static java.util.stream.Collectors.joining;
+import static java.util.stream.Collectors.mapping;
+import static java.util.stream.Collectors.toList;
+import static java.util.stream.Collectors.toMap;
+import static java.util.stream.Collectors.toSet;
+import static jdk.jpackage.internal.util.function.ThrowingFunction.toFunction;
+import static jdk.jpackage.internal.util.function.ThrowingSupplier.toSupplier;
+
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.UncheckedIOException;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.OpenOption;
+import java.nio.file.Path;
+import java.nio.file.StandardCopyOption;
+import java.nio.file.StandardOpenOption;
+import java.security.MessageDigest;
+import java.security.cert.CertificateFactory;
+import java.security.cert.X509Certificate;
+import java.util.ArrayList;
+import java.util.Base64;
+import java.util.Collection;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.HexFormat;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.TimeUnit;
+import java.util.function.Predicate;
+import java.util.stream.Stream;
+import javax.naming.ldap.LdapName;
+import javax.naming.ldap.Rdn;
+import jdk.jpackage.internal.util.function.ExceptionBox;
+import jdk.jpackage.internal.util.function.ThrowingConsumer;
+
+/**
+ * Utilities to setup identities and keychains for sign testing.
+ * <p>
+ * Identity is a pair of a private key and a certificate created with this
+ * private key. It is used for signing. Keychain is a storage for identities.
+ *
+ * <ul>
+ * <li>"/usr/bin/security" command line tool manages keychains and identities.
+ * <li>"/usr/bin/codesign" command line tool uses identities to sign files and
+ * folders.
+ * <li>"Keychain Access" is GUI application to manage keychains and identities.
+ * </ul>
+ *
+ * <ol>
+ * <h1>How do you create an identity for testing?</h1>
+ * <li>Create a private RSA key.
+ * <li>Create a self-signed certificate using the key from step #1.
+ * <li>Save both the private key and the certificate from steps #1 and #2 in a
+ * keychain.
+ * <li>Trust the certificate from step #2.
+ * </ol>
+ *
+ * There are few options each above steps can be executed (applies to macOS
+ * Sequoia).
+ *
+ * <h2>1. Create a private RSA key</h2>
+ *
+ * <h3>1.1. Create a private RSA key with openssl</h3>
+ *
+ * This is the obvious approach given openssl will be used to create a
+ * certificate. You can create a key and a certificate with a single openssl
+ * command. However the catch is importing the private key in a keystore.
+ * <p>
+ * All private keys imported in a keychain with {@code /usr/bin/security import}
+ * command have "Imported Private Key" label. There is no other tool to change
+ * key labels but "Keychain Access".
+ * <p>
+ * On top of that the internal name of the key can NOT be changed at all. The
+ * internal name of the key is the name assigned by /usr/bin/security command
+ * when it imports it. It derives it from the name of a file from which it
+ * imports the key. E.g. say "identity.pem" file stores an identity, then
+ *
+ * <pre>
+ * /usr/bin/security import identity.pem -f pemseq -k foo.keychain
+ * </pre>
+ *
+ * command will import a private key with internal name "identity" and name
+ * "Imported Private Key" in "foo.keychain" keychain. You will see "Imported
+ * Private Key" in the list of keys in "Keychain Access" app, but when you will
+ * use this key with /usr/bin/codesign it will prompt to enter keychain password
+ * to access "identity" key. Even after you give a better name to this key
+ * instead of "Imported Private Key", /usr/bin/codesign will keep referring this
+ * key as "identity".
+ *
+ * <h3>1.2. Create a private RSA key with /usr/bin/security</h3>
+ *
+ * Use
+ *
+ * <pre>
+ * /usr/bin/security create-keypair -a rsa -s 2048 -k foo.keychain -T /usr/bin/security -T /usr/bin/codesign -T /usr/bin/productbuild "My key"
+ * </pre>
+ *
+ * command to create RSA key pair in "foo.keychain" keychain. Both private and
+ * public keys will be named "My key". This way, you can get an adequately
+ * identified private key in a keychain.
+ * <p>
+ * You will need to run an additional command to allow access to the private key
+ * without being asked for the keychain password:
+ *
+ * <pre>
+ * /usr/bin/security set-key-partition-list -S apple-tool:,apple: -s -k ${KEYCHAIN-PASSWORD} foo.keychain
+ * </pre>
+ *
+ * The only combination that suppresses popping up authorization dialog asking
+ * for keychain password to access a private key when signing files with
+ * /usr/bin/codesign and /usr/bin/productbuild commands is the above command and
+ * {@code -T /usr/bin/security -T /usr/bin/codesign -T /usr/bin/productbuild}
+ * arguments in {@code /usr/bin/security create-keypair} command.
+ *
+ * If you use {@code -A} instead of
+ * {@code -T /usr/bin/security -T /usr/bin/codesign -T /usr/bin/productbuild}
+ * hoping it will grant blank permission to any app to use the key it will not
+ * work.
+ *
+ * Running the subsequent {@code /usr/bin/security set-key-partition-list...}
+ * command will not help to suppress popping up the authorization dialog.
+ *
+ * <p>
+ * The correlation between
+ * {@code -T /usr/bin/security -T /usr/bin/codesign -T /usr/bin/productbuild}
+ * arguments of {@code /usr/bin/security create-keypair} or
+ * {@code /usr/bin/security import} command and
+ * {@code /usr/bin/security set-key-partition-list...} command is not explicitly
+ * documented and is not mentioned on <a href=
+ * "https://stackoverflow.com/questions/20205162/user-interaction-is-not-allowed-trying-to-sign-an-osx-app-using-codesign"
+ * target="_blank">Stack Overflow</a> or
+ * <a href="https://developer.apple.com/forums/thread/666107" target=
+ * "_blank">Apple Developer Forum</a>.
+ *
+ * <p>
+ * Note #1: If user interaction is impossible (ssh session) and
+ * /usr/bin/codesign is not correctly configured in the access control list of a
+ * private key it attempts to use it will fail with the following cryptic error:
+ *
+ * <pre>
+ * AppImageMacSignTest.app/Contents/runtime/Contents/Home/lib/libnet.dylib: errSecInternalComponent
+ * </pre>
+ *
+ * <p>
+ * Note #2: For the same cause /usr/bin/product build fails with a better error message:
+ *
+ * <pre>
+ * SignData failed: Error Domain=NSOSStatusErrorDomain Code=-25308 ... (errKCInteractionNotAllowed / errSecInteractionNotAllowed: / Interaction is not allowed with the Security Server.)
+ * </pre>
+ *
+ * <p>
+ * You can extract the key to use with openssl for certificate creation with
+ * {@code /usr/bin/security export} command.
+ *
+ * <h2>2. Create a self-signed certificate</h2>
+ *
+ * No brainier, use openssl. If a private key was created with
+ * {@code /usr/bin/security create-keypair} command it needs to be extracted
+ * from the keychain in a format suitable for openssl. This can be achieved with
+ * the following command:
+ *
+ * <pre>
+ * /usr/bin/security export -f pkcs12 -k foo.keychain -t privKeys -P "" -o key.p12
+ * </pre>
+ *
+ * The above command will save all private keys in a "foo.keychain" keychain in
+ * a PKCS#12-encoded "key.p12" file with an empty passphrase.
+ * <p>
+ * Note #1: Given there is no way to extract specific private key from a
+ * keystore make sure it contains a single private key.
+ * <p>
+ * Note #2: You can't extract private key in PEM format, i.e.
+ * {@code /usr/bin/security export -f pemseq -t privKeys} command will fail.
+ * <p>
+ * The inferior alternative is to use the GUI "Certificate Assistant" from
+ * "Keychain Access".
+ *
+ * <h2>3. Save both private key and the certificate from steps #1 and #2 in a
+ * keychain</h2>
+ *
+ * Assume private key has been created using
+ * {@code /usr/bin/security create-keypair} command and is already in a keychain
+ * you only need to import a certificate created in step #2. If the certificate
+ * was saved in "cert.pem" file in step #2, the following command:
+ *
+ * <pre>
+ * /usr/bin/security import cert.pem -f pemseq -k foo.keychain
+ * </pre>
+ *
+ * will import a certificate from "cert.pem" file in "foo.keychain" keychain.
+ *
+ * <h2>4. Trust the certificate from step #2</h2>
+ *
+ * An untrusted certificate can NOT be used with /usr/bin/codesign. Use
+ *
+ * <pre>
+ * /usr/bin/security security add-trusted-cert -k foo.keychain cert.pem
+ * </pre>
+ *
+ * command to add trusted certificate from "cert.pem" file to "foo.keychain"
+ * keychain. If the certificate is already in the keychain it will be marked
+ * trusted.
+ * <p>
+ * This step can not be automated as there is no way to avoid entering a user
+ * password.
+ * <p>
+ * Running this command with sudo doesn't help - it will ask for password twice
+ * (unless you configure sudo not to ask a passowrd, in this case it will ask
+ * once).
+ * <p>
+ * Running this command from ssh session will fail with the following error
+ * message:
+ *
+ * <pre>
+ * SecTrustSettingsSetTrustSettings: The authorization was denied since no user interaction was possible.
+ * </pre>
+ *
+ * User interaction can NOT be avoided for this step. This is a deliberate
+ * security constrained according to <a href=
+ * "https://developer.apple.com/documentation/macos-release-notes/macos-big-sur-11_0_1-release-notes#Security"
+ * target="_blank">Big Sur Release Notes</a> and
+ * <a href="https://developer.apple.com/forums/thread/671582" target=
+ * "_blank">Apple Developer Forum</a>.
+ */
+
+public final class MacSign {
+
+    public record KeychainWithCertsSpec(Keychain keychain, List<CertificateRequest> certificateRequests) {
+
+        public KeychainWithCertsSpec {
+            Objects.requireNonNull(keychain);
+            Objects.requireNonNull(certificateRequests);
+            certificateRequests.forEach(Objects::requireNonNull);
+        }
+
+        @Override
+        public String toString() {
+            final var sb = new StringBuilder();
+            sb.append(keychain);
+            if (!certificateRequests.isEmpty()) {
+                sb.append("; certs=").append(certificateRequests);
+            }
+            return sb.toString();
+        }
+
+        public static final class Builder {
+
+            public Builder name(String v) {
+                keychainBuilder.name(v);
+                return this;
+            }
+
+            public Builder password(String v) {
+                keychainBuilder.password(v);
+                return this;
+            }
+
+            public Builder addCert(CertificateRequest v) {
+                certs.add(v);
+                return this;
+            }
+
+            public Builder addCert(CertificateRequest.Builder v) {
+                return addCert(v.create());
+            }
+
+            public KeychainWithCertsSpec create() {
+                final var keychain = keychainBuilder.create();
+                return new KeychainWithCertsSpec(keychain, List.copyOf(certs));
+            }
+
+            private Keychain.Builder keychainBuilder = new Keychain.Builder();
+            private List<CertificateRequest> certs = new ArrayList<>();
+        }
+    }
+
+    public record Keychain(String name, String password) {
+        public Keychain {
+            Objects.requireNonNull(name);
+            Objects.requireNonNull(password);
+        }
+
+        public Path path() {
+            final var path = Path.of(name);
+            if (path.isAbsolute()) {
+                return path;
+            } else {
+                return Path.of(System.getProperty("user.home")).resolve("Library/Keychains").resolve(name + "-db");
+            }
+        }
+
+        public static final class Builder {
+
+            public Builder name(String v) {
+                name = v;
+                return this;
+            }
+
+            public Builder password(String v) {
+                password = v;
+                return this;
+            }
+
+            public Keychain create() {
+                return new Keychain(validatedName(), validatedPassword());
+            }
+
+            private String validatedName() {
+                return Optional.ofNullable(name).orElse("jpackageTest.keychain");
+            }
+
+            private String validatedPassword() {
+                return Optional.ofNullable(password).orElse("test");
+            }
+
+            private String name;
+            private String password;
+        }
+
+        Keychain create() {
+            final var exec = createExecutor("create-keychain");
+            final var result = exec.saveOutput().executeWithoutExitCodeCheck();
+            if (result.getExitCode() == 48 && result.getFirstLineOfOutput().endsWith("A keychain with the same name already exists.")) {
+                delete();
+                exec.saveOutput(false).execute();
+            } else {
+                result.assertExitCodeIsZero();
+            }
+
+            // Ensure the keychain is unlocked.
+            unlock();
+
+            // Set auto-lock timeout to unlimited and remove auto-lock on sleep.
+            security("set-keychain-settings", name).execute();
+            return this;
+        }
+
+        Keychain delete() {
+            security("delete-keychain", name).execute();
+            return this;
+        }
+
+        Keychain unlock() {
+            createExecutor("unlock-keychain").execute();
+            return this;
+        }
+
+        boolean exists() {
+            return Files.exists(path());
+        }
+
+        Keychain createKeyPair(String name) {
+            security("create-keypair",
+                    "-a", "rsa",
+                    "-s", "2048",
+                    "-k", this.name,
+                    "-T", "/usr/bin/security",
+                    "-T", "/usr/bin/codesign",
+                    "-T", "/usr/bin/productbuild").execute();
+            security("set-key-partition-list", "-S", "apple-tool:,apple:", "-s", "-k", password, this.name).execute();
+            return this;
+        }
+
+        List<X509Certificate> findCertificates() {
+            final var in = new ByteArrayInputStream(
+                    security("find-certificate", "-ap", name).saveOutput().execute().getOutput().stream().collect(joining("\n")).getBytes(StandardCharsets.UTF_8));
+            return toFunction(CERT_FACTORY::generateCertificates).apply(in).stream().map(X509Certificate.class::cast).toList();
+        }
+
+        public static void addToSearchList(Collection<Keychain> keychains) {
+            security("list-keychains", "-d", "user", "-s", "login.keychain")
+            .addArguments(keychains.stream().map(Keychain::name).toList())
+            .execute();
+        }
+
+        private Executor createExecutor(String command) {
+            return security(command, "-p", password, name);
+        }
+    }
+
+    record ResolvedCertificateRequest(CertificateRequest request, X509Certificate cert, VerifyStatus verifyStatus) {
+        ResolvedCertificateRequest {
+            Objects.requireNonNull(request);
+            Objects.requireNonNull(cert);
+            Objects.requireNonNull(verifyStatus);
+        }
+
+        enum VerifyStatus {
+            VERIFY_OK,
+            VERIFY_ERROR,
+            UNVERIFIED
+        }
+
+        ResolvedCertificateRequest(X509Certificate cert) {
+            this(new CertificateRequest(cert), cert, VerifyStatus.UNVERIFIED);
+        }
+
+        ResolvedCertificateRequest copyVerified(boolean verifySuccess) {
+            return new ResolvedCertificateRequest(request, cert,
+                    verifySuccess ? VerifyStatus.VERIFY_OK : VerifyStatus.VERIFY_ERROR);
+        }
+    }
+
+    record CertificateStats(List<ResolvedCertificateRequest> allResolvedCertificateRequests,
+            List<X509Certificate> allCertificates, List<CertificateRequest> knownCertificateRequests,
+            Map<X509Certificate, Throwable> unmappedCertificates) {
+
+        private static CertificateStats get(KeychainWithCertsSpec spec) {
+            return CACHE.computeIfAbsent(spec, CertificateStats::create);
+        }
+
+        Map<CertificateRequest, List<X509Certificate>> mapKnownCertificateRequests() {
+            return knownCertificateRequests.stream().collect(groupingBy(x -> x, mapping(certificateRequest -> {
+                return allResolvedCertificateRequests.stream().filter(v -> {
+                    return v.request().equals(certificateRequest);
+                }).map(ResolvedCertificateRequest::cert);
+            }, flatMapping(x -> x, toList()))));
+        }
+
+        Set<CertificateRequest> verifyFailedCertificateRequests() {
+            return knownCertificateRequests.stream().filter(certificateRequest -> {
+                return allResolvedCertificateRequests.stream().anyMatch(v -> {
+                    return v.request().equals(certificateRequest) && v.verifyStatus() == ResolvedCertificateRequest.VerifyStatus.VERIFY_ERROR;
+                });
+            }).collect(toSet());
+        }
+
+        Set<CertificateRequest> unmappedCertificateRequests() {
+            return Comm.compare(Set.copyOf(knownCertificateRequests),
+                    allResolvedCertificateRequests.stream().map(ResolvedCertificateRequest::request).collect(toSet())).unique1();
+        }
+
+        private static CertificateStats create(KeychainWithCertsSpec spec) {
+            final var allCertificates = spec.keychain().findCertificates();
+            final List<ResolvedCertificateRequest> allResolvedCertificateRequests = new ArrayList<>();
+            final Map<X509Certificate, Throwable> unmappedCertificates = new HashMap<>();
+
+            withTempDirectory(workDir -> {
+                for (final var cert : allCertificates) {
+                    ResolvedCertificateRequest resolvedCertificateRequest;
+                    try {
+                        resolvedCertificateRequest = new ResolvedCertificateRequest(cert);
+                    } catch (RuntimeException ex) {
+                        final Throwable t;
+                        if (ex instanceof ExceptionBox) {
+                            t = ex.getCause();
+                        } else {
+                            t = ex;
+                        }
+                        unmappedCertificates.put(cert, t);
+                        continue;
+                    }
+
+                    if (spec.certificateRequests().contains(resolvedCertificateRequest.request)) {
+                        final var certFile = workDir.resolve(CertificateHash.of(cert).toString() + ".pem");
+                        final var verifySuccess = verifyCertificate(resolvedCertificateRequest, spec.keychain(), certFile);
+                        resolvedCertificateRequest = resolvedCertificateRequest.copyVerified(verifySuccess);
+                    }
+
+                    allResolvedCertificateRequests.add(resolvedCertificateRequest);
+                }
+            });
+
+            return new CertificateStats(allResolvedCertificateRequests, List.copyOf(allCertificates),
+                    List.copyOf(spec.certificateRequests()), unmappedCertificates);
+        }
+
+        private static final Map<KeychainWithCertsSpec, CertificateStats> CACHE = new ConcurrentHashMap<>();
+    }
+
+    record PemData(String label, byte[] data) {
+        PemData {
+            Objects.requireNonNull(label);
+            Objects.requireNonNull(data);
+        }
+
+        @Override
+        public String toString() {
+            final var sb = new StringBuilder();
+            sb.append(frame("BEGIN " + label));
+            sb.append(ENCODER.encodeToString(data));
+            sb.append("\n");
+            sb.append(frame("END " + label));
+            return sb.toString();
+        }
+
+        static PemData of(X509Certificate cert) {
+            return new PemData("CERTIFICATE", toSupplier(cert::getEncoded).get());
+        }
+
+        void save(Path path, OpenOption... options) {
+            try {
+                Files.createDirectories(path.getParent());
+                Files.writeString(path, toString(), options);
+            } catch (IOException ex) {
+                throw new UncheckedIOException(ex);
+            }
+        }
+
+        private static String frame(String str) {
+            return String.format("-----%s-----\n", Objects.requireNonNull(str));
+        }
+
+        private final static Base64.Encoder ENCODER = Base64.getMimeEncoder(64, "\n".getBytes());
+    }
+
+    public record CertificateHash(byte[] value) {
+        public CertificateHash {
+            Objects.requireNonNull(value);
+            if (value.length != 20) {
+                throw new IllegalArgumentException("Invalid SHA-1 hash");
+            }
+        }
+
+        public static CertificateHash of(X509Certificate cert) {
+            return new CertificateHash(toSupplier(() -> {
+                final MessageDigest md = MessageDigest.getInstance("SHA-1");
+                md.update(cert.getEncoded());
+                return md.digest();
+            }).get());
+        }
+
+        @Override
+        public String toString() {
+            return FORMAT.formatHex(value);
+        }
+
+        private static final HexFormat FORMAT = HexFormat.of().withUpperCase();
+    }
+
+    public enum CertificateType {
+        CODE_SIGN(List.of(
+                "basicConstraints=critical,CA:false",
+                "keyUsage=critical,digitalSignature"
+        ), CODE_SIGN_EXTENDED_KEY_USAGE, "codeSign"),
+        // https://www.apple.com/certificateauthority/pdf/Apple_Developer_ID_CPS_v1.1.pdf
+        // https://security.stackexchange.com/questions/17909/how-to-create-an-apple-installer-package-signing-certificate
+        // https://github.com/zschuessler/AXtendedKey/blob/32c8ccec3df7e78fe521d09c48bd20558b3a4a24/src/axtended_key/services/certificate_manager.py#L109C102-L109C115
+        INSTALLER(List.of(
+                "basicConstraints=critical,CA:false",
+                "keyUsage=critical,digitalSignature",
+                // Apple-specific extension for self-distributed apps
+                // https://oid-base.com/get/1.2.840.113635.100.6.1.14
+                "1.2.840.113635.100.6.1.14=critical,DER:0500"
+        ), INSTALLER_EXTENDED_KEY_USAGE,
+                // Should be "pkgSign", but with this policy `security verify-cert` command fails.
+                "basic");
+
+        CertificateType(List<String> otherExtensions, List<String> extendedKeyUsage, String verifyPolicy) {
+            this.otherExtensions = otherExtensions;
+            this.extendedKeyUsage = extendedKeyUsage;
+            this.verifyPolicy = verifyPolicy;
+        }
+
+        boolean isTypeOf(X509Certificate cert) {
+            return toSupplier(() -> cert.getExtendedKeyUsage().containsAll(extendedKeyUsage)).get();
+        }
+
+        List<String> extensions() {
+            return Stream.concat(otherExtensions.stream(),
+                    Stream.of("extendedKeyUsage=" + Stream.concat(Stream.of("critical"), extendedKeyUsage.stream()).collect(joining(",")))).toList();
+        }
+
+        String verifyPolicy() {
+            return verifyPolicy;
+        }
+
+        private final List<String> otherExtensions;
+        private final List<String> extendedKeyUsage;
+        private final String verifyPolicy;
+    }
+
+    public record CertificateRequest(String name, CertificateType type, int days) implements Comparable<CertificateRequest>{
+        public CertificateRequest {
+            Objects.requireNonNull(name);
+            Objects.requireNonNull(type);
+        }
+
+        CertificateRequest(X509Certificate cert) {
+            this(getSubjectCN(cert), getType(cert), getDurationInDays(cert));
+        }
+
+        @Override
+        public int compareTo(CertificateRequest o) {
+            return COMPARATOR.compare(this, o);
+        }
+
+        public static final class Builder {
+
+            public Builder userName(String v) {
+                userName = v;
+                return this;
+            }
+
+            public Builder commonName(String v) {
+                commonName = v;
+                return this;
+            }
+
+            public Builder type(CertificateType v) {
+                type = v;
+                return this;
+            }
+
+            public Builder days(int v) {
+                days = v;
+                return this;
+            }
+
+            public CertificateRequest create() {
+                return new CertificateRequest(validatedCN(), type, days);
+            }
+
+            private String validatedUserName() {
+                return Objects.requireNonNull(userName);
+            }
+
+            private String validatedCN() {
+                return Optional.ofNullable(commonName).orElseGet(() -> {
+                    switch (type) {
+                        case CODE_SIGN -> {
+                            return "Developer ID Application: " + validatedUserName();
+                        }
+                        case INSTALLER -> {
+                            return "Developer ID Installer: " + validatedUserName();
+                        }
+                        default -> {
+                            throw new UnsupportedOperationException();
+                        }
+                    }
+                });
+            }
+
+            private String userName;
+            private String commonName; // CN
+            private CertificateType type = CertificateType.CODE_SIGN;
+            private int days = 365;
+        }
+
+        private static String getSubjectCN(X509Certificate cert) {
+            final var principal = cert.getSubjectX500Principal();
+            final var ldapName = toSupplier(() -> new LdapName(principal.getName())).get();
+            return ldapName.getRdns().stream().filter(rdn -> {
+                return rdn.getType().equalsIgnoreCase("CN");
+            }).map(Rdn::getValue).map(Object::toString).distinct().reduce((x, y) -> {
+                throw new IllegalArgumentException(String.format(
+                        "Certificate with hash=%s has multiple subject common names: [%s], [%s]", CertificateHash.of(cert), x, y));
+            }).orElseThrow(() -> {
+                throw new IllegalArgumentException(String.format(
+                        "Certificate with hash=%s doesn't have subject common name", CertificateHash.of(cert)));
+            });
+        }
+
+        private static CertificateType getType(X509Certificate cert) {
+            return Stream.of(CertificateType.values()).filter(certType -> {
+                return certType.isTypeOf(cert);
+            }).reduce((x, y) -> {
+                throw new IllegalArgumentException(String.format(
+                        "Ambiguous type of a certificate with hash=%s: [%s], [%s]", CertificateHash.of(cert), x, y));
+            }).orElseThrow(() -> {
+                throw new IllegalArgumentException(String.format(
+                        "Unrecognized type of a certificate with hash=%s", CertificateHash.of(cert)));
+            });
+        }
+
+        private static int getDurationInDays(X509Certificate cert) {
+            final var notBefore = cert.getNotBefore();
+            final var notAfter = cert.getNotAfter();
+            return (int)TimeUnit.DAYS.convert(notAfter.getTime() - notBefore.getTime(), TimeUnit.MILLISECONDS);
+        }
+
+        private static final Comparator<CertificateRequest> COMPARATOR =
+                Comparator.comparing(CertificateRequest::name)
+                .thenComparing(Comparator.comparing(CertificateRequest::type))
+                .thenComparing(Comparator.comparingInt(CertificateRequest::days));
+    }
+
+    /**
+     * Creates keychains and signing identities from the given configuration.
+     * <p>
+     * It will create a single private key and unique certificate using this key for
+     * every unique {@linkplain CertificateRequest} instance.
+     * <p>
+     * Created certificates will be imported into the keychains, and every
+     * certificate will be marked as trusted.
+     * <p>
+     * The user will be prompted to enter the user login password as
+     * many times as the number of unique certificates this function will create.
+     *
+     * @param specs the keychains and signing identities configuration
+     */
+    public static void setUp(List<KeychainWithCertsSpec> specs) {
+        validate(specs);
+
+        if (!OPENSSL.isAbsolute()) {
+            final var opensslVer = Executor.of(OPENSSL.toString(), "version").saveFirstLineOfOutput().execute().getFirstLineOfOutput();
+            TKit.trace(String.format("openssl version: %s", opensslVer));
+        }
+
+        traceSigningEnvironment(specs);
+
+        // Reset keychain search list to defaults.
+        Keychain.addToSearchList(List.of());
+
+        final var mainKeychain = specs.getFirst().keychain();
+
+        // Init basic keychain from scratch.
+        // This will create the keychain file and the key pair.
+        mainKeychain.create().createKeyPair("jpackage test key");
+
+        // Use the same private key to create certificates in additional keychains.
+        for (final var keychainSpec : specs.subList(1, specs.size())) {
+            final var keychainFile = keychainSpec.keychain().path();
+            TKit.trace(String.format("Create keychain in [%s] file from [%s] keychain", keychainFile, mainKeychain.name()));
+            try {
+                Files.copy(mainKeychain.path(), keychainFile, StandardCopyOption.REPLACE_EXISTING);
+            } catch (IOException ex) {
+                throw new UncheckedIOException(ex);
+            }
+        }
+
+        withTempDirectory(dir -> {
+            // Create certificates.
+            final var certPemFiles = createCertificates(mainKeychain, specs, dir);
+
+            final Map<Path, Keychain> trustConfig = new HashMap<>();
+
+            for (final var certPemFile : certPemFiles.entrySet()) {
+                // Import the certificate in all keychains it belongs to.
+                final var keychains = findKeychains(certPemFile.getKey(), specs).toList();
+                keychains.forEach(keychain -> {
+                    MacSign.security("import", certPemFile.getValue().normalize().toString(),
+                            "-k", keychain.name(),
+                            "-f", "pemseq",
+                            "-t", "agg",
+                            "-A").execute();
+                });
+
+                trustConfig.put(certPemFile.getValue(), keychains.getFirst());
+            }
+
+            // Trust certificates.
+            trustCertificates(trustConfig);
+        });
+
+        Keychain.addToSearchList(specs.stream().map(KeychainWithCertsSpec::keychain).toList());
+    }
+
+    /**
+     * Destroys the given signing configuration.
+     * <p>
+     * It will remove specified keychains from the keychain search list and delete
+     * the keychain files.
+     *
+     * @param specs the keychains and signing identities configuration
+     */
+    public static void tearDown(List<KeychainWithCertsSpec> specs) {
+        validate(specs);
+        Keychain.addToSearchList(List.of());
+        specs.forEach(spec -> {
+            spec.keychain().delete();
+        });
+    }
+
+    /**
+     * Returns {@code true} if the given signing configuration is deployed and in
+     * good standing.
+     *
+     * @param specs the keychains and signing identities configuration
+     * @return {@code true} if the given signing configuration is deployed and in
+     *         good standing
+     */
+    public static boolean isDeployed(List<KeychainWithCertsSpec> specs) {
+        validate(specs);
+        traceSigningEnvironment(specs);
+
+        final var missingKeychain = specs.stream().map(KeychainWithCertsSpec::keychain).filter(Predicate.not(Keychain::exists)).peek(keychain -> {
+            TKit.trace(String.format("Missing [%s] keychain file", keychain.path()));
+        }).findAny().isPresent();
+
+        final var specsWithExistingKeychains = specs.stream().filter(spec -> {
+            return spec.keychain().exists();
+        }).toList();
+
+        final var certificateStats = specsWithExistingKeychains.stream().collect(
+                toMap(KeychainWithCertsSpec::keychain, CertificateStats::get));
+
+        for (final var keychain : specsWithExistingKeychains.stream().map(KeychainWithCertsSpec::keychain).toList()) {
+            TKit.trace(String.format("In [%s] keychain:", keychain.name()));
+            final var certificateStat = certificateStats.get(keychain);
+            final var resolvedCertificateRequests = certificateStat.allResolvedCertificateRequests().stream()
+                    .sorted(Comparator.comparing(ResolvedCertificateRequest::request)).toList();
+            for (final var resolvedCertificateRequest : resolvedCertificateRequests) {
+                TKit.trace(String.format("  Certificate with hash=%s: %s[%s]",
+                        CertificateHash.of(resolvedCertificateRequest.cert()),
+                        resolvedCertificateRequest.request(),
+                        resolvedCertificateRequest.verifyStatus()));
+            }
+
+            for (final var unmappedCertificate : certificateStat.unmappedCertificates().entrySet()) {
+                TKit.trace(String.format("  Failed to create certificate request from the certificate with hash=%s: %s",
+                        CertificateHash.of(unmappedCertificate.getKey()), unmappedCertificate.getValue()));
+            }
+
+            for (final var unmappedCertificateRequest : certificateStat.unmappedCertificateRequests().stream().sorted().toList()) {
+                TKit.trace(String.format("  Missing certificate for %s certificate request", unmappedCertificateRequest));
+            }
+        }
+
+        final var missingCertificates = certificateStats.values().stream().anyMatch(stat -> {
+            return !stat.unmappedCertificateRequests().isEmpty();
+        });
+
+        final var invalidCertificates = certificateStats.values().stream().anyMatch(stat -> {
+            return !stat.verifyFailedCertificateRequests().isEmpty();
+        });
+
+        return !missingKeychain && !missingCertificates && !invalidCertificates;
+    }
+
+    public static Map<CertificateRequest, X509Certificate> mapCertificateRequests(KeychainWithCertsSpec spec) {
+        return CertificateStats.get(spec).mapKnownCertificateRequests().entrySet().stream().collect(toMap(Map.Entry::getKey, e -> {
+            return e.getValue().stream().reduce((x, y) -> {
+                throw new IllegalStateException(String.format(
+                        "Certificates with hash=%s and hash=%s map into %s certificate request in [%s] keychain",
+                        CertificateHash.of(x), CertificateHash.of(y), e.getKey(), spec.keychain().name()));
+            }).orElseThrow(() -> {
+                throw new IllegalStateException(String.format(
+                        "A certificate matching %s certificate request not found in [%s] keychain",
+                        e.getKey(), spec.keychain().name()));
+            });
+        }));
+    }
+
+    private static void validate(List<KeychainWithCertsSpec> specs) {
+        specs.stream().map(KeychainWithCertsSpec::keychain).map(Keychain::name).collect(toMap(x -> x, x -> x, (x, y) -> {
+            throw new IllegalArgumentException(String.format("Multiple keychains with the same name [%s]", x));
+        }));
+
+        specs.stream().forEach(spec -> {
+            spec.certificateRequests().stream().collect(toMap(x -> x, x -> x, (x, y) -> {
+                throw new IllegalArgumentException(String.format(
+                        "Multiple certificate requests with the same specification %s in one keychain [%s]", x, spec.keychain().name()));
+            }));
+        });
+    }
+
+    private static boolean verifyCertificate(ResolvedCertificateRequest resolvedCertificateRequest, Keychain keychain, Path certFile) {
+        PemData.of(resolvedCertificateRequest.cert()).save(certFile, StandardOpenOption.CREATE, StandardOpenOption.TRUNCATE_EXISTING);
+        for (final var mode : List.of("-q", "-v")) {
+            final var ok = security("verify-cert", "-L", "-n", mode,
+                    "-c", certFile.normalize().toString(),
+                    "-k", keychain.name(),
+                    "-p", resolvedCertificateRequest.request().type().verifyPolicy()).executeWithoutExitCodeCheck().getExitCode() == 0;
+            if (ok) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    private static void traceSigningEnvironment(Collection<KeychainWithCertsSpec> specs) {
+        TKit.trace("Signing environment:");
+        int specIdx = 1;
+        for (final var spec : specs) {
+            TKit.trace(String.format("[%d/%d] %s", specIdx++, specs.size(), spec.keychain()));
+            int certRequestIdx = 1;
+            for (final var certRequest : spec.certificateRequests()) {
+                TKit.trace(String.format("  [%d/%d] %s", certRequestIdx++, spec.certificateRequests().size(), certRequest));
+            }
+        }
+    }
+
+    private static Stream<Keychain> findKeychains(CertificateRequest certificateRequest,
+            Collection<KeychainWithCertsSpec> specs) {
+        Objects.requireNonNull(certificateRequest);
+        return specs.stream().filter(spec -> {
+            return spec.certificateRequests().contains(certificateRequest);
+        }).map(KeychainWithCertsSpec::keychain);
+    }
+
+    private static void withTempDirectory(ThrowingConsumer<Path> callback) {
+        try {
+            final var dir = Files.createTempDirectory("jdk.jpackage.test");
+            try {
+                ThrowingConsumer.toConsumer(callback).accept(dir);
+            } finally {
+                TKit.deleteDirectoryRecursive(dir, "");
+            }
+        } catch (IOException ex) {
+            throw new UncheckedIOException(ex);
+        }
+    }
+
+    private static Map<CertificateRequest, Path> createCertificates(Keychain privateKeySource,
+            Collection<KeychainWithCertsSpec> specs, Path outputPemDir) {
+
+        Objects.requireNonNull(privateKeySource);
+        Objects.requireNonNull(specs);
+        specs.forEach(Objects::requireNonNull);
+        Objects.requireNonNull(outputPemDir);
+
+        final Map<CertificateRequest, X509Certificate> createdCertificates = new HashMap<>();
+
+        withTempDirectory(tmpDir -> {
+            final var cfgFile = tmpDir.resolve("cert.cfg");
+            final var certFile = tmpDir.resolve("cert.pem");
+            final var keyFilePKCS12 = tmpDir.resolve("key.p12");
+            final var keyFilePEM = tmpDir.resolve("key.pem");
+
+            security("export",
+                    "-f", "pkcs12",
+                    "-k", privateKeySource.name(),
+                    "-t", "privKeys",
+                    "-P", "",
+                    "-o", keyFilePKCS12.normalize().toString()).execute();
+
+            // This step is needed only for LibreSSL variant of openssl command which can't take
+            // private key in PKCS#12 format.
+            Executor.of(OPENSSL.toString(), "pkcs12",
+                    "-nodes",
+                    "-in", keyFilePKCS12.normalize().toString(),
+                    "-password", "pass:",
+                    "-out", keyFilePEM.normalize().toString()).dumpOutput().execute();
+
+            final var keyFile = keyFilePEM;
+
+            for (final var spec : specs) {
+                for (final var certificateRequest : spec.certificateRequests()) {
+                    var cert = createdCertificates.get(certificateRequest);
+                    if (cert == null) {
+                        TKit.createTextFile(cfgFile, Stream.of(
+                                "[ req ]",
+                                "distinguished_name = req_name",
+                                "prompt=no",
+                                "[ req_name ]",
+                                "CN=" + certificateRequest.name()
+                        ));
+
+                        final var openssl = Executor.of(OPENSSL.toString(), "req",
+                                "-x509", "-utf8", "-sha256", "-nodes",
+                                "-new", // Prevents LibreSSL variant of openssl command from hanging
+                                "-days", Integer.toString(certificateRequest.days()),
+                                "-key", keyFile.normalize().toString(),
+                                "-config", cfgFile.normalize().toString(),
+                                "-out", certFile.normalize().toString());
+
+                        certificateRequest.type().extensions().forEach(ext -> {
+                            openssl.addArgument("-addext");
+                            openssl.addArgument(ext);
+                        });
+
+                        openssl.dumpOutput().execute();
+
+                        try (final var in = Files.newInputStream(certFile)) {
+                            cert = (X509Certificate)CERT_FACTORY.generateCertificate(in);
+                            createdCertificates.put(certificateRequest, cert);
+
+                            final var certHash = CertificateHash.of(cert);
+                            final var certPemFile = outputPemDir.resolve(certHash.toString() + ".pem");
+                            Files.copy(certFile, certPemFile);
+                        }
+                    }
+                }
+            }
+        });
+
+        return createdCertificates.entrySet().stream().collect(toMap(Map.Entry::getKey, e -> {
+            final var certHash = CertificateHash.of(e.getValue());
+            return outputPemDir.resolve(certHash.toString() + ".pem");
+        }));
+    }
+
+    private static void trustCertificates(Map<Path, Keychain> config) {
+        if (config.isEmpty()) {
+            throw new IllegalArgumentException();
+        }
+
+        final var exec = Executor.of("osascript", SIGN_UTILS_SCRIPT.toString(), "trust-certs",
+                config.keySet().iterator().next().getParent().toAbsolutePath().toString());
+
+        exec.addArguments(config.entrySet().stream().map(e -> {
+            return Stream.of(e.getValue().name(), e.getKey().getFileName().toString());
+        }).flatMap(x -> x).toList());
+
+        exec.dumpOutput().execute();
+    }
+
+    static Executor security(String... args) {
+        return Executor.of("security").dumpOutput().addArguments(args);
+    }
+
+    private static final CertificateFactory CERT_FACTORY = toSupplier(() -> {
+        return CertificateFactory.getInstance("X.509");
+    }).get();
+
+    // Code Signing
+    private static final List<String> CODE_SIGN_EXTENDED_KEY_USAGE = List.of("1.3.6.1.5.5.7.3.3");
+    // Apple Custom Extended Key Usage (EKU) packageSign
+    // https://oid-base.com/get/1.2.840.113635.100.4.13
+    private static final List<String> INSTALLER_EXTENDED_KEY_USAGE = List.of("1.2.840.113635.100.4.13");
+
+    private static final Path SIGN_UTILS_SCRIPT = TKit.TEST_SRC_ROOT.resolve("resources/sign-utils.applescript").normalize();
+
+    // macOS comes with /usr/bin/openssl which is LibreSSL
+    // If you install openssl with Homebrew, it will be installed in /usr/local/bin/openssl,
+    // and the PATH env variable will be altered to pick up openssl from Homebrew.
+    // However, jtreg will alter the value of the PATH env variable and
+    // /usr/bin/openssl will preempt /usr/local/bin/openssl.
+    // To workaround this jtreg behavior support specifying path to openssl command.
+    private static final Path OPENSSL = Path.of(Optional.ofNullable(TKit.getConfigProperty("openssl")).orElse("openssl"));
+}
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 f10415b5e97..c2c0397116d 100644
--- a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/TKit.java
+++ b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/TKit.java
@@ -518,11 +518,14 @@ public final class TKit {
     }
 
     public static RuntimeException throwSkippedException(String reason) {
-        trace("Skip the test: " + reason);
         RuntimeException ex = ThrowingSupplier.toSupplier(
                 () -> (RuntimeException) Class.forName("jtreg.SkippedException").getConstructor(
                         String.class).newInstance(reason)).get();
+        return throwSkippedException(ex);
+    }
 
+    public static RuntimeException throwSkippedException(RuntimeException ex) {
+        trace("Skip the test: " + ex.getMessage());
         currentTest.notifySkipped(ex);
         throw ex;
     }
diff --git a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/TestInstance.java b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/TestInstance.java
index 159a46c96c2..bef75e7280a 100644
--- a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/TestInstance.java
+++ b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/TestInstance.java
@@ -253,7 +253,7 @@ final class TestInstance implements ThrowingRunnable {
                 status = Status.Failed;
             }
 
-            if (!KEEP_WORK_DIR.contains(status)) {
+            if (!KEEP_WORK_DIR.contains(status) && Files.isDirectory(workDir)) {
                 if (Files.isSameFile(workDir, Path.of("."))) {
                     // 1. If the work directory is the current directory, don't
                     // delete it, just clean as deleting it would be confusing.
diff --git a/test/jdk/tools/jpackage/macosx/base/SigningBase.java b/test/jdk/tools/jpackage/macosx/base/SigningBase.java
index 021a19bb82f..d188a57dbd8 100644
--- a/test/jdk/tools/jpackage/macosx/base/SigningBase.java
+++ b/test/jdk/tools/jpackage/macosx/base/SigningBase.java
@@ -24,14 +24,95 @@
 import java.nio.file.Path;
 import java.util.Arrays;
 import java.util.List;
-
-import jdk.jpackage.test.JPackageCommand;
-import jdk.jpackage.test.TKit;
+import java.util.stream.Stream;
 import jdk.jpackage.test.Executor;
 import jdk.jpackage.test.Executor.Result;
+import jdk.jpackage.test.JPackageCommand;
+import jdk.jpackage.test.MacSign;
+import jdk.jpackage.test.MacSign.CertificateType;
+import jdk.jpackage.test.MacSign.CertificateRequest;
+import jdk.jpackage.test.MacSign.KeychainWithCertsSpec;
+import jdk.jpackage.test.TKit;
+
+
+/*
+ * @test
+ * @summary Setup the environment for jpackage macos signing tests.
+ *          Creates required keychains and signing identities.
+ *          Does NOT run any jpackag tests.
+ * @library /test/jdk/tools/jpackage/helpers
+ * @build jdk.jpackage.test.*
+ * @compile -Xlint:all -Werror SigningBase.java
+ * @requires (jpackage.test.MacSignTests == "setup")
+ * @run main/othervm/timeout=1440 -Xmx512m jdk.jpackage.test.Main
+ *  --jpt-run=SigningBase.setUp
+ */
+
+/*
+ * @test
+ * @summary Tear down the environment for jpackage macos signing tests.
+ *          Deletes required keychains and signing identities.
+ *          Does NOT run any jpackag tests.
+ * @library /test/jdk/tools/jpackage/helpers
+ * @build jdk.jpackage.test.*
+ * @compile -Xlint:all -Werror SigningBase.java
+ * @requires (jpackage.test.MacSignTests == "teardown")
+ * @run main/othervm/timeout=1440 -Xmx512m jdk.jpackage.test.Main
+ *  --jpt-run=SigningBase.tearDown
+ */
 
 public class SigningBase {
 
+    enum StandardKeychain {
+        MAIN(DEFAULT_KEYCHAIN,
+                cert().userName(DEV_NAMES[CertIndex.ASCII_INDEX.value()]).create(),
+                cert().type(CertificateType.INSTALLER).userName(DEV_NAMES[CertIndex.ASCII_INDEX.value()]).create(),
+                cert().userName(DEV_NAMES[CertIndex.UNICODE_INDEX.value()]).create(),
+                cert().type(CertificateType.INSTALLER).userName(DEV_NAMES[CertIndex.UNICODE_INDEX.value()]).create());
+
+        StandardKeychain(String keychainName, CertificateRequest cert, CertificateRequest... otherCerts) {
+            final var builder = keychain(keychainName).addCert(cert);
+            List.of(otherCerts).forEach(builder::addCert);
+            this.spec = builder.create();
+        }
+
+        KeychainWithCertsSpec spec() {
+            return spec;
+        }
+
+        private static KeychainWithCertsSpec.Builder keychain(String name) {
+            return new KeychainWithCertsSpec.Builder().name(name);
+        }
+
+        private static CertificateRequest.Builder cert() {
+            return new CertificateRequest.Builder();
+        }
+
+        private static List<KeychainWithCertsSpec> signingEnv() {
+            return Stream.of(values()).map(StandardKeychain::spec).toList();
+        }
+
+        final KeychainWithCertsSpec spec;
+    }
+
+    public static void setUp() {
+        MacSign.setUp(StandardKeychain.signingEnv());
+    }
+
+    public static void tearDown() {
+        MacSign.tearDown(StandardKeychain.signingEnv());
+    }
+
+    public static void verifySignTestEnvReady() {
+        if (!Inner.SIGN_ENV_READY) {
+            TKit.throwSkippedException(new IllegalStateException("Misconfigured signing test environment"));
+        }
+    }
+
+    private final class Inner {
+        private final static boolean SIGN_ENV_READY = MacSign.isDeployed(StandardKeychain.signingEnv());
+    }
+
     enum CertIndex {
         ASCII_INDEX(0),
         UNICODE_INDEX(1),
diff --git a/test/jdk/tools/jpackage/resources/sign-utils.applescript b/test/jdk/tools/jpackage/resources/sign-utils.applescript
new file mode 100644
index 00000000000..ef8bc31f328
--- /dev/null
+++ b/test/jdk/tools/jpackage/resources/sign-utils.applescript
@@ -0,0 +1,114 @@
+(*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *)
+
+on run argv
+  set action to (item 1 of argv)
+
+  if action is "run-shell-script" then
+    runShellCommandInTerminal (item 2 of argv)
+  else if action is "trust-certs" then
+    set certs to {}
+    set certFileDir to (item 2 of argv)
+    repeat with i from 3 to (length of argv) by 2
+      set end of certs to {keychain: item i of argv, cert: certFileDir & "/" & item (i + 1) of argv}
+    end repeat
+    trustCerts(certs)
+  else
+    error "Unrecognized command: [" & action & "]"
+  end if
+end run
+
+
+on trustCerts(certs)
+  set runShellScriptInTerminal to "osascript " & quoted form of (POSIX path of (path to me)) & " run-shell-script "
+  repeat with i from 1 to count of certs
+    set cert to item i of certs
+    set theLabel to "certificate [" & i & "/" & count of certs & "]"
+    repeat
+      tell application "Finder"
+        activate
+        display dialog ("Trust " & theLabel) giving up after 60
+      end tell
+      if button returned of result = "OK" then
+        try
+          set theScript to "/usr/bin/security add-trusted-cert -k " & quoted form of (keychain of cert) & " " & quoted form of (cert of cert)
+          set theCmdline to runShellScriptInTerminal & quoted form of theScript
+          log "Execute: " & theCmdline
+          do shell script theCmdline
+          log "Trusted " & theLabel
+          exit repeat
+        on error errMsg number errNum
+          log "Error occurred: " & errMsg & " (Error Code: " & errNum & ")"
+        end try
+      else if gave up of result then
+        error "Timeout of a request to trust " & theLabel
+      end if
+    end repeat
+  end repeat
+end trustCerts
+
+
+on runShellCommandInTerminal(shellCommand)
+  waitShellCommandAndCloseTerminalWindow(startShellCommandInTerminal(shellCommand))
+end runShellCommandInTerminal
+
+
+on startShellCommandInTerminal(shellCommand)
+  set runningFile to do shell script "mktemp"
+  tell application "Terminal"
+    set theTab to do script shellCommand & "; rm -f " & quoted form of runningFile & "; exit"
+    log theTab
+    return {terminalTab: theTab, file: runningFile}
+  end tell
+end startShellCommandInTerminal
+
+
+on waitShellCommandAndCloseTerminalWindow(tabWithRunningFile)
+  repeat
+    try
+      do shell script "test -f " & quoted form of file of tabWithRunningFile
+      -- shell script is still running
+      delay 2
+    on error
+      -- shell script is done, exit
+      exit repeat
+    end try
+  end repeat
+  closeTerminalTab(terminalTab of tabWithRunningFile)
+end waitShellCommandAndCloseTerminalWindow
+
+
+on closeTerminalTab(theTab)
+  -- Find the window owning "theTab" tab and close it
+  tell application "Terminal"
+    repeat with w in windows
+      repeat with t in tabs of w
+        if theTab is contents of t then
+          log "Closing window " & (id of w)
+          close w
+          return
+        end if
+      end repeat
+    end repeat
+  end tell
+end closeTerminalTab

From 5625b43ff4fa77843260d152d618ae1083ec04b8 Mon Sep 17 00:00:00 2001
From: Zihao Lin <linzihao1999@outlook.com>
Date: Tue, 25 Mar 2025 01:34:11 +0000
Subject: [PATCH 455/587] 8350429:
 runtime/NMT/CheckForProperDetailStackTrace.java should only run for debug JVM

Reviewed-by: stuefe, jsjolen
---
 .../jtreg/runtime/NMT/CheckForProperDetailStackTrace.java        | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/hotspot/jtreg/runtime/NMT/CheckForProperDetailStackTrace.java b/test/hotspot/jtreg/runtime/NMT/CheckForProperDetailStackTrace.java
index 049d7070266..398d6b523ad 100644
--- a/test/hotspot/jtreg/runtime/NMT/CheckForProperDetailStackTrace.java
+++ b/test/hotspot/jtreg/runtime/NMT/CheckForProperDetailStackTrace.java
@@ -28,6 +28,7 @@
  * @library /test/lib
  * @modules java.base/jdk.internal.misc
  *          java.management
+ * @requires vm.debug
  * @compile ../modules/CompilerUtils.java
  * @run driver CheckForProperDetailStackTrace
  */

From ba658a71ba4372b42a496edee55400f5014815d4 Mon Sep 17 00:00:00 2001
From: Xiaohong Gong <xgong@openjdk.org>
Date: Tue, 25 Mar 2025 01:35:27 +0000
Subject: [PATCH 456/587] 8349522: AArch64: Add backend implementation for new
 unsigned and saturating vector operations

Reviewed-by: epeter, haosun, bkilambi
---
 src/hotspot/cpu/aarch64/aarch64_vector.ad     | 285 +++++-
 src/hotspot/cpu/aarch64/aarch64_vector_ad.m4  | 153 ++-
 src/hotspot/cpu/aarch64/assembler_aarch64.hpp |  29 +-
 test/hotspot/gtest/aarch64/aarch64-asmtest.py |  32 +
 test/hotspot/gtest/aarch64/asmtest.out.h      | 960 ++++++++++--------
 .../compiler/lib/ir_framework/IRNode.java     |  15 +
 .../ir_framework/test/IREncodingPrinter.java  |   1 +
 .../VectorSaturatedOperationsTest.java        | 148 ++-
 8 files changed, 1146 insertions(+), 477 deletions(-)

diff --git a/src/hotspot/cpu/aarch64/aarch64_vector.ad b/src/hotspot/cpu/aarch64/aarch64_vector.ad
index d217fb7e949..ae51df2fea6 100644
--- a/src/hotspot/cpu/aarch64/aarch64_vector.ad
+++ b/src/hotspot/cpu/aarch64/aarch64_vector.ad
@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
+// Copyright (c) 2020, 2025, Oracle and/or its affiliates. All rights reserved.
 // Copyright (c) 2020, 2024, Arm Limited. All rights reserved.
 // DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 //
@@ -254,6 +254,13 @@ source %{
       case Op_CompressBitsV:
       case Op_ExpandBitsV:
         return false;
+      case Op_SaturatingAddV:
+      case Op_SaturatingSubV:
+        // Only SVE2 supports the predicated saturating instructions.
+        if (UseSVE < 2) {
+          return false;
+        }
+        break;
       // We use Op_LoadVectorMasked to implement the predicated Op_LoadVector.
       // Hence we turn to check whether Op_LoadVectorMasked is supported. The
       // same as vector store/gather/scatter.
@@ -1539,6 +1546,142 @@ instruct vand_notL_masked(vReg dst_src1, vReg src2, immL_M1 m1, pRegGov pg) %{
   ins_pipe(pipe_slow);
 %}
 
+// ------------------------- Vector saturating add -----------------------------
+
+// Signed saturating add
+
+instruct vsqadd(vReg dst, vReg src1, vReg src2) %{
+  predicate(!n->as_SaturatingVector()->is_unsigned());
+  match(Set dst (SaturatingAddV src1 src2));
+  format %{ "vsqadd $dst, $src1, $src2" %}
+  ins_encode %{
+    uint length_in_bytes = Matcher::vector_length_in_bytes(this);
+    if (VM_Version::use_neon_for_vector(length_in_bytes)) {
+      __ sqaddv($dst$$FloatRegister, get_arrangement(this),
+                $src1$$FloatRegister, $src2$$FloatRegister);
+    } else {
+      assert(UseSVE > 0, "must be sve");
+      BasicType bt = Matcher::vector_element_basic_type(this);
+      __ sve_sqadd($dst$$FloatRegister, __ elemType_to_regVariant(bt),
+                   $src1$$FloatRegister, $src2$$FloatRegister);
+    }
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+instruct vsqadd_masked(vReg dst_src1, vReg src2, pRegGov pg) %{
+  predicate(UseSVE == 2 && !n->as_SaturatingVector()->is_unsigned());
+  match(Set dst_src1 (SaturatingAddV (Binary dst_src1 src2) pg));
+  format %{ "vsqadd_masked $dst_src1, $pg, $dst_src1, $src2" %}
+  ins_encode %{
+    BasicType bt = Matcher::vector_element_basic_type(this);
+    __ sve_sqadd($dst_src1$$FloatRegister, __ elemType_to_regVariant(bt),
+                 $pg$$PRegister, $src2$$FloatRegister);
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+// Unsigned saturating add
+
+instruct vuqadd(vReg dst, vReg src1, vReg src2) %{
+  predicate(n->as_SaturatingVector()->is_unsigned());
+  match(Set dst (SaturatingAddV src1 src2));
+  format %{ "vuqadd $dst, $src1, $src2" %}
+  ins_encode %{
+    uint length_in_bytes = Matcher::vector_length_in_bytes(this);
+    if (VM_Version::use_neon_for_vector(length_in_bytes)) {
+      __ uqaddv($dst$$FloatRegister, get_arrangement(this),
+                $src1$$FloatRegister, $src2$$FloatRegister);
+    } else {
+      assert(UseSVE > 0, "must be sve");
+      BasicType bt = Matcher::vector_element_basic_type(this);
+      __ sve_uqadd($dst$$FloatRegister, __ elemType_to_regVariant(bt),
+                   $src1$$FloatRegister, $src2$$FloatRegister);
+    }
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+instruct vuqadd_masked(vReg dst_src1, vReg src2, pRegGov pg) %{
+  predicate(UseSVE == 2 && n->as_SaturatingVector()->is_unsigned());
+  match(Set dst_src1 (SaturatingAddV (Binary dst_src1 src2) pg));
+  format %{ "vuqadd_masked $dst_src1, $pg, $dst_src1, $src2" %}
+  ins_encode %{
+    BasicType bt = Matcher::vector_element_basic_type(this);
+    __ sve_uqadd($dst_src1$$FloatRegister, __ elemType_to_regVariant(bt),
+                 $pg$$PRegister, $src2$$FloatRegister);
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+// ------------------------- Vector saturating sub -----------------------------
+
+// Signed saturating sub
+
+instruct vsqsub(vReg dst, vReg src1, vReg src2) %{
+  predicate(!n->as_SaturatingVector()->is_unsigned());
+  match(Set dst (SaturatingSubV src1 src2));
+  format %{ "vsqsub $dst, $src1, $src2" %}
+  ins_encode %{
+    uint length_in_bytes = Matcher::vector_length_in_bytes(this);
+    if (VM_Version::use_neon_for_vector(length_in_bytes)) {
+      __ sqsubv($dst$$FloatRegister, get_arrangement(this),
+                $src1$$FloatRegister, $src2$$FloatRegister);
+    } else {
+      assert(UseSVE > 0, "must be sve");
+      BasicType bt = Matcher::vector_element_basic_type(this);
+      __ sve_sqsub($dst$$FloatRegister, __ elemType_to_regVariant(bt),
+                   $src1$$FloatRegister, $src2$$FloatRegister);
+    }
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+instruct vsqsub_masked(vReg dst_src1, vReg src2, pRegGov pg) %{
+  predicate(UseSVE == 2 && !n->as_SaturatingVector()->is_unsigned());
+  match(Set dst_src1 (SaturatingSubV (Binary dst_src1 src2) pg));
+  format %{ "vsqsub_masked $dst_src1, $pg, $dst_src1, $src2" %}
+  ins_encode %{
+    BasicType bt = Matcher::vector_element_basic_type(this);
+    __ sve_sqsub($dst_src1$$FloatRegister, __ elemType_to_regVariant(bt),
+                 $pg$$PRegister, $src2$$FloatRegister);
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+// Unsigned saturating sub
+
+instruct vuqsub(vReg dst, vReg src1, vReg src2) %{
+  predicate(n->as_SaturatingVector()->is_unsigned());
+  match(Set dst (SaturatingSubV src1 src2));
+  format %{ "vuqsub $dst, $src1, $src2" %}
+  ins_encode %{
+    uint length_in_bytes = Matcher::vector_length_in_bytes(this);
+    if (VM_Version::use_neon_for_vector(length_in_bytes)) {
+      __ uqsubv($dst$$FloatRegister, get_arrangement(this),
+                $src1$$FloatRegister, $src2$$FloatRegister);
+    } else {
+      assert(UseSVE > 0, "must be sve");
+      BasicType bt = Matcher::vector_element_basic_type(this);
+      __ sve_uqsub($dst$$FloatRegister, __ elemType_to_regVariant(bt),
+                   $src1$$FloatRegister, $src2$$FloatRegister);
+    }
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+instruct vuqsub_masked(vReg dst_src1, vReg src2, pRegGov pg) %{
+  predicate(UseSVE == 2 && n->as_SaturatingVector()->is_unsigned());
+  match(Set dst_src1 (SaturatingSubV (Binary dst_src1 src2) pg));
+  format %{ "vuqsub_masked $dst_src1, $pg, $dst_src1, $src2" %}
+  ins_encode %{
+    BasicType bt = Matcher::vector_element_basic_type(this);
+    __ sve_uqsub($dst_src1$$FloatRegister, __ elemType_to_regVariant(bt),
+                 $pg$$PRegister, $src2$$FloatRegister);
+  %}
+  ins_pipe(pipe_slow);
+%}
+
 // ------------------------------ Vector abs -----------------------------------
 
 // vector abs
@@ -1993,6 +2136,76 @@ instruct vmin_masked(vReg dst_src1, vReg src2, pRegGov pg) %{
   ins_pipe(pipe_slow);
 %}
 
+// vector unsigned min - LONG
+
+instruct vuminL_neon(vReg dst, vReg src1, vReg src2) %{
+  predicate(UseSVE == 0 && Matcher::vector_element_basic_type(n) == T_LONG);
+  match(Set dst (UMinV src1 src2));
+  effect(TEMP_DEF dst);
+  format %{ "vuminL_neon $dst, $src1, $src2\t# 2L" %}
+  ins_encode %{
+    __ cm(Assembler::HI, $dst$$FloatRegister, __ T2D, $src1$$FloatRegister, $src2$$FloatRegister);
+    __ bsl($dst$$FloatRegister, __ T16B, $src2$$FloatRegister, $src1$$FloatRegister);
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+instruct vuminL_sve(vReg dst_src1, vReg src2) %{
+  predicate(UseSVE > 0 && Matcher::vector_element_basic_type(n) == T_LONG);
+  match(Set dst_src1 (UMinV dst_src1 src2));
+  format %{ "vuminL_sve $dst_src1, $dst_src1, $src2" %}
+  ins_encode %{
+    __ sve_umin($dst_src1$$FloatRegister, __ D, ptrue, $src2$$FloatRegister);
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+// vector unsigned min - B/S/I
+
+instruct vumin_neon(vReg dst, vReg src1, vReg src2) %{
+  predicate(Matcher::vector_element_basic_type(n) != T_LONG &&
+            VM_Version::use_neon_for_vector(Matcher::vector_length_in_bytes(n)));
+  match(Set dst (UMinV src1 src2));
+  format %{ "vumin_neon $dst, $src1, $src2\t# B/S/I" %}
+  ins_encode %{
+    BasicType bt = Matcher::vector_element_basic_type(this);
+    assert(is_integral_type(bt) && bt != T_LONG, "unsupported type");
+    __ uminv($dst$$FloatRegister, get_arrangement(this),
+             $src1$$FloatRegister, $src2$$FloatRegister);
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+instruct vumin_sve(vReg dst_src1, vReg src2) %{
+  predicate(Matcher::vector_element_basic_type(n) != T_LONG &&
+            !VM_Version::use_neon_for_vector(Matcher::vector_length_in_bytes(n)));
+  match(Set dst_src1 (UMinV dst_src1 src2));
+  format %{ "vumin_sve $dst_src1, $dst_src1, $src2\t# B/S/I" %}
+  ins_encode %{
+    assert(UseSVE > 0, "must be sve");
+    BasicType bt = Matcher::vector_element_basic_type(this);
+    assert(is_integral_type(bt) && bt != T_LONG, "unsupported type");
+    __ sve_umin($dst_src1$$FloatRegister, __ elemType_to_regVariant(bt),
+                ptrue, $src2$$FloatRegister);
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+// vector unsigned min - predicated
+
+instruct vumin_masked(vReg dst_src1, vReg src2, pRegGov pg) %{
+  predicate(UseSVE > 0);
+  match(Set dst_src1 (UMinV (Binary dst_src1 src2) pg));
+  format %{ "vumin_masked $dst_src1, $pg, $dst_src1, $src2" %}
+  ins_encode %{
+    BasicType bt = Matcher::vector_element_basic_type(this);
+    assert(is_integral_type(bt), "unsupported type");
+    __ sve_umin($dst_src1$$FloatRegister, __ elemType_to_regVariant(bt),
+                $pg$$PRegister, $src2$$FloatRegister);
+  %}
+  ins_pipe(pipe_slow);
+%}
+
 // ------------------------------ Vector max -----------------------------------
 
 // vector max - LONG
@@ -2080,6 +2293,76 @@ instruct vmax_masked(vReg dst_src1, vReg src2, pRegGov pg) %{
   ins_pipe(pipe_slow);
 %}
 
+// vector unsigned max - LONG
+
+instruct vumaxL_neon(vReg dst, vReg src1, vReg src2) %{
+  predicate(UseSVE == 0 && Matcher::vector_element_basic_type(n) == T_LONG);
+  match(Set dst (UMaxV src1 src2));
+  effect(TEMP_DEF dst);
+  format %{ "vumaxL_neon $dst, $src1, $src2\t# 2L" %}
+  ins_encode %{
+    __ cm(Assembler::HI, $dst$$FloatRegister, __ T2D, $src1$$FloatRegister, $src2$$FloatRegister);
+    __ bsl($dst$$FloatRegister, __ T16B, $src1$$FloatRegister, $src2$$FloatRegister);
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+instruct vumaxL_sve(vReg dst_src1, vReg src2) %{
+  predicate(UseSVE > 0 && Matcher::vector_element_basic_type(n) == T_LONG);
+  match(Set dst_src1 (UMaxV dst_src1 src2));
+  format %{ "vumaxL_sve $dst_src1, $dst_src1, $src2" %}
+  ins_encode %{
+    __ sve_umax($dst_src1$$FloatRegister, __ D, ptrue, $src2$$FloatRegister);
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+// vector unsigned max - B/S/I
+
+instruct vumax_neon(vReg dst, vReg src1, vReg src2) %{
+  predicate(Matcher::vector_element_basic_type(n) != T_LONG &&
+            VM_Version::use_neon_for_vector(Matcher::vector_length_in_bytes(n)));
+  match(Set dst (UMaxV src1 src2));
+  format %{ "vumax_neon $dst, $src1, $src2\t# B/S/I" %}
+  ins_encode %{
+    BasicType bt = Matcher::vector_element_basic_type(this);
+    assert(is_integral_type(bt) && bt != T_LONG, "unsupported type");
+    __ umaxv($dst$$FloatRegister, get_arrangement(this),
+             $src1$$FloatRegister, $src2$$FloatRegister);
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+instruct vumax_sve(vReg dst_src1, vReg src2) %{
+  predicate(Matcher::vector_element_basic_type(n) != T_LONG &&
+            !VM_Version::use_neon_for_vector(Matcher::vector_length_in_bytes(n)));
+  match(Set dst_src1 (UMaxV dst_src1 src2));
+  format %{ "vumax_sve $dst_src1, $dst_src1, $src2\t# B/S/I" %}
+  ins_encode %{
+    assert(UseSVE > 0, "must be sve");
+    BasicType bt = Matcher::vector_element_basic_type(this);
+    assert(is_integral_type(bt) && bt != T_LONG, "unsupported type");
+    __ sve_umax($dst_src1$$FloatRegister, __ elemType_to_regVariant(bt),
+                ptrue, $src2$$FloatRegister);
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+// vector unsigned max - predicated
+
+instruct vumax_masked(vReg dst_src1, vReg src2, pRegGov pg) %{
+  predicate(UseSVE > 0);
+  match(Set dst_src1 (UMaxV (Binary dst_src1 src2) pg));
+  format %{ "vumax_masked $dst_src1, $pg, $dst_src1, $src2" %}
+  ins_encode %{
+    BasicType bt = Matcher::vector_element_basic_type(this);
+    assert(is_integral_type(bt), "unsupported type");
+    __ sve_umax($dst_src1$$FloatRegister, __ elemType_to_regVariant(bt),
+                $pg$$PRegister, $src2$$FloatRegister);
+  %}
+  ins_pipe(pipe_slow);
+%}
+
 // ------------------------------ MLA RELATED ----------------------------------
 
 // vector mla
diff --git a/src/hotspot/cpu/aarch64/aarch64_vector_ad.m4 b/src/hotspot/cpu/aarch64/aarch64_vector_ad.m4
index 422e98d9b68..5d999299f03 100644
--- a/src/hotspot/cpu/aarch64/aarch64_vector_ad.m4
+++ b/src/hotspot/cpu/aarch64/aarch64_vector_ad.m4
@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
+// Copyright (c) 2020, 2025, Oracle and/or its affiliates. All rights reserved.
 // Copyright (c) 2020, 2024, Arm Limited. All rights reserved.
 // DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 //
@@ -244,6 +244,13 @@ source %{
       case Op_CompressBitsV:
       case Op_ExpandBitsV:
         return false;
+      case Op_SaturatingAddV:
+      case Op_SaturatingSubV:
+        // Only SVE2 supports the predicated saturating instructions.
+        if (UseSVE < 2) {
+          return false;
+        }
+        break;
       // We use Op_LoadVectorMasked to implement the predicated Op_LoadVector.
       // Hence we turn to check whether Op_LoadVectorMasked is supported. The
       // same as vector store/gather/scatter.
@@ -813,6 +820,65 @@ dnl
 VECTOR_AND_NOT_PREDICATE(I)
 VECTOR_AND_NOT_PREDICATE(L)
 
+dnl
+dnl VECTOR_SATURATING_OP($1,     $2, $3     )
+dnl VECTOR_SATURATING_OP(prefix, op, op_name)
+define(`VECTOR_SATURATING_OP', `
+instruct v$1$2(vReg dst, vReg src1, vReg src2) %{
+  predicate(ifelse($1, sq, `!',`')n->as_SaturatingVector()->is_unsigned());
+  match(Set dst ($3 src1 src2));
+  format %{ "v$1$2 $dst, $src1, $src2" %}
+  ins_encode %{
+    uint length_in_bytes = Matcher::vector_length_in_bytes(this);
+    if (VM_Version::use_neon_for_vector(length_in_bytes)) {
+      __ $1$2v($dst$$FloatRegister, get_arrangement(this),
+                $src1$$FloatRegister, $src2$$FloatRegister);
+    } else {
+      assert(UseSVE > 0, "must be sve");
+      BasicType bt = Matcher::vector_element_basic_type(this);
+      __ sve_$1$2($dst$$FloatRegister, __ elemType_to_regVariant(bt),
+                   $src1$$FloatRegister, $src2$$FloatRegister);
+    }
+  %}
+  ins_pipe(pipe_slow);
+%}')dnl
+dnl
+dnl
+dnl VECTOR_SATURATING_PREDICATE($1,     $2, $3     )
+dnl VECTOR_SATURATING_PREDICATE(prefix, op, op_name)
+define(`VECTOR_SATURATING_PREDICATE', `
+instruct v$1$2_masked(vReg dst_src1, vReg src2, pRegGov pg) %{
+  predicate(UseSVE == 2 && ifelse($1, sq, `!',`')n->as_SaturatingVector()->is_unsigned());
+  match(Set dst_src1 ($3 (Binary dst_src1 src2) pg));
+  format %{ "v$1$2_masked $dst_src1, $pg, $dst_src1, $src2" %}
+  ins_encode %{
+    BasicType bt = Matcher::vector_element_basic_type(this);
+    __ sve_$1$2($dst_src1$$FloatRegister, __ elemType_to_regVariant(bt),
+                 $pg$$PRegister, $src2$$FloatRegister);
+  %}
+  ins_pipe(pipe_slow);
+%}')dnl
+dnl
+// ------------------------- Vector saturating add -----------------------------
+
+// Signed saturating add
+VECTOR_SATURATING_OP(sq, add, SaturatingAddV)
+VECTOR_SATURATING_PREDICATE(sq, add, SaturatingAddV)
+
+// Unsigned saturating add
+VECTOR_SATURATING_OP(uq, add, SaturatingAddV)
+VECTOR_SATURATING_PREDICATE(uq, add, SaturatingAddV)
+
+// ------------------------- Vector saturating sub -----------------------------
+
+// Signed saturating sub
+VECTOR_SATURATING_OP(sq, sub, SaturatingSubV)
+VECTOR_SATURATING_PREDICATE(sq, sub, SaturatingSubV)
+
+// Unsigned saturating sub
+VECTOR_SATURATING_OP(uq, sub, SaturatingSubV)
+VECTOR_SATURATING_PREDICATE(uq, sub, SaturatingSubV)
+
 dnl
 dnl UNARY_OP($1,        $2,      $3,        $4,       $5  )
 dnl UNARY_OP(rule_name, op_name, insn_neon, insn_sve, size)
@@ -964,17 +1030,17 @@ UNARY_OP_PREDICATE_WITH_SIZE(vsqrtF, SqrtVF, sve_fsqrt, S)
 UNARY_OP_PREDICATE_WITH_SIZE(vsqrtD, SqrtVD, sve_fsqrt, D)
 
 dnl
-dnl VMINMAX_L_NEON($1,   $2     )
-dnl VMINMAX_L_NEON(type, op_name)
+dnl VMINMAX_L_NEON($1,   $2     , $3  )
+dnl VMINMAX_L_NEON(type, op_name, sign)
 define(`VMINMAX_L_NEON', `
-instruct v$1L_neon(vReg dst, vReg src1, vReg src2) %{
+instruct v$3$1L_neon(vReg dst, vReg src1, vReg src2) %{
   predicate(UseSVE == 0 && Matcher::vector_element_basic_type(n) == T_LONG);
   match(Set dst ($2 src1 src2));
   effect(TEMP_DEF dst);
-  format %{ "v$1L_neon $dst, $src1, $src2\t# 2L" %}
+  format %{ "v$3$1L_neon $dst, $src1, $src2\t# 2L" %}
   ins_encode %{
-    __ cm(Assembler::GT, $dst$$FloatRegister, __ T2D, $src1$$FloatRegister, $src2$$FloatRegister);
-    __ bsl($dst$$FloatRegister, __ T16B, ifelse(min, $1, $src2, $src1)$$FloatRegister, ifelse(min, $1, $src1, $src2)$$FloatRegister);
+    __ cm(Assembler::ifelse($3, u, HI, GT), $dst$$FloatRegister, __ T2D, $src1$$FloatRegister, $src2$$FloatRegister);
+    __ bsl($dst$$FloatRegister, __ T16B, ifelse($1, min, $src2, $src1)$$FloatRegister, ifelse(min, $1, $src1, $src2)$$FloatRegister);
   %}
   ins_pipe(pipe_slow);
 %}')dnl
@@ -1058,6 +1124,57 @@ instruct v$1_masked(vReg dst_src1, vReg src2, pRegGov pg) %{
   ins_pipe(pipe_slow);
 %}')dnl
 dnl
+dnl VUMINMAX_NEON($1,   $2,      $3  )
+dnl VUMINMAX_NEON(type, op_name, insn)
+define(`VUMINMAX_NEON', `
+instruct v$1_neon(vReg dst, vReg src1, vReg src2) %{
+  predicate(Matcher::vector_element_basic_type(n) != T_LONG &&
+            VM_Version::use_neon_for_vector(Matcher::vector_length_in_bytes(n)));
+  match(Set dst ($2 src1 src2));
+  format %{ "v$1_neon $dst, $src1, $src2\t# B/S/I" %}
+  ins_encode %{
+    BasicType bt = Matcher::vector_element_basic_type(this);
+    assert(is_integral_type(bt) && bt != T_LONG, "unsupported type");
+    __ $3($dst$$FloatRegister, get_arrangement(this),
+             $src1$$FloatRegister, $src2$$FloatRegister);
+  %}
+  ins_pipe(pipe_slow);
+%}')dnl
+dnl
+dnl VUMINMAX_SVE($1,   $2,      $3  )
+dnl VUMINMAX_SVE(type, op_name, insn)
+define(`VUMINMAX_SVE', `
+instruct v$1_sve(vReg dst_src1, vReg src2) %{
+  predicate(Matcher::vector_element_basic_type(n) != T_LONG &&
+            !VM_Version::use_neon_for_vector(Matcher::vector_length_in_bytes(n)));
+  match(Set dst_src1 ($2 dst_src1 src2));
+  format %{ "v$1_sve $dst_src1, $dst_src1, $src2\t# B/S/I" %}
+  ins_encode %{
+    assert(UseSVE > 0, "must be sve");
+    BasicType bt = Matcher::vector_element_basic_type(this);
+    assert(is_integral_type(bt) && bt != T_LONG, "unsupported type");
+    __ $3($dst_src1$$FloatRegister, __ elemType_to_regVariant(bt),
+                ptrue, $src2$$FloatRegister);
+  %}
+  ins_pipe(pipe_slow);
+%}')dnl
+dnl
+dnl VUMINMAX_PREDICATE($1,   $2,      $3  )
+dnl VUMINMAX_PREDICATE(type, op_name, insn)
+define(`VUMINMAX_PREDICATE', `
+instruct v$1_masked(vReg dst_src1, vReg src2, pRegGov pg) %{
+  predicate(UseSVE > 0);
+  match(Set dst_src1 ($2 (Binary dst_src1 src2) pg));
+  format %{ "v$1_masked $dst_src1, $pg, $dst_src1, $src2" %}
+  ins_encode %{
+    BasicType bt = Matcher::vector_element_basic_type(this);
+    assert(is_integral_type(bt), "unsupported type");
+    __ $3($dst_src1$$FloatRegister, __ elemType_to_regVariant(bt),
+                $pg$$PRegister, $src2$$FloatRegister);
+  %}
+  ins_pipe(pipe_slow);
+%}')dnl
+dnl
 // ------------------------------ Vector min -----------------------------------
 
 // vector min - LONG
@@ -1071,6 +1188,17 @@ VMINMAX_SVE(min, MinV, sve_fmin, sve_smin)
 // vector min - predicated
 VMINMAX_PREDICATE(min, MinV, sve_fmin, sve_smin)
 
+// vector unsigned min - LONG
+VMINMAX_L_NEON(min, UMinV, u)
+VMINMAX_L_SVE(umin, UMinV, sve_umin)
+
+// vector unsigned min - B/S/I
+VUMINMAX_NEON(umin, UMinV, uminv)
+VUMINMAX_SVE(umin, UMinV, sve_umin)
+
+// vector unsigned min - predicated
+VUMINMAX_PREDICATE(umin, UMinV, sve_umin)
+
 // ------------------------------ Vector max -----------------------------------
 
 // vector max - LONG
@@ -1084,6 +1212,17 @@ VMINMAX_SVE(max, MaxV, sve_fmax, sve_smax)
 // vector max - predicated
 VMINMAX_PREDICATE(max, MaxV, sve_fmax, sve_smax)
 
+// vector unsigned max - LONG
+VMINMAX_L_NEON(max, UMaxV, u)
+VMINMAX_L_SVE(umax, UMaxV, sve_umax)
+
+// vector unsigned max - B/S/I
+VUMINMAX_NEON(umax, UMaxV, umaxv)
+VUMINMAX_SVE(umax, UMaxV, sve_umax)
+
+// vector unsigned max - predicated
+VUMINMAX_PREDICATE(umax, UMaxV, sve_umax)
+
 // ------------------------------ MLA RELATED ----------------------------------
 
 // vector mla
diff --git a/src/hotspot/cpu/aarch64/assembler_aarch64.hpp b/src/hotspot/cpu/aarch64/assembler_aarch64.hpp
index c91a136e7d5..3db7d308844 100644
--- a/src/hotspot/cpu/aarch64/assembler_aarch64.hpp
+++ b/src/hotspot/cpu/aarch64/assembler_aarch64.hpp
@@ -2600,6 +2600,9 @@ template<typename R, typename... Rx>
 
   INSN(addv,   0, 0b100001, true);  // accepted arrangements: T8B, T16B, T4H, T8H, T2S, T4S, T2D
   INSN(subv,   1, 0b100001, true);  // accepted arrangements: T8B, T16B, T4H, T8H, T2S, T4S, T2D
+  INSN(sqaddv, 0, 0b000011, true);  // accepted arrangements: T8B, T16B, T4H, T8H, T2S, T4S, T2D
+  INSN(sqsubv, 0, 0b001011, true);  // accepted arrangements: T8B, T16B, T4H, T8H, T2S, T4S, T2D
+  INSN(uqaddv, 1, 0b000011, true);  // accepted arrangements: T8B, T16B, T4H, T8H, T2S, T4S, T2D
   INSN(uqsubv, 1, 0b001011, true);  // accepted arrangements: T8B, T16B, T4H, T8H, T2S, T4S, T2D
   INSN(mulv,   0, 0b100111, false); // accepted arrangements: T8B, T16B, T4H, T8H, T2S, T4S
   INSN(mlav,   0, 0b100101, false); // accepted arrangements: T8B, T16B, T4H, T8H, T2S, T4S
@@ -2613,6 +2616,8 @@ template<typename R, typename... Rx>
   INSN(umlalv, 1, 0b100000, false); // accepted arrangements: T8B, T16B, T4H, T8H, T2S, T4S
   INSN(maxv,   0, 0b011001, false); // accepted arrangements: T8B, T16B, T4H, T8H, T2S, T4S
   INSN(minv,   0, 0b011011, false); // accepted arrangements: T8B, T16B, T4H, T8H, T2S, T4S
+  INSN(umaxv,  1, 0b011001, false); // accepted arrangements: T8B, T16B, T4H, T8H, T2S, T4S
+  INSN(uminv,  1, 0b011011, false); // accepted arrangements: T8B, T16B, T4H, T8H, T2S, T4S
   INSN(smaxp,  0, 0b101001, false); // accepted arrangements: T8B, T16B, T4H, T8H, T2S, T4S
   INSN(sminp,  0, 0b101011, false); // accepted arrangements: T8B, T16B, T4H, T8H, T2S, T4S
   INSN(sqdmulh,0, 0b101101, false); // accepted arrangements: T4H, T8H, T2S, T4S
@@ -3323,8 +3328,12 @@ public:
     f(0b00000100, 31, 24), f(T, 23, 22), f(1, 21),                                     \
     rf(Zm, 16), f(0, 15, 13), f(opcode, 12, 10), rf(Zn, 5), rf(Zd, 0);                 \
   }
-  INSN(sve_add, 0b000);
-  INSN(sve_sub, 0b001);
+  INSN(sve_add,   0b000);
+  INSN(sve_sub,   0b001);
+  INSN(sve_sqadd, 0b100);
+  INSN(sve_sqsub, 0b110);
+  INSN(sve_uqadd, 0b101);
+  INSN(sve_uqsub, 0b111);
 #undef INSN
 
 // SVE integer add/subtract immediate (unpredicated)
@@ -3435,6 +3444,8 @@ public:
   INSN(sve_sminv, 0b00000100, 0b001010001); // signed minimum reduction to scalar
   INSN(sve_sub,   0b00000100, 0b000001000); // vector sub
   INSN(sve_uaddv, 0b00000100, 0b000001001); // unsigned add reduction to scalar
+  INSN(sve_umax,  0b00000100, 0b001001000); // unsigned maximum vectors
+  INSN(sve_umin,  0b00000100, 0b001011000); // unsigned minimum vectors
 #undef INSN
 
 // SVE floating-point arithmetic - predicate
@@ -4226,6 +4237,20 @@ public:
   INSN(sve_eor3, 0b001); // Bitwise exclusive OR of three vectors
 #undef INSN
 
+// SVE2 saturating operations - predicate
+#define INSN(NAME, op1, op2)                                                          \
+  void NAME(FloatRegister Zdn, SIMD_RegVariant T, PRegister Pg, FloatRegister Znm) {  \
+    assert(T != Q, "invalid register variant");                                       \
+    sve_predicate_reg_insn(op1, op2, Zdn, T, Pg, Znm);                                \
+  }
+
+  INSN(sve_sqadd, 0b01000100, 0b011000100); // signed saturating add
+  INSN(sve_sqsub, 0b01000100, 0b011010100); // signed saturating sub
+  INSN(sve_uqadd, 0b01000100, 0b011001100); // unsigned saturating add
+  INSN(sve_uqsub, 0b01000100, 0b011011100); // unsigned saturating sub
+
+#undef INSN
+
   Assembler(CodeBuffer* code) : AbstractAssembler(code) {
   }
 
diff --git a/test/hotspot/gtest/aarch64/aarch64-asmtest.py b/test/hotspot/gtest/aarch64/aarch64-asmtest.py
index 45ecf57e971..92868e783dc 100644
--- a/test/hotspot/gtest/aarch64/aarch64-asmtest.py
+++ b/test/hotspot/gtest/aarch64/aarch64-asmtest.py
@@ -1792,12 +1792,28 @@ generate(ThreeRegNEONOp,
           ["addv", "add", "4H"], ["addv", "add", "8H"],
           ["addv", "add", "2S"], ["addv", "add", "4S"],
           ["addv", "add", "2D"],
+          ["sqaddv", "sqadd", "8B"], ["sqaddv", "sqadd", "16B"],
+          ["sqaddv", "sqadd", "4H"], ["sqaddv", "sqadd", "8H"],
+          ["sqaddv", "sqadd", "2S"], ["sqaddv", "sqadd", "4S"],
+          ["sqaddv", "sqadd", "2D"],
+          ["uqaddv", "uqadd", "8B"], ["uqaddv", "uqadd", "16B"],
+          ["uqaddv", "uqadd", "4H"], ["uqaddv", "uqadd", "8H"],
+          ["uqaddv", "uqadd", "2S"], ["uqaddv", "uqadd", "4S"],
+          ["uqaddv", "uqadd", "2D"],
           ["fadd", "fadd", "2S"], ["fadd", "fadd", "4S"],
           ["fadd", "fadd", "2D"],
           ["subv", "sub", "8B"], ["subv", "sub", "16B"],
           ["subv", "sub", "4H"], ["subv", "sub", "8H"],
           ["subv", "sub", "2S"], ["subv", "sub", "4S"],
           ["subv", "sub", "2D"],
+          ["sqsubv", "sqsub", "8B"], ["sqsubv", "sqsub", "16B"],
+          ["sqsubv", "sqsub", "4H"], ["sqsubv", "sqsub", "8H"],
+          ["sqsubv", "sqsub", "2S"], ["sqsubv", "sqsub", "4S"],
+          ["sqsubv", "sqsub", "2D"],
+          ["uqsubv", "uqsub", "8B"], ["uqsubv", "uqsub", "16B"],
+          ["uqsubv", "uqsub", "4H"], ["uqsubv", "uqsub", "8H"],
+          ["uqsubv", "uqsub", "2S"], ["uqsubv", "uqsub", "4S"],
+          ["uqsubv", "uqsub", "2D"],
           ["fsub", "fsub", "2S"], ["fsub", "fsub", "4S"],
           ["fsub", "fsub", "2D"],
           ["mulv", "mul", "8B"], ["mulv", "mul", "16B"],
@@ -1822,6 +1838,9 @@ generate(ThreeRegNEONOp,
           ["maxv", "smax", "8B"], ["maxv", "smax", "16B"],
           ["maxv", "smax", "4H"], ["maxv", "smax", "8H"],
           ["maxv", "smax", "2S"], ["maxv", "smax", "4S"],
+          ["umaxv", "umax", "8B"], ["umaxv", "umax", "16B"],
+          ["umaxv", "umax", "4H"], ["umaxv", "umax", "8H"],
+          ["umaxv", "umax", "2S"], ["umaxv", "umax", "4S"],
           ["smaxp", "smaxp", "8B"], ["smaxp", "smaxp", "16B"],
           ["smaxp", "smaxp", "4H"], ["smaxp", "smaxp", "8H"],
           ["smaxp", "smaxp", "2S"], ["smaxp", "smaxp", "4S"],
@@ -1830,6 +1849,9 @@ generate(ThreeRegNEONOp,
           ["minv", "smin", "8B"], ["minv", "smin", "16B"],
           ["minv", "smin", "4H"], ["minv", "smin", "8H"],
           ["minv", "smin", "2S"], ["minv", "smin", "4S"],
+          ["uminv", "umin", "8B"], ["uminv", "umin", "16B"],
+          ["uminv", "umin", "4H"], ["uminv", "umin", "8H"],
+          ["uminv", "umin", "2S"], ["uminv", "umin", "4S"],
           ["sminp", "sminp", "8B"], ["sminp", "sminp", "16B"],
           ["sminp", "sminp", "4H"], ["sminp", "sminp", "8H"],
           ["sminp", "sminp", "2S"], ["sminp", "sminp", "4S"],
@@ -2131,6 +2153,10 @@ generate(SVEVectorOp, [["add", "ZZZ"],
                        ["fadd", "ZZZ"],
                        ["fmul", "ZZZ"],
                        ["fsub", "ZZZ"],
+                       ["sqadd", "ZZZ"],
+                       ["sqsub", "ZZZ"],
+                       ["uqadd", "ZZZ"],
+                       ["uqsub", "ZZZ"],
                        ["abs", "ZPZ", "m"],
                        ["add", "ZPZ", "m", "dn"],
                        ["and", "ZPZ", "m", "dn"],
@@ -2149,6 +2175,8 @@ generate(SVEVectorOp, [["add", "ZZZ"],
                        ["revb", "ZPZ", "m"],
                        ["smax", "ZPZ", "m", "dn"],
                        ["smin", "ZPZ", "m", "dn"],
+                       ["umax", "ZPZ", "m", "dn"],
+                       ["umin", "ZPZ", "m", "dn"],
                        ["sub", "ZPZ", "m", "dn"],
                        ["fabs", "ZPZ", "m"],
                        ["fadd", "ZPZ", "m", "dn"],
@@ -2183,6 +2211,10 @@ generate(SVEVectorOp, [["add", "ZZZ"],
                        ["bext", "ZZZ"],
                        ["bdep", "ZZZ"],
                        ["eor3", "ZZZ"],
+                       ["sqadd", "ZPZ", "m", "dn"],
+                       ["sqsub", "ZPZ", "m", "dn"],
+                       ["uqadd", "ZPZ", "m", "dn"],
+                       ["uqsub", "ZPZ", "m", "dn"],
                       ])
 
 generate(SVEReductionOp, [["andv", 0], ["orv", 0], ["eorv", 0], ["smaxv", 0], ["sminv", 0],
diff --git a/test/hotspot/gtest/aarch64/asmtest.out.h b/test/hotspot/gtest/aarch64/asmtest.out.h
index 3bcd40ba2aa..0c2011592b6 100644
--- a/test/hotspot/gtest/aarch64/asmtest.out.h
+++ b/test/hotspot/gtest/aarch64/asmtest.out.h
@@ -673,175 +673,215 @@
     __ addv(v28, __ T2S, v29, v30);                    //       add     v28.2S, v29.2S, v30.2S
     __ addv(v2, __ T4S, v3, v4);                       //       add     v2.4S, v3.4S, v4.4S
     __ addv(v25, __ T2D, v26, v27);                    //       add     v25.2D, v26.2D, v27.2D
-    __ fadd(v5, __ T2S, v6, v7);                       //       fadd    v5.2S, v6.2S, v7.2S
-    __ fadd(v3, __ T4S, v4, v5);                       //       fadd    v3.4S, v4.4S, v5.4S
-    __ fadd(v8, __ T2D, v9, v10);                      //       fadd    v8.2D, v9.2D, v10.2D
-    __ subv(v22, __ T8B, v23, v24);                    //       sub     v22.8B, v23.8B, v24.8B
-    __ subv(v19, __ T16B, v20, v21);                   //       sub     v19.16B, v20.16B, v21.16B
-    __ subv(v13, __ T4H, v14, v15);                    //       sub     v13.4H, v14.4H, v15.4H
-    __ subv(v5, __ T8H, v6, v7);                       //       sub     v5.8H, v6.8H, v7.8H
-    __ subv(v29, __ T2S, v30, v31);                    //       sub     v29.2S, v30.2S, v31.2S
-    __ subv(v24, __ T4S, v25, v26);                    //       sub     v24.4S, v25.4S, v26.4S
-    __ subv(v21, __ T2D, v22, v23);                    //       sub     v21.2D, v22.2D, v23.2D
-    __ fsub(v26, __ T2S, v27, v28);                    //       fsub    v26.2S, v27.2S, v28.2S
-    __ fsub(v24, __ T4S, v25, v26);                    //       fsub    v24.4S, v25.4S, v26.4S
-    __ fsub(v3, __ T2D, v4, v5);                       //       fsub    v3.2D, v4.2D, v5.2D
-    __ mulv(v24, __ T8B, v25, v26);                    //       mul     v24.8B, v25.8B, v26.8B
-    __ mulv(v26, __ T16B, v27, v28);                   //       mul     v26.16B, v27.16B, v28.16B
-    __ mulv(v23, __ T4H, v24, v25);                    //       mul     v23.4H, v24.4H, v25.4H
-    __ mulv(v15, __ T8H, v16, v17);                    //       mul     v15.8H, v16.8H, v17.8H
-    __ mulv(v21, __ T2S, v22, v23);                    //       mul     v21.2S, v22.2S, v23.2S
-    __ mulv(v3, __ T4S, v4, v5);                       //       mul     v3.4S, v4.4S, v5.4S
-    __ fabd(v24, __ T2S, v25, v26);                    //       fabd    v24.2S, v25.2S, v26.2S
-    __ fabd(v8, __ T4S, v9, v10);                      //       fabd    v8.4S, v9.4S, v10.4S
-    __ fabd(v25, __ T2D, v26, v27);                    //       fabd    v25.2D, v26.2D, v27.2D
-    __ faddp(v20, __ T2S, v21, v22);                   //       faddp   v20.2S, v21.2S, v22.2S
-    __ faddp(v16, __ T4S, v17, v18);                   //       faddp   v16.4S, v17.4S, v18.4S
-    __ faddp(v17, __ T2D, v18, v19);                   //       faddp   v17.2D, v18.2D, v19.2D
-    __ fmul(v2, __ T2S, v3, v4);                       //       fmul    v2.2S, v3.2S, v4.2S
-    __ fmul(v1, __ T4S, v2, v3);                       //       fmul    v1.4S, v2.4S, v3.4S
-    __ fmul(v0, __ T2D, v1, v2);                       //       fmul    v0.2D, v1.2D, v2.2D
-    __ mlav(v24, __ T4H, v25, v26);                    //       mla     v24.4H, v25.4H, v26.4H
+    __ sqaddv(v5, __ T8B, v6, v7);                     //       sqadd   v5.8B, v6.8B, v7.8B
+    __ sqaddv(v3, __ T16B, v4, v5);                    //       sqadd   v3.16B, v4.16B, v5.16B
+    __ sqaddv(v8, __ T4H, v9, v10);                    //       sqadd   v8.4H, v9.4H, v10.4H
+    __ sqaddv(v22, __ T8H, v23, v24);                  //       sqadd   v22.8H, v23.8H, v24.8H
+    __ sqaddv(v19, __ T2S, v20, v21);                  //       sqadd   v19.2S, v20.2S, v21.2S
+    __ sqaddv(v13, __ T4S, v14, v15);                  //       sqadd   v13.4S, v14.4S, v15.4S
+    __ sqaddv(v5, __ T2D, v6, v7);                     //       sqadd   v5.2D, v6.2D, v7.2D
+    __ uqaddv(v29, __ T8B, v30, v31);                  //       uqadd   v29.8B, v30.8B, v31.8B
+    __ uqaddv(v24, __ T16B, v25, v26);                 //       uqadd   v24.16B, v25.16B, v26.16B
+    __ uqaddv(v21, __ T4H, v22, v23);                  //       uqadd   v21.4H, v22.4H, v23.4H
+    __ uqaddv(v26, __ T8H, v27, v28);                  //       uqadd   v26.8H, v27.8H, v28.8H
+    __ uqaddv(v24, __ T2S, v25, v26);                  //       uqadd   v24.2S, v25.2S, v26.2S
+    __ uqaddv(v3, __ T4S, v4, v5);                     //       uqadd   v3.4S, v4.4S, v5.4S
+    __ uqaddv(v24, __ T2D, v25, v26);                  //       uqadd   v24.2D, v25.2D, v26.2D
+    __ fadd(v26, __ T2S, v27, v28);                    //       fadd    v26.2S, v27.2S, v28.2S
+    __ fadd(v23, __ T4S, v24, v25);                    //       fadd    v23.4S, v24.4S, v25.4S
+    __ fadd(v15, __ T2D, v16, v17);                    //       fadd    v15.2D, v16.2D, v17.2D
+    __ subv(v21, __ T8B, v22, v23);                    //       sub     v21.8B, v22.8B, v23.8B
+    __ subv(v3, __ T16B, v4, v5);                      //       sub     v3.16B, v4.16B, v5.16B
+    __ subv(v24, __ T4H, v25, v26);                    //       sub     v24.4H, v25.4H, v26.4H
+    __ subv(v8, __ T8H, v9, v10);                      //       sub     v8.8H, v9.8H, v10.8H
+    __ subv(v25, __ T2S, v26, v27);                    //       sub     v25.2S, v26.2S, v27.2S
+    __ subv(v20, __ T4S, v21, v22);                    //       sub     v20.4S, v21.4S, v22.4S
+    __ subv(v16, __ T2D, v17, v18);                    //       sub     v16.2D, v17.2D, v18.2D
+    __ sqsubv(v17, __ T8B, v18, v19);                  //       sqsub   v17.8B, v18.8B, v19.8B
+    __ sqsubv(v2, __ T16B, v3, v4);                    //       sqsub   v2.16B, v3.16B, v4.16B
+    __ sqsubv(v1, __ T4H, v2, v3);                     //       sqsub   v1.4H, v2.4H, v3.4H
+    __ sqsubv(v0, __ T8H, v1, v2);                     //       sqsub   v0.8H, v1.8H, v2.8H
+    __ sqsubv(v24, __ T2S, v25, v26);                  //       sqsub   v24.2S, v25.2S, v26.2S
+    __ sqsubv(v4, __ T4S, v5, v6);                     //       sqsub   v4.4S, v5.4S, v6.4S
+    __ sqsubv(v3, __ T2D, v4, v5);                     //       sqsub   v3.2D, v4.2D, v5.2D
+    __ uqsubv(v12, __ T8B, v13, v14);                  //       uqsub   v12.8B, v13.8B, v14.8B
+    __ uqsubv(v31, __ T16B, v0, v1);                   //       uqsub   v31.16B, v0.16B, v1.16B
+    __ uqsubv(v28, __ T4H, v29, v30);                  //       uqsub   v28.4H, v29.4H, v30.4H
+    __ uqsubv(v10, __ T8H, v11, v12);                  //       uqsub   v10.8H, v11.8H, v12.8H
+    __ uqsubv(v26, __ T2S, v27, v28);                  //       uqsub   v26.2S, v27.2S, v28.2S
+    __ uqsubv(v2, __ T4S, v3, v4);                     //       uqsub   v2.4S, v3.4S, v4.4S
+    __ uqsubv(v12, __ T2D, v13, v14);                  //       uqsub   v12.2D, v13.2D, v14.2D
+    __ fsub(v18, __ T2S, v19, v20);                    //       fsub    v18.2S, v19.2S, v20.2S
+    __ fsub(v31, __ T4S, v0, v1);                      //       fsub    v31.4S, v0.4S, v1.4S
+    __ fsub(v1, __ T2D, v2, v3);                       //       fsub    v1.2D, v2.2D, v3.2D
+    __ mulv(v13, __ T8B, v14, v15);                    //       mul     v13.8B, v14.8B, v15.8B
+    __ mulv(v29, __ T16B, v30, v31);                   //       mul     v29.16B, v30.16B, v31.16B
+    __ mulv(v0, __ T4H, v1, v2);                       //       mul     v0.4H, v1.4H, v2.4H
+    __ mulv(v19, __ T8H, v20, v21);                    //       mul     v19.8H, v20.8H, v21.8H
+    __ mulv(v12, __ T2S, v13, v14);                    //       mul     v12.2S, v13.2S, v14.2S
+    __ mulv(v17, __ T4S, v18, v19);                    //       mul     v17.4S, v18.4S, v19.4S
+    __ fabd(v22, __ T2S, v23, v24);                    //       fabd    v22.2S, v23.2S, v24.2S
+    __ fabd(v13, __ T4S, v14, v15);                    //       fabd    v13.4S, v14.4S, v15.4S
+    __ fabd(v28, __ T2D, v29, v30);                    //       fabd    v28.2D, v29.2D, v30.2D
+    __ faddp(v30, __ T2S, v31, v0);                    //       faddp   v30.2S, v31.2S, v0.2S
+    __ faddp(v31, __ T4S, v0, v1);                     //       faddp   v31.4S, v0.4S, v1.4S
+    __ faddp(v1, __ T2D, v2, v3);                      //       faddp   v1.2D, v2.2D, v3.2D
+    __ fmul(v26, __ T2S, v27, v28);                    //       fmul    v26.2S, v27.2S, v28.2S
+    __ fmul(v28, __ T4S, v29, v30);                    //       fmul    v28.4S, v29.4S, v30.4S
+    __ fmul(v4, __ T2D, v5, v6);                       //       fmul    v4.2D, v5.2D, v6.2D
+    __ mlav(v30, __ T4H, v31, v0);                     //       mla     v30.4H, v31.4H, v0.4H
     __ mlav(v4, __ T8H, v5, v6);                       //       mla     v4.8H, v5.8H, v6.8H
-    __ mlav(v3, __ T2S, v4, v5);                       //       mla     v3.2S, v4.2S, v5.2S
-    __ mlav(v12, __ T4S, v13, v14);                    //       mla     v12.4S, v13.4S, v14.4S
-    __ fmla(v31, __ T2S, v0, v1);                      //       fmla    v31.2S, v0.2S, v1.2S
-    __ fmla(v28, __ T4S, v29, v30);                    //       fmla    v28.4S, v29.4S, v30.4S
-    __ fmla(v10, __ T2D, v11, v12);                    //       fmla    v10.2D, v11.2D, v12.2D
-    __ mlsv(v26, __ T4H, v27, v28);                    //       mls     v26.4H, v27.4H, v28.4H
-    __ mlsv(v2, __ T8H, v3, v4);                       //       mls     v2.8H, v3.8H, v4.8H
-    __ mlsv(v12, __ T2S, v13, v14);                    //       mls     v12.2S, v13.2S, v14.2S
-    __ mlsv(v18, __ T4S, v19, v20);                    //       mls     v18.4S, v19.4S, v20.4S
-    __ fmls(v31, __ T2S, v0, v1);                      //       fmls    v31.2S, v0.2S, v1.2S
-    __ fmls(v1, __ T4S, v2, v3);                       //       fmls    v1.4S, v2.4S, v3.4S
-    __ fmls(v13, __ T2D, v14, v15);                    //       fmls    v13.2D, v14.2D, v15.2D
-    __ fdiv(v29, __ T2S, v30, v31);                    //       fdiv    v29.2S, v30.2S, v31.2S
-    __ fdiv(v0, __ T4S, v1, v2);                       //       fdiv    v0.4S, v1.4S, v2.4S
-    __ fdiv(v19, __ T2D, v20, v21);                    //       fdiv    v19.2D, v20.2D, v21.2D
-    __ maxv(v12, __ T8B, v13, v14);                    //       smax    v12.8B, v13.8B, v14.8B
-    __ maxv(v17, __ T16B, v18, v19);                   //       smax    v17.16B, v18.16B, v19.16B
-    __ maxv(v22, __ T4H, v23, v24);                    //       smax    v22.4H, v23.4H, v24.4H
-    __ maxv(v13, __ T8H, v14, v15);                    //       smax    v13.8H, v14.8H, v15.8H
-    __ maxv(v28, __ T2S, v29, v30);                    //       smax    v28.2S, v29.2S, v30.2S
-    __ maxv(v30, __ T4S, v31, v0);                     //       smax    v30.4S, v31.4S, v0.4S
-    __ smaxp(v31, __ T8B, v0, v1);                     //       smaxp   v31.8B, v0.8B, v1.8B
-    __ smaxp(v1, __ T16B, v2, v3);                     //       smaxp   v1.16B, v2.16B, v3.16B
-    __ smaxp(v26, __ T4H, v27, v28);                   //       smaxp   v26.4H, v27.4H, v28.4H
-    __ smaxp(v28, __ T8H, v29, v30);                   //       smaxp   v28.8H, v29.8H, v30.8H
-    __ smaxp(v4, __ T2S, v5, v6);                      //       smaxp   v4.2S, v5.2S, v6.2S
-    __ smaxp(v30, __ T4S, v31, v0);                    //       smaxp   v30.4S, v31.4S, v0.4S
-    __ fmax(v4, __ T2S, v5, v6);                       //       fmax    v4.2S, v5.2S, v6.2S
-    __ fmax(v6, __ T4S, v7, v8);                       //       fmax    v6.4S, v7.4S, v8.4S
-    __ fmax(v30, __ T2D, v31, v0);                     //       fmax    v30.2D, v31.2D, v0.2D
-    __ minv(v26, __ T8B, v27, v28);                    //       smin    v26.8B, v27.8B, v28.8B
-    __ minv(v18, __ T16B, v19, v20);                   //       smin    v18.16B, v19.16B, v20.16B
-    __ minv(v9, __ T4H, v10, v11);                     //       smin    v9.4H, v10.4H, v11.4H
-    __ minv(v8, __ T8H, v9, v10);                      //       smin    v8.8H, v9.8H, v10.8H
-    __ minv(v12, __ T2S, v13, v14);                    //       smin    v12.2S, v13.2S, v14.2S
-    __ minv(v0, __ T4S, v1, v2);                       //       smin    v0.4S, v1.4S, v2.4S
-    __ sminp(v20, __ T8B, v21, v22);                   //       sminp   v20.8B, v21.8B, v22.8B
-    __ sminp(v1, __ T16B, v2, v3);                     //       sminp   v1.16B, v2.16B, v3.16B
-    __ sminp(v24, __ T4H, v25, v26);                   //       sminp   v24.4H, v25.4H, v26.4H
-    __ sminp(v2, __ T8H, v3, v4);                      //       sminp   v2.8H, v3.8H, v4.8H
-    __ sminp(v0, __ T2S, v1, v2);                      //       sminp   v0.2S, v1.2S, v2.2S
-    __ sminp(v9, __ T4S, v10, v11);                    //       sminp   v9.4S, v10.4S, v11.4S
-    __ sqdmulh(v24, __ T4H, v25, v26);                 //       sqdmulh v24.4H, v25.4H, v26.4H
-    __ sqdmulh(v26, __ T8H, v27, v28);                 //       sqdmulh v26.8H, v27.8H, v28.8H
-    __ sqdmulh(v16, __ T2S, v17, v18);                 //       sqdmulh v16.2S, v17.2S, v18.2S
-    __ sqdmulh(v30, __ T4S, v31, v0);                  //       sqdmulh v30.4S, v31.4S, v0.4S
-    __ shsubv(v3, __ T8B, v4, v5);                     //       shsub   v3.8B, v4.8B, v5.8B
-    __ shsubv(v10, __ T16B, v11, v12);                 //       shsub   v10.16B, v11.16B, v12.16B
-    __ shsubv(v23, __ T4H, v24, v25);                  //       shsub   v23.4H, v24.4H, v25.4H
-    __ shsubv(v10, __ T8H, v11, v12);                  //       shsub   v10.8H, v11.8H, v12.8H
-    __ shsubv(v4, __ T2S, v5, v6);                     //       shsub   v4.2S, v5.2S, v6.2S
-    __ shsubv(v18, __ T4S, v19, v20);                  //       shsub   v18.4S, v19.4S, v20.4S
-    __ fmin(v2, __ T2S, v3, v4);                       //       fmin    v2.2S, v3.2S, v4.2S
-    __ fmin(v11, __ T4S, v12, v13);                    //       fmin    v11.4S, v12.4S, v13.4S
-    __ fmin(v8, __ T2D, v9, v10);                      //       fmin    v8.2D, v9.2D, v10.2D
-    __ facgt(v10, __ T2S, v11, v12);                   //       facgt   v10.2S, v11.2S, v12.2S
-    __ facgt(v15, __ T4S, v16, v17);                   //       facgt   v15.4S, v16.4S, v17.4S
+    __ mlav(v6, __ T2S, v7, v8);                       //       mla     v6.2S, v7.2S, v8.2S
+    __ mlav(v30, __ T4S, v31, v0);                     //       mla     v30.4S, v31.4S, v0.4S
+    __ fmla(v26, __ T2S, v27, v28);                    //       fmla    v26.2S, v27.2S, v28.2S
+    __ fmla(v18, __ T4S, v19, v20);                    //       fmla    v18.4S, v19.4S, v20.4S
+    __ fmla(v9, __ T2D, v10, v11);                     //       fmla    v9.2D, v10.2D, v11.2D
+    __ mlsv(v8, __ T4H, v9, v10);                      //       mls     v8.4H, v9.4H, v10.4H
+    __ mlsv(v12, __ T8H, v13, v14);                    //       mls     v12.8H, v13.8H, v14.8H
+    __ mlsv(v0, __ T2S, v1, v2);                       //       mls     v0.2S, v1.2S, v2.2S
+    __ mlsv(v20, __ T4S, v21, v22);                    //       mls     v20.4S, v21.4S, v22.4S
+    __ fmls(v1, __ T2S, v2, v3);                       //       fmls    v1.2S, v2.2S, v3.2S
+    __ fmls(v24, __ T4S, v25, v26);                    //       fmls    v24.4S, v25.4S, v26.4S
+    __ fmls(v2, __ T2D, v3, v4);                       //       fmls    v2.2D, v3.2D, v4.2D
+    __ fdiv(v0, __ T2S, v1, v2);                       //       fdiv    v0.2S, v1.2S, v2.2S
+    __ fdiv(v9, __ T4S, v10, v11);                     //       fdiv    v9.4S, v10.4S, v11.4S
+    __ fdiv(v24, __ T2D, v25, v26);                    //       fdiv    v24.2D, v25.2D, v26.2D
+    __ maxv(v26, __ T8B, v27, v28);                    //       smax    v26.8B, v27.8B, v28.8B
+    __ maxv(v16, __ T16B, v17, v18);                   //       smax    v16.16B, v17.16B, v18.16B
+    __ maxv(v30, __ T4H, v31, v0);                     //       smax    v30.4H, v31.4H, v0.4H
+    __ maxv(v3, __ T8H, v4, v5);                       //       smax    v3.8H, v4.8H, v5.8H
+    __ maxv(v10, __ T2S, v11, v12);                    //       smax    v10.2S, v11.2S, v12.2S
+    __ maxv(v23, __ T4S, v24, v25);                    //       smax    v23.4S, v24.4S, v25.4S
+    __ umaxv(v10, __ T8B, v11, v12);                   //       umax    v10.8B, v11.8B, v12.8B
+    __ umaxv(v4, __ T16B, v5, v6);                     //       umax    v4.16B, v5.16B, v6.16B
+    __ umaxv(v18, __ T4H, v19, v20);                   //       umax    v18.4H, v19.4H, v20.4H
+    __ umaxv(v2, __ T8H, v3, v4);                      //       umax    v2.8H, v3.8H, v4.8H
+    __ umaxv(v11, __ T2S, v12, v13);                   //       umax    v11.2S, v12.2S, v13.2S
+    __ umaxv(v8, __ T4S, v9, v10);                     //       umax    v8.4S, v9.4S, v10.4S
+    __ smaxp(v10, __ T8B, v11, v12);                   //       smaxp   v10.8B, v11.8B, v12.8B
+    __ smaxp(v15, __ T16B, v16, v17);                  //       smaxp   v15.16B, v16.16B, v17.16B
+    __ smaxp(v17, __ T4H, v18, v19);                   //       smaxp   v17.4H, v18.4H, v19.4H
+    __ smaxp(v2, __ T8H, v3, v4);                      //       smaxp   v2.8H, v3.8H, v4.8H
+    __ smaxp(v10, __ T2S, v11, v12);                   //       smaxp   v10.2S, v11.2S, v12.2S
+    __ smaxp(v12, __ T4S, v13, v14);                   //       smaxp   v12.4S, v13.4S, v14.4S
+    __ fmax(v12, __ T2S, v13, v14);                    //       fmax    v12.2S, v13.2S, v14.2S
+    __ fmax(v15, __ T4S, v16, v17);                    //       fmax    v15.4S, v16.4S, v17.4S
+    __ fmax(v13, __ T2D, v14, v15);                    //       fmax    v13.2D, v14.2D, v15.2D
+    __ minv(v2, __ T8B, v3, v4);                       //       smin    v2.8B, v3.8B, v4.8B
+    __ minv(v7, __ T16B, v8, v9);                      //       smin    v7.16B, v8.16B, v9.16B
+    __ minv(v20, __ T4H, v21, v22);                    //       smin    v20.4H, v21.4H, v22.4H
+    __ minv(v26, __ T8H, v27, v28);                    //       smin    v26.8H, v27.8H, v28.8H
+    __ minv(v16, __ T2S, v17, v18);                    //       smin    v16.2S, v17.2S, v18.2S
+    __ minv(v4, __ T4S, v5, v6);                       //       smin    v4.4S, v5.4S, v6.4S
+    __ uminv(v2, __ T8B, v3, v4);                      //       umin    v2.8B, v3.8B, v4.8B
+    __ uminv(v4, __ T16B, v5, v6);                     //       umin    v4.16B, v5.16B, v6.16B
+    __ uminv(v12, __ T4H, v13, v14);                   //       umin    v12.4H, v13.4H, v14.4H
+    __ uminv(v18, __ T8H, v19, v20);                   //       umin    v18.8H, v19.8H, v20.8H
+    __ uminv(v21, __ T2S, v22, v23);                   //       umin    v21.2S, v22.2S, v23.2S
+    __ uminv(v16, __ T4S, v17, v18);                   //       umin    v16.4S, v17.4S, v18.4S
+    __ sminp(v18, __ T8B, v19, v20);                   //       sminp   v18.8B, v19.8B, v20.8B
+    __ sminp(v11, __ T16B, v12, v13);                  //       sminp   v11.16B, v12.16B, v13.16B
+    __ sminp(v21, __ T4H, v22, v23);                   //       sminp   v21.4H, v22.4H, v23.4H
+    __ sminp(v23, __ T8H, v24, v25);                   //       sminp   v23.8H, v24.8H, v25.8H
+    __ sminp(v12, __ T2S, v13, v14);                   //       sminp   v12.2S, v13.2S, v14.2S
+    __ sminp(v26, __ T4S, v27, v28);                   //       sminp   v26.4S, v27.4S, v28.4S
+    __ sqdmulh(v23, __ T4H, v24, v25);                 //       sqdmulh v23.4H, v24.4H, v25.4H
+    __ sqdmulh(v28, __ T8H, v29, v30);                 //       sqdmulh v28.8H, v29.8H, v30.8H
+    __ sqdmulh(v14, __ T2S, v15, v16);                 //       sqdmulh v14.2S, v15.2S, v16.2S
+    __ sqdmulh(v11, __ T4S, v12, v13);                 //       sqdmulh v11.4S, v12.4S, v13.4S
+    __ shsubv(v24, __ T8B, v25, v26);                  //       shsub   v24.8B, v25.8B, v26.8B
+    __ shsubv(v1, __ T16B, v2, v3);                    //       shsub   v1.16B, v2.16B, v3.16B
+    __ shsubv(v12, __ T4H, v13, v14);                  //       shsub   v12.4H, v13.4H, v14.4H
+    __ shsubv(v31, __ T8H, v0, v1);                    //       shsub   v31.8H, v0.8H, v1.8H
+    __ shsubv(v10, __ T2S, v11, v12);                  //       shsub   v10.2S, v11.2S, v12.2S
+    __ shsubv(v16, __ T4S, v17, v18);                  //       shsub   v16.4S, v17.4S, v18.4S
+    __ fmin(v7, __ T2S, v8, v9);                       //       fmin    v7.2S, v8.2S, v9.2S
+    __ fmin(v2, __ T4S, v3, v4);                       //       fmin    v2.4S, v3.4S, v4.4S
+    __ fmin(v3, __ T2D, v4, v5);                       //       fmin    v3.2D, v4.2D, v5.2D
+    __ facgt(v13, __ T2S, v14, v15);                   //       facgt   v13.2S, v14.2S, v15.2S
+    __ facgt(v19, __ T4S, v20, v21);                   //       facgt   v19.4S, v20.4S, v21.4S
     __ facgt(v17, __ T2D, v18, v19);                   //       facgt   v17.2D, v18.2D, v19.2D
 
 // VectorScalarNEONInstruction
-    __ fmlavs(v5, __ T2S, v6, v7, 0);                  //       fmla    v5.2S, v6.2S, v7.S[0]
-    __ mulvs(v6, __ T4S, v7, v8, 1);                   //       mul     v6.4S, v7.4S, v8.S[1]
-    __ fmlavs(v6, __ T2D, v7, v8, 0);                  //       fmla    v6.2D, v7.2D, v8.D[0]
-    __ fmlsvs(v3, __ T2S, v4, v5, 0);                  //       fmls    v3.2S, v4.2S, v5.S[0]
-    __ mulvs(v13, __ T4S, v14, v15, 2);                //       mul     v13.4S, v14.4S, v15.S[2]
-    __ fmlsvs(v2, __ T2D, v3, v4, 1);                  //       fmls    v2.2D, v3.2D, v4.D[1]
-    __ fmulxvs(v2, __ T2S, v3, v4, 0);                 //       fmulx   v2.2S, v3.2S, v4.S[0]
-    __ mulvs(v9, __ T4S, v10, v11, 1);                 //       mul     v9.4S, v10.4S, v11.S[1]
-    __ fmulxvs(v8, __ T2D, v9, v10, 1);                //       fmulx   v8.2D, v9.2D, v10.D[1]
-    __ mulvs(v5, __ T4H, v6, v7, 2);                   //       mul     v5.4H, v6.4H, v7.H[2]
-    __ mulvs(v11, __ T8H, v12, v13, 5);                //       mul     v11.8H, v12.8H, v13.H[5]
-    __ mulvs(v13, __ T2S, v14, v15, 0);                //       mul     v13.2S, v14.2S, v15.S[0]
+    __ fmlavs(v1, __ T2S, v2, v3, 1);                  //       fmla    v1.2S, v2.2S, v3.S[1]
+    __ mulvs(v5, __ T4S, v6, v7, 0);                   //       mul     v5.4S, v6.4S, v7.S[0]
+    __ fmlavs(v2, __ T2D, v3, v4, 1);                  //       fmla    v2.2D, v3.2D, v4.D[1]
+    __ fmlsvs(v7, __ T2S, v8, v9, 0);                  //       fmls    v7.2S, v8.2S, v9.S[0]
+    __ mulvs(v15, __ T4S, v0, v1, 3);                  //       mul     v15.4S, v0.4S, v1.S[3]
+    __ fmlsvs(v10, __ T2D, v11, v12, 0);               //       fmls    v10.2D, v11.2D, v12.D[0]
+    __ fmulxvs(v10, __ T2S, v11, v12, 0);              //       fmulx   v10.2S, v11.2S, v12.S[0]
     __ mulvs(v14, __ T4S, v15, v16, 2);                //       mul     v14.4S, v15.4S, v16.S[2]
+    __ fmulxvs(v13, __ T2D, v14, v15, 1);              //       fmulx   v13.2D, v14.2D, v15.D[1]
+    __ mulvs(v2, __ T4H, v3, v4, 3);                   //       mul     v2.4H, v3.4H, v4.H[3]
+    __ mulvs(v11, __ T8H, v12, v13, 0);                //       mul     v11.8H, v12.8H, v13.H[0]
+    __ mulvs(v15, __ T2S, v0, v1, 1);                  //       mul     v15.2S, v0.2S, v1.S[1]
+    __ mulvs(v6, __ T4S, v7, v8, 0);                   //       mul     v6.4S, v7.4S, v8.S[0]
 
 // NEONVectorCompare
-    __ cm(Assembler::GT, v14, __ T8B, v15, v16);       //       cmgt    v14.8B, v15.8B, v16.8B
-    __ cm(Assembler::GT, v11, __ T16B, v12, v13);      //       cmgt    v11.16B, v12.16B, v13.16B
-    __ cm(Assembler::GT, v24, __ T4H, v25, v26);       //       cmgt    v24.4H, v25.4H, v26.4H
-    __ cm(Assembler::GT, v1, __ T8H, v2, v3);          //       cmgt    v1.8H, v2.8H, v3.8H
-    __ cm(Assembler::GT, v12, __ T2S, v13, v14);       //       cmgt    v12.2S, v13.2S, v14.2S
+    __ cm(Assembler::GT, v9, __ T8B, v10, v11);        //       cmgt    v9.8B, v10.8B, v11.8B
+    __ cm(Assembler::GT, v28, __ T16B, v29, v30);      //       cmgt    v28.16B, v29.16B, v30.16B
+    __ cm(Assembler::GT, v15, __ T4H, v16, v17);       //       cmgt    v15.4H, v16.4H, v17.4H
+    __ cm(Assembler::GT, v29, __ T8H, v30, v31);       //       cmgt    v29.8H, v30.8H, v31.8H
+    __ cm(Assembler::GT, v22, __ T2S, v23, v24);       //       cmgt    v22.2S, v23.2S, v24.2S
     __ cm(Assembler::GT, v31, __ T4S, v0, v1);         //       cmgt    v31.4S, v0.4S, v1.4S
-    __ cm(Assembler::GT, v10, __ T2D, v11, v12);       //       cmgt    v10.2D, v11.2D, v12.2D
-    __ cm(Assembler::GE, v16, __ T8B, v17, v18);       //       cmge    v16.8B, v17.8B, v18.8B
-    __ cm(Assembler::GE, v7, __ T16B, v8, v9);         //       cmge    v7.16B, v8.16B, v9.16B
-    __ cm(Assembler::GE, v2, __ T4H, v3, v4);          //       cmge    v2.4H, v3.4H, v4.4H
-    __ cm(Assembler::GE, v3, __ T8H, v4, v5);          //       cmge    v3.8H, v4.8H, v5.8H
-    __ cm(Assembler::GE, v13, __ T2S, v14, v15);       //       cmge    v13.2S, v14.2S, v15.2S
-    __ cm(Assembler::GE, v19, __ T4S, v20, v21);       //       cmge    v19.4S, v20.4S, v21.4S
-    __ cm(Assembler::GE, v17, __ T2D, v18, v19);       //       cmge    v17.2D, v18.2D, v19.2D
-    __ cm(Assembler::EQ, v16, __ T8B, v17, v18);       //       cmeq    v16.8B, v17.8B, v18.8B
-    __ cm(Assembler::EQ, v3, __ T16B, v4, v5);         //       cmeq    v3.16B, v4.16B, v5.16B
-    __ cm(Assembler::EQ, v1, __ T4H, v2, v3);          //       cmeq    v1.4H, v2.4H, v3.4H
+    __ cm(Assembler::GT, v19, __ T2D, v20, v21);       //       cmgt    v19.2D, v20.2D, v21.2D
+    __ cm(Assembler::GE, v31, __ T8B, v0, v1);         //       cmge    v31.8B, v0.8B, v1.8B
+    __ cm(Assembler::GE, v5, __ T16B, v6, v7);         //       cmge    v5.16B, v6.16B, v7.16B
+    __ cm(Assembler::GE, v14, __ T4H, v15, v16);       //       cmge    v14.4H, v15.4H, v16.4H
+    __ cm(Assembler::GE, v18, __ T8H, v19, v20);       //       cmge    v18.8H, v19.8H, v20.8H
+    __ cm(Assembler::GE, v31, __ T2S, v0, v1);         //       cmge    v31.2S, v0.2S, v1.2S
+    __ cm(Assembler::GE, v18, __ T4S, v19, v20);       //       cmge    v18.4S, v19.4S, v20.4S
+    __ cm(Assembler::GE, v27, __ T2D, v28, v29);       //       cmge    v27.2D, v28.2D, v29.2D
+    __ cm(Assembler::EQ, v20, __ T8B, v21, v22);       //       cmeq    v20.8B, v21.8B, v22.8B
+    __ cm(Assembler::EQ, v16, __ T16B, v17, v18);      //       cmeq    v16.16B, v17.16B, v18.16B
+    __ cm(Assembler::EQ, v12, __ T4H, v13, v14);       //       cmeq    v12.4H, v13.4H, v14.4H
     __ cm(Assembler::EQ, v11, __ T8H, v12, v13);       //       cmeq    v11.8H, v12.8H, v13.8H
-    __ cm(Assembler::EQ, v30, __ T2S, v31, v0);        //       cmeq    v30.2S, v31.2S, v0.2S
-    __ cm(Assembler::EQ, v5, __ T4S, v6, v7);          //       cmeq    v5.4S, v6.4S, v7.4S
-    __ cm(Assembler::EQ, v8, __ T2D, v9, v10);         //       cmeq    v8.2D, v9.2D, v10.2D
-    __ cm(Assembler::HI, v15, __ T8B, v16, v17);       //       cmhi    v15.8B, v16.8B, v17.8B
-    __ cm(Assembler::HI, v29, __ T16B, v30, v31);      //       cmhi    v29.16B, v30.16B, v31.16B
-    __ cm(Assembler::HI, v30, __ T4H, v31, v0);        //       cmhi    v30.4H, v31.4H, v0.4H
-    __ cm(Assembler::HI, v0, __ T8H, v1, v2);          //       cmhi    v0.8H, v1.8H, v2.8H
-    __ cm(Assembler::HI, v20, __ T2S, v21, v22);       //       cmhi    v20.2S, v21.2S, v22.2S
-    __ cm(Assembler::HI, v7, __ T4S, v8, v9);          //       cmhi    v7.4S, v8.4S, v9.4S
+    __ cm(Assembler::EQ, v9, __ T2S, v10, v11);        //       cmeq    v9.2S, v10.2S, v11.2S
+    __ cm(Assembler::EQ, v6, __ T4S, v7, v8);          //       cmeq    v6.4S, v7.4S, v8.4S
+    __ cm(Assembler::EQ, v30, __ T2D, v31, v0);        //       cmeq    v30.2D, v31.2D, v0.2D
+    __ cm(Assembler::HI, v17, __ T8B, v18, v19);       //       cmhi    v17.8B, v18.8B, v19.8B
+    __ cm(Assembler::HI, v27, __ T16B, v28, v29);      //       cmhi    v27.16B, v28.16B, v29.16B
+    __ cm(Assembler::HI, v28, __ T4H, v29, v30);       //       cmhi    v28.4H, v29.4H, v30.4H
+    __ cm(Assembler::HI, v30, __ T8H, v31, v0);        //       cmhi    v30.8H, v31.8H, v0.8H
+    __ cm(Assembler::HI, v7, __ T2S, v8, v9);          //       cmhi    v7.2S, v8.2S, v9.2S
+    __ cm(Assembler::HI, v10, __ T4S, v11, v12);       //       cmhi    v10.4S, v11.4S, v12.4S
     __ cm(Assembler::HI, v20, __ T2D, v21, v22);       //       cmhi    v20.2D, v21.2D, v22.2D
-    __ cm(Assembler::HS, v23, __ T8B, v24, v25);       //       cmhs    v23.8B, v24.8B, v25.8B
-    __ cm(Assembler::HS, v28, __ T16B, v29, v30);      //       cmhs    v28.16B, v29.16B, v30.16B
-    __ cm(Assembler::HS, v21, __ T4H, v22, v23);       //       cmhs    v21.4H, v22.4H, v23.4H
-    __ cm(Assembler::HS, v27, __ T8H, v28, v29);       //       cmhs    v27.8H, v28.8H, v29.8H
-    __ cm(Assembler::HS, v25, __ T2S, v26, v27);       //       cmhs    v25.2S, v26.2S, v27.2S
-    __ cm(Assembler::HS, v5, __ T4S, v6, v7);          //       cmhs    v5.4S, v6.4S, v7.4S
-    __ cm(Assembler::HS, v1, __ T2D, v2, v3);          //       cmhs    v1.2D, v2.2D, v3.2D
-    __ fcm(Assembler::EQ, v23, __ T2S, v24, v25);      //       fcmeq   v23.2S, v24.2S, v25.2S
-    __ fcm(Assembler::EQ, v16, __ T4S, v17, v18);      //       fcmeq   v16.4S, v17.4S, v18.4S
-    __ fcm(Assembler::EQ, v31, __ T2D, v0, v1);        //       fcmeq   v31.2D, v0.2D, v1.2D
-    __ fcm(Assembler::GT, v5, __ T2S, v6, v7);         //       fcmgt   v5.2S, v6.2S, v7.2S
-    __ fcm(Assembler::GT, v12, __ T4S, v13, v14);      //       fcmgt   v12.4S, v13.4S, v14.4S
-    __ fcm(Assembler::GT, v9, __ T2D, v10, v11);       //       fcmgt   v9.2D, v10.2D, v11.2D
-    __ fcm(Assembler::GE, v28, __ T2S, v29, v30);      //       fcmge   v28.2S, v29.2S, v30.2S
+    __ cm(Assembler::HS, v10, __ T8B, v11, v12);       //       cmhs    v10.8B, v11.8B, v12.8B
+    __ cm(Assembler::HS, v4, __ T16B, v5, v6);         //       cmhs    v4.16B, v5.16B, v6.16B
+    __ cm(Assembler::HS, v24, __ T4H, v25, v26);       //       cmhs    v24.4H, v25.4H, v26.4H
+    __ cm(Assembler::HS, v17, __ T8H, v18, v19);       //       cmhs    v17.8H, v18.8H, v19.8H
+    __ cm(Assembler::HS, v17, __ T2S, v18, v19);       //       cmhs    v17.2S, v18.2S, v19.2S
+    __ cm(Assembler::HS, v22, __ T4S, v23, v24);       //       cmhs    v22.4S, v23.4S, v24.4S
+    __ cm(Assembler::HS, v3, __ T2D, v4, v5);          //       cmhs    v3.2D, v4.2D, v5.2D
+    __ fcm(Assembler::EQ, v29, __ T2S, v30, v31);      //       fcmeq   v29.2S, v30.2S, v31.2S
+    __ fcm(Assembler::EQ, v15, __ T4S, v16, v17);      //       fcmeq   v15.4S, v16.4S, v17.4S
+    __ fcm(Assembler::EQ, v22, __ T2D, v23, v24);      //       fcmeq   v22.2D, v23.2D, v24.2D
+    __ fcm(Assembler::GT, v19, __ T2S, v20, v21);      //       fcmgt   v19.2S, v20.2S, v21.2S
+    __ fcm(Assembler::GT, v19, __ T4S, v20, v21);      //       fcmgt   v19.4S, v20.4S, v21.4S
+    __ fcm(Assembler::GT, v22, __ T2D, v23, v24);      //       fcmgt   v22.2D, v23.2D, v24.2D
+    __ fcm(Assembler::GE, v2, __ T2S, v3, v4);         //       fcmge   v2.2S, v3.2S, v4.2S
     __ fcm(Assembler::GE, v15, __ T4S, v16, v17);      //       fcmge   v15.4S, v16.4S, v17.4S
-    __ fcm(Assembler::GE, v29, __ T2D, v30, v31);      //       fcmge   v29.2D, v30.2D, v31.2D
+    __ fcm(Assembler::GE, v6, __ T2D, v7, v8);         //       fcmge   v6.2D, v7.2D, v8.2D
 
 // SVEComparisonWithZero
-    __ sve_fcm(Assembler::EQ, p11, __ D, p7, z31, 0.0); //      fcmeq   p11.d, p7/z, z31.d, #0.0
-    __ sve_fcm(Assembler::GT, p2, __ D, p7, z14, 0.0); //       fcmgt   p2.d, p7/z, z14.d, #0.0
-    __ sve_fcm(Assembler::GE, p9, __ D, p4, z27, 0.0); //       fcmge   p9.d, p4/z, z27.d, #0.0
-    __ sve_fcm(Assembler::LT, p6, __ S, p1, z11, 0.0); //       fcmlt   p6.s, p1/z, z11.s, #0.0
-    __ sve_fcm(Assembler::LE, p15, __ D, p7, z17, 0.0); //      fcmle   p15.d, p7/z, z17.d, #0.0
-    __ sve_fcm(Assembler::NE, p15, __ S, p5, z7, 0.0); //       fcmne   p15.s, p5/z, z7.s, #0.0
+    __ sve_fcm(Assembler::EQ, p6, __ S, p3, z16, 0.0); //       fcmeq   p6.s, p3/z, z16.s, #0.0
+    __ sve_fcm(Assembler::GT, p11, __ D, p4, z1, 0.0); //       fcmgt   p11.d, p4/z, z1.d, #0.0
+    __ sve_fcm(Assembler::GE, p2, __ S, p4, z17, 0.0); //       fcmge   p2.s, p4/z, z17.s, #0.0
+    __ sve_fcm(Assembler::LT, p11, __ S, p5, z13, 0.0); //      fcmlt   p11.s, p5/z, z13.s, #0.0
+    __ sve_fcm(Assembler::LE, p14, __ S, p6, z27, 0.0); //      fcmle   p14.s, p6/z, z27.s, #0.0
+    __ sve_fcm(Assembler::NE, p1, __ D, p6, z1, 0.0);  //       fcmne   p1.d, p6/z, z1.d, #0.0
 
 // SVEComparisonWithImm
-    __ sve_cmp(Assembler::EQ, p5, __ D, p4, z4, 1);    //       cmpeq   p5.d, p4/z, z4.d, #1
-    __ sve_cmp(Assembler::GT, p11, __ D, p3, z3, 6);   //       cmpgt   p11.d, p3/z, z3.d, #6
-    __ sve_cmp(Assembler::GE, p9, __ S, p0, z19, -1);  //       cmpge   p9.s, p0/z, z19.s, #-1
-    __ sve_cmp(Assembler::LT, p3, __ S, p2, z12, -3);  //       cmplt   p3.s, p2/z, z12.s, #-3
-    __ sve_cmp(Assembler::LE, p11, __ D, p4, z1, -11); //       cmple   p11.d, p4/z, z1.d, #-11
-    __ sve_cmp(Assembler::NE, p8, __ S, p5, z2, -3);   //       cmpne   p8.s, p5/z, z2.s, #-3
-    __ sve_cmp(Assembler::HS, p5, __ D, p6, z21, 49);  //       cmphs   p5.d, p6/z, z21.d, #49
-    __ sve_cmp(Assembler::HI, p13, __ B, p7, z3, 97);  //       cmphi   p13.b, p7/z, z3.b, #97
-    __ sve_cmp(Assembler::LS, p9, __ H, p7, z17, 109); //       cmpls   p9.h, p7/z, z17.h, #109
-    __ sve_cmp(Assembler::LO, p7, __ S, p5, z7, 127);  //       cmplo   p7.s, p5/z, z7.s, #127
+    __ sve_cmp(Assembler::EQ, p9, __ H, p7, z17, 11);  //       cmpeq   p9.h, p7/z, z17.h, #11
+    __ sve_cmp(Assembler::GT, p7, __ S, p5, z7, 15);   //       cmpgt   p7.s, p5/z, z7.s, #15
+    __ sve_cmp(Assembler::GE, p12, __ D, p6, z2, 2);   //       cmpge   p12.d, p6/z, z2.d, #2
+    __ sve_cmp(Assembler::LT, p5, __ S, p0, z23, 2);   //       cmplt   p5.s, p0/z, z23.s, #2
+    __ sve_cmp(Assembler::LE, p0, __ D, p5, z25, -14); //       cmple   p0.d, p5/z, z25.d, #-14
+    __ sve_cmp(Assembler::NE, p9, __ B, p7, z12, 14);  //       cmpne   p9.b, p7/z, z12.b, #14
+    __ sve_cmp(Assembler::HS, p14, __ D, p1, z16, 37); //       cmphs   p14.d, p1/z, z16.d, #37
+    __ sve_cmp(Assembler::HI, p14, __ B, p1, z18, 29); //       cmphi   p14.b, p1/z, z18.b, #29
+    __ sve_cmp(Assembler::LS, p7, __ S, p2, z9, 10);   //       cmpls   p7.s, p2/z, z9.s, #10
+    __ sve_cmp(Assembler::LO, p14, __ D, p1, z21, 111); //      cmplo   p14.d, p1/z, z21.d, #111
 
 // SpecialCases
     __ ccmn(zr, zr, 3u, Assembler::LE);                //       ccmn    xzr, xzr, #3, LE
@@ -1096,229 +1136,239 @@
     __ fmovd(v0, -1.0625);                             //       fmov d0, #-1.0625
 
 // LSEOp
-    __ swp(Assembler::xword, r25, r2, sp);             //       swp     x25, x2, [sp]
-    __ ldadd(Assembler::xword, r27, r16, r10);         //       ldadd   x27, x16, [x10]
-    __ ldbic(Assembler::xword, r23, r19, r3);          //       ldclr   x23, x19, [x3]
-    __ ldeor(Assembler::xword, r16, r0, r25);          //       ldeor   x16, x0, [x25]
-    __ ldorr(Assembler::xword, r26, r23, r2);          //       ldset   x26, x23, [x2]
-    __ ldsmin(Assembler::xword, r16, r12, r4);         //       ldsmin  x16, x12, [x4]
-    __ ldsmax(Assembler::xword, r28, r30, r29);        //       ldsmax  x28, x30, [x29]
-    __ ldumin(Assembler::xword, r16, r27, r6);         //       ldumin  x16, x27, [x6]
-    __ ldumax(Assembler::xword, r9, r29, r15);         //       ldumax  x9, x29, [x15]
+    __ swp(Assembler::xword, r0, r17, r15);            //       swp     x0, x17, [x15]
+    __ ldadd(Assembler::xword, r4, r26, r8);           //       ldadd   x4, x26, [x8]
+    __ ldbic(Assembler::xword, r28, r22, r27);         //       ldclr   x28, x22, [x27]
+    __ ldeor(Assembler::xword, r27, r25, r23);         //       ldeor   x27, x25, [x23]
+    __ ldorr(Assembler::xword, r0, r4, r6);            //       ldset   x0, x4, [x6]
+    __ ldsmin(Assembler::xword, r16, r0, r4);          //       ldsmin  x16, x0, [x4]
+    __ ldsmax(Assembler::xword, r15, r1, r10);         //       ldsmax  x15, x1, [x10]
+    __ ldumin(Assembler::xword, r7, r5, r10);          //       ldumin  x7, x5, [x10]
+    __ ldumax(Assembler::xword, r28, r7, r20);         //       ldumax  x28, x7, [x20]
 
 // LSEOp
-    __ swpa(Assembler::xword, r7, r4, r7);             //       swpa    x7, x4, [x7]
-    __ ldadda(Assembler::xword, r15, r9, r23);         //       ldadda  x15, x9, [x23]
-    __ ldbica(Assembler::xword, r8, r2, r28);          //       ldclra  x8, x2, [x28]
-    __ ldeora(Assembler::xword, r21, zr, r5);          //       ldeora  x21, xzr, [x5]
-    __ ldorra(Assembler::xword, r27, r0, r17);         //       ldseta  x27, x0, [x17]
-    __ ldsmina(Assembler::xword, r15, r4, r26);        //       ldsmina x15, x4, [x26]
-    __ ldsmaxa(Assembler::xword, r8, r28, r22);        //       ldsmaxa x8, x28, [x22]
-    __ ldumina(Assembler::xword, r27, r27, r25);       //       ldumina x27, x27, [x25]
-    __ ldumaxa(Assembler::xword, r23, r0, r4);         //       ldumaxa x23, x0, [x4]
+    __ swpa(Assembler::xword, r23, r21, r6);           //       swpa    x23, x21, [x6]
+    __ ldadda(Assembler::xword, r11, r8, r17);         //       ldadda  x11, x8, [x17]
+    __ ldbica(Assembler::xword, zr, r6, r17);          //       ldclra  xzr, x6, [x17]
+    __ ldeora(Assembler::xword, r2, r12, r30);         //       ldeora  x2, x12, [x30]
+    __ ldorra(Assembler::xword, r29, r3, r27);         //       ldseta  x29, x3, [x27]
+    __ ldsmina(Assembler::xword, r22, r29, r14);       //       ldsmina x22, x29, [x14]
+    __ ldsmaxa(Assembler::xword, r13, r28, r17);       //       ldsmaxa x13, x28, [x17]
+    __ ldumina(Assembler::xword, r24, r5, r2);         //       ldumina x24, x5, [x2]
+    __ ldumaxa(Assembler::xword, r14, r10, r16);       //       ldumaxa x14, x10, [x16]
 
 // LSEOp
-    __ swpal(Assembler::xword, r6, r16, r0);           //       swpal   x6, x16, [x0]
-    __ ldaddal(Assembler::xword, r4, r15, r1);         //       ldaddal x4, x15, [x1]
-    __ ldbical(Assembler::xword, r10, r7, r5);         //       ldclral x10, x7, [x5]
-    __ ldeoral(Assembler::xword, r10, r28, r7);        //       ldeoral x10, x28, [x7]
-    __ ldorral(Assembler::xword, r20, r23, r21);       //       ldsetal x20, x23, [x21]
-    __ ldsminal(Assembler::xword, r6, r11, r8);        //       ldsminal        x6, x11, [x8]
-    __ ldsmaxal(Assembler::xword, r17, zr, r6);        //       ldsmaxal        x17, xzr, [x6]
-    __ lduminal(Assembler::xword, r17, r2, r12);       //       lduminal        x17, x2, [x12]
-    __ ldumaxal(Assembler::xword, r30, r29, r3);       //       ldumaxal        x30, x29, [x3]
+    __ swpal(Assembler::xword, r11, r27, r23);         //       swpal   x11, x27, [x23]
+    __ ldaddal(Assembler::xword, r12, r4, r22);        //       ldaddal x12, x4, [x22]
+    __ ldbical(Assembler::xword, r17, r4, r1);         //       ldclral x17, x4, [x1]
+    __ ldeoral(Assembler::xword, r19, r16, r15);       //       ldeoral x19, x16, [x15]
+    __ ldorral(Assembler::xword, r13, r14, r12);       //       ldsetal x13, x14, [x12]
+    __ ldsminal(Assembler::xword, r2, r17, r3);        //       ldsminal        x2, x17, [x3]
+    __ ldsmaxal(Assembler::xword, r21, r23, r5);       //       ldsmaxal        x21, x23, [x5]
+    __ lduminal(Assembler::xword, r6, r7, r19);        //       lduminal        x6, x7, [x19]
+    __ ldumaxal(Assembler::xword, r13, r28, r17);      //       ldumaxal        x13, x28, [x17]
 
 // LSEOp
-    __ swpl(Assembler::xword, r27, r22, r29);          //       swpl    x27, x22, [x29]
-    __ ldaddl(Assembler::xword, r14, r13, r28);        //       ldaddl  x14, x13, [x28]
-    __ ldbicl(Assembler::xword, r17, r24, r5);         //       ldclrl  x17, x24, [x5]
-    __ ldeorl(Assembler::xword, r2, r14, r10);         //       ldeorl  x2, x14, [x10]
-    __ ldorrl(Assembler::xword, r16, r11, r27);        //       ldsetl  x16, x11, [x27]
-    __ ldsminl(Assembler::xword, r23, r12, r4);        //       ldsminl x23, x12, [x4]
-    __ ldsmaxl(Assembler::xword, r22, r17, r4);        //       ldsmaxl x22, x17, [x4]
-    __ lduminl(Assembler::xword, r1, r19, r16);        //       lduminl x1, x19, [x16]
-    __ ldumaxl(Assembler::xword, r16, r13, r14);       //       ldumaxl x16, x13, [x14]
+    __ swpl(Assembler::xword, r16, r6, r2);            //       swpl    x16, x6, [x2]
+    __ ldaddl(Assembler::xword, r29, r3, r4);          //       ldaddl  x29, x3, [x4]
+    __ ldbicl(Assembler::xword, r6, r16, r20);         //       ldclrl  x6, x16, [x20]
+    __ ldeorl(Assembler::xword, r13, r12, r20);        //       ldeorl  x13, x12, [x20]
+    __ ldorrl(Assembler::xword, r8, r25, r20);         //       ldsetl  x8, x25, [x20]
+    __ ldsminl(Assembler::xword, r19, r0, r11);        //       ldsminl x19, x0, [x11]
+    __ ldsmaxl(Assembler::xword, r24, r6, r20);        //       ldsmaxl x24, x6, [x20]
+    __ lduminl(Assembler::xword, zr, r14, r16);        //       lduminl xzr, x14, [x16]
+    __ ldumaxl(Assembler::xword, r6, r0, r7);          //       ldumaxl x6, x0, [x7]
 
 // LSEOp
-    __ swp(Assembler::word, r12, r2, r17);             //       swp     w12, w2, [x17]
-    __ ldadd(Assembler::word, r3, r21, r23);           //       ldadd   w3, w21, [x23]
-    __ ldbic(Assembler::word, r5, r6, r7);             //       ldclr   w5, w6, [x7]
-    __ ldeor(Assembler::word, r19, r13, r28);          //       ldeor   w19, w13, [x28]
-    __ ldorr(Assembler::word, r17, r16, r6);           //       ldset   w17, w16, [x6]
-    __ ldsmin(Assembler::word, r2, r29, r3);           //       ldsmin  w2, w29, [x3]
-    __ ldsmax(Assembler::word, r4, r6, r15);           //       ldsmax  w4, w6, [x15]
-    __ ldumin(Assembler::word, r20, r13, r12);         //       ldumin  w20, w13, [x12]
-    __ ldumax(Assembler::word, r20, r8, r25);          //       ldumax  w20, w8, [x25]
+    __ swp(Assembler::word, r15, r19, r26);            //       swp     w15, w19, [x26]
+    __ ldadd(Assembler::word, r9, r10, r23);           //       ldadd   w9, w10, [x23]
+    __ ldbic(Assembler::word, r21, r22, r28);          //       ldclr   w21, w22, [x28]
+    __ ldeor(Assembler::word, r2, r3, r15);            //       ldeor   w2, w3, [x15]
+    __ ldorr(Assembler::word, r19, r20, r7);           //       ldset   w19, w20, [x7]
+    __ ldsmin(Assembler::word, r4, r29, r7);           //       ldsmin  w4, w29, [x7]
+    __ ldsmax(Assembler::word, r0, r9, r16);           //       ldsmax  w0, w9, [x16]
+    __ ldumin(Assembler::word, r20, r23, r4);          //       ldumin  w20, w23, [x4]
+    __ ldumax(Assembler::word, r16, r10, r23);         //       ldumax  w16, w10, [x23]
 
 // LSEOp
-    __ swpa(Assembler::word, r20, r19, r0);            //       swpa    w20, w19, [x0]
-    __ ldadda(Assembler::word, r11, r24, r6);          //       ldadda  w11, w24, [x6]
-    __ ldbica(Assembler::word, r20, zr, r14);          //       ldclra  w20, wzr, [x14]
-    __ ldeora(Assembler::word, r16, r6, r0);           //       ldeora  w16, w6, [x0]
-    __ ldorra(Assembler::word, r7, r15, r19);          //       ldseta  w7, w15, [x19]
-    __ ldsmina(Assembler::word, r26, r9, r10);         //       ldsmina w26, w9, [x10]
-    __ ldsmaxa(Assembler::word, r23, r21, r22);        //       ldsmaxa w23, w21, [x22]
-    __ ldumina(Assembler::word, r28, r2, r3);          //       ldumina w28, w2, [x3]
-    __ ldumaxa(Assembler::word, r15, r19, r20);        //       ldumaxa w15, w19, [x20]
+    __ swpa(Assembler::word, r11, r25, r6);            //       swpa    w11, w25, [x6]
+    __ ldadda(Assembler::word, zr, r16, r13);          //       ldadda  wzr, w16, [x13]
+    __ ldbica(Assembler::word, r23, r12, r1);          //       ldclra  w23, w12, [x1]
+    __ ldeora(Assembler::word, r14, r9, r21);          //       ldeora  w14, w9, [x21]
+    __ ldorra(Assembler::word, r16, r26, r15);         //       ldseta  w16, w26, [x15]
+    __ ldsmina(Assembler::word, r4, r4, r15);          //       ldsmina w4, w4, [x15]
+    __ ldsmaxa(Assembler::word, r8, r6, r30);          //       ldsmaxa w8, w6, [x30]
+    __ ldumina(Assembler::word, r4, r29, r17);         //       ldumina w4, w29, [x17]
+    __ ldumaxa(Assembler::word, r29, r26, r9);         //       ldumaxa w29, w26, [x9]
 
 // LSEOp
-    __ swpal(Assembler::word, r7, r4, r29);            //       swpal   w7, w4, [x29]
-    __ ldaddal(Assembler::word, r7, r0, r9);           //       ldaddal w7, w0, [x9]
-    __ ldbical(Assembler::word, r16, r20, r23);        //       ldclral w16, w20, [x23]
-    __ ldeoral(Assembler::word, r4, r16, r10);         //       ldeoral w4, w16, [x10]
-    __ ldorral(Assembler::word, r23, r11, r25);        //       ldsetal w23, w11, [x25]
-    __ ldsminal(Assembler::word, r6, zr, r16);         //       ldsminal        w6, wzr, [x16]
-    __ ldsmaxal(Assembler::word, r13, r23, r12);       //       ldsmaxal        w13, w23, [x12]
-    __ lduminal(Assembler::word, r1, r14, r9);         //       lduminal        w1, w14, [x9]
-    __ ldumaxal(Assembler::word, r21, r16, r26);       //       ldumaxal        w21, w16, [x26]
+    __ swpal(Assembler::word, r15, r2, r11);           //       swpal   w15, w2, [x11]
+    __ ldaddal(Assembler::word, r29, r3, r7);          //       ldaddal w29, w3, [x7]
+    __ ldbical(Assembler::word, r1, r27, r21);         //       ldclral w1, w27, [x21]
+    __ ldeoral(Assembler::word, r16, r14, r8);         //       ldeoral w16, w14, [x8]
+    __ ldorral(Assembler::word, r16, r22, r25);        //       ldsetal w16, w22, [x25]
+    __ ldsminal(Assembler::word, r5, r20, r21);        //       ldsminal        w5, w20, [x21]
+    __ ldsmaxal(Assembler::word, r16, r23, r16);       //       ldsmaxal        w16, w23, [x16]
+    __ lduminal(Assembler::word, r30, r20, r20);       //       lduminal        w30, w20, [x20]
+    __ ldumaxal(Assembler::word, r0, r4, r19);         //       ldumaxal        w0, w4, [x19]
 
 // LSEOp
-    __ swpl(Assembler::word, r15, r4, r4);             //       swpl    w15, w4, [x4]
-    __ ldaddl(Assembler::word, r16, r8, r6);           //       ldaddl  w16, w8, [x6]
-    __ ldbicl(Assembler::word, r30, r4, r29);          //       ldclrl  w30, w4, [x29]
-    __ ldeorl(Assembler::word, r17, r29, r26);         //       ldeorl  w17, w29, [x26]
-    __ ldorrl(Assembler::word, r9, r15, r2);           //       ldsetl  w9, w15, [x2]
-    __ ldsminl(Assembler::word, r11, r29, r3);         //       ldsminl w11, w29, [x3]
-    __ ldsmaxl(Assembler::word, r7, r1, r27);          //       ldsmaxl w7, w1, [x27]
-    __ lduminl(Assembler::word, r21, r16, r14);        //       lduminl w21, w16, [x14]
-    __ ldumaxl(Assembler::word, r8, r16, r22);         //       ldumaxl w8, w16, [x22]
+    __ swpl(Assembler::word, r24, r4, r20);            //       swpl    w24, w4, [x20]
+    __ ldaddl(Assembler::word, r4, r24, r26);          //       ldaddl  w4, w24, [x26]
+    __ ldbicl(Assembler::word, r19, r2, r8);           //       ldclrl  w19, w2, [x8]
+    __ ldeorl(Assembler::word, r8, r14, r24);          //       ldeorl  w8, w14, [x24]
+    __ ldorrl(Assembler::word, r16, zr, r22);          //       ldsetl  w16, wzr, [x22]
+    __ ldsminl(Assembler::word, r4, zr, r1);           //       ldsminl w4, wzr, [x1]
+    __ ldsmaxl(Assembler::word, r10, r20, r12);        //       ldsmaxl w10, w20, [x12]
+    __ lduminl(Assembler::word, r0, r9, r7);           //       lduminl w0, w9, [x7]
+    __ ldumaxl(Assembler::word, r24, r16, r4);         //       ldumaxl w24, w16, [x4]
 
 // SHA3SIMDOp
-    __ bcax(v25, __ T16B, v5, v20, v21);               //       bcax            v25.16B, v5.16B, v20.16B, v21.16B
-    __ eor3(v18, __ T16B, v23, v16, v30);              //       eor3            v18.16B, v23.16B, v16.16B, v30.16B
-    __ rax1(v20, __ T2D, v20, v0);                     //       rax1            v20.2D, v20.2D, v0.2D
-    __ xar(v4, __ T2D, v19, v24, 9);                   //       xar             v4.2D, v19.2D, v24.2D, #9
+    __ bcax(v27, __ T16B, v6, v10, v27);               //       bcax            v27.16B, v6.16B, v10.16B, v27.16B
+    __ eor3(v24, __ T16B, v13, v16, v31);              //       eor3            v24.16B, v13.16B, v16.16B, v31.16B
+    __ rax1(v22, __ T2D, v22, v20);                    //       rax1            v22.2D, v22.2D, v20.2D
+    __ xar(v31, __ T2D, v29, v9, 28);                  //       xar             v31.2D, v29.2D, v9.2D, #28
 
 // SHA512SIMDOp
-    __ sha512h(v20, __ T2D, v4, v24);                  //       sha512h         q20, q4, v24.2D
-    __ sha512h2(v26, __ T2D, v19, v2);                 //       sha512h2                q26, q19, v2.2D
-    __ sha512su0(v8, __ T2D, v8);                      //       sha512su0               v8.2D, v8.2D
-    __ sha512su1(v14, __ T2D, v24, v18);               //       sha512su1               v14.2D, v24.2D, v18.2D
+    __ sha512h(v20, __ T2D, v7, v20);                  //       sha512h         q20, q7, v20.2D
+    __ sha512h2(v28, __ T2D, v9, v11);                 //       sha512h2                q28, q9, v11.2D
+    __ sha512su0(v14, __ T2D, v12);                    //       sha512su0               v14.2D, v12.2D
+    __ sha512su1(v20, __ T2D, v1, v24);                //       sha512su1               v20.2D, v1.2D, v24.2D
 
 // SVEBinaryImmOp
-    __ sve_add(z31, __ S, 36u);                        //       add     z31.s, z31.s, #0x24
-    __ sve_sub(z31, __ B, 85u);                        //       sub     z31.b, z31.b, #0x55
-    __ sve_and(z20, __ H, 4032u);                      //       and     z20.h, z20.h, #0xfc0
-    __ sve_eor(z7, __ D, 274877904896u);               //       eor     z7.d, z7.d, #0x3ffffff800
-    __ sve_orr(z27, __ B, 243u);                       //       orr     z27.b, z27.b, #0xf3
+    __ sve_add(z9, __ S, 108u);                        //       add     z9.s, z9.s, #0x6c
+    __ sve_sub(z19, __ S, 132u);                       //       sub     z19.s, z19.s, #0x84
+    __ sve_and(z5, __ B, 124u);                        //       and     z5.b, z5.b, #0x7c
+    __ sve_eor(z8, __ H, 32768u);                      //       eor     z8.h, z8.h, #0x8000
+    __ sve_orr(z4, __ H, 508u);                        //       orr     z4.h, z4.h, #0x1fc
 
 // SVEBinaryImmOp
-    __ sve_add(z24, __ H, 132u);                       //       add     z24.h, z24.h, #0x84
-    __ sve_sub(z31, __ S, 183u);                       //       sub     z31.s, z31.s, #0xb7
-    __ sve_and(z20, __ D, 4503599627354112u);          //       and     z20.d, z20.d, #0xfffffffffc000
-    __ sve_eor(z14, __ S, 4042322160u);                //       eor     z14.s, z14.s, #0xf0f0f0f0
-    __ sve_orr(z28, __ H, 32256u);                     //       orr     z28.h, z28.h, #0x7e00
+    __ sve_add(z0, __ H, 181u);                        //       add     z0.h, z0.h, #0xb5
+    __ sve_sub(z27, __ B, 7u);                         //       sub     z27.b, z27.b, #0x7
+    __ sve_and(z9, __ S, 130023424u);                  //       and     z9.s, z9.s, #0x7c00000
+    __ sve_eor(z24, __ B, 62u);                        //       eor     z24.b, z24.b, #0x3e
+    __ sve_orr(z24, __ D, 18428729675200069887u);      //       orr     z24.d, z24.d, #0xffc00000000000ff
 
 // SVEBinaryImmOp
-    __ sve_add(z12, __ S, 13u);                        //       add     z12.s, z12.s, #0xd
-    __ sve_sub(z24, __ H, 159u);                       //       sub     z24.h, z24.h, #0x9f
-    __ sve_and(z13, __ S, 2151677951u);                //       and     z13.s, z13.s, #0x803fffff
-    __ sve_eor(z5, __ B, 124u);                        //       eor     z5.b, z5.b, #0x7c
-    __ sve_orr(z8, __ H, 32768u);                      //       orr     z8.h, z8.h, #0x8000
+    __ sve_add(z11, __ D, 104u);                       //       add     z11.d, z11.d, #0x68
+    __ sve_sub(z18, __ D, 142u);                       //       sub     z18.d, z18.d, #0x8e
+    __ sve_and(z14, __ B, 131u);                       //       and     z14.b, z14.b, #0x83
+    __ sve_eor(z22, __ S, 4042322160u);                //       eor     z22.s, z22.s, #0xf0f0f0f0
+    __ sve_orr(z3, __ B, 225u);                        //       orr     z3.b, z3.b, #0xe1
 
 // SVEBinaryImmOp
-    __ sve_add(z4, __ H, 243u);                        //       add     z4.h, z4.h, #0xf3
-    __ sve_sub(z5, __ B, 86u);                         //       sub     z5.b, z5.b, #0x56
-    __ sve_and(z22, __ D, 8064u);                      //       and     z22.d, z22.d, #0x1f80
-    __ sve_eor(z9, __ S, 130023424u);                  //       eor     z9.s, z9.s, #0x7c00000
-    __ sve_orr(z24, __ B, 62u);                        //       orr     z24.b, z24.b, #0x3e
+    __ sve_add(z9, __ S, 142u);                        //       add     z9.s, z9.s, #0x8e
+    __ sve_sub(z21, __ B, 36u);                        //       sub     z21.b, z21.b, #0x24
+    __ sve_and(z2, __ D, 8796093020160u);              //       and     z2.d, z2.d, #0x7fffffff800
+    __ sve_eor(z11, __ S, 3221229567u);                //       eor     z11.s, z11.s, #0xc0000fff
+    __ sve_orr(z30, __ H, 126u);                       //       orr     z30.h, z30.h, #0x7e
 
 // SVEBinaryImmOp
-    __ sve_add(z24, __ D, 113u);                       //       add     z24.d, z24.d, #0x71
-    __ sve_sub(z21, __ H, 217u);                       //       sub     z21.h, z21.h, #0xd9
-    __ sve_and(z13, __ S, 3221229567u);                //       and     z13.s, z13.s, #0xc0000fff
-    __ sve_eor(z14, __ B, 131u);                       //       eor     z14.b, z14.b, #0x83
-    __ sve_orr(z22, __ S, 4042322160u);                //       orr     z22.s, z22.s, #0xf0f0f0f0
+    __ sve_add(z23, __ H, 29u);                        //       add     z23.h, z23.h, #0x1d
+    __ sve_sub(z24, __ D, 26u);                        //       sub     z24.d, z24.d, #0x1a
+    __ sve_and(z19, __ S, 4294049777u);                //       and     z19.s, z19.s, #0xfff1fff1
+    __ sve_eor(z21, __ H, 1008u);                      //       eor     z21.h, z21.h, #0x3f0
+    __ sve_orr(z26, __ B, 131u);                       //       orr     z26.b, z26.b, #0x83
 
 // SVEBinaryImmOp
-    __ sve_add(z3, __ B, 215u);                        //       add     z3.b, z3.b, #0xd7
-    __ sve_sub(z19, __ H, 134u);                       //       sub     z19.h, z19.h, #0x86
-    __ sve_and(z17, __ S, 491520u);                    //       and     z17.s, z17.s, #0x78000
-    __ sve_eor(z2, __ D, 8796093020160u);              //       eor     z2.d, z2.d, #0x7fffffff800
-    __ sve_orr(z11, __ S, 3221229567u);                //       orr     z11.s, z11.s, #0xc0000fff
+    __ sve_add(z17, __ B, 31u);                        //       add     z17.b, z17.b, #0x1f
+    __ sve_sub(z9, __ S, 97u);                         //       sub     z9.s, z9.s, #0x61
+    __ sve_and(z8, __ H, 49155u);                      //       and     z8.h, z8.h, #0xc003
+    __ sve_eor(z17, __ H, 57855u);                     //       eor     z17.h, z17.h, #0xe1ff
+    __ sve_orr(z18, __ D, 2251799811588096u);          //       orr     z18.d, z18.d, #0x7ffffffe00000
 
 // SVEVectorOp
-    __ sve_add(z30, __ B, z12, z3);                    //       add     z30.b, z12.b, z3.b
-    __ sve_sub(z23, __ D, z9, z3);                     //       sub     z23.d, z9.d, z3.d
-    __ sve_fadd(z28, __ D, z3, z19);                   //       fadd    z28.d, z3.d, z19.d
-    __ sve_fmul(z7, __ S, z26, z21);                   //       fmul    z7.s, z26.s, z21.s
-    __ sve_fsub(z5, __ S, z8, z26);                    //       fsub    z5.s, z8.s, z26.s
-    __ sve_abs(z22, __ B, p4, z17);                    //       abs     z22.b, p4/m, z17.b
-    __ sve_add(z3, __ H, p2, z20);                     //       add     z3.h, p2/m, z3.h, z20.h
-    __ sve_and(z8, __ S, p3, z14);                     //       and     z8.s, p3/m, z8.s, z14.s
-    __ sve_asr(z17, __ D, p2, z13);                    //       asr     z17.d, p2/m, z17.d, z13.d
-    __ sve_bic(z18, __ H, p7, z19);                    //       bic     z18.h, p7/m, z18.h, z19.h
-    __ sve_clz(z16, __ S, p3, z27);                    //       clz     z16.s, p3/m, z27.s
-    __ sve_cnt(z28, __ H, p5, z8);                     //       cnt     z28.h, p5/m, z8.h
-    __ sve_eor(z5, __ H, p7, z28);                     //       eor     z5.h, p7/m, z5.h, z28.h
-    __ sve_lsl(z0, __ S, p3, z25);                     //       lsl     z0.s, p3/m, z0.s, z25.s
-    __ sve_lsr(z21, __ S, p0, z3);                     //       lsr     z21.s, p0/m, z21.s, z3.s
-    __ sve_mul(z26, __ D, p1, z26);                    //       mul     z26.d, p1/m, z26.d, z26.d
-    __ sve_neg(z19, __ H, p4, z1);                     //       neg     z19.h, p4/m, z1.h
-    __ sve_not(z14, __ B, p7, z14);                    //       not     z14.b, p7/m, z14.b
-    __ sve_orr(z18, __ S, p0, z31);                    //       orr     z18.s, p0/m, z18.s, z31.s
-    __ sve_rbit(z23, __ H, p5, z30);                   //       rbit    z23.h, p5/m, z30.h
-    __ sve_revb(z8, __ S, p0, z0);                     //       revb    z8.s, p0/m, z0.s
-    __ sve_smax(z23, __ S, p5, z0);                    //       smax    z23.s, p5/m, z23.s, z0.s
-    __ sve_smin(z26, __ H, p6, z24);                   //       smin    z26.h, p6/m, z26.h, z24.h
-    __ sve_sub(z22, __ B, p5, z2);                     //       sub     z22.b, p5/m, z22.b, z2.b
-    __ sve_fabs(z11, __ D, p5, z12);                   //       fabs    z11.d, p5/m, z12.d
-    __ sve_fadd(z24, __ D, p6, z9);                    //       fadd    z24.d, p6/m, z24.d, z9.d
-    __ sve_fdiv(z17, __ D, p5, z20);                   //       fdiv    z17.d, p5/m, z17.d, z20.d
-    __ sve_fmax(z4, __ D, p5, z13);                    //       fmax    z4.d, p5/m, z4.d, z13.d
-    __ sve_fmin(z22, __ D, p7, z31);                   //       fmin    z22.d, p7/m, z22.d, z31.d
-    __ sve_fmul(z18, __ S, p4, z15);                   //       fmul    z18.s, p4/m, z18.s, z15.s
-    __ sve_fneg(z13, __ S, p7, z20);                   //       fneg    z13.s, p7/m, z20.s
-    __ sve_frintm(z1, __ S, p3, z14);                  //       frintm  z1.s, p3/m, z14.s
-    __ sve_frintn(z7, __ D, p2, z12);                  //       frintn  z7.d, p2/m, z12.d
-    __ sve_frintp(z4, __ S, p6, z15);                  //       frintp  z4.s, p6/m, z15.s
-    __ sve_fsqrt(z3, __ D, p7, z1);                    //       fsqrt   z3.d, p7/m, z1.d
-    __ sve_fsub(z5, __ D, p5, z31);                    //       fsub    z5.d, p5/m, z5.d, z31.d
-    __ sve_fmad(z13, __ D, p3, z9, z14);               //       fmad    z13.d, p3/m, z9.d, z14.d
-    __ sve_fmla(z1, __ S, p3, z28, z3);                //       fmla    z1.s, p3/m, z28.s, z3.s
-    __ sve_fmls(z26, __ S, p2, z25, z9);               //       fmls    z26.s, p2/m, z25.s, z9.s
-    __ sve_fmsb(z26, __ D, p2, z14, z1);               //       fmsb    z26.d, p2/m, z14.d, z1.d
-    __ sve_fnmad(z26, __ D, p1, z29, z20);             //       fnmad   z26.d, p1/m, z29.d, z20.d
-    __ sve_fnmsb(z6, __ D, p7, z13, z1);               //       fnmsb   z6.d, p7/m, z13.d, z1.d
-    __ sve_fnmla(z11, __ S, p2, z1, z1);               //       fnmla   z11.s, p2/m, z1.s, z1.s
-    __ sve_fnmls(z27, __ S, p6, z15, z2);              //       fnmls   z27.s, p6/m, z15.s, z2.s
-    __ sve_mla(z30, __ B, p4, z25, z2);                //       mla     z30.b, p4/m, z25.b, z2.b
-    __ sve_mls(z24, __ H, p0, z26, z29);               //       mls     z24.h, p0/m, z26.h, z29.h
-    __ sve_and(z3, z22, z14);                          //       and     z3.d, z22.d, z14.d
-    __ sve_eor(z28, z17, z4);                          //       eor     z28.d, z17.d, z4.d
-    __ sve_orr(z27, z16, z2);                          //       orr     z27.d, z16.d, z2.d
-    __ sve_bic(z1, z28, z7);                           //       bic     z1.d, z28.d, z7.d
-    __ sve_uzp1(z31, __ H, z28, z16);                  //       uzp1    z31.h, z28.h, z16.h
-    __ sve_uzp2(z22, __ B, z17, z29);                  //       uzp2    z22.b, z17.b, z29.b
-    __ sve_fabd(z22, __ D, p1, z12);                   //       fabd    z22.d, p1/m, z22.d, z12.d
-    __ sve_bext(z11, __ H, z9, z11);                   //       bext    z11.h, z9.h, z11.h
-    __ sve_bdep(z0, __ S, z4, z23);                    //       bdep    z0.s, z4.s, z23.s
-    __ sve_eor3(z20, z4, z3);                          //       eor3    z20.d, z20.d, z4.d, z3.d
+    __ sve_add(z16, __ S, z15, z27);                   //       add     z16.s, z15.s, z27.s
+    __ sve_sub(z28, __ H, z22, z8);                    //       sub     z28.h, z22.h, z8.h
+    __ sve_fadd(z5, __ S, z28, z28);                   //       fadd    z5.s, z28.s, z28.s
+    __ sve_fmul(z0, __ D, z15, z25);                   //       fmul    z0.d, z15.d, z25.d
+    __ sve_fsub(z21, __ D, z0, z3);                    //       fsub    z21.d, z0.d, z3.d
+    __ sve_sqadd(z26, __ D, z5, z26);                  //       sqadd   z26.d, z5.d, z26.d
+    __ sve_sqsub(z19, __ H, z17, z1);                  //       sqsub   z19.h, z17.h, z1.h
+    __ sve_uqadd(z14, __ B, z30, z14);                 //       uqadd   z14.b, z30.b, z14.b
+    __ sve_uqsub(z18, __ S, z2, z31);                  //       uqsub   z18.s, z2.s, z31.s
+    __ sve_abs(z23, __ H, p5, z30);                    //       abs     z23.h, p5/m, z30.h
+    __ sve_add(z8, __ H, p0, z0);                      //       add     z8.h, p0/m, z8.h, z0.h
+    __ sve_and(z23, __ S, p5, z0);                     //       and     z23.s, p5/m, z23.s, z0.s
+    __ sve_asr(z26, __ H, p6, z24);                    //       asr     z26.h, p6/m, z26.h, z24.h
+    __ sve_bic(z22, __ B, p5, z2);                     //       bic     z22.b, p5/m, z22.b, z2.b
+    __ sve_clz(z11, __ S, p5, z12);                    //       clz     z11.s, p5/m, z12.s
+    __ sve_cnt(z24, __ D, p6, z9);                     //       cnt     z24.d, p6/m, z9.d
+    __ sve_eor(z17, __ S, p5, z20);                    //       eor     z17.s, p5/m, z17.s, z20.s
+    __ sve_lsl(z4, __ D, p5, z13);                     //       lsl     z4.d, p5/m, z4.d, z13.d
+    __ sve_lsr(z22, __ D, p7, z31);                    //       lsr     z22.d, p7/m, z22.d, z31.d
+    __ sve_mul(z18, __ H, p4, z15);                    //       mul     z18.h, p4/m, z18.h, z15.h
+    __ sve_neg(z13, __ B, p7, z20);                    //       neg     z13.b, p7/m, z20.b
+    __ sve_not(z1, __ B, p3, z14);                     //       not     z1.b, p3/m, z14.b
+    __ sve_orr(z7, __ S, p2, z12);                     //       orr     z7.s, p2/m, z7.s, z12.s
+    __ sve_rbit(z4, __ B, p6, z15);                    //       rbit    z4.b, p6/m, z15.b
+    __ sve_revb(z3, __ S, p7, z1);                     //       revb    z3.s, p7/m, z1.s
+    __ sve_smax(z5, __ D, p5, z31);                    //       smax    z5.d, p5/m, z5.d, z31.d
+    __ sve_smin(z13, __ H, p3, z9);                    //       smin    z13.h, p3/m, z13.h, z9.h
+    __ sve_umax(z30, __ D, p0, z15);                   //       umax    z30.d, p0/m, z30.d, z15.d
+    __ sve_umin(z3, __ H, p0, z26);                    //       umin    z3.h, p0/m, z3.h, z26.h
+    __ sve_sub(z25, __ D, p2, z1);                     //       sub     z25.d, p2/m, z25.d, z1.d
+    __ sve_fabs(z10, __ D, p3, z1);                    //       fabs    z10.d, p3/m, z1.d
+    __ sve_fadd(z26, __ D, p1, z29);                   //       fadd    z26.d, p1/m, z26.d, z29.d
+    __ sve_fdiv(z17, __ S, p1, z28);                   //       fdiv    z17.s, p1/m, z17.s, z28.s
+    __ sve_fmax(z1, __ S, p7, z11);                    //       fmax    z1.s, p7/m, z1.s, z11.s
+    __ sve_fmin(z1, __ D, p0, z1);                     //       fmin    z1.d, p0/m, z1.d, z1.d
+    __ sve_fmul(z27, __ S, p3, z2);                    //       fmul    z27.s, p3/m, z27.s, z2.s
+    __ sve_fneg(z30, __ S, p4, z25);                   //       fneg    z30.s, p4/m, z25.s
+    __ sve_frintm(z2, __ D, p6, z3);                   //       frintm  z2.d, p6/m, z3.d
+    __ sve_frintn(z29, __ D, p3, z3);                  //       frintn  z29.d, p3/m, z3.d
+    __ sve_frintp(z14, __ D, p4, z28);                 //       frintp  z14.d, p4/m, z28.d
+    __ sve_fsqrt(z4, __ D, p2, z27);                   //       fsqrt   z4.d, p2/m, z27.d
+    __ sve_fsub(z2, __ D, p4, z1);                     //       fsub    z2.d, p4/m, z2.d, z1.d
+    __ sve_fmad(z7, __ D, p5, z31, z28);               //       fmad    z7.d, p5/m, z31.d, z28.d
+    __ sve_fmla(z10, __ S, p5, z17, z29);              //       fmla    z10.s, p5/m, z17.s, z29.s
+    __ sve_fmls(z22, __ S, p1, z12, z24);              //       fmls    z22.s, p1/m, z12.s, z24.s
+    __ sve_fmsb(z9, __ S, p2, z11, z0);                //       fmsb    z9.s, p2/m, z11.s, z0.s
+    __ sve_fnmad(z23, __ S, p5, z20, z4);              //       fnmad   z23.s, p5/m, z20.s, z4.s
+    __ sve_fnmsb(z15, __ D, p3, z4, z30);              //       fnmsb   z15.d, p3/m, z4.d, z30.d
+    __ sve_fnmla(z27, __ S, p1, z21, z26);             //       fnmla   z27.s, p1/m, z21.s, z26.s
+    __ sve_fnmls(z31, __ S, p0, z25, z4);              //       fnmls   z31.s, p0/m, z25.s, z4.s
+    __ sve_mla(z6, __ D, p0, z21, z7);                 //       mla     z6.d, p0/m, z21.d, z7.d
+    __ sve_mls(z24, __ S, p7, z24, z31);               //       mls     z24.s, p7/m, z24.s, z31.s
+    __ sve_and(z1, z10, z12);                          //       and     z1.d, z10.d, z12.d
+    __ sve_eor(z13, z8, z25);                          //       eor     z13.d, z8.d, z25.d
+    __ sve_orr(z1, z31, z23);                          //       orr     z1.d, z31.d, z23.d
+    __ sve_bic(z20, z0, z21);                          //       bic     z20.d, z0.d, z21.d
+    __ sve_uzp1(z31, __ S, z29, z27);                  //       uzp1    z31.s, z29.s, z27.s
+    __ sve_uzp2(z8, __ S, z29, z26);                   //       uzp2    z8.s, z29.s, z26.s
+    __ sve_fabd(z5, __ D, p1, z18);                    //       fabd    z5.d, p1/m, z5.d, z18.d
+    __ sve_bext(z13, __ H, z26, z21);                  //       bext    z13.h, z26.h, z21.h
+    __ sve_bdep(z0, __ D, z19, z10);                   //       bdep    z0.d, z19.d, z10.d
+    __ sve_eor3(z7, z17, z6);                          //       eor3    z7.d, z7.d, z17.d, z6.d
+    __ sve_sqadd(z20, __ H, p6, z28);                  //       sqadd   z20.h, p6/m, z20.h, z28.h
+    __ sve_sqsub(z17, __ H, p3, z19);                  //       sqsub   z17.h, p3/m, z17.h, z19.h
+    __ sve_uqadd(z26, __ B, p2, z24);                  //       uqadd   z26.b, p2/m, z26.b, z24.b
+    __ sve_uqsub(z11, __ S, p3, z28);                  //       uqsub   z11.s, p3/m, z11.s, z28.s
 
 // SVEReductionOp
-    __ sve_andv(v15, __ D, p1, z30);                   //       andv d15, p1, z30.d
-    __ sve_orv(v27, __ D, p1, z21);                    //       orv d27, p1, z21.d
-    __ sve_eorv(v10, __ D, p7, z3);                    //       eorv d10, p7, z3.d
-    __ sve_smaxv(v4, __ B, p2, z6);                    //       smaxv b4, p2, z6.b
-    __ sve_sminv(v21, __ D, p1, z25);                  //       sminv d21, p1, z25.d
-    __ sve_fminv(v30, __ D, p6, z31);                  //       fminv d30, p6, z31.d
-    __ sve_fmaxv(v1, __ D, p2, z12);                   //       fmaxv d1, p2, z12.d
-    __ sve_fadda(v13, __ D, p2, z25);                  //       fadda d13, p2, d13, z25.d
-    __ sve_uaddv(v1, __ D, p7, z23);                   //       uaddv d1, p7, z23.d
+    __ sve_andv(v23, __ S, p5, z28);                   //       andv s23, p5, z28.s
+    __ sve_orv(v20, __ B, p7, z24);                    //       orv b20, p7, z24.b
+    __ sve_eorv(v27, __ H, p1, z23);                   //       eorv h27, p1, z23.h
+    __ sve_smaxv(v12, __ D, p1, z13);                  //       smaxv d12, p1, z13.d
+    __ sve_sminv(v26, __ B, p5, z20);                  //       sminv b26, p5, z20.b
+    __ sve_fminv(v2, __ S, p7, z29);                   //       fminv s2, p7, z29.s
+    __ sve_fmaxv(v29, __ S, p5, z3);                   //       fmaxv s29, p5, z3.s
+    __ sve_fadda(v5, __ S, p2, z28);                   //       fadda s5, p2, s5, z28.s
+    __ sve_uaddv(v17, __ H, p3, z14);                  //       uaddv d17, p3, z14.h
 
 // AddWideNEONOp
-    __ saddwv(v20, v21, __ T8H, v22, __ T8B);          //       saddw   v20.8H, v21.8H, v22.8B
-    __ saddwv2(v0, v1, __ T8H, v2, __ T16B);           //       saddw2  v0.8H, v1.8H, v2.16B
-    __ saddwv(v21, v22, __ T4S, v23, __ T4H);          //       saddw   v21.4S, v22.4S, v23.4H
-    __ saddwv2(v7, v8, __ T4S, v9, __ T8H);            //       saddw2  v7.4S, v8.4S, v9.8H
-    __ saddwv(v31, v0, __ T2D, v1, __ T2S);            //       saddw   v31.2D, v0.2D, v1.2S
+    __ saddwv(v10, v11, __ T8H, v12, __ T8B);          //       saddw   v10.8H, v11.8H, v12.8B
+    __ saddwv2(v8, v9, __ T8H, v10, __ T16B);          //       saddw2  v8.8H, v9.8H, v10.16B
+    __ saddwv(v9, v10, __ T4S, v11, __ T4H);           //       saddw   v9.4S, v10.4S, v11.4H
+    __ saddwv2(v19, v20, __ T4S, v21, __ T8H);         //       saddw2  v19.4S, v20.4S, v21.8H
+    __ saddwv(v0, v1, __ T2D, v2, __ T2S);             //       saddw   v0.2D, v1.2D, v2.2S
     __ saddwv2(v29, v30, __ T2D, v31, __ T4S);         //       saddw2  v29.2D, v30.2D, v31.4S
-    __ uaddwv(v27, v28, __ T8H, v29, __ T8B);          //       uaddw   v27.8H, v28.8H, v29.8B
-    __ uaddwv2(v22, v23, __ T8H, v24, __ T16B);        //       uaddw2  v22.8H, v23.8H, v24.16B
-    __ uaddwv(v8, v9, __ T4S, v10, __ T4H);            //       uaddw   v8.4S, v9.4S, v10.4H
-    __ uaddwv2(v29, v30, __ T4S, v31, __ T8H);         //       uaddw2  v29.4S, v30.4S, v31.8H
-    __ uaddwv(v26, v27, __ T2D, v28, __ T2S);          //       uaddw   v26.2D, v27.2D, v28.2S
-    __ uaddwv2(v20, v21, __ T2D, v22, __ T4S);         //       uaddw2  v20.2D, v21.2D, v22.4S
+    __ uaddwv(v16, v17, __ T8H, v18, __ T8B);          //       uaddw   v16.8H, v17.8H, v18.8B
+    __ uaddwv2(v16, v17, __ T8H, v18, __ T16B);        //       uaddw2  v16.8H, v17.8H, v18.16B
+    __ uaddwv(v13, v14, __ T4S, v15, __ T4H);          //       uaddw   v13.4S, v14.4S, v15.4H
+    __ uaddwv2(v23, v24, __ T4S, v25, __ T8H);         //       uaddw2  v23.4S, v24.4S, v25.8H
+    __ uaddwv(v24, v25, __ T2D, v26, __ T2S);          //       uaddw   v24.2D, v25.2D, v26.2S
+    __ uaddwv2(v23, v24, __ T2D, v25, __ T4S);         //       uaddw2  v23.2D, v24.2D, v25.4S
 
     __ bind(forth);
 
@@ -1337,30 +1387,30 @@
     0x9101a1a0,     0xb10a5cc8,     0xd10810aa,     0xf10fd061,
     0x120cb166,     0x321764bc,     0x52174681,     0x720c0227,
     0x9241018e,     0xb25a2969,     0xd278b411,     0xf26aad01,
-    0x14000000,     0x17ffffd7,     0x1400044b,     0x94000000,
-    0x97ffffd4,     0x94000448,     0x3400000a,     0x34fffa2a,
-    0x340088aa,     0x35000008,     0x35fff9c8,     0x35008848,
-    0xb400000b,     0xb4fff96b,     0xb40087eb,     0xb500001d,
-    0xb5fff91d,     0xb500879d,     0x10000013,     0x10fff8b3,
-    0x10008733,     0x90000013,     0x36300016,     0x3637f836,
-    0x363086b6,     0x3758000c,     0x375ff7cc,     0x3758864c,
+    0x14000000,     0x17ffffd7,     0x1400047d,     0x94000000,
+    0x97ffffd4,     0x9400047a,     0x3400000a,     0x34fffa2a,
+    0x34008eea,     0x35000008,     0x35fff9c8,     0x35008e88,
+    0xb400000b,     0xb4fff96b,     0xb4008e2b,     0xb500001d,
+    0xb5fff91d,     0xb5008ddd,     0x10000013,     0x10fff8b3,
+    0x10008d73,     0x90000013,     0x36300016,     0x3637f836,
+    0x36308cf6,     0x3758000c,     0x375ff7cc,     0x37588c8c,
     0x128313a0,     0x528a32c7,     0x7289173b,     0x92ab3acc,
     0xd2a0bf94,     0xf2c285e8,     0x9358722f,     0x330e652f,
     0x53067f3b,     0x93577c53,     0xb34a1aac,     0xd35a4016,
     0x13946c63,     0x93c3dbc8,     0x54000000,     0x54fff5a0,
-    0x54008420,     0x54000001,     0x54fff541,     0x540083c1,
-    0x54000002,     0x54fff4e2,     0x54008362,     0x54000002,
-    0x54fff482,     0x54008302,     0x54000003,     0x54fff423,
-    0x540082a3,     0x54000003,     0x54fff3c3,     0x54008243,
-    0x54000004,     0x54fff364,     0x540081e4,     0x54000005,
-    0x54fff305,     0x54008185,     0x54000006,     0x54fff2a6,
-    0x54008126,     0x54000007,     0x54fff247,     0x540080c7,
-    0x54000008,     0x54fff1e8,     0x54008068,     0x54000009,
-    0x54fff189,     0x54008009,     0x5400000a,     0x54fff12a,
-    0x54007faa,     0x5400000b,     0x54fff0cb,     0x54007f4b,
-    0x5400000c,     0x54fff06c,     0x54007eec,     0x5400000d,
-    0x54fff00d,     0x54007e8d,     0x5400000e,     0x54ffefae,
-    0x54007e2e,     0x5400000f,     0x54ffef4f,     0x54007dcf,
+    0x54008a60,     0x54000001,     0x54fff541,     0x54008a01,
+    0x54000002,     0x54fff4e2,     0x540089a2,     0x54000002,
+    0x54fff482,     0x54008942,     0x54000003,     0x54fff423,
+    0x540088e3,     0x54000003,     0x54fff3c3,     0x54008883,
+    0x54000004,     0x54fff364,     0x54008824,     0x54000005,
+    0x54fff305,     0x540087c5,     0x54000006,     0x54fff2a6,
+    0x54008766,     0x54000007,     0x54fff247,     0x54008707,
+    0x54000008,     0x54fff1e8,     0x540086a8,     0x54000009,
+    0x54fff189,     0x54008649,     0x5400000a,     0x54fff12a,
+    0x540085ea,     0x5400000b,     0x54fff0cb,     0x5400858b,
+    0x5400000c,     0x54fff06c,     0x5400852c,     0x5400000d,
+    0x54fff00d,     0x540084cd,     0x5400000e,     0x54ffefae,
+    0x5400846e,     0x5400000f,     0x54ffef4f,     0x5400840f,
     0xd40658e1,     0xd4014d22,     0xd4046543,     0xd4273f60,
     0xd44cad80,     0xd503201f,     0xd503203f,     0xd503205f,
     0xd503209f,     0xd50320bf,     0xd503219f,     0xd50323bf,
@@ -1463,47 +1513,57 @@
     0x0e351e93,     0x4e381ef6,     0x0eac1d6a,     0x4ea61ca4,
     0x2e211c1f,     0x6e371ed5,     0x0e2a8528,     0x4e21841f,
     0x0e758693,     0x4e6c856a,     0x0ebe87bc,     0x4ea48462,
-    0x4efb8759,     0x0e27d4c5,     0x4e25d483,     0x4e6ad528,
-    0x2e3886f6,     0x6e358693,     0x2e6f85cd,     0x6e6784c5,
-    0x2ebf87dd,     0x6eba8738,     0x6ef786d5,     0x0ebcd77a,
-    0x4ebad738,     0x4ee5d483,     0x0e3a9f38,     0x4e3c9f7a,
-    0x0e799f17,     0x4e719e0f,     0x0eb79ed5,     0x4ea59c83,
-    0x2ebad738,     0x6eaad528,     0x6efbd759,     0x2e36d6b4,
-    0x6e32d630,     0x6e73d651,     0x2e24dc62,     0x6e23dc41,
-    0x6e62dc20,     0x0e7a9738,     0x4e6694a4,     0x0ea59483,
-    0x4eae95ac,     0x0e21cc1f,     0x4e3ecfbc,     0x4e6ccd6a,
-    0x2e7c977a,     0x6e649462,     0x2eae95ac,     0x6eb49672,
-    0x0ea1cc1f,     0x4ea3cc41,     0x4eefcdcd,     0x2e3fffdd,
-    0x6e22fc20,     0x6e75fe93,     0x0e2e65ac,     0x4e336651,
-    0x0e7866f6,     0x4e6f65cd,     0x0ebe67bc,     0x4ea067fe,
-    0x0e21a41f,     0x4e23a441,     0x0e7ca77a,     0x4e7ea7bc,
-    0x0ea6a4a4,     0x4ea0a7fe,     0x0e26f4a4,     0x4e28f4e6,
-    0x4e60f7fe,     0x0e3c6f7a,     0x4e346e72,     0x0e6b6d49,
-    0x4e6a6d28,     0x0eae6dac,     0x4ea26c20,     0x0e36aeb4,
-    0x4e23ac41,     0x0e7aaf38,     0x4e64ac62,     0x0ea2ac20,
-    0x4eabad49,     0x0e7ab738,     0x4e7cb77a,     0x0eb2b630,
-    0x4ea0b7fe,     0x0e252483,     0x4e2c256a,     0x0e792717,
-    0x4e6c256a,     0x0ea624a4,     0x4eb42672,     0x0ea4f462,
-    0x4eadf58b,     0x4eeaf528,     0x2eaced6a,     0x6eb1ee0f,
-    0x6ef3ee51,     0x0f8710c5,     0x4fa880e6,     0x4fc810e6,
-    0x0f855083,     0x4f8f89cd,     0x4fc45862,     0x2f849062,
-    0x4fab8149,     0x6fca9928,     0x0f6780c5,     0x4f5d898b,
-    0x0f8f81cd,     0x4f9089ee,     0x0e3035ee,     0x4e2d358b,
-    0x0e7a3738,     0x4e633441,     0x0eae35ac,     0x4ea1341f,
-    0x4eec356a,     0x0e323e30,     0x4e293d07,     0x0e643c62,
-    0x4e653c83,     0x0eaf3dcd,     0x4eb53e93,     0x4ef33e51,
-    0x2e328e30,     0x6e258c83,     0x2e638c41,     0x6e6d8d8b,
-    0x2ea08ffe,     0x6ea78cc5,     0x6eea8d28,     0x2e31360f,
-    0x6e3f37dd,     0x2e6037fe,     0x6e623420,     0x2eb636b4,
-    0x6ea93507,     0x6ef636b4,     0x2e393f17,     0x6e3e3fbc,
-    0x2e773ed5,     0x6e7d3f9b,     0x2ebb3f59,     0x6ea73cc5,
-    0x6ee33c41,     0x0e39e717,     0x4e32e630,     0x4e61e41f,
-    0x2ea7e4c5,     0x6eaee5ac,     0x6eebe549,     0x2e3ee7bc,
-    0x6e31e60f,     0x6e7fe7dd,     0x65d23feb,     0x65d03dd2,
-    0x65d03369,     0x65912566,     0x65d13e3f,     0x659334ef,
-    0x25c19085,     0x25c60c7b,     0x259f0269,     0x259d2983,
-    0x25d5303b,     0x259d9458,     0x24ec5aa5,     0x24385c7d,
-    0x247b7e39,     0x24bff4e7,     0xba5fd3e3,     0x3a5f03e5,
+    0x4efb8759,     0x0e270cc5,     0x4e250c83,     0x0e6a0d28,
+    0x4e780ef6,     0x0eb50e93,     0x4eaf0dcd,     0x4ee70cc5,
+    0x2e3f0fdd,     0x6e3a0f38,     0x2e770ed5,     0x6e7c0f7a,
+    0x2eba0f38,     0x6ea50c83,     0x6efa0f38,     0x0e3cd77a,
+    0x4e39d717,     0x4e71d60f,     0x2e3786d5,     0x6e258483,
+    0x2e7a8738,     0x6e6a8528,     0x2ebb8759,     0x6eb686b4,
+    0x6ef28630,     0x0e332e51,     0x4e242c62,     0x0e632c41,
+    0x4e622c20,     0x0eba2f38,     0x4ea62ca4,     0x4ee52c83,
+    0x2e2e2dac,     0x6e212c1f,     0x2e7e2fbc,     0x6e6c2d6a,
+    0x2ebc2f7a,     0x6ea42c62,     0x6eee2dac,     0x0eb4d672,
+    0x4ea1d41f,     0x4ee3d441,     0x0e2f9dcd,     0x4e3f9fdd,
+    0x0e629c20,     0x4e759e93,     0x0eae9dac,     0x4eb39e51,
+    0x2eb8d6f6,     0x6eafd5cd,     0x6efed7bc,     0x2e20d7fe,
+    0x6e21d41f,     0x6e63d441,     0x2e3cdf7a,     0x6e3edfbc,
+    0x6e66dca4,     0x0e6097fe,     0x4e6694a4,     0x0ea894e6,
+    0x4ea097fe,     0x0e3ccf7a,     0x4e34ce72,     0x4e6bcd49,
+    0x2e6a9528,     0x6e6e95ac,     0x2ea29420,     0x6eb696b4,
+    0x0ea3cc41,     0x4ebacf38,     0x4ee4cc62,     0x2e22fc20,
+    0x6e2bfd49,     0x6e7aff38,     0x0e3c677a,     0x4e326630,
+    0x0e6067fe,     0x4e656483,     0x0eac656a,     0x4eb96717,
+    0x2e2c656a,     0x6e2664a4,     0x2e746672,     0x6e646462,
+    0x2ead658b,     0x6eaa6528,     0x0e2ca56a,     0x4e31a60f,
+    0x0e73a651,     0x4e64a462,     0x0eaca56a,     0x4eaea5ac,
+    0x0e2ef5ac,     0x4e31f60f,     0x4e6ff5cd,     0x0e246c62,
+    0x4e296d07,     0x0e766eb4,     0x4e7c6f7a,     0x0eb26e30,
+    0x4ea66ca4,     0x2e246c62,     0x6e266ca4,     0x2e6e6dac,
+    0x6e746e72,     0x2eb76ed5,     0x6eb26e30,     0x0e34ae72,
+    0x4e2dad8b,     0x0e77aed5,     0x4e79af17,     0x0eaeadac,
+    0x4ebcaf7a,     0x0e79b717,     0x4e7eb7bc,     0x0eb0b5ee,
+    0x4eadb58b,     0x0e3a2738,     0x4e232441,     0x0e6e25ac,
+    0x4e61241f,     0x0eac256a,     0x4eb22630,     0x0ea9f507,
+    0x4ea4f462,     0x4ee5f483,     0x2eafedcd,     0x6eb5ee93,
+    0x6ef3ee51,     0x0fa31041,     0x4f8780c5,     0x4fc41862,
+    0x0f895107,     0x4fa1880f,     0x4fcc516a,     0x2f8c916a,
+    0x4f9089ee,     0x6fcf99cd,     0x0f748062,     0x4f4d818b,
+    0x0fa1800f,     0x4f8880e6,     0x0e2b3549,     0x4e3e37bc,
+    0x0e71360f,     0x4e7f37dd,     0x0eb836f6,     0x4ea1341f,
+    0x4ef53693,     0x0e213c1f,     0x4e273cc5,     0x0e703dee,
+    0x4e743e72,     0x0ea13c1f,     0x4eb43e72,     0x4efd3f9b,
+    0x2e368eb4,     0x6e328e30,     0x2e6e8dac,     0x6e6d8d8b,
+    0x2eab8d49,     0x6ea88ce6,     0x6ee08ffe,     0x2e333651,
+    0x6e3d379b,     0x2e7e37bc,     0x6e6037fe,     0x2ea93507,
+    0x6eac356a,     0x6ef636b4,     0x2e2c3d6a,     0x6e263ca4,
+    0x2e7a3f38,     0x6e733e51,     0x2eb33e51,     0x6eb83ef6,
+    0x6ee53c83,     0x0e3fe7dd,     0x4e31e60f,     0x4e78e6f6,
+    0x2eb5e693,     0x6eb5e693,     0x6ef8e6f6,     0x2e24e462,
+    0x6e31e60f,     0x6e68e4e6,     0x65922e06,     0x65d0303b,
+    0x65903222,     0x659135ab,     0x65913b7e,     0x65d33821,
+    0x254b9e29,     0x258f14f7,     0x25c2184c,     0x258222e5,
+    0x25d23730,     0x250e9d99,     0x24e9460e,     0x2427465e,
+    0x24a2a937,     0x24fbe6ae,     0xba5fd3e3,     0x3a5f03e5,
     0xfa411be4,     0x7a42cbe2,     0x93df03ff,     0xc820ffff,
     0x8822fc7f,     0xc8247cbf,     0x88267fff,     0x4e010fe0,
     0x5e040420,     0x4e081fe1,     0x4e0c1fe1,     0x4e0a1fe1,
@@ -1565,53 +1625,55 @@
     0x1e721000,     0x1e723000,     0x1e741000,     0x1e743000,
     0x1e761000,     0x1e763000,     0x1e781000,     0x1e783000,
     0x1e7a1000,     0x1e7a3000,     0x1e7c1000,     0x1e7c3000,
-    0x1e7e1000,     0x1e7e3000,     0xf83983e2,     0xf83b0150,
-    0xf8371073,     0xf8302320,     0xf83a3057,     0xf830508c,
-    0xf83c43be,     0xf83070db,     0xf82961fd,     0xf8a780e4,
-    0xf8af02e9,     0xf8a81382,     0xf8b520bf,     0xf8bb3220,
-    0xf8af5344,     0xf8a842dc,     0xf8bb733b,     0xf8b76080,
-    0xf8e68010,     0xf8e4002f,     0xf8ea10a7,     0xf8ea20fc,
-    0xf8f432b7,     0xf8e6510b,     0xf8f140df,     0xf8f17182,
-    0xf8fe607d,     0xf87b83b6,     0xf86e038d,     0xf87110b8,
-    0xf862214e,     0xf870336b,     0xf877508c,     0xf8764091,
-    0xf8617213,     0xf87061cd,     0xb82c8222,     0xb82302f5,
-    0xb82510e6,     0xb833238d,     0xb83130d0,     0xb822507d,
-    0xb82441e6,     0xb834718d,     0xb8346328,     0xb8b48013,
-    0xb8ab00d8,     0xb8b411df,     0xb8b02006,     0xb8a7326f,
-    0xb8ba5149,     0xb8b742d5,     0xb8bc7062,     0xb8af6293,
-    0xb8e783a4,     0xb8e70120,     0xb8f012f4,     0xb8e42150,
-    0xb8f7332b,     0xb8e6521f,     0xb8ed4197,     0xb8e1712e,
-    0xb8f56350,     0xb86f8084,     0xb87000c8,     0xb87e13a4,
-    0xb871235d,     0xb869304f,     0xb86b507d,     0xb8674361,
-    0xb87571d0,     0xb86862d0,     0xce3454b9,     0xce107af2,
-    0xce608e94,     0xce982664,     0xce788094,     0xce62867a,
-    0xcec08108,     0xce728b0e,     0x25a0c49f,     0x2521cabf,
-    0x058054b4,     0x0543ab47,     0x050026bb,     0x2560d098,
-    0x25a1d6ff,     0x058394b4,     0x0540266e,     0x05003cbc,
-    0x25a0c1ac,     0x2561d3f8,     0x05800acd,     0x05403685,
-    0x05000c08,     0x2560de64,     0x2521cac5,     0x0583c8b6,
-    0x05405089,     0x05003e98,     0x25e0ce38,     0x2561db35,
-    0x058011ad,     0x05400e4e,     0x05002676,     0x2520dae3,
-    0x2561d0d3,     0x05808871,     0x0543abe2,     0x050011ab,
-    0x0423019e,     0x04e30537,     0x65d3007c,     0x65950b47,
-    0x659a0505,     0x0416b236,     0x04400a83,     0x049a0dc8,
-    0x04d089b1,     0x045b1e72,     0x0499af70,     0x045ab51c,
-    0x04591f85,     0x04938f20,     0x04918075,     0x04d0075a,
-    0x0457b033,     0x041ebdce,     0x049803f2,     0x056797d7,
-    0x05a48008,     0x04881417,     0x044a1b1a,     0x04011456,
-    0x04dcb58b,     0x65c09938,     0x65cd9691,     0x65c695a4,
-    0x65c79ff6,     0x658291f2,     0x049dbe8d,     0x6582adc1,
-    0x65c0a987,     0x6581b9e4,     0x65cdbc23,     0x65c197e5,
-    0x65ee8d2d,     0x65a30f81,     0x65a92b3a,     0x65e1a9da,
-    0x65f4c7ba,     0x65e1fda6,     0x65a1482b,     0x65a279fb,
-    0x0402533e,     0x045d6358,     0x042e32c3,     0x04a4323c,
-    0x0462321b,     0x04e73381,     0x05706b9f,     0x053d6e36,
-    0x65c88596,     0x454bb12b,     0x4597b480,     0x04243874,
-    0x04da27cf,     0x04d826bb,     0x04d93c6a,     0x040828c4,
-    0x04ca2735,     0x65c73bfe,     0x65c62981,     0x65d82b2d,
-    0x04c13ee1,     0x0e3612b4,     0x4e221020,     0x0e7712d5,
-    0x4e691107,     0x0ea1101f,     0x4ebf13dd,     0x2e3d139b,
-    0x6e3812f6,     0x2e6a1128,     0x6e7f13dd,     0x2ebc137a,
-    0x6eb612b4,
+    0x1e7e1000,     0x1e7e3000,     0xf82081f1,     0xf824011a,
+    0xf83c1376,     0xf83b22f9,     0xf82030c4,     0xf8305080,
+    0xf82f4141,     0xf8277145,     0xf83c6287,     0xf8b780d5,
+    0xf8ab0228,     0xf8bf1226,     0xf8a223cc,     0xf8bd3363,
+    0xf8b651dd,     0xf8ad423c,     0xf8b87045,     0xf8ae620a,
+    0xf8eb82fb,     0xf8ec02c4,     0xf8f11024,     0xf8f321f0,
+    0xf8ed318e,     0xf8e25071,     0xf8f540b7,     0xf8e67267,
+    0xf8ed623c,     0xf8708046,     0xf87d0083,     0xf8661290,
+    0xf86d228c,     0xf8683299,     0xf8735160,     0xf8784286,
+    0xf87f720e,     0xf86660e0,     0xb82f8353,     0xb82902ea,
+    0xb8351396,     0xb82221e3,     0xb83330f4,     0xb82450fd,
+    0xb8204209,     0xb8347097,     0xb83062ea,     0xb8ab80d9,
+    0xb8bf01b0,     0xb8b7102c,     0xb8ae22a9,     0xb8b031fa,
+    0xb8a451e4,     0xb8a843c6,     0xb8a4723d,     0xb8bd613a,
+    0xb8ef8162,     0xb8fd00e3,     0xb8e112bb,     0xb8f0210e,
+    0xb8f03336,     0xb8e552b4,     0xb8f04217,     0xb8fe7294,
+    0xb8e06264,     0xb8788284,     0xb8640358,     0xb8731102,
+    0xb868230e,     0xb87032df,     0xb864503f,     0xb86a4194,
+    0xb86070e9,     0xb8786090,     0xce2a6cdb,     0xce107db8,
+    0xce748ed6,     0xce8973bf,     0xce7480f4,     0xce6b853c,
+    0xcec0818e,     0xce788834,     0x25a0cd89,     0x25a1d093,
+    0x05803685,     0x05400c08,     0x050074c4,     0x2560d6a0,
+    0x2521c0fb,     0x05805089,     0x05403e98,     0x05025238,
+    0x25e0cd0b,     0x25e1d1d2,     0x05800e4e,     0x05402676,
+    0x05001e63,     0x25a0d1c9,     0x2521c495,     0x0583abe2,
+    0x054011ab,     0x05007cbe,     0x2560c3b7,     0x25e1c358,
+    0x05806593,     0x054064b5,     0x05000e5a,     0x2520c3f1,
+    0x25a1cc29,     0x05801468,     0x05401d71,     0x05035bb2,
+    0x04bb01f0,     0x046806dc,     0x659c0385,     0x65d909e0,
+    0x65c30415,     0x04fa10ba,     0x04611a33,     0x042e17ce,
+    0x04bf1c52,     0x0456b7d7,     0x04400008,     0x049a1417,
+    0x04509b1a,     0x041b1456,     0x0499b58b,     0x04dab938,
+    0x04991691,     0x04d395a4,     0x04d19ff6,     0x045011f2,
+    0x0417be8d,     0x041eadc1,     0x04980987,     0x052799e4,
+    0x05a49c23,     0x04c817e5,     0x044a0d2d,     0x04c901fe,
+    0x044b0343,     0x04c10839,     0x04dcac2a,     0x65c087ba,
+    0x658d8791,     0x65869d61,     0x65c78021,     0x65828c5b,
+    0x049db33e,     0x65c2b862,     0x65c0ac7d,     0x65c1b38e,
+    0x65cdab64,     0x65c19022,     0x65fc97e7,     0x65bd162a,
+    0x65b82596,     0x65a0a969,     0x65a4d697,     0x65feec8f,
+    0x65ba46bb,     0x65a4633f,     0x04c742a6,     0x049f7f18,
+    0x042c3141,     0x04b9310d,     0x047733e1,     0x04f53014,
+    0x05bb6bbf,     0x05ba6fa8,     0x65c88645,     0x4555b34d,
+    0x45cab660,     0x043138c7,     0x44589b94,     0x445a8e71,
+    0x44198b1a,     0x449b8f8b,     0x049a3797,     0x04183f14,
+    0x045926fb,     0x04c825ac,     0x040a369a,     0x65873fa2,
+    0x6586347d,     0x65982b85,     0x04412dd1,     0x0e2c116a,
+    0x4e2a1128,     0x0e6b1149,     0x4e751293,     0x0ea21020,
+    0x4ebf13dd,     0x2e321230,     0x6e321230,     0x2e6f11cd,
+    0x6e791317,     0x2eba1338,     0x6eb91317,
   };
 // END  Generated code -- do not edit
diff --git a/test/hotspot/jtreg/compiler/lib/ir_framework/IRNode.java b/test/hotspot/jtreg/compiler/lib/ir_framework/IRNode.java
index 25204dc280d..b650db8344a 100644
--- a/test/hotspot/jtreg/compiler/lib/ir_framework/IRNode.java
+++ b/test/hotspot/jtreg/compiler/lib/ir_framework/IRNode.java
@@ -2016,6 +2016,21 @@ public class IRNode {
         vectorNode(VECTOR_BLEND_B, "VectorBlend", TYPE_BYTE);
     }
 
+    public static final String VECTOR_BLEND_S = VECTOR_PREFIX + "VECTOR_BLEND_S" + POSTFIX;
+    static {
+        vectorNode(VECTOR_BLEND_S, "VectorBlend", TYPE_SHORT);
+    }
+
+    public static final String VECTOR_BLEND_I = VECTOR_PREFIX + "VECTOR_BLEND_I" + POSTFIX;
+    static {
+        vectorNode(VECTOR_BLEND_I, "VectorBlend", TYPE_INT);
+    }
+
+    public static final String VECTOR_BLEND_L = VECTOR_PREFIX + "VECTOR_BLEND_L" + POSTFIX;
+    static {
+        vectorNode(VECTOR_BLEND_L, "VectorBlend", TYPE_LONG);
+    }
+
     public static final String VECTOR_BLEND_F = VECTOR_PREFIX + "VECTOR_BLEND_F" + POSTFIX;
     static {
         vectorNode(VECTOR_BLEND_F, "VectorBlend", TYPE_FLOAT);
diff --git a/test/hotspot/jtreg/compiler/lib/ir_framework/test/IREncodingPrinter.java b/test/hotspot/jtreg/compiler/lib/ir_framework/test/IREncodingPrinter.java
index 03847e8f761..c9904404e90 100644
--- a/test/hotspot/jtreg/compiler/lib/ir_framework/test/IREncodingPrinter.java
+++ b/test/hotspot/jtreg/compiler/lib/ir_framework/test/IREncodingPrinter.java
@@ -108,6 +108,7 @@ public class IREncodingPrinter {
         "sha3",
         "asimd",
         "sve",
+        "sve2",
         // Riscv64
         "rvv",
         "zbkb",
diff --git a/test/hotspot/jtreg/compiler/vectorapi/VectorSaturatedOperationsTest.java b/test/hotspot/jtreg/compiler/vectorapi/VectorSaturatedOperationsTest.java
index f4ef254a980..84aaacb3a01 100644
--- a/test/hotspot/jtreg/compiler/vectorapi/VectorSaturatedOperationsTest.java
+++ b/test/hotspot/jtreg/compiler/vectorapi/VectorSaturatedOperationsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2024, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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 8338021 8342677
+* @bug 8338021 8342677 8349522
 * @summary Add IR validation tests for newly added saturated vector add / sub operations
 * @modules jdk.incubator.vector
 * @library /test/lib /
@@ -59,6 +59,8 @@ public class VectorSaturatedOperationsTest {
     private short[] short_out;
     private byte[]  byte_out;
 
+    private boolean[] mask;
+
     public static void main(String[] args) {
         TestFramework testFramework = new TestFramework();
         testFramework.setDefaultWarmup(5000)
@@ -137,6 +139,7 @@ public class VectorSaturatedOperationsTest {
         short_in2 = new short[COUNT];
         int_in2   = new int[COUNT];
         long_in2  = new long[COUNT];
+        mask      = new boolean[COUNT];
         IntStream.range(0, COUNT-4).forEach(
             i -> {
                 long_in1[i] = r.nextLong(Long.MIN_VALUE, Long.MAX_VALUE);
@@ -147,6 +150,7 @@ public class VectorSaturatedOperationsTest {
                 short_in2[i] = (short)r.nextInt(Short.MIN_VALUE, Short.MAX_VALUE);
                 byte_in1[i] = (byte)r.nextInt(Byte.MIN_VALUE, Byte.MAX_VALUE);
                 byte_in2[i] = (byte)r.nextInt(Byte.MIN_VALUE, Byte.MAX_VALUE);
+                mask[i] = r.nextBoolean();
             }
         );
 
@@ -162,7 +166,7 @@ public class VectorSaturatedOperationsTest {
     }
 
     @Test
-    @IR(counts = {IRNode.SATURATING_ADD_VB, " >0 "}, applyIfCPUFeature = {"avx", "true"})
+    @IR(counts = {IRNode.SATURATING_ADD_VB, " >0 "}, applyIfCPUFeatureOr = {"avx", "true", "asimd", "true"})
     @Warmup(value = 10000)
     public void sadd_byte() {
         for (int i = 0; i < COUNT; i += bspec.length()) {
@@ -185,7 +189,7 @@ public class VectorSaturatedOperationsTest {
     }
 
     @Test
-    @IR(counts = {IRNode.SATURATING_ADD_VS, " >0 "}, applyIfCPUFeature = {"avx", "true"})
+    @IR(counts = {IRNode.SATURATING_ADD_VS, " >0 "}, applyIfCPUFeatureOr = {"avx", "true", "asimd", "true"})
     @Warmup(value = 10000)
     public void sadd_short() {
         for (int i = 0; i < COUNT; i += sspec.length()) {
@@ -208,7 +212,7 @@ public class VectorSaturatedOperationsTest {
     }
 
     @Test
-    @IR(counts = {IRNode.SATURATING_ADD_VI, " >0 "}, applyIfCPUFeature = {"avx", "true"})
+    @IR(counts = {IRNode.SATURATING_ADD_VI, " >0 "}, applyIfCPUFeatureOr = {"avx", "true", "asimd", "true"})
     @Warmup(value = 10000)
     public void sadd_int() {
         for (int i = 0; i < COUNT; i += ispec.length()) {
@@ -231,7 +235,7 @@ public class VectorSaturatedOperationsTest {
     }
 
     @Test
-    @IR(counts = {IRNode.SATURATING_ADD_VL, " >0 "}, applyIfCPUFeature = {"avx", "true"})
+    @IR(counts = {IRNode.SATURATING_ADD_VL, " >0 "}, applyIfCPUFeatureOr = {"avx", "true", "asimd", "true"})
     @Warmup(value = 10000)
     public void sadd_long() {
         for (int i = 0; i < COUNT; i += lspec.length()) {
@@ -256,7 +260,7 @@ public class VectorSaturatedOperationsTest {
     @Test
     @IR(counts = {IRNode.SATURATING_ADD_VB, " >0 " , "unsigned_vector_node", " >0 "},
         phase = {CompilePhase.BEFORE_MATCHING},
-        applyIfCPUFeature = {"avx", "true"})
+        applyIfCPUFeatureOr = {"avx", "true", "asimd", "true"})
     @Warmup(value = 10000)
     public void suadd_byte() {
         for (int i = 0; i < COUNT; i += bspec.length()) {
@@ -281,7 +285,7 @@ public class VectorSaturatedOperationsTest {
     @Test
     @IR(counts = {IRNode.SATURATING_ADD_VS, " >0 ", "unsigned_vector_node", " >0 "},
         phase = {CompilePhase.BEFORE_MATCHING},
-        applyIfCPUFeature = {"avx", "true"})
+        applyIfCPUFeatureOr = {"avx", "true", "asimd", "true"})
     @Warmup(value = 10000)
     public void suadd_short() {
         for (int i = 0; i < COUNT; i += sspec.length()) {
@@ -306,7 +310,7 @@ public class VectorSaturatedOperationsTest {
     @Test
     @IR(counts = {IRNode.SATURATING_ADD_VI, " >0 ", "unsigned_vector_node", " >0 "},
         phase = {CompilePhase.BEFORE_MATCHING},
-        applyIfCPUFeature = {"avx", "true"})
+        applyIfCPUFeatureOr = {"avx", "true", "asimd", "true"})
     @Warmup(value = 10000)
     public void suadd_int() {
         for (int i = 0; i < COUNT; i += ispec.length()) {
@@ -331,7 +335,7 @@ public class VectorSaturatedOperationsTest {
     @Test
     @IR(counts = {IRNode.SATURATING_ADD_VL, " >0 ", "unsigned_vector_node", " >0 "},
         phase = {CompilePhase.BEFORE_MATCHING},
-        applyIfCPUFeature = {"avx", "true"})
+        applyIfCPUFeatureOr = {"avx", "true", "asimd", "true"})
     @Warmup(value = 10000)
     public void suadd_long() {
         for (int i = 0; i < COUNT; i += lspec.length()) {
@@ -354,7 +358,7 @@ public class VectorSaturatedOperationsTest {
     }
 
     @Test
-    @IR(counts = {IRNode.SATURATING_SUB_VB, " >0 "}, applyIfCPUFeature = {"avx", "true"})
+    @IR(counts = {IRNode.SATURATING_SUB_VB, " >0 "}, applyIfCPUFeatureOr = {"avx", "true", "asimd", "true"})
     @Warmup(value = 10000)
     public void ssub_byte() {
         for (int i = 0; i < COUNT; i += bspec.length()) {
@@ -377,7 +381,7 @@ public class VectorSaturatedOperationsTest {
     }
 
     @Test
-    @IR(counts = {IRNode.SATURATING_SUB_VS, " >0 "}, applyIfCPUFeature = {"avx", "true"})
+    @IR(counts = {IRNode.SATURATING_SUB_VS, " >0 "}, applyIfCPUFeatureOr = {"avx", "true", "asimd", "true"})
     @Warmup(value = 10000)
     public void ssub_short() {
         for (int i = 0; i < COUNT; i += sspec.length()) {
@@ -400,7 +404,7 @@ public class VectorSaturatedOperationsTest {
     }
 
     @Test
-    @IR(counts = {IRNode.SATURATING_SUB_VI, " >0 "}, applyIfCPUFeature = {"avx", "true"})
+    @IR(counts = {IRNode.SATURATING_SUB_VI, " >0 "}, applyIfCPUFeatureOr = {"avx", "true", "asimd", "true"})
     @Warmup(value = 10000)
     public void ssub_int() {
         for (int i = 0; i < COUNT; i += ispec.length()) {
@@ -423,7 +427,7 @@ public class VectorSaturatedOperationsTest {
     }
 
     @Test
-    @IR(counts = {IRNode.SATURATING_SUB_VL, " >0 "}, applyIfCPUFeature = {"avx", "true"})
+    @IR(counts = {IRNode.SATURATING_SUB_VL, " >0 "}, applyIfCPUFeatureOr = {"avx", "true", "asimd", "true"})
     @Warmup(value = 10000)
     public void ssub_long() {
         for (int i = 0; i < COUNT; i += lspec.length()) {
@@ -448,7 +452,7 @@ public class VectorSaturatedOperationsTest {
     @Test
     @IR(counts = {IRNode.SATURATING_SUB_VB, " >0 " , "unsigned_vector_node", " >0 "},
         phase = {CompilePhase.BEFORE_MATCHING},
-        applyIfCPUFeature = {"avx", "true"})
+        applyIfCPUFeatureOr = {"avx", "true", "asimd", "true"})
     @Warmup(value = 10000)
     public void susub_byte() {
         for (int i = 0; i < COUNT; i += bspec.length()) {
@@ -473,7 +477,7 @@ public class VectorSaturatedOperationsTest {
     @Test
     @IR(counts = {IRNode.SATURATING_SUB_VS, " >0 ", "unsigned_vector_node", " >0 "},
         phase = {CompilePhase.BEFORE_MATCHING},
-        applyIfCPUFeature = {"avx", "true"})
+        applyIfCPUFeatureOr = {"avx", "true", "asimd", "true"})
     @Warmup(value = 10000)
     public void susub_short() {
         for (int i = 0; i < COUNT; i += sspec.length()) {
@@ -498,7 +502,7 @@ public class VectorSaturatedOperationsTest {
     @Test
     @IR(counts = {IRNode.SATURATING_SUB_VI, " >0 ", "unsigned_vector_node", " >0 "},
         phase = {CompilePhase.BEFORE_MATCHING},
-        applyIfCPUFeature = {"avx", "true"})
+        applyIfCPUFeatureOr = {"avx", "true", "asimd", "true"})
     @Warmup(value = 10000)
     public void susub_int() {
         for (int i = 0; i < COUNT; i += ispec.length()) {
@@ -523,7 +527,7 @@ public class VectorSaturatedOperationsTest {
     @Test
     @IR(counts = {IRNode.SATURATING_SUB_VL, " >0 ", "unsigned_vector_node", " >0 "},
         phase = {CompilePhase.BEFORE_MATCHING},
-        applyIfCPUFeature = {"avx", "true"})
+        applyIfCPUFeatureOr = {"avx", "true", "asimd", "true"})
     @Warmup(value = 10000)
     public void susub_long() {
         for (int i = 0; i < COUNT; i += lspec.length()) {
@@ -544,4 +548,112 @@ public class VectorSaturatedOperationsTest {
             }
         }
     }
+
+    @Test
+    @IR(counts = {IRNode.SATURATING_ADD_VB, " >0 "}, applyIfCPUFeatureOr = {"avx", "true", "asimd", "true"})
+    @IR(counts = {IRNode.VECTOR_BLEND_B, " >0 "}, applyIfCPUFeatureAnd = {"asimd", "true", "sve2", "false"})
+    @IR(failOn = IRNode.VECTOR_BLEND_B, applyIfCPUFeature = {"sve2", "true"})
+    @Warmup(value = 10000)
+    public void sadd_masked() {
+        for (int i = 0; i < COUNT; i += bspec.length()) {
+            VectorMask<Byte> m = VectorMask.fromArray(bspec, mask, i);
+            ByteVector.fromArray(bspec, byte_in1, i)
+                      .lanewise(VectorOperators.SADD,
+                                ByteVector.fromArray(bspec, byte_in2, i), m)
+                      .intoArray(byte_out, i);
+        }
+    }
+
+    @Check(test = "sadd_masked")
+    public void sadd_masked_verify() {
+        for (int i = 0; i < COUNT; i++) {
+            byte actual = byte_out[i];
+            byte expected = mask[i] ? VectorMath.addSaturating(byte_in1[i], byte_in2[i]) : byte_in1[i];
+            if (actual != expected) {
+                throw new AssertionError("Result Mismatch : actual (" +  actual + ") !=  expected (" + expected  + ")");
+            }
+        }
+    }
+
+    @Test
+    @IR(counts = {IRNode.SATURATING_SUB_VS, " >0 "}, applyIfCPUFeatureOr = {"avx", "true", "asimd", "true"})
+    @IR(counts = {IRNode.VECTOR_BLEND_S, " >0 "}, applyIfCPUFeatureAnd = {"asimd", "true", "sve2", "false"})
+    @IR(failOn = IRNode.VECTOR_BLEND_S, applyIfCPUFeature = {"sve2", "true"})
+    @Warmup(value = 10000)
+    public void ssub_masked() {
+        for (int i = 0; i < COUNT; i += sspec.length()) {
+            VectorMask<Short> m = VectorMask.fromArray(sspec, mask, i);
+            ShortVector.fromArray(sspec, short_in1, i)
+                       .lanewise(VectorOperators.SSUB,
+                                 ShortVector.fromArray(sspec, short_in2, i), m)
+                       .intoArray(short_out, i);
+        }
+    }
+
+    @Check(test = "ssub_masked")
+    public void ssub_masked_verify() {
+        for (int i = 0; i < COUNT; i++) {
+            short actual = short_out[i];
+            short expected = mask[i] ? VectorMath.subSaturating(short_in1[i], short_in2[i]) : short_in1[i];
+            if (actual != expected) {
+                throw new AssertionError("Result Mismatch : actual (" +  actual + ") !=  expected (" + expected  + ")");
+            }
+        }
+    }
+
+    @Test
+    @IR(counts = {IRNode.SATURATING_ADD_VI, " >0 ", "unsigned_vector_node", " >0 "},
+        phase = {CompilePhase.BEFORE_MATCHING},
+        applyIfCPUFeatureOr = {"avx", "true", "asimd", "true"})
+    @IR(counts = {IRNode.VECTOR_BLEND_I, " >0 "}, applyIfCPUFeatureAnd = {"asimd", "true", "sve2", "false"})
+    @IR(failOn = IRNode.VECTOR_BLEND_I, applyIfCPUFeature = {"sve2", "true"})
+    @Warmup(value = 10000)
+    public void suadd_masked() {
+        for (int i = 0; i < COUNT; i += ispec.length()) {
+            VectorMask<Integer> m = VectorMask.fromArray(ispec, mask, i);
+            IntVector.fromArray(ispec, int_in1, i)
+                     .lanewise(VectorOperators.SUADD,
+                               IntVector.fromArray(ispec, int_in2, i), m)
+                     .intoArray(int_out, i);
+        }
+    }
+
+    @Check(test = "suadd_masked")
+    public void suadd_masked_verify() {
+        for (int i = 0; i < COUNT; i++) {
+            int actual = int_out[i];
+            int expected = mask[i] ? VectorMath.addSaturatingUnsigned(int_in1[i], int_in2[i]) : int_in1[i];
+            if (actual != expected) {
+                throw new AssertionError("Result Mismatch : actual (" +  actual + ") !=  expected (" + expected  + ")");
+            }
+        }
+    }
+
+    @Test
+    @IR(counts = {IRNode.SATURATING_SUB_VL, " >0 ", "unsigned_vector_node", " >0 "},
+        phase = {CompilePhase.BEFORE_MATCHING},
+        applyIfCPUFeatureOr = {"avx2", "true", "asimd", "true"})
+    @IR(counts = {IRNode.VECTOR_BLEND_L, " >0 "}, applyIfCPUFeatureAnd = {"asimd", "true", "sve2", "false"})
+    @IR(failOn = IRNode.VECTOR_BLEND_L, applyIfCPUFeature = {"sve2", "true"})
+    @Warmup(value = 10000)
+    public void susub_masked() {
+        for (int i = 0; i < COUNT; i += lspec.length()) {
+            VectorMask<Long> m = VectorMask.fromArray(lspec, mask, i);
+            LongVector.fromArray(lspec, long_in1, i)
+                      .lanewise(VectorOperators.SUSUB,
+                                LongVector.fromArray(lspec, long_in2, i), m)
+                      .intoArray(long_out, i);
+        }
+    }
+
+    @Check(test = "susub_masked")
+    public void susub_masked_verify() {
+        for (int i = 0; i < COUNT; i++) {
+            long actual = long_out[i];
+            long expected = mask[i] ? VectorMath.subSaturatingUnsigned(long_in1[i], long_in2[i]) : long_in1[i];
+            if (actual != expected) {
+                throw new AssertionError("Result Mismatch : actual (" +  actual + ") !=  expected (" + expected  + ")");
+            }
+        }
+    }
 }

From b2da0d341b740eb5fbb784075adb3433427c3cff Mon Sep 17 00:00:00 2001
From: Alexey Semenyuk <asemenyuk@openjdk.org>
Date: Tue, 25 Mar 2025 01:45:03 +0000
Subject: [PATCH 457/587] 8352289: [macos] Review skipped tests  in
 tools/jpackage/macosx/SigningPackage*

Reviewed-by: almatvee
---
 .../jdk/jpackage/test/JPackageCommand.java    |   6 +-
 .../helpers/jdk/jpackage/test/MacHelper.java  |   9 ++
 .../jpackage/macosx/SigningAppImageTest.java  |   8 +-
 .../macosx/SigningAppImageTwoStepsTest.java   |  12 +-
 .../jpackage/macosx/SigningOptionsTest.java   | 151 ------------------
 ...SigningPackageFromTwoStepAppImageTest.java |  12 +-
 .../jpackage/macosx/SigningPackageTest.java   |   8 +-
 .../macosx/SigningPackageTwoStepTest.java     |  13 +-
 .../jpackage/macosx/base/SigningCheck.java    |  97 -----------
 test/jdk/tools/jpackage/share/ErrorTest.java  |  55 ++++++-
 10 files changed, 73 insertions(+), 298 deletions(-)
 delete mode 100644 test/jdk/tools/jpackage/macosx/SigningOptionsTest.java
 delete mode 100644 test/jdk/tools/jpackage/macosx/base/SigningCheck.java

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 1a6fd9ac6ca..d72e84bfab1 100644
--- a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/JPackageCommand.java
+++ b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/JPackageCommand.java
@@ -747,10 +747,10 @@ public class JPackageCommand extends CommandArguments<JPackageCommand> {
 
     public JPackageCommand validateOutput(CannedFormattedString... str) {
         // Will look up the given errors in the order they are specified.
-        return validateOutput(Stream.of(str)
-                .map(this::getValue)
+        Stream.of(str).map(this::getValue)
                 .map(TKit::assertTextStream)
-                .reduce(TKit.TextStreamVerifier::andThen).get());
+                .reduce(TKit.TextStreamVerifier::andThen).ifPresent(this::validateOutput);
+        return this;
     }
 
     public boolean isWithToolProvider() {
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 8d245fb4d96..23d0ec80f1d 100644
--- a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/MacHelper.java
+++ b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/MacHelper.java
@@ -397,6 +397,10 @@ public final class MacHelper {
         private final org.w3c.dom.Document doc;
     }
 
+    public static boolean isXcodeDevToolsInstalled() {
+        return Inner.XCODE_DEV_TOOLS_INSTALLED;
+    }
+
     private static DocumentBuilder createDocumentBuilder() throws
                 ParserConfigurationException {
         DocumentBuilderFactory dbf = DocumentBuilderFactory.newDefaultInstance();
@@ -432,6 +436,11 @@ public final class MacHelper {
         }
     }
 
+    private static final class Inner {
+        private static final boolean XCODE_DEV_TOOLS_INSTALLED =
+                Executor.of("/usr/bin/xcrun", "--help").executeWithoutExitCodeCheck().getExitCode() == 0;
+    }
+
     static final Set<Path> CRITICAL_RUNTIME_FILES = Set.of(Path.of(
             "Contents/Home/lib/server/libjvm.dylib"));
 
diff --git a/test/jdk/tools/jpackage/macosx/SigningAppImageTest.java b/test/jdk/tools/jpackage/macosx/SigningAppImageTest.java
index e27f6c8729b..e93e659408f 100644
--- a/test/jdk/tools/jpackage/macosx/SigningAppImageTest.java
+++ b/test/jdk/tools/jpackage/macosx/SigningAppImageTest.java
@@ -46,16 +46,14 @@ import jdk.jpackage.test.AdditionalLauncher;
  * @test
  * @summary jpackage with --type app-image --mac-sign
  * @library /test/jdk/tools/jpackage/helpers
- * @library /test/lib
  * @library base
  * @build SigningBase
- * @build SigningCheck
- * @build jtreg.SkippedException
  * @build jdk.jpackage.test.*
  * @build SigningAppImageTest
- * @requires (os.family == "mac")
+ * @requires (jpackage.test.MacSignTests == "run")
  * @run main/othervm/timeout=720 -Xmx512m jdk.jpackage.test.Main
  *  --jpt-run=SigningAppImageTest
+ *  --jpt-before-run=SigningBase.verifySignTestEnvReady
  */
 public class SigningAppImageTest {
 
@@ -72,8 +70,6 @@ public class SigningAppImageTest {
     public void test(boolean doSign, boolean signingKey, SigningBase.CertIndex certEnum) throws Exception {
         final var certIndex = certEnum.value();
 
-        SigningCheck.checkCertificates(certIndex);
-
         JPackageCommand cmd = JPackageCommand.helloAppImage();
         if (doSign) {
             cmd.addArguments("--mac-sign",
diff --git a/test/jdk/tools/jpackage/macosx/SigningAppImageTwoStepsTest.java b/test/jdk/tools/jpackage/macosx/SigningAppImageTwoStepsTest.java
index b8763d82e36..94199b31434 100644
--- a/test/jdk/tools/jpackage/macosx/SigningAppImageTwoStepsTest.java
+++ b/test/jdk/tools/jpackage/macosx/SigningAppImageTwoStepsTest.java
@@ -47,16 +47,14 @@ import jdk.jpackage.test.AdditionalLauncher;
  * @test
  * @summary jpackage with --type app-image --app-image "appImage" --mac-sign
  * @library /test/jdk/tools/jpackage/helpers
- * @library /test/lib
  * @library base
  * @build SigningBase
- * @build SigningCheck
- * @build jtreg.SkippedException
  * @build jdk.jpackage.test.*
  * @build SigningAppImageTwoStepsTest
- * @requires (os.family == "mac")
+ * @requires (jpackage.test.MacSignTests == "run")
  * @run main/othervm/timeout=720 -Xmx512m jdk.jpackage.test.Main
  *  --jpt-run=SigningAppImageTwoStepsTest
+ *  --jpt-before-run=SigningBase.verifySignTestEnvReady
  */
 public class SigningAppImageTwoStepsTest {
 
@@ -68,11 +66,7 @@ public class SigningAppImageTwoStepsTest {
     @Parameter({"true", "false"})
     // Unsigned
     @Parameter({"false", "true"})
-    public void test(String... testArgs) throws Exception {
-        boolean signAppImage = Boolean.parseBoolean(testArgs[0]);
-        boolean signingKey = Boolean.parseBoolean(testArgs[1]);
-
-        SigningCheck.checkCertificates(SigningBase.DEFAULT_INDEX);
+    public void test(boolean signAppImage, boolean signingKey) throws Exception {
 
         Path appimageOutput = TKit.createTempDirectory("appimage");
 
diff --git a/test/jdk/tools/jpackage/macosx/SigningOptionsTest.java b/test/jdk/tools/jpackage/macosx/SigningOptionsTest.java
deleted file mode 100644
index 88595c566df..00000000000
--- a/test/jdk/tools/jpackage/macosx/SigningOptionsTest.java
+++ /dev/null
@@ -1,151 +0,0 @@
-/*
- * Copyright (c) 2023, 2025, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please 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.Collection;
-import java.util.List;
-import jdk.jpackage.test.Annotations.Parameters;
-import jdk.jpackage.test.Annotations.Test;
-import jdk.jpackage.test.JPackageCommand;
-import jdk.jpackage.test.TKit;
-
-/*
- * @test
- * @summary Test jpackage signing options errors
- * @library /test/jdk/tools/jpackage/helpers
- * @library /test/lib
- * @library base
- * @build SigningBase
- * @build SigningCheck
- * @build jtreg.SkippedException
- * @build SigningOptionsTest
- * @requires (os.family == "mac")
- * @run main/othervm/timeout=360 -Xmx512m jdk.jpackage.test.Main
- *  --jpt-run=SigningOptionsTest
- *  --jpt-before-run=jdk.jpackage.test.JPackageCommand.useExecutableByDefault
- */
-
-/*
- * @test
- * @summary Test jpackage signing options errors
- * @library /test/jdk/tools/jpackage/helpers
- * @library /test/lib
- * @library base
- * @build SigningBase
- * @build SigningCheck
- * @build jtreg.SkippedException
- * @build SigningOptionsTest
- * @requires (os.family == "mac")
- * @run main/othervm/timeout=360 -Xmx512m jdk.jpackage.test.Main
- *  --jpt-run=SigningOptionsTest
- *  --jpt-before-run=jdk.jpackage.test.JPackageCommand.useToolProviderByDefault
- */
-
-public final class SigningOptionsTest {
-
-    private final String expectedError;
-    private final JPackageCommand cmd;
-
-    private static final String TEST_DUKE = TKit.TEST_SRC_ROOT.resolve(
-            "apps/dukeplug.png").toString();
-
-    @Parameters
-    public static Collection<?> input() {
-        return List.of(new Object[][]{
-            // --mac-signing-key-user-name and --mac-app-image-sign-identity
-            {"Hello",
-                    new String[]{"--mac-sign",
-                                 "--mac-signing-key-user-name", "test-key",
-                                 "--mac-app-image-sign-identity", "test-identity"},
-                    null,
-                    "Mutually exclusive options",
-                    Boolean.FALSE},
-            // --mac-signing-key-user-name and --mac-installer-sign-identity
-            {"Hello",
-                    new String[]{"--mac-sign",
-                                 "--mac-signing-key-user-name", "test-key",
-                                 "--mac-installer-sign-identity", "test-identity"},
-                    null,
-                    "Mutually exclusive options",
-                    Boolean.FALSE},
-            // --mac-installer-sign-identity and --type app-image
-            {"Hello",
-                    new String[]{"--mac-sign",
-                                 "--mac-installer-sign-identity", "test-identity"},
-                    null,
-                    "Option [--mac-installer-sign-identity] is not valid with type",
-                    Boolean.FALSE},
-            // --mac-installer-sign-identity and --type dmg
-            {"Hello",
-                    new String[]{"--type", "dmg",
-                                 "--mac-sign",
-                                 "--mac-installer-sign-identity", "test-identity"},
-                    new String[]{"--type"},
-                    "Option [--mac-installer-sign-identity] is not valid with type",
-                    Boolean.FALSE},
-            // --app-content and --type app-image
-            // JDK-8340802: "codesign" may or may not fail if additional
-            // content is specified based on macOS version. For example on
-            // macOS 15 aarch64 "codesign" will not fail with additional content.
-            // Since we only need to check that warning is displayed when
-            // "codesign" fails and "--app-content" is provided, lets fail
-            // "codesign" for some better reason like identity which does not
-            // exists.
-            {"Hello",
-                    new String[]{"--app-content", TEST_DUKE,
-                                 "--mac-sign",
-                                 "--mac-app-image-sign-identity", "test-identity"},
-                    null,
-                    "\"codesign\" failed and additional application content" +
-                    " was supplied via the \"--app-content\" parameter.",
-                    Boolean.TRUE},
-        });
-    }
-
-    public SigningOptionsTest(String javaAppDesc, String[] jpackageArgs,
-                              String[] removeArgs, String expectedError,
-                              Boolean checkRequirements) {
-        this.expectedError = expectedError;
-
-        if (checkRequirements) {
-            SigningCheck.isXcodeDevToolsInstalled();
-        }
-
-        cmd = JPackageCommand.helloAppImage(javaAppDesc)
-                .saveConsoleOutput(true).dumpOutput(true);
-        if (jpackageArgs != null) {
-            cmd.addArguments(jpackageArgs);
-        } if (removeArgs != null) {
-            for (String arg : removeArgs) {
-                cmd.removeArgumentWithValue(arg);
-            }
-        }
-    }
-
-    @Test
-    public void test() {
-        List<String> output = cmd.execute(1).getOutput();
-        TKit.assertNotNull(output, "output is null");
-        TKit.assertTextStream(expectedError).apply(output.stream());
-    }
-
-}
diff --git a/test/jdk/tools/jpackage/macosx/SigningPackageFromTwoStepAppImageTest.java b/test/jdk/tools/jpackage/macosx/SigningPackageFromTwoStepAppImageTest.java
index f6408d21eba..a612c36ca62 100644
--- a/test/jdk/tools/jpackage/macosx/SigningPackageFromTwoStepAppImageTest.java
+++ b/test/jdk/tools/jpackage/macosx/SigningPackageFromTwoStepAppImageTest.java
@@ -51,17 +51,15 @@ import jdk.jpackage.test.Annotations.Parameter;
  * @test
  * @summary jpackage with --type pkg,dmg --app-image
  * @library /test/jdk/tools/jpackage/helpers
- * @library /test/lib
  * @library base
  * @key jpackagePlatformPackage
  * @build SigningBase
- * @build SigningCheck
- * @build jtreg.SkippedException
  * @build jdk.jpackage.test.*
  * @build SigningPackageFromTwoStepAppImageTest
- * @requires (os.family == "mac")
+ * @requires (jpackage.test.MacSignTests == "run")
  * @run main/othervm/timeout=720 -Xmx512m jdk.jpackage.test.Main
  *  --jpt-run=SigningPackageFromTwoStepAppImageTest
+ *  --jpt-before-run=SigningBase.verifySignTestEnvReady
  */
 public class SigningPackageFromTwoStepAppImageTest {
 
@@ -103,11 +101,7 @@ public class SigningPackageFromTwoStepAppImageTest {
     @Parameter({"true", "false"})
     // Unsigned
     @Parameter({"false", "true"})
-    public void test(String... testArgs) throws Exception {
-        boolean signAppImage = Boolean.parseBoolean(testArgs[0]);
-        boolean signingKey = Boolean.parseBoolean(testArgs[1]);
-
-        SigningCheck.checkCertificates(SigningBase.DEFAULT_INDEX);
+    public void test(boolean signAppImage, boolean signingKey) throws Exception {
 
         Path appimageOutput = TKit.createTempDirectory("appimage");
 
diff --git a/test/jdk/tools/jpackage/macosx/SigningPackageTest.java b/test/jdk/tools/jpackage/macosx/SigningPackageTest.java
index c56f01e192e..e41b0d60397 100644
--- a/test/jdk/tools/jpackage/macosx/SigningPackageTest.java
+++ b/test/jdk/tools/jpackage/macosx/SigningPackageTest.java
@@ -49,17 +49,15 @@ import jdk.jpackage.test.Annotations.Parameter;
  * @test
  * @summary jpackage with --type pkg,dmg --mac-sign
  * @library /test/jdk/tools/jpackage/helpers
- * @library /test/lib
  * @library base
  * @key jpackagePlatformPackage
  * @build SigningBase
- * @build SigningCheck
- * @build jtreg.SkippedException
  * @build jdk.jpackage.test.*
  * @build SigningPackageTest
- * @requires (os.family == "mac")
+ * @requires (jpackage.test.MacSignTests == "run")
  * @run main/othervm/timeout=720 -Xmx512m jdk.jpackage.test.Main
  *  --jpt-run=SigningPackageTest
+ *  --jpt-before-run=SigningBase.verifySignTestEnvReady
  */
 public class SigningPackageTest {
 
@@ -129,8 +127,6 @@ public class SigningPackageTest {
     public static void test(boolean signingKey, boolean signAppImage, boolean signPKG, SigningBase.CertIndex certEnum) throws Exception {
         final var certIndex = certEnum.value();
 
-        SigningCheck.checkCertificates(certIndex);
-
         new PackageTest()
                 .configureHelloApp()
                 .forTypes(PackageType.MAC)
diff --git a/test/jdk/tools/jpackage/macosx/SigningPackageTwoStepTest.java b/test/jdk/tools/jpackage/macosx/SigningPackageTwoStepTest.java
index 84af48f6efb..ccb78fee9f8 100644
--- a/test/jdk/tools/jpackage/macosx/SigningPackageTwoStepTest.java
+++ b/test/jdk/tools/jpackage/macosx/SigningPackageTwoStepTest.java
@@ -52,17 +52,15 @@ import jdk.jpackage.test.Annotations.Parameter;
  * @test
  * @summary jpackage with --type pkg,dmg --app-image
  * @library /test/jdk/tools/jpackage/helpers
- * @library /test/lib
  * @library base
  * @key jpackagePlatformPackage
  * @build SigningBase
- * @build SigningCheck
- * @build jtreg.SkippedException
  * @build jdk.jpackage.test.*
  * @build SigningPackageTwoStepTest
- * @requires (os.family == "mac")
+ * @requires (jpackage.test.MacSignTests == "run")
  * @run main/othervm/timeout=720 -Xmx512m jdk.jpackage.test.Main
  *  --jpt-run=SigningPackageTwoStepTest
+ *  --jpt-before-run=SigningBase.verifySignTestEnvReady
  */
 public class SigningPackageTwoStepTest {
 
@@ -107,12 +105,7 @@ public class SigningPackageTwoStepTest {
     @Parameter({"true", "false"})
     // Unsigned
     @Parameter({"false", "true"})
-    public static void test(String... testArgs) throws Exception {
-        boolean signAppImage = Boolean.parseBoolean(testArgs[0]);
-        boolean signingKey = Boolean.parseBoolean(testArgs[1]);
-
-        SigningCheck.checkCertificates(SigningBase.DEFAULT_INDEX);
-
+    public static void test(boolean signAppImage, boolean signingKey) throws Exception {
         Path appimageOutput = TKit.createTempDirectory("appimage");
 
         JPackageCommand appImageCmd = JPackageCommand.helloAppImage()
diff --git a/test/jdk/tools/jpackage/macosx/base/SigningCheck.java b/test/jdk/tools/jpackage/macosx/base/SigningCheck.java
deleted file mode 100644
index 3db101f3806..00000000000
--- a/test/jdk/tools/jpackage/macosx/base/SigningCheck.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
- * Copyright (c) 2019, 2025, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-import java.util.List;
-
-import jdk.jpackage.test.TKit;
-import jdk.jpackage.test.Executor;
-
-import jdk.jpackage.internal.MacCertificate;
-
-public class SigningCheck {
-
-    public static void checkCertificates(int certIndex) {
-        if (!SigningBase.isDevNameDefault()) {
-            // Do not validate user supplied certificates.
-            // User supplied certs whose trust is set to "Use System Defaults"
-            // will not be listed as trusted by dump-trust-settings, so we
-            // cannot verify them completely.
-            return;
-        }
-
-        // Index can be -1 for unsigned tests, but we still skipping test
-        // if machine is not configured for signing testing, so default it to
-        // SigningBase.DEFAULT_INDEX
-        if (certIndex <= -1) {
-            certIndex = SigningBase.DEFAULT_INDEX;
-        }
-
-        String key = MacCertificate.findCertificateKey(null,
-                        SigningBase.getAppCert(certIndex),
-                        SigningBase.getKeyChain());
-        validateCertificate(key);
-        validateCertificateTrust(SigningBase.getAppCert(certIndex));
-
-        key = MacCertificate.findCertificateKey(null,
-                SigningBase.getInstallerCert(certIndex),
-                SigningBase.getKeyChain());
-        validateCertificate(key);
-        validateCertificateTrust(SigningBase.getInstallerCert(certIndex));
-    }
-
-    private static void validateCertificate(String key) {
-        if (key != null) {
-            MacCertificate certificate = new MacCertificate(key);
-            if (!certificate.isValid()) {
-                TKit.throwSkippedException("Certifcate expired: " + key);
-            } else {
-                return;
-            }
-        }
-
-        TKit.throwSkippedException("Cannot find required certifciates: " + key);
-    }
-
-    private static void validateCertificateTrust(String name) {
-        // Certificates using the default user name must be trusted by user.
-        List<String> result = new Executor()
-                .setExecutable("/usr/bin/security")
-                .addArguments("dump-trust-settings")
-                .executeWithoutExitCodeCheckAndGetOutput();
-        result.stream().forEachOrdered(TKit::trace);
-        TKit.assertTextStream(name)
-                .predicate((line, what) -> line.trim().endsWith(what))
-                .orElseThrow(() -> TKit.throwSkippedException(
-                        "Certifcate not trusted by current user: " + name))
-                .apply(result.stream());
-    }
-
-    public static void isXcodeDevToolsInstalled() {
-        int code = Executor.of("/usr/bin/xcrun", "--help")
-                .executeWithoutExitCodeCheck().getExitCode();
-        if (code != 0) {
-            TKit.throwSkippedException("Missing Xcode with command line developer tools");
-        }
-    }
-
-}
diff --git a/test/jdk/tools/jpackage/share/ErrorTest.java b/test/jdk/tools/jpackage/share/ErrorTest.java
index 5260dceae32..0af215d7d43 100644
--- a/test/jdk/tools/jpackage/share/ErrorTest.java
+++ b/test/jdk/tools/jpackage/share/ErrorTest.java
@@ -35,6 +35,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Objects;
 import java.util.Optional;
+import java.util.function.Consumer;
 import java.util.function.Function;
 import java.util.function.Supplier;
 import java.util.regex.Pattern;
@@ -46,6 +47,7 @@ import jdk.jpackage.test.Annotations.Test;
 import jdk.jpackage.test.CannedFormattedString;
 import jdk.jpackage.test.JPackageCommand;
 import jdk.jpackage.test.JPackageStringBundle;
+import jdk.jpackage.test.MacHelper;
 import jdk.jpackage.test.PackageType;
 import jdk.jpackage.test.TKit;
 
@@ -539,25 +541,64 @@ public final class ErrorTest {
         ).map(argGroup -> {
             return testSpec().noAppDesc().addArgs(argGroup.asArray()).addArgs("--app-image", Token.APP_IMAGE.token())
                     .error("ERR_InvalidOptionWithAppImageSigning", argGroup.arg());
-        }).<TestSpec>mapMulti((builder, acc) -> {
-            // It should bail out with the same error message regardless of `--mac-sign` option.
-            acc.accept(builder.create());
-            acc.accept(builder.addArgs("--mac-sign").create());
-        }).toList());
+         // It should bail out with the same error message regardless of `--mac-sign` option.
+        }).mapMulti(ErrorTest::duplicateForMacSign).toList());
 
         testCases.addAll(createMutuallyExclusive(
                 new ArgumentGroup("--mac-signing-key-user-name", "foo"),
                 new ArgumentGroup("--mac-app-image-sign-identity", "bar")
-        ).map(TestSpec.Builder::create).toList());
+        ).mapMulti(ErrorTest::duplicateForMacSign).toList());
 
         testCases.addAll(createMutuallyExclusive(
                 new ArgumentGroup("--mac-signing-key-user-name", "foo"),
                 new ArgumentGroup("--mac-installer-sign-identity", "bar")
-        ).map(TestSpec.Builder::nativeType).map(TestSpec.Builder::create).toList());
+        ).map(TestSpec.Builder::nativeType).mapMulti(ErrorTest::duplicateForMacSign).toList());
 
         return toTestArgs(testCases.stream());
     }
 
+    @Test(ifOS = MACOS)
+    public static void testAppContentWarning() {
+        // --app-content and --type app-image
+        // Expect `message.codesign.failed.reason.app.content` message in the log.
+        // This is not a fatal error, just a warning.
+        // To make jpackage fail, specify invalid signing identity.
+        final var cmd = JPackageCommand.helloAppImage()
+                .addArguments("--app-content", TKit.TEST_SRC_ROOT.resolve("apps/dukeplug.png"))
+                .addArguments("--mac-sign", "--mac-app-image-sign-identity", "foo");
+
+        final List<CannedFormattedString> expectedStrings = new ArrayList<>();
+        expectedStrings.add(JPackageStringBundle.MAIN.cannedFormattedString("message.codesign.failed.reason.app.content"));
+
+        final var xcodeWarning = JPackageStringBundle.MAIN.cannedFormattedString("message.codesign.failed.reason.xcode.tools");
+        if (!MacHelper.isXcodeDevToolsInstalled()) {
+            expectedStrings.add(xcodeWarning);
+        }
+
+        defaultInit(cmd, expectedStrings);
+
+        if (MacHelper.isXcodeDevToolsInstalled()) {
+            // Check there is no warning about missing xcode command line developer tools.
+            cmd.validateOutput(TKit.assertTextStream(xcodeWarning.getValue()).negate());
+        }
+
+        cmd.execute(1);
+    }
+
+    private static void duplicate(TestSpec.Builder builder, Consumer<TestSpec> accumulator, Consumer<TestSpec.Builder> mutator) {
+        accumulator.accept(builder.create());
+        mutator.accept(builder);
+        accumulator.accept(builder.create());
+    }
+
+    private static void duplicateAddArgs(TestSpec.Builder builder, Consumer<TestSpec> accumulator, String...args) {
+        duplicate(builder, accumulator, b -> b.addArgs(args));
+    }
+
+    private static void duplicateForMacSign(TestSpec.Builder builder, Consumer<TestSpec> accumulator) {
+        duplicateAddArgs(builder, accumulator, "--mac-sign");
+    }
+
     private record UnsupportedPlatformOption(String name, Optional<String> value) {
         UnsupportedPlatformOption {
             Objects.requireNonNull(name);

From 99c8a6e47ac9b0659349a849940c27c626beb905 Mon Sep 17 00:00:00 2001
From: Xiaohong Gong <xgong@openjdk.org>
Date: Tue, 25 Mar 2025 06:06:42 +0000
Subject: [PATCH 458/587] 8350463: AArch64: Add vector rearrange support for
 small lane count vectors

Reviewed-by: epeter, bkilambi, haosun
---
 src/hotspot/cpu/aarch64/aarch64_vector.ad     |  63 +---
 src/hotspot/cpu/aarch64/aarch64_vector_ad.m4  |  63 +---
 .../cpu/aarch64/c2_MacroAssembler_aarch64.cpp |  58 ++++
 .../cpu/aarch64/c2_MacroAssembler_aarch64.hpp |   4 +-
 .../compiler/lib/ir_framework/IRNode.java     |  30 ++
 .../vectorapi/VectorRearrangeTest.java        | 311 ++++++++++++++++++
 6 files changed, 422 insertions(+), 107 deletions(-)
 create mode 100644 test/hotspot/jtreg/compiler/vectorapi/VectorRearrangeTest.java

diff --git a/src/hotspot/cpu/aarch64/aarch64_vector.ad b/src/hotspot/cpu/aarch64/aarch64_vector.ad
index ae51df2fea6..c7a0fc5724b 100644
--- a/src/hotspot/cpu/aarch64/aarch64_vector.ad
+++ b/src/hotspot/cpu/aarch64/aarch64_vector.ad
@@ -204,12 +204,6 @@ source %{
           return false;
         }
         break;
-      case Op_VectorLoadShuffle:
-      case Op_VectorRearrange:
-        if (vlen < 4) {
-          return false;
-        }
-        break;
       case Op_ExpandV:
         if (UseSVE < 2 || is_subword_type(bt)) {
           return false;
@@ -6439,61 +6433,24 @@ instruct vtest_alltrue_sve(rFlagsReg cr, pReg src1, pReg src2, pReg ptmp) %{
 
 // ------------------------------ Vector rearrange -----------------------------
 
-// Here is an example that rearranges a NEON vector with 4 ints:
-// Rearrange V1 int[a0, a1, a2, a3] to V2 int[a2, a3, a0, a1]
-//   1. Get the indices of V1 and store them as Vi byte[0, 1, 2, 3].
-//   2. Convert Vi byte[0, 1, 2, 3] to the indices of V2 and also store them as Vi byte[2, 3, 0, 1].
-//   3. Unsigned extend Long Vi from byte[2, 3, 0, 1] to int[2, 3, 0, 1].
-//   4. Multiply Vi int[2, 3, 0, 1] with constant int[0x04040404, 0x04040404, 0x04040404, 0x04040404]
-//      and get tbl base Vm int[0x08080808, 0x0c0c0c0c, 0x00000000, 0x04040404].
-//   5. Add Vm with constant int[0x03020100, 0x03020100, 0x03020100, 0x03020100]
-//      and get tbl index Vm int[0x0b0a0908, 0x0f0e0d0c, 0x03020100, 0x07060504]
-//   6. Use Vm as index register, and use V1 as table register.
-//      Then get V2 as the result by tbl NEON instructions.
-// Notes:
-//   Step 1 matches VectorLoadConst.
-//   Step 3 matches VectorLoadShuffle.
-//   Step 4, 5, 6 match VectorRearrange.
-//   For VectorRearrange short/int, the reason why such complex calculation is
-//   required is because NEON tbl supports bytes table only, so for short/int, we
-//   need to lookup 2/4 bytes as a group. For VectorRearrange long, we use bsl
-//   to implement rearrange.
-
-// Maybe move the shuffle preparation to VectorLoadShuffle
-instruct rearrange_HS_neon(vReg dst, vReg src, vReg shuffle, vReg tmp1, vReg tmp2) %{
-  predicate(UseSVE == 0 &&
-            (Matcher::vector_element_basic_type(n) == T_SHORT ||
-             (type2aelembytes(Matcher::vector_element_basic_type(n)) == 4 &&
-              Matcher::vector_length_in_bytes(n) == 16)));
+instruct rearrange_HSD_neon(vReg dst, vReg src, vReg shuffle, vReg tmp) %{
+  predicate(UseSVE == 0 && Matcher::vector_element_basic_type(n) != T_BYTE);
   match(Set dst (VectorRearrange src shuffle));
-  effect(TEMP_DEF dst, TEMP tmp1, TEMP tmp2);
-  format %{ "rearrange_HS_neon $dst, $src, $shuffle\t# vector (4S/8S/4I/4F). KILL $tmp1, $tmp2" %}
+  effect(TEMP_DEF dst, TEMP tmp);
+  format %{ "rearrange_HSD_neon $dst, $src, $shuffle\t# vector (4H/8H/2S/4S/2D). KILL $tmp" %}
   ins_encode %{
     BasicType bt = Matcher::vector_element_basic_type(this);
-    if (bt == T_SHORT) {
-      uint length_in_bytes = Matcher::vector_length_in_bytes(this);
-      assert(length_in_bytes == 8 || length_in_bytes == 16, "must be");
-      Assembler::SIMD_Arrangement size1 = length_in_bytes == 16 ? __ T16B : __ T8B;
-      Assembler::SIMD_Arrangement size2 = length_in_bytes == 16 ? __ T8H : __ T4H;
-      __ mov($tmp1$$FloatRegister, size1, 0x02);
-      __ mov($tmp2$$FloatRegister, size2, 0x0100);
-      __ mulv($dst$$FloatRegister, size2, $shuffle$$FloatRegister, $tmp1$$FloatRegister);
-      __ addv($dst$$FloatRegister, size1, $dst$$FloatRegister, $tmp2$$FloatRegister);
-      __ tbl($dst$$FloatRegister, size1, $src$$FloatRegister, 1, $dst$$FloatRegister);
-    } else {
-      assert(bt == T_INT || bt == T_FLOAT, "unsupported type");
-      __ mov($tmp1$$FloatRegister, __ T16B, 0x04);
-      __ mov($tmp2$$FloatRegister, __ T4S, 0x03020100);
-      __ mulv($dst$$FloatRegister, __ T4S, $shuffle$$FloatRegister, $tmp1$$FloatRegister);
-      __ addv($dst$$FloatRegister, __ T16B, $dst$$FloatRegister, $tmp2$$FloatRegister);
-      __ tbl($dst$$FloatRegister, __ T16B, $src$$FloatRegister, 1, $dst$$FloatRegister);
-    }
+    uint length_in_bytes = Matcher::vector_length_in_bytes(this);
+    assert(length_in_bytes == 8 || length_in_bytes == 16, "must be");
+    __ neon_rearrange_hsd($dst$$FloatRegister, $src$$FloatRegister,
+                          $shuffle$$FloatRegister, $tmp$$FloatRegister,
+                          bt, length_in_bytes == 16);
   %}
   ins_pipe(pipe_slow);
 %}
 
 instruct rearrange(vReg dst, vReg src, vReg shuffle) %{
-  predicate(Matcher::vector_element_basic_type(n) == T_BYTE || UseSVE > 0);
+  predicate(UseSVE > 0 || Matcher::vector_element_basic_type(n) == T_BYTE);
   match(Set dst (VectorRearrange src shuffle));
   format %{ "rearrange $dst, $src, $shuffle" %}
   ins_encode %{
diff --git a/src/hotspot/cpu/aarch64/aarch64_vector_ad.m4 b/src/hotspot/cpu/aarch64/aarch64_vector_ad.m4
index 5d999299f03..171bc390545 100644
--- a/src/hotspot/cpu/aarch64/aarch64_vector_ad.m4
+++ b/src/hotspot/cpu/aarch64/aarch64_vector_ad.m4
@@ -194,12 +194,6 @@ source %{
           return false;
         }
         break;
-      case Op_VectorLoadShuffle:
-      case Op_VectorRearrange:
-        if (vlen < 4) {
-          return false;
-        }
-        break;
       case Op_ExpandV:
         if (UseSVE < 2 || is_subword_type(bt)) {
           return false;
@@ -4542,61 +4536,24 @@ instruct vtest_alltrue_sve(rFlagsReg cr, pReg src1, pReg src2, pReg ptmp) %{
 
 // ------------------------------ Vector rearrange -----------------------------
 
-// Here is an example that rearranges a NEON vector with 4 ints:
-// Rearrange V1 int[a0, a1, a2, a3] to V2 int[a2, a3, a0, a1]
-//   1. Get the indices of V1 and store them as Vi byte[0, 1, 2, 3].
-//   2. Convert Vi byte[0, 1, 2, 3] to the indices of V2 and also store them as Vi byte[2, 3, 0, 1].
-//   3. Unsigned extend Long Vi from byte[2, 3, 0, 1] to int[2, 3, 0, 1].
-//   4. Multiply Vi int[2, 3, 0, 1] with constant int[0x04040404, 0x04040404, 0x04040404, 0x04040404]
-//      and get tbl base Vm int[0x08080808, 0x0c0c0c0c, 0x00000000, 0x04040404].
-//   5. Add Vm with constant int[0x03020100, 0x03020100, 0x03020100, 0x03020100]
-//      and get tbl index Vm int[0x0b0a0908, 0x0f0e0d0c, 0x03020100, 0x07060504]
-//   6. Use Vm as index register, and use V1 as table register.
-//      Then get V2 as the result by tbl NEON instructions.
-// Notes:
-//   Step 1 matches VectorLoadConst.
-//   Step 3 matches VectorLoadShuffle.
-//   Step 4, 5, 6 match VectorRearrange.
-//   For VectorRearrange short/int, the reason why such complex calculation is
-//   required is because NEON tbl supports bytes table only, so for short/int, we
-//   need to lookup 2/4 bytes as a group. For VectorRearrange long, we use bsl
-//   to implement rearrange.
-
-// Maybe move the shuffle preparation to VectorLoadShuffle
-instruct rearrange_HS_neon(vReg dst, vReg src, vReg shuffle, vReg tmp1, vReg tmp2) %{
-  predicate(UseSVE == 0 &&
-            (Matcher::vector_element_basic_type(n) == T_SHORT ||
-             (type2aelembytes(Matcher::vector_element_basic_type(n)) == 4 &&
-              Matcher::vector_length_in_bytes(n) == 16)));
+instruct rearrange_HSD_neon(vReg dst, vReg src, vReg shuffle, vReg tmp) %{
+  predicate(UseSVE == 0 && Matcher::vector_element_basic_type(n) != T_BYTE);
   match(Set dst (VectorRearrange src shuffle));
-  effect(TEMP_DEF dst, TEMP tmp1, TEMP tmp2);
-  format %{ "rearrange_HS_neon $dst, $src, $shuffle\t# vector (4S/8S/4I/4F). KILL $tmp1, $tmp2" %}
+  effect(TEMP_DEF dst, TEMP tmp);
+  format %{ "rearrange_HSD_neon $dst, $src, $shuffle\t# vector (4H/8H/2S/4S/2D). KILL $tmp" %}
   ins_encode %{
     BasicType bt = Matcher::vector_element_basic_type(this);
-    if (bt == T_SHORT) {
-      uint length_in_bytes = Matcher::vector_length_in_bytes(this);
-      assert(length_in_bytes == 8 || length_in_bytes == 16, "must be");
-      Assembler::SIMD_Arrangement size1 = length_in_bytes == 16 ? __ T16B : __ T8B;
-      Assembler::SIMD_Arrangement size2 = length_in_bytes == 16 ? __ T8H : __ T4H;
-      __ mov($tmp1$$FloatRegister, size1, 0x02);
-      __ mov($tmp2$$FloatRegister, size2, 0x0100);
-      __ mulv($dst$$FloatRegister, size2, $shuffle$$FloatRegister, $tmp1$$FloatRegister);
-      __ addv($dst$$FloatRegister, size1, $dst$$FloatRegister, $tmp2$$FloatRegister);
-      __ tbl($dst$$FloatRegister, size1, $src$$FloatRegister, 1, $dst$$FloatRegister);
-    } else {
-      assert(bt == T_INT || bt == T_FLOAT, "unsupported type");
-      __ mov($tmp1$$FloatRegister, __ T16B, 0x04);
-      __ mov($tmp2$$FloatRegister, __ T4S, 0x03020100);
-      __ mulv($dst$$FloatRegister, __ T4S, $shuffle$$FloatRegister, $tmp1$$FloatRegister);
-      __ addv($dst$$FloatRegister, __ T16B, $dst$$FloatRegister, $tmp2$$FloatRegister);
-      __ tbl($dst$$FloatRegister, __ T16B, $src$$FloatRegister, 1, $dst$$FloatRegister);
-    }
+    uint length_in_bytes = Matcher::vector_length_in_bytes(this);
+    assert(length_in_bytes == 8 || length_in_bytes == 16, "must be");
+    __ neon_rearrange_hsd($dst$$FloatRegister, $src$$FloatRegister,
+                          $shuffle$$FloatRegister, $tmp$$FloatRegister,
+                          bt, length_in_bytes == 16);
   %}
   ins_pipe(pipe_slow);
 %}
 
 instruct rearrange(vReg dst, vReg src, vReg shuffle) %{
-  predicate(Matcher::vector_element_basic_type(n) == T_BYTE || UseSVE > 0);
+  predicate(UseSVE > 0 || Matcher::vector_element_basic_type(n) == T_BYTE);
   match(Set dst (VectorRearrange src shuffle));
   format %{ "rearrange $dst, $src, $shuffle" %}
   ins_encode %{
diff --git a/src/hotspot/cpu/aarch64/c2_MacroAssembler_aarch64.cpp b/src/hotspot/cpu/aarch64/c2_MacroAssembler_aarch64.cpp
index 97cd00e6522..605a05a44a7 100644
--- a/src/hotspot/cpu/aarch64/c2_MacroAssembler_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/c2_MacroAssembler_aarch64.cpp
@@ -2545,6 +2545,64 @@ void C2_MacroAssembler::neon_reverse_bytes(FloatRegister dst, FloatRegister src,
   }
 }
 
+// VectorRearrange implementation for short/int/float/long/double types with NEON
+// instructions. For VectorRearrange short/int/float, we use NEON tbl instruction.
+// But since it supports bytes table only, we need to lookup 2/4 bytes as a group.
+// For VectorRearrange long/double, we compare the shuffle input with iota indices,
+// and use bsl to implement the operation.
+void C2_MacroAssembler::neon_rearrange_hsd(FloatRegister dst, FloatRegister src,
+                                           FloatRegister shuffle, FloatRegister tmp,
+                                           BasicType bt, bool isQ) {
+  assert_different_registers(dst, src, shuffle, tmp);
+  SIMD_Arrangement size1 = isQ ? T16B : T8B;
+  SIMD_Arrangement size2 = esize2arrangement((uint)type2aelembytes(bt), isQ);
+
+  // Here is an example that rearranges a NEON vector with 4 ints:
+  // Rearrange V1 int[a0, a1, a2, a3] to V2 int[a2, a3, a0, a1]
+  //   1. We assume the shuffle input is Vi int[2, 3, 0, 1].
+  //   2. Multiply Vi int[2, 3, 0, 1] with constant int vector
+  //      [0x04040404, 0x04040404, 0x04040404, 0x04040404], and get
+  //      tbl base Vm int[0x08080808, 0x0c0c0c0c, 0x00000000, 0x04040404].
+  //   3. Add Vm with constant int[0x03020100, 0x03020100, 0x03020100, 0x03020100],
+  //      and get tbl index Vm int[0x0b0a0908, 0x0f0e0d0c, 0x03020100, 0x07060504]
+  //   4. Use Vm as index register, and use V1 as table register.
+  //      Then get V2 as the result by tbl NEON instructions.
+  switch (bt) {
+    case T_SHORT:
+      mov(tmp, size1, 0x02);
+      mulv(dst, size2, shuffle, tmp);
+      mov(tmp, size2, 0x0100);
+      addv(dst, size1, dst, tmp);
+      tbl(dst, size1, src, 1, dst);
+      break;
+    case T_INT:
+    case T_FLOAT:
+      mov(tmp, size1, 0x04);
+      mulv(dst, size2, shuffle, tmp);
+      mov(tmp, size2, 0x03020100);
+      addv(dst, size1, dst, tmp);
+      tbl(dst, size1, src, 1, dst);
+      break;
+    case T_LONG:
+    case T_DOUBLE:
+      // Load the iota indices for Long type. The indices are ordered by
+      // type B/S/I/L/F/D, and the offset between two types is 16; Hence
+      // the offset for L is 48.
+      lea(rscratch1,
+          ExternalAddress(StubRoutines::aarch64::vector_iota_indices() + 48));
+      ldrq(tmp, rscratch1);
+      // Check whether the input "shuffle" is the same with iota indices.
+      // Return "src" if true, otherwise swap the two elements of "src".
+      cm(EQ, dst, size2, shuffle, tmp);
+      ext(tmp, size1, src, src, 8);
+      bsl(dst, size1, src, tmp);
+      break;
+    default:
+      assert(false, "unsupported element type");
+      ShouldNotReachHere();
+  }
+}
+
 // Extract a scalar element from an sve vector at position 'idx'.
 // The input elements in src are expected to be of integral type.
 void C2_MacroAssembler::sve_extract_integral(Register dst, BasicType bt, FloatRegister src,
diff --git a/src/hotspot/cpu/aarch64/c2_MacroAssembler_aarch64.hpp b/src/hotspot/cpu/aarch64/c2_MacroAssembler_aarch64.hpp
index d61b050407d..e0eaa0b76e6 100644
--- a/src/hotspot/cpu/aarch64/c2_MacroAssembler_aarch64.hpp
+++ b/src/hotspot/cpu/aarch64/c2_MacroAssembler_aarch64.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -179,6 +179,8 @@
 
   void neon_reverse_bytes(FloatRegister dst, FloatRegister src, BasicType bt, bool isQ);
 
+  void neon_rearrange_hsd(FloatRegister dst, FloatRegister src, FloatRegister shuffle,
+                          FloatRegister tmp, BasicType bt, bool isQ);
   // java.lang.Math::signum intrinsics
   void vector_signum_neon(FloatRegister dst, FloatRegister src, FloatRegister zero,
                           FloatRegister one, SIMD_Arrangement T);
diff --git a/test/hotspot/jtreg/compiler/lib/ir_framework/IRNode.java b/test/hotspot/jtreg/compiler/lib/ir_framework/IRNode.java
index b650db8344a..adb8efc9097 100644
--- a/test/hotspot/jtreg/compiler/lib/ir_framework/IRNode.java
+++ b/test/hotspot/jtreg/compiler/lib/ir_framework/IRNode.java
@@ -334,6 +334,36 @@ public class IRNode {
         beforeMatchingNameRegex(OPAQUE_MULTIVERSIONING, "OpaqueMultiversioning");
     }
 
+    public static final String REARRANGE_VB = VECTOR_PREFIX + "REARRANGE_VB" + POSTFIX;
+    static {
+        vectorNode(REARRANGE_VB, "VectorRearrange", TYPE_BYTE);
+    }
+
+    public static final String REARRANGE_VS = VECTOR_PREFIX + "REARRANGE_VS" + POSTFIX;
+    static {
+        vectorNode(REARRANGE_VS, "VectorRearrange", TYPE_SHORT);
+    }
+
+    public static final String REARRANGE_VI = VECTOR_PREFIX + "REARRANGE_VI" + POSTFIX;
+    static {
+        vectorNode(REARRANGE_VI, "VectorRearrange", TYPE_INT);
+    }
+
+    public static final String REARRANGE_VL = VECTOR_PREFIX + "REARRANGE_VL" + POSTFIX;
+    static {
+        vectorNode(REARRANGE_VL, "VectorRearrange", TYPE_LONG);
+    }
+
+    public static final String REARRANGE_VF = VECTOR_PREFIX + "REARRANGE_VF" + POSTFIX;
+    static {
+        vectorNode(REARRANGE_VF, "VectorRearrange", TYPE_FLOAT);
+    }
+
+    public static final String REARRANGE_VD = VECTOR_PREFIX + "REARRANGE_VD" + POSTFIX;
+    static {
+        vectorNode(REARRANGE_VD, "VectorRearrange", TYPE_DOUBLE);
+    }
+
     public static final String ADD_P_OF = COMPOSITE_PREFIX + "ADD_P_OF" + POSTFIX;
     static {
         String regex = START + "addP_" + IS_REPLACED + MID + ".*" + END;
diff --git a/test/hotspot/jtreg/compiler/vectorapi/VectorRearrangeTest.java b/test/hotspot/jtreg/compiler/vectorapi/VectorRearrangeTest.java
new file mode 100644
index 00000000000..f2d172b8888
--- /dev/null
+++ b/test/hotspot/jtreg/compiler/vectorapi/VectorRearrangeTest.java
@@ -0,0 +1,311 @@
+/*
+ * Copyright (c) 2025, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact 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 8350463
+ * @summary AArch64: Add vector rearrange support for small lane count vectors
+ * @modules jdk.incubator.vector
+ * @library /test/lib /
+ *
+ * @run driver compiler.vectorapi.VectorRearrangeTest
+ */
+
+package compiler.vectorapi;
+
+import compiler.lib.generators.*;
+import compiler.lib.ir_framework.*;
+import jdk.incubator.vector.*;
+import jdk.test.lib.Asserts;
+
+public class VectorRearrangeTest {
+    private static final int LENGTH = 1024;
+    private static final Generators random = Generators.G;
+
+    private static final VectorSpecies<Byte> bspec128    = ByteVector.SPECIES_128;
+    private static final VectorSpecies<Short> sspec128   = ShortVector.SPECIES_128;
+    private static final VectorSpecies<Integer> ispec128 = IntVector.SPECIES_128;
+    private static final VectorSpecies<Long> lspec128    = LongVector.SPECIES_128;
+    private static final VectorSpecies<Float> fspec128   = FloatVector.SPECIES_128;
+    private static final VectorSpecies<Double> dspec128  = DoubleVector.SPECIES_128;
+    private static final VectorSpecies<Byte> bspec64     = ByteVector.SPECIES_64;
+    private static final VectorSpecies<Short> sspec64    = ShortVector.SPECIES_64;
+    private static final VectorSpecies<Integer> ispec64  = IntVector.SPECIES_64;
+    private static final VectorSpecies<Float> fspec64    = FloatVector.SPECIES_64;
+
+    private static byte[]   bsrc;
+    private static short[]  ssrc;
+    private static int[]    isrc;
+    private static long[]   lsrc;
+    private static float[]  fsrc;
+    private static double[] dsrc;
+
+    private static byte[]   bdst;
+    private static short[]  sdst;
+    private static int[]    idst;
+    private static long[]   ldst;
+    private static float[]  fdst;
+    private static double[] ddst;
+
+    private static int[][] indexes;
+
+    static {
+        bsrc = new byte[LENGTH];
+        ssrc = new short[LENGTH];
+        isrc = new int[LENGTH];
+        lsrc = new long[LENGTH];
+        fsrc = new float[LENGTH];
+        dsrc = new double[LENGTH];
+        bdst = new byte[LENGTH];
+        sdst = new short[LENGTH];
+        idst = new int[LENGTH];
+        ldst = new long[LENGTH];
+        fdst = new float[LENGTH];
+        ddst = new double[LENGTH];
+
+        Generator<Integer> byteGen = random.uniformInts(Byte.MIN_VALUE, Byte.MAX_VALUE);
+        Generator<Integer> shortGen = random.uniformInts(Short.MIN_VALUE, Short.MAX_VALUE);
+        for (int i = 0; i < LENGTH; i++) {
+            bsrc[i] = byteGen.next().byteValue();
+            ssrc[i] = shortGen.next().shortValue();
+        }
+        random.fill(random.ints(), isrc);
+        random.fill(random.longs(), lsrc);
+        random.fill(random.floats(), fsrc);
+        random.fill(random.doubles(), dsrc);
+
+        int[] nums = {2, 4, 8, 16};
+        indexes = new int[4][];
+        for (int i = 0; i < 4; i++) {
+            indexes[i] = new int[nums[i]];
+            random.fill(random.uniformInts(0, nums[i] - 1), indexes[i]);
+        }
+    }
+
+    @Test
+    @IR(counts = {IRNode.REARRANGE_VB, IRNode.VECTOR_SIZE_8, " >0 "}, applyIfCPUFeatureOr = {"avx", "true", "asimd", "true"})
+    public void rearrange_byte64() {
+        VectorShuffle<Byte> shuffle = VectorShuffle.fromArray(bspec64, indexes[2], 0);
+        for (int i = 0; i < LENGTH; i += bspec64.length()) {
+            ByteVector.fromArray(bspec64, bsrc, i)
+                      .rearrange(shuffle)
+                      .intoArray(bdst, i);
+        }
+    }
+
+    @Check(test = "rearrange_byte64")
+    public void rearrange_byte64_verify() {
+        for (int i = 0; i < LENGTH; i += bspec64.length()) {
+            for (int j = 0; j < bspec64.length(); j++) {
+                Asserts.assertEquals(bsrc[indexes[2][j] + i], bdst[i + j]);
+            }
+        }
+    }
+
+    @Test
+    @IR(counts = {IRNode.REARRANGE_VB, IRNode.VECTOR_SIZE_16, " >0 "}, applyIfCPUFeatureOr = {"avx", "true", "asimd", "true"})
+    public void rearrange_byte128() {
+        VectorShuffle<Byte> shuffle = VectorShuffle.fromArray(bspec128, indexes[3], 0);
+        for (int i = 0; i < LENGTH; i += bspec128.length()) {
+            ByteVector.fromArray(bspec128, bsrc, i)
+                      .rearrange(shuffle)
+                      .intoArray(bdst, i);
+        }
+    }
+
+    @Check(test = "rearrange_byte128")
+    public void rearrange_byte128_verify() {
+        for (int i = 0; i < LENGTH; i += bspec128.length()) {
+            for (int j = 0; j < bspec128.length(); j++) {
+                Asserts.assertEquals(bsrc[indexes[3][j] + i], bdst[i + j]);
+            }
+        }
+    }
+
+    @Test
+    @IR(counts = {IRNode.REARRANGE_VS, IRNode.VECTOR_SIZE_4, " >0 "}, applyIfCPUFeatureOr = {"avx", "true", "asimd", "true"})
+    public void rearrange_short64() {
+        VectorShuffle<Short> shuffle = VectorShuffle.fromArray(sspec64, indexes[1], 0);
+        for (int i = 0; i < LENGTH; i += sspec64.length()) {
+            ShortVector.fromArray(sspec64, ssrc, i)
+                       .rearrange(shuffle)
+                       .intoArray(sdst, i);
+        }
+    }
+
+    @Check(test = "rearrange_short64")
+    public void rearrange_short64_verify() {
+        for (int i = 0; i < LENGTH; i += sspec64.length()) {
+            for (int j = 0; j < sspec64.length(); j++) {
+                Asserts.assertEquals(ssrc[indexes[1][j] + i], sdst[i + j]);
+            }
+        }
+    }
+
+    @Test
+    @IR(counts = {IRNode.REARRANGE_VS, IRNode.VECTOR_SIZE_8, " >0 "}, applyIfCPUFeatureOr = {"avx", "true", "asimd", "true"})
+    public void rearrange_short128() {
+        VectorShuffle<Short> shuffle = VectorShuffle.fromArray(sspec128, indexes[2], 0);
+        for (int i = 0; i < LENGTH; i += sspec128.length()) {
+            ShortVector.fromArray(sspec128, ssrc, i)
+                       .rearrange(shuffle)
+                       .intoArray(sdst, i);
+        }
+    }
+
+    @Check(test = "rearrange_short128")
+    public void rearrange_short128_verify() {
+        for (int i = 0; i < LENGTH; i += sspec128.length()) {
+            for (int j = 0; j < sspec128.length(); j++) {
+                Asserts.assertEquals(ssrc[indexes[2][j] + i], sdst[i + j]);
+            }
+        }
+    }
+
+    @Test
+    @IR(counts = {IRNode.REARRANGE_VI, IRNode.VECTOR_SIZE_2, " >0 "}, applyIfCPUFeature = {"asimd", "true"})
+    public void rearrange_int64() {
+        VectorShuffle<Integer> shuffle = VectorShuffle.fromArray(ispec64, indexes[0], 0);
+        for (int i = 0; i < LENGTH; i += ispec64.length()) {
+            IntVector.fromArray(ispec64, isrc, i)
+                     .rearrange(shuffle)
+                     .intoArray(idst, i);
+        }
+    }
+
+    @Check(test = "rearrange_int64")
+    public void rearrange_int64_verify() {
+        for (int i = 0; i < LENGTH; i += ispec64.length()) {
+            for (int j = 0; j < ispec64.length(); j++) {
+                Asserts.assertEquals(isrc[indexes[0][j] + i], idst[i + j]);
+            }
+        }
+    }
+
+    @Test
+    @IR(counts = {IRNode.REARRANGE_VI, IRNode.VECTOR_SIZE_4, " >0 "}, applyIfCPUFeatureOr = {"avx", "true", "asimd", "true"})
+    public void rearrange_int128() {
+        VectorShuffle<Integer> shuffle = VectorShuffle.fromArray(ispec128, indexes[1], 0);
+        for (int i = 0; i < LENGTH; i += ispec128.length()) {
+            IntVector.fromArray(ispec128, isrc, i)
+                     .rearrange(shuffle)
+                     .intoArray(idst, i);
+        }
+    }
+
+    @Check(test = "rearrange_int128")
+    public void rearrange_int128_verify() {
+        for (int i = 0; i < LENGTH; i += ispec128.length()) {
+            for (int j = 0; j < ispec128.length(); j++) {
+                Asserts.assertEquals(isrc[indexes[1][j] + i], idst[i + j]);
+            }
+        }
+    }
+
+    @Test
+    @IR(counts = {IRNode.REARRANGE_VL, IRNode.VECTOR_SIZE_2, " >0 "}, applyIfCPUFeature = {"asimd", "true"})
+    public void rearrange_long128() {
+        VectorShuffle<Long> shuffle = VectorShuffle.fromArray(lspec128, indexes[0], 0);
+        for (int i = 0; i < LENGTH; i += lspec128.length()) {
+            LongVector.fromArray(lspec128, lsrc, i)
+                      .rearrange(shuffle)
+                      .intoArray(ldst, i);
+        }
+    }
+
+    @Check(test = "rearrange_long128")
+    public void rearrange_long128_verify() {
+        for (int i = 0; i < LENGTH; i += lspec128.length()) {
+            for (int j = 0; j < lspec128.length(); j++) {
+                Asserts.assertEquals(lsrc[indexes[0][j] + i], ldst[i + j]);
+            }
+        }
+    }
+
+    @Test
+    @IR(counts = {IRNode.REARRANGE_VF, IRNode.VECTOR_SIZE_2, " >0 "}, applyIfCPUFeature = {"asimd", "true"})
+    public void rearrange_float64() {
+        VectorShuffle<Float> shuffle = VectorShuffle.fromArray(fspec64, indexes[0], 0);
+        for (int i = 0; i < LENGTH; i += fspec64.length()) {
+            FloatVector.fromArray(fspec64, fsrc, i)
+                       .rearrange(shuffle)
+                       .intoArray(fdst, i);
+        }
+    }
+
+    @Check(test = "rearrange_float64")
+    public void rearrange_float64_verify() {
+        for (int i = 0; i < LENGTH; i += fspec64.length()) {
+            for (int j = 0; j < fspec64.length(); j++) {
+                Asserts.assertEquals(fsrc[indexes[0][j] + i], fdst[i + j]);
+            }
+        }
+    }
+
+    @Test
+    @IR(counts = {IRNode.REARRANGE_VF, IRNode.VECTOR_SIZE_4, " >0 "}, applyIfCPUFeatureOr = {"avx", "true", "asimd", "true"})
+    public void rearrange_float128() {
+        VectorShuffle<Float> shuffle = VectorShuffle.fromArray(fspec128, indexes[1], 0);
+        for (int i = 0; i < LENGTH; i += fspec128.length()) {
+            FloatVector.fromArray(fspec128, fsrc, i)
+                       .rearrange(shuffle)
+                       .intoArray(fdst, i);
+        }
+    }
+
+    @Check(test = "rearrange_float128")
+    public void rearrange_float128_verify() {
+        for (int i = 0; i < LENGTH; i += fspec128.length()) {
+            for (int j = 0; j < fspec128.length(); j++) {
+                Asserts.assertEquals(fsrc[indexes[1][j] + i], fdst[i + j]);
+            }
+        }
+    }
+
+    @Test
+    @IR(counts = {IRNode.REARRANGE_VD, IRNode.VECTOR_SIZE_2, " >0 "}, applyIfCPUFeature = {"asimd", "true"})
+    public void rearrange_double128() {
+        VectorShuffle<Double> shuffle = VectorShuffle.fromArray(dspec128, indexes[0], 0);
+        for (int i = 0; i < LENGTH; i += dspec128.length()) {
+            DoubleVector.fromArray(dspec128, dsrc, i)
+                        .rearrange(shuffle)
+                        .intoArray(ddst, i);
+        }
+    }
+
+    @Check(test = "rearrange_double128")
+    public void rearrange_double128_verify() {
+        for (int i = 0; i < LENGTH; i += dspec128.length()) {
+            for (int j = 0; j < dspec128.length(); j++) {
+                Asserts.assertEquals(dsrc[indexes[0][j] + i], ddst[i + j]);
+            }
+        }
+    }
+
+    public static void main(String[] args) {
+        TestFramework testFramework = new TestFramework();
+        testFramework.setDefaultWarmup(5000)
+                     .addFlags("--add-modules=jdk.incubator.vector")
+                     .start();
+    }
+}

From 48fac6626c605f4679544e3dd24d5ad70561494a Mon Sep 17 00:00:00 2001
From: Damon Fenacci <dfenacci@openjdk.org>
Date: Tue, 25 Mar 2025 07:10:47 +0000
Subject: [PATCH 459/587] 8347406: [REDO] C1/C2 don't handle allocation failure
 properly during initialization (RuntimeStub::new_runtime_stub fatal crash)

Reviewed-by: dlong, adinn
---
 src/hotspot/cpu/aarch64/runtime_aarch64.cpp   |  8 ++---
 src/hotspot/cpu/arm/runtime_arm.cpp           |  8 ++---
 src/hotspot/cpu/ppc/runtime_ppc.cpp           |  4 +--
 src/hotspot/cpu/ppc/sharedRuntime_ppc.cpp     |  4 +--
 src/hotspot/cpu/riscv/runtime_riscv.cpp       |  8 ++---
 src/hotspot/cpu/s390/runtime_s390.cpp         |  4 +--
 src/hotspot/cpu/s390/sharedRuntime_s390.cpp   |  4 +--
 src/hotspot/cpu/x86/runtime_x86_32.cpp        |  8 ++---
 src/hotspot/cpu/x86/runtime_x86_64.cpp        |  8 ++---
 src/hotspot/share/c1/c1_Compiler.cpp          | 10 ++++---
 src/hotspot/share/c1/c1_Compiler.hpp          |  4 +--
 src/hotspot/share/c1/c1_Runtime1.cpp          | 17 +++++++----
 src/hotspot/share/c1/c1_Runtime1.hpp          |  4 +--
 src/hotspot/share/code/codeBlob.cpp           |  8 ++---
 src/hotspot/share/code/codeBlob.hpp           |  2 +-
 src/hotspot/share/gc/g1/c1/g1BarrierSetC1.cpp |  3 +-
 src/hotspot/share/gc/g1/c1/g1BarrierSetC1.hpp |  4 +--
 .../share/gc/shared/c1/barrierSetC1.hpp       |  4 +--
 .../shenandoah/c1/shenandoahBarrierSetC1.cpp  | 29 ++++++++++++++-----
 .../shenandoah/c1/shenandoahBarrierSetC1.hpp  |  3 +-
 src/hotspot/share/gc/z/c1/zBarrierSetC1.cpp   | 24 ++++++++++-----
 src/hotspot/share/gc/z/c1/zBarrierSetC1.hpp   |  4 +--
 src/hotspot/share/opto/output.cpp             |  9 ++++--
 src/hotspot/share/opto/runtime.cpp            |  4 ++-
 src/hotspot/share/opto/runtime.hpp            |  4 +--
 test/hotspot/jtreg/ProblemList.txt            |  2 --
 .../jtreg/compiler/startup/StartupOutput.java | 28 +++++++++++++-----
 27 files changed, 135 insertions(+), 84 deletions(-)

diff --git a/src/hotspot/cpu/aarch64/runtime_aarch64.cpp b/src/hotspot/cpu/aarch64/runtime_aarch64.cpp
index ba676573f39..83e43c3ebd2 100644
--- a/src/hotspot/cpu/aarch64/runtime_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/runtime_aarch64.cpp
@@ -59,7 +59,7 @@ class SimpleRuntimeFrame {
 #define __ masm->
 
 //------------------------------generate_uncommon_trap_blob--------------------
-void OptoRuntime::generate_uncommon_trap_blob() {
+UncommonTrapBlob* OptoRuntime::generate_uncommon_trap_blob() {
   // Allocate space for the code
   ResourceMark rm;
   // Setup code generation tools
@@ -243,7 +243,7 @@ void OptoRuntime::generate_uncommon_trap_blob() {
   // Make sure all code is generated
   masm->flush();
 
-  _uncommon_trap_blob =  UncommonTrapBlob::create(&buffer, oop_maps,
+  return UncommonTrapBlob::create(&buffer, oop_maps,
                                                  SimpleRuntimeFrame::framesize >> 1);
 }
 
@@ -273,7 +273,7 @@ void OptoRuntime::generate_uncommon_trap_blob() {
 //       Registers r0, r3, r2, r4, r5, r8-r11 are not callee saved.
 //
 
-void OptoRuntime::generate_exception_blob() {
+ExceptionBlob* OptoRuntime::generate_exception_blob() {
   assert(!OptoRuntime::is_callee_saved_register(R3_num), "");
   assert(!OptoRuntime::is_callee_saved_register(R0_num), "");
   assert(!OptoRuntime::is_callee_saved_register(R2_num), "");
@@ -378,7 +378,7 @@ void OptoRuntime::generate_exception_blob() {
   masm->flush();
 
   // Set exception blob
-  _exception_blob =  ExceptionBlob::create(&buffer, oop_maps, SimpleRuntimeFrame::framesize >> 1);
+  return ExceptionBlob::create(&buffer, oop_maps, SimpleRuntimeFrame::framesize >> 1);
 }
 #endif // COMPILER2
 
diff --git a/src/hotspot/cpu/arm/runtime_arm.cpp b/src/hotspot/cpu/arm/runtime_arm.cpp
index ac6e1be0395..20c1bc199d3 100644
--- a/src/hotspot/cpu/arm/runtime_arm.cpp
+++ b/src/hotspot/cpu/arm/runtime_arm.cpp
@@ -42,7 +42,7 @@
 //------------------------------generate_uncommon_trap_blob--------------------
 // Ought to generate an ideal graph & compile, but here's some ASM
 // instead.
-void OptoRuntime::generate_uncommon_trap_blob() {
+UncommonTrapBlob* OptoRuntime::generate_uncommon_trap_blob() {
   // allocate space for the code
   ResourceMark rm;
 
@@ -174,7 +174,7 @@ void OptoRuntime::generate_uncommon_trap_blob() {
   __ pop(RegisterSet(FP) | RegisterSet(PC));
 
   masm->flush();
-  _uncommon_trap_blob = UncommonTrapBlob::create(&buffer, nullptr, 2 /* LR+FP */);
+  return UncommonTrapBlob::create(&buffer, nullptr, 2 /* LR+FP */);
 }
 
 //------------------------------ generate_exception_blob ---------------------------
@@ -201,7 +201,7 @@ void OptoRuntime::generate_uncommon_trap_blob() {
 //
 // Note: the exception pc MUST be at a call (precise debug information)
 //
-void OptoRuntime::generate_exception_blob() {
+ExceptionBlob* OptoRuntime::generate_exception_blob() {
   // allocate space for code
   ResourceMark rm;
 
@@ -283,7 +283,7 @@ void OptoRuntime::generate_exception_blob() {
   // make sure all code is generated
   masm->flush();
 
-  _exception_blob = ExceptionBlob::create(&buffer, oop_maps, framesize_in_words);
+  return ExceptionBlob::create(&buffer, oop_maps, framesize_in_words);
 }
 
 #endif // COMPILER2
diff --git a/src/hotspot/cpu/ppc/runtime_ppc.cpp b/src/hotspot/cpu/ppc/runtime_ppc.cpp
index 6ab29ac98b2..94e8c08ebf5 100644
--- a/src/hotspot/cpu/ppc/runtime_ppc.cpp
+++ b/src/hotspot/cpu/ppc/runtime_ppc.cpp
@@ -67,7 +67,7 @@
 //
 // Note: the exception pc MUST be at a call (precise debug information)
 //
-void OptoRuntime::generate_exception_blob() {
+ExceptionBlob* OptoRuntime::generate_exception_blob() {
   // Allocate space for the code.
   ResourceMark rm;
   // Setup code generation tools.
@@ -143,7 +143,7 @@ void OptoRuntime::generate_exception_blob() {
   masm->flush();
 
   // Set exception blob.
-  _exception_blob = ExceptionBlob::create(&buffer, oop_maps,
+  return ExceptionBlob::create(&buffer, oop_maps,
                                           frame_size_in_bytes/wordSize);
 }
 
diff --git a/src/hotspot/cpu/ppc/sharedRuntime_ppc.cpp b/src/hotspot/cpu/ppc/sharedRuntime_ppc.cpp
index 4bdd8667c62..0d0e004c923 100644
--- a/src/hotspot/cpu/ppc/sharedRuntime_ppc.cpp
+++ b/src/hotspot/cpu/ppc/sharedRuntime_ppc.cpp
@@ -3100,7 +3100,7 @@ void SharedRuntime::generate_deopt_blob() {
 }
 
 #ifdef COMPILER2
-void OptoRuntime::generate_uncommon_trap_blob() {
+UncommonTrapBlob* OptoRuntime::generate_uncommon_trap_blob() {
   // Allocate space for the code.
   ResourceMark rm;
   // Setup code generation tools.
@@ -3228,7 +3228,7 @@ void OptoRuntime::generate_uncommon_trap_blob() {
 
   masm->flush();
 
-  _uncommon_trap_blob = UncommonTrapBlob::create(&buffer, oop_maps, frame_size_in_bytes/wordSize);
+  return UncommonTrapBlob::create(&buffer, oop_maps, frame_size_in_bytes/wordSize);
 }
 #endif // COMPILER2
 
diff --git a/src/hotspot/cpu/riscv/runtime_riscv.cpp b/src/hotspot/cpu/riscv/runtime_riscv.cpp
index 0a838896a02..44a8e35e285 100644
--- a/src/hotspot/cpu/riscv/runtime_riscv.cpp
+++ b/src/hotspot/cpu/riscv/runtime_riscv.cpp
@@ -57,7 +57,7 @@ public:
 #define __ masm->
 
 //------------------------------generate_uncommon_trap_blob--------------------
-void OptoRuntime::generate_uncommon_trap_blob() {
+UncommonTrapBlob* OptoRuntime::generate_uncommon_trap_blob() {
   // Allocate space for the code
   ResourceMark rm;
   // Setup code generation tools
@@ -240,7 +240,7 @@ void OptoRuntime::generate_uncommon_trap_blob() {
   // Make sure all code is generated
   masm->flush();
 
-  _uncommon_trap_blob =  UncommonTrapBlob::create(&buffer, oop_maps,
+  return UncommonTrapBlob::create(&buffer, oop_maps,
                                                   SimpleRuntimeFrame::framesize >> 1);
 }
 
@@ -270,7 +270,7 @@ void OptoRuntime::generate_uncommon_trap_blob() {
 //       Registers x10, x13, x12, x14, x15, t0 are not callee saved.
 //
 
-void OptoRuntime::generate_exception_blob() {
+ExceptionBlob* OptoRuntime::generate_exception_blob() {
   assert(!OptoRuntime::is_callee_saved_register(R13_num), "");
   assert(!OptoRuntime::is_callee_saved_register(R10_num), "");
   assert(!OptoRuntime::is_callee_saved_register(R12_num), "");
@@ -376,6 +376,6 @@ void OptoRuntime::generate_exception_blob() {
   masm->flush();
 
   // Set exception blob
-  _exception_blob =  ExceptionBlob::create(&buffer, oop_maps, SimpleRuntimeFrame::framesize >> 1);
+  return ExceptionBlob::create(&buffer, oop_maps, SimpleRuntimeFrame::framesize >> 1);
 }
 #endif // COMPILER2
diff --git a/src/hotspot/cpu/s390/runtime_s390.cpp b/src/hotspot/cpu/s390/runtime_s390.cpp
index a0714619d87..4eedb3877d2 100644
--- a/src/hotspot/cpu/s390/runtime_s390.cpp
+++ b/src/hotspot/cpu/s390/runtime_s390.cpp
@@ -65,7 +65,7 @@
 //
 // Note: the exception pc MUST be at a call (precise debug information)
 
-void OptoRuntime::generate_exception_blob() {
+ExceptionBlob* OptoRuntime::generate_exception_blob() {
 
   // Allocate space for the code
   ResourceMark rm;
@@ -146,5 +146,5 @@ void OptoRuntime::generate_exception_blob() {
 
   // Set exception blob.
   OopMapSet *oop_maps = nullptr;
-  _exception_blob =  ExceptionBlob::create(&buffer, oop_maps, frame_size/wordSize);
+  return ExceptionBlob::create(&buffer, oop_maps, frame_size/wordSize);
 }
diff --git a/src/hotspot/cpu/s390/sharedRuntime_s390.cpp b/src/hotspot/cpu/s390/sharedRuntime_s390.cpp
index 69a9b22778d..7b6735eabcc 100644
--- a/src/hotspot/cpu/s390/sharedRuntime_s390.cpp
+++ b/src/hotspot/cpu/s390/sharedRuntime_s390.cpp
@@ -2762,7 +2762,7 @@ void SharedRuntime::generate_deopt_blob() {
 
 #ifdef COMPILER2
 //------------------------------generate_uncommon_trap_blob--------------------
-void OptoRuntime::generate_uncommon_trap_blob() {
+UncommonTrapBlob* OptoRuntime::generate_uncommon_trap_blob() {
   // Allocate space for the code
   ResourceMark rm;
   // Setup code generation tools
@@ -2882,7 +2882,7 @@ void OptoRuntime::generate_uncommon_trap_blob() {
   __ z_br(Z_R14);
 
   masm->flush();
-  _uncommon_trap_blob = UncommonTrapBlob::create(&buffer, nullptr, framesize_in_bytes/wordSize);
+  return UncommonTrapBlob::create(&buffer, nullptr, framesize_in_bytes/wordSize);
 }
 #endif // COMPILER2
 
diff --git a/src/hotspot/cpu/x86/runtime_x86_32.cpp b/src/hotspot/cpu/x86/runtime_x86_32.cpp
index 4148f98f81c..dd6611c6b9f 100644
--- a/src/hotspot/cpu/x86/runtime_x86_32.cpp
+++ b/src/hotspot/cpu/x86/runtime_x86_32.cpp
@@ -41,7 +41,7 @@
 #define __ masm->
 
 //------------------------------generate_uncommon_trap_blob--------------------
-void OptoRuntime::generate_uncommon_trap_blob() {
+UncommonTrapBlob* OptoRuntime::generate_uncommon_trap_blob() {
   // allocate space for the code
   ResourceMark rm;
   // setup code generation tools
@@ -212,7 +212,7 @@ void OptoRuntime::generate_uncommon_trap_blob() {
   // make sure all code is generated
   masm->flush();
 
-   _uncommon_trap_blob = UncommonTrapBlob::create(&buffer, oop_maps, framesize);
+   return UncommonTrapBlob::create(&buffer, oop_maps, framesize);
 }
 
 //------------------------------generate_exception_blob---------------------------
@@ -240,7 +240,7 @@ void OptoRuntime::generate_uncommon_trap_blob() {
 //       Only register rax, rdx, rcx are not callee saved.
 //
 
-void OptoRuntime::generate_exception_blob() {
+ExceptionBlob* OptoRuntime::generate_exception_blob() {
 
   // Capture info about frame layout
   enum layout {
@@ -328,5 +328,5 @@ void OptoRuntime::generate_exception_blob() {
   // make sure all code is generated
   masm->flush();
 
-  _exception_blob = ExceptionBlob::create(&buffer, oop_maps, framesize);
+  return ExceptionBlob::create(&buffer, oop_maps, framesize);
 }
diff --git a/src/hotspot/cpu/x86/runtime_x86_64.cpp b/src/hotspot/cpu/x86/runtime_x86_64.cpp
index 464b0eeac6c..a063c7aeb37 100644
--- a/src/hotspot/cpu/x86/runtime_x86_64.cpp
+++ b/src/hotspot/cpu/x86/runtime_x86_64.cpp
@@ -55,7 +55,7 @@ class SimpleRuntimeFrame {
 #define __ masm->
 
 //------------------------------generate_uncommon_trap_blob--------------------
-void OptoRuntime::generate_uncommon_trap_blob() {
+UncommonTrapBlob* OptoRuntime::generate_uncommon_trap_blob() {
   // Allocate space for the code
   ResourceMark rm;
   // Setup code generation tools
@@ -225,7 +225,7 @@ void OptoRuntime::generate_uncommon_trap_blob() {
   // Make sure all code is generated
   masm->flush();
 
-  _uncommon_trap_blob =  UncommonTrapBlob::create(&buffer, oop_maps,
+  return UncommonTrapBlob::create(&buffer, oop_maps,
                                                  SimpleRuntimeFrame::framesize >> 1);
 }
 
@@ -255,7 +255,7 @@ void OptoRuntime::generate_uncommon_trap_blob() {
 //       Registers rax, rdx, rcx, rsi, rdi, r8-r11 are not callee saved.
 //
 
-void OptoRuntime::generate_exception_blob() {
+ExceptionBlob* OptoRuntime::generate_exception_blob() {
   assert(!OptoRuntime::is_callee_saved_register(RDX_num), "");
   assert(!OptoRuntime::is_callee_saved_register(RAX_num), "");
   assert(!OptoRuntime::is_callee_saved_register(RCX_num), "");
@@ -357,6 +357,6 @@ void OptoRuntime::generate_exception_blob() {
   masm->flush();
 
   // Set exception blob
-  _exception_blob =  ExceptionBlob::create(&buffer, oop_maps, SimpleRuntimeFrame::framesize >> 1);
+  return ExceptionBlob::create(&buffer, oop_maps, SimpleRuntimeFrame::framesize >> 1);
 }
 #endif // COMPILER2
diff --git a/src/hotspot/share/c1/c1_Compiler.cpp b/src/hotspot/share/c1/c1_Compiler.cpp
index 1024b903550..dd13b84edf5 100644
--- a/src/hotspot/share/c1/c1_Compiler.cpp
+++ b/src/hotspot/share/c1/c1_Compiler.cpp
@@ -47,16 +47,19 @@
 Compiler::Compiler() : AbstractCompiler(compiler_c1) {
 }
 
-void Compiler::init_c1_runtime() {
+bool Compiler::init_c1_runtime() {
   BufferBlob* buffer_blob = CompilerThread::current()->get_buffer_blob();
   FrameMap::initialize();
-  Runtime1::initialize(buffer_blob);
+  if (!Runtime1::initialize(buffer_blob)) {
+    return false;
+  }
   // initialize data structures
   ValueType::initialize();
   GraphBuilder::initialize();
   // note: to use more than one instance of LinearScan at a time this function call has to
   //       be moved somewhere outside of this constructor:
   Interval::initialize();
+  return true;
 }
 
 
@@ -65,12 +68,11 @@ void Compiler::initialize() {
   BufferBlob* buffer_blob = init_buffer_blob();
 
   if (should_perform_init()) {
-    if (buffer_blob == nullptr) {
+    if (buffer_blob == nullptr || !init_c1_runtime()) {
       // When we come here we are in state 'initializing'; entire C1 compilation
       // can be shut down.
       set_state(failed);
     } else {
-      init_c1_runtime();
       set_state(initialized);
     }
   }
diff --git a/src/hotspot/share/c1/c1_Compiler.hpp b/src/hotspot/share/c1/c1_Compiler.hpp
index 0160ee63574..fde7c8e7932 100644
--- a/src/hotspot/share/c1/c1_Compiler.hpp
+++ b/src/hotspot/share/c1/c1_Compiler.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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 @@ class DirectiveSet;
 
 class Compiler: public AbstractCompiler {
  private:
-  static void init_c1_runtime();
+  static bool init_c1_runtime();
   BufferBlob* init_buffer_blob();
 
  public:
diff --git a/src/hotspot/share/c1/c1_Runtime1.cpp b/src/hotspot/share/c1/c1_Runtime1.cpp
index e1602749439..bb0fdf00565 100644
--- a/src/hotspot/share/c1/c1_Runtime1.cpp
+++ b/src/hotspot/share/c1/c1_Runtime1.cpp
@@ -229,12 +229,12 @@ CodeBlob* Runtime1::generate_blob(BufferBlob* buffer_blob, C1StubId id, const ch
                                                  CodeOffsets::frame_never_safe,
                                                  frame_size,
                                                  oop_maps,
-                                                 must_gc_arguments);
-  assert(blob != nullptr, "blob must exist");
+                                                 must_gc_arguments,
+                                                 false /* alloc_fail_is_fatal */ );
   return blob;
 }
 
-void Runtime1::generate_blob_for(BufferBlob* buffer_blob, C1StubId id) {
+bool Runtime1::generate_blob_for(BufferBlob* buffer_blob, C1StubId id) {
   assert(C1StubId::NO_STUBID < id && id < C1StubId::NUM_STUBIDS, "illegal stub id");
   bool expect_oop_map = true;
 #ifdef ASSERT
@@ -257,14 +257,19 @@ void Runtime1::generate_blob_for(BufferBlob* buffer_blob, C1StubId id) {
   CodeBlob* blob = generate_blob(buffer_blob, id, name_for(id), expect_oop_map, &cl);
   // install blob
   _blobs[(int)id] = blob;
+  return blob != nullptr;
 }
 
-void Runtime1::initialize(BufferBlob* blob) {
+bool Runtime1::initialize(BufferBlob* blob) {
   // platform-dependent initialization
   initialize_pd();
   // generate stubs
   int limit = (int)C1StubId::NUM_STUBIDS;
-  for (int id = 0; id < limit; id++) generate_blob_for(blob, (C1StubId)id);
+  for (int id = 0; id < limit; id++) {
+    if (!generate_blob_for(blob, (C1StubId) id)) {
+      return false;
+    }
+  }
   // printing
 #ifndef PRODUCT
   if (PrintSimpleStubs) {
@@ -278,7 +283,7 @@ void Runtime1::initialize(BufferBlob* blob) {
   }
 #endif
   BarrierSetC1* bs = BarrierSet::barrier_set()->barrier_set_c1();
-  bs->generate_c1_runtime_stubs(blob);
+  return bs->generate_c1_runtime_stubs(blob);
 }
 
 CodeBlob* Runtime1::blob_for(C1StubId id) {
diff --git a/src/hotspot/share/c1/c1_Runtime1.hpp b/src/hotspot/share/c1/c1_Runtime1.hpp
index 5fce0ff4228..c09de00ce55 100644
--- a/src/hotspot/share/c1/c1_Runtime1.hpp
+++ b/src/hotspot/share/c1/c1_Runtime1.hpp
@@ -85,7 +85,7 @@ public:
   // stub generation
  public:
   static CodeBlob*  generate_blob(BufferBlob* buffer_blob, C1StubId id, const char* name, bool expect_oop_map, StubAssemblerCodeGenClosure *cl);
-  static void       generate_blob_for(BufferBlob* blob, C1StubId id);
+  static bool       generate_blob_for(BufferBlob* blob, C1StubId id);
   static OopMapSet* generate_code_for(C1StubId id, StubAssembler* sasm);
  private:
   static OopMapSet* generate_exception_throw(StubAssembler* sasm, address target, bool has_argument);
@@ -130,7 +130,7 @@ public:
 
  public:
   // initialization
-  static void initialize(BufferBlob* blob);
+  static bool initialize(BufferBlob* blob);
   static void initialize_pd();
 
   // return offset in words
diff --git a/src/hotspot/share/code/codeBlob.cpp b/src/hotspot/share/code/codeBlob.cpp
index 72f0dd67a44..4ae4ccbc858 100644
--- a/src/hotspot/share/code/codeBlob.cpp
+++ b/src/hotspot/share/code/codeBlob.cpp
@@ -490,9 +490,9 @@ void* RuntimeStub::operator new(size_t s, unsigned size) throw() {
 }
 
 // operator new shared by all singletons:
-void* SingletonBlob::operator new(size_t s, unsigned size) throw() {
+void* SingletonBlob::operator new(size_t s, unsigned size, bool alloc_fail_is_fatal) throw() {
   void* p = CodeCache::allocate(size, CodeBlobType::NonNMethod);
-  if (!p) fatal("Initial size of CodeCache is too small");
+  if (alloc_fail_is_fatal && !p) fatal("Initial size of CodeCache is too small");
   return p;
 }
 
@@ -574,7 +574,7 @@ UncommonTrapBlob* UncommonTrapBlob::create(
   ThreadInVMfromUnknown __tiv;  // get to VM state in case we block on CodeCache_lock
   {
     MutexLocker mu(CodeCache_lock, Mutex::_no_safepoint_check_flag);
-    blob = new (size) UncommonTrapBlob(cb, size, oop_maps, frame_size);
+    blob = new (size, false) UncommonTrapBlob(cb, size, oop_maps, frame_size);
   }
 
   trace_new_stub(blob, "UncommonTrapBlob");
@@ -606,7 +606,7 @@ ExceptionBlob* ExceptionBlob::create(
   ThreadInVMfromUnknown __tiv;  // get to VM state in case we block on CodeCache_lock
   {
     MutexLocker mu(CodeCache_lock, Mutex::_no_safepoint_check_flag);
-    blob = new (size) ExceptionBlob(cb, size, oop_maps, frame_size);
+    blob = new (size, false) ExceptionBlob(cb, size, oop_maps, frame_size);
   }
 
   trace_new_stub(blob, "ExceptionBlob");
diff --git a/src/hotspot/share/code/codeBlob.hpp b/src/hotspot/share/code/codeBlob.hpp
index 57f830a4970..1daa35c16b5 100644
--- a/src/hotspot/share/code/codeBlob.hpp
+++ b/src/hotspot/share/code/codeBlob.hpp
@@ -454,7 +454,7 @@ class SingletonBlob: public RuntimeBlob {
   friend class VMStructs;
 
  protected:
-  void* operator new(size_t s, unsigned size) throw();
+  void* operator new(size_t s, unsigned size, bool alloc_fail_is_fatal=true) throw();
 
  public:
    SingletonBlob(
diff --git a/src/hotspot/share/gc/g1/c1/g1BarrierSetC1.cpp b/src/hotspot/share/gc/g1/c1/g1BarrierSetC1.cpp
index 1e91e067f33..a0eb218dd6c 100644
--- a/src/hotspot/share/gc/g1/c1/g1BarrierSetC1.cpp
+++ b/src/hotspot/share/gc/g1/c1/g1BarrierSetC1.cpp
@@ -215,11 +215,12 @@ class C1G1PostBarrierCodeGenClosure : public StubAssemblerCodeGenClosure {
   }
 };
 
-void G1BarrierSetC1::generate_c1_runtime_stubs(BufferBlob* buffer_blob) {
+bool G1BarrierSetC1::generate_c1_runtime_stubs(BufferBlob* buffer_blob) {
   C1G1PreBarrierCodeGenClosure pre_code_gen_cl;
   C1G1PostBarrierCodeGenClosure post_code_gen_cl;
   _pre_barrier_c1_runtime_code_blob = Runtime1::generate_blob(buffer_blob, C1StubId::NO_STUBID, "g1_pre_barrier_slow",
                                                               false, &pre_code_gen_cl);
   _post_barrier_c1_runtime_code_blob = Runtime1::generate_blob(buffer_blob, C1StubId::NO_STUBID, "g1_post_barrier_slow",
                                                                false, &post_code_gen_cl);
+  return _pre_barrier_c1_runtime_code_blob != nullptr && _post_barrier_c1_runtime_code_blob != nullptr;
 }
diff --git a/src/hotspot/share/gc/g1/c1/g1BarrierSetC1.hpp b/src/hotspot/share/gc/g1/c1/g1BarrierSetC1.hpp
index ce6f7277ed2..4baaf8ac58c 100644
--- a/src/hotspot/share/gc/g1/c1/g1BarrierSetC1.hpp
+++ b/src/hotspot/share/gc/g1/c1/g1BarrierSetC1.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -140,7 +140,7 @@ class G1BarrierSetC1 : public ModRefBarrierSetC1 {
   CodeBlob* pre_barrier_c1_runtime_code_blob() { return _pre_barrier_c1_runtime_code_blob; }
   CodeBlob* post_barrier_c1_runtime_code_blob() { return _post_barrier_c1_runtime_code_blob; }
 
-  virtual void generate_c1_runtime_stubs(BufferBlob* buffer_blob);
+  virtual bool generate_c1_runtime_stubs(BufferBlob* buffer_blob);
 };
 
 #endif // SHARE_GC_G1_C1_G1BARRIERSETC1_HPP
diff --git a/src/hotspot/share/gc/shared/c1/barrierSetC1.hpp b/src/hotspot/share/gc/shared/c1/barrierSetC1.hpp
index 0fd6493d50e..3d0621cdc7a 100644
--- a/src/hotspot/share/gc/shared/c1/barrierSetC1.hpp
+++ b/src/hotspot/share/gc/shared/c1/barrierSetC1.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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,7 +135,7 @@ public:
   virtual LIR_Opr atomic_xchg_at(LIRAccess& access, LIRItem& value);
   virtual LIR_Opr atomic_add_at(LIRAccess& access, LIRItem& value);
 
-  virtual void generate_c1_runtime_stubs(BufferBlob* buffer_blob) {}
+  virtual bool generate_c1_runtime_stubs(BufferBlob* buffer_blob) { return true; }
 };
 
 #endif // SHARE_GC_SHARED_C1_BARRIERSETC1_HPP
diff --git a/src/hotspot/share/gc/shenandoah/c1/shenandoahBarrierSetC1.cpp b/src/hotspot/share/gc/shenandoah/c1/shenandoahBarrierSetC1.cpp
index 1796e8ef197..9a12e0ed1a1 100644
--- a/src/hotspot/share/gc/shenandoah/c1/shenandoahBarrierSetC1.cpp
+++ b/src/hotspot/share/gc/shenandoah/c1/shenandoahBarrierSetC1.cpp
@@ -1,6 +1,7 @@
 /*
  * Copyright (c) 2018, 2024, Red Hat, Inc. All rights reserved.
  * Copyright Amazon.com Inc. or its affiliates. All Rights Reserved.
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -271,32 +272,46 @@ public:
   }
 };
 
-void ShenandoahBarrierSetC1::generate_c1_runtime_stubs(BufferBlob* buffer_blob) {
+bool ShenandoahBarrierSetC1::generate_c1_runtime_stubs(BufferBlob* buffer_blob) {
   C1ShenandoahPreBarrierCodeGenClosure pre_code_gen_cl;
   _pre_barrier_c1_runtime_code_blob = Runtime1::generate_blob(buffer_blob, C1StubId::NO_STUBID,
                                                               "shenandoah_pre_barrier_slow",
                                                               false, &pre_code_gen_cl);
+  if (_pre_barrier_c1_runtime_code_blob == nullptr) {
+    return false;
+  }
   if (ShenandoahLoadRefBarrier) {
     C1ShenandoahLoadReferenceBarrierCodeGenClosure lrb_strong_code_gen_cl(ON_STRONG_OOP_REF);
     _load_reference_barrier_strong_rt_code_blob = Runtime1::generate_blob(buffer_blob, C1StubId::NO_STUBID,
-                                                                  "shenandoah_load_reference_barrier_strong_slow",
-                                                                  false, &lrb_strong_code_gen_cl);
+                                                                          "shenandoah_load_reference_barrier_strong_slow",
+                                                                          false, &lrb_strong_code_gen_cl);
+    if (_load_reference_barrier_strong_rt_code_blob == nullptr) {
+      return false;
+    }
 
     C1ShenandoahLoadReferenceBarrierCodeGenClosure lrb_strong_native_code_gen_cl(ON_STRONG_OOP_REF | IN_NATIVE);
     _load_reference_barrier_strong_native_rt_code_blob = Runtime1::generate_blob(buffer_blob, C1StubId::NO_STUBID,
-                                                                          "shenandoah_load_reference_barrier_strong_native_slow",
-                                                                          false, &lrb_strong_native_code_gen_cl);
+                                                                                 "shenandoah_load_reference_barrier_strong_native_slow",
+                                                                                 false, &lrb_strong_native_code_gen_cl);
+    if (_load_reference_barrier_strong_native_rt_code_blob == nullptr) {
+      return false;
+    }
 
     C1ShenandoahLoadReferenceBarrierCodeGenClosure lrb_weak_code_gen_cl(ON_WEAK_OOP_REF);
     _load_reference_barrier_weak_rt_code_blob = Runtime1::generate_blob(buffer_blob, C1StubId::NO_STUBID,
-                                                                          "shenandoah_load_reference_barrier_weak_slow",
-                                                                          false, &lrb_weak_code_gen_cl);
+                                                                        "shenandoah_load_reference_barrier_weak_slow",
+                                                                        false, &lrb_weak_code_gen_cl);
+    if (_load_reference_barrier_weak_rt_code_blob == nullptr) {
+      return false;
+    }
 
     C1ShenandoahLoadReferenceBarrierCodeGenClosure lrb_phantom_code_gen_cl(ON_PHANTOM_OOP_REF | IN_NATIVE);
     _load_reference_barrier_phantom_rt_code_blob = Runtime1::generate_blob(buffer_blob, C1StubId::NO_STUBID,
                                                                            "shenandoah_load_reference_barrier_phantom_slow",
                                                                            false, &lrb_phantom_code_gen_cl);
+    return (_load_reference_barrier_phantom_rt_code_blob != nullptr);
   }
+  return true;
 }
 
 void ShenandoahBarrierSetC1::post_barrier(LIRAccess& access, LIR_Opr addr, LIR_Opr new_val) {
diff --git a/src/hotspot/share/gc/shenandoah/c1/shenandoahBarrierSetC1.hpp b/src/hotspot/share/gc/shenandoah/c1/shenandoahBarrierSetC1.hpp
index 6c7ef49080f..1b4f2c79bd2 100644
--- a/src/hotspot/share/gc/shenandoah/c1/shenandoahBarrierSetC1.hpp
+++ b/src/hotspot/share/gc/shenandoah/c1/shenandoahBarrierSetC1.hpp
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2018, 2021, Red Hat, Inc. All rights reserved.
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -247,7 +248,7 @@ protected:
 
 public:
 
-  virtual void generate_c1_runtime_stubs(BufferBlob* buffer_blob);
+  virtual bool generate_c1_runtime_stubs(BufferBlob* buffer_blob);
 };
 
 #endif // SHARE_GC_SHENANDOAH_C1_SHENANDOAHBARRIERSETC1_HPP
diff --git a/src/hotspot/share/gc/z/c1/zBarrierSetC1.cpp b/src/hotspot/share/gc/z/c1/zBarrierSetC1.cpp
index 87bfc1f9c66..f3643c0a325 100644
--- a/src/hotspot/share/gc/z/c1/zBarrierSetC1.cpp
+++ b/src/hotspot/share/gc/z/c1/zBarrierSetC1.cpp
@@ -507,7 +507,7 @@ public:
 static address generate_c1_load_runtime_stub(BufferBlob* blob, DecoratorSet decorators, const char* name) {
   ZLoadBarrierRuntimeStubCodeGenClosure cl(decorators);
   CodeBlob* const code_blob = Runtime1::generate_blob(blob, C1StubId::NO_STUBID /* stub_id */, name, false /* expect_oop_map*/, &cl);
-  return code_blob->code_begin();
+  return (code_blob != nullptr) ? code_blob->code_begin() : nullptr;
 }
 
 class ZStoreBarrierRuntimeStubCodeGenClosure : public StubAssemblerCodeGenClosure {
@@ -527,17 +527,27 @@ public:
 static address generate_c1_store_runtime_stub(BufferBlob* blob, bool self_healing, const char* name) {
   ZStoreBarrierRuntimeStubCodeGenClosure cl(self_healing);
   CodeBlob* const code_blob = Runtime1::generate_blob(blob, C1StubId::NO_STUBID /* stub_id */, name, false /* expect_oop_map*/, &cl);
-  return code_blob->code_begin();
+  return (code_blob != nullptr) ? code_blob->code_begin() : nullptr;
 }
 
-void ZBarrierSetC1::generate_c1_runtime_stubs(BufferBlob* blob) {
+bool ZBarrierSetC1::generate_c1_runtime_stubs(BufferBlob* blob) {
   _load_barrier_on_oop_field_preloaded_runtime_stub =
-    generate_c1_load_runtime_stub(blob, ON_STRONG_OOP_REF, "load_barrier_on_oop_field_preloaded_runtime_stub");
+      generate_c1_load_runtime_stub(blob, ON_STRONG_OOP_REF, "load_barrier_on_oop_field_preloaded_runtime_stub");
+  if (_load_barrier_on_oop_field_preloaded_runtime_stub == nullptr) {
+    return false;
+  }
   _load_barrier_on_weak_oop_field_preloaded_runtime_stub =
-    generate_c1_load_runtime_stub(blob, ON_WEAK_OOP_REF, "load_barrier_on_weak_oop_field_preloaded_runtime_stub");
+      generate_c1_load_runtime_stub(blob, ON_WEAK_OOP_REF, "load_barrier_on_weak_oop_field_preloaded_runtime_stub");
+  if (_load_barrier_on_weak_oop_field_preloaded_runtime_stub == nullptr) {
+    return false;
+  }
 
   _store_barrier_on_oop_field_with_healing =
-    generate_c1_store_runtime_stub(blob, true /* self_healing */, "store_barrier_on_oop_field_with_healing");
+      generate_c1_store_runtime_stub(blob, true /* self_healing */, "store_barrier_on_oop_field_with_healing");
+  if (_store_barrier_on_oop_field_with_healing == nullptr) {
+    return false;
+  }
   _store_barrier_on_oop_field_without_healing =
-    generate_c1_store_runtime_stub(blob, false /* self_healing */, "store_barrier_on_oop_field_without_healing");
+      generate_c1_store_runtime_stub(blob, false /* self_healing */, "store_barrier_on_oop_field_without_healing");
+  return _store_barrier_on_oop_field_without_healing != nullptr;
 }
diff --git a/src/hotspot/share/gc/z/c1/zBarrierSetC1.hpp b/src/hotspot/share/gc/z/c1/zBarrierSetC1.hpp
index a17c3f7628c..ec0881eec2e 100644
--- a/src/hotspot/share/gc/z/c1/zBarrierSetC1.hpp
+++ b/src/hotspot/share/gc/z/c1/zBarrierSetC1.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -112,7 +112,7 @@ protected:
 public:
   ZBarrierSetC1();
 
-  virtual void generate_c1_runtime_stubs(BufferBlob* blob);
+  virtual bool generate_c1_runtime_stubs(BufferBlob* blob);
 };
 
 #endif // SHARE_GC_Z_C1_ZBARRIERSETC1_HPP
diff --git a/src/hotspot/share/opto/output.cpp b/src/hotspot/share/opto/output.cpp
index da58f333676..9fe5ad562b0 100644
--- a/src/hotspot/share/opto/output.cpp
+++ b/src/hotspot/share/opto/output.cpp
@@ -3479,10 +3479,15 @@ void PhaseOutput::install_stub(const char* stub_name) {
                                                       // _code_offsets.value(CodeOffsets::Frame_Complete),
                                                       frame_size_in_words(),
                                                       oop_map_set(),
+                                                      false,
                                                       false);
-      assert(rs != nullptr && rs->is_runtime_stub(), "sanity check");
 
-      C->set_stub_entry_point(rs->entry_point());
+      if (rs == nullptr) {
+        C->record_failure("CodeCache is full");
+      } else {
+        assert(rs->is_runtime_stub(), "sanity check");
+        C->set_stub_entry_point(rs->entry_point());
+      }
     }
   }
 }
diff --git a/src/hotspot/share/opto/runtime.cpp b/src/hotspot/share/opto/runtime.cpp
index 7774c8a49c9..4dfc5db577e 100644
--- a/src/hotspot/share/opto/runtime.cpp
+++ b/src/hotspot/share/opto/runtime.cpp
@@ -132,7 +132,9 @@ static bool check_compiled_frame(JavaThread* thread) {
 */
 
 #define GEN_C2_BLOB(name, type)                    \
-  generate_ ## name ## _blob();
+  BLOB_FIELD_NAME(name) =                       \
+    generate_ ## name ## _blob();                  \
+  if (BLOB_FIELD_NAME(name) == nullptr) { return false; }
 
 // a few helper macros to conjure up generate_stub call arguments
 #define C2_STUB_FIELD_NAME(name) _ ## name ## _Java
diff --git a/src/hotspot/share/opto/runtime.hpp b/src/hotspot/share/opto/runtime.hpp
index dab8fb724fc..96b7e9297d6 100644
--- a/src/hotspot/share/opto/runtime.hpp
+++ b/src/hotspot/share/opto/runtime.hpp
@@ -257,8 +257,8 @@ private:
   // CodeBlob support
   // ===================================================================
 
-  static void generate_uncommon_trap_blob(void);
-  static void generate_exception_blob();
+  static UncommonTrapBlob* generate_uncommon_trap_blob(void);
+  static ExceptionBlob* generate_exception_blob();
 
   static void register_finalizer_C(oopDesc* obj, JavaThread* current);
 
diff --git a/test/hotspot/jtreg/ProblemList.txt b/test/hotspot/jtreg/ProblemList.txt
index b866df3020a..6dd35997cac 100644
--- a/test/hotspot/jtreg/ProblemList.txt
+++ b/test/hotspot/jtreg/ProblemList.txt
@@ -70,8 +70,6 @@ compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/VirtualObjectDebugInf
 compiler/floatingpoint/TestSubnormalFloat.java 8317810 generic-i586
 compiler/floatingpoint/TestSubnormalDouble.java 8317810 generic-i586
 
-compiler/startup/StartupOutput.java 8347406 generic-x64
-
 compiler/codecache/CodeCacheFullCountTest.java 8332954 generic-all
 
 compiler/interpreter/Test6833129.java 8335266 generic-i586
diff --git a/test/hotspot/jtreg/compiler/startup/StartupOutput.java b/test/hotspot/jtreg/compiler/startup/StartupOutput.java
index f74a03b226f..883f1a08030 100644
--- a/test/hotspot/jtreg/compiler/startup/StartupOutput.java
+++ b/test/hotspot/jtreg/compiler/startup/StartupOutput.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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 @@
 
 /*
  * @test
+ * @key randomness
  * @bug 8026949 8164091
  * @summary Test ensures correct VM output during startup
  * @library /test/lib
@@ -37,11 +38,14 @@ package compiler.startup;
 
 import jdk.test.lib.process.OutputAnalyzer;
 import jdk.test.lib.process.ProcessTools;
+import jdk.test.lib.Utils;
+import java.util.Random;
 
 public class StartupOutput {
     public static void main(String[] args) throws Exception {
         ProcessBuilder pb;
         OutputAnalyzer out;
+        Random rand = Utils.getRandomInstance();
 
         pb = ProcessTools.createLimitedTestJavaProcessBuilder("-Xint", "-XX:+DisplayVMOutputToStdout", "-version");
         out = new OutputAnalyzer(pb.start());
@@ -56,13 +60,21 @@ public class StartupOutput {
             throw new Exception("VM crashed with exit code " + exitCode);
         }
 
-        pb = ProcessTools.createLimitedTestJavaProcessBuilder("-XX:InitialCodeCacheSize=1024K", "-XX:ReservedCodeCacheSize=1200k", "-version");
-        out = new OutputAnalyzer(pb.start());
-        // The VM should not crash but will probably fail with a "CodeCache is full. Compiler has been disabled." message
-        out.stdoutShouldNotContain("# A fatal error");
-        exitCode = out.getExitValue();
-        if (exitCode != 1 && exitCode != 0) {
-            throw new Exception("VM crashed with exit code " + exitCode);
+        Process[] pr = new Process[200];
+        for (int i = 0; i < 200; i++) {
+            int initialCodeCacheSizeInKb = 800 + rand.nextInt(400);
+            int reservedCodeCacheSizeInKb = initialCodeCacheSizeInKb + rand.nextInt(200);
+            pb = ProcessTools.createLimitedTestJavaProcessBuilder("-XX:InitialCodeCacheSize=" + initialCodeCacheSizeInKb + "K", "-XX:ReservedCodeCacheSize=" + reservedCodeCacheSizeInKb + "k", "-version");
+            pr[i] = pb.start();
+        }
+        for (int i = 0; i < 200; i++) {
+            out = new OutputAnalyzer(pr[i]);
+            // The VM should not crash but will probably fail with a "CodeCache is full. Compiler has been disabled." message
+            out.stdoutShouldNotContain("# A fatal error");
+            exitCode = out.getExitValue();
+            if (exitCode != 1 && exitCode != 0) {
+                throw new Exception("VM crashed with exit code " + exitCode);
+            }
         }
     }
 }

From c94bc7427ce86dce9613d3a201eef7f3828447b0 Mon Sep 17 00:00:00 2001
From: Marc Chevalier <marc.chevalier@oracle.com>
Date: Tue, 25 Mar 2025 07:28:06 +0000
Subject: [PATCH 460/587] 8352595: Regression of JDK-8314999 in IR matching

Reviewed-by: chagedorn, thartmann
---
 .../ir_framework/tests/TestBadFormat.java     | 16 ++--
 .../tests/TestPhaseIRMatching.java            | 83 +++++++++++--------
 .../tests/flag/TestCompilePhaseCollector.java | 65 ++++++++-------
 3 files changed, 91 insertions(+), 73 deletions(-)

diff --git a/test/hotspot/jtreg/testlibrary_tests/ir_framework/tests/TestBadFormat.java b/test/hotspot/jtreg/testlibrary_tests/ir_framework/tests/TestBadFormat.java
index 8e6085708ed..ac8867f3985 100644
--- a/test/hotspot/jtreg/testlibrary_tests/ir_framework/tests/TestBadFormat.java
+++ b/test/hotspot/jtreg/testlibrary_tests/ir_framework/tests/TestBadFormat.java
@@ -1163,15 +1163,17 @@ class BadIRNodeForPhase {
     public void duplicatedPhase() {}
 
     @Test
-    @FailCount(4)
-    @IR(failOn = IRNode.ALLOC, phase = {CompilePhase.FINAL_CODE, CompilePhase.AFTER_MACRO_EXPANSION})
-    @IR(failOn = IRNode.ALLOC, phase = CompilePhase.PRINT_IDEAL)
+    @FailCount(6)
+    @IR(failOn = IRNode.ALLOC, phase = {CompilePhase.FINAL_CODE, CompilePhase.AFTER_MACRO_EXPANSION})  // FINAL_CODE not available
+    @IR(failOn = IRNode.ALLOC, phase = CompilePhase.PRINT_IDEAL)  // PRINT_IDEAL not available
+    @IR(failOn = IRNode.ALLOC, phase = {CompilePhase.ITER_GVN1, CompilePhase.AFTER_PARSING})  // works
     @IR(failOn = IRNode.ALLOC, phase = {CompilePhase.ITER_GVN1, CompilePhase.AFTER_PARSING,
-                                        CompilePhase.PRINT_OPTO_ASSEMBLY}) // works
-    @IR(failOn = IRNode.ALLOC_ARRAY, phase = {CompilePhase.FINAL_CODE, CompilePhase.AFTER_MACRO_EXPANSION})
-    @IR(failOn = IRNode.ALLOC_ARRAY, phase = CompilePhase.PRINT_IDEAL)
+                                        CompilePhase.PRINT_OPTO_ASSEMBLY})  // PRINT_OPTO_ASSEMBLY not available
+    @IR(failOn = IRNode.ALLOC_ARRAY, phase = {CompilePhase.FINAL_CODE, CompilePhase.AFTER_MACRO_EXPANSION})  // FINAL_CODE not available
+    @IR(failOn = IRNode.ALLOC_ARRAY, phase = CompilePhase.PRINT_IDEAL)  // PRINT_IDEAL not available
+    @IR(failOn = IRNode.ALLOC_ARRAY, phase = {CompilePhase.ITER_GVN1, CompilePhase.AFTER_PARSING})  // works
     @IR(failOn = IRNode.ALLOC_ARRAY, phase = {CompilePhase.ITER_GVN1, CompilePhase.AFTER_PARSING,
-                                        CompilePhase.PRINT_OPTO_ASSEMBLY}) // works
+                                        CompilePhase.PRINT_OPTO_ASSEMBLY})  // PRINT_OPTO_ASSEMBLY not available
     public void alloc() {}
 
     @Test
diff --git a/test/hotspot/jtreg/testlibrary_tests/ir_framework/tests/TestPhaseIRMatching.java b/test/hotspot/jtreg/testlibrary_tests/ir_framework/tests/TestPhaseIRMatching.java
index ca0e37de166..f2dd871ae83 100644
--- a/test/hotspot/jtreg/testlibrary_tests/ir_framework/tests/TestPhaseIRMatching.java
+++ b/test/hotspot/jtreg/testlibrary_tests/ir_framework/tests/TestPhaseIRMatching.java
@@ -107,6 +107,16 @@ class Basics {
     Object obj3;
     Object obj4;
 
+    public class Helper {
+        private String s;
+
+        public Helper(String s, int i) {
+            this.s = s;
+        }
+
+        public String getString() { return s; }
+    }
+
     @Test
     @IR(failOn = IRNode.STORE, phase = {CompilePhase.DEFAULT, CompilePhase.PRINT_IDEAL})
     @ExpectedFailure(ruleId = 1, failOn = 1) // Only one failure - remove duplicated phases after mapping DEFAULT
@@ -115,15 +125,16 @@ class Basics {
     }
 
     @Test
-    @IR(failOn = {IRNode.STORE, IRNode.ALLOC, IRNode.COUNTED_LOOP},
-        counts = {IRNode.STORE, "3", IRNode.ALLOC, "1", IRNode.COUNTED_LOOP, "2"})
+    @IR(failOn = {IRNode.STORE, IRNode.FIELD_ACCESS, IRNode.COUNTED_LOOP},
+        counts = {IRNode.STORE, "3", IRNode.FIELD_ACCESS, "2", IRNode.COUNTED_LOOP, "2"})
     @ExpectedFailure(ruleId = 1, phase = CompilePhase.PRINT_IDEAL, failOn = 1, counts = {1, 3})
-    @ExpectedFailure(ruleId = 1, phase = CompilePhase.PRINT_OPTO_ASSEMBLY, counts = 2)
+    @ExpectedFailure(ruleId = 1, phase = CompilePhase.PRINT_OPTO_ASSEMBLY, failOn = 2)
 
-    @IR(failOn = {IRNode.STORE, IRNode.ALLOC, IRNode.COUNTED_LOOP})
+    @IR(failOn = {IRNode.STORE, IRNode.FIELD_ACCESS, IRNode.COUNTED_LOOP})
     @ExpectedFailure(ruleId = 2, phase = CompilePhase.PRINT_IDEAL, failOn = 1)
+    @ExpectedFailure(ruleId = 2, phase = CompilePhase.PRINT_OPTO_ASSEMBLY, failOn = 2)
 
-    @IR(counts = {IRNode.STORE, "3", IRNode.ALLOC, "1", IRNode.COUNTED_LOOP, "2"})
+    @IR(counts = {IRNode.STORE, "3", IRNode.FIELD_ACCESS, "1", IRNode.COUNTED_LOOP, "2"})
     @ExpectedFailure(ruleId = 3, phase = CompilePhase.PRINT_IDEAL, counts = {1, 3})
     @ExpectedFailure(ruleId = 3, phase = CompilePhase.PRINT_OPTO_ASSEMBLY, counts = 2)
 
@@ -135,52 +146,54 @@ class Basics {
     }
 
     @Test
-    @IR(failOn = {IRNode.STORE_F, IRNode.ALLOC, IRNode.COUNTED_LOOP},
-        counts = {IRNode.STORE_F, "3", IRNode.ALLOC, "1", IRNode.COUNTED_LOOP, "2"})
+    @IR(failOn = {IRNode.STORE_F, IRNode.FIELD_ACCESS, IRNode.COUNTED_LOOP},
+        counts = {IRNode.STORE_F, "3", IRNode.FIELD_ACCESS, "1", IRNode.COUNTED_LOOP, "2"})
     @ExpectedFailure(ruleId = 1, phase = CompilePhase.PRINT_OPTO_ASSEMBLY, failOn = 2)
     @ExpectedFailure(ruleId = 1, phase = CompilePhase.PRINT_IDEAL, counts = {1, 3})
 
-    @IR(failOn = {IRNode.STORE_F, IRNode.ALLOC, IRNode.COUNTED_LOOP})
+    @IR(failOn = {IRNode.STORE_F, IRNode.FIELD_ACCESS, IRNode.COUNTED_LOOP})
     @ExpectedFailure(ruleId = 2, phase = CompilePhase.PRINT_OPTO_ASSEMBLY, failOn = 2)
 
-    @IR(counts = {IRNode.STORE_F, "3", IRNode.ALLOC, "1", IRNode.COUNTED_LOOP, "2"})
+    @IR(counts = {IRNode.STORE_F, "3", IRNode.FIELD_ACCESS, "1", IRNode.COUNTED_LOOP, "2"})
     @ExpectedFailure(ruleId = 3, phase = CompilePhase.PRINT_IDEAL, counts = {1, 3})
 
-    @IR(failOn = {IRNode.STORE_F, IRNode.ALLOC, IRNode.COUNTED_LOOP},
-        counts = {IRNode.STORE_F, "3", IRNode.ALLOC, "2", IRNode.COUNTED_LOOP, "2"})
+    @IR(failOn = {IRNode.STORE_F, IRNode.FIELD_ACCESS, IRNode.COUNTED_LOOP},
+        counts = {IRNode.STORE_F, "3", IRNode.FIELD_ACCESS, "2", IRNode.COUNTED_LOOP, "2"})
 
     @ExpectedFailure(ruleId = 4, phase = CompilePhase.PRINT_OPTO_ASSEMBLY, failOn = 2, counts = 2)
     @ExpectedFailure(ruleId = 4, phase = CompilePhase.PRINT_IDEAL, counts = {1, 3})
 
-    @IR(counts = {IRNode.ALLOC, "2"})
+    @IR(counts = {IRNode.FIELD_ACCESS, "2"})
     @ExpectedFailure(ruleId = 5, phase = CompilePhase.PRINT_OPTO_ASSEMBLY, counts = 1)
-    public Object defaultOnOptoAssembly() {
-        return new Object();
+    public Object defaultOnOptoAssembly(Helper h) {
+        return h.getString();
     }
 
     @Test
-    @IR(failOn = {IRNode.STORE, IRNode.ALLOC, IRNode.ALLOC_OF, "Object", IRNode.COUNTED_LOOP},
-        counts = {IRNode.STORE, "20", IRNode.ALLOC, "1", IRNode.ALLOC_OF, "Object", "1", IRNode.COUNTED_LOOP, "2"})
-    @ExpectedFailure(ruleId = 1, phase = CompilePhase.PRINT_OPTO_ASSEMBLY, failOn = {2, 3})
-    @ExpectedFailure(ruleId = 1, phase = CompilePhase.PRINT_IDEAL, failOn = 1, counts = {1, 4})
+    @IR(failOn = {IRNode.STORE, IRNode.FIELD_ACCESS, IRNode.COUNTED_LOOP},
+        counts = {IRNode.STORE, "20", IRNode.FIELD_ACCESS, "3", IRNode.COUNTED_LOOP, "2"})
+    @ExpectedFailure(ruleId = 1, phase = CompilePhase.PRINT_OPTO_ASSEMBLY, failOn = 2)
+    @ExpectedFailure(ruleId = 1, phase = CompilePhase.PRINT_IDEAL, failOn = 1, counts = {1, 3})
 
-    @IR(failOn = {IRNode.STORE, IRNode.ALLOC, IRNode.ALLOC_OF, "Object", IRNode.COUNTED_LOOP})
+    @IR(failOn = {IRNode.STORE, IRNode.FIELD_ACCESS, IRNode.COUNTED_LOOP})
     @ExpectedFailure(ruleId = 2, phase = CompilePhase.PRINT_IDEAL, failOn = 1)
-    @ExpectedFailure(ruleId = 2, phase = CompilePhase.PRINT_OPTO_ASSEMBLY, failOn = {2, 3})
+    @ExpectedFailure(ruleId = 2, phase = CompilePhase.PRINT_OPTO_ASSEMBLY, failOn = 2)
 
-    @IR(counts = {IRNode.STORE, "20", IRNode.ALLOC, "1", IRNode.ALLOC_OF, "Object", "2", IRNode.COUNTED_LOOP, "2"})
-    @ExpectedFailure(ruleId = 3, phase = CompilePhase.PRINT_IDEAL, counts = {1, 4})
-    @ExpectedFailure(ruleId = 3, phase = CompilePhase.PRINT_OPTO_ASSEMBLY, counts = 3)
+    @IR(counts = {IRNode.STORE, "20", IRNode.FIELD_ACCESS, "2", IRNode.COUNTED_LOOP, "2"})
+    @ExpectedFailure(ruleId = 3, phase = CompilePhase.PRINT_IDEAL, counts = {1, 3})
+    @ExpectedFailure(ruleId = 3, phase = CompilePhase.PRINT_OPTO_ASSEMBLY, counts = 2)
 
-    @IR(failOn = {IRNode.STORE, IRNode.ALLOC, IRNode.ALLOC_OF, "Object", IRNode.COUNTED_LOOP},
-        counts = {IRNode.STORE, "20", IRNode.ALLOC, "2", IRNode.ALLOC_OF, "Object", "2", IRNode.COUNTED_LOOP, "2"})
-    @ExpectedFailure(ruleId = 4, phase = CompilePhase.PRINT_OPTO_ASSEMBLY, failOn = {2, 3}, counts = {2, 3})
-    @ExpectedFailure(ruleId = 4, phase = CompilePhase.PRINT_IDEAL, failOn = 1, counts = {1, 4})
+    @IR(failOn = {IRNode.STORE, IRNode.FIELD_ACCESS, IRNode.COUNTED_LOOP},
+        counts = {IRNode.STORE, "20", IRNode.FIELD_ACCESS, "2", IRNode.COUNTED_LOOP, "2"})
+    @ExpectedFailure(ruleId = 4, phase = CompilePhase.PRINT_OPTO_ASSEMBLY, failOn = 2, counts = 2)
+    @ExpectedFailure(ruleId = 4, phase = CompilePhase.PRINT_IDEAL, failOn = 1, counts = {1, 3})
 
-    @IR(counts = {IRNode.ALLOC, "2", IRNode.ALLOC_OF, "Object", "1"})
+    @IR(counts = {IRNode.FIELD_ACCESS, "2"})
     @ExpectedFailure(ruleId = 5, phase = CompilePhase.PRINT_OPTO_ASSEMBLY, counts = 1)
-    public void defaultOnBoth() {
-        obj = new Object();
+    public Object defaultOnBoth(Helper h) {
+        i = 34;
+        l = 34;
+        return h.getString();
     }
 
     @Test
@@ -202,7 +215,7 @@ class Basics {
         return x;
     }
 
-    @Run(test = "removeLoopsWithMultipleCompilations")
+    @Run(test = {"removeLoopsWithMultipleCompilations", "defaultOnOptoAssembly", "defaultOnBoth"})
     @Warmup(1)
     public void run() {
         for (int i = 0; i < 10000; i++) {
@@ -211,6 +224,8 @@ class Basics {
         for (int i = 0; i < 10000; i++) {
             removeLoopsWithMultipleCompilations(3);
         }
+        defaultOnOptoAssembly(new Helper("a", 1));
+        defaultOnBoth(new Helper("a", 1));
     }
 
     @Test
@@ -238,9 +253,9 @@ class Basics {
     @Test
     @IR(failOn = {IRNode.ALLOC, IRNode.ALLOC_ARRAY},
         counts = {IRNode.ALLOC, "0", IRNode.ALLOC_ARRAY, "0"},
-        phase = {CompilePhase.BEFORE_REMOVEUSELESS, CompilePhase.CCP1, CompilePhase.PRINT_OPTO_ASSEMBLY, CompilePhase.DEFAULT})
+        phase = {CompilePhase.BEFORE_REMOVEUSELESS, CompilePhase.CCP1, CompilePhase.DEFAULT})
     @ExpectedFailure(ruleId = 1, failOn = {1, 2}, counts = {1, 2},
-                     phase = {CompilePhase.BEFORE_REMOVEUSELESS, CompilePhase.CCP1, CompilePhase.PRINT_OPTO_ASSEMBLY})
+                     phase = {CompilePhase.BEFORE_REMOVEUSELESS, CompilePhase.CCP1, CompilePhase.BEFORE_MACRO_EXPANSION})
     public void alloc() {
         obj = new Object();
         obj2 = new Object[1];
@@ -248,7 +263,7 @@ class Basics {
 
     @Test
     @IR(counts = {IRNode.ALLOC, "2", IRNode.ALLOC_ARRAY, "2"}, // works for all phases
-        phase = {CompilePhase.BEFORE_REMOVEUSELESS, CompilePhase.CCP1, CompilePhase.PRINT_OPTO_ASSEMBLY, CompilePhase.DEFAULT})
+        phase = {CompilePhase.BEFORE_REMOVEUSELESS, CompilePhase.CCP1, CompilePhase.DEFAULT})
     public void alloc2() {
         obj = new Object();
         obj2 = new Object[1];
diff --git a/test/hotspot/jtreg/testlibrary_tests/ir_framework/tests/flag/TestCompilePhaseCollector.java b/test/hotspot/jtreg/testlibrary_tests/ir_framework/tests/flag/TestCompilePhaseCollector.java
index d8f2e2d6e61..acb900fbdc0 100644
--- a/test/hotspot/jtreg/testlibrary_tests/ir_framework/tests/flag/TestCompilePhaseCollector.java
+++ b/test/hotspot/jtreg/testlibrary_tests/ir_framework/tests/flag/TestCompilePhaseCollector.java
@@ -147,9 +147,9 @@ public class TestCompilePhaseCollector {
                                     String simpleMethodName, CompilePhase... compilePhases) {
         String methodName = getFullMethodName(testClass, simpleMethodName);
         Set<CompilePhase> compilePhaseSet = methodToCompilePhases.get(methodName);
-        Assert.assertEquals("must be equal", compilePhases.length, compilePhaseSet.size());
+        Assert.assertEquals("In method " + simpleMethodName + ": must be equal", compilePhases.length, compilePhaseSet.size());
         for (CompilePhase compilePhase : compilePhases) {
-            Assert.assertTrue("did not find " + compilePhase + " for " + methodName,
+            Assert.assertTrue("In method " + simpleMethodName + ": did not find " + compilePhase + " for " + methodName,
                               methodToCompilePhases.get(methodName).contains(compilePhase));
         }
     }
@@ -193,44 +193,45 @@ public class TestCompilePhaseCollector {
     }
 
     static class Opto {
-        @Test
-        @IR(failOn = IRNode.ALLOC)
-        public void test1() {}
-
-
-        @Test
-        @IR(failOn = {IRNode.ALLOC_OF, "Foo"})
-        public void test2() {}
 
         @Test
         @IR(counts = {IRNode.SCOPE_OBJECT, "2"})
-        public void test3() {}
+        public void test1() {}
 
         @Test
-        @IR(counts = {IRNode.ALLOC_ARRAY_OF, "Foo", "!= 4"})
-        public void test4() {}
-
+        @IR(counts = {IRNode.OOPMAP_WITH, "Foo", "2"})
+        public void test2() {}
 
         @Test
         @IR(failOn = IRNode.FIELD_ACCESS)
         @IR(counts = {IRNode.CHECKCAST_ARRAY, "2"})
-        public void test5() {}
+        public void test3() {}
 
         @Test
         @IR(failOn = {IRNode.CHECKCAST_ARRAYCOPY, IRNode.CHECKCAST_ARRAY_OF, "Foo"})
-        @IR(counts = {IRNode.ALLOC, "2", IRNode.ALLOC_ARRAY_OF, "Foo", "> 1"})
+        @IR(counts = {IRNode.CBZ_HI, "> 1"})
+        public void test4() {}
+
+        @Test
+        @IR(failOn = {IRNode.CBNZW_HI})
+        @IR(counts = {IRNode.CBZ_LS, "2", IRNode.CBZW_LS, "> 1"})
+        public void test5() {}
+
+        @Test
+        @IR(failOn = {IRNode.CBNZW_HI})
+        @IR(counts = {IRNode.CBZW_LS, "> 1"})
         public void test6() {}
     }
 
     static class IdealAndOpto {
         @Test
-        @IR(failOn = IRNode.ALLOC)
+        @IR(failOn = IRNode.FIELD_ACCESS)
         @IR(failOn = IRNode.STORE)
         public void test1() {}
 
 
         @Test
-        @IR(failOn = {IRNode.ALLOC_OF, "Foo"})
+        @IR(failOn = {IRNode.CHECKCAST_ARRAY_OF, "Foo"})
         @IR(failOn = {IRNode.STORE_OF_FIELD, "iFld"})
         public void test2() {}
 
@@ -241,7 +242,7 @@ public class TestCompilePhaseCollector {
 
         @Test
         @IR(counts = {IRNode.LOAD_OF_FIELD, "iFld", "!= 4"})
-        @IR(counts = {IRNode.ALLOC_ARRAY_OF, "Foo", "!= 4"})
+        @IR(counts = {IRNode.OOPMAP_WITH, "Foo", "!= 4"})
         public void test4() {}
 
 
@@ -254,7 +255,7 @@ public class TestCompilePhaseCollector {
 
         @Test
         @IR(failOn = {IRNode.STORE, IRNode.CHECKCAST_ARRAY_OF, "Foo"})
-        @IR(counts = {IRNode.ALLOC, "2", IRNode.STORE_OF_FIELD, "iFld", "> 1"})
+        @IR(counts = {IRNode.FIELD_ACCESS, "2", IRNode.STORE_OF_FIELD, "iFld", "> 1"})
         public void test6() {}
     }
 
@@ -308,7 +309,7 @@ public class TestCompilePhaseCollector {
 
         @Test
         @IR(failOn = IRNode.ALLOC, phase = AFTER_PARSING)
-        @IR(failOn = {IRNode.ALLOC_ARRAY_OF, "Foo"}, phase = DEFAULT)
+        @IR(failOn = {IRNode.OOPMAP_WITH, "Foo"}, phase = DEFAULT)
         public void test3() {}
 
         @Test
@@ -326,7 +327,7 @@ public class TestCompilePhaseCollector {
 
         @Test
         @IR(failOn = IRNode.STORE, phase = {PHASEIDEALLOOP1, PHASEIDEALLOOP2})
-        @IR(failOn = IRNode.ALLOC, phase = DEFAULT)
+        @IR(failOn = IRNode.FIELD_ACCESS, phase = DEFAULT)
         @IR(failOn = IRNode.STORE, phase = {FINAL_CODE, OPTIMIZE_FINISHED})
         public void test7() {}
 
@@ -346,7 +347,7 @@ public class TestCompilePhaseCollector {
 
         @Test
         @IR(counts = {IRNode.ALLOC, "< 3"}, phase = AFTER_PARSING)
-        @IR(counts = {IRNode.ALLOC_ARRAY_OF, "Foo", ">=3"}, phase = DEFAULT)
+        @IR(counts = {IRNode.OOPMAP_WITH, "Foo", ">=3"}, phase = DEFAULT)
         public void test3A() {}
 
         @Test
@@ -364,7 +365,7 @@ public class TestCompilePhaseCollector {
 
         @Test
         @IR(counts = {IRNode.STORE, "3"}, phase = {PHASEIDEALLOOP1, PHASEIDEALLOOP2})
-        @IR(counts = {IRNode.ALLOC, "3"}, phase = DEFAULT)
+        @IR(counts = {IRNode.FIELD_ACCESS, "3"}, phase = DEFAULT)
         @IR(counts = {IRNode.STORE, "3"}, phase = {FINAL_CODE, OPTIMIZE_FINISHED})
         public void test7A() {}
 
@@ -386,13 +387,13 @@ public class TestCompilePhaseCollector {
         @Test
         @IR(failOn = IRNode.STORE, phase = AFTER_PARSING)
         @IR(counts = {IRNode.STORE, "3"}, phase = DEFAULT)
-        @IR(failOn = {IRNode.ALLOC_OF, "Foo"}, phase = DEFAULT)
+        @IR(failOn = {IRNode.OOPMAP_WITH, "Foo"}, phase = DEFAULT)
         public void mix3() {}
 
         @Test
         @IR(counts = {IRNode.STORE, "3"}, phase = AFTER_PARSING)
         @IR(counts = {IRNode.STORE_OF_CLASS, "Foo", "3"}, phase = DEFAULT)
-        @IR(failOn = IRNode.ALLOC, phase = DEFAULT)
+        @IR(failOn = IRNode.FIELD_ACCESS, phase = DEFAULT)
         public void mix4() {}
 
         @Test
@@ -402,7 +403,7 @@ public class TestCompilePhaseCollector {
 
         @Test
         @IR(failOn = IRNode.STORE, phase = {PHASEIDEALLOOP1, PHASEIDEALLOOP2})
-        @IR(counts = {IRNode.ALLOC, "3"}, phase = DEFAULT)
+        @IR(counts = {IRNode.FIELD_ACCESS, "3"}, phase = DEFAULT)
         @IR(failOn = IRNode.STORE, phase = {FINAL_CODE, OPTIMIZE_FINISHED})
         public void mix6() {}
 
@@ -413,7 +414,7 @@ public class TestCompilePhaseCollector {
 
         @Test
         @IR(failOn = IRNode.STORE, phase = {PHASEIDEALLOOP1, DEFAULT, PHASEIDEALLOOP2})
-        @IR(counts = {IRNode.ALLOC, "3"}, phase = {FINAL_CODE, OPTIMIZE_FINISHED, DEFAULT})
+        @IR(counts = {IRNode.FIELD_ACCESS, "3"}, phase = {FINAL_CODE, OPTIMIZE_FINISHED, DEFAULT})
         public void mix8() {}
 
         @Test
@@ -425,13 +426,13 @@ public class TestCompilePhaseCollector {
         public void mix10() {}
 
         @Test
-        @IR(failOn = IRNode.ALLOC, phase = {PHASEIDEALLOOP1, PRINT_OPTO_ASSEMBLY, PHASEIDEALLOOP2})
-        @IR(counts = {IRNode.ALLOC, "3"}, phase = {FINAL_CODE, OPTIMIZE_FINISHED, DEFAULT})
+        @IR(failOn = IRNode.FIELD_ACCESS, phase = {PHASEIDEALLOOP1, PRINT_OPTO_ASSEMBLY, PHASEIDEALLOOP2})
+        @IR(counts = {IRNode.FIELD_ACCESS, "3"}, phase = {FINAL_CODE, OPTIMIZE_FINISHED, DEFAULT})
         public void mix11() {}
 
         @Test
         @IR(failOn = IRNode.STORE, phase = {PHASEIDEALLOOP1, PRINT_IDEAL, PHASEIDEALLOOP2})
-        @IR(counts = {IRNode.ALLOC, "3"}, phase = {FINAL_CODE, OPTIMIZE_FINISHED, DEFAULT})
+        @IR(counts = {IRNode.FIELD_ACCESS, "3"}, phase = {FINAL_CODE, OPTIMIZE_FINISHED, DEFAULT})
         public void mix12() {}
 
         @Test
@@ -456,7 +457,7 @@ public class TestCompilePhaseCollector {
 
         @Test
         @IR(counts = {"foo", "3"}, phase = {PHASEIDEALLOOP1, PHASEIDEALLOOP2})
-        @IR(failOn = IRNode.ALLOC, phase = {FINAL_CODE, OPTIMIZE_FINISHED, DEFAULT})
+        @IR(failOn = IRNode.FIELD_ACCESS, phase = {FINAL_CODE, OPTIMIZE_FINISHED, DEFAULT})
         public void mix17() {}
     }
 }

From 6bc480358c80b0a1a94b5ca5f4b7ff2d84ce8e37 Mon Sep 17 00:00:00 2001
From: Matthias Baesken <mbaesken@openjdk.org>
Date: Tue, 25 Mar 2025 08:01:15 +0000
Subject: [PATCH 461/587] 8351277: Remove pipewire from AIX build

Reviewed-by: ihse, prr, azvegint
---
 .../modules/java.desktop/lib/AwtLibraries.gmk |  6 +++-
 .../libawt_xawt/awt/screencast_pipewire.c     | 29 ++++++++++++++++++-
 .../libawt_xawt/awt/screencast_portal.c       |  4 +++
 .../libpipewire/include/spa/utils/endian.h    |  4 ---
 4 files changed, 37 insertions(+), 6 deletions(-)

diff --git a/make/modules/java.desktop/lib/AwtLibraries.gmk b/make/modules/java.desktop/lib/AwtLibraries.gmk
index 5507c1d3edd..5414c93c908 100644
--- a/make/modules/java.desktop/lib/AwtLibraries.gmk
+++ b/make/modules/java.desktop/lib/AwtLibraries.gmk
@@ -231,10 +231,14 @@ ifeq ($(call isTargetOs, windows macosx)+$(ENABLE_HEADLESS_ONLY), false+false)
       common/font \
       common/java2d/opengl \
       common/java2d/x11 \
-      libpipewire/include \
       java.base:libjvm \
       #
 
+  # exclude pipewire from the AIX build, no Wayland support
+  ifeq ($(call isTargetOs, aix), false)
+    LIBAWT_XAWT_EXTRA_HEADER_DIRS += libpipewire/include
+  endif
+
   ifeq ($(call isTargetOs, linux), true)
     ifeq ($(DISABLE_XRENDER), true)
       LIBAWT_XAWT_CFLAGS += -DDISABLE_XRENDER_BY_DEFAULT=true
diff --git a/src/java.desktop/unix/native/libawt_xawt/awt/screencast_pipewire.c b/src/java.desktop/unix/native/libawt_xawt/awt/screencast_pipewire.c
index 09585964ac8..62d9e358173 100644
--- a/src/java.desktop/unix/native/libawt_xawt/awt/screencast_pipewire.c
+++ b/src/java.desktop/unix/native/libawt_xawt/awt/screencast_pipewire.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,6 +30,8 @@
 #include <dlfcn.h>
 #include "jni_util.h"
 #include "awt.h"
+
+#ifndef _AIX
 #include "screencast_pipewire.h"
 
 struct pw_buffer *(*fp_pw_stream_dequeue_buffer)(struct pw_stream *stream);
@@ -1095,3 +1097,28 @@ JNIEXPORT jint JNICALL Java_sun_awt_screencast_ScreencastHelper_getRGBPixelsImpl
     releaseToken(env, jtoken, token);
     return 0;
 }
+#else
+JNIEXPORT void JNICALL
+Java_sun_awt_screencast_ScreencastHelper_closeSession(JNIEnv *env, jclass cls) {
+}
+
+JNIEXPORT jint JNICALL Java_sun_awt_screencast_ScreencastHelper_getRGBPixelsImpl(
+        JNIEnv *env,
+        jclass cls,
+        jint jx,
+        jint jy,
+        jint jwidth,
+        jint jheight,
+        jintArray pixelArray,
+        jintArray affectedScreensBoundsArray,
+        jstring jtoken
+) {
+    return -1; /* RESULT_ERROR */
+}
+
+JNIEXPORT jboolean JNICALL Java_sun_awt_screencast_ScreencastHelper_loadPipewire(
+        JNIEnv *env, jclass cls, jboolean screencastDebug
+) {
+    return JNI_FALSE;
+}
+#endif
diff --git a/src/java.desktop/unix/native/libawt_xawt/awt/screencast_portal.c b/src/java.desktop/unix/native/libawt_xawt/awt/screencast_portal.c
index 92342aa13be..4d99b90ba08 100644
--- a/src/java.desktop/unix/native/libawt_xawt/awt/screencast_portal.c
+++ b/src/java.desktop/unix/native/libawt_xawt/awt/screencast_portal.c
@@ -29,7 +29,10 @@
 #include <string.h>
 #include <pwd.h>
 #include <unistd.h>
+
+#ifndef _AIX
 #include "screencast_pipewire.h"
+
 #include "screencast_portal.h"
 
 extern volatile bool isGtkMainThread;
@@ -925,3 +928,4 @@ int getPipewireFd(const gchar *token,
     DEBUG_SCREENCAST("pwFd %i\n", pipewireFd);
     return pipewireFd;
 }
+#endif
diff --git a/src/java.desktop/unix/native/libpipewire/include/spa/utils/endian.h b/src/java.desktop/unix/native/libpipewire/include/spa/utils/endian.h
index 0a8f62c73ce..2d002d4538c 100644
--- a/src/java.desktop/unix/native/libpipewire/include/spa/utils/endian.h
+++ b/src/java.desktop/unix/native/libpipewire/include/spa/utils/endian.h
@@ -18,10 +18,6 @@
 #define bswap_16 _byteswap_ushort
 #define bswap_32 _byteswap_ulong
 #define bswap_64 _byteswap_uint64
-#elif defined(AIX)
-#include <sys/machine.h>
-#define __BIG_ENDIAN      BIG_ENDIAN
-#define __BYTE_ORDER      BIG_ENDIAN
 #else
 #include <endian.h>
 #include <byteswap.h>

From 17dc30c54e90a339783b7da6ef282a2206205653 Mon Sep 17 00:00:00 2001
From: Aleksey Shipilev <shade@openjdk.org>
Date: Tue, 25 Mar 2025 08:20:35 +0000
Subject: [PATCH 462/587] 8352414: JFR: JavaMonitorDeflateEvent crashes when
 deflated monitor object is dead

Reviewed-by: dholmes, mgronlun
---
 src/hotspot/share/jfr/metadata/metadata.xml   |   4 +-
 src/hotspot/share/runtime/objectMonitor.cpp   |  17 +-
 .../runtime/StressJavaMonitorEvents.java      | 156 ++++++++++++++++++
 .../runtime/TestJavaMonitorDeflateEvent.java  |   5 +-
 4 files changed, 174 insertions(+), 8 deletions(-)
 create mode 100644 test/jdk/jdk/jfr/event/runtime/StressJavaMonitorEvents.java

diff --git a/src/hotspot/share/jfr/metadata/metadata.xml b/src/hotspot/share/jfr/metadata/metadata.xml
index f430c43eb62..562d31b828d 100644
--- a/src/hotspot/share/jfr/metadata/metadata.xml
+++ b/src/hotspot/share/jfr/metadata/metadata.xml
@@ -123,8 +123,8 @@
   </Event>
 
   <Event name="JavaMonitorDeflate" category="Java Application" label="Java Monitor Deflated">
-    <Field type="Class" name="monitorClass" label="Monitor Class" />
-    <Field type="ulong" contentType="address" name="address" label="Monitor Address" relation="JavaMonitorAddress" />
+    <Field type="Class" name="monitorClass" label="Monitor Class" description="Class of the object deflated. If null or N/A, the object has been garbage collected." />
+    <Field type="ulong" contentType="address" name="address" label="Monitor Address" relation="JavaMonitorAddress" description="Address of the object deflated. If null or N/A, the object has been garbage collected."/>
   </Event>
 
   <Event name="JavaMonitorStatistics" category="Java Application, Statistics" label="Java Monitor Statistics" period="everyChunk">
diff --git a/src/hotspot/share/runtime/objectMonitor.cpp b/src/hotspot/share/runtime/objectMonitor.cpp
index 510b5cca5f4..c36ddee1d20 100644
--- a/src/hotspot/share/runtime/objectMonitor.cpp
+++ b/src/hotspot/share/runtime/objectMonitor.cpp
@@ -737,12 +737,19 @@ bool ObjectMonitor::try_lock_or_add_to_entry_list(JavaThread* current, ObjectWai
 static void post_monitor_deflate_event(EventJavaMonitorDeflate* event,
                                        const oop obj) {
   assert(event != nullptr, "invariant");
-  const Klass* monitor_klass = obj->klass();
-  if (ObjectMonitor::is_jfr_excluded(monitor_klass)) {
-    return;
+  if (obj == nullptr) {
+    // Accept the case when obj was already garbage-collected.
+    // Emit the event anyway, but without details.
+    event->set_monitorClass(nullptr);
+    event->set_address(0);
+  } else {
+    const Klass* monitor_klass = obj->klass();
+    if (ObjectMonitor::is_jfr_excluded(monitor_klass)) {
+      return;
+    }
+    event->set_monitorClass(monitor_klass);
+    event->set_address((uintptr_t)(void*)obj);
   }
-  event->set_monitorClass(monitor_klass);
-  event->set_address((uintptr_t)(void*)obj);
   event->commit();
 }
 
diff --git a/test/jdk/jdk/jfr/event/runtime/StressJavaMonitorEvents.java b/test/jdk/jdk/jfr/event/runtime/StressJavaMonitorEvents.java
new file mode 100644
index 00000000000..ed3b5454163
--- /dev/null
+++ b/test/jdk/jdk/jfr/event/runtime/StressJavaMonitorEvents.java
@@ -0,0 +1,156 @@
+/*
+ * Copyright Amazon.com Inc. or its affiliates. All Rights Reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.jfr.event.runtime;
+
+import static jdk.test.lib.Asserts.assertTrue;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.atomic.AtomicLong;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.ThreadLocalRandom;
+
+import jdk.jfr.consumer.RecordingStream;
+import jdk.jfr.consumer.RecordedClass;
+import jdk.jfr.consumer.RecordedEvent;
+import jdk.test.lib.jfr.EventNames;
+import jdk.test.lib.jfr.Events;
+import jdk.test.lib.thread.TestThread;
+import jdk.test.lib.thread.XRun;
+
+/**
+ * @test StressJavaMonitorEvents
+ * @summary Tests that VM does not crash when monitor-related JFR events are enabled
+ * @requires vm.flagless
+ * @requires vm.hasJFR
+ * @library /test/lib
+ * @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:GuaranteedAsyncDeflationInterval=100 jdk.jfr.event.runtime.StressJavaMonitorEvents
+ */
+public class StressJavaMonitorEvents {
+
+    static final int RUN_TIME_MS = 10000;
+    static final int GC_EVERY_MS = 500;
+    static final int THREADS = 4;
+    static final int NUM_LOCKS = 1024;
+
+    static final List<String> CAPTURE_EVENTS = List.of(
+        EventNames.JavaMonitorEnter,
+        EventNames.JavaMonitorWait,
+        EventNames.JavaMonitorNotify,
+        EventNames.JavaMonitorInflate,
+        EventNames.JavaMonitorDeflate,
+        EventNames.JavaMonitorStatistics
+    );
+
+    static final Set<String> CAN_BE_ZERO_EVENTS = Set.of(
+        // Only when lock actually gets contended, not guaranteed.
+        EventNames.JavaMonitorEnter,
+        // Only when there are waiters on the lock, not guaranteed.
+        EventNames.JavaMonitorNotify
+    );
+
+    static final Object[] LOCKS = new Object[NUM_LOCKS];
+
+    public static TestThread startThread(final long deadline) {
+        TestThread t = new TestThread(new XRun() {
+            @Override
+            public void xrun() throws Throwable {
+                ThreadLocalRandom r = ThreadLocalRandom.current();
+                while (System.nanoTime() < deadline) {
+                    // Overwrite random lock, making the old one dead
+                    LOCKS[r.nextInt(NUM_LOCKS)] = new Object();
+
+                    // Wait on random lock, inflating it
+                    Object waitLock = LOCKS[r.nextInt(NUM_LOCKS)];
+                    if (waitLock != null) {
+                        synchronized (waitLock) {
+                            waitLock.wait(1);
+                        }
+                    }
+
+                    // Notify a random lock
+                    Object notifyLock = LOCKS[r.nextInt(NUM_LOCKS)];
+                    if (notifyLock != null) {
+                        synchronized (notifyLock) {
+                            notifyLock.notify();
+                        }
+                    }
+
+                    // Notify all on a random lock
+                    Object notifyAllLock = LOCKS[r.nextInt(NUM_LOCKS)];
+                    if (notifyAllLock != null) {
+                        synchronized (notifyAllLock) {
+                            notifyAllLock.notifyAll();
+                        }
+                    }
+                }
+            }
+        });
+        t.start();
+        return t;
+    }
+
+    public static void main(String[] args) throws Exception {
+        Map<String, AtomicLong> counters = new HashMap<>();
+
+        try (RecordingStream rs = new RecordingStream()) {
+            // Setup all interesting events, and start recording.
+            for (String ev : CAPTURE_EVENTS) {
+                rs.enable(ev).withoutThreshold();
+                AtomicLong counter = new AtomicLong();
+                rs.onEvent(ev, e -> counter.incrementAndGet());
+                counters.put(ev, counter);
+            }
+            rs.startAsync();
+
+            long deadline = System.nanoTime() + TimeUnit.MILLISECONDS.toNanos(RUN_TIME_MS);
+            List<TestThread> threads = new ArrayList<>();
+            for (int t = 0; t < THREADS; t++) {
+                threads.add(startThread(deadline));
+            }
+
+            // Trigger GCs periodically to yield dead objects with inflated monitors.
+            while (System.nanoTime() < deadline) {
+                Thread.sleep(GC_EVERY_MS);
+                System.gc();
+            }
+
+            // Wait for all threads to exit and close the recording.
+            for (TestThread t : threads) {
+                t.join();
+            }
+            rs.close();
+
+            // Print stats and check event counts.
+            for (String ev : CAPTURE_EVENTS) {
+                long count = counters.get(ev).get();
+                System.out.println(ev + ": " + count);
+                assertTrue(CAN_BE_ZERO_EVENTS.contains(ev) || (count > 0));
+            }
+        }
+    }
+}
diff --git a/test/jdk/jdk/jfr/event/runtime/TestJavaMonitorDeflateEvent.java b/test/jdk/jdk/jfr/event/runtime/TestJavaMonitorDeflateEvent.java
index 2c10911179b..5e1e604a504 100644
--- a/test/jdk/jdk/jfr/event/runtime/TestJavaMonitorDeflateEvent.java
+++ b/test/jdk/jdk/jfr/event/runtime/TestJavaMonitorDeflateEvent.java
@@ -56,8 +56,11 @@ public class TestJavaMonitorDeflateEvent {
     static class Lock {
     }
 
+    // Make sure the object stays reachable.
+    // This guarantees the fields are fully set up on deflation.
+    static final Lock lock = new Lock();
+
     public static void main(String[] args) throws Exception {
-        final Lock lock = new Lock();
         final String lockClassName = lock.getClass().getName().replace('.', '/');
 
         List<RecordedEvent> events = new CopyOnWriteArrayList<>();

From f9bcef4dba569701ebed7762fc8730d552325382 Mon Sep 17 00:00:00 2001
From: Xiaohong Gong <xgong@openjdk.org>
Date: Tue, 25 Mar 2025 08:27:18 +0000
Subject: [PATCH 463/587] 8351627: C2 AArch64 ROR/ROL: assert((1 << ((T>>1)+3))
 > shift) failed: Invalid Shift value

Reviewed-by: chagedorn, epeter, jbhateja, adinn
---
 src/hotspot/share/opto/vectornode.cpp         |   3 +-
 .../vectorapi/TestRotateWithZero.java         | 302 ++++++++++++++++++
 2 files changed, 304 insertions(+), 1 deletion(-)
 create mode 100644 test/hotspot/jtreg/compiler/vectorapi/TestRotateWithZero.java

diff --git a/src/hotspot/share/opto/vectornode.cpp b/src/hotspot/share/opto/vectornode.cpp
index 0e5739f39c2..622766ecfd5 100644
--- a/src/hotspot/share/opto/vectornode.cpp
+++ b/src/hotspot/share/opto/vectornode.cpp
@@ -1670,7 +1670,7 @@ Node* VectorNode::degenerate_vector_rotate(Node* src, Node* cnt, bool is_rotate_
     // Constant shift.
     int shift = cnt_type->get_con() & shift_mask;
     shiftRCnt = phase->intcon(shift);
-    shiftLCnt = phase->intcon(shift_mask + 1 - shift);
+    shiftLCnt = phase->intcon((shift_mask + 1 - shift) & shift_mask);
   } else if (cnt->Opcode() == Op_Replicate) {
     // Scalar variable shift, handle replicates generated by auto vectorizer.
     cnt = cnt->in(1);
@@ -1686,6 +1686,7 @@ Node* VectorNode::degenerate_vector_rotate(Node* src, Node* cnt, bool is_rotate_
     }
     shiftRCnt = phase->transform(new AndINode(cnt, phase->intcon(shift_mask)));
     shiftLCnt = phase->transform(new SubINode(phase->intcon(shift_mask + 1), shiftRCnt));
+    shiftLCnt = phase->transform(new AndINode(shiftLCnt, phase->intcon(shift_mask)));
   } else {
     // Variable vector rotate count.
     assert(Matcher::supports_vector_variable_shifts(), "");
diff --git a/test/hotspot/jtreg/compiler/vectorapi/TestRotateWithZero.java b/test/hotspot/jtreg/compiler/vectorapi/TestRotateWithZero.java
new file mode 100644
index 00000000000..b11c558a319
--- /dev/null
+++ b/test/hotspot/jtreg/compiler/vectorapi/TestRotateWithZero.java
@@ -0,0 +1,302 @@
+/*
+ * Copyright (c) 2025, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package compiler.vectorapi;
+
+import compiler.lib.generators.*;
+import jdk.incubator.vector.IntVector;
+import jdk.incubator.vector.ShortVector;
+import jdk.incubator.vector.VectorOperators;
+import jdk.incubator.vector.VectorSpecies;
+import jdk.test.lib.Asserts;
+
+/*
+ * @test
+ * @bug 8351627
+ * @summary C2 AArch64 ROR/ROL: assert((1 << ((T>>1)+3)) > shift) failed: Invalid Shift value
+ * @modules jdk.incubator.vector
+ * @library /test/lib /
+ * @run main/othervm -XX:-TieredCompilation compiler.vectorapi.TestRotateWithZero
+ */
+public class TestRotateWithZero {
+    private static final int INVOCATIONS = 10000;
+    private static final int LENGTH = 2048;
+    private static final Generators random = Generators.G;
+    private static final VectorSpecies<Integer> I_SPECIES = IntVector.SPECIES_PREFERRED;
+    private static final VectorSpecies<Short> S_SPECIES = ShortVector.SPECIES_PREFERRED;
+
+    private static int[] arr1;
+    private static int[] arr2;
+    private static int[] res;
+    private static short[] sarr1;
+    private static short[] sarr2;
+    private static short[] sres;
+
+    static {
+        arr1 = new int[LENGTH];
+        arr2 = new int[LENGTH];
+        res = new int[LENGTH];
+        sarr1 = new short[LENGTH];
+        sarr2 = new short[LENGTH];
+        sres = new short[LENGTH];
+
+        random.fill(random.ints(), arr1);
+        Generator<Integer> shortGen = random.uniformInts(Short.MIN_VALUE, Short.MAX_VALUE);
+        for (int i = 0; i < LENGTH; i++) {
+            sarr1[i] = shortGen.next().shortValue();
+            sarr2[i] = (short)0;
+            arr2[i] = 0;
+        }
+    }
+
+    private static void rotateRightWithZero() {
+        for (int i = 0; i < LENGTH; i += I_SPECIES.length()) {
+            IntVector v = IntVector.fromArray(I_SPECIES, arr1, i);
+            v.lanewise(VectorOperators.ROR, 0).intoArray(res, i);
+        }
+    }
+
+    private static void rotateLeftWithZero() {
+        for (int i = 0; i < LENGTH; i += I_SPECIES.length()) {
+            IntVector v = IntVector.fromArray(I_SPECIES, arr1, i);
+            v.lanewise(VectorOperators.ROL, 0).intoArray(res, i);
+        }
+    }
+
+    private static void rotateRightWithZeroConst() {
+        IntVector vzero = IntVector.zero(I_SPECIES);
+        for (int i = 0; i < LENGTH; i += I_SPECIES.length()) {
+            IntVector v = IntVector.fromArray(I_SPECIES, arr1, i);
+            v.lanewise(VectorOperators.ROR, vzero).intoArray(res, i);
+        }
+    }
+
+    private static void rotateLeftWithZeroConst() {
+        IntVector vzero = IntVector.zero(I_SPECIES);
+        for (int i = 0; i < LENGTH; i += I_SPECIES.length()) {
+            IntVector v = IntVector.fromArray(I_SPECIES, arr1, i);
+            v.lanewise(VectorOperators.ROL, vzero).intoArray(res, i);
+        }
+    }
+
+    private static void rotateRightWithZeroArr() {
+        IntVector vzero = IntVector.fromArray(I_SPECIES, arr2, 0);
+        for (int i = 0; i < LENGTH; i += I_SPECIES.length()) {
+            IntVector v = IntVector.fromArray(I_SPECIES, arr1, i);
+            v.lanewise(VectorOperators.ROR, vzero).intoArray(res, i);
+        }
+    }
+
+    private static void rotateLeftWithZeroArr() {
+        IntVector vzero = IntVector.fromArray(I_SPECIES, arr2, 0);
+        for (int i = 0; i < LENGTH; i += I_SPECIES.length()) {
+            IntVector v = IntVector.fromArray(I_SPECIES, arr1, i);
+            v.lanewise(VectorOperators.ROL, vzero).intoArray(res, i);
+        }
+    }
+
+    private static void rotateRightWithZeroVar() {
+        for (int i = 0; i < LENGTH; i += I_SPECIES.length()) {
+            IntVector v = IntVector.fromArray(I_SPECIES, arr1, i);
+            v.lanewise(VectorOperators.ROR, arr2[i]).intoArray(res, i);
+        }
+    }
+
+    private static void rotateLeftWithZeroVar() {
+        for (int i = 0; i < LENGTH; i += I_SPECIES.length()) {
+            IntVector v = IntVector.fromArray(I_SPECIES, arr1, i);
+            v.lanewise(VectorOperators.ROL, arr2[i]).intoArray(res, i);
+        }
+    }
+
+    private static void rotateRightWithZero_subword() {
+        for (int i = 0; i < LENGTH; i += S_SPECIES.length()) {
+            ShortVector v = ShortVector.fromArray(S_SPECIES, sarr1, i);
+            v.lanewise(VectorOperators.ROR, 0).intoArray(sres, i);
+        }
+    }
+
+    private static void rotateLeftWithZero_subword() {
+        for (int i = 0; i < LENGTH; i += S_SPECIES.length()) {
+            ShortVector v = ShortVector.fromArray(S_SPECIES, sarr1, i);
+            v.lanewise(VectorOperators.ROL, 0).intoArray(sres, i);
+        }
+    }
+
+    private static void rotateRightWithZeroConst_subword() {
+        ShortVector vzero = ShortVector.zero(S_SPECIES);
+        for (int i = 0; i < LENGTH; i += S_SPECIES.length()) {
+            ShortVector v = ShortVector.fromArray(S_SPECIES, sarr1, i);
+            v.lanewise(VectorOperators.ROR, vzero).intoArray(sres, i);
+        }
+    }
+
+    private static void rotateLeftWithZeroConst_subword() {
+        ShortVector vzero = ShortVector.zero(S_SPECIES);
+        for (int i = 0; i < LENGTH; i += S_SPECIES.length()) {
+            ShortVector v = ShortVector.fromArray(S_SPECIES, sarr1, i);
+            v.lanewise(VectorOperators.ROL, vzero).intoArray(sres, i);
+        }
+    }
+
+    private static void rotateRightWithZeroArr_subword() {
+        for (int i = 0; i < LENGTH; i += S_SPECIES.length()) {
+            ShortVector v1 = ShortVector.fromArray(S_SPECIES, sarr1, i);
+            ShortVector v2 = ShortVector.fromArray(S_SPECIES, sarr2, i);
+            v1.lanewise(VectorOperators.ROR, v2).intoArray(sres, i);
+        }
+    }
+
+    private static void rotateLeftWithZeroArr_subword() {
+        for (int i = 0; i < LENGTH; i += S_SPECIES.length()) {
+            ShortVector v1 = ShortVector.fromArray(S_SPECIES, sarr1, i);
+            ShortVector v2 = ShortVector.fromArray(S_SPECIES, sarr2, i);
+            v1.lanewise(VectorOperators.ROL, v2).intoArray(sres, i);
+        }
+    }
+
+    private static void rotateRightWithZeroVar_subword() {
+        for (int i = 0; i < LENGTH; i += S_SPECIES.length()) {
+            ShortVector v = ShortVector.fromArray(S_SPECIES, sarr1, i);
+            v.lanewise(VectorOperators.ROR, sarr2[i]).intoArray(sres, i);
+        }
+    }
+
+    private static void rotateLeftWithZeroVar_subword() {
+        for (int i = 0; i < LENGTH; i += S_SPECIES.length()) {
+            ShortVector v = ShortVector.fromArray(S_SPECIES, sarr1, i);
+            v.lanewise(VectorOperators.ROL, sarr2[i]).intoArray(sres, i);
+        }
+    }
+
+    private static void checkResults(int[] ref, int[] res) {
+        for (int i = 0; i < LENGTH; i++) {
+            Asserts.assertEquals(ref[i], res[i]);
+        }
+    }
+
+    private static void checkResults(short[] ref, short[] res) {
+        for (int i = 0; i < LENGTH; i++) {
+            Asserts.assertEquals(ref[i], res[i]);
+        }
+    }
+
+    private static void test() {
+        // Test rotate with a immediate 0
+        for (int i = 0; i < INVOCATIONS; i++) {
+            rotateRightWithZero();
+        }
+        checkResults(arr1, res);
+
+        for (int i = 0; i < INVOCATIONS; i++) {
+            rotateLeftWithZero();
+        }
+        checkResults(arr1, res);
+
+        // Test rotate with a constant vector with all zeros
+        for (int i = 0; i < INVOCATIONS; i++) {
+            rotateRightWithZeroConst();
+        }
+        checkResults(arr1, res);
+
+        for (int i = 0; i < INVOCATIONS; i++) {
+            rotateLeftWithZeroConst();
+        }
+        checkResults(arr1, res);
+
+        // Test rotate with a vector loaded from the memory
+        // filled with zeros
+        for (int i = 0; i < INVOCATIONS; i++) {
+            rotateRightWithZeroArr();
+        }
+        checkResults(arr1, res);
+
+        for (int i = 0; i < INVOCATIONS; i++) {
+            rotateLeftWithZeroArr();
+        }
+        checkResults(arr1, res);
+
+        // Test rotate with a variable assigned with zero.
+        for (int i = 0; i < INVOCATIONS; i++) {
+            rotateRightWithZeroVar();
+        }
+        checkResults(arr1, res);
+
+        for (int i = 0; i < INVOCATIONS; i++) {
+            rotateLeftWithZeroVar();
+        }
+        checkResults(arr1, res);
+    }
+
+    private static void test_subword() {
+        // Test rotate with a immediate 0
+        for (int i = 0; i < INVOCATIONS; i++) {
+            rotateRightWithZero_subword();
+        }
+        checkResults(sarr1, sres);
+
+        for (int i = 0; i < INVOCATIONS; i++) {
+            rotateLeftWithZero_subword();
+        }
+        checkResults(sarr1, sres);
+
+        // Test rotate with a constant vector with all zeros
+        for (int i = 0; i < INVOCATIONS; i++) {
+            rotateRightWithZeroConst_subword();
+        }
+        checkResults(sarr1, sres);
+
+        for (int i = 0; i < INVOCATIONS; i++) {
+            rotateLeftWithZeroConst_subword();
+        }
+        checkResults(sarr1, sres);
+
+        // Test rotate with a vector loaded from the memory
+        // filled with zeros
+        for (int i = 0; i < INVOCATIONS; i++) {
+            rotateRightWithZeroArr_subword();
+        }
+        checkResults(sarr1, sres);
+
+        for (int i = 0; i < INVOCATIONS; i++) {
+            rotateLeftWithZeroArr_subword();
+        }
+        checkResults(sarr1, sres);
+
+        // Test rotate with a variable assigned with zero.
+        for (int i = 0; i < INVOCATIONS; i++) {
+            rotateRightWithZeroVar_subword();
+        }
+        checkResults(sarr1, sres);
+
+        for (int i = 0; i < INVOCATIONS; i++) {
+            rotateLeftWithZeroVar_subword();
+        }
+        checkResults(sarr1, sres);
+    }
+
+    public static void main(String[] args) {
+        test();
+        test_subword();
+    }
+}

From aee4d6910ba15f8b8946f36968fc8b8599d9e50d Mon Sep 17 00:00:00 2001
From: Aleksey Shipilev <shade@openjdk.org>
Date: Tue, 25 Mar 2025 09:01:48 +0000
Subject: [PATCH 464/587] 8348829: Remove ObjectMonitor perf counters

Reviewed-by: dholmes, coleenp
---
 .../share/runtime/lightweightSynchronizer.cpp | 10 ----
 src/hotspot/share/runtime/objectMonitor.cpp   | 54 -------------------
 src/hotspot/share/runtime/objectMonitor.hpp   | 39 --------------
 src/hotspot/share/runtime/synchronizer.cpp    | 13 -----
 4 files changed, 116 deletions(-)

diff --git a/src/hotspot/share/runtime/lightweightSynchronizer.cpp b/src/hotspot/share/runtime/lightweightSynchronizer.cpp
index 44d0cb32b56..cefd46d900d 100644
--- a/src/hotspot/share/runtime/lightweightSynchronizer.cpp
+++ b/src/hotspot/share/runtime/lightweightSynchronizer.cpp
@@ -39,7 +39,6 @@
 #include "runtime/mutexLocker.hpp"
 #include "runtime/objectMonitor.inline.hpp"
 #include "runtime/os.hpp"
-#include "runtime/perfData.inline.hpp"
 #include "runtime/safepointMechanism.inline.hpp"
 #include "runtime/safepointVerifiers.hpp"
 #include "runtime/synchronizer.inline.hpp"
@@ -388,9 +387,6 @@ ObjectMonitor* LightweightSynchronizer::get_or_insert_monitor(oop object, JavaTh
   ObjectMonitor* monitor = get_or_insert_monitor_from_table(object, current, &inserted);
 
   if (inserted) {
-    // Hopefully the performance counters are allocated on distinct
-    // cache lines to avoid false sharing on MP systems ...
-    OM_PERFDATA_OP(Inflations, inc());
     log_inflate(current, object, cause);
     if (event.should_commit()) {
       post_monitor_inflate_event(&event, object, cause);
@@ -878,9 +874,6 @@ ObjectMonitor* LightweightSynchronizer::inflate_into_object_header(oop object, O
         // with the ObjectMonitor, it is safe to allow async deflation:
         ObjectSynchronizer::_in_use_list.add(monitor);
 
-        // Hopefully the performance counters are allocated on distinct
-        // cache lines to avoid false sharing on MP systems ...
-        OM_PERFDATA_OP(Inflations, inc());
         log_inflate(current, object, cause);
         if (event.should_commit()) {
           post_monitor_inflate_event(&event, object, cause);
@@ -919,9 +912,6 @@ ObjectMonitor* LightweightSynchronizer::inflate_into_object_header(oop object, O
     // with the ObjectMonitor, it is safe to allow async deflation:
     ObjectSynchronizer::_in_use_list.add(m);
 
-    // Hopefully the performance counters are allocated on distinct
-    // cache lines to avoid false sharing on MP systems ...
-    OM_PERFDATA_OP(Inflations, inc());
     log_inflate(current, object, cause);
     if (event.should_commit()) {
       post_monitor_inflate_event(&event, object, cause);
diff --git a/src/hotspot/share/runtime/objectMonitor.cpp b/src/hotspot/share/runtime/objectMonitor.cpp
index c36ddee1d20..aff48edd7d9 100644
--- a/src/hotspot/share/runtime/objectMonitor.cpp
+++ b/src/hotspot/share/runtime/objectMonitor.cpp
@@ -49,7 +49,6 @@
 #include "runtime/objectMonitor.inline.hpp"
 #include "runtime/orderAccess.hpp"
 #include "runtime/osThread.hpp"
-#include "runtime/perfData.hpp"
 #include "runtime/safefetch.hpp"
 #include "runtime/safepointMechanism.inline.hpp"
 #include "runtime/sharedRuntime.hpp"
@@ -648,8 +647,6 @@ void ObjectMonitor::enter_with_contention_mark(JavaThread* current, ObjectMonito
       current->post_vthread_pinned_event(&vthread_pinned_event, "Contended monitor enter", result);
     }
   }
-
-  OM_PERFDATA_OP(ContendedLockAttempts, inc());
 }
 
 // Caveat: try_lock() is not necessarily serializing if it returns failure.
@@ -1025,14 +1022,6 @@ void ObjectMonitor::enter_internal(JavaThread* current) {
 
     // The lock is still contested.
 
-    // Keep a tally of the # of futile wakeups.
-    // Note that the counter is not protected by a lock or updated by atomics.
-    // That is by design - we trade "lossy" counters which are exposed to
-    // races during updates for a lower probe effect.
-    // We are in safepoint safe state, so shutdown can remove the counter
-    // under our feet. Make sure we make this access safely.
-    OM_PERFDATA_SAFE_OP(FutileWakeups, inc());
-
     // Assuming this is not a spurious wakeup we'll normally find _succ == current.
     // We can defer clearing _succ until after the spin completes
     // try_spin() must tolerate being called with _succ == current.
@@ -1145,12 +1134,6 @@ void ObjectMonitor::reenter_internal(JavaThread* current, ObjectWaiter* currentN
     // Invariant: after clearing _succ a contending thread
     // *must* retry  _owner before parking.
     OrderAccess::fence();
-
-    // Keep a tally of the # of futile wakeups.
-    // Note that the counter is not protected by a lock or updated by atomics.
-    // That is by design - we trade "lossy" counters which are exposed to
-    // races during updates for a lower probe effect.
-    OM_PERFDATA_OP(FutileWakeups, inc());
   }
 
   // Current has acquired the lock -- Unlink current from the _entry_list.
@@ -1608,9 +1591,6 @@ void ObjectMonitor::exit_epilog(JavaThread* current, ObjectWaiter* Wakee) {
     // Virtual thread case.
     Trigger->unpark();
   }
-
-  // Maintain stats and report events to JVMTI
-  OM_PERFDATA_OP(Parks, inc());
 }
 
 // Exits the monitor returning recursion count. _owner should
@@ -2045,7 +2025,6 @@ void ObjectMonitor::notify(TRAPS) {
   EventJavaMonitorNotify event;
   DTRACE_MONITOR_PROBE(notify, this, object(), current);
   int tally = notify_internal(current) ? 1 : 0;
-  OM_PERFDATA_OP(Notifications, inc(tally));
 
   if ((tally > 0) && event.should_commit()) {
     post_monitor_notify_event(&event, this, /* notified_count = */ tally);
@@ -2074,8 +2053,6 @@ void ObjectMonitor::notifyAll(TRAPS) {
     }
   }
 
-  OM_PERFDATA_OP(Notifications, inc(tally));
-
   if ((tally > 0) && event.should_commit()) {
     post_monitor_notify_event(&event, this, /* notified_count = */ tally);
   }
@@ -2514,14 +2491,6 @@ inline void ObjectMonitor::dequeue_specific_waiter(ObjectWaiter* node) {
 }
 
 // -----------------------------------------------------------------------------
-// PerfData support
-PerfCounter * ObjectMonitor::_sync_ContendedLockAttempts       = nullptr;
-PerfCounter * ObjectMonitor::_sync_FutileWakeups               = nullptr;
-PerfCounter * ObjectMonitor::_sync_Parks                       = nullptr;
-PerfCounter * ObjectMonitor::_sync_Notifications               = nullptr;
-PerfCounter * ObjectMonitor::_sync_Inflations                  = nullptr;
-PerfCounter * ObjectMonitor::_sync_Deflations                  = nullptr;
-PerfLongVariable * ObjectMonitor::_sync_MonExtant              = nullptr;
 
 // One-shot global initialization for the sync subsystem.
 // We could also defer initialization and initialize on-demand
@@ -2538,29 +2507,6 @@ void ObjectMonitor::Initialize() {
     Knob_FixedSpin = -1;
   }
 
-  if (UsePerfData) {
-    EXCEPTION_MARK;
-#define NEWPERFCOUNTER(n)                                                \
-  {                                                                      \
-    n = PerfDataManager::create_counter(SUN_RT, #n, PerfData::U_Events,  \
-                                        CHECK);                          \
-  }
-#define NEWPERFVARIABLE(n)                                                \
-  {                                                                       \
-    n = PerfDataManager::create_variable(SUN_RT, #n, PerfData::U_Events,  \
-                                         CHECK);                          \
-  }
-    NEWPERFCOUNTER(_sync_Inflations);
-    NEWPERFCOUNTER(_sync_Deflations);
-    NEWPERFCOUNTER(_sync_ContendedLockAttempts);
-    NEWPERFCOUNTER(_sync_FutileWakeups);
-    NEWPERFCOUNTER(_sync_Parks);
-    NEWPERFCOUNTER(_sync_Notifications);
-    NEWPERFVARIABLE(_sync_MonExtant);
-#undef NEWPERFCOUNTER
-#undef NEWPERFVARIABLE
-  }
-
   _oop_storage = OopStorageSet::create_weak("ObjectSynchronizer Weak", mtSynchronizer);
 
   DEBUG_ONLY(InitDone = true;)
diff --git a/src/hotspot/share/runtime/objectMonitor.hpp b/src/hotspot/share/runtime/objectMonitor.hpp
index e7f964ee4e5..aa32b3cfbf1 100644
--- a/src/hotspot/share/runtime/objectMonitor.hpp
+++ b/src/hotspot/share/runtime/objectMonitor.hpp
@@ -31,7 +31,6 @@
 #include "oops/oopHandle.hpp"
 #include "oops/weakHandle.hpp"
 #include "runtime/javaThread.hpp"
-#include "runtime/perfDataTypes.hpp"
 #include "utilities/checkedCast.hpp"
 
 class ObjectMonitor;
@@ -218,44 +217,6 @@ class ObjectMonitor : public CHeapObj<mtObjectMonitor> {
   static OopHandle& vthread_list_head() { return _vthread_list_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
-  // objects which can happen at normal VM shutdown. This operation is
-  // only safe when thread is not in safepoint-safe code, i.e. PerfDataManager
-  // could not reach the safepoint and free the counter while we are using it.
-  // If this is not guaranteed, use OM_PERFDATA_SAFE_OP instead.
-  #define OM_PERFDATA_OP(f, op_str)                 \
-    do {                                            \
-      if (ObjectMonitor::_sync_ ## f != nullptr) {  \
-        if (PerfDataManager::has_PerfData()) {      \
-          ObjectMonitor::_sync_ ## f->op_str;       \
-        }                                           \
-      }                                             \
-    } while (0)
-
-  // Only perform a PerfData operation if the PerfData object has been
-  // allocated and if the PerfDataManager has not freed the PerfData
-  // objects which can happen at normal VM shutdown. Additionally, we
-  // enter the critical section to resolve the race against PerfDataManager
-  // entering the safepoint and deleting the counter during shutdown.
-  #define OM_PERFDATA_SAFE_OP(f, op_str)            \
-    do {                                            \
-      if (ObjectMonitor::_sync_ ## f != nullptr) {  \
-        GlobalCounter::CriticalSection cs(Thread::current()); \
-        if (PerfDataManager::has_PerfData()) {      \
-          ObjectMonitor::_sync_ ## f->op_str;       \
-        }                                           \
-      }                                             \
-    } while (0)
-
-  static PerfCounter * _sync_ContendedLockAttempts;
-  static PerfCounter * _sync_FutileWakeups;
-  static PerfCounter * _sync_Parks;
-  static PerfCounter * _sync_Notifications;
-  static PerfCounter * _sync_Inflations;
-  static PerfCounter * _sync_Deflations;
-  static PerfLongVariable * _sync_MonExtant;
-
   static int Knob_SpinLimit;
 
   static ByteSize metadata_offset()    { return byte_offset_of(ObjectMonitor, _metadata); }
diff --git a/src/hotspot/share/runtime/synchronizer.cpp b/src/hotspot/share/runtime/synchronizer.cpp
index 2a97dba7119..3cd708e9718 100644
--- a/src/hotspot/share/runtime/synchronizer.cpp
+++ b/src/hotspot/share/runtime/synchronizer.cpp
@@ -48,7 +48,6 @@
 #include "runtime/objectMonitor.inline.hpp"
 #include "runtime/os.inline.hpp"
 #include "runtime/osThread.hpp"
-#include "runtime/perfData.hpp"
 #include "runtime/safepointMechanism.inline.hpp"
 #include "runtime/safepointVerifiers.hpp"
 #include "runtime/sharedRuntime.hpp"
@@ -376,12 +375,9 @@ bool ObjectSynchronizer::quick_notify(oopDesc* obj, JavaThread* current, bool al
       } else {
         DTRACE_MONITOR_PROBE(notify, mon, obj, current);
       }
-      int free_count = 0;
       do {
         mon->notify_internal(current);
-        ++free_count;
       } while (mon->first_waiter() != nullptr && all);
-      OM_PERFDATA_OP(Notifications, inc(free_count));
     }
     return true;
   }
@@ -1595,9 +1591,6 @@ ObjectMonitor* ObjectSynchronizer::inflate_impl(JavaThread* locking_thread, oop
       // with the ObjectMonitor, it is safe to allow async deflation:
       _in_use_list.add(m);
 
-      // Hopefully the performance counters are allocated on distinct cache lines
-      // to avoid false sharing on MP systems ...
-      OM_PERFDATA_OP(Inflations, inc());
       if (log_is_enabled(Trace, monitorinflation)) {
         ResourceMark rm;
         lsh.print_cr("inflate(has_locker): object=" INTPTR_FORMAT ", mark="
@@ -1637,9 +1630,6 @@ ObjectMonitor* ObjectSynchronizer::inflate_impl(JavaThread* locking_thread, oop
     // with the ObjectMonitor, it is safe to allow async deflation:
     _in_use_list.add(m);
 
-    // Hopefully the performance counters are allocated on distinct
-    // cache lines to avoid false sharing on MP systems ...
-    OM_PERFDATA_OP(Inflations, inc());
     if (log_is_enabled(Trace, monitorinflation)) {
       ResourceMark rm;
       lsh.print_cr("inflate(unlocked): object=" INTPTR_FORMAT ", mark="
@@ -1867,9 +1857,6 @@ size_t ObjectSynchronizer::deflate_idle_monitors() {
 
   log.end(deflated_count, unlinked_count);
 
-  OM_PERFDATA_OP(MonExtant, set_value(_in_use_list.count()));
-  OM_PERFDATA_OP(Deflations, inc(deflated_count));
-
   GVars.stw_random = os::random();
 
   if (deflated_count != 0) {

From 6879c446c6e7734c162c85bd2bd3d7f3b012cca4 Mon Sep 17 00:00:00 2001
From: Ivan Walulya <iwalulya@openjdk.org>
Date: Tue, 25 Mar 2025 09:24:36 +0000
Subject: [PATCH 465/587] 8351405: G1: Collection set early pruning causes
 suboptimal region selection

Reviewed-by: ayang, tschatzl
---
 .../share/gc/g1/g1CollectionSetCandidates.cpp | 11 +++++-----
 .../share/gc/g1/g1CollectionSetCandidates.hpp |  4 ++--
 .../share/gc/g1/g1CollectionSetChooser.cpp    |  6 +++---
 src/hotspot/share/gc/g1/g1ConcurrentMark.cpp  |  3 ++-
 src/hotspot/share/gc/g1/g1ConcurrentMark.hpp  |  4 ++++
 .../share/gc/g1/g1ConcurrentMark.inline.hpp   |  8 +++++++
 src/hotspot/share/gc/g1/g1HeapRegion.cpp      |  3 +++
 src/hotspot/share/gc/g1/g1HeapRegion.hpp      | 12 ++++++++---
 .../share/gc/g1/g1HeapRegion.inline.hpp       |  5 ++++-
 src/hotspot/share/gc/g1/g1Policy.cpp          |  9 ++++++++
 src/hotspot/share/gc/g1/g1Policy.hpp          |  4 ++++
 .../share/gc/g1/g1RegionMarkStatsCache.hpp    | 21 ++++++++++++++-----
 .../gc/g1/g1RegionMarkStatsCache.inline.hpp   |  5 +++++
 13 files changed, 75 insertions(+), 20 deletions(-)

diff --git a/src/hotspot/share/gc/g1/g1CollectionSetCandidates.cpp b/src/hotspot/share/gc/g1/g1CollectionSetCandidates.cpp
index 7784eb645d3..6c13c015eff 100644
--- a/src/hotspot/share/gc/g1/g1CollectionSetCandidates.cpp
+++ b/src/hotspot/share/gc/g1/g1CollectionSetCandidates.cpp
@@ -134,7 +134,7 @@ int G1CSetCandidateGroup::compare_gc_efficiency(G1CSetCandidateGroup** gr1, G1CS
   }
 }
 
-int G1CSetCandidateGroup::compare_reclaimble_bytes(G1CollectionSetCandidateInfo* ci1, G1CollectionSetCandidateInfo* ci2) {
+int G1CollectionSetCandidateInfo::compare_region_gc_efficiency(G1CollectionSetCandidateInfo* ci1, G1CollectionSetCandidateInfo* ci2) {
   // Make sure that null entries are moved to the end.
   if (ci1->_r == nullptr) {
     if (ci2->_r == nullptr) {
@@ -146,12 +146,13 @@ int G1CSetCandidateGroup::compare_reclaimble_bytes(G1CollectionSetCandidateInfo*
     return -1;
   }
 
-  size_t reclaimable1 = ci1->_r->reclaimable_bytes();
-  size_t reclaimable2 = ci2->_r->reclaimable_bytes();
+  G1Policy* p = G1CollectedHeap::heap()->policy();
+  double gc_efficiency1 = p->predict_gc_efficiency(ci1->_r);
+  double gc_efficiency2 = p->predict_gc_efficiency(ci2->_r);
 
-  if (reclaimable1 > reclaimable2) {
+  if (gc_efficiency1 > gc_efficiency2) {
     return -1;
-  } else if (reclaimable1 < reclaimable2) {
+  } else if (gc_efficiency1 < gc_efficiency2) {
     return 1;
   } else {
     return 0;
diff --git a/src/hotspot/share/gc/g1/g1CollectionSetCandidates.hpp b/src/hotspot/share/gc/g1/g1CollectionSetCandidates.hpp
index b60af7d067d..73421d40ee9 100644
--- a/src/hotspot/share/gc/g1/g1CollectionSetCandidates.hpp
+++ b/src/hotspot/share/gc/g1/g1CollectionSetCandidates.hpp
@@ -48,6 +48,8 @@ struct G1CollectionSetCandidateInfo {
     ++_num_unreclaimed;
     return _num_unreclaimed < G1NumCollectionsKeepPinned;
   }
+
+  static int compare_region_gc_efficiency(G1CollectionSetCandidateInfo* ci1, G1CollectionSetCandidateInfo* ci2);
 };
 
 using G1CSetCandidateGroupIterator = GrowableArrayIterator<G1CollectionSetCandidateInfo>;
@@ -106,8 +108,6 @@ public:
   // up at the end of the list.
   static int compare_gc_efficiency(G1CSetCandidateGroup** gr1, G1CSetCandidateGroup** gr2);
 
-  static int compare_reclaimble_bytes(G1CollectionSetCandidateInfo* ci1, G1CollectionSetCandidateInfo* ci2);
-
   double gc_efficiency() const { return _gc_efficiency; }
 
   G1HeapRegion* region_at(uint i) const { return _candidates.at(i)._r; }
diff --git a/src/hotspot/share/gc/g1/g1CollectionSetChooser.cpp b/src/hotspot/share/gc/g1/g1CollectionSetChooser.cpp
index 3531d97fd3a..20d6b125b4d 100644
--- a/src/hotspot/share/gc/g1/g1CollectionSetChooser.cpp
+++ b/src/hotspot/share/gc/g1/g1CollectionSetChooser.cpp
@@ -96,14 +96,14 @@ class G1BuildCandidateRegionsTask : public WorkerTask {
       _data[idx] = CandidateInfo(hr);
     }
 
-    void sort_by_reclaimable_bytes() {
+    void sort_by_gc_efficiency() {
       if (_cur_claim_idx == 0) {
         return;
       }
       for (uint i = _cur_claim_idx; i < _max_size; i++) {
         assert(_data[i]._r == nullptr, "must be");
       }
-      qsort(_data, _cur_claim_idx, sizeof(_data[0]), (_sort_Fn)G1CSetCandidateGroup::compare_reclaimble_bytes);
+      qsort(_data, _cur_claim_idx, sizeof(_data[0]), (_sort_Fn)G1CollectionSetCandidateInfo::compare_region_gc_efficiency);
       for (uint i = _cur_claim_idx; i < _max_size; i++) {
         assert(_data[i]._r == nullptr, "must be");
       }
@@ -247,7 +247,7 @@ public:
   }
 
   void sort_and_prune_into(G1CollectionSetCandidates* candidates) {
-    _result.sort_by_reclaimable_bytes();
+    _result.sort_by_gc_efficiency();
     prune(_result.array());
     candidates->set_candidates_from_marking(_result.array(),
                                             _num_regions_added);
diff --git a/src/hotspot/share/gc/g1/g1ConcurrentMark.cpp b/src/hotspot/share/gc/g1/g1ConcurrentMark.cpp
index 87b384b1c94..41878a20935 100644
--- a/src/hotspot/share/gc/g1/g1ConcurrentMark.cpp
+++ b/src/hotspot/share/gc/g1/g1ConcurrentMark.cpp
@@ -1288,7 +1288,8 @@ class G1UpdateRegionLivenessAndSelectForRebuildTask : public WorkerTask {
           reclaim_empty_humongous_region(hr);
         }
       } else if (hr->is_old()) {
-        hr->note_end_of_marking(_cm->top_at_mark_start(hr), _cm->live_bytes(hr->hrm_index()));
+        uint region_idx = hr->hrm_index();
+        hr->note_end_of_marking(_cm->top_at_mark_start(hr), _cm->live_bytes(region_idx), _cm->incoming_refs(region_idx));
 
         if (hr->live_bytes() != 0) {
           if (tracker->update_old_before_rebuild(hr)) {
diff --git a/src/hotspot/share/gc/g1/g1ConcurrentMark.hpp b/src/hotspot/share/gc/g1/g1ConcurrentMark.hpp
index 3ffa9fd9c7c..d54f9bc96f1 100644
--- a/src/hotspot/share/gc/g1/g1ConcurrentMark.hpp
+++ b/src/hotspot/share/gc/g1/g1ConcurrentMark.hpp
@@ -562,6 +562,8 @@ public:
   size_t live_bytes(uint region) const { return _region_mark_stats[region]._live_words * HeapWordSize; }
   // Set live bytes for concurrent marking.
   void set_live_bytes(uint region, size_t live_bytes) { _region_mark_stats[region]._live_words = live_bytes / HeapWordSize; }
+  // Approximate number of incoming references found during marking.
+  size_t incoming_refs(uint region) const { return _region_mark_stats[region]._incoming_refs; }
 
   // Update the TAMS for the given region to the current top.
   inline void update_top_at_mark_start(G1HeapRegion* r);
@@ -952,6 +954,8 @@ public:
 
   inline void update_liveness(oop const obj, size_t const obj_size);
 
+  inline void inc_incoming_refs(oop const obj);
+
   // Clear (without flushing) the mark cache entry for the given region.
   void clear_mark_stats_cache(uint region_idx);
   // Evict the whole statistics cache into the global statistics. Returns the
diff --git a/src/hotspot/share/gc/g1/g1ConcurrentMark.inline.hpp b/src/hotspot/share/gc/g1/g1ConcurrentMark.inline.hpp
index c5ad269ae69..982d03d0da2 100644
--- a/src/hotspot/share/gc/g1/g1ConcurrentMark.inline.hpp
+++ b/src/hotspot/share/gc/g1/g1ConcurrentMark.inline.hpp
@@ -228,6 +228,10 @@ inline void G1CMTask::update_liveness(oop const obj, const size_t obj_size) {
   _mark_stats_cache.add_live_words(_g1h->addr_to_region(obj), obj_size);
 }
 
+inline void G1CMTask::inc_incoming_refs(oop const obj) {
+  _mark_stats_cache.inc_incoming_refs(_g1h->addr_to_region(obj));
+}
+
 inline void G1ConcurrentMark::add_to_liveness(uint worker_id, oop const obj, size_t size) {
   task(worker_id)->update_liveness(obj, size);
 }
@@ -288,6 +292,10 @@ inline bool G1CMTask::deal_with_reference(T* p) {
   if (obj == nullptr) {
     return false;
   }
+
+  if (!G1HeapRegion::is_in_same_region(p, obj)) {
+    inc_incoming_refs(obj);
+  }
   return make_reference_grey(obj);
 }
 
diff --git a/src/hotspot/share/gc/g1/g1HeapRegion.cpp b/src/hotspot/share/gc/g1/g1HeapRegion.cpp
index 428b708fa56..288ddae48fb 100644
--- a/src/hotspot/share/gc/g1/g1HeapRegion.cpp
+++ b/src/hotspot/share/gc/g1/g1HeapRegion.cpp
@@ -128,6 +128,7 @@ void G1HeapRegion::hr_clear(bool clear_space) {
 
   _parsable_bottom = bottom();
   _garbage_bytes = 0;
+  _incoming_refs = 0;
 
   if (clear_space) clear(SpaceDecorator::Mangle);
 }
@@ -239,6 +240,7 @@ G1HeapRegion::G1HeapRegion(uint hrm_index,
 #endif
   _parsable_bottom(nullptr),
   _garbage_bytes(0),
+  _incoming_refs(0),
   _young_index_in_cset(-1),
   _surv_rate_group(nullptr),
   _age_index(G1SurvRateGroup::InvalidAgeIndex),
@@ -278,6 +280,7 @@ void G1HeapRegion::report_region_type_change(G1HeapRegionTraceType::Type to) {
   assert(parsable_bottom_acquire() == bottom(), "must be");
 
   _garbage_bytes = 0;
+  _incoming_refs = 0;
 }
 
 void G1HeapRegion::note_self_forward_chunk_done(size_t garbage_bytes) {
diff --git a/src/hotspot/share/gc/g1/g1HeapRegion.hpp b/src/hotspot/share/gc/g1/g1HeapRegion.hpp
index fbf13e1b571..62804b47d93 100644
--- a/src/hotspot/share/gc/g1/g1HeapRegion.hpp
+++ b/src/hotspot/share/gc/g1/g1HeapRegion.hpp
@@ -237,6 +237,10 @@ private:
   // Amount of dead data in the region.
   size_t _garbage_bytes;
 
+  // Approximate number of references to this regions at the end of concurrent
+  // marking. We we do not mark through all objects, so this is an estimate.
+  size_t _incoming_refs;
+
   // Data for young region survivor prediction.
   uint  _young_index_in_cset;
   G1SurvRateGroup* _surv_rate_group;
@@ -339,6 +343,8 @@ public:
     return capacity() - known_live_bytes;
   }
 
+  size_t incoming_refs() { return _incoming_refs; }
+
   inline bool is_collection_set_candidate() const;
 
   // Retrieve parsable bottom; since it may be modified concurrently, outside a
@@ -351,9 +357,9 @@ public:
   // that the collector is about to start or has finished (concurrently)
   // marking the heap.
 
-  // Notify the region that concurrent marking has finished. Passes TAMS and the number of
-  // bytes marked between bottom and TAMS.
-  inline void note_end_of_marking(HeapWord* top_at_mark_start, size_t marked_bytes);
+  // Notify the region that concurrent marking has finished. Passes TAMS, the number of
+  // bytes marked between bottom and TAMS, and the estimate for incoming references.
+  inline void note_end_of_marking(HeapWord* top_at_mark_start, size_t marked_bytes, size_t incoming_refs);
 
   // Notify the region that scrubbing has completed.
   inline void note_end_of_scrubbing();
diff --git a/src/hotspot/share/gc/g1/g1HeapRegion.inline.hpp b/src/hotspot/share/gc/g1/g1HeapRegion.inline.hpp
index 7c4342d3371..c2e5c5df4b1 100644
--- a/src/hotspot/share/gc/g1/g1HeapRegion.inline.hpp
+++ b/src/hotspot/share/gc/g1/g1HeapRegion.inline.hpp
@@ -156,6 +156,8 @@ inline void G1HeapRegion::reset_after_full_gc_common() {
 
   _garbage_bytes = 0;
 
+  _incoming_refs = 0;
+
   // Clear unused heap memory in debug builds.
   if (ZapUnusedHeapArea) {
     mangle_unused_area();
@@ -263,11 +265,12 @@ inline void G1HeapRegion::reset_parsable_bottom() {
   Atomic::release_store(&_parsable_bottom, bottom());
 }
 
-inline void G1HeapRegion::note_end_of_marking(HeapWord* top_at_mark_start, size_t marked_bytes) {
+inline void G1HeapRegion::note_end_of_marking(HeapWord* top_at_mark_start, size_t marked_bytes, size_t incoming_refs) {
   assert_at_safepoint();
 
   if (top_at_mark_start != bottom()) {
     _garbage_bytes = byte_size(bottom(), top_at_mark_start) - marked_bytes;
+    _incoming_refs = incoming_refs;
   }
 
   if (needs_scrubbing()) {
diff --git a/src/hotspot/share/gc/g1/g1Policy.cpp b/src/hotspot/share/gc/g1/g1Policy.cpp
index 8e81327b42d..8aaa47ba08f 100644
--- a/src/hotspot/share/gc/g1/g1Policy.cpp
+++ b/src/hotspot/share/gc/g1/g1Policy.cpp
@@ -1107,6 +1107,15 @@ size_t G1Policy::predict_bytes_to_copy(G1HeapRegion* hr) const {
   return bytes_to_copy;
 }
 
+double G1Policy::predict_gc_efficiency(G1HeapRegion* hr) {
+
+  double total_based_on_incoming_refs_ms = predict_merge_scan_time(hr->incoming_refs()) + // We use the number of incoming references as an estimate for remset cards.
+                                           predict_non_young_other_time_ms(1) +
+                                           predict_region_copy_time_ms(hr, false /* for_young_only_phase */);
+
+  return hr->reclaimable_bytes() / total_based_on_incoming_refs_ms;
+}
+
 double G1Policy::predict_young_region_other_time_ms(uint count) const {
   return _analytics->predict_young_other_time_ms(count);
 }
diff --git a/src/hotspot/share/gc/g1/g1Policy.hpp b/src/hotspot/share/gc/g1/g1Policy.hpp
index ca64f4c8c23..fb24b5ab72b 100644
--- a/src/hotspot/share/gc/g1/g1Policy.hpp
+++ b/src/hotspot/share/gc/g1/g1Policy.hpp
@@ -243,6 +243,10 @@ public:
   size_t predict_bytes_to_copy(G1HeapRegion* hr) const;
   size_t pending_cards_at_gc_start() const { return _pending_cards_at_gc_start; }
 
+  // GC efficiency for collecting the region based on the time estimate for
+  // merging and scanning incoming references.
+  double predict_gc_efficiency(G1HeapRegion* hr);
+
   // The minimum number of retained regions we will add to the CSet during a young GC.
   uint min_retained_old_cset_length() const;
   // Calculate the minimum number of old regions we'll add to the CSet
diff --git a/src/hotspot/share/gc/g1/g1RegionMarkStatsCache.hpp b/src/hotspot/share/gc/g1/g1RegionMarkStatsCache.hpp
index fe3c16c729a..f94285b06e9 100644
--- a/src/hotspot/share/gc/g1/g1RegionMarkStatsCache.hpp
+++ b/src/hotspot/share/gc/g1/g1RegionMarkStatsCache.hpp
@@ -33,20 +33,26 @@
 
 // Per-Region statistics gathered during marking.
 //
-// This includes
+// These include:
 // * the number of live words gathered during marking for the area from bottom
-// to tams. This is an exact measure.
-// The code corrects later for the live data between tams and top.
+//   to tams. This is an exact measure. The code corrects later for the live data
+//   between tams and top.
+// * the number of incoming references found during marking. This is an approximate
+//   value because we do not mark through all objects.
 struct G1RegionMarkStats {
   size_t _live_words;
+  size_t _incoming_refs;
 
   // Clear all members.
   void clear() {
     _live_words = 0;
+    _incoming_refs = 0;
   }
-  // Clear all members after a marking overflow. Nothing to do as the live words
-  // are updated by the atomic mark. We do not remark objects after overflow.
+  // Clear all members after a marking overflow. Only needs to clear the number of
+  // incoming references as all objects will be rescanned, while the live words are
+  // gathered whenever a thread can mark an object, which is synchronized.
   void clear_during_overflow() {
+    _incoming_refs = 0;
   }
 };
 
@@ -107,6 +113,11 @@ public:
     cur->_stats._live_words += live_words;
   }
 
+  void inc_incoming_refs(uint region_idx) {
+    G1RegionMarkStatsCacheEntry* const cur = find_for_add(region_idx);
+    cur->_stats._incoming_refs++;
+  }
+
   void reset(uint region_idx) {
     uint const cache_idx = hash(region_idx);
     G1RegionMarkStatsCacheEntry* cur = &_cache[cache_idx];
diff --git a/src/hotspot/share/gc/g1/g1RegionMarkStatsCache.inline.hpp b/src/hotspot/share/gc/g1/g1RegionMarkStatsCache.inline.hpp
index 76679e2164d..d25da3e72b8 100644
--- a/src/hotspot/share/gc/g1/g1RegionMarkStatsCache.inline.hpp
+++ b/src/hotspot/share/gc/g1/g1RegionMarkStatsCache.inline.hpp
@@ -49,6 +49,11 @@ inline void G1RegionMarkStatsCache::evict(uint idx) {
   if (cur->_stats._live_words != 0) {
     Atomic::add(&_target[cur->_region_idx]._live_words, cur->_stats._live_words);
   }
+
+  if (cur->_stats._incoming_refs != 0) {
+    Atomic::add(&_target[cur->_region_idx]._incoming_refs, cur->_stats._incoming_refs);
+  }
+
   cur->clear();
 }
 

From 9f582e56baee0e7f5af20da0f395cd935bf5a962 Mon Sep 17 00:00:00 2001
From: Hamlin Li <mli@openjdk.org>
Date: Tue, 25 Mar 2025 09:29:40 +0000
Subject: [PATCH 466/587] 8320997: RISC-V: C2 ReverseV

Reviewed-by: fyang, luhenry
---
 src/hotspot/cpu/riscv/riscv_v.ad              | 27 +++++++++++++++++++
 .../vectorization/TestReverseBitsVector.java  |  4 ++-
 2 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/src/hotspot/cpu/riscv/riscv_v.ad b/src/hotspot/cpu/riscv/riscv_v.ad
index 9892d2b9c03..cd9d2107b79 100644
--- a/src/hotspot/cpu/riscv/riscv_v.ad
+++ b/src/hotspot/cpu/riscv/riscv_v.ad
@@ -79,6 +79,7 @@ source %{
       case Op_PopCountVL:
       case Op_PopCountVI:
       case Op_ReverseBytesV:
+      case Op_ReverseV:
       case Op_RotateLeftV:
       case Op_RotateRightV:
         return UseZvbb;
@@ -4704,6 +4705,32 @@ instruct vround_d(vReg dst, vReg src, fRegD tmp, vRegMask_V0 v0) %{
   ins_pipe(pipe_slow);
 %}
 
+// -------------------------------- Reverse Bits Vector Operations ------------------------
+
+instruct vreverse_masked(vReg dst_src, vRegMask_V0 v0) %{
+  match(Set dst_src (ReverseV dst_src v0));
+  format %{ "vreverse_masked $dst_src, $dst_src, v0" %}
+  ins_encode %{
+    BasicType bt = Matcher::vector_element_basic_type(this);
+    uint vlen = Matcher::vector_length(this);
+    __ vsetvli_helper(bt, vlen);
+    __ vbrev_v(as_VectorRegister($dst_src$$reg), as_VectorRegister($dst_src$$reg), Assembler::v0_t);
+  %}
+  ins_pipe(pipe_slow);
+%}
+
+instruct vreverse(vReg dst, vReg src) %{
+  match(Set dst (ReverseV src));
+  format %{ "vreverse $dst, $src" %}
+  ins_encode %{
+    BasicType bt = Matcher::vector_element_basic_type(this);
+    uint vlen = Matcher::vector_length(this);
+    __ vsetvli_helper(bt, vlen);
+    __ vbrev_v(as_VectorRegister($dst$$reg), as_VectorRegister($src$$reg));
+  %}
+  ins_pipe(pipe_slow);
+%}
+
 // -------------------------------- Reverse Bytes Vector Operations ------------------------
 
 instruct vreverse_bytes_masked(vReg dst_src, vRegMask_V0 v0) %{
diff --git a/test/hotspot/jtreg/compiler/vectorization/TestReverseBitsVector.java b/test/hotspot/jtreg/compiler/vectorization/TestReverseBitsVector.java
index 1144186d8e5..c8c6586675a 100644
--- a/test/hotspot/jtreg/compiler/vectorization/TestReverseBitsVector.java
+++ b/test/hotspot/jtreg/compiler/vectorization/TestReverseBitsVector.java
@@ -25,7 +25,9 @@
  * @bug 8290034
  * @summary Auto-vectorization of Reverse bit operation.
  * @requires vm.compiler2.enabled
- * @requires (os.simpleArch == "x64" & vm.cpu.features ~= ".*avx2.*") | os.arch == "aarch64"
+ * @requires (os.simpleArch == "x64" & vm.cpu.features ~= ".*avx2.*") |
+ *           os.arch == "aarch64" |
+ *           (os.arch == "riscv64" & vm.cpu.features ~= ".*zbkb.*" & vm.cpu.features ~= ".*zvbb.*")
  * @library /test/lib /
  * @run driver compiler.vectorization.TestReverseBitsVector
  */

From 3d3b7820371058b40f2e694536c98aa3900abb5f Mon Sep 17 00:00:00 2001
From: Hamlin Li <mli@openjdk.org>
Date: Tue, 25 Mar 2025 09:30:51 +0000
Subject: [PATCH 467/587] 8352607: RISC-V: use cmove in min/max when Zicond is
 supported

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

diff --git a/src/hotspot/cpu/riscv/riscv.ad b/src/hotspot/cpu/riscv/riscv.ad
index 9435c0b562d..59171d84c9b 100644
--- a/src/hotspot/cpu/riscv/riscv.ad
+++ b/src/hotspot/cpu/riscv/riscv.ad
@@ -9036,17 +9036,11 @@ instruct minI_reg_reg(iRegINoSp dst, iRegI src)
   match(Set dst (MinI dst src));
 
   ins_cost(BRANCH_COST + ALU_COST);
-  format %{
-    "ble $dst, $src, skip\t#@minI_reg_reg\n\t"
-    "mv  $dst, $src\n\t"
-    "skip:"
-  %}
+  format %{"minI_reg_reg $dst, $dst, $src\t#@minI_reg_reg\n\t"%}
 
   ins_encode %{
-    Label Lskip;
-    __ ble(as_Register($dst$$reg), as_Register($src$$reg), Lskip);
-    __ mv(as_Register($dst$$reg), as_Register($src$$reg));
-    __ bind(Lskip);
+    __ cmov_gt(as_Register($dst$$reg), as_Register($src$$reg),
+               as_Register($dst$$reg), as_Register($src$$reg));
   %}
 
   ins_pipe(pipe_class_compare);
@@ -9057,17 +9051,11 @@ instruct maxI_reg_reg(iRegINoSp dst, iRegI src)
   match(Set dst (MaxI dst src));
 
   ins_cost(BRANCH_COST + ALU_COST);
-  format %{
-    "bge $dst, $src, skip\t#@maxI_reg_reg\n\t"
-    "mv  $dst, $src\n\t"
-    "skip:"
-  %}
+  format %{"maxI_reg_reg $dst, $dst, $src\t#@maxI_reg_reg\n\t"%}
 
   ins_encode %{
-    Label Lskip;
-    __ bge(as_Register($dst$$reg), as_Register($src$$reg), Lskip);
-    __ mv(as_Register($dst$$reg), as_Register($src$$reg));
-    __ bind(Lskip);
+    __ cmov_lt(as_Register($dst$$reg), as_Register($src$$reg),
+               as_Register($dst$$reg), as_Register($src$$reg));
   %}
 
   ins_pipe(pipe_class_compare);
@@ -9083,17 +9071,11 @@ instruct minI_reg_zero(iRegINoSp dst, immI0 zero)
   match(Set dst (MinI zero dst));
 
   ins_cost(BRANCH_COST + ALU_COST);
-  format %{
-    "blez $dst, skip\t#@minI_reg_zero\n\t"
-    "mv   $dst, zr\n\t"
-    "skip:"
-  %}
+  format %{"minI_reg_zero $dst, $dst, zr\t#@minI_reg_zero\n\t"%}
 
   ins_encode %{
-    Label Lskip;
-    __ blez(as_Register($dst$$reg), Lskip);
-    __ mv(as_Register($dst$$reg), zr);
-    __ bind(Lskip);
+    __ cmov_gt(as_Register($dst$$reg), zr,
+               as_Register($dst$$reg), zr);
   %}
 
   ins_pipe(pipe_class_compare);
@@ -9105,17 +9087,11 @@ instruct maxI_reg_zero(iRegINoSp dst, immI0 zero)
   match(Set dst (MaxI zero dst));
 
   ins_cost(BRANCH_COST + ALU_COST);
-  format %{
-    "bgez $dst, skip\t#@maxI_reg_zero\n\t"
-    "mv   $dst, zr\n\t"
-    "skip:"
-  %}
+  format %{"maxI_reg_zero $dst, $dst, zr\t#@maxI_reg_zero\n\t"%}
 
   ins_encode %{
-    Label Lskip;
-    __ bgez(as_Register($dst$$reg), Lskip);
-    __ mv(as_Register($dst$$reg), zr);
-    __ bind(Lskip);
+    __ cmov_lt(as_Register($dst$$reg), zr,
+               as_Register($dst$$reg), zr);
   %}
 
   ins_pipe(pipe_class_compare);
@@ -9128,23 +9104,12 @@ instruct minI_rReg(iRegINoSp dst, iRegI src1, iRegI src2)
   effect(DEF dst, USE src1, USE src2);
 
   ins_cost(BRANCH_COST + ALU_COST * 2);
-  format %{
-    "ble $src1, $src2, Lsrc1\t#@minI_rReg\n\t"
-    "mv $dst, $src2\n\t"
-    "j Ldone\n\t"
-    "Lsrc1:\n\t"
-    "mv $dst, $src1\n\t"
-    "Ldone:"
-  %}
+  format %{"minI_rReg $dst, $src1, $src2\t#@minI_rReg\n\t"%}
 
   ins_encode %{
-    Label Lsrc1, Ldone;
-    __ ble(as_Register($src1$$reg), as_Register($src2$$reg), Lsrc1);
-    __ mv(as_Register($dst$$reg), as_Register($src2$$reg));
-    __ j(Ldone);
-    __ bind(Lsrc1);
     __ mv(as_Register($dst$$reg), as_Register($src1$$reg));
-    __ bind(Ldone);
+    __ cmov_gt(as_Register($src1$$reg), as_Register($src2$$reg),
+               as_Register($dst$$reg), as_Register($src2$$reg));
   %}
 
   ins_pipe(pipe_class_compare);
@@ -9157,24 +9122,12 @@ instruct maxI_rReg(iRegINoSp dst, iRegI src1, iRegI src2)
   effect(DEF dst, USE src1, USE src2);
 
   ins_cost(BRANCH_COST + ALU_COST * 2);
-  format %{
-    "bge $src1, $src2, Lsrc1\t#@maxI_rReg\n\t"
-    "mv $dst, $src2\n\t"
-    "j Ldone\n\t"
-    "Lsrc1:\n\t"
-    "mv $dst, $src1\n\t"
-    "Ldone:"
-  %}
+  format %{"maxI_rReg $dst, $src1, $src2\t#@maxI_rReg\n\t"%}
 
   ins_encode %{
-    Label Lsrc1, Ldone;
-    __ bge(as_Register($src1$$reg), as_Register($src2$$reg), Lsrc1);
-    __ mv(as_Register($dst$$reg), as_Register($src2$$reg));
-    __ j(Ldone);
-    __ bind(Lsrc1);
     __ mv(as_Register($dst$$reg), as_Register($src1$$reg));
-    __ bind(Ldone);
-
+    __ cmov_lt(as_Register($src1$$reg), as_Register($src2$$reg),
+               as_Register($dst$$reg), as_Register($src2$$reg));
   %}
 
   ins_pipe(pipe_class_compare);

From bdcac98673a2250f608bdf244e17578eecb30fbe Mon Sep 17 00:00:00 2001
From: Marc Chevalier <marc.chevalier@oracle.com>
Date: Tue, 25 Mar 2025 10:15:55 +0000
Subject: [PATCH 468/587] 8347459: C2: missing transformation for chain of
 shifts/multiplications by constants

Reviewed-by: dfenacci, epeter
---
 src/hotspot/share/opto/memnode.cpp            | 216 ++++++++++++++++--
 src/hotspot/share/opto/memnode.hpp            |   2 +-
 src/hotspot/share/opto/mulnode.cpp            |  57 +++++
 .../share/utilities/globalDefinitions.hpp     |   8 +
 .../irTests/LShiftINodeIdealizationTests.java | 138 ++++++++++-
 .../irTests/LShiftLNodeIdealizationTests.java | 122 +++++++++-
 6 files changed, 526 insertions(+), 17 deletions(-)

diff --git a/src/hotspot/share/opto/memnode.cpp b/src/hotspot/share/opto/memnode.cpp
index 7a285ee0722..a19dbd664eb 100644
--- a/src/hotspot/share/opto/memnode.cpp
+++ b/src/hotspot/share/opto/memnode.cpp
@@ -3606,20 +3606,208 @@ Node *StoreNode::Ideal_masked_input(PhaseGVN *phase, uint mask) {
 
 //------------------------------Ideal_sign_extended_input----------------------
 // Check for useless sign-extension before a partial-word store
-// (StoreB ... (RShiftI _ (LShiftI _ valIn conIL ) conIR) )
-// If (conIL == conIR && conIR <= num_bits)  this simplifies to
-// (StoreB ... (valIn) )
-Node *StoreNode::Ideal_sign_extended_input(PhaseGVN *phase, int num_bits) {
-  Node *val = in(MemNode::ValueIn);
-  if( val->Opcode() == Op_RShiftI ) {
-    const TypeInt *t = phase->type( val->in(2) )->isa_int();
-    if( t && t->is_con() && (t->get_con() <= num_bits) ) {
-      Node *shl = val->in(1);
-      if( shl->Opcode() == Op_LShiftI ) {
-        const TypeInt *t2 = phase->type( shl->in(2) )->isa_int();
-        if( t2 && t2->is_con() && (t2->get_con() == t->get_con()) ) {
-          set_req_X(MemNode::ValueIn, shl->in(1), phase);
-          return this;
+// (StoreB ... (RShiftI _ (LShiftI _ v conIL) conIR))
+// If (conIL == conIR && conIR <= num_rejected_bits) this simplifies to
+// (StoreB ... (v))
+// If (conIL > conIR) under some conditions, it can be simplified into
+// (StoreB ... (LShiftI _ v (conIL - conIR)))
+// This case happens when the value of the store was itself a left shift, that
+// gets merged into the inner left shift of the sign-extension. For instance,
+// if we have
+// array_of_shorts[0] = (short)(v << 2)
+// We get a structure such as:
+// (StoreB ... (RShiftI _ (LShiftI _ (LShiftI _ v 2) 16) 16))
+// that is simplified into
+// (StoreB ... (RShiftI _ (LShiftI _ v 18) 16)).
+// It is thus useful to handle cases where conIL > conIR. But this simplification
+// does not always hold. Let's see in which cases it's valid.
+//
+// Let's assume we have the following 32 bits integer v:
+// +----------------------------------+
+// |             v[0..31]             |
+// +----------------------------------+
+//  31                               0
+// that will be stuffed in 8 bits byte after a shift left and a shift right of
+// potentially different magnitudes.
+// We denote num_rejected_bits the number of bits of the discarded part. In this
+// case, num_rejected_bits == 24.
+//
+// Statement (proved further below in case analysis):
+//   Given:
+//   - 0 <= conIL < BitsPerJavaInteger   (no wrap in shift, enforced by maskShiftAmount)
+//   - 0 <= conIR < BitsPerJavaInteger   (no wrap in shift, enforced by maskShiftAmount)
+//   - conIL >= conIR
+//   - num_rejected_bits >= conIR
+//   Then this form:
+//      (RShiftI _ (LShiftI _ v conIL) conIR)
+//   can be replaced with this form:
+//      (LShiftI _ v (conIL-conIR))
+//
+// Note: We only have to show that the non-rejected lowest bits (8 bits for byte)
+//       have to be correct, as the higher bits are rejected / truncated by the store.
+//
+// The hypotheses
+//   0 <= conIL < BitsPerJavaInteger
+//   0 <= conIR < BitsPerJavaInteger
+// are ensured by maskShiftAmount (called from ::Ideal of shift nodes). Indeed,
+// (v << 31) << 2 must be simplified into 0, not into v << 33 (which is equivalent
+// to v << 1).
+//
+//
+// If you don't like case analysis, jump after the conclusion.
+// ### Case 1 : conIL == conIR
+// ###### Case 1.1: conIL == conIR == num_rejected_bits
+// If we do the shift left then right by 24 bits, we get:
+// after: v << 24
+// +---------+------------------------+
+// | v[0..7] |           0            |
+// +---------+------------------------+
+//  31     24 23                      0
+// after: (v << 24) >> 24
+// +------------------------+---------+
+// |        sign bit        | v[0..7] |
+// +------------------------+---------+
+//  31                     8 7        0
+// The non-rejected bits (bits kept by the store, that is the 8 lower bits of the
+// result) are the same before and after, so, indeed, simplifying is correct.
+
+// ###### Case 1.2: conIL == conIR < num_rejected_bits
+// If we do the shift left then right by 22 bits, we get:
+// after: v << 22
+// +---------+------------------------+
+// | v[0..9] |           0            |
+// +---------+------------------------+
+//  31     22 21                      0
+// after: (v << 22) >> 22
+// +------------------------+---------+
+// |        sign bit        | v[0..9] |
+// +------------------------+---------+
+//  31                    10 9        0
+// The non-rejected bits are the 8 lower bits of v. The bits 8 and 9 of v are still
+// present in (v << 22) >> 22 but will be dropped by the store. The simplification is
+// still correct.
+
+// ###### But! Case 1.3: conIL == conIR > num_rejected_bits
+// If we do the shift left then right by 26 bits, we get:
+// after: v << 26
+// +---------+------------------------+
+// | v[0..5] |           0            |
+// +---------+------------------------+
+//  31     26 25                      0
+// after: (v << 26) >> 26
+// +------------------------+---------+
+// |        sign bit        | v[0..5] |
+// +------------------------+---------+
+//  31                     6 5        0
+// The non-rejected bits are made of
+// - 0-5 => the bits 0 to 5 of v
+// - 6-7 => the sign bit of v[0..5] (that is v[5])
+// Simplifying this as v is not correct.
+// The condition conIR <= num_rejected_bits is indeed necessary in Case 1
+//
+// ### Case 2: conIL > conIR
+// ###### Case 2.1: num_rejected_bits == conIR
+// We take conIL == 26 for this example.
+// after: v << 26
+// +---------+------------------------+
+// | v[0..5] |           0            |
+// +---------+------------------------+
+//  31     26 25                      0
+// after: (v << 26) >> 24
+// +------------------+---------+-----+
+// |     sign bit     | v[0..5] |  0  |
+// +------------------+---------+-----+
+//  31               8 7       2 1   0
+// The non-rejected bits are the 8 lower ones of (v << conIL - conIR).
+// The bits 6 and 7 of v have been thrown away after the shift left.
+// The simplification is still correct.
+//
+// ###### Case 2.2: num_rejected_bits > conIR.
+// Let's say conIL == 26 and conIR == 22.
+// after: v << 26
+// +---------+------------------------+
+// | v[0..5] |           0            |
+// +---------+------------------------+
+//  31     26 25                      0
+// after: (v << 26) >> 22
+// +------------------+---------+-----+
+// |     sign bit     | v[0..5] |  0  |
+// +------------------+---------+-----+
+//  31              10 9       4 3   0
+// The bits non-rejected by the store are exactly the 8 lower ones of (v << (conIL - conIR)):
+// - 0-3 => 0
+// - 4-7 => bits 0 to 3 of v
+// The simplification is still correct.
+// The bits 4 and 5 of v are still present in (v << (conIL - conIR)) but they don't
+// matter as they are not in the 8 lower bits: they will be cut out by the store.
+//
+// ###### But! Case 2.3: num_rejected_bits < conIR.
+// Let's see that this case is not as easy to simplify.
+// Let's say conIL == 28 and conIR == 26.
+// after: v << 28
+// +---------+------------------------+
+// | v[0..3] |           0            |
+// +---------+------------------------+
+//  31     28 27                      0
+// after: (v << 28) >> 26
+// +------------------+---------+-----+
+// |     sign bit     | v[0..3] |  0  |
+// +------------------+---------+-----+
+//  31               6 5       2 1   0
+// The non-rejected bits are made of
+// - 0-1 => 0
+// - 2-5 => the bits 0 to 3 of v
+// - 6-7 => the sign bit of v[0..3] (that is v[3])
+// Simplifying this as (v << 2) is not correct.
+// The condition conIR <= num_rejected_bits is indeed necessary in Case 2.
+//
+// ### Conclusion:
+// Our hypotheses are indeed sufficient:
+//   - 0 <= conIL < BitsPerJavaInteger
+//   - 0 <= conIR < BitsPerJavaInteger
+//   - conIL >= conIR
+//   - num_rejected_bits >= conIR
+//
+// ### A rationale without case analysis:
+// After the shift left, conIL upper  bits of v are discarded and conIL lower bit
+// zeroes are added. After the shift right, conIR lower bits of the previous result
+// are discarded. If conIL >= conIR, we discard only the zeroes we made up during
+// the shift left, but if conIL < conIR, then we discard also lower bits of v. But
+// the point of the simplification is to get an expression of the form
+// (v << (conIL - conIR)). This expression discard only higher bits of v, thus the
+// simplification is not correct if conIL < conIR.
+//
+// Moreover, after the shift right, the higher bit of (v << conIL) is repeated on the
+// conIR higher bits of ((v << conIL) >> conIR), it's the sign-extension. If
+// conIR > num_rejected_bits, then at least one artificial copy of this sign bit will
+// be in the window of the store. Thus ((v << conIL) >> conIR) is not equivalent to
+// (v << (conIL-conIR)) if conIR > num_rejected_bits.
+//
+// We do not treat the case conIL < conIR here since the point of this function is
+// to skip sign-extensions (that is conIL == conIR == num_rejected_bits). The need
+// of treating conIL > conIR comes from the cases where the sign-extended value is
+// also left-shift expression. Computing the sign-extension of a right-shift expression
+// doesn't yield a situation such as
+// (StoreB ... (RShiftI _ (LShiftI _ v conIL) conIR))
+// where conIL < conIR.
+Node* StoreNode::Ideal_sign_extended_input(PhaseGVN* phase, int num_rejected_bits) {
+  Node* shr = in(MemNode::ValueIn);
+  if (shr->Opcode() == Op_RShiftI) {
+    const TypeInt* conIR = phase->type(shr->in(2))->isa_int();
+    if (conIR != nullptr && conIR->is_con() && conIR->get_con() >= 0 && conIR->get_con() < BitsPerJavaInteger && conIR->get_con() <= num_rejected_bits) {
+      Node* shl = shr->in(1);
+      if (shl->Opcode() == Op_LShiftI) {
+        const TypeInt* conIL = phase->type(shl->in(2))->isa_int();
+        if (conIL != nullptr && conIL->is_con() && conIL->get_con() >= 0 && conIL->get_con() < BitsPerJavaInteger) {
+          if (conIL->get_con() == conIR->get_con()) {
+            set_req_X(MemNode::ValueIn, shl->in(1), phase);
+            return this;
+          }
+          if (conIL->get_con() > conIR->get_con()) {
+            Node* new_shl = phase->transform(new LShiftINode(shl->in(1), phase->intcon(conIL->get_con() - conIR->get_con())));
+            set_req_X(MemNode::ValueIn, new_shl, phase);
+            return this;
+          }
         }
       }
     }
diff --git a/src/hotspot/share/opto/memnode.hpp b/src/hotspot/share/opto/memnode.hpp
index b19f7dda989..eca891bebbb 100644
--- a/src/hotspot/share/opto/memnode.hpp
+++ b/src/hotspot/share/opto/memnode.hpp
@@ -579,7 +579,7 @@ protected:
   virtual bool depends_only_on_test() const { return false; }
 
   Node *Ideal_masked_input       (PhaseGVN *phase, uint mask);
-  Node *Ideal_sign_extended_input(PhaseGVN *phase, int  num_bits);
+  Node* Ideal_sign_extended_input(PhaseGVN* phase, int num_rejected_bits);
 
 public:
   // We must ensure that stores of object references will be visible
diff --git a/src/hotspot/share/opto/mulnode.cpp b/src/hotspot/share/opto/mulnode.cpp
index b1a9219e113..e149662e199 100644
--- a/src/hotspot/share/opto/mulnode.cpp
+++ b/src/hotspot/share/opto/mulnode.cpp
@@ -970,6 +970,43 @@ static int maskShiftAmount(PhaseGVN* phase, Node* shiftNode, int nBits) {
   return 0;
 }
 
+// Called with
+//    outer_shift = (_ << con0)
+// We are looking for the pattern:
+//   outer_shift = ((X << con1) << con0)
+//   we denote inner_shift the nested expression (X << con1)
+//
+// con0 and con1 are both in [0..nbits), as they are computed by maskShiftAmount.
+//
+// There are 2 cases:
+// if con0 + con1 >= nbits => 0
+// if con0 + con1 < nbits => X << (con1 + con0)
+static Node* collapse_nested_shift_left(PhaseGVN* phase, Node* outer_shift, int con0, BasicType bt) {
+  assert(bt == T_LONG || bt == T_INT, "Unexpected type");
+  int nbits = static_cast<int>(bits_per_java_integer(bt));
+  Node* inner_shift = outer_shift->in(1);
+  if (inner_shift->Opcode() != Op_LShift(bt)) {
+    return nullptr;
+  }
+
+  int con1 = maskShiftAmount(phase, inner_shift, nbits);
+  if (con1 == 0) { // Either non-const, or actually 0 (up to mask) and then delegated to Identity()
+    return nullptr;
+  }
+
+  if (con0 + con1 >= nbits) {
+    // While it might be tempting to use
+    // phase->zerocon(bt);
+    // it would be incorrect: zerocon caches nodes, while Ideal is only allowed
+    // to return a new node, this or nullptr, but not an old (cached) node.
+    return ConNode::make(TypeInteger::zero(bt));
+  }
+
+  // con0 + con1 < nbits ==> actual shift happens now
+  Node* con0_plus_con1 = phase->intcon(con0 + con1);
+  return LShiftNode::make(inner_shift->in(1), con0_plus_con1, bt);
+}
+
 //------------------------------Identity---------------------------------------
 Node* LShiftINode::Identity(PhaseGVN* phase) {
   int count = 0;
@@ -983,6 +1020,9 @@ Node* LShiftINode::Identity(PhaseGVN* phase) {
 //------------------------------Ideal------------------------------------------
 // If the right input is a constant, and the left input is an add of a
 // constant, flatten the tree: (X+con1)<<con0 ==> X<<con0 + con1<<con0
+//
+// Also collapse nested left-shifts with constant rhs:
+// (X << con1) << con2 ==> X << (con1 + con2)
 Node *LShiftINode::Ideal(PhaseGVN *phase, bool can_reshape) {
   int con = maskShiftAmount(phase, this, BitsPerJavaInteger);
   if (con == 0) {
@@ -1095,6 +1135,13 @@ Node *LShiftINode::Ideal(PhaseGVN *phase, bool can_reshape) {
       phase->type(add1->in(2)) == TypeInt::make( bits_mask ) )
     return new LShiftINode( add1->in(1), in(2) );
 
+  // Performs:
+  // (X << con1) << con2 ==> X << (con1 + con2)
+  Node* doubleShift = collapse_nested_shift_left(phase, this, con, T_INT);
+  if (doubleShift != nullptr) {
+    return doubleShift;
+  }
+
   return nullptr;
 }
 
@@ -1159,6 +1206,9 @@ Node* LShiftLNode::Identity(PhaseGVN* phase) {
 //------------------------------Ideal------------------------------------------
 // If the right input is a constant, and the left input is an add of a
 // constant, flatten the tree: (X+con1)<<con0 ==> X<<con0 + con1<<con0
+//
+// Also collapse nested left-shifts with constant rhs:
+// (X << con1) << con2 ==> X << (con1 + con2)
 Node *LShiftLNode::Ideal(PhaseGVN *phase, bool can_reshape) {
   int con = maskShiftAmount(phase, this, BitsPerJavaLong);
   if (con == 0) {
@@ -1271,6 +1321,13 @@ Node *LShiftLNode::Ideal(PhaseGVN *phase, bool can_reshape) {
       phase->type(add1->in(2)) == TypeLong::make( bits_mask ) )
     return new LShiftLNode( add1->in(1), in(2) );
 
+  // Performs:
+  // (X << con1) << con2 ==> X << (con1 + con2)
+  Node* doubleShift = collapse_nested_shift_left(phase, this, con, T_LONG);
+  if (doubleShift != nullptr) {
+    return doubleShift;
+  }
+
   return nullptr;
 }
 
diff --git a/src/hotspot/share/utilities/globalDefinitions.hpp b/src/hotspot/share/utilities/globalDefinitions.hpp
index 4dc8ebfef4a..95ebc77d1c9 100644
--- a/src/hotspot/share/utilities/globalDefinitions.hpp
+++ b/src/hotspot/share/utilities/globalDefinitions.hpp
@@ -797,6 +797,14 @@ inline jlong min_signed_integer(BasicType bt) {
   return min_jlong;
 }
 
+inline uint bits_per_java_integer(BasicType bt) {
+  if (bt == T_INT) {
+    return BitsPerJavaInteger;
+  }
+  assert(bt == T_LONG, "int or long only");
+  return BitsPerJavaLong;
+}
+
 // Auxiliary math routines
 // least common multiple
 extern size_t lcm(size_t a, size_t b);
diff --git a/test/hotspot/jtreg/compiler/c2/irTests/LShiftINodeIdealizationTests.java b/test/hotspot/jtreg/compiler/c2/irTests/LShiftINodeIdealizationTests.java
index b9e1590443c..0b2a87fb2c5 100644
--- a/test/hotspot/jtreg/compiler/c2/irTests/LShiftINodeIdealizationTests.java
+++ b/test/hotspot/jtreg/compiler/c2/irTests/LShiftINodeIdealizationTests.java
@@ -25,6 +25,8 @@ package compiler.c2.irTests;
 import jdk.test.lib.Asserts;
 import compiler.lib.ir_framework.*;
 
+import static compiler.lib.generators.Generators.G;
+
 /*
  * @test
  * @bug 8297384 8303238
@@ -33,11 +35,26 @@ import compiler.lib.ir_framework.*;
  * @run driver compiler.c2.irTests.LShiftINodeIdealizationTests
  */
 public class LShiftINodeIdealizationTests {
+    private static final int CON0 = G.ints().next();
+    private static final int CON1 = G.ints().next();
+
     public static void main(String[] args) {
         TestFramework.run();
     }
 
-    @Run(test = { "test1", "test2", "test3", "test4", "test5", "test6", "test7", "test8" })
+    @Run(test = {"test1", "test2", "test3", "test4", "test5", "test6", "test7", "test8",
+            "testDoubleShift1",
+            "testDoubleShift2",
+            "testDoubleShift3",
+            "testDoubleShift4",
+            "testDoubleShift5",
+            "testDoubleShift6",
+            "testDoubleShift7",
+            "testDoubleShift8",
+            "testDoubleShift9",
+            "testDoubleShiftSliceAndStore",
+            "testRandom",
+    })
     public void runMethod() {
         int a = RunInfo.getRandom().nextInt();
         int b = RunInfo.getRandom().nextInt();
@@ -66,6 +83,8 @@ public class LShiftINodeIdealizationTests {
         Asserts.assertEQ((a >>> 8) << 4, test6(a));
         Asserts.assertEQ(((a >> 4) & 0xFF) << 8, test7(a));
         Asserts.assertEQ(((a >>> 4) & 0xFF) << 8, test8(a));
+
+        assertDoubleShiftResult(a);
     }
 
     @Test
@@ -131,4 +150,121 @@ public class LShiftINodeIdealizationTests {
     public int test8(int x) {
         return ((x >>> 4) & 0xFF) << 8;
     }
+
+    @DontCompile
+    public void assertDoubleShiftResult(int a) {
+        Asserts.assertEQ((a << 2) << 3, testDoubleShift1(a));
+        Asserts.assertEQ(a << 5, testDoubleShift1(a));
+
+        Asserts.assertEQ(((a << 2) << 3) << 1, testDoubleShift2(a));
+        Asserts.assertEQ(a << 6, testDoubleShift2(a));
+
+        Asserts.assertEQ((a << 31) << 1, testDoubleShift3(a));
+        Asserts.assertEQ(0, testDoubleShift3(a));
+
+        Asserts.assertEQ((a << 1) << 31, testDoubleShift4(a));
+        Asserts.assertEQ(0, testDoubleShift4(a));
+
+        Asserts.assertEQ(((a << 30) << 1) << 1, testDoubleShift5(a));
+        Asserts.assertEQ(0, testDoubleShift5(a));
+
+        Asserts.assertEQ((a * 4) << 3, testDoubleShift6(a));
+        Asserts.assertEQ(a << 5, testDoubleShift6(a));
+
+        Asserts.assertEQ((a << 3) * 4, testDoubleShift7(a));
+        Asserts.assertEQ(a << 5, testDoubleShift7(a));
+
+        Asserts.assertEQ(a << 33, testDoubleShift8(a));
+        Asserts.assertEQ(a << 1, testDoubleShift8(a));
+
+        Asserts.assertEQ((a << 30) << 3, testDoubleShift9(a));
+        Asserts.assertEQ(0, testDoubleShift9(a));
+
+        short[] arr = new short[1];
+        arr[0] = (short)a;
+        Asserts.assertEQ((short)(a << 3), testDoubleShiftSliceAndStore(arr)[0]);
+
+        Asserts.assertEQ((a << CON0) << CON1, testRandom(a));
+    }
+
+    @Test
+    @IR(counts = {IRNode.LSHIFT, "1"})
+    // Checks (x << 2) << 3 => x << 5
+    public int testDoubleShift1(int x) {
+        return (x << 2) << 3;
+    }
+
+    @Test
+    @IR(counts = {IRNode.LSHIFT, "1"})
+    // Checks ((x << 2) << 3) << 1 => x << 6
+    public int testDoubleShift2(int x) {
+        return ((x << 2) << 3) << 1;
+    }
+
+    @Test
+    @IR(failOn = {IRNode.LSHIFT})
+    // Checks (x << 31) << 1 => 0
+    public int testDoubleShift3(int x) {
+        return (x << 31) << 1;
+    }
+
+    @Test
+    @IR(failOn = {IRNode.LSHIFT})
+    // Checks (x << 1) << 31 => 0
+    public int testDoubleShift4(int x) {
+        return (x << 1) << 31;
+    }
+
+    @Test
+    @IR(failOn = {IRNode.LSHIFT})
+    // Checks ((x << 30) << 1) << 1 => 0
+    public int testDoubleShift5(int x) {
+        return ((x << 30) << 1) << 1;
+    }
+
+    @Test
+    @IR(failOn = {IRNode.MUL})
+    @IR(counts = {IRNode.LSHIFT, "1"})
+    // Checks (x * 4) << 3 => x << 5
+    public int testDoubleShift6(int x) {
+        return (x * 4) << 3;
+    }
+
+    @Test
+    @IR(failOn = {IRNode.MUL})
+    @IR(counts = {IRNode.LSHIFT, "1"})
+    // Checks (x << 3) * 4 => x << 5
+    public int testDoubleShift7(int x) {
+        return (x << 3) * 4;
+    }
+
+    @Test
+    @IR(counts = {IRNode.LSHIFT, "1"})
+    // Checks x << 33 => x << 1
+    public int testDoubleShift8(int x) {
+        return x << 33;
+    }
+
+    @Test
+    @IR(failOn = {IRNode.LSHIFT})
+    // Checks (x << 30) << 3 => 0
+    public int testDoubleShift9(int x) {
+        return (x << 30) << 3;
+    }
+
+    @Test
+    @IR(failOn = {IRNode.MUL, IRNode.RSHIFT})
+    @IR(counts = {IRNode.LSHIFT, "1"})
+    // Checks (short) (a[0] << 3) => (((a[0] << 3) << 16) >> 16) => ((a[0] << 19) >> 16) => (a[0] << 3)
+    public short[] testDoubleShiftSliceAndStore(short[] a) {
+        short[] res = new short[1];
+        res[0] = (short) (a[0] << 3);
+        return res;
+    }
+
+    @Test
+    @IR(counts = {IRNode.LSHIFT, "<= 1"})
+    public int testRandom(int x) {
+        return (x << CON0) << CON1;
+    }
 }
diff --git a/test/hotspot/jtreg/compiler/c2/irTests/LShiftLNodeIdealizationTests.java b/test/hotspot/jtreg/compiler/c2/irTests/LShiftLNodeIdealizationTests.java
index 31a13edc6cb..11eb928d564 100644
--- a/test/hotspot/jtreg/compiler/c2/irTests/LShiftLNodeIdealizationTests.java
+++ b/test/hotspot/jtreg/compiler/c2/irTests/LShiftLNodeIdealizationTests.java
@@ -24,6 +24,7 @@ package compiler.c2.irTests;
 
 import jdk.test.lib.Asserts;
 import compiler.lib.ir_framework.*;
+import static compiler.lib.generators.Generators.G;
 
 /*
  * @test
@@ -33,11 +34,25 @@ import compiler.lib.ir_framework.*;
  * @run driver compiler.c2.irTests.LShiftLNodeIdealizationTests
  */
 public class LShiftLNodeIdealizationTests {
+    private static final long CON0 = G.longs().next();
+    private static final long CON1 = G.longs().next();
+
     public static void main(String[] args) {
         TestFramework.run();
     }
 
-    @Run(test = { "test3", "test4", "test5", "test6", "test7", "test8" })
+    @Run(test = {"test3", "test4", "test5", "test6", "test7", "test8",
+            "testDoubleShift1",
+            "testDoubleShift2",
+            "testDoubleShift3",
+            "testDoubleShift4",
+            "testDoubleShift5",
+            "testDoubleShift6",
+            "testDoubleShift7",
+            "testDoubleShift8",
+            "testDoubleShift9",
+            "testRandom",
+    })
     public void runMethod() {
         long a = RunInfo.getRandom().nextLong();
         long b = RunInfo.getRandom().nextLong();
@@ -64,6 +79,8 @@ public class LShiftLNodeIdealizationTests {
         Asserts.assertEQ((a >>> 8L) << 4L, test6(a));
         Asserts.assertEQ(((a >> 4L) & 0xFFL) << 8L, test7(a));
         Asserts.assertEQ(((a >>> 4L) & 0xFFL) << 8L, test8(a));
+
+        assertDoubleShiftResult(a);
     }
 
     @Test
@@ -113,4 +130,107 @@ public class LShiftLNodeIdealizationTests {
     public long test8(long x) {
         return ((x >>> 4L) & 0xFFL) << 8L;
     }
+
+    @DontCompile
+    public void assertDoubleShiftResult(long a) {
+        Asserts.assertEQ((a << 2L) << 3L, testDoubleShift1(a));
+        Asserts.assertEQ(a << 5L, testDoubleShift1(a));
+
+        Asserts.assertEQ(((a << 2L) << 3L) << 1L, testDoubleShift2(a));
+        Asserts.assertEQ(a << 6L, testDoubleShift2(a));
+
+        Asserts.assertEQ((a << 63L) << 1L, testDoubleShift3(a));
+        Asserts.assertEQ(0L, testDoubleShift3(a));
+
+        Asserts.assertEQ((a << 1L) << 63L, testDoubleShift4(a));
+        Asserts.assertEQ(0L, testDoubleShift4(a));
+
+        Asserts.assertEQ(((a << 62L) << 1L) << 1L, testDoubleShift5(a));
+        Asserts.assertEQ(0L, testDoubleShift5(a));
+
+        Asserts.assertEQ((a * 4L) << 3L, testDoubleShift6(a));
+        Asserts.assertEQ(a << 5L, testDoubleShift6(a));
+
+        Asserts.assertEQ((a << 3L) * 4L, testDoubleShift7(a));
+        Asserts.assertEQ(a << 5L, testDoubleShift7(a));
+
+        Asserts.assertEQ(a << 65L, testDoubleShift8(a));
+        Asserts.assertEQ(a << 1L, testDoubleShift8(a));
+
+        Asserts.assertEQ((a << 62L) << 3L, testDoubleShift9(a));
+        Asserts.assertEQ(0L, testDoubleShift9(a));
+
+        Asserts.assertEQ((a << CON0) << CON1, testRandom(a));
+    }
+
+    @Test
+    @IR(counts = {IRNode.LSHIFT, "1"})
+    // Checks (x << 2) << 3 => x << 5
+    public long testDoubleShift1(long x) {
+        return (x << 2L) << 3L;
+    }
+
+    @Test
+    @IR(counts = {IRNode.LSHIFT, "1"})
+    // Checks ((x << 2) << 3) << 1 => x << 6
+    public long testDoubleShift2(long x) {
+        return ((x << 2L) << 3L) << 1L;
+    }
+
+    @Test
+    @IR(failOn = {IRNode.LSHIFT})
+    // Checks (x << 63) << 1 => 0
+    public long testDoubleShift3(long x) {
+        return (x << 63L) << 1L;
+    }
+
+    @Test
+    @IR(failOn = {IRNode.LSHIFT})
+    // Checks (x << 1) << 63 => 0
+    public long testDoubleShift4(long x) {
+        return (x << 1L) << 63L;
+    }
+
+    @Test
+    @IR(failOn = {IRNode.LSHIFT})
+    // Checks ((x << 62) << 1) << 1 => 0
+    public long testDoubleShift5(long x) {
+        return ((x << 62L) << 1L) << 1L;
+    }
+
+    @Test
+    @IR(failOn = {IRNode.MUL})
+    @IR(counts = {IRNode.LSHIFT, "1"})
+    // Checks (x * 4) << 3 => x << 5
+    public long testDoubleShift6(long x) {
+        return (x * 4L) << 3L;
+    }
+
+    @Test
+    @IR(failOn = {IRNode.MUL})
+    @IR(counts = {IRNode.LSHIFT, "1"})
+    // Checks (x << 3) * 4 => x << 5
+    public long testDoubleShift7(long x) {
+        return (x << 3L) * 4L;
+    }
+
+    @Test
+    @IR(counts = {IRNode.LSHIFT, "1"})
+    // Checks x << 65 => x << 1
+    public long testDoubleShift8(long x) {
+        return x << 65L;
+    }
+
+    @Test
+    @IR(failOn = {IRNode.LSHIFT})
+    // Checks (x << 62) << 3 => 0
+    public long testDoubleShift9(long x) {
+        return (x << 62L) << 3L;
+    }
+
+    @Test
+    @IR(counts = {IRNode.LSHIFT, "<= 1"})
+    public long testRandom(long x) {
+        return (x << CON0) << CON1;
+    }
 }

From c002b97ee99c1889aa89e0a8853beafaf0969e9c Mon Sep 17 00:00:00 2001
From: Prasanta Sadhukhan <psadhukhan@openjdk.org>
Date: Tue, 25 Mar 2025 10:35:07 +0000
Subject: [PATCH 469/587] 8352676: Opensource JMenu tests - series1

Reviewed-by: azvegint
---
 test/jdk/javax/swing/JMenu/bug4140643.java | 107 +++++++++++++++++++++
 test/jdk/javax/swing/JMenu/bug4146588.java | 100 +++++++++++++++++++
 test/jdk/javax/swing/JMenu/bug4342646.java |  90 +++++++++++++++++
 3 files changed, 297 insertions(+)
 create mode 100644 test/jdk/javax/swing/JMenu/bug4140643.java
 create mode 100644 test/jdk/javax/swing/JMenu/bug4146588.java
 create mode 100644 test/jdk/javax/swing/JMenu/bug4342646.java

diff --git a/test/jdk/javax/swing/JMenu/bug4140643.java b/test/jdk/javax/swing/JMenu/bug4140643.java
new file mode 100644
index 00000000000..e9205dfcfc6
--- /dev/null
+++ b/test/jdk/javax/swing/JMenu/bug4140643.java
@@ -0,0 +1,107 @@
+/*
+ * Copyright (c) 2001, 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact 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 4140643
+ * @summary Tests that Motif menus open with both Alt-key and Meta-key
+ * @key headful
+ * @run main bug4140643
+ */
+
+import java.awt.Robot;
+import java.awt.event.KeyEvent;
+import javax.swing.JButton;
+import javax.swing.JFrame;
+import javax.swing.JMenu;
+import javax.swing.JMenuBar;
+import javax.swing.JMenuItem;
+import javax.swing.SwingUtilities;
+import javax.swing.UIManager;
+import javax.swing.UnsupportedLookAndFeelException;
+
+public class bug4140643 {
+    private static JFrame frame;
+    private static JMenu menu;
+    private static volatile boolean isPopMenuVisible;
+
+    public static void main(String[] args) throws Exception {
+        Robot robot = new Robot();
+        try {
+            SwingUtilities.invokeAndWait(() -> {
+                try {
+                    UIManager.setLookAndFeel(
+                        "com.sun.java.swing.plaf.motif.MotifLookAndFeel");
+                } catch (ClassNotFoundException | InstantiationException
+                        | UnsupportedLookAndFeelException
+                        | IllegalAccessException e) {
+                    throw new RuntimeException(e);
+                }
+                frame = new JFrame("bug4140643");
+
+                menu = new JMenu("File");
+                menu.setMnemonic(KeyEvent.VK_F);
+                menu.add(new JMenuItem("Open..."));
+                menu.add(new JMenuItem("Save"));
+
+                JMenuBar mbar = new JMenuBar();
+                mbar.add(menu);
+                frame.setJMenuBar(mbar);
+
+                frame.add(new JButton("Click Here"));
+                frame.pack();
+                frame.setLocationRelativeTo(null);
+                frame.setVisible(true);
+            });
+            robot.waitForIdle();
+            robot.delay(1000);
+            if (System.getProperty("os.name").contains("OS X")) {
+                robot.keyPress(KeyEvent.VK_CONTROL);
+                robot.keyPress(KeyEvent.VK_ALT);
+                robot.keyPress(KeyEvent.VK_F);
+                robot.keyRelease(KeyEvent.VK_F);
+                robot.keyRelease(KeyEvent.VK_ALT);
+                robot.keyRelease(KeyEvent.VK_CONTROL);
+            } else {
+                robot.keyPress(KeyEvent.VK_ALT);
+                robot.keyPress(KeyEvent.VK_F);
+                robot.keyRelease(KeyEvent.VK_F);
+                robot.keyRelease(KeyEvent.VK_ALT);
+            }
+            robot.waitForIdle();
+            robot.delay(1000);
+            SwingUtilities.invokeAndWait(() -> {
+                isPopMenuVisible = menu.isPopupMenuVisible();
+            });
+            if (!isPopMenuVisible) {
+                throw new RuntimeException("Menu popup is not shown");
+            }
+        } finally {
+            SwingUtilities.invokeAndWait(() -> {
+                if (frame != null) {
+                    frame.dispose();
+                }
+            });
+        }
+    }
+}
diff --git a/test/jdk/javax/swing/JMenu/bug4146588.java b/test/jdk/javax/swing/JMenu/bug4146588.java
new file mode 100644
index 00000000000..a27380daa23
--- /dev/null
+++ b/test/jdk/javax/swing/JMenu/bug4146588.java
@@ -0,0 +1,100 @@
+/*
+ * Copyright (c) 2001, 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact 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 4146588
+ * @summary JMenu.setMenuLocation has no effect
+ * @key headful
+ * @run main bug4146588
+ */
+
+import java.awt.Point;
+import java.awt.Rectangle;
+import java.awt.Robot;
+import javax.swing.JFrame;
+import javax.swing.JMenu;
+import javax.swing.JMenuBar;
+import javax.swing.SwingUtilities;
+
+public class bug4146588  {
+
+    private static JFrame fr;
+    private static JMenu menu;
+    private static volatile Point loc;
+    private static volatile Point popupLoc;
+    private static volatile Point menuLoc;
+    private static volatile Rectangle frameBounds;
+    private static volatile Rectangle popupBounds;
+
+    public static void main(String[] args) throws Exception {
+        Robot robot = new Robot();
+        try {
+            SwingUtilities.invokeAndWait(() -> {
+                fr = new JFrame("bug4146588 frame");
+
+                JMenuBar menubar = new JMenuBar();
+                menu = new JMenu("Menu");
+                menu.add("Item 1");
+                menu.add("Item 2");
+                menu.add("Item 3");
+                menu.setMenuLocation(150, 150);
+                menubar.add(menu);
+                fr.setJMenuBar(menubar);
+
+                fr.setSize(400, 400);
+                fr.setLocationRelativeTo(null);
+                fr.setVisible(true);
+            });
+            robot.waitForIdle();
+            robot.delay(1000);
+            SwingUtilities.invokeAndWait(() -> {
+                menu.doClick(0);
+            });
+            robot.waitForIdle();
+            robot.delay(200);
+            SwingUtilities.invokeAndWait(() -> {
+                popupLoc = menu.getPopupMenu().getLocationOnScreen();
+                menuLoc = menu.getLocationOnScreen();
+                frameBounds = fr.getBounds();
+                popupBounds = menu.getPopupMenu().getBounds();
+            });
+            System.out.println(popupLoc);
+            System.out.println(popupBounds);
+            System.out.println(frameBounds);
+            System.out.println(menuLoc);
+            if (!(popupLoc.getX()
+                 > ((frameBounds.getX() + frameBounds.getWidth() / 2) - popupBounds.getWidth()))
+                && (popupLoc.getY()
+                 > ((frameBounds.getY() + frameBounds.getHeight() / 2) - popupBounds.getHeight()))) {
+                throw new RuntimeException("popup is not at center of frame");
+            }
+        } finally {
+            SwingUtilities.invokeAndWait(() -> {
+                if (fr != null) {
+                    fr.dispose();
+                }
+            });
+        }
+    }
+}
diff --git a/test/jdk/javax/swing/JMenu/bug4342646.java b/test/jdk/javax/swing/JMenu/bug4342646.java
new file mode 100644
index 00000000000..610eb349bcf
--- /dev/null
+++ b/test/jdk/javax/swing/JMenu/bug4342646.java
@@ -0,0 +1,90 @@
+/*
+ * Copyright (c) 2001, 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact 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 4342646
+ * @summary Tests that very long menus are properly placed on the screen.
+ * @key headful
+ * @run main bug4342646
+ */
+
+import java.awt.Point;
+import java.awt.Robot;
+
+import javax.swing.JFrame;
+import javax.swing.JMenu;
+import javax.swing.JMenuBar;
+import javax.swing.JMenuItem;
+import javax.swing.SwingUtilities;
+
+public class bug4342646 {
+
+    private static JFrame frame;
+    private static JMenu menu;
+    private static volatile Point popupLoc;
+    private static volatile Point menuLoc;
+
+    public static void main(String[] args) throws Exception {
+        Robot robot = new Robot();
+        try {
+            SwingUtilities.invokeAndWait(() -> {
+                JMenuBar mbar = new JMenuBar();
+                menu = new JMenu("Menu");
+                menu.add(new JMenuItem(
+                         "AAAAAAAAAAAAAAAAAAAAAAAAAAAA" +
+                         "AAAAAAAAAAAAAAAAAAAAAAAAAAAAA" +
+                         "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" +
+                         "AAAAAAAAAAAAAAAAAAAAAAA"));
+                mbar.add(menu);
+
+                frame = new JFrame("4342646");
+                frame.setJMenuBar(mbar);
+                frame.setBounds(10, 10, 200, 100);
+                frame.setVisible(true);
+            });
+            robot.waitForIdle();
+            robot.delay(1000);
+            SwingUtilities.invokeAndWait(() -> {
+                menu.doClick();
+            });
+            robot.waitForIdle();
+            robot.delay(200);
+            SwingUtilities.invokeAndWait(() -> {
+                popupLoc = menu.getPopupMenu().getLocationOnScreen();
+                menuLoc = menu.getLocationOnScreen();
+            });
+            System.out.println(menuLoc);
+            System.out.println(popupLoc);
+            if (popupLoc.getX() < menuLoc.getX()) {
+                throw new RuntimeException("PopupMenu is incorrectly placed at left of menu");
+            }
+        } finally {
+            SwingUtilities.invokeAndWait(() -> {
+                if (frame != null) {
+                    frame.dispose();
+                }
+            });
+        }
+    }
+}

From 721ef76738a2145bdff9b8534d3512282c61db8b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Markus=20Gr=C3=B6nlund?= <mgronlun@openjdk.org>
Date: Tue, 25 Mar 2025 10:37:29 +0000
Subject: [PATCH 470/587] 8352696: JFR: assert(false): EA: missing memory path

Reviewed-by: thartmann, shade, kvn
---
 src/hotspot/share/opto/library_call.cpp       | 13 ++-
 .../jfr/jvm/TestJvmCommitIntrinsicAndEA.java  | 93 +++++++++++++++++++
 2 files changed, 99 insertions(+), 7 deletions(-)
 create mode 100644 test/jdk/jdk/jfr/jvm/TestJvmCommitIntrinsicAndEA.java

diff --git a/src/hotspot/share/opto/library_call.cpp b/src/hotspot/share/opto/library_call.cpp
index d5e33e7f9ed..9e98c9883f7 100644
--- a/src/hotspot/share/opto/library_call.cpp
+++ b/src/hotspot/share/opto/library_call.cpp
@@ -3154,7 +3154,8 @@ 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, MemNode::unordered);
+  store_to_memory(control(), notified_offset, _gvn.intcon(0), T_BOOLEAN, MemNode::unordered);
+  Node* notified_reset_memory = reset_memory();
 
   // 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));
@@ -3172,12 +3173,10 @@ bool LibraryCallKit::inline_native_jvm_commit() {
   Node* next_pos_X = _gvn.transform(ConvL2X(arg));
 
   // 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, MemNode::release);
-#else
-  commit_memory = store_to_memory(control(), java_buffer_pos_offset, next_pos_X, T_INT, MemNode::release);
-#endif
+  store_to_memory(control(), java_buffer_pos_offset, next_pos_X, LP64_ONLY(T_LONG) NOT_LP64(T_INT), MemNode::release);
+
+  Node* commit_memory = reset_memory();
+  set_all_memory(commit_memory);
 
   // 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.
   Node* java_buffer_flags_offset = _gvn.transform(new AddPNode(top(), java_buffer, _gvn.transform(MakeConX(in_bytes(JFR_BUFFER_FLAGS_OFFSET)))));
diff --git a/test/jdk/jdk/jfr/jvm/TestJvmCommitIntrinsicAndEA.java b/test/jdk/jdk/jfr/jvm/TestJvmCommitIntrinsicAndEA.java
new file mode 100644
index 00000000000..1983d18230a
--- /dev/null
+++ b/test/jdk/jdk/jfr/jvm/TestJvmCommitIntrinsicAndEA.java
@@ -0,0 +1,93 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please 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.jvm;
+
+import java.util.concurrent.Executor;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ThreadFactory;
+import java.util.concurrent.CountDownLatch;
+import jdk.jfr.consumer.RecordingStream;
+import jdk.test.lib.jfr.EventNames;
+
+/**
+ *
+ * A successful execution is when the JTREG test executes successfully,
+ * i.e., with no exceptions or JVM asserts.
+ *
+ * In JVM debug builds, C2 will assert as part of EscapeAnalysis and dump an hs_err<pid>.log:
+ *
+ * #
+ * # A fatal error has been detected by the Java Runtime Environment:
+ * #
+ * # Internal Error (..\open\src\hotspot\share\opto\escape.cpp:4788)
+ * # assert(false) failed: EA: missing memory path
+ *
+ * Current thread JavaThread "C2 CompilerThread2"
+ * Current CompileTask:
+ * C2:27036 1966 ! 4   java.lang.VirtualThread::run (173 bytes)
+ *
+ * ConnectionGraph::split_unique_types+0x2409 (escape.cpp:4788)
+ * ConnectionGraph::compute_escape+0x11e6 (escape.cpp:397)
+ * ConnectionGraph::do_analysis+0xf2 (escape.cpp:118)
+ * Compile::Optimize+0x85d (compile.cpp:2381)
+ * ...
+ *
+ * The error is because C2's Escape Analysis does not recognize a pattern
+ * where one input of memory Phi node is MergeMem node, and another is RAW store.
+ * This pattern is created by the jdk.jfr.internal.JVM.commit() intrinsic,
+ * which is inlined because of inlining the JFR event jdk.VirtualThreadStart.
+ *
+ * As a result, EA complains about a strange memory graph.
+ */
+
+/**
+ * @test
+ * @bug 8352696
+ * @requires vm.flagless & vm.hasJFR & vm.debug
+ * @library /test/lib /test/jdk
+ * @run main/othervm -Xbatch jdk.jfr.jvm.TestJvmCommitIntrinsicAndEA
+ */
+public final class TestJvmCommitIntrinsicAndEA {
+    private static final int NUM_TASKS = 10_000;
+
+    public static void main(String[] args) throws Throwable {
+        CountDownLatch latch = new CountDownLatch(NUM_TASKS);
+
+        try (RecordingStream rs = new RecordingStream()) {
+            rs.enable(EventNames.VirtualThreadStart).withoutStackTrace();
+            rs.enable(EventNames.VirtualThreadEnd).withoutStackTrace();
+            rs.onEvent(EventNames.VirtualThreadEnd, e -> latch.countDown());
+            rs.startAsync();
+            // Execute NUM_TASKS, each in their own virtual thread.
+            ThreadFactory factory = Thread.ofVirtual().factory();
+            try (var executor = Executors.newThreadPerTaskExecutor(factory)) {
+                for (int i = 0; i < NUM_TASKS; i++) {
+                    executor.submit(() -> { });
+                }
+            }
+            latch.await();
+        }
+    }
+}

From 512b9b16e009fc550afaf9aefdb912c9495ed50a Mon Sep 17 00:00:00 2001
From: Magnus Ihse Bursie <ihse@openjdk.org>
Date: Tue, 25 Mar 2025 10:56:52 +0000
Subject: [PATCH 471/587] 8196896: Use SYSROOT_CFLAGS in dtrace gensrc

Reviewed-by: erikj
---
 make/hotspot/gensrc/GensrcDtrace.gmk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/make/hotspot/gensrc/GensrcDtrace.gmk b/make/hotspot/gensrc/GensrcDtrace.gmk
index fd243ea8269..e71c3cb961d 100644
--- a/make/hotspot/gensrc/GensrcDtrace.gmk
+++ b/make/hotspot/gensrc/GensrcDtrace.gmk
@@ -47,7 +47,7 @@ ifeq ($(call check-jvm-feature, dtrace), true)
 	$(call LogInfo, Generating dtrace header file $(@F))
 	$(call MakeDir, $(@D) $(DTRACE_SUPPORT_DIR))
 	$(call ExecuteWithLog, $(DTRACE_SUPPORT_DIR)/$(@F).d, \
-	    ($(CPP) $(DTRACE_CPP_FLAGS) $< > $(DTRACE_SUPPORT_DIR)/$(@F).d))
+	    ($(CPP) $(DTRACE_CPP_FLAGS) $(SYSROOT_CFLAGS) $< > $(DTRACE_SUPPORT_DIR)/$(@F).d))
 	$(call ExecuteWithLog, $@, $(DTRACE) $(DTRACE_FLAGS) -h -o $@ -s $(DTRACE_SUPPORT_DIR)/$(@F).d)
 
   # Process all .d files in DTRACE_SOURCE_DIR. They are:

From bab93729c26907dc51d15dbb5651f860f0cb58ab Mon Sep 17 00:00:00 2001
From: Magnus Ihse Bursie <ihse@openjdk.org>
Date: Tue, 25 Mar 2025 10:58:10 +0000
Subject: [PATCH 472/587] 8352618: Remove old deprecated functionality in the
 build system

Reviewed-by: erikj, kbarrett, jwaters
---
 make/PreInit.gmk              |  1 -
 make/PreInitSupport.gmk       | 12 ------------
 make/RunTestsPrebuilt.gmk     |  3 +--
 make/autoconf/basic.m4        |  3 ---
 make/autoconf/configure.ac    |  6 +-----
 make/autoconf/help.m4         | 10 +---------
 make/autoconf/jdk-options.m4  | 21 ---------------------
 make/autoconf/jvm-features.m4 |  7 +++----
 make/autoconf/util.m4         |  2 +-
 make/common/LogUtils.gmk      |  6 ------
 10 files changed, 7 insertions(+), 64 deletions(-)

diff --git a/make/PreInit.gmk b/make/PreInit.gmk
index b4c0402da3d..b70e15a3b8c 100644
--- a/make/PreInit.gmk
+++ b/make/PreInit.gmk
@@ -75,7 +75,6 @@ ifneq ($(SKIP_SPEC), true)
 
   # Basic checks on environment and command line.
   $(eval $(call CheckControlVariables))
-  $(eval $(call CheckDeprecatedEnvironment))
   $(eval $(call CheckInvalidMakeFlags))
 
   # Check that CONF_CHECK is valid.
diff --git a/make/PreInitSupport.gmk b/make/PreInitSupport.gmk
index c3741589330..66bcbd2209c 100644
--- a/make/PreInitSupport.gmk
+++ b/make/PreInitSupport.gmk
@@ -94,18 +94,6 @@ define CheckControlVariables
   endif
 endef
 
-# Check for deprecated ALT_ variables
-define CheckDeprecatedEnvironment
-  defined_alt_variables := $$(filter ALT_%, $$(.VARIABLES))
-  ifneq ($$(defined_alt_variables), )
-    $$(info Warning: You have the following ALT_ variables set:)
-    $$(foreach var, $$(defined_alt_variables), $$(info * $$(var)=$$($$(var))))
-    $$(info ALT_ variables are deprecated, and may result in a failed build.)
-    $$(info Please clean your environment.)
-    $$(info )
-  endif
-endef
-
 # Check for invalid make flags like -j
 define CheckInvalidMakeFlags
   # This is a trick to get this rule to execute before any other rules
diff --git a/make/RunTestsPrebuilt.gmk b/make/RunTestsPrebuilt.gmk
index 1ca22276c75..ea38e73d49c 100644
--- a/make/RunTestsPrebuilt.gmk
+++ b/make/RunTestsPrebuilt.gmk
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -140,7 +140,6 @@ $(eval $(call SetupVariable,JIB_JAR,OPTIONAL))
 include $(TOPDIR)/make/PreInitSupport.gmk
 include $(TOPDIR)/make/common/LogUtils.gmk
 
-$(eval $(call CheckDeprecatedEnvironment))
 $(eval $(call CheckInvalidMakeFlags))
 $(eval $(call ParseLogLevel))
 
diff --git a/make/autoconf/basic.m4 b/make/autoconf/basic.m4
index de3613e1cc2..19e6641b94d 100644
--- a/make/autoconf/basic.m4
+++ b/make/autoconf/basic.m4
@@ -549,9 +549,6 @@ AC_DEFUN_ONCE([BASIC_TEST_USABILITY_ISSUES],
 
   BASIC_CHECK_SRC_PERMS
 
-  # Check if the user has any old-style ALT_ variables set.
-  FOUND_ALT_VARIABLES=`env | grep ^ALT_`
-
   # Before generating output files, test if they exist. If they do, this is a reconfigure.
   # Since we can't properly handle the dependencies for this, warn the user about the situation
   if test -e $OUTPUTDIR/spec.gmk; then
diff --git a/make/autoconf/configure.ac b/make/autoconf/configure.ac
index 66809127a75..9eeded48fed 100644
--- a/make/autoconf/configure.ac
+++ b/make/autoconf/configure.ac
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
 # 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,9 +174,6 @@ SRCDIRS_SETUP_IMPORT_MODULES
 #
 ################################################################################
 
-# See if we are doing a complete static build or not
-JDKOPT_SETUP_STATIC_BUILD
-
 # First determine the toolchain type (compiler family)
 TOOLCHAIN_DETERMINE_TOOLCHAIN_TYPE
 
@@ -259,7 +256,6 @@ LIB_TESTS_ENABLE_DISABLE_JTREG_TEST_THREAD_FACTORY
 
 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
diff --git a/make/autoconf/help.m4 b/make/autoconf/help.m4
index 4d1b3c37bbb..400acf11a63 100644
--- a/make/autoconf/help.m4
+++ b/make/autoconf/help.m4
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2022, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -341,14 +341,6 @@ AC_DEFUN_ONCE([HELP_PRINT_SUMMARY_AND_WARNINGS],
     printf "\n"
   fi
 
-  if test "x$FOUND_ALT_VARIABLES" != "x"; then
-    printf "WARNING: You have old-style ALT_ environment variables set.\n"
-    printf "These are not respected, and will be ignored. It is recommended\n"
-    printf "that you clean your environment. The following variables are set:\n"
-    printf "$FOUND_ALT_VARIABLES\n"
-    printf "\n"
-  fi
-
   if test "x$OUTPUT_DIR_IS_LOCAL" != "xyes"; then
     printf "WARNING: Your build output directory is not on a local disk.\n"
     printf "This will severely degrade build performance!\n"
diff --git a/make/autoconf/jdk-options.m4 b/make/autoconf/jdk-options.m4
index 991f57505dc..f8ce5392df9 100644
--- a/make/autoconf/jdk-options.m4
+++ b/make/autoconf/jdk-options.m4
@@ -554,16 +554,6 @@ AC_DEFUN_ONCE([JDKOPT_SETUP_UNDEFINED_BEHAVIOR_SANITIZER],
   AC_SUBST(UBSAN_ENABLED)
 ])
 
-################################################################################
-#
-# Static build support.  When enabled will generate static
-# libraries instead of shared libraries for all JDK libs.
-#
-AC_DEFUN_ONCE([JDKOPT_SETUP_STATIC_BUILD],
-[
-  UTIL_DEPRECATED_ARG_ENABLE(static-build)
-])
-
 ################################################################################
 #
 # jmod options.
@@ -671,15 +661,6 @@ AC_DEFUN([JDKOPT_EXCLUDE_TRANSLATIONS],
   AC_SUBST(EXCLUDE_TRANSLATIONS)
 ])
 
-################################################################################
-#
-# Optionally disable man pages (deprecated)
-#
-AC_DEFUN([JDKOPT_ENABLE_DISABLE_MANPAGES],
-[
-  UTIL_DEPRECATED_ARG_ENABLE(manpages)
-])
-
 ################################################################################
 #
 # Disable the default CDS archive generation
@@ -866,8 +847,6 @@ AC_DEFUN_ONCE([JDKOPT_SETUP_REPRODUCIBLE_BUILD],
   AC_SUBST(SOURCE_DATE)
   AC_SUBST(ISO_8601_FORMAT_STRING)
   AC_SUBST(SOURCE_DATE_ISO_8601)
-
-  UTIL_DEPRECATED_ARG_ENABLE(reproducible-build)
 ])
 
 ################################################################################
diff --git a/make/autoconf/jvm-features.m4 b/make/autoconf/jvm-features.m4
index 9695644bafe..668de019469 100644
--- a/make/autoconf/jvm-features.m4
+++ b/make/autoconf/jvm-features.m4
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
 # 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,8 @@ m4_define(jvm_features_valid, m4_normalize( \
 ))
 
 # Deprecated JVM features (these are ignored, but with a warning)
-m4_define(jvm_features_deprecated, m4_normalize(
-    cmsgc trace \
-))
+# This list is empty at the moment.
+m4_define(jvm_features_deprecated, m4_normalize( ))
 
 # Feature descriptions
 m4_define(jvm_feature_desc_cds, [enable class data sharing (CDS)])
diff --git a/make/autoconf/util.m4 b/make/autoconf/util.m4
index aa9662e2100..4d98d06355a 100644
--- a/make/autoconf/util.m4
+++ b/make/autoconf/util.m4
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
 # 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/make/common/LogUtils.gmk b/make/common/LogUtils.gmk
index b32f6179ac7..50969733320 100644
--- a/make/common/LogUtils.gmk
+++ b/make/common/LogUtils.gmk
@@ -64,12 +64,6 @@ define ParseLogValue
 endef
 
 define ParseLogLevel
-  # Catch old-style VERBOSE= command lines.
-  ifneq ($$(origin VERBOSE), undefined)
-    $$(info Error: VERBOSE is deprecated. Use LOG=<warn|info|debug|trace> instead.)
-    $$(error Cannot continue)
-  endif
-
   # Setup logging according to LOG
 
   # If "nofile" is present, do not log to a file

From 67c4405250f93a1188c03bf336db160f77a10c7f Mon Sep 17 00:00:00 2001
From: Tobias Hartmann <thartmann@openjdk.org>
Date: Tue, 25 Mar 2025 11:52:54 +0000
Subject: [PATCH 473/587] 8352866: TestLogJIT.java runs wrong test class

Reviewed-by: rcastanedalo, chagedorn
---
 test/hotspot/jtreg/compiler/arguments/TestLogJIT.java         | 2 +-
 test/hotspot/jtreg/compiler/c2/Test7005594.java               | 4 ++--
 .../loopopts/TestMissingSkeletonPredicateForIfNode.java       | 2 +-
 .../compiler/loopopts/superword/TestSearchAlignment.java      | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/test/hotspot/jtreg/compiler/arguments/TestLogJIT.java b/test/hotspot/jtreg/compiler/arguments/TestLogJIT.java
index afafe17523c..dbbd6dcfdc5 100644
--- a/test/hotspot/jtreg/compiler/arguments/TestLogJIT.java
+++ b/test/hotspot/jtreg/compiler/arguments/TestLogJIT.java
@@ -24,7 +24,7 @@
 /*
  * @test
  * @summary Test running with log:jit*=debug enabled.
- * @run main/othervm -Xlog:jit*=debug compiler.arguments.TestTraceTypeProfile
+ * @run main/othervm -Xlog:jit*=debug compiler.arguments.TestLogJIT
  */
 
 package compiler.arguments;
diff --git a/test/hotspot/jtreg/compiler/c2/Test7005594.java b/test/hotspot/jtreg/compiler/c2/Test7005594.java
index 1b2d6d73caf..005bc12142e 100644
--- a/test/hotspot/jtreg/compiler/c2/Test7005594.java
+++ b/test/hotspot/jtreg/compiler/c2/Test7005594.java
@@ -27,8 +27,8 @@
  * @summary Array overflow not handled correctly with loop optimzations
  *
  * @run main/othervm -Xcomp
-                     -XX:CompileOnly=compiler.c2.Test7005594::test
-                     compiler.c2.Test7005594
+ *                   -XX:CompileOnly=compiler.c2.Test7005594::test
+ *                   compiler.c2.Test7005594
  */
 
 package compiler.c2;
diff --git a/test/hotspot/jtreg/compiler/loopopts/TestMissingSkeletonPredicateForIfNode.java b/test/hotspot/jtreg/compiler/loopopts/TestMissingSkeletonPredicateForIfNode.java
index debc4a3890b..096abe015b3 100644
--- a/test/hotspot/jtreg/compiler/loopopts/TestMissingSkeletonPredicateForIfNode.java
+++ b/test/hotspot/jtreg/compiler/loopopts/TestMissingSkeletonPredicateForIfNode.java
@@ -28,7 +28,7 @@
  *          predicate is created in loop predication.
  * @requires vm.debug == true & vm.compiler2.enabled
  * @run main/othervm -XX:-TieredCompilation -Xbatch -XX:-RangeCheckElimination -XX:+BailoutToInterpreterForThrows
-                     compiler.loopopts.TestMissingSkeletonPredicateForIfNode
+ *                   compiler.loopopts.TestMissingSkeletonPredicateForIfNode
  */
 package compiler.loopopts;
 
diff --git a/test/hotspot/jtreg/compiler/loopopts/superword/TestSearchAlignment.java b/test/hotspot/jtreg/compiler/loopopts/superword/TestSearchAlignment.java
index 5242adb43b5..1ecaf6a2e15 100644
--- a/test/hotspot/jtreg/compiler/loopopts/superword/TestSearchAlignment.java
+++ b/test/hotspot/jtreg/compiler/loopopts/superword/TestSearchAlignment.java
@@ -27,7 +27,7 @@
  * @summary JVM crash in SWPointer during C2 compilation
  *
  * @run main/othervm -XX:-TieredCompilation -XX:-BackgroundCompilation -XX:-UseOnStackReplacement
-        -XX:CompileCommand=compileonly,compiler.loopopts.superword.TestSearchAlignment::vMeth
+ *      -XX:CompileCommand=compileonly,compiler.loopopts.superword.TestSearchAlignment::vMeth
  *      compiler.loopopts.superword.TestSearchAlignment
  */
 

From c953e0ede17aed9b80a637f1ffce90b2ea54ae21 Mon Sep 17 00:00:00 2001
From: Christian Hagedorn <chagedorn@openjdk.org>
Date: Tue, 25 Mar 2025 11:58:28 +0000
Subject: [PATCH 474/587] 8350579: Remove Template Assertion Predicates
 belonging to a loop once it is folded away

Reviewed-by: epeter, roland
---
 src/hotspot/share/opto/loopTransform.cpp      |  25 +-
 src/hotspot/share/opto/loopUnswitch.cpp       |  14 +-
 src/hotspot/share/opto/loopnode.hpp           |   2 +-
 src/hotspot/share/opto/opaquenode.cpp         |   7 +-
 src/hotspot/share/opto/opaquenode.hpp         |  14 +-
 src/hotspot/share/opto/predicates.cpp         | 197 +++++---
 src/hotspot/share/opto/predicates.hpp         |  47 +-
 src/hotspot/share/opto/split_if.cpp           |   7 +-
 .../assertion/TestAssertionPredicates.java    | 471 ++++++++++++++++++
 9 files changed, 656 insertions(+), 128 deletions(-)
 create mode 100644 test/hotspot/jtreg/compiler/predicates/assertion/TestAssertionPredicates.java

diff --git a/src/hotspot/share/opto/loopTransform.cpp b/src/hotspot/share/opto/loopTransform.cpp
index 9f3c4e2b152..f0cca35d0bd 100644
--- a/src/hotspot/share/opto/loopTransform.cpp
+++ b/src/hotspot/share/opto/loopTransform.cpp
@@ -1699,17 +1699,16 @@ 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(CountedLoopNode* main_loop_head) {
-  Node* init = main_loop_head->init_trip();
-
+void PhaseIdealLoop::update_main_loop_assertion_predicates(CountedLoopNode* new_main_loop_head,
+                                                           const int stride_con_before_unroll) {
   // 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 unrolled_stride_con = main_loop_head->stride_con() * 2;
+  int unrolled_stride_con = stride_con_before_unroll * 2;
   Node* unrolled_stride = intcon(unrolled_stride_con);
 
-  Node* loop_entry = main_loop_head->skip_strip_mined()->in(LoopNode::EntryControl);
+  Node* loop_entry = new_main_loop_head->skip_strip_mined()->in(LoopNode::EntryControl);
   PredicateIterator predicate_iterator(loop_entry);
-  UpdateStrideForAssertionPredicates update_stride_for_assertion_predicates(unrolled_stride, this);
+  UpdateStrideForAssertionPredicates update_stride_for_assertion_predicates(unrolled_stride, new_main_loop_head, this);
   predicate_iterator.for_each(update_stride_for_assertion_predicates);
 }
 
@@ -1748,9 +1747,9 @@ void PhaseIdealLoop::initialize_assertion_predicates_for_post_loop(CountedLoopNo
 }
 
 void PhaseIdealLoop::create_assertion_predicates_at_loop(CountedLoopNode* source_loop_head,
-                                                          CountedLoopNode* target_loop_head,
-                                                          const NodeInLoopBody& _node_in_loop_body,
-                                                          const bool clone_template) {
+                                                         CountedLoopNode* target_loop_head,
+                                                         const NodeInLoopBody& _node_in_loop_body,
+                                                         const bool clone_template) {
   CreateAssertionPredicatesVisitor create_assertion_predicates_visitor(target_loop_head, this, _node_in_loop_body,
                                                                        clone_template);
   Node* source_loop_entry = source_loop_head->skip_strip_mined()->in(LoopNode::EntryControl);
@@ -1854,15 +1853,13 @@ void PhaseIdealLoop::do_unroll(IdealLoopTree *loop, Node_List &old_new, bool adj
   C->set_major_progress();
 
   Node* new_limit = nullptr;
-  int stride_con = stride->get_int();
+  const int stride_con = stride->get_int();
   int stride_p = (stride_con > 0) ? stride_con : -stride_con;
   uint old_trip_count = loop_head->trip_count();
   // Verify that unroll policy result is still valid.
   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(loop_head);
-
   // Adjust loop limit to keep valid iterations number after unroll.
   // Use (limit - stride) instead of (((limit - init)/stride) & (-2))*stride
   // which may overflow.
@@ -1996,7 +1993,7 @@ void PhaseIdealLoop::do_unroll(IdealLoopTree *loop, Node_List &old_new, bool adj
       phi   ->set_req(LoopNode::LoopBackControl, C->top());
     }
   }
-  Node *clone_head = old_new[loop_head->_idx];
+  CountedLoopNode* clone_head = old_new[loop_head->_idx]->as_CountedLoop();
   _igvn.hash_delete(clone_head);
   loop_head ->set_req(LoopNode::   EntryControl, clone_head->in(LoopNode::LoopBackControl));
   clone_head->set_req(LoopNode::LoopBackControl, loop_head ->in(LoopNode::LoopBackControl));
@@ -2025,6 +2022,8 @@ void PhaseIdealLoop::do_unroll(IdealLoopTree *loop, Node_List &old_new, bool adj
   loop->record_for_igvn();
   loop_head->clear_strip_mined();
 
+  update_main_loop_assertion_predicates(clone_head, stride_con);
+
 #ifndef PRODUCT
   if (C->do_vector_loop() && (PrintOpto && (VerifyLoopOptimizations || TraceLoopOpts))) {
     tty->print("\nnew loop after unroll\n");       loop->dump_head();
diff --git a/src/hotspot/share/opto/loopUnswitch.cpp b/src/hotspot/share/opto/loopUnswitch.cpp
index 051aa59ca71..a8d9a5d740b 100644
--- a/src/hotspot/share/opto/loopUnswitch.cpp
+++ b/src/hotspot/share/opto/loopUnswitch.cpp
@@ -279,14 +279,16 @@ class UnswitchedLoopSelector : public StackObj {
 // Class to unswitch the original loop and create Predicates at the new unswitched loop versions. The newly cloned loop
 // becomes the false-path-loop while original loop becomes the true-path-loop.
 class OriginalLoop : public StackObj {
-  LoopNode* const _loop_head; // OuterStripMinedLoopNode if loop strip mined, else just the loop head.
+  LoopNode* const _loop_head;
+  LoopNode* const _outer_loop_head; // OuterStripMinedLoopNode if loop strip mined, else just the loop head.
   IdealLoopTree* const _loop;
   Node_List& _old_new;
   PhaseIdealLoop* const _phase;
 
  public:
   OriginalLoop(IdealLoopTree* loop, Node_List& old_new)
-      : _loop_head(loop->_head->as_Loop()->skip_strip_mined()),
+      : _loop_head(loop->_head->as_Loop()),
+        _outer_loop_head(loop->_head->as_Loop()->skip_strip_mined()),
         _loop(loop),
         _old_new(old_new),
         _phase(loop->_phase) {}
@@ -314,14 +316,14 @@ class OriginalLoop : public StackObj {
 
  private:
   void clone_loop(const LoopSelector& loop_selector) {
-    _phase->clone_loop(_loop, _old_new, _phase->dom_depth(_loop_head),
+    _phase->clone_loop(_loop, _old_new, _phase->dom_depth(_outer_loop_head),
                        PhaseIdealLoop::CloneIncludesStripMined, loop_selector.selector());
     fix_loop_entries(loop_selector);
   }
 
-  void fix_loop_entries(const LoopSelector& loop_selector) {
-    _phase->replace_loop_entry(_loop_head, loop_selector.true_path_loop_proj());
-    LoopNode* false_path_loop_strip_mined_head = old_to_new(_loop_head)->as_Loop();
+  void fix_loop_entries(const LoopSelector& loop_selector) const {
+    _phase->replace_loop_entry(_outer_loop_head, loop_selector.true_path_loop_proj());
+    LoopNode* false_path_loop_strip_mined_head = old_to_new(_outer_loop_head)->as_Loop();
     _phase->replace_loop_entry(false_path_loop_strip_mined_head,
                                loop_selector.false_path_loop_proj());
   }
diff --git a/src/hotspot/share/opto/loopnode.hpp b/src/hotspot/share/opto/loopnode.hpp
index f2ef38c5b67..b21f2f0348b 100644
--- a/src/hotspot/share/opto/loopnode.hpp
+++ b/src/hotspot/share/opto/loopnode.hpp
@@ -979,7 +979,7 @@ private:
  private:
   static void get_opaque_template_assertion_predicate_nodes(ParsePredicateSuccessProj* parse_predicate_proj,
                                                             Unique_Node_List& list);
-  void update_main_loop_assertion_predicates(CountedLoopNode* main_loop_head);
+  void update_main_loop_assertion_predicates(CountedLoopNode* new_main_loop_head, int stride_con_before_unroll);
   void initialize_assertion_predicates_for_peeled_loop(CountedLoopNode* peeled_loop_head,
                                                        CountedLoopNode* remaining_loop_head,
                                                        uint first_node_index_in_cloned_loop_body,
diff --git a/src/hotspot/share/opto/opaquenode.cpp b/src/hotspot/share/opto/opaquenode.cpp
index f6ef79a5379..29d625db190 100644
--- a/src/hotspot/share/opto/opaquenode.cpp
+++ b/src/hotspot/share/opto/opaquenode.cpp
@@ -112,8 +112,10 @@ const Type* OpaqueNotNullNode::Value(PhaseGVN* phase) const {
   return phase->type(in(1));
 }
 
-OpaqueTemplateAssertionPredicateNode::OpaqueTemplateAssertionPredicateNode(BoolNode* bol): Node(nullptr, bol),
-  _predicate_state(PredicateState::Useful) {
+OpaqueTemplateAssertionPredicateNode::OpaqueTemplateAssertionPredicateNode(BoolNode* bol,  CountedLoopNode* loop_node)
+    : Node(nullptr, bol),
+      _loop_node(loop_node),
+      _predicate_state(PredicateState::Useful) {
   init_class_id(Class_OpaqueTemplateAssertionPredicate);
 }
 
@@ -148,6 +150,7 @@ void OpaqueTemplateAssertionPredicateNode::mark_useless(PhaseIterGVN& igvn) {
 
 #ifndef PRODUCT
 void OpaqueTemplateAssertionPredicateNode::dump_spec(outputStream* st) const {
+  st->print("loop_idx=%d ", _loop_node->_idx);
   if (is_useless()) {
     st->print("#useless ");
   }
diff --git a/src/hotspot/share/opto/opaquenode.hpp b/src/hotspot/share/opto/opaquenode.hpp
index b15bebda636..d3cbbcfafbe 100644
--- a/src/hotspot/share/opto/opaquenode.hpp
+++ b/src/hotspot/share/opto/opaquenode.hpp
@@ -152,6 +152,9 @@ class OpaqueNotNullNode : public Node {
 // OpaqueTemplateAssertionPredicateNode is replaced by true in order to fold the Template Assertion Predicate away.
 class OpaqueTemplateAssertionPredicateNode : public Node {
 
+  // The counted loop this Template Assertion Predicate is associated with.
+  CountedLoopNode* _loop_node;
+
   // When splitting a loop or when the associated loop dies, the Template Assertion Predicate with this
   // OpaqueTemplateAssertionPredicateNode also needs to be removed. We set this flag and then clean this node up in the
   // next IGVN phase by checking this flag in Value().
@@ -164,7 +167,7 @@ class OpaqueTemplateAssertionPredicateNode : public Node {
   }
 
  public:
-  OpaqueTemplateAssertionPredicateNode(BoolNode* bol);
+  OpaqueTemplateAssertionPredicateNode(BoolNode* bol, CountedLoopNode* loop_node);
 
   virtual int Opcode() const;
   virtual uint size_of() const { return sizeof(*this); }
@@ -172,6 +175,15 @@ class OpaqueTemplateAssertionPredicateNode : public Node {
   virtual const Type* Value(PhaseGVN* phase) const;
   virtual const Type* bottom_type() const { return TypeInt::BOOL; }
 
+  CountedLoopNode* loop_node() const {
+    return _loop_node;
+  }
+
+  // Should only be called during Loop Unrolling when we only update the OpaqueLoopStride input but don't require a full
+  // clone of the Template Assertion Expression.
+  void update_loop_node(CountedLoopNode* loop_node) {
+    _loop_node = loop_node;
+  }
 
   bool is_useless() const {
     return _predicate_state == PredicateState::Useless;
diff --git a/src/hotspot/share/opto/predicates.cpp b/src/hotspot/share/opto/predicates.cpp
index 03d369f7af0..52139335305 100644
--- a/src/hotspot/share/opto/predicates.cpp
+++ b/src/hotspot/share/opto/predicates.cpp
@@ -179,10 +179,11 @@ bool TemplateAssertionPredicate::is_predicate(const Node* maybe_success_proj) {
 }
 
 // Clone this Template Assertion Predicate without modifying any OpaqueLoop*Node inputs.
-TemplateAssertionPredicate TemplateAssertionPredicate::clone(Node* new_control, PhaseIdealLoop* phase) const {
+TemplateAssertionPredicate TemplateAssertionPredicate::clone(Node* new_control, CountedLoopNode* new_loop_node,
+                                                             PhaseIdealLoop* phase) const {
   DEBUG_ONLY(verify();)
-  TemplateAssertionExpression template_assertion_expression(opaque_node());
-  OpaqueTemplateAssertionPredicateNode* new_opaque_node = template_assertion_expression.clone(new_control, phase);
+  TemplateAssertionExpression template_assertion_expression(opaque_node(), phase);
+  OpaqueTemplateAssertionPredicateNode* new_opaque_node = template_assertion_expression.clone(new_control, new_loop_node);
   AssertionPredicateIfCreator assertion_predicate_if_creator(phase);
   IfTrueNode* success_proj = assertion_predicate_if_creator.create_for_template(new_control, _if_node->Opcode(),
                                                                                 new_opaque_node,
@@ -195,13 +196,14 @@ TemplateAssertionPredicate TemplateAssertionPredicate::clone(Node* new_control,
 // Clone this Template Assertion Predicate and use a newly created OpaqueLoopInitNode with 'new_opaque_input' as input.
 TemplateAssertionPredicate TemplateAssertionPredicate::clone_and_replace_opaque_input(Node* new_control,
                                                                                       Node* new_opaque_input,
+                                                                                      CountedLoopNode* new_loop_node,
                                                                                       PhaseIdealLoop* phase) const {
   DEBUG_ONLY(verify();)
   OpaqueLoopInitNode* new_opaque_init = new OpaqueLoopInitNode(phase->C, new_opaque_input);
   phase->register_new_node(new_opaque_init, new_control);
-  TemplateAssertionExpression template_assertion_expression(opaque_node());
+  TemplateAssertionExpression template_assertion_expression(opaque_node(), phase);
   OpaqueTemplateAssertionPredicateNode* new_opaque_node =
-      template_assertion_expression.clone_and_replace_init(new_control, new_opaque_init, phase);
+      template_assertion_expression.clone_and_replace_init(new_control, new_opaque_init, new_loop_node);
   AssertionPredicateIfCreator assertion_predicate_if_creator(phase);
   IfTrueNode* success_proj = assertion_predicate_if_creator.create_for_template(new_control, _if_node->Opcode(),
                                                                                 new_opaque_node,
@@ -211,11 +213,41 @@ TemplateAssertionPredicate TemplateAssertionPredicate::clone_and_replace_opaque_
   return cloned_template_assertion_predicate;
 }
 
+// This class is used to replace the input to OpaqueLoopStrideNode with a new node while leaving the other nodes
+// unchanged.
+class ReplaceOpaqueStrideInput : public BFSActions {
+  Node* _new_opaque_stride_input;
+  PhaseIterGVN& _igvn;
+
+  public:
+  ReplaceOpaqueStrideInput(Node* new_opaque_stride_input, PhaseIterGVN& igvn)
+      : _new_opaque_stride_input(new_opaque_stride_input),
+        _igvn(igvn) {}
+  NONCOPYABLE(ReplaceOpaqueStrideInput);
+
+  void replace_for(OpaqueTemplateAssertionPredicateNode* opaque_node) {
+    DataNodeBFS bfs(*this);
+    bfs.run(opaque_node);
+  }
+
+  bool should_visit(Node* node) const override {
+    return TemplateAssertionExpressionNode::is_maybe_in_expression(node);
+  }
+
+  bool is_target_node(Node* node) const override {
+    return node->is_OpaqueLoopStride();
+  }
+
+  void target_node_action(Node* target_node) override {
+    _igvn.replace_input_of(target_node, 1, _new_opaque_stride_input);
+  }
+};
+
 // 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 {
   DEBUG_ONLY(verify();)
-  TemplateAssertionExpression expression(opaque_node());
-  expression.replace_opaque_stride_input(new_stride, igvn);
+  ReplaceOpaqueStrideInput replace_opaque_stride_input(new_stride, igvn);
+  replace_opaque_stride_input.replace_for(opaque_node());
 }
 
 // Create a new Initialized Assertion Predicate from this template at the template success projection.
@@ -427,25 +459,25 @@ class ReplaceInitAndStrideStrategy : public TransformStrategyForOpaqueLoopNodes
 // OpaqueTemplateAssertionPredicate to and including the OpaqueLoop* nodes). The cloned nodes are rewired to reflect the
 // same graph structure as found for this Template Assertion Expression. The cloned nodes get 'new_control' as control.
 // There is no other update done for the cloned nodes. Return the newly cloned OpaqueTemplateAssertionPredicate.
-OpaqueTemplateAssertionPredicateNode* TemplateAssertionExpression::clone(Node* new_control, PhaseIdealLoop* phase) const {
-  CloneStrategy clone_init_and_stride_strategy(phase, new_control);
-  return clone(clone_init_and_stride_strategy, new_control, phase);
+OpaqueTemplateAssertionPredicateNode* TemplateAssertionExpression::clone(Node* new_control, CountedLoopNode* new_loop_node) const {
+  CloneStrategy clone_init_and_stride_strategy(_phase, new_control);
+  return clone(clone_init_and_stride_strategy, new_control, new_loop_node);
 }
 
 // Same as clone() but instead of cloning the OpaqueLoopInitNode, we replace it with the provided 'new_init' node.
 OpaqueTemplateAssertionPredicateNode*
-TemplateAssertionExpression::clone_and_replace_init(Node* new_control, Node* new_init, PhaseIdealLoop* phase) const {
-  ReplaceInitAndCloneStrideStrategy replace_init_and_clone_stride_strategy(new_control, new_init, phase);
-  return clone(replace_init_and_clone_stride_strategy, new_control, phase);
+TemplateAssertionExpression::clone_and_replace_init(Node* new_control, Node* new_init,
+                                                    CountedLoopNode* new_loop_node) const {
+  ReplaceInitAndCloneStrideStrategy replace_init_and_clone_stride_strategy(new_control, new_init, _phase);
+  return clone(replace_init_and_clone_stride_strategy, new_control, new_loop_node);
 }
 
 // Same as clone() but instead of cloning the OpaqueLoopInit and OpaqueLoopStride node, we replace them with the provided
 // 'new_init' and 'new_stride' nodes, respectively.
 OpaqueTemplateAssertionPredicateNode*
-TemplateAssertionExpression::clone_and_replace_init_and_stride(Node* new_control, Node* new_init, Node* new_stride,
-                                                               PhaseIdealLoop* phase) const {
+TemplateAssertionExpression::clone_and_replace_init_and_stride(Node* new_control, Node* new_init, Node* new_stride) const {
   ReplaceInitAndStrideStrategy replace_init_and_stride_strategy(new_init, new_stride);
-  return clone(replace_init_and_stride_strategy, new_control, phase);
+  return clone(replace_init_and_stride_strategy, new_control, _opaque_node->loop_node());
 }
 
 // Class to collect data nodes from a source to target nodes by following the inputs of the source node recursively.
@@ -528,56 +560,25 @@ class DataNodesOnPathsToTargets : public StackObj {
 // Clones this Template Assertion Expression and applies the given strategy to transform the OpaqueLoop* nodes.
 OpaqueTemplateAssertionPredicateNode*
 TemplateAssertionExpression::clone(const TransformStrategyForOpaqueLoopNodes& transform_strategy, Node* new_control,
-                                   PhaseIdealLoop* phase) const {
+                                   CountedLoopNode* new_loop_node) const {
   ResourceMark rm;
   auto is_opaque_loop_node = [](const Node* node) {
     return node->is_Opaque1();
   };
   DataNodesOnPathsToTargets data_nodes_on_path_to_targets(TemplateAssertionExpressionNode::is_maybe_in_expression,
                                                           is_opaque_loop_node);
-  const Unique_Node_List& collected_nodes = data_nodes_on_path_to_targets.collect(_opaque_node);
-  DataNodeGraph data_node_graph(collected_nodes, phase);
+  Node* bool_into_opaque_node = _opaque_node->in(1);
+  const Unique_Node_List& collected_nodes = data_nodes_on_path_to_targets.collect(bool_into_opaque_node);
+  DataNodeGraph data_node_graph(collected_nodes, _phase);
   const OrigToNewHashtable& orig_to_new = data_node_graph.clone_with_opaque_loop_transform_strategy(transform_strategy,
                                                                                                     new_control);
-  assert(orig_to_new.contains(_opaque_node), "must exist");
-  Node* opaque_node_clone = *orig_to_new.get(_opaque_node);
-  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 BFSActions {
-  Node* _new_opaque_stride_input;
-  PhaseIterGVN& _igvn;
-
- public:
-  ReplaceOpaqueStrideInput(Node* new_opaque_stride_input, PhaseIterGVN& igvn)
-      : _new_opaque_stride_input(new_opaque_stride_input),
-        _igvn(igvn) {}
-  NONCOPYABLE(ReplaceOpaqueStrideInput);
-
-  void replace_for(OpaqueTemplateAssertionPredicateNode* opaque_node) {
-    DataNodeBFS bfs(*this);
-    bfs.run(opaque_node);
-  }
-
-  bool should_visit(Node* node) const override {
-    return TemplateAssertionExpressionNode::is_maybe_in_expression(node);
-  }
-
-  bool is_target_node(Node* node) const override {
-    return node->is_OpaqueLoopStride();
-  }
-
-  void target_node_action(Node* target_node) override {
-    _igvn.replace_input_of(target_node, 1, _new_opaque_stride_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) const {
-  ReplaceOpaqueStrideInput replace_opaque_stride_input(new_stride, igvn);
-  replace_opaque_stride_input.replace_for(_opaque_node);
+  assert(orig_to_new.contains(bool_into_opaque_node), "must exist");
+  BoolNode* bool_into_opaque_node_clone = (*orig_to_new.get(bool_into_opaque_node))->as_Bool();
+  OpaqueTemplateAssertionPredicateNode* opaque_clone =
+      new OpaqueTemplateAssertionPredicateNode(bool_into_opaque_node_clone, new_loop_node);
+  _phase->C->add_template_assertion_predicate_opaque(opaque_clone);
+  _phase->register_new_node(opaque_clone, new_control);
+  return opaque_clone;
 }
 
 // The transformations of this class fold the OpaqueLoop* nodes by returning their inputs.
@@ -593,13 +594,13 @@ class RemoveOpaqueLoopNodesStrategy : public TransformStrategyForOpaqueLoopNodes
 };
 
 OpaqueInitializedAssertionPredicateNode*
-TemplateAssertionExpression::clone_and_fold_opaque_loop_nodes(Node* new_control, PhaseIdealLoop* phase) const {
+TemplateAssertionExpression::clone_and_fold_opaque_loop_nodes(Node* new_control) const {
   RemoveOpaqueLoopNodesStrategy remove_opaque_loop_nodes_strategy;
   OpaqueTemplateAssertionPredicateNode* cloned_template_opaque = clone(remove_opaque_loop_nodes_strategy, new_control,
-                                                                       phase);
+                                                                       _opaque_node->loop_node());
   OpaqueInitializedAssertionPredicateNode* opaque_initialized_opaque =
-      new OpaqueInitializedAssertionPredicateNode(cloned_template_opaque->in(1)->as_Bool(), phase->C);
-  phase->register_new_node(opaque_initialized_opaque, new_control);
+      new OpaqueInitializedAssertionPredicateNode(cloned_template_opaque->in(1)->as_Bool(), _phase->C);
+  _phase->register_new_node(opaque_initialized_opaque, new_control);
   return opaque_initialized_opaque;
 }
 
@@ -645,15 +646,18 @@ class AssertionPredicateExpressionCreator : public StackObj {
         _upper((_stride > 0) != (_scale > 0)) {} // Make sure rc_predicate() chooses the "scale*init + offset" case.
 
   // Create the expression for a Template Assertion Predicate with an OpaqueTemplateAssertionPredicate node.
-  OpaqueTemplateAssertionPredicateNode* create_for_template(Node* new_control, Node* operand, bool& does_overflow) const {
+  OpaqueTemplateAssertionPredicateNode* create_for_template(Node* new_control, Node* operand, CountedLoopNode* loop_node,
+                                                            bool& does_overflow) const {
     BoolNode* bool_for_expression =  _phase->rc_predicate(new_control, _scale, _offset, operand, nullptr,
                                                           _stride, _range, _upper, does_overflow);
-    return create_opaque_node(new_control, bool_for_expression);
+    return create_opaque_for_template(new_control, bool_for_expression, loop_node);
   }
 
  private:
-  OpaqueTemplateAssertionPredicateNode* create_opaque_node(Node* new_control, BoolNode* bool_for_expression) const {
-    OpaqueTemplateAssertionPredicateNode* new_expression = new OpaqueTemplateAssertionPredicateNode(bool_for_expression);
+  OpaqueTemplateAssertionPredicateNode* create_opaque_for_template(Node* new_control, BoolNode* bool_for_expression,
+                                                           CountedLoopNode* loop_node) const {
+    OpaqueTemplateAssertionPredicateNode* new_expression = new OpaqueTemplateAssertionPredicateNode(bool_for_expression,
+                                                                                                    loop_node);
     _phase->C->add_template_assertion_predicate_opaque(new_expression);
     _phase->register_new_node(new_expression, new_control);
     return new_expression;
@@ -665,12 +669,12 @@ class AssertionPredicateExpressionCreator : public StackObj {
                                                                   bool& does_overflow) const {
     BoolNode* bool_for_expression = _phase->rc_predicate(new_control, _scale, _offset, operand, nullptr,
                                                          _stride, _range, _upper, does_overflow);
-    return create_opaque_initialized_assertion_predicate_node(new_control, bool_for_expression);
+    return create_opaque_for_initialized(new_control, bool_for_expression);
   }
 
  private:
-  OpaqueInitializedAssertionPredicateNode* create_opaque_initialized_assertion_predicate_node(
-      Node* new_control, BoolNode* bool_for_expression) const {
+  OpaqueInitializedAssertionPredicateNode* create_opaque_for_initialized(Node* new_control,
+                                                                         BoolNode* bool_for_expression) const {
     OpaqueInitializedAssertionPredicateNode* new_expression =
         new OpaqueInitializedAssertionPredicateNode(bool_for_expression, _phase->C);
     _phase->register_new_node(new_expression, new_control);
@@ -762,7 +766,7 @@ OpaqueTemplateAssertionPredicateNode*
 TemplateAssertionPredicateCreator::create_for_init_value(Node* new_control, OpaqueLoopInitNode* opaque_init,
                                                          bool& does_overflow) const {
   AssertionPredicateExpressionCreator expression_creator(_loop_head->stride_con(), _scale, _offset, _range, _phase);
-  return expression_creator.create_for_template(new_control, opaque_init, does_overflow);
+  return expression_creator.create_for_template(new_control, opaque_init, _loop_head, does_overflow);
 }
 
 OpaqueTemplateAssertionPredicateNode*
@@ -770,7 +774,7 @@ TemplateAssertionPredicateCreator::create_for_last_value(Node* new_control, Opaq
                                                          bool& does_overflow) const {
   Node* last_value = create_last_value(new_control, opaque_init);
   AssertionPredicateExpressionCreator expression_creator(_loop_head->stride_con(), _scale, _offset, _range, _phase);
-  return expression_creator.create_for_template(new_control, last_value, does_overflow);
+  return expression_creator.create_for_template(new_control, last_value, _loop_head, does_overflow);
 }
 
 Node* TemplateAssertionPredicateCreator::create_last_value(Node* new_control, OpaqueLoopInitNode* opaque_init) const {
@@ -855,10 +859,10 @@ InitializedAssertionPredicate InitializedAssertionPredicateCreator::create_from_
 // projection by cloning it but omitting the OpaqueLoop*Notes (i.e. taking their inputs instead).
 InitializedAssertionPredicate InitializedAssertionPredicateCreator::create_from_template_and_insert_below(
     const TemplateAssertionPredicate& template_assertion_predicate) const {
-  TemplateAssertionExpression template_assertion_expression(template_assertion_predicate.opaque_node());
+  TemplateAssertionExpression template_assertion_expression(template_assertion_predicate.opaque_node(), _phase);
   IfTrueNode* template_assertion_predicate_success_proj = template_assertion_predicate.tail();
   OpaqueInitializedAssertionPredicateNode* assertion_expression =
-      template_assertion_expression.clone_and_fold_opaque_loop_nodes(template_assertion_predicate_success_proj, _phase);
+      template_assertion_expression.clone_and_fold_opaque_loop_nodes(template_assertion_predicate_success_proj);
 
   IfNode* template_assertion_predicate_if = template_assertion_predicate.head();
   AssertionPredicateType assertion_predicate_type = template_assertion_predicate_if->assertion_predicate_type();
@@ -899,9 +903,9 @@ InitializedAssertionPredicateCreator::create_assertion_expression_from_template(
                                                                                 Node* new_stride) const {
   OpaqueTemplateAssertionPredicateNode* template_opaque =
       template_assertion_predicate->in(1)->as_OpaqueTemplateAssertionPredicate();
-  TemplateAssertionExpression template_assertion_expression(template_opaque);
+  TemplateAssertionExpression template_assertion_expression(template_opaque, _phase);
   OpaqueTemplateAssertionPredicateNode* tmp_opaque =
-      template_assertion_expression.clone_and_replace_init_and_stride(new_control, new_init, new_stride, _phase);
+      template_assertion_expression.clone_and_replace_init_and_stride(new_control, new_init, new_stride);
   OpaqueInitializedAssertionPredicateNode* assertion_expression =
       new OpaqueInitializedAssertionPredicateNode(tmp_opaque->in(1)->as_Bool(), _phase->C);
   _phase->register_new_node(assertion_expression, new_control);
@@ -959,6 +963,7 @@ CreateAssertionPredicatesVisitor::CreateAssertionPredicatesVisitor(CountedLoopNo
                                                                    const bool clone_template)
     : _init(target_loop_head->init_trip()),
       _stride(target_loop_head->stride()),
+      _target_loop_head(target_loop_head),
       _old_target_loop_entry(target_loop_head->skip_strip_mined()->in(LoopNode::EntryControl)),
       _current_predicate_chain_head(target_loop_head->skip_strip_mined()), // Initially no predicates, yet.
       _phase(phase),
@@ -1013,7 +1018,8 @@ InitializedAssertionPredicate CreateAssertionPredicatesVisitor::initialize_from_
 TemplateAssertionPredicate CreateAssertionPredicatesVisitor::clone_template_and_replace_init_input(
     const TemplateAssertionPredicate& template_assertion_predicate) const {
   TemplateAssertionPredicate new_template =
-      template_assertion_predicate.clone_and_replace_opaque_input(_old_target_loop_entry, _init, _phase);
+      template_assertion_predicate.clone_and_replace_opaque_input(_old_target_loop_entry, _init, _target_loop_head,
+                                                                  _phase);
   return new_template;
 }
 
@@ -1081,11 +1087,22 @@ void TargetLoopPredicateChain::rewire_to_target_chain_head(IfTrueNode* template_
 
 ClonePredicateToTargetLoop::ClonePredicateToTargetLoop(LoopNode* target_loop_head, const NodeInLoopBody& node_in_loop_body,
                                                        PhaseIdealLoop* phase)
-    : _old_target_loop_entry(target_loop_head->in(LoopNode::EntryControl)),
-      _target_loop_predicate_chain(target_loop_head, phase),
+    : _target_loop_head(target_loop_head),
+      _target_outer_loop_head(target_loop_head->skip_strip_mined()),
+      _old_target_loop_entry(_target_outer_loop_head->in(LoopNode::EntryControl)),
+      _target_loop_predicate_chain(_target_outer_loop_head, phase),
       _node_in_loop_body(node_in_loop_body),
       _phase(phase) {}
 
+// Clones the provided Template Assertion Predicate to the head of the current predicate chain at the target loop.
+void ClonePredicateToTargetLoop::clone_template_assertion_predicate(
+    const TemplateAssertionPredicate& template_assertion_predicate) {
+  TemplateAssertionPredicate cloned_template_assertion_predicate =
+      template_assertion_predicate.clone(_old_target_loop_entry, _target_loop_head->as_CountedLoop(), _phase);
+  template_assertion_predicate.rewire_loop_data_dependencies(cloned_template_assertion_predicate.tail(),
+                                                             _node_in_loop_body, _phase);
+  _target_loop_predicate_chain.insert_predicate(cloned_template_assertion_predicate);
+}
 
 CloneUnswitchedLoopPredicatesVisitor::CloneUnswitchedLoopPredicatesVisitor(
     LoopNode* true_path_loop_head, LoopNode* false_path_loop_head,
@@ -1131,6 +1148,7 @@ void UpdateStrideForAssertionPredicates::visit(const TemplateAssertionPredicate&
     return;
   }
   replace_opaque_stride_input(template_assertion_predicate);
+  template_assertion_predicate.update_associated_loop_node(_loop_node);
   Node* template_tail_control_out = template_assertion_predicate.tail()->unique_ctrl_out();
   InitializedAssertionPredicate initialized_assertion_predicate =
       initialize_from_updated_template(template_assertion_predicate);
@@ -1212,23 +1230,38 @@ void EliminateUselessPredicates::mark_loop_associated_predicates_useful() const
 
 // This visitor marks all visited Parse and Template Assertion Predicates useful.
 class PredicateUsefulMarkerVisitor : public PredicateVisitor {
+  LoopNode* const _loop_node; // The loop node from which we currently iterate through the Predicates.
+
  public:
+  explicit PredicateUsefulMarkerVisitor(LoopNode* loop_node) : _loop_node(loop_node) {}
+  NONCOPYABLE(PredicateUsefulMarkerVisitor);
+
   using PredicateVisitor::visit;
 
   void visit(const ParsePredicate& parse_predicate) override {
     parse_predicate.head()->mark_useful();
   }
 
-  // We actually mark the associated OpaqueTemplateAssertionPredicate node useful.
+  // If the stored loop node does not match the current loop node from which we iterate from, we found a Template
+  // Assertion Predicate belonging to an already earlier folded loop in the graph. We mark it useless to drop this
+  // Template Assertion Predicate because we are no longer splitting a loop which it belongs to. Moreover, if we do not
+  // remove this Template Assertion Predicate, we could wrongly be creating Initialized Assertion Predicates from it at
+  // the new loop which has completely unrelated loop values. These Initialized Assertion Predicates can then fail at
+  // runtime, and we crash by executing a halt instruction.
   void visit(const TemplateAssertionPredicate& template_assertion_predicate) override {
-    template_assertion_predicate.opaque_node()->mark_useful();
+    OpaqueTemplateAssertionPredicateNode* opaque_node = template_assertion_predicate.opaque_node();
+    if (opaque_node->loop_node() == _loop_node) {
+      // We actually mark the associated OpaqueTemplateAssertionPredicate node useful.
+      template_assertion_predicate.opaque_node()->mark_useful();
+    }
   }
 };
 
 void EliminateUselessPredicates::mark_useful_predicates_for_loop(IdealLoopTree* loop) {
-  Node* loop_entry = loop->_head->as_Loop()->skip_strip_mined()->in(LoopNode::EntryControl);
+  LoopNode* loop_node = loop->_head->as_Loop();
+  Node* loop_entry = loop_node->skip_strip_mined()->in(LoopNode::EntryControl);
   const PredicateIterator predicate_iterator(loop_entry);
-  PredicateUsefulMarkerVisitor predicate_useful_marker_visitor;
+  PredicateUsefulMarkerVisitor predicate_useful_marker_visitor(loop_node);
   predicate_iterator.for_each(predicate_useful_marker_visitor);
 }
 
diff --git a/src/hotspot/share/opto/predicates.hpp b/src/hotspot/share/opto/predicates.hpp
index 3d1cbe3a89c..90731bddccd 100644
--- a/src/hotspot/share/opto/predicates.hpp
+++ b/src/hotspot/share/opto/predicates.hpp
@@ -396,14 +396,21 @@ class TemplateAssertionPredicate : public Predicate {
     return opaque_node()->is_useless();
   }
 
-  TemplateAssertionPredicate clone(Node* new_control, PhaseIdealLoop* phase) const;
+  TemplateAssertionPredicate clone(Node* new_control, CountedLoopNode* new_loop_node, PhaseIdealLoop* phase) const;
   TemplateAssertionPredicate clone_and_replace_opaque_input(Node* new_control, Node* new_opaque_input,
-                                                            PhaseIdealLoop* phase) const;
+                                                            CountedLoopNode* new_loop_node, PhaseIdealLoop* phase) const;
   void replace_opaque_stride_input(Node* new_stride, PhaseIterGVN& igvn) const;
   InitializedAssertionPredicate initialize(PhaseIdealLoop* phase) const;
   void rewire_loop_data_dependencies(IfTrueNode* target_predicate, const NodeInLoopBody& data_in_loop_body,
                                      const PhaseIdealLoop* phase) const;
   void kill(PhaseIterGVN& igvn) const;
+
+  // Should only be called during Loop Unrolling when we only update the OpaqueLoopStride input but don't require a full
+  // clone of the Template Assertion Expression.
+  void update_associated_loop_node(CountedLoopNode* loop_node) const {
+    opaque_node()->update_loop_node(loop_node);
+  }
+
   static bool is_predicate(const Node* maybe_success_proj);
 
 #ifdef ASSERT
@@ -478,23 +485,25 @@ class TransformStrategyForOpaqueLoopNodes : public StackObj {
 // A Template Assertion Predicate represents the OpaqueTemplateAssertionPredicateNode for the initial value or the last
 // value of a Template Assertion Predicate and all the nodes up to and including the OpaqueLoop* nodes.
 class TemplateAssertionExpression : public StackObj {
-  OpaqueTemplateAssertionPredicateNode* _opaque_node;
-
+  OpaqueTemplateAssertionPredicateNode* const _opaque_node;
+  PhaseIdealLoop* const _phase;
  public:
-  explicit TemplateAssertionExpression(OpaqueTemplateAssertionPredicateNode* opaque_node) : _opaque_node(opaque_node) {}
+  TemplateAssertionExpression(OpaqueTemplateAssertionPredicateNode* opaque_node, PhaseIdealLoop* phase)
+      : _opaque_node(opaque_node),
+        _phase(phase) {}
+  NONCOPYABLE(TemplateAssertionExpression);
 
  private:
   OpaqueTemplateAssertionPredicateNode* clone(const TransformStrategyForOpaqueLoopNodes& transform_strategy,
-                                              Node* new_control, PhaseIdealLoop* phase) const;
+                                              Node* new_control, CountedLoopNode* new_loop_node) const;
 
  public:
-  OpaqueTemplateAssertionPredicateNode* clone(Node* new_control, PhaseIdealLoop* phase) const;
+  OpaqueTemplateAssertionPredicateNode* clone(Node* new_control, CountedLoopNode* new_loop_node) const;
   OpaqueTemplateAssertionPredicateNode* clone_and_replace_init(Node* new_control, Node* new_init,
-                                                               PhaseIdealLoop* phase) const;
+                                                               CountedLoopNode* new_loop_node) const;
   OpaqueTemplateAssertionPredicateNode* clone_and_replace_init_and_stride(Node* new_control, Node* new_init,
-                                                                          Node* new_stride, PhaseIdealLoop* phase) const;
-  void replace_opaque_stride_input(Node* new_stride, PhaseIterGVN& igvn) const;
-  OpaqueInitializedAssertionPredicateNode* clone_and_fold_opaque_loop_nodes(Node* new_control, PhaseIdealLoop* phase) const;
+                                                                          Node* new_stride) const;
+  OpaqueInitializedAssertionPredicateNode* clone_and_fold_opaque_loop_nodes(Node* new_control) const;
 };
 
 // Class to represent a node being part of a Template Assertion Expression. Note that this is not an IR node.
@@ -1078,6 +1087,7 @@ class NodeInClonedLoopBody : public NodeInLoopBody {
 class CreateAssertionPredicatesVisitor : public PredicateVisitor {
   Node* const _init;
   Node* const _stride;
+  CountedLoopNode* const _target_loop_head;
   Node* const _old_target_loop_entry;
   Node* _current_predicate_chain_head;
   PhaseIdealLoop* const _phase;
@@ -1139,6 +1149,8 @@ public:
 //            |                                |                                                        |
 //    source loop head                      target loop head                                       target loop head
 class ClonePredicateToTargetLoop : public StackObj {
+  LoopNode* const _target_loop_head;
+  LoopNode* const _target_outer_loop_head;
   Node* const _old_target_loop_entry; // Used as control for each newly cloned predicate.
   TargetLoopPredicateChain _target_loop_predicate_chain;
   const NodeInLoopBody& _node_in_loop_body;
@@ -1154,14 +1166,7 @@ public:
     _target_loop_predicate_chain.insert_predicate(cloned_parse_predicate);
   }
 
-  // Clones the provided Template Assertion Predicate to the head of the current predicate chain at the target loop.
-  void clone_template_assertion_predicate(const TemplateAssertionPredicate& template_assertion_predicate) {
-    TemplateAssertionPredicate cloned_template_assertion_predicate =
-        template_assertion_predicate.clone(_old_target_loop_entry, _phase);
-    template_assertion_predicate.rewire_loop_data_dependencies(cloned_template_assertion_predicate.tail(),
-                                                               _node_in_loop_body, _phase);
-    _target_loop_predicate_chain.insert_predicate(cloned_template_assertion_predicate);
-  }
+  void clone_template_assertion_predicate(const TemplateAssertionPredicate& template_assertion_predicate);
 };
 
 // Visitor to clone Parse and Template Assertion Predicates from a loop to its unswitched true and false path loop.
@@ -1209,6 +1214,7 @@ class OpaqueTemplateAssertionPredicateCollector : public PredicateVisitor {
 // from the updated templates. The old Initialized Assertion Predicates are killed.
 class UpdateStrideForAssertionPredicates : public PredicateVisitor {
   Node* const _new_stride;
+  CountedLoopNode* const _loop_node;
   PhaseIdealLoop* const _phase;
 
   void replace_opaque_stride_input(const TemplateAssertionPredicate& template_assertion_predicate) const;
@@ -1218,8 +1224,9 @@ class UpdateStrideForAssertionPredicates : public PredicateVisitor {
   void connect_initialized_assertion_predicate(Node* new_control_out, const InitializedAssertionPredicate& initialized_assertion_predicate) const;
 
  public:
-  UpdateStrideForAssertionPredicates(Node* const new_stride, PhaseIdealLoop* phase)
+  UpdateStrideForAssertionPredicates(Node* const new_stride, CountedLoopNode* loop_node, PhaseIdealLoop* phase)
       : _new_stride(new_stride),
+        _loop_node(loop_node),
         _phase(phase) {}
   NONCOPYABLE(UpdateStrideForAssertionPredicates);
 
diff --git a/src/hotspot/share/opto/split_if.cpp b/src/hotspot/share/opto/split_if.cpp
index 7c51ae0f827..bede04c6b2c 100644
--- a/src/hotspot/share/opto/split_if.cpp
+++ b/src/hotspot/share/opto/split_if.cpp
@@ -404,9 +404,10 @@ void PhaseIdealLoop::clone_template_assertion_expression_down(Node* node) {
   auto clone_expression = [&](IfNode* template_assertion_predicate) {
     OpaqueTemplateAssertionPredicateNode* opaque_node =
         template_assertion_predicate->in(1)->as_OpaqueTemplateAssertionPredicate();
-    TemplateAssertionExpression template_assertion_expression(opaque_node);
-    Node* new_ctrl = template_assertion_predicate->in(0);
-    OpaqueTemplateAssertionPredicateNode* cloned_opaque_node = template_assertion_expression.clone(new_ctrl, this);
+    TemplateAssertionExpression template_assertion_expression(opaque_node, this);
+    Node* new_control = template_assertion_predicate->in(0);
+    OpaqueTemplateAssertionPredicateNode* cloned_opaque_node = template_assertion_expression.clone(new_control,
+                                                                                                   opaque_node->loop_node());
     igvn().replace_input_of(template_assertion_predicate, 1, cloned_opaque_node);
   };
   template_assertion_expression_node.for_each_template_assertion_predicate(clone_expression);
diff --git a/test/hotspot/jtreg/compiler/predicates/assertion/TestAssertionPredicates.java b/test/hotspot/jtreg/compiler/predicates/assertion/TestAssertionPredicates.java
new file mode 100644
index 00000000000..c6c9325408e
--- /dev/null
+++ b/test/hotspot/jtreg/compiler/predicates/assertion/TestAssertionPredicates.java
@@ -0,0 +1,471 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact 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=Xbatch
+ * @bug 8288981 8350579
+ * @summary Test all possible cases in which Assertion Predicates are required such that the graph is not left in a
+ *          broken state to trigger assertions. Additional tests ensure the correctness of the implementation.
+ *          All tests additionally -XX:+AbortVMOnCompilationFailure which would catch bad graphs as a result of missing
+            or wrong Assertion Predicates where we simply bail out of C2 compilation.
+ * @run main/othervm -Xbatch
+ *                   -XX:+UnlockDiagnosticVMOptions -XX:+AbortVMOnCompilationFailure
+ *                   -XX:CompileCommand=compileonly,compiler.predicates.TestAssertionPredicates::*
+ *                   -XX:CompileCommand=dontinline,compiler.predicates.TestAssertionPredicates::*
+ *                   compiler.predicates.TestAssertionPredicates Xbatch
+ */
+
+/*
+ * @test id=NoTieredCompilation
+ * @bug 8288981 8350579
+
+ * @run main/othervm -Xbatch -XX:-TieredCompilation
+ *                   -XX:+UnlockDiagnosticVMOptions -XX:+AbortVMOnCompilationFailure
+ *                   -XX:CompileCommand=compileonly,compiler.predicates.TestAssertionPredicates::*
+ *                   -XX:CompileCommand=dontinline,compiler.predicates.TestAssertionPredicates::*
+ *                   compiler.predicates.TestAssertionPredicates NoTieredCompilation
+ */
+
+/*
+ * @test id=Xcomp
+ * @bug 8288981 8350579
+ * @run main/othervm -Xcomp
+ *                   -XX:+UnlockDiagnosticVMOptions -XX:+AbortVMOnCompilationFailure
+ *                   -XX:CompileCommand=compileonly,compiler.predicates.TestAssertionPredicates::*
+ *                   -XX:CompileCommand=dontinline,compiler.predicates.TestAssertionPredicates::*
+ *                   -XX:CompileCommand=inline,compiler.predicates.TestAssertionPredicates::inline
+ *                   compiler.predicates.TestAssertionPredicates Xcomp
+ */
+
+/*
+ * @test id=LoopMaxUnroll0
+ * @bug 8288981 8350579
+ * @requires vm.compiler2.enabled
+ * @run main/othervm -Xcomp -XX:LoopMaxUnroll=0
+ *                   -XX:+UnlockDiagnosticVMOptions -XX:+AbortVMOnCompilationFailure
+ *                   -XX:CompileCommand=compileonly,compiler.predicates.TestAssertionPredicates::*
+ *                   -XX:CompileCommand=dontinline,compiler.predicates.TestAssertionPredicates::*
+ *                   compiler.predicates.TestAssertionPredicates LoopMaxUnroll0
+ */
+
+/*
+ * @test id=StressXcomp
+ * @bug 8288981 8350579
+ * @requires vm.compiler2.enabled
+ * @run main/othervm -Xcomp -XX:+UnlockDiagnosticVMOptions -XX:+StressIGVN -XX:+StressGCM -XX:+AbortVMOnCompilationFailure
+ *                   -XX:CompileCommand=compileonly,compiler.predicates.TestAssertionPredicates::*
+ *                   -XX:CompileCommand=dontinline,compiler.predicates.TestAssertionPredicates::*
+ *                   compiler.predicates.TestAssertionPredicates Stress
+ */
+
+/*
+ * @test id=StressXbatch
+ * @bug 8288981 8350579
+ * @requires vm.compiler2.enabled
+ * @run main/othervm -Xbatch -XX:+UnlockDiagnosticVMOptions -XX:+StressIGVN -XX:+StressGCM -XX:+AbortVMOnCompilationFailure
+ *                   -XX:CompileCommand=compileonly,compiler.predicates.TestAssertionPredicates::*
+ *                   -XX:CompileCommand=dontinline,compiler.predicates.TestAssertionPredicates::*
+ *                   compiler.predicates.TestAssertionPredicates Stress
+ */
+
+/*
+ * @test id=NoLoopPredication
+ * @bug 8288981 8350579
+ * @requires vm.compiler2.enabled
+ * @run main/othervm -Xbatch -XX:-UseLoopPredicate
+ *                   -XX:+UnlockDiagnosticVMOptions -XX:+AbortVMOnCompilationFailure
+ *                   -XX:CompileCommand=compileonly,compiler.predicates.TestAssertionPredicates::*
+ *                   -XX:CompileCommand=dontinline,compiler.predicates.TestAssertionPredicates::*
+ *                   compiler.predicates.TestAssertionPredicates NoLoopPredication
+ */
+
+/*
+ * @test id=NoFlags
+ * @bug 8288981 8350579
+ * @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+AbortVMOnCompilationFailure
+ *                    compiler.predicates.TestAssertionPredicates NoFlags
+ */
+
+package compiler.predicates;
+
+public class TestAssertionPredicates {
+    static int[] iArrShort = new int[10];
+    static int[] iArr = new int[200];
+    static int[] iArr2 = new int[200];
+    static int[] iArr3 = new int[300];
+    static short[] sArr = new short[10];
+
+    static boolean flag;
+    static int iFld = 34;
+    static int iFld2, iFld3;
+    static float fFld;
+    static short five = 5;
+
+
+    public static void main(String[] args) {
+        switch (args[0]) {
+            case "Xbatch" -> {
+                for (int i = 0; i < 10000; i++) {
+                    flag = !flag;
+                    testTemplateAssertionPredicateNotRemovedHalt();
+                    testTemplateAssertionPredicateNotRemovedMalformedGraph();
+                    test8305428();
+                    test8305428No2();
+                }
+            }
+            case "NoTieredCompilation" -> {
+                for (int i = 0; i < 1000; i++) {
+                    test8320920();
+                    test8332501();
+                }
+            }
+            case "LoopMaxUnroll0" -> {
+                testDyingRuntimePredicate();
+                testDyingNegatedRuntimePredicate();
+            }
+            case "Xcomp" -> {
+                testDyingInitializedAssertionPredicate();
+            }
+            case "NoLoopPredication", "NoFlags", "Stress" -> {
+                for (int i = 0; i < 10000; i++) {
+                    runAllTests();
+                }
+            }
+            default -> throw new RuntimeException("invalid arg");
+        }
+    }
+
+    static void runAllTests() {
+        testTemplateAssertionPredicateNotRemovedHalt();
+        testTemplateAssertionPredicateNotRemovedMalformedGraph();
+        testDyingRuntimePredicate();
+        testDyingNegatedRuntimePredicate();
+        testDyingInitializedAssertionPredicate();
+        test8305428();
+        test8305428No2();
+        test8320920();
+        test8332501();
+    }
+
+    // Corresponds to JDK-8305428.
+    // -Xbatch -XX:CompileCommand=compileonly,Test*::*
+    public static void testTemplateAssertionPredicateNotRemovedHalt() {
+        int one = 34;
+
+        int limit = 2;
+        for (; limit < 4; limit *= 2);
+        for (int i = 2; i < limit; i++) {
+            one = 1;
+        }
+
+        int i = 80;
+        // 1) Found to be a counted loop with a limit between 1 and 34 (C2 only knows after CCP that 'one'
+        //    is the constant 1).
+        // 2b) Two Hoisted Range Check Predicates.
+        //     Two Template Assertion Predicates but triggering this bug, we only need to focus on one:
+        //         Init Value: OpaqueLoopInit(0) <u iArrShort.length
+        // 4) After CCP, we know that this loop only runs for one iteration. The backedge is never taken
+        //    and the CountedLoopNode can be folded away during IGVN.
+        //    The Parse Predicates together with the Template Assertion Predicate from 2b) now end up
+        //    above the partially peeled inner loop.
+        for (int j = 0; j < one; j++) {
+            // 3) Apply Partial Peeling which gives us the following loop:
+            //      for (i = 80; i >= 5; i--) { fFld += 34; }
+            //    Note that this loop does not have any Parse Predicates above its loop entry.
+            // 5) This loop is converted to a counted loop.
+            // 6) We pre-main-post this loop and update the Template Assertion Predicate for the main-loop
+            //    The problem now is, that we use the init value of this loop which is completely
+            //    unrelated to the init value of the outer loop for which this Tempalte Asseriton Predicate
+            //    was originally created! We get the following wrong Template Assertion Predicate for the
+            //    init value:
+            //        OpaqueLoopInit(79) <u iArrShort.length
+            //    From that we create a wrong Initialized Assertion Predicate:
+            //        79 <u iArrShort.length
+            //    During runtime, we know the length:
+            //        79 <u iArrShort.length = 10
+            //    And the Initialized Assertion Predidate fails. We execute the corresponding Halt node
+            //    and the VM crashes.
+            while (true) {
+
+                // Found as loop head in ciTypeFlow, but both paths inside loop -> head not cloned.
+                // As a result, this head has the safepoint as backedge instead of the loop exit test
+                // and we cannot create a counted loop (yet). We first need to partial peel.
+                if (flag) {
+                }
+
+                // Loop exit test.
+                if (i < 5) {
+                    break;
+                }
+                // <-- Partial Peeling CUT -->
+                // Safepoint
+                fFld += 34; // Make sure loop not empty.
+                i--;
+            }
+            // 2a) Loop Predication hoists this check out of the loop with two Hoisted Range Check
+            //     Predicates and two Template Assertion Predicates at 2b).
+            iArrShort[j] = 3;
+        }
+    }
+
+    // Corresponds to JDK-8305428 but with different manifestation (malformed graph).
+    // -Xbatch -XX:CompileCommand=compileonly,Test*::*
+    public static void testTemplateAssertionPredicateNotRemovedMalformedGraph() {
+        int zero = 34;
+
+        int limit = 2;
+        for (; limit < 4; limit *= 2);
+        for (int i = 2; i < limit; i++) {
+            zero = 1;
+        }
+
+        int i = 80;
+        for (int j = 0; j < zero; j++) {
+            while (true) {
+
+                // Found as loop head in ciTypeFlow, but both paths inside loop -> head not cloned.
+                // As a result, this head has the safepoint as backedge instead of the loop exit test
+                // and we cannot create a counted loop (yet). We first need to partial peel.
+                if (flag) {
+                }
+
+                // Loop exit test.
+                if (i < -5) {
+                    break;
+                }
+                // <-- Partial Peeling CUT -->
+                // Safepoint
+                fFld = iArr2[i+5];
+                i--;
+            }
+            iArr[j] = 3;
+        }
+    }
+
+    /*
+     * Some tests catching some issues while adding the new implementation.
+     */
+
+    // Initialized Assertion Predicate with ConI as bool node is not recognized, and we miss to remove a Template
+    // Assertion Predicate from which we later create a wrong Initialized Assertion Predicate (for wrong loop).
+    static void testDyingInitializedAssertionPredicate() {
+        boolean b = false;
+        int i4, i6, i7 = 14, i8, iArr[][] = new int[10][10];
+        for (int i = 0; i < iArr.length; i++) {
+            inline(iArr[i]);
+        }
+        for (i4 = 7; i4 < 10; i4++) {
+            iArr2[1] += 5;
+        }
+        for (i6 = 100; i6 > 4; --i6) {
+            i8 = 1;
+            while (++i8 < 6) {
+                sArr[i8] = 3;
+                i7 += i8 + i8;
+                iArr2[i8] -= 34;
+            }
+        }
+    }
+
+    public static void inline(int[] a) {
+        for (int i = 0; i < a.length; i++) {
+            a[i] = 4;
+        }
+    }
+
+    static void testDyingRuntimePredicate() {
+        int zero = 34;
+        int[] iArrLoc = new int[100];
+
+        int limit = 2;
+        int loopInit = -10;
+        int four = -10;
+        for (; limit < 4; limit *= 2);
+        for (int i = 2; i < limit; i++) {
+            zero = 0;
+            loopInit = 99;
+            four = 4;
+        }
+
+        // Template + Hoisted Range Check Predicate for iArr[i]. Hoisted Invariant Check Predicate IC for iArr3[index].
+        // After CCP: ConI for IC and uncommon proj already killed -> IGVN will fold this away. But Predicate logic
+        // need to still recognize this predicate to find the Template above to kill it. If we don't do it, then it
+        // will end up at loop below and peeling will clone the template and create a completely wrong Initialized
+        // Assertion Predicate, killing some parts of the graph and leaving us with a broken graph.
+        for (int i = loopInit; i < 100; i++) {
+            iArr[i] = 34;
+            iArrLoc[four] = 34;
+        }
+
+        int i = -10;
+        while (true) {
+
+            // Found as loop head in ciTypeFlow, but both paths inside loop -> head not cloned.
+            // As a result, this head has the safepoint as backedge instead of the loop exit test
+            // and we cannot create a counted loop (yet). We first need to partial peel.
+            if (zero * i == 34) {
+                iFld2 = 23;
+            } else {
+                iFld = 2;
+            }
+
+            // Loop exit test.
+            if (i >= -2) {
+                break;
+            }
+            // <-- Partial Peeling CUT -->
+            // Safepoint
+            if (zero * i + five == 0) {
+                return;
+            }
+            iFld2 = 34;
+            i++;
+        }
+    }
+
+    static void testDyingNegatedRuntimePredicate() {
+        int zero = 34;
+        int[] iArrLoc = new int[100];
+
+        int limit = 2;
+        int loopInit = -10;
+        int four = -10;
+        for (; limit < 4; limit *= 2);
+        for (int i = 2; i < limit; i++) {
+            zero = 0;
+            loopInit = 99;
+            four = 4;
+        }
+
+        // Template + Hoisted Range Check Predicate for iArr[i]. Hoisted Invariant Check Predicate IC for iArr3[index].
+        // After CCP: ConI for IC and uncommon proj already killed -> IGVN will fold this away. But Predicate logic
+        // need to still recognize this predicate to find the Template above to kill it. If we don't do it, then it
+        // will end up at loop below and peeling will clone the template and create a completely wrong Initialized
+        // Assertion Predicate, killing some parts of the graph and leaving us with a broken graph.
+        for (int i = loopInit; i < 100; i++) {
+            iArr[i] = 34;
+            if (-3 > loopInit) {
+                // Negated Hoisted Invariant Check Predicate.
+                iArrLoc[101] = 34; // Always out of bounds and will be a range_check trap in the graph.
+            }
+        }
+
+        int i = -10;
+        while (true) {
+
+            // Found as loop head in ciTypeFlow, but both paths inside loop -> head not cloned.
+            // As a result, this head has the safepoint as backedge instead of the loop exit test
+            // and we cannot create a counted loop (yet). We first need to partial peel.
+            if (zero * i == 34) {
+                iFld2 = 23;
+            } else {
+                iFld = 2;
+            }
+
+            // Loop exit test.
+            if (i >= -2) {
+                break;
+            }
+            // <-- Partial Peeling CUT -->
+            // Safepoint
+            if (zero * i + five == 0) {
+                return;
+            }
+            iFld2 = 34;
+            i++;
+        }
+    }
+
+    /**
+     * Tests collected in JBS and duplicated issues
+     */
+
+
+    // -Xbatch -XX:CompileCommand=compileonly,Test*::*
+    static void test8305428() {
+        int j = 1;
+        do {
+            for (int k = 270; k > 1; --k) {
+                iFld++;
+            }
+
+            switch (j) {
+                case 1:
+                    switch (92) {
+                        case 92:
+                            flag = flag;
+                    }
+                case 2:
+                    iArr[j] = 3;
+            }
+        } while (++j < 100);
+    }
+
+    // -Xbatch -XX:CompileCommand=compileonly,Test*::*
+    static void test8305428No2() {
+        int i = 1;
+        do {
+            for (int j = 103; j > 1; --j) {
+                iArr[i] = iArr[j / 34];
+            }
+            for (int j = 103; j > 4; j -= 3) {
+                switch (i % 9) {
+                    case 0:
+                    case 2:
+                    case 3:
+                        iArr[i - 1] = 34;
+                    case 8:
+                }
+            }
+        } while (++i < 99);
+    }
+
+    static void test8320920() {
+        int i = 1;
+        do {
+            for (int j = 83; j > i; j--) {
+                iFld = 3;
+            }
+            for (int j = 5; j < 83; j++) {
+                for (int k = i; k < 2; k++)
+                    ;
+            }
+            iArr3[i - 1] = 34;
+        } while (++i < 300);
+    }
+
+    static void test8332501() {
+        int i = 1;
+        do {
+            for (int j = 108; j > 1; j -= 2) {
+                fFld += j;
+            }
+            for (int j = 3; 108 > j; j++) {
+                for (int k = 2; k > i; --k) {
+                }
+            }
+            iArr[i] = 34;
+        } while (++i < 150);
+    }
+}

From 997aa176dbfc3709f8731c10f901334334e606d1 Mon Sep 17 00:00:00 2001
From: Kevin Walls <kevinw@openjdk.org>
Date: Tue, 25 Mar 2025 12:32:16 +0000
Subject: [PATCH 475/587] 8351310: Deprecate com.sun.jdi.JDIPermission for
 removal

Reviewed-by: sspitsyn, cjplummer
---
 src/jdk.jdi/share/classes/com/sun/jdi/JDIPermission.java    | 6 +++++-
 .../com/sun/tools/jdi/VirtualMachineManagerImpl.java        | 3 +--
 2 files changed, 6 insertions(+), 3 deletions(-)

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 a968f6894be..1b80e6d9a1a 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, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -33,6 +33,7 @@ package com.sun.jdi;
  * @apiNote
  * This permission cannot be used for controlling access to resources
  * as the Security Manager is no longer supported.
+ * Consequently this class is deprecated for removal in a future release.
  *
  * @author  Tim Bell
  * @since   1.5
@@ -44,8 +45,11 @@ package com.sun.jdi;
  * @see java.security.PermissionCollection
  * @see java.lang.SecurityManager
  *
+ * @deprecated This class was only useful in conjunction with the Security Manager,
+ * which is no longer supported. There is no replacement for this class.
  */
 
+@Deprecated(since="25", forRemoval=true)
 public final class JDIPermission extends java.security.BasicPermission {
 
     private static final long serialVersionUID = -6988461416938786271L;
diff --git a/src/jdk.jdi/share/classes/com/sun/tools/jdi/VirtualMachineManagerImpl.java b/src/jdk.jdi/share/classes/com/sun/tools/jdi/VirtualMachineManagerImpl.java
index d49e718db60..836946ae00f 100644
--- a/src/jdk.jdi/share/classes/com/sun/tools/jdi/VirtualMachineManagerImpl.java
+++ b/src/jdk.jdi/share/classes/com/sun/tools/jdi/VirtualMachineManagerImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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.util.List;
 import java.util.ResourceBundle;
 import java.util.ServiceLoader;
 
-import com.sun.jdi.JDIPermission;
 import com.sun.jdi.VMDisconnectedException;
 import com.sun.jdi.VirtualMachine;
 import com.sun.jdi.VirtualMachineManager;

From 3ac9678ea1078087f047cb31fb705d94de3f690e Mon Sep 17 00:00:00 2001
From: Kevin Walls <kevinw@openjdk.org>
Date: Tue, 25 Mar 2025 12:32:37 +0000
Subject: [PATCH 476/587] 8351224: Deprecate
 com.sun.tools.attach.AttachPermission for removal

Reviewed-by: sspitsyn
---
 .../classes/com/sun/tools/attach/AttachPermission.java     | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

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 a69742e27c0..905b12bf21f 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, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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,12 +33,17 @@ package com.sun.tools.attach;
  * @apiNote
  * This permission cannot be used for controlling access to resources
  * as the Security Manager is no longer supported.
+ * Consequently this class is deprecated for removal in a future release.
  *
  * @see com.sun.tools.attach.VirtualMachine
  * @see com.sun.tools.attach.spi.AttachProvider
  * @since 1.6
+ *
+ * @deprecated This class was only useful in conjunction with the Security Manager,
+ * which is no longer supported. There is no replacement for this class.
  */
 
+@Deprecated(since="25", forRemoval=true)
 public final class AttachPermission extends java.security.BasicPermission {
 
     /** use serialVersionUID for interoperability */

From fa0b18bfde38ee2ffbab33a9eaac547fe8aa3c7c Mon Sep 17 00:00:00 2001
From: Mikhail Yankelevich <myankelevich@openjdk.org>
Date: Tue, 25 Mar 2025 13:04:30 +0000
Subject: [PATCH 477/587] 8352509: Update jdk.test.lib.SecurityTools jar method
 to accept List<String> parameter

Reviewed-by: weijun
---
 test/lib/jdk/test/lib/SecurityTools.java | 29 +++++++++++++++++++++---
 1 file changed, 26 insertions(+), 3 deletions(-)

diff --git a/test/lib/jdk/test/lib/SecurityTools.java b/test/lib/jdk/test/lib/SecurityTools.java
index ff13343ad32..2bc56ad4c43 100644
--- a/test/lib/jdk/test/lib/SecurityTools.java
+++ b/test/lib/jdk/test/lib/SecurityTools.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -233,6 +233,17 @@ public class SecurityTools {
         return execute(getProcessBuilder("kinit", makeList(args)));
     }
 
+    /**
+     * Runs jar.
+     *
+     * @param args arguments to jar in the list.
+     * @return an {@link OutputAnalyzer} object
+     * @throws Exception if there is an error
+     */
+    public static OutputAnalyzer jar(final List<String> args) throws Exception {
+        return execute(getProcessBuilder("jar", args));
+    }
+
     /**
      * Runs jar.
      *
@@ -241,8 +252,20 @@ public class SecurityTools {
      * @return an {@link OutputAnalyzer} object
      * @throws Exception if there is an error
      */
-    public static OutputAnalyzer jar(String args) throws Exception {
-        return execute(getProcessBuilder("jar", makeList(args)));
+    public static OutputAnalyzer jar(final String args) throws Exception {
+        return  jar(makeList(args));
+    }
+
+    /**
+     * Runs jar.
+     *
+     * @param args arguments to jar in multiple strings.
+     *             Converted to be a List with List.of.
+     * @return an {@link OutputAnalyzer} object
+     * @throws Exception if there is an error
+     */
+    public static OutputAnalyzer jar(final String... args) throws Exception {
+        return jar(List.of(args));
     }
 
     /**

From fe03e2ecbd5c4d5d06ad1703fa969043d1127c0f Mon Sep 17 00:00:00 2001
From: Archie Cobbs <acobbs@openjdk.org>
Date: Tue, 25 Mar 2025 14:28:05 +0000
Subject: [PATCH 478/587] 8351897: Extra closing curly brace typos in Javadoc

Reviewed-by: liach
---
 .../share/classes/java/lang/classfile/package-info.java   | 8 ++++----
 .../share/classes/java/net/NetworkInterface.java          | 4 ++--
 src/java.base/share/classes/java/text/MessageFormat.java  | 8 ++++----
 .../share/classes/java/util/stream/AbstractTask.java      | 4 ++--
 .../share/classes/java/util/stream/Collectors.java        | 4 ++--
 5 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/java.base/share/classes/java/lang/classfile/package-info.java b/src/java.base/share/classes/java/lang/classfile/package-info.java
index a966a6d8269..832dac2fff1 100644
--- a/src/java.base/share/classes/java/lang/classfile/package-info.java
+++ b/src/java.base/share/classes/java/lang/classfile/package-info.java
@@ -168,7 +168,7 @@
  * <p>
  * For nonstandard attributes, user-provided attribute mappers can be specified
  * through the use of the {@link
- * ClassFile.AttributeMapperOption#of(Function)}}
+ * ClassFile.AttributeMapperOption#of(Function)}
  * classfile option.  Implementations of custom attributes should extend {@link
  * CustomAttribute}.
  *
@@ -185,11 +185,11 @@
  * -- unrecognized or problematic original attributes (default is {@code PASS_ALL_ATTRIBUTES})</li>
  *   <li>{@link ClassFile.ClassHierarchyResolverOption#of(ClassHierarchyResolver)}
  * -- specify a custom class hierarchy resolver used by stack map generation</li>
- *   <li>{@link ClassFile.ConstantPoolSharingOption}}
+ *   <li>{@link ClassFile.ConstantPoolSharingOption}
  * -- share constant pool when transforming (default is {@code SHARED_POOL})</li>
- *   <li>{@link ClassFile.DeadCodeOption}}
+ *   <li>{@link ClassFile.DeadCodeOption}
  * -- patch out unreachable code (default is {@code PATCH_DEAD_CODE})</li>
- *   <li>{@link ClassFile.DeadLabelsOption}}
+ *   <li>{@link ClassFile.DeadLabelsOption}
  * -- filter unresolved labels (default is {@code FAIL_ON_DEAD_LABELS})</li>
  *   <li>{@link ClassFile.DebugElementsOption}
  * -- processing of debug information, such as local variable metadata (default is {@code PASS_DEBUG}) </li>
diff --git a/src/java.base/share/classes/java/net/NetworkInterface.java b/src/java.base/share/classes/java/net/NetworkInterface.java
index 29a07d9b76d..8e0f7137315 100644
--- a/src/java.base/share/classes/java/net/NetworkInterface.java
+++ b/src/java.base/share/classes/java/net/NetworkInterface.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -366,7 +366,7 @@ public final class NetworkInterface {
      * this machine.
      *
      * @apiNote This method can be used in combination with
-     * {@link #inetAddresses()}} to obtain a stream of all IP addresses for
+     * {@link #inetAddresses()} to obtain a stream of all IP addresses for
      * this node, for example:
      * <pre> {@code
      * Stream<InetAddress> addrs = NetworkInterface.networkInterfaces()
diff --git a/src/java.base/share/classes/java/text/MessageFormat.java b/src/java.base/share/classes/java/text/MessageFormat.java
index dbe312e8583..5477d0f881a 100644
--- a/src/java.base/share/classes/java/text/MessageFormat.java
+++ b/src/java.base/share/classes/java/text/MessageFormat.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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,15 +316,15 @@ import java.util.Objects;
  *       <th scope="row" style="font-weight:normal" rowspan=3>{@code list}
  *       <th scope="row" style="font-weight:normal"><i>(none)</i>
  *       <td>{@link ListFormat#getInstance(Locale, ListFormat.Type, ListFormat.Style)
- *       ListFormat.getInstance}{@code (getLocale()}, {@link ListFormat.Type#STANDARD}, {@link ListFormat.Style#FULL})
+ *       ListFormat.getInstance}{@code (getLocale()}, {@link ListFormat.Type#STANDARD}, {@link ListFormat.Style#FULL}{@code )}
  *    <tr>
  *       <th scope="row" style="font-weight:normal">{@code or}
  *       <td>{@link ListFormat#getInstance(Locale, ListFormat.Type, ListFormat.Style)
- *       ListFormat.getInstance}{@code (getLocale()}, {@link ListFormat.Type#OR}, {@link ListFormat.Style#FULL})
+ *       ListFormat.getInstance}{@code (getLocale()}, {@link ListFormat.Type#OR}, {@link ListFormat.Style#FULL}{@code )}
  *    <tr>
  *       <th scope="row" style="font-weight:normal">{@code unit}
  *       <td>{@link ListFormat#getInstance(Locale, ListFormat.Type, ListFormat.Style)
- *       ListFormat.getInstance}{@code (getLocale()}, {@link ListFormat.Type#UNIT}, {@link ListFormat.Style#FULL}}
+ *       ListFormat.getInstance}{@code (getLocale()}, {@link ListFormat.Type#UNIT}, {@link ListFormat.Style#FULL}{@code )}
  * </tbody>
  * </table>
  *
diff --git a/src/java.base/share/classes/java/util/stream/AbstractTask.java b/src/java.base/share/classes/java/util/stream/AbstractTask.java
index 9a61729f68d..04a64fdd346 100644
--- a/src/java.base/share/classes/java/util/stream/AbstractTask.java
+++ b/src/java.base/share/classes/java/util/stream/AbstractTask.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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,7 +222,7 @@ abstract class AbstractTask<P_IN, P_OUT, R,
 
     /**
      * Does nothing; instead, subclasses should use
-     * {@link #setLocalResult(Object)}} to manage results.
+     * {@link #setLocalResult(Object)} to manage results.
      *
      * @param result must be null, or an exception is thrown (this is a safety
      *        tripwire to detect when {@code setRawResult()} is being used
diff --git a/src/java.base/share/classes/java/util/stream/Collectors.java b/src/java.base/share/classes/java/util/stream/Collectors.java
index fe20bc1709a..6099ba6fd78 100644
--- a/src/java.base/share/classes/java/util/stream/Collectors.java
+++ b/src/java.base/share/classes/java/util/stream/Collectors.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -833,7 +833,7 @@ public final class Collectors {
      * The {@code reducing()} collectors are most useful when used in a
      * multi-level reduction, downstream of {@code groupingBy} or
      * {@code partitioningBy}.  To perform a simple reduction on a stream,
-     * use {@link Stream#reduce(Object, BinaryOperator)}} instead.
+     * use {@link Stream#reduce(Object, BinaryOperator)} instead.
      *
      * @param <T> element type for the input and output of the reduction
      * @param identity the identity value for the reduction (also, the value

From 03105fc92505e9e367354e763b99cbe02bf473d6 Mon Sep 17 00:00:00 2001
From: Volkan Yazici <vyazici@openjdk.org>
Date: Tue, 25 Mar 2025 14:35:45 +0000
Subject: [PATCH 479/587] 8351601: [JMH] test UnixSocketChannelReadWrite failed
 for 2 threads config

Reviewed-by: michaelm
---
 .../java/net/UnixSocketChannelReadWrite.java  | 19 +++----------------
 1 file changed, 3 insertions(+), 16 deletions(-)

diff --git a/test/micro/org/openjdk/bench/java/net/UnixSocketChannelReadWrite.java b/test/micro/org/openjdk/bench/java/net/UnixSocketChannelReadWrite.java
index e0d67cb39a5..64b44446bcd 100644
--- a/test/micro/org/openjdk/bench/java/net/UnixSocketChannelReadWrite.java
+++ b/test/micro/org/openjdk/bench/java/net/UnixSocketChannelReadWrite.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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 java.nio.channels.ServerSocketChannel;
 import java.nio.channels.SocketChannel;
 import java.nio.file.*;
 import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicInteger;
 
 import org.openjdk.jmh.annotations.*;
 
@@ -52,22 +51,10 @@ public class UnixSocketChannelReadWrite {
     private ReadThread rt;
     private ByteBuffer bb = ByteBuffer.allocate(1);
 
-    private static volatile String tempDir;
-    private static final AtomicInteger count = new AtomicInteger(0);
     private volatile Path socket;
 
-    static {
-        try {
-            Path p = Files.createTempDirectory("readWriteTest");
-            tempDir = p.toString();
-        } catch (IOException e) {
-            tempDir = null;
-        }
-    }
-
     private ServerSocketChannel getServerSocketChannel() throws IOException {
-        int next = count.incrementAndGet();
-        socket = Paths.get(tempDir, Integer.toString(next));
+        socket = Files.createTempDirectory(UnixSocketChannelReadWrite.class.getSimpleName()).resolve("sock");
         UnixDomainSocketAddress addr = UnixDomainSocketAddress.of(socket);
         ServerSocketChannel c = ServerSocketChannel.open(StandardProtocolFamily.UNIX);
         c.bind(addr);
@@ -93,7 +80,7 @@ public class UnixSocketChannelReadWrite {
         s2.close();
         ssc.close();
         Files.delete(socket);
-        Files.delete(Path.of(tempDir));
+        Files.delete(socket.getParent());
         rt.join();
     }
 

From e98838f58db1606f35c85ac9fcdbdf1076b6a303 Mon Sep 17 00:00:00 2001
From: David Linus Briemann <david.briemann@sap.com>
Date: Tue, 25 Mar 2025 15:16:46 +0000
Subject: [PATCH 480/587] 8352065: [PPC64] C2: Implement PopCountVL,
 CountLeadingZerosV and CountTrailingZerosV nodes

Reviewed-by: mdoerr, rrich
---
 src/hotspot/cpu/ppc/assembler_ppc.hpp         | 18 ++++++
 src/hotspot/cpu/ppc/assembler_ppc.inline.hpp  |  9 +++
 src/hotspot/cpu/ppc/ppc.ad                    | 60 ++++++++++++++++++-
 .../TestNumberOfContinuousZeros.java          |  9 ++-
 4 files changed, 92 insertions(+), 4 deletions(-)

diff --git a/src/hotspot/cpu/ppc/assembler_ppc.hpp b/src/hotspot/cpu/ppc/assembler_ppc.hpp
index 11532edaad9..b38c4ac5bae 100644
--- a/src/hotspot/cpu/ppc/assembler_ppc.hpp
+++ b/src/hotspot/cpu/ppc/assembler_ppc.hpp
@@ -544,6 +544,7 @@ class Assembler : public AbstractAssembler {
     MTVSRDD_OPCODE = (31u << OPCODE_SHIFT |  435u << 1),
     MTVSRWZ_OPCODE = (31u << OPCODE_SHIFT |  243u << 1),
     MFVSRD_OPCODE  = (31u << OPCODE_SHIFT |   51u << 1),
+    MFVSRLD_OPCODE = (31u << OPCODE_SHIFT |  307u << 1),
     MTVSRWA_OPCODE = (31u << OPCODE_SHIFT |  211u << 1),
     MFVSRWZ_OPCODE = (31u << OPCODE_SHIFT |  115u << 1),
     XXPERMDI_OPCODE= (60u << OPCODE_SHIFT |   10u << 3),
@@ -736,6 +737,14 @@ class Assembler : public AbstractAssembler {
     VPOPCNTH_OPCODE= (4u  << OPCODE_SHIFT | 1859u     ),
     VPOPCNTW_OPCODE= (4u  << OPCODE_SHIFT | 1923u     ),
     VPOPCNTD_OPCODE= (4u  << OPCODE_SHIFT | 1987u     ),
+    VCLZB_OPCODE   = (4u  << OPCODE_SHIFT | 1794u     ),
+    VCLZH_OPCODE   = (4u  << OPCODE_SHIFT | 1858u     ),
+    VCLZW_OPCODE   = (4u  << OPCODE_SHIFT | 1922u     ),
+    VCLZD_OPCODE   = (4u  << OPCODE_SHIFT | 1986u     ),
+    VCTZB_OPCODE   = (4u  << OPCODE_SHIFT | 28u << 16 | 1538u),
+    VCTZH_OPCODE   = (4u  << OPCODE_SHIFT | 29u << 16 | 1538u),
+    VCTZW_OPCODE   = (4u  << OPCODE_SHIFT | 30u << 16 | 1538u),
+    VCTZD_OPCODE   = (4u  << OPCODE_SHIFT | 31u << 16 | 1538u),
 
     // Vector Floating-Point
     // not implemented yet
@@ -2334,6 +2343,14 @@ class Assembler : public AbstractAssembler {
   inline void vpopcnth( VectorRegister d, VectorRegister b);
   inline void vpopcntw( VectorRegister d, VectorRegister b);
   inline void vpopcntd( VectorRegister d, VectorRegister b);
+  inline void vclzb(    VectorRegister d, VectorRegister b);
+  inline void vclzh(    VectorRegister d, VectorRegister b);
+  inline void vclzw(    VectorRegister d, VectorRegister b);
+  inline void vclzd(    VectorRegister d, VectorRegister b);
+  inline void vctzb(    VectorRegister d, VectorRegister b);
+  inline void vctzh(    VectorRegister d, VectorRegister b);
+  inline void vctzw(    VectorRegister d, VectorRegister b);
+  inline void vctzd(    VectorRegister d, VectorRegister b);
   // Vector Floating-Point not implemented yet
   inline void mtvscr(   VectorRegister b);
   inline void mfvscr(   VectorRegister d);
@@ -2358,6 +2375,7 @@ class Assembler : public AbstractAssembler {
   inline void xxmrglw(  VectorSRegister d, VectorSRegister a, VectorSRegister b);
   inline void mtvsrd(   VectorSRegister d, Register a);
   inline void mfvsrd(   Register        d, VectorSRegister a);
+  inline void mfvsrld(  Register        d, VectorSRegister a); // Requires Power9.
   inline void mtvsrdd(  VectorSRegister d, Register a, Register b);
   inline void mtvsrwz(  VectorSRegister d, Register a);
   inline void mfvsrwz(  Register        d, VectorSRegister a);
diff --git a/src/hotspot/cpu/ppc/assembler_ppc.inline.hpp b/src/hotspot/cpu/ppc/assembler_ppc.inline.hpp
index ab026d35662..4fb8c5c4198 100644
--- a/src/hotspot/cpu/ppc/assembler_ppc.inline.hpp
+++ b/src/hotspot/cpu/ppc/assembler_ppc.inline.hpp
@@ -873,6 +873,7 @@ inline void Assembler::stxvd2x( VectorSRegister d, Register s1, Register s2) { e
 inline void Assembler::mtvsrd(  VectorSRegister d, Register a)               { emit_int32( MTVSRD_OPCODE  | vsrt(d)  | ra(a)); }
 inline void Assembler::mtvsrdd( VectorSRegister d, Register a, Register b)   { emit_int32( MTVSRDD_OPCODE | vsrt(d)  | ra(a) | rb(b)); }
 inline void Assembler::mfvsrd(  Register d, VectorSRegister a)               { emit_int32( MFVSRD_OPCODE  | vsrs(a)  | ra(d)); }
+inline void Assembler::mfvsrld( Register d, VectorSRegister a)               { emit_int32( MFVSRLD_OPCODE | vsrs(a)  | ra(d)); }
 inline void Assembler::mtvsrwz( VectorSRegister d, Register a)               { emit_int32( MTVSRWZ_OPCODE | vsrt(d) | ra(a)); }
 inline void Assembler::mfvsrwz( Register d, VectorSRegister a)               { emit_int32( MFVSRWZ_OPCODE | vsrs(a) | ra(d)); }
 inline void Assembler::xxspltib(VectorSRegister d, int ui8)                  { emit_int32( XXSPLTIB_OPCODE | vsrt(d) | imm8(ui8)); }
@@ -1076,6 +1077,14 @@ inline void Assembler::vpopcntb(VectorRegister d, VectorRegister b)
 inline void Assembler::vpopcnth(VectorRegister d, VectorRegister b)                   { emit_int32( VPOPCNTH_OPCODE | vrt(d) | vrb(b)); }
 inline void Assembler::vpopcntw(VectorRegister d, VectorRegister b)                   { emit_int32( VPOPCNTW_OPCODE | vrt(d) | vrb(b)); }
 inline void Assembler::vpopcntd(VectorRegister d, VectorRegister b)                   { emit_int32( VPOPCNTD_OPCODE | vrt(d) | vrb(b)); }
+inline void Assembler::vclzb(   VectorRegister d, VectorRegister b)                   { emit_int32( VCLZB_OPCODE    | vrt(d) | vrb(b)); }
+inline void Assembler::vclzh(   VectorRegister d, VectorRegister b)                   { emit_int32( VCLZH_OPCODE    | vrt(d) | vrb(b)); }
+inline void Assembler::vclzw(   VectorRegister d, VectorRegister b)                   { emit_int32( VCLZW_OPCODE    | vrt(d) | vrb(b)); }
+inline void Assembler::vclzd(   VectorRegister d, VectorRegister b)                   { emit_int32( VCLZD_OPCODE    | vrt(d) | vrb(b)); }
+inline void Assembler::vctzb(   VectorRegister d, VectorRegister b)                   { emit_int32( VCTZB_OPCODE    | vrt(d) | vrb(b)); }
+inline void Assembler::vctzh(   VectorRegister d, VectorRegister b)                   { emit_int32( VCTZH_OPCODE    | vrt(d) | vrb(b)); }
+inline void Assembler::vctzw(   VectorRegister d, VectorRegister b)                   { emit_int32( VCTZW_OPCODE    | vrt(d) | vrb(b)); }
+inline void Assembler::vctzd(   VectorRegister d, VectorRegister b)                   { emit_int32( VCTZD_OPCODE    | vrt(d) | vrb(b)); }
 inline void Assembler::mtvscr(  VectorRegister b)                                     { emit_int32( MTVSCR_OPCODE   | vrb(b)); }
 inline void Assembler::mfvscr(  VectorRegister d)                                     { emit_int32( MFVSCR_OPCODE   | vrt(d)); }
 
diff --git a/src/hotspot/cpu/ppc/ppc.ad b/src/hotspot/cpu/ppc/ppc.ad
index 2504c613d78..acb98f8ea5c 100644
--- a/src/hotspot/cpu/ppc/ppc.ad
+++ b/src/hotspot/cpu/ppc/ppc.ad
@@ -2108,7 +2108,12 @@ bool Matcher::match_rule_supported(int opcode) {
     case Op_RoundDoubleModeV:
       return SuperwordUseVSX;
     case Op_PopCountVI:
+    case Op_PopCountVL:
       return (SuperwordUseVSX && UsePopCountInstruction);
+    case Op_CountLeadingZerosV:
+      return SuperwordUseVSX && UseCountLeadingZerosInstructionsPPC64;
+    case Op_CountTrailingZerosV:
+      return SuperwordUseVSX && UseCountTrailingZerosInstructionsPPC64;
     case Op_FmaF:
     case Op_FmaD:
       return UseFMA;
@@ -14077,10 +14082,11 @@ instruct vsqrt2D_reg(vecX dst, vecX src) %{
   ins_pipe(pipe_class_default);
 %}
 
-// Vector Population Count Instructions
+// Vector Population Count and Zeros Count Instructions
 
 instruct vpopcnt_reg(vecX dst, vecX src) %{
   match(Set dst (PopCountVI src));
+  match(Set dst (PopCountVL src));
   format %{ "VPOPCNT $dst,$src\t// pop count packed" %}
   size(4);
   ins_encode %{
@@ -14105,6 +14111,58 @@ instruct vpopcnt_reg(vecX dst, vecX src) %{
   ins_pipe(pipe_class_default);
 %}
 
+instruct vcount_leading_zeros_reg(vecX dst, vecX src) %{
+  match(Set dst (CountLeadingZerosV src));
+  format %{ "VCLZ $dst,$src\t// leading zeros count packed" %}
+  size(4);
+  ins_encode %{
+    BasicType bt = Matcher::vector_element_basic_type(this);
+    switch (bt) {
+      case T_BYTE:
+        __ vclzb($dst$$VectorSRegister->to_vr(), $src$$VectorSRegister->to_vr());
+        break;
+      case T_SHORT:
+        __ vclzh($dst$$VectorSRegister->to_vr(), $src$$VectorSRegister->to_vr());
+        break;
+      case T_INT:
+        __ vclzw($dst$$VectorSRegister->to_vr(), $src$$VectorSRegister->to_vr());
+        break;
+      case T_LONG:
+        __ vclzd($dst$$VectorSRegister->to_vr(), $src$$VectorSRegister->to_vr());
+        break;
+      default:
+        ShouldNotReachHere();
+    }
+  %}
+  ins_pipe(pipe_class_default);
+%}
+
+instruct vcount_trailing_zeros_reg(vecX dst, vecX src) %{
+  match(Set dst (CountTrailingZerosV src));
+  format %{ "VCTZ $dst,$src\t// trailing zeros count packed" %}
+  size(4);
+  ins_encode %{
+    BasicType bt = Matcher::vector_element_basic_type(this);
+    switch (bt) {
+      case T_BYTE:
+        __ vctzb($dst$$VectorSRegister->to_vr(), $src$$VectorSRegister->to_vr());
+        break;
+      case T_SHORT:
+        __ vctzh($dst$$VectorSRegister->to_vr(), $src$$VectorSRegister->to_vr());
+        break;
+      case T_INT:
+        __ vctzw($dst$$VectorSRegister->to_vr(), $src$$VectorSRegister->to_vr());
+        break;
+      case T_LONG:
+        __ vctzd($dst$$VectorSRegister->to_vr(), $src$$VectorSRegister->to_vr());
+        break;
+      default:
+        ShouldNotReachHere();
+    }
+  %}
+  ins_pipe(pipe_class_default);
+%}
+
 // --------------------------------- FMA --------------------------------------
 // src1 * src2 + dst
 instruct vfma4F(vecX dst, vecX src1, vecX src2) %{
diff --git a/test/hotspot/jtreg/compiler/vectorization/TestNumberOfContinuousZeros.java b/test/hotspot/jtreg/compiler/vectorization/TestNumberOfContinuousZeros.java
index 3a273c7be8c..9eda6f85e3d 100644
--- a/test/hotspot/jtreg/compiler/vectorization/TestNumberOfContinuousZeros.java
+++ b/test/hotspot/jtreg/compiler/vectorization/TestNumberOfContinuousZeros.java
@@ -30,7 +30,8 @@
 * @requires vm.compiler2.enabled
 * @requires (os.simpleArch == "x64" & vm.cpu.features ~= ".*avx2.*") |
 *           (os.simpleArch == "aarch64" & vm.cpu.features ~= ".*sve.*") |
-*           (os.simpleArch == "riscv64" & vm.cpu.features ~= ".*zvbb.*")
+*           (os.simpleArch == "riscv64" & vm.cpu.features ~= ".*zvbb.*") |
+*           ((os.arch == "ppc64" | os.arch == "ppc64le") & vm.cpu.features ~= ".*darn.*")
 * @library /test/lib /
 * @modules jdk.incubator.vector
 * @run driver compiler.vectorization.TestNumberOfContinuousZeros
@@ -70,7 +71,8 @@ public class TestNumberOfContinuousZeros {
     }
 
     @Test
-    @IR(counts = {IRNode.COUNT_TRAILING_ZEROS_VL, "> 0"})
+    @IR(applyIfPlatformOr = {"x64", "true", "aarch64", "true", "riscv64", "true"},
+        counts = {IRNode.COUNT_TRAILING_ZEROS_VL, "> 0"})
     public void vectorizeNumberOfTrailingZerosLong() {
         for (int i = 0; i < LEN; ++i) {
             outputLong[i] = Long.numberOfTrailingZeros(inputLong[i]);
@@ -78,7 +80,8 @@ public class TestNumberOfContinuousZeros {
     }
 
     @Test
-    @IR(counts = {IRNode.COUNT_LEADING_ZEROS_VL, "> 0"})
+    @IR(applyIfPlatformOr = {"x64", "true", "aarch64", "true", "riscv64", "true"},
+        counts = {IRNode.COUNT_LEADING_ZEROS_VL, "> 0"})
     public void vectorizeNumberOfLeadingZerosLong() {
         for (int i = 0; i < LEN; ++i) {
             outputLong[i] = Long.numberOfLeadingZeros(inputLong[i]);

From 993eae4aa591ec9610b9d8bc03382a225c93d844 Mon Sep 17 00:00:00 2001
From: Naoto Sato <naoto@openjdk.org>
Date: Tue, 25 Mar 2025 15:52:18 +0000
Subject: [PATCH 481/587] 8346948: Update CLDR to Version 47.0

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

diff --git a/make/data/cldr/LICENSE b/make/data/cldr/LICENSE
index 99bd0beafbb..9065fe54d8b 100644
--- a/make/data/cldr/LICENSE
+++ b/make/data/cldr/LICENSE
@@ -1,8 +1,8 @@
-UNICODE LICENSE V3
+UNICODE LICENSE V3
 
 COPYRIGHT AND PERMISSION NOTICE
 
-Copyright © 1991-2024 Unicode, Inc.
+Copyright © 2019-2025 Unicode, Inc.
 
 NOTICE TO USER: Carefully read the following legal agreement. BY
 DOWNLOADING, INSTALLING, COPYING OR OTHERWISE USING DATA FILES, AND/OR
diff --git a/make/data/cldr/common/bcp47/collation.xml b/make/data/cldr/common/bcp47/collation.xml
index bb51229ede1..d8c29685cad 100644
--- a/make/data/cldr/common/bcp47/collation.xml
+++ b/make/data/cldr/common/bcp47/collation.xml
@@ -10,14 +10,14 @@ For terms of use, see http://www.unicode.org/copyright.html
     <version number="$Revision$"/>
     <keyword>
         <key name="co" description="Collation type key" alias="collation">
-            <type name="big5han" description="Pinyin ordering for Latin, big5 charset ordering for CJK characters (used in Chinese)"/>
+            <type name="big5han" description="Pinyin ordering for Latin, big5 charset ordering for CJK characters (used in Chinese)" deprecated="true"/>
             <type name="compat" description="A previous version of the ordering, for compatibility" since="26"/>
             <type name="dict" description="Dictionary style ordering (such as in Sinhala)" alias="dictionary"/>
             <type name="direct" description="Binary code point order (used in Hindi)" deprecated="true"/>
             <type name="ducet" description="The default Unicode collation element table order" since="2.0.1"/>
             <type name="emoji" description="Recommended ordering for emoji characters" since="27"/>
             <type name="eor" description="European ordering rules" since="24"/>
-            <type name="gb2312" description="Pinyin ordering for Latin, gb2312han charset ordering for CJK characters (used in Chinese)" alias="gb2312han"/>
+            <type name="gb2312" description="Pinyin ordering for Latin, gb2312han charset ordering for CJK characters (used in Chinese)" alias="gb2312han" deprecated="true"/>
             <type name="phonebk" description="Phonebook style ordering (such as in German)" alias="phonebook"/>
             <type name="phonetic" description="Phonetic ordering (sorting based on pronunciation)"/>
             <type name="pinyin" description="Pinyin ordering for Latin and for CJK characters (used in Chinese)"/>
diff --git a/make/data/cldr/common/dtd/ldml.dtd b/make/data/cldr/common/dtd/ldml.dtd
index efe1565f53d..4ef94ba67ca 100644
--- a/make/data/cldr/common/dtd/ldml.dtd
+++ b/make/data/cldr/common/dtd/ldml.dtd
@@ -1,5 +1,5 @@
 <!--
-Copyright © 1991-2024 Unicode, Inc.
+Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -42,7 +42,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 <!ATTLIST version number CDATA #REQUIRED >
     <!--@MATCH:regex/\$Revision.*\$-->
     <!--@METADATA-->
-<!ATTLIST version cldrVersion CDATA #FIXED "46" >
+<!ATTLIST version cldrVersion CDATA #FIXED "47" >
     <!--@MATCH:any-->
     <!--@VALUE-->
 <!ATTLIST version draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
@@ -61,7 +61,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 
 <!ELEMENT language ( #PCDATA ) >
 <!ATTLIST language type NMTOKEN #REQUIRED >
-    <!--@MATCH:validity/locale-->
+    <!--@MATCH:validity/locale-for-names-->
 <!ATTLIST language alt NMTOKENS #IMPLIED >
     <!--@MATCH:literal/long, secondary, short, variant, menu, official-->
 <!ATTLIST language draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
@@ -95,7 +95,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 
 <!ELEMENT variant ( #PCDATA ) >
 <!ATTLIST variant type NMTOKEN #REQUIRED >
-    <!--@MATCH:validity/variant-->
+    <!--@MATCH:or/validity/variant||literal/AREVELA, AREVMDA, LAUKIKA, VAIDIKA-->
 <!ATTLIST variant alt NMTOKENS #IMPLIED >
     <!--@MATCH:literal/secondary, variant-->
 <!ATTLIST variant draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
diff --git a/make/data/cldr/common/dtd/ldml.xsd b/make/data/cldr/common/dtd/ldml.xsd
index ee03c2275cc..973251f2f69 100644
--- a/make/data/cldr/common/dtd/ldml.xsd
+++ b/make/data/cldr/common/dtd/ldml.xsd
@@ -5,7 +5,7 @@ Note: DTD @-annotations are not currently converted to .xsd. For full CLDR file
 -->
 
 <!--
-  Copyright © 1991-2024 Unicode, Inc.
+  Copyright © 1991-2025 Unicode, Inc.
   For terms of use, see http://www.unicode.org/copyright.html
   SPDX-License-Identifier: Unicode-3.0
   CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -128,10 +128,10 @@ Note: DTD @-annotations are not currently converted to .xsd. For full CLDR file
   <xs:element name="version">
     <xs:complexType>
       <xs:attribute name="number" use="required"/>
-      <xs:attribute default="46" name="cldrVersion">
+      <xs:attribute default="47" name="cldrVersion">
         <xs:simpleType>
           <xs:restriction base="xs:string">
-            <xs:enumeration value="46"/>
+            <xs:enumeration value="47"/>
           </xs:restriction>
         </xs:simpleType>
       </xs:attribute>
diff --git a/make/data/cldr/common/dtd/ldmlBCP47.dtd b/make/data/cldr/common/dtd/ldmlBCP47.dtd
index e69ae1e7724..21ab9e836b7 100644
--- a/make/data/cldr/common/dtd/ldmlBCP47.dtd
+++ b/make/data/cldr/common/dtd/ldmlBCP47.dtd
@@ -1,5 +1,5 @@
 <!--
-Copyright © 1991-2024 Unicode, Inc.
+Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -12,7 +12,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 <!ATTLIST version number CDATA #REQUIRED >
     <!--@MATCH:regex/\$Revision.*\$-->
     <!--@METADATA-->
-<!ATTLIST version cldrVersion CDATA #FIXED "46" >
+<!ATTLIST version cldrVersion CDATA #FIXED "47" >
     <!--@MATCH:version-->
     <!--@VALUE-->
 
diff --git a/make/data/cldr/common/dtd/ldmlBCP47.xsd b/make/data/cldr/common/dtd/ldmlBCP47.xsd
index d55d3f40728..3abe9785334 100644
--- a/make/data/cldr/common/dtd/ldmlBCP47.xsd
+++ b/make/data/cldr/common/dtd/ldmlBCP47.xsd
@@ -5,7 +5,7 @@ Note: DTD @-annotations are not currently converted to .xsd. For full CLDR file
 -->
 
 <!--
-  Copyright © 1991-2024 Unicode, Inc.
+  Copyright © 1991-2025 Unicode, Inc.
   For terms of use, see http://www.unicode.org/copyright.html
   SPDX-License-Identifier: Unicode-3.0
   CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -24,10 +24,10 @@ Note: DTD @-annotations are not currently converted to .xsd. For full CLDR file
   <xs:element name="version">
     <xs:complexType>
       <xs:attribute name="number" use="required"/>
-      <xs:attribute default="46" name="cldrVersion">
+      <xs:attribute default="47" name="cldrVersion">
         <xs:simpleType>
           <xs:restriction base="xs:string">
-            <xs:enumeration value="46"/>
+            <xs:enumeration value="47"/>
           </xs:restriction>
         </xs:simpleType>
       </xs:attribute>
diff --git a/make/data/cldr/common/dtd/ldmlSupplemental.dtd b/make/data/cldr/common/dtd/ldmlSupplemental.dtd
index 338b8be5c99..6667ea902b9 100644
--- a/make/data/cldr/common/dtd/ldmlSupplemental.dtd
+++ b/make/data/cldr/common/dtd/ldmlSupplemental.dtd
@@ -1,18 +1,18 @@
 <!--
-Copyright © 1991-2024 Unicode, Inc.
+Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 -->
 
-<!ELEMENT supplementalData ( version, generation?, cldrVersion?, currencyData?, territoryContainment?, subdivisionContainment?, languageData?, territoryInfo?, postalCodeData?, calendarData?, calendarPreferenceData?, weekData?, timeData?, measurementData?, unitIdComponents?, unitPrefixes?, unitConstants*, unitQuantities*, convertUnits*, unitPreferenceData?, timezoneData?, characters?, transforms?, metadata?, codeMappings?, parentLocales*, personNamesDefaults?, likelySubtags?, metazoneInfo?, plurals?, telephoneCodeData?, numberingSystems?, bcp47KeywordMappings?, gender?, references?, languageMatching?, dayPeriodRuleSet*, metaZones?, primaryZones?, windowsZones?, coverageLevels?, idValidity?, rgScope?, languageGroups?, grammaticalData? ) >
+<!ELEMENT supplementalData ( version, generation?, cldrVersion?, currencyData?, territoryContainment?, subdivisionContainment?, languageData?, scriptData?, territoryInfo?, postalCodeData?, calendarData?, calendarPreferenceData?, weekData?, timeData?, measurementData?, unitIdComponents?, unitPrefixes?, unitConstants*, unitQuantities*, convertUnits*, unitPreferenceData?, timezoneData?, characters?, transforms?, metadata?, codeMappings?, parentLocales*, personNamesDefaults?, likelySubtags?, metazoneInfo?, plurals?, telephoneCodeData?, numberingSystems?, bcp47KeywordMappings?, gender?, references?, languageMatching?, dayPeriodRuleSet*, metaZones?, primaryZones?, windowsZones?, coverageLevels?, idValidity?, rgScope?, languageGroups?, grammaticalData? ) >
 
 <!ELEMENT version EMPTY >
     <!--@METADATA-->
 <!ATTLIST version number CDATA #REQUIRED >
     <!--@MATCH:any-->
     <!--@METADATA-->
-<!ATTLIST version cldrVersion CDATA #FIXED "46" >
+<!ATTLIST version cldrVersion CDATA #FIXED "47" >
     <!--@MATCH:version-->
     <!--@VALUE-->
 <!ATTLIST version unicodeVersion CDATA #FIXED "16.0.0" >
@@ -65,12 +65,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 
 <!ELEMENT region ( currency* ) >
 <!ATTLIST region iso3166 NMTOKEN #REQUIRED >
-    <!--@MATCH:validity/region-->
+    <!--@MATCH:validity/region/all-->
 <!ATTLIST region draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED-->
 
 <!ELEMENT currency ( alternate* ) >
+    <!--@ORDERED-->
 <!ATTLIST currency before NMTOKEN #IMPLIED >
     <!-- use from and to instead. -->
     <!--@VALUE-->
@@ -113,7 +114,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 <!ATTLIST group type NMTOKEN #REQUIRED >
     <!--@MATCH:validity/region-->
 <!ATTLIST group contains NMTOKENS #IMPLIED >
-    <!--@MATCH:set/validity/region-->
+    <!--@MATCH:set/validity/region/all-->
     <!--@VALUE-->
 <!ATTLIST group grouping (true | false) #IMPLIED >
     <!--@VALUE-->
@@ -156,6 +157,17 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 <!ATTLIST language alt NMTOKENS #IMPLIED >
     <!--@MATCH:literal/secondary, variant-->
 
+<!ELEMENT scriptData ( scriptVariant* ) >
+
+<!ELEMENT scriptVariant EMPTY >
+<!ATTLIST scriptVariant type NMTOKEN #REQUIRED >
+    <!--@MATCH:literal/compound, visual, subset-->
+<!ATTLIST scriptVariant id NMTOKEN #REQUIRED >
+    <!--@MATCH:validity/script-->
+<!ATTLIST scriptVariant base NMTOKENS #REQUIRED >
+    <!--@MATCH:set/validity/script-->
+    <!--@VALUE-->
+
 <!ELEMENT territoryInfo ( territory* ) >
 <!ATTLIST territoryInfo draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
@@ -284,7 +296,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 <!ELEMENT minDays EMPTY >
 <!ATTLIST minDays count (1 | 2 | 3 | 4 | 5 | 6 | 7) #REQUIRED >
 <!ATTLIST minDays territories NMTOKENS #REQUIRED >
-    <!--@MATCH:set/validity/region-->
+    <!--@MATCH:set/validity/region/all-->
     <!--@VALUE-->
 <!ATTLIST minDays draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
@@ -297,7 +309,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 <!ELEMENT firstDay EMPTY >
 <!ATTLIST firstDay day (sun | mon | tue | wed | thu | fri | sat) #REQUIRED >
 <!ATTLIST firstDay territories NMTOKENS #REQUIRED >
-    <!--@MATCH:set/validity/region-->
+    <!--@MATCH:set/validity/region/all-->
     <!--@VALUE-->
 <!ATTLIST firstDay draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
@@ -702,7 +714,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 
 <!ELEMENT languageAlias EMPTY >
 <!ATTLIST languageAlias type NMTOKEN #REQUIRED >
-    <!--@MATCH:or/validity/locale||literal/aa_saaho, aar, abk, afr, aka, alb, amh, ara, arg, arm, art_lojban, asm, ava, ave, aym, aze, bak, bam, baq, bel, ben, bih, bis, bod, bos, bre, bul, bur, cat, ces, cha, che, chi, chu, chv, cor, cos, cre, cym, cze, dan, deu, div, dut, dzo, ell, eng, epo, est, eus, ewe, fao, fas, fij, fin, fra, fre, fry, ful, geo, ger, gla, gle, glg, glv, gre, grn, guj, hat, hau, hbs, heb, her, hin, hmo, hrv, hun, hye, i_ami, i_bnn, i_hak, i_klingon, i_lux, i_navajo, i_pwn, i_tao, i_tay, i_tsu, ibo, ice, ido, iii, iku, ile, ina, ind, ipk, isl, ita, jav, jpn, kal, kan, kas, kat, kau, kaz, khm, kik, kin, kir, kom, kon, kor, kua, kur, lao, lat, lav, lim, lin, lit, ltz, lub, lug, mac, mah, mal, mao, mar, may, mkd, mlg, mlt, mol, mon, mri, msa, mya, nau, nav, nbl, nde, ndo, nep, nld, nno, no_bokmal, no_nynorsk, no_bok, no_nyn, nob, nor, nya, oci, oji, ori, orm, oss, pan, per, pli, pol, por, pus, que, roh, ron, rum, run, rus, sag, san, scc, scr, sgn_BE_FR, sgn_BE_NL, sgn_CH_DE, sin, slk, slo, slv, sme, smo, sna, snd, som, sot, spa, sqi, srd, srp, ssw, sun, swa, swe, tah, tam, tat, tel, tgk, tgl, tha, tib, tir, ton, tsn, tso, tuk, tur, twi, uig, ukr, urd, uzb, ven, vie, vol, wel, wln, wol, xho, yid, yor, zh_guoyu, zh_hakka, zh_min_nan, zh_xiang, zha, zho, zul, cel_gaulish, i_default, i_enochian, i_mingo, und_aaland, und_bokmal, und_hakka, und_lojban, und_nynorsk, und_saaho, und_xiang, zh_min, en_GB_oed, zh_cmn, zh_cmn_Hans, zh_cmn_Hant, zh_gan, zh_wuu, zh_yue-->
+    <!--@MATCH:or/validity/bcp47-wellformed||literal/aa_saaho, art_lojban, cel_gaulish, en_GB_oed, hy_arevmda, i_ami, i_bnn, i_default, i_enochian, i_hak, i_klingon, i_lux, i_mingo, i_navajo, i_pwn, i_tao, i_tay, i_tsu, no_bok, no_bokmal, no_nyn, no_nynorsk, sgn_BE_FR, sgn_BE_NL, sgn_BR, sgn_CH_DE, sgn_CO, sgn_DE, sgn_DK, sgn_ES, sgn_FR, sgn_GB, sgn_GR, sgn_IE, sgn_IT, sgn_JP, sgn_MX, sgn_NI, sgn_NL, sgn_NO, sgn_PT, sgn_SE, sgn_US, sgn_ZA, und_aaland, und_arevela, und_arevmda, und_bokmal, und_hakka, und_hepburn_heploc, und_lojban, und_nynorsk, und_saaho, und_xiang, zh_cmn, zh_cmn_Hans, zh_cmn_Hant, zh_gan, zh_guoyu, zh_hakka, zh_min, zh_min_nan, zh_wuu, zh_xiang, zh_yue-->
 <!ATTLIST languageAlias replacement NMTOKEN #REQUIRED >
     <!--@MATCH:or/validity/locale||literal/en_x_i_default, nan_x_zh_min, see_x_i_mingo, und_x_i_enochian, xtg_x_cel_gaulish-->
     <!--@VALUE-->
@@ -711,7 +723,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 
 <!ELEMENT scriptAlias EMPTY >
 <!ATTLIST scriptAlias type NMTOKEN #REQUIRED >
-    <!--@MATCH:validity/script-->
+    <!--@MATCH:validity/script/all-->
 <!ATTLIST scriptAlias replacement NMTOKEN #REQUIRED >
     <!--@MATCH:validity/script-->
     <!--@VALUE-->
@@ -720,9 +732,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 
 <!ELEMENT territoryAlias EMPTY >
 <!ATTLIST territoryAlias type NMTOKEN #REQUIRED >
-    <!--@MATCH:set/or/validity/region||regex/[0-9]{3}|[A-Z]{3}||literal/CT, DY, FQ, HV, JT, MI, NH, NQ, PC, PU, PZ, RH, UK, VD, WK-->
+    <!--@MATCH:set/or/validity/region/all||regex/[0-9]{3}|[A-Z]{3}||literal/CT, DY, FQ, HV, JT, MI, NH, NQ, PC, PU, PZ, RH, UK, VD, WK-->
 <!ATTLIST territoryAlias replacement NMTOKENS #REQUIRED >
-    <!--@MATCH:set/validity/region-->
+    <!--@MATCH:set/validity/region/all-->
     <!--@VALUE-->
 <!ATTLIST territoryAlias reason (deprecated | overlong) #IMPLIED >
     <!--@VALUE-->
@@ -738,7 +750,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 
 <!ELEMENT variantAlias EMPTY >
 <!ATTLIST variantAlias type NMTOKEN #REQUIRED >
-    <!--@MATCH:or/validity/variant||literal/aaland, polytoni-->
+    <!--@MATCH:or/validity/variant/all||literal/aaland, polytoni-->
 <!ATTLIST variantAlias replacement NMTOKEN #REQUIRED >
     <!--@MATCH:or/validity/variant||validity/region||literal/hy, hyw-->
     <!--@VALUE-->
@@ -914,7 +926,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 
 <!ELEMENT territoryCodes EMPTY >
 <!ATTLIST territoryCodes type NMTOKEN #REQUIRED >
-    <!--@MATCH:validity/region-->
+    <!--@MATCH:validity/region/all-->
 <!ATTLIST territoryCodes numeric NMTOKEN #IMPLIED >
     <!--@MATCH:range/1~999-->
     <!--@VALUE-->
@@ -962,9 +974,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 
 <!ELEMENT likelySubtag EMPTY >
 <!ATTLIST likelySubtag from NMTOKEN #REQUIRED >
-    <!--@MATCH:validity/locale-->
+    <!--@MATCH:validity/locale-for-likely-->
 <!ATTLIST likelySubtag to NMTOKEN #REQUIRED >
-    <!--@MATCH:validity/locale-->
+    <!--@MATCH:validity/locale-for-likely-->
     <!--@VALUE-->
 <!ATTLIST likelySubtag origin NMTOKENS #IMPLIED >
     <!--@MATCH:set/literal/sil1, wikidata, special-->
@@ -996,7 +1008,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 
 <!ELEMENT pluralRules ( pluralRule* ) >
 <!ATTLIST pluralRules locales NMTOKENS #REQUIRED >
-    <!--@MATCH:set/validity/locale-->
+    <!--@MATCH:set/or/validity/locale-for-likely||literal/sh-->
 <!ATTLIST pluralRules draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED-->
diff --git a/make/data/cldr/common/dtd/ldmlSupplemental.xsd b/make/data/cldr/common/dtd/ldmlSupplemental.xsd
index 6716f017f62..b7c64ddb38d 100644
--- a/make/data/cldr/common/dtd/ldmlSupplemental.xsd
+++ b/make/data/cldr/common/dtd/ldmlSupplemental.xsd
@@ -5,7 +5,7 @@ Note: DTD @-annotations are not currently converted to .xsd. For full CLDR file
 -->
 
 <!--
-  Copyright © 1991-2024 Unicode, Inc.
+  Copyright © 1991-2025 Unicode, Inc.
   For terms of use, see http://www.unicode.org/copyright.html
   SPDX-License-Identifier: Unicode-3.0
   CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -20,6 +20,7 @@ Note: DTD @-annotations are not currently converted to .xsd. For full CLDR file
         <xs:element minOccurs="0" ref="territoryContainment"/>
         <xs:element minOccurs="0" ref="subdivisionContainment"/>
         <xs:element minOccurs="0" ref="languageData"/>
+        <xs:element minOccurs="0" ref="scriptData"/>
         <xs:element minOccurs="0" ref="territoryInfo"/>
         <xs:element minOccurs="0" ref="postalCodeData"/>
         <xs:element minOccurs="0" ref="calendarData"/>
@@ -64,10 +65,10 @@ Note: DTD @-annotations are not currently converted to .xsd. For full CLDR file
   <xs:element name="version">
     <xs:complexType>
       <xs:attribute name="number" use="required"/>
-      <xs:attribute default="46" name="cldrVersion">
+      <xs:attribute default="47" name="cldrVersion">
         <xs:simpleType>
           <xs:restriction base="xs:string">
-            <xs:enumeration value="46"/>
+            <xs:enumeration value="47"/>
           </xs:restriction>
         </xs:simpleType>
       </xs:attribute>
@@ -241,6 +242,7 @@ Note: DTD @-annotations are not currently converted to .xsd. For full CLDR file
       <xs:attribute name="references"/>
     </xs:complexType>
   </xs:element>
+  
   <!-- use from and to instead. -->
   
   
@@ -372,6 +374,24 @@ Note: DTD @-annotations are not currently converted to .xsd. For full CLDR file
   
   
   
+  <xs:element name="scriptData">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element maxOccurs="unbounded" minOccurs="0" ref="scriptVariant"/>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="scriptVariant">
+    <xs:complexType>
+      <xs:attribute name="type" type="xs:NMTOKEN" use="required"/>
+      <xs:attribute name="id" type="xs:NMTOKEN" use="required"/>
+      <xs:attribute name="base" type="xs:NMTOKENS" use="required"/>
+    </xs:complexType>
+  </xs:element>
+  
+  
+  
+  
   <xs:element name="territoryInfo">
     <xs:complexType>
       <xs:sequence>
diff --git a/make/data/cldr/common/main/aa.xml b/make/data/cldr/common/main/aa.xml
index bb823863fa4..3ff6fb6dd06 100644
--- a/make/data/cldr/common/main/aa.xml
+++ b/make/data/cldr/common/main/aa.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/aa_DJ.xml b/make/data/cldr/common/main/aa_DJ.xml
index e5e7af3d720..c4f0b19dd72 100644
--- a/make/data/cldr/common/main/aa_DJ.xml
+++ b/make/data/cldr/common/main/aa_DJ.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/aa_ER.xml b/make/data/cldr/common/main/aa_ER.xml
index d1d87be1704..a106efffb22 100644
--- a/make/data/cldr/common/main/aa_ER.xml
+++ b/make/data/cldr/common/main/aa_ER.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/aa_ET.xml b/make/data/cldr/common/main/aa_ET.xml
index 3a8f936daf9..daa020403de 100644
--- a/make/data/cldr/common/main/aa_ET.xml
+++ b/make/data/cldr/common/main/aa_ET.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/ab.xml b/make/data/cldr/common/main/ab.xml
index 5bb1fd2c891..07e0dfa4fae 100644
--- a/make/data/cldr/common/main/ab.xml
+++ b/make/data/cldr/common/main/ab.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/ab_GE.xml b/make/data/cldr/common/main/ab_GE.xml
index 25fd9298245..d5d73ae5e82 100644
--- a/make/data/cldr/common/main/ab_GE.xml
+++ b/make/data/cldr/common/main/ab_GE.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/af.xml b/make/data/cldr/common/main/af.xml
index aae485668df..17355745ca1 100644
--- a/make/data/cldr/common/main/af.xml
+++ b/make/data/cldr/common/main/af.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/af_NA.xml b/make/data/cldr/common/main/af_NA.xml
index 555c035b0b0..1f0051d33a4 100644
--- a/make/data/cldr/common/main/af_NA.xml
+++ b/make/data/cldr/common/main/af_NA.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/af_ZA.xml b/make/data/cldr/common/main/af_ZA.xml
index 5d04978a1e8..7aab0d2ab0f 100644
--- a/make/data/cldr/common/main/af_ZA.xml
+++ b/make/data/cldr/common/main/af_ZA.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/agq.xml b/make/data/cldr/common/main/agq.xml
index 29ca92bb633..d543b21cc5c 100644
--- a/make/data/cldr/common/main/agq.xml
+++ b/make/data/cldr/common/main/agq.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/agq_CM.xml b/make/data/cldr/common/main/agq_CM.xml
index 4ed8914f419..ed1f9ab0e3e 100644
--- a/make/data/cldr/common/main/agq_CM.xml
+++ b/make/data/cldr/common/main/agq_CM.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/ak.xml b/make/data/cldr/common/main/ak.xml
index 74c9de0c9ad..f2417e895de 100644
--- a/make/data/cldr/common/main/ak.xml
+++ b/make/data/cldr/common/main/ak.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/ak_GH.xml b/make/data/cldr/common/main/ak_GH.xml
index 820e726a52c..1fdba5bbf8f 100644
--- a/make/data/cldr/common/main/ak_GH.xml
+++ b/make/data/cldr/common/main/ak_GH.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/am.xml b/make/data/cldr/common/main/am.xml
index 558567ed9df..aa3e9dbded4 100644
--- a/make/data/cldr/common/main/am.xml
+++ b/make/data/cldr/common/main/am.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/am_ET.xml b/make/data/cldr/common/main/am_ET.xml
index c66f2029440..fc0413bc40a 100644
--- a/make/data/cldr/common/main/am_ET.xml
+++ b/make/data/cldr/common/main/am_ET.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/an.xml b/make/data/cldr/common/main/an.xml
index 5786203541a..6349366dec4 100644
--- a/make/data/cldr/common/main/an.xml
+++ b/make/data/cldr/common/main/an.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/an_ES.xml b/make/data/cldr/common/main/an_ES.xml
index 7e83c2651ea..648da40c534 100644
--- a/make/data/cldr/common/main/an_ES.xml
+++ b/make/data/cldr/common/main/an_ES.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/ann.xml b/make/data/cldr/common/main/ann.xml
index 49486a7f08f..98fd77b92ac 100644
--- a/make/data/cldr/common/main/ann.xml
+++ b/make/data/cldr/common/main/ann.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/ann_NG.xml b/make/data/cldr/common/main/ann_NG.xml
index 66709ee4860..4d1f378a278 100644
--- a/make/data/cldr/common/main/ann_NG.xml
+++ b/make/data/cldr/common/main/ann_NG.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/apc.xml b/make/data/cldr/common/main/apc.xml
index 1db7a71aa2d..cfd9cb52666 100644
--- a/make/data/cldr/common/main/apc.xml
+++ b/make/data/cldr/common/main/apc.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/apc_SY.xml b/make/data/cldr/common/main/apc_SY.xml
index e249c49bf9a..ced77b795f9 100644
--- a/make/data/cldr/common/main/apc_SY.xml
+++ b/make/data/cldr/common/main/apc_SY.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/ar.xml b/make/data/cldr/common/main/ar.xml
index 105a81f17d2..a17155fcd2e 100644
--- a/make/data/cldr/common/main/ar.xml
+++ b/make/data/cldr/common/main/ar.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -5132,6 +5132,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<currencyFormatLength>
 				<currencyFormat type="standard">
 					<pattern>‏#,##0.00 ¤</pattern>
+					<pattern alt="noCurrency" draft="provisional">‏#,##0.00</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 			<unitPattern count="zero">{0} {1}</unitPattern>
@@ -5145,6 +5146,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<currencyFormatLength>
 				<currencyFormat type="standard">
 					<pattern>‏#,##0.00 ¤;‏-#,##0.00 ¤</pattern>
+					<pattern alt="noCurrency" draft="provisional">‏#,##0.00;‏-#,##0.00</pattern>
 				</currencyFormat>
 				<currencyFormat type="accounting">
 					<pattern>؜#,##0.00¤;(؜#,##0.00¤)</pattern>
diff --git a/make/data/cldr/common/main/ar_001.xml b/make/data/cldr/common/main/ar_001.xml
index 7ef8518fb50..ab8e5977231 100644
--- a/make/data/cldr/common/main/ar_001.xml
+++ b/make/data/cldr/common/main/ar_001.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/ar_AE.xml b/make/data/cldr/common/main/ar_AE.xml
index 16529b39227..cf626b76485 100644
--- a/make/data/cldr/common/main/ar_AE.xml
+++ b/make/data/cldr/common/main/ar_AE.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/ar_BH.xml b/make/data/cldr/common/main/ar_BH.xml
index c105c640666..e96eeea430d 100644
--- a/make/data/cldr/common/main/ar_BH.xml
+++ b/make/data/cldr/common/main/ar_BH.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/ar_DJ.xml b/make/data/cldr/common/main/ar_DJ.xml
index 434afd02fac..a6c15546480 100644
--- a/make/data/cldr/common/main/ar_DJ.xml
+++ b/make/data/cldr/common/main/ar_DJ.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/ar_DZ.xml b/make/data/cldr/common/main/ar_DZ.xml
index 75594030bb0..eb18542b3dc 100644
--- a/make/data/cldr/common/main/ar_DZ.xml
+++ b/make/data/cldr/common/main/ar_DZ.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/ar_EG.xml b/make/data/cldr/common/main/ar_EG.xml
index d135bfe0085..9df8163ab83 100644
--- a/make/data/cldr/common/main/ar_EG.xml
+++ b/make/data/cldr/common/main/ar_EG.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/ar_EH.xml b/make/data/cldr/common/main/ar_EH.xml
index 881bb4af655..ee2ca23b63e 100644
--- a/make/data/cldr/common/main/ar_EH.xml
+++ b/make/data/cldr/common/main/ar_EH.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/ar_ER.xml b/make/data/cldr/common/main/ar_ER.xml
index 954a1c05d9b..07ac97e86cd 100644
--- a/make/data/cldr/common/main/ar_ER.xml
+++ b/make/data/cldr/common/main/ar_ER.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/ar_IL.xml b/make/data/cldr/common/main/ar_IL.xml
index 5fed505dbd6..1bad397f70f 100644
--- a/make/data/cldr/common/main/ar_IL.xml
+++ b/make/data/cldr/common/main/ar_IL.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/ar_IQ.xml b/make/data/cldr/common/main/ar_IQ.xml
index 0520aec07df..32745e6cd9f 100644
--- a/make/data/cldr/common/main/ar_IQ.xml
+++ b/make/data/cldr/common/main/ar_IQ.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/ar_JO.xml b/make/data/cldr/common/main/ar_JO.xml
index 59e71c756c8..be151239d63 100644
--- a/make/data/cldr/common/main/ar_JO.xml
+++ b/make/data/cldr/common/main/ar_JO.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/ar_KM.xml b/make/data/cldr/common/main/ar_KM.xml
index ddb79577b6d..d7a54c1674e 100644
--- a/make/data/cldr/common/main/ar_KM.xml
+++ b/make/data/cldr/common/main/ar_KM.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/ar_KW.xml b/make/data/cldr/common/main/ar_KW.xml
index 845b88f9b7f..ba901ef1d8a 100644
--- a/make/data/cldr/common/main/ar_KW.xml
+++ b/make/data/cldr/common/main/ar_KW.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/ar_LB.xml b/make/data/cldr/common/main/ar_LB.xml
index c048345b83f..83032fcd60a 100644
--- a/make/data/cldr/common/main/ar_LB.xml
+++ b/make/data/cldr/common/main/ar_LB.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/ar_LY.xml b/make/data/cldr/common/main/ar_LY.xml
index cdae03aa3fb..a84b3701ded 100644
--- a/make/data/cldr/common/main/ar_LY.xml
+++ b/make/data/cldr/common/main/ar_LY.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/ar_MA.xml b/make/data/cldr/common/main/ar_MA.xml
index 2db269ed2bf..fd849c94d58 100644
--- a/make/data/cldr/common/main/ar_MA.xml
+++ b/make/data/cldr/common/main/ar_MA.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/ar_MR.xml b/make/data/cldr/common/main/ar_MR.xml
index 1d027ddd2b0..a6cbc44ed4a 100644
--- a/make/data/cldr/common/main/ar_MR.xml
+++ b/make/data/cldr/common/main/ar_MR.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/ar_OM.xml b/make/data/cldr/common/main/ar_OM.xml
index aba4c2d718d..849225bb420 100644
--- a/make/data/cldr/common/main/ar_OM.xml
+++ b/make/data/cldr/common/main/ar_OM.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/ar_PS.xml b/make/data/cldr/common/main/ar_PS.xml
index 8d815fa7aea..e126d803927 100644
--- a/make/data/cldr/common/main/ar_PS.xml
+++ b/make/data/cldr/common/main/ar_PS.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/ar_QA.xml b/make/data/cldr/common/main/ar_QA.xml
index bf6acd6b0c4..d507b528d1a 100644
--- a/make/data/cldr/common/main/ar_QA.xml
+++ b/make/data/cldr/common/main/ar_QA.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/ar_SA.xml b/make/data/cldr/common/main/ar_SA.xml
index 067dfa747a4..aafe7e5e7c7 100644
--- a/make/data/cldr/common/main/ar_SA.xml
+++ b/make/data/cldr/common/main/ar_SA.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/ar_SD.xml b/make/data/cldr/common/main/ar_SD.xml
index ca321a31d40..28d606107b9 100644
--- a/make/data/cldr/common/main/ar_SD.xml
+++ b/make/data/cldr/common/main/ar_SD.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/ar_SO.xml b/make/data/cldr/common/main/ar_SO.xml
index f5ff04ffce6..3405ed8431e 100644
--- a/make/data/cldr/common/main/ar_SO.xml
+++ b/make/data/cldr/common/main/ar_SO.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/ar_SS.xml b/make/data/cldr/common/main/ar_SS.xml
index a48c8164978..5c7eaa6c6d4 100644
--- a/make/data/cldr/common/main/ar_SS.xml
+++ b/make/data/cldr/common/main/ar_SS.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/ar_SY.xml b/make/data/cldr/common/main/ar_SY.xml
index 08c412f9ba0..b2b6ec6abfe 100644
--- a/make/data/cldr/common/main/ar_SY.xml
+++ b/make/data/cldr/common/main/ar_SY.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/ar_TD.xml b/make/data/cldr/common/main/ar_TD.xml
index e3e3a7d22a4..9d05fb6a32c 100644
--- a/make/data/cldr/common/main/ar_TD.xml
+++ b/make/data/cldr/common/main/ar_TD.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/ar_TN.xml b/make/data/cldr/common/main/ar_TN.xml
index d62cfba3157..21ff20e22f7 100644
--- a/make/data/cldr/common/main/ar_TN.xml
+++ b/make/data/cldr/common/main/ar_TN.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/ar_YE.xml b/make/data/cldr/common/main/ar_YE.xml
index 453fd471a92..c58cb6486e5 100644
--- a/make/data/cldr/common/main/ar_YE.xml
+++ b/make/data/cldr/common/main/ar_YE.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/arn.xml b/make/data/cldr/common/main/arn.xml
index ad324bf5568..ec81153ce78 100644
--- a/make/data/cldr/common/main/arn.xml
+++ b/make/data/cldr/common/main/arn.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/arn_CL.xml b/make/data/cldr/common/main/arn_CL.xml
index 25b3f50ca37..aa6a93575d6 100644
--- a/make/data/cldr/common/main/arn_CL.xml
+++ b/make/data/cldr/common/main/arn_CL.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/as.xml b/make/data/cldr/common/main/as.xml
index b3696f2ce3a..1eeb5591b56 100644
--- a/make/data/cldr/common/main/as.xml
+++ b/make/data/cldr/common/main/as.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -3955,7 +3955,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		<otherNumberingSystems>
 			<native>beng</native>
 		</otherNumberingSystems>
-		<symbols>
+		<symbols numberSystem="latn">
 			<timeSeparator draft="unconfirmed">.</timeSeparator>
 		</symbols>
 		<decimalFormats numberSystem="latn">
diff --git a/make/data/cldr/common/main/as_IN.xml b/make/data/cldr/common/main/as_IN.xml
index 3c265965eef..2a08455196b 100644
--- a/make/data/cldr/common/main/as_IN.xml
+++ b/make/data/cldr/common/main/as_IN.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/asa.xml b/make/data/cldr/common/main/asa.xml
index b7359144dc9..1e8e9139baf 100644
--- a/make/data/cldr/common/main/asa.xml
+++ b/make/data/cldr/common/main/asa.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/asa_TZ.xml b/make/data/cldr/common/main/asa_TZ.xml
index 9b70fcded72..a7fb9a81754 100644
--- a/make/data/cldr/common/main/asa_TZ.xml
+++ b/make/data/cldr/common/main/asa_TZ.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/ast.xml b/make/data/cldr/common/main/ast.xml
index e02dc9e5742..bf948f4bead 100644
--- a/make/data/cldr/common/main/ast.xml
+++ b/make/data/cldr/common/main/ast.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/ast_ES.xml b/make/data/cldr/common/main/ast_ES.xml
index 476f1892a4c..1daf4c238e5 100644
--- a/make/data/cldr/common/main/ast_ES.xml
+++ b/make/data/cldr/common/main/ast_ES.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/az.xml b/make/data/cldr/common/main/az.xml
index 7849097e10c..c349944c7a5 100644
--- a/make/data/cldr/common/main/az.xml
+++ b/make/data/cldr/common/main/az.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/az_Arab.xml b/make/data/cldr/common/main/az_Arab.xml
index 5c59e7e39ca..3c46ec62a82 100644
--- a/make/data/cldr/common/main/az_Arab.xml
+++ b/make/data/cldr/common/main/az_Arab.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/az_Arab_IQ.xml b/make/data/cldr/common/main/az_Arab_IQ.xml
index 8445320375e..4befc3cc91e 100644
--- a/make/data/cldr/common/main/az_Arab_IQ.xml
+++ b/make/data/cldr/common/main/az_Arab_IQ.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/az_Arab_IR.xml b/make/data/cldr/common/main/az_Arab_IR.xml
index 7ffa77c8b7b..dfca1875c94 100644
--- a/make/data/cldr/common/main/az_Arab_IR.xml
+++ b/make/data/cldr/common/main/az_Arab_IR.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/az_Arab_TR.xml b/make/data/cldr/common/main/az_Arab_TR.xml
index f6fd51e08a8..d30a02ee121 100644
--- a/make/data/cldr/common/main/az_Arab_TR.xml
+++ b/make/data/cldr/common/main/az_Arab_TR.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/az_Cyrl.xml b/make/data/cldr/common/main/az_Cyrl.xml
index 1cc1e2beb92..64b3e0669f3 100644
--- a/make/data/cldr/common/main/az_Cyrl.xml
+++ b/make/data/cldr/common/main/az_Cyrl.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/az_Cyrl_AZ.xml b/make/data/cldr/common/main/az_Cyrl_AZ.xml
index 0f167dc4f75..3c489f2ad7e 100644
--- a/make/data/cldr/common/main/az_Cyrl_AZ.xml
+++ b/make/data/cldr/common/main/az_Cyrl_AZ.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/az_Latn.xml b/make/data/cldr/common/main/az_Latn.xml
index 81c4777cdc4..450ae860b84 100644
--- a/make/data/cldr/common/main/az_Latn.xml
+++ b/make/data/cldr/common/main/az_Latn.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/az_Latn_AZ.xml b/make/data/cldr/common/main/az_Latn_AZ.xml
index ceaf9de3eff..f0c9d332881 100644
--- a/make/data/cldr/common/main/az_Latn_AZ.xml
+++ b/make/data/cldr/common/main/az_Latn_AZ.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/ba.xml b/make/data/cldr/common/main/ba.xml
index e4fd7353647..468134a046d 100644
--- a/make/data/cldr/common/main/ba.xml
+++ b/make/data/cldr/common/main/ba.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/ba_RU.xml b/make/data/cldr/common/main/ba_RU.xml
index b835b6839f7..d10868e111e 100644
--- a/make/data/cldr/common/main/ba_RU.xml
+++ b/make/data/cldr/common/main/ba_RU.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/bal.xml b/make/data/cldr/common/main/bal.xml
index 355aa29a28e..c8dec39faaa 100644
--- a/make/data/cldr/common/main/bal.xml
+++ b/make/data/cldr/common/main/bal.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/bal_Arab.xml b/make/data/cldr/common/main/bal_Arab.xml
index 9872b379b45..763b97a84ea 100644
--- a/make/data/cldr/common/main/bal_Arab.xml
+++ b/make/data/cldr/common/main/bal_Arab.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/bal_Arab_PK.xml b/make/data/cldr/common/main/bal_Arab_PK.xml
index 78d2338d90e..b7b4c6644ee 100644
--- a/make/data/cldr/common/main/bal_Arab_PK.xml
+++ b/make/data/cldr/common/main/bal_Arab_PK.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/bal_Latn.xml b/make/data/cldr/common/main/bal_Latn.xml
index 81059f1fa12..576ae907516 100644
--- a/make/data/cldr/common/main/bal_Latn.xml
+++ b/make/data/cldr/common/main/bal_Latn.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/bal_Latn_PK.xml b/make/data/cldr/common/main/bal_Latn_PK.xml
index 4d8bb32b570..a9a0c0ac8d0 100644
--- a/make/data/cldr/common/main/bal_Latn_PK.xml
+++ b/make/data/cldr/common/main/bal_Latn_PK.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/bas.xml b/make/data/cldr/common/main/bas.xml
index 923b500ae36..ddba778be4d 100644
--- a/make/data/cldr/common/main/bas.xml
+++ b/make/data/cldr/common/main/bas.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/bas_CM.xml b/make/data/cldr/common/main/bas_CM.xml
index b3766fa7fe3..b3367d38f48 100644
--- a/make/data/cldr/common/main/bas_CM.xml
+++ b/make/data/cldr/common/main/bas_CM.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/be.xml b/make/data/cldr/common/main/be.xml
index c7a7afa6494..3e074c52d8d 100644
--- a/make/data/cldr/common/main/be.xml
+++ b/make/data/cldr/common/main/be.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/be_BY.xml b/make/data/cldr/common/main/be_BY.xml
index d17bb251e5a..f03895f39c6 100644
--- a/make/data/cldr/common/main/be_BY.xml
+++ b/make/data/cldr/common/main/be_BY.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/be_TARASK.xml b/make/data/cldr/common/main/be_TARASK.xml
index cb640562472..ff9db1f909d 100644
--- a/make/data/cldr/common/main/be_TARASK.xml
+++ b/make/data/cldr/common/main/be_TARASK.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/bem.xml b/make/data/cldr/common/main/bem.xml
index ba5dd7b75ac..73905e0d93d 100644
--- a/make/data/cldr/common/main/bem.xml
+++ b/make/data/cldr/common/main/bem.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/bem_ZM.xml b/make/data/cldr/common/main/bem_ZM.xml
index 82360f3f853..4ae1ac9cd51 100644
--- a/make/data/cldr/common/main/bem_ZM.xml
+++ b/make/data/cldr/common/main/bem_ZM.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/bew.xml b/make/data/cldr/common/main/bew.xml
index 5a270c061da..2c39d42b48b 100644
--- a/make/data/cldr/common/main/bew.xml
+++ b/make/data/cldr/common/main/bew.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/bew_ID.xml b/make/data/cldr/common/main/bew_ID.xml
index ce5a2c288b4..5a498ec8e72 100644
--- a/make/data/cldr/common/main/bew_ID.xml
+++ b/make/data/cldr/common/main/bew_ID.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/bez.xml b/make/data/cldr/common/main/bez.xml
index 1ca290667bc..4c032315ffa 100644
--- a/make/data/cldr/common/main/bez.xml
+++ b/make/data/cldr/common/main/bez.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/bez_TZ.xml b/make/data/cldr/common/main/bez_TZ.xml
index d587ae72662..5bbf991e0af 100644
--- a/make/data/cldr/common/main/bez_TZ.xml
+++ b/make/data/cldr/common/main/bez_TZ.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/bg.xml b/make/data/cldr/common/main/bg.xml
index e1c6a42926e..e7a63e3da12 100644
--- a/make/data/cldr/common/main/bg.xml
+++ b/make/data/cldr/common/main/bg.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/bg_BG.xml b/make/data/cldr/common/main/bg_BG.xml
index 2285ed3ee04..02dfc948cfa 100644
--- a/make/data/cldr/common/main/bg_BG.xml
+++ b/make/data/cldr/common/main/bg_BG.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/bgc.xml b/make/data/cldr/common/main/bgc.xml
index c34f081a1a8..ddf8a1c890d 100644
--- a/make/data/cldr/common/main/bgc.xml
+++ b/make/data/cldr/common/main/bgc.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/bgc_IN.xml b/make/data/cldr/common/main/bgc_IN.xml
index 5d19790f3e9..751a64010f1 100644
--- a/make/data/cldr/common/main/bgc_IN.xml
+++ b/make/data/cldr/common/main/bgc_IN.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/bgn.xml b/make/data/cldr/common/main/bgn.xml
index 9d1daad06c6..af9d989f91e 100644
--- a/make/data/cldr/common/main/bgn.xml
+++ b/make/data/cldr/common/main/bgn.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/bgn_AE.xml b/make/data/cldr/common/main/bgn_AE.xml
index b9cb9a052d4..aa66c1ff7f8 100644
--- a/make/data/cldr/common/main/bgn_AE.xml
+++ b/make/data/cldr/common/main/bgn_AE.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/bgn_AF.xml b/make/data/cldr/common/main/bgn_AF.xml
index be65d4d117d..6acc8e0535f 100644
--- a/make/data/cldr/common/main/bgn_AF.xml
+++ b/make/data/cldr/common/main/bgn_AF.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/bgn_IR.xml b/make/data/cldr/common/main/bgn_IR.xml
index 83f9ac9da11..b4b9b2d94d7 100644
--- a/make/data/cldr/common/main/bgn_IR.xml
+++ b/make/data/cldr/common/main/bgn_IR.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/bgn_OM.xml b/make/data/cldr/common/main/bgn_OM.xml
index 87fe449558c..2271bc4fd47 100644
--- a/make/data/cldr/common/main/bgn_OM.xml
+++ b/make/data/cldr/common/main/bgn_OM.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/bgn_PK.xml b/make/data/cldr/common/main/bgn_PK.xml
index 9b449ca80a5..63a6e3d6968 100644
--- a/make/data/cldr/common/main/bgn_PK.xml
+++ b/make/data/cldr/common/main/bgn_PK.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/bho.xml b/make/data/cldr/common/main/bho.xml
index a2fbfa63dfb..87a01568064 100644
--- a/make/data/cldr/common/main/bho.xml
+++ b/make/data/cldr/common/main/bho.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/bho_IN.xml b/make/data/cldr/common/main/bho_IN.xml
index 650d36cc8e2..88a3b6ec5be 100644
--- a/make/data/cldr/common/main/bho_IN.xml
+++ b/make/data/cldr/common/main/bho_IN.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/blo.xml b/make/data/cldr/common/main/blo.xml
index 4781d9b45ee..a19f37f2d06 100644
--- a/make/data/cldr/common/main/blo.xml
+++ b/make/data/cldr/common/main/blo.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/blo_BJ.xml b/make/data/cldr/common/main/blo_BJ.xml
index 6c98cd14af3..969238e4fdb 100644
--- a/make/data/cldr/common/main/blo_BJ.xml
+++ b/make/data/cldr/common/main/blo_BJ.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/blt.xml b/make/data/cldr/common/main/blt.xml
index d794eb40b47..6dca6db9dbd 100644
--- a/make/data/cldr/common/main/blt.xml
+++ b/make/data/cldr/common/main/blt.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/blt_VN.xml b/make/data/cldr/common/main/blt_VN.xml
index 1b88b04e88c..b32492d6aa4 100644
--- a/make/data/cldr/common/main/blt_VN.xml
+++ b/make/data/cldr/common/main/blt_VN.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/bm.xml b/make/data/cldr/common/main/bm.xml
index 72c8c9915f8..bce546dd881 100644
--- a/make/data/cldr/common/main/bm.xml
+++ b/make/data/cldr/common/main/bm.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/bm_ML.xml b/make/data/cldr/common/main/bm_ML.xml
index 0bea4c7f333..f8f4dd8e45c 100644
--- a/make/data/cldr/common/main/bm_ML.xml
+++ b/make/data/cldr/common/main/bm_ML.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/bm_Nkoo.xml b/make/data/cldr/common/main/bm_Nkoo.xml
index 2bc069dded5..fa4ebf3626c 100644
--- a/make/data/cldr/common/main/bm_Nkoo.xml
+++ b/make/data/cldr/common/main/bm_Nkoo.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/bm_Nkoo_ML.xml b/make/data/cldr/common/main/bm_Nkoo_ML.xml
index 1154ba21bfb..baf3ceccadf 100644
--- a/make/data/cldr/common/main/bm_Nkoo_ML.xml
+++ b/make/data/cldr/common/main/bm_Nkoo_ML.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/bn.xml b/make/data/cldr/common/main/bn.xml
index bd6d3c5f902..fea3fe71eb0 100644
--- a/make/data/cldr/common/main/bn.xml
+++ b/make/data/cldr/common/main/bn.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/bn_BD.xml b/make/data/cldr/common/main/bn_BD.xml
index 8539fa31581..62eec5b7672 100644
--- a/make/data/cldr/common/main/bn_BD.xml
+++ b/make/data/cldr/common/main/bn_BD.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/bn_IN.xml b/make/data/cldr/common/main/bn_IN.xml
index 692ec6e7bc7..9bb515a431a 100644
--- a/make/data/cldr/common/main/bn_IN.xml
+++ b/make/data/cldr/common/main/bn_IN.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/bo.xml b/make/data/cldr/common/main/bo.xml
index cc6e160d830..9c863cde4cc 100644
--- a/make/data/cldr/common/main/bo.xml
+++ b/make/data/cldr/common/main/bo.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/bo_CN.xml b/make/data/cldr/common/main/bo_CN.xml
index 468941b265b..188b9035331 100644
--- a/make/data/cldr/common/main/bo_CN.xml
+++ b/make/data/cldr/common/main/bo_CN.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/bo_IN.xml b/make/data/cldr/common/main/bo_IN.xml
index a9190c3a051..a0c703b246a 100644
--- a/make/data/cldr/common/main/bo_IN.xml
+++ b/make/data/cldr/common/main/bo_IN.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/br.xml b/make/data/cldr/common/main/br.xml
index 3f5cbb61022..b42fcdbb756 100644
--- a/make/data/cldr/common/main/br.xml
+++ b/make/data/cldr/common/main/br.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/br_FR.xml b/make/data/cldr/common/main/br_FR.xml
index 38985b58329..5bc1514c084 100644
--- a/make/data/cldr/common/main/br_FR.xml
+++ b/make/data/cldr/common/main/br_FR.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/brx.xml b/make/data/cldr/common/main/brx.xml
index 58bf5271975..2181aaefd8d 100644
--- a/make/data/cldr/common/main/brx.xml
+++ b/make/data/cldr/common/main/brx.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/brx_IN.xml b/make/data/cldr/common/main/brx_IN.xml
index 1e20219d4e8..a4d690cdbb0 100644
--- a/make/data/cldr/common/main/brx_IN.xml
+++ b/make/data/cldr/common/main/brx_IN.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/bs.xml b/make/data/cldr/common/main/bs.xml
index fe5a60dc108..2ef4a63d10e 100644
--- a/make/data/cldr/common/main/bs.xml
+++ b/make/data/cldr/common/main/bs.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/bs_Cyrl.xml b/make/data/cldr/common/main/bs_Cyrl.xml
index 720a39415b6..dda7b7539b8 100644
--- a/make/data/cldr/common/main/bs_Cyrl.xml
+++ b/make/data/cldr/common/main/bs_Cyrl.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/bs_Cyrl_BA.xml b/make/data/cldr/common/main/bs_Cyrl_BA.xml
index 051a01c7e9c..e0e698a1053 100644
--- a/make/data/cldr/common/main/bs_Cyrl_BA.xml
+++ b/make/data/cldr/common/main/bs_Cyrl_BA.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/bs_Latn.xml b/make/data/cldr/common/main/bs_Latn.xml
index a48060f5de6..b718900da50 100644
--- a/make/data/cldr/common/main/bs_Latn.xml
+++ b/make/data/cldr/common/main/bs_Latn.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/bs_Latn_BA.xml b/make/data/cldr/common/main/bs_Latn_BA.xml
index eb8626bd891..f45ff51172b 100644
--- a/make/data/cldr/common/main/bs_Latn_BA.xml
+++ b/make/data/cldr/common/main/bs_Latn_BA.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/bss.xml b/make/data/cldr/common/main/bss.xml
index 509605db1b4..7d5a4399731 100644
--- a/make/data/cldr/common/main/bss.xml
+++ b/make/data/cldr/common/main/bss.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/bss_CM.xml b/make/data/cldr/common/main/bss_CM.xml
index fa49ba19698..a6f4930fac7 100644
--- a/make/data/cldr/common/main/bss_CM.xml
+++ b/make/data/cldr/common/main/bss_CM.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/byn.xml b/make/data/cldr/common/main/byn.xml
index 0eec9bde36e..ad490ab1552 100644
--- a/make/data/cldr/common/main/byn.xml
+++ b/make/data/cldr/common/main/byn.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/byn_ER.xml b/make/data/cldr/common/main/byn_ER.xml
index ff33c7038ab..ef8f983d0c6 100644
--- a/make/data/cldr/common/main/byn_ER.xml
+++ b/make/data/cldr/common/main/byn_ER.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/ca.xml b/make/data/cldr/common/main/ca.xml
index 132bd0137cd..ddcab9cdd02 100644
--- a/make/data/cldr/common/main/ca.xml
+++ b/make/data/cldr/common/main/ca.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/ca_AD.xml b/make/data/cldr/common/main/ca_AD.xml
index f4e922404ef..9b24e9c1db3 100644
--- a/make/data/cldr/common/main/ca_AD.xml
+++ b/make/data/cldr/common/main/ca_AD.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/ca_ES.xml b/make/data/cldr/common/main/ca_ES.xml
index 85b7785b1cc..6c6cb34c1e9 100644
--- a/make/data/cldr/common/main/ca_ES.xml
+++ b/make/data/cldr/common/main/ca_ES.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/ca_ES_VALENCIA.xml b/make/data/cldr/common/main/ca_ES_VALENCIA.xml
index aaa1063f17a..0a0c226a32b 100644
--- a/make/data/cldr/common/main/ca_ES_VALENCIA.xml
+++ b/make/data/cldr/common/main/ca_ES_VALENCIA.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/ca_FR.xml b/make/data/cldr/common/main/ca_FR.xml
index 5291f34d629..17c642b76bb 100644
--- a/make/data/cldr/common/main/ca_FR.xml
+++ b/make/data/cldr/common/main/ca_FR.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/ca_IT.xml b/make/data/cldr/common/main/ca_IT.xml
index 4220b903733..379c78084ed 100644
--- a/make/data/cldr/common/main/ca_IT.xml
+++ b/make/data/cldr/common/main/ca_IT.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/cad.xml b/make/data/cldr/common/main/cad.xml
index ff354198818..9e59f033115 100644
--- a/make/data/cldr/common/main/cad.xml
+++ b/make/data/cldr/common/main/cad.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/cad_US.xml b/make/data/cldr/common/main/cad_US.xml
index f3a8b989566..8278457164f 100644
--- a/make/data/cldr/common/main/cad_US.xml
+++ b/make/data/cldr/common/main/cad_US.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/cch.xml b/make/data/cldr/common/main/cch.xml
index 1dcd468a6fe..044f72ad55d 100644
--- a/make/data/cldr/common/main/cch.xml
+++ b/make/data/cldr/common/main/cch.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/cch_NG.xml b/make/data/cldr/common/main/cch_NG.xml
index b703402cb08..9b3db2fc4fd 100644
--- a/make/data/cldr/common/main/cch_NG.xml
+++ b/make/data/cldr/common/main/cch_NG.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/ccp.xml b/make/data/cldr/common/main/ccp.xml
index 7304ae6dd98..c0f2ad0b8bd 100644
--- a/make/data/cldr/common/main/ccp.xml
+++ b/make/data/cldr/common/main/ccp.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/ccp_BD.xml b/make/data/cldr/common/main/ccp_BD.xml
index 4fbec9f8503..ab890b86e4b 100644
--- a/make/data/cldr/common/main/ccp_BD.xml
+++ b/make/data/cldr/common/main/ccp_BD.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/ccp_IN.xml b/make/data/cldr/common/main/ccp_IN.xml
index 8d2ca5ea261..971a0f40eac 100644
--- a/make/data/cldr/common/main/ccp_IN.xml
+++ b/make/data/cldr/common/main/ccp_IN.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/ce.xml b/make/data/cldr/common/main/ce.xml
index e2ff1fc4e6a..90a35254b99 100644
--- a/make/data/cldr/common/main/ce.xml
+++ b/make/data/cldr/common/main/ce.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/ce_RU.xml b/make/data/cldr/common/main/ce_RU.xml
index 98ee73d5435..68a290892b8 100644
--- a/make/data/cldr/common/main/ce_RU.xml
+++ b/make/data/cldr/common/main/ce_RU.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/ceb.xml b/make/data/cldr/common/main/ceb.xml
index 19238f6bb04..89746056e89 100644
--- a/make/data/cldr/common/main/ceb.xml
+++ b/make/data/cldr/common/main/ceb.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/ceb_PH.xml b/make/data/cldr/common/main/ceb_PH.xml
index 720bca662a3..c3c82e87d32 100644
--- a/make/data/cldr/common/main/ceb_PH.xml
+++ b/make/data/cldr/common/main/ceb_PH.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/cgg.xml b/make/data/cldr/common/main/cgg.xml
index ce3e6c1724e..3a3411023a9 100644
--- a/make/data/cldr/common/main/cgg.xml
+++ b/make/data/cldr/common/main/cgg.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/cgg_UG.xml b/make/data/cldr/common/main/cgg_UG.xml
index be094e50917..abdea934ea9 100644
--- a/make/data/cldr/common/main/cgg_UG.xml
+++ b/make/data/cldr/common/main/cgg_UG.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/cho.xml b/make/data/cldr/common/main/cho.xml
index b82979f63cd..4d086f9a2cf 100644
--- a/make/data/cldr/common/main/cho.xml
+++ b/make/data/cldr/common/main/cho.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/cho_US.xml b/make/data/cldr/common/main/cho_US.xml
index 545a93f54a1..e1938f37b51 100644
--- a/make/data/cldr/common/main/cho_US.xml
+++ b/make/data/cldr/common/main/cho_US.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/chr.xml b/make/data/cldr/common/main/chr.xml
index 4cb2682f08f..64fdcf84734 100644
--- a/make/data/cldr/common/main/chr.xml
+++ b/make/data/cldr/common/main/chr.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/chr_US.xml b/make/data/cldr/common/main/chr_US.xml
index c4765608100..5ae7c33536d 100644
--- a/make/data/cldr/common/main/chr_US.xml
+++ b/make/data/cldr/common/main/chr_US.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/cic.xml b/make/data/cldr/common/main/cic.xml
index 19ef45c939e..fd4ed7ace11 100644
--- a/make/data/cldr/common/main/cic.xml
+++ b/make/data/cldr/common/main/cic.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/cic_US.xml b/make/data/cldr/common/main/cic_US.xml
index 06358d5e3a9..d2065b10a37 100644
--- a/make/data/cldr/common/main/cic_US.xml
+++ b/make/data/cldr/common/main/cic_US.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/ckb.xml b/make/data/cldr/common/main/ckb.xml
index e657cfdd359..a52891df344 100644
--- a/make/data/cldr/common/main/ckb.xml
+++ b/make/data/cldr/common/main/ckb.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/ckb_IQ.xml b/make/data/cldr/common/main/ckb_IQ.xml
index d5566668311..60e569682f6 100644
--- a/make/data/cldr/common/main/ckb_IQ.xml
+++ b/make/data/cldr/common/main/ckb_IQ.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/ckb_IR.xml b/make/data/cldr/common/main/ckb_IR.xml
index 82e50bf7ebe..35aad6cc3a9 100644
--- a/make/data/cldr/common/main/ckb_IR.xml
+++ b/make/data/cldr/common/main/ckb_IR.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/co.xml b/make/data/cldr/common/main/co.xml
index c3dc3a138e3..b102b74c2bd 100644
--- a/make/data/cldr/common/main/co.xml
+++ b/make/data/cldr/common/main/co.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/co_FR.xml b/make/data/cldr/common/main/co_FR.xml
index 7ec66b708a1..f3dee06d8c8 100644
--- a/make/data/cldr/common/main/co_FR.xml
+++ b/make/data/cldr/common/main/co_FR.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/cop.xml b/make/data/cldr/common/main/cop.xml
new file mode 100644
index 00000000000..fe7f39e1517
--- /dev/null
+++ b/make/data/cldr/common/main/cop.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
+<!-- Copyright © 1991-2025 Unicode, Inc.
+For terms of use, see http://www.unicode.org/copyright.html
+SPDX-License-Identifier: Unicode-3.0
+CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
+-->
+<ldml>
+	<identity>
+		<version number="$Revision$"/>
+		<language type="cop"/>
+	</identity>
+	<characters>
+		<exemplarCharacters>[ⲁ ⲃ ⲅ ⲇ ⲉ ⲋ ⲍ ⲏ ⲑ ⲓ ⲕ ⲗ ⲙ ⲛ ⲝ ⲟ ⲡ ⲣ ⲥ ⲧ ⲩ ⲫ ⲭ ⲯ ⲱ ϣ ϥ ϧ ϩ ϫ ϭ ϯ]</exemplarCharacters>
+		<exemplarCharacters type="auxiliary">[⳥ ⳦ ⳧ ⳨ ⳩ ⳪ ⳤ]</exemplarCharacters>
+		<exemplarCharacters type="punctuation">[– ⸗ , ; \: . ⳹ ⳾ ⳼ ⳿ ( )]</exemplarCharacters>
+	</characters>
+</ldml>
diff --git a/make/data/cldr/common/main/cop_EG.xml b/make/data/cldr/common/main/cop_EG.xml
new file mode 100644
index 00000000000..e96913cb575
--- /dev/null
+++ b/make/data/cldr/common/main/cop_EG.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
+<!-- Copyright © 1991-2025 Unicode, Inc.
+For terms of use, see http://www.unicode.org/copyright.html
+SPDX-License-Identifier: Unicode-3.0
+CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
+-->
+<ldml>
+	<identity>
+		<version number="$Revision$"/>
+		<language type="cop"/>
+		<territory type="EG"/>
+	</identity>
+</ldml>
diff --git a/make/data/cldr/common/main/cs.xml b/make/data/cldr/common/main/cs.xml
index 2b2ece15549..47b0c97a132 100644
--- a/make/data/cldr/common/main/cs.xml
+++ b/make/data/cldr/common/main/cs.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -4389,6 +4389,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<currencyFormatLength>
 				<currencyFormat type="standard">
 					<pattern>#,##0.00 ¤</pattern>
+					<pattern alt="noCurrency" draft="provisional">#,##0.00</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 			<currencyFormatLength type="short">
diff --git a/make/data/cldr/common/main/cs_CZ.xml b/make/data/cldr/common/main/cs_CZ.xml
index 24aaba7de65..1ad127034ec 100644
--- a/make/data/cldr/common/main/cs_CZ.xml
+++ b/make/data/cldr/common/main/cs_CZ.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/csw.xml b/make/data/cldr/common/main/csw.xml
index 5e4fba3ab8b..2ee952b51c6 100644
--- a/make/data/cldr/common/main/csw.xml
+++ b/make/data/cldr/common/main/csw.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/csw_CA.xml b/make/data/cldr/common/main/csw_CA.xml
index 8b68feb93f8..4305e02993b 100644
--- a/make/data/cldr/common/main/csw_CA.xml
+++ b/make/data/cldr/common/main/csw_CA.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/cu.xml b/make/data/cldr/common/main/cu.xml
index bd6ba061339..45f45dd1f36 100644
--- a/make/data/cldr/common/main/cu.xml
+++ b/make/data/cldr/common/main/cu.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/cu_RU.xml b/make/data/cldr/common/main/cu_RU.xml
index 746300296e0..690ec1feebc 100644
--- a/make/data/cldr/common/main/cu_RU.xml
+++ b/make/data/cldr/common/main/cu_RU.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/cv.xml b/make/data/cldr/common/main/cv.xml
index 9f850a7344f..69207a5c275 100644
--- a/make/data/cldr/common/main/cv.xml
+++ b/make/data/cldr/common/main/cv.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/cv_RU.xml b/make/data/cldr/common/main/cv_RU.xml
index 042cde46b8a..828d19b03aa 100644
--- a/make/data/cldr/common/main/cv_RU.xml
+++ b/make/data/cldr/common/main/cv_RU.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/cy.xml b/make/data/cldr/common/main/cy.xml
index e8742b9c7a9..7b68a594923 100644
--- a/make/data/cldr/common/main/cy.xml
+++ b/make/data/cldr/common/main/cy.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/cy_GB.xml b/make/data/cldr/common/main/cy_GB.xml
index 688ce3f6aa7..ac8acc7faaf 100644
--- a/make/data/cldr/common/main/cy_GB.xml
+++ b/make/data/cldr/common/main/cy_GB.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/da.xml b/make/data/cldr/common/main/da.xml
index aaf6959d2bc..56c7e15ea39 100644
--- a/make/data/cldr/common/main/da.xml
+++ b/make/data/cldr/common/main/da.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -3891,6 +3891,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<currencyFormatLength>
 				<currencyFormat type="standard">
 					<pattern>#,##0.00 ¤</pattern>
+					<pattern alt="noCurrency" draft="provisional">#,##0.00</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 			<currencyFormatLength type="short">
@@ -7024,9 +7025,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other">{0} mmHg</unitPattern>
 			</unit>
 			<unit type="pressure-inch-ofhg">
-				<displayName># Hg</displayName>
-				<unitPattern count="one">{0} # Hg</unitPattern>
-				<unitPattern count="other">{0} # Hg</unitPattern>
+				<displayName>″ Hg</displayName>
+				<unitPattern count="one">{0} ″ Hg</unitPattern>
+				<unitPattern count="other">{0} ″ Hg</unitPattern>
 			</unit>
 			<unit type="speed-kilometer-per-hour">
 				<displayName>km/t</displayName>
diff --git a/make/data/cldr/common/main/da_DK.xml b/make/data/cldr/common/main/da_DK.xml
index 8ea345b6577..1182aefebbc 100644
--- a/make/data/cldr/common/main/da_DK.xml
+++ b/make/data/cldr/common/main/da_DK.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/da_GL.xml b/make/data/cldr/common/main/da_GL.xml
index 290f091331f..ad3f55a70c2 100644
--- a/make/data/cldr/common/main/da_GL.xml
+++ b/make/data/cldr/common/main/da_GL.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/dav.xml b/make/data/cldr/common/main/dav.xml
index 7cd6e77a1c7..3f50fc926a7 100644
--- a/make/data/cldr/common/main/dav.xml
+++ b/make/data/cldr/common/main/dav.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/dav_KE.xml b/make/data/cldr/common/main/dav_KE.xml
index b317e2e51e7..cfd8e0c3b15 100644
--- a/make/data/cldr/common/main/dav_KE.xml
+++ b/make/data/cldr/common/main/dav_KE.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/de.xml b/make/data/cldr/common/main/de.xml
index 6ef39f2d098..3ca5a3d1ec1 100644
--- a/make/data/cldr/common/main/de.xml
+++ b/make/data/cldr/common/main/de.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -4629,6 +4629,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<currencyFormatLength>
 				<currencyFormat type="standard">
 					<pattern>#,##0.00 ¤</pattern>
+					<pattern alt="noCurrency" draft="provisional">#,##0.00</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 			<currencyFormatLength type="short">
diff --git a/make/data/cldr/common/main/de_AT.xml b/make/data/cldr/common/main/de_AT.xml
index 2c96f6eeb98..2c5005d9184 100644
--- a/make/data/cldr/common/main/de_AT.xml
+++ b/make/data/cldr/common/main/de_AT.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/de_BE.xml b/make/data/cldr/common/main/de_BE.xml
index 65168659e95..f02f6e98842 100644
--- a/make/data/cldr/common/main/de_BE.xml
+++ b/make/data/cldr/common/main/de_BE.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/de_CH.xml b/make/data/cldr/common/main/de_CH.xml
index 205f9b935c6..d8c3c358004 100644
--- a/make/data/cldr/common/main/de_CH.xml
+++ b/make/data/cldr/common/main/de_CH.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/de_DE.xml b/make/data/cldr/common/main/de_DE.xml
index 215f3071fb5..8493f5b316f 100644
--- a/make/data/cldr/common/main/de_DE.xml
+++ b/make/data/cldr/common/main/de_DE.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/de_IT.xml b/make/data/cldr/common/main/de_IT.xml
index c02cf2d054a..d58932947a0 100644
--- a/make/data/cldr/common/main/de_IT.xml
+++ b/make/data/cldr/common/main/de_IT.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/de_LI.xml b/make/data/cldr/common/main/de_LI.xml
index f9d02706ab8..718cb336a1a 100644
--- a/make/data/cldr/common/main/de_LI.xml
+++ b/make/data/cldr/common/main/de_LI.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/de_LU.xml b/make/data/cldr/common/main/de_LU.xml
index 3090319548c..4ec6b9f5bcb 100644
--- a/make/data/cldr/common/main/de_LU.xml
+++ b/make/data/cldr/common/main/de_LU.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/dje.xml b/make/data/cldr/common/main/dje.xml
index 72c95576a9e..45f80ab56da 100644
--- a/make/data/cldr/common/main/dje.xml
+++ b/make/data/cldr/common/main/dje.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/dje_NE.xml b/make/data/cldr/common/main/dje_NE.xml
index 8cbabd42fdb..13098022b9c 100644
--- a/make/data/cldr/common/main/dje_NE.xml
+++ b/make/data/cldr/common/main/dje_NE.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/doi.xml b/make/data/cldr/common/main/doi.xml
index 8e8a66dfff1..b6c9dc75dfb 100644
--- a/make/data/cldr/common/main/doi.xml
+++ b/make/data/cldr/common/main/doi.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/doi_IN.xml b/make/data/cldr/common/main/doi_IN.xml
index 941eaa5fda2..62d53ce4159 100644
--- a/make/data/cldr/common/main/doi_IN.xml
+++ b/make/data/cldr/common/main/doi_IN.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/dsb.xml b/make/data/cldr/common/main/dsb.xml
index 5c1ace89fe9..486cd558ea6 100644
--- a/make/data/cldr/common/main/dsb.xml
+++ b/make/data/cldr/common/main/dsb.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/dsb_DE.xml b/make/data/cldr/common/main/dsb_DE.xml
index 312a235443e..7fed0f68da1 100644
--- a/make/data/cldr/common/main/dsb_DE.xml
+++ b/make/data/cldr/common/main/dsb_DE.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/dua.xml b/make/data/cldr/common/main/dua.xml
index 0162040d704..547640b7b05 100644
--- a/make/data/cldr/common/main/dua.xml
+++ b/make/data/cldr/common/main/dua.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/dua_CM.xml b/make/data/cldr/common/main/dua_CM.xml
index 83e862a0269..3322133c009 100644
--- a/make/data/cldr/common/main/dua_CM.xml
+++ b/make/data/cldr/common/main/dua_CM.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/dv.xml b/make/data/cldr/common/main/dv.xml
index c169fd9eb73..77f725c086e 100644
--- a/make/data/cldr/common/main/dv.xml
+++ b/make/data/cldr/common/main/dv.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -116,21 +116,21 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 		<symbols numberSystem="latn">
 			<list draft="unconfirmed">,</list>
 		</symbols>
-		<decimalFormats>
+		<decimalFormats numberSystem="latn">
 			<decimalFormatLength>
 				<decimalFormat>
 					<pattern draft="unconfirmed">#,##,##0.###</pattern>
 				</decimalFormat>
 			</decimalFormatLength>
 		</decimalFormats>
-		<percentFormats>
+		<percentFormats numberSystem="latn">
 			<percentFormatLength>
 				<percentFormat>
 					<pattern draft="unconfirmed">#,##,##0%</pattern>
 				</percentFormat>
 			</percentFormatLength>
 		</percentFormats>
-		<currencyFormats>
+		<currencyFormats numberSystem="latn">
 			<currencyFormatLength>
 				<currencyFormat type="standard">
 					<pattern draft="unconfirmed">¤ #,##,##0.00</pattern>
diff --git a/make/data/cldr/common/main/dv_MV.xml b/make/data/cldr/common/main/dv_MV.xml
index 3518ac6f4b2..dfa52a66b37 100644
--- a/make/data/cldr/common/main/dv_MV.xml
+++ b/make/data/cldr/common/main/dv_MV.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/dyo.xml b/make/data/cldr/common/main/dyo.xml
index 43cc0b41066..baa17a6108f 100644
--- a/make/data/cldr/common/main/dyo.xml
+++ b/make/data/cldr/common/main/dyo.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/dyo_SN.xml b/make/data/cldr/common/main/dyo_SN.xml
index 28753759b12..a0cf85086f5 100644
--- a/make/data/cldr/common/main/dyo_SN.xml
+++ b/make/data/cldr/common/main/dyo_SN.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/dz.xml b/make/data/cldr/common/main/dz.xml
index b22ebf6b4cd..85f7fb24bfe 100644
--- a/make/data/cldr/common/main/dz.xml
+++ b/make/data/cldr/common/main/dz.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/dz_BT.xml b/make/data/cldr/common/main/dz_BT.xml
index b75cafed863..67b32f9e753 100644
--- a/make/data/cldr/common/main/dz_BT.xml
+++ b/make/data/cldr/common/main/dz_BT.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/ebu.xml b/make/data/cldr/common/main/ebu.xml
index 5bccad8ed18..87cb77438e0 100644
--- a/make/data/cldr/common/main/ebu.xml
+++ b/make/data/cldr/common/main/ebu.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/ebu_KE.xml b/make/data/cldr/common/main/ebu_KE.xml
index 1be6fdd248f..75eb09de886 100644
--- a/make/data/cldr/common/main/ebu_KE.xml
+++ b/make/data/cldr/common/main/ebu_KE.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/ee.xml b/make/data/cldr/common/main/ee.xml
index 01eed333c21..cbfdedbb836 100644
--- a/make/data/cldr/common/main/ee.xml
+++ b/make/data/cldr/common/main/ee.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/ee_GH.xml b/make/data/cldr/common/main/ee_GH.xml
index 452647d5bd0..91a4077921f 100644
--- a/make/data/cldr/common/main/ee_GH.xml
+++ b/make/data/cldr/common/main/ee_GH.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/ee_TG.xml b/make/data/cldr/common/main/ee_TG.xml
index 4da0b5e63db..724b748c98e 100644
--- a/make/data/cldr/common/main/ee_TG.xml
+++ b/make/data/cldr/common/main/ee_TG.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/el.xml b/make/data/cldr/common/main/el.xml
index c7b4b2ca21a..b4843307d3a 100644
--- a/make/data/cldr/common/main/el.xml
+++ b/make/data/cldr/common/main/el.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -4847,6 +4847,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<currencyFormatLength>
 				<currencyFormat type="standard">
 					<pattern>#,##0.00 ¤</pattern>
+					<pattern alt="noCurrency" draft="provisional">#,##0.00</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 			<currencyFormatLength type="short">
diff --git a/make/data/cldr/common/main/el_CY.xml b/make/data/cldr/common/main/el_CY.xml
index 4684acf26e6..aa737bcc9e1 100644
--- a/make/data/cldr/common/main/el_CY.xml
+++ b/make/data/cldr/common/main/el_CY.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/el_GR.xml b/make/data/cldr/common/main/el_GR.xml
index 486102f53d6..5283153925f 100644
--- a/make/data/cldr/common/main/el_GR.xml
+++ b/make/data/cldr/common/main/el_GR.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/el_POLYTON.xml b/make/data/cldr/common/main/el_POLYTON.xml
index 4ddfe8295c3..5834e404688 100644
--- a/make/data/cldr/common/main/el_POLYTON.xml
+++ b/make/data/cldr/common/main/el_POLYTON.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/en.xml b/make/data/cldr/common/main/en.xml
index ee29e6f48d9..ae1e61a78df 100644
--- a/make/data/cldr/common/main/en.xml
+++ b/make/data/cldr/common/main/en.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -139,6 +139,7 @@ annotations.
 			<language type="cop">Coptic</language>
 			<language type="cps">Capiznon</language>
 			<language type="cr">Cree</language>
+			<language type="cr" alt="long">Woods Cree</language>
 			<language type="crg">Michif</language>
 			<language type="crh">Crimean Tatar</language>
 			<language type="crj">Southern East Cree</language>
@@ -152,7 +153,6 @@ annotations.
 			<language type="csw">Swampy Cree</language>
 			<language type="cu">Church Slavic</language>
 			<language type="cv">Chuvash</language>
-			<language type="cwd">Woods Cree</language>
 			<language type="cy">Welsh</language>
 			<language type="da">Danish</language>
 			<language type="dak">Dakota</language>
@@ -256,7 +256,6 @@ annotations.
 			<language type="hak">Hakka Chinese</language>
 			<language type="haw">Hawaiian</language>
 			<language type="hax">Southern Haida</language>
-			<language type="hdn">Northern Haida</language>
 			<language type="he">Hebrew</language>
 			<language type="hi">Hindi</language>
 			<language type="hi_Latn">Hindi (Latin)</language>
@@ -284,7 +283,6 @@ annotations.
 			<language type="ig">Igbo</language>
 			<language type="ii">Sichuan Yi</language>
 			<language type="ik">Inupiaq</language>
-			<language type="ike">Eastern Canadian Inuktitut</language>
 			<language type="ikt">Western Canadian Inuktitut</language>
 			<language type="ilo">Iloko</language>
 			<language type="inh">Ingush</language>
@@ -473,7 +471,6 @@ annotations.
 			<language type="oj">Ojibwa</language>
 			<language type="ojb">Northwestern Ojibwa</language>
 			<language type="ojc">Central Ojibwa</language>
-			<language type="ojg">Eastern Ojibwa</language>
 			<language type="ojs">Oji-Cree</language>
 			<language type="ojw">Western Ojibwa</language>
 			<language type="oka">Okanagan</language>
@@ -998,6 +995,7 @@ annotations.
 			<territory type="BZ">Belize</territory>
 			<territory type="CA">Canada</territory>
 			<territory type="CC">Cocos (Keeling) Islands</territory>
+			<territory type="CC" alt="short">Cocos Islands</territory>
 			<territory type="CD">Congo - Kinshasa</territory>
 			<territory type="CD" alt="variant">Congo (DRC)</territory>
 			<territory type="CF">Central African Republic</territory>
@@ -1159,6 +1157,7 @@ annotations.
 			<territory type="PL">Poland</territory>
 			<territory type="PM">St. Pierre &amp; Miquelon</territory>
 			<territory type="PN">Pitcairn Islands</territory>
+			<territory type="PN" alt="short">Pitcairn</territory>
 			<territory type="PR">Puerto Rico</territory>
 			<territory type="PS">Palestinian Territories</territory>
 			<territory type="PS" alt="short">Palestine</territory>
@@ -3927,6 +3926,21 @@ annotations.
 			<zone type="Etc/Unknown">
 				<exemplarCity>Unknown City</exemplarCity>
 			</zone>
+			<zone type="Antarctica/Macquarie">
+				<exemplarCity>Macquarie Island</exemplarCity>
+			</zone>
+			<zone type="Australia/Lord_Howe">
+				<exemplarCity>Lord Howe Island</exemplarCity>
+			</zone>
+			<zone type="Indian/Cocos">
+				<exemplarCity>Cocos Islands</exemplarCity>
+			</zone>
+			<zone type="Pacific/Easter">
+				<exemplarCity>Easter Island</exemplarCity>
+			</zone>
+			<zone type="Indian/Christmas">
+				<exemplarCity>Christmas Island</exemplarCity>
+			</zone>
 			<zone type="Europe/London">
 				<long>
 					<daylight>British Summer Time</daylight>
@@ -3940,6 +3954,12 @@ annotations.
 			<zone type="Asia/Qostanay">
 				<exemplarCity>Kostanay</exemplarCity>
 			</zone>
+			<zone type="Pacific/Norfolk">
+				<exemplarCity>Norfolk Island</exemplarCity>
+			</zone>
+			<zone type="Pacific/Wake">
+				<exemplarCity>Wake Island</exemplarCity>
+			</zone>
 			<zone type="Asia/Saigon">
 				<exemplarCity>Ho Chi Minh City</exemplarCity>
 			</zone>
@@ -4060,9 +4080,9 @@ annotations.
 			</metazone>
 			<metazone type="Apia">
 				<long>
-					<generic>Apia Time</generic>
-					<standard>Apia Standard Time</standard>
-					<daylight>Apia Daylight Time</daylight>
+					<generic>Samoa Time</generic>
+					<standard>Samoa Standard Time</standard>
+					<daylight>Samoa Daylight Time</daylight>
 				</long>
 			</metazone>
 			<metazone type="Aqtau">
@@ -4121,7 +4141,7 @@ annotations.
 			</metazone>
 			<metazone type="Australia_Central">
 				<long>
-					<generic>Central Australia Time</generic>
+					<generic>Australian Central Time</generic>
 					<standard>Australian Central Standard Time</standard>
 					<daylight>Australian Central Daylight Time</daylight>
 				</long>
@@ -4135,14 +4155,14 @@ annotations.
 			</metazone>
 			<metazone type="Australia_Eastern">
 				<long>
-					<generic>Eastern Australia Time</generic>
+					<generic>Australian Eastern Time</generic>
 					<standard>Australian Eastern Standard Time</standard>
 					<daylight>Australian Eastern Daylight Time</daylight>
 				</long>
 			</metazone>
 			<metazone type="Australia_Western">
 				<long>
-					<generic>Western Australia Time</generic>
+					<generic>Australian Western Time</generic>
 					<standard>Australian Western Standard Time</standard>
 					<daylight>Australian Western Daylight Time</daylight>
 				</long>
@@ -4187,7 +4207,7 @@ annotations.
 			</metazone>
 			<metazone type="Brunei">
 				<long>
-					<standard>Brunei Darussalam Time</standard>
+					<standard>Brunei Time</standard>
 				</long>
 			</metazone>
 			<metazone type="Cape_Verde">
@@ -4249,7 +4269,7 @@ annotations.
 				<long>
 					<generic>Cook Islands Time</generic>
 					<standard>Cook Islands Standard Time</standard>
-					<daylight>Cook Islands Half Summer Time</daylight>
+					<daylight>Cook Islands Summer Time</daylight>
 				</long>
 			</metazone>
 			<metazone type="Cuba">
@@ -4266,12 +4286,12 @@ annotations.
 			</metazone>
 			<metazone type="DumontDUrville">
 				<long>
-					<standard>Dumont-d’Urville Time</standard>
+					<standard>Dumont d’Urville Time</standard>
 				</long>
 			</metazone>
 			<metazone type="East_Timor">
 				<long>
-					<standard>East Timor Time</standard>
+					<standard>Timor-Leste Time</standard>
 				</long>
 			</metazone>
 			<metazone type="Easter">
@@ -4488,9 +4508,9 @@ annotations.
 			</metazone>
 			<metazone type="Kamchatka">
 				<long>
-					<generic>Petropavlovsk-Kamchatski Time</generic>
-					<standard>Petropavlovsk-Kamchatski Standard Time</standard>
-					<daylight>Petropavlovsk-Kamchatski Summer Time</daylight>
+					<generic>Kamchatka Time</generic>
+					<standard>Kamchatka Standard Time</standard>
+					<daylight>Kamchatka Summer Time</daylight>
 				</long>
 			</metazone>
 			<metazone type="Kazakhstan">
@@ -4673,7 +4693,7 @@ annotations.
 			</metazone>
 			<metazone type="North_Mariana">
 				<long>
-					<standard>North Mariana Islands Time</standard>
+					<standard>Northern Mariana Islands Time</standard>
 				</long>
 			</metazone>
 			<metazone type="Novosibirsk">
@@ -4747,12 +4767,12 @@ annotations.
 			</metazone>
 			<metazone type="Ponape">
 				<long>
-					<standard>Ponape Time</standard>
+					<standard>Pohnpei Time</standard>
 				</long>
 			</metazone>
 			<metazone type="Pyongyang">
 				<long>
-					<standard>Pyongyang Time</standard>
+					<standard>North Korea Time</standard>
 				</long>
 			</metazone>
 			<metazone type="Qyzylorda">
@@ -4788,9 +4808,9 @@ annotations.
 			</metazone>
 			<metazone type="Samoa">
 				<long>
-					<generic>Samoa Time</generic>
-					<standard>Samoa Standard Time</standard>
-					<daylight>Samoa Daylight Time</daylight>
+					<generic>American Samoa Time</generic>
+					<standard>American Samoa Standard Time</standard>
+					<daylight>American Samoa Daylight Time</daylight>
 				</long>
 			</metazone>
 			<metazone type="Seychelles">
@@ -4830,9 +4850,9 @@ annotations.
 			</metazone>
 			<metazone type="Taipei">
 				<long>
-					<generic>Taipei Time</generic>
-					<standard>Taipei Standard Time</standard>
-					<daylight>Taipei Daylight Time</daylight>
+					<generic>Taiwan Time</generic>
+					<standard>Taiwan Standard Time</standard>
+					<daylight>Taiwan Daylight Time</daylight>
 				</long>
 			</metazone>
 			<metazone type="Tajikistan">
@@ -5114,6 +5134,7 @@ annotations.
 				<displayName>United Arab Emirates Dirham</displayName>
 				<displayName count="one">UAE dirham</displayName>
 				<displayName count="other">UAE dirhams</displayName>
+				<symbol>AED</symbol>
 			</currency>
 			<currency type="AFA">
 				<displayName>Afghan Afghani (1927–2002)</displayName>
@@ -5124,6 +5145,7 @@ annotations.
 				<displayName>Afghan Afghani</displayName>
 				<displayName count="one">Afghan Afghani</displayName>
 				<displayName count="other">Afghan Afghanis</displayName>
+				<symbol>AFN</symbol>
 			</currency>
 			<currency type="ALK">
 				<displayName>Albanian Lek (1946–1965)</displayName>
@@ -5134,21 +5156,25 @@ annotations.
 				<displayName>Albanian Lek</displayName>
 				<displayName count="one">Albanian lek</displayName>
 				<displayName count="other">Albanian lekë</displayName>
+				<symbol>ALL</symbol>
 			</currency>
 			<currency type="AMD">
 				<displayName>Armenian Dram</displayName>
 				<displayName count="one">Armenian dram</displayName>
 				<displayName count="other">Armenian drams</displayName>
+				<symbol>AMD</symbol>
 			</currency>
 			<currency type="ANG">
 				<displayName>Netherlands Antillean Guilder</displayName>
 				<displayName count="one">Netherlands Antillean guilder</displayName>
 				<displayName count="other">Netherlands Antillean guilders</displayName>
+				<symbol>ANG</symbol>
 			</currency>
 			<currency type="AOA">
 				<displayName>Angolan Kwanza</displayName>
 				<displayName count="one">Angolan kwanza</displayName>
 				<displayName count="other">Angolan kwanzas</displayName>
+				<symbol>AOA</symbol>
 			</currency>
 			<currency type="AOK">
 				<displayName>Angolan Kwanza (1977–1991)</displayName>
@@ -5189,6 +5215,7 @@ annotations.
 				<displayName>Argentine Peso</displayName>
 				<displayName count="one">Argentine peso</displayName>
 				<displayName count="other">Argentine pesos</displayName>
+				<symbol>ARS</symbol>
 			</currency>
 			<currency type="ATS">
 				<displayName>Austrian Schilling</displayName>
@@ -5199,11 +5226,13 @@ annotations.
 				<displayName>Australian Dollar</displayName>
 				<displayName count="one">Australian dollar</displayName>
 				<displayName count="other">Australian dollars</displayName>
+				<symbol>A$</symbol>
 			</currency>
 			<currency type="AWG">
 				<displayName>Aruban Florin</displayName>
 				<displayName count="one">Aruban florin</displayName>
 				<displayName count="other">Aruban florin</displayName>
+				<symbol>AWG</symbol>
 			</currency>
 			<currency type="AZM">
 				<displayName>Azerbaijani Manat (1993–2006)</displayName>
@@ -5214,6 +5243,7 @@ annotations.
 				<displayName>Azerbaijani Manat</displayName>
 				<displayName count="one">Azerbaijani manat</displayName>
 				<displayName count="other">Azerbaijani manats</displayName>
+				<symbol>AZN</symbol>
 			</currency>
 			<currency type="BAD">
 				<displayName>Bosnia-Herzegovina Dinar (1992–1994)</displayName>
@@ -5224,6 +5254,7 @@ annotations.
 				<displayName>Bosnia-Herzegovina Convertible Mark</displayName>
 				<displayName count="one">Bosnia-Herzegovina convertible mark</displayName>
 				<displayName count="other">Bosnia-Herzegovina convertible marks</displayName>
+				<symbol>BAM</symbol>
 			</currency>
 			<currency type="BAN">
 				<displayName>Bosnia-Herzegovina New Dinar (1994–1997)</displayName>
@@ -5234,11 +5265,13 @@ annotations.
 				<displayName>Barbadian Dollar</displayName>
 				<displayName count="one">Barbadian dollar</displayName>
 				<displayName count="other">Barbadian dollars</displayName>
+				<symbol>BBD</symbol>
 			</currency>
 			<currency type="BDT">
 				<displayName>Bangladeshi Taka</displayName>
 				<displayName count="one">Bangladeshi taka</displayName>
 				<displayName count="other">Bangladeshi takas</displayName>
+				<symbol>BDT</symbol>
 			</currency>
 			<currency type="BEC">
 				<displayName>Belgian Franc (convertible)</displayName>
@@ -5269,6 +5302,7 @@ annotations.
 				<displayName>Bulgarian Lev</displayName>
 				<displayName count="one">Bulgarian lev</displayName>
 				<displayName count="other">Bulgarian leva</displayName>
+				<symbol>BGN</symbol>
 			</currency>
 			<currency type="BGO">
 				<displayName>Bulgarian Lev (1879–1952)</displayName>
@@ -5279,26 +5313,31 @@ annotations.
 				<displayName>Bahraini Dinar</displayName>
 				<displayName count="one">Bahraini dinar</displayName>
 				<displayName count="other">Bahraini dinars</displayName>
+				<symbol>BHD</symbol>
 			</currency>
 			<currency type="BIF">
 				<displayName>Burundian Franc</displayName>
 				<displayName count="one">Burundian franc</displayName>
 				<displayName count="other">Burundian francs</displayName>
+				<symbol>BIF</symbol>
 			</currency>
 			<currency type="BMD">
 				<displayName>Bermudan Dollar</displayName>
 				<displayName count="one">Bermudan dollar</displayName>
 				<displayName count="other">Bermudan dollars</displayName>
+				<symbol>BMD</symbol>
 			</currency>
 			<currency type="BND">
 				<displayName>Brunei Dollar</displayName>
 				<displayName count="one">Brunei dollar</displayName>
 				<displayName count="other">Brunei dollars</displayName>
+				<symbol>BND</symbol>
 			</currency>
 			<currency type="BOB">
 				<displayName>Bolivian Boliviano</displayName>
 				<displayName count="one">Bolivian boliviano</displayName>
 				<displayName count="other">Bolivian bolivianos</displayName>
+				<symbol>BOB</symbol>
 			</currency>
 			<currency type="BOL">
 				<displayName>Bolivian Boliviano (1863–1963)</displayName>
@@ -5334,6 +5373,7 @@ annotations.
 				<displayName>Brazilian Real</displayName>
 				<displayName count="one">Brazilian real</displayName>
 				<displayName count="other">Brazilian reals</displayName>
+				<symbol>R$</symbol>
 			</currency>
 			<currency type="BRN">
 				<displayName>Brazilian New Cruzado (1989–1990)</displayName>
@@ -5354,11 +5394,13 @@ annotations.
 				<displayName>Bahamian Dollar</displayName>
 				<displayName count="one">Bahamian dollar</displayName>
 				<displayName count="other">Bahamian dollars</displayName>
+				<symbol>BSD</symbol>
 			</currency>
 			<currency type="BTN">
 				<displayName>Bhutanese Ngultrum</displayName>
 				<displayName count="one">Bhutanese ngultrum</displayName>
 				<displayName count="other">Bhutanese ngultrums</displayName>
+				<symbol>BTN</symbol>
 			</currency>
 			<currency type="BUK">
 				<displayName>Burmese Kyat</displayName>
@@ -5369,6 +5411,7 @@ annotations.
 				<displayName>Botswanan Pula</displayName>
 				<displayName count="one">Botswanan pula</displayName>
 				<displayName count="other">Botswanan pulas</displayName>
+				<symbol>BWP</symbol>
 			</currency>
 			<currency type="BYB">
 				<displayName>Belarusian Ruble (1994–1999)</displayName>
@@ -5379,6 +5422,7 @@ annotations.
 				<displayName>Belarusian Ruble</displayName>
 				<displayName count="one">Belarusian ruble</displayName>
 				<displayName count="other">Belarusian rubles</displayName>
+				<symbol>BYN</symbol>
 			</currency>
 			<currency type="BYR">
 				<displayName>Belarusian Ruble (2000–2016)</displayName>
@@ -5389,16 +5433,19 @@ annotations.
 				<displayName>Belize Dollar</displayName>
 				<displayName count="one">Belize dollar</displayName>
 				<displayName count="other">Belize dollars</displayName>
+				<symbol>BZD</symbol>
 			</currency>
 			<currency type="CAD">
 				<displayName>Canadian Dollar</displayName>
 				<displayName count="one">Canadian dollar</displayName>
 				<displayName count="other">Canadian dollars</displayName>
+				<symbol>CA$</symbol>
 			</currency>
 			<currency type="CDF">
 				<displayName>Congolese Franc</displayName>
 				<displayName count="one">Congolese franc</displayName>
 				<displayName count="other">Congolese francs</displayName>
+				<symbol>CDF</symbol>
 			</currency>
 			<currency type="CHE">
 				<displayName>WIR Euro</displayName>
@@ -5409,6 +5456,7 @@ annotations.
 				<displayName>Swiss Franc</displayName>
 				<displayName count="one">Swiss franc</displayName>
 				<displayName count="other">Swiss francs</displayName>
+				<symbol>CHF</symbol>
 			</currency>
 			<currency type="CHW">
 				<displayName>WIR Franc</displayName>
@@ -5429,11 +5477,13 @@ annotations.
 				<displayName>Chilean Peso</displayName>
 				<displayName count="one">Chilean peso</displayName>
 				<displayName count="other">Chilean pesos</displayName>
+				<symbol>CLP</symbol>
 			</currency>
 			<currency type="CNH">
 				<displayName>Chinese Yuan (offshore)</displayName>
 				<displayName count="one">Chinese yuan (offshore)</displayName>
 				<displayName count="other">Chinese yuan (offshore)</displayName>
+				<symbol>CNH</symbol>
 			</currency>
 			<currency type="CNX">
 				<displayName>Chinese People’s Bank Dollar</displayName>
@@ -5444,11 +5494,13 @@ annotations.
 				<displayName>Chinese Yuan</displayName>
 				<displayName count="one">Chinese yuan</displayName>
 				<displayName count="other">Chinese yuan</displayName>
+				<symbol>CN¥</symbol>
 			</currency>
 			<currency type="COP">
 				<displayName>Colombian Peso</displayName>
 				<displayName count="one">Colombian peso</displayName>
 				<displayName count="other">Colombian pesos</displayName>
+				<symbol>COP</symbol>
 			</currency>
 			<currency type="COU">
 				<displayName>Colombian Real Value Unit</displayName>
@@ -5459,6 +5511,7 @@ annotations.
 				<displayName>Costa Rican Colón</displayName>
 				<displayName count="one">Costa Rican colón</displayName>
 				<displayName count="other">Costa Rican colóns</displayName>
+				<symbol>CRC</symbol>
 			</currency>
 			<currency type="CSD">
 				<displayName>Serbian Dinar (2002–2006)</displayName>
@@ -5474,16 +5527,19 @@ annotations.
 				<displayName>Cuban Convertible Peso</displayName>
 				<displayName count="one">Cuban convertible peso</displayName>
 				<displayName count="other">Cuban convertible pesos</displayName>
+				<symbol>CUC</symbol>
 			</currency>
 			<currency type="CUP">
 				<displayName>Cuban Peso</displayName>
 				<displayName count="one">Cuban peso</displayName>
 				<displayName count="other">Cuban pesos</displayName>
+				<symbol>CUP</symbol>
 			</currency>
 			<currency type="CVE">
 				<displayName>Cape Verdean Escudo</displayName>
 				<displayName count="one">Cape Verdean escudo</displayName>
 				<displayName count="other">Cape Verdean escudos</displayName>
+				<symbol>CVE</symbol>
 			</currency>
 			<currency type="CYP">
 				<displayName>Cypriot Pound</displayName>
@@ -5494,6 +5550,7 @@ annotations.
 				<displayName>Czech Koruna</displayName>
 				<displayName count="one">Czech koruna</displayName>
 				<displayName count="other">Czech korunas</displayName>
+				<symbol>CZK</symbol>
 			</currency>
 			<currency type="DDM">
 				<displayName>East German Mark</displayName>
@@ -5509,21 +5566,25 @@ annotations.
 				<displayName>Djiboutian Franc</displayName>
 				<displayName count="one">Djiboutian franc</displayName>
 				<displayName count="other">Djiboutian francs</displayName>
+				<symbol>DJF</symbol>
 			</currency>
 			<currency type="DKK">
 				<displayName>Danish Krone</displayName>
 				<displayName count="one">Danish krone</displayName>
 				<displayName count="other">Danish kroner</displayName>
+				<symbol>DKK</symbol>
 			</currency>
 			<currency type="DOP">
 				<displayName>Dominican Peso</displayName>
 				<displayName count="one">Dominican peso</displayName>
 				<displayName count="other">Dominican pesos</displayName>
+				<symbol>DOP</symbol>
 			</currency>
 			<currency type="DZD">
 				<displayName>Algerian Dinar</displayName>
 				<displayName count="one">Algerian dinar</displayName>
 				<displayName count="other">Algerian dinars</displayName>
+				<symbol>DZD</symbol>
 			</currency>
 			<currency type="ECS">
 				<displayName>Ecuadorian Sucre</displayName>
@@ -5544,11 +5605,13 @@ annotations.
 				<displayName>Egyptian Pound</displayName>
 				<displayName count="one">Egyptian pound</displayName>
 				<displayName count="other">Egyptian pounds</displayName>
+				<symbol>EGP</symbol>
 			</currency>
 			<currency type="ERN">
 				<displayName>Eritrean Nakfa</displayName>
 				<displayName count="one">Eritrean nakfa</displayName>
 				<displayName count="other">Eritrean nakfas</displayName>
+				<symbol>ERN</symbol>
 			</currency>
 			<currency type="ESA">
 				<displayName>Spanish Peseta (A account)</displayName>
@@ -5569,11 +5632,13 @@ annotations.
 				<displayName>Ethiopian Birr</displayName>
 				<displayName count="one">Ethiopian birr</displayName>
 				<displayName count="other">Ethiopian birrs</displayName>
+				<symbol>ETB</symbol>
 			</currency>
 			<currency type="EUR">
 				<displayName>Euro</displayName>
 				<displayName count="one">euro</displayName>
 				<displayName count="other">euros</displayName>
+				<symbol>€</symbol>
 			</currency>
 			<currency type="FIM">
 				<displayName>Finnish Markka</displayName>
@@ -5584,11 +5649,13 @@ annotations.
 				<displayName>Fijian Dollar</displayName>
 				<displayName count="one">Fijian dollar</displayName>
 				<displayName count="other">Fijian dollars</displayName>
+				<symbol>FJD</symbol>
 			</currency>
 			<currency type="FKP">
 				<displayName>Falkland Islands Pound</displayName>
 				<displayName count="one">Falkland Islands pound</displayName>
 				<displayName count="other">Falkland Islands pounds</displayName>
+				<symbol>FKP</symbol>
 			</currency>
 			<currency type="FRF">
 				<displayName>French Franc</displayName>
@@ -5599,6 +5666,7 @@ annotations.
 				<displayName>British Pound</displayName>
 				<displayName count="one">British pound</displayName>
 				<displayName count="other">British pounds</displayName>
+				<symbol>£</symbol>
 			</currency>
 			<currency type="GEK">
 				<displayName>Georgian Kupon Larit</displayName>
@@ -5609,6 +5677,7 @@ annotations.
 				<displayName>Georgian Lari</displayName>
 				<displayName count="one">Georgian lari</displayName>
 				<displayName count="other">Georgian laris</displayName>
+				<symbol>GEL</symbol>
 			</currency>
 			<currency type="GHC">
 				<displayName>Ghanaian Cedi (1979–2007)</displayName>
@@ -5619,21 +5688,25 @@ annotations.
 				<displayName>Ghanaian Cedi</displayName>
 				<displayName count="one">Ghanaian cedi</displayName>
 				<displayName count="other">Ghanaian cedis</displayName>
+				<symbol>GHS</symbol>
 			</currency>
 			<currency type="GIP">
 				<displayName>Gibraltar Pound</displayName>
 				<displayName count="one">Gibraltar pound</displayName>
 				<displayName count="other">Gibraltar pounds</displayName>
+				<symbol>GIP</symbol>
 			</currency>
 			<currency type="GMD">
 				<displayName>Gambian Dalasi</displayName>
 				<displayName count="one">Gambian dalasi</displayName>
 				<displayName count="other">Gambian dalasis</displayName>
+				<symbol>GMD</symbol>
 			</currency>
 			<currency type="GNF">
 				<displayName>Guinean Franc</displayName>
 				<displayName count="one">Guinean franc</displayName>
 				<displayName count="other">Guinean francs</displayName>
+				<symbol>GNF</symbol>
 			</currency>
 			<currency type="GNS">
 				<displayName>Guinean Syli</displayName>
@@ -5654,6 +5727,7 @@ annotations.
 				<displayName>Guatemalan Quetzal</displayName>
 				<displayName count="one">Guatemalan quetzal</displayName>
 				<displayName count="other">Guatemalan quetzals</displayName>
+				<symbol>GTQ</symbol>
 			</currency>
 			<currency type="GWE">
 				<displayName>Portuguese Guinea Escudo</displayName>
@@ -5669,16 +5743,19 @@ annotations.
 				<displayName>Guyanaese Dollar</displayName>
 				<displayName count="one">Guyanaese dollar</displayName>
 				<displayName count="other">Guyanaese dollars</displayName>
+				<symbol>GYD</symbol>
 			</currency>
 			<currency type="HKD">
 				<displayName>Hong Kong Dollar</displayName>
 				<displayName count="one">Hong Kong dollar</displayName>
 				<displayName count="other">Hong Kong dollars</displayName>
+				<symbol>HK$</symbol>
 			</currency>
 			<currency type="HNL">
 				<displayName>Honduran Lempira</displayName>
 				<displayName count="one">Honduran lempira</displayName>
 				<displayName count="other">Honduran lempiras</displayName>
+				<symbol>HNL</symbol>
 			</currency>
 			<currency type="HRD">
 				<displayName>Croatian Dinar</displayName>
@@ -5689,21 +5766,25 @@ annotations.
 				<displayName>Croatian Kuna</displayName>
 				<displayName count="one">Croatian kuna</displayName>
 				<displayName count="other">Croatian kunas</displayName>
+				<symbol>HRK</symbol>
 			</currency>
 			<currency type="HTG">
 				<displayName>Haitian Gourde</displayName>
 				<displayName count="one">Haitian gourde</displayName>
 				<displayName count="other">Haitian gourdes</displayName>
+				<symbol>HTG</symbol>
 			</currency>
 			<currency type="HUF">
 				<displayName>Hungarian Forint</displayName>
 				<displayName count="one">Hungarian forint</displayName>
 				<displayName count="other">Hungarian forints</displayName>
+				<symbol>HUF</symbol>
 			</currency>
 			<currency type="IDR">
 				<displayName>Indonesian Rupiah</displayName>
 				<displayName count="one">Indonesian rupiah</displayName>
 				<displayName count="other">Indonesian rupiahs</displayName>
+				<symbol>IDR</symbol>
 			</currency>
 			<currency type="IEP">
 				<displayName>Irish Pound</displayName>
@@ -5724,21 +5805,25 @@ annotations.
 				<displayName>Israeli New Shekel</displayName>
 				<displayName count="one">Israeli new shekel</displayName>
 				<displayName count="other">Israeli new shekels</displayName>
+				<symbol>₪</symbol>
 			</currency>
 			<currency type="INR">
 				<displayName>Indian Rupee</displayName>
 				<displayName count="one">Indian rupee</displayName>
 				<displayName count="other">Indian rupees</displayName>
+				<symbol>₹</symbol>
 			</currency>
 			<currency type="IQD">
 				<displayName>Iraqi Dinar</displayName>
 				<displayName count="one">Iraqi dinar</displayName>
 				<displayName count="other">Iraqi dinars</displayName>
+				<symbol>IQD</symbol>
 			</currency>
 			<currency type="IRR">
 				<displayName>Iranian Rial</displayName>
 				<displayName count="one">Iranian rial</displayName>
 				<displayName count="other">Iranian rials</displayName>
+				<symbol>IRR</symbol>
 			</currency>
 			<currency type="ISJ">
 				<displayName>Icelandic Króna (1918–1981)</displayName>
@@ -5749,6 +5834,7 @@ annotations.
 				<displayName>Icelandic Króna</displayName>
 				<displayName count="one">Icelandic króna</displayName>
 				<displayName count="other">Icelandic krónur</displayName>
+				<symbol>ISK</symbol>
 			</currency>
 			<currency type="ITL">
 				<displayName>Italian Lira</displayName>
@@ -5759,11 +5845,13 @@ annotations.
 				<displayName>Jamaican Dollar</displayName>
 				<displayName count="one">Jamaican dollar</displayName>
 				<displayName count="other">Jamaican dollars</displayName>
+				<symbol>JMD</symbol>
 			</currency>
 			<currency type="JOD">
 				<displayName>Jordanian Dinar</displayName>
 				<displayName count="one">Jordanian dinar</displayName>
 				<displayName count="other">Jordanian dinars</displayName>
+				<symbol>JOD</symbol>
 			</currency>
 			<currency type="JPY">
 				<displayName>Japanese Yen</displayName>
@@ -5775,26 +5863,31 @@ annotations.
 				<displayName>Kenyan Shilling</displayName>
 				<displayName count="one">Kenyan shilling</displayName>
 				<displayName count="other">Kenyan shillings</displayName>
+				<symbol>KES</symbol>
 			</currency>
 			<currency type="KGS">
 				<displayName>Kyrgystani Som</displayName>
 				<displayName count="one">Kyrgystani som</displayName>
 				<displayName count="other">Kyrgystani soms</displayName>
+				<symbol>KGS</symbol>
 			</currency>
 			<currency type="KHR">
 				<displayName>Cambodian Riel</displayName>
 				<displayName count="one">Cambodian riel</displayName>
 				<displayName count="other">Cambodian riels</displayName>
+				<symbol>KHR</symbol>
 			</currency>
 			<currency type="KMF">
 				<displayName>Comorian Franc</displayName>
 				<displayName count="one">Comorian franc</displayName>
 				<displayName count="other">Comorian francs</displayName>
+				<symbol>KMF</symbol>
 			</currency>
 			<currency type="KPW">
 				<displayName>North Korean Won</displayName>
 				<displayName count="one">North Korean won</displayName>
 				<displayName count="other">North Korean won</displayName>
+				<symbol>KPW</symbol>
 			</currency>
 			<currency type="KRH">
 				<displayName>South Korean Hwan (1953–1962)</displayName>
@@ -5810,46 +5903,55 @@ annotations.
 				<displayName>South Korean Won</displayName>
 				<displayName count="one">South Korean won</displayName>
 				<displayName count="other">South Korean won</displayName>
+				<symbol>₩</symbol>
 			</currency>
 			<currency type="KWD">
 				<displayName>Kuwaiti Dinar</displayName>
 				<displayName count="one">Kuwaiti dinar</displayName>
 				<displayName count="other">Kuwaiti dinars</displayName>
+				<symbol>KWD</symbol>
 			</currency>
 			<currency type="KYD">
 				<displayName>Cayman Islands Dollar</displayName>
 				<displayName count="one">Cayman Islands dollar</displayName>
 				<displayName count="other">Cayman Islands dollars</displayName>
+				<symbol>KYD</symbol>
 			</currency>
 			<currency type="KZT">
 				<displayName>Kazakhstani Tenge</displayName>
 				<displayName count="one">Kazakhstani tenge</displayName>
 				<displayName count="other">Kazakhstani tenges</displayName>
+				<symbol>KZT</symbol>
 			</currency>
 			<currency type="LAK">
 				<displayName>Laotian Kip</displayName>
 				<displayName count="one">Laotian kip</displayName>
 				<displayName count="other">Laotian kips</displayName>
+				<symbol>LAK</symbol>
 			</currency>
 			<currency type="LBP">
 				<displayName>Lebanese Pound</displayName>
 				<displayName count="one">Lebanese pound</displayName>
 				<displayName count="other">Lebanese pounds</displayName>
+				<symbol>LBP</symbol>
 			</currency>
 			<currency type="LKR">
 				<displayName>Sri Lankan Rupee</displayName>
 				<displayName count="one">Sri Lankan rupee</displayName>
 				<displayName count="other">Sri Lankan rupees</displayName>
+				<symbol>LKR</symbol>
 			</currency>
 			<currency type="LRD">
 				<displayName>Liberian Dollar</displayName>
 				<displayName count="one">Liberian dollar</displayName>
 				<displayName count="other">Liberian dollars</displayName>
+				<symbol>LRD</symbol>
 			</currency>
 			<currency type="LSL">
 				<displayName>Lesotho Loti</displayName>
 				<displayName count="one">Lesotho loti</displayName>
 				<displayName count="other">Lesotho lotis</displayName>
+				<symbol>LSL</symbol>
 			</currency>
 			<currency type="LTL">
 				<displayName>Lithuanian Litas</displayName>
@@ -5890,11 +5992,13 @@ annotations.
 				<displayName>Libyan Dinar</displayName>
 				<displayName count="one">Libyan dinar</displayName>
 				<displayName count="other">Libyan dinars</displayName>
+				<symbol>LYD</symbol>
 			</currency>
 			<currency type="MAD">
 				<displayName>Moroccan Dirham</displayName>
 				<displayName count="one">Moroccan dirham</displayName>
 				<displayName count="other">Moroccan dirhams</displayName>
+				<symbol>MAD</symbol>
 			</currency>
 			<currency type="MAF">
 				<displayName>Moroccan Franc</displayName>
@@ -5915,11 +6019,13 @@ annotations.
 				<displayName>Moldovan Leu</displayName>
 				<displayName count="one">Moldovan leu</displayName>
 				<displayName count="other">Moldovan lei</displayName>
+				<symbol>MDL</symbol>
 			</currency>
 			<currency type="MGA">
 				<displayName>Malagasy Ariary</displayName>
 				<displayName count="one">Malagasy ariary</displayName>
 				<displayName count="other">Malagasy ariaries</displayName>
+				<symbol>MGA</symbol>
 			</currency>
 			<currency type="MGF">
 				<displayName>Malagasy Franc</displayName>
@@ -5930,6 +6036,7 @@ annotations.
 				<displayName>Macedonian Denar</displayName>
 				<displayName count="one">Macedonian denar</displayName>
 				<displayName count="other">Macedonian denari</displayName>
+				<symbol>MKD</symbol>
 			</currency>
 			<currency type="MKN">
 				<displayName>Macedonian Denar (1992–1993)</displayName>
@@ -5945,16 +6052,19 @@ annotations.
 				<displayName>Myanmar Kyat</displayName>
 				<displayName count="one">Myanmar kyat</displayName>
 				<displayName count="other">Myanmar kyats</displayName>
+				<symbol>MMK</symbol>
 			</currency>
 			<currency type="MNT">
 				<displayName>Mongolian Tugrik</displayName>
 				<displayName count="one">Mongolian tugrik</displayName>
 				<displayName count="other">Mongolian tugriks</displayName>
+				<symbol>MNT</symbol>
 			</currency>
 			<currency type="MOP">
 				<displayName>Macanese Pataca</displayName>
 				<displayName count="one">Macanese pataca</displayName>
 				<displayName count="other">Macanese patacas</displayName>
+				<symbol>MOP</symbol>
 			</currency>
 			<currency type="MRO">
 				<displayName>Mauritanian Ouguiya (1973–2017)</displayName>
@@ -5965,6 +6075,7 @@ annotations.
 				<displayName>Mauritanian Ouguiya</displayName>
 				<displayName count="one">Mauritanian ouguiya</displayName>
 				<displayName count="other">Mauritanian ouguiyas</displayName>
+				<symbol>MRU</symbol>
 			</currency>
 			<currency type="MTL">
 				<displayName>Maltese Lira</displayName>
@@ -5980,6 +6091,7 @@ annotations.
 				<displayName>Mauritian Rupee</displayName>
 				<displayName count="one">Mauritian rupee</displayName>
 				<displayName count="other">Mauritian rupees</displayName>
+				<symbol>MUR</symbol>
 			</currency>
 			<currency type="MVP">
 				<displayName>Maldivian Rupee (1947–1981)</displayName>
@@ -5990,16 +6102,19 @@ annotations.
 				<displayName>Maldivian Rufiyaa</displayName>
 				<displayName count="one">Maldivian rufiyaa</displayName>
 				<displayName count="other">Maldivian rufiyaas</displayName>
+				<symbol>MVR</symbol>
 			</currency>
 			<currency type="MWK">
 				<displayName>Malawian Kwacha</displayName>
 				<displayName count="one">Malawian kwacha</displayName>
 				<displayName count="other">Malawian kwachas</displayName>
+				<symbol>MWK</symbol>
 			</currency>
 			<currency type="MXN">
 				<displayName>Mexican Peso</displayName>
 				<displayName count="one">Mexican peso</displayName>
 				<displayName count="other">Mexican pesos</displayName>
+				<symbol>MX$</symbol>
 			</currency>
 			<currency type="MXP">
 				<displayName>Mexican Silver Peso (1861–1992)</displayName>
@@ -6015,6 +6130,7 @@ annotations.
 				<displayName>Malaysian Ringgit</displayName>
 				<displayName count="one">Malaysian ringgit</displayName>
 				<displayName count="other">Malaysian ringgits</displayName>
+				<symbol>MYR</symbol>
 			</currency>
 			<currency type="MZE">
 				<displayName>Mozambican Escudo</displayName>
@@ -6030,16 +6146,19 @@ annotations.
 				<displayName>Mozambican Metical</displayName>
 				<displayName count="one">Mozambican metical</displayName>
 				<displayName count="other">Mozambican meticals</displayName>
+				<symbol>MZN</symbol>
 			</currency>
 			<currency type="NAD">
 				<displayName>Namibian Dollar</displayName>
 				<displayName count="one">Namibian dollar</displayName>
 				<displayName count="other">Namibian dollars</displayName>
+				<symbol>NAD</symbol>
 			</currency>
 			<currency type="NGN">
 				<displayName>Nigerian Naira</displayName>
 				<displayName count="one">Nigerian naira</displayName>
 				<displayName count="other">Nigerian nairas</displayName>
+				<symbol>NGN</symbol>
 			</currency>
 			<currency type="NIC">
 				<displayName>Nicaraguan Córdoba (1988–1991)</displayName>
@@ -6050,6 +6169,7 @@ annotations.
 				<displayName>Nicaraguan Córdoba</displayName>
 				<displayName count="one">Nicaraguan córdoba</displayName>
 				<displayName count="other">Nicaraguan córdobas</displayName>
+				<symbol>NIO</symbol>
 			</currency>
 			<currency type="NLG">
 				<displayName>Dutch Guilder</displayName>
@@ -6060,26 +6180,31 @@ annotations.
 				<displayName>Norwegian Krone</displayName>
 				<displayName count="one">Norwegian krone</displayName>
 				<displayName count="other">Norwegian kroner</displayName>
+				<symbol>NOK</symbol>
 			</currency>
 			<currency type="NPR">
 				<displayName>Nepalese Rupee</displayName>
 				<displayName count="one">Nepalese rupee</displayName>
 				<displayName count="other">Nepalese rupees</displayName>
+				<symbol>NPR</symbol>
 			</currency>
 			<currency type="NZD">
 				<displayName>New Zealand Dollar</displayName>
 				<displayName count="one">New Zealand dollar</displayName>
 				<displayName count="other">New Zealand dollars</displayName>
+				<symbol>NZ$</symbol>
 			</currency>
 			<currency type="OMR">
 				<displayName>Omani Rial</displayName>
 				<displayName count="one">Omani rial</displayName>
 				<displayName count="other">Omani rials</displayName>
+				<symbol>OMR</symbol>
 			</currency>
 			<currency type="PAB">
 				<displayName>Panamanian Balboa</displayName>
 				<displayName count="one">Panamanian balboa</displayName>
 				<displayName count="other">Panamanian balboas</displayName>
+				<symbol>PAB</symbol>
 			</currency>
 			<currency type="PEI">
 				<displayName>Peruvian Inti</displayName>
@@ -6090,6 +6215,7 @@ annotations.
 				<displayName>Peruvian Sol</displayName>
 				<displayName count="one">Peruvian sol</displayName>
 				<displayName count="other">Peruvian soles</displayName>
+				<symbol>PEN</symbol>
 			</currency>
 			<currency type="PES">
 				<displayName>Peruvian Sol (1863–1965)</displayName>
@@ -6100,21 +6226,25 @@ annotations.
 				<displayName>Papua New Guinean Kina</displayName>
 				<displayName count="one">Papua New Guinean kina</displayName>
 				<displayName count="other">Papua New Guinean kina</displayName>
+				<symbol>PGK</symbol>
 			</currency>
 			<currency type="PHP">
 				<displayName>Philippine Peso</displayName>
 				<displayName count="one">Philippine peso</displayName>
 				<displayName count="other">Philippine pesos</displayName>
+				<symbol>₱</symbol>
 			</currency>
 			<currency type="PKR">
 				<displayName>Pakistani Rupee</displayName>
 				<displayName count="one">Pakistani rupee</displayName>
 				<displayName count="other">Pakistani rupees</displayName>
+				<symbol>PKR</symbol>
 			</currency>
 			<currency type="PLN">
 				<displayName>Polish Zloty</displayName>
 				<displayName count="one">Polish zloty</displayName>
 				<displayName count="other">Polish zlotys</displayName>
+				<symbol>PLN</symbol>
 			</currency>
 			<currency type="PLZ">
 				<displayName>Polish Zloty (1950–1995)</displayName>
@@ -6130,11 +6260,13 @@ annotations.
 				<displayName>Paraguayan Guarani</displayName>
 				<displayName count="one">Paraguayan guarani</displayName>
 				<displayName count="other">Paraguayan guaranis</displayName>
+				<symbol>PYG</symbol>
 			</currency>
 			<currency type="QAR">
 				<displayName>Qatari Riyal</displayName>
 				<displayName count="one">Qatari riyal</displayName>
 				<displayName count="other">Qatari riyals</displayName>
+				<symbol>QAR</symbol>
 			</currency>
 			<currency type="RHD">
 				<displayName>Rhodesian Dollar</displayName>
@@ -6150,16 +6282,19 @@ annotations.
 				<displayName>Romanian Leu</displayName>
 				<displayName count="one">Romanian leu</displayName>
 				<displayName count="other">Romanian lei</displayName>
+				<symbol>RON</symbol>
 			</currency>
 			<currency type="RSD">
 				<displayName>Serbian Dinar</displayName>
 				<displayName count="one">Serbian dinar</displayName>
 				<displayName count="other">Serbian dinars</displayName>
+				<symbol>RSD</symbol>
 			</currency>
 			<currency type="RUB">
 				<displayName>Russian Ruble</displayName>
 				<displayName count="one">Russian ruble</displayName>
 				<displayName count="other">Russian rubles</displayName>
+				<symbol>RUB</symbol>
 			</currency>
 			<currency type="RUR">
 				<displayName>Russian Ruble (1991–1998)</displayName>
@@ -6170,21 +6305,25 @@ annotations.
 				<displayName>Rwandan Franc</displayName>
 				<displayName count="one">Rwandan franc</displayName>
 				<displayName count="other">Rwandan francs</displayName>
+				<symbol>RWF</symbol>
 			</currency>
 			<currency type="SAR">
 				<displayName>Saudi Riyal</displayName>
 				<displayName count="one">Saudi riyal</displayName>
 				<displayName count="other">Saudi riyals</displayName>
+				<symbol>SAR</symbol>
 			</currency>
 			<currency type="SBD">
 				<displayName>Solomon Islands Dollar</displayName>
 				<displayName count="one">Solomon Islands dollar</displayName>
 				<displayName count="other">Solomon Islands dollars</displayName>
+				<symbol>SBD</symbol>
 			</currency>
 			<currency type="SCR">
 				<displayName>Seychellois Rupee</displayName>
 				<displayName count="one">Seychellois rupee</displayName>
 				<displayName count="other">Seychellois rupees</displayName>
+				<symbol>SCR</symbol>
 			</currency>
 			<currency type="SDD">
 				<displayName>Sudanese Dinar (1992–2007)</displayName>
@@ -6195,6 +6334,7 @@ annotations.
 				<displayName>Sudanese Pound</displayName>
 				<displayName count="one">Sudanese pound</displayName>
 				<displayName count="other">Sudanese pounds</displayName>
+				<symbol>SDG</symbol>
 			</currency>
 			<currency type="SDP">
 				<displayName>Sudanese Pound (1957–1998)</displayName>
@@ -6205,16 +6345,19 @@ annotations.
 				<displayName>Swedish Krona</displayName>
 				<displayName count="one">Swedish krona</displayName>
 				<displayName count="other">Swedish kronor</displayName>
+				<symbol>SEK</symbol>
 			</currency>
 			<currency type="SGD">
 				<displayName>Singapore Dollar</displayName>
 				<displayName count="one">Singapore dollar</displayName>
 				<displayName count="other">Singapore dollars</displayName>
+				<symbol>SGD</symbol>
 			</currency>
 			<currency type="SHP">
 				<displayName>St. Helena Pound</displayName>
 				<displayName count="one">St. Helena pound</displayName>
 				<displayName count="other">St. Helena pounds</displayName>
+				<symbol>SHP</symbol>
 			</currency>
 			<currency type="SIT">
 				<displayName>Slovenian Tolar</displayName>
@@ -6230,21 +6373,25 @@ annotations.
 				<displayName>Sierra Leonean Leone</displayName>
 				<displayName count="one">Sierra Leonean leone</displayName>
 				<displayName count="other">Sierra Leonean leones</displayName>
+				<symbol>SLE</symbol>
 			</currency>
 			<currency type="SLL">
 				<displayName>Sierra Leonean Leone (1964—2022)</displayName>
 				<displayName count="one">Sierra Leonean leone (1964—2022)</displayName>
 				<displayName count="other">Sierra Leonean leones (1964—2022)</displayName>
+				<symbol>SLL</symbol>
 			</currency>
 			<currency type="SOS">
 				<displayName>Somali Shilling</displayName>
 				<displayName count="one">Somali shilling</displayName>
 				<displayName count="other">Somali shillings</displayName>
+				<symbol>SOS</symbol>
 			</currency>
 			<currency type="SRD">
 				<displayName>Surinamese Dollar</displayName>
 				<displayName count="one">Surinamese dollar</displayName>
 				<displayName count="other">Surinamese dollars</displayName>
+				<symbol>SRD</symbol>
 			</currency>
 			<currency type="SRG">
 				<displayName>Surinamese Guilder</displayName>
@@ -6255,6 +6402,7 @@ annotations.
 				<displayName>South Sudanese Pound</displayName>
 				<displayName count="one">South Sudanese pound</displayName>
 				<displayName count="other">South Sudanese pounds</displayName>
+				<symbol>SSP</symbol>
 			</currency>
 			<currency type="STD">
 				<displayName>São Tomé &amp; Príncipe Dobra (1977–2017)</displayName>
@@ -6265,6 +6413,7 @@ annotations.
 				<displayName>São Tomé &amp; Príncipe Dobra</displayName>
 				<displayName count="one">São Tomé &amp; Príncipe dobra</displayName>
 				<displayName count="other">São Tomé &amp; Príncipe dobras</displayName>
+				<symbol>STN</symbol>
 			</currency>
 			<currency type="SUR">
 				<displayName>Soviet Rouble</displayName>
@@ -6280,16 +6429,19 @@ annotations.
 				<displayName>Syrian Pound</displayName>
 				<displayName count="one">Syrian pound</displayName>
 				<displayName count="other">Syrian pounds</displayName>
+				<symbol>SYP</symbol>
 			</currency>
 			<currency type="SZL">
 				<displayName>Swazi Lilangeni</displayName>
 				<displayName count="one">Swazi lilangeni</displayName>
 				<displayName count="other">Swazi emalangeni</displayName>
+				<symbol>SZL</symbol>
 			</currency>
 			<currency type="THB">
 				<displayName>Thai Baht</displayName>
 				<displayName count="one">Thai baht</displayName>
 				<displayName count="other">Thai baht</displayName>
+				<symbol>THB</symbol>
 			</currency>
 			<currency type="TJR">
 				<displayName>Tajikistani Ruble</displayName>
@@ -6300,6 +6452,7 @@ annotations.
 				<displayName>Tajikistani Somoni</displayName>
 				<displayName count="one">Tajikistani somoni</displayName>
 				<displayName count="other">Tajikistani somonis</displayName>
+				<symbol>TJS</symbol>
 			</currency>
 			<currency type="TMM">
 				<displayName>Turkmenistani Manat (1993–2009)</displayName>
@@ -6310,16 +6463,19 @@ annotations.
 				<displayName>Turkmenistani Manat</displayName>
 				<displayName count="one">Turkmenistani manat</displayName>
 				<displayName count="other">Turkmenistani manat</displayName>
+				<symbol>TMT</symbol>
 			</currency>
 			<currency type="TND">
 				<displayName>Tunisian Dinar</displayName>
 				<displayName count="one">Tunisian dinar</displayName>
 				<displayName count="other">Tunisian dinars</displayName>
+				<symbol>TND</symbol>
 			</currency>
 			<currency type="TOP">
 				<displayName>Tongan Paʻanga</displayName>
 				<displayName count="one">Tongan paʻanga</displayName>
 				<displayName count="other">Tongan paʻanga</displayName>
+				<symbol>TOP</symbol>
 			</currency>
 			<currency type="TPE">
 				<displayName>Timorese Escudo</displayName>
@@ -6335,26 +6491,31 @@ annotations.
 				<displayName>Turkish Lira</displayName>
 				<displayName count="one">Turkish lira</displayName>
 				<displayName count="other">Turkish Lira</displayName>
+				<symbol>TRY</symbol>
 			</currency>
 			<currency type="TTD">
 				<displayName>Trinidad &amp; Tobago Dollar</displayName>
 				<displayName count="one">Trinidad &amp; Tobago dollar</displayName>
 				<displayName count="other">Trinidad &amp; Tobago dollars</displayName>
+				<symbol>TTD</symbol>
 			</currency>
 			<currency type="TWD">
 				<displayName>New Taiwan Dollar</displayName>
 				<displayName count="one">New Taiwan dollar</displayName>
 				<displayName count="other">New Taiwan dollars</displayName>
+				<symbol>NT$</symbol>
 			</currency>
 			<currency type="TZS">
 				<displayName>Tanzanian Shilling</displayName>
 				<displayName count="one">Tanzanian shilling</displayName>
 				<displayName count="other">Tanzanian shillings</displayName>
+				<symbol>TZS</symbol>
 			</currency>
 			<currency type="UAH">
 				<displayName>Ukrainian Hryvnia</displayName>
 				<displayName count="one">Ukrainian hryvnia</displayName>
 				<displayName count="other">Ukrainian hryvnias</displayName>
+				<symbol>UAH</symbol>
 			</currency>
 			<currency type="UAK">
 				<displayName>Ukrainian Karbovanets</displayName>
@@ -6370,6 +6531,7 @@ annotations.
 				<displayName>Ugandan Shilling</displayName>
 				<displayName count="one">Ugandan shilling</displayName>
 				<displayName count="other">Ugandan shillings</displayName>
+				<symbol>UGX</symbol>
 			</currency>
 			<currency type="USD">
 				<displayName>US Dollar</displayName>
@@ -6401,6 +6563,7 @@ annotations.
 				<displayName>Uruguayan Peso</displayName>
 				<displayName count="one">Uruguayan peso</displayName>
 				<displayName count="other">Uruguayan pesos</displayName>
+				<symbol>UYU</symbol>
 			</currency>
 			<currency type="UYW">
 				<displayName>Uruguayan Nominal Wage Index Unit</displayName>
@@ -6411,6 +6574,7 @@ annotations.
 				<displayName>Uzbekistani Som</displayName>
 				<displayName count="one">Uzbekistani som</displayName>
 				<displayName count="other">Uzbekistani som</displayName>
+				<symbol>UZS</symbol>
 			</currency>
 			<currency type="VEB">
 				<displayName>Venezuelan Bolívar (1871–2008)</displayName>
@@ -6431,11 +6595,13 @@ annotations.
 				<displayName>Venezuelan Bolívar</displayName>
 				<displayName count="one">Venezuelan bolívar</displayName>
 				<displayName count="other">Venezuelan bolívars</displayName>
+				<symbol>VES</symbol>
 			</currency>
 			<currency type="VND">
 				<displayName>Vietnamese Dong</displayName>
 				<displayName count="one">Vietnamese dong</displayName>
 				<displayName count="other">Vietnamese dong</displayName>
+				<symbol>₫</symbol>
 			</currency>
 			<currency type="VNN">
 				<displayName>Vietnamese Dong (1978–1985)</displayName>
@@ -6446,16 +6612,19 @@ annotations.
 				<displayName>Vanuatu Vatu</displayName>
 				<displayName count="one">Vanuatu vatu</displayName>
 				<displayName count="other">Vanuatu vatus</displayName>
+				<symbol>VUV</symbol>
 			</currency>
 			<currency type="WST">
 				<displayName>Samoan Tala</displayName>
 				<displayName count="one">Samoan tala</displayName>
 				<displayName count="other">Samoan tala</displayName>
+				<symbol>WST</symbol>
 			</currency>
 			<currency type="XAF">
 				<displayName>Central African CFA Franc</displayName>
 				<displayName count="one">Central African CFA franc</displayName>
 				<displayName count="other">Central African CFA francs</displayName>
+				<symbol>FCFA</symbol>
 			</currency>
 			<currency type="XAG">
 				<displayName>Silver</displayName>
@@ -6491,6 +6660,7 @@ annotations.
 				<displayName>East Caribbean Dollar</displayName>
 				<displayName count="one">East Caribbean dollar</displayName>
 				<displayName count="other">East Caribbean dollars</displayName>
+				<symbol>EC$</symbol>
 			</currency>
 			<currency type="XCG">
 				<displayName>Caribbean guilder</displayName>
@@ -6521,6 +6691,7 @@ annotations.
 				<displayName>West African CFA Franc</displayName>
 				<displayName count="one">West African CFA franc</displayName>
 				<displayName count="other">West African CFA francs</displayName>
+				<symbol>F CFA</symbol>
 			</currency>
 			<currency type="XPD">
 				<displayName>Palladium</displayName>
@@ -6531,6 +6702,7 @@ annotations.
 				<displayName>CFP Franc</displayName>
 				<displayName count="one">CFP franc</displayName>
 				<displayName count="other">CFP francs</displayName>
+				<symbol>CFPF</symbol>
 			</currency>
 			<currency type="XPT">
 				<displayName>Platinum</displayName>
@@ -6571,6 +6743,7 @@ annotations.
 				<displayName>Yemeni Rial</displayName>
 				<displayName count="one">Yemeni rial</displayName>
 				<displayName count="other">Yemeni rials</displayName>
+				<symbol>YER</symbol>
 			</currency>
 			<currency type="YUD">
 				<displayName>Yugoslavian Hard Dinar (1966–1990)</displayName>
@@ -6601,6 +6774,7 @@ annotations.
 				<displayName>South African Rand</displayName>
 				<displayName count="one">South African rand</displayName>
 				<displayName count="other">South African rand</displayName>
+				<symbol>ZAR</symbol>
 			</currency>
 			<currency type="ZMK">
 				<displayName>Zambian Kwacha (1968–2012)</displayName>
@@ -6611,6 +6785,7 @@ annotations.
 				<displayName>Zambian Kwacha</displayName>
 				<displayName count="one">Zambian kwacha</displayName>
 				<displayName count="other">Zambian kwachas</displayName>
+				<symbol>ZMW</symbol>
 			</currency>
 			<currency type="ZRN">
 				<displayName>Zairean New Zaire (1993–1998)</displayName>
@@ -6631,6 +6806,7 @@ annotations.
 				<displayName>Zimbabwean Gold</displayName>
 				<displayName count="one">Zimbabwean gold</displayName>
 				<displayName count="other">Zimbabwean gold</displayName>
+				<symbol>ZWG</symbol>
 			</currency>
 			<currency type="ZWL">
 				<displayName>Zimbabwean Dollar (2009–2024)</displayName>
@@ -10159,6 +10335,7 @@ annotations.
 		<nameOrderLocales order="surnameFirst">ja ko vi yue zh</nameOrderLocales>
 		<parameterDefault parameter="formality">informal</parameterDefault>
 		<parameterDefault parameter="length">medium</parameterDefault>
+		<foreignSpaceReplacement xml:space="preserve"> </foreignSpaceReplacement>
 		<initialPattern type="initial">{0}.</initialPattern>
 		<initialPattern type="initialSequence">{0}{1}</initialPattern>
 		<personName order="givenFirst" length="long" usage="referring" formality="formal">
diff --git a/make/data/cldr/common/main/en_001.xml b/make/data/cldr/common/main/en_001.xml
index 944fdc84b79..b538c4a2de7 100644
--- a/make/data/cldr/common/main/en_001.xml
+++ b/make/data/cldr/common/main/en_001.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/en_150.xml b/make/data/cldr/common/main/en_150.xml
index e4309125fdd..412dd61dbb2 100644
--- a/make/data/cldr/common/main/en_150.xml
+++ b/make/data/cldr/common/main/en_150.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/en_AE.xml b/make/data/cldr/common/main/en_AE.xml
index a06ca32f9d7..87a19fe34dd 100644
--- a/make/data/cldr/common/main/en_AE.xml
+++ b/make/data/cldr/common/main/en_AE.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/en_AG.xml b/make/data/cldr/common/main/en_AG.xml
index 7baadb707fb..7383686fb3b 100644
--- a/make/data/cldr/common/main/en_AG.xml
+++ b/make/data/cldr/common/main/en_AG.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/en_AI.xml b/make/data/cldr/common/main/en_AI.xml
index 570253439bb..4ad0f8701bb 100644
--- a/make/data/cldr/common/main/en_AI.xml
+++ b/make/data/cldr/common/main/en_AI.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/en_AS.xml b/make/data/cldr/common/main/en_AS.xml
index da6ad816ab3..c31e5361374 100644
--- a/make/data/cldr/common/main/en_AS.xml
+++ b/make/data/cldr/common/main/en_AS.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/en_AT.xml b/make/data/cldr/common/main/en_AT.xml
index f9ed67e12eb..de4ddc030d3 100644
--- a/make/data/cldr/common/main/en_AT.xml
+++ b/make/data/cldr/common/main/en_AT.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/en_AU.xml b/make/data/cldr/common/main/en_AU.xml
index ab2bc8069d9..923e42942d0 100644
--- a/make/data/cldr/common/main/en_AU.xml
+++ b/make/data/cldr/common/main/en_AU.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -466,24 +466,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</field>
 		</fields>
 		<timeZoneNames>
-			<metazone type="Africa_Eastern">
-				<long>
-					<standard>Eastern Africa Time</standard>
-				</long>
-			</metazone>
-			<metazone type="Arabian">
-				<long>
-					<generic>Arabia Time</generic>
-					<standard>Arabia Standard Time</standard>
-					<daylight>Arabia Daylight Time</daylight>
-				</long>
-			</metazone>
 			<metazone type="Australia_Central">
-				<long>
-					<generic>Australian Central Time</generic>
-					<standard>Australian Central Standard Time</standard>
-					<daylight>Australian Central Daylight Time</daylight>
-				</long>
 				<short>
 					<generic>ACT</generic>
 					<standard>ACST</standard>
@@ -498,11 +481,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				</short>
 			</metazone>
 			<metazone type="Australia_Eastern">
-				<long>
-					<generic>Australian Eastern Time</generic>
-					<standard>Australian Eastern Standard Time</standard>
-					<daylight>Australian Eastern Daylight Time</daylight>
-				</long>
 				<short>
 					<generic>AET</generic>
 					<standard>AEST</standard>
@@ -510,11 +488,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				</short>
 			</metazone>
 			<metazone type="Australia_Western">
-				<long>
-					<generic>Australian Western Time</generic>
-					<standard>Australian Western Standard Time</standard>
-					<daylight>Australian Western Daylight Time</daylight>
-				</long>
 				<short>
 					<generic>AWT</generic>
 					<standard>AWST</standard>
@@ -528,18 +501,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<daylight>China Summer Time</daylight>
 				</long>
 			</metazone>
-			<metazone type="Cook">
-				<long>
-					<generic>Cook Island Time</generic>
-					<standard>Cook Island Standard Time</standard>
-					<daylight>Cook Island Summer Time</daylight>
-				</long>
-			</metazone>
-			<metazone type="Gulf">
-				<short>
-					<standard>Gulf ST</standard>
-				</short>
-			</metazone>
 			<metazone type="Japan">
 				<long>
 					<generic>Japan Time</generic>
@@ -549,7 +510,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</metazone>
 			<metazone type="Korea">
 				<long>
-					<generic>Korea Time</generic>
+					<generic>Korean Time</generic>
 					<standard>Korean Standard Time</standard>
 					<daylight>Korean Summer Time</daylight>
 				</long>
@@ -561,13 +522,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<daylight>LHDT</daylight>
 				</short>
 			</metazone>
-			<metazone type="Moscow">
-				<long>
-					<generic>Moscow Time</generic>
-					<standard>Moscow Standard Time</standard>
-					<daylight>Moscow Daylight Time</daylight>
-				</long>
-			</metazone>
 			<metazone type="New_Zealand">
 				<short>
 					<generic>NZT</generic>
@@ -577,15 +531,15 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</metazone>
 			<metazone type="Samoa">
 				<long>
-					<generic>Samoa Time</generic>
-					<standard>Samoa Standard Time</standard>
+					<generic>American Samoa Time</generic>
+					<standard>American Samoa Standard Time</standard>
 					<daylight>Samoa Summer Time</daylight>
 				</long>
 			</metazone>
 			<metazone type="Taipei">
 				<long>
-					<generic>Taipei Time</generic>
-					<standard>Taipei Standard Time</standard>
+					<generic>Taiwan Time</generic>
+					<standard>Taiwan Standard Time</standard>
 					<daylight>Taipei Summer Time</daylight>
 				</long>
 			</metazone>
diff --git a/make/data/cldr/common/main/en_BB.xml b/make/data/cldr/common/main/en_BB.xml
index a42ddcee867..2d5ed6b43bc 100644
--- a/make/data/cldr/common/main/en_BB.xml
+++ b/make/data/cldr/common/main/en_BB.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/en_BE.xml b/make/data/cldr/common/main/en_BE.xml
index 4f11b35c416..9b0d0607757 100644
--- a/make/data/cldr/common/main/en_BE.xml
+++ b/make/data/cldr/common/main/en_BE.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/en_BI.xml b/make/data/cldr/common/main/en_BI.xml
index 08c66ea876a..490c52dd522 100644
--- a/make/data/cldr/common/main/en_BI.xml
+++ b/make/data/cldr/common/main/en_BI.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/en_BM.xml b/make/data/cldr/common/main/en_BM.xml
index 2751a7e6adb..c25e826d065 100644
--- a/make/data/cldr/common/main/en_BM.xml
+++ b/make/data/cldr/common/main/en_BM.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/en_BS.xml b/make/data/cldr/common/main/en_BS.xml
index 7d61e251960..9a84c43091c 100644
--- a/make/data/cldr/common/main/en_BS.xml
+++ b/make/data/cldr/common/main/en_BS.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/en_BW.xml b/make/data/cldr/common/main/en_BW.xml
index 029a68bd483..d69c717ff3f 100644
--- a/make/data/cldr/common/main/en_BW.xml
+++ b/make/data/cldr/common/main/en_BW.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/en_BZ.xml b/make/data/cldr/common/main/en_BZ.xml
index 8301db0f0ba..34bc2bfd340 100644
--- a/make/data/cldr/common/main/en_BZ.xml
+++ b/make/data/cldr/common/main/en_BZ.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/en_CA.xml b/make/data/cldr/common/main/en_CA.xml
index aa475a80126..924ad541521 100644
--- a/make/data/cldr/common/main/en_CA.xml
+++ b/make/data/cldr/common/main/en_CA.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -1288,8 +1288,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</metazone>
 			<metazone type="Samoa">
 				<long>
-					<generic>Samoa Time</generic>
-					<standard>Samoa Standard Time</standard>
+					<generic>American Samoa Time</generic>
+					<standard>American Samoa Standard Time</standard>
 					<daylight>Samoan Time</daylight>
 				</long>
 			</metazone>
diff --git a/make/data/cldr/common/main/en_CC.xml b/make/data/cldr/common/main/en_CC.xml
index d7c89cceb05..3808acea3b0 100644
--- a/make/data/cldr/common/main/en_CC.xml
+++ b/make/data/cldr/common/main/en_CC.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/en_CH.xml b/make/data/cldr/common/main/en_CH.xml
index eb4b4052e0a..089854b073e 100644
--- a/make/data/cldr/common/main/en_CH.xml
+++ b/make/data/cldr/common/main/en_CH.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/en_CK.xml b/make/data/cldr/common/main/en_CK.xml
index 6b90814a581..730cd680677 100644
--- a/make/data/cldr/common/main/en_CK.xml
+++ b/make/data/cldr/common/main/en_CK.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/en_CM.xml b/make/data/cldr/common/main/en_CM.xml
index 9e88b643c8e..6b92c638541 100644
--- a/make/data/cldr/common/main/en_CM.xml
+++ b/make/data/cldr/common/main/en_CM.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/en_CX.xml b/make/data/cldr/common/main/en_CX.xml
index f74d58fae8d..537e1a56c7a 100644
--- a/make/data/cldr/common/main/en_CX.xml
+++ b/make/data/cldr/common/main/en_CX.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/en_CY.xml b/make/data/cldr/common/main/en_CY.xml
index 246e69e27a7..02b11655ea3 100644
--- a/make/data/cldr/common/main/en_CY.xml
+++ b/make/data/cldr/common/main/en_CY.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/en_CZ.xml b/make/data/cldr/common/main/en_CZ.xml
new file mode 100644
index 00000000000..e7e9beb7b0b
--- /dev/null
+++ b/make/data/cldr/common/main/en_CZ.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
+<!-- Copyright © 1991-2025 Unicode, Inc.
+For terms of use, see http://www.unicode.org/copyright.html
+SPDX-License-Identifier: Unicode-3.0
+CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
+-->
+<ldml>
+	<identity>
+		<version number="$Revision$"/>
+		<language type="en"/>
+		<territory type="CZ"/>
+	</identity>
+	<numbers>
+		<symbols numberSystem="latn">
+			<decimal>,</decimal>
+			<group> </group>
+		</symbols>
+	</numbers>
+</ldml>
diff --git a/make/data/cldr/common/main/en_DE.xml b/make/data/cldr/common/main/en_DE.xml
index e0a78572fb7..6294b401369 100644
--- a/make/data/cldr/common/main/en_DE.xml
+++ b/make/data/cldr/common/main/en_DE.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/en_DG.xml b/make/data/cldr/common/main/en_DG.xml
index afedbcd68f1..094dafdac31 100644
--- a/make/data/cldr/common/main/en_DG.xml
+++ b/make/data/cldr/common/main/en_DG.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/en_DK.xml b/make/data/cldr/common/main/en_DK.xml
index 7cfe98003a3..ecb0c0d2654 100644
--- a/make/data/cldr/common/main/en_DK.xml
+++ b/make/data/cldr/common/main/en_DK.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/en_DM.xml b/make/data/cldr/common/main/en_DM.xml
index 4865025f358..1b22f67288c 100644
--- a/make/data/cldr/common/main/en_DM.xml
+++ b/make/data/cldr/common/main/en_DM.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/en_Dsrt.xml b/make/data/cldr/common/main/en_Dsrt.xml
index 8f8a739bc69..864d2064cc3 100644
--- a/make/data/cldr/common/main/en_Dsrt.xml
+++ b/make/data/cldr/common/main/en_Dsrt.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/en_Dsrt_US.xml b/make/data/cldr/common/main/en_Dsrt_US.xml
index 1f5f650afba..b54eb040e60 100644
--- a/make/data/cldr/common/main/en_Dsrt_US.xml
+++ b/make/data/cldr/common/main/en_Dsrt_US.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/en_ER.xml b/make/data/cldr/common/main/en_ER.xml
index 73eb1839023..c49ec740711 100644
--- a/make/data/cldr/common/main/en_ER.xml
+++ b/make/data/cldr/common/main/en_ER.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/en_ES.xml b/make/data/cldr/common/main/en_ES.xml
new file mode 100644
index 00000000000..d26802b70bb
--- /dev/null
+++ b/make/data/cldr/common/main/en_ES.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
+<!-- Copyright © 1991-2025 Unicode, Inc.
+For terms of use, see http://www.unicode.org/copyright.html
+SPDX-License-Identifier: Unicode-3.0
+CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
+-->
+<ldml>
+	<identity>
+		<version number="$Revision$"/>
+		<language type="en"/>
+		<territory type="ES"/>
+	</identity>
+	<numbers>
+		<symbols numberSystem="latn">
+			<decimal>,</decimal>
+			<group>.</group>
+		</symbols>
+	</numbers>
+</ldml>
diff --git a/make/data/cldr/common/main/en_FI.xml b/make/data/cldr/common/main/en_FI.xml
index c5bd77f0004..de95149f382 100644
--- a/make/data/cldr/common/main/en_FI.xml
+++ b/make/data/cldr/common/main/en_FI.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/en_FJ.xml b/make/data/cldr/common/main/en_FJ.xml
index 150d4c97926..078c2afdb76 100644
--- a/make/data/cldr/common/main/en_FJ.xml
+++ b/make/data/cldr/common/main/en_FJ.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/en_FK.xml b/make/data/cldr/common/main/en_FK.xml
index 0043263afab..b65c355a9ae 100644
--- a/make/data/cldr/common/main/en_FK.xml
+++ b/make/data/cldr/common/main/en_FK.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/en_FM.xml b/make/data/cldr/common/main/en_FM.xml
index 302122d86b9..00fdfb1bb25 100644
--- a/make/data/cldr/common/main/en_FM.xml
+++ b/make/data/cldr/common/main/en_FM.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/en_FR.xml b/make/data/cldr/common/main/en_FR.xml
new file mode 100644
index 00000000000..bcc83860baa
--- /dev/null
+++ b/make/data/cldr/common/main/en_FR.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
+<!-- Copyright © 1991-2025 Unicode, Inc.
+For terms of use, see http://www.unicode.org/copyright.html
+SPDX-License-Identifier: Unicode-3.0
+CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
+-->
+<ldml>
+	<identity>
+		<version number="$Revision$"/>
+		<language type="en"/>
+		<territory type="FR"/>
+	</identity>
+	<numbers>
+		<symbols numberSystem="latn">
+			<decimal>,</decimal>
+			<group> </group>
+		</symbols>
+	</numbers>
+</ldml>
diff --git a/make/data/cldr/common/main/en_GB.xml b/make/data/cldr/common/main/en_GB.xml
index 8469b5eccbd..2954f553cf4 100644
--- a/make/data/cldr/common/main/en_GB.xml
+++ b/make/data/cldr/common/main/en_GB.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/en_GD.xml b/make/data/cldr/common/main/en_GD.xml
index ab54007ecca..f2976ff5b1b 100644
--- a/make/data/cldr/common/main/en_GD.xml
+++ b/make/data/cldr/common/main/en_GD.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/en_GG.xml b/make/data/cldr/common/main/en_GG.xml
index f5f305f14d7..1d3221f062f 100644
--- a/make/data/cldr/common/main/en_GG.xml
+++ b/make/data/cldr/common/main/en_GG.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/en_GH.xml b/make/data/cldr/common/main/en_GH.xml
index 360a5852f96..d49e1926386 100644
--- a/make/data/cldr/common/main/en_GH.xml
+++ b/make/data/cldr/common/main/en_GH.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/en_GI.xml b/make/data/cldr/common/main/en_GI.xml
index 86ebcd6d140..8d060873194 100644
--- a/make/data/cldr/common/main/en_GI.xml
+++ b/make/data/cldr/common/main/en_GI.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/en_GM.xml b/make/data/cldr/common/main/en_GM.xml
index e56a540ba5b..feccaa3a2ce 100644
--- a/make/data/cldr/common/main/en_GM.xml
+++ b/make/data/cldr/common/main/en_GM.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/en_GS.xml b/make/data/cldr/common/main/en_GS.xml
new file mode 100644
index 00000000000..6d286ade323
--- /dev/null
+++ b/make/data/cldr/common/main/en_GS.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
+<!-- Copyright © 1991-2025 Unicode, Inc.
+For terms of use, see http://www.unicode.org/copyright.html
+SPDX-License-Identifier: Unicode-3.0
+CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
+-->
+<ldml>
+	<identity>
+		<version number="$Revision$"/>
+		<language type="en"/>
+		<territory type="GS"/>
+	</identity>
+	<dates>
+		<calendars>
+			<calendar type="gregorian">
+				<timeFormats>
+					<timeFormatLength type="full">
+						<timeFormat>
+							<pattern>HH:mm:ss zzzz</pattern>
+							<datetimeSkeleton>HHmmsszzzz</datetimeSkeleton>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="long">
+						<timeFormat>
+							<pattern>HH:mm:ss z</pattern>
+							<datetimeSkeleton>HHmmssz</datetimeSkeleton>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="medium">
+						<timeFormat>
+							<pattern>HH:mm:ss</pattern>
+							<datetimeSkeleton>HHmmss</datetimeSkeleton>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="short">
+						<timeFormat>
+							<pattern>HH:mm</pattern>
+							<datetimeSkeleton>HHmm</datetimeSkeleton>
+						</timeFormat>
+					</timeFormatLength>
+				</timeFormats>
+			</calendar>
+		</calendars>
+	</dates>
+</ldml>
diff --git a/make/data/cldr/common/main/en_GU.xml b/make/data/cldr/common/main/en_GU.xml
index 2da80b51ca7..d4d325ef67c 100644
--- a/make/data/cldr/common/main/en_GU.xml
+++ b/make/data/cldr/common/main/en_GU.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/en_GY.xml b/make/data/cldr/common/main/en_GY.xml
index 01cae4613e8..db7afdcb328 100644
--- a/make/data/cldr/common/main/en_GY.xml
+++ b/make/data/cldr/common/main/en_GY.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/en_HK.xml b/make/data/cldr/common/main/en_HK.xml
index 55efa60afe4..e400b89f98b 100644
--- a/make/data/cldr/common/main/en_HK.xml
+++ b/make/data/cldr/common/main/en_HK.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/en_HU.xml b/make/data/cldr/common/main/en_HU.xml
new file mode 100644
index 00000000000..08a6b18e212
--- /dev/null
+++ b/make/data/cldr/common/main/en_HU.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
+<!-- Copyright © 1991-2025 Unicode, Inc.
+For terms of use, see http://www.unicode.org/copyright.html
+SPDX-License-Identifier: Unicode-3.0
+CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
+-->
+<ldml>
+	<identity>
+		<version number="$Revision$"/>
+		<language type="en"/>
+		<territory type="HU"/>
+	</identity>
+	<numbers>
+		<symbols numberSystem="latn">
+			<decimal>,</decimal>
+			<group> </group>
+		</symbols>
+	</numbers>
+</ldml>
diff --git a/make/data/cldr/common/main/en_ID.xml b/make/data/cldr/common/main/en_ID.xml
index d8967d4d32e..48f8dff2932 100644
--- a/make/data/cldr/common/main/en_ID.xml
+++ b/make/data/cldr/common/main/en_ID.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/en_IE.xml b/make/data/cldr/common/main/en_IE.xml
index 4d0cb66f64f..359ebb9de49 100644
--- a/make/data/cldr/common/main/en_IE.xml
+++ b/make/data/cldr/common/main/en_IE.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/en_IL.xml b/make/data/cldr/common/main/en_IL.xml
index 64e6712abf6..58b92b9c829 100644
--- a/make/data/cldr/common/main/en_IL.xml
+++ b/make/data/cldr/common/main/en_IL.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/en_IM.xml b/make/data/cldr/common/main/en_IM.xml
index e0cebdc97d7..0d3c0687dd4 100644
--- a/make/data/cldr/common/main/en_IM.xml
+++ b/make/data/cldr/common/main/en_IM.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/en_IN.xml b/make/data/cldr/common/main/en_IN.xml
index 68543b3ca1c..d40501175db 100644
--- a/make/data/cldr/common/main/en_IN.xml
+++ b/make/data/cldr/common/main/en_IN.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/en_IO.xml b/make/data/cldr/common/main/en_IO.xml
index 92a48e14017..19d74d95597 100644
--- a/make/data/cldr/common/main/en_IO.xml
+++ b/make/data/cldr/common/main/en_IO.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/en_IT.xml b/make/data/cldr/common/main/en_IT.xml
new file mode 100644
index 00000000000..12793fd37f8
--- /dev/null
+++ b/make/data/cldr/common/main/en_IT.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
+<!-- Copyright © 1991-2025 Unicode, Inc.
+For terms of use, see http://www.unicode.org/copyright.html
+SPDX-License-Identifier: Unicode-3.0
+CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
+-->
+<ldml>
+	<identity>
+		<version number="$Revision$"/>
+		<language type="en"/>
+		<territory type="IT"/>
+	</identity>
+	<numbers>
+		<symbols numberSystem="latn">
+			<decimal>,</decimal>
+			<group>.</group>
+		</symbols>
+	</numbers>
+</ldml>
diff --git a/make/data/cldr/common/main/en_JE.xml b/make/data/cldr/common/main/en_JE.xml
index bb034325375..90189dfc452 100644
--- a/make/data/cldr/common/main/en_JE.xml
+++ b/make/data/cldr/common/main/en_JE.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/en_JM.xml b/make/data/cldr/common/main/en_JM.xml
index 95d0f7ff446..e740a2c044f 100644
--- a/make/data/cldr/common/main/en_JM.xml
+++ b/make/data/cldr/common/main/en_JM.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/en_KE.xml b/make/data/cldr/common/main/en_KE.xml
index 1bf5307c0fa..0956a6fa390 100644
--- a/make/data/cldr/common/main/en_KE.xml
+++ b/make/data/cldr/common/main/en_KE.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/en_KI.xml b/make/data/cldr/common/main/en_KI.xml
index d0e791a7af9..502356b8945 100644
--- a/make/data/cldr/common/main/en_KI.xml
+++ b/make/data/cldr/common/main/en_KI.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/en_KN.xml b/make/data/cldr/common/main/en_KN.xml
index e42abe1b6ca..a1805b589ba 100644
--- a/make/data/cldr/common/main/en_KN.xml
+++ b/make/data/cldr/common/main/en_KN.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/en_KY.xml b/make/data/cldr/common/main/en_KY.xml
index 578853384ad..8f59343ef43 100644
--- a/make/data/cldr/common/main/en_KY.xml
+++ b/make/data/cldr/common/main/en_KY.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/en_LC.xml b/make/data/cldr/common/main/en_LC.xml
index e1f26e6c5f8..79dbbf7b337 100644
--- a/make/data/cldr/common/main/en_LC.xml
+++ b/make/data/cldr/common/main/en_LC.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/en_LR.xml b/make/data/cldr/common/main/en_LR.xml
index eb4bd35354e..fa470ac0ccf 100644
--- a/make/data/cldr/common/main/en_LR.xml
+++ b/make/data/cldr/common/main/en_LR.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/en_LS.xml b/make/data/cldr/common/main/en_LS.xml
index 1eae8537fa8..8d8a657503c 100644
--- a/make/data/cldr/common/main/en_LS.xml
+++ b/make/data/cldr/common/main/en_LS.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/en_MG.xml b/make/data/cldr/common/main/en_MG.xml
index 64b115b5eee..5ca9f1fa6c7 100644
--- a/make/data/cldr/common/main/en_MG.xml
+++ b/make/data/cldr/common/main/en_MG.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/en_MH.xml b/make/data/cldr/common/main/en_MH.xml
index 6796e9192e0..7f42c1cf96c 100644
--- a/make/data/cldr/common/main/en_MH.xml
+++ b/make/data/cldr/common/main/en_MH.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/en_MO.xml b/make/data/cldr/common/main/en_MO.xml
index d8d7f8b4c9a..06cf34440d6 100644
--- a/make/data/cldr/common/main/en_MO.xml
+++ b/make/data/cldr/common/main/en_MO.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/en_MP.xml b/make/data/cldr/common/main/en_MP.xml
index 7dc20583a0c..43d42252bdd 100644
--- a/make/data/cldr/common/main/en_MP.xml
+++ b/make/data/cldr/common/main/en_MP.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/en_MS.xml b/make/data/cldr/common/main/en_MS.xml
index 8b050edc400..ac508d70912 100644
--- a/make/data/cldr/common/main/en_MS.xml
+++ b/make/data/cldr/common/main/en_MS.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/en_MT.xml b/make/data/cldr/common/main/en_MT.xml
index c5a59d467ee..dc576e3239f 100644
--- a/make/data/cldr/common/main/en_MT.xml
+++ b/make/data/cldr/common/main/en_MT.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/en_MU.xml b/make/data/cldr/common/main/en_MU.xml
index 415c9633f85..07f2a659a99 100644
--- a/make/data/cldr/common/main/en_MU.xml
+++ b/make/data/cldr/common/main/en_MU.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/en_MV.xml b/make/data/cldr/common/main/en_MV.xml
index ef0f012484e..d6ebe136b06 100644
--- a/make/data/cldr/common/main/en_MV.xml
+++ b/make/data/cldr/common/main/en_MV.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/en_MW.xml b/make/data/cldr/common/main/en_MW.xml
index a082ea1e795..49ccd8ada5d 100644
--- a/make/data/cldr/common/main/en_MW.xml
+++ b/make/data/cldr/common/main/en_MW.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/en_MY.xml b/make/data/cldr/common/main/en_MY.xml
index b781aba1310..5e76d602d2c 100644
--- a/make/data/cldr/common/main/en_MY.xml
+++ b/make/data/cldr/common/main/en_MY.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/en_NA.xml b/make/data/cldr/common/main/en_NA.xml
index a805dda6fe4..7041c039622 100644
--- a/make/data/cldr/common/main/en_NA.xml
+++ b/make/data/cldr/common/main/en_NA.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/en_NF.xml b/make/data/cldr/common/main/en_NF.xml
index f0abbefd4a5..ec20f817dfb 100644
--- a/make/data/cldr/common/main/en_NF.xml
+++ b/make/data/cldr/common/main/en_NF.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/en_NG.xml b/make/data/cldr/common/main/en_NG.xml
index cfee35b5967..08477868ff5 100644
--- a/make/data/cldr/common/main/en_NG.xml
+++ b/make/data/cldr/common/main/en_NG.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/en_NL.xml b/make/data/cldr/common/main/en_NL.xml
index ad11fd2356e..7db1396ef36 100644
--- a/make/data/cldr/common/main/en_NL.xml
+++ b/make/data/cldr/common/main/en_NL.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/en_NO.xml b/make/data/cldr/common/main/en_NO.xml
new file mode 100644
index 00000000000..1331989aa5d
--- /dev/null
+++ b/make/data/cldr/common/main/en_NO.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
+<!-- Copyright © 1991-2025 Unicode, Inc.
+For terms of use, see http://www.unicode.org/copyright.html
+SPDX-License-Identifier: Unicode-3.0
+CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
+-->
+<ldml>
+	<identity>
+		<version number="$Revision$"/>
+		<language type="en"/>
+		<territory type="NO"/>
+	</identity>
+	<characters>
+		<exemplarCharacters type="numbers">[  \- ‑ , % ‰ + 0 1 2 3 4 5 6 7 8 9]</exemplarCharacters>
+	</characters>
+	<numbers>
+		<symbols numberSystem="latn">
+			<decimal>,</decimal>
+			<group> </group>
+		</symbols>
+		<percentFormats numberSystem="latn">
+			<percentFormatLength>
+				<percentFormat>
+					<pattern>#,##0 %</pattern>
+				</percentFormat>
+			</percentFormatLength>
+		</percentFormats>
+		<currencies>
+			<currency type="NOK">
+				<symbol>kr</symbol>
+			</currency>
+		</currencies>
+	</numbers>
+</ldml>
diff --git a/make/data/cldr/common/main/en_NR.xml b/make/data/cldr/common/main/en_NR.xml
index 461a309c8e6..63b142124c3 100644
--- a/make/data/cldr/common/main/en_NR.xml
+++ b/make/data/cldr/common/main/en_NR.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/en_NU.xml b/make/data/cldr/common/main/en_NU.xml
index e1f57eb64b7..57d70413246 100644
--- a/make/data/cldr/common/main/en_NU.xml
+++ b/make/data/cldr/common/main/en_NU.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/en_NZ.xml b/make/data/cldr/common/main/en_NZ.xml
index 9fd2ea95156..2e2686ba79f 100644
--- a/make/data/cldr/common/main/en_NZ.xml
+++ b/make/data/cldr/common/main/en_NZ.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/en_PG.xml b/make/data/cldr/common/main/en_PG.xml
index 0f630a113de..ae283082f86 100644
--- a/make/data/cldr/common/main/en_PG.xml
+++ b/make/data/cldr/common/main/en_PG.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/en_PH.xml b/make/data/cldr/common/main/en_PH.xml
index 5c556175331..5ca3049519a 100644
--- a/make/data/cldr/common/main/en_PH.xml
+++ b/make/data/cldr/common/main/en_PH.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/en_PK.xml b/make/data/cldr/common/main/en_PK.xml
index 3707a36e215..e32d60c36bc 100644
--- a/make/data/cldr/common/main/en_PK.xml
+++ b/make/data/cldr/common/main/en_PK.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/en_PL.xml b/make/data/cldr/common/main/en_PL.xml
new file mode 100644
index 00000000000..f450a26f0fd
--- /dev/null
+++ b/make/data/cldr/common/main/en_PL.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
+<!-- Copyright © 1991-2025 Unicode, Inc.
+For terms of use, see http://www.unicode.org/copyright.html
+SPDX-License-Identifier: Unicode-3.0
+CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
+-->
+<ldml>
+	<identity>
+		<version number="$Revision$"/>
+		<language type="en"/>
+		<territory type="PL"/>
+	</identity>
+	<numbers>
+		<symbols numberSystem="latn">
+			<decimal>,</decimal>
+			<group>.</group>
+		</symbols>
+		<currencyFormats numberSystem="latn">
+			<currencyFormatLength>
+				<currencyFormat type="accounting">
+					<pattern>#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+	</numbers>
+</ldml>
diff --git a/make/data/cldr/common/main/en_PN.xml b/make/data/cldr/common/main/en_PN.xml
index 41dfaf5a2bc..ce49f3fb1a1 100644
--- a/make/data/cldr/common/main/en_PN.xml
+++ b/make/data/cldr/common/main/en_PN.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/en_PR.xml b/make/data/cldr/common/main/en_PR.xml
index c2a0b54bac2..56312a6ad7a 100644
--- a/make/data/cldr/common/main/en_PR.xml
+++ b/make/data/cldr/common/main/en_PR.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/en_PT.xml b/make/data/cldr/common/main/en_PT.xml
new file mode 100644
index 00000000000..83f5062f161
--- /dev/null
+++ b/make/data/cldr/common/main/en_PT.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
+<!-- Copyright © 1991-2025 Unicode, Inc.
+For terms of use, see http://www.unicode.org/copyright.html
+SPDX-License-Identifier: Unicode-3.0
+CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
+-->
+<ldml>
+	<identity>
+		<version number="$Revision$"/>
+		<language type="en"/>
+		<territory type="PT"/>
+	</identity>
+	<numbers>
+		<symbols numberSystem="latn">
+			<decimal>,</decimal>
+			<group> </group>
+		</symbols>
+		<currencyFormats numberSystem="latn">
+			<currencyFormatLength>
+				<currencyFormat type="accounting">
+					<pattern>#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+	</numbers>
+</ldml>
diff --git a/make/data/cldr/common/main/en_PW.xml b/make/data/cldr/common/main/en_PW.xml
index 9dc9d40e06c..8252ebc2c7e 100644
--- a/make/data/cldr/common/main/en_PW.xml
+++ b/make/data/cldr/common/main/en_PW.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/en_RO.xml b/make/data/cldr/common/main/en_RO.xml
new file mode 100644
index 00000000000..26063dc6e4c
--- /dev/null
+++ b/make/data/cldr/common/main/en_RO.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
+<!-- Copyright © 1991-2025 Unicode, Inc.
+For terms of use, see http://www.unicode.org/copyright.html
+SPDX-License-Identifier: Unicode-3.0
+CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
+-->
+<ldml>
+	<identity>
+		<version number="$Revision$"/>
+		<language type="en"/>
+		<territory type="RO"/>
+	</identity>
+	<numbers>
+		<symbols numberSystem="latn">
+			<decimal>,</decimal>
+			<group>.</group>
+		</symbols>
+		<currencyFormats numberSystem="latn">
+			<currencyFormatLength>
+				<currencyFormat type="accounting">
+					<pattern>#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+	</numbers>
+</ldml>
diff --git a/make/data/cldr/common/main/en_RW.xml b/make/data/cldr/common/main/en_RW.xml
index 16cec039043..2ebe3630383 100644
--- a/make/data/cldr/common/main/en_RW.xml
+++ b/make/data/cldr/common/main/en_RW.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/en_SB.xml b/make/data/cldr/common/main/en_SB.xml
index f7d8a49d231..31552e640e4 100644
--- a/make/data/cldr/common/main/en_SB.xml
+++ b/make/data/cldr/common/main/en_SB.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/en_SC.xml b/make/data/cldr/common/main/en_SC.xml
index 80db50ef2ca..e502a29058c 100644
--- a/make/data/cldr/common/main/en_SC.xml
+++ b/make/data/cldr/common/main/en_SC.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/en_SD.xml b/make/data/cldr/common/main/en_SD.xml
index 9e937732564..b9132a568e2 100644
--- a/make/data/cldr/common/main/en_SD.xml
+++ b/make/data/cldr/common/main/en_SD.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/en_SE.xml b/make/data/cldr/common/main/en_SE.xml
index 2864cd90b2b..eda926e4137 100644
--- a/make/data/cldr/common/main/en_SE.xml
+++ b/make/data/cldr/common/main/en_SE.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/en_SG.xml b/make/data/cldr/common/main/en_SG.xml
index 970adc78ac2..8265a84f38d 100644
--- a/make/data/cldr/common/main/en_SG.xml
+++ b/make/data/cldr/common/main/en_SG.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/en_SH.xml b/make/data/cldr/common/main/en_SH.xml
index 70acafc3aaf..8f3d387a66a 100644
--- a/make/data/cldr/common/main/en_SH.xml
+++ b/make/data/cldr/common/main/en_SH.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/en_SI.xml b/make/data/cldr/common/main/en_SI.xml
index 3a1d997b448..fa881408603 100644
--- a/make/data/cldr/common/main/en_SI.xml
+++ b/make/data/cldr/common/main/en_SI.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/en_SK.xml b/make/data/cldr/common/main/en_SK.xml
new file mode 100644
index 00000000000..424e5132db9
--- /dev/null
+++ b/make/data/cldr/common/main/en_SK.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
+<!-- Copyright © 1991-2025 Unicode, Inc.
+For terms of use, see http://www.unicode.org/copyright.html
+SPDX-License-Identifier: Unicode-3.0
+CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
+-->
+<ldml>
+	<identity>
+		<version number="$Revision$"/>
+		<language type="en"/>
+		<territory type="SK"/>
+	</identity>
+	<numbers>
+		<symbols numberSystem="latn">
+			<decimal>,</decimal>
+			<group> </group>
+			<exponential>e</exponential>
+		</symbols>
+		<currencyFormats numberSystem="latn">
+			<currencyFormatLength>
+				<currencyFormat type="accounting">
+					<pattern>#,##0.00 ¤;(#,##0.00 ¤)</pattern>
+				</currencyFormat>
+			</currencyFormatLength>
+		</currencyFormats>
+	</numbers>
+</ldml>
diff --git a/make/data/cldr/common/main/en_SL.xml b/make/data/cldr/common/main/en_SL.xml
index f4a944bcf93..96b3da01929 100644
--- a/make/data/cldr/common/main/en_SL.xml
+++ b/make/data/cldr/common/main/en_SL.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/en_SS.xml b/make/data/cldr/common/main/en_SS.xml
index c45a113af4b..14065dd9bd1 100644
--- a/make/data/cldr/common/main/en_SS.xml
+++ b/make/data/cldr/common/main/en_SS.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/en_SX.xml b/make/data/cldr/common/main/en_SX.xml
index c73851eb280..4b2165dbcce 100644
--- a/make/data/cldr/common/main/en_SX.xml
+++ b/make/data/cldr/common/main/en_SX.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/en_SZ.xml b/make/data/cldr/common/main/en_SZ.xml
index 085aa49bd18..f7c580a995d 100644
--- a/make/data/cldr/common/main/en_SZ.xml
+++ b/make/data/cldr/common/main/en_SZ.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/en_Shaw.xml b/make/data/cldr/common/main/en_Shaw.xml
index 39f2e23af19..937d9e50698 100644
--- a/make/data/cldr/common/main/en_Shaw.xml
+++ b/make/data/cldr/common/main/en_Shaw.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/en_Shaw_GB.xml b/make/data/cldr/common/main/en_Shaw_GB.xml
index 2766c6c6ce2..3088b566194 100644
--- a/make/data/cldr/common/main/en_Shaw_GB.xml
+++ b/make/data/cldr/common/main/en_Shaw_GB.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/en_TC.xml b/make/data/cldr/common/main/en_TC.xml
index 716b6c0dfa5..d4bca762389 100644
--- a/make/data/cldr/common/main/en_TC.xml
+++ b/make/data/cldr/common/main/en_TC.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/en_TK.xml b/make/data/cldr/common/main/en_TK.xml
index 2b4933cd43d..a914ed7de3b 100644
--- a/make/data/cldr/common/main/en_TK.xml
+++ b/make/data/cldr/common/main/en_TK.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/en_TO.xml b/make/data/cldr/common/main/en_TO.xml
index 3471fd370bc..aa06ab65936 100644
--- a/make/data/cldr/common/main/en_TO.xml
+++ b/make/data/cldr/common/main/en_TO.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/en_TT.xml b/make/data/cldr/common/main/en_TT.xml
index f2cdc18acf0..79e5d262f00 100644
--- a/make/data/cldr/common/main/en_TT.xml
+++ b/make/data/cldr/common/main/en_TT.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/en_TV.xml b/make/data/cldr/common/main/en_TV.xml
index 477b1b1edf8..aa60bb5b2ab 100644
--- a/make/data/cldr/common/main/en_TV.xml
+++ b/make/data/cldr/common/main/en_TV.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/en_TZ.xml b/make/data/cldr/common/main/en_TZ.xml
index 1fb9d69f076..09ae6edec65 100644
--- a/make/data/cldr/common/main/en_TZ.xml
+++ b/make/data/cldr/common/main/en_TZ.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/en_UG.xml b/make/data/cldr/common/main/en_UG.xml
index ffa4e478f08..435309e56e8 100644
--- a/make/data/cldr/common/main/en_UG.xml
+++ b/make/data/cldr/common/main/en_UG.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/en_UM.xml b/make/data/cldr/common/main/en_UM.xml
index 90e040619f9..3d6d68d7790 100644
--- a/make/data/cldr/common/main/en_UM.xml
+++ b/make/data/cldr/common/main/en_UM.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/en_US.xml b/make/data/cldr/common/main/en_US.xml
index 1098f0a192b..803f60ad00e 100644
--- a/make/data/cldr/common/main/en_US.xml
+++ b/make/data/cldr/common/main/en_US.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/en_US_POSIX.xml b/make/data/cldr/common/main/en_US_POSIX.xml
index 5a7864a4513..ce9b24ed41b 100644
--- a/make/data/cldr/common/main/en_US_POSIX.xml
+++ b/make/data/cldr/common/main/en_US_POSIX.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/en_VC.xml b/make/data/cldr/common/main/en_VC.xml
index 5ced8633069..163465f6032 100644
--- a/make/data/cldr/common/main/en_VC.xml
+++ b/make/data/cldr/common/main/en_VC.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/en_VG.xml b/make/data/cldr/common/main/en_VG.xml
index bff76dad8b9..7198f934772 100644
--- a/make/data/cldr/common/main/en_VG.xml
+++ b/make/data/cldr/common/main/en_VG.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/en_VI.xml b/make/data/cldr/common/main/en_VI.xml
index 2d5800e3980..f183a2bc323 100644
--- a/make/data/cldr/common/main/en_VI.xml
+++ b/make/data/cldr/common/main/en_VI.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/en_VU.xml b/make/data/cldr/common/main/en_VU.xml
index 8d072e673b2..7f78f1639d7 100644
--- a/make/data/cldr/common/main/en_VU.xml
+++ b/make/data/cldr/common/main/en_VU.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/en_WS.xml b/make/data/cldr/common/main/en_WS.xml
index c0881e59da8..8a52b13aa64 100644
--- a/make/data/cldr/common/main/en_WS.xml
+++ b/make/data/cldr/common/main/en_WS.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/en_ZA.xml b/make/data/cldr/common/main/en_ZA.xml
index 77d04450056..c103a3ff8a8 100644
--- a/make/data/cldr/common/main/en_ZA.xml
+++ b/make/data/cldr/common/main/en_ZA.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/en_ZM.xml b/make/data/cldr/common/main/en_ZM.xml
index 31d055396d6..d5349f6db12 100644
--- a/make/data/cldr/common/main/en_ZM.xml
+++ b/make/data/cldr/common/main/en_ZM.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/en_ZW.xml b/make/data/cldr/common/main/en_ZW.xml
index 415f5896a78..c0f68ea9c48 100644
--- a/make/data/cldr/common/main/en_ZW.xml
+++ b/make/data/cldr/common/main/en_ZW.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/eo.xml b/make/data/cldr/common/main/eo.xml
index 977ff2dc091..e774c2af1ab 100644
--- a/make/data/cldr/common/main/eo.xml
+++ b/make/data/cldr/common/main/eo.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/eo_001.xml b/make/data/cldr/common/main/eo_001.xml
index 3092db7a06a..c79262597c2 100644
--- a/make/data/cldr/common/main/eo_001.xml
+++ b/make/data/cldr/common/main/eo_001.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/es.xml b/make/data/cldr/common/main/es.xml
index daabcb5e02f..3ef6d339a66 100644
--- a/make/data/cldr/common/main/es.xml
+++ b/make/data/cldr/common/main/es.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -4234,6 +4234,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<currencyFormatLength>
 				<currencyFormat type="standard">
 					<pattern>#,##0.00 ¤</pattern>
+					<pattern alt="noCurrency" draft="provisional">#,##0.00</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 			<currencyFormatLength type="short">
diff --git a/make/data/cldr/common/main/es_419.xml b/make/data/cldr/common/main/es_419.xml
index 2658c449001..1c73bc6db40 100644
--- a/make/data/cldr/common/main/es_419.xml
+++ b/make/data/cldr/common/main/es_419.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/es_AR.xml b/make/data/cldr/common/main/es_AR.xml
index f663283b309..03b6e24afba 100644
--- a/make/data/cldr/common/main/es_AR.xml
+++ b/make/data/cldr/common/main/es_AR.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/es_BO.xml b/make/data/cldr/common/main/es_BO.xml
index 9fc7e639462..645549fbcf5 100644
--- a/make/data/cldr/common/main/es_BO.xml
+++ b/make/data/cldr/common/main/es_BO.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/es_BR.xml b/make/data/cldr/common/main/es_BR.xml
index c98cd1291a4..779160b4ec2 100644
--- a/make/data/cldr/common/main/es_BR.xml
+++ b/make/data/cldr/common/main/es_BR.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/es_BZ.xml b/make/data/cldr/common/main/es_BZ.xml
index 33864498795..75f5fc0fd85 100644
--- a/make/data/cldr/common/main/es_BZ.xml
+++ b/make/data/cldr/common/main/es_BZ.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/es_CL.xml b/make/data/cldr/common/main/es_CL.xml
index 2dff2101d76..f5c2f863db9 100644
--- a/make/data/cldr/common/main/es_CL.xml
+++ b/make/data/cldr/common/main/es_CL.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/es_CO.xml b/make/data/cldr/common/main/es_CO.xml
index 9032b0a216d..2919b0a070f 100644
--- a/make/data/cldr/common/main/es_CO.xml
+++ b/make/data/cldr/common/main/es_CO.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/es_CR.xml b/make/data/cldr/common/main/es_CR.xml
index 4a1b28a281d..693ace12f91 100644
--- a/make/data/cldr/common/main/es_CR.xml
+++ b/make/data/cldr/common/main/es_CR.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/es_CU.xml b/make/data/cldr/common/main/es_CU.xml
index 13f190f8d8b..e42ae2d2583 100644
--- a/make/data/cldr/common/main/es_CU.xml
+++ b/make/data/cldr/common/main/es_CU.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/es_DO.xml b/make/data/cldr/common/main/es_DO.xml
index a74138af8ce..99a314f62e4 100644
--- a/make/data/cldr/common/main/es_DO.xml
+++ b/make/data/cldr/common/main/es_DO.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/es_EA.xml b/make/data/cldr/common/main/es_EA.xml
index 1de5b4a13c4..46d286d8197 100644
--- a/make/data/cldr/common/main/es_EA.xml
+++ b/make/data/cldr/common/main/es_EA.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/es_EC.xml b/make/data/cldr/common/main/es_EC.xml
index 41dfc1f792d..a813242deaa 100644
--- a/make/data/cldr/common/main/es_EC.xml
+++ b/make/data/cldr/common/main/es_EC.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/es_ES.xml b/make/data/cldr/common/main/es_ES.xml
index 0df424e4a51..0c9e4fb8f77 100644
--- a/make/data/cldr/common/main/es_ES.xml
+++ b/make/data/cldr/common/main/es_ES.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/es_GQ.xml b/make/data/cldr/common/main/es_GQ.xml
index 15c1dfd26ce..556267534f4 100644
--- a/make/data/cldr/common/main/es_GQ.xml
+++ b/make/data/cldr/common/main/es_GQ.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/es_GT.xml b/make/data/cldr/common/main/es_GT.xml
index 4c61912faab..9137c3bd3d5 100644
--- a/make/data/cldr/common/main/es_GT.xml
+++ b/make/data/cldr/common/main/es_GT.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/es_HN.xml b/make/data/cldr/common/main/es_HN.xml
index 91097a8307f..9be7f572ca7 100644
--- a/make/data/cldr/common/main/es_HN.xml
+++ b/make/data/cldr/common/main/es_HN.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/es_IC.xml b/make/data/cldr/common/main/es_IC.xml
index 2f9d5b339e0..519e4c3cf34 100644
--- a/make/data/cldr/common/main/es_IC.xml
+++ b/make/data/cldr/common/main/es_IC.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/es_MX.xml b/make/data/cldr/common/main/es_MX.xml
index cad6322043a..be625c9581e 100644
--- a/make/data/cldr/common/main/es_MX.xml
+++ b/make/data/cldr/common/main/es_MX.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/es_NI.xml b/make/data/cldr/common/main/es_NI.xml
index 759dba472f5..068c1766308 100644
--- a/make/data/cldr/common/main/es_NI.xml
+++ b/make/data/cldr/common/main/es_NI.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/es_PA.xml b/make/data/cldr/common/main/es_PA.xml
index 710b463d411..76ae5a0e0eb 100644
--- a/make/data/cldr/common/main/es_PA.xml
+++ b/make/data/cldr/common/main/es_PA.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/es_PE.xml b/make/data/cldr/common/main/es_PE.xml
index f10440734c9..aa0c0b9ab24 100644
--- a/make/data/cldr/common/main/es_PE.xml
+++ b/make/data/cldr/common/main/es_PE.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/es_PH.xml b/make/data/cldr/common/main/es_PH.xml
index 5ad142f2182..63b36da9443 100644
--- a/make/data/cldr/common/main/es_PH.xml
+++ b/make/data/cldr/common/main/es_PH.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/es_PR.xml b/make/data/cldr/common/main/es_PR.xml
index 21eec4a4930..16ea7f9459a 100644
--- a/make/data/cldr/common/main/es_PR.xml
+++ b/make/data/cldr/common/main/es_PR.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/es_PY.xml b/make/data/cldr/common/main/es_PY.xml
index 3c7a5802417..33fb2a11578 100644
--- a/make/data/cldr/common/main/es_PY.xml
+++ b/make/data/cldr/common/main/es_PY.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/es_SV.xml b/make/data/cldr/common/main/es_SV.xml
index f1f72ef262a..1f84c30c611 100644
--- a/make/data/cldr/common/main/es_SV.xml
+++ b/make/data/cldr/common/main/es_SV.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/es_US.xml b/make/data/cldr/common/main/es_US.xml
index 0dce40420b5..98d53c4b12d 100644
--- a/make/data/cldr/common/main/es_US.xml
+++ b/make/data/cldr/common/main/es_US.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/es_UY.xml b/make/data/cldr/common/main/es_UY.xml
index 9413f6ad750..75541c40b19 100644
--- a/make/data/cldr/common/main/es_UY.xml
+++ b/make/data/cldr/common/main/es_UY.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/es_VE.xml b/make/data/cldr/common/main/es_VE.xml
index 67457a37647..ef44a1f55d9 100644
--- a/make/data/cldr/common/main/es_VE.xml
+++ b/make/data/cldr/common/main/es_VE.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/et.xml b/make/data/cldr/common/main/et.xml
index d2727a59721..714746ef2db 100644
--- a/make/data/cldr/common/main/et.xml
+++ b/make/data/cldr/common/main/et.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/et_EE.xml b/make/data/cldr/common/main/et_EE.xml
index 3c364e59359..bb97ad4a891 100644
--- a/make/data/cldr/common/main/et_EE.xml
+++ b/make/data/cldr/common/main/et_EE.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/eu.xml b/make/data/cldr/common/main/eu.xml
index 27c31f61321..e44c764a817 100644
--- a/make/data/cldr/common/main/eu.xml
+++ b/make/data/cldr/common/main/eu.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/eu_ES.xml b/make/data/cldr/common/main/eu_ES.xml
index 3b4cea6aec2..93b73ed422d 100644
--- a/make/data/cldr/common/main/eu_ES.xml
+++ b/make/data/cldr/common/main/eu_ES.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/ewo.xml b/make/data/cldr/common/main/ewo.xml
index b0aa0bd21bb..1d3f17dc49e 100644
--- a/make/data/cldr/common/main/ewo.xml
+++ b/make/data/cldr/common/main/ewo.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/ewo_CM.xml b/make/data/cldr/common/main/ewo_CM.xml
index c1ca412bec0..19ca07da663 100644
--- a/make/data/cldr/common/main/ewo_CM.xml
+++ b/make/data/cldr/common/main/ewo_CM.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/fa.xml b/make/data/cldr/common/main/fa.xml
index b24c0f85743..9fda3578343 100644
--- a/make/data/cldr/common/main/fa.xml
+++ b/make/data/cldr/common/main/fa.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -4998,6 +4998,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<currencyFormatLength>
 				<currencyFormat type="standard">
 					<pattern>‎¤#,##0.00</pattern>
+					<pattern alt="noCurrency" draft="provisional">‎#,##0.00</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 		</currencyFormats>
@@ -5005,6 +5006,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<currencyFormatLength>
 				<currencyFormat type="standard">
 					<pattern>‎¤#,##0.00</pattern>
+					<pattern alt="noCurrency" draft="provisional">‎#,##0.00</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 		</currencyFormats>
@@ -5012,6 +5014,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<currencyFormatLength>
 				<currencyFormat type="standard">
 					<pattern>‎¤ #,##0.00</pattern>
+					<pattern alt="noCurrency" draft="provisional">‎#,##0.00</pattern>
 				</currencyFormat>
 				<currencyFormat type="accounting">
 					<pattern>‎¤ #,##0.00;‎(¤ #,##0.00)</pattern>
diff --git a/make/data/cldr/common/main/fa_AF.xml b/make/data/cldr/common/main/fa_AF.xml
index e4e54d3a968..9c1de9f280d 100644
--- a/make/data/cldr/common/main/fa_AF.xml
+++ b/make/data/cldr/common/main/fa_AF.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/fa_IR.xml b/make/data/cldr/common/main/fa_IR.xml
index 6bd954fe747..74107844497 100644
--- a/make/data/cldr/common/main/fa_IR.xml
+++ b/make/data/cldr/common/main/fa_IR.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/ff.xml b/make/data/cldr/common/main/ff.xml
index d49da7dd73a..b512e61f302 100644
--- a/make/data/cldr/common/main/ff.xml
+++ b/make/data/cldr/common/main/ff.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/ff_Adlm.xml b/make/data/cldr/common/main/ff_Adlm.xml
index bca130e259d..17ac848f28c 100644
--- a/make/data/cldr/common/main/ff_Adlm.xml
+++ b/make/data/cldr/common/main/ff_Adlm.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/ff_Adlm_BF.xml b/make/data/cldr/common/main/ff_Adlm_BF.xml
index 90be5631993..fe98c9b8a7f 100644
--- a/make/data/cldr/common/main/ff_Adlm_BF.xml
+++ b/make/data/cldr/common/main/ff_Adlm_BF.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/ff_Adlm_CM.xml b/make/data/cldr/common/main/ff_Adlm_CM.xml
index 3761a7efe1d..10c6aee6a5a 100644
--- a/make/data/cldr/common/main/ff_Adlm_CM.xml
+++ b/make/data/cldr/common/main/ff_Adlm_CM.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/ff_Adlm_GH.xml b/make/data/cldr/common/main/ff_Adlm_GH.xml
index c3477d0486e..41dad457247 100644
--- a/make/data/cldr/common/main/ff_Adlm_GH.xml
+++ b/make/data/cldr/common/main/ff_Adlm_GH.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/ff_Adlm_GM.xml b/make/data/cldr/common/main/ff_Adlm_GM.xml
index 35fafdbe790..b0028d020fd 100644
--- a/make/data/cldr/common/main/ff_Adlm_GM.xml
+++ b/make/data/cldr/common/main/ff_Adlm_GM.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/ff_Adlm_GN.xml b/make/data/cldr/common/main/ff_Adlm_GN.xml
index d8c3db1a6ac..22019d0dd96 100644
--- a/make/data/cldr/common/main/ff_Adlm_GN.xml
+++ b/make/data/cldr/common/main/ff_Adlm_GN.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/ff_Adlm_GW.xml b/make/data/cldr/common/main/ff_Adlm_GW.xml
index 17ce40babac..e4918a9beef 100644
--- a/make/data/cldr/common/main/ff_Adlm_GW.xml
+++ b/make/data/cldr/common/main/ff_Adlm_GW.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/ff_Adlm_LR.xml b/make/data/cldr/common/main/ff_Adlm_LR.xml
index b6c231d0808..9ab06869ae9 100644
--- a/make/data/cldr/common/main/ff_Adlm_LR.xml
+++ b/make/data/cldr/common/main/ff_Adlm_LR.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/ff_Adlm_MR.xml b/make/data/cldr/common/main/ff_Adlm_MR.xml
index 0887f910fe8..e22860e24ac 100644
--- a/make/data/cldr/common/main/ff_Adlm_MR.xml
+++ b/make/data/cldr/common/main/ff_Adlm_MR.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/ff_Adlm_NE.xml b/make/data/cldr/common/main/ff_Adlm_NE.xml
index 27ba7a82479..4d6c098901a 100644
--- a/make/data/cldr/common/main/ff_Adlm_NE.xml
+++ b/make/data/cldr/common/main/ff_Adlm_NE.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/ff_Adlm_NG.xml b/make/data/cldr/common/main/ff_Adlm_NG.xml
index 2c41f8227de..6ee36975b18 100644
--- a/make/data/cldr/common/main/ff_Adlm_NG.xml
+++ b/make/data/cldr/common/main/ff_Adlm_NG.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/ff_Adlm_SL.xml b/make/data/cldr/common/main/ff_Adlm_SL.xml
index 9f82db107c5..9368df9b25b 100644
--- a/make/data/cldr/common/main/ff_Adlm_SL.xml
+++ b/make/data/cldr/common/main/ff_Adlm_SL.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/ff_Adlm_SN.xml b/make/data/cldr/common/main/ff_Adlm_SN.xml
index c40e32bd727..cc6e228302c 100644
--- a/make/data/cldr/common/main/ff_Adlm_SN.xml
+++ b/make/data/cldr/common/main/ff_Adlm_SN.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/ff_Latn.xml b/make/data/cldr/common/main/ff_Latn.xml
index 935b75f4483..1e17bcd74ef 100644
--- a/make/data/cldr/common/main/ff_Latn.xml
+++ b/make/data/cldr/common/main/ff_Latn.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/ff_Latn_BF.xml b/make/data/cldr/common/main/ff_Latn_BF.xml
index e7e67942819..eac443835e4 100644
--- a/make/data/cldr/common/main/ff_Latn_BF.xml
+++ b/make/data/cldr/common/main/ff_Latn_BF.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/ff_Latn_CM.xml b/make/data/cldr/common/main/ff_Latn_CM.xml
index 58cb7f2cbbf..b42b30b221a 100644
--- a/make/data/cldr/common/main/ff_Latn_CM.xml
+++ b/make/data/cldr/common/main/ff_Latn_CM.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/ff_Latn_GH.xml b/make/data/cldr/common/main/ff_Latn_GH.xml
index e41b64f1fd1..4612705e5c0 100644
--- a/make/data/cldr/common/main/ff_Latn_GH.xml
+++ b/make/data/cldr/common/main/ff_Latn_GH.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/ff_Latn_GM.xml b/make/data/cldr/common/main/ff_Latn_GM.xml
index 201a089c5a9..418b42a6fbe 100644
--- a/make/data/cldr/common/main/ff_Latn_GM.xml
+++ b/make/data/cldr/common/main/ff_Latn_GM.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/ff_Latn_GN.xml b/make/data/cldr/common/main/ff_Latn_GN.xml
index d24fcded069..cf39a9284e2 100644
--- a/make/data/cldr/common/main/ff_Latn_GN.xml
+++ b/make/data/cldr/common/main/ff_Latn_GN.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/ff_Latn_GW.xml b/make/data/cldr/common/main/ff_Latn_GW.xml
index 86129370658..f5d3155ea43 100644
--- a/make/data/cldr/common/main/ff_Latn_GW.xml
+++ b/make/data/cldr/common/main/ff_Latn_GW.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/ff_Latn_LR.xml b/make/data/cldr/common/main/ff_Latn_LR.xml
index 54833258e68..1e7051ad737 100644
--- a/make/data/cldr/common/main/ff_Latn_LR.xml
+++ b/make/data/cldr/common/main/ff_Latn_LR.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/ff_Latn_MR.xml b/make/data/cldr/common/main/ff_Latn_MR.xml
index 410874c3384..cae578934d3 100644
--- a/make/data/cldr/common/main/ff_Latn_MR.xml
+++ b/make/data/cldr/common/main/ff_Latn_MR.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/ff_Latn_NE.xml b/make/data/cldr/common/main/ff_Latn_NE.xml
index 36982866935..361a64b8c70 100644
--- a/make/data/cldr/common/main/ff_Latn_NE.xml
+++ b/make/data/cldr/common/main/ff_Latn_NE.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/ff_Latn_NG.xml b/make/data/cldr/common/main/ff_Latn_NG.xml
index 5816f40592c..e81ce8ef00f 100644
--- a/make/data/cldr/common/main/ff_Latn_NG.xml
+++ b/make/data/cldr/common/main/ff_Latn_NG.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/ff_Latn_SL.xml b/make/data/cldr/common/main/ff_Latn_SL.xml
index 0cbb05f7425..800913270b8 100644
--- a/make/data/cldr/common/main/ff_Latn_SL.xml
+++ b/make/data/cldr/common/main/ff_Latn_SL.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/ff_Latn_SN.xml b/make/data/cldr/common/main/ff_Latn_SN.xml
index af236d68ca2..f319297a65c 100644
--- a/make/data/cldr/common/main/ff_Latn_SN.xml
+++ b/make/data/cldr/common/main/ff_Latn_SN.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/fi.xml b/make/data/cldr/common/main/fi.xml
index b67fb765c5f..3d8176baf9e 100644
--- a/make/data/cldr/common/main/fi.xml
+++ b/make/data/cldr/common/main/fi.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -26,7 +26,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<language type="afh">afrihili</language>
 			<language type="agq">aghem</language>
 			<language type="ain">ainu</language>
-			<language type="ajp">urduni</language>
 			<language type="ak">akan</language>
 			<language type="akk">akkadi</language>
 			<language type="akz">alabama</language>
@@ -38,6 +37,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<language type="ang">muinaisenglanti</language>
 			<language type="ann">obolo</language>
 			<language type="anp">angika</language>
+			<language type="apc">urduni</language>
 			<language type="ar">arabia</language>
 			<language type="ar_001">yleisarabia</language>
 			<language type="arc">valtakunnanaramea</language>
@@ -4574,6 +4574,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<currencyFormatLength>
 				<currencyFormat type="standard">
 					<pattern>#,##0.00 ¤</pattern>
+					<pattern alt="noCurrency" draft="provisional">#,##0.00</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 			<currencyFormatLength type="short">
diff --git a/make/data/cldr/common/main/fi_FI.xml b/make/data/cldr/common/main/fi_FI.xml
index 35fdb9512a9..d99b841c1a1 100644
--- a/make/data/cldr/common/main/fi_FI.xml
+++ b/make/data/cldr/common/main/fi_FI.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/fil.xml b/make/data/cldr/common/main/fil.xml
index 7fc5cf09870..ffc6e42ace6 100644
--- a/make/data/cldr/common/main/fil.xml
+++ b/make/data/cldr/common/main/fil.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/fil_PH.xml b/make/data/cldr/common/main/fil_PH.xml
index e9869e5802f..4a5e1da9cd5 100644
--- a/make/data/cldr/common/main/fil_PH.xml
+++ b/make/data/cldr/common/main/fil_PH.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/fo.xml b/make/data/cldr/common/main/fo.xml
index 6fd7a518162..62c754793d9 100644
--- a/make/data/cldr/common/main/fo.xml
+++ b/make/data/cldr/common/main/fo.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/fo_DK.xml b/make/data/cldr/common/main/fo_DK.xml
index 7a060794f54..78215407266 100644
--- a/make/data/cldr/common/main/fo_DK.xml
+++ b/make/data/cldr/common/main/fo_DK.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/fo_FO.xml b/make/data/cldr/common/main/fo_FO.xml
index 0d8f10b4dba..56131e44252 100644
--- a/make/data/cldr/common/main/fo_FO.xml
+++ b/make/data/cldr/common/main/fo_FO.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/fr.xml b/make/data/cldr/common/main/fr.xml
index ee22ad101c9..06ad708b52c 100644
--- a/make/data/cldr/common/main/fr.xml
+++ b/make/data/cldr/common/main/fr.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -4885,6 +4885,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<currencyFormatLength>
 				<currencyFormat type="standard">
 					<pattern>#,##0.00 ¤</pattern>
+					<pattern alt="noCurrency" draft="provisional">#,##0.00</pattern>
 				</currencyFormat>
 				<currencyFormat type="accounting">
 					<pattern>#,##0.00 ¤;(#,##0.00 ¤)</pattern>
diff --git a/make/data/cldr/common/main/fr_BE.xml b/make/data/cldr/common/main/fr_BE.xml
index 01effdbd41b..8daa9eaf65f 100644
--- a/make/data/cldr/common/main/fr_BE.xml
+++ b/make/data/cldr/common/main/fr_BE.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/fr_BF.xml b/make/data/cldr/common/main/fr_BF.xml
index 147d05e30e0..f1f328d4b88 100644
--- a/make/data/cldr/common/main/fr_BF.xml
+++ b/make/data/cldr/common/main/fr_BF.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/fr_BI.xml b/make/data/cldr/common/main/fr_BI.xml
index 621d814c755..b1a6d4f44df 100644
--- a/make/data/cldr/common/main/fr_BI.xml
+++ b/make/data/cldr/common/main/fr_BI.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/fr_BJ.xml b/make/data/cldr/common/main/fr_BJ.xml
index 10ab208c340..b18500440e2 100644
--- a/make/data/cldr/common/main/fr_BJ.xml
+++ b/make/data/cldr/common/main/fr_BJ.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/fr_BL.xml b/make/data/cldr/common/main/fr_BL.xml
index 313cdfa6439..55ccb68ba1a 100644
--- a/make/data/cldr/common/main/fr_BL.xml
+++ b/make/data/cldr/common/main/fr_BL.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/fr_CA.xml b/make/data/cldr/common/main/fr_CA.xml
index 6fbfa4fa262..f873e9d2394 100644
--- a/make/data/cldr/common/main/fr_CA.xml
+++ b/make/data/cldr/common/main/fr_CA.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/fr_CD.xml b/make/data/cldr/common/main/fr_CD.xml
index 2f522cc844f..f10cdc14f81 100644
--- a/make/data/cldr/common/main/fr_CD.xml
+++ b/make/data/cldr/common/main/fr_CD.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/fr_CF.xml b/make/data/cldr/common/main/fr_CF.xml
index 9cb186d2952..df848921b9b 100644
--- a/make/data/cldr/common/main/fr_CF.xml
+++ b/make/data/cldr/common/main/fr_CF.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/fr_CG.xml b/make/data/cldr/common/main/fr_CG.xml
index e1a3b4a716a..6d24ea6c970 100644
--- a/make/data/cldr/common/main/fr_CG.xml
+++ b/make/data/cldr/common/main/fr_CG.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/fr_CH.xml b/make/data/cldr/common/main/fr_CH.xml
index 5a168c97697..f3a71045e7c 100644
--- a/make/data/cldr/common/main/fr_CH.xml
+++ b/make/data/cldr/common/main/fr_CH.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/fr_CI.xml b/make/data/cldr/common/main/fr_CI.xml
index 90208c36bc6..91469e9ea9e 100644
--- a/make/data/cldr/common/main/fr_CI.xml
+++ b/make/data/cldr/common/main/fr_CI.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/fr_CM.xml b/make/data/cldr/common/main/fr_CM.xml
index 6b436ac139c..73f80e69fd2 100644
--- a/make/data/cldr/common/main/fr_CM.xml
+++ b/make/data/cldr/common/main/fr_CM.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/fr_DJ.xml b/make/data/cldr/common/main/fr_DJ.xml
index 1fc0c5046d9..de44abeb79f 100644
--- a/make/data/cldr/common/main/fr_DJ.xml
+++ b/make/data/cldr/common/main/fr_DJ.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/fr_DZ.xml b/make/data/cldr/common/main/fr_DZ.xml
index f807f785bee..5e654faf10c 100644
--- a/make/data/cldr/common/main/fr_DZ.xml
+++ b/make/data/cldr/common/main/fr_DZ.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/fr_FR.xml b/make/data/cldr/common/main/fr_FR.xml
index aa2e0e5c0dd..fe464b814f9 100644
--- a/make/data/cldr/common/main/fr_FR.xml
+++ b/make/data/cldr/common/main/fr_FR.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/fr_GA.xml b/make/data/cldr/common/main/fr_GA.xml
index 71b364d15fa..1511ed3cfd7 100644
--- a/make/data/cldr/common/main/fr_GA.xml
+++ b/make/data/cldr/common/main/fr_GA.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/fr_GF.xml b/make/data/cldr/common/main/fr_GF.xml
index 5ede4983f33..2164d851afe 100644
--- a/make/data/cldr/common/main/fr_GF.xml
+++ b/make/data/cldr/common/main/fr_GF.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/fr_GN.xml b/make/data/cldr/common/main/fr_GN.xml
index 21062f9a659..d0fab982901 100644
--- a/make/data/cldr/common/main/fr_GN.xml
+++ b/make/data/cldr/common/main/fr_GN.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/fr_GP.xml b/make/data/cldr/common/main/fr_GP.xml
index 60d21f8a045..4394bc3d951 100644
--- a/make/data/cldr/common/main/fr_GP.xml
+++ b/make/data/cldr/common/main/fr_GP.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/fr_GQ.xml b/make/data/cldr/common/main/fr_GQ.xml
index bd4a2e57271..30ead6477ec 100644
--- a/make/data/cldr/common/main/fr_GQ.xml
+++ b/make/data/cldr/common/main/fr_GQ.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/fr_HT.xml b/make/data/cldr/common/main/fr_HT.xml
index 67376463b43..7bec4b16f62 100644
--- a/make/data/cldr/common/main/fr_HT.xml
+++ b/make/data/cldr/common/main/fr_HT.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/fr_KM.xml b/make/data/cldr/common/main/fr_KM.xml
index 4f37867f6b8..7a4d6b1bef4 100644
--- a/make/data/cldr/common/main/fr_KM.xml
+++ b/make/data/cldr/common/main/fr_KM.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/fr_LU.xml b/make/data/cldr/common/main/fr_LU.xml
index a4b2da9658b..b01265f9b75 100644
--- a/make/data/cldr/common/main/fr_LU.xml
+++ b/make/data/cldr/common/main/fr_LU.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/fr_MA.xml b/make/data/cldr/common/main/fr_MA.xml
index 9a6291f72f6..38851ec3b56 100644
--- a/make/data/cldr/common/main/fr_MA.xml
+++ b/make/data/cldr/common/main/fr_MA.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/fr_MC.xml b/make/data/cldr/common/main/fr_MC.xml
index b0c3a56dbd4..dffda4d24d3 100644
--- a/make/data/cldr/common/main/fr_MC.xml
+++ b/make/data/cldr/common/main/fr_MC.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/fr_MF.xml b/make/data/cldr/common/main/fr_MF.xml
index 8e8faa565f2..69101fa3e48 100644
--- a/make/data/cldr/common/main/fr_MF.xml
+++ b/make/data/cldr/common/main/fr_MF.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/fr_MG.xml b/make/data/cldr/common/main/fr_MG.xml
index 24f4c01fd03..e0afd609746 100644
--- a/make/data/cldr/common/main/fr_MG.xml
+++ b/make/data/cldr/common/main/fr_MG.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/fr_ML.xml b/make/data/cldr/common/main/fr_ML.xml
index 92baa844d7b..6ca862ea641 100644
--- a/make/data/cldr/common/main/fr_ML.xml
+++ b/make/data/cldr/common/main/fr_ML.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/fr_MQ.xml b/make/data/cldr/common/main/fr_MQ.xml
index b0843cdfc3f..c1b47054a87 100644
--- a/make/data/cldr/common/main/fr_MQ.xml
+++ b/make/data/cldr/common/main/fr_MQ.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/fr_MR.xml b/make/data/cldr/common/main/fr_MR.xml
index c28494b741b..d5f0f37a546 100644
--- a/make/data/cldr/common/main/fr_MR.xml
+++ b/make/data/cldr/common/main/fr_MR.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/fr_MU.xml b/make/data/cldr/common/main/fr_MU.xml
index a34ad049263..1e28464c0f0 100644
--- a/make/data/cldr/common/main/fr_MU.xml
+++ b/make/data/cldr/common/main/fr_MU.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/fr_NC.xml b/make/data/cldr/common/main/fr_NC.xml
index 5b37c39a95b..ab435b89ae8 100644
--- a/make/data/cldr/common/main/fr_NC.xml
+++ b/make/data/cldr/common/main/fr_NC.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/fr_NE.xml b/make/data/cldr/common/main/fr_NE.xml
index e9326af410d..7a0e1444381 100644
--- a/make/data/cldr/common/main/fr_NE.xml
+++ b/make/data/cldr/common/main/fr_NE.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/fr_PF.xml b/make/data/cldr/common/main/fr_PF.xml
index 96285e8276e..9c423d3f5b8 100644
--- a/make/data/cldr/common/main/fr_PF.xml
+++ b/make/data/cldr/common/main/fr_PF.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/fr_PM.xml b/make/data/cldr/common/main/fr_PM.xml
index 40ffe3e536e..40288ca3ff9 100644
--- a/make/data/cldr/common/main/fr_PM.xml
+++ b/make/data/cldr/common/main/fr_PM.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/fr_RE.xml b/make/data/cldr/common/main/fr_RE.xml
index f86d81a11e6..f0df90cfc86 100644
--- a/make/data/cldr/common/main/fr_RE.xml
+++ b/make/data/cldr/common/main/fr_RE.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/fr_RW.xml b/make/data/cldr/common/main/fr_RW.xml
index 8040bdfa162..030c76c53ab 100644
--- a/make/data/cldr/common/main/fr_RW.xml
+++ b/make/data/cldr/common/main/fr_RW.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/fr_SC.xml b/make/data/cldr/common/main/fr_SC.xml
index c4cb4cf1788..aafe72d84cc 100644
--- a/make/data/cldr/common/main/fr_SC.xml
+++ b/make/data/cldr/common/main/fr_SC.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/fr_SN.xml b/make/data/cldr/common/main/fr_SN.xml
index 89343236f3f..657930a1cfb 100644
--- a/make/data/cldr/common/main/fr_SN.xml
+++ b/make/data/cldr/common/main/fr_SN.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/fr_SY.xml b/make/data/cldr/common/main/fr_SY.xml
index 1dab23168f1..5ef1c925ee7 100644
--- a/make/data/cldr/common/main/fr_SY.xml
+++ b/make/data/cldr/common/main/fr_SY.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/fr_TD.xml b/make/data/cldr/common/main/fr_TD.xml
index eb5ab733d98..7742d5f8e28 100644
--- a/make/data/cldr/common/main/fr_TD.xml
+++ b/make/data/cldr/common/main/fr_TD.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/fr_TG.xml b/make/data/cldr/common/main/fr_TG.xml
index a01e06a4909..c6fc6f4ec48 100644
--- a/make/data/cldr/common/main/fr_TG.xml
+++ b/make/data/cldr/common/main/fr_TG.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/fr_TN.xml b/make/data/cldr/common/main/fr_TN.xml
index fed2ed7807f..1eb823262fd 100644
--- a/make/data/cldr/common/main/fr_TN.xml
+++ b/make/data/cldr/common/main/fr_TN.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/fr_VU.xml b/make/data/cldr/common/main/fr_VU.xml
index f9eb38f20a3..f9e05873199 100644
--- a/make/data/cldr/common/main/fr_VU.xml
+++ b/make/data/cldr/common/main/fr_VU.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/fr_WF.xml b/make/data/cldr/common/main/fr_WF.xml
index e644869fdc3..7271b98f682 100644
--- a/make/data/cldr/common/main/fr_WF.xml
+++ b/make/data/cldr/common/main/fr_WF.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/fr_YT.xml b/make/data/cldr/common/main/fr_YT.xml
index 134c877e30c..d4f874ac362 100644
--- a/make/data/cldr/common/main/fr_YT.xml
+++ b/make/data/cldr/common/main/fr_YT.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/frr.xml b/make/data/cldr/common/main/frr.xml
index bd0134d453f..47fa5256bc5 100644
--- a/make/data/cldr/common/main/frr.xml
+++ b/make/data/cldr/common/main/frr.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/frr_DE.xml b/make/data/cldr/common/main/frr_DE.xml
index e4dd611312f..056ecce9d7c 100644
--- a/make/data/cldr/common/main/frr_DE.xml
+++ b/make/data/cldr/common/main/frr_DE.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/fur.xml b/make/data/cldr/common/main/fur.xml
index eb962af0ed9..a7d26ec7caa 100644
--- a/make/data/cldr/common/main/fur.xml
+++ b/make/data/cldr/common/main/fur.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/fur_IT.xml b/make/data/cldr/common/main/fur_IT.xml
index fcc1dfb18b4..df956ebcc64 100644
--- a/make/data/cldr/common/main/fur_IT.xml
+++ b/make/data/cldr/common/main/fur_IT.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/fy.xml b/make/data/cldr/common/main/fy.xml
index d9dfbf5934f..6cf0c53ad5c 100644
--- a/make/data/cldr/common/main/fy.xml
+++ b/make/data/cldr/common/main/fy.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/fy_NL.xml b/make/data/cldr/common/main/fy_NL.xml
index db5f697c8a3..70acc8b72a4 100644
--- a/make/data/cldr/common/main/fy_NL.xml
+++ b/make/data/cldr/common/main/fy_NL.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/ga.xml b/make/data/cldr/common/main/ga.xml
index 473bbbec0e1..5be8c5b76ec 100644
--- a/make/data/cldr/common/main/ga.xml
+++ b/make/data/cldr/common/main/ga.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/ga_GB.xml b/make/data/cldr/common/main/ga_GB.xml
index af57908d747..a4dbdce2024 100644
--- a/make/data/cldr/common/main/ga_GB.xml
+++ b/make/data/cldr/common/main/ga_GB.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/ga_IE.xml b/make/data/cldr/common/main/ga_IE.xml
index 3a7250e9763..3603d1e49c2 100644
--- a/make/data/cldr/common/main/ga_IE.xml
+++ b/make/data/cldr/common/main/ga_IE.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/gaa.xml b/make/data/cldr/common/main/gaa.xml
index 57057aeebf4..6e69d56b6a2 100644
--- a/make/data/cldr/common/main/gaa.xml
+++ b/make/data/cldr/common/main/gaa.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/gaa_GH.xml b/make/data/cldr/common/main/gaa_GH.xml
index 84715929253..e9c0a2f1162 100644
--- a/make/data/cldr/common/main/gaa_GH.xml
+++ b/make/data/cldr/common/main/gaa_GH.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/gd.xml b/make/data/cldr/common/main/gd.xml
index c78fafa85a6..e9b23423ac4 100644
--- a/make/data/cldr/common/main/gd.xml
+++ b/make/data/cldr/common/main/gd.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/gd_GB.xml b/make/data/cldr/common/main/gd_GB.xml
index 1b81536ed80..8f67a50f7b4 100644
--- a/make/data/cldr/common/main/gd_GB.xml
+++ b/make/data/cldr/common/main/gd_GB.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/gez.xml b/make/data/cldr/common/main/gez.xml
index bb405dabb87..233c0f3063d 100644
--- a/make/data/cldr/common/main/gez.xml
+++ b/make/data/cldr/common/main/gez.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -477,7 +477,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 		<symbols numberSystem="latn">
 			<group draft="unconfirmed">ወ</group>
 		</symbols>
-		<currencyFormats>
+		<currencyFormats numberSystem="latn">
 			<currencyFormatLength>
 				<currencyFormat type="standard">
 					<pattern draft="unconfirmed">¤#,##0.00</pattern>
diff --git a/make/data/cldr/common/main/gez_ER.xml b/make/data/cldr/common/main/gez_ER.xml
index f5b9ae7497e..7ea24e389b1 100644
--- a/make/data/cldr/common/main/gez_ER.xml
+++ b/make/data/cldr/common/main/gez_ER.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/gez_ET.xml b/make/data/cldr/common/main/gez_ET.xml
index c9250811ec8..5b022efdc17 100644
--- a/make/data/cldr/common/main/gez_ET.xml
+++ b/make/data/cldr/common/main/gez_ET.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/gl.xml b/make/data/cldr/common/main/gl.xml
index 3bb5aed0f78..2a172194808 100644
--- a/make/data/cldr/common/main/gl.xml
+++ b/make/data/cldr/common/main/gl.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/gl_ES.xml b/make/data/cldr/common/main/gl_ES.xml
index 18cb43c3cec..aa125388779 100644
--- a/make/data/cldr/common/main/gl_ES.xml
+++ b/make/data/cldr/common/main/gl_ES.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/gn.xml b/make/data/cldr/common/main/gn.xml
index a1a3df585db..3b54104f69b 100644
--- a/make/data/cldr/common/main/gn.xml
+++ b/make/data/cldr/common/main/gn.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/gn_PY.xml b/make/data/cldr/common/main/gn_PY.xml
index 87af65ad1c6..74d9ad56498 100644
--- a/make/data/cldr/common/main/gn_PY.xml
+++ b/make/data/cldr/common/main/gn_PY.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/gsw.xml b/make/data/cldr/common/main/gsw.xml
index 0047e032028..fda45bd6c1b 100644
--- a/make/data/cldr/common/main/gsw.xml
+++ b/make/data/cldr/common/main/gsw.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/gsw_CH.xml b/make/data/cldr/common/main/gsw_CH.xml
index 8740af7b759..972a8b88802 100644
--- a/make/data/cldr/common/main/gsw_CH.xml
+++ b/make/data/cldr/common/main/gsw_CH.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/gsw_FR.xml b/make/data/cldr/common/main/gsw_FR.xml
index d90c3ea2e51..89c72e1b1a6 100644
--- a/make/data/cldr/common/main/gsw_FR.xml
+++ b/make/data/cldr/common/main/gsw_FR.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/gsw_LI.xml b/make/data/cldr/common/main/gsw_LI.xml
index e7eba946b71..3a482c3e23f 100644
--- a/make/data/cldr/common/main/gsw_LI.xml
+++ b/make/data/cldr/common/main/gsw_LI.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/gu.xml b/make/data/cldr/common/main/gu.xml
index 079cdcb105f..f3e353e8710 100644
--- a/make/data/cldr/common/main/gu.xml
+++ b/make/data/cldr/common/main/gu.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/gu_IN.xml b/make/data/cldr/common/main/gu_IN.xml
index d2f77872e11..651897910c3 100644
--- a/make/data/cldr/common/main/gu_IN.xml
+++ b/make/data/cldr/common/main/gu_IN.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/guz.xml b/make/data/cldr/common/main/guz.xml
index 6e2b253a5d3..8d6f2f72c6e 100644
--- a/make/data/cldr/common/main/guz.xml
+++ b/make/data/cldr/common/main/guz.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/guz_KE.xml b/make/data/cldr/common/main/guz_KE.xml
index f7c8d95d03d..9c203c0cb10 100644
--- a/make/data/cldr/common/main/guz_KE.xml
+++ b/make/data/cldr/common/main/guz_KE.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/gv.xml b/make/data/cldr/common/main/gv.xml
index 344a82417c2..f13cd5a2a3b 100644
--- a/make/data/cldr/common/main/gv.xml
+++ b/make/data/cldr/common/main/gv.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/gv_IM.xml b/make/data/cldr/common/main/gv_IM.xml
index 6a8d0ac45cc..3e7cb3df44e 100644
--- a/make/data/cldr/common/main/gv_IM.xml
+++ b/make/data/cldr/common/main/gv_IM.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/ha.xml b/make/data/cldr/common/main/ha.xml
index 6420a881716..f16d12fa8a0 100644
--- a/make/data/cldr/common/main/ha.xml
+++ b/make/data/cldr/common/main/ha.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/ha_Arab.xml b/make/data/cldr/common/main/ha_Arab.xml
index 06b6eafd72f..1f08f56f633 100644
--- a/make/data/cldr/common/main/ha_Arab.xml
+++ b/make/data/cldr/common/main/ha_Arab.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/ha_Arab_NG.xml b/make/data/cldr/common/main/ha_Arab_NG.xml
index de44776f657..6822a492603 100644
--- a/make/data/cldr/common/main/ha_Arab_NG.xml
+++ b/make/data/cldr/common/main/ha_Arab_NG.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/ha_Arab_SD.xml b/make/data/cldr/common/main/ha_Arab_SD.xml
index d36a89d5e5f..b4f674fa96e 100644
--- a/make/data/cldr/common/main/ha_Arab_SD.xml
+++ b/make/data/cldr/common/main/ha_Arab_SD.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/ha_GH.xml b/make/data/cldr/common/main/ha_GH.xml
index f93141c71b4..61d6e5d3469 100644
--- a/make/data/cldr/common/main/ha_GH.xml
+++ b/make/data/cldr/common/main/ha_GH.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/ha_NE.xml b/make/data/cldr/common/main/ha_NE.xml
index 84ece09be99..9e34526993f 100644
--- a/make/data/cldr/common/main/ha_NE.xml
+++ b/make/data/cldr/common/main/ha_NE.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/ha_NG.xml b/make/data/cldr/common/main/ha_NG.xml
index 1a42e43793a..be0589afefb 100644
--- a/make/data/cldr/common/main/ha_NG.xml
+++ b/make/data/cldr/common/main/ha_NG.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/haw.xml b/make/data/cldr/common/main/haw.xml
index dadea206071..014397e54b8 100644
--- a/make/data/cldr/common/main/haw.xml
+++ b/make/data/cldr/common/main/haw.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/haw_US.xml b/make/data/cldr/common/main/haw_US.xml
index 5a37f908c1c..2fee25753be 100644
--- a/make/data/cldr/common/main/haw_US.xml
+++ b/make/data/cldr/common/main/haw_US.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/he.xml b/make/data/cldr/common/main/he.xml
index 5a7011b729f..640cb79740b 100644
--- a/make/data/cldr/common/main/he.xml
+++ b/make/data/cldr/common/main/he.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -5223,6 +5223,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<currencyFormatLength>
 				<currencyFormat type="standard">
 					<pattern>‏#,##0.00 ‏¤;‏-#,##0.00 ‏¤</pattern>
+					<pattern alt="noCurrency" draft="provisional">‏#,##0.00‏;‏-#,##0.00‏</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 			<currencyFormatLength type="short">
diff --git a/make/data/cldr/common/main/he_IL.xml b/make/data/cldr/common/main/he_IL.xml
index 41be0ec5ddb..d783ceb4e07 100644
--- a/make/data/cldr/common/main/he_IL.xml
+++ b/make/data/cldr/common/main/he_IL.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/hi.xml b/make/data/cldr/common/main/hi.xml
index 9ce32233943..649bddacab6 100644
--- a/make/data/cldr/common/main/hi.xml
+++ b/make/data/cldr/common/main/hi.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -1480,7 +1480,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							<month type="7">जुल॰</month>
 							<month type="8">अग॰</month>
 							<month type="9">सित॰</month>
-							<month type="10">अक्तू॰</month>
+							<month type="10">अक्टू॰</month>
 							<month type="11">नव॰</month>
 							<month type="12">दिस॰</month>
 						</monthWidth>
@@ -1494,7 +1494,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							<month type="7">जुलाई</month>
 							<month type="8">अगस्त</month>
 							<month type="9">सितंबर</month>
-							<month type="10">अक्तूबर</month>
+							<month type="10">अक्टूबर</month>
 							<month type="11">नवंबर</month>
 							<month type="12">दिसंबर</month>
 						</monthWidth>
@@ -1867,7 +1867,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<intervalFormats>
 						<intervalFormatItem id="GyM">
 							<greatestDifference id="G" draft="contributed">GGGGG M/y – GGGGG M/y</greatestDifference>
-							<greatestDifference id="M" draft="contributed">GGGGG M/y – M/</greatestDifference>
+							<greatestDifference id="M" draft="contributed">GGGGG M/y – M/y</greatestDifference>
 							<greatestDifference id="y" draft="contributed">GGGGG M/y – M/y</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="GyMd">
diff --git a/make/data/cldr/common/main/hi_IN.xml b/make/data/cldr/common/main/hi_IN.xml
index 20ee8e9fef7..e9c65684d18 100644
--- a/make/data/cldr/common/main/hi_IN.xml
+++ b/make/data/cldr/common/main/hi_IN.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/hi_Latn.xml b/make/data/cldr/common/main/hi_Latn.xml
index 32be9e66a96..a3a8493c029 100644
--- a/make/data/cldr/common/main/hi_Latn.xml
+++ b/make/data/cldr/common/main/hi_Latn.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/hi_Latn_IN.xml b/make/data/cldr/common/main/hi_Latn_IN.xml
index c3ab4c4cf56..4e4cfba3b2a 100644
--- a/make/data/cldr/common/main/hi_Latn_IN.xml
+++ b/make/data/cldr/common/main/hi_Latn_IN.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/hnj.xml b/make/data/cldr/common/main/hnj.xml
index 6492ca8dc35..1ef29c32a2a 100644
--- a/make/data/cldr/common/main/hnj.xml
+++ b/make/data/cldr/common/main/hnj.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/hnj_Hmnp.xml b/make/data/cldr/common/main/hnj_Hmnp.xml
index edf19bb8cdc..6e58738ffeb 100644
--- a/make/data/cldr/common/main/hnj_Hmnp.xml
+++ b/make/data/cldr/common/main/hnj_Hmnp.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/hnj_Hmnp_US.xml b/make/data/cldr/common/main/hnj_Hmnp_US.xml
index 34ff522c1fe..3c73bc0ad21 100644
--- a/make/data/cldr/common/main/hnj_Hmnp_US.xml
+++ b/make/data/cldr/common/main/hnj_Hmnp_US.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/hr.xml b/make/data/cldr/common/main/hr.xml
index fe18649d5ea..35c73535771 100644
--- a/make/data/cldr/common/main/hr.xml
+++ b/make/data/cldr/common/main/hr.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/hr_BA.xml b/make/data/cldr/common/main/hr_BA.xml
index 93895ec431f..d60ff6acb30 100644
--- a/make/data/cldr/common/main/hr_BA.xml
+++ b/make/data/cldr/common/main/hr_BA.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/hr_HR.xml b/make/data/cldr/common/main/hr_HR.xml
index 34f898cb40d..2b7af0b4001 100644
--- a/make/data/cldr/common/main/hr_HR.xml
+++ b/make/data/cldr/common/main/hr_HR.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/hsb.xml b/make/data/cldr/common/main/hsb.xml
index a989a0a8074..f3c8138cc6d 100644
--- a/make/data/cldr/common/main/hsb.xml
+++ b/make/data/cldr/common/main/hsb.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/hsb_DE.xml b/make/data/cldr/common/main/hsb_DE.xml
index 76e15d557b5..94ab2712a13 100644
--- a/make/data/cldr/common/main/hsb_DE.xml
+++ b/make/data/cldr/common/main/hsb_DE.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/ht.xml b/make/data/cldr/common/main/ht.xml
new file mode 100644
index 00000000000..c3dbb4adad4
--- /dev/null
+++ b/make/data/cldr/common/main/ht.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
+<!-- Copyright © 1991-2025 Unicode, Inc.
+For terms of use, see http://www.unicode.org/copyright.html
+SPDX-License-Identifier: Unicode-3.0
+CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
+-->
+<ldml>
+	<identity>
+		<version number="$Revision$"/>
+		<language type="ht"/>
+	</identity>
+	<localeDisplayNames>
+		<languages>
+			<language type="ht">Kreyòl Ayisyen</language>
+		</languages>
+	</localeDisplayNames>
+	<characters>
+		<exemplarCharacters>[a {an} b {ch} d eè {en} f g h i j k l m n {ng} oò {on} {ou} {oun} p r s t {ui} v w y z]</exemplarCharacters>
+		<exemplarCharacters type="auxiliary">[x]</exemplarCharacters>
+		<exemplarCharacters type="punctuation">[\- ‑ , ; \: ! ? . … '‘’ &quot;“” ( ) \[ \] § @ / \&amp; # % ′ ″]</exemplarCharacters>
+	</characters>
+	<numbers>
+		<symbols numberSystem="latn">
+			<group> </group>
+			<percentSign>%</percentSign>
+			<minusSign>-</minusSign>
+		</symbols>
+	</numbers>
+</ldml>
diff --git a/make/data/cldr/common/main/ht_HT.xml b/make/data/cldr/common/main/ht_HT.xml
new file mode 100644
index 00000000000..c4f5bb4d5ac
--- /dev/null
+++ b/make/data/cldr/common/main/ht_HT.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
+<!-- Copyright © 1991-2025 Unicode, Inc.
+For terms of use, see http://www.unicode.org/copyright.html
+SPDX-License-Identifier: Unicode-3.0
+CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
+-->
+<ldml>
+	<identity>
+		<version number="$Revision$"/>
+		<language type="ht"/>
+		<territory type="HT"/>
+	</identity>
+</ldml>
diff --git a/make/data/cldr/common/main/hu.xml b/make/data/cldr/common/main/hu.xml
index d386b4c4eae..2cfb4d16073 100644
--- a/make/data/cldr/common/main/hu.xml
+++ b/make/data/cldr/common/main/hu.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -3898,6 +3898,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<currencyFormatLength>
 				<currencyFormat type="standard">
 					<pattern>#,##0.00 ¤</pattern>
+					<pattern alt="noCurrency" draft="provisional">#,##0.00</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 			<currencyFormatLength type="short">
diff --git a/make/data/cldr/common/main/hu_HU.xml b/make/data/cldr/common/main/hu_HU.xml
index 30feb772c9a..bbdb7e640ab 100644
--- a/make/data/cldr/common/main/hu_HU.xml
+++ b/make/data/cldr/common/main/hu_HU.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/hy.xml b/make/data/cldr/common/main/hy.xml
index fac008b48b2..08690355a5a 100644
--- a/make/data/cldr/common/main/hy.xml
+++ b/make/data/cldr/common/main/hy.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/hy_AM.xml b/make/data/cldr/common/main/hy_AM.xml
index 57234fe8ece..ebfc9ef50c0 100644
--- a/make/data/cldr/common/main/hy_AM.xml
+++ b/make/data/cldr/common/main/hy_AM.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/ia.xml b/make/data/cldr/common/main/ia.xml
index fed06caad47..c6acc5a59d9 100644
--- a/make/data/cldr/common/main/ia.xml
+++ b/make/data/cldr/common/main/ia.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/ia_001.xml b/make/data/cldr/common/main/ia_001.xml
index 54b31c5a82e..61f07dae67e 100644
--- a/make/data/cldr/common/main/ia_001.xml
+++ b/make/data/cldr/common/main/ia_001.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/id.xml b/make/data/cldr/common/main/id.xml
index 33cad514796..590e7d58569 100644
--- a/make/data/cldr/common/main/id.xml
+++ b/make/data/cldr/common/main/id.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -4042,6 +4042,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<currencyFormat type="standard">
 					<pattern>¤#,##0.00</pattern>
 					<pattern alt="alphaNextToNumber" draft="provisional">¤ #,##0.00</pattern>
+					<pattern alt="noCurrency" draft="provisional">#,##0.00</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 			<currencyFormatLength type="short">
diff --git a/make/data/cldr/common/main/id_ID.xml b/make/data/cldr/common/main/id_ID.xml
index 83e9f6051a7..3b1b27e75ce 100644
--- a/make/data/cldr/common/main/id_ID.xml
+++ b/make/data/cldr/common/main/id_ID.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/ie.xml b/make/data/cldr/common/main/ie.xml
index cee5d7192f9..2d79e00936f 100644
--- a/make/data/cldr/common/main/ie.xml
+++ b/make/data/cldr/common/main/ie.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/ie_EE.xml b/make/data/cldr/common/main/ie_EE.xml
index 5faf8528d1c..6636dc97a29 100644
--- a/make/data/cldr/common/main/ie_EE.xml
+++ b/make/data/cldr/common/main/ie_EE.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/ig.xml b/make/data/cldr/common/main/ig.xml
index bd305223871..787eb2c8133 100644
--- a/make/data/cldr/common/main/ig.xml
+++ b/make/data/cldr/common/main/ig.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/ig_NG.xml b/make/data/cldr/common/main/ig_NG.xml
index 7704ec263eb..2e22bb68cfb 100644
--- a/make/data/cldr/common/main/ig_NG.xml
+++ b/make/data/cldr/common/main/ig_NG.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/ii.xml b/make/data/cldr/common/main/ii.xml
index a5c31ffea7f..268e4a9808e 100644
--- a/make/data/cldr/common/main/ii.xml
+++ b/make/data/cldr/common/main/ii.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/ii_CN.xml b/make/data/cldr/common/main/ii_CN.xml
index 478dc23f82f..8ea18cfb2f2 100644
--- a/make/data/cldr/common/main/ii_CN.xml
+++ b/make/data/cldr/common/main/ii_CN.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/io.xml b/make/data/cldr/common/main/io.xml
index f960e028b81..0e5578945d2 100644
--- a/make/data/cldr/common/main/io.xml
+++ b/make/data/cldr/common/main/io.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/io_001.xml b/make/data/cldr/common/main/io_001.xml
index b7b5f851ab2..c9f5d6ab340 100644
--- a/make/data/cldr/common/main/io_001.xml
+++ b/make/data/cldr/common/main/io_001.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/is.xml b/make/data/cldr/common/main/is.xml
index 5d815a076b0..a1cd0c5ef1c 100644
--- a/make/data/cldr/common/main/is.xml
+++ b/make/data/cldr/common/main/is.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/is_IS.xml b/make/data/cldr/common/main/is_IS.xml
index 0cec87ac20c..f2b249f52ae 100644
--- a/make/data/cldr/common/main/is_IS.xml
+++ b/make/data/cldr/common/main/is_IS.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/it.xml b/make/data/cldr/common/main/it.xml
index a893098a2d3..a34f0ada80a 100644
--- a/make/data/cldr/common/main/it.xml
+++ b/make/data/cldr/common/main/it.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -3754,6 +3754,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<currencyFormatLength>
 				<currencyFormat type="standard">
 					<pattern>#,##0.00 ¤</pattern>
+					<pattern alt="noCurrency" draft="provisional">#,##0.00</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 			<currencyFormatLength type="short">
diff --git a/make/data/cldr/common/main/it_CH.xml b/make/data/cldr/common/main/it_CH.xml
index 1843cd39912..4185a3c2f4e 100644
--- a/make/data/cldr/common/main/it_CH.xml
+++ b/make/data/cldr/common/main/it_CH.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/it_IT.xml b/make/data/cldr/common/main/it_IT.xml
index 5f3342415d8..e301fb305af 100644
--- a/make/data/cldr/common/main/it_IT.xml
+++ b/make/data/cldr/common/main/it_IT.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/it_SM.xml b/make/data/cldr/common/main/it_SM.xml
index b30f7e0df51..05453b958f3 100644
--- a/make/data/cldr/common/main/it_SM.xml
+++ b/make/data/cldr/common/main/it_SM.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/it_VA.xml b/make/data/cldr/common/main/it_VA.xml
index 4ceb6fc0bff..69517164bec 100644
--- a/make/data/cldr/common/main/it_VA.xml
+++ b/make/data/cldr/common/main/it_VA.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/iu.xml b/make/data/cldr/common/main/iu.xml
index dbd87621f8c..3c9614e4393 100644
--- a/make/data/cldr/common/main/iu.xml
+++ b/make/data/cldr/common/main/iu.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/iu_CA.xml b/make/data/cldr/common/main/iu_CA.xml
index 4e4a6931d38..805f31eac37 100644
--- a/make/data/cldr/common/main/iu_CA.xml
+++ b/make/data/cldr/common/main/iu_CA.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/iu_Latn.xml b/make/data/cldr/common/main/iu_Latn.xml
index 51be22c08a1..a80bc13998e 100644
--- a/make/data/cldr/common/main/iu_Latn.xml
+++ b/make/data/cldr/common/main/iu_Latn.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/iu_Latn_CA.xml b/make/data/cldr/common/main/iu_Latn_CA.xml
index 2ea5fc82a1c..a3c92234097 100644
--- a/make/data/cldr/common/main/iu_Latn_CA.xml
+++ b/make/data/cldr/common/main/iu_Latn_CA.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/ja.xml b/make/data/cldr/common/main/ja.xml
index 1828cb83f78..8c7f32a9a03 100644
--- a/make/data/cldr/common/main/ja.xml
+++ b/make/data/cldr/common/main/ja.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -1431,13 +1431,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<dateFormatLength type="full">
 						<dateFormat>
 							<pattern>GGGGy年M月d日EEEE</pattern>
-							<datetimeSkeleton>GGGGyMEEEEd</datetimeSkeleton>
+							<datetimeSkeleton>GGGGyMMMEEEEd</datetimeSkeleton>
 						</dateFormat>
 					</dateFormatLength>
 					<dateFormatLength type="long">
 						<dateFormat>
 							<pattern>GGGGy年M月d日</pattern>
-							<datetimeSkeleton>GGGGyMd</datetimeSkeleton>
+							<datetimeSkeleton>GGGGyMMMd</datetimeSkeleton>
 						</dateFormat>
 					</dateFormatLength>
 					<dateFormatLength type="medium">
@@ -1892,13 +1892,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<dateFormatLength type="full">
 						<dateFormat>
 							<pattern>Gy年M月d日(EEEE)</pattern>
-							<datetimeSkeleton>GyMEEEEd</datetimeSkeleton>
+							<datetimeSkeleton>GyMMMEEEEd</datetimeSkeleton>
 						</dateFormat>
 					</dateFormatLength>
 					<dateFormatLength type="long">
 						<dateFormat>
 							<pattern>Gy年M月d日</pattern>
-							<datetimeSkeleton>GyMd</datetimeSkeleton>
+							<datetimeSkeleton>GyMMMd</datetimeSkeleton>
 						</dateFormat>
 					</dateFormatLength>
 					<dateFormatLength type="medium">
@@ -2246,13 +2246,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<dateFormatLength type="full">
 						<dateFormat>
 							<pattern>y年M月d日EEEE</pattern>
-							<datetimeSkeleton>yMEEEEd</datetimeSkeleton>
+							<datetimeSkeleton>yMMMEEEEd</datetimeSkeleton>
 						</dateFormat>
 					</dateFormatLength>
 					<dateFormatLength type="long">
 						<dateFormat>
 							<pattern>y年M月d日</pattern>
-							<datetimeSkeleton>yMd</datetimeSkeleton>
+							<datetimeSkeleton>yMMMd</datetimeSkeleton>
 						</dateFormat>
 					</dateFormatLength>
 					<dateFormatLength type="medium">
@@ -3134,7 +3134,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<dateFormatLength type="medium">
 						<dateFormat>
 							<pattern numbers="y=jpanyear">Gy年M月d日</pattern>
-							<datetimeSkeleton numbers="y=jpanyear">GyMd</datetimeSkeleton>
+							<datetimeSkeleton numbers="y=jpanyear">GyMMMd</datetimeSkeleton>
 						</dateFormat>
 					</dateFormatLength>
 					<dateFormatLength type="short">
@@ -5893,6 +5893,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<currencyFormat type="standard">
 					<pattern>¤#,##0.00</pattern>
 					<pattern alt="alphaNextToNumber" draft="provisional">¤ #,##0.00</pattern>
+					<pattern alt="noCurrency" draft="provisional">#,##0.00</pattern>
 				</currencyFormat>
 				<currencyFormat type="accounting">
 					<pattern>¤#,##0.00;(¤#,##0.00)</pattern>
diff --git a/make/data/cldr/common/main/ja_JP.xml b/make/data/cldr/common/main/ja_JP.xml
index d6254b095db..0257f8d4a23 100644
--- a/make/data/cldr/common/main/ja_JP.xml
+++ b/make/data/cldr/common/main/ja_JP.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/jbo.xml b/make/data/cldr/common/main/jbo.xml
index 6f1a7601a5c..a9d5b97744b 100644
--- a/make/data/cldr/common/main/jbo.xml
+++ b/make/data/cldr/common/main/jbo.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/jbo_001.xml b/make/data/cldr/common/main/jbo_001.xml
index ad6bd6ce3f9..e5aa35dd311 100644
--- a/make/data/cldr/common/main/jbo_001.xml
+++ b/make/data/cldr/common/main/jbo_001.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/jgo.xml b/make/data/cldr/common/main/jgo.xml
index 8fb4a321436..77a32c12d1e 100644
--- a/make/data/cldr/common/main/jgo.xml
+++ b/make/data/cldr/common/main/jgo.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/jgo_CM.xml b/make/data/cldr/common/main/jgo_CM.xml
index 28bcebccf52..015e6b4ee7c 100644
--- a/make/data/cldr/common/main/jgo_CM.xml
+++ b/make/data/cldr/common/main/jgo_CM.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/jmc.xml b/make/data/cldr/common/main/jmc.xml
index d6f948f0e39..b5cee1bbaf6 100644
--- a/make/data/cldr/common/main/jmc.xml
+++ b/make/data/cldr/common/main/jmc.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/jmc_TZ.xml b/make/data/cldr/common/main/jmc_TZ.xml
index b0748810276..322430eb22f 100644
--- a/make/data/cldr/common/main/jmc_TZ.xml
+++ b/make/data/cldr/common/main/jmc_TZ.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/jv.xml b/make/data/cldr/common/main/jv.xml
index 12a77c0b9fa..54ef5e3901d 100644
--- a/make/data/cldr/common/main/jv.xml
+++ b/make/data/cldr/common/main/jv.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/jv_ID.xml b/make/data/cldr/common/main/jv_ID.xml
index 95d195ca0fe..8346ad36722 100644
--- a/make/data/cldr/common/main/jv_ID.xml
+++ b/make/data/cldr/common/main/jv_ID.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/ka.xml b/make/data/cldr/common/main/ka.xml
index 8e07d0714f1..7740acd7acb 100644
--- a/make/data/cldr/common/main/ka.xml
+++ b/make/data/cldr/common/main/ka.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/ka_GE.xml b/make/data/cldr/common/main/ka_GE.xml
index 513b88d0fec..2bd8f38f2b7 100644
--- a/make/data/cldr/common/main/ka_GE.xml
+++ b/make/data/cldr/common/main/ka_GE.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/kaa.xml b/make/data/cldr/common/main/kaa.xml
index 58b4ba82f03..851615c3139 100644
--- a/make/data/cldr/common/main/kaa.xml
+++ b/make/data/cldr/common/main/kaa.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/kaa_Cyrl.xml b/make/data/cldr/common/main/kaa_Cyrl.xml
index b00e1fc739d..835393d3d0e 100644
--- a/make/data/cldr/common/main/kaa_Cyrl.xml
+++ b/make/data/cldr/common/main/kaa_Cyrl.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/kaa_Cyrl_UZ.xml b/make/data/cldr/common/main/kaa_Cyrl_UZ.xml
index 41241c8bcf5..b9d9235939b 100644
--- a/make/data/cldr/common/main/kaa_Cyrl_UZ.xml
+++ b/make/data/cldr/common/main/kaa_Cyrl_UZ.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/kaa_Latn.xml b/make/data/cldr/common/main/kaa_Latn.xml
index f91107fb861..6835760d9d8 100644
--- a/make/data/cldr/common/main/kaa_Latn.xml
+++ b/make/data/cldr/common/main/kaa_Latn.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/kaa_Latn_UZ.xml b/make/data/cldr/common/main/kaa_Latn_UZ.xml
index 73b4eac55b6..d736c92e002 100644
--- a/make/data/cldr/common/main/kaa_Latn_UZ.xml
+++ b/make/data/cldr/common/main/kaa_Latn_UZ.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/kab.xml b/make/data/cldr/common/main/kab.xml
index 004887d3ab5..ef10d1d734d 100644
--- a/make/data/cldr/common/main/kab.xml
+++ b/make/data/cldr/common/main/kab.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/kab_DZ.xml b/make/data/cldr/common/main/kab_DZ.xml
index 9c5e9f6f9c1..a2794990123 100644
--- a/make/data/cldr/common/main/kab_DZ.xml
+++ b/make/data/cldr/common/main/kab_DZ.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/kaj.xml b/make/data/cldr/common/main/kaj.xml
index dd2f2d48a3b..21a82b08e12 100644
--- a/make/data/cldr/common/main/kaj.xml
+++ b/make/data/cldr/common/main/kaj.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/kaj_NG.xml b/make/data/cldr/common/main/kaj_NG.xml
index 446af581cde..94cbec8f719 100644
--- a/make/data/cldr/common/main/kaj_NG.xml
+++ b/make/data/cldr/common/main/kaj_NG.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/kam.xml b/make/data/cldr/common/main/kam.xml
index 655615f74d0..441a887e01c 100644
--- a/make/data/cldr/common/main/kam.xml
+++ b/make/data/cldr/common/main/kam.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/kam_KE.xml b/make/data/cldr/common/main/kam_KE.xml
index f77693e6a7d..906bcf44413 100644
--- a/make/data/cldr/common/main/kam_KE.xml
+++ b/make/data/cldr/common/main/kam_KE.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/kcg.xml b/make/data/cldr/common/main/kcg.xml
index c5ac5715b48..aa7c5111ed8 100644
--- a/make/data/cldr/common/main/kcg.xml
+++ b/make/data/cldr/common/main/kcg.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/kcg_NG.xml b/make/data/cldr/common/main/kcg_NG.xml
index 354b2ab3b37..fde9b506366 100644
--- a/make/data/cldr/common/main/kcg_NG.xml
+++ b/make/data/cldr/common/main/kcg_NG.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/kde.xml b/make/data/cldr/common/main/kde.xml
index fb03f22a83d..a3c7ece3129 100644
--- a/make/data/cldr/common/main/kde.xml
+++ b/make/data/cldr/common/main/kde.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/kde_TZ.xml b/make/data/cldr/common/main/kde_TZ.xml
index ae70dc44043..a4247e6fdc8 100644
--- a/make/data/cldr/common/main/kde_TZ.xml
+++ b/make/data/cldr/common/main/kde_TZ.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/kea.xml b/make/data/cldr/common/main/kea.xml
index 04bcbe2209f..15661c6e995 100644
--- a/make/data/cldr/common/main/kea.xml
+++ b/make/data/cldr/common/main/kea.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/kea_CV.xml b/make/data/cldr/common/main/kea_CV.xml
index 59bcc9a2ad2..5b79b668f1c 100644
--- a/make/data/cldr/common/main/kea_CV.xml
+++ b/make/data/cldr/common/main/kea_CV.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/ken.xml b/make/data/cldr/common/main/ken.xml
index 580019ec00e..e7c726fd87b 100644
--- a/make/data/cldr/common/main/ken.xml
+++ b/make/data/cldr/common/main/ken.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/ken_CM.xml b/make/data/cldr/common/main/ken_CM.xml
index 1e19cade921..38abe696378 100644
--- a/make/data/cldr/common/main/ken_CM.xml
+++ b/make/data/cldr/common/main/ken_CM.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/kgp.xml b/make/data/cldr/common/main/kgp.xml
index 1857b67a354..343220d9650 100644
--- a/make/data/cldr/common/main/kgp.xml
+++ b/make/data/cldr/common/main/kgp.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/kgp_BR.xml b/make/data/cldr/common/main/kgp_BR.xml
index af653d29fa7..0510442d931 100644
--- a/make/data/cldr/common/main/kgp_BR.xml
+++ b/make/data/cldr/common/main/kgp_BR.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/khq.xml b/make/data/cldr/common/main/khq.xml
index b06fba711b4..2ef7b2e476a 100644
--- a/make/data/cldr/common/main/khq.xml
+++ b/make/data/cldr/common/main/khq.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/khq_ML.xml b/make/data/cldr/common/main/khq_ML.xml
index 5087d6d1fdd..b00498944d1 100644
--- a/make/data/cldr/common/main/khq_ML.xml
+++ b/make/data/cldr/common/main/khq_ML.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/ki.xml b/make/data/cldr/common/main/ki.xml
index f129f2e46d9..db95ceb18b6 100644
--- a/make/data/cldr/common/main/ki.xml
+++ b/make/data/cldr/common/main/ki.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/ki_KE.xml b/make/data/cldr/common/main/ki_KE.xml
index c764864fc45..e9f5e0bba9f 100644
--- a/make/data/cldr/common/main/ki_KE.xml
+++ b/make/data/cldr/common/main/ki_KE.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/kk.xml b/make/data/cldr/common/main/kk.xml
index 478618683e4..c410b197cc6 100644
--- a/make/data/cldr/common/main/kk.xml
+++ b/make/data/cldr/common/main/kk.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/kk_Arab.xml b/make/data/cldr/common/main/kk_Arab.xml
index 31edc11dcfe..198e8443f83 100644
--- a/make/data/cldr/common/main/kk_Arab.xml
+++ b/make/data/cldr/common/main/kk_Arab.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/kk_Arab_CN.xml b/make/data/cldr/common/main/kk_Arab_CN.xml
index 0444f3c9ddc..055c86f5224 100644
--- a/make/data/cldr/common/main/kk_Arab_CN.xml
+++ b/make/data/cldr/common/main/kk_Arab_CN.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/kk_Cyrl.xml b/make/data/cldr/common/main/kk_Cyrl.xml
index 01868746aa3..703545ad901 100644
--- a/make/data/cldr/common/main/kk_Cyrl.xml
+++ b/make/data/cldr/common/main/kk_Cyrl.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/kk_Cyrl_KZ.xml b/make/data/cldr/common/main/kk_Cyrl_KZ.xml
index 1232ab65454..c9e4f044cd5 100644
--- a/make/data/cldr/common/main/kk_Cyrl_KZ.xml
+++ b/make/data/cldr/common/main/kk_Cyrl_KZ.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/kk_KZ.xml b/make/data/cldr/common/main/kk_KZ.xml
index 414c04cfce2..1ebf28f3f7c 100644
--- a/make/data/cldr/common/main/kk_KZ.xml
+++ b/make/data/cldr/common/main/kk_KZ.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/kkj.xml b/make/data/cldr/common/main/kkj.xml
index a99945b5c0b..ae69cc29036 100644
--- a/make/data/cldr/common/main/kkj.xml
+++ b/make/data/cldr/common/main/kkj.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/kkj_CM.xml b/make/data/cldr/common/main/kkj_CM.xml
index 19bd6fd1d94..f0e45aec2d1 100644
--- a/make/data/cldr/common/main/kkj_CM.xml
+++ b/make/data/cldr/common/main/kkj_CM.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/kl.xml b/make/data/cldr/common/main/kl.xml
index 187beece7db..83f3643a1ef 100644
--- a/make/data/cldr/common/main/kl.xml
+++ b/make/data/cldr/common/main/kl.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/kl_GL.xml b/make/data/cldr/common/main/kl_GL.xml
index 26a85b6f95c..d8f76f6a8ca 100644
--- a/make/data/cldr/common/main/kl_GL.xml
+++ b/make/data/cldr/common/main/kl_GL.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/kln.xml b/make/data/cldr/common/main/kln.xml
index d882d25f75e..8838a462c97 100644
--- a/make/data/cldr/common/main/kln.xml
+++ b/make/data/cldr/common/main/kln.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/kln_KE.xml b/make/data/cldr/common/main/kln_KE.xml
index 1b9cc26e504..04aa405d790 100644
--- a/make/data/cldr/common/main/kln_KE.xml
+++ b/make/data/cldr/common/main/kln_KE.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/km.xml b/make/data/cldr/common/main/km.xml
index e3889fb4cd6..f07aa1d935f 100644
--- a/make/data/cldr/common/main/km.xml
+++ b/make/data/cldr/common/main/km.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/km_KH.xml b/make/data/cldr/common/main/km_KH.xml
index 6bcd32e45e7..359ea26534d 100644
--- a/make/data/cldr/common/main/km_KH.xml
+++ b/make/data/cldr/common/main/km_KH.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/kn.xml b/make/data/cldr/common/main/kn.xml
index 56558a40986..344df888bb8 100644
--- a/make/data/cldr/common/main/kn.xml
+++ b/make/data/cldr/common/main/kn.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -4375,6 +4375,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<currencyFormat type="standard">
 					<pattern>¤#,##0.00</pattern>
 					<pattern alt="alphaNextToNumber" draft="provisional">¤ #,##0.00</pattern>
+					<pattern alt="noCurrency" draft="provisional">#,##0.00</pattern>
 				</currencyFormat>
 				<currencyFormat type="accounting">
 					<pattern>¤#,##0.00;(¤#,##0.00)</pattern>
diff --git a/make/data/cldr/common/main/kn_IN.xml b/make/data/cldr/common/main/kn_IN.xml
index a1c6190e5f5..9e5a7547faa 100644
--- a/make/data/cldr/common/main/kn_IN.xml
+++ b/make/data/cldr/common/main/kn_IN.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/ko.xml b/make/data/cldr/common/main/ko.xml
index 2e0462ccf46..893a89500e8 100644
--- a/make/data/cldr/common/main/ko.xml
+++ b/make/data/cldr/common/main/ko.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -1703,13 +1703,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<dateFormatLength type="full">
 						<dateFormat>
 							<pattern>G y년 M월 d일 EEEE</pattern>
-							<datetimeSkeleton>GyMEEEEd</datetimeSkeleton>
+							<datetimeSkeleton>GyMMMEEEEd</datetimeSkeleton>
 						</dateFormat>
 					</dateFormatLength>
 					<dateFormatLength type="long">
 						<dateFormat>
 							<pattern>G y년 M월 d일</pattern>
-							<datetimeSkeleton>GyMd</datetimeSkeleton>
+							<datetimeSkeleton>GyMMMd</datetimeSkeleton>
 						</dateFormat>
 					</dateFormatLength>
 					<dateFormatLength type="medium">
@@ -2106,13 +2106,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<dateFormatLength type="full">
 						<dateFormat>
 							<pattern>y년 MMMM d일 EEEE</pattern>
-							<datetimeSkeleton>yMEEEEd</datetimeSkeleton>
+							<datetimeSkeleton>yMMMMEEEEd</datetimeSkeleton>
 						</dateFormat>
 					</dateFormatLength>
 					<dateFormatLength type="long">
 						<dateFormat>
 							<pattern>y년 MMMM d일</pattern>
-							<datetimeSkeleton>yMd</datetimeSkeleton>
+							<datetimeSkeleton>yMMMMd</datetimeSkeleton>
 						</dateFormat>
 					</dateFormatLength>
 					<dateFormatLength type="medium">
@@ -5229,6 +5229,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<currencyFormat type="standard">
 					<pattern>¤#,##0.00</pattern>
 					<pattern alt="alphaNextToNumber" draft="provisional">¤ #,##0.00</pattern>
+					<pattern alt="noCurrency" draft="provisional">#,##0.00</pattern>
 				</currencyFormat>
 				<currencyFormat type="accounting">
 					<pattern>¤#,##0.00;(¤#,##0.00)</pattern>
diff --git a/make/data/cldr/common/main/ko_CN.xml b/make/data/cldr/common/main/ko_CN.xml
index 47217db9115..5099badce6c 100644
--- a/make/data/cldr/common/main/ko_CN.xml
+++ b/make/data/cldr/common/main/ko_CN.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/ko_KP.xml b/make/data/cldr/common/main/ko_KP.xml
index 888b2928e53..197086a2f04 100644
--- a/make/data/cldr/common/main/ko_KP.xml
+++ b/make/data/cldr/common/main/ko_KP.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/ko_KR.xml b/make/data/cldr/common/main/ko_KR.xml
index 087699e3d87..70d14dd0451 100644
--- a/make/data/cldr/common/main/ko_KR.xml
+++ b/make/data/cldr/common/main/ko_KR.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/kok.xml b/make/data/cldr/common/main/kok.xml
index 4e33acab233..061136411d8 100644
--- a/make/data/cldr/common/main/kok.xml
+++ b/make/data/cldr/common/main/kok.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/kok_Deva.xml b/make/data/cldr/common/main/kok_Deva.xml
index b60131657be..2a886560ed7 100644
--- a/make/data/cldr/common/main/kok_Deva.xml
+++ b/make/data/cldr/common/main/kok_Deva.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/kok_Deva_IN.xml b/make/data/cldr/common/main/kok_Deva_IN.xml
index 44cef1baffe..4f8f171c4e4 100644
--- a/make/data/cldr/common/main/kok_Deva_IN.xml
+++ b/make/data/cldr/common/main/kok_Deva_IN.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/kok_Latn.xml b/make/data/cldr/common/main/kok_Latn.xml
index db40552d17c..e7566ebdaaa 100644
--- a/make/data/cldr/common/main/kok_Latn.xml
+++ b/make/data/cldr/common/main/kok_Latn.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/kok_Latn_IN.xml b/make/data/cldr/common/main/kok_Latn_IN.xml
index ef922fa7dd8..bc85d4377f7 100644
--- a/make/data/cldr/common/main/kok_Latn_IN.xml
+++ b/make/data/cldr/common/main/kok_Latn_IN.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/kpe.xml b/make/data/cldr/common/main/kpe.xml
index 8bceeab6893..f8847650c17 100644
--- a/make/data/cldr/common/main/kpe.xml
+++ b/make/data/cldr/common/main/kpe.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/kpe_GN.xml b/make/data/cldr/common/main/kpe_GN.xml
index 520baa5999f..56317273ea7 100644
--- a/make/data/cldr/common/main/kpe_GN.xml
+++ b/make/data/cldr/common/main/kpe_GN.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/kpe_LR.xml b/make/data/cldr/common/main/kpe_LR.xml
index cf2c35b0450..915ce64b123 100644
--- a/make/data/cldr/common/main/kpe_LR.xml
+++ b/make/data/cldr/common/main/kpe_LR.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/ks.xml b/make/data/cldr/common/main/ks.xml
index 566c60c5071..5592cc9b897 100644
--- a/make/data/cldr/common/main/ks.xml
+++ b/make/data/cldr/common/main/ks.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/ks_Arab.xml b/make/data/cldr/common/main/ks_Arab.xml
index 2a340e770c1..4e1131c8bed 100644
--- a/make/data/cldr/common/main/ks_Arab.xml
+++ b/make/data/cldr/common/main/ks_Arab.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/ks_Arab_IN.xml b/make/data/cldr/common/main/ks_Arab_IN.xml
index 6edd11a8d28..1e3061d17d3 100644
--- a/make/data/cldr/common/main/ks_Arab_IN.xml
+++ b/make/data/cldr/common/main/ks_Arab_IN.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/ks_Deva.xml b/make/data/cldr/common/main/ks_Deva.xml
index 1b671388a2a..6cdc96cfc00 100644
--- a/make/data/cldr/common/main/ks_Deva.xml
+++ b/make/data/cldr/common/main/ks_Deva.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/ks_Deva_IN.xml b/make/data/cldr/common/main/ks_Deva_IN.xml
index 4227f7302fc..1932195541f 100644
--- a/make/data/cldr/common/main/ks_Deva_IN.xml
+++ b/make/data/cldr/common/main/ks_Deva_IN.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/ksb.xml b/make/data/cldr/common/main/ksb.xml
index f2df1369f13..6cfd664325a 100644
--- a/make/data/cldr/common/main/ksb.xml
+++ b/make/data/cldr/common/main/ksb.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/ksb_TZ.xml b/make/data/cldr/common/main/ksb_TZ.xml
index da76ac63cf1..702f02e956b 100644
--- a/make/data/cldr/common/main/ksb_TZ.xml
+++ b/make/data/cldr/common/main/ksb_TZ.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/ksf.xml b/make/data/cldr/common/main/ksf.xml
index 4b0c73375eb..d2f9e02e439 100644
--- a/make/data/cldr/common/main/ksf.xml
+++ b/make/data/cldr/common/main/ksf.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/ksf_CM.xml b/make/data/cldr/common/main/ksf_CM.xml
index 08ed3a551ae..20241a34f4f 100644
--- a/make/data/cldr/common/main/ksf_CM.xml
+++ b/make/data/cldr/common/main/ksf_CM.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/ksh.xml b/make/data/cldr/common/main/ksh.xml
index 2b680403e00..1e34fe41add 100644
--- a/make/data/cldr/common/main/ksh.xml
+++ b/make/data/cldr/common/main/ksh.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/ksh_DE.xml b/make/data/cldr/common/main/ksh_DE.xml
index b18a18bfc47..34e13631945 100644
--- a/make/data/cldr/common/main/ksh_DE.xml
+++ b/make/data/cldr/common/main/ksh_DE.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/ku.xml b/make/data/cldr/common/main/ku.xml
index d06613cbd9e..f9e1ec94a62 100644
--- a/make/data/cldr/common/main/ku.xml
+++ b/make/data/cldr/common/main/ku.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/ku_TR.xml b/make/data/cldr/common/main/ku_TR.xml
index 852a953e7a4..cccbcf7e75e 100644
--- a/make/data/cldr/common/main/ku_TR.xml
+++ b/make/data/cldr/common/main/ku_TR.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/kw.xml b/make/data/cldr/common/main/kw.xml
index 08ea8631d58..882ced8184e 100644
--- a/make/data/cldr/common/main/kw.xml
+++ b/make/data/cldr/common/main/kw.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/kw_GB.xml b/make/data/cldr/common/main/kw_GB.xml
index 271dc8fbdfd..0cdf43466e4 100644
--- a/make/data/cldr/common/main/kw_GB.xml
+++ b/make/data/cldr/common/main/kw_GB.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/kxv.xml b/make/data/cldr/common/main/kxv.xml
index 027b144fdeb..7a3a8b3b16f 100644
--- a/make/data/cldr/common/main/kxv.xml
+++ b/make/data/cldr/common/main/kxv.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/kxv_Deva.xml b/make/data/cldr/common/main/kxv_Deva.xml
index de14aea4c20..d777e1d7441 100644
--- a/make/data/cldr/common/main/kxv_Deva.xml
+++ b/make/data/cldr/common/main/kxv_Deva.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/kxv_Deva_IN.xml b/make/data/cldr/common/main/kxv_Deva_IN.xml
index 06f9b2a11ec..63f71570587 100644
--- a/make/data/cldr/common/main/kxv_Deva_IN.xml
+++ b/make/data/cldr/common/main/kxv_Deva_IN.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/kxv_Latn.xml b/make/data/cldr/common/main/kxv_Latn.xml
index d96d9162905..c8bd95a8866 100644
--- a/make/data/cldr/common/main/kxv_Latn.xml
+++ b/make/data/cldr/common/main/kxv_Latn.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/kxv_Latn_IN.xml b/make/data/cldr/common/main/kxv_Latn_IN.xml
index fb1044bcca8..45e58e6a2b7 100644
--- a/make/data/cldr/common/main/kxv_Latn_IN.xml
+++ b/make/data/cldr/common/main/kxv_Latn_IN.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/kxv_Orya.xml b/make/data/cldr/common/main/kxv_Orya.xml
index 13c2c599790..e44e4894aa1 100644
--- a/make/data/cldr/common/main/kxv_Orya.xml
+++ b/make/data/cldr/common/main/kxv_Orya.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/kxv_Orya_IN.xml b/make/data/cldr/common/main/kxv_Orya_IN.xml
index cedd119b862..39d13a9cc3d 100644
--- a/make/data/cldr/common/main/kxv_Orya_IN.xml
+++ b/make/data/cldr/common/main/kxv_Orya_IN.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/kxv_Telu.xml b/make/data/cldr/common/main/kxv_Telu.xml
index d8ea57b48e4..4a139f94b74 100644
--- a/make/data/cldr/common/main/kxv_Telu.xml
+++ b/make/data/cldr/common/main/kxv_Telu.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/kxv_Telu_IN.xml b/make/data/cldr/common/main/kxv_Telu_IN.xml
index efd968cf3d1..f8b3fcce8b6 100644
--- a/make/data/cldr/common/main/kxv_Telu_IN.xml
+++ b/make/data/cldr/common/main/kxv_Telu_IN.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/ky.xml b/make/data/cldr/common/main/ky.xml
index 35592fdb428..28c43627a3b 100644
--- a/make/data/cldr/common/main/ky.xml
+++ b/make/data/cldr/common/main/ky.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/ky_KG.xml b/make/data/cldr/common/main/ky_KG.xml
index ec1b189c382..e76aaf03da7 100644
--- a/make/data/cldr/common/main/ky_KG.xml
+++ b/make/data/cldr/common/main/ky_KG.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/la.xml b/make/data/cldr/common/main/la.xml
index ac6303dcfee..f3d9037b632 100644
--- a/make/data/cldr/common/main/la.xml
+++ b/make/data/cldr/common/main/la.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -24,7 +24,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<language type="az" draft="provisional">Atropatenica</language>
 			<language type="be" draft="provisional">Ruthenica Alba</language>
 			<language type="bg" draft="provisional">Bulgarica</language>
-			<language type="bh" draft="provisional">Bihari</language>
 			<language type="bn" draft="provisional">Bengalica</language>
 			<language type="bo" draft="provisional">Tibetana</language>
 			<language type="br" draft="provisional">Britonica</language>
@@ -58,20 +57,19 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<language type="gn" draft="provisional">Guaranica</language>
 			<language type="gu" draft="provisional">Gujaratensis</language>
 			<language type="gv" draft="provisional">Monensis</language>
+			<language type="he" draft="provisional">Hebraica</language>
 			<language type="hi" draft="provisional">Hindica</language>
 			<language type="hr" draft="provisional">Croatica</language>
 			<language type="ht" draft="provisional">Creolus Haitianus</language>
 			<language type="hu" draft="provisional">Hungarica</language>
 			<language type="hy" draft="provisional">Armenica</language>
 			<language type="ia" draft="provisional">Interlingua</language>
+			<language type="id" draft="provisional">Indonesia</language>
 			<language type="ie" draft="provisional">Interlingue</language>
 			<language type="ig" draft="provisional">Igbonica</language>
-			<language type="in" draft="provisional">Indonesia</language>
 			<language type="is" draft="provisional">Islandica</language>
 			<language type="it" draft="provisional">Italiana</language>
-			<language type="iw" draft="provisional">Hebraica</language>
 			<language type="ja" draft="provisional">Iaponica</language>
-			<language type="ji" draft="provisional">Iudaeogermanica</language>
 			<language type="jv" draft="provisional">Iavensis</language>
 			<language type="ka" draft="provisional">Georgiana</language>
 			<language type="kk" draft="provisional">Cazachica</language>
@@ -140,6 +138,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<language type="ur" draft="provisional">Urdu</language>
 			<language type="uz" draft="provisional">Uzbecica</language>
 			<language type="vi" draft="provisional">Vietnamica</language>
+			<language type="yi" draft="provisional">Iudaeogermanica</language>
 			<language type="zh" draft="provisional">Sinica</language>
 			<language type="zu" draft="provisional">Zuluana</language>
 		</languages>
@@ -213,7 +212,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<territory type="BR" draft="provisional">Brasilia</territory>
 			<territory type="BS" draft="provisional">Insulae Bahamenses</territory>
 			<territory type="BT" draft="provisional">Butania</territory>
-			<territory type="BU" draft="provisional">Birmania</territory>
 			<territory type="BV" draft="provisional">Insula Bouvet</territory>
 			<territory type="BW" draft="provisional">Botswana</territory>
 			<territory type="BY" draft="provisional">Ruthenia Alba</territory>
@@ -237,7 +235,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<territory type="CX" draft="provisional">Insula Christi Natalis</territory>
 			<territory type="CY" draft="provisional">Cyprus</territory>
 			<territory type="CZ" draft="provisional">Cechia</territory>
-			<territory type="DD" draft="provisional">Res publica Democratica Germanica</territory>
 			<territory type="DE" draft="provisional">Germania</territory>
 			<territory type="DJ" draft="provisional">Gibutum</territory>
 			<territory type="DK" draft="provisional">Dania</territory>
@@ -421,7 +418,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<territory type="XK" draft="provisional">Kosovia</territory>
 			<territory type="YE" draft="provisional">Iemenia</territory>
 			<territory type="YT" draft="provisional">Maiotta</territory>
-			<territory type="YU" draft="provisional">Iugoslavia</territory>
 			<territory type="ZA" draft="provisional">Africa Australis</territory>
 			<territory type="ZM" draft="provisional">Zambia</territory>
 			<territory type="ZW" draft="provisional">Zimbabua</territory>
diff --git a/make/data/cldr/common/main/la_VA.xml b/make/data/cldr/common/main/la_VA.xml
index 882936a2d11..1c2c032618f 100644
--- a/make/data/cldr/common/main/la_VA.xml
+++ b/make/data/cldr/common/main/la_VA.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/lag.xml b/make/data/cldr/common/main/lag.xml
index c24bb2857fe..64b5f53fffd 100644
--- a/make/data/cldr/common/main/lag.xml
+++ b/make/data/cldr/common/main/lag.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/lag_TZ.xml b/make/data/cldr/common/main/lag_TZ.xml
index bbada3821da..58b07945b05 100644
--- a/make/data/cldr/common/main/lag_TZ.xml
+++ b/make/data/cldr/common/main/lag_TZ.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/lb.xml b/make/data/cldr/common/main/lb.xml
index 8f97285338c..d2b14f0cd92 100644
--- a/make/data/cldr/common/main/lb.xml
+++ b/make/data/cldr/common/main/lb.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/lb_LU.xml b/make/data/cldr/common/main/lb_LU.xml
index 80db736f391..6fbdc876580 100644
--- a/make/data/cldr/common/main/lb_LU.xml
+++ b/make/data/cldr/common/main/lb_LU.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/lg.xml b/make/data/cldr/common/main/lg.xml
index 968e74f542d..e7808653808 100644
--- a/make/data/cldr/common/main/lg.xml
+++ b/make/data/cldr/common/main/lg.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/lg_UG.xml b/make/data/cldr/common/main/lg_UG.xml
index cb4923685dd..e86ac33a6d0 100644
--- a/make/data/cldr/common/main/lg_UG.xml
+++ b/make/data/cldr/common/main/lg_UG.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/lij.xml b/make/data/cldr/common/main/lij.xml
index a92575e8b64..87513dfd5e8 100644
--- a/make/data/cldr/common/main/lij.xml
+++ b/make/data/cldr/common/main/lij.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/lij_IT.xml b/make/data/cldr/common/main/lij_IT.xml
index 4481b5e5d41..dbe99b11109 100644
--- a/make/data/cldr/common/main/lij_IT.xml
+++ b/make/data/cldr/common/main/lij_IT.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/lkt.xml b/make/data/cldr/common/main/lkt.xml
index 7dbe08b1c0d..2faf814f838 100644
--- a/make/data/cldr/common/main/lkt.xml
+++ b/make/data/cldr/common/main/lkt.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/lkt_US.xml b/make/data/cldr/common/main/lkt_US.xml
index 4351b161d3f..d54e64c97ae 100644
--- a/make/data/cldr/common/main/lkt_US.xml
+++ b/make/data/cldr/common/main/lkt_US.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/lld.xml b/make/data/cldr/common/main/lld.xml
index c16a51f45fd..7fa1cff49b1 100644
--- a/make/data/cldr/common/main/lld.xml
+++ b/make/data/cldr/common/main/lld.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/lld_IT.xml b/make/data/cldr/common/main/lld_IT.xml
index 997a460bcf4..e8eb5869048 100644
--- a/make/data/cldr/common/main/lld_IT.xml
+++ b/make/data/cldr/common/main/lld_IT.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/lmo.xml b/make/data/cldr/common/main/lmo.xml
index b50fb89c66b..039d6c5ae3d 100644
--- a/make/data/cldr/common/main/lmo.xml
+++ b/make/data/cldr/common/main/lmo.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/lmo_IT.xml b/make/data/cldr/common/main/lmo_IT.xml
index 6f3d11658bc..61c6eb25eca 100644
--- a/make/data/cldr/common/main/lmo_IT.xml
+++ b/make/data/cldr/common/main/lmo_IT.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/ln.xml b/make/data/cldr/common/main/ln.xml
index 6f6222fad2a..ad0c686e849 100644
--- a/make/data/cldr/common/main/ln.xml
+++ b/make/data/cldr/common/main/ln.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/ln_AO.xml b/make/data/cldr/common/main/ln_AO.xml
index 09b1c3d2ea4..695360e84d3 100644
--- a/make/data/cldr/common/main/ln_AO.xml
+++ b/make/data/cldr/common/main/ln_AO.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/ln_CD.xml b/make/data/cldr/common/main/ln_CD.xml
index 7d2f2b7ed93..a768b6dc009 100644
--- a/make/data/cldr/common/main/ln_CD.xml
+++ b/make/data/cldr/common/main/ln_CD.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/ln_CF.xml b/make/data/cldr/common/main/ln_CF.xml
index 694908121f5..1c03dad445b 100644
--- a/make/data/cldr/common/main/ln_CF.xml
+++ b/make/data/cldr/common/main/ln_CF.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/ln_CG.xml b/make/data/cldr/common/main/ln_CG.xml
index 51c8a9a07f8..03e35f0903d 100644
--- a/make/data/cldr/common/main/ln_CG.xml
+++ b/make/data/cldr/common/main/ln_CG.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/lo.xml b/make/data/cldr/common/main/lo.xml
index 1f9337282ae..9c80f01c584 100644
--- a/make/data/cldr/common/main/lo.xml
+++ b/make/data/cldr/common/main/lo.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/lo_LA.xml b/make/data/cldr/common/main/lo_LA.xml
index 3bb8132ccca..89f1aca3ad2 100644
--- a/make/data/cldr/common/main/lo_LA.xml
+++ b/make/data/cldr/common/main/lo_LA.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/lrc.xml b/make/data/cldr/common/main/lrc.xml
index 93aac31823a..8a554ea4ce4 100644
--- a/make/data/cldr/common/main/lrc.xml
+++ b/make/data/cldr/common/main/lrc.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/lrc_IQ.xml b/make/data/cldr/common/main/lrc_IQ.xml
index 28c931d4b5b..45bec039f39 100644
--- a/make/data/cldr/common/main/lrc_IQ.xml
+++ b/make/data/cldr/common/main/lrc_IQ.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/lrc_IR.xml b/make/data/cldr/common/main/lrc_IR.xml
index ba23a13e760..41c8b8219bb 100644
--- a/make/data/cldr/common/main/lrc_IR.xml
+++ b/make/data/cldr/common/main/lrc_IR.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/lt.xml b/make/data/cldr/common/main/lt.xml
index 3a9bf521049..d6f1f79b788 100644
--- a/make/data/cldr/common/main/lt.xml
+++ b/make/data/cldr/common/main/lt.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/lt_LT.xml b/make/data/cldr/common/main/lt_LT.xml
index 0d971009e4c..08968640d92 100644
--- a/make/data/cldr/common/main/lt_LT.xml
+++ b/make/data/cldr/common/main/lt_LT.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/ltg.xml b/make/data/cldr/common/main/ltg.xml
index 88bd51e61a7..586cd716bee 100644
--- a/make/data/cldr/common/main/ltg.xml
+++ b/make/data/cldr/common/main/ltg.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/ltg_LV.xml b/make/data/cldr/common/main/ltg_LV.xml
index f3be553096f..c0e80704e33 100644
--- a/make/data/cldr/common/main/ltg_LV.xml
+++ b/make/data/cldr/common/main/ltg_LV.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/lu.xml b/make/data/cldr/common/main/lu.xml
index 94e964dd36f..ef02991e5a4 100644
--- a/make/data/cldr/common/main/lu.xml
+++ b/make/data/cldr/common/main/lu.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/lu_CD.xml b/make/data/cldr/common/main/lu_CD.xml
index 826ad6749cd..393f4d8a904 100644
--- a/make/data/cldr/common/main/lu_CD.xml
+++ b/make/data/cldr/common/main/lu_CD.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/luo.xml b/make/data/cldr/common/main/luo.xml
index b60480e457a..f80fe2f0333 100644
--- a/make/data/cldr/common/main/luo.xml
+++ b/make/data/cldr/common/main/luo.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/luo_KE.xml b/make/data/cldr/common/main/luo_KE.xml
index 053db7388d7..7f1e053f28f 100644
--- a/make/data/cldr/common/main/luo_KE.xml
+++ b/make/data/cldr/common/main/luo_KE.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/luy.xml b/make/data/cldr/common/main/luy.xml
index a3ec56ed28f..8e35dab092f 100644
--- a/make/data/cldr/common/main/luy.xml
+++ b/make/data/cldr/common/main/luy.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/luy_KE.xml b/make/data/cldr/common/main/luy_KE.xml
index e5b25757a59..0a48841d5a5 100644
--- a/make/data/cldr/common/main/luy_KE.xml
+++ b/make/data/cldr/common/main/luy_KE.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/lv.xml b/make/data/cldr/common/main/lv.xml
index 17c90c6336b..cdba3533df3 100644
--- a/make/data/cldr/common/main/lv.xml
+++ b/make/data/cldr/common/main/lv.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/lv_LV.xml b/make/data/cldr/common/main/lv_LV.xml
index 722169e2367..cf5d7490052 100644
--- a/make/data/cldr/common/main/lv_LV.xml
+++ b/make/data/cldr/common/main/lv_LV.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/mai.xml b/make/data/cldr/common/main/mai.xml
index a6aec70c7bf..beaf8294757 100644
--- a/make/data/cldr/common/main/mai.xml
+++ b/make/data/cldr/common/main/mai.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/mai_IN.xml b/make/data/cldr/common/main/mai_IN.xml
index 5723c4896b9..ddb75ca66c4 100644
--- a/make/data/cldr/common/main/mai_IN.xml
+++ b/make/data/cldr/common/main/mai_IN.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/mas.xml b/make/data/cldr/common/main/mas.xml
index 3c9a16ba879..352344fc65a 100644
--- a/make/data/cldr/common/main/mas.xml
+++ b/make/data/cldr/common/main/mas.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/mas_KE.xml b/make/data/cldr/common/main/mas_KE.xml
index 8fd05e37ceb..75d0935fccb 100644
--- a/make/data/cldr/common/main/mas_KE.xml
+++ b/make/data/cldr/common/main/mas_KE.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/mas_TZ.xml b/make/data/cldr/common/main/mas_TZ.xml
index 9614975030f..f85dd2fdeeb 100644
--- a/make/data/cldr/common/main/mas_TZ.xml
+++ b/make/data/cldr/common/main/mas_TZ.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/mdf.xml b/make/data/cldr/common/main/mdf.xml
index 23a1e567eab..336a810738e 100644
--- a/make/data/cldr/common/main/mdf.xml
+++ b/make/data/cldr/common/main/mdf.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/mdf_RU.xml b/make/data/cldr/common/main/mdf_RU.xml
index 63f14c8e264..6d536e8ffea 100644
--- a/make/data/cldr/common/main/mdf_RU.xml
+++ b/make/data/cldr/common/main/mdf_RU.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/mer.xml b/make/data/cldr/common/main/mer.xml
index d4bcbd8c1eb..7822d43e590 100644
--- a/make/data/cldr/common/main/mer.xml
+++ b/make/data/cldr/common/main/mer.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/mer_KE.xml b/make/data/cldr/common/main/mer_KE.xml
index 6a9bf6854df..fb9c6362281 100644
--- a/make/data/cldr/common/main/mer_KE.xml
+++ b/make/data/cldr/common/main/mer_KE.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/mfe.xml b/make/data/cldr/common/main/mfe.xml
index a7c8df749a7..a97a5d27155 100644
--- a/make/data/cldr/common/main/mfe.xml
+++ b/make/data/cldr/common/main/mfe.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/mfe_MU.xml b/make/data/cldr/common/main/mfe_MU.xml
index bc6821ba085..8f3e261051e 100644
--- a/make/data/cldr/common/main/mfe_MU.xml
+++ b/make/data/cldr/common/main/mfe_MU.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/mg.xml b/make/data/cldr/common/main/mg.xml
index 0174d0ea16a..10fc10235e5 100644
--- a/make/data/cldr/common/main/mg.xml
+++ b/make/data/cldr/common/main/mg.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/mg_MG.xml b/make/data/cldr/common/main/mg_MG.xml
index fc8aa9874fd..2de01472543 100644
--- a/make/data/cldr/common/main/mg_MG.xml
+++ b/make/data/cldr/common/main/mg_MG.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/mgh.xml b/make/data/cldr/common/main/mgh.xml
index 5799a350ee5..e57bb2f5425 100644
--- a/make/data/cldr/common/main/mgh.xml
+++ b/make/data/cldr/common/main/mgh.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/mgh_MZ.xml b/make/data/cldr/common/main/mgh_MZ.xml
index c220df1088f..7d04401e50c 100644
--- a/make/data/cldr/common/main/mgh_MZ.xml
+++ b/make/data/cldr/common/main/mgh_MZ.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/mgo.xml b/make/data/cldr/common/main/mgo.xml
index e75e0804623..b3dfb5c492f 100644
--- a/make/data/cldr/common/main/mgo.xml
+++ b/make/data/cldr/common/main/mgo.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/mgo_CM.xml b/make/data/cldr/common/main/mgo_CM.xml
index 493705ed806..20be98cb5bd 100644
--- a/make/data/cldr/common/main/mgo_CM.xml
+++ b/make/data/cldr/common/main/mgo_CM.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/mhn.xml b/make/data/cldr/common/main/mhn.xml
index f1220801953..7e8916f400e 100644
--- a/make/data/cldr/common/main/mhn.xml
+++ b/make/data/cldr/common/main/mhn.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/mhn_IT.xml b/make/data/cldr/common/main/mhn_IT.xml
index a3ab1373298..783381acddf 100644
--- a/make/data/cldr/common/main/mhn_IT.xml
+++ b/make/data/cldr/common/main/mhn_IT.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/mi.xml b/make/data/cldr/common/main/mi.xml
index 5f32c630f23..c6ab2b52789 100644
--- a/make/data/cldr/common/main/mi.xml
+++ b/make/data/cldr/common/main/mi.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/mi_NZ.xml b/make/data/cldr/common/main/mi_NZ.xml
index 93e252d8726..84e6ac643bf 100644
--- a/make/data/cldr/common/main/mi_NZ.xml
+++ b/make/data/cldr/common/main/mi_NZ.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/mic.xml b/make/data/cldr/common/main/mic.xml
index 55f82bd7442..4cb5b021cb7 100644
--- a/make/data/cldr/common/main/mic.xml
+++ b/make/data/cldr/common/main/mic.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/mic_CA.xml b/make/data/cldr/common/main/mic_CA.xml
index cbe2e9e703b..bd4f2177e5d 100644
--- a/make/data/cldr/common/main/mic_CA.xml
+++ b/make/data/cldr/common/main/mic_CA.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/mk.xml b/make/data/cldr/common/main/mk.xml
index 590aaf380f2..33d31fa0067 100644
--- a/make/data/cldr/common/main/mk.xml
+++ b/make/data/cldr/common/main/mk.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/mk_MK.xml b/make/data/cldr/common/main/mk_MK.xml
index 2921dd641b5..cdd4e83df2f 100644
--- a/make/data/cldr/common/main/mk_MK.xml
+++ b/make/data/cldr/common/main/mk_MK.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/ml.xml b/make/data/cldr/common/main/ml.xml
index ff6deca0b01..1be91580838 100644
--- a/make/data/cldr/common/main/ml.xml
+++ b/make/data/cldr/common/main/ml.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/ml_IN.xml b/make/data/cldr/common/main/ml_IN.xml
index 1cfb17d6fbb..efcb729ff0f 100644
--- a/make/data/cldr/common/main/ml_IN.xml
+++ b/make/data/cldr/common/main/ml_IN.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/mn.xml b/make/data/cldr/common/main/mn.xml
index d170cd28ba3..c2ef8bb91ce 100644
--- a/make/data/cldr/common/main/mn.xml
+++ b/make/data/cldr/common/main/mn.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/mn_MN.xml b/make/data/cldr/common/main/mn_MN.xml
index 4a2f173ca58..a81682884d1 100644
--- a/make/data/cldr/common/main/mn_MN.xml
+++ b/make/data/cldr/common/main/mn_MN.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/mn_Mong.xml b/make/data/cldr/common/main/mn_Mong.xml
index 252ac0d5a1a..2bb7cd403f6 100644
--- a/make/data/cldr/common/main/mn_Mong.xml
+++ b/make/data/cldr/common/main/mn_Mong.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/mn_Mong_CN.xml b/make/data/cldr/common/main/mn_Mong_CN.xml
index 84aa98185f0..a969e80ae6c 100644
--- a/make/data/cldr/common/main/mn_Mong_CN.xml
+++ b/make/data/cldr/common/main/mn_Mong_CN.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/mn_Mong_MN.xml b/make/data/cldr/common/main/mn_Mong_MN.xml
index 187e493c3a5..aab5134fcdc 100644
--- a/make/data/cldr/common/main/mn_Mong_MN.xml
+++ b/make/data/cldr/common/main/mn_Mong_MN.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/mni.xml b/make/data/cldr/common/main/mni.xml
index 345427427f6..1f431fbd609 100644
--- a/make/data/cldr/common/main/mni.xml
+++ b/make/data/cldr/common/main/mni.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/mni_Beng.xml b/make/data/cldr/common/main/mni_Beng.xml
index 9efb5c5a59c..df904dc4da2 100644
--- a/make/data/cldr/common/main/mni_Beng.xml
+++ b/make/data/cldr/common/main/mni_Beng.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/mni_Beng_IN.xml b/make/data/cldr/common/main/mni_Beng_IN.xml
index bf54e2ee0b5..4d2c462d25d 100644
--- a/make/data/cldr/common/main/mni_Beng_IN.xml
+++ b/make/data/cldr/common/main/mni_Beng_IN.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/mni_Mtei.xml b/make/data/cldr/common/main/mni_Mtei.xml
index c3f491dffb6..50e0a3cb82d 100644
--- a/make/data/cldr/common/main/mni_Mtei.xml
+++ b/make/data/cldr/common/main/mni_Mtei.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/mni_Mtei_IN.xml b/make/data/cldr/common/main/mni_Mtei_IN.xml
index 7691ca713f2..3c461af8819 100644
--- a/make/data/cldr/common/main/mni_Mtei_IN.xml
+++ b/make/data/cldr/common/main/mni_Mtei_IN.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/moh.xml b/make/data/cldr/common/main/moh.xml
index 13db5330ce9..af9eed4d003 100644
--- a/make/data/cldr/common/main/moh.xml
+++ b/make/data/cldr/common/main/moh.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/moh_CA.xml b/make/data/cldr/common/main/moh_CA.xml
index 9f977507b81..f84d32c868d 100644
--- a/make/data/cldr/common/main/moh_CA.xml
+++ b/make/data/cldr/common/main/moh_CA.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/mr.xml b/make/data/cldr/common/main/mr.xml
index 27186ff06c0..d5548854883 100644
--- a/make/data/cldr/common/main/mr.xml
+++ b/make/data/cldr/common/main/mr.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -4777,6 +4777,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<currencyFormat type="standard">
 					<pattern>¤#,##0.00</pattern>
 					<pattern alt="alphaNextToNumber" draft="provisional">¤ #,##0.00</pattern>
+					<pattern alt="noCurrency" draft="provisional">#,##0.00</pattern>
 				</currencyFormat>
 				<currencyFormat type="accounting">
 					<pattern>¤#,##0.00;(¤#,##0.00)</pattern>
diff --git a/make/data/cldr/common/main/mr_IN.xml b/make/data/cldr/common/main/mr_IN.xml
index f21c66363d5..456a0a645dc 100644
--- a/make/data/cldr/common/main/mr_IN.xml
+++ b/make/data/cldr/common/main/mr_IN.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/ms.xml b/make/data/cldr/common/main/ms.xml
index 501ceb897f8..01eb22f39a7 100644
--- a/make/data/cldr/common/main/ms.xml
+++ b/make/data/cldr/common/main/ms.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -3554,6 +3554,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<currencyFormat type="standard">
 					<pattern>¤#,##0.00</pattern>
 					<pattern alt="alphaNextToNumber" draft="provisional">¤ #,##0.00</pattern>
+					<pattern alt="noCurrency" draft="provisional">#,##0.00</pattern>
 				</currencyFormat>
 				<currencyFormat type="accounting">
 					<pattern>¤#,##0.00;(¤#,##0.00)</pattern>
diff --git a/make/data/cldr/common/main/ms_Arab.xml b/make/data/cldr/common/main/ms_Arab.xml
index 0db76dd7e2a..ce88331ca6f 100644
--- a/make/data/cldr/common/main/ms_Arab.xml
+++ b/make/data/cldr/common/main/ms_Arab.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/ms_Arab_BN.xml b/make/data/cldr/common/main/ms_Arab_BN.xml
index 03b60d8dc3a..8409a7d00a4 100644
--- a/make/data/cldr/common/main/ms_Arab_BN.xml
+++ b/make/data/cldr/common/main/ms_Arab_BN.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/ms_Arab_MY.xml b/make/data/cldr/common/main/ms_Arab_MY.xml
index bddd3315cb2..3cc37452c4a 100644
--- a/make/data/cldr/common/main/ms_Arab_MY.xml
+++ b/make/data/cldr/common/main/ms_Arab_MY.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/ms_BN.xml b/make/data/cldr/common/main/ms_BN.xml
index d156f483167..f378ed80454 100644
--- a/make/data/cldr/common/main/ms_BN.xml
+++ b/make/data/cldr/common/main/ms_BN.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/ms_ID.xml b/make/data/cldr/common/main/ms_ID.xml
index 0ca7f5756c9..ab851e9d290 100644
--- a/make/data/cldr/common/main/ms_ID.xml
+++ b/make/data/cldr/common/main/ms_ID.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/ms_MY.xml b/make/data/cldr/common/main/ms_MY.xml
index dda1253cdb5..0b556bbb525 100644
--- a/make/data/cldr/common/main/ms_MY.xml
+++ b/make/data/cldr/common/main/ms_MY.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/ms_SG.xml b/make/data/cldr/common/main/ms_SG.xml
index f799e1eef9e..076dfc67f7c 100644
--- a/make/data/cldr/common/main/ms_SG.xml
+++ b/make/data/cldr/common/main/ms_SG.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/mt.xml b/make/data/cldr/common/main/mt.xml
index 21a937ed4e8..df9ca3a1f79 100644
--- a/make/data/cldr/common/main/mt.xml
+++ b/make/data/cldr/common/main/mt.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/mt_MT.xml b/make/data/cldr/common/main/mt_MT.xml
index b58fe9e5526..1ef46fb477c 100644
--- a/make/data/cldr/common/main/mt_MT.xml
+++ b/make/data/cldr/common/main/mt_MT.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/mua.xml b/make/data/cldr/common/main/mua.xml
index da45b0d679b..3c4d413b460 100644
--- a/make/data/cldr/common/main/mua.xml
+++ b/make/data/cldr/common/main/mua.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/mua_CM.xml b/make/data/cldr/common/main/mua_CM.xml
index caad2d7cc70..26847725dc7 100644
--- a/make/data/cldr/common/main/mua_CM.xml
+++ b/make/data/cldr/common/main/mua_CM.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/mus.xml b/make/data/cldr/common/main/mus.xml
index c25ac4b0d9a..e34b47c47cb 100644
--- a/make/data/cldr/common/main/mus.xml
+++ b/make/data/cldr/common/main/mus.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/mus_US.xml b/make/data/cldr/common/main/mus_US.xml
index 3c4734e80a6..ae225b6b5b4 100644
--- a/make/data/cldr/common/main/mus_US.xml
+++ b/make/data/cldr/common/main/mus_US.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/my.xml b/make/data/cldr/common/main/my.xml
index 360e5e56301..42aab30f35a 100644
--- a/make/data/cldr/common/main/my.xml
+++ b/make/data/cldr/common/main/my.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/my_MM.xml b/make/data/cldr/common/main/my_MM.xml
index e55a9021df1..3995e1b68c8 100644
--- a/make/data/cldr/common/main/my_MM.xml
+++ b/make/data/cldr/common/main/my_MM.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/myv.xml b/make/data/cldr/common/main/myv.xml
index 58c41e016ae..010ca7d694c 100644
--- a/make/data/cldr/common/main/myv.xml
+++ b/make/data/cldr/common/main/myv.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/myv_RU.xml b/make/data/cldr/common/main/myv_RU.xml
index d14f2711c19..0fc2e373653 100644
--- a/make/data/cldr/common/main/myv_RU.xml
+++ b/make/data/cldr/common/main/myv_RU.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/mzn.xml b/make/data/cldr/common/main/mzn.xml
index 599f5d52656..26520ef58b0 100644
--- a/make/data/cldr/common/main/mzn.xml
+++ b/make/data/cldr/common/main/mzn.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/mzn_IR.xml b/make/data/cldr/common/main/mzn_IR.xml
index 86f4ea58065..b52f5580ad6 100644
--- a/make/data/cldr/common/main/mzn_IR.xml
+++ b/make/data/cldr/common/main/mzn_IR.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/naq.xml b/make/data/cldr/common/main/naq.xml
index de8df9f5c99..5c83223d90c 100644
--- a/make/data/cldr/common/main/naq.xml
+++ b/make/data/cldr/common/main/naq.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/naq_NA.xml b/make/data/cldr/common/main/naq_NA.xml
index cfc526d85fb..6c1cd685efa 100644
--- a/make/data/cldr/common/main/naq_NA.xml
+++ b/make/data/cldr/common/main/naq_NA.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/nb.xml b/make/data/cldr/common/main/nb.xml
index e976bed763b..076cc216289 100644
--- a/make/data/cldr/common/main/nb.xml
+++ b/make/data/cldr/common/main/nb.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/nb_NO.xml b/make/data/cldr/common/main/nb_NO.xml
index 884d9ab3fec..ed94db888ef 100644
--- a/make/data/cldr/common/main/nb_NO.xml
+++ b/make/data/cldr/common/main/nb_NO.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/nb_SJ.xml b/make/data/cldr/common/main/nb_SJ.xml
index c4a140911c4..0fbd4116882 100644
--- a/make/data/cldr/common/main/nb_SJ.xml
+++ b/make/data/cldr/common/main/nb_SJ.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/nd.xml b/make/data/cldr/common/main/nd.xml
index 090794fb3fa..6ffc75256b7 100644
--- a/make/data/cldr/common/main/nd.xml
+++ b/make/data/cldr/common/main/nd.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/nd_ZW.xml b/make/data/cldr/common/main/nd_ZW.xml
index 11463f23aa7..7bf620aa7b0 100644
--- a/make/data/cldr/common/main/nd_ZW.xml
+++ b/make/data/cldr/common/main/nd_ZW.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/nds.xml b/make/data/cldr/common/main/nds.xml
index 9f827f0337d..b4f1e03f66c 100644
--- a/make/data/cldr/common/main/nds.xml
+++ b/make/data/cldr/common/main/nds.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/nds_DE.xml b/make/data/cldr/common/main/nds_DE.xml
index b8080c1b38f..361277d3786 100644
--- a/make/data/cldr/common/main/nds_DE.xml
+++ b/make/data/cldr/common/main/nds_DE.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/nds_NL.xml b/make/data/cldr/common/main/nds_NL.xml
index c8b33f0cbb9..2b31df45a64 100644
--- a/make/data/cldr/common/main/nds_NL.xml
+++ b/make/data/cldr/common/main/nds_NL.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/ne.xml b/make/data/cldr/common/main/ne.xml
index 86c770993f8..0ef08650f30 100644
--- a/make/data/cldr/common/main/ne.xml
+++ b/make/data/cldr/common/main/ne.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/ne_IN.xml b/make/data/cldr/common/main/ne_IN.xml
index 3f6a9afd5b2..fef7d29d281 100644
--- a/make/data/cldr/common/main/ne_IN.xml
+++ b/make/data/cldr/common/main/ne_IN.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/ne_NP.xml b/make/data/cldr/common/main/ne_NP.xml
index 47c6ac59d74..9dca2a1363d 100644
--- a/make/data/cldr/common/main/ne_NP.xml
+++ b/make/data/cldr/common/main/ne_NP.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/nl.xml b/make/data/cldr/common/main/nl.xml
index fc9b9ec7ac5..1de3fa015a9 100644
--- a/make/data/cldr/common/main/nl.xml
+++ b/make/data/cldr/common/main/nl.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -26,7 +26,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<language type="afh">Afrihili</language>
 			<language type="agq">Aghem</language>
 			<language type="ain">Aino</language>
-			<language type="ajp" draft="contributed">Zuid-Levantijns-Arabisch</language>
 			<language type="ak">Akan</language>
 			<language type="akk">Akkadisch</language>
 			<language type="akz">Alabama</language>
@@ -4936,6 +4935,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<currencyFormatLength>
 				<currencyFormat type="standard">
 					<pattern>¤ #,##0.00;¤ -#,##0.00</pattern>
+					<pattern alt="noCurrency" draft="contributed">#,##0.00</pattern>
 				</currencyFormat>
 				<currencyFormat type="accounting">
 					<pattern>¤ #,##0.00;(¤ #,##0.00)</pattern>
diff --git a/make/data/cldr/common/main/nl_AW.xml b/make/data/cldr/common/main/nl_AW.xml
index e48888a9432..723499a2f3c 100644
--- a/make/data/cldr/common/main/nl_AW.xml
+++ b/make/data/cldr/common/main/nl_AW.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/nl_BE.xml b/make/data/cldr/common/main/nl_BE.xml
index 36e44b41bc0..9750c44df94 100644
--- a/make/data/cldr/common/main/nl_BE.xml
+++ b/make/data/cldr/common/main/nl_BE.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/nl_BQ.xml b/make/data/cldr/common/main/nl_BQ.xml
index fb89bec8b13..7c0d982631b 100644
--- a/make/data/cldr/common/main/nl_BQ.xml
+++ b/make/data/cldr/common/main/nl_BQ.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/nl_CW.xml b/make/data/cldr/common/main/nl_CW.xml
index 11c3f1a2f65..799a61642b4 100644
--- a/make/data/cldr/common/main/nl_CW.xml
+++ b/make/data/cldr/common/main/nl_CW.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/nl_NL.xml b/make/data/cldr/common/main/nl_NL.xml
index 1a40318fdf1..0f9fedd079b 100644
--- a/make/data/cldr/common/main/nl_NL.xml
+++ b/make/data/cldr/common/main/nl_NL.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/nl_SR.xml b/make/data/cldr/common/main/nl_SR.xml
index c3ae94252dd..13f926561bd 100644
--- a/make/data/cldr/common/main/nl_SR.xml
+++ b/make/data/cldr/common/main/nl_SR.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/nl_SX.xml b/make/data/cldr/common/main/nl_SX.xml
index e750bc82886..1e4f8aee7fc 100644
--- a/make/data/cldr/common/main/nl_SX.xml
+++ b/make/data/cldr/common/main/nl_SX.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/nmg.xml b/make/data/cldr/common/main/nmg.xml
index 1b0e1530bd7..b3caea650a8 100644
--- a/make/data/cldr/common/main/nmg.xml
+++ b/make/data/cldr/common/main/nmg.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/nmg_CM.xml b/make/data/cldr/common/main/nmg_CM.xml
index 7cdc4c81e89..8a81ce13b00 100644
--- a/make/data/cldr/common/main/nmg_CM.xml
+++ b/make/data/cldr/common/main/nmg_CM.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/nn.xml b/make/data/cldr/common/main/nn.xml
index 46e6d522bee..781763020eb 100644
--- a/make/data/cldr/common/main/nn.xml
+++ b/make/data/cldr/common/main/nn.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/nn_NO.xml b/make/data/cldr/common/main/nn_NO.xml
index 8d15a18fed9..596363e0405 100644
--- a/make/data/cldr/common/main/nn_NO.xml
+++ b/make/data/cldr/common/main/nn_NO.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/nnh.xml b/make/data/cldr/common/main/nnh.xml
index 9d7b4ab82e1..8956e801350 100644
--- a/make/data/cldr/common/main/nnh.xml
+++ b/make/data/cldr/common/main/nnh.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/nnh_CM.xml b/make/data/cldr/common/main/nnh_CM.xml
index e4be7d0bed3..fd27154bec8 100644
--- a/make/data/cldr/common/main/nnh_CM.xml
+++ b/make/data/cldr/common/main/nnh_CM.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/no.xml b/make/data/cldr/common/main/no.xml
index 45b1615d26a..6f4c4cd9c0e 100644
--- a/make/data/cldr/common/main/no.xml
+++ b/make/data/cldr/common/main/no.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -4767,6 +4767,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<currencyFormatLength>
 				<currencyFormat type="standard">
 					<pattern>#,##0.00 ¤;-#,##0.00 ¤</pattern>
+					<pattern alt="noCurrency" draft="provisional">#,##0.00</pattern>
 				</currencyFormat>
 				<currencyFormat type="accounting">
 					<pattern>¤ #,##0.00;(¤ #,##0.00)</pattern>
diff --git a/make/data/cldr/common/main/nqo.xml b/make/data/cldr/common/main/nqo.xml
index 1d3c603e210..035bcb49c1b 100644
--- a/make/data/cldr/common/main/nqo.xml
+++ b/make/data/cldr/common/main/nqo.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/nqo_GN.xml b/make/data/cldr/common/main/nqo_GN.xml
index 18820b62e57..67b7fd446db 100644
--- a/make/data/cldr/common/main/nqo_GN.xml
+++ b/make/data/cldr/common/main/nqo_GN.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/nr.xml b/make/data/cldr/common/main/nr.xml
index 12f2badb7a9..0fd3bbba6bd 100644
--- a/make/data/cldr/common/main/nr.xml
+++ b/make/data/cldr/common/main/nr.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/nr_ZA.xml b/make/data/cldr/common/main/nr_ZA.xml
index a3d30e250b9..ba85620212a 100644
--- a/make/data/cldr/common/main/nr_ZA.xml
+++ b/make/data/cldr/common/main/nr_ZA.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/nso.xml b/make/data/cldr/common/main/nso.xml
index 630aa9ecd8f..83e2ad877e0 100644
--- a/make/data/cldr/common/main/nso.xml
+++ b/make/data/cldr/common/main/nso.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/nso_ZA.xml b/make/data/cldr/common/main/nso_ZA.xml
index dcb283d3b2c..0e5f04cdb2c 100644
--- a/make/data/cldr/common/main/nso_ZA.xml
+++ b/make/data/cldr/common/main/nso_ZA.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/nus.xml b/make/data/cldr/common/main/nus.xml
index fef478634ee..e7f97fc5867 100644
--- a/make/data/cldr/common/main/nus.xml
+++ b/make/data/cldr/common/main/nus.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/nus_SS.xml b/make/data/cldr/common/main/nus_SS.xml
index 8aa24a11103..ebcc01308de 100644
--- a/make/data/cldr/common/main/nus_SS.xml
+++ b/make/data/cldr/common/main/nus_SS.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/nv.xml b/make/data/cldr/common/main/nv.xml
index 311f0fa810b..dc1a5170702 100644
--- a/make/data/cldr/common/main/nv.xml
+++ b/make/data/cldr/common/main/nv.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/nv_US.xml b/make/data/cldr/common/main/nv_US.xml
index 09914927cd4..2f61e108eff 100644
--- a/make/data/cldr/common/main/nv_US.xml
+++ b/make/data/cldr/common/main/nv_US.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/ny.xml b/make/data/cldr/common/main/ny.xml
index 54f19ee0fd1..af33350a56c 100644
--- a/make/data/cldr/common/main/ny.xml
+++ b/make/data/cldr/common/main/ny.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/ny_MW.xml b/make/data/cldr/common/main/ny_MW.xml
index e8ac1b7925a..5836ffed2ed 100644
--- a/make/data/cldr/common/main/ny_MW.xml
+++ b/make/data/cldr/common/main/ny_MW.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/nyn.xml b/make/data/cldr/common/main/nyn.xml
index cdb3cc3aa85..9a1cda05518 100644
--- a/make/data/cldr/common/main/nyn.xml
+++ b/make/data/cldr/common/main/nyn.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/nyn_UG.xml b/make/data/cldr/common/main/nyn_UG.xml
index 0594d79bfe9..6c3c9c914c9 100644
--- a/make/data/cldr/common/main/nyn_UG.xml
+++ b/make/data/cldr/common/main/nyn_UG.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/oc.xml b/make/data/cldr/common/main/oc.xml
index ad78fdf64a5..869bf9b9931 100644
--- a/make/data/cldr/common/main/oc.xml
+++ b/make/data/cldr/common/main/oc.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/oc_ES.xml b/make/data/cldr/common/main/oc_ES.xml
index 13df9cb8a5a..df686405e32 100644
--- a/make/data/cldr/common/main/oc_ES.xml
+++ b/make/data/cldr/common/main/oc_ES.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/oc_FR.xml b/make/data/cldr/common/main/oc_FR.xml
index 6018774650a..21763f08ae0 100644
--- a/make/data/cldr/common/main/oc_FR.xml
+++ b/make/data/cldr/common/main/oc_FR.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/om.xml b/make/data/cldr/common/main/om.xml
index 56921842657..6416d60b7c5 100644
--- a/make/data/cldr/common/main/om.xml
+++ b/make/data/cldr/common/main/om.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/om_ET.xml b/make/data/cldr/common/main/om_ET.xml
index c4215878f67..620b2f12e01 100644
--- a/make/data/cldr/common/main/om_ET.xml
+++ b/make/data/cldr/common/main/om_ET.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/om_KE.xml b/make/data/cldr/common/main/om_KE.xml
index e9af9f89a91..6e03dc88bf6 100644
--- a/make/data/cldr/common/main/om_KE.xml
+++ b/make/data/cldr/common/main/om_KE.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/or.xml b/make/data/cldr/common/main/or.xml
index ff7b8e643ca..77f1ebb89a2 100644
--- a/make/data/cldr/common/main/or.xml
+++ b/make/data/cldr/common/main/or.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/or_IN.xml b/make/data/cldr/common/main/or_IN.xml
index 509ddf974bc..9ef6a1d3fa2 100644
--- a/make/data/cldr/common/main/or_IN.xml
+++ b/make/data/cldr/common/main/or_IN.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/os.xml b/make/data/cldr/common/main/os.xml
index 347fec989fa..99d08f175ad 100644
--- a/make/data/cldr/common/main/os.xml
+++ b/make/data/cldr/common/main/os.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/os_GE.xml b/make/data/cldr/common/main/os_GE.xml
index fd327c6700d..b34c9a4b742 100644
--- a/make/data/cldr/common/main/os_GE.xml
+++ b/make/data/cldr/common/main/os_GE.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/os_RU.xml b/make/data/cldr/common/main/os_RU.xml
index 3653ce1d58b..9621e29a00b 100644
--- a/make/data/cldr/common/main/os_RU.xml
+++ b/make/data/cldr/common/main/os_RU.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/osa.xml b/make/data/cldr/common/main/osa.xml
index 43fc58c2334..dbbccde670f 100644
--- a/make/data/cldr/common/main/osa.xml
+++ b/make/data/cldr/common/main/osa.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/osa_US.xml b/make/data/cldr/common/main/osa_US.xml
index 961506955d0..624f8f78cf4 100644
--- a/make/data/cldr/common/main/osa_US.xml
+++ b/make/data/cldr/common/main/osa_US.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/pa.xml b/make/data/cldr/common/main/pa.xml
index 0b39cc4113d..2da4fdb061a 100644
--- a/make/data/cldr/common/main/pa.xml
+++ b/make/data/cldr/common/main/pa.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/pa_Arab.xml b/make/data/cldr/common/main/pa_Arab.xml
index 711493803ea..048f78e502d 100644
--- a/make/data/cldr/common/main/pa_Arab.xml
+++ b/make/data/cldr/common/main/pa_Arab.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/pa_Arab_PK.xml b/make/data/cldr/common/main/pa_Arab_PK.xml
index b5fbaba6dd5..5bd767e1be5 100644
--- a/make/data/cldr/common/main/pa_Arab_PK.xml
+++ b/make/data/cldr/common/main/pa_Arab_PK.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/pa_Guru.xml b/make/data/cldr/common/main/pa_Guru.xml
index 7404e53d47e..709ca5c308c 100644
--- a/make/data/cldr/common/main/pa_Guru.xml
+++ b/make/data/cldr/common/main/pa_Guru.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/pa_Guru_IN.xml b/make/data/cldr/common/main/pa_Guru_IN.xml
index 0373b1e6094..a889f1bd48b 100644
--- a/make/data/cldr/common/main/pa_Guru_IN.xml
+++ b/make/data/cldr/common/main/pa_Guru_IN.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/pap.xml b/make/data/cldr/common/main/pap.xml
index dc4b0aec8a3..d537758ef24 100644
--- a/make/data/cldr/common/main/pap.xml
+++ b/make/data/cldr/common/main/pap.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/pap_AW.xml b/make/data/cldr/common/main/pap_AW.xml
index fe75adea332..71d15e6bce4 100644
--- a/make/data/cldr/common/main/pap_AW.xml
+++ b/make/data/cldr/common/main/pap_AW.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/pap_CW.xml b/make/data/cldr/common/main/pap_CW.xml
index 30f9b0a6471..9df56789f0c 100644
--- a/make/data/cldr/common/main/pap_CW.xml
+++ b/make/data/cldr/common/main/pap_CW.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/pcm.xml b/make/data/cldr/common/main/pcm.xml
index a831a8400dd..165db2e975e 100644
--- a/make/data/cldr/common/main/pcm.xml
+++ b/make/data/cldr/common/main/pcm.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/pcm_NG.xml b/make/data/cldr/common/main/pcm_NG.xml
index 83ecba1e4aa..22c5995083c 100644
--- a/make/data/cldr/common/main/pcm_NG.xml
+++ b/make/data/cldr/common/main/pcm_NG.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/pis.xml b/make/data/cldr/common/main/pis.xml
index 65d4c579ca4..ca0485a3116 100644
--- a/make/data/cldr/common/main/pis.xml
+++ b/make/data/cldr/common/main/pis.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/pis_SB.xml b/make/data/cldr/common/main/pis_SB.xml
index 0463fa6cd0c..665e1faa0c6 100644
--- a/make/data/cldr/common/main/pis_SB.xml
+++ b/make/data/cldr/common/main/pis_SB.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/pl.xml b/make/data/cldr/common/main/pl.xml
index 37e2116c208..c302f4537a2 100644
--- a/make/data/cldr/common/main/pl.xml
+++ b/make/data/cldr/common/main/pl.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -4247,6 +4247,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<currencyFormatLength>
 				<currencyFormat type="standard">
 					<pattern>#,##0.00 ¤</pattern>
+					<pattern alt="noCurrency" draft="provisional">#,##0.00</pattern>
 				</currencyFormat>
 				<currencyFormat type="accounting">
 					<pattern>#,##0.00 ¤;(#,##0.00 ¤)</pattern>
diff --git a/make/data/cldr/common/main/pl_PL.xml b/make/data/cldr/common/main/pl_PL.xml
index 4ee13a842d8..83468335198 100644
--- a/make/data/cldr/common/main/pl_PL.xml
+++ b/make/data/cldr/common/main/pl_PL.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/prg.xml b/make/data/cldr/common/main/prg.xml
index 2be8a674c6a..13e1c01ac0d 100644
--- a/make/data/cldr/common/main/prg.xml
+++ b/make/data/cldr/common/main/prg.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/prg_PL.xml b/make/data/cldr/common/main/prg_PL.xml
index 95506f645ed..3e1f1b28b17 100644
--- a/make/data/cldr/common/main/prg_PL.xml
+++ b/make/data/cldr/common/main/prg_PL.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/ps.xml b/make/data/cldr/common/main/ps.xml
index 631e86a17e5..55a7f06f86d 100644
--- a/make/data/cldr/common/main/ps.xml
+++ b/make/data/cldr/common/main/ps.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/ps_AF.xml b/make/data/cldr/common/main/ps_AF.xml
index ba7f778fdc9..80d72c08ea4 100644
--- a/make/data/cldr/common/main/ps_AF.xml
+++ b/make/data/cldr/common/main/ps_AF.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/ps_PK.xml b/make/data/cldr/common/main/ps_PK.xml
index ef66321643b..4eac726eaa2 100644
--- a/make/data/cldr/common/main/ps_PK.xml
+++ b/make/data/cldr/common/main/ps_PK.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/pt.xml b/make/data/cldr/common/main/pt.xml
index 8f3936a6c0d..43027cd50d0 100644
--- a/make/data/cldr/common/main/pt.xml
+++ b/make/data/cldr/common/main/pt.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/pt_AO.xml b/make/data/cldr/common/main/pt_AO.xml
index 9607bce2383..bf3c734029d 100644
--- a/make/data/cldr/common/main/pt_AO.xml
+++ b/make/data/cldr/common/main/pt_AO.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/pt_BR.xml b/make/data/cldr/common/main/pt_BR.xml
index d56d9554f77..a875ed83c37 100644
--- a/make/data/cldr/common/main/pt_BR.xml
+++ b/make/data/cldr/common/main/pt_BR.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/pt_CH.xml b/make/data/cldr/common/main/pt_CH.xml
index 5b8ad6f5143..5583a0987c9 100644
--- a/make/data/cldr/common/main/pt_CH.xml
+++ b/make/data/cldr/common/main/pt_CH.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/pt_CV.xml b/make/data/cldr/common/main/pt_CV.xml
index 1d9d5db0e2d..e4e50feff3e 100644
--- a/make/data/cldr/common/main/pt_CV.xml
+++ b/make/data/cldr/common/main/pt_CV.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/pt_GQ.xml b/make/data/cldr/common/main/pt_GQ.xml
index b9d78e6a6f1..0557b3e773e 100644
--- a/make/data/cldr/common/main/pt_GQ.xml
+++ b/make/data/cldr/common/main/pt_GQ.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/pt_GW.xml b/make/data/cldr/common/main/pt_GW.xml
index bb9b77b7d96..72194bdb78e 100644
--- a/make/data/cldr/common/main/pt_GW.xml
+++ b/make/data/cldr/common/main/pt_GW.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/pt_LU.xml b/make/data/cldr/common/main/pt_LU.xml
index c4ca53f2af2..683c2f9889b 100644
--- a/make/data/cldr/common/main/pt_LU.xml
+++ b/make/data/cldr/common/main/pt_LU.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/pt_MO.xml b/make/data/cldr/common/main/pt_MO.xml
index a5806b02ca4..76de6ef1ff5 100644
--- a/make/data/cldr/common/main/pt_MO.xml
+++ b/make/data/cldr/common/main/pt_MO.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/pt_MZ.xml b/make/data/cldr/common/main/pt_MZ.xml
index b056c0ac5d5..1e6ea0b3e6d 100644
--- a/make/data/cldr/common/main/pt_MZ.xml
+++ b/make/data/cldr/common/main/pt_MZ.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/pt_PT.xml b/make/data/cldr/common/main/pt_PT.xml
index 21fc8f99113..81f0ef80a2c 100644
--- a/make/data/cldr/common/main/pt_PT.xml
+++ b/make/data/cldr/common/main/pt_PT.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -2461,6 +2461,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<currencyFormatLength>
 				<currencyFormat type="standard">
 					<pattern>#,##0.00 ¤</pattern>
+					<pattern alt="noCurrency" draft="provisional">#,##0.00</pattern>
 				</currencyFormat>
 				<currencyFormat type="accounting">
 					<pattern>#,##0.00 ¤;(#,##0.00 ¤)</pattern>
diff --git a/make/data/cldr/common/main/pt_ST.xml b/make/data/cldr/common/main/pt_ST.xml
index 5328acab556..c1fd71b4b7a 100644
--- a/make/data/cldr/common/main/pt_ST.xml
+++ b/make/data/cldr/common/main/pt_ST.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/pt_TL.xml b/make/data/cldr/common/main/pt_TL.xml
index 488246ffbde..be57c2a8848 100644
--- a/make/data/cldr/common/main/pt_TL.xml
+++ b/make/data/cldr/common/main/pt_TL.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/qu.xml b/make/data/cldr/common/main/qu.xml
index 40c46d2bf63..e6fda4e4aca 100644
--- a/make/data/cldr/common/main/qu.xml
+++ b/make/data/cldr/common/main/qu.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/qu_BO.xml b/make/data/cldr/common/main/qu_BO.xml
index 7eba6f91da0..8d84ac4a0e2 100644
--- a/make/data/cldr/common/main/qu_BO.xml
+++ b/make/data/cldr/common/main/qu_BO.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/qu_EC.xml b/make/data/cldr/common/main/qu_EC.xml
index 2cfdf0b5e0a..aa713ad8ce0 100644
--- a/make/data/cldr/common/main/qu_EC.xml
+++ b/make/data/cldr/common/main/qu_EC.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/qu_PE.xml b/make/data/cldr/common/main/qu_PE.xml
index 7018e5d4942..e9c5bd22a9e 100644
--- a/make/data/cldr/common/main/qu_PE.xml
+++ b/make/data/cldr/common/main/qu_PE.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/quc.xml b/make/data/cldr/common/main/quc.xml
index a30a30b9b7e..0f67fba04e5 100644
--- a/make/data/cldr/common/main/quc.xml
+++ b/make/data/cldr/common/main/quc.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/quc_GT.xml b/make/data/cldr/common/main/quc_GT.xml
index 1a1549c4b9b..c5e23a97f79 100644
--- a/make/data/cldr/common/main/quc_GT.xml
+++ b/make/data/cldr/common/main/quc_GT.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/raj.xml b/make/data/cldr/common/main/raj.xml
index 55569ec849c..a03b0a2efd6 100644
--- a/make/data/cldr/common/main/raj.xml
+++ b/make/data/cldr/common/main/raj.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/raj_IN.xml b/make/data/cldr/common/main/raj_IN.xml
index a2e6c9c10c5..6373b1ad60c 100644
--- a/make/data/cldr/common/main/raj_IN.xml
+++ b/make/data/cldr/common/main/raj_IN.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/rhg.xml b/make/data/cldr/common/main/rhg.xml
index f100e9155f2..57a6701b427 100644
--- a/make/data/cldr/common/main/rhg.xml
+++ b/make/data/cldr/common/main/rhg.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/rhg_Rohg.xml b/make/data/cldr/common/main/rhg_Rohg.xml
index f88501c90b1..cc9874ae0b0 100644
--- a/make/data/cldr/common/main/rhg_Rohg.xml
+++ b/make/data/cldr/common/main/rhg_Rohg.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/rhg_Rohg_BD.xml b/make/data/cldr/common/main/rhg_Rohg_BD.xml
index 97fcdfdc9fd..b1abd002f8f 100644
--- a/make/data/cldr/common/main/rhg_Rohg_BD.xml
+++ b/make/data/cldr/common/main/rhg_Rohg_BD.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/rhg_Rohg_MM.xml b/make/data/cldr/common/main/rhg_Rohg_MM.xml
index 516f2632466..091b73a5f54 100644
--- a/make/data/cldr/common/main/rhg_Rohg_MM.xml
+++ b/make/data/cldr/common/main/rhg_Rohg_MM.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/rif.xml b/make/data/cldr/common/main/rif.xml
index cb6718452cd..4c254f9e790 100644
--- a/make/data/cldr/common/main/rif.xml
+++ b/make/data/cldr/common/main/rif.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/rif_MA.xml b/make/data/cldr/common/main/rif_MA.xml
index cb1758ce486..050c2ba1923 100644
--- a/make/data/cldr/common/main/rif_MA.xml
+++ b/make/data/cldr/common/main/rif_MA.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/rm.xml b/make/data/cldr/common/main/rm.xml
index fb1b4f6dd93..e5e3aeaa8c5 100644
--- a/make/data/cldr/common/main/rm.xml
+++ b/make/data/cldr/common/main/rm.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/rm_CH.xml b/make/data/cldr/common/main/rm_CH.xml
index 89fa47c46fc..90a7de966c9 100644
--- a/make/data/cldr/common/main/rm_CH.xml
+++ b/make/data/cldr/common/main/rm_CH.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/rn.xml b/make/data/cldr/common/main/rn.xml
index b9863f0374b..3efa13a87a2 100644
--- a/make/data/cldr/common/main/rn.xml
+++ b/make/data/cldr/common/main/rn.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/rn_BI.xml b/make/data/cldr/common/main/rn_BI.xml
index 5d22cd47227..7972a978ddb 100644
--- a/make/data/cldr/common/main/rn_BI.xml
+++ b/make/data/cldr/common/main/rn_BI.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/ro.xml b/make/data/cldr/common/main/ro.xml
index 2bef5272eca..5add9d07498 100644
--- a/make/data/cldr/common/main/ro.xml
+++ b/make/data/cldr/common/main/ro.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -4174,6 +4174,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<currencyFormatLength>
 				<currencyFormat type="standard">
 					<pattern>#,##0.00 ¤</pattern>
+					<pattern alt="noCurrency" draft="provisional">#,##0.00</pattern>
 				</currencyFormat>
 				<currencyFormat type="accounting">
 					<pattern>#,##0.00 ¤;(#,##0.00 ¤)</pattern>
diff --git a/make/data/cldr/common/main/ro_MD.xml b/make/data/cldr/common/main/ro_MD.xml
index b48cb292501..2428493f454 100644
--- a/make/data/cldr/common/main/ro_MD.xml
+++ b/make/data/cldr/common/main/ro_MD.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/ro_RO.xml b/make/data/cldr/common/main/ro_RO.xml
index ffa86ea3d2d..0a618a5c9c6 100644
--- a/make/data/cldr/common/main/ro_RO.xml
+++ b/make/data/cldr/common/main/ro_RO.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/rof.xml b/make/data/cldr/common/main/rof.xml
index c174f7f1a01..38797d30492 100644
--- a/make/data/cldr/common/main/rof.xml
+++ b/make/data/cldr/common/main/rof.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/rof_TZ.xml b/make/data/cldr/common/main/rof_TZ.xml
index 4edf5689c7e..7b94e24fc5e 100644
--- a/make/data/cldr/common/main/rof_TZ.xml
+++ b/make/data/cldr/common/main/rof_TZ.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/root.xml b/make/data/cldr/common/main/root.xml
index 5c87d314864..4aee72f9dec 100644
--- a/make/data/cldr/common/main/root.xml
+++ b/make/data/cldr/common/main/root.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -3198,15 +3198,15 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>UTC</standard>
 				</short>
 			</zone>
-			<zone type="Etc/Unknown">
-				<exemplarCity>Unknown</exemplarCity>
-			</zone>
 			<zone type="Antarctica/DumontDUrville">
-				<exemplarCity>Dumont d’Urville</exemplarCity>
+				<exemplarCity>Dumont-d’Urville</exemplarCity>
 			</zone>
 			<zone type="America/St_Barthelemy">
 				<exemplarCity>St. Barthélemy</exemplarCity>
 			</zone>
+			<zone type="America/Noronha">
+				<exemplarCity>Fernando de Noronha</exemplarCity>
+			</zone>
 			<zone type="America/Coral_Harbour">
 				<exemplarCity>Atikokan</exemplarCity>
 			</zone>
@@ -4462,6 +4462,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<currencyFormatLength>
 				<currencyFormat type="standard">
 					<pattern>¤ #,##0.00</pattern>
+					<pattern alt="alphaNextToNumber">¤ #,##0.00</pattern>
 					<pattern alt="noCurrency">#,##0.00</pattern>
 				</currencyFormat>
 				<currencyFormat type="accounting">
diff --git a/make/data/cldr/common/main/ru.xml b/make/data/cldr/common/main/ru.xml
index 56e0e603d8a..f01b65479ab 100644
--- a/make/data/cldr/common/main/ru.xml
+++ b/make/data/cldr/common/main/ru.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -5654,6 +5654,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<currencyFormatLength>
 				<currencyFormat type="standard">
 					<pattern>#,##0.00 ¤</pattern>
+					<pattern alt="noCurrency" draft="provisional">#,##0.00</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 			<currencyFormatLength type="short">
diff --git a/make/data/cldr/common/main/ru_BY.xml b/make/data/cldr/common/main/ru_BY.xml
index 785bc7e8160..b36a7a34f58 100644
--- a/make/data/cldr/common/main/ru_BY.xml
+++ b/make/data/cldr/common/main/ru_BY.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/ru_KG.xml b/make/data/cldr/common/main/ru_KG.xml
index 52d7a7b1999..114911600db 100644
--- a/make/data/cldr/common/main/ru_KG.xml
+++ b/make/data/cldr/common/main/ru_KG.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/ru_KZ.xml b/make/data/cldr/common/main/ru_KZ.xml
index af683f7fe06..78dd7c3c894 100644
--- a/make/data/cldr/common/main/ru_KZ.xml
+++ b/make/data/cldr/common/main/ru_KZ.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/ru_MD.xml b/make/data/cldr/common/main/ru_MD.xml
index f4a39c6903b..983cbf1d070 100644
--- a/make/data/cldr/common/main/ru_MD.xml
+++ b/make/data/cldr/common/main/ru_MD.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/ru_RU.xml b/make/data/cldr/common/main/ru_RU.xml
index aa008c5f446..81ee86ca4b0 100644
--- a/make/data/cldr/common/main/ru_RU.xml
+++ b/make/data/cldr/common/main/ru_RU.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/ru_UA.xml b/make/data/cldr/common/main/ru_UA.xml
index 2b45e4bf7fc..8a9c4e02dfb 100644
--- a/make/data/cldr/common/main/ru_UA.xml
+++ b/make/data/cldr/common/main/ru_UA.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/rw.xml b/make/data/cldr/common/main/rw.xml
index 8ae77785edc..0c25e15c411 100644
--- a/make/data/cldr/common/main/rw.xml
+++ b/make/data/cldr/common/main/rw.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/rw_RW.xml b/make/data/cldr/common/main/rw_RW.xml
index 3884fab8cf2..6594c69d2f3 100644
--- a/make/data/cldr/common/main/rw_RW.xml
+++ b/make/data/cldr/common/main/rw_RW.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/rwk.xml b/make/data/cldr/common/main/rwk.xml
index 9a32f8431e7..96f30df0610 100644
--- a/make/data/cldr/common/main/rwk.xml
+++ b/make/data/cldr/common/main/rwk.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/rwk_TZ.xml b/make/data/cldr/common/main/rwk_TZ.xml
index 93a91aee965..35262e6fc51 100644
--- a/make/data/cldr/common/main/rwk_TZ.xml
+++ b/make/data/cldr/common/main/rwk_TZ.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/sa.xml b/make/data/cldr/common/main/sa.xml
index e7772d6aba9..0d58bdfcbcd 100644
--- a/make/data/cldr/common/main/sa.xml
+++ b/make/data/cldr/common/main/sa.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/sa_IN.xml b/make/data/cldr/common/main/sa_IN.xml
index dec966c92af..898673a0691 100644
--- a/make/data/cldr/common/main/sa_IN.xml
+++ b/make/data/cldr/common/main/sa_IN.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/sah.xml b/make/data/cldr/common/main/sah.xml
index a83da9acfe1..29ed04a5da4 100644
--- a/make/data/cldr/common/main/sah.xml
+++ b/make/data/cldr/common/main/sah.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/sah_RU.xml b/make/data/cldr/common/main/sah_RU.xml
index 6ea7810b7bf..fea8e44c570 100644
--- a/make/data/cldr/common/main/sah_RU.xml
+++ b/make/data/cldr/common/main/sah_RU.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/saq.xml b/make/data/cldr/common/main/saq.xml
index 8c975679f0f..c49da3a26aa 100644
--- a/make/data/cldr/common/main/saq.xml
+++ b/make/data/cldr/common/main/saq.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/saq_KE.xml b/make/data/cldr/common/main/saq_KE.xml
index f2781b159ac..becbbd4d6c2 100644
--- a/make/data/cldr/common/main/saq_KE.xml
+++ b/make/data/cldr/common/main/saq_KE.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/sat.xml b/make/data/cldr/common/main/sat.xml
index e990b1d29c6..8ed99a516cc 100644
--- a/make/data/cldr/common/main/sat.xml
+++ b/make/data/cldr/common/main/sat.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/sat_Deva.xml b/make/data/cldr/common/main/sat_Deva.xml
index 30961e3dfdc..d5969c115d3 100644
--- a/make/data/cldr/common/main/sat_Deva.xml
+++ b/make/data/cldr/common/main/sat_Deva.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/sat_Deva_IN.xml b/make/data/cldr/common/main/sat_Deva_IN.xml
index be00da78a9a..06fb5f01710 100644
--- a/make/data/cldr/common/main/sat_Deva_IN.xml
+++ b/make/data/cldr/common/main/sat_Deva_IN.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/sat_Olck.xml b/make/data/cldr/common/main/sat_Olck.xml
index 806495ec77c..c2944c2bbdf 100644
--- a/make/data/cldr/common/main/sat_Olck.xml
+++ b/make/data/cldr/common/main/sat_Olck.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/sat_Olck_IN.xml b/make/data/cldr/common/main/sat_Olck_IN.xml
index 5f5bc27ec07..c2231cb2000 100644
--- a/make/data/cldr/common/main/sat_Olck_IN.xml
+++ b/make/data/cldr/common/main/sat_Olck_IN.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/sbp.xml b/make/data/cldr/common/main/sbp.xml
index 898598f848c..82e0d962fa1 100644
--- a/make/data/cldr/common/main/sbp.xml
+++ b/make/data/cldr/common/main/sbp.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/sbp_TZ.xml b/make/data/cldr/common/main/sbp_TZ.xml
index dcab5b8450a..03ac2cfcbee 100644
--- a/make/data/cldr/common/main/sbp_TZ.xml
+++ b/make/data/cldr/common/main/sbp_TZ.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/sc.xml b/make/data/cldr/common/main/sc.xml
index 10c68109e4f..ec57770a997 100644
--- a/make/data/cldr/common/main/sc.xml
+++ b/make/data/cldr/common/main/sc.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/sc_IT.xml b/make/data/cldr/common/main/sc_IT.xml
index 376c0399cca..f3250e5a18c 100644
--- a/make/data/cldr/common/main/sc_IT.xml
+++ b/make/data/cldr/common/main/sc_IT.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/scn.xml b/make/data/cldr/common/main/scn.xml
index fd6f4109412..309d98394ea 100644
--- a/make/data/cldr/common/main/scn.xml
+++ b/make/data/cldr/common/main/scn.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/scn_IT.xml b/make/data/cldr/common/main/scn_IT.xml
index 54c0c33495b..78d5024059a 100644
--- a/make/data/cldr/common/main/scn_IT.xml
+++ b/make/data/cldr/common/main/scn_IT.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/sd.xml b/make/data/cldr/common/main/sd.xml
index fe0b269052c..19b23be9f41 100644
--- a/make/data/cldr/common/main/sd.xml
+++ b/make/data/cldr/common/main/sd.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/sd_Arab.xml b/make/data/cldr/common/main/sd_Arab.xml
index 1844976e26f..c3d3291dcc9 100644
--- a/make/data/cldr/common/main/sd_Arab.xml
+++ b/make/data/cldr/common/main/sd_Arab.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/sd_Arab_PK.xml b/make/data/cldr/common/main/sd_Arab_PK.xml
index f123030ec5a..e1cb9eae010 100644
--- a/make/data/cldr/common/main/sd_Arab_PK.xml
+++ b/make/data/cldr/common/main/sd_Arab_PK.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/sd_Deva.xml b/make/data/cldr/common/main/sd_Deva.xml
index 517a2db3f2e..9b331766891 100644
--- a/make/data/cldr/common/main/sd_Deva.xml
+++ b/make/data/cldr/common/main/sd_Deva.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/sd_Deva_IN.xml b/make/data/cldr/common/main/sd_Deva_IN.xml
index 6406ca40a47..12eec8a301c 100644
--- a/make/data/cldr/common/main/sd_Deva_IN.xml
+++ b/make/data/cldr/common/main/sd_Deva_IN.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/sdh.xml b/make/data/cldr/common/main/sdh.xml
index 860747bd424..fb5900e564d 100644
--- a/make/data/cldr/common/main/sdh.xml
+++ b/make/data/cldr/common/main/sdh.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/sdh_IQ.xml b/make/data/cldr/common/main/sdh_IQ.xml
index 73b71829b57..ce7de84ea57 100644
--- a/make/data/cldr/common/main/sdh_IQ.xml
+++ b/make/data/cldr/common/main/sdh_IQ.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/sdh_IR.xml b/make/data/cldr/common/main/sdh_IR.xml
index 7752d73ac19..107e9f4374b 100644
--- a/make/data/cldr/common/main/sdh_IR.xml
+++ b/make/data/cldr/common/main/sdh_IR.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/se.xml b/make/data/cldr/common/main/se.xml
index 343d2d6caa5..bdc806c27e5 100644
--- a/make/data/cldr/common/main/se.xml
+++ b/make/data/cldr/common/main/se.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/se_FI.xml b/make/data/cldr/common/main/se_FI.xml
index fd6d2ee1644..aae2f5a8890 100644
--- a/make/data/cldr/common/main/se_FI.xml
+++ b/make/data/cldr/common/main/se_FI.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/se_NO.xml b/make/data/cldr/common/main/se_NO.xml
index 12bdb6a17b9..1a1d68ed2fa 100644
--- a/make/data/cldr/common/main/se_NO.xml
+++ b/make/data/cldr/common/main/se_NO.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/se_SE.xml b/make/data/cldr/common/main/se_SE.xml
index 99d52c3ab3e..739f7d8115b 100644
--- a/make/data/cldr/common/main/se_SE.xml
+++ b/make/data/cldr/common/main/se_SE.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/seh.xml b/make/data/cldr/common/main/seh.xml
index 2815843850f..c07febf6650 100644
--- a/make/data/cldr/common/main/seh.xml
+++ b/make/data/cldr/common/main/seh.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/seh_MZ.xml b/make/data/cldr/common/main/seh_MZ.xml
index 857a4e4e0fa..a6f9635c421 100644
--- a/make/data/cldr/common/main/seh_MZ.xml
+++ b/make/data/cldr/common/main/seh_MZ.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/ses.xml b/make/data/cldr/common/main/ses.xml
index 9189d74e8f3..22d34f7b4a7 100644
--- a/make/data/cldr/common/main/ses.xml
+++ b/make/data/cldr/common/main/ses.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/ses_ML.xml b/make/data/cldr/common/main/ses_ML.xml
index d0fe59700fd..a7f7f8f77e9 100644
--- a/make/data/cldr/common/main/ses_ML.xml
+++ b/make/data/cldr/common/main/ses_ML.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/sg.xml b/make/data/cldr/common/main/sg.xml
index c40349f2e99..629d51fe367 100644
--- a/make/data/cldr/common/main/sg.xml
+++ b/make/data/cldr/common/main/sg.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/sg_CF.xml b/make/data/cldr/common/main/sg_CF.xml
index 6318b0fdf4c..cc659206949 100644
--- a/make/data/cldr/common/main/sg_CF.xml
+++ b/make/data/cldr/common/main/sg_CF.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/shi.xml b/make/data/cldr/common/main/shi.xml
index b7b64363ad0..24e2aab3baa 100644
--- a/make/data/cldr/common/main/shi.xml
+++ b/make/data/cldr/common/main/shi.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/shi_Latn.xml b/make/data/cldr/common/main/shi_Latn.xml
index 8d762fe15e7..e14a3222f49 100644
--- a/make/data/cldr/common/main/shi_Latn.xml
+++ b/make/data/cldr/common/main/shi_Latn.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/shi_Latn_MA.xml b/make/data/cldr/common/main/shi_Latn_MA.xml
index e28483d26ea..3531cf0a4d1 100644
--- a/make/data/cldr/common/main/shi_Latn_MA.xml
+++ b/make/data/cldr/common/main/shi_Latn_MA.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/shi_Tfng.xml b/make/data/cldr/common/main/shi_Tfng.xml
index fa97b50b8c1..d7675bff89c 100644
--- a/make/data/cldr/common/main/shi_Tfng.xml
+++ b/make/data/cldr/common/main/shi_Tfng.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/shi_Tfng_MA.xml b/make/data/cldr/common/main/shi_Tfng_MA.xml
index 63001b5c7fb..e8242d878f2 100644
--- a/make/data/cldr/common/main/shi_Tfng_MA.xml
+++ b/make/data/cldr/common/main/shi_Tfng_MA.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/shn.xml b/make/data/cldr/common/main/shn.xml
index 4235172f367..75b20be6149 100644
--- a/make/data/cldr/common/main/shn.xml
+++ b/make/data/cldr/common/main/shn.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/shn_MM.xml b/make/data/cldr/common/main/shn_MM.xml
index ae944bf3420..b3f5dde99f0 100644
--- a/make/data/cldr/common/main/shn_MM.xml
+++ b/make/data/cldr/common/main/shn_MM.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/shn_TH.xml b/make/data/cldr/common/main/shn_TH.xml
index 32a425c9b40..02e4d0654ce 100644
--- a/make/data/cldr/common/main/shn_TH.xml
+++ b/make/data/cldr/common/main/shn_TH.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/si.xml b/make/data/cldr/common/main/si.xml
index e9310faf1b5..6c2531cf14c 100644
--- a/make/data/cldr/common/main/si.xml
+++ b/make/data/cldr/common/main/si.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/si_LK.xml b/make/data/cldr/common/main/si_LK.xml
index e16af631667..ff969360757 100644
--- a/make/data/cldr/common/main/si_LK.xml
+++ b/make/data/cldr/common/main/si_LK.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/sid.xml b/make/data/cldr/common/main/sid.xml
index a92e68a3459..cf493ea1bff 100644
--- a/make/data/cldr/common/main/sid.xml
+++ b/make/data/cldr/common/main/sid.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/sid_ET.xml b/make/data/cldr/common/main/sid_ET.xml
index 29b629c4df4..09f4b307514 100644
--- a/make/data/cldr/common/main/sid_ET.xml
+++ b/make/data/cldr/common/main/sid_ET.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/sk.xml b/make/data/cldr/common/main/sk.xml
index 649e0b2a83f..735603fd65d 100644
--- a/make/data/cldr/common/main/sk.xml
+++ b/make/data/cldr/common/main/sk.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -4158,6 +4158,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<currencyFormatLength>
 				<currencyFormat type="standard">
 					<pattern>#,##0.00 ¤</pattern>
+					<pattern alt="noCurrency" draft="provisional">#,##0.00</pattern>
 				</currencyFormat>
 				<currencyFormat type="accounting">
 					<pattern>#,##0.00 ¤;(#,##0.00 ¤)</pattern>
diff --git a/make/data/cldr/common/main/sk_SK.xml b/make/data/cldr/common/main/sk_SK.xml
index 9d5d7c6c366..6a3adb1ac2f 100644
--- a/make/data/cldr/common/main/sk_SK.xml
+++ b/make/data/cldr/common/main/sk_SK.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/skr.xml b/make/data/cldr/common/main/skr.xml
index 88729169b8e..157d136949f 100644
--- a/make/data/cldr/common/main/skr.xml
+++ b/make/data/cldr/common/main/skr.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/skr_PK.xml b/make/data/cldr/common/main/skr_PK.xml
index b2614bad2be..262526209c0 100644
--- a/make/data/cldr/common/main/skr_PK.xml
+++ b/make/data/cldr/common/main/skr_PK.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/sl.xml b/make/data/cldr/common/main/sl.xml
index ce2c42632ea..9dfffbeee15 100644
--- a/make/data/cldr/common/main/sl.xml
+++ b/make/data/cldr/common/main/sl.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/sl_SI.xml b/make/data/cldr/common/main/sl_SI.xml
index 1368b6fb95a..f350fb624fd 100644
--- a/make/data/cldr/common/main/sl_SI.xml
+++ b/make/data/cldr/common/main/sl_SI.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/sma.xml b/make/data/cldr/common/main/sma.xml
index 56337ccc8f4..ba4f84b328f 100644
--- a/make/data/cldr/common/main/sma.xml
+++ b/make/data/cldr/common/main/sma.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/sma_NO.xml b/make/data/cldr/common/main/sma_NO.xml
index 16ee062d37c..c42ca353d8b 100644
--- a/make/data/cldr/common/main/sma_NO.xml
+++ b/make/data/cldr/common/main/sma_NO.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/sma_SE.xml b/make/data/cldr/common/main/sma_SE.xml
index 600fb9fe6ac..5f2044808f9 100644
--- a/make/data/cldr/common/main/sma_SE.xml
+++ b/make/data/cldr/common/main/sma_SE.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/smj.xml b/make/data/cldr/common/main/smj.xml
index 2f2d71927e9..5c3964d4149 100644
--- a/make/data/cldr/common/main/smj.xml
+++ b/make/data/cldr/common/main/smj.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/smj_NO.xml b/make/data/cldr/common/main/smj_NO.xml
index c1bfae31c23..3d1fb9c1f50 100644
--- a/make/data/cldr/common/main/smj_NO.xml
+++ b/make/data/cldr/common/main/smj_NO.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/smj_SE.xml b/make/data/cldr/common/main/smj_SE.xml
index 2d14ac2865f..e55bfbcdf9f 100644
--- a/make/data/cldr/common/main/smj_SE.xml
+++ b/make/data/cldr/common/main/smj_SE.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/smn.xml b/make/data/cldr/common/main/smn.xml
index d6e4b544b1a..4127fb6e100 100644
--- a/make/data/cldr/common/main/smn.xml
+++ b/make/data/cldr/common/main/smn.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/smn_FI.xml b/make/data/cldr/common/main/smn_FI.xml
index 04fc344983a..dd84dc0f078 100644
--- a/make/data/cldr/common/main/smn_FI.xml
+++ b/make/data/cldr/common/main/smn_FI.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/sms.xml b/make/data/cldr/common/main/sms.xml
index 8d57359d4c8..542bb59fd74 100644
--- a/make/data/cldr/common/main/sms.xml
+++ b/make/data/cldr/common/main/sms.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/sms_FI.xml b/make/data/cldr/common/main/sms_FI.xml
index 07c7be6f7e8..cf6545f0bef 100644
--- a/make/data/cldr/common/main/sms_FI.xml
+++ b/make/data/cldr/common/main/sms_FI.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/sn.xml b/make/data/cldr/common/main/sn.xml
index 006c7d0b14b..f73b2ea7162 100644
--- a/make/data/cldr/common/main/sn.xml
+++ b/make/data/cldr/common/main/sn.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/sn_ZW.xml b/make/data/cldr/common/main/sn_ZW.xml
index 4aa04059c50..e5750c2e672 100644
--- a/make/data/cldr/common/main/sn_ZW.xml
+++ b/make/data/cldr/common/main/sn_ZW.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/so.xml b/make/data/cldr/common/main/so.xml
index 6d916fa8de5..487a3476f90 100644
--- a/make/data/cldr/common/main/so.xml
+++ b/make/data/cldr/common/main/so.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/so_DJ.xml b/make/data/cldr/common/main/so_DJ.xml
index fdcc7fea0e1..a01f5bd952c 100644
--- a/make/data/cldr/common/main/so_DJ.xml
+++ b/make/data/cldr/common/main/so_DJ.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/so_ET.xml b/make/data/cldr/common/main/so_ET.xml
index 8829571b928..3d7137b893f 100644
--- a/make/data/cldr/common/main/so_ET.xml
+++ b/make/data/cldr/common/main/so_ET.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/so_KE.xml b/make/data/cldr/common/main/so_KE.xml
index f117c320940..5d54dd93f98 100644
--- a/make/data/cldr/common/main/so_KE.xml
+++ b/make/data/cldr/common/main/so_KE.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/so_SO.xml b/make/data/cldr/common/main/so_SO.xml
index a576aff8c65..6840e3babe1 100644
--- a/make/data/cldr/common/main/so_SO.xml
+++ b/make/data/cldr/common/main/so_SO.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/sq.xml b/make/data/cldr/common/main/sq.xml
index 16b64b166fb..b812532db36 100644
--- a/make/data/cldr/common/main/sq.xml
+++ b/make/data/cldr/common/main/sq.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/sq_AL.xml b/make/data/cldr/common/main/sq_AL.xml
index d358f488859..90cd2b0fc91 100644
--- a/make/data/cldr/common/main/sq_AL.xml
+++ b/make/data/cldr/common/main/sq_AL.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/sq_MK.xml b/make/data/cldr/common/main/sq_MK.xml
index 1b195b20744..50f6a62fb11 100644
--- a/make/data/cldr/common/main/sq_MK.xml
+++ b/make/data/cldr/common/main/sq_MK.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/sq_XK.xml b/make/data/cldr/common/main/sq_XK.xml
index a876cedc6ae..4adacd63447 100644
--- a/make/data/cldr/common/main/sq_XK.xml
+++ b/make/data/cldr/common/main/sq_XK.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/sr.xml b/make/data/cldr/common/main/sr.xml
index b544b269658..19e590d21fa 100644
--- a/make/data/cldr/common/main/sr.xml
+++ b/make/data/cldr/common/main/sr.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/sr_Cyrl.xml b/make/data/cldr/common/main/sr_Cyrl.xml
index f6a9df7ab3b..424021d997d 100644
--- a/make/data/cldr/common/main/sr_Cyrl.xml
+++ b/make/data/cldr/common/main/sr_Cyrl.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/sr_Cyrl_BA.xml b/make/data/cldr/common/main/sr_Cyrl_BA.xml
index ab0c793f680..d112a24c27f 100644
--- a/make/data/cldr/common/main/sr_Cyrl_BA.xml
+++ b/make/data/cldr/common/main/sr_Cyrl_BA.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/sr_Cyrl_ME.xml b/make/data/cldr/common/main/sr_Cyrl_ME.xml
index 54d72b35ace..058e55d769d 100644
--- a/make/data/cldr/common/main/sr_Cyrl_ME.xml
+++ b/make/data/cldr/common/main/sr_Cyrl_ME.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/sr_Cyrl_RS.xml b/make/data/cldr/common/main/sr_Cyrl_RS.xml
index 7006e981801..75775115c2e 100644
--- a/make/data/cldr/common/main/sr_Cyrl_RS.xml
+++ b/make/data/cldr/common/main/sr_Cyrl_RS.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/sr_Cyrl_XK.xml b/make/data/cldr/common/main/sr_Cyrl_XK.xml
index 0d2afec0266..66363cdcf08 100644
--- a/make/data/cldr/common/main/sr_Cyrl_XK.xml
+++ b/make/data/cldr/common/main/sr_Cyrl_XK.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/sr_Latn.xml b/make/data/cldr/common/main/sr_Latn.xml
index 32686ee0998..edbc0fa8ae9 100644
--- a/make/data/cldr/common/main/sr_Latn.xml
+++ b/make/data/cldr/common/main/sr_Latn.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/sr_Latn_BA.xml b/make/data/cldr/common/main/sr_Latn_BA.xml
index 497ee36926b..80475ab0366 100644
--- a/make/data/cldr/common/main/sr_Latn_BA.xml
+++ b/make/data/cldr/common/main/sr_Latn_BA.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/sr_Latn_ME.xml b/make/data/cldr/common/main/sr_Latn_ME.xml
index 886b9cdba07..7ee454af022 100644
--- a/make/data/cldr/common/main/sr_Latn_ME.xml
+++ b/make/data/cldr/common/main/sr_Latn_ME.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/sr_Latn_RS.xml b/make/data/cldr/common/main/sr_Latn_RS.xml
index 04102a3a7d6..0ba6285168b 100644
--- a/make/data/cldr/common/main/sr_Latn_RS.xml
+++ b/make/data/cldr/common/main/sr_Latn_RS.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/sr_Latn_XK.xml b/make/data/cldr/common/main/sr_Latn_XK.xml
index f655d5dbe82..b2d8d79b7a8 100644
--- a/make/data/cldr/common/main/sr_Latn_XK.xml
+++ b/make/data/cldr/common/main/sr_Latn_XK.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/ss.xml b/make/data/cldr/common/main/ss.xml
index c86a4a9c653..76c1b6054d6 100644
--- a/make/data/cldr/common/main/ss.xml
+++ b/make/data/cldr/common/main/ss.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/ss_SZ.xml b/make/data/cldr/common/main/ss_SZ.xml
index 440f7ef0f89..91fe0998d2e 100644
--- a/make/data/cldr/common/main/ss_SZ.xml
+++ b/make/data/cldr/common/main/ss_SZ.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/ss_ZA.xml b/make/data/cldr/common/main/ss_ZA.xml
index f57011adf51..f0bbcdca37c 100644
--- a/make/data/cldr/common/main/ss_ZA.xml
+++ b/make/data/cldr/common/main/ss_ZA.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/ssy.xml b/make/data/cldr/common/main/ssy.xml
index ec9d3508fe4..919d6a0a7d6 100644
--- a/make/data/cldr/common/main/ssy.xml
+++ b/make/data/cldr/common/main/ssy.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/ssy_ER.xml b/make/data/cldr/common/main/ssy_ER.xml
index 0953fc3c828..c6b6a6ee00c 100644
--- a/make/data/cldr/common/main/ssy_ER.xml
+++ b/make/data/cldr/common/main/ssy_ER.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/st.xml b/make/data/cldr/common/main/st.xml
index 1bf19d3f9dc..108fdb84ffe 100644
--- a/make/data/cldr/common/main/st.xml
+++ b/make/data/cldr/common/main/st.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/st_LS.xml b/make/data/cldr/common/main/st_LS.xml
index 508573ff653..269f5305510 100644
--- a/make/data/cldr/common/main/st_LS.xml
+++ b/make/data/cldr/common/main/st_LS.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/st_ZA.xml b/make/data/cldr/common/main/st_ZA.xml
index c575262cfe5..e4650e4deee 100644
--- a/make/data/cldr/common/main/st_ZA.xml
+++ b/make/data/cldr/common/main/st_ZA.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/su.xml b/make/data/cldr/common/main/su.xml
index 9a39f1f0262..f59f6ad3b9c 100644
--- a/make/data/cldr/common/main/su.xml
+++ b/make/data/cldr/common/main/su.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/su_Latn.xml b/make/data/cldr/common/main/su_Latn.xml
index 65f70aab8cb..c2c7310a280 100644
--- a/make/data/cldr/common/main/su_Latn.xml
+++ b/make/data/cldr/common/main/su_Latn.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/su_Latn_ID.xml b/make/data/cldr/common/main/su_Latn_ID.xml
index fdac0d2c9e3..f58b076cd5f 100644
--- a/make/data/cldr/common/main/su_Latn_ID.xml
+++ b/make/data/cldr/common/main/su_Latn_ID.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/sv.xml b/make/data/cldr/common/main/sv.xml
index bed41efa47c..0aa70680a30 100644
--- a/make/data/cldr/common/main/sv.xml
+++ b/make/data/cldr/common/main/sv.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -4769,6 +4769,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<currencyFormatLength>
 				<currencyFormat type="standard">
 					<pattern>#,##0.00 ¤</pattern>
+					<pattern alt="noCurrency" draft="provisional">#,##0.00</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 			<currencyFormatLength type="short">
diff --git a/make/data/cldr/common/main/sv_AX.xml b/make/data/cldr/common/main/sv_AX.xml
index f4e5c2916fc..db98dd1dca1 100644
--- a/make/data/cldr/common/main/sv_AX.xml
+++ b/make/data/cldr/common/main/sv_AX.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/sv_FI.xml b/make/data/cldr/common/main/sv_FI.xml
index 5d651579c59..99ddaf2d923 100644
--- a/make/data/cldr/common/main/sv_FI.xml
+++ b/make/data/cldr/common/main/sv_FI.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/sv_SE.xml b/make/data/cldr/common/main/sv_SE.xml
index de404ba5273..fb324c7021f 100644
--- a/make/data/cldr/common/main/sv_SE.xml
+++ b/make/data/cldr/common/main/sv_SE.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/sw.xml b/make/data/cldr/common/main/sw.xml
index 4d118b02822..26779a6c82c 100644
--- a/make/data/cldr/common/main/sw.xml
+++ b/make/data/cldr/common/main/sw.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/sw_CD.xml b/make/data/cldr/common/main/sw_CD.xml
index 47f916723bb..41ba714c2a4 100644
--- a/make/data/cldr/common/main/sw_CD.xml
+++ b/make/data/cldr/common/main/sw_CD.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/sw_KE.xml b/make/data/cldr/common/main/sw_KE.xml
index d146d4dc4a0..5ab87eb56a6 100644
--- a/make/data/cldr/common/main/sw_KE.xml
+++ b/make/data/cldr/common/main/sw_KE.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/sw_TZ.xml b/make/data/cldr/common/main/sw_TZ.xml
index 0f77a90f4f2..1724f8a89df 100644
--- a/make/data/cldr/common/main/sw_TZ.xml
+++ b/make/data/cldr/common/main/sw_TZ.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/sw_UG.xml b/make/data/cldr/common/main/sw_UG.xml
index 97567fa2564..abb0ca3edf1 100644
--- a/make/data/cldr/common/main/sw_UG.xml
+++ b/make/data/cldr/common/main/sw_UG.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/syr.xml b/make/data/cldr/common/main/syr.xml
index 0704b2d4d31..de89e87770a 100644
--- a/make/data/cldr/common/main/syr.xml
+++ b/make/data/cldr/common/main/syr.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -3492,20 +3492,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 		<symbols numberSystem="latn">
 			<nan draft="unconfirmed">ܠܝܬ ܡܢܝܢܐ</nan>
 		</symbols>
-		<decimalFormats>
-			<decimalFormatLength>
-				<decimalFormat>
-					<pattern draft="unconfirmed">#,##0.###;#,##0.###-</pattern>
-				</decimalFormat>
-			</decimalFormatLength>
-		</decimalFormats>
-		<currencyFormats>
-			<currencyFormatLength>
-				<currencyFormat type="standard">
-					<pattern draft="unconfirmed">¤ #,##0.00;¤ #,##0.00-</pattern>
-				</currencyFormat>
-			</currencyFormatLength>
-		</currencyFormats>
 		<currencyFormats numberSystem="latn">
 			<unitPattern count="one" draft="unconfirmed">{0} {1}</unitPattern>
 			<unitPattern count="other" draft="unconfirmed">{0} {1}</unitPattern>
diff --git a/make/data/cldr/common/main/syr_IQ.xml b/make/data/cldr/common/main/syr_IQ.xml
index c70f4db66ab..421c932d46a 100644
--- a/make/data/cldr/common/main/syr_IQ.xml
+++ b/make/data/cldr/common/main/syr_IQ.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/syr_SY.xml b/make/data/cldr/common/main/syr_SY.xml
index 4260f446630..c9299ff93f7 100644
--- a/make/data/cldr/common/main/syr_SY.xml
+++ b/make/data/cldr/common/main/syr_SY.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/szl.xml b/make/data/cldr/common/main/szl.xml
index 8bbc34de5d5..09b54dc4dae 100644
--- a/make/data/cldr/common/main/szl.xml
+++ b/make/data/cldr/common/main/szl.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/szl_PL.xml b/make/data/cldr/common/main/szl_PL.xml
index f7d6bb206a8..f328954356b 100644
--- a/make/data/cldr/common/main/szl_PL.xml
+++ b/make/data/cldr/common/main/szl_PL.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/ta.xml b/make/data/cldr/common/main/ta.xml
index 63769051703..43a2779bebd 100644
--- a/make/data/cldr/common/main/ta.xml
+++ b/make/data/cldr/common/main/ta.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -4867,6 +4867,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<currencyFormatLength>
 				<currencyFormat type="standard">
 					<pattern>¤#,##,##0.00</pattern>
+					<pattern alt="noCurrency" draft="contributed">#,##,##0.00</pattern>
 				</currencyFormat>
 				<currencyFormat type="accounting">
 					<pattern>¤#,##0.00;(¤#,##0.00)</pattern>
diff --git a/make/data/cldr/common/main/ta_IN.xml b/make/data/cldr/common/main/ta_IN.xml
index 128edffb144..86905e015d9 100644
--- a/make/data/cldr/common/main/ta_IN.xml
+++ b/make/data/cldr/common/main/ta_IN.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/ta_LK.xml b/make/data/cldr/common/main/ta_LK.xml
index f6fac9f6b17..0c5e89e233b 100644
--- a/make/data/cldr/common/main/ta_LK.xml
+++ b/make/data/cldr/common/main/ta_LK.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/ta_MY.xml b/make/data/cldr/common/main/ta_MY.xml
index a893525396a..f24cc219fb4 100644
--- a/make/data/cldr/common/main/ta_MY.xml
+++ b/make/data/cldr/common/main/ta_MY.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/ta_SG.xml b/make/data/cldr/common/main/ta_SG.xml
index 9b3acf30d75..5e37f8039e7 100644
--- a/make/data/cldr/common/main/ta_SG.xml
+++ b/make/data/cldr/common/main/ta_SG.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/te.xml b/make/data/cldr/common/main/te.xml
index d433c4432f3..cd6d965ae18 100644
--- a/make/data/cldr/common/main/te.xml
+++ b/make/data/cldr/common/main/te.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/te_IN.xml b/make/data/cldr/common/main/te_IN.xml
index 3394316324f..55e453a7a8c 100644
--- a/make/data/cldr/common/main/te_IN.xml
+++ b/make/data/cldr/common/main/te_IN.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/teo.xml b/make/data/cldr/common/main/teo.xml
index d1a6b911446..3c32865b770 100644
--- a/make/data/cldr/common/main/teo.xml
+++ b/make/data/cldr/common/main/teo.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/teo_KE.xml b/make/data/cldr/common/main/teo_KE.xml
index 40e34580b1f..e50bc90a196 100644
--- a/make/data/cldr/common/main/teo_KE.xml
+++ b/make/data/cldr/common/main/teo_KE.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/teo_UG.xml b/make/data/cldr/common/main/teo_UG.xml
index f2659738cfb..9fe3938248d 100644
--- a/make/data/cldr/common/main/teo_UG.xml
+++ b/make/data/cldr/common/main/teo_UG.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/tg.xml b/make/data/cldr/common/main/tg.xml
index 0e6392f854c..99d34be7f21 100644
--- a/make/data/cldr/common/main/tg.xml
+++ b/make/data/cldr/common/main/tg.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/tg_TJ.xml b/make/data/cldr/common/main/tg_TJ.xml
index 6b8d827b269..c155c70a55d 100644
--- a/make/data/cldr/common/main/tg_TJ.xml
+++ b/make/data/cldr/common/main/tg_TJ.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/th.xml b/make/data/cldr/common/main/th.xml
index 0a627fd42e0..ea1a00e3d0f 100644
--- a/make/data/cldr/common/main/th.xml
+++ b/make/data/cldr/common/main/th.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -5344,6 +5344,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<currencyFormat type="standard">
 					<pattern>¤#,##0.00</pattern>
 					<pattern alt="alphaNextToNumber" draft="provisional">¤ #,##0.00</pattern>
+					<pattern alt="noCurrency" draft="provisional">#,##0.00</pattern>
 				</currencyFormat>
 				<currencyFormat type="accounting">
 					<pattern>¤#,##0.00;(¤#,##0.00)</pattern>
diff --git a/make/data/cldr/common/main/th_TH.xml b/make/data/cldr/common/main/th_TH.xml
index 7feac5e265a..345040b5b82 100644
--- a/make/data/cldr/common/main/th_TH.xml
+++ b/make/data/cldr/common/main/th_TH.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/ti.xml b/make/data/cldr/common/main/ti.xml
index 77738b234b1..767bdcbe280 100644
--- a/make/data/cldr/common/main/ti.xml
+++ b/make/data/cldr/common/main/ti.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/ti_ER.xml b/make/data/cldr/common/main/ti_ER.xml
index 93062dd72d5..c0fb0e068e6 100644
--- a/make/data/cldr/common/main/ti_ER.xml
+++ b/make/data/cldr/common/main/ti_ER.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/ti_ET.xml b/make/data/cldr/common/main/ti_ET.xml
index ec8c7604eb8..0bfe7c1e77d 100644
--- a/make/data/cldr/common/main/ti_ET.xml
+++ b/make/data/cldr/common/main/ti_ET.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/tig.xml b/make/data/cldr/common/main/tig.xml
index 3c079e55353..5d75170dd5a 100644
--- a/make/data/cldr/common/main/tig.xml
+++ b/make/data/cldr/common/main/tig.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/tig_ER.xml b/make/data/cldr/common/main/tig_ER.xml
index 66096312894..7a3145fdbc3 100644
--- a/make/data/cldr/common/main/tig_ER.xml
+++ b/make/data/cldr/common/main/tig_ER.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/tk.xml b/make/data/cldr/common/main/tk.xml
index 36465a20519..79104bb6449 100644
--- a/make/data/cldr/common/main/tk.xml
+++ b/make/data/cldr/common/main/tk.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/tk_TM.xml b/make/data/cldr/common/main/tk_TM.xml
index 4a14ee3ade1..e4c2dc9d1d2 100644
--- a/make/data/cldr/common/main/tk_TM.xml
+++ b/make/data/cldr/common/main/tk_TM.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/tn.xml b/make/data/cldr/common/main/tn.xml
index d1aca57a896..e157138b2a5 100644
--- a/make/data/cldr/common/main/tn.xml
+++ b/make/data/cldr/common/main/tn.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/tn_BW.xml b/make/data/cldr/common/main/tn_BW.xml
index ec774774ade..e938f664a76 100644
--- a/make/data/cldr/common/main/tn_BW.xml
+++ b/make/data/cldr/common/main/tn_BW.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/tn_ZA.xml b/make/data/cldr/common/main/tn_ZA.xml
index a4675dc9514..363601ca197 100644
--- a/make/data/cldr/common/main/tn_ZA.xml
+++ b/make/data/cldr/common/main/tn_ZA.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/to.xml b/make/data/cldr/common/main/to.xml
index d7891e9ffbf..e3010060c94 100644
--- a/make/data/cldr/common/main/to.xml
+++ b/make/data/cldr/common/main/to.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/to_TO.xml b/make/data/cldr/common/main/to_TO.xml
index bc46c596dd2..4f34629dcbd 100644
--- a/make/data/cldr/common/main/to_TO.xml
+++ b/make/data/cldr/common/main/to_TO.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/tok.xml b/make/data/cldr/common/main/tok.xml
index 65fee38557a..59db8671691 100644
--- a/make/data/cldr/common/main/tok.xml
+++ b/make/data/cldr/common/main/tok.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/tok_001.xml b/make/data/cldr/common/main/tok_001.xml
index d70868f3cff..00f80be924e 100644
--- a/make/data/cldr/common/main/tok_001.xml
+++ b/make/data/cldr/common/main/tok_001.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/tpi.xml b/make/data/cldr/common/main/tpi.xml
index 97e55f31e31..becca68770f 100644
--- a/make/data/cldr/common/main/tpi.xml
+++ b/make/data/cldr/common/main/tpi.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/tpi_PG.xml b/make/data/cldr/common/main/tpi_PG.xml
index 42a5bfe3851..26e12c3b8a2 100644
--- a/make/data/cldr/common/main/tpi_PG.xml
+++ b/make/data/cldr/common/main/tpi_PG.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/tr.xml b/make/data/cldr/common/main/tr.xml
index edf34da8561..21e58dc9a8b 100644
--- a/make/data/cldr/common/main/tr.xml
+++ b/make/data/cldr/common/main/tr.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -3900,6 +3900,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<currencyFormat type="standard">
 					<pattern>¤#,##0.00</pattern>
 					<pattern alt="alphaNextToNumber" draft="provisional">¤ #,##0.00</pattern>
+					<pattern alt="noCurrency" draft="provisional">#,##0.00</pattern>
 				</currencyFormat>
 				<currencyFormat type="accounting">
 					<pattern>¤#,##0.00;(¤#,##0.00)</pattern>
diff --git a/make/data/cldr/common/main/tr_CY.xml b/make/data/cldr/common/main/tr_CY.xml
index 51c2665e09d..301b78c911a 100644
--- a/make/data/cldr/common/main/tr_CY.xml
+++ b/make/data/cldr/common/main/tr_CY.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/tr_TR.xml b/make/data/cldr/common/main/tr_TR.xml
index b5f4f6b9907..db470b10669 100644
--- a/make/data/cldr/common/main/tr_TR.xml
+++ b/make/data/cldr/common/main/tr_TR.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/trv.xml b/make/data/cldr/common/main/trv.xml
index ef10a1c9961..655cbab6b0e 100644
--- a/make/data/cldr/common/main/trv.xml
+++ b/make/data/cldr/common/main/trv.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/trv_TW.xml b/make/data/cldr/common/main/trv_TW.xml
index a29c48baf71..257be361c18 100644
--- a/make/data/cldr/common/main/trv_TW.xml
+++ b/make/data/cldr/common/main/trv_TW.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/trw.xml b/make/data/cldr/common/main/trw.xml
index 725d8f6bbbc..f6c91fe2759 100644
--- a/make/data/cldr/common/main/trw.xml
+++ b/make/data/cldr/common/main/trw.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/trw_PK.xml b/make/data/cldr/common/main/trw_PK.xml
index ac600521497..a684e2fbeda 100644
--- a/make/data/cldr/common/main/trw_PK.xml
+++ b/make/data/cldr/common/main/trw_PK.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/ts.xml b/make/data/cldr/common/main/ts.xml
index c9d2049c577..76cbdd013a5 100644
--- a/make/data/cldr/common/main/ts.xml
+++ b/make/data/cldr/common/main/ts.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/ts_ZA.xml b/make/data/cldr/common/main/ts_ZA.xml
index 7b5b0040d33..74e249189ee 100644
--- a/make/data/cldr/common/main/ts_ZA.xml
+++ b/make/data/cldr/common/main/ts_ZA.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/tt.xml b/make/data/cldr/common/main/tt.xml
index 59e376e6862..51b999e428d 100644
--- a/make/data/cldr/common/main/tt.xml
+++ b/make/data/cldr/common/main/tt.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -3505,13 +3505,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				</percentFormat>
 			</percentFormatLength>
 		</percentFormats>
-		<currencyFormats>
-			<currencyFormatLength>
-				<currencyFormat type="standard">
-					<pattern draft="unconfirmed">#,##0.00¤</pattern>
-				</currencyFormat>
-			</currencyFormatLength>
-		</currencyFormats>
 		<currencyFormats numberSystem="latn">
 			<currencyFormatLength>
 				<currencyFormat type="standard">
diff --git a/make/data/cldr/common/main/tt_RU.xml b/make/data/cldr/common/main/tt_RU.xml
index 457e22723e5..afb7e501023 100644
--- a/make/data/cldr/common/main/tt_RU.xml
+++ b/make/data/cldr/common/main/tt_RU.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/twq.xml b/make/data/cldr/common/main/twq.xml
index 879b928c211..f056f2bc6bd 100644
--- a/make/data/cldr/common/main/twq.xml
+++ b/make/data/cldr/common/main/twq.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/twq_NE.xml b/make/data/cldr/common/main/twq_NE.xml
index 4cd326ae69f..e261e9d244c 100644
--- a/make/data/cldr/common/main/twq_NE.xml
+++ b/make/data/cldr/common/main/twq_NE.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/tyv.xml b/make/data/cldr/common/main/tyv.xml
index cb00198bf97..4457e457a04 100644
--- a/make/data/cldr/common/main/tyv.xml
+++ b/make/data/cldr/common/main/tyv.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/tyv_RU.xml b/make/data/cldr/common/main/tyv_RU.xml
index 1968e81a13a..5724eac34d6 100644
--- a/make/data/cldr/common/main/tyv_RU.xml
+++ b/make/data/cldr/common/main/tyv_RU.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/tzm.xml b/make/data/cldr/common/main/tzm.xml
index 00c6f99b2fd..c0c00692564 100644
--- a/make/data/cldr/common/main/tzm.xml
+++ b/make/data/cldr/common/main/tzm.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/tzm_MA.xml b/make/data/cldr/common/main/tzm_MA.xml
index bf1595b3bde..92b120762f7 100644
--- a/make/data/cldr/common/main/tzm_MA.xml
+++ b/make/data/cldr/common/main/tzm_MA.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/ug.xml b/make/data/cldr/common/main/ug.xml
index d33d0faa2bd..685a49e71cf 100644
--- a/make/data/cldr/common/main/ug.xml
+++ b/make/data/cldr/common/main/ug.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/ug_CN.xml b/make/data/cldr/common/main/ug_CN.xml
index 0ef634ba339..1be45500400 100644
--- a/make/data/cldr/common/main/ug_CN.xml
+++ b/make/data/cldr/common/main/ug_CN.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/uk.xml b/make/data/cldr/common/main/uk.xml
index 07e964a224b..ed07b15f361 100644
--- a/make/data/cldr/common/main/uk.xml
+++ b/make/data/cldr/common/main/uk.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -5473,6 +5473,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<currencyFormatLength>
 				<currencyFormat type="standard">
 					<pattern>#,##0.00 ¤</pattern>
+					<pattern alt="noCurrency" draft="provisional">#,##0.00</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 			<currencyFormatLength type="short">
diff --git a/make/data/cldr/common/main/uk_UA.xml b/make/data/cldr/common/main/uk_UA.xml
index e8712e1ce53..1bf69ebc03f 100644
--- a/make/data/cldr/common/main/uk_UA.xml
+++ b/make/data/cldr/common/main/uk_UA.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/ur.xml b/make/data/cldr/common/main/ur.xml
index c9eb2ebcf20..b56793e017c 100644
--- a/make/data/cldr/common/main/ur.xml
+++ b/make/data/cldr/common/main/ur.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -4307,6 +4307,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<currencyFormatLength>
 				<currencyFormat type="standard">
 					<pattern>¤#,##0.00</pattern>
+					<pattern alt="noCurrency" draft="provisional">#,##0.00</pattern>
 				</currencyFormat>
 				<currencyFormat type="accounting">
 					<pattern>¤#,##0.00;(¤#,##0.00)</pattern>
diff --git a/make/data/cldr/common/main/ur_IN.xml b/make/data/cldr/common/main/ur_IN.xml
index 43bb9e844df..e5a965fba35 100644
--- a/make/data/cldr/common/main/ur_IN.xml
+++ b/make/data/cldr/common/main/ur_IN.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/ur_PK.xml b/make/data/cldr/common/main/ur_PK.xml
index 15a06e36430..5fea1d2107e 100644
--- a/make/data/cldr/common/main/ur_PK.xml
+++ b/make/data/cldr/common/main/ur_PK.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/uz.xml b/make/data/cldr/common/main/uz.xml
index b60fc4602ef..af0dbd54840 100644
--- a/make/data/cldr/common/main/uz.xml
+++ b/make/data/cldr/common/main/uz.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/uz_Arab.xml b/make/data/cldr/common/main/uz_Arab.xml
index cfee01b5424..c69396e1118 100644
--- a/make/data/cldr/common/main/uz_Arab.xml
+++ b/make/data/cldr/common/main/uz_Arab.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/uz_Arab_AF.xml b/make/data/cldr/common/main/uz_Arab_AF.xml
index 2811c51a34d..6ed576b7875 100644
--- a/make/data/cldr/common/main/uz_Arab_AF.xml
+++ b/make/data/cldr/common/main/uz_Arab_AF.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/uz_Cyrl.xml b/make/data/cldr/common/main/uz_Cyrl.xml
index 04e8c03c201..6def99fbf5a 100644
--- a/make/data/cldr/common/main/uz_Cyrl.xml
+++ b/make/data/cldr/common/main/uz_Cyrl.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/uz_Cyrl_UZ.xml b/make/data/cldr/common/main/uz_Cyrl_UZ.xml
index 661662e2a54..d0d0a707515 100644
--- a/make/data/cldr/common/main/uz_Cyrl_UZ.xml
+++ b/make/data/cldr/common/main/uz_Cyrl_UZ.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/uz_Latn.xml b/make/data/cldr/common/main/uz_Latn.xml
index 751b7b9ad9d..cd8f4d69a6c 100644
--- a/make/data/cldr/common/main/uz_Latn.xml
+++ b/make/data/cldr/common/main/uz_Latn.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/uz_Latn_UZ.xml b/make/data/cldr/common/main/uz_Latn_UZ.xml
index 186352fa45c..1f47dcaa2af 100644
--- a/make/data/cldr/common/main/uz_Latn_UZ.xml
+++ b/make/data/cldr/common/main/uz_Latn_UZ.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/vai.xml b/make/data/cldr/common/main/vai.xml
index 7a933507f2c..15a5ff6c000 100644
--- a/make/data/cldr/common/main/vai.xml
+++ b/make/data/cldr/common/main/vai.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/vai_Latn.xml b/make/data/cldr/common/main/vai_Latn.xml
index 5a3fe8b92d6..5bc4338e37b 100644
--- a/make/data/cldr/common/main/vai_Latn.xml
+++ b/make/data/cldr/common/main/vai_Latn.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/vai_Latn_LR.xml b/make/data/cldr/common/main/vai_Latn_LR.xml
index 35c079808c8..da20c4a7e17 100644
--- a/make/data/cldr/common/main/vai_Latn_LR.xml
+++ b/make/data/cldr/common/main/vai_Latn_LR.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/vai_Vaii.xml b/make/data/cldr/common/main/vai_Vaii.xml
index ff8d2dddc32..b538a05af48 100644
--- a/make/data/cldr/common/main/vai_Vaii.xml
+++ b/make/data/cldr/common/main/vai_Vaii.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/vai_Vaii_LR.xml b/make/data/cldr/common/main/vai_Vaii_LR.xml
index 8d2a6a96a83..27f3c297b5b 100644
--- a/make/data/cldr/common/main/vai_Vaii_LR.xml
+++ b/make/data/cldr/common/main/vai_Vaii_LR.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/ve.xml b/make/data/cldr/common/main/ve.xml
index bba30a59a3d..3966f467954 100644
--- a/make/data/cldr/common/main/ve.xml
+++ b/make/data/cldr/common/main/ve.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/ve_ZA.xml b/make/data/cldr/common/main/ve_ZA.xml
index 4f4702d3e87..8a924f6f7f2 100644
--- a/make/data/cldr/common/main/ve_ZA.xml
+++ b/make/data/cldr/common/main/ve_ZA.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/vec.xml b/make/data/cldr/common/main/vec.xml
index 41eb1b7ee0d..df905e32262 100644
--- a/make/data/cldr/common/main/vec.xml
+++ b/make/data/cldr/common/main/vec.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/vec_IT.xml b/make/data/cldr/common/main/vec_IT.xml
index 7105959d47a..6363ccd9575 100644
--- a/make/data/cldr/common/main/vec_IT.xml
+++ b/make/data/cldr/common/main/vec_IT.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/vi.xml b/make/data/cldr/common/main/vi.xml
index 57ddb1ef436..3f709432953 100644
--- a/make/data/cldr/common/main/vi.xml
+++ b/make/data/cldr/common/main/vi.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -3944,6 +3944,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<currencyFormatLength>
 				<currencyFormat type="standard">
 					<pattern>#,##0.00 ¤</pattern>
+					<pattern alt="noCurrency" draft="provisional">#,##0.00</pattern>
 				</currencyFormat>
 				<currencyFormat type="accounting">
 					<pattern alt="noCurrency">#,##0.00;(#,##0.00)</pattern>
diff --git a/make/data/cldr/common/main/vi_VN.xml b/make/data/cldr/common/main/vi_VN.xml
index bddbba22d90..f1f8929aa41 100644
--- a/make/data/cldr/common/main/vi_VN.xml
+++ b/make/data/cldr/common/main/vi_VN.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/vmw.xml b/make/data/cldr/common/main/vmw.xml
index 659a9e4e4f4..0ee0670414f 100644
--- a/make/data/cldr/common/main/vmw.xml
+++ b/make/data/cldr/common/main/vmw.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/vmw_MZ.xml b/make/data/cldr/common/main/vmw_MZ.xml
index 3c6f3b580be..9f7491c0216 100644
--- a/make/data/cldr/common/main/vmw_MZ.xml
+++ b/make/data/cldr/common/main/vmw_MZ.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/vo.xml b/make/data/cldr/common/main/vo.xml
index f3ab9dc93e1..94fd4835ca3 100644
--- a/make/data/cldr/common/main/vo.xml
+++ b/make/data/cldr/common/main/vo.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/vo_001.xml b/make/data/cldr/common/main/vo_001.xml
index 489080db299..92c5491a3b6 100644
--- a/make/data/cldr/common/main/vo_001.xml
+++ b/make/data/cldr/common/main/vo_001.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/vun.xml b/make/data/cldr/common/main/vun.xml
index 8f618cd9c67..bbad57f0ec6 100644
--- a/make/data/cldr/common/main/vun.xml
+++ b/make/data/cldr/common/main/vun.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/vun_TZ.xml b/make/data/cldr/common/main/vun_TZ.xml
index e7380551a6a..f4460fcf1d2 100644
--- a/make/data/cldr/common/main/vun_TZ.xml
+++ b/make/data/cldr/common/main/vun_TZ.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/wa.xml b/make/data/cldr/common/main/wa.xml
index cf82dc51b86..bfd5f8d4eaf 100644
--- a/make/data/cldr/common/main/wa.xml
+++ b/make/data/cldr/common/main/wa.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/wa_BE.xml b/make/data/cldr/common/main/wa_BE.xml
index b3851d6d65d..961e3deffae 100644
--- a/make/data/cldr/common/main/wa_BE.xml
+++ b/make/data/cldr/common/main/wa_BE.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/wae.xml b/make/data/cldr/common/main/wae.xml
index b4f505481b0..ac04028d196 100644
--- a/make/data/cldr/common/main/wae.xml
+++ b/make/data/cldr/common/main/wae.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/wae_CH.xml b/make/data/cldr/common/main/wae_CH.xml
index 1476edb9eba..aa67be4f3f7 100644
--- a/make/data/cldr/common/main/wae_CH.xml
+++ b/make/data/cldr/common/main/wae_CH.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/wal.xml b/make/data/cldr/common/main/wal.xml
index a01abdb2fdc..70297ce0897 100644
--- a/make/data/cldr/common/main/wal.xml
+++ b/make/data/cldr/common/main/wal.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/wal_ET.xml b/make/data/cldr/common/main/wal_ET.xml
index 7b327c11634..6d1dc55e47a 100644
--- a/make/data/cldr/common/main/wal_ET.xml
+++ b/make/data/cldr/common/main/wal_ET.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/wbp.xml b/make/data/cldr/common/main/wbp.xml
index 567d70cc058..27c10869745 100644
--- a/make/data/cldr/common/main/wbp.xml
+++ b/make/data/cldr/common/main/wbp.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/wbp_AU.xml b/make/data/cldr/common/main/wbp_AU.xml
index c4eb9cd398c..244ea9b2135 100644
--- a/make/data/cldr/common/main/wbp_AU.xml
+++ b/make/data/cldr/common/main/wbp_AU.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/wo.xml b/make/data/cldr/common/main/wo.xml
index 859d240d1da..5b75bfa0907 100644
--- a/make/data/cldr/common/main/wo.xml
+++ b/make/data/cldr/common/main/wo.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/wo_SN.xml b/make/data/cldr/common/main/wo_SN.xml
index 4404a070ba3..a43f06c236a 100644
--- a/make/data/cldr/common/main/wo_SN.xml
+++ b/make/data/cldr/common/main/wo_SN.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/xh.xml b/make/data/cldr/common/main/xh.xml
index 4a80d82776c..e4dec18f57d 100644
--- a/make/data/cldr/common/main/xh.xml
+++ b/make/data/cldr/common/main/xh.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/xh_ZA.xml b/make/data/cldr/common/main/xh_ZA.xml
index 9b9f1627eb8..011f07b4128 100644
--- a/make/data/cldr/common/main/xh_ZA.xml
+++ b/make/data/cldr/common/main/xh_ZA.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/xnr.xml b/make/data/cldr/common/main/xnr.xml
index b6c823ffc0f..1bc080f23d7 100644
--- a/make/data/cldr/common/main/xnr.xml
+++ b/make/data/cldr/common/main/xnr.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/xnr_IN.xml b/make/data/cldr/common/main/xnr_IN.xml
index 09931f3aa1b..86d2752cfb4 100644
--- a/make/data/cldr/common/main/xnr_IN.xml
+++ b/make/data/cldr/common/main/xnr_IN.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/xog.xml b/make/data/cldr/common/main/xog.xml
index 08454c0f076..fc983490a00 100644
--- a/make/data/cldr/common/main/xog.xml
+++ b/make/data/cldr/common/main/xog.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/xog_UG.xml b/make/data/cldr/common/main/xog_UG.xml
index 0b882fe9ea5..4cacf2202e9 100644
--- a/make/data/cldr/common/main/xog_UG.xml
+++ b/make/data/cldr/common/main/xog_UG.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/yav.xml b/make/data/cldr/common/main/yav.xml
index 855051df41d..88d7b957533 100644
--- a/make/data/cldr/common/main/yav.xml
+++ b/make/data/cldr/common/main/yav.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/yav_CM.xml b/make/data/cldr/common/main/yav_CM.xml
index 1539a1e7285..1afe11bb924 100644
--- a/make/data/cldr/common/main/yav_CM.xml
+++ b/make/data/cldr/common/main/yav_CM.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/yi.xml b/make/data/cldr/common/main/yi.xml
index 412fd89a515..f640705eb82 100644
--- a/make/data/cldr/common/main/yi.xml
+++ b/make/data/cldr/common/main/yi.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/yi_UA.xml b/make/data/cldr/common/main/yi_UA.xml
index bf85c1e0b17..b991a4f53fc 100644
--- a/make/data/cldr/common/main/yi_UA.xml
+++ b/make/data/cldr/common/main/yi_UA.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/yo.xml b/make/data/cldr/common/main/yo.xml
index 9157498a583..056ec4d0f17 100644
--- a/make/data/cldr/common/main/yo.xml
+++ b/make/data/cldr/common/main/yo.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/yo_BJ.xml b/make/data/cldr/common/main/yo_BJ.xml
index 6c68d0ae2fe..0523124f50a 100644
--- a/make/data/cldr/common/main/yo_BJ.xml
+++ b/make/data/cldr/common/main/yo_BJ.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -1918,7 +1918,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</unit>
 			<unit type="duration-year">
 				<displayName>ɔ̀dún</displayName>
-				<perUnitPattern>{0} ɔd</perUnitPattern>
+				<unitPattern count="other">{0} ɔ̀dún</unitPattern>
 			</unit>
 			<unit type="duration-week">
 				<perUnitPattern>{0}/ɔsh</perUnitPattern>
@@ -2005,7 +2005,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<unit type="duration-year">
 				<displayName>ɔd</displayName>
 				<unitPattern count="other">{0} ɔd</unitPattern>
-				<perUnitPattern>{0}/ɔd</perUnitPattern>
 			</unit>
 			<unit type="duration-month">
 				<displayName>oshù</displayName>
@@ -2088,6 +2087,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</unit>
 		</unitLength>
 		<unitLength type="narrow">
+			<unit type="duration-year">
+				<displayName>ɔd</displayName>
+				<unitPattern count="other">{0} ɔd</unitPattern>
+			</unit>
 			<unit type="duration-week">
 				<displayName>ɔshɛ́</displayName>
 				<perUnitPattern>{0}/ɔ̀shɛ̀</perUnitPattern>
diff --git a/make/data/cldr/common/main/yo_NG.xml b/make/data/cldr/common/main/yo_NG.xml
index 43a18174b67..04c1f5f1969 100644
--- a/make/data/cldr/common/main/yo_NG.xml
+++ b/make/data/cldr/common/main/yo_NG.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/yrl.xml b/make/data/cldr/common/main/yrl.xml
index f22c56444ef..a82d832c7dc 100644
--- a/make/data/cldr/common/main/yrl.xml
+++ b/make/data/cldr/common/main/yrl.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/yrl_BR.xml b/make/data/cldr/common/main/yrl_BR.xml
index aecac36a980..27e049aa23f 100644
--- a/make/data/cldr/common/main/yrl_BR.xml
+++ b/make/data/cldr/common/main/yrl_BR.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/yrl_CO.xml b/make/data/cldr/common/main/yrl_CO.xml
index a0b060a17ab..a8607444c93 100644
--- a/make/data/cldr/common/main/yrl_CO.xml
+++ b/make/data/cldr/common/main/yrl_CO.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/yrl_VE.xml b/make/data/cldr/common/main/yrl_VE.xml
index 8f084e29fa2..d6663f73a9b 100644
--- a/make/data/cldr/common/main/yrl_VE.xml
+++ b/make/data/cldr/common/main/yrl_VE.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/yue.xml b/make/data/cldr/common/main/yue.xml
index 23add427dca..30024be998e 100644
--- a/make/data/cldr/common/main/yue.xml
+++ b/make/data/cldr/common/main/yue.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -1929,19 +1929,19 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<dateFormatLength type="full">
 						<dateFormat>
 							<pattern>G y年M月d日 EEEE</pattern>
-							<datetimeSkeleton>GyMEEEEd</datetimeSkeleton>
+							<datetimeSkeleton>GyMMMEEEEd</datetimeSkeleton>
 						</dateFormat>
 					</dateFormatLength>
 					<dateFormatLength type="long">
 						<dateFormat>
 							<pattern>G y年M月d日</pattern>
-							<datetimeSkeleton>GyMd</datetimeSkeleton>
+							<datetimeSkeleton>GyMMMd</datetimeSkeleton>
 						</dateFormat>
 					</dateFormatLength>
 					<dateFormatLength type="medium">
 						<dateFormat>
 							<pattern>G y年M月d日</pattern>
-							<datetimeSkeleton>GyMd</datetimeSkeleton>
+							<datetimeSkeleton>GyMMMd</datetimeSkeleton>
 						</dateFormat>
 					</dateFormatLength>
 					<dateFormatLength type="short">
@@ -2243,19 +2243,19 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<dateFormatLength type="full">
 						<dateFormat>
 							<pattern>y年M月d日 EEEE</pattern>
-							<datetimeSkeleton>yMEEEEd</datetimeSkeleton>
+							<datetimeSkeleton>yMMMEEEEd</datetimeSkeleton>
 						</dateFormat>
 					</dateFormatLength>
 					<dateFormatLength type="long">
 						<dateFormat>
 							<pattern>y年M月d日</pattern>
-							<datetimeSkeleton>yMd</datetimeSkeleton>
+							<datetimeSkeleton>yMMMd</datetimeSkeleton>
 						</dateFormat>
 					</dateFormatLength>
 					<dateFormatLength type="medium">
 						<dateFormat>
 							<pattern>y年M月d日</pattern>
-							<datetimeSkeleton>yMd</datetimeSkeleton>
+							<datetimeSkeleton>yMMMd</datetimeSkeleton>
 						</dateFormat>
 					</dateFormatLength>
 					<dateFormatLength type="short">
diff --git a/make/data/cldr/common/main/yue_Hans.xml b/make/data/cldr/common/main/yue_Hans.xml
index 653d3489721..b7c29be1597 100644
--- a/make/data/cldr/common/main/yue_Hans.xml
+++ b/make/data/cldr/common/main/yue_Hans.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -1389,19 +1389,19 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<dateFormatLength type="full">
 						<dateFormat>
 							<pattern>Gy年M月d日EEEE</pattern>
-							<datetimeSkeleton>GyMEEEEd</datetimeSkeleton>
+							<datetimeSkeleton>GyMMMEEEEd</datetimeSkeleton>
 						</dateFormat>
 					</dateFormatLength>
 					<dateFormatLength type="long">
 						<dateFormat>
 							<pattern>Gy年M月d日</pattern>
-							<datetimeSkeleton>GyMd</datetimeSkeleton>
+							<datetimeSkeleton>GyMMMd</datetimeSkeleton>
 						</dateFormat>
 					</dateFormatLength>
 					<dateFormatLength type="medium">
 						<dateFormat>
 							<pattern>Gy年M月d日</pattern>
-							<datetimeSkeleton>GyMd</datetimeSkeleton>
+							<datetimeSkeleton>GyMMMd</datetimeSkeleton>
 						</dateFormat>
 					</dateFormatLength>
 					<dateFormatLength type="short">
@@ -1928,19 +1928,19 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<dateFormatLength type="full">
 						<dateFormat>
 							<pattern>Gy年MM月d日EEEE</pattern>
-							<datetimeSkeleton>GyMMEEEEd</datetimeSkeleton>
+							<datetimeSkeleton>GyMMMEEEEd</datetimeSkeleton>
 						</dateFormat>
 					</dateFormatLength>
 					<dateFormatLength type="long">
 						<dateFormat>
 							<pattern>Gy年MM月d日</pattern>
-							<datetimeSkeleton>GyMMd</datetimeSkeleton>
+							<datetimeSkeleton>GyMMMd</datetimeSkeleton>
 						</dateFormat>
 					</dateFormatLength>
 					<dateFormatLength type="medium">
 						<dateFormat>
 							<pattern>Gy年MM月d日</pattern>
-							<datetimeSkeleton>GyMMd</datetimeSkeleton>
+							<datetimeSkeleton>GyMMMd</datetimeSkeleton>
 						</dateFormat>
 					</dateFormatLength>
 					<dateFormatLength type="short">
@@ -2251,19 +2251,19 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<dateFormatLength type="full">
 						<dateFormat>
 							<pattern>y年M月d日EEEE</pattern>
-							<datetimeSkeleton>yMEEEEd</datetimeSkeleton>
+							<datetimeSkeleton>yMMMEEEEd</datetimeSkeleton>
 						</dateFormat>
 					</dateFormatLength>
 					<dateFormatLength type="long">
 						<dateFormat>
 							<pattern>y年M月d日</pattern>
-							<datetimeSkeleton>yMd</datetimeSkeleton>
+							<datetimeSkeleton>yMMMd</datetimeSkeleton>
 						</dateFormat>
 					</dateFormatLength>
 					<dateFormatLength type="medium">
 						<dateFormat>
 							<pattern>y年M月d日</pattern>
-							<datetimeSkeleton>yMd</datetimeSkeleton>
+							<datetimeSkeleton>yMMMd</datetimeSkeleton>
 						</dateFormat>
 					</dateFormatLength>
 					<dateFormatLength type="short">
@@ -2543,19 +2543,19 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<dateFormatLength type="full">
 						<dateFormat>
 							<pattern>Gy年M月d日EEEE</pattern>
-							<datetimeSkeleton>GyMEEEEd</datetimeSkeleton>
+							<datetimeSkeleton>GyMMMEEEEd</datetimeSkeleton>
 						</dateFormat>
 					</dateFormatLength>
 					<dateFormatLength type="long">
 						<dateFormat>
 							<pattern>Gy年M月d日</pattern>
-							<datetimeSkeleton>GyMd</datetimeSkeleton>
+							<datetimeSkeleton>GyMMMd</datetimeSkeleton>
 						</dateFormat>
 					</dateFormatLength>
 					<dateFormatLength type="medium">
 						<dateFormat>
 							<pattern>Gy年M月d日</pattern>
-							<datetimeSkeleton>GyMd</datetimeSkeleton>
+							<datetimeSkeleton>GyMMMd</datetimeSkeleton>
 						</dateFormat>
 					</dateFormatLength>
 					<dateFormatLength type="short">
@@ -2632,19 +2632,19 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<dateFormatLength type="full">
 						<dateFormat>
 							<pattern>Gy年M月d日EEEE</pattern>
-							<datetimeSkeleton>GyMEEEEd</datetimeSkeleton>
+							<datetimeSkeleton>GyMMMEEEEd</datetimeSkeleton>
 						</dateFormat>
 					</dateFormatLength>
 					<dateFormatLength type="long">
 						<dateFormat>
 							<pattern>Gy年M月d日</pattern>
-							<datetimeSkeleton>GyMd</datetimeSkeleton>
+							<datetimeSkeleton>GyMMMd</datetimeSkeleton>
 						</dateFormat>
 					</dateFormatLength>
 					<dateFormatLength type="medium">
 						<dateFormat>
 							<pattern>Gy年M月d日</pattern>
-							<datetimeSkeleton>GyMd</datetimeSkeleton>
+							<datetimeSkeleton>GyMMMd</datetimeSkeleton>
 						</dateFormat>
 					</dateFormatLength>
 					<dateFormatLength type="short">
@@ -2920,19 +2920,19 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<dateFormatLength type="full">
 						<dateFormat>
 							<pattern>Gy年M月d日EEEE</pattern>
-							<datetimeSkeleton>GyMEEEEd</datetimeSkeleton>
+							<datetimeSkeleton>GyMMMEEEEd</datetimeSkeleton>
 						</dateFormat>
 					</dateFormatLength>
 					<dateFormatLength type="long">
 						<dateFormat>
 							<pattern>Gy年M月d日</pattern>
-							<datetimeSkeleton>GyMd</datetimeSkeleton>
+							<datetimeSkeleton>GyMMMd</datetimeSkeleton>
 						</dateFormat>
 					</dateFormatLength>
 					<dateFormatLength type="medium">
 						<dateFormat>
 							<pattern>Gy年M月d日</pattern>
-							<datetimeSkeleton>GyMd</datetimeSkeleton>
+							<datetimeSkeleton>GyMMMd</datetimeSkeleton>
 						</dateFormat>
 					</dateFormatLength>
 					<dateFormatLength type="short">
@@ -3018,19 +3018,19 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<dateFormatLength type="full">
 						<dateFormat>
 							<pattern>Gy年M月d日EEEE</pattern>
-							<datetimeSkeleton>GyMEEEEd</datetimeSkeleton>
+							<datetimeSkeleton>GyMMMEEEEd</datetimeSkeleton>
 						</dateFormat>
 					</dateFormatLength>
 					<dateFormatLength type="long">
 						<dateFormat>
 							<pattern>Gy年M月d日</pattern>
-							<datetimeSkeleton>GyMd</datetimeSkeleton>
+							<datetimeSkeleton>GyMMMd</datetimeSkeleton>
 						</dateFormat>
 					</dateFormatLength>
 					<dateFormatLength type="medium">
 						<dateFormat>
 							<pattern>Gy年M月d日</pattern>
-							<datetimeSkeleton>GyMd</datetimeSkeleton>
+							<datetimeSkeleton>GyMMMd</datetimeSkeleton>
 						</dateFormat>
 					</dateFormatLength>
 					<dateFormatLength type="short">
diff --git a/make/data/cldr/common/main/yue_Hans_CN.xml b/make/data/cldr/common/main/yue_Hans_CN.xml
index 5a0f87470d0..d9eda817a97 100644
--- a/make/data/cldr/common/main/yue_Hans_CN.xml
+++ b/make/data/cldr/common/main/yue_Hans_CN.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/yue_Hant.xml b/make/data/cldr/common/main/yue_Hant.xml
index f34cd5b4287..b3f9b4bf47e 100644
--- a/make/data/cldr/common/main/yue_Hant.xml
+++ b/make/data/cldr/common/main/yue_Hant.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/yue_Hant_CN.xml b/make/data/cldr/common/main/yue_Hant_CN.xml
index 82ee5657808..61ecf77dda7 100644
--- a/make/data/cldr/common/main/yue_Hant_CN.xml
+++ b/make/data/cldr/common/main/yue_Hant_CN.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -12,4 +12,36 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 		<script type="Hant"/>
 		<territory type="CN"/>
 	</identity>
+	<dates>
+		<calendars>
+			<calendar type="gregorian">
+				<timeFormats>
+					<timeFormatLength type="full">
+						<timeFormat>
+							<pattern draft="contributed">HH:mm:ss [zzzz]</pattern>
+							<datetimeSkeleton draft="contributed">HHmmsszzzz</datetimeSkeleton>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="long">
+						<timeFormat>
+							<pattern draft="contributed">HH:mm:ss [z]</pattern>
+							<datetimeSkeleton draft="contributed">HHmmssz</datetimeSkeleton>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="medium">
+						<timeFormat>
+							<pattern draft="contributed">HH:mm:ss</pattern>
+							<datetimeSkeleton draft="contributed">HHmmss</datetimeSkeleton>
+						</timeFormat>
+					</timeFormatLength>
+					<timeFormatLength type="short">
+						<timeFormat>
+							<pattern draft="contributed">HH:mm</pattern>
+							<datetimeSkeleton draft="contributed">HHmm</datetimeSkeleton>
+						</timeFormat>
+					</timeFormatLength>
+				</timeFormats>
+			</calendar>
+		</calendars>
+	</dates>
 </ldml>
diff --git a/make/data/cldr/common/main/yue_Hant_HK.xml b/make/data/cldr/common/main/yue_Hant_HK.xml
index 24920c69cd5..725d38bb37b 100644
--- a/make/data/cldr/common/main/yue_Hant_HK.xml
+++ b/make/data/cldr/common/main/yue_Hant_HK.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/yue_Hant_MO.xml b/make/data/cldr/common/main/yue_Hant_MO.xml
new file mode 100644
index 00000000000..96266c3d574
--- /dev/null
+++ b/make/data/cldr/common/main/yue_Hant_MO.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
+<!-- Copyright © 1991-2025 Unicode, Inc.
+For terms of use, see http://www.unicode.org/copyright.html
+SPDX-License-Identifier: Unicode-3.0
+CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
+-->
+<ldml>
+	<identity>
+		<version number="$Revision$"/>
+		<language type="yue"/>
+		<script type="Hant"/>
+		<territory type="MO"/>
+	</identity>
+</ldml>
diff --git a/make/data/cldr/common/main/za.xml b/make/data/cldr/common/main/za.xml
index d6b56c0fedd..0a0cba9b2e8 100644
--- a/make/data/cldr/common/main/za.xml
+++ b/make/data/cldr/common/main/za.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/za_CN.xml b/make/data/cldr/common/main/za_CN.xml
index 83256fd63a5..7d593285825 100644
--- a/make/data/cldr/common/main/za_CN.xml
+++ b/make/data/cldr/common/main/za_CN.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/zgh.xml b/make/data/cldr/common/main/zgh.xml
index a2492602028..98c44a230b0 100644
--- a/make/data/cldr/common/main/zgh.xml
+++ b/make/data/cldr/common/main/zgh.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/zgh_MA.xml b/make/data/cldr/common/main/zgh_MA.xml
index d068734cd5f..232e1b813f0 100644
--- a/make/data/cldr/common/main/zgh_MA.xml
+++ b/make/data/cldr/common/main/zgh_MA.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/zh.xml b/make/data/cldr/common/main/zh.xml
index 1ab973eb9b6..533073cf9f7 100644
--- a/make/data/cldr/common/main/zh.xml
+++ b/make/data/cldr/common/main/zh.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -2037,19 +2037,19 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<dateFormatLength type="full">
 						<dateFormat>
 							<pattern>Gy年M月d日EEEE</pattern>
-							<datetimeSkeleton>GyMEEEEd</datetimeSkeleton>
+							<datetimeSkeleton>GyMMMEEEEd</datetimeSkeleton>
 						</dateFormat>
 					</dateFormatLength>
 					<dateFormatLength type="long">
 						<dateFormat>
 							<pattern>Gy年M月d日</pattern>
-							<datetimeSkeleton>GyMd</datetimeSkeleton>
+							<datetimeSkeleton>GyMMMd</datetimeSkeleton>
 						</dateFormat>
 					</dateFormatLength>
 					<dateFormatLength type="medium">
 						<dateFormat>
 							<pattern>Gy年M月d日</pattern>
-							<datetimeSkeleton>GyMd</datetimeSkeleton>
+							<datetimeSkeleton>GyMMMd</datetimeSkeleton>
 						</dateFormat>
 					</dateFormatLength>
 					<dateFormatLength type="short">
@@ -2368,19 +2368,19 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<dateFormatLength type="full">
 						<dateFormat>
 							<pattern>y年M月d日EEEE</pattern>
-							<datetimeSkeleton>yMEEEEd</datetimeSkeleton>
+							<datetimeSkeleton>yMMMEEEEd</datetimeSkeleton>
 						</dateFormat>
 					</dateFormatLength>
 					<dateFormatLength type="long">
 						<dateFormat>
 							<pattern>y年M月d日</pattern>
-							<datetimeSkeleton>yMd</datetimeSkeleton>
+							<datetimeSkeleton>yMMMd</datetimeSkeleton>
 						</dateFormat>
 					</dateFormatLength>
 					<dateFormatLength type="medium">
 						<dateFormat>
 							<pattern>y年M月d日</pattern>
-							<datetimeSkeleton>yMd</datetimeSkeleton>
+							<datetimeSkeleton>yMMMd</datetimeSkeleton>
 						</dateFormat>
 					</dateFormatLength>
 					<dateFormatLength type="short">
@@ -2741,19 +2741,19 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<dateFormatLength type="full">
 						<dateFormat>
 							<pattern draft="contributed">Gy年MM月d日EEEE</pattern>
-							<datetimeSkeleton draft="contributed">GyMMEEEEd</datetimeSkeleton>
+							<datetimeSkeleton draft="contributed">GyMMMEEEEd</datetimeSkeleton>
 						</dateFormat>
 					</dateFormatLength>
 					<dateFormatLength type="long">
 						<dateFormat>
 							<pattern draft="contributed">Gy年MM月d日</pattern>
-							<datetimeSkeleton draft="contributed">GyMMd</datetimeSkeleton>
+							<datetimeSkeleton draft="contributed">GyMMMd</datetimeSkeleton>
 						</dateFormat>
 					</dateFormatLength>
 					<dateFormatLength type="medium">
 						<dateFormat>
 							<pattern draft="contributed">Gy年MM月d日</pattern>
-							<datetimeSkeleton draft="contributed">GyMMd</datetimeSkeleton>
+							<datetimeSkeleton draft="contributed">GyMMMd</datetimeSkeleton>
 						</dateFormat>
 					</dateFormatLength>
 					<dateFormatLength type="short">
@@ -5831,6 +5831,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<currencyFormat type="standard">
 					<pattern>¤#,##0.00</pattern>
 					<pattern alt="alphaNextToNumber" draft="provisional">¤ #,##0.00</pattern>
+					<pattern alt="noCurrency" draft="provisional">#,##0.00</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 		</currencyFormats>
@@ -5896,6 +5897,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<currencyFormat type="standard">
 					<pattern>¤#,##0.00</pattern>
 					<pattern alt="alphaNextToNumber" draft="provisional">¤ #,##0.00</pattern>
+					<pattern alt="noCurrency" draft="provisional">#,##0.00</pattern>
 				</currencyFormat>
 				<currencyFormat type="accounting">
 					<pattern>¤#,##0.00;(¤#,##0.00)</pattern>
diff --git a/make/data/cldr/common/main/zh_Hans.xml b/make/data/cldr/common/main/zh_Hans.xml
index 0c76ce0ebcb..591c79eb047 100644
--- a/make/data/cldr/common/main/zh_Hans.xml
+++ b/make/data/cldr/common/main/zh_Hans.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/zh_Hans_CN.xml b/make/data/cldr/common/main/zh_Hans_CN.xml
index fcdea0e9e42..a3429a4034b 100644
--- a/make/data/cldr/common/main/zh_Hans_CN.xml
+++ b/make/data/cldr/common/main/zh_Hans_CN.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/zh_Hans_HK.xml b/make/data/cldr/common/main/zh_Hans_HK.xml
index f94dae7db8c..f515f939262 100644
--- a/make/data/cldr/common/main/zh_Hans_HK.xml
+++ b/make/data/cldr/common/main/zh_Hans_HK.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/zh_Hans_MO.xml b/make/data/cldr/common/main/zh_Hans_MO.xml
index 16d25d5eeed..8793e0e150b 100644
--- a/make/data/cldr/common/main/zh_Hans_MO.xml
+++ b/make/data/cldr/common/main/zh_Hans_MO.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/zh_Hans_MY.xml b/make/data/cldr/common/main/zh_Hans_MY.xml
index 5a399f139cd..6a8050439d9 100644
--- a/make/data/cldr/common/main/zh_Hans_MY.xml
+++ b/make/data/cldr/common/main/zh_Hans_MY.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/zh_Hans_SG.xml b/make/data/cldr/common/main/zh_Hans_SG.xml
index 5c85bf323f1..3394c5466e7 100644
--- a/make/data/cldr/common/main/zh_Hans_SG.xml
+++ b/make/data/cldr/common/main/zh_Hans_SG.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/zh_Hant.xml b/make/data/cldr/common/main/zh_Hant.xml
index abb81625341..4dac776e727 100644
--- a/make/data/cldr/common/main/zh_Hant.xml
+++ b/make/data/cldr/common/main/zh_Hant.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -2083,19 +2083,19 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<dateFormatLength type="full">
 						<dateFormat>
 							<pattern>G y年M月d日 EEEE</pattern>
-							<datetimeSkeleton>GyMEEEEd</datetimeSkeleton>
+							<datetimeSkeleton>GyMMMEEEEd</datetimeSkeleton>
 						</dateFormat>
 					</dateFormatLength>
 					<dateFormatLength type="long">
 						<dateFormat>
 							<pattern>G y年M月d日</pattern>
-							<datetimeSkeleton>GyMd</datetimeSkeleton>
+							<datetimeSkeleton>GyMMMd</datetimeSkeleton>
 						</dateFormat>
 					</dateFormatLength>
 					<dateFormatLength type="medium">
 						<dateFormat>
 							<pattern>G y年M月d日</pattern>
-							<datetimeSkeleton>GyMd</datetimeSkeleton>
+							<datetimeSkeleton>GyMMMd</datetimeSkeleton>
 						</dateFormat>
 					</dateFormatLength>
 					<dateFormatLength type="short">
@@ -2355,19 +2355,19 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<dateFormatLength type="full">
 						<dateFormat>
 							<pattern>y年M月d日 EEEE</pattern>
-							<datetimeSkeleton>yMEEEEd</datetimeSkeleton>
+							<datetimeSkeleton>yMMMEEEEd</datetimeSkeleton>
 						</dateFormat>
 					</dateFormatLength>
 					<dateFormatLength type="long">
 						<dateFormat>
 							<pattern>y年M月d日</pattern>
-							<datetimeSkeleton>yMd</datetimeSkeleton>
+							<datetimeSkeleton>yMMMd</datetimeSkeleton>
 						</dateFormat>
 					</dateFormatLength>
 					<dateFormatLength type="medium">
 						<dateFormat>
 							<pattern>y年M月d日</pattern>
-							<datetimeSkeleton>yMd</datetimeSkeleton>
+							<datetimeSkeleton>yMMMd</datetimeSkeleton>
 						</dateFormat>
 					</dateFormatLength>
 					<dateFormatLength type="short">
@@ -6004,6 +6004,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<currencyFormat type="standard">
 					<pattern>¤#,##0.00</pattern>
 					<pattern alt="alphaNextToNumber" draft="provisional">¤ #,##0.00</pattern>
+					<pattern alt="noCurrency" draft="provisional">#,##0.00</pattern>
 				</currencyFormat>
 				<currencyFormat type="accounting">
 					<pattern>¤#,##0.00;(¤#,##0.00)</pattern>
diff --git a/make/data/cldr/common/main/zh_Hant_HK.xml b/make/data/cldr/common/main/zh_Hant_HK.xml
index c2c520f5dd1..8d6ffd863bb 100644
--- a/make/data/cldr/common/main/zh_Hant_HK.xml
+++ b/make/data/cldr/common/main/zh_Hant_HK.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/zh_Hant_MO.xml b/make/data/cldr/common/main/zh_Hant_MO.xml
index f941bdd6b45..20bd21f0f7f 100644
--- a/make/data/cldr/common/main/zh_Hant_MO.xml
+++ b/make/data/cldr/common/main/zh_Hant_MO.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/zh_Hant_MY.xml b/make/data/cldr/common/main/zh_Hant_MY.xml
index db9f6777c28..2f27e7052a5 100644
--- a/make/data/cldr/common/main/zh_Hant_MY.xml
+++ b/make/data/cldr/common/main/zh_Hant_MY.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/zh_Hant_TW.xml b/make/data/cldr/common/main/zh_Hant_TW.xml
index 35382c2bf79..5fdc6303fd9 100644
--- a/make/data/cldr/common/main/zh_Hant_TW.xml
+++ b/make/data/cldr/common/main/zh_Hant_TW.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/zh_Latn.xml b/make/data/cldr/common/main/zh_Latn.xml
index 8fcf4721e28..fd38ef7630f 100644
--- a/make/data/cldr/common/main/zh_Latn.xml
+++ b/make/data/cldr/common/main/zh_Latn.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/zh_Latn_CN.xml b/make/data/cldr/common/main/zh_Latn_CN.xml
index d347c12a7b4..dc44db9cb3b 100644
--- a/make/data/cldr/common/main/zh_Latn_CN.xml
+++ b/make/data/cldr/common/main/zh_Latn_CN.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/zu.xml b/make/data/cldr/common/main/zu.xml
index b5ba7786a55..bd893062aa9 100644
--- a/make/data/cldr/common/main/zu.xml
+++ b/make/data/cldr/common/main/zu.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/main/zu_ZA.xml b/make/data/cldr/common/main/zu_ZA.xml
index 758ca6e92b5..5a4a7498b5a 100644
--- a/make/data/cldr/common/main/zu_ZA.xml
+++ b/make/data/cldr/common/main/zu_ZA.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
-<!-- Copyright © 1991-2024 Unicode, Inc.
+<!-- Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
diff --git a/make/data/cldr/common/properties/coverageLevels.txt b/make/data/cldr/common/properties/coverageLevels.txt
index 38cdfd69c05..e8d75b8af16 100644
--- a/make/data/cldr/common/properties/coverageLevels.txt
+++ b/make/data/cldr/common/properties/coverageLevels.txt
@@ -119,7 +119,6 @@ or ;	modern ;	Odia
 pa ;	modern ;	Punjabi
 pcm ;	modern ;	Nigerian Pidgin
 pl ;	modern ;	Polish
-prg ;	basic ;	Prussian
 ps ;	modern ;	Pashto
 pt ;	modern ;	Portuguese
 qu ;	moderate ;	Quechua
@@ -167,7 +166,7 @@ vi ;	modern ;	Vietnamese
 vmw ;	basic ;	Makhuwa
 wo ;	moderate ;	Wolof
 xh ;	moderate ;	Xhosa
-xnr ;	moderate ;	Kangri
+xnr ;	basic ;	Kangri
 yo ;	modern ;	Yoruba
 yrl ;	basic ;	Nheengatu
 yue ;	modern ;	Cantonese
diff --git a/make/data/cldr/common/supplemental/attributeValueValidity.xml b/make/data/cldr/common/supplemental/attributeValueValidity.xml
index d8000f9f36d..10f314f7fd3 100644
--- a/make/data/cldr/common/supplemental/attributeValueValidity.xml
+++ b/make/data/cldr/common/supplemental/attributeValueValidity.xml
@@ -66,12 +66,12 @@
 			<variable id='$languageNonTcLtBasic' type='choice'>
 				 aa ab agq ak an ann apc arn asa
 				 ba bal bas bem bew bez bgn blt bm bo bss byn
-				 cad cch ccp ce cgg cho cic ckb co cu
+				 cad cch ccp ce cgg cho cic ckb co cop cu
 				 dav dje dua dv dyo dz
 				 ebu ee ewo
 				 ff frr fur
 				 gaa gez gn gsw guz gv
-				 haw hnj
+				 haw hnj ht
 				 ii io iu
 				 jbo jgo jmc
 				 kaa kab kaj kam kcg kde ken khq ki kkj kl kln kpe ksb ksf ksh kw
diff --git a/make/data/cldr/common/supplemental/coverageLevels.xml b/make/data/cldr/common/supplemental/coverageLevels.xml
index e90743ead92..2db941b8529 100644
--- a/make/data/cldr/common/supplemental/coverageLevels.xml
+++ b/make/data/cldr/common/supplemental/coverageLevels.xml
@@ -68,8 +68,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 		<coverageVariable key="%currency40" value="(BRL|CNY|EUR|GBP|INR|JPY|RUB|USD)"/>
 		<coverageVariable key="%currency60" value="(AUD|CAD|CHF|DKK|HKD|IDR|KRW|MXN|NOK|PLN|SAR|SEK|THB|TRY|TWD|ZAR)"/>
 		<coverageVariable key="%currency60_EU" value="(CZK|HUF)"/>
+		<!-- Restore ZWG to currency80 in next submission cycle https://unicode-org.atlassian.net/browse/CLDR-18258 -->
 		<coverageVariable key="%currency80" value="(AED|AFN|ALL|AMD|ANG|AOA|ARS|AWG|AZN|BAM|BBD|BDT|BGN|BHD|BIF|BMD|BND|BOB|BSD|BTN|BWP|BYN|BZD|CDF|CLP|CNH|COP|CRC|CUC|CUP|CVE|CZK|DJF|DOP|DZD|EGP|ERN|ETB|FJD|FKP|GEL|GHS|GIP|GMD|GNF|GTQ|GYD|HNL|HRK|HTG|HUF|ILS|IQD|IRR|ISK|JMD|JOD|KES|KGS|KHR|KMF|KPW|KWD|KYD|KZT|LAK|LBP|LKR|LRD|LSL|LYD|MAD|MDL|MGA|MKD|MMK|MNT|MOP|MRU|MUR|MVR|MWK|MYR|MZN|NAD|NGN|NIO|NPR|NZD|OMR|PAB|PEN|PGK|PHP|PKR|PYG|QAR|RON|RSD|RWF|SBD|SCR|SDG|SGD|SHP|SL[EL]|SOS|SRD|SSP|STN|SYP|SZL|TJS|TMT|TND|TOP|TTD|TZS|UAH|UGX|UYU|UZS|VES|VND|VUV|WST|XCD|XAF|XOF|XPF|YER|ZMW)"/>
-		<coverageVariable key="%currency100" value="(AFA|ADP|ALK|AO[KNR]|AR[ALMP]|ATS|AZM|BA[DN]|BE[CFL]|BG[LM]|BGO|BO[LPV]|BR[BCENRZ]|BUK|BY[BR]|CH[EW]|CL[EF]|CNX|COU|CS[DK]|CYP|DDM|DEM|EC[SV]|EEK|ES[ABP]|FIM|FRF|GEK|GHC|GNS|GQE|GRD|GW[EP]|HRD|IEP|IL[PR]|ISJ|ITL|KR[HO]|LT[LT]|LU[CFL]|LV[LR]|MAF|MCF|MDC|MGF|MKN|MLF|MRO|MT[LP]|MVP|MX[PV]|MZ[EM]|NIC|NLG|PE[IS]|PLZ|PTE|RHD|ROL|RUR|SD[DP]|SIT|SKK|SRG|STD|SUR|SVC|TJR|TMM|TPE|TRL|UAK|UGS|US[NS]|UY[IPW]|VE[BF]|VNN|XA[GU]|XB[ABCD]|XDR|XEU|XF[OU]|XP[DT]|XRE|XSU|XTS|XUA|YDD|YU[DMNR]|ZAL|ZMK|ZR[NZ]|ZW[DLR])"/>
+		<coverageVariable key="%currency100" value="(AFA|ADP|ALK|AO[KNR]|AR[ALMP]|ATS|AZM|BA[DN]|BE[CFL]|BG[LM]|BGO|BO[LPV]|BR[BCENRZ]|BUK|BY[BR]|CH[EW]|CL[EF]|CNX|COU|CS[DK]|CYP|DDM|DEM|EC[SV]|EEK|ES[ABP]|FIM|FRF|GEK|GHC|GNS|GQE|GRD|GW[EP]|HRD|IEP|IL[PR]|ISJ|ITL|KR[HO]|LT[LT]|LU[CFL]|LV[LR]|MAF|MCF|MDC|MGF|MKN|MLF|MRO|MT[LP]|MVP|MX[PV]|MZ[EM]|NIC|NLG|PE[IS]|PLZ|PTE|RHD|ROL|RUR|SD[DP]|SIT|SKK|SRG|STD|SUR|SVC|TJR|TMM|TPE|TRL|UAK|UGS|US[NS]|UY[IPW]|VE[BF]|VNN|XA[GU]|XB[ABCD]|XDR|XEU|XF[OU]|XP[DT]|XRE|XSU|XTS|XUA|YDD|YU[DMNR]|ZAL|ZMK|ZR[NZ]|ZW[DLRG])"/>
 		<coverageVariable key="%cyclicNameTypes" value="([1-9]?[0-9])"/>
 		<coverageVariable key="%d0Types80" value="(ascii|fwidth|hwidth|lower|title|upper)"/>
 		<coverageVariable key="%dateFormatItems" value="((E|d|Ed|EEEEd)|((Gy|y|yyyy|U)?(M|Md|MEd|MEEEEd|MMM|MMMd|MMMEd|MMMEEEEd|MMMM|MMMMd|MMMMEd|MMMMEEEEd))|((Gy|y|yyyy)(QQQ|QQQQ)?))"/>
@@ -107,7 +108,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 		<coverageVariable key="%language60_TD" value="(shu|dzg|kbl|mde|mua|sba)"/>
 		<!-- See CLDR-16673: All basic+ locales (per coverageLevels.txt) MUST have their language's name at least at level 80 (modern), except for those on exception list -->
 		<!-- Can use MinimizeRegex.java to "unpack" the compressed lists that are painful to edit -->
-		<coverageVariable key="%language80" value="(af|am|ar|as|az|be|bg|bgc|bho|bn|brx|bs|ca|ceb|cs|cv|cy|da|de|doi|el|en|es|et|eu|fa|fi|fil|fr|ga|gd|gl|gu|ha|he|hi|hr|hu|hy|id|ig|is|it|ja|jv|ka|kk|km|kn|ko|kok|ks|ky|lo|lt|lv|mai|mi|mk|ml|mn|mni|mr|ms|my|ne|nl|nn|no|or|pa|pcm|pl|ps|pt|raj|ro|ru|sa|sat|sd|si|sk|sl|so|sq|sr|su|sv|sw|ta|te|tg|th|ti|tk|tr|tt|uk|ur|uz|vi|wo|xh|yo|yue|zh|zu|ast|blo|br|chr|csw|dsb|eo|ff|fo|fy|hsb|ia|ie|kea|kgp|ku|kxv|lb|lij|lmo|mt|nds|nqo|oc|prg|qu|rm|sah|sc|syr|szl|to|ug|vec|vmw|xnr|yrl|za|mul|root|zxx|und)"/>
+		<coverageVariable key="%language80" value="(af|ak|am|ar|as|az|be|bg|bgc|bho|bn|brx|bs|ca|ceb|cs|cv|cy|da|de|doi|ee|el|en|es|et|eu|fa|fi|fil|fr|ga|gaa|gd|gl|gu|ha|he|hi|hr|hu|hy|id|ig|ii|is|it|ja|jv|ka|kk|km|kn|ko|kok|ks|ky|lo|lt|lv|mai|mi|mk|ml|mn|mni|mr|ms|my|ne|nl|nn|no|nso|om|or|pa|pcm|pl|ps|pt|raj|ro|ru|rw|sa|sat|sd|si|sk|sl|so|sq|sr|st|su|sv|sw|ta|te|tg|th|ti|tk|tn|tr|tt|uk|ur|uz|vi|wo|xh|yo|yue|zh|zu|ast|blo|br|chr|csw|dsb|eo|ff|fo|fy|hsb|ia|ie|kea|kgp|ku|kxv|lb|lij|lmo|mt|nds|nqo|oc|prg|qu|rm|sah|sc|syr|szl|to|ug|vec|vmw|xnr|yrl|za|mul|root|zxx|und)"/>
 		<coverageVariable key="%lbTypes80" value="(strict|normal|loose)"/>
 		<coverageVariable key="%lwTypes" value="(normal|breakall|keepall|phrase)"/>
 		<coverageVariable key="%m0Types80" value="(bgn|prprname|ungegn)"/>
@@ -171,6 +172,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 		<coverageVariable key="%unitsCommonUS" value="(length-(inch|foot|yard|mile)|mass-(ounce|pound)|temperature-fahrenheit|speed-mile-per-hour)"/>
 		<coverageVariable key="%unitsEnglish" value="(length-fathom|length-furlong|mass-stone|volume-bushel|energy-british-thermal-unit)"/>
 		<coverageVariable key="%unitsNonEnglish" value="[a-z]++-(?!(furlong|fathom|stone|bushel|mile-nautical))([a-z]++([-a-z]++)?)"/>
+		<coverageVariable key="%unitsNonLightSpeed" value="[a-z]++-(?!(light-speed))"/>
 		<coverageVariable key="%unitsOther" value="(length-(picometer|light-year)|pressure-(hectopascal|inch-ofhg|millibar)|acceleration-g-force|angle-(degree|minute|second)|area-(acre|hectare|square-(foot|kilometer|meter|mile))|power-(horsepower|kilowatt|watt)|speed-meter-per-second|volume-cubic-(mile|kilometer))"/>
 		<coverageVariable key="%unitBeaufortRegions" value="(CN|DE|GB|GR|HK|MO|MT|NL|TW|US)"/>
 		<coverageVariable key="%variantTypes" value="([A-Z0-9]++)"/>
@@ -228,6 +230,38 @@ For terms of use, see http://www.unicode.org/copyright.html
 
 		<coverageLevel value="moderate" match="characters/exemplarCharacters[@type='%anyAlphaNum']"/>
 
+
+		<!-- *********************
+		Temporary overrides for https://unicode-org.atlassian.net/browse/CLDR-18258
+
+		These overrides help us ignore values that were added not during a submission cycle. If interpreted normally, it
+		would cause many supported locales to drop in coverage. During the next regular submission cycle, please remove these rules
+		and encourage linguists to fix these values.
+		********************* -->
+		<!-- <coverageLevel	value="modern" inLanguage="de"	match="units/unitLength[@type='%unitLengths']/unit[@type='speed-light-speed']/unitPattern[@count='%anyAttribute']/[@case='%anyAttribute']"/>
+		<coverageLevel	value="modern"	match="units/unitLength[@type='%unitLengths']/unit[@type='speed-light-speed']/unitPattern[@count='%anyAttribute']"/>
+		<coverageLevel	value="modern"	match="units/unitLength[@type='%unitLengths']/unit[@type='speed-light-speed']/displayName"/> -->
+		<coverageLevel	value="comprehensive"	match="units/unitLength[@type='%unitLengths']/unit[@type='speed-light-speed']/unitPattern[@count='%anyAttribute'][@case='%anyAttribute']"/>
+
+		<!-- <coverageLevel inTerritory="%unitBeaufortRegions" value="modern" match="units/unitLength[@type='%unitLengths']/unit[@type='speed-beaufort']/unitPattern[@count='%anyAttribute'][@case='%anyAttribute']"/>
+		<coverageLevel inTerritory="%unitBeaufortRegions" value="modern" match="units/unitLength[@type='%unitLengths']/unit[@type='speed-beaufort']/unitPattern[@count='%anyAttribute']"/>
+		//ldml/units/unitLength[@type="long"]/unit[@type="speed-light-speed"]/unitPattern[@count="one"]
+modern //ldml/units/unitLength[@type="long"]/unit[@type="speed-light-speed"]/unitPattern[@count="one"][@case="accusative"]
+//ldml/units/unitLength[@type="long"]/unit[@type="speed-light-speed"]/unitPattern[@count="other"][@case="accusative"] -->
+		<coverageLevel	value="comprehensive"	match="units/unitLength[@type='%unitLengths']/unit[@type='speed-light-speed']/unitPattern[@count='%anyAttribute']"/>
+		<coverageLevel	value="comprehensive"	match="units/unitLength[@type='%unitLengths']/unit[@type='speed-light-speed']/displayName"/>
+
+    <!-- TestCoverageCompleteness {
+      Error: (TestCoverageLevel.java:729) Comprehensive & no exception for path =>      //ldml/units/unitLength[@type="long"]/unit[@type="speed-light-speed"]/unitPattern[@count="one"]
+      Error: (TestCoverageLevel.java:729) Comprehensive & no exception for path =>      //ldml/units/unitLength[@type="short"]/unit[@type="speed-light-speed"]/displayName
+      Error: (TestCoverageLevel.java:729) Comprehensive & no exception for path =>      //ldml/units/unitLength[@type="short"]/unit[@type="speed-light-speed"]/unitPattern[@count="one"]
+      Error: (TestCoverageLevel.java:729) Comprehensive & no exception for path =>      //ldml/units/unitLength[@type="short"]/unit[@type="speed-light-speed"]/unitPattern[@count="other"]
+      Error: (TestCoverageLevel.java:729) Comprehensive & no exception for path =>      //ldml/units/unitLength[@type="long"]/unit[@type="speed-light-speed"]/displayName
+      Error: (TestCoverageLevel.java:729) Comprehensive & no exception for path =>      //ldml/units/unitLength[@type="long"]/unit[@type="speed-light-speed"]/unitPattern[@count="other"]
+	   Error: (TestCoverageLevel.java:849) de (0) Broken Logical Grouping: comprehensive => [//ldml/units/unitLength[@type="long"]/unit[@type="speed-light-speed"]/unitPattern[@count="one"], //ldml/units/unitLength[@type="long"]/unit[@type="speed-light-speed"]/unitPattern[@count="other"]]
+      Error: (TestCoverageLevel.java:849) pl (0) Broken Logical Grouping: modern => [//ldml/units/unitLength[@type="long"]/unit[@type="speed-light-speed"]/unitPattern[@count="few"][@case="accusative"], //ldml/units/unitLength[@type="long"]/unit[@type="speed-light-speed"]/unitPattern[@count="few"][@case="genitive"], //ldml/units/unitLength[@type="long"]/unit[@type="speed-light-speed"]/unitPattern[@count="many"][@case="accusative"], //ldml/units/unitLength[@type="long"]/unit[@type="speed-light-speed"]/unitPattern[@count="many"][@case="genitive"], //ldml/units/unitLength[@type="long"]/unit[@type="speed-light-speed"]/unitPattern[@count="one"][@case="accusative"], //ldml/units/unitLength[@type="long"]/unit[@type="speed-light-speed"]/unitPattern[@count="one"][@case="genitive"], //ldml/units/unitLength[@type="long"]/unit[@type="speed-light-speed"]/unitPattern[@count="other"][@case="accusative"], //ldml/units/unitLength[@type="long"]/unit[@type="speed-light-speed"]/unitPattern[@count="other"][@case="genitive"]]
+      Error: (TestCoverageLevel.java:849) pl (0) Broken Logical Grouping: comprehensive => [//ldml/units/unitLength[@type="long"]/unit[@type="speed-light-speed"]/unitPattern[@count="few"], //ldml/units/unitLength[@type="long"]/unit[@type="speed-light-speed"]/unitPattern[@count="many"], //ldml/units/unitLength[@type="long"]/unit[@type="speed-light-speed"]/unitPattern[@count="one"], //ldml/units/unitLength[@type="long"]/unit[@type="speed-light-speed"]/unitPattern[@count="other"]]
+    } (1.309s) FAILED (4 failure(s)) -->
 		<!-- *********************
 		Modified Basic rules (v41)
 		These contain a mixture of basic and moderate.
@@ -510,6 +544,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 		<coverageLevel	value="basic"	 	match="numbers/decimalFormats[@numberSystem='latn']/decimalFormatLength/decimalFormat%stdPattern"/>
 		<coverageLevel	value="basic"	 	match="numbers/percentFormats[@numberSystem='latn']/percentFormatLength/percentFormat%stdPattern"/>
 		<coverageLevel	value="basic"	 	match="numbers/scientificFormats[@numberSystem='latn']/scientificFormatLength/scientificFormat%stdPattern"/>
+		<coverageLevel	value="moderate"	match="numbers/currencyFormats[@numberSystem='latn']/currencyFormatLength/currencyFormat%stdPattern[@alt='%anyAttribute']"/>
 		<coverageLevel	value="basic"	 	match="numbers/currencyFormats[@numberSystem='latn']/currencyFormatLength/currencyFormat%stdPattern"/>
 		<coverageLevel	value="moderate"	match="numbers/currencyFormats[@numberSystem='latn']/unitPattern[@count='%anyAttribute']"/>
 
@@ -519,42 +554,73 @@ For terms of use, see http://www.unicode.org/copyright.html
 		<coverageLevel	value="moderate"	match="numbers/decimalFormats[@numberSystem='latn']/decimalFormatLength[@type='%shortLong']/decimalFormat[@type='standard']/pattern[@type='%compactDecimalTypes'][@count='%anyAttribute']"/>
 
 		<!-- non-latn default number systems, standard formats for decimal/currency/percent/etc also at basic per TC 2024-05-08 -->
-		<coverageLevel	value="moderate"	inScript="%adlmDefaultScripts" match="numbers/currencyFormats[@numberSystem='adlm']/currencyFormatLength/currencyFormat%stdPattern[@alt='%anyAttribute']"/>
+
+		<!-- *********************
+		Most comprehensive levels are temporary overrides for https://unicode-org.atlassian.net/browse/CLDR-18258
+
+		These overrides help us ignore values that were added not during a submission cycle. If interpreted normally, it
+		would cause many supported locales to drop in coverage. During the next regular submission cycle, please remove these rules
+		and encourage linguists to fix these values. The 4 values should be moderate / basic / modern / moderate.
+		********************* -->
+		<coverageLevel	value="comprehensive"	inScript="%adlmDefaultScripts" match="numbers/currencyFormats[@numberSystem='adlm']/currencyFormatLength/currencyFormat%stdPattern[@alt='%anyAttribute']"/>
 		<coverageLevel	value="basic"		inScript="%adlmDefaultScripts" match="numbers/currencyFormats[@numberSystem='adlm']/currencyFormatLength/currencyFormat%stdPattern"/>
-		<coverageLevel	value="moderate"	inScript="%adlmDefaultScripts" match="numbers/currencyFormats[@numberSystem='adlm']/currencyFormatLength[@type='short']/currencyFormat[@type='standard']/pattern[@type='%compactDecimalTypes']"/>
-		<coverageLevel	value="moderate"	inLanguage="%arabDefaultLanguages" inScript="Arab" match="numbers/currencyFormats[@numberSystem='arab']/currencyFormatLength/currencyFormat%stdPattern[@alt='%anyAttribute']"/>
+		<coverageLevel	value="comprehensive"	    inScript="%adlmDefaultScripts" match="numbers/currencyFormats[@numberSystem='adlm']/currencyFormatLength[@type='short']/currencyFormat[@type='standard']/pattern[@type='%compactDecimalTypes'][@count='%anyAttribute'][@alt='%anyAttribute']"/>
+		<coverageLevel	value="comprehensive"	inScript="%adlmDefaultScripts" match="numbers/currencyFormats[@numberSystem='adlm']/currencyFormatLength[@type='short']/currencyFormat[@type='standard']/pattern[@type='%compactDecimalTypes'][@count='%anyAttribute']"/>
+
+		<coverageLevel	value="comprehensive"	inLanguage="%arabDefaultLanguages" inScript="Arab" match="numbers/currencyFormats[@numberSystem='arab']/currencyFormatLength/currencyFormat%stdPattern[@alt='%anyAttribute']"/>
 		<coverageLevel	value="basic"		inLanguage="%arabDefaultLanguages" inScript="Arab" match="numbers/currencyFormats[@numberSystem='arab']/currencyFormatLength/currencyFormat%stdPattern"/>
-		<coverageLevel	value="moderate"	inLanguage="%arabDefaultLanguages" inScript="Arab" match="numbers/currencyFormats[@numberSystem='arab']/currencyFormatLength[@type='short']/currencyFormat[@type='standard']/pattern[@type='%compactDecimalTypes']"/>
-		<coverageLevel	value="moderate"	inLanguage="%arabextDefaultLanguages" inScript="Arab" match="numbers/currencyFormats[@numberSystem='arabext']/currencyFormatLength/currencyFormat%stdPattern[@alt='%anyAttribute']"/>
+		<coverageLevel	value="comprehensive"	    inLanguage="%arabDefaultLanguages" inScript="Arab" match="numbers/currencyFormats[@numberSystem='arab']/currencyFormatLength[@type='short']/currencyFormat[@type='standard']/pattern[@type='%compactDecimalTypes'][@count='%anyAttribute'][@alt='%anyAttribute']"/>
+		<coverageLevel	value="comprehensive"	inLanguage="%arabDefaultLanguages" inScript="Arab" match="numbers/currencyFormats[@numberSystem='arab']/currencyFormatLength[@type='short']/currencyFormat[@type='standard']/pattern[@type='%compactDecimalTypes'][@count='%anyAttribute']"/>
+
+		<coverageLevel	value="comprehensive"	inLanguage="%arabextDefaultLanguages" inScript="Arab" match="numbers/currencyFormats[@numberSystem='arabext']/currencyFormatLength/currencyFormat%stdPattern[@alt='%anyAttribute']"/>
 		<coverageLevel	value="basic"		inLanguage="%arabextDefaultLanguages" inScript="Arab" match="numbers/currencyFormats[@numberSystem='arabext']/currencyFormatLength/currencyFormat%stdPattern"/>
-		<coverageLevel	value="moderate"	inLanguage="%arabextDefaultLanguages" inScript="Arab" match="numbers/currencyFormats[@numberSystem='arabext']/currencyFormatLength[@type='short']/currencyFormat[@type='standard']/pattern[@type='%compactDecimalTypes']"/>
-		<coverageLevel	value="moderate"	inScript="%bengDefaultScripts"	match="numbers/currencyFormats[@numberSystem='beng']/currencyFormatLength/currencyFormat%stdPattern[@alt='%anyAttribute']"/>
+		<coverageLevel	value="comprehensive"	    inLanguage="%arabextDefaultLanguages" inScript="Arab" match="numbers/currencyFormats[@numberSystem='arabext']/currencyFormatLength[@type='short']/currencyFormat[@type='standard']/pattern[@type='%compactDecimalTypes'][@count='%anyAttribute'][@alt='%anyAttribute']"/>
+		<coverageLevel	value="comprehensive"	inLanguage="%arabextDefaultLanguages" inScript="Arab" match="numbers/currencyFormats[@numberSystem='arabext']/currencyFormatLength[@type='short']/currencyFormat[@type='standard']/pattern[@type='%compactDecimalTypes'][@count='%anyAttribute']"/>
+
+		<coverageLevel	value="comprehensive"	inScript="%bengDefaultScripts"	match="numbers/currencyFormats[@numberSystem='beng']/currencyFormatLength/currencyFormat%stdPattern[@alt='%anyAttribute']"/>
 		<coverageLevel	value="basic"		inScript="%bengDefaultScripts"	match="numbers/currencyFormats[@numberSystem='beng']/currencyFormatLength/currencyFormat%stdPattern"/>
-		<coverageLevel	value="moderate"	inScript="%bengDefaultScripts"	match="numbers/currencyFormats[@numberSystem='beng']/currencyFormatLength[@type='short']/currencyFormat[@type='standard']/pattern[@type='%compactDecimalTypes']"/>
-		<coverageLevel	value="moderate"	inScript="%cakmDefaultScripts"	match="numbers/currencyFormats[@numberSystem='cakm']/currencyFormatLength/currencyFormat%stdPattern[@alt='%anyAttribute']"/>
+		<coverageLevel	value="comprehensive"	    inScript="%bengDefaultScripts"	match="numbers/currencyFormats[@numberSystem='beng']/currencyFormatLength[@type='short']/currencyFormat[@type='standard']/pattern[@type='%compactDecimalTypes'][@count='%anyAttribute'][@alt='%anyAttribute']"/>
+		<coverageLevel	value="comprehensive"	inScript="%bengDefaultScripts"	match="numbers/currencyFormats[@numberSystem='beng']/currencyFormatLength[@type='short']/currencyFormat[@type='standard']/pattern[@type='%compactDecimalTypes'][@count='%anyAttribute']"/>
+
+		<coverageLevel	value="comprehensive"	inScript="%cakmDefaultScripts"	match="numbers/currencyFormats[@numberSystem='cakm']/currencyFormatLength/currencyFormat%stdPattern[@alt='%anyAttribute']"/>
 		<coverageLevel	value="basic"		inScript="%cakmDefaultScripts"	match="numbers/currencyFormats[@numberSystem='cakm']/currencyFormatLength/currencyFormat%stdPattern"/>
-		<coverageLevel	value="moderate"	inScript="%cakmDefaultScripts"	match="numbers/currencyFormats[@numberSystem='cakm']/currencyFormatLength[@type='short']/currencyFormat[@type='standard']/pattern[@type='%compactDecimalTypes']"/>
-		<coverageLevel	value="moderate"	inLanguage="%devaDefaultLanguages" inScript="Deva" match="numbers/currencyFormats[@numberSystem='deva']/currencyFormatLength/currencyFormat%stdPattern[@alt='%anyAttribute']"/>
+		<coverageLevel	value="comprehensive"	    inScript="%cakmDefaultScripts"	match="numbers/currencyFormats[@numberSystem='cakm']/currencyFormatLength[@type='short']/currencyFormat[@type='standard']/pattern[@type='%compactDecimalTypes'][@count='%anyAttribute'][@alt='%anyAttribute']"/>
+		<coverageLevel	value="comprehensive"	inScript="%cakmDefaultScripts"	match="numbers/currencyFormats[@numberSystem='cakm']/currencyFormatLength[@type='short']/currencyFormat[@type='standard']/pattern[@type='%compactDecimalTypes'][@count='%anyAttribute']"/>
+
+		<coverageLevel	value="comprehensive"	inLanguage="%devaDefaultLanguages" inScript="Deva" match="numbers/currencyFormats[@numberSystem='deva']/currencyFormatLength/currencyFormat%stdPattern[@alt='%anyAttribute']"/>
 		<coverageLevel	value="basic"		inLanguage="%devaDefaultLanguages" inScript="Deva" match="numbers/currencyFormats[@numberSystem='deva']/currencyFormatLength/currencyFormat%stdPattern"/>
-		<coverageLevel	value="moderate"	inLanguage="%devaDefaultLanguages" inScript="Deva" match="numbers/currencyFormats[@numberSystem='deva']/currencyFormatLength[@type='short']/currencyFormat[@type='standard']/pattern[@type='%compactDecimalTypes']"/>
-		<coverageLevel	value="moderate"	inScript="%hmnpDefaultScripts"	match="numbers/currencyFormats[@numberSystem='hmnp']/currencyFormatLength/currencyFormat%stdPattern[@alt='%anyAttribute']"/>
+		<coverageLevel	value="comprehensive"	    inLanguage="%devaDefaultLanguages" inScript="Deva" match="numbers/currencyFormats[@numberSystem='deva']/currencyFormatLength[@type='short']/currencyFormat[@type='standard']/pattern[@type='%compactDecimalTypes'][@count='%anyAttribute'][@alt='%anyAttribute']"/>
+		<coverageLevel	value="comprehensive"	inLanguage="%devaDefaultLanguages" inScript="Deva" match="numbers/currencyFormats[@numberSystem='deva']/currencyFormatLength[@type='short']/currencyFormat[@type='standard']/pattern[@type='%compactDecimalTypes'][@count='%anyAttribute']"/>
+
+		<coverageLevel	value="comprehensive"	inScript="%hmnpDefaultScripts"	match="numbers/currencyFormats[@numberSystem='hmnp']/currencyFormatLength/currencyFormat%stdPattern[@alt='%anyAttribute']"/>
 		<coverageLevel	value="basic"		inScript="%hmnpDefaultScripts"	match="numbers/currencyFormats[@numberSystem='hmnp']/currencyFormatLength/currencyFormat%stdPattern"/>
-		<coverageLevel	value="moderate"	inScript="%hmnpDefaultScripts"	match="numbers/currencyFormats[@numberSystem='hmnp']/currencyFormatLength[@type='short']/currencyFormat[@type='standard']/pattern[@type='%compactDecimalTypes']"/>
-		<coverageLevel	value="moderate"	inScript="%mteiDefaultScripts"	match="numbers/currencyFormats[@numberSystem='mtei']/currencyFormatLength/currencyFormat%stdPattern[@alt='%anyAttribute']"/>
+		<coverageLevel	value="comprehensive"	    inScript="%hmnpDefaultScripts"	match="numbers/currencyFormats[@numberSystem='hmnp']/currencyFormatLength[@type='short']/currencyFormat[@type='standard']/pattern[@type='%compactDecimalTypes'][@count='%anyAttribute'][@alt='%anyAttribute']"/>
+		<coverageLevel	value="comprehensive"	inScript="%hmnpDefaultScripts"	match="numbers/currencyFormats[@numberSystem='hmnp']/currencyFormatLength[@type='short']/currencyFormat[@type='standard']/pattern[@type='%compactDecimalTypes'][@count='%anyAttribute']"/>
+
+		<coverageLevel	value="comprehensive"	inScript="%mteiDefaultScripts"	match="numbers/currencyFormats[@numberSystem='mtei']/currencyFormatLength/currencyFormat%stdPattern[@alt='%anyAttribute']"/>
 		<coverageLevel	value="basic"		inScript="%mteiDefaultScripts"	match="numbers/currencyFormats[@numberSystem='mtei']/currencyFormatLength/currencyFormat%stdPattern"/>
-		<coverageLevel	value="moderate"	inScript="%mteiDefaultScripts"	match="numbers/currencyFormats[@numberSystem='mtei']/currencyFormatLength[@type='short']/currencyFormat[@type='standard']/pattern[@type='%compactDecimalTypes']"/>
-		<coverageLevel	value="moderate"	inLanguage="%mymrDefaultLanguages"	match="numbers/currencyFormats[@numberSystem='mymr']/currencyFormatLength/currencyFormat%stdPattern[@alt='%anyAttribute']"/>
+		<coverageLevel	value="comprehensive"	    inScript="%mteiDefaultScripts"	match="numbers/currencyFormats[@numberSystem='mtei']/currencyFormatLength[@type='short']/currencyFormat[@type='standard']/pattern[@type='%compactDecimalTypes'][@count='%anyAttribute'][@alt='%anyAttribute']"/>
+		<coverageLevel	value="comprehensive"	inScript="%mteiDefaultScripts"	match="numbers/currencyFormats[@numberSystem='mtei']/currencyFormatLength[@type='short']/currencyFormat[@type='standard']/pattern[@type='%compactDecimalTypes'][@count='%anyAttribute']"/>
+
+		<coverageLevel	value="comprehensive"	inLanguage="%mymrDefaultLanguages"	match="numbers/currencyFormats[@numberSystem='mymr']/currencyFormatLength/currencyFormat%stdPattern[@alt='%anyAttribute']"/>
 		<coverageLevel	value="basic"		inLanguage="%mymrDefaultLanguages"	match="numbers/currencyFormats[@numberSystem='mymr']/currencyFormatLength/currencyFormat%stdPattern"/>
-		<coverageLevel	value="moderate"	inLanguage="%mymrDefaultLanguages"	match="numbers/currencyFormats[@numberSystem='mymr']/currencyFormatLength[@type='short']/currencyFormat[@type='standard']/pattern[@type='%compactDecimalTypes']"/>
-		<coverageLevel	value="moderate"	inLanguage="%nkooDefaultLanguages"	match="numbers/currencyFormats[@numberSystem='nkoo']/currencyFormatLength/currencyFormat%stdPattern[@alt='%anyAttribute']"/>
+		<coverageLevel	value="comprehensive"	    inLanguage="%mymrDefaultLanguages"	match="numbers/currencyFormats[@numberSystem='mymr']/currencyFormatLength[@type='short']/currencyFormat[@type='standard']/pattern[@type='%compactDecimalTypes'][@count='%anyAttribute'][@alt='%anyAttribute']"/>
+		<coverageLevel	value="comprehensive"	inLanguage="%mymrDefaultLanguages"	match="numbers/currencyFormats[@numberSystem='mymr']/currencyFormatLength[@type='short']/currencyFormat[@type='standard']/pattern[@type='%compactDecimalTypes'][@count='%anyAttribute']"/>
+
+		<coverageLevel	value="comprehensive"	inLanguage="%nkooDefaultLanguages"	match="numbers/currencyFormats[@numberSystem='nkoo']/currencyFormatLength/currencyFormat%stdPattern[@alt='%anyAttribute']"/>
 		<coverageLevel	value="basic"		inLanguage="%nkooDefaultLanguages"	match="numbers/currencyFormats[@numberSystem='nkoo']/currencyFormatLength/currencyFormat%stdPattern"/>
-		<coverageLevel	value="moderate"	inLanguage="%nkooDefaultLanguages"	match="numbers/currencyFormats[@numberSystem='nkoo']/currencyFormatLength[@type='short']/currencyFormat[@type='standard']/pattern[@type='%compactDecimalTypes']"/>
-		<coverageLevel	value="moderate"	inScript="%olckDefaultScripts"	match="numbers/currencyFormats[@numberSystem='olck']/currencyFormatLength/currencyFormat%stdPattern[@alt='%anyAttribute']"/>
+		<coverageLevel	value="comprehensive"	    inLanguage="%nkooDefaultLanguages"	match="numbers/currencyFormats[@numberSystem='nkoo']/currencyFormatLength[@type='short']/currencyFormat[@type='standard']/pattern[@type='%compactDecimalTypes'][@count='%anyAttribute'][@alt='%anyAttribute']"/>
+		<coverageLevel	value="comprehensive"	inLanguage="%nkooDefaultLanguages"	match="numbers/currencyFormats[@numberSystem='nkoo']/currencyFormatLength[@type='short']/currencyFormat[@type='standard']/pattern[@type='%compactDecimalTypes'][@count='%anyAttribute']"/>
+
+		<coverageLevel	value="comprehensive"	inScript="%olckDefaultScripts"	match="numbers/currencyFormats[@numberSystem='olck']/currencyFormatLength/currencyFormat%stdPattern[@alt='%anyAttribute']"/>
 		<coverageLevel	value="basic"		inScript="%olckDefaultScripts"	match="numbers/currencyFormats[@numberSystem='olck']/currencyFormatLength/currencyFormat%stdPattern"/>
-		<coverageLevel	value="moderate"	inScript="%olckDefaultScripts"	match="numbers/currencyFormats[@numberSystem='olck']/currencyFormatLength[@type='short']/currencyFormat[@type='standard']/pattern[@type='%compactDecimalTypes']"/>
-		<coverageLevel	value="moderate"	inLanguage="%tibtDefaultLanguages"	match="numbers/currencyFormats[@numberSystem='tibt']/currencyFormatLength/currencyFormat%stdPattern[@alt='%anyAttribute']"/>
+		<coverageLevel	value="comprehensive"	    inScript="%olckDefaultScripts"	match="numbers/currencyFormats[@numberSystem='olck']/currencyFormatLength[@type='short']/currencyFormat[@type='standard']/pattern[@type='%compactDecimalTypes'][@count='%anyAttribute'][@alt='%anyAttribute']"/>
+		<coverageLevel	value="comprehensive"	inScript="%olckDefaultScripts"	match="numbers/currencyFormats[@numberSystem='olck']/currencyFormatLength[@type='short']/currencyFormat[@type='standard']/pattern[@type='%compactDecimalTypes'][@count='%anyAttribute']"/>
+
+		<coverageLevel	value="comprehensive"	inLanguage="%tibtDefaultLanguages"	match="numbers/currencyFormats[@numberSystem='tibt']/currencyFormatLength/currencyFormat%stdPattern[@alt='%anyAttribute']"/>
 		<coverageLevel	value="basic"		inLanguage="%tibtDefaultLanguages"	match="numbers/currencyFormats[@numberSystem='tibt']/currencyFormatLength/currencyFormat%stdPattern"/>
-		<coverageLevel	value="moderate"	inLanguage="%tibtDefaultLanguages"	match="numbers/currencyFormats[@numberSystem='tibt']/currencyFormatLength[@type='short']/currencyFormat[@type='standard']/pattern[@type='%compactDecimalTypes']"/>
+		<coverageLevel	value="comprehensive"	    inLanguage="%tibtDefaultLanguages"	match="numbers/currencyFormats[@numberSystem='tibt']/currencyFormatLength[@type='short']/currencyFormat[@type='standard']/pattern[@type='%compactDecimalTypes'][@count='%anyAttribute'][@alt='%anyAttribute']"/>
+		<coverageLevel	value="comprehensive"	inLanguage="%tibtDefaultLanguages"	match="numbers/currencyFormats[@numberSystem='tibt']/currencyFormatLength[@type='short']/currencyFormat[@type='standard']/pattern[@type='%compactDecimalTypes'][@count='%anyAttribute']"/>
 	
 		<coverageLevel	value="moderate"	inScript="%adlmDefaultScripts"	match="numbers/decimalFormats[@numberSystem='adlm']/decimalFormatLength[@type='%shortLong']/decimalFormat[@type='standard']/pattern[@type='%compactDecimalTypes']"/>
 		<coverageLevel	value="basic"		inScript="%adlmDefaultScripts"	match="numbers/decimalFormats[@numberSystem='adlm']/decimalFormatLength/decimalFormat%stdPattern"/>
diff --git a/make/data/cldr/common/supplemental/dayPeriods.xml b/make/data/cldr/common/supplemental/dayPeriods.xml
index d898ad0a4a3..a19e6779d87 100644
--- a/make/data/cldr/common/supplemental/dayPeriods.xml
+++ b/make/data/cldr/common/supplemental/dayPeriods.xml
@@ -7,6 +7,7 @@
  -->
 <supplementalData>
 	<version number="$Revision$"/>
+	<!-- Remember to make parallel changes both dayPeriodRuleSets! -->
 	<dayPeriodRuleSet>
 		<dayPeriodRules locales="root">
 			<dayPeriodRule type="am" from="00:00" before="12:00"/>	<!-- AM -->
@@ -15,10 +16,10 @@
 		<dayPeriodRules locales="en">
 			<dayPeriodRule type="midnight" at="00:00"/>	<!-- midnight -->
 			<dayPeriodRule type="noon" at="12:00"/>	<!-- noon -->
-			<dayPeriodRule type="morning1" from="06:00" before="12:00"/>	<!-- morning -->
+			<dayPeriodRule type="morning1" from="00:00" before="12:00"/>	<!-- morning -->
 			<dayPeriodRule type="afternoon1" from="12:00" before="18:00"/>	<!-- afternoon -->
 			<dayPeriodRule type="evening1" from="18:00" before="21:00"/>	<!-- evening -->
-			<dayPeriodRule type="night1" from="21:00" before="06:00"/>	<!-- night -->
+			<dayPeriodRule type="night1" from="21:00" before="24:00"/>	<!-- night -->
 		</dayPeriodRules>
 		<dayPeriodRules locales="af">
 			<dayPeriodRule type="midnight" at="00:00"/>	<!-- middernag -->
@@ -693,10 +694,10 @@
 			<dayPeriodRule type="pm" from="12:00" before="24:00"/>	<!-- PM -->
 		</dayPeriodRules>
 		<dayPeriodRules locales="en">
-			<dayPeriodRule type="morning1" from="06:00" before="12:00"/>	<!-- morning -->
+			<dayPeriodRule type="morning1" from="00:00" before="12:00"/>	<!-- morning -->
 			<dayPeriodRule type="afternoon1" from="12:00" before="18:00"/>	<!-- afternoon -->
 			<dayPeriodRule type="evening1" from="18:00" before="21:00"/>	<!-- evening -->
-			<dayPeriodRule type="night1" from="21:00" before="06:00"/>	<!-- night -->
+			<dayPeriodRule type="night1" from="21:00" before="24:00"/>	<!-- night -->
 		</dayPeriodRules>
 		<dayPeriodRules locales="af">
 			<dayPeriodRule type="morning1" from="05:00" before="12:00"/>	<!-- oggend -->
diff --git a/make/data/cldr/common/supplemental/languageInfo.xml b/make/data/cldr/common/supplemental/languageInfo.xml
index 69206ac3569..3c106149481 100644
--- a/make/data/cldr/common/supplemental/languageInfo.xml
+++ b/make/data/cldr/common/supplemental/languageInfo.xml
@@ -36,7 +36,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			    and in the absence of better information. -->
 			<languageMatch desired="ab"	supported="ru"	distance="30"	oneway="true"/>	<!-- Abkhazian: ab ⇒ ru -->
 			<languageMatch desired="ach"	supported="en"	distance="30"	oneway="true"/>	<!-- Acoli (Southern Luo dialect in Uganda): ach ⇒ en -->
-			<languageMatch desired="af"	supported="nl"	distance="20"	oneway="true"/>	<!-- Afrikaans: af ⇒ nl -->
+			<languageMatch desired="af"	supported="en"	distance="20"	oneway="true"/>	<!-- Afrikaans: af ⇒ en -->
 			<languageMatch desired="ak"	supported="en"	distance="30"	oneway="true"/>	<!-- Akan: ak ⇒ en -->
 			<languageMatch desired="am"	supported="en"	distance="30"	oneway="true"/>	<!-- Amharic ⇒ English -->
 			<languageMatch desired="ay"	supported="es"	distance="20"	oneway="true"/>	<!-- Aymara: ay ⇒ es -->
diff --git a/make/data/cldr/common/supplemental/likelySubtags.xml b/make/data/cldr/common/supplemental/likelySubtags.xml
index e983ecb3852..8b87d7e23d7 100644
--- a/make/data/cldr/common/supplemental/likelySubtags.xml
+++ b/make/data/cldr/common/supplemental/likelySubtags.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE supplementalData SYSTEM "../../common/dtd/ldmlSupplemental.dtd">
 <!--
-Copyright © 1991-2024 Unicode, Inc.
+Copyright © 1991-2025 Unicode, Inc.
 For terms of use, see http://www.unicode.org/copyright.html
 SPDX-License-Identifier: Unicode-3.0
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -36,7 +36,7 @@ not be patched by hand, as any changes made in that fashion may be lost.
 		<likelySubtag from="ann" to="ann_Latn_NG"/>		<!--Obolo‧?‧?	➡ Obolo‧Latin‧Nigeria-->
 		<likelySubtag from="aoz" to="aoz_Latn_ID"/>		<!--Uab Meto‧?‧?	➡ Uab Meto‧Latin‧Indonesia-->
 		<likelySubtag from="apc" to="apc_Arab_SY"/>		<!--Levantine Arabic‧?‧?	➡ Levantine Arabic‧Arabic‧Syria-->
-		<likelySubtag from="apd" to="apd_Arab_TG"/>		<!--Sudanese Arabic‧?‧?	➡ Sudanese Arabic‧Arabic‧Togo-->
+		<likelySubtag from="apd" to="apd_Arab_SD"/>		<!--Sudanese Arabic‧?‧?	➡ Sudanese Arabic‧Arabic‧Sudan-->
 		<likelySubtag from="ar" to="ar_Arab_EG"/>		<!--Arabic‧?‧?	➡ Arabic‧Arabic‧Egypt-->
 		<likelySubtag from="arc" to="arc_Armi_IR"/>		<!--Aramaic‧?‧?	➡ Aramaic‧Imperial Aramaic‧Iran-->
 		<likelySubtag from="arc_Hatr" to="arc_Hatr_IQ"/>		<!--Aramaic‧Hatran‧?	➡ Aramaic‧Hatran‧Iraq-->
@@ -128,6 +128,7 @@ not be patched by hand, as any changes made in that fashion may be lost.
 		<likelySubtag from="cad" to="cad_Latn_US"/>		<!--Caddo‧?‧?	➡ Caddo‧Latin‧United States-->
 		<likelySubtag from="cch" to="cch_Latn_NG"/>		<!--Atsam‧?‧?	➡ Atsam‧Latin‧Nigeria-->
 		<likelySubtag from="ccp" to="ccp_Cakm_BD"/>		<!--Chakma‧?‧?	➡ Chakma‧Chakma‧Bangladesh-->
+		<likelySubtag from="ccr" to="ccr_Latn_SV"/>		<!--Cacaopera‧?‧?	➡ Cacaopera‧Latin‧El Salvador-->
 		<likelySubtag from="ce" to="ce_Cyrl_RU"/>		<!--Chechen‧?‧?	➡ Chechen‧Cyrillic‧Russia-->
 		<likelySubtag from="ceb" to="ceb_Latn_PH"/>		<!--Cebuano‧?‧?	➡ Cebuano‧Latin‧Philippines-->
 		<likelySubtag from="cgg" to="cgg_Latn_UG"/>		<!--Chiga‧?‧?	➡ Chiga‧Latin‧Uganda-->
@@ -182,6 +183,7 @@ not be patched by hand, as any changes made in that fashion may be lost.
 		<likelySubtag from="dyu" to="dyu_Latn_BF"/>		<!--Dyula‧?‧?	➡ Dyula‧Latin‧Burkina Faso-->
 		<likelySubtag from="dz" to="dz_Tibt_BT"/>		<!--Dzongkha‧?‧?	➡ Dzongkha‧Tibetan‧Bhutan-->
 		<likelySubtag from="ebu" to="ebu_Latn_KE"/>		<!--Embu‧?‧?	➡ Embu‧Latin‧Kenya-->
+		<likelySubtag from="ecy" to="ecy_Cprt_CY"/>		<!--Eteocypriot‧?‧?	➡ Eteocypriot‧Cypriot‧Cyprus-->
 		<likelySubtag from="ee" to="ee_Latn_GH"/>		<!--Ewe‧?‧?	➡ Ewe‧Latin‧Ghana-->
 		<likelySubtag from="efi" to="efi_Latn_NG"/>		<!--Efik‧?‧?	➡ Efik‧Latin‧Nigeria-->
 		<likelySubtag from="egl" to="egl_Latn_IT"/>		<!--Emilian‧?‧?	➡ Emilian‧Latin‧Italy-->
@@ -240,13 +242,13 @@ not be patched by hand, as any changes made in that fashion may be lost.
 		<likelySubtag from="gju" to="gju_Arab_PK"/>		<!--Gujari‧?‧?	➡ Gujari‧Arabic‧Pakistan-->
 		<likelySubtag from="gl" to="gl_Latn_ES"/>		<!--Galician‧?‧?	➡ Galician‧Latin‧Spain-->
 		<likelySubtag from="glk" to="glk_Arab_IR"/>		<!--Gilaki‧?‧?	➡ Gilaki‧Arabic‧Iran-->
+		<likelySubtag from="gmy" to="gmy_Linb_GR"/>		<!--Mycenaean Greek‧?‧?	➡ Mycenaean Greek‧Linear B‧Greece-->
 		<likelySubtag from="gn" to="gn_Latn_PY"/>		<!--Guarani‧?‧?	➡ Guarani‧Latin‧Paraguay-->
 		<likelySubtag from="gon" to="gon_Deva_IN"/>		<!--Gondi‧?‧?	➡ Gondi‧Devanagari‧India-->
 		<likelySubtag from="gor" to="gor_Latn_ID"/>		<!--Gorontalo‧?‧?	➡ Gorontalo‧Latin‧Indonesia-->
 		<likelySubtag from="gos" to="gos_Latn_NL"/>		<!--Gronings‧?‧?	➡ Gronings‧Latin‧Netherlands-->
 		<likelySubtag from="got" to="got_Goth_UA"/>		<!--Gothic‧?‧?	➡ Gothic‧Gothic‧Ukraine-->
-		<likelySubtag from="grc" to="grc_Cprt_CY"/>		<!--Ancient Greek‧?‧?	➡ Ancient Greek‧Cypriot‧Cyprus-->
-		<likelySubtag from="grc_Linb" to="grc_Linb_GR"/>		<!--Ancient Greek‧Linear B‧?	➡ Ancient Greek‧Linear B‧Greece-->
+		<likelySubtag from="grc" to="grc_Grek_GR"/>		<!--Ancient Greek‧?‧?	➡ Ancient Greek‧Greek‧Greece-->
 		<likelySubtag from="grt" to="grt_Beng_IN"/>		<!--Garo‧?‧?	➡ Garo‧Bangla‧India-->
 		<likelySubtag from="gsw" to="gsw_Latn_CH"/>		<!--Swiss German‧?‧?	➡ Swiss German‧Latin‧Switzerland-->
 		<likelySubtag from="gu" to="gu_Gujr_IN"/>		<!--Gujarati‧?‧?	➡ Gujarati‧Gujarati‧India-->
@@ -261,6 +263,8 @@ not be patched by hand, as any changes made in that fashion may be lost.
 		<likelySubtag from="ha_CM" to="ha_Arab_CM"/>		<!--Hausa‧?‧Cameroon	➡ Hausa‧Arabic‧Cameroon-->
 		<likelySubtag from="ha_SD" to="ha_Arab_SD"/>		<!--Hausa‧?‧Sudan	➡ Hausa‧Arabic‧Sudan-->
 		<likelySubtag from="hak" to="hak_Hans_CN"/>		<!--Hakka Chinese‧?‧?	➡ Hakka Chinese‧Simplified‧China-->
+		<likelySubtag from="hak_TW" to="hak_Hant_TW"/>		<!--Hakka Chinese‧?‧Taiwan	➡ Hakka Chinese‧Traditional‧Taiwan-->
+		<likelySubtag from="hak_Hant" to="hak_Hant_TW"/>		<!--Hakka Chinese‧Traditional‧?	➡ Hakka Chinese‧Traditional‧Taiwan-->
 		<likelySubtag from="haw" to="haw_Latn_US"/>		<!--Hawaiian‧?‧?	➡ Hawaiian‧Latin‧United States-->
 		<likelySubtag from="haz" to="haz_Arab_AF"/>		<!--Hazaragi‧?‧?	➡ Hazaragi‧Arabic‧Afghanistan-->
 		<likelySubtag from="he" to="he_Hebr_IL"/>		<!--Hebrew‧?‧?	➡ Hebrew‧Hebrew‧Israel-->
@@ -321,7 +325,7 @@ not be patched by hand, as any changes made in that fashion may be lost.
 		<likelySubtag from="kaj" to="kaj_Latn_NG"/>		<!--Jju‧?‧?	➡ Jju‧Latin‧Nigeria-->
 		<likelySubtag from="kam" to="kam_Latn_KE"/>		<!--Kamba‧?‧?	➡ Kamba‧Latin‧Kenya-->
 		<likelySubtag from="kao" to="kao_Latn_ML"/>		<!--Xaasongaxango‧?‧?	➡ Xaasongaxango‧Latin‧Mali-->
-		<likelySubtag from="kaw" to="kaw_Kawi_ID"/>		<!--Kawi‧?‧?	➡ Kawi‧Kawi‧Indonesia-->
+		<likelySubtag from="kaw" to="kaw_Bali_ID"/>		<!--Kawi‧?‧?	➡ Kawi‧Balinese‧Indonesia-->
 		<likelySubtag from="kbd" to="kbd_Cyrl_RU"/>		<!--Kabardian‧?‧?	➡ Kabardian‧Cyrillic‧Russia-->
 		<likelySubtag from="kby" to="kby_Arab_NE"/>		<!--Manga Kanuri‧?‧?	➡ Manga Kanuri‧Arabic‧Niger-->
 		<likelySubtag from="kcg" to="kcg_Latn_NG"/>		<!--Tyap‧?‧?	➡ Tyap‧Latin‧Nigeria-->
@@ -366,6 +370,7 @@ not be patched by hand, as any changes made in that fashion may be lost.
 		<likelySubtag from="kok" to="kok_Deva_IN"/>		<!--Konkani‧?‧?	➡ Konkani‧Devanagari‧India-->
 		<likelySubtag from="kos" to="kos_Latn_FM"/>		<!--Kosraean‧?‧?	➡ Kosraean‧Latin‧Micronesia-->
 		<likelySubtag from="kpe" to="kpe_Latn_LR"/>		<!--Kpelle‧?‧?	➡ Kpelle‧Latin‧Liberia-->
+		<likelySubtag from="kqn" to="kqn_Latn_ZM"/>		<!--Kaonde‧?‧?	➡ Kaonde‧Latin‧Zambia-->
 		<likelySubtag from="krc" to="krc_Cyrl_RU"/>		<!--Karachay-Balkar‧?‧?	➡ Karachay-Balkar‧Cyrillic‧Russia-->
 		<likelySubtag from="kri" to="kri_Latn_SL"/>		<!--Krio‧?‧?	➡ Krio‧Latin‧Sierra Leone-->
 		<likelySubtag from="krj" to="krj_Latn_PH"/>		<!--Kinaray-a‧?‧?	➡ Kinaray-a‧Latin‧Philippines-->
@@ -403,6 +408,8 @@ not be patched by hand, as any changes made in that fashion may be lost.
 		<likelySubtag from="lbe" to="lbe_Cyrl_RU"/>		<!--Lak‧?‧?	➡ Lak‧Cyrillic‧Russia-->
 		<likelySubtag from="lbw" to="lbw_Latn_ID"/>		<!--Tolaki‧?‧?	➡ Tolaki‧Latin‧Indonesia-->
 		<likelySubtag from="lcp" to="lcp_Thai_CN"/>		<!--Western Lawa‧?‧?	➡ Western Lawa‧Thai‧China-->
+		<likelySubtag from="leb" to="leb_Latn_ZM"/>		<!--Lala-Bisa‧?‧?	➡ Lala-Bisa‧Latin‧Zambia-->
+		<likelySubtag from="len" to="len_Latn_SV"/>		<!--Lenca‧?‧?	➡ Lenca‧Latin‧El Salvador-->
 		<likelySubtag from="lep" to="lep_Lepc_IN"/>		<!--Lepcha‧?‧?	➡ Lepcha‧Lepcha‧India-->
 		<likelySubtag from="lez" to="lez_Cyrl_RU"/>		<!--Lezghian‧?‧?	➡ Lezghian‧Cyrillic‧Russia-->
 		<likelySubtag from="lg" to="lg_Latn_UG"/>		<!--Ganda‧?‧?	➡ Ganda‧Latin‧Uganda-->
@@ -427,6 +434,8 @@ not be patched by hand, as any changes made in that fashion may be lost.
 		<likelySubtag from="ltg" to="ltg_Latn_LV"/>		<!--Latgalian‧?‧?	➡ Latgalian‧Latin‧Latvia-->
 		<likelySubtag from="lu" to="lu_Latn_CD"/>		<!--Luba-Katanga‧?‧?	➡ Luba-Katanga‧Latin‧Congo - Kinshasa-->
 		<likelySubtag from="lua" to="lua_Latn_CD"/>		<!--Luba-Lulua‧?‧?	➡ Luba-Lulua‧Latin‧Congo - Kinshasa-->
+		<likelySubtag from="lue" to="lue_Latn_ZM"/>		<!--Luvale‧?‧?	➡ Luvale‧Latin‧Zambia-->
+		<likelySubtag from="lun" to="lun_Latn_ZM"/>		<!--Lunda‧?‧?	➡ Lunda‧Latin‧Zambia-->
 		<likelySubtag from="luo" to="luo_Latn_KE"/>		<!--Luo‧?‧?	➡ Luo‧Latin‧Kenya-->
 		<likelySubtag from="luy" to="luy_Latn_KE"/>		<!--Luyia‧?‧?	➡ Luyia‧Latin‧Kenya-->
 		<likelySubtag from="luz" to="luz_Arab_IR"/>		<!--Southern Luri‧?‧?	➡ Southern Luri‧Arabic‧Iran-->
@@ -434,13 +443,14 @@ not be patched by hand, as any changes made in that fashion may be lost.
 		<likelySubtag from="lwl" to="lwl_Thai_TH"/>		<!--Eastern Lawa‧?‧?	➡ Eastern Lawa‧Thai‧Thailand-->
 		<likelySubtag from="lzh" to="lzh_Hans_CN"/>		<!--Literary Chinese‧?‧?	➡ Literary Chinese‧Simplified‧China-->
 		<likelySubtag from="lzz" to="lzz_Latn_TR"/>		<!--Laz‧?‧?	➡ Laz‧Latin‧Türkiye-->
+		<likelySubtag from="lzz_GE" to="lzz_Geor_GE"/>		<!--Laz‧?‧Georgia	➡ Laz‧Georgian‧Georgia-->
+		<likelySubtag from="lzz_Geor" to="lzz_Geor_GE"/>		<!--Laz‧Georgian‧?	➡ Laz‧Georgian‧Georgia-->
 		<likelySubtag from="mad" to="mad_Latn_ID"/>		<!--Madurese‧?‧?	➡ Madurese‧Latin‧Indonesia-->
 		<likelySubtag from="maf" to="maf_Latn_CM"/>		<!--Mafa‧?‧?	➡ Mafa‧Latin‧Cameroon-->
 		<likelySubtag from="mag" to="mag_Deva_IN"/>		<!--Magahi‧?‧?	➡ Magahi‧Devanagari‧India-->
 		<likelySubtag from="mai" to="mai_Deva_IN"/>		<!--Maithili‧?‧?	➡ Maithili‧Devanagari‧India-->
 		<likelySubtag from="mak" to="mak_Latn_ID"/>		<!--Makasar‧?‧?	➡ Makasar‧Latin‧Indonesia-->
 		<likelySubtag from="man" to="man_Latn_GM"/>		<!--Mandingo‧?‧?	➡ Mandingo‧Latin‧Gambia-->
-		<likelySubtag from="man_GN" to="man_Nkoo_GN"/>		<!--Mandingo‧?‧Guinea	➡ Mandingo‧N’Ko‧Guinea-->
 		<likelySubtag from="man_Nkoo" to="man_Nkoo_GN"/>		<!--Mandingo‧N’Ko‧?	➡ Mandingo‧N’Ko‧Guinea-->
 		<likelySubtag from="mas" to="mas_Latn_KE"/>		<!--Masai‧?‧?	➡ Masai‧Latin‧Kenya-->
 		<likelySubtag from="maz" to="maz_Latn_MX"/>		<!--Central Mazahua‧?‧?	➡ Central Mazahua‧Latin‧Mexico-->
@@ -498,6 +508,8 @@ not be patched by hand, as any changes made in that fashion may be lost.
 		<likelySubtag from="mzn" to="mzn_Arab_IR"/>		<!--Mazanderani‧?‧?	➡ Mazanderani‧Arabic‧Iran-->
 		<likelySubtag from="na" to="na_Latn_NR"/>		<!--Nauru‧?‧?	➡ Nauru‧Latin‧Nauru-->
 		<likelySubtag from="nan" to="nan_Hans_CN"/>		<!--Min Nan Chinese‧?‧?	➡ Min Nan Chinese‧Simplified‧China-->
+		<likelySubtag from="nan_TW" to="nan_Hant_TW"/>		<!--Min Nan Chinese‧?‧Taiwan	➡ Min Nan Chinese‧Traditional‧Taiwan-->
+		<likelySubtag from="nan_Hant" to="nan_Hant_TW"/>		<!--Min Nan Chinese‧Traditional‧?	➡ Min Nan Chinese‧Traditional‧Taiwan-->
 		<likelySubtag from="nap" to="nap_Latn_IT"/>		<!--Neapolitan‧?‧?	➡ Neapolitan‧Latin‧Italy-->
 		<likelySubtag from="naq" to="naq_Latn_NA"/>		<!--Nama‧?‧?	➡ Nama‧Latin‧Namibia-->
 		<likelySubtag from="nb" to="nb_Latn_NO"/>		<!--Norwegian Bokmål‧?‧?	➡ Norwegian Bokmål‧Latin‧Norway-->
@@ -525,6 +537,7 @@ not be patched by hand, as any changes made in that fashion may be lost.
 		<likelySubtag from="non" to="non_Runr_SE"/>		<!--Old Norse‧?‧?	➡ Old Norse‧Runic‧Sweden-->
 		<likelySubtag from="nqo" to="nqo_Nkoo_GN"/>		<!--N’Ko‧?‧?	➡ N’Ko‧N’Ko‧Guinea-->
 		<likelySubtag from="nr" to="nr_Latn_ZA"/>		<!--South Ndebele‧?‧?	➡ South Ndebele‧Latin‧South Africa-->
+		<likelySubtag from="nse" to="nse_Latn_ZM"/>		<!--Nsenga‧?‧?	➡ Nsenga‧Latin‧Zambia-->
 		<likelySubtag from="nsk" to="nsk_Cans_CA"/>		<!--Naskapi‧?‧?	➡ Naskapi‧Unified Canadian Aboriginal Syllabics‧Canada-->
 		<likelySubtag from="nso" to="nso_Latn_ZA"/>		<!--Northern Sotho‧?‧?	➡ Northern Sotho‧Latin‧South Africa-->
 		<likelySubtag from="nst" to="nst_Tnsa_IN"/>		<!--Tase Naga‧?‧?	➡ Tase Naga‧Tangsa‧India-->
@@ -538,6 +551,7 @@ not be patched by hand, as any changes made in that fashion may be lost.
 		<likelySubtag from="oc" to="oc_Latn_FR"/>		<!--Occitan‧?‧?	➡ Occitan‧Latin‧France-->
 		<likelySubtag from="oj" to="oj_Cans_CA"/>		<!--Ojibwa‧?‧?	➡ Ojibwa‧Unified Canadian Aboriginal Syllabics‧Canada-->
 		<likelySubtag from="ojs" to="ojs_Cans_CA"/>		<!--Oji-Cree‧?‧?	➡ Oji-Cree‧Unified Canadian Aboriginal Syllabics‧Canada-->
+		<likelySubtag from="ojw" to="ojw_Latn_CA"/>		<!--Western Ojibwa‧?‧?	➡ Western Ojibwa‧Latin‧Canada-->
 		<likelySubtag from="oka" to="oka_Latn_CA"/>		<!--Okanagan‧?‧?	➡ Okanagan‧Latin‧Canada-->
 		<likelySubtag from="om" to="om_Latn_ET"/>		<!--Oromo‧?‧?	➡ Oromo‧Latin‧Ethiopia-->
 		<likelySubtag from="or" to="or_Orya_IN"/>		<!--Odia‧?‧?	➡ Odia‧Odia‧India-->
@@ -567,7 +581,12 @@ not be patched by hand, as any changes made in that fashion may be lost.
 		<likelySubtag from="pl" to="pl_Latn_PL"/>		<!--Polish‧?‧?	➡ Polish‧Latin‧Poland-->
 		<likelySubtag from="pms" to="pms_Latn_IT"/>		<!--Piedmontese‧?‧?	➡ Piedmontese‧Latin‧Italy-->
 		<likelySubtag from="pnt" to="pnt_Grek_GR"/>		<!--Pontic‧?‧?	➡ Pontic‧Greek‧Greece-->
+		<likelySubtag from="pnt_RU" to="pnt_Cyrl_RU"/>		<!--Pontic‧?‧Russia	➡ Pontic‧Cyrillic‧Russia-->
+		<likelySubtag from="pnt_TR" to="pnt_Latn_TR"/>		<!--Pontic‧?‧Türkiye	➡ Pontic‧Latin‧Türkiye-->
+		<likelySubtag from="pnt_Cyrl" to="pnt_Cyrl_RU"/>		<!--Pontic‧Cyrillic‧?	➡ Pontic‧Cyrillic‧Russia-->
+		<likelySubtag from="pnt_Latn" to="pnt_Latn_TR"/>		<!--Pontic‧Latin‧?	➡ Pontic‧Latin‧Türkiye-->
 		<likelySubtag from="pon" to="pon_Latn_FM"/>		<!--Pohnpeian‧?‧?	➡ Pohnpeian‧Latin‧Micronesia-->
+		<likelySubtag from="ppl" to="ppl_Latn_SV"/>		<!--Pipil‧?‧?	➡ Pipil‧Latin‧El Salvador-->
 		<likelySubtag from="pqm" to="pqm_Latn_CA"/>		<!--Maliseet-Passamaquoddy‧?‧?	➡ Maliseet-Passamaquoddy‧Latin‧Canada-->
 		<likelySubtag from="pra" to="pra_Khar_PK"/>		<!--Prakrit languages‧?‧?	➡ Prakrit languages‧Kharoshthi‧Pakistan-->
 		<likelySubtag from="prd" to="prd_Arab_IR"/>		<!--Parsi-Dari‧?‧?	➡ Parsi-Dari‧Arabic‧Iran-->
@@ -630,7 +649,7 @@ not be patched by hand, as any changes made in that fashion may be lost.
 		<likelySubtag from="sei" to="sei_Latn_MX"/>		<!--Seri‧?‧?	➡ Seri‧Latin‧Mexico-->
 		<likelySubtag from="ses" to="ses_Latn_ML"/>		<!--Koyraboro Senni‧?‧?	➡ Koyraboro Senni‧Latin‧Mali-->
 		<likelySubtag from="sg" to="sg_Latn_CF"/>		<!--Sango‧?‧?	➡ Sango‧Latin‧Central African Republic-->
-		<likelySubtag from="sga" to="sga_Ogam_IE"/>		<!--Old Irish‧?‧?	➡ Old Irish‧Ogham‧Ireland-->
+		<likelySubtag from="sga" to="sga_Latn_IE"/>		<!--Old Irish‧?‧?	➡ Old Irish‧Latin‧Ireland-->
 		<likelySubtag from="sgs" to="sgs_Latn_LT"/>		<!--Samogitian‧?‧?	➡ Samogitian‧Latin‧Lithuania-->
 		<likelySubtag from="shi" to="shi_Tfng_MA"/>		<!--Tachelhit‧?‧?	➡ Tachelhit‧Tifinagh‧Morocco-->
 		<likelySubtag from="shn" to="shn_Mymr_MM"/>		<!--Shan‧?‧?	➡ Shan‧Myanmar‧Myanmar (Burma)-->
@@ -657,7 +676,6 @@ not be patched by hand, as any changes made in that fashion may be lost.
 		<likelySubtag from="sr" to="sr_Cyrl_RS"/>		<!--Serbian‧?‧?	➡ Serbian‧Cyrillic‧Serbia-->
 		<likelySubtag from="sr_ME" to="sr_Latn_ME"/>		<!--Serbian‧?‧Montenegro	➡ Serbian‧Latin‧Montenegro-->
 		<likelySubtag from="sr_RO" to="sr_Latn_RO"/>		<!--Serbian‧?‧Romania	➡ Serbian‧Latin‧Romania-->
-		<likelySubtag from="sr_RU" to="sr_Latn_RU"/>		<!--Serbian‧?‧Russia	➡ Serbian‧Latin‧Russia-->
 		<likelySubtag from="sr_TR" to="sr_Latn_TR"/>		<!--Serbian‧?‧Türkiye	➡ Serbian‧Latin‧Türkiye-->
 		<likelySubtag from="srb" to="srb_Sora_IN"/>		<!--Sora‧?‧?	➡ Sora‧Sora Sompeng‧India-->
 		<likelySubtag from="srn" to="srn_Latn_SR"/>		<!--Sranan Tongo‧?‧?	➡ Sranan Tongo‧Latin‧Suriname-->
@@ -712,6 +730,7 @@ not be patched by hand, as any changes made in that fashion may be lost.
 		<likelySubtag from="tnr" to="tnr_Latn_SN"/>		<!--Ménik‧?‧?	➡ Ménik‧Latin‧Senegal-->
 		<likelySubtag from="to" to="to_Latn_TO"/>		<!--Tongan‧?‧?	➡ Tongan‧Latin‧Tonga-->
 		<likelySubtag from="tog" to="tog_Latn_MW"/>		<!--Nyasa Tonga‧?‧?	➡ Nyasa Tonga‧Latin‧Malawi-->
+		<likelySubtag from="toi" to="toi_Latn_ZM"/>		<!--Tonga (Zambia)‧?‧?	➡ Tonga (Zambia)‧Latin‧Zambia-->
 		<likelySubtag from="tok" to="tok_Latn_001"/>		<!--Toki Pona‧?‧?	➡ Toki Pona‧Latin‧world-->
 		<likelySubtag from="tpi" to="tpi_Latn_PG"/>		<!--Tok Pisin‧?‧?	➡ Tok Pisin‧Latin‧Papua New Guinea-->
 		<likelySubtag from="tr" to="tr_Latn_TR"/>		<!--Turkish‧?‧?	➡ Turkish‧Latin‧Türkiye-->
@@ -831,7 +850,7 @@ not be patched by hand, as any changes made in that fashion may be lost.
 		<likelySubtag from="zh_Hant" to="zh_Hant_TW"/>		<!--Chinese‧Traditional‧?	➡ Chinese‧Traditional‧Taiwan-->
 		<likelySubtag from="zhx" to="zhx_Nshu_CN"/>		<!--Chinese (family)‧?‧?	➡ Chinese (family)‧Nüshu‧China-->
 		<likelySubtag from="zkt" to="zkt_Kits_CN"/>		<!--Kitan‧?‧?	➡ Kitan‧Khitan small script‧China-->
-		<likelySubtag from="zlm" to="zlm_Latn_TG"/>		<!--Malay (individual language)‧?‧?	➡ Malay (individual language)‧Latin‧Togo-->
+		<likelySubtag from="zlm" to="zlm_Latn_MY"/>		<!--Malay (individual language)‧?‧?	➡ Malay (individual language)‧Latin‧Malaysia-->
 		<likelySubtag from="zmi" to="zmi_Latn_MY"/>		<!--Negeri Sembilan Malay‧?‧?	➡ Negeri Sembilan Malay‧Latin‧Malaysia-->
 		<likelySubtag from="zu" to="zu_Latn_ZA"/>		<!--Zulu‧?‧?	➡ Zulu‧Latin‧South Africa-->
 		<likelySubtag from="zza" to="zza_Latn_TR"/>		<!--Zaza‧?‧?	➡ Zaza‧Latin‧Türkiye-->
@@ -864,10 +883,11 @@ not be patched by hand, as any changes made in that fashion may be lost.
 		<likelySubtag from="und_BQ" to="pap_Latn_BQ"/>		<!--?‧?‧Caribbean Netherlands	➡ Papiamento‧Latin‧Caribbean Netherlands-->
 		<likelySubtag from="und_BR" to="pt_Latn_BR"/>		<!--?‧?‧Brazil	➡ Portuguese‧Latin‧Brazil-->
 		<likelySubtag from="und_BT" to="dz_Tibt_BT"/>		<!--?‧?‧Bhutan	➡ Dzongkha‧Tibetan‧Bhutan-->
+		<likelySubtag from="und_BV" to="no_Latn_BV"/>		<!--?‧?‧Bouvet Island	➡ Norwegian‧Latin‧Bouvet Island-->
 		<likelySubtag from="und_BY" to="be_Cyrl_BY"/>		<!--?‧?‧Belarus	➡ Belarusian‧Cyrillic‧Belarus-->
 		<likelySubtag from="und_CC" to="ms_Arab_CC"/>		<!--?‧?‧Cocos (Keeling) Islands	➡ Malay‧Arabic‧Cocos (Keeling) Islands-->
-		<likelySubtag from="und_CD" to="sw_Latn_CD"/>		<!--?‧?‧Congo - Kinshasa	➡ Swahili‧Latin‧Congo - Kinshasa-->
-		<likelySubtag from="und_CF" to="fr_Latn_CF"/>		<!--?‧?‧Central African Republic	➡ French‧Latin‧Central African Republic-->
+		<likelySubtag from="und_CD" to="fr_Latn_CD"/>		<!--?‧?‧Congo - Kinshasa	➡ French‧Latin‧Congo - Kinshasa-->
+		<likelySubtag from="und_CF" to="sg_Latn_CF"/>		<!--?‧?‧Central African Republic	➡ Sango‧Latin‧Central African Republic-->
 		<likelySubtag from="und_CG" to="fr_Latn_CG"/>		<!--?‧?‧Congo - Brazzaville	➡ French‧Latin‧Congo - Brazzaville-->
 		<likelySubtag from="und_CH" to="de_Latn_CH"/>		<!--?‧?‧Switzerland	➡ German‧Latin‧Switzerland-->
 		<likelySubtag from="und_CI" to="fr_Latn_CI"/>		<!--?‧?‧Côte d’Ivoire	➡ French‧Latin‧Côte d’Ivoire-->
@@ -882,7 +902,7 @@ not be patched by hand, as any changes made in that fashion may be lost.
 		<likelySubtag from="und_CY" to="el_Grek_CY"/>		<!--?‧?‧Cyprus	➡ Greek‧Greek‧Cyprus-->
 		<likelySubtag from="und_CZ" to="cs_Latn_CZ"/>		<!--?‧?‧Czechia	➡ Czech‧Latin‧Czechia-->
 		<likelySubtag from="und_DE" to="de_Latn_DE"/>		<!--?‧?‧Germany	➡ German‧Latin‧Germany-->
-		<likelySubtag from="und_DJ" to="aa_Latn_DJ"/>		<!--?‧?‧Djibouti	➡ Afar‧Latin‧Djibouti-->
+		<likelySubtag from="und_DJ" to="fr_Latn_DJ"/>		<!--?‧?‧Djibouti	➡ French‧Latin‧Djibouti-->
 		<likelySubtag from="und_DK" to="da_Latn_DK"/>		<!--?‧?‧Denmark	➡ Danish‧Latin‧Denmark-->
 		<likelySubtag from="und_DO" to="es_Latn_DO"/>		<!--?‧?‧Dominican Republic	➡ Spanish‧Latin‧Dominican Republic-->
 		<likelySubtag from="und_DZ" to="ar_Arab_DZ"/>		<!--?‧?‧Algeria	➡ Arabic‧Arabic‧Algeria-->
@@ -954,7 +974,7 @@ not be patched by hand, as any changes made in that fashion may be lost.
 		<likelySubtag from="und_MQ" to="fr_Latn_MQ"/>		<!--?‧?‧Martinique	➡ French‧Latin‧Martinique-->
 		<likelySubtag from="und_MR" to="ar_Arab_MR"/>		<!--?‧?‧Mauritania	➡ Arabic‧Arabic‧Mauritania-->
 		<likelySubtag from="und_MT" to="mt_Latn_MT"/>		<!--?‧?‧Malta	➡ Maltese‧Latin‧Malta-->
-		<likelySubtag from="und_MU" to="mfe_Latn_MU"/>		<!--?‧?‧Mauritius	➡ Morisyen‧Latin‧Mauritius-->
+		<likelySubtag from="und_MU" to="fr_Latn_MU"/>		<!--?‧?‧Mauritius	➡ French‧Latin‧Mauritius-->
 		<likelySubtag from="und_MV" to="dv_Thaa_MV"/>		<!--?‧?‧Maldives	➡ Divehi‧Thaana‧Maldives-->
 		<likelySubtag from="und_MX" to="es_Latn_MX"/>		<!--?‧?‧Mexico	➡ Spanish‧Latin‧Mexico-->
 		<likelySubtag from="und_MY" to="ms_Latn_MY"/>		<!--?‧?‧Malaysia	➡ Malay‧Latin‧Malaysia-->
@@ -993,16 +1013,15 @@ not be patched by hand, as any changes made in that fashion may be lost.
 		<likelySubtag from="und_SI" to="sl_Latn_SI"/>		<!--?‧?‧Slovenia	➡ Slovenian‧Latin‧Slovenia-->
 		<likelySubtag from="und_SJ" to="nb_Latn_SJ"/>		<!--?‧?‧Svalbard & Jan Mayen	➡ Norwegian Bokmål‧Latin‧Svalbard & Jan Mayen-->
 		<likelySubtag from="und_SK" to="sk_Latn_SK"/>		<!--?‧?‧Slovakia	➡ Slovak‧Latin‧Slovakia-->
-		<likelySubtag from="und_SL" to="kri_Latn_SL"/>		<!--?‧?‧Sierra Leone	➡ Krio‧Latin‧Sierra Leone-->
 		<likelySubtag from="und_SM" to="it_Latn_SM"/>		<!--?‧?‧San Marino	➡ Italian‧Latin‧San Marino-->
-		<likelySubtag from="und_SN" to="fr_Latn_SN"/>		<!--?‧?‧Senegal	➡ French‧Latin‧Senegal-->
+		<likelySubtag from="und_SN" to="wo_Latn_SN"/>		<!--?‧?‧Senegal	➡ Wolof‧Latin‧Senegal-->
 		<likelySubtag from="und_SO" to="so_Latn_SO"/>		<!--?‧?‧Somalia	➡ Somali‧Latin‧Somalia-->
 		<likelySubtag from="und_SR" to="nl_Latn_SR"/>		<!--?‧?‧Suriname	➡ Dutch‧Latin‧Suriname-->
 		<likelySubtag from="und_SS" to="ar_Arab_SS"/>		<!--?‧?‧South Sudan	➡ Arabic‧Arabic‧South Sudan-->
 		<likelySubtag from="und_ST" to="pt_Latn_ST"/>		<!--?‧?‧São Tomé & Príncipe	➡ Portuguese‧Latin‧São Tomé & Príncipe-->
 		<likelySubtag from="und_SV" to="es_Latn_SV"/>		<!--?‧?‧El Salvador	➡ Spanish‧Latin‧El Salvador-->
 		<likelySubtag from="und_SY" to="ar_Arab_SY"/>		<!--?‧?‧Syria	➡ Arabic‧Arabic‧Syria-->
-		<likelySubtag from="und_TD" to="fr_Latn_TD"/>		<!--?‧?‧Chad	➡ French‧Latin‧Chad-->
+		<likelySubtag from="und_TD" to="ar_Arab_TD"/>		<!--?‧?‧Chad	➡ Arabic‧Arabic‧Chad-->
 		<likelySubtag from="und_TF" to="fr_Latn_TF"/>		<!--?‧?‧French Southern Territories	➡ French‧Latin‧French Southern Territories-->
 		<likelySubtag from="und_TG" to="fr_Latn_TG"/>		<!--?‧?‧Togo	➡ French‧Latin‧Togo-->
 		<likelySubtag from="und_TH" to="th_Thai_TH"/>		<!--?‧?‧Thailand	➡ Thai‧Thai‧Thailand-->
@@ -1029,13 +1048,13 @@ not be patched by hand, as any changes made in that fashion may be lost.
 		<likelySubtag from="und_XK" to="sq_Latn_XK"/>		<!--?‧?‧Kosovo	➡ Albanian‧Latin‧Kosovo-->
 		<likelySubtag from="und_YE" to="ar_Arab_YE"/>		<!--?‧?‧Yemen	➡ Arabic‧Arabic‧Yemen-->
 		<likelySubtag from="und_YT" to="fr_Latn_YT"/>		<!--?‧?‧Mayotte	➡ French‧Latin‧Mayotte-->
-		<likelySubtag from="und_ZM" to="bem_Latn_ZM"/>		<!--?‧?‧Zambia	➡ Bemba‧Latin‧Zambia-->
 		<likelySubtag from="und_ZW" to="sn_Latn_ZW"/>		<!--?‧?‧Zimbabwe	➡ Shona‧Latin‧Zimbabwe-->
 		<likelySubtag from="und_Adlm" to="ff_Adlm_GN"/>		<!--?‧Adlam‧?	➡ Fula‧Adlam‧Guinea-->
 		<likelySubtag from="und_Aghb" to="xag_Aghb_AZ"/>		<!--?‧Caucasian Albanian‧?	➡ Aghwan‧Caucasian Albanian‧Azerbaijan-->
 		<likelySubtag from="und_Ahom" to="aho_Ahom_IN"/>		<!--?‧Ahom‧?	➡ Ahom‧Ahom‧India-->
 		<likelySubtag from="und_Arab" to="ar_Arab_EG"/>		<!--?‧Arabic‧?	➡ Arabic‧Arabic‧Egypt-->
 		<likelySubtag from="und_Arab_AF" to="fa_Arab_AF"/>		<!--?‧Arabic‧Afghanistan	➡ Persian‧Arabic‧Afghanistan-->
+		<likelySubtag from="und_Arab_AZ" to="az_Arab_AZ"/>		<!--?‧Arabic‧Azerbaijan	➡ Azerbaijani‧Arabic‧Azerbaijan-->
 		<likelySubtag from="und_Arab_BN" to="ms_Arab_BN"/>		<!--?‧Arabic‧Brunei	➡ Malay‧Arabic‧Brunei-->
 		<likelySubtag from="und_Arab_CC" to="ms_Arab_CC"/>		<!--?‧Arabic‧Cocos (Keeling) Islands	➡ Malay‧Arabic‧Cocos (Keeling) Islands-->
 		<likelySubtag from="und_Arab_CN" to="ug_Arab_CN"/>		<!--?‧Arabic‧China	➡ Uyghur‧Arabic‧China-->
@@ -1049,7 +1068,6 @@ not be patched by hand, as any changes made in that fashion may be lost.
 		<likelySubtag from="und_Arab_MU" to="ur_Arab_MU"/>		<!--?‧Arabic‧Mauritius	➡ Urdu‧Arabic‧Mauritius-->
 		<likelySubtag from="und_Arab_NG" to="ha_Arab_NG"/>		<!--?‧Arabic‧Nigeria	➡ Hausa‧Arabic‧Nigeria-->
 		<likelySubtag from="und_Arab_PK" to="ur_Arab_PK"/>		<!--?‧Arabic‧Pakistan	➡ Urdu‧Arabic‧Pakistan-->
-		<likelySubtag from="und_Arab_TG" to="apd_Arab_TG"/>		<!--?‧Arabic‧Togo	➡ Sudanese Arabic‧Arabic‧Togo-->
 		<likelySubtag from="und_Arab_TH" to="mfa_Arab_TH"/>		<!--?‧Arabic‧Thailand	➡ Pattani Malay‧Arabic‧Thailand-->
 		<likelySubtag from="und_Arab_TJ" to="fa_Arab_TJ"/>		<!--?‧Arabic‧Tajikistan	➡ Persian‧Arabic‧Tajikistan-->
 		<likelySubtag from="und_Arab_TR" to="apc_Arab_TR"/>		<!--?‧Arabic‧Türkiye	➡ Levantine Arabic‧Arabic‧Türkiye-->
@@ -1076,7 +1094,7 @@ not be patched by hand, as any changes made in that fashion may be lost.
 		<likelySubtag from="und_Chrs" to="xco_Chrs_UZ"/>		<!--?‧Chorasmian‧?	➡ Chorasmian‧Chorasmian‧Uzbekistan-->
 		<likelySubtag from="und_Copt" to="cop_Copt_EG"/>		<!--?‧Coptic‧?	➡ Coptic‧Coptic‧Egypt-->
 		<likelySubtag from="und_Cpmn" to="und_Cpmn_CY"/>		<!--?‧Cypro-Minoan‧?	➡ ?‧Cypro-Minoan‧Cyprus-->
-		<likelySubtag from="und_Cprt" to="grc_Cprt_CY"/>		<!--?‧Cypriot‧?	➡ Ancient Greek‧Cypriot‧Cyprus-->
+		<likelySubtag from="und_Cprt" to="ecy_Cprt_CY"/>		<!--?‧Cypriot‧?	➡ Eteocypriot‧Cypriot‧Cyprus-->
 		<likelySubtag from="und_Cyrl" to="ru_Cyrl_RU"/>		<!--?‧Cyrillic‧?	➡ Russian‧Cyrillic‧Russia-->
 		<likelySubtag from="und_Cyrl_AF" to="kaa_Cyrl_AF"/>		<!--?‧Cyrillic‧Afghanistan	➡ Kara-Kalpak‧Cyrillic‧Afghanistan-->
 		<likelySubtag from="und_Cyrl_AL" to="mk_Cyrl_AL"/>		<!--?‧Cyrillic‧Albania	➡ Macedonian‧Cyrillic‧Albania-->
@@ -1189,7 +1207,7 @@ not be patched by hand, as any changes made in that fashion may be lost.
 		<likelySubtag from="und_Latn_MA" to="fr_Latn_MA"/>		<!--?‧Latin‧Morocco	➡ French‧Latin‧Morocco-->
 		<likelySubtag from="und_Latn_MK" to="sq_Latn_MK"/>		<!--?‧Latin‧North Macedonia	➡ Albanian‧Latin‧North Macedonia-->
 		<likelySubtag from="und_Latn_MM" to="kac_Latn_MM"/>		<!--?‧Latin‧Myanmar (Burma)	➡ Kachin‧Latin‧Myanmar (Burma)-->
-		<likelySubtag from="und_Latn_MO" to="pt_Latn_MO"/>		<!--?‧Latin‧Macao SAR China	➡ Portuguese‧Latin‧Macao SAR China-->
+		<likelySubtag from="und_Latn_MO" to="en_Latn_MO"/>		<!--?‧Latin‧Macao SAR China	➡ English‧Latin‧Macao SAR China-->
 		<likelySubtag from="und_Latn_MR" to="fr_Latn_MR"/>		<!--?‧Latin‧Mauritania	➡ French‧Latin‧Mauritania-->
 		<likelySubtag from="und_Latn_MV" to="en_Latn_MV"/>		<!--?‧Latin‧Maldives	➡ English‧Latin‧Maldives-->
 		<likelySubtag from="und_Latn_NP" to="en_Latn_NP"/>		<!--?‧Latin‧Nepal	➡ English‧Latin‧Nepal-->
@@ -1197,7 +1215,8 @@ not be patched by hand, as any changes made in that fashion may be lost.
 		<likelySubtag from="und_Latn_RU" to="krl_Latn_RU"/>		<!--?‧Latin‧Russia	➡ Karelian‧Latin‧Russia-->
 		<likelySubtag from="und_Latn_SD" to="en_Latn_SD"/>		<!--?‧Latin‧Sudan	➡ English‧Latin‧Sudan-->
 		<likelySubtag from="und_Latn_SS" to="en_Latn_SS"/>		<!--?‧Latin‧South Sudan	➡ English‧Latin‧South Sudan-->
-		<likelySubtag from="und_Latn_SY" to="fr_Latn_SY"/>		<!--?‧Latin‧Syria	➡ French‧Latin‧Syria-->
+		<likelySubtag from="und_Latn_SY" to="ku_Latn_SY"/>		<!--?‧Latin‧Syria	➡ Kurdish‧Latin‧Syria-->
+		<likelySubtag from="und_Latn_TD" to="fr_Latn_TD"/>		<!--?‧Latin‧Chad	➡ French‧Latin‧Chad-->
 		<likelySubtag from="und_Latn_TH" to="en_Latn_TH"/>		<!--?‧Latin‧Thailand	➡ English‧Latin‧Thailand-->
 		<likelySubtag from="und_Latn_TN" to="fr_Latn_TN"/>		<!--?‧Latin‧Tunisia	➡ French‧Latin‧Tunisia-->
 		<likelySubtag from="und_Latn_TW" to="trv_Latn_TW"/>		<!--?‧Latin‧Taiwan	➡ Taroko‧Latin‧Taiwan-->
@@ -1206,7 +1225,7 @@ not be patched by hand, as any changes made in that fashion may be lost.
 		<likelySubtag from="und_Lepc" to="lep_Lepc_IN"/>		<!--?‧Lepcha‧?	➡ Lepcha‧Lepcha‧India-->
 		<likelySubtag from="und_Limb" to="lif_Limb_IN"/>		<!--?‧Limbu‧?	➡ Limbu‧Limbu‧India-->
 		<likelySubtag from="und_Lina" to="lab_Lina_GR"/>		<!--?‧Linear A‧?	➡ Linear A‧Linear A‧Greece-->
-		<likelySubtag from="und_Linb" to="grc_Linb_GR"/>		<!--?‧Linear B‧?	➡ Ancient Greek‧Linear B‧Greece-->
+		<likelySubtag from="und_Linb" to="gmy_Linb_GR"/>		<!--?‧Linear B‧?	➡ Mycenaean Greek‧Linear B‧Greece-->
 		<likelySubtag from="und_Lisu" to="lis_Lisu_CN"/>		<!--?‧Fraser‧?	➡ Lisu‧Fraser‧China-->
 		<likelySubtag from="und_Lyci" to="xlc_Lyci_TR"/>		<!--?‧Lycian‧?	➡ Lycian‧Lycian‧Türkiye-->
 		<likelySubtag from="und_Lydi" to="xld_Lydi_TR"/>		<!--?‧Lydian‧?	➡ Lydian‧Lydian‧Türkiye-->
@@ -2325,7 +2344,6 @@ not be patched by hand, as any changes made in that fashion may be lost.
 		<likelySubtag from="ccl" to="ccl_Latn_TZ" origin="sil1"/>		<!--Cutchi-Swahili‧?‧?	➡ Cutchi-Swahili‧Latin‧Tanzania-->
 		<likelySubtag from="ccm" to="ccm_Latn_MY" origin="sil1"/>		<!--Malaccan Creole Malay‧?‧?	➡ Malaccan Creole Malay‧Latin‧Malaysia-->
 		<likelySubtag from="cco" to="cco_Latn_MX" origin="sil1"/>		<!--Comaltepec Chinantec‧?‧?	➡ Comaltepec Chinantec‧Latin‧Mexico-->
-		<likelySubtag from="ccr" to="ccr_Latn_SV" origin="sil1"/>		<!--Cacaopera‧?‧?	➡ Cacaopera‧Latin‧El Salvador-->
 		<likelySubtag from="cde" to="cde_Telu_IN" origin="sil1"/>		<!--Chenchu‧?‧?	➡ Chenchu‧Telugu‧India-->
 		<likelySubtag from="cdf" to="cdf_Latn_IN" origin="sil1"/>		<!--Chiru‧?‧?	➡ Chiru‧Latin‧India-->
 		<likelySubtag from="cdh" to="cdh_Deva_IN" origin="sil1"/>		<!--Chambeali‧?‧?	➡ Chambeali‧Devanagari‧India-->
@@ -2799,7 +2817,6 @@ not be patched by hand, as any changes made in that fashion may be lost.
 		<likelySubtag from="ebo" to="ebo_Latn_CG" origin="sil1"/>		<!--Teke-Ebo‧?‧?	➡ Teke-Ebo‧Latin‧Congo - Brazzaville-->
 		<likelySubtag from="ebr" to="ebr_Latn_CI" origin="sil1"/>		<!--Ebrié‧?‧?	➡ Ebrié‧Latin‧Côte d’Ivoire-->
 		<likelySubtag from="ecr" to="ecr_Grek_GR" origin="sil1"/>		<!--Eteocretan‧?‧?	➡ Eteocretan‧Greek‧Greece-->
-		<likelySubtag from="ecy" to="ecy_Cprt_CY" origin="sil1"/>		<!--Eteocypriot‧?‧?	➡ Eteocypriot‧Cypriot‧Cyprus-->
 		<likelySubtag from="efa" to="efa_Latn_NG" origin="sil1"/>		<!--Efai‧?‧?	➡ Efai‧Latin‧Nigeria-->
 		<likelySubtag from="efe" to="efe_Latn_CD" origin="sil1"/>		<!--Efe‧?‧?	➡ Efe‧Latin‧Congo - Kinshasa-->
 		<likelySubtag from="ega" to="ega_Latn_CI" origin="sil1"/>		<!--Ega‧?‧?	➡ Ega‧Latin‧Côte d’Ivoire-->
@@ -3099,7 +3116,6 @@ not be patched by hand, as any changes made in that fashion may be lost.
 		<likelySubtag from="gmu" to="gmu_Latn_PG" origin="sil1"/>		<!--Gumalu‧?‧?	➡ Gumalu‧Latin‧Papua New Guinea-->
 		<likelySubtag from="gmv" to="gmv_Ethi_ET" origin="sil1"/>		<!--Gamo‧?‧?	➡ Gamo‧Ethiopic‧Ethiopia-->
 		<likelySubtag from="gmx" to="gmx_Latn_TZ" origin="sil1"/>		<!--Magoma‧?‧?	➡ Magoma‧Latin‧Tanzania-->
-		<likelySubtag from="gmy" to="gmy_Linb_GR" origin="sil1"/>		<!--Mycenaean Greek‧?‧?	➡ Mycenaean Greek‧Linear B‧Greece-->
 		<likelySubtag from="gmz" to="gmz_Latn_NG" origin="sil1"/>		<!--Mgbolizhia‧?‧?	➡ Mgbolizhia‧Latin‧Nigeria-->
 		<likelySubtag from="gna" to="gna_Latn_BF" origin="sil1"/>		<!--Kaansa‧?‧?	➡ Kaansa‧Latin‧Burkina Faso-->
 		<likelySubtag from="gnb" to="gnb_Latn_IN" origin="sil1"/>		<!--Gangte‧?‧?	➡ Gangte‧Latin‧India-->
@@ -3970,7 +3986,6 @@ not be patched by hand, as any changes made in that fashion may be lost.
 		<likelySubtag from="kqk" to="kqk_Latn_BJ" origin="sil1"/>		<!--Kotafon Gbe‧?‧?	➡ Kotafon Gbe‧Latin‧Benin-->
 		<likelySubtag from="kql" to="kql_Latn_PG" origin="sil1"/>		<!--Kyenele‧?‧?	➡ Kyenele‧Latin‧Papua New Guinea-->
 		<likelySubtag from="kqm" to="kqm_Latn_CI" origin="sil1"/>		<!--Khisa‧?‧?	➡ Khisa‧Latin‧Côte d’Ivoire-->
-		<likelySubtag from="kqn" to="kqn_Latn_ZM" origin="sil1"/>		<!--Kaonde‧?‧?	➡ Kaonde‧Latin‧Zambia-->
 		<likelySubtag from="kqo" to="kqo_Latn_LR" origin="sil1"/>		<!--Eastern Krahn‧?‧?	➡ Eastern Krahn‧Latin‧Liberia-->
 		<likelySubtag from="kqp" to="kqp_Latn_TD" origin="sil1"/>		<!--Kimré‧?‧?	➡ Kimré‧Latin‧Chad-->
 		<likelySubtag from="kqq" to="kqq_Latn_BR" origin="sil1"/>		<!--Krenak‧?‧?	➡ Krenak‧Latin‧Brazil-->
@@ -4232,7 +4247,6 @@ not be patched by hand, as any changes made in that fashion may be lost.
 		<likelySubtag from="ldp" to="ldp_Latn_NG" origin="sil1"/>		<!--Tso‧?‧?	➡ Tso‧Latin‧Nigeria-->
 		<likelySubtag from="ldq" to="ldq_Latn_NG" origin="sil1"/>		<!--Lufu‧?‧?	➡ Lufu‧Latin‧Nigeria-->
 		<likelySubtag from="lea" to="lea_Latn_CD" origin="sil1"/>		<!--Lega-Shabunda‧?‧?	➡ Lega-Shabunda‧Latin‧Congo - Kinshasa-->
-		<likelySubtag from="leb" to="leb_Latn_ZM" origin="sil1"/>		<!--Lala-Bisa‧?‧?	➡ Lala-Bisa‧Latin‧Zambia-->
 		<likelySubtag from="lec" to="lec_Latn_BO" origin="sil1"/>		<!--Leco‧?‧?	➡ Leco‧Latin‧Bolivia-->
 		<likelySubtag from="led" to="led_Latn_CD" origin="sil1"/>		<!--Lendu‧?‧?	➡ Lendu‧Latin‧Congo - Kinshasa-->
 		<likelySubtag from="lee" to="lee_Latn_BF" origin="sil1"/>		<!--Lyélé‧?‧?	➡ Lyélé‧Latin‧Burkina Faso-->
@@ -4243,7 +4257,6 @@ not be patched by hand, as any changes made in that fashion may be lost.
 		<likelySubtag from="lek" to="lek_Latn_PG" origin="sil1"/>		<!--Leipon‧?‧?	➡ Leipon‧Latin‧Papua New Guinea-->
 		<likelySubtag from="lel" to="lel_Latn_CD" origin="sil1"/>		<!--Lele (Democratic Republic of Congo)‧?‧?	➡ Lele (Democratic Republic of Congo)‧Latin‧Congo - Kinshasa-->
 		<likelySubtag from="lem" to="lem_Latn_CM" origin="sil1"/>		<!--Nomaande‧?‧?	➡ Nomaande‧Latin‧Cameroon-->
-		<likelySubtag from="len" to="len_Latn_HN" origin="sil1"/>		<!--Lenca‧?‧?	➡ Lenca‧Latin‧Honduras-->
 		<likelySubtag from="leo" to="leo_Latn_CM" origin="sil1"/>		<!--Leti (Cameroon)‧?‧?	➡ Leti (Cameroon)‧Latin‧Cameroon-->
 		<likelySubtag from="leq" to="leq_Latn_PG" origin="sil1"/>		<!--Lembena‧?‧?	➡ Lembena‧Latin‧Papua New Guinea-->
 		<likelySubtag from="ler" to="ler_Latn_PG" origin="sil1"/>		<!--Lenkau‧?‧?	➡ Lenkau‧Latin‧Papua New Guinea-->
@@ -4422,14 +4435,12 @@ not be patched by hand, as any changes made in that fashion may be lost.
 		<likelySubtag from="ltu" to="ltu_Latn_ID" origin="sil1"/>		<!--Latu‧?‧?	➡ Latu‧Latin‧Indonesia-->
 		<likelySubtag from="luc" to="luc_Latn_UG" origin="sil1"/>		<!--Aringa‧?‧?	➡ Aringa‧Latin‧Uganda-->
 		<likelySubtag from="lud" to="lud_Latn_RU" origin="sil1"/>		<!--Ludian‧?‧?	➡ Ludian‧Latin‧Russia-->
-		<likelySubtag from="lue" to="lue_Latn_ZM" origin="sil1"/>		<!--Luvale‧?‧?	➡ Luvale‧Latin‧Zambia-->
 		<likelySubtag from="luf" to="luf_Latn_PG" origin="sil1"/>		<!--Laua‧?‧?	➡ Laua‧Latin‧Papua New Guinea-->
 		<likelySubtag from="lui" to="lui_Latn_US" origin="sil1"/>		<!--Luiseno‧?‧?	➡ Luiseno‧Latin‧United States-->
 		<likelySubtag from="luj" to="luj_Latn_CD" origin="sil1"/>		<!--Luna‧?‧?	➡ Luna‧Latin‧Congo - Kinshasa-->
 		<likelySubtag from="luk" to="luk_Tibt_BT" origin="sil1"/>		<!--Lunanakha‧?‧?	➡ Lunanakha‧Tibetan‧Bhutan-->
 		<likelySubtag from="lul" to="lul_Latn_SS" origin="sil1"/>		<!--Olu'bo‧?‧?	➡ Olu'bo‧Latin‧South Sudan-->
 		<likelySubtag from="lum" to="lum_Latn_AO" origin="sil1"/>		<!--Luimbi‧?‧?	➡ Luimbi‧Latin‧Angola-->
-		<likelySubtag from="lun" to="lun_Latn_ZM" origin="sil1"/>		<!--Lunda‧?‧?	➡ Lunda‧Latin‧Zambia-->
 		<likelySubtag from="lup" to="lup_Latn_GA" origin="sil1"/>		<!--Lumbu‧?‧?	➡ Lumbu‧Latin‧Gabon-->
 		<likelySubtag from="luq" to="luq_Latn_CU" origin="sil1"/>		<!--Lucumi‧?‧?	➡ Lucumi‧Latin‧Cuba-->
 		<likelySubtag from="lur" to="lur_Latn_ID" origin="sil1"/>		<!--Laura‧?‧?	➡ Laura‧Latin‧Indonesia-->
@@ -5322,7 +5333,6 @@ not be patched by hand, as any changes made in that fashion may be lost.
 		<likelySubtag from="nsb" to="nsb_Latn_ZA" origin="sil1"/>		<!--Lower Nossob‧?‧?	➡ Lower Nossob‧Latin‧South Africa-->
 		<likelySubtag from="nsc" to="nsc_Latn_NG" origin="sil1"/>		<!--Nshi‧?‧?	➡ Nshi‧Latin‧Nigeria-->
 		<likelySubtag from="nsd" to="nsd_Yiii_CN" origin="sil1"/>		<!--Southern Nisu‧?‧?	➡ Southern Nisu‧Yi‧China-->
-		<likelySubtag from="nse" to="nse_Latn_ZM" origin="sil1"/>		<!--Nsenga‧?‧?	➡ Nsenga‧Latin‧Zambia-->
 		<likelySubtag from="nsf" to="nsf_Yiii_CN" origin="sil1"/>		<!--Northwestern Nisu‧?‧?	➡ Northwestern Nisu‧Yi‧China-->
 		<likelySubtag from="nsg" to="nsg_Latn_TZ" origin="sil1"/>		<!--Ngasa‧?‧?	➡ Ngasa‧Latin‧Tanzania-->
 		<likelySubtag from="nsh" to="nsh_Latn_CM" origin="sil1"/>		<!--Ngoshie‧?‧?	➡ Ngoshie‧Latin‧Cameroon-->
@@ -5461,7 +5471,6 @@ not be patched by hand, as any changes made in that fashion may be lost.
 		<likelySubtag from="ojb" to="ojb_Latn_CA" origin="sil1"/>		<!--Northwestern Ojibwa‧?‧?	➡ Northwestern Ojibwa‧Latin‧Canada-->
 		<likelySubtag from="ojc" to="ojc_Latn_CA" origin="sil1"/>		<!--Central Ojibwa‧?‧?	➡ Central Ojibwa‧Latin‧Canada-->
 		<likelySubtag from="ojv" to="ojv_Latn_SB" origin="sil1"/>		<!--Ontong Java‧?‧?	➡ Ontong Java‧Latin‧Solomon Islands-->
-		<likelySubtag from="ojw" to="ojw_Latn_CA" origin="sil1"/>		<!--Western Ojibwa‧?‧?	➡ Western Ojibwa‧Latin‧Canada-->
 		<likelySubtag from="okb" to="okb_Latn_NG" origin="sil1"/>		<!--Okobo‧?‧?	➡ Okobo‧Latin‧Nigeria-->
 		<likelySubtag from="okc" to="okc_Latn_CD" origin="sil1"/>		<!--Kobo‧?‧?	➡ Kobo‧Latin‧Congo - Kinshasa-->
 		<likelySubtag from="okd" to="okd_Latn_NG" origin="sil1"/>		<!--Okodia‧?‧?	➡ Okodia‧Latin‧Nigeria-->
@@ -5766,7 +5775,6 @@ not be patched by hand, as any changes made in that fashion may be lost.
 		<likelySubtag from="ppe" to="ppe_Latn_PG" origin="sil1"/>		<!--Papi‧?‧?	➡ Papi‧Latin‧Papua New Guinea-->
 		<likelySubtag from="ppi" to="ppi_Latn_MX" origin="sil1"/>		<!--Paipai‧?‧?	➡ Paipai‧Latin‧Mexico-->
 		<likelySubtag from="ppk" to="ppk_Latn_ID" origin="sil1"/>		<!--Uma‧?‧?	➡ Uma‧Latin‧Indonesia-->
-		<likelySubtag from="ppl" to="ppl_Latn_SV" origin="sil1"/>		<!--Pipil‧?‧?	➡ Pipil‧Latin‧El Salvador-->
 		<likelySubtag from="ppm" to="ppm_Latn_ID" origin="sil1"/>		<!--Papuma‧?‧?	➡ Papuma‧Latin‧Indonesia-->
 		<likelySubtag from="ppn" to="ppn_Latn_PG" origin="sil1"/>		<!--Papapana‧?‧?	➡ Papapana‧Latin‧Papua New Guinea-->
 		<likelySubtag from="ppo" to="ppo_Latn_PG" origin="sil1"/>		<!--Folopa‧?‧?	➡ Folopa‧Latin‧Papua New Guinea-->
@@ -6653,7 +6661,6 @@ not be patched by hand, as any changes made in that fashion may be lost.
 		<likelySubtag from="tod" to="tod_Latn_GN" origin="sil1"/>		<!--Toma‧?‧?	➡ Toma‧Latin‧Guinea-->
 		<likelySubtag from="tof" to="tof_Latn_PG" origin="sil1"/>		<!--Gizrra‧?‧?	➡ Gizrra‧Latin‧Papua New Guinea-->
 		<likelySubtag from="toh" to="toh_Latn_MZ" origin="sil1"/>		<!--Gitonga‧?‧?	➡ Gitonga‧Latin‧Mozambique-->
-		<likelySubtag from="toi" to="toi_Latn_ZM" origin="sil1"/>		<!--Tonga (Zambia)‧?‧?	➡ Tonga (Zambia)‧Latin‧Zambia-->
 		<likelySubtag from="toj" to="toj_Latn_MX" origin="sil1"/>		<!--Tojolabal‧?‧?	➡ Tojolabal‧Latin‧Mexico-->
 		<likelySubtag from="tol" to="tol_Latn_US" origin="sil1"/>		<!--Tolowa‧?‧?	➡ Tolowa‧Latin‧United States-->
 		<likelySubtag from="tom" to="tom_Latn_ID" origin="sil1"/>		<!--Tombulu‧?‧?	➡ Tombulu‧Latin‧Indonesia-->
diff --git a/make/data/cldr/common/supplemental/supplementalData.xml b/make/data/cldr/common/supplemental/supplementalData.xml
index 65b2d6819ea..1c9a5a0c62e 100644
--- a/make/data/cldr/common/supplemental/supplementalData.xml
+++ b/make/data/cldr/common/supplemental/supplementalData.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE supplementalData SYSTEM "../../common/dtd/ldmlSupplemental.dtd">
 <!--
-Copyright © 1991-2023 Unicode, Inc.
+Copyright © 1991-2025 Unicode, Inc.
 CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 For terms of use, see https://www.unicode.org/copyright.html
 -->
@@ -1145,12 +1145,12 @@ The printed version of ISO-4217:2001
             <currency iso4217="DEM" from="1999-09-01" to="2002-03-09"/>
             <currency iso4217="YUM" from="1994-01-24" to="1999-09-30"/><!-- Yugoslavian history. YU was renamed to CS. -->
         </region>
-        <region iso3166="YE">
-            <currency iso4217="YER" from="1990-05-22"/><!-- You might be able to say 1964-05-08 is the starting date -->
-        </region>
         <region iso3166="YD">
             <currency iso4217="YDD" from="1965-04-01" to="1996-01-01"/>
         </region>
+        <region iso3166="YE">
+            <currency iso4217="YER" from="1990-05-22"/><!-- You might be able to say 1964-05-08 is the starting date -->
+        </region>
         <region iso3166="YT">
             <currency iso4217="EUR" from="1999-01-01"/>
             <currency iso4217="FRF" from="1976-02-23" to="2002-02-17"/>
@@ -1291,7 +1291,7 @@ XXX Code for transations where no currency is involved
 		<language type="ada" territories="GH" alt="secondary"/>
 		<language type="ady" scripts="Cyrl"/>
 		<language type="ady" territories="RU" alt="secondary"/>
-		<language type="ae" scripts="Avst" alt="secondary"/>
+		<language type="ae" scripts="Avst"/>
 		<language type="aeb" scripts="Arab"/>
 		<language type="aeb" territories="TN" alt="secondary"/>
 		<language type="af" scripts="Latn"/>
@@ -1302,7 +1302,7 @@ XXX Code for transations where no currency is involved
 		<language type="ain" scripts="Kana Latn" alt="secondary"/>
 		<language type="ak" scripts="Latn"/>
 		<language type="ak" territories="GH" alt="secondary"/>
-		<language type="akk" scripts="Xsux" alt="secondary"/>
+		<language type="akk" scripts="Xsux"/>
 		<language type="akz" scripts="Latn"/>
 		<language type="ale" scripts="Latn"/>
 		<language type="aln" scripts="Latn"/>
@@ -1311,11 +1311,14 @@ XXX Code for transations where no currency is involved
 		<language type="am" scripts="Ethi" territories="ET"/>
 		<language type="amo" scripts="Latn"/>
 		<language type="an" scripts="Latn"/>
-		<language type="ang" scripts="Latn" alt="secondary"/>
+		<language type="ang" scripts="Latn"/>
 		<language type="ann" scripts="Latn"/>
 		<language type="anp" scripts="Deva"/>
 		<language type="aoz" scripts="Latn"/>
+		<language type="apc" scripts="Arab"/>
 		<language type="apc" territories="IL JO LB PS SY TR" alt="secondary"/>
+		<language type="apd" scripts="Arab"/>
+		<language type="apd" territories="SD" alt="secondary"/>
 		<language type="ar" scripts="Arab" territories="AE BH DJ DZ EG EH ER IL IQ JO KM KW LB LY MA MR OM PS QA SA SD SO SY TD TN YE"/>
 		<language type="ar" scripts="Syrc" territories="IR SS" alt="secondary"/>
 		<language type="arc" scripts="Armi Nbat Palm" alt="secondary"/>
@@ -1326,7 +1329,7 @@ XXX Code for transations where no currency is involved
 		<language type="arq" territories="DZ" alt="secondary"/>
 		<language type="ars" scripts="Arab"/>
 		<language type="ars" territories="SA" alt="secondary"/>
-		<language type="arw" scripts="Latn" alt="secondary"/>
+		<language type="arw" scripts="Latn"/>
 		<language type="ary" scripts="Arab"/>
 		<language type="ary" territories="MA" alt="secondary"/>
 		<language type="arz" scripts="Arab"/>
@@ -1339,11 +1342,11 @@ XXX Code for transations where no currency is involved
 		<language type="atj" scripts="Latn"/>
 		<language type="av" scripts="Cyrl"/>
 		<language type="av" territories="RU" alt="secondary"/>
-		<language type="avk" scripts="Latn" alt="secondary"/>
+		<language type="avk" scripts="Latn"/>
 		<language type="awa" scripts="Deva"/>
 		<language type="awa" territories="IN" alt="secondary"/>
 		<language type="ay" scripts="Latn" territories="BO"/>
-		<language type="az" scripts="Arab Cyrl Latn" territories="AZ"/>
+		<language type="az" scripts="Latn Arab Cyrl" territories="AZ"/>
 		<language type="az" territories="IQ IR RU" alt="secondary"/>
 		<language type="ba" scripts="Cyrl"/>
 		<language type="ba" territories="RU" alt="secondary"/>
@@ -1386,7 +1389,7 @@ XXX Code for transations where no currency is involved
 		<language type="bhi" scripts="Deva"/>
 		<language type="bhi" territories="IN" alt="secondary"/>
 		<language type="bho" scripts="Deva"/>
-		<language type="bho" territories="IN MU NP" alt="secondary"/>
+		<language type="bho" territories="IN NP" alt="secondary"/>
 		<language type="bi" scripts="Latn" territories="VU"/>
 		<language type="bik" scripts="Latn"/>
 		<language type="bik" territories="PH" alt="secondary"/>
@@ -1396,6 +1399,7 @@ XXX Code for transations where no currency is involved
 		<language type="bjj" territories="IN" alt="secondary"/>
 		<language type="bjn" scripts="Latn"/>
 		<language type="bjn" territories="ID" alt="secondary"/>
+		<language type="bjt" scripts="Latn"/>
 		<language type="bjt" territories="SN" alt="secondary"/>
 		<language type="bkm" scripts="Latn"/>
 		<language type="bku" scripts="Latn"/>
@@ -1420,7 +1424,8 @@ XXX Code for transations where no currency is involved
 		<language type="brh" scripts="Latn" territories="PK" alt="secondary"/>
 		<language type="brx" scripts="Deva"/>
 		<language type="brx" territories="IN" alt="secondary"/>
-		<language type="bs" scripts="Cyrl Latn" territories="BA"/>
+		<language type="bs" scripts="Latn Cyrl" territories="BA"/>
+		<language type="bsc" scripts="Latn"/>
 		<language type="bsc" territories="SN" alt="secondary"/>
 		<language type="bss" scripts="Latn"/>
 		<language type="bto" scripts="Latn"/>
@@ -1443,7 +1448,8 @@ XXX Code for transations where no currency is involved
 		<language type="car" scripts="Latn"/>
 		<language type="cay" scripts="Latn"/>
 		<language type="cch" scripts="Latn"/>
-		<language type="ccp" scripts="Beng Cakm"/>
+		<language type="ccp" scripts="Cakm Beng"/>
+		<language type="ccr" scripts="Latn"/>
 		<language type="ce" scripts="Cyrl"/>
 		<language type="ce" territories="RU" alt="secondary"/>
 		<language type="ceb" scripts="Latn"/>
@@ -1454,7 +1460,7 @@ XXX Code for transations where no currency is involved
 		<language type="chk" scripts="Latn"/>
 		<language type="chk" territories="FM" alt="secondary"/>
 		<language type="chm" scripts="Cyrl"/>
-		<language type="chn" scripts="Latn" alt="secondary"/>
+		<language type="chn" scripts="Latn"/>
 		<language type="cho" scripts="Latn"/>
 		<language type="chp" scripts="Latn"/>
 		<language type="chp" scripts="Cans" territories="CA" alt="secondary"/>
@@ -1471,15 +1477,15 @@ XXX Code for transations where no currency is involved
 		<language type="ckt" scripts="Cyrl"/>
 		<language type="clc" scripts="Latn"/>
 		<language type="co" scripts="Latn"/>
-		<language type="cop" scripts="Arab Copt Grek" alt="secondary"/>
+		<language type="cop" scripts="Copt Arab Grek" territories="EG" alt="secondary"/>
 		<language type="cps" scripts="Latn"/>
 		<language type="cr" scripts="Cans Latn"/>
-		<language type="cr" territories="CA" alt="secondary"/>
 		<language type="crg" scripts="Latn"/>
 		<language type="crh" scripts="Cyrl"/>
 		<language type="crj" scripts="Cans"/>
 		<language type="crj" scripts="Latn" alt="secondary"/>
 		<language type="crk" scripts="Cans"/>
+		<language type="crk" territories="CA" alt="secondary"/>
 		<language type="crl" scripts="Cans"/>
 		<language type="crl" scripts="Latn" alt="secondary"/>
 		<language type="crm" scripts="Cans"/>
@@ -1487,10 +1493,11 @@ XXX Code for transations where no currency is involved
 		<language type="crs" territories="SC" alt="secondary"/>
 		<language type="cs" scripts="Latn" territories="CZ"/>
 		<language type="cs" territories="SK" alt="secondary"/>
-		<language type="csb" scripts="Latn" territories="PL" alt="secondary"/>
+		<language type="csb" scripts="Latn"/>
+		<language type="csb" territories="PL" alt="secondary"/>
 		<language type="csw" scripts="Cans"/>
 		<language type="ctd" scripts="Latn"/>
-		<language type="cu" scripts="Cyrl" alt="secondary"/>
+		<language type="cu" scripts="Cyrl"/>
 		<language type="cv" scripts="Cyrl"/>
 		<language type="cv" territories="RU" alt="secondary"/>
 		<language type="cy" scripts="Latn"/>
@@ -1522,7 +1529,7 @@ XXX Code for transations where no currency is involved
 		<language type="dtp" scripts="Latn"/>
 		<language type="dty" scripts="Deva"/>
 		<language type="dua" scripts="Latn"/>
-		<language type="dum" scripts="Latn" alt="secondary"/>
+		<language type="dum" scripts="Latn"/>
 		<language type="dv" scripts="Thaa" territories="MV"/>
 		<language type="dyo" scripts="Latn"/>
 		<language type="dyo" scripts="Arab" territories="SN" alt="secondary"/>
@@ -1530,21 +1537,22 @@ XXX Code for transations where no currency is involved
 		<language type="dyu" territories="BF" alt="secondary"/>
 		<language type="dz" scripts="Tibt" territories="BT"/>
 		<language type="ebu" scripts="Latn"/>
+		<language type="ecy" scripts="Cprt"/>
 		<language type="ee" scripts="Latn"/>
 		<language type="ee" territories="GH TG" alt="secondary"/>
 		<language type="efi" scripts="Latn"/>
 		<language type="efi" territories="NG" alt="secondary"/>
 		<language type="egl" scripts="Latn"/>
-		<language type="egy" scripts="Egyp" alt="secondary"/>
+		<language type="egy" scripts="Egyp"/>
 		<language type="eka" scripts="Latn"/>
 		<language type="eky" scripts="Kali"/>
 		<language type="el" scripts="Grek" territories="CY GR"/>
-		<language type="en" scripts="Latn" territories="AG AI AS AU BB BI BM BS BW BZ CA CC CK CM CQ CX DG DM ER FJ FK FM GB GD GG GH GI GM GU GY HK IE IM IN IO JE JM KE KI KN KY LC LR LS MG MH MP MS MT MU MW NA NF NG NR NU NZ PG PH PK PN PR PW RW SB SC SD SG SH SL SS SX SZ TC TK TO TT TV TZ UG UM US VC VG VI VU WS ZA ZM ZW"/>
-		<language type="en" scripts="Dsrt Shaw" territories="AC AE AR AT BA BD BE BG BR CH CL CY CZ DE DK DZ EE EG ES ET FI FR GR HR HU IL IQ IT JO KZ LB LK LT LU LV MA MV MX MY NL PL PT RO SE SI SK TA TH TR YE" alt="secondary"/>
-		<language type="enm" scripts="Latn" alt="secondary"/>
+		<language type="en" scripts="Latn" territories="AG AI AS AU BB BI BM BS BW BZ CA CC CK CM CQ CX DG DM ER FJ FK FM GB GD GG GH GI GM GS GU GY HK IE IM IN IO JE JM KE KI KN KY LC LR LS MG MH MP MS MT MU MW NA NF NG NR NU NZ PG PH PK PN PR PW RW SB SC SD SG SH SL SS SX SZ TC TK TO TT TV TZ UG UM US VC VG VI VU WS ZA ZM ZW"/>
+		<language type="en" scripts="Dsrt Shaw" territories="AC AE AR AT BA BD BE BG BR CH CL CY CZ DE DK DZ EE EG ES ET FI FR GR HR HU IL IQ IT JO KZ LB LK LT LU LV MA MO MV MX MY NL PL PT RO SE SI SK TA TH TR YE" alt="secondary"/>
+		<language type="enm" scripts="Latn"/>
 		<language type="eo" scripts="Latn"/>
 		<language type="es" scripts="Latn" territories="AR BO CL CO CR CU DO EA EC ES GQ GT HN IC MX NI PA PE PR PY SV UY VE"/>
-		<language type="es" territories="AD BZ DE FR GB GI PH PT RO US" alt="secondary"/>
+		<language type="es" territories="AD BZ CA DE FR GB GI PH PT RO US" alt="secondary"/>
 		<language type="esu" scripts="Latn"/>
 		<language type="et" scripts="Latn" territories="EE"/>
 		<language type="ett" scripts="Ital Latn" alt="secondary"/>
@@ -1572,11 +1580,11 @@ XXX Code for transations where no currency is involved
 		<language type="fo" scripts="Latn" territories="FO"/>
 		<language type="fon" scripts="Latn"/>
 		<language type="fon" territories="BJ" alt="secondary"/>
-		<language type="fr" scripts="Latn" territories="BE BF BI BJ BL CA CD CF CG CH CI CM DJ DZ FR GA GF GN GP GQ HT KM LU MA MC MF MG ML MQ MU NC NE PF PM RE RW SC SN SY TD TG TN VU WF YT"/>
-		<language type="fr" scripts="Dupl" territories="DE GB IT NL PT RO TF US" alt="secondary"/>
+		<language type="fr" scripts="Latn" territories="BE BF BI BJ BL CA CD CF CG CH CI CM DJ DZ FR GA GF GN GP GQ HT KM LU MA MC MF MG ML MQ MU NC NE PF PM RE RW SC SN TD TG TN VU WF YT"/>
+		<language type="fr" scripts="Dupl" territories="AT DE GB IT LB NL PT RO ST SY TF US" alt="secondary"/>
 		<language type="frc" scripts="Latn"/>
-		<language type="frm" scripts="Latn" alt="secondary"/>
-		<language type="fro" scripts="Latn" alt="secondary"/>
+		<language type="frm" scripts="Latn"/>
+		<language type="fro" scripts="Latn"/>
 		<language type="frp" scripts="Latn"/>
 		<language type="frr" scripts="Latn"/>
 		<language type="frr" territories="DE" alt="secondary"/>
@@ -1609,7 +1617,7 @@ XXX Code for transations where no currency is involved
 		<language type="gcr" territories="GF" alt="secondary"/>
 		<language type="gd" scripts="Latn"/>
 		<language type="gd" territories="GB" alt="secondary"/>
-		<language type="gez" scripts="Ethi" alt="secondary"/>
+		<language type="gez" scripts="Ethi"/>
 		<language type="gil" scripts="Latn" territories="KI"/>
 		<language type="gjk" scripts="Arab"/>
 		<language type="gju" scripts="Arab"/>
@@ -1618,17 +1626,18 @@ XXX Code for transations where no currency is involved
 		<language type="gld" scripts="Cyrl"/>
 		<language type="glk" scripts="Arab"/>
 		<language type="glk" territories="IR" alt="secondary"/>
-		<language type="gmh" scripts="Latn" alt="secondary"/>
+		<language type="gmh" scripts="Latn"/>
+		<language type="gmy" scripts="Linb"/>
 		<language type="gn" scripts="Latn" territories="PY"/>
-		<language type="goh" scripts="Latn" alt="secondary"/>
+		<language type="goh" scripts="Latn"/>
 		<language type="gon" scripts="Deva Telu"/>
 		<language type="gon" territories="IN" alt="secondary"/>
 		<language type="gor" scripts="Latn"/>
 		<language type="gor" territories="ID" alt="secondary"/>
 		<language type="gos" scripts="Latn"/>
-		<language type="got" scripts="Goth" alt="secondary"/>
+		<language type="got" scripts="Goth"/>
 		<language type="grb" scripts="Latn"/>
-		<language type="grc" scripts="Cprt Grek Linb" alt="secondary"/>
+		<language type="grc" scripts="Grek"/>
 		<language type="grt" scripts="Beng"/>
 		<language type="gsw" scripts="Latn" territories="CH LI"/>
 		<language type="gsw" territories="DE" alt="secondary"/>
@@ -1644,10 +1653,10 @@ XXX Code for transations where no currency is involved
 		<language type="gvr" scripts="Deva"/>
 		<language type="gwi" scripts="Latn"/>
 		<language type="gwi" territories="CA" alt="secondary"/>
-		<language type="ha" scripts="Arab Latn"/>
+		<language type="ha" scripts="Latn Arab"/>
 		<language type="ha" territories="NE NG" alt="secondary"/>
 		<language type="hai" scripts="Latn"/>
-		<language type="hak" scripts="Hans"/>
+		<language type="hak" scripts="Hans Hant" territories="TW"/>
 		<language type="hak" territories="CN" alt="secondary"/>
 		<language type="haw" scripts="Latn"/>
 		<language type="haw" territories="US" alt="secondary"/>
@@ -1659,7 +1668,7 @@ XXX Code for transations where no currency is involved
 		<language type="hif" scripts="Deva Latn" territories="FJ"/>
 		<language type="hil" scripts="Latn"/>
 		<language type="hil" territories="PH" alt="secondary"/>
-		<language type="hit" scripts="Xsux" alt="secondary"/>
+		<language type="hit" scripts="Xsux"/>
 		<language type="hmd" scripts="Plrd"/>
 		<language type="hmn" scripts="Latn"/>
 		<language type="hmn" scripts="Hmng" alt="secondary"/>
@@ -1691,13 +1700,13 @@ XXX Code for transations where no currency is involved
 		<language type="hy" scripts="Armn" territories="AM"/>
 		<language type="hy" territories="RU" alt="secondary"/>
 		<language type="hz" scripts="Latn"/>
-		<language type="ia" scripts="Latn" alt="secondary"/>
+		<language type="ia" scripts="Latn"/>
 		<language type="iba" scripts="Latn"/>
 		<language type="ibb" scripts="Latn"/>
 		<language type="ibb" territories="NG" alt="secondary"/>
 		<language type="id" scripts="Latn" territories="ID"/>
 		<language type="id" scripts="Arab" alt="secondary"/>
-		<language type="ie" scripts="Latn" alt="secondary"/>
+		<language type="ie" scripts="Latn"/>
 		<language type="ife" scripts="Latn"/>
 		<language type="ig" scripts="Latn"/>
 		<language type="ig" territories="NG" alt="secondary"/>
@@ -1709,6 +1718,7 @@ XXX Code for transations where no currency is involved
 		<language type="ilo" territories="PH" alt="secondary"/>
 		<language type="inh" scripts="Cyrl"/>
 		<language type="inh" scripts="Arab Latn" territories="RU" alt="secondary"/>
+		<language type="io" scripts="Latn"/>
 		<language type="is" scripts="Latn" territories="IS"/>
 		<language type="it" scripts="Latn" territories="CH IT SM VA"/>
 		<language type="it" territories="DE FR HR MT US" alt="secondary"/>
@@ -1718,12 +1728,13 @@ XXX Code for transations where no currency is involved
 		<language type="ja" scripts="Jpan" territories="JP"/>
 		<language type="jam" scripts="Latn"/>
 		<language type="jam" territories="JM" alt="secondary"/>
+		<language type="jbo" scripts="Latn"/>
 		<language type="jgo" scripts="Latn"/>
 		<language type="jmc" scripts="Latn"/>
 		<language type="jml" scripts="Deva"/>
 		<language type="jpr" scripts="Hebr"/>
 		<language type="jrb" scripts="Hebr"/>
-		<language type="jut" scripts="Latn" alt="secondary"/>
+		<language type="jut" scripts="Latn"/>
 		<language type="jv" scripts="Latn"/>
 		<language type="jv" scripts="Java" territories="ID" alt="secondary"/>
 		<language type="ka" scripts="Geor" territories="GE"/>
@@ -1735,6 +1746,8 @@ XXX Code for transations where no currency is involved
 		<language type="kam" scripts="Latn"/>
 		<language type="kam" territories="KE" alt="secondary"/>
 		<language type="kao" scripts="Latn"/>
+		<language type="kaw" scripts="Bali"/>
+		<language type="kaw" scripts="Java Kawi" alt="secondary"/>
 		<language type="kbd" scripts="Cyrl"/>
 		<language type="kbd" territories="RU" alt="secondary"/>
 		<language type="kca" scripts="Cyrl"/>
@@ -1745,6 +1758,7 @@ XXX Code for transations where no currency is involved
 		<language type="kdt" scripts="Thai"/>
 		<language type="kea" scripts="Latn"/>
 		<language type="kea" territories="CV" alt="secondary"/>
+		<language type="ken" scripts="Latn"/>
 		<language type="kfo" scripts="Latn"/>
 		<language type="kfr" scripts="Deva"/>
 		<language type="kfr" territories="IN" alt="secondary"/>
@@ -1770,7 +1784,7 @@ XXX Code for transations where no currency is involved
 		<language type="kjg" scripts="Laoo"/>
 		<language type="kjg" scripts="Latn" alt="secondary"/>
 		<language type="kjh" scripts="Cyrl"/>
-		<language type="kk" scripts="Arab Cyrl" territories="KZ"/>
+		<language type="kk" scripts="Cyrl Arab" territories="KZ"/>
 		<language type="kk" territories="CN" alt="secondary"/>
 		<language type="kkj" scripts="Latn"/>
 		<language type="kl" scripts="Latn" territories="GL"/>
@@ -1782,6 +1796,7 @@ XXX Code for transations where no currency is involved
 		<language type="kmb" territories="AO" alt="secondary"/>
 		<language type="kn" scripts="Knda"/>
 		<language type="kn" territories="IN" alt="secondary"/>
+		<language type="knf" scripts="Latn"/>
 		<language type="knf" territories="SN" alt="secondary"/>
 		<language type="knn" scripts="Deva"/>
 		<language type="knn" territories="IN" alt="secondary"/>
@@ -1809,7 +1824,7 @@ XXX Code for transations where no currency is involved
 		<language type="ksb" territories="TZ" alt="secondary"/>
 		<language type="ksf" scripts="Latn"/>
 		<language type="ksh" scripts="Latn"/>
-		<language type="ku" scripts="Arab Cyrl Latn"/>
+		<language type="ku" scripts="Latn Arab Cyrl"/>
 		<language type="ku" territories="SY TR" alt="secondary"/>
 		<language type="kum" scripts="Cyrl"/>
 		<language type="kum" territories="RU" alt="secondary"/>
@@ -1825,10 +1840,11 @@ XXX Code for transations where no currency is involved
 		<language type="kxp" scripts="Arab"/>
 		<language type="kxv" scripts="Latn"/>
 		<language type="kxv" scripts="Deva Orya Telu" alt="secondary"/>
-		<language type="ky" scripts="Arab Cyrl Latn" territories="KG"/>
+		<language type="ky" scripts="Cyrl Arab Latn" territories="KG"/>
 		<language type="kyu" scripts="Kali"/>
-		<language type="la" scripts="Latn" territories="VA" alt="secondary"/>
-		<language type="lab" scripts="Lina" alt="secondary"/>
+		<language type="la" scripts="Latn"/>
+		<language type="la" territories="VA" alt="secondary"/>
+		<language type="lab" scripts="Lina"/>
 		<language type="lad" scripts="Hebr"/>
 		<language type="lag" scripts="Latn"/>
 		<language type="lah" scripts="Arab"/>
@@ -1841,10 +1857,11 @@ XXX Code for transations where no currency is involved
 		<language type="lbe" territories="RU" alt="secondary"/>
 		<language type="lbw" scripts="Latn"/>
 		<language type="lcp" scripts="Thai"/>
+		<language type="len" scripts="Latn"/>
 		<language type="lep" scripts="Lepc"/>
 		<language type="lez" scripts="Cyrl"/>
 		<language type="lez" scripts="Aghb" territories="RU" alt="secondary"/>
-		<language type="lfn" scripts="Cyrl Latn" alt="secondary"/>
+		<language type="lfn" scripts="Latn Cyrl" alt="secondary"/>
 		<language type="lg" scripts="Latn"/>
 		<language type="lg" territories="UG" alt="secondary"/>
 		<language type="li" scripts="Latn"/>
@@ -1852,7 +1869,7 @@ XXX Code for transations where no currency is involved
 		<language type="lij" scripts="Latn"/>
 		<language type="lil" scripts="Latn"/>
 		<language type="lis" scripts="Lisu"/>
-		<language type="liv" scripts="Latn" alt="secondary"/>
+		<language type="liv" scripts="Latn"/>
 		<language type="ljp" scripts="Latn"/>
 		<language type="ljp" territories="ID" alt="secondary"/>
 		<language type="lki" scripts="Arab"/>
@@ -1877,20 +1894,21 @@ XXX Code for transations where no currency is involved
 		<language type="lu" territories="CD" alt="secondary"/>
 		<language type="lua" scripts="Latn"/>
 		<language type="lua" territories="CD" alt="secondary"/>
-		<language type="lui" scripts="Latn" alt="secondary"/>
+		<language type="lui" scripts="Latn"/>
 		<language type="lun" scripts="Latn"/>
 		<language type="luo" scripts="Latn"/>
 		<language type="luo" territories="KE" alt="secondary"/>
 		<language type="lus" scripts="Beng"/>
-		<language type="lut" scripts="Latn" alt="secondary"/>
+		<language type="lut" scripts="Latn"/>
 		<language type="luy" scripts="Latn"/>
 		<language type="luy" territories="KE" alt="secondary"/>
 		<language type="luz" scripts="Arab"/>
 		<language type="luz" territories="IR" alt="secondary"/>
 		<language type="lv" scripts="Latn" territories="LV"/>
 		<language type="lwl" scripts="Thai"/>
-		<language type="lzh" scripts="Hans" alt="secondary"/>
-		<language type="lzz" scripts="Latn Geor"/>
+		<language type="lzh" scripts="Hans"/>
+		<language type="lzz" scripts="Latn"/>
+		<language type="lzz" scripts="Geor" alt="secondary"/>
 		<language type="mad" scripts="Latn"/>
 		<language type="mad" territories="ID" alt="secondary"/>
 		<language type="maf" scripts="Latn"/>
@@ -1920,6 +1938,7 @@ XXX Code for transations where no currency is involved
 		<language type="mfa" territories="TH" alt="secondary"/>
 		<language type="mfe" scripts="Latn"/>
 		<language type="mfe" territories="MU" alt="secondary"/>
+		<language type="mfv" scripts="Latn"/>
 		<language type="mfv" territories="SN" alt="secondary"/>
 		<language type="mg" scripts="Latn" territories="MG"/>
 		<language type="mgh" scripts="Latn"/>
@@ -1939,7 +1958,7 @@ XXX Code for transations where no currency is involved
 		<language type="mls" scripts="Latn"/>
 		<language type="mn" scripts="Cyrl" territories="MN"/>
 		<language type="mn" scripts="Mong Phag" territories="CN" alt="secondary"/>
-		<language type="mnc" scripts="Mong" alt="secondary"/>
+		<language type="mnc" scripts="Mong"/>
 		<language type="mni" scripts="Beng"/>
 		<language type="mni" scripts="Mtei" territories="IN" alt="secondary"/>
 		<language type="mns" scripts="Cyrl"/>
@@ -1954,7 +1973,7 @@ XXX Code for transations where no currency is involved
 		<language type="mrj" scripts="Cyrl"/>
 		<language type="mro" scripts="Latn"/>
 		<language type="mro" scripts="Mroo" alt="secondary"/>
-		<language type="ms" scripts="Arab Latn" territories="BN MY SG"/>
+		<language type="ms" scripts="Latn Arab" territories="BN MY SG"/>
 		<language type="ms" territories="CC ID" alt="secondary"/>
 		<language type="mt" scripts="Latn" territories="MT"/>
 		<language type="mtr" scripts="Deva"/>
@@ -1975,11 +1994,11 @@ XXX Code for transations where no currency is involved
 		<language type="myv" territories="RU" alt="secondary"/>
 		<language type="myx" scripts="Latn"/>
 		<language type="myx" territories="UG" alt="secondary"/>
-		<language type="myz" scripts="Mand" alt="secondary"/>
+		<language type="myz" scripts="Mand"/>
 		<language type="mzn" scripts="Arab"/>
 		<language type="mzn" territories="IR" alt="secondary"/>
 		<language type="na" scripts="Latn" territories="NR"/>
-		<language type="nan" scripts="Hans"/>
+		<language type="nan" scripts="Hans Hant" territories="TW"/>
 		<language type="nan" territories="CN" alt="secondary"/>
 		<language type="nap" scripts="Latn"/>
 		<language type="naq" scripts="Latn"/>
@@ -2011,13 +2030,14 @@ XXX Code for transations where no currency is involved
 		<language type="nn" scripts="Latn" territories="NO"/>
 		<language type="nnh" scripts="Latn"/>
 		<language type="no" scripts="Latn" territories="NO"/>
+		<language type="no" territories="BV" alt="secondary"/>
 		<language type="nod" scripts="Lana"/>
 		<language type="nod" territories="TH" alt="secondary"/>
 		<language type="noe" scripts="Deva"/>
 		<language type="noe" territories="IN" alt="secondary"/>
 		<language type="nog" scripts="Cyrl"/>
-		<language type="non" scripts="Runr" alt="secondary"/>
-		<language type="nov" scripts="Latn" alt="secondary"/>
+		<language type="non" scripts="Runr"/>
+		<language type="nov" scripts="Latn"/>
 		<language type="nqo" scripts="Nkoo"/>
 		<language type="nr" scripts="Latn"/>
 		<language type="nr" territories="ZA" alt="secondary"/>
@@ -2041,6 +2061,7 @@ XXX Code for transations where no currency is involved
 		<language type="oj" scripts="Cans"/>
 		<language type="oj" scripts="Latn" alt="secondary"/>
 		<language type="ojs" scripts="Cans"/>
+		<language type="ojw" scripts="Latn"/>
 		<language type="oka" scripts="Latn"/>
 		<language type="om" scripts="Latn"/>
 		<language type="om" scripts="Ethi" territories="ET" alt="secondary"/>
@@ -2051,9 +2072,9 @@ XXX Code for transations where no currency is involved
 		<language type="osa" scripts="Osge"/>
 		<language type="osa" scripts="Latn" alt="secondary"/>
 		<language type="osc" scripts="Ital Latn" alt="secondary"/>
-		<language type="otk" scripts="Orkh" alt="secondary"/>
-		<language type="pa" scripts="Arab Guru"/>
-		<language type="pa" territories="GB IN PK" alt="secondary"/>
+		<language type="otk" scripts="Orkh"/>
+		<language type="pa" scripts="Guru Arab"/>
+		<language type="pa" territories="CA GB IN PK" alt="secondary"/>
 		<language type="pag" scripts="Latn"/>
 		<language type="pag" territories="PH" alt="secondary"/>
 		<language type="pal" scripts="Phli Phlp" alt="secondary"/>
@@ -2067,23 +2088,26 @@ XXX Code for transations where no currency is involved
 		<language type="pcm" territories="NG" alt="secondary"/>
 		<language type="pdc" scripts="Latn"/>
 		<language type="pdt" scripts="Latn"/>
-		<language type="peo" scripts="Xpeo" alt="secondary"/>
+		<language type="peo" scripts="Xpeo"/>
 		<language type="pfl" scripts="Latn"/>
-		<language type="phn" scripts="Phnx" alt="secondary"/>
-		<language type="pi" scripts="Deva Sinh Thai" alt="secondary"/>
+		<language type="phn" scripts="Phnx"/>
+		<language type="pi" scripts="Mymr"/>
+		<language type="pi" scripts="Sinh Deva Thai" alt="secondary"/>
 		<language type="pis" scripts="Latn"/>
 		<language type="pis" territories="SB" alt="secondary"/>
 		<language type="pko" scripts="Latn"/>
 		<language type="pl" scripts="Latn" territories="PL"/>
 		<language type="pl" territories="GB" alt="secondary"/>
 		<language type="pms" scripts="Latn"/>
-		<language type="pnt" scripts="Grek Cyrl Latn"/>
+		<language type="pnt" scripts="Grek"/>
+		<language type="pnt" scripts="Cyrl Latn" alt="secondary"/>
 		<language type="pon" scripts="Latn"/>
 		<language type="pon" territories="FM" alt="secondary"/>
+		<language type="ppl" scripts="Latn"/>
 		<language type="pqm" scripts="Latn"/>
 		<language type="prd" scripts="Arab"/>
-		<language type="prg" scripts="Latn" alt="secondary"/>
-		<language type="pro" scripts="Latn" alt="secondary"/>
+		<language type="prg" scripts="Latn"/>
+		<language type="pro" scripts="Latn"/>
 		<language type="ps" scripts="Arab" territories="AF"/>
 		<language type="ps" territories="PK" alt="secondary"/>
 		<language type="pt" scripts="Latn" territories="AO BR CV GQ GW MO MZ PT ST TL"/>
@@ -2141,7 +2165,7 @@ XXX Code for transations where no currency is involved
 		<language type="saf" scripts="Latn"/>
 		<language type="sah" scripts="Cyrl"/>
 		<language type="sah" territories="RU" alt="secondary"/>
-		<language type="sam" scripts="Hebr Samr" alt="secondary"/>
+		<language type="sam" scripts="Samr Hebr" alt="secondary"/>
 		<language type="saq" scripts="Latn"/>
 		<language type="sas" scripts="Latn"/>
 		<language type="sas" territories="ID" alt="secondary"/>
@@ -2171,12 +2195,13 @@ XXX Code for transations where no currency is involved
 		<language type="seh" scripts="Latn"/>
 		<language type="seh" territories="MZ" alt="secondary"/>
 		<language type="sei" scripts="Latn"/>
-		<language type="sel" scripts="Cyrl" alt="secondary"/>
+		<language type="sel" scripts="Cyrl"/>
 		<language type="ses" scripts="Latn"/>
 		<language type="sg" scripts="Latn" territories="CF"/>
-		<language type="sga" scripts="Latn Ogam" alt="secondary"/>
+		<language type="sga" scripts="Latn"/>
+		<language type="sga" scripts="Ogam" alt="secondary"/>
 		<language type="sgs" scripts="Latn"/>
-		<language type="shi" scripts="Arab Latn Tfng"/>
+		<language type="shi" scripts="Tfng Latn Arab"/>
 		<language type="shi" territories="MA" alt="secondary"/>
 		<language type="shn" scripts="Mymr"/>
 		<language type="shn" territories="MM" alt="secondary"/>
@@ -2192,13 +2217,15 @@ XXX Code for transations where no currency is involved
 		<language type="sli" scripts="Latn"/>
 		<language type="sly" scripts="Latn"/>
 		<language type="sm" scripts="Latn" territories="AS WS"/>
+		<language type="sm" territories="TK" alt="secondary"/>
 		<language type="sma" scripts="Latn"/>
 		<language type="smj" scripts="Latn"/>
 		<language type="smn" scripts="Latn"/>
-		<language type="smp" scripts="Samr" alt="secondary"/>
+		<language type="smp" scripts="Samr"/>
 		<language type="sms" scripts="Latn"/>
 		<language type="sms" territories="FI" alt="secondary"/>
 		<language type="sn" scripts="Latn" territories="ZW"/>
+		<language type="snf" scripts="Latn"/>
 		<language type="snf" territories="SN" alt="secondary"/>
 		<language type="snk" scripts="Latn"/>
 		<language type="snk" territories="ML" alt="secondary"/>
@@ -2240,7 +2267,7 @@ XXX Code for transations where no currency is involved
 		<language type="syi" scripts="Latn"/>
 		<language type="syl" scripts="Beng"/>
 		<language type="syl" scripts="Sylo" territories="BD" alt="secondary"/>
-		<language type="syr" scripts="Syrc" alt="secondary"/>
+		<language type="syr" scripts="Syrc"/>
 		<language type="szl" scripts="Latn"/>
 		<language type="ta" scripts="Taml" territories="LK SG"/>
 		<language type="ta" territories="GB IN MY" alt="secondary"/>
@@ -2263,7 +2290,7 @@ XXX Code for transations where no currency is involved
 		<language type="teo" territories="UG" alt="secondary"/>
 		<language type="ter" scripts="Latn"/>
 		<language type="tet" scripts="Latn" territories="TL"/>
-		<language type="tg" scripts="Arab Cyrl Latn" territories="TJ"/>
+		<language type="tg" scripts="Cyrl Arab Latn" territories="TJ"/>
 		<language type="th" scripts="Thai" territories="TH"/>
 		<language type="thl" scripts="Deva"/>
 		<language type="thq" scripts="Deva"/>
@@ -2274,22 +2301,25 @@ XXX Code for transations where no currency is involved
 		<language type="tig" territories="ER" alt="secondary"/>
 		<language type="tiv" scripts="Latn"/>
 		<language type="tiv" territories="NG" alt="secondary"/>
-		<language type="tk" scripts="Arab Cyrl Latn" territories="TM"/>
+		<language type="tk" scripts="Latn Arab Cyrl" territories="TM"/>
 		<language type="tk" territories="AF IR" alt="secondary"/>
 		<language type="tkl" scripts="Latn" territories="TK"/>
-		<language type="tkr" scripts="Latn Cyrl"/>
+		<language type="tkr" scripts="Latn"/>
+		<language type="tkr" scripts="Cyrl" alt="secondary"/>
 		<language type="tkt" scripts="Deva"/>
 		<language type="tli" scripts="Latn"/>
-		<language type="tly" scripts="Latn Arab Cyrl"/>
-		<language type="tly" territories="AZ" alt="secondary"/>
+		<language type="tly" scripts="Latn"/>
+		<language type="tly" scripts="Arab Cyrl" territories="AZ" alt="secondary"/>
 		<language type="tmh" scripts="Latn"/>
 		<language type="tmh" territories="NE" alt="secondary"/>
 		<language type="tn" scripts="Latn" territories="BW"/>
 		<language type="tn" territories="ZA" alt="secondary"/>
+		<language type="tnr" scripts="Latn"/>
 		<language type="tnr" territories="SN" alt="secondary"/>
 		<language type="to" scripts="Latn" territories="TO"/>
 		<language type="tog" scripts="Latn"/>
-		<language type="tok" scripts="Latn" alt="secondary"/>
+		<language type="toi" territories="ZM" alt="secondary"/>
+		<language type="tok" scripts="Latn"/>
 		<language type="tpi" scripts="Latn" territories="PG"/>
 		<language type="tr" scripts="Latn" territories="CY TR"/>
 		<language type="tr" scripts="Arab" territories="DE" alt="secondary"/>
@@ -2309,8 +2339,8 @@ XXX Code for transations where no currency is involved
 		<language type="ttj" scripts="Latn"/>
 		<language type="tts" scripts="Thai"/>
 		<language type="tts" territories="TH" alt="secondary"/>
-		<language type="ttt" scripts="Latn Cyrl"/>
-		<language type="ttt" scripts="Arab" alt="secondary"/>
+		<language type="ttt" scripts="Latn"/>
+		<language type="ttt" scripts="Arab Cyrl" alt="secondary"/>
 		<language type="tum" scripts="Latn"/>
 		<language type="tum" territories="MW" alt="secondary"/>
 		<language type="tvl" scripts="Latn" territories="TV"/>
@@ -2324,25 +2354,25 @@ XXX Code for transations where no currency is involved
 		<language type="udm" scripts="Latn" territories="RU" alt="secondary"/>
 		<language type="ug" scripts="Arab Cyrl"/>
 		<language type="ug" scripts="Latn" territories="CN" alt="secondary"/>
-		<language type="uga" scripts="Ugar" alt="secondary"/>
+		<language type="uga" scripts="Ugar"/>
 		<language type="uk" scripts="Cyrl" territories="UA"/>
 		<language type="uk" territories="RS" alt="secondary"/>
 		<language type="uli" scripts="Latn"/>
 		<language type="umb" scripts="Latn"/>
 		<language type="umb" territories="AO" alt="secondary"/>
-		<language type="und" territories="AQ BV CP GS HM" alt="secondary"/>
+		<language type="und" territories="AQ CP HM" alt="secondary"/>
 		<language type="unr" scripts="Beng Deva"/>
 		<language type="unr" territories="IN" alt="secondary"/>
 		<language type="unx" scripts="Beng Deva"/>
 		<language type="ur" scripts="Arab" territories="PK"/>
 		<language type="ur" territories="GB IN" alt="secondary"/>
-		<language type="uz" scripts="Arab Cyrl Latn" territories="UZ"/>
+		<language type="uz" scripts="Latn Cyrl Arab" territories="UZ"/>
 		<language type="uz" territories="AF" alt="secondary"/>
-		<language type="vai" scripts="Latn Vaii"/>
+		<language type="vai" scripts="Vaii Latn"/>
 		<language type="ve" scripts="Latn"/>
 		<language type="ve" territories="ZA" alt="secondary"/>
 		<language type="vec" scripts="Latn"/>
-		<language type="vec" territories="BR HR IT MX SI" alt="secondary"/>
+		<language type="vec" territories="BR HR IT SI" alt="secondary"/>
 		<language type="vep" scripts="Latn"/>
 		<language type="vi" scripts="Latn" territories="VN"/>
 		<language type="vi" scripts="Hani" territories="US" alt="secondary"/>
@@ -2353,8 +2383,8 @@ XXX Code for transations where no currency is involved
 		<language type="vmf" territories="DE" alt="secondary"/>
 		<language type="vmw" scripts="Latn"/>
 		<language type="vmw" territories="MZ" alt="secondary"/>
-		<language type="vo" scripts="Latn" alt="secondary"/>
-		<language type="vot" scripts="Latn" alt="secondary"/>
+		<language type="vo" scripts="Latn"/>
+		<language type="vot" scripts="Latn"/>
 		<language type="vro" scripts="Latn"/>
 		<language type="vun" scripts="Latn"/>
 		<language type="wa" scripts="Latn"/>
@@ -2380,23 +2410,23 @@ XXX Code for transations where no currency is involved
 		<language type="wuu" territories="CN" alt="secondary"/>
 		<language type="xal" scripts="Cyrl"/>
 		<language type="xav" scripts="Latn"/>
-		<language type="xcr" scripts="Cari" alt="secondary"/>
+		<language type="xcr" scripts="Cari"/>
 		<language type="xh" scripts="Latn"/>
 		<language type="xh" territories="ZA" alt="secondary"/>
-		<language type="xlc" scripts="Lyci" alt="secondary"/>
-		<language type="xld" scripts="Lydi" alt="secondary"/>
+		<language type="xlc" scripts="Lyci"/>
+		<language type="xld" scripts="Lydi"/>
 		<language type="xmf" scripts="Geor"/>
-		<language type="xmn" scripts="Mani" alt="secondary"/>
-		<language type="xmr" scripts="Merc" alt="secondary"/>
-		<language type="xna" scripts="Narb" alt="secondary"/>
+		<language type="xmn" scripts="Mani"/>
+		<language type="xmr" scripts="Merc"/>
+		<language type="xna" scripts="Narb"/>
 		<language type="xnr" scripts="Deva"/>
 		<language type="xnr" territories="IN" alt="secondary"/>
 		<language type="xog" scripts="Latn"/>
 		<language type="xog" territories="UG" alt="secondary"/>
-		<language type="xpr" scripts="Prti" alt="secondary"/>
-		<language type="xsa" scripts="Sarb" alt="secondary"/>
+		<language type="xpr" scripts="Prti"/>
+		<language type="xsa" scripts="Sarb"/>
 		<language type="xsr" scripts="Deva"/>
-		<language type="xum" scripts="Ital Latn" alt="secondary"/>
+		<language type="xum" scripts="Latn Ital" alt="secondary"/>
 		<language type="yao" scripts="Latn"/>
 		<language type="yap" scripts="Latn"/>
 		<language type="yav" scripts="Latn"/>
@@ -2406,7 +2436,7 @@ XXX Code for transations where no currency is involved
 		<language type="yrk" scripts="Cyrl"/>
 		<language type="yrl" scripts="Latn"/>
 		<language type="yua" scripts="Latn"/>
-		<language type="yue" scripts="Hans Hant"/>
+		<language type="yue" scripts="Hant Hans" territories="MO"/>
 		<language type="yue" territories="CN HK" alt="secondary"/>
 		<language type="za" scripts="Latn"/>
 		<language type="za" scripts="Hans" territories="CN" alt="secondary"/>
@@ -2414,11 +2444,11 @@ XXX Code for transations where no currency is involved
 		<language type="zap" scripts="Latn"/>
 		<language type="zdj" scripts="Arab" territories="KM"/>
 		<language type="zea" scripts="Latn"/>
-		<language type="zen" scripts="Tfng" alt="secondary"/>
+		<language type="zen" scripts="Tfng"/>
 		<language type="zgh" scripts="Tfng"/>
 		<language type="zgh" territories="MA" alt="secondary"/>
 		<language type="zh" scripts="Hans Hant" territories="CN HK MO SG TW"/>
-		<language type="zh" scripts="Bopo Latn Phag" territories="ID MY TH US VN" alt="secondary"/>
+		<language type="zh" scripts="Bopo Latn Phag" territories="CA ID MY TH US VN" alt="secondary"/>
 		<language type="zmi" scripts="Latn"/>
 		<language type="zu" scripts="Latn"/>
 		<language type="zu" territories="ZA" alt="secondary"/>
@@ -2426,7 +2456,25 @@ XXX Code for transations where no currency is involved
 		<language type="zza" scripts="Latn"/>
 		<language type="zza" territories="TR" alt="secondary"/>
 	</languageData>
- <!-- See http://unicode.org/cldr/data/diff/supplemental/territory_language_information.html for more information on territoryInfo. -->
+	<scriptData>
+		<scriptVariant type="compound" id='Hanb' base='Hani Bopo'/> <!-- Han with Bopomofo (alias for Han + Bopomofo) -->
+		<scriptVariant type="compound" id='Jpan' base='Hani Hira Kana'/> <!-- Japanese (alias for Han + Hiragana + Katakana) -->
+		<scriptVariant type="compound" id='Hrkt' base='Hira Kana'/> <!-- Japanese syllabaries (alias for Hiragana + Katakana) -->
+		<scriptVariant type="compound" id='Kore' base='Hang Hani'/> <!-- Korean (alias for Hangul + Han) -->
+	
+		<scriptVariant type="visual" id='Aran' base='Arab'/> <!-- Arabic (Nastaliq variant) -->
+		<scriptVariant type="visual" id='Cyrs' base='Cyrl'/> <!-- Cyrillic (Old Church Slavonic variant) -->
+		<scriptVariant type="visual" id='Latf' base='Latn'/> <!-- Latin (Fraktur variant) -->
+		<scriptVariant type="visual" id='Latg' base='Latn'/> <!-- Latin (Gaelic variant) -->
+		<scriptVariant type="visual" id='Syrn' base='Syrc'/> <!-- Syriac (Eastern variant) -->
+		<scriptVariant type="visual" id='Syre' base='Syrc'/> <!-- Syriac (Estrangelo variant) -->
+		<scriptVariant type="visual" id='Syrj' base='Syrc'/> <!-- Syriac (Western variant) -->
+	
+		<scriptVariant type="subset" id='Jamo' base='Hang'/> <!-- Jamo (alias for Jamo subset of Hangul) -->
+		<scriptVariant type="subset" id='Hans' base='Hani'/> <!-- Han (Simplified variant) -->
+		<scriptVariant type="subset" id='Hant' base='Hani'/> <!-- Han (Traditional variant) -->
+	</scriptData>
+	<!-- See https://www.unicode.org/cldr/charts/latest/supplemental/territory_language_information.html for more information on territoryInfo. -->
 	<territoryInfo>
 		<territory type="AC" gdp="50800000" literacyPercent="99" population="940">	<!--Ascension Island-->
 			<languagePopulation type="en" populationPercent="99" references="R1020"/>	<!--English-->
@@ -2496,7 +2544,7 @@ XXX Code for transations where no currency is involved
 			<languagePopulation type="de" populationPercent="97" officialStatus="official"/>	<!--German-->
 			<languagePopulation type="bar" populationPercent="95"/>	<!--Bavarian-->
 			<languagePopulation type="en" populationPercent="73"/>	<!--English-->
-			<languagePopulation type="fr" populationPercent="11"/>	<!--French-->
+			<languagePopulation type="fr" populationPercent="13" references="R1132"/>	<!--French-->
 			<languagePopulation type="it" populationPercent="9"/>	<!--Italian-->
 			<languagePopulation type="hr" populationPercent="1.2" officialStatus="official_regional"/>	<!--Croatian-->
 			<languagePopulation type="sl" populationPercent="0.37" officialStatus="official_regional"/>	<!--Slovenian-->
@@ -2559,7 +2607,7 @@ XXX Code for transations where no currency is involved
 		<territory type="BF" gdp="57150000000" literacyPercent="28.7" population="23042200">	<!--Burkina Faso-->
 			<languagePopulation type="mos" populationPercent="40" references="R1307"/>	<!--Mossi-->
 			<languagePopulation type="dyu" populationPercent="32" references="R1091"/>	<!--Dyula-->
-			<languagePopulation type="fr" populationPercent="22" officialStatus="official"/>	<!--French-->
+			<languagePopulation type="fr" populationPercent="25" officialStatus="official" references="R1132"/>	<!--French-->
 			<languagePopulation type="ff" populationPercent="0" references="R1150"/>	<!--Fula-->
 			<languagePopulation type="ff_Adlm" populationPercent="0" references="R1150"/>	<!--Fula (Adlam)-->
 		</territory>
@@ -2581,13 +2629,13 @@ XXX Code for transations where no currency is involved
 			<languagePopulation type="en" populationPercent="0.046" officialStatus="official" references="R1308"/>	<!--English-->
 		</territory>
 		<territory type="BJ" gdp="52510000000" literacyPercent="42.4" population="14697100">	<!--Benin-->
-			<languagePopulation type="fr" populationPercent="35" officialStatus="official"/>	<!--French-->
+			<languagePopulation type="fr" populationPercent="34" officialStatus="official" references="R1339"/>	<!--French-->
 			<languagePopulation type="fon" populationPercent="25"/>	<!--Fon-->
 			<languagePopulation type="yo" populationPercent="6.7"/>	<!--Yoruba-->
 			<languagePopulation type="blo" populationPercent="0.3" references="R1194"/>	<!--Anii-->
 		</territory>
 		<territory type="BL" gdp="255000000" literacyPercent="99" population="7086">	<!--St. Barthélemy-->
-			<languagePopulation type="fr" populationPercent="97" officialStatus="official"/>	<!--French-->
+			<languagePopulation type="fr" populationPercent="85" officialStatus="official" references="R1340"/>	<!--French-->
 		</territory>
 		<territory type="BM" gdp="6349000000" literacyPercent="98" population="72800">	<!--Bermuda-->
 			<languagePopulation type="en" populationPercent="92" officialStatus="official"/>	<!--English-->
@@ -2634,7 +2682,7 @@ XXX Code for transations where no currency is involved
 			<languagePopulation type="lep" populationPercent="3.9"/>	<!--Lepcha-->
 		</territory>
 		<territory type="BV" gdp="54050" literacyPercent="99" population="1">	<!--Bouvet Island-->
-			<languagePopulation type="und" populationPercent="100"/>	<!--Unknown language-->
+			<languagePopulation type="no" populationPercent="100" references="R1062"/>	<!--Norwegian-->
 		</territory>
 		<territory type="BW" gdp="46740000000" literacyPercent="85.1" population="2450670">	<!--Botswana-->
 			<languagePopulation type="en" populationPercent="81" officialStatus="official" references="R1009"/>	<!--English-->
@@ -2650,74 +2698,75 @@ XXX Code for transations where no currency is involved
 			<languagePopulation type="es" populationPercent="28"/>	<!--Spanish-->
 		</territory>
 		<territory type="CA" gdp="2238000000000" literacyPercent="99" population="38794800">	<!--Canada-->
-			<languagePopulation type="en" populationPercent="86" officialStatus="official" references="R1331"/>	<!--English-->
-			<languagePopulation type="fr" populationPercent="30" officialStatus="official" references="R1331"/>	<!--French-->
-			<languagePopulation type="zh" populationPercent="1.8" references="R1329"/>	<!--Chinese-->
-			<languagePopulation type="yue" populationPercent="1.7" references="R1329"/>	<!--Cantonese-->
-			<languagePopulation type="es" populationPercent="1.6" references="R1329"/>	<!--Spanish-->
-			<languagePopulation type="pa" populationPercent="1.6" references="R1329"/>	<!--Punjabi-->
-			<languagePopulation type="ar" populationPercent="1.5" references="R1329"/>	<!--Arabic-->
-			<languagePopulation type="fil" populationPercent="1.5" references="R1329"/>	<!--Filipino-->
-			<languagePopulation type="it" populationPercent="0.91" references="R1329"/>	<!--Italian-->
-			<languagePopulation type="de" populationPercent="0.78" references="R1329"/>	<!--German-->
-			<languagePopulation type="ur" populationPercent="0.76" references="R1329"/>	<!--Urdu-->
-			<languagePopulation type="fa" populationPercent="0.65" references="R1329"/>	<!--Persian-->
-			<languagePopulation type="pt" populationPercent="0.61" references="R1329"/>	<!--Portuguese-->
-			<languagePopulation type="ru" populationPercent="0.56" references="R1329"/>	<!--Russian-->
-			<languagePopulation type="hi" populationPercent="0.5" references="R1329"/>	<!--Hindi-->
-			<languagePopulation type="ta" populationPercent="0.49" references="R1329"/>	<!--Tamil-->
-			<languagePopulation type="vi" populationPercent="0.49" references="R1329"/>	<!--Vietnamese-->
-			<languagePopulation type="pl" populationPercent="0.46" references="R1329"/>	<!--Polish-->
-			<languagePopulation type="ko" populationPercent="0.45" references="R1329"/>	<!--Korean-->
-			<languagePopulation type="gu" populationPercent="0.36" references="R1329"/>	<!--Gujarati-->
-			<languagePopulation type="el" populationPercent="0.33" references="R1329"/>	<!--Greek-->
-			<languagePopulation type="ro" populationPercent="0.27" references="R1329"/>	<!--Romanian-->
-			<languagePopulation type="bn" populationPercent="0.24" references="R1329"/>	<!--Bangla-->
-			<languagePopulation type="pdt" populationPercent="0.24" references="R1329"/>	<!--Plautdietsch-->
-			<languagePopulation type="uk" populationPercent="0.2" references="R1329"/>	<!--Ukrainian-->
-			<languagePopulation type="sr" populationPercent="0.17" references="R1329"/>	<!--Serbian-->
-			<languagePopulation type="nl" populationPercent="0.15" references="R1329"/>	<!--Dutch-->
-			<languagePopulation type="ja" populationPercent="0.14" references="R1329"/>	<!--Japanese-->
-			<languagePopulation type="hu" populationPercent="0.13" references="R1329"/>	<!--Hungarian-->
-			<languagePopulation type="so" populationPercent="0.13" references="R1329"/>	<!--Somali-->
-			<languagePopulation type="hr" populationPercent="0.12" references="R1329"/>	<!--Croatian-->
-			<languagePopulation type="iu" literacyPercent="30" populationPercent="0.12" officialStatus="official_regional" references="R1329"/>	<!--Inuktitut-->
-			<languagePopulation type="iu_Latn" literacyPercent="30" populationPercent="0.12" officialStatus="official_regional" references="R1329"/>	<!--Inuktitut (Latin)-->
-			<languagePopulation type="tr" populationPercent="0.1" references="R1329"/>	<!--Turkish-->
-			<languagePopulation type="oj" populationPercent="0.063" references="R1329"/>	<!--Ojibwa-->
-			<languagePopulation type="ojs" populationPercent="0.04" references="R1329"/>	<!--Oji-Cree-->
-			<languagePopulation type="chp" populationPercent="0.034" officialStatus="official_regional" references="R1329"/>	<!--Chipewyan-->
-			<languagePopulation type="moe" populationPercent="0.032" references="R1329"/>	<!--Innu-aimun-->
-			<languagePopulation type="cr" populationPercent="0.023" officialStatus="official_regional" references="R1329"/>	<!--Cree-->
-			<languagePopulation type="mic" populationPercent="0.02" references="R1329"/>	<!--Mi'kmaw-->
-			<languagePopulation type="atj" populationPercent="0.017" references="R1329"/>	<!--Atikamekw-->
-			<languagePopulation type="bla" populationPercent="0.013" references="R1329"/>	<!--Siksiká-->
-			<languagePopulation type="crk" populationPercent="0.011" references="R1329"/>	<!--Plains Cree-->
-			<languagePopulation type="den" populationPercent="0.0059" officialStatus="official_regional" references="R1329"/>	<!--Slave-->
-			<languagePopulation type="dgr" populationPercent="0.0055" officialStatus="official_regional" references="R1329"/>	<!--Dogrib-->
-			<languagePopulation type="csw" populationPercent="0.0046" references="R1329"/>	<!--Swampy Cree-->
-			<languagePopulation type="moh" populationPercent="0.0045" references="R1329"/>	<!--Mohawk-->
-			<languagePopulation type="nsk" populationPercent="0.0036" references="R1329"/>	<!--Naskapi-->
-			<languagePopulation type="dak" populationPercent="0.0031" references="R1329"/>	<!--Dakota-->
-			<languagePopulation type="clc" populationPercent="0.0022" references="R1329"/>	<!--Chilcotin-->
-			<languagePopulation type="hur" populationPercent="0.0018" references="R1329"/>	<!--Halkomelem-->
-			<languagePopulation type="crg" populationPercent="0.0018" references="R1329"/>	<!--Michif-->
-			<languagePopulation type="war" populationPercent="0.0018" references="R1329"/>	<!--Waray-->
-			<languagePopulation type="lil" populationPercent="0.0014" references="R1329"/>	<!--Lillooet-->
-			<languagePopulation type="oka" populationPercent="0.0013" references="R1329"/>	<!--Okanagan-->
-			<languagePopulation type="pqm" populationPercent="0.0013" references="R1329"/>	<!--Maliseet-Passamaquoddy-->
-			<languagePopulation type="crl" populationPercent="0.001" references="R1329"/>	<!--Northern East Cree-->
-			<languagePopulation type="kwk" populationPercent="0.001" references="R1329"/>	<!--Kwakʼwala-->
-			<languagePopulation type="gwi" populationPercent="0.0007" officialStatus="official_regional" references="R1329"/>	<!--Gwichʼin-->
+			<languagePopulation type="en" populationPercent="87" officialStatus="official" references="R1019"/>	<!--English-->
+			<languagePopulation type="fr" populationPercent="29" officialStatus="official" references="R1341"/>	<!--French-->
+			<languagePopulation type="es" populationPercent="3.2" references="R1019"/>	<!--Spanish-->
+			<languagePopulation type="zh" populationPercent="2.7" references="R1019"/>	<!--Chinese-->
+			<languagePopulation type="pa" populationPercent="2.6" references="R1019"/>	<!--Punjabi-->
+			<languagePopulation type="ar" populationPercent="2.3" references="R1019"/>	<!--Arabic-->
+			<languagePopulation type="hi" populationPercent="2.1" references="R1019"/>	<!--Hindi-->
+			<languagePopulation type="fil" populationPercent="2" references="R1019"/>	<!--Filipino-->
+			<languagePopulation type="yue" populationPercent="2" references="R1019"/>	<!--Cantonese-->
+			<languagePopulation type="it" populationPercent="1.5" references="R1019"/>	<!--Italian-->
+			<languagePopulation type="de" populationPercent="1.2" references="R1019"/>	<!--German-->
+			<languagePopulation type="ur" populationPercent="1.1" references="R1019"/>	<!--Urdu-->
+			<languagePopulation type="pt" populationPercent="0.93" references="R1019"/>	<!--Portuguese-->
+			<languagePopulation type="ru" populationPercent="0.85" references="R1019"/>	<!--Russian-->
+			<languagePopulation type="ta" populationPercent="0.65" references="R1019"/>	<!--Tamil-->
+			<languagePopulation type="vi" populationPercent="0.64" references="R1019"/>	<!--Vietnamese-->
+			<languagePopulation type="fa" populationPercent="0.61" references="R1019"/>	<!--Persian-->
+			<languagePopulation type="gu" populationPercent="0.58" references="R1019"/>	<!--Gujarati-->
+			<languagePopulation type="pl" populationPercent="0.56" references="R1019"/>	<!--Polish-->
+			<languagePopulation type="ko" populationPercent="0.56" references="R1019"/>	<!--Korean-->
+			<languagePopulation type="el" populationPercent="0.4" references="R1019"/>	<!--Greek-->
+			<languagePopulation type="uk" populationPercent="0.36" references="R1019"/>	<!--Ukrainian-->
+			<languagePopulation type="bn" populationPercent="0.33" references="R1019"/>	<!--Bangla-->
+			<languagePopulation type="ro" populationPercent="0.32" references="R1019"/>	<!--Romanian-->
+			<languagePopulation type="nl" populationPercent="0.3" references="R1019"/>	<!--Dutch-->
+			<languagePopulation type="ja" populationPercent="0.27" references="R1019"/>	<!--Japanese-->
+			<languagePopulation type="sr" populationPercent="0.23" references="R1019"/>	<!--Serbian-->
+			<languagePopulation type="tr" populationPercent="0.22" references="R1019"/>	<!--Turkish-->
+			<languagePopulation type="hr" populationPercent="0.2" references="R1019"/>	<!--Croatian-->
+			<languagePopulation type="hu" populationPercent="0.18" references="R1019"/>	<!--Hungarian-->
+			<languagePopulation type="so" populationPercent="0.16" references="R1019"/>	<!--Somali-->
+			<languagePopulation type="iu" literacyPercent="30" populationPercent="0.11" officialStatus="official_regional" references="R1019"/>	<!--Inuktitut-->
+			<languagePopulation type="iu_Latn" literacyPercent="30" populationPercent="0.11" officialStatus="official_regional" references="R1019"/>	<!--Inuktitut (Latin)-->
+			<languagePopulation type="pdt" populationPercent="0.11" references="R1019"/>	<!--Plautdietsch-->
+			<languagePopulation type="oj" populationPercent="0.072" references="R1019"/>	<!--Ojibwa-->
+			<languagePopulation type="ojs" populationPercent="0.042" references="R1019"/>	<!--Oji-Cree-->
+			<languagePopulation type="crk" populationPercent="0.033" officialStatus="official_regional" references="R1019"/>	<!--Plains Cree-->
+			<languagePopulation type="chp" populationPercent="0.032" officialStatus="official_regional" references="R1019"/>	<!--Chipewyan-->
+			<languagePopulation type="moe" populationPercent="0.03" references="R1019"/>	<!--Innu-aimun-->
+			<languagePopulation type="mic" populationPercent="0.024" references="R1019"/>	<!--Mi'kmaw-->
+			<languagePopulation type="atj" populationPercent="0.018" references="R1019"/>	<!--Atikamekw-->
+			<languagePopulation type="bla" populationPercent="0.017" references="R1019"/>	<!--Siksiká-->
+			<languagePopulation type="cr" populationPercent="0.013" references="R1019"/>	<!--Cree-->
+			<languagePopulation type="crl" populationPercent="0.013" references="R1019"/>	<!--Northern East Cree-->
+			<languagePopulation type="csw" populationPercent="0.012" references="R1019"/>	<!--Swampy Cree-->
+			<languagePopulation type="war" populationPercent="0.012" references="R1019"/>	<!--Waray-->
+			<languagePopulation type="ojw" populationPercent="0.0094" references="R1019"/>	<!--Western Ojibwa-->
+			<languagePopulation type="den" populationPercent="0.006" officialStatus="official_regional" references="R1019"/>	<!--Slave-->
+			<languagePopulation type="dgr" populationPercent="0.0055" officialStatus="official_regional" references="R1019"/>	<!--Dogrib-->
+			<languagePopulation type="crg" populationPercent="0.0049" references="R1019"/>	<!--Michif-->
+			<languagePopulation type="moh" populationPercent="0.0041" references="R1019"/>	<!--Mohawk-->
+			<languagePopulation type="dak" populationPercent="0.0039" references="R1019"/>	<!--Dakota-->
+			<languagePopulation type="hur" populationPercent="0.0036" references="R1019"/>	<!--Halkomelem-->
+			<languagePopulation type="nsk" populationPercent="0.0027" references="R1019"/>	<!--Naskapi-->
+			<languagePopulation type="clc" populationPercent="0.0022" references="R1019"/>	<!--Chilcotin-->
+			<languagePopulation type="kwk" populationPercent="0.0021" references="R1019"/>	<!--Kwakʼwala-->
+			<languagePopulation type="pqm" populationPercent="0.0021" references="R1019"/>	<!--Maliseet-Passamaquoddy-->
+			<languagePopulation type="oka" populationPercent="0.0018" references="R1019"/>	<!--Okanagan-->
+			<languagePopulation type="lil" populationPercent="0.0015" references="R1019"/>	<!--Lillooet-->
+			<languagePopulation type="gwi" populationPercent="0.0008" officialStatus="official_regional" references="R1019"/>	<!--Gwichʼin-->
 		</territory>
 		<territory type="CC" gdp="35090000" literacyPercent="99" population="593">	<!--Cocos (Keeling) Islands-->
 			<languagePopulation type="ms_Arab" populationPercent="84"/>	<!--Malay (Arabic)-->
 			<languagePopulation type="en" populationPercent="17" officialStatus="de_facto_official"/>	<!--English-->
 		</territory>
 		<territory type="CD" gdp="154000000000" literacyPercent="66.8" population="115403000">	<!--Congo - Kinshasa-->
+			<languagePopulation type="fr" populationPercent="51" officialStatus="official" references="R1342"/>	<!--French-->
 			<languagePopulation type="sw" populationPercent="50" officialStatus="official_regional" references="R1122"/>	<!--Swahili-->
 			<languagePopulation type="lua" populationPercent="9.6" officialStatus="official_regional" references="R1092"/>	<!--Luba-Lulua-->
-			<languagePopulation type="fr" populationPercent="3.8" officialStatus="official" references="R1002"/>	<!--French-->
 			<languagePopulation type="ln" populationPercent="3.1" officialStatus="official_regional"/>	<!--Lingala-->
 			<languagePopulation type="lu" populationPercent="2.3" references="R1093"/>	<!--Luba-Katanga-->
 			<languagePopulation type="kg" populationPercent="1.5" officialStatus="official_regional"/>	<!--Kongo-->
@@ -2725,20 +2774,20 @@ XXX Code for transations where no currency is involved
 			<languagePopulation type="rw" populationPercent="0.38"/>	<!--Kinyarwanda-->
 		</territory>
 		<territory type="CF" gdp="5849000000" literacyPercent="56.6" population="5650960">	<!--Central African Republic-->
-			<languagePopulation type="fr" populationPercent="49" officialStatus="official"/>	<!--French-->
 			<languagePopulation type="sg" populationPercent="49" officialStatus="official" references="R1011"/>	<!--Sango-->
+			<languagePopulation type="fr" populationPercent="29" officialStatus="official" references="R1343"/>	<!--French-->
 			<languagePopulation type="ln" populationPercent="0.24"/>	<!--Lingala-->
 		</territory>
 		<territory type="CG" gdp="38160000000" literacyPercent="83.8" population="6097670">	<!--Congo - Brazzaville-->
-			<languagePopulation type="fr" populationPercent="84" officialStatus="official"/>	<!--French-->
+			<languagePopulation type="fr" populationPercent="61" officialStatus="official" references="R1344"/>	<!--French-->
 			<languagePopulation type="ln" populationPercent="2.4"/>	<!--Lingala-->
 		</territory>
 		<territory type="CH" gdp="733800000000" literacyPercent="99" population="8860570">	<!--Switzerland-->
-			<languagePopulation type="de" populationPercent="73" officialStatus="official"/>	<!--German-->
-			<languagePopulation type="gsw" writingPercent="5" populationPercent="65" officialStatus="de_facto_official" references="R1006"/>	<!--Swiss German-->
-			<languagePopulation type="en" populationPercent="61" references="R1137"/>	<!--English-->
-			<languagePopulation type="fr" populationPercent="21" officialStatus="official" references="R1137"/>	<!--French-->
-			<languagePopulation type="it" populationPercent="4.3" officialStatus="official"/>	<!--Italian-->
+			<languagePopulation type="de" populationPercent="76" officialStatus="official" references="R1345"/>	<!--German-->
+			<languagePopulation type="gsw" writingPercent="5" populationPercent="66" officialStatus="de_facto_official" references="R1346"/>	<!--Swiss German-->
+			<languagePopulation type="en" populationPercent="45" references="R1345"/>	<!--English-->
+			<languagePopulation type="fr" populationPercent="39" officialStatus="official" references="R1345"/>	<!--French-->
+			<languagePopulation type="it" populationPercent="15" officialStatus="official" references="R1345"/>	<!--Italian-->
 			<languagePopulation type="lmo" writingPercent="5" populationPercent="4.1" references="R1086"/>	<!--Lombard-->
 			<languagePopulation type="pt" populationPercent="3.4" references="R1316"/>	<!--Portuguese-->
 			<languagePopulation type="rm" populationPercent="0.5" officialStatus="official_regional" references="R1117"/>	<!--Romansh-->
@@ -2746,7 +2795,7 @@ XXX Code for transations where no currency is involved
 			<languagePopulation type="wae" populationPercent="0.11"/>	<!--Walser-->
 		</territory>
 		<territory type="CI" gdp="202800000000" literacyPercent="56.9" population="29981800">	<!--Côte d’Ivoire-->
-			<languagePopulation type="fr" populationPercent="49" officialStatus="official"/>	<!--French-->
+			<languagePopulation type="fr" populationPercent="34" officialStatus="official" references="R1347"/>	<!--French-->
 			<languagePopulation type="bci" literacyPercent="10" populationPercent="11"/>	<!--Baoulé-->
 			<languagePopulation type="sef" writingPercent="5" populationPercent="4.3"/>	<!--Cebaara Senoufo-->
 			<languagePopulation type="dnj" literacyPercent="1" populationPercent="4"/>	<!--Dan-->
@@ -2826,7 +2875,7 @@ XXX Code for transations where no currency is involved
 			<languagePopulation type="yrl" populationPercent="0.006" references="R1327"/>	<!--Nheengatu-->
 		</territory>
 		<territory type="CP" gdp="55050" literacyPercent="99" population="1">	<!--Clipperton Island-->
-			<languagePopulation type="und" populationPercent="100" references="R1062"/>	<!--Unknown language-->
+			<languagePopulation type="und" populationPercent="100" references="R1178"/>	<!--Unknown language-->
 		</territory>
 		<territory type="CQ" gdp="21940000" literacyPercent="99" population="492">	<!--Sark-->
 			<languagePopulation type="en" populationPercent="98" officialStatus="official" references="R1166"/>	<!--English-->
@@ -2853,9 +2902,10 @@ XXX Code for transations where no currency is involved
 			<languagePopulation type="el" populationPercent="95" officialStatus="official"/>	<!--Greek-->
 			<languagePopulation type="en" populationPercent="73"/>	<!--English-->
 			<languagePopulation type="tr" populationPercent="23" officialStatus="official"/>	<!--Turkish-->
-			<languagePopulation type="fr" populationPercent="7"/>	<!--French-->
+			<languagePopulation type="fr" populationPercent="6.6" references="R1132"/>	<!--French-->
 			<languagePopulation type="hy" populationPercent="0.21"/>	<!--Armenian-->
 			<languagePopulation type="ar" populationPercent="0.098"/>	<!--Arabic-->
+			<languagePopulation type="ecy" populationPercent="0.0001"/>	<!--Eteocypriot-->
 		</territory>
 		<territory type="CZ" gdp="519000000000" literacyPercent="99" population="10837900">	<!--Czechia-->
 			<languagePopulation type="cs" populationPercent="98" officialStatus="official"/>	<!--Czech-->
@@ -2895,10 +2945,10 @@ XXX Code for transations where no currency is involved
 			<languagePopulation type="en" populationPercent="99" officialStatus="de_facto_official" references="R1065"/>	<!--English-->
 		</territory>
 		<territory type="DJ" gdp="7380000000" literacyPercent="67.9" population="994974">	<!--Djibouti-->
+			<languagePopulation type="fr" populationPercent="50" officialStatus="official" references="R1348"/>	<!--French-->
 			<languagePopulation type="aa" populationPercent="42"/>	<!--Afar-->
 			<languagePopulation type="so" populationPercent="41"/>	<!--Somali-->
 			<languagePopulation type="ar" populationPercent="7.3" officialStatus="official"/>	<!--Arabic-->
-			<languagePopulation type="fr" populationPercent="2.1" officialStatus="official"/>	<!--French-->
 		</territory>
 		<territory type="DK" gdp="428400000000" literacyPercent="99" population="5973140">	<!--Denmark-->
 			<languagePopulation type="da" populationPercent="93" officialStatus="official"/>	<!--Danish-->
@@ -2919,7 +2969,7 @@ XXX Code for transations where no currency is involved
 		<territory type="DZ" gdp="699900000000" literacyPercent="72.6" population="47022500">	<!--Algeria-->
 			<languagePopulation type="arq" populationPercent="83"/>	<!--Algerian Arabic-->
 			<languagePopulation type="ar" populationPercent="74" officialStatus="official"/>	<!--Arabic-->
-			<languagePopulation type="fr" populationPercent="20" officialStatus="official" references="R1124"/>	<!--French-->
+			<languagePopulation type="fr" populationPercent="33" officialStatus="official" references="R1349"/>	<!--French-->
 			<languagePopulation type="kab" literacyPercent="10" populationPercent="7.8" references="R1293"/>	<!--Kabyle-->
 			<languagePopulation type="en" populationPercent="7"/>	<!--English-->
 		</territory>
@@ -2943,6 +2993,7 @@ XXX Code for transations where no currency is involved
 			<languagePopulation type="ar" populationPercent="94" officialStatus="official"/>	<!--Arabic-->
 			<languagePopulation type="arz" populationPercent="64"/>	<!--Egyptian Arabic-->
 			<languagePopulation type="en" populationPercent="35"/>	<!--English-->
+			<languagePopulation type="cop" populationPercent="6" references="R1337"/>	<!--Coptic-->
 			<languagePopulation type="el" populationPercent="0.061"/>	<!--Greek-->
 		</territory>
 		<territory type="EH" gdp="906500000" literacyPercent="50" population="652271">	<!--Western Sahara-->
@@ -3013,7 +3064,7 @@ XXX Code for transations where no currency is involved
 			<languagePopulation type="fo" populationPercent="95" officialStatus="official"/>	<!--Faroese-->
 		</territory>
 		<territory type="FR" gdp="3764000000000" literacyPercent="99" population="68374600">	<!--France-->
-			<languagePopulation type="fr" populationPercent="99" officialStatus="official"/>	<!--French-->
+			<languagePopulation type="fr" populationPercent="97" officialStatus="official" references="R1132"/>	<!--French-->
 			<languagePopulation type="en" populationPercent="39"/>	<!--English-->
 			<languagePopulation type="es" populationPercent="13" references="R1125"/>	<!--Spanish-->
 			<languagePopulation type="de" populationPercent="5" references="R1298"/>	<!--German-->
@@ -3032,12 +3083,12 @@ XXX Code for transations where no currency is involved
 			<languagePopulation type="ia" populationPercent="0.0002" references="R1298"/>	<!--Interlingua-->
 		</territory>
 		<territory type="GA" gdp="48200000000" literacyPercent="89" population="2455110">	<!--Gabon-->
-			<languagePopulation type="fr" populationPercent="63" officialStatus="official"/>	<!--French-->
+			<languagePopulation type="fr" populationPercent="63" officialStatus="official" references="R1350"/>	<!--French-->
 			<languagePopulation type="puu" populationPercent="9"/>	<!--Punu-->
 		</territory>
 		<territory type="GB" gdp="3700000000000" literacyPercent="99" population="68459100">	<!--United Kingdom-->
 			<languagePopulation type="en" populationPercent="98" officialStatus="official" references="R1330"/>	<!--English-->
-			<languagePopulation type="fr" populationPercent="23" references="R1330"/>	<!--French-->
+			<languagePopulation type="fr" populationPercent="17" references="R1132"/>	<!--French-->
 			<languagePopulation type="de" populationPercent="9" references="R1330"/>	<!--German-->
 			<languagePopulation type="es" populationPercent="8" references="R1330"/>	<!--Spanish-->
 			<languagePopulation type="pl" populationPercent="4" references="R1330"/>	<!--Polish-->
@@ -3072,9 +3123,10 @@ XXX Code for transations where no currency is involved
 			<languagePopulation type="ab" populationPercent="2.2" officialStatus="official_regional"/>	<!--Abkhazian-->
 			<languagePopulation type="os" populationPercent="2.2" officialStatus="official_regional"/>	<!--Ossetic-->
 			<languagePopulation type="ku" populationPercent="0.89"/>	<!--Kurdish-->
+			<languagePopulation type="lzz_Geor" populationPercent="0.002" references="R1334"/>	<!--Laz (Georgian)-->
 		</territory>
 		<territory type="GF" gdp="1551000000" literacyPercent="83" population="199509">	<!--French Guiana-->
-			<languagePopulation type="fr" populationPercent="77" officialStatus="official" references="R1019"/>	<!--French-->
+			<languagePopulation type="fr" populationPercent="62" officialStatus="official" references="R1351"/>	<!--French-->
 			<languagePopulation type="gcr" populationPercent="26"/>	<!--Guianese Creole French-->
 			<languagePopulation type="zh_Hant" populationPercent="2.5"/>	<!--Chinese (Traditional)-->
 			<languagePopulation type="hnj" populationPercent="2.4" references="R1107"/>	<!--Hmong Njua-->
@@ -3107,32 +3159,34 @@ XXX Code for transations where no currency is involved
 		<territory type="GM" gdp="7905000000" literacyPercent="51.1" population="2523330">	<!--Gambia-->
 			<languagePopulation type="en" populationPercent="40" officialStatus="official"/>	<!--English-->
 			<languagePopulation type="man" populationPercent="29"/>	<!--Mandingo-->
+			<languagePopulation type="man_Nkoo" writingPercent="5" populationPercent="29" references="R1023"/>	<!--Mandingo (N’Ko)-->
 			<languagePopulation type="ff" populationPercent="0"/>	<!--Fula-->
 			<languagePopulation type="ff_Adlm" populationPercent="0"/>	<!--Fula (Adlam)-->
 		</territory>
 		<territory type="GN" gdp="56660000000" literacyPercent="41" population="13986200">	<!--Guinea-->
-			<languagePopulation type="fr" populationPercent="29" officialStatus="official" references="R1040"/>	<!--French-->
+			<languagePopulation type="fr" populationPercent="27" officialStatus="official" references="R1352"/>	<!--French-->
 			<languagePopulation type="ff" populationPercent="26"/>	<!--Fula-->
-			<languagePopulation type="man_Nkoo" populationPercent="23"/>	<!--Mandingo (N’Ko)-->
+			<languagePopulation type="man" populationPercent="23"/>	<!--Mandingo-->
+			<languagePopulation type="man_Nkoo" literacyPercent="25" populationPercent="23" references="R1021"/>	<!--Mandingo (N’Ko)-->
 			<languagePopulation type="sus" populationPercent="11"/>	<!--Susu-->
 			<languagePopulation type="nqo" populationPercent="5" references="R1286"/>	<!--N’Ko-->
 			<languagePopulation type="kpe" populationPercent="3.8"/>	<!--Kpelle-->
 			<languagePopulation type="ff_Adlm" populationPercent="0" references="R1250"/>	<!--Fula (Adlam)-->
 		</territory>
 		<territory type="GP" gdp="3513000000" literacyPercent="90" population="452776">	<!--Guadeloupe-->
-			<languagePopulation type="fr" populationPercent="90" officialStatus="official" references="R1023"/>	<!--French-->
+			<languagePopulation type="fr" populationPercent="84" officialStatus="official" references="R1340"/>	<!--French-->
 		</territory>
 		<territory type="GQ" gdp="28940000000" literacyPercent="94.2" population="1795830">	<!--Equatorial Guinea-->
 			<languagePopulation type="es" populationPercent="87" officialStatus="official" references="R1142"/>	<!--Spanish-->
 			<languagePopulation type="fan" populationPercent="51"/>	<!--Fang-->
-			<languagePopulation type="fr" populationPercent="8.8" officialStatus="official" references="R1084"/>	<!--French-->
+			<languagePopulation type="fr" populationPercent="29" officialStatus="official" references="R1353"/>	<!--French-->
 			<languagePopulation type="bvb" populationPercent="7.9"/>	<!--Bube-->
 			<languagePopulation type="pt" populationPercent="0.0001" officialStatus="official" references="R1150"/>	<!--Portuguese-->
 		</territory>
 		<territory type="GR" gdp="375800000000" literacyPercent="97.3" population="10461100">	<!--Greece-->
 			<languagePopulation type="el" populationPercent="99" officialStatus="official" references="R1211"/>	<!--Greek-->
 			<languagePopulation type="en" populationPercent="51"/>	<!--English-->
-			<languagePopulation type="fr" populationPercent="9"/>	<!--French-->
+			<languagePopulation type="fr" populationPercent="7.3" references="R1132"/>	<!--French-->
 			<languagePopulation type="de" populationPercent="5"/>	<!--German-->
 			<languagePopulation type="pnt" populationPercent="3.7"/>	<!--Pontic-->
 			<languagePopulation type="mk" populationPercent="1.6"/>	<!--Macedonian-->
@@ -3140,9 +3194,11 @@ XXX Code for transations where no currency is involved
 			<languagePopulation type="bg" populationPercent="0.27"/>	<!--Bulgarian-->
 			<languagePopulation type="sq" populationPercent="0.096"/>	<!--Albanian-->
 			<languagePopulation type="tsd" populationPercent="0.0019"/>	<!--Tsakonian-->
+			<languagePopulation type="gmy" populationPercent="0"/>	<!--Mycenaean Greek-->
+			<languagePopulation type="grc" populationPercent="0"/>	<!--Ancient Greek-->
 		</territory>
 		<territory type="GS" gdp="1081000" literacyPercent="99" population="20">	<!--South Georgia & South Sandwich Islands-->
-			<languagePopulation type="und" literacyPercent="100" populationPercent="100" references="R1178"/>	<!--Unknown language-->
+			<languagePopulation type="en" populationPercent="100" officialStatus="official" references="R1338"/>	<!--English-->
 		</territory>
 		<territory type="GT" gdp="223200000000" literacyPercent="75.9" population="18255200">	<!--Guatemala-->
 			<languagePopulation type="es" populationPercent="93" officialStatus="official" references="R1227"/>	<!--Spanish-->
@@ -3154,6 +3210,7 @@ XXX Code for transations where no currency is involved
 		</territory>
 		<territory type="GW" gdp="5099000000" literacyPercent="55.3" population="2132330">	<!--Guinea-Bissau-->
 			<languagePopulation type="pt" populationPercent="100" officialStatus="official" references="R1027"/>	<!--Portuguese-->
+			<languagePopulation type="fr" populationPercent="15" references="R1354"/>	<!--French-->
 			<languagePopulation type="knf" populationPercent="2.6" references="R1220"/>	<!--Mankanya-->
 			<languagePopulation type="ff" populationPercent="0" references="R1150"/>	<!--Fula-->
 			<languagePopulation type="ff_Adlm" populationPercent="0" references="R1150"/>	<!--Fula (Adlam)-->
@@ -3182,13 +3239,13 @@ XXX Code for transations where no currency is involved
 		</territory>
 		<territory type="HT" gdp="34410000000" literacyPercent="48.7" population="11753900">	<!--Haiti-->
 			<languagePopulation type="ht" populationPercent="81" officialStatus="official" references="R1029"/>	<!--Haitian Creole-->
-			<languagePopulation type="fr" literacyPercent="100" populationPercent="4.7" officialStatus="official" references="R1030"/>	<!--French-->
+			<languagePopulation type="fr" populationPercent="42" officialStatus="official" references="R1348"/>	<!--French-->
 		</territory>
 		<territory type="HU" gdp="388900000000" literacyPercent="99" population="9855750">	<!--Hungary-->
 			<languagePopulation type="hu" populationPercent="100" officialStatus="official"/>	<!--Hungarian-->
 			<languagePopulation type="en" populationPercent="20"/>	<!--English-->
 			<languagePopulation type="de" populationPercent="18"/>	<!--German-->
-			<languagePopulation type="fr" populationPercent="3"/>	<!--French-->
+			<languagePopulation type="fr" populationPercent="1.2" references="R1132"/>	<!--French-->
 			<languagePopulation type="ro" populationPercent="0.99"/>	<!--Romanian-->
 			<languagePopulation type="hr" populationPercent="0.32"/>	<!--Croatian-->
 			<languagePopulation type="sk" populationPercent="0.12"/>	<!--Slovak-->
@@ -3228,11 +3285,13 @@ XXX Code for transations where no currency is involved
 			<languagePopulation type="sxn" populationPercent="0.092"/>	<!--Sangir-->
 			<languagePopulation type="sly" populationPercent="0.054"/>	<!--Selayar-->
 			<languagePopulation type="mwv" populationPercent="0.024"/>	<!--Mentawai-->
+			<languagePopulation type="ban_Bali" populationPercent="0" references="R1002"/>	<!--Balinese (Balinese)-->
+			<languagePopulation type="kaw" populationPercent="0" references="R1006"/>	<!--Kawi-->
 		</territory>
 		<territory type="IE" gdp="608500000000" literacyPercent="99" population="5233460">	<!--Ireland-->
 			<languagePopulation type="en" populationPercent="98" officialStatus="official" references="R1202"/>	<!--English-->
 			<languagePopulation type="ga" populationPercent="22" officialStatus="official" references="R1043"/>	<!--Irish-->
-			<languagePopulation type="fr" populationPercent="17"/>	<!--French-->
+			<languagePopulation type="fr" populationPercent="13" references="R1132"/>	<!--French-->
 		</territory>
 		<territory type="IL" gdp="471000000000" literacyPercent="97.1" population="9402620">	<!--Israel-->
 			<languagePopulation type="he" populationPercent="100" officialStatus="official"/>	<!--Hebrew-->
@@ -3377,7 +3436,7 @@ XXX Code for transations where no currency is involved
 		<territory type="IT" gdp="3097000000000" literacyPercent="99" population="60964900">	<!--Italy-->
 			<languagePopulation type="it" populationPercent="95" officialStatus="official"/>	<!--Italian-->
 			<languagePopulation type="en" populationPercent="34"/>	<!--English-->
-			<languagePopulation type="fr" populationPercent="6.3" officialStatus="official_regional" references="R1252"/>	<!--French-->
+			<languagePopulation type="fr" populationPercent="20" officialStatus="official_regional" references="R1132"/>	<!--French-->
 			<languagePopulation type="lmo" populationPercent="5.7" references="R1172"/>	<!--Lombard-->
 			<languagePopulation type="sc" populationPercent="1.7"/>	<!--Sardinian-->
 			<languagePopulation type="de" populationPercent="1.6" references="R1251"/>	<!--German-->
@@ -3452,9 +3511,9 @@ XXX Code for transations where no currency is involved
 		</territory>
 		<territory type="KM" gdp="2961000000" literacyPercent="75.5" population="900141">	<!--Comoros-->
 			<languagePopulation type="ar" populationPercent="66" officialStatus="official"/>	<!--Arabic-->
-			<languagePopulation type="fr" populationPercent="56" officialStatus="official"/>	<!--French-->
 			<languagePopulation type="zdj" populationPercent="37" officialStatus="official" references="R1198"/>	<!--Ngazidja Comorian-->
 			<languagePopulation type="wni" populationPercent="34" officialStatus="official" references="R1313"/>	<!--Ndzwani Comorian-->
+			<languagePopulation type="fr" populationPercent="26" officialStatus="official" references="R1355"/>	<!--French-->
 		</territory>
 		<territory type="KN" gdp="1438000000" literacyPercent="97.8" population="55133">	<!--St. Kitts & Nevis-->
 			<languagePopulation type="en" populationPercent="98" officialStatus="official"/>	<!--English-->
@@ -3489,9 +3548,9 @@ XXX Code for transations where no currency is involved
 			<languagePopulation type="apc" populationPercent="100" references="R1173"/>	<!--Levantine Arabic-->
 			<languagePopulation type="ar" populationPercent="86" officialStatus="official"/>	<!--Arabic-->
 			<languagePopulation type="en" populationPercent="40"/>	<!--English-->
+			<languagePopulation type="fr" populationPercent="38" references="R1356"/>	<!--French-->
 			<languagePopulation type="hy" populationPercent="5.2"/>	<!--Armenian-->
 			<languagePopulation type="ku_Arab" populationPercent="1.7"/>	<!--Kurdish (Arabic)-->
-			<languagePopulation type="fr" populationPercent="0.37"/>	<!--French-->
 		</territory>
 		<territory type="LC" gdp="4083000000" literacyPercent="90.1" population="168038">	<!--St. Lucia-->
 			<languagePopulation type="en" populationPercent="90" officialStatus="official"/>	<!--English-->
@@ -3530,7 +3589,7 @@ XXX Code for transations where no currency is involved
 			<languagePopulation type="sgs" populationPercent="0" references="R1303"/>	<!--Samogitian-->
 		</territory>
 		<territory type="LU" gdp="88530000000" literacyPercent="100" population="671254">	<!--Luxembourg-->
-			<languagePopulation type="fr" populationPercent="87" officialStatus="official"/>	<!--French-->
+			<languagePopulation type="fr" populationPercent="92" officialStatus="official" references="R1132"/>	<!--French-->
 			<languagePopulation type="lb" writingPercent="5" populationPercent="67" officialStatus="official" references="R1024"/>	<!--Luxembourgish-->
 			<languagePopulation type="de" populationPercent="63" officialStatus="official"/>	<!--German-->
 			<languagePopulation type="en" populationPercent="56"/>	<!--English-->
@@ -3548,18 +3607,18 @@ XXX Code for transations where no currency is involved
 		<territory type="MA" gdp="337500000000" literacyPercent="67.1" population="37387600">	<!--Morocco-->
 			<languagePopulation type="ary" populationPercent="87"/>	<!--Moroccan Arabic-->
 			<languagePopulation type="ar" populationPercent="62" officialStatus="official"/>	<!--Arabic-->
+			<languagePopulation type="fr" populationPercent="36" officialStatus="de_facto_official" references="R1357"/>	<!--French-->
 			<languagePopulation type="zgh" populationPercent="22" references="R1254"/>	<!--Standard Moroccan Tamazight-->
-			<languagePopulation type="fr" populationPercent="20" officialStatus="de_facto_official" references="R1050"/>	<!--French-->
 			<languagePopulation type="en" populationPercent="14" references="R1050"/>	<!--English-->
 			<languagePopulation type="tzm" literacyPercent="25" populationPercent="9.8" officialStatus="official"/>	<!--Central Atlas Tamazight-->
 			<languagePopulation type="shi" populationPercent="8.7"/>	<!--Tachelhit-->
-			<languagePopulation type="shi_Latn" populationPercent="8.7" references="R1181"/>	<!--Tachelhit (Latin)-->
+			<languagePopulation type="shi_Latn" writingPercent="5" populationPercent="8.7" references="R1181"/>	<!--Tachelhit (Latin)-->
 			<languagePopulation type="rif" writingPercent="5" populationPercent="4.9"/>	<!--Riffian-->
 			<languagePopulation type="rif_Tfng" writingPercent="5" populationPercent="4.9"/>	<!--Riffian (Tifinagh)-->
 			<languagePopulation type="es" populationPercent="0.065"/>	<!--Spanish-->
 		</territory>
 		<territory type="MC" gdp="7672000000" literacyPercent="99" population="31813">	<!--Monaco-->
-			<languagePopulation type="fr" populationPercent="99" officialStatus="official"/>	<!--French-->
+			<languagePopulation type="fr" populationPercent="97" officialStatus="official" references="R1358"/>	<!--French-->
 		</territory>
 		<territory type="MD" gdp="38970000000" literacyPercent="99" population="3599530">	<!--Moldova-->
 			<languagePopulation type="ro" populationPercent="63" officialStatus="official"/>	<!--Romanian-->
@@ -3574,11 +3633,11 @@ XXX Code for transations where no currency is involved
 			<languagePopulation type="sr" populationPercent="5" references="R1255"/>	<!--Serbian-->
 		</territory>
 		<territory type="MF" gdp="449000000" literacyPercent="99" population="32996">	<!--St. Martin-->
-			<languagePopulation type="fr" populationPercent="100" officialStatus="official"/>	<!--French-->
+			<languagePopulation type="fr" populationPercent="84" officialStatus="official" references="R1340"/>	<!--French-->
 		</territory>
 		<territory type="MG" gdp="51260000000" literacyPercent="64.5" population="29452700">	<!--Madagascar-->
 			<languagePopulation type="mg" populationPercent="90" officialStatus="official" references="R1089"/>	<!--Malagasy-->
-			<languagePopulation type="fr" populationPercent="69" officialStatus="official"/>	<!--French-->
+			<languagePopulation type="fr" populationPercent="27" officialStatus="official" references="R1359"/>	<!--French-->
 			<languagePopulation type="en" populationPercent="18" officialStatus="official" references="R1118"/>	<!--English-->
 		</territory>
 		<territory type="MH" gdp="283600000" literacyPercent="93.7" population="82011">	<!--Marshall Islands-->
@@ -3592,7 +3651,7 @@ XXX Code for transations where no currency is involved
 		</territory>
 		<territory type="ML" gdp="57240000000" literacyPercent="33.4" population="21990600">	<!--Mali-->
 			<languagePopulation type="bm" populationPercent="46"/>	<!--Bambara-->
-			<languagePopulation type="fr" populationPercent="46" officialStatus="official"/>	<!--French-->
+			<languagePopulation type="fr" populationPercent="17" officialStatus="official" references="R1360"/>	<!--French-->
 			<languagePopulation type="ffm" populationPercent="7.7"/>	<!--Maasina Fulfulde-->
 			<languagePopulation type="snk" populationPercent="5.9"/>	<!--Soninke-->
 			<languagePopulation type="mwk" populationPercent="5"/>	<!--Kita Maninkakan-->
@@ -3624,20 +3683,23 @@ XXX Code for transations where no currency is involved
 		</territory>
 		<territory type="MO" gdp="71840000000" literacyPercent="95.6" population="644426">	<!--Macao SAR China-->
 			<languagePopulation type="zh_Hant" populationPercent="98" officialStatus="official"/>	<!--Chinese (Traditional)-->
-			<languagePopulation type="pt" populationPercent="5" officialStatus="official" references="R1085"/>	<!--Portuguese-->
+			<languagePopulation type="yue" populationPercent="86" officialStatus="de_facto_official" references="R1085"/>	<!--Cantonese-->
+			<languagePopulation type="en" populationPercent="23" references="R1085"/>	<!--English-->
 			<languagePopulation type="zh" populationPercent="5" references="R1143"/>	<!--Chinese-->
-			<languagePopulation type="en" populationPercent="2.3" references="R1273"/>	<!--English-->
+			<languagePopulation type="nan" populationPercent="3.7" references="R1273"/>	<!--Min Nan Chinese-->
+			<languagePopulation type="fil" populationPercent="3.1" references="R1085"/>	<!--Filipino-->
+			<languagePopulation type="pt" populationPercent="2.3" officialStatus="official" references="R1085"/>	<!--Portuguese-->
 		</territory>
 		<territory type="MP" gdp="1242000000" literacyPercent="97" population="51118">	<!--Northern Mariana Islands-->
 			<languagePopulation type="en" populationPercent="97" officialStatus="de_facto_official"/>	<!--English-->
 			<languagePopulation type="ch" populationPercent="18"/>	<!--Chamorro-->
 		</territory>
 		<territory type="MQ" gdp="6117000000" literacyPercent="98" population="436131">	<!--Martinique-->
-			<languagePopulation type="fr" populationPercent="98" officialStatus="official"/>	<!--French-->
+			<languagePopulation type="fr" populationPercent="81" officialStatus="official" references="R1361"/>	<!--French-->
 		</territory>
 		<territory type="MR" gdp="30400000000" literacyPercent="58.6" population="4328040">	<!--Mauritania-->
 			<languagePopulation type="ar" populationPercent="85" officialStatus="official"/>	<!--Arabic-->
-			<languagePopulation type="fr" populationPercent="17" references="R1021"/>	<!--French-->
+			<languagePopulation type="fr" populationPercent="13" references="R1339"/>	<!--French-->
 			<languagePopulation type="ff" populationPercent="5.7"/>	<!--Fula-->
 			<languagePopulation type="wo" populationPercent="0.23"/>	<!--Wolof-->
 			<languagePopulation type="ff_Adlm" populationPercent="0" references="R1150"/>	<!--Fula (Adlam)-->
@@ -3649,14 +3711,14 @@ XXX Code for transations where no currency is involved
 			<languagePopulation type="mt" populationPercent="100" officialStatus="official"/>	<!--Maltese-->
 			<languagePopulation type="en" populationPercent="88" officialStatus="official"/>	<!--English-->
 			<languagePopulation type="it" populationPercent="56" references="R1319"/>	<!--Italian-->
-			<languagePopulation type="fr" populationPercent="11"/>	<!--French-->
+			<languagePopulation type="fr" populationPercent="13" references="R1132"/>	<!--French-->
 		</territory>
 		<territory type="MU" gdp="33530000000" literacyPercent="88.8" population="1310500">	<!--Mauritius-->
-			<languagePopulation type="mfe" populationPercent="90"/>	<!--Morisyen-->
+			<languagePopulation type="mfe" populationPercent="90" references="R1185"/>	<!--Morisyen-->
+			<languagePopulation type="fr" populationPercent="73" officialStatus="official" references="R1030"/>	<!--French-->
 			<languagePopulation type="en" populationPercent="72" officialStatus="official" references="R1152"/>	<!--English-->
-			<languagePopulation type="bho" populationPercent="27"/>	<!--Bhojpuri-->
+			<languagePopulation type="bho" populationPercent="8.6" references="R1185"/>	<!--Bhojpuri-->
 			<languagePopulation type="ur" populationPercent="5.2"/>	<!--Urdu-->
-			<languagePopulation type="fr" populationPercent="3" officialStatus="official"/>	<!--French-->
 			<languagePopulation type="ta" populationPercent="2.5"/>	<!--Tamil-->
 		</territory>
 		<territory type="MV" gdp="11650000000" literacyPercent="98.4" population="388858">	<!--Maldives-->
@@ -3678,7 +3740,7 @@ XXX Code for transations where no currency is involved
 			<languagePopulation type="nhw" populationPercent="0.39"/>	<!--Western Huasteca Nahuatl-->
 			<languagePopulation type="maz" populationPercent="0.34"/>	<!--Central Mazahua-->
 			<languagePopulation type="nch" populationPercent="0.19"/>	<!--Central Huasteca Nahuatl-->
-			<languagePopulation type="vec" populationPercent="0.0019" officialStatus="official_regional" references="R1136"/>	<!--Venetian-->
+			<languagePopulation type="vec" populationPercent="0.0019" references="R1136"/>	<!--Venetian-->
 			<languagePopulation type="sei" populationPercent="0.0007"/>	<!--Seri-->
 		</territory>
 		<territory type="MY" gdp="1152000000000" literacyPercent="93.1" population="34564800">	<!--Malaysia-->
@@ -3719,12 +3781,12 @@ XXX Code for transations where no currency is involved
 			<languagePopulation type="tn" populationPercent="0.56"/>	<!--Tswana-->
 		</territory>
 		<territory type="NC" gdp="10270000000" literacyPercent="96.2" population="304167">	<!--New Caledonia-->
-			<languagePopulation type="fr" populationPercent="96" officialStatus="official"/>	<!--French-->
+			<languagePopulation type="fr" populationPercent="99" officialStatus="official" references="R1362"/>	<!--French-->
 		</territory>
 		<territory type="NE" gdp="44560000000" literacyPercent="28.7" population="26342800">	<!--Niger-->
 			<languagePopulation type="ha" populationPercent="41"/>	<!--Hausa-->
-			<languagePopulation type="fr" populationPercent="29" officialStatus="official" references="R1041"/>	<!--French-->
 			<languagePopulation type="dje" populationPercent="17"/>	<!--Zarma-->
+			<languagePopulation type="fr" populationPercent="13" officialStatus="official" references="R1363"/>	<!--French-->
 			<languagePopulation type="fuq" populationPercent="7"/>	<!--Central-Eastern Niger Fulfulde-->
 			<languagePopulation type="tmh" populationPercent="6"/>	<!--Tamashek-->
 			<languagePopulation type="ar" populationPercent="0.21"/>	<!--Arabic-->
@@ -3763,7 +3825,7 @@ XXX Code for transations where no currency is involved
 			<languagePopulation type="nl" populationPercent="100" officialStatus="official" references="R1042"/>	<!--Dutch-->
 			<languagePopulation type="en" populationPercent="90" references="R1070"/>	<!--English-->
 			<languagePopulation type="de" writingPercent="5" populationPercent="71"/>	<!--German-->
-			<languagePopulation type="fr" populationPercent="29"/>	<!--French-->
+			<languagePopulation type="fr" populationPercent="19" references="R1132"/>	<!--French-->
 			<languagePopulation type="nds" writingPercent="5" populationPercent="11"/>	<!--Low German-->
 			<languagePopulation type="li" writingPercent="5" populationPercent="5.5" references="R1026"/>	<!--Limburgish-->
 			<languagePopulation type="fy" populationPercent="4.3" officialStatus="official_regional"/>	<!--Western Frisian-->
@@ -3837,7 +3899,7 @@ XXX Code for transations where no currency is involved
 			<languagePopulation type="ay" populationPercent="1.6"/>	<!--Aymara-->
 		</territory>
 		<territory type="PF" gdp="5650000000" literacyPercent="98" population="303540">	<!--French Polynesia-->
-			<languagePopulation type="fr" populationPercent="61" officialStatus="official"/>	<!--French-->
+			<languagePopulation type="fr" populationPercent="98" officialStatus="official" references="R1364"/>	<!--French-->
 			<languagePopulation type="ty" populationPercent="31" officialStatus="official"/>	<!--Tahitian-->
 			<languagePopulation type="zh_Hant" populationPercent="7.8"/>	<!--Chinese (Traditional)-->
 		</territory>
@@ -3908,7 +3970,7 @@ XXX Code for transations where no currency is involved
 			<languagePopulation type="prg" populationPercent="0.0001"/>	<!--Prussian-->
 		</territory>
 		<territory type="PM" gdp="261300000" literacyPercent="99" population="5132">	<!--St. Pierre & Miquelon-->
-			<languagePopulation type="fr" populationPercent="100" officialStatus="official"/>	<!--French-->
+			<languagePopulation type="fr" populationPercent="100" officialStatus="official" references="R1365"/>	<!--French-->
 			<languagePopulation type="en" populationPercent="3.7"/>	<!--English-->
 		</territory>
 		<territory type="PN" gdp="2702000" literacyPercent="99" population="50">	<!--Pitcairn Islands-->
@@ -3944,14 +4006,14 @@ XXX Code for transations where no currency is involved
 			<languagePopulation type="ml" populationPercent="0.25"/>	<!--Malayalam-->
 		</territory>
 		<territory type="RE" gdp="4791000000" literacyPercent="88" population="787584">	<!--Réunion-->
-			<languagePopulation type="fr" populationPercent="89" officialStatus="official" references="R1130"/>	<!--French-->
+			<languagePopulation type="fr" populationPercent="89" officialStatus="official" references="R1366"/>	<!--French-->
 			<languagePopulation type="rcf" populationPercent="71"/>	<!--Réunion Creole French-->
 			<languagePopulation type="ta" populationPercent="15"/>	<!--Tamil-->
 		</territory>
 		<territory type="RO" gdp="772100000000" literacyPercent="97.7" population="18148200">	<!--Romania-->
 			<languagePopulation type="ro" populationPercent="90" officialStatus="official"/>	<!--Romanian-->
 			<languagePopulation type="en" populationPercent="31"/>	<!--English-->
-			<languagePopulation type="fr" populationPercent="17"/>	<!--French-->
+			<languagePopulation type="fr" populationPercent="12" references="R1132"/>	<!--French-->
 			<languagePopulation type="es" populationPercent="10"/>	<!--Spanish-->
 			<languagePopulation type="hu" populationPercent="6.6"/>	<!--Hungarian-->
 			<languagePopulation type="de" populationPercent="0.21"/>	<!--German-->
@@ -3999,10 +4061,11 @@ XXX Code for transations where no currency is involved
 			<languagePopulation type="krl" populationPercent="0.082"/>	<!--Karelian-->
 			<languagePopulation type="lbe" populationPercent="0.078" officialStatus="official_regional"/>	<!--Lak-->
 			<languagePopulation type="koi" populationPercent="0.045" officialStatus="official_regional"/>	<!--Komi-Permyak-->
+			<languagePopulation type="pnt_Cyrl" populationPercent="0.04" references="R1335"/>	<!--Pontic (Cyrillic)-->
 			<languagePopulation type="mrj" populationPercent="0.021"/>	<!--Western Mari-->
 			<languagePopulation type="alt" populationPercent="0.014"/>	<!--Southern Altai-->
 			<languagePopulation type="fi" populationPercent="0.012"/>	<!--Finnish-->
-			<languagePopulation type="sr_Latn" populationPercent="0.0036"/>	<!--Serbian (Latin)-->
+			<languagePopulation type="sr" populationPercent="0.0041" references="R1040"/>	<!--Serbian-->
 			<languagePopulation type="vep" populationPercent="0.0026"/>	<!--Veps-->
 			<languagePopulation type="mn" populationPercent="0.0015"/>	<!--Mongolian-->
 			<languagePopulation type="kaa" populationPercent="0.0006" references="R1199"/>	<!--Kara-Kalpak-->
@@ -4013,7 +4076,7 @@ XXX Code for transations where no currency is involved
 		<territory type="RW" gdp="42700000000" literacyPercent="71.1" population="13623300">	<!--Rwanda-->
 			<languagePopulation type="rw" populationPercent="77" officialStatus="official"/>	<!--Kinyarwanda-->
 			<languagePopulation type="en" populationPercent="15" officialStatus="official" references="R1054"/>	<!--English-->
-			<languagePopulation type="fr" populationPercent="0.017" officialStatus="official"/>	<!--French-->
+			<languagePopulation type="fr" populationPercent="5.8" officialStatus="official" references="R1353"/>	<!--French-->
 		</territory>
 		<territory type="SA" gdp="1831000000000" literacyPercent="87.2" population="36544400">	<!--Saudi Arabia-->
 			<languagePopulation type="ar" populationPercent="100" officialStatus="official"/>	<!--Arabic-->
@@ -4026,10 +4089,11 @@ XXX Code for transations where no currency is involved
 		</territory>
 		<territory type="SC" gdp="3530000000" literacyPercent="91.8" population="98187">	<!--Seychelles-->
 			<languagePopulation type="crs" populationPercent="98" references="R1063"/>	<!--Seselwa Creole French-->
-			<languagePopulation type="fr" populationPercent="60" officialStatus="official" references="R1161"/>	<!--French-->
+			<languagePopulation type="fr" populationPercent="53" officialStatus="official" references="R1354"/>	<!--French-->
 			<languagePopulation type="en" populationPercent="38" officialStatus="official"/>	<!--English-->
 		</territory>
 		<territory type="SD" gdp="136000000000" literacyPercent="71.9" population="50467300">	<!--Sudan-->
+			<languagePopulation type="apd" populationPercent="61"/>	<!--Sudanese Arabic-->
 			<languagePopulation type="ar" populationPercent="61" officialStatus="official" references="R1234"/>	<!--Arabic-->
 			<languagePopulation type="en" populationPercent="61" officialStatus="official" references="R1235"/>	<!--English-->
 			<languagePopulation type="bej" populationPercent="5.4" references="R1314"/>	<!--Beja-->
@@ -4098,7 +4162,7 @@ XXX Code for transations where no currency is involved
 		</territory>
 		<territory type="SN" gdp="77380000000" literacyPercent="49.7" population="18847500">	<!--Senegal-->
 			<languagePopulation type="wo" populationPercent="70" officialStatus="de_facto_official" references="R1297"/>	<!--Wolof-->
-			<languagePopulation type="fr" literacyPercent="100" populationPercent="39" officialStatus="official" references="R1069"/>	<!--French-->
+			<languagePopulation type="fr" literacyPercent="100" populationPercent="26" officialStatus="official" references="R1367"/>	<!--French-->
 			<languagePopulation type="ff" populationPercent="21" officialStatus="official_regional"/>	<!--Fula-->
 			<languagePopulation type="srr" populationPercent="11" officialStatus="official_regional" references="R1069"/>	<!--Serer-->
 			<languagePopulation type="dyo" literacyPercent="10" populationPercent="2.6" officialStatus="official_regional" references="R1281"/>	<!--Jola-Fonyi-->
@@ -4131,9 +4195,13 @@ XXX Code for transations where no currency is involved
 		</territory>
 		<territory type="ST" gdp="1267000000" literacyPercent="69.5" population="223561">	<!--São Tomé & Príncipe-->
 			<languagePopulation type="pt" populationPercent="85" officialStatus="official"/>	<!--Portuguese-->
+			<languagePopulation type="fr" populationPercent="20" references="R1368"/>	<!--French-->
 		</territory>
 		<territory type="SV" gdp="71960000000" literacyPercent="84.5" population="6628700">	<!--El Salvador-->
 			<languagePopulation type="es" populationPercent="89" officialStatus="official"/>	<!--Spanish-->
+			<languagePopulation type="ccr" populationPercent="0.056"/>	<!--Cacaopera-->
+			<languagePopulation type="ppl" populationPercent="0.041"/>	<!--Pipil-->
+			<languagePopulation type="len" populationPercent="0.02"/>	<!--Lenca-->
 		</territory>
 		<territory type="SX" gdp="1912000000" literacyPercent="99" population="46215">	<!--Sint Maarten-->
 			<languagePopulation type="en" populationPercent="68" officialStatus="official" references="R1238"/>	<!--English-->
@@ -4145,7 +4213,7 @@ XXX Code for transations where no currency is involved
 			<languagePopulation type="apc" populationPercent="85" references="R1173"/>	<!--Levantine Arabic-->
 			<languagePopulation type="ar" populationPercent="80" officialStatus="official"/>	<!--Arabic-->
 			<languagePopulation type="ku" populationPercent="8"/>	<!--Kurdish-->
-			<languagePopulation type="fr" populationPercent="5.9" officialStatus="official" references="R1088"/>	<!--French-->
+			<languagePopulation type="fr" populationPercent="5.9" references="R1088"/>	<!--French-->
 			<languagePopulation type="hy" populationPercent="1.8"/>	<!--Armenian-->
 			<languagePopulation type="syr" writingPercent="5" populationPercent="0.084" references="R1017"/>	<!--Syriac-->
 		</territory>
@@ -4162,14 +4230,14 @@ XXX Code for transations where no currency is involved
 			<languagePopulation type="en" populationPercent="98" officialStatus="official"/>	<!--English-->
 		</territory>
 		<territory type="TD" gdp="32450000000" literacyPercent="35.4" population="19093600">	<!--Chad-->
-			<languagePopulation type="fr" populationPercent="26" officialStatus="official" references="R1239"/>	<!--French-->
 			<languagePopulation type="ar" populationPercent="17" officialStatus="official" references="R1239"/>	<!--Arabic-->
+			<languagePopulation type="fr" populationPercent="13" officialStatus="official" references="R1360"/>	<!--French-->
 		</territory>
 		<territory type="TF" gdp="7707000" literacyPercent="99" population="140">	<!--French Southern Territories-->
 			<languagePopulation type="fr" literacyPercent="100" populationPercent="100" references="R1184"/>	<!--French-->
 		</territory>
 		<territory type="TG" gdp="25750000000" literacyPercent="60.4" population="8917990">	<!--Togo-->
-			<languagePopulation type="fr" populationPercent="61" officialStatus="official"/>	<!--French-->
+			<languagePopulation type="fr" populationPercent="41" officialStatus="official" references="R1369"/>	<!--French-->
 			<languagePopulation type="ee" populationPercent="17"/>	<!--Ewe-->
 			<languagePopulation type="ife" literacyPercent="15" populationPercent="1.3" references="R1048"/>	<!--Ifè-->
 			<languagePopulation type="blo" populationPercent="0.15" references="R1194"/>	<!--Anii-->
@@ -4197,8 +4265,9 @@ XXX Code for transations where no currency is involved
 			<languagePopulation type="ar" populationPercent="0.0096"/>	<!--Arabic-->
 		</territory>
 		<territory type="TK" gdp="7712000" literacyPercent="99.6" population="1647">	<!--Tokelau-->
-			<languagePopulation type="en" populationPercent="78" officialStatus="official"/>	<!--English-->
-			<languagePopulation type="tkl" writingPercent="5" populationPercent="78" officialStatus="official" references="R1185"/>	<!--Tokelau-->
+			<languagePopulation type="tkl" literacyPercent="71" populationPercent="69" officialStatus="official" references="R1104"/>	<!--Tokelau-->
+			<languagePopulation type="en" literacyPercent="90" populationPercent="38" officialStatus="official" references="R1104"/>	<!--English-->
+			<languagePopulation type="sm" populationPercent="20" references="R1104"/>	<!--Samoan-->
 		</territory>
 		<territory type="TL" gdp="6265000000" literacyPercent="58.3" population="1506910">	<!--Timor-Leste-->
 			<languagePopulation type="pt" literacyPercent="100" populationPercent="59" officialStatus="official" references="R1049"/>	<!--Portuguese-->
@@ -4214,7 +4283,7 @@ XXX Code for transations where no currency is involved
 		<territory type="TN" gdp="153600000000" literacyPercent="79.1" population="12048800">	<!--Tunisia-->
 			<languagePopulation type="aeb" populationPercent="90"/>	<!--Tunisian Arabic-->
 			<languagePopulation type="ar" populationPercent="90" officialStatus="official"/>	<!--Arabic-->
-			<languagePopulation type="fr" populationPercent="74" officialStatus="official" references="R1132"/>	<!--French-->
+			<languagePopulation type="fr" populationPercent="53" officialStatus="official" references="R1347"/>	<!--French-->
 		</territory>
 		<territory type="TO" gdp="700400000" literacyPercent="99" population="104889">	<!--Tonga-->
 			<languagePopulation type="to" populationPercent="95" officialStatus="official"/>	<!--Tongan-->
@@ -4226,7 +4295,6 @@ XXX Code for transations where no currency is involved
 			<languagePopulation type="ku" populationPercent="5.5"/>	<!--Kurdish-->
 			<languagePopulation type="apc" populationPercent="5.2" references="R1173"/>	<!--Levantine Arabic-->
 			<languagePopulation type="zza" populationPercent="1.4"/>	<!--Zaza-->
-			<languagePopulation type="kaa" populationPercent="0.1" references="R1199"/>	<!--Kara-Kalpak-->
 			<languagePopulation type="kbd" populationPercent="0.77"/>	<!--Kabardian-->
 			<languagePopulation type="az" populationPercent="0.74"/>	<!--Azerbaijani-->
 			<languagePopulation type="az_Arab" populationPercent="0.65"/>	<!--Azerbaijani (Arabic)-->
@@ -4235,11 +4303,13 @@ XXX Code for transations where no currency is involved
 			<languagePopulation type="bg" populationPercent="0.42"/>	<!--Bulgarian-->
 			<languagePopulation type="ady" populationPercent="0.39"/>	<!--Adyghe-->
 			<languagePopulation type="kiu" populationPercent="0.19"/>	<!--Kirmanjki-->
+			<languagePopulation type="kaa" populationPercent="0.1" references="R1199"/>	<!--Kara-Kalpak-->
 			<languagePopulation type="hy" populationPercent="0.056"/>	<!--Armenian-->
 			<languagePopulation type="ka" populationPercent="0.056"/>	<!--Georgian-->
 			<languagePopulation type="sr_Latn" writingPercent="5" populationPercent="0.028" references="R1017"/>	<!--Serbian (Latin)-->
 			<languagePopulation type="lzz" populationPercent="0.028"/>	<!--Laz-->
 			<languagePopulation type="sq" populationPercent="0.021"/>	<!--Albanian-->
+			<languagePopulation type="pnt_Latn" populationPercent="0.0061" references="R1336"/>	<!--Pontic (Latin)-->
 			<languagePopulation type="ab" populationPercent="0.0048" references="R1079"/>	<!--Abkhazian-->
 			<languagePopulation type="el" populationPercent="0.0048"/>	<!--Greek-->
 			<languagePopulation type="tru" populationPercent="0.0036"/>	<!--Turoyo-->
@@ -4257,6 +4327,8 @@ XXX Code for transations where no currency is involved
 		</territory>
 		<territory type="TW" gdp="1143000000000" literacyPercent="96.1" population="23595300">	<!--Taiwan-->
 			<languagePopulation type="zh_Hant" populationPercent="95" officialStatus="official"/>	<!--Chinese (Traditional)-->
+			<languagePopulation type="nan_Hant" populationPercent="57" officialStatus="official" references="R1219"/>	<!--Min Nan Chinese (Traditional)-->
+			<languagePopulation type="hak_Hant" populationPercent="11" officialStatus="official" references="R1333"/>	<!--Hakka Chinese (Traditional)-->
 			<languagePopulation type="trv" populationPercent="0.02"/>	<!--Taroko-->
 		</territory>
 		<territory type="TZ" gdp="234100000000" literacyPercent="67.8" population="67462100">	<!--Tanzania-->
@@ -4376,11 +4448,11 @@ XXX Code for transations where no currency is involved
 		<territory type="VU" gdp="999500000" literacyPercent="83.2" population="318007">	<!--Vanuatu-->
 			<languagePopulation type="bi" populationPercent="90" officialStatus="official" references="R1201"/>	<!--Bislama-->
 			<languagePopulation type="en" populationPercent="83" officialStatus="official"/>	<!--English-->
-			<languagePopulation type="fr" populationPercent="50" officialStatus="official"/>	<!--French-->
+			<languagePopulation type="fr" populationPercent="31" officialStatus="official" references="R1360"/>	<!--French-->
 		</territory>
 		<territory type="WF" gdp="60000000" literacyPercent="50" population="15964">	<!--Wallis & Futuna-->
+			<languagePopulation type="fr" populationPercent="83" officialStatus="official" references="R1342"/>	<!--French-->
 			<languagePopulation type="wls" populationPercent="59"/>	<!--Wallisian-->
-			<languagePopulation type="fr" populationPercent="48" officialStatus="official" references="R1168"/>	<!--French-->
 			<languagePopulation type="fud" populationPercent="30"/>	<!--East Futuna-->
 		</territory>
 		<territory type="WS" gdp="1359000000" literacyPercent="98.8" population="208853">	<!--Samoa-->
@@ -4399,7 +4471,7 @@ XXX Code for transations where no currency is involved
 		</territory>
 		<territory type="YT" gdp="953600000" literacyPercent="80.8" population="194000">	<!--Mayotte-->
 			<languagePopulation type="swb" populationPercent="88" references="R1169"/>	<!--Comorian-->
-			<languagePopulation type="fr" populationPercent="57" officialStatus="official" references="R1170"/>	<!--French-->
+			<languagePopulation type="fr" populationPercent="63" officialStatus="official" references="R1370"/>	<!--French-->
 			<languagePopulation type="buc" populationPercent="23"/>	<!--Bushi-->
 			<languagePopulation type="sw" populationPercent="1.4"/>	<!--Swahili-->
 		</territory>
@@ -4419,10 +4491,17 @@ XXX Code for transations where no currency is involved
 			<languagePopulation type="sw" literacyPercent="50" populationPercent="0.0017"/>	<!--Swahili-->
 		</territory>
 		<territory type="ZM" gdp="76490000000" literacyPercent="61.4" population="20799100">	<!--Zambia-->
-			<languagePopulation type="bem" populationPercent="31" references="R1104"/>	<!--Bemba-->
+			<languagePopulation type="bem" populationPercent="34" references="R1285"/>	<!--Bemba-->
+			<languagePopulation type="ny" populationPercent="19" references="R1285"/>	<!--Nyanja-->
 			<languagePopulation type="en" populationPercent="16" officialStatus="official"/>	<!--English-->
-			<languagePopulation type="ny" populationPercent="15"/>	<!--Nyanja-->
-			<languagePopulation type="loz" populationPercent="6" references="R1285"/>	<!--Lozi-->
+			<languagePopulation type="toi" populationPercent="11" references="R1285"/>	<!--Tonga [Zambia]-->
+			<languagePopulation type="loz" populationPercent="5.5" references="R1285"/>	<!--Lozi-->
+			<languagePopulation type="nse" populationPercent="3" references="R1285"/>	<!--Nsenga-->
+			<languagePopulation type="leb" populationPercent="2.8" references="R1285"/>	<!--Lala-Bisa-->
+			<languagePopulation type="tum" populationPercent="2.6" references="R1285"/>	<!--Tumbuka-->
+			<languagePopulation type="kqn" populationPercent="1.9" references="R1285"/>	<!--Kaonde-->
+			<languagePopulation type="lun" populationPercent="1.9" references="R1285"/>	<!--Lunda-->
+			<languagePopulation type="lue" populationPercent="1.5" references="R1285"/>	<!--Luvale-->
 		</territory>
 		<territory type="ZW" gdp="58580000000" literacyPercent="83.6" population="17150400">	<!--Zimbabwe-->
 			<languagePopulation type="sn" populationPercent="81" officialStatus="official"/>	<!--Shona-->
@@ -4890,7 +4969,7 @@ XXX Code for transations where no currency is involved
 		<weekOfPreference ordering="weekOfYear weekOfInterval" locales="zu"/>
 		<weekOfPreference ordering="weekOfDate" locales="ca es fr gl"/>
 		<weekOfPreference ordering="weekOfDate weekOfMonth" locales="en bn ja ka"/>
-		<weekOfPreference ordering="weekOfDate weekOfMonth weekOfInterval" locales="bg de iw pt ur zh"/>
+		<weekOfPreference ordering="weekOfDate weekOfMonth weekOfInterval" locales="bg de he pt ur zh"/>
 		<weekOfPreference ordering="weekOfDate weekOfYear weekOfMonth" locales="nl"/>
 		<weekOfPreference ordering="weekOfDate weekOfInterval weekOfMonth" locales="af"/>
 		<weekOfPreference ordering="weekOfMonth" locales="ar fil gu hu hy id kk ko"/>
@@ -4908,7 +4987,7 @@ XXX Code for transations where no currency is involved
     <timeData>
 		<hours preferred="H" allowed="H" regions="AX BQ CP CZ DK FI ID IS ML NE RU SE SJ SK"/>
 		<hours preferred="H" allowed="H h" regions="001 BI BY FO GL HU MG MT MU MV NO PL RW TH TJ TM VN ZW"/>
-		<hours preferred="H" allowed="H h hb hB" regions="AC AI BW BZ CC CK CX DG FK GB GG GI IE IM IO JE LT MK MN MS NF NG NR NU PN SH SX TA ZA en_IL"/>
+		<hours preferred="H" allowed="H h hb hB" regions="AC AI BW BZ CC CK CX DG FK GB GG GI GS IE IM IO JE LT MK MN MS NF NG NR NU PN SH SX TA ZA en_IL"/>
 		<hours preferred="H" allowed="H h hB" regions="CF CM LU NP PF SC SM SN TF VA ca_ES fr_CA gl_ES it_CH it_IT"/>
 		<hours preferred="H" allowed="H h hB hb" regions="EA IC KG KM LK MA af_ZA es_BR es_ES es_GQ"/>
 		<hours preferred="H" allowed="H K h" regions="JP"/>
@@ -5448,8 +5527,8 @@ XXX Code for transations where no currency is involved
 
 	<parentLocales>
 		<parentLocale parent="root" localeRules="nonlikelyScript" locales="az_Arab az_Cyrl bal_Latn blt_Latn bm_Nkoo bs_Cyrl byn_Latn cu_Glag dje_Arab dyo_Arab en_Dsrt en_Shaw ff_Adlm ff_Arab ha_Arab iu_Latn kaa_Latn kk_Arab kok_Latn ks_Deva ku_Arab kxv_Deva kxv_Orya kxv_Telu ky_Arab ky_Latn ml_Arab mn_Mong mni_Mtei ms_Arab pa_Arab sat_Deva sd_Deva sd_Khoj sd_Sind shi_Latn so_Arab sr_Latn sw_Arab tg_Arab ug_Cyrl uz_Arab uz_Cyrl vai_Latn wo_Arab yo_Arab yue_Hans zh_Hant"/>
-		<parentLocale parent="en_001" locales="en_150 en_AG en_AI en_AU en_BB en_BM en_BS en_BW en_BZ en_CC en_CK en_CM en_CX en_CY en_DG en_DM en_ER en_FJ en_FK en_FM en_GB en_GD en_GG en_GH en_GI en_GM en_GY en_HK en_ID en_IE en_IL en_IM en_IN en_IO en_JE en_JM en_KE en_KI en_KN en_KY en_LC en_LR en_LS en_MG en_MO en_MS en_MT en_MU en_MV en_MW en_MY en_NA en_NF en_NG en_NR en_NU en_NZ en_PG en_PK en_PN en_PW en_RW en_SB en_SC en_SD en_SG en_SH en_SL en_SS en_SX en_SZ en_TC en_TK en_TO en_TT en_TV en_TZ en_UG en_VC en_VG en_VU en_WS en_ZA en_ZM en_ZW"/>
-		<parentLocale parent="en_150" locales="en_AT en_BE en_CH en_DE en_DK en_FI en_NL en_SE en_SI"/>
+		<parentLocale parent="en_001" locales="en_150 en_AG en_AI en_AU en_BB en_BM en_BS en_BW en_BZ en_CC en_CK en_CM en_CX en_CY en_DG en_DM en_ER en_FJ en_FK en_FM en_GB en_GD en_GG en_GH en_GI en_GM en_GS en_GY en_HK en_ID en_IE en_IL en_IM en_IN en_IO en_JE en_JM en_KE en_KI en_KN en_KY en_LC en_LR en_LS en_MG en_MO en_MS en_MT en_MU en_MV en_MW en_MY en_NA en_NF en_NG en_NR en_NU en_NZ en_PG en_PK en_PN en_PW en_RW en_SB en_SC en_SD en_SG en_SH en_SL en_SS en_SX en_SZ en_TC en_TK en_TO en_TT en_TV en_TZ en_UG en_VC en_VG en_VU en_WS en_ZA en_ZM en_ZW"/>
+		<parentLocale parent="en_150" locales="en_AT en_BE en_CH en_CZ en_DE en_DK en_ES en_FI en_FR en_HU en_IT en_NL en_NO en_PL en_PT en_RO en_SE en_SI en_SK"/>
 		<parentLocale parent="en_IN" locales="hi_Latn"/>
 		<parentLocale parent="es_419" locales="es_AR es_BO es_BR es_BZ es_CL es_CO es_CR es_CU es_DO es_EC es_GT es_HN es_JP es_MX es_NI es_PA es_PE es_PR es_PY es_SV es_US es_UY es_VE"/>
 		<parentLocale parent="fr_HT" locales="ht"/>
@@ -5475,11 +5554,11 @@ XXX Code for transations where no currency is involved
 	<references>
 		<reference type="R1000" uri="https://www.cia.gov/cia/publications/factbook/geos/aa.html">Dutch official</reference>
 		<reference type="R1001" uri="http://www.migrationinformation.org/Feature/display.cfm?ID=72">At most 6% are not fluent in English</reference>
-		<reference type="R1002" uri="https://www.cia.gov/cia/publications/factbook/geos/cg.html">French official, the figure is derived from literacy * population</reference>
+		<reference type="R1002">Precise data not available, added so Balinese script defaults to Balinese</reference>
 		<reference type="R1003">While Cyrillic is customary, the vast majority of the population can read both.For languages not customarily written, the writing populiation is artificially set to 5% in the absence of better information.</reference>
 		<reference type="R1004" uri="http://www.ethnologue.com/show_country.asp?name=NL">The figure includes 'Vlaams' population from Ethnologue</reference>
 		<reference type="R1005" uri="http://www.orbilat.com/Languages/Walloon/Walloon.htm">It is estimated that Walloon is used actively by 10-20% of the total population of Wallonia or between 300,000 and 600,000 people. For languages not customarily written, the writing population is artificially set to 5% in the absence of better information.</reference>
-		<reference type="R1006" uri="http://www.ethnologue.com/show_country.asp?name=CH">http://en.wikipedia.org/wiki/Demographics_of_Switzerland Literacy rate for gsw is 5% of reported speaker population; literacy is mostly in standard German. For languages not customarily written, the writing population is artificially set to 5% in the absence of better information.</reference>
+		<reference type="R1006">Precise data not available</reference>
 		<reference type="R1007" uri="http://www.ethnologue.com/show_country.asp?name=Bahrain">Arabic official, the figure is derived from literacy * lang pop</reference>
 		<reference type="R1008" uri="http://lanic.utexas.edu/project/tilan/reports/rtf359/bolivia1.html">Spanish is the official language, only about 60-70% of the population speaks it at all ;</reference>
 		<reference type="R1009" uri="https://www.cia.gov/cia/publications/factbook/geos/bc.html">English official, 81% literacy; the figure is derived from literacy * lang pop</reference>
@@ -5492,18 +5571,18 @@ XXX Code for transations where no currency is involved
 		<reference type="R1016" uri="http://www.ethnologue.com/show_language.asp?code=sco">100k+ native, plus 1.5 mil 2nd lang speakers. For languages not customarily written, the writing population is artificially set to 5% in the absence of better information.</reference>
 		<reference type="R1017">For languages not customarily written, the writing population is artificially set to 5% in the absence of better information.</reference>
 		<reference type="R1018" uri="https://www.cia.gov/cia/publications/factbook/geos/gj.html">English official; the figure is derived from literacy * lang pop</reference>
-		<reference type="R1019" uri="http://www.ethnologue.com/show_country.asp?name=GF">French official; the figure is derived from literacy * lang pop</reference>
+		<reference type="R1019" uri="https://www150.statcan.gc.ca/t1/tbl1/en/tv.action?pid=9810021601">Canada 2021 Census language &quot;Knowledge of Language&quot;; official status from Wikipedia Languages_of_Canada</reference>
 		<reference type="R1020" uri="http://en.wikipedia.org/wiki/Ascension_Island">[missing]</reference>
-		<reference type="R1021" uri="http://www.nationsonline.org/oneworld/mauritania.htm">Crude estimate based on import partner data. http://www.answers.com/topic/mauritania</reference>
+		<reference type="R1021">Actually literacy in Nko writing unknown but historically they used the Latin script</reference>
 		<reference type="R1022" uri="https://www.cia.gov/cia/publications/factbook/geos/gi.html">English official, the figure is derived from literacy * lang pop</reference>
-		<reference type="R1023" uri="http://www.ethnologue.com/show_country.asp?name=GP">French official; the figure is derived from literacy * lang pop</reference>
+		<reference type="R1023">Actually literacy in Nko writing unknown</reference>
 		<reference type="R1024" uri="http://www.ethnologue.com/show_language.asp?code=ltz">Some 99% of users are literate in French or German. For languages not customarily written, the writing population is artificially set to 5% in the absence of better information.</reference>
 		<reference type="R1025" uri="http://www.ethnologue.com/language/ewo">2nd lang literacy 15-25%</reference>
 		<reference type="R1026" uri="http://www.ethnologue.com/show_language.asp?code=lim">Nearly all speakers are literate in a 2nd language. For languages not customarily written, the writing population is artificially set to 5%</reference>
 		<reference type="R1027" uri="https://www.cia.gov/cia/publications/factbook/geos/pu.html">Many minor langs; Portuguese official</reference>
 		<reference type="R1028" uri="http://www.seasite.niu.edu/tagalog/essays_on_philippine_languages.htm">In this and other sources, such as Ethnologue, there is no estimate for number of users. http://en.wikipedia.org/wiki/Filipino_language http://www.ethnologue.com/show_language.asp?code=fil </reference>
 		<reference type="R1029" uri="http://www.ethnologue.com/show_language.asp?code=hat">Most of the population uses Creole; see also http://www.country-studies.com/haiti/creole,-literacy,-and-education.html http://en.wikipedia.org/wiki/French_language#Haiti</reference>
-		<reference type="R1030" uri="http://www.ethnologue.com/show_language.asp?code=fra">400k 2nd language speakers</reference>
+		<reference type="R1030" uri="https://www.francophonie.org/sites/default/files/2021-04/LFDM-20Edition-2019-La-langue-fran%C3%A7aise-dans-le-monde.pdf">[missing]</reference>
 		<reference type="R1031" uri="http://www.ethnologue.com/show_country.asp?name=CV">Official language, 37-77% literacy</reference>
 		<reference type="R1032" uri="http://www.ethnologue.com/show_country.asp?name=ER">Official language, used in some schools.</reference>
 		<reference type="R1033" uri="http://www.ciil.org/Main/Announcement/MBE_Programme/paper/paper2.htm">http://www.censusindia.net/cendat/datatable26.html</reference>
@@ -5513,8 +5592,7 @@ XXX Code for transations where no currency is involved
 		<reference type="R1037" uri="http://en.wikipedia.org/wiki/Kiribati">English official; Kiribati widespread</reference>
 		<reference type="R1038" uri="https://www.cia.gov/cia/publications/factbook/fields/2098.html">[missing]</reference>
 		<reference type="R1039" uri="https://www.cia.gov/cia/publications/factbook/geos/ls.html">German official</reference>
-		<reference type="R1040">No figures found for use of French. Used literacy 29.5% times population to get the writing pop; French is the only official language.</reference>
-		<reference type="R1041" uri="https://www.cia.gov/cia/publications/factbook/geos/ng.html">French official; the figure is derived from literacy * lang pop</reference>
+		<reference type="R1040" uri="http://rosstat.gov.ru/vpn_popul">2020 Russian Census</reference>
 		<reference type="R1042" uri="https://www.cia.gov/cia/publications/factbook/geos/nl.html">Used CIA literacy figure times population, added 'Vlaams' population</reference>
 		<reference type="R1043" uri="http://www.cso.ie/census/documents/Final%20Principal%20Demographic%20Results%202006.pdf">[missing]</reference>
 		<reference type="R1044" uri="http://www.ethnologue.com/show_language.asp?code=mri">70,000 in 1991, 100,000 who understand it, but do not speak it ; ethnic pop 530,000 in 2002</reference>
@@ -5535,7 +5613,7 @@ XXX Code for transations where no currency is involved
 		<reference type="R1059" uri="https://www.cia.gov/cia/publications/factbook/fields/2098.html">English official on some islands, total 9.4%</reference>
 		<reference type="R1060" uri="http://www.nsf.gov/od/opp/support/southp.jsp">http://astro.uchicago.edu/cara/vtour/mcmurdo/ http://www.usap.gov/videoclipsandmaps/mcmwebcam.cfm Winter population is listed.</reference>
 		<reference type="R1061" uri="http://www.ethnologue.com/show_language.asp?code=tem">1.2mil 1st lang + 240k 2nd lang users, low literacy</reference>
-		<reference type="R1062" uri="http://en.wikipedia.org/wiki/Clipperton_Island">[missing]</reference>
+		<reference type="R1062" uri="https://en.wikipedia.org/wiki/Bouvet_Island">Has rotating Norwegian population at Norvegia Station</reference>
 		<reference type="R1063" uri="http://www.flw.com/languages/creoleseychelles.htm">http://www.mavicanet.com/directory/eng/2436.html</reference>
 		<reference type="R1064" uri="https://www.cia.gov/cia/publications/factbook/geos/hm.html">Uninhabited, barren, sub-Antarctic islands</reference>
 		<reference type="R1065" uri="http://en.wikipedia.org/wiki/Diego_Garcia">[missing]</reference>
@@ -5557,8 +5635,7 @@ XXX Code for transations where no currency is involved
 		<reference type="R1081" uri="https://www.cia.gov/cia/publications/factbook/geos/tz.html">English (official, primary language of commerce, administration, and higher education)</reference>
 		<reference type="R1082" uri="http://www.ethnologue.com/show_language.asp?code=eng">Ethnologue lists 1 million 2nd lang users of English; no other good figures found.</reference>
 		<reference type="R1083" uri="http://www.bhas.ba/index.php?option=com_content&amp;view=article&amp;id=52&amp;itemid=80&amp;lang=en&amp;Itemid="> also: http://en.wikipedia.org/wiki/Bosnian_language</reference>
-		<reference type="R1084" uri="http://www.nationsonline.org/oneworld/equatorial_guinea.htm">French is a minority official language. Crude estimate of usage based on import partner data.</reference>
-		<reference type="R1085" uri="http://en.wikipedia.org/wiki/Geographic_distribution_of_Portuguese">Macao reported 5% native Portuguese speakers.</reference>
+		<reference type="R1085" uri="https://www.dsec.gov.mo/getAttachment/6cb29f2f-524a-488f-aed3-4d7207bb109e/E_CEN_PUB_2021_Y.aspx">2021 Census, counting people who are fluent in the language</reference>
 		<reference type="R1086">5% writing pop estimated in absence of other data</reference>
 		<reference type="R1087" uri="http://www.ethnologue.com/show_language.asp?code=rkt">[missing]</reference>
 		<reference type="R1088" uri="http://www.nationsonline.org/oneworld/syria.htm">Crude estimate based on import partner data.</reference>
@@ -5577,7 +5654,7 @@ XXX Code for transations where no currency is involved
 		<reference type="R1101" uri="http://www.ethnologue.com/show_language.asp?code=mhr">[missing]</reference>
 		<reference type="R1102" uri="https://en.wikipedia.org/wiki/Languages_with_official_status_in_India#Writing_systems">Deva is the official script for sd in India; set to 55%. Arab, Guru, Khoj also used.</reference>
 		<reference type="R1103" uri="http://www.ethnologue.com/show_language.asp?code=srn">The lingua franca of 80% of the population</reference>
-		<reference type="R1104" uri="http://www.ethnologue.com/show_language.asp?code=bem">[missing]</reference>
+		<reference type="R1104" uri="http://www.tokelau.org.nz/Stats.html">2016 Census</reference>
 		<reference type="R1105" uri="https://www.ethnologue.com/language/mro">and https://en.wikipedia.org/wiki/Mru_language</reference>
 		<reference type="R1106" uri="http://en.wikipedia.org/wiki/Languages_of_Pakistan">- More than 95% of Pakistanis can speak or understand Urdu as their second or third language</reference>
 		<reference type="R1107" uri="https://joshuaproject.net/languages/hnj">[missing]</reference>
@@ -5597,20 +5674,17 @@ XXX Code for transations where no currency is involved
 		<reference type="R1121" uri="http://www.nvtc.gov/lotw/months/march/Azerbaijani.html#writ">Latin script official, used 98.8% of pop * 90% for the usage figure</reference>
 		<reference type="R1122" uri="http://en.wikipedia.org/wiki/Swahili_language">- five eastern provinces of the DRC are Swahili speaking. Nearly half the 66 million Congolese speak it.</reference>
 		<reference type="R1123" uri="http://en.wikipedia.org/wiki/Kazakh_language">[missing]</reference>
-		<reference type="R1124" uri="http://en.wikipedia.org/wiki/Algerian_language">estimate 20% of Algerians can use French</reference>
 		<reference type="R1125" uri="http://en.wikipedia.org/wiki/Alsatian_language">[missing]</reference>
 		<reference type="R1126" uri="http://www.ethnologue.com/show_language.asp?code=rwr">[missing]</reference>
 		<reference type="R1127" uri="http://en.wikipedia.org/wiki/Swahili_language">- Most educated Kenyans are able to communicate fluently in Swahili, since it is a compulsory subject in school</reference>
 		<reference type="R1128" uri="http://en.wikipedia.org/wiki/Gagauz_language">[missing]</reference>
 		<reference type="R1129" uri="http://www.ethnologue.com/show_language.asp?code=skr">[missing]</reference>
-		<reference type="R1130" uri="http://en.wikipedia.org/wiki/R%C3%A9union">- Education is in French; using literacy rate * pop for French-using population</reference>
 		<reference type="R1131" uri="http://en.wikipedia.org/wiki/Singapore">  English is the first language learned by half the children by the time they reach preschool age; using 92.6% of pop for the English figure</reference>
-		<reference type="R1132" uri="http://en.wikipedia.org/wiki/Tunisia#Language">- using pop * literacy rate</reference>
+		<reference type="R1132" uri="https://observatoire.francophonie.org//wp-content/uploads/2022/03/odsef-lfdm-2022.pdf">Organisation internationale de la Francophonie Meta-study. Data from 2012 and 2016 Eurostat studies on first and second language usage across Europe</reference>
 		<reference type="R1133" uri="http://en.wikipedia.org/wiki/Swahili_language">- 90 percent of approximately 39 million Tanzanians speak Swahili</reference>
 		<reference type="R1134" uri="http://en.wikipedia.org/wiki/Swahili_language">- Baganda generally don't speak Swahili, but it is in common use among the 25 million people elsewhere in the country, and is currently being implemented in schools nationwide (use 75% of Cpop for this figure)</reference>
 		<reference type="R1135" uri="https://en.wikipedia.org/wiki/Talian_dialect">[missing]</reference>
 		<reference type="R1136" uri="https://en.wikipedia.org/wiki/Chipilo_Venetian_dialect">[missing]</reference>
-		<reference type="R1137" uri="http://en.wikipedia.org/wiki/French_language">[missing]</reference>
 		<reference type="R1138" uri="http://en.wikipedia.org/wiki/Breton_language">http://www.ofis-bzh.org/fr/langue_bretonne/chiffres_cles/index.php France blocks other languages in state schools; 1.4% attended Breton schools and 3% is estimated as family transmission rate</reference>
 		<reference type="R1139" uri="http://en.wikipedia.org/wiki/Pashto_language">15.8% of population</reference>
 		<reference type="R1140" uri="http://en.wikipedia.org/wiki/Cornish_language">The 2008 estimate is ~2000 speakers due to revival efforts</reference>
@@ -5634,16 +5708,13 @@ XXX Code for transations where no currency is involved
 		<reference type="R1158" uri="http://en.wikipedia.org/wiki/Languages_of_Pakistan#Punjabi">Spoken by 70% of population, assumed to use Arabic script in Pakistan</reference>
 		<reference type="R1159" uri="http://en.wikipedia.org/wiki/Chuvash_language#Language_use">Reported to be (regional) official in Chuvashia, central Russia: taught at schools. However: http://cv.wikipedia.org/ Chuvash Wikipedia on-line.</reference>
 		<reference type="R1160" uri="https://www.ethnologue.com/language/pis">[missing]</reference>
-		<reference type="R1161" uri="http://en.wikipedia.org/wiki/African_French">[missing]</reference>
 		<reference type="R1162" uri="https://www.cia.gov/cia/publications/factbook/fields/2098.html">'A lingua franca and a first language for 10% of the population but understood by 95%' http://en.wikipedia.org/wiki/Krio_language</reference>
 		<reference type="R1163" uri="http://en.wikipedia.org/wiki/Suriname#Languages">Dutch is spoken as a mother tongue by about 60% of the Surinamese, while most others speak it as a second or third language.</reference>
 		<reference type="R1164" uri="http://en.wikipedia.org/wiki/Isan_language">main language of trade and comm. in Isan region, except ... media where it gives way to Thai; now largely an unwritten language. 10% writing pop estimated in absence of other data</reference>
 		<reference type="R1165" uri="http://en.wikipedia.org/wiki/Uyghur_language">- primarily written using an Arabic-derived alphabet</reference>
 		<reference type="R1166" uri="https://en.wikipedia.org/wiki/Sark#Economy">and https://islandstudies.com/files/2016/11/Guernsey-Herm-Sark.pdf - extrapolated GDP from per capita x population</reference>
 		<reference type="R1167" uri="http://www.ethnologue.com/show_language.asp?code=nds">understood by 10 million, perhaps. Figure is questionable writing pop artificially set to 5% see also: http://en.wikipedia.org/wiki/Low_German (understood by 10 million people, and native to about 3 million people all around northern Germany)</reference>
-		<reference type="R1168" uri="http://en.wikipedia.org/wiki/Wallis_and_futuna#Languages">[missing]</reference>
 		<reference type="R1169" uri="http://en.wikipedia.org/wiki/Mayotte#Languages">See the 2006 language survey data for 2nd langs = Shimaore</reference>
-		<reference type="R1170" uri="http://en.wikipedia.org/wiki/Mayotte#Languages">See the 2006 language survey data for 2nd langs</reference>
 		<reference type="R1171">Common lingua franca, widely used. High literacy.</reference>
 		<reference type="R1172" uri="https://en.wikipedia.org/wiki/Lombard_language#Usage">but subtracting 270,000 per https://en.wikipedia.org/wiki/Swiss_Italian</reference>
 		<reference type="R1173" uri="https://en.wikipedia.org/wiki/Levantine_Arabic#Speakers_by_country">[missing]</reference>
@@ -5651,14 +5722,14 @@ XXX Code for transations where no currency is involved
 		<reference type="R1175" uri="http://en.wikipedia.org/wiki/Saho_language">[missing]</reference>
 		<reference type="R1176" uri="http://en.wikipedia.org/wiki/Spanish_language#Spain">98.8% speak Spanish. Also, https://www.cia.gov/library/publications/the-world-factbook/geos/sp.html</reference>
 		<reference type="R1177" uri="https://www.cia.gov/library/publications/the-world-factbook/geos/sp.html">[missing]</reference>
-		<reference type="R1178" uri="https://www.cia.gov/cia/publications/factbook/geos/sx.html">No indigenous inhabitants. http://en.wikipedia.org/wiki/Heard_Island_and_McDonald_Islands</reference>
+		<reference type="R1178" uri="http://en.wikipedia.org/wiki/Clipperton_Island">Colony of France but uninhabited</reference>
 		<reference type="R1179" uri="https://www.cia.gov/cia/publications/factbook/geos/io.html">No indigenous inhabitants. http://en.wikipedia.org/wiki/British_Indian_Ocean_Territory</reference>
 		<reference type="R1180" uri="http://www.ethnologue.com/show_language.asp?code=saq">Many also use Swahili</reference>
 		<reference type="R1181" uri="http://www.ethnologue.com/show_language.asp?code=shi">Latin is not shown as being used, rather Arabic</reference>
 		<reference type="R1182" uri="http://www.ethnologue.com/show_language.asp?code=naq">Used in schools up to University.</reference>
 		<reference type="R1183" uri="http://en.wikipedia.org/wiki/Sakha_language">Also called Sakha.</reference>
 		<reference type="R1184" uri="https://www.cia.gov/cia/publications/factbook/geos/fs.html">No indigenous inhabitants. http://en.wikipedia.org/wiki/French_Southern_Territories</reference>
-		<reference type="R1185" uri="https://www.cia.gov/library/publications/the-world-factbook/geos/tl.html">[missing]</reference>
+		<reference type="R1185" uri="https://statsmauritius.govmu.org/Documents/Statistics/ESI/2022/EI1687/2022%20Population%20Census_Main%20Results_18112022.pdf">2022 Census language spoken at home</reference>
 		<reference type="R1186" uri="http://www.ethnologue.com/show_language.asp?code=mas">Shows 50% literacy</reference>
 		<reference type="R1187" uri="http://www.ethnologue.com/show_language.asp?code=asa">Most also use Swahili with 50% literacy. Only 5% monolingual.</reference>
 		<reference type="R1188" uri="http://www.ethnologue.com/show_language.asp?code=lag">Most also use Swahili</reference>
@@ -5692,6 +5763,7 @@ XXX Code for transations where no currency is involved
 		<reference type="R1216">This is base pop for &quot;&quot;&quot;&quot;&quot;&quot;&quot;&quot;&quot;&quot;&quot;&quot;&quot;&quot;&quot;&quot;&quot;&quot;&quot;&quot;&quot;&quot;&quot;&quot;&quot;&quot;&quot;&quot;&quot;&quot;&quot;&quot;fub&quot;&quot;&quot;&quot;&quot;&quot;&quot;&quot;&quot;&quot;&quot;&quot;&quot;&quot;&quot;&quot;&quot;&quot;&quot;&quot;&quot;&quot;&quot;&quot;&quot;&quot;&quot;&quot;&quot;&quot;&quot;&quot; lang code; ff shows as a macrolanguage</reference>
 		<reference type="R1217" uri="http://www.ethnologue.com/language/bkm">[missing]</reference>
 		<reference type="R1218" uri="http://en.wikipedia.org/wiki/Vietnamese_language">(could be higher if 2nd lang included; no data yet)</reference>
+		<reference type="R1219" uri="https://en.wikipedia.org/wiki/Taiwanese_Hokkien">[missing]</reference>
 		<reference type="R1220" uri="http://www.ethnologue.com/18/language/knf/">[missing]</reference>
 		<reference type="R1221" uri="https://www.cia.gov/library/publications/the-world-factbook/geos/cc.html">[missing]</reference>
 		<reference type="R1222" uri="http://www.ethnologue.com/show_language.asp?code=dsb">pop 7k. Figure is questionable writing pop artificially set to 5% see also http://en.wikipedia.org/wiki/Lower_Sorbian</reference>
@@ -5724,7 +5796,6 @@ XXX Code for transations where no currency is involved
 		<reference type="R1249" uri="https://en.wikipedia.org/wiki/Ladin_language">population figure from CLDR-17483 ticket</reference>
 		<reference type="R1250">No Data Available at present.</reference>
 		<reference type="R1251">co-official in South Tyrol</reference>
-		<reference type="R1252">Aosta Valley</reference>
 		<reference type="R1253">in Trieste and  Gorizia</reference>
 		<reference type="R1254" uri="http://unicode.org/cldr/trac/attachment/ticket/5887/zgh-ISO639-2-certif.pdf">[missing]</reference>
 		<reference type="R1255">Information on the Latin/Cyrillic script percentages for Montenegro not currently found.</reference>
@@ -5745,7 +5816,7 @@ XXX Code for transations where no currency is involved
 		<reference type="R1270">Mainly unwritten</reference>
 		<reference type="R1271">Vai script is the main script for this language.</reference>
 		<reference type="R1272">Latin listed as being used (Scriptsource) but no pop figures available.</reference>
-		<reference type="R1273" uri="https://www.cia.gov/library/publications/the-world-factbook/geos/mc.html">and https://en.wikipedia.org/wiki/Macau</reference>
+		<reference type="R1273" uri="https://www.dsec.gov.mo/getAttachment/7a3b17c2-22cc-4197-9bd5-ccc6eec388a2/E_CEN_PUB_2011_Y.aspx">2011 Census -- the language is not distinguished in the 2021 census</reference>
 		<reference type="R1274" uri="http://www.ethnologue.com/language/mgh">but no literacy data</reference>
 		<reference type="R1275" uri="http://www.ethnologue.com/language/pcm">Including 1st and 2nd lang speakers</reference>
 		<reference type="R1276" uri="http://www.ethnologue.com/show_language.asp?code=bin">[missing]</reference>
@@ -5757,7 +5828,7 @@ XXX Code for transations where no currency is involved
 		<reference type="R1282" uri="http://www.ethnologue.com/language/sbp">near zero literacy; pop ~80000 (2009) see David Lawrence, Tanzania and its People, page 121, Google books</reference>
 		<reference type="R1283" uri="http://www.ethnologue.com/language/ACH/">(baseline)</reference>
 		<reference type="R1284" uri="http://news.bbc.co.uk/2/hi/europe/4475099.stm">No population figure yet on use of Latin in Vatican. Estimate 100% of Vatican residents can use Latin.</reference>
-		<reference type="R1285" uri="https://en.wikipedia.org/wiki/Lozi_language">[missing]</reference>
+		<reference type="R1285" uri="http://www.zamstats.gov.zm/phocadownload/2010_Census/2010%20Census%20of%20Population%20National%20Analytical%20Report.pdf">2010 Census: Widely Spoken Language of Communication</reference>
 		<reference type="R1286">No figures available for this language.  Estimating at 5%.</reference>
 		<reference type="R1287" uri="http://en.wikipedia.org/wiki/Mapuche_language">[missing]</reference>
 		<reference type="R1288" uri="http://en.wikipedia.org/wiki/Quechua_language">[missing]</reference>
@@ -5801,9 +5872,45 @@ XXX Code for transations where no currency is involved
 		<reference type="R1326" uri="https://www.ethnologue.com/language/osa">[missing]</reference>
 		<reference type="R1327" uri="https://pt.wikipedia.org/wiki/Nheengatu">[missing]</reference>
 		<reference type="R1328">Mainly in Guangdong Prov, ~70-80 million. Script unspecified so both listed</reference>
-		<reference type="R1329" uri="https://www12.statcan.gc.ca/census-recensement/2016/dp-pd/dt-td/Rp-eng.cfm?TABID=2&amp;Lang=E&amp;APATH=3&amp;DETAIL=0&amp;DIM=0&amp;FL=A&amp;FREE=0&amp;GC=0&amp;GID=1235625&amp;GK=0&amp;GRP=1&amp;PID=110212&amp;PRID=10&amp;PTYPE=109445&amp;S=0&amp;SHOWALL=0&amp;SUB=0&amp;Temporal=2016&amp;THEME=118&amp;VID=0&amp;VNAMEE=&amp;VNAMEF=&amp;D1=0&amp;D2=0&amp;D3=0&amp;D4=0&amp;D5=0&amp;D6=0">Canada 2016 census language data; official status from Wikipedia Languages_of_Canada</reference>
 		<reference type="R1330" uri="https://en.wikipedia.org/wiki/Languages_of_the_United_Kingdom">Analyzed from 2011 UK census and other sources</reference>
-		<reference type="R1331" uri="https://en.wikipedia.org/wiki/Languages_of_Canada">In total 86.2% of Canadians have working knowledge of English while 29.8% have a working knowledge of French.</reference>
 		<reference type="R1332" uri="https://statisticsmaldives.gov.mv/statistical-release-iii-education">2014 Maldives: 98% literacy in Divehi, 75% in English</reference>
+		<reference type="R1333" uri="https://en.wikipedia.org/wiki/Taiwanese_Hakka">[missing]</reference>
+		<reference type="R1334" uri="https://en.wikipedia.org/wiki/Laz_people#cite_note-ethnologue-1">[missing]</reference>
+		<reference type="R1335" uri="https://en.wikipedia.org/wiki/Greeks_in_Russia_and_Ukraine#cite_ref-15">Greek population in Russia -- most ancestrally used Pontic Greek -- modern usage almost certainly has dropped off but we don't have clear statistics on current usage.</reference>
+		<reference type="R1336" uri="https://joshuaproject.net/people_groups/14444/TU">[missing]</reference>
+		<reference type="R1337" uri="https://www.wsj.com/articles/BL-263B-3637">Lower estimate of Coptic population, actual language literacy unknown </reference>
+		<reference type="R1338" uri="https://commonwealthchamber.com/associated-territories/south-georgia-and-the-south-sandwich-islands/">[missing]</reference>
+		<reference type="R1339" uri="https://observatoire.francophonie.org//wp-content/uploads/2022/03/odsef-lfdm-2022.pdf">Organisation internationale de la Francophonie Meta-study. Data from 2013 Census</reference>
+		<reference type="R1340" uri="https://observatoire.francophonie.org//wp-content/uploads/2022/03/odsef-lfdm-2022.pdf">Organisation internationale de la Francophonie Meta-study. Data from IVQ survey in 2009</reference>
+		<reference type="R1341" uri="https://www150.statcan.gc.ca/t1/tbl1/en/tv.action?pid=9810021601">2021 Census Knowledge of Language</reference>
+		<reference type="R1342" uri="https://observatoire.francophonie.org//wp-content/uploads/2022/03/odsef-lfdm-2022.pdf">Organisation internationale de la Francophonie Meta-study. Data from 2014 study</reference>
+		<reference type="R1343" uri="https://observatoire.francophonie.org//wp-content/uploads/2022/03/odsef-lfdm-2022.pdf">Organisation internationale de la Francophonie Meta-study. Data from 1994 study</reference>
+		<reference type="R1344" uri="https://observatoire.francophonie.org//wp-content/uploads/2022/03/odsef-lfdm-2022.pdf">Organisation internationale de la Francophonie Meta-study. Data from 2009 and 2012 studies</reference>
+		<reference type="R1345" uri="https://www.bfs.admin.ch/bfs/de/home/statistiken/bevoelkerung/sprachen-religionen/sprachen.html">Regelmässig verwendete Sprachen - Percent of people that regularly use the language</reference>
+		<reference type="R1346" uri="https://www.bfs.admin.ch/bfs/de/home/statistiken/bevoelkerung/sprachen-religionen/sprachen.html">Regelmässig verwendete Sprachen - Percent of people that regularly use the language; literacy is mostly in standard German. For languages not customarily written, the writing population is artificially set to 5% in the absence of better information.&quot;</reference>
+		<reference type="R1347" uri="https://observatoire.francophonie.org//wp-content/uploads/2022/03/odsef-lfdm-2022.pdf">Organisation internationale de la Francophonie Meta-study. Data from 2014 census</reference>
+		<reference type="R1348" uri="https://observatoire.francophonie.org//wp-content/uploads/2022/03/odsef-lfdm-2022.pdf">Organisation internationale de la Francophonie Meta-study. Data from 2010 questionnaire</reference>
+		<reference type="R1349" uri="https://observatoire.francophonie.org//wp-content/uploads/2022/03/odsef-lfdm-2022.pdf">Organisation internationale de la Francophonie Meta-study. Data from 2008 Census</reference>
+		<reference type="R1350" uri="https://observatoire.francophonie.org//wp-content/uploads/2022/03/odsef-lfdm-2022.pdf">Organisation internationale de la Francophonie Meta-study. Data from 2017 survey from Gabon authorities</reference>
+		<reference type="R1351" uri="https://observatoire.francophonie.org//wp-content/uploads/2022/03/odsef-lfdm-2022.pdf">Organisation internationale de la Francophonie Meta-study. Data from 2011 IVQ survey</reference>
+		<reference type="R1352" uri="https://observatoire.francophonie.org//wp-content/uploads/2022/03/odsef-lfdm-2022.pdf">Organisation internationale de la Francophonie Meta-study. Data from 2005 Study</reference>
+		<reference type="R1353" uri="https://observatoire.francophonie.org//wp-content/uploads/2022/03/odsef-lfdm-2022.pdf">Organisation internationale de la Francophonie Meta-study. Data from 2012 Census</reference>
+		<reference type="R1354" uri="https://observatoire.francophonie.org//wp-content/uploads/2022/03/odsef-lfdm-2022.pdf">Organisation internationale de la Francophonie Meta-study. Data from 2014 questionnaire</reference>
+		<reference type="R1355" uri="https://observatoire.francophonie.org//wp-content/uploads/2022/03/odsef-lfdm-2022.pdf">Organisation internationale de la Francophonie Meta-study. Data from 2003 census</reference>
+		<reference type="R1356" uri="https://observatoire.francophonie.org//wp-content/uploads/2022/03/odsef-lfdm-2022.pdf">Organisation internationale de la Francophonie Meta-study. Data from 2012, mixed methods</reference>
+		<reference type="R1357" uri="https://observatoire.francophonie.org//wp-content/uploads/2022/03/odsef-lfdm-2022.pdf">Organisation internationale de la Francophonie Meta-study. Data from 2014 Census</reference>
+		<reference type="R1358" uri="https://observatoire.francophonie.org//wp-content/uploads/2022/03/odsef-lfdm-2022.pdf">Organisation internationale de la Francophonie Meta-study. Data from 2017 questionnaire</reference>
+		<reference type="R1359" uri="https://observatoire.francophonie.org//wp-content/uploads/2022/03/odsef-lfdm-2022.pdf">Organisation internationale de la Francophonie Meta-study. Data from 2018 census</reference>
+		<reference type="R1360" uri="https://observatoire.francophonie.org//wp-content/uploads/2022/03/odsef-lfdm-2022.pdf">Organisation internationale de la Francophonie Meta-study. Data from 2009 census</reference>
+		<reference type="R1361" uri="https://observatoire.francophonie.org//wp-content/uploads/2022/03/odsef-lfdm-2022.pdf">Organisation internationale de la Francophonie Meta-study. Data from IVQ survey in 2014</reference>
+		<reference type="R1362" uri="https://observatoire.francophonie.org//wp-content/uploads/2022/03/odsef-lfdm-2022.pdf">Organisation internationale de la Francophonie Meta-study. Data from 2009 Census</reference>
+		<reference type="R1363" uri="https://observatoire.francophonie.org//wp-content/uploads/2022/03/odsef-lfdm-2022.pdf">Organisation internationale de la Francophonie Meta-study. Data from 2012 census</reference>
+		<reference type="R1364" uri="https://observatoire.francophonie.org//wp-content/uploads/2022/03/odsef-lfdm-2022.pdf">Organisation internationale de la Francophonie Meta-study. Data from 2017 Census</reference>
+		<reference type="R1365" uri="https://observatoire.francophonie.org//wp-content/uploads/2022/03/odsef-lfdm-2022.pdf">Organisation internationale de la Francophonie Meta-study. Data from 2018 Census</reference>
+		<reference type="R1366" uri="https://observatoire.francophonie.org//wp-content/uploads/2022/03/odsef-lfdm-2022.pdf">Organisation internationale de la Francophonie Meta-study. Data from IVQ survey in 2007</reference>
+		<reference type="R1367" uri="https://observatoire.francophonie.org//wp-content/uploads/2022/03/odsef-lfdm-2022.pdf">Organisation internationale de la Francophonie Meta-study. Data from 2013 census. Literacy is based on the language of instruction</reference>
+		<reference type="R1368" uri="https://observatoire.francophonie.org//wp-content/uploads/2022/03/odsef-lfdm-2022.pdf">Organisation internationale de la Francophonie Meta-study. Data from 2014</reference>
+		<reference type="R1369" uri="https://observatoire.francophonie.org//wp-content/uploads/2022/03/odsef-lfdm-2022.pdf">Organisation internationale de la Francophonie Meta-study. Data from 2010 census</reference>
+		<reference type="R1370" uri="https://observatoire.francophonie.org//wp-content/uploads/2022/03/odsef-lfdm-2022.pdf">Organisation internationale de la Francophonie Meta-study. Data from 2007 Census</reference>
 	</references>
 </supplementalData>
diff --git a/make/data/cldr/common/supplemental/supplementalMetadata.xml b/make/data/cldr/common/supplemental/supplementalMetadata.xml
index a4011a09aa4..d8e5052adef 100644
--- a/make/data/cldr/common/supplemental/supplementalMetadata.xml
+++ b/make/data/cldr/common/supplemental/supplementalMetadata.xml
@@ -179,7 +179,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<languageAlias type="mof" replacement="xnt" reason="deprecated"/>  <!-- Mohegan-Montauk-Narragansett -->
 			<languageAlias type="mwd" replacement="dmw" reason="deprecated"/>  <!-- Mudbura -->
 			<languageAlias type="nbf" replacement="nru" reason="deprecated"/>  <!-- Naxi -->
-			<languageAlias type="nbx" replacement="ekc" reason="deprecated"/>  <!-- Ngura -->
+			<languageAlias type="nbx" replacement="gll" reason="deprecated"/>  <!-- Ngura -->
 			<languageAlias type="nln" replacement="azd" reason="deprecated"/>  <!-- Durango Nahuatl -->
 			<languageAlias type="nlr" replacement="nrk" reason="deprecated"/>  <!-- Ngarla -->
 			<languageAlias type="noo" replacement="dtd" reason="deprecated"/>  <!-- Nootka -->
@@ -306,6 +306,9 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<languageAlias type="him" replacement="srx" reason="macrolanguage"/> <!-- Himachali ⇒ Sirmauri (= Pahari, Himachali) -->
 			<languageAlias type="mnk" replacement="man" reason="macrolanguage"/> <!-- Mandinka ⇒ Mandingo -->
 			<languageAlias type="bh" replacement="bho" reason="macrolanguage"/> <!-- Bihari ⇒ Bhojpuri -->
+			<languageAlias type="cls" replacement="sa" reason="macrolanguage"/> <!-- Classical Sanskrit ⇒ Sanskrit -->
+			<!-- Special case <languageAlias type="nb" replacement="no" reason="macrolanguage"/> <! - - Norwegian Bokmål ⇒ Norwegian -->
+			<!-- Special case <languageAlias type="sr" replacement="sh" reason="macrolanguage"/> <! - - Serbian ⇒ Serbo-Croatian -->
 
 			<languageAlias type="prs" replacement="fa_AF" reason="overlong"/> <!-- Dari ⇒ Farsi (Afganistan) -->
 			<languageAlias type="swc" replacement="sw_CD" reason="overlong"/> <!-- Congo Swahili ⇒ Swahili (Congo - Kinshasa) -->
@@ -1880,14 +1883,14 @@ For terms of use, see http://www.unicode.org/copyright.html
 			bgc_IN bgn_PK bho_IN blo_BJ blt_VN bm_ML bm_Nkoo_ML bn_BD bo_CN br_FR brx_IN
 			bs_Cyrl_BA bs_Latn bs_Latn_BA bss_CM byn_ER
 			ca_ES cad_US cch_NG ccp_BD ce_RU ceb_PH cgg_UG cho_US chr_US cic_US ckb_IQ
-			co_FR cs_CZ csw_CA cu_RU cv_RU cy_GB
+			co_FR cop_EG cs_CZ csw_CA cu_RU cv_RU cy_GB
 			da_DK dav_KE de_DE dje_NE doi_IN dsb_DE dua_CM dv_MV dyo_SN dz_BT
 			ebu_KE ee_GH el_GR en_Dsrt_US en_Shaw_GB en_US eo_001 es_ES et_EE eu_ES ewo_CM
 			fa_IR ff_Adlm_GN ff_Latn ff_Latn_SN fi_FI fil_PH fo_FO fr_FR frr_DE fur_IT
 			fy_NL
 			ga_IE gaa_GH gd_GB gez_ET gl_ES gn_PY gsw_CH gu_IN guz_KE gv_IM
 			ha_Arab_NG ha_NG haw_US he_IL hi_IN hi_Latn_IN hnj_Hmnp hnj_Hmnp_US hr_HR
-			hsb_DE hu_HU hy_AM
+			hsb_DE ht_HT hu_HU hy_AM
 			ia_001 id_ID ie_EE ife_TG ig_NG ii_CN io_001 is_IS it_IT iu_CA iu_Latn_CA
 			ja_JP jbo_001 jgo_CM jmc_TZ jv_ID
 			ka_GE kaa_Cyrl kaa_Cyrl_UZ kaa_Latn_UZ kab_DZ kaj_NG kam_KE kcg_NG kde_TZ kea_CV ken_CM kgp_BR
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 6e130872bd4..cf629a7d57c 100644
--- a/src/java.base/share/classes/java/util/spi/LocaleServiceProvider.java
+++ b/src/java.base/share/classes/java/util/spi/LocaleServiceProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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,6 +181,8 @@ import java.util.Locale;
  *     <th scope="col">CLDR version</th></tr>
  * </thead>
  * <tbody>
+ * <tr><th scope="row" style="text-align:left">JDK 25</th>
+ *     <td>CLDR 47</td></tr>
  * <tr><th scope="row" style="text-align:left">JDK 24</th>
  *     <td>CLDR 46</td></tr>
  * <tr><th scope="row" style="text-align:left">JDK 23</th>
diff --git a/src/java.base/share/legal/cldr.md b/src/java.base/share/legal/cldr.md
index 81a4038107d..f020d8f51ae 100644
--- a/src/java.base/share/legal/cldr.md
+++ b/src/java.base/share/legal/cldr.md
@@ -1,4 +1,4 @@
-## Unicode Common Local Data Repository (CLDR) v46
+## Unicode Common Local Data Repository (CLDR) v47
 
 ### CLDR License
 
@@ -9,7 +9,7 @@ UNICODE LICENSE V3
 
 COPYRIGHT AND PERMISSION NOTICE
 
-Copyright © 1991-2024 Unicode, Inc.
+Copyright © 1991-2025 Unicode, Inc.
 
 NOTICE TO USER: Carefully read the following legal agreement. BY
 DOWNLOADING, INSTALLING, COPYING OR OTHERWISE USING DATA FILES, AND/OR
@@ -53,7 +53,7 @@ Unicode® Copyright and Terms of Use
 For the general privacy policy governing access to this site, see the  Unicode Privacy Policy.
 
 Unicode Copyright
-Copyright © 1991-2024 Unicode, Inc. All rights reserved.
+Copyright © 1991-2025 Unicode, Inc. All rights reserved.
 Definitions
 Unicode Data Files ("DATA FILES") include all data files under the directories:
 https://www.unicode.org/Public/
diff --git a/src/jdk.localedata/share/legal/cldr.md b/src/jdk.localedata/share/legal/cldr.md
index 81a4038107d..f020d8f51ae 100644
--- a/src/jdk.localedata/share/legal/cldr.md
+++ b/src/jdk.localedata/share/legal/cldr.md
@@ -1,4 +1,4 @@
-## Unicode Common Local Data Repository (CLDR) v46
+## Unicode Common Local Data Repository (CLDR) v47
 
 ### CLDR License
 
@@ -9,7 +9,7 @@ UNICODE LICENSE V3
 
 COPYRIGHT AND PERMISSION NOTICE
 
-Copyright © 1991-2024 Unicode, Inc.
+Copyright © 1991-2025 Unicode, Inc.
 
 NOTICE TO USER: Carefully read the following legal agreement. BY
 DOWNLOADING, INSTALLING, COPYING OR OTHERWISE USING DATA FILES, AND/OR
@@ -53,7 +53,7 @@ Unicode® Copyright and Terms of Use
 For the general privacy policy governing access to this site, see the  Unicode Privacy Policy.
 
 Unicode Copyright
-Copyright © 1991-2024 Unicode, Inc. All rights reserved.
+Copyright © 1991-2025 Unicode, Inc. All rights reserved.
 Definitions
 Unicode Data Files ("DATA FILES") include all data files under the directories:
 https://www.unicode.org/Public/
diff --git a/test/jdk/java/time/test/java/time/format/TestDateTimeFormatterBuilder.java b/test/jdk/java/time/test/java/time/format/TestDateTimeFormatterBuilder.java
index 75fed1524d2..6d62dfe1265 100644
--- a/test/jdk/java/time/test/java/time/format/TestDateTimeFormatterBuilder.java
+++ b/test/jdk/java/time/test/java/time/format/TestDateTimeFormatterBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -554,7 +554,7 @@ public class TestDateTimeFormatterBuilder {
     Object[][] data_dayPeriodFormat() {
         return new Object[][] {
             {0, 0, TextStyle.FULL, Locale.US, "midnight"},
-            {0, 1, TextStyle.FULL, Locale.US, "at night"},
+            {0, 1, TextStyle.FULL, Locale.US, "in the morning"},
             {6, 0, TextStyle.FULL, Locale.US, "in the morning"},
             {12, 0, TextStyle.FULL, Locale.US, "noon"},
             {12, 1, TextStyle.FULL, Locale.US, "in the afternoon"},
@@ -571,7 +571,7 @@ public class TestDateTimeFormatterBuilder {
             {23, 0, TextStyle.FULL, Locale.JAPAN, "\u591c\u4e2d"},
 
             {0, 0, TextStyle.NARROW, Locale.US, "mi"},
-            {0, 1, TextStyle.NARROW, Locale.US, "at night"},
+            {0, 1, TextStyle.NARROW, Locale.US, "in the morning"},
             {6, 0, TextStyle.NARROW, Locale.US, "in the morning"},
             {12, 0, TextStyle.NARROW, Locale.US, "n"},
             {12, 1, TextStyle.NARROW, Locale.US, "in the afternoon"},
@@ -600,13 +600,13 @@ public class TestDateTimeFormatterBuilder {
     Object[][] data_dayPeriodParse() {
         return new Object[][] {
                 {TextStyle.FULL, Locale.US, 0, 0, "midnight"},
-                {TextStyle.FULL, Locale.US, 1, 30, "at night"},
                 {TextStyle.FULL, Locale.US, 6, 0, "AM"},
-                {TextStyle.FULL, Locale.US, 9, 0, "in the morning"},
+                {TextStyle.FULL, Locale.US, 6, 0, "in the morning"},
                 {TextStyle.FULL, Locale.US, 12, 0, "noon"},
                 {TextStyle.FULL, Locale.US, 15, 0, "in the afternoon"},
                 {TextStyle.FULL, Locale.US, 18, 0, "PM"},
                 {TextStyle.FULL, Locale.US, 19, 30, "in the evening"},
+                {TextStyle.FULL, Locale.US, 22, 30, "at night"},
 
                 {TextStyle.FULL, Locale.JAPAN, 0, 0, "\u771f\u591c\u4e2d"},
                 {TextStyle.FULL, Locale.JAPAN, 1, 30, "\u591c\u4e2d"},
@@ -619,13 +619,13 @@ public class TestDateTimeFormatterBuilder {
                 {TextStyle.FULL, Locale.JAPAN, 21, 0, "\u591c"},
 
                 {TextStyle.NARROW, Locale.US, 0, 0, "mi"},
-                {TextStyle.NARROW, Locale.US, 1, 30, "at night"},
                 {TextStyle.NARROW, Locale.US, 6, 0, "a"},
-                {TextStyle.NARROW, Locale.US, 9, 0, "in the morning"},
+                {TextStyle.NARROW, Locale.US, 6, 0, "in the morning"},
                 {TextStyle.NARROW, Locale.US, 12, 0, "n"},
                 {TextStyle.NARROW, Locale.US, 15, 0, "in the afternoon"},
                 {TextStyle.NARROW, Locale.US, 18, 0, "p"},
                 {TextStyle.NARROW, Locale.US, 19, 30, "in the evening"},
+                {TextStyle.NARROW, Locale.US, 22, 30, "at night"},
 
                 {TextStyle.NARROW, Locale.JAPAN, 0, 0, "\u771f\u591c\u4e2d"},
                 {TextStyle.NARROW, Locale.JAPAN, 1, 30, "\u591c\u4e2d"},
@@ -651,12 +651,12 @@ public class TestDateTimeFormatterBuilder {
     Object[][] data_dayPeriodParsePattern() {
         return new Object[][] {
             {"H B", "23 at night", 23},
-            {"H B", "3 at night", 3},
+            {"H B", "3 in the morning", 3},
             {"K B", "11 at night", 23},
-            {"K B", "3 at night", 3},
+            {"K B", "3 in the morning", 3},
             {"K B", "11 in the morning", 11},
             {"h B", "11 at night", 23},
-            {"h B", "3 at night", 3},
+            {"h B", "3 in the morning", 3},
             {"h B", "11 in the morning", 11},
             {"a", "AM", 6},
             {"a", "PM", 18},
@@ -692,14 +692,14 @@ public class TestDateTimeFormatterBuilder {
     Object[][] data_dayPeriodParseInvalid() {
         return new Object[][] {
                 {TextStyle.FULL, ResolverStyle.SMART, Locale.US, "00:01 midnight", "00:00"},
-                {TextStyle.FULL, ResolverStyle.SMART, Locale.US, "06:01 at night", "21:00-06:00"},
-                {TextStyle.FULL, ResolverStyle.SMART, Locale.US, "05:59 in the morning", "06:00-12:00"},
+                {TextStyle.FULL, ResolverStyle.SMART, Locale.US, "00:01 at night", "21:00-24:00"},
+                {TextStyle.FULL, ResolverStyle.SMART, Locale.US, "12:01 in the morning", "00:00-12:00"},
                 {TextStyle.FULL, ResolverStyle.SMART, Locale.US, "11:59 noon", "12:00"},
                 {TextStyle.FULL, ResolverStyle.SMART, Locale.US, "18:00 in the afternoon", "12:00-18:00"},
                 {TextStyle.FULL, ResolverStyle.SMART, Locale.US, "17:59 in the evening", "18:00-21:00"},
                 {TextStyle.NARROW, ResolverStyle.SMART, Locale.US, "00:01 mi", "00:00"},
-                {TextStyle.NARROW, ResolverStyle.SMART, Locale.US, "06:01 at night", "21:00-06:00"},
-                {TextStyle.NARROW, ResolverStyle.SMART, Locale.US, "05:59 in the morning", "06:00-12:00"},
+                {TextStyle.NARROW, ResolverStyle.SMART, Locale.US, "00:01 at night", "21:00-24:00"},
+                {TextStyle.NARROW, ResolverStyle.SMART, Locale.US, "12:01 in the morning", "00:00-12:00"},
                 {TextStyle.NARROW, ResolverStyle.SMART, Locale.US, "11:59 n", "12:00"},
                 {TextStyle.NARROW, ResolverStyle.SMART, Locale.US, "18:00 in the afternoon", "12:00-18:00"},
                 {TextStyle.NARROW, ResolverStyle.SMART, Locale.US, "17:59 in the evening", "18:00-21:00"},
@@ -720,14 +720,14 @@ public class TestDateTimeFormatterBuilder {
                 {TextStyle.NARROW, ResolverStyle.SMART, Locale.JAPAN, "23:00 \u591c", "19:00-23:00"},
 
                 {TextStyle.FULL, ResolverStyle.LENIENT, Locale.US, "00:01 midnight", "00:00"},
-                {TextStyle.FULL, ResolverStyle.LENIENT, Locale.US, "06:01 at night", "21:00-06:00"},
-                {TextStyle.FULL, ResolverStyle.LENIENT, Locale.US, "05:59 in the morning", "06:00-12:00"},
+                {TextStyle.FULL, ResolverStyle.LENIENT, Locale.US, "00:01 at night", "21:00-24:00"},
+                {TextStyle.FULL, ResolverStyle.LENIENT, Locale.US, "12:01 in the morning", "00:00-12:00"},
                 {TextStyle.FULL, ResolverStyle.LENIENT, Locale.US, "11:59 noon", "12:00"},
                 {TextStyle.FULL, ResolverStyle.LENIENT, Locale.US, "18:00 in the afternoon", "12:00-18:00"},
                 {TextStyle.FULL, ResolverStyle.LENIENT, Locale.US, "17:59 in the evening", "18:00-21:00"},
                 {TextStyle.NARROW, ResolverStyle.LENIENT, Locale.US, "00:01 mi", "00:00"},
-                {TextStyle.NARROW, ResolverStyle.LENIENT, Locale.US, "06:01 at night", "21:00-06:00"},
-                {TextStyle.NARROW, ResolverStyle.LENIENT, Locale.US, "05:59 in the morning", "06:00-12:00"},
+                {TextStyle.NARROW, ResolverStyle.LENIENT, Locale.US, "00:01 at night", "21:00-24:00"},
+                {TextStyle.NARROW, ResolverStyle.LENIENT, Locale.US, "12:01 in the morning", "00:00-12:00"},
                 {TextStyle.NARROW, ResolverStyle.LENIENT, Locale.US, "11:59 n", "12:00"},
                 {TextStyle.NARROW, ResolverStyle.LENIENT, Locale.US, "18:00 in the afternoon", "12:00-18:00"},
                 {TextStyle.NARROW, ResolverStyle.LENIENT, Locale.US, "17:59 in the evening", "18:00-21:00"},
diff --git a/test/jdk/java/time/test/java/time/format/TestUnicodeExtension.java b/test/jdk/java/time/test/java/time/format/TestUnicodeExtension.java
index d7b414dc761..550dc5b31c2 100644
--- a/test/jdk/java/time/test/java/time/format/TestUnicodeExtension.java
+++ b/test/jdk/java/time/test/java/time/format/TestUnicodeExtension.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,6 +24,7 @@
 /*
  * @test
  * @bug 8176841 8202537 8244245 8265315 8284840 8296248 8306116 8333582
+ *      8346948
  * @summary Tests java.time classes deals with Unicode extensions
  *      correctly.
  * @modules jdk.localedata
@@ -345,7 +346,7 @@ public class TestUnicodeExtension {
     Object[][] shortTZID() {
         return new Object[][] {
             // LDML's short ID, Expected Zone,
-            // Based on timezone.xml from CLDR v46
+            // Based on timezone.xml from CLDR v47
             {"adalv", "Europe/Andorra"},
             {"aedxb", "Asia/Dubai"},
             {"afkbl", "Asia/Kabul"},
diff --git a/test/jdk/java/time/test/java/time/format/TestZoneTextPrinterParser.java b/test/jdk/java/time/test/java/time/format/TestZoneTextPrinterParser.java
index 224c0c05771..20861f151e0 100644
--- a/test/jdk/java/time/test/java/time/format/TestZoneTextPrinterParser.java
+++ b/test/jdk/java/time/test/java/time/format/TestZoneTextPrinterParser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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 @@ import org.testng.annotations.Test;
 
 /*
  * @test
- * @bug 8081022 8151876 8166875 8177819 8189784 8206980 8277049 8278434
+ * @bug 8081022 8151876 8166875 8177819 8189784 8206980 8277049 8278434 8346948
  *      8174269
  * @key randomness
  */
@@ -162,7 +162,7 @@ public class TestZoneTextPrinterParser extends AbstractTestPrinterParser {
 //          {"CET",              "Central European Time", preferred, Locale.ENGLISH, TextStyle.FULL}, no three-letter ID in CLDR
             {"Asia/Shanghai",    "China Standard Time",   none,      Locale.ENGLISH, TextStyle.FULL},
             {"Asia/Macau",       "China Standard Time",   preferred, Locale.ENGLISH, TextStyle.FULL},
-            {"Asia/Taipei",      "Taipei Standard Time",  preferred, Locale.ENGLISH, TextStyle.FULL},
+            {"Asia/Taipei",      "Taiwan Standard Time",  preferred, Locale.ENGLISH, TextStyle.FULL},
             {"America/Chicago",  "CST",                   none,      Locale.ENGLISH, TextStyle.SHORT},
             {"Asia/Taipei",      "CST",                   preferred, Locale.ENGLISH, TextStyle.SHORT},
             {"Australia/South",  "ACST",                  preferred_s, Locale.ENGLISH, TextStyle.SHORT},
diff --git a/test/jdk/sun/util/resources/cldr/Bug8145136.java b/test/jdk/sun/util/resources/cldr/Bug8145136.java
deleted file mode 100644
index 8b5ec11cc4c..00000000000
--- a/test/jdk/sun/util/resources/cldr/Bug8145136.java
+++ /dev/null
@@ -1,130 +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 8145136 8202537 8221432 8251317 8258794 8265315 8306116
- * @modules jdk.localedata
- * @summary Tests LikelySubtags is correctly reflected in JDK.
- * @run main/othervm -Djava.locale.providers=CLDR Bug8145136
- */
-import java.util.Arrays;
-import java.util.List;
-import java.util.Locale;
-import java.util.stream.Collectors;
-
-public class Bug8145136 {
-
-    public static void main(String[] args) {
-        /* This golden data is names of all *.xml files which contain locale
-         * specific data in CLDR 44. With LikelySubtags,
-         * these locales should be present in output of getAvailableLocales()
-         * method.
-         */
-        List<String> likelySubtagsLocales = List.of(
-            "", "af", "af-NA", "af-ZA", "agq", "agq-CM", "ak", "ak-GH", "am", "am-ET", "ar", "ar-001", "ar-AE",
-            "ar-BH", "ar-DJ", "ar-DZ", "ar-EG", "ar-EH", "ar-ER", "ar-IL", "ar-IQ", "ar-JO", "ar-KM", "ar-KW",
-            "ar-LB", "ar-LY", "ar-MA", "ar-MR", "ar-OM", "ar-PS", "ar-QA", "ar-SA", "ar-SD", "ar-SO", "ar-SS",
-            "ar-SY", "ar-TD", "ar-TN", "ar-YE", "as", "as-IN", "asa", "asa-TZ", "ast", "ast-ES", "az", "az-Cyrl",
-            "az-Cyrl-AZ", "az-Latn", "az-Latn-AZ", "bas", "bas-CM", "be", "be-BY", "be-TARASK", "bem", "bem-ZM",
-            "bez", "bez-TZ", "bg", "bg-BG", "bm", "bm-ML", "bn", "bn-BD", "bn-IN", "bo", "bo-CN", "bo-IN", "br",
-            "br-FR", "brx", "brx-IN", "bs", "bs-Cyrl", "bs-Cyrl-BA", "bs-Latn", "bs-Latn-BA", "ca", "ca-AD",
-            "ca-ES", "ca-ES-VALENCIA", "ca-FR", "ca-IT", "ccp", "ccp-BD", "ccp-IN", "ce", "ce-RU", "ceb", "ceb-PH",
-            "cgg", "cgg-UG", "chr", "chr-US", "ckb", "ckb-IQ", "ckb-IR", "cs", "cs-CZ", "cy", "cy-GB", "da",
-            "da-DK", "da-GL", "dav", "dav-KE", "de", "de-AT", "de-BE", "de-CH", "de-DE", "de-IT", "de-LI", "de-LU",
-            "dje", "dje-NE", "doi", "doi-IN", "dsb", "dsb-DE", "dua", "dua-CM", "dyo", "dyo-SN", "dz", "dz-BT",
-            "ebu", "ebu-KE", "ee", "ee-GH", "ee-TG", "el", "el-CY", "el-GR", "en", "en-001", "en-150", "en-AE",
-            "en-AG", "en-AI", "en-AS", "en-AT", "en-AU", "en-BB", "en-BE", "en-BI", "en-BM", "en-BS", "en-BW",
-            "en-BZ", "en-CA", "en-CC", "en-CH", "en-CK", "en-CM", "en-CX", "en-CY", "en-DE", "en-DG", "en-DK",
-            "en-DM", "en-ER", "en-FI", "en-FJ", "en-FK", "en-FM", "en-GB", "en-GD", "en-GG", "en-GH", "en-GI",
-            "en-GM", "en-GU", "en-GY", "en-HK", "en-IE", "en-IL", "en-IM", "en-IN", "en-IO", "en-JE", "en-JM",
-            "en-KE", "en-KI", "en-KN", "en-KY", "en-LC", "en-LR", "en-LS", "en-MG", "en-MH", "en-MO", "en-MP",
-            "en-MS", "en-MT", "en-MU", "en-MV", "en-MW", "en-MY", "en-NA", "en-NF", "en-NG", "en-NL", "en-NR",
-            "en-NU", "en-NZ", "en-PG", "en-PH", "en-PK", "en-PN", "en-PR", "en-PW", "en-RW", "en-SB", "en-SC",
-            "en-SD", "en-SE", "en-SG", "en-SH", "en-SI", "en-SL", "en-SS", "en-SX", "en-SZ", "en-TC", "en-TK",
-            "en-TO", "en-TT", "en-TV", "en-TZ", "en-UG", "en-UM", "en-US", "en-US-POSIX", "en-VC", "en-VG", "en-VI",
-            "en-VU", "en-WS", "en-ZA", "en-ZM", "en-ZW", "eo", "eo-001", "es", "es-419", "es-AR", "es-BO", "es-BR",
-            "es-BZ", "es-CL", "es-CO", "es-CR", "es-CU", "es-DO", "es-EA", "es-EC", "es-ES", "es-GQ", "es-GT",
-            "es-HN", "es-IC", "es-MX", "es-NI", "es-PA", "es-PE", "es-PH", "es-PR", "es-PY", "es-SV", "es-US",
-            "es-UY", "es-VE", "et", "et-EE", "eu", "eu-ES", "ewo", "ewo-CM", "fa", "fa-AF", "fa-IR", "ff",
-            "ff-Adlm", "ff-Adlm-BF", "ff-Adlm-CM", "ff-Adlm-GH", "ff-Adlm-GM", "ff-Adlm-GN", "ff-Adlm-GW",
-            "ff-Adlm-LR", "ff-Adlm-MR", "ff-Adlm-NE", "ff-Adlm-NG", "ff-Adlm-SL", "ff-Adlm-SN", "ff-Latn",
-            "ff-Latn-BF", "ff-Latn-CM", "ff-Latn-GH", "ff-Latn-GM", "ff-Latn-GN", "ff-Latn-GW", "ff-Latn-LR",
-            "ff-Latn-MR", "ff-Latn-NE", "ff-Latn-NG", "ff-Latn-SL", "ff-Latn-SN", "fi", "fi-FI", "fil", "fil-PH",
-            "fo", "fo-DK", "fo-FO", "fr", "fr-BE", "fr-BF", "fr-BI", "fr-BJ", "fr-BL", "fr-CA", "fr-CD", "fr-CF",
-            "fr-CG", "fr-CH", "fr-CI", "fr-CM", "fr-DJ", "fr-DZ", "fr-FR", "fr-GA", "fr-GF", "fr-GN", "fr-GP",
-            "fr-GQ", "fr-HT", "fr-KM", "fr-LU", "fr-MA", "fr-MC", "fr-MF", "fr-MG", "fr-ML", "fr-MQ", "fr-MR",
-            "fr-MU", "fr-NC", "fr-NE", "fr-PF", "fr-PM", "fr-RE", "fr-RW", "fr-SC", "fr-SN", "fr-SY", "fr-TD",
-            "fr-TG", "fr-TN", "fr-VU", "fr-WF", "fr-YT", "fur", "fur-IT", "fy", "fy-NL", "ga", "ga-GB", "ga-IE",
-            "gd", "gd-GB", "gl", "gl-ES", "gsw", "gsw-CH", "gsw-FR", "gsw-LI", "gu", "gu-IN", "guz", "guz-KE",
-            "gv", "gv-IM", "ha", "ha-GH", "ha-NE", "ha-NG", "haw", "haw-US", "he", "he-IL", "hi", "hi-IN",
-            "hi-Latn", "hi-Latn-IN", "hr", "hr-BA", "hr-HR", "hsb", "hsb-DE", "hu", "hu-HU", "hy", "hy-AM", "ia",
-            "ia-001", "id", "id-ID", "ig", "ig-NG", "ii", "ii-CN", "is", "is-IS", "it", "it-CH", "it-IT", "it-SM",
-            "it-VA", "ja", "ja-JP", "jgo", "jgo-CM", "jmc", "jmc-TZ", "jv", "jv-ID", "ka", "ka-GE", "kab", "kab-DZ",
-            "kam", "kam-KE", "kde", "kde-TZ", "kea", "kea-CV", "kgp", "kgp-BR", "khq", "khq-ML", "ki", "ki-KE",
-            "kk", "kk-KZ", "kkj", "kkj-CM", "kl", "kl-GL", "kln", "kln-KE", "km", "km-KH", "kn", "kn-IN", "ko",
-            "ko-KP", "ko-KR", "kok", "kok-IN", "ks", "ks-Arab", "ks-Arab-IN", "ks-Deva", "ks-Deva-IN", "ksb",
-            "ksb-TZ", "ksf", "ksf-CM", "ksh", "ksh-DE", "ku", "ku-TR", "kw", "kw-GB", "ky", "ky-KG", "lag",
-            "lag-TZ", "lb", "lb-LU", "lg", "lg-UG", "lkt", "lkt-US", "ln", "ln-AO", "ln-CD", "ln-CF", "ln-CG", "lo",
-            "lo-LA", "lrc", "lrc-IQ", "lrc-IR", "lt", "lt-LT", "lu", "lu-CD", "luo", "luo-KE", "luy", "luy-KE",
-            "lv", "lv-LV", "mai", "mai-IN", "mas", "mas-KE", "mas-TZ", "mer", "mer-KE", "mfe", "mfe-MU", "mg",
-            "mg-MG", "mgh", "mgh-MZ", "mgo", "mgo-CM", "mi", "mi-NZ", "mk", "mk-MK", "ml", "ml-IN", "mn", "mn-MN",
-            "mni", "mni-Beng", "mni-Beng-IN", "mr", "mr-IN", "ms", "ms-BN", "ms-ID", "ms-MY", "ms-SG", "mt",
-            "mt-MT", "mua", "mua-CM", "my", "my-MM", "mzn", "mzn-IR", "naq", "naq-NA", "nb", "nb-NO", "nb-SJ", "nd",
-            "nd-ZW", "nds", "nds-DE", "nds-NL", "ne", "ne-IN", "ne-NP", "nl", "nl-AW", "nl-BE", "nl-BQ", "nl-CW",
-            "nl-NL", "nl-SR", "nl-SX", "nmg", "nmg-CM", "nn", "nn-NO", "nnh", "nnh-CM", "no", "nus", "nus-SS",
-            "nyn", "nyn-UG", "om", "om-ET", "om-KE", "or", "or-IN", "os", "os-GE", "os-RU", "pa", "pa-Arab",
-            "pa-Arab-PK", "pa-Guru", "pa-Guru-IN", "pcm", "pcm-NG", "pl", "pl-PL", "ps", "ps-AF", "ps-PK", "pt",
-            "pt-AO", "pt-BR", "pt-CH", "pt-CV", "pt-GQ", "pt-GW", "pt-LU", "pt-MO", "pt-MZ", "pt-PT", "pt-ST",
-            "pt-TL", "qu", "qu-BO", "qu-EC", "qu-PE", "rm", "rm-CH", "rn", "rn-BI", "ro", "ro-MD", "ro-RO", "rof",
-            "rof-TZ", "ru", "ru-BY", "ru-KG", "ru-KZ", "ru-MD", "ru-RU", "ru-UA", "rw", "rw-RW", "rwk", "rwk-TZ",
-            "sa", "sa-IN", "sah", "sah-RU", "saq", "saq-KE", "sat", "sat-Olck", "sat-Olck-IN", "sbp", "sbp-TZ",
-            "sc", "sc-IT", "sd", "sd-Arab", "sd-Arab-PK", "sd-Deva", "sd-Deva-IN", "se", "se-FI", "se-NO", "se-SE",
-            "seh", "seh-MZ", "ses", "ses-ML", "sg", "sg-CF", "shi", "shi-Latn", "shi-Latn-MA", "shi-Tfng",
-            "shi-Tfng-MA", "si", "si-LK", "sk", "sk-SK", "sl", "sl-SI", "smn", "smn-FI", "sn", "sn-ZW", "so",
-            "so-DJ", "so-ET", "so-KE", "so-SO", "sq", "sq-AL", "sq-MK", "sq-XK", "sr", "sr-Cyrl", "sr-Cyrl-BA",
-            "sr-Cyrl-ME", "sr-Cyrl-RS", "sr-Cyrl-XK", "sr-Latn", "sr-Latn-BA", "sr-Latn-ME", "sr-Latn-RS",
-            "sr-Latn-XK", "su", "su-Latn", "su-Latn-ID", "sv", "sv-AX", "sv-FI", "sv-SE", "sw", "sw-CD", "sw-KE",
-            "sw-TZ", "sw-UG", "ta", "ta-IN", "ta-LK", "ta-MY", "ta-SG", "te", "te-IN", "teo", "teo-KE", "teo-UG",
-            "tg", "tg-TJ", "th", "th-TH", "ti", "ti-ER", "ti-ET", "tk", "tk-TM", "to", "to-TO", "tr", "tr-CY",
-            "tr-TR", "tt", "tt-RU", "twq", "twq-NE", "tzm", "tzm-MA", "ug", "ug-CN", "uk", "uk-UA", "ur", "ur-IN",
-            "ur-PK", "uz", "uz-Arab", "uz-Arab-AF", "uz-Cyrl", "uz-Cyrl-UZ", "uz-Latn", "uz-Latn-UZ", "vai",
-            "vai-Latn", "vai-Latn-LR", "vai-Vaii", "vai-Vaii-LR", "vi", "vi-VN", "vun", "vun-TZ", "wae", "wae-CH",
-            "wo", "wo-SN", "xh", "xh-ZA", "xog", "xog-UG", "yav", "yav-CM", "yi", "yi-UA", "yo", "yo-BJ", "yo-NG",
-            "yrl", "yrl-BR", "yrl-CO", "yrl-VE", "yue", "yue-Hans", "yue-Hans-CN", "yue-Hant", "yue-Hant-HK", "zgh",
-            "zgh-MA", "zh", "zh-Hans", "zh-Hans-CN", "zh-Hans-HK", "zh-Hans-MO", "zh-Hans-SG", "zh-Hant",
-            "zh-Hant-HK", "zh-Hant-MO", "zh-Hant-TW", "zu", "zu-ZA");
-
-        List<Locale> availableLocales = Arrays.asList(Locale.getAvailableLocales());
-
-        List<Locale> localesNotFound = likelySubtagsLocales.stream()
-                .map(Locale::forLanguageTag)
-                .filter(l -> !availableLocales.contains(l))
-                .collect(Collectors.toList());
-
-        if (localesNotFound.size() > 0) {
-            throw new RuntimeException("Locales " + localesNotFound
-                    + " not found in Available Locales list");
-        }
-    }
-}
diff --git a/test/jdk/sun/util/resources/cldr/LikelySubtagLocalesTest.java b/test/jdk/sun/util/resources/cldr/LikelySubtagLocalesTest.java
new file mode 100644
index 00000000000..0e66db5c5da
--- /dev/null
+++ b/test/jdk/sun/util/resources/cldr/LikelySubtagLocalesTest.java
@@ -0,0 +1,69 @@
+/*
+ * Copyright (c) 2016, 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact 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 8145136 8202537 8221432 8251317 8258794 8265315 8306116 8346948
+ * @modules jdk.localedata
+ * @summary Tests LikelySubtags is correctly reflected in Locale.getAvailableLocales().
+ * @run junit/othervm -Djava.locale.providers=CLDR LikelySubtagLocalesTest
+ */
+import java.util.Arrays;
+import java.util.List;
+import java.util.Locale;
+import java.util.stream.Stream;
+
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+public class LikelySubtagLocalesTest {
+
+    public static final List<Locale> AVAILABLE_LOCALES = Arrays.asList(Locale.getAvailableLocales());
+
+    /* Samples of locales that do not exist as .xml CLDR source files, but derived from
+     * LikelySubtags. These locales should be present in output of getAvailableLocales()
+     * method.
+     */
+    private static Stream<String> likelySubtagLocales() {
+        return Stream.of(
+            "ar-Arab-EG",
+            "de-Latn-DE",
+            "en-Latn-US",
+            "es-Latn-ES",
+            "fr-Latn-FR",
+            "he-Hebr-IL",
+            "hi-Deva-IN",
+            "ja-Jpan-JP",
+            "ko-Kore-KR");
+    }
+
+    @ParameterizedTest
+    @MethodSource("likelySubtagLocales")
+    public void testLikelySubtagLocales(String likelySubtag) {
+        var l = Locale.forLanguageTag(likelySubtag);
+        assertTrue(likelySubtag.equals(l.toLanguageTag()), likelySubtag + " != " + l.toLanguageTag());
+        assertTrue(AVAILABLE_LOCALES.contains(l), l.getDisplayName() +
+            " not found in Available Locales list");
+    }
+}
diff --git a/test/jdk/sun/util/resources/cldr/TimeZoneNamesTest.java b/test/jdk/sun/util/resources/cldr/TimeZoneNamesTest.java
index 3e2c1208bc9..4fe1a7d25a9 100644
--- a/test/jdk/sun/util/resources/cldr/TimeZoneNamesTest.java
+++ b/test/jdk/sun/util/resources/cldr/TimeZoneNamesTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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 8181157 8202537 8234347 8236548 8261279 8322647 8174269
+ * @bug 8181157 8202537 8234347 8236548 8261279 8322647 8174269 8346948
  * @modules jdk.localedata
  * @summary Checks CLDR time zone names are generated correctly at
  * either build or runtime
@@ -51,7 +51,7 @@ public class TimeZoneNamesTest {
         return new Object[][] {
             // tzid, locale, style, expected
 
-            // This list is as of CLDR version 44, and should be examined
+            // This list is as of CLDR version 47, and should be examined
             // on the CLDR data upgrade.
 
             // no "metazone" zones
@@ -193,7 +193,7 @@ public class TimeZoneNamesTest {
                         "AWST",
                         "Australian Western Daylight Time",
                         "AWDT",
-                        "Western Australia Time",
+                        "Australian Western Time",
                         "AWT"},
             {"Africa/Harare",    Locale.US, "Central Africa Time",
                         "CAT",
diff --git a/test/jdk/tools/jlink/plugins/IncludeLocalesPluginTest.java b/test/jdk/tools/jlink/plugins/IncludeLocalesPluginTest.java
index f30adee80a3..008b4a175a9 100644
--- a/test/jdk/tools/jlink/plugins/IncludeLocalesPluginTest.java
+++ b/test/jdk/tools/jlink/plugins/IncludeLocalesPluginTest.java
@@ -53,7 +53,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
  * @test
  * @bug 8152143 8152704 8155649 8165804 8185841 8176841 8190918
  *      8179071 8202537 8221432 8222098 8251317 8258794 8265315
- *      8296248 8306116 8174269 8347146
+ *      8296248 8306116 8174269 8347146 8346948
  * @summary IncludeLocalesPlugin tests
  * @author Naoto Sato
  * @requires (vm.compMode != "Xcomp" & os.maxMemory >= 2g)
@@ -138,15 +138,15 @@ public class IncludeLocalesPluginTest {
                 List.of(
                         "(root)", "en", "en_001", "en_150", "en_AG", "en_AI",
                         "en_AT", "en_AU", "en_BB", "en_BE", "en_BM", "en_BS", "en_BW", "en_BZ",
-                        "en_CC", "en_CH", "en_CK", "en_CM", "en_CX", "en_CY", "en_DE",
-                        "en_DG", "en_DK", "en_DM", "en_ER", "en_FI", "en_FJ", "en_FK", "en_FM",
-                        "en_GB", "en_GD", "en_GG", "en_GH", "en_GI", "en_GM", "en_GY", "en_HK", "en_ID",
-                        "en_IE", "en_IL", "en_IM", "en_IN", "en_IO", "en_JE", "en_JM", "en_KE",
+                        "en_CC", "en_CH", "en_CK", "en_CM", "en_CX", "en_CY", "en_CZ", "en_DE",
+                        "en_DG", "en_DK", "en_DM", "en_ER", "en_ES", "en_FI", "en_FJ", "en_FK", "en_FM", "en_FR",
+                        "en_GB", "en_GD", "en_GG", "en_GH", "en_GI", "en_GM", "en_GS", "en_GY", "en_HK", "en_HU", "en_ID",
+                        "en_IE", "en_IL", "en_IM", "en_IN", "en_IO", "en_IT", "en_JE", "en_JM", "en_KE",
                         "en_KI", "en_KN", "en_KY", "en_LC", "en_LR", "en_LS", "en_MG", "en_MO",
                         "en_MS", "en_MT", "en_MU", "en_MV", "en_MW", "en_MY", "en_NA", "en_NF", "en_NG",
-                        "en_NL", "en_NR", "en_NU", "en_NZ", "en_PG", "en_PK", "en_PN",
-                        "en_PW", "en_RW", "en_SB", "en_SC", "en_SD", "en_SE", "en_SG", "en_SH",
-                        "en_SI", "en_SL", "en_SS", "en_SX", "en_SZ", "en_TC", "en_TK", "en_TO",
+                        "en_NL", "en_NO", "en_NR", "en_NU", "en_NZ", "en_PG", "en_PK", "en_PL", "en_PN", "en_PT",
+                        "en_PW", "en_RO", "en_RW", "en_SB", "en_SC", "en_SD", "en_SE", "en_SG", "en_SH",
+                        "en_SI", "en_SK", "en_SL", "en_SS", "en_SX", "en_SZ", "en_TC", "en_TK", "en_TO",
                         "en_TT", "en_TV", "en_TZ", "en_UG", "en_US", "en_US_#Latn", "en_US_POSIX", "en_VC", "en_VG", "en_VU", "en_WS",
                         "en_ZA", "en_ZM", "en_ZW", "es", "es_419", "es_AR", "es_BO", "es_BR", "es_BZ",
                         "es_CL", "es_CO", "es_CR", "es_CU", "es_DO", "es_EC", "es_GT", "es_HN",
@@ -175,15 +175,15 @@ public class IncludeLocalesPluginTest {
                 List.of(
                         "(root)", "en", "en_001", "en_150", "en_AE", "en_AG", "en_AI", "en_AS", "en_AT",
                         "en_AU", "en_BB", "en_BE", "en_BI", "en_BM", "en_BS", "en_BW", "en_BZ",
-                        "en_CA", "en_CC", "en_CH", "en_CK", "en_CM", "en_CX", "en_CY", "en_DE",
-                        "en_DG", "en_DK", "en_DM", "en_ER", "en_FI", "en_FJ", "en_FK", "en_FM",
-                        "en_GB", "en_GD", "en_GG", "en_GH", "en_GI", "en_GM", "en_GU", "en_GY",
-                        "en_HK", "en_ID", "en_IE", "en_IL", "en_IM", "en_IN", "en_IO", "en_JE", "en_JM",
+                        "en_CA", "en_CC", "en_CH", "en_CK", "en_CM", "en_CX", "en_CY", "en_CZ", "en_DE",
+                        "en_DG", "en_DK", "en_DM", "en_ER", "en_ES", "en_FI", "en_FJ", "en_FK", "en_FM", "en_FR",
+                        "en_GB", "en_GD", "en_GG", "en_GH", "en_GI", "en_GM", "en_GS", "en_GU", "en_GY",
+                        "en_HK", "en_HU", "en_ID", "en_IE", "en_IL", "en_IM", "en_IN", "en_IO", "en_IT", "en_JE", "en_JM",
                         "en_KE", "en_KI", "en_KN", "en_KY", "en_LC", "en_LR", "en_LS", "en_MG",
                         "en_MH", "en_MO", "en_MP", "en_MS", "en_MT", "en_MU", "en_MV", "en_MW", "en_MY",
-                        "en_NA", "en_NF", "en_NG", "en_NL", "en_NR", "en_NU", "en_NZ", "en_PG",
-                        "en_PH", "en_PK", "en_PN", "en_PR", "en_PW", "en_RW", "en_SB", "en_SC",
-                        "en_SD", "en_SE", "en_SG", "en_SH", "en_SI", "en_SL", "en_SS", "en_SX",
+                        "en_NA", "en_NF", "en_NG", "en_NL", "en_NO", "en_NR", "en_NU", "en_NZ", "en_PG",
+                        "en_PH", "en_PK", "en_PL", "en_PN", "en_PR", "en_PT", "en_PW", "en_RO", "en_RW", "en_SB", "en_SC",
+                        "en_SD", "en_SE", "en_SG", "en_SH", "en_SI", "en_SK", "en_SL", "en_SS", "en_SX",
                         "en_SZ", "en_TC", "en_TK", "en_TO", "en_TT", "en_TV", "en_TZ", "en_UG",
                         "en_UM", "en_US", "en_US_#Latn", "en_US_POSIX", "en_VC", "en_VG", "en_VI", "en_VU",
                         "en_WS", "en_ZA", "en_ZM", "en_ZW", "ja", "ja_JP", "ja_JP_#Jpan",
@@ -355,15 +355,15 @@ public class IncludeLocalesPluginTest {
                 List.of(
                         "(root)", "en", "en_001", "en_150", "en_AE", "en_AG", "en_AI", "en_AS", "en_AT",
                         "en_AU", "en_BB", "en_BE", "en_BI", "en_BM", "en_BS", "en_BW", "en_BZ",
-                        "en_CA", "en_CC", "en_CH", "en_CK", "en_CM", "en_CX", "en_CY", "en_DE",
-                        "en_DG", "en_DK", "en_DM", "en_ER", "en_FI", "en_FJ", "en_FK", "en_FM",
-                        "en_GB", "en_GD", "en_GG", "en_GH", "en_GI", "en_GM", "en_GU", "en_GY",
-                        "en_HK", "en_ID", "en_IE", "en_IL", "en_IM", "en_IN", "en_IO", "en_JE", "en_JM",
+                        "en_CA", "en_CC", "en_CH", "en_CK", "en_CM", "en_CX", "en_CY", "en_CZ", "en_DE",
+                        "en_DG", "en_DK", "en_DM", "en_ER", "en_ES", "en_FI", "en_FJ", "en_FK", "en_FM", "en_FR",
+                        "en_GB", "en_GD", "en_GG", "en_GH", "en_GI", "en_GM", "en_GS", "en_GU", "en_GY",
+                        "en_HK", "en_HU", "en_ID", "en_IE", "en_IL", "en_IM", "en_IN", "en_IO", "en_IT", "en_JE", "en_JM",
                         "en_KE", "en_KI", "en_KN", "en_KY", "en_LC", "en_LR", "en_LS", "en_MG",
                         "en_MH", "en_MO", "en_MP", "en_MS", "en_MT", "en_MU", "en_MV", "en_MW", "en_MY",
-                        "en_NA", "en_NF", "en_NG", "en_NL", "en_NR", "en_NU", "en_NZ", "en_PG",
-                        "en_PH", "en_PK", "en_PN", "en_PR", "en_PW", "en_RW", "en_SB", "en_SC",
-                        "en_SD", "en_SE", "en_SG", "en_SH", "en_SI", "en_SL", "en_SS", "en_SX",
+                        "en_NA", "en_NF", "en_NG", "en_NL", "en_NO", "en_NR", "en_NU", "en_NZ", "en_PG",
+                        "en_PH", "en_PK", "en_PL", "en_PN", "en_PR", "en_PT", "en_PW", "en_RO", "en_RW", "en_SB", "en_SC",
+                        "en_SD", "en_SE", "en_SG", "en_SH", "en_SI", "en_SK", "en_SL", "en_SS", "en_SX",
                         "en_SZ", "en_TC", "en_TK", "en_TO", "en_TT", "en_TV", "en_TZ", "en_UG",
                         "en_UM", "en_US", "en_US_#Latn", "en_US_POSIX", "en_VC", "en_VG", "en_VI", "en_VU",
                         "en_WS", "en_ZA", "en_ZM", "en_ZW"),

From c856b3425a70d2aecb6c5c44da36396a5d74b00d Mon Sep 17 00:00:00 2001
From: Emanuel Peter <epeter@openjdk.org>
Date: Tue, 25 Mar 2025 16:08:57 +0000
Subject: [PATCH 482/587] 8352587: C2 SuperWord: we must avoid Multiversioning
 for PeelMainPost loops

Reviewed-by: chagedorn, kvn
---
 src/hotspot/share/opto/loopTransform.cpp      | 13 ++--
 src/hotspot/share/opto/loopnode.cpp           |  4 ++
 src/hotspot/share/opto/loopopts.cpp           |  2 +-
 .../TestMultiversionWithPeelMainPost.java     | 58 ++++++++++++++++
 .../TestPeelMainPostNoMultiversioning.java    | 67 +++++++++++++++++++
 5 files changed, 139 insertions(+), 5 deletions(-)
 create mode 100644 test/hotspot/jtreg/compiler/loopopts/superword/TestMultiversionWithPeelMainPost.java
 create mode 100644 test/hotspot/jtreg/compiler/loopopts/superword/TestPeelMainPostNoMultiversioning.java

diff --git a/src/hotspot/share/opto/loopTransform.cpp b/src/hotspot/share/opto/loopTransform.cpp
index f0cca35d0bd..f491fa2fb10 100644
--- a/src/hotspot/share/opto/loopTransform.cpp
+++ b/src/hotspot/share/opto/loopTransform.cpp
@@ -3429,10 +3429,15 @@ bool IdealLoopTree::iteration_split_impl(PhaseIdealLoop *phase, Node_List &old_n
         return false;
       }
 
-      // We are going to add pre-loop and post-loop.
-      // But should we also multi-version for auto-vectorization speculative
-      // checks, i.e. fast and slow-paths?
-      phase->maybe_multiversion_for_auto_vectorization_runtime_checks(this, old_new);
+      if (!peel_only) {
+        // We are going to add pre-loop and post-loop (PreMainPost).
+        // But should we also multiversion for auto-vectorization speculative
+        // checks, i.e. fast and slow-paths?
+        // Note: Just PeelMainPost is not sufficient, as we could never find the
+        //       multiversion_if again from the main loop: we need a nicely structured
+        //       pre-loop, a peeled iteration cannot easily be parsed through.
+        phase->maybe_multiversion_for_auto_vectorization_runtime_checks(this, old_new);
+      }
 
       phase->insert_pre_post_loops(this, old_new, peel_only);
     }
diff --git a/src/hotspot/share/opto/loopnode.cpp b/src/hotspot/share/opto/loopnode.cpp
index cb3bcee7194..92f678030ca 100644
--- a/src/hotspot/share/opto/loopnode.cpp
+++ b/src/hotspot/share/opto/loopnode.cpp
@@ -4471,6 +4471,10 @@ void PhaseIdealLoop::eliminate_useless_multiversion_if() {
         IfNode* multiversion_if = head->find_multiversion_if_from_multiversion_fast_main_loop();
         if (multiversion_if != nullptr) {
             useful_multiversioning_opaque_nodes.push(multiversion_if->in(1)->as_OpaqueMultiversioning());
+        } else {
+          // We could not find the multiversion_if, and would never find it again. Remove the
+          // multiversion marking for consistency.
+          head->set_no_multiversion();
         }
       }
     }
diff --git a/src/hotspot/share/opto/loopopts.cpp b/src/hotspot/share/opto/loopopts.cpp
index d6242d9f8b8..e896196c6cf 100644
--- a/src/hotspot/share/opto/loopopts.cpp
+++ b/src/hotspot/share/opto/loopopts.cpp
@@ -4484,7 +4484,7 @@ PhaseIdealLoop::auto_vectorize(IdealLoopTree* lpt, VSharedData &vshared) {
   return AutoVectorizeStatus::Success;
 }
 
-// Just before insert_pre_post_loops, we can multi-version the loop:
+// Just before insert_pre_post_loops, we can multiversion the loop:
 //
 //              multiversion_if
 //               |       |
diff --git a/test/hotspot/jtreg/compiler/loopopts/superword/TestMultiversionWithPeelMainPost.java b/test/hotspot/jtreg/compiler/loopopts/superword/TestMultiversionWithPeelMainPost.java
new file mode 100644
index 00000000000..e28c283e63e
--- /dev/null
+++ b/test/hotspot/jtreg/compiler/loopopts/superword/TestMultiversionWithPeelMainPost.java
@@ -0,0 +1,58 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package compiler.loopopts.superword;
+
+/*
+ * @test
+ * @bug 8352587
+ * @summary Test case where we used to Multiversion a PeelMainPost loop,
+ *          which is useless and triggered an assert later on.
+ * @run main compiler.loopopts.superword.TestMultiversionWithPeelMainPost
+ * @run main/othervm -XX:CompileCommand=compileonly,compiler.loopopts.superword.TestMultiversionWithPeelMainPost::test
+ *                   -XX:-TieredCompilation -Xcomp
+ *                   -XX:PerMethodTrapLimit=0
+ *                   compiler.loopopts.superword.TestMultiversionWithPeelMainPost
+ */
+
+public class TestMultiversionWithPeelMainPost {
+    static byte byArr[] = new byte[2];
+
+    public static void main(String[] strArr) {
+        test();
+    }
+
+    static void test() {
+        int x = 2;
+        int i = 4;
+        while (i > 0) {
+            for (int j = 5; j < 56; j++) {
+                byArr[1] = 3;
+            }
+            for (int j = 256; j > 3; j -= 2) {
+                x += 3;
+            }
+            i--;
+        }
+    }
+}
diff --git a/test/hotspot/jtreg/compiler/loopopts/superword/TestPeelMainPostNoMultiversioning.java b/test/hotspot/jtreg/compiler/loopopts/superword/TestPeelMainPostNoMultiversioning.java
new file mode 100644
index 00000000000..99ed557ec42
--- /dev/null
+++ b/test/hotspot/jtreg/compiler/loopopts/superword/TestPeelMainPostNoMultiversioning.java
@@ -0,0 +1,67 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package compiler.loopopts.superword;
+
+import compiler.lib.ir_framework.*;
+
+/*
+ * @test
+ * @bug 8352587
+ * @summary IR test to ensure that PeelMainPost cases does not get Multiversioned.
+ * @library /test/lib /
+ * @run driver compiler.loopopts.superword.TestPeelMainPostNoMultiversioning
+ */
+
+public class TestPeelMainPostNoMultiversioning {
+
+    public static void main(String[] args) {
+        TestFramework framework = new TestFramework(TestPeelMainPostNoMultiversioning.class);
+        // No traps means we cannot use the predicates version for SuperWord / AutoVectorization,
+        // and instead use multiversioning directly.
+        framework.addFlags("-XX:-TieredCompilation", "-XX:PerMethodTrapLimit=0");
+        framework.setDefaultWarmup(0); // simulates Xcomp
+        framework.start();
+    }
+
+    public static long value = 1;
+    public static long multiplicator = 3;
+
+    @Test
+    @IR(counts = {".*multiversion.*", "= 0"},
+        phase = CompilePhase.PHASEIDEALLOOP1)
+    @IR(counts = {".*multiversion.*", "= 0"},
+        phase = CompilePhase.PHASEIDEALLOOP_ITERATIONS)
+    @IR(counts = {".*multiversion.*", "= 0"},
+        phase = CompilePhase.PRINT_IDEAL)
+    // We are checking it for a few phases, just to make sure we are not seeing multiversioning
+    // at any point.
+    public static void test() {
+        long x = value;
+        long y = multiplicator;
+        for (int i = 0; i < 10_000; i++) {
+            x *= y; // No memory load/store -> PeelMainPost
+        }
+        value = x;
+    }
+}

From 60544a15d6bd9fc17f362cdfb95f06e733934b05 Mon Sep 17 00:00:00 2001
From: Chen Liang <liach@openjdk.org>
Date: Tue, 25 Mar 2025 19:01:02 +0000
Subject: [PATCH 483/587] 8164714: Constructor.newInstance creates instance of
 inner class with null outer class

Reviewed-by: vromero
---
 .../com/sun/tools/javac/comp/Lower.java       | 45 +++++++----
 .../com/sun/tools/javac/jvm/Target.java       |  7 ++
 .../classfile/AnnotatedExtendsTest.java       |  4 +-
 .../javac/nestmates/CheckNestmateAttrs.java   |  8 +-
 .../outerThisNull/NoOuterThisNullChecks.java  | 73 ++++++++++++++++++
 .../outerThisNull/OuterThisNullChecks.java    | 74 +++++++++++++++++++
 test/langtools/tools/javap/AnnoTest.java      | 28 +++----
 .../tools/javap/classfile/T6887895.java       |  5 +-
 8 files changed, 209 insertions(+), 35 deletions(-)
 create mode 100644 test/langtools/tools/javac/outerThisNull/NoOuterThisNullChecks.java
 create mode 100644 test/langtools/tools/javac/outerThisNull/OuterThisNullChecks.java

diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Lower.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Lower.java
index d2219bb08b8..a544b3948e5 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Lower.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Lower.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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,6 +105,7 @@ public class Lower extends TreeTranslator {
     private final boolean disableProtectedAccessors; // experimental
     private final PkgInfo pkginfoOpt;
     private final boolean optimizeOuterThis;
+    private final boolean nullCheckOuterThis;
     private final boolean useMatchException;
     private final HashMap<TypePairs, String> typePairToName;
     private int variableIndex = 0;
@@ -134,6 +135,8 @@ public class Lower extends TreeTranslator {
         optimizeOuterThis =
             target.optimizeOuterThis() ||
             options.getBoolean("optimizeOuterThis", false);
+        nullCheckOuterThis = options.getBoolean("nullCheckOuterThis",
+            target.nullCheckOuterThisByDefault());
         disableProtectedAccessors = options.isSet("disableProtectedAccessors");
         Source source = Source.instance(context);
         Preview preview = Preview.instance(context);
@@ -1794,18 +1797,27 @@ public class Lower extends TreeTranslator {
                     make.Ident(rhs)).setType(lhs.erasure(types)));
     }
 
-    /** Return tree simulating the assignment {@code this.this$n = this$n}.
+    /**
+     * Return tree simulating null checking outer this and/or assigning. This is
+     * called when a null check is required (nullCheckOuterThis), or a synthetic
+     * field is generated (stores).
      */
-    JCStatement initOuterThis(int pos, VarSymbol rhs) {
+    JCStatement initOuterThis(int pos, VarSymbol rhs, boolean stores) {
         Assert.check(rhs.owner.kind == MTH);
-        VarSymbol lhs = outerThisStack.head;
-        Assert.check(rhs.owner.owner == lhs.owner);
+        Assert.check(nullCheckOuterThis || stores); // One of the flags must be true
         make.at(pos);
-        return
-            make.Exec(
-                make.Assign(
+        JCExpression expression = make.Ident(rhs);
+        if (nullCheckOuterThis) {
+            expression = attr.makeNullCheck(expression);
+        }
+        if (stores) {
+            VarSymbol lhs = outerThisStack.head;
+            Assert.check(rhs.owner.owner == lhs.owner);
+            expression = make.Assign(
                     make.Select(make.This(lhs.owner.erasure(types)), lhs),
-                    make.Ident(rhs)).setType(lhs.erasure(types)));
+                    expression).setType(lhs.erasure(types));
+        }
+        return make.Exec(expression);
     }
 
 /* ************************************************************************
@@ -2210,15 +2222,22 @@ public class Lower extends TreeTranslator {
         }
         // If this$n was accessed, add the field definition and prepend
         // initializer code to any super() invocation to initialize it
-        if (currentClass.hasOuterInstance() && shouldEmitOuterThis(currentClass)) {
-            tree.defs = tree.defs.prepend(otdef);
-            enterSynthetic(tree.pos(), otdef.sym, currentClass.members());
+        // otherwise prepend enclosing instance null check code if required
+        emitOuter:
+        if (currentClass.hasOuterInstance()) {
+            boolean storesThis = shouldEmitOuterThis(currentClass);
+            if (storesThis) {
+                tree.defs = tree.defs.prepend(otdef);
+                enterSynthetic(tree.pos(), otdef.sym, currentClass.members());
+            } else if (!nullCheckOuterThis) {
+                break emitOuter;
+            }
 
             for (JCTree def : tree.defs) {
                 if (TreeInfo.isConstructor(def)) {
                     JCMethodDecl mdef = (JCMethodDecl)def;
                     if (TreeInfo.hasConstructorCall(mdef, names._super)) {
-                        List<JCStatement> initializer = List.of(initOuterThis(mdef.body.pos, mdef.params.head.sym));
+                        List<JCStatement> initializer = List.of(initOuterThis(mdef.body.pos, mdef.params.head.sym, storesThis)) ;
                         TreeInfo.mapSuperCalls(mdef.body, supercall -> make.Block(0, initializer.append(supercall)));
                     }
                 }
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/Target.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/Target.java
index 90f235fff04..5b207352e6e 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/Target.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/Target.java
@@ -238,4 +238,11 @@ public enum Target {
     public boolean usesReferenceOnlySelectorTypes() {
         return compareTo(Target.JDK1_23) < 0;
     }
+
+    /**
+     * Should we emit a null check against incoming outer this argument by default?
+     */
+    public boolean nullCheckOuterThisByDefault() {
+        return compareTo(JDK1_25) >= 0;
+    }
 }
diff --git a/test/langtools/tools/javac/annotations/typeAnnotations/classfile/AnnotatedExtendsTest.java b/test/langtools/tools/javac/annotations/typeAnnotations/classfile/AnnotatedExtendsTest.java
index 450e2b5956a..11694085f53 100644
--- a/test/langtools/tools/javac/annotations/typeAnnotations/classfile/AnnotatedExtendsTest.java
+++ b/test/langtools/tools/javac/annotations/typeAnnotations/classfile/AnnotatedExtendsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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,7 @@ public class AnnotatedExtendsTest {
                 .classes(classPath.toString())
                 .run()
                 .getOutput(Task.OutputKind.DIRECT);
-        if (!javapOut.contains("0: #21(): CLASS_EXTENDS, type_index=65535"))
+        if (!javapOut.contains("0: #27(): CLASS_EXTENDS, type_index=65535"))
             throw new AssertionError("Expected output missing: " + javapOut);
     }
 }
diff --git a/test/langtools/tools/javac/nestmates/CheckNestmateAttrs.java b/test/langtools/tools/javac/nestmates/CheckNestmateAttrs.java
index a56d294f9b4..e02e47861d7 100644
--- a/test/langtools/tools/javac/nestmates/CheckNestmateAttrs.java
+++ b/test/langtools/tools/javac/nestmates/CheckNestmateAttrs.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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,9 @@ public class CheckNestmateAttrs {
         runCheck(params, new String [] {
                         "NestHost: class CheckNestmateAttrs",
                         "0: aload_0",
-                        "1: getfield      #1                  // Field this$1:LCheckNestmateAttrs$Inner;",
-                        "4: getfield      #13                 // Field CheckNestmateAttrs$Inner.this$0:LCheckNestmateAttrs;",
-                        "7: invokevirtual #19                 // Method CheckNestmateAttrs.test:()V",
+                        "1: getfield      #7                  // Field this$1:LCheckNestmateAttrs$Inner;",
+                        "4: getfield      #19                 // Field CheckNestmateAttrs$Inner.this$0:LCheckNestmateAttrs;",
+                        "7: invokevirtual #25                 // Method CheckNestmateAttrs.test:()V",
                         "10: return"
         });
 
diff --git a/test/langtools/tools/javac/outerThisNull/NoOuterThisNullChecks.java b/test/langtools/tools/javac/outerThisNull/NoOuterThisNullChecks.java
new file mode 100644
index 00000000000..1706394dc29
--- /dev/null
+++ b/test/langtools/tools/javac/outerThisNull/NoOuterThisNullChecks.java
@@ -0,0 +1,73 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please 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;
+import java.lang.reflect.InvocationTargetException;
+import java.util.stream.Stream;
+
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+/*
+ * @test
+ * @bug 8164714
+ * @summary No null check for immediate enclosing instance for VM/reflective
+ *          invocation of inner classes for older versions or on request
+ *
+ * @clean *
+ * @compile -XDnullCheckOuterThis=false NoOuterThisNullChecks.java
+ * @run junit NoOuterThisNullChecks
+ *
+ * @clean *
+ * @compile --release 17 NoOuterThisNullChecks.java
+ * @run junit NoOuterThisNullChecks
+ */
+class NoOuterThisNullChecks {
+    static Stream<Class<?>> testClasses() {
+        return Stream.of(NoOuterThis.class, OuterThisField.class);
+    }
+
+    @MethodSource("testClasses")
+    @ParameterizedTest
+    void testNoOuter(Class<?> clz) {
+        assertDoesNotThrow(() -> clz.getDeclaredConstructor(NoOuterThisNullChecks.class).newInstance((Object) null));
+
+        MethodHandle mh = assertDoesNotThrow(() -> MethodHandles.lookup().findConstructor(clz, MethodType.methodType(void.class, NoOuterThisNullChecks.class)))
+                .asType(MethodType.methodType(Object.class, Object.class));
+        assertDoesNotThrow(() -> {
+            Object stub = mh.invokeExact((Object) null);
+        });
+    }
+
+    class NoOuterThis {}
+    class OuterThisField {
+        @Override
+        public String toString() {
+            return "outer this = " + NoOuterThisNullChecks.this;
+        }
+    }
+}
diff --git a/test/langtools/tools/javac/outerThisNull/OuterThisNullChecks.java b/test/langtools/tools/javac/outerThisNull/OuterThisNullChecks.java
new file mode 100644
index 00000000000..17ad042f78d
--- /dev/null
+++ b/test/langtools/tools/javac/outerThisNull/OuterThisNullChecks.java
@@ -0,0 +1,74 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please 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;
+import java.lang.reflect.InvocationTargetException;
+import java.util.stream.Stream;
+
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+/*
+ * @test
+ * @bug 8164714
+ * @summary Null check for immediate enclosing instance for VM/reflective
+ *          invocation of inner classes
+ *
+ * @clean *
+ * @compile OuterThisNullChecks.java
+ * @run junit OuterThisNullChecks
+ *
+ * @clean *
+ * @compile --release 17 -XDnullCheckOuterThis=true OuterThisNullChecks.java
+ * @run junit OuterThisNullChecks
+ */
+class OuterThisNullChecks {
+    static Stream<Class<?>> testClasses() {
+        return Stream.of(NoOuterThis.class, OuterThisField.class);
+    }
+
+    @MethodSource("testClasses")
+    @ParameterizedTest
+    void testNoOuter(Class<?> clz) {
+        var ite = assertThrows(InvocationTargetException.class, () -> clz.getDeclaredConstructor(OuterThisNullChecks.class).newInstance((Object) null));
+        assertInstanceOf(NullPointerException.class, ite.getCause());
+
+        MethodHandle mh = assertDoesNotThrow(() -> MethodHandles.lookup().findConstructor(clz, MethodType.methodType(void.class, OuterThisNullChecks.class)))
+                .asType(MethodType.methodType(Object.class, Object.class));
+        assertThrows(NullPointerException.class, () -> {
+            Object stub = mh.invokeExact((Object) null);
+        });
+    }
+
+    class NoOuterThis {}
+    class OuterThisField {
+        @Override
+        public String toString() {
+            return "outer this = " + OuterThisNullChecks.this;
+        }
+    }
+}
diff --git a/test/langtools/tools/javap/AnnoTest.java b/test/langtools/tools/javap/AnnoTest.java
index e7bf4074915..205a997aec6 100644
--- a/test/langtools/tools/javap/AnnoTest.java
+++ b/test/langtools/tools/javap/AnnoTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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,50 +49,50 @@ public class AnnoTest {
 
         expect(out,
                 "RuntimeVisibleAnnotations:\n" +
-                "  0: #18(#19=B#20)\n" +
+                "  0: #24(#25=B#26)\n" +
                 "    AnnoTest$ByteAnno(\n" +
                 "      value=(byte) 42\n" +
                 "    )\n" +
-                "  1: #21(#19=S#22)\n" +
+                "  1: #27(#25=S#28)\n" +
                 "    AnnoTest$ShortAnno(\n" +
                 "      value=(short) 3\n" +
                 "    )");
         expect(out,
                 "RuntimeInvisibleAnnotations:\n" +
-                "  0: #24(#19=[J#25,J#27,J#29,J#31,J#33])\n" +
+                "  0: #30(#25=[J#31,J#33,J#35,J#37,J#39])\n" +
                 "    AnnoTest$ArrayAnno(\n" +
                 "      value=[1l,2l,3l,4l,5l]\n" +
                 "    )\n" +
-                "  1: #35(#19=Z#36)\n" +
+                "  1: #41(#25=Z#42)\n" +
                 "    AnnoTest$BooleanAnno(\n" +
                 "      value=false\n" +
                 "    )\n" +
-                "  2: #37(#38=c#39)\n" +
+                "  2: #43(#44=c#45)\n" +
                 "    AnnoTest$ClassAnno(\n" +
                 "      type=class Ljava/lang/Object;\n" +
                 "    )\n" +
-                "  3: #40(#41=e#42.#43)\n" +
+                "  3: #46(#47=e#48.#49)\n" +
                 "    AnnoTest$EnumAnno(\n" +
                 "      kind=Ljavax/lang/model/element/ElementKind;.PACKAGE\n" +
                 "    )\n" +
-                "  4: #44(#19=I#45)\n" +
+                "  4: #50(#25=I#51)\n" +
                 "    AnnoTest$IntAnno(\n" +
                 "      value=2\n" +
                 "    )\n" +
-                "  5: #46()\n" +
+                "  5: #52()\n" +
                 "    AnnoTest$IntDefaultAnno\n" +
-                "  6: #47(#48=s#49)\n" +
+                "  6: #53(#54=s#55)\n" +
                 "    AnnoTest$NameAnno(\n" +
                 "      name=\"NAME\"\n" +
                 "    )\n" +
-                "  7: #50(#51=D#52,#54=F#55)\n" +
+                "  7: #56(#57=D#58,#60=F#61)\n" +
                 "    AnnoTest$MultiAnno(\n" +
                 "      d=3.14159d\n" +
                 "      f=2.71828f\n" +
                 "    )\n" +
-                "  8: #56()\n" +
+                "  8: #62()\n" +
                 "    AnnoTest$SimpleAnno\n" +
-                "  9: #57(#19=@#44(#19=I#58))\n" +
+                "  9: #63(#25=@#50(#25=I#64))\n" +
                 "    AnnoTest$AnnoAnno(\n" +
                 "      value=@AnnoTest$IntAnno(\n" +
                 "        value=5\n" +
@@ -100,7 +100,7 @@ public class AnnoTest {
                 "    )");
         expect(out,
                 "RuntimeInvisibleTypeAnnotations:\n" +
-                "  0: #60(): CLASS_EXTENDS, type_index=0\n" +
+                "  0: #66(): CLASS_EXTENDS, type_index=0\n" +
                 "    AnnoTest$TypeAnno");
 
         if (errors > 0)
diff --git a/test/langtools/tools/javap/classfile/T6887895.java b/test/langtools/tools/javap/classfile/T6887895.java
index 01d85508064..3f9052adb1e 100644
--- a/test/langtools/tools/javap/classfile/T6887895.java
+++ b/test/langtools/tools/javap/classfile/T6887895.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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,8 @@ public class T6887895 {
                 "java/lang/Object",
                 "java/lang/String",
                 "T6887895",
-                "T6887895$Test"
+                "T6887895$Test",
+                "java/util/Objects",
         };
 
         Set<String> expect = new TreeSet<String>(Arrays.asList(expectNames));

From f5a0db43b76ea58f54d87c49d97c7d87ee1b4ba6 Mon Sep 17 00:00:00 2001
From: Chen Liang <liach@openjdk.org>
Date: Tue, 25 Mar 2025 19:01:22 +0000
Subject: [PATCH 484/587] 8315447: Invalid Type Annotation attached to a method
 instead of a lambda

Reviewed-by: vromero
---
 .../sun/tools/javac/comp/LambdaToMethod.java  |   6 +-
 .../classfile/CombinationsTargetTest3.java    | 158 ++----------------
 .../classfile/RepeatableInLambdaTest.java     |  85 ++++++++++
 3 files changed, 100 insertions(+), 149 deletions(-)
 create mode 100644 test/langtools/tools/javac/annotations/typeAnnotations/classfile/RepeatableInLambdaTest.java

diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/LambdaToMethod.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/LambdaToMethod.java
index 8772e70dda3..b13c9e0fe2b 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/LambdaToMethod.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/LambdaToMethod.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -462,6 +462,10 @@ public class LambdaToMethod extends TreeTranslator {
         ListBuffer<Attribute.TypeCompound> lambdaTypeAnnos = new ListBuffer<>();
 
         for (Attribute.TypeCompound tc : source.get()) {
+            if (tc.hasUnknownPosition()) {
+                // Handle container annotations
+                tc.tryFixPosition();
+            }
             if (tc.position.onLambda == tree) {
                 lambdaTypeAnnos.append(tc);
             } else {
diff --git a/test/langtools/tools/javac/annotations/typeAnnotations/classfile/CombinationsTargetTest3.java b/test/langtools/tools/javac/annotations/typeAnnotations/classfile/CombinationsTargetTest3.java
index 1a8a8cf8414..5fffb82356e 100644
--- a/test/langtools/tools/javac/annotations/typeAnnotations/classfile/CombinationsTargetTest3.java
+++ b/test/langtools/tools/javac/annotations/typeAnnotations/classfile/CombinationsTargetTest3.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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,11 @@
  * @test
  * @bug 8005085 8005681 8008769 8010015
  * @summary Check (repeating)type annotations on lambda usage.
- * @modules jdk.jdeps/com.sun.tools.classfile
  * @run main CombinationsTargetTest3
  */
 
-import com.sun.tools.classfile.*;
 import java.io.*;
-import java.util.ArrayList;
-import java.util.List;
+import java.lang.classfile.*;
 import java.util.Vector;
 
 public class CombinationsTargetTest3 extends ClassfileTestHelper {
@@ -203,19 +200,19 @@ public class CombinationsTargetTest3 extends ClassfileTestHelper {
                 classFile=new File(classdir.concat(source.altClassName));
                 source.innerClassname=null;
             }
-            ClassFile cf = ClassFile.read(classFile);
+            ClassModel cf = ClassFile.of().parse(classFile.toPath());
 
-            println("Testing classfile: " + cf.getName());
+            println("Testing classfile: " + cf.thisClass().asInternalName());
             //Test class,fields and method counts.
             test(cf);
 
-            for (Field f : cf.fields) {
-                test(cf, f);
-                test(cf, f, true);
+            for (FieldModel f : cf.fields()) {
+                test(f);
+                test(f, true);
             }
-            for (Method m: cf.methods) {
-                test(cf, m);
-                test(cf, m, true);
+            for (MethodModel m: cf.methods()) {
+                test(m);
+                test(m, true);
             }
 
             countAnnotations(); // sets errors=0 before counting.
@@ -539,139 +536,4 @@ public class CombinationsTargetTest3 extends ClassfileTestHelper {
         }
         return imports + source;
     }
-
-    /************ Helper annotations counting methods ******************/
-    void test(ClassFile cf) {
-        test("CLASS",cf, null, null, Attribute.RuntimeVisibleTypeAnnotations, true);
-        test("CLASS",cf, null, null, Attribute.RuntimeInvisibleTypeAnnotations, false);
-        //RuntimeAnnotations since one annotation can result in two attributes.
-        test("CLASS",cf, null, null, Attribute.RuntimeVisibleAnnotations, true);
-        test("CLASS",cf, null, null, Attribute.RuntimeInvisibleAnnotations, false);
-    }
-
-    void test(ClassFile cf, Field f, Boolean local) {
-        if (!local) {
-            test("FIELD",cf, f, null, Attribute.RuntimeVisibleTypeAnnotations, true);
-            test("FIELD",cf, f, null, Attribute.RuntimeInvisibleTypeAnnotations, false);
-            test("FIELD",cf, f, null, Attribute.RuntimeVisibleAnnotations, true);
-            test("FIELD",cf, f, null, Attribute.RuntimeInvisibleAnnotations, false);
-        } else {
-            test("CODE",cf, f, null, Attribute.RuntimeVisibleTypeAnnotations, true);
-            test("CODE",cf, f, null, Attribute.RuntimeInvisibleTypeAnnotations, false);
-            test("CODE",cf, f, null, Attribute.RuntimeVisibleAnnotations, true);
-            test("CODE",cf, f, null, Attribute.RuntimeInvisibleAnnotations, false);
-        }
-    }
-
-    void test(ClassFile cf, Field f) {
-        test(cf, f, false);
-    }
-
-    // 'local' determines whether to look for annotations in code attribute or not.
-    void test(ClassFile cf, Method m, Boolean local) {
-        if (!local) {
-            test("METHOD",cf, null, m, Attribute.RuntimeVisibleTypeAnnotations, true);
-            test("METHOD",cf, null, m, Attribute.RuntimeInvisibleTypeAnnotations, false);
-            test("METHOD",cf, null, m, Attribute.RuntimeVisibleAnnotations, true);
-            test("METHOD",cf, null, m, Attribute.RuntimeInvisibleAnnotations, false);
-        } else  {
-            test("MCODE",cf, null, m, Attribute.RuntimeVisibleTypeAnnotations, true);
-            test("MCODE",cf, null, m, Attribute.RuntimeInvisibleTypeAnnotations, false);
-            test("MCODE",cf, null, m, Attribute.RuntimeVisibleAnnotations, true);
-            test("MCODE",cf, null, m, Attribute.RuntimeInvisibleAnnotations, false);
-        }
-    }
-
-    // default to not looking in code attribute
-    void test(ClassFile cf, Method m ) {
-        test(cf, m, false);
-    }
-
-    // Test the result of Attributes.getIndex according to expectations
-    // encoded in the class/field/method name; increment annotations counts.
-    void test(String ttype, ClassFile cf, Field f, Method m, String annName, boolean visible) {
-        String testtype = ttype;
-        String name = null;
-        int index = -1;
-        Attribute attr = null;
-        Code_attribute cAttr = null;
-        boolean isTAattr = annName.contains("TypeAnnotations");
-        try {
-            switch(testtype) {
-                case "FIELD":
-                    name = f.getName(cf.constant_pool);
-                    index = f.attributes.getIndex(cf.constant_pool, annName);
-                    if(index!= -1)
-                        attr = f.attributes.get(index);
-                    break;
-                case "CODE":
-                    name = f.getName(cf.constant_pool);
-                    //fetch index of and code attribute and annotations from code attribute.
-                    index = cf.attributes.getIndex(cf.constant_pool, Attribute.Code);
-                    if(index!= -1) {
-                        attr = cf.attributes.get(index);
-                        assert attr instanceof Code_attribute;
-                        cAttr = (Code_attribute)attr;
-                        index = cAttr.attributes.getIndex(cf.constant_pool, annName);
-                        if(index!= -1)
-                            attr = cAttr.attributes.get(index);
-                    }
-                    break;
-                case "METHOD":
-                    name = m.getName(cf.constant_pool);
-                    index = m.attributes.getIndex(cf.constant_pool, annName);
-                    if(index!= -1)
-                        attr = m.attributes.get(index);
-                    break;
-                case "MCODE":
-                    name = m.getName(cf.constant_pool);
-                    //fetch index of and code attribute and annotations from code attribute.
-                    index = m.attributes.getIndex(cf.constant_pool, Attribute.Code);
-                    if(index!= -1) {
-                        attr = m.attributes.get(index);
-                        assert attr instanceof Code_attribute;
-                        cAttr = (Code_attribute)attr;
-                        index = cAttr.attributes.getIndex(cf.constant_pool, annName);
-                        if(index!= -1)
-                            attr = cAttr.attributes.get(index);
-                    }
-                    break;
-                default:
-                    name = cf.getName();
-                    index = cf.attributes.getIndex(cf.constant_pool, annName);
-                    if(index!= -1) attr = cf.attributes.get(index);
-            }
-        } catch(ConstantPoolException cpe) { cpe.printStackTrace(); }
-
-        if (index != -1) {
-            if(isTAattr) { //count RuntimeTypeAnnotations
-                RuntimeTypeAnnotations_attribute tAttr =
-                        (RuntimeTypeAnnotations_attribute)attr;
-                System.out.println(testtype + ": " + name + ", " + annName + ": " +
-                        tAttr.annotations.length );
-                if (tAttr.annotations.length > 0) {
-                    for (int i = 0; i < tAttr.annotations.length; i++) {
-                        System.out.println("  types:" + tAttr.annotations[i].position.type);
-                    }
-                } else {
-                    System.out.println("");
-                }
-                allt += tAttr.annotations.length;
-                if (visible)
-                    tvisibles += tAttr.annotations.length;
-                else
-                    tinvisibles += tAttr.annotations.length;
-            } else {
-                RuntimeAnnotations_attribute tAttr =
-                        (RuntimeAnnotations_attribute)attr;
-                System.out.println(testtype + ": " + name + ", " + annName + ": " +
-                        tAttr.annotations.length );
-                all += tAttr.annotations.length;
-                if (visible)
-                    visibles += tAttr.annotations.length;
-                else
-                    invisibles += tAttr.annotations.length;
-            }
-        }
-    }
 }
diff --git a/test/langtools/tools/javac/annotations/typeAnnotations/classfile/RepeatableInLambdaTest.java b/test/langtools/tools/javac/annotations/typeAnnotations/classfile/RepeatableInLambdaTest.java
new file mode 100644
index 00000000000..7c7620dd227
--- /dev/null
+++ b/test/langtools/tools/javac/annotations/typeAnnotations/classfile/RepeatableInLambdaTest.java
@@ -0,0 +1,85 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact 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 8315447
+ * @summary Container annotations for type annotations in lambdas should be
+ *          placed on the lambda method
+ * @library /test/lib
+ * @run junit RepeatableInLambdaTest
+ */
+
+import java.lang.classfile.Attributes;
+import java.lang.classfile.ClassFile;
+import java.lang.constant.ClassDesc;
+import java.lang.reflect.AccessFlag;
+import java.util.Map;
+
+import jdk.test.lib.compiler.InMemoryJavaCompiler;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+class RepeatableInLambdaTest {
+    static final String src = """
+            import java.lang.annotation.Repeatable;
+            import java.lang.annotation.Target;
+            import static java.lang.annotation.ElementType.TYPE_USE;
+            import java.util.function.Supplier;
+
+            @Target(TYPE_USE)
+            @Repeatable(AC.class)
+            @interface A {
+            }
+
+            @Target(TYPE_USE)
+            @interface AC {
+                A[] value();
+            }
+
+            @Target(TYPE_USE)
+            @interface B {}
+
+            class Test {
+                void test() {
+                    Supplier<Integer> s = () -> (@A @A @B Integer) 1;
+                }
+            }
+            """;
+
+    @Test
+    void test() {
+        var codes = InMemoryJavaCompiler.compile(Map.of("Test", src));
+        var bytes = codes.get("Test");
+        var cf = ClassFile.of().parse(bytes);
+        var lambdaMethod = cf.methods().stream().filter(mm -> mm.flags().has(AccessFlag.SYNTHETIC))
+                .findFirst().orElseThrow();
+        System.err.println(lambdaMethod);
+        var ritva = lambdaMethod.code().orElseThrow().findAttribute(Attributes.runtimeInvisibleTypeAnnotations()).orElseThrow();
+        var annoList = ritva.annotations();
+        assertEquals(2, annoList.size());
+        assertEquals(ClassDesc.of("AC"), annoList.getFirst().annotation().classSymbol());
+        assertEquals(ClassDesc.of("B"), annoList.get(1).annotation().classSymbol());
+    }
+}

From dbc620fb1f754ca84f2a07abfdfbd4c5fcb55087 Mon Sep 17 00:00:00 2001
From: William Kemper <wkemper@openjdk.org>
Date: Tue, 25 Mar 2025 19:50:06 +0000
Subject: [PATCH 485/587] 8352299: GenShen: Young cycles that interrupt old
 cycles cannot be cancelled

Reviewed-by: shade
---
 .../share/gc/shenandoah/shenandoahHeap.cpp    |  4 ++--
 .../shenandoah/shenandoahSharedVariables.hpp  | 19 +++++++++++++------
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/src/hotspot/share/gc/shenandoah/shenandoahHeap.cpp b/src/hotspot/share/gc/shenandoah/shenandoahHeap.cpp
index c506c418d6d..e38e1636fd1 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahHeap.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahHeap.cpp
@@ -2171,8 +2171,8 @@ size_t ShenandoahHeap::tlab_used(Thread* thread) const {
 }
 
 bool ShenandoahHeap::try_cancel_gc(GCCause::Cause cause) {
-  jbyte prev = _cancelled_gc.cmpxchg(cause, GCCause::_no_gc);
-  return prev == GCCause::_no_gc;
+  const GCCause::Cause prev = _cancelled_gc.xchg(cause);
+  return prev == GCCause::_no_gc || prev == GCCause::_shenandoah_concurrent_gc;
 }
 
 void ShenandoahHeap::cancel_concurrent_mark() {
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahSharedVariables.hpp b/src/hotspot/share/gc/shenandoah/shenandoahSharedVariables.hpp
index 3d5a2b149a7..1d1c9359946 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahSharedVariables.hpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahSharedVariables.hpp
@@ -212,8 +212,9 @@ private:
 
 template<class T>
 struct ShenandoahSharedEnumFlag {
+  typedef uint32_t EnumValueType;
   shenandoah_padding(0);
-  volatile ShenandoahSharedValue value;
+  volatile EnumValueType value;
   shenandoah_padding(1);
 
   ShenandoahSharedEnumFlag() {
@@ -222,8 +223,8 @@ struct ShenandoahSharedEnumFlag {
 
   void set(T v) {
     assert (v >= 0, "sanity");
-    assert (v < (sizeof(ShenandoahSharedValue) * CHAR_MAX), "sanity");
-    Atomic::release_store_fence(&value, (ShenandoahSharedValue)v);
+    assert (v < (sizeof(EnumValueType) * CHAR_MAX), "sanity");
+    Atomic::release_store_fence(&value, (EnumValueType)v);
   }
 
   T get() const {
@@ -232,11 +233,17 @@ struct ShenandoahSharedEnumFlag {
 
   T cmpxchg(T new_value, T expected) {
     assert (new_value >= 0, "sanity");
-    assert (new_value < (sizeof(ShenandoahSharedValue) * CHAR_MAX), "sanity");
-    return (T)Atomic::cmpxchg(&value, (ShenandoahSharedValue)expected, (ShenandoahSharedValue)new_value);
+    assert (new_value < (sizeof(EnumValueType) * CHAR_MAX), "sanity");
+    return (T)Atomic::cmpxchg(&value, (EnumValueType)expected, (EnumValueType)new_value);
   }
 
-  volatile ShenandoahSharedValue* addr_of() {
+  T xchg(T new_value) {
+    assert (new_value >= 0, "sanity");
+    assert (new_value < (sizeof(EnumValueType) * CHAR_MAX), "sanity");
+    return (T)Atomic::xchg(&value, (EnumValueType)new_value);
+  }
+
+  volatile EnumValueType* addr_of() {
     return &value;
   }
 

From 0935ba9a8c808d372b387d0d0f479f854c121ec1 Mon Sep 17 00:00:00 2001
From: SendaoYan <syan@openjdk.org>
Date: Wed, 26 Mar 2025 01:24:55 +0000
Subject: [PATCH 486/587] 8352481: Enforce the use of lld with clang

Co-authored-by: Magnus Ihse Bursie <ihse@openjdk.org>
Reviewed-by: ihse, erikj
---
 make/autoconf/toolchain.m4 | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/make/autoconf/toolchain.m4 b/make/autoconf/toolchain.m4
index c240b9098bc..b3b473c9341 100644
--- a/make/autoconf/toolchain.m4
+++ b/make/autoconf/toolchain.m4
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
 # 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,6 +620,13 @@ AC_DEFUN_ONCE([TOOLCHAIN_DETECT_TOOLCHAIN_CORE],
     # All other toolchains use the compiler to link.
     LD="$CC"
     LDCXX="$CXX"
+    # Force use of lld, since that is what we expect when setting flags later on
+    if test "x$TOOLCHAIN_TYPE" = xclang; then
+      if test "x$OPENJDK_BUILD_OS" != "xmacosx"; then
+        LD="$LD -fuse-ld=lld"
+        LDCXX="$LDCXX -fuse-ld=lld"
+      fi
+    fi
   fi
   AC_SUBST(LD)
   # FIXME: it should be CXXLD, according to standard (cf CXXCPP)

From a81250c55312dfdeb4d65970cff683e6f0783ca7 Mon Sep 17 00:00:00 2001
From: Dingli Zhang <dzhang@openjdk.org>
Date: Wed, 26 Mar 2025 01:58:02 +0000
Subject: [PATCH 487/587] 8352673: RISC-V: Vector can't be turned on with
 -XX:+UseRVV

Reviewed-by: rehn, fyang, syan
---
 src/hotspot/cpu/riscv/vm_version_riscv.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/hotspot/cpu/riscv/vm_version_riscv.cpp b/src/hotspot/cpu/riscv/vm_version_riscv.cpp
index bd84171d5cc..36763b1e9d5 100644
--- a/src/hotspot/cpu/riscv/vm_version_riscv.cpp
+++ b/src/hotspot/cpu/riscv/vm_version_riscv.cpp
@@ -194,7 +194,7 @@ void VM_Version::common_initialize() {
   }
 
   if (UseRVV) {
-    if (!ext_V.enabled()) {
+    if (!ext_V.enabled() && FLAG_IS_DEFAULT(UseRVV)) {
       warning("RVV is not supported on this CPU");
       FLAG_SET_DEFAULT(UseRVV, false);
     } else {

From 1a8c8e07fee33861d348f7b41fea0e3fd5bbc0af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eirik=20Bj=C3=B8rsn=C3=B8s?= <eirbjo@openjdk.org>
Date: Wed, 26 Mar 2025 06:09:17 +0000
Subject: [PATCH 488/587] 8352858: Make java.net.JarURLConnection fields final

Reviewed-by: jpai, dfuchs
---
 .../classes/java/net/JarURLConnection.java    | 74 ++++++++++++-------
 1 file changed, 48 insertions(+), 26 deletions(-)

diff --git a/src/java.base/share/classes/java/net/JarURLConnection.java b/src/java.base/share/classes/java/net/JarURLConnection.java
index 160b7e8de64..41194fac94d 100644
--- a/src/java.base/share/classes/java/net/JarURLConnection.java
+++ b/src/java.base/share/classes/java/net/JarURLConnection.java
@@ -30,7 +30,7 @@ import java.util.jar.JarFile;
 import java.util.jar.JarEntry;
 import java.util.jar.Attributes;
 import java.util.jar.Manifest;
-import java.security.Permission;
+
 import sun.net.www.ParseUtil;
 
 /**
@@ -136,8 +136,11 @@ import sun.net.www.ParseUtil;
  */
 public abstract class JarURLConnection extends URLConnection {
 
-    private URL jarFileURL;
-    private String entryName;
+    // The URL to the JAR file this connection reads from
+    private final URL jarFileURL;
+
+    // The entry this connection reads from, if any
+    private final String entryName;
 
     /**
      * The connection to the JAR file URL, if the connection has been
@@ -152,44 +155,63 @@ public abstract class JarURLConnection extends URLConnection {
      * could be found in a specification string or the
      * string could not be parsed.
      */
-
     protected JarURLConnection(URL url) throws MalformedURLException {
         super(url);
-        parseSpecs(url);
-    }
 
-    /* get the specs for a given url out of the cache, and compute and
-     * cache them if they're not there.
-     */
-    private void parseSpecs(URL url) throws MalformedURLException {
+        // Extract JAR file URL and entry name components from the URL
         String spec = url.getFile();
+        int separatorIndex = spec.indexOf("!/");
 
-        int separator = spec.indexOf("!/");
-        /*
-         * REMIND: we don't handle nested JAR URLs
-         */
-        if (separator == -1) {
+        // REMIND: we don't handle nested JAR URLs
+        if (separatorIndex == -1) {
             throw new MalformedURLException("no !/ found in url spec:" + spec);
         }
 
-        @SuppressWarnings("deprecation")
-        var _unused = jarFileURL = new URL(spec.substring(0, separator++));
+        jarFileURL = parseJarFileURL(spec, separatorIndex, url);
+        entryName = parseEntryName(spec, separatorIndex);
+    }
 
+    /**
+     * Parse the URL of the JAR file backing this JarURLConnection,
+     * appending any #runtime fragment as neccessary
+     *
+     * @param spec the URL spec of this connection
+     * @param separatorIndex the index of the '!/' separator
+     * @param connectionURL the URL passed to the constructor
+     * @return a URL to the JAR file this connection reads from
+     *
+     * @throws MalformedURLException if a malformed URL is found
+     */
+    @SuppressWarnings("deprecation")
+    private static URL parseJarFileURL(String spec, int separatorIndex, URL connectionURL) throws MalformedURLException {
+
+        URL url = new URL(spec.substring(0, separatorIndex));
         /*
-         * The url argument may have had a runtime fragment appended, so
+         * The url passed to the constructor may have had a runtime fragment appended, so
          * we need to add a runtime fragment to the jarFileURL to enable
          * runtime versioning when the underlying jar file is opened.
          */
-        if ("runtime".equals(url.getRef())) {
-            @SuppressWarnings("deprecation")
-            var _unused2 = jarFileURL = new URL(jarFileURL, "#runtime");
+        if ("runtime".equals(connectionURL.getRef())) {
+            return new URL(url, "#runtime");
         }
-        entryName = null;
+        return url;
+    }
 
-        /* if ! is the last letter of the innerURL, entryName is null */
-        if (++separator != spec.length()) {
-            entryName = spec.substring(separator, spec.length());
-            entryName = ParseUtil.decode (entryName);
+    /**
+     * Parse the entry name (if any) of this JarURLConnection
+     *
+     * @param spec the URL spec of this connection
+     * @param separatorIndex the index of the '!/' separator
+     * @return the decoded entry name, or null if this URL has no entry name
+     */
+    private static String parseEntryName(String spec, int separatorIndex) {
+        // If the URL ends with the '!/' separator, entryName is null
+        int nameIndex = separatorIndex + 2;
+        if (nameIndex == spec.length()) {
+            return null;
+        } else {
+            String encodedName = spec.substring(nameIndex, spec.length());
+            return ParseUtil.decode(encodedName);
         }
     }
 

From 2e4d7d1846d846fd98201b9b3abeb7b91239a40d Mon Sep 17 00:00:00 2001
From: Damon Fenacci <dfenacci@openjdk.org>
Date: Wed, 26 Mar 2025 07:07:48 +0000
Subject: [PATCH 489/587] 8302459: Missing late inline cleanup causes
 compiler/vectorapi/VectorLogicalOpIdentityTest.java IR failure

Co-authored-by: Vladimir Ivanov <vlivanov@openjdk.org>
Reviewed-by: thartmann, vlivanov
---
 src/hotspot/share/opto/callGenerator.cpp      |   2 +-
 src/hotspot/share/opto/callnode.cpp           | 113 +++++++++++-------
 src/hotspot/share/opto/callnode.hpp           |   1 +
 src/hotspot/share/opto/compile.cpp            |  11 ++
 test/hotspot/jtreg/ProblemList.txt            |   1 -
 .../VectorGatherMaskFoldingTest.java          |  11 +-
 .../VectorLogicalOpIdentityTest.java          |   5 +-
 7 files changed, 93 insertions(+), 51 deletions(-)

diff --git a/src/hotspot/share/opto/callGenerator.cpp b/src/hotspot/share/opto/callGenerator.cpp
index ec7117e3568..5f010d5c427 100644
--- a/src/hotspot/share/opto/callGenerator.cpp
+++ b/src/hotspot/share/opto/callGenerator.cpp
@@ -470,7 +470,7 @@ class LateInlineVirtualCallGenerator : public VirtualCallGenerator {
   virtual void do_late_inline();
 
   virtual void set_callee_method(ciMethod* m) {
-    assert(_callee == nullptr, "repeated inlining attempt");
+    assert(_callee == nullptr || _callee == m, "repeated inline attempt with different callee");
     _callee = m;
   }
 
diff --git a/src/hotspot/share/opto/callnode.cpp b/src/hotspot/share/opto/callnode.cpp
index 68efabea15c..bb30dcb2976 100644
--- a/src/hotspot/share/opto/callnode.cpp
+++ b/src/hotspot/share/opto/callnode.cpp
@@ -1091,6 +1091,15 @@ void CallJavaNode::dump_compact_spec(outputStream* st) const {
 }
 #endif
 
+void CallJavaNode::register_for_late_inline() {
+  if (generator() != nullptr) {
+    Compile::current()->prepend_late_inline(generator());
+    set_generator(nullptr);
+  } else {
+    assert(false, "repeated inline attempt");
+  }
+}
+
 //=============================================================================
 uint CallStaticJavaNode::size_of() const { return sizeof(*this); }
 bool CallStaticJavaNode::cmp( const Node &n ) const {
@@ -1101,26 +1110,35 @@ bool CallStaticJavaNode::cmp( const Node &n ) const {
 Node* CallStaticJavaNode::Ideal(PhaseGVN* phase, bool can_reshape) {
   CallGenerator* cg = generator();
   if (can_reshape && cg != nullptr) {
-    assert(IncrementalInlineMH, "required");
-    assert(cg->call_node() == this, "mismatch");
-    assert(cg->is_mh_late_inline(), "not virtual");
+    if (cg->is_mh_late_inline()) {
+      assert(IncrementalInlineMH, "required");
+      assert(cg->call_node() == this, "mismatch");
+      assert(cg->method()->is_method_handle_intrinsic(), "required");
 
-    // Check whether this MH handle call becomes a candidate for inlining.
-    ciMethod* callee = cg->method();
-    vmIntrinsics::ID iid = callee->intrinsic_id();
-    if (iid == vmIntrinsics::_invokeBasic) {
-      if (in(TypeFunc::Parms)->Opcode() == Op_ConP) {
-        phase->C->prepend_late_inline(cg);
-        set_generator(nullptr);
+      // Check whether this MH handle call becomes a candidate for inlining.
+      ciMethod* callee = cg->method();
+      vmIntrinsics::ID iid = callee->intrinsic_id();
+      if (iid == vmIntrinsics::_invokeBasic) {
+        if (in(TypeFunc::Parms)->Opcode() == Op_ConP) {
+          register_for_late_inline();
+        }
+      } else if (iid == vmIntrinsics::_linkToNative) {
+        // never retry
+      } else {
+        assert(callee->has_member_arg(), "wrong type of call?");
+        if (in(TypeFunc::Parms + callee->arg_size() - 1)->Opcode() == Op_ConP) {
+          register_for_late_inline();
+          phase->C->inc_number_of_mh_late_inlines();
+        }
       }
-    } else if (iid == vmIntrinsics::_linkToNative) {
-      // never retry
     } else {
-      assert(callee->has_member_arg(), "wrong type of call?");
-      if (in(TypeFunc::Parms + callee->arg_size() - 1)->Opcode() == Op_ConP) {
-        phase->C->prepend_late_inline(cg);
-        set_generator(nullptr);
+      assert(IncrementalInline, "required");
+      assert(!cg->method()->is_method_handle_intrinsic(), "required");
+      if (phase->C->print_inlining()) {
+        phase->C->inline_printer()->record(cg->method(), cg->call_node()->jvms(), InliningResult::FAILURE,
+          "static call node changed: trying again");
       }
+      register_for_late_inline();
     }
   }
   return CallNode::Ideal(phase, can_reshape);
@@ -1189,39 +1207,46 @@ bool CallDynamicJavaNode::cmp( const Node &n ) const {
 Node* CallDynamicJavaNode::Ideal(PhaseGVN* phase, bool can_reshape) {
   CallGenerator* cg = generator();
   if (can_reshape && cg != nullptr) {
-    assert(IncrementalInlineVirtual, "required");
-    assert(cg->call_node() == this, "mismatch");
-    assert(cg->is_virtual_late_inline(), "not virtual");
+    if (cg->is_virtual_late_inline()) {
+      assert(IncrementalInlineVirtual, "required");
+      assert(cg->call_node() == this, "mismatch");
 
-    // Recover symbolic info for method resolution.
-    ciMethod* caller = jvms()->method();
-    ciBytecodeStream iter(caller);
-    iter.force_bci(jvms()->bci());
+      // Recover symbolic info for method resolution.
+      ciMethod* caller = jvms()->method();
+      ciBytecodeStream iter(caller);
+      iter.force_bci(jvms()->bci());
 
-    bool             not_used1;
-    ciSignature*     not_used2;
-    ciMethod*        orig_callee  = iter.get_method(not_used1, &not_used2);  // callee in the bytecode
-    ciKlass*         holder       = iter.get_declared_method_holder();
-    if (orig_callee->is_method_handle_intrinsic()) {
-      assert(_override_symbolic_info, "required");
-      orig_callee = method();
-      holder = method()->holder();
-    }
+      bool             not_used1;
+      ciSignature*     not_used2;
+      ciMethod*        orig_callee  = iter.get_method(not_used1, &not_used2);  // callee in the bytecode
+      ciKlass*         holder       = iter.get_declared_method_holder();
+      if (orig_callee->is_method_handle_intrinsic()) {
+        assert(_override_symbolic_info, "required");
+        orig_callee = method();
+        holder = method()->holder();
+      }
 
-    ciInstanceKlass* klass = ciEnv::get_instance_klass_for_declared_method_holder(holder);
+      ciInstanceKlass* klass = ciEnv::get_instance_klass_for_declared_method_holder(holder);
 
-    Node* receiver_node = in(TypeFunc::Parms);
-    const TypeOopPtr* receiver_type = phase->type(receiver_node)->isa_oopptr();
+      Node* receiver_node = in(TypeFunc::Parms);
+      const TypeOopPtr* receiver_type = phase->type(receiver_node)->isa_oopptr();
 
-    int  not_used3;
-    bool call_does_dispatch;
-    ciMethod* callee = phase->C->optimize_virtual_call(caller, klass, holder, orig_callee, receiver_type, true /*is_virtual*/,
-                                                       call_does_dispatch, not_used3);  // out-parameters
-    if (!call_does_dispatch) {
-      // Register for late inlining.
-      cg->set_callee_method(callee);
-      phase->C->prepend_late_inline(cg); // MH late inlining prepends to the list, so do the same
-      set_generator(nullptr);
+      int  not_used3;
+      bool call_does_dispatch;
+      ciMethod* callee = phase->C->optimize_virtual_call(caller, klass, holder, orig_callee, receiver_type, true /*is_virtual*/,
+                                                         call_does_dispatch, not_used3);  // out-parameters
+      if (!call_does_dispatch) {
+        // Register for late inlining.
+        cg->set_callee_method(callee);
+        register_for_late_inline(); // MH late inlining prepends to the list, so do the same
+      }
+    } else {
+      assert(IncrementalInline, "required");
+      if (phase->C->print_inlining()) {
+        phase->C->inline_printer()->record(cg->method(), cg->call_node()->jvms(), InliningResult::FAILURE,
+          "dynamic call node changed: trying again");
+      }
+      register_for_late_inline();
     }
   }
   return CallNode::Ideal(phase, can_reshape);
diff --git a/src/hotspot/share/opto/callnode.hpp b/src/hotspot/share/opto/callnode.hpp
index fc03ab5163b..db857d4c6d1 100644
--- a/src/hotspot/share/opto/callnode.hpp
+++ b/src/hotspot/share/opto/callnode.hpp
@@ -790,6 +790,7 @@ public:
   void  set_arg_escape(bool f)             { _arg_escape = f; }
   bool  arg_escape() const                 { return _arg_escape; }
   void copy_call_debug_info(PhaseIterGVN* phase, SafePointNode *sfpt);
+  void register_for_late_inline();
 
   DEBUG_ONLY( bool validate_symbolic_info() const; )
 
diff --git a/src/hotspot/share/opto/compile.cpp b/src/hotspot/share/opto/compile.cpp
index 56f57793fbb..8a059d0852f 100644
--- a/src/hotspot/share/opto/compile.cpp
+++ b/src/hotspot/share/opto/compile.cpp
@@ -2085,6 +2085,7 @@ bool Compile::inline_incrementally_one() {
   for (int i = 0; i < _late_inlines.length(); i++) {
     _late_inlines_pos = i+1;
     CallGenerator* cg = _late_inlines.at(i);
+    bool is_scheduled_for_igvn_before = C->igvn_worklist()->member(cg->call_node());
     bool does_dispatch = cg->is_virtual_late_inline() || cg->is_mh_late_inline();
     if (inlining_incrementally() || does_dispatch) { // a call can be either inlined or strength-reduced to a direct call
       cg->do_late_inline();
@@ -2095,6 +2096,16 @@ bool Compile::inline_incrementally_one() {
         _late_inlines_pos = i+1; // restore the position in case new elements were inserted
         print_method(PHASE_INCREMENTAL_INLINE_STEP, 3, cg->call_node());
         break; // process one call site at a time
+      } else {
+        bool is_scheduled_for_igvn_after = C->igvn_worklist()->member(cg->call_node());
+        if (!is_scheduled_for_igvn_before && is_scheduled_for_igvn_after) {
+          // Avoid potential infinite loop if node already in the IGVN list
+          assert(false, "scheduled for IGVN during inlining attempt");
+        } else {
+          // Ensure call node has not disappeared from IGVN worklist during a failed inlining attempt
+          assert(!is_scheduled_for_igvn_before || is_scheduled_for_igvn_after, "call node removed from IGVN list during inlining pass");
+          cg->call_node()->set_generator(cg);
+        }
       }
     } else {
       // Ignore late inline direct calls when inlining is not allowed.
diff --git a/test/hotspot/jtreg/ProblemList.txt b/test/hotspot/jtreg/ProblemList.txt
index 6dd35997cac..d76f4b2d95b 100644
--- a/test/hotspot/jtreg/ProblemList.txt
+++ b/test/hotspot/jtreg/ProblemList.txt
@@ -56,7 +56,6 @@ compiler/c2/irTests/TestDuplicateBackedge.java 8318904 generic-all
 compiler/codecache/jmx/PoolsIndependenceTest.java 8264632 macosx-all
 
 compiler/vectorapi/reshape/TestVectorReinterpret.java 8320897,8348519 aix-ppc64,linux-ppc64le,linux-s390x
-compiler/vectorapi/VectorLogicalOpIdentityTest.java 8302459 linux-x64,windows-x64
 compiler/vectorapi/VectorRebracket128Test.java 8330538 generic-all
 
 compiler/jvmci/TestUncaughtErrorInCompileMethod.java 8309073 generic-all
diff --git a/test/hotspot/jtreg/compiler/vectorapi/VectorGatherMaskFoldingTest.java b/test/hotspot/jtreg/compiler/vectorapi/VectorGatherMaskFoldingTest.java
index 88175baf8e4..7e16c5e5e86 100644
--- a/test/hotspot/jtreg/compiler/vectorapi/VectorGatherMaskFoldingTest.java
+++ b/test/hotspot/jtreg/compiler/vectorapi/VectorGatherMaskFoldingTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2024, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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 @@ import java.nio.ByteOrder;
 
 /**
  * @test
- * @bug 8325520
+ * @bug 8325520 8302459
  * @library /test/lib /
  * @summary Don't allow folding of Load/Store vectors when using incompatible indices or masks
  * @modules jdk.incubator.vector
@@ -1398,7 +1398,12 @@ public class VectorGatherMaskFoldingTest {
     public static void main(String[] args) {
         TestFramework testFramework = new TestFramework();
         testFramework.setDefaultWarmup(10000)
-                     .addFlags("--add-modules=jdk.incubator.vector", "-XX:+IgnoreUnrecognizedVMOptions", "-XX:+IncrementalInlineForceCleanup")
+                     .addFlags("--add-modules=jdk.incubator.vector")
                      .start();
+        testFramework = new TestFramework();
+        testFramework.setDefaultWarmup(10000)
+                     .addFlags("--add-modules=jdk.incubator.vector", "-XX:-TieredCompilation")
+                     .start();
+
     }
 }
diff --git a/test/hotspot/jtreg/compiler/vectorapi/VectorLogicalOpIdentityTest.java b/test/hotspot/jtreg/compiler/vectorapi/VectorLogicalOpIdentityTest.java
index 426dec67019..1a2402222ed 100644
--- a/test/hotspot/jtreg/compiler/vectorapi/VectorLogicalOpIdentityTest.java
+++ b/test/hotspot/jtreg/compiler/vectorapi/VectorLogicalOpIdentityTest.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, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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 @@ import jdk.test.lib.Utils;
 
 /**
  * @test
- * @bug 8288294
+ * @bug 8288294 8302459
  * @key randomness
  * @library /test/lib /
  * @summary Add identity transformations for vector logic operations
@@ -761,5 +761,6 @@ public class VectorLogicalOpIdentityTest {
 
     public static void main(String[] args) {
         TestFramework.runWithFlags("--add-modules=jdk.incubator.vector");
+        TestFramework.runWithFlags("--add-modules=jdk.incubator.vector", "-XX:-TieredCompilation");
     }
 }

From 45a9750b2c9364a05e00cdb935ef986c0a2c3e19 Mon Sep 17 00:00:00 2001
From: Fredrik Bredberg <fbredberg@openjdk.org>
Date: Wed, 26 Mar 2025 07:30:04 +0000
Subject: [PATCH 490/587] 8351655: Optimize
 ObjectMonitor::unlink_after_acquire()

Reviewed-by: pchilanomate, dholmes, coleenp
---
 src/hotspot/share/runtime/objectMonitor.cpp | 80 +++++++++++++++------
 src/hotspot/share/runtime/objectMonitor.hpp |  1 +
 2 files changed, 59 insertions(+), 22 deletions(-)

diff --git a/src/hotspot/share/runtime/objectMonitor.cpp b/src/hotspot/share/runtime/objectMonitor.cpp
index aff48edd7d9..e280de6baf1 100644
--- a/src/hotspot/share/runtime/objectMonitor.cpp
+++ b/src/hotspot/share/runtime/objectMonitor.cpp
@@ -1258,32 +1258,69 @@ void ObjectMonitor::vthread_epilog(JavaThread* current, ObjectWaiter* node) {
   }
 }
 
+// Convert entry_list into a doubly linked list by assigning the prev
+// pointers and the entry_list_tail pointer (if needed). Within the
+// entry_list the next pointers always form a consistent singly linked
+// list. When this function is called, the entry_list will be either
+// singly linked, or starting as singly linked (at the head), but
+// ending as doubly linked (at the tail).
+void ObjectMonitor::entry_list_build_dll(JavaThread* current) {
+  assert(has_owner(current), "invariant");
+  ObjectWaiter* prev = nullptr;
+  // Need acquire here to match the implicit release of the cmpxchg
+  // that updated entry_list, so we can access w->prev().
+  ObjectWaiter* w = Atomic::load_acquire(&_entry_list);
+  assert(w != nullptr, "should only be called when entry list is not empty");
+  while (w != nullptr) {
+    assert(w->TState == ObjectWaiter::TS_ENTER, "invariant");
+    assert(w->prev() == nullptr || w->prev() == prev, "invariant");
+    if (w->prev() != nullptr) {
+      break;
+    }
+    w->_prev = prev;
+    prev = w;
+    w = w->next();
+  }
+  if (w == nullptr) {
+    // We converted the entire entry_list from a singly linked list
+    // into a doubly linked list. Now we just need to set the tail
+    // pointer.
+    assert(prev != nullptr && prev->next() == nullptr, "invariant");
+    assert(_entry_list_tail == nullptr || _entry_list_tail == prev, "invariant");
+    _entry_list_tail = prev;
+  } else {
+#ifdef ASSERT
+    // We stopped iterating through the _entry_list when we found a
+    // node that had its prev pointer set. I.e. we converted the first
+    // part of the entry_list from a singly linked list into a doubly
+    // linked list. Now we just want to make sure the rest of the list
+    // is doubly linked. But first we check that we have a tail
+    // pointer, because if the end of the entry_list is doubly linked
+    // and we don't have the tail pointer, something is broken.
+    assert(_entry_list_tail != nullptr, "invariant");
+    while (w != nullptr) {
+      assert(w->TState == ObjectWaiter::TS_ENTER, "invariant");
+      assert(w->prev() == prev, "invariant");
+      prev = w;
+      w = w->next();
+    }
+    assert(_entry_list_tail == prev, "invariant");
+#endif
+  }
+}
+
 // Return the tail of the _entry_list. If the tail is currently not
-// known, find it by walking from the head of _entry_list, and while
-// doing so assign the _prev pointers to create a doubly linked list.
+// known, it can be found by first calling entry_list_build_dll().
 ObjectWaiter* ObjectMonitor::entry_list_tail(JavaThread* current) {
   assert(has_owner(current), "invariant");
   ObjectWaiter* w = _entry_list_tail;
   if (w != nullptr) {
     return w;
   }
-  // Need acquire here to match the implicit release of the cmpxchg
-  // that updated _entry_list, so we can access w->_next.
-  w = Atomic::load_acquire(&_entry_list);
+  entry_list_build_dll(current);
+  w = _entry_list_tail;
   assert(w != nullptr, "invariant");
-  if (w->next() == nullptr) {
-    _entry_list_tail = w;
-    return w;
-  }
-  ObjectWaiter* prev = nullptr;
-  while (w != nullptr) {
-    assert(w->TState == ObjectWaiter::TS_ENTER, "invariant");
-    w->_prev = prev;
-    prev = w;
-    w = w->next();
-  }
-  _entry_list_tail = prev;
-  return prev;
+  return w;
 }
 
 // By convention we unlink a contending thread from _entry_list
@@ -1317,9 +1354,9 @@ void ObjectMonitor::unlink_after_acquire(JavaThread* current, ObjectWaiter* curr
     if (currentNode->prev() == nullptr) {
       // Build the doubly linked list to get hold of
       // currentNode->prev().
-      _entry_list_tail = nullptr;
-      entry_list_tail(current);
+      entry_list_build_dll(current);
       assert(currentNode->prev() != nullptr, "must be");
+      assert(_entry_list_tail == currentNode, "must be");
     }
     // The currentNode is the last element in _entry_list and we know
     // which element is the previous one.
@@ -1363,8 +1400,7 @@ void ObjectMonitor::unlink_after_acquire(JavaThread* current, ObjectWaiter* curr
       }
     }
     // Build the doubly linked list to get hold of currentNode->prev().
-    _entry_list_tail = nullptr;
-    entry_list_tail(current);
+    entry_list_build_dll(current);
     assert(currentNode->prev() != nullptr, "must be");
   }
 
diff --git a/src/hotspot/share/runtime/objectMonitor.hpp b/src/hotspot/share/runtime/objectMonitor.hpp
index aa32b3cfbf1..54662ffab7b 100644
--- a/src/hotspot/share/runtime/objectMonitor.hpp
+++ b/src/hotspot/share/runtime/objectMonitor.hpp
@@ -402,6 +402,7 @@ class ObjectMonitor : public CHeapObj<mtObjectMonitor> {
   void      dequeue_specific_waiter(ObjectWaiter* waiter);
   void      enter_internal(JavaThread* current);
   void      reenter_internal(JavaThread* current, ObjectWaiter* current_node);
+  void      entry_list_build_dll(JavaThread* current);
   void      unlink_after_acquire(JavaThread* current, ObjectWaiter* current_node);
   ObjectWaiter* entry_list_tail(JavaThread* current);
 

From e32a0c90feb231d791e6c17e6360f629189cab8b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Jeli=C5=84ski?= <djelinski@openjdk.org>
Date: Wed, 26 Mar 2025 08:12:45 +0000
Subject: [PATCH 491/587] 8352706: httpclient HeadTest does not run on HTTP2

Co-authored-by: Daniel Fuchs <dfuchs@openjdk.org>
Reviewed-by: michaelm
---
 test/jdk/java/net/httpclient/HeadTest.java | 28 ++++++++++------------
 1 file changed, 12 insertions(+), 16 deletions(-)

diff --git a/test/jdk/java/net/httpclient/HeadTest.java b/test/jdk/java/net/httpclient/HeadTest.java
index a1d6d71791a..5b3b1671d43 100644
--- a/test/jdk/java/net/httpclient/HeadTest.java
+++ b/test/jdk/java/net/httpclient/HeadTest.java
@@ -86,22 +86,21 @@ public class HeadTest implements HttpServerAdapters {
     @DataProvider(name = "positive")
     public Object[][] positive() {
         return new Object[][] {
+                // HTTP/1.1
                 { httpURI, "GET", HTTP_NOT_MODIFIED, HTTP_1_1  },
                 { httpsURI, "GET", HTTP_NOT_MODIFIED, HTTP_1_1  },
-                { httpURI, "GET", HTTP_NOT_MODIFIED, HttpClient.Version.HTTP_2  },
-                { httpsURI, "GET", HTTP_NOT_MODIFIED, HttpClient.Version.HTTP_2  },
                 { httpURI, "HEAD", HTTP_OK, HTTP_1_1  },
                 { httpsURI, "HEAD", HTTP_OK, HTTP_1_1  },
-                { httpURI, "HEAD", HTTP_OK, HttpClient.Version.HTTP_2  },
-                { httpsURI, "HEAD", HTTP_OK, HttpClient.Version.HTTP_2  },
                 { httpURI + "transfer/", "GET", HTTP_NOT_MODIFIED, HTTP_1_1  },
                 { httpsURI + "transfer/", "GET", HTTP_NOT_MODIFIED, HTTP_1_1  },
-                { httpURI + "transfer/", "GET", HTTP_NOT_MODIFIED, HttpClient.Version.HTTP_2  },
-                { httpsURI + "transfer/", "GET", HTTP_NOT_MODIFIED, HttpClient.Version.HTTP_2  },
                 { httpURI + "transfer/", "HEAD", HTTP_OK, HTTP_1_1  },
                 { httpsURI + "transfer/", "HEAD", HTTP_OK, HTTP_1_1  },
-                { httpURI + "transfer/", "HEAD", HTTP_OK, HttpClient.Version.HTTP_2  },
-                { httpsURI + "transfer/", "HEAD", HTTP_OK, HttpClient.Version.HTTP_2  }
+                // HTTP/2
+                { http2URI, "GET", HTTP_NOT_MODIFIED, HttpClient.Version.HTTP_2  },
+                { https2URI, "GET", HTTP_NOT_MODIFIED, HttpClient.Version.HTTP_2  },
+                { http2URI, "HEAD", HTTP_OK, HttpClient.Version.HTTP_2  },
+                { https2URI, "HEAD", HTTP_OK, HttpClient.Version.HTTP_2  },
+                // HTTP2 forbids transfer-encoding
         };
     }
 
@@ -112,17 +111,13 @@ public class HeadTest implements HttpServerAdapters {
         URI uri = URI.create(uriString);
         HttpRequest.Builder requestBuilder = HttpRequest
                 .newBuilder(uri)
+                .version(version)
                 .method(method, HttpRequest.BodyPublishers.noBody());
-        if (version != null) {
-            requestBuilder.version(version);
-        }
         doTest(requestBuilder.build(), expResp);
         // repeat the test this time by building the request using convenience
         // GET and HEAD methods
-        requestBuilder = HttpRequest.newBuilder(uri);
-        if (version != null) {
-            requestBuilder.version(version);
-        }
+        requestBuilder = HttpRequest.newBuilder(uri)
+                .version(version);
         switch (method) {
             case "GET" -> requestBuilder.GET();
             case "HEAD" -> requestBuilder.HEAD();
@@ -146,6 +141,7 @@ public class HeadTest implements HttpServerAdapters {
         assertEquals(response.statusCode(), expResp);
         assertEquals(response.body(), "");
         assertEquals(response.headers().firstValue("Content-length").get(), CONTENT_LEN);
+        assertEquals(response.version(), request.version().get());
     }
 
     // -- Infrastructure
@@ -168,7 +164,7 @@ public class HeadTest implements HttpServerAdapters {
         http2TestServer = HttpTestServer.create(HTTP_2);
         http2TestServer.addHandler(new HeadHandler(), "/");
         http2URI = "http://" + http2TestServer.serverAuthority() + "/";
-        https2TestServer = HttpTestServer.create(HTTP_2, SSLContext.getDefault());
+        https2TestServer = HttpTestServer.create(HTTP_2, sslContext);
         https2TestServer.addHandler(new HeadHandler(), "/");
         https2URI = "https://" + https2TestServer.serverAuthority() + "/";
 

From eb6e8288c628577ce557266773ffebdf0bbe853a Mon Sep 17 00:00:00 2001
From: Kevin Walls <kevinw@openjdk.org>
Date: Wed, 26 Mar 2025 09:03:19 +0000
Subject: [PATCH 492/587] 8351002: com/sun/management/OperatingSystemMXBean
 cpuLoad tests fail intermittently

Reviewed-by: sspitsyn, lmesnik
---
 test/jdk/ProblemList.txt                      |  5 ++--
 .../GetProcessCpuLoad.java                    | 26 +++++++++++++----
 .../GetProcessCpuTime.java                    | 25 ++++++++++++----
 .../GetSystemCpuLoad.java                     | 29 +++++++++++++++----
 4 files changed, 65 insertions(+), 20 deletions(-)

diff --git a/test/jdk/ProblemList.txt b/test/jdk/ProblemList.txt
index d954b95b520..db2fbdb0411 100644
--- a/test/jdk/ProblemList.txt
+++ b/test/jdk/ProblemList.txt
@@ -536,9 +536,8 @@ java/io/IO/IO.java                                              8337935 linux-pp
 
 # jdk_management
 
-# First bug for AIX, second for Windows
-com/sun/management/OperatingSystemMXBean/GetProcessCpuLoad.java 8030957,8351002 aix-all,windows-all
-com/sun/management/OperatingSystemMXBean/GetSystemCpuLoad.java  8030957,8351002 aix-all,windows-all
+com/sun/management/OperatingSystemMXBean/GetProcessCpuLoad.java 8030957 aix-all
+com/sun/management/OperatingSystemMXBean/GetSystemCpuLoad.java  8030957 aix-all
 
 java/lang/management/MemoryMXBean/Pending.java                  8158837 generic-all
 java/lang/management/MemoryMXBean/PendingAllGC.sh               8158837 generic-all
diff --git a/test/jdk/com/sun/management/OperatingSystemMXBean/GetProcessCpuLoad.java b/test/jdk/com/sun/management/OperatingSystemMXBean/GetProcessCpuLoad.java
index ecb65b7b3ea..3ee847b28b1 100644
--- a/test/jdk/com/sun/management/OperatingSystemMXBean/GetProcessCpuLoad.java
+++ b/test/jdk/com/sun/management/OperatingSystemMXBean/GetProcessCpuLoad.java
@@ -25,23 +25,35 @@
  * @test
  * @bug     7028071
  * @summary Basic unit test of OperatingSystemMXBean.getProcessCpuLoad()
- *
+ * @library /test/lib
  * @run main GetProcessCpuLoad
  */
 
-import java.lang.management.*;
 import com.sun.management.OperatingSystemMXBean;
+import java.lang.management.*;
+import jdk.test.lib.Platform;
 
 public class GetProcessCpuLoad {
     public static void main(String[] argv) throws Exception {
         OperatingSystemMXBean mbean = (com.sun.management.OperatingSystemMXBean)
             ManagementFactory.getOperatingSystemMXBean();
+
+        Exception ex = null;
         double load;
-        for(int i=0; i<10; i++) {
+
+        for(int i = 0; i < 10; i++) {
             load = mbean.getProcessCpuLoad();
-            if(load<0.0 || load>1.0) {
+            if (load == -1.0 && Platform.isWindows()) {
+                // Some Windows 2019 systems can return -1 for the first few reads.
+                // Remember a -1 in case it never gets better.
+                ex = new RuntimeException("getProcessCpuLoad() returns " + load
+                     + " which is not in the [0.0,1.0] interval");
+            } else if (load < 0.0 || load > 1.0) {
                 throw new RuntimeException("getProcessCpuLoad() returns " + load
-                       +   " which is not in the [0.0,1.0] interval");
+                          + " which is not in the [0.0,1.0] interval");
+            } else {
+                // A good reading: forget any previous -1.
+                ex = null;
             }
             try {
                 Thread.sleep(200);
@@ -49,5 +61,9 @@ public class GetProcessCpuLoad {
                 e.printStackTrace();
             }
         }
+
+        if (ex != null) {
+            throw ex;
+        }
     }
 }
diff --git a/test/jdk/com/sun/management/OperatingSystemMXBean/GetProcessCpuTime.java b/test/jdk/com/sun/management/OperatingSystemMXBean/GetProcessCpuTime.java
index f65b2616ae9..95d7ac9cb5d 100644
--- a/test/jdk/com/sun/management/OperatingSystemMXBean/GetProcessCpuTime.java
+++ b/test/jdk/com/sun/management/OperatingSystemMXBean/GetProcessCpuTime.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@
  * @test
  * @bug     4858522
  * @summary Basic unit test of OperatingSystemMXBean.getProcessCpuTime()
+ * @library /test/lib
  * @author  Steve Bohne
  */
 
@@ -45,6 +46,7 @@
 
 import com.sun.management.OperatingSystemMXBean;
 import java.lang.management.*;
+import jdk.test.lib.Platform;
 
 public class GetProcessCpuTime {
 
@@ -55,9 +57,7 @@ public class GetProcessCpuTime {
 
     // Careful with these values.
     private static final long MIN_TIME_FOR_PASS = 1;
-    private static final long MAX_TIME_FOR_PASS = Long.MAX_VALUE;
-
-    // No max time.
+    private static final long MAX_TIME_FOR_PASS = Long.MAX_VALUE / 10_000_000;
 
     private static boolean trace = false;
 
@@ -74,9 +74,22 @@ public class GetProcessCpuTime {
         }
 
         long ns = mbean.getProcessCpuTime();
+        if (ns == -1 && Platform.isWindows()) {
+            // Some Windows 2019 systems can return -1 for the first few reads.
+            for (int i = 0; i < 10; i++) {
+                ns = mbean.getProcessCpuTime();
+                if (ns != -1) {
+                    break;
+                }
+                try {
+                    Thread.sleep(200);
+                } catch (InterruptedException e) {
+                    e.printStackTrace();
+                }
+            }
+        }
         if (ns == -1) {
-            System.out.println("getProcessCpuTime() is not supported");
-            return;
+            throw new RuntimeException("getProcessCpuTime() is not supported");
         }
 
         if (trace) {
diff --git a/test/jdk/com/sun/management/OperatingSystemMXBean/GetSystemCpuLoad.java b/test/jdk/com/sun/management/OperatingSystemMXBean/GetSystemCpuLoad.java
index 7bd9d162cb3..0501cbbcbd7 100644
--- a/test/jdk/com/sun/management/OperatingSystemMXBean/GetSystemCpuLoad.java
+++ b/test/jdk/com/sun/management/OperatingSystemMXBean/GetSystemCpuLoad.java
@@ -24,24 +24,37 @@
 /*
  * @test
  * @bug     7028071
- * @summary Basic unit test of OperatingSystemMXBean.getSystemCpuLoad()
- *
+ * @summary Basic unit test of OperatingSystemMXBean.getProcessCpuLoad()
+ * @library /test/lib
  * @run main GetSystemCpuLoad
  */
 
-import java.lang.management.*;
 import com.sun.management.OperatingSystemMXBean;
+import java.lang.management.*;
+import jdk.test.lib.Platform;
 
 public class GetSystemCpuLoad {
     public static void main(String[] argv) throws Exception {
         OperatingSystemMXBean mbean = (com.sun.management.OperatingSystemMXBean)
             ManagementFactory.getOperatingSystemMXBean();
+
+        Exception ex = null;
         double load;
-        for(int i=0; i<10; i++) {
+
+        for (int i = 0; i < 10; i++) {
             load = mbean.getSystemCpuLoad();
-            if(load<0.0 || load>1.0) {
+            if (load == -1.0 && Platform.isWindows()) {
+                // Some Windows 2019 systems can return -1 for the first few reads.
+                // Remember a -1 in case it never gets better.
+                ex = new RuntimeException("getSystemCpuLoad() returns " + load
+                         + " which is not in the [0.0,1.0] interval");
+
+            } else if (load < 0.0 || load > 1.0) {
                 throw new RuntimeException("getSystemCpuLoad() returns " + load
-                       +  " which is not in the [0.0,1.0] interval");
+                           + " which is not in the [0.0,1.0] interval");
+            } else {
+                // A good reading: forget any previous -1.
+                ex = null;
             }
             try {
                 Thread.sleep(200);
@@ -49,5 +62,9 @@ public class GetSystemCpuLoad {
                 e.printStackTrace();
             }
         }
+
+        if (ex != null) {
+            throw ex;
+        }
     }
 }

From ee710fec21c4e886769576c17ad6db2ab91a84b4 Mon Sep 17 00:00:00 2001
From: Aleksey Shipilev <shade@openjdk.org>
Date: Wed, 26 Mar 2025 09:23:45 +0000
Subject: [PATCH 493/587] 8345169: Implement JEP 503: Remove the 32-bit x86
 Port

Reviewed-by: ihse, mdoerr, vlivanov, kvn, coleenp, dholmes
---
 make/autoconf/basic.m4                        |     7 +-
 make/autoconf/platform.m4                     |    12 +-
 src/hotspot/cpu/x86/downcallLinker_x86_32.cpp |    42 -
 src/hotspot/cpu/x86/foreignGlobals_x86_32.cpp |    54 -
 .../x86/gc/shenandoah/shenandoah_x86_32.ad    |    71 -
 src/hotspot/cpu/x86/interpreterRT_x86_32.cpp  |   145 -
 .../cpu/x86/jniFastGetField_x86_32.cpp        |   323 -
 .../x86/macroAssembler_x86_32_constants.cpp   |    52 -
 .../cpu/x86/macroAssembler_x86_32_cos.cpp     |   427 -
 .../cpu/x86/macroAssembler_x86_32_exp.cpp     |   329 -
 .../cpu/x86/macroAssembler_x86_32_log.cpp     |   344 -
 .../cpu/x86/macroAssembler_x86_32_log10.cpp   |   357 -
 .../cpu/x86/macroAssembler_x86_32_pow.cpp     |  1855 ---
 .../cpu/x86/macroAssembler_x86_32_sin.cpp     |  1742 --
 .../cpu/x86/macroAssembler_x86_32_tan.cpp     |  1172 --
 src/hotspot/cpu/x86/sharedRuntime_x86_32.cpp  |  2854 ----
 src/hotspot/cpu/x86/stubGenerator_x86_32.cpp  |  4314 -----
 src/hotspot/cpu/x86/stubRoutines_x86_32.cpp   |    41 -
 .../templateInterpreterGenerator_x86_32.cpp   |   509 -
 src/hotspot/cpu/x86/upcallLinker_x86_32.cpp   |    33 -
 src/hotspot/cpu/x86/vtableStubs_x86_32.cpp    |   265 -
 src/hotspot/cpu/x86/x86_32.ad                 | 13702 ----------------
 src/hotspot/os_cpu/bsd_x86/bsd_x86_32.S       |   525 -
 src/hotspot/os_cpu/linux_x86/linux_x86_32.S   |   518 -
 .../os_cpu/linux_x86/safefetch_linux_x86_32.S |    41 -
 25 files changed, 5 insertions(+), 29729 deletions(-)
 delete mode 100644 src/hotspot/cpu/x86/downcallLinker_x86_32.cpp
 delete mode 100644 src/hotspot/cpu/x86/foreignGlobals_x86_32.cpp
 delete mode 100644 src/hotspot/cpu/x86/gc/shenandoah/shenandoah_x86_32.ad
 delete mode 100644 src/hotspot/cpu/x86/interpreterRT_x86_32.cpp
 delete mode 100644 src/hotspot/cpu/x86/jniFastGetField_x86_32.cpp
 delete mode 100644 src/hotspot/cpu/x86/macroAssembler_x86_32_constants.cpp
 delete mode 100644 src/hotspot/cpu/x86/macroAssembler_x86_32_cos.cpp
 delete mode 100644 src/hotspot/cpu/x86/macroAssembler_x86_32_exp.cpp
 delete mode 100644 src/hotspot/cpu/x86/macroAssembler_x86_32_log.cpp
 delete mode 100644 src/hotspot/cpu/x86/macroAssembler_x86_32_log10.cpp
 delete mode 100644 src/hotspot/cpu/x86/macroAssembler_x86_32_pow.cpp
 delete mode 100644 src/hotspot/cpu/x86/macroAssembler_x86_32_sin.cpp
 delete mode 100644 src/hotspot/cpu/x86/macroAssembler_x86_32_tan.cpp
 delete mode 100644 src/hotspot/cpu/x86/sharedRuntime_x86_32.cpp
 delete mode 100644 src/hotspot/cpu/x86/stubGenerator_x86_32.cpp
 delete mode 100644 src/hotspot/cpu/x86/stubRoutines_x86_32.cpp
 delete mode 100644 src/hotspot/cpu/x86/templateInterpreterGenerator_x86_32.cpp
 delete mode 100644 src/hotspot/cpu/x86/upcallLinker_x86_32.cpp
 delete mode 100644 src/hotspot/cpu/x86/vtableStubs_x86_32.cpp
 delete mode 100644 src/hotspot/cpu/x86/x86_32.ad
 delete mode 100644 src/hotspot/os_cpu/bsd_x86/bsd_x86_32.S
 delete mode 100644 src/hotspot/os_cpu/linux_x86/linux_x86_32.S
 delete mode 100644 src/hotspot/os_cpu/linux_x86/safefetch_linux_x86_32.S

diff --git a/make/autoconf/basic.m4 b/make/autoconf/basic.m4
index 19e6641b94d..6daba35547b 100644
--- a/make/autoconf/basic.m4
+++ b/make/autoconf/basic.m4
@@ -75,10 +75,11 @@ AC_DEFUN_ONCE([BASIC_SETUP_PATHS],
     AC_MSG_NOTICE([Rewriting ORIGINAL_PATH to $REWRITTEN_PATH])
   fi
 
+  if test "x$OPENJDK_TARGET_CPU" = xx86 && test "x$with_jvm_variants" != xzero; then
+    AC_MSG_ERROR([32-bit x86 builds are not supported])
+  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/platform.m4 b/make/autoconf/platform.m4
index 937d8c37927..31451d0c37f 100644
--- a/make/autoconf/platform.m4
+++ b/make/autoconf/platform.m4
@@ -666,17 +666,7 @@ 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@:>@])])
-  # Unfortunately, variants have not been parsed yet, so we have to check the configure option
-  # directly. Allow only the directly specified Zero variant, treat any other mix as containing
-  # something non-Zero.
-  if test "x$OPENJDK_TARGET_CPU" = xx86 && test "x$with_jvm_variants" != xzero; then
-    if test "x$enable_deprecated_ports" = "xyes"; then
-      AC_MSG_WARN([The 32-bit 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
+  # There are no deprecated ports. Implement the deprecation warnings here.
 ])
 
 AC_DEFUN_ONCE([PLATFORM_SETUP_OPENJDK_BUILD_OS_VERSION],
diff --git a/src/hotspot/cpu/x86/downcallLinker_x86_32.cpp b/src/hotspot/cpu/x86/downcallLinker_x86_32.cpp
deleted file mode 100644
index 3c7d93fc79e..00000000000
--- a/src/hotspot/cpu/x86/downcallLinker_x86_32.cpp
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright (c) 2020, 2025, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please 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 "prims/downcallLinker.hpp"
-
-RuntimeStub* DowncallLinker::make_downcall_stub(BasicType* signature,
-                                                int num_args,
-                                                BasicType ret_bt,
-                                                const ABIDescriptor& abi,
-                                                const GrowableArray<VMStorage>& input_registers,
-                                                const GrowableArray<VMStorage>& output_registers,
-                                                bool needs_return_buffer,
-                                                int captured_state_mask,
-                                                bool needs_transition) {
-  Unimplemented();
-  return nullptr;
-}
-
-void DowncallLinker::StubGenerator::pd_add_offset_to_oop(VMStorage reg_oop, VMStorage reg_offset,
-                                                         VMStorage tmp1, VMStorage tmp2) const {
-  Unimplemented();
-}
diff --git a/src/hotspot/cpu/x86/foreignGlobals_x86_32.cpp b/src/hotspot/cpu/x86/foreignGlobals_x86_32.cpp
deleted file mode 100644
index 18aa454e61c..00000000000
--- a/src/hotspot/cpu/x86/foreignGlobals_x86_32.cpp
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright (c) 2022, 2025, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please 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 "code/vmreg.hpp"
-#include "prims/foreignGlobals.hpp"
-#include "utilities/debug.hpp"
-
-class MacroAssembler;
-
-bool ForeignGlobals::is_foreign_linker_supported() {
-  return false;
-}
-
-const ABIDescriptor ForeignGlobals::parse_abi_descriptor(jobject jabi) {
-  Unimplemented();
-  return {};
-}
-
-int RegSpiller::pd_reg_size(VMStorage reg) {
-  Unimplemented();
-  return -1;
-}
-
-void RegSpiller::pd_store_reg(MacroAssembler* masm, int offset, VMStorage reg) {
-  Unimplemented();
-}
-
-void RegSpiller::pd_load_reg(MacroAssembler* masm, int offset, VMStorage reg) {
-  Unimplemented();
-}
-
-void ArgumentShuffle::pd_generate(MacroAssembler* masm, VMStorage tmp, int in_stk_bias, int out_stk_bias) const {
-  Unimplemented();
-}
diff --git a/src/hotspot/cpu/x86/gc/shenandoah/shenandoah_x86_32.ad b/src/hotspot/cpu/x86/gc/shenandoah/shenandoah_x86_32.ad
deleted file mode 100644
index 3cf82bf9fb1..00000000000
--- a/src/hotspot/cpu/x86/gc/shenandoah/shenandoah_x86_32.ad
+++ /dev/null
@@ -1,71 +0,0 @@
-//
-// Copyright (c) 2018, 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.
-//
-//
-
-source_hpp %{
-#include "gc/shenandoah/shenandoahBarrierSetAssembler.hpp"
-#include "gc/shenandoah/c2/shenandoahSupport.hpp"
-%}
-
-instruct compareAndSwapP_shenandoah(rRegI res,
-                                    memory mem_ptr,
-                                    eRegP tmp1, eRegP tmp2,
-                                    eAXRegP oldval, eRegP newval,
-                                    eFlagsReg cr)
-%{
-  match(Set res (ShenandoahCompareAndSwapP mem_ptr (Binary oldval newval)));
-  match(Set res (ShenandoahWeakCompareAndSwapP mem_ptr (Binary oldval newval)));
-  effect(TEMP tmp1, TEMP tmp2, KILL cr, KILL oldval);
-
-  format %{ "shenandoah_cas_oop $mem_ptr,$newval" %}
-
-  ins_encode %{
-    ShenandoahBarrierSet::assembler()->cmpxchg_oop(masm,
-                                                   $res$$Register, $mem_ptr$$Address, $oldval$$Register, $newval$$Register,
-                                                   false, // swap
-                                                   $tmp1$$Register, $tmp2$$Register
-                                                   );
-  %}
-  ins_pipe( pipe_cmpxchg );
-%}
-
-instruct compareAndExchangeP_shenandoah(memory mem_ptr,
-                                        eAXRegP oldval, eRegP newval,
-                                        eRegP tmp1, eRegP tmp2,
-                                        eFlagsReg cr)
-%{
-  match(Set oldval (ShenandoahCompareAndExchangeP mem_ptr (Binary oldval newval)));
-  effect(KILL cr, TEMP tmp1, TEMP tmp2);
-  ins_cost(1000);
-
-  format %{ "shenandoah_cas_oop $mem_ptr,$newval" %}
-
-  ins_encode %{
-    ShenandoahBarrierSet::assembler()->cmpxchg_oop(masm,
-                                                   noreg, $mem_ptr$$Address, $oldval$$Register, $newval$$Register,
-                                                   true,  // exchange
-                                                   $tmp1$$Register, $tmp2$$Register
-                                                   );
-  %}
-  ins_pipe( pipe_cmpxchg );
-%}
diff --git a/src/hotspot/cpu/x86/interpreterRT_x86_32.cpp b/src/hotspot/cpu/x86/interpreterRT_x86_32.cpp
deleted file mode 100644
index 14f11596924..00000000000
--- a/src/hotspot/cpu/x86/interpreterRT_x86_32.cpp
+++ /dev/null
@@ -1,145 +0,0 @@
-/*
- * Copyright (c) 1998, 2025, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please 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 "interpreter/interp_masm.hpp"
-#include "interpreter/interpreter.hpp"
-#include "interpreter/interpreterRuntime.hpp"
-#include "memory/allocation.inline.hpp"
-#include "oops/method.hpp"
-#include "oops/oop.inline.hpp"
-#include "runtime/handles.inline.hpp"
-#include "runtime/icache.hpp"
-#include "runtime/interfaceSupport.inline.hpp"
-#include "runtime/signature.hpp"
-
-
-#define __ _masm->
-
-
-// Implementation of SignatureHandlerGenerator
-InterpreterRuntime::SignatureHandlerGenerator::SignatureHandlerGenerator(const methodHandle& method, CodeBuffer* buffer) :
-    NativeSignatureIterator(method) {
-  _masm = new MacroAssembler(buffer);
-}
-
-void InterpreterRuntime::SignatureHandlerGenerator::pass_int() {
-  move(offset(), jni_offset() + 1);
-}
-
-void InterpreterRuntime::SignatureHandlerGenerator::pass_float() {
-  move(offset(), jni_offset() + 1);
-}
-
-void InterpreterRuntime::SignatureHandlerGenerator::pass_long() {
-   move(offset(), jni_offset() + 2);
-   move(offset() + 1, jni_offset() + 1);
-}
-
-void InterpreterRuntime::SignatureHandlerGenerator::pass_object() {
-  box (offset(), jni_offset() + 1);
-}
-
-void InterpreterRuntime::SignatureHandlerGenerator::move(int from_offset, int to_offset) {
-  __ movl(temp(), Address(from(), Interpreter::local_offset_in_bytes(from_offset)));
-  __ movl(Address(to(), to_offset * wordSize), temp());
-}
-
-
-void InterpreterRuntime::SignatureHandlerGenerator::box(int from_offset, int to_offset) {
-  __ lea(temp(), Address(from(), Interpreter::local_offset_in_bytes(from_offset)));
-  __ cmpptr(Address(from(), Interpreter::local_offset_in_bytes(from_offset)), NULL_WORD); // do not use temp() to avoid AGI
-  Label L;
-  __ jcc(Assembler::notZero, L);
-  __ movptr(temp(), NULL_WORD);
-  __ bind(L);
-  __ movptr(Address(to(), to_offset * wordSize), temp());
-}
-
-
-void InterpreterRuntime::SignatureHandlerGenerator::generate( uint64_t fingerprint) {
-  // generate code to handle arguments
-  iterate(fingerprint);
-  // return result handler
-  __ lea(rax,
-         ExternalAddress((address)Interpreter::result_handler(method()->result_type())));
-  // return
-  __ ret(0);
-  __ flush();
-}
-
-
-Register InterpreterRuntime::SignatureHandlerGenerator::from()       { return rdi; }
-Register InterpreterRuntime::SignatureHandlerGenerator::to()         { return rsp; }
-Register InterpreterRuntime::SignatureHandlerGenerator::temp()       { return rcx; }
-
-
-// Implementation of SignatureHandlerLibrary
-
-void SignatureHandlerLibrary::pd_set_handler(address handler) {}
-
-class SlowSignatureHandler: public NativeSignatureIterator {
- private:
-  address   _from;
-  intptr_t* _to;
-
-  virtual void pass_int() {
-    *_to++ = *(jint *)(_from+Interpreter::local_offset_in_bytes(0));
-    _from -= Interpreter::stackElementSize;
-  }
-
-  virtual void pass_float() {
-    *_to++ = *(jint *)(_from+Interpreter::local_offset_in_bytes(0));
-    _from -= Interpreter::stackElementSize;
-  }
-
-  virtual void pass_long() {
-    _to[0] = *(intptr_t*)(_from+Interpreter::local_offset_in_bytes(1));
-    _to[1] = *(intptr_t*)(_from+Interpreter::local_offset_in_bytes(0));
-    _to += 2;
-    _from -= 2*Interpreter::stackElementSize;
-  }
-
-  virtual void pass_object() {
-    // pass address of from
-    intptr_t from_addr = (intptr_t)(_from + Interpreter::local_offset_in_bytes(0));
-    *_to++ = (*(intptr_t*)from_addr == 0) ? NULL_WORD : from_addr;
-    _from -= Interpreter::stackElementSize;
-   }
-
- public:
-  SlowSignatureHandler(const methodHandle& method, address from, intptr_t* to) :
-    NativeSignatureIterator(method) {
-    _from = from;
-    _to   = to + (is_static() ? 2 : 1);
-  }
-};
-
-JRT_ENTRY(address, InterpreterRuntime::slow_signature_handler(JavaThread* current, Method* method, intptr_t* from, intptr_t* to))
-  methodHandle m(current, (Method*)method);
-  assert(m->is_native(), "sanity check");
-  // handle arguments
-  SlowSignatureHandler(m, (address)from, to + 1).iterate((uint64_t)CONST64(-1));
-  // return result handler
-  return Interpreter::result_handler(m->result_type());
-JRT_END
diff --git a/src/hotspot/cpu/x86/jniFastGetField_x86_32.cpp b/src/hotspot/cpu/x86/jniFastGetField_x86_32.cpp
deleted file mode 100644
index eee82a5c682..00000000000
--- a/src/hotspot/cpu/x86/jniFastGetField_x86_32.cpp
+++ /dev/null
@@ -1,323 +0,0 @@
-/*
- * Copyright (c) 2004, 2025, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please 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 "asm/macroAssembler.hpp"
-#include "memory/resourceArea.hpp"
-#include "prims/jniFastGetField.hpp"
-#include "prims/jvm_misc.hpp"
-#include "prims/jvmtiExport.hpp"
-#include "runtime/os.inline.hpp"
-#include "runtime/safepoint.hpp"
-#include "runtime/stubRoutines.hpp"
-
-#define __ masm->
-
-#define BUFFER_SIZE 30
-
-// Instead of issuing lfence for LoadLoad barrier, we create data dependency
-// between loads, which is much more efficient than lfence.
-
-address JNI_FastGetField::generate_fast_get_int_field0(BasicType type) {
-  const char *name = nullptr;
-  switch (type) {
-    case T_BOOLEAN: name = "jni_fast_GetBooleanField"; break;
-    case T_BYTE:    name = "jni_fast_GetByteField";    break;
-    case T_CHAR:    name = "jni_fast_GetCharField";    break;
-    case T_SHORT:   name = "jni_fast_GetShortField";   break;
-    case T_INT:     name = "jni_fast_GetIntField";     break;
-    default:        ShouldNotReachHere();
-  }
-  ResourceMark rm;
-  BufferBlob* blob = BufferBlob::create(name, BUFFER_SIZE*wordSize);
-  CodeBuffer cbuf(blob);
-  MacroAssembler* masm = new MacroAssembler(&cbuf);
-  address fast_entry = __ pc();
-
-  Label slow;
-
-  // stack layout:    offset from rsp (in words):
-  //  return pc        0
-  //  jni env          1
-  //  obj              2
-  //  jfieldID         3
-
-  ExternalAddress counter(SafepointSynchronize::safepoint_counter_addr());
-  __ mov32 (rcx, counter);
-  __ testb (rcx, 1);
-  __ jcc (Assembler::notZero, slow);
-
-  if (JvmtiExport::can_post_field_access()) {
-    // Check to see if a field access watch has been set before we
-    // take the fast path.
-    __ cmp32(ExternalAddress((address) JvmtiExport::get_field_access_count_addr()), 0);
-    __ jcc(Assembler::notZero, slow);
-  }
-
-  __ mov(rax, rcx);
-  __ andptr(rax, 1);                         // rax, must end up 0
-  __ movptr(rdx, Address(rsp, rax, Address::times_1, 2*wordSize));
-                                            // obj, notice rax, is 0.
-                                            // rdx is data dependent on rcx.
-  __ movptr(rax, Address(rsp, 3*wordSize));  // jfieldID
-
-  __ clear_jobject_tag(rdx);
-
-  __ movptr(rdx, Address(rdx, 0));           // *obj
-  __ shrptr (rax, 2);                         // offset
-
-  assert(count < LIST_CAPACITY, "LIST_CAPACITY too small");
-  speculative_load_pclist[count] = __ pc();
-  switch (type) {
-    case T_BOOLEAN: __ movzbl (rax, Address(rdx, rax, Address::times_1)); break;
-    case T_BYTE:    __ movsbl (rax, Address(rdx, rax, Address::times_1)); break;
-    case T_CHAR:    __ movzwl (rax, Address(rdx, rax, Address::times_1)); break;
-    case T_SHORT:   __ movswl (rax, Address(rdx, rax, Address::times_1)); break;
-    case T_INT:     __ movl   (rax, Address(rdx, rax, Address::times_1)); break;
-    default:        ShouldNotReachHere();
-  }
-
-  Address ca1;
-  __ lea(rdx, counter);
-  __ xorptr(rdx, rax);
-  __ xorptr(rdx, rax);
-  __ cmp32(rcx, Address(rdx, 0));
-  // ca1 is the same as ca because
-  // rax, ^ counter_addr ^ rax, = address
-  // ca1 is data dependent on rax,.
-  __ jcc (Assembler::notEqual, slow);
-
-  __ ret (0);
-
-  slowcase_entry_pclist[count++] = __ pc();
-  __ bind (slow);
-  address slow_case_addr = nullptr;
-  switch (type) {
-    case T_BOOLEAN: slow_case_addr = jni_GetBooleanField_addr(); break;
-    case T_BYTE:    slow_case_addr = jni_GetByteField_addr();    break;
-    case T_CHAR:    slow_case_addr = jni_GetCharField_addr();    break;
-    case T_SHORT:   slow_case_addr = jni_GetShortField_addr();   break;
-    case T_INT:     slow_case_addr = jni_GetIntField_addr();     break;
-    default:        ShouldNotReachHere();
-  }
-  // tail call
-  __ jump (RuntimeAddress(slow_case_addr));
-
-  __ flush ();
-
-  return fast_entry;
-}
-
-address JNI_FastGetField::generate_fast_get_boolean_field() {
-  return generate_fast_get_int_field0(T_BOOLEAN);
-}
-
-address JNI_FastGetField::generate_fast_get_byte_field() {
-  return generate_fast_get_int_field0(T_BYTE);
-}
-
-address JNI_FastGetField::generate_fast_get_char_field() {
-  return generate_fast_get_int_field0(T_CHAR);
-}
-
-address JNI_FastGetField::generate_fast_get_short_field() {
-  return generate_fast_get_int_field0(T_SHORT);
-}
-
-address JNI_FastGetField::generate_fast_get_int_field() {
-  return generate_fast_get_int_field0(T_INT);
-}
-
-address JNI_FastGetField::generate_fast_get_long_field() {
-  const char *name = "jni_fast_GetLongField";
-  ResourceMark rm;
-  BufferBlob* blob = BufferBlob::create(name, BUFFER_SIZE*wordSize);
-  CodeBuffer cbuf(blob);
-  MacroAssembler* masm = new MacroAssembler(&cbuf);
-  address fast_entry = __ pc();
-
-  Label slow;
-
-  // stack layout:    offset from rsp (in words):
-  //  old rsi          0
-  //  return pc        1
-  //  jni env          2
-  //  obj              3
-  //  jfieldID         4
-
-  ExternalAddress counter(SafepointSynchronize::safepoint_counter_addr());
-
-  __ push  (rsi);
-  __ mov32 (rcx, counter);
-  __ testb (rcx, 1);
-  __ jcc (Assembler::notZero, slow);
-
-  if (JvmtiExport::can_post_field_access()) {
-    // Check to see if a field access watch has been set before we
-    // take the fast path.
-    __ cmp32(ExternalAddress((address) JvmtiExport::get_field_access_count_addr()), 0);
-    __ jcc(Assembler::notZero, slow);
-  }
-
-  __ mov(rax, rcx);
-  __ andptr(rax, 1);                         // rax, must end up 0
-  __ movptr(rdx, Address(rsp, rax, Address::times_1, 3*wordSize));
-                                            // obj, notice rax, is 0.
-                                            // rdx is data dependent on rcx.
-  __ movptr(rsi, Address(rsp, 4*wordSize));  // jfieldID
-
-  __ clear_jobject_tag(rdx);
-
-  __ movptr(rdx, Address(rdx, 0));           // *obj
-  __ shrptr(rsi, 2);                         // offset
-
-  assert(count < LIST_CAPACITY-1, "LIST_CAPACITY too small");
-  speculative_load_pclist[count++] = __ pc();
-  __ movptr(rax, Address(rdx, rsi, Address::times_1));
-  speculative_load_pclist[count] = __ pc();
-  __ movl(rdx, Address(rdx, rsi, Address::times_1, 4));
-
-  __ lea(rsi, counter);
-  __ xorptr(rsi, rdx);
-  __ xorptr(rsi, rax);
-  __ xorptr(rsi, rdx);
-  __ xorptr(rsi, rax);
-  __ cmp32(rcx, Address(rsi, 0));
-  // ca1 is the same as ca because
-  // rax, ^ rdx ^ counter_addr ^ rax, ^ rdx = address
-  // ca1 is data dependent on both rax, and rdx.
-  __ jcc (Assembler::notEqual, slow);
-
-  __ pop (rsi);
-
-  __ ret (0);
-
-  slowcase_entry_pclist[count-1] = __ pc();
-  slowcase_entry_pclist[count++] = __ pc();
-  __ bind (slow);
-  __ pop  (rsi);
-  address slow_case_addr = jni_GetLongField_addr();;
-  // tail call
-  __ jump (RuntimeAddress(slow_case_addr));
-
-  __ flush ();
-
-  return fast_entry;
-}
-
-address JNI_FastGetField::generate_fast_get_float_field0(BasicType type) {
-  const char *name = nullptr;
-  switch (type) {
-    case T_FLOAT:  name = "jni_fast_GetFloatField";  break;
-    case T_DOUBLE: name = "jni_fast_GetDoubleField"; break;
-    default:       ShouldNotReachHere();
-  }
-  ResourceMark rm;
-  BufferBlob* blob = BufferBlob::create(name, BUFFER_SIZE*wordSize);
-  CodeBuffer cbuf(blob);
-  MacroAssembler* masm = new MacroAssembler(&cbuf);
-  address fast_entry = __ pc();
-
-  Label slow_with_pop, slow;
-
-  // stack layout:    offset from rsp (in words):
-  //  return pc        0
-  //  jni env          1
-  //  obj              2
-  //  jfieldID         3
-
-  ExternalAddress counter(SafepointSynchronize::safepoint_counter_addr());
-
-  __ mov32 (rcx, counter);
-  __ testb (rcx, 1);
-  __ jcc (Assembler::notZero, slow);
-
-  if (JvmtiExport::can_post_field_access()) {
-    // Check to see if a field access watch has been set before we
-    // take the fast path.
-    __ cmp32(ExternalAddress((address) JvmtiExport::get_field_access_count_addr()), 0);
-    __ jcc(Assembler::notZero, slow);
-  }
-
-  __ mov(rax, rcx);
-  __ andptr(rax, 1);                         // rax, must end up 0
-  __ movptr(rdx, Address(rsp, rax, Address::times_1, 2*wordSize));
-                                            // obj, notice rax, is 0.
-                                            // rdx is data dependent on rcx.
-  __ movptr(rax, Address(rsp, 3*wordSize));  // jfieldID
-
-  __ clear_jobject_tag(rdx);
-
-  __ movptr(rdx, Address(rdx, 0));           // *obj
-  __ shrptr(rax, 2);                         // offset
-
-  assert(count < LIST_CAPACITY, "LIST_CAPACITY too small");
-  speculative_load_pclist[count] = __ pc();
-  switch (type) {
-    case T_FLOAT:  __ fld_s (Address(rdx, rax, Address::times_1)); break;
-    case T_DOUBLE: __ fld_d (Address(rdx, rax, Address::times_1)); break;
-    default:       ShouldNotReachHere();
-  }
-
-  Address ca1;
-  __ fst_s (Address(rsp, -4));
-  __ lea(rdx, counter);
-  __ movl (rax, Address(rsp, -4));
-  // garbage hi-order bits on 64bit are harmless.
-  __ xorptr(rdx, rax);
-  __ xorptr(rdx, rax);
-  __ cmp32(rcx, Address(rdx, 0));
-  // rax, ^ counter_addr ^ rax, = address
-  // ca1 is data dependent on the field
-  // access.
-  __ jcc (Assembler::notEqual, slow_with_pop);
-
-  __ ret (0);
-
-  __ bind (slow_with_pop);
-  // invalid load. pop FPU stack.
-  __ fstp_d (0);
-
-  slowcase_entry_pclist[count++] = __ pc();
-  __ bind (slow);
-  address slow_case_addr = nullptr;
-  switch (type) {
-    case T_FLOAT:  slow_case_addr = jni_GetFloatField_addr();  break;
-    case T_DOUBLE: slow_case_addr = jni_GetDoubleField_addr(); break;
-    default:       ShouldNotReachHere();
-  }
-  // tail call
-  __ jump (RuntimeAddress(slow_case_addr));
-
-  __ flush ();
-
-  return fast_entry;
-}
-
-address JNI_FastGetField::generate_fast_get_float_field() {
-  return generate_fast_get_float_field0(T_FLOAT);
-}
-
-address JNI_FastGetField::generate_fast_get_double_field() {
-  return generate_fast_get_float_field0(T_DOUBLE);
-}
diff --git a/src/hotspot/cpu/x86/macroAssembler_x86_32_constants.cpp b/src/hotspot/cpu/x86/macroAssembler_x86_32_constants.cpp
deleted file mode 100644
index 6fdda4c2f71..00000000000
--- a/src/hotspot/cpu/x86/macroAssembler_x86_32_constants.cpp
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright (c) 2022, 2025, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please 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 "macroAssembler_x86.hpp"
-
-ATTRIBUTE_ALIGNED(16) static const juint _ONES[] = {
-    0x00000000UL, 0x3ff00000UL, 0x00000000UL, 0xbff00000UL
-};
-address MacroAssembler::ONES = (address)_ONES;
-
-ATTRIBUTE_ALIGNED(16) static const juint _PI4_INV[] = {
-    0x6dc9c883UL, 0x3ff45f30UL
-};
-address MacroAssembler::PI4_INV = (address)_PI4_INV;
-
-ATTRIBUTE_ALIGNED(16) static const juint _PI4X3[] = {
-    0x54443000UL, 0xbfe921fbUL, 0x3b39a000UL, 0x3d373dcbUL, 0xe0e68948UL,
-    0xba845c06UL
-};
-address MacroAssembler::PI4X3 = (address)_PI4X3;
-
-ATTRIBUTE_ALIGNED(16) static const juint _PI4X4[] = {
-    0x54400000UL, 0xbfe921fbUL, 0x1a600000UL, 0xbdc0b461UL, 0x2e000000UL,
-    0xbb93198aUL, 0x252049c1UL, 0xb96b839aUL
-};
-address MacroAssembler::PI4X4 = (address)_PI4X4;
-
-ATTRIBUTE_ALIGNED(16) static const juint _L_2IL0FLOATPACKET_0[] = {
-    0xffffffffUL, 0x7fffffffUL, 0x00000000UL, 0x00000000UL
-};
-address MacroAssembler::L_2IL0FLOATPACKET_0 = (address)_L_2IL0FLOATPACKET_0;
diff --git a/src/hotspot/cpu/x86/macroAssembler_x86_32_cos.cpp b/src/hotspot/cpu/x86/macroAssembler_x86_32_cos.cpp
deleted file mode 100644
index dce16756a66..00000000000
--- a/src/hotspot/cpu/x86/macroAssembler_x86_32_cos.cpp
+++ /dev/null
@@ -1,427 +0,0 @@
-/*
-* Copyright (c) 2016, 2021, Intel Corporation. All rights reserved.
-* Intel Math Library (LIBM) Source Code
-*
-* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-*
-* This code is free software; you can redistribute it and/or modify it
-* under the terms of the GNU General Public License version 2 only, as
-* published by the Free Software Foundation.
-*
-* This code is distributed in the hope that it will be useful, but WITHOUT
-* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-* FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-* version 2 for more details (a copy is included in the LICENSE file that
-* accompanied this code).
-*
-* You should have received a copy of the GNU General Public License version
-* 2 along with this work; if not, write to the Free Software Foundation,
-* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-*
-* Please 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 "asm/assembler.hpp"
-#include "asm/assembler.inline.hpp"
-#include "macroAssembler_x86.hpp"
-#include "runtime/stubRoutines.hpp"
-#include "utilities/globalDefinitions.hpp"
-
-/******************************************************************************/
-//                     ALGORITHM DESCRIPTION - COS()
-//                     ---------------------
-//
-//     1. RANGE REDUCTION
-//
-//     We perform an initial range reduction from X to r with
-//
-//          X =~= N * pi/32 + r
-//
-//     so that |r| <= pi/64 + epsilon. We restrict inputs to those
-//     where |N| <= 932560. Beyond this, the range reduction is
-//     insufficiently accurate. For extremely small inputs,
-//     denormalization can occur internally, impacting performance.
-//     This means that the main path is actually only taken for
-//     2^-252 <= |X| < 90112.
-//
-//     To avoid branches, we perform the range reduction to full
-//     accuracy each time.
-//
-//          X - N * (P_1 + P_2 + P_3)
-//
-//     where P_1 and P_2 are 32-bit numbers (so multiplication by N
-//     is exact) and P_3 is a 53-bit number. Together, these
-//     approximate pi well enough for all cases in the restricted
-//     range.
-//
-//     The main reduction sequence is:
-//
-//             y = 32/pi * x
-//             N = integer(y)
-//     (computed by adding and subtracting off SHIFTER)
-//
-//             m_1 = N * P_1
-//             m_2 = N * P_2
-//             r_1 = x - m_1
-//             r = r_1 - m_2
-//     (this r can be used for most of the calculation)
-//
-//             c_1 = r_1 - r
-//             m_3 = N * P_3
-//             c_2 = c_1 - m_2
-//             c = c_2 - m_3
-//
-//     2. MAIN ALGORITHM
-//
-//     The algorithm uses a table lookup based on B = M * pi / 32
-//     where M = N mod 64. The stored values are:
-//       sigma             closest power of 2 to cos(B)
-//       C_hl              53-bit cos(B) - sigma
-//       S_hi + S_lo       2 * 53-bit sin(B)
-//
-//     The computation is organized as follows:
-//
-//          sin(B + r + c) = [sin(B) + sigma * r] +
-//                           r * (cos(B) - sigma) +
-//                           sin(B) * [cos(r + c) - 1] +
-//                           cos(B) * [sin(r + c) - r]
-//
-//     which is approximately:
-//
-//          [S_hi + sigma * r] +
-//          C_hl * r +
-//          S_lo + S_hi * [(cos(r) - 1) - r * c] +
-//          (C_hl + sigma) * [(sin(r) - r) + c]
-//
-//     and this is what is actually computed. We separate this sum
-//     into four parts:
-//
-//          hi + med + pols + corr
-//
-//     where
-//
-//          hi       = S_hi + sigma r
-//          med      = C_hl * r
-//          pols     = S_hi * (cos(r) - 1) + (C_hl + sigma) * (sin(r) - r)
-//          corr     = S_lo + c * ((C_hl + sigma) - S_hi * r)
-//
-//     3. POLYNOMIAL
-//
-//     The polynomial S_hi * (cos(r) - 1) + (C_hl + sigma) *
-//     (sin(r) - r) can be rearranged freely, since it is quite
-//     small, so we exploit parallelism to the fullest.
-//
-//          psc4       =   SC_4 * r_1
-//          msc4       =   psc4 * r
-//          r2         =   r * r
-//          msc2       =   SC_2 * r2
-//          r4         =   r2 * r2
-//          psc3       =   SC_3 + msc4
-//          psc1       =   SC_1 + msc2
-//          msc3       =   r4 * psc3
-//          sincospols =   psc1 + msc3
-//          pols       =   sincospols *
-//                         <S_hi * r^2 | (C_hl + sigma) * r^3>
-//
-//     4. CORRECTION TERM
-//
-//     This is where the "c" component of the range reduction is
-//     taken into account; recall that just "r" is used for most of
-//     the calculation.
-//
-//          -c   = m_3 - c_2
-//          -d   = S_hi * r - (C_hl + sigma)
-//          corr = -c * -d + S_lo
-//
-//     5. COMPENSATED SUMMATIONS
-//
-//     The two successive compensated summations add up the high
-//     and medium parts, leaving just the low parts to add up at
-//     the end.
-//
-//          rs        =  sigma * r
-//          res_int   =  S_hi + rs
-//          k_0       =  S_hi - res_int
-//          k_2       =  k_0 + rs
-//          med       =  C_hl * r
-//          res_hi    =  res_int + med
-//          k_1       =  res_int - res_hi
-//          k_3       =  k_1 + med
-//
-//     6. FINAL SUMMATION
-//
-//     We now add up all the small parts:
-//
-//          res_lo = pols(hi) + pols(lo) + corr + k_1 + k_3
-//
-//     Now the overall result is just:
-//
-//          res_hi + res_lo
-//
-//     7. SMALL ARGUMENTS
-//
-//     Inputs with |X| < 2^-252 are treated specially as
-//     1 - |x|.
-//
-// Special cases:
-//  cos(NaN) = quiet NaN, and raise invalid exception
-//  cos(INF) = NaN and raise invalid exception
-//  cos(0) = 1
-//
-/******************************************************************************/
-
-// The 32 bit code is at most SSE2 compliant
-
-ATTRIBUTE_ALIGNED(16) static const juint _static_const_table_cos[] =
-{
-    0x00000000UL, 0x00000000UL, 0x00000000UL, 0x00000000UL, 0x00000000UL,
-    0x00000000UL, 0x00000000UL, 0x3ff00000UL, 0x176d6d31UL, 0xbf73b92eUL,
-    0xbc29b42cUL, 0x3fb917a6UL, 0xe0000000UL, 0xbc3e2718UL, 0x00000000UL,
-    0x3ff00000UL, 0x011469fbUL, 0xbf93ad06UL, 0x3c69a60bUL, 0x3fc8f8b8UL,
-    0xc0000000UL, 0xbc626d19UL, 0x00000000UL, 0x3ff00000UL, 0x939d225aUL,
-    0xbfa60beaUL, 0x2ed59f06UL, 0x3fd29406UL, 0xa0000000UL, 0xbc75d28dUL,
-    0x00000000UL, 0x3ff00000UL, 0x866b95cfUL, 0xbfb37ca1UL, 0xa6aea963UL,
-    0x3fd87de2UL, 0xe0000000UL, 0xbc672cedUL, 0x00000000UL, 0x3ff00000UL,
-    0x73fa1279UL, 0xbfbe3a68UL, 0x3806f63bUL, 0x3fde2b5dUL, 0x20000000UL,
-    0x3c5e0d89UL, 0x00000000UL, 0x3ff00000UL, 0x5bc57974UL, 0xbfc59267UL,
-    0x39ae68c8UL, 0x3fe1c73bUL, 0x20000000UL, 0x3c8b25ddUL, 0x00000000UL,
-    0x3ff00000UL, 0x53aba2fdUL, 0xbfcd0dfeUL, 0x25091dd6UL, 0x3fe44cf3UL,
-    0x20000000UL, 0x3c68076aUL, 0x00000000UL, 0x3ff00000UL, 0x99fcef32UL,
-    0x3fca8279UL, 0x667f3bcdUL, 0x3fe6a09eUL, 0x20000000UL, 0xbc8bdd34UL,
-    0x00000000UL, 0x3fe00000UL, 0x94247758UL, 0x3fc133ccUL, 0x6b151741UL,
-    0x3fe8bc80UL, 0x20000000UL, 0xbc82c5e1UL, 0x00000000UL, 0x3fe00000UL,
-    0x9ae68c87UL, 0x3fac73b3UL, 0x290ea1a3UL, 0x3fea9b66UL, 0xe0000000UL,
-    0x3c39f630UL, 0x00000000UL, 0x3fe00000UL, 0x7f909c4eUL, 0xbf9d4a2cUL,
-    0xf180bdb1UL, 0x3fec38b2UL, 0x80000000UL, 0xbc76e0b1UL, 0x00000000UL,
-    0x3fe00000UL, 0x65455a75UL, 0xbfbe0875UL, 0xcf328d46UL, 0x3fed906bUL,
-    0x20000000UL, 0x3c7457e6UL, 0x00000000UL, 0x3fe00000UL, 0x76acf82dUL,
-    0x3fa4a031UL, 0x56c62ddaUL, 0x3fee9f41UL, 0xe0000000UL, 0x3c8760b1UL,
-    0x00000000UL, 0x3fd00000UL, 0x0e5967d5UL, 0xbfac1d1fUL, 0xcff75cb0UL,
-    0x3fef6297UL, 0x20000000UL, 0x3c756217UL, 0x00000000UL, 0x3fd00000UL,
-    0x0f592f50UL, 0xbf9ba165UL, 0xa3d12526UL, 0x3fefd88dUL, 0x40000000UL,
-    0xbc887df6UL, 0x00000000UL, 0x3fc00000UL, 0x00000000UL, 0x00000000UL,
-    0x00000000UL, 0x3ff00000UL, 0x00000000UL, 0x00000000UL, 0x00000000UL,
-    0x00000000UL, 0x0f592f50UL, 0x3f9ba165UL, 0xa3d12526UL, 0x3fefd88dUL,
-    0x40000000UL, 0xbc887df6UL, 0x00000000UL, 0xbfc00000UL, 0x0e5967d5UL,
-    0x3fac1d1fUL, 0xcff75cb0UL, 0x3fef6297UL, 0x20000000UL, 0x3c756217UL,
-    0x00000000UL, 0xbfd00000UL, 0x76acf82dUL, 0xbfa4a031UL, 0x56c62ddaUL,
-    0x3fee9f41UL, 0xe0000000UL, 0x3c8760b1UL, 0x00000000UL, 0xbfd00000UL,
-    0x65455a75UL, 0x3fbe0875UL, 0xcf328d46UL, 0x3fed906bUL, 0x20000000UL,
-    0x3c7457e6UL, 0x00000000UL, 0xbfe00000UL, 0x7f909c4eUL, 0x3f9d4a2cUL,
-    0xf180bdb1UL, 0x3fec38b2UL, 0x80000000UL, 0xbc76e0b1UL, 0x00000000UL,
-    0xbfe00000UL, 0x9ae68c87UL, 0xbfac73b3UL, 0x290ea1a3UL, 0x3fea9b66UL,
-    0xe0000000UL, 0x3c39f630UL, 0x00000000UL, 0xbfe00000UL, 0x94247758UL,
-    0xbfc133ccUL, 0x6b151741UL, 0x3fe8bc80UL, 0x20000000UL, 0xbc82c5e1UL,
-    0x00000000UL, 0xbfe00000UL, 0x99fcef32UL, 0xbfca8279UL, 0x667f3bcdUL,
-    0x3fe6a09eUL, 0x20000000UL, 0xbc8bdd34UL, 0x00000000UL, 0xbfe00000UL,
-    0x53aba2fdUL, 0x3fcd0dfeUL, 0x25091dd6UL, 0x3fe44cf3UL, 0x20000000UL,
-    0x3c68076aUL, 0x00000000UL, 0xbff00000UL, 0x5bc57974UL, 0x3fc59267UL,
-    0x39ae68c8UL, 0x3fe1c73bUL, 0x20000000UL, 0x3c8b25ddUL, 0x00000000UL,
-    0xbff00000UL, 0x73fa1279UL, 0x3fbe3a68UL, 0x3806f63bUL, 0x3fde2b5dUL,
-    0x20000000UL, 0x3c5e0d89UL, 0x00000000UL, 0xbff00000UL, 0x866b95cfUL,
-    0x3fb37ca1UL, 0xa6aea963UL, 0x3fd87de2UL, 0xe0000000UL, 0xbc672cedUL,
-    0x00000000UL, 0xbff00000UL, 0x939d225aUL, 0x3fa60beaUL, 0x2ed59f06UL,
-    0x3fd29406UL, 0xa0000000UL, 0xbc75d28dUL, 0x00000000UL, 0xbff00000UL,
-    0x011469fbUL, 0x3f93ad06UL, 0x3c69a60bUL, 0x3fc8f8b8UL, 0xc0000000UL,
-    0xbc626d19UL, 0x00000000UL, 0xbff00000UL, 0x176d6d31UL, 0x3f73b92eUL,
-    0xbc29b42cUL, 0x3fb917a6UL, 0xe0000000UL, 0xbc3e2718UL, 0x00000000UL,
-    0xbff00000UL, 0x00000000UL, 0x00000000UL, 0x00000000UL, 0x00000000UL,
-    0x00000000UL, 0x00000000UL, 0x00000000UL, 0xbff00000UL, 0x176d6d31UL,
-    0x3f73b92eUL, 0xbc29b42cUL, 0xbfb917a6UL, 0xe0000000UL, 0x3c3e2718UL,
-    0x00000000UL, 0xbff00000UL, 0x011469fbUL, 0x3f93ad06UL, 0x3c69a60bUL,
-    0xbfc8f8b8UL, 0xc0000000UL, 0x3c626d19UL, 0x00000000UL, 0xbff00000UL,
-    0x939d225aUL, 0x3fa60beaUL, 0x2ed59f06UL, 0xbfd29406UL, 0xa0000000UL,
-    0x3c75d28dUL, 0x00000000UL, 0xbff00000UL, 0x866b95cfUL, 0x3fb37ca1UL,
-    0xa6aea963UL, 0xbfd87de2UL, 0xe0000000UL, 0x3c672cedUL, 0x00000000UL,
-    0xbff00000UL, 0x73fa1279UL, 0x3fbe3a68UL, 0x3806f63bUL, 0xbfde2b5dUL,
-    0x20000000UL, 0xbc5e0d89UL, 0x00000000UL, 0xbff00000UL, 0x5bc57974UL,
-    0x3fc59267UL, 0x39ae68c8UL, 0xbfe1c73bUL, 0x20000000UL, 0xbc8b25ddUL,
-    0x00000000UL, 0xbff00000UL, 0x53aba2fdUL, 0x3fcd0dfeUL, 0x25091dd6UL,
-    0xbfe44cf3UL, 0x20000000UL, 0xbc68076aUL, 0x00000000UL, 0xbff00000UL,
-    0x99fcef32UL, 0xbfca8279UL, 0x667f3bcdUL, 0xbfe6a09eUL, 0x20000000UL,
-    0x3c8bdd34UL, 0x00000000UL, 0xbfe00000UL, 0x94247758UL, 0xbfc133ccUL,
-    0x6b151741UL, 0xbfe8bc80UL, 0x20000000UL, 0x3c82c5e1UL, 0x00000000UL,
-    0xbfe00000UL, 0x9ae68c87UL, 0xbfac73b3UL, 0x290ea1a3UL, 0xbfea9b66UL,
-    0xe0000000UL, 0xbc39f630UL, 0x00000000UL, 0xbfe00000UL, 0x7f909c4eUL,
-    0x3f9d4a2cUL, 0xf180bdb1UL, 0xbfec38b2UL, 0x80000000UL, 0x3c76e0b1UL,
-    0x00000000UL, 0xbfe00000UL, 0x65455a75UL, 0x3fbe0875UL, 0xcf328d46UL,
-    0xbfed906bUL, 0x20000000UL, 0xbc7457e6UL, 0x00000000UL, 0xbfe00000UL,
-    0x76acf82dUL, 0xbfa4a031UL, 0x56c62ddaUL, 0xbfee9f41UL, 0xe0000000UL,
-    0xbc8760b1UL, 0x00000000UL, 0xbfd00000UL, 0x0e5967d5UL, 0x3fac1d1fUL,
-    0xcff75cb0UL, 0xbfef6297UL, 0x20000000UL, 0xbc756217UL, 0x00000000UL,
-    0xbfd00000UL, 0x0f592f50UL, 0x3f9ba165UL, 0xa3d12526UL, 0xbfefd88dUL,
-    0x40000000UL, 0x3c887df6UL, 0x00000000UL, 0xbfc00000UL, 0x00000000UL,
-    0x00000000UL, 0x00000000UL, 0xbff00000UL, 0x00000000UL, 0x00000000UL,
-    0x00000000UL, 0x00000000UL, 0x0f592f50UL, 0xbf9ba165UL, 0xa3d12526UL,
-    0xbfefd88dUL, 0x40000000UL, 0x3c887df6UL, 0x00000000UL, 0x3fc00000UL,
-    0x0e5967d5UL, 0xbfac1d1fUL, 0xcff75cb0UL, 0xbfef6297UL, 0x20000000UL,
-    0xbc756217UL, 0x00000000UL, 0x3fd00000UL, 0x76acf82dUL, 0x3fa4a031UL,
-    0x56c62ddaUL, 0xbfee9f41UL, 0xe0000000UL, 0xbc8760b1UL, 0x00000000UL,
-    0x3fd00000UL, 0x65455a75UL, 0xbfbe0875UL, 0xcf328d46UL, 0xbfed906bUL,
-    0x20000000UL, 0xbc7457e6UL, 0x00000000UL, 0x3fe00000UL, 0x7f909c4eUL,
-    0xbf9d4a2cUL, 0xf180bdb1UL, 0xbfec38b2UL, 0x80000000UL, 0x3c76e0b1UL,
-    0x00000000UL, 0x3fe00000UL, 0x9ae68c87UL, 0x3fac73b3UL, 0x290ea1a3UL,
-    0xbfea9b66UL, 0xe0000000UL, 0xbc39f630UL, 0x00000000UL, 0x3fe00000UL,
-    0x94247758UL, 0x3fc133ccUL, 0x6b151741UL, 0xbfe8bc80UL, 0x20000000UL,
-    0x3c82c5e1UL, 0x00000000UL, 0x3fe00000UL, 0x99fcef32UL, 0x3fca8279UL,
-    0x667f3bcdUL, 0xbfe6a09eUL, 0x20000000UL, 0x3c8bdd34UL, 0x00000000UL,
-    0x3fe00000UL, 0x53aba2fdUL, 0xbfcd0dfeUL, 0x25091dd6UL, 0xbfe44cf3UL,
-    0x20000000UL, 0xbc68076aUL, 0x00000000UL, 0x3ff00000UL, 0x5bc57974UL,
-    0xbfc59267UL, 0x39ae68c8UL, 0xbfe1c73bUL, 0x20000000UL, 0xbc8b25ddUL,
-    0x00000000UL, 0x3ff00000UL, 0x73fa1279UL, 0xbfbe3a68UL, 0x3806f63bUL,
-    0xbfde2b5dUL, 0x20000000UL, 0xbc5e0d89UL, 0x00000000UL, 0x3ff00000UL,
-    0x866b95cfUL, 0xbfb37ca1UL, 0xa6aea963UL, 0xbfd87de2UL, 0xe0000000UL,
-    0x3c672cedUL, 0x00000000UL, 0x3ff00000UL, 0x939d225aUL, 0xbfa60beaUL,
-    0x2ed59f06UL, 0xbfd29406UL, 0xa0000000UL, 0x3c75d28dUL, 0x00000000UL,
-    0x3ff00000UL, 0x011469fbUL, 0xbf93ad06UL, 0x3c69a60bUL, 0xbfc8f8b8UL,
-    0xc0000000UL, 0x3c626d19UL, 0x00000000UL, 0x3ff00000UL, 0x176d6d31UL,
-    0xbf73b92eUL, 0xbc29b42cUL, 0xbfb917a6UL, 0xe0000000UL, 0x3c3e2718UL,
-    0x00000000UL, 0x3ff00000UL, 0x55555555UL, 0xbfc55555UL, 0x00000000UL,
-    0xbfe00000UL, 0x11111111UL, 0x3f811111UL, 0x55555555UL, 0x3fa55555UL,
-    0x1a01a01aUL, 0xbf2a01a0UL, 0x16c16c17UL, 0xbf56c16cUL, 0xa556c734UL,
-    0x3ec71de3UL, 0x1a01a01aUL, 0x3efa01a0UL, 0x1a600000UL, 0x3d90b461UL,
-    0x1a600000UL, 0x3d90b461UL, 0x54400000UL, 0x3fb921fbUL, 0x00000000UL,
-    0x00000000UL, 0x2e037073UL, 0x3b63198aUL, 0x00000000UL, 0x00000000UL,
-    0x6dc9c883UL, 0x40245f30UL, 0x00000000UL, 0x00000000UL, 0x00000000UL,
-    0x43380000UL, 0x00000000UL, 0x00000000UL, 0x00000000UL, 0x3ff00000UL,
-    0x00000000UL, 0x00000000UL, 0x00000000UL, 0x80000000UL, 0x00000000UL,
-    0x00000000UL, 0x00000000UL, 0x80000000UL, 0x00000000UL, 0x00000000UL,
-    0x00000000UL, 0x3fe00000UL, 0x00000000UL, 0x3fe00000UL
-};
-//registers,
-// input: (rbp + 8)
-// scratch: xmm1, xmm2, xmm3, xmm4, xmm5, xmm6, xmm7
-//          eax, ecx, edx, ebx (tmp)
-
-// Code generated by Intel C compiler for LIBM library
-
-void MacroAssembler::fast_cos(XMMRegister xmm0, XMMRegister xmm1, XMMRegister xmm2, XMMRegister xmm3,
-                              XMMRegister xmm4, XMMRegister xmm5, XMMRegister xmm6, XMMRegister xmm7,
-                              Register eax, Register ecx, Register edx, Register tmp) {
-  Label L_2TAG_PACKET_0_0_2, L_2TAG_PACKET_1_0_2, L_2TAG_PACKET_2_0_2, L_2TAG_PACKET_3_0_2;
-  Label start;
-
-  assert_different_registers(tmp, eax, ecx, edx);
-
-  address static_const_table_cos = (address)_static_const_table_cos;
-
-  bind(start);
-  subl(rsp, 120);
-  movl(Address(rsp, 56), tmp);
-  lea(tmp, ExternalAddress(static_const_table_cos));
-  movsd(xmm0, Address(rsp, 128));
-  pextrw(eax, xmm0, 3);
-  andl(eax, 32767);
-  subl(eax, 12336);
-  cmpl(eax, 4293);
-  jcc(Assembler::above, L_2TAG_PACKET_0_0_2);
-  movsd(xmm1, Address(tmp, 2160));
-  mulsd(xmm1, xmm0);
-  movdqu(xmm5, Address(tmp, 2240));
-  movsd(xmm4, Address(tmp, 2224));
-  pand(xmm4, xmm0);
-  por(xmm5, xmm4);
-  movsd(xmm3, Address(tmp, 2128));
-  movdqu(xmm2, Address(tmp, 2112));
-  addpd(xmm1, xmm5);
-  cvttsd2sil(edx, xmm1);
-  cvtsi2sdl(xmm1, edx);
-  mulsd(xmm3, xmm1);
-  unpcklpd(xmm1, xmm1);
-  addl(edx, 1865232);
-  movdqu(xmm4, xmm0);
-  andl(edx, 63);
-  movdqu(xmm5, Address(tmp, 2096));
-  lea(eax, Address(tmp, 0));
-  shll(edx, 5);
-  addl(eax, edx);
-  mulpd(xmm2, xmm1);
-  subsd(xmm0, xmm3);
-  mulsd(xmm1, Address(tmp, 2144));
-  subsd(xmm4, xmm3);
-  movsd(xmm7, Address(eax, 8));
-  unpcklpd(xmm0, xmm0);
-  movapd(xmm3, xmm4);
-  subsd(xmm4, xmm2);
-  mulpd(xmm5, xmm0);
-  subpd(xmm0, xmm2);
-  movdqu(xmm6, Address(tmp, 2064));
-  mulsd(xmm7, xmm4);
-  subsd(xmm3, xmm4);
-  mulpd(xmm5, xmm0);
-  mulpd(xmm0, xmm0);
-  subsd(xmm3, xmm2);
-  movdqu(xmm2, Address(eax, 0));
-  subsd(xmm1, xmm3);
-  movsd(xmm3, Address(eax, 24));
-  addsd(xmm2, xmm3);
-  subsd(xmm7, xmm2);
-  mulsd(xmm2, xmm4);
-  mulpd(xmm6, xmm0);
-  mulsd(xmm3, xmm4);
-  mulpd(xmm2, xmm0);
-  mulpd(xmm0, xmm0);
-  addpd(xmm5, Address(tmp, 2080));
-  mulsd(xmm4, Address(eax, 0));
-  addpd(xmm6, Address(tmp, 2048));
-  mulpd(xmm5, xmm0);
-  movapd(xmm0, xmm3);
-  addsd(xmm3, Address(eax, 8));
-  mulpd(xmm1, xmm7);
-  movapd(xmm7, xmm4);
-  addsd(xmm4, xmm3);
-  addpd(xmm6, xmm5);
-  movsd(xmm5, Address(eax, 8));
-  subsd(xmm5, xmm3);
-  subsd(xmm3, xmm4);
-  addsd(xmm1, Address(eax, 16));
-  mulpd(xmm6, xmm2);
-  addsd(xmm5, xmm0);
-  addsd(xmm3, xmm7);
-  addsd(xmm1, xmm5);
-  addsd(xmm1, xmm3);
-  addsd(xmm1, xmm6);
-  unpckhpd(xmm6, xmm6);
-  addsd(xmm1, xmm6);
-  addsd(xmm4, xmm1);
-  movsd(Address(rsp, 0), xmm4);
-  fld_d(Address(rsp, 0));
-  jmp(L_2TAG_PACKET_1_0_2);
-
-  bind(L_2TAG_PACKET_0_0_2);
-  jcc(Assembler::greater, L_2TAG_PACKET_2_0_2);
-  pextrw(eax, xmm0, 3);
-  andl(eax, 32767);
-  pinsrw(xmm0, eax, 3);
-  movsd(xmm1, Address(tmp, 2192));
-  subsd(xmm1, xmm0);
-  movsd(Address(rsp, 0), xmm1);
-  fld_d(Address(rsp, 0));
-  jmp(L_2TAG_PACKET_1_0_2);
-
-  bind(L_2TAG_PACKET_2_0_2);
-  movl(eax, Address(rsp, 132));
-  andl(eax, 2146435072);
-  cmpl(eax, 2146435072);
-  jcc(Assembler::equal, L_2TAG_PACKET_3_0_2);
-  subl(rsp, 32);
-  movsd(Address(rsp, 0), xmm0);
-  lea(eax, Address(rsp, 40));
-  movl(Address(rsp, 8), eax);
-  movl(eax, 1);
-  movl(Address(rsp, 12), eax);
-  call(RuntimeAddress(CAST_FROM_FN_PTR(address, StubRoutines::dlibm_sin_cos_huge())));
-  addl(rsp, 32);
-  fld_d(Address(rsp, 8));
-  jmp(L_2TAG_PACKET_1_0_2);
-
-  bind(L_2TAG_PACKET_3_0_2);
-  fld_d(Address(rsp, 128));
-  fmul_d(Address(tmp, 2208));
-
-  bind(L_2TAG_PACKET_1_0_2);
-  movl(tmp, Address(rsp, 56));
-}
diff --git a/src/hotspot/cpu/x86/macroAssembler_x86_32_exp.cpp b/src/hotspot/cpu/x86/macroAssembler_x86_32_exp.cpp
deleted file mode 100644
index 2e6c1a617bb..00000000000
--- a/src/hotspot/cpu/x86/macroAssembler_x86_32_exp.cpp
+++ /dev/null
@@ -1,329 +0,0 @@
-/*
-* Copyright (c) 2016, 2021, Intel Corporation. All rights reserved.
-* Copyright (C) 2021 THL A29 Limited, a Tencent company. All rights reserved.
-* Intel Math Library (LIBM) Source Code
-*
-* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-*
-* This code is free software; you can redistribute it and/or modify it
-* under the terms of the GNU General Public License version 2 only, as
-* published by the Free Software Foundation.
-*
-* This code is distributed in the hope that it will be useful, but WITHOUT
-* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-* FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-* version 2 for more details (a copy is included in the LICENSE file that
-* accompanied this code).
-*
-* You should have received a copy of the GNU General Public License version
-* 2 along with this work; if not, write to the Free Software Foundation,
-* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-*
-* Please 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 "asm/assembler.hpp"
-#include "asm/assembler.inline.hpp"
-#include "macroAssembler_x86.hpp"
-#include "runtime/stubRoutines.hpp"
-#include "utilities/globalDefinitions.hpp"
-
-/******************************************************************************/
-//                     ALGORITHM DESCRIPTION - EXP()
-//                     ---------------------
-//
-// Description:
-//  Let K = 64 (table size).
-//        x    x/log(2)     n
-//       e  = 2          = 2 * T[j] * (1 + P(y))
-//  where
-//       x = m*log(2)/K + y,    y in [-log(2)/K..log(2)/K]
-//       m = n*K + j,           m,n,j - signed integer, j in [-K/2..K/2]
-//                  j/K
-//       values of 2   are tabulated as T[j] = T_hi[j] ( 1 + T_lo[j]).
-//
-//       P(y) is a minimax polynomial approximation of exp(x)-1
-//       on small interval [-log(2)/K..log(2)/K] (were calculated by Maple V).
-//
-//  To avoid problems with arithmetic overflow and underflow,
-//            n                        n1  n2
-//  value of 2  is safely computed as 2 * 2 where n1 in [-BIAS/2..BIAS/2]
-//  where BIAS is a value of exponent bias.
-//
-// Special cases:
-//  exp(NaN) = NaN
-//  exp(+INF) = +INF
-//  exp(-INF) = 0
-//  exp(x) = 1 for subnormals
-//  for finite argument, only exp(0)=1 is exact
-//  For IEEE double
-//    if x >  709.782712893383973096 then exp(x) overflow
-//    if x < -745.133219101941108420 then exp(x) underflow
-//
-/******************************************************************************/
-
-// The 32 bit code is at most SSE2 compliant
-
-ATTRIBUTE_ALIGNED(16) static const juint _static_const_table[] =
-{
-    0x00000000UL, 0xfff00000UL, 0x00000000UL, 0xfff00000UL, 0xffffffc0UL,
-    0x00000000UL, 0xffffffc0UL, 0x00000000UL, 0x0000ffc0UL, 0x00000000UL,
-    0x0000ffc0UL, 0x00000000UL, 0x00000000UL, 0x43380000UL, 0x00000000UL,
-    0x43380000UL, 0x652b82feUL, 0x40571547UL, 0x652b82feUL, 0x40571547UL,
-    0xfefa0000UL, 0x3f862e42UL, 0xfefa0000UL, 0x3f862e42UL, 0xbc9e3b3aUL,
-    0x3d1cf79aUL, 0xbc9e3b3aUL, 0x3d1cf79aUL, 0xfffffffeUL, 0x3fdfffffUL,
-    0xfffffffeUL, 0x3fdfffffUL, 0xe3289860UL, 0x3f56c15cUL, 0x555b9e25UL,
-    0x3fa55555UL, 0xc090cf0fUL, 0x3f811115UL, 0x55548ba1UL, 0x3fc55555UL,
-    0x00000000UL, 0x00000000UL, 0x00000000UL, 0x00000000UL, 0x0e03754dUL,
-    0x3cad7bbfUL, 0x3e778060UL, 0x00002c9aUL, 0x3567f613UL, 0x3c8cd252UL,
-    0xd3158574UL, 0x000059b0UL, 0x61e6c861UL, 0x3c60f74eUL, 0x18759bc8UL,
-    0x00008745UL, 0x5d837b6cUL, 0x3c979aa6UL, 0x6cf9890fUL, 0x0000b558UL,
-    0x702f9cd1UL, 0x3c3ebe3dUL, 0x32d3d1a2UL, 0x0000e3ecUL, 0x1e63bcd8UL,
-    0x3ca3516eUL, 0xd0125b50UL, 0x00011301UL, 0x26f0387bUL, 0x3ca4c554UL,
-    0xaea92ddfUL, 0x0001429aUL, 0x62523fb6UL, 0x3ca95153UL, 0x3c7d517aUL,
-    0x000172b8UL, 0x3f1353bfUL, 0x3c8b898cUL, 0xeb6fcb75UL, 0x0001a35bUL,
-    0x3e3a2f5fUL, 0x3c9aecf7UL, 0x3168b9aaUL, 0x0001d487UL, 0x44a6c38dUL,
-    0x3c8a6f41UL, 0x88628cd6UL, 0x0002063bUL, 0xe3a8a894UL, 0x3c968efdUL,
-    0x6e756238UL, 0x0002387aUL, 0x981fe7f2UL, 0x3c80472bUL, 0x65e27cddUL,
-    0x00026b45UL, 0x6d09ab31UL, 0x3c82f7e1UL, 0xf51fdee1UL, 0x00029e9dUL,
-    0x720c0ab3UL, 0x3c8b3782UL, 0xa6e4030bUL, 0x0002d285UL, 0x4db0abb6UL,
-    0x3c834d75UL, 0x0a31b715UL, 0x000306feUL, 0x5dd3f84aUL, 0x3c8fdd39UL,
-    0xb26416ffUL, 0x00033c08UL, 0xcc187d29UL, 0x3ca12f8cUL, 0x373aa9caUL,
-    0x000371a7UL, 0x738b5e8bUL, 0x3ca7d229UL, 0x34e59ff6UL, 0x0003a7dbUL,
-    0xa72a4c6dUL, 0x3c859f48UL, 0x4c123422UL, 0x0003dea6UL, 0x259d9205UL,
-    0x3ca8b846UL, 0x21f72e29UL, 0x0004160aUL, 0x60c2ac12UL, 0x3c4363edUL,
-    0x6061892dUL, 0x00044e08UL, 0xdaa10379UL, 0x3c6ecce1UL, 0xb5c13cd0UL,
-    0x000486a2UL, 0xbb7aafb0UL, 0x3c7690ceUL, 0xd5362a27UL, 0x0004bfdaUL,
-    0x9b282a09UL, 0x3ca083ccUL, 0x769d2ca6UL, 0x0004f9b2UL, 0xc1aae707UL,
-    0x3ca509b0UL, 0x569d4f81UL, 0x0005342bUL, 0x18fdd78eUL, 0x3c933505UL,
-    0x36b527daUL, 0x00056f47UL, 0xe21c5409UL, 0x3c9063e1UL, 0xdd485429UL,
-    0x0005ab07UL, 0x2b64c035UL, 0x3c9432e6UL, 0x15ad2148UL, 0x0005e76fUL,
-    0x99f08c0aUL, 0x3ca01284UL, 0xb03a5584UL, 0x0006247eUL, 0x0073dc06UL,
-    0x3c99f087UL, 0x82552224UL, 0x00066238UL, 0x0da05571UL, 0x3c998d4dUL,
-    0x667f3bccUL, 0x0006a09eUL, 0x86ce4786UL, 0x3ca52bb9UL, 0x3c651a2eUL,
-    0x0006dfb2UL, 0x206f0dabUL, 0x3ca32092UL, 0xe8ec5f73UL, 0x00071f75UL,
-    0x8e17a7a6UL, 0x3ca06122UL, 0x564267c8UL, 0x00075febUL, 0x461e9f86UL,
-    0x3ca244acUL, 0x73eb0186UL, 0x0007a114UL, 0xabd66c55UL, 0x3c65ebe1UL,
-    0x36cf4e62UL, 0x0007e2f3UL, 0xbbff67d0UL, 0x3c96fe9fUL, 0x994cce12UL,
-    0x00082589UL, 0x14c801dfUL, 0x3c951f14UL, 0x9b4492ecUL, 0x000868d9UL,
-    0xc1f0eab4UL, 0x3c8db72fUL, 0x422aa0dbUL, 0x0008ace5UL, 0x59f35f44UL,
-    0x3c7bf683UL, 0x99157736UL, 0x0008f1aeUL, 0x9c06283cUL, 0x3ca360baUL,
-    0xb0cdc5e4UL, 0x00093737UL, 0x20f962aaUL, 0x3c95e8d1UL, 0x9fde4e4fUL,
-    0x00097d82UL, 0x2b91ce27UL, 0x3c71affcUL, 0x82a3f090UL, 0x0009c491UL,
-    0x589a2ebdUL, 0x3c9b6d34UL, 0x7b5de564UL, 0x000a0c66UL, 0x9ab89880UL,
-    0x3c95277cUL, 0xb23e255cUL, 0x000a5503UL, 0x6e735ab3UL, 0x3c846984UL,
-    0x5579fdbfUL, 0x000a9e6bUL, 0x92cb3387UL, 0x3c8c1a77UL, 0x995ad3adUL,
-    0x000ae89fUL, 0xdc2d1d96UL, 0x3ca22466UL, 0xb84f15faUL, 0x000b33a2UL,
-    0xb19505aeUL, 0x3ca1112eUL, 0xf2fb5e46UL, 0x000b7f76UL, 0x0a5fddcdUL,
-    0x3c74ffd7UL, 0x904bc1d2UL, 0x000bcc1eUL, 0x30af0cb3UL, 0x3c736eaeUL,
-    0xdd85529cUL, 0x000c199bUL, 0xd10959acUL, 0x3c84e08fUL, 0x2e57d14bUL,
-    0x000c67f1UL, 0x6c921968UL, 0x3c676b2cUL, 0xdcef9069UL, 0x000cb720UL,
-    0x36df99b3UL, 0x3c937009UL, 0x4a07897bUL, 0x000d072dUL, 0xa63d07a7UL,
-    0x3c74a385UL, 0xdcfba487UL, 0x000d5818UL, 0xd5c192acUL, 0x3c8e5a50UL,
-    0x03db3285UL, 0x000da9e6UL, 0x1c4a9792UL, 0x3c98bb73UL, 0x337b9b5eUL,
-    0x000dfc97UL, 0x603a88d3UL, 0x3c74b604UL, 0xe78b3ff6UL, 0x000e502eUL,
-    0x92094926UL, 0x3c916f27UL, 0xa2a490d9UL, 0x000ea4afUL, 0x41aa2008UL,
-    0x3c8ec3bcUL, 0xee615a27UL, 0x000efa1bUL, 0x31d185eeUL, 0x3c8a64a9UL,
-    0x5b6e4540UL, 0x000f5076UL, 0x4d91cd9dUL, 0x3c77893bUL, 0x819e90d8UL,
-    0x000fa7c1UL, 0x00000000UL, 0x3ff00000UL, 0x00000000UL, 0x7ff00000UL,
-    0x00000000UL, 0x00000000UL, 0xffffffffUL, 0x7fefffffUL, 0x00000000UL,
-    0x00100000UL
-};
-
-//registers,
-// input: (rbp + 8)
-// scratch: xmm1, xmm2, xmm3, xmm4, xmm5, xmm6, xmm7
-//          rax, rdx, rcx, rbx (tmp)
-
-// Code generated by Intel C compiler for LIBM library
-
-void MacroAssembler::fast_exp(XMMRegister xmm0, XMMRegister xmm1, XMMRegister xmm2, XMMRegister xmm3,
-                              XMMRegister xmm4, XMMRegister xmm5, XMMRegister xmm6, XMMRegister xmm7,
-                              Register eax, Register ecx, Register edx, Register tmp) {
-  Label L_2TAG_PACKET_0_0_2, L_2TAG_PACKET_1_0_2, L_2TAG_PACKET_2_0_2, L_2TAG_PACKET_3_0_2;
-  Label L_2TAG_PACKET_4_0_2, L_2TAG_PACKET_5_0_2, L_2TAG_PACKET_6_0_2, L_2TAG_PACKET_7_0_2;
-  Label L_2TAG_PACKET_8_0_2, L_2TAG_PACKET_9_0_2, L_2TAG_PACKET_10_0_2, L_2TAG_PACKET_11_0_2;
-  Label L_2TAG_PACKET_12_0_2;
-
-  assert_different_registers(tmp, eax, ecx, edx);
-  address static_const_table = (address)_static_const_table;
-
-  subl(rsp, 120);
-  movl(Address(rsp, 64), tmp);
-  lea(tmp, ExternalAddress(static_const_table));
-  movsd(xmm0, Address(rsp, 128));
-  unpcklpd(xmm0, xmm0);
-  movdqu(xmm1, Address(tmp, 64));          // 0x652b82feUL, 0x40571547UL, 0x652b82feUL, 0x40571547UL
-  movdqu(xmm6, Address(tmp, 48));          // 0x00000000UL, 0x43380000UL, 0x00000000UL, 0x43380000UL
-  movdqu(xmm2, Address(tmp, 80));          // 0xfefa0000UL, 0x3f862e42UL, 0xfefa0000UL, 0x3f862e42UL
-  movdqu(xmm3, Address(tmp, 96));          // 0xbc9e3b3aUL, 0x3d1cf79aUL, 0xbc9e3b3aUL, 0x3d1cf79aUL
-  pextrw(eax, xmm0, 3);
-  andl(eax, 32767);
-  movl(edx, 16527);
-  subl(edx, eax);
-  subl(eax, 15504);
-  orl(edx, eax);
-  cmpl(edx, INT_MIN);
-  jcc(Assembler::aboveEqual, L_2TAG_PACKET_0_0_2);
-  mulpd(xmm1, xmm0);
-  addpd(xmm1, xmm6);
-  movapd(xmm7, xmm1);
-  subpd(xmm1, xmm6);
-  mulpd(xmm2, xmm1);
-  movdqu(xmm4, Address(tmp, 128));         // 0xe3289860UL, 0x3f56c15cUL, 0x555b9e25UL, 0x3fa55555UL
-  mulpd(xmm3, xmm1);
-  movdqu(xmm5, Address(tmp, 144));         // 0xc090cf0fUL, 0x3f811115UL, 0x55548ba1UL, 0x3fc55555UL
-  subpd(xmm0, xmm2);
-  movdl(eax, xmm7);
-  movl(ecx, eax);
-  andl(ecx, 63);
-  shll(ecx, 4);
-  sarl(eax, 6);
-  movl(edx, eax);
-  movdqu(xmm6, Address(tmp, 16));          // 0xffffffc0UL, 0x00000000UL, 0xffffffc0UL, 0x00000000UL
-  pand(xmm7, xmm6);
-  movdqu(xmm6, Address(tmp, 32));          // 0x0000ffc0UL, 0x00000000UL, 0x0000ffc0UL, 0x00000000UL
-  paddq(xmm7, xmm6);
-  psllq(xmm7, 46);
-  subpd(xmm0, xmm3);
-  movdqu(xmm2, Address(tmp, ecx, Address::times_1, 160));
-  mulpd(xmm4, xmm0);
-  movapd(xmm6, xmm0);
-  movapd(xmm1, xmm0);
-  mulpd(xmm6, xmm6);
-  mulpd(xmm0, xmm6);
-  addpd(xmm5, xmm4);
-  mulsd(xmm0, xmm6);
-  mulpd(xmm6, Address(tmp, 112));          // 0xfffffffeUL, 0x3fdfffffUL, 0xfffffffeUL, 0x3fdfffffUL
-  addsd(xmm1, xmm2);
-  unpckhpd(xmm2, xmm2);
-  mulpd(xmm0, xmm5);
-  addsd(xmm1, xmm0);
-  por(xmm2, xmm7);
-  unpckhpd(xmm0, xmm0);
-  addsd(xmm0, xmm1);
-  addsd(xmm0, xmm6);
-  addl(edx, 894);
-  cmpl(edx, 1916);
-  jcc(Assembler::above, L_2TAG_PACKET_1_0_2);
-  mulsd(xmm0, xmm2);
-  addsd(xmm0, xmm2);
-  jmp(L_2TAG_PACKET_2_0_2);
-
-  bind(L_2TAG_PACKET_1_0_2);
-  fnstcw(Address(rsp, 24));
-  movzwl(edx, Address(rsp, 24));
-  orl(edx, 768);
-  movw(Address(rsp, 28), edx);
-  fldcw(Address(rsp, 28));
-  movl(edx, eax);
-  sarl(eax, 1);
-  subl(edx, eax);
-  movdqu(xmm6, Address(tmp, 0));           // 0x00000000UL, 0xfff00000UL, 0x00000000UL, 0xfff00000UL
-  pandn(xmm6, xmm2);
-  addl(eax, 1023);
-  movdl(xmm3, eax);
-  psllq(xmm3, 52);
-  por(xmm6, xmm3);
-  addl(edx, 1023);
-  movdl(xmm4, edx);
-  psllq(xmm4, 52);
-  movsd(Address(rsp, 8), xmm0);
-  fld_d(Address(rsp, 8));
-  movsd(Address(rsp, 16), xmm6);
-  fld_d(Address(rsp, 16));
-  fmula(1);
-  faddp(1);
-  movsd(Address(rsp, 8), xmm4);
-  fld_d(Address(rsp, 8));
-  fmulp(1);
-  fstp_d(Address(rsp, 8));
-  movsd(xmm0, Address(rsp, 8));
-  fldcw(Address(rsp, 24));
-  pextrw(ecx, xmm0, 3);
-  andl(ecx, 32752);
-  cmpl(ecx, 32752);
-  jcc(Assembler::aboveEqual, L_2TAG_PACKET_3_0_2);
-  cmpl(ecx, 0);
-  jcc(Assembler::equal, L_2TAG_PACKET_4_0_2);
-  jmp(L_2TAG_PACKET_2_0_2);
-  cmpl(ecx, INT_MIN);
-  jcc(Assembler::below, L_2TAG_PACKET_3_0_2);
-  cmpl(ecx, -1064950997);
-  jcc(Assembler::below, L_2TAG_PACKET_2_0_2);
-  jcc(Assembler::above, L_2TAG_PACKET_4_0_2);
-  movl(edx, Address(rsp, 128));
-  cmpl(edx, -17155601);
-  jcc(Assembler::below, L_2TAG_PACKET_2_0_2);
-  jmp(L_2TAG_PACKET_4_0_2);
-
-  bind(L_2TAG_PACKET_3_0_2);
-  movl(edx, 14);
-  jmp(L_2TAG_PACKET_5_0_2);
-
-  bind(L_2TAG_PACKET_4_0_2);
-  movl(edx, 15);
-
-  bind(L_2TAG_PACKET_5_0_2);
-  movsd(Address(rsp, 0), xmm0);
-  movsd(xmm0, Address(rsp, 128));
-  fld_d(Address(rsp, 0));
-  jmp(L_2TAG_PACKET_6_0_2);
-
-  bind(L_2TAG_PACKET_7_0_2);
-  cmpl(eax, 2146435072);
-  jcc(Assembler::aboveEqual, L_2TAG_PACKET_8_0_2);
-  movl(eax, Address(rsp, 132));
-  cmpl(eax, INT_MIN);
-  jcc(Assembler::aboveEqual, L_2TAG_PACKET_9_0_2);
-  movsd(xmm0, Address(tmp, 1208));         // 0xffffffffUL, 0x7fefffffUL
-  mulsd(xmm0, xmm0);
-  movl(edx, 14);
-  jmp(L_2TAG_PACKET_5_0_2);
-
-  bind(L_2TAG_PACKET_9_0_2);
-  movsd(xmm0, Address(tmp, 1216));
-  mulsd(xmm0, xmm0);
-  movl(edx, 15);
-  jmp(L_2TAG_PACKET_5_0_2);
-
-  bind(L_2TAG_PACKET_8_0_2);
-  movl(edx, Address(rsp, 128));
-  cmpl(eax, 2146435072);
-  jcc(Assembler::above, L_2TAG_PACKET_10_0_2);
-  cmpl(edx, 0);
-  jcc(Assembler::notEqual, L_2TAG_PACKET_10_0_2);
-  movl(eax, Address(rsp, 132));
-  cmpl(eax, 2146435072);
-  jcc(Assembler::notEqual, L_2TAG_PACKET_11_0_2);
-  movsd(xmm0, Address(tmp, 1192));         // 0x00000000UL, 0x7ff00000UL
-  jmp(L_2TAG_PACKET_2_0_2);
-
-  bind(L_2TAG_PACKET_11_0_2);
-  movsd(xmm0, Address(tmp, 1200));         // 0x00000000UL, 0x00000000UL
-  jmp(L_2TAG_PACKET_2_0_2);
-
-  bind(L_2TAG_PACKET_10_0_2);
-  movsd(xmm0, Address(rsp, 128));
-  addsd(xmm0, xmm0);
-  jmp(L_2TAG_PACKET_2_0_2);
-
-  bind(L_2TAG_PACKET_0_0_2);
-  movl(eax, Address(rsp, 132));
-  andl(eax, 2147483647);
-  cmpl(eax, 1083179008);
-  jcc(Assembler::aboveEqual, L_2TAG_PACKET_7_0_2);
-  movsd(xmm0, Address(rsp, 128));
-  addsd(xmm0, Address(tmp, 1184));         // 0x00000000UL, 0x3ff00000UL
-  jmp(L_2TAG_PACKET_2_0_2);
-
-  bind(L_2TAG_PACKET_2_0_2);
-  movsd(Address(rsp, 48), xmm0);
-  fld_d(Address(rsp, 48));
-
-  bind(L_2TAG_PACKET_6_0_2);
-  movl(tmp, Address(rsp, 64));
-}
diff --git a/src/hotspot/cpu/x86/macroAssembler_x86_32_log.cpp b/src/hotspot/cpu/x86/macroAssembler_x86_32_log.cpp
deleted file mode 100644
index abaabef6741..00000000000
--- a/src/hotspot/cpu/x86/macroAssembler_x86_32_log.cpp
+++ /dev/null
@@ -1,344 +0,0 @@
-/*
-* Copyright (c) 2016, 2021, Intel Corporation. All rights reserved.
-* Copyright (C) 2021 THL A29 Limited, a Tencent company. All rights reserved.
-* Intel Math Library (LIBM) Source Code
-*
-* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-*
-* This code is free software; you can redistribute it and/or modify it
-* under the terms of the GNU General Public License version 2 only, as
-* published by the Free Software Foundation.
-*
-* This code is distributed in the hope that it will be useful, but WITHOUT
-* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-* FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-* version 2 for more details (a copy is included in the LICENSE file that
-* accompanied this code).
-*
-* You should have received a copy of the GNU General Public License version
-* 2 along with this work; if not, write to the Free Software Foundation,
-* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-*
-* Please 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 "asm/assembler.hpp"
-#include "asm/assembler.inline.hpp"
-#include "macroAssembler_x86.hpp"
-#include "utilities/globalDefinitions.hpp"
-
-/******************************************************************************/
-//                     ALGORITHM DESCRIPTION - LOG()
-//                     ---------------------
-//
-//    x=2^k * mx, mx in [1,2)
-//
-//    Get B~1/mx based on the output of rcpss instruction (B0)
-//    B = int((B0*2^7+0.5))/2^7
-//
-//    Reduced argument: r=B*mx-1.0 (computed accurately in high and low parts)
-//
-//    Result:  k*log(2) - log(B) + p(r) if |x-1| >= small value (2^-6)  and
-//             p(r) is a degree 7 polynomial
-//             -log(B) read from data table (high, low parts)
-//             Result is formed from high and low parts
-//
-// Special cases:
-//  log(NaN) = quiet NaN, and raise invalid exception
-//  log(+INF) = that INF
-//  log(0) = -INF with divide-by-zero exception raised
-//  log(1) = +0
-//  log(x) = NaN with invalid exception raised if x < -0, including -INF
-//
-/******************************************************************************/
-
-// The 32 bit code is at most SSE2 compliant
-//
-ATTRIBUTE_ALIGNED(16) static const juint _static_const_table_log[] =
-{
-    0xfefa3800UL, 0x3fe62e42UL, 0x93c76730UL, 0x3d2ef357UL, 0xaa241800UL,
-    0x3fe5ee82UL, 0x0cda46beUL, 0x3d220238UL, 0x5c364800UL, 0x3fe5af40UL,
-    0xac10c9fbUL, 0x3d2dfa63UL, 0x26bb8c00UL, 0x3fe5707aUL, 0xff3303ddUL,
-    0x3d09980bUL, 0x26867800UL, 0x3fe5322eUL, 0x5d257531UL, 0x3d05ccc4UL,
-    0x835a5000UL, 0x3fe4f45aUL, 0x6d93b8fbUL, 0xbd2e6c51UL, 0x6f970c00UL,
-    0x3fe4b6fdUL, 0xed4c541cUL, 0x3cef7115UL, 0x27e8a400UL, 0x3fe47a15UL,
-    0xf94d60aaUL, 0xbd22cb6aUL, 0xf2f92400UL, 0x3fe43d9fUL, 0x481051f7UL,
-    0xbcfd984fUL, 0x2125cc00UL, 0x3fe4019cUL, 0x30f0c74cUL, 0xbd26ce79UL,
-    0x0c36c000UL, 0x3fe3c608UL, 0x7cfe13c2UL, 0xbd02b736UL, 0x17197800UL,
-    0x3fe38ae2UL, 0xbb5569a4UL, 0xbd218b7aUL, 0xad9d8c00UL, 0x3fe35028UL,
-    0x9527e6acUL, 0x3d10b83fUL, 0x44340800UL, 0x3fe315daUL, 0xc5a0ed9cUL,
-    0xbd274e93UL, 0x57b0e000UL, 0x3fe2dbf5UL, 0x07b9dc11UL, 0xbd17a6e5UL,
-    0x6d0ec000UL, 0x3fe2a278UL, 0xe797882dUL, 0x3d206d2bUL, 0x1134dc00UL,
-    0x3fe26962UL, 0x05226250UL, 0xbd0b61f1UL, 0xd8bebc00UL, 0x3fe230b0UL,
-    0x6e48667bUL, 0x3d12fc06UL, 0x5fc61800UL, 0x3fe1f863UL, 0xc9fe81d3UL,
-    0xbd2a7242UL, 0x49ae6000UL, 0x3fe1c078UL, 0xed70e667UL, 0x3cccacdeUL,
-    0x40f23c00UL, 0x3fe188eeUL, 0xf8ab4650UL, 0x3d14cc4eUL, 0xf6f29800UL,
-    0x3fe151c3UL, 0xa293ae49UL, 0xbd2edd97UL, 0x23c75c00UL, 0x3fe11af8UL,
-    0xbb9ddcb2UL, 0xbd258647UL, 0x8611cc00UL, 0x3fe0e489UL, 0x07801742UL,
-    0x3d1c2998UL, 0xe2d05400UL, 0x3fe0ae76UL, 0x887e7e27UL, 0x3d1f486bUL,
-    0x0533c400UL, 0x3fe078bfUL, 0x41edf5fdUL, 0x3d268122UL, 0xbe760400UL,
-    0x3fe04360UL, 0xe79539e0UL, 0xbd04c45fUL, 0xe5b20800UL, 0x3fe00e5aUL,
-    0xb1727b1cUL, 0xbd053ba3UL, 0xaf7a4800UL, 0x3fdfb358UL, 0x3c164935UL,
-    0x3d0085faUL, 0xee031800UL, 0x3fdf4aa7UL, 0x6f014a8bUL, 0x3d12cde5UL,
-    0x56b41000UL, 0x3fdee2a1UL, 0x5a470251UL, 0x3d2f27f4UL, 0xc3ddb000UL,
-    0x3fde7b42UL, 0x5372bd08UL, 0xbd246550UL, 0x1a272800UL, 0x3fde148aUL,
-    0x07322938UL, 0xbd1326b2UL, 0x484c9800UL, 0x3fddae75UL, 0x60dc616aUL,
-    0xbd1ea42dUL, 0x46def800UL, 0x3fdd4902UL, 0xe9a767a8UL, 0x3d235bafUL,
-    0x18064800UL, 0x3fdce42fUL, 0x3ec7a6b0UL, 0xbd0797c3UL, 0xc7455800UL,
-    0x3fdc7ff9UL, 0xc15249aeUL, 0xbd29b6ddUL, 0x693fa000UL, 0x3fdc1c60UL,
-    0x7fe8e180UL, 0x3d2cec80UL, 0x1b80e000UL, 0x3fdbb961UL, 0xf40a666dUL,
-    0x3d27d85bUL, 0x04462800UL, 0x3fdb56faUL, 0x2d841995UL, 0x3d109525UL,
-    0x5248d000UL, 0x3fdaf529UL, 0x52774458UL, 0xbd217cc5UL, 0x3c8ad800UL,
-    0x3fda93edUL, 0xbea77a5dUL, 0x3d1e36f2UL, 0x0224f800UL, 0x3fda3344UL,
-    0x7f9d79f5UL, 0x3d23c645UL, 0xea15f000UL, 0x3fd9d32bUL, 0x10d0c0b0UL,
-    0xbd26279eUL, 0x43135800UL, 0x3fd973a3UL, 0xa502d9f0UL, 0xbd152313UL,
-    0x635bf800UL, 0x3fd914a8UL, 0x2ee6307dUL, 0xbd1766b5UL, 0xa88b3000UL,
-    0x3fd8b639UL, 0xe5e70470UL, 0xbd205ae1UL, 0x776dc800UL, 0x3fd85855UL,
-    0x3333778aUL, 0x3d2fd56fUL, 0x3bd81800UL, 0x3fd7fafaUL, 0xc812566aUL,
-    0xbd272090UL, 0x687cf800UL, 0x3fd79e26UL, 0x2efd1778UL, 0x3d29ec7dUL,
-    0x76c67800UL, 0x3fd741d8UL, 0x49dc60b3UL, 0x3d2d8b09UL, 0xe6af1800UL,
-    0x3fd6e60eUL, 0x7c222d87UL, 0x3d172165UL, 0x3e9c6800UL, 0x3fd68ac8UL,
-    0x2756eba0UL, 0x3d20a0d3UL, 0x0b3ab000UL, 0x3fd63003UL, 0xe731ae00UL,
-    0xbd2db623UL, 0xdf596000UL, 0x3fd5d5bdUL, 0x08a465dcUL, 0xbd0a0b2aUL,
-    0x53c8d000UL, 0x3fd57bf7UL, 0xee5d40efUL, 0x3d1fadedUL, 0x0738a000UL,
-    0x3fd522aeUL, 0x8164c759UL, 0x3d2ebe70UL, 0x9e173000UL, 0x3fd4c9e0UL,
-    0x1b0ad8a4UL, 0xbd2e2089UL, 0xc271c800UL, 0x3fd4718dUL, 0x0967d675UL,
-    0xbd2f27ceUL, 0x23d5e800UL, 0x3fd419b4UL, 0xec90e09dUL, 0x3d08e436UL,
-    0x77333000UL, 0x3fd3c252UL, 0xb606bd5cUL, 0x3d183b54UL, 0x76be1000UL,
-    0x3fd36b67UL, 0xb0f177c8UL, 0x3d116ecdUL, 0xe1d36000UL, 0x3fd314f1UL,
-    0xd3213cb8UL, 0xbd28e27aUL, 0x7cdc9000UL, 0x3fd2bef0UL, 0x4a5004f4UL,
-    0x3d2a9cfaUL, 0x1134d800UL, 0x3fd26962UL, 0xdf5bb3b6UL, 0x3d2c93c1UL,
-    0x6d0eb800UL, 0x3fd21445UL, 0xba46baeaUL, 0x3d0a87deUL, 0x635a6800UL,
-    0x3fd1bf99UL, 0x5147bdb7UL, 0x3d2ca6edUL, 0xcbacf800UL, 0x3fd16b5cUL,
-    0xf7a51681UL, 0x3d2b9acdUL, 0x8227e800UL, 0x3fd1178eUL, 0x63a5f01cUL,
-    0xbd2c210eUL, 0x67616000UL, 0x3fd0c42dUL, 0x163ceae9UL, 0x3d27188bUL,
-    0x604d5800UL, 0x3fd07138UL, 0x16ed4e91UL, 0x3cf89cdbUL, 0x5626c800UL,
-    0x3fd01eaeUL, 0x1485e94aUL, 0xbd16f08cUL, 0x6cb3b000UL, 0x3fcf991cUL,
-    0xca0cdf30UL, 0x3d1bcbecUL, 0xe4dd0000UL, 0x3fcef5adUL, 0x65bb8e11UL,
-    0xbcca2115UL, 0xffe71000UL, 0x3fce530eUL, 0x6041f430UL, 0x3cc21227UL,
-    0xb0d49000UL, 0x3fcdb13dUL, 0xf715b035UL, 0xbd2aff2aUL, 0xf2656000UL,
-    0x3fcd1037UL, 0x75b6f6e4UL, 0xbd084a7eUL, 0xc6f01000UL, 0x3fcc6ffbUL,
-    0xc5962bd2UL, 0xbcf1ec72UL, 0x383be000UL, 0x3fcbd087UL, 0x595412b6UL,
-    0xbd2d4bc4UL, 0x575bd000UL, 0x3fcb31d8UL, 0x4eace1aaUL, 0xbd0c358dUL,
-    0x3c8ae000UL, 0x3fca93edUL, 0x50562169UL, 0xbd287243UL, 0x07089000UL,
-    0x3fc9f6c4UL, 0x6865817aUL, 0x3d29904dUL, 0xdcf70000UL, 0x3fc95a5aUL,
-    0x58a0ff6fUL, 0x3d07f228UL, 0xeb390000UL, 0x3fc8beafUL, 0xaae92cd1UL,
-    0xbd073d54UL, 0x6551a000UL, 0x3fc823c1UL, 0x9a631e83UL, 0x3d1e0ddbUL,
-    0x85445000UL, 0x3fc7898dUL, 0x70914305UL, 0xbd1c6610UL, 0x8b757000UL,
-    0x3fc6f012UL, 0xe59c21e1UL, 0xbd25118dUL, 0xbe8c1000UL, 0x3fc6574eUL,
-    0x2c3c2e78UL, 0x3d19cf8bUL, 0x6b544000UL, 0x3fc5bf40UL, 0xeb68981cUL,
-    0xbd127023UL, 0xe4a1b000UL, 0x3fc527e5UL, 0xe5697dc7UL, 0x3d2633e8UL,
-    0x8333b000UL, 0x3fc4913dUL, 0x54fdb678UL, 0x3d258379UL, 0xa5993000UL,
-    0x3fc3fb45UL, 0x7e6a354dUL, 0xbd2cd1d8UL, 0xb0159000UL, 0x3fc365fcUL,
-    0x234b7289UL, 0x3cc62fa8UL, 0x0c868000UL, 0x3fc2d161UL, 0xcb81b4a1UL,
-    0x3d039d6cUL, 0x2a49c000UL, 0x3fc23d71UL, 0x8fd3df5cUL, 0x3d100d23UL,
-    0x7e23f000UL, 0x3fc1aa2bUL, 0x44389934UL, 0x3d2ca78eUL, 0x8227e000UL,
-    0x3fc1178eUL, 0xce2d07f2UL, 0x3d21ef78UL, 0xb59e4000UL, 0x3fc08598UL,
-    0x7009902cUL, 0xbd27e5ddUL, 0x39dbe000UL, 0x3fbfe891UL, 0x4fa10afdUL,
-    0xbd2534d6UL, 0x830a2000UL, 0x3fbec739UL, 0xafe645e0UL, 0xbd2dc068UL,
-    0x63844000UL, 0x3fbda727UL, 0x1fa71733UL, 0x3d1a8940UL, 0x01bc4000UL,
-    0x3fbc8858UL, 0xc65aacd3UL, 0x3d2646d1UL, 0x8dad6000UL, 0x3fbb6ac8UL,
-    0x2bf768e5UL, 0xbd139080UL, 0x40b1c000UL, 0x3fba4e76UL, 0xb94407c8UL,
-    0xbd0e42b6UL, 0x5d594000UL, 0x3fb9335eUL, 0x3abd47daUL, 0x3d23115cUL,
-    0x2f40e000UL, 0x3fb8197eUL, 0xf96ffdf7UL, 0x3d0f80dcUL, 0x0aeac000UL,
-    0x3fb700d3UL, 0xa99ded32UL, 0x3cec1e8dUL, 0x4d97a000UL, 0x3fb5e95aUL,
-    0x3c5d1d1eUL, 0xbd2c6906UL, 0x5d208000UL, 0x3fb4d311UL, 0x82f4e1efUL,
-    0xbcf53a25UL, 0xa7d1e000UL, 0x3fb3bdf5UL, 0xa5db4ed7UL, 0x3d2cc85eUL,
-    0xa4472000UL, 0x3fb2aa04UL, 0xae9c697dUL, 0xbd20b6e8UL, 0xd1466000UL,
-    0x3fb1973bUL, 0x560d9e9bUL, 0xbd25325dUL, 0xb59e4000UL, 0x3fb08598UL,
-    0x7009902cUL, 0xbd17e5ddUL, 0xc006c000UL, 0x3faeea31UL, 0x4fc93b7bUL,
-    0xbd0e113eUL, 0xcdddc000UL, 0x3faccb73UL, 0x47d82807UL, 0xbd1a68f2UL,
-    0xd0fb0000UL, 0x3faaaef2UL, 0x353bb42eUL, 0x3d20fc1aUL, 0x149fc000UL,
-    0x3fa894aaUL, 0xd05a267dUL, 0xbd197995UL, 0xf2d4c000UL, 0x3fa67c94UL,
-    0xec19afa2UL, 0xbd029efbUL, 0xd42e0000UL, 0x3fa466aeUL, 0x75bdfd28UL,
-    0xbd2c1673UL, 0x2f8d0000UL, 0x3fa252f3UL, 0xe021b67bUL, 0x3d283e9aUL,
-    0x89e74000UL, 0x3fa0415dUL, 0x5cf1d753UL, 0x3d0111c0UL, 0xec148000UL,
-    0x3f9c63d2UL, 0x3f9eb2f3UL, 0x3d2578c6UL, 0x28c90000UL, 0x3f984925UL,
-    0x325a0c34UL, 0xbd2aa0baUL, 0x25980000UL, 0x3f9432a9UL, 0x928637feUL,
-    0x3d098139UL, 0x58938000UL, 0x3f902056UL, 0x06e2f7d2UL, 0xbd23dc5bUL,
-    0xa3890000UL, 0x3f882448UL, 0xda74f640UL, 0xbd275577UL, 0x75890000UL,
-    0x3f801015UL, 0x999d2be8UL, 0xbd10c76bUL, 0x59580000UL, 0x3f700805UL,
-    0xcb31c67bUL, 0x3d2166afUL, 0x00000000UL, 0x00000000UL, 0x00000000UL,
-    0x80000000UL, 0xfefa3800UL, 0x3fa62e42UL, 0x93c76730UL, 0x3ceef357UL,
-    0x92492492UL, 0x3fc24924UL, 0x00000000UL, 0xbfd00000UL, 0x3d6fb175UL,
-    0xbfc5555eUL, 0x55555555UL, 0x3fd55555UL, 0x9999999aUL, 0x3fc99999UL,
-    0x00000000UL, 0xbfe00000UL, 0x00000000UL, 0xffffe000UL, 0x00000000UL,
-    0xffffe000UL
-};
-
-//registers,
-// input: xmm0
-// scratch: xmm1, xmm2, xmm3, xmm4, xmm5, xmm6, xmm7
-//          rax, rdx, rcx, rbx (tmp)
-void MacroAssembler::fast_log(XMMRegister xmm0, XMMRegister xmm1, XMMRegister xmm2, XMMRegister xmm3,
-                              XMMRegister xmm4, XMMRegister xmm5, XMMRegister xmm6, XMMRegister xmm7,
-                              Register eax, Register ecx, Register edx, Register tmp) {
-  Label L_2TAG_PACKET_0_0_2, L_2TAG_PACKET_1_0_2, L_2TAG_PACKET_2_0_2, L_2TAG_PACKET_3_0_2;
-  Label L_2TAG_PACKET_4_0_2, L_2TAG_PACKET_5_0_2, L_2TAG_PACKET_6_0_2, L_2TAG_PACKET_7_0_2;
-  Label L_2TAG_PACKET_8_0_2, L_2TAG_PACKET_9_0_2;
-  Label L_2TAG_PACKET_10_0_2;
-
-  assert_different_registers(tmp, eax, ecx, edx);
-  address static_const_table = (address)_static_const_table_log;
-
-  subl(rsp, 104);
-  movl(Address(rsp, 40), tmp);
-  lea(tmp, ExternalAddress(static_const_table));
-  xorpd(xmm2, xmm2);
-  movl(eax, 16368);
-  pinsrw(xmm2, eax, 3);
-  xorpd(xmm3, xmm3);
-  movl(edx, 30704);
-  pinsrw(xmm3, edx, 3);
-  movsd(xmm0, Address(rsp, 112));
-  movapd(xmm1, xmm0);
-  movl(ecx, 32768);
-  movdl(xmm4, ecx);
-  movsd(xmm5, Address(tmp, 2128));         // 0x00000000UL, 0xffffe000UL
-  pextrw(eax, xmm0, 3);
-  por(xmm0, xmm2);
-  psllq(xmm0, 5);
-  movl(ecx, 16352);
-  psrlq(xmm0, 34);
-  rcpss(xmm0, xmm0);
-  psllq(xmm1, 12);
-  pshufd(xmm6, xmm5, 228);
-  psrlq(xmm1, 12);
-  subl(eax, 16);
-  cmpl(eax, 32736);
-  jcc(Assembler::aboveEqual, L_2TAG_PACKET_0_0_2);
-
-  bind(L_2TAG_PACKET_1_0_2);
-  paddd(xmm0, xmm4);
-  por(xmm1, xmm3);
-  movdl(edx, xmm0);
-  psllq(xmm0, 29);
-  pand(xmm5, xmm1);
-  pand(xmm0, xmm6);
-  subsd(xmm1, xmm5);
-  mulpd(xmm5, xmm0);
-  andl(eax, 32752);
-  subl(eax, ecx);
-  cvtsi2sdl(xmm7, eax);
-  mulsd(xmm1, xmm0);
-  movsd(xmm6, Address(tmp, 2064));         // 0xfefa3800UL, 0x3fa62e42UL
-  movdqu(xmm3, Address(tmp, 2080));        // 0x92492492UL, 0x3fc24924UL, 0x00000000UL, 0xbfd00000UL
-  subsd(xmm5, xmm2);
-  andl(edx, 16711680);
-  shrl(edx, 12);
-  movdqu(xmm0, Address(tmp, edx));
-  movdqu(xmm4, Address(tmp, 2096));        // 0x3d6fb175UL, 0xbfc5555eUL, 0x55555555UL, 0x3fd55555UL
-  addsd(xmm1, xmm5);
-  movdqu(xmm2, Address(tmp, 2112));        // 0x9999999aUL, 0x3fc99999UL, 0x00000000UL, 0xbfe00000UL
-  mulsd(xmm6, xmm7);
-  pshufd(xmm5, xmm1, 68);
-  mulsd(xmm7, Address(tmp, 2072));         // 0x93c76730UL, 0x3ceef357UL, 0x92492492UL, 0x3fc24924UL
-  mulsd(xmm3, xmm1);
-  addsd(xmm0, xmm6);
-  mulpd(xmm4, xmm5);
-  mulpd(xmm5, xmm5);
-  pshufd(xmm6, xmm0, 228);
-  addsd(xmm0, xmm1);
-  addpd(xmm4, xmm2);
-  mulpd(xmm3, xmm5);
-  subsd(xmm6, xmm0);
-  mulsd(xmm4, xmm1);
-  pshufd(xmm2, xmm0, 238);
-  addsd(xmm1, xmm6);
-  mulsd(xmm5, xmm5);
-  addsd(xmm7, xmm2);
-  addpd(xmm4, xmm3);
-  addsd(xmm1, xmm7);
-  mulpd(xmm4, xmm5);
-  addsd(xmm1, xmm4);
-  pshufd(xmm5, xmm4, 238);
-  addsd(xmm1, xmm5);
-  addsd(xmm0, xmm1);
-  jmp(L_2TAG_PACKET_2_0_2);
-
-  bind(L_2TAG_PACKET_0_0_2);
-  movsd(xmm0, Address(rsp, 112));
-  movdqu(xmm1, xmm0);
-  addl(eax, 16);
-  cmpl(eax, 32768);
-  jcc(Assembler::aboveEqual, L_2TAG_PACKET_3_0_2);
-  cmpl(eax, 16);
-  jcc(Assembler::below, L_2TAG_PACKET_4_0_2);
-
-  bind(L_2TAG_PACKET_5_0_2);
-  addsd(xmm0, xmm0);
-  jmp(L_2TAG_PACKET_2_0_2);
-
-  bind(L_2TAG_PACKET_6_0_2);
-  jcc(Assembler::above, L_2TAG_PACKET_5_0_2);
-  cmpl(edx, 0);
-  jcc(Assembler::above, L_2TAG_PACKET_5_0_2);
-  jmp(L_2TAG_PACKET_7_0_2);
-
-  bind(L_2TAG_PACKET_3_0_2);
-  movdl(edx, xmm1);
-  psrlq(xmm1, 32);
-  movdl(ecx, xmm1);
-  addl(ecx, ecx);
-  cmpl(ecx, -2097152);
-  jcc(Assembler::aboveEqual, L_2TAG_PACKET_6_0_2);
-  orl(edx, ecx);
-  cmpl(edx, 0);
-  jcc(Assembler::equal, L_2TAG_PACKET_8_0_2);
-
-  bind(L_2TAG_PACKET_7_0_2);
-  xorpd(xmm1, xmm1);
-  xorpd(xmm0, xmm0);
-  movl(eax, 32752);
-  pinsrw(xmm1, eax, 3);
-  movl(edx, 3);
-  mulsd(xmm0, xmm1);
-
-  bind(L_2TAG_PACKET_9_0_2);
-  movsd(Address(rsp, 0), xmm0);
-  movsd(xmm0, Address(rsp, 112));
-  fld_d(Address(rsp, 0));
-  jmp(L_2TAG_PACKET_10_0_2);
-
-  bind(L_2TAG_PACKET_8_0_2);
-  xorpd(xmm1, xmm1);
-  xorpd(xmm0, xmm0);
-  movl(eax, 49136);
-  pinsrw(xmm0, eax, 3);
-  divsd(xmm0, xmm1);
-  movl(edx, 2);
-  jmp(L_2TAG_PACKET_9_0_2);
-
-  bind(L_2TAG_PACKET_4_0_2);
-  movdl(edx, xmm1);
-  psrlq(xmm1, 32);
-  movdl(ecx, xmm1);
-  orl(edx, ecx);
-  cmpl(edx, 0);
-  jcc(Assembler::equal, L_2TAG_PACKET_8_0_2);
-  xorpd(xmm1, xmm1);
-  movl(eax, 18416);
-  pinsrw(xmm1, eax, 3);
-  mulsd(xmm0, xmm1);
-  movapd(xmm1, xmm0);
-  pextrw(eax, xmm0, 3);
-  por(xmm0, xmm2);
-  psllq(xmm0, 5);
-  movl(ecx, 18416);
-  psrlq(xmm0, 34);
-  rcpss(xmm0, xmm0);
-  psllq(xmm1, 12);
-  pshufd(xmm6, xmm5, 228);
-  psrlq(xmm1, 12);
-  jmp(L_2TAG_PACKET_1_0_2);
-
-  bind(L_2TAG_PACKET_2_0_2);
-  movsd(Address(rsp, 24), xmm0);
-  fld_d(Address(rsp, 24));
-
-  bind(L_2TAG_PACKET_10_0_2);
-  movl(tmp, Address(rsp, 40));
-}
diff --git a/src/hotspot/cpu/x86/macroAssembler_x86_32_log10.cpp b/src/hotspot/cpu/x86/macroAssembler_x86_32_log10.cpp
deleted file mode 100644
index 1fc5f49cf75..00000000000
--- a/src/hotspot/cpu/x86/macroAssembler_x86_32_log10.cpp
+++ /dev/null
@@ -1,357 +0,0 @@
-/*
-* Copyright (c) 2016, 2021, Intel Corporation. All rights reserved.
-* Intel Math Library (LIBM) Source Code
-*
-* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-*
-* This code is free software; you can redistribute it and/or modify it
-* under the terms of the GNU General Public License version 2 only, as
-* published by the Free Software Foundation.
-*
-* This code is distributed in the hope that it will be useful, but WITHOUT
-* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-* FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-* version 2 for more details (a copy is included in the LICENSE file that
-* accompanied this code).
-*
-* You should have received a copy of the GNU General Public License version
-* 2 along with this work; if not, write to the Free Software Foundation,
-* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-*
-* Please 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 "asm/assembler.hpp"
-#include "asm/assembler.inline.hpp"
-#include "macroAssembler_x86.hpp"
-#include "runtime/stubRoutines.hpp"
-#include "utilities/globalDefinitions.hpp"
-
-/******************************************************************************/
-//                     ALGORITHM DESCRIPTION - LOG10()
-//                     ---------------------
-//
-//    Let x=2^k * mx, mx in [1,2)
-//
-//    Get B~1/mx based on the output of rcpss instruction (B0)
-//    B = int((B0*LH*2^7+0.5))/2^7
-//    LH is a short approximation for log10(e)
-//
-//    Reduced argument: r=B*mx-LH (computed accurately in high and low parts)
-//
-//    Result:  k*log10(2) - log(B) + p(r)
-//             p(r) is a degree 7 polynomial
-//             -log(B) read from data table (high, low parts)
-//             Result is formed from high and low parts
-//
-// Special cases:
-//  log10(0) = -INF with divide-by-zero exception raised
-//  log10(1) = +0
-//  log10(x) = NaN with invalid exception raised if x < -0, including -INF
-//  log10(+INF) = +INF
-//
-/******************************************************************************/
-
-// The 32 bit code is at most SSE2 compliant
-
-ATTRIBUTE_ALIGNED(16) static const juint _static_const_table_log10[] =
-{
-    0x509f7800UL, 0x3fd34413UL, 0x1f12b358UL, 0x3d1fef31UL, 0x80333400UL,
-    0x3fd32418UL, 0xc671d9d0UL, 0xbcf542bfUL, 0x51195000UL, 0x3fd30442UL,
-    0x78a4b0c3UL, 0x3d18216aUL, 0x6fc79400UL, 0x3fd2e490UL, 0x80fa389dUL,
-    0xbc902869UL, 0x89d04000UL, 0x3fd2c502UL, 0x75c2f564UL, 0x3d040754UL,
-    0x4ddd1c00UL, 0x3fd2a598UL, 0xd219b2c3UL, 0xbcfa1d84UL, 0x6baa7c00UL,
-    0x3fd28651UL, 0xfd9abec1UL, 0x3d1be6d3UL, 0x94028800UL, 0x3fd2672dUL,
-    0xe289a455UL, 0xbd1ede5eUL, 0x78b86400UL, 0x3fd2482cUL, 0x6734d179UL,
-    0x3d1fe79bUL, 0xcca3c800UL, 0x3fd2294dUL, 0x981a40b8UL, 0xbced34eaUL,
-    0x439c5000UL, 0x3fd20a91UL, 0xcc392737UL, 0xbd1a9cc3UL, 0x92752c00UL,
-    0x3fd1ebf6UL, 0x03c9afe7UL, 0x3d1e98f8UL, 0x6ef8dc00UL, 0x3fd1cd7dUL,
-    0x71dae7f4UL, 0x3d08a86cUL, 0x8fe4dc00UL, 0x3fd1af25UL, 0xee9185a1UL,
-    0xbcff3412UL, 0xace59400UL, 0x3fd190eeUL, 0xc2cab353UL, 0x3cf17ed9UL,
-    0x7e925000UL, 0x3fd172d8UL, 0x6952c1b2UL, 0x3cf1521cUL, 0xbe694400UL,
-    0x3fd154e2UL, 0xcacb79caUL, 0xbd0bdc78UL, 0x26cbac00UL, 0x3fd1370dUL,
-    0xf71f4de1UL, 0xbd01f8beUL, 0x72fa0800UL, 0x3fd11957UL, 0x55bf910bUL,
-    0x3c946e2bUL, 0x5f106000UL, 0x3fd0fbc1UL, 0x39e639c1UL, 0x3d14a84bUL,
-    0xa802a800UL, 0x3fd0de4aUL, 0xd3f31d5dUL, 0xbd178385UL, 0x0b992000UL,
-    0x3fd0c0f3UL, 0x3843106fUL, 0xbd1f602fUL, 0x486ce800UL, 0x3fd0a3baUL,
-    0x8819497cUL, 0x3cef987aUL, 0x1de49400UL, 0x3fd086a0UL, 0x1caa0467UL,
-    0x3d0faec7UL, 0x4c30cc00UL, 0x3fd069a4UL, 0xa4424372UL, 0xbd1618fcUL,
-    0x94490000UL, 0x3fd04cc6UL, 0x946517d2UL, 0xbd18384bUL, 0xb7e84000UL,
-    0x3fd03006UL, 0xe0109c37UL, 0xbd19a6acUL, 0x798a0c00UL, 0x3fd01364UL,
-    0x5121e864UL, 0xbd164cf7UL, 0x38ce8000UL, 0x3fcfedbfUL, 0x46214d1aUL,
-    0xbcbbc402UL, 0xc8e62000UL, 0x3fcfb4efUL, 0xdab93203UL, 0x3d1e0176UL,
-    0x2cb02800UL, 0x3fcf7c5aUL, 0x2a2ea8e4UL, 0xbcfec86aUL, 0xeeeaa000UL,
-    0x3fcf43fdUL, 0xc18e49a4UL, 0x3cf110a8UL, 0x9bb6e800UL, 0x3fcf0bdaUL,
-    0x923cc9c0UL, 0xbd15ce99UL, 0xc093f000UL, 0x3fced3efUL, 0x4d4b51e9UL,
-    0x3d1a04c7UL, 0xec58f800UL, 0x3fce9c3cUL, 0x163cad59UL, 0x3cac8260UL,
-    0x9a907000UL, 0x3fce2d7dUL, 0x3fa93646UL, 0x3ce4a1c0UL, 0x37311000UL,
-    0x3fcdbf99UL, 0x32abd1fdUL, 0x3d07ea9dUL, 0x6744b800UL, 0x3fcd528cUL,
-    0x4dcbdfd4UL, 0xbd1b08e2UL, 0xe36de800UL, 0x3fcce653UL, 0x0b7b7f7fUL,
-    0xbd1b8f03UL, 0x77506800UL, 0x3fcc7aecUL, 0xa821c9fbUL, 0x3d13c163UL,
-    0x00ff8800UL, 0x3fcc1053UL, 0x536bca76UL, 0xbd074ee5UL, 0x70719800UL,
-    0x3fcba684UL, 0xd7da9b6bUL, 0xbd1fbf16UL, 0xc6f8d800UL, 0x3fcb3d7dUL,
-    0xe2220bb3UL, 0x3d1a295dUL, 0x16c15800UL, 0x3fcad53cUL, 0xe724911eUL,
-    0xbcf55822UL, 0x82533800UL, 0x3fca6dbcUL, 0x6d982371UL, 0x3cac567cUL,
-    0x3c19e800UL, 0x3fca06fcUL, 0x84d17d80UL, 0x3d1da204UL, 0x85ef8000UL,
-    0x3fc9a0f8UL, 0x54466a6aUL, 0xbd002204UL, 0xb0ac2000UL, 0x3fc93baeUL,
-    0xd601fd65UL, 0x3d18840cUL, 0x1bb9b000UL, 0x3fc8d71cUL, 0x7bf58766UL,
-    0xbd14f897UL, 0x34aae800UL, 0x3fc8733eUL, 0x3af6ac24UL, 0xbd0f5c45UL,
-    0x76d68000UL, 0x3fc81012UL, 0x4303e1a1UL, 0xbd1f9a80UL, 0x6af57800UL,
-    0x3fc7ad96UL, 0x43fbcb46UL, 0x3cf4c33eUL, 0xa6c51000UL, 0x3fc74bc7UL,
-    0x70f0eac5UL, 0xbd192e3bUL, 0xccab9800UL, 0x3fc6eaa3UL, 0xc0093dfeUL,
-    0xbd0faf15UL, 0x8b60b800UL, 0x3fc68a28UL, 0xde78d5fdUL, 0xbc9ea4eeUL,
-    0x9d987000UL, 0x3fc62a53UL, 0x962bea6eUL, 0xbd194084UL, 0xc9b0e800UL,
-    0x3fc5cb22UL, 0x888dd999UL, 0x3d1fe201UL, 0xe1634800UL, 0x3fc56c93UL,
-    0x16ada7adUL, 0x3d1b1188UL, 0xc176c000UL, 0x3fc50ea4UL, 0x4159b5b5UL,
-    0xbcf09c08UL, 0x51766000UL, 0x3fc4b153UL, 0x84393d23UL, 0xbcf6a89cUL,
-    0x83695000UL, 0x3fc4549dUL, 0x9f0b8bbbUL, 0x3d1c4b8cUL, 0x538d5800UL,
-    0x3fc3f881UL, 0xf49df747UL, 0x3cf89b99UL, 0xc8138000UL, 0x3fc39cfcUL,
-    0xd503b834UL, 0xbd13b99fUL, 0xf0df0800UL, 0x3fc3420dUL, 0xf011b386UL,
-    0xbd05d8beUL, 0xe7466800UL, 0x3fc2e7b2UL, 0xf39c7bc2UL, 0xbd1bb94eUL,
-    0xcdd62800UL, 0x3fc28de9UL, 0x05e6d69bUL, 0xbd10ed05UL, 0xd015d800UL,
-    0x3fc234b0UL, 0xe29b6c9dUL, 0xbd1ff967UL, 0x224ea800UL, 0x3fc1dc06UL,
-    0x727711fcUL, 0xbcffb30dUL, 0x01540000UL, 0x3fc183e8UL, 0x39786c5aUL,
-    0x3cc23f57UL, 0xb24d9800UL, 0x3fc12c54UL, 0xc905a342UL, 0x3d003a1dUL,
-    0x82835800UL, 0x3fc0d54aUL, 0x9b9920c0UL, 0x3d03b25aUL, 0xc72ac000UL,
-    0x3fc07ec7UL, 0x46f26a24UL, 0x3cf0fa41UL, 0xdd35d800UL, 0x3fc028caUL,
-    0x41d9d6dcUL, 0x3d034a65UL, 0x52474000UL, 0x3fbfa6a4UL, 0x44f66449UL,
-    0x3d19cad3UL, 0x2da3d000UL, 0x3fbefcb8UL, 0x67832999UL, 0x3d18400fUL,
-    0x32a10000UL, 0x3fbe53ceUL, 0x9c0e3b1aUL, 0xbcff62fdUL, 0x556b7000UL,
-    0x3fbdabe3UL, 0x02976913UL, 0xbcf8243bUL, 0x97e88000UL, 0x3fbd04f4UL,
-    0xec793797UL, 0x3d1c0578UL, 0x09647000UL, 0x3fbc5effUL, 0x05fc0565UL,
-    0xbd1d799eUL, 0xc6426000UL, 0x3fbbb9ffUL, 0x4625f5edUL, 0x3d1f5723UL,
-    0xf7afd000UL, 0x3fbb15f3UL, 0xdd5aae61UL, 0xbd1a7e1eUL, 0xd358b000UL,
-    0x3fba72d8UL, 0x3314e4d3UL, 0x3d17bc91UL, 0x9b1f5000UL, 0x3fb9d0abUL,
-    0x9a4d514bUL, 0x3cf18c9bUL, 0x9cd4e000UL, 0x3fb92f69UL, 0x7e4496abUL,
-    0x3cf1f96dUL, 0x31f4f000UL, 0x3fb88f10UL, 0xf56479e7UL, 0x3d165818UL,
-    0xbf628000UL, 0x3fb7ef9cUL, 0x26bf486dUL, 0xbd1113a6UL, 0xb526b000UL,
-    0x3fb7510cUL, 0x1a1c3384UL, 0x3ca9898dUL, 0x8e31e000UL, 0x3fb6b35dUL,
-    0xb3875361UL, 0xbd0661acUL, 0xd01de000UL, 0x3fb6168cUL, 0x2a7cacfaUL,
-    0xbd1bdf10UL, 0x0af23000UL, 0x3fb57a98UL, 0xff868816UL, 0x3cf046d0UL,
-    0xd8ea0000UL, 0x3fb4df7cUL, 0x1515fbe7UL, 0xbd1fd529UL, 0xde3b2000UL,
-    0x3fb44538UL, 0x6e59a132UL, 0x3d1faeeeUL, 0xc8df9000UL, 0x3fb3abc9UL,
-    0xf1322361UL, 0xbd198807UL, 0x505f1000UL, 0x3fb3132dUL, 0x0888e6abUL,
-    0x3d1e5380UL, 0x359bd000UL, 0x3fb27b61UL, 0xdfbcbb22UL, 0xbcfe2724UL,
-    0x429ee000UL, 0x3fb1e463UL, 0x6eb4c58cUL, 0xbcfe4dd6UL, 0x4a673000UL,
-    0x3fb14e31UL, 0x4ce1ac9bUL, 0x3d1ba691UL, 0x28b96000UL, 0x3fb0b8c9UL,
-    0x8c7813b8UL, 0xbd0b3872UL, 0xc1f08000UL, 0x3fb02428UL, 0xc2bc8c2cUL,
-    0x3cb5ea6bUL, 0x05a1a000UL, 0x3faf209cUL, 0x72e8f18eUL, 0xbce8df84UL,
-    0xc0b5e000UL, 0x3fadfa6dUL, 0x9fdef436UL, 0x3d087364UL, 0xaf416000UL,
-    0x3facd5c2UL, 0x1068c3a9UL, 0x3d0827e7UL, 0xdb356000UL, 0x3fabb296UL,
-    0x120a34d3UL, 0x3d101a9fUL, 0x5dfea000UL, 0x3faa90e6UL, 0xdaded264UL,
-    0xbd14c392UL, 0x6034c000UL, 0x3fa970adUL, 0x1c9d06a9UL, 0xbd1b705eUL,
-    0x194c6000UL, 0x3fa851e8UL, 0x83996ad9UL, 0xbd0117bcUL, 0xcf4ac000UL,
-    0x3fa73492UL, 0xb1a94a62UL, 0xbca5ea42UL, 0xd67b4000UL, 0x3fa618a9UL,
-    0x75aed8caUL, 0xbd07119bUL, 0x9126c000UL, 0x3fa4fe29UL, 0x5291d533UL,
-    0x3d12658fUL, 0x6f4d4000UL, 0x3fa3e50eUL, 0xcd2c5cd9UL, 0x3d1d5c70UL,
-    0xee608000UL, 0x3fa2cd54UL, 0xd1008489UL, 0x3d1a4802UL, 0x9900e000UL,
-    0x3fa1b6f9UL, 0x54fb5598UL, 0xbd16593fUL, 0x06bb6000UL, 0x3fa0a1f9UL,
-    0x64ef57b4UL, 0xbd17636bUL, 0xb7940000UL, 0x3f9f1c9fUL, 0xee6a4737UL,
-    0x3cb5d479UL, 0x91aa0000UL, 0x3f9cf7f5UL, 0x3a16373cUL, 0x3d087114UL,
-    0x156b8000UL, 0x3f9ad5edUL, 0x836c554aUL, 0x3c6900b0UL, 0xd4764000UL,
-    0x3f98b67fUL, 0xed12f17bUL, 0xbcffc974UL, 0x77dec000UL, 0x3f9699a7UL,
-    0x232ce7eaUL, 0x3d1e35bbUL, 0xbfbf4000UL, 0x3f947f5dUL, 0xd84ffa6eUL,
-    0x3d0e0a49UL, 0x82c7c000UL, 0x3f92679cUL, 0x8d170e90UL, 0xbd14d9f2UL,
-    0xadd20000UL, 0x3f90525dUL, 0x86d9f88eUL, 0x3cdeb986UL, 0x86f10000UL,
-    0x3f8c7f36UL, 0xb9e0a517UL, 0x3ce29faaUL, 0xb75c8000UL, 0x3f885e9eUL,
-    0x542568cbUL, 0xbd1f7bdbUL, 0x46b30000UL, 0x3f8442e8UL, 0xb954e7d9UL,
-    0x3d1e5287UL, 0xb7e60000UL, 0x3f802c07UL, 0x22da0b17UL, 0xbd19fb27UL,
-    0x6c8b0000UL, 0x3f7833e3UL, 0x821271efUL, 0xbd190f96UL, 0x29910000UL,
-    0x3f701936UL, 0xbc3491a5UL, 0xbd1bcf45UL, 0x354a0000UL, 0x3f600fe3UL,
-    0xc0ff520aUL, 0xbd19d71cUL, 0x00000000UL, 0x00000000UL, 0x00000000UL,
-    0x00000000UL, 0x509f7800UL, 0x3f934413UL, 0x1f12b358UL, 0x3cdfef31UL,
-    0xc1a5f12eUL, 0x40358874UL, 0x64d4ef0dUL, 0xc0089309UL, 0x385593b1UL,
-    0xc025c917UL, 0xdc963467UL, 0x3ffc6a02UL, 0x7f9d3aa1UL, 0x4016ab9fUL,
-    0xdc77b115UL, 0xbff27af2UL, 0xf8000000UL, 0xffffffffUL, 0x00000000UL,
-    0xffffe000UL, 0x00000000UL, 0x3fdbc000UL, 0xbf2e4108UL, 0x3f5a7a6cUL
-};
-//registers,
-// input: xmm0
-// scratch: xmm1, xmm2, xmm3, xmm4, xmm5, xmm6, xmm7
-//          rax, rdx, rcx, rbx (tmp)
-
-void MacroAssembler::fast_log10(XMMRegister xmm0, XMMRegister xmm1, XMMRegister xmm2, XMMRegister xmm3,
-                                XMMRegister xmm4, XMMRegister xmm5, XMMRegister xmm6, XMMRegister xmm7,
-                                Register eax, Register ecx, Register edx, Register tmp) {
-
-  Label L_2TAG_PACKET_0_0_2, L_2TAG_PACKET_1_0_2, L_2TAG_PACKET_2_0_2, L_2TAG_PACKET_3_0_2;
-  Label L_2TAG_PACKET_4_0_2, L_2TAG_PACKET_5_0_2, L_2TAG_PACKET_6_0_2, L_2TAG_PACKET_7_0_2;
-  Label L_2TAG_PACKET_8_0_2, L_2TAG_PACKET_9_0_2, L_2TAG_PACKET_10_0_2;
-
-  assert_different_registers(tmp, eax, ecx, edx);
-
-  address static_const_table_log10 = (address)_static_const_table_log10;
-
-  subl(rsp, 104);
-  movl(Address(rsp, 40), tmp);
-  lea(tmp, ExternalAddress(static_const_table_log10));
-  xorpd(xmm2, xmm2);
-  movl(eax, 16368);
-  pinsrw(xmm2, eax, 3);
-  movl(ecx, 1054736384);
-  movdl(xmm7, ecx);
-  xorpd(xmm3, xmm3);
-  movl(edx, 30704);
-  pinsrw(xmm3, edx, 3);
-  movsd(xmm0, Address(rsp, 112));
-  movdqu(xmm1, xmm0);
-  movl(edx, 32768);
-  movdl(xmm4, edx);
-  movdqu(xmm5, Address(tmp, 2128));    //0x3ffc6a02UL, 0x7f9d3aa1UL, 0x4016ab9fUL, 0xdc77b115UL
-  pextrw(eax, xmm0, 3);
-  por(xmm0, xmm2);
-  movl(ecx, 16352);
-  psllq(xmm0, 5);
-  movsd(xmm2, Address(tmp, 2144));    //0xbff27af2UL, 0xf8000000UL, 0xffffffffUL, 0x00000000UL
-  psrlq(xmm0, 34);
-  rcpss(xmm0, xmm0);
-  psllq(xmm1, 12);
-  pshufd(xmm6, xmm5, 78);
-  psrlq(xmm1, 12);
-  subl(eax, 16);
-  cmpl(eax, 32736);
-  jcc(Assembler::aboveEqual, L_2TAG_PACKET_0_0_2);
-
-  bind(L_2TAG_PACKET_1_0_2);
-  mulss(xmm0, xmm7);
-  por(xmm1, xmm3);
-  andpd(xmm5, xmm1);
-  paddd(xmm0, xmm4);
-  subsd(xmm1, xmm5);
-  movdl(edx, xmm0);
-  psllq(xmm0, 29);
-  andpd(xmm0, xmm6);
-  andl(eax, 32752);
-  subl(eax, ecx);
-  cvtsi2sdl(xmm7, eax);
-  mulpd(xmm5, xmm0);
-  mulsd(xmm1, xmm0);
-  movsd(xmm6, Address(tmp, 2064));    //0xbd19d71cUL, 0x00000000UL, 0x00000000UL, 0x00000000UL
-  movdqu(xmm3, Address(tmp, 2080));    //0x00000000UL, 0x509f7800UL, 0x3f934413UL, 0x1f12b358UL
-  subsd(xmm5, xmm2);
-  andl(edx, 16711680);
-  shrl(edx, 12);
-  movdqu(xmm0, Address(tmp, edx, Address::times_1, -1504));
-  movdqu(xmm4, Address(tmp, 2096));    //0x3cdfef31UL, 0xc1a5f12eUL, 0x40358874UL, 0x64d4ef0dUL
-  addsd(xmm1, xmm5);
-  movdqu(xmm2, Address(tmp, 2112));    //0xc0089309UL, 0x385593b1UL, 0xc025c917UL, 0xdc963467UL
-  mulsd(xmm6, xmm7);
-  pshufd(xmm5, xmm1, 68);
-  mulsd(xmm7, Address(tmp, 2072));    //0x00000000UL, 0x00000000UL, 0x00000000UL, 0x509f7800UL
-  mulsd(xmm3, xmm1);
-  addsd(xmm0, xmm6);
-  mulpd(xmm4, xmm5);
-  movsd(xmm6, Address(tmp, 2152));    //0xffffffffUL, 0x00000000UL, 0xffffe000UL, 0x00000000UL
-  mulpd(xmm5, xmm5);
-  addpd(xmm4, xmm2);
-  mulpd(xmm3, xmm5);
-  pshufd(xmm2, xmm0, 228);
-  addsd(xmm0, xmm1);
-  mulsd(xmm4, xmm1);
-  subsd(xmm2, xmm0);
-  mulsd(xmm6, xmm1);
-  addsd(xmm1, xmm2);
-  pshufd(xmm2, xmm0, 238);
-  mulsd(xmm5, xmm5);
-  addsd(xmm7, xmm2);
-  addsd(xmm1, xmm6);
-  addpd(xmm4, xmm3);
-  addsd(xmm1, xmm7);
-  mulpd(xmm4, xmm5);
-  addsd(xmm1, xmm4);
-  pshufd(xmm5, xmm4, 238);
-  addsd(xmm1, xmm5);
-  addsd(xmm0, xmm1);
-  jmp(L_2TAG_PACKET_2_0_2);
-
-  bind(L_2TAG_PACKET_0_0_2);
-  movsd(xmm0, Address(rsp, 112));    //0xbcfa1d84UL, 0x6baa7c00UL, 0x3fd28651UL, 0xfd9abec1UL
-  movdqu(xmm1, xmm0);
-  addl(eax, 16);
-  cmpl(eax, 32768);
-  jcc(Assembler::aboveEqual, L_2TAG_PACKET_3_0_2);
-  cmpl(eax, 16);
-  jcc(Assembler::below, L_2TAG_PACKET_4_0_2);
-
-  bind(L_2TAG_PACKET_5_0_2);
-  addsd(xmm0, xmm0);
-  jmp(L_2TAG_PACKET_2_0_2);
-
-  bind(L_2TAG_PACKET_6_0_2);
-  jcc(Assembler::above, L_2TAG_PACKET_5_0_2);
-  cmpl(edx, 0);
-  jcc(Assembler::above, L_2TAG_PACKET_5_0_2);
-  jmp(L_2TAG_PACKET_7_0_2);
-
-  bind(L_2TAG_PACKET_3_0_2);
-  movdl(edx, xmm1);
-  psrlq(xmm1, 32);
-  movdl(ecx, xmm1);
-  addl(ecx, ecx);
-  cmpl(ecx, -2097152);
-  jcc(Assembler::aboveEqual, L_2TAG_PACKET_6_0_2);
-  orl(edx, ecx);
-  cmpl(edx, 0);
-  jcc(Assembler::equal, L_2TAG_PACKET_8_0_2);
-
-  bind(L_2TAG_PACKET_7_0_2);
-  xorpd(xmm1, xmm1);
-  xorpd(xmm0, xmm0);
-  movl(eax, 32752);
-  pinsrw(xmm1, eax, 3);
-  movl(edx, 9);
-  mulsd(xmm0, xmm1);
-
-  bind(L_2TAG_PACKET_9_0_2);
-  movsd(Address(rsp, 0), xmm0);
-  movsd(xmm0, Address(rsp, 112));    //0xbcfa1d84UL, 0x6baa7c00UL, 0x3fd28651UL, 0xfd9abec1UL
-  fld_d(Address(rsp, 0));
-  jmp(L_2TAG_PACKET_10_0_2);
-
-  bind(L_2TAG_PACKET_8_0_2);
-  xorpd(xmm1, xmm1);
-  xorpd(xmm0, xmm0);
-  movl(eax, 49136);
-  pinsrw(xmm0, eax, 3);
-  divsd(xmm0, xmm1);
-  movl(edx, 8);
-  jmp(L_2TAG_PACKET_9_0_2);
-
-  bind(L_2TAG_PACKET_4_0_2);
-  movdl(edx, xmm1);
-  psrlq(xmm1, 32);
-  movdl(ecx, xmm1);
-  orl(edx, ecx);
-  cmpl(edx, 0);
-  jcc(Assembler::equal, L_2TAG_PACKET_8_0_2);
-  xorpd(xmm1, xmm1);
-  movl(eax, 18416);
-  pinsrw(xmm1, eax, 3);
-  mulsd(xmm0, xmm1);
-  xorpd(xmm2, xmm2);
-  movl(eax, 16368);
-  pinsrw(xmm2, eax, 3);
-  movdqu(xmm1, xmm0);
-  pextrw(eax, xmm0, 3);
-  por(xmm0, xmm2);
-  movl(ecx, 18416);
-  psllq(xmm0, 5);
-  movsd(xmm2, Address(tmp, 2144));    //0xbff27af2UL, 0xf8000000UL, 0xffffffffUL, 0x00000000UL
-  psrlq(xmm0, 34);
-  rcpss(xmm0, xmm0);
-  psllq(xmm1, 12);
-  pshufd(xmm6, xmm5, 78);
-  psrlq(xmm1, 12);
-  jmp(L_2TAG_PACKET_1_0_2);
-
-  bind(L_2TAG_PACKET_2_0_2);
-  movsd(Address(rsp, 24), xmm0);
-  fld_d(Address(rsp, 24));
-
-  bind(L_2TAG_PACKET_10_0_2);
-  movl(tmp, Address(rsp, 40));
-
-}
diff --git a/src/hotspot/cpu/x86/macroAssembler_x86_32_pow.cpp b/src/hotspot/cpu/x86/macroAssembler_x86_32_pow.cpp
deleted file mode 100644
index 2d8a8ef91ac..00000000000
--- a/src/hotspot/cpu/x86/macroAssembler_x86_32_pow.cpp
+++ /dev/null
@@ -1,1855 +0,0 @@
-/*
-* Copyright (c) 2016, 2021, Intel Corporation. All rights reserved.
-* Copyright (C) 2021 THL A29 Limited, a Tencent company. All rights reserved.
-* Intel Math Library (LIBM) Source Code
-*
-* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-*
-* This code is free software; you can redistribute it and/or modify it
-* under the terms of the GNU General Public License version 2 only, as
-* published by the Free Software Foundation.
-*
-* This code is distributed in the hope that it will be useful, but WITHOUT
-* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-* FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-* version 2 for more details (a copy is included in the LICENSE file that
-* accompanied this code).
-*
-* You should have received a copy of the GNU General Public License version
-* 2 along with this work; if not, write to the Free Software Foundation,
-* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-*
-* Please 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 "asm/assembler.hpp"
-#include "asm/assembler.inline.hpp"
-#include "macroAssembler_x86.hpp"
-#include "runtime/stubRoutines.hpp"
-#include "utilities/globalDefinitions.hpp"
-
-/******************************************************************************/
-//                     ALGORITHM DESCRIPTION  - POW()
-//                     ---------------------
-//
-//    Let x=2^k * mx, mx in [1,2)
-//
-//    log2(x) calculation:
-//
-//    Get B~1/mx based on the output of rcpps instruction (B0)
-//    B = int((B0*LH*2^9+0.5))/2^9
-//    LH is a short approximation for log2(e)
-//
-//    Reduced argument, scaled by LH:
-//                r=B*mx-LH (computed accurately in high and low parts)
-//
-//    log2(x) result:  k - log2(B) + p(r)
-//             p(r) is a degree 8 polynomial
-//             -log2(B) read from data table (high, low parts)
-//             log2(x) is formed from high and low parts
-//    For |x| in [1-1/32, 1+1/16), a slower but more accurate computation
-//    based om the same table design is performed.
-//
-//   Main path is taken if | floor(log2(|log2(|x|)|) + floor(log2|y|) | < 8,
-//   to filter out all potential OF/UF cases.
-//   exp2(y*log2(x)) is computed using an 8-bit index table and a degree 5
-//   polynomial
-//
-// Special cases:
-//  pow(-0,y) = -INF and raises the divide-by-zero exception for y an odd
-//  integer < 0.
-//  pow(-0,y) = +INF and raises the divide-by-zero exception for y < 0 and
-//  not an odd integer.
-//  pow(-0,y) = -0 for y an odd integer > 0.
-//  pow(-0,y) = +0 for y > 0 and not an odd integer.
-//  pow(-1,-INF) = NaN.
-//  pow(+1,y) = NaN for any y, even a NaN.
-//  pow(x,-0) = 1 for any x, even a NaN.
-//  pow(x,y) = a NaN and raises the invalid exception for finite x < 0 and
-//  finite non-integer y.
-//  pow(x,-INF) = +INF for |x|<1.
-//  pow(x,-INF) = +0 for |x|>1.
-//  pow(x,+INF) = +0 for |x|<1.
-//  pow(x,+INF) = +INF for |x|>1.
-//  pow(-INF,y) = -0 for y an odd integer < 0.
-//  pow(-INF,y) = +0 for y < 0 and not an odd integer.
-//  pow(-INF,y) = -INF for y an odd integer > 0.
-//  pow(-INF,y) = +INF for y > 0 and not an odd integer.
-//  pow(+INF,y) = +0 for y <0.
-//  pow(+INF,y) = +INF for y >0.
-//
-/******************************************************************************/
-
-// The 32 bit code is at most SSE2 compliant
-ATTRIBUTE_ALIGNED(16) static const juint _static_const_table_pow[] =
-{
-    0x00000000UL, 0xbfd61a00UL, 0x00000000UL, 0xbf5dabe1UL, 0xf8000000UL,
-    0xffffffffUL, 0x00000000UL, 0xfffff800UL, 0x00000000UL, 0x3ff00000UL,
-    0x00000000UL, 0x00000000UL, 0x20000000UL, 0x3feff00aUL, 0x96621f95UL,
-    0x3e5b1856UL, 0xe0000000UL, 0x3fefe019UL, 0xe5916f9eUL, 0xbe325278UL,
-    0x00000000UL, 0x3fefd02fUL, 0x859a1062UL, 0x3e595fb7UL, 0xc0000000UL,
-    0x3fefc049UL, 0xb245f18fUL, 0xbe529c38UL, 0xe0000000UL, 0x3fefb069UL,
-    0xad2880a7UL, 0xbe501230UL, 0x60000000UL, 0x3fefa08fUL, 0xc8e72420UL,
-    0x3e597bd1UL, 0x80000000UL, 0x3fef90baUL, 0xc30c4500UL, 0xbe5d6c75UL,
-    0xe0000000UL, 0x3fef80eaUL, 0x02c63f43UL, 0x3e2e1318UL, 0xc0000000UL,
-    0x3fef7120UL, 0xb3d4ccccUL, 0xbe44c52aUL, 0x00000000UL, 0x3fef615cUL,
-    0xdbd91397UL, 0xbe4e7d6cUL, 0xa0000000UL, 0x3fef519cUL, 0x65c5cd68UL,
-    0xbe522dc8UL, 0xa0000000UL, 0x3fef41e2UL, 0x46d1306cUL, 0xbe5a840eUL,
-    0xe0000000UL, 0x3fef322dUL, 0xd2980e94UL, 0x3e5071afUL, 0xa0000000UL,
-    0x3fef227eUL, 0x773abadeUL, 0xbe5891e5UL, 0xa0000000UL, 0x3fef12d4UL,
-    0xdc6bf46bUL, 0xbe5cccbeUL, 0xe0000000UL, 0x3fef032fUL, 0xbc7247faUL,
-    0xbe2bab83UL, 0x80000000UL, 0x3feef390UL, 0xbcaa1e46UL, 0xbe53bb3bUL,
-    0x60000000UL, 0x3feee3f6UL, 0x5f6c682dUL, 0xbe54c619UL, 0x80000000UL,
-    0x3feed461UL, 0x5141e368UL, 0xbe4b6d86UL, 0xe0000000UL, 0x3feec4d1UL,
-    0xec678f76UL, 0xbe369af6UL, 0x80000000UL, 0x3feeb547UL, 0x41301f55UL,
-    0xbe2d4312UL, 0x60000000UL, 0x3feea5c2UL, 0x676da6bdUL, 0xbe4d8dd0UL,
-    0x60000000UL, 0x3fee9642UL, 0x57a891c4UL, 0x3e51f991UL, 0xa0000000UL,
-    0x3fee86c7UL, 0xe4eb491eUL, 0x3e579bf9UL, 0x20000000UL, 0x3fee7752UL,
-    0xfddc4a2cUL, 0xbe3356e6UL, 0xc0000000UL, 0x3fee67e1UL, 0xd75b5bf1UL,
-    0xbe449531UL, 0x80000000UL, 0x3fee5876UL, 0xbd423b8eUL, 0x3df54fe4UL,
-    0x60000000UL, 0x3fee4910UL, 0x330e51b9UL, 0x3e54289cUL, 0x80000000UL,
-    0x3fee39afUL, 0x8651a95fUL, 0xbe55aad6UL, 0xa0000000UL, 0x3fee2a53UL,
-    0x5e98c708UL, 0xbe2fc4a9UL, 0xe0000000UL, 0x3fee1afcUL, 0x0989328dUL,
-    0x3e23958cUL, 0x40000000UL, 0x3fee0babUL, 0xee642abdUL, 0xbe425dd8UL,
-    0xa0000000UL, 0x3fedfc5eUL, 0xc394d236UL, 0x3e526362UL, 0x20000000UL,
-    0x3feded17UL, 0xe104aa8eUL, 0x3e4ce247UL, 0xc0000000UL, 0x3fedddd4UL,
-    0x265a9be4UL, 0xbe5bb77aUL, 0x40000000UL, 0x3fedce97UL, 0x0ecac52fUL,
-    0x3e4a7cb1UL, 0xe0000000UL, 0x3fedbf5eUL, 0x124cb3b8UL, 0x3e257024UL,
-    0x80000000UL, 0x3fedb02bUL, 0xe6d4febeUL, 0xbe2033eeUL, 0x20000000UL,
-    0x3feda0fdUL, 0x39cca00eUL, 0xbe3ddabcUL, 0xc0000000UL, 0x3fed91d3UL,
-    0xef8a552aUL, 0xbe543390UL, 0x40000000UL, 0x3fed82afUL, 0xb8e85204UL,
-    0x3e513850UL, 0xe0000000UL, 0x3fed738fUL, 0x3d59fe08UL, 0xbe5db728UL,
-    0x40000000UL, 0x3fed6475UL, 0x3aa7ead1UL, 0x3e58804bUL, 0xc0000000UL,
-    0x3fed555fUL, 0xf8a35ba9UL, 0xbe5298b0UL, 0x00000000UL, 0x3fed464fUL,
-    0x9a88dd15UL, 0x3e5a8cdbUL, 0x40000000UL, 0x3fed3743UL, 0xb0b0a190UL,
-    0x3e598635UL, 0x80000000UL, 0x3fed283cUL, 0xe2113295UL, 0xbe5c1119UL,
-    0x80000000UL, 0x3fed193aUL, 0xafbf1728UL, 0xbe492e9cUL, 0x60000000UL,
-    0x3fed0a3dUL, 0xe4a4ccf3UL, 0x3e19b90eUL, 0x20000000UL, 0x3fecfb45UL,
-    0xba3cbeb8UL, 0x3e406b50UL, 0xc0000000UL, 0x3fecec51UL, 0x110f7dddUL,
-    0x3e0d6806UL, 0x40000000UL, 0x3fecdd63UL, 0x7dd7d508UL, 0xbe5a8943UL,
-    0x80000000UL, 0x3fecce79UL, 0x9b60f271UL, 0xbe50676aUL, 0x80000000UL,
-    0x3fecbf94UL, 0x0b9ad660UL, 0x3e59174fUL, 0x60000000UL, 0x3fecb0b4UL,
-    0x00823d9cUL, 0x3e5bbf72UL, 0x20000000UL, 0x3feca1d9UL, 0x38a6ec89UL,
-    0xbe4d38f9UL, 0x80000000UL, 0x3fec9302UL, 0x3a0b7d8eUL, 0x3e53dbfdUL,
-    0xc0000000UL, 0x3fec8430UL, 0xc6826b34UL, 0xbe27c5c9UL, 0xc0000000UL,
-    0x3fec7563UL, 0x0c706381UL, 0xbe593653UL, 0x60000000UL, 0x3fec669bUL,
-    0x7df34ec7UL, 0x3e461ab5UL, 0xe0000000UL, 0x3fec57d7UL, 0x40e5e7e8UL,
-    0xbe5c3daeUL, 0x00000000UL, 0x3fec4919UL, 0x5602770fUL, 0xbe55219dUL,
-    0xc0000000UL, 0x3fec3a5eUL, 0xec7911ebUL, 0x3e5a5d25UL, 0x60000000UL,
-    0x3fec2ba9UL, 0xb39ea225UL, 0xbe53c00bUL, 0x80000000UL, 0x3fec1cf8UL,
-    0x967a212eUL, 0x3e5a8ddfUL, 0x60000000UL, 0x3fec0e4cUL, 0x580798bdUL,
-    0x3e5f53abUL, 0x00000000UL, 0x3febffa5UL, 0xb8282df6UL, 0xbe46b874UL,
-    0x20000000UL, 0x3febf102UL, 0xe33a6729UL, 0x3e54963fUL, 0x00000000UL,
-    0x3febe264UL, 0x3b53e88aUL, 0xbe3adce1UL, 0x60000000UL, 0x3febd3caUL,
-    0xc2585084UL, 0x3e5cde9fUL, 0x80000000UL, 0x3febc535UL, 0xa335c5eeUL,
-    0xbe39fd9cUL, 0x20000000UL, 0x3febb6a5UL, 0x7325b04dUL, 0x3e42ba15UL,
-    0x60000000UL, 0x3feba819UL, 0x1564540fUL, 0x3e3a9f35UL, 0x40000000UL,
-    0x3feb9992UL, 0x83fff592UL, 0xbe5465ceUL, 0xa0000000UL, 0x3feb8b0fUL,
-    0xb9da63d3UL, 0xbe4b1a0aUL, 0x80000000UL, 0x3feb7c91UL, 0x6d6f1ea4UL,
-    0x3e557657UL, 0x00000000UL, 0x3feb6e18UL, 0x5e80a1bfUL, 0x3e4ddbb6UL,
-    0x00000000UL, 0x3feb5fa3UL, 0x1c9eacb5UL, 0x3e592877UL, 0xa0000000UL,
-    0x3feb5132UL, 0x6d40beb3UL, 0xbe51858cUL, 0xa0000000UL, 0x3feb42c6UL,
-    0xd740c67bUL, 0x3e427ad2UL, 0x40000000UL, 0x3feb345fUL, 0xa3e0cceeUL,
-    0xbe5c2fc4UL, 0x40000000UL, 0x3feb25fcUL, 0x8e752b50UL, 0xbe3da3c2UL,
-    0xc0000000UL, 0x3feb179dUL, 0xa892e7deUL, 0x3e1fb481UL, 0xc0000000UL,
-    0x3feb0943UL, 0x21ed71e9UL, 0xbe365206UL, 0x20000000UL, 0x3feafaeeUL,
-    0x0e1380a3UL, 0x3e5c5b7bUL, 0x20000000UL, 0x3feaec9dUL, 0x3c3d640eUL,
-    0xbe5dbbd0UL, 0x60000000UL, 0x3feade50UL, 0x8f97a715UL, 0x3e3a8ec5UL,
-    0x20000000UL, 0x3fead008UL, 0x23ab2839UL, 0x3e2fe98aUL, 0x40000000UL,
-    0x3feac1c4UL, 0xf4bbd50fUL, 0x3e54d8f6UL, 0xe0000000UL, 0x3feab384UL,
-    0x14757c4dUL, 0xbe48774cUL, 0xc0000000UL, 0x3feaa549UL, 0x7c7b0eeaUL,
-    0x3e5b51bbUL, 0x20000000UL, 0x3fea9713UL, 0xf56f7013UL, 0x3e386200UL,
-    0xe0000000UL, 0x3fea88e0UL, 0xbe428ebeUL, 0xbe514af5UL, 0xe0000000UL,
-    0x3fea7ab2UL, 0x8d0e4496UL, 0x3e4f9165UL, 0x60000000UL, 0x3fea6c89UL,
-    0xdbacc5d5UL, 0xbe5c063bUL, 0x20000000UL, 0x3fea5e64UL, 0x3f19d970UL,
-    0xbe5a0c8cUL, 0x20000000UL, 0x3fea5043UL, 0x09ea3e6bUL, 0x3e5065dcUL,
-    0x80000000UL, 0x3fea4226UL, 0x78df246cUL, 0x3e5e05f6UL, 0x40000000UL,
-    0x3fea340eUL, 0x4057d4a0UL, 0x3e431b2bUL, 0x40000000UL, 0x3fea25faUL,
-    0x82867bb5UL, 0x3e4b76beUL, 0xa0000000UL, 0x3fea17eaUL, 0x9436f40aUL,
-    0xbe5aad39UL, 0x20000000UL, 0x3fea09dfUL, 0x4b5253b3UL, 0x3e46380bUL,
-    0x00000000UL, 0x3fe9fbd8UL, 0x8fc52466UL, 0xbe386f9bUL, 0x20000000UL,
-    0x3fe9edd5UL, 0x22d3f344UL, 0xbe538347UL, 0x60000000UL, 0x3fe9dfd6UL,
-    0x1ac33522UL, 0x3e5dbc53UL, 0x00000000UL, 0x3fe9d1dcUL, 0xeabdff1dUL,
-    0x3e40fc0cUL, 0xe0000000UL, 0x3fe9c3e5UL, 0xafd30e73UL, 0xbe585e63UL,
-    0xe0000000UL, 0x3fe9b5f3UL, 0xa52f226aUL, 0xbe43e8f9UL, 0x20000000UL,
-    0x3fe9a806UL, 0xecb8698dUL, 0xbe515b36UL, 0x80000000UL, 0x3fe99a1cUL,
-    0xf2b4e89dUL, 0x3e48b62bUL, 0x20000000UL, 0x3fe98c37UL, 0x7c9a88fbUL,
-    0x3e44414cUL, 0x00000000UL, 0x3fe97e56UL, 0xda015741UL, 0xbe5d13baUL,
-    0xe0000000UL, 0x3fe97078UL, 0x5fdace06UL, 0x3e51b947UL, 0x00000000UL,
-    0x3fe962a0UL, 0x956ca094UL, 0x3e518785UL, 0x40000000UL, 0x3fe954cbUL,
-    0x01164c1dUL, 0x3e5d5b57UL, 0xc0000000UL, 0x3fe946faUL, 0xe63b3767UL,
-    0xbe4f84e7UL, 0x40000000UL, 0x3fe9392eUL, 0xe57cc2a9UL, 0x3e34eda3UL,
-    0xe0000000UL, 0x3fe92b65UL, 0x8c75b544UL, 0x3e5766a0UL, 0xc0000000UL,
-    0x3fe91da1UL, 0x37d1d087UL, 0xbe5e2ab1UL, 0x80000000UL, 0x3fe90fe1UL,
-    0xa953dc20UL, 0x3e5fa1f3UL, 0x80000000UL, 0x3fe90225UL, 0xdbd3f369UL,
-    0x3e47d6dbUL, 0xa0000000UL, 0x3fe8f46dUL, 0x1c9be989UL, 0xbe5e2b0aUL,
-    0xa0000000UL, 0x3fe8e6b9UL, 0x3c93d76aUL, 0x3e5c8618UL, 0xe0000000UL,
-    0x3fe8d909UL, 0x2182fc9aUL, 0xbe41aa9eUL, 0x20000000UL, 0x3fe8cb5eUL,
-    0xe6b3539dUL, 0xbe530d19UL, 0x60000000UL, 0x3fe8bdb6UL, 0x49e58cc3UL,
-    0xbe3bb374UL, 0xa0000000UL, 0x3fe8b012UL, 0xa7cfeb8fUL, 0x3e56c412UL,
-    0x00000000UL, 0x3fe8a273UL, 0x8d52bc19UL, 0x3e1429b8UL, 0x60000000UL,
-    0x3fe894d7UL, 0x4dc32c6cUL, 0xbe48604cUL, 0xc0000000UL, 0x3fe8873fUL,
-    0x0c868e56UL, 0xbe564ee5UL, 0x00000000UL, 0x3fe879acUL, 0x56aee828UL,
-    0x3e5e2fd8UL, 0x60000000UL, 0x3fe86c1cUL, 0x7ceab8ecUL, 0x3e493365UL,
-    0xc0000000UL, 0x3fe85e90UL, 0x78d4dadcUL, 0xbe4f7f25UL, 0x00000000UL,
-    0x3fe85109UL, 0x0ccd8280UL, 0x3e31e7a2UL, 0x40000000UL, 0x3fe84385UL,
-    0x34ba4e15UL, 0x3e328077UL, 0x80000000UL, 0x3fe83605UL, 0xa670975aUL,
-    0xbe53eee5UL, 0xa0000000UL, 0x3fe82889UL, 0xf61b77b2UL, 0xbe43a20aUL,
-    0xa0000000UL, 0x3fe81b11UL, 0x13e6643bUL, 0x3e5e5fe5UL, 0xc0000000UL,
-    0x3fe80d9dUL, 0x82cc94e8UL, 0xbe5ff1f9UL, 0xa0000000UL, 0x3fe8002dUL,
-    0x8a0c9c5dUL, 0xbe42b0e7UL, 0x60000000UL, 0x3fe7f2c1UL, 0x22a16f01UL,
-    0x3e5d9ea0UL, 0x20000000UL, 0x3fe7e559UL, 0xc38cd451UL, 0x3e506963UL,
-    0xc0000000UL, 0x3fe7d7f4UL, 0x9902bc71UL, 0x3e4503d7UL, 0x40000000UL,
-    0x3fe7ca94UL, 0xdef2a3c0UL, 0x3e3d98edUL, 0xa0000000UL, 0x3fe7bd37UL,
-    0xed49abb0UL, 0x3e24c1ffUL, 0xe0000000UL, 0x3fe7afdeUL, 0xe3b0be70UL,
-    0xbe40c467UL, 0x00000000UL, 0x3fe7a28aUL, 0xaf9f193cUL, 0xbe5dff6cUL,
-    0xe0000000UL, 0x3fe79538UL, 0xb74cf6b6UL, 0xbe258ed0UL, 0xa0000000UL,
-    0x3fe787ebUL, 0x1d9127c7UL, 0x3e345fb0UL, 0x40000000UL, 0x3fe77aa2UL,
-    0x1028c21dUL, 0xbe4619bdUL, 0xa0000000UL, 0x3fe76d5cUL, 0x7cb0b5e4UL,
-    0x3e40f1a2UL, 0xe0000000UL, 0x3fe7601aUL, 0x2b1bc4adUL, 0xbe32e8bbUL,
-    0xe0000000UL, 0x3fe752dcUL, 0x6839f64eUL, 0x3e41f57bUL, 0xc0000000UL,
-    0x3fe745a2UL, 0xc4121f7eUL, 0xbe52c40aUL, 0x60000000UL, 0x3fe7386cUL,
-    0xd6852d72UL, 0xbe5c4e6bUL, 0xc0000000UL, 0x3fe72b39UL, 0x91d690f7UL,
-    0xbe57f88fUL, 0xe0000000UL, 0x3fe71e0aUL, 0x627a2159UL, 0xbe4425d5UL,
-    0xc0000000UL, 0x3fe710dfUL, 0x50a54033UL, 0x3e422b7eUL, 0x60000000UL,
-    0x3fe703b8UL, 0x3b0b5f91UL, 0x3e5d3857UL, 0xe0000000UL, 0x3fe6f694UL,
-    0x84d628a2UL, 0xbe51f090UL, 0x00000000UL, 0x3fe6e975UL, 0x306d8894UL,
-    0xbe414d83UL, 0xe0000000UL, 0x3fe6dc58UL, 0x30bf24aaUL, 0xbe4650caUL,
-    0x80000000UL, 0x3fe6cf40UL, 0xd4628d69UL, 0xbe5db007UL, 0xc0000000UL,
-    0x3fe6c22bUL, 0xa2aae57bUL, 0xbe31d279UL, 0xc0000000UL, 0x3fe6b51aUL,
-    0x860edf7eUL, 0xbe2d4c4aUL, 0x80000000UL, 0x3fe6a80dUL, 0xf3559341UL,
-    0xbe5f7e98UL, 0xe0000000UL, 0x3fe69b03UL, 0xa885899eUL, 0xbe5c2011UL,
-    0xe0000000UL, 0x3fe68dfdUL, 0x2bdc6d37UL, 0x3e224a82UL, 0xa0000000UL,
-    0x3fe680fbUL, 0xc12ad1b9UL, 0xbe40cf56UL, 0x00000000UL, 0x3fe673fdUL,
-    0x1bcdf659UL, 0xbdf52f2dUL, 0x00000000UL, 0x3fe66702UL, 0x5df10408UL,
-    0x3e5663e0UL, 0xc0000000UL, 0x3fe65a0aUL, 0xa4070568UL, 0xbe40b12fUL,
-    0x00000000UL, 0x3fe64d17UL, 0x71c54c47UL, 0x3e5f5e8bUL, 0x00000000UL,
-    0x3fe64027UL, 0xbd4b7e83UL, 0x3e42ead6UL, 0xa0000000UL, 0x3fe6333aUL,
-    0x61598bd2UL, 0xbe4c48d4UL, 0xc0000000UL, 0x3fe62651UL, 0x6f538d61UL,
-    0x3e548401UL, 0xa0000000UL, 0x3fe6196cUL, 0x14344120UL, 0xbe529af6UL,
-    0x00000000UL, 0x3fe60c8bUL, 0x5982c587UL, 0xbe3e1e4fUL, 0x00000000UL,
-    0x3fe5ffadUL, 0xfe51d4eaUL, 0xbe4c897aUL, 0x80000000UL, 0x3fe5f2d2UL,
-    0xfd46ebe1UL, 0x3e552e00UL, 0xa0000000UL, 0x3fe5e5fbUL, 0xa4695699UL,
-    0x3e5ed471UL, 0x60000000UL, 0x3fe5d928UL, 0x80d118aeUL, 0x3e456b61UL,
-    0xa0000000UL, 0x3fe5cc58UL, 0x304c330bUL, 0x3e54dc29UL, 0x80000000UL,
-    0x3fe5bf8cUL, 0x0af2dedfUL, 0xbe3aa9bdUL, 0xe0000000UL, 0x3fe5b2c3UL,
-    0x15fc9258UL, 0xbe479a37UL, 0xc0000000UL, 0x3fe5a5feUL, 0x9292c7eaUL,
-    0x3e188650UL, 0x20000000UL, 0x3fe5993dUL, 0x33b4d380UL, 0x3e5d6d93UL,
-    0x20000000UL, 0x3fe58c7fUL, 0x02fd16c7UL, 0x3e2fe961UL, 0xa0000000UL,
-    0x3fe57fc4UL, 0x4a05edb6UL, 0xbe4d55b4UL, 0xa0000000UL, 0x3fe5730dUL,
-    0x3d443abbUL, 0xbe5e6954UL, 0x00000000UL, 0x3fe5665aUL, 0x024acfeaUL,
-    0x3e50e61bUL, 0x00000000UL, 0x3fe559aaUL, 0xcc9edd09UL, 0xbe325403UL,
-    0x60000000UL, 0x3fe54cfdUL, 0x1fe26950UL, 0x3e5d500eUL, 0x60000000UL,
-    0x3fe54054UL, 0x6c5ae164UL, 0xbe4a79b4UL, 0xc0000000UL, 0x3fe533aeUL,
-    0x154b0287UL, 0xbe401571UL, 0xa0000000UL, 0x3fe5270cUL, 0x0673f401UL,
-    0xbe56e56bUL, 0xe0000000UL, 0x3fe51a6dUL, 0x751b639cUL, 0x3e235269UL,
-    0xa0000000UL, 0x3fe50dd2UL, 0x7c7b2bedUL, 0x3ddec887UL, 0xc0000000UL,
-    0x3fe5013aUL, 0xafab4e17UL, 0x3e5e7575UL, 0x60000000UL, 0x3fe4f4a6UL,
-    0x2e308668UL, 0x3e59aed6UL, 0x80000000UL, 0x3fe4e815UL, 0xf33e2a76UL,
-    0xbe51f184UL, 0xe0000000UL, 0x3fe4db87UL, 0x839f3e3eUL, 0x3e57db01UL,
-    0xc0000000UL, 0x3fe4cefdUL, 0xa9eda7bbUL, 0x3e535e0fUL, 0x00000000UL,
-    0x3fe4c277UL, 0x2a8f66a5UL, 0x3e5ce451UL, 0xc0000000UL, 0x3fe4b5f3UL,
-    0x05192456UL, 0xbe4e8518UL, 0xc0000000UL, 0x3fe4a973UL, 0x4aa7cd1dUL,
-    0x3e46784aUL, 0x40000000UL, 0x3fe49cf7UL, 0x8e23025eUL, 0xbe5749f2UL,
-    0x00000000UL, 0x3fe4907eUL, 0x18d30215UL, 0x3e360f39UL, 0x20000000UL,
-    0x3fe48408UL, 0x63dcf2f3UL, 0x3e5e00feUL, 0xc0000000UL, 0x3fe47795UL,
-    0x46182d09UL, 0xbe5173d9UL, 0xa0000000UL, 0x3fe46b26UL, 0x8f0e62aaUL,
-    0xbe48f281UL, 0xe0000000UL, 0x3fe45ebaUL, 0x5775c40cUL, 0xbe56aad4UL,
-    0x60000000UL, 0x3fe45252UL, 0x0fe25f69UL, 0x3e48bd71UL, 0x40000000UL,
-    0x3fe445edUL, 0xe9989ec5UL, 0x3e590d97UL, 0x80000000UL, 0x3fe4398bUL,
-    0xb3d9ffe3UL, 0x3e479dbcUL, 0x20000000UL, 0x3fe42d2dUL, 0x388e4d2eUL,
-    0xbe5eed80UL, 0xe0000000UL, 0x3fe420d1UL, 0x6f797c18UL, 0x3e554b4cUL,
-    0x20000000UL, 0x3fe4147aUL, 0x31048bb4UL, 0xbe5b1112UL, 0x80000000UL,
-    0x3fe40825UL, 0x2efba4f9UL, 0x3e48ebc7UL, 0x40000000UL, 0x3fe3fbd4UL,
-    0x50201119UL, 0x3e40b701UL, 0x40000000UL, 0x3fe3ef86UL, 0x0a4db32cUL,
-    0x3e551de8UL, 0xa0000000UL, 0x3fe3e33bUL, 0x0c9c148bUL, 0xbe50c1f6UL,
-    0x20000000UL, 0x3fe3d6f4UL, 0xc9129447UL, 0x3e533fa0UL, 0x00000000UL,
-    0x3fe3cab0UL, 0xaae5b5a0UL, 0xbe22b68eUL, 0x20000000UL, 0x3fe3be6fUL,
-    0x02305e8aUL, 0xbe54fc08UL, 0x60000000UL, 0x3fe3b231UL, 0x7f908258UL,
-    0x3e57dc05UL, 0x00000000UL, 0x3fe3a5f7UL, 0x1a09af78UL, 0x3e08038bUL,
-    0xe0000000UL, 0x3fe399bfUL, 0x490643c1UL, 0xbe5dbe42UL, 0xe0000000UL,
-    0x3fe38d8bUL, 0x5e8ad724UL, 0xbe3c2b72UL, 0x20000000UL, 0x3fe3815bUL,
-    0xc67196b6UL, 0x3e1713cfUL, 0xa0000000UL, 0x3fe3752dUL, 0x6182e429UL,
-    0xbe3ec14cUL, 0x40000000UL, 0x3fe36903UL, 0xab6eb1aeUL, 0x3e5a2cc5UL,
-    0x40000000UL, 0x3fe35cdcUL, 0xfe5dc064UL, 0xbe5c5878UL, 0x40000000UL,
-    0x3fe350b8UL, 0x0ba6b9e4UL, 0x3e51619bUL, 0x80000000UL, 0x3fe34497UL,
-    0x857761aaUL, 0x3e5fff53UL, 0x00000000UL, 0x3fe3387aUL, 0xf872d68cUL,
-    0x3e484f4dUL, 0xa0000000UL, 0x3fe32c5fUL, 0x087e97c2UL, 0x3e52842eUL,
-    0x80000000UL, 0x3fe32048UL, 0x73d6d0c0UL, 0xbe503edfUL, 0x80000000UL,
-    0x3fe31434UL, 0x0c1456a1UL, 0xbe5f72adUL, 0xa0000000UL, 0x3fe30823UL,
-    0x83a1a4d5UL, 0xbe5e65ccUL, 0xe0000000UL, 0x3fe2fc15UL, 0x855a7390UL,
-    0xbe506438UL, 0x40000000UL, 0x3fe2f00bUL, 0xa2898287UL, 0x3e3d22a2UL,
-    0xe0000000UL, 0x3fe2e403UL, 0x8b56f66fUL, 0xbe5aa5fdUL, 0x80000000UL,
-    0x3fe2d7ffUL, 0x52db119aUL, 0x3e3a2e3dUL, 0x60000000UL, 0x3fe2cbfeUL,
-    0xe2ddd4c0UL, 0xbe586469UL, 0x40000000UL, 0x3fe2c000UL, 0x6b01bf10UL,
-    0x3e352b9dUL, 0x40000000UL, 0x3fe2b405UL, 0xb07a1cdfUL, 0x3e5c5cdaUL,
-    0x80000000UL, 0x3fe2a80dUL, 0xc7b5f868UL, 0xbe5668b3UL, 0xc0000000UL,
-    0x3fe29c18UL, 0x185edf62UL, 0xbe563d66UL, 0x00000000UL, 0x3fe29027UL,
-    0xf729e1ccUL, 0x3e59a9a0UL, 0x80000000UL, 0x3fe28438UL, 0x6433c727UL,
-    0xbe43cc89UL, 0x00000000UL, 0x3fe2784dUL, 0x41782631UL, 0xbe30750cUL,
-    0xa0000000UL, 0x3fe26c64UL, 0x914911b7UL, 0xbe58290eUL, 0x40000000UL,
-    0x3fe2607fUL, 0x3dcc73e1UL, 0xbe4269cdUL, 0x00000000UL, 0x3fe2549dUL,
-    0x2751bf70UL, 0xbe5a6998UL, 0xc0000000UL, 0x3fe248bdUL, 0x4248b9fbUL,
-    0xbe4ddb00UL, 0x80000000UL, 0x3fe23ce1UL, 0xf35cf82fUL, 0x3e561b71UL,
-    0x60000000UL, 0x3fe23108UL, 0x8e481a2dUL, 0x3e518fb9UL, 0x60000000UL,
-    0x3fe22532UL, 0x5ab96edcUL, 0xbe5fafc5UL, 0x40000000UL, 0x3fe2195fUL,
-    0x80943911UL, 0xbe07f819UL, 0x40000000UL, 0x3fe20d8fUL, 0x386f2d6cUL,
-    0xbe54ba8bUL, 0x40000000UL, 0x3fe201c2UL, 0xf29664acUL, 0xbe5eb815UL,
-    0x20000000UL, 0x3fe1f5f8UL, 0x64f03390UL, 0x3e5e320cUL, 0x20000000UL,
-    0x3fe1ea31UL, 0x747ff696UL, 0x3e5ef0a5UL, 0x40000000UL, 0x3fe1de6dUL,
-    0x3e9ceb51UL, 0xbe5f8d27UL, 0x20000000UL, 0x3fe1d2acUL, 0x4ae0b55eUL,
-    0x3e5faa21UL, 0x20000000UL, 0x3fe1c6eeUL, 0x28569a5eUL, 0x3e598a4fUL,
-    0x20000000UL, 0x3fe1bb33UL, 0x54b33e07UL, 0x3e46130aUL, 0x20000000UL,
-    0x3fe1af7bUL, 0x024f1078UL, 0xbe4dbf93UL, 0x00000000UL, 0x3fe1a3c6UL,
-    0xb0783bfaUL, 0x3e419248UL, 0xe0000000UL, 0x3fe19813UL, 0x2f02b836UL,
-    0x3e4e02b7UL, 0xc0000000UL, 0x3fe18c64UL, 0x28dec9d4UL, 0x3e09064fUL,
-    0x80000000UL, 0x3fe180b8UL, 0x45cbf406UL, 0x3e5b1f46UL, 0x40000000UL,
-    0x3fe1750fUL, 0x03d9964cUL, 0x3e5b0a79UL, 0x00000000UL, 0x3fe16969UL,
-    0x8b5b882bUL, 0xbe238086UL, 0xa0000000UL, 0x3fe15dc5UL, 0x73bad6f8UL,
-    0xbdf1fca4UL, 0x20000000UL, 0x3fe15225UL, 0x5385769cUL, 0x3e5e8d76UL,
-    0xa0000000UL, 0x3fe14687UL, 0x1676dc6bUL, 0x3e571d08UL, 0x20000000UL,
-    0x3fe13aedUL, 0xa8c41c7fUL, 0xbe598a25UL, 0x60000000UL, 0x3fe12f55UL,
-    0xc4e1aaf0UL, 0x3e435277UL, 0xa0000000UL, 0x3fe123c0UL, 0x403638e1UL,
-    0xbe21aa7cUL, 0xc0000000UL, 0x3fe1182eUL, 0x557a092bUL, 0xbdd0116bUL,
-    0xc0000000UL, 0x3fe10c9fUL, 0x7d779f66UL, 0x3e4a61baUL, 0xc0000000UL,
-    0x3fe10113UL, 0x2b09c645UL, 0xbe5d586eUL, 0x20000000UL, 0x3fe0ea04UL,
-    0xea2cad46UL, 0x3e5aa97cUL, 0x20000000UL, 0x3fe0d300UL, 0x23190e54UL,
-    0x3e50f1a7UL, 0xa0000000UL, 0x3fe0bc07UL, 0x1379a5a6UL, 0xbe51619dUL,
-    0x60000000UL, 0x3fe0a51aUL, 0x926a3d4aUL, 0x3e5cf019UL, 0xa0000000UL,
-    0x3fe08e38UL, 0xa8c24358UL, 0x3e35241eUL, 0x20000000UL, 0x3fe07762UL,
-    0x24317e7aUL, 0x3e512cfaUL, 0x00000000UL, 0x3fe06097UL, 0xfd9cf274UL,
-    0xbe55bef3UL, 0x00000000UL, 0x3fe049d7UL, 0x3689b49dUL, 0xbe36d26dUL,
-    0x40000000UL, 0x3fe03322UL, 0xf72ef6c4UL, 0xbe54cd08UL, 0xa0000000UL,
-    0x3fe01c78UL, 0x23702d2dUL, 0xbe5900bfUL, 0x00000000UL, 0x3fe005daUL,
-    0x3f59c14cUL, 0x3e57d80bUL, 0x40000000UL, 0x3fdfde8dUL, 0xad67766dUL,
-    0xbe57fad4UL, 0x40000000UL, 0x3fdfb17cUL, 0x644f4ae7UL, 0x3e1ee43bUL,
-    0x40000000UL, 0x3fdf8481UL, 0x903234d2UL, 0x3e501a86UL, 0x40000000UL,
-    0x3fdf579cUL, 0xafe9e509UL, 0xbe267c3eUL, 0x00000000UL, 0x3fdf2acdUL,
-    0xb7dfda0bUL, 0xbe48149bUL, 0x40000000UL, 0x3fdefe13UL, 0x3b94305eUL,
-    0x3e5f4ea7UL, 0x80000000UL, 0x3fded16fUL, 0x5d95da61UL, 0xbe55c198UL,
-    0x00000000UL, 0x3fdea4e1UL, 0x406960c9UL, 0xbdd99a19UL, 0x00000000UL,
-    0x3fde7868UL, 0xd22f3539UL, 0x3e470c78UL, 0x80000000UL, 0x3fde4c04UL,
-    0x83eec535UL, 0xbe3e1232UL, 0x40000000UL, 0x3fde1fb6UL, 0x3dfbffcbUL,
-    0xbe4b7d71UL, 0x40000000UL, 0x3fddf37dUL, 0x7e1be4e0UL, 0xbe5b8f8fUL,
-    0x40000000UL, 0x3fddc759UL, 0x46dae887UL, 0xbe350458UL, 0x80000000UL,
-    0x3fdd9b4aUL, 0xed6ecc49UL, 0xbe5f0045UL, 0x80000000UL, 0x3fdd6f50UL,
-    0x2e9e883cUL, 0x3e2915daUL, 0x80000000UL, 0x3fdd436bUL, 0xf0bccb32UL,
-    0x3e4a68c9UL, 0x80000000UL, 0x3fdd179bUL, 0x9bbfc779UL, 0xbe54a26aUL,
-    0x00000000UL, 0x3fdcebe0UL, 0x7cea33abUL, 0x3e43c6b7UL, 0x40000000UL,
-    0x3fdcc039UL, 0xe740fd06UL, 0x3e5526c2UL, 0x40000000UL, 0x3fdc94a7UL,
-    0x9eadeb1aUL, 0xbe396d8dUL, 0xc0000000UL, 0x3fdc6929UL, 0xf0a8f95aUL,
-    0xbe5c0ab2UL, 0x80000000UL, 0x3fdc3dc0UL, 0x6ee2693bUL, 0x3e0992e6UL,
-    0xc0000000UL, 0x3fdc126bUL, 0x5ac6b581UL, 0xbe2834b6UL, 0x40000000UL,
-    0x3fdbe72bUL, 0x8cc226ffUL, 0x3e3596a6UL, 0x00000000UL, 0x3fdbbbffUL,
-    0xf92a74bbUL, 0x3e3c5813UL, 0x00000000UL, 0x3fdb90e7UL, 0x479664c0UL,
-    0xbe50d644UL, 0x00000000UL, 0x3fdb65e3UL, 0x5004975bUL, 0xbe55258fUL,
-    0x00000000UL, 0x3fdb3af3UL, 0xe4b23194UL, 0xbe588407UL, 0xc0000000UL,
-    0x3fdb1016UL, 0xe65d4d0aUL, 0x3e527c26UL, 0x80000000UL, 0x3fdae54eUL,
-    0x814fddd6UL, 0x3e5962a2UL, 0x40000000UL, 0x3fdaba9aUL, 0xe19d0913UL,
-    0xbe562f4eUL, 0x80000000UL, 0x3fda8ff9UL, 0x43cfd006UL, 0xbe4cfdebUL,
-    0x40000000UL, 0x3fda656cUL, 0x686f0a4eUL, 0x3e5e47a8UL, 0xc0000000UL,
-    0x3fda3af2UL, 0x7200d410UL, 0x3e5e1199UL, 0xc0000000UL, 0x3fda108cUL,
-    0xabd2266eUL, 0x3e5ee4d1UL, 0x40000000UL, 0x3fd9e63aUL, 0x396f8f2cUL,
-    0x3e4dbffbUL, 0x00000000UL, 0x3fd9bbfbUL, 0xe32b25ddUL, 0x3e5c3a54UL,
-    0x40000000UL, 0x3fd991cfUL, 0x431e4035UL, 0xbe457925UL, 0x80000000UL,
-    0x3fd967b6UL, 0x7bed3dd3UL, 0x3e40c61dUL, 0x00000000UL, 0x3fd93db1UL,
-    0xd7449365UL, 0x3e306419UL, 0x80000000UL, 0x3fd913beUL, 0x1746e791UL,
-    0x3e56fcfcUL, 0x40000000UL, 0x3fd8e9dfUL, 0xf3a9028bUL, 0xbe5041b9UL,
-    0xc0000000UL, 0x3fd8c012UL, 0x56840c50UL, 0xbe26e20aUL, 0x40000000UL,
-    0x3fd89659UL, 0x19763102UL, 0xbe51f466UL, 0x80000000UL, 0x3fd86cb2UL,
-    0x7032de7cUL, 0xbe4d298aUL, 0x80000000UL, 0x3fd8431eUL, 0xdeb39fabUL,
-    0xbe4361ebUL, 0x40000000UL, 0x3fd8199dUL, 0x5d01cbe0UL, 0xbe5425b3UL,
-    0x80000000UL, 0x3fd7f02eUL, 0x3ce99aa9UL, 0x3e146fa8UL, 0x80000000UL,
-    0x3fd7c6d2UL, 0xd1a262b9UL, 0xbe5a1a69UL, 0xc0000000UL, 0x3fd79d88UL,
-    0x8606c236UL, 0x3e423a08UL, 0x80000000UL, 0x3fd77451UL, 0x8fd1e1b7UL,
-    0x3e5a6a63UL, 0xc0000000UL, 0x3fd74b2cUL, 0xe491456aUL, 0x3e42c1caUL,
-    0x40000000UL, 0x3fd7221aUL, 0x4499a6d7UL, 0x3e36a69aUL, 0x00000000UL,
-    0x3fd6f91aUL, 0x5237df94UL, 0xbe0f8f02UL, 0x00000000UL, 0x3fd6d02cUL,
-    0xb6482c6eUL, 0xbe5abcf7UL, 0x00000000UL, 0x3fd6a750UL, 0x1919fd61UL,
-    0xbe57ade2UL, 0x00000000UL, 0x3fd67e86UL, 0xaa7a994dUL, 0xbe3f3fbdUL,
-    0x00000000UL, 0x3fd655ceUL, 0x67db014cUL, 0x3e33c550UL, 0x00000000UL,
-    0x3fd62d28UL, 0xa82856b7UL, 0xbe1409d1UL, 0xc0000000UL, 0x3fd60493UL,
-    0x1e6a300dUL, 0x3e55d899UL, 0x80000000UL, 0x3fd5dc11UL, 0x1222bd5cUL,
-    0xbe35bfc0UL, 0xc0000000UL, 0x3fd5b3a0UL, 0x6e8dc2d3UL, 0x3e5d4d79UL,
-    0x00000000UL, 0x3fd58b42UL, 0xe0e4ace6UL, 0xbe517303UL, 0x80000000UL,
-    0x3fd562f4UL, 0xb306e0a8UL, 0x3e5edf0fUL, 0xc0000000UL, 0x3fd53ab8UL,
-    0x6574bc54UL, 0x3e5ee859UL, 0x80000000UL, 0x3fd5128eUL, 0xea902207UL,
-    0x3e5f6188UL, 0xc0000000UL, 0x3fd4ea75UL, 0x9f911d79UL, 0x3e511735UL,
-    0x80000000UL, 0x3fd4c26eUL, 0xf9c77397UL, 0xbe5b1643UL, 0x40000000UL,
-    0x3fd49a78UL, 0x15fc9258UL, 0x3e479a37UL, 0x80000000UL, 0x3fd47293UL,
-    0xd5a04dd9UL, 0xbe426e56UL, 0xc0000000UL, 0x3fd44abfUL, 0xe04042f5UL,
-    0x3e56f7c6UL, 0x40000000UL, 0x3fd422fdUL, 0x1d8bf2c8UL, 0x3e5d8810UL,
-    0x00000000UL, 0x3fd3fb4cUL, 0x88a8ddeeUL, 0xbe311454UL, 0xc0000000UL,
-    0x3fd3d3abUL, 0x3e3b5e47UL, 0xbe5d1b72UL, 0x40000000UL, 0x3fd3ac1cUL,
-    0xc2ab5d59UL, 0x3e31b02bUL, 0xc0000000UL, 0x3fd3849dUL, 0xd4e34b9eUL,
-    0x3e51cb2fUL, 0x40000000UL, 0x3fd35d30UL, 0x177204fbUL, 0xbe2b8cd7UL,
-    0x80000000UL, 0x3fd335d3UL, 0xfcd38c82UL, 0xbe4356e1UL, 0x80000000UL,
-    0x3fd30e87UL, 0x64f54accUL, 0xbe4e6224UL, 0x00000000UL, 0x3fd2e74cUL,
-    0xaa7975d9UL, 0x3e5dc0feUL, 0x80000000UL, 0x3fd2c021UL, 0x516dab3fUL,
-    0xbe50ffa3UL, 0x40000000UL, 0x3fd29907UL, 0x2bfb7313UL, 0x3e5674a2UL,
-    0xc0000000UL, 0x3fd271fdUL, 0x0549fc99UL, 0x3e385d29UL, 0xc0000000UL,
-    0x3fd24b04UL, 0x55b63073UL, 0xbe500c6dUL, 0x00000000UL, 0x3fd2241cUL,
-    0x3f91953aUL, 0x3e389977UL, 0xc0000000UL, 0x3fd1fd43UL, 0xa1543f71UL,
-    0xbe3487abUL, 0xc0000000UL, 0x3fd1d67bUL, 0x4ec8867cUL, 0x3df6a2dcUL,
-    0x00000000UL, 0x3fd1afc4UL, 0x4328e3bbUL, 0x3e41d9c0UL, 0x80000000UL,
-    0x3fd1891cUL, 0x2e1cda84UL, 0x3e3bdd87UL, 0x40000000UL, 0x3fd16285UL,
-    0x4b5331aeUL, 0xbe53128eUL, 0x00000000UL, 0x3fd13bfeUL, 0xb9aec164UL,
-    0xbe52ac98UL, 0xc0000000UL, 0x3fd11586UL, 0xd91e1316UL, 0xbe350630UL,
-    0x80000000UL, 0x3fd0ef1fUL, 0x7cacc12cUL, 0x3e3f5219UL, 0x40000000UL,
-    0x3fd0c8c8UL, 0xbce277b7UL, 0x3e3d30c0UL, 0x00000000UL, 0x3fd0a281UL,
-    0x2a63447dUL, 0xbe541377UL, 0x80000000UL, 0x3fd07c49UL, 0xfac483b5UL,
-    0xbe5772ecUL, 0xc0000000UL, 0x3fd05621UL, 0x36b8a570UL, 0xbe4fd4bdUL,
-    0xc0000000UL, 0x3fd03009UL, 0xbae505f7UL, 0xbe450388UL, 0x80000000UL,
-    0x3fd00a01UL, 0x3e35aeadUL, 0xbe5430fcUL, 0x80000000UL, 0x3fcfc811UL,
-    0x707475acUL, 0x3e38806eUL, 0x80000000UL, 0x3fcf7c3fUL, 0xc91817fcUL,
-    0xbe40cceaUL, 0x80000000UL, 0x3fcf308cUL, 0xae05d5e9UL, 0xbe4919b8UL,
-    0x80000000UL, 0x3fcee4f8UL, 0xae6cc9e6UL, 0xbe530b94UL, 0x00000000UL,
-    0x3fce9983UL, 0x1efe3e8eUL, 0x3e57747eUL, 0x00000000UL, 0x3fce4e2dUL,
-    0xda78d9bfUL, 0xbe59a608UL, 0x00000000UL, 0x3fce02f5UL, 0x8abe2c2eUL,
-    0x3e4a35adUL, 0x00000000UL, 0x3fcdb7dcUL, 0x1495450dUL, 0xbe0872ccUL,
-    0x80000000UL, 0x3fcd6ce1UL, 0x86ee0ba0UL, 0xbe4f59a0UL, 0x00000000UL,
-    0x3fcd2205UL, 0xe81ca888UL, 0x3e5402c3UL, 0x00000000UL, 0x3fccd747UL,
-    0x3b4424b9UL, 0x3e5dfdc3UL, 0x80000000UL, 0x3fcc8ca7UL, 0xd305b56cUL,
-    0x3e202da6UL, 0x00000000UL, 0x3fcc4226UL, 0x399a6910UL, 0xbe482a1cUL,
-    0x80000000UL, 0x3fcbf7c2UL, 0x747f7938UL, 0xbe587372UL, 0x80000000UL,
-    0x3fcbad7cUL, 0x6fc246a0UL, 0x3e50d83dUL, 0x00000000UL, 0x3fcb6355UL,
-    0xee9e9be5UL, 0xbe5c35bdUL, 0x80000000UL, 0x3fcb194aUL, 0x8416c0bcUL,
-    0x3e546d4fUL, 0x00000000UL, 0x3fcacf5eUL, 0x49f7f08fUL, 0x3e56da76UL,
-    0x00000000UL, 0x3fca858fUL, 0x5dc30de2UL, 0x3e5f390cUL, 0x00000000UL,
-    0x3fca3bdeUL, 0x950583b6UL, 0xbe5e4169UL, 0x80000000UL, 0x3fc9f249UL,
-    0x33631553UL, 0x3e52aeb1UL, 0x00000000UL, 0x3fc9a8d3UL, 0xde8795a6UL,
-    0xbe59a504UL, 0x00000000UL, 0x3fc95f79UL, 0x076bf41eUL, 0x3e5122feUL,
-    0x80000000UL, 0x3fc9163cUL, 0x2914c8e7UL, 0x3e3dd064UL, 0x00000000UL,
-    0x3fc8cd1dUL, 0x3a30eca3UL, 0xbe21b4aaUL, 0x80000000UL, 0x3fc8841aUL,
-    0xb2a96650UL, 0xbe575444UL, 0x80000000UL, 0x3fc83b34UL, 0x2376c0cbUL,
-    0xbe2a74c7UL, 0x80000000UL, 0x3fc7f26bUL, 0xd8a0b653UL, 0xbe5181b6UL,
-    0x00000000UL, 0x3fc7a9bfUL, 0x32257882UL, 0xbe4a78b4UL, 0x00000000UL,
-    0x3fc7612fUL, 0x1eee8bd9UL, 0xbe1bfe9dUL, 0x80000000UL, 0x3fc718bbUL,
-    0x0c603cc4UL, 0x3e36fdc9UL, 0x80000000UL, 0x3fc6d064UL, 0x3728b8cfUL,
-    0xbe1e542eUL, 0x80000000UL, 0x3fc68829UL, 0xc79a4067UL, 0x3e5c380fUL,
-    0x00000000UL, 0x3fc6400bUL, 0xf69eac69UL, 0x3e550a84UL, 0x80000000UL,
-    0x3fc5f808UL, 0xb7a780a4UL, 0x3e5d9224UL, 0x80000000UL, 0x3fc5b022UL,
-    0xad9dfb1eUL, 0xbe55242fUL, 0x00000000UL, 0x3fc56858UL, 0x659b18beUL,
-    0xbe4bfda3UL, 0x80000000UL, 0x3fc520a9UL, 0x66ee3631UL, 0xbe57d769UL,
-    0x80000000UL, 0x3fc4d916UL, 0x1ec62819UL, 0x3e2427f7UL, 0x80000000UL,
-    0x3fc4919fUL, 0xdec25369UL, 0xbe435431UL, 0x00000000UL, 0x3fc44a44UL,
-    0xa8acfc4bUL, 0xbe3c62e8UL, 0x00000000UL, 0x3fc40304UL, 0xcf1d3eabUL,
-    0xbdfba29fUL, 0x80000000UL, 0x3fc3bbdfUL, 0x79aba3eaUL, 0xbdf1b7c8UL,
-    0x80000000UL, 0x3fc374d6UL, 0xb8d186daUL, 0xbe5130cfUL, 0x80000000UL,
-    0x3fc32de8UL, 0x9d74f152UL, 0x3e2285b6UL, 0x00000000UL, 0x3fc2e716UL,
-    0x50ae7ca9UL, 0xbe503920UL, 0x80000000UL, 0x3fc2a05eUL, 0x6caed92eUL,
-    0xbe533924UL, 0x00000000UL, 0x3fc259c2UL, 0x9cb5034eUL, 0xbe510e31UL,
-    0x80000000UL, 0x3fc21340UL, 0x12c4d378UL, 0xbe540b43UL, 0x80000000UL,
-    0x3fc1ccd9UL, 0xcc418706UL, 0x3e59887aUL, 0x00000000UL, 0x3fc1868eUL,
-    0x921f4106UL, 0xbe528e67UL, 0x80000000UL, 0x3fc1405cUL, 0x3969441eUL,
-    0x3e5d8051UL, 0x00000000UL, 0x3fc0fa46UL, 0xd941ef5bUL, 0x3e5f9079UL,
-    0x80000000UL, 0x3fc0b44aUL, 0x5a3e81b2UL, 0xbe567691UL, 0x00000000UL,
-    0x3fc06e69UL, 0x9d66afe7UL, 0xbe4d43fbUL, 0x00000000UL, 0x3fc028a2UL,
-    0x0a92a162UL, 0xbe52f394UL, 0x00000000UL, 0x3fbfc5eaUL, 0x209897e5UL,
-    0x3e529e37UL, 0x00000000UL, 0x3fbf3ac5UL, 0x8458bd7bUL, 0x3e582831UL,
-    0x00000000UL, 0x3fbeafd5UL, 0xb8d8b4b8UL, 0xbe486b4aUL, 0x00000000UL,
-    0x3fbe2518UL, 0xe0a3b7b6UL, 0x3e5bafd2UL, 0x00000000UL, 0x3fbd9a90UL,
-    0x2bf2710eUL, 0x3e383b2bUL, 0x00000000UL, 0x3fbd103cUL, 0x73eb6ab7UL,
-    0xbe56d78dUL, 0x00000000UL, 0x3fbc861bUL, 0x32ceaff5UL, 0xbe32dc5aUL,
-    0x00000000UL, 0x3fbbfc2eUL, 0xbee04cb7UL, 0xbe4a71a4UL, 0x00000000UL,
-    0x3fbb7274UL, 0x35ae9577UL, 0x3e38142fUL, 0x00000000UL, 0x3fbae8eeUL,
-    0xcbaddab4UL, 0xbe5490f0UL, 0x00000000UL, 0x3fba5f9aUL, 0x95ce1114UL,
-    0x3e597c71UL, 0x00000000UL, 0x3fb9d67aUL, 0x6d7c0f78UL, 0x3e3abc2dUL,
-    0x00000000UL, 0x3fb94d8dUL, 0x2841a782UL, 0xbe566cbcUL, 0x00000000UL,
-    0x3fb8c4d2UL, 0x6ed429c6UL, 0xbe3cfff9UL, 0x00000000UL, 0x3fb83c4aUL,
-    0xe4a49fbbUL, 0xbe552964UL, 0x00000000UL, 0x3fb7b3f4UL, 0x2193d81eUL,
-    0xbe42fa72UL, 0x00000000UL, 0x3fb72bd0UL, 0xdd70c122UL, 0x3e527a8cUL,
-    0x00000000UL, 0x3fb6a3dfUL, 0x03108a54UL, 0xbe450393UL, 0x00000000UL,
-    0x3fb61c1fUL, 0x30ff7954UL, 0x3e565840UL, 0x00000000UL, 0x3fb59492UL,
-    0xdedd460cUL, 0xbe5422b5UL, 0x00000000UL, 0x3fb50d36UL, 0x950f9f45UL,
-    0xbe5313f6UL, 0x00000000UL, 0x3fb4860bUL, 0x582cdcb1UL, 0x3e506d39UL,
-    0x00000000UL, 0x3fb3ff12UL, 0x7216d3a6UL, 0x3e4aa719UL, 0x00000000UL,
-    0x3fb3784aUL, 0x57a423fdUL, 0x3e5a9b9fUL, 0x00000000UL, 0x3fb2f1b4UL,
-    0x7a138b41UL, 0xbe50b418UL, 0x00000000UL, 0x3fb26b4eUL, 0x2fbfd7eaUL,
-    0x3e23a53eUL, 0x00000000UL, 0x3fb1e519UL, 0x18913ccbUL, 0x3e465fc1UL,
-    0x00000000UL, 0x3fb15f15UL, 0x7ea24e21UL, 0x3e042843UL, 0x00000000UL,
-    0x3fb0d941UL, 0x7c6d9c77UL, 0x3e59f61eUL, 0x00000000UL, 0x3fb0539eUL,
-    0x114efd44UL, 0x3e4ccab7UL, 0x00000000UL, 0x3faf9c56UL, 0x1777f657UL,
-    0x3e552f65UL, 0x00000000UL, 0x3fae91d2UL, 0xc317b86aUL, 0xbe5a61e0UL,
-    0x00000000UL, 0x3fad87acUL, 0xb7664efbUL, 0xbe41f64eUL, 0x00000000UL,
-    0x3fac7de6UL, 0x5d3d03a9UL, 0x3e0807a0UL, 0x00000000UL, 0x3fab7480UL,
-    0x743c38ebUL, 0xbe3726e1UL, 0x00000000UL, 0x3faa6b78UL, 0x06a253f1UL,
-    0x3e5ad636UL, 0x00000000UL, 0x3fa962d0UL, 0xa35f541bUL, 0x3e5a187aUL,
-    0x00000000UL, 0x3fa85a88UL, 0x4b86e446UL, 0xbe508150UL, 0x00000000UL,
-    0x3fa7529cUL, 0x2589cacfUL, 0x3e52938aUL, 0x00000000UL, 0x3fa64b10UL,
-    0xaf6b11f2UL, 0xbe3454cdUL, 0x00000000UL, 0x3fa543e2UL, 0x97506fefUL,
-    0xbe5fdec5UL, 0x00000000UL, 0x3fa43d10UL, 0xe75f7dd9UL, 0xbe388dd3UL,
-    0x00000000UL, 0x3fa3369cUL, 0xa4139632UL, 0xbdea5177UL, 0x00000000UL,
-    0x3fa23086UL, 0x352d6f1eUL, 0xbe565ad6UL, 0x00000000UL, 0x3fa12accUL,
-    0x77449eb7UL, 0xbe50d5c7UL, 0x00000000UL, 0x3fa0256eUL, 0x7478da78UL,
-    0x3e404724UL, 0x00000000UL, 0x3f9e40dcUL, 0xf59cef7fUL, 0xbe539d0aUL,
-    0x00000000UL, 0x3f9c3790UL, 0x1511d43cUL, 0x3e53c2c8UL, 0x00000000UL,
-    0x3f9a2f00UL, 0x9b8bff3cUL, 0xbe43b3e1UL, 0x00000000UL, 0x3f982724UL,
-    0xad1e22a5UL, 0x3e46f0bdUL, 0x00000000UL, 0x3f962000UL, 0x130d9356UL,
-    0x3e475ba0UL, 0x00000000UL, 0x3f941994UL, 0x8f86f883UL, 0xbe513d0bUL,
-    0x00000000UL, 0x3f9213dcUL, 0x914d0dc8UL, 0xbe534335UL, 0x00000000UL,
-    0x3f900ed8UL, 0x2d73e5e7UL, 0xbe22ba75UL, 0x00000000UL, 0x3f8c1510UL,
-    0xc5b7d70eUL, 0x3e599c5dUL, 0x00000000UL, 0x3f880de0UL, 0x8a27857eUL,
-    0xbe3d28c8UL, 0x00000000UL, 0x3f840810UL, 0xda767328UL, 0x3e531b3dUL,
-    0x00000000UL, 0x3f8003b0UL, 0x77bacaf3UL, 0xbe5f04e3UL, 0x00000000UL,
-    0x3f780150UL, 0xdf4b0720UL, 0x3e5a8bffUL, 0x00000000UL, 0x3f6ffc40UL,
-    0x34c48e71UL, 0xbe3fcd99UL, 0x00000000UL, 0x3f5ff6c0UL, 0x1ad218afUL,
-    0xbe4c78a7UL, 0x00000000UL, 0x00000000UL, 0x00000000UL, 0x80000000UL,
-    0x00000000UL, 0xfffff800UL, 0x00000000UL, 0xfffff800UL, 0x00000000UL,
-    0x3ff72000UL, 0x161bb241UL, 0xbf5dabe1UL, 0x6dc96112UL, 0xbf836578UL,
-    0xee241472UL, 0xbf9b0301UL, 0x9f95985aUL, 0xbfb528dbUL, 0xb3841d2aUL,
-    0xbfd619b6UL, 0x518775e3UL, 0x3f9004f2UL, 0xac8349bbUL, 0x3fa76c9bUL,
-    0x486ececcUL, 0x3fc4635eUL, 0x161bb241UL, 0xbf5dabe1UL, 0x9f95985aUL,
-    0xbfb528dbUL, 0xf8b5787dUL, 0x3ef2531eUL, 0x486ececbUL, 0x3fc4635eUL,
-    0x412055ccUL, 0xbdd61bb2UL, 0x00000000UL, 0xfffffff8UL, 0x00000000UL,
-    0xffffffffUL, 0x00000000UL, 0x3ff00000UL, 0x00000000UL, 0x3b700000UL,
-    0xfa5abcbfUL, 0x3ff00b1aUL, 0xa7609f71UL, 0xbc84f6b2UL, 0xa9fb3335UL,
-    0x3ff0163dUL, 0x9ab8cdb7UL, 0x3c9b6129UL, 0x143b0281UL, 0x3ff02168UL,
-    0x0fc54eb6UL, 0xbc82bf31UL, 0x3e778061UL, 0x3ff02c9aUL, 0x535b085dUL,
-    0xbc719083UL, 0x2e11bbccUL, 0x3ff037d4UL, 0xeeade11aUL, 0x3c656811UL,
-    0xe86e7f85UL, 0x3ff04315UL, 0x1977c96eUL, 0xbc90a31cUL, 0x72f654b1UL,
-    0x3ff04e5fUL, 0x3aa0d08cUL, 0x3c84c379UL, 0xd3158574UL, 0x3ff059b0UL,
-    0xa475b465UL, 0x3c8d73e2UL, 0x0e3c1f89UL, 0x3ff0650aUL, 0x5799c397UL,
-    0xbc95cb7bUL, 0x29ddf6deUL, 0x3ff0706bUL, 0xe2b13c27UL, 0xbc8c91dfUL,
-    0x2b72a836UL, 0x3ff07bd4UL, 0x54458700UL, 0x3c832334UL, 0x18759bc8UL,
-    0x3ff08745UL, 0x4bb284ffUL, 0x3c6186beUL, 0xf66607e0UL, 0x3ff092bdUL,
-    0x800a3fd1UL, 0xbc968063UL, 0xcac6f383UL, 0x3ff09e3eUL, 0x18316136UL,
-    0x3c914878UL, 0x9b1f3919UL, 0x3ff0a9c7UL, 0x873d1d38UL, 0x3c85d16cUL,
-    0x6cf9890fUL, 0x3ff0b558UL, 0x4adc610bUL, 0x3c98a62eUL, 0x45e46c85UL,
-    0x3ff0c0f1UL, 0x06d21cefUL, 0x3c94f989UL, 0x2b7247f7UL, 0x3ff0cc92UL,
-    0x16e24f71UL, 0x3c901edcUL, 0x23395decUL, 0x3ff0d83bUL, 0xe43f316aUL,
-    0xbc9bc14dUL, 0x32d3d1a2UL, 0x3ff0e3ecUL, 0x27c57b52UL, 0x3c403a17UL,
-    0x5fdfa9c5UL, 0x3ff0efa5UL, 0xbc54021bUL, 0xbc949db9UL, 0xaffed31bUL,
-    0x3ff0fb66UL, 0xc44ebd7bUL, 0xbc6b9bedUL, 0x28d7233eUL, 0x3ff10730UL,
-    0x1692fdd5UL, 0x3c8d46ebUL, 0xd0125b51UL, 0x3ff11301UL, 0x39449b3aUL,
-    0xbc96c510UL, 0xab5e2ab6UL, 0x3ff11edbUL, 0xf703fb72UL, 0xbc9ca454UL,
-    0xc06c31ccUL, 0x3ff12abdUL, 0xb36ca5c7UL, 0xbc51b514UL, 0x14f204abUL,
-    0x3ff136a8UL, 0xba48dcf0UL, 0xbc67108fUL, 0xaea92de0UL, 0x3ff1429aUL,
-    0x9af1369eUL, 0xbc932fbfUL, 0x934f312eUL, 0x3ff14e95UL, 0x39bf44abUL,
-    0xbc8b91e8UL, 0xc8a58e51UL, 0x3ff15a98UL, 0xb9eeab0aUL, 0x3c82406aUL,
-    0x5471c3c2UL, 0x3ff166a4UL, 0x82ea1a32UL, 0x3c58f23bUL, 0x3c7d517bUL,
-    0x3ff172b8UL, 0xb9d78a76UL, 0xbc819041UL, 0x8695bbc0UL, 0x3ff17ed4UL,
-    0xe2ac5a64UL, 0x3c709e3fUL, 0x388c8deaUL, 0x3ff18af9UL, 0xd1970f6cUL,
-    0xbc911023UL, 0x58375d2fUL, 0x3ff19726UL, 0x85f17e08UL, 0x3c94aaddUL,
-    0xeb6fcb75UL, 0x3ff1a35bUL, 0x7b4968e4UL, 0x3c8e5b4cUL, 0xf8138a1cUL,
-    0x3ff1af99UL, 0xa4b69280UL, 0x3c97bf85UL, 0x84045cd4UL, 0x3ff1bbe0UL,
-    0x352ef607UL, 0xbc995386UL, 0x95281c6bUL, 0x3ff1c82fUL, 0x8010f8c9UL,
-    0x3c900977UL, 0x3168b9aaUL, 0x3ff1d487UL, 0x00a2643cUL, 0x3c9e016eUL,
-    0x5eb44027UL, 0x3ff1e0e7UL, 0x088cb6deUL, 0xbc96fdd8UL, 0x22fcd91dUL,
-    0x3ff1ed50UL, 0x027bb78cUL, 0xbc91df98UL, 0x8438ce4dUL, 0x3ff1f9c1UL,
-    0xa097af5cUL, 0xbc9bf524UL, 0x88628cd6UL, 0x3ff2063bUL, 0x814a8495UL,
-    0x3c8dc775UL, 0x3578a819UL, 0x3ff212beUL, 0x2cfcaac9UL, 0x3c93592dUL,
-    0x917ddc96UL, 0x3ff21f49UL, 0x9494a5eeUL, 0x3c82a97eUL, 0xa27912d1UL,
-    0x3ff22bddUL, 0x5577d69fUL, 0x3c8d34fbUL, 0x6e756238UL, 0x3ff2387aUL,
-    0xb6c70573UL, 0x3c99b07eUL, 0xfb82140aUL, 0x3ff2451fUL, 0x911ca996UL,
-    0x3c8acfccUL, 0x4fb2a63fUL, 0x3ff251ceUL, 0xbef4f4a4UL, 0x3c8ac155UL,
-    0x711ece75UL, 0x3ff25e85UL, 0x4ac31b2cUL, 0x3c93e1a2UL, 0x65e27cddUL,
-    0x3ff26b45UL, 0x9940e9d9UL, 0x3c82bd33UL, 0x341ddf29UL, 0x3ff2780eUL,
-    0x05f9e76cUL, 0x3c9e067cUL, 0xe1f56381UL, 0x3ff284dfUL, 0x8c3f0d7eUL,
-    0xbc9a4c3aUL, 0x7591bb70UL, 0x3ff291baUL, 0x28401cbdUL, 0xbc82cc72UL,
-    0xf51fdee1UL, 0x3ff29e9dUL, 0xafad1255UL, 0x3c8612e8UL, 0x66d10f13UL,
-    0x3ff2ab8aUL, 0x191690a7UL, 0xbc995743UL, 0xd0dad990UL, 0x3ff2b87fUL,
-    0xd6381aa4UL, 0xbc410adcUL, 0x39771b2fUL, 0x3ff2c57eUL, 0xa6eb5124UL,
-    0xbc950145UL, 0xa6e4030bUL, 0x3ff2d285UL, 0x54db41d5UL, 0x3c900247UL,
-    0x1f641589UL, 0x3ff2df96UL, 0xfbbce198UL, 0x3c9d16cfUL, 0xa93e2f56UL,
-    0x3ff2ecafUL, 0x45d52383UL, 0x3c71ca0fUL, 0x4abd886bUL, 0x3ff2f9d2UL,
-    0x532bda93UL, 0xbc653c55UL, 0x0a31b715UL, 0x3ff306feUL, 0xd23182e4UL,
-    0x3c86f46aUL, 0xedeeb2fdUL, 0x3ff31432UL, 0xf3f3fcd1UL, 0x3c8959a3UL,
-    0xfc4cd831UL, 0x3ff32170UL, 0x8e18047cUL, 0x3c8a9ce7UL, 0x3ba8ea32UL,
-    0x3ff32eb8UL, 0x3cb4f318UL, 0xbc9c45e8UL, 0xb26416ffUL, 0x3ff33c08UL,
-    0x843659a6UL, 0x3c932721UL, 0x66e3fa2dUL, 0x3ff34962UL, 0x930881a4UL,
-    0xbc835a75UL, 0x5f929ff1UL, 0x3ff356c5UL, 0x5c4e4628UL, 0xbc8b5ceeUL,
-    0xa2de883bUL, 0x3ff36431UL, 0xa06cb85eUL, 0xbc8c3144UL, 0x373aa9cbUL,
-    0x3ff371a7UL, 0xbf42eae2UL, 0xbc963aeaUL, 0x231e754aUL, 0x3ff37f26UL,
-    0x9eceb23cUL, 0xbc99f5caUL, 0x6d05d866UL, 0x3ff38caeUL, 0x3c9904bdUL,
-    0xbc9e958dUL, 0x1b7140efUL, 0x3ff39a40UL, 0xfc8e2934UL, 0xbc99a9a5UL,
-    0x34e59ff7UL, 0x3ff3a7dbUL, 0xd661f5e3UL, 0xbc75e436UL, 0xbfec6cf4UL,
-    0x3ff3b57fUL, 0xe26fff18UL, 0x3c954c66UL, 0xc313a8e5UL, 0x3ff3c32dUL,
-    0x375d29c3UL, 0xbc9efff8UL, 0x44ede173UL, 0x3ff3d0e5UL, 0x8c284c71UL,
-    0x3c7fe8d0UL, 0x4c123422UL, 0x3ff3dea6UL, 0x11f09ebcUL, 0x3c8ada09UL,
-    0xdf1c5175UL, 0x3ff3ec70UL, 0x7b8c9bcaUL, 0xbc8af663UL, 0x04ac801cUL,
-    0x3ff3fa45UL, 0xf956f9f3UL, 0xbc97d023UL, 0xc367a024UL, 0x3ff40822UL,
-    0xb6f4d048UL, 0x3c8bddf8UL, 0x21f72e2aUL, 0x3ff4160aUL, 0x1c309278UL,
-    0xbc5ef369UL, 0x2709468aUL, 0x3ff423fbUL, 0xc0b314ddUL, 0xbc98462dUL,
-    0xd950a897UL, 0x3ff431f5UL, 0xe35f7999UL, 0xbc81c7ddUL, 0x3f84b9d4UL,
-    0x3ff43ffaUL, 0x9704c003UL, 0x3c8880beUL, 0x6061892dUL, 0x3ff44e08UL,
-    0x04ef80d0UL, 0x3c489b7aUL, 0x42a7d232UL, 0x3ff45c20UL, 0x82fb1f8eUL,
-    0xbc686419UL, 0xed1d0057UL, 0x3ff46a41UL, 0xd1648a76UL, 0x3c9c944bUL,
-    0x668b3237UL, 0x3ff4786dUL, 0xed445733UL, 0xbc9c20f0UL, 0xb5c13cd0UL,
-    0x3ff486a2UL, 0xb69062f0UL, 0x3c73c1a3UL, 0xe192aed2UL, 0x3ff494e1UL,
-    0x5e499ea0UL, 0xbc83b289UL, 0xf0d7d3deUL, 0x3ff4a32aUL, 0xf3d1be56UL,
-    0x3c99cb62UL, 0xea6db7d7UL, 0x3ff4b17dUL, 0x7f2897f0UL, 0xbc8125b8UL,
-    0xd5362a27UL, 0x3ff4bfdaUL, 0xafec42e2UL, 0x3c7d4397UL, 0xb817c114UL,
-    0x3ff4ce41UL, 0x690abd5dUL, 0x3c905e29UL, 0x99fddd0dUL, 0x3ff4dcb2UL,
-    0xbc6a7833UL, 0x3c98ecdbUL, 0x81d8abffUL, 0x3ff4eb2dUL, 0x2e5d7a52UL,
-    0xbc95257dUL, 0x769d2ca7UL, 0x3ff4f9b2UL, 0xd25957e3UL, 0xbc94b309UL,
-    0x7f4531eeUL, 0x3ff50841UL, 0x49b7465fUL, 0x3c7a249bUL, 0xa2cf6642UL,
-    0x3ff516daUL, 0x69bd93efUL, 0xbc8f7685UL, 0xe83f4eefUL, 0x3ff5257dUL,
-    0x43efef71UL, 0xbc7c998dUL, 0x569d4f82UL, 0x3ff5342bUL, 0x1db13cadUL,
-    0xbc807abeUL, 0xf4f6ad27UL, 0x3ff542e2UL, 0x192d5f7eUL, 0x3c87926dUL,
-    0xca5d920fUL, 0x3ff551a4UL, 0xefede59bUL, 0xbc8d689cUL, 0xdde910d2UL,
-    0x3ff56070UL, 0x168eebf0UL, 0xbc90fb6eUL, 0x36b527daUL, 0x3ff56f47UL,
-    0x011d93adUL, 0x3c99bb2cUL, 0xdbe2c4cfUL, 0x3ff57e27UL, 0x8a57b9c4UL,
-    0xbc90b98cUL, 0xd497c7fdUL, 0x3ff58d12UL, 0x5b9a1de8UL, 0x3c8295e1UL,
-    0x27ff07ccUL, 0x3ff59c08UL, 0xe467e60fUL, 0xbc97e2ceUL, 0xdd485429UL,
-    0x3ff5ab07UL, 0x054647adUL, 0x3c96324cUL, 0xfba87a03UL, 0x3ff5ba11UL,
-    0x4c233e1aUL, 0xbc9b77a1UL, 0x8a5946b7UL, 0x3ff5c926UL, 0x816986a2UL,
-    0x3c3c4b1bUL, 0x90998b93UL, 0x3ff5d845UL, 0xa8b45643UL, 0xbc9cd6a7UL,
-    0x15ad2148UL, 0x3ff5e76fUL, 0x3080e65eUL, 0x3c9ba6f9UL, 0x20dceb71UL,
-    0x3ff5f6a3UL, 0xe3cdcf92UL, 0xbc89eaddUL, 0xb976dc09UL, 0x3ff605e1UL,
-    0x9b56de47UL, 0xbc93e242UL, 0xe6cdf6f4UL, 0x3ff6152aUL, 0x4ab84c27UL,
-    0x3c9e4b3eUL, 0xb03a5585UL, 0x3ff6247eUL, 0x7e40b497UL, 0xbc9383c1UL,
-    0x1d1929fdUL, 0x3ff633ddUL, 0xbeb964e5UL, 0x3c984710UL, 0x34ccc320UL,
-    0x3ff64346UL, 0x759d8933UL, 0xbc8c483cUL, 0xfebc8fb7UL, 0x3ff652b9UL,
-    0xc9a73e09UL, 0xbc9ae3d5UL, 0x82552225UL, 0x3ff66238UL, 0x87591c34UL,
-    0xbc9bb609UL, 0xc70833f6UL, 0x3ff671c1UL, 0x586c6134UL, 0xbc8e8732UL,
-    0xd44ca973UL, 0x3ff68155UL, 0x44f73e65UL, 0x3c6038aeUL, 0xb19e9538UL,
-    0x3ff690f4UL, 0x9aeb445dUL, 0x3c8804bdUL, 0x667f3bcdUL, 0x3ff6a09eUL,
-    0x13b26456UL, 0xbc9bdd34UL, 0xfa75173eUL, 0x3ff6b052UL, 0x2c9a9d0eUL,
-    0x3c7a38f5UL, 0x750bdabfUL, 0x3ff6c012UL, 0x67ff0b0dUL, 0xbc728956UL,
-    0xddd47645UL, 0x3ff6cfdcUL, 0xb6f17309UL, 0x3c9c7aa9UL, 0x3c651a2fUL,
-    0x3ff6dfb2UL, 0x683c88abUL, 0xbc6bbe3aUL, 0x98593ae5UL, 0x3ff6ef92UL,
-    0x9e1ac8b2UL, 0xbc90b974UL, 0xf9519484UL, 0x3ff6ff7dUL, 0x25860ef6UL,
-    0xbc883c0fUL, 0x66f42e87UL, 0x3ff70f74UL, 0xd45aa65fUL, 0x3c59d644UL,
-    0xe8ec5f74UL, 0x3ff71f75UL, 0x86887a99UL, 0xbc816e47UL, 0x86ead08aUL,
-    0x3ff72f82UL, 0x2cd62c72UL, 0xbc920aa0UL, 0x48a58174UL, 0x3ff73f9aUL,
-    0x6c65d53cUL, 0xbc90a8d9UL, 0x35d7cbfdUL, 0x3ff74fbdUL, 0x618a6e1cUL,
-    0x3c9047fdUL, 0x564267c9UL, 0x3ff75febUL, 0x57316dd3UL, 0xbc902459UL,
-    0xb1ab6e09UL, 0x3ff77024UL, 0x169147f8UL, 0x3c9b7877UL, 0x4fde5d3fUL,
-    0x3ff78069UL, 0x0a02162dUL, 0x3c9866b8UL, 0x38ac1cf6UL, 0x3ff790b9UL,
-    0x62aadd3eUL, 0x3c9349a8UL, 0x73eb0187UL, 0x3ff7a114UL, 0xee04992fUL,
-    0xbc841577UL, 0x0976cfdbUL, 0x3ff7b17bUL, 0x8468dc88UL, 0xbc9bebb5UL,
-    0x0130c132UL, 0x3ff7c1edUL, 0xd1164dd6UL, 0x3c9f124cUL, 0x62ff86f0UL,
-    0x3ff7d26aUL, 0xfb72b8b4UL, 0x3c91bddbUL, 0x36cf4e62UL, 0x3ff7e2f3UL,
-    0xba15797eUL, 0x3c705d02UL, 0x8491c491UL, 0x3ff7f387UL, 0xcf9311aeUL,
-    0xbc807f11UL, 0x543e1a12UL, 0x3ff80427UL, 0x626d972bUL, 0xbc927c86UL,
-    0xadd106d9UL, 0x3ff814d2UL, 0x0d151d4dUL, 0x3c946437UL, 0x994cce13UL,
-    0x3ff82589UL, 0xd41532d8UL, 0xbc9d4c1dUL, 0x1eb941f7UL, 0x3ff8364cUL,
-    0x31df2bd5UL, 0x3c999b9aUL, 0x4623c7adUL, 0x3ff8471aUL, 0xa341cdfbUL,
-    0xbc88d684UL, 0x179f5b21UL, 0x3ff857f4UL, 0xf8b216d0UL, 0xbc5ba748UL,
-    0x9b4492edUL, 0x3ff868d9UL, 0x9bd4f6baUL, 0xbc9fc6f8UL, 0xd931a436UL,
-    0x3ff879caUL, 0xd2db47bdUL, 0x3c85d2d7UL, 0xd98a6699UL, 0x3ff88ac7UL,
-    0xf37cb53aUL, 0x3c9994c2UL, 0xa478580fUL, 0x3ff89bd0UL, 0x4475202aUL,
-    0x3c9d5395UL, 0x422aa0dbUL, 0x3ff8ace5UL, 0x56864b27UL, 0x3c96e9f1UL,
-    0xbad61778UL, 0x3ff8be05UL, 0xfc43446eUL, 0x3c9ecb5eUL, 0x16b5448cUL,
-    0x3ff8cf32UL, 0x32e9e3aaUL, 0xbc70d55eUL, 0x5e0866d9UL, 0x3ff8e06aUL,
-    0x6fc9b2e6UL, 0xbc97114aUL, 0x99157736UL, 0x3ff8f1aeUL, 0xa2e3976cUL,
-    0x3c85cc13UL, 0xd0282c8aUL, 0x3ff902feUL, 0x85fe3fd2UL, 0x3c9592caUL,
-    0x0b91ffc6UL, 0x3ff9145bUL, 0x2e582524UL, 0xbc9dd679UL, 0x53aa2fe2UL,
-    0x3ff925c3UL, 0xa639db7fUL, 0xbc83455fUL, 0xb0cdc5e5UL, 0x3ff93737UL,
-    0x81b57ebcUL, 0xbc675fc7UL, 0x2b5f98e5UL, 0x3ff948b8UL, 0x797d2d99UL,
-    0xbc8dc3d6UL, 0xcbc8520fUL, 0x3ff95a44UL, 0x96a5f039UL, 0xbc764b7cUL,
-    0x9a7670b3UL, 0x3ff96bddUL, 0x7f19c896UL, 0xbc5ba596UL, 0x9fde4e50UL,
-    0x3ff97d82UL, 0x7c1b85d1UL, 0xbc9d185bUL, 0xe47a22a2UL, 0x3ff98f33UL,
-    0xa24c78ecUL, 0x3c7cabdaUL, 0x70ca07baUL, 0x3ff9a0f1UL, 0x91cee632UL,
-    0xbc9173bdUL, 0x4d53fe0dUL, 0x3ff9b2bbUL, 0x4df6d518UL, 0xbc9dd84eUL,
-    0x82a3f090UL, 0x3ff9c491UL, 0xb071f2beUL, 0x3c7c7c46UL, 0x194bb8d5UL,
-    0x3ff9d674UL, 0xa3dd8233UL, 0xbc9516beUL, 0x19e32323UL, 0x3ff9e863UL,
-    0x78e64c6eUL, 0x3c7824caUL, 0x8d07f29eUL, 0x3ff9fa5eUL, 0xaaf1faceUL,
-    0xbc84a9ceUL, 0x7b5de565UL, 0x3ffa0c66UL, 0x5d1cd533UL, 0xbc935949UL,
-    0xed8eb8bbUL, 0x3ffa1e7aUL, 0xee8be70eUL, 0x3c9c6618UL, 0xec4a2d33UL,
-    0x3ffa309bUL, 0x7ddc36abUL, 0x3c96305cUL, 0x80460ad8UL, 0x3ffa42c9UL,
-    0x589fb120UL, 0xbc9aa780UL, 0xb23e255dUL, 0x3ffa5503UL, 0xdb8d41e1UL,
-    0xbc9d2f6eUL, 0x8af46052UL, 0x3ffa674aUL, 0x30670366UL, 0x3c650f56UL,
-    0x1330b358UL, 0x3ffa799eUL, 0xcac563c7UL, 0x3c9bcb7eUL, 0x53c12e59UL,
-    0x3ffa8bfeUL, 0xb2ba15a9UL, 0xbc94f867UL, 0x5579fdbfUL, 0x3ffa9e6bUL,
-    0x0ef7fd31UL, 0x3c90fac9UL, 0x21356ebaUL, 0x3ffab0e5UL, 0xdae94545UL,
-    0x3c889c31UL, 0xbfd3f37aUL, 0x3ffac36bUL, 0xcae76cd0UL, 0xbc8f9234UL,
-    0x3a3c2774UL, 0x3ffad5ffUL, 0xb6b1b8e5UL, 0x3c97ef3bUL, 0x995ad3adUL,
-    0x3ffae89fUL, 0x345dcc81UL, 0x3c97a1cdUL, 0xe622f2ffUL, 0x3ffafb4cUL,
-    0x0f315ecdUL, 0xbc94b2fcUL, 0x298db666UL, 0x3ffb0e07UL, 0x4c80e425UL,
-    0xbc9bdef5UL, 0x6c9a8952UL, 0x3ffb20ceUL, 0x4a0756ccUL, 0x3c94dd02UL,
-    0xb84f15fbUL, 0x3ffb33a2UL, 0x3084d708UL, 0xbc62805eUL, 0x15b749b1UL,
-    0x3ffb4684UL, 0xe9df7c90UL, 0xbc7f763dUL, 0x8de5593aUL, 0x3ffb5972UL,
-    0xbbba6de3UL, 0xbc9c71dfUL, 0x29f1c52aUL, 0x3ffb6c6eUL, 0x52883f6eUL,
-    0x3c92a8f3UL, 0xf2fb5e47UL, 0x3ffb7f76UL, 0x7e54ac3bUL, 0xbc75584fUL,
-    0xf22749e4UL, 0x3ffb928cUL, 0x54cb65c6UL, 0xbc9b7216UL, 0x30a1064aUL,
-    0x3ffba5b0UL, 0x0e54292eUL, 0xbc9efcd3UL, 0xb79a6f1fUL, 0x3ffbb8e0UL,
-    0xc9696205UL, 0xbc3f52d1UL, 0x904bc1d2UL, 0x3ffbcc1eUL, 0x7a2d9e84UL,
-    0x3c823dd0UL, 0xc3f3a207UL, 0x3ffbdf69UL, 0x60ea5b53UL, 0xbc3c2623UL,
-    0x5bd71e09UL, 0x3ffbf2c2UL, 0x3f6b9c73UL, 0xbc9efdcaUL, 0x6141b33dUL,
-    0x3ffc0628UL, 0xa1fbca34UL, 0xbc8d8a5aUL, 0xdd85529cUL, 0x3ffc199bUL,
-    0x895048ddUL, 0x3c811065UL, 0xd9fa652cUL, 0x3ffc2d1cUL, 0x17c8a5d7UL,
-    0xbc96e516UL, 0x5fffd07aUL, 0x3ffc40abUL, 0xe083c60aUL, 0x3c9b4537UL,
-    0x78fafb22UL, 0x3ffc5447UL, 0x2493b5afUL, 0x3c912f07UL, 0x2e57d14bUL,
-    0x3ffc67f1UL, 0xff483cadUL, 0x3c92884dUL, 0x8988c933UL, 0x3ffc7ba8UL,
-    0xbe255559UL, 0xbc8e76bbUL, 0x9406e7b5UL, 0x3ffc8f6dUL, 0x48805c44UL,
-    0x3c71acbcUL, 0x5751c4dbUL, 0x3ffca340UL, 0xd10d08f5UL, 0xbc87f2beUL,
-    0xdcef9069UL, 0x3ffcb720UL, 0xd1e949dbUL, 0x3c7503cbUL, 0x2e6d1675UL,
-    0x3ffccb0fUL, 0x86009092UL, 0xbc7d220fUL, 0x555dc3faUL, 0x3ffcdf0bUL,
-    0x53829d72UL, 0xbc8dd83bUL, 0x5b5bab74UL, 0x3ffcf315UL, 0xb86dff57UL,
-    0xbc9a08e9UL, 0x4a07897cUL, 0x3ffd072dUL, 0x43797a9cUL, 0xbc9cbc37UL,
-    0x2b08c968UL, 0x3ffd1b53UL, 0x219a36eeUL, 0x3c955636UL, 0x080d89f2UL,
-    0x3ffd2f87UL, 0x719d8578UL, 0xbc9d487bUL, 0xeacaa1d6UL, 0x3ffd43c8UL,
-    0xbf5a1614UL, 0x3c93db53UL, 0xdcfba487UL, 0x3ffd5818UL, 0xd75b3707UL,
-    0x3c82ed02UL, 0xe862e6d3UL, 0x3ffd6c76UL, 0x4a8165a0UL, 0x3c5fe87aUL,
-    0x16c98398UL, 0x3ffd80e3UL, 0x8beddfe8UL, 0xbc911ec1UL, 0x71ff6075UL,
-    0x3ffd955dUL, 0xbb9af6beUL, 0x3c9a052dUL, 0x03db3285UL, 0x3ffda9e6UL,
-    0x696db532UL, 0x3c9c2300UL, 0xd63a8315UL, 0x3ffdbe7cUL, 0x926b8be4UL,
-    0xbc9b76f1UL, 0xf301b460UL, 0x3ffdd321UL, 0x78f018c3UL, 0x3c92da57UL,
-    0x641c0658UL, 0x3ffde7d5UL, 0x8e79ba8fUL, 0xbc9ca552UL, 0x337b9b5fUL,
-    0x3ffdfc97UL, 0x4f184b5cUL, 0xbc91a5cdUL, 0x6b197d17UL, 0x3ffe1167UL,
-    0xbd5c7f44UL, 0xbc72b529UL, 0x14f5a129UL, 0x3ffe2646UL, 0x817a1496UL,
-    0xbc97b627UL, 0x3b16ee12UL, 0x3ffe3b33UL, 0x31fdc68bUL, 0xbc99f4a4UL,
-    0xe78b3ff6UL, 0x3ffe502eUL, 0x80a9cc8fUL, 0x3c839e89UL, 0x24676d76UL,
-    0x3ffe6539UL, 0x7522b735UL, 0xbc863ff8UL, 0xfbc74c83UL, 0x3ffe7a51UL,
-    0xca0c8de2UL, 0x3c92d522UL, 0x77cdb740UL, 0x3ffe8f79UL, 0x80b054b1UL,
-    0xbc910894UL, 0xa2a490daUL, 0x3ffea4afUL, 0x179c2893UL, 0xbc9e9c23UL,
-    0x867cca6eUL, 0x3ffeb9f4UL, 0x2293e4f2UL, 0x3c94832fUL, 0x2d8e67f1UL,
-    0x3ffecf48UL, 0xb411ad8cUL, 0xbc9c93f3UL, 0xa2188510UL, 0x3ffee4aaUL,
-    0xa487568dUL, 0x3c91c68dUL, 0xee615a27UL, 0x3ffefa1bUL, 0x86a4b6b0UL,
-    0x3c9dc7f4UL, 0x1cb6412aUL, 0x3fff0f9cUL, 0x65181d45UL, 0xbc932200UL,
-    0x376bba97UL, 0x3fff252bUL, 0xbf0d8e43UL, 0x3c93a1a5UL, 0x48dd7274UL,
-    0x3fff3ac9UL, 0x3ed837deUL, 0xbc795a5aUL, 0x5b6e4540UL, 0x3fff5076UL,
-    0x2dd8a18bUL, 0x3c99d3e1UL, 0x798844f8UL, 0x3fff6632UL, 0x3539343eUL,
-    0x3c9fa37bUL, 0xad9cbe14UL, 0x3fff7bfdUL, 0xd006350aUL, 0xbc9dbb12UL,
-    0x02243c89UL, 0x3fff91d8UL, 0xa779f689UL, 0xbc612ea8UL, 0x819e90d8UL,
-    0x3fffa7c1UL, 0xf3a5931eUL, 0x3c874853UL, 0x3692d514UL, 0x3fffbdbaUL,
-    0x15098eb6UL, 0xbc796773UL, 0x2b8f71f1UL, 0x3fffd3c2UL, 0x966579e7UL,
-    0x3c62eb74UL, 0x6b2a23d9UL, 0x3fffe9d9UL, 0x7442fde3UL, 0x3c74a603UL,
-    0xe78a6731UL, 0x3f55d87fUL, 0xd704a0c0UL, 0x3fac6b08UL, 0x6fba4e77UL,
-    0x3f83b2abUL, 0xff82c58fUL, 0x3fcebfbdUL, 0xfefa39efUL, 0x3fe62e42UL,
-    0x00000000UL, 0x00000000UL, 0xfefa39efUL, 0x3fe62e42UL, 0xfefa39efUL,
-    0xbfe62e42UL, 0xf8000000UL, 0xffffffffUL, 0xf8000000UL, 0xffffffffUL,
-    0x00000000UL, 0x80000000UL, 0x00000000UL, 0x00000000UL
-
-};
-
-ATTRIBUTE_ALIGNED(8) static const double _DOUBLE2 = 2.0;
-ATTRIBUTE_ALIGNED(8) static const double _DOUBLE0 = 0.0;
-ATTRIBUTE_ALIGNED(8) static const double _DOUBLE0DOT5 = 0.5;
-
-//registers,
-// input: xmm0, xmm1
-// scratch: xmm1, xmm2, xmm3, xmm4, xmm5, xmm6, xmm7
-//          eax, edx, ecx, ebx
-
-// Code generated by Intel C compiler for LIBM library
-
-void MacroAssembler::fast_pow(XMMRegister xmm0, XMMRegister xmm1, XMMRegister xmm2, XMMRegister xmm3, XMMRegister xmm4, XMMRegister xmm5, XMMRegister xmm6, XMMRegister xmm7, Register eax, Register ecx, Register edx, Register tmp) {
-  Label L_2TAG_PACKET_0_0_2, L_2TAG_PACKET_1_0_2, L_2TAG_PACKET_2_0_2, L_2TAG_PACKET_3_0_2;
-  Label L_2TAG_PACKET_4_0_2, L_2TAG_PACKET_5_0_2, L_2TAG_PACKET_6_0_2, L_2TAG_PACKET_7_0_2;
-  Label L_2TAG_PACKET_8_0_2, L_2TAG_PACKET_9_0_2, L_2TAG_PACKET_10_0_2, L_2TAG_PACKET_11_0_2;
-  Label L_2TAG_PACKET_12_0_2, L_2TAG_PACKET_13_0_2, L_2TAG_PACKET_14_0_2, L_2TAG_PACKET_15_0_2;
-  Label L_2TAG_PACKET_16_0_2, L_2TAG_PACKET_17_0_2, L_2TAG_PACKET_18_0_2, L_2TAG_PACKET_19_0_2;
-  Label L_2TAG_PACKET_20_0_2, L_2TAG_PACKET_21_0_2, L_2TAG_PACKET_22_0_2, L_2TAG_PACKET_23_0_2;
-  Label L_2TAG_PACKET_24_0_2, L_2TAG_PACKET_25_0_2, L_2TAG_PACKET_26_0_2, L_2TAG_PACKET_27_0_2;
-  Label L_2TAG_PACKET_28_0_2, L_2TAG_PACKET_29_0_2, L_2TAG_PACKET_30_0_2, L_2TAG_PACKET_31_0_2;
-  Label L_2TAG_PACKET_32_0_2, L_2TAG_PACKET_33_0_2, L_2TAG_PACKET_34_0_2, L_2TAG_PACKET_35_0_2;
-  Label L_2TAG_PACKET_36_0_2, L_2TAG_PACKET_37_0_2, L_2TAG_PACKET_38_0_2, L_2TAG_PACKET_39_0_2;
-  Label L_2TAG_PACKET_40_0_2, L_2TAG_PACKET_41_0_2, L_2TAG_PACKET_42_0_2, L_2TAG_PACKET_43_0_2;
-  Label L_2TAG_PACKET_44_0_2, L_2TAG_PACKET_45_0_2, L_2TAG_PACKET_46_0_2, L_2TAG_PACKET_47_0_2;
-  Label L_2TAG_PACKET_48_0_2, L_2TAG_PACKET_49_0_2, L_2TAG_PACKET_50_0_2, L_2TAG_PACKET_51_0_2;
-  Label L_2TAG_PACKET_52_0_2, L_2TAG_PACKET_53_0_2, L_2TAG_PACKET_54_0_2, L_2TAG_PACKET_55_0_2;
-  Label L_2TAG_PACKET_56_0_2, L_2TAG_PACKET_57_0_2, L_2TAG_PACKET_58_0_2, start;
-  Label L_NOT_DOUBLE2, L_NOT_DOUBLE0DOT5;
-
-  assert_different_registers(tmp, eax, ecx, edx);
-
-  address static_const_table_pow = (address)_static_const_table_pow;
-  address DOUBLE2 = (address) &_DOUBLE2;
-  address DOUBLE0 = (address) &_DOUBLE0;
-  address DOUBLE0DOT5 = (address) &_DOUBLE0DOT5;
-
-  subl(rsp, 120);
-  movl(Address(rsp, 64), tmp);
-  lea(tmp, ExternalAddress(static_const_table_pow));
-  movsd(xmm0, Address(rsp, 128));
-  movsd(xmm1, Address(rsp, 136));
-
-  // Special case: pow(x, 2.0) => x * x
-  ucomisd(xmm1, ExternalAddress(DOUBLE2));
-  jccb(Assembler::notEqual, L_NOT_DOUBLE2);
-  jccb(Assembler::parity, L_NOT_DOUBLE2);
-  mulsd(xmm0, xmm0);
-  jmp(L_2TAG_PACKET_21_0_2);
-
-  bind(L_NOT_DOUBLE2);
-  // Special case: pow(x, 0.5) => sqrt(x)
-  ucomisd(xmm1, ExternalAddress(DOUBLE0DOT5)); // For pow(x, y), check whether y == 0.5
-  jccb(Assembler::notEqual, L_NOT_DOUBLE0DOT5);
-  jccb(Assembler::parity, L_NOT_DOUBLE0DOT5);
-  ucomisd(xmm0, ExternalAddress(DOUBLE0));
-  // According to the API specs, pow(-0.0, 0.5) = 0.0 and sqrt(-0.0) = -0.0.
-  // So pow(-0.0, 0.5) shouldn't be replaced with sqrt(-0.0).
-  // -0.0/+0.0 are both excluded since floating-point comparison doesn't distinguish -0.0 from +0.0.
-  jccb(Assembler::belowEqual, L_NOT_DOUBLE0DOT5); // pow(x, 0.5) => sqrt(x) only for x > 0.0
-  sqrtsd(xmm0, xmm0);
-  jmp(L_2TAG_PACKET_21_0_2);
-
-  bind(L_NOT_DOUBLE0DOT5);
-  xorpd(xmm2, xmm2);
-  movl(eax, 16368);
-  pinsrw(xmm2, eax, 3);
-  movl(ecx, 1069088768);
-  movdl(xmm7, ecx);
-  movsd(Address(rsp, 16), xmm1);
-  xorpd(xmm1, xmm1);
-  movl(edx, 30704);
-  pinsrw(xmm1, edx, 3);
-  movsd(Address(rsp, 8), xmm0);
-  movdqu(xmm3, xmm0);
-  movl(edx, 8192);
-  movdl(xmm4, edx);
-  movdqu(xmm6, Address(tmp, 8240));
-  pextrw(eax, xmm0, 3);
-  por(xmm0, xmm2);
-  psllq(xmm0, 5);
-  movsd(xmm2, Address(tmp, 8256));
-  psrlq(xmm0, 34);
-  movl(edx, eax);
-  andl(edx, 32752);
-  subl(edx, 16368);
-  movl(ecx, edx);
-  sarl(edx, 31);
-  addl(ecx, edx);
-  xorl(ecx, edx);
-  rcpss(xmm0, xmm0);
-  psllq(xmm3, 12);
-  addl(ecx, 16);
-  bsrl(ecx, ecx);
-  psrlq(xmm3, 12);
-  movl(Address(rsp, 24), rsi);
-  subl(eax, 16);
-  cmpl(eax, 32736);
-  jcc(Assembler::aboveEqual, L_2TAG_PACKET_0_0_2);
-  movl(rsi, 0);
-
-  bind(L_2TAG_PACKET_1_0_2);
-  mulss(xmm0, xmm7);
-  movl(edx, -1);
-  subl(ecx, 4);
-  shll(edx);
-  movdl(xmm5, edx);
-  por(xmm3, xmm1);
-  subl(eax, 16351);
-  cmpl(eax, 1);
-  jcc(Assembler::belowEqual, L_2TAG_PACKET_2_0_2);
-  paddd(xmm0, xmm4);
-  psllq(xmm5, 32);
-  movdl(edx, xmm0);
-  psllq(xmm0, 29);
-  pand(xmm5, xmm3);
-
-  bind(L_2TAG_PACKET_3_0_2);
-  pand(xmm0, xmm6);
-  subsd(xmm3, xmm5);
-  subl(eax, 1);
-  sarl(eax, 4);
-  cvtsi2sdl(xmm7, eax);
-  mulpd(xmm5, xmm0);
-
-  bind(L_2TAG_PACKET_4_0_2);
-  mulsd(xmm3, xmm0);
-  movdqu(xmm1, Address(tmp, 8272));
-  subsd(xmm5, xmm2);
-  movdqu(xmm4, Address(tmp, 8288));
-  movl(ecx, eax);
-  sarl(eax, 31);
-  addl(ecx, eax);
-  xorl(eax, ecx);
-  addl(eax, 1);
-  bsrl(eax, eax);
-  unpcklpd(xmm5, xmm3);
-  movdqu(xmm6, Address(tmp, 8304));
-  addsd(xmm3, xmm5);
-  andl(edx, 16760832);
-  shrl(edx, 10);
-  addpd(xmm5, Address(tmp, edx, Address::times_1, -3616));
-  movdqu(xmm0, Address(tmp, 8320));
-  pshufd(xmm2, xmm3, 68);
-  mulsd(xmm3, xmm3);
-  mulpd(xmm1, xmm2);
-  mulpd(xmm4, xmm2);
-  addsd(xmm5, xmm7);
-  mulsd(xmm2, xmm3);
-  addpd(xmm6, xmm1);
-  mulsd(xmm3, xmm3);
-  addpd(xmm0, xmm4);
-  movsd(xmm1, Address(rsp, 16));
-  movzwl(ecx, Address(rsp, 22));
-  pshufd(xmm7, xmm5, 238);
-  movsd(xmm4, Address(tmp, 8368));
-  mulpd(xmm6, xmm2);
-  pshufd(xmm3, xmm3, 68);
-  mulpd(xmm0, xmm2);
-  shll(eax, 4);
-  subl(eax, 15872);
-  andl(ecx, 32752);
-  addl(eax, ecx);
-  mulpd(xmm3, xmm6);
-  cmpl(eax, 624);
-  jcc(Assembler::aboveEqual, L_2TAG_PACKET_5_0_2);
-  xorpd(xmm6, xmm6);
-  movl(edx, 17080);
-  pinsrw(xmm6, edx, 3);
-  movdqu(xmm2, xmm1);
-  pand(xmm4, xmm1);
-  subsd(xmm1, xmm4);
-  mulsd(xmm4, xmm5);
-  addsd(xmm0, xmm7);
-  mulsd(xmm1, xmm5);
-  movdqu(xmm7, xmm6);
-  addsd(xmm6, xmm4);
-  addpd(xmm3, xmm0);
-  movdl(edx, xmm6);
-  subsd(xmm6, xmm7);
-  pshufd(xmm0, xmm3, 238);
-  subsd(xmm4, xmm6);
-  addsd(xmm0, xmm3);
-  movl(ecx, edx);
-  andl(edx, 255);
-  addl(edx, edx);
-  movdqu(xmm5, Address(tmp, edx, Address::times_8, 8384));
-  addsd(xmm4, xmm1);
-  mulsd(xmm2, xmm0);
-  movdqu(xmm7, Address(tmp, 12480));
-  movdqu(xmm3, Address(tmp, 12496));
-  shll(ecx, 12);
-  xorl(ecx, rsi);
-  andl(ecx, -1048576);
-  movdl(xmm6, ecx);
-  addsd(xmm2, xmm4);
-  movsd(xmm1, Address(tmp, 12512));
-  pshufd(xmm0, xmm2, 68);
-  pshufd(xmm4, xmm2, 68);
-  mulpd(xmm0, xmm0);
-  movl(rsi, Address(rsp, 24));
-  mulpd(xmm7, xmm4);
-  pshufd(xmm6, xmm6, 17);
-  mulsd(xmm1, xmm2);
-  mulsd(xmm0, xmm0);
-  paddd(xmm5, xmm6);
-  addpd(xmm3, xmm7);
-  mulsd(xmm1, xmm5);
-  pshufd(xmm6, xmm5, 238);
-  mulpd(xmm0, xmm3);
-  addsd(xmm1, xmm6);
-  pshufd(xmm3, xmm0, 238);
-  mulsd(xmm0, xmm5);
-  mulsd(xmm3, xmm5);
-  addsd(xmm0, xmm1);
-  addsd(xmm0, xmm3);
-  addsd(xmm0, xmm5);
-  movsd(Address(rsp, 0), xmm0);
-  fld_d(Address(rsp, 0));
-  jmp(L_2TAG_PACKET_6_0_2);
-
-  bind(L_2TAG_PACKET_7_0_2);
-  movsd(xmm0, Address(rsp, 128));
-  movsd(xmm1, Address(rsp, 136));
-  mulsd(xmm0, xmm1);
-  movsd(Address(rsp, 0), xmm0);
-  fld_d(Address(rsp, 0));
-  jmp(L_2TAG_PACKET_6_0_2);
-
-  bind(L_2TAG_PACKET_0_0_2);
-  addl(eax, 16);
-  movl(edx, 32752);
-  andl(edx, eax);
-  cmpl(edx, 32752);
-  jcc(Assembler::equal, L_2TAG_PACKET_8_0_2);
-  testl(eax, 32768);
-  jcc(Assembler::notEqual, L_2TAG_PACKET_9_0_2);
-
-  bind(L_2TAG_PACKET_10_0_2);
-  movl(ecx, Address(rsp, 16));
-  xorl(edx, edx);
-  testl(ecx, ecx);
-  movl(ecx, 1);
-  cmovl(Assembler::notEqual, edx, ecx);
-  orl(edx, Address(rsp, 20));
-  cmpl(edx, 1072693248);
-  jcc(Assembler::equal, L_2TAG_PACKET_7_0_2);
-  movsd(xmm0, Address(rsp, 8));
-  movsd(xmm3, Address(rsp, 8));
-  movdl(edx, xmm3);
-  psrlq(xmm3, 32);
-  movdl(ecx, xmm3);
-  orl(edx, ecx);
-  cmpl(edx, 0);
-  jcc(Assembler::equal, L_2TAG_PACKET_11_0_2);
-  xorpd(xmm3, xmm3);
-  movl(eax, 18416);
-  pinsrw(xmm3, eax, 3);
-  mulsd(xmm0, xmm3);
-  xorpd(xmm2, xmm2);
-  movl(eax, 16368);
-  pinsrw(xmm2, eax, 3);
-  movdqu(xmm3, xmm0);
-  pextrw(eax, xmm0, 3);
-  por(xmm0, xmm2);
-  movl(ecx, 18416);
-  psllq(xmm0, 5);
-  movsd(xmm2, Address(tmp, 8256));
-  psrlq(xmm0, 34);
-  rcpss(xmm0, xmm0);
-  psllq(xmm3, 12);
-  movdqu(xmm6, Address(tmp, 8240));
-  psrlq(xmm3, 12);
-  mulss(xmm0, xmm7);
-  movl(edx, -1024);
-  movdl(xmm5, edx);
-  por(xmm3, xmm1);
-  paddd(xmm0, xmm4);
-  psllq(xmm5, 32);
-  movdl(edx, xmm0);
-  psllq(xmm0, 29);
-  pand(xmm5, xmm3);
-  movl(rsi, 0);
-  pand(xmm0, xmm6);
-  subsd(xmm3, xmm5);
-  andl(eax, 32752);
-  subl(eax, 18416);
-  sarl(eax, 4);
-  cvtsi2sdl(xmm7, eax);
-  mulpd(xmm5, xmm0);
-  jmp(L_2TAG_PACKET_4_0_2);
-
-  bind(L_2TAG_PACKET_12_0_2);
-  movl(ecx, Address(rsp, 16));
-  xorl(edx, edx);
-  testl(ecx, ecx);
-  movl(ecx, 1);
-  cmovl(Assembler::notEqual, edx, ecx);
-  orl(edx, Address(rsp, 20));
-  cmpl(edx, 1072693248);
-  jcc(Assembler::equal, L_2TAG_PACKET_7_0_2);
-  movsd(xmm0, Address(rsp, 8));
-  movsd(xmm3, Address(rsp, 8));
-  movdl(edx, xmm3);
-  psrlq(xmm3, 32);
-  movdl(ecx, xmm3);
-  orl(edx, ecx);
-  cmpl(edx, 0);
-  jcc(Assembler::equal, L_2TAG_PACKET_11_0_2);
-  xorpd(xmm3, xmm3);
-  movl(eax, 18416);
-  pinsrw(xmm3, eax, 3);
-  mulsd(xmm0, xmm3);
-  xorpd(xmm2, xmm2);
-  movl(eax, 16368);
-  pinsrw(xmm2, eax, 3);
-  movdqu(xmm3, xmm0);
-  pextrw(eax, xmm0, 3);
-  por(xmm0, xmm2);
-  movl(ecx, 18416);
-  psllq(xmm0, 5);
-  movsd(xmm2, Address(tmp, 8256));
-  psrlq(xmm0, 34);
-  rcpss(xmm0, xmm0);
-  psllq(xmm3, 12);
-  movdqu(xmm6, Address(tmp, 8240));
-  psrlq(xmm3, 12);
-  mulss(xmm0, xmm7);
-  movl(edx, -1024);
-  movdl(xmm5, edx);
-  por(xmm3, xmm1);
-  paddd(xmm0, xmm4);
-  psllq(xmm5, 32);
-  movdl(edx, xmm0);
-  psllq(xmm0, 29);
-  pand(xmm5, xmm3);
-  movl(rsi, INT_MIN);
-  pand(xmm0, xmm6);
-  subsd(xmm3, xmm5);
-  andl(eax, 32752);
-  subl(eax, 18416);
-  sarl(eax, 4);
-  cvtsi2sdl(xmm7, eax);
-  mulpd(xmm5, xmm0);
-  jmp(L_2TAG_PACKET_4_0_2);
-
-  bind(L_2TAG_PACKET_5_0_2);
-  cmpl(eax, 0);
-  jcc(Assembler::less, L_2TAG_PACKET_13_0_2);
-  cmpl(eax, 752);
-  jcc(Assembler::aboveEqual, L_2TAG_PACKET_14_0_2);
-
-  bind(L_2TAG_PACKET_15_0_2);
-  addsd(xmm0, xmm7);
-  movsd(xmm2, Address(tmp, 12544));
-  addpd(xmm3, xmm0);
-  xorpd(xmm6, xmm6);
-  movl(eax, 17080);
-  pinsrw(xmm6, eax, 3);
-  pshufd(xmm0, xmm3, 238);
-  addsd(xmm0, xmm3);
-  movdqu(xmm3, xmm5);
-  addsd(xmm5, xmm0);
-  movdqu(xmm4, xmm2);
-  subsd(xmm3, xmm5);
-  movdqu(xmm7, xmm5);
-  pand(xmm5, xmm2);
-  movdqu(xmm2, xmm1);
-  pand(xmm4, xmm1);
-  subsd(xmm7, xmm5);
-  addsd(xmm0, xmm3);
-  subsd(xmm1, xmm4);
-  mulsd(xmm4, xmm5);
-  addsd(xmm0, xmm7);
-  mulsd(xmm2, xmm0);
-  movdqu(xmm7, xmm6);
-  mulsd(xmm1, xmm5);
-  addsd(xmm6, xmm4);
-  movdl(eax, xmm6);
-  subsd(xmm6, xmm7);
-  addsd(xmm2, xmm1);
-  movdqu(xmm7, Address(tmp, 12480));
-  movdqu(xmm3, Address(tmp, 12496));
-  subsd(xmm4, xmm6);
-  pextrw(edx, xmm6, 3);
-  movl(ecx, eax);
-  andl(eax, 255);
-  addl(eax, eax);
-  movdqu(xmm5, Address(tmp, eax, Address::times_8, 8384));
-  addsd(xmm2, xmm4);
-  sarl(ecx, 8);
-  movl(eax, ecx);
-  sarl(ecx, 1);
-  subl(eax, ecx);
-  shll(ecx, 20);
-  xorl(ecx, rsi);
-  movdl(xmm6, ecx);
-  movsd(xmm1, Address(tmp, 12512));
-  andl(edx, 32767);
-  cmpl(edx, 16529);
-  jcc(Assembler::above, L_2TAG_PACKET_14_0_2);
-  pshufd(xmm0, xmm2, 68);
-  pshufd(xmm4, xmm2, 68);
-  mulpd(xmm0, xmm0);
-  mulpd(xmm7, xmm4);
-  pshufd(xmm6, xmm6, 17);
-  mulsd(xmm1, xmm2);
-  mulsd(xmm0, xmm0);
-  paddd(xmm5, xmm6);
-  addpd(xmm3, xmm7);
-  mulsd(xmm1, xmm5);
-  pshufd(xmm6, xmm5, 238);
-  mulpd(xmm0, xmm3);
-  addsd(xmm1, xmm6);
-  pshufd(xmm3, xmm0, 238);
-  mulsd(xmm0, xmm5);
-  mulsd(xmm3, xmm5);
-  shll(eax, 4);
-  xorpd(xmm4, xmm4);
-  addl(eax, 16368);
-  pinsrw(xmm4, eax, 3);
-  addsd(xmm0, xmm1);
-  movl(rsi, Address(rsp, 24));
-  addsd(xmm0, xmm3);
-  movdqu(xmm1, xmm0);
-  addsd(xmm0, xmm5);
-  mulsd(xmm0, xmm4);
-  pextrw(eax, xmm0, 3);
-  andl(eax, 32752);
-  jcc(Assembler::equal, L_2TAG_PACKET_16_0_2);
-  cmpl(eax, 32752);
-  jcc(Assembler::equal, L_2TAG_PACKET_17_0_2);
-
-  bind(L_2TAG_PACKET_18_0_2);
-  movsd(Address(rsp, 0), xmm0);
-  fld_d(Address(rsp, 0));
-  jmp(L_2TAG_PACKET_6_0_2);
-
-  bind(L_2TAG_PACKET_8_0_2);
-  movsd(xmm1, Address(rsp, 16));
-  movsd(xmm0, Address(rsp, 8));
-  movdqu(xmm2, xmm0);
-  movdl(eax, xmm2);
-  psrlq(xmm2, 20);
-  movdl(edx, xmm2);
-  orl(eax, edx);
-  jcc(Assembler::equal, L_2TAG_PACKET_19_0_2);
-  addsd(xmm0, xmm0);
-  movdl(eax, xmm1);
-  psrlq(xmm1, 32);
-  movdl(edx, xmm1);
-  movl(ecx, edx);
-  addl(edx, edx);
-  orl(eax, edx);
-  jcc(Assembler::equal, L_2TAG_PACKET_20_0_2);
-  jmp(L_2TAG_PACKET_18_0_2);
-
-  bind(L_2TAG_PACKET_20_0_2);
-  xorpd(xmm0, xmm0);
-  movl(eax, 16368);
-  pinsrw(xmm0, eax, 3);
-  movl(edx, 29);
-  jmp(L_2TAG_PACKET_21_0_2);
-
-  bind(L_2TAG_PACKET_22_0_2);
-  movsd(xmm0, Address(rsp, 16));
-  addpd(xmm0, xmm0);
-  jmp(L_2TAG_PACKET_18_0_2);
-
-  bind(L_2TAG_PACKET_19_0_2);
-  movdl(eax, xmm1);
-  movdqu(xmm2, xmm1);
-  psrlq(xmm1, 32);
-  movdl(edx, xmm1);
-  movl(ecx, edx);
-  addl(edx, edx);
-  orl(eax, edx);
-  jcc(Assembler::equal, L_2TAG_PACKET_23_0_2);
-  pextrw(eax, xmm2, 3);
-  andl(eax, 32752);
-  cmpl(eax, 32752);
-  jcc(Assembler::notEqual, L_2TAG_PACKET_24_0_2);
-  movdl(eax, xmm2);
-  psrlq(xmm2, 20);
-  movdl(edx, xmm2);
-  orl(eax, edx);
-  jcc(Assembler::notEqual, L_2TAG_PACKET_22_0_2);
-
-  bind(L_2TAG_PACKET_24_0_2);
-  pextrw(eax, xmm0, 3);
-  testl(eax, 32768);
-  jcc(Assembler::notEqual, L_2TAG_PACKET_25_0_2);
-  testl(ecx, INT_MIN);
-  jcc(Assembler::notEqual, L_2TAG_PACKET_26_0_2);
-  jmp(L_2TAG_PACKET_18_0_2);
-
-  bind(L_2TAG_PACKET_27_0_2);
-  movsd(xmm1, Address(rsp, 16));
-  movdl(eax, xmm1);
-  testl(eax, 1);
-  jcc(Assembler::notEqual, L_2TAG_PACKET_28_0_2);
-  testl(eax, 2);
-  jcc(Assembler::notEqual, L_2TAG_PACKET_29_0_2);
-  jmp(L_2TAG_PACKET_28_0_2);
-
-  bind(L_2TAG_PACKET_25_0_2);
-  shrl(ecx, 20);
-  andl(ecx, 2047);
-  cmpl(ecx, 1075);
-  jcc(Assembler::above, L_2TAG_PACKET_28_0_2);
-  jcc(Assembler::equal, L_2TAG_PACKET_30_0_2);
-  cmpl(ecx, 1074);
-  jcc(Assembler::above, L_2TAG_PACKET_27_0_2);
-  cmpl(ecx, 1023);
-  jcc(Assembler::below, L_2TAG_PACKET_28_0_2);
-  movsd(xmm1, Address(rsp, 16));
-  movl(eax, 17208);
-  xorpd(xmm3, xmm3);
-  pinsrw(xmm3, eax, 3);
-  movdqu(xmm4, xmm3);
-  addsd(xmm3, xmm1);
-  subsd(xmm4, xmm3);
-  addsd(xmm1, xmm4);
-  pextrw(eax, xmm1, 3);
-  andl(eax, 32752);
-  jcc(Assembler::notEqual, L_2TAG_PACKET_28_0_2);
-  movdl(eax, xmm3);
-  andl(eax, 1);
-  jcc(Assembler::equal, L_2TAG_PACKET_28_0_2);
-
-  bind(L_2TAG_PACKET_29_0_2);
-  movsd(xmm1, Address(rsp, 16));
-  pextrw(eax, xmm1, 3);
-  andl(eax, 32768);
-  jcc(Assembler::equal, L_2TAG_PACKET_18_0_2);
-  xorpd(xmm0, xmm0);
-  movl(eax, 32768);
-  pinsrw(xmm0, eax, 3);
-  jmp(L_2TAG_PACKET_18_0_2);
-
-  bind(L_2TAG_PACKET_28_0_2);
-  movsd(xmm1, Address(rsp, 16));
-  pextrw(eax, xmm1, 3);
-  andl(eax, 32768);
-  jcc(Assembler::notEqual, L_2TAG_PACKET_26_0_2);
-
-  bind(L_2TAG_PACKET_31_0_2);
-  xorpd(xmm0, xmm0);
-  movl(eax, 32752);
-  pinsrw(xmm0, eax, 3);
-  jmp(L_2TAG_PACKET_18_0_2);
-
-  bind(L_2TAG_PACKET_30_0_2);
-  movsd(xmm1, Address(rsp, 16));
-  movdl(eax, xmm1);
-  andl(eax, 1);
-  jcc(Assembler::equal, L_2TAG_PACKET_28_0_2);
-  jmp(L_2TAG_PACKET_29_0_2);
-
-  bind(L_2TAG_PACKET_32_0_2);
-  movdl(eax, xmm1);
-  psrlq(xmm1, 20);
-  movdl(edx, xmm1);
-  orl(eax, edx);
-  jcc(Assembler::equal, L_2TAG_PACKET_33_0_2);
-  movsd(xmm0, Address(rsp, 16));
-  addsd(xmm0, xmm0);
-  jmp(L_2TAG_PACKET_18_0_2);
-
-  bind(L_2TAG_PACKET_33_0_2);
-  movsd(xmm0, Address(rsp, 8));
-  pextrw(eax, xmm0, 3);
-  cmpl(eax, 49136);
-  jcc(Assembler::notEqual, L_2TAG_PACKET_34_0_2);
-  movdl(ecx, xmm0);
-  psrlq(xmm0, 20);
-  movdl(edx, xmm0);
-  orl(ecx, edx);
-  jcc(Assembler::notEqual, L_2TAG_PACKET_34_0_2);
-  xorpd(xmm0, xmm0);
-  movl(eax, 32760);
-  pinsrw(xmm0, eax, 3);
-  jmp(L_2TAG_PACKET_18_0_2);
-
-  bind(L_2TAG_PACKET_34_0_2);
-  movsd(xmm1, Address(rsp, 16));
-  andl(eax, 32752);
-  subl(eax, 16368);
-  pextrw(edx, xmm1, 3);
-  xorpd(xmm0, xmm0);
-  xorl(eax, edx);
-  andl(eax, 32768);
-  jcc(Assembler::notEqual, L_2TAG_PACKET_18_0_2);
-  movl(ecx, 32752);
-  pinsrw(xmm0, ecx, 3);
-  jmp(L_2TAG_PACKET_18_0_2);
-
-  bind(L_2TAG_PACKET_35_0_2);
-  movdl(eax, xmm1);
-  cmpl(edx, 17184);
-  jcc(Assembler::above, L_2TAG_PACKET_36_0_2);
-  testl(eax, 1);
-  jcc(Assembler::notEqual, L_2TAG_PACKET_37_0_2);
-  testl(eax, 2);
-  jcc(Assembler::equal, L_2TAG_PACKET_38_0_2);
-  jmp(L_2TAG_PACKET_39_0_2);
-
-  bind(L_2TAG_PACKET_36_0_2);
-  testl(eax, 1);
-  jcc(Assembler::equal, L_2TAG_PACKET_38_0_2);
-  jmp(L_2TAG_PACKET_39_0_2);
-
-  bind(L_2TAG_PACKET_9_0_2);
-  movsd(xmm2, Address(rsp, 8));
-  movdl(eax, xmm2);
-  psrlq(xmm2, 31);
-  movdl(ecx, xmm2);
-  orl(eax, ecx);
-  jcc(Assembler::equal, L_2TAG_PACKET_11_0_2);
-  movsd(xmm1, Address(rsp, 16));
-  pextrw(edx, xmm1, 3);
-  movdl(eax, xmm1);
-  movdqu(xmm2, xmm1);
-  psrlq(xmm2, 32);
-  movdl(ecx, xmm2);
-  addl(ecx, ecx);
-  orl(ecx, eax);
-  jcc(Assembler::equal, L_2TAG_PACKET_40_0_2);
-  andl(edx, 32752);
-  cmpl(edx, 32752);
-  jcc(Assembler::equal, L_2TAG_PACKET_32_0_2);
-  cmpl(edx, 17200);
-  jcc(Assembler::above, L_2TAG_PACKET_38_0_2);
-  cmpl(edx, 17184);
-  jcc(Assembler::aboveEqual, L_2TAG_PACKET_35_0_2);
-  cmpl(edx, 16368);
-  jcc(Assembler::below, L_2TAG_PACKET_37_0_2);
-  movl(eax, 17208);
-  xorpd(xmm2, xmm2);
-  pinsrw(xmm2, eax, 3);
-  movdqu(xmm4, xmm2);
-  addsd(xmm2, xmm1);
-  subsd(xmm4, xmm2);
-  addsd(xmm1, xmm4);
-  pextrw(eax, xmm1, 3);
-  andl(eax, 32767);
-  jcc(Assembler::notEqual, L_2TAG_PACKET_37_0_2);
-  movdl(eax, xmm2);
-  andl(eax, 1);
-  jcc(Assembler::equal, L_2TAG_PACKET_38_0_2);
-
-  bind(L_2TAG_PACKET_39_0_2);
-  xorpd(xmm1, xmm1);
-  movl(edx, 30704);
-  pinsrw(xmm1, edx, 3);
-  movsd(xmm2, Address(tmp, 8256));
-  movsd(xmm4, Address(rsp, 8));
-  pextrw(eax, xmm4, 3);
-  movl(edx, 8192);
-  movdl(xmm4, edx);
-  andl(eax, 32767);
-  subl(eax, 16);
-  jcc(Assembler::less, L_2TAG_PACKET_12_0_2);
-  movl(edx, eax);
-  andl(edx, 32752);
-  subl(edx, 16368);
-  movl(ecx, edx);
-  sarl(edx, 31);
-  addl(ecx, edx);
-  xorl(ecx, edx);
-  addl(ecx, 16);
-  bsrl(ecx, ecx);
-  movl(rsi, INT_MIN);
-  jmp(L_2TAG_PACKET_1_0_2);
-
-  bind(L_2TAG_PACKET_37_0_2);
-  xorpd(xmm1, xmm1);
-  movl(eax, 32752);
-  pinsrw(xmm1, eax, 3);
-  xorpd(xmm0, xmm0);
-  mulsd(xmm0, xmm1);
-  movl(edx, 28);
-  jmp(L_2TAG_PACKET_21_0_2);
-
-  bind(L_2TAG_PACKET_38_0_2);
-  xorpd(xmm1, xmm1);
-  movl(edx, 30704);
-  pinsrw(xmm1, edx, 3);
-  movsd(xmm2, Address(tmp, 8256));
-  movsd(xmm4, Address(rsp, 8));
-  pextrw(eax, xmm4, 3);
-  movl(edx, 8192);
-  movdl(xmm4, edx);
-  andl(eax, 32767);
-  subl(eax, 16);
-  jcc(Assembler::less, L_2TAG_PACKET_10_0_2);
-  movl(edx, eax);
-  andl(edx, 32752);
-  subl(edx, 16368);
-  movl(ecx, edx);
-  sarl(edx, 31);
-  addl(ecx, edx);
-  xorl(ecx, edx);
-  addl(ecx, 16);
-  bsrl(ecx, ecx);
-  movl(rsi, 0);
-  jmp(L_2TAG_PACKET_1_0_2);
-
-  bind(L_2TAG_PACKET_23_0_2);
-  xorpd(xmm0, xmm0);
-  movl(eax, 16368);
-  pinsrw(xmm0, eax, 3);
-  jmp(L_2TAG_PACKET_18_0_2);
-
-  bind(L_2TAG_PACKET_26_0_2);
-  xorpd(xmm0, xmm0);
-  jmp(L_2TAG_PACKET_18_0_2);
-
-  bind(L_2TAG_PACKET_13_0_2);
-  addl(eax, 384);
-  cmpl(eax, 0);
-  jcc(Assembler::less, L_2TAG_PACKET_41_0_2);
-  mulsd(xmm5, xmm1);
-  addsd(xmm0, xmm7);
-  shrl(rsi, 31);
-  addpd(xmm3, xmm0);
-  pshufd(xmm0, xmm3, 238);
-  addsd(xmm3, xmm0);
-  movsd(xmm4, Address(tmp, rsi, Address::times_8, 12528));
-  mulsd(xmm1, xmm3);
-  xorpd(xmm0, xmm0);
-  movl(eax, 16368);
-  shll(rsi, 15);
-  orl(eax, rsi);
-  pinsrw(xmm0, eax, 3);
-  addsd(xmm5, xmm1);
-  movl(rsi, Address(rsp, 24));
-  mulsd(xmm5, xmm4);
-  addsd(xmm0, xmm5);
-  jmp(L_2TAG_PACKET_18_0_2);
-
-  bind(L_2TAG_PACKET_41_0_2);
-  movl(rsi, Address(rsp, 24));
-  xorpd(xmm0, xmm0);
-  movl(eax, 16368);
-  pinsrw(xmm0, eax, 3);
-  jmp(L_2TAG_PACKET_18_0_2);
-
-  bind(L_2TAG_PACKET_40_0_2);
-  xorpd(xmm0, xmm0);
-  movl(eax, 16368);
-  pinsrw(xmm0, eax, 3);
-  jmp(L_2TAG_PACKET_18_0_2);
-
-  bind(L_2TAG_PACKET_42_0_2);
-  xorpd(xmm0, xmm0);
-  movl(eax, 16368);
-  pinsrw(xmm0, eax, 3);
-  movl(edx, 26);
-  jmp(L_2TAG_PACKET_21_0_2);
-
-  bind(L_2TAG_PACKET_11_0_2);
-  movsd(xmm1, Address(rsp, 16));
-  movdqu(xmm2, xmm1);
-  pextrw(eax, xmm1, 3);
-  andl(eax, 32752);
-  cmpl(eax, 32752);
-  jcc(Assembler::notEqual, L_2TAG_PACKET_43_0_2);
-  movdl(eax, xmm2);
-  psrlq(xmm2, 20);
-  movdl(edx, xmm2);
-  orl(eax, edx);
-  jcc(Assembler::notEqual, L_2TAG_PACKET_22_0_2);
-
-  bind(L_2TAG_PACKET_43_0_2);
-  movdl(eax, xmm1);
-  psrlq(xmm1, 32);
-  movdl(edx, xmm1);
-  movl(ecx, edx);
-  addl(edx, edx);
-  orl(eax, edx);
-  jcc(Assembler::equal, L_2TAG_PACKET_42_0_2);
-  shrl(edx, 21);
-  cmpl(edx, 1075);
-  jcc(Assembler::above, L_2TAG_PACKET_44_0_2);
-  jcc(Assembler::equal, L_2TAG_PACKET_45_0_2);
-  cmpl(edx, 1023);
-  jcc(Assembler::below, L_2TAG_PACKET_44_0_2);
-  movsd(xmm1, Address(rsp, 16));
-  movl(eax, 17208);
-  xorpd(xmm3, xmm3);
-  pinsrw(xmm3, eax, 3);
-  movdqu(xmm4, xmm3);
-  addsd(xmm3, xmm1);
-  subsd(xmm4, xmm3);
-  addsd(xmm1, xmm4);
-  pextrw(eax, xmm1, 3);
-  andl(eax, 32752);
-  jcc(Assembler::notEqual, L_2TAG_PACKET_44_0_2);
-  movdl(eax, xmm3);
-  andl(eax, 1);
-  jcc(Assembler::equal, L_2TAG_PACKET_44_0_2);
-
-  bind(L_2TAG_PACKET_46_0_2);
-  movsd(xmm0, Address(rsp, 8));
-  testl(ecx, INT_MIN);
-  jcc(Assembler::notEqual, L_2TAG_PACKET_47_0_2);
-  jmp(L_2TAG_PACKET_18_0_2);
-
-  bind(L_2TAG_PACKET_45_0_2);
-  movsd(xmm1, Address(rsp, 16));
-  movdl(eax, xmm1);
-  testl(eax, 1);
-  jcc(Assembler::notEqual, L_2TAG_PACKET_46_0_2);
-
-  bind(L_2TAG_PACKET_44_0_2);
-  testl(ecx, INT_MIN);
-  jcc(Assembler::equal, L_2TAG_PACKET_26_0_2);
-  xorpd(xmm0, xmm0);
-
-  bind(L_2TAG_PACKET_47_0_2);
-  movl(eax, 16368);
-  xorpd(xmm1, xmm1);
-  pinsrw(xmm1, eax, 3);
-  divsd(xmm1, xmm0);
-  movdqu(xmm0, xmm1);
-  movl(edx, 27);
-  jmp(L_2TAG_PACKET_21_0_2);
-
-  bind(L_2TAG_PACKET_14_0_2);
-  movsd(xmm2, Address(rsp, 8));
-  movsd(xmm6, Address(rsp, 16));
-  pextrw(eax, xmm2, 3);
-  pextrw(edx, xmm6, 3);
-  movl(ecx, 32752);
-  andl(ecx, edx);
-  cmpl(ecx, 32752);
-  jcc(Assembler::equal, L_2TAG_PACKET_48_0_2);
-  andl(eax, 32752);
-  subl(eax, 16368);
-  xorl(edx, eax);
-  testl(edx, 32768);
-  jcc(Assembler::notEqual, L_2TAG_PACKET_49_0_2);
-
-  bind(L_2TAG_PACKET_50_0_2);
-  movl(eax, 32736);
-  pinsrw(xmm0, eax, 3);
-  shrl(rsi, 16);
-  orl(eax, rsi);
-  pinsrw(xmm1, eax, 3);
-  movl(rsi, Address(rsp, 24));
-  mulsd(xmm0, xmm1);
-
-  bind(L_2TAG_PACKET_17_0_2);
-  movl(edx, 24);
-
-  bind(L_2TAG_PACKET_21_0_2);
-  movsd(Address(rsp, 0), xmm0);
-  fld_d(Address(rsp, 0));
-  jmp(L_2TAG_PACKET_6_0_2);
-
-  bind(L_2TAG_PACKET_49_0_2);
-  movl(eax, 16);
-  pinsrw(xmm0, eax, 3);
-  mulsd(xmm0, xmm0);
-  testl(rsi, INT_MIN);
-  jcc(Assembler::equal, L_2TAG_PACKET_51_0_2);
-  movsd(xmm2, Address(tmp, 12560));
-  xorpd(xmm0, xmm2);
-
-  bind(L_2TAG_PACKET_51_0_2);
-  movl(rsi, Address(rsp, 24));
-  movl(edx, 25);
-  jmp(L_2TAG_PACKET_21_0_2);
-
-  bind(L_2TAG_PACKET_16_0_2);
-  pextrw(ecx, xmm5, 3);
-  pextrw(edx, xmm4, 3);
-  movl(eax, -1);
-  andl(ecx, 32752);
-  subl(ecx, 16368);
-  andl(edx, 32752);
-  addl(edx, ecx);
-  movl(ecx, -31);
-  sarl(edx, 4);
-  subl(ecx, edx);
-  jcc(Assembler::lessEqual, L_2TAG_PACKET_52_0_2);
-  cmpl(ecx, 20);
-  jcc(Assembler::above, L_2TAG_PACKET_53_0_2);
-  shll(eax);
-
-  bind(L_2TAG_PACKET_52_0_2);
-  movdl(xmm0, eax);
-  psllq(xmm0, 32);
-  pand(xmm0, xmm5);
-  subsd(xmm5, xmm0);
-  addsd(xmm5, xmm1);
-  mulsd(xmm0, xmm4);
-  mulsd(xmm5, xmm4);
-  addsd(xmm0, xmm5);
-
-  bind(L_2TAG_PACKET_53_0_2);
-  movl(edx, 25);
-  jmp(L_2TAG_PACKET_21_0_2);
-
-  bind(L_2TAG_PACKET_2_0_2);
-  movzwl(ecx, Address(rsp, 22));
-  movl(edx, INT_MIN);
-  movdl(xmm1, edx);
-  xorpd(xmm7, xmm7);
-  paddd(xmm0, xmm4);
-  psllq(xmm5, 32);
-  movdl(edx, xmm0);
-  psllq(xmm0, 29);
-  paddq(xmm1, xmm3);
-  pand(xmm5, xmm1);
-  andl(ecx, 32752);
-  cmpl(ecx, 16560);
-  jcc(Assembler::below, L_2TAG_PACKET_3_0_2);
-  pand(xmm0, xmm6);
-  subsd(xmm3, xmm5);
-  addl(eax, 16351);
-  shrl(eax, 4);
-  subl(eax, 1022);
-  cvtsi2sdl(xmm7, eax);
-  mulpd(xmm5, xmm0);
-  movsd(xmm4, Address(tmp, 0));
-  mulsd(xmm3, xmm0);
-  movsd(xmm6, Address(tmp, 0));
-  subsd(xmm5, xmm2);
-  movsd(xmm1, Address(tmp, 8));
-  pshufd(xmm2, xmm3, 68);
-  unpcklpd(xmm5, xmm3);
-  addsd(xmm3, xmm5);
-  movsd(xmm0, Address(tmp, 8));
-  andl(edx, 16760832);
-  shrl(edx, 10);
-  addpd(xmm7, Address(tmp, edx, Address::times_1, -3616));
-  mulsd(xmm4, xmm5);
-  mulsd(xmm0, xmm5);
-  mulsd(xmm6, xmm2);
-  mulsd(xmm1, xmm2);
-  movdqu(xmm2, xmm5);
-  mulsd(xmm4, xmm5);
-  addsd(xmm5, xmm0);
-  movdqu(xmm0, xmm7);
-  addsd(xmm2, xmm3);
-  addsd(xmm7, xmm5);
-  mulsd(xmm6, xmm2);
-  subsd(xmm0, xmm7);
-  movdqu(xmm2, xmm7);
-  addsd(xmm7, xmm4);
-  addsd(xmm0, xmm5);
-  subsd(xmm2, xmm7);
-  addsd(xmm4, xmm2);
-  pshufd(xmm2, xmm5, 238);
-  movdqu(xmm5, xmm7);
-  addsd(xmm7, xmm2);
-  addsd(xmm4, xmm0);
-  movdqu(xmm0, Address(tmp, 8272));
-  subsd(xmm5, xmm7);
-  addsd(xmm6, xmm4);
-  movdqu(xmm4, xmm7);
-  addsd(xmm5, xmm2);
-  addsd(xmm7, xmm1);
-  movdqu(xmm2, Address(tmp, 8336));
-  subsd(xmm4, xmm7);
-  addsd(xmm6, xmm5);
-  addsd(xmm4, xmm1);
-  pshufd(xmm5, xmm7, 238);
-  movdqu(xmm1, xmm7);
-  addsd(xmm7, xmm5);
-  subsd(xmm1, xmm7);
-  addsd(xmm1, xmm5);
-  movdqu(xmm5, Address(tmp, 8352));
-  pshufd(xmm3, xmm3, 68);
-  addsd(xmm6, xmm4);
-  addsd(xmm6, xmm1);
-  movdqu(xmm1, Address(tmp, 8304));
-  mulpd(xmm0, xmm3);
-  mulpd(xmm2, xmm3);
-  pshufd(xmm4, xmm3, 68);
-  mulpd(xmm3, xmm3);
-  addpd(xmm0, xmm1);
-  addpd(xmm5, xmm2);
-  mulsd(xmm4, xmm3);
-  movsd(xmm2, Address(tmp, 16));
-  mulpd(xmm3, xmm3);
-  movsd(xmm1, Address(rsp, 16));
-  movzwl(ecx, Address(rsp, 22));
-  mulpd(xmm0, xmm4);
-  pextrw(eax, xmm7, 3);
-  mulpd(xmm5, xmm4);
-  mulpd(xmm0, xmm3);
-  movsd(xmm4, Address(tmp, 8376));
-  pand(xmm2, xmm7);
-  addsd(xmm5, xmm6);
-  subsd(xmm7, xmm2);
-  addpd(xmm5, xmm0);
-  andl(eax, 32752);
-  subl(eax, 16368);
-  andl(ecx, 32752);
-  cmpl(ecx, 32752);
-  jcc(Assembler::equal, L_2TAG_PACKET_48_0_2);
-  addl(ecx, eax);
-  cmpl(ecx, 16576);
-  jcc(Assembler::aboveEqual, L_2TAG_PACKET_54_0_2);
-  pshufd(xmm0, xmm5, 238);
-  pand(xmm4, xmm1);
-  movdqu(xmm3, xmm1);
-  addsd(xmm5, xmm0);
-  subsd(xmm1, xmm4);
-  xorpd(xmm6, xmm6);
-  movl(edx, 17080);
-  pinsrw(xmm6, edx, 3);
-  addsd(xmm7, xmm5);
-  mulsd(xmm4, xmm2);
-  mulsd(xmm1, xmm2);
-  movdqu(xmm5, xmm6);
-  mulsd(xmm3, xmm7);
-  addsd(xmm6, xmm4);
-  addsd(xmm1, xmm3);
-  movdqu(xmm7, Address(tmp, 12480));
-  movdl(edx, xmm6);
-  subsd(xmm6, xmm5);
-  movdqu(xmm3, Address(tmp, 12496));
-  movsd(xmm2, Address(tmp, 12512));
-  subsd(xmm4, xmm6);
-  movl(ecx, edx);
-  andl(edx, 255);
-  addl(edx, edx);
-  movdqu(xmm5, Address(tmp, edx, Address::times_8, 8384));
-  addsd(xmm4, xmm1);
-  pextrw(edx, xmm6, 3);
-  shrl(ecx, 8);
-  movl(eax, ecx);
-  shrl(ecx, 1);
-  subl(eax, ecx);
-  shll(ecx, 20);
-  movdl(xmm6, ecx);
-  pshufd(xmm0, xmm4, 68);
-  pshufd(xmm1, xmm4, 68);
-  mulpd(xmm0, xmm0);
-  mulpd(xmm7, xmm1);
-  pshufd(xmm6, xmm6, 17);
-  mulsd(xmm2, xmm4);
-  andl(edx, 32767);
-  cmpl(edx, 16529);
-  jcc(Assembler::above, L_2TAG_PACKET_14_0_2);
-  mulsd(xmm0, xmm0);
-  paddd(xmm5, xmm6);
-  addpd(xmm3, xmm7);
-  mulsd(xmm2, xmm5);
-  pshufd(xmm6, xmm5, 238);
-  mulpd(xmm0, xmm3);
-  addsd(xmm2, xmm6);
-  pshufd(xmm3, xmm0, 238);
-  addl(eax, 1023);
-  shll(eax, 20);
-  orl(eax, rsi);
-  movdl(xmm4, eax);
-  mulsd(xmm0, xmm5);
-  mulsd(xmm3, xmm5);
-  addsd(xmm0, xmm2);
-  psllq(xmm4, 32);
-  addsd(xmm0, xmm3);
-  movdqu(xmm1, xmm0);
-  addsd(xmm0, xmm5);
-  movl(rsi, Address(rsp, 24));
-  mulsd(xmm0, xmm4);
-  pextrw(eax, xmm0, 3);
-  andl(eax, 32752);
-  jcc(Assembler::equal, L_2TAG_PACKET_16_0_2);
-  cmpl(eax, 32752);
-  jcc(Assembler::equal, L_2TAG_PACKET_17_0_2);
-
-  bind(L_2TAG_PACKET_55_0_2);
-  movsd(Address(rsp, 0), xmm0);
-  fld_d(Address(rsp, 0));
-  jmp(L_2TAG_PACKET_6_0_2);
-
-  bind(L_2TAG_PACKET_48_0_2);
-  movl(rsi, Address(rsp, 24));
-
-  bind(L_2TAG_PACKET_56_0_2);
-  movsd(xmm0, Address(rsp, 8));
-  movsd(xmm1, Address(rsp, 16));
-  addsd(xmm1, xmm1);
-  xorpd(xmm2, xmm2);
-  movl(eax, 49136);
-  pinsrw(xmm2, eax, 3);
-  addsd(xmm2, xmm0);
-  pextrw(eax, xmm2, 3);
-  cmpl(eax, 0);
-  jcc(Assembler::notEqual, L_2TAG_PACKET_57_0_2);
-  xorpd(xmm0, xmm0);
-  movl(eax, 32760);
-  pinsrw(xmm0, eax, 3);
-  jmp(L_2TAG_PACKET_18_0_2);
-
-  bind(L_2TAG_PACKET_57_0_2);
-  movdl(edx, xmm1);
-  movdqu(xmm3, xmm1);
-  psrlq(xmm3, 20);
-  movdl(ecx, xmm3);
-  orl(ecx, edx);
-  jcc(Assembler::equal, L_2TAG_PACKET_58_0_2);
-  addsd(xmm1, xmm1);
-  movdqu(xmm0, xmm1);
-  jmp(L_2TAG_PACKET_18_0_2);
-
-  bind(L_2TAG_PACKET_58_0_2);
-  pextrw(eax, xmm0, 3);
-  andl(eax, 32752);
-  pextrw(edx, xmm1, 3);
-  xorpd(xmm0, xmm0);
-  subl(eax, 16368);
-  xorl(eax, edx);
-  testl(eax, 32768);
-  jcc(Assembler::notEqual, L_2TAG_PACKET_18_0_2);
-  movl(edx, 32752);
-  pinsrw(xmm0, edx, 3);
-  jmp(L_2TAG_PACKET_18_0_2);
-
-  bind(L_2TAG_PACKET_54_0_2);
-  pextrw(eax, xmm1, 3);
-  pextrw(ecx, xmm2, 3);
-  xorl(eax, ecx);
-  testl(eax, 32768);
-  jcc(Assembler::equal, L_2TAG_PACKET_50_0_2);
-  jmp(L_2TAG_PACKET_49_0_2);
-
-  bind(L_2TAG_PACKET_6_0_2);
-  movl(tmp, Address(rsp, 64));
-
-}
diff --git a/src/hotspot/cpu/x86/macroAssembler_x86_32_sin.cpp b/src/hotspot/cpu/x86/macroAssembler_x86_32_sin.cpp
deleted file mode 100644
index cd593ba3356..00000000000
--- a/src/hotspot/cpu/x86/macroAssembler_x86_32_sin.cpp
+++ /dev/null
@@ -1,1742 +0,0 @@
-/*
-* Copyright (c) 2016, 2021, Intel Corporation. All rights reserved.
-* Intel Math Library (LIBM) Source Code
-*
-* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-*
-* This code is free software; you can redistribute it and/or modify it
-* under the terms of the GNU General Public License version 2 only, as
-* published by the Free Software Foundation.
-*
-* This code is distributed in the hope that it will be useful, but WITHOUT
-* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-* FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-* version 2 for more details (a copy is included in the LICENSE file that
-* accompanied this code).
-*
-* You should have received a copy of the GNU General Public License version
-* 2 along with this work; if not, write to the Free Software Foundation,
-* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-*
-* Please 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 "asm/assembler.hpp"
-#include "asm/assembler.inline.hpp"
-#include "macroAssembler_x86.hpp"
-#include "runtime/stubRoutines.hpp"
-#include "stubRoutines_x86.hpp"
-#include "utilities/globalDefinitions.hpp"
-
-/******************************************************************************/
-//                     ALGORITHM DESCRIPTION - SIN()
-//                     ---------------------
-//
-//     1. RANGE REDUCTION
-//
-//     We perform an initial range reduction from X to r with
-//
-//          X =~= N * pi/32 + r
-//
-//     so that |r| <= pi/64 + epsilon. We restrict inputs to those
-//     where |N| <= 932560. Beyond this, the range reduction is
-//     insufficiently accurate. For extremely small inputs,
-//     denormalization can occur internally, impacting performance.
-//     This means that the main path is actually only taken for
-//     2^-252 <= |X| < 90112.
-//
-//     To avoid branches, we perform the range reduction to full
-//     accuracy each time.
-//
-//          X - N * (P_1 + P_2 + P_3)
-//
-//     where P_1 and P_2 are 32-bit numbers (so multiplication by N
-//     is exact) and P_3 is a 53-bit number. Together, these
-//     approximate pi well enough for all cases in the restricted
-//     range.
-//
-//     The main reduction sequence is:
-//
-//             y = 32/pi * x
-//             N = integer(y)
-//     (computed by adding and subtracting off SHIFTER)
-//
-//             m_1 = N * P_1
-//             m_2 = N * P_2
-//             r_1 = x - m_1
-//             r = r_1 - m_2
-//     (this r can be used for most of the calculation)
-//
-//             c_1 = r_1 - r
-//             m_3 = N * P_3
-//             c_2 = c_1 - m_2
-//             c = c_2 - m_3
-//
-//     2. MAIN ALGORITHM
-//
-//     The algorithm uses a table lookup based on B = M * pi / 32
-//     where M = N mod 64. The stored values are:
-//       sigma             closest power of 2 to cos(B)
-//       C_hl              53-bit cos(B) - sigma
-//       S_hi + S_lo       2 * 53-bit sin(B)
-//
-//     The computation is organized as follows:
-//
-//          sin(B + r + c) = [sin(B) + sigma * r] +
-//                           r * (cos(B) - sigma) +
-//                           sin(B) * [cos(r + c) - 1] +
-//                           cos(B) * [sin(r + c) - r]
-//
-//     which is approximately:
-//
-//          [S_hi + sigma * r] +
-//          C_hl * r +
-//          S_lo + S_hi * [(cos(r) - 1) - r * c] +
-//          (C_hl + sigma) * [(sin(r) - r) + c]
-//
-//     and this is what is actually computed. We separate this sum
-//     into four parts:
-//
-//          hi + med + pols + corr
-//
-//     where
-//
-//          hi       = S_hi + sigma r
-//          med      = C_hl * r
-//          pols     = S_hi * (cos(r) - 1) + (C_hl + sigma) * (sin(r) - r)
-//          corr     = S_lo + c * ((C_hl + sigma) - S_hi * r)
-//
-//     3. POLYNOMIAL
-//
-//     The polynomial S_hi * (cos(r) - 1) + (C_hl + sigma) *
-//     (sin(r) - r) can be rearranged freely, since it is quite
-//     small, so we exploit parallelism to the fullest.
-//
-//          psc4       =   SC_4 * r_1
-//          msc4       =   psc4 * r
-//          r2         =   r * r
-//          msc2       =   SC_2 * r2
-//          r4         =   r2 * r2
-//          psc3       =   SC_3 + msc4
-//          psc1       =   SC_1 + msc2
-//          msc3       =   r4 * psc3
-//          sincospols =   psc1 + msc3
-//          pols       =   sincospols *
-//                         <S_hi * r^2 | (C_hl + sigma) * r^3>
-//
-//     4. CORRECTION TERM
-//
-//     This is where the "c" component of the range reduction is
-//     taken into account; recall that just "r" is used for most of
-//     the calculation.
-//
-//          -c   = m_3 - c_2
-//          -d   = S_hi * r - (C_hl + sigma)
-//          corr = -c * -d + S_lo
-//
-//     5. COMPENSATED SUMMATIONS
-//
-//     The two successive compensated summations add up the high
-//     and medium parts, leaving just the low parts to add up at
-//     the end.
-//
-//          rs        =  sigma * r
-//          res_int   =  S_hi + rs
-//          k_0       =  S_hi - res_int
-//          k_2       =  k_0 + rs
-//          med       =  C_hl * r
-//          res_hi    =  res_int + med
-//          k_1       =  res_int - res_hi
-//          k_3       =  k_1 + med
-//
-//     6. FINAL SUMMATION
-//
-//     We now add up all the small parts:
-//
-//          res_lo = pols(hi) + pols(lo) + corr + k_1 + k_3
-//
-//     Now the overall result is just:
-//
-//          res_hi + res_lo
-//
-//     7. SMALL ARGUMENTS
-//
-//     If |x| < SNN (SNN meaning the smallest normal number), we
-//     simply perform 0.1111111 cdots 1111 * x. For SNN <= |x|, we
-//     do 2^-55 * (2^55 * x - x).
-//
-// Special cases:
-//  sin(NaN) = quiet NaN, and raise invalid exception
-//  sin(INF) = NaN and raise invalid exception
-//  sin(+/-0) = +/-0
-//
-/******************************************************************************/
-
-// The 32 bit code is at most SSE2 compliant
-ATTRIBUTE_ALIGNED(8) static const juint _zero_none[] =
-{
-    0x00000000UL, 0x00000000UL, 0x00000000UL, 0xbff00000UL
-};
-
-ATTRIBUTE_ALIGNED(4) static const juint __4onpi_d[] =
-{
-    0x6dc9c883UL, 0x3ff45f30UL
-};
-
-ATTRIBUTE_ALIGNED(4) static const juint _TWO_32H[] =
-{
-    0x00000000UL, 0x41f80000UL
-};
-
-ATTRIBUTE_ALIGNED(4) static const juint _pi04_3d[] =
-{
-    0x54442d00UL, 0x3fe921fbUL, 0x98cc5180UL, 0x3ce84698UL, 0xcbb5bf6cUL,
-    0xb9dfc8f8UL
-};
-
-ATTRIBUTE_ALIGNED(4) static const juint _pi04_5d[] =
-{
-    0x54400000UL, 0x3fe921fbUL, 0x1a600000UL, 0x3dc0b461UL, 0x2e000000UL,
-    0x3b93198aUL, 0x25200000UL, 0x396b839aUL, 0x533e63a0UL, 0x37027044UL
-};
-
-ATTRIBUTE_ALIGNED(4) static const juint _SCALE[] =
-{
-    0x00000000UL, 0x32600000UL
-};
-
-ATTRIBUTE_ALIGNED(4) static const juint _zeros[] =
-{
-    0x00000000UL, 0x00000000UL, 0x00000000UL, 0x80000000UL
-};
-
-ATTRIBUTE_ALIGNED(4) static const juint _pi04_2d[] =
-{
-    0x54400000UL, 0x3fe921fbUL, 0x1a626331UL, 0x3dc0b461UL
-};
-
-ATTRIBUTE_ALIGNED(4) static const juint _TWO_12H[] =
-{
-    0x00000000UL, 0x40b80000UL
-};
-
-ATTRIBUTE_ALIGNED(2) static const jushort __4onpi_31l[] =
-{
-    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x836e, 0xa2f9,
-    0x40d8, 0x0000, 0x0000, 0x0000, 0x2a50, 0x9c88, 0x40b7, 0x0000, 0x0000, 0x0000,
-    0xabe8, 0xfe13, 0x4099, 0x0000, 0x0000, 0x0000, 0x6ee0, 0xfa9a, 0x4079, 0x0000,
-    0x0000, 0x0000, 0x9580, 0xdb62, 0x4058, 0x0000, 0x0000, 0x0000, 0x1c82, 0xc9e2,
-    0x403d, 0x0000, 0x0000, 0x0000, 0xb1c0, 0xff28, 0x4019, 0x0000, 0x0000, 0x0000,
-    0xef14, 0xaf7a, 0x3ffe, 0x0000, 0x0000, 0x0000, 0x48dc, 0xc36e, 0x3fdf, 0x0000,
-    0x0000, 0x0000, 0x3740, 0xe909, 0x3fbe, 0x0000, 0x0000, 0x0000, 0x924a, 0xb801,
-    0x3fa2, 0x0000, 0x0000, 0x0000, 0x3a32, 0xdd41, 0x3f83, 0x0000, 0x0000, 0x0000,
-    0x8778, 0x873f, 0x3f62, 0x0000, 0x0000, 0x0000, 0x1298, 0xb1cb, 0x3f44, 0x0000,
-    0x0000, 0x0000, 0xa208, 0x9cfb, 0x3f26, 0x0000, 0x0000, 0x0000, 0xbaec, 0xd7d4,
-    0x3f06, 0x0000, 0x0000, 0x0000, 0xd338, 0x8909, 0x3ee7, 0x0000, 0x0000, 0x0000,
-    0x68b8, 0xe04d, 0x3ec7, 0x0000, 0x0000, 0x0000, 0x4e64, 0xdf90, 0x3eaa, 0x0000,
-    0x0000, 0x0000, 0xc1a8, 0xeb1c, 0x3e89, 0x0000, 0x0000, 0x0000, 0x2720, 0xce7d,
-    0x3e6a, 0x0000, 0x0000, 0x0000, 0x77b8, 0x8bf1, 0x3e4b, 0x0000, 0x0000, 0x0000,
-    0xec7e, 0xe4a0, 0x3e2e, 0x0000, 0x0000, 0x0000, 0xffbc, 0xf12f, 0x3e0f, 0x0000,
-    0x0000, 0x0000, 0xfdc0, 0xb301, 0x3deb, 0x0000, 0x0000, 0x0000, 0xc5ac, 0x9788,
-    0x3dd1, 0x0000, 0x0000, 0x0000, 0x47da, 0x829b, 0x3db2, 0x0000, 0x0000, 0x0000,
-    0xd9e4, 0xa6cf, 0x3d93, 0x0000, 0x0000, 0x0000, 0x36e8, 0xf961, 0x3d73, 0x0000,
-    0x0000, 0x0000, 0xf668, 0xf463, 0x3d54, 0x0000, 0x0000, 0x0000, 0x5168, 0xf2ff,
-    0x3d35, 0x0000, 0x0000, 0x0000, 0x758e, 0xea4f, 0x3d17, 0x0000, 0x0000, 0x0000,
-    0xf17a, 0xebe5, 0x3cf8, 0x0000, 0x0000, 0x0000, 0x9cfa, 0x9e83, 0x3cd9, 0x0000,
-    0x0000, 0x0000, 0xa4ba, 0xe294, 0x3cba, 0x0000, 0x0000, 0x0000, 0xd7ec, 0x9afe,
-    0x3c9a, 0x0000, 0x0000, 0x0000, 0xae80, 0x8fc6, 0x3c79, 0x0000, 0x0000, 0x0000,
-    0x3304, 0x8560, 0x3c5c, 0x0000, 0x0000, 0x0000, 0x6d70, 0xdf8f, 0x3c3b, 0x0000,
-    0x0000, 0x0000, 0x3ef0, 0xafc3, 0x3c1e, 0x0000, 0x0000, 0x0000, 0xd0d8, 0x826b,
-    0x3bfe, 0x0000, 0x0000, 0x0000, 0x1c80, 0xed4f, 0x3bdd, 0x0000, 0x0000, 0x0000,
-    0x730c, 0xb0af, 0x3bc1, 0x0000, 0x0000, 0x0000, 0x6660, 0xc219, 0x3ba2, 0x0000,
-    0x0000, 0x0000, 0x940c, 0xabe2, 0x3b83, 0x0000, 0x0000, 0x0000, 0xdffc, 0x8408,
-    0x3b64, 0x0000, 0x0000, 0x0000, 0x6b98, 0xc402, 0x3b45, 0x0000, 0x0000, 0x0000,
-    0x1818, 0x9cc4, 0x3b26, 0x0000, 0x0000, 0x0000, 0x5390, 0xaab6, 0x3b05, 0x0000,
-    0x0000, 0x0000, 0xb070, 0xd464, 0x3ae9, 0x0000, 0x0000, 0x0000, 0x231a, 0x9ef0,
-    0x3aca, 0x0000, 0x0000, 0x0000, 0x0670, 0xd1f1, 0x3aaa, 0x0000, 0x0000, 0x0000,
-    0x7738, 0xd9f3, 0x3a8a, 0x0000, 0x0000, 0x0000, 0xa834, 0x8092, 0x3a6c, 0x0000,
-    0x0000, 0x0000, 0xb45c, 0xce23, 0x3a4d, 0x0000, 0x0000, 0x0000, 0x36e8, 0xb0e5,
-    0x3a2d, 0x0000, 0x0000, 0x0000, 0xd156, 0xaf44, 0x3a10, 0x0000, 0x0000, 0x0000,
-    0x9f52, 0x8c82, 0x39f1, 0x0000, 0x0000, 0x0000, 0x829c, 0xff83, 0x39d1, 0x0000,
-    0x0000, 0x0000, 0x7d06, 0xefc6, 0x39b3, 0x0000, 0x0000, 0x0000, 0x93e0, 0xb0b7,
-    0x3992, 0x0000, 0x0000, 0x0000, 0xedde, 0xc193, 0x3975, 0x0000, 0x0000, 0x0000,
-    0xbbc0, 0xcf49, 0x3952, 0x0000, 0x0000, 0x0000, 0xbdf0, 0xd63c, 0x3937, 0x0000,
-    0x0000, 0x0000, 0x1f34, 0x9f3a, 0x3918, 0x0000, 0x0000, 0x0000, 0x3f8e, 0xe579,
-    0x38f9, 0x0000, 0x0000, 0x0000, 0x90c8, 0xc3f8, 0x38d9, 0x0000, 0x0000, 0x0000,
-    0x48c0, 0xf8f8, 0x38b7, 0x0000, 0x0000, 0x0000, 0xed56, 0xafa6, 0x389c, 0x0000,
-    0x0000, 0x0000, 0x8218, 0xb969, 0x387d, 0x0000, 0x0000, 0x0000, 0x1852, 0xec57,
-    0x385e, 0x0000, 0x0000, 0x0000, 0x670c, 0xd674, 0x383e, 0x0000, 0x0000, 0x0000,
-    0xad40, 0xc2c4, 0x3820, 0x0000, 0x0000, 0x0000, 0x2e80, 0xa696, 0x3801, 0x0000,
-    0x0000, 0x0000, 0xd800, 0xc467, 0x37dc, 0x0000, 0x0000, 0x0000, 0x3c72, 0xc5ae,
-    0x37c3, 0x0000, 0x0000, 0x0000, 0xb006, 0xac69, 0x37a4, 0x0000, 0x0000, 0x0000,
-    0x34a0, 0x8cdf, 0x3782, 0x0000, 0x0000, 0x0000, 0x9ed2, 0xd25e, 0x3766, 0x0000,
-    0x0000, 0x0000, 0x6fec, 0xaaaa, 0x3747, 0x0000, 0x0000, 0x0000, 0x6040, 0xfb5c,
-    0x3726, 0x0000, 0x0000, 0x0000, 0x764c, 0xa3fc, 0x3708, 0x0000, 0x0000, 0x0000,
-    0xb254, 0x954e, 0x36e9, 0x0000, 0x0000, 0x0000, 0x3e1c, 0xf5dc, 0x36ca, 0x0000,
-    0x0000, 0x0000, 0x7b06, 0xc635, 0x36ac, 0x0000, 0x0000, 0x0000, 0xa8ba, 0xd738,
-    0x368d, 0x0000, 0x0000, 0x0000, 0x06cc, 0xb24e, 0x366d, 0x0000, 0x0000, 0x0000,
-    0x7108, 0xac76, 0x364f, 0x0000, 0x0000, 0x0000, 0x2324, 0xa7cb, 0x3630, 0x0000,
-    0x0000, 0x0000, 0xac40, 0xef15, 0x360f, 0x0000, 0x0000, 0x0000, 0xae46, 0xd516,
-    0x35f2, 0x0000, 0x0000, 0x0000, 0x615e, 0xe003, 0x35d3, 0x0000, 0x0000, 0x0000,
-    0x0cf0, 0xefe7, 0x35b1, 0x0000, 0x0000, 0x0000, 0xfb50, 0xf98c, 0x3595, 0x0000,
-    0x0000, 0x0000, 0x0abc, 0xf333, 0x3575, 0x0000, 0x0000, 0x0000, 0xdd60, 0xca3f,
-    0x3555, 0x0000, 0x0000, 0x0000, 0x7eb6, 0xd87f, 0x3538, 0x0000, 0x0000, 0x0000,
-    0x44f4, 0xb291, 0x3519, 0x0000, 0x0000, 0x0000, 0xff80, 0xc982, 0x34f6, 0x0000,
-    0x0000, 0x0000, 0x9de0, 0xd9b8, 0x34db, 0x0000, 0x0000, 0x0000, 0xcd42, 0x9366,
-    0x34bc, 0x0000, 0x0000, 0x0000, 0xbef0, 0xfaee, 0x349d, 0x0000, 0x0000, 0x0000,
-    0xdac4, 0xb6f1, 0x347d, 0x0000, 0x0000, 0x0000, 0xf140, 0x94de, 0x345d, 0x0000,
-    0x0000, 0x0000, 0xa218, 0x8b4b, 0x343e, 0x0000, 0x0000, 0x0000, 0x6380, 0xa135,
-    0x341e, 0x0000, 0x0000, 0x0000, 0xb184, 0x8cb2, 0x3402, 0x0000, 0x0000, 0x0000,
-    0x196e, 0xdc61, 0x33e3, 0x0000, 0x0000, 0x0000, 0x0c00, 0xde05, 0x33c4, 0x0000,
-    0x0000, 0x0000, 0xef9a, 0xbd38, 0x33a5, 0x0000, 0x0000, 0x0000, 0xc1a0, 0xdf00,
-    0x3385, 0x0000, 0x0000, 0x0000, 0x1090, 0x9973, 0x3365, 0x0000, 0x0000, 0x0000,
-    0x4882, 0x8301, 0x3348, 0x0000, 0x0000, 0x0000, 0x7abe, 0xadc7, 0x3329, 0x0000,
-    0x0000, 0x0000, 0x7cba, 0xec2b, 0x330a, 0x0000, 0x0000, 0x0000, 0xa520, 0x8f21,
-    0x32e9, 0x0000, 0x0000, 0x0000, 0x710c, 0x8d36, 0x32cc, 0x0000, 0x0000, 0x0000,
-    0x5212, 0xc6ed, 0x32ad, 0x0000, 0x0000, 0x0000, 0x7308, 0xfd76, 0x328d, 0x0000,
-    0x0000, 0x0000, 0x5014, 0xd548, 0x326f, 0x0000, 0x0000, 0x0000, 0xd3f2, 0xb499,
-    0x3250, 0x0000, 0x0000, 0x0000, 0x7f74, 0xa606, 0x3230, 0x0000, 0x0000, 0x0000,
-    0xf0a8, 0xd720, 0x3212, 0x0000, 0x0000, 0x0000, 0x185c, 0xe20f, 0x31f2, 0x0000,
-    0x0000, 0x0000, 0xa5a8, 0x8738, 0x31d4, 0x0000, 0x0000, 0x0000, 0xdd74, 0xcafb,
-    0x31b4, 0x0000, 0x0000, 0x0000, 0x98b6, 0xbd8e, 0x3196, 0x0000, 0x0000, 0x0000,
-    0xe9de, 0x977f, 0x3177, 0x0000, 0x0000, 0x0000, 0x67c0, 0x818d, 0x3158, 0x0000,
-    0x0000, 0x0000, 0xe52a, 0x9322, 0x3139, 0x0000, 0x0000, 0x0000, 0xe568, 0x9b6c,
-    0x3119, 0x0000, 0x0000, 0x0000, 0x2358, 0xaa0a, 0x30fa, 0x0000, 0x0000, 0x0000,
-    0xe480, 0xe13b, 0x30d9, 0x0000, 0x0000, 0x0000, 0x3024, 0x90a1, 0x30bd, 0x0000,
-    0x0000, 0x0000, 0x9620, 0xda30, 0x309d, 0x0000, 0x0000, 0x0000, 0x898a, 0xb388,
-    0x307f, 0x0000, 0x0000, 0x0000, 0xb24c, 0xc891, 0x3060, 0x0000, 0x0000, 0x0000,
-    0x8056, 0xf98b, 0x3041, 0x0000, 0x0000, 0x0000, 0x72a4, 0xa1ea, 0x3021, 0x0000,
-    0x0000, 0x0000, 0x6af8, 0x9488, 0x3001, 0x0000, 0x0000, 0x0000, 0xe00c, 0xdfcb,
-    0x2fe4, 0x0000, 0x0000, 0x0000, 0xeeec, 0xc941, 0x2fc4, 0x0000, 0x0000, 0x0000,
-    0x53e0, 0xe70f, 0x2fa4, 0x0000, 0x0000, 0x0000, 0x8f60, 0x9c07, 0x2f85, 0x0000,
-    0x0000, 0x0000, 0xb328, 0xc3e7, 0x2f68, 0x0000, 0x0000, 0x0000, 0x9404, 0xf8c7,
-    0x2f48, 0x0000, 0x0000, 0x0000, 0x38e0, 0xc99f, 0x2f29, 0x0000, 0x0000, 0x0000,
-    0x9778, 0xd984, 0x2f09, 0x0000, 0x0000, 0x0000, 0xe700, 0xd142, 0x2eea, 0x0000,
-    0x0000, 0x0000, 0xd904, 0x9443, 0x2ecd, 0x0000, 0x0000, 0x0000, 0xd4ba, 0xae7e,
-    0x2eae, 0x0000, 0x0000, 0x0000, 0x8e5e, 0x8524, 0x2e8f, 0x0000, 0x0000, 0x0000,
-    0xb550, 0xc9ed, 0x2e6e, 0x0000, 0x0000, 0x0000, 0x53b8, 0x8648, 0x2e51, 0x0000,
-    0x0000, 0x0000, 0xdae4, 0x87f9, 0x2e32, 0x0000, 0x0000, 0x0000, 0x2942, 0xd966,
-    0x2e13, 0x0000, 0x0000, 0x0000, 0x4f28, 0xcf3c, 0x2df3, 0x0000, 0x0000, 0x0000,
-    0xfa40, 0xc4ef, 0x2dd1, 0x0000, 0x0000, 0x0000, 0x4424, 0xbca7, 0x2db5, 0x0000,
-    0x0000, 0x0000, 0x2e62, 0xcdc5, 0x2d97, 0x0000, 0x0000, 0x0000, 0xed88, 0x996b,
-    0x2d78, 0x0000, 0x0000, 0x0000, 0x7c30, 0xd97d, 0x2d56, 0x0000, 0x0000, 0x0000,
-    0xed26, 0xbf6e, 0x2d3a, 0x0000, 0x0000, 0x0000, 0x2918, 0x921b, 0x2d1a, 0x0000,
-    0x0000, 0x0000, 0x4e24, 0xe84e, 0x2cfb, 0x0000, 0x0000, 0x0000, 0x6dc0, 0x92ec,
-    0x2cdd, 0x0000, 0x0000, 0x0000, 0x4f2c, 0xacf8, 0x2cbd, 0x0000, 0x0000, 0x0000,
-    0xc634, 0xf094, 0x2c9e, 0x0000, 0x0000, 0x0000, 0xdc70, 0xe5d3, 0x2c7e, 0x0000,
-    0x0000, 0x0000, 0x2180, 0xa600, 0x2c5b, 0x0000, 0x0000, 0x0000, 0x8480, 0xd680,
-    0x2c3c, 0x0000, 0x0000, 0x0000, 0x8b24, 0xd63b, 0x2c22, 0x0000, 0x0000, 0x0000,
-    0x02e0, 0xaa47, 0x2c00, 0x0000, 0x0000, 0x0000, 0x9ad0, 0xee84, 0x2be3, 0x0000,
-    0x0000, 0x0000, 0xf7dc, 0xf699, 0x2bc6, 0x0000, 0x0000, 0x0000, 0xddde, 0xe490,
-    0x2ba7, 0x0000, 0x0000, 0x0000, 0x34a0, 0xb4fd, 0x2b85, 0x0000, 0x0000, 0x0000,
-    0x91b4, 0x8ef6, 0x2b68, 0x0000, 0x0000, 0x0000, 0xa3e0, 0xa2a7, 0x2b47, 0x0000,
-    0x0000, 0x0000, 0xcce4, 0x82b3, 0x2b2a, 0x0000, 0x0000, 0x0000, 0xe4be, 0x8207,
-    0x2b0c, 0x0000, 0x0000, 0x0000, 0x1d92, 0xab43, 0x2aed, 0x0000, 0x0000, 0x0000,
-    0xe818, 0xf9f6, 0x2acd, 0x0000, 0x0000, 0x0000, 0xff12, 0xba80, 0x2aaf, 0x0000,
-    0x0000, 0x0000, 0x5254, 0x8529, 0x2a90, 0x0000, 0x0000, 0x0000, 0x1b88, 0xe032,
-    0x2a71, 0x0000, 0x0000, 0x0000, 0x3248, 0xd86d, 0x2a50, 0x0000, 0x0000, 0x0000,
-    0x3140, 0xc9d5, 0x2a2e, 0x0000, 0x0000, 0x0000, 0x14e6, 0xbd47, 0x2a14, 0x0000,
-    0x0000, 0x0000, 0x5c10, 0xe544, 0x29f4, 0x0000, 0x0000, 0x0000, 0x9f50, 0x90b6,
-    0x29d4, 0x0000, 0x0000, 0x0000, 0x9850, 0xab55, 0x29b6, 0x0000, 0x0000, 0x0000,
-    0x2750, 0x9d07, 0x2998, 0x0000, 0x0000, 0x0000, 0x6700, 0x8bbb, 0x2973, 0x0000,
-    0x0000, 0x0000, 0x5dba, 0xed31, 0x295a, 0x0000, 0x0000, 0x0000, 0x61dc, 0x85fe,
-    0x293a, 0x0000, 0x0000, 0x0000, 0x9ba2, 0xd6b4, 0x291c, 0x0000, 0x0000, 0x0000,
-    0x2d30, 0xe3a5, 0x28fb, 0x0000, 0x0000, 0x0000, 0x6630, 0xb566, 0x28dd, 0x0000,
-    0x0000, 0x0000, 0x5ad4, 0xa829, 0x28bf, 0x0000, 0x0000, 0x0000, 0x89d8, 0xe290,
-    0x28a0, 0x0000, 0x0000, 0x0000, 0x3916, 0xc428, 0x2881, 0x0000, 0x0000, 0x0000,
-    0x0490, 0xbea4, 0x2860, 0x0000, 0x0000, 0x0000, 0xee06, 0x80ee, 0x2843, 0x0000,
-    0x0000, 0x0000, 0xfc00, 0xf327, 0x2820, 0x0000, 0x0000, 0x0000, 0xea40, 0xa871,
-    0x2800, 0x0000, 0x0000, 0x0000, 0x63d8, 0x9c26, 0x27e4, 0x0000, 0x0000, 0x0000,
-    0x07ba, 0xc0c9, 0x27c7, 0x0000, 0x0000, 0x0000, 0x3fa2, 0x9797, 0x27a8, 0x0000,
-    0x0000, 0x0000, 0x21c6, 0xfeca, 0x2789, 0x0000, 0x0000, 0x0000, 0xde40, 0x860d,
-    0x2768, 0x0000, 0x0000, 0x0000, 0x9cc8, 0x98ce, 0x2749, 0x0000, 0x0000, 0x0000,
-    0x3778, 0xa31c, 0x272a, 0x0000, 0x0000, 0x0000, 0xe778, 0xf6e2, 0x270b, 0x0000,
-    0x0000, 0x0000, 0x59b8, 0xf841, 0x26ed, 0x0000, 0x0000, 0x0000, 0x02e0, 0xad04,
-    0x26cd, 0x0000, 0x0000, 0x0000, 0x5a92, 0x9380, 0x26b0, 0x0000, 0x0000, 0x0000,
-    0xc740, 0x8886, 0x268d, 0x0000, 0x0000, 0x0000, 0x0680, 0xfaf8, 0x266c, 0x0000,
-    0x0000, 0x0000, 0xfb60, 0x897f, 0x2653, 0x0000, 0x0000, 0x0000, 0x8760, 0xf903,
-    0x2634, 0x0000, 0x0000, 0x0000, 0xad2a, 0xc2c8, 0x2615, 0x0000, 0x0000, 0x0000,
-    0x2d86, 0x8aef, 0x25f6, 0x0000, 0x0000, 0x0000, 0x1ef4, 0xe627, 0x25d6, 0x0000,
-    0x0000, 0x0000, 0x09e4, 0x8020, 0x25b7, 0x0000, 0x0000, 0x0000, 0x7548, 0xd227,
-    0x2598, 0x0000, 0x0000, 0x0000, 0x75dc, 0xfb5b, 0x2579, 0x0000, 0x0000, 0x0000,
-    0xea84, 0xc8b6, 0x255a, 0x0000, 0x0000, 0x0000, 0xe4d0, 0x8145, 0x253b, 0x0000,
-    0x0000, 0x0000, 0x3640, 0x9768, 0x251c, 0x0000, 0x0000, 0x0000, 0x246a, 0xccec,
-    0x24fe, 0x0000, 0x0000, 0x0000, 0x51d0, 0xa075, 0x24dd, 0x0000, 0x0000, 0x0000,
-    0x4638, 0xa385, 0x24bf, 0x0000, 0x0000, 0x0000, 0xd788, 0xd776, 0x24a1, 0x0000,
-    0x0000, 0x0000, 0x1370, 0x8997, 0x2482, 0x0000, 0x0000, 0x0000, 0x1e88, 0x9b67,
-    0x2462, 0x0000, 0x0000, 0x0000, 0x6c08, 0xd975, 0x2444, 0x0000, 0x0000, 0x0000,
-    0xfdb0, 0xcfc0, 0x2422, 0x0000, 0x0000, 0x0000, 0x3100, 0xc026, 0x2406, 0x0000,
-    0x0000, 0x0000, 0xc5b4, 0xae64, 0x23e6, 0x0000, 0x0000, 0x0000, 0x2280, 0xf687,
-    0x23c3, 0x0000, 0x0000, 0x0000, 0x2de0, 0x9006, 0x23a9, 0x0000, 0x0000, 0x0000,
-    0x24bc, 0xf631, 0x238a, 0x0000, 0x0000, 0x0000, 0xb8d4, 0xa975, 0x236b, 0x0000,
-    0x0000, 0x0000, 0xd9a4, 0xb949, 0x234b, 0x0000, 0x0000, 0x0000, 0xb54e, 0xbd39,
-    0x232d, 0x0000, 0x0000, 0x0000, 0x4aac, 0x9a52, 0x230e, 0x0000, 0x0000, 0x0000,
-    0xbbbc, 0xd085, 0x22ef, 0x0000, 0x0000, 0x0000, 0xdf18, 0xc633, 0x22cf, 0x0000,
-    0x0000, 0x0000, 0x16d0, 0xeca5, 0x22af, 0x0000, 0x0000, 0x0000, 0xf2a0, 0xdf6f,
-    0x228e, 0x0000, 0x0000, 0x0000, 0x8c44, 0xe86b, 0x2272, 0x0000, 0x0000, 0x0000,
-    0x35c0, 0xbbf4, 0x2253, 0x0000, 0x0000, 0x0000, 0x0c40, 0xdafb, 0x2230, 0x0000,
-    0x0000, 0x0000, 0x92dc, 0x9935, 0x2216, 0x0000, 0x0000, 0x0000, 0x0ca0, 0xbda6,
-    0x21f3, 0x0000, 0x0000, 0x0000, 0x5958, 0xa6fd, 0x21d6, 0x0000, 0x0000, 0x0000,
-    0xa3dc, 0x9d7f, 0x21b9, 0x0000, 0x0000, 0x0000, 0x79dc, 0xfcb5, 0x2199, 0x0000,
-    0x0000, 0x0000, 0xf264, 0xcebb, 0x217b, 0x0000, 0x0000, 0x0000, 0x0abe, 0x8308,
-    0x215c, 0x0000, 0x0000, 0x0000, 0x30ae, 0xb463, 0x213d, 0x0000, 0x0000, 0x0000,
-    0x6228, 0xb040, 0x211c, 0x0000, 0x0000, 0x0000, 0xc9b2, 0xf43b, 0x20ff, 0x0000,
-    0x0000, 0x0000, 0x3d8e, 0xa4b3, 0x20e0, 0x0000, 0x0000, 0x0000, 0x84e6, 0x8dab,
-    0x20c1, 0x0000, 0x0000, 0x0000, 0xa124, 0x9b74, 0x20a1, 0x0000, 0x0000, 0x0000,
-    0xc276, 0xd497, 0x2083, 0x0000, 0x0000, 0x0000, 0x6354, 0xa466, 0x2063, 0x0000,
-    0x0000, 0x0000, 0x8654, 0xaf0a, 0x2044, 0x0000, 0x0000, 0x0000, 0x1d20, 0xfa5c,
-    0x2024, 0x0000, 0x0000, 0x0000, 0xbcd0, 0xf3f0, 0x2004, 0x0000, 0x0000, 0x0000,
-    0xedf0, 0xf0b6, 0x1fe7, 0x0000, 0x0000, 0x0000, 0x45bc, 0x9182, 0x1fc9, 0x0000,
-    0x0000, 0x0000, 0xe254, 0xdc85, 0x1faa, 0x0000, 0x0000, 0x0000, 0xb898, 0xe9b1,
-    0x1f8a, 0x0000, 0x0000, 0x0000, 0x0ebe, 0xe6f0, 0x1f6c, 0x0000, 0x0000, 0x0000,
-    0xa9b8, 0xf584, 0x1f4c, 0x0000, 0x0000, 0x0000, 0x12e8, 0xdf6b, 0x1f2e, 0x0000,
-    0x0000, 0x0000, 0x9f9e, 0xcd55, 0x1f0f, 0x0000, 0x0000, 0x0000, 0x05a0, 0xec3a,
-    0x1eef, 0x0000, 0x0000, 0x0000, 0xd8e0, 0x96f8, 0x1ed1, 0x0000, 0x0000, 0x0000,
-    0x3bd4, 0xccc6, 0x1eb1, 0x0000, 0x0000, 0x0000, 0x4910, 0xb87b, 0x1e93, 0x0000,
-    0x0000, 0x0000, 0xbefc, 0xd40b, 0x1e73, 0x0000, 0x0000, 0x0000, 0x317e, 0xa406,
-    0x1e55, 0x0000, 0x0000, 0x0000, 0x6bb2, 0xc2b2, 0x1e36, 0x0000, 0x0000, 0x0000,
-    0xb87e, 0xbb78, 0x1e17, 0x0000, 0x0000, 0x0000, 0xa03c, 0xdbbd, 0x1df7, 0x0000,
-    0x0000, 0x0000, 0x5b6c, 0xe3c8, 0x1dd9, 0x0000, 0x0000, 0x0000, 0x8968, 0xca8e,
-    0x1dba, 0x0000, 0x0000, 0x0000, 0xc024, 0xe6ab, 0x1d9a, 0x0000, 0x0000, 0x0000,
-    0x4110, 0xd4eb, 0x1d7a, 0x0000, 0x0000, 0x0000, 0xa168, 0xbdb5, 0x1d5d, 0x0000,
-    0x0000, 0x0000, 0x012e, 0xa5fa, 0x1d3e, 0x0000, 0x0000, 0x0000, 0x6838, 0x9c1f,
-    0x1d1e, 0x0000, 0x0000, 0x0000, 0xa158, 0xaa76, 0x1d00, 0x0000, 0x0000, 0x0000,
-    0x090a, 0xbd95, 0x1ce1, 0x0000, 0x0000, 0x0000, 0xf73e, 0x8b6d, 0x1cc2, 0x0000,
-    0x0000, 0x0000, 0x5fda, 0xbcbf, 0x1ca3, 0x0000, 0x0000, 0x0000, 0xdbe8, 0xb89f,
-    0x1c84, 0x0000, 0x0000, 0x0000, 0x6e4c, 0x96c7, 0x1c64, 0x0000, 0x0000, 0x0000,
-    0x19c2, 0xf2a4, 0x1c46, 0x0000, 0x0000, 0x0000, 0xb800, 0xf855, 0x1c1e, 0x0000,
-    0x0000, 0x0000, 0x87fc, 0x85ff, 0x1c08, 0x0000, 0x0000, 0x0000, 0x1418, 0x839f,
-    0x1be9, 0x0000, 0x0000, 0x0000, 0x6186, 0xd9d8, 0x1bca, 0x0000, 0x0000, 0x0000,
-    0xf500, 0xabaa, 0x1ba6, 0x0000, 0x0000, 0x0000, 0x7b36, 0xdafe, 0x1b8c, 0x0000,
-    0x0000, 0x0000, 0xf394, 0xe6d8, 0x1b6c, 0x0000, 0x0000, 0x0000, 0x6efc, 0x9e55,
-    0x1b4e, 0x0000, 0x0000, 0x0000, 0x5e10, 0xc523, 0x1b2e, 0x0000, 0x0000, 0x0000,
-    0x8210, 0xb6f9, 0x1b0d, 0x0000, 0x0000, 0x0000, 0x9ab0, 0x96e3, 0x1af1, 0x0000,
-    0x0000, 0x0000, 0x3864, 0x92e7, 0x1ad1, 0x0000, 0x0000, 0x0000, 0x9878, 0xdc65,
-    0x1ab1, 0x0000, 0x0000, 0x0000, 0xfa20, 0xd6cb, 0x1a94, 0x0000, 0x0000, 0x0000,
-    0x6c00, 0xa4e4, 0x1a70, 0x0000, 0x0000, 0x0000, 0xab40, 0xb41b, 0x1a53, 0x0000,
-    0x0000, 0x0000, 0x43a4, 0x8ede, 0x1a37, 0x0000, 0x0000, 0x0000, 0x22e0, 0x9314,
-    0x1a15, 0x0000, 0x0000, 0x0000, 0x6170, 0xb949, 0x19f8, 0x0000, 0x0000, 0x0000,
-    0x6b00, 0xe056, 0x19d8, 0x0000, 0x0000, 0x0000, 0x9ba8, 0xa94c, 0x19b9, 0x0000,
-    0x0000, 0x0000, 0xfaa0, 0xaa16, 0x199b, 0x0000, 0x0000, 0x0000, 0x899a, 0xf627,
-    0x197d, 0x0000, 0x0000, 0x0000, 0x9f20, 0xfb70, 0x195d, 0x0000, 0x0000, 0x0000,
-    0xa4b8, 0xc176, 0x193e, 0x0000, 0x0000, 0x0000, 0xb21c, 0x85c3, 0x1920, 0x0000,
-    0x0000, 0x0000, 0x50d2, 0x9b19, 0x1901, 0x0000, 0x0000, 0x0000, 0xd4b0, 0xb708,
-    0x18e0, 0x0000, 0x0000, 0x0000, 0xfb88, 0xf510, 0x18c1, 0x0000, 0x0000, 0x0000,
-    0x31ec, 0xdc8d, 0x18a3, 0x0000, 0x0000, 0x0000, 0x3c00, 0xbff9, 0x1885, 0x0000,
-    0x0000, 0x0000, 0x5020, 0xc30b, 0x1862, 0x0000, 0x0000, 0x0000, 0xd4f0, 0xda0c,
-    0x1844, 0x0000, 0x0000, 0x0000, 0x20d2, 0x99a5, 0x1828, 0x0000, 0x0000, 0x0000,
-    0x852e, 0xd159, 0x1809, 0x0000, 0x0000, 0x0000, 0x7cd8, 0x97a1, 0x17e9, 0x0000,
-    0x0000, 0x0000, 0x423a, 0x997b, 0x17cb, 0x0000, 0x0000, 0x0000, 0xc1c0, 0xbe7d,
-    0x17a8, 0x0000, 0x0000, 0x0000, 0xe8bc, 0xdcdd, 0x178d, 0x0000, 0x0000, 0x0000,
-    0x8b28, 0xae06, 0x176e, 0x0000, 0x0000, 0x0000, 0x102e, 0xb8d4, 0x174f, 0x0000,
-    0x0000, 0x0000, 0xaa00, 0xaa5c, 0x172f, 0x0000, 0x0000, 0x0000, 0x51f0, 0x9fc0,
-    0x170e, 0x0000, 0x0000, 0x0000, 0xf858, 0xe181, 0x16f2, 0x0000, 0x0000, 0x0000,
-    0x91a8, 0x8162, 0x16d3, 0x0000, 0x0000, 0x0000, 0x5f40, 0xcb6f, 0x16b1, 0x0000,
-    0x0000, 0x0000, 0xbb50, 0xe55f, 0x1693, 0x0000, 0x0000, 0x0000, 0xacd2, 0xd895,
-    0x1676, 0x0000, 0x0000, 0x0000, 0xef30, 0x97bf, 0x1654, 0x0000, 0x0000, 0x0000,
-    0xf700, 0xb3d7, 0x1633, 0x0000, 0x0000, 0x0000, 0x3454, 0xa7b5, 0x1619, 0x0000,
-    0x0000, 0x0000, 0x6b00, 0xa929, 0x15f6, 0x0000, 0x0000, 0x0000, 0x9f04, 0x89f7,
-    0x15db, 0x0000, 0x0000, 0x0000, 0xad78, 0xd985, 0x15bc, 0x0000, 0x0000, 0x0000,
-    0xa46a, 0xae3f, 0x159d, 0x0000, 0x0000, 0x0000, 0x63a0, 0xd0da, 0x157c, 0x0000,
-    0x0000, 0x0000, 0x5e90, 0x817d, 0x155e, 0x0000, 0x0000, 0x0000, 0x1494, 0xb13f,
-    0x1540, 0x0000, 0x0000, 0x0000, 0x0090, 0x9c40, 0x1521, 0x0000, 0x0000, 0x0000,
-    0xdd70, 0xcc86, 0x1500, 0x0000, 0x0000, 0x0000, 0x64f8, 0xdb6f, 0x14e1, 0x0000,
-    0x0000, 0x0000, 0xe22c, 0xac17, 0x14c3, 0x0000, 0x0000, 0x0000, 0x60e0, 0xa9ad,
-    0x14a3, 0x0000, 0x0000, 0x0000, 0x4640, 0xd658, 0x1481, 0x0000, 0x0000, 0x0000,
-    0x6490, 0xa181, 0x1467, 0x0000, 0x0000, 0x0000, 0x1df4, 0xaaa2, 0x1447, 0x0000,
-    0x0000, 0x0000, 0xb94a, 0x8f61, 0x1429, 0x0000, 0x0000, 0x0000, 0x5198, 0x9d83,
-    0x1409, 0x0000, 0x0000, 0x0000, 0x0f7a, 0xa818, 0x13eb, 0x0000, 0x0000, 0x0000,
-    0xc45e, 0xc06c, 0x13cc, 0x0000, 0x0000, 0x0000, 0x4ec0, 0xfa29, 0x13a8, 0x0000,
-    0x0000, 0x0000, 0x6418, 0x8cad, 0x138c, 0x0000, 0x0000, 0x0000, 0xbcc8, 0xe7d1,
-    0x136f, 0x0000, 0x0000, 0x0000, 0xc934, 0xf9b0, 0x134f, 0x0000, 0x0000, 0x0000,
-    0x6ce0, 0x98df, 0x1331, 0x0000, 0x0000, 0x0000, 0x3516, 0xe5e9, 0x1312, 0x0000,
-    0x0000, 0x0000, 0xc6c0, 0xef8b, 0x12ef, 0x0000, 0x0000, 0x0000, 0xaf02, 0x913d,
-    0x12d4, 0x0000, 0x0000, 0x0000, 0xd230, 0xe1d5, 0x12b5, 0x0000, 0x0000, 0x0000,
-    0xfba8, 0xc232, 0x1295, 0x0000, 0x0000, 0x0000, 0x7ba4, 0xabeb, 0x1277, 0x0000,
-    0x0000, 0x0000, 0x6e5c, 0xc692, 0x1258, 0x0000, 0x0000, 0x0000, 0x76a2, 0x9756,
-    0x1239, 0x0000, 0x0000, 0x0000, 0xe180, 0xe423, 0x1214, 0x0000, 0x0000, 0x0000,
-    0x8c3c, 0x90f8, 0x11fb, 0x0000, 0x0000, 0x0000, 0x9f3c, 0x9fd2, 0x11dc, 0x0000,
-    0x0000, 0x0000, 0x53e0, 0xb73e, 0x11bd, 0x0000, 0x0000, 0x0000, 0x45be, 0x88d6,
-    0x119e, 0x0000, 0x0000, 0x0000, 0x111a, 0x8bc0, 0x117f, 0x0000, 0x0000, 0x0000,
-    0xe26a, 0xd7ff, 0x1160, 0x0000, 0x0000, 0x0000, 0xfb60, 0xdd8d, 0x113f, 0x0000,
-    0x0000, 0x0000, 0x9370, 0xc108, 0x1120, 0x0000, 0x0000, 0x0000, 0x9654, 0x8baf,
-    0x1103, 0x0000, 0x0000, 0x0000, 0xd6ec, 0xd6b9, 0x10e4, 0x0000, 0x0000, 0x0000,
-    0x23e4, 0xd7b7, 0x10c4, 0x0000, 0x0000, 0x0000, 0x1aa6, 0xa847, 0x10a6, 0x0000,
-    0x0000, 0x0000, 0xbee6, 0x9fef, 0x1087, 0x0000, 0x0000, 0x0000, 0x26d0, 0xa6eb,
-    0x1066, 0x0000, 0x0000, 0x0000, 0x5b86, 0xa880, 0x1049, 0x0000, 0x0000, 0x0000,
-    0x125c, 0xd971, 0x1029, 0x0000, 0x0000, 0x0000, 0x1f78, 0x9d18, 0x100a, 0x0000,
-    0x0000, 0x0000, 0x0e84, 0xb15b, 0x0feb, 0x0000, 0x0000, 0x0000, 0xd0c0, 0xc150,
-    0x0fcc, 0x0000, 0x0000, 0x0000, 0xa330, 0xc40c, 0x0fad, 0x0000, 0x0000, 0x0000,
-    0x5202, 0xfc2c, 0x0f8f, 0x0000, 0x0000, 0x0000, 0x3f7c, 0xecf5, 0x0f6f, 0x0000,
-    0x0000, 0x0000, 0xef44, 0xfdfd, 0x0f50, 0x0000, 0x0000, 0x0000, 0x3f6c, 0xab1b,
-    0x0f31, 0x0000, 0x0000, 0x0000, 0xf658, 0x89ec, 0x0f11, 0x0000, 0x0000, 0x0000,
-    0xbfc8, 0x9ba8, 0x0ef4, 0x0000, 0x0000, 0x0000, 0x3d40, 0xbe21, 0x0ed5, 0x0000,
-    0x0000, 0x0000, 0xbbc4, 0xc70d, 0x0eb6, 0x0000, 0x0000, 0x0000, 0x5158, 0xdb16,
-    0x0e96, 0x0000, 0x0000, 0x0000, 0xb5a8, 0xa8d8, 0x0e78, 0x0000, 0x0000, 0x0000,
-    0xcccc, 0xb40e, 0x0e58, 0x0000, 0x0000, 0x0000, 0x448c, 0xcb62, 0x0e3a, 0x0000,
-    0x0000, 0x0000, 0xf12a, 0x8aed, 0x0e1b, 0x0000, 0x0000, 0x0000, 0x79d0, 0xc59c,
-    0x0dfb, 0x0000, 0x0000, 0x0000, 0x06b4, 0xcdc9, 0x0ddd, 0x0000, 0x0000, 0x0000,
-    0xae70, 0xa979, 0x0dbe, 0x0000, 0x0000, 0x0000, 0x317c, 0xa8fb, 0x0d9e, 0x0000,
-    0x0000, 0x0000, 0x5fe0, 0x8a50, 0x0d7d, 0x0000, 0x0000, 0x0000, 0x70b6, 0xfdfa,
-    0x0d61, 0x0000, 0x0000, 0x0000, 0x1640, 0x9dc7, 0x0d41, 0x0000, 0x0000, 0x0000,
-    0x9a9c, 0xdc50, 0x0d23, 0x0000, 0x0000, 0x0000, 0x4fcc, 0x9a9b, 0x0d04, 0x0000,
-    0x0000, 0x0000, 0x7e48, 0x8f77, 0x0ce5, 0x0000, 0x0000, 0x0000, 0x84e4, 0xd4b9,
-    0x0cc6, 0x0000, 0x0000, 0x0000, 0x84e0, 0xbd10, 0x0ca6, 0x0000, 0x0000, 0x0000,
-    0x1b0a, 0xc8d9, 0x0c88, 0x0000, 0x0000, 0x0000, 0x6a48, 0xfc81, 0x0c68, 0x0000,
-    0x0000, 0x0000, 0x070a, 0xbef6, 0x0c4a, 0x0000, 0x0000, 0x0000, 0x8a70, 0xf096,
-    0x0c2b, 0x0000, 0x0000, 0x0000, 0xecc2, 0xc994, 0x0c0c, 0x0000, 0x0000, 0x0000,
-    0x1540, 0x9537, 0x0bea, 0x0000, 0x0000, 0x0000, 0x1b02, 0xab5b, 0x0bce, 0x0000,
-    0x0000, 0x0000, 0x5dc0, 0xb0c8, 0x0bad, 0x0000, 0x0000, 0x0000, 0xc928, 0xe034,
-    0x0b8f, 0x0000, 0x0000, 0x0000, 0x2d12, 0xb4b0, 0x0b71, 0x0000, 0x0000, 0x0000,
-    0x8fc2, 0xbb94, 0x0b52, 0x0000, 0x0000, 0x0000, 0xe236, 0xe22f, 0x0b33, 0x0000,
-    0x0000, 0x0000, 0xb97c, 0xbe9e, 0x0b13, 0x0000, 0x0000, 0x0000, 0xe1a6, 0xe16d,
-    0x0af5, 0x0000, 0x0000, 0x0000, 0xd330, 0xbaf0, 0x0ad6, 0x0000, 0x0000, 0x0000,
-    0xc0bc, 0xbbd0, 0x0ab7, 0x0000, 0x0000, 0x0000, 0x8e66, 0xdd9b, 0x0a98, 0x0000,
-    0x0000, 0x0000, 0xc95c, 0xf799, 0x0a79, 0x0000, 0x0000, 0x0000, 0xdac0, 0xbe4c,
-    0x0a55, 0x0000, 0x0000, 0x0000, 0xafc0, 0xc378, 0x0a37, 0x0000, 0x0000, 0x0000,
-    0xa880, 0xe341, 0x0a19, 0x0000, 0x0000, 0x0000, 0xc242, 0x81f6, 0x09fd, 0x0000,
-    0x0000, 0x0000, 0x7470, 0xc777, 0x09de, 0x0000, 0x0000, 0x0000, 0x62bc, 0xb684,
-    0x09be, 0x0000, 0x0000, 0x0000, 0x43ac, 0x8c58, 0x099f, 0x0000, 0x0000, 0x0000,
-    0xcc3c, 0xf9ac, 0x0981, 0x0000, 0x0000, 0x0000, 0x1526, 0xb670, 0x0962, 0x0000,
-    0x0000, 0x0000, 0xc9fe, 0xdf50, 0x0943, 0x0000, 0x0000, 0x0000, 0x6ae6, 0xc065,
-    0x0924, 0x0000, 0x0000, 0x0000, 0xb114, 0xcf29, 0x0905, 0x0000, 0x0000, 0x0000,
-    0xd388, 0x922a, 0x08e4, 0x0000, 0x0000, 0x0000, 0xcf54, 0xb926, 0x08c7, 0x0000,
-    0x0000, 0x0000, 0x3826, 0xe855, 0x08a8, 0x0000, 0x0000, 0x0000, 0xe7c8, 0x829b,
-    0x0888, 0x0000, 0x0000, 0x0000, 0x546c, 0xa903, 0x086a, 0x0000, 0x0000, 0x0000,
-    0x8768, 0x99cc, 0x0849, 0x0000, 0x0000, 0x0000, 0x00ac, 0xf529, 0x082b, 0x0000,
-    0x0000, 0x0000, 0x2658, 0x9f0b, 0x080c, 0x0000, 0x0000, 0x0000, 0xfe5c, 0x9e21,
-    0x07ee, 0x0000, 0x0000, 0x0000, 0x6da2, 0x9910, 0x07cf, 0x0000, 0x0000, 0x0000,
-    0x9220, 0xf9b3, 0x07b0, 0x0000, 0x0000, 0x0000, 0x3d90, 0xa541, 0x0791, 0x0000,
-    0x0000, 0x0000, 0x6e4c, 0xe7cc, 0x0771, 0x0000, 0x0000, 0x0000, 0xa8fa, 0xe80a,
-    0x0753, 0x0000, 0x0000, 0x0000, 0x4e14, 0xc3a7, 0x0734, 0x0000, 0x0000, 0x0000,
-    0xf7e0, 0xbad9, 0x0712, 0x0000, 0x0000, 0x0000, 0xfea0, 0xeff2, 0x06f5, 0x0000,
-    0x0000, 0x0000, 0xcef6, 0xbd48, 0x06d7, 0x0000, 0x0000, 0x0000, 0x7544, 0xf559,
-    0x06b7, 0x0000, 0x0000, 0x0000, 0x2388, 0xf655, 0x0698, 0x0000, 0x0000, 0x0000,
-    0xe900, 0xad56, 0x0676, 0x0000, 0x0000, 0x0000, 0x2cc0, 0x8437, 0x0659, 0x0000,
-    0x0000, 0x0000, 0x3068, 0xc544, 0x063b, 0x0000, 0x0000, 0x0000, 0xdc70, 0xe73c,
-    0x061b, 0x0000, 0x0000, 0x0000, 0xee50, 0x9d49, 0x05fc, 0x0000, 0x0000, 0x0000,
-    0x93d2, 0x81f6, 0x05df, 0x0000, 0x0000, 0x0000, 0x941c, 0xadff, 0x05bf, 0x0000,
-    0x0000, 0x0000, 0x2ce2, 0x8e45, 0x05a1, 0x0000, 0x0000, 0x0000, 0x4a60, 0x95fd,
-    0x0581, 0x0000, 0x0000, 0x0000, 0x79f8, 0xb83a, 0x0563, 0x0000, 0x0000, 0x0000,
-    0xcb58, 0xa1f5, 0x0543, 0x0000, 0x0000, 0x0000, 0x2a3a, 0xdc36, 0x0525, 0x0000,
-    0x0000, 0x0000, 0x14ee, 0x890e, 0x0506, 0x0000, 0x0000, 0x0000, 0x8f20, 0xc432,
-    0x04e3, 0x0000, 0x0000, 0x0000, 0x8440, 0xb21d, 0x04c6, 0x0000, 0x0000, 0x0000,
-    0x5430, 0xf698, 0x04a7, 0x0000, 0x0000, 0x0000, 0x04ae, 0x8b20, 0x048a, 0x0000,
-    0x0000, 0x0000, 0x04d0, 0xe872, 0x046b, 0x0000, 0x0000, 0x0000, 0xc78e, 0x8893,
-    0x044c, 0x0000, 0x0000, 0x0000, 0x0f78, 0x9895, 0x042b, 0x0000, 0x0000, 0x0000,
-    0x11d4, 0xdf2e, 0x040d, 0x0000, 0x0000, 0x0000, 0xe84c, 0x89d5, 0x03ef, 0x0000,
-    0x0000, 0x0000, 0xf7be, 0x8a67, 0x03d0, 0x0000, 0x0000, 0x0000, 0x95d0, 0xc906,
-    0x03b1, 0x0000, 0x0000, 0x0000, 0x64ce, 0xd96c, 0x0392, 0x0000, 0x0000, 0x0000,
-    0x97ba, 0xa16f, 0x0373, 0x0000, 0x0000, 0x0000, 0x463c, 0xc51a, 0x0354, 0x0000,
-    0x0000, 0x0000, 0xef0a, 0xe93e, 0x0335, 0x0000, 0x0000, 0x0000, 0x526a, 0xa466,
-    0x0316, 0x0000, 0x0000, 0x0000, 0x4140, 0xa94d, 0x02f5, 0x0000, 0x0000, 0x0000,
-    0xb4ec, 0xce68, 0x02d8, 0x0000, 0x0000, 0x0000, 0x4fa2, 0x8490, 0x02b9, 0x0000,
-    0x0000, 0x0000, 0x4e60, 0xca98, 0x0298, 0x0000, 0x0000, 0x0000, 0x08dc, 0xe09c,
-    0x027a, 0x0000, 0x0000, 0x0000, 0x2b90, 0xc7e3, 0x025c, 0x0000, 0x0000, 0x0000,
-    0x5a7c, 0xf8ef, 0x023c, 0x0000, 0x0000, 0x0000, 0x5022, 0x9d58, 0x021e, 0x0000,
-    0x0000, 0x0000, 0x553a, 0xe242, 0x01ff, 0x0000, 0x0000, 0x0000, 0x7e6e, 0xb54d,
-    0x01e0, 0x0000, 0x0000, 0x0000, 0xd2d4, 0xa88c, 0x01c1, 0x0000, 0x0000, 0x0000,
-    0x75b6, 0xfe6d, 0x01a2, 0x0000, 0x0000, 0x0000, 0x3bb2, 0xf04c, 0x0183, 0x0000,
-    0x0000, 0x0000, 0xc2d0, 0xc046, 0x0163, 0x0000, 0x0000, 0x0000, 0x250c, 0xf9d6,
-    0x0145, 0x0000, 0x0000, 0x0000, 0xb7b4, 0x8a0d, 0x0126, 0x0000, 0x0000, 0x0000,
-    0x1a72, 0xe4f5, 0x0107, 0x0000, 0x0000, 0x0000, 0x825c, 0xa9b8, 0x00e8, 0x0000,
-    0x0000, 0x0000, 0x6c90, 0xc9ad, 0x00c6, 0x0000, 0x0000, 0x0000, 0x4d00, 0xd1bb,
-    0x00aa, 0x0000, 0x0000, 0x0000, 0xa4a0, 0xee01, 0x0087, 0x0000, 0x0000, 0x0000,
-    0x89a8, 0xbe9f, 0x006b, 0x0000, 0x0000, 0x0000, 0x038e, 0xc80c, 0x004d, 0x0000,
-    0x0000, 0x0000, 0xfe26, 0x8384, 0x002e, 0x0000, 0x0000, 0x0000, 0xcd90, 0xca57,
-    0x000e, 0x0000
-};
-
-void MacroAssembler::libm_reduce_pi04l(Register eax, Register ecx, Register edx, Register ebx, Register esi, Register edi, Register ebp, Register esp) {
-  Label B1_1, B1_2, B1_3, B1_4, B1_5, B1_6, B1_7, B1_8, B1_9, B1_10, B1_11, B1_12;
-  Label B1_13, B1_14, B1_15;
-
-  assert_different_registers(ebx, eax, ecx, edx, esi, edi, ebp, esp);
-
-  address zero_none  = (address)_zero_none;
-  address _4onpi_d   = (address)__4onpi_d;
-  address TWO_32H    = (address)_TWO_32H;
-  address pi04_3d    = (address)_pi04_3d;
-  address pi04_5d    = (address)_pi04_5d;
-  address SCALE      = (address)_SCALE;
-  address zeros      = (address)_zeros;
-  address pi04_2d    = (address)_pi04_2d;
-  address TWO_12H    = (address)_TWO_12H;
-  address _4onpi_31l = (address)__4onpi_31l;
-
-  bind(B1_1);
-  push(ebp);
-  movl(ebp, esp);
-  andl(esp, -16);
-  push(esi);
-  push(edi);
-  push(ebx);
-  subl(esp, 20);
-  movzwl(ebx, Address(ebp, 16));
-  andl(ebx, 32767);
-  movl(eax, Address(ebp, 20));
-  cmpl(ebx, 16413);
-  movl(esi, Address(ebp, 24));
-  movl(Address(esp, 4), eax);
-  jcc(Assembler::greaterEqual, B1_8);
-
-  bind(B1_2);
-  fld_x(Address(ebp, 8));
-  fld_d(ExternalAddress(_4onpi_d));    //0x6dc9c883UL, 0x3ff45f30UL
-  fmul(1);
-  fstp_x(Address(esp, 8));
-  movzwl(ecx, Address(esp, 16));
-  negl(ecx);
-  addl(ecx, 30);
-  movl(eax, Address(esp, 12));
-  shrl(eax);
-  cmpl(Address(esp, 4), 0);
-  jcc(Assembler::notEqual, B1_4);
-
-  bind(B1_3);
-  lea(ecx, Address(eax, 1));
-  andl(ecx, -2);
-  jmp(B1_5);
-
-  bind(B1_4);
-  movl(ecx, eax);
-  addl(eax, Address(esp, 4));
-  movl(edx, eax);
-  andl(edx, 1);
-  addl(ecx, edx);
-
-  bind(B1_5);
-  fld_d(ExternalAddress(TWO_32H));    //0x00000000UL, 0x41f80000UL
-  cmpl(ebx, 16400);
-  movl(Address(esp, 0), ecx);
-  fild_s(Address(esp, 0));
-  jcc(Assembler::greaterEqual, B1_7);
-
-  bind(B1_6);
-  fld_d(ExternalAddress(pi04_3d));    //0x54442d00UL, 0x3fe921fbUL
-  fmul(1);
-  fsubp(3);
-  fxch(1);
-  fmul(2);
-  fld_s(2);
-  fadd(1);
-  fsubrp(1);
-  fld_s(0);
-  fxch(1);
-  fsuba(3);
-  fld_d(ExternalAddress(8 + pi04_3d));    //0x98cc5180UL, 0x3ce84698UL
-  fmul(3);
-  fsuba(2);
-  fxch(1);
-  fsub(2);
-  fsubrp(1);
-  faddp(3);
-  fld_d(ExternalAddress(16 + pi04_3d));    //0xcbb5bf6cUL, 0xb9dfc8f8UL
-  fmulp(2);
-  fld_s(1);
-  fsubr(1);
-  fsuba(1);
-  fxch(2);
-  fsubp(1);
-  faddp(2);
-  fxch(1);
-  jmp(B1_15);
-
-  bind(B1_7);
-  fld_d(ExternalAddress(pi04_5d));    //0x54400000UL, 0x3fe921fbUL
-  fmul(1);
-  fsubp(3);
-  fxch(1);
-  fmul(2);
-  fld_s(2);
-  fadd(1);
-  fsubrp(1);
-  fld_s(0);
-  fxch(1);
-  fsuba(3);
-  fld_d(ExternalAddress(8 + pi04_5d));    //0x1a600000UL, 0x3dc0b461UL
-  fmul(3);
-  fsuba(2);
-  fxch(1);
-  fsub(2);
-  fsubrp(1);
-  faddp(3);
-  fld_d(ExternalAddress(16 + pi04_5d));    //0x2e000000UL, 0x3b93198aUL
-  fmul(2);
-  fld_s(0);
-  fsubr(2);
-  fsuba(2);
-  fxch(1);
-  fsubp(2);
-  fxch(1);
-  faddp(3);
-  fld_d(ExternalAddress(24 + pi04_5d));    //0x25200000UL, 0x396b839aUL
-  fmul(2);
-  fld_s(0);
-  fsubr(2);
-  fsuba(2);
-  fxch(1);
-  fsubp(2);
-  fxch(1);
-  faddp(3);
-  fld_d(ExternalAddress(32 + pi04_5d));    //0x533e63a0UL, 0x37027044UL
-  fmulp(2);
-  fld_s(1);
-  fsubr(1);
-  fsuba(1);
-  fxch(2);
-  fsubp(1);
-  faddp(2);
-  fxch(1);
-  jmp(B1_15);
-
-  bind(B1_8);
-  fld_x(Address(ebp, 8));
-  addl(ebx, -16417);
-  fmul_d(as_Address(ExternalAddress(SCALE)));    //0x00000000UL, 0x32600000UL
-  movl(eax, -2078209981);
-  imull(ebx);
-  addl(edx, ebx);
-  movl(ecx, ebx);
-  sarl(edx, 4);
-  sarl(ecx, 31);
-  subl(edx, ecx);
-  movl(eax, edx);
-  shll(eax, 5);
-  fstp_x(Address(ebp, 8));
-  fld_x(Address(ebp, 8));
-  subl(eax, edx);
-  movl(Address(ebp, 8), 0);
-  subl(ebx, eax);
-  fld_x(Address(ebp, 8));
-  cmpl(ebx, 17);
-  fsuba(1);
-  jcc(Assembler::less, B1_10);
-
-  bind(B1_9);
-  lea(eax, Address(noreg, edx, Address::times_8));
-  lea(ecx, Address(eax, edx, Address::times_4));
-  incl(edx);
-  fld_x(Address(_4onpi_31l, RelocationHolder::none).plus_disp(ecx, Address::times_1));
-  fmul(2);
-  fld_x(Address(12 + _4onpi_31l, RelocationHolder::none).plus_disp(ecx, Address::times_1));
-  fmul(2);
-  fld_s(0);
-  fadd(2);
-  fsuba(2);
-  fxch(1);
-  faddp(2);
-  fld_s(1);
-  fadd(1);
-  fstp_x(Address(esp, 8));
-  andl(Address(esp, 8), -16777216);
-  fld_x(Address(esp, 8));
-  fsubp(1);
-  jmp(B1_11);
-
-  bind(B1_10);
-  fld_d(ExternalAddress(zeros));    //0x00000000UL, 0x00000000UL
-  fld_s(0);
-
-  bind(B1_11);
-  fld_s(0);
-  lea(eax, Address(noreg, edx, Address::times_8));
-  fld_s(3);
-  lea(edx, Address(eax, edx, Address::times_4));
-  fld_x(Address(_4onpi_31l, RelocationHolder::none).plus_disp(edx, Address::times_1));
-  fmul(6);
-  movl(Address(esp, 0), edx);
-  fadda(2);
-  fxch(2);
-  fsuba(3);
-  fxch(2);
-  faddp(3);
-  fxch(2);
-  faddp(3);
-  fld_x(Address(12 + _4onpi_31l, RelocationHolder::none).plus_disp(edx, Address::times_1));
-  fmula(2);
-  fld_s(2);
-  fadd(2);
-  fld_s(0);
-  fxch(1);
-  fsubra(3);
-  fxch(3);
-  fchs();
-  faddp(4);
-  fxch(3);
-  faddp(4);
-  fxch(2);
-  fadd(3);
-  fxch(2);
-  fmul(5);
-  fadda(2);
-  fld_s(4);
-  fld_x(Address(24 + _4onpi_31l, RelocationHolder::none).plus_disp(edx, Address::times_1));
-  fmula(1);
-  fxch(1);
-  fadda(4);
-  fxch(4);
-  fstp_x(Address(esp, 8));
-  movzwl(ebx, Address(esp, 16));
-  andl(ebx, 32767);
-  cmpl(ebx, 16415);
-  jcc(Assembler::greaterEqual, B1_13);
-
-  bind(B1_12);
-  negl(ebx);
-  addl(ebx, 30);
-  movl(ecx, ebx);
-  movl(eax, Address(esp, 12));
-  shrl(eax);
-  shll(eax);
-  movl(Address(esp, 12), eax);
-  movl(Address(esp, 8), 0);
-  shrl(eax);
-  jmp(B1_14);
-
-  bind(B1_13);
-  negl(ebx);
-  addl(ebx, 30);
-  movl(ecx, ebx);
-  movl(edx, Address(esp, 8));
-  shrl(edx);
-  shll(edx);
-  negl(ecx);
-  movl(eax, Address(esp, 12));
-  shll(eax);
-  movl(ecx, ebx);
-  movl(Address(esp, 8), edx);
-  shrl(edx);
-  orl(eax, edx);
-
-  bind(B1_14);
-  fld_x(Address(esp, 8));
-  addl(eax, Address(esp, 4));
-  fsubp(3);
-  fmul(6);
-  fld_s(4);
-  movl(edx, eax);
-  andl(edx, 1);
-  fadd(3);
-  movl(ecx, Address(esp, 0));
-  fsuba(3);
-  fxch(3);
-  faddp(5);
-  fld_s(1);
-  fxch(3);
-  fadd_d(Address(zero_none, RelocationHolder::none).plus_disp(edx, Address::times_8));
-  fadda(3);
-  fsub(3);
-  faddp(2);
-  fxch(1);
-  faddp(4);
-  fld_s(2);
-  fadd(2);
-  fsuba(2);
-  fxch(3);
-  faddp(2);
-  fxch(1);
-  faddp(3);
-  fld_s(0);
-  fadd(2);
-  fsuba(2);
-  fxch(1);
-  faddp(2);
-  fxch(1);
-  faddp(2);
-  fld_s(2);
-  fld_x(Address(36 + _4onpi_31l, RelocationHolder::none).plus_disp(ecx, Address::times_1));
-  fmula(1);
-  fld_s(1);
-  fadd(3);
-  fsuba(3);
-  fxch(2);
-  faddp(3);
-  fxch(2);
-  faddp(3);
-  fxch(1);
-  fmul(4);
-  fld_s(0);
-  fadd(2);
-  fsuba(2);
-  fxch(1);
-  faddp(2);
-  fxch(1);
-  faddp(2);
-  fld_s(2);
-  fld_x(Address(48 + _4onpi_31l, RelocationHolder::none).plus_disp(ecx, Address::times_1));
-  fmula(1);
-  fld_s(1);
-  fadd(3);
-  fsuba(3);
-  fxch(2);
-  faddp(3);
-  fxch(2);
-  faddp(3);
-  fld_s(3);
-  fxch(2);
-  fmul(5);
-  fld_x(Address(60 + _4onpi_31l, RelocationHolder::none).plus_disp(ecx, Address::times_1));
-  fmula(3);
-  fxch(3);
-  faddp(1);
-  fld_s(0);
-  fadd(2);
-  fsuba(2);
-  fxch(1);
-  faddp(2);
-  fxch(1);
-  faddp(3);
-  fld_s(3);
-  fxch(2);
-  fmul(5);
-  fld_x(Address(72 + _4onpi_31l, RelocationHolder::none).plus_disp(ecx, Address::times_1));
-  fmula(3);
-  fxch(3);
-  faddp(1);
-  fld_s(0);
-  fadd(2);
-  fsuba(2);
-  fxch(1);
-  faddp(2);
-  fxch(1);
-  faddp(3);
-  fxch(1);
-  fmulp(4);
-  fld_x(Address(84 + _4onpi_31l, RelocationHolder::none).plus_disp(ecx, Address::times_1));
-  fmulp(3);
-  fxch(2);
-  faddp(3);
-  fld_s(2);
-  fadd(2);
-  fld_d(ExternalAddress(TWO_32H));    //0x00000000UL, 0x41f80000UL
-  fmul(1);
-  fadda(1);
-  fsubp(1);
-  fsuba(2);
-  fxch(3);
-  faddp(2);
-  faddp(1);
-  fld_d(ExternalAddress(pi04_2d));    //0x54400000UL, 0x3fe921fbUL
-  fld_s(0);
-  fmul(2);
-  fxch(2);
-  fadd(3);
-  fxch(1);
-  fmulp(3);
-  fmul_d(as_Address(ExternalAddress(8 + pi04_2d)));    //0x1a626331UL, 0x3dc0b461UL
-  faddp(1);
-
-  bind(B1_15);
-  fld_d(ExternalAddress(TWO_12H));    //0x00000000UL, 0x40b80000UL
-  fld_s(2);
-  fadd(2);
-  fmula(1);
-  fstp_x(Address(esp, 8));
-  fld_x(Address(esp, 8));
-  fadd(1);
-  fsubrp(1);
-  fst_d(Address(esi, 0));
-  fsubp(2);
-  faddp(1);
-  fstp_d(Address(esi, 8));
-  addl(esp, 20);
-  pop(ebx);
-  pop(edi);
-  pop(esi);
-  movl(esp, ebp);
-  pop(ebp);
-  ret(0);
-}
-
-
-ATTRIBUTE_ALIGNED(16) static const jushort _SP[] =
-{
-    0xaaab, 0xaaaa, 0xaaaa, 0xaaaa, 0xbffc, 0x0000, 0x8887, 0x8888, 0x8888, 0x8888,
-    0x3ff8, 0x0000, 0xc527, 0x0d00, 0x00d0, 0xd00d, 0xbff2, 0x0000, 0x45f6, 0xb616,
-    0x1d2a, 0xb8ef, 0x3fec, 0x0000, 0x825b, 0x3997, 0x2b3f, 0xd732, 0xbfe5, 0x0000,
-    0xbf33, 0x8bb4, 0x2fda, 0xb092, 0x3fde, 0x0000, 0x44a6, 0xed1a, 0x29ef, 0xd73e,
-    0xbfd6, 0x0000, 0x8610, 0x307f, 0x62a1, 0xc921, 0x3fce, 0x0000
-};
-
-ATTRIBUTE_ALIGNED(16) static const jushort _CP[] =
-{
-    0x0000, 0x0000, 0x0000, 0x8000, 0xbffe, 0x0000, 0xaaa5, 0xaaaa, 0xaaaa, 0xaaaa,
-    0x3ffa, 0x0000, 0x9c2f, 0x0b60, 0x60b6, 0xb60b, 0xbff5, 0x0000, 0xf024, 0x0cac,
-    0x00d0, 0xd00d, 0x3fef, 0x0000, 0x03fe, 0x3f65, 0x7dbb, 0x93f2, 0xbfe9, 0x0000,
-    0xd84d, 0xadee, 0xc698, 0x8f76, 0x3fe2, 0x0000, 0xdaba, 0xfe79, 0xea36, 0xc9c9,
-    0xbfda, 0x0000, 0x3ac6, 0x0ba0, 0x07ce, 0xd585, 0x3fd2, 0x0000
-};
-
-void MacroAssembler::libm_sincos_huge(XMMRegister xmm0, XMMRegister xmm1, Register eax, Register ecx, Register edx, Register ebx, Register esi, Register edi, Register ebp, Register esp) {
-  Label B1_1, B1_2, B1_3, B1_4, B1_5, B1_6, B1_7, B1_8, B1_9, B1_10, B1_11, B1_12;
-  Label B1_13, B1_14, B1_15, B1_16, B1_17, B1_18, B1_19, B1_20, B1_21, B1_22, B1_23;
-  Label B1_24, B1_25, B1_26, B1_27, B1_28, B1_29, B1_30, B1_31, B1_32, B1_33, B1_34;
-  Label B1_35, B1_36, B1_37, B1_38, B1_39, B1_40, B1_41, B1_42, B1_43, B1_46;
-
-  assert_different_registers(ebx, eax, ecx, edx, esi, edi, ebp, esp);
-
-  address CP = (address)_CP;
-  address SP = (address)_SP;
-
-  bind(B1_1);
-  push(ebp);
-  movl(ebp, esp);
-  andl(esp, -64);
-  push(esi);
-  push(edi);
-  push(ebx);
-  subl(esp, 52);
-  movl(eax, Address(ebp, 16));
-  movl(edx, Address(ebp, 20));
-  movl(Address(esp, 32), eax);
-  movl(Address(esp, 36), edx);
-
-  bind(B1_2);
-  fnstcw(Address(esp, 30));
-
-  bind(B1_3);
-  movsd(xmm1, Address(ebp, 8));
-  movl(esi, Address(ebp, 12));
-  movl(eax, esi);
-  andl(eax, 2147483647);
-  andps(xmm1, ExternalAddress(L_2IL0FLOATPACKET_0));    //0xffffffffUL, 0x7fffffffUL, 0x00000000UL, 0x00000000UL
-  shrl(esi, 31);
-  movl(Address(esp, 40), eax);
-  cmpl(eax, 1104150528);
-  movsd(Address(ebp, 8), xmm1);
-  jcc(Assembler::aboveEqual, B1_11);
-
-  bind(B1_4);
-  movsd(xmm0, ExternalAddress(PI4_INV));    //0x6dc9c883UL, 0x3ff45f30UL
-  mulsd(xmm0, xmm1);
-  movzwl(edx, Address(esp, 30));
-  movl(eax, edx);
-  andl(eax, 768);
-  movsd(Address(esp, 0), xmm0);
-  cmpl(eax, 768);
-  jcc(Assembler::equal, B1_42);
-
-  bind(B1_5);
-  orl(edx, -64768);
-  movw(Address(esp, 28), edx);
-
-  bind(B1_6);
-  fldcw(Address(esp, 28));
-
-  bind(B1_7);
-  movsd(xmm1, Address(ebp, 8));
-  movl(ebx, 1);
-
-  bind(B1_8);
-  movl(Address(esp, 12), ebx);
-  movl(ebx, Address(esp, 4));
-  movl(eax, ebx);
-  movl(Address(esp, 8), esi);
-  movl(esi, ebx);
-  shrl(esi, 20);
-  andl(eax, 1048575);
-  movl(ecx, esi);
-  orl(eax, 1048576);
-  negl(ecx);
-  movl(edx, eax);
-  addl(ecx, 19);
-  addl(esi, 13);
-  movl(Address(esp, 24), ecx);
-  shrl(edx);
-  movl(ecx, esi);
-  shll(eax);
-  movl(ecx, Address(esp, 24));
-  movl(esi, Address(esp, 0));
-  shrl(esi);
-  orl(eax, esi);
-  cmpl(ebx, 1094713344);
-  movsd(Address(esp, 16), xmm1);
-  fld_d(Address(esp, 16));
-  cmov32(Assembler::below, eax, edx);
-  movl(esi, Address(esp, 8));
-  lea(edx, Address(eax, 1));
-  movl(ebx, edx);
-  andl(ebx, -2);
-  movl(Address(esp, 16), ebx);
-  fild_s(Address(esp, 16));
-  movl(ebx, Address(esp, 12));
-  cmpl(Address(esp, 40), 1094713344);
-  jcc(Assembler::aboveEqual, B1_10);
-
-  bind(B1_9);
-  fld_d(ExternalAddress(PI4X3));    //0x54443000UL, 0xbfe921fbUL
-  fmul(1);
-  faddp(2);
-  fld_d(ExternalAddress(PI4X3 + 8));    //0x3b39a000UL, 0x3d373dcbUL
-  fmul(1);
-  faddp(2);
-  fld_d(ExternalAddress(PI4X3 + 16));    //0xe0e68948UL, 0xba845c06UL
-  fmulp(1);
-  faddp(1);
-  jmp(B1_17);
-
-  bind(B1_10);
-  fld_d(ExternalAddress(PI4X4));    //0x54400000UL, 0xbfe921fbUL
-  fmul(1);
-  faddp(2);
-  fld_d(ExternalAddress(PI4X4 + 8));    //0x1a600000UL, 0xbdc0b461UL
-  fmul(1);
-  faddp(2);
-  fld_d(ExternalAddress(PI4X4 + 16));    //0x2e000000UL, 0xbb93198aUL
-  fmul(1);
-  faddp(2);
-  fld_d(ExternalAddress(PI4X4 + 24));    //0x252049c1UL, 0xb96b839aUL
-  fmulp(1);
-  faddp(1);
-  jmp(B1_17);
-
-  bind(B1_11);
-  movzwl(edx, Address(esp, 30));
-  movl(eax, edx);
-  andl(eax, 768);
-  cmpl(eax, 768);
-  jcc(Assembler::equal, B1_43);
-  bind(B1_12);
-  orl(edx, -64768);
-  movw(Address(esp, 28), edx);
-
-  bind(B1_13);
-  fldcw(Address(esp, 28));
-
-  bind(B1_14);
-  movsd(xmm1, Address(ebp, 8));
-  movl(ebx, 1);
-
-  bind(B1_15);
-  movsd(Address(esp, 16), xmm1);
-  fld_d(Address(esp, 16));
-  addl(esp, -32);
-  lea(eax, Address(esp, 32));
-  fstp_x(Address(esp, 0));
-  movl(Address(esp, 12), 0);
-  movl(Address(esp, 16), eax);
-  call(RuntimeAddress(CAST_FROM_FN_PTR(address, StubRoutines::dlibm_reduce_pi04l())));
-
-  bind(B1_46);
-  addl(esp, 32);
-
-  bind(B1_16);
-  fld_d(Address(esp, 0));
-  lea(edx, Address(eax, 1));
-  fld_d(Address(esp, 8));
-  faddp(1);
-
-  bind(B1_17);
-  movl(ecx, edx);
-  addl(eax, 3);
-  shrl(ecx, 2);
-  andl(ecx, 1);
-  shrl(eax, 2);
-  xorl(esi, ecx);
-  movl(ecx, Address(esp, 36));
-  andl(eax, 1);
-  andl(ecx, 3);
-  cmpl(ecx, 3);
-  jcc(Assembler::notEqual, B1_25);
-
-  bind(B1_18);
-  fld_x(ExternalAddress(84 + SP));    //0x8610, 0x307f, 0x62
-  fld_s(1);
-  fmul((2));
-  testb(edx, 2);
-  fmula((1));
-  fld_x(ExternalAddress(72 + SP));    //0x44a6, 0xed1a, 0x29
-  faddp(2);
-  fmula(1);
-  fld_x(ExternalAddress(60 + SP));    //0xbf33, 0x8bb4, 0x2f
-  faddp(2);
-  fmula(1);
-  fld_x(ExternalAddress(48 + SP));    //0x825b, 0x3997, 0x2b
-  faddp(2);
-  fmula(1);
-  fld_x(ExternalAddress(36 + SP));    //0x45f6, 0xb616, 0x1d
-  faddp(2);
-  fmula(1);
-  fld_x(ExternalAddress(24 + SP));    //0xc527, 0x0d00, 0x00
-  faddp(2);
-  fmula(1);
-  fld_x(ExternalAddress(12 + SP));    //0x8887, 0x8888, 0x88
-  faddp(2);
-  fmula(1);
-  fld_x(ExternalAddress(SP));    //0xaaab, 0xaaaa, 0xaa
-  faddp(2);
-  fmula(1);
-  fld_x(ExternalAddress(84 + CP));    //0x3ac6, 0x0ba0, 0x07
-  fmul(1);
-  fld_x(ExternalAddress(72 + CP));    //0xdaba, 0xfe79, 0xea
-  faddp(1);
-  fmul(1);
-  fld_x(ExternalAddress(62 + CP));    //0xd84d, 0xadee, 0xc6
-  faddp(1);
-  fmul(1);
-  fld_x(ExternalAddress(48 + CP));    //0x03fe, 0x3f65, 0x7d
-  faddp(1);
-  fmul(1);
-  fld_x(ExternalAddress(36 + CP));    //0xf024, 0x0cac, 0x00
-  faddp(1);
-  fmul(1);
-  fld_x(ExternalAddress(24 + CP));    //0x9c2f, 0x0b60, 0x60
-  faddp(1);
-  fmul(1);
-  fld_x(ExternalAddress(12 + CP));    //0xaaa5, 0xaaaa, 0xaa
-  faddp(1);
-  fmul(1);
-  fld_x(ExternalAddress(CP));    //0x0000, 0x0000, 0x00
-  faddp(1);
-  fmulp(1);
-  fld_d(Address(ONES, RelocationHolder::none).plus_disp(esi, Address::times_8));
-  fld_d(Address(ONES, RelocationHolder::none).plus_disp(eax, Address::times_8));
-  jcc(Assembler::equal, B1_22);
-
-  bind(B1_19);
-  fmulp(4);
-  testl(ebx, ebx);
-  fxch(2);
-  fmul(3);
-  movl(eax, Address(esp, 2));
-  faddp(3);
-  fxch(2);
-  fstp_d(Address(eax, 0));
-  fmula(1);
-  faddp(1);
-  fstp_d(Address(eax, 8));
-  jcc(Assembler::equal, B1_21);
-
-  bind(B1_20);
-  fldcw(Address(esp, 30));
-
-  bind(B1_21);
-  addl(esp, 52);
-  pop(ebx);
-  pop(edi);
-  pop(esi);
-  movl(esp, ebp);
-  pop(ebp);
-  ret(0);
-
-  bind(B1_22);
-  fxch(1);
-  fmulp(4);
-  testl(ebx, ebx);
-  fxch(2);
-  fmul(3);
-  movl(eax, Address(esp, 32));
-  faddp(3);
-  fxch(2);
-  fstp_d(Address(eax, 8));
-  fmula(1);
-  faddp(1);
-  fstp_d(Address(eax, 0));
-  jcc(Assembler::equal, B1_24);
-
-  bind(B1_23);
-  fldcw(Address(esp, 30));
-
-  bind(B1_24);
-  addl(esp, 52);
-  pop(ebx);
-  pop(edi);
-  pop(esi);
-  movl(esp, ebp);
-  pop(ebp);
-  ret(0);
-
-  bind(B1_25);
-  testb(Address(esp, 36), 2);
-  jcc(Assembler::equal, B1_33);
-
-  bind(B1_26);
-  fld_s(0);
-  testb(edx, 2);
-  fmul(1);
-  fld_s(0);
-  fmul(1);
-  jcc(Assembler::equal, B1_30);
-
-  bind(B1_27);
-  fstp_d(2);
-  fld_x(ExternalAddress(84 + CP));    //0x3ac6, 0x0ba0, 0x07
-  testl(ebx, ebx);
-  fmul(2);
-  fld_x(ExternalAddress(72 + CP));    //0xdaba, 0xfe79, 0xea
-  fmul(3);
-  fld_x(ExternalAddress(60 + CP));    //0xd84d, 0xadee, 0xc6
-  movl(eax, Address(rsp, 32));
-  faddp(2);
-  fxch(1);
-  fmul(3);
-  fld_x(ExternalAddress(48 + CP));    //0x03fe, 0x3f65, 0x7d
-  faddp(2);
-  fxch(1);
-  fmul(3);
-  fld_x(ExternalAddress(36 + CP));    //0xf024, 0x0cac, 0x00
-  faddp(2);
-  fxch(1);
-  fmul(3);
-  fld_x(ExternalAddress(24 + CP));    //0x9c2f, 0x0b60, 0x60
-  faddp(2);
-  fxch(1);
-  fmul(3);
-  fld_x(ExternalAddress(12 + CP));    //0xaaa5, 0xaaaa, 0xaa
-  faddp(2);
-  fxch(1);
-  fmulp(3);
-  fld_x(ExternalAddress(CP));    //0x0000, 0x0000, 0x00
-  faddp(1);
-  fmulp(1);
-  faddp(1);
-  fld_d(Address(ONES, RelocationHolder::none).plus_disp(rsi, Address::times_8));
-  fmula(1);
-  faddp(1);
-  fstp_d(Address(eax, 8));
-  jcc(Assembler::equal, B1_29);
-
-  bind(B1_28);
-  fldcw(Address(esp, 30));
-
-  bind(B1_29);
-  addl(esp, 52);
-  pop(ebx);
-  pop(edi);
-  pop(esi);
-  movl(esp, ebp);
-  pop(ebp);
-  ret(0);
-
-  bind(B1_30);
-  fld_x(ExternalAddress(84 + SP));    //0x8610, 0x307f, 0x62
-  testl(ebx, ebx);
-  fmul(1);
-  fld_x(ExternalAddress(72 + SP));    //0x44a6, 0xed1a, 0x29
-  fmul(2);
-  fld_x(ExternalAddress(60 + SP));    //0xbf33, 0x8bb4, 0x2f
-  movl(eax, Address(rsp, 32));
-  faddp(2);
-  fxch(1);
-  fmul(2);
-  fld_x(ExternalAddress(48 + SP));    //0x825b, 0x3997, 0x2b
-  faddp(2);
-  fxch(1);
-  fmul(2);
-  fld_x(ExternalAddress(36 + SP));    //0x45f6, 0xb616, 0x1d
-  faddp(2);
-  fxch(1);
-  fmul(2);
-  fld_x(ExternalAddress(24 + SP));    //0xc527, 0x0d00, 0x00
-  faddp(2);
-  fxch(1);
-  fmul(2);
-  fld_x(ExternalAddress(12 + SP));    //0x8887, 0x8888, 0x88
-  faddp(2);
-  fxch(1);
-  fmulp(2);
-  fld_x(ExternalAddress(SP));    //0xaaab, 0xaaaa, 0xaa
-  faddp(1);
-  fmulp(2);
-  faddp(1);
-  fld_d(Address(ONES, RelocationHolder::none).plus_disp(rsi, Address::times_8));
-  fmulp(2);
-  fmul(1);
-  faddp(1);
-  fstp_d(Address(eax, 8));
-  jcc(Assembler::equal, B1_32);
-
-  bind(B1_31);
-  fldcw(Address(esp, 30));
-
-  bind(B1_32);
-  addl(esp, 52);
-  pop(ebx);
-  pop(edi);
-  pop(esi);
-  movl(esp, ebp);
-  pop(ebp);
-  ret(0);
-
-  bind(B1_33);
-  testb(Address(esp, 36), 1);
-  jcc(Assembler::equal, B1_41);
-
-  bind(B1_34);
-  fld_s(0);
-  testb(edx, 2);
-  fmul(1);
-  fld_s(0);
-  fmul(1);
-  jcc(Assembler::equal, B1_38);
-
-  bind(B1_35);
-  fld_x(ExternalAddress(84 + SP));    //0x8610, 0x307f, 0x62
-  testl(ebx, ebx);
-  fmul(1);
-  fld_x(ExternalAddress(72 + SP));    //0x44a6, 0xed1a, 0x29
-  fmul(2);
-  fld_x(ExternalAddress(60 + SP));    //0xbf33, 0x8bb4, 0x2f
-  faddp(2);
-  fxch(1);
-  fmul(2);
-  fld_x(ExternalAddress(48 + SP));    //0x825b, 0x3997, 0x2b
-  faddp(2);
-  fxch(1);
-  fmul(2);
-  fld_x(ExternalAddress(36 + SP));    //0x45f6, 0xb616, 0x1d
-  faddp(2);
-  fxch(1);
-  fmul(2);
-  fld_x(ExternalAddress(24 + SP));    //0xc527, 0x0d00, 0x00
-  faddp(2);
-  fxch(1);
-  fmul(2);
-  fld_x(ExternalAddress(12 + SP));    //0x8887, 0x8888, 0x88
-  faddp(2);
-  fxch(1);
-  fmulp(2);
-  fld_x(ExternalAddress(SP));    //0xaaab, 0xaaaa, 0xaa
-  faddp(1);
-  fmulp(2);
-  faddp(1);
-  fld_d(Address(ONES, RelocationHolder::none).plus_disp(eax, Address::times_8));
-  fmulp(2);
-  fmul(1);
-  movl(eax, Address(esp, 32));
-  faddp(1);
-  fstp_d(Address(eax, 0));
-  jcc(Assembler::equal, B1_37);
-
-  bind(B1_36);
-  fldcw(Address(esp, 30));
-
-  bind(B1_37);
-  addl(esp, 52);
-  pop(ebx);
-  pop(edi);
-  pop(esi);
-  movl(esp, ebp);
-  pop(ebp);
-  ret(0);
-
-  bind(B1_38);
-  fstp_d(2);
-  fld_x(ExternalAddress(84 + CP));    //0x3ac6, 0x0ba0, 0x07
-  testl(ebx, ebx);
-  fmul(2);
-  fld_x(ExternalAddress(72 + CP));    //0xdaba, 0xfe79, 0xea
-  fmul(3);
-  fld_x(ExternalAddress(60 + CP));    //0xd84d, 0xadee, 0xc6
-  faddp(2);
-  fxch(1);
-  fmul(3);
-  fld_x(ExternalAddress(48 + CP));    //0x03fe, 0x3f65, 0x7d
-  faddp(2);
-  fxch(1);
-  fmul(3);
-  fld_x(ExternalAddress(36 + CP));    //0xf024, 0x0cac, 0x00
-  faddp(2);
-  fxch(1);
-  fmul(3);
-  fld_x(ExternalAddress(24 + CP));    //0x9c2f, 0x0b60, 0x60
-  faddp(2);
-  fxch(1);
-  fmul(3);
-  fld_x(ExternalAddress(12 + CP));    //0xaaa5, 0xaaaa, 0xaa
-  faddp(2);
-  fxch(1);
-  fmulp(3);
-  fld_x(ExternalAddress(CP));    //0x0000, 0x0000, 0x00
-  faddp(1);
-  fmulp(1);
-  faddp(1);
-  fld_d(Address(ONES, RelocationHolder::none).plus_disp(eax, Address::times_8));
-  fmula(1);
-  movl(eax, Address(esp, 32));
-  faddp(1);
-  fstp_d(Address(eax, 0));
-  jcc(Assembler::equal, B1_40);
-
-  bind(B1_39);
-  fldcw(Address(esp, 30));
-  bind(B1_40);
-  addl(esp, 52);
-  pop(ebx);
-  pop(edi);
-  pop(esi);
-  movl(esp, ebp);
-  pop(ebp);
-  ret(0);
-  bind(B1_41);
-  fstp_d(0);
-  addl(esp, 52);
-  pop(ebx);
-  pop(edi);
-  pop(esi);
-  movl(esp, ebp);
-  pop(ebp);
-  ret(0);
-  bind(B1_42);
-  xorl(ebx, ebx);
-  jmp(B1_8);
-  bind(B1_43);
-  xorl(ebx, ebx);
-  jmp(B1_15);
-}
-
-ATTRIBUTE_ALIGNED(16) static const juint _static_const_table_sin[] =
-{
-    0x00000000UL, 0x00000000UL, 0x00000000UL, 0x00000000UL, 0x00000000UL,
-    0x00000000UL, 0x00000000UL, 0x3ff00000UL, 0x176d6d31UL, 0xbf73b92eUL,
-    0xbc29b42cUL, 0x3fb917a6UL, 0xe0000000UL, 0xbc3e2718UL, 0x00000000UL,
-    0x3ff00000UL, 0x011469fbUL, 0xbf93ad06UL, 0x3c69a60bUL, 0x3fc8f8b8UL,
-    0xc0000000UL, 0xbc626d19UL, 0x00000000UL, 0x3ff00000UL, 0x939d225aUL,
-    0xbfa60beaUL, 0x2ed59f06UL, 0x3fd29406UL, 0xa0000000UL, 0xbc75d28dUL,
-    0x00000000UL, 0x3ff00000UL, 0x866b95cfUL, 0xbfb37ca1UL, 0xa6aea963UL,
-    0x3fd87de2UL, 0xe0000000UL, 0xbc672cedUL, 0x00000000UL, 0x3ff00000UL,
-    0x73fa1279UL, 0xbfbe3a68UL, 0x3806f63bUL, 0x3fde2b5dUL, 0x20000000UL,
-    0x3c5e0d89UL, 0x00000000UL, 0x3ff00000UL, 0x5bc57974UL, 0xbfc59267UL,
-    0x39ae68c8UL, 0x3fe1c73bUL, 0x20000000UL, 0x3c8b25ddUL, 0x00000000UL,
-    0x3ff00000UL, 0x53aba2fdUL, 0xbfcd0dfeUL, 0x25091dd6UL, 0x3fe44cf3UL,
-    0x20000000UL, 0x3c68076aUL, 0x00000000UL, 0x3ff00000UL, 0x99fcef32UL,
-    0x3fca8279UL, 0x667f3bcdUL, 0x3fe6a09eUL, 0x20000000UL, 0xbc8bdd34UL,
-    0x00000000UL, 0x3fe00000UL, 0x94247758UL, 0x3fc133ccUL, 0x6b151741UL,
-    0x3fe8bc80UL, 0x20000000UL, 0xbc82c5e1UL, 0x00000000UL, 0x3fe00000UL,
-    0x9ae68c87UL, 0x3fac73b3UL, 0x290ea1a3UL, 0x3fea9b66UL, 0xe0000000UL,
-    0x3c39f630UL, 0x00000000UL, 0x3fe00000UL, 0x7f909c4eUL, 0xbf9d4a2cUL,
-    0xf180bdb1UL, 0x3fec38b2UL, 0x80000000UL, 0xbc76e0b1UL, 0x00000000UL,
-    0x3fe00000UL, 0x65455a75UL, 0xbfbe0875UL, 0xcf328d46UL, 0x3fed906bUL,
-    0x20000000UL, 0x3c7457e6UL, 0x00000000UL, 0x3fe00000UL, 0x76acf82dUL,
-    0x3fa4a031UL, 0x56c62ddaUL, 0x3fee9f41UL, 0xe0000000UL, 0x3c8760b1UL,
-    0x00000000UL, 0x3fd00000UL, 0x0e5967d5UL, 0xbfac1d1fUL, 0xcff75cb0UL,
-    0x3fef6297UL, 0x20000000UL, 0x3c756217UL, 0x00000000UL, 0x3fd00000UL,
-    0x0f592f50UL, 0xbf9ba165UL, 0xa3d12526UL, 0x3fefd88dUL, 0x40000000UL,
-    0xbc887df6UL, 0x00000000UL, 0x3fc00000UL, 0x00000000UL, 0x00000000UL,
-    0x00000000UL, 0x3ff00000UL, 0x00000000UL, 0x00000000UL, 0x00000000UL,
-    0x00000000UL, 0x0f592f50UL, 0x3f9ba165UL, 0xa3d12526UL, 0x3fefd88dUL,
-    0x40000000UL, 0xbc887df6UL, 0x00000000UL, 0xbfc00000UL, 0x0e5967d5UL,
-    0x3fac1d1fUL, 0xcff75cb0UL, 0x3fef6297UL, 0x20000000UL, 0x3c756217UL,
-    0x00000000UL, 0xbfd00000UL, 0x76acf82dUL, 0xbfa4a031UL, 0x56c62ddaUL,
-    0x3fee9f41UL, 0xe0000000UL, 0x3c8760b1UL, 0x00000000UL, 0xbfd00000UL,
-    0x65455a75UL, 0x3fbe0875UL, 0xcf328d46UL, 0x3fed906bUL, 0x20000000UL,
-    0x3c7457e6UL, 0x00000000UL, 0xbfe00000UL, 0x7f909c4eUL, 0x3f9d4a2cUL,
-    0xf180bdb1UL, 0x3fec38b2UL, 0x80000000UL, 0xbc76e0b1UL, 0x00000000UL,
-    0xbfe00000UL, 0x9ae68c87UL, 0xbfac73b3UL, 0x290ea1a3UL, 0x3fea9b66UL,
-    0xe0000000UL, 0x3c39f630UL, 0x00000000UL, 0xbfe00000UL, 0x94247758UL,
-    0xbfc133ccUL, 0x6b151741UL, 0x3fe8bc80UL, 0x20000000UL, 0xbc82c5e1UL,
-    0x00000000UL, 0xbfe00000UL, 0x99fcef32UL, 0xbfca8279UL, 0x667f3bcdUL,
-    0x3fe6a09eUL, 0x20000000UL, 0xbc8bdd34UL, 0x00000000UL, 0xbfe00000UL,
-    0x53aba2fdUL, 0x3fcd0dfeUL, 0x25091dd6UL, 0x3fe44cf3UL, 0x20000000UL,
-    0x3c68076aUL, 0x00000000UL, 0xbff00000UL, 0x5bc57974UL, 0x3fc59267UL,
-    0x39ae68c8UL, 0x3fe1c73bUL, 0x20000000UL, 0x3c8b25ddUL, 0x00000000UL,
-    0xbff00000UL, 0x73fa1279UL, 0x3fbe3a68UL, 0x3806f63bUL, 0x3fde2b5dUL,
-    0x20000000UL, 0x3c5e0d89UL, 0x00000000UL, 0xbff00000UL, 0x866b95cfUL,
-    0x3fb37ca1UL, 0xa6aea963UL, 0x3fd87de2UL, 0xe0000000UL, 0xbc672cedUL,
-    0x00000000UL, 0xbff00000UL, 0x939d225aUL, 0x3fa60beaUL, 0x2ed59f06UL,
-    0x3fd29406UL, 0xa0000000UL, 0xbc75d28dUL, 0x00000000UL, 0xbff00000UL,
-    0x011469fbUL, 0x3f93ad06UL, 0x3c69a60bUL, 0x3fc8f8b8UL, 0xc0000000UL,
-    0xbc626d19UL, 0x00000000UL, 0xbff00000UL, 0x176d6d31UL, 0x3f73b92eUL,
-    0xbc29b42cUL, 0x3fb917a6UL, 0xe0000000UL, 0xbc3e2718UL, 0x00000000UL,
-    0xbff00000UL, 0x00000000UL, 0x00000000UL, 0x00000000UL, 0x00000000UL,
-    0x00000000UL, 0x00000000UL, 0x00000000UL, 0xbff00000UL, 0x176d6d31UL,
-    0x3f73b92eUL, 0xbc29b42cUL, 0xbfb917a6UL, 0xe0000000UL, 0x3c3e2718UL,
-    0x00000000UL, 0xbff00000UL, 0x011469fbUL, 0x3f93ad06UL, 0x3c69a60bUL,
-    0xbfc8f8b8UL, 0xc0000000UL, 0x3c626d19UL, 0x00000000UL, 0xbff00000UL,
-    0x939d225aUL, 0x3fa60beaUL, 0x2ed59f06UL, 0xbfd29406UL, 0xa0000000UL,
-    0x3c75d28dUL, 0x00000000UL, 0xbff00000UL, 0x866b95cfUL, 0x3fb37ca1UL,
-    0xa6aea963UL, 0xbfd87de2UL, 0xe0000000UL, 0x3c672cedUL, 0x00000000UL,
-    0xbff00000UL, 0x73fa1279UL, 0x3fbe3a68UL, 0x3806f63bUL, 0xbfde2b5dUL,
-    0x20000000UL, 0xbc5e0d89UL, 0x00000000UL, 0xbff00000UL, 0x5bc57974UL,
-    0x3fc59267UL, 0x39ae68c8UL, 0xbfe1c73bUL, 0x20000000UL, 0xbc8b25ddUL,
-    0x00000000UL, 0xbff00000UL, 0x53aba2fdUL, 0x3fcd0dfeUL, 0x25091dd6UL,
-    0xbfe44cf3UL, 0x20000000UL, 0xbc68076aUL, 0x00000000UL, 0xbff00000UL,
-    0x99fcef32UL, 0xbfca8279UL, 0x667f3bcdUL, 0xbfe6a09eUL, 0x20000000UL,
-    0x3c8bdd34UL, 0x00000000UL, 0xbfe00000UL, 0x94247758UL, 0xbfc133ccUL,
-    0x6b151741UL, 0xbfe8bc80UL, 0x20000000UL, 0x3c82c5e1UL, 0x00000000UL,
-    0xbfe00000UL, 0x9ae68c87UL, 0xbfac73b3UL, 0x290ea1a3UL, 0xbfea9b66UL,
-    0xe0000000UL, 0xbc39f630UL, 0x00000000UL, 0xbfe00000UL, 0x7f909c4eUL,
-    0x3f9d4a2cUL, 0xf180bdb1UL, 0xbfec38b2UL, 0x80000000UL, 0x3c76e0b1UL,
-    0x00000000UL, 0xbfe00000UL, 0x65455a75UL, 0x3fbe0875UL, 0xcf328d46UL,
-    0xbfed906bUL, 0x20000000UL, 0xbc7457e6UL, 0x00000000UL, 0xbfe00000UL,
-    0x76acf82dUL, 0xbfa4a031UL, 0x56c62ddaUL, 0xbfee9f41UL, 0xe0000000UL,
-    0xbc8760b1UL, 0x00000000UL, 0xbfd00000UL, 0x0e5967d5UL, 0x3fac1d1fUL,
-    0xcff75cb0UL, 0xbfef6297UL, 0x20000000UL, 0xbc756217UL, 0x00000000UL,
-    0xbfd00000UL, 0x0f592f50UL, 0x3f9ba165UL, 0xa3d12526UL, 0xbfefd88dUL,
-    0x40000000UL, 0x3c887df6UL, 0x00000000UL, 0xbfc00000UL, 0x00000000UL,
-    0x00000000UL, 0x00000000UL, 0xbff00000UL, 0x00000000UL, 0x00000000UL,
-    0x00000000UL, 0x00000000UL, 0x0f592f50UL, 0xbf9ba165UL, 0xa3d12526UL,
-    0xbfefd88dUL, 0x40000000UL, 0x3c887df6UL, 0x00000000UL, 0x3fc00000UL,
-    0x0e5967d5UL, 0xbfac1d1fUL, 0xcff75cb0UL, 0xbfef6297UL, 0x20000000UL,
-    0xbc756217UL, 0x00000000UL, 0x3fd00000UL, 0x76acf82dUL, 0x3fa4a031UL,
-    0x56c62ddaUL, 0xbfee9f41UL, 0xe0000000UL, 0xbc8760b1UL, 0x00000000UL,
-    0x3fd00000UL, 0x65455a75UL, 0xbfbe0875UL, 0xcf328d46UL, 0xbfed906bUL,
-    0x20000000UL, 0xbc7457e6UL, 0x00000000UL, 0x3fe00000UL, 0x7f909c4eUL,
-    0xbf9d4a2cUL, 0xf180bdb1UL, 0xbfec38b2UL, 0x80000000UL, 0x3c76e0b1UL,
-    0x00000000UL, 0x3fe00000UL, 0x9ae68c87UL, 0x3fac73b3UL, 0x290ea1a3UL,
-    0xbfea9b66UL, 0xe0000000UL, 0xbc39f630UL, 0x00000000UL, 0x3fe00000UL,
-    0x94247758UL, 0x3fc133ccUL, 0x6b151741UL, 0xbfe8bc80UL, 0x20000000UL,
-    0x3c82c5e1UL, 0x00000000UL, 0x3fe00000UL, 0x99fcef32UL, 0x3fca8279UL,
-    0x667f3bcdUL, 0xbfe6a09eUL, 0x20000000UL, 0x3c8bdd34UL, 0x00000000UL,
-    0x3fe00000UL, 0x53aba2fdUL, 0xbfcd0dfeUL, 0x25091dd6UL, 0xbfe44cf3UL,
-    0x20000000UL, 0xbc68076aUL, 0x00000000UL, 0x3ff00000UL, 0x5bc57974UL,
-    0xbfc59267UL, 0x39ae68c8UL, 0xbfe1c73bUL, 0x20000000UL, 0xbc8b25ddUL,
-    0x00000000UL, 0x3ff00000UL, 0x73fa1279UL, 0xbfbe3a68UL, 0x3806f63bUL,
-    0xbfde2b5dUL, 0x20000000UL, 0xbc5e0d89UL, 0x00000000UL, 0x3ff00000UL,
-    0x866b95cfUL, 0xbfb37ca1UL, 0xa6aea963UL, 0xbfd87de2UL, 0xe0000000UL,
-    0x3c672cedUL, 0x00000000UL, 0x3ff00000UL, 0x939d225aUL, 0xbfa60beaUL,
-    0x2ed59f06UL, 0xbfd29406UL, 0xa0000000UL, 0x3c75d28dUL, 0x00000000UL,
-    0x3ff00000UL, 0x011469fbUL, 0xbf93ad06UL, 0x3c69a60bUL, 0xbfc8f8b8UL,
-    0xc0000000UL, 0x3c626d19UL, 0x00000000UL, 0x3ff00000UL, 0x176d6d31UL,
-    0xbf73b92eUL, 0xbc29b42cUL, 0xbfb917a6UL, 0xe0000000UL, 0x3c3e2718UL,
-    0x00000000UL, 0x3ff00000UL, 0x55555555UL, 0xbfc55555UL, 0x00000000UL,
-    0xbfe00000UL, 0x11111111UL, 0x3f811111UL, 0x55555555UL, 0x3fa55555UL,
-    0x1a01a01aUL, 0xbf2a01a0UL, 0x16c16c17UL, 0xbf56c16cUL, 0xa556c734UL,
-    0x3ec71de3UL, 0x1a01a01aUL, 0x3efa01a0UL, 0x1a600000UL, 0x3d90b461UL,
-    0x1a600000UL, 0x3d90b461UL, 0x54400000UL, 0x3fb921fbUL, 0x00000000UL,
-    0x00000000UL, 0x2e037073UL, 0x3b63198aUL, 0x00000000UL, 0x00000000UL,
-    0x6dc9c883UL, 0x40245f30UL, 0x00000000UL, 0x00000000UL, 0x00000000UL,
-    0x43380000UL, 0x00000000UL, 0x00000000UL, 0x00000000UL, 0x43600000UL,
-    0x00000000UL, 0x00000000UL, 0x00000000UL, 0x3c800000UL, 0x00000000UL,
-    0x00000000UL, 0xffffffffUL, 0x3fefffffUL, 0x00000000UL, 0x00000000UL,
-    0x00000000UL, 0x80000000UL, 0x00000000UL, 0x00000000UL, 0x00000000UL,
-    0x80000000UL, 0x00000000UL, 0x80000000UL, 0x00000000UL, 0x3fe00000UL,
-    0x00000000UL, 0x3fe00000UL
-};
-
-void MacroAssembler::fast_sin(XMMRegister xmm0, XMMRegister xmm1, XMMRegister xmm2, XMMRegister xmm3,
-                              XMMRegister xmm4, XMMRegister xmm5, XMMRegister xmm6, XMMRegister xmm7,
-                              Register eax, Register ebx, Register edx) {
-
-  Label L_2TAG_PACKET_0_0_2, L_2TAG_PACKET_1_0_2, L_2TAG_PACKET_2_0_2, L_2TAG_PACKET_3_0_2;
-  Label L_2TAG_PACKET_4_0_2;
-
-  assert_different_registers(eax, ebx, edx);
-
-  address static_const_table_sin = (address)_static_const_table_sin;
-
-  subl(rsp, 120);
-  movl(Address(rsp, 56), ebx);
-  lea(ebx, ExternalAddress(static_const_table_sin));
-  movsd(xmm0, Address(rsp, 128));
-  pextrw(eax, xmm0, 3);
-  andl(eax, 32767);
-  subl(eax, 12336);
-  cmpl(eax, 4293);
-  jcc(Assembler::above, L_2TAG_PACKET_0_0_2);
-  movsd(xmm1, Address(ebx, 2160));
-  mulsd(xmm1, xmm0);
-  movsd(xmm5, Address(ebx, 2272));
-  movdqu(xmm4, Address(ebx, 2256));
-  pand(xmm4, xmm0);
-  por(xmm5, xmm4);
-  movsd(xmm3, Address(ebx, 2128));
-  movdqu(xmm2, Address(ebx, 2112));
-  addpd(xmm1, xmm5);
-  cvttsd2sil(edx, xmm1);
-  cvtsi2sdl(xmm1, edx);
-  mulsd(xmm3, xmm1);
-  unpcklpd(xmm1, xmm1);
-  addl(edx, 1865216);
-  movdqu(xmm4, xmm0);
-  andl(edx, 63);
-  movdqu(xmm5, Address(ebx, 2096));
-  lea(eax, Address(ebx, 0));
-  shll(edx, 5);
-  addl(eax, edx);
-  mulpd(xmm2, xmm1);
-  subsd(xmm0, xmm3);
-  mulsd(xmm1, Address(ebx, 2144));
-  subsd(xmm4, xmm3);
-  movsd(xmm7, Address(eax, 8));
-  unpcklpd(xmm0, xmm0);
-  movapd(xmm3, xmm4);
-  subsd(xmm4, xmm2);
-  mulpd(xmm5, xmm0);
-  subpd(xmm0, xmm2);
-  movdqu(xmm6, Address(ebx, 2064));
-  mulsd(xmm7, xmm4);
-  subsd(xmm3, xmm4);
-  mulpd(xmm5, xmm0);
-  mulpd(xmm0, xmm0);
-  subsd(xmm3, xmm2);
-  movdqu(xmm2, Address(eax, 0));
-  subsd(xmm1, xmm3);
-  movsd(xmm3, Address(eax, 24));
-  addsd(xmm2, xmm3);
-  subsd(xmm7, xmm2);
-  mulsd(xmm2, xmm4);
-  mulpd(xmm6, xmm0);
-  mulsd(xmm3, xmm4);
-  mulpd(xmm2, xmm0);
-  mulpd(xmm0, xmm0);
-  addpd(xmm5, Address(ebx, 2080));
-  mulsd(xmm4, Address(eax, 0));
-  addpd(xmm6, Address(ebx, 2048));
-  mulpd(xmm5, xmm0);
-  movapd(xmm0, xmm3);
-  addsd(xmm3, Address(eax, 8));
-  mulpd(xmm1, xmm7);
-  movapd(xmm7, xmm4);
-  addsd(xmm4, xmm3);
-  addpd(xmm6, xmm5);
-  movsd(xmm5, Address(eax, 8));
-  subsd(xmm5, xmm3);
-  subsd(xmm3, xmm4);
-  addsd(xmm1, Address(eax, 16));
-  mulpd(xmm6, xmm2);
-  addsd(xmm5, xmm0);
-  addsd(xmm3, xmm7);
-  addsd(xmm1, xmm5);
-  addsd(xmm1, xmm3);
-  addsd(xmm1, xmm6);
-  unpckhpd(xmm6, xmm6);
-  addsd(xmm1, xmm6);
-  addsd(xmm4, xmm1);
-  movsd(Address(rsp, 0), xmm4);
-  fld_d(Address(rsp, 0));
-  jmp(L_2TAG_PACKET_1_0_2);
-
-  bind(L_2TAG_PACKET_0_0_2);
-  jcc(Assembler::greater, L_2TAG_PACKET_2_0_2);
-  shrl(eax, 4);
-  cmpl(eax, 268434685);
-  jcc(Assembler::notEqual, L_2TAG_PACKET_3_0_2);
-  movsd(Address(rsp, 0), xmm0);
-  fld_d(Address(rsp, 0));
-  jmp(L_2TAG_PACKET_1_0_2);
-
-  bind(L_2TAG_PACKET_3_0_2);
-  movsd(xmm3, Address(ebx, 2192));
-  mulsd(xmm3, xmm0);
-  subsd(xmm3, xmm0);
-  mulsd(xmm3, Address(ebx, 2208));
-  movsd(Address(rsp, 0), xmm0);
-  fld_d(Address(rsp, 0));
-  jmp(L_2TAG_PACKET_1_0_2);
-
-  bind(L_2TAG_PACKET_2_0_2);
-  movl(eax, Address(rsp, 132));
-  andl(eax, 2146435072);
-  cmpl(eax, 2146435072);
-  jcc(Assembler::equal, L_2TAG_PACKET_4_0_2);
-  subl(rsp, 32);
-  movsd(Address(rsp, 0), xmm0);
-  lea(eax, Address(rsp, 40));
-  movl(Address(rsp, 8), eax);
-  movl(eax, 2);
-  movl(Address(rsp, 12), eax);
-  call(RuntimeAddress(CAST_FROM_FN_PTR(address, StubRoutines::dlibm_sin_cos_huge())));
-  addl(rsp, 32);
-  fld_d(Address(rsp, 16));
-  jmp(L_2TAG_PACKET_1_0_2);
-  bind(L_2TAG_PACKET_4_0_2);
-  fld_d(Address(rsp, 128));
-  fmul_d(Address(ebx, 2240));
-  bind(L_2TAG_PACKET_1_0_2);
-  movl(ebx, Address(rsp, 56));
-}
diff --git a/src/hotspot/cpu/x86/macroAssembler_x86_32_tan.cpp b/src/hotspot/cpu/x86/macroAssembler_x86_32_tan.cpp
deleted file mode 100644
index 4e8be8a1f1d..00000000000
--- a/src/hotspot/cpu/x86/macroAssembler_x86_32_tan.cpp
+++ /dev/null
@@ -1,1172 +0,0 @@
-/*
-* Copyright (c) 2016, 2021, Intel Corporation. All rights reserved.
-* Intel Math Library (LIBM) Source Code
-*
-* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-*
-* This code is free software; you can redistribute it and/or modify it
-* under the terms of the GNU General Public License version 2 only, as
-* published by the Free Software Foundation.
-*
-* This code is distributed in the hope that it will be useful, but WITHOUT
-* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-* FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-* version 2 for more details (a copy is included in the LICENSE file that
-* accompanied this code).
-*
-* You should have received a copy of the GNU General Public License version
-* 2 along with this work; if not, write to the Free Software Foundation,
-* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-*
-* Please 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 "asm/assembler.hpp"
-#include "asm/assembler.inline.hpp"
-#include "macroAssembler_x86.hpp"
-#include "runtime/stubRoutines.hpp"
-#include "utilities/globalDefinitions.hpp"
-
-/******************************************************************************/
-//                     ALGORITHM DESCRIPTION - TAN()
-//                     ---------------------
-//
-// Polynomials coefficients and other constants.
-//
-// Note that in this algorithm, there is a different polynomial for
-// each breakpoint, so there are 32 sets of polynomial coefficients
-// as well as 32 instances of the other constants.
-//
-// The polynomial coefficients and constants are offset from the start
-// of the main block as follows:
-//
-//   0:  c8 | c0
-//  16:  c9 | c1
-//  32: c10 | c2
-//  48: c11 | c3
-//  64: c12 | c4
-//  80: c13 | c5
-//  96: c14 | c6
-// 112: c15 | c7
-// 128: T_hi
-// 136: T_lo
-// 144: Sigma
-// 152: T_hl
-// 160: Tau
-// 168: Mask
-// 176: (end of block)
-//
-// The total table size is therefore 5632 bytes.
-//
-// Note that c0 and c1 are always zero. We could try storing
-// other constants here, and just loading the low part of the
-// SIMD register in these cases, after ensuring the high part
-// is zero.
-//
-// The higher terms of the polynomial are computed in the *low*
-// part of the SIMD register. This is so we can overlap the
-// multiplication by r^8 and the unpacking of the other part.
-//
-// The constants are:
-// T_hi + T_lo = accurate constant term in power series
-// Sigma + T_hl = accurate coefficient of r in power series (Sigma=1 bit)
-// Tau = multiplier for the reciprocal, always -1 or 0
-//
-// The basic reconstruction formula using these constants is:
-//
-// High = tau * recip_hi + t_hi
-// Med = (sgn * r + t_hl * r)_hi
-// Low = (sgn * r + t_hl * r)_lo +
-//       tau * recip_lo + T_lo + (T_hl + sigma) * c + pol
-//
-// where pol = c0 + c1 * r + c2 * r^2 + ... + c15 * r^15
-//
-// (c0 = c1 = 0, but using them keeps SIMD regularity)
-//
-// We then do a compensated sum High + Med, add the low parts together
-// and then do the final sum.
-//
-// Here recip_hi + recip_lo is an accurate reciprocal of the remainder
-// modulo pi/2
-//
-// Special cases:
-//  tan(NaN) = quiet NaN, and raise invalid exception
-//  tan(INF) = NaN and raise invalid exception
-//  tan(+/-0) = +/-0
-//
-/******************************************************************************/
-
-// The 32 bit code is at most SSE2 compliant
-
-ATTRIBUTE_ALIGNED(16) static const jushort _TP[] =
-{
-    0x4cd6, 0xaf6c, 0xc710, 0xc662, 0xbffd, 0x0000, 0x4b06, 0xb0ac, 0xd3b2, 0xcc2c,
-    0x3ff9, 0x0000, 0x00e3, 0xc850, 0xaa28, 0x9533, 0xbff3, 0x0000, 0x2ff0, 0x466d,
-    0x1a3b, 0xb266, 0x3fe5, 0x0000
-};
-
-ATTRIBUTE_ALIGNED(16) static const jushort _TQ[] =
-{
-    0x399c, 0x8391, 0x154c, 0x94ca, 0xbfff, 0x0000, 0xb6a3, 0xc36a, 0x44e2, 0x8a2c,
-    0x3ffe, 0x0000, 0xb70f, 0xd068, 0xa6ce, 0xe9dd, 0xbff9, 0x0000, 0x820f, 0x51ce,
-    0x7d76, 0x9bff, 0x3ff3, 0x0000
-};
-
-ATTRIBUTE_ALIGNED(16) static const jushort _GP[] =
-{
-    0xaaab, 0xaaaa, 0xaaaa, 0xaaaa, 0xbffd, 0x0000, 0xb62f, 0x0b60, 0x60b6, 0xb60b,
-    0xbff9, 0x0000, 0xdfa7, 0x08aa, 0x55e0, 0x8ab3, 0xbff6, 0x0000, 0x85a0, 0xa819,
-    0xbc99, 0xddeb, 0xbff2, 0x0000, 0x7065, 0x6a37, 0x795f, 0xb354, 0xbfef, 0x0000,
-    0xa8f9, 0x83f1, 0x2ec8, 0x9140, 0xbfec, 0x0000, 0xf3ca, 0x8c96, 0x8e0b, 0xeb6d,
-    0xbfe8, 0x0000, 0x355b, 0xd910, 0x67c9, 0xbed3, 0xbfe5, 0x0000, 0x286b, 0xb49e,
-    0xb854, 0x9a98, 0xbfe2, 0x0000, 0x0871, 0x1a2f, 0x6477, 0xfcc4, 0xbfde, 0x0000,
-    0xa559, 0x1da9, 0xaed2, 0xba76, 0xbfdb, 0x0000, 0x00a3, 0x7fea, 0x9bc3, 0xf205,
-    0xbfd8, 0x0000
-};
-
-void MacroAssembler::libm_tancot_huge(XMMRegister xmm0, XMMRegister xmm1, Register eax, Register ecx, Register edx, Register ebx, Register esi, Register edi, Register ebp, Register esp) {
-  Label B1_1, B1_2, B1_3, B1_4, B1_5, B1_6, B1_7, B1_8, B1_9, B1_10, B1_11, B1_12;
-  Label B1_13, B1_14, B1_15, B1_16, B1_17, B1_18, B1_19, B1_20, B1_21, B1_22, B1_23;
-  Label B1_24, B1_25, B1_26, B1_27, B1_28, B1_29, B1_30, B1_31, B1_32, B1_33, B1_34;
-  Label B1_35, B1_36, B1_37, B1_38, B1_39, B1_40, B1_43;
-
-  assert_different_registers(ebx, eax, ecx, edx, esi, edi, ebp, esp);
-
-  address TP = (address)_TP;
-  address TQ = (address)_TQ;
-  address GP = (address)_GP;
-
-  bind(B1_1);
-  push(ebp);
-  movl(ebp, esp);
-  andl(esp, -64);
-  push(esi);
-  push(edi);
-  push(ebx);
-  subl(esp, 52);
-  movl(eax, Address(ebp, 16));
-  movl(ebx, Address(ebp, 20));
-  movl(Address(esp, 40), eax);
-
-  bind(B1_2);
-  fnstcw(Address(esp, 38));
-
-  bind(B1_3);
-  movl(edx, Address(ebp, 12));
-  movl(eax, edx);
-  andl(eax, 2147483647);
-  shrl(edx, 31);
-  movl(Address(esp, 44), edx);
-  cmpl(eax, 1104150528);
-  jcc(Assembler::aboveEqual, B1_11);
-
-  bind(B1_4);
-  movsd(xmm1, Address(ebp, 8));
-  movzwl(ecx, Address(esp, 38));
-  movl(edx, ecx);
-  andl(edx, 768);
-  andps(xmm1, ExternalAddress(L_2IL0FLOATPACKET_0));    //0xffffffffUL, 0x7fffffffUL, 0x00000000UL, 0x00000000UL
-  cmpl(edx, 768);
-  movsd(xmm0, ExternalAddress(PI4_INV));    ////0x6dc9c883UL, 0x3ff45f30UL
-  mulsd(xmm0, xmm1);
-  movsd(Address(ebp, 8), xmm1);
-  movsd(Address(esp, 0), xmm0);
-  jcc(Assembler::equal, B1_39);
-
-  bind(B1_5);
-  orl(ecx, -64768);
-  movw(Address(esp, 36), ecx);
-
-  bind(B1_6);
-  fldcw(Address(esp, 36));
-
-  bind(B1_7);
-  movsd(xmm1, Address(ebp, 8));
-  movl(edi, 1);
-
-  bind(B1_8);
-  movl(Address(esp, 12), esi);
-  movl(esi, Address(esp, 4));
-  movl(edx, esi);
-  movl(Address(esp, 24), edi);
-  movl(edi, esi);
-  shrl(edi, 20);
-  andl(edx, 1048575);
-  movl(ecx, edi);
-  orl(edx, 1048576);
-  negl(ecx);
-  addl(edi, 13);
-  movl(Address(esp, 8), ebx);
-  addl(ecx, 19);
-  movl(ebx, edx);
-  movl(Address(esp, 28), ecx);
-  shrl(ebx);
-  movl(ecx, edi);
-  shll(edx);
-  movl(ecx, Address(esp, 28));
-  movl(edi, Address(esp, 0));
-  shrl(edi);
-  orl(edx, edi);
-  cmpl(esi, 1094713344);
-  movsd(Address(esp, 16), xmm1);
-  fld_d(Address(esp, 16));
-  cmov32(Assembler::below, edx, ebx);
-  movl(edi, Address(esp, 24));
-  movl(esi, Address(esp, 12));
-  lea(ebx, Address(edx, 1));
-  andl(ebx, -2);
-  movl(Address(esp, 16), ebx);
-  cmpl(eax, 1094713344);
-  fild_s(Address(esp, 16));
-  movl(ebx, Address(esp, 8));
-  jcc(Assembler::aboveEqual, B1_10);
-
-  bind(B1_9);
-  fld_d(ExternalAddress(PI4X3));    //0x54443000UL, 0xbfe921fbUL
-  fmul(1);
-  faddp(2);
-  fld_d(ExternalAddress(PI4X3 + 8));    //0x3b39a000UL, 0x3d373dcbUL
-  fmul(1);
-  faddp(2);
-  fld_d(ExternalAddress(PI4X3 + 16));    //0xe0e68948UL, 0xba845c06UL
-  fmulp(1);
-  faddp(1);
-  jmp(B1_17);
-
-  bind(B1_10);
-  fld_d(ExternalAddress(PI4X4));    //0x54400000UL, 0xbfe921fbUL
-  fmul(1);
-  faddp(2);
-  fld_d(ExternalAddress(PI4X4 + 8));    //0x1a600000UL, 0xbdc0b461UL
-  fmul(1);
-  faddp(2);
-  fld_d(ExternalAddress(PI4X4 + 16));    //0x2e000000UL, 0xbb93198aUL
-  fmul(1);
-  faddp(2);
-  fld_d(ExternalAddress(PI4X4 + 24));    //0x252049c1UL, 0xb96b839aUL
-  fmulp(1);
-  faddp(1);
-  jmp(B1_17);
-
-  bind(B1_11);
-  movzwl(edx, Address(esp, 38));
-  movl(eax, edx);
-  andl(eax, 768);
-  cmpl(eax, 768);
-  jcc(Assembler::equal, B1_40);
-
-  bind(B1_12);
-  orl(edx, -64768);
-  movw(Address(esp, 36), edx);
-
-  bind(B1_13);
-  fldcw(Address(esp, 36));
-
-  bind(B1_14);
-  movl(edi, 1);
-
-  bind(B1_15);
-  movsd(xmm0, Address(ebp, 8));
-  addl(esp, -32);
-  andps(xmm0, ExternalAddress(L_2IL0FLOATPACKET_0));    //0xffffffffUL, 0x7fffffffUL, 0x00000000UL, 0x00000000UL
-  lea(eax, Address(esp, 32));
-  movsd(Address(eax, 16), xmm0);
-  fld_d(Address(eax, 16));
-  fstp_x(Address(esp, 0));
-  movl(Address(esp, 12), 0);
-  movl(Address(esp, 16), eax);
-  call(RuntimeAddress(CAST_FROM_FN_PTR(address, StubRoutines::dlibm_reduce_pi04l())));
-
-  bind(B1_43);
-  movl(edx, eax);
-  addl(esp, 32);
-
-  bind(B1_16);
-  fld_d(Address(esp, 0));
-  fld_d(Address(esp, 8));
-  faddp(1);
-
-  bind(B1_17);
-  movl(eax, ebx);
-  andl(eax, 3);
-  cmpl(eax, 3);
-  jcc(Assembler::notEqual, B1_24);
-
-  bind(B1_18);
-  fld_d(ExternalAddress(ONES));
-  incl(edx);
-  fdiv(1);
-  testb(edx, 2);
-  fstp_x(Address(esp, 24));
-  fld_s(0);
-  fmul(1);
-  fld_s(0);
-  fmul(1);
-  fld_x(ExternalAddress(36 + TP));    //0x2ff0, 0x466d, 0x1a
-  fmul(2);
-  fld_x(ExternalAddress(24 + TP));    //0x00e3, 0xc850, 0xaa
-  faddp(1);
-  fmul(2);
-  fld_x(ExternalAddress(12 + TP));    //0x4b06, 0xb0ac, 0xd3
-  faddp(1);
-  fmul(2);
-  fld_x(ExternalAddress(36 + TQ));    //0x820f, 0x51ce, 0x7d
-  fmul(3);
-  fld_x(ExternalAddress(24 + TQ));    //0xb70f, 0xd068, 0xa6
-  faddp(1);
-  fmul(3);
-  fld_x(ExternalAddress(12 + TQ));    //0xb6a3, 0xc36a, 0x44
-  faddp(1);
-  fmul(3);
-  fld_x(ExternalAddress(TQ));    //0x399c, 0x8391, 0x15
-  faddp(1);
-  fld_x(ExternalAddress(TP));    //0x4cd6, 0xaf6c, 0xc7
-  faddp(2);
-  fld_x(ExternalAddress(132 + GP));    //0x00a3, 0x7fea, 0x9b
-  fmul(3);
-  fld_x(ExternalAddress(120 + GP));    //0xa559, 0x1da9, 0xae
-  fmul(4);
-  fld_x(ExternalAddress(108 + GP));    //0x0871, 0x1a2f, 0x64
-  faddp(2);
-  fxch(1);
-  fmul(4);
-  fld_x(ExternalAddress(96 + GP));    //0x286b, 0xb49e, 0xb8
-  faddp(2);
-  fxch(1);
-  fmul(4);
-  fld_x(ExternalAddress(84 + GP));    //0x355b, 0xd910, 0x67
-  faddp(2);
-  fxch(1);
-  fmul(4);
-  fld_x(ExternalAddress(72 + GP));    //0x8c96, 0x8e0b, 0xeb
-  faddp(2);
-  fxch(1);
-  fmul(4);
-  fld_x(ExternalAddress(60 + GP));    //0xa8f9, 0x83f1, 0x2e
-  faddp(2);
-  fxch(1);
-  fmul(4);
-  fld_x(ExternalAddress(48 + GP));    //0x7065, 0x6a37, 0x79
-  faddp(2);
-  fxch(1);
-  fmul(4);
-  fld_x(ExternalAddress(36 + GP));    //0x85a0, 0xa819, 0xbc
-  faddp(2);
-  fxch(1);
-  fmul(4);
-  fld_x(ExternalAddress(24 + GP));    //0xdfa7, 0x08aa, 0x55
-  faddp(2);
-  fxch(1);
-  fmulp(4);
-  fld_x(ExternalAddress(12 + GP));    //0xb62f, 0x0b60, 0x60
-  faddp(1);
-  fmul(4);
-  fmul(5);
-  fld_x(ExternalAddress(GP));    //0xaaab, 0xaaaa, 0xaa
-  faddp(4);
-  fxch(3);
-  fmul(5);
-  faddp(3);
-  jcc(Assembler::equal, B1_20);
-
-  bind(B1_19);
-  fld_x(Address(esp, 24));
-  fxch(1);
-  fdivrp(2);
-  fxch(1);
-  fmulp(3);
-  movl(eax, Address(esp, 44));
-  xorl(eax, 1);
-  fxch(2);
-  fmul(3);
-  fld_d(Address(ONES, RelocationHolder::none).plus_disp(eax, Address::times_8));
-  fmula(2);
-  fmula(3);
-  fxch(3);
-  faddp(2);
-  fxch(1);
-  fstp_d(Address(esp, 16));
-  fmul(1);
-  fxch(1);
-  fmulp(2);
-  movsd(xmm0, Address(esp, 16));
-  faddp(1);
-  fstp_d(Address(esp, 16));
-  movsd(xmm1, Address(esp, 16));
-  jmp(B1_21);
-
-  bind(B1_20);
-  fdivrp(1);
-  fmulp(2);
-  fxch(1);
-  fmul(2);
-  movl(eax, Address(esp, 44));
-  fld_d(Address(ONES, RelocationHolder::none).plus_disp(eax, Address::times_8));
-  fmula(1);
-  fmula(3);
-  fxch(3);
-  faddp(1);
-  fstp_d(Address(esp, 16));
-  fmul(1);
-  fld_x(Address(esp, 24));
-  fmulp(2);
-  movsd(xmm0, Address(esp, 16));
-  faddp(1);
-  fstp_d(Address(esp, 16));
-  movsd(xmm1, Address(esp, 16));
-
-  bind(B1_21);
-  testl(edi, edi);
-  jcc(Assembler::equal, B1_23);
-
-  bind(B1_22);
-  fldcw(Address(esp, 38));
-
-  bind(B1_23);
-  movl(eax, Address(esp, 40));
-  movsd(Address(eax, 0), xmm0);
-  movsd(Address(eax, 8), xmm1);
-  addl(esp, 52);
-  pop(ebx);
-  pop(edi);
-  pop(esi);
-  movl(esp, ebp);
-  pop(ebp);
-  ret(0);
-
-  bind(B1_24);
-  testb(ebx, 2);
-  jcc(Assembler::equal, B1_31);
-
-  bind(B1_25);
-  incl(edx);
-  fld_s(0);
-  fmul(1);
-  testb(edx, 2);
-  jcc(Assembler::equal, B1_27);
-
-  bind(B1_26);
-  fld_d(ExternalAddress(ONES));
-  fdiv(2);
-  fld_s(1);
-  fmul(2);
-  fld_x(ExternalAddress(132 + GP));    //0x00a3, 0x7fea, 0x9b
-  fmul(1);
-  fld_x(ExternalAddress(120 + GP));    //0xa559, 0x1da9, 0xae
-  fmul(2);
-  fld_x(ExternalAddress(108 + GP));    //0x67c9, 0xbed3, 0xbf
-  movl(eax, Address(esp, 44));
-  faddp(2);
-  fxch(1);
-  fmul(2);
-  xorl(eax, 1);
-  fld_x(ExternalAddress(96 + GP));    //0x286b, 0xb49e, 0xb8
-  faddp(2);
-  fxch(1);
-  fmul(2);
-  fld_x(ExternalAddress(84 + GP));    //0x355b, 0xd910, 0x67
-  faddp(2);
-  fxch(1);
-  fmul(2);
-  fld_x(ExternalAddress(72 + GP));    //0xf3ca, 0x8c96, 0x8e
-  faddp(2);
-  fxch(1);
-  fmul(2);
-  fld_x(ExternalAddress(60 + GP));    //0xa8f9, 0x83f1, 0x2e
-  faddp(2);
-  fxch(1);
-  fmul(2);
-  fld_x(ExternalAddress(48 + GP));    //0x7065, 0x6a37, 0x79
-  faddp(2);
-  fxch(1);
-  fmul(2);
-  fld_x(ExternalAddress(36 + GP));    //0x85a0, 0xa819, 0xbc
-  faddp(2);
-  fxch(1);
-  fmul(2);
-  fld_x(ExternalAddress(24 + GP));    //0xdfa7, 0x08aa, 0x55
-  faddp(2);
-  fxch(1);
-  fmulp(2);
-  fld_x(ExternalAddress(12 + GP));    //0xb62f, 0x0b60, 0x60
-  faddp(1);
-  fmulp(3);
-  fld_x(ExternalAddress(GP));    //0xaaab, 0xaaaa, 0xaa
-  faddp(1);
-  fmul(3);
-  fxch(2);
-  fmulp(3);
-  fxch(1);
-  faddp(2);
-  fld_d(Address(ONES, RelocationHolder::none).plus_disp(eax, Address::times_8));
-  fmula(2);
-  fmulp(1);
-  faddp(1);
-  fstp_d(Address(esp, 16));
-  movsd(xmm0, Address(esp, 16));
-  jmp(B1_28);
-
-  bind(B1_27);
-  fld_x(ExternalAddress(36 + TP));    //0x2ff0, 0x466d, 0x1a
-  fmul(1);
-  fld_x(ExternalAddress(24 + TP));    //0x00e3, 0xc850, 0xaa
-  movl(eax, Address(esp, 44));
-  faddp(1);
-  fmul(1);
-  fld_x(ExternalAddress(36 + TQ));    //0x820f, 0x51ce, 0x7d
-  fmul(2);
-  fld_x(ExternalAddress(24 + TQ));    //0xb70f, 0xd068, 0xa6
-  faddp(1);
-  fmul(2);
-  fld_x(ExternalAddress(12 + TQ));    //0xb6a3, 0xc36a, 0x44
-  faddp(1);
-  fmul(2);
-  fld_x(ExternalAddress(TQ));    //0x399c, 0x8391, 0x15
-  faddp(1);
-  fld_x(ExternalAddress(12 + TP));    //0x4b06, 0xb0ac, 0xd3
-  faddp(2);
-  fxch(1);
-  fmul(2);
-  fld_x(ExternalAddress(TP));    //0x4cd6, 0xaf6c, 0xc7
-  faddp(1);
-  fdivrp(1);
-  fmulp(1);
-  fmul(1);
-  fld_d(Address(ONES, RelocationHolder::none).plus_disp(eax, Address::times_8));
-  fmula(1);
-  fmulp(2);
-  faddp(1);
-  fstp_d(Address(esp, 16));
-  movsd(xmm0, Address(esp, 16));
-
-  bind(B1_28);
-  testl(edi, edi);
-  jcc(Assembler::equal, B1_30);
-
-  bind(B1_29);
-  fldcw(Address(esp, 38));
-
-  bind(B1_30);
-  movl(eax, Address(esp, 40));
-  movsd(Address(eax, 0), xmm0);
-  addl(esp, 52);
-  pop(ebx);
-  pop(edi);
-  pop(esi);
-  movl(esp, ebp);
-  pop(ebp);
-  ret(0);
-
-  bind(B1_31);
-  testb(ebx, 1);
-  jcc(Assembler::equal, B1_38);
-
-  bind(B1_32);
-  incl(edx);
-  fld_s(0);
-  fmul(1);
-  testb(edx, 2);
-  jcc(Assembler::equal, B1_34);
-
-  bind(B1_33);
-  fld_x(ExternalAddress(36 + TP));    //0x2ff0, 0x466d, 0x1a
-  fmul(1);
-  fld_x(ExternalAddress(24 + TP));    //0x00e3, 0xc850, 0xaa
-  movl(eax, Address(esp, 44));
-  faddp(1);
-  fmul(1);
-  xorl(eax, 1);
-  fld_x(ExternalAddress(36 + TQ));    //0x820f, 0x51ce, 0x7d
-  fmul(2);
-  fld_x(ExternalAddress(24 + TQ));    //0xb70f, 0xd068, 0xa6
-  faddp(1);
-  fmul(2);
-  fld_x(ExternalAddress(12 + TQ));    //0xb6a3, 0xc36a, 0x44
-  faddp(1);
-  fmul(2);
-  fld_x(ExternalAddress(TQ));    //0x399c, 0x8391, 0x15
-  faddp(1);
-  fld_x(ExternalAddress(12 + TP));    //0x4b06, 0xb0ac, 0xd3
-  faddp(2);
-  fxch(1);
-  fmul(2);
-  fld_x(ExternalAddress(TP));    //0x4cd6, 0xaf6c, 0xc7
-  faddp(1);
-  fdivrp(1);
-  fmulp(1);
-  fmul(1);
-  fld_d(Address(ONES, RelocationHolder::none).plus_disp(eax, Address::times_8));
-  fmula(1);
-  fmulp(2);
-  faddp(1);
-  fstp_d(Address(esp, 16));
-  movsd(xmm0, Address(esp, 16));
-  jmp(B1_35);
-
-  bind(B1_34);
-  fld_d(ExternalAddress(ONES));
-  fdiv(2);
-  fld_s(1);
-  fmul(2);
-  fld_x(ExternalAddress(132 + GP));    //0x00a3, 0x7fea, 0x9b
-  fmul(1);
-  fld_x(ExternalAddress(120 + GP));    //0xa559, 0x1da9, 0xae
-  fmul(2);
-  fld_x(ExternalAddress(108 + GP));    //0x67c9, 0xbed3, 0xbf
-  movl(eax, Address(esp, 44));
-  faddp(2);
-  fxch(1);
-  fmul(2);
-  fld_x(ExternalAddress(96 + GP));    //0x286b, 0xb49e, 0xb8
-  faddp(2);
-  fxch(1);
-  fmul(2);
-  fld_x(ExternalAddress(84 + GP));    //0x355b, 0xd910, 0x67
-  faddp(2);
-  fxch(1);
-  fmul(2);
-  fld_x(ExternalAddress(72 + GP));    //0xf3ca, 0x8c96, 0x8e
-  faddp(2);
-  fxch(1);
-  fmul(2);
-  fld_x(ExternalAddress(60 + GP));    //0xa8f9, 0x83f1, 0x2e
-  faddp(2);
-  fxch(1);
-  fmul(2);
-  fld_x(ExternalAddress(48 + GP));    //0x7065, 0x6a37, 0x79
-  faddp(2);
-  fxch(1);
-  fmul(2);
-  fld_x(ExternalAddress(36 + GP));    //0x85a0, 0xa819, 0xbc
-  faddp(2);
-  fxch(1);
-  fmul(2);
-  fld_x(ExternalAddress(24 + GP));    //0xdfa7, 0x08aa, 0x55
-  faddp(2);
-  fxch(1);
-  fmulp(2);
-  fld_x(ExternalAddress(12 + GP));    //0xb62f, 0x0b60, 0x60
-  faddp(1);
-  fmulp(3);
-  fld_x(ExternalAddress(GP));    //0xaaab, 0xaaaa, 0xaa
-  faddp(1);
-  fmul(3);
-  fxch(2);
-  fmulp(3);
-  fxch(1);
-  faddp(2);
-  fld_d(Address(ONES, RelocationHolder::none).plus_disp(eax, Address::times_8));
-  fmula(2);
-  fmulp(1);
-  faddp(1);
-  fstp_d(Address(esp, 16));
-  movsd(xmm0, Address(esp, 16));
-
-  bind(B1_35);
-  testl(edi, edi);
-  jcc(Assembler::equal, B1_37);
-
-  bind(B1_36);
-  fldcw(Address(esp, 38));
-
-  bind(B1_37);
-  movl(eax, Address(esp, 40));
-  movsd(Address(eax, 8), xmm0);
-  addl(esp, 52);
-  pop(ebx);
-  pop(edi);
-  pop(esi);
-  mov(esp, ebp);
-  pop(ebp);
-  ret(0);
-
-  bind(B1_38);
-  fstp_d(0);
-  addl(esp, 52);
-  pop(ebx);
-  pop(edi);
-  pop(esi);
-  mov(esp, ebp);
-  pop(ebp);
-  ret(0);
-
-  bind(B1_39);
-  xorl(edi, edi);
-  jmp(B1_8);
-
-  bind(B1_40);
-  xorl(edi, edi);
-  jmp(B1_15);
-}
-
-ATTRIBUTE_ALIGNED(16) static const juint _static_const_table_tan[] =
-{
-    0x00000000UL, 0x00000000UL, 0x00000000UL, 0x00000000UL, 0x882c10faUL,
-    0x3f9664f4UL, 0x00000000UL, 0x00000000UL, 0x00000000UL, 0x00000000UL,
-    0x00000000UL, 0x00000000UL, 0x55e6c23dUL, 0x3f8226e3UL, 0x55555555UL,
-    0x3fd55555UL, 0x00000000UL, 0x00000000UL, 0x00000000UL, 0x00000000UL,
-    0x0e157de0UL, 0x3f6d6d3dUL, 0x11111111UL, 0x3fc11111UL, 0x00000000UL,
-    0x00000000UL, 0x00000000UL, 0x00000000UL, 0x452b75e3UL, 0x3f57da36UL,
-    0x1ba1ba1cUL, 0x3faba1baUL, 0x00000000UL, 0x00000000UL, 0x00000000UL,
-    0x00000000UL, 0x00000000UL, 0x3ff00000UL, 0x00000000UL, 0x00000000UL,
-    0x00000000UL, 0x00000000UL, 0x00000000UL, 0x00000000UL, 0x4e435f9bUL,
-    0x3f953f83UL, 0x00000000UL, 0x00000000UL, 0x3c6e8e46UL, 0x3f9b74eaUL,
-    0x00000000UL, 0x00000000UL, 0xda5b7511UL, 0x3f85ad63UL, 0xdc230b9bUL,
-    0x3fb97558UL, 0x26cb3788UL, 0x3f881308UL, 0x76fc4985UL, 0x3fd62ac9UL,
-    0x77bb08baUL, 0x3f757c85UL, 0xb6247521UL, 0x3fb1381eUL, 0x5922170cUL,
-    0x3f754e95UL, 0x8746482dUL, 0x3fc27f83UL, 0x11055b30UL, 0x3f64e391UL,
-    0x3e666320UL, 0x3fa3e609UL, 0x0de9dae3UL, 0x3f6301dfUL, 0x1f1dca06UL,
-    0x3fafa8aeUL, 0x8c5b2da2UL, 0x3fb936bbUL, 0x4e88f7a5UL, 0x3c587d05UL,
-    0x00000000UL, 0x3ff00000UL, 0xa8935dd9UL, 0x3f83dde2UL, 0x00000000UL,
-    0x00000000UL, 0x00000000UL, 0x00000000UL, 0x5a279ea3UL, 0x3faa3407UL,
-    0x00000000UL, 0x00000000UL, 0x432d65faUL, 0x3fa70153UL, 0x00000000UL,
-    0x00000000UL, 0x891a4602UL, 0x3f9d03efUL, 0xd62ca5f8UL, 0x3fca77d9UL,
-    0xb35f4628UL, 0x3f97a265UL, 0x433258faUL, 0x3fd8cf51UL, 0xb58fd909UL,
-    0x3f8f88e3UL, 0x01771ceaUL, 0x3fc2b154UL, 0xf3562f8eUL, 0x3f888f57UL,
-    0xc028a723UL, 0x3fc7370fUL, 0x20b7f9f0UL, 0x3f80f44cUL, 0x214368e9UL,
-    0x3fb6dfaaUL, 0x28891863UL, 0x3f79b4b6UL, 0x172dbbf0UL, 0x3fb6cb8eUL,
-    0xe0553158UL, 0x3fc975f5UL, 0x593fe814UL, 0x3c2ef5d3UL, 0x00000000UL,
-    0x3ff00000UL, 0x03dec550UL, 0x3fa44203UL, 0x00000000UL, 0x00000000UL,
-    0x00000000UL, 0x00000000UL, 0x9314533eUL, 0x3fbb8ec5UL, 0x00000000UL,
-    0x00000000UL, 0x09aa36d0UL, 0x3fb6d3f4UL, 0x00000000UL, 0x00000000UL,
-    0xdcb427fdUL, 0x3fb13950UL, 0xd87ab0bbUL, 0x3fd5335eUL, 0xce0ae8a5UL,
-    0x3fabb382UL, 0x79143126UL, 0x3fddba41UL, 0x5f2b28d4UL, 0x3fa552f1UL,
-    0x59f21a6dUL, 0x3fd015abUL, 0x22c27d95UL, 0x3fa0e984UL, 0xe19fc6aaUL,
-    0x3fd0576cUL, 0x8f2c2950UL, 0x3f9a4898UL, 0xc0b3f22cUL, 0x3fc59462UL,
-    0x1883a4b8UL, 0x3f94b61cUL, 0x3f838640UL, 0x3fc30eb8UL, 0x355c63dcUL,
-    0x3fd36a08UL, 0x1dce993dUL, 0xbc6d704dUL, 0x00000000UL, 0x3ff00000UL,
-    0x2b82ab63UL, 0x3fb78e92UL, 0x00000000UL, 0x00000000UL, 0x00000000UL,
-    0x00000000UL, 0x56f37042UL, 0x3fccfc56UL, 0x00000000UL, 0x00000000UL,
-    0xaa563951UL, 0x3fc90125UL, 0x00000000UL, 0x00000000UL, 0x3d0e7c5dUL,
-    0x3fc50533UL, 0x9bed9b2eUL, 0x3fdf0ed9UL, 0x5fe7c47cUL, 0x3fc1f250UL,
-    0x96c125e5UL, 0x3fe2edd9UL, 0x5a02bbd8UL, 0x3fbe5c71UL, 0x86362c20UL,
-    0x3fda08b7UL, 0x4b4435edUL, 0x3fb9d342UL, 0x4b494091UL, 0x3fd911bdUL,
-    0xb56658beUL, 0x3fb5e4c7UL, 0x93a2fd76UL, 0x3fd3c092UL, 0xda271794UL,
-    0x3fb29910UL, 0x3303df2bUL, 0x3fd189beUL, 0x99fcef32UL, 0x3fda8279UL,
-    0xb68c1467UL, 0x3c708b2fUL, 0x00000000UL, 0x3ff00000UL, 0x980c4337UL,
-    0x3fc5f619UL, 0x00000000UL, 0x00000000UL, 0x00000000UL, 0x00000000UL,
-    0xcc03e501UL, 0x3fdff10fUL, 0x00000000UL, 0x00000000UL, 0x44a4e845UL,
-    0x3fddb63bUL, 0x00000000UL, 0x00000000UL, 0x3768ad9fUL, 0x3fdb72a4UL,
-    0x3dd01ccaUL, 0x3fe5fdb9UL, 0xa61d2811UL, 0x3fd972b2UL, 0x5645ad0bUL,
-    0x3fe977f9UL, 0xd013b3abUL, 0x3fd78ca3UL, 0xbf0bf914UL, 0x3fe4f192UL,
-    0x4d53e730UL, 0x3fd5d060UL, 0x3f8b9000UL, 0x3fe49933UL, 0xe2b82f08UL,
-    0x3fd4322aUL, 0x5936a835UL, 0x3fe27ae1UL, 0xb1c61c9bUL, 0x3fd2b3fbUL,
-    0xef478605UL, 0x3fe1659eUL, 0x190834ecUL, 0x3fe11ab7UL, 0xcdb625eaUL,
-    0xbc8e564bUL, 0x00000000UL, 0x3ff00000UL, 0xb07217e3UL, 0x3fd248f1UL,
-    0x00000000UL, 0x00000000UL, 0x00000000UL, 0x00000000UL, 0x2b2c49d0UL,
-    0x3ff2de9cUL, 0x00000000UL, 0x00000000UL, 0x2655bc98UL, 0x3ff33e58UL,
-    0x00000000UL, 0x00000000UL, 0xff691fa2UL, 0x3ff3972eUL, 0xe93463bdUL,
-    0x3feeed87UL, 0x070e10a0UL, 0x3ff3f5b2UL, 0xf4d790a4UL, 0x3ff20c10UL,
-    0xa04e8ea3UL, 0x3ff4541aUL, 0x386accd3UL, 0x3ff1369eUL, 0x222a66ddUL,
-    0x3ff4b521UL, 0x22a9777eUL, 0x3ff20817UL, 0x52a04a6eUL, 0x3ff5178fUL,
-    0xddaa0031UL, 0x3ff22137UL, 0x4447d47cUL, 0x3ff57c01UL, 0x1e9c7f1dUL,
-    0x3ff29311UL, 0x2ab7f990UL, 0x3fe561b8UL, 0x209c7df1UL, 0x3c87a8c5UL,
-    0x00000000UL, 0x3ff00000UL, 0x4170bcc6UL, 0x3fdc92d8UL, 0x00000000UL,
-    0x00000000UL, 0x00000000UL, 0x00000000UL, 0xc7ab4d5aUL, 0x40085e24UL,
-    0x00000000UL, 0x00000000UL, 0xe93ea75dUL, 0x400b963dUL, 0x00000000UL,
-    0x00000000UL, 0x94a7f25aUL, 0x400f37e2UL, 0x4b6261cbUL, 0x3ff5f984UL,
-    0x5a9dd812UL, 0x4011aab0UL, 0x74c30018UL, 0x3ffaf5a5UL, 0x7f2ce8e3UL,
-    0x4013fe8bUL, 0xfe8e54faUL, 0x3ffd7334UL, 0x670d618dUL, 0x4016a10cUL,
-    0x4db97058UL, 0x4000e012UL, 0x24df44ddUL, 0x40199c5fUL, 0x697d6eceUL,
-    0x4003006eUL, 0x83298b82UL, 0x401cfc4dUL, 0x19d490d6UL, 0x40058c19UL,
-    0x2ae42850UL, 0x3fea4300UL, 0x118e20e6UL, 0xbc7a6db8UL, 0x00000000UL,
-    0x40000000UL, 0xe33345b8UL, 0xbfd4e526UL, 0x00000000UL, 0x00000000UL,
-    0x00000000UL, 0x00000000UL, 0x65965966UL, 0x40219659UL, 0x00000000UL,
-    0x00000000UL, 0x882c10faUL, 0x402664f4UL, 0x00000000UL, 0x00000000UL,
-    0x83cd3723UL, 0x402c8342UL, 0x00000000UL, 0x40000000UL, 0x55e6c23dUL,
-    0x403226e3UL, 0x55555555UL, 0x40055555UL, 0x34451939UL, 0x40371c96UL,
-    0xaaaaaaabUL, 0x400aaaaaUL, 0x0e157de0UL, 0x403d6d3dUL, 0x11111111UL,
-    0x40111111UL, 0xa738201fUL, 0x4042bbceUL, 0x05b05b06UL, 0x4015b05bUL,
-    0x452b75e3UL, 0x4047da36UL, 0x1ba1ba1cUL, 0x401ba1baUL, 0x00000000UL,
-    0x3ff00000UL, 0x00000000UL, 0x00000000UL, 0x00000000UL, 0x40000000UL,
-    0x00000000UL, 0x00000000UL, 0x00000000UL, 0x00000000UL, 0x00000000UL,
-    0x00000000UL, 0x4f48b8d3UL, 0xbf33eaf9UL, 0x00000000UL, 0x00000000UL,
-    0x0cf7586fUL, 0x3f20b8eaUL, 0x00000000UL, 0x00000000UL, 0xd0258911UL,
-    0xbf0abaf3UL, 0x23e49fe9UL, 0xbfab5a8cUL, 0x2d53222eUL, 0x3ef60d15UL,
-    0x21169451UL, 0x3fa172b2UL, 0xbb254dbcUL, 0xbee1d3b5UL, 0xdbf93b8eUL,
-    0xbf84c7dbUL, 0x05b4630bUL, 0x3ecd3364UL, 0xee9aada7UL, 0x3f743924UL,
-    0x794a8297UL, 0xbeb7b7b9UL, 0xe015f797UL, 0xbf5d41f5UL, 0xe41a4a56UL,
-    0x3ea35dfbUL, 0xe4c2a251UL, 0x3f49a2abUL, 0x5af9e000UL, 0xbfce49ceUL,
-    0x8c743719UL, 0x3d1eb860UL, 0x00000000UL, 0x00000000UL, 0x1b4863cfUL,
-    0x3fd78294UL, 0x00000000UL, 0x3ff00000UL, 0x00000000UL, 0xfffffff8UL,
-    0x535ad890UL, 0xbf2b9320UL, 0x00000000UL, 0x00000000UL, 0x018fdf1fUL,
-    0x3f16d61dUL, 0x00000000UL, 0x00000000UL, 0x0359f1beUL, 0xbf0139e4UL,
-    0xa4317c6dUL, 0xbfa67e17UL, 0x82672d0fUL, 0x3eebb405UL, 0x2f1b621eUL,
-    0x3f9f455bUL, 0x51ccf238UL, 0xbed55317UL, 0xf437b9acUL, 0xbf804beeUL,
-    0xc791a2b5UL, 0x3ec0e993UL, 0x919a1db2UL, 0x3f7080c2UL, 0x336a5b0eUL,
-    0xbeaa48a2UL, 0x0a268358UL, 0xbf55a443UL, 0xdfd978e4UL, 0x3e94b61fUL,
-    0xd7767a58UL, 0x3f431806UL, 0x2aea0000UL, 0xbfc9bbe8UL, 0x7723ea61UL,
-    0xbd3a2369UL, 0x00000000UL, 0x00000000UL, 0xdf7796ffUL, 0x3fd6e642UL,
-    0x00000000UL, 0x3ff00000UL, 0x00000000UL, 0xfffffff8UL, 0xb9ff07ceUL,
-    0xbf231c78UL, 0x00000000UL, 0x00000000UL, 0xa5517182UL, 0x3f0ff0e0UL,
-    0x00000000UL, 0x00000000UL, 0x790b4cbcUL, 0xbef66191UL, 0x848a46c6UL,
-    0xbfa21ac0UL, 0xb16435faUL, 0x3ee1d3ecUL, 0x2a1aa832UL, 0x3f9c71eaUL,
-    0xfdd299efUL, 0xbec9dd1aUL, 0x3f8dbaafUL, 0xbf793363UL, 0x309fc6eaUL,
-    0x3eb415d6UL, 0xbee60471UL, 0x3f6b83baUL, 0x94a0a697UL, 0xbe9dae11UL,
-    0x3e5c67b3UL, 0xbf4fd07bUL, 0x9a8f3e3eUL, 0x3e86bd75UL, 0xa4beb7a4UL,
-    0x3f3d1eb1UL, 0x29cfc000UL, 0xbfc549ceUL, 0xbf159358UL, 0xbd397b33UL,
-    0x00000000UL, 0x00000000UL, 0x871fee6cUL, 0x3fd666f0UL, 0x00000000UL,
-    0x3ff00000UL, 0x00000000UL, 0xfffffff8UL, 0x7d98a556UL, 0xbf1a3958UL,
-    0x00000000UL, 0x00000000UL, 0x9d88dc01UL, 0x3f0704c2UL, 0x00000000UL,
-    0x00000000UL, 0x73742a2bUL, 0xbeed054aUL, 0x58844587UL, 0xbf9c2a13UL,
-    0x55688a79UL, 0x3ed7a326UL, 0xee33f1d6UL, 0x3f9a48f4UL, 0xa8dc9888UL,
-    0xbebf8939UL, 0xaad4b5b8UL, 0xbf72f746UL, 0x9102efa1UL, 0x3ea88f82UL,
-    0xdabc29cfUL, 0x3f678228UL, 0x9289afb8UL, 0xbe90f456UL, 0x741fb4edUL,
-    0xbf46f3a3UL, 0xa97f6663UL, 0x3e79b4bfUL, 0xca89ff3fUL, 0x3f36db70UL,
-    0xa8a2a000UL, 0xbfc0ee13UL, 0x3da24be1UL, 0xbd338b9fUL, 0x00000000UL,
-    0x00000000UL, 0x11cd6c69UL, 0x3fd601fdUL, 0x00000000UL, 0x3ff00000UL,
-    0x00000000UL, 0xfffffff8UL, 0x1a154b97UL, 0xbf116b01UL, 0x00000000UL,
-    0x00000000UL, 0x2d427630UL, 0x3f0147bfUL, 0x00000000UL, 0x00000000UL,
-    0xb93820c8UL, 0xbee264d4UL, 0xbb6cbb18UL, 0xbf94ab8cUL, 0x888d4d92UL,
-    0x3ed0568bUL, 0x60730f7cUL, 0x3f98b19bUL, 0xe4b1fb11UL, 0xbeb2f950UL,
-    0x22cf9f74UL, 0xbf6b21cdUL, 0x4a3ff0a6UL, 0x3e9f499eUL, 0xfd2b83ceUL,
-    0x3f64aad7UL, 0x637b73afUL, 0xbe83487cUL, 0xe522591aUL, 0xbf3fc092UL,
-    0xa158e8bcUL, 0x3e6e3aaeUL, 0xe5e82ffaUL, 0x3f329d2fUL, 0xd636a000UL,
-    0xbfb9477fUL, 0xc2c2d2bcUL, 0xbd135ef9UL, 0x00000000UL, 0x00000000UL,
-    0xf2fdb123UL, 0x3fd5b566UL, 0x00000000UL, 0x3ff00000UL, 0x00000000UL,
-    0xfffffff8UL, 0xc41acb64UL, 0xbf05448dUL, 0x00000000UL, 0x00000000UL,
-    0xdbb03d6fUL, 0x3efb7ad2UL, 0x00000000UL, 0x00000000UL, 0x9e42962dUL,
-    0xbed5aea5UL, 0x2579f8efUL, 0xbf8b2398UL, 0x288a1ed9UL, 0x3ec81441UL,
-    0xb0198dc5UL, 0x3f979a3aUL, 0x2fdfe253UL, 0xbea57cd3UL, 0x5766336fUL,
-    0xbf617caaUL, 0x600944c3UL, 0x3e954ed6UL, 0xa4e0aaf8UL, 0x3f62c646UL,
-    0x6b8fb29cUL, 0xbe74e3a3UL, 0xdc4c0409UL, 0xbf33f952UL, 0x9bffe365UL,
-    0x3e6301ecUL, 0xb8869e44UL, 0x3f2fc566UL, 0xe1e04000UL, 0xbfb0cc62UL,
-    0x016b907fUL, 0xbd119cbcUL, 0x00000000UL, 0x00000000UL, 0xe6b9d8faUL,
-    0x3fd57fb3UL, 0x00000000UL, 0x3ff00000UL, 0x00000000UL, 0xfffffff8UL,
-    0x5daf22a6UL, 0xbef429d7UL, 0x00000000UL, 0x00000000UL, 0x06bca545UL,
-    0x3ef7a27dUL, 0x00000000UL, 0x00000000UL, 0x7211c19aUL, 0xbec41c3eUL,
-    0x956ed53eUL, 0xbf7ae3f4UL, 0xee750e72UL, 0x3ec3901bUL, 0x91d443f5UL,
-    0x3f96f713UL, 0x36661e6cUL, 0xbe936e09UL, 0x506f9381UL, 0xbf5122e8UL,
-    0xcb6dd43fUL, 0x3e9041b9UL, 0x6698b2ffUL, 0x3f61b0c7UL, 0x576bf12bUL,
-    0xbe625a8aUL, 0xe5a0e9dcUL, 0xbf23499dUL, 0x110384ddUL, 0x3e5b1c2cUL,
-    0x68d43db6UL, 0x3f2cb899UL, 0x6ecac000UL, 0xbfa0c414UL, 0xcd7dd58cUL,
-    0x3d13500fUL, 0x00000000UL, 0x00000000UL, 0x85a2c8fbUL, 0x3fd55fe0UL,
-    0x00000000UL, 0x3ff00000UL, 0x00000000UL, 0xfffffff8UL, 0x00000000UL,
-    0x00000000UL, 0x00000000UL, 0x00000000UL, 0x2bf70ebeUL, 0x3ef66a8fUL,
-    0x00000000UL, 0x00000000UL, 0x00000000UL, 0x00000000UL, 0x00000000UL,
-    0x00000000UL, 0xd644267fUL, 0x3ec22805UL, 0x16c16c17UL, 0x3f96c16cUL,
-    0x00000000UL, 0x00000000UL, 0x00000000UL, 0x00000000UL, 0xc4e09162UL,
-    0x3e8d6db2UL, 0xbc011567UL, 0x3f61566aUL, 0x00000000UL, 0x00000000UL,
-    0x00000000UL, 0x00000000UL, 0x1f79955cUL, 0x3e57da4eUL, 0x9334ef0bUL,
-    0x3f2bbd77UL, 0x00000000UL, 0x00000000UL, 0x00000000UL, 0x00000000UL,
-    0x00000000UL, 0x00000000UL, 0x55555555UL, 0x3fd55555UL, 0x00000000UL,
-    0x3ff00000UL, 0x00000000UL, 0xfffffff8UL, 0x5daf22a6UL, 0x3ef429d7UL,
-    0x00000000UL, 0x00000000UL, 0x06bca545UL, 0x3ef7a27dUL, 0x00000000UL,
-    0x00000000UL, 0x7211c19aUL, 0x3ec41c3eUL, 0x956ed53eUL, 0x3f7ae3f4UL,
-    0xee750e72UL, 0x3ec3901bUL, 0x91d443f5UL, 0x3f96f713UL, 0x36661e6cUL,
-    0x3e936e09UL, 0x506f9381UL, 0x3f5122e8UL, 0xcb6dd43fUL, 0x3e9041b9UL,
-    0x6698b2ffUL, 0x3f61b0c7UL, 0x576bf12bUL, 0x3e625a8aUL, 0xe5a0e9dcUL,
-    0x3f23499dUL, 0x110384ddUL, 0x3e5b1c2cUL, 0x68d43db6UL, 0x3f2cb899UL,
-    0x6ecac000UL, 0x3fa0c414UL, 0xcd7dd58cUL, 0xbd13500fUL, 0x00000000UL,
-    0x00000000UL, 0x85a2c8fbUL, 0x3fd55fe0UL, 0x00000000UL, 0x3ff00000UL,
-    0x00000000UL, 0xfffffff8UL, 0xc41acb64UL, 0x3f05448dUL, 0x00000000UL,
-    0x00000000UL, 0xdbb03d6fUL, 0x3efb7ad2UL, 0x00000000UL, 0x00000000UL,
-    0x9e42962dUL, 0x3ed5aea5UL, 0x2579f8efUL, 0x3f8b2398UL, 0x288a1ed9UL,
-    0x3ec81441UL, 0xb0198dc5UL, 0x3f979a3aUL, 0x2fdfe253UL, 0x3ea57cd3UL,
-    0x5766336fUL, 0x3f617caaUL, 0x600944c3UL, 0x3e954ed6UL, 0xa4e0aaf8UL,
-    0x3f62c646UL, 0x6b8fb29cUL, 0x3e74e3a3UL, 0xdc4c0409UL, 0x3f33f952UL,
-    0x9bffe365UL, 0x3e6301ecUL, 0xb8869e44UL, 0x3f2fc566UL, 0xe1e04000UL,
-    0x3fb0cc62UL, 0x016b907fUL, 0x3d119cbcUL, 0x00000000UL, 0x00000000UL,
-    0xe6b9d8faUL, 0x3fd57fb3UL, 0x00000000UL, 0x3ff00000UL, 0x00000000UL,
-    0xfffffff8UL, 0x1a154b97UL, 0x3f116b01UL, 0x00000000UL, 0x00000000UL,
-    0x2d427630UL, 0x3f0147bfUL, 0x00000000UL, 0x00000000UL, 0xb93820c8UL,
-    0x3ee264d4UL, 0xbb6cbb18UL, 0x3f94ab8cUL, 0x888d4d92UL, 0x3ed0568bUL,
-    0x60730f7cUL, 0x3f98b19bUL, 0xe4b1fb11UL, 0x3eb2f950UL, 0x22cf9f74UL,
-    0x3f6b21cdUL, 0x4a3ff0a6UL, 0x3e9f499eUL, 0xfd2b83ceUL, 0x3f64aad7UL,
-    0x637b73afUL, 0x3e83487cUL, 0xe522591aUL, 0x3f3fc092UL, 0xa158e8bcUL,
-    0x3e6e3aaeUL, 0xe5e82ffaUL, 0x3f329d2fUL, 0xd636a000UL, 0x3fb9477fUL,
-    0xc2c2d2bcUL, 0x3d135ef9UL, 0x00000000UL, 0x00000000UL, 0xf2fdb123UL,
-    0x3fd5b566UL, 0x00000000UL, 0x3ff00000UL, 0x00000000UL, 0xfffffff8UL,
-    0x7d98a556UL, 0x3f1a3958UL, 0x00000000UL, 0x00000000UL, 0x9d88dc01UL,
-    0x3f0704c2UL, 0x00000000UL, 0x00000000UL, 0x73742a2bUL, 0x3eed054aUL,
-    0x58844587UL, 0x3f9c2a13UL, 0x55688a79UL, 0x3ed7a326UL, 0xee33f1d6UL,
-    0x3f9a48f4UL, 0xa8dc9888UL, 0x3ebf8939UL, 0xaad4b5b8UL, 0x3f72f746UL,
-    0x9102efa1UL, 0x3ea88f82UL, 0xdabc29cfUL, 0x3f678228UL, 0x9289afb8UL,
-    0x3e90f456UL, 0x741fb4edUL, 0x3f46f3a3UL, 0xa97f6663UL, 0x3e79b4bfUL,
-    0xca89ff3fUL, 0x3f36db70UL, 0xa8a2a000UL, 0x3fc0ee13UL, 0x3da24be1UL,
-    0x3d338b9fUL, 0x00000000UL, 0x00000000UL, 0x11cd6c69UL, 0x3fd601fdUL,
-    0x00000000UL, 0x3ff00000UL, 0x00000000UL, 0xfffffff8UL, 0xb9ff07ceUL,
-    0x3f231c78UL, 0x00000000UL, 0x00000000UL, 0xa5517182UL, 0x3f0ff0e0UL,
-    0x00000000UL, 0x00000000UL, 0x790b4cbcUL, 0x3ef66191UL, 0x848a46c6UL,
-    0x3fa21ac0UL, 0xb16435faUL, 0x3ee1d3ecUL, 0x2a1aa832UL, 0x3f9c71eaUL,
-    0xfdd299efUL, 0x3ec9dd1aUL, 0x3f8dbaafUL, 0x3f793363UL, 0x309fc6eaUL,
-    0x3eb415d6UL, 0xbee60471UL, 0x3f6b83baUL, 0x94a0a697UL, 0x3e9dae11UL,
-    0x3e5c67b3UL, 0x3f4fd07bUL, 0x9a8f3e3eUL, 0x3e86bd75UL, 0xa4beb7a4UL,
-    0x3f3d1eb1UL, 0x29cfc000UL, 0x3fc549ceUL, 0xbf159358UL, 0x3d397b33UL,
-    0x00000000UL, 0x00000000UL, 0x871fee6cUL, 0x3fd666f0UL, 0x00000000UL,
-    0x3ff00000UL, 0x00000000UL, 0xfffffff8UL, 0x535ad890UL, 0x3f2b9320UL,
-    0x00000000UL, 0x00000000UL, 0x018fdf1fUL, 0x3f16d61dUL, 0x00000000UL,
-    0x00000000UL, 0x0359f1beUL, 0x3f0139e4UL, 0xa4317c6dUL, 0x3fa67e17UL,
-    0x82672d0fUL, 0x3eebb405UL, 0x2f1b621eUL, 0x3f9f455bUL, 0x51ccf238UL,
-    0x3ed55317UL, 0xf437b9acUL, 0x3f804beeUL, 0xc791a2b5UL, 0x3ec0e993UL,
-    0x919a1db2UL, 0x3f7080c2UL, 0x336a5b0eUL, 0x3eaa48a2UL, 0x0a268358UL,
-    0x3f55a443UL, 0xdfd978e4UL, 0x3e94b61fUL, 0xd7767a58UL, 0x3f431806UL,
-    0x2aea0000UL, 0x3fc9bbe8UL, 0x7723ea61UL, 0x3d3a2369UL, 0x00000000UL,
-    0x00000000UL, 0xdf7796ffUL, 0x3fd6e642UL, 0x00000000UL, 0x3ff00000UL,
-    0x00000000UL, 0xfffffff8UL, 0x4f48b8d3UL, 0x3f33eaf9UL, 0x00000000UL,
-    0x00000000UL, 0x0cf7586fUL, 0x3f20b8eaUL, 0x00000000UL, 0x00000000UL,
-    0xd0258911UL, 0x3f0abaf3UL, 0x23e49fe9UL, 0x3fab5a8cUL, 0x2d53222eUL,
-    0x3ef60d15UL, 0x21169451UL, 0x3fa172b2UL, 0xbb254dbcUL, 0x3ee1d3b5UL,
-    0xdbf93b8eUL, 0x3f84c7dbUL, 0x05b4630bUL, 0x3ecd3364UL, 0xee9aada7UL,
-    0x3f743924UL, 0x794a8297UL, 0x3eb7b7b9UL, 0xe015f797UL, 0x3f5d41f5UL,
-    0xe41a4a56UL, 0x3ea35dfbUL, 0xe4c2a251UL, 0x3f49a2abUL, 0x5af9e000UL,
-    0x3fce49ceUL, 0x8c743719UL, 0xbd1eb860UL, 0x00000000UL, 0x00000000UL,
-    0x1b4863cfUL, 0x3fd78294UL, 0x00000000UL, 0x3ff00000UL, 0x00000000UL,
-    0xfffffff8UL, 0x65965966UL, 0xc0219659UL, 0x00000000UL, 0x00000000UL,
-    0x882c10faUL, 0x402664f4UL, 0x00000000UL, 0x00000000UL, 0x83cd3723UL,
-    0xc02c8342UL, 0x00000000UL, 0xc0000000UL, 0x55e6c23dUL, 0x403226e3UL,
-    0x55555555UL, 0x40055555UL, 0x34451939UL, 0xc0371c96UL, 0xaaaaaaabUL,
-    0xc00aaaaaUL, 0x0e157de0UL, 0x403d6d3dUL, 0x11111111UL, 0x40111111UL,
-    0xa738201fUL, 0xc042bbceUL, 0x05b05b06UL, 0xc015b05bUL, 0x452b75e3UL,
-    0x4047da36UL, 0x1ba1ba1cUL, 0x401ba1baUL, 0x00000000UL, 0xbff00000UL,
-    0x00000000UL, 0x00000000UL, 0x00000000UL, 0x40000000UL, 0x00000000UL,
-    0x00000000UL, 0x00000000UL, 0x00000000UL, 0x00000000UL, 0x00000000UL,
-    0xc7ab4d5aUL, 0xc0085e24UL, 0x00000000UL, 0x00000000UL, 0xe93ea75dUL,
-    0x400b963dUL, 0x00000000UL, 0x00000000UL, 0x94a7f25aUL, 0xc00f37e2UL,
-    0x4b6261cbUL, 0xbff5f984UL, 0x5a9dd812UL, 0x4011aab0UL, 0x74c30018UL,
-    0x3ffaf5a5UL, 0x7f2ce8e3UL, 0xc013fe8bUL, 0xfe8e54faUL, 0xbffd7334UL,
-    0x670d618dUL, 0x4016a10cUL, 0x4db97058UL, 0x4000e012UL, 0x24df44ddUL,
-    0xc0199c5fUL, 0x697d6eceUL, 0xc003006eUL, 0x83298b82UL, 0x401cfc4dUL,
-    0x19d490d6UL, 0x40058c19UL, 0x2ae42850UL, 0xbfea4300UL, 0x118e20e6UL,
-    0x3c7a6db8UL, 0x00000000UL, 0x40000000UL, 0xe33345b8UL, 0xbfd4e526UL,
-    0x00000000UL, 0x00000000UL, 0x00000000UL, 0x00000000UL, 0x2b2c49d0UL,
-    0xbff2de9cUL, 0x00000000UL, 0x00000000UL, 0x2655bc98UL, 0x3ff33e58UL,
-    0x00000000UL, 0x00000000UL, 0xff691fa2UL, 0xbff3972eUL, 0xe93463bdUL,
-    0xbfeeed87UL, 0x070e10a0UL, 0x3ff3f5b2UL, 0xf4d790a4UL, 0x3ff20c10UL,
-    0xa04e8ea3UL, 0xbff4541aUL, 0x386accd3UL, 0xbff1369eUL, 0x222a66ddUL,
-    0x3ff4b521UL, 0x22a9777eUL, 0x3ff20817UL, 0x52a04a6eUL, 0xbff5178fUL,
-    0xddaa0031UL, 0xbff22137UL, 0x4447d47cUL, 0x3ff57c01UL, 0x1e9c7f1dUL,
-    0x3ff29311UL, 0x2ab7f990UL, 0xbfe561b8UL, 0x209c7df1UL, 0xbc87a8c5UL,
-    0x00000000UL, 0x3ff00000UL, 0x4170bcc6UL, 0x3fdc92d8UL, 0x00000000UL,
-    0x00000000UL, 0x00000000UL, 0x00000000UL, 0xcc03e501UL, 0xbfdff10fUL,
-    0x00000000UL, 0x00000000UL, 0x44a4e845UL, 0x3fddb63bUL, 0x00000000UL,
-    0x00000000UL, 0x3768ad9fUL, 0xbfdb72a4UL, 0x3dd01ccaUL, 0xbfe5fdb9UL,
-    0xa61d2811UL, 0x3fd972b2UL, 0x5645ad0bUL, 0x3fe977f9UL, 0xd013b3abUL,
-    0xbfd78ca3UL, 0xbf0bf914UL, 0xbfe4f192UL, 0x4d53e730UL, 0x3fd5d060UL,
-    0x3f8b9000UL, 0x3fe49933UL, 0xe2b82f08UL, 0xbfd4322aUL, 0x5936a835UL,
-    0xbfe27ae1UL, 0xb1c61c9bUL, 0x3fd2b3fbUL, 0xef478605UL, 0x3fe1659eUL,
-    0x190834ecUL, 0xbfe11ab7UL, 0xcdb625eaUL, 0x3c8e564bUL, 0x00000000UL,
-    0x3ff00000UL, 0xb07217e3UL, 0x3fd248f1UL, 0x00000000UL, 0x00000000UL,
-    0x00000000UL, 0x00000000UL, 0x56f37042UL, 0xbfccfc56UL, 0x00000000UL,
-    0x00000000UL, 0xaa563951UL, 0x3fc90125UL, 0x00000000UL, 0x00000000UL,
-    0x3d0e7c5dUL, 0xbfc50533UL, 0x9bed9b2eUL, 0xbfdf0ed9UL, 0x5fe7c47cUL,
-    0x3fc1f250UL, 0x96c125e5UL, 0x3fe2edd9UL, 0x5a02bbd8UL, 0xbfbe5c71UL,
-    0x86362c20UL, 0xbfda08b7UL, 0x4b4435edUL, 0x3fb9d342UL, 0x4b494091UL,
-    0x3fd911bdUL, 0xb56658beUL, 0xbfb5e4c7UL, 0x93a2fd76UL, 0xbfd3c092UL,
-    0xda271794UL, 0x3fb29910UL, 0x3303df2bUL, 0x3fd189beUL, 0x99fcef32UL,
-    0xbfda8279UL, 0xb68c1467UL, 0xbc708b2fUL, 0x00000000UL, 0x3ff00000UL,
-    0x980c4337UL, 0x3fc5f619UL, 0x00000000UL, 0x00000000UL, 0x00000000UL,
-    0x00000000UL, 0x9314533eUL, 0xbfbb8ec5UL, 0x00000000UL, 0x00000000UL,
-    0x09aa36d0UL, 0x3fb6d3f4UL, 0x00000000UL, 0x00000000UL, 0xdcb427fdUL,
-    0xbfb13950UL, 0xd87ab0bbUL, 0xbfd5335eUL, 0xce0ae8a5UL, 0x3fabb382UL,
-    0x79143126UL, 0x3fddba41UL, 0x5f2b28d4UL, 0xbfa552f1UL, 0x59f21a6dUL,
-    0xbfd015abUL, 0x22c27d95UL, 0x3fa0e984UL, 0xe19fc6aaUL, 0x3fd0576cUL,
-    0x8f2c2950UL, 0xbf9a4898UL, 0xc0b3f22cUL, 0xbfc59462UL, 0x1883a4b8UL,
-    0x3f94b61cUL, 0x3f838640UL, 0x3fc30eb8UL, 0x355c63dcUL, 0xbfd36a08UL,
-    0x1dce993dUL, 0x3c6d704dUL, 0x00000000UL, 0x3ff00000UL, 0x2b82ab63UL,
-    0x3fb78e92UL, 0x00000000UL, 0x00000000UL, 0x00000000UL, 0x00000000UL,
-    0x5a279ea3UL, 0xbfaa3407UL, 0x00000000UL, 0x00000000UL, 0x432d65faUL,
-    0x3fa70153UL, 0x00000000UL, 0x00000000UL, 0x891a4602UL, 0xbf9d03efUL,
-    0xd62ca5f8UL, 0xbfca77d9UL, 0xb35f4628UL, 0x3f97a265UL, 0x433258faUL,
-    0x3fd8cf51UL, 0xb58fd909UL, 0xbf8f88e3UL, 0x01771ceaUL, 0xbfc2b154UL,
-    0xf3562f8eUL, 0x3f888f57UL, 0xc028a723UL, 0x3fc7370fUL, 0x20b7f9f0UL,
-    0xbf80f44cUL, 0x214368e9UL, 0xbfb6dfaaUL, 0x28891863UL, 0x3f79b4b6UL,
-    0x172dbbf0UL, 0x3fb6cb8eUL, 0xe0553158UL, 0xbfc975f5UL, 0x593fe814UL,
-    0xbc2ef5d3UL, 0x00000000UL, 0x3ff00000UL, 0x03dec550UL, 0x3fa44203UL,
-    0x00000000UL, 0x00000000UL, 0x00000000UL, 0x00000000UL, 0x4e435f9bUL,
-    0xbf953f83UL, 0x00000000UL, 0x00000000UL, 0x3c6e8e46UL, 0x3f9b74eaUL,
-    0x00000000UL, 0x00000000UL, 0xda5b7511UL, 0xbf85ad63UL, 0xdc230b9bUL,
-    0xbfb97558UL, 0x26cb3788UL, 0x3f881308UL, 0x76fc4985UL, 0x3fd62ac9UL,
-    0x77bb08baUL, 0xbf757c85UL, 0xb6247521UL, 0xbfb1381eUL, 0x5922170cUL,
-    0x3f754e95UL, 0x8746482dUL, 0x3fc27f83UL, 0x11055b30UL, 0xbf64e391UL,
-    0x3e666320UL, 0xbfa3e609UL, 0x0de9dae3UL, 0x3f6301dfUL, 0x1f1dca06UL,
-    0x3fafa8aeUL, 0x8c5b2da2UL, 0xbfb936bbUL, 0x4e88f7a5UL, 0xbc587d05UL,
-    0x00000000UL, 0x3ff00000UL, 0xa8935dd9UL, 0x3f83dde2UL, 0x00000000UL,
-    0x00000000UL, 0x00000000UL, 0x00000000UL, 0x6dc9c883UL, 0x3fe45f30UL,
-    0x6dc9c883UL, 0x40245f30UL, 0x00000000UL, 0x43780000UL, 0x00000000UL,
-    0x43380000UL, 0x54444000UL, 0x3fb921fbUL, 0x54440000UL, 0x3fb921fbUL,
-    0x67674000UL, 0xbd32e7b9UL, 0x4c4c0000UL, 0x3d468c23UL, 0x3707344aUL,
-    0x3aa8a2e0UL, 0x03707345UL, 0x3ae98a2eUL, 0x00000000UL, 0x80000000UL,
-    0x00000000UL, 0x80000000UL, 0x676733afUL, 0x3d32e7b9UL, 0x00000000UL,
-    0x00000000UL, 0x00000000UL, 0x3ff00000UL, 0x00000000UL, 0x00000000UL,
-    0x00000000UL, 0x7ff00000UL, 0x00000000UL, 0x00000000UL, 0xfffc0000UL,
-    0xffffffffUL, 0x00000000UL, 0x00000000UL, 0x00000000UL, 0x43600000UL,
-    0x00000000UL, 0x00000000UL, 0x00000000UL, 0x3c800000UL, 0x00000000UL,
-    0x00000000UL, 0x00000000UL, 0x3ca00000UL, 0x00000000UL, 0x00000000UL,
-    0x00000000UL, 0x3fe00000UL, 0x00000000UL, 0x3fe00000UL, 0x00000000UL,
-    0x40300000UL, 0x00000000UL, 0x3ff00000UL
-};
-
-void MacroAssembler::fast_tan(XMMRegister xmm0, XMMRegister xmm1, XMMRegister xmm2, XMMRegister xmm3, XMMRegister xmm4, XMMRegister xmm5, XMMRegister xmm6, XMMRegister xmm7, Register eax, Register ecx, Register edx, Register tmp) {
-
-  Label L_2TAG_PACKET_0_0_2, L_2TAG_PACKET_1_0_2, L_2TAG_PACKET_2_0_2, L_2TAG_PACKET_3_0_2;
-  Label L_2TAG_PACKET_4_0_2;
-
-  assert_different_registers(tmp, eax, ecx, edx);
-
-  address static_const_table_tan = (address)_static_const_table_tan;
-
-  subl(rsp, 120);
-  movl(Address(rsp, 56), tmp);
-  lea(tmp, ExternalAddress(static_const_table_tan));
-  movsd(xmm0, Address(rsp, 128));
-  pextrw(eax, xmm0, 3);
-  andl(eax, 32767);
-  subl(eax, 14368);
-  cmpl(eax, 2216);
-  jcc(Assembler::above, L_2TAG_PACKET_0_0_2);
-  movdqu(xmm5, Address(tmp, 5840));
-  movdqu(xmm6, Address(tmp, 5856));
-  unpcklpd(xmm0, xmm0);
-  movdqu(xmm4, Address(tmp, 5712));
-  andpd(xmm4, xmm0);
-  movdqu(xmm1, Address(tmp, 5632));
-  mulpd(xmm1, xmm0);
-  por(xmm5, xmm4);
-  addpd(xmm1, xmm5);
-  movdqu(xmm7, xmm1);
-  unpckhpd(xmm7, xmm7);
-  cvttsd2sil(edx, xmm7);
-  cvttpd2dq(xmm1, xmm1);
-  cvtdq2pd(xmm1, xmm1);
-  mulpd(xmm1, xmm6);
-  movdqu(xmm3, Address(tmp, 5664));
-  movsd(xmm5, Address(tmp, 5728));
-  addl(edx, 469248);
-  movdqu(xmm4, Address(tmp, 5680));
-  mulpd(xmm3, xmm1);
-  andl(edx, 31);
-  mulsd(xmm5, xmm1);
-  movl(ecx, edx);
-  mulpd(xmm4, xmm1);
-  shll(ecx, 1);
-  subpd(xmm0, xmm3);
-  mulpd(xmm1, Address(tmp, 5696));
-  addl(edx, ecx);
-  shll(ecx, 2);
-  addl(edx, ecx);
-  addsd(xmm5, xmm0);
-  movdqu(xmm2, xmm0);
-  subpd(xmm0, xmm4);
-  movsd(xmm6, Address(tmp, 5744));
-  shll(edx, 4);
-  lea(eax, Address(tmp, 0));
-  andpd(xmm5, Address(tmp, 5776));
-  movdqu(xmm3, xmm0);
-  addl(eax, edx);
-  subpd(xmm2, xmm0);
-  unpckhpd(xmm0, xmm0);
-  divsd(xmm6, xmm5);
-  subpd(xmm2, xmm4);
-  movdqu(xmm7, Address(eax, 16));
-  subsd(xmm3, xmm5);
-  mulpd(xmm7, xmm0);
-  subpd(xmm2, xmm1);
-  movdqu(xmm1, Address(eax, 48));
-  mulpd(xmm1, xmm0);
-  movdqu(xmm4, Address(eax, 96));
-  mulpd(xmm4, xmm0);
-  addsd(xmm2, xmm3);
-  movdqu(xmm3, xmm0);
-  mulpd(xmm0, xmm0);
-  addpd(xmm7, Address(eax, 0));
-  addpd(xmm1, Address(eax, 32));
-  mulpd(xmm1, xmm0);
-  addpd(xmm4, Address(eax, 80));
-  addpd(xmm7, xmm1);
-  movdqu(xmm1, Address(eax, 112));
-  mulpd(xmm1, xmm0);
-  mulpd(xmm0, xmm0);
-  addpd(xmm4, xmm1);
-  movdqu(xmm1, Address(eax, 64));
-  mulpd(xmm1, xmm0);
-  addpd(xmm7, xmm1);
-  movdqu(xmm1, xmm3);
-  mulpd(xmm3, xmm0);
-  mulsd(xmm0, xmm0);
-  mulpd(xmm1, Address(eax, 144));
-  mulpd(xmm4, xmm3);
-  movdqu(xmm3, xmm1);
-  addpd(xmm7, xmm4);
-  movdqu(xmm4, xmm1);
-  mulsd(xmm0, xmm7);
-  unpckhpd(xmm7, xmm7);
-  addsd(xmm0, xmm7);
-  unpckhpd(xmm1, xmm1);
-  addsd(xmm3, xmm1);
-  subsd(xmm4, xmm3);
-  addsd(xmm1, xmm4);
-  movdqu(xmm4, xmm2);
-  movsd(xmm7, Address(eax, 144));
-  unpckhpd(xmm2, xmm2);
-  addsd(xmm7, Address(eax, 152));
-  mulsd(xmm7, xmm2);
-  addsd(xmm7, Address(eax, 136));
-  addsd(xmm7, xmm1);
-  addsd(xmm0, xmm7);
-  movsd(xmm7, Address(tmp, 5744));
-  mulsd(xmm4, xmm6);
-  movsd(xmm2, Address(eax, 168));
-  andpd(xmm2, xmm6);
-  mulsd(xmm5, xmm2);
-  mulsd(xmm6, Address(eax, 160));
-  subsd(xmm7, xmm5);
-  subsd(xmm2, Address(eax, 128));
-  subsd(xmm7, xmm4);
-  mulsd(xmm7, xmm6);
-  movdqu(xmm4, xmm3);
-  subsd(xmm3, xmm2);
-  addsd(xmm2, xmm3);
-  subsd(xmm4, xmm2);
-  addsd(xmm0, xmm4);
-  subsd(xmm0, xmm7);
-  addsd(xmm0, xmm3);
-  movsd(Address(rsp, 0), xmm0);
-  fld_d(Address(rsp, 0));
-  jmp(L_2TAG_PACKET_1_0_2);
-
-  bind(L_2TAG_PACKET_0_0_2);
-  jcc(Assembler::greater, L_2TAG_PACKET_2_0_2);
-  shrl(eax, 4);
-  cmpl(eax, 268434558);
-  jcc(Assembler::notEqual, L_2TAG_PACKET_3_0_2);
-  movdqu(xmm3, xmm0);
-  mulsd(xmm3, Address(tmp, 5808));
-
-  bind(L_2TAG_PACKET_3_0_2);
-  movsd(xmm3, Address(tmp, 5792));
-  mulsd(xmm3, xmm0);
-  addsd(xmm3, xmm0);
-  mulsd(xmm3, Address(tmp, 5808));
-  movsd(Address(rsp, 0), xmm3);
-  fld_d(Address(rsp, 0));
-  jmp(L_2TAG_PACKET_1_0_2);
-
-  bind(L_2TAG_PACKET_2_0_2);
-  movq(xmm7, Address(tmp, 5712));
-  andpd(xmm7, xmm0);
-  xorpd(xmm7, xmm0);
-  ucomisd(xmm7, Address(tmp, 5760));
-  jcc(Assembler::equal, L_2TAG_PACKET_4_0_2);
-  subl(rsp, 32);
-  movsd(Address(rsp, 0), xmm0);
-  lea(eax, Address(rsp, 40));
-  movl(Address(rsp, 8), eax);
-  movl(eax, 2);
-  movl(Address(rsp, 12), eax);
-  call(RuntimeAddress(CAST_FROM_FN_PTR(address, StubRoutines::dlibm_tan_cot_huge())));
-  addl(rsp, 32);
-  fld_d(Address(rsp, 8));
-  jmp(L_2TAG_PACKET_1_0_2);
-
-  bind(L_2TAG_PACKET_4_0_2);
-  movq(Address(rsp, 0), xmm0);
-  fld_d(Address(rsp, 0));
-  fsub_d(Address(rsp, 0));
-
-  bind(L_2TAG_PACKET_1_0_2);
-  movl(tmp, Address(rsp, 56));
-}
diff --git a/src/hotspot/cpu/x86/sharedRuntime_x86_32.cpp b/src/hotspot/cpu/x86/sharedRuntime_x86_32.cpp
deleted file mode 100644
index 8e5e54f244c..00000000000
--- a/src/hotspot/cpu/x86/sharedRuntime_x86_32.cpp
+++ /dev/null
@@ -1,2854 +0,0 @@
-/*
- * Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please 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 "asm/macroAssembler.hpp"
-#include "asm/macroAssembler.inline.hpp"
-#include "code/compiledIC.hpp"
-#include "code/debugInfoRec.hpp"
-#include "code/nativeInst.hpp"
-#include "code/vtableStubs.hpp"
-#include "compiler/oopMap.hpp"
-#include "gc/shared/gcLocker.hpp"
-#include "gc/shared/barrierSet.hpp"
-#include "gc/shared/barrierSetAssembler.hpp"
-#include "interpreter/interpreter.hpp"
-#include "logging/log.hpp"
-#include "memory/resourceArea.hpp"
-#include "oops/klass.inline.hpp"
-#include "prims/methodHandles.hpp"
-#include "runtime/jniHandles.hpp"
-#include "runtime/safepointMechanism.hpp"
-#include "runtime/sharedRuntime.hpp"
-#include "runtime/signature.hpp"
-#include "runtime/stubRoutines.hpp"
-#include "runtime/timerTrace.hpp"
-#include "runtime/vframeArray.hpp"
-#include "runtime/vm_version.hpp"
-#include "utilities/align.hpp"
-#include "vmreg_x86.inline.hpp"
-#ifdef COMPILER1
-#include "c1/c1_Runtime1.hpp"
-#endif
-#ifdef COMPILER2
-#include "opto/runtime.hpp"
-#endif
-
-#define __ masm->
-
-#ifdef PRODUCT
-#define BLOCK_COMMENT(str) /* nothing */
-#else
-#define BLOCK_COMMENT(str) __ block_comment(str)
-#endif // PRODUCT
-
-const int StackAlignmentInSlots = StackAlignmentInBytes / VMRegImpl::stack_slot_size;
-
-class RegisterSaver {
-  // Capture info about frame layout
-#define DEF_XMM_OFFS(regnum) xmm ## regnum ## _off = xmm_off + (regnum)*16/BytesPerInt, xmm ## regnum ## H_off
-  enum layout {
-                fpu_state_off = 0,
-                fpu_state_end = fpu_state_off+FPUStateSizeInWords,
-                st0_off, st0H_off,
-                st1_off, st1H_off,
-                st2_off, st2H_off,
-                st3_off, st3H_off,
-                st4_off, st4H_off,
-                st5_off, st5H_off,
-                st6_off, st6H_off,
-                st7_off, st7H_off,
-                xmm_off,
-                DEF_XMM_OFFS(0),
-                DEF_XMM_OFFS(1),
-                DEF_XMM_OFFS(2),
-                DEF_XMM_OFFS(3),
-                DEF_XMM_OFFS(4),
-                DEF_XMM_OFFS(5),
-                DEF_XMM_OFFS(6),
-                DEF_XMM_OFFS(7),
-                flags_off = xmm7_off + 16/BytesPerInt + 1, // 16-byte stack alignment fill word
-                rdi_off,
-                rsi_off,
-                ignore_off,  // extra copy of rbp,
-                rsp_off,
-                rbx_off,
-                rdx_off,
-                rcx_off,
-                rax_off,
-                // The frame sender code expects that rbp will be in the "natural" place and
-                // will override any oopMap setting for it. We must therefore force the layout
-                // so that it agrees with the frame sender code.
-                rbp_off,
-                return_off,      // slot for return address
-                reg_save_size };
-  enum { FPU_regs_live = flags_off - fpu_state_end };
-
-  public:
-
-  static OopMap* save_live_registers(MacroAssembler* masm, int additional_frame_words,
-                                     int* total_frame_words, bool verify_fpu = true, bool save_vectors = false);
-  static void restore_live_registers(MacroAssembler* masm, bool restore_vectors = false);
-
-  static int rax_offset() { return rax_off; }
-  static int rbx_offset() { return rbx_off; }
-
-  // Offsets into the register save area
-  // Used by deoptimization when it is managing result register
-  // values on its own
-
-  static int raxOffset(void) { return rax_off; }
-  static int rdxOffset(void) { return rdx_off; }
-  static int rbxOffset(void) { return rbx_off; }
-  static int xmm0Offset(void) { return xmm0_off; }
-  // This really returns a slot in the fp save area, which one is not important
-  static int fpResultOffset(void) { return st0_off; }
-
-  // During deoptimization only the result register need to be restored
-  // all the other values have already been extracted.
-
-  static void restore_result_registers(MacroAssembler* masm);
-
-};
-
-OopMap* RegisterSaver::save_live_registers(MacroAssembler* masm, int additional_frame_words,
-                                           int* total_frame_words, bool verify_fpu, bool save_vectors) {
-  int num_xmm_regs = XMMRegister::number_of_registers;
-  int ymm_bytes = num_xmm_regs * 16;
-  int zmm_bytes = num_xmm_regs * 32;
-#ifdef COMPILER2
-  int opmask_state_bytes = KRegister::number_of_registers * 8;
-  if (save_vectors) {
-    assert(UseAVX > 0, "Vectors larger than 16 byte long are supported only with AVX");
-    assert(MaxVectorSize <= 64, "Only up to 64 byte long vectors are supported");
-    // Save upper half of YMM registers
-    int vect_bytes = ymm_bytes;
-    if (UseAVX > 2) {
-      // Save upper half of ZMM registers as well
-      vect_bytes += zmm_bytes;
-      additional_frame_words += opmask_state_bytes / wordSize;
-    }
-    additional_frame_words += vect_bytes / wordSize;
-  }
-#else
-  assert(!save_vectors, "vectors are generated only by C2");
-#endif
-  int frame_size_in_bytes = (reg_save_size + additional_frame_words) * wordSize;
-  int frame_words = frame_size_in_bytes / wordSize;
-  *total_frame_words = frame_words;
-
-  assert(FPUStateSizeInWords == 27, "update stack layout");
-
-  // save registers, fpu state, and flags
-  // We assume caller has already has return address slot on the stack
-  // We push epb twice in this sequence because we want the real rbp,
-  // to be under the return like a normal enter and we want to use pusha
-  // We push by hand instead of using push.
-  __ enter();
-  __ pusha();
-  __ pushf();
-  __ subptr(rsp,FPU_regs_live*wordSize); // Push FPU registers space
-  __ push_FPU_state();          // Save FPU state & init
-
-  if (verify_fpu) {
-    // Some stubs may have non standard FPU control word settings so
-    // only check and reset the value when it required to be the
-    // standard value.  The safepoint blob in particular can be used
-    // in methods which are using the 24 bit control word for
-    // optimized float math.
-
-#ifdef ASSERT
-    // Make sure the control word has the expected value
-    Label ok;
-    __ cmpw(Address(rsp, 0), StubRoutines::x86::fpu_cntrl_wrd_std());
-    __ jccb(Assembler::equal, ok);
-    __ stop("corrupted control word detected");
-    __ bind(ok);
-#endif
-
-    // Reset the control word to guard against exceptions being unmasked
-    // since fstp_d can cause FPU stack underflow exceptions.  Write it
-    // into the on stack copy and then reload that to make sure that the
-    // current and future values are correct.
-    __ movw(Address(rsp, 0), StubRoutines::x86::fpu_cntrl_wrd_std());
-  }
-
-  __ frstor(Address(rsp, 0));
-  if (!verify_fpu) {
-    // Set the control word so that exceptions are masked for the
-    // following code.
-    __ fldcw(ExternalAddress(StubRoutines::x86::addr_fpu_cntrl_wrd_std()));
-  }
-
-  int off = st0_off;
-  int delta = st1_off - off;
-
-  // Save the FPU registers in de-opt-able form
-  for (int n = 0; n < FloatRegister::number_of_registers; n++) {
-    __ fstp_d(Address(rsp, off*wordSize));
-    off += delta;
-  }
-
-  off = xmm0_off;
-  delta = xmm1_off - off;
-  if(UseSSE == 1) {
-    // Save the XMM state
-    for (int n = 0; n < num_xmm_regs; n++) {
-      __ movflt(Address(rsp, off*wordSize), as_XMMRegister(n));
-      off += delta;
-    }
-  } else if(UseSSE >= 2) {
-    // Save whole 128bit (16 bytes) XMM registers
-    for (int n = 0; n < num_xmm_regs; n++) {
-      __ movdqu(Address(rsp, off*wordSize), as_XMMRegister(n));
-      off += delta;
-    }
-  }
-
-#ifdef COMPILER2
-  if (save_vectors) {
-    __ subptr(rsp, ymm_bytes);
-    // Save upper half of YMM registers
-    for (int n = 0; n < num_xmm_regs; n++) {
-      __ vextractf128_high(Address(rsp, n*16), as_XMMRegister(n));
-    }
-    if (UseAVX > 2) {
-      __ subptr(rsp, zmm_bytes);
-      // Save upper half of ZMM registers
-      for (int n = 0; n < num_xmm_regs; n++) {
-        __ vextractf64x4_high(Address(rsp, n*32), as_XMMRegister(n));
-      }
-      __ subptr(rsp, opmask_state_bytes);
-      // Save opmask registers
-      for (int n = 0; n < KRegister::number_of_registers; n++) {
-        __ kmov(Address(rsp, n*8), as_KRegister(n));
-      }
-    }
-  }
-#else
-  assert(!save_vectors, "vectors are generated only by C2");
-#endif
-
-  __ vzeroupper();
-
-  // Set an oopmap for the call site.  This oopmap will map all
-  // oop-registers and debug-info registers as callee-saved.  This
-  // will allow deoptimization at this safepoint to find all possible
-  // debug-info recordings, as well as let GC find all oops.
-
-  OopMapSet *oop_maps = new OopMapSet();
-  OopMap* map =  new OopMap( frame_words, 0 );
-
-#define STACK_OFFSET(x) VMRegImpl::stack2reg((x) + additional_frame_words)
-#define NEXTREG(x) (x)->as_VMReg()->next()
-
-  map->set_callee_saved(STACK_OFFSET(rax_off), rax->as_VMReg());
-  map->set_callee_saved(STACK_OFFSET(rcx_off), rcx->as_VMReg());
-  map->set_callee_saved(STACK_OFFSET(rdx_off), rdx->as_VMReg());
-  map->set_callee_saved(STACK_OFFSET(rbx_off), rbx->as_VMReg());
-  // rbp, location is known implicitly, no oopMap
-  map->set_callee_saved(STACK_OFFSET(rsi_off), rsi->as_VMReg());
-  map->set_callee_saved(STACK_OFFSET(rdi_off), rdi->as_VMReg());
-
-  // %%% This is really a waste but we'll keep things as they were for now for the upper component
-  off = st0_off;
-  delta = st1_off - off;
-  for (int n = 0; n < FloatRegister::number_of_registers; n++) {
-    FloatRegister freg_name = as_FloatRegister(n);
-    map->set_callee_saved(STACK_OFFSET(off), freg_name->as_VMReg());
-    map->set_callee_saved(STACK_OFFSET(off+1), NEXTREG(freg_name));
-    off += delta;
-  }
-  off = xmm0_off;
-  delta = xmm1_off - off;
-  for (int n = 0; n < num_xmm_regs; n++) {
-    XMMRegister xmm_name = as_XMMRegister(n);
-    map->set_callee_saved(STACK_OFFSET(off), xmm_name->as_VMReg());
-    map->set_callee_saved(STACK_OFFSET(off+1), NEXTREG(xmm_name));
-    off += delta;
-  }
-#undef NEXTREG
-#undef STACK_OFFSET
-
-  return map;
-}
-
-void RegisterSaver::restore_live_registers(MacroAssembler* masm, bool restore_vectors) {
-  int opmask_state_bytes = 0;
-  int additional_frame_bytes = 0;
-  int num_xmm_regs = XMMRegister::number_of_registers;
-  int ymm_bytes = num_xmm_regs * 16;
-  int zmm_bytes = num_xmm_regs * 32;
-  // Recover XMM & FPU state
-#ifdef COMPILER2
-  if (restore_vectors) {
-    assert(UseAVX > 0, "Vectors larger than 16 byte long are supported only with AVX");
-    assert(MaxVectorSize <= 64, "Only up to 64 byte long vectors are supported");
-    // Save upper half of YMM registers
-    additional_frame_bytes = ymm_bytes;
-    if (UseAVX > 2) {
-      // Save upper half of ZMM registers as well
-      additional_frame_bytes += zmm_bytes;
-      opmask_state_bytes = KRegister::number_of_registers * 8;
-      additional_frame_bytes += opmask_state_bytes;
-    }
-  }
-#else
-  assert(!restore_vectors, "vectors are generated only by C2");
-#endif
-
-  int off = xmm0_off;
-  int delta = xmm1_off - off;
-
-  __ vzeroupper();
-
-  if (UseSSE == 1) {
-    // Restore XMM registers
-    assert(additional_frame_bytes == 0, "");
-    for (int n = 0; n < num_xmm_regs; n++) {
-      __ movflt(as_XMMRegister(n), Address(rsp, off*wordSize));
-      off += delta;
-    }
-  } else if (UseSSE >= 2) {
-    // Restore whole 128bit (16 bytes) XMM registers. Do this before restoring YMM and
-    // ZMM because the movdqu instruction zeros the upper part of the XMM register.
-    for (int n = 0; n < num_xmm_regs; n++) {
-      __ movdqu(as_XMMRegister(n), Address(rsp, off*wordSize+additional_frame_bytes));
-      off += delta;
-    }
-  }
-
-  if (restore_vectors) {
-    off = additional_frame_bytes - ymm_bytes;
-    // Restore upper half of YMM registers.
-    for (int n = 0; n < num_xmm_regs; n++) {
-      __ vinsertf128_high(as_XMMRegister(n), Address(rsp, n*16+off));
-    }
-    if (UseAVX > 2) {
-      // Restore upper half of ZMM registers.
-      off = opmask_state_bytes;
-      for (int n = 0; n < num_xmm_regs; n++) {
-        __ vinsertf64x4_high(as_XMMRegister(n), Address(rsp, n*32+off));
-      }
-      for (int n = 0; n < KRegister::number_of_registers; n++) {
-        __ kmov(as_KRegister(n), Address(rsp, n*8));
-      }
-    }
-    __ addptr(rsp, additional_frame_bytes);
-  }
-
-  __ pop_FPU_state();
-  __ addptr(rsp, FPU_regs_live*wordSize); // Pop FPU registers
-
-  __ popf();
-  __ popa();
-  // Get the rbp, described implicitly by the frame sender code (no oopMap)
-  __ pop(rbp);
-}
-
-void RegisterSaver::restore_result_registers(MacroAssembler* masm) {
-
-  // Just restore result register. Only used by deoptimization. By
-  // now any callee save register that needs to be restore to a c2
-  // caller of the deoptee has been extracted into the vframeArray
-  // and will be stuffed into the c2i adapter we create for later
-  // restoration so only result registers need to be restored here.
-  //
-
-  __ frstor(Address(rsp, 0));      // Restore fpu state
-
-  // Recover XMM & FPU state
-  if( UseSSE == 1 ) {
-    __ movflt(xmm0, Address(rsp, xmm0_off*wordSize));
-  } else if( UseSSE >= 2 ) {
-    __ movdbl(xmm0, Address(rsp, xmm0_off*wordSize));
-  }
-  __ movptr(rax, Address(rsp, rax_off*wordSize));
-  __ movptr(rdx, Address(rsp, rdx_off*wordSize));
-  // Pop all of the register save are off the stack except the return address
-  __ addptr(rsp, return_off * wordSize);
-}
-
-// Is vector's size (in bytes) bigger than a size saved by default?
-// 16 bytes XMM registers are saved by default using SSE2 movdqu instructions.
-// Note, MaxVectorSize == 0 with UseSSE < 2 and vectors are not generated.
-bool SharedRuntime::is_wide_vector(int size) {
-  return size > 16;
-}
-
-// The java_calling_convention describes stack locations as ideal slots on
-// a frame with no abi restrictions. Since we must observe abi restrictions
-// (like the placement of the register window) the slots must be biased by
-// the following value.
-static int reg2offset_in(VMReg r) {
-  // Account for saved rbp, and return address
-  // This should really be in_preserve_stack_slots
-  return (r->reg2stack() + 2) * VMRegImpl::stack_slot_size;
-}
-
-static int reg2offset_out(VMReg r) {
-  return (r->reg2stack() + SharedRuntime::out_preserve_stack_slots()) * VMRegImpl::stack_slot_size;
-}
-
-// ---------------------------------------------------------------------------
-// Read the array of BasicTypes from a signature, and compute where the
-// arguments should go.  Values in the VMRegPair regs array refer to 4-byte
-// quantities.  Values less than SharedInfo::stack0 are registers, those above
-// refer to 4-byte stack slots.  All stack slots are based off of the stack pointer
-// as framesizes are fixed.
-// VMRegImpl::stack0 refers to the first slot 0(sp).
-// and VMRegImpl::stack0+1 refers to the memory word 4-byes higher.
-// Register up to Register::number_of_registers are the 32-bit
-// integer registers.
-
-// Pass first two oop/int args in registers ECX and EDX.
-// Pass first two float/double args in registers XMM0 and XMM1.
-// Doubles have precedence, so if you pass a mix of floats and doubles
-// the doubles will grab the registers before the floats will.
-
-// Note: the INPUTS in sig_bt are in units of Java argument words, which are
-// either 32-bit or 64-bit depending on the build.  The OUTPUTS are in 32-bit
-// units regardless of build. Of course for i486 there is no 64 bit build
-
-
-// ---------------------------------------------------------------------------
-// The compiled Java calling convention.
-// Pass first two oop/int args in registers ECX and EDX.
-// Pass first two float/double args in registers XMM0 and XMM1.
-// Doubles have precedence, so if you pass a mix of floats and doubles
-// the doubles will grab the registers before the floats will.
-int SharedRuntime::java_calling_convention(const BasicType *sig_bt,
-                                           VMRegPair *regs,
-                                           int total_args_passed) {
-  uint    stack = 0;          // Starting stack position for args on stack
-
-
-  // Pass first two oop/int args in registers ECX and EDX.
-  uint reg_arg0 = 9999;
-  uint reg_arg1 = 9999;
-
-  // Pass first two float/double args in registers XMM0 and XMM1.
-  // Doubles have precedence, so if you pass a mix of floats and doubles
-  // the doubles will grab the registers before the floats will.
-  // CNC - TURNED OFF FOR non-SSE.
-  //       On Intel we have to round all doubles (and most floats) at
-  //       call sites by storing to the stack in any case.
-  // UseSSE=0 ==> Don't Use ==> 9999+0
-  // UseSSE=1 ==> Floats only ==> 9999+1
-  // UseSSE>=2 ==> Floats or doubles ==> 9999+2
-  enum { fltarg_dontuse = 9999+0, fltarg_float_only = 9999+1, fltarg_flt_dbl = 9999+2 };
-  uint fargs = (UseSSE>=2) ? 2 : UseSSE;
-  uint freg_arg0 = 9999+fargs;
-  uint freg_arg1 = 9999+fargs;
-
-  // Pass doubles & longs aligned on the stack.  First count stack slots for doubles
-  int i;
-  for( i = 0; i < total_args_passed; i++) {
-    if( sig_bt[i] == T_DOUBLE ) {
-      // first 2 doubles go in registers
-      if( freg_arg0 == fltarg_flt_dbl ) freg_arg0 = i;
-      else if( freg_arg1 == fltarg_flt_dbl ) freg_arg1 = i;
-      else // Else double is passed low on the stack to be aligned.
-        stack += 2;
-    } else if( sig_bt[i] == T_LONG ) {
-      stack += 2;
-    }
-  }
-  int dstack = 0;             // Separate counter for placing doubles
-
-  // Now pick where all else goes.
-  for( i = 0; i < total_args_passed; i++) {
-    // From the type and the argument number (count) compute the location
-    switch( sig_bt[i] ) {
-    case T_SHORT:
-    case T_CHAR:
-    case T_BYTE:
-    case T_BOOLEAN:
-    case T_INT:
-    case T_ARRAY:
-    case T_OBJECT:
-    case T_ADDRESS:
-      if( reg_arg0 == 9999 )  {
-        reg_arg0 = i;
-        regs[i].set1(rcx->as_VMReg());
-      } else if( reg_arg1 == 9999 )  {
-        reg_arg1 = i;
-        regs[i].set1(rdx->as_VMReg());
-      } else {
-        regs[i].set1(VMRegImpl::stack2reg(stack++));
-      }
-      break;
-    case T_FLOAT:
-      if( freg_arg0 == fltarg_flt_dbl || freg_arg0 == fltarg_float_only ) {
-        freg_arg0 = i;
-        regs[i].set1(xmm0->as_VMReg());
-      } else if( freg_arg1 == fltarg_flt_dbl || freg_arg1 == fltarg_float_only ) {
-        freg_arg1 = i;
-        regs[i].set1(xmm1->as_VMReg());
-      } else {
-        regs[i].set1(VMRegImpl::stack2reg(stack++));
-      }
-      break;
-    case T_LONG:
-      assert((i + 1) < total_args_passed && sig_bt[i+1] == T_VOID, "missing Half" );
-      regs[i].set2(VMRegImpl::stack2reg(dstack));
-      dstack += 2;
-      break;
-    case T_DOUBLE:
-      assert((i + 1) < total_args_passed && sig_bt[i+1] == T_VOID, "missing Half" );
-      if( freg_arg0 == (uint)i ) {
-        regs[i].set2(xmm0->as_VMReg());
-      } else if( freg_arg1 == (uint)i ) {
-        regs[i].set2(xmm1->as_VMReg());
-      } else {
-        regs[i].set2(VMRegImpl::stack2reg(dstack));
-        dstack += 2;
-      }
-      break;
-    case T_VOID: regs[i].set_bad(); break;
-      break;
-    default:
-      ShouldNotReachHere();
-      break;
-    }
-  }
-
-  return stack;
-}
-
-// Patch the callers callsite with entry to compiled code if it exists.
-static void patch_callers_callsite(MacroAssembler *masm) {
-  Label L;
-  __ cmpptr(Address(rbx, in_bytes(Method::code_offset())), NULL_WORD);
-  __ jcc(Assembler::equal, L);
-  // Schedule the branch target address early.
-  // Call into the VM to patch the caller, then jump to compiled callee
-  // rax, isn't live so capture return address while we easily can
-  __ movptr(rax, Address(rsp, 0));
-  __ pusha();
-  __ pushf();
-
-  if (UseSSE == 1) {
-    __ subptr(rsp, 2*wordSize);
-    __ movflt(Address(rsp, 0), xmm0);
-    __ movflt(Address(rsp, wordSize), xmm1);
-  }
-  if (UseSSE >= 2) {
-    __ subptr(rsp, 4*wordSize);
-    __ movdbl(Address(rsp, 0), xmm0);
-    __ movdbl(Address(rsp, 2*wordSize), xmm1);
-  }
-#ifdef COMPILER2
-  // C2 may leave the stack dirty if not in SSE2+ mode
-  if (UseSSE >= 2) {
-    __ verify_FPU(0, "c2i transition should have clean FPU stack");
-  } else {
-    __ empty_FPU_stack();
-  }
-#endif /* COMPILER2 */
-
-  // VM needs caller's callsite
-  __ push(rax);
-  // VM needs target method
-  __ push(rbx);
-  __ call(RuntimeAddress(CAST_FROM_FN_PTR(address, SharedRuntime::fixup_callers_callsite)));
-  __ addptr(rsp, 2*wordSize);
-
-  if (UseSSE == 1) {
-    __ movflt(xmm0, Address(rsp, 0));
-    __ movflt(xmm1, Address(rsp, wordSize));
-    __ addptr(rsp, 2*wordSize);
-  }
-  if (UseSSE >= 2) {
-    __ movdbl(xmm0, Address(rsp, 0));
-    __ movdbl(xmm1, Address(rsp, 2*wordSize));
-    __ addptr(rsp, 4*wordSize);
-  }
-
-  __ popf();
-  __ popa();
-  __ bind(L);
-}
-
-
-static void move_c2i_double(MacroAssembler *masm, XMMRegister r, int st_off) {
-  int next_off = st_off - Interpreter::stackElementSize;
-  __ movdbl(Address(rsp, next_off), r);
-}
-
-static void gen_c2i_adapter(MacroAssembler *masm,
-                            int total_args_passed,
-                            int comp_args_on_stack,
-                            const BasicType *sig_bt,
-                            const VMRegPair *regs,
-                            Label& skip_fixup) {
-  // Before we get into the guts of the C2I adapter, see if we should be here
-  // at all.  We've come from compiled code and are attempting to jump to the
-  // interpreter, which means the caller made a static call to get here
-  // (vcalls always get a compiled target if there is one).  Check for a
-  // compiled target.  If there is one, we need to patch the caller's call.
-  patch_callers_callsite(masm);
-
-  __ bind(skip_fixup);
-
-#ifdef COMPILER2
-  // C2 may leave the stack dirty if not in SSE2+ mode
-  if (UseSSE >= 2) {
-    __ verify_FPU(0, "c2i transition should have clean FPU stack");
-  } else {
-    __ empty_FPU_stack();
-  }
-#endif /* COMPILER2 */
-
-  // Since all args are passed on the stack, total_args_passed * interpreter_
-  // stack_element_size  is the
-  // space we need.
-  int extraspace = total_args_passed * Interpreter::stackElementSize;
-
-  // Get return address
-  __ pop(rax);
-
-  // set senderSP value
-  __ movptr(rsi, rsp);
-
-  __ subptr(rsp, extraspace);
-
-  // Now write the args into the outgoing interpreter space
-  for (int i = 0; i < total_args_passed; i++) {
-    if (sig_bt[i] == T_VOID) {
-      assert(i > 0 && (sig_bt[i-1] == T_LONG || sig_bt[i-1] == T_DOUBLE), "missing half");
-      continue;
-    }
-
-    // st_off points to lowest address on stack.
-    int st_off = ((total_args_passed - 1) - i) * Interpreter::stackElementSize;
-    int next_off = st_off - Interpreter::stackElementSize;
-
-    // Say 4 args:
-    // i   st_off
-    // 0   12 T_LONG
-    // 1    8 T_VOID
-    // 2    4 T_OBJECT
-    // 3    0 T_BOOL
-    VMReg r_1 = regs[i].first();
-    VMReg r_2 = regs[i].second();
-    if (!r_1->is_valid()) {
-      assert(!r_2->is_valid(), "");
-      continue;
-    }
-
-    if (r_1->is_stack()) {
-      // memory to memory use fpu stack top
-      int ld_off = r_1->reg2stack() * VMRegImpl::stack_slot_size + extraspace;
-
-      if (!r_2->is_valid()) {
-        __ movl(rdi, Address(rsp, ld_off));
-        __ movptr(Address(rsp, st_off), rdi);
-      } else {
-
-        // ld_off == LSW, ld_off+VMRegImpl::stack_slot_size == MSW
-        // st_off == MSW, st_off-wordSize == LSW
-
-        __ movptr(rdi, Address(rsp, ld_off));
-        __ movptr(Address(rsp, next_off), rdi);
-        __ movptr(rdi, Address(rsp, ld_off + wordSize));
-        __ movptr(Address(rsp, st_off), rdi);
-      }
-    } else if (r_1->is_Register()) {
-      Register r = r_1->as_Register();
-      if (!r_2->is_valid()) {
-        __ movl(Address(rsp, st_off), r);
-      } else {
-        // long/double in gpr
-        ShouldNotReachHere();
-      }
-    } else {
-      assert(r_1->is_XMMRegister(), "");
-      if (!r_2->is_valid()) {
-        __ movflt(Address(rsp, st_off), r_1->as_XMMRegister());
-      } else {
-        assert(sig_bt[i] == T_DOUBLE || sig_bt[i] == T_LONG, "wrong type");
-        move_c2i_double(masm, r_1->as_XMMRegister(), st_off);
-      }
-    }
-  }
-
-  // Schedule the branch target address early.
-  __ movptr(rcx, Address(rbx, in_bytes(Method::interpreter_entry_offset())));
-  // And repush original return address
-  __ push(rax);
-  __ jmp(rcx);
-}
-
-
-static void move_i2c_double(MacroAssembler *masm, XMMRegister r, Register saved_sp, int ld_off) {
-  int next_val_off = ld_off - Interpreter::stackElementSize;
-  __ movdbl(r, Address(saved_sp, next_val_off));
-}
-
-static void range_check(MacroAssembler* masm, Register pc_reg, Register temp_reg,
-                        address code_start, address code_end,
-                        Label& L_ok) {
-  Label L_fail;
-  __ lea(temp_reg, AddressLiteral(code_start, relocInfo::none));
-  __ cmpptr(pc_reg, temp_reg);
-  __ jcc(Assembler::belowEqual, L_fail);
-  __ lea(temp_reg, AddressLiteral(code_end, relocInfo::none));
-  __ cmpptr(pc_reg, temp_reg);
-  __ jcc(Assembler::below, L_ok);
-  __ bind(L_fail);
-}
-
-void SharedRuntime::gen_i2c_adapter(MacroAssembler *masm,
-                                    int total_args_passed,
-                                    int comp_args_on_stack,
-                                    const BasicType *sig_bt,
-                                    const VMRegPair *regs) {
-  // Note: rsi contains the senderSP on entry. We must preserve it since
-  // we may do a i2c -> c2i transition if we lose a race where compiled
-  // code goes non-entrant while we get args ready.
-
-  // Adapters can be frameless because they do not require the caller
-  // to perform additional cleanup work, such as correcting the stack pointer.
-  // An i2c adapter is frameless because the *caller* frame, which is interpreted,
-  // routinely repairs its own stack pointer (from interpreter_frame_last_sp),
-  // even if a callee has modified the stack pointer.
-  // A c2i adapter is frameless because the *callee* frame, which is interpreted,
-  // routinely repairs its caller's stack pointer (from sender_sp, which is set
-  // up via the senderSP register).
-  // In other words, if *either* the caller or callee is interpreted, we can
-  // get the stack pointer repaired after a call.
-  // This is why c2i and i2c adapters cannot be indefinitely composed.
-  // In particular, if a c2i adapter were to somehow call an i2c adapter,
-  // both caller and callee would be compiled methods, and neither would
-  // clean up the stack pointer changes performed by the two adapters.
-  // If this happens, control eventually transfers back to the compiled
-  // caller, but with an uncorrected stack, causing delayed havoc.
-
-  // Pick up the return address
-  __ movptr(rax, Address(rsp, 0));
-
-  if (VerifyAdapterCalls &&
-      (Interpreter::code() != nullptr || StubRoutines::final_stubs_code() != nullptr)) {
-    // So, let's test for cascading c2i/i2c adapters right now.
-    //  assert(Interpreter::contains($return_addr) ||
-    //         StubRoutines::contains($return_addr),
-    //         "i2c adapter must return to an interpreter frame");
-    __ block_comment("verify_i2c { ");
-    Label L_ok;
-    if (Interpreter::code() != nullptr) {
-      range_check(masm, rax, rdi,
-                  Interpreter::code()->code_start(), Interpreter::code()->code_end(),
-                  L_ok);
-    }
-    if (StubRoutines::initial_stubs_code() != nullptr) {
-      range_check(masm, rax, rdi,
-                  StubRoutines::initial_stubs_code()->code_begin(),
-                  StubRoutines::initial_stubs_code()->code_end(),
-                  L_ok);
-    }
-    if (StubRoutines::final_stubs_code() != nullptr) {
-      range_check(masm, rax, rdi,
-                  StubRoutines::final_stubs_code()->code_begin(),
-                  StubRoutines::final_stubs_code()->code_end(),
-                  L_ok);
-    }
-    const char* msg = "i2c adapter must return to an interpreter frame";
-    __ block_comment(msg);
-    __ stop(msg);
-    __ bind(L_ok);
-    __ block_comment("} verify_i2ce ");
-  }
-
-  // Must preserve original SP for loading incoming arguments because
-  // we need to align the outgoing SP for compiled code.
-  __ movptr(rdi, rsp);
-
-  // Cut-out for having no stack args.  Since up to 2 int/oop args are passed
-  // in registers, we will occasionally have no stack args.
-  int comp_words_on_stack = 0;
-  if (comp_args_on_stack) {
-    // Sig words on the stack are greater-than VMRegImpl::stack0.  Those in
-    // registers are below.  By subtracting stack0, we either get a negative
-    // number (all values in registers) or the maximum stack slot accessed.
-    // int comp_args_on_stack = VMRegImpl::reg2stack(max_arg);
-    // Convert 4-byte stack slots to words.
-    comp_words_on_stack = align_up(comp_args_on_stack*4, wordSize)>>LogBytesPerWord;
-    // Round up to miminum stack alignment, in wordSize
-    comp_words_on_stack = align_up(comp_words_on_stack, 2);
-    __ subptr(rsp, comp_words_on_stack * wordSize);
-  }
-
-  // Align the outgoing SP
-  __ andptr(rsp, -(StackAlignmentInBytes));
-
-  // push the return address on the stack (note that pushing, rather
-  // than storing it, yields the correct frame alignment for the callee)
-  __ push(rax);
-
-  // Put saved SP in another register
-  const Register saved_sp = rax;
-  __ movptr(saved_sp, rdi);
-
-
-  // Will jump to the compiled code just as if compiled code was doing it.
-  // Pre-load the register-jump target early, to schedule it better.
-  __ movptr(rdi, Address(rbx, in_bytes(Method::from_compiled_offset())));
-
-  // Now generate the shuffle code.  Pick up all register args and move the
-  // rest through the floating point stack top.
-  for (int i = 0; i < total_args_passed; i++) {
-    if (sig_bt[i] == T_VOID) {
-      // Longs and doubles are passed in native word order, but misaligned
-      // in the 32-bit build.
-      assert(i > 0 && (sig_bt[i-1] == T_LONG || sig_bt[i-1] == T_DOUBLE), "missing half");
-      continue;
-    }
-
-    // Pick up 0, 1 or 2 words from SP+offset.
-
-    assert(!regs[i].second()->is_valid() || regs[i].first()->next() == regs[i].second(),
-            "scrambled load targets?");
-    // Load in argument order going down.
-    int ld_off = (total_args_passed - i) * Interpreter::stackElementSize;
-    // Point to interpreter value (vs. tag)
-    int next_off = ld_off - Interpreter::stackElementSize;
-    //
-    //
-    //
-    VMReg r_1 = regs[i].first();
-    VMReg r_2 = regs[i].second();
-    if (!r_1->is_valid()) {
-      assert(!r_2->is_valid(), "");
-      continue;
-    }
-    if (r_1->is_stack()) {
-      // Convert stack slot to an SP offset (+ wordSize to account for return address )
-      int st_off = regs[i].first()->reg2stack()*VMRegImpl::stack_slot_size + wordSize;
-
-      // We can use rsi as a temp here because compiled code doesn't need rsi as an input
-      // and if we end up going thru a c2i because of a miss a reasonable value of rsi
-      // we be generated.
-      if (!r_2->is_valid()) {
-        // __ fld_s(Address(saved_sp, ld_off));
-        // __ fstp_s(Address(rsp, st_off));
-        __ movl(rsi, Address(saved_sp, ld_off));
-        __ movptr(Address(rsp, st_off), rsi);
-      } else {
-        // Interpreter local[n] == MSW, local[n+1] == LSW however locals
-        // are accessed as negative so LSW is at LOW address
-
-        // ld_off is MSW so get LSW
-        // st_off is LSW (i.e. reg.first())
-        // __ fld_d(Address(saved_sp, next_off));
-        // __ fstp_d(Address(rsp, st_off));
-        //
-        // We are using two VMRegs. This can be either T_OBJECT, T_ADDRESS, T_LONG, or T_DOUBLE
-        // the interpreter allocates two slots but only uses one for thr T_LONG or T_DOUBLE case
-        // So we must adjust where to pick up the data to match the interpreter.
-        //
-        // Interpreter local[n] == MSW, local[n+1] == LSW however locals
-        // are accessed as negative so LSW is at LOW address
-
-        // ld_off is MSW so get LSW
-        __ movptr(rsi, Address(saved_sp, next_off));
-        __ movptr(Address(rsp, st_off), rsi);
-        __ movptr(rsi, Address(saved_sp, ld_off));
-        __ movptr(Address(rsp, st_off + wordSize), rsi);
-      }
-    } else if (r_1->is_Register()) {  // Register argument
-      Register r = r_1->as_Register();
-      assert(r != rax, "must be different");
-      if (r_2->is_valid()) {
-        //
-        // We are using two VMRegs. This can be either T_OBJECT, T_ADDRESS, T_LONG, or T_DOUBLE
-        // the interpreter allocates two slots but only uses one for thr T_LONG or T_DOUBLE case
-        // So we must adjust where to pick up the data to match the interpreter.
-
-        // this can be a misaligned move
-        __ movptr(r, Address(saved_sp, next_off));
-        assert(r_2->as_Register() != rax, "need another temporary register");
-        // Remember r_1 is low address (and LSB on x86)
-        // So r_2 gets loaded from high address regardless of the platform
-        __ movptr(r_2->as_Register(), Address(saved_sp, ld_off));
-      } else {
-        __ movl(r, Address(saved_sp, ld_off));
-      }
-    } else {
-      assert(r_1->is_XMMRegister(), "");
-      if (!r_2->is_valid()) {
-        __ movflt(r_1->as_XMMRegister(), Address(saved_sp, ld_off));
-      } else {
-        move_i2c_double(masm, r_1->as_XMMRegister(), saved_sp, ld_off);
-      }
-    }
-  }
-
-  // 6243940 We might end up in handle_wrong_method if
-  // the callee is deoptimized as we race thru here. If that
-  // happens we don't want to take a safepoint because the
-  // caller frame will look interpreted and arguments are now
-  // "compiled" so it is much better to make this transition
-  // invisible to the stack walking code. Unfortunately if
-  // we try and find the callee by normal means a safepoint
-  // is possible. So we stash the desired callee in the thread
-  // and the vm will find there should this case occur.
-
-  __ get_thread(rax);
-  __ movptr(Address(rax, JavaThread::callee_target_offset()), rbx);
-
-  // move Method* to rax, in case we end up in an c2i adapter.
-  // the c2i adapters expect Method* in rax, (c2) because c2's
-  // resolve stubs return the result (the method) in rax,.
-  // I'd love to fix this.
-  __ mov(rax, rbx);
-
-  __ jmp(rdi);
-}
-
-// ---------------------------------------------------------------
-AdapterHandlerEntry* SharedRuntime::generate_i2c2i_adapters(MacroAssembler *masm,
-                                                            int total_args_passed,
-                                                            int comp_args_on_stack,
-                                                            const BasicType *sig_bt,
-                                                            const VMRegPair *regs,
-                                                            AdapterFingerPrint* fingerprint) {
-  address i2c_entry = __ pc();
-
-  gen_i2c_adapter(masm, total_args_passed, comp_args_on_stack, sig_bt, regs);
-
-  // -------------------------------------------------------------------------
-  // Generate a C2I adapter.  On entry we know rbx, holds the Method* during calls
-  // to the interpreter.  The args start out packed in the compiled layout.  They
-  // need to be unpacked into the interpreter layout.  This will almost always
-  // require some stack space.  We grow the current (compiled) stack, then repack
-  // the args.  We  finally end in a jump to the generic interpreter entry point.
-  // On exit from the interpreter, the interpreter will restore our SP (lest the
-  // compiled code, which relies solely on SP and not EBP, get sick).
-
-  address c2i_unverified_entry = __ pc();
-  Label skip_fixup;
-
-  Register data = rax;
-  Register receiver = rcx;
-  Register temp = rbx;
-
-  {
-    __ ic_check(1 /* end_alignment */);
-    __ movptr(rbx, Address(data, CompiledICData::speculated_method_offset()));
-    // Method might have been compiled since the call site was patched to
-    // interpreted if that is the case treat it as a miss so we can get
-    // the call site corrected.
-    __ cmpptr(Address(rbx, in_bytes(Method::code_offset())), NULL_WORD);
-    __ jcc(Assembler::equal, skip_fixup);
-  }
-
-  address c2i_entry = __ pc();
-
-  BarrierSetAssembler* bs = BarrierSet::barrier_set()->barrier_set_assembler();
-  bs->c2i_entry_barrier(masm);
-
-  gen_c2i_adapter(masm, total_args_passed, comp_args_on_stack, sig_bt, regs, skip_fixup);
-
-  return AdapterHandlerLibrary::new_entry(fingerprint, i2c_entry, c2i_entry, c2i_unverified_entry);
-}
-
-int SharedRuntime::c_calling_convention(const BasicType *sig_bt,
-                                         VMRegPair *regs,
-                                         int total_args_passed) {
-
-// We return the amount of VMRegImpl stack slots we need to reserve for all
-// the arguments NOT counting out_preserve_stack_slots.
-
-  uint    stack = 0;        // All arguments on stack
-
-  for( int i = 0; i < total_args_passed; i++) {
-    // From the type and the argument number (count) compute the location
-    switch( sig_bt[i] ) {
-    case T_BOOLEAN:
-    case T_CHAR:
-    case T_FLOAT:
-    case T_BYTE:
-    case T_SHORT:
-    case T_INT:
-    case T_OBJECT:
-    case T_ARRAY:
-    case T_ADDRESS:
-    case T_METADATA:
-      regs[i].set1(VMRegImpl::stack2reg(stack++));
-      break;
-    case T_LONG:
-    case T_DOUBLE: // The stack numbering is reversed from Java
-      // Since C arguments do not get reversed, the ordering for
-      // doubles on the stack must be opposite the Java convention
-      assert((i + 1) < total_args_passed && sig_bt[i+1] == T_VOID, "missing Half" );
-      regs[i].set2(VMRegImpl::stack2reg(stack));
-      stack += 2;
-      break;
-    case T_VOID: regs[i].set_bad(); break;
-    default:
-      ShouldNotReachHere();
-      break;
-    }
-  }
-  return stack;
-}
-
-int SharedRuntime::vector_calling_convention(VMRegPair *regs,
-                                             uint num_bits,
-                                             uint total_args_passed) {
-  Unimplemented();
-  return 0;
-}
-
-// A simple move of integer like type
-static void simple_move32(MacroAssembler* masm, VMRegPair src, VMRegPair dst) {
-  if (src.first()->is_stack()) {
-    if (dst.first()->is_stack()) {
-      // stack to stack
-      // __ ld(FP, reg2offset(src.first()), L5);
-      // __ st(L5, SP, reg2offset(dst.first()));
-      __ movl2ptr(rax, Address(rbp, reg2offset_in(src.first())));
-      __ movptr(Address(rsp, reg2offset_out(dst.first())), rax);
-    } else {
-      // stack to reg
-      __ movl2ptr(dst.first()->as_Register(),  Address(rbp, reg2offset_in(src.first())));
-    }
-  } else if (dst.first()->is_stack()) {
-    // reg to stack
-    // no need to sign extend on 64bit
-    __ movptr(Address(rsp, reg2offset_out(dst.first())), src.first()->as_Register());
-  } else {
-    if (dst.first() != src.first()) {
-      __ mov(dst.first()->as_Register(), src.first()->as_Register());
-    }
-  }
-}
-
-// An oop arg. Must pass a handle not the oop itself
-static void object_move(MacroAssembler* masm,
-                        OopMap* map,
-                        int oop_handle_offset,
-                        int framesize_in_slots,
-                        VMRegPair src,
-                        VMRegPair dst,
-                        bool is_receiver,
-                        int* receiver_offset) {
-
-  // Because of the calling conventions we know that src can be a
-  // register or a stack location. dst can only be a stack location.
-
-  assert(dst.first()->is_stack(), "must be stack");
-  // must pass a handle. First figure out the location we use as a handle
-
-  if (src.first()->is_stack()) {
-    // Oop is already on the stack as an argument
-    Register rHandle = rax;
-    Label nil;
-    __ xorptr(rHandle, rHandle);
-    __ cmpptr(Address(rbp, reg2offset_in(src.first())), NULL_WORD);
-    __ jcc(Assembler::equal, nil);
-    __ lea(rHandle, Address(rbp, reg2offset_in(src.first())));
-    __ bind(nil);
-    __ movptr(Address(rsp, reg2offset_out(dst.first())), rHandle);
-
-    int offset_in_older_frame = src.first()->reg2stack() + SharedRuntime::out_preserve_stack_slots();
-    map->set_oop(VMRegImpl::stack2reg(offset_in_older_frame + framesize_in_slots));
-    if (is_receiver) {
-      *receiver_offset = (offset_in_older_frame + framesize_in_slots) * VMRegImpl::stack_slot_size;
-    }
-  } else {
-    // Oop is in a register we must store it to the space we reserve
-    // on the stack for oop_handles
-    const Register rOop = src.first()->as_Register();
-    const Register rHandle = rax;
-    int oop_slot = (rOop == rcx ? 0 : 1) * VMRegImpl::slots_per_word + oop_handle_offset;
-    int offset = oop_slot*VMRegImpl::stack_slot_size;
-    Label skip;
-    __ movptr(Address(rsp, offset), rOop);
-    map->set_oop(VMRegImpl::stack2reg(oop_slot));
-    __ xorptr(rHandle, rHandle);
-    __ cmpptr(rOop, NULL_WORD);
-    __ jcc(Assembler::equal, skip);
-    __ lea(rHandle, Address(rsp, offset));
-    __ bind(skip);
-    // Store the handle parameter
-    __ movptr(Address(rsp, reg2offset_out(dst.first())), rHandle);
-    if (is_receiver) {
-      *receiver_offset = offset;
-    }
-  }
-}
-
-// A float arg may have to do float reg int reg conversion
-static void float_move(MacroAssembler* masm, VMRegPair src, VMRegPair dst) {
-  assert(!src.second()->is_valid() && !dst.second()->is_valid(), "bad float_move");
-
-  // Because of the calling convention we know that src is either a stack location
-  // or an xmm register. dst can only be a stack location.
-
-  assert(dst.first()->is_stack() && ( src.first()->is_stack() || src.first()->is_XMMRegister()), "bad parameters");
-
-  if (src.first()->is_stack()) {
-    __ movl(rax, Address(rbp, reg2offset_in(src.first())));
-    __ movptr(Address(rsp, reg2offset_out(dst.first())), rax);
-  } else {
-    // reg to stack
-    __ movflt(Address(rsp, reg2offset_out(dst.first())), src.first()->as_XMMRegister());
-  }
-}
-
-// A long move
-static void long_move(MacroAssembler* masm, VMRegPair src, VMRegPair dst) {
-
-  // The only legal possibility for a long_move VMRegPair is:
-  // 1: two stack slots (possibly unaligned)
-  // as neither the java  or C calling convention will use registers
-  // for longs.
-
-  if (src.first()->is_stack() && dst.first()->is_stack()) {
-    assert(src.second()->is_stack() && dst.second()->is_stack(), "must be all stack");
-    __ movptr(rax, Address(rbp, reg2offset_in(src.first())));
-    __ movptr(rbx, Address(rbp, reg2offset_in(src.second())));
-    __ movptr(Address(rsp, reg2offset_out(dst.first())), rax);
-    __ movptr(Address(rsp, reg2offset_out(dst.second())), rbx);
-  } else {
-    ShouldNotReachHere();
-  }
-}
-
-// A double move
-static void double_move(MacroAssembler* masm, VMRegPair src, VMRegPair dst) {
-
-  // The only legal possibilities for a double_move VMRegPair are:
-  // The painful thing here is that like long_move a VMRegPair might be
-
-  // Because of the calling convention we know that src is either
-  //   1: a single physical register (xmm registers only)
-  //   2: two stack slots (possibly unaligned)
-  // dst can only be a pair of stack slots.
-
-  assert(dst.first()->is_stack() && (src.first()->is_XMMRegister() || src.first()->is_stack()), "bad args");
-
-  if (src.first()->is_stack()) {
-    // source is all stack
-    __ movptr(rax, Address(rbp, reg2offset_in(src.first())));
-    __ movptr(rbx, Address(rbp, reg2offset_in(src.second())));
-    __ movptr(Address(rsp, reg2offset_out(dst.first())), rax);
-    __ movptr(Address(rsp, reg2offset_out(dst.second())), rbx);
-  } else {
-    // reg to stack
-    // No worries about stack alignment
-    __ movdbl(Address(rsp, reg2offset_out(dst.first())), src.first()->as_XMMRegister());
-  }
-}
-
-
-void SharedRuntime::save_native_result(MacroAssembler *masm, BasicType ret_type, int frame_slots) {
-  // We always ignore the frame_slots arg and just use the space just below frame pointer
-  // which by this time is free to use
-  switch (ret_type) {
-  case T_FLOAT:
-    __ fstp_s(Address(rbp, -wordSize));
-    break;
-  case T_DOUBLE:
-    __ fstp_d(Address(rbp, -2*wordSize));
-    break;
-  case T_VOID:  break;
-  case T_LONG:
-    __ movptr(Address(rbp, -wordSize), rax);
-    __ movptr(Address(rbp, -2*wordSize), rdx);
-    break;
-  default: {
-    __ movptr(Address(rbp, -wordSize), rax);
-    }
-  }
-}
-
-void SharedRuntime::restore_native_result(MacroAssembler *masm, BasicType ret_type, int frame_slots) {
-  // We always ignore the frame_slots arg and just use the space just below frame pointer
-  // which by this time is free to use
-  switch (ret_type) {
-  case T_FLOAT:
-    __ fld_s(Address(rbp, -wordSize));
-    break;
-  case T_DOUBLE:
-    __ fld_d(Address(rbp, -2*wordSize));
-    break;
-  case T_LONG:
-    __ movptr(rax, Address(rbp, -wordSize));
-    __ movptr(rdx, Address(rbp, -2*wordSize));
-    break;
-  case T_VOID:  break;
-  default: {
-    __ movptr(rax, Address(rbp, -wordSize));
-    }
-  }
-}
-
-static void verify_oop_args(MacroAssembler* masm,
-                            const methodHandle& method,
-                            const BasicType* sig_bt,
-                            const VMRegPair* regs) {
-  Register temp_reg = rbx;  // not part of any compiled calling seq
-  if (VerifyOops) {
-    for (int i = 0; i < method->size_of_parameters(); i++) {
-      if (is_reference_type(sig_bt[i])) {
-        VMReg r = regs[i].first();
-        assert(r->is_valid(), "bad oop arg");
-        if (r->is_stack()) {
-          __ movptr(temp_reg, Address(rsp, r->reg2stack() * VMRegImpl::stack_slot_size + wordSize));
-          __ verify_oop(temp_reg);
-        } else {
-          __ verify_oop(r->as_Register());
-        }
-      }
-    }
-  }
-}
-
-static void gen_special_dispatch(MacroAssembler* masm,
-                                 const methodHandle& method,
-                                 const BasicType* sig_bt,
-                                 const VMRegPair* regs) {
-  verify_oop_args(masm, method, sig_bt, regs);
-  vmIntrinsics::ID iid = method->intrinsic_id();
-
-  // Now write the args into the outgoing interpreter space
-  bool     has_receiver   = false;
-  Register receiver_reg   = noreg;
-  int      member_arg_pos = -1;
-  Register member_reg     = noreg;
-  int      ref_kind       = MethodHandles::signature_polymorphic_intrinsic_ref_kind(iid);
-  if (ref_kind != 0) {
-    member_arg_pos = method->size_of_parameters() - 1;  // trailing MemberName argument
-    member_reg = rbx;  // known to be free at this point
-    has_receiver = MethodHandles::ref_kind_has_receiver(ref_kind);
-  } else if (iid == vmIntrinsics::_invokeBasic) {
-    has_receiver = true;
-  } else {
-    fatal("unexpected intrinsic id %d", vmIntrinsics::as_int(iid));
-  }
-
-  if (member_reg != noreg) {
-    // Load the member_arg into register, if necessary.
-    SharedRuntime::check_member_name_argument_is_last_argument(method, sig_bt, regs);
-    VMReg r = regs[member_arg_pos].first();
-    if (r->is_stack()) {
-      __ movptr(member_reg, Address(rsp, r->reg2stack() * VMRegImpl::stack_slot_size + wordSize));
-    } else {
-      // no data motion is needed
-      member_reg = r->as_Register();
-    }
-  }
-
-  if (has_receiver) {
-    // Make sure the receiver is loaded into a register.
-    assert(method->size_of_parameters() > 0, "oob");
-    assert(sig_bt[0] == T_OBJECT, "receiver argument must be an object");
-    VMReg r = regs[0].first();
-    assert(r->is_valid(), "bad receiver arg");
-    if (r->is_stack()) {
-      // Porting note:  This assumes that compiled calling conventions always
-      // pass the receiver oop in a register.  If this is not true on some
-      // platform, pick a temp and load the receiver from stack.
-      fatal("receiver always in a register");
-      receiver_reg = rcx;  // known to be free at this point
-      __ movptr(receiver_reg, Address(rsp, r->reg2stack() * VMRegImpl::stack_slot_size + wordSize));
-    } else {
-      // no data motion is needed
-      receiver_reg = r->as_Register();
-    }
-  }
-
-  // Figure out which address we are really jumping to:
-  MethodHandles::generate_method_handle_dispatch(masm, iid,
-                                                 receiver_reg, member_reg, /*for_compiler_entry:*/ true);
-}
-
-// ---------------------------------------------------------------------------
-// Generate a native wrapper for a given method.  The method takes arguments
-// in the Java compiled code convention, marshals them to the native
-// convention (handlizes oops, etc), transitions to native, makes the call,
-// returns to java state (possibly blocking), unhandlizes any result and
-// returns.
-//
-// Critical native functions are a shorthand for the use of
-// GetPrimtiveArrayCritical and disallow the use of any other JNI
-// functions.  The wrapper is expected to unpack the arguments before
-// passing them to the callee. Critical native functions leave the state _in_Java,
-// since they cannot stop for GC.
-// Some other parts of JNI setup are skipped like the tear down of the JNI handle
-// block and the check for pending exceptions it's impossible for them
-// to be thrown.
-//
-//
-nmethod* SharedRuntime::generate_native_wrapper(MacroAssembler* masm,
-                                                const methodHandle& method,
-                                                int compile_id,
-                                                BasicType* in_sig_bt,
-                                                VMRegPair* in_regs,
-                                                BasicType ret_type) {
-  if (method->is_method_handle_intrinsic()) {
-    vmIntrinsics::ID iid = method->intrinsic_id();
-    intptr_t start = (intptr_t)__ pc();
-    int vep_offset = ((intptr_t)__ pc()) - start;
-    gen_special_dispatch(masm,
-                         method,
-                         in_sig_bt,
-                         in_regs);
-    int frame_complete = ((intptr_t)__ pc()) - start;  // not complete, period
-    __ flush();
-    int stack_slots = SharedRuntime::out_preserve_stack_slots();  // no out slots at all, actually
-    return nmethod::new_native_nmethod(method,
-                                       compile_id,
-                                       masm->code(),
-                                       vep_offset,
-                                       frame_complete,
-                                       stack_slots / VMRegImpl::slots_per_word,
-                                       in_ByteSize(-1),
-                                       in_ByteSize(-1),
-                                       (OopMapSet*)nullptr);
-  }
-  address native_func = method->native_function();
-  assert(native_func != nullptr, "must have function");
-
-  // An OopMap for lock (and class if static)
-  OopMapSet *oop_maps = new OopMapSet();
-
-  // We have received a description of where all the java arg are located
-  // on entry to the wrapper. We need to convert these args to where
-  // the jni function will expect them. To figure out where they go
-  // we convert the java signature to a C signature by inserting
-  // the hidden arguments as arg[0] and possibly arg[1] (static method)
-
-  const int total_in_args = method->size_of_parameters();
-  int  total_c_args       = total_in_args + (method->is_static() ? 2 : 1);
-
-  BasicType* out_sig_bt = NEW_RESOURCE_ARRAY(BasicType, total_c_args);
-  VMRegPair* out_regs   = NEW_RESOURCE_ARRAY(VMRegPair, total_c_args);
-
-  int argc = 0;
-  out_sig_bt[argc++] = T_ADDRESS;
-  if (method->is_static()) {
-    out_sig_bt[argc++] = T_OBJECT;
-  }
-
-  for (int i = 0; i < total_in_args ; i++ ) {
-    out_sig_bt[argc++] = in_sig_bt[i];
-  }
-
-  // Now figure out where the args must be stored and how much stack space
-  // they require.
-  int out_arg_slots;
-  out_arg_slots = c_calling_convention(out_sig_bt, out_regs, total_c_args);
-
-  // Compute framesize for the wrapper.  We need to handlize all oops in
-  // registers a max of 2 on x86.
-
-  // Calculate the total number of stack slots we will need.
-
-  // First count the abi requirement plus all of the outgoing args
-  int stack_slots = SharedRuntime::out_preserve_stack_slots() + out_arg_slots;
-
-  // Now the space for the inbound oop handle area
-  int total_save_slots = 2 * VMRegImpl::slots_per_word; // 2 arguments passed in registers
-
-  int oop_handle_offset = stack_slots;
-  stack_slots += total_save_slots;
-
-  // Now any space we need for handlizing a klass if static method
-
-  int klass_slot_offset = 0;
-  int klass_offset = -1;
-  int lock_slot_offset = 0;
-  bool is_static = false;
-
-  if (method->is_static()) {
-    klass_slot_offset = stack_slots;
-    stack_slots += VMRegImpl::slots_per_word;
-    klass_offset = klass_slot_offset * VMRegImpl::stack_slot_size;
-    is_static = true;
-  }
-
-  // Plus a lock if needed
-
-  if (method->is_synchronized()) {
-    lock_slot_offset = stack_slots;
-    stack_slots += VMRegImpl::slots_per_word;
-  }
-
-  // Now a place (+2) to save return values or temp during shuffling
-  // + 2 for return address (which we own) and saved rbp,
-  stack_slots += 4;
-
-  // Ok The space we have allocated will look like:
-  //
-  //
-  // FP-> |                     |
-  //      |---------------------|
-  //      | 2 slots for moves   |
-  //      |---------------------|
-  //      | lock box (if sync)  |
-  //      |---------------------| <- lock_slot_offset  (-lock_slot_rbp_offset)
-  //      | klass (if static)   |
-  //      |---------------------| <- klass_slot_offset
-  //      | oopHandle area      |
-  //      |---------------------| <- oop_handle_offset (a max of 2 registers)
-  //      | outbound memory     |
-  //      | based arguments     |
-  //      |                     |
-  //      |---------------------|
-  //      |                     |
-  // SP-> | out_preserved_slots |
-  //
-  //
-  // ****************************************************************************
-  // WARNING - on Windows Java Natives use pascal calling convention and pop the
-  // arguments off of the stack after the jni call. Before the call we can use
-  // instructions that are SP relative. After the jni call we switch to FP
-  // relative instructions instead of re-adjusting the stack on windows.
-  // ****************************************************************************
-
-
-  // Now compute actual number of stack words we need rounding to make
-  // stack properly aligned.
-  stack_slots = align_up(stack_slots, StackAlignmentInSlots);
-
-  int stack_size = stack_slots * VMRegImpl::stack_slot_size;
-
-  intptr_t start = (intptr_t)__ pc();
-
-  // First thing make an ic check to see if we should even be here
-
-  // We are free to use all registers as temps without saving them and
-  // restoring them except rbp. rbp is the only callee save register
-  // as far as the interpreter and the compiler(s) are concerned.
-
-
-  const Register receiver = rcx;
-  Label exception_pending;
-
-  __ verify_oop(receiver);
-  // verified entry must be aligned for code patching.
-  __ ic_check(8 /* end_alignment */);
-
-  int vep_offset = ((intptr_t)__ pc()) - start;
-
-#ifdef COMPILER1
-  // For Object.hashCode, System.identityHashCode try to pull hashCode from object header if available.
-  if ((InlineObjectHash && method->intrinsic_id() == vmIntrinsics::_hashCode) || (method->intrinsic_id() == vmIntrinsics::_identityHashCode)) {
-    inline_check_hashcode_from_object_header(masm, method, rcx /*obj_reg*/, rax /*result*/);
-   }
-#endif // COMPILER1
-
-  // The instruction at the verified entry point must be 5 bytes or longer
-  // because it can be patched on the fly by make_non_entrant. The stack bang
-  // instruction fits that requirement.
-
-  // Generate stack overflow check
-  __ bang_stack_with_offset((int)StackOverflow::stack_shadow_zone_size());
-
-  // Generate a new frame for the wrapper.
-  __ enter();
-  // -2 because return address is already present and so is saved rbp
-  __ subptr(rsp, stack_size - 2*wordSize);
-
-
-  BarrierSetAssembler* bs = BarrierSet::barrier_set()->barrier_set_assembler();
-  bs->nmethod_entry_barrier(masm, nullptr /* slow_path */, nullptr /* continuation */);
-
-  // Frame is now completed as far as size and linkage.
-  int frame_complete = ((intptr_t)__ pc()) - start;
-
-  // Calculate the difference between rsp and rbp,. We need to know it
-  // after the native call because on windows Java Natives will pop
-  // the arguments and it is painful to do rsp relative addressing
-  // in a platform independent way. So after the call we switch to
-  // rbp, relative addressing.
-
-  int fp_adjustment = stack_size - 2*wordSize;
-
-#ifdef COMPILER2
-  // C2 may leave the stack dirty if not in SSE2+ mode
-  if (UseSSE >= 2) {
-    __ verify_FPU(0, "c2i transition should have clean FPU stack");
-  } else {
-    __ empty_FPU_stack();
-  }
-#endif /* COMPILER2 */
-
-  // Compute the rbp, offset for any slots used after the jni call
-
-  int lock_slot_rbp_offset = (lock_slot_offset*VMRegImpl::stack_slot_size) - fp_adjustment;
-
-  // We use rdi as a thread pointer because it is callee save and
-  // if we load it once it is usable thru the entire wrapper
-  const Register thread = rdi;
-
-   // We use rsi as the oop handle for the receiver/klass
-   // It is callee save so it survives the call to native
-
-   const Register oop_handle_reg = rsi;
-
-   __ get_thread(thread);
-
-  //
-  // We immediately shuffle the arguments so that any vm call we have to
-  // make from here on out (sync slow path, jvmti, etc.) we will have
-  // captured the oops from our caller and have a valid oopMap for
-  // them.
-
-  // -----------------
-  // The Grand Shuffle
-  //
-  // Natives require 1 or 2 extra arguments over the normal ones: the JNIEnv*
-  // and, if static, the class mirror instead of a receiver.  This pretty much
-  // guarantees that register layout will not match (and x86 doesn't use reg
-  // parms though amd does).  Since the native abi doesn't use register args
-  // and the java conventions does we don't have to worry about collisions.
-  // All of our moved are reg->stack or stack->stack.
-  // We ignore the extra arguments during the shuffle and handle them at the
-  // last moment. The shuffle is described by the two calling convention
-  // vectors we have in our possession. We simply walk the java vector to
-  // get the source locations and the c vector to get the destinations.
-
-  int c_arg = method->is_static() ? 2 : 1;
-
-  // Record rsp-based slot for receiver on stack for non-static methods
-  int receiver_offset = -1;
-
-  // This is a trick. We double the stack slots so we can claim
-  // the oops in the caller's frame. Since we are sure to have
-  // more args than the caller doubling is enough to make
-  // sure we can capture all the incoming oop args from the
-  // caller.
-  //
-  OopMap* map = new OopMap(stack_slots * 2, 0 /* arg_slots*/);
-
-  // Mark location of rbp,
-  // map->set_callee_saved(VMRegImpl::stack2reg( stack_slots - 2), stack_slots * 2, 0, rbp->as_VMReg());
-
-  // We know that we only have args in at most two integer registers (rcx, rdx). So rax, rbx
-  // Are free to temporaries if we have to do  stack to steck moves.
-  // All inbound args are referenced based on rbp, and all outbound args via rsp.
-
-  for (int i = 0; i < total_in_args ; i++, c_arg++ ) {
-    switch (in_sig_bt[i]) {
-      case T_ARRAY:
-      case T_OBJECT:
-        object_move(masm, map, oop_handle_offset, stack_slots, in_regs[i], out_regs[c_arg],
-                    ((i == 0) && (!is_static)),
-                    &receiver_offset);
-        break;
-      case T_VOID:
-        break;
-
-      case T_FLOAT:
-        float_move(masm, in_regs[i], out_regs[c_arg]);
-          break;
-
-      case T_DOUBLE:
-        assert( i + 1 < total_in_args &&
-                in_sig_bt[i + 1] == T_VOID &&
-                out_sig_bt[c_arg+1] == T_VOID, "bad arg list");
-        double_move(masm, in_regs[i], out_regs[c_arg]);
-        break;
-
-      case T_LONG :
-        long_move(masm, in_regs[i], out_regs[c_arg]);
-        break;
-
-      case T_ADDRESS: assert(false, "found T_ADDRESS in java args");
-
-      default:
-        simple_move32(masm, in_regs[i], out_regs[c_arg]);
-    }
-  }
-
-  // Pre-load a static method's oop into rsi.  Used both by locking code and
-  // the normal JNI call code.
-  if (method->is_static()) {
-
-    //  load opp into a register
-    __ movoop(oop_handle_reg, JNIHandles::make_local(method->method_holder()->java_mirror()));
-
-    // Now handlize the static class mirror it's known not-null.
-    __ movptr(Address(rsp, klass_offset), oop_handle_reg);
-    map->set_oop(VMRegImpl::stack2reg(klass_slot_offset));
-
-    // Now get the handle
-    __ lea(oop_handle_reg, Address(rsp, klass_offset));
-    // store the klass handle as second argument
-    __ movptr(Address(rsp, wordSize), oop_handle_reg);
-  }
-
-  // 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). 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
-
-  intptr_t the_pc = (intptr_t) __ pc();
-  oop_maps->add_gc_map(the_pc - start, map);
-
-  __ set_last_Java_frame(thread, rsp, noreg, (address)the_pc, noreg);
-
-
-  // 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?
-
-  if (DTraceMethodProbes) {
-    __ mov_metadata(rax, method());
-    __ call_VM_leaf(
-         CAST_FROM_FN_PTR(address, SharedRuntime::dtrace_method_entry),
-         thread, rax);
-  }
-
-  // RedefineClasses() tracing support for obsolete method entry
-  if (log_is_enabled(Trace, redefine, class, obsolete)) {
-    __ mov_metadata(rax, method());
-    __ call_VM_leaf(
-         CAST_FROM_FN_PTR(address, SharedRuntime::rc_trace_method_entry),
-         thread, rax);
-  }
-
-  // These are register definitions we need for locking/unlocking
-  const Register swap_reg = rax;  // Must use rax, for cmpxchg instruction
-  const Register obj_reg  = rcx;  // Will contain the oop
-  const Register lock_reg = rdx;  // Address of compiler lock object (BasicLock)
-
-  Label slow_path_lock;
-  Label lock_done;
-
-  // Lock a synchronized method
-  if (method->is_synchronized()) {
-    Label count_mon;
-
-    const int mark_word_offset = BasicLock::displaced_header_offset_in_bytes();
-
-    // Get the handle (the 2nd argument)
-    __ movptr(oop_handle_reg, Address(rsp, wordSize));
-
-    // Get address of the box
-
-    __ lea(lock_reg, Address(rbp, lock_slot_rbp_offset));
-
-    // Load the oop from the handle
-    __ movptr(obj_reg, Address(oop_handle_reg, 0));
-
-    if (LockingMode == LM_MONITOR) {
-      __ jmp(slow_path_lock);
-    } else if (LockingMode == LM_LEGACY) {
-      // Load immediate 1 into swap_reg %rax,
-      __ movptr(swap_reg, 1);
-
-      // Load (object->mark() | 1) into swap_reg %rax,
-      __ orptr(swap_reg, Address(obj_reg, oopDesc::mark_offset_in_bytes()));
-
-      // Save (object->mark() | 1) into BasicLock's displaced header
-      __ movptr(Address(lock_reg, mark_word_offset), swap_reg);
-
-      // src -> dest iff dest == rax, else rax, <- dest
-      // *obj_reg = lock_reg iff *obj_reg == rax, else rax, = *(obj_reg)
-      __ lock();
-      __ cmpxchgptr(lock_reg, Address(obj_reg, oopDesc::mark_offset_in_bytes()));
-      __ jcc(Assembler::equal, count_mon);
-
-      // Test if the oopMark is an obvious stack pointer, i.e.,
-      //  1) (mark & 3) == 0, and
-      //  2) rsp <= mark < mark + os::pagesize()
-      // These 3 tests can be done by evaluating the following
-      // expression: ((mark - rsp) & (3 - os::vm_page_size())),
-      // assuming both stack pointer and pagesize have their
-      // least significant 2 bits clear.
-      // NOTE: the oopMark is in swap_reg %rax, as the result of cmpxchg
-
-      __ subptr(swap_reg, rsp);
-      __ andptr(swap_reg, 3 - (int)os::vm_page_size());
-
-      // 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);
-    } else {
-      assert(LockingMode == LM_LIGHTWEIGHT, "must be");
-      // Lacking registers and thread on x86_32. Always take slow path.
-      __ jmp(slow_path_lock);
-    }
-    __ bind(count_mon);
-    __ inc_held_monitor_count();
-
-    // Slow path will re-enter here
-    __ bind(lock_done);
-  }
-
-
-  // Finally just about ready to make the JNI call
-
-  // get JNIEnv* which is first argument to native
-  __ lea(rdx, Address(thread, in_bytes(JavaThread::jni_environment_offset())));
-  __ movptr(Address(rsp, 0), rdx);
-
-  // Now set thread in native
-  __ movl(Address(thread, JavaThread::thread_state_offset()), _thread_in_native);
-
-  __ call(RuntimeAddress(native_func));
-
-  // Verify or restore cpu control state after JNI call
-  __ restore_cpu_control_state_after_jni(noreg);
-
-  // WARNING - on Windows Java Natives use pascal calling convention and pop the
-  // arguments off of the stack. We could just re-adjust the stack pointer here
-  // and continue to do SP relative addressing but we instead switch to FP
-  // relative addressing.
-
-  // Unpack native results.
-  switch (ret_type) {
-  case T_BOOLEAN: __ c2bool(rax);            break;
-  case T_CHAR   : __ andptr(rax, 0xFFFF);    break;
-  case T_BYTE   : __ sign_extend_byte (rax); break;
-  case T_SHORT  : __ sign_extend_short(rax); break;
-  case T_INT    : /* nothing to do */        break;
-  case T_DOUBLE :
-  case T_FLOAT  :
-    // Result is in st0 we'll save as needed
-    break;
-  case T_ARRAY:                 // Really a handle
-  case T_OBJECT:                // Really a handle
-      break; // can't de-handlize until after safepoint check
-  case T_VOID: break;
-  case T_LONG: break;
-  default       : ShouldNotReachHere();
-  }
-
-  // Switch thread to "native transition" state before reading the synchronization state.
-  // This additional state is necessary because reading and testing the synchronization
-  // state is not atomic w.r.t. GC, as this scenario demonstrates:
-  //     Java thread A, in _thread_in_native state, loads _not_synchronized and is preempted.
-  //     VM thread changes sync state to synchronizing and suspends threads for GC.
-  //     Thread A is resumed to finish this native method, but doesn't block here since it
-  //     didn't see any synchronization is progress, and escapes.
-  __ movl(Address(thread, JavaThread::thread_state_offset()), _thread_in_native_trans);
-
-  // Force this write out before the read below
-  if (!UseSystemMemoryBarrier) {
-    __ membar(Assembler::Membar_mask_bits(
-              Assembler::LoadLoad | Assembler::LoadStore |
-              Assembler::StoreLoad | Assembler::StoreStore));
-  }
-
-  if (AlwaysRestoreFPU) {
-    // Make sure the control word is correct.
-    __ fldcw(ExternalAddress(StubRoutines::x86::addr_fpu_cntrl_wrd_std()));
-  }
-
-  // check for safepoint operation in progress and/or pending suspend requests
-  { Label Continue, slow_path;
-
-    __ safepoint_poll(slow_path, thread, true /* at_return */, false /* in_nmethod */);
-
-    __ cmpl(Address(thread, JavaThread::suspend_flags_offset()), 0);
-    __ jcc(Assembler::equal, Continue);
-    __ bind(slow_path);
-
-    // Don't use call_VM as it will see a possible pending exception and forward it
-    // and never return here preventing us from clearing _last_native_pc down below.
-    // Also can't use call_VM_leaf either as it will check to see if rsi & rdi are
-    // preserved and correspond to the bcp/locals pointers. So we do a runtime call
-    // by hand.
-    //
-    __ vzeroupper();
-
-    save_native_result(masm, ret_type, stack_slots);
-    __ push(thread);
-    __ call(RuntimeAddress(CAST_FROM_FN_PTR(address,
-                                              JavaThread::check_special_condition_for_native_trans)));
-    __ increment(rsp, wordSize);
-    // Restore any method result value
-    restore_native_result(masm, ret_type, stack_slots);
-    __ bind(Continue);
-  }
-
-  // change thread state
-  __ movl(Address(thread, JavaThread::thread_state_offset()), _thread_in_Java);
-
-  Label reguard;
-  Label reguard_done;
-  __ cmpl(Address(thread, JavaThread::stack_guard_state_offset()), StackOverflow::stack_guard_yellow_reserved_disabled);
-  __ jcc(Assembler::equal, reguard);
-
-  // slow path reguard  re-enters here
-  __ bind(reguard_done);
-
-  // Handle possible exception (will unlock if necessary)
-
-  // native result if any is live
-
-  // Unlock
-  Label slow_path_unlock;
-  Label unlock_done;
-  if (method->is_synchronized()) {
-
-    Label fast_done;
-
-    // Get locked oop from the handle we passed to jni
-    __ movptr(obj_reg, Address(oop_handle_reg, 0));
-
-    if (LockingMode == LM_LEGACY) {
-      Label not_recur;
-      // Simple recursive lock?
-      __ cmpptr(Address(rbp, lock_slot_rbp_offset), NULL_WORD);
-      __ jcc(Assembler::notEqual, not_recur);
-      __ dec_held_monitor_count();
-      __ jmpb(fast_done);
-      __ bind(not_recur);
-    }
-
-    // Must save rax, if it is live now because cmpxchg must use it
-    if (ret_type != T_FLOAT && ret_type != T_DOUBLE && ret_type != T_VOID) {
-      save_native_result(masm, ret_type, stack_slots);
-    }
-
-    if (LockingMode == LM_MONITOR) {
-      __ jmp(slow_path_unlock);
-    } else if (LockingMode == LM_LEGACY) {
-      //  get old displaced header
-      __ movptr(rbx, Address(rbp, lock_slot_rbp_offset));
-
-      // get address of the stack lock
-      __ lea(rax, Address(rbp, lock_slot_rbp_offset));
-
-      // Atomic swap old header if oop still contains the stack lock
-      // src -> dest iff dest == rax, else rax, <- dest
-      // *obj_reg = rbx, iff *obj_reg == rax, else rax, = *(obj_reg)
-      __ lock();
-      __ cmpxchgptr(rbx, Address(obj_reg, oopDesc::mark_offset_in_bytes()));
-      __ jcc(Assembler::notEqual, slow_path_unlock);
-      __ dec_held_monitor_count();
-    } else {
-      assert(LockingMode == LM_LIGHTWEIGHT, "must be");
-      __ lightweight_unlock(obj_reg, swap_reg, thread, lock_reg, slow_path_unlock);
-      __ dec_held_monitor_count();
-    }
-
-    // slow path re-enters here
-    __ bind(unlock_done);
-    if (ret_type != T_FLOAT && ret_type != T_DOUBLE && ret_type != T_VOID) {
-      restore_native_result(masm, ret_type, stack_slots);
-    }
-
-    __ bind(fast_done);
-  }
-
-  if (DTraceMethodProbes) {
-    // Tell dtrace about this method exit
-    save_native_result(masm, ret_type, stack_slots);
-    __ mov_metadata(rax, method());
-    __ call_VM_leaf(
-         CAST_FROM_FN_PTR(address, SharedRuntime::dtrace_method_exit),
-         thread, rax);
-    restore_native_result(masm, ret_type, stack_slots);
-  }
-
-  // We can finally stop using that last_Java_frame we setup ages ago
-
-  __ reset_last_Java_frame(thread, false);
-
-  // Unbox oop result, e.g. JNIHandles::resolve value.
-  if (is_reference_type(ret_type)) {
-    __ resolve_jobject(rax /* value */,
-                       thread /* thread */,
-                       rcx /* tmp */);
-  }
-
-  if (CheckJNICalls) {
-    // clear_pending_jni_exception_check
-    __ movptr(Address(thread, JavaThread::pending_jni_exception_check_fn_offset()), NULL_WORD);
-  }
-
-  // reset handle block
-  __ movptr(rcx, Address(thread, JavaThread::active_handles_offset()));
-  __ movl(Address(rcx, JNIHandleBlock::top_offset()), NULL_WORD);
-
-  // Any exception pending?
-  __ cmpptr(Address(thread, in_bytes(Thread::pending_exception_offset())), NULL_WORD);
-  __ jcc(Assembler::notEqual, exception_pending);
-
-  // no exception, we're almost done
-
-  // check that only result value is on FPU stack
-  __ verify_FPU(ret_type == T_FLOAT || ret_type == T_DOUBLE ? 1 : 0, "native_wrapper normal exit");
-
-  // Fixup floating pointer results so that result looks like a return from a compiled method
-  if (ret_type == T_FLOAT) {
-    if (UseSSE >= 1) {
-      // Pop st0 and store as float and reload into xmm register
-      __ fstp_s(Address(rbp, -4));
-      __ movflt(xmm0, Address(rbp, -4));
-    }
-  } else if (ret_type == T_DOUBLE) {
-    if (UseSSE >= 2) {
-      // Pop st0 and store as double and reload into xmm register
-      __ fstp_d(Address(rbp, -8));
-      __ movdbl(xmm0, Address(rbp, -8));
-    }
-  }
-
-  // Return
-
-  __ leave();
-  __ ret(0);
-
-  // Unexpected paths are out of line and go here
-
-  // Slow path locking & unlocking
-  if (method->is_synchronized()) {
-
-    // BEGIN Slow path lock
-
-    __ bind(slow_path_lock);
-
-    // has last_Java_frame setup. No exceptions so do vanilla call not call_VM
-    // args are (oop obj, BasicLock* lock, JavaThread* thread)
-    __ push(thread);
-    __ push(lock_reg);
-    __ push(obj_reg);
-    __ call(RuntimeAddress(CAST_FROM_FN_PTR(address, SharedRuntime::complete_monitor_locking_C)));
-    __ addptr(rsp, 3*wordSize);
-
-#ifdef ASSERT
-    { Label L;
-    __ cmpptr(Address(thread, in_bytes(Thread::pending_exception_offset())), NULL_WORD);
-    __ jcc(Assembler::equal, L);
-    __ stop("no pending exception allowed on exit from monitorenter");
-    __ bind(L);
-    }
-#endif
-    __ jmp(lock_done);
-
-    // END Slow path lock
-
-    // BEGIN Slow path unlock
-    __ bind(slow_path_unlock);
-    __ vzeroupper();
-    // Slow path unlock
-
-    if (ret_type == T_FLOAT || ret_type == T_DOUBLE ) {
-      save_native_result(masm, ret_type, stack_slots);
-    }
-    // Save pending exception around call to VM (which contains an EXCEPTION_MARK)
-
-    __ pushptr(Address(thread, in_bytes(Thread::pending_exception_offset())));
-    __ movptr(Address(thread, in_bytes(Thread::pending_exception_offset())), NULL_WORD);
-
-
-    // should be a peal
-    // +wordSize because of the push above
-    // args are (oop obj, BasicLock* lock, JavaThread* thread)
-    __ push(thread);
-    __ lea(rax, Address(rbp, lock_slot_rbp_offset));
-    __ push(rax);
-
-    __ push(obj_reg);
-    __ call(RuntimeAddress(CAST_FROM_FN_PTR(address, SharedRuntime::complete_monitor_unlocking_C)));
-    __ addptr(rsp, 3*wordSize);
-#ifdef ASSERT
-    {
-      Label L;
-      __ cmpptr(Address(thread, in_bytes(Thread::pending_exception_offset())), NULL_WORD);
-      __ jcc(Assembler::equal, L);
-      __ stop("no pending exception allowed on exit complete_monitor_unlocking_C");
-      __ bind(L);
-    }
-#endif /* ASSERT */
-
-    __ popptr(Address(thread, in_bytes(Thread::pending_exception_offset())));
-
-    if (ret_type == T_FLOAT || ret_type == T_DOUBLE ) {
-      restore_native_result(masm, ret_type, stack_slots);
-    }
-    __ jmp(unlock_done);
-    // END Slow path unlock
-
-  }
-
-  // SLOW PATH Reguard the stack if needed
-
-  __ bind(reguard);
-  __ vzeroupper();
-  save_native_result(masm, ret_type, stack_slots);
-  {
-    __ call(RuntimeAddress(CAST_FROM_FN_PTR(address, SharedRuntime::reguard_yellow_pages)));
-  }
-  restore_native_result(masm, ret_type, stack_slots);
-  __ jmp(reguard_done);
-
-
-  // BEGIN EXCEPTION PROCESSING
-
-  // Forward  the exception
-  __ bind(exception_pending);
-
-  // remove possible return value from FPU register stack
-  __ empty_FPU_stack();
-
-  // pop our frame
-  __ leave();
-  // and forward the exception
-  __ jump(RuntimeAddress(StubRoutines::forward_exception_entry()));
-
-  __ flush();
-
-  nmethod *nm = nmethod::new_native_nmethod(method,
-                                            compile_id,
-                                            masm->code(),
-                                            vep_offset,
-                                            frame_complete,
-                                            stack_slots / VMRegImpl::slots_per_word,
-                                            (is_static ? in_ByteSize(klass_offset) : in_ByteSize(receiver_offset)),
-                                            in_ByteSize(lock_slot_offset*VMRegImpl::stack_slot_size),
-                                            oop_maps);
-
-  return nm;
-
-}
-
-// this function returns the adjust size (in number of words) to a c2i adapter
-// activation for use during deoptimization
-int Deoptimization::last_frame_adjust(int callee_parameters, int callee_locals ) {
-  return (callee_locals - callee_parameters) * Interpreter::stackElementWords;
-}
-
-
-// Number of stack slots between incoming argument block and the start of
-// a new frame.  The PROLOG must add this many slots to the stack.  The
-// EPILOG must remove this many slots.  Intel needs one slot for
-// return address and one for rbp, (must save rbp)
-uint SharedRuntime::in_preserve_stack_slots() {
-  return 2+VerifyStackAtCalls;
-}
-
-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
-  ResourceMark rm;
-  // setup code generation tools
-  // note: the buffer code size must account for StackShadowPages=50
-  const char* name = SharedRuntime::stub_name(SharedStubId::deopt_id);
-  CodeBuffer   buffer(name, 1536, 1024);
-  MacroAssembler* masm = new MacroAssembler(&buffer);
-  int frame_size_in_words;
-  OopMap* map = nullptr;
-  // Account for the extra args we place on the stack
-  // by the time we call fetch_unroll_info
-  const int additional_words = 2; // deopt kind, thread
-
-  OopMapSet *oop_maps = new OopMapSet();
-
-  // -------------
-  // This code enters when returning to a de-optimized nmethod.  A return
-  // address has been pushed on the stack, and return values are in
-  // registers.
-  // If we are doing a normal deopt then we were called from the patched
-  // nmethod from the point we returned to the nmethod. So the return
-  // address on the stack is wrong by NativeCall::instruction_size
-  // We will adjust the value to it looks like we have the original return
-  // address on the stack (like when we eagerly deoptimized).
-  // In the case of an exception pending with deoptimized then we enter
-  // with a return address on the stack that points after the call we patched
-  // into the exception handler. We have the following register state:
-  //    rax,: exception
-  //    rbx,: exception handler
-  //    rdx: throwing pc
-  // So in this case we simply jam rdx into the useless return address and
-  // the stack looks just like we want.
-  //
-  // At this point we need to de-opt.  We save the argument return
-  // registers.  We call the first C routine, fetch_unroll_info().  This
-  // routine captures the return values and returns a structure which
-  // describes the current frame size and the sizes of all replacement frames.
-  // The current frame is compiled code and may contain many inlined
-  // functions, each with their own JVM state.  We pop the current frame, then
-  // push all the new frames.  Then we call the C routine unpack_frames() to
-  // populate these frames.  Finally unpack_frames() returns us the new target
-  // address.  Notice that callee-save registers are BLOWN here; they have
-  // already been captured in the vframeArray at the time the return PC was
-  // patched.
-  address start = __ pc();
-  Label cont;
-
-  // Prolog for non exception case!
-
-  // Save everything in sight.
-
-  map = RegisterSaver::save_live_registers(masm, additional_words, &frame_size_in_words, false);
-  // Normal deoptimization
-  __ push(Deoptimization::Unpack_deopt);
-  __ jmp(cont);
-
-  int reexecute_offset = __ pc() - start;
-
-  // Reexecute case
-  // return address is the pc describes what bci to do re-execute at
-
-  // No need to update map as each call to save_live_registers will produce identical oopmap
-  (void) RegisterSaver::save_live_registers(masm, additional_words, &frame_size_in_words, false);
-
-  __ push(Deoptimization::Unpack_reexecute);
-  __ jmp(cont);
-
-  int exception_offset = __ pc() - start;
-
-  // Prolog for exception case
-
-  // all registers are dead at this entry point, except for rax, and
-  // rdx which contain the exception oop and exception pc
-  // respectively.  Set them in TLS and fall thru to the
-  // unpack_with_exception_in_tls entry point.
-
-  __ get_thread(rdi);
-  __ movptr(Address(rdi, JavaThread::exception_pc_offset()), rdx);
-  __ movptr(Address(rdi, JavaThread::exception_oop_offset()), rax);
-
-  int exception_in_tls_offset = __ pc() - start;
-
-  // new implementation because exception oop is now passed in JavaThread
-
-  // Prolog for exception case
-  // All registers must be preserved because they might be used by LinearScan
-  // Exceptiop oop and throwing PC are passed in JavaThread
-  // tos: stack at point of call to method that threw the exception (i.e. only
-  // args are on the stack, no return address)
-
-  // make room on stack for the return address
-  // It will be patched later with the throwing pc. The correct value is not
-  // available now because loading it from memory would destroy registers.
-  __ push(0);
-
-  // Save everything in sight.
-
-  // No need to update map as each call to save_live_registers will produce identical oopmap
-  (void) RegisterSaver::save_live_registers(masm, additional_words, &frame_size_in_words, false);
-
-  // Now it is safe to overwrite any register
-
-  // store the correct deoptimization type
-  __ push(Deoptimization::Unpack_exception);
-
-  // load throwing pc from JavaThread and patch it as the return address
-  // of the current frame. Then clear the field in JavaThread
-  __ get_thread(rdi);
-  __ movptr(rdx, Address(rdi, JavaThread::exception_pc_offset()));
-  __ movptr(Address(rbp, wordSize), rdx);
-  __ movptr(Address(rdi, JavaThread::exception_pc_offset()), NULL_WORD);
-
-#ifdef ASSERT
-  // verify that there is really an exception oop in JavaThread
-  __ movptr(rax, Address(rdi, JavaThread::exception_oop_offset()));
-  __ verify_oop(rax);
-
-  // verify that there is no pending exception
-  Label no_pending_exception;
-  __ movptr(rax, Address(rdi, Thread::pending_exception_offset()));
-  __ testptr(rax, rax);
-  __ jcc(Assembler::zero, no_pending_exception);
-  __ stop("must not have pending exception here");
-  __ bind(no_pending_exception);
-#endif
-
-  __ bind(cont);
-
-  // Compiled code leaves the floating point stack dirty, empty it.
-  __ empty_FPU_stack();
-
-
-  // Call C code.  Need thread and this frame, but NOT official VM entry
-  // crud.  We cannot block on this call, no GC can happen.
-  __ get_thread(rcx);
-  __ push(rcx);
-  // fetch_unroll_info needs to call last_java_frame()
-  __ set_last_Java_frame(rcx, noreg, noreg, nullptr, noreg);
-
-  __ call(RuntimeAddress(CAST_FROM_FN_PTR(address, Deoptimization::fetch_unroll_info)));
-
-  // Need to have an oopmap that tells fetch_unroll_info where to
-  // find any register it might need.
-
-  oop_maps->add_gc_map( __ pc()-start, map);
-
-  // Discard args to fetch_unroll_info
-  __ pop(rcx);
-  __ pop(rcx);
-
-  __ get_thread(rcx);
-  __ reset_last_Java_frame(rcx, false);
-
-  // Load UnrollBlock into EDI
-  __ mov(rdi, rax);
-
-  // Move the unpack kind to a safe place in the UnrollBlock because
-  // we are very short of registers
-
-  Address unpack_kind(rdi, Deoptimization::UnrollBlock::unpack_kind_offset());
-  // retrieve the deopt kind from the UnrollBlock.
-  __ movl(rax, unpack_kind);
-
-   Label noException;
-  __ cmpl(rax, Deoptimization::Unpack_exception);   // Was exception pending?
-  __ jcc(Assembler::notEqual, noException);
-  __ movptr(rax, Address(rcx, JavaThread::exception_oop_offset()));
-  __ movptr(rdx, Address(rcx, JavaThread::exception_pc_offset()));
-  __ movptr(Address(rcx, JavaThread::exception_oop_offset()), NULL_WORD);
-  __ movptr(Address(rcx, JavaThread::exception_pc_offset()), NULL_WORD);
-
-  __ verify_oop(rax);
-
-  // Overwrite the result registers with the exception results.
-  __ movptr(Address(rsp, RegisterSaver::raxOffset()*wordSize), rax);
-  __ movptr(Address(rsp, RegisterSaver::rdxOffset()*wordSize), rdx);
-
-  __ bind(noException);
-
-  // Stack is back to only having register save data on the stack.
-  // Now restore the result registers. Everything else is either dead or captured
-  // in the vframeArray.
-
-  RegisterSaver::restore_result_registers(masm);
-
-  // Non standard control word may be leaked out through a safepoint blob, and we can
-  // deopt at a poll point with the non standard control word. However, we should make
-  // sure the control word is correct after restore_result_registers.
-  __ fldcw(ExternalAddress(StubRoutines::x86::addr_fpu_cntrl_wrd_std()));
-
-  // All of the register save area has been popped of the stack. Only the
-  // return address remains.
-
-  // Pop all the frames we must move/replace.
-  //
-  // Frame picture (youngest to oldest)
-  // 1: self-frame (no frame link)
-  // 2: deopting frame  (no frame link)
-  // 3: caller of deopting frame (could be compiled/interpreted).
-  //
-  // Note: by leaving the return address of self-frame on the stack
-  // and using the size of frame 2 to adjust the stack
-  // when we are done the return to frame 3 will still be on the stack.
-
-  // Pop deoptimized frame
-  __ addptr(rsp, Address(rdi,Deoptimization::UnrollBlock::size_of_deoptimized_frame_offset()));
-
-  // sp should be pointing at the return address to the caller (3)
-
-  // Pick up the initial fp we should save
-  // restore rbp before stack bang because if stack overflow is thrown it needs to be pushed (and preserved)
-  __ movptr(rbp, Address(rdi, Deoptimization::UnrollBlock::initial_info_offset()));
-
-#ifdef ASSERT
-  // Compilers generate code that bang the stack by as much as the
-  // interpreter would need. So this stack banging should never
-  // trigger a fault. Verify that it does not on non product builds.
-  __ movl(rbx, Address(rdi ,Deoptimization::UnrollBlock::total_frame_sizes_offset()));
-  __ bang_stack_size(rbx, rcx);
-#endif
-
-  // Load array of frame pcs into ECX
-  __ movptr(rcx,Address(rdi,Deoptimization::UnrollBlock::frame_pcs_offset()));
-
-  __ pop(rsi); // trash the old pc
-
-  // Load array of frame sizes into ESI
-  __ movptr(rsi,Address(rdi,Deoptimization::UnrollBlock::frame_sizes_offset()));
-
-  Address counter(rdi, Deoptimization::UnrollBlock::counter_temp_offset());
-
-  __ movl(rbx, Address(rdi, Deoptimization::UnrollBlock::number_of_frames_offset()));
-  __ movl(counter, rbx);
-
-  // Now adjust the caller's stack to make up for the extra locals
-  // but record the original sp so that we can save it in the skeletal interpreter
-  // frame and the stack walking of interpreter_sender will get the unextended sp
-  // value and not the "real" sp value.
-
-  Address sp_temp(rdi, Deoptimization::UnrollBlock::sender_sp_temp_offset());
-  __ movptr(sp_temp, rsp);
-  __ movl2ptr(rbx, Address(rdi, Deoptimization::UnrollBlock::caller_adjustment_offset()));
-  __ subptr(rsp, rbx);
-
-  // Push interpreter frames in a loop
-  Label loop;
-  __ bind(loop);
-  __ movptr(rbx, Address(rsi, 0));      // Load frame size
-  __ subptr(rbx, 2*wordSize);           // we'll push pc and rbp, by hand
-  __ pushptr(Address(rcx, 0));          // save return address
-  __ enter();                           // save old & set new rbp,
-  __ subptr(rsp, rbx);                  // Prolog!
-  __ movptr(rbx, sp_temp);              // sender's sp
-  // This value is corrected by layout_activation_impl
-  __ movptr(Address(rbp, frame::interpreter_frame_last_sp_offset * wordSize), NULL_WORD);
-  __ movptr(Address(rbp, frame::interpreter_frame_sender_sp_offset * wordSize), rbx); // Make it walkable
-  __ movptr(sp_temp, rsp);              // pass to next frame
-  __ addptr(rsi, wordSize);             // Bump array pointer (sizes)
-  __ addptr(rcx, wordSize);             // Bump array pointer (pcs)
-  __ decrementl(counter);             // decrement counter
-  __ jcc(Assembler::notZero, loop);
-  __ pushptr(Address(rcx, 0));          // save final return address
-
-  // Re-push self-frame
-  __ enter();                           // save old & set new rbp,
-
-  //  Return address and rbp, are in place
-  // We'll push additional args later. Just allocate a full sized
-  // register save area
-  __ subptr(rsp, (frame_size_in_words-additional_words - 2) * wordSize);
-
-  // Restore frame locals after moving the frame
-  __ movptr(Address(rsp, RegisterSaver::raxOffset()*wordSize), rax);
-  __ movptr(Address(rsp, RegisterSaver::rdxOffset()*wordSize), rdx);
-  __ fstp_d(Address(rsp, RegisterSaver::fpResultOffset()*wordSize));   // Pop float stack and store in local
-  if( UseSSE>=2 ) __ movdbl(Address(rsp, RegisterSaver::xmm0Offset()*wordSize), xmm0);
-  if( UseSSE==1 ) __ movflt(Address(rsp, RegisterSaver::xmm0Offset()*wordSize), xmm0);
-
-  // Set up the args to unpack_frame
-
-  __ pushl(unpack_kind);                     // get the unpack_kind value
-  __ get_thread(rcx);
-  __ push(rcx);
-
-  // set last_Java_sp, last_Java_fp
-  __ set_last_Java_frame(rcx, noreg, rbp, nullptr, noreg);
-
-  // Call C code.  Need thread but NOT official VM entry
-  // crud.  We cannot block on this call, no GC can happen.  Call should
-  // restore return values to their stack-slots with the new SP.
-  __ call(RuntimeAddress(CAST_FROM_FN_PTR(address, Deoptimization::unpack_frames)));
-  // Set an oopmap for the call site
-  oop_maps->add_gc_map( __ pc()-start, new OopMap( frame_size_in_words, 0 ));
-
-  // rax, contains the return result type
-  __ push(rax);
-
-  __ get_thread(rcx);
-  __ reset_last_Java_frame(rcx, false);
-
-  // Collect return values
-  __ movptr(rax,Address(rsp, (RegisterSaver::raxOffset() + additional_words + 1)*wordSize));
-  __ movptr(rdx,Address(rsp, (RegisterSaver::rdxOffset() + additional_words + 1)*wordSize));
-
-  // Clear floating point stack before returning to interpreter
-  __ empty_FPU_stack();
-
-  // Check if we should push the float or double return value.
-  Label results_done, yes_double_value;
-  __ cmpl(Address(rsp, 0), T_DOUBLE);
-  __ jcc (Assembler::zero, yes_double_value);
-  __ cmpl(Address(rsp, 0), T_FLOAT);
-  __ jcc (Assembler::notZero, results_done);
-
-  // return float value as expected by interpreter
-  if( UseSSE>=1 ) __ movflt(xmm0, Address(rsp, (RegisterSaver::xmm0Offset() + additional_words + 1)*wordSize));
-  else            __ fld_d(Address(rsp, (RegisterSaver::fpResultOffset() + additional_words + 1)*wordSize));
-  __ jmp(results_done);
-
-  // return double value as expected by interpreter
-  __ bind(yes_double_value);
-  if( UseSSE>=2 ) __ movdbl(xmm0, Address(rsp, (RegisterSaver::xmm0Offset() + additional_words + 1)*wordSize));
-  else            __ fld_d(Address(rsp, (RegisterSaver::fpResultOffset() + additional_words + 1)*wordSize));
-
-  __ bind(results_done);
-
-  // Pop self-frame.
-  __ leave();                              // Epilog!
-
-  // Jump to interpreter
-  __ ret(0);
-
-  // -------------
-  // make sure all code is generated
-  masm->flush();
-
-  _deopt_blob = DeoptimizationBlob::create( &buffer, oop_maps, 0, exception_offset, reexecute_offset, frame_size_in_words);
-  _deopt_blob->set_unpack_with_exception_in_tls_offset(exception_in_tls_offset);
-}
-
-//------------------------------generate_handler_blob------
-//
-// Generate a special Compile2Runtime blob that saves all registers,
-// setup oopmap, and calls safepoint code to stop the compiled code for
-// a safepoint.
-//
-SafepointBlob* SharedRuntime::generate_handler_blob(SharedStubId id, address call_ptr) {
-
-  // Account for thread arg in our frame
-  const int additional_words = 1;
-  int frame_size_in_words;
-
-  assert (StubRoutines::forward_exception_entry() != nullptr, "must be generated before");
-  assert(is_polling_page_id(id), "expected a polling page stub id");
-
-  ResourceMark rm;
-  OopMapSet *oop_maps = new OopMapSet();
-  OopMap* map;
-
-  // allocate space for the code
-  // setup code generation tools
-  const char* name = SharedRuntime::stub_name(id);
-  CodeBuffer   buffer(name, 2048, 1024);
-  MacroAssembler* masm = new MacroAssembler(&buffer);
-
-  const Register java_thread = rdi; // callee-saved for VC++
-  address start   = __ pc();
-  address call_pc = nullptr;
-  bool cause_return = (id == SharedStubId::polling_page_return_handler_id);
-  bool save_vectors = (id == SharedStubId::polling_page_vectors_safepoint_handler_id);
-
-  // If cause_return is true we are at a poll_return and there is
-  // the return address on the stack to the caller on the nmethod
-  // that is safepoint. We can leave this return on the stack and
-  // effectively complete the return and safepoint in the caller.
-  // Otherwise we push space for a return address that the safepoint
-  // handler will install later to make the stack walking sensible.
-  if (!cause_return)
-    __ push(rbx);  // Make room for return address (or push it again)
-
-  map = RegisterSaver::save_live_registers(masm, additional_words, &frame_size_in_words, false, save_vectors);
-
-  // The following is basically a call_VM. However, we need the precise
-  // address of the call in order to generate an oopmap. Hence, we do all the
-  // work ourselves.
-
-  // Push thread argument and setup last_Java_sp
-  __ get_thread(java_thread);
-  __ push(java_thread);
-  __ set_last_Java_frame(java_thread, noreg, noreg, nullptr, noreg);
-
-  // if this was not a poll_return then we need to correct the return address now.
-  if (!cause_return) {
-    // Get the return pc saved by the signal handler and stash it in its appropriate place on the stack.
-    // Additionally, rbx is a callee saved register and we can look at it later to determine
-    // if someone changed the return address for us!
-    __ movptr(rbx, Address(java_thread, JavaThread::saved_exception_pc_offset()));
-    __ movptr(Address(rbp, wordSize), rbx);
-  }
-
-  // do the call
-  __ call(RuntimeAddress(call_ptr));
-
-  // Set an oopmap for the call site.  This oopmap will map all
-  // oop-registers and debug-info registers as callee-saved.  This
-  // will allow deoptimization at this safepoint to find all possible
-  // debug-info recordings, as well as let GC find all oops.
-
-  oop_maps->add_gc_map( __ pc() - start, map);
-
-  // Discard arg
-  __ pop(rcx);
-
-  Label noException;
-
-  // Clear last_Java_sp again
-  __ get_thread(java_thread);
-  __ reset_last_Java_frame(java_thread, false);
-
-  __ cmpptr(Address(java_thread, Thread::pending_exception_offset()), NULL_WORD);
-  __ jcc(Assembler::equal, noException);
-
-  // Exception pending
-  RegisterSaver::restore_live_registers(masm, save_vectors);
-
-  __ jump(RuntimeAddress(StubRoutines::forward_exception_entry()));
-
-  __ bind(noException);
-
-  Label no_adjust, bail, not_special;
-  if (!cause_return) {
-    // If our stashed return pc was modified by the runtime we avoid touching it
-    __ cmpptr(rbx, Address(rbp, wordSize));
-    __ jccb(Assembler::notEqual, no_adjust);
-
-    // Skip over the poll instruction.
-    // See NativeInstruction::is_safepoint_poll()
-    // Possible encodings:
-    //      85 00       test   %eax,(%rax)
-    //      85 01       test   %eax,(%rcx)
-    //      85 02       test   %eax,(%rdx)
-    //      85 03       test   %eax,(%rbx)
-    //      85 06       test   %eax,(%rsi)
-    //      85 07       test   %eax,(%rdi)
-    //
-    //      85 04 24    test   %eax,(%rsp)
-    //      85 45 00    test   %eax,0x0(%rbp)
-
-#ifdef ASSERT
-    __ movptr(rax, rbx); // remember where 0x85 should be, for verification below
-#endif
-    // rsp/rbp base encoding takes 3 bytes with the following register values:
-    // rsp 0x04
-    // rbp 0x05
-    __ movzbl(rcx, Address(rbx, 1));
-    __ andptr(rcx, 0x07); // looking for 0x04 .. 0x05
-    __ subptr(rcx, 4);    // looking for 0x00 .. 0x01
-    __ cmpptr(rcx, 1);
-    __ jcc(Assembler::above, not_special);
-    __ addptr(rbx, 1);
-    __ bind(not_special);
-#ifdef ASSERT
-    // Verify the correct encoding of the poll we're about to skip.
-    __ cmpb(Address(rax, 0), NativeTstRegMem::instruction_code_memXregl);
-    __ jcc(Assembler::notEqual, bail);
-    // Mask out the modrm bits
-    __ testb(Address(rax, 1), NativeTstRegMem::modrm_mask);
-    // rax encodes to 0, so if the bits are nonzero it's incorrect
-    __ jcc(Assembler::notZero, bail);
-#endif
-    // Adjust return pc forward to step over the safepoint poll instruction
-    __ addptr(rbx, 2);
-    __ movptr(Address(rbp, wordSize), rbx);
-  }
-
-  __ bind(no_adjust);
-  // Normal exit, register restoring and exit
-  RegisterSaver::restore_live_registers(masm, save_vectors);
-
-  __ ret(0);
-
-#ifdef ASSERT
-  __ bind(bail);
-  __ stop("Attempting to adjust pc to skip safepoint poll but the return point is not what we expected");
-#endif
-
-  // make sure all code is generated
-  masm->flush();
-
-  // Fill-out other meta info
-  return SafepointBlob::create(&buffer, oop_maps, frame_size_in_words);
-}
-
-//
-// generate_resolve_blob - call resolution (static/virtual/opt-virtual/ic-miss
-//
-// Generate a stub that calls into vm to find out the proper destination
-// of a java call. All the argument registers are live at this point
-// but since this is generic code we don't know what they are and the caller
-// must do any gc of the args.
-//
-RuntimeStub* SharedRuntime::generate_resolve_blob(SharedStubId id, address destination) {
-  assert (StubRoutines::forward_exception_entry() != nullptr, "must be generated before");
-  assert(is_resolve_id(id), "expected a resolve stub id");
-
-  // allocate space for the code
-  ResourceMark rm;
-
-  const char* name = SharedRuntime::stub_name(id);
-  CodeBuffer buffer(name, 1000, 512);
-  MacroAssembler* masm                = new MacroAssembler(&buffer);
-
-  int frame_size_words;
-  enum frame_layout {
-                thread_off,
-                extra_words };
-
-  OopMapSet *oop_maps = new OopMapSet();
-  OopMap* map = nullptr;
-
-  int start = __ offset();
-
-  map = RegisterSaver::save_live_registers(masm, extra_words, &frame_size_words);
-
-  int frame_complete = __ offset();
-
-  const Register thread = rdi;
-  __ get_thread(rdi);
-
-  __ push(thread);
-  __ set_last_Java_frame(thread, noreg, rbp, nullptr, noreg);
-
-  __ call(RuntimeAddress(destination));
-
-
-  // Set an oopmap for the call site.
-  // We need this not only for callee-saved registers, but also for volatile
-  // registers that the compiler might be keeping live across a safepoint.
-
-  oop_maps->add_gc_map( __ offset() - start, map);
-
-  // rax, contains the address we are going to jump to assuming no exception got installed
-
-  __ addptr(rsp, wordSize);
-
-  // clear last_Java_sp
-  __ reset_last_Java_frame(thread, true);
-  // check for pending exceptions
-  Label pending;
-  __ cmpptr(Address(thread, Thread::pending_exception_offset()), NULL_WORD);
-  __ jcc(Assembler::notEqual, pending);
-
-  // get the returned Method*
-  __ get_vm_result_2(rbx, thread);
-  __ movptr(Address(rsp, RegisterSaver::rbx_offset() * wordSize), rbx);
-
-  __ movptr(Address(rsp, RegisterSaver::rax_offset() * wordSize), rax);
-
-  RegisterSaver::restore_live_registers(masm);
-
-  // We are back to the original state on entry and ready to go.
-
-  __ jmp(rax);
-
-  // Pending exception after the safepoint
-
-  __ bind(pending);
-
-  RegisterSaver::restore_live_registers(masm);
-
-  // exception pending => remove activation and forward to exception handler
-
-  __ get_thread(thread);
-  __ movptr(Address(thread, JavaThread::vm_result_offset()), NULL_WORD);
-  __ movptr(rax, Address(thread, Thread::pending_exception_offset()));
-  __ jump(RuntimeAddress(StubRoutines::forward_exception_entry()));
-
-  // -------------
-  // make sure all code is generated
-  masm->flush();
-
-  // return the  blob
-  // frame_size_words or bytes??
-  return RuntimeStub::new_runtime_stub(name, &buffer, frame_complete, frame_size_words, oop_maps, true);
-}
-
-  //------------------------------------------------------------------------------------------------------------------------
-  // 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 frame.
-  //
-  // Previously the compiler (c2) allowed for callee save registers on Java calls.
-  // This is no longer true after adapter frames were removed but could possibly
-  // be brought back in the future if the interpreter code was reworked and it
-  // was deemed worthwhile. The comment below was left to describe what must
-  // happen here if callee saves were resurrected. As it stands now this stub
-  // could actually be a vanilla BufferBlob and have now oopMap at all.
-  // Since it doesn't make much difference we've chosen to leave it the
-  // way it was in the callee save days and keep the comment.
-
-  // If we need to preserve callee-saved values we need a callee-saved oop map and
-  // therefore have to make these stubs into RuntimeStubs rather than BufferBlobs.
-  // If the compiler needs all registers to be preserved between the fault
-  // point and the exception handler then it must assume responsibility for that in
-  // AbstractCompiler::continuation_for_implicit_null_exception or
-  // continuation_for_implicit_division_by_zero_exception. All other implicit
-  // exceptions (e.g., NullPointerException or AbstractMethodError on entry) are
-  // either at call sites or otherwise assume that stack unwinding will be initiated,
-  // so caller saved registers were assumed volatile in the compiler.
-RuntimeStub* SharedRuntime::generate_throw_exception(SharedStubId id, address runtime_entry) {
-  assert(is_throw_id(id), "expected a throw stub id");
-
-  const char* name = SharedRuntime::stub_name(id);
-
-  // Information about frame layout at time of blocking runtime call.
-  // Note that we only have to preserve callee-saved registers since
-  // the compilers are responsible for supplying a continuation point
-  // if they expect all registers to be preserved.
-  enum layout {
-    thread_off,    // last_java_sp
-    arg1_off,
-    arg2_off,
-    rbp_off,       // callee saved register
-    ret_pc,
-    framesize
-  };
-
-  int insts_size = 256;
-  int locs_size  = 32;
-
-  ResourceMark rm;
-  const char* timer_msg = "SharedRuntime generate_throw_exception";
-  TraceTime timer(timer_msg, TRACETIME_LOG(Info, startuptime));
-
-  CodeBuffer code(name, insts_size, locs_size);
-  OopMapSet* oop_maps  = new OopMapSet();
-  MacroAssembler* masm = new MacroAssembler(&code);
-
-  address start = __ pc();
-
-  // This is an inlined and slightly modified version of call_VM
-  // which has the ability to fetch the return PC out of
-  // thread-local storage and also sets up last_Java_sp slightly
-  // differently than the real call_VM
-  Register java_thread = rbx;
-  __ get_thread(java_thread);
-
-  __ enter(); // required for proper stackwalking of RuntimeStub frame
-
-  // pc and rbp, already pushed
-  __ subptr(rsp, (framesize-2) * wordSize); // prolog
-
-  // Frame is now completed as far as size and linkage.
-
-  int frame_complete = __ pc() - start;
-
-  // push java thread (becomes first argument of C function)
-  __ movptr(Address(rsp, thread_off * wordSize), java_thread);
-  // Set up last_Java_sp and last_Java_fp
-  __ set_last_Java_frame(java_thread, rsp, rbp, nullptr, noreg);
-
-  // Call runtime
-  BLOCK_COMMENT("call runtime_entry");
-  __ call(RuntimeAddress(runtime_entry));
-  // Generate oop map
-  OopMap* map =  new OopMap(framesize, 0);
-  oop_maps->add_gc_map(__ pc() - start, map);
-
-  // restore the thread (cannot use the pushed argument since arguments
-  // may be overwritten by C code generated by an optimizing compiler);
-  // however can use the register value directly if it is callee saved.
-  __ get_thread(java_thread);
-
-  __ reset_last_Java_frame(java_thread, true);
-
-  __ leave(); // required for proper stackwalking of RuntimeStub frame
-
-  // check for pending exceptions
-#ifdef ASSERT
-  Label L;
-  __ cmpptr(Address(java_thread, Thread::pending_exception_offset()), NULL_WORD);
-  __ jcc(Assembler::notEqual, L);
-  __ should_not_reach_here();
-  __ bind(L);
-#endif /* ASSERT */
-  __ jump(RuntimeAddress(StubRoutines::forward_exception_entry()));
-
-
-  RuntimeStub* stub = RuntimeStub::new_runtime_stub(name, &code, frame_complete, framesize, oop_maps, false);
-  return stub;
-}
-
-#if INCLUDE_JFR
-
-static void jfr_prologue(address the_pc, MacroAssembler* masm) {
-  Register java_thread = rdi;
-  __ get_thread(java_thread);
-  __ set_last_Java_frame(java_thread, rsp, rbp, the_pc, noreg);
-  __ movptr(Address(rsp, 0), java_thread);
-}
-
-// The handle is dereferenced through a load barrier.
-static void jfr_epilogue(MacroAssembler* masm) {
-  Register java_thread = rdi;
-  __ get_thread(java_thread);
-  __ reset_last_Java_frame(java_thread, true);
-}
-
-// For c2: c_rarg0 is junk, call to runtime to write a checkpoint.
-// It returns a jobject handle to the event writer.
-// The handle is dereferenced and the return value is the event writer oop.
-RuntimeStub* SharedRuntime::generate_jfr_write_checkpoint() {
-  enum layout {
-    FPUState_off         = 0,
-    rbp_off              = FPUStateSizeInWords,
-    rdi_off,
-    rsi_off,
-    rcx_off,
-    rbx_off,
-    saved_argument_off,
-    saved_argument_off2, // 2nd half of double
-    framesize
-  };
-
-  int insts_size = 1024;
-  int locs_size = 64;
-  const char* name = SharedRuntime::stub_name(SharedStubId::jfr_write_checkpoint_id);
-  CodeBuffer code(name, insts_size, locs_size);
-  OopMapSet* oop_maps = new OopMapSet();
-  MacroAssembler* masm = new MacroAssembler(&code);
-
-  address start = __ pc();
-  __ enter();
-  int frame_complete = __ pc() - start;
-  address the_pc = __ pc();
-  jfr_prologue(the_pc, masm);
-  __ call_VM_leaf(CAST_FROM_FN_PTR(address, JfrIntrinsicSupport::write_checkpoint), 1);
-  jfr_epilogue(masm);
-  __ resolve_global_jobject(rax, rdi, rdx);
-  __ leave();
-  __ ret(0);
-
-  OopMap* map = new OopMap(framesize, 1); // rbp
-  oop_maps->add_gc_map(the_pc - start, map);
-
-  RuntimeStub* stub = // codeBlob framesize is in words (not VMRegImpl::slot_size)
-    RuntimeStub::new_runtime_stub(name, &code, frame_complete,
-                                  (framesize >> (LogBytesPerWord - LogBytesPerInt)),
-                                  oop_maps, false);
-  return stub;
-}
-
-// For c2: call to return a leased buffer.
-RuntimeStub* SharedRuntime::generate_jfr_return_lease() {
-  enum layout {
-    FPUState_off = 0,
-    rbp_off = FPUStateSizeInWords,
-    rdi_off,
-    rsi_off,
-    rcx_off,
-    rbx_off,
-    saved_argument_off,
-    saved_argument_off2, // 2nd half of double
-    framesize
-  };
-
-  int insts_size = 1024;
-  int locs_size = 64;
-  const char* name = SharedRuntime::stub_name(SharedStubId::jfr_return_lease_id);
-  CodeBuffer code(name, insts_size, locs_size);
-  OopMapSet* oop_maps = new OopMapSet();
-  MacroAssembler* masm = new MacroAssembler(&code);
-
-  address start = __ pc();
-  __ enter();
-  int frame_complete = __ pc() - start;
-  address the_pc = __ pc();
-  jfr_prologue(the_pc, masm);
-  __ call_VM_leaf(CAST_FROM_FN_PTR(address, JfrIntrinsicSupport::return_lease), 1);
-  jfr_epilogue(masm);
-  __ leave();
-  __ ret(0);
-
-  OopMap* map = new OopMap(framesize, 1); // rbp
-  oop_maps->add_gc_map(the_pc - start, map);
-
-  RuntimeStub* stub = // codeBlob framesize is in words (not VMRegImpl::slot_size)
-    RuntimeStub::new_runtime_stub(name, &code, frame_complete,
-                                  (framesize >> (LogBytesPerWord - LogBytesPerInt)),
-                                  oop_maps, false);
-  return stub;
-}
-
-#endif // INCLUDE_JFR
diff --git a/src/hotspot/cpu/x86/stubGenerator_x86_32.cpp b/src/hotspot/cpu/x86/stubGenerator_x86_32.cpp
deleted file mode 100644
index 9ec556777b0..00000000000
--- a/src/hotspot/cpu/x86/stubGenerator_x86_32.cpp
+++ /dev/null
@@ -1,4314 +0,0 @@
-/*
- * Copyright (c) 1999, 2025, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please 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 "asm/macroAssembler.hpp"
-#include "asm/macroAssembler.inline.hpp"
-#include "compiler/oopMap.hpp"
-#include "gc/shared/barrierSet.hpp"
-#include "gc/shared/barrierSetAssembler.hpp"
-#include "gc/shared/barrierSetNMethod.hpp"
-#include "interpreter/interpreter.hpp"
-#include "memory/universe.hpp"
-#include "nativeInst_x86.hpp"
-#include "oops/instanceOop.hpp"
-#include "oops/method.hpp"
-#include "oops/objArrayKlass.hpp"
-#include "oops/oop.inline.hpp"
-#include "prims/methodHandles.hpp"
-#include "runtime/frame.inline.hpp"
-#include "runtime/handles.inline.hpp"
-#include "runtime/javaThread.hpp"
-#include "runtime/sharedRuntime.hpp"
-#include "runtime/stubCodeGenerator.hpp"
-#include "runtime/stubRoutines.hpp"
-#ifdef COMPILER2
-#include "opto/runtime.hpp"
-#endif
-
-// Declaration and definition of StubGenerator (no .hpp file).
-// For a more detailed description of the stub routine structure
-// see the comment in stubRoutines.hpp
-
-#define __ _masm->
-#define a__ ((Assembler*)_masm)->
-
-#ifdef PRODUCT
-#define BLOCK_COMMENT(str) /* nothing */
-#else
-#define BLOCK_COMMENT(str) __ block_comment(str)
-#endif
-
-#define BIND(label) bind(label); BLOCK_COMMENT(#label ":")
-
-const int FPU_CNTRL_WRD_MASK = 0xFFFF;
-
-ATTRIBUTE_ALIGNED(16) static const uint32_t KEY_SHUFFLE_MASK[] = {
-    0x00010203UL, 0x04050607UL, 0x08090A0BUL, 0x0C0D0E0FUL,
-};
-
-ATTRIBUTE_ALIGNED(16) static const uint32_t COUNTER_SHUFFLE_MASK[] = {
-    0x0C0D0E0FUL, 0x08090A0BUL, 0x04050607UL, 0x00010203UL,
-};
-
-ATTRIBUTE_ALIGNED(16) static const uint32_t GHASH_BYTE_SWAP_MASK[] = {
-    0x0C0D0E0FUL, 0x08090A0BUL, 0x04050607UL, 0x00010203UL,
-};
-
-ATTRIBUTE_ALIGNED(16) static const uint32_t GHASH_LONG_SWAP_MASK[] = {
-    0x0B0A0908UL, 0x0F0E0D0CUL, 0x03020100UL, 0x07060504UL,
-};
-
-// -------------------------------------------------------------------------------------------------------------------------
-// Stub Code definitions
-
-class StubGenerator: public StubCodeGenerator {
- private:
-
-#ifdef PRODUCT
-#define inc_counter_np(counter) ((void)0)
-#else
-  void inc_counter_np_(uint& counter) {
-    __ incrementl(ExternalAddress((address)&counter));
-  }
-#define inc_counter_np(counter) \
-  BLOCK_COMMENT("inc_counter " #counter); \
-  inc_counter_np_(counter);
-#endif //PRODUCT
-
-  void inc_copy_counter_np(BasicType t) {
-#ifndef PRODUCT
-    switch (t) {
-    case T_BYTE:    inc_counter_np(SharedRuntime::_jbyte_array_copy_ctr); return;
-    case T_SHORT:   inc_counter_np(SharedRuntime::_jshort_array_copy_ctr); return;
-    case T_INT:     inc_counter_np(SharedRuntime::_jint_array_copy_ctr); return;
-    case T_LONG:    inc_counter_np(SharedRuntime::_jlong_array_copy_ctr); return;
-    case T_OBJECT:  inc_counter_np(SharedRuntime::_oop_array_copy_ctr); return;
-    default:        ShouldNotReachHere();
-    }
-#endif //PRODUCT
-  }
-
-  //------------------------------------------------------------------------------------------------------------------------
-  // Call stubs are used to call Java from C
-  //
-  //    [ return_from_Java     ] <--- rsp
-  //    [ argument word n      ]
-  //      ...
-  // -N [ argument word 1      ]
-  // -7 [ Possible padding for stack alignment ]
-  // -6 [ Possible padding for stack alignment ]
-  // -5 [ Possible padding for stack alignment ]
-  // -4 [ mxcsr save           ] <--- rsp_after_call
-  // -3 [ saved rbx,            ]
-  // -2 [ saved rsi            ]
-  // -1 [ saved rdi            ]
-  //  0 [ saved rbp,            ] <--- rbp,
-  //  1 [ return address       ]
-  //  2 [ ptr. to call wrapper ]
-  //  3 [ result               ]
-  //  4 [ result_type          ]
-  //  5 [ method               ]
-  //  6 [ entry_point          ]
-  //  7 [ parameters           ]
-  //  8 [ parameter_size       ]
-  //  9 [ thread               ]
-
-
-  address generate_call_stub(address& return_address) {
-    StubGenStubId stub_id = StubGenStubId::call_stub_id;
-    StubCodeMark mark(this, stub_id);
-    address start = __ pc();
-
-    // stub code parameters / addresses
-    assert(frame::entry_frame_call_wrapper_offset == 2, "adjust this code");
-    bool  sse_save = false;
-    const Address rsp_after_call(rbp, -4 * wordSize); // same as in generate_catch_exception()!
-    const int     locals_count_in_bytes  (4*wordSize);
-    const Address mxcsr_save    (rbp, -4 * wordSize);
-    const Address saved_rbx     (rbp, -3 * wordSize);
-    const Address saved_rsi     (rbp, -2 * wordSize);
-    const Address saved_rdi     (rbp, -1 * wordSize);
-    const Address result        (rbp,  3 * wordSize);
-    const Address result_type   (rbp,  4 * wordSize);
-    const Address method        (rbp,  5 * wordSize);
-    const Address entry_point   (rbp,  6 * wordSize);
-    const Address parameters    (rbp,  7 * wordSize);
-    const Address parameter_size(rbp,  8 * wordSize);
-    const Address thread        (rbp,  9 * wordSize); // same as in generate_catch_exception()!
-    sse_save =  UseSSE > 0;
-
-    // stub code
-    __ enter();
-    __ movptr(rcx, parameter_size);              // parameter counter
-    __ shlptr(rcx, Interpreter::logStackElementSize); // convert parameter count to bytes
-    __ addptr(rcx, locals_count_in_bytes);       // reserve space for register saves
-    __ subptr(rsp, rcx);
-    __ andptr(rsp, -(StackAlignmentInBytes));    // Align stack
-
-    // save rdi, rsi, & rbx, according to C calling conventions
-    __ movptr(saved_rdi, rdi);
-    __ movptr(saved_rsi, rsi);
-    __ movptr(saved_rbx, rbx);
-
-    // save and initialize %mxcsr
-    if (sse_save) {
-      Label skip_ldmx;
-      __ cmp32_mxcsr_std(mxcsr_save, rax);
-      __ jcc(Assembler::equal, skip_ldmx);
-      __ ldmxcsr(mxcsr_std);
-      __ bind(skip_ldmx);
-    }
-
-    // make sure the control word is correct.
-    __ fldcw(ExternalAddress(StubRoutines::x86::addr_fpu_cntrl_wrd_std()));
-
-#ifdef ASSERT
-    // make sure we have no pending exceptions
-    { Label L;
-      __ movptr(rcx, thread);
-      __ cmpptr(Address(rcx, Thread::pending_exception_offset()), NULL_WORD);
-      __ jcc(Assembler::equal, L);
-      __ stop("StubRoutines::call_stub: entered with pending exception");
-      __ bind(L);
-    }
-#endif
-
-    // pass parameters if any
-    BLOCK_COMMENT("pass parameters if any");
-    Label parameters_done;
-    __ movl(rcx, parameter_size);  // parameter counter
-    __ testl(rcx, rcx);
-    __ jcc(Assembler::zero, parameters_done);
-
-    // parameter passing loop
-
-    Label loop;
-    // Copy Java parameters in reverse order (receiver last)
-    // Note that the argument order is inverted in the process
-    // source is rdx[rcx: N-1..0]
-    // dest   is rsp[rbx: 0..N-1]
-
-    __ movptr(rdx, parameters);          // parameter pointer
-    __ xorptr(rbx, rbx);
-
-    __ BIND(loop);
-
-    // get parameter
-    __ movptr(rax, Address(rdx, rcx, Interpreter::stackElementScale(), -wordSize));
-    __ movptr(Address(rsp, rbx, Interpreter::stackElementScale(),
-                    Interpreter::expr_offset_in_bytes(0)), rax);          // store parameter
-    __ increment(rbx);
-    __ decrement(rcx);
-    __ jcc(Assembler::notZero, loop);
-
-    // call Java function
-    __ BIND(parameters_done);
-    __ movptr(rbx, method);           // get Method*
-    __ movptr(rax, entry_point);      // get entry_point
-    __ mov(rsi, rsp);                 // set sender sp
-    BLOCK_COMMENT("call Java function");
-    __ call(rax);
-
-    BLOCK_COMMENT("call_stub_return_address:");
-    return_address = __ pc();
-
-#ifdef COMPILER2
-    {
-      Label L_skip;
-      if (UseSSE >= 2) {
-        __ verify_FPU(0, "call_stub_return");
-      } else {
-        for (int i = 1; i < 8; i++) {
-          __ ffree(i);
-        }
-
-        // UseSSE <= 1 so double result should be left on TOS
-        __ movl(rsi, result_type);
-        __ cmpl(rsi, T_DOUBLE);
-        __ jcc(Assembler::equal, L_skip);
-        if (UseSSE == 0) {
-          // UseSSE == 0 so float result should be left on TOS
-          __ cmpl(rsi, T_FLOAT);
-          __ jcc(Assembler::equal, L_skip);
-        }
-        __ ffree(0);
-      }
-      __ BIND(L_skip);
-    }
-#endif // COMPILER2
-
-    // store result depending on type
-    // (everything that is not T_LONG, T_FLOAT or T_DOUBLE is treated as T_INT)
-    __ movptr(rdi, result);
-    Label is_long, is_float, is_double, exit;
-    __ movl(rsi, result_type);
-    __ cmpl(rsi, T_LONG);
-    __ jcc(Assembler::equal, is_long);
-    __ cmpl(rsi, T_FLOAT);
-    __ jcc(Assembler::equal, is_float);
-    __ cmpl(rsi, T_DOUBLE);
-    __ jcc(Assembler::equal, is_double);
-
-    // handle T_INT case
-    __ movl(Address(rdi, 0), rax);
-    __ BIND(exit);
-
-    // check that FPU stack is empty
-    __ verify_FPU(0, "generate_call_stub");
-
-    // pop parameters
-    __ lea(rsp, rsp_after_call);
-
-    // restore %mxcsr
-    if (sse_save) {
-      __ ldmxcsr(mxcsr_save);
-    }
-
-    // restore rdi, rsi and rbx,
-    __ movptr(rbx, saved_rbx);
-    __ movptr(rsi, saved_rsi);
-    __ movptr(rdi, saved_rdi);
-    __ addptr(rsp, 4*wordSize);
-
-    // return
-    __ pop(rbp);
-    __ ret(0);
-
-    // handle return types different from T_INT
-    __ BIND(is_long);
-    __ movl(Address(rdi, 0 * wordSize), rax);
-    __ movl(Address(rdi, 1 * wordSize), rdx);
-    __ jmp(exit);
-
-    __ BIND(is_float);
-    // interpreter uses xmm0 for return values
-    if (UseSSE >= 1) {
-      __ movflt(Address(rdi, 0), xmm0);
-    } else {
-      __ fstp_s(Address(rdi, 0));
-    }
-    __ jmp(exit);
-
-    __ BIND(is_double);
-    // interpreter uses xmm0 for return values
-    if (UseSSE >= 2) {
-      __ movdbl(Address(rdi, 0), xmm0);
-    } else {
-      __ fstp_d(Address(rdi, 0));
-    }
-    __ jmp(exit);
-
-    return start;
-  }
-
-
-  //------------------------------------------------------------------------------------------------------------------------
-  // Return point for a Java call if there's an exception thrown in Java code.
-  // The exception is caught and transformed into a pending exception stored in
-  // JavaThread that can be tested from within the VM.
-  //
-  // Note: Usually the parameters are removed by the callee. In case of an exception
-  //       crossing an activation frame boundary, that is not the case if the callee
-  //       is compiled code => need to setup the rsp.
-  //
-  // rax,: exception oop
-
-  address generate_catch_exception() {
-    StubGenStubId stub_id = StubGenStubId::catch_exception_id;
-    StubCodeMark mark(this, stub_id);
-    const Address rsp_after_call(rbp, -4 * wordSize); // same as in generate_call_stub()!
-    const Address thread        (rbp,  9 * wordSize); // same as in generate_call_stub()!
-    address start = __ pc();
-
-    // get thread directly
-    __ movptr(rcx, thread);
-#ifdef ASSERT
-    // verify that threads correspond
-    { Label L;
-      __ get_thread(rbx);
-      __ cmpptr(rbx, rcx);
-      __ jcc(Assembler::equal, L);
-      __ stop("StubRoutines::catch_exception: threads must correspond");
-      __ bind(L);
-    }
-#endif
-    // set pending exception
-    __ verify_oop(rax);
-    __ movptr(Address(rcx, Thread::pending_exception_offset()), rax);
-    __ lea(Address(rcx, Thread::exception_file_offset()),
-           ExternalAddress((address)__FILE__), noreg);
-    __ movl(Address(rcx, Thread::exception_line_offset()), __LINE__ );
-    // complete return to VM
-    assert(StubRoutines::_call_stub_return_address != nullptr, "_call_stub_return_address must have been generated before");
-    __ jump(RuntimeAddress(StubRoutines::_call_stub_return_address));
-
-    return start;
-  }
-
-
-  //------------------------------------------------------------------------------------------------------------------------
-  // Continuation point for runtime calls returning with a pending exception.
-  // The pending exception check happened in the runtime or native call stub.
-  // The pending exception in Thread is converted into a Java-level exception.
-  //
-  // Contract with Java-level exception handlers:
-  // rax: exception
-  // rdx: throwing pc
-  //
-  // NOTE: At entry of this stub, exception-pc must be on stack !!
-
-  address generate_forward_exception() {
-    StubGenStubId stub_id = StubGenStubId::forward_exception_id;
-    StubCodeMark mark(this, stub_id);
-    address start = __ pc();
-    const Register thread = rcx;
-
-    // other registers used in this stub
-    const Register exception_oop = rax;
-    const Register handler_addr  = rbx;
-    const Register exception_pc  = rdx;
-
-    // Upon entry, the sp points to the return address returning into Java
-    // (interpreted or compiled) code; i.e., the return address becomes the
-    // throwing pc.
-    //
-    // Arguments pushed before the runtime call are still on the stack but
-    // the exception handler will reset the stack pointer -> ignore them.
-    // A potential result in registers can be ignored as well.
-
-#ifdef ASSERT
-    // make sure this code is only executed if there is a pending exception
-    { Label L;
-      __ get_thread(thread);
-      __ cmpptr(Address(thread, Thread::pending_exception_offset()), NULL_WORD);
-      __ jcc(Assembler::notEqual, L);
-      __ stop("StubRoutines::forward exception: no pending exception (1)");
-      __ bind(L);
-    }
-#endif
-
-    // compute exception handler into rbx,
-    __ get_thread(thread);
-    __ movptr(exception_pc, Address(rsp, 0));
-    BLOCK_COMMENT("call exception_handler_for_return_address");
-    __ call_VM_leaf(CAST_FROM_FN_PTR(address, SharedRuntime::exception_handler_for_return_address), thread, exception_pc);
-    __ mov(handler_addr, rax);
-
-    // setup rax & rdx, remove return address & clear pending exception
-    __ get_thread(thread);
-    __ pop(exception_pc);
-    __ movptr(exception_oop, Address(thread, Thread::pending_exception_offset()));
-    __ movptr(Address(thread, Thread::pending_exception_offset()), NULL_WORD);
-
-#ifdef ASSERT
-    // make sure exception is set
-    { Label L;
-      __ testptr(exception_oop, exception_oop);
-      __ jcc(Assembler::notEqual, L);
-      __ stop("StubRoutines::forward exception: no pending exception (2)");
-      __ bind(L);
-    }
-#endif
-
-    // Verify that there is really a valid exception in RAX.
-    __ verify_oop(exception_oop);
-
-    // continue at exception handler (return address removed)
-    // rax: exception
-    // rbx: exception handler
-    // rdx: throwing pc
-    __ jmp(handler_addr);
-
-    return start;
-  }
-
-  //----------------------------------------------------------------------------------------------------
-  // Support for void verify_mxcsr()
-  //
-  // This routine is used with -Xcheck:jni to verify that native
-  // JNI code does not return to Java code without restoring the
-  // MXCSR register to our expected state.
-
-
-  address generate_verify_mxcsr() {
-    StubGenStubId stub_id = StubGenStubId::verify_mxcsr_id;
-    StubCodeMark mark(this, stub_id);
-    address start = __ pc();
-
-    const Address mxcsr_save(rsp, 0);
-
-    if (CheckJNICalls && UseSSE > 0 ) {
-      Label ok_ret;
-      __ push(rax);
-      __ subptr(rsp, wordSize);      // allocate a temp location
-      __ cmp32_mxcsr_std(mxcsr_save, rax);
-      __ jcc(Assembler::equal, ok_ret);
-
-      __ warn("MXCSR changed by native JNI code.");
-
-      ExternalAddress mxcsr_std(StubRoutines::x86::addr_mxcsr_std());
-      __ ldmxcsr(mxcsr_std);
-
-      __ bind(ok_ret);
-      __ addptr(rsp, wordSize);
-      __ pop(rax);
-    }
-
-    __ ret(0);
-
-    return start;
-  }
-
-
-  //---------------------------------------------------------------------------
-  // Support for void verify_fpu_cntrl_wrd()
-  //
-  // This routine is used with -Xcheck:jni to verify that native
-  // JNI code does not return to Java code without restoring the
-  // FP control word to our expected state.
-
-  address generate_verify_fpu_cntrl_wrd() {
-    StubGenStubId stub_id = StubGenStubId::verify_fpu_cntrl_word_id;
-    StubCodeMark mark(this, stub_id);
-    address start = __ pc();
-
-    const Address fpu_cntrl_wrd_save(rsp, 0);
-
-    if (CheckJNICalls) {
-      Label ok_ret;
-      __ push(rax);
-      __ subptr(rsp, wordSize);      // allocate a temp location
-      __ fnstcw(fpu_cntrl_wrd_save);
-      __ movl(rax, fpu_cntrl_wrd_save);
-      __ andl(rax, FPU_CNTRL_WRD_MASK);
-      ExternalAddress fpu_std(StubRoutines::x86::addr_fpu_cntrl_wrd_std());
-      __ cmp32(rax, fpu_std);
-      __ jcc(Assembler::equal, ok_ret);
-
-      __ warn("Floating point control word changed by native JNI code.");
-
-      __ fldcw(fpu_std);
-
-      __ bind(ok_ret);
-      __ addptr(rsp, wordSize);
-      __ pop(rax);
-    }
-
-    __ ret(0);
-
-    return start;
-  }
-
-  //---------------------------------------------------------------------------
-  // Wrapper for slow-case handling of double-to-integer conversion
-  // d2i or f2i fast case failed either because it is nan or because
-  // of under/overflow.
-  // Input:  FPU TOS: float value
-  // Output: rax, (rdx): integer (long) result
-
-  address generate_d2i_wrapper(BasicType t, address fcn) {
-    StubGenStubId stub_id = StubGenStubId::d2i_wrapper_id;
-    StubCodeMark mark(this, stub_id);
-    address start = __ pc();
-
-  // Capture info about frame layout
-  enum layout { FPUState_off         = 0,
-                rbp_off              = FPUStateSizeInWords,
-                rdi_off,
-                rsi_off,
-                rcx_off,
-                rbx_off,
-                saved_argument_off,
-                saved_argument_off2, // 2nd half of double
-                framesize
-  };
-
-  assert(FPUStateSizeInWords == 27, "update stack layout");
-
-    // Save outgoing argument to stack across push_FPU_state()
-    __ subptr(rsp, wordSize * 2);
-    __ fstp_d(Address(rsp, 0));
-
-    // Save CPU & FPU state
-    __ push(rbx);
-    __ push(rcx);
-    __ push(rsi);
-    __ push(rdi);
-    __ push(rbp);
-    __ push_FPU_state();
-
-    // push_FPU_state() resets the FP top of stack
-    // Load original double into FP top of stack
-    __ fld_d(Address(rsp, saved_argument_off * wordSize));
-    // Store double into stack as outgoing argument
-    __ subptr(rsp, wordSize*2);
-    __ fst_d(Address(rsp, 0));
-
-    // Prepare FPU for doing math in C-land
-    __ empty_FPU_stack();
-    // Call the C code to massage the double.  Result in EAX
-    if (t == T_INT)
-      { BLOCK_COMMENT("SharedRuntime::d2i"); }
-    else if (t == T_LONG)
-      { BLOCK_COMMENT("SharedRuntime::d2l"); }
-    __ call_VM_leaf( fcn, 2 );
-
-    // Restore CPU & FPU state
-    __ pop_FPU_state();
-    __ pop(rbp);
-    __ pop(rdi);
-    __ pop(rsi);
-    __ pop(rcx);
-    __ pop(rbx);
-    __ addptr(rsp, wordSize * 2);
-
-    __ ret(0);
-
-    return start;
-  }
-  //---------------------------------------------------------------------------------------------------
-
-  address generate_vector_mask(StubGenStubId stub_id, int32_t mask) {
-    __ align(CodeEntryAlignment);
-    StubCodeMark mark(this, stub_id);
-    address start = __ pc();
-
-    for (int i = 0; i < 16; i++) {
-      __ emit_data(mask, relocInfo::none, 0);
-    }
-
-    return start;
-  }
-
-  address generate_count_leading_zeros_lut() {
-    __ align64();
-    StubGenStubId stub_id = StubGenStubId::vector_count_leading_zeros_lut_id;
-    StubCodeMark mark(this, stub_id);
-    address start = __ pc();
-    __ emit_data(0x02020304, relocInfo::none, 0);
-    __ emit_data(0x01010101, relocInfo::none, 0);
-    __ emit_data(0x00000000, relocInfo::none, 0);
-    __ emit_data(0x00000000, relocInfo::none, 0);
-    __ emit_data(0x02020304, relocInfo::none, 0);
-    __ emit_data(0x01010101, relocInfo::none, 0);
-    __ emit_data(0x00000000, relocInfo::none, 0);
-    __ emit_data(0x00000000, relocInfo::none, 0);
-    __ emit_data(0x02020304, relocInfo::none, 0);
-    __ emit_data(0x01010101, relocInfo::none, 0);
-    __ emit_data(0x00000000, relocInfo::none, 0);
-    __ emit_data(0x00000000, relocInfo::none, 0);
-    __ emit_data(0x02020304, relocInfo::none, 0);
-    __ emit_data(0x01010101, relocInfo::none, 0);
-    __ emit_data(0x00000000, relocInfo::none, 0);
-    __ emit_data(0x00000000, relocInfo::none, 0);
-    return start;
-  }
-
-
-  address generate_popcount_avx_lut() {
-    __ align64();
-    StubGenStubId stub_id = StubGenStubId::vector_popcount_lut_id;
-    StubCodeMark mark(this, stub_id);
-    address start = __ pc();
-    __ emit_data(0x02010100, relocInfo::none, 0);
-    __ emit_data(0x03020201, relocInfo::none, 0);
-    __ emit_data(0x03020201, relocInfo::none, 0);
-    __ emit_data(0x04030302, relocInfo::none, 0);
-    __ emit_data(0x02010100, relocInfo::none, 0);
-    __ emit_data(0x03020201, relocInfo::none, 0);
-    __ emit_data(0x03020201, relocInfo::none, 0);
-    __ emit_data(0x04030302, relocInfo::none, 0);
-    __ emit_data(0x02010100, relocInfo::none, 0);
-    __ emit_data(0x03020201, relocInfo::none, 0);
-    __ emit_data(0x03020201, relocInfo::none, 0);
-    __ emit_data(0x04030302, relocInfo::none, 0);
-    __ emit_data(0x02010100, relocInfo::none, 0);
-    __ emit_data(0x03020201, relocInfo::none, 0);
-    __ emit_data(0x03020201, relocInfo::none, 0);
-    __ emit_data(0x04030302, relocInfo::none, 0);
-    return start;
-  }
-
-
-  address generate_iota_indices() {
-    __ align(CodeEntryAlignment);
-    StubGenStubId stub_id = StubGenStubId::vector_iota_indices_id;
-    StubCodeMark mark(this, stub_id);
-    address start = __ pc();
-    // B
-    __ emit_data(0x03020100, relocInfo::none, 0);
-    __ emit_data(0x07060504, relocInfo::none, 0);
-    __ emit_data(0x0B0A0908, relocInfo::none, 0);
-    __ emit_data(0x0F0E0D0C, relocInfo::none, 0);
-    __ emit_data(0x13121110, relocInfo::none, 0);
-    __ emit_data(0x17161514, relocInfo::none, 0);
-    __ emit_data(0x1B1A1918, relocInfo::none, 0);
-    __ emit_data(0x1F1E1D1C, relocInfo::none, 0);
-    __ emit_data(0x23222120, relocInfo::none, 0);
-    __ emit_data(0x27262524, relocInfo::none, 0);
-    __ emit_data(0x2B2A2928, relocInfo::none, 0);
-    __ emit_data(0x2F2E2D2C, relocInfo::none, 0);
-    __ emit_data(0x33323130, relocInfo::none, 0);
-    __ emit_data(0x37363534, relocInfo::none, 0);
-    __ emit_data(0x3B3A3938, relocInfo::none, 0);
-    __ emit_data(0x3F3E3D3C, relocInfo::none, 0);
-
-    // W
-    __ emit_data(0x00010000, relocInfo::none, 0);
-    __ emit_data(0x00030002, relocInfo::none, 0);
-    __ emit_data(0x00050004, relocInfo::none, 0);
-    __ emit_data(0x00070006, relocInfo::none, 0);
-    __ emit_data(0x00090008, relocInfo::none, 0);
-    __ emit_data(0x000B000A, relocInfo::none, 0);
-    __ emit_data(0x000D000C, relocInfo::none, 0);
-    __ emit_data(0x000F000E, relocInfo::none, 0);
-    __ emit_data(0x00110010, relocInfo::none, 0);
-    __ emit_data(0x00130012, relocInfo::none, 0);
-    __ emit_data(0x00150014, relocInfo::none, 0);
-    __ emit_data(0x00170016, relocInfo::none, 0);
-    __ emit_data(0x00190018, relocInfo::none, 0);
-    __ emit_data(0x001B001A, relocInfo::none, 0);
-    __ emit_data(0x001D001C, relocInfo::none, 0);
-    __ emit_data(0x001F001E, relocInfo::none, 0);
-
-    // D
-    __ emit_data(0x00000000, relocInfo::none, 0);
-    __ emit_data(0x00000001, relocInfo::none, 0);
-    __ emit_data(0x00000002, relocInfo::none, 0);
-    __ emit_data(0x00000003, relocInfo::none, 0);
-    __ emit_data(0x00000004, relocInfo::none, 0);
-    __ emit_data(0x00000005, relocInfo::none, 0);
-    __ emit_data(0x00000006, relocInfo::none, 0);
-    __ emit_data(0x00000007, relocInfo::none, 0);
-    __ emit_data(0x00000008, relocInfo::none, 0);
-    __ emit_data(0x00000009, relocInfo::none, 0);
-    __ emit_data(0x0000000A, relocInfo::none, 0);
-    __ emit_data(0x0000000B, relocInfo::none, 0);
-    __ emit_data(0x0000000C, relocInfo::none, 0);
-    __ emit_data(0x0000000D, relocInfo::none, 0);
-    __ emit_data(0x0000000E, relocInfo::none, 0);
-    __ emit_data(0x0000000F, relocInfo::none, 0);
-
-    // Q
-    __ emit_data(0x00000000, relocInfo::none, 0);
-    __ emit_data(0x00000000, relocInfo::none, 0);
-    __ emit_data(0x00000001, relocInfo::none, 0);
-    __ emit_data(0x00000000, relocInfo::none, 0);
-    __ emit_data(0x00000002, relocInfo::none, 0);
-    __ emit_data(0x00000000, relocInfo::none, 0);
-    __ emit_data(0x00000003, relocInfo::none, 0);
-    __ emit_data(0x00000000, relocInfo::none, 0);
-    __ emit_data(0x00000004, relocInfo::none, 0);
-    __ emit_data(0x00000000, relocInfo::none, 0);
-    __ emit_data(0x00000005, relocInfo::none, 0);
-    __ emit_data(0x00000000, relocInfo::none, 0);
-    __ emit_data(0x00000006, relocInfo::none, 0);
-    __ emit_data(0x00000000, relocInfo::none, 0);
-    __ emit_data(0x00000007, relocInfo::none, 0);
-    __ emit_data(0x00000000, relocInfo::none, 0);
-
-    // D - FP
-    __ emit_data(0x00000000, relocInfo::none, 0); // 0.0f
-    __ emit_data(0x3F800000, relocInfo::none, 0); // 1.0f
-    __ emit_data(0x40000000, relocInfo::none, 0); // 2.0f
-    __ emit_data(0x40400000, relocInfo::none, 0); // 3.0f
-    __ emit_data(0x40800000, relocInfo::none, 0); // 4.0f
-    __ emit_data(0x40A00000, relocInfo::none, 0); // 5.0f
-    __ emit_data(0x40C00000, relocInfo::none, 0); // 6.0f
-    __ emit_data(0x40E00000, relocInfo::none, 0); // 7.0f
-    __ emit_data(0x41000000, relocInfo::none, 0); // 8.0f
-    __ emit_data(0x41100000, relocInfo::none, 0); // 9.0f
-    __ emit_data(0x41200000, relocInfo::none, 0); // 10.0f
-    __ emit_data(0x41300000, relocInfo::none, 0); // 11.0f
-    __ emit_data(0x41400000, relocInfo::none, 0); // 12.0f
-    __ emit_data(0x41500000, relocInfo::none, 0); // 13.0f
-    __ emit_data(0x41600000, relocInfo::none, 0); // 14.0f
-    __ emit_data(0x41700000, relocInfo::none, 0); // 15.0f
-
-    // Q - FP
-    __ emit_data(0x00000000, relocInfo::none, 0); // 0.0d
-    __ emit_data(0x00000000, relocInfo::none, 0);
-    __ emit_data(0x00000000, relocInfo::none, 0); // 1.0d
-    __ emit_data(0x3FF00000, relocInfo::none, 0);
-    __ emit_data(0x00000000, relocInfo::none, 0); // 2.0d
-    __ emit_data(0x40000000, relocInfo::none, 0);
-    __ emit_data(0x00000000, relocInfo::none, 0); // 3.0d
-    __ emit_data(0x40080000, relocInfo::none, 0);
-    __ emit_data(0x00000000, relocInfo::none, 0); // 4.0d
-    __ emit_data(0x40100000, relocInfo::none, 0);
-    __ emit_data(0x00000000, relocInfo::none, 0); // 5.0d
-    __ emit_data(0x40140000, relocInfo::none, 0);
-    __ emit_data(0x00000000, relocInfo::none, 0); // 6.0d
-    __ emit_data(0x40180000, relocInfo::none, 0);
-    __ emit_data(0x00000000, relocInfo::none, 0); // 7.0d
-    __ emit_data(0x401c0000, relocInfo::none, 0);
-    return start;
-  }
-
-  address generate_vector_reverse_bit_lut() {
-    __ align(CodeEntryAlignment);
-    StubGenStubId stub_id = StubGenStubId::vector_reverse_bit_lut_id;
-    StubCodeMark mark(this, stub_id);
-    address start = __ pc();
-    __ emit_data(0x0C040800, relocInfo::none, 0);
-    __ emit_data(0x0E060A02, relocInfo::none, 0);
-    __ emit_data(0x0D050901, relocInfo::none, 0);
-    __ emit_data(0x0F070B03, relocInfo::none, 0);
-    __ emit_data(0x0C040800, relocInfo::none, 0);
-    __ emit_data(0x0E060A02, relocInfo::none, 0);
-    __ emit_data(0x0D050901, relocInfo::none, 0);
-    __ emit_data(0x0F070B03, relocInfo::none, 0);
-    __ emit_data(0x0C040800, relocInfo::none, 0);
-    __ emit_data(0x0E060A02, relocInfo::none, 0);
-    __ emit_data(0x0D050901, relocInfo::none, 0);
-    __ emit_data(0x0F070B03, relocInfo::none, 0);
-    __ emit_data(0x0C040800, relocInfo::none, 0);
-    __ emit_data(0x0E060A02, relocInfo::none, 0);
-    __ emit_data(0x0D050901, relocInfo::none, 0);
-    __ emit_data(0x0F070B03, relocInfo::none, 0);
-    return start;
-  }
-
-  address generate_vector_reverse_byte_perm_mask_long() {
-    __ align(CodeEntryAlignment);
-    StubGenStubId stub_id = StubGenStubId::vector_reverse_byte_perm_mask_long_id;
-    StubCodeMark mark(this, stub_id);
-    address start = __ pc();
-    __ emit_data(0x04050607, relocInfo::none, 0);
-    __ emit_data(0x00010203, relocInfo::none, 0);
-    __ emit_data(0x0C0D0E0F, relocInfo::none, 0);
-    __ emit_data(0x08090A0B, relocInfo::none, 0);
-    __ emit_data(0x04050607, relocInfo::none, 0);
-    __ emit_data(0x00010203, relocInfo::none, 0);
-    __ emit_data(0x0C0D0E0F, relocInfo::none, 0);
-    __ emit_data(0x08090A0B, relocInfo::none, 0);
-    __ emit_data(0x04050607, relocInfo::none, 0);
-    __ emit_data(0x00010203, relocInfo::none, 0);
-    __ emit_data(0x0C0D0E0F, relocInfo::none, 0);
-    __ emit_data(0x08090A0B, relocInfo::none, 0);
-    __ emit_data(0x04050607, relocInfo::none, 0);
-    __ emit_data(0x00010203, relocInfo::none, 0);
-    __ emit_data(0x0C0D0E0F, relocInfo::none, 0);
-    __ emit_data(0x08090A0B, relocInfo::none, 0);
-    return start;
-  }
-
-  address generate_vector_reverse_byte_perm_mask_int() {
-    __ align(CodeEntryAlignment);
-    StubGenStubId stub_id = StubGenStubId::vector_reverse_byte_perm_mask_int_id;
-    StubCodeMark mark(this, stub_id);
-    address start = __ pc();
-    __ emit_data(0x00010203, relocInfo::none, 0);
-    __ emit_data(0x04050607, relocInfo::none, 0);
-    __ emit_data(0x08090A0B, relocInfo::none, 0);
-    __ emit_data(0x0C0D0E0F, relocInfo::none, 0);
-    __ emit_data(0x00010203, relocInfo::none, 0);
-    __ emit_data(0x04050607, relocInfo::none, 0);
-    __ emit_data(0x08090A0B, relocInfo::none, 0);
-    __ emit_data(0x0C0D0E0F, relocInfo::none, 0);
-    __ emit_data(0x00010203, relocInfo::none, 0);
-    __ emit_data(0x04050607, relocInfo::none, 0);
-    __ emit_data(0x08090A0B, relocInfo::none, 0);
-    __ emit_data(0x0C0D0E0F, relocInfo::none, 0);
-    __ emit_data(0x00010203, relocInfo::none, 0);
-    __ emit_data(0x04050607, relocInfo::none, 0);
-    __ emit_data(0x08090A0B, relocInfo::none, 0);
-    __ emit_data(0x0C0D0E0F, relocInfo::none, 0);
-    return start;
-  }
-
-  address generate_vector_reverse_byte_perm_mask_short() {
-    __ align(CodeEntryAlignment);
-    StubGenStubId stub_id = StubGenStubId::vector_reverse_byte_perm_mask_short_id;
-    StubCodeMark mark(this, stub_id);
-    address start = __ pc();
-    __ emit_data(0x02030001, relocInfo::none, 0);
-    __ emit_data(0x06070405, relocInfo::none, 0);
-    __ emit_data(0x0A0B0809, relocInfo::none, 0);
-    __ emit_data(0x0E0F0C0D, relocInfo::none, 0);
-    __ emit_data(0x02030001, relocInfo::none, 0);
-    __ emit_data(0x06070405, relocInfo::none, 0);
-    __ emit_data(0x0A0B0809, relocInfo::none, 0);
-    __ emit_data(0x0E0F0C0D, relocInfo::none, 0);
-    __ emit_data(0x02030001, relocInfo::none, 0);
-    __ emit_data(0x06070405, relocInfo::none, 0);
-    __ emit_data(0x0A0B0809, relocInfo::none, 0);
-    __ emit_data(0x0E0F0C0D, relocInfo::none, 0);
-    __ emit_data(0x02030001, relocInfo::none, 0);
-    __ emit_data(0x06070405, relocInfo::none, 0);
-    __ emit_data(0x0A0B0809, relocInfo::none, 0);
-    __ emit_data(0x0E0F0C0D, relocInfo::none, 0);
-    return start;
-  }
-
-  address generate_vector_byte_shuffle_mask() {
-    __ align(CodeEntryAlignment);
-    StubGenStubId stub_id = StubGenStubId::vector_byte_shuffle_mask_id;
-    StubCodeMark mark(this, stub_id);
-    address start = __ pc();
-    __ emit_data(0x70707070, relocInfo::none, 0);
-    __ emit_data(0x70707070, relocInfo::none, 0);
-    __ emit_data(0x70707070, relocInfo::none, 0);
-    __ emit_data(0x70707070, relocInfo::none, 0);
-    __ emit_data(0xF0F0F0F0, relocInfo::none, 0);
-    __ emit_data(0xF0F0F0F0, relocInfo::none, 0);
-    __ emit_data(0xF0F0F0F0, relocInfo::none, 0);
-    __ emit_data(0xF0F0F0F0, relocInfo::none, 0);
-    return start;
-  }
-
-  address generate_vector_mask_long_double(StubGenStubId stub_id, int32_t maskhi, int32_t masklo) {
-    __ align(CodeEntryAlignment);
-    StubCodeMark mark(this, stub_id);
-    address start = __ pc();
-
-    for (int i = 0; i < 8; i++) {
-      __ emit_data(masklo, relocInfo::none, 0);
-      __ emit_data(maskhi, relocInfo::none, 0);
-    }
-
-    return start;
-  }
-
-  //----------------------------------------------------------------------------------------------------
-
-  address generate_vector_byte_perm_mask() {
-    __ align(CodeEntryAlignment);
-    StubGenStubId stub_id = StubGenStubId::vector_byte_perm_mask_id;
-    StubCodeMark mark(this, stub_id);
-    address start = __ pc();
-
-    __ emit_data(0x00000001, relocInfo::none, 0);
-    __ emit_data(0x00000000, relocInfo::none, 0);
-    __ emit_data(0x00000003, relocInfo::none, 0);
-    __ emit_data(0x00000000, relocInfo::none, 0);
-    __ emit_data(0x00000005, relocInfo::none, 0);
-    __ emit_data(0x00000000, relocInfo::none, 0);
-    __ emit_data(0x00000007, relocInfo::none, 0);
-    __ emit_data(0x00000000, relocInfo::none, 0);
-    __ emit_data(0x00000000, relocInfo::none, 0);
-    __ emit_data(0x00000000, relocInfo::none, 0);
-    __ emit_data(0x00000002, relocInfo::none, 0);
-    __ emit_data(0x00000000, relocInfo::none, 0);
-    __ emit_data(0x00000004, relocInfo::none, 0);
-    __ emit_data(0x00000000, relocInfo::none, 0);
-    __ emit_data(0x00000006, relocInfo::none, 0);
-    __ emit_data(0x00000000, relocInfo::none, 0);
-
-    return start;
-  }
-
-  address generate_vector_custom_i32(StubGenStubId stub_id, Assembler::AvxVectorLen len,
-                                     int32_t val0, int32_t val1, int32_t val2, int32_t val3,
-                                     int32_t val4 = 0, int32_t val5 = 0, int32_t val6 = 0, int32_t val7 = 0,
-                                     int32_t val8 = 0, int32_t val9 = 0, int32_t val10 = 0, int32_t val11 = 0,
-                                     int32_t val12 = 0, int32_t val13 = 0, int32_t val14 = 0, int32_t val15 = 0) {
-    __ align(CodeEntryAlignment);
-    StubCodeMark mark(this, stub_id);
-    address start = __ pc();
-
-    assert(len != Assembler::AVX_NoVec, "vector len must be specified");
-    __ emit_data(val0, relocInfo::none, 0);
-    __ emit_data(val1, relocInfo::none, 0);
-    __ emit_data(val2, relocInfo::none, 0);
-    __ emit_data(val3, relocInfo::none, 0);
-    if (len >= Assembler::AVX_256bit) {
-      __ emit_data(val4, relocInfo::none, 0);
-      __ emit_data(val5, relocInfo::none, 0);
-      __ emit_data(val6, relocInfo::none, 0);
-      __ emit_data(val7, relocInfo::none, 0);
-      if (len >= Assembler::AVX_512bit) {
-        __ emit_data(val8, relocInfo::none, 0);
-        __ emit_data(val9, relocInfo::none, 0);
-        __ emit_data(val10, relocInfo::none, 0);
-        __ emit_data(val11, relocInfo::none, 0);
-        __ emit_data(val12, relocInfo::none, 0);
-        __ emit_data(val13, relocInfo::none, 0);
-        __ emit_data(val14, relocInfo::none, 0);
-        __ emit_data(val15, relocInfo::none, 0);
-      }
-    }
-
-    return start;
-  }
-
-  //----------------------------------------------------------------------------------------------------
-  // Non-destructive plausibility checks for oops
-
-  address generate_verify_oop() {
-    StubGenStubId stub_id = StubGenStubId::verify_oop_id;
-    StubCodeMark mark(this, stub_id);
-    address start = __ pc();
-
-    // Incoming arguments on stack after saving rax,:
-    //
-    // [tos    ]: saved rdx
-    // [tos + 1]: saved EFLAGS
-    // [tos + 2]: return address
-    // [tos + 3]: char* error message
-    // [tos + 4]: oop   object to verify
-    // [tos + 5]: saved rax, - saved by caller and bashed
-
-    Label exit, error;
-    __ pushf();
-    __ incrementl(ExternalAddress((address) StubRoutines::verify_oop_count_addr()));
-    __ push(rdx);                                // save rdx
-    // make sure object is 'reasonable'
-    __ movptr(rax, Address(rsp, 4 * wordSize));    // get object
-    __ testptr(rax, rax);
-    __ jcc(Assembler::zero, exit);               // if obj is null it is ok
-
-    // Check if the oop is in the right area of memory
-    const int oop_mask = Universe::verify_oop_mask();
-    const int oop_bits = Universe::verify_oop_bits();
-    __ mov(rdx, rax);
-    __ andptr(rdx, oop_mask);
-    __ cmpptr(rdx, oop_bits);
-    __ jcc(Assembler::notZero, error);
-
-    // make sure klass is 'reasonable', which is not zero.
-    __ movptr(rax, Address(rax, oopDesc::klass_offset_in_bytes())); // get klass
-    __ testptr(rax, rax);
-    __ jcc(Assembler::zero, error);              // if klass is null it is broken
-
-    // return if everything seems ok
-    __ bind(exit);
-    __ movptr(rax, Address(rsp, 5 * wordSize));  // get saved rax, back
-    __ pop(rdx);                                 // restore rdx
-    __ popf();                                   // restore EFLAGS
-    __ ret(3 * wordSize);                        // pop arguments
-
-    // handle errors
-    __ bind(error);
-    __ movptr(rax, Address(rsp, 5 * wordSize));  // get saved rax, back
-    __ pop(rdx);                                 // get saved rdx back
-    __ popf();                                   // get saved EFLAGS off stack -- will be ignored
-    __ pusha();                                  // push registers (eip = return address & msg are already pushed)
-    BLOCK_COMMENT("call MacroAssembler::debug");
-    __ call(RuntimeAddress(CAST_FROM_FN_PTR(address, MacroAssembler::debug32)));
-    __ hlt();
-    return start;
-  }
-
-
-  // Copy 64 bytes chunks
-  //
-  // Inputs:
-  //   from        - source array address
-  //   to_from     - destination array address - from
-  //   qword_count - 8-bytes element count, negative
-  //
-  void xmm_copy_forward(Register from, Register to_from, Register qword_count) {
-    assert( UseSSE >= 2, "supported cpu only" );
-    Label L_copy_64_bytes_loop, L_copy_64_bytes, L_copy_8_bytes, L_exit;
-
-    // Copy 64-byte chunks
-    __ jmpb(L_copy_64_bytes);
-    __ align(OptoLoopAlignment);
-  __ BIND(L_copy_64_bytes_loop);
-
-    if (UseUnalignedLoadStores) {
-      if (UseAVX > 2) {
-        __ evmovdqul(xmm0, Address(from, 0), Assembler::AVX_512bit);
-        __ evmovdqul(Address(from, to_from, Address::times_1, 0), xmm0, Assembler::AVX_512bit);
-      } else if (UseAVX == 2) {
-        __ vmovdqu(xmm0, Address(from,  0));
-        __ vmovdqu(Address(from, to_from, Address::times_1,  0), xmm0);
-        __ vmovdqu(xmm1, Address(from, 32));
-        __ vmovdqu(Address(from, to_from, Address::times_1, 32), xmm1);
-      } else {
-        __ movdqu(xmm0, Address(from, 0));
-        __ movdqu(Address(from, to_from, Address::times_1, 0), xmm0);
-        __ movdqu(xmm1, Address(from, 16));
-        __ movdqu(Address(from, to_from, Address::times_1, 16), xmm1);
-        __ movdqu(xmm2, Address(from, 32));
-        __ movdqu(Address(from, to_from, Address::times_1, 32), xmm2);
-        __ movdqu(xmm3, Address(from, 48));
-        __ movdqu(Address(from, to_from, Address::times_1, 48), xmm3);
-      }
-    } else {
-      __ movq(xmm0, Address(from, 0));
-      __ movq(Address(from, to_from, Address::times_1, 0), xmm0);
-      __ movq(xmm1, Address(from, 8));
-      __ movq(Address(from, to_from, Address::times_1, 8), xmm1);
-      __ movq(xmm2, Address(from, 16));
-      __ movq(Address(from, to_from, Address::times_1, 16), xmm2);
-      __ movq(xmm3, Address(from, 24));
-      __ movq(Address(from, to_from, Address::times_1, 24), xmm3);
-      __ movq(xmm4, Address(from, 32));
-      __ movq(Address(from, to_from, Address::times_1, 32), xmm4);
-      __ movq(xmm5, Address(from, 40));
-      __ movq(Address(from, to_from, Address::times_1, 40), xmm5);
-      __ movq(xmm6, Address(from, 48));
-      __ movq(Address(from, to_from, Address::times_1, 48), xmm6);
-      __ movq(xmm7, Address(from, 56));
-      __ movq(Address(from, to_from, Address::times_1, 56), xmm7);
-    }
-
-    __ addl(from, 64);
-  __ BIND(L_copy_64_bytes);
-    __ subl(qword_count, 8);
-    __ jcc(Assembler::greaterEqual, L_copy_64_bytes_loop);
-
-    if (UseUnalignedLoadStores && (UseAVX == 2)) {
-      // clean upper bits of YMM registers
-      __ vpxor(xmm0, xmm0);
-      __ vpxor(xmm1, xmm1);
-    }
-    __ addl(qword_count, 8);
-    __ jccb(Assembler::zero, L_exit);
-    //
-    // length is too short, just copy qwords
-    //
-  __ BIND(L_copy_8_bytes);
-    __ movq(xmm0, Address(from, 0));
-    __ movq(Address(from, to_from, Address::times_1), xmm0);
-    __ addl(from, 8);
-    __ decrement(qword_count);
-    __ jcc(Assembler::greater, L_copy_8_bytes);
-  __ BIND(L_exit);
-  }
-
-  address generate_disjoint_copy(StubGenStubId stub_id, address* entry) {
-    BasicType t;
-    bool aligned;
-    Address::ScaleFactor sf;
-    bool dest_uninitialized;
-
-    switch (stub_id) {
-    case jbyte_disjoint_arraycopy_id:
-      t = T_BYTE;
-      aligned = false;
-      sf = Address::times_1;
-      dest_uninitialized = false;
-      break;
-    case arrayof_jbyte_disjoint_arraycopy_id:
-      t = T_BYTE;
-      aligned = true;
-      sf = Address::times_1;
-      dest_uninitialized = false;
-      break;
-    case jshort_disjoint_arraycopy_id:
-      t = T_SHORT;
-      aligned = false;
-      sf = Address::times_2;
-      dest_uninitialized = false;
-      break;
-    case arrayof_jshort_disjoint_arraycopy_id:
-      t = T_SHORT;
-      aligned = true;
-      sf = Address::times_2;
-      dest_uninitialized = false;
-      break;
-    case jint_disjoint_arraycopy_id:
-      t = T_INT;
-      aligned = true;
-      sf = Address::times_4;
-      dest_uninitialized = false;
-      break;
-    case arrayof_jint_disjoint_arraycopy_id:
-      // since this is always aligned we can (should!) use the same
-      // stub as for case jint_disjoint_arraycopy
-      ShouldNotReachHere();
-      break;
-    case jlong_disjoint_arraycopy_id:
-    case arrayof_jlong_disjoint_arraycopy_id:
-      // Handled by a special generator routine on 32 bit
-      ShouldNotReachHere();
-      break;
-    case oop_disjoint_arraycopy_id:
-      t = T_OBJECT;
-      aligned = true;
-      sf = Address::times_ptr;
-      dest_uninitialized = false;
-      break;
-    case arrayof_oop_disjoint_arraycopy_id:
-      // since this is always aligned we can (should!) use the same
-      // stub as for case oop_disjoint_arraycopy
-      ShouldNotReachHere();
-      break;
-    case oop_disjoint_arraycopy_uninit_id:
-      t = T_OBJECT;
-      aligned = true;
-      sf = Address::times_ptr;
-      dest_uninitialized = true;
-      break;
-    case arrayof_oop_disjoint_arraycopy_uninit_id:
-      // since this is always aligned we can (should!) use the same
-      // stub as for case oop_disjoint_arraycopy_uninit
-      ShouldNotReachHere();
-      break;
-    default:
-      ShouldNotReachHere();
-      break;
-    }
-
-    __ align(CodeEntryAlignment);
-    StubCodeMark mark(this, stub_id);
-    address start = __ pc();
-
-    Label L_0_count, L_exit, L_skip_align1, L_skip_align2, L_copy_byte;
-    Label L_copy_2_bytes, L_copy_4_bytes, L_copy_64_bytes;
-
-    int shift = Address::times_ptr - sf;
-
-    const Register from     = rsi;  // source array address
-    const Register to       = rdi;  // destination array address
-    const Register count    = rcx;  // elements count
-    const Register to_from  = to;   // (to - from)
-    const Register saved_to = rdx;  // saved destination array address
-
-    __ enter(); // required for proper stackwalking of RuntimeStub frame
-    __ push(rsi);
-    __ push(rdi);
-    __ movptr(from , Address(rsp, 12+ 4));
-    __ movptr(to   , Address(rsp, 12+ 8));
-    __ movl(count, Address(rsp, 12+ 12));
-
-    if (entry != nullptr) {
-      *entry = __ pc(); // Entry point from conjoint arraycopy stub.
-      BLOCK_COMMENT("Entry:");
-    }
-
-    if (t == T_OBJECT) {
-      __ testl(count, count);
-      __ jcc(Assembler::zero, L_0_count);
-    }
-
-    DecoratorSet decorators = IN_HEAP | IS_ARRAY | ARRAYCOPY_DISJOINT;
-    if (dest_uninitialized) {
-      decorators |= IS_DEST_UNINITIALIZED;
-    }
-    if (aligned) {
-      decorators |= ARRAYCOPY_ALIGNED;
-    }
-
-    BarrierSetAssembler *bs = BarrierSet::barrier_set()->barrier_set_assembler();
-    bs->arraycopy_prologue(_masm, decorators, t, from, to, count);
-    {
-      bool add_entry = (t != T_OBJECT && (!aligned || t == T_INT));
-      // UnsafeMemoryAccess page error: continue after unsafe access
-      UnsafeMemoryAccessMark umam(this, add_entry, true);
-      __ subptr(to, from); // to --> to_from
-      __ cmpl(count, 2<<shift); // Short arrays (< 8 bytes) copy by element
-      __ jcc(Assembler::below, L_copy_4_bytes); // use unsigned cmp
-      if (!UseUnalignedLoadStores && !aligned && (t == T_BYTE || t == T_SHORT)) {
-        // align source address at 4 bytes address boundary
-        if (t == T_BYTE) {
-          // One byte misalignment happens only for byte arrays
-          __ testl(from, 1);
-          __ jccb(Assembler::zero, L_skip_align1);
-          __ movb(rax, Address(from, 0));
-          __ movb(Address(from, to_from, Address::times_1, 0), rax);
-          __ increment(from);
-          __ decrement(count);
-        __ BIND(L_skip_align1);
-        }
-        // Two bytes misalignment happens only for byte and short (char) arrays
-        __ testl(from, 2);
-        __ jccb(Assembler::zero, L_skip_align2);
-        __ movw(rax, Address(from, 0));
-        __ movw(Address(from, to_from, Address::times_1, 0), rax);
-        __ addptr(from, 2);
-        __ subl(count, 1<<(shift-1));
-      __ BIND(L_skip_align2);
-      }
-      if (!UseXMMForArrayCopy) {
-        __ mov(rax, count);      // save 'count'
-        __ shrl(count, shift); // bytes count
-        __ addptr(to_from, from);// restore 'to'
-        __ rep_mov();
-        __ subptr(to_from, from);// restore 'to_from'
-        __ mov(count, rax);      // restore 'count'
-        __ jmpb(L_copy_2_bytes); // all dwords were copied
-      } else {
-        if (!UseUnalignedLoadStores) {
-          // align to 8 bytes, we know we are 4 byte aligned to start
-          __ testptr(from, 4);
-          __ jccb(Assembler::zero, L_copy_64_bytes);
-          __ movl(rax, Address(from, 0));
-          __ movl(Address(from, to_from, Address::times_1, 0), rax);
-          __ addptr(from, 4);
-          __ subl(count, 1<<shift);
-        }
-      __ BIND(L_copy_64_bytes);
-        __ mov(rax, count);
-        __ shrl(rax, shift+1);  // 8 bytes chunk count
-        //
-        // Copy 8-byte chunks through XMM registers, 8 per iteration of the loop
-        //
-        xmm_copy_forward(from, to_from, rax);
-      }
-      // copy tailing dword
-    __ BIND(L_copy_4_bytes);
-      __ testl(count, 1<<shift);
-      __ jccb(Assembler::zero, L_copy_2_bytes);
-      __ movl(rax, Address(from, 0));
-      __ movl(Address(from, to_from, Address::times_1, 0), rax);
-      if (t == T_BYTE || t == T_SHORT) {
-        __ addptr(from, 4);
-      __ BIND(L_copy_2_bytes);
-        // copy tailing word
-        __ testl(count, 1<<(shift-1));
-        __ jccb(Assembler::zero, L_copy_byte);
-        __ movw(rax, Address(from, 0));
-        __ movw(Address(from, to_from, Address::times_1, 0), rax);
-        if (t == T_BYTE) {
-          __ addptr(from, 2);
-        __ BIND(L_copy_byte);
-          // copy tailing byte
-          __ testl(count, 1);
-          __ jccb(Assembler::zero, L_exit);
-          __ movb(rax, Address(from, 0));
-          __ movb(Address(from, to_from, Address::times_1, 0), rax);
-        __ BIND(L_exit);
-        } else {
-        __ BIND(L_copy_byte);
-        }
-      } else {
-      __ BIND(L_copy_2_bytes);
-      }
-    }
-
-    __ movl(count, Address(rsp, 12+12)); // reread 'count'
-    bs->arraycopy_epilogue(_masm, decorators, t, from, to, count);
-
-    if (t == T_OBJECT) {
-    __ BIND(L_0_count);
-    }
-    inc_copy_counter_np(t);
-    __ pop(rdi);
-    __ pop(rsi);
-    __ leave(); // required for proper stackwalking of RuntimeStub frame
-    __ vzeroupper();
-    __ xorptr(rax, rax); // return 0
-    __ ret(0);
-    return start;
-  }
-
-
-  address generate_fill(StubGenStubId stub_id) {
-    BasicType t;
-    bool aligned;
-    switch(stub_id) {
-    case jbyte_fill_id:
-      t = T_BYTE;
-      aligned = false;
-      break;
-    case jshort_fill_id:
-      t = T_SHORT;
-      aligned = false;
-      break;
-    case jint_fill_id:
-      t = T_INT;
-      aligned = false;
-      break;
-    case arrayof_jbyte_fill_id:
-      t = T_BYTE;
-      aligned = true;
-      break;
-    case arrayof_jshort_fill_id:
-      t = T_SHORT;
-      aligned = true;
-      break;
-    case arrayof_jint_fill_id:
-      t = T_INT;
-      aligned = true;
-      break;
-    default:
-      ShouldNotReachHere();
-      break;
-    }
-
-    __ align(CodeEntryAlignment);
-    StubCodeMark mark(this, stub_id);
-    address start = __ pc();
-
-    BLOCK_COMMENT("Entry:");
-
-    const Register to       = rdi;  // source array address
-    const Register value    = rdx;  // value
-    const Register count    = rsi;  // elements count
-
-    __ enter(); // required for proper stackwalking of RuntimeStub frame
-    __ push(rsi);
-    __ push(rdi);
-    __ movptr(to   , Address(rsp, 12+ 4));
-    __ movl(value, Address(rsp, 12+ 8));
-    __ movl(count, Address(rsp, 12+ 12));
-
-    __ generate_fill(t, aligned, to, value, count, rax, xmm0);
-
-    __ pop(rdi);
-    __ pop(rsi);
-    __ leave(); // required for proper stackwalking of RuntimeStub frame
-    __ ret(0);
-    return start;
-  }
-
-  address generate_conjoint_copy(StubGenStubId stub_id,
-                                 address nooverlap_target,
-                                 address* entry) {
-    BasicType t;
-    bool aligned;
-    Address::ScaleFactor sf;
-    bool dest_uninitialized;
-
-    switch (stub_id) {
-    case jbyte_arraycopy_id:
-      t = T_BYTE;
-      aligned = false;
-      sf = Address::times_1;
-      dest_uninitialized = false;
-      break;
-    case arrayof_jbyte_arraycopy_id:
-      t = T_BYTE;
-      aligned = true;
-      sf = Address::times_1;
-      dest_uninitialized = false;
-      break;
-    case jshort_arraycopy_id:
-      t = T_SHORT;
-      aligned = false;
-      sf = Address::times_2;
-      dest_uninitialized = false;
-      break;
-    case arrayof_jshort_arraycopy_id:
-      t = T_SHORT;
-      aligned = true;
-      sf = Address::times_2;
-      dest_uninitialized = false;
-      break;
-    case jint_arraycopy_id:
-      t = T_INT;
-      aligned = true;
-      sf = Address::times_4;
-      dest_uninitialized = false;
-      break;
-    case arrayof_jint_arraycopy_id:
-      // since this is always aligned we can (should!) use the same
-      // stub as for case jint_arraycopy
-      ShouldNotReachHere();
-      break;
-    case jlong_arraycopy_id:
-    case arrayof_jlong_arraycopy_id:
-      // Handled by a special generator routine on 32 bit
-      ShouldNotReachHere();
-      break;
-    case oop_arraycopy_id:
-      t = T_OBJECT;
-      aligned = true;
-      sf = Address::times_ptr;
-      dest_uninitialized = false;
-      break;
-    case arrayof_oop_arraycopy_id:
-      // since this is always aligned we can (should!) use the same
-      // stub as for case oop_arraycopy
-      ShouldNotReachHere();
-      break;
-    case oop_arraycopy_uninit_id:
-      t = T_OBJECT;
-      aligned = true;
-      sf = Address::times_ptr;
-      dest_uninitialized = true;
-      break;
-    case arrayof_oop_arraycopy_uninit_id:
-      // since this is always aligned we can (should!) use the same
-      // stub as for case oop_arraycopy_uninit
-      ShouldNotReachHere();
-      break;
-    default:
-      ShouldNotReachHere();
-      break;
-    }
-
-    __ align(CodeEntryAlignment);
-    StubCodeMark mark(this, stub_id);
-    address start = __ pc();
-
-    Label L_0_count, L_exit, L_skip_align1, L_skip_align2, L_copy_byte;
-    Label L_copy_2_bytes, L_copy_4_bytes, L_copy_8_bytes, L_copy_8_bytes_loop;
-
-    int shift = Address::times_ptr - sf;
-
-    const Register src   = rax;  // source array address
-    const Register dst   = rdx;  // destination array address
-    const Register from  = rsi;  // source array address
-    const Register to    = rdi;  // destination array address
-    const Register count = rcx;  // elements count
-    const Register end   = rax;  // array end address
-
-    __ enter(); // required for proper stackwalking of RuntimeStub frame
-    __ push(rsi);
-    __ push(rdi);
-    __ movptr(src  , Address(rsp, 12+ 4));   // from
-    __ movptr(dst  , Address(rsp, 12+ 8));   // to
-    __ movl2ptr(count, Address(rsp, 12+12)); // count
-
-    if (entry != nullptr) {
-      *entry = __ pc(); // Entry point from generic arraycopy stub.
-      BLOCK_COMMENT("Entry:");
-    }
-
-    // nooverlap_target expects arguments in rsi and rdi.
-    __ mov(from, src);
-    __ mov(to  , dst);
-
-    // arrays overlap test: dispatch to disjoint stub if necessary.
-    RuntimeAddress nooverlap(nooverlap_target);
-    __ cmpptr(dst, src);
-    __ lea(end, Address(src, count, sf, 0)); // src + count * elem_size
-    __ jump_cc(Assembler::belowEqual, nooverlap);
-    __ cmpptr(dst, end);
-    __ jump_cc(Assembler::aboveEqual, nooverlap);
-
-    if (t == T_OBJECT) {
-      __ testl(count, count);
-      __ jcc(Assembler::zero, L_0_count);
-    }
-
-    DecoratorSet decorators = IN_HEAP | IS_ARRAY;
-    if (dest_uninitialized) {
-      decorators |= IS_DEST_UNINITIALIZED;
-    }
-    if (aligned) {
-      decorators |= ARRAYCOPY_ALIGNED;
-    }
-
-    BarrierSetAssembler *bs = BarrierSet::barrier_set()->barrier_set_assembler();
-    bs->arraycopy_prologue(_masm, decorators, t, from, to, count);
-
-    {
-      bool add_entry = (t != T_OBJECT && (!aligned || t == T_INT));
-      // UnsafeMemoryAccess page error: continue after unsafe access
-      UnsafeMemoryAccessMark umam(this, add_entry, true);
-      // copy from high to low
-      __ cmpl(count, 2<<shift); // Short arrays (< 8 bytes) copy by element
-      __ jcc(Assembler::below, L_copy_4_bytes); // use unsigned cmp
-      if (t == T_BYTE || t == T_SHORT) {
-        // Align the end of destination array at 4 bytes address boundary
-        __ lea(end, Address(dst, count, sf, 0));
-        if (t == T_BYTE) {
-          // One byte misalignment happens only for byte arrays
-          __ testl(end, 1);
-          __ jccb(Assembler::zero, L_skip_align1);
-          __ decrement(count);
-          __ movb(rdx, Address(from, count, sf, 0));
-          __ movb(Address(to, count, sf, 0), rdx);
-        __ BIND(L_skip_align1);
-        }
-        // Two bytes misalignment happens only for byte and short (char) arrays
-        __ testl(end, 2);
-        __ jccb(Assembler::zero, L_skip_align2);
-        __ subptr(count, 1<<(shift-1));
-        __ movw(rdx, Address(from, count, sf, 0));
-        __ movw(Address(to, count, sf, 0), rdx);
-      __ BIND(L_skip_align2);
-        __ cmpl(count, 2<<shift); // Short arrays (< 8 bytes) copy by element
-        __ jcc(Assembler::below, L_copy_4_bytes);
-      }
-
-      if (!UseXMMForArrayCopy) {
-        __ std();
-        __ mov(rax, count); // Save 'count'
-        __ mov(rdx, to);    // Save 'to'
-        __ lea(rsi, Address(from, count, sf, -4));
-        __ lea(rdi, Address(to  , count, sf, -4));
-        __ shrptr(count, shift); // bytes count
-        __ rep_mov();
-        __ cld();
-        __ mov(count, rax); // restore 'count'
-        __ andl(count, (1<<shift)-1);      // mask the number of rest elements
-        __ movptr(from, Address(rsp, 12+4)); // reread 'from'
-        __ mov(to, rdx);   // restore 'to'
-        __ jmpb(L_copy_2_bytes); // all dword were copied
-      } else {
-        // Align to 8 bytes the end of array. It is aligned to 4 bytes already.
-        __ testptr(end, 4);
-        __ jccb(Assembler::zero, L_copy_8_bytes);
-        __ subl(count, 1<<shift);
-        __ movl(rdx, Address(from, count, sf, 0));
-        __ movl(Address(to, count, sf, 0), rdx);
-        __ jmpb(L_copy_8_bytes);
-
-        __ align(OptoLoopAlignment);
-        // Move 8 bytes
-      __ BIND(L_copy_8_bytes_loop);
-        __ movq(xmm0, Address(from, count, sf, 0));
-        __ movq(Address(to, count, sf, 0), xmm0);
-      __ BIND(L_copy_8_bytes);
-        __ subl(count, 2<<shift);
-        __ jcc(Assembler::greaterEqual, L_copy_8_bytes_loop);
-        __ addl(count, 2<<shift);
-      }
-    __ BIND(L_copy_4_bytes);
-      // copy prefix qword
-      __ testl(count, 1<<shift);
-      __ jccb(Assembler::zero, L_copy_2_bytes);
-      __ movl(rdx, Address(from, count, sf, -4));
-      __ movl(Address(to, count, sf, -4), rdx);
-
-      if (t == T_BYTE || t == T_SHORT) {
-          __ subl(count, (1<<shift));
-        __ BIND(L_copy_2_bytes);
-          // copy prefix dword
-          __ testl(count, 1<<(shift-1));
-          __ jccb(Assembler::zero, L_copy_byte);
-          __ movw(rdx, Address(from, count, sf, -2));
-          __ movw(Address(to, count, sf, -2), rdx);
-          if (t == T_BYTE) {
-            __ subl(count, 1<<(shift-1));
-          __ BIND(L_copy_byte);
-            // copy prefix byte
-            __ testl(count, 1);
-            __ jccb(Assembler::zero, L_exit);
-            __ movb(rdx, Address(from, 0));
-            __ movb(Address(to, 0), rdx);
-          __ BIND(L_exit);
-          } else {
-          __ BIND(L_copy_byte);
-          }
-      } else {
-      __ BIND(L_copy_2_bytes);
-      }
-    }
-
-    __ movl2ptr(count, Address(rsp, 12+12)); // reread count
-    bs->arraycopy_epilogue(_masm, decorators, t, from, to, count);
-
-    if (t == T_OBJECT) {
-    __ BIND(L_0_count);
-    }
-    inc_copy_counter_np(t);
-    __ pop(rdi);
-    __ pop(rsi);
-    __ leave(); // required for proper stackwalking of RuntimeStub frame
-    __ xorptr(rax, rax); // return 0
-    __ ret(0);
-    return start;
-  }
-
-
-  address generate_disjoint_long_copy(address* entry) {
-    __ align(CodeEntryAlignment);
-    StubGenStubId stub_id = StubGenStubId::jlong_disjoint_arraycopy_id;
-    StubCodeMark mark(this, stub_id);
-    address start = __ pc();
-
-    Label L_copy_8_bytes, L_copy_8_bytes_loop;
-    const Register from       = rax;  // source array address
-    const Register to         = rdx;  // destination array address
-    const Register count      = rcx;  // elements count
-    const Register to_from    = rdx;  // (to - from)
-
-    __ enter(); // required for proper stackwalking of RuntimeStub frame
-    __ movptr(from , Address(rsp, 8+0));       // from
-    __ movptr(to   , Address(rsp, 8+4));       // to
-    __ movl2ptr(count, Address(rsp, 8+8));     // count
-
-    *entry = __ pc(); // Entry point from conjoint arraycopy stub.
-    BLOCK_COMMENT("Entry:");
-
-    {
-      // UnsafeMemoryAccess page error: continue after unsafe access
-      UnsafeMemoryAccessMark umam(this, true, true);
-      __ subptr(to, from); // to --> to_from
-      if (UseXMMForArrayCopy) {
-        xmm_copy_forward(from, to_from, count);
-      } else {
-        __ jmpb(L_copy_8_bytes);
-        __ align(OptoLoopAlignment);
-      __ BIND(L_copy_8_bytes_loop);
-        __ fild_d(Address(from, 0));
-        __ fistp_d(Address(from, to_from, Address::times_1));
-        __ addptr(from, 8);
-      __ BIND(L_copy_8_bytes);
-        __ decrement(count);
-        __ jcc(Assembler::greaterEqual, L_copy_8_bytes_loop);
-      }
-    }
-    inc_copy_counter_np(T_LONG);
-    __ leave(); // required for proper stackwalking of RuntimeStub frame
-    __ vzeroupper();
-    __ xorptr(rax, rax); // return 0
-    __ ret(0);
-    return start;
-  }
-
-  address generate_conjoint_long_copy(address nooverlap_target, address* entry) {
-    __ align(CodeEntryAlignment);
-    StubGenStubId stub_id = StubGenStubId::jlong_arraycopy_id;
-    StubCodeMark mark(this, stub_id);
-    address start = __ pc();
-
-    Label L_copy_8_bytes, L_copy_8_bytes_loop;
-    const Register from       = rax;  // source array address
-    const Register to         = rdx;  // destination array address
-    const Register count      = rcx;  // elements count
-    const Register end_from   = rax;  // source array end address
-
-    __ enter(); // required for proper stackwalking of RuntimeStub frame
-    __ movptr(from , Address(rsp, 8+0));       // from
-    __ movptr(to   , Address(rsp, 8+4));       // to
-    __ movl2ptr(count, Address(rsp, 8+8));     // count
-
-    *entry = __ pc(); // Entry point from generic arraycopy stub.
-    BLOCK_COMMENT("Entry:");
-
-    // arrays overlap test
-    __ cmpptr(to, from);
-    RuntimeAddress nooverlap(nooverlap_target);
-    __ jump_cc(Assembler::belowEqual, nooverlap);
-    __ lea(end_from, Address(from, count, Address::times_8, 0));
-    __ cmpptr(to, end_from);
-    __ movptr(from, Address(rsp, 8));  // from
-    __ jump_cc(Assembler::aboveEqual, nooverlap);
-
-    {
-      // UnsafeMemoryAccess page error: continue after unsafe access
-      UnsafeMemoryAccessMark umam(this, true, true);
-
-      __ jmpb(L_copy_8_bytes);
-
-      __ align(OptoLoopAlignment);
-    __ BIND(L_copy_8_bytes_loop);
-      if (UseXMMForArrayCopy) {
-        __ movq(xmm0, Address(from, count, Address::times_8));
-        __ movq(Address(to, count, Address::times_8), xmm0);
-      } else {
-        __ fild_d(Address(from, count, Address::times_8));
-        __ fistp_d(Address(to, count, Address::times_8));
-      }
-    __ BIND(L_copy_8_bytes);
-      __ decrement(count);
-      __ jcc(Assembler::greaterEqual, L_copy_8_bytes_loop);
-
-    }
-    inc_copy_counter_np(T_LONG);
-    __ leave(); // required for proper stackwalking of RuntimeStub frame
-    __ xorptr(rax, rax); // return 0
-    __ ret(0);
-    return start;
-  }
-
-
-  // Helper for generating a dynamic type check.
-  // The sub_klass must be one of {rbx, rdx, rsi}.
-  // The temp is killed.
-  void generate_type_check(Register sub_klass,
-                           Address& super_check_offset_addr,
-                           Address& super_klass_addr,
-                           Register temp,
-                           Label* L_success, Label* L_failure) {
-    BLOCK_COMMENT("type_check:");
-
-    Label L_fallthrough;
-#define LOCAL_JCC(assembler_con, label_ptr)                             \
-    if (label_ptr != nullptr)  __ jcc(assembler_con, *(label_ptr));        \
-    else                    __ jcc(assembler_con, L_fallthrough) /*omit semi*/
-
-    // The following is a strange variation of the fast path which requires
-    // one less register, because needed values are on the argument stack.
-    // __ check_klass_subtype_fast_path(sub_klass, *super_klass*, temp,
-    //                                  L_success, L_failure, null);
-    assert_different_registers(sub_klass, temp);
-
-    int sc_offset = in_bytes(Klass::secondary_super_cache_offset());
-
-    // if the pointers are equal, we are done (e.g., String[] elements)
-    __ cmpptr(sub_klass, super_klass_addr);
-    LOCAL_JCC(Assembler::equal, L_success);
-
-    // check the supertype display:
-    __ movl2ptr(temp, super_check_offset_addr);
-    Address super_check_addr(sub_klass, temp, Address::times_1, 0);
-    __ movptr(temp, super_check_addr); // load displayed supertype
-    __ cmpptr(temp, super_klass_addr); // test the super type
-    LOCAL_JCC(Assembler::equal, L_success);
-
-    // if it was a primary super, we can just fail immediately
-    __ cmpl(super_check_offset_addr, sc_offset);
-    LOCAL_JCC(Assembler::notEqual, L_failure);
-
-    // The repne_scan instruction uses fixed registers, which will get spilled.
-    // We happen to know this works best when super_klass is in rax.
-    Register super_klass = temp;
-    __ movptr(super_klass, super_klass_addr);
-    __ check_klass_subtype_slow_path(sub_klass, super_klass, noreg, noreg,
-                                     L_success, L_failure);
-
-    __ bind(L_fallthrough);
-
-    if (L_success == nullptr) { BLOCK_COMMENT("L_success:"); }
-    if (L_failure == nullptr) { BLOCK_COMMENT("L_failure:"); }
-
-#undef LOCAL_JCC
-  }
-
-  //
-  //  Generate checkcasting array copy stub
-  //
-  //  Input:
-  //    4(rsp)   - source array address
-  //    8(rsp)   - destination array address
-  //   12(rsp)   - element count, can be zero
-  //   16(rsp)   - size_t ckoff (super_check_offset)
-  //   20(rsp)   - oop ckval (super_klass)
-  //
-  //  Output:
-  //    rax, ==  0  -  success
-  //    rax, == -1^K - failure, where K is partial transfer count
-  //
-  address generate_checkcast_copy(StubGenStubId stub_id, address* entry) {
-    bool dest_uninitialized;
-    switch(stub_id) {
-    case checkcast_arraycopy_id:
-      dest_uninitialized = false;
-      break;
-    case checkcast_arraycopy_uninit_id:
-      dest_uninitialized = true;
-      break;
-    default:
-      ShouldNotReachHere();
-    }
-
-    __ align(CodeEntryAlignment);
-    StubCodeMark mark(this, stub_id);
-    address start = __ pc();
-
-    Label L_load_element, L_store_element, L_do_card_marks, L_done;
-
-    // register use:
-    //  rax, rdx, rcx -- loop control (end_from, end_to, count)
-    //  rdi, rsi      -- element access (oop, klass)
-    //  rbx,           -- temp
-    const Register from       = rax;    // source array address
-    const Register to         = rdx;    // destination array address
-    const Register length     = rcx;    // elements count
-    const Register elem       = rdi;    // each oop copied
-    const Register elem_klass = rsi;    // each elem._klass (sub_klass)
-    const Register temp       = rbx;    // lone remaining temp
-
-    __ enter(); // required for proper stackwalking of RuntimeStub frame
-
-    __ push(rsi);
-    __ push(rdi);
-    __ push(rbx);
-
-    Address   from_arg(rsp, 16+ 4);     // from
-    Address     to_arg(rsp, 16+ 8);     // to
-    Address length_arg(rsp, 16+12);     // elements count
-    Address  ckoff_arg(rsp, 16+16);     // super_check_offset
-    Address  ckval_arg(rsp, 16+20);     // super_klass
-
-    // Load up:
-    __ movptr(from,     from_arg);
-    __ movptr(to,         to_arg);
-    __ movl2ptr(length, length_arg);
-
-    if (entry != nullptr) {
-      *entry = __ pc(); // Entry point from generic arraycopy stub.
-      BLOCK_COMMENT("Entry:");
-    }
-
-    //---------------------------------------------------------------
-    // Assembler stub will be used for this call to arraycopy
-    // if the two arrays are subtypes of Object[] but the
-    // destination array type is not equal to or a supertype
-    // of the source type.  Each element must be separately
-    // checked.
-
-    // Loop-invariant addresses.  They are exclusive end pointers.
-    Address end_from_addr(from, length, Address::times_ptr, 0);
-    Address   end_to_addr(to,   length, Address::times_ptr, 0);
-
-    Register end_from = from;           // re-use
-    Register end_to   = to;             // re-use
-    Register count    = length;         // re-use
-
-    // Loop-variant addresses.  They assume post-incremented count < 0.
-    Address from_element_addr(end_from, count, Address::times_ptr, 0);
-    Address   to_element_addr(end_to,   count, Address::times_ptr, 0);
-    Address elem_klass_addr(elem, oopDesc::klass_offset_in_bytes());
-
-    DecoratorSet decorators = IN_HEAP | IS_ARRAY | ARRAYCOPY_CHECKCAST;
-    if (dest_uninitialized) {
-      decorators |= IS_DEST_UNINITIALIZED;
-    }
-
-    BasicType type = T_OBJECT;
-    BarrierSetAssembler *bs = BarrierSet::barrier_set()->barrier_set_assembler();
-    bs->arraycopy_prologue(_masm, decorators, type, from, to, count);
-
-    // Copy from low to high addresses, indexed from the end of each array.
-    __ lea(end_from, end_from_addr);
-    __ lea(end_to,   end_to_addr);
-    assert(length == count, "");        // else fix next line:
-    __ negptr(count);                   // negate and test the length
-    __ jccb(Assembler::notZero, L_load_element);
-
-    // Empty array:  Nothing to do.
-    __ xorptr(rax, rax);                  // return 0 on (trivial) success
-    __ jmp(L_done);
-
-    // ======== begin loop ========
-    // (Loop is rotated; its entry is L_load_element.)
-    // Loop control:
-    //   for (count = -count; count != 0; count++)
-    // Base pointers src, dst are biased by 8*count,to last element.
-    __ align(OptoLoopAlignment);
-
-    __ BIND(L_store_element);
-    __ movptr(to_element_addr, elem);     // store the oop
-    __ increment(count);                // increment the count toward zero
-    __ jccb(Assembler::zero, L_do_card_marks);
-
-    // ======== loop entry is here ========
-    __ BIND(L_load_element);
-    __ movptr(elem, from_element_addr);   // load the oop
-    __ testptr(elem, elem);
-    __ jccb(Assembler::zero, L_store_element);
-
-    // (Could do a trick here:  Remember last successful non-null
-    // element stored and make a quick oop equality check on it.)
-
-    __ movptr(elem_klass, elem_klass_addr); // query the object klass
-    generate_type_check(elem_klass, ckoff_arg, ckval_arg, temp,
-                        &L_store_element, nullptr);
-    // (On fall-through, we have failed the element type check.)
-    // ======== end loop ========
-
-    // It was a real error; we must depend on the caller to finish the job.
-    // Register "count" = -1 * number of *remaining* oops, length_arg = *total* oops.
-    // Emit GC store barriers for the oops we have copied (length_arg + count),
-    // and report their number to the caller.
-    assert_different_registers(to, count, rax);
-    Label L_post_barrier;
-    __ addl(count, length_arg);         // transfers = (length - remaining)
-    __ movl2ptr(rax, count);            // save the value
-    __ notptr(rax);                     // report (-1^K) to caller (does not affect flags)
-    __ jccb(Assembler::notZero, L_post_barrier);
-    __ jmp(L_done); // K == 0, nothing was copied, skip post barrier
-
-    // Come here on success only.
-    __ BIND(L_do_card_marks);
-    __ xorptr(rax, rax);                // return 0 on success
-    __ movl2ptr(count, length_arg);
-
-    __ BIND(L_post_barrier);
-    __ movptr(to, to_arg);              // reload
-    bs->arraycopy_epilogue(_masm, decorators, type, from, to, count);
-
-    // Common exit point (success or failure).
-    __ BIND(L_done);
-    __ pop(rbx);
-    __ pop(rdi);
-    __ pop(rsi);
-    inc_counter_np(SharedRuntime::_checkcast_array_copy_ctr);
-    __ leave(); // required for proper stackwalking of RuntimeStub frame
-    __ ret(0);
-
-    return start;
-  }
-
-  //
-  //  Generate 'unsafe' array copy stub
-  //  Though just as safe as the other stubs, it takes an unscaled
-  //  size_t argument instead of an element count.
-  //
-  //  Input:
-  //    4(rsp)   - source array address
-  //    8(rsp)   - destination array address
-  //   12(rsp)   - byte count, can be zero
-  //
-  //  Output:
-  //    rax, ==  0  -  success
-  //    rax, == -1  -  need to call System.arraycopy
-  //
-  // Examines the alignment of the operands and dispatches
-  // to a long, int, short, or byte copy loop.
-  //
-  address generate_unsafe_copy(address byte_copy_entry,
-                               address short_copy_entry,
-                               address int_copy_entry,
-                               address long_copy_entry) {
-
-    Label L_long_aligned, L_int_aligned, L_short_aligned;
-
-    __ align(CodeEntryAlignment);
-    StubGenStubId stub_id = StubGenStubId::unsafe_arraycopy_id;
-    StubCodeMark mark(this, stub_id);
-    address start = __ pc();
-
-    const Register from       = rax;  // source array address
-    const Register to         = rdx;  // destination array address
-    const Register count      = rcx;  // elements count
-
-    __ enter(); // required for proper stackwalking of RuntimeStub frame
-    __ push(rsi);
-    __ push(rdi);
-    Address  from_arg(rsp, 12+ 4);      // from
-    Address    to_arg(rsp, 12+ 8);      // to
-    Address count_arg(rsp, 12+12);      // byte count
-
-    // Load up:
-    __ movptr(from ,  from_arg);
-    __ movptr(to   ,    to_arg);
-    __ movl2ptr(count, count_arg);
-
-    // bump this on entry, not on exit:
-    inc_counter_np(SharedRuntime::_unsafe_array_copy_ctr);
-
-    const Register bits = rsi;
-    __ mov(bits, from);
-    __ orptr(bits, to);
-    __ orptr(bits, count);
-
-    __ testl(bits, BytesPerLong-1);
-    __ jccb(Assembler::zero, L_long_aligned);
-
-    __ testl(bits, BytesPerInt-1);
-    __ jccb(Assembler::zero, L_int_aligned);
-
-    __ testl(bits, BytesPerShort-1);
-    __ jump_cc(Assembler::notZero, RuntimeAddress(byte_copy_entry));
-
-    __ BIND(L_short_aligned);
-    __ shrptr(count, LogBytesPerShort); // size => short_count
-    __ movl(count_arg, count);          // update 'count'
-    __ jump(RuntimeAddress(short_copy_entry));
-
-    __ BIND(L_int_aligned);
-    __ shrptr(count, LogBytesPerInt); // size => int_count
-    __ movl(count_arg, count);          // update 'count'
-    __ jump(RuntimeAddress(int_copy_entry));
-
-    __ BIND(L_long_aligned);
-    __ shrptr(count, LogBytesPerLong); // size => qword_count
-    __ movl(count_arg, count);          // update 'count'
-    __ pop(rdi); // Do pops here since jlong_arraycopy stub does not do it.
-    __ pop(rsi);
-    __ jump(RuntimeAddress(long_copy_entry));
-
-    return start;
-  }
-
-
-  // Perform range checks on the proposed arraycopy.
-  // Smashes src_pos and dst_pos.  (Uses them up for temps.)
-  void arraycopy_range_checks(Register src,
-                              Register src_pos,
-                              Register dst,
-                              Register dst_pos,
-                              Address& length,
-                              Label& L_failed) {
-    BLOCK_COMMENT("arraycopy_range_checks:");
-    const Register src_end = src_pos;   // source array end position
-    const Register dst_end = dst_pos;   // destination array end position
-    __ addl(src_end, length); // src_pos + length
-    __ addl(dst_end, length); // dst_pos + length
-
-    //  if (src_pos + length > arrayOop(src)->length() ) FAIL;
-    __ cmpl(src_end, Address(src, arrayOopDesc::length_offset_in_bytes()));
-    __ jcc(Assembler::above, L_failed);
-
-    //  if (dst_pos + length > arrayOop(dst)->length() ) FAIL;
-    __ cmpl(dst_end, Address(dst, arrayOopDesc::length_offset_in_bytes()));
-    __ jcc(Assembler::above, L_failed);
-
-    BLOCK_COMMENT("arraycopy_range_checks done");
-  }
-
-
-  //
-  //  Generate generic array copy stubs
-  //
-  //  Input:
-  //     4(rsp)    -  src oop
-  //     8(rsp)    -  src_pos
-  //    12(rsp)    -  dst oop
-  //    16(rsp)    -  dst_pos
-  //    20(rsp)    -  element count
-  //
-  //  Output:
-  //    rax, ==  0  -  success
-  //    rax, == -1^K - failure, where K is partial transfer count
-  //
-  address generate_generic_copy(address entry_jbyte_arraycopy,
-                                address entry_jshort_arraycopy,
-                                address entry_jint_arraycopy,
-                                address entry_oop_arraycopy,
-                                address entry_jlong_arraycopy,
-                                address entry_checkcast_arraycopy) {
-    Label L_failed, L_failed_0, L_objArray;
-
-    { int modulus = CodeEntryAlignment;
-      int target  = modulus - 5; // 5 = sizeof jmp(L_failed)
-      int advance = target - (__ offset() % modulus);
-      if (advance < 0)  advance += modulus;
-      if (advance > 0)  __ nop(advance);
-    }
-    StubGenStubId stub_id = StubGenStubId::generic_arraycopy_id;
-    StubCodeMark mark(this, stub_id);
-
-    // Short-hop target to L_failed.  Makes for denser prologue code.
-    __ BIND(L_failed_0);
-    __ jmp(L_failed);
-    assert(__ offset() % CodeEntryAlignment == 0, "no further alignment needed");
-
-    __ align(CodeEntryAlignment);
-    address start = __ pc();
-
-    __ enter(); // required for proper stackwalking of RuntimeStub frame
-    __ push(rsi);
-    __ push(rdi);
-
-    // bump this on entry, not on exit:
-    inc_counter_np(SharedRuntime::_generic_array_copy_ctr);
-
-    // Input values
-    Address SRC     (rsp, 12+ 4);
-    Address SRC_POS (rsp, 12+ 8);
-    Address DST     (rsp, 12+12);
-    Address DST_POS (rsp, 12+16);
-    Address LENGTH  (rsp, 12+20);
-
-    //-----------------------------------------------------------------------
-    // Assembler stub will be used for this call to arraycopy
-    // if the following conditions are met:
-    //
-    // (1) src and dst must not be null.
-    // (2) src_pos must not be negative.
-    // (3) dst_pos must not be negative.
-    // (4) length  must not be negative.
-    // (5) src klass and dst klass should be the same and not null.
-    // (6) src and dst should be arrays.
-    // (7) src_pos + length must not exceed length of src.
-    // (8) dst_pos + length must not exceed length of dst.
-    //
-
-    const Register src     = rax;       // source array oop
-    const Register src_pos = rsi;
-    const Register dst     = rdx;       // destination array oop
-    const Register dst_pos = rdi;
-    const Register length  = rcx;       // transfer count
-
-    //  if (src == null) return -1;
-    __ movptr(src, SRC);      // src oop
-    __ testptr(src, src);
-    __ jccb(Assembler::zero, L_failed_0);
-
-    //  if (src_pos < 0) return -1;
-    __ movl2ptr(src_pos, SRC_POS);  // src_pos
-    __ testl(src_pos, src_pos);
-    __ jccb(Assembler::negative, L_failed_0);
-
-    //  if (dst == nullptr) return -1;
-    __ movptr(dst, DST);      // dst oop
-    __ testptr(dst, dst);
-    __ jccb(Assembler::zero, L_failed_0);
-
-    //  if (dst_pos < 0) return -1;
-    __ movl2ptr(dst_pos, DST_POS);  // dst_pos
-    __ testl(dst_pos, dst_pos);
-    __ jccb(Assembler::negative, L_failed_0);
-
-    //  if (length < 0) return -1;
-    __ movl2ptr(length, LENGTH);   // length
-    __ testl(length, length);
-    __ jccb(Assembler::negative, L_failed_0);
-
-    //  if (src->klass() == nullptr) return -1;
-    Address src_klass_addr(src, oopDesc::klass_offset_in_bytes());
-    Address dst_klass_addr(dst, oopDesc::klass_offset_in_bytes());
-    const Register rcx_src_klass = rcx;    // array klass
-    __ movptr(rcx_src_klass, Address(src, oopDesc::klass_offset_in_bytes()));
-
-#ifdef ASSERT
-    //  assert(src->klass() != nullptr);
-    BLOCK_COMMENT("assert klasses not null");
-    { Label L1, L2;
-      __ testptr(rcx_src_klass, rcx_src_klass);
-      __ jccb(Assembler::notZero, L2);   // it is broken if klass is null
-      __ bind(L1);
-      __ stop("broken null klass");
-      __ bind(L2);
-      __ cmpptr(dst_klass_addr, NULL_WORD);
-      __ jccb(Assembler::equal, L1);      // this would be broken also
-      BLOCK_COMMENT("assert done");
-    }
-#endif //ASSERT
-
-    // Load layout helper (32-bits)
-    //
-    //  |array_tag|     | header_size | element_type |     |log2_element_size|
-    // 32        30    24            16              8     2                 0
-    //
-    //   array_tag: typeArray = 0x3, objArray = 0x2, non-array = 0x0
-    //
-
-    int lh_offset = in_bytes(Klass::layout_helper_offset());
-    Address src_klass_lh_addr(rcx_src_klass, lh_offset);
-
-    // Handle objArrays completely differently...
-    jint objArray_lh = Klass::array_layout_helper(T_OBJECT);
-    __ cmpl(src_klass_lh_addr, objArray_lh);
-    __ jcc(Assembler::equal, L_objArray);
-
-    //  if (src->klass() != dst->klass()) return -1;
-    __ cmpptr(rcx_src_klass, dst_klass_addr);
-    __ jccb(Assembler::notEqual, L_failed_0);
-
-    const Register rcx_lh = rcx;  // layout helper
-    assert(rcx_lh == rcx_src_klass, "known alias");
-    __ movl(rcx_lh, src_klass_lh_addr);
-
-    //  if (!src->is_Array()) return -1;
-    __ cmpl(rcx_lh, Klass::_lh_neutral_value);
-    __ jcc(Assembler::greaterEqual, L_failed_0); // signed cmp
-
-    // At this point, it is known to be a typeArray (array_tag 0x3).
-#ifdef ASSERT
-    { Label L;
-      __ cmpl(rcx_lh, (Klass::_lh_array_tag_type_value << Klass::_lh_array_tag_shift));
-      __ jcc(Assembler::greaterEqual, L); // signed cmp
-      __ stop("must be a primitive array");
-      __ bind(L);
-    }
-#endif
-
-    assert_different_registers(src, src_pos, dst, dst_pos, rcx_lh);
-    arraycopy_range_checks(src, src_pos, dst, dst_pos, LENGTH, L_failed);
-
-    // TypeArrayKlass
-    //
-    // src_addr = (src + array_header_in_bytes()) + (src_pos << log2elemsize);
-    // dst_addr = (dst + array_header_in_bytes()) + (dst_pos << log2elemsize);
-    //
-    const Register rsi_offset = rsi; // array offset
-    const Register src_array  = src; // src array offset
-    const Register dst_array  = dst; // dst array offset
-    const Register rdi_elsize = rdi; // log2 element size
-
-    __ mov(rsi_offset, rcx_lh);
-    __ shrptr(rsi_offset, Klass::_lh_header_size_shift);
-    __ andptr(rsi_offset, Klass::_lh_header_size_mask);   // array_offset
-    __ addptr(src_array, rsi_offset);  // src array offset
-    __ addptr(dst_array, rsi_offset);  // dst array offset
-    __ andptr(rcx_lh, Klass::_lh_log2_element_size_mask); // log2 elsize
-
-    // next registers should be set before the jump to corresponding stub
-    const Register from       = src; // source array address
-    const Register to         = dst; // destination array address
-    const Register count      = rcx; // elements count
-    // some of them should be duplicated on stack
-#define FROM   Address(rsp, 12+ 4)
-#define TO     Address(rsp, 12+ 8)   // Not used now
-#define COUNT  Address(rsp, 12+12)   // Only for oop arraycopy
-
-    BLOCK_COMMENT("scale indexes to element size");
-    __ movl2ptr(rsi, SRC_POS);  // src_pos
-    __ shlptr(rsi);             // src_pos << rcx (log2 elsize)
-    assert(src_array == from, "");
-    __ addptr(from, rsi);       // from = src_array + SRC_POS << log2 elsize
-    __ movl2ptr(rdi, DST_POS);  // dst_pos
-    __ shlptr(rdi);             // dst_pos << rcx (log2 elsize)
-    assert(dst_array == to, "");
-    __ addptr(to,  rdi);        // to   = dst_array + DST_POS << log2 elsize
-    __ movptr(FROM, from);      // src_addr
-    __ mov(rdi_elsize, rcx_lh); // log2 elsize
-    __ movl2ptr(count, LENGTH); // elements count
-
-    BLOCK_COMMENT("choose copy loop based on element size");
-    __ cmpl(rdi_elsize, 0);
-
-    __ jump_cc(Assembler::equal, RuntimeAddress(entry_jbyte_arraycopy));
-    __ cmpl(rdi_elsize, LogBytesPerShort);
-    __ jump_cc(Assembler::equal, RuntimeAddress(entry_jshort_arraycopy));
-    __ cmpl(rdi_elsize, LogBytesPerInt);
-    __ jump_cc(Assembler::equal, RuntimeAddress(entry_jint_arraycopy));
-#ifdef ASSERT
-    __ cmpl(rdi_elsize, LogBytesPerLong);
-    __ jccb(Assembler::notEqual, L_failed);
-#endif
-    __ pop(rdi); // Do pops here since jlong_arraycopy stub does not do it.
-    __ pop(rsi);
-    __ jump(RuntimeAddress(entry_jlong_arraycopy));
-
-  __ BIND(L_failed);
-    __ xorptr(rax, rax);
-    __ notptr(rax); // return -1
-    __ pop(rdi);
-    __ pop(rsi);
-    __ leave(); // required for proper stackwalking of RuntimeStub frame
-    __ ret(0);
-
-    // ObjArrayKlass
-  __ BIND(L_objArray);
-    // live at this point:  rcx_src_klass, src[_pos], dst[_pos]
-
-    Label L_plain_copy, L_checkcast_copy;
-    //  test array classes for subtyping
-    __ cmpptr(rcx_src_klass, dst_klass_addr); // usual case is exact equality
-    __ jccb(Assembler::notEqual, L_checkcast_copy);
-
-    // Identically typed arrays can be copied without element-wise checks.
-    assert_different_registers(src, src_pos, dst, dst_pos, rcx_src_klass);
-    arraycopy_range_checks(src, src_pos, dst, dst_pos, LENGTH, L_failed);
-
-  __ BIND(L_plain_copy);
-    __ movl2ptr(count, LENGTH); // elements count
-    __ movl2ptr(src_pos, SRC_POS);  // reload src_pos
-    __ lea(from, Address(src, src_pos, Address::times_ptr,
-                 arrayOopDesc::base_offset_in_bytes(T_OBJECT))); // src_addr
-    __ movl2ptr(dst_pos, DST_POS);  // reload dst_pos
-    __ lea(to,   Address(dst, dst_pos, Address::times_ptr,
-                 arrayOopDesc::base_offset_in_bytes(T_OBJECT))); // dst_addr
-    __ movptr(FROM,  from);   // src_addr
-    __ movptr(TO,    to);     // dst_addr
-    __ movl(COUNT, count);  // count
-    __ jump(RuntimeAddress(entry_oop_arraycopy));
-
-  __ BIND(L_checkcast_copy);
-    // live at this point:  rcx_src_klass, dst[_pos], src[_pos]
-    {
-      // Handy offsets:
-      int  ek_offset = in_bytes(ObjArrayKlass::element_klass_offset());
-      int sco_offset = in_bytes(Klass::super_check_offset_offset());
-
-      Register rsi_dst_klass = rsi;
-      Register rdi_temp      = rdi;
-      assert(rsi_dst_klass == src_pos, "expected alias w/ src_pos");
-      assert(rdi_temp      == dst_pos, "expected alias w/ dst_pos");
-      Address dst_klass_lh_addr(rsi_dst_klass, lh_offset);
-
-      // Before looking at dst.length, make sure dst is also an objArray.
-      __ movptr(rsi_dst_klass, dst_klass_addr);
-      __ cmpl(dst_klass_lh_addr, objArray_lh);
-      __ jccb(Assembler::notEqual, L_failed);
-
-      // It is safe to examine both src.length and dst.length.
-      __ movl2ptr(src_pos, SRC_POS);        // reload rsi
-      arraycopy_range_checks(src, src_pos, dst, dst_pos, LENGTH, L_failed);
-      // (Now src_pos and dst_pos are killed, but not src and dst.)
-
-      // We'll need this temp (don't forget to pop it after the type check).
-      __ push(rbx);
-      Register rbx_src_klass = rbx;
-
-      __ mov(rbx_src_klass, rcx_src_klass); // spill away from rcx
-      __ movptr(rsi_dst_klass, dst_klass_addr);
-      Address super_check_offset_addr(rsi_dst_klass, sco_offset);
-      Label L_fail_array_check;
-      generate_type_check(rbx_src_klass,
-                          super_check_offset_addr, dst_klass_addr,
-                          rdi_temp, nullptr, &L_fail_array_check);
-      // (On fall-through, we have passed the array type check.)
-      __ pop(rbx);
-      __ jmp(L_plain_copy);
-
-      __ BIND(L_fail_array_check);
-      // Reshuffle arguments so we can call checkcast_arraycopy:
-
-      // match initial saves for checkcast_arraycopy
-      // push(rsi);    // already done; see above
-      // push(rdi);    // already done; see above
-      // push(rbx);    // already done; see above
-
-      // Marshal outgoing arguments now, freeing registers.
-      Address   from_arg(rsp, 16+ 4);   // from
-      Address     to_arg(rsp, 16+ 8);   // to
-      Address length_arg(rsp, 16+12);   // elements count
-      Address  ckoff_arg(rsp, 16+16);   // super_check_offset
-      Address  ckval_arg(rsp, 16+20);   // super_klass
-
-      Address SRC_POS_arg(rsp, 16+ 8);
-      Address DST_POS_arg(rsp, 16+16);
-      Address  LENGTH_arg(rsp, 16+20);
-      // push rbx, changed the incoming offsets (why not just use rbp,??)
-      // assert(SRC_POS_arg.disp() == SRC_POS.disp() + 4, "");
-
-      __ movptr(rbx, Address(rsi_dst_klass, ek_offset));
-      __ movl2ptr(length, LENGTH_arg);    // reload elements count
-      __ movl2ptr(src_pos, SRC_POS_arg);  // reload src_pos
-      __ movl2ptr(dst_pos, DST_POS_arg);  // reload dst_pos
-
-      __ movptr(ckval_arg, rbx);          // destination element type
-      __ movl(rbx, Address(rbx, sco_offset));
-      __ movl(ckoff_arg, rbx);          // corresponding class check offset
-
-      __ movl(length_arg, length);      // outgoing length argument
-
-      __ lea(from, Address(src, src_pos, Address::times_ptr,
-                            arrayOopDesc::base_offset_in_bytes(T_OBJECT)));
-      __ movptr(from_arg, from);
-
-      __ lea(to, Address(dst, dst_pos, Address::times_ptr,
-                          arrayOopDesc::base_offset_in_bytes(T_OBJECT)));
-      __ movptr(to_arg, to);
-      __ jump(RuntimeAddress(entry_checkcast_arraycopy));
-    }
-
-    return start;
-  }
-
-  void generate_arraycopy_stubs() {
-    address entry;
-    address entry_jbyte_arraycopy;
-    address entry_jshort_arraycopy;
-    address entry_jint_arraycopy;
-    address entry_oop_arraycopy;
-    address entry_jlong_arraycopy;
-    address entry_checkcast_arraycopy;
-
-    StubRoutines::_arrayof_jbyte_disjoint_arraycopy =
-        generate_disjoint_copy(StubGenStubId::arrayof_jbyte_disjoint_arraycopy_id, &entry);
-    StubRoutines::_arrayof_jbyte_arraycopy =
-        generate_conjoint_copy(StubGenStubId::arrayof_jbyte_arraycopy_id, entry, nullptr);
-    StubRoutines::_jbyte_disjoint_arraycopy =
-      generate_disjoint_copy(StubGenStubId::jbyte_disjoint_arraycopy_id, &entry);
-    StubRoutines::_jbyte_arraycopy =
-        generate_conjoint_copy(StubGenStubId::jbyte_arraycopy_id,  entry, &entry_jbyte_arraycopy);
-
-    StubRoutines::_arrayof_jshort_disjoint_arraycopy =
-        generate_disjoint_copy(StubGenStubId::arrayof_jshort_disjoint_arraycopy_id, &entry);
-    StubRoutines::_arrayof_jshort_arraycopy =
-        generate_conjoint_copy(StubGenStubId::arrayof_jshort_arraycopy_id, entry, nullptr);
-    StubRoutines::_jshort_disjoint_arraycopy =
-        generate_disjoint_copy(StubGenStubId::jshort_disjoint_arraycopy_id, &entry);
-    StubRoutines::_jshort_arraycopy =
-        generate_conjoint_copy(StubGenStubId::jshort_arraycopy_id, entry, &entry_jshort_arraycopy);
-
-    // Next arrays are always aligned on 4 bytes at least.
-    StubRoutines::_jint_disjoint_arraycopy =
-        generate_disjoint_copy(StubGenStubId::jint_disjoint_arraycopy_id, &entry);
-    StubRoutines::_jint_arraycopy =
-        generate_conjoint_copy(StubGenStubId::jint_arraycopy_id, entry, &entry_jint_arraycopy);
-
-    StubRoutines::_oop_disjoint_arraycopy =
-        generate_disjoint_copy(StubGenStubId::oop_disjoint_arraycopy_id, &entry);
-    StubRoutines::_oop_arraycopy =
-        generate_conjoint_copy(StubGenStubId::oop_arraycopy_id, entry, &entry_oop_arraycopy);
-
-    StubRoutines::_oop_disjoint_arraycopy_uninit =
-        generate_disjoint_copy(StubGenStubId::oop_disjoint_arraycopy_uninit_id, &entry);
-    StubRoutines::_oop_arraycopy_uninit =
-        generate_conjoint_copy(StubGenStubId::oop_arraycopy_uninit_id, entry, nullptr);
-
-    StubRoutines::_jlong_disjoint_arraycopy =
-        generate_disjoint_long_copy(&entry);
-    StubRoutines::_jlong_arraycopy =
-        generate_conjoint_long_copy(entry, &entry_jlong_arraycopy);
-
-    StubRoutines::_jbyte_fill = generate_fill(StubGenStubId::jbyte_fill_id);
-    StubRoutines::_jshort_fill = generate_fill(StubGenStubId::jshort_fill_id);
-    StubRoutines::_jint_fill = generate_fill(StubGenStubId::jint_fill_id);
-    StubRoutines::_arrayof_jbyte_fill = generate_fill(StubGenStubId::arrayof_jbyte_fill_id);
-    StubRoutines::_arrayof_jshort_fill = generate_fill(StubGenStubId::arrayof_jshort_fill_id);
-    StubRoutines::_arrayof_jint_fill = generate_fill(StubGenStubId::arrayof_jint_fill_id);
-
-    StubRoutines::_arrayof_jint_disjoint_arraycopy       = StubRoutines::_jint_disjoint_arraycopy;
-    StubRoutines::_arrayof_oop_disjoint_arraycopy        = StubRoutines::_oop_disjoint_arraycopy;
-    StubRoutines::_arrayof_oop_disjoint_arraycopy_uninit = StubRoutines::_oop_disjoint_arraycopy_uninit;
-    StubRoutines::_arrayof_jlong_disjoint_arraycopy      = StubRoutines::_jlong_disjoint_arraycopy;
-
-    StubRoutines::_arrayof_jint_arraycopy       = StubRoutines::_jint_arraycopy;
-    StubRoutines::_arrayof_oop_arraycopy        = StubRoutines::_oop_arraycopy;
-    StubRoutines::_arrayof_oop_arraycopy_uninit = StubRoutines::_oop_arraycopy_uninit;
-    StubRoutines::_arrayof_jlong_arraycopy      = StubRoutines::_jlong_arraycopy;
-
-    StubRoutines::_checkcast_arraycopy =
-      generate_checkcast_copy(StubGenStubId::checkcast_arraycopy_id, &entry_checkcast_arraycopy);
-    StubRoutines::_checkcast_arraycopy_uninit =
-      generate_checkcast_copy(StubGenStubId::checkcast_arraycopy_uninit_id, nullptr);
-
-    StubRoutines::_unsafe_arraycopy =
-        generate_unsafe_copy(entry_jbyte_arraycopy,
-                             entry_jshort_arraycopy,
-                             entry_jint_arraycopy,
-                             entry_jlong_arraycopy);
-
-    StubRoutines::_generic_arraycopy =
-        generate_generic_copy( entry_jbyte_arraycopy,
-                               entry_jshort_arraycopy,
-                               entry_jint_arraycopy,
-                               entry_oop_arraycopy,
-                               entry_jlong_arraycopy,
-                               entry_checkcast_arraycopy);
-  }
-
-  // AES intrinsic stubs
-  enum {AESBlockSize = 16};
-
-  address key_shuffle_mask_addr() {
-    return (address)KEY_SHUFFLE_MASK;
-  }
-
-  address counter_shuffle_mask_addr() {
-    return (address)COUNTER_SHUFFLE_MASK;
-  }
-
-  // Utility routine for loading a 128-bit key word in little endian format
-  // can optionally specify that the shuffle mask is already in an xmmregister
-  void load_key(XMMRegister xmmdst, Register key, int offset, XMMRegister xmm_shuf_mask = xnoreg) {
-    __ movdqu(xmmdst, Address(key, offset));
-    if (xmm_shuf_mask != xnoreg) {
-      __ pshufb(xmmdst, xmm_shuf_mask);
-    } else {
-      __ pshufb(xmmdst, ExternalAddress(key_shuffle_mask_addr()));
-    }
-  }
-
-  // aesenc using specified key+offset
-  // can optionally specify that the shuffle mask is already in an xmmregister
-  void aes_enc_key(XMMRegister xmmdst, XMMRegister xmmtmp, Register key, int offset, XMMRegister xmm_shuf_mask = xnoreg) {
-    load_key(xmmtmp, key, offset, xmm_shuf_mask);
-    __ aesenc(xmmdst, xmmtmp);
-  }
-
-  // aesdec using specified key+offset
-  // can optionally specify that the shuffle mask is already in an xmmregister
-  void aes_dec_key(XMMRegister xmmdst, XMMRegister xmmtmp, Register key, int offset, XMMRegister xmm_shuf_mask = xnoreg) {
-    load_key(xmmtmp, key, offset, xmm_shuf_mask);
-    __ aesdec(xmmdst, xmmtmp);
-  }
-
-  // Utility routine for increase 128bit counter (iv in CTR mode)
-  //  XMM_128bit,  D3, D2, D1, D0
-  void inc_counter(Register reg, XMMRegister xmmdst, int inc_delta, Label& next_block) {
-    __ pextrd(reg, xmmdst, 0x0);
-    __ addl(reg, inc_delta);
-    __ pinsrd(xmmdst, reg, 0x0);
-    __ jcc(Assembler::carryClear, next_block); // jump if no carry
-
-    __ pextrd(reg, xmmdst, 0x01); // Carry-> D1
-    __ addl(reg, 0x01);
-    __ pinsrd(xmmdst, reg, 0x01);
-    __ jcc(Assembler::carryClear, next_block); // jump if no carry
-
-    __ pextrd(reg, xmmdst, 0x02); // Carry-> D2
-    __ addl(reg, 0x01);
-    __ pinsrd(xmmdst, reg, 0x02);
-    __ jcc(Assembler::carryClear, next_block); // jump if no carry
-
-    __ pextrd(reg, xmmdst, 0x03); // Carry -> D3
-    __ addl(reg, 0x01);
-    __ pinsrd(xmmdst, reg, 0x03);
-
-    __ BIND(next_block);          // next instruction
-  }
-
-
-  // Arguments:
-  //
-  // Inputs:
-  //   c_rarg0   - source byte array address
-  //   c_rarg1   - destination byte array address
-  //   c_rarg2   - K (key) in little endian int array
-  //
-  address generate_aescrypt_encryptBlock() {
-    assert(UseAES, "need AES instructions and misaligned SSE support");
-    __ align(CodeEntryAlignment);
-    StubGenStubId stub_id = StubGenStubId::aescrypt_encryptBlock_id;
-    StubCodeMark mark(this, stub_id);
-    Label L_doLast;
-    address start = __ pc();
-
-    const Register from        = rdx;      // source array address
-    const Register to          = rdx;      // destination array address
-    const Register key         = rcx;      // key array address
-    const Register keylen      = rax;
-    const Address  from_param(rbp, 8+0);
-    const Address  to_param  (rbp, 8+4);
-    const Address  key_param (rbp, 8+8);
-
-    const XMMRegister xmm_result = xmm0;
-    const XMMRegister xmm_key_shuf_mask = xmm1;
-    const XMMRegister xmm_temp1  = xmm2;
-    const XMMRegister xmm_temp2  = xmm3;
-    const XMMRegister xmm_temp3  = xmm4;
-    const XMMRegister xmm_temp4  = xmm5;
-
-    __ enter();   // required for proper stackwalking of RuntimeStub frame
-
-    __ movptr(from, from_param);
-    __ movptr(key, key_param);
-
-    // keylen could be only {11, 13, 15} * 4 = {44, 52, 60}
-    __ movl(keylen, Address(key, arrayOopDesc::length_offset_in_bytes() - arrayOopDesc::base_offset_in_bytes(T_INT)));
-
-    __ movdqu(xmm_key_shuf_mask, ExternalAddress(key_shuffle_mask_addr()));
-    __ movdqu(xmm_result, Address(from, 0));  // get 16 bytes of input
-    __ movptr(to, to_param);
-
-    // For encryption, the java expanded key ordering is just what we need
-
-    load_key(xmm_temp1, key, 0x00, xmm_key_shuf_mask);
-    __ pxor(xmm_result, xmm_temp1);
-
-    load_key(xmm_temp1, key, 0x10, xmm_key_shuf_mask);
-    load_key(xmm_temp2, key, 0x20, xmm_key_shuf_mask);
-    load_key(xmm_temp3, key, 0x30, xmm_key_shuf_mask);
-    load_key(xmm_temp4, key, 0x40, xmm_key_shuf_mask);
-
-    __ aesenc(xmm_result, xmm_temp1);
-    __ aesenc(xmm_result, xmm_temp2);
-    __ aesenc(xmm_result, xmm_temp3);
-    __ aesenc(xmm_result, xmm_temp4);
-
-    load_key(xmm_temp1, key, 0x50, xmm_key_shuf_mask);
-    load_key(xmm_temp2, key, 0x60, xmm_key_shuf_mask);
-    load_key(xmm_temp3, key, 0x70, xmm_key_shuf_mask);
-    load_key(xmm_temp4, key, 0x80, xmm_key_shuf_mask);
-
-    __ aesenc(xmm_result, xmm_temp1);
-    __ aesenc(xmm_result, xmm_temp2);
-    __ aesenc(xmm_result, xmm_temp3);
-    __ aesenc(xmm_result, xmm_temp4);
-
-    load_key(xmm_temp1, key, 0x90, xmm_key_shuf_mask);
-    load_key(xmm_temp2, key, 0xa0, xmm_key_shuf_mask);
-
-    __ cmpl(keylen, 44);
-    __ jccb(Assembler::equal, L_doLast);
-
-    __ aesenc(xmm_result, xmm_temp1);
-    __ aesenc(xmm_result, xmm_temp2);
-
-    load_key(xmm_temp1, key, 0xb0, xmm_key_shuf_mask);
-    load_key(xmm_temp2, key, 0xc0, xmm_key_shuf_mask);
-
-    __ cmpl(keylen, 52);
-    __ jccb(Assembler::equal, L_doLast);
-
-    __ aesenc(xmm_result, xmm_temp1);
-    __ aesenc(xmm_result, xmm_temp2);
-
-    load_key(xmm_temp1, key, 0xd0, xmm_key_shuf_mask);
-    load_key(xmm_temp2, key, 0xe0, xmm_key_shuf_mask);
-
-    __ BIND(L_doLast);
-    __ aesenc(xmm_result, xmm_temp1);
-    __ aesenclast(xmm_result, xmm_temp2);
-    __ movdqu(Address(to, 0), xmm_result);        // store the result
-    __ xorptr(rax, rax); // return 0
-    __ leave(); // required for proper stackwalking of RuntimeStub frame
-    __ ret(0);
-
-    return start;
-  }
-
-
-  // Arguments:
-  //
-  // Inputs:
-  //   c_rarg0   - source byte array address
-  //   c_rarg1   - destination byte array address
-  //   c_rarg2   - K (key) in little endian int array
-  //
-  address generate_aescrypt_decryptBlock() {
-    assert(UseAES, "need AES instructions and misaligned SSE support");
-    __ align(CodeEntryAlignment);
-    StubGenStubId stub_id = StubGenStubId::aescrypt_decryptBlock_id;
-    StubCodeMark mark(this, stub_id);
-    Label L_doLast;
-    address start = __ pc();
-
-    const Register from        = rdx;      // source array address
-    const Register to          = rdx;      // destination array address
-    const Register key         = rcx;      // key array address
-    const Register keylen      = rax;
-    const Address  from_param(rbp, 8+0);
-    const Address  to_param  (rbp, 8+4);
-    const Address  key_param (rbp, 8+8);
-
-    const XMMRegister xmm_result = xmm0;
-    const XMMRegister xmm_key_shuf_mask = xmm1;
-    const XMMRegister xmm_temp1  = xmm2;
-    const XMMRegister xmm_temp2  = xmm3;
-    const XMMRegister xmm_temp3  = xmm4;
-    const XMMRegister xmm_temp4  = xmm5;
-
-    __ enter(); // required for proper stackwalking of RuntimeStub frame
-
-    __ movptr(from, from_param);
-    __ movptr(key, key_param);
-
-    // keylen could be only {11, 13, 15} * 4 = {44, 52, 60}
-    __ movl(keylen, Address(key, arrayOopDesc::length_offset_in_bytes() - arrayOopDesc::base_offset_in_bytes(T_INT)));
-
-    __ movdqu(xmm_key_shuf_mask, ExternalAddress(key_shuffle_mask_addr()));
-    __ movdqu(xmm_result, Address(from, 0));
-    __ movptr(to, to_param);
-
-    // for decryption java expanded key ordering is rotated one position from what we want
-    // so we start from 0x10 here and hit 0x00 last
-    // we don't know if the key is aligned, hence not using load-execute form
-    load_key(xmm_temp1, key, 0x10, xmm_key_shuf_mask);
-    load_key(xmm_temp2, key, 0x20, xmm_key_shuf_mask);
-    load_key(xmm_temp3, key, 0x30, xmm_key_shuf_mask);
-    load_key(xmm_temp4, key, 0x40, xmm_key_shuf_mask);
-
-    __ pxor  (xmm_result, xmm_temp1);
-    __ aesdec(xmm_result, xmm_temp2);
-    __ aesdec(xmm_result, xmm_temp3);
-    __ aesdec(xmm_result, xmm_temp4);
-
-    load_key(xmm_temp1, key, 0x50, xmm_key_shuf_mask);
-    load_key(xmm_temp2, key, 0x60, xmm_key_shuf_mask);
-    load_key(xmm_temp3, key, 0x70, xmm_key_shuf_mask);
-    load_key(xmm_temp4, key, 0x80, xmm_key_shuf_mask);
-
-    __ aesdec(xmm_result, xmm_temp1);
-    __ aesdec(xmm_result, xmm_temp2);
-    __ aesdec(xmm_result, xmm_temp3);
-    __ aesdec(xmm_result, xmm_temp4);
-
-    load_key(xmm_temp1, key, 0x90, xmm_key_shuf_mask);
-    load_key(xmm_temp2, key, 0xa0, xmm_key_shuf_mask);
-    load_key(xmm_temp3, key, 0x00, xmm_key_shuf_mask);
-
-    __ cmpl(keylen, 44);
-    __ jccb(Assembler::equal, L_doLast);
-
-    __ aesdec(xmm_result, xmm_temp1);
-    __ aesdec(xmm_result, xmm_temp2);
-
-    load_key(xmm_temp1, key, 0xb0, xmm_key_shuf_mask);
-    load_key(xmm_temp2, key, 0xc0, xmm_key_shuf_mask);
-
-    __ cmpl(keylen, 52);
-    __ jccb(Assembler::equal, L_doLast);
-
-    __ aesdec(xmm_result, xmm_temp1);
-    __ aesdec(xmm_result, xmm_temp2);
-
-    load_key(xmm_temp1, key, 0xd0, xmm_key_shuf_mask);
-    load_key(xmm_temp2, key, 0xe0, xmm_key_shuf_mask);
-
-    __ BIND(L_doLast);
-    __ aesdec(xmm_result, xmm_temp1);
-    __ aesdec(xmm_result, xmm_temp2);
-
-    // for decryption the aesdeclast operation is always on key+0x00
-    __ aesdeclast(xmm_result, xmm_temp3);
-    __ movdqu(Address(to, 0), xmm_result);  // store the result
-    __ xorptr(rax, rax); // return 0
-    __ leave(); // required for proper stackwalking of RuntimeStub frame
-    __ ret(0);
-
-    return start;
-  }
-
-  void handleSOERegisters(bool saving) {
-    const int saveFrameSizeInBytes = 4 * wordSize;
-    const Address saved_rbx     (rbp, -3 * wordSize);
-    const Address saved_rsi     (rbp, -2 * wordSize);
-    const Address saved_rdi     (rbp, -1 * wordSize);
-
-    if (saving) {
-      __ subptr(rsp, saveFrameSizeInBytes);
-      __ movptr(saved_rsi, rsi);
-      __ movptr(saved_rdi, rdi);
-      __ movptr(saved_rbx, rbx);
-    } else {
-      // restoring
-      __ movptr(rsi, saved_rsi);
-      __ movptr(rdi, saved_rdi);
-      __ movptr(rbx, saved_rbx);
-    }
-  }
-
-  // Arguments:
-  //
-  // Inputs:
-  //   c_rarg0   - source byte array address
-  //   c_rarg1   - destination byte array address
-  //   c_rarg2   - K (key) in little endian int array
-  //   c_rarg3   - r vector byte array address
-  //   c_rarg4   - input length
-  //
-  // Output:
-  //   rax       - input length
-  //
-  address generate_cipherBlockChaining_encryptAESCrypt() {
-    assert(UseAES, "need AES instructions and misaligned SSE support");
-    __ align(CodeEntryAlignment);
-    StubGenStubId stub_id = StubGenStubId::cipherBlockChaining_encryptAESCrypt_id;
-    StubCodeMark mark(this, stub_id);
-    address start = __ pc();
-
-    Label L_exit, L_key_192_256, L_key_256, L_loopTop_128, L_loopTop_192, L_loopTop_256;
-    const Register from        = rsi;      // source array address
-    const Register to          = rdx;      // destination array address
-    const Register key         = rcx;      // key array address
-    const Register rvec        = rdi;      // r byte array initialized from initvector array address
-                                           // and left with the results of the last encryption block
-    const Register len_reg     = rbx;      // src len (must be multiple of blocksize 16)
-    const Register pos         = rax;
-
-    // xmm register assignments for the loops below
-    const XMMRegister xmm_result = xmm0;
-    const XMMRegister xmm_temp   = xmm1;
-    // first 6 keys preloaded into xmm2-xmm7
-    const int XMM_REG_NUM_KEY_FIRST = 2;
-    const int XMM_REG_NUM_KEY_LAST  = 7;
-    const XMMRegister xmm_key0   = as_XMMRegister(XMM_REG_NUM_KEY_FIRST);
-
-    __ enter(); // required for proper stackwalking of RuntimeStub frame
-    handleSOERegisters(true /*saving*/);
-
-    // load registers from incoming parameters
-    const Address  from_param(rbp, 8+0);
-    const Address  to_param  (rbp, 8+4);
-    const Address  key_param (rbp, 8+8);
-    const Address  rvec_param (rbp, 8+12);
-    const Address  len_param  (rbp, 8+16);
-    __ movptr(from , from_param);
-    __ movptr(to   , to_param);
-    __ movptr(key  , key_param);
-    __ movptr(rvec , rvec_param);
-    __ movptr(len_reg , len_param);
-
-    const XMMRegister xmm_key_shuf_mask = xmm_temp;  // used temporarily to swap key bytes up front
-    __ movdqu(xmm_key_shuf_mask, ExternalAddress(key_shuffle_mask_addr()));
-    // load up xmm regs 2 thru 7 with keys 0-5
-    for (int rnum = XMM_REG_NUM_KEY_FIRST, offset = 0x00; rnum  <= XMM_REG_NUM_KEY_LAST; rnum++) {
-      load_key(as_XMMRegister(rnum), key, offset, xmm_key_shuf_mask);
-      offset += 0x10;
-    }
-
-    __ movdqu(xmm_result, Address(rvec, 0x00));   // initialize xmm_result with r vec
-
-    // now split to different paths depending on the keylen (len in ints of AESCrypt.KLE array (52=192, or 60=256))
-    __ movl(rax, Address(key, arrayOopDesc::length_offset_in_bytes() - arrayOopDesc::base_offset_in_bytes(T_INT)));
-    __ cmpl(rax, 44);
-    __ jcc(Assembler::notEqual, L_key_192_256);
-
-    // 128 bit code follows here
-    __ movl(pos, 0);
-    __ align(OptoLoopAlignment);
-    __ BIND(L_loopTop_128);
-    __ movdqu(xmm_temp, Address(from, pos, Address::times_1, 0));   // get next 16 bytes of input
-    __ pxor  (xmm_result, xmm_temp);                                // xor with the current r vector
-
-    __ pxor  (xmm_result, xmm_key0);                                // do the aes rounds
-    for (int rnum = XMM_REG_NUM_KEY_FIRST + 1; rnum  <= XMM_REG_NUM_KEY_LAST; rnum++) {
-      __ aesenc(xmm_result, as_XMMRegister(rnum));
-    }
-    for (int key_offset = 0x60; key_offset <= 0x90; key_offset += 0x10) {
-      aes_enc_key(xmm_result, xmm_temp, key, key_offset);
-    }
-    load_key(xmm_temp, key, 0xa0);
-    __ aesenclast(xmm_result, xmm_temp);
-
-    __ movdqu(Address(to, pos, Address::times_1, 0), xmm_result);     // store into the next 16 bytes of output
-    // no need to store r to memory until we exit
-    __ addptr(pos, AESBlockSize);
-    __ subptr(len_reg, AESBlockSize);
-    __ jcc(Assembler::notEqual, L_loopTop_128);
-
-    __ BIND(L_exit);
-    __ movdqu(Address(rvec, 0), xmm_result);     // final value of r stored in rvec of CipherBlockChaining object
-
-    handleSOERegisters(false /*restoring*/);
-    __ movptr(rax, len_param); // return length
-    __ leave();                                  // required for proper stackwalking of RuntimeStub frame
-    __ ret(0);
-
-    __ BIND(L_key_192_256);
-    // here rax = len in ints of AESCrypt.KLE array (52=192, or 60=256)
-    __ cmpl(rax, 52);
-    __ jcc(Assembler::notEqual, L_key_256);
-
-    // 192-bit code follows here (could be changed to use more xmm registers)
-    __ movl(pos, 0);
-    __ align(OptoLoopAlignment);
-    __ BIND(L_loopTop_192);
-    __ movdqu(xmm_temp, Address(from, pos, Address::times_1, 0));   // get next 16 bytes of input
-    __ pxor  (xmm_result, xmm_temp);                                // xor with the current r vector
-
-    __ pxor  (xmm_result, xmm_key0);                                // do the aes rounds
-    for (int rnum = XMM_REG_NUM_KEY_FIRST + 1; rnum  <= XMM_REG_NUM_KEY_LAST; rnum++) {
-      __ aesenc(xmm_result, as_XMMRegister(rnum));
-    }
-    for (int key_offset = 0x60; key_offset <= 0xb0; key_offset += 0x10) {
-      aes_enc_key(xmm_result, xmm_temp, key, key_offset);
-    }
-    load_key(xmm_temp, key, 0xc0);
-    __ aesenclast(xmm_result, xmm_temp);
-
-    __ movdqu(Address(to, pos, Address::times_1, 0), xmm_result);   // store into the next 16 bytes of output
-    // no need to store r to memory until we exit
-    __ addptr(pos, AESBlockSize);
-    __ subptr(len_reg, AESBlockSize);
-    __ jcc(Assembler::notEqual, L_loopTop_192);
-    __ jmp(L_exit);
-
-    __ BIND(L_key_256);
-    // 256-bit code follows here (could be changed to use more xmm registers)
-    __ movl(pos, 0);
-    __ align(OptoLoopAlignment);
-    __ BIND(L_loopTop_256);
-    __ movdqu(xmm_temp, Address(from, pos, Address::times_1, 0));   // get next 16 bytes of input
-    __ pxor  (xmm_result, xmm_temp);                                // xor with the current r vector
-
-    __ pxor  (xmm_result, xmm_key0);                                // do the aes rounds
-    for (int rnum = XMM_REG_NUM_KEY_FIRST + 1; rnum  <= XMM_REG_NUM_KEY_LAST; rnum++) {
-      __ aesenc(xmm_result, as_XMMRegister(rnum));
-    }
-    for (int key_offset = 0x60; key_offset <= 0xd0; key_offset += 0x10) {
-      aes_enc_key(xmm_result, xmm_temp, key, key_offset);
-    }
-    load_key(xmm_temp, key, 0xe0);
-    __ aesenclast(xmm_result, xmm_temp);
-
-    __ movdqu(Address(to, pos, Address::times_1, 0), xmm_result);   // store into the next 16 bytes of output
-    // no need to store r to memory until we exit
-    __ addptr(pos, AESBlockSize);
-    __ subptr(len_reg, AESBlockSize);
-    __ jcc(Assembler::notEqual, L_loopTop_256);
-    __ jmp(L_exit);
-
-    return start;
-  }
-
-
-  // CBC AES Decryption.
-  // In 32-bit stub, because of lack of registers we do not try to parallelize 4 blocks at a time.
-  //
-  // Arguments:
-  //
-  // Inputs:
-  //   c_rarg0   - source byte array address
-  //   c_rarg1   - destination byte array address
-  //   c_rarg2   - K (key) in little endian int array
-  //   c_rarg3   - r vector byte array address
-  //   c_rarg4   - input length
-  //
-  // Output:
-  //   rax       - input length
-  //
-
-  address generate_cipherBlockChaining_decryptAESCrypt_Parallel() {
-    assert(UseAES, "need AES instructions and misaligned SSE support");
-    __ align(CodeEntryAlignment);
-    StubGenStubId stub_id = StubGenStubId::cipherBlockChaining_decryptAESCrypt_id;
-    StubCodeMark mark(this, stub_id);
-    address start = __ pc();
-
-    const Register from        = rsi;      // source array address
-    const Register to          = rdx;      // destination array address
-    const Register key         = rcx;      // key array address
-    const Register rvec        = rdi;      // r byte array initialized from initvector array address
-                                           // and left with the results of the last encryption block
-    const Register len_reg     = rbx;      // src len (must be multiple of blocksize 16)
-    const Register pos         = rax;
-
-    const int PARALLEL_FACTOR = 4;
-    const int ROUNDS[3] = { 10, 12, 14 }; //aes rounds for key128, key192, key256
-
-    Label L_exit;
-    Label L_singleBlock_loopTop[3]; //128, 192, 256
-    Label L_multiBlock_loopTop[3]; //128, 192, 256
-
-    const XMMRegister xmm_prev_block_cipher = xmm0; // holds cipher of previous block
-    const XMMRegister xmm_key_shuf_mask = xmm1;
-
-    const XMMRegister xmm_key_tmp0 = xmm2;
-    const XMMRegister xmm_key_tmp1 = xmm3;
-
-    // registers holding the six results in the parallelized loop
-    const XMMRegister xmm_result0 = xmm4;
-    const XMMRegister xmm_result1 = xmm5;
-    const XMMRegister xmm_result2 = xmm6;
-    const XMMRegister xmm_result3 = xmm7;
-
-    __ enter(); // required for proper stackwalking of RuntimeStub frame
-    handleSOERegisters(true /*saving*/);
-
-    // load registers from incoming parameters
-    const Address  from_param(rbp, 8+0);
-    const Address  to_param  (rbp, 8+4);
-    const Address  key_param (rbp, 8+8);
-    const Address  rvec_param (rbp, 8+12);
-    const Address  len_param  (rbp, 8+16);
-
-    __ movptr(from , from_param);
-    __ movptr(to   , to_param);
-    __ movptr(key  , key_param);
-    __ movptr(rvec , rvec_param);
-    __ movptr(len_reg , len_param);
-
-    __ movdqu(xmm_key_shuf_mask, ExternalAddress(key_shuffle_mask_addr()));
-    __ movdqu(xmm_prev_block_cipher, Address(rvec, 0x00)); // initialize with initial rvec
-
-    __ xorptr(pos, pos);
-
-    // now split to different paths depending on the keylen (len in ints of AESCrypt.KLE array (52=192, or 60=256))
-    // rvec is reused
-    __ movl(rvec, Address(key, arrayOopDesc::length_offset_in_bytes() - arrayOopDesc::base_offset_in_bytes(T_INT)));
-    __ cmpl(rvec, 52);
-    __ jcc(Assembler::equal, L_multiBlock_loopTop[1]);
-    __ cmpl(rvec, 60);
-    __ jcc(Assembler::equal, L_multiBlock_loopTop[2]);
-
-#define DoFour(opc, src_reg)           \
-  __ opc(xmm_result0, src_reg);         \
-  __ opc(xmm_result1, src_reg);         \
-  __ opc(xmm_result2, src_reg);         \
-  __ opc(xmm_result3, src_reg);         \
-
-    for (int k = 0; k < 3; ++k) {
-      __ align(OptoLoopAlignment);
-      __ BIND(L_multiBlock_loopTop[k]);
-      __ cmpptr(len_reg, PARALLEL_FACTOR * AESBlockSize); // see if at least 4 blocks left
-      __ jcc(Assembler::less, L_singleBlock_loopTop[k]);
-
-      __ movdqu(xmm_result0, Address(from, pos, Address::times_1, 0 * AESBlockSize)); // get next 4 blocks into xmmresult registers
-      __ movdqu(xmm_result1, Address(from, pos, Address::times_1, 1 * AESBlockSize));
-      __ movdqu(xmm_result2, Address(from, pos, Address::times_1, 2 * AESBlockSize));
-      __ movdqu(xmm_result3, Address(from, pos, Address::times_1, 3 * AESBlockSize));
-
-      // the java expanded key ordering is rotated one position from what we want
-      // so we start from 0x10 here and hit 0x00 last
-      load_key(xmm_key_tmp0, key, 0x10, xmm_key_shuf_mask);
-      DoFour(pxor, xmm_key_tmp0); //xor with first key
-      // do the aes dec rounds
-      for (int rnum = 1; rnum <= ROUNDS[k];) {
-        //load two keys at a time
-        //k1->0x20, ..., k9->0xa0, k10->0x00
-        load_key(xmm_key_tmp1, key, (rnum + 1) * 0x10, xmm_key_shuf_mask);
-        load_key(xmm_key_tmp0, key, ((rnum + 2) % (ROUNDS[k] + 1)) * 0x10, xmm_key_shuf_mask); // hit 0x00 last!
-        DoFour(aesdec, xmm_key_tmp1);
-        rnum++;
-        if (rnum != ROUNDS[k]) {
-          DoFour(aesdec, xmm_key_tmp0);
-        }
-        else {
-          DoFour(aesdeclast, xmm_key_tmp0);
-        }
-        rnum++;
-      }
-
-      // for each result, xor with the r vector of previous cipher block
-      __ pxor(xmm_result0, xmm_prev_block_cipher);
-      __ movdqu(xmm_prev_block_cipher, Address(from, pos, Address::times_1, 0 * AESBlockSize));
-      __ pxor(xmm_result1, xmm_prev_block_cipher);
-      __ movdqu(xmm_prev_block_cipher, Address(from, pos, Address::times_1, 1 * AESBlockSize));
-      __ pxor(xmm_result2, xmm_prev_block_cipher);
-      __ movdqu(xmm_prev_block_cipher, Address(from, pos, Address::times_1, 2 * AESBlockSize));
-      __ pxor(xmm_result3, xmm_prev_block_cipher);
-      __ movdqu(xmm_prev_block_cipher, Address(from, pos, Address::times_1, 3 * AESBlockSize)); // this will carry over to next set of blocks
-
-            // store 4 results into the next 64 bytes of output
-       __ movdqu(Address(to, pos, Address::times_1, 0 * AESBlockSize), xmm_result0);
-       __ movdqu(Address(to, pos, Address::times_1, 1 * AESBlockSize), xmm_result1);
-       __ movdqu(Address(to, pos, Address::times_1, 2 * AESBlockSize), xmm_result2);
-       __ movdqu(Address(to, pos, Address::times_1, 3 * AESBlockSize), xmm_result3);
-
-       __ addptr(pos, 4 * AESBlockSize);
-       __ subptr(len_reg, 4 * AESBlockSize);
-       __ jmp(L_multiBlock_loopTop[k]);
-
-       //singleBlock starts here
-       __ align(OptoLoopAlignment);
-       __ BIND(L_singleBlock_loopTop[k]);
-       __ cmpptr(len_reg, 0); // any blocks left?
-       __ jcc(Assembler::equal, L_exit);
-       __ movdqu(xmm_result0, Address(from, pos, Address::times_1, 0)); // get next 16 bytes of cipher input
-       __ movdqa(xmm_result1, xmm_result0);
-
-       load_key(xmm_key_tmp0, key, 0x10, xmm_key_shuf_mask);
-       __ pxor(xmm_result0, xmm_key_tmp0);
-       // do the aes dec rounds
-       for (int rnum = 1; rnum < ROUNDS[k]; rnum++) {
-         // the java expanded key ordering is rotated one position from what we want
-         load_key(xmm_key_tmp0, key, (rnum + 1) * 0x10, xmm_key_shuf_mask);
-         __ aesdec(xmm_result0, xmm_key_tmp0);
-       }
-       load_key(xmm_key_tmp0, key, 0x00, xmm_key_shuf_mask);
-       __ aesdeclast(xmm_result0, xmm_key_tmp0);
-       __ pxor(xmm_result0, xmm_prev_block_cipher); // xor with the current r vector
-       __ movdqu(Address(to, pos, Address::times_1, 0), xmm_result0); // store into the next 16 bytes of output
-       // no need to store r to memory until we exit
-       __ movdqa(xmm_prev_block_cipher, xmm_result1); // set up next r vector with cipher input from this block
-
-       __ addptr(pos, AESBlockSize);
-       __ subptr(len_reg, AESBlockSize);
-       __ jmp(L_singleBlock_loopTop[k]);
-    }//for 128/192/256
-
-    __ BIND(L_exit);
-    __ movptr(rvec, rvec_param);                        // restore this since reused earlier
-    __ movdqu(Address(rvec, 0), xmm_prev_block_cipher); // final value of r stored in rvec of CipherBlockChaining object
-    handleSOERegisters(false /*restoring*/);
-    __ movptr(rax, len_param);                          // return length
-    __ leave();                                         // required for proper stackwalking of RuntimeStub frame
-    __ ret(0);
-
-    return start;
-  }
-
-  // CTR AES crypt.
-  // In 32-bit stub, parallelize 4 blocks at a time
-  // Arguments:
-  //
-  // Inputs:
-  //   c_rarg0   - source byte array address
-  //   c_rarg1   - destination byte array address
-  //   c_rarg2   - K (key) in little endian int array
-  //   c_rarg3   - counter vector byte array address
-  //   c_rarg4   - input length
-  //
-  // Output:
-  //   rax       - input length
-  //
-  address generate_counterMode_AESCrypt_Parallel() {
-    assert(UseAES, "need AES instructions and misaligned SSE support");
-    __ align(CodeEntryAlignment);
-    StubGenStubId stub_id = StubGenStubId::counterMode_AESCrypt_id;
-    StubCodeMark mark(this, stub_id);
-    address start = __ pc();
-    const Register from        = rsi;      // source array address
-    const Register to          = rdx;      // destination array address
-    const Register key         = rcx;      // key array address
-    const Register counter     = rdi;      // counter byte array initialized from initvector array address
-                                           // and updated with the incremented counter in the end
-    const Register len_reg     = rbx;
-    const Register pos         = rax;
-
-    __ enter(); // required for proper stackwalking of RuntimeStub frame
-    handleSOERegisters(true /*saving*/); // save rbx, rsi, rdi
-
-    // load registers from incoming parameters
-    const Address  from_param(rbp, 8+0);
-    const Address  to_param  (rbp, 8+4);
-    const Address  key_param (rbp, 8+8);
-    const Address  rvec_param (rbp, 8+12);
-    const Address  len_param  (rbp, 8+16);
-    const Address  saved_counter_param(rbp, 8 + 20);
-    const Address  used_addr_param(rbp, 8 + 24);
-
-    __ movptr(from , from_param);
-    __ movptr(to   , to_param);
-    __ movptr(len_reg , len_param);
-
-    // Use the partially used encrpyted counter from last invocation
-    Label L_exit_preLoop, L_preLoop_start;
-
-    // Use the registers 'counter' and 'key' here in this preloop
-    // to hold of last 2 params 'used' and 'saved_encCounter_start'
-    Register used = counter;
-    Register saved_encCounter_start = key;
-    Register used_addr = saved_encCounter_start;
-
-    __ movptr(used_addr, used_addr_param);
-    __ movptr(used, Address(used_addr, 0));
-    __ movptr(saved_encCounter_start, saved_counter_param);
-
-    __ BIND(L_preLoop_start);
-    __ cmpptr(used, 16);
-    __ jcc(Assembler::aboveEqual, L_exit_preLoop);
-    __ cmpptr(len_reg, 0);
-    __ jcc(Assembler::lessEqual, L_exit_preLoop);
-    __ movb(rax, Address(saved_encCounter_start, used));
-    __ xorb(rax, Address(from, 0));
-    __ movb(Address(to, 0), rax);
-    __ addptr(from, 1);
-    __ addptr(to, 1);
-    __ addptr(used, 1);
-    __ subptr(len_reg, 1);
-
-    __ jmp(L_preLoop_start);
-
-    __ BIND(L_exit_preLoop);
-    __ movptr(used_addr, used_addr_param);
-    __ movptr(used_addr, used_addr_param);
-    __ movl(Address(used_addr, 0), used);
-
-    // load the parameters 'key' and 'counter'
-    __ movptr(key, key_param);
-    __ movptr(counter, rvec_param);
-
-    // xmm register assignments for the loops below
-    const XMMRegister xmm_curr_counter      = xmm0;
-    const XMMRegister xmm_counter_shuf_mask = xmm1;  // need to be reloaded
-    const XMMRegister xmm_key_shuf_mask     = xmm2;  // need to be reloaded
-    const XMMRegister xmm_key               = xmm3;
-    const XMMRegister xmm_result0           = xmm4;
-    const XMMRegister xmm_result1           = xmm5;
-    const XMMRegister xmm_result2           = xmm6;
-    const XMMRegister xmm_result3           = xmm7;
-    const XMMRegister xmm_from0             = xmm1;   //reuse XMM register
-    const XMMRegister xmm_from1             = xmm2;
-    const XMMRegister xmm_from2             = xmm3;
-    const XMMRegister xmm_from3             = xmm4;
-
-    //for key_128, key_192, key_256
-    const int rounds[3] = {10, 12, 14};
-    Label L_singleBlockLoopTop[3];
-    Label L_multiBlock_loopTop[3];
-    Label L_key192_top, L_key256_top;
-    Label L_incCounter[3][4]; // 3: different key length,  4: 4 blocks at a time
-    Label L_incCounter_single[3]; //for single block, key128, key192, key256
-    Label L_processTail_insr[3], L_processTail_4_insr[3], L_processTail_2_insr[3], L_processTail_1_insr[3], L_processTail_exit_insr[3];
-    Label L_processTail_extr[3], L_processTail_4_extr[3], L_processTail_2_extr[3], L_processTail_1_extr[3], L_processTail_exit_extr[3];
-
-    Label L_exit;
-    const int PARALLEL_FACTOR = 4;  //because of the limited register number
-
-    // initialize counter with initial counter
-    __ movdqu(xmm_curr_counter, Address(counter, 0x00));
-    __ movdqu(xmm_counter_shuf_mask, ExternalAddress(counter_shuffle_mask_addr()));
-    __ pshufb(xmm_curr_counter, xmm_counter_shuf_mask); //counter is shuffled for increase
-
-    // key length could be only {11, 13, 15} * 4 = {44, 52, 60}
-    __ movdqu(xmm_key_shuf_mask, ExternalAddress(key_shuffle_mask_addr()));
-    __ movl(rax, Address(key, arrayOopDesc::length_offset_in_bytes() - arrayOopDesc::base_offset_in_bytes(T_INT)));
-    __ cmpl(rax, 52);
-    __ jcc(Assembler::equal, L_key192_top);
-    __ cmpl(rax, 60);
-    __ jcc(Assembler::equal, L_key256_top);
-
-    //key128 begins here
-    __ movptr(pos, 0); // init pos before L_multiBlock_loopTop
-
-#define CTR_DoFour(opc, src_reg)               \
-    __ opc(xmm_result0, src_reg);              \
-    __ opc(xmm_result1, src_reg);              \
-    __ opc(xmm_result2, src_reg);              \
-    __ opc(xmm_result3, src_reg);
-
-    // k == 0 :  generate code for key_128
-    // k == 1 :  generate code for key_192
-    // k == 2 :  generate code for key_256
-    for (int k = 0; k < 3; ++k) {
-      //multi blocks starts here
-      __ align(OptoLoopAlignment);
-      __ BIND(L_multiBlock_loopTop[k]);
-      __ cmpptr(len_reg, PARALLEL_FACTOR * AESBlockSize); // see if at least PARALLEL_FACTOR blocks left
-      __ jcc(Assembler::less, L_singleBlockLoopTop[k]);
-
-      __ movdqu(xmm_key_shuf_mask, ExternalAddress(key_shuffle_mask_addr()));
-      __ movdqu(xmm_counter_shuf_mask, ExternalAddress(counter_shuffle_mask_addr()));
-
-      //load, then increase counters
-      CTR_DoFour(movdqa, xmm_curr_counter);
-      __ push(rbx);
-      inc_counter(rbx, xmm_result1, 0x01, L_incCounter[k][0]);
-      inc_counter(rbx, xmm_result2, 0x02, L_incCounter[k][1]);
-      inc_counter(rbx, xmm_result3, 0x03, L_incCounter[k][2]);
-      inc_counter(rbx, xmm_curr_counter, 0x04, L_incCounter[k][3]);
-      __ pop (rbx);
-
-      load_key(xmm_key, key, 0x00, xmm_key_shuf_mask); // load Round 0 key. interleaving for better performance
-
-      CTR_DoFour(pshufb, xmm_counter_shuf_mask); // after increased, shuffled counters back for PXOR
-      CTR_DoFour(pxor, xmm_key);   //PXOR with Round 0 key
-
-      for (int i = 1; i < rounds[k]; ++i) {
-        load_key(xmm_key, key, (0x10 * i), xmm_key_shuf_mask);
-        CTR_DoFour(aesenc, xmm_key);
-      }
-      load_key(xmm_key, key, (0x10 * rounds[k]), xmm_key_shuf_mask);
-      CTR_DoFour(aesenclast, xmm_key);
-
-      // get next PARALLEL_FACTOR blocks into xmm_from registers
-      __ movdqu(xmm_from0, Address(from, pos, Address::times_1, 0 * AESBlockSize));
-      __ movdqu(xmm_from1, Address(from, pos, Address::times_1, 1 * AESBlockSize));
-      __ movdqu(xmm_from2, Address(from, pos, Address::times_1, 2 * AESBlockSize));
-
-      // PXOR with input text
-      __ pxor(xmm_result0, xmm_from0); //result0 is xmm4
-      __ pxor(xmm_result1, xmm_from1);
-      __ pxor(xmm_result2, xmm_from2);
-
-      // store PARALLEL_FACTOR results into the next 64 bytes of output
-      __ movdqu(Address(to, pos, Address::times_1, 0 * AESBlockSize), xmm_result0);
-      __ movdqu(Address(to, pos, Address::times_1, 1 * AESBlockSize), xmm_result1);
-      __ movdqu(Address(to, pos, Address::times_1, 2 * AESBlockSize), xmm_result2);
-
-      // do it here after xmm_result0 is saved, because xmm_from3 reuse the same register of xmm_result0.
-      __ movdqu(xmm_from3, Address(from, pos, Address::times_1, 3 * AESBlockSize));
-      __ pxor(xmm_result3, xmm_from3);
-      __ movdqu(Address(to, pos, Address::times_1, 3 * AESBlockSize), xmm_result3);
-
-      __ addptr(pos, PARALLEL_FACTOR * AESBlockSize); // increase the length of crypt text
-      __ subptr(len_reg, PARALLEL_FACTOR * AESBlockSize); // decrease the remaining length
-      __ jmp(L_multiBlock_loopTop[k]);
-
-      // singleBlock starts here
-      __ align(OptoLoopAlignment);
-      __ BIND(L_singleBlockLoopTop[k]);
-      __ cmpptr(len_reg, 0);
-      __ jcc(Assembler::equal, L_exit);
-      __ movdqu(xmm_key_shuf_mask, ExternalAddress(key_shuffle_mask_addr()));
-      __ movdqu(xmm_counter_shuf_mask, ExternalAddress(counter_shuffle_mask_addr()));
-      __ movdqa(xmm_result0, xmm_curr_counter);
-      load_key(xmm_key, key, 0x00, xmm_key_shuf_mask);
-      __ push(rbx);//rbx is used for increasing counter
-      inc_counter(rbx, xmm_curr_counter, 0x01, L_incCounter_single[k]);
-      __ pop (rbx);
-      __ pshufb(xmm_result0, xmm_counter_shuf_mask);
-      __ pxor(xmm_result0, xmm_key);
-      for (int i = 1; i < rounds[k]; i++) {
-        load_key(xmm_key, key, (0x10 * i), xmm_key_shuf_mask);
-        __ aesenc(xmm_result0, xmm_key);
-      }
-      load_key(xmm_key, key, (0x10 * rounds[k]), xmm_key_shuf_mask);
-      __ aesenclast(xmm_result0, xmm_key);
-      __ cmpptr(len_reg, AESBlockSize);
-      __ jcc(Assembler::less, L_processTail_insr[k]);
-        __ movdqu(xmm_from0, Address(from, pos, Address::times_1, 0 * AESBlockSize));
-        __ pxor(xmm_result0, xmm_from0);
-        __ movdqu(Address(to, pos, Address::times_1, 0 * AESBlockSize), xmm_result0);
-        __ addptr(pos, AESBlockSize);
-        __ subptr(len_reg, AESBlockSize);
-        __ jmp(L_singleBlockLoopTop[k]);
-
-      __ BIND(L_processTail_insr[k]);                                               // Process the tail part of the input array
-        __ addptr(pos, len_reg);                                                    // 1. Insert bytes from src array into xmm_from0 register
-        __ testptr(len_reg, 8);
-        __ jcc(Assembler::zero, L_processTail_4_insr[k]);
-          __ subptr(pos,8);
-          __ pinsrd(xmm_from0, Address(from, pos), 0);
-          __ pinsrd(xmm_from0, Address(from, pos, Address::times_1, 4), 1);
-        __ BIND(L_processTail_4_insr[k]);
-        __ testptr(len_reg, 4);
-        __ jcc(Assembler::zero, L_processTail_2_insr[k]);
-          __ subptr(pos,4);
-          __ pslldq(xmm_from0, 4);
-          __ pinsrd(xmm_from0, Address(from, pos), 0);
-        __ BIND(L_processTail_2_insr[k]);
-        __ testptr(len_reg, 2);
-        __ jcc(Assembler::zero, L_processTail_1_insr[k]);
-          __ subptr(pos, 2);
-          __ pslldq(xmm_from0, 2);
-          __ pinsrw(xmm_from0, Address(from, pos), 0);
-        __ BIND(L_processTail_1_insr[k]);
-        __ testptr(len_reg, 1);
-        __ jcc(Assembler::zero, L_processTail_exit_insr[k]);
-          __ subptr(pos, 1);
-          __ pslldq(xmm_from0, 1);
-          __ pinsrb(xmm_from0, Address(from, pos), 0);
-        __ BIND(L_processTail_exit_insr[k]);
-
-        __ movptr(saved_encCounter_start, saved_counter_param);
-        __ movdqu(Address(saved_encCounter_start, 0), xmm_result0);               // 2. Perform pxor of the encrypted counter and plaintext Bytes.
-        __ pxor(xmm_result0, xmm_from0);                                          //    Also the encrypted counter is saved for next invocation.
-
-        __ testptr(len_reg, 8);
-        __ jcc(Assembler::zero, L_processTail_4_extr[k]);                        // 3. Extract bytes from xmm_result0 into the dest. array
-          __ pextrd(Address(to, pos), xmm_result0, 0);
-          __ pextrd(Address(to, pos, Address::times_1, 4), xmm_result0, 1);
-          __ psrldq(xmm_result0, 8);
-          __ addptr(pos, 8);
-        __ BIND(L_processTail_4_extr[k]);
-        __ testptr(len_reg, 4);
-        __ jcc(Assembler::zero, L_processTail_2_extr[k]);
-          __ pextrd(Address(to, pos), xmm_result0, 0);
-          __ psrldq(xmm_result0, 4);
-          __ addptr(pos, 4);
-        __ BIND(L_processTail_2_extr[k]);
-        __ testptr(len_reg, 2);
-        __ jcc(Assembler::zero, L_processTail_1_extr[k]);
-          __ pextrb(Address(to, pos), xmm_result0, 0);
-          __ pextrb(Address(to, pos, Address::times_1, 1), xmm_result0, 1);
-          __ psrldq(xmm_result0, 2);
-          __ addptr(pos, 2);
-        __ BIND(L_processTail_1_extr[k]);
-        __ testptr(len_reg, 1);
-        __ jcc(Assembler::zero, L_processTail_exit_extr[k]);
-          __ pextrb(Address(to, pos), xmm_result0, 0);
-
-        __ BIND(L_processTail_exit_extr[k]);
-        __ movptr(used_addr, used_addr_param);
-        __ movl(Address(used_addr, 0), len_reg);
-        __ jmp(L_exit);
-    }
-
-    __ BIND(L_exit);
-    __ movdqu(xmm_counter_shuf_mask, ExternalAddress(counter_shuffle_mask_addr()));
-    __ pshufb(xmm_curr_counter, xmm_counter_shuf_mask); //counter is shuffled back.
-    __ movdqu(Address(counter, 0), xmm_curr_counter); //save counter back
-    handleSOERegisters(false /*restoring*/);
-    __ movptr(rax, len_param); // return length
-    __ leave();                // required for proper stackwalking of RuntimeStub frame
-    __ ret(0);
-
-    __ BIND (L_key192_top);
-    __ movptr(pos, 0); // init pos before L_multiBlock_loopTop
-    __ jmp(L_multiBlock_loopTop[1]); //key192
-
-    __ BIND (L_key256_top);
-    __ movptr(pos, 0); // init pos before L_multiBlock_loopTop
-    __ jmp(L_multiBlock_loopTop[2]); //key192
-
-    return start;
-  }
-
-  // ofs and limit are use for multi-block byte array.
-  // int com.sun.security.provider.MD5.implCompress(byte[] b, int ofs)
-  address generate_md5_implCompress(StubGenStubId stub_id) {
-    bool multi_block;
-    switch(stub_id) {
-    case StubGenStubId::md5_implCompress_id:
-      multi_block = false;
-      break;
-    case StubGenStubId::md5_implCompressMB_id:
-      multi_block = true;
-      break;
-    default:
-      ShouldNotReachHere();
-    }
-
-    __ align(CodeEntryAlignment);
-    StubCodeMark mark(this, stub_id);
-    address start = __ pc();
-
-    const Register buf_param = rbp;
-    const Address state_param(rsp, 0 * wordSize);
-    const Address ofs_param  (rsp, 1 * wordSize);
-    const Address limit_param(rsp, 2 * wordSize);
-
-    __ enter();
-    __ push(rbx);
-    __ push(rdi);
-    __ push(rsi);
-    __ push(rbp);
-    __ subptr(rsp, 3 * wordSize);
-
-    __ movptr(rsi, Address(rbp, 8 + 4));
-    __ movptr(state_param, rsi);
-    if (multi_block) {
-      __ movptr(rsi, Address(rbp, 8 + 8));
-      __ movptr(ofs_param, rsi);
-      __ movptr(rsi, Address(rbp, 8 + 12));
-      __ movptr(limit_param, rsi);
-    }
-    __ movptr(buf_param, Address(rbp, 8 + 0)); // do it last because it override rbp
-    __ fast_md5(buf_param, state_param, ofs_param, limit_param, multi_block);
-
-    __ addptr(rsp, 3 * wordSize);
-    __ pop(rbp);
-    __ pop(rsi);
-    __ pop(rdi);
-    __ pop(rbx);
-    __ leave();
-    __ ret(0);
-    return start;
-  }
-
-  address generate_upper_word_mask() {
-    __ align64();
-    StubGenStubId stub_id = StubGenStubId::upper_word_mask_id;
-    StubCodeMark mark(this, stub_id);
-    address start = __ pc();
-    __ emit_data(0x00000000, relocInfo::none, 0);
-    __ emit_data(0x00000000, relocInfo::none, 0);
-    __ emit_data(0x00000000, relocInfo::none, 0);
-    __ emit_data(0xFFFFFFFF, relocInfo::none, 0);
-    return start;
-  }
-
-  address generate_shuffle_byte_flip_mask() {
-    __ align64();
-    StubGenStubId stub_id = StubGenStubId::shuffle_byte_flip_mask_id;
-    StubCodeMark mark(this, stub_id);
-    address start = __ pc();
-    __ emit_data(0x0c0d0e0f, relocInfo::none, 0);
-    __ emit_data(0x08090a0b, relocInfo::none, 0);
-    __ emit_data(0x04050607, relocInfo::none, 0);
-    __ emit_data(0x00010203, relocInfo::none, 0);
-    return start;
-  }
-
-  // ofs and limit are use for multi-block byte array.
-  // int com.sun.security.provider.DigestBase.implCompressMultiBlock(byte[] b, int ofs, int limit)
-  address generate_sha1_implCompress(StubGenStubId stub_id) {
-    bool multi_block;
-    switch(stub_id) {
-    case StubGenStubId::sha1_implCompress_id:
-      multi_block = false;
-      break;
-    case StubGenStubId::sha1_implCompressMB_id:
-      multi_block = true;
-      break;
-    default:
-      ShouldNotReachHere();
-    }
-
-    __ align(CodeEntryAlignment);
-    StubCodeMark mark(this, stub_id);
-    address start = __ pc();
-
-    Register buf   = rax;
-    Register state = rdx;
-    Register ofs   = rcx;
-    Register limit = rdi;
-
-    const Address  buf_param(rbp, 8 + 0);
-    const Address  state_param(rbp, 8 + 4);
-    const Address  ofs_param(rbp, 8 + 8);
-    const Address  limit_param(rbp, 8 + 12);
-
-    const XMMRegister abcd = xmm0;
-    const XMMRegister e0 = xmm1;
-    const XMMRegister e1 = xmm2;
-    const XMMRegister msg0 = xmm3;
-
-    const XMMRegister msg1 = xmm4;
-    const XMMRegister msg2 = xmm5;
-    const XMMRegister msg3 = xmm6;
-    const XMMRegister shuf_mask = xmm7;
-
-    __ enter();
-    __ subptr(rsp, 8 * wordSize);
-    handleSOERegisters(true /*saving*/);
-
-    __ movptr(buf, buf_param);
-    __ movptr(state, state_param);
-    if (multi_block) {
-      __ movptr(ofs, ofs_param);
-      __ movptr(limit, limit_param);
-    }
-
-    __ fast_sha1(abcd, e0, e1, msg0, msg1, msg2, msg3, shuf_mask,
-      buf, state, ofs, limit, rsp, multi_block);
-
-    handleSOERegisters(false /*restoring*/);
-    __ addptr(rsp, 8 * wordSize);
-    __ leave();
-    __ ret(0);
-    return start;
-  }
-
-  address generate_pshuffle_byte_flip_mask() {
-    __ align64();
-    StubGenStubId stub_id = StubGenStubId::pshuffle_byte_flip_mask_id;
-    StubCodeMark mark(this, stub_id);
-    address start = __ pc();
-    __ emit_data(0x00010203, relocInfo::none, 0);
-    __ emit_data(0x04050607, relocInfo::none, 0);
-    __ emit_data(0x08090a0b, relocInfo::none, 0);
-    __ emit_data(0x0c0d0e0f, relocInfo::none, 0);
-    return start;
-  }
-
-  // ofs and limit are use for multi-block byte array.
-  // int com.sun.security.provider.DigestBase.implCompressMultiBlock(byte[] b, int ofs, int limit)
- address generate_sha256_implCompress(StubGenStubId stub_id) {
-    bool multi_block;
-    switch(stub_id) {
-    case StubGenStubId::sha256_implCompress_id:
-      multi_block = false;
-      break;
-    case StubGenStubId::sha256_implCompressMB_id:
-      multi_block = true;
-      break;
-    default:
-      ShouldNotReachHere();
-    }
-
-    __ align(CodeEntryAlignment);
-    StubCodeMark mark(this, stub_id);
-    address start = __ pc();
-
-    Register buf = rbx;
-    Register state = rsi;
-    Register ofs = rdx;
-    Register limit = rcx;
-
-    const Address  buf_param(rbp, 8 + 0);
-    const Address  state_param(rbp, 8 + 4);
-    const Address  ofs_param(rbp, 8 + 8);
-    const Address  limit_param(rbp, 8 + 12);
-
-    const XMMRegister msg = xmm0;
-    const XMMRegister state0 = xmm1;
-    const XMMRegister state1 = xmm2;
-    const XMMRegister msgtmp0 = xmm3;
-
-    const XMMRegister msgtmp1 = xmm4;
-    const XMMRegister msgtmp2 = xmm5;
-    const XMMRegister msgtmp3 = xmm6;
-    const XMMRegister msgtmp4 = xmm7;
-
-    __ enter();
-    __ subptr(rsp, 8 * wordSize);
-    handleSOERegisters(true /*saving*/);
-    __ movptr(buf, buf_param);
-    __ movptr(state, state_param);
-    if (multi_block) {
-     __ movptr(ofs, ofs_param);
-     __ movptr(limit, limit_param);
-    }
-
-    __ fast_sha256(msg, state0, state1, msgtmp0, msgtmp1, msgtmp2, msgtmp3, msgtmp4,
-      buf, state, ofs, limit, rsp, multi_block);
-
-    handleSOERegisters(false);
-    __ addptr(rsp, 8 * wordSize);
-    __ leave();
-    __ ret(0);
-    return start;
-  }
-
-  // byte swap x86 long
-  address ghash_long_swap_mask_addr() {
-    return (address)GHASH_LONG_SWAP_MASK;
-  }
-
-  // byte swap x86 byte array
-  address ghash_byte_swap_mask_addr() {
-    return (address)GHASH_BYTE_SWAP_MASK;
-  }
-
-  /* Single and multi-block ghash operations */
-  address generate_ghash_processBlocks() {
-    assert(UseGHASHIntrinsics, "need GHASH intrinsics and CLMUL support");
-    __ align(CodeEntryAlignment);
-    Label L_ghash_loop, L_exit;
-    StubGenStubId stub_id = StubGenStubId::ghash_processBlocks_id;
-    StubCodeMark mark(this, stub_id);
-
-    address start = __ pc();
-
-    const Register state        = rdi;
-    const Register subkeyH      = rsi;
-    const Register data         = rdx;
-    const Register blocks       = rcx;
-
-    const Address  state_param(rbp, 8+0);
-    const Address  subkeyH_param(rbp, 8+4);
-    const Address  data_param(rbp, 8+8);
-    const Address  blocks_param(rbp, 8+12);
-
-    const XMMRegister xmm_temp0 = xmm0;
-    const XMMRegister xmm_temp1 = xmm1;
-    const XMMRegister xmm_temp2 = xmm2;
-    const XMMRegister xmm_temp3 = xmm3;
-    const XMMRegister xmm_temp4 = xmm4;
-    const XMMRegister xmm_temp5 = xmm5;
-    const XMMRegister xmm_temp6 = xmm6;
-    const XMMRegister xmm_temp7 = xmm7;
-
-    __ enter();
-    handleSOERegisters(true);  // Save registers
-
-    __ movptr(state, state_param);
-    __ movptr(subkeyH, subkeyH_param);
-    __ movptr(data, data_param);
-    __ movptr(blocks, blocks_param);
-
-    __ movdqu(xmm_temp0, Address(state, 0));
-    __ pshufb(xmm_temp0, ExternalAddress(ghash_long_swap_mask_addr()));
-
-    __ movdqu(xmm_temp1, Address(subkeyH, 0));
-    __ pshufb(xmm_temp1, ExternalAddress(ghash_long_swap_mask_addr()));
-
-    __ BIND(L_ghash_loop);
-    __ movdqu(xmm_temp2, Address(data, 0));
-    __ pshufb(xmm_temp2, ExternalAddress(ghash_byte_swap_mask_addr()));
-
-    __ pxor(xmm_temp0, xmm_temp2);
-
-    //
-    // Multiply with the hash key
-    //
-    __ movdqu(xmm_temp3, xmm_temp0);
-    __ pclmulqdq(xmm_temp3, xmm_temp1, 0);      // xmm3 holds a0*b0
-    __ movdqu(xmm_temp4, xmm_temp0);
-    __ pclmulqdq(xmm_temp4, xmm_temp1, 16);     // xmm4 holds a0*b1
-
-    __ movdqu(xmm_temp5, xmm_temp0);
-    __ pclmulqdq(xmm_temp5, xmm_temp1, 1);      // xmm5 holds a1*b0
-    __ movdqu(xmm_temp6, xmm_temp0);
-    __ pclmulqdq(xmm_temp6, xmm_temp1, 17);     // xmm6 holds a1*b1
-
-    __ pxor(xmm_temp4, xmm_temp5);      // xmm4 holds a0*b1 + a1*b0
-
-    __ movdqu(xmm_temp5, xmm_temp4);    // move the contents of xmm4 to xmm5
-    __ psrldq(xmm_temp4, 8);    // shift by xmm4 64 bits to the right
-    __ pslldq(xmm_temp5, 8);    // shift by xmm5 64 bits to the left
-    __ pxor(xmm_temp3, xmm_temp5);
-    __ pxor(xmm_temp6, xmm_temp4);      // Register pair <xmm6:xmm3> holds the result
-                                        // of the carry-less multiplication of
-                                        // xmm0 by xmm1.
-
-    // We shift the result of the multiplication by one bit position
-    // to the left to cope for the fact that the bits are reversed.
-    __ movdqu(xmm_temp7, xmm_temp3);
-    __ movdqu(xmm_temp4, xmm_temp6);
-    __ pslld (xmm_temp3, 1);
-    __ pslld(xmm_temp6, 1);
-    __ psrld(xmm_temp7, 31);
-    __ psrld(xmm_temp4, 31);
-    __ movdqu(xmm_temp5, xmm_temp7);
-    __ pslldq(xmm_temp4, 4);
-    __ pslldq(xmm_temp7, 4);
-    __ psrldq(xmm_temp5, 12);
-    __ por(xmm_temp3, xmm_temp7);
-    __ por(xmm_temp6, xmm_temp4);
-    __ por(xmm_temp6, xmm_temp5);
-
-    //
-    // First phase of the reduction
-    //
-    // Move xmm3 into xmm4, xmm5, xmm7 in order to perform the shifts
-    // independently.
-    __ movdqu(xmm_temp7, xmm_temp3);
-    __ movdqu(xmm_temp4, xmm_temp3);
-    __ movdqu(xmm_temp5, xmm_temp3);
-    __ pslld(xmm_temp7, 31);    // packed right shift shifting << 31
-    __ pslld(xmm_temp4, 30);    // packed right shift shifting << 30
-    __ pslld(xmm_temp5, 25);    // packed right shift shifting << 25
-    __ pxor(xmm_temp7, xmm_temp4);      // xor the shifted versions
-    __ pxor(xmm_temp7, xmm_temp5);
-    __ movdqu(xmm_temp4, xmm_temp7);
-    __ pslldq(xmm_temp7, 12);
-    __ psrldq(xmm_temp4, 4);
-    __ pxor(xmm_temp3, xmm_temp7);      // first phase of the reduction complete
-
-    //
-    // Second phase of the reduction
-    //
-    // Make 3 copies of xmm3 in xmm2, xmm5, xmm7 for doing these
-    // shift operations.
-    __ movdqu(xmm_temp2, xmm_temp3);
-    __ movdqu(xmm_temp7, xmm_temp3);
-    __ movdqu(xmm_temp5, xmm_temp3);
-    __ psrld(xmm_temp2, 1);     // packed left shifting >> 1
-    __ psrld(xmm_temp7, 2);     // packed left shifting >> 2
-    __ psrld(xmm_temp5, 7);     // packed left shifting >> 7
-    __ pxor(xmm_temp2, xmm_temp7);      // xor the shifted versions
-    __ pxor(xmm_temp2, xmm_temp5);
-    __ pxor(xmm_temp2, xmm_temp4);
-    __ pxor(xmm_temp3, xmm_temp2);
-    __ pxor(xmm_temp6, xmm_temp3);      // the result is in xmm6
-
-    __ decrement(blocks);
-    __ jcc(Assembler::zero, L_exit);
-    __ movdqu(xmm_temp0, xmm_temp6);
-    __ addptr(data, 16);
-    __ jmp(L_ghash_loop);
-
-    __ BIND(L_exit);
-       // Byte swap 16-byte result
-    __ pshufb(xmm_temp6, ExternalAddress(ghash_long_swap_mask_addr()));
-    __ movdqu(Address(state, 0), xmm_temp6);   // store the result
-
-    handleSOERegisters(false);  // restore registers
-    __ leave();
-    __ ret(0);
-    return start;
-  }
-
-  /**
-   *  Arguments:
-   *
-   * Inputs:
-   *   rsp(4)   - int crc
-   *   rsp(8)   - byte* buf
-   *   rsp(12)  - int length
-   *
-   * Output:
-   *       rax   - int crc result
-   */
-  address generate_updateBytesCRC32() {
-    assert(UseCRC32Intrinsics, "need AVX and CLMUL instructions");
-
-    __ align(CodeEntryAlignment);
-    StubGenStubId stub_id = StubGenStubId::updateBytesCRC32_id;
-    StubCodeMark mark(this, stub_id);
-
-    address start = __ pc();
-
-    const Register crc   = rdx;  // crc
-    const Register buf   = rsi;  // source java byte array address
-    const Register len   = rcx;  // length
-    const Register table = rdi;  // crc_table address (reuse register)
-    const Register tmp   = rbx;
-    assert_different_registers(crc, buf, len, table, tmp, rax);
-
-    BLOCK_COMMENT("Entry:");
-    __ enter(); // required for proper stackwalking of RuntimeStub frame
-    __ push(rsi);
-    __ push(rdi);
-    __ push(rbx);
-
-    Address crc_arg(rbp, 8 + 0);
-    Address buf_arg(rbp, 8 + 4);
-    Address len_arg(rbp, 8 + 8);
-
-    // Load up:
-    __ movl(crc,   crc_arg);
-    __ movptr(buf, buf_arg);
-    __ movl(len,   len_arg);
-
-    __ kernel_crc32(crc, buf, len, table, tmp);
-
-    __ movl(rax, crc);
-    __ pop(rbx);
-    __ pop(rdi);
-    __ pop(rsi);
-    __ vzeroupper();
-    __ leave(); // required for proper stackwalking of RuntimeStub frame
-    __ ret(0);
-
-    return start;
-  }
-
-  /**
-  *  Arguments:
-  *
-  * Inputs:
-  *   rsp(4)   - int crc
-  *   rsp(8)   - byte* buf
-  *   rsp(12)  - int length
-  *   rsp(16)  - table_start - optional (present only when doing a library_calll,
-  *              not used by x86 algorithm)
-  *
-  * Output:
-  *       rax  - int crc result
-  */
-  address generate_updateBytesCRC32C(bool is_pclmulqdq_supported) {
-    assert(UseCRC32CIntrinsics, "need SSE4_2");
-    __ align(CodeEntryAlignment);
-    StubGenStubId stub_id = StubGenStubId::updateBytesCRC32C_id;
-    StubCodeMark mark(this, stub_id);
-
-    address start = __ pc();
-    const Register crc = rax;  // crc
-    const Register buf = rcx;  // source java byte array address
-    const Register len = rdx;  // length
-    const Register d = rbx;
-    const Register g = rsi;
-    const Register h = rdi;
-    const Register empty = noreg; // will never be used, in order not
-                                  // to change a signature for crc32c_IPL_Alg2_Alt2
-                                  // between 64/32 I'm just keeping it here
-    assert_different_registers(crc, buf, len, d, g, h);
-
-    BLOCK_COMMENT("Entry:");
-    __ enter(); // required for proper stackwalking of RuntimeStub frame
-    Address crc_arg(rsp, 4 + 4 + 0); // ESP+4 +
-                                     // we need to add additional 4 because __ enter
-                                     // have just pushed ebp on a stack
-    Address buf_arg(rsp, 4 + 4 + 4);
-    Address len_arg(rsp, 4 + 4 + 8);
-      // Load up:
-      __ movl(crc, crc_arg);
-      __ movl(buf, buf_arg);
-      __ movl(len, len_arg);
-      __ push(d);
-      __ push(g);
-      __ push(h);
-      __ crc32c_ipl_alg2_alt2(crc, buf, len,
-                              d, g, h,
-                              empty, empty, empty,
-                              xmm0, xmm1, xmm2,
-                              is_pclmulqdq_supported);
-      __ pop(h);
-      __ pop(g);
-      __ pop(d);
-    __ vzeroupper();
-    __ leave(); // required for proper stackwalking of RuntimeStub frame
-    __ ret(0);
-
-    return start;
-  }
-
- address generate_libmExp() {
-    StubGenStubId stub_id = StubGenStubId::dexp_id;
-    StubCodeMark mark(this, stub_id);
-
-    address start = __ pc();
-
-    BLOCK_COMMENT("Entry:");
-    __ enter(); // required for proper stackwalking of RuntimeStub frame
-    __ fast_exp(xmm0, xmm1, xmm2, xmm3, xmm4, xmm5, xmm6, xmm7,
-                rax, rcx, rdx, rbx);
-    __ leave(); // required for proper stackwalking of RuntimeStub frame
-    __ ret(0);
-
-    return start;
-
-  }
-
- address generate_libmLog() {
-   StubGenStubId stub_id = StubGenStubId::dlog_id;
-   StubCodeMark mark(this, stub_id);
-
-   address start = __ pc();
-
-   BLOCK_COMMENT("Entry:");
-   __ enter(); // required for proper stackwalking of RuntimeStub frame
-   __ fast_log(xmm0, xmm1, xmm2, xmm3, xmm4, xmm5, xmm6, xmm7,
-               rax, rcx, rdx, rbx);
-   __ leave(); // required for proper stackwalking of RuntimeStub frame
-   __ ret(0);
-
-   return start;
-
- }
-
- address generate_libmLog10() {
-   StubGenStubId stub_id = StubGenStubId::dlog10_id;
-   StubCodeMark mark(this, stub_id);
-
-   address start = __ pc();
-
-   BLOCK_COMMENT("Entry:");
-   __ enter(); // required for proper stackwalking of RuntimeStub frame
-   __ fast_log10(xmm0, xmm1, xmm2, xmm3, xmm4, xmm5, xmm6, xmm7,
-               rax, rcx, rdx, rbx);
-   __ leave(); // required for proper stackwalking of RuntimeStub frame
-   __ ret(0);
-
-   return start;
-
- }
-
- address generate_libmPow() {
-   StubGenStubId stub_id = StubGenStubId::dpow_id;
-   StubCodeMark mark(this, stub_id);
-
-   address start = __ pc();
-
-   BLOCK_COMMENT("Entry:");
-   __ enter(); // required for proper stackwalking of RuntimeStub frame
-   __ fast_pow(xmm0, xmm1, xmm2, xmm3, xmm4, xmm5, xmm6, xmm7,
-               rax, rcx, rdx, rbx);
-   __ leave(); // required for proper stackwalking of RuntimeStub frame
-   __ ret(0);
-
-   return start;
-
- }
-
- address generate_libm_reduce_pi04l() {
-   StubGenStubId stub_id = StubGenStubId::dlibm_reduce_pi04l_id;
-   StubCodeMark mark(this, stub_id);
-
-   address start = __ pc();
-
-   BLOCK_COMMENT("Entry:");
-   __ libm_reduce_pi04l(rax, rcx, rdx, rbx, rsi, rdi, rbp, rsp);
-
-   return start;
-
- }
-
- address generate_libm_sin_cos_huge() {
-   StubGenStubId stub_id = StubGenStubId::dlibm_sin_cos_huge_id;
-   StubCodeMark mark(this, stub_id);
-
-   address start = __ pc();
-
-   BLOCK_COMMENT("Entry:");
-   __ libm_sincos_huge(xmm0, xmm1, rax, rcx, rdx, rbx, rsi, rdi, rbp, rsp);
-
-   return start;
-
- }
-
- address generate_libmSin() {
-   StubGenStubId stub_id = StubGenStubId::dsin_id;
-   StubCodeMark mark(this, stub_id);
-
-   address start = __ pc();
-
-   BLOCK_COMMENT("Entry:");
-   __ enter(); // required for proper stackwalking of RuntimeStub frame
-   __ fast_sin(xmm0, xmm1, xmm2, xmm3, xmm4, xmm5, xmm6, xmm7,
-               rax, rbx, rdx);
-   __ leave(); // required for proper stackwalking of RuntimeStub frame
-   __ ret(0);
-
-   return start;
-
- }
-
- address generate_libmCos() {
-   StubGenStubId stub_id = StubGenStubId::dcos_id;
-   StubCodeMark mark(this, stub_id);
-
-   address start = __ pc();
-
-   BLOCK_COMMENT("Entry:");
-   __ enter(); // required for proper stackwalking of RuntimeStub frame
-   __ fast_cos(xmm0, xmm1, xmm2, xmm3, xmm4, xmm5, xmm6, xmm7,
-               rax, rcx, rdx, rbx);
-   __ leave(); // required for proper stackwalking of RuntimeStub frame
-   __ ret(0);
-
-   return start;
-
- }
-
- address generate_libm_tan_cot_huge() {
-   StubGenStubId stub_id = StubGenStubId::dlibm_tan_cot_huge_id;
-   StubCodeMark mark(this, stub_id);
-
-   address start = __ pc();
-
-   BLOCK_COMMENT("Entry:");
-   __ libm_tancot_huge(xmm0, xmm1, rax, rcx, rdx, rbx, rsi, rdi, rbp, rsp);
-
-   return start;
-
- }
-
- address generate_libmTan() {
-   StubGenStubId stub_id = StubGenStubId::dtan_id;
-   StubCodeMark mark(this, stub_id);
-
-   address start = __ pc();
-
-   BLOCK_COMMENT("Entry:");
-   __ enter(); // required for proper stackwalking of RuntimeStub frame
-   __ fast_tan(xmm0, xmm1, xmm2, xmm3, xmm4, xmm5, xmm6, xmm7,
-               rax, rcx, rdx, rbx);
-   __ leave(); // required for proper stackwalking of RuntimeStub frame
-   __ ret(0);
-
-   return start;
-
- }
-
-  address generate_method_entry_barrier() {
-    __ align(CodeEntryAlignment);
-    StubGenStubId stub_id = StubGenStubId::method_entry_barrier_id;
-    StubCodeMark mark(this, stub_id);
-
-    Label deoptimize_label;
-
-    address start = __ pc();
-
-    __ push(-1); // cookie, this is used for writing the new rsp when deoptimizing
-
-    BLOCK_COMMENT("Entry:");
-    __ enter(); // save rbp
-
-    // save rbx, because we want to use that value.
-    // We could do without it but then we depend on the number of slots used by pusha
-    __ push(rbx);
-
-    __ lea(rbx, Address(rsp, wordSize * 3)); // 1 for cookie, 1 for rbp, 1 for rbx - this should be the return address
-
-    __ pusha();
-
-    // xmm0 and xmm1 may be used for passing float/double arguments
-
-    if (UseSSE >= 2) {
-      const int xmm_size = wordSize * 4;
-      __ subptr(rsp, xmm_size * 2);
-      __ movdbl(Address(rsp, xmm_size * 1), xmm1);
-      __ movdbl(Address(rsp, xmm_size * 0), xmm0);
-    } else if (UseSSE >= 1) {
-      const int xmm_size = wordSize * 2;
-      __ subptr(rsp, xmm_size * 2);
-      __ movflt(Address(rsp, xmm_size * 1), xmm1);
-      __ movflt(Address(rsp, xmm_size * 0), xmm0);
-    }
-
-    __ call_VM_leaf(CAST_FROM_FN_PTR(address, static_cast<int (*)(address*)>(BarrierSetNMethod::nmethod_stub_entry_barrier)), rbx);
-
-    if (UseSSE >= 2) {
-      const int xmm_size = wordSize * 4;
-      __ movdbl(xmm0, Address(rsp, xmm_size * 0));
-      __ movdbl(xmm1, Address(rsp, xmm_size * 1));
-      __ addptr(rsp, xmm_size * 2);
-    } else if (UseSSE >= 1) {
-      const int xmm_size = wordSize * 2;
-      __ movflt(xmm0, Address(rsp, xmm_size * 0));
-      __ movflt(xmm1, Address(rsp, xmm_size * 1));
-      __ addptr(rsp, xmm_size * 2);
-    }
-
-    __ cmpl(rax, 1); // 1 means deoptimize
-    __ jcc(Assembler::equal, deoptimize_label);
-
-    __ popa();
-    __ pop(rbx);
-
-    __ leave();
-
-    __ addptr(rsp, 1 * wordSize); // cookie
-    __ ret(0);
-
-    __ BIND(deoptimize_label);
-
-    __ popa();
-    __ pop(rbx);
-
-    __ leave();
-
-    // this can be taken out, but is good for verification purposes. getting a SIGSEGV
-    // here while still having a correct stack is valuable
-    __ testptr(rsp, Address(rsp, 0));
-
-    __ movptr(rsp, Address(rsp, 0)); // new rsp was written in the barrier
-    __ jmp(Address(rsp, -1 * wordSize)); // jmp target should be callers verified_entry_point
-
-    return start;
-  }
-
- private:
-
-  void create_control_words() {
-    // Round to nearest, 53-bit mode, exceptions masked
-    StubRoutines::x86::_fpu_cntrl_wrd_std   = 0x027F;
-    // Round to zero, 53-bit mode, exception mased
-    StubRoutines::x86::_fpu_cntrl_wrd_trunc = 0x0D7F;
-    // Round to nearest, 24-bit mode, exceptions masked
-    StubRoutines::x86::_fpu_cntrl_wrd_24    = 0x007F;
-    // Round to nearest, 64-bit mode, exceptions masked, flags specialized
-    StubRoutines::x86::_mxcsr_std           = EnableX86ECoreOpts ? 0x1FBF : 0x1F80;
-    // Note: the following two constants are 80-bit values
-    //       layout is critical for correct loading by FPU.
-    // Bias for strict fp multiply/divide
-    StubRoutines::x86::_fpu_subnormal_bias1[0]= 0x00000000; // 2^(-15360) == 0x03ff 8000 0000 0000 0000
-    StubRoutines::x86::_fpu_subnormal_bias1[1]= 0x80000000;
-    StubRoutines::x86::_fpu_subnormal_bias1[2]= 0x03ff;
-    // Un-Bias for strict fp multiply/divide
-    StubRoutines::x86::_fpu_subnormal_bias2[0]= 0x00000000; // 2^(+15360) == 0x7bff 8000 0000 0000 0000
-    StubRoutines::x86::_fpu_subnormal_bias2[1]= 0x80000000;
-    StubRoutines::x86::_fpu_subnormal_bias2[2]= 0x7bff;
-  }
-
-  address generate_cont_thaw() {
-    if (!Continuations::enabled()) return nullptr;
-    Unimplemented();
-    return nullptr;
-  }
-
-  address generate_cont_returnBarrier() {
-    if (!Continuations::enabled()) return nullptr;
-    Unimplemented();
-    return nullptr;
-  }
-
-  address generate_cont_returnBarrier_exception() {
-    if (!Continuations::enabled()) return nullptr;
-    Unimplemented();
-    return nullptr;
-  }
-
-  //---------------------------------------------------------------------------
-  // Initialization
-
-  void generate_initial_stubs() {
-    // Generates all stubs and initializes the entry points
-
-    //------------------------------------------------------------------------------------------------------------------------
-    // entry points that exist in all platforms
-    // Note: This is code that could be shared among different platforms - however the benefit seems to be smaller than
-    //       the disadvantage of having a much more complicated generator structure. See also comment in stubRoutines.hpp.
-    StubRoutines::_forward_exception_entry      = generate_forward_exception();
-
-    StubRoutines::_call_stub_entry              =
-      generate_call_stub(StubRoutines::_call_stub_return_address);
-    // is referenced by megamorphic call
-    StubRoutines::_catch_exception_entry        = generate_catch_exception();
-
-    // platform dependent
-    create_control_words();
-
-    // Initialize table for copy memory (arraycopy) check.
-    if (UnsafeMemoryAccess::_table == nullptr) {
-      UnsafeMemoryAccess::create_table(16 + 4); // 16 for copyMemory; 4 for setMemory
-    }
-
-    StubRoutines::x86::_verify_mxcsr_entry         = generate_verify_mxcsr();
-    StubRoutines::x86::_verify_fpu_cntrl_wrd_entry = generate_verify_fpu_cntrl_wrd();
-    StubRoutines::x86::_d2i_wrapper                = generate_d2i_wrapper(T_INT,  CAST_FROM_FN_PTR(address, SharedRuntime::d2i));
-    StubRoutines::x86::_d2l_wrapper                = generate_d2i_wrapper(T_LONG, CAST_FROM_FN_PTR(address, SharedRuntime::d2l));
-
-    if (UseCRC32Intrinsics) {
-      // set table address before stub generation which use it
-      StubRoutines::_crc_table_adr = (address)StubRoutines::x86::_crc_table;
-      StubRoutines::_updateBytesCRC32 = generate_updateBytesCRC32();
-    }
-
-    if (UseCRC32CIntrinsics) {
-      bool supports_clmul = VM_Version::supports_clmul();
-      StubRoutines::x86::generate_CRC32C_table(supports_clmul);
-      StubRoutines::_crc32c_table_addr = (address)StubRoutines::x86::_crc32c_table;
-      StubRoutines::_updateBytesCRC32C = generate_updateBytesCRC32C(supports_clmul);
-    }
-    if (VM_Version::supports_sse2() && UseLibmIntrinsic && InlineIntrinsics) {
-      if (vmIntrinsics::is_intrinsic_available(vmIntrinsics::_dexp)) {
-        StubRoutines::_dexp = generate_libmExp();
-      }
-      if (vmIntrinsics::is_intrinsic_available(vmIntrinsics::_dlog)) {
-        StubRoutines::_dlog = generate_libmLog();
-      }
-      if (vmIntrinsics::is_intrinsic_available(vmIntrinsics::_dlog10)) {
-        StubRoutines::_dlog10 = generate_libmLog10();
-      }
-      if (vmIntrinsics::is_intrinsic_available(vmIntrinsics::_dpow)) {
-        StubRoutines::_dpow = generate_libmPow();
-      }
-      if (vmIntrinsics::is_intrinsic_available(vmIntrinsics::_dsin) ||
-        vmIntrinsics::is_intrinsic_available(vmIntrinsics::_dcos) ||
-        vmIntrinsics::is_intrinsic_available(vmIntrinsics::_dtan)) {
-        StubRoutines::_dlibm_reduce_pi04l = generate_libm_reduce_pi04l();
-      }
-      if (vmIntrinsics::is_intrinsic_available(vmIntrinsics::_dsin) ||
-        vmIntrinsics::is_intrinsic_available(vmIntrinsics::_dcos)) {
-        StubRoutines::_dlibm_sin_cos_huge = generate_libm_sin_cos_huge();
-      }
-      if (vmIntrinsics::is_intrinsic_available(vmIntrinsics::_dsin)) {
-        StubRoutines::_dsin = generate_libmSin();
-      }
-      if (vmIntrinsics::is_intrinsic_available(vmIntrinsics::_dcos)) {
-        StubRoutines::_dcos = generate_libmCos();
-      }
-      if (vmIntrinsics::is_intrinsic_available(vmIntrinsics::_dtan)) {
-        StubRoutines::_dlibm_tan_cot_huge = generate_libm_tan_cot_huge();
-        StubRoutines::_dtan = generate_libmTan();
-      }
-    }
-  }
-
-  void generate_continuation_stubs() {
-    // Continuation stubs:
-    StubRoutines::_cont_thaw          = generate_cont_thaw();
-    StubRoutines::_cont_returnBarrier = generate_cont_returnBarrier();
-    StubRoutines::_cont_returnBarrierExc = generate_cont_returnBarrier_exception();
-  }
-
-  void generate_final_stubs() {
-    // Generates all stubs and initializes the entry points
-
-    // support for verify_oop (must happen after universe_init)
-    StubRoutines::_verify_oop_subroutine_entry     = generate_verify_oop();
-
-    // arraycopy stubs used by compilers
-    generate_arraycopy_stubs();
-
-    StubRoutines::_method_entry_barrier = generate_method_entry_barrier();
-  }
-
-  void generate_compiler_stubs() {
-#if COMPILER2_OR_JVMCI
-
-    // entry points that are C2/JVMCI specific
-
-    StubRoutines::x86::_vector_float_sign_mask = generate_vector_mask(StubGenStubId::vector_float_sign_mask_id, 0x7FFFFFFF);
-    StubRoutines::x86::_vector_float_sign_flip = generate_vector_mask(StubGenStubId::vector_float_sign_flip_id, 0x80000000);
-    StubRoutines::x86::_vector_double_sign_mask = generate_vector_mask_long_double(StubGenStubId::vector_double_sign_mask_id, 0x7FFFFFFF, 0xFFFFFFFF);
-    StubRoutines::x86::_vector_double_sign_flip = generate_vector_mask_long_double(StubGenStubId::vector_double_sign_flip_id, 0x80000000, 0x00000000);
-    StubRoutines::x86::_vector_short_to_byte_mask = generate_vector_mask(StubGenStubId::vector_short_to_byte_mask_id, 0x00ff00ff);
-    StubRoutines::x86::_vector_int_to_byte_mask = generate_vector_mask(StubGenStubId::vector_int_to_byte_mask_id, 0x000000ff);
-    StubRoutines::x86::_vector_int_to_short_mask = generate_vector_mask(StubGenStubId::vector_int_to_short_mask_id, 0x0000ffff);
-    StubRoutines::x86::_vector_32_bit_mask = generate_vector_custom_i32(StubGenStubId::vector_32_bit_mask_id, Assembler::AVX_512bit,
-                                                                        0xFFFFFFFF, 0, 0, 0);
-    StubRoutines::x86::_vector_64_bit_mask = generate_vector_custom_i32(StubGenStubId::vector_64_bit_mask_id, Assembler::AVX_512bit,
-                                                                        0xFFFFFFFF, 0xFFFFFFFF, 0, 0);
-    StubRoutines::x86::_vector_int_shuffle_mask = generate_vector_mask(StubGenStubId::vector_int_shuffle_mask_id, 0x03020100);
-    StubRoutines::x86::_vector_byte_shuffle_mask = generate_vector_byte_shuffle_mask();
-    StubRoutines::x86::_vector_short_shuffle_mask = generate_vector_mask(StubGenStubId::vector_short_shuffle_mask_id, 0x01000100);
-    StubRoutines::x86::_vector_long_shuffle_mask = generate_vector_mask_long_double(StubGenStubId::vector_long_shuffle_mask_id, 0x00000001, 0x0);
-    StubRoutines::x86::_vector_byte_perm_mask = generate_vector_byte_perm_mask();
-    StubRoutines::x86::_vector_long_sign_mask = generate_vector_mask_long_double(StubGenStubId::vector_long_sign_mask_id, 0x80000000, 0x00000000);
-    StubRoutines::x86::_vector_all_bits_set = generate_vector_mask(StubGenStubId::vector_all_bits_set_id, 0xFFFFFFFF);
-    StubRoutines::x86::_vector_int_mask_cmp_bits = generate_vector_mask(StubGenStubId::vector_int_mask_cmp_bits_id, 0x00000001);
-    StubRoutines::x86::_vector_iota_indices = generate_iota_indices();
-    StubRoutines::x86::_vector_count_leading_zeros_lut = generate_count_leading_zeros_lut();
-    StubRoutines::x86::_vector_reverse_bit_lut = generate_vector_reverse_bit_lut();
-    StubRoutines::x86::_vector_reverse_byte_perm_mask_long = generate_vector_reverse_byte_perm_mask_long();
-    StubRoutines::x86::_vector_reverse_byte_perm_mask_int = generate_vector_reverse_byte_perm_mask_int();
-    StubRoutines::x86::_vector_reverse_byte_perm_mask_short = generate_vector_reverse_byte_perm_mask_short();
-
-    if (VM_Version::supports_avx2() && !VM_Version::supports_avx512_vpopcntdq()) {
-      // lut implementation influenced by counting 1s algorithm from section 5-1 of Hackers' Delight.
-      StubRoutines::x86::_vector_popcount_lut = generate_popcount_avx_lut();
-    }
-
-    // don't bother generating these AES intrinsic stubs unless global flag is set
-    if (UseAESIntrinsics) {
-      StubRoutines::_aescrypt_encryptBlock = generate_aescrypt_encryptBlock();
-      StubRoutines::_aescrypt_decryptBlock = generate_aescrypt_decryptBlock();
-      StubRoutines::_cipherBlockChaining_encryptAESCrypt = generate_cipherBlockChaining_encryptAESCrypt();
-      StubRoutines::_cipherBlockChaining_decryptAESCrypt = generate_cipherBlockChaining_decryptAESCrypt_Parallel();
-    }
-
-    if (UseAESCTRIntrinsics) {
-      StubRoutines::_counterMode_AESCrypt = generate_counterMode_AESCrypt_Parallel();
-    }
-
-    if (UseMD5Intrinsics) {
-      StubRoutines::_md5_implCompress = generate_md5_implCompress(StubGenStubId::md5_implCompress_id);
-      StubRoutines::_md5_implCompressMB = generate_md5_implCompress(StubGenStubId::md5_implCompressMB_id);
-    }
-    if (UseSHA1Intrinsics) {
-      StubRoutines::x86::_upper_word_mask_addr = generate_upper_word_mask();
-      StubRoutines::x86::_shuffle_byte_flip_mask_addr = generate_shuffle_byte_flip_mask();
-      StubRoutines::_sha1_implCompress = generate_sha1_implCompress(StubGenStubId::sha1_implCompress_id);
-      StubRoutines::_sha1_implCompressMB = generate_sha1_implCompress(StubGenStubId::sha1_implCompressMB_id);
-    }
-    if (UseSHA256Intrinsics) {
-      StubRoutines::x86::_k256_adr = (address)StubRoutines::x86::_k256;
-      StubRoutines::x86::_pshuffle_byte_flip_mask_addr = generate_pshuffle_byte_flip_mask();
-      StubRoutines::_sha256_implCompress = generate_sha256_implCompress(StubGenStubId::sha256_implCompress_id);
-      StubRoutines::_sha256_implCompressMB = generate_sha256_implCompress(StubGenStubId::sha256_implCompressMB_id);
-    }
-
-    // Generate GHASH intrinsics code
-    if (UseGHASHIntrinsics) {
-      StubRoutines::_ghash_processBlocks = generate_ghash_processBlocks();
-    }
-#endif // COMPILER2_OR_JVMCI
-  }
-
-
- public:
-  StubGenerator(CodeBuffer* code, StubGenBlobId blob_id) : StubCodeGenerator(code, blob_id) {
-    switch(blob_id) {
-    case initial_id:
-      generate_initial_stubs();
-      break;
-     case continuation_id:
-      generate_continuation_stubs();
-      break;
-    case compiler_id:
-      generate_compiler_stubs();
-      break;
-    case final_id:
-      generate_final_stubs();
-      break;
-    default:
-      fatal("unexpected blob id: %d", blob_id);
-      break;
-    };
-  }
-}; // end class declaration
-
-void StubGenerator_generate(CodeBuffer* code, StubGenBlobId blob_id) {
-  StubGenerator g(code, blob_id);
-}
diff --git a/src/hotspot/cpu/x86/stubRoutines_x86_32.cpp b/src/hotspot/cpu/x86/stubRoutines_x86_32.cpp
deleted file mode 100644
index 810f421f141..00000000000
--- a/src/hotspot/cpu/x86/stubRoutines_x86_32.cpp
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please 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 "runtime/deoptimization.hpp"
-#include "runtime/frame.inline.hpp"
-#include "runtime/javaThread.hpp"
-#include "runtime/stubRoutines.hpp"
-
-// Implementation of the platform-specific part of StubRoutines - for
-// a description of how to extend it, see the stubRoutines.hpp file.
-
-jint StubRoutines::x86::_fpu_cntrl_wrd_std   = 0;
-jint StubRoutines::x86::_fpu_cntrl_wrd_24    = 0;
-jint StubRoutines::x86::_fpu_cntrl_wrd_trunc = 0;
-
-jint StubRoutines::x86::_mxcsr_std = 0;
-
-jint StubRoutines::x86::_fpu_subnormal_bias1[3] = { 0, 0, 0 };
-jint StubRoutines::x86::_fpu_subnormal_bias2[3] = { 0, 0, 0 };
-
diff --git a/src/hotspot/cpu/x86/templateInterpreterGenerator_x86_32.cpp b/src/hotspot/cpu/x86/templateInterpreterGenerator_x86_32.cpp
deleted file mode 100644
index df8633bdd15..00000000000
--- a/src/hotspot/cpu/x86/templateInterpreterGenerator_x86_32.cpp
+++ /dev/null
@@ -1,509 +0,0 @@
-/*
- * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please 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 "asm/macroAssembler.hpp"
-#include "compiler/disassembler.hpp"
-#include "interpreter/interp_masm.hpp"
-#include "interpreter/interpreter.hpp"
-#include "interpreter/interpreterRuntime.hpp"
-#include "interpreter/templateInterpreterGenerator.hpp"
-#include "runtime/arguments.hpp"
-#include "runtime/sharedRuntime.hpp"
-#include "runtime/stubRoutines.hpp"
-
-#define __ Disassembler::hook<InterpreterMacroAssembler>(__FILE__, __LINE__, _masm)->
-
-
-address TemplateInterpreterGenerator::generate_slow_signature_handler() {
-  address entry = __ pc();
-  // rbx,: method
-  // rcx: temporary
-  // rdi: pointer to locals
-  // rsp: end of copied parameters area
-  __ mov(rcx, rsp);
-  __ call_VM(noreg, CAST_FROM_FN_PTR(address, InterpreterRuntime::slow_signature_handler), rbx, rdi, rcx);
-  __ ret(0);
-  return entry;
-}
-
-/**
- * Method entry for static native methods:
- *   int java.util.zip.CRC32.update(int crc, int b)
- */
-address TemplateInterpreterGenerator::generate_CRC32_update_entry() {
-  assert(UseCRC32Intrinsics, "this intrinsic is not supported");
-  address entry = __ pc();
-
-  // rbx: Method*
-  // rsi: senderSP must preserved for slow path, set SP to it on fast path
-  // rdx: scratch
-  // rdi: scratch
-
-  Label slow_path;
-  // If we need a safepoint check, generate full interpreter entry.
-  __ get_thread(rdi);
-  __ safepoint_poll(slow_path, rdi, false /* at_return */, false /* in_nmethod */);
-
-  // We don't generate local frame and don't align stack because
-  // we call stub code and there is no safepoint on this path.
-
-  // Load parameters
-  const Register crc = rax;  // crc
-  const Register val = rdx;  // source java byte value
-  const Register tbl = rdi;  // scratch
-
-  // Arguments are reversed on java expression stack
-  __ movl(val, Address(rsp,   wordSize)); // byte value
-  __ movl(crc, Address(rsp, 2*wordSize)); // Initial CRC
-
-  __ lea(tbl, ExternalAddress(StubRoutines::crc_table_addr()));
-  __ notl(crc); // ~crc
-  __ update_byte_crc32(crc, val, tbl);
-  __ notl(crc); // ~crc
-  // result in rax
-
-  // _areturn
-  __ pop(rdi);                // get return address
-  __ mov(rsp, rsi);           // set sp to sender sp
-  __ jmp(rdi);
-
-  // generate a vanilla native entry as the slow path
-  __ bind(slow_path);
-  __ jump_to_entry(Interpreter::entry_for_kind(Interpreter::native));
-  return entry;
-}
-
-/**
- * Method entry for static native methods:
- *   int java.util.zip.CRC32.updateBytes(int crc, byte[] b, int off, int len)
- *   int java.util.zip.CRC32.updateByteBuffer(int crc, long buf, int off, int len)
- */
-address TemplateInterpreterGenerator::generate_CRC32_updateBytes_entry(AbstractInterpreter::MethodKind kind) {
-  assert(UseCRC32Intrinsics, "this intrinsic is not supported");
-  address entry = __ pc();
-
-  // rbx,: Method*
-  // rsi: senderSP must preserved for slow path, set SP to it on fast path
-  // rdx: scratch
-  // rdi: scratch
-
-  Label slow_path;
-  // If we need a safepoint check, generate full interpreter entry.
-  __ get_thread(rdi);
-  __ safepoint_poll(slow_path, rdi, false /* at_return */, false /* in_nmethod */);
-
-  // We don't generate local frame and don't align stack because
-  // we call stub code and there is no safepoint on this path.
-
-  // Load parameters
-  const Register crc = rax;  // crc
-  const Register buf = rdx;  // source java byte array address
-  const Register len = rdi;  // length
-
-  // value              x86_32
-  // interp. arg ptr    ESP + 4
-  // int java.util.zip.CRC32.updateBytes(int crc, byte[] b, int off, int len)
-  //                                         3           2      1        0
-  // int java.util.zip.CRC32.updateByteBuffer(int crc, long buf, int off, int len)
-  //                                              4         2,3      1        0
-
-  // Arguments are reversed on java expression stack
-  __ movl(len,   Address(rsp,   4 + 0)); // Length
-  // Calculate address of start element
-  if (kind == Interpreter::java_util_zip_CRC32_updateByteBuffer) {
-    __ movptr(buf, Address(rsp, 4 + 2 * wordSize)); // long buf
-    __ addptr(buf, Address(rsp, 4 + 1 * wordSize)); // + offset
-    __ movl(crc,   Address(rsp, 4 + 4 * wordSize)); // Initial CRC
-  } else {
-    __ movptr(buf, Address(rsp, 4 + 2 * wordSize)); // byte[] array
-    __ addptr(buf, arrayOopDesc::base_offset_in_bytes(T_BYTE)); // + header size
-    __ addptr(buf, Address(rsp, 4 + 1 * wordSize)); // + offset
-    __ movl(crc,   Address(rsp, 4 + 3 * wordSize)); // Initial CRC
-  }
-
-  __ super_call_VM_leaf(CAST_FROM_FN_PTR(address, StubRoutines::updateBytesCRC32()), crc, buf, len);
-  // result in rax
-
-  // _areturn
-  __ pop(rdi);                // get return address
-  __ mov(rsp, rsi);           // set sp to sender sp
-  __ jmp(rdi);
-
-  // generate a vanilla native entry as the slow path
-  __ bind(slow_path);
-  __ jump_to_entry(Interpreter::entry_for_kind(Interpreter::native));
-  return entry;
-}
-
-/**
-* Method entry for static native methods:
-*   int java.util.zip.CRC32C.updateBytes(int crc, byte[] b, int off, int end)
-*   int java.util.zip.CRC32C.updateByteBuffer(int crc, long address, int off, int end)
-*/
-address TemplateInterpreterGenerator::generate_CRC32C_updateBytes_entry(AbstractInterpreter::MethodKind kind) {
-  assert(UseCRC32CIntrinsics, "this intrinsic is not supported");
-  address entry = __ pc();
-  // Load parameters
-  const Register crc = rax;  // crc
-  const Register buf = rcx;  // source java byte array address
-  const Register len = rdx;  // length
-  const Register end = len;
-
-  // value              x86_32
-  // interp. arg ptr    ESP + 4
-  // int java.util.zip.CRC32.updateBytes(int crc, byte[] b, int off, int end)
-  //                                         3           2      1        0
-  // int java.util.zip.CRC32.updateByteBuffer(int crc, long address, int off, int end)
-  //                                              4         2,3          1        0
-
-  // Arguments are reversed on java expression stack
-  __ movl(end, Address(rsp, 4 + 0)); // end
-  __ subl(len, Address(rsp, 4 + 1 * wordSize));  // end - offset == length
-  // Calculate address of start element
-  if (kind == Interpreter::java_util_zip_CRC32C_updateDirectByteBuffer) {
-    __ movptr(buf, Address(rsp, 4 + 2 * wordSize)); // long address
-    __ addptr(buf, Address(rsp, 4 + 1 * wordSize)); // + offset
-    __ movl(crc, Address(rsp, 4 + 4 * wordSize)); // Initial CRC
-  } else {
-    __ movptr(buf, Address(rsp, 4 + 2 * wordSize)); // byte[] array
-    __ addptr(buf, arrayOopDesc::base_offset_in_bytes(T_BYTE)); // + header size
-    __ addptr(buf, Address(rsp, 4 + 1 * wordSize)); // + offset
-    __ movl(crc, Address(rsp, 4 + 3 * wordSize)); // Initial CRC
-  }
-  __ super_call_VM_leaf(CAST_FROM_FN_PTR(address, StubRoutines::updateBytesCRC32C()), crc, buf, len);
-  // result in rax
-  // _areturn
-  __ pop(rdi);                // get return address
-  __ mov(rsp, rsi);           // set sp to sender sp
-  __ jmp(rdi);
-
-  return entry;
-}
-
-/**
- * Method entry for static native method:
- *    java.lang.Float.intBitsToFloat(int bits)
- */
-address TemplateInterpreterGenerator::generate_Float_intBitsToFloat_entry() {
-  if (UseSSE >= 1) {
-    address entry = __ pc();
-
-    // rsi: the sender's SP
-
-    // Skip safepoint check (compiler intrinsic versions of this method
-    // do not perform safepoint checks either).
-
-    // Load 'bits' into xmm0 (interpreter returns results in xmm0)
-    __ movflt(xmm0, Address(rsp, wordSize));
-
-    // Return
-    __ pop(rdi); // get return address
-    __ mov(rsp, rsi); // set rsp to the sender's SP
-    __ jmp(rdi);
-    return entry;
-  }
-
-  return nullptr;
-}
-
-/**
- * Method entry for static native method:
- *    java.lang.Float.floatToRawIntBits(float value)
- */
-address TemplateInterpreterGenerator::generate_Float_floatToRawIntBits_entry() {
-  if (UseSSE >= 1) {
-    address entry = __ pc();
-
-    // rsi: the sender's SP
-
-    // Skip safepoint check (compiler intrinsic versions of this method
-    // do not perform safepoint checks either).
-
-    // Load the parameter (a floating-point value) into rax.
-    __ movl(rax, Address(rsp, wordSize));
-
-    // Return
-    __ pop(rdi); // get return address
-    __ mov(rsp, rsi); // set rsp to the sender's SP
-    __ jmp(rdi);
-    return entry;
-  }
-
-  return nullptr;
-}
-
-
-/**
- * Method entry for static native method:
- *    java.lang.Double.longBitsToDouble(long bits)
- */
-address TemplateInterpreterGenerator::generate_Double_longBitsToDouble_entry() {
-   if (UseSSE >= 2) {
-     address entry = __ pc();
-
-     // rsi: the sender's SP
-
-     // Skip safepoint check (compiler intrinsic versions of this method
-     // do not perform safepoint checks either).
-
-     // Load 'bits' into xmm0 (interpreter returns results in xmm0)
-     __ movdbl(xmm0, Address(rsp, wordSize));
-
-     // Return
-     __ pop(rdi); // get return address
-     __ mov(rsp, rsi); // set rsp to the sender's SP
-     __ jmp(rdi);
-     return entry;
-   }
-
-   return nullptr;
-}
-
-/**
- * Method entry for static native method:
- *    java.lang.Double.doubleToRawLongBits(double value)
- */
-address TemplateInterpreterGenerator::generate_Double_doubleToRawLongBits_entry() {
-  if (UseSSE >= 2) {
-    address entry = __ pc();
-
-    // rsi: the sender's SP
-
-    // Skip safepoint check (compiler intrinsic versions of this method
-    // do not perform safepoint checks either).
-
-    // Load the parameter (a floating-point value) into rax.
-    __ movl(rdx, Address(rsp, 2*wordSize));
-    __ movl(rax, Address(rsp, wordSize));
-
-    // Return
-    __ pop(rdi); // get return address
-    __ mov(rsp, rsi); // set rsp to the sender's SP
-    __ jmp(rdi);
-    return entry;
-  }
-
-  return nullptr;
-}
-
-/**
- * Method entry for static method:
- *    java.lang.Float.float16ToFloat(short floatBinary16)
- */
-address TemplateInterpreterGenerator::generate_Float_float16ToFloat_entry() {
-  assert(VM_Version::supports_float16(), "this intrinsic is not supported");
-  address entry = __ pc();
-
-  // rsi: the sender's SP
-
-  // Load value into xmm0 and convert
-  __ movswl(rax, Address(rsp, wordSize));
-  __ flt16_to_flt(xmm0, rax);
-
-  // Return
-  __ pop(rdi); // get return address
-  __ mov(rsp, rsi); // set rsp to the sender's SP
-  __ jmp(rdi);
-  return entry;
-}
-
-/**
- * Method entry for static method:
- *    java.lang.Float.floatToFloat16(float value)
- */
-address TemplateInterpreterGenerator::generate_Float_floatToFloat16_entry() {
-  assert(VM_Version::supports_float16(), "this intrinsic is not supported");
-  address entry = __ pc();
-
-  // rsi: the sender's SP
-
-  // Load value into xmm0, convert and put result into rax
-  __ movflt(xmm0, Address(rsp, wordSize));
-  __ flt_to_flt16(rax, xmm0, xmm1);
-
-  // Return
-  __ pop(rdi); // get return address
-  __ mov(rsp, rsi); // set rsp to the sender's SP
-  __ jmp(rdi);
-  return entry;
-}
-
-address TemplateInterpreterGenerator::generate_math_entry(AbstractInterpreter::MethodKind kind) {
-
-  // rbx,: Method*
-  // rcx: scratrch
-  // rsi: sender sp
-
-  address entry_point = __ pc();
-
-  // These don't need a safepoint check because they aren't virtually
-  // callable. We won't enter these intrinsics from compiled code.
-  // If in the future we added an intrinsic which was virtually callable
-  // we'd have to worry about how to safepoint so that this code is used.
-
-  // mathematical functions inlined by compiler
-  // (interpreter must provide identical implementation
-  // in order to avoid monotonicity bugs when switching
-  // from interpreter to compiler in the middle of some
-  // computation)
-  //
-  // stack: [ ret adr ] <-- rsp
-  //        [ lo(arg) ]
-  //        [ hi(arg) ]
-  //
-  if (kind == Interpreter::java_lang_math_tanh) {
-    return nullptr;
-  }
-
-  if (kind == Interpreter::java_lang_math_fmaD) {
-    if (!UseFMA) {
-      return nullptr; // Generate a vanilla entry
-    }
-    __ movdbl(xmm2, Address(rsp, 5 * wordSize));
-    __ movdbl(xmm1, Address(rsp, 3 * wordSize));
-    __ movdbl(xmm0, Address(rsp, 1 * wordSize));
-    __ fmad(xmm0, xmm1, xmm2, xmm0);
-    __ pop(rdi);                               // get return address
-    __ mov(rsp, rsi);                          // set sp to sender sp
-    __ jmp(rdi);
-
-    return entry_point;
-  } else if (kind == Interpreter::java_lang_math_fmaF) {
-    if (!UseFMA) {
-      return nullptr; // Generate a vanilla entry
-    }
-    __ movflt(xmm2, Address(rsp, 3 * wordSize));
-    __ movflt(xmm1, Address(rsp, 2 * wordSize));
-    __ movflt(xmm0, Address(rsp, 1 * wordSize));
-    __ fmaf(xmm0, xmm1, xmm2, xmm0);
-    __ pop(rdi);                               // get return address
-    __ mov(rsp, rsi);                          // set sp to sender sp
-    __ jmp(rdi);
-
-    return entry_point;
- }
-
-  __ fld_d(Address(rsp, 1*wordSize));
-  switch (kind) {
-    case Interpreter::java_lang_math_sin :
-        __ subptr(rsp, 2 * wordSize);
-        __ fstp_d(Address(rsp, 0));
-        if (VM_Version::supports_sse2() && StubRoutines::dsin() != nullptr) {
-          __ call(RuntimeAddress(CAST_FROM_FN_PTR(address, StubRoutines::dsin())));
-        } else {
-          __ call_VM_leaf0(CAST_FROM_FN_PTR(address, SharedRuntime::dsin));
-        }
-        __ addptr(rsp, 2 * wordSize);
-        break;
-    case Interpreter::java_lang_math_cos :
-        __ subptr(rsp, 2 * wordSize);
-        __ fstp_d(Address(rsp, 0));
-        if (VM_Version::supports_sse2() && StubRoutines::dcos() != nullptr) {
-          __ call(RuntimeAddress(CAST_FROM_FN_PTR(address, StubRoutines::dcos())));
-        } else {
-          __ call_VM_leaf0(CAST_FROM_FN_PTR(address, SharedRuntime::dcos));
-        }
-        __ addptr(rsp, 2 * wordSize);
-        break;
-    case Interpreter::java_lang_math_tan :
-        __ subptr(rsp, 2 * wordSize);
-        __ fstp_d(Address(rsp, 0));
-        if (StubRoutines::dtan() != nullptr) {
-          __ call(RuntimeAddress(CAST_FROM_FN_PTR(address, StubRoutines::dtan())));
-        } else {
-          __ call_VM_leaf0(CAST_FROM_FN_PTR(address, SharedRuntime::dtan));
-        }
-        __ addptr(rsp, 2 * wordSize);
-        break;
-    case Interpreter::java_lang_math_sqrt:
-        __ fsqrt();
-        break;
-    case Interpreter::java_lang_math_abs:
-        __ fabs();
-        break;
-    case Interpreter::java_lang_math_log:
-        __ subptr(rsp, 2 * wordSize);
-        __ fstp_d(Address(rsp, 0));
-        if (StubRoutines::dlog() != nullptr) {
-          __ call(RuntimeAddress(CAST_FROM_FN_PTR(address, StubRoutines::dlog())));
-        } else {
-          __ call_VM_leaf0(CAST_FROM_FN_PTR(address, SharedRuntime::dlog));
-        }
-        __ addptr(rsp, 2 * wordSize);
-        break;
-    case Interpreter::java_lang_math_log10:
-        __ subptr(rsp, 2 * wordSize);
-        __ fstp_d(Address(rsp, 0));
-        if (StubRoutines::dlog10() != nullptr) {
-          __ call(RuntimeAddress(CAST_FROM_FN_PTR(address, StubRoutines::dlog10())));
-        } else {
-          __ call_VM_leaf0(CAST_FROM_FN_PTR(address, SharedRuntime::dlog10));
-        }
-        __ addptr(rsp, 2 * wordSize);
-        break;
-    case Interpreter::java_lang_math_pow:
-      __ fld_d(Address(rsp, 3*wordSize)); // second argument
-      __ subptr(rsp, 4 * wordSize);
-      __ fstp_d(Address(rsp, 0));
-      __ fstp_d(Address(rsp, 2 * wordSize));
-      if (StubRoutines::dpow() != nullptr) {
-        __ call(RuntimeAddress(CAST_FROM_FN_PTR(address, StubRoutines::dpow())));
-      } else {
-        __ call_VM_leaf0(CAST_FROM_FN_PTR(address, SharedRuntime::dpow));
-      }
-      __ addptr(rsp, 4 * wordSize);
-      break;
-    case Interpreter::java_lang_math_exp:
-      __ subptr(rsp, 2*wordSize);
-      __ fstp_d(Address(rsp, 0));
-      if (StubRoutines::dexp() != nullptr) {
-        __ call(RuntimeAddress(CAST_FROM_FN_PTR(address, StubRoutines::dexp())));
-      } else {
-        __ call_VM_leaf0(CAST_FROM_FN_PTR(address, SharedRuntime::dexp));
-      }
-      __ addptr(rsp, 2*wordSize);
-    break;
-    default                              :
-        ShouldNotReachHere();
-  }
-
-  // return double result in xmm0 for interpreter and compilers.
-  if (UseSSE >= 2) {
-    __ subptr(rsp, 2*wordSize);
-    __ fstp_d(Address(rsp, 0));
-    __ movdbl(xmm0, Address(rsp, 0));
-    __ addptr(rsp, 2*wordSize);
-  }
-
-  // done, result in FPU ST(0) or XMM0
-  __ pop(rdi);                               // get return address
-  __ mov(rsp, rsi);                          // set sp to sender sp
-  __ jmp(rdi);
-
-  return entry_point;
-}
-
-// Not supported
-address TemplateInterpreterGenerator::generate_currentThread() { return nullptr; }
-
diff --git a/src/hotspot/cpu/x86/upcallLinker_x86_32.cpp b/src/hotspot/cpu/x86/upcallLinker_x86_32.cpp
deleted file mode 100644
index 6dd2ddd5874..00000000000
--- a/src/hotspot/cpu/x86/upcallLinker_x86_32.cpp
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright (c) 2020, 2025, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please 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 "prims/upcallLinker.hpp"
-
-address UpcallLinker::make_upcall_stub(jobject receiver, Symbol* signature,
-                                       BasicType* out_sig_bt, int total_out_args,
-                                       BasicType ret_type,
-                                       jobject jabi, jobject jconv,
-                                       bool needs_return_buffer, int ret_buf_size) {
-  ShouldNotCallThis();
-  return nullptr;
-}
diff --git a/src/hotspot/cpu/x86/vtableStubs_x86_32.cpp b/src/hotspot/cpu/x86/vtableStubs_x86_32.cpp
deleted file mode 100644
index 3e70a45b58b..00000000000
--- a/src/hotspot/cpu/x86/vtableStubs_x86_32.cpp
+++ /dev/null
@@ -1,265 +0,0 @@
-/*
- * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please 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 "asm/macroAssembler.hpp"
-#include "code/compiledIC.hpp"
-#include "code/vtableStubs.hpp"
-#include "interp_masm_x86.hpp"
-#include "memory/resourceArea.hpp"
-#include "oops/instanceKlass.hpp"
-#include "oops/klassVtable.hpp"
-#include "runtime/sharedRuntime.hpp"
-#include "vmreg_x86.inline.hpp"
-#ifdef COMPILER2
-#include "opto/runtime.hpp"
-#endif
-
-// machine-dependent part of VtableStubs: create VtableStub of correct size and
-// initialize its code
-
-#define __ masm->
-
-#ifndef PRODUCT
-extern "C" void bad_compiled_vtable_index(JavaThread* thread, oop receiver, int index);
-#endif
-
-// These stubs are used by the compiler only.
-// Argument registers, which must be preserved:
-//   rcx - receiver (always first argument)
-//   rdx - second argument (if any)
-// Other registers that might be usable:
-//   rax - inline cache register (is interface for itable stub)
-//   rbx - method (used when calling out to interpreter)
-// Available now, but may become callee-save at some point:
-//   rsi, rdi
-// Note that rax and rdx are also used for return values.
-
-VtableStub* VtableStubs::create_vtable_stub(int vtable_index) {
-  // Read "A word on VtableStub sizing" in share/code/vtableStubs.hpp for details on stub sizing.
-  const int stub_code_length = code_size_limit(true);
-  VtableStub* s = new(stub_code_length) VtableStub(true, vtable_index);
-  // Can be null if there is no free space in the code cache.
-  if (s == nullptr) {
-    return nullptr;
-  }
-
-  // Count unused bytes in instruction sequences of variable size.
-  // We add them to the computed buffer size in order to avoid
-  // overflow in subsequently generated stubs.
-  address   start_pc;
-  int       slop_bytes = 0;
-  int       slop_delta = 0;
-  // No variance was detected in vtable stub sizes. Setting index_dependent_slop == 0 will unveil any deviation from this observation.
-  const int index_dependent_slop     = 0;
-
-  ResourceMark    rm;
-  CodeBuffer      cb(s->entry_point(), stub_code_length);
-  MacroAssembler* masm = new MacroAssembler(&cb);
-
-#if (!defined(PRODUCT) && defined(COMPILER2))
-  if (CountCompiledCalls) {
-    __ incrementl(ExternalAddress((address) SharedRuntime::nof_megamorphic_calls_addr()));
-  }
-#endif
-
-  // get receiver (need to skip return address on top of stack)
-  assert(VtableStub::receiver_location() == rcx->as_VMReg(), "receiver expected in rcx");
-
-  // get receiver klass
-  address npe_addr = __ pc();
-  __ movptr(rax, Address(rcx, oopDesc::klass_offset_in_bytes()));
-
-#ifndef PRODUCT
-  if (DebugVtables) {
-    Label L;
-    start_pc = __ pc();
-    // check offset vs vtable length
-    __ cmpl(Address(rax, Klass::vtable_length_offset()), vtable_index*vtableEntry::size());
-    slop_delta  = 10 - (__ pc() - start_pc);  // cmpl varies in length, depending on data
-    slop_bytes += slop_delta;
-    assert(slop_delta >= 0, "negative slop(%d) encountered, adjust code size estimate!", slop_delta);
-
-    __ jcc(Assembler::greater, L);
-    __ movl(rbx, vtable_index);
-    // VTABLE TODO: find upper bound for call_VM length.
-    start_pc = __ pc();
-    __ call_VM(noreg, CAST_FROM_FN_PTR(address, bad_compiled_vtable_index), rcx, rbx);
-    slop_delta  = 500 - (__ pc() - start_pc);
-    slop_bytes += slop_delta;
-    assert(slop_delta >= 0, "negative slop(%d) encountered, adjust code size estimate!", slop_delta);
-    __ bind(L);
-  }
-#endif // PRODUCT
-
-  const Register method = rbx;
-
-  // load Method* and target address
-  start_pc = __ pc();
-  __ lookup_virtual_method(rax, vtable_index, method);
-  slop_delta  = 6 - (int)(__ pc() - start_pc);
-  slop_bytes += slop_delta;
-  assert(slop_delta >= 0, "negative slop(%d) encountered, adjust code size estimate!", slop_delta);
-
-#ifndef PRODUCT
-  if (DebugVtables) {
-    Label L;
-    __ cmpptr(method, NULL_WORD);
-    __ jcc(Assembler::equal, L);
-    __ cmpptr(Address(method, Method::from_compiled_offset()), NULL_WORD);
-    __ jcc(Assembler::notZero, L);
-    __ stop("Vtable entry is null");
-    __ bind(L);
-  }
-#endif // PRODUCT
-
-  // rax: receiver klass
-  // method (rbx): Method*
-  // rcx: receiver
-  address ame_addr = __ pc();
-  __ jmp( Address(method, Method::from_compiled_offset()));
-
-  masm->flush();
-  slop_bytes += index_dependent_slop; // add'l slop for size variance due to large itable offsets
-  bookkeeping(masm, tty, s, npe_addr, ame_addr, true, vtable_index, slop_bytes, index_dependent_slop);
-
-  return s;
-}
-
-
-VtableStub* VtableStubs::create_itable_stub(int itable_index) {
-  // Read "A word on VtableStub sizing" in share/code/vtableStubs.hpp for details on stub sizing.
-  const int stub_code_length = code_size_limit(false);
-  VtableStub* s = new(stub_code_length) VtableStub(false, itable_index);
-  // Can be null if there is no free space in the code cache.
-  if (s == nullptr) {
-    return nullptr;
-  }
-  // Count unused bytes in instruction sequences of variable size.
-  // We add them to the computed buffer size in order to avoid
-  // overflow in subsequently generated stubs.
-  address   start_pc;
-  int       slop_bytes = 0;
-  int       slop_delta = 0;
-  const int index_dependent_slop = (itable_index == 0) ? 4 :     // code size change with transition from 8-bit to 32-bit constant (@index == 32).
-                                   (itable_index < 32) ? 3 : 0;  // index == 0 generates even shorter code.
-
-  ResourceMark    rm;
-  CodeBuffer      cb(s->entry_point(), stub_code_length);
-  MacroAssembler* masm = new MacroAssembler(&cb);
-
-#if (!defined(PRODUCT) && defined(COMPILER2))
-  if (CountCompiledCalls) {
-    __ incrementl(ExternalAddress((address) SharedRuntime::nof_megamorphic_calls_addr()));
-  }
-#endif /* PRODUCT */
-
-  // Entry arguments:
-  //  rax: CompiledICData
-  //  rcx: Receiver
-
-  // Most registers are in use; we'll use rax, rbx, rcx, rdx, rsi, rdi
-  // (If we need to make rsi, rdi callee-save, do a push/pop here.)
-  const Register recv_klass_reg     = rsi;
-  const Register holder_klass_reg   = rax; // declaring interface klass (DEFC)
-  const Register resolved_klass_reg = rdi; // resolved interface klass (REFC)
-  const Register temp_reg           = rdx;
-  const Register method             = rbx;
-  const Register icdata_reg         = rax;
-  const Register receiver           = rcx;
-
-  __ movptr(resolved_klass_reg, Address(icdata_reg, CompiledICData::itable_refc_klass_offset()));
-  __ movptr(holder_klass_reg,   Address(icdata_reg, CompiledICData::itable_defc_klass_offset()));
-
-  Label L_no_such_interface;
-
-  // get receiver klass (also an implicit null-check)
-  assert(VtableStub::receiver_location() ==  rcx->as_VMReg(), "receiver expected in  rcx");
-  address npe_addr = __ pc();
-  __ load_klass(recv_klass_reg, rcx, noreg);
-
-  start_pc = __ pc();
-  __ push(rdx); // temp_reg
-
-  // Receiver subtype check against REFC.
-  // Get selected method from declaring class and itable index
-  __ lookup_interface_method_stub(recv_klass_reg, // input
-                                  holder_klass_reg, // input
-                                  resolved_klass_reg, // input
-                                  method, // output
-                                  temp_reg,
-                                  noreg,
-                                  receiver, // input (x86_32 only: to restore recv_klass value)
-                                  itable_index,
-                                  L_no_such_interface);
-  const ptrdiff_t  lookupSize = __ pc() - start_pc;
-
-  // We expect we need index_dependent_slop extra bytes. Reason:
-  // The emitted code in lookup_interface_method changes when itable_index exceeds 31.
-  // For windows, a narrow estimate was found to be 104. Other OSes not tested.
-  const ptrdiff_t estimate = 104;
-  const ptrdiff_t codesize = lookupSize + index_dependent_slop;
-  slop_delta  = (int)(estimate - codesize);
-  slop_bytes += slop_delta;
-  assert(slop_delta >= 0, "itable #%d: Code size estimate (%d) for lookup_interface_method too small, required: %d", itable_index, (int)estimate, (int)codesize);
-
-  // method (rbx): Method*
-  // rcx: receiver
-
-#ifdef ASSERT
-  if (DebugVtables) {
-    Label L1;
-    __ cmpptr(method, NULL_WORD);
-    __ jcc(Assembler::equal, L1);
-    __ cmpptr(Address(method, Method::from_compiled_offset()), NULL_WORD);
-    __ jcc(Assembler::notZero, L1);
-    __ stop("Method* is null");
-    __ bind(L1);
-  }
-#endif // ASSERT
-
-  __ pop(rdx);
-  address ame_addr = __ pc();
-  __ jmp(Address(method, Method::from_compiled_offset()));
-
-  __ bind(L_no_such_interface);
-  // Handle IncompatibleClassChangeError in itable stubs.
-  // More detailed error message.
-  // We force resolving of the call site by jumping to the "handle
-  // wrong method" stub, and so let the interpreter runtime do all the
-  // dirty work.
-  __ pop(rdx);
-  __ jump(RuntimeAddress(SharedRuntime::get_handle_wrong_method_stub()));
-
-  masm->flush();
-  slop_bytes += index_dependent_slop; // add'l slop for size variance due to large itable offsets
-  bookkeeping(masm, tty, s, npe_addr, ame_addr, false, itable_index, slop_bytes, index_dependent_slop);
-
-  return s;
-}
-
-int VtableStub::pd_code_alignment() {
-  // x86 cache line size is 64 bytes, but we want to limit alignment loss.
-  const unsigned int icache_line_size = wordSize;
-  return icache_line_size;
-}
diff --git a/src/hotspot/cpu/x86/x86_32.ad b/src/hotspot/cpu/x86/x86_32.ad
deleted file mode 100644
index 0b8dee7392a..00000000000
--- a/src/hotspot/cpu/x86/x86_32.ad
+++ /dev/null
@@ -1,13702 +0,0 @@
-//
-// Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
-// DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-//
-// This code is free software; you can redistribute it and/or modify it
-// under the terms of the GNU General Public License version 2 only, as
-// published by the Free Software Foundation.
-//
-// This code is distributed in the hope that it will be useful, but WITHOUT
-// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-// FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-// version 2 for more details (a copy is included in the LICENSE file that
-// accompanied this code).
-//
-// You should have received a copy of the GNU General Public License version
-// 2 along with this work; if not, write to the Free Software Foundation,
-// Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-//
-// Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-// or visit www.oracle.com if you need additional information or have any
-// questions.
-//
-//
-
-// X86 Architecture Description File
-
-//----------REGISTER DEFINITION BLOCK------------------------------------------
-// This information is used by the matcher and the register allocator to
-// describe individual registers and classes of registers within the target
-// architecture.
-
-register %{
-//----------Architecture Description Register Definitions----------------------
-// General Registers
-// "reg_def"  name ( register save type, C convention save type,
-//                   ideal register type, encoding );
-// Register Save Types:
-//
-// NS  = No-Save:       The register allocator assumes that these registers
-//                      can be used without saving upon entry to the method, &
-//                      that they do not need to be saved at call sites.
-//
-// SOC = Save-On-Call:  The register allocator assumes that these registers
-//                      can be used without saving upon entry to the method,
-//                      but that they must be saved at call sites.
-//
-// SOE = Save-On-Entry: The register allocator assumes that these registers
-//                      must be saved before using them upon entry to the
-//                      method, but they do not need to be saved at call
-//                      sites.
-//
-// AS  = Always-Save:   The register allocator assumes that these registers
-//                      must be saved before using them upon entry to the
-//                      method, & that they must be saved at call sites.
-//
-// Ideal Register Type is used to determine how to save & restore a
-// register.  Op_RegI will get spilled with LoadI/StoreI, Op_RegP will get
-// spilled with LoadP/StoreP.  If the register supports both, use Op_RegI.
-//
-// The encoding number is the actual bit-pattern placed into the opcodes.
-
-// General Registers
-// Previously set EBX, ESI, and EDI as save-on-entry for java code
-// Turn off SOE in java-code due to frequent use of uncommon-traps.
-// Now that allocator is better, turn on ESI and EDI as SOE registers.
-
-reg_def EBX(SOC, SOE, Op_RegI, 3, rbx->as_VMReg());
-reg_def ECX(SOC, SOC, Op_RegI, 1, rcx->as_VMReg());
-reg_def ESI(SOC, SOE, Op_RegI, 6, rsi->as_VMReg());
-reg_def EDI(SOC, SOE, Op_RegI, 7, rdi->as_VMReg());
-// now that adapter frames are gone EBP is always saved and restored by the prolog/epilog code
-reg_def EBP(NS, SOE, Op_RegI, 5, rbp->as_VMReg());
-reg_def EDX(SOC, SOC, Op_RegI, 2, rdx->as_VMReg());
-reg_def EAX(SOC, SOC, Op_RegI, 0, rax->as_VMReg());
-reg_def ESP( NS,  NS, Op_RegI, 4, rsp->as_VMReg());
-
-// Float registers.  We treat TOS/FPR0 special.  It is invisible to the
-// allocator, and only shows up in the encodings.
-reg_def FPR0L( SOC, SOC, Op_RegF, 0, VMRegImpl::Bad());
-reg_def FPR0H( SOC, SOC, Op_RegF, 0, VMRegImpl::Bad());
-// Ok so here's the trick FPR1 is really st(0) except in the midst
-// of emission of assembly for a machnode. During the emission the fpu stack
-// is pushed making FPR1 == st(1) temporarily. However at any safepoint
-// the stack will not have this element so FPR1 == st(0) from the
-// oopMap viewpoint. This same weirdness with numbering causes
-// instruction encoding to have to play games with the register
-// encode to correct for this 0/1 issue. See MachSpillCopyNode::implementation
-// where it does flt->flt moves to see an example
-//
-reg_def FPR1L( SOC, SOC, Op_RegF, 1, as_FloatRegister(0)->as_VMReg());
-reg_def FPR1H( SOC, SOC, Op_RegF, 1, as_FloatRegister(0)->as_VMReg()->next());
-reg_def FPR2L( SOC, SOC, Op_RegF, 2, as_FloatRegister(1)->as_VMReg());
-reg_def FPR2H( SOC, SOC, Op_RegF, 2, as_FloatRegister(1)->as_VMReg()->next());
-reg_def FPR3L( SOC, SOC, Op_RegF, 3, as_FloatRegister(2)->as_VMReg());
-reg_def FPR3H( SOC, SOC, Op_RegF, 3, as_FloatRegister(2)->as_VMReg()->next());
-reg_def FPR4L( SOC, SOC, Op_RegF, 4, as_FloatRegister(3)->as_VMReg());
-reg_def FPR4H( SOC, SOC, Op_RegF, 4, as_FloatRegister(3)->as_VMReg()->next());
-reg_def FPR5L( SOC, SOC, Op_RegF, 5, as_FloatRegister(4)->as_VMReg());
-reg_def FPR5H( SOC, SOC, Op_RegF, 5, as_FloatRegister(4)->as_VMReg()->next());
-reg_def FPR6L( SOC, SOC, Op_RegF, 6, as_FloatRegister(5)->as_VMReg());
-reg_def FPR6H( SOC, SOC, Op_RegF, 6, as_FloatRegister(5)->as_VMReg()->next());
-reg_def FPR7L( SOC, SOC, Op_RegF, 7, as_FloatRegister(6)->as_VMReg());
-reg_def FPR7H( SOC, SOC, Op_RegF, 7, as_FloatRegister(6)->as_VMReg()->next());
-//
-// Empty fill registers, which are never used, but supply alignment to xmm regs
-//
-reg_def FILL0( SOC, SOC, Op_RegF, 8, VMRegImpl::Bad());
-reg_def FILL1( SOC, SOC, Op_RegF, 9, VMRegImpl::Bad());
-reg_def FILL2( SOC, SOC, Op_RegF, 10, VMRegImpl::Bad());
-reg_def FILL3( SOC, SOC, Op_RegF, 11, VMRegImpl::Bad());
-reg_def FILL4( SOC, SOC, Op_RegF, 12, VMRegImpl::Bad());
-reg_def FILL5( SOC, SOC, Op_RegF, 13, VMRegImpl::Bad());
-reg_def FILL6( SOC, SOC, Op_RegF, 14, VMRegImpl::Bad());
-reg_def FILL7( SOC, SOC, Op_RegF, 15, VMRegImpl::Bad());
-
-// Specify priority of register selection within phases of register
-// allocation.  Highest priority is first.  A useful heuristic is to
-// give registers a low priority when they are required by machine
-// instructions, like EAX and EDX.  Registers which are used as
-// pairs must fall on an even boundary (witness the FPR#L's in this list).
-// For the Intel integer registers, the equivalent Long pairs are
-// EDX:EAX, EBX:ECX, and EDI:EBP.
-alloc_class chunk0( ECX,   EBX,   EBP,   EDI,   EAX,   EDX,   ESI, ESP,
-                    FPR0L, FPR0H, FPR1L, FPR1H, FPR2L, FPR2H,
-                    FPR3L, FPR3H, FPR4L, FPR4H, FPR5L, FPR5H,
-                    FPR6L, FPR6H, FPR7L, FPR7H,
-                    FILL0, FILL1, FILL2, FILL3, FILL4, FILL5, FILL6, FILL7);
-
-
-//----------Architecture Description Register Classes--------------------------
-// Several register classes are automatically defined based upon information in
-// this architecture description.
-// 1) reg_class inline_cache_reg           ( /* as def'd in frame section */ )
-// 2) reg_class stack_slots( /* one chunk of stack-based "registers" */ )
-//
-// Class for no registers (empty set).
-reg_class no_reg();
-
-// Class for all registers
-reg_class any_reg_with_ebp(EAX, EDX, EBP, EDI, ESI, ECX, EBX, ESP);
-// Class for all registers (excluding EBP)
-reg_class any_reg_no_ebp(EAX, EDX, EDI, ESI, ECX, EBX, ESP);
-// Dynamic register class that selects at runtime between register classes
-// any_reg and any_no_ebp_reg (depending on the value of the flag PreserveFramePointer).
-// Equivalent to: return PreserveFramePointer ? any_no_ebp_reg : any_reg;
-reg_class_dynamic any_reg(any_reg_no_ebp, any_reg_with_ebp, %{ PreserveFramePointer %});
-
-// Class for general registers
-reg_class int_reg_with_ebp(EAX, EDX, EBP, EDI, ESI, ECX, EBX);
-// Class for general registers (excluding EBP).
-// It is also safe for use by tailjumps (we don't want to allocate in ebp).
-// Used also if the PreserveFramePointer flag is true.
-reg_class int_reg_no_ebp(EAX, EDX, EDI, ESI, ECX, EBX);
-// Dynamic register class that selects between int_reg and int_reg_no_ebp.
-reg_class_dynamic int_reg(int_reg_no_ebp, int_reg_with_ebp, %{ PreserveFramePointer %});
-
-// Class of "X" registers
-reg_class int_x_reg(EBX, ECX, EDX, EAX);
-
-// Class of registers that can appear in an address with no offset.
-// EBP and ESP require an extra instruction byte for zero offset.
-// Used in fast-unlock
-reg_class p_reg(EDX, EDI, ESI, EBX);
-
-// Class for general registers excluding ECX
-reg_class ncx_reg_with_ebp(EAX, EDX, EBP, EDI, ESI, EBX);
-// Class for general registers excluding ECX (and EBP)
-reg_class ncx_reg_no_ebp(EAX, EDX, EDI, ESI, EBX);
-// Dynamic register class that selects between ncx_reg and ncx_reg_no_ebp.
-reg_class_dynamic ncx_reg(ncx_reg_no_ebp, ncx_reg_with_ebp, %{ PreserveFramePointer %});
-
-// Class for general registers excluding EAX
-reg_class nax_reg(EDX, EDI, ESI, ECX, EBX);
-
-// Class for general registers excluding EAX and EBX.
-reg_class nabx_reg_with_ebp(EDX, EDI, ESI, ECX, EBP);
-// Class for general registers excluding EAX and EBX (and EBP)
-reg_class nabx_reg_no_ebp(EDX, EDI, ESI, ECX);
-// Dynamic register class that selects between nabx_reg and nabx_reg_no_ebp.
-reg_class_dynamic nabx_reg(nabx_reg_no_ebp, nabx_reg_with_ebp, %{ PreserveFramePointer %});
-
-// Class of EAX (for multiply and divide operations)
-reg_class eax_reg(EAX);
-
-// Class of EBX (for atomic add)
-reg_class ebx_reg(EBX);
-
-// Class of ECX (for shift and JCXZ operations and cmpLTMask)
-reg_class ecx_reg(ECX);
-
-// Class of EDX (for multiply and divide operations)
-reg_class edx_reg(EDX);
-
-// Class of EDI (for synchronization)
-reg_class edi_reg(EDI);
-
-// Class of ESI (for synchronization)
-reg_class esi_reg(ESI);
-
-// Singleton class for stack pointer
-reg_class sp_reg(ESP);
-
-// Singleton class for instruction pointer
-// reg_class ip_reg(EIP);
-
-// Class of integer register pairs
-reg_class long_reg_with_ebp( EAX,EDX, ECX,EBX, EBP,EDI );
-// Class of integer register pairs (excluding EBP and EDI);
-reg_class long_reg_no_ebp( EAX,EDX, ECX,EBX );
-// Dynamic register class that selects between long_reg and long_reg_no_ebp.
-reg_class_dynamic long_reg(long_reg_no_ebp, long_reg_with_ebp, %{ PreserveFramePointer %});
-
-// Class of integer register pairs that aligns with calling convention
-reg_class eadx_reg( EAX,EDX );
-reg_class ebcx_reg( ECX,EBX );
-reg_class ebpd_reg( EBP,EDI );
-
-// Not AX or DX, used in divides
-reg_class nadx_reg_with_ebp(EBX, ECX, ESI, EDI, EBP);
-// Not AX or DX (and neither EBP), used in divides
-reg_class nadx_reg_no_ebp(EBX, ECX, ESI, EDI);
-// Dynamic register class that selects between nadx_reg and nadx_reg_no_ebp.
-reg_class_dynamic nadx_reg(nadx_reg_no_ebp, nadx_reg_with_ebp, %{ PreserveFramePointer %});
-
-// Floating point registers.  Notice FPR0 is not a choice.
-// FPR0 is not ever allocated; we use clever encodings to fake
-// a 2-address instructions out of Intels FP stack.
-reg_class fp_flt_reg( FPR1L,FPR2L,FPR3L,FPR4L,FPR5L,FPR6L,FPR7L );
-
-reg_class fp_dbl_reg( FPR1L,FPR1H, FPR2L,FPR2H, FPR3L,FPR3H,
-                      FPR4L,FPR4H, FPR5L,FPR5H, FPR6L,FPR6H,
-                      FPR7L,FPR7H );
-
-reg_class fp_flt_reg0( FPR1L );
-reg_class fp_dbl_reg0( FPR1L,FPR1H );
-reg_class fp_dbl_reg1( FPR2L,FPR2H );
-reg_class fp_dbl_notreg0( FPR2L,FPR2H, FPR3L,FPR3H, FPR4L,FPR4H,
-                          FPR5L,FPR5H, FPR6L,FPR6H, FPR7L,FPR7H );
-
-%}
-
-
-//----------SOURCE BLOCK-------------------------------------------------------
-// This is a block of C++ code which provides values, functions, and
-// definitions necessary in the rest of the architecture description
-source_hpp %{
-// Must be visible to the DFA in dfa_x86_32.cpp
-extern bool is_operand_hi32_zero(Node* n);
-%}
-
-source %{
-#define   RELOC_IMM32    Assembler::imm_operand
-#define   RELOC_DISP32   Assembler::disp32_operand
-
-#define __ masm->
-
-// How to find the high register of a Long pair, given the low register
-#define   HIGH_FROM_LOW(x) (as_Register((x)->encoding()+2))
-#define   HIGH_FROM_LOW_ENC(x) ((x)+2)
-
-// These masks are used to provide 128-bit aligned bitmasks to the XMM
-// instructions, to allow sign-masking or sign-bit flipping.  They allow
-// fast versions of NegF/NegD and AbsF/AbsD.
-
-void reg_mask_init() {}
-
-// Note: 'double' and 'long long' have 32-bits alignment on x86.
-static jlong* double_quadword(jlong *adr, jlong lo, jlong hi) {
-  // Use the expression (adr)&(~0xF) to provide 128-bits aligned address
-  // of 128-bits operands for SSE instructions.
-  jlong *operand = (jlong*)(((uintptr_t)adr)&((uintptr_t)(~0xF)));
-  // Store the value to a 128-bits operand.
-  operand[0] = lo;
-  operand[1] = hi;
-  return operand;
-}
-
-// Buffer for 128-bits masks used by SSE instructions.
-static jlong fp_signmask_pool[(4+1)*2]; // 4*128bits(data) + 128bits(alignment)
-
-// Static initialization during VM startup.
-static jlong *float_signmask_pool  = double_quadword(&fp_signmask_pool[1*2], CONST64(0x7FFFFFFF7FFFFFFF), CONST64(0x7FFFFFFF7FFFFFFF));
-static jlong *double_signmask_pool = double_quadword(&fp_signmask_pool[2*2], CONST64(0x7FFFFFFFFFFFFFFF), CONST64(0x7FFFFFFFFFFFFFFF));
-static jlong *float_signflip_pool  = double_quadword(&fp_signmask_pool[3*2], CONST64(0x8000000080000000), CONST64(0x8000000080000000));
-static jlong *double_signflip_pool = double_quadword(&fp_signmask_pool[4*2], CONST64(0x8000000000000000), CONST64(0x8000000000000000));
-
-// Offset hacking within calls.
-static int pre_call_resets_size() {
-  int size = 0;
-  Compile* C = Compile::current();
-  if (C->in_24_bit_fp_mode()) {
-    size += 6; // fldcw
-  }
-  if (VM_Version::supports_vzeroupper()) {
-    size += 3; // vzeroupper
-  }
-  return size;
-}
-
-// !!!!! Special hack to get all type of calls to specify the byte offset
-//       from the start of the call to the point where the return address
-//       will point.
-int MachCallStaticJavaNode::ret_addr_offset() {
-  return 5 + pre_call_resets_size();  // 5 bytes from start of call to where return address points
-}
-
-int MachCallDynamicJavaNode::ret_addr_offset() {
-  return 10 + pre_call_resets_size();  // 10 bytes from start of call to where return address points
-}
-
-static int sizeof_FFree_Float_Stack_All = -1;
-
-int MachCallRuntimeNode::ret_addr_offset() {
-  assert(sizeof_FFree_Float_Stack_All != -1, "must have been emitted already");
-  return 5 + pre_call_resets_size() + (_leaf_no_fp ? 0 : sizeof_FFree_Float_Stack_All);
-}
-
-//
-// Compute padding required for nodes which need alignment
-//
-
-// The address of the call instruction needs to be 4-byte aligned to
-// ensure that it does not span a cache line so that it can be patched.
-int CallStaticJavaDirectNode::compute_padding(int current_offset) const {
-  current_offset += pre_call_resets_size();  // skip fldcw, if any
-  current_offset += 1;      // skip call opcode byte
-  return align_up(current_offset, alignment_required()) - current_offset;
-}
-
-// The address of the call instruction needs to be 4-byte aligned to
-// ensure that it does not span a cache line so that it can be patched.
-int CallDynamicJavaDirectNode::compute_padding(int current_offset) const {
-  current_offset += pre_call_resets_size();  // skip fldcw, if any
-  current_offset += 5;      // skip MOV instruction
-  current_offset += 1;      // skip call opcode byte
-  return align_up(current_offset, alignment_required()) - current_offset;
-}
-
-// EMIT_RM()
-void emit_rm(C2_MacroAssembler *masm, int f1, int f2, int f3) {
-  unsigned char c = (unsigned char)((f1 << 6) | (f2 << 3) | f3);
-  __ emit_int8(c);
-}
-
-// EMIT_CC()
-void emit_cc(C2_MacroAssembler *masm, int f1, int f2) {
-  unsigned char c = (unsigned char)( f1 | f2 );
-  __ emit_int8(c);
-}
-
-// EMIT_OPCODE()
-void emit_opcode(C2_MacroAssembler *masm, int code) {
-  __ emit_int8((unsigned char) code);
-}
-
-// EMIT_OPCODE() w/ relocation information
-void emit_opcode(C2_MacroAssembler *masm, int code, relocInfo::relocType reloc, int offset = 0) {
-  __ relocate(__ inst_mark() + offset, reloc);
-  emit_opcode(masm, code);
-}
-
-// EMIT_D8()
-void emit_d8(C2_MacroAssembler *masm, int d8) {
-  __ emit_int8((unsigned char) d8);
-}
-
-// EMIT_D16()
-void emit_d16(C2_MacroAssembler *masm, int d16) {
-  __ emit_int16(d16);
-}
-
-// EMIT_D32()
-void emit_d32(C2_MacroAssembler *masm, int d32) {
-  __ emit_int32(d32);
-}
-
-// emit 32 bit value and construct relocation entry from relocInfo::relocType
-void emit_d32_reloc(C2_MacroAssembler *masm, int d32, relocInfo::relocType reloc,
-        int format) {
-  __ relocate(__ inst_mark(), reloc, format);
-  __ emit_int32(d32);
-}
-
-// emit 32 bit value and construct relocation entry from RelocationHolder
-void emit_d32_reloc(C2_MacroAssembler *masm, int d32, RelocationHolder const& rspec,
-        int format) {
-#ifdef ASSERT
-  if (rspec.reloc()->type() == relocInfo::oop_type && d32 != 0 && d32 != (int)Universe::non_oop_word()) {
-    assert(oopDesc::is_oop(cast_to_oop(d32)), "cannot embed broken oops in code");
-  }
-#endif
-  __ relocate(__ inst_mark(), rspec, format);
-  __ emit_int32(d32);
-}
-
-// Access stack slot for load or store
-void store_to_stackslot(C2_MacroAssembler *masm, int opcode, int rm_field, int disp) {
-  emit_opcode( masm, opcode );               // (e.g., FILD   [ESP+src])
-  if( -128 <= disp && disp <= 127 ) {
-    emit_rm( masm, 0x01, rm_field, ESP_enc );  // R/M byte
-    emit_rm( masm, 0x00, ESP_enc, ESP_enc);    // SIB byte
-    emit_d8 (masm, disp);     // Displacement  // R/M byte
-  } else {
-    emit_rm( masm, 0x02, rm_field, ESP_enc );  // R/M byte
-    emit_rm( masm, 0x00, ESP_enc, ESP_enc);    // SIB byte
-    emit_d32(masm, disp);     // Displacement  // R/M byte
-  }
-}
-
-   // rRegI ereg, memory mem) %{    // emit_reg_mem
-void encode_RegMem( C2_MacroAssembler *masm, int reg_encoding, int base, int index, int scale, int displace, relocInfo::relocType disp_reloc ) {
-  // There is no index & no scale, use form without SIB byte
-  if ((index == 0x4) &&
-      (scale == 0) && (base != ESP_enc)) {
-    // If no displacement, mode is 0x0; unless base is [EBP]
-    if ( (displace == 0) && (base != EBP_enc) ) {
-      emit_rm(masm, 0x0, reg_encoding, base);
-    }
-    else {                    // If 8-bit displacement, mode 0x1
-      if ((displace >= -128) && (displace <= 127)
-          && (disp_reloc == relocInfo::none) ) {
-        emit_rm(masm, 0x1, reg_encoding, base);
-        emit_d8(masm, displace);
-      }
-      else {                  // If 32-bit displacement
-        if (base == -1) { // Special flag for absolute address
-          emit_rm(masm, 0x0, reg_encoding, 0x5);
-          // (manual lies; no SIB needed here)
-          if ( disp_reloc != relocInfo::none ) {
-            emit_d32_reloc(masm, displace, disp_reloc, 1);
-          } else {
-            emit_d32      (masm, displace);
-          }
-        }
-        else {                // Normal base + offset
-          emit_rm(masm, 0x2, reg_encoding, base);
-          if ( disp_reloc != relocInfo::none ) {
-            emit_d32_reloc(masm, displace, disp_reloc, 1);
-          } else {
-            emit_d32      (masm, displace);
-          }
-        }
-      }
-    }
-  }
-  else {                      // Else, encode with the SIB byte
-    // If no displacement, mode is 0x0; unless base is [EBP]
-    if (displace == 0 && (base != EBP_enc)) {  // If no displacement
-      emit_rm(masm, 0x0, reg_encoding, 0x4);
-      emit_rm(masm, scale, index, base);
-    }
-    else {                    // If 8-bit displacement, mode 0x1
-      if ((displace >= -128) && (displace <= 127)
-          && (disp_reloc == relocInfo::none) ) {
-        emit_rm(masm, 0x1, reg_encoding, 0x4);
-        emit_rm(masm, scale, index, base);
-        emit_d8(masm, displace);
-      }
-      else {                  // If 32-bit displacement
-        if (base == 0x04 ) {
-          emit_rm(masm, 0x2, reg_encoding, 0x4);
-          emit_rm(masm, scale, index, 0x04);
-        } else {
-          emit_rm(masm, 0x2, reg_encoding, 0x4);
-          emit_rm(masm, scale, index, base);
-        }
-        if ( disp_reloc != relocInfo::none ) {
-          emit_d32_reloc(masm, displace, disp_reloc, 1);
-        } else {
-          emit_d32      (masm, displace);
-        }
-      }
-    }
-  }
-}
-
-
-void encode_Copy( C2_MacroAssembler *masm, int dst_encoding, int src_encoding ) {
-  if( dst_encoding == src_encoding ) {
-    // reg-reg copy, use an empty encoding
-  } else {
-    emit_opcode( masm, 0x8B );
-    emit_rm(masm, 0x3, dst_encoding, src_encoding );
-  }
-}
-
-void emit_cmpfp_fixup(MacroAssembler* masm) {
-  Label exit;
-  __ jccb(Assembler::noParity, exit);
-  __ pushf();
-  //
-  // comiss/ucomiss instructions set ZF,PF,CF flags and
-  // zero OF,AF,SF for NaN values.
-  // Fixup flags by zeroing ZF,PF so that compare of NaN
-  // values returns 'less than' result (CF is set).
-  // Leave the rest of flags unchanged.
-  //
-  //    7 6 5 4 3 2 1 0
-  //   |S|Z|r|A|r|P|r|C|  (r - reserved bit)
-  //    0 0 1 0 1 0 1 1   (0x2B)
-  //
-  __ andl(Address(rsp, 0), 0xffffff2b);
-  __ popf();
-  __ bind(exit);
-}
-
-static void emit_cmpfp3(MacroAssembler* masm, Register dst) {
-  Label done;
-  __ movl(dst, -1);
-  __ jcc(Assembler::parity, done);
-  __ jcc(Assembler::below, done);
-  __ setb(Assembler::notEqual, dst);
-  __ movzbl(dst, dst);
-  __ bind(done);
-}
-
-
-//=============================================================================
-const RegMask& MachConstantBaseNode::_out_RegMask = RegMask::Empty;
-
-int ConstantTable::calculate_table_base_offset() const {
-  return 0;  // absolute addressing, no offset
-}
-
-bool MachConstantBaseNode::requires_postalloc_expand() const { return false; }
-void MachConstantBaseNode::postalloc_expand(GrowableArray <Node *> *nodes, PhaseRegAlloc *ra_) {
-  ShouldNotReachHere();
-}
-
-void MachConstantBaseNode::emit(C2_MacroAssembler* masm, PhaseRegAlloc* ra_) const {
-  // Empty encoding
-}
-
-uint MachConstantBaseNode::size(PhaseRegAlloc* ra_) const {
-  return 0;
-}
-
-#ifndef PRODUCT
-void MachConstantBaseNode::format(PhaseRegAlloc* ra_, outputStream* st) const {
-  st->print("# MachConstantBaseNode (empty encoding)");
-}
-#endif
-
-
-//=============================================================================
-#ifndef PRODUCT
-void MachPrologNode::format(PhaseRegAlloc* ra_, outputStream* st) const {
-  Compile* C = ra_->C;
-
-  int framesize = C->output()->frame_size_in_bytes();
-  int bangsize = C->output()->bang_size_in_bytes();
-  assert((framesize & (StackAlignmentInBytes-1)) == 0, "frame size not aligned");
-  // Remove wordSize for return addr which is already pushed.
-  framesize -= wordSize;
-
-  if (C->output()->need_stack_bang(bangsize)) {
-    framesize -= wordSize;
-    st->print("# stack bang (%d bytes)", bangsize);
-    st->print("\n\t");
-    st->print("PUSH   EBP\t# Save EBP");
-    if (PreserveFramePointer) {
-      st->print("\n\t");
-      st->print("MOV    EBP, ESP\t# Save the caller's SP into EBP");
-    }
-    if (framesize) {
-      st->print("\n\t");
-      st->print("SUB    ESP, #%d\t# Create frame",framesize);
-    }
-  } else {
-    st->print("SUB    ESP, #%d\t# Create frame",framesize);
-    st->print("\n\t");
-    framesize -= wordSize;
-    st->print("MOV    [ESP + #%d], EBP\t# Save EBP",framesize);
-    if (PreserveFramePointer) {
-      st->print("\n\t");
-      st->print("MOV    EBP, ESP\t# Save the caller's SP into EBP");
-      if (framesize > 0) {
-        st->print("\n\t");
-        st->print("ADD    EBP, #%d", framesize);
-      }
-    }
-  }
-
-  if (VerifyStackAtCalls) {
-    st->print("\n\t");
-    framesize -= wordSize;
-    st->print("MOV    [ESP + #%d], 0xBADB100D\t# Majik cookie for stack depth check",framesize);
-  }
-
-  if( C->in_24_bit_fp_mode() ) {
-    st->print("\n\t");
-    st->print("FLDCW  \t# load 24 bit fpu control word");
-  }
-  if (UseSSE >= 2 && VerifyFPU) {
-    st->print("\n\t");
-    st->print("# verify FPU stack (must be clean on entry)");
-  }
-
-#ifdef ASSERT
-  if (VerifyStackAtCalls) {
-    st->print("\n\t");
-    st->print("# stack alignment check");
-  }
-#endif
-  st->cr();
-}
-#endif
-
-
-void MachPrologNode::emit(C2_MacroAssembler *masm, PhaseRegAlloc *ra_) const {
-  Compile* C = ra_->C;
-
-  int framesize = C->output()->frame_size_in_bytes();
-  int bangsize = C->output()->bang_size_in_bytes();
-
-  __ verified_entry(framesize, C->output()->need_stack_bang(bangsize)?bangsize:0, C->in_24_bit_fp_mode(), C->stub_function() != nullptr);
-
-  C->output()->set_frame_complete(__ offset());
-
-  if (C->has_mach_constant_base_node()) {
-    // NOTE: We set the table base offset here because users might be
-    // emitted before MachConstantBaseNode.
-    ConstantTable& constant_table = C->output()->constant_table();
-    constant_table.set_table_base_offset(constant_table.calculate_table_base_offset());
-  }
-}
-
-uint MachPrologNode::size(PhaseRegAlloc *ra_) const {
-  return MachNode::size(ra_); // too many variables; just compute it the hard way
-}
-
-int MachPrologNode::reloc() const {
-  return 0; // a large enough number
-}
-
-//=============================================================================
-#ifndef PRODUCT
-void MachEpilogNode::format( PhaseRegAlloc *ra_, outputStream* st ) const {
-  Compile *C = ra_->C;
-  int framesize = C->output()->frame_size_in_bytes();
-  assert((framesize & (StackAlignmentInBytes-1)) == 0, "frame size not aligned");
-  // Remove two words for return addr and rbp,
-  framesize -= 2*wordSize;
-
-  if (C->max_vector_size() > 16) {
-    st->print("VZEROUPPER");
-    st->cr(); st->print("\t");
-  }
-  if (C->in_24_bit_fp_mode()) {
-    st->print("FLDCW  standard control word");
-    st->cr(); st->print("\t");
-  }
-  if (framesize) {
-    st->print("ADD    ESP,%d\t# Destroy frame",framesize);
-    st->cr(); st->print("\t");
-  }
-  st->print_cr("POPL   EBP"); st->print("\t");
-  if (do_polling() && C->is_method_compilation()) {
-    st->print("CMPL    rsp, poll_offset[thread]  \n\t"
-              "JA      #safepoint_stub\t"
-              "# Safepoint: poll for GC");
-  }
-}
-#endif
-
-void MachEpilogNode::emit(C2_MacroAssembler *masm, PhaseRegAlloc *ra_) const {
-  Compile *C = ra_->C;
-
-  if (C->max_vector_size() > 16) {
-    // Clear upper bits of YMM registers when current compiled code uses
-    // wide vectors to avoid AVX <-> SSE transition penalty during call.
-    __ vzeroupper();
-  }
-  // If method set FPU control word, restore to standard control word
-  if (C->in_24_bit_fp_mode()) {
-    __ fldcw(ExternalAddress(StubRoutines::x86::addr_fpu_cntrl_wrd_std()));
-  }
-
-  int framesize = C->output()->frame_size_in_bytes();
-  assert((framesize & (StackAlignmentInBytes-1)) == 0, "frame size not aligned");
-  // Remove two words for return addr and rbp,
-  framesize -= 2*wordSize;
-
-  // Note that VerifyStackAtCalls' Majik cookie does not change the frame size popped here
-
-  if (framesize >= 128) {
-    emit_opcode(masm, 0x81); // add  SP, #framesize
-    emit_rm(masm, 0x3, 0x00, ESP_enc);
-    emit_d32(masm, framesize);
-  } else if (framesize) {
-    emit_opcode(masm, 0x83); // add  SP, #framesize
-    emit_rm(masm, 0x3, 0x00, ESP_enc);
-    emit_d8(masm, framesize);
-  }
-
-  emit_opcode(masm, 0x58 | EBP_enc);
-
-  if (StackReservedPages > 0 && C->has_reserved_stack_access()) {
-    __ reserved_stack_check();
-  }
-
-  if (do_polling() && C->is_method_compilation()) {
-    Register thread = as_Register(EBX_enc);
-    __ get_thread(thread);
-    Label dummy_label;
-    Label* code_stub = &dummy_label;
-    if (!C->output()->in_scratch_emit_size()) {
-      C2SafepointPollStub* stub = new (C->comp_arena()) C2SafepointPollStub(__ offset());
-      C->output()->add_stub(stub);
-      code_stub = &stub->entry();
-    }
-    __ set_inst_mark();
-    __ relocate(relocInfo::poll_return_type);
-    __ clear_inst_mark();
-    __ safepoint_poll(*code_stub, thread, true /* at_return */, true /* in_nmethod */);
-  }
-}
-
-uint MachEpilogNode::size(PhaseRegAlloc *ra_) const {
-  return MachNode::size(ra_); // too many variables; just compute it
-                              // the hard way
-}
-
-int MachEpilogNode::reloc() const {
-  return 0; // a large enough number
-}
-
-const Pipeline * MachEpilogNode::pipeline() const {
-  return MachNode::pipeline_class();
-}
-
-//=============================================================================
-
-enum RC { rc_bad, rc_int, rc_kreg, rc_float, rc_xmm, rc_stack };
-static enum RC rc_class( OptoReg::Name reg ) {
-
-  if( !OptoReg::is_valid(reg)  ) return rc_bad;
-  if (OptoReg::is_stack(reg)) return rc_stack;
-
-  VMReg r = OptoReg::as_VMReg(reg);
-  if (r->is_Register()) return rc_int;
-  if (r->is_FloatRegister()) {
-    assert(UseSSE < 2, "shouldn't be used in SSE2+ mode");
-    return rc_float;
-  }
-  if (r->is_KRegister()) return rc_kreg;
-  assert(r->is_XMMRegister(), "must be");
-  return rc_xmm;
-}
-
-static int impl_helper( C2_MacroAssembler *masm, bool do_size, bool is_load, int offset, int reg,
-                        int opcode, const char *op_str, int size, outputStream* st ) {
-  if( masm ) {
-    masm->set_inst_mark();
-    emit_opcode  (masm, opcode );
-    encode_RegMem(masm, Matcher::_regEncode[reg], ESP_enc, 0x4, 0, offset, relocInfo::none);
-    masm->clear_inst_mark();
-#ifndef PRODUCT
-  } else if( !do_size ) {
-    if( size != 0 ) st->print("\n\t");
-    if( opcode == 0x8B || opcode == 0x89 ) { // MOV
-      if( is_load ) st->print("%s   %s,[ESP + #%d]",op_str,Matcher::regName[reg],offset);
-      else          st->print("%s   [ESP + #%d],%s",op_str,offset,Matcher::regName[reg]);
-    } else { // FLD, FST, PUSH, POP
-      st->print("%s [ESP + #%d]",op_str,offset);
-    }
-#endif
-  }
-  int offset_size = (offset == 0) ? 0 : ((offset <= 127) ? 1 : 4);
-  return size+3+offset_size;
-}
-
-// Helper for XMM registers.  Extra opcode bits, limited syntax.
-static int impl_x_helper( C2_MacroAssembler *masm, bool do_size, bool is_load,
-                         int offset, int reg_lo, int reg_hi, int size, outputStream* st ) {
-  int in_size_in_bits = Assembler::EVEX_32bit;
-  int evex_encoding = 0;
-  if (reg_lo+1 == reg_hi) {
-    in_size_in_bits = Assembler::EVEX_64bit;
-    evex_encoding = Assembler::VEX_W;
-  }
-  if (masm) {
-    // EVEX spills remain EVEX: Compressed displacemement is better than AVX on spill mem operations,
-    //                          it maps more cases to single byte displacement
-    __ set_managed();
-    if (reg_lo+1 == reg_hi) { // double move?
-      if (is_load) {
-        __ movdbl(as_XMMRegister(Matcher::_regEncode[reg_lo]), Address(rsp, offset));
-      } else {
-        __ movdbl(Address(rsp, offset), as_XMMRegister(Matcher::_regEncode[reg_lo]));
-      }
-    } else {
-      if (is_load) {
-        __ movflt(as_XMMRegister(Matcher::_regEncode[reg_lo]), Address(rsp, offset));
-      } else {
-        __ movflt(Address(rsp, offset), as_XMMRegister(Matcher::_regEncode[reg_lo]));
-      }
-    }
-#ifndef PRODUCT
-  } else if (!do_size) {
-    if (size != 0) st->print("\n\t");
-    if (reg_lo+1 == reg_hi) { // double move?
-      if (is_load) st->print("%s %s,[ESP + #%d]",
-                              UseXmmLoadAndClearUpper ? "MOVSD " : "MOVLPD",
-                              Matcher::regName[reg_lo], offset);
-      else         st->print("MOVSD  [ESP + #%d],%s",
-                              offset, Matcher::regName[reg_lo]);
-    } else {
-      if (is_load) st->print("MOVSS  %s,[ESP + #%d]",
-                              Matcher::regName[reg_lo], offset);
-      else         st->print("MOVSS  [ESP + #%d],%s",
-                              offset, Matcher::regName[reg_lo]);
-    }
-#endif
-  }
-  bool is_single_byte = false;
-  if ((UseAVX > 2) && (offset != 0)) {
-    is_single_byte = Assembler::query_compressed_disp_byte(offset, true, 0, Assembler::EVEX_T1S, in_size_in_bits, evex_encoding);
-  }
-  int offset_size = 0;
-  if (UseAVX > 2 ) {
-    offset_size = (offset == 0) ? 0 : ((is_single_byte) ? 1 : 4);
-  } else {
-    offset_size = (offset == 0) ? 0 : ((offset <= 127) ? 1 : 4);
-  }
-  size += (UseAVX > 2) ? 2 : 0; // Need an additional two bytes for EVEX
-  // VEX_2bytes prefix is used if UseAVX > 0, so it takes the same 2 bytes as SIMD prefix.
-  return size+5+offset_size;
-}
-
-
-static int impl_movx_helper( C2_MacroAssembler *masm, bool do_size, int src_lo, int dst_lo,
-                            int src_hi, int dst_hi, int size, outputStream* st ) {
-  if (masm) {
-    // EVEX spills remain EVEX: logic complex between full EVEX, partial and AVX, manage EVEX spill code one way.
-    __ set_managed();
-    if (src_lo+1 == src_hi && dst_lo+1 == dst_hi) { // double move?
-      __ movdbl(as_XMMRegister(Matcher::_regEncode[dst_lo]),
-                as_XMMRegister(Matcher::_regEncode[src_lo]));
-    } else {
-      __ movflt(as_XMMRegister(Matcher::_regEncode[dst_lo]),
-                as_XMMRegister(Matcher::_regEncode[src_lo]));
-    }
-#ifndef PRODUCT
-  } else if (!do_size) {
-    if (size != 0) st->print("\n\t");
-    if (UseXmmRegToRegMoveAll) {//Use movaps,movapd to move between xmm registers
-      if (src_lo+1 == src_hi && dst_lo+1 == dst_hi) { // double move?
-        st->print("MOVAPD %s,%s",Matcher::regName[dst_lo],Matcher::regName[src_lo]);
-      } else {
-        st->print("MOVAPS %s,%s",Matcher::regName[dst_lo],Matcher::regName[src_lo]);
-      }
-    } else {
-      if( src_lo+1 == src_hi && dst_lo+1 == dst_hi ) { // double move?
-        st->print("MOVSD  %s,%s",Matcher::regName[dst_lo],Matcher::regName[src_lo]);
-      } else {
-        st->print("MOVSS  %s,%s",Matcher::regName[dst_lo],Matcher::regName[src_lo]);
-      }
-    }
-#endif
-  }
-  // VEX_2bytes prefix is used if UseAVX > 0, and it takes the same 2 bytes as SIMD prefix.
-  // Only MOVAPS SSE prefix uses 1 byte.  EVEX uses an additional 2 bytes.
-  int sz = (UseAVX > 2) ? 6 : 4;
-  if (!(src_lo+1 == src_hi && dst_lo+1 == dst_hi) &&
-      UseXmmRegToRegMoveAll && (UseAVX == 0)) sz = 3;
-  return size + sz;
-}
-
-static int impl_movgpr2x_helper( C2_MacroAssembler *masm, bool do_size, int src_lo, int dst_lo,
-                            int src_hi, int dst_hi, int size, outputStream* st ) {
-  // 32-bit
-  if (masm) {
-    // EVEX spills remain EVEX: logic complex between full EVEX, partial and AVX, manage EVEX spill code one way.
-    __ set_managed();
-    __ movdl(as_XMMRegister(Matcher::_regEncode[dst_lo]),
-             as_Register(Matcher::_regEncode[src_lo]));
-#ifndef PRODUCT
-  } else if (!do_size) {
-    st->print("movdl   %s, %s\t# spill", Matcher::regName[dst_lo], Matcher::regName[src_lo]);
-#endif
-  }
-  return (UseAVX> 2) ? 6 : 4;
-}
-
-
-static int impl_movx2gpr_helper( C2_MacroAssembler *masm, bool do_size, int src_lo, int dst_lo,
-                                 int src_hi, int dst_hi, int size, outputStream* st ) {
-  // 32-bit
-  if (masm) {
-    // EVEX spills remain EVEX: logic complex between full EVEX, partial and AVX, manage EVEX spill code one way.
-    __ set_managed();
-    __ movdl(as_Register(Matcher::_regEncode[dst_lo]),
-             as_XMMRegister(Matcher::_regEncode[src_lo]));
-#ifndef PRODUCT
-  } else if (!do_size) {
-    st->print("movdl   %s, %s\t# spill", Matcher::regName[dst_lo], Matcher::regName[src_lo]);
-#endif
-  }
-  return (UseAVX> 2) ? 6 : 4;
-}
-
-static int impl_mov_helper( C2_MacroAssembler *masm, bool do_size, int src, int dst, int size, outputStream* st ) {
-  if( masm ) {
-    emit_opcode(masm, 0x8B );
-    emit_rm    (masm, 0x3, Matcher::_regEncode[dst], Matcher::_regEncode[src] );
-#ifndef PRODUCT
-  } else if( !do_size ) {
-    if( size != 0 ) st->print("\n\t");
-    st->print("MOV    %s,%s",Matcher::regName[dst],Matcher::regName[src]);
-#endif
-  }
-  return size+2;
-}
-
-static int impl_fp_store_helper( C2_MacroAssembler *masm, bool do_size, int src_lo, int src_hi, int dst_lo, int dst_hi,
-                                 int offset, int size, outputStream* st ) {
-  if( src_lo != FPR1L_num ) {      // Move value to top of FP stack, if not already there
-    if( masm ) {
-      emit_opcode( masm, 0xD9 );  // FLD (i.e., push it)
-      emit_d8( masm, 0xC0-1+Matcher::_regEncode[src_lo] );
-#ifndef PRODUCT
-    } else if( !do_size ) {
-      if( size != 0 ) st->print("\n\t");
-      st->print("FLD    %s",Matcher::regName[src_lo]);
-#endif
-    }
-    size += 2;
-  }
-
-  int st_op = (src_lo != FPR1L_num) ? EBX_num /*store & pop*/ : EDX_num /*store no pop*/;
-  const char *op_str;
-  int op;
-  if( src_lo+1 == src_hi && dst_lo+1 == dst_hi ) { // double store?
-    op_str = (src_lo != FPR1L_num) ? "FSTP_D" : "FST_D ";
-    op = 0xDD;
-  } else {                   // 32-bit store
-    op_str = (src_lo != FPR1L_num) ? "FSTP_S" : "FST_S ";
-    op = 0xD9;
-    assert( !OptoReg::is_valid(src_hi) && !OptoReg::is_valid(dst_hi), "no non-adjacent float-stores" );
-  }
-
-  return impl_helper(masm,do_size,false,offset,st_op,op,op_str,size, st);
-}
-
-// Next two methods are shared by 32- and 64-bit VM. They are defined in x86.ad.
-static void vec_mov_helper(C2_MacroAssembler *masm, int src_lo, int dst_lo,
-                          int src_hi, int dst_hi, uint ireg, outputStream* st);
-
-void vec_spill_helper(C2_MacroAssembler *masm, bool is_load,
-                            int stack_offset, int reg, uint ireg, outputStream* st);
-
-static void vec_stack_to_stack_helper(C2_MacroAssembler *masm, int src_offset,
-                                     int dst_offset, uint ireg, outputStream* st) {
-  if (masm) {
-    switch (ireg) {
-    case Op_VecS:
-      __ pushl(Address(rsp, src_offset));
-      __ popl (Address(rsp, dst_offset));
-      break;
-    case Op_VecD:
-      __ pushl(Address(rsp, src_offset));
-      __ popl (Address(rsp, dst_offset));
-      __ pushl(Address(rsp, src_offset+4));
-      __ popl (Address(rsp, dst_offset+4));
-      break;
-    case Op_VecX:
-      __ movdqu(Address(rsp, -16), xmm0);
-      __ movdqu(xmm0, Address(rsp, src_offset));
-      __ movdqu(Address(rsp, dst_offset), xmm0);
-      __ movdqu(xmm0, Address(rsp, -16));
-      break;
-    case Op_VecY:
-      __ vmovdqu(Address(rsp, -32), xmm0);
-      __ vmovdqu(xmm0, Address(rsp, src_offset));
-      __ vmovdqu(Address(rsp, dst_offset), xmm0);
-      __ vmovdqu(xmm0, Address(rsp, -32));
-      break;
-    case Op_VecZ:
-      __ evmovdquq(Address(rsp, -64), xmm0, 2);
-      __ evmovdquq(xmm0, Address(rsp, src_offset), 2);
-      __ evmovdquq(Address(rsp, dst_offset), xmm0, 2);
-      __ evmovdquq(xmm0, Address(rsp, -64), 2);
-      break;
-    default:
-      ShouldNotReachHere();
-    }
-#ifndef PRODUCT
-  } else {
-    switch (ireg) {
-    case Op_VecS:
-      st->print("pushl   [rsp + #%d]\t# 32-bit mem-mem spill\n\t"
-                "popl    [rsp + #%d]",
-                src_offset, dst_offset);
-      break;
-    case Op_VecD:
-      st->print("pushl   [rsp + #%d]\t# 64-bit mem-mem spill\n\t"
-                "popq    [rsp + #%d]\n\t"
-                "pushl   [rsp + #%d]\n\t"
-                "popq    [rsp + #%d]",
-                src_offset, dst_offset, src_offset+4, dst_offset+4);
-      break;
-     case Op_VecX:
-      st->print("movdqu  [rsp - #16], xmm0\t# 128-bit mem-mem spill\n\t"
-                "movdqu  xmm0, [rsp + #%d]\n\t"
-                "movdqu  [rsp + #%d], xmm0\n\t"
-                "movdqu  xmm0, [rsp - #16]",
-                src_offset, dst_offset);
-      break;
-    case Op_VecY:
-      st->print("vmovdqu [rsp - #32], xmm0\t# 256-bit mem-mem spill\n\t"
-                "vmovdqu xmm0, [rsp + #%d]\n\t"
-                "vmovdqu [rsp + #%d], xmm0\n\t"
-                "vmovdqu xmm0, [rsp - #32]",
-                src_offset, dst_offset);
-      break;
-    case Op_VecZ:
-      st->print("vmovdqu [rsp - #64], xmm0\t# 512-bit mem-mem spill\n\t"
-                "vmovdqu xmm0, [rsp + #%d]\n\t"
-                "vmovdqu [rsp + #%d], xmm0\n\t"
-                "vmovdqu xmm0, [rsp - #64]",
-                src_offset, dst_offset);
-      break;
-    default:
-      ShouldNotReachHere();
-    }
-#endif
-  }
-}
-
-uint MachSpillCopyNode::implementation( C2_MacroAssembler *masm, PhaseRegAlloc *ra_, bool do_size, outputStream* st ) const {
-  // Get registers to move
-  OptoReg::Name src_second = ra_->get_reg_second(in(1));
-  OptoReg::Name src_first = ra_->get_reg_first(in(1));
-  OptoReg::Name dst_second = ra_->get_reg_second(this );
-  OptoReg::Name dst_first = ra_->get_reg_first(this );
-
-  enum RC src_second_rc = rc_class(src_second);
-  enum RC src_first_rc = rc_class(src_first);
-  enum RC dst_second_rc = rc_class(dst_second);
-  enum RC dst_first_rc = rc_class(dst_first);
-
-  assert( OptoReg::is_valid(src_first) && OptoReg::is_valid(dst_first), "must move at least 1 register" );
-
-  // Generate spill code!
-  int size = 0;
-
-  if( src_first == dst_first && src_second == dst_second )
-    return size;            // Self copy, no move
-
-  if (bottom_type()->isa_vect() != nullptr && bottom_type()->isa_vectmask() == nullptr) {
-    uint ireg = ideal_reg();
-    assert((src_first_rc != rc_int && dst_first_rc != rc_int), "sanity");
-    assert((src_first_rc != rc_float && dst_first_rc != rc_float), "sanity");
-    assert((ireg == Op_VecS || ireg == Op_VecD || ireg == Op_VecX || ireg == Op_VecY || ireg == Op_VecZ ), "sanity");
-    if( src_first_rc == rc_stack && dst_first_rc == rc_stack ) {
-      // mem -> mem
-      int src_offset = ra_->reg2offset(src_first);
-      int dst_offset = ra_->reg2offset(dst_first);
-      vec_stack_to_stack_helper(masm, src_offset, dst_offset, ireg, st);
-    } else if (src_first_rc == rc_xmm && dst_first_rc == rc_xmm ) {
-      vec_mov_helper(masm, src_first, dst_first, src_second, dst_second, ireg, st);
-    } else if (src_first_rc == rc_xmm && dst_first_rc == rc_stack ) {
-      int stack_offset = ra_->reg2offset(dst_first);
-      vec_spill_helper(masm, false, stack_offset, src_first, ireg, st);
-    } else if (src_first_rc == rc_stack && dst_first_rc == rc_xmm ) {
-      int stack_offset = ra_->reg2offset(src_first);
-      vec_spill_helper(masm, true,  stack_offset, dst_first, ireg, st);
-    } else {
-      ShouldNotReachHere();
-    }
-    return 0;
-  }
-
-  // --------------------------------------
-  // Check for mem-mem move.  push/pop to move.
-  if( src_first_rc == rc_stack && dst_first_rc == rc_stack ) {
-    if( src_second == dst_first ) { // overlapping stack copy ranges
-      assert( src_second_rc == rc_stack && dst_second_rc == rc_stack, "we only expect a stk-stk copy here" );
-      size = impl_helper(masm,do_size,true ,ra_->reg2offset(src_second),ESI_num,0xFF,"PUSH  ",size, st);
-      size = impl_helper(masm,do_size,false,ra_->reg2offset(dst_second),EAX_num,0x8F,"POP   ",size, st);
-      src_second_rc = dst_second_rc = rc_bad;  // flag as already moved the second bits
-    }
-    // move low bits
-    size = impl_helper(masm,do_size,true ,ra_->reg2offset(src_first),ESI_num,0xFF,"PUSH  ",size, st);
-    size = impl_helper(masm,do_size,false,ra_->reg2offset(dst_first),EAX_num,0x8F,"POP   ",size, st);
-    if( src_second_rc == rc_stack && dst_second_rc == rc_stack ) { // mov second bits
-      size = impl_helper(masm,do_size,true ,ra_->reg2offset(src_second),ESI_num,0xFF,"PUSH  ",size, st);
-      size = impl_helper(masm,do_size,false,ra_->reg2offset(dst_second),EAX_num,0x8F,"POP   ",size, st);
-    }
-    return size;
-  }
-
-  // --------------------------------------
-  // Check for integer reg-reg copy
-  if( src_first_rc == rc_int && dst_first_rc == rc_int )
-    size = impl_mov_helper(masm,do_size,src_first,dst_first,size, st);
-
-  // Check for integer store
-  if( src_first_rc == rc_int && dst_first_rc == rc_stack )
-    size = impl_helper(masm,do_size,false,ra_->reg2offset(dst_first),src_first,0x89,"MOV ",size, st);
-
-  // Check for integer load
-  if( src_first_rc == rc_stack && dst_first_rc == rc_int )
-    size = impl_helper(masm,do_size,true ,ra_->reg2offset(src_first),dst_first,0x8B,"MOV ",size, st);
-
-  // Check for integer reg-xmm reg copy
-  if( src_first_rc == rc_int && dst_first_rc == rc_xmm ) {
-    assert( (src_second_rc == rc_bad && dst_second_rc == rc_bad),
-            "no 64 bit integer-float reg moves" );
-    return impl_movgpr2x_helper(masm,do_size,src_first,dst_first,src_second, dst_second, size, st);
-  }
-  // --------------------------------------
-  // Check for float reg-reg copy
-  if( src_first_rc == rc_float && dst_first_rc == rc_float ) {
-    assert( (src_second_rc == rc_bad && dst_second_rc == rc_bad) ||
-            (src_first+1 == src_second && dst_first+1 == dst_second), "no non-adjacent float-moves" );
-    if( masm ) {
-
-      // Note the mucking with the register encode to compensate for the 0/1
-      // indexing issue mentioned in a comment in the reg_def sections
-      // for FPR registers many lines above here.
-
-      if( src_first != FPR1L_num ) {
-        emit_opcode  (masm, 0xD9 );           // FLD    ST(i)
-        emit_d8      (masm, 0xC0+Matcher::_regEncode[src_first]-1 );
-        emit_opcode  (masm, 0xDD );           // FSTP   ST(i)
-        emit_d8      (masm, 0xD8+Matcher::_regEncode[dst_first] );
-     } else {
-        emit_opcode  (masm, 0xDD );           // FST    ST(i)
-        emit_d8      (masm, 0xD0+Matcher::_regEncode[dst_first]-1 );
-     }
-#ifndef PRODUCT
-    } else if( !do_size ) {
-      if( size != 0 ) st->print("\n\t");
-      if( src_first != FPR1L_num ) st->print("FLD    %s\n\tFSTP   %s",Matcher::regName[src_first],Matcher::regName[dst_first]);
-      else                      st->print(             "FST    %s",                            Matcher::regName[dst_first]);
-#endif
-    }
-    return size + ((src_first != FPR1L_num) ? 2+2 : 2);
-  }
-
-  // Check for float store
-  if( src_first_rc == rc_float && dst_first_rc == rc_stack ) {
-    return impl_fp_store_helper(masm,do_size,src_first,src_second,dst_first,dst_second,ra_->reg2offset(dst_first),size, st);
-  }
-
-  // Check for float load
-  if( dst_first_rc == rc_float && src_first_rc == rc_stack ) {
-    int offset = ra_->reg2offset(src_first);
-    const char *op_str;
-    int op;
-    if( src_first+1 == src_second && dst_first+1 == dst_second ) { // double load?
-      op_str = "FLD_D";
-      op = 0xDD;
-    } else {                   // 32-bit load
-      op_str = "FLD_S";
-      op = 0xD9;
-      assert( src_second_rc == rc_bad && dst_second_rc == rc_bad, "no non-adjacent float-loads" );
-    }
-    if( masm ) {
-      masm->set_inst_mark();
-      emit_opcode  (masm, op );
-      encode_RegMem(masm, 0x0, ESP_enc, 0x4, 0, offset, relocInfo::none);
-      emit_opcode  (masm, 0xDD );           // FSTP   ST(i)
-      emit_d8      (masm, 0xD8+Matcher::_regEncode[dst_first] );
-      masm->clear_inst_mark();
-#ifndef PRODUCT
-    } else if( !do_size ) {
-      if( size != 0 ) st->print("\n\t");
-      st->print("%s  ST,[ESP + #%d]\n\tFSTP   %s",op_str, offset,Matcher::regName[dst_first]);
-#endif
-    }
-    int offset_size = (offset == 0) ? 0 : ((offset <= 127) ? 1 : 4);
-    return size + 3+offset_size+2;
-  }
-
-  // Check for xmm reg-reg copy
-  if( src_first_rc == rc_xmm && dst_first_rc == rc_xmm ) {
-    assert( (src_second_rc == rc_bad && dst_second_rc == rc_bad) ||
-            (src_first+1 == src_second && dst_first+1 == dst_second),
-            "no non-adjacent float-moves" );
-    return impl_movx_helper(masm,do_size,src_first,dst_first,src_second, dst_second, size, st);
-  }
-
-  // Check for xmm reg-integer reg copy
-  if( src_first_rc == rc_xmm && dst_first_rc == rc_int ) {
-    assert( (src_second_rc == rc_bad && dst_second_rc == rc_bad),
-            "no 64 bit float-integer reg moves" );
-    return impl_movx2gpr_helper(masm,do_size,src_first,dst_first,src_second, dst_second, size, st);
-  }
-
-  // Check for xmm store
-  if( src_first_rc == rc_xmm && dst_first_rc == rc_stack ) {
-    return impl_x_helper(masm,do_size,false,ra_->reg2offset(dst_first), src_first, src_second, size, st);
-  }
-
-  // Check for float xmm load
-  if( src_first_rc == rc_stack && dst_first_rc == rc_xmm ) {
-    return impl_x_helper(masm,do_size,true ,ra_->reg2offset(src_first),dst_first, dst_second, size, st);
-  }
-
-  // Copy from float reg to xmm reg
-  if( src_first_rc == rc_float && dst_first_rc == rc_xmm ) {
-    // copy to the top of stack from floating point reg
-    // and use LEA to preserve flags
-    if( masm ) {
-      emit_opcode(masm,0x8D);  // LEA  ESP,[ESP-8]
-      emit_rm(masm, 0x1, ESP_enc, 0x04);
-      emit_rm(masm, 0x0, 0x04, ESP_enc);
-      emit_d8(masm,0xF8);
-#ifndef PRODUCT
-    } else if( !do_size ) {
-      if( size != 0 ) st->print("\n\t");
-      st->print("LEA    ESP,[ESP-8]");
-#endif
-    }
-    size += 4;
-
-    size = impl_fp_store_helper(masm,do_size,src_first,src_second,dst_first,dst_second,0,size, st);
-
-    // Copy from the temp memory to the xmm reg.
-    size = impl_x_helper(masm,do_size,true ,0,dst_first, dst_second, size, st);
-
-    if( masm ) {
-      emit_opcode(masm,0x8D);  // LEA  ESP,[ESP+8]
-      emit_rm(masm, 0x1, ESP_enc, 0x04);
-      emit_rm(masm, 0x0, 0x04, ESP_enc);
-      emit_d8(masm,0x08);
-#ifndef PRODUCT
-    } else if( !do_size ) {
-      if( size != 0 ) st->print("\n\t");
-      st->print("LEA    ESP,[ESP+8]");
-#endif
-    }
-    size += 4;
-    return size;
-  }
-
-  // AVX-512 opmask specific spilling.
-  if (src_first_rc == rc_stack && dst_first_rc == rc_kreg) {
-    assert((src_first & 1) == 0 && src_first + 1 == src_second, "invalid register pair");
-    assert((dst_first & 1) == 0 && dst_first + 1 == dst_second, "invalid register pair");
-    int offset = ra_->reg2offset(src_first);
-    if (masm != nullptr) {
-      __ kmov(as_KRegister(Matcher::_regEncode[dst_first]), Address(rsp, offset));
-#ifndef PRODUCT
-    } else {
-      st->print("KMOV    %s, [ESP + %d]", Matcher::regName[dst_first], offset);
-#endif
-    }
-    return 0;
-  }
-
-  if (src_first_rc == rc_kreg && dst_first_rc == rc_stack) {
-    assert((src_first & 1) == 0 && src_first + 1 == src_second, "invalid register pair");
-    assert((dst_first & 1) == 0 && dst_first + 1 == dst_second, "invalid register pair");
-    int offset = ra_->reg2offset(dst_first);
-    if (masm != nullptr) {
-      __ kmov(Address(rsp, offset), as_KRegister(Matcher::_regEncode[src_first]));
-#ifndef PRODUCT
-    } else {
-      st->print("KMOV    [ESP + %d], %s", offset, Matcher::regName[src_first]);
-#endif
-    }
-    return 0;
-  }
-
-  if (src_first_rc == rc_kreg && dst_first_rc == rc_int) {
-    Unimplemented();
-    return 0;
-  }
-
-  if (src_first_rc == rc_int && dst_first_rc == rc_kreg) {
-    Unimplemented();
-    return 0;
-  }
-
-  if (src_first_rc == rc_kreg && dst_first_rc == rc_kreg) {
-    assert((src_first & 1) == 0 && src_first + 1 == src_second, "invalid register pair");
-    assert((dst_first & 1) == 0 && dst_first + 1 == dst_second, "invalid register pair");
-    if (masm != nullptr) {
-      __ kmov(as_KRegister(Matcher::_regEncode[dst_first]), as_KRegister(Matcher::_regEncode[src_first]));
-#ifndef PRODUCT
-    } else {
-      st->print("KMOV    %s, %s", Matcher::regName[dst_first], Matcher::regName[src_first]);
-#endif
-    }
-    return 0;
-  }
-
-  assert( size > 0, "missed a case" );
-
-  // --------------------------------------------------------------------
-  // Check for second bits still needing moving.
-  if( src_second == dst_second )
-    return size;               // Self copy; no move
-  assert( src_second_rc != rc_bad && dst_second_rc != rc_bad, "src_second & dst_second cannot be Bad" );
-
-  // Check for second word int-int move
-  if( src_second_rc == rc_int && dst_second_rc == rc_int )
-    return impl_mov_helper(masm,do_size,src_second,dst_second,size, st);
-
-  // Check for second word integer store
-  if( src_second_rc == rc_int && dst_second_rc == rc_stack )
-    return impl_helper(masm,do_size,false,ra_->reg2offset(dst_second),src_second,0x89,"MOV ",size, st);
-
-  // Check for second word integer load
-  if( dst_second_rc == rc_int && src_second_rc == rc_stack )
-    return impl_helper(masm,do_size,true ,ra_->reg2offset(src_second),dst_second,0x8B,"MOV ",size, st);
-
-  Unimplemented();
-  return 0; // Mute compiler
-}
-
-#ifndef PRODUCT
-void MachSpillCopyNode::format(PhaseRegAlloc *ra_, outputStream* st) const {
-  implementation( nullptr, ra_, false, st );
-}
-#endif
-
-void MachSpillCopyNode::emit(C2_MacroAssembler *masm, PhaseRegAlloc *ra_) const {
-  implementation( masm, ra_, false, nullptr );
-}
-
-uint MachSpillCopyNode::size(PhaseRegAlloc *ra_) const {
-  return MachNode::size(ra_);
-}
-
-
-//=============================================================================
-#ifndef PRODUCT
-void BoxLockNode::format( PhaseRegAlloc *ra_, outputStream* st ) const {
-  int offset = ra_->reg2offset(in_RegMask(0).find_first_elem());
-  int reg = ra_->get_reg_first(this);
-  st->print("LEA    %s,[ESP + #%d]",Matcher::regName[reg],offset);
-}
-#endif
-
-void BoxLockNode::emit(C2_MacroAssembler *masm, PhaseRegAlloc *ra_) const {
-  int offset = ra_->reg2offset(in_RegMask(0).find_first_elem());
-  int reg = ra_->get_encode(this);
-  if( offset >= 128 ) {
-    emit_opcode(masm, 0x8D);      // LEA  reg,[SP+offset]
-    emit_rm(masm, 0x2, reg, 0x04);
-    emit_rm(masm, 0x0, 0x04, ESP_enc);
-    emit_d32(masm, offset);
-  }
-  else {
-    emit_opcode(masm, 0x8D);      // LEA  reg,[SP+offset]
-    emit_rm(masm, 0x1, reg, 0x04);
-    emit_rm(masm, 0x0, 0x04, ESP_enc);
-    emit_d8(masm, offset);
-  }
-}
-
-uint BoxLockNode::size(PhaseRegAlloc *ra_) const {
-  int offset = ra_->reg2offset(in_RegMask(0).find_first_elem());
-  if( offset >= 128 ) {
-    return 7;
-  }
-  else {
-    return 4;
-  }
-}
-
-//=============================================================================
-#ifndef PRODUCT
-void MachUEPNode::format( PhaseRegAlloc *ra_, outputStream* st ) const {
-  st->print_cr(  "CMP    EAX,[ECX+4]\t# Inline cache check");
-  st->print_cr("\tJNE    SharedRuntime::handle_ic_miss_stub");
-  st->print_cr("\tNOP");
-  st->print_cr("\tNOP");
-  if( !OptoBreakpoint )
-    st->print_cr("\tNOP");
-}
-#endif
-
-void MachUEPNode::emit(C2_MacroAssembler *masm, PhaseRegAlloc *ra_) const {
-  __ ic_check(CodeEntryAlignment);
-}
-
-uint MachUEPNode::size(PhaseRegAlloc *ra_) const {
-  return MachNode::size(ra_); // too many variables; just compute it
-                              // the hard way
-}
-
-
-//=============================================================================
-
-// Vector calling convention not supported.
-bool Matcher::supports_vector_calling_convention() {
-  return false;
-}
-
-OptoRegPair Matcher::vector_return_value(uint ideal_reg) {
-  Unimplemented();
-  return OptoRegPair(0, 0);
-}
-
-// Is this branch offset short enough that a short branch can be used?
-//
-// NOTE: If the platform does not provide any short branch variants, then
-//       this method should return false for offset 0.
-bool Matcher::is_short_branch_offset(int rule, int br_size, int offset) {
-  // The passed offset is relative to address of the branch.
-  // On 86 a branch displacement is calculated relative to address
-  // of a next instruction.
-  offset -= br_size;
-
-  // the short version of jmpConUCF2 contains multiple branches,
-  // making the reach slightly less
-  if (rule == jmpConUCF2_rule)
-    return (-126 <= offset && offset <= 125);
-  return (-128 <= offset && offset <= 127);
-}
-
-// Return whether or not this register is ever used as an argument.  This
-// function is used on startup to build the trampoline stubs in generateOptoStub.
-// Registers not mentioned will be killed by the VM call in the trampoline, and
-// arguments in those registers not be available to the callee.
-bool Matcher::can_be_java_arg( int reg ) {
-  if(  reg == ECX_num   || reg == EDX_num   ) return true;
-  if( (reg == XMM0_num  || reg == XMM1_num ) && UseSSE>=1 ) return true;
-  if( (reg == XMM0b_num || reg == XMM1b_num) && UseSSE>=2 ) return true;
-  return false;
-}
-
-bool Matcher::is_spillable_arg( int reg ) {
-  return can_be_java_arg(reg);
-}
-
-uint Matcher::int_pressure_limit()
-{
-  return (INTPRESSURE == -1) ? 6 : INTPRESSURE;
-}
-
-uint Matcher::float_pressure_limit()
-{
-  return (FLOATPRESSURE == -1) ? 6 : FLOATPRESSURE;
-}
-
-bool Matcher::use_asm_for_ldiv_by_con( jlong divisor ) {
-  // Use hardware integer DIV instruction when
-  // it is faster than a code which use multiply.
-  // Only when constant divisor fits into 32 bit
-  // (min_jint is excluded to get only correct
-  // positive 32 bit values from negative).
-  return VM_Version::has_fast_idiv() &&
-         (divisor == (int)divisor && divisor != min_jint);
-}
-
-// Register for DIVI projection of divmodI
-RegMask Matcher::divI_proj_mask() {
-  return EAX_REG_mask();
-}
-
-// Register for MODI projection of divmodI
-RegMask Matcher::modI_proj_mask() {
-  return EDX_REG_mask();
-}
-
-// Register for DIVL projection of divmodL
-RegMask Matcher::divL_proj_mask() {
-  ShouldNotReachHere();
-  return RegMask();
-}
-
-// Register for MODL projection of divmodL
-RegMask Matcher::modL_proj_mask() {
-  ShouldNotReachHere();
-  return RegMask();
-}
-
-const RegMask Matcher::method_handle_invoke_SP_save_mask() {
-  return NO_REG_mask();
-}
-
-// Returns true if the high 32 bits of the value is known to be zero.
-bool is_operand_hi32_zero(Node* n) {
-  int opc = n->Opcode();
-  if (opc == Op_AndL) {
-    Node* o2 = n->in(2);
-    if (o2->is_Con() && (o2->get_long() & 0xFFFFFFFF00000000LL) == 0LL) {
-      return true;
-    }
-  }
-  if (opc == Op_ConL && (n->get_long() & 0xFFFFFFFF00000000LL) == 0LL) {
-    return true;
-  }
-  return false;
-}
-
-%}
-
-//----------ENCODING BLOCK-----------------------------------------------------
-// This block specifies the encoding classes used by the compiler to output
-// byte streams.  Encoding classes generate functions which are called by
-// Machine Instruction Nodes in order to generate the bit encoding of the
-// instruction.  Operands specify their base encoding interface with the
-// interface keyword.  There are currently supported four interfaces,
-// REG_INTER, CONST_INTER, MEMORY_INTER, & COND_INTER.  REG_INTER causes an
-// operand to generate a function which returns its register number when
-// queried.   CONST_INTER causes an operand to generate a function which
-// returns the value of the constant when queried.  MEMORY_INTER causes an
-// operand to generate four functions which return the Base Register, the
-// Index Register, the Scale Value, and the Offset Value of the operand when
-// queried.  COND_INTER causes an operand to generate six functions which
-// return the encoding code (ie - encoding bits for the instruction)
-// associated with each basic boolean condition for a conditional instruction.
-// Instructions specify two basic values for encoding.  They use the
-// ins_encode keyword to specify their encoding class (which must be one of
-// the class names specified in the encoding block), and they use the
-// opcode keyword to specify, in order, their primary, secondary, and
-// tertiary opcode.  Only the opcode sections which a particular instruction
-// needs for encoding need to be specified.
-encode %{
-  // Build emit functions for each basic byte or larger field in the intel
-  // encoding scheme (opcode, rm, sib, immediate), and call them from C++
-  // code in the enc_class source block.  Emit functions will live in the
-  // main source block for now.  In future, we can generalize this by
-  // adding a syntax that specifies the sizes of fields in an order,
-  // so that the adlc can build the emit functions automagically
-
-  // Set instruction mark in MacroAssembler. This is used only in
-  // instructions that emit bytes directly to the CodeBuffer wraped
-  // in the MacroAssembler. Should go away once all "instruct" are
-  // patched to emit bytes only using methods in MacroAssembler.
-  enc_class SetInstMark %{
-    __ set_inst_mark();
-  %}
-
-  enc_class ClearInstMark %{
-    __ clear_inst_mark();
-  %}
-
-  // Emit primary opcode
-  enc_class OpcP %{
-    emit_opcode(masm, $primary);
-  %}
-
-  // Emit secondary opcode
-  enc_class OpcS %{
-    emit_opcode(masm, $secondary);
-  %}
-
-  // Emit opcode directly
-  enc_class Opcode(immI d8) %{
-    emit_opcode(masm, $d8$$constant);
-  %}
-
-  enc_class SizePrefix %{
-    emit_opcode(masm,0x66);
-  %}
-
-  enc_class RegReg (rRegI dst, rRegI src) %{    // RegReg(Many)
-    emit_rm(masm, 0x3, $dst$$reg, $src$$reg);
-  %}
-
-  enc_class OpcRegReg (immI opcode, rRegI dst, rRegI src) %{    // OpcRegReg(Many)
-    emit_opcode(masm,$opcode$$constant);
-    emit_rm(masm, 0x3, $dst$$reg, $src$$reg);
-  %}
-
-  enc_class mov_r32_imm0( rRegI dst ) %{
-    emit_opcode( masm, 0xB8 + $dst$$reg ); // 0xB8+ rd   -- MOV r32  ,imm32
-    emit_d32   ( masm, 0x0  );             //                         imm32==0x0
-  %}
-
-  enc_class cdq_enc %{
-    // Full implementation of Java idiv and irem; checks for
-    // special case as described in JVM spec., p.243 & p.271.
-    //
-    //         normal case                           special case
-    //
-    // input : rax,: dividend                         min_int
-    //         reg: divisor                          -1
-    //
-    // output: rax,: quotient  (= rax, idiv reg)       min_int
-    //         rdx: remainder (= rax, irem reg)       0
-    //
-    //  Code sequnce:
-    //
-    //  81 F8 00 00 00 80    cmp         rax,80000000h
-    //  0F 85 0B 00 00 00    jne         normal_case
-    //  33 D2                xor         rdx,edx
-    //  83 F9 FF             cmp         rcx,0FFh
-    //  0F 84 03 00 00 00    je          done
-    //                  normal_case:
-    //  99                   cdq
-    //  F7 F9                idiv        rax,ecx
-    //                  done:
-    //
-    emit_opcode(masm,0x81); emit_d8(masm,0xF8);
-    emit_opcode(masm,0x00); emit_d8(masm,0x00);
-    emit_opcode(masm,0x00); emit_d8(masm,0x80);                     // cmp rax,80000000h
-    emit_opcode(masm,0x0F); emit_d8(masm,0x85);
-    emit_opcode(masm,0x0B); emit_d8(masm,0x00);
-    emit_opcode(masm,0x00); emit_d8(masm,0x00);                     // jne normal_case
-    emit_opcode(masm,0x33); emit_d8(masm,0xD2);                     // xor rdx,edx
-    emit_opcode(masm,0x83); emit_d8(masm,0xF9); emit_d8(masm,0xFF); // cmp rcx,0FFh
-    emit_opcode(masm,0x0F); emit_d8(masm,0x84);
-    emit_opcode(masm,0x03); emit_d8(masm,0x00);
-    emit_opcode(masm,0x00); emit_d8(masm,0x00);                     // je done
-    // normal_case:
-    emit_opcode(masm,0x99);                                         // cdq
-    // idiv (note: must be emitted by the user of this rule)
-    // normal:
-  %}
-
-  // Dense encoding for older common ops
-  enc_class Opc_plus(immI opcode, rRegI reg) %{
-    emit_opcode(masm, $opcode$$constant + $reg$$reg);
-  %}
-
-
-  // Opcde enc_class for 8/32 bit immediate instructions with sign-extension
-  enc_class OpcSE (immI imm) %{ // Emit primary opcode and set sign-extend bit
-    // Check for 8-bit immediate, and set sign extend bit in opcode
-    if (($imm$$constant >= -128) && ($imm$$constant <= 127)) {
-      emit_opcode(masm, $primary | 0x02);
-    }
-    else {                          // If 32-bit immediate
-      emit_opcode(masm, $primary);
-    }
-  %}
-
-  enc_class OpcSErm (rRegI dst, immI imm) %{    // OpcSEr/m
-    // Emit primary opcode and set sign-extend bit
-    // Check for 8-bit immediate, and set sign extend bit in opcode
-    if (($imm$$constant >= -128) && ($imm$$constant <= 127)) {
-      emit_opcode(masm, $primary | 0x02);    }
-    else {                          // If 32-bit immediate
-      emit_opcode(masm, $primary);
-    }
-    // Emit r/m byte with secondary opcode, after primary opcode.
-    emit_rm(masm, 0x3, $secondary, $dst$$reg);
-  %}
-
-  enc_class Con8or32 (immI imm) %{    // Con8or32(storeImmI), 8 or 32 bits
-    // Check for 8-bit immediate, and set sign extend bit in opcode
-    if (($imm$$constant >= -128) && ($imm$$constant <= 127)) {
-      $$$emit8$imm$$constant;
-    }
-    else {                          // If 32-bit immediate
-      // Output immediate
-      $$$emit32$imm$$constant;
-    }
-  %}
-
-  enc_class Long_OpcSErm_Lo(eRegL dst, immL imm) %{
-    // Emit primary opcode and set sign-extend bit
-    // Check for 8-bit immediate, and set sign extend bit in opcode
-    int con = (int)$imm$$constant; // Throw away top bits
-    emit_opcode(masm, ((con >= -128) && (con <= 127)) ? ($primary | 0x02) : $primary);
-    // Emit r/m byte with secondary opcode, after primary opcode.
-    emit_rm(masm, 0x3, $secondary, $dst$$reg);
-    if ((con >= -128) && (con <= 127)) emit_d8 (masm,con);
-    else                               emit_d32(masm,con);
-  %}
-
-  enc_class Long_OpcSErm_Hi(eRegL dst, immL imm) %{
-    // Emit primary opcode and set sign-extend bit
-    // Check for 8-bit immediate, and set sign extend bit in opcode
-    int con = (int)($imm$$constant >> 32); // Throw away bottom bits
-    emit_opcode(masm, ((con >= -128) && (con <= 127)) ? ($primary | 0x02) : $primary);
-    // Emit r/m byte with tertiary opcode, after primary opcode.
-    emit_rm(masm, 0x3, $tertiary, HIGH_FROM_LOW_ENC($dst$$reg));
-    if ((con >= -128) && (con <= 127)) emit_d8 (masm,con);
-    else                               emit_d32(masm,con);
-  %}
-
-  enc_class OpcSReg (rRegI dst) %{    // BSWAP
-    emit_cc(masm, $secondary, $dst$$reg );
-  %}
-
-  enc_class bswap_long_bytes(eRegL dst) %{ // BSWAP
-    int destlo = $dst$$reg;
-    int desthi = HIGH_FROM_LOW_ENC(destlo);
-    // bswap lo
-    emit_opcode(masm, 0x0F);
-    emit_cc(masm, 0xC8, destlo);
-    // bswap hi
-    emit_opcode(masm, 0x0F);
-    emit_cc(masm, 0xC8, desthi);
-    // xchg lo and hi
-    emit_opcode(masm, 0x87);
-    emit_rm(masm, 0x3, destlo, desthi);
-  %}
-
-  enc_class RegOpc (rRegI div) %{    // IDIV, IMOD, JMP indirect, ...
-    emit_rm(masm, 0x3, $secondary, $div$$reg );
-  %}
-
-  enc_class enc_cmov(cmpOp cop ) %{ // CMOV
-    $$$emit8$primary;
-    emit_cc(masm, $secondary, $cop$$cmpcode);
-  %}
-
-  enc_class enc_cmov_dpr(cmpOp cop, regDPR src ) %{ // CMOV
-    int op = 0xDA00 + $cop$$cmpcode + ($src$$reg-1);
-    emit_d8(masm, op >> 8 );
-    emit_d8(masm, op & 255);
-  %}
-
-  // emulate a CMOV with a conditional branch around a MOV
-  enc_class enc_cmov_branch( cmpOp cop, immI brOffs ) %{ // CMOV
-    // Invert sense of branch from sense of CMOV
-    emit_cc( masm, 0x70, ($cop$$cmpcode^1) );
-    emit_d8( masm, $brOffs$$constant );
-  %}
-
-  enc_class enc_PartialSubtypeCheck( ) %{
-    Register Redi = as_Register(EDI_enc); // result register
-    Register Reax = as_Register(EAX_enc); // super class
-    Register Recx = as_Register(ECX_enc); // killed
-    Register Resi = as_Register(ESI_enc); // sub class
-    Label miss;
-
-    // NB: Callers may assume that, when $result is a valid register,
-    // check_klass_subtype_slow_path sets it to a nonzero value.
-     __ check_klass_subtype_slow_path(Resi, Reax, Recx, Redi,
-                                     nullptr, &miss,
-                                     /*set_cond_codes:*/ true);
-    if ($primary) {
-      __ xorptr(Redi, Redi);
-    }
-    __ bind(miss);
-  %}
-
-  enc_class FFree_Float_Stack_All %{    // Free_Float_Stack_All
-    int start = __ offset();
-    if (UseSSE >= 2) {
-      if (VerifyFPU) {
-        __ verify_FPU(0, "must be empty in SSE2+ mode");
-      }
-    } else {
-      // External c_calling_convention expects the FPU stack to be 'clean'.
-      // Compiled code leaves it dirty.  Do cleanup now.
-      __ empty_FPU_stack();
-    }
-    if (sizeof_FFree_Float_Stack_All == -1) {
-      sizeof_FFree_Float_Stack_All = __ offset() - start;
-    } else {
-      assert(__ offset() - start == sizeof_FFree_Float_Stack_All, "wrong size");
-    }
-  %}
-
-  enc_class Verify_FPU_For_Leaf %{
-    if( VerifyFPU ) {
-      __ verify_FPU( -3, "Returning from Runtime Leaf call");
-    }
-  %}
-
-  enc_class Java_To_Runtime (method meth) %{    // CALL Java_To_Runtime, Java_To_Runtime_Leaf
-    // This is the instruction starting address for relocation info.
-    __ set_inst_mark();
-    $$$emit8$primary;
-    // CALL directly to the runtime
-    emit_d32_reloc(masm, ($meth$$method - (int)(__ pc()) - 4),
-                runtime_call_Relocation::spec(), RELOC_IMM32 );
-    __ clear_inst_mark();
-    __ post_call_nop();
-
-    if (UseSSE >= 2) {
-      BasicType rt = tf()->return_type();
-
-      if ((rt == T_FLOAT || rt == T_DOUBLE) && !return_value_is_used()) {
-        // A C runtime call where the return value is unused.  In SSE2+
-        // mode the result needs to be removed from the FPU stack.  It's
-        // likely that this function call could be removed by the
-        // optimizer if the C function is a pure function.
-        __ ffree(0);
-      } else if (rt == T_FLOAT) {
-        __ lea(rsp, Address(rsp, -4));
-        __ fstp_s(Address(rsp, 0));
-        __ movflt(xmm0, Address(rsp, 0));
-        __ lea(rsp, Address(rsp,  4));
-      } else if (rt == T_DOUBLE) {
-        __ lea(rsp, Address(rsp, -8));
-        __ fstp_d(Address(rsp, 0));
-        __ movdbl(xmm0, Address(rsp, 0));
-        __ lea(rsp, Address(rsp,  8));
-      }
-    }
-  %}
-
-  enc_class pre_call_resets %{
-    // If method sets FPU control word restore it here
-    debug_only(int off0 = __ offset());
-    if (ra_->C->in_24_bit_fp_mode()) {
-      __ fldcw(ExternalAddress(StubRoutines::x86::addr_fpu_cntrl_wrd_std()));
-    }
-    // Clear upper bits of YMM registers when current compiled code uses
-    // wide vectors to avoid AVX <-> SSE transition penalty during call.
-    __ vzeroupper();
-    debug_only(int off1 = __ offset());
-    assert(off1 - off0 == pre_call_resets_size(), "correct size prediction");
-  %}
-
-  enc_class post_call_FPU %{
-    // If method sets FPU control word do it here also
-    if (Compile::current()->in_24_bit_fp_mode()) {
-      __ fldcw(ExternalAddress(StubRoutines::x86::addr_fpu_cntrl_wrd_24()));
-    }
-  %}
-
-  enc_class Java_Static_Call (method meth) %{    // JAVA STATIC CALL
-    // CALL to fixup routine.  Fixup routine uses ScopeDesc info to determine
-    // who we intended to call.
-    __ set_inst_mark();
-    $$$emit8$primary;
-
-    if (!_method) {
-      emit_d32_reloc(masm, ($meth$$method - (int)(__ pc()) - 4),
-                     runtime_call_Relocation::spec(),
-                     RELOC_IMM32);
-      __ clear_inst_mark();
-      __ post_call_nop();
-    } else {
-      int method_index = resolved_method_index(masm);
-      RelocationHolder rspec = _optimized_virtual ? opt_virtual_call_Relocation::spec(method_index)
-                                                  : static_call_Relocation::spec(method_index);
-      emit_d32_reloc(masm, ($meth$$method - (int)(__ pc()) - 4),
-                     rspec, RELOC_DISP32);
-      __ post_call_nop();
-      address mark = __ inst_mark();
-      if (CodeBuffer::supports_shared_stubs() && _method->can_be_statically_bound()) {
-        // Calls of the same statically bound method can share
-        // a stub to the interpreter.
-        __ code()->shared_stub_to_interp_for(_method, __ code()->insts()->mark_off());
-        __ clear_inst_mark();
-      } else {
-        // Emit stubs for static call.
-        address stub = CompiledDirectCall::emit_to_interp_stub(masm, mark);
-        __ clear_inst_mark();
-        if (stub == nullptr) {
-          ciEnv::current()->record_failure("CodeCache is full");
-          return;
-        }
-      }
-    }
-  %}
-
-  enc_class Java_Dynamic_Call (method meth) %{    // JAVA DYNAMIC CALL
-    __ ic_call((address)$meth$$method, resolved_method_index(masm));
-    __ post_call_nop();
-  %}
-
-  enc_class Java_Compiled_Call (method meth) %{    // JAVA COMPILED CALL
-    int disp = in_bytes(Method::from_compiled_offset());
-    assert( -128 <= disp && disp <= 127, "compiled_code_offset isn't small");
-
-    // CALL *[EAX+in_bytes(Method::from_compiled_code_entry_point_offset())]
-    __ set_inst_mark();
-    $$$emit8$primary;
-    emit_rm(masm, 0x01, $secondary, EAX_enc );  // R/M byte
-    emit_d8(masm, disp);             // Displacement
-    __ clear_inst_mark();
-    __ post_call_nop();
-  %}
-
-  enc_class RegOpcImm (rRegI dst, immI8 shift) %{    // SHL, SAR, SHR
-    $$$emit8$primary;
-    emit_rm(masm, 0x3, $secondary, $dst$$reg);
-    $$$emit8$shift$$constant;
-  %}
-
-  enc_class LdImmI (rRegI dst, immI src) %{    // Load Immediate
-    // Load immediate does not have a zero or sign extended version
-    // for 8-bit immediates
-    emit_opcode(masm, 0xB8 + $dst$$reg);
-    $$$emit32$src$$constant;
-  %}
-
-  enc_class LdImmP (rRegI dst, immI src) %{    // Load Immediate
-    // Load immediate does not have a zero or sign extended version
-    // for 8-bit immediates
-    emit_opcode(masm, $primary + $dst$$reg);
-    $$$emit32$src$$constant;
-  %}
-
-  enc_class LdImmL_Lo( eRegL dst, immL src) %{    // Load Immediate
-    // Load immediate does not have a zero or sign extended version
-    // for 8-bit immediates
-    int dst_enc = $dst$$reg;
-    int src_con = $src$$constant & 0x0FFFFFFFFL;
-    if (src_con == 0) {
-      // xor dst, dst
-      emit_opcode(masm, 0x33);
-      emit_rm(masm, 0x3, dst_enc, dst_enc);
-    } else {
-      emit_opcode(masm, $primary + dst_enc);
-      emit_d32(masm, src_con);
-    }
-  %}
-
-  enc_class LdImmL_Hi( eRegL dst, immL src) %{    // Load Immediate
-    // Load immediate does not have a zero or sign extended version
-    // for 8-bit immediates
-    int dst_enc = $dst$$reg + 2;
-    int src_con = ((julong)($src$$constant)) >> 32;
-    if (src_con == 0) {
-      // xor dst, dst
-      emit_opcode(masm, 0x33);
-      emit_rm(masm, 0x3, dst_enc, dst_enc);
-    } else {
-      emit_opcode(masm, $primary + dst_enc);
-      emit_d32(masm, src_con);
-    }
-  %}
-
-
-  // Encode a reg-reg copy.  If it is useless, then empty encoding.
-  enc_class enc_Copy( rRegI dst, rRegI src ) %{
-    encode_Copy( masm, $dst$$reg, $src$$reg );
-  %}
-
-  enc_class enc_CopyL_Lo( rRegI dst, eRegL src ) %{
-    encode_Copy( masm, $dst$$reg, $src$$reg );
-  %}
-
-  enc_class RegReg (rRegI dst, rRegI src) %{    // RegReg(Many)
-    emit_rm(masm, 0x3, $dst$$reg, $src$$reg);
-  %}
-
-  enc_class RegReg_Lo(eRegL dst, eRegL src) %{    // RegReg(Many)
-    $$$emit8$primary;
-    emit_rm(masm, 0x3, $dst$$reg, $src$$reg);
-  %}
-
-  enc_class RegReg_Hi(eRegL dst, eRegL src) %{    // RegReg(Many)
-    $$$emit8$secondary;
-    emit_rm(masm, 0x3, HIGH_FROM_LOW_ENC($dst$$reg), HIGH_FROM_LOW_ENC($src$$reg));
-  %}
-
-  enc_class RegReg_Lo2(eRegL dst, eRegL src) %{    // RegReg(Many)
-    emit_rm(masm, 0x3, $dst$$reg, $src$$reg);
-  %}
-
-  enc_class RegReg_Hi2(eRegL dst, eRegL src) %{    // RegReg(Many)
-    emit_rm(masm, 0x3, HIGH_FROM_LOW_ENC($dst$$reg), HIGH_FROM_LOW_ENC($src$$reg));
-  %}
-
-  enc_class RegReg_HiLo( eRegL src, rRegI dst ) %{
-    emit_rm(masm, 0x3, $dst$$reg, HIGH_FROM_LOW_ENC($src$$reg));
-  %}
-
-  enc_class Con32 (immI src) %{    // Con32(storeImmI)
-    // Output immediate
-    $$$emit32$src$$constant;
-  %}
-
-  enc_class Con32FPR_as_bits(immFPR src) %{        // storeF_imm
-    // Output Float immediate bits
-    jfloat jf = $src$$constant;
-    int    jf_as_bits = jint_cast( jf );
-    emit_d32(masm, jf_as_bits);
-  %}
-
-  enc_class Con32F_as_bits(immF src) %{      // storeX_imm
-    // Output Float immediate bits
-    jfloat jf = $src$$constant;
-    int    jf_as_bits = jint_cast( jf );
-    emit_d32(masm, jf_as_bits);
-  %}
-
-  enc_class Con16 (immI src) %{    // Con16(storeImmI)
-    // Output immediate
-    $$$emit16$src$$constant;
-  %}
-
-  enc_class Con_d32(immI src) %{
-    emit_d32(masm,$src$$constant);
-  %}
-
-  enc_class conmemref (eRegP t1) %{    // Con32(storeImmI)
-    // Output immediate memory reference
-    emit_rm(masm, 0x00, $t1$$reg, 0x05 );
-    emit_d32(masm, 0x00);
-  %}
-
-  enc_class lock_prefix( ) %{
-    emit_opcode(masm,0xF0);         // [Lock]
-  %}
-
-  // Cmp-xchg long value.
-  // Note: we need to swap rbx, and rcx before and after the
-  //       cmpxchg8 instruction because the instruction uses
-  //       rcx as the high order word of the new value to store but
-  //       our register encoding uses rbx,.
-  enc_class enc_cmpxchg8(eSIRegP mem_ptr) %{
-
-    // XCHG  rbx,ecx
-    emit_opcode(masm,0x87);
-    emit_opcode(masm,0xD9);
-    // [Lock]
-    emit_opcode(masm,0xF0);
-    // CMPXCHG8 [Eptr]
-    emit_opcode(masm,0x0F);
-    emit_opcode(masm,0xC7);
-    emit_rm( masm, 0x0, 1, $mem_ptr$$reg );
-    // XCHG  rbx,ecx
-    emit_opcode(masm,0x87);
-    emit_opcode(masm,0xD9);
-  %}
-
-  enc_class enc_cmpxchg(eSIRegP mem_ptr) %{
-    // [Lock]
-    emit_opcode(masm,0xF0);
-
-    // CMPXCHG [Eptr]
-    emit_opcode(masm,0x0F);
-    emit_opcode(masm,0xB1);
-    emit_rm( masm, 0x0, 1, $mem_ptr$$reg );
-  %}
-
-  enc_class enc_cmpxchgb(eSIRegP mem_ptr) %{
-    // [Lock]
-    emit_opcode(masm,0xF0);
-
-    // CMPXCHGB [Eptr]
-    emit_opcode(masm,0x0F);
-    emit_opcode(masm,0xB0);
-    emit_rm( masm, 0x0, 1, $mem_ptr$$reg );
-  %}
-
-  enc_class enc_cmpxchgw(eSIRegP mem_ptr) %{
-    // [Lock]
-    emit_opcode(masm,0xF0);
-
-    // 16-bit mode
-    emit_opcode(masm, 0x66);
-
-    // CMPXCHGW [Eptr]
-    emit_opcode(masm,0x0F);
-    emit_opcode(masm,0xB1);
-    emit_rm( masm, 0x0, 1, $mem_ptr$$reg );
-  %}
-
-  enc_class enc_flags_ne_to_boolean( iRegI res ) %{
-    int res_encoding = $res$$reg;
-
-    // MOV  res,0
-    emit_opcode( masm, 0xB8 + res_encoding);
-    emit_d32( masm, 0 );
-    // JNE,s  fail
-    emit_opcode(masm,0x75);
-    emit_d8(masm, 5 );
-    // MOV  res,1
-    emit_opcode( masm, 0xB8 + res_encoding);
-    emit_d32( masm, 1 );
-    // fail:
-  %}
-
-  enc_class RegMem (rRegI ereg, memory mem) %{    // emit_reg_mem
-    int reg_encoding = $ereg$$reg;
-    int base  = $mem$$base;
-    int index = $mem$$index;
-    int scale = $mem$$scale;
-    int displace = $mem$$disp;
-    relocInfo::relocType disp_reloc = $mem->disp_reloc();
-    encode_RegMem(masm, reg_encoding, base, index, scale, displace, disp_reloc);
-  %}
-
-  enc_class RegMem_Hi(eRegL ereg, memory mem) %{    // emit_reg_mem
-    int reg_encoding = HIGH_FROM_LOW_ENC($ereg$$reg);  // Hi register of pair, computed from lo
-    int base  = $mem$$base;
-    int index = $mem$$index;
-    int scale = $mem$$scale;
-    int displace = $mem$$disp + 4;      // Offset is 4 further in memory
-    assert( $mem->disp_reloc() == relocInfo::none, "Cannot add 4 to oop" );
-    encode_RegMem(masm, reg_encoding, base, index, scale, displace, relocInfo::none);
-  %}
-
-  enc_class move_long_small_shift( eRegL dst, immI_1_31 cnt ) %{
-    int r1, r2;
-    if( $tertiary == 0xA4 ) { r1 = $dst$$reg;  r2 = HIGH_FROM_LOW_ENC($dst$$reg); }
-    else                    { r2 = $dst$$reg;  r1 = HIGH_FROM_LOW_ENC($dst$$reg); }
-    emit_opcode(masm,0x0F);
-    emit_opcode(masm,$tertiary);
-    emit_rm(masm, 0x3, r1, r2);
-    emit_d8(masm,$cnt$$constant);
-    emit_d8(masm,$primary);
-    emit_rm(masm, 0x3, $secondary, r1);
-    emit_d8(masm,$cnt$$constant);
-  %}
-
-  enc_class move_long_big_shift_sign( eRegL dst, immI_32_63 cnt ) %{
-    emit_opcode( masm, 0x8B ); // Move
-    emit_rm(masm, 0x3, $dst$$reg, HIGH_FROM_LOW_ENC($dst$$reg));
-    if( $cnt$$constant > 32 ) { // Shift, if not by zero
-      emit_d8(masm,$primary);
-      emit_rm(masm, 0x3, $secondary, $dst$$reg);
-      emit_d8(masm,$cnt$$constant-32);
-    }
-    emit_d8(masm,$primary);
-    emit_rm(masm, 0x3, $secondary, HIGH_FROM_LOW_ENC($dst$$reg));
-    emit_d8(masm,31);
-  %}
-
-  enc_class move_long_big_shift_clr( eRegL dst, immI_32_63 cnt ) %{
-    int r1, r2;
-    if( $secondary == 0x5 ) { r1 = $dst$$reg;  r2 = HIGH_FROM_LOW_ENC($dst$$reg); }
-    else                    { r2 = $dst$$reg;  r1 = HIGH_FROM_LOW_ENC($dst$$reg); }
-
-    emit_opcode( masm, 0x8B ); // Move r1,r2
-    emit_rm(masm, 0x3, r1, r2);
-    if( $cnt$$constant > 32 ) { // Shift, if not by zero
-      emit_opcode(masm,$primary);
-      emit_rm(masm, 0x3, $secondary, r1);
-      emit_d8(masm,$cnt$$constant-32);
-    }
-    emit_opcode(masm,0x33);  // XOR r2,r2
-    emit_rm(masm, 0x3, r2, r2);
-  %}
-
-  // Clone of RegMem but accepts an extra parameter to access each
-  // half of a double in memory; it never needs relocation info.
-  enc_class Mov_MemD_half_to_Reg (immI opcode, memory mem, immI disp_for_half, rRegI rm_reg) %{
-    emit_opcode(masm,$opcode$$constant);
-    int reg_encoding = $rm_reg$$reg;
-    int base     = $mem$$base;
-    int index    = $mem$$index;
-    int scale    = $mem$$scale;
-    int displace = $mem$$disp + $disp_for_half$$constant;
-    relocInfo::relocType disp_reloc = relocInfo::none;
-    encode_RegMem(masm, reg_encoding, base, index, scale, displace, disp_reloc);
-  %}
-
-  // !!!!! Special Custom Code used by MemMove, and stack access instructions !!!!!
-  //
-  // Clone of RegMem except the RM-byte's reg/opcode field is an ADLC-time constant
-  // and it never needs relocation information.
-  // Frequently used to move data between FPU's Stack Top and memory.
-  enc_class RMopc_Mem_no_oop (immI rm_opcode, memory mem) %{
-    int rm_byte_opcode = $rm_opcode$$constant;
-    int base     = $mem$$base;
-    int index    = $mem$$index;
-    int scale    = $mem$$scale;
-    int displace = $mem$$disp;
-    assert( $mem->disp_reloc() == relocInfo::none, "No oops here because no reloc info allowed" );
-    encode_RegMem(masm, rm_byte_opcode, base, index, scale, displace, relocInfo::none);
-  %}
-
-  enc_class RMopc_Mem (immI rm_opcode, memory mem) %{
-    int rm_byte_opcode = $rm_opcode$$constant;
-    int base     = $mem$$base;
-    int index    = $mem$$index;
-    int scale    = $mem$$scale;
-    int displace = $mem$$disp;
-    relocInfo::relocType disp_reloc = $mem->disp_reloc(); // disp-as-oop when working with static globals
-    encode_RegMem(masm, rm_byte_opcode, base, index, scale, displace, disp_reloc);
-  %}
-
-  enc_class RegLea (rRegI dst, rRegI src0, immI src1 ) %{    // emit_reg_lea
-    int reg_encoding = $dst$$reg;
-    int base         = $src0$$reg;      // 0xFFFFFFFF indicates no base
-    int index        = 0x04;            // 0x04 indicates no index
-    int scale        = 0x00;            // 0x00 indicates no scale
-    int displace     = $src1$$constant; // 0x00 indicates no displacement
-    relocInfo::relocType disp_reloc = relocInfo::none;
-    encode_RegMem(masm, reg_encoding, base, index, scale, displace, disp_reloc);
-  %}
-
-  enc_class min_enc (rRegI dst, rRegI src) %{    // MIN
-    // Compare dst,src
-    emit_opcode(masm,0x3B);
-    emit_rm(masm, 0x3, $dst$$reg, $src$$reg);
-    // jmp dst < src around move
-    emit_opcode(masm,0x7C);
-    emit_d8(masm,2);
-    // move dst,src
-    emit_opcode(masm,0x8B);
-    emit_rm(masm, 0x3, $dst$$reg, $src$$reg);
-  %}
-
-  enc_class max_enc (rRegI dst, rRegI src) %{    // MAX
-    // Compare dst,src
-    emit_opcode(masm,0x3B);
-    emit_rm(masm, 0x3, $dst$$reg, $src$$reg);
-    // jmp dst > src around move
-    emit_opcode(masm,0x7F);
-    emit_d8(masm,2);
-    // move dst,src
-    emit_opcode(masm,0x8B);
-    emit_rm(masm, 0x3, $dst$$reg, $src$$reg);
-  %}
-
-  enc_class enc_FPR_store(memory mem, regDPR src) %{
-    // If src is FPR1, we can just FST to store it.
-    // Else we need to FLD it to FPR1, then FSTP to store/pop it.
-    int reg_encoding = 0x2; // Just store
-    int base  = $mem$$base;
-    int index = $mem$$index;
-    int scale = $mem$$scale;
-    int displace = $mem$$disp;
-    relocInfo::relocType disp_reloc = $mem->disp_reloc(); // disp-as-oop when working with static globals
-    if( $src$$reg != FPR1L_enc ) {
-      reg_encoding = 0x3;  // Store & pop
-      emit_opcode( masm, 0xD9 ); // FLD (i.e., push it)
-      emit_d8( masm, 0xC0-1+$src$$reg );
-    }
-    __ set_inst_mark();       // Mark start of opcode for reloc info in mem operand
-    emit_opcode(masm,$primary);
-    encode_RegMem(masm, reg_encoding, base, index, scale, displace, disp_reloc);
-    __ clear_inst_mark();
-  %}
-
-  enc_class neg_reg(rRegI dst) %{
-    // NEG $dst
-    emit_opcode(masm,0xF7);
-    emit_rm(masm, 0x3, 0x03, $dst$$reg );
-  %}
-
-  enc_class setLT_reg(eCXRegI dst) %{
-    // SETLT $dst
-    emit_opcode(masm,0x0F);
-    emit_opcode(masm,0x9C);
-    emit_rm( masm, 0x3, 0x4, $dst$$reg );
-  %}
-
-  enc_class enc_cmpLTP(ncxRegI p, ncxRegI q, ncxRegI y, eCXRegI tmp) %{    // cadd_cmpLT
-    int tmpReg = $tmp$$reg;
-
-    // SUB $p,$q
-    emit_opcode(masm,0x2B);
-    emit_rm(masm, 0x3, $p$$reg, $q$$reg);
-    // SBB $tmp,$tmp
-    emit_opcode(masm,0x1B);
-    emit_rm(masm, 0x3, tmpReg, tmpReg);
-    // AND $tmp,$y
-    emit_opcode(masm,0x23);
-    emit_rm(masm, 0x3, tmpReg, $y$$reg);
-    // ADD $p,$tmp
-    emit_opcode(masm,0x03);
-    emit_rm(masm, 0x3, $p$$reg, tmpReg);
-  %}
-
-  enc_class shift_left_long( eRegL dst, eCXRegI shift ) %{
-    // TEST shift,32
-    emit_opcode(masm,0xF7);
-    emit_rm(masm, 0x3, 0, ECX_enc);
-    emit_d32(masm,0x20);
-    // JEQ,s small
-    emit_opcode(masm, 0x74);
-    emit_d8(masm, 0x04);
-    // MOV    $dst.hi,$dst.lo
-    emit_opcode( masm, 0x8B );
-    emit_rm(masm, 0x3, HIGH_FROM_LOW_ENC($dst$$reg), $dst$$reg );
-    // CLR    $dst.lo
-    emit_opcode(masm, 0x33);
-    emit_rm(masm, 0x3, $dst$$reg, $dst$$reg);
-// small:
-    // SHLD   $dst.hi,$dst.lo,$shift
-    emit_opcode(masm,0x0F);
-    emit_opcode(masm,0xA5);
-    emit_rm(masm, 0x3, $dst$$reg, HIGH_FROM_LOW_ENC($dst$$reg));
-    // SHL    $dst.lo,$shift"
-    emit_opcode(masm,0xD3);
-    emit_rm(masm, 0x3, 0x4, $dst$$reg );
-  %}
-
-  enc_class shift_right_long( eRegL dst, eCXRegI shift ) %{
-    // TEST shift,32
-    emit_opcode(masm,0xF7);
-    emit_rm(masm, 0x3, 0, ECX_enc);
-    emit_d32(masm,0x20);
-    // JEQ,s small
-    emit_opcode(masm, 0x74);
-    emit_d8(masm, 0x04);
-    // MOV    $dst.lo,$dst.hi
-    emit_opcode( masm, 0x8B );
-    emit_rm(masm, 0x3, $dst$$reg, HIGH_FROM_LOW_ENC($dst$$reg) );
-    // CLR    $dst.hi
-    emit_opcode(masm, 0x33);
-    emit_rm(masm, 0x3, HIGH_FROM_LOW_ENC($dst$$reg), HIGH_FROM_LOW_ENC($dst$$reg));
-// small:
-    // SHRD   $dst.lo,$dst.hi,$shift
-    emit_opcode(masm,0x0F);
-    emit_opcode(masm,0xAD);
-    emit_rm(masm, 0x3, HIGH_FROM_LOW_ENC($dst$$reg), $dst$$reg);
-    // SHR    $dst.hi,$shift"
-    emit_opcode(masm,0xD3);
-    emit_rm(masm, 0x3, 0x5, HIGH_FROM_LOW_ENC($dst$$reg) );
-  %}
-
-  enc_class shift_right_arith_long( eRegL dst, eCXRegI shift ) %{
-    // TEST shift,32
-    emit_opcode(masm,0xF7);
-    emit_rm(masm, 0x3, 0, ECX_enc);
-    emit_d32(masm,0x20);
-    // JEQ,s small
-    emit_opcode(masm, 0x74);
-    emit_d8(masm, 0x05);
-    // MOV    $dst.lo,$dst.hi
-    emit_opcode( masm, 0x8B );
-    emit_rm(masm, 0x3, $dst$$reg, HIGH_FROM_LOW_ENC($dst$$reg) );
-    // SAR    $dst.hi,31
-    emit_opcode(masm, 0xC1);
-    emit_rm(masm, 0x3, 7, HIGH_FROM_LOW_ENC($dst$$reg) );
-    emit_d8(masm, 0x1F );
-// small:
-    // SHRD   $dst.lo,$dst.hi,$shift
-    emit_opcode(masm,0x0F);
-    emit_opcode(masm,0xAD);
-    emit_rm(masm, 0x3, HIGH_FROM_LOW_ENC($dst$$reg), $dst$$reg);
-    // SAR    $dst.hi,$shift"
-    emit_opcode(masm,0xD3);
-    emit_rm(masm, 0x3, 0x7, HIGH_FROM_LOW_ENC($dst$$reg) );
-  %}
-
-
-  // ----------------- Encodings for floating point unit -----------------
-  // May leave result in FPU-TOS or FPU reg depending on opcodes
-  enc_class OpcReg_FPR(regFPR src) %{    // FMUL, FDIV
-    $$$emit8$primary;
-    emit_rm(masm, 0x3, $secondary, $src$$reg );
-  %}
-
-  // Pop argument in FPR0 with FSTP ST(0)
-  enc_class PopFPU() %{
-    emit_opcode( masm, 0xDD );
-    emit_d8( masm, 0xD8 );
-  %}
-
-  // !!!!! equivalent to Pop_Reg_F
-  enc_class Pop_Reg_DPR( regDPR dst ) %{
-    emit_opcode( masm, 0xDD );           // FSTP   ST(i)
-    emit_d8( masm, 0xD8+$dst$$reg );
-  %}
-
-  enc_class Push_Reg_DPR( regDPR dst ) %{
-    emit_opcode( masm, 0xD9 );
-    emit_d8( masm, 0xC0-1+$dst$$reg );   // FLD ST(i-1)
-  %}
-
-  enc_class strictfp_bias1( regDPR dst ) %{
-    emit_opcode( masm, 0xDB );           // FLD m80real
-    emit_opcode( masm, 0x2D );
-    emit_d32( masm, (int)StubRoutines::x86::addr_fpu_subnormal_bias1() );
-    emit_opcode( masm, 0xDE );           // FMULP ST(dst), ST0
-    emit_opcode( masm, 0xC8+$dst$$reg );
-  %}
-
-  enc_class strictfp_bias2( regDPR dst ) %{
-    emit_opcode( masm, 0xDB );           // FLD m80real
-    emit_opcode( masm, 0x2D );
-    emit_d32( masm, (int)StubRoutines::x86::addr_fpu_subnormal_bias2() );
-    emit_opcode( masm, 0xDE );           // FMULP ST(dst), ST0
-    emit_opcode( masm, 0xC8+$dst$$reg );
-  %}
-
-  // Special case for moving an integer register to a stack slot.
-  enc_class OpcPRegSS( stackSlotI dst, rRegI src ) %{ // RegSS
-    store_to_stackslot( masm, $primary, $src$$reg, $dst$$disp );
-  %}
-
-  // Special case for moving a register to a stack slot.
-  enc_class RegSS( stackSlotI dst, rRegI src ) %{ // RegSS
-    // Opcode already emitted
-    emit_rm( masm, 0x02, $src$$reg, ESP_enc );   // R/M byte
-    emit_rm( masm, 0x00, ESP_enc, ESP_enc);          // SIB byte
-    emit_d32(masm, $dst$$disp);   // Displacement
-  %}
-
-  // Push the integer in stackSlot 'src' onto FP-stack
-  enc_class Push_Mem_I( memory src ) %{    // FILD   [ESP+src]
-    store_to_stackslot( masm, $primary, $secondary, $src$$disp );
-  %}
-
-  // Push FPU's TOS float to a stack-slot, and pop FPU-stack
-  enc_class Pop_Mem_FPR( stackSlotF dst ) %{ // FSTP_S [ESP+dst]
-    store_to_stackslot( masm, 0xD9, 0x03, $dst$$disp );
-  %}
-
-  // Same as Pop_Mem_F except for opcode
-  // Push FPU's TOS double to a stack-slot, and pop FPU-stack
-  enc_class Pop_Mem_DPR( stackSlotD dst ) %{ // FSTP_D [ESP+dst]
-    store_to_stackslot( masm, 0xDD, 0x03, $dst$$disp );
-  %}
-
-  enc_class Pop_Reg_FPR( regFPR dst ) %{
-    emit_opcode( masm, 0xDD );           // FSTP   ST(i)
-    emit_d8( masm, 0xD8+$dst$$reg );
-  %}
-
-  enc_class Push_Reg_FPR( regFPR dst ) %{
-    emit_opcode( masm, 0xD9 );           // FLD    ST(i-1)
-    emit_d8( masm, 0xC0-1+$dst$$reg );
-  %}
-
-  // Push FPU's float to a stack-slot, and pop FPU-stack
-  enc_class Pop_Mem_Reg_FPR( stackSlotF dst, regFPR src ) %{
-    int pop = 0x02;
-    if ($src$$reg != FPR1L_enc) {
-      emit_opcode( masm, 0xD9 );         // FLD    ST(i-1)
-      emit_d8( masm, 0xC0-1+$src$$reg );
-      pop = 0x03;
-    }
-    store_to_stackslot( masm, 0xD9, pop, $dst$$disp ); // FST<P>_S  [ESP+dst]
-  %}
-
-  // Push FPU's double to a stack-slot, and pop FPU-stack
-  enc_class Pop_Mem_Reg_DPR( stackSlotD dst, regDPR src ) %{
-    int pop = 0x02;
-    if ($src$$reg != FPR1L_enc) {
-      emit_opcode( masm, 0xD9 );         // FLD    ST(i-1)
-      emit_d8( masm, 0xC0-1+$src$$reg );
-      pop = 0x03;
-    }
-    store_to_stackslot( masm, 0xDD, pop, $dst$$disp ); // FST<P>_D  [ESP+dst]
-  %}
-
-  // Push FPU's double to a FPU-stack-slot, and pop FPU-stack
-  enc_class Pop_Reg_Reg_DPR( regDPR dst, regFPR src ) %{
-    int pop = 0xD0 - 1; // -1 since we skip FLD
-    if ($src$$reg != FPR1L_enc) {
-      emit_opcode( masm, 0xD9 );         // FLD    ST(src-1)
-      emit_d8( masm, 0xC0-1+$src$$reg );
-      pop = 0xD8;
-    }
-    emit_opcode( masm, 0xDD );
-    emit_d8( masm, pop+$dst$$reg );      // FST<P> ST(i)
-  %}
-
-
-  enc_class Push_Reg_Mod_DPR( regDPR dst, regDPR src) %{
-    // load dst in FPR0
-    emit_opcode( masm, 0xD9 );
-    emit_d8( masm, 0xC0-1+$dst$$reg );
-    if ($src$$reg != FPR1L_enc) {
-      // fincstp
-      emit_opcode (masm, 0xD9);
-      emit_opcode (masm, 0xF7);
-      // swap src with FPR1:
-      // FXCH FPR1 with src
-      emit_opcode(masm, 0xD9);
-      emit_d8(masm, 0xC8-1+$src$$reg );
-      // fdecstp
-      emit_opcode (masm, 0xD9);
-      emit_opcode (masm, 0xF6);
-    }
-  %}
-
-  enc_class Push_ResultD(regD dst) %{
-    __ fstp_d(Address(rsp, 0));
-    __ movdbl($dst$$XMMRegister, Address(rsp, 0));
-    __ addptr(rsp, 8);
-  %}
-
-  enc_class Push_ResultF(regF dst, immI d8) %{
-    __ fstp_s(Address(rsp, 0));
-    __ movflt($dst$$XMMRegister, Address(rsp, 0));
-    __ addptr(rsp, $d8$$constant);
-  %}
-
-  enc_class Push_SrcD(regD src) %{
-    __ subptr(rsp, 8);
-    __ movdbl(Address(rsp, 0), $src$$XMMRegister);
-    __ fld_d(Address(rsp, 0));
-  %}
-
-  enc_class push_stack_temp_qword() %{
-    __ subptr(rsp, 8);
-  %}
-
-  enc_class pop_stack_temp_qword() %{
-    __ addptr(rsp, 8);
-  %}
-
-  enc_class push_xmm_to_fpr1(regD src) %{
-    __ movdbl(Address(rsp, 0), $src$$XMMRegister);
-    __ fld_d(Address(rsp, 0));
-  %}
-
-  enc_class fnstsw_sahf_skip_parity() %{
-    // fnstsw ax
-    emit_opcode( masm, 0xDF );
-    emit_opcode( masm, 0xE0 );
-    // sahf
-    emit_opcode( masm, 0x9E );
-    // jnp  ::skip
-    emit_opcode( masm, 0x7B );
-    emit_opcode( masm, 0x05 );
-  %}
-
-  enc_class fpu_flags() %{
-    // fnstsw_ax
-    emit_opcode( masm, 0xDF);
-    emit_opcode( masm, 0xE0);
-    // test ax,0x0400
-    emit_opcode( masm, 0x66 );   // operand-size prefix for 16-bit immediate
-    emit_opcode( masm, 0xA9 );
-    emit_d16   ( masm, 0x0400 );
-    // // // This sequence works, but stalls for 12-16 cycles on PPro
-    // // test rax,0x0400
-    // emit_opcode( masm, 0xA9 );
-    // emit_d32   ( masm, 0x00000400 );
-    //
-    // jz exit (no unordered comparison)
-    emit_opcode( masm, 0x74 );
-    emit_d8    ( masm, 0x02 );
-    // mov ah,1 - treat as LT case (set carry flag)
-    emit_opcode( masm, 0xB4 );
-    emit_d8    ( masm, 0x01 );
-    // sahf
-    emit_opcode( masm, 0x9E);
-  %}
-
-  enc_class cmpF_P6_fixup() %{
-    // Fixup the integer flags in case comparison involved a NaN
-    //
-    // JNP exit (no unordered comparison, P-flag is set by NaN)
-    emit_opcode( masm, 0x7B );
-    emit_d8    ( masm, 0x03 );
-    // MOV AH,1 - treat as LT case (set carry flag)
-    emit_opcode( masm, 0xB4 );
-    emit_d8    ( masm, 0x01 );
-    // SAHF
-    emit_opcode( masm, 0x9E);
-    // NOP     // target for branch to avoid branch to branch
-    emit_opcode( masm, 0x90);
-  %}
-
-//     fnstsw_ax();
-//     sahf();
-//     movl(dst, nan_result);
-//     jcc(Assembler::parity, exit);
-//     movl(dst, less_result);
-//     jcc(Assembler::below, exit);
-//     movl(dst, equal_result);
-//     jcc(Assembler::equal, exit);
-//     movl(dst, greater_result);
-
-// less_result     =  1;
-// greater_result  = -1;
-// equal_result    = 0;
-// nan_result      = -1;
-
-  enc_class CmpF_Result(rRegI dst) %{
-    // fnstsw_ax();
-    emit_opcode( masm, 0xDF);
-    emit_opcode( masm, 0xE0);
-    // sahf
-    emit_opcode( masm, 0x9E);
-    // movl(dst, nan_result);
-    emit_opcode( masm, 0xB8 + $dst$$reg);
-    emit_d32( masm, -1 );
-    // jcc(Assembler::parity, exit);
-    emit_opcode( masm, 0x7A );
-    emit_d8    ( masm, 0x13 );
-    // movl(dst, less_result);
-    emit_opcode( masm, 0xB8 + $dst$$reg);
-    emit_d32( masm, -1 );
-    // jcc(Assembler::below, exit);
-    emit_opcode( masm, 0x72 );
-    emit_d8    ( masm, 0x0C );
-    // movl(dst, equal_result);
-    emit_opcode( masm, 0xB8 + $dst$$reg);
-    emit_d32( masm, 0 );
-    // jcc(Assembler::equal, exit);
-    emit_opcode( masm, 0x74 );
-    emit_d8    ( masm, 0x05 );
-    // movl(dst, greater_result);
-    emit_opcode( masm, 0xB8 + $dst$$reg);
-    emit_d32( masm, 1 );
-  %}
-
-
-  // Compare the longs and set flags
-  // BROKEN!  Do Not use as-is
-  enc_class cmpl_test( eRegL src1, eRegL src2 ) %{
-    // CMP    $src1.hi,$src2.hi
-    emit_opcode( masm, 0x3B );
-    emit_rm(masm, 0x3, HIGH_FROM_LOW_ENC($src1$$reg), HIGH_FROM_LOW_ENC($src2$$reg) );
-    // JNE,s  done
-    emit_opcode(masm,0x75);
-    emit_d8(masm, 2 );
-    // CMP    $src1.lo,$src2.lo
-    emit_opcode( masm, 0x3B );
-    emit_rm(masm, 0x3, $src1$$reg, $src2$$reg );
-// done:
-  %}
-
-  enc_class convert_int_long( regL dst, rRegI src ) %{
-    // mov $dst.lo,$src
-    int dst_encoding = $dst$$reg;
-    int src_encoding = $src$$reg;
-    encode_Copy( masm, dst_encoding  , src_encoding );
-    // mov $dst.hi,$src
-    encode_Copy( masm, HIGH_FROM_LOW_ENC(dst_encoding), src_encoding );
-    // sar $dst.hi,31
-    emit_opcode( masm, 0xC1 );
-    emit_rm(masm, 0x3, 7, HIGH_FROM_LOW_ENC(dst_encoding) );
-    emit_d8(masm, 0x1F );
-  %}
-
-  enc_class convert_long_double( eRegL src ) %{
-    // push $src.hi
-    emit_opcode(masm, 0x50+HIGH_FROM_LOW_ENC($src$$reg));
-    // push $src.lo
-    emit_opcode(masm, 0x50+$src$$reg  );
-    // fild 64-bits at [SP]
-    emit_opcode(masm,0xdf);
-    emit_d8(masm, 0x6C);
-    emit_d8(masm, 0x24);
-    emit_d8(masm, 0x00);
-    // pop stack
-    emit_opcode(masm, 0x83); // add  SP, #8
-    emit_rm(masm, 0x3, 0x00, ESP_enc);
-    emit_d8(masm, 0x8);
-  %}
-
-  enc_class multiply_con_and_shift_high( eDXRegI dst, nadxRegI src1, eADXRegL_low_only src2, immI_32_63 cnt, eFlagsReg cr ) %{
-    // IMUL   EDX:EAX,$src1
-    emit_opcode( masm, 0xF7 );
-    emit_rm( masm, 0x3, 0x5, $src1$$reg );
-    // SAR    EDX,$cnt-32
-    int shift_count = ((int)$cnt$$constant) - 32;
-    if (shift_count > 0) {
-      emit_opcode(masm, 0xC1);
-      emit_rm(masm, 0x3, 7, $dst$$reg );
-      emit_d8(masm, shift_count);
-    }
-  %}
-
-  // this version doesn't have add sp, 8
-  enc_class convert_long_double2( eRegL src ) %{
-    // push $src.hi
-    emit_opcode(masm, 0x50+HIGH_FROM_LOW_ENC($src$$reg));
-    // push $src.lo
-    emit_opcode(masm, 0x50+$src$$reg  );
-    // fild 64-bits at [SP]
-    emit_opcode(masm,0xdf);
-    emit_d8(masm, 0x6C);
-    emit_d8(masm, 0x24);
-    emit_d8(masm, 0x00);
-  %}
-
-  enc_class long_int_multiply( eADXRegL dst, nadxRegI src) %{
-    // Basic idea: long = (long)int * (long)int
-    // IMUL EDX:EAX, src
-    emit_opcode( masm, 0xF7 );
-    emit_rm( masm, 0x3, 0x5, $src$$reg);
-  %}
-
-  enc_class long_uint_multiply( eADXRegL dst, nadxRegI src) %{
-    // Basic Idea:  long = (int & 0xffffffffL) * (int & 0xffffffffL)
-    // MUL EDX:EAX, src
-    emit_opcode( masm, 0xF7 );
-    emit_rm( masm, 0x3, 0x4, $src$$reg);
-  %}
-
-  enc_class long_multiply( eADXRegL dst, eRegL src, rRegI tmp ) %{
-    // Basic idea: lo(result) = lo(x_lo * y_lo)
-    //             hi(result) = hi(x_lo * y_lo) + lo(x_hi * y_lo) + lo(x_lo * y_hi)
-    // MOV    $tmp,$src.lo
-    encode_Copy( masm, $tmp$$reg, $src$$reg );
-    // IMUL   $tmp,EDX
-    emit_opcode( masm, 0x0F );
-    emit_opcode( masm, 0xAF );
-    emit_rm( masm, 0x3, $tmp$$reg, HIGH_FROM_LOW_ENC($dst$$reg) );
-    // MOV    EDX,$src.hi
-    encode_Copy( masm, HIGH_FROM_LOW_ENC($dst$$reg), HIGH_FROM_LOW_ENC($src$$reg) );
-    // IMUL   EDX,EAX
-    emit_opcode( masm, 0x0F );
-    emit_opcode( masm, 0xAF );
-    emit_rm( masm, 0x3, HIGH_FROM_LOW_ENC($dst$$reg), $dst$$reg );
-    // ADD    $tmp,EDX
-    emit_opcode( masm, 0x03 );
-    emit_rm( masm, 0x3, $tmp$$reg, HIGH_FROM_LOW_ENC($dst$$reg) );
-    // MUL   EDX:EAX,$src.lo
-    emit_opcode( masm, 0xF7 );
-    emit_rm( masm, 0x3, 0x4, $src$$reg );
-    // ADD    EDX,ESI
-    emit_opcode( masm, 0x03 );
-    emit_rm( masm, 0x3, HIGH_FROM_LOW_ENC($dst$$reg), $tmp$$reg );
-  %}
-
-  enc_class long_multiply_con( eADXRegL dst, immL_127 src, rRegI tmp ) %{
-    // Basic idea: lo(result) = lo(src * y_lo)
-    //             hi(result) = hi(src * y_lo) + lo(src * y_hi)
-    // IMUL   $tmp,EDX,$src
-    emit_opcode( masm, 0x6B );
-    emit_rm( masm, 0x3, $tmp$$reg, HIGH_FROM_LOW_ENC($dst$$reg) );
-    emit_d8( masm, (int)$src$$constant );
-    // MOV    EDX,$src
-    emit_opcode(masm, 0xB8 + EDX_enc);
-    emit_d32( masm, (int)$src$$constant );
-    // MUL   EDX:EAX,EDX
-    emit_opcode( masm, 0xF7 );
-    emit_rm( masm, 0x3, 0x4, EDX_enc );
-    // ADD    EDX,ESI
-    emit_opcode( masm, 0x03 );
-    emit_rm( masm, 0x3, EDX_enc, $tmp$$reg );
-  %}
-
-  enc_class long_div( eRegL src1, eRegL src2 ) %{
-    // PUSH src1.hi
-    emit_opcode(masm, HIGH_FROM_LOW_ENC(0x50+$src1$$reg) );
-    // PUSH src1.lo
-    emit_opcode(masm,               0x50+$src1$$reg  );
-    // PUSH src2.hi
-    emit_opcode(masm, HIGH_FROM_LOW_ENC(0x50+$src2$$reg) );
-    // PUSH src2.lo
-    emit_opcode(masm,               0x50+$src2$$reg  );
-    // CALL directly to the runtime
-    __ set_inst_mark();
-    emit_opcode(masm,0xE8);       // Call into runtime
-    emit_d32_reloc(masm, (CAST_FROM_FN_PTR(address, SharedRuntime::ldiv) - __ pc()) - 4, runtime_call_Relocation::spec(), RELOC_IMM32 );
-    __ clear_inst_mark();
-    __ post_call_nop();
-    // Restore stack
-    emit_opcode(masm, 0x83); // add  SP, #framesize
-    emit_rm(masm, 0x3, 0x00, ESP_enc);
-    emit_d8(masm, 4*4);
-  %}
-
-  enc_class long_mod( eRegL src1, eRegL src2 ) %{
-    // PUSH src1.hi
-    emit_opcode(masm, HIGH_FROM_LOW_ENC(0x50+$src1$$reg) );
-    // PUSH src1.lo
-    emit_opcode(masm,               0x50+$src1$$reg  );
-    // PUSH src2.hi
-    emit_opcode(masm, HIGH_FROM_LOW_ENC(0x50+$src2$$reg) );
-    // PUSH src2.lo
-    emit_opcode(masm,               0x50+$src2$$reg  );
-    // CALL directly to the runtime
-    __ set_inst_mark();
-    emit_opcode(masm,0xE8);       // Call into runtime
-    emit_d32_reloc(masm, (CAST_FROM_FN_PTR(address, SharedRuntime::lrem ) - __ pc()) - 4, runtime_call_Relocation::spec(), RELOC_IMM32 );
-    __ clear_inst_mark();
-    __ post_call_nop();
-    // Restore stack
-    emit_opcode(masm, 0x83); // add  SP, #framesize
-    emit_rm(masm, 0x3, 0x00, ESP_enc);
-    emit_d8(masm, 4*4);
-  %}
-
-  enc_class long_cmp_flags0( eRegL src, rRegI tmp ) %{
-    // MOV   $tmp,$src.lo
-    emit_opcode(masm, 0x8B);
-    emit_rm(masm, 0x3, $tmp$$reg, $src$$reg);
-    // OR    $tmp,$src.hi
-    emit_opcode(masm, 0x0B);
-    emit_rm(masm, 0x3, $tmp$$reg, HIGH_FROM_LOW_ENC($src$$reg));
-  %}
-
-  enc_class long_cmp_flags1( eRegL src1, eRegL src2 ) %{
-    // CMP    $src1.lo,$src2.lo
-    emit_opcode( masm, 0x3B );
-    emit_rm(masm, 0x3, $src1$$reg, $src2$$reg );
-    // JNE,s  skip
-    emit_cc(masm, 0x70, 0x5);
-    emit_d8(masm,2);
-    // CMP    $src1.hi,$src2.hi
-    emit_opcode( masm, 0x3B );
-    emit_rm(masm, 0x3, HIGH_FROM_LOW_ENC($src1$$reg), HIGH_FROM_LOW_ENC($src2$$reg) );
-  %}
-
-  enc_class long_cmp_flags2( eRegL src1, eRegL src2, rRegI tmp ) %{
-    // CMP    $src1.lo,$src2.lo\t! Long compare; set flags for low bits
-    emit_opcode( masm, 0x3B );
-    emit_rm(masm, 0x3, $src1$$reg, $src2$$reg );
-    // MOV    $tmp,$src1.hi
-    emit_opcode( masm, 0x8B );
-    emit_rm(masm, 0x3, $tmp$$reg, HIGH_FROM_LOW_ENC($src1$$reg) );
-    // SBB   $tmp,$src2.hi\t! Compute flags for long compare
-    emit_opcode( masm, 0x1B );
-    emit_rm(masm, 0x3, $tmp$$reg, HIGH_FROM_LOW_ENC($src2$$reg) );
-  %}
-
-  enc_class long_cmp_flags3( eRegL src, rRegI tmp ) %{
-    // XOR    $tmp,$tmp
-    emit_opcode(masm,0x33);  // XOR
-    emit_rm(masm,0x3, $tmp$$reg, $tmp$$reg);
-    // CMP    $tmp,$src.lo
-    emit_opcode( masm, 0x3B );
-    emit_rm(masm, 0x3, $tmp$$reg, $src$$reg );
-    // SBB    $tmp,$src.hi
-    emit_opcode( masm, 0x1B );
-    emit_rm(masm, 0x3, $tmp$$reg, HIGH_FROM_LOW_ENC($src$$reg) );
-  %}
-
- // Sniff, sniff... smells like Gnu Superoptimizer
-  enc_class neg_long( eRegL dst ) %{
-    emit_opcode(masm,0xF7);    // NEG hi
-    emit_rm    (masm,0x3, 0x3, HIGH_FROM_LOW_ENC($dst$$reg));
-    emit_opcode(masm,0xF7);    // NEG lo
-    emit_rm    (masm,0x3, 0x3,               $dst$$reg );
-    emit_opcode(masm,0x83);    // SBB hi,0
-    emit_rm    (masm,0x3, 0x3, HIGH_FROM_LOW_ENC($dst$$reg));
-    emit_d8    (masm,0 );
-  %}
-
-  enc_class enc_pop_rdx() %{
-    emit_opcode(masm,0x5A);
-  %}
-
-  enc_class enc_rethrow() %{
-    __ set_inst_mark();
-    emit_opcode(masm, 0xE9);        // jmp    entry
-    emit_d32_reloc(masm, (int)OptoRuntime::rethrow_stub() - ((int)__ pc())-4,
-                   runtime_call_Relocation::spec(), RELOC_IMM32 );
-    __ clear_inst_mark();
-    __ post_call_nop();
-  %}
-
-
-  // Convert a double to an int.  Java semantics require we do complex
-  // manglelations in the corner cases.  So we set the rounding mode to
-  // 'zero', store the darned double down as an int, and reset the
-  // rounding mode to 'nearest'.  The hardware throws an exception which
-  // patches up the correct value directly to the stack.
-  enc_class DPR2I_encoding( regDPR src ) %{
-    // Flip to round-to-zero mode.  We attempted to allow invalid-op
-    // exceptions here, so that a NAN or other corner-case value will
-    // thrown an exception (but normal values get converted at full speed).
-    // However, I2C adapters and other float-stack manglers leave pending
-    // invalid-op exceptions hanging.  We would have to clear them before
-    // enabling them and that is more expensive than just testing for the
-    // invalid value Intel stores down in the corner cases.
-    emit_opcode(masm,0xD9);            // FLDCW  trunc
-    emit_opcode(masm,0x2D);
-    emit_d32(masm,(int)StubRoutines::x86::addr_fpu_cntrl_wrd_trunc());
-    // Allocate a word
-    emit_opcode(masm,0x83);            // SUB ESP,4
-    emit_opcode(masm,0xEC);
-    emit_d8(masm,0x04);
-    // Encoding assumes a double has been pushed into FPR0.
-    // Store down the double as an int, popping the FPU stack
-    emit_opcode(masm,0xDB);            // FISTP [ESP]
-    emit_opcode(masm,0x1C);
-    emit_d8(masm,0x24);
-    // Restore the rounding mode; mask the exception
-    emit_opcode(masm,0xD9);            // FLDCW   std/24-bit mode
-    emit_opcode(masm,0x2D);
-    emit_d32( masm, Compile::current()->in_24_bit_fp_mode()
-        ? (int)StubRoutines::x86::addr_fpu_cntrl_wrd_24()
-        : (int)StubRoutines::x86::addr_fpu_cntrl_wrd_std());
-
-    // Load the converted int; adjust CPU stack
-    emit_opcode(masm,0x58);       // POP EAX
-    emit_opcode(masm,0x3D);       // CMP EAX,imm
-    emit_d32   (masm,0x80000000); //         0x80000000
-    emit_opcode(masm,0x75);       // JNE around_slow_call
-    emit_d8    (masm,0x07);       // Size of slow_call
-    // Push src onto stack slow-path
-    emit_opcode(masm,0xD9 );      // FLD     ST(i)
-    emit_d8    (masm,0xC0-1+$src$$reg );
-    // CALL directly to the runtime
-    __ set_inst_mark();
-    emit_opcode(masm,0xE8);       // Call into runtime
-    emit_d32_reloc(masm, (StubRoutines::x86::d2i_wrapper() - __ pc()) - 4, runtime_call_Relocation::spec(), RELOC_IMM32 );
-    __ clear_inst_mark();
-    __ post_call_nop();
-    // Carry on here...
-  %}
-
-  enc_class DPR2L_encoding( regDPR src ) %{
-    emit_opcode(masm,0xD9);            // FLDCW  trunc
-    emit_opcode(masm,0x2D);
-    emit_d32(masm,(int)StubRoutines::x86::addr_fpu_cntrl_wrd_trunc());
-    // Allocate a word
-    emit_opcode(masm,0x83);            // SUB ESP,8
-    emit_opcode(masm,0xEC);
-    emit_d8(masm,0x08);
-    // Encoding assumes a double has been pushed into FPR0.
-    // Store down the double as a long, popping the FPU stack
-    emit_opcode(masm,0xDF);            // FISTP [ESP]
-    emit_opcode(masm,0x3C);
-    emit_d8(masm,0x24);
-    // Restore the rounding mode; mask the exception
-    emit_opcode(masm,0xD9);            // FLDCW   std/24-bit mode
-    emit_opcode(masm,0x2D);
-    emit_d32( masm, Compile::current()->in_24_bit_fp_mode()
-        ? (int)StubRoutines::x86::addr_fpu_cntrl_wrd_24()
-        : (int)StubRoutines::x86::addr_fpu_cntrl_wrd_std());
-
-    // Load the converted int; adjust CPU stack
-    emit_opcode(masm,0x58);       // POP EAX
-    emit_opcode(masm,0x5A);       // POP EDX
-    emit_opcode(masm,0x81);       // CMP EDX,imm
-    emit_d8    (masm,0xFA);       // rdx
-    emit_d32   (masm,0x80000000); //         0x80000000
-    emit_opcode(masm,0x75);       // JNE around_slow_call
-    emit_d8    (masm,0x07+4);     // Size of slow_call
-    emit_opcode(masm,0x85);       // TEST EAX,EAX
-    emit_opcode(masm,0xC0);       // 2/rax,/rax,
-    emit_opcode(masm,0x75);       // JNE around_slow_call
-    emit_d8    (masm,0x07);       // Size of slow_call
-    // Push src onto stack slow-path
-    emit_opcode(masm,0xD9 );      // FLD     ST(i)
-    emit_d8    (masm,0xC0-1+$src$$reg );
-    // CALL directly to the runtime
-    __ set_inst_mark();
-    emit_opcode(masm,0xE8);       // Call into runtime
-    emit_d32_reloc(masm, (StubRoutines::x86::d2l_wrapper() - __ pc()) - 4, runtime_call_Relocation::spec(), RELOC_IMM32 );
-    __ clear_inst_mark();
-    __ post_call_nop();
-    // Carry on here...
-  %}
-
-  enc_class FMul_ST_reg( eRegFPR src1 ) %{
-    // Operand was loaded from memory into fp ST (stack top)
-    // FMUL   ST,$src  /* D8 C8+i */
-    emit_opcode(masm, 0xD8);
-    emit_opcode(masm, 0xC8 + $src1$$reg);
-  %}
-
-  enc_class FAdd_ST_reg( eRegFPR src2 ) %{
-    // FADDP  ST,src2  /* D8 C0+i */
-    emit_opcode(masm, 0xD8);
-    emit_opcode(masm, 0xC0 + $src2$$reg);
-    //could use FADDP  src2,fpST  /* DE C0+i */
-  %}
-
-  enc_class FAddP_reg_ST( eRegFPR src2 ) %{
-    // FADDP  src2,ST  /* DE C0+i */
-    emit_opcode(masm, 0xDE);
-    emit_opcode(masm, 0xC0 + $src2$$reg);
-  %}
-
-  enc_class subFPR_divFPR_encode( eRegFPR src1, eRegFPR src2) %{
-    // Operand has been loaded into fp ST (stack top)
-      // FSUB   ST,$src1
-      emit_opcode(masm, 0xD8);
-      emit_opcode(masm, 0xE0 + $src1$$reg);
-
-      // FDIV
-      emit_opcode(masm, 0xD8);
-      emit_opcode(masm, 0xF0 + $src2$$reg);
-  %}
-
-  enc_class MulFAddF (eRegFPR src1, eRegFPR src2) %{
-    // Operand was loaded from memory into fp ST (stack top)
-    // FADD   ST,$src  /* D8 C0+i */
-    emit_opcode(masm, 0xD8);
-    emit_opcode(masm, 0xC0 + $src1$$reg);
-
-    // FMUL  ST,src2  /* D8 C*+i */
-    emit_opcode(masm, 0xD8);
-    emit_opcode(masm, 0xC8 + $src2$$reg);
-  %}
-
-
-  enc_class MulFAddFreverse (eRegFPR src1, eRegFPR src2) %{
-    // Operand was loaded from memory into fp ST (stack top)
-    // FADD   ST,$src  /* D8 C0+i */
-    emit_opcode(masm, 0xD8);
-    emit_opcode(masm, 0xC0 + $src1$$reg);
-
-    // FMULP  src2,ST  /* DE C8+i */
-    emit_opcode(masm, 0xDE);
-    emit_opcode(masm, 0xC8 + $src2$$reg);
-  %}
-
-  // Atomically load the volatile long
-  enc_class enc_loadL_volatile( memory mem, stackSlotL dst ) %{
-    emit_opcode(masm,0xDF);
-    int rm_byte_opcode = 0x05;
-    int base     = $mem$$base;
-    int index    = $mem$$index;
-    int scale    = $mem$$scale;
-    int displace = $mem$$disp;
-    relocInfo::relocType disp_reloc = $mem->disp_reloc(); // disp-as-oop when working with static globals
-    encode_RegMem(masm, rm_byte_opcode, base, index, scale, displace, disp_reloc);
-    store_to_stackslot( masm, 0x0DF, 0x07, $dst$$disp );
-  %}
-
-  // Volatile Store Long.  Must be atomic, so move it into
-  // the FP TOS and then do a 64-bit FIST.  Has to probe the
-  // target address before the store (for null-ptr checks)
-  // so the memory operand is used twice in the encoding.
-  enc_class enc_storeL_volatile( memory mem, stackSlotL src ) %{
-    store_to_stackslot( masm, 0x0DF, 0x05, $src$$disp );
-    __ set_inst_mark();            // Mark start of FIST in case $mem has an oop
-    emit_opcode(masm,0xDF);
-    int rm_byte_opcode = 0x07;
-    int base     = $mem$$base;
-    int index    = $mem$$index;
-    int scale    = $mem$$scale;
-    int displace = $mem$$disp;
-    relocInfo::relocType disp_reloc = $mem->disp_reloc(); // disp-as-oop when working with static globals
-    encode_RegMem(masm, rm_byte_opcode, base, index, scale, displace, disp_reloc);
-    __ clear_inst_mark();
-  %}
-
-%}
-
-
-//----------FRAME--------------------------------------------------------------
-// Definition of frame structure and management information.
-//
-//  S T A C K   L A Y O U T    Allocators stack-slot number
-//                             |   (to get allocators register number
-//  G  Owned by    |        |  v    add OptoReg::stack0())
-//  r   CALLER     |        |
-//  o     |        +--------+      pad to even-align allocators stack-slot
-//  w     V        |  pad0  |        numbers; owned by CALLER
-//  t   -----------+--------+----> Matcher::_in_arg_limit, unaligned
-//  h     ^        |   in   |  5
-//        |        |  args  |  4   Holes in incoming args owned by SELF
-//  |     |        |        |  3
-//  |     |        +--------+
-//  V     |        | old out|      Empty on Intel, window on Sparc
-//        |    old |preserve|      Must be even aligned.
-//        |     SP-+--------+----> Matcher::_old_SP, even aligned
-//        |        |   in   |  3   area for Intel ret address
-//     Owned by    |preserve|      Empty on Sparc.
-//       SELF      +--------+
-//        |        |  pad2  |  2   pad to align old SP
-//        |        +--------+  1
-//        |        | locks  |  0
-//        |        +--------+----> OptoReg::stack0(), even aligned
-//        |        |  pad1  | 11   pad to align new SP
-//        |        +--------+
-//        |        |        | 10
-//        |        | spills |  9   spills
-//        V        |        |  8   (pad0 slot for callee)
-//      -----------+--------+----> Matcher::_out_arg_limit, unaligned
-//        ^        |  out   |  7
-//        |        |  args  |  6   Holes in outgoing args owned by CALLEE
-//     Owned by    +--------+
-//      CALLEE     | new out|  6   Empty on Intel, window on Sparc
-//        |    new |preserve|      Must be even-aligned.
-//        |     SP-+--------+----> Matcher::_new_SP, even aligned
-//        |        |        |
-//
-// Note 1: Only region 8-11 is determined by the allocator.  Region 0-5 is
-//         known from SELF's arguments and the Java calling convention.
-//         Region 6-7 is determined per call site.
-// Note 2: If the calling convention leaves holes in the incoming argument
-//         area, those holes are owned by SELF.  Holes in the outgoing area
-//         are owned by the CALLEE.  Holes should not be necessary in the
-//         incoming area, as the Java calling convention is completely under
-//         the control of the AD file.  Doubles can be sorted and packed to
-//         avoid holes.  Holes in the outgoing arguments may be necessary for
-//         varargs C calling conventions.
-// Note 3: Region 0-3 is even aligned, with pad2 as needed.  Region 3-5 is
-//         even aligned with pad0 as needed.
-//         Region 6 is even aligned.  Region 6-7 is NOT even aligned;
-//         region 6-11 is even aligned; it may be padded out more so that
-//         the region from SP to FP meets the minimum stack alignment.
-
-frame %{
-  // These three registers define part of the calling convention
-  // between compiled code and the interpreter.
-  inline_cache_reg(EAX);                // Inline Cache Register
-
-  // Optional: name the operand used by cisc-spilling to access [stack_pointer + offset]
-  cisc_spilling_operand_name(indOffset32);
-
-  // Number of stack slots consumed by locking an object
-  sync_stack_slots(1);
-
-  // Compiled code's Frame Pointer
-  frame_pointer(ESP);
-  // Interpreter stores its frame pointer in a register which is
-  // stored to the stack by I2CAdaptors.
-  // I2CAdaptors convert from interpreted java to compiled java.
-  interpreter_frame_pointer(EBP);
-
-  // Stack alignment requirement
-  // Alignment size in bytes (128-bit -> 16 bytes)
-  stack_alignment(StackAlignmentInBytes);
-
-  // Number of outgoing stack slots killed above the out_preserve_stack_slots
-  // for calls to C.  Supports the var-args backing area for register parms.
-  varargs_C_out_slots_killed(0);
-
-  // The after-PROLOG location of the return address.  Location of
-  // return address specifies a type (REG or STACK) and a number
-  // representing the register number (i.e. - use a register name) or
-  // stack slot.
-  // Ret Addr is on stack in slot 0 if no locks or verification or alignment.
-  // Otherwise, it is above the locks and verification slot and alignment word
-  return_addr(STACK - 1 +
-              align_up((Compile::current()->in_preserve_stack_slots() +
-                        Compile::current()->fixed_slots()),
-                       stack_alignment_in_slots()));
-
-  // Location of C & interpreter return values
-  c_return_value %{
-    assert( ideal_reg >= Op_RegI && ideal_reg <= Op_RegL, "only return normal values" );
-    static int lo[Op_RegL+1] = { 0, 0, OptoReg::Bad, EAX_num,      EAX_num,      FPR1L_num,    FPR1L_num, EAX_num };
-    static int hi[Op_RegL+1] = { 0, 0, OptoReg::Bad, OptoReg::Bad, OptoReg::Bad, OptoReg::Bad, FPR1H_num, EDX_num };
-
-    // in SSE2+ mode we want to keep the FPU stack clean so pretend
-    // that C functions return float and double results in XMM0.
-    if( ideal_reg == Op_RegD && UseSSE>=2 )
-      return OptoRegPair(XMM0b_num,XMM0_num);
-    if( ideal_reg == Op_RegF && UseSSE>=2 )
-      return OptoRegPair(OptoReg::Bad,XMM0_num);
-
-    return OptoRegPair(hi[ideal_reg],lo[ideal_reg]);
-  %}
-
-  // Location of return values
-  return_value %{
-    assert( ideal_reg >= Op_RegI && ideal_reg <= Op_RegL, "only return normal values" );
-    static int lo[Op_RegL+1] = { 0, 0, OptoReg::Bad, EAX_num,      EAX_num,      FPR1L_num,    FPR1L_num, EAX_num };
-    static int hi[Op_RegL+1] = { 0, 0, OptoReg::Bad, OptoReg::Bad, OptoReg::Bad, OptoReg::Bad, FPR1H_num, EDX_num };
-    if( ideal_reg == Op_RegD && UseSSE>=2 )
-      return OptoRegPair(XMM0b_num,XMM0_num);
-    if( ideal_reg == Op_RegF && UseSSE>=1 )
-      return OptoRegPair(OptoReg::Bad,XMM0_num);
-    return OptoRegPair(hi[ideal_reg],lo[ideal_reg]);
-  %}
-
-%}
-
-//----------ATTRIBUTES---------------------------------------------------------
-//----------Operand Attributes-------------------------------------------------
-op_attrib op_cost(0);        // Required cost attribute
-
-//----------Instruction Attributes---------------------------------------------
-ins_attrib ins_cost(100);       // Required cost attribute
-ins_attrib ins_size(8);         // Required size attribute (in bits)
-ins_attrib ins_short_branch(0); // Required flag: is this instruction a
-                                // non-matching short branch variant of some
-                                                            // long branch?
-ins_attrib ins_alignment(1);    // Required alignment attribute (must be a power of 2)
-                                // specifies the alignment that some part of the instruction (not
-                                // necessarily the start) requires.  If > 1, a compute_padding()
-                                // function must be provided for the instruction
-
-//----------OPERANDS-----------------------------------------------------------
-// Operand definitions must precede instruction definitions for correct parsing
-// in the ADLC because operands constitute user defined types which are used in
-// instruction definitions.
-
-//----------Simple Operands----------------------------------------------------
-// Immediate Operands
-// Integer Immediate
-operand immI() %{
-  match(ConI);
-
-  op_cost(10);
-  format %{ %}
-  interface(CONST_INTER);
-%}
-
-// Constant for test vs zero
-operand immI_0() %{
-  predicate(n->get_int() == 0);
-  match(ConI);
-
-  op_cost(0);
-  format %{ %}
-  interface(CONST_INTER);
-%}
-
-// Constant for increment
-operand immI_1() %{
-  predicate(n->get_int() == 1);
-  match(ConI);
-
-  op_cost(0);
-  format %{ %}
-  interface(CONST_INTER);
-%}
-
-// Constant for decrement
-operand immI_M1() %{
-  predicate(n->get_int() == -1);
-  match(ConI);
-
-  op_cost(0);
-  format %{ %}
-  interface(CONST_INTER);
-%}
-
-// Valid scale values for addressing modes
-operand immI2() %{
-  predicate(0 <= n->get_int() && (n->get_int() <= 3));
-  match(ConI);
-
-  format %{ %}
-  interface(CONST_INTER);
-%}
-
-operand immI8() %{
-  predicate((-128 <= n->get_int()) && (n->get_int() <= 127));
-  match(ConI);
-
-  op_cost(5);
-  format %{ %}
-  interface(CONST_INTER);
-%}
-
-operand immU8() %{
-  predicate((0 <= n->get_int()) && (n->get_int() <= 255));
-  match(ConI);
-
-  op_cost(5);
-  format %{ %}
-  interface(CONST_INTER);
-%}
-
-operand immI16() %{
-  predicate((-32768 <= n->get_int()) && (n->get_int() <= 32767));
-  match(ConI);
-
-  op_cost(10);
-  format %{ %}
-  interface(CONST_INTER);
-%}
-
-// Int Immediate non-negative
-operand immU31()
-%{
-  predicate(n->get_int() >= 0);
-  match(ConI);
-
-  op_cost(0);
-  format %{ %}
-  interface(CONST_INTER);
-%}
-
-// Constant for long shifts
-operand immI_32() %{
-  predicate( n->get_int() == 32 );
-  match(ConI);
-
-  op_cost(0);
-  format %{ %}
-  interface(CONST_INTER);
-%}
-
-operand immI_1_31() %{
-  predicate( n->get_int() >= 1 && n->get_int() <= 31 );
-  match(ConI);
-
-  op_cost(0);
-  format %{ %}
-  interface(CONST_INTER);
-%}
-
-operand immI_32_63() %{
-  predicate( n->get_int() >= 32 && n->get_int() <= 63 );
-  match(ConI);
-  op_cost(0);
-
-  format %{ %}
-  interface(CONST_INTER);
-%}
-
-operand immI_2() %{
-  predicate( n->get_int() == 2 );
-  match(ConI);
-
-  op_cost(0);
-  format %{ %}
-  interface(CONST_INTER);
-%}
-
-operand immI_3() %{
-  predicate( n->get_int() == 3 );
-  match(ConI);
-
-  op_cost(0);
-  format %{ %}
-  interface(CONST_INTER);
-%}
-
-operand immI_4()
-%{
-  predicate(n->get_int() == 4);
-  match(ConI);
-
-  op_cost(0);
-  format %{ %}
-  interface(CONST_INTER);
-%}
-
-operand immI_8()
-%{
-  predicate(n->get_int() == 8);
-  match(ConI);
-
-  op_cost(0);
-  format %{ %}
-  interface(CONST_INTER);
-%}
-
-// Pointer Immediate
-operand immP() %{
-  match(ConP);
-
-  op_cost(10);
-  format %{ %}
-  interface(CONST_INTER);
-%}
-
-// Null Pointer Immediate
-operand immP0() %{
-  predicate( n->get_ptr() == 0 );
-  match(ConP);
-  op_cost(0);
-
-  format %{ %}
-  interface(CONST_INTER);
-%}
-
-// Long Immediate
-operand immL() %{
-  match(ConL);
-
-  op_cost(20);
-  format %{ %}
-  interface(CONST_INTER);
-%}
-
-// Long Immediate zero
-operand immL0() %{
-  predicate( n->get_long() == 0L );
-  match(ConL);
-  op_cost(0);
-
-  format %{ %}
-  interface(CONST_INTER);
-%}
-
-// Long Immediate zero
-operand immL_M1() %{
-  predicate( n->get_long() == -1L );
-  match(ConL);
-  op_cost(0);
-
-  format %{ %}
-  interface(CONST_INTER);
-%}
-
-// Long immediate from 0 to 127.
-// Used for a shorter form of long mul by 10.
-operand immL_127() %{
-  predicate((0 <= n->get_long()) && (n->get_long() <= 127));
-  match(ConL);
-  op_cost(0);
-
-  format %{ %}
-  interface(CONST_INTER);
-%}
-
-// Long Immediate: low 32-bit mask
-operand immL_32bits() %{
-  predicate(n->get_long() == 0xFFFFFFFFL);
-  match(ConL);
-  op_cost(0);
-
-  format %{ %}
-  interface(CONST_INTER);
-%}
-
-// Long Immediate: low 32-bit mask
-operand immL32() %{
-  predicate(n->get_long() == (int)(n->get_long()));
-  match(ConL);
-  op_cost(20);
-
-  format %{ %}
-  interface(CONST_INTER);
-%}
-
-//Double Immediate zero
-operand immDPR0() %{
-  // Do additional (and counter-intuitive) test against NaN to work around VC++
-  // bug that generates code such that NaNs compare equal to 0.0
-  predicate( UseSSE<=1 && n->getd() == 0.0 && !g_isnan(n->getd()) );
-  match(ConD);
-
-  op_cost(5);
-  format %{ %}
-  interface(CONST_INTER);
-%}
-
-// Double Immediate one
-operand immDPR1() %{
-  predicate( UseSSE<=1 && n->getd() == 1.0 );
-  match(ConD);
-
-  op_cost(5);
-  format %{ %}
-  interface(CONST_INTER);
-%}
-
-// Double Immediate
-operand immDPR() %{
-  predicate(UseSSE<=1);
-  match(ConD);
-
-  op_cost(5);
-  format %{ %}
-  interface(CONST_INTER);
-%}
-
-operand immD() %{
-  predicate(UseSSE>=2);
-  match(ConD);
-
-  op_cost(5);
-  format %{ %}
-  interface(CONST_INTER);
-%}
-
-// Double Immediate zero
-operand immD0() %{
-  // Do additional (and counter-intuitive) test against NaN to work around VC++
-  // bug that generates code such that NaNs compare equal to 0.0 AND do not
-  // compare equal to -0.0.
-  predicate( UseSSE>=2 && jlong_cast(n->getd()) == 0 );
-  match(ConD);
-
-  format %{ %}
-  interface(CONST_INTER);
-%}
-
-// Float Immediate zero
-operand immFPR0() %{
-  predicate(UseSSE == 0 && n->getf() == 0.0F);
-  match(ConF);
-
-  op_cost(5);
-  format %{ %}
-  interface(CONST_INTER);
-%}
-
-// Float Immediate one
-operand immFPR1() %{
-  predicate(UseSSE == 0 && n->getf() == 1.0F);
-  match(ConF);
-
-  op_cost(5);
-  format %{ %}
-  interface(CONST_INTER);
-%}
-
-// Float Immediate
-operand immFPR() %{
-  predicate( UseSSE == 0 );
-  match(ConF);
-
-  op_cost(5);
-  format %{ %}
-  interface(CONST_INTER);
-%}
-
-// Float Immediate
-operand immF() %{
-  predicate(UseSSE >= 1);
-  match(ConF);
-
-  op_cost(5);
-  format %{ %}
-  interface(CONST_INTER);
-%}
-
-// Float Immediate zero.  Zero and not -0.0
-operand immF0() %{
-  predicate( UseSSE >= 1 && jint_cast(n->getf()) == 0 );
-  match(ConF);
-
-  op_cost(5);
-  format %{ %}
-  interface(CONST_INTER);
-%}
-
-// Immediates for special shifts (sign extend)
-
-// Constants for increment
-operand immI_16() %{
-  predicate( n->get_int() == 16 );
-  match(ConI);
-
-  format %{ %}
-  interface(CONST_INTER);
-%}
-
-operand immI_24() %{
-  predicate( n->get_int() == 24 );
-  match(ConI);
-
-  format %{ %}
-  interface(CONST_INTER);
-%}
-
-// Constant for byte-wide masking
-operand immI_255() %{
-  predicate( n->get_int() == 255 );
-  match(ConI);
-
-  format %{ %}
-  interface(CONST_INTER);
-%}
-
-// Constant for short-wide masking
-operand immI_65535() %{
-  predicate(n->get_int() == 65535);
-  match(ConI);
-
-  format %{ %}
-  interface(CONST_INTER);
-%}
-
-operand kReg()
-%{
-  constraint(ALLOC_IN_RC(vectmask_reg));
-  match(RegVectMask);
-  format %{%}
-  interface(REG_INTER);
-%}
-
-// Register Operands
-// Integer Register
-operand rRegI() %{
-  constraint(ALLOC_IN_RC(int_reg));
-  match(RegI);
-  match(xRegI);
-  match(eAXRegI);
-  match(eBXRegI);
-  match(eCXRegI);
-  match(eDXRegI);
-  match(eDIRegI);
-  match(eSIRegI);
-
-  format %{ %}
-  interface(REG_INTER);
-%}
-
-// Subset of Integer Register
-operand xRegI(rRegI reg) %{
-  constraint(ALLOC_IN_RC(int_x_reg));
-  match(reg);
-  match(eAXRegI);
-  match(eBXRegI);
-  match(eCXRegI);
-  match(eDXRegI);
-
-  format %{ %}
-  interface(REG_INTER);
-%}
-
-// Special Registers
-operand eAXRegI(xRegI reg) %{
-  constraint(ALLOC_IN_RC(eax_reg));
-  match(reg);
-  match(rRegI);
-
-  format %{ "EAX" %}
-  interface(REG_INTER);
-%}
-
-// Special Registers
-operand eBXRegI(xRegI reg) %{
-  constraint(ALLOC_IN_RC(ebx_reg));
-  match(reg);
-  match(rRegI);
-
-  format %{ "EBX" %}
-  interface(REG_INTER);
-%}
-
-operand eCXRegI(xRegI reg) %{
-  constraint(ALLOC_IN_RC(ecx_reg));
-  match(reg);
-  match(rRegI);
-
-  format %{ "ECX" %}
-  interface(REG_INTER);
-%}
-
-operand eDXRegI(xRegI reg) %{
-  constraint(ALLOC_IN_RC(edx_reg));
-  match(reg);
-  match(rRegI);
-
-  format %{ "EDX" %}
-  interface(REG_INTER);
-%}
-
-operand eDIRegI(xRegI reg) %{
-  constraint(ALLOC_IN_RC(edi_reg));
-  match(reg);
-  match(rRegI);
-
-  format %{ "EDI" %}
-  interface(REG_INTER);
-%}
-
-operand nadxRegI() %{
-  constraint(ALLOC_IN_RC(nadx_reg));
-  match(RegI);
-  match(eBXRegI);
-  match(eCXRegI);
-  match(eSIRegI);
-  match(eDIRegI);
-
-  format %{ %}
-  interface(REG_INTER);
-%}
-
-operand ncxRegI() %{
-  constraint(ALLOC_IN_RC(ncx_reg));
-  match(RegI);
-  match(eAXRegI);
-  match(eDXRegI);
-  match(eSIRegI);
-  match(eDIRegI);
-
-  format %{ %}
-  interface(REG_INTER);
-%}
-
-// // This operand was used by cmpFastUnlock, but conflicted with 'object' reg
-// //
-operand eSIRegI(xRegI reg) %{
-   constraint(ALLOC_IN_RC(esi_reg));
-   match(reg);
-   match(rRegI);
-
-   format %{ "ESI" %}
-   interface(REG_INTER);
-%}
-
-// Pointer Register
-operand anyRegP() %{
-  constraint(ALLOC_IN_RC(any_reg));
-  match(RegP);
-  match(eAXRegP);
-  match(eBXRegP);
-  match(eCXRegP);
-  match(eDIRegP);
-  match(eRegP);
-
-  format %{ %}
-  interface(REG_INTER);
-%}
-
-operand eRegP() %{
-  constraint(ALLOC_IN_RC(int_reg));
-  match(RegP);
-  match(eAXRegP);
-  match(eBXRegP);
-  match(eCXRegP);
-  match(eDIRegP);
-
-  format %{ %}
-  interface(REG_INTER);
-%}
-
-operand rRegP() %{
-  constraint(ALLOC_IN_RC(int_reg));
-  match(RegP);
-  match(eAXRegP);
-  match(eBXRegP);
-  match(eCXRegP);
-  match(eDIRegP);
-
-  format %{ %}
-  interface(REG_INTER);
-%}
-
-// On windows95, EBP is not safe to use for implicit null tests.
-operand eRegP_no_EBP() %{
-  constraint(ALLOC_IN_RC(int_reg_no_ebp));
-  match(RegP);
-  match(eAXRegP);
-  match(eBXRegP);
-  match(eCXRegP);
-  match(eDIRegP);
-
-  op_cost(100);
-  format %{ %}
-  interface(REG_INTER);
-%}
-
-operand pRegP() %{
-  constraint(ALLOC_IN_RC(p_reg));
-  match(RegP);
-  match(eBXRegP);
-  match(eDXRegP);
-  match(eSIRegP);
-  match(eDIRegP);
-
-  format %{ %}
-  interface(REG_INTER);
-%}
-
-// Special Registers
-// Return a pointer value
-operand eAXRegP(eRegP reg) %{
-  constraint(ALLOC_IN_RC(eax_reg));
-  match(reg);
-  format %{ "EAX" %}
-  interface(REG_INTER);
-%}
-
-// Used in AtomicAdd
-operand eBXRegP(eRegP reg) %{
-  constraint(ALLOC_IN_RC(ebx_reg));
-  match(reg);
-  format %{ "EBX" %}
-  interface(REG_INTER);
-%}
-
-// Tail-call (interprocedural jump) to interpreter
-operand eCXRegP(eRegP reg) %{
-  constraint(ALLOC_IN_RC(ecx_reg));
-  match(reg);
-  format %{ "ECX" %}
-  interface(REG_INTER);
-%}
-
-operand eDXRegP(eRegP reg) %{
-  constraint(ALLOC_IN_RC(edx_reg));
-  match(reg);
-  format %{ "EDX" %}
-  interface(REG_INTER);
-%}
-
-operand eSIRegP(eRegP reg) %{
-  constraint(ALLOC_IN_RC(esi_reg));
-  match(reg);
-  format %{ "ESI" %}
-  interface(REG_INTER);
-%}
-
-// Used in rep stosw
-operand eDIRegP(eRegP reg) %{
-  constraint(ALLOC_IN_RC(edi_reg));
-  match(reg);
-  format %{ "EDI" %}
-  interface(REG_INTER);
-%}
-
-operand eRegL() %{
-  constraint(ALLOC_IN_RC(long_reg));
-  match(RegL);
-  match(eADXRegL);
-
-  format %{ %}
-  interface(REG_INTER);
-%}
-
-operand eADXRegL( eRegL reg ) %{
-  constraint(ALLOC_IN_RC(eadx_reg));
-  match(reg);
-
-  format %{ "EDX:EAX" %}
-  interface(REG_INTER);
-%}
-
-operand eBCXRegL( eRegL reg ) %{
-  constraint(ALLOC_IN_RC(ebcx_reg));
-  match(reg);
-
-  format %{ "EBX:ECX" %}
-  interface(REG_INTER);
-%}
-
-operand eBDPRegL( eRegL reg ) %{
-  constraint(ALLOC_IN_RC(ebpd_reg));
-  match(reg);
-
-  format %{ "EBP:EDI" %}
-  interface(REG_INTER);
-%}
-// Special case for integer high multiply
-operand eADXRegL_low_only() %{
-  constraint(ALLOC_IN_RC(eadx_reg));
-  match(RegL);
-
-  format %{ "EAX" %}
-  interface(REG_INTER);
-%}
-
-// Flags register, used as output of compare instructions
-operand rFlagsReg() %{
-  constraint(ALLOC_IN_RC(int_flags));
-  match(RegFlags);
-
-  format %{ "EFLAGS" %}
-  interface(REG_INTER);
-%}
-
-// Flags register, used as output of compare instructions
-operand eFlagsReg() %{
-  constraint(ALLOC_IN_RC(int_flags));
-  match(RegFlags);
-
-  format %{ "EFLAGS" %}
-  interface(REG_INTER);
-%}
-
-// Flags register, used as output of FLOATING POINT compare instructions
-operand eFlagsRegU() %{
-  constraint(ALLOC_IN_RC(int_flags));
-  match(RegFlags);
-
-  format %{ "EFLAGS_U" %}
-  interface(REG_INTER);
-%}
-
-operand eFlagsRegUCF() %{
-  constraint(ALLOC_IN_RC(int_flags));
-  match(RegFlags);
-  predicate(false);
-
-  format %{ "EFLAGS_U_CF" %}
-  interface(REG_INTER);
-%}
-
-// Condition Code Register used by long compare
-operand flagsReg_long_LTGE() %{
-  constraint(ALLOC_IN_RC(int_flags));
-  match(RegFlags);
-  format %{ "FLAGS_LTGE" %}
-  interface(REG_INTER);
-%}
-operand flagsReg_long_EQNE() %{
-  constraint(ALLOC_IN_RC(int_flags));
-  match(RegFlags);
-  format %{ "FLAGS_EQNE" %}
-  interface(REG_INTER);
-%}
-operand flagsReg_long_LEGT() %{
-  constraint(ALLOC_IN_RC(int_flags));
-  match(RegFlags);
-  format %{ "FLAGS_LEGT" %}
-  interface(REG_INTER);
-%}
-
-// Condition Code Register used by unsigned long compare
-operand flagsReg_ulong_LTGE() %{
-  constraint(ALLOC_IN_RC(int_flags));
-  match(RegFlags);
-  format %{ "FLAGS_U_LTGE" %}
-  interface(REG_INTER);
-%}
-operand flagsReg_ulong_EQNE() %{
-  constraint(ALLOC_IN_RC(int_flags));
-  match(RegFlags);
-  format %{ "FLAGS_U_EQNE" %}
-  interface(REG_INTER);
-%}
-operand flagsReg_ulong_LEGT() %{
-  constraint(ALLOC_IN_RC(int_flags));
-  match(RegFlags);
-  format %{ "FLAGS_U_LEGT" %}
-  interface(REG_INTER);
-%}
-
-// Float register operands
-operand regDPR() %{
-  predicate( UseSSE < 2 );
-  constraint(ALLOC_IN_RC(fp_dbl_reg));
-  match(RegD);
-  match(regDPR1);
-  match(regDPR2);
-  format %{ %}
-  interface(REG_INTER);
-%}
-
-operand regDPR1(regDPR reg) %{
-  predicate( UseSSE < 2 );
-  constraint(ALLOC_IN_RC(fp_dbl_reg0));
-  match(reg);
-  format %{ "FPR1" %}
-  interface(REG_INTER);
-%}
-
-operand regDPR2(regDPR reg) %{
-  predicate( UseSSE < 2 );
-  constraint(ALLOC_IN_RC(fp_dbl_reg1));
-  match(reg);
-  format %{ "FPR2" %}
-  interface(REG_INTER);
-%}
-
-operand regnotDPR1(regDPR reg) %{
-  predicate( UseSSE < 2 );
-  constraint(ALLOC_IN_RC(fp_dbl_notreg0));
-  match(reg);
-  format %{ %}
-  interface(REG_INTER);
-%}
-
-// Float register operands
-operand regFPR() %{
-  predicate( UseSSE < 2 );
-  constraint(ALLOC_IN_RC(fp_flt_reg));
-  match(RegF);
-  match(regFPR1);
-  format %{ %}
-  interface(REG_INTER);
-%}
-
-// Float register operands
-operand regFPR1(regFPR reg) %{
-  predicate( UseSSE < 2 );
-  constraint(ALLOC_IN_RC(fp_flt_reg0));
-  match(reg);
-  format %{ "FPR1" %}
-  interface(REG_INTER);
-%}
-
-// XMM Float register operands
-operand regF() %{
-  predicate( UseSSE>=1 );
-  constraint(ALLOC_IN_RC(float_reg_legacy));
-  match(RegF);
-  format %{ %}
-  interface(REG_INTER);
-%}
-
-operand legRegF() %{
-  predicate( UseSSE>=1 );
-  constraint(ALLOC_IN_RC(float_reg_legacy));
-  match(RegF);
-  format %{ %}
-  interface(REG_INTER);
-%}
-
-// Float register operands
-operand vlRegF() %{
-   constraint(ALLOC_IN_RC(float_reg_vl));
-   match(RegF);
-
-   format %{ %}
-   interface(REG_INTER);
-%}
-
-// XMM Double register operands
-operand regD() %{
-  predicate( UseSSE>=2 );
-  constraint(ALLOC_IN_RC(double_reg_legacy));
-  match(RegD);
-  format %{ %}
-  interface(REG_INTER);
-%}
-
-// Double register operands
-operand legRegD() %{
-  predicate( UseSSE>=2 );
-  constraint(ALLOC_IN_RC(double_reg_legacy));
-  match(RegD);
-  format %{ %}
-  interface(REG_INTER);
-%}
-
-operand vlRegD() %{
-   constraint(ALLOC_IN_RC(double_reg_vl));
-   match(RegD);
-
-   format %{ %}
-   interface(REG_INTER);
-%}
-
-//----------Memory Operands----------------------------------------------------
-// Direct Memory Operand
-operand direct(immP addr) %{
-  match(addr);
-
-  format %{ "[$addr]" %}
-  interface(MEMORY_INTER) %{
-    base(0xFFFFFFFF);
-    index(0x4);
-    scale(0x0);
-    disp($addr);
-  %}
-%}
-
-// Indirect Memory Operand
-operand indirect(eRegP reg) %{
-  constraint(ALLOC_IN_RC(int_reg));
-  match(reg);
-
-  format %{ "[$reg]" %}
-  interface(MEMORY_INTER) %{
-    base($reg);
-    index(0x4);
-    scale(0x0);
-    disp(0x0);
-  %}
-%}
-
-// Indirect Memory Plus Short Offset Operand
-operand indOffset8(eRegP reg, immI8 off) %{
-  match(AddP reg off);
-
-  format %{ "[$reg + $off]" %}
-  interface(MEMORY_INTER) %{
-    base($reg);
-    index(0x4);
-    scale(0x0);
-    disp($off);
-  %}
-%}
-
-// Indirect Memory Plus Long Offset Operand
-operand indOffset32(eRegP reg, immI off) %{
-  match(AddP reg off);
-
-  format %{ "[$reg + $off]" %}
-  interface(MEMORY_INTER) %{
-    base($reg);
-    index(0x4);
-    scale(0x0);
-    disp($off);
-  %}
-%}
-
-// Indirect Memory Plus Long Offset Operand
-operand indOffset32X(rRegI reg, immP off) %{
-  match(AddP off reg);
-
-  format %{ "[$reg + $off]" %}
-  interface(MEMORY_INTER) %{
-    base($reg);
-    index(0x4);
-    scale(0x0);
-    disp($off);
-  %}
-%}
-
-// Indirect Memory Plus Index Register Plus Offset Operand
-operand indIndexOffset(eRegP reg, rRegI ireg, immI off) %{
-  match(AddP (AddP reg ireg) off);
-
-  op_cost(10);
-  format %{"[$reg + $off + $ireg]" %}
-  interface(MEMORY_INTER) %{
-    base($reg);
-    index($ireg);
-    scale(0x0);
-    disp($off);
-  %}
-%}
-
-// Indirect Memory Plus Index Register Plus Offset Operand
-operand indIndex(eRegP reg, rRegI ireg) %{
-  match(AddP reg ireg);
-
-  op_cost(10);
-  format %{"[$reg + $ireg]" %}
-  interface(MEMORY_INTER) %{
-    base($reg);
-    index($ireg);
-    scale(0x0);
-    disp(0x0);
-  %}
-%}
-
-// // -------------------------------------------------------------------------
-// // 486 architecture doesn't support "scale * index + offset" with out a base
-// // -------------------------------------------------------------------------
-// // Scaled Memory Operands
-// // Indirect Memory Times Scale Plus Offset Operand
-// operand indScaleOffset(immP off, rRegI ireg, immI2 scale) %{
-//   match(AddP off (LShiftI ireg scale));
-//
-//   op_cost(10);
-//   format %{"[$off + $ireg << $scale]" %}
-//   interface(MEMORY_INTER) %{
-//     base(0x4);
-//     index($ireg);
-//     scale($scale);
-//     disp($off);
-//   %}
-// %}
-
-// Indirect Memory Times Scale Plus Index Register
-operand indIndexScale(eRegP reg, rRegI ireg, immI2 scale) %{
-  match(AddP reg (LShiftI ireg scale));
-
-  op_cost(10);
-  format %{"[$reg + $ireg << $scale]" %}
-  interface(MEMORY_INTER) %{
-    base($reg);
-    index($ireg);
-    scale($scale);
-    disp(0x0);
-  %}
-%}
-
-// Indirect Memory Times Scale Plus Index Register Plus Offset Operand
-operand indIndexScaleOffset(eRegP reg, immI off, rRegI ireg, immI2 scale) %{
-  match(AddP (AddP reg (LShiftI ireg scale)) off);
-
-  op_cost(10);
-  format %{"[$reg + $off + $ireg << $scale]" %}
-  interface(MEMORY_INTER) %{
-    base($reg);
-    index($ireg);
-    scale($scale);
-    disp($off);
-  %}
-%}
-
-//----------Load Long Memory Operands------------------------------------------
-// The load-long idiom will use it's address expression again after loading
-// the first word of the long.  If the load-long destination overlaps with
-// registers used in the addressing expression, the 2nd half will be loaded
-// from a clobbered address.  Fix this by requiring that load-long use
-// address registers that do not overlap with the load-long target.
-
-// load-long support
-operand load_long_RegP() %{
-  constraint(ALLOC_IN_RC(esi_reg));
-  match(RegP);
-  match(eSIRegP);
-  op_cost(100);
-  format %{  %}
-  interface(REG_INTER);
-%}
-
-// Indirect Memory Operand Long
-operand load_long_indirect(load_long_RegP reg) %{
-  constraint(ALLOC_IN_RC(esi_reg));
-  match(reg);
-
-  format %{ "[$reg]" %}
-  interface(MEMORY_INTER) %{
-    base($reg);
-    index(0x4);
-    scale(0x0);
-    disp(0x0);
-  %}
-%}
-
-// Indirect Memory Plus Long Offset Operand
-operand load_long_indOffset32(load_long_RegP reg, immI off) %{
-  match(AddP reg off);
-
-  format %{ "[$reg + $off]" %}
-  interface(MEMORY_INTER) %{
-    base($reg);
-    index(0x4);
-    scale(0x0);
-    disp($off);
-  %}
-%}
-
-opclass load_long_memory(load_long_indirect, load_long_indOffset32);
-
-
-//----------Special Memory Operands--------------------------------------------
-// Stack Slot Operand - This operand is used for loading and storing temporary
-//                      values on the stack where a match requires a value to
-//                      flow through memory.
-operand stackSlotP(sRegP reg) %{
-  constraint(ALLOC_IN_RC(stack_slots));
-  // No match rule because this operand is only generated in matching
-  format %{ "[$reg]" %}
-  interface(MEMORY_INTER) %{
-    base(0x4);   // ESP
-    index(0x4);  // No Index
-    scale(0x0);  // No Scale
-    disp($reg);  // Stack Offset
-  %}
-%}
-
-operand stackSlotI(sRegI reg) %{
-  constraint(ALLOC_IN_RC(stack_slots));
-  // No match rule because this operand is only generated in matching
-  format %{ "[$reg]" %}
-  interface(MEMORY_INTER) %{
-    base(0x4);   // ESP
-    index(0x4);  // No Index
-    scale(0x0);  // No Scale
-    disp($reg);  // Stack Offset
-  %}
-%}
-
-operand stackSlotF(sRegF reg) %{
-  constraint(ALLOC_IN_RC(stack_slots));
-  // No match rule because this operand is only generated in matching
-  format %{ "[$reg]" %}
-  interface(MEMORY_INTER) %{
-    base(0x4);   // ESP
-    index(0x4);  // No Index
-    scale(0x0);  // No Scale
-    disp($reg);  // Stack Offset
-  %}
-%}
-
-operand stackSlotD(sRegD reg) %{
-  constraint(ALLOC_IN_RC(stack_slots));
-  // No match rule because this operand is only generated in matching
-  format %{ "[$reg]" %}
-  interface(MEMORY_INTER) %{
-    base(0x4);   // ESP
-    index(0x4);  // No Index
-    scale(0x0);  // No Scale
-    disp($reg);  // Stack Offset
-  %}
-%}
-
-operand stackSlotL(sRegL reg) %{
-  constraint(ALLOC_IN_RC(stack_slots));
-  // No match rule because this operand is only generated in matching
-  format %{ "[$reg]" %}
-  interface(MEMORY_INTER) %{
-    base(0x4);   // ESP
-    index(0x4);  // No Index
-    scale(0x0);  // No Scale
-    disp($reg);  // Stack Offset
-  %}
-%}
-
-//----------Conditional Branch Operands----------------------------------------
-// Comparison Op  - This is the operation of the comparison, and is limited to
-//                  the following set of codes:
-//                  L (<), LE (<=), G (>), GE (>=), E (==), NE (!=)
-//
-// Other attributes of the comparison, such as unsignedness, are specified
-// by the comparison instruction that sets a condition code flags register.
-// That result is represented by a flags operand whose subtype is appropriate
-// to the unsignedness (etc.) of the comparison.
-//
-// Later, the instruction which matches both the Comparison Op (a Bool) and
-// the flags (produced by the Cmp) specifies the coding of the comparison op
-// by matching a specific subtype of Bool operand below, such as cmpOpU.
-
-// Comparison Code
-operand cmpOp() %{
-  match(Bool);
-
-  format %{ "" %}
-  interface(COND_INTER) %{
-    equal(0x4, "e");
-    not_equal(0x5, "ne");
-    less(0xC, "l");
-    greater_equal(0xD, "ge");
-    less_equal(0xE, "le");
-    greater(0xF, "g");
-    overflow(0x0, "o");
-    no_overflow(0x1, "no");
-  %}
-%}
-
-// Comparison Code, unsigned compare.  Used by FP also, with
-// C2 (unordered) turned into GT or LT already.  The other bits
-// C0 and C3 are turned into Carry & Zero flags.
-operand cmpOpU() %{
-  match(Bool);
-
-  format %{ "" %}
-  interface(COND_INTER) %{
-    equal(0x4, "e");
-    not_equal(0x5, "ne");
-    less(0x2, "b");
-    greater_equal(0x3, "nb");
-    less_equal(0x6, "be");
-    greater(0x7, "nbe");
-    overflow(0x0, "o");
-    no_overflow(0x1, "no");
-  %}
-%}
-
-// Floating comparisons that don't require any fixup for the unordered case
-operand cmpOpUCF() %{
-  match(Bool);
-  predicate(n->as_Bool()->_test._test == BoolTest::lt ||
-            n->as_Bool()->_test._test == BoolTest::ge ||
-            n->as_Bool()->_test._test == BoolTest::le ||
-            n->as_Bool()->_test._test == BoolTest::gt);
-  format %{ "" %}
-  interface(COND_INTER) %{
-    equal(0x4, "e");
-    not_equal(0x5, "ne");
-    less(0x2, "b");
-    greater_equal(0x3, "nb");
-    less_equal(0x6, "be");
-    greater(0x7, "nbe");
-    overflow(0x0, "o");
-    no_overflow(0x1, "no");
-  %}
-%}
-
-
-// Floating comparisons that can be fixed up with extra conditional jumps
-operand cmpOpUCF2() %{
-  match(Bool);
-  predicate(n->as_Bool()->_test._test == BoolTest::ne ||
-            n->as_Bool()->_test._test == BoolTest::eq);
-  format %{ "" %}
-  interface(COND_INTER) %{
-    equal(0x4, "e");
-    not_equal(0x5, "ne");
-    less(0x2, "b");
-    greater_equal(0x3, "nb");
-    less_equal(0x6, "be");
-    greater(0x7, "nbe");
-    overflow(0x0, "o");
-    no_overflow(0x1, "no");
-  %}
-%}
-
-// Comparison Code for FP conditional move
-operand cmpOp_fcmov() %{
-  match(Bool);
-
-  predicate(n->as_Bool()->_test._test != BoolTest::overflow &&
-            n->as_Bool()->_test._test != BoolTest::no_overflow);
-  format %{ "" %}
-  interface(COND_INTER) %{
-    equal        (0x0C8);
-    not_equal    (0x1C8);
-    less         (0x0C0);
-    greater_equal(0x1C0);
-    less_equal   (0x0D0);
-    greater      (0x1D0);
-    overflow(0x0, "o"); // not really supported by the instruction
-    no_overflow(0x1, "no"); // not really supported by the instruction
-  %}
-%}
-
-// Comparison Code used in long compares
-operand cmpOp_commute() %{
-  match(Bool);
-
-  format %{ "" %}
-  interface(COND_INTER) %{
-    equal(0x4, "e");
-    not_equal(0x5, "ne");
-    less(0xF, "g");
-    greater_equal(0xE, "le");
-    less_equal(0xD, "ge");
-    greater(0xC, "l");
-    overflow(0x0, "o");
-    no_overflow(0x1, "no");
-  %}
-%}
-
-// Comparison Code used in unsigned long compares
-operand cmpOpU_commute() %{
-  match(Bool);
-
-  format %{ "" %}
-  interface(COND_INTER) %{
-    equal(0x4, "e");
-    not_equal(0x5, "ne");
-    less(0x7, "nbe");
-    greater_equal(0x6, "be");
-    less_equal(0x3, "nb");
-    greater(0x2, "b");
-    overflow(0x0, "o");
-    no_overflow(0x1, "no");
-  %}
-%}
-
-//----------OPERAND CLASSES----------------------------------------------------
-// Operand Classes are groups of operands that are used as to simplify
-// instruction definitions by not requiring the AD writer to specify separate
-// instructions for every form of operand when the instruction accepts
-// multiple operand types with the same basic encoding and format.  The classic
-// case of this is memory operands.
-
-opclass memory(direct, indirect, indOffset8, indOffset32, indOffset32X, indIndexOffset,
-               indIndex, indIndexScale, indIndexScaleOffset);
-
-// Long memory operations are encoded in 2 instructions and a +4 offset.
-// This means some kind of offset is always required and you cannot use
-// an oop as the offset (done when working on static globals).
-opclass long_memory(direct, indirect, indOffset8, indOffset32, indIndexOffset,
-                    indIndex, indIndexScale, indIndexScaleOffset);
-
-
-//----------PIPELINE-----------------------------------------------------------
-// Rules which define the behavior of the target architectures pipeline.
-pipeline %{
-
-//----------ATTRIBUTES---------------------------------------------------------
-attributes %{
-  variable_size_instructions;        // Fixed size instructions
-  max_instructions_per_bundle = 3;   // Up to 3 instructions per bundle
-  instruction_unit_size = 1;         // An instruction is 1 bytes long
-  instruction_fetch_unit_size = 16;  // The processor fetches one line
-  instruction_fetch_units = 1;       // of 16 bytes
-
-  // List of nop instructions
-  nops( MachNop );
-%}
-
-//----------RESOURCES----------------------------------------------------------
-// Resources are the functional units available to the machine
-
-// Generic P2/P3 pipeline
-// 3 decoders, only D0 handles big operands; a "bundle" is the limit of
-// 3 instructions decoded per cycle.
-// 2 load/store ops per cycle, 1 branch, 1 FPU,
-// 2 ALU op, only ALU0 handles mul/div instructions.
-resources( D0, D1, D2, DECODE = D0 | D1 | D2,
-           MS0, MS1, MEM = MS0 | MS1,
-           BR, FPU,
-           ALU0, ALU1, ALU = ALU0 | ALU1 );
-
-//----------PIPELINE DESCRIPTION-----------------------------------------------
-// Pipeline Description specifies the stages in the machine's pipeline
-
-// Generic P2/P3 pipeline
-pipe_desc(S0, S1, S2, S3, S4, S5);
-
-//----------PIPELINE CLASSES---------------------------------------------------
-// Pipeline Classes describe the stages in which input and output are
-// referenced by the hardware pipeline.
-
-// Naming convention: ialu or fpu
-// Then: _reg
-// Then: _reg if there is a 2nd register
-// Then: _long if it's a pair of instructions implementing a long
-// Then: _fat if it requires the big decoder
-//   Or: _mem if it requires the big decoder and a memory unit.
-
-// Integer ALU reg operation
-pipe_class ialu_reg(rRegI dst) %{
-    single_instruction;
-    dst    : S4(write);
-    dst    : S3(read);
-    DECODE : S0;        // any decoder
-    ALU    : S3;        // any alu
-%}
-
-// Long ALU reg operation
-pipe_class ialu_reg_long(eRegL dst) %{
-    instruction_count(2);
-    dst    : S4(write);
-    dst    : S3(read);
-    DECODE : S0(2);     // any 2 decoders
-    ALU    : S3(2);     // both alus
-%}
-
-// Integer ALU reg operation using big decoder
-pipe_class ialu_reg_fat(rRegI dst) %{
-    single_instruction;
-    dst    : S4(write);
-    dst    : S3(read);
-    D0     : S0;        // big decoder only
-    ALU    : S3;        // any alu
-%}
-
-// Long ALU reg operation using big decoder
-pipe_class ialu_reg_long_fat(eRegL dst) %{
-    instruction_count(2);
-    dst    : S4(write);
-    dst    : S3(read);
-    D0     : S0(2);     // big decoder only; twice
-    ALU    : S3(2);     // any 2 alus
-%}
-
-// Integer ALU reg-reg operation
-pipe_class ialu_reg_reg(rRegI dst, rRegI src) %{
-    single_instruction;
-    dst    : S4(write);
-    src    : S3(read);
-    DECODE : S0;        // any decoder
-    ALU    : S3;        // any alu
-%}
-
-// Long ALU reg-reg operation
-pipe_class ialu_reg_reg_long(eRegL dst, eRegL src) %{
-    instruction_count(2);
-    dst    : S4(write);
-    src    : S3(read);
-    DECODE : S0(2);     // any 2 decoders
-    ALU    : S3(2);     // both alus
-%}
-
-// Integer ALU reg-reg operation
-pipe_class ialu_reg_reg_fat(rRegI dst, memory src) %{
-    single_instruction;
-    dst    : S4(write);
-    src    : S3(read);
-    D0     : S0;        // big decoder only
-    ALU    : S3;        // any alu
-%}
-
-// Long ALU reg-reg operation
-pipe_class ialu_reg_reg_long_fat(eRegL dst, eRegL src) %{
-    instruction_count(2);
-    dst    : S4(write);
-    src    : S3(read);
-    D0     : S0(2);     // big decoder only; twice
-    ALU    : S3(2);     // both alus
-%}
-
-// Integer ALU reg-mem operation
-pipe_class ialu_reg_mem(rRegI dst, memory mem) %{
-    single_instruction;
-    dst    : S5(write);
-    mem    : S3(read);
-    D0     : S0;        // big decoder only
-    ALU    : S4;        // any alu
-    MEM    : S3;        // any mem
-%}
-
-// Long ALU reg-mem operation
-pipe_class ialu_reg_long_mem(eRegL dst, load_long_memory mem) %{
-    instruction_count(2);
-    dst    : S5(write);
-    mem    : S3(read);
-    D0     : S0(2);     // big decoder only; twice
-    ALU    : S4(2);     // any 2 alus
-    MEM    : S3(2);     // both mems
-%}
-
-// Integer mem operation (prefetch)
-pipe_class ialu_mem(memory mem)
-%{
-    single_instruction;
-    mem    : S3(read);
-    D0     : S0;        // big decoder only
-    MEM    : S3;        // any mem
-%}
-
-// Integer Store to Memory
-pipe_class ialu_mem_reg(memory mem, rRegI src) %{
-    single_instruction;
-    mem    : S3(read);
-    src    : S5(read);
-    D0     : S0;        // big decoder only
-    ALU    : S4;        // any alu
-    MEM    : S3;
-%}
-
-// Long Store to Memory
-pipe_class ialu_mem_long_reg(memory mem, eRegL src) %{
-    instruction_count(2);
-    mem    : S3(read);
-    src    : S5(read);
-    D0     : S0(2);     // big decoder only; twice
-    ALU    : S4(2);     // any 2 alus
-    MEM    : S3(2);     // Both mems
-%}
-
-// Integer Store to Memory
-pipe_class ialu_mem_imm(memory mem) %{
-    single_instruction;
-    mem    : S3(read);
-    D0     : S0;        // big decoder only
-    ALU    : S4;        // any alu
-    MEM    : S3;
-%}
-
-// Integer ALU0 reg-reg operation
-pipe_class ialu_reg_reg_alu0(rRegI dst, rRegI src) %{
-    single_instruction;
-    dst    : S4(write);
-    src    : S3(read);
-    D0     : S0;        // Big decoder only
-    ALU0   : S3;        // only alu0
-%}
-
-// Integer ALU0 reg-mem operation
-pipe_class ialu_reg_mem_alu0(rRegI dst, memory mem) %{
-    single_instruction;
-    dst    : S5(write);
-    mem    : S3(read);
-    D0     : S0;        // big decoder only
-    ALU0   : S4;        // ALU0 only
-    MEM    : S3;        // any mem
-%}
-
-// Integer ALU reg-reg operation
-pipe_class ialu_cr_reg_reg(eFlagsReg cr, rRegI src1, rRegI src2) %{
-    single_instruction;
-    cr     : S4(write);
-    src1   : S3(read);
-    src2   : S3(read);
-    DECODE : S0;        // any decoder
-    ALU    : S3;        // any alu
-%}
-
-// Integer ALU reg-imm operation
-pipe_class ialu_cr_reg_imm(eFlagsReg cr, rRegI src1) %{
-    single_instruction;
-    cr     : S4(write);
-    src1   : S3(read);
-    DECODE : S0;        // any decoder
-    ALU    : S3;        // any alu
-%}
-
-// Integer ALU reg-mem operation
-pipe_class ialu_cr_reg_mem(eFlagsReg cr, rRegI src1, memory src2) %{
-    single_instruction;
-    cr     : S4(write);
-    src1   : S3(read);
-    src2   : S3(read);
-    D0     : S0;        // big decoder only
-    ALU    : S4;        // any alu
-    MEM    : S3;
-%}
-
-// Conditional move reg-reg
-pipe_class pipe_cmplt( rRegI p, rRegI q, rRegI y ) %{
-    instruction_count(4);
-    y      : S4(read);
-    q      : S3(read);
-    p      : S3(read);
-    DECODE : S0(4);     // any decoder
-%}
-
-// Conditional move reg-reg
-pipe_class pipe_cmov_reg( rRegI dst, rRegI src, eFlagsReg cr ) %{
-    single_instruction;
-    dst    : S4(write);
-    src    : S3(read);
-    cr     : S3(read);
-    DECODE : S0;        // any decoder
-%}
-
-// Conditional move reg-mem
-pipe_class pipe_cmov_mem( eFlagsReg cr, rRegI dst, memory src) %{
-    single_instruction;
-    dst    : S4(write);
-    src    : S3(read);
-    cr     : S3(read);
-    DECODE : S0;        // any decoder
-    MEM    : S3;
-%}
-
-// Conditional move reg-reg long
-pipe_class pipe_cmov_reg_long( eFlagsReg cr, eRegL dst, eRegL src) %{
-    single_instruction;
-    dst    : S4(write);
-    src    : S3(read);
-    cr     : S3(read);
-    DECODE : S0(2);     // any 2 decoders
-%}
-
-// Conditional move double reg-reg
-pipe_class pipe_cmovDPR_reg( eFlagsReg cr, regDPR1 dst, regDPR src) %{
-    single_instruction;
-    dst    : S4(write);
-    src    : S3(read);
-    cr     : S3(read);
-    DECODE : S0;        // any decoder
-%}
-
-// Float reg-reg operation
-pipe_class fpu_reg(regDPR dst) %{
-    instruction_count(2);
-    dst    : S3(read);
-    DECODE : S0(2);     // any 2 decoders
-    FPU    : S3;
-%}
-
-// Float reg-reg operation
-pipe_class fpu_reg_reg(regDPR dst, regDPR src) %{
-    instruction_count(2);
-    dst    : S4(write);
-    src    : S3(read);
-    DECODE : S0(2);     // any 2 decoders
-    FPU    : S3;
-%}
-
-// Float reg-reg operation
-pipe_class fpu_reg_reg_reg(regDPR dst, regDPR src1, regDPR src2) %{
-    instruction_count(3);
-    dst    : S4(write);
-    src1   : S3(read);
-    src2   : S3(read);
-    DECODE : S0(3);     // any 3 decoders
-    FPU    : S3(2);
-%}
-
-// Float reg-reg operation
-pipe_class fpu_reg_reg_reg_reg(regDPR dst, regDPR src1, regDPR src2, regDPR src3) %{
-    instruction_count(4);
-    dst    : S4(write);
-    src1   : S3(read);
-    src2   : S3(read);
-    src3   : S3(read);
-    DECODE : S0(4);     // any 3 decoders
-    FPU    : S3(2);
-%}
-
-// Float reg-reg operation
-pipe_class fpu_reg_mem_reg_reg(regDPR dst, memory src1, regDPR src2, regDPR src3) %{
-    instruction_count(4);
-    dst    : S4(write);
-    src1   : S3(read);
-    src2   : S3(read);
-    src3   : S3(read);
-    DECODE : S1(3);     // any 3 decoders
-    D0     : S0;        // Big decoder only
-    FPU    : S3(2);
-    MEM    : S3;
-%}
-
-// Float reg-mem operation
-pipe_class fpu_reg_mem(regDPR dst, memory mem) %{
-    instruction_count(2);
-    dst    : S5(write);
-    mem    : S3(read);
-    D0     : S0;        // big decoder only
-    DECODE : S1;        // any decoder for FPU POP
-    FPU    : S4;
-    MEM    : S3;        // any mem
-%}
-
-// Float reg-mem operation
-pipe_class fpu_reg_reg_mem(regDPR dst, regDPR src1, memory mem) %{
-    instruction_count(3);
-    dst    : S5(write);
-    src1   : S3(read);
-    mem    : S3(read);
-    D0     : S0;        // big decoder only
-    DECODE : S1(2);     // any decoder for FPU POP
-    FPU    : S4;
-    MEM    : S3;        // any mem
-%}
-
-// Float mem-reg operation
-pipe_class fpu_mem_reg(memory mem, regDPR src) %{
-    instruction_count(2);
-    src    : S5(read);
-    mem    : S3(read);
-    DECODE : S0;        // any decoder for FPU PUSH
-    D0     : S1;        // big decoder only
-    FPU    : S4;
-    MEM    : S3;        // any mem
-%}
-
-pipe_class fpu_mem_reg_reg(memory mem, regDPR src1, regDPR src2) %{
-    instruction_count(3);
-    src1   : S3(read);
-    src2   : S3(read);
-    mem    : S3(read);
-    DECODE : S0(2);     // any decoder for FPU PUSH
-    D0     : S1;        // big decoder only
-    FPU    : S4;
-    MEM    : S3;        // any mem
-%}
-
-pipe_class fpu_mem_reg_mem(memory mem, regDPR src1, memory src2) %{
-    instruction_count(3);
-    src1   : S3(read);
-    src2   : S3(read);
-    mem    : S4(read);
-    DECODE : S0;        // any decoder for FPU PUSH
-    D0     : S0(2);     // big decoder only
-    FPU    : S4;
-    MEM    : S3(2);     // any mem
-%}
-
-pipe_class fpu_mem_mem(memory dst, memory src1) %{
-    instruction_count(2);
-    src1   : S3(read);
-    dst    : S4(read);
-    D0     : S0(2);     // big decoder only
-    MEM    : S3(2);     // any mem
-%}
-
-pipe_class fpu_mem_mem_mem(memory dst, memory src1, memory src2) %{
-    instruction_count(3);
-    src1   : S3(read);
-    src2   : S3(read);
-    dst    : S4(read);
-    D0     : S0(3);     // big decoder only
-    FPU    : S4;
-    MEM    : S3(3);     // any mem
-%}
-
-pipe_class fpu_mem_reg_con(memory mem, regDPR src1) %{
-    instruction_count(3);
-    src1   : S4(read);
-    mem    : S4(read);
-    DECODE : S0;        // any decoder for FPU PUSH
-    D0     : S0(2);     // big decoder only
-    FPU    : S4;
-    MEM    : S3(2);     // any mem
-%}
-
-// Float load constant
-pipe_class fpu_reg_con(regDPR dst) %{
-    instruction_count(2);
-    dst    : S5(write);
-    D0     : S0;        // big decoder only for the load
-    DECODE : S1;        // any decoder for FPU POP
-    FPU    : S4;
-    MEM    : S3;        // any mem
-%}
-
-// Float load constant
-pipe_class fpu_reg_reg_con(regDPR dst, regDPR src) %{
-    instruction_count(3);
-    dst    : S5(write);
-    src    : S3(read);
-    D0     : S0;        // big decoder only for the load
-    DECODE : S1(2);     // any decoder for FPU POP
-    FPU    : S4;
-    MEM    : S3;        // any mem
-%}
-
-// UnConditional branch
-pipe_class pipe_jmp( label labl ) %{
-    single_instruction;
-    BR   : S3;
-%}
-
-// Conditional branch
-pipe_class pipe_jcc( cmpOp cmp, eFlagsReg cr, label labl ) %{
-    single_instruction;
-    cr    : S1(read);
-    BR    : S3;
-%}
-
-// Allocation idiom
-pipe_class pipe_cmpxchg( eRegP dst, eRegP heap_ptr ) %{
-    instruction_count(1); force_serialization;
-    fixed_latency(6);
-    heap_ptr : S3(read);
-    DECODE   : S0(3);
-    D0       : S2;
-    MEM      : S3;
-    ALU      : S3(2);
-    dst      : S5(write);
-    BR       : S5;
-%}
-
-// Generic big/slow expanded idiom
-pipe_class pipe_slow(  ) %{
-    instruction_count(10); multiple_bundles; force_serialization;
-    fixed_latency(100);
-    D0  : S0(2);
-    MEM : S3(2);
-%}
-
-// The real do-nothing guy
-pipe_class empty( ) %{
-    instruction_count(0);
-%}
-
-// Define the class for the Nop node
-define %{
-   MachNop = empty;
-%}
-
-%}
-
-//----------INSTRUCTIONS-------------------------------------------------------
-//
-// match      -- States which machine-independent subtree may be replaced
-//               by this instruction.
-// ins_cost   -- The estimated cost of this instruction is used by instruction
-//               selection to identify a minimum cost tree of machine
-//               instructions that matches a tree of machine-independent
-//               instructions.
-// format     -- A string providing the disassembly for this instruction.
-//               The value of an instruction's operand may be inserted
-//               by referring to it with a '$' prefix.
-// opcode     -- Three instruction opcodes may be provided.  These are referred
-//               to within an encode class as $primary, $secondary, and $tertiary
-//               respectively.  The primary opcode is commonly used to
-//               indicate the type of machine instruction, while secondary
-//               and tertiary are often used for prefix options or addressing
-//               modes.
-// ins_encode -- A list of encode classes with parameters. The encode class
-//               name must have been defined in an 'enc_class' specification
-//               in the encode section of the architecture description.
-
-// Dummy reg-to-reg vector moves. Removed during post-selection cleanup.
-// Load Float
-instruct MoveF2LEG(legRegF dst, regF src) %{
-  match(Set dst src);
-  format %{ "movss $dst,$src\t# if src != dst load float (4 bytes)" %}
-  ins_encode %{
-    ShouldNotReachHere();
-  %}
-  ins_pipe( fpu_reg_reg );
-%}
-
-// Load Float
-instruct MoveLEG2F(regF dst, legRegF src) %{
-  match(Set dst src);
-  format %{ "movss $dst,$src\t# if src != dst load float (4 bytes)" %}
-  ins_encode %{
-    ShouldNotReachHere();
-  %}
-  ins_pipe( fpu_reg_reg );
-%}
-
-// Load Float
-instruct MoveF2VL(vlRegF dst, regF src) %{
-  match(Set dst src);
-  format %{ "movss $dst,$src\t! load float (4 bytes)" %}
-  ins_encode %{
-    ShouldNotReachHere();
-  %}
-  ins_pipe( fpu_reg_reg );
-%}
-
-// Load Float
-instruct MoveVL2F(regF dst, vlRegF src) %{
-  match(Set dst src);
-  format %{ "movss $dst,$src\t! load float (4 bytes)" %}
-  ins_encode %{
-    ShouldNotReachHere();
-  %}
-  ins_pipe( fpu_reg_reg );
-%}
-
-
-
-// Load Double
-instruct MoveD2LEG(legRegD dst, regD src) %{
-  match(Set dst src);
-  format %{ "movsd $dst,$src\t# if src != dst load double (8 bytes)" %}
-  ins_encode %{
-    ShouldNotReachHere();
-  %}
-  ins_pipe( fpu_reg_reg );
-%}
-
-// Load Double
-instruct MoveLEG2D(regD dst, legRegD src) %{
-  match(Set dst src);
-  format %{ "movsd $dst,$src\t# if src != dst load double (8 bytes)" %}
-  ins_encode %{
-    ShouldNotReachHere();
-  %}
-  ins_pipe( fpu_reg_reg );
-%}
-
-// Load Double
-instruct MoveD2VL(vlRegD dst, regD src) %{
-  match(Set dst src);
-  format %{ "movsd $dst,$src\t! load double (8 bytes)" %}
-  ins_encode %{
-    ShouldNotReachHere();
-  %}
-  ins_pipe( fpu_reg_reg );
-%}
-
-// Load Double
-instruct MoveVL2D(regD dst, vlRegD src) %{
-  match(Set dst src);
-  format %{ "movsd $dst,$src\t! load double (8 bytes)" %}
-  ins_encode %{
-    ShouldNotReachHere();
-  %}
-  ins_pipe( fpu_reg_reg );
-%}
-
-//----------BSWAP-Instruction--------------------------------------------------
-instruct bytes_reverse_int(rRegI dst) %{
-  match(Set dst (ReverseBytesI dst));
-
-  format %{ "BSWAP  $dst" %}
-  opcode(0x0F, 0xC8);
-  ins_encode( OpcP, OpcSReg(dst) );
-  ins_pipe( ialu_reg );
-%}
-
-instruct bytes_reverse_long(eRegL dst) %{
-  match(Set dst (ReverseBytesL dst));
-
-  format %{ "BSWAP  $dst.lo\n\t"
-            "BSWAP  $dst.hi\n\t"
-            "XCHG   $dst.lo $dst.hi" %}
-
-  ins_cost(125);
-  ins_encode( bswap_long_bytes(dst) );
-  ins_pipe( ialu_reg_reg);
-%}
-
-instruct bytes_reverse_unsigned_short(rRegI dst, eFlagsReg cr) %{
-  match(Set dst (ReverseBytesUS dst));
-  effect(KILL cr);
-
-  format %{ "BSWAP  $dst\n\t"
-            "SHR    $dst,16\n\t" %}
-  ins_encode %{
-    __ bswapl($dst$$Register);
-    __ shrl($dst$$Register, 16);
-  %}
-  ins_pipe( ialu_reg );
-%}
-
-instruct bytes_reverse_short(rRegI dst, eFlagsReg cr) %{
-  match(Set dst (ReverseBytesS dst));
-  effect(KILL cr);
-
-  format %{ "BSWAP  $dst\n\t"
-            "SAR    $dst,16\n\t" %}
-  ins_encode %{
-    __ bswapl($dst$$Register);
-    __ sarl($dst$$Register, 16);
-  %}
-  ins_pipe( ialu_reg );
-%}
-
-
-//---------- Zeros Count Instructions ------------------------------------------
-
-instruct countLeadingZerosI(rRegI dst, rRegI src, eFlagsReg cr) %{
-  predicate(UseCountLeadingZerosInstruction);
-  match(Set dst (CountLeadingZerosI src));
-  effect(KILL cr);
-
-  format %{ "LZCNT  $dst, $src\t# count leading zeros (int)" %}
-  ins_encode %{
-    __ lzcntl($dst$$Register, $src$$Register);
-  %}
-  ins_pipe(ialu_reg);
-%}
-
-instruct countLeadingZerosI_bsr(rRegI dst, rRegI src, eFlagsReg cr) %{
-  predicate(!UseCountLeadingZerosInstruction);
-  match(Set dst (CountLeadingZerosI src));
-  effect(KILL cr);
-
-  format %{ "BSR    $dst, $src\t# count leading zeros (int)\n\t"
-            "JNZ    skip\n\t"
-            "MOV    $dst, -1\n"
-      "skip:\n\t"
-            "NEG    $dst\n\t"
-            "ADD    $dst, 31" %}
-  ins_encode %{
-    Register Rdst = $dst$$Register;
-    Register Rsrc = $src$$Register;
-    Label skip;
-    __ bsrl(Rdst, Rsrc);
-    __ jccb(Assembler::notZero, skip);
-    __ movl(Rdst, -1);
-    __ bind(skip);
-    __ negl(Rdst);
-    __ addl(Rdst, BitsPerInt - 1);
-  %}
-  ins_pipe(ialu_reg);
-%}
-
-instruct countLeadingZerosL(rRegI dst, eRegL src, eFlagsReg cr) %{
-  predicate(UseCountLeadingZerosInstruction);
-  match(Set dst (CountLeadingZerosL src));
-  effect(TEMP dst, KILL cr);
-
-  format %{ "LZCNT  $dst, $src.hi\t# count leading zeros (long)\n\t"
-            "JNC    done\n\t"
-            "LZCNT  $dst, $src.lo\n\t"
-            "ADD    $dst, 32\n"
-      "done:" %}
-  ins_encode %{
-    Register Rdst = $dst$$Register;
-    Register Rsrc = $src$$Register;
-    Label done;
-    __ lzcntl(Rdst, HIGH_FROM_LOW(Rsrc));
-    __ jccb(Assembler::carryClear, done);
-    __ lzcntl(Rdst, Rsrc);
-    __ addl(Rdst, BitsPerInt);
-    __ bind(done);
-  %}
-  ins_pipe(ialu_reg);
-%}
-
-instruct countLeadingZerosL_bsr(rRegI dst, eRegL src, eFlagsReg cr) %{
-  predicate(!UseCountLeadingZerosInstruction);
-  match(Set dst (CountLeadingZerosL src));
-  effect(TEMP dst, KILL cr);
-
-  format %{ "BSR    $dst, $src.hi\t# count leading zeros (long)\n\t"
-            "JZ     msw_is_zero\n\t"
-            "ADD    $dst, 32\n\t"
-            "JMP    not_zero\n"
-      "msw_is_zero:\n\t"
-            "BSR    $dst, $src.lo\n\t"
-            "JNZ    not_zero\n\t"
-            "MOV    $dst, -1\n"
-      "not_zero:\n\t"
-            "NEG    $dst\n\t"
-            "ADD    $dst, 63\n" %}
- ins_encode %{
-    Register Rdst = $dst$$Register;
-    Register Rsrc = $src$$Register;
-    Label msw_is_zero;
-    Label not_zero;
-    __ bsrl(Rdst, HIGH_FROM_LOW(Rsrc));
-    __ jccb(Assembler::zero, msw_is_zero);
-    __ addl(Rdst, BitsPerInt);
-    __ jmpb(not_zero);
-    __ bind(msw_is_zero);
-    __ bsrl(Rdst, Rsrc);
-    __ jccb(Assembler::notZero, not_zero);
-    __ movl(Rdst, -1);
-    __ bind(not_zero);
-    __ negl(Rdst);
-    __ addl(Rdst, BitsPerLong - 1);
-  %}
-  ins_pipe(ialu_reg);
-%}
-
-instruct countTrailingZerosI(rRegI dst, rRegI src, eFlagsReg cr) %{
-  predicate(UseCountTrailingZerosInstruction);
-  match(Set dst (CountTrailingZerosI src));
-  effect(KILL cr);
-
-  format %{ "TZCNT    $dst, $src\t# count trailing zeros (int)" %}
-  ins_encode %{
-    __ tzcntl($dst$$Register, $src$$Register);
-  %}
-  ins_pipe(ialu_reg);
-%}
-
-instruct countTrailingZerosI_bsf(rRegI dst, rRegI src, eFlagsReg cr) %{
-  predicate(!UseCountTrailingZerosInstruction);
-  match(Set dst (CountTrailingZerosI src));
-  effect(KILL cr);
-
-  format %{ "BSF    $dst, $src\t# count trailing zeros (int)\n\t"
-            "JNZ    done\n\t"
-            "MOV    $dst, 32\n"
-      "done:" %}
-  ins_encode %{
-    Register Rdst = $dst$$Register;
-    Label done;
-    __ bsfl(Rdst, $src$$Register);
-    __ jccb(Assembler::notZero, done);
-    __ movl(Rdst, BitsPerInt);
-    __ bind(done);
-  %}
-  ins_pipe(ialu_reg);
-%}
-
-instruct countTrailingZerosL(rRegI dst, eRegL src, eFlagsReg cr) %{
-  predicate(UseCountTrailingZerosInstruction);
-  match(Set dst (CountTrailingZerosL src));
-  effect(TEMP dst, KILL cr);
-
-  format %{ "TZCNT  $dst, $src.lo\t# count trailing zeros (long) \n\t"
-            "JNC    done\n\t"
-            "TZCNT  $dst, $src.hi\n\t"
-            "ADD    $dst, 32\n"
-            "done:" %}
-  ins_encode %{
-    Register Rdst = $dst$$Register;
-    Register Rsrc = $src$$Register;
-    Label done;
-    __ tzcntl(Rdst, Rsrc);
-    __ jccb(Assembler::carryClear, done);
-    __ tzcntl(Rdst, HIGH_FROM_LOW(Rsrc));
-    __ addl(Rdst, BitsPerInt);
-    __ bind(done);
-  %}
-  ins_pipe(ialu_reg);
-%}
-
-instruct countTrailingZerosL_bsf(rRegI dst, eRegL src, eFlagsReg cr) %{
-  predicate(!UseCountTrailingZerosInstruction);
-  match(Set dst (CountTrailingZerosL src));
-  effect(TEMP dst, KILL cr);
-
-  format %{ "BSF    $dst, $src.lo\t# count trailing zeros (long)\n\t"
-            "JNZ    done\n\t"
-            "BSF    $dst, $src.hi\n\t"
-            "JNZ    msw_not_zero\n\t"
-            "MOV    $dst, 32\n"
-      "msw_not_zero:\n\t"
-            "ADD    $dst, 32\n"
-      "done:" %}
-  ins_encode %{
-    Register Rdst = $dst$$Register;
-    Register Rsrc = $src$$Register;
-    Label msw_not_zero;
-    Label done;
-    __ bsfl(Rdst, Rsrc);
-    __ jccb(Assembler::notZero, done);
-    __ bsfl(Rdst, HIGH_FROM_LOW(Rsrc));
-    __ jccb(Assembler::notZero, msw_not_zero);
-    __ movl(Rdst, BitsPerInt);
-    __ bind(msw_not_zero);
-    __ addl(Rdst, BitsPerInt);
-    __ bind(done);
-  %}
-  ins_pipe(ialu_reg);
-%}
-
-
-//---------- Population Count Instructions -------------------------------------
-
-instruct popCountI(rRegI dst, rRegI src, eFlagsReg cr) %{
-  predicate(UsePopCountInstruction);
-  match(Set dst (PopCountI src));
-  effect(KILL cr);
-
-  format %{ "POPCNT $dst, $src" %}
-  ins_encode %{
-    __ popcntl($dst$$Register, $src$$Register);
-  %}
-  ins_pipe(ialu_reg);
-%}
-
-instruct popCountI_mem(rRegI dst, memory mem, eFlagsReg cr) %{
-  predicate(UsePopCountInstruction);
-  match(Set dst (PopCountI (LoadI mem)));
-  effect(KILL cr);
-
-  format %{ "POPCNT $dst, $mem" %}
-  ins_encode %{
-    __ popcntl($dst$$Register, $mem$$Address);
-  %}
-  ins_pipe(ialu_reg);
-%}
-
-// Note: Long.bitCount(long) returns an int.
-instruct popCountL(rRegI dst, eRegL src, rRegI tmp, eFlagsReg cr) %{
-  predicate(UsePopCountInstruction);
-  match(Set dst (PopCountL src));
-  effect(KILL cr, TEMP tmp, TEMP dst);
-
-  format %{ "POPCNT $dst, $src.lo\n\t"
-            "POPCNT $tmp, $src.hi\n\t"
-            "ADD    $dst, $tmp" %}
-  ins_encode %{
-    __ popcntl($dst$$Register, $src$$Register);
-    __ popcntl($tmp$$Register, HIGH_FROM_LOW($src$$Register));
-    __ addl($dst$$Register, $tmp$$Register);
-  %}
-  ins_pipe(ialu_reg);
-%}
-
-// Note: Long.bitCount(long) returns an int.
-instruct popCountL_mem(rRegI dst, memory mem, rRegI tmp, eFlagsReg cr) %{
-  predicate(UsePopCountInstruction);
-  match(Set dst (PopCountL (LoadL mem)));
-  effect(KILL cr, TEMP tmp, TEMP dst);
-
-  format %{ "POPCNT $dst, $mem\n\t"
-            "POPCNT $tmp, $mem+4\n\t"
-            "ADD    $dst, $tmp" %}
-  ins_encode %{
-    //__ popcntl($dst$$Register, $mem$$Address$$first);
-    //__ popcntl($tmp$$Register, $mem$$Address$$second);
-    __ popcntl($dst$$Register, Address::make_raw($mem$$base, $mem$$index, $mem$$scale, $mem$$disp, relocInfo::none));
-    __ popcntl($tmp$$Register, Address::make_raw($mem$$base, $mem$$index, $mem$$scale, $mem$$disp + 4, relocInfo::none));
-    __ addl($dst$$Register, $tmp$$Register);
-  %}
-  ins_pipe(ialu_reg);
-%}
-
-
-//----------Load/Store/Move Instructions---------------------------------------
-//----------Load Instructions--------------------------------------------------
-// Load Byte (8bit signed)
-instruct loadB(xRegI dst, memory mem) %{
-  match(Set dst (LoadB mem));
-
-  ins_cost(125);
-  format %{ "MOVSX8 $dst,$mem\t# byte" %}
-
-  ins_encode %{
-    __ movsbl($dst$$Register, $mem$$Address);
-  %}
-
-  ins_pipe(ialu_reg_mem);
-%}
-
-// Load Byte (8bit signed) into Long Register
-instruct loadB2L(eRegL dst, memory mem, eFlagsReg cr) %{
-  match(Set dst (ConvI2L (LoadB mem)));
-  effect(KILL cr);
-
-  ins_cost(375);
-  format %{ "MOVSX8 $dst.lo,$mem\t# byte -> long\n\t"
-            "MOV    $dst.hi,$dst.lo\n\t"
-            "SAR    $dst.hi,7" %}
-
-  ins_encode %{
-    __ movsbl($dst$$Register, $mem$$Address);
-    __ movl(HIGH_FROM_LOW($dst$$Register), $dst$$Register); // This is always a different register.
-    __ sarl(HIGH_FROM_LOW($dst$$Register), 7); // 24+1 MSB are already signed extended.
-  %}
-
-  ins_pipe(ialu_reg_mem);
-%}
-
-// Load Unsigned Byte (8bit UNsigned)
-instruct loadUB(xRegI dst, memory mem) %{
-  match(Set dst (LoadUB mem));
-
-  ins_cost(125);
-  format %{ "MOVZX8 $dst,$mem\t# ubyte -> int" %}
-
-  ins_encode %{
-    __ movzbl($dst$$Register, $mem$$Address);
-  %}
-
-  ins_pipe(ialu_reg_mem);
-%}
-
-// Load Unsigned Byte (8 bit UNsigned) into Long Register
-instruct loadUB2L(eRegL dst, memory mem, eFlagsReg cr) %{
-  match(Set dst (ConvI2L (LoadUB mem)));
-  effect(KILL cr);
-
-  ins_cost(250);
-  format %{ "MOVZX8 $dst.lo,$mem\t# ubyte -> long\n\t"
-            "XOR    $dst.hi,$dst.hi" %}
-
-  ins_encode %{
-    Register Rdst = $dst$$Register;
-    __ movzbl(Rdst, $mem$$Address);
-    __ xorl(HIGH_FROM_LOW(Rdst), HIGH_FROM_LOW(Rdst));
-  %}
-
-  ins_pipe(ialu_reg_mem);
-%}
-
-// Load Unsigned Byte (8 bit UNsigned) with mask into Long Register
-instruct loadUB2L_immI(eRegL dst, memory mem, immI mask, eFlagsReg cr) %{
-  match(Set dst (ConvI2L (AndI (LoadUB mem) mask)));
-  effect(KILL cr);
-
-  format %{ "MOVZX8 $dst.lo,$mem\t# ubyte & 32-bit mask -> long\n\t"
-            "XOR    $dst.hi,$dst.hi\n\t"
-            "AND    $dst.lo,right_n_bits($mask, 8)" %}
-  ins_encode %{
-    Register Rdst = $dst$$Register;
-    __ movzbl(Rdst, $mem$$Address);
-    __ xorl(HIGH_FROM_LOW(Rdst), HIGH_FROM_LOW(Rdst));
-    __ andl(Rdst, $mask$$constant & right_n_bits(8));
-  %}
-  ins_pipe(ialu_reg_mem);
-%}
-
-// Load Short (16bit signed)
-instruct loadS(rRegI dst, memory mem) %{
-  match(Set dst (LoadS mem));
-
-  ins_cost(125);
-  format %{ "MOVSX  $dst,$mem\t# short" %}
-
-  ins_encode %{
-    __ movswl($dst$$Register, $mem$$Address);
-  %}
-
-  ins_pipe(ialu_reg_mem);
-%}
-
-// Load Short (16 bit signed) to Byte (8 bit signed)
-instruct loadS2B(rRegI dst, memory mem, immI_24 twentyfour) %{
-  match(Set dst (RShiftI (LShiftI (LoadS mem) twentyfour) twentyfour));
-
-  ins_cost(125);
-  format %{ "MOVSX  $dst, $mem\t# short -> byte" %}
-  ins_encode %{
-    __ movsbl($dst$$Register, $mem$$Address);
-  %}
-  ins_pipe(ialu_reg_mem);
-%}
-
-// Load Short (16bit signed) into Long Register
-instruct loadS2L(eRegL dst, memory mem, eFlagsReg cr) %{
-  match(Set dst (ConvI2L (LoadS mem)));
-  effect(KILL cr);
-
-  ins_cost(375);
-  format %{ "MOVSX  $dst.lo,$mem\t# short -> long\n\t"
-            "MOV    $dst.hi,$dst.lo\n\t"
-            "SAR    $dst.hi,15" %}
-
-  ins_encode %{
-    __ movswl($dst$$Register, $mem$$Address);
-    __ movl(HIGH_FROM_LOW($dst$$Register), $dst$$Register); // This is always a different register.
-    __ sarl(HIGH_FROM_LOW($dst$$Register), 15); // 16+1 MSB are already signed extended.
-  %}
-
-  ins_pipe(ialu_reg_mem);
-%}
-
-// Load Unsigned Short/Char (16bit unsigned)
-instruct loadUS(rRegI dst, memory mem) %{
-  match(Set dst (LoadUS mem));
-
-  ins_cost(125);
-  format %{ "MOVZX  $dst,$mem\t# ushort/char -> int" %}
-
-  ins_encode %{
-    __ movzwl($dst$$Register, $mem$$Address);
-  %}
-
-  ins_pipe(ialu_reg_mem);
-%}
-
-// Load Unsigned Short/Char (16 bit UNsigned) to Byte (8 bit signed)
-instruct loadUS2B(rRegI dst, memory mem, immI_24 twentyfour) %{
-  match(Set dst (RShiftI (LShiftI (LoadUS mem) twentyfour) twentyfour));
-
-  ins_cost(125);
-  format %{ "MOVSX  $dst, $mem\t# ushort -> byte" %}
-  ins_encode %{
-    __ movsbl($dst$$Register, $mem$$Address);
-  %}
-  ins_pipe(ialu_reg_mem);
-%}
-
-// Load Unsigned Short/Char (16 bit UNsigned) into Long Register
-instruct loadUS2L(eRegL dst, memory mem, eFlagsReg cr) %{
-  match(Set dst (ConvI2L (LoadUS mem)));
-  effect(KILL cr);
-
-  ins_cost(250);
-  format %{ "MOVZX  $dst.lo,$mem\t# ushort/char -> long\n\t"
-            "XOR    $dst.hi,$dst.hi" %}
-
-  ins_encode %{
-    __ movzwl($dst$$Register, $mem$$Address);
-    __ xorl(HIGH_FROM_LOW($dst$$Register), HIGH_FROM_LOW($dst$$Register));
-  %}
-
-  ins_pipe(ialu_reg_mem);
-%}
-
-// Load Unsigned Short/Char (16 bit UNsigned) with mask 0xFF into Long Register
-instruct loadUS2L_immI_255(eRegL dst, memory mem, immI_255 mask, eFlagsReg cr) %{
-  match(Set dst (ConvI2L (AndI (LoadUS mem) mask)));
-  effect(KILL cr);
-
-  format %{ "MOVZX8 $dst.lo,$mem\t# ushort/char & 0xFF -> long\n\t"
-            "XOR    $dst.hi,$dst.hi" %}
-  ins_encode %{
-    Register Rdst = $dst$$Register;
-    __ movzbl(Rdst, $mem$$Address);
-    __ xorl(HIGH_FROM_LOW(Rdst), HIGH_FROM_LOW(Rdst));
-  %}
-  ins_pipe(ialu_reg_mem);
-%}
-
-// Load Unsigned Short/Char (16 bit UNsigned) with a 32-bit mask into Long Register
-instruct loadUS2L_immI(eRegL dst, memory mem, immI mask, eFlagsReg cr) %{
-  match(Set dst (ConvI2L (AndI (LoadUS mem) mask)));
-  effect(KILL cr);
-
-  format %{ "MOVZX  $dst.lo, $mem\t# ushort/char & 32-bit mask -> long\n\t"
-            "XOR    $dst.hi,$dst.hi\n\t"
-            "AND    $dst.lo,right_n_bits($mask, 16)" %}
-  ins_encode %{
-    Register Rdst = $dst$$Register;
-    __ movzwl(Rdst, $mem$$Address);
-    __ xorl(HIGH_FROM_LOW(Rdst), HIGH_FROM_LOW(Rdst));
-    __ andl(Rdst, $mask$$constant & right_n_bits(16));
-  %}
-  ins_pipe(ialu_reg_mem);
-%}
-
-// Load Integer
-instruct loadI(rRegI dst, memory mem) %{
-  match(Set dst (LoadI mem));
-
-  ins_cost(125);
-  format %{ "MOV    $dst,$mem\t# int" %}
-
-  ins_encode %{
-    __ movl($dst$$Register, $mem$$Address);
-  %}
-
-  ins_pipe(ialu_reg_mem);
-%}
-
-// Load Integer (32 bit signed) to Byte (8 bit signed)
-instruct loadI2B(rRegI dst, memory mem, immI_24 twentyfour) %{
-  match(Set dst (RShiftI (LShiftI (LoadI mem) twentyfour) twentyfour));
-
-  ins_cost(125);
-  format %{ "MOVSX  $dst, $mem\t# int -> byte" %}
-  ins_encode %{
-    __ movsbl($dst$$Register, $mem$$Address);
-  %}
-  ins_pipe(ialu_reg_mem);
-%}
-
-// Load Integer (32 bit signed) to Unsigned Byte (8 bit UNsigned)
-instruct loadI2UB(rRegI dst, memory mem, immI_255 mask) %{
-  match(Set dst (AndI (LoadI mem) mask));
-
-  ins_cost(125);
-  format %{ "MOVZX  $dst, $mem\t# int -> ubyte" %}
-  ins_encode %{
-    __ movzbl($dst$$Register, $mem$$Address);
-  %}
-  ins_pipe(ialu_reg_mem);
-%}
-
-// Load Integer (32 bit signed) to Short (16 bit signed)
-instruct loadI2S(rRegI dst, memory mem, immI_16 sixteen) %{
-  match(Set dst (RShiftI (LShiftI (LoadI mem) sixteen) sixteen));
-
-  ins_cost(125);
-  format %{ "MOVSX  $dst, $mem\t# int -> short" %}
-  ins_encode %{
-    __ movswl($dst$$Register, $mem$$Address);
-  %}
-  ins_pipe(ialu_reg_mem);
-%}
-
-// Load Integer (32 bit signed) to Unsigned Short/Char (16 bit UNsigned)
-instruct loadI2US(rRegI dst, memory mem, immI_65535 mask) %{
-  match(Set dst (AndI (LoadI mem) mask));
-
-  ins_cost(125);
-  format %{ "MOVZX  $dst, $mem\t# int -> ushort/char" %}
-  ins_encode %{
-    __ movzwl($dst$$Register, $mem$$Address);
-  %}
-  ins_pipe(ialu_reg_mem);
-%}
-
-// Load Integer into Long Register
-instruct loadI2L(eRegL dst, memory mem, eFlagsReg cr) %{
-  match(Set dst (ConvI2L (LoadI mem)));
-  effect(KILL cr);
-
-  ins_cost(375);
-  format %{ "MOV    $dst.lo,$mem\t# int -> long\n\t"
-            "MOV    $dst.hi,$dst.lo\n\t"
-            "SAR    $dst.hi,31" %}
-
-  ins_encode %{
-    __ movl($dst$$Register, $mem$$Address);
-    __ movl(HIGH_FROM_LOW($dst$$Register), $dst$$Register); // This is always a different register.
-    __ sarl(HIGH_FROM_LOW($dst$$Register), 31);
-  %}
-
-  ins_pipe(ialu_reg_mem);
-%}
-
-// Load Integer with mask 0xFF into Long Register
-instruct loadI2L_immI_255(eRegL dst, memory mem, immI_255 mask, eFlagsReg cr) %{
-  match(Set dst (ConvI2L (AndI (LoadI mem) mask)));
-  effect(KILL cr);
-
-  format %{ "MOVZX8 $dst.lo,$mem\t# int & 0xFF -> long\n\t"
-            "XOR    $dst.hi,$dst.hi" %}
-  ins_encode %{
-    Register Rdst = $dst$$Register;
-    __ movzbl(Rdst, $mem$$Address);
-    __ xorl(HIGH_FROM_LOW(Rdst), HIGH_FROM_LOW(Rdst));
-  %}
-  ins_pipe(ialu_reg_mem);
-%}
-
-// Load Integer with mask 0xFFFF into Long Register
-instruct loadI2L_immI_65535(eRegL dst, memory mem, immI_65535 mask, eFlagsReg cr) %{
-  match(Set dst (ConvI2L (AndI (LoadI mem) mask)));
-  effect(KILL cr);
-
-  format %{ "MOVZX  $dst.lo,$mem\t# int & 0xFFFF -> long\n\t"
-            "XOR    $dst.hi,$dst.hi" %}
-  ins_encode %{
-    Register Rdst = $dst$$Register;
-    __ movzwl(Rdst, $mem$$Address);
-    __ xorl(HIGH_FROM_LOW(Rdst), HIGH_FROM_LOW(Rdst));
-  %}
-  ins_pipe(ialu_reg_mem);
-%}
-
-// Load Integer with 31-bit mask into Long Register
-instruct loadI2L_immU31(eRegL dst, memory mem, immU31 mask, eFlagsReg cr) %{
-  match(Set dst (ConvI2L (AndI (LoadI mem) mask)));
-  effect(KILL cr);
-
-  format %{ "MOV    $dst.lo,$mem\t# int & 31-bit mask -> long\n\t"
-            "XOR    $dst.hi,$dst.hi\n\t"
-            "AND    $dst.lo,$mask" %}
-  ins_encode %{
-    Register Rdst = $dst$$Register;
-    __ movl(Rdst, $mem$$Address);
-    __ xorl(HIGH_FROM_LOW(Rdst), HIGH_FROM_LOW(Rdst));
-    __ andl(Rdst, $mask$$constant);
-  %}
-  ins_pipe(ialu_reg_mem);
-%}
-
-// Load Unsigned Integer into Long Register
-instruct loadUI2L(eRegL dst, memory mem, immL_32bits mask, eFlagsReg cr) %{
-  match(Set dst (AndL (ConvI2L (LoadI mem)) mask));
-  effect(KILL cr);
-
-  ins_cost(250);
-  format %{ "MOV    $dst.lo,$mem\t# uint -> long\n\t"
-            "XOR    $dst.hi,$dst.hi" %}
-
-  ins_encode %{
-    __ movl($dst$$Register, $mem$$Address);
-    __ xorl(HIGH_FROM_LOW($dst$$Register), HIGH_FROM_LOW($dst$$Register));
-  %}
-
-  ins_pipe(ialu_reg_mem);
-%}
-
-// Load Long.  Cannot clobber address while loading, so restrict address
-// register to ESI
-instruct loadL(eRegL dst, load_long_memory mem) %{
-  predicate(!((LoadLNode*)n)->require_atomic_access());
-  match(Set dst (LoadL mem));
-
-  ins_cost(250);
-  format %{ "MOV    $dst.lo,$mem\t# long\n\t"
-            "MOV    $dst.hi,$mem+4" %}
-
-  ins_encode %{
-    Address Amemlo = Address::make_raw($mem$$base, $mem$$index, $mem$$scale, $mem$$disp, relocInfo::none);
-    Address Amemhi = Address::make_raw($mem$$base, $mem$$index, $mem$$scale, $mem$$disp + 4, relocInfo::none);
-    __ movl($dst$$Register, Amemlo);
-    __ movl(HIGH_FROM_LOW($dst$$Register), Amemhi);
-  %}
-
-  ins_pipe(ialu_reg_long_mem);
-%}
-
-// Volatile Load Long.  Must be atomic, so do 64-bit FILD
-// then store it down to the stack and reload on the int
-// side.
-instruct loadL_volatile(stackSlotL dst, memory mem) %{
-  predicate(UseSSE<=1 && ((LoadLNode*)n)->require_atomic_access());
-  match(Set dst (LoadL mem));
-
-  ins_cost(200);
-  format %{ "FILD   $mem\t# Atomic volatile long load\n\t"
-            "FISTp  $dst" %}
-  ins_encode(enc_loadL_volatile(mem,dst));
-  ins_pipe( fpu_reg_mem );
-%}
-
-instruct loadLX_volatile(stackSlotL dst, memory mem, regD tmp) %{
-  predicate(UseSSE>=2 && ((LoadLNode*)n)->require_atomic_access());
-  match(Set dst (LoadL mem));
-  effect(TEMP tmp);
-  ins_cost(180);
-  format %{ "MOVSD  $tmp,$mem\t# Atomic volatile long load\n\t"
-            "MOVSD  $dst,$tmp" %}
-  ins_encode %{
-    __ movdbl($tmp$$XMMRegister, $mem$$Address);
-    __ movdbl(Address(rsp, $dst$$disp), $tmp$$XMMRegister);
-  %}
-  ins_pipe( pipe_slow );
-%}
-
-instruct loadLX_reg_volatile(eRegL dst, memory mem, regD tmp) %{
-  predicate(UseSSE>=2 && ((LoadLNode*)n)->require_atomic_access());
-  match(Set dst (LoadL mem));
-  effect(TEMP tmp);
-  ins_cost(160);
-  format %{ "MOVSD  $tmp,$mem\t# Atomic volatile long load\n\t"
-            "MOVD   $dst.lo,$tmp\n\t"
-            "PSRLQ  $tmp,32\n\t"
-            "MOVD   $dst.hi,$tmp" %}
-  ins_encode %{
-    __ movdbl($tmp$$XMMRegister, $mem$$Address);
-    __ movdl($dst$$Register, $tmp$$XMMRegister);
-    __ psrlq($tmp$$XMMRegister, 32);
-    __ movdl(HIGH_FROM_LOW($dst$$Register), $tmp$$XMMRegister);
-  %}
-  ins_pipe( pipe_slow );
-%}
-
-// Load Range
-instruct loadRange(rRegI dst, memory mem) %{
-  match(Set dst (LoadRange mem));
-
-  ins_cost(125);
-  format %{ "MOV    $dst,$mem" %}
-  opcode(0x8B);
-  ins_encode( SetInstMark, OpcP, RegMem(dst,mem), ClearInstMark);
-  ins_pipe( ialu_reg_mem );
-%}
-
-
-// Load Pointer
-instruct loadP(eRegP dst, memory mem) %{
-  match(Set dst (LoadP mem));
-
-  ins_cost(125);
-  format %{ "MOV    $dst,$mem" %}
-  opcode(0x8B);
-  ins_encode( SetInstMark, OpcP, RegMem(dst,mem), ClearInstMark);
-  ins_pipe( ialu_reg_mem );
-%}
-
-// Load Klass Pointer
-instruct loadKlass(eRegP dst, memory mem) %{
-  match(Set dst (LoadKlass mem));
-
-  ins_cost(125);
-  format %{ "MOV    $dst,$mem" %}
-  opcode(0x8B);
-  ins_encode( SetInstMark, OpcP, RegMem(dst,mem), ClearInstMark);
-  ins_pipe( ialu_reg_mem );
-%}
-
-// Load Double
-instruct loadDPR(regDPR dst, memory mem) %{
-  predicate(UseSSE<=1);
-  match(Set dst (LoadD mem));
-
-  ins_cost(150);
-  format %{ "FLD_D  ST,$mem\n\t"
-            "FSTP   $dst" %}
-  opcode(0xDD);               /* DD /0 */
-  ins_encode( SetInstMark, OpcP, RMopc_Mem(0x00,mem),
-              Pop_Reg_DPR(dst), ClearInstMark );
-  ins_pipe( fpu_reg_mem );
-%}
-
-// Load Double to XMM
-instruct loadD(regD dst, memory mem) %{
-  predicate(UseSSE>=2 && UseXmmLoadAndClearUpper);
-  match(Set dst (LoadD mem));
-  ins_cost(145);
-  format %{ "MOVSD  $dst,$mem" %}
-  ins_encode %{
-    __ movdbl ($dst$$XMMRegister, $mem$$Address);
-  %}
-  ins_pipe( pipe_slow );
-%}
-
-instruct loadD_partial(regD dst, memory mem) %{
-  predicate(UseSSE>=2 && !UseXmmLoadAndClearUpper);
-  match(Set dst (LoadD mem));
-  ins_cost(145);
-  format %{ "MOVLPD $dst,$mem" %}
-  ins_encode %{
-    __ movdbl ($dst$$XMMRegister, $mem$$Address);
-  %}
-  ins_pipe( pipe_slow );
-%}
-
-// Load to XMM register (single-precision floating point)
-// MOVSS instruction
-instruct loadF(regF dst, memory mem) %{
-  predicate(UseSSE>=1);
-  match(Set dst (LoadF mem));
-  ins_cost(145);
-  format %{ "MOVSS  $dst,$mem" %}
-  ins_encode %{
-    __ movflt ($dst$$XMMRegister, $mem$$Address);
-  %}
-  ins_pipe( pipe_slow );
-%}
-
-// Load Float
-instruct loadFPR(regFPR dst, memory mem) %{
-  predicate(UseSSE==0);
-  match(Set dst (LoadF mem));
-
-  ins_cost(150);
-  format %{ "FLD_S  ST,$mem\n\t"
-            "FSTP   $dst" %}
-  opcode(0xD9);               /* D9 /0 */
-  ins_encode( SetInstMark, OpcP, RMopc_Mem(0x00,mem),
-              Pop_Reg_FPR(dst), ClearInstMark );
-  ins_pipe( fpu_reg_mem );
-%}
-
-// Load Effective Address
-instruct leaP8(eRegP dst, indOffset8 mem) %{
-  match(Set dst mem);
-
-  ins_cost(110);
-  format %{ "LEA    $dst,$mem" %}
-  opcode(0x8D);
-  ins_encode( SetInstMark, OpcP, RegMem(dst,mem), ClearInstMark);
-  ins_pipe( ialu_reg_reg_fat );
-%}
-
-instruct leaP32(eRegP dst, indOffset32 mem) %{
-  match(Set dst mem);
-
-  ins_cost(110);
-  format %{ "LEA    $dst,$mem" %}
-  opcode(0x8D);
-  ins_encode( SetInstMark, OpcP, RegMem(dst,mem), ClearInstMark);
-  ins_pipe( ialu_reg_reg_fat );
-%}
-
-instruct leaPIdxOff(eRegP dst, indIndexOffset mem) %{
-  match(Set dst mem);
-
-  ins_cost(110);
-  format %{ "LEA    $dst,$mem" %}
-  opcode(0x8D);
-  ins_encode( SetInstMark, OpcP, RegMem(dst,mem), ClearInstMark);
-  ins_pipe( ialu_reg_reg_fat );
-%}
-
-instruct leaPIdxScale(eRegP dst, indIndexScale mem) %{
-  match(Set dst mem);
-
-  ins_cost(110);
-  format %{ "LEA    $dst,$mem" %}
-  opcode(0x8D);
-  ins_encode( SetInstMark, OpcP, RegMem(dst,mem), ClearInstMark);
-  ins_pipe( ialu_reg_reg_fat );
-%}
-
-instruct leaPIdxScaleOff(eRegP dst, indIndexScaleOffset mem) %{
-  match(Set dst mem);
-
-  ins_cost(110);
-  format %{ "LEA    $dst,$mem" %}
-  opcode(0x8D);
-  ins_encode( SetInstMark, OpcP, RegMem(dst,mem), ClearInstMark);
-  ins_pipe( ialu_reg_reg_fat );
-%}
-
-// Load Constant
-instruct loadConI(rRegI dst, immI src) %{
-  match(Set dst src);
-
-  format %{ "MOV    $dst,$src" %}
-  ins_encode( SetInstMark, LdImmI(dst, src), ClearInstMark );
-  ins_pipe( ialu_reg_fat );
-%}
-
-// Load Constant zero
-instruct loadConI0(rRegI dst, immI_0 src, eFlagsReg cr) %{
-  match(Set dst src);
-  effect(KILL cr);
-
-  ins_cost(50);
-  format %{ "XOR    $dst,$dst" %}
-  opcode(0x33);  /* + rd */
-  ins_encode( OpcP, RegReg( dst, dst ) );
-  ins_pipe( ialu_reg );
-%}
-
-instruct loadConP(eRegP dst, immP src) %{
-  match(Set dst src);
-
-  format %{ "MOV    $dst,$src" %}
-  opcode(0xB8);  /* + rd */
-  ins_encode( SetInstMark, LdImmP(dst, src), ClearInstMark );
-  ins_pipe( ialu_reg_fat );
-%}
-
-instruct loadConL(eRegL dst, immL src, eFlagsReg cr) %{
-  match(Set dst src);
-  effect(KILL cr);
-  ins_cost(200);
-  format %{ "MOV    $dst.lo,$src.lo\n\t"
-            "MOV    $dst.hi,$src.hi" %}
-  opcode(0xB8);
-  ins_encode( LdImmL_Lo(dst, src), LdImmL_Hi(dst, src) );
-  ins_pipe( ialu_reg_long_fat );
-%}
-
-instruct loadConL0(eRegL dst, immL0 src, eFlagsReg cr) %{
-  match(Set dst src);
-  effect(KILL cr);
-  ins_cost(150);
-  format %{ "XOR    $dst.lo,$dst.lo\n\t"
-            "XOR    $dst.hi,$dst.hi" %}
-  opcode(0x33,0x33);
-  ins_encode( RegReg_Lo(dst,dst), RegReg_Hi(dst, dst) );
-  ins_pipe( ialu_reg_long );
-%}
-
-// The instruction usage is guarded by predicate in operand immFPR().
-instruct loadConFPR(regFPR dst, immFPR con) %{
-  match(Set dst con);
-  ins_cost(125);
-  format %{ "FLD_S  ST,[$constantaddress]\t# load from constant table: float=$con\n\t"
-            "FSTP   $dst" %}
-  ins_encode %{
-    __ fld_s($constantaddress($con));
-    __ fstp_d($dst$$reg);
-  %}
-  ins_pipe(fpu_reg_con);
-%}
-
-// The instruction usage is guarded by predicate in operand immFPR0().
-instruct loadConFPR0(regFPR dst, immFPR0 con) %{
-  match(Set dst con);
-  ins_cost(125);
-  format %{ "FLDZ   ST\n\t"
-            "FSTP   $dst" %}
-  ins_encode %{
-    __ fldz();
-    __ fstp_d($dst$$reg);
-  %}
-  ins_pipe(fpu_reg_con);
-%}
-
-// The instruction usage is guarded by predicate in operand immFPR1().
-instruct loadConFPR1(regFPR dst, immFPR1 con) %{
-  match(Set dst con);
-  ins_cost(125);
-  format %{ "FLD1   ST\n\t"
-            "FSTP   $dst" %}
-  ins_encode %{
-    __ fld1();
-    __ fstp_d($dst$$reg);
-  %}
-  ins_pipe(fpu_reg_con);
-%}
-
-// The instruction usage is guarded by predicate in operand immF().
-instruct loadConF(regF dst, immF con) %{
-  match(Set dst con);
-  ins_cost(125);
-  format %{ "MOVSS  $dst,[$constantaddress]\t# load from constant table: float=$con" %}
-  ins_encode %{
-    __ movflt($dst$$XMMRegister, $constantaddress($con));
-  %}
-  ins_pipe(pipe_slow);
-%}
-
-// The instruction usage is guarded by predicate in operand immF0().
-instruct loadConF0(regF dst, immF0 src) %{
-  match(Set dst src);
-  ins_cost(100);
-  format %{ "XORPS  $dst,$dst\t# float 0.0" %}
-  ins_encode %{
-    __ xorps($dst$$XMMRegister, $dst$$XMMRegister);
-  %}
-  ins_pipe(pipe_slow);
-%}
-
-// The instruction usage is guarded by predicate in operand immDPR().
-instruct loadConDPR(regDPR dst, immDPR con) %{
-  match(Set dst con);
-  ins_cost(125);
-
-  format %{ "FLD_D  ST,[$constantaddress]\t# load from constant table: double=$con\n\t"
-            "FSTP   $dst" %}
-  ins_encode %{
-    __ fld_d($constantaddress($con));
-    __ fstp_d($dst$$reg);
-  %}
-  ins_pipe(fpu_reg_con);
-%}
-
-// The instruction usage is guarded by predicate in operand immDPR0().
-instruct loadConDPR0(regDPR dst, immDPR0 con) %{
-  match(Set dst con);
-  ins_cost(125);
-
-  format %{ "FLDZ   ST\n\t"
-            "FSTP   $dst" %}
-  ins_encode %{
-    __ fldz();
-    __ fstp_d($dst$$reg);
-  %}
-  ins_pipe(fpu_reg_con);
-%}
-
-// The instruction usage is guarded by predicate in operand immDPR1().
-instruct loadConDPR1(regDPR dst, immDPR1 con) %{
-  match(Set dst con);
-  ins_cost(125);
-
-  format %{ "FLD1   ST\n\t"
-            "FSTP   $dst" %}
-  ins_encode %{
-    __ fld1();
-    __ fstp_d($dst$$reg);
-  %}
-  ins_pipe(fpu_reg_con);
-%}
-
-// The instruction usage is guarded by predicate in operand immD().
-instruct loadConD(regD dst, immD con) %{
-  match(Set dst con);
-  ins_cost(125);
-  format %{ "MOVSD  $dst,[$constantaddress]\t# load from constant table: double=$con" %}
-  ins_encode %{
-    __ movdbl($dst$$XMMRegister, $constantaddress($con));
-  %}
-  ins_pipe(pipe_slow);
-%}
-
-// The instruction usage is guarded by predicate in operand immD0().
-instruct loadConD0(regD dst, immD0 src) %{
-  match(Set dst src);
-  ins_cost(100);
-  format %{ "XORPD  $dst,$dst\t# double 0.0" %}
-  ins_encode %{
-    __ xorpd ($dst$$XMMRegister, $dst$$XMMRegister);
-  %}
-  ins_pipe( pipe_slow );
-%}
-
-// Load Stack Slot
-instruct loadSSI(rRegI dst, stackSlotI src) %{
-  match(Set dst src);
-  ins_cost(125);
-
-  format %{ "MOV    $dst,$src" %}
-  opcode(0x8B);
-  ins_encode( SetInstMark, OpcP, RegMem(dst,src), ClearInstMark);
-  ins_pipe( ialu_reg_mem );
-%}
-
-instruct loadSSL(eRegL dst, stackSlotL src) %{
-  match(Set dst src);
-
-  ins_cost(200);
-  format %{ "MOV    $dst,$src.lo\n\t"
-            "MOV    $dst+4,$src.hi" %}
-  opcode(0x8B, 0x8B);
-  ins_encode( SetInstMark, OpcP, RegMem( dst, src ), OpcS, RegMem_Hi( dst, src ), ClearInstMark );
-  ins_pipe( ialu_mem_long_reg );
-%}
-
-// Load Stack Slot
-instruct loadSSP(eRegP dst, stackSlotP src) %{
-  match(Set dst src);
-  ins_cost(125);
-
-  format %{ "MOV    $dst,$src" %}
-  opcode(0x8B);
-  ins_encode( SetInstMark, OpcP, RegMem(dst,src), ClearInstMark);
-  ins_pipe( ialu_reg_mem );
-%}
-
-// Load Stack Slot
-instruct loadSSF(regFPR dst, stackSlotF src) %{
-  match(Set dst src);
-  ins_cost(125);
-
-  format %{ "FLD_S  $src\n\t"
-            "FSTP   $dst" %}
-  opcode(0xD9);               /* D9 /0, FLD m32real */
-  ins_encode( SetInstMark, OpcP, RMopc_Mem_no_oop(0x00,src),
-              Pop_Reg_FPR(dst), ClearInstMark );
-  ins_pipe( fpu_reg_mem );
-%}
-
-// Load Stack Slot
-instruct loadSSD(regDPR dst, stackSlotD src) %{
-  match(Set dst src);
-  ins_cost(125);
-
-  format %{ "FLD_D  $src\n\t"
-            "FSTP   $dst" %}
-  opcode(0xDD);               /* DD /0, FLD m64real */
-  ins_encode( SetInstMark, OpcP, RMopc_Mem_no_oop(0x00,src),
-              Pop_Reg_DPR(dst), ClearInstMark );
-  ins_pipe( fpu_reg_mem );
-%}
-
-// Prefetch instructions for allocation.
-// Must be safe to execute with invalid address (cannot fault).
-
-instruct prefetchAlloc0( memory mem ) %{
-  predicate(UseSSE==0 && AllocatePrefetchInstr!=3);
-  match(PrefetchAllocation mem);
-  ins_cost(0);
-  size(0);
-  format %{ "Prefetch allocation (non-SSE is empty encoding)" %}
-  ins_encode();
-  ins_pipe(empty);
-%}
-
-instruct prefetchAlloc( memory mem ) %{
-  predicate(AllocatePrefetchInstr==3);
-  match( PrefetchAllocation mem );
-  ins_cost(100);
-
-  format %{ "PREFETCHW $mem\t! Prefetch allocation into L1 cache and mark modified" %}
-  ins_encode %{
-    __ prefetchw($mem$$Address);
-  %}
-  ins_pipe(ialu_mem);
-%}
-
-instruct prefetchAllocNTA( memory mem ) %{
-  predicate(UseSSE>=1 && AllocatePrefetchInstr==0);
-  match(PrefetchAllocation mem);
-  ins_cost(100);
-
-  format %{ "PREFETCHNTA $mem\t! Prefetch allocation into non-temporal cache for write" %}
-  ins_encode %{
-    __ prefetchnta($mem$$Address);
-  %}
-  ins_pipe(ialu_mem);
-%}
-
-instruct prefetchAllocT0( memory mem ) %{
-  predicate(UseSSE>=1 && AllocatePrefetchInstr==1);
-  match(PrefetchAllocation mem);
-  ins_cost(100);
-
-  format %{ "PREFETCHT0 $mem\t! Prefetch allocation into L1 and L2 caches for write" %}
-  ins_encode %{
-    __ prefetcht0($mem$$Address);
-  %}
-  ins_pipe(ialu_mem);
-%}
-
-instruct prefetchAllocT2( memory mem ) %{
-  predicate(UseSSE>=1 && AllocatePrefetchInstr==2);
-  match(PrefetchAllocation mem);
-  ins_cost(100);
-
-  format %{ "PREFETCHT2 $mem\t! Prefetch allocation into L2 cache for write" %}
-  ins_encode %{
-    __ prefetcht2($mem$$Address);
-  %}
-  ins_pipe(ialu_mem);
-%}
-
-//----------Store Instructions-------------------------------------------------
-
-// Store Byte
-instruct storeB(memory mem, xRegI src) %{
-  match(Set mem (StoreB mem src));
-
-  ins_cost(125);
-  format %{ "MOV8   $mem,$src" %}
-  opcode(0x88);
-  ins_encode( SetInstMark, OpcP, RegMem( src, mem ), ClearInstMark );
-  ins_pipe( ialu_mem_reg );
-%}
-
-// Store Char/Short
-instruct storeC(memory mem, rRegI src) %{
-  match(Set mem (StoreC mem src));
-
-  ins_cost(125);
-  format %{ "MOV16  $mem,$src" %}
-  opcode(0x89, 0x66);
-  ins_encode( SetInstMark, OpcS, OpcP, RegMem( src, mem ), ClearInstMark );
-  ins_pipe( ialu_mem_reg );
-%}
-
-// Store Integer
-instruct storeI(memory mem, rRegI src) %{
-  match(Set mem (StoreI mem src));
-
-  ins_cost(125);
-  format %{ "MOV    $mem,$src" %}
-  opcode(0x89);
-  ins_encode( SetInstMark, OpcP, RegMem( src, mem ), ClearInstMark );
-  ins_pipe( ialu_mem_reg );
-%}
-
-// Store Long
-instruct storeL(long_memory mem, eRegL src) %{
-  predicate(!((StoreLNode*)n)->require_atomic_access());
-  match(Set mem (StoreL mem src));
-
-  ins_cost(200);
-  format %{ "MOV    $mem,$src.lo\n\t"
-            "MOV    $mem+4,$src.hi" %}
-  opcode(0x89, 0x89);
-  ins_encode( SetInstMark, OpcP, RegMem( src, mem ), OpcS, RegMem_Hi( src, mem ), ClearInstMark );
-  ins_pipe( ialu_mem_long_reg );
-%}
-
-// Store Long to Integer
-instruct storeL2I(memory mem, eRegL src) %{
-  match(Set mem (StoreI mem (ConvL2I src)));
-
-  format %{ "MOV    $mem,$src.lo\t# long -> int" %}
-  ins_encode %{
-    __ movl($mem$$Address, $src$$Register);
-  %}
-  ins_pipe(ialu_mem_reg);
-%}
-
-// Volatile Store Long.  Must be atomic, so move it into
-// the FP TOS and then do a 64-bit FIST.  Has to probe the
-// target address before the store (for null-ptr checks)
-// so the memory operand is used twice in the encoding.
-instruct storeL_volatile(memory mem, stackSlotL src, eFlagsReg cr ) %{
-  predicate(UseSSE<=1 && ((StoreLNode*)n)->require_atomic_access());
-  match(Set mem (StoreL mem src));
-  effect( KILL cr );
-  ins_cost(400);
-  format %{ "CMP    $mem,EAX\t# Probe address for implicit null check\n\t"
-            "FILD   $src\n\t"
-            "FISTp  $mem\t # 64-bit atomic volatile long store" %}
-  opcode(0x3B);
-  ins_encode( SetInstMark, OpcP, RegMem( EAX, mem ), enc_storeL_volatile(mem,src), ClearInstMark);
-  ins_pipe( fpu_reg_mem );
-%}
-
-instruct storeLX_volatile(memory mem, stackSlotL src, regD tmp, eFlagsReg cr) %{
-  predicate(UseSSE>=2 && ((StoreLNode*)n)->require_atomic_access());
-  match(Set mem (StoreL mem src));
-  effect( TEMP tmp, KILL cr );
-  ins_cost(380);
-  format %{ "CMP    $mem,EAX\t# Probe address for implicit null check\n\t"
-            "MOVSD  $tmp,$src\n\t"
-            "MOVSD  $mem,$tmp\t # 64-bit atomic volatile long store" %}
-  ins_encode %{
-    __ cmpl(rax, $mem$$Address);
-    __ movdbl($tmp$$XMMRegister, Address(rsp, $src$$disp));
-    __ movdbl($mem$$Address, $tmp$$XMMRegister);
-  %}
-  ins_pipe( pipe_slow );
-%}
-
-instruct storeLX_reg_volatile(memory mem, eRegL src, regD tmp2, regD tmp, eFlagsReg cr) %{
-  predicate(UseSSE>=2 && ((StoreLNode*)n)->require_atomic_access());
-  match(Set mem (StoreL mem src));
-  effect( TEMP tmp2 , TEMP tmp, KILL cr );
-  ins_cost(360);
-  format %{ "CMP    $mem,EAX\t# Probe address for implicit null check\n\t"
-            "MOVD   $tmp,$src.lo\n\t"
-            "MOVD   $tmp2,$src.hi\n\t"
-            "PUNPCKLDQ $tmp,$tmp2\n\t"
-            "MOVSD  $mem,$tmp\t # 64-bit atomic volatile long store" %}
-  ins_encode %{
-    __ cmpl(rax, $mem$$Address);
-    __ movdl($tmp$$XMMRegister, $src$$Register);
-    __ movdl($tmp2$$XMMRegister, HIGH_FROM_LOW($src$$Register));
-    __ punpckldq($tmp$$XMMRegister, $tmp2$$XMMRegister);
-    __ movdbl($mem$$Address, $tmp$$XMMRegister);
-  %}
-  ins_pipe( pipe_slow );
-%}
-
-// Store Pointer; for storing unknown oops and raw pointers
-instruct storeP(memory mem, anyRegP src) %{
-  match(Set mem (StoreP mem src));
-
-  ins_cost(125);
-  format %{ "MOV    $mem,$src" %}
-  opcode(0x89);
-  ins_encode( SetInstMark, OpcP, RegMem( src, mem ), ClearInstMark );
-  ins_pipe( ialu_mem_reg );
-%}
-
-// Store Integer Immediate
-instruct storeImmI(memory mem, immI src) %{
-  match(Set mem (StoreI mem src));
-
-  ins_cost(150);
-  format %{ "MOV    $mem,$src" %}
-  opcode(0xC7);               /* C7 /0 */
-  ins_encode( SetInstMark, OpcP, RMopc_Mem(0x00,mem), Con32(src), ClearInstMark);
-  ins_pipe( ialu_mem_imm );
-%}
-
-// Store Short/Char Immediate
-instruct storeImmI16(memory mem, immI16 src) %{
-  predicate(UseStoreImmI16);
-  match(Set mem (StoreC mem src));
-
-  ins_cost(150);
-  format %{ "MOV16  $mem,$src" %}
-  opcode(0xC7);     /* C7 /0 Same as 32 store immediate with prefix */
-  ins_encode( SetInstMark, SizePrefix, OpcP, RMopc_Mem(0x00,mem), Con16(src), ClearInstMark);
-  ins_pipe( ialu_mem_imm );
-%}
-
-// Store Pointer Immediate; null pointers or constant oops that do not
-// need card-mark barriers.
-instruct storeImmP(memory mem, immP src) %{
-  match(Set mem (StoreP mem src));
-
-  ins_cost(150);
-  format %{ "MOV    $mem,$src" %}
-  opcode(0xC7);               /* C7 /0 */
-  ins_encode( SetInstMark, OpcP, RMopc_Mem(0x00,mem), Con32( src ), ClearInstMark);
-  ins_pipe( ialu_mem_imm );
-%}
-
-// Store Byte Immediate
-instruct storeImmB(memory mem, immI8 src) %{
-  match(Set mem (StoreB mem src));
-
-  ins_cost(150);
-  format %{ "MOV8   $mem,$src" %}
-  opcode(0xC6);               /* C6 /0 */
-  ins_encode( SetInstMark, OpcP, RMopc_Mem(0x00,mem), Con8or32(src), ClearInstMark);
-  ins_pipe( ialu_mem_imm );
-%}
-
-// Store Double
-instruct storeDPR( memory mem, regDPR1 src) %{
-  predicate(UseSSE<=1);
-  match(Set mem (StoreD mem src));
-
-  ins_cost(100);
-  format %{ "FST_D  $mem,$src" %}
-  opcode(0xDD);       /* DD /2 */
-  ins_encode( enc_FPR_store(mem,src) );
-  ins_pipe( fpu_mem_reg );
-%}
-
-// Store double does rounding on x86
-instruct storeDPR_rounded( memory mem, regDPR1 src) %{
-  predicate(UseSSE<=1);
-  match(Set mem (StoreD mem (RoundDouble src)));
-
-  ins_cost(100);
-  format %{ "FST_D  $mem,$src\t# round" %}
-  opcode(0xDD);       /* DD /2 */
-  ins_encode( enc_FPR_store(mem,src) );
-  ins_pipe( fpu_mem_reg );
-%}
-
-// Store XMM register to memory (double-precision floating points)
-// MOVSD instruction
-instruct storeD(memory mem, regD src) %{
-  predicate(UseSSE>=2);
-  match(Set mem (StoreD mem src));
-  ins_cost(95);
-  format %{ "MOVSD  $mem,$src" %}
-  ins_encode %{
-    __ movdbl($mem$$Address, $src$$XMMRegister);
-  %}
-  ins_pipe( pipe_slow );
-%}
-
-// Store XMM register to memory (single-precision floating point)
-// MOVSS instruction
-instruct storeF(memory mem, regF src) %{
-  predicate(UseSSE>=1);
-  match(Set mem (StoreF mem src));
-  ins_cost(95);
-  format %{ "MOVSS  $mem,$src" %}
-  ins_encode %{
-    __ movflt($mem$$Address, $src$$XMMRegister);
-  %}
-  ins_pipe( pipe_slow );
-%}
-
-
-// Store Float
-instruct storeFPR( memory mem, regFPR1 src) %{
-  predicate(UseSSE==0);
-  match(Set mem (StoreF mem src));
-
-  ins_cost(100);
-  format %{ "FST_S  $mem,$src" %}
-  opcode(0xD9);       /* D9 /2 */
-  ins_encode( enc_FPR_store(mem,src) );
-  ins_pipe( fpu_mem_reg );
-%}
-
-// Store Float does rounding on x86
-instruct storeFPR_rounded( memory mem, regFPR1 src) %{
-  predicate(UseSSE==0);
-  match(Set mem (StoreF mem (RoundFloat src)));
-
-  ins_cost(100);
-  format %{ "FST_S  $mem,$src\t# round" %}
-  opcode(0xD9);       /* D9 /2 */
-  ins_encode( enc_FPR_store(mem,src) );
-  ins_pipe( fpu_mem_reg );
-%}
-
-// Store Float does rounding on x86
-instruct storeFPR_Drounded( memory mem, regDPR1 src) %{
-  predicate(UseSSE<=1);
-  match(Set mem (StoreF mem (ConvD2F src)));
-
-  ins_cost(100);
-  format %{ "FST_S  $mem,$src\t# D-round" %}
-  opcode(0xD9);       /* D9 /2 */
-  ins_encode( enc_FPR_store(mem,src) );
-  ins_pipe( fpu_mem_reg );
-%}
-
-// Store immediate Float value (it is faster than store from FPU register)
-// The instruction usage is guarded by predicate in operand immFPR().
-instruct storeFPR_imm( memory mem, immFPR src) %{
-  match(Set mem (StoreF mem src));
-
-  ins_cost(50);
-  format %{ "MOV    $mem,$src\t# store float" %}
-  opcode(0xC7);               /* C7 /0 */
-  ins_encode( SetInstMark, OpcP, RMopc_Mem(0x00,mem),  Con32FPR_as_bits(src), ClearInstMark);
-  ins_pipe( ialu_mem_imm );
-%}
-
-// Store immediate Float value (it is faster than store from XMM register)
-// The instruction usage is guarded by predicate in operand immF().
-instruct storeF_imm( memory mem, immF src) %{
-  match(Set mem (StoreF mem src));
-
-  ins_cost(50);
-  format %{ "MOV    $mem,$src\t# store float" %}
-  opcode(0xC7);               /* C7 /0 */
-  ins_encode( SetInstMark, OpcP, RMopc_Mem(0x00,mem),  Con32F_as_bits(src), ClearInstMark);
-  ins_pipe( ialu_mem_imm );
-%}
-
-// Store Integer to stack slot
-instruct storeSSI(stackSlotI dst, rRegI src) %{
-  match(Set dst src);
-
-  ins_cost(100);
-  format %{ "MOV    $dst,$src" %}
-  opcode(0x89);
-  ins_encode( OpcPRegSS( dst, src ) );
-  ins_pipe( ialu_mem_reg );
-%}
-
-// Store Integer to stack slot
-instruct storeSSP(stackSlotP dst, eRegP src) %{
-  match(Set dst src);
-
-  ins_cost(100);
-  format %{ "MOV    $dst,$src" %}
-  opcode(0x89);
-  ins_encode( OpcPRegSS( dst, src ) );
-  ins_pipe( ialu_mem_reg );
-%}
-
-// Store Long to stack slot
-instruct storeSSL(stackSlotL dst, eRegL src) %{
-  match(Set dst src);
-
-  ins_cost(200);
-  format %{ "MOV    $dst,$src.lo\n\t"
-            "MOV    $dst+4,$src.hi" %}
-  opcode(0x89, 0x89);
-  ins_encode( SetInstMark, OpcP, RegMem( src, dst ), OpcS, RegMem_Hi( src, dst ), ClearInstMark );
-  ins_pipe( ialu_mem_long_reg );
-%}
-
-//----------MemBar Instructions-----------------------------------------------
-// Memory barrier flavors
-
-instruct membar_acquire() %{
-  match(MemBarAcquire);
-  match(LoadFence);
-  ins_cost(400);
-
-  size(0);
-  format %{ "MEMBAR-acquire ! (empty encoding)" %}
-  ins_encode();
-  ins_pipe(empty);
-%}
-
-instruct membar_acquire_lock() %{
-  match(MemBarAcquireLock);
-  ins_cost(0);
-
-  size(0);
-  format %{ "MEMBAR-acquire (prior CMPXCHG in FastLock so empty encoding)" %}
-  ins_encode( );
-  ins_pipe(empty);
-%}
-
-instruct membar_release() %{
-  match(MemBarRelease);
-  match(StoreFence);
-  ins_cost(400);
-
-  size(0);
-  format %{ "MEMBAR-release ! (empty encoding)" %}
-  ins_encode( );
-  ins_pipe(empty);
-%}
-
-instruct membar_release_lock() %{
-  match(MemBarReleaseLock);
-  ins_cost(0);
-
-  size(0);
-  format %{ "MEMBAR-release (a FastUnlock follows so empty encoding)" %}
-  ins_encode( );
-  ins_pipe(empty);
-%}
-
-instruct membar_volatile(eFlagsReg cr) %{
-  match(MemBarVolatile);
-  effect(KILL cr);
-  ins_cost(400);
-
-  format %{
-    $$template
-    $$emit$$"LOCK ADDL [ESP + #0], 0\t! membar_volatile"
-  %}
-  ins_encode %{
-    __ membar(Assembler::StoreLoad);
-  %}
-  ins_pipe(pipe_slow);
-%}
-
-instruct unnecessary_membar_volatile() %{
-  match(MemBarVolatile);
-  predicate(Matcher::post_store_load_barrier(n));
-  ins_cost(0);
-
-  size(0);
-  format %{ "MEMBAR-volatile (unnecessary so empty encoding)" %}
-  ins_encode( );
-  ins_pipe(empty);
-%}
-
-instruct membar_storestore() %{
-  match(MemBarStoreStore);
-  match(StoreStoreFence);
-  ins_cost(0);
-
-  size(0);
-  format %{ "MEMBAR-storestore (empty encoding)" %}
-  ins_encode( );
-  ins_pipe(empty);
-%}
-
-//----------Move Instructions--------------------------------------------------
-instruct castX2P(eAXRegP dst, eAXRegI src) %{
-  match(Set dst (CastX2P src));
-  format %{ "# X2P  $dst, $src" %}
-  ins_encode( /*empty encoding*/ );
-  ins_cost(0);
-  ins_pipe(empty);
-%}
-
-instruct castP2X(rRegI dst, eRegP src ) %{
-  match(Set dst (CastP2X src));
-  ins_cost(50);
-  format %{ "MOV    $dst, $src\t# CastP2X" %}
-  ins_encode( enc_Copy( dst, src) );
-  ins_pipe( ialu_reg_reg );
-%}
-
-//----------Conditional Move---------------------------------------------------
-// Conditional move
-instruct jmovI_reg(cmpOp cop, eFlagsReg cr, rRegI dst, rRegI src) %{
-  predicate(!VM_Version::supports_cmov() );
-  match(Set dst (CMoveI (Binary cop cr) (Binary dst src)));
-  ins_cost(200);
-  format %{ "J$cop,us skip\t# signed cmove\n\t"
-            "MOV    $dst,$src\n"
-      "skip:" %}
-  ins_encode %{
-    Label Lskip;
-    // Invert sense of branch from sense of CMOV
-    __ jccb((Assembler::Condition)($cop$$cmpcode^1), Lskip);
-    __ movl($dst$$Register, $src$$Register);
-    __ bind(Lskip);
-  %}
-  ins_pipe( pipe_cmov_reg );
-%}
-
-instruct jmovI_regU(cmpOpU cop, eFlagsRegU cr, rRegI dst, rRegI src) %{
-  predicate(!VM_Version::supports_cmov() );
-  match(Set dst (CMoveI (Binary cop cr) (Binary dst src)));
-  ins_cost(200);
-  format %{ "J$cop,us skip\t# unsigned cmove\n\t"
-            "MOV    $dst,$src\n"
-      "skip:" %}
-  ins_encode %{
-    Label Lskip;
-    // Invert sense of branch from sense of CMOV
-    __ jccb((Assembler::Condition)($cop$$cmpcode^1), Lskip);
-    __ movl($dst$$Register, $src$$Register);
-    __ bind(Lskip);
-  %}
-  ins_pipe( pipe_cmov_reg );
-%}
-
-instruct cmovI_reg(rRegI dst, rRegI src, eFlagsReg cr, cmpOp cop ) %{
-  predicate(VM_Version::supports_cmov() );
-  match(Set dst (CMoveI (Binary cop cr) (Binary dst src)));
-  ins_cost(200);
-  format %{ "CMOV$cop $dst,$src" %}
-  opcode(0x0F,0x40);
-  ins_encode( enc_cmov(cop), RegReg( dst, src ) );
-  ins_pipe( pipe_cmov_reg );
-%}
-
-instruct cmovI_regU( cmpOpU cop, eFlagsRegU cr, rRegI dst, rRegI src ) %{
-  predicate(VM_Version::supports_cmov() );
-  match(Set dst (CMoveI (Binary cop cr) (Binary dst src)));
-  ins_cost(200);
-  format %{ "CMOV$cop $dst,$src" %}
-  opcode(0x0F,0x40);
-  ins_encode( enc_cmov(cop), RegReg( dst, src ) );
-  ins_pipe( pipe_cmov_reg );
-%}
-
-instruct cmovI_regUCF( cmpOpUCF cop, eFlagsRegUCF cr, rRegI dst, rRegI src ) %{
-  predicate(VM_Version::supports_cmov() );
-  match(Set dst (CMoveI (Binary cop cr) (Binary dst src)));
-  ins_cost(200);
-  expand %{
-    cmovI_regU(cop, cr, dst, src);
-  %}
-%}
-
-// Conditional move
-instruct cmovI_mem(cmpOp cop, eFlagsReg cr, rRegI dst, memory src) %{
-  predicate(VM_Version::supports_cmov() );
-  match(Set dst (CMoveI (Binary cop cr) (Binary dst (LoadI src))));
-  ins_cost(250);
-  format %{ "CMOV$cop $dst,$src" %}
-  opcode(0x0F,0x40);
-  ins_encode( SetInstMark, enc_cmov(cop), RegMem( dst, src ), ClearInstMark );
-  ins_pipe( pipe_cmov_mem );
-%}
-
-// Conditional move
-instruct cmovI_memU(cmpOpU cop, eFlagsRegU cr, rRegI dst, memory src) %{
-  predicate(VM_Version::supports_cmov() );
-  match(Set dst (CMoveI (Binary cop cr) (Binary dst (LoadI src))));
-  ins_cost(250);
-  format %{ "CMOV$cop $dst,$src" %}
-  opcode(0x0F,0x40);
-  ins_encode( SetInstMark, enc_cmov(cop), RegMem( dst, src ), ClearInstMark );
-  ins_pipe( pipe_cmov_mem );
-%}
-
-instruct cmovI_memUCF(cmpOpUCF cop, eFlagsRegUCF cr, rRegI dst, memory src) %{
-  predicate(VM_Version::supports_cmov() );
-  match(Set dst (CMoveI (Binary cop cr) (Binary dst (LoadI src))));
-  ins_cost(250);
-  expand %{
-    cmovI_memU(cop, cr, dst, src);
-  %}
-%}
-
-// Conditional move
-instruct cmovP_reg(eRegP dst, eRegP src, eFlagsReg cr, cmpOp cop ) %{
-  predicate(VM_Version::supports_cmov() );
-  match(Set dst (CMoveP (Binary cop cr) (Binary dst src)));
-  ins_cost(200);
-  format %{ "CMOV$cop $dst,$src\t# ptr" %}
-  opcode(0x0F,0x40);
-  ins_encode( enc_cmov(cop), RegReg( dst, src ) );
-  ins_pipe( pipe_cmov_reg );
-%}
-
-// Conditional move (non-P6 version)
-// Note:  a CMoveP is generated for  stubs and native wrappers
-//        regardless of whether we are on a P6, so we
-//        emulate a cmov here
-instruct cmovP_reg_nonP6(eRegP dst, eRegP src, eFlagsReg cr, cmpOp cop ) %{
-  match(Set dst (CMoveP (Binary cop cr) (Binary dst src)));
-  ins_cost(300);
-  format %{ "Jn$cop   skip\n\t"
-          "MOV    $dst,$src\t# pointer\n"
-      "skip:" %}
-  opcode(0x8b);
-  ins_encode( enc_cmov_branch(cop, 0x2), OpcP, RegReg(dst, src));
-  ins_pipe( pipe_cmov_reg );
-%}
-
-// Conditional move
-instruct cmovP_regU(cmpOpU cop, eFlagsRegU cr, eRegP dst, eRegP src ) %{
-  predicate(VM_Version::supports_cmov() );
-  match(Set dst (CMoveP (Binary cop cr) (Binary dst src)));
-  ins_cost(200);
-  format %{ "CMOV$cop $dst,$src\t# ptr" %}
-  opcode(0x0F,0x40);
-  ins_encode( enc_cmov(cop), RegReg( dst, src ) );
-  ins_pipe( pipe_cmov_reg );
-%}
-
-instruct cmovP_regUCF(cmpOpUCF cop, eFlagsRegUCF cr, eRegP dst, eRegP src ) %{
-  predicate(VM_Version::supports_cmov() );
-  match(Set dst (CMoveP (Binary cop cr) (Binary dst src)));
-  ins_cost(200);
-  expand %{
-    cmovP_regU(cop, cr, dst, src);
-  %}
-%}
-
-// DISABLED: Requires the ADLC to emit a bottom_type call that
-// correctly meets the two pointer arguments; one is an incoming
-// register but the other is a memory operand.  ALSO appears to
-// be buggy with implicit null checks.
-//
-//// Conditional move
-//instruct cmovP_mem(cmpOp cop, eFlagsReg cr, eRegP dst, memory src) %{
-//  predicate(VM_Version::supports_cmov() );
-//  match(Set dst (CMoveP (Binary cop cr) (Binary dst (LoadP src))));
-//  ins_cost(250);
-//  format %{ "CMOV$cop $dst,$src\t# ptr" %}
-//  opcode(0x0F,0x40);
-//  ins_encode( enc_cmov(cop), RegMem( dst, src ) );
-//  ins_pipe( pipe_cmov_mem );
-//%}
-//
-//// Conditional move
-//instruct cmovP_memU(cmpOpU cop, eFlagsRegU cr, eRegP dst, memory src) %{
-//  predicate(VM_Version::supports_cmov() );
-//  match(Set dst (CMoveP (Binary cop cr) (Binary dst (LoadP src))));
-//  ins_cost(250);
-//  format %{ "CMOV$cop $dst,$src\t# ptr" %}
-//  opcode(0x0F,0x40);
-//  ins_encode( enc_cmov(cop), RegMem( dst, src ) );
-//  ins_pipe( pipe_cmov_mem );
-//%}
-
-// Conditional move
-instruct fcmovDPR_regU(cmpOp_fcmov cop, eFlagsRegU cr, regDPR1 dst, regDPR src) %{
-  predicate(UseSSE<=1);
-  match(Set dst (CMoveD (Binary cop cr) (Binary dst src)));
-  ins_cost(200);
-  format %{ "FCMOV$cop $dst,$src\t# double" %}
-  opcode(0xDA);
-  ins_encode( enc_cmov_dpr(cop,src) );
-  ins_pipe( pipe_cmovDPR_reg );
-%}
-
-// Conditional move
-instruct fcmovFPR_regU(cmpOp_fcmov cop, eFlagsRegU cr, regFPR1 dst, regFPR src) %{
-  predicate(UseSSE==0);
-  match(Set dst (CMoveF (Binary cop cr) (Binary dst src)));
-  ins_cost(200);
-  format %{ "FCMOV$cop $dst,$src\t# float" %}
-  opcode(0xDA);
-  ins_encode( enc_cmov_dpr(cop,src) );
-  ins_pipe( pipe_cmovDPR_reg );
-%}
-
-// Float CMOV on Intel doesn't handle *signed* compares, only unsigned.
-instruct fcmovDPR_regS(cmpOp cop, eFlagsReg cr, regDPR dst, regDPR src) %{
-  predicate(UseSSE<=1);
-  match(Set dst (CMoveD (Binary cop cr) (Binary dst src)));
-  ins_cost(200);
-  format %{ "Jn$cop   skip\n\t"
-            "MOV    $dst,$src\t# double\n"
-      "skip:" %}
-  opcode (0xdd, 0x3);     /* DD D8+i or DD /3 */
-  ins_encode( enc_cmov_branch( cop, 0x4 ), Push_Reg_DPR(src), OpcP, RegOpc(dst) );
-  ins_pipe( pipe_cmovDPR_reg );
-%}
-
-// Float CMOV on Intel doesn't handle *signed* compares, only unsigned.
-instruct fcmovFPR_regS(cmpOp cop, eFlagsReg cr, regFPR dst, regFPR src) %{
-  predicate(UseSSE==0);
-  match(Set dst (CMoveF (Binary cop cr) (Binary dst src)));
-  ins_cost(200);
-  format %{ "Jn$cop    skip\n\t"
-            "MOV    $dst,$src\t# float\n"
-      "skip:" %}
-  opcode (0xdd, 0x3);     /* DD D8+i or DD /3 */
-  ins_encode( enc_cmov_branch( cop, 0x4 ), Push_Reg_FPR(src), OpcP, RegOpc(dst) );
-  ins_pipe( pipe_cmovDPR_reg );
-%}
-
-// No CMOVE with SSE/SSE2
-instruct fcmovF_regS(cmpOp cop, eFlagsReg cr, regF dst, regF src) %{
-  predicate (UseSSE>=1);
-  match(Set dst (CMoveF (Binary cop cr) (Binary dst src)));
-  ins_cost(200);
-  format %{ "Jn$cop   skip\n\t"
-            "MOVSS  $dst,$src\t# float\n"
-      "skip:" %}
-  ins_encode %{
-    Label skip;
-    // Invert sense of branch from sense of CMOV
-    __ jccb((Assembler::Condition)($cop$$cmpcode^1), skip);
-    __ movflt($dst$$XMMRegister, $src$$XMMRegister);
-    __ bind(skip);
-  %}
-  ins_pipe( pipe_slow );
-%}
-
-// No CMOVE with SSE/SSE2
-instruct fcmovD_regS(cmpOp cop, eFlagsReg cr, regD dst, regD src) %{
-  predicate (UseSSE>=2);
-  match(Set dst (CMoveD (Binary cop cr) (Binary dst src)));
-  ins_cost(200);
-  format %{ "Jn$cop   skip\n\t"
-            "MOVSD  $dst,$src\t# float\n"
-      "skip:" %}
-  ins_encode %{
-    Label skip;
-    // Invert sense of branch from sense of CMOV
-    __ jccb((Assembler::Condition)($cop$$cmpcode^1), skip);
-    __ movdbl($dst$$XMMRegister, $src$$XMMRegister);
-    __ bind(skip);
-  %}
-  ins_pipe( pipe_slow );
-%}
-
-// unsigned version
-instruct fcmovF_regU(cmpOpU cop, eFlagsRegU cr, regF dst, regF src) %{
-  predicate (UseSSE>=1);
-  match(Set dst (CMoveF (Binary cop cr) (Binary dst src)));
-  ins_cost(200);
-  format %{ "Jn$cop   skip\n\t"
-            "MOVSS  $dst,$src\t# float\n"
-      "skip:" %}
-  ins_encode %{
-    Label skip;
-    // Invert sense of branch from sense of CMOV
-    __ jccb((Assembler::Condition)($cop$$cmpcode^1), skip);
-    __ movflt($dst$$XMMRegister, $src$$XMMRegister);
-    __ bind(skip);
-  %}
-  ins_pipe( pipe_slow );
-%}
-
-instruct fcmovF_regUCF(cmpOpUCF cop, eFlagsRegUCF cr, regF dst, regF src) %{
-  predicate (UseSSE>=1);
-  match(Set dst (CMoveF (Binary cop cr) (Binary dst src)));
-  ins_cost(200);
-  expand %{
-    fcmovF_regU(cop, cr, dst, src);
-  %}
-%}
-
-// unsigned version
-instruct fcmovD_regU(cmpOpU cop, eFlagsRegU cr, regD dst, regD src) %{
-  predicate (UseSSE>=2);
-  match(Set dst (CMoveD (Binary cop cr) (Binary dst src)));
-  ins_cost(200);
-  format %{ "Jn$cop   skip\n\t"
-            "MOVSD  $dst,$src\t# float\n"
-      "skip:" %}
-  ins_encode %{
-    Label skip;
-    // Invert sense of branch from sense of CMOV
-    __ jccb((Assembler::Condition)($cop$$cmpcode^1), skip);
-    __ movdbl($dst$$XMMRegister, $src$$XMMRegister);
-    __ bind(skip);
-  %}
-  ins_pipe( pipe_slow );
-%}
-
-instruct fcmovD_regUCF(cmpOpUCF cop, eFlagsRegUCF cr, regD dst, regD src) %{
-  predicate (UseSSE>=2);
-  match(Set dst (CMoveD (Binary cop cr) (Binary dst src)));
-  ins_cost(200);
-  expand %{
-    fcmovD_regU(cop, cr, dst, src);
-  %}
-%}
-
-instruct cmovL_reg(cmpOp cop, eFlagsReg cr, eRegL dst, eRegL src) %{
-  predicate(VM_Version::supports_cmov() );
-  match(Set dst (CMoveL (Binary cop cr) (Binary dst src)));
-  ins_cost(200);
-  format %{ "CMOV$cop $dst.lo,$src.lo\n\t"
-            "CMOV$cop $dst.hi,$src.hi" %}
-  opcode(0x0F,0x40);
-  ins_encode( enc_cmov(cop), RegReg_Lo2( dst, src ), enc_cmov(cop), RegReg_Hi2( dst, src ) );
-  ins_pipe( pipe_cmov_reg_long );
-%}
-
-instruct cmovL_regU(cmpOpU cop, eFlagsRegU cr, eRegL dst, eRegL src) %{
-  predicate(VM_Version::supports_cmov() );
-  match(Set dst (CMoveL (Binary cop cr) (Binary dst src)));
-  ins_cost(200);
-  format %{ "CMOV$cop $dst.lo,$src.lo\n\t"
-            "CMOV$cop $dst.hi,$src.hi" %}
-  opcode(0x0F,0x40);
-  ins_encode( enc_cmov(cop), RegReg_Lo2( dst, src ), enc_cmov(cop), RegReg_Hi2( dst, src ) );
-  ins_pipe( pipe_cmov_reg_long );
-%}
-
-instruct cmovL_regUCF(cmpOpUCF cop, eFlagsRegUCF cr, eRegL dst, eRegL src) %{
-  predicate(VM_Version::supports_cmov() );
-  match(Set dst (CMoveL (Binary cop cr) (Binary dst src)));
-  ins_cost(200);
-  expand %{
-    cmovL_regU(cop, cr, dst, src);
-  %}
-%}
-
-//----------Arithmetic Instructions--------------------------------------------
-//----------Addition Instructions----------------------------------------------
-
-// Integer Addition Instructions
-instruct addI_eReg(rRegI dst, rRegI src, eFlagsReg cr) %{
-  match(Set dst (AddI dst src));
-  effect(KILL cr);
-
-  size(2);
-  format %{ "ADD    $dst,$src" %}
-  opcode(0x03);
-  ins_encode( OpcP, RegReg( dst, src) );
-  ins_pipe( ialu_reg_reg );
-%}
-
-instruct addI_eReg_imm(rRegI dst, immI src, eFlagsReg cr) %{
-  match(Set dst (AddI dst src));
-  effect(KILL cr);
-
-  format %{ "ADD    $dst,$src" %}
-  opcode(0x81, 0x00); /* /0 id */
-  ins_encode( OpcSErm( dst, src ), Con8or32( src ) );
-  ins_pipe( ialu_reg );
-%}
-
-instruct incI_eReg(rRegI dst, immI_1 src, eFlagsReg cr) %{
-  predicate(UseIncDec);
-  match(Set dst (AddI dst src));
-  effect(KILL cr);
-
-  size(1);
-  format %{ "INC    $dst" %}
-  opcode(0x40); /*  */
-  ins_encode( Opc_plus( primary, dst ) );
-  ins_pipe( ialu_reg );
-%}
-
-instruct leaI_eReg_immI(rRegI dst, rRegI src0, immI src1) %{
-  match(Set dst (AddI src0 src1));
-  ins_cost(110);
-
-  format %{ "LEA    $dst,[$src0 + $src1]" %}
-  opcode(0x8D); /* 0x8D /r */
-  ins_encode( SetInstMark, OpcP, RegLea( dst, src0, src1 ), ClearInstMark );
-  ins_pipe( ialu_reg_reg );
-%}
-
-instruct leaP_eReg_immI(eRegP dst, eRegP src0, immI src1) %{
-  match(Set dst (AddP src0 src1));
-  ins_cost(110);
-
-  format %{ "LEA    $dst,[$src0 + $src1]\t# ptr" %}
-  opcode(0x8D); /* 0x8D /r */
-  ins_encode( SetInstMark, OpcP, RegLea( dst, src0, src1 ), ClearInstMark );
-  ins_pipe( ialu_reg_reg );
-%}
-
-instruct decI_eReg(rRegI dst, immI_M1 src, eFlagsReg cr) %{
-  predicate(UseIncDec);
-  match(Set dst (AddI dst src));
-  effect(KILL cr);
-
-  size(1);
-  format %{ "DEC    $dst" %}
-  opcode(0x48); /*  */
-  ins_encode( Opc_plus( primary, dst ) );
-  ins_pipe( ialu_reg );
-%}
-
-instruct addP_eReg(eRegP dst, rRegI src, eFlagsReg cr) %{
-  match(Set dst (AddP dst src));
-  effect(KILL cr);
-
-  size(2);
-  format %{ "ADD    $dst,$src" %}
-  opcode(0x03);
-  ins_encode( OpcP, RegReg( dst, src) );
-  ins_pipe( ialu_reg_reg );
-%}
-
-instruct addP_eReg_imm(eRegP dst, immI src, eFlagsReg cr) %{
-  match(Set dst (AddP dst src));
-  effect(KILL cr);
-
-  format %{ "ADD    $dst,$src" %}
-  opcode(0x81,0x00); /* Opcode 81 /0 id */
-  // ins_encode( RegImm( dst, src) );
-  ins_encode( OpcSErm( dst, src ), Con8or32( src ) );
-  ins_pipe( ialu_reg );
-%}
-
-instruct addI_eReg_mem(rRegI dst, memory src, eFlagsReg cr) %{
-  match(Set dst (AddI dst (LoadI src)));
-  effect(KILL cr);
-
-  ins_cost(150);
-  format %{ "ADD    $dst,$src" %}
-  opcode(0x03);
-  ins_encode( SetInstMark, OpcP, RegMem( dst, src), ClearInstMark );
-  ins_pipe( ialu_reg_mem );
-%}
-
-instruct addI_mem_eReg(memory dst, rRegI src, eFlagsReg cr) %{
-  match(Set dst (StoreI dst (AddI (LoadI dst) src)));
-  effect(KILL cr);
-
-  ins_cost(150);
-  format %{ "ADD    $dst,$src" %}
-  opcode(0x01);  /* Opcode 01 /r */
-  ins_encode( SetInstMark, OpcP, RegMem( src, dst ), ClearInstMark );
-  ins_pipe( ialu_mem_reg );
-%}
-
-// Add Memory with Immediate
-instruct addI_mem_imm(memory dst, immI src, eFlagsReg cr) %{
-  match(Set dst (StoreI dst (AddI (LoadI dst) src)));
-  effect(KILL cr);
-
-  ins_cost(125);
-  format %{ "ADD    $dst,$src" %}
-  opcode(0x81);               /* Opcode 81 /0 id */
-  ins_encode( SetInstMark, OpcSE( src ), RMopc_Mem(0x00,dst), Con8or32(src), ClearInstMark );
-  ins_pipe( ialu_mem_imm );
-%}
-
-instruct incI_mem(memory dst, immI_1 src, eFlagsReg cr) %{
-  match(Set dst (StoreI dst (AddI (LoadI dst) src)));
-  effect(KILL cr);
-
-  ins_cost(125);
-  format %{ "INC    $dst" %}
-  opcode(0xFF);               /* Opcode FF /0 */
-  ins_encode( SetInstMark, OpcP, RMopc_Mem(0x00,dst), ClearInstMark);
-  ins_pipe( ialu_mem_imm );
-%}
-
-instruct decI_mem(memory dst, immI_M1 src, eFlagsReg cr) %{
-  match(Set dst (StoreI dst (AddI (LoadI dst) src)));
-  effect(KILL cr);
-
-  ins_cost(125);
-  format %{ "DEC    $dst" %}
-  opcode(0xFF);               /* Opcode FF /1 */
-  ins_encode( SetInstMark, OpcP, RMopc_Mem(0x01,dst), ClearInstMark);
-  ins_pipe( ialu_mem_imm );
-%}
-
-
-instruct checkCastPP( eRegP dst ) %{
-  match(Set dst (CheckCastPP dst));
-
-  size(0);
-  format %{ "#checkcastPP of $dst" %}
-  ins_encode( /*empty encoding*/ );
-  ins_pipe( empty );
-%}
-
-instruct castPP( eRegP dst ) %{
-  match(Set dst (CastPP dst));
-  format %{ "#castPP of $dst" %}
-  ins_encode( /*empty encoding*/ );
-  ins_pipe( empty );
-%}
-
-instruct castII( rRegI dst ) %{
-  match(Set dst (CastII dst));
-  format %{ "#castII of $dst" %}
-  ins_encode( /*empty encoding*/ );
-  ins_cost(0);
-  ins_pipe( empty );
-%}
-
-instruct castLL( eRegL dst ) %{
-  match(Set dst (CastLL dst));
-  format %{ "#castLL of $dst" %}
-  ins_encode( /*empty encoding*/ );
-  ins_cost(0);
-  ins_pipe( empty );
-%}
-
-instruct castFF( regF dst ) %{
-  predicate(UseSSE >= 1);
-  match(Set dst (CastFF dst));
-  format %{ "#castFF of $dst" %}
-  ins_encode( /*empty encoding*/ );
-  ins_cost(0);
-  ins_pipe( empty );
-%}
-
-instruct castDD( regD dst ) %{
-  predicate(UseSSE >= 2);
-  match(Set dst (CastDD dst));
-  format %{ "#castDD of $dst" %}
-  ins_encode( /*empty encoding*/ );
-  ins_cost(0);
-  ins_pipe( empty );
-%}
-
-instruct castFF_PR( regFPR dst ) %{
-  predicate(UseSSE < 1);
-  match(Set dst (CastFF dst));
-  format %{ "#castFF of $dst" %}
-  ins_encode( /*empty encoding*/ );
-  ins_cost(0);
-  ins_pipe( empty );
-%}
-
-instruct castDD_PR( regDPR dst ) %{
-  predicate(UseSSE < 2);
-  match(Set dst (CastDD dst));
-  format %{ "#castDD of $dst" %}
-  ins_encode( /*empty encoding*/ );
-  ins_cost(0);
-  ins_pipe( empty );
-%}
-
-// No flag versions for CompareAndSwap{P,I,L} because matcher can't match them
-
-instruct compareAndSwapL( rRegI res, eSIRegP mem_ptr, eADXRegL oldval, eBCXRegL newval, eFlagsReg cr ) %{
-  match(Set res (CompareAndSwapL mem_ptr (Binary oldval newval)));
-  match(Set res (WeakCompareAndSwapL mem_ptr (Binary oldval newval)));
-  effect(KILL cr, KILL oldval);
-  format %{ "CMPXCHG8 [$mem_ptr],$newval\t# If EDX:EAX==[$mem_ptr] Then store $newval into [$mem_ptr]\n\t"
-            "MOV    $res,0\n\t"
-            "JNE,s  fail\n\t"
-            "MOV    $res,1\n"
-          "fail:" %}
-  ins_encode( enc_cmpxchg8(mem_ptr),
-              enc_flags_ne_to_boolean(res) );
-  ins_pipe( pipe_cmpxchg );
-%}
-
-instruct compareAndSwapP( rRegI res,  pRegP mem_ptr, eAXRegP oldval, eCXRegP newval, eFlagsReg cr) %{
-  match(Set res (CompareAndSwapP mem_ptr (Binary oldval newval)));
-  match(Set res (WeakCompareAndSwapP mem_ptr (Binary oldval newval)));
-  effect(KILL cr, KILL oldval);
-  format %{ "CMPXCHG [$mem_ptr],$newval\t# If EAX==[$mem_ptr] Then store $newval into [$mem_ptr]\n\t"
-            "MOV    $res,0\n\t"
-            "JNE,s  fail\n\t"
-            "MOV    $res,1\n"
-          "fail:" %}
-  ins_encode( enc_cmpxchg(mem_ptr), enc_flags_ne_to_boolean(res) );
-  ins_pipe( pipe_cmpxchg );
-%}
-
-instruct compareAndSwapB( rRegI res, pRegP mem_ptr, eAXRegI oldval, eCXRegI newval, eFlagsReg cr ) %{
-  match(Set res (CompareAndSwapB mem_ptr (Binary oldval newval)));
-  match(Set res (WeakCompareAndSwapB mem_ptr (Binary oldval newval)));
-  effect(KILL cr, KILL oldval);
-  format %{ "CMPXCHGB [$mem_ptr],$newval\t# If EAX==[$mem_ptr] Then store $newval into [$mem_ptr]\n\t"
-            "MOV    $res,0\n\t"
-            "JNE,s  fail\n\t"
-            "MOV    $res,1\n"
-          "fail:" %}
-  ins_encode( enc_cmpxchgb(mem_ptr),
-              enc_flags_ne_to_boolean(res) );
-  ins_pipe( pipe_cmpxchg );
-%}
-
-instruct compareAndSwapS( rRegI res, pRegP mem_ptr, eAXRegI oldval, eCXRegI newval, eFlagsReg cr ) %{
-  match(Set res (CompareAndSwapS mem_ptr (Binary oldval newval)));
-  match(Set res (WeakCompareAndSwapS mem_ptr (Binary oldval newval)));
-  effect(KILL cr, KILL oldval);
-  format %{ "CMPXCHGW [$mem_ptr],$newval\t# If EAX==[$mem_ptr] Then store $newval into [$mem_ptr]\n\t"
-            "MOV    $res,0\n\t"
-            "JNE,s  fail\n\t"
-            "MOV    $res,1\n"
-          "fail:" %}
-  ins_encode( enc_cmpxchgw(mem_ptr),
-              enc_flags_ne_to_boolean(res) );
-  ins_pipe( pipe_cmpxchg );
-%}
-
-instruct compareAndSwapI( rRegI res, pRegP mem_ptr, eAXRegI oldval, eCXRegI newval, eFlagsReg cr) %{
-  match(Set res (CompareAndSwapI mem_ptr (Binary oldval newval)));
-  match(Set res (WeakCompareAndSwapI mem_ptr (Binary oldval newval)));
-  effect(KILL cr, KILL oldval);
-  format %{ "CMPXCHG [$mem_ptr],$newval\t# If EAX==[$mem_ptr] Then store $newval into [$mem_ptr]\n\t"
-            "MOV    $res,0\n\t"
-            "JNE,s  fail\n\t"
-            "MOV    $res,1\n"
-          "fail:" %}
-  ins_encode( enc_cmpxchg(mem_ptr), enc_flags_ne_to_boolean(res) );
-  ins_pipe( pipe_cmpxchg );
-%}
-
-instruct compareAndExchangeL( eSIRegP mem_ptr, eADXRegL oldval, eBCXRegL newval, eFlagsReg cr ) %{
-  match(Set oldval (CompareAndExchangeL mem_ptr (Binary oldval newval)));
-  effect(KILL cr);
-  format %{ "CMPXCHG8 [$mem_ptr],$newval\t# If EDX:EAX==[$mem_ptr] Then store $newval into [$mem_ptr]\n\t" %}
-  ins_encode( enc_cmpxchg8(mem_ptr) );
-  ins_pipe( pipe_cmpxchg );
-%}
-
-instruct compareAndExchangeP( pRegP mem_ptr, eAXRegP oldval, eCXRegP newval, eFlagsReg cr) %{
-  match(Set oldval (CompareAndExchangeP mem_ptr (Binary oldval newval)));
-  effect(KILL cr);
-  format %{ "CMPXCHG [$mem_ptr],$newval\t# If EAX==[$mem_ptr] Then store $newval into [$mem_ptr]\n\t" %}
-  ins_encode( enc_cmpxchg(mem_ptr) );
-  ins_pipe( pipe_cmpxchg );
-%}
-
-instruct compareAndExchangeB( pRegP mem_ptr, eAXRegI oldval, eCXRegI newval, eFlagsReg cr) %{
-  match(Set oldval (CompareAndExchangeB mem_ptr (Binary oldval newval)));
-  effect(KILL cr);
-  format %{ "CMPXCHGB [$mem_ptr],$newval\t# If EAX==[$mem_ptr] Then store $newval into [$mem_ptr]\n\t" %}
-  ins_encode( enc_cmpxchgb(mem_ptr) );
-  ins_pipe( pipe_cmpxchg );
-%}
-
-instruct compareAndExchangeS( pRegP mem_ptr, eAXRegI oldval, eCXRegI newval, eFlagsReg cr) %{
-  match(Set oldval (CompareAndExchangeS mem_ptr (Binary oldval newval)));
-  effect(KILL cr);
-  format %{ "CMPXCHGW [$mem_ptr],$newval\t# If EAX==[$mem_ptr] Then store $newval into [$mem_ptr]\n\t" %}
-  ins_encode( enc_cmpxchgw(mem_ptr) );
-  ins_pipe( pipe_cmpxchg );
-%}
-
-instruct compareAndExchangeI( pRegP mem_ptr, eAXRegI oldval, eCXRegI newval, eFlagsReg cr) %{
-  match(Set oldval (CompareAndExchangeI mem_ptr (Binary oldval newval)));
-  effect(KILL cr);
-  format %{ "CMPXCHG [$mem_ptr],$newval\t# If EAX==[$mem_ptr] Then store $newval into [$mem_ptr]\n\t" %}
-  ins_encode( enc_cmpxchg(mem_ptr) );
-  ins_pipe( pipe_cmpxchg );
-%}
-
-instruct xaddB_no_res( memory mem, Universe dummy, immI add, eFlagsReg cr) %{
-  predicate(n->as_LoadStore()->result_not_used());
-  match(Set dummy (GetAndAddB mem add));
-  effect(KILL cr);
-  format %{ "ADDB  [$mem],$add" %}
-  ins_encode %{
-    __ lock();
-    __ addb($mem$$Address, $add$$constant);
-  %}
-  ins_pipe( pipe_cmpxchg );
-%}
-
-// Important to match to xRegI: only 8-bit regs.
-instruct xaddB( memory mem, xRegI newval, eFlagsReg cr) %{
-  match(Set newval (GetAndAddB mem newval));
-  effect(KILL cr);
-  format %{ "XADDB  [$mem],$newval" %}
-  ins_encode %{
-    __ lock();
-    __ xaddb($mem$$Address, $newval$$Register);
-  %}
-  ins_pipe( pipe_cmpxchg );
-%}
-
-instruct xaddS_no_res( memory mem, Universe dummy, immI add, eFlagsReg cr) %{
-  predicate(n->as_LoadStore()->result_not_used());
-  match(Set dummy (GetAndAddS mem add));
-  effect(KILL cr);
-  format %{ "ADDS  [$mem],$add" %}
-  ins_encode %{
-    __ lock();
-    __ addw($mem$$Address, $add$$constant);
-  %}
-  ins_pipe( pipe_cmpxchg );
-%}
-
-instruct xaddS( memory mem, rRegI newval, eFlagsReg cr) %{
-  match(Set newval (GetAndAddS mem newval));
-  effect(KILL cr);
-  format %{ "XADDS  [$mem],$newval" %}
-  ins_encode %{
-    __ lock();
-    __ xaddw($mem$$Address, $newval$$Register);
-  %}
-  ins_pipe( pipe_cmpxchg );
-%}
-
-instruct xaddI_no_res( memory mem, Universe dummy, immI add, eFlagsReg cr) %{
-  predicate(n->as_LoadStore()->result_not_used());
-  match(Set dummy (GetAndAddI mem add));
-  effect(KILL cr);
-  format %{ "ADDL  [$mem],$add" %}
-  ins_encode %{
-    __ lock();
-    __ addl($mem$$Address, $add$$constant);
-  %}
-  ins_pipe( pipe_cmpxchg );
-%}
-
-instruct xaddI( memory mem, rRegI newval, eFlagsReg cr) %{
-  match(Set newval (GetAndAddI mem newval));
-  effect(KILL cr);
-  format %{ "XADDL  [$mem],$newval" %}
-  ins_encode %{
-    __ lock();
-    __ xaddl($mem$$Address, $newval$$Register);
-  %}
-  ins_pipe( pipe_cmpxchg );
-%}
-
-// Important to match to xRegI: only 8-bit regs.
-instruct xchgB( memory mem, xRegI newval) %{
-  match(Set newval (GetAndSetB mem newval));
-  format %{ "XCHGB  $newval,[$mem]" %}
-  ins_encode %{
-    __ xchgb($newval$$Register, $mem$$Address);
-  %}
-  ins_pipe( pipe_cmpxchg );
-%}
-
-instruct xchgS( memory mem, rRegI newval) %{
-  match(Set newval (GetAndSetS mem newval));
-  format %{ "XCHGW  $newval,[$mem]" %}
-  ins_encode %{
-    __ xchgw($newval$$Register, $mem$$Address);
-  %}
-  ins_pipe( pipe_cmpxchg );
-%}
-
-instruct xchgI( memory mem, rRegI newval) %{
-  match(Set newval (GetAndSetI mem newval));
-  format %{ "XCHGL  $newval,[$mem]" %}
-  ins_encode %{
-    __ xchgl($newval$$Register, $mem$$Address);
-  %}
-  ins_pipe( pipe_cmpxchg );
-%}
-
-instruct xchgP( memory mem, pRegP newval) %{
-  match(Set newval (GetAndSetP mem newval));
-  format %{ "XCHGL  $newval,[$mem]" %}
-  ins_encode %{
-    __ xchgl($newval$$Register, $mem$$Address);
-  %}
-  ins_pipe( pipe_cmpxchg );
-%}
-
-//----------Subtraction Instructions-------------------------------------------
-
-// Integer Subtraction Instructions
-instruct subI_eReg(rRegI dst, rRegI src, eFlagsReg cr) %{
-  match(Set dst (SubI dst src));
-  effect(KILL cr);
-
-  size(2);
-  format %{ "SUB    $dst,$src" %}
-  opcode(0x2B);
-  ins_encode( OpcP, RegReg( dst, src) );
-  ins_pipe( ialu_reg_reg );
-%}
-
-instruct subI_eReg_imm(rRegI dst, immI src, eFlagsReg cr) %{
-  match(Set dst (SubI dst src));
-  effect(KILL cr);
-
-  format %{ "SUB    $dst,$src" %}
-  opcode(0x81,0x05);  /* Opcode 81 /5 */
-  // ins_encode( RegImm( dst, src) );
-  ins_encode( OpcSErm( dst, src ), Con8or32( src ) );
-  ins_pipe( ialu_reg );
-%}
-
-instruct subI_eReg_mem(rRegI dst, memory src, eFlagsReg cr) %{
-  match(Set dst (SubI dst (LoadI src)));
-  effect(KILL cr);
-
-  ins_cost(150);
-  format %{ "SUB    $dst,$src" %}
-  opcode(0x2B);
-  ins_encode( SetInstMark, OpcP, RegMem( dst, src), ClearInstMark );
-  ins_pipe( ialu_reg_mem );
-%}
-
-instruct subI_mem_eReg(memory dst, rRegI src, eFlagsReg cr) %{
-  match(Set dst (StoreI dst (SubI (LoadI dst) src)));
-  effect(KILL cr);
-
-  ins_cost(150);
-  format %{ "SUB    $dst,$src" %}
-  opcode(0x29);  /* Opcode 29 /r */
-  ins_encode( SetInstMark, OpcP, RegMem( src, dst ), ClearInstMark );
-  ins_pipe( ialu_mem_reg );
-%}
-
-// Subtract from a pointer
-instruct subP_eReg(eRegP dst, rRegI src, immI_0 zero, eFlagsReg cr) %{
-  match(Set dst (AddP dst (SubI zero src)));
-  effect(KILL cr);
-
-  size(2);
-  format %{ "SUB    $dst,$src" %}
-  opcode(0x2B);
-  ins_encode( OpcP, RegReg( dst, src) );
-  ins_pipe( ialu_reg_reg );
-%}
-
-instruct negI_eReg(rRegI dst, immI_0 zero, eFlagsReg cr) %{
-  match(Set dst (SubI zero dst));
-  effect(KILL cr);
-
-  size(2);
-  format %{ "NEG    $dst" %}
-  opcode(0xF7,0x03);  // Opcode F7 /3
-  ins_encode( OpcP, RegOpc( dst ) );
-  ins_pipe( ialu_reg );
-%}
-
-//----------Multiplication/Division Instructions-------------------------------
-// Integer Multiplication Instructions
-// Multiply Register
-instruct mulI_eReg(rRegI dst, rRegI src, eFlagsReg cr) %{
-  match(Set dst (MulI dst src));
-  effect(KILL cr);
-
-  size(3);
-  ins_cost(300);
-  format %{ "IMUL   $dst,$src" %}
-  opcode(0xAF, 0x0F);
-  ins_encode( OpcS, OpcP, RegReg( dst, src) );
-  ins_pipe( ialu_reg_reg_alu0 );
-%}
-
-// Multiply 32-bit Immediate
-instruct mulI_eReg_imm(rRegI dst, rRegI src, immI imm, eFlagsReg cr) %{
-  match(Set dst (MulI src imm));
-  effect(KILL cr);
-
-  ins_cost(300);
-  format %{ "IMUL   $dst,$src,$imm" %}
-  opcode(0x69);  /* 69 /r id */
-  ins_encode( OpcSE(imm), RegReg( dst, src ), Con8or32( imm ) );
-  ins_pipe( ialu_reg_reg_alu0 );
-%}
-
-instruct loadConL_low_only(eADXRegL_low_only dst, immL32 src, eFlagsReg cr) %{
-  match(Set dst src);
-  effect(KILL cr);
-
-  // Note that this is artificially increased to make it more expensive than loadConL
-  ins_cost(250);
-  format %{ "MOV    EAX,$src\t// low word only" %}
-  opcode(0xB8);
-  ins_encode( LdImmL_Lo(dst, src) );
-  ins_pipe( ialu_reg_fat );
-%}
-
-// Multiply by 32-bit Immediate, taking the shifted high order results
-//  (special case for shift by 32)
-instruct mulI_imm_high(eDXRegI dst, nadxRegI src1, eADXRegL_low_only src2, immI_32 cnt, eFlagsReg cr) %{
-  match(Set dst (ConvL2I (RShiftL (MulL (ConvI2L src1) src2) cnt)));
-  predicate( _kids[0]->_kids[0]->_kids[1]->_leaf->Opcode() == Op_ConL &&
-             _kids[0]->_kids[0]->_kids[1]->_leaf->as_Type()->type()->is_long()->get_con() >= min_jint &&
-             _kids[0]->_kids[0]->_kids[1]->_leaf->as_Type()->type()->is_long()->get_con() <= max_jint );
-  effect(USE src1, KILL cr);
-
-  // Note that this is adjusted by 150 to compensate for the overcosting of loadConL_low_only
-  ins_cost(0*100 + 1*400 - 150);
-  format %{ "IMUL   EDX:EAX,$src1" %}
-  ins_encode( multiply_con_and_shift_high( dst, src1, src2, cnt, cr ) );
-  ins_pipe( pipe_slow );
-%}
-
-// Multiply by 32-bit Immediate, taking the shifted high order results
-instruct mulI_imm_RShift_high(eDXRegI dst, nadxRegI src1, eADXRegL_low_only src2, immI_32_63 cnt, eFlagsReg cr) %{
-  match(Set dst (ConvL2I (RShiftL (MulL (ConvI2L src1) src2) cnt)));
-  predicate( _kids[0]->_kids[0]->_kids[1]->_leaf->Opcode() == Op_ConL &&
-             _kids[0]->_kids[0]->_kids[1]->_leaf->as_Type()->type()->is_long()->get_con() >= min_jint &&
-             _kids[0]->_kids[0]->_kids[1]->_leaf->as_Type()->type()->is_long()->get_con() <= max_jint );
-  effect(USE src1, KILL cr);
-
-  // Note that this is adjusted by 150 to compensate for the overcosting of loadConL_low_only
-  ins_cost(1*100 + 1*400 - 150);
-  format %{ "IMUL   EDX:EAX,$src1\n\t"
-            "SAR    EDX,$cnt-32" %}
-  ins_encode( multiply_con_and_shift_high( dst, src1, src2, cnt, cr ) );
-  ins_pipe( pipe_slow );
-%}
-
-// Multiply Memory 32-bit Immediate
-instruct mulI_mem_imm(rRegI dst, memory src, immI imm, eFlagsReg cr) %{
-  match(Set dst (MulI (LoadI src) imm));
-  effect(KILL cr);
-
-  ins_cost(300);
-  format %{ "IMUL   $dst,$src,$imm" %}
-  opcode(0x69);  /* 69 /r id */
-  ins_encode( SetInstMark, OpcSE(imm), RegMem( dst, src ), Con8or32( imm ), ClearInstMark );
-  ins_pipe( ialu_reg_mem_alu0 );
-%}
-
-// Multiply Memory
-instruct mulI(rRegI dst, memory src, eFlagsReg cr) %{
-  match(Set dst (MulI dst (LoadI src)));
-  effect(KILL cr);
-
-  ins_cost(350);
-  format %{ "IMUL   $dst,$src" %}
-  opcode(0xAF, 0x0F);
-  ins_encode( SetInstMark, OpcS, OpcP, RegMem( dst, src), ClearInstMark );
-  ins_pipe( ialu_reg_mem_alu0 );
-%}
-
-instruct mulAddS2I_rReg(rRegI dst, rRegI src1, rRegI src2, rRegI src3, eFlagsReg cr)
-%{
-  match(Set dst (MulAddS2I (Binary dst src1) (Binary src2 src3)));
-  effect(KILL cr, KILL src2);
-
-  expand %{ mulI_eReg(dst, src1, cr);
-           mulI_eReg(src2, src3, cr);
-           addI_eReg(dst, src2, cr); %}
-%}
-
-// Multiply Register Int to Long
-instruct mulI2L(eADXRegL dst, eAXRegI src, nadxRegI src1, eFlagsReg flags) %{
-  // Basic Idea: long = (long)int * (long)int
-  match(Set dst (MulL (ConvI2L src) (ConvI2L src1)));
-  effect(DEF dst, USE src, USE src1, KILL flags);
-
-  ins_cost(300);
-  format %{ "IMUL   $dst,$src1" %}
-
-  ins_encode( long_int_multiply( dst, src1 ) );
-  ins_pipe( ialu_reg_reg_alu0 );
-%}
-
-instruct mulIS_eReg(eADXRegL dst, immL_32bits mask, eFlagsReg flags, eAXRegI src, nadxRegI src1) %{
-  // Basic Idea:  long = (int & 0xffffffffL) * (int & 0xffffffffL)
-  match(Set dst (MulL (AndL (ConvI2L src) mask) (AndL (ConvI2L src1) mask)));
-  effect(KILL flags);
-
-  ins_cost(300);
-  format %{ "MUL    $dst,$src1" %}
-
-  ins_encode( long_uint_multiply(dst, src1) );
-  ins_pipe( ialu_reg_reg_alu0 );
-%}
-
-// Multiply Register Long
-instruct mulL_eReg(eADXRegL dst, eRegL src, rRegI tmp, eFlagsReg cr) %{
-  match(Set dst (MulL dst src));
-  effect(KILL cr, TEMP tmp);
-  ins_cost(4*100+3*400);
-// Basic idea: lo(result) = lo(x_lo * y_lo)
-//             hi(result) = hi(x_lo * y_lo) + lo(x_hi * y_lo) + lo(x_lo * y_hi)
-  format %{ "MOV    $tmp,$src.lo\n\t"
-            "IMUL   $tmp,EDX\n\t"
-            "MOV    EDX,$src.hi\n\t"
-            "IMUL   EDX,EAX\n\t"
-            "ADD    $tmp,EDX\n\t"
-            "MUL    EDX:EAX,$src.lo\n\t"
-            "ADD    EDX,$tmp" %}
-  ins_encode( long_multiply( dst, src, tmp ) );
-  ins_pipe( pipe_slow );
-%}
-
-// Multiply Register Long where the left operand's high 32 bits are zero
-instruct mulL_eReg_lhi0(eADXRegL dst, eRegL src, rRegI tmp, eFlagsReg cr) %{
-  predicate(is_operand_hi32_zero(n->in(1)));
-  match(Set dst (MulL dst src));
-  effect(KILL cr, TEMP tmp);
-  ins_cost(2*100+2*400);
-// Basic idea: lo(result) = lo(x_lo * y_lo)
-//             hi(result) = hi(x_lo * y_lo) + lo(x_lo * y_hi) where lo(x_hi * y_lo) = 0 because x_hi = 0
-  format %{ "MOV    $tmp,$src.hi\n\t"
-            "IMUL   $tmp,EAX\n\t"
-            "MUL    EDX:EAX,$src.lo\n\t"
-            "ADD    EDX,$tmp" %}
-  ins_encode %{
-    __ movl($tmp$$Register, HIGH_FROM_LOW($src$$Register));
-    __ imull($tmp$$Register, rax);
-    __ mull($src$$Register);
-    __ addl(rdx, $tmp$$Register);
-  %}
-  ins_pipe( pipe_slow );
-%}
-
-// Multiply Register Long where the right operand's high 32 bits are zero
-instruct mulL_eReg_rhi0(eADXRegL dst, eRegL src, rRegI tmp, eFlagsReg cr) %{
-  predicate(is_operand_hi32_zero(n->in(2)));
-  match(Set dst (MulL dst src));
-  effect(KILL cr, TEMP tmp);
-  ins_cost(2*100+2*400);
-// Basic idea: lo(result) = lo(x_lo * y_lo)
-//             hi(result) = hi(x_lo * y_lo) + lo(x_hi * y_lo) where lo(x_lo * y_hi) = 0 because y_hi = 0
-  format %{ "MOV    $tmp,$src.lo\n\t"
-            "IMUL   $tmp,EDX\n\t"
-            "MUL    EDX:EAX,$src.lo\n\t"
-            "ADD    EDX,$tmp" %}
-  ins_encode %{
-    __ movl($tmp$$Register, $src$$Register);
-    __ imull($tmp$$Register, rdx);
-    __ mull($src$$Register);
-    __ addl(rdx, $tmp$$Register);
-  %}
-  ins_pipe( pipe_slow );
-%}
-
-// Multiply Register Long where the left and the right operands' high 32 bits are zero
-instruct mulL_eReg_hi0(eADXRegL dst, eRegL src, eFlagsReg cr) %{
-  predicate(is_operand_hi32_zero(n->in(1)) && is_operand_hi32_zero(n->in(2)));
-  match(Set dst (MulL dst src));
-  effect(KILL cr);
-  ins_cost(1*400);
-// Basic idea: lo(result) = lo(x_lo * y_lo)
-//             hi(result) = hi(x_lo * y_lo) where lo(x_hi * y_lo) = 0 and lo(x_lo * y_hi) = 0 because x_hi = 0 and y_hi = 0
-  format %{ "MUL    EDX:EAX,$src.lo\n\t" %}
-  ins_encode %{
-    __ mull($src$$Register);
-  %}
-  ins_pipe( pipe_slow );
-%}
-
-// Multiply Register Long by small constant
-instruct mulL_eReg_con(eADXRegL dst, immL_127 src, rRegI tmp, eFlagsReg cr) %{
-  match(Set dst (MulL dst src));
-  effect(KILL cr, TEMP tmp);
-  ins_cost(2*100+2*400);
-  size(12);
-// Basic idea: lo(result) = lo(src * EAX)
-//             hi(result) = hi(src * EAX) + lo(src * EDX)
-  format %{ "IMUL   $tmp,EDX,$src\n\t"
-            "MOV    EDX,$src\n\t"
-            "MUL    EDX\t# EDX*EAX -> EDX:EAX\n\t"
-            "ADD    EDX,$tmp" %}
-  ins_encode( long_multiply_con( dst, src, tmp ) );
-  ins_pipe( pipe_slow );
-%}
-
-// Integer DIV with Register
-instruct divI_eReg(eAXRegI rax, eDXRegI rdx, eCXRegI div, eFlagsReg cr) %{
-  match(Set rax (DivI rax div));
-  effect(KILL rdx, KILL cr);
-  size(26);
-  ins_cost(30*100+10*100);
-  format %{ "CMP    EAX,0x80000000\n\t"
-            "JNE,s  normal\n\t"
-            "XOR    EDX,EDX\n\t"
-            "CMP    ECX,-1\n\t"
-            "JE,s   done\n"
-    "normal: CDQ\n\t"
-            "IDIV   $div\n\t"
-    "done:"        %}
-  opcode(0xF7, 0x7);  /* Opcode F7 /7 */
-  ins_encode( cdq_enc, OpcP, RegOpc(div) );
-  ins_pipe( ialu_reg_reg_alu0 );
-%}
-
-// Divide Register Long
-instruct divL_eReg(eADXRegL dst, eRegL src1, eRegL src2) %{
-  match(Set dst (DivL src1 src2));
-  effect(CALL);
-  ins_cost(10000);
-  format %{ "PUSH   $src1.hi\n\t"
-            "PUSH   $src1.lo\n\t"
-            "PUSH   $src2.hi\n\t"
-            "PUSH   $src2.lo\n\t"
-            "CALL   SharedRuntime::ldiv\n\t"
-            "ADD    ESP,16" %}
-  ins_encode( long_div(src1,src2) );
-  ins_pipe( pipe_slow );
-%}
-
-// Integer DIVMOD with Register, both quotient and mod results
-instruct divModI_eReg_divmod(eAXRegI rax, eDXRegI rdx, eCXRegI div, eFlagsReg cr) %{
-  match(DivModI rax div);
-  effect(KILL cr);
-  size(26);
-  ins_cost(30*100+10*100);
-  format %{ "CMP    EAX,0x80000000\n\t"
-            "JNE,s  normal\n\t"
-            "XOR    EDX,EDX\n\t"
-            "CMP    ECX,-1\n\t"
-            "JE,s   done\n"
-    "normal: CDQ\n\t"
-            "IDIV   $div\n\t"
-    "done:"        %}
-  opcode(0xF7, 0x7);  /* Opcode F7 /7 */
-  ins_encode( cdq_enc, OpcP, RegOpc(div) );
-  ins_pipe( pipe_slow );
-%}
-
-// Integer MOD with Register
-instruct modI_eReg(eDXRegI rdx, eAXRegI rax, eCXRegI div, eFlagsReg cr) %{
-  match(Set rdx (ModI rax div));
-  effect(KILL rax, KILL cr);
-
-  size(26);
-  ins_cost(300);
-  format %{ "CDQ\n\t"
-            "IDIV   $div" %}
-  opcode(0xF7, 0x7);  /* Opcode F7 /7 */
-  ins_encode( cdq_enc, OpcP, RegOpc(div) );
-  ins_pipe( ialu_reg_reg_alu0 );
-%}
-
-// Remainder Register Long
-instruct modL_eReg(eADXRegL dst, eRegL src1, eRegL src2) %{
-  match(Set dst (ModL src1 src2));
-  effect(CALL);
-  ins_cost(10000);
-  format %{ "PUSH   $src1.hi\n\t"
-            "PUSH   $src1.lo\n\t"
-            "PUSH   $src2.hi\n\t"
-            "PUSH   $src2.lo\n\t"
-            "CALL   SharedRuntime::lrem\n\t"
-            "ADD    ESP,16" %}
-  ins_encode( long_mod(src1,src2) );
-  ins_pipe( pipe_slow );
-%}
-
-// Divide Register Long (no special case since divisor != -1)
-instruct divL_eReg_imm32( eADXRegL dst, immL32 imm, rRegI tmp, rRegI tmp2, eFlagsReg cr ) %{
-  match(Set dst (DivL dst imm));
-  effect( TEMP tmp, TEMP tmp2, KILL cr );
-  ins_cost(1000);
-  format %{ "MOV    $tmp,abs($imm) # ldiv EDX:EAX,$imm\n\t"
-            "XOR    $tmp2,$tmp2\n\t"
-            "CMP    $tmp,EDX\n\t"
-            "JA,s   fast\n\t"
-            "MOV    $tmp2,EAX\n\t"
-            "MOV    EAX,EDX\n\t"
-            "MOV    EDX,0\n\t"
-            "JLE,s  pos\n\t"
-            "LNEG   EAX : $tmp2\n\t"
-            "DIV    $tmp # unsigned division\n\t"
-            "XCHG   EAX,$tmp2\n\t"
-            "DIV    $tmp\n\t"
-            "LNEG   $tmp2 : EAX\n\t"
-            "JMP,s  done\n"
-    "pos:\n\t"
-            "DIV    $tmp\n\t"
-            "XCHG   EAX,$tmp2\n"
-    "fast:\n\t"
-            "DIV    $tmp\n"
-    "done:\n\t"
-            "MOV    EDX,$tmp2\n\t"
-            "NEG    EDX:EAX # if $imm < 0" %}
-  ins_encode %{
-    int con = (int)$imm$$constant;
-    assert(con != 0 && con != -1 && con != min_jint, "wrong divisor");
-    int pcon = (con > 0) ? con : -con;
-    Label Lfast, Lpos, Ldone;
-
-    __ movl($tmp$$Register, pcon);
-    __ xorl($tmp2$$Register,$tmp2$$Register);
-    __ cmpl($tmp$$Register, HIGH_FROM_LOW($dst$$Register));
-    __ jccb(Assembler::above, Lfast); // result fits into 32 bit
-
-    __ movl($tmp2$$Register, $dst$$Register); // save
-    __ movl($dst$$Register, HIGH_FROM_LOW($dst$$Register));
-    __ movl(HIGH_FROM_LOW($dst$$Register),0); // preserve flags
-    __ jccb(Assembler::lessEqual, Lpos); // result is positive
-
-    // Negative dividend.
-    // convert value to positive to use unsigned division
-    __ lneg($dst$$Register, $tmp2$$Register);
-    __ divl($tmp$$Register);
-    __ xchgl($dst$$Register, $tmp2$$Register);
-    __ divl($tmp$$Register);
-    // revert result back to negative
-    __ lneg($tmp2$$Register, $dst$$Register);
-    __ jmpb(Ldone);
-
-    __ bind(Lpos);
-    __ divl($tmp$$Register); // Use unsigned division
-    __ xchgl($dst$$Register, $tmp2$$Register);
-    // Fallthrow for final divide, tmp2 has 32 bit hi result
-
-    __ bind(Lfast);
-    // fast path: src is positive
-    __ divl($tmp$$Register); // Use unsigned division
-
-    __ bind(Ldone);
-    __ movl(HIGH_FROM_LOW($dst$$Register),$tmp2$$Register);
-    if (con < 0) {
-      __ lneg(HIGH_FROM_LOW($dst$$Register), $dst$$Register);
-    }
-  %}
-  ins_pipe( pipe_slow );
-%}
-
-// Remainder Register Long (remainder fit into 32 bits)
-instruct modL_eReg_imm32( eADXRegL dst, immL32 imm, rRegI tmp, rRegI tmp2, eFlagsReg cr ) %{
-  match(Set dst (ModL dst imm));
-  effect( TEMP tmp, TEMP tmp2, KILL cr );
-  ins_cost(1000);
-  format %{ "MOV    $tmp,abs($imm) # lrem EDX:EAX,$imm\n\t"
-            "CMP    $tmp,EDX\n\t"
-            "JA,s   fast\n\t"
-            "MOV    $tmp2,EAX\n\t"
-            "MOV    EAX,EDX\n\t"
-            "MOV    EDX,0\n\t"
-            "JLE,s  pos\n\t"
-            "LNEG   EAX : $tmp2\n\t"
-            "DIV    $tmp # unsigned division\n\t"
-            "MOV    EAX,$tmp2\n\t"
-            "DIV    $tmp\n\t"
-            "NEG    EDX\n\t"
-            "JMP,s  done\n"
-    "pos:\n\t"
-            "DIV    $tmp\n\t"
-            "MOV    EAX,$tmp2\n"
-    "fast:\n\t"
-            "DIV    $tmp\n"
-    "done:\n\t"
-            "MOV    EAX,EDX\n\t"
-            "SAR    EDX,31\n\t" %}
-  ins_encode %{
-    int con = (int)$imm$$constant;
-    assert(con != 0 && con != -1 && con != min_jint, "wrong divisor");
-    int pcon = (con > 0) ? con : -con;
-    Label  Lfast, Lpos, Ldone;
-
-    __ movl($tmp$$Register, pcon);
-    __ cmpl($tmp$$Register, HIGH_FROM_LOW($dst$$Register));
-    __ jccb(Assembler::above, Lfast); // src is positive and result fits into 32 bit
-
-    __ movl($tmp2$$Register, $dst$$Register); // save
-    __ movl($dst$$Register, HIGH_FROM_LOW($dst$$Register));
-    __ movl(HIGH_FROM_LOW($dst$$Register),0); // preserve flags
-    __ jccb(Assembler::lessEqual, Lpos); // result is positive
-
-    // Negative dividend.
-    // convert value to positive to use unsigned division
-    __ lneg($dst$$Register, $tmp2$$Register);
-    __ divl($tmp$$Register);
-    __ movl($dst$$Register, $tmp2$$Register);
-    __ divl($tmp$$Register);
-    // revert remainder back to negative
-    __ negl(HIGH_FROM_LOW($dst$$Register));
-    __ jmpb(Ldone);
-
-    __ bind(Lpos);
-    __ divl($tmp$$Register);
-    __ movl($dst$$Register, $tmp2$$Register);
-
-    __ bind(Lfast);
-    // fast path: src is positive
-    __ divl($tmp$$Register);
-
-    __ bind(Ldone);
-    __ movl($dst$$Register, HIGH_FROM_LOW($dst$$Register));
-    __ sarl(HIGH_FROM_LOW($dst$$Register), 31); // result sign
-
-  %}
-  ins_pipe( pipe_slow );
-%}
-
-// Integer Shift Instructions
-// Shift Left by one
-instruct shlI_eReg_1(rRegI dst, immI_1 shift, eFlagsReg cr) %{
-  match(Set dst (LShiftI dst shift));
-  effect(KILL cr);
-
-  size(2);
-  format %{ "SHL    $dst,$shift" %}
-  opcode(0xD1, 0x4);  /* D1 /4 */
-  ins_encode( OpcP, RegOpc( dst ) );
-  ins_pipe( ialu_reg );
-%}
-
-// Shift Left by 8-bit immediate
-instruct salI_eReg_imm(rRegI dst, immI8 shift, eFlagsReg cr) %{
-  match(Set dst (LShiftI dst shift));
-  effect(KILL cr);
-
-  size(3);
-  format %{ "SHL    $dst,$shift" %}
-  opcode(0xC1, 0x4);  /* C1 /4 ib */
-  ins_encode( RegOpcImm( dst, shift) );
-  ins_pipe( ialu_reg );
-%}
-
-// Shift Left by variable
-instruct salI_eReg_CL(rRegI dst, eCXRegI shift, eFlagsReg cr) %{
-  match(Set dst (LShiftI dst shift));
-  effect(KILL cr);
-
-  size(2);
-  format %{ "SHL    $dst,$shift" %}
-  opcode(0xD3, 0x4);  /* D3 /4 */
-  ins_encode( OpcP, RegOpc( dst ) );
-  ins_pipe( ialu_reg_reg );
-%}
-
-// Arithmetic shift right by one
-instruct sarI_eReg_1(rRegI dst, immI_1 shift, eFlagsReg cr) %{
-  match(Set dst (RShiftI dst shift));
-  effect(KILL cr);
-
-  size(2);
-  format %{ "SAR    $dst,$shift" %}
-  opcode(0xD1, 0x7);  /* D1 /7 */
-  ins_encode( OpcP, RegOpc( dst ) );
-  ins_pipe( ialu_reg );
-%}
-
-// Arithmetic shift right by one
-instruct sarI_mem_1(memory dst, immI_1 shift, eFlagsReg cr) %{
-  match(Set dst (StoreI dst (RShiftI (LoadI dst) shift)));
-  effect(KILL cr);
-  format %{ "SAR    $dst,$shift" %}
-  opcode(0xD1, 0x7);  /* D1 /7 */
-  ins_encode( SetInstMark, OpcP, RMopc_Mem(secondary,dst), ClearInstMark );
-  ins_pipe( ialu_mem_imm );
-%}
-
-// Arithmetic Shift Right by 8-bit immediate
-instruct sarI_eReg_imm(rRegI dst, immI8 shift, eFlagsReg cr) %{
-  match(Set dst (RShiftI dst shift));
-  effect(KILL cr);
-
-  size(3);
-  format %{ "SAR    $dst,$shift" %}
-  opcode(0xC1, 0x7);  /* C1 /7 ib */
-  ins_encode( RegOpcImm( dst, shift ) );
-  ins_pipe( ialu_mem_imm );
-%}
-
-// Arithmetic Shift Right by 8-bit immediate
-instruct sarI_mem_imm(memory dst, immI8 shift, eFlagsReg cr) %{
-  match(Set dst (StoreI dst (RShiftI (LoadI dst) shift)));
-  effect(KILL cr);
-
-  format %{ "SAR    $dst,$shift" %}
-  opcode(0xC1, 0x7);  /* C1 /7 ib */
-  ins_encode( SetInstMark, OpcP, RMopc_Mem(secondary, dst ), Con8or32(shift), ClearInstMark );
-  ins_pipe( ialu_mem_imm );
-%}
-
-// Arithmetic Shift Right by variable
-instruct sarI_eReg_CL(rRegI dst, eCXRegI shift, eFlagsReg cr) %{
-  match(Set dst (RShiftI dst shift));
-  effect(KILL cr);
-
-  size(2);
-  format %{ "SAR    $dst,$shift" %}
-  opcode(0xD3, 0x7);  /* D3 /7 */
-  ins_encode( OpcP, RegOpc( dst ) );
-  ins_pipe( ialu_reg_reg );
-%}
-
-// Logical shift right by one
-instruct shrI_eReg_1(rRegI dst, immI_1 shift, eFlagsReg cr) %{
-  match(Set dst (URShiftI dst shift));
-  effect(KILL cr);
-
-  size(2);
-  format %{ "SHR    $dst,$shift" %}
-  opcode(0xD1, 0x5);  /* D1 /5 */
-  ins_encode( OpcP, RegOpc( dst ) );
-  ins_pipe( ialu_reg );
-%}
-
-// Logical Shift Right by 8-bit immediate
-instruct shrI_eReg_imm(rRegI dst, immI8 shift, eFlagsReg cr) %{
-  match(Set dst (URShiftI dst shift));
-  effect(KILL cr);
-
-  size(3);
-  format %{ "SHR    $dst,$shift" %}
-  opcode(0xC1, 0x5);  /* C1 /5 ib */
-  ins_encode( RegOpcImm( dst, shift) );
-  ins_pipe( ialu_reg );
-%}
-
-
-// Logical Shift Right by 24, followed by Arithmetic Shift Left by 24.
-// This idiom is used by the compiler for the i2b bytecode.
-instruct i2b(rRegI dst, xRegI src, immI_24 twentyfour) %{
-  match(Set dst (RShiftI (LShiftI src twentyfour) twentyfour));
-
-  size(3);
-  format %{ "MOVSX  $dst,$src :8" %}
-  ins_encode %{
-    __ movsbl($dst$$Register, $src$$Register);
-  %}
-  ins_pipe(ialu_reg_reg);
-%}
-
-// Logical Shift Right by 16, followed by Arithmetic Shift Left by 16.
-// This idiom is used by the compiler the i2s bytecode.
-instruct i2s(rRegI dst, xRegI src, immI_16 sixteen) %{
-  match(Set dst (RShiftI (LShiftI src sixteen) sixteen));
-
-  size(3);
-  format %{ "MOVSX  $dst,$src :16" %}
-  ins_encode %{
-    __ movswl($dst$$Register, $src$$Register);
-  %}
-  ins_pipe(ialu_reg_reg);
-%}
-
-
-// Logical Shift Right by variable
-instruct shrI_eReg_CL(rRegI dst, eCXRegI shift, eFlagsReg cr) %{
-  match(Set dst (URShiftI dst shift));
-  effect(KILL cr);
-
-  size(2);
-  format %{ "SHR    $dst,$shift" %}
-  opcode(0xD3, 0x5);  /* D3 /5 */
-  ins_encode( OpcP, RegOpc( dst ) );
-  ins_pipe( ialu_reg_reg );
-%}
-
-
-//----------Logical Instructions-----------------------------------------------
-//----------Integer Logical Instructions---------------------------------------
-// And Instructions
-// And Register with Register
-instruct andI_eReg(rRegI dst, rRegI src, eFlagsReg cr) %{
-  match(Set dst (AndI dst src));
-  effect(KILL cr);
-
-  size(2);
-  format %{ "AND    $dst,$src" %}
-  opcode(0x23);
-  ins_encode( OpcP, RegReg( dst, src) );
-  ins_pipe( ialu_reg_reg );
-%}
-
-// And Register with Immediate
-instruct andI_eReg_imm(rRegI dst, immI src, eFlagsReg cr) %{
-  match(Set dst (AndI dst src));
-  effect(KILL cr);
-
-  format %{ "AND    $dst,$src" %}
-  opcode(0x81,0x04);  /* Opcode 81 /4 */
-  // ins_encode( RegImm( dst, src) );
-  ins_encode( OpcSErm( dst, src ), Con8or32( src ) );
-  ins_pipe( ialu_reg );
-%}
-
-// And Register with Memory
-instruct andI_eReg_mem(rRegI dst, memory src, eFlagsReg cr) %{
-  match(Set dst (AndI dst (LoadI src)));
-  effect(KILL cr);
-
-  ins_cost(150);
-  format %{ "AND    $dst,$src" %}
-  opcode(0x23);
-  ins_encode( SetInstMark, OpcP, RegMem( dst, src), ClearInstMark );
-  ins_pipe( ialu_reg_mem );
-%}
-
-// And Memory with Register
-instruct andI_mem_eReg(memory dst, rRegI src, eFlagsReg cr) %{
-  match(Set dst (StoreI dst (AndI (LoadI dst) src)));
-  effect(KILL cr);
-
-  ins_cost(150);
-  format %{ "AND    $dst,$src" %}
-  opcode(0x21);  /* Opcode 21 /r */
-  ins_encode( SetInstMark, OpcP, RegMem( src, dst ), ClearInstMark );
-  ins_pipe( ialu_mem_reg );
-%}
-
-// And Memory with Immediate
-instruct andI_mem_imm(memory dst, immI src, eFlagsReg cr) %{
-  match(Set dst (StoreI dst (AndI (LoadI dst) src)));
-  effect(KILL cr);
-
-  ins_cost(125);
-  format %{ "AND    $dst,$src" %}
-  opcode(0x81, 0x4);  /* Opcode 81 /4 id */
-  // ins_encode( MemImm( dst, src) );
-  ins_encode( SetInstMark, OpcSE( src ), RMopc_Mem(secondary, dst ), Con8or32(src), ClearInstMark );
-  ins_pipe( ialu_mem_imm );
-%}
-
-// BMI1 instructions
-instruct andnI_rReg_rReg_rReg(rRegI dst, rRegI src1, rRegI src2, immI_M1 minus_1, eFlagsReg cr) %{
-  match(Set dst (AndI (XorI src1 minus_1) src2));
-  predicate(UseBMI1Instructions);
-  effect(KILL cr);
-
-  format %{ "ANDNL  $dst, $src1, $src2" %}
-
-  ins_encode %{
-    __ andnl($dst$$Register, $src1$$Register, $src2$$Register);
-  %}
-  ins_pipe(ialu_reg);
-%}
-
-instruct andnI_rReg_rReg_mem(rRegI dst, rRegI src1, memory src2, immI_M1 minus_1, eFlagsReg cr) %{
-  match(Set dst (AndI (XorI src1 minus_1) (LoadI src2) ));
-  predicate(UseBMI1Instructions);
-  effect(KILL cr);
-
-  ins_cost(125);
-  format %{ "ANDNL  $dst, $src1, $src2" %}
-
-  ins_encode %{
-    __ andnl($dst$$Register, $src1$$Register, $src2$$Address);
-  %}
-  ins_pipe(ialu_reg_mem);
-%}
-
-instruct blsiI_rReg_rReg(rRegI dst, rRegI src, immI_0 imm_zero, eFlagsReg cr) %{
-  match(Set dst (AndI (SubI imm_zero src) src));
-  predicate(UseBMI1Instructions);
-  effect(KILL cr);
-
-  format %{ "BLSIL  $dst, $src" %}
-
-  ins_encode %{
-    __ blsil($dst$$Register, $src$$Register);
-  %}
-  ins_pipe(ialu_reg);
-%}
-
-instruct blsiI_rReg_mem(rRegI dst, memory src, immI_0 imm_zero, eFlagsReg cr) %{
-  match(Set dst (AndI (SubI imm_zero (LoadI src) ) (LoadI src) ));
-  predicate(UseBMI1Instructions);
-  effect(KILL cr);
-
-  ins_cost(125);
-  format %{ "BLSIL  $dst, $src" %}
-
-  ins_encode %{
-    __ blsil($dst$$Register, $src$$Address);
-  %}
-  ins_pipe(ialu_reg_mem);
-%}
-
-instruct blsmskI_rReg_rReg(rRegI dst, rRegI src, immI_M1 minus_1, eFlagsReg cr)
-%{
-  match(Set dst (XorI (AddI src minus_1) src));
-  predicate(UseBMI1Instructions);
-  effect(KILL cr);
-
-  format %{ "BLSMSKL $dst, $src" %}
-
-  ins_encode %{
-    __ blsmskl($dst$$Register, $src$$Register);
-  %}
-
-  ins_pipe(ialu_reg);
-%}
-
-instruct blsmskI_rReg_mem(rRegI dst, memory src, immI_M1 minus_1, eFlagsReg cr)
-%{
-  match(Set dst (XorI (AddI (LoadI src) minus_1) (LoadI src) ));
-  predicate(UseBMI1Instructions);
-  effect(KILL cr);
-
-  ins_cost(125);
-  format %{ "BLSMSKL $dst, $src" %}
-
-  ins_encode %{
-    __ blsmskl($dst$$Register, $src$$Address);
-  %}
-
-  ins_pipe(ialu_reg_mem);
-%}
-
-instruct blsrI_rReg_rReg(rRegI dst, rRegI src, immI_M1 minus_1, eFlagsReg cr)
-%{
-  match(Set dst (AndI (AddI src minus_1) src) );
-  predicate(UseBMI1Instructions);
-  effect(KILL cr);
-
-  format %{ "BLSRL  $dst, $src" %}
-
-  ins_encode %{
-    __ blsrl($dst$$Register, $src$$Register);
-  %}
-
-  ins_pipe(ialu_reg);
-%}
-
-instruct blsrI_rReg_mem(rRegI dst, memory src, immI_M1 minus_1, eFlagsReg cr)
-%{
-  match(Set dst (AndI (AddI (LoadI src) minus_1) (LoadI src) ));
-  predicate(UseBMI1Instructions);
-  effect(KILL cr);
-
-  ins_cost(125);
-  format %{ "BLSRL  $dst, $src" %}
-
-  ins_encode %{
-    __ blsrl($dst$$Register, $src$$Address);
-  %}
-
-  ins_pipe(ialu_reg_mem);
-%}
-
-// Or Instructions
-// Or Register with Register
-instruct orI_eReg(rRegI dst, rRegI src, eFlagsReg cr) %{
-  match(Set dst (OrI dst src));
-  effect(KILL cr);
-
-  size(2);
-  format %{ "OR     $dst,$src" %}
-  opcode(0x0B);
-  ins_encode( OpcP, RegReg( dst, src) );
-  ins_pipe( ialu_reg_reg );
-%}
-
-instruct orI_eReg_castP2X(rRegI dst, eRegP src, eFlagsReg cr) %{
-  match(Set dst (OrI dst (CastP2X src)));
-  effect(KILL cr);
-
-  size(2);
-  format %{ "OR     $dst,$src" %}
-  opcode(0x0B);
-  ins_encode( OpcP, RegReg( dst, src) );
-  ins_pipe( ialu_reg_reg );
-%}
-
-
-// Or Register with Immediate
-instruct orI_eReg_imm(rRegI dst, immI src, eFlagsReg cr) %{
-  match(Set dst (OrI dst src));
-  effect(KILL cr);
-
-  format %{ "OR     $dst,$src" %}
-  opcode(0x81,0x01);  /* Opcode 81 /1 id */
-  // ins_encode( RegImm( dst, src) );
-  ins_encode( OpcSErm( dst, src ), Con8or32( src ) );
-  ins_pipe( ialu_reg );
-%}
-
-// Or Register with Memory
-instruct orI_eReg_mem(rRegI dst, memory src, eFlagsReg cr) %{
-  match(Set dst (OrI dst (LoadI src)));
-  effect(KILL cr);
-
-  ins_cost(150);
-  format %{ "OR     $dst,$src" %}
-  opcode(0x0B);
-  ins_encode( SetInstMark, OpcP, RegMem( dst, src), ClearInstMark );
-  ins_pipe( ialu_reg_mem );
-%}
-
-// Or Memory with Register
-instruct orI_mem_eReg(memory dst, rRegI src, eFlagsReg cr) %{
-  match(Set dst (StoreI dst (OrI (LoadI dst) src)));
-  effect(KILL cr);
-
-  ins_cost(150);
-  format %{ "OR     $dst,$src" %}
-  opcode(0x09);  /* Opcode 09 /r */
-  ins_encode( SetInstMark, OpcP, RegMem( src, dst ), ClearInstMark );
-  ins_pipe( ialu_mem_reg );
-%}
-
-// Or Memory with Immediate
-instruct orI_mem_imm(memory dst, immI src, eFlagsReg cr) %{
-  match(Set dst (StoreI dst (OrI (LoadI dst) src)));
-  effect(KILL cr);
-
-  ins_cost(125);
-  format %{ "OR     $dst,$src" %}
-  opcode(0x81,0x1);  /* Opcode 81 /1 id */
-  // ins_encode( MemImm( dst, src) );
-  ins_encode( SetInstMark, OpcSE( src ), RMopc_Mem(secondary, dst ), Con8or32(src), ClearInstMark );
-  ins_pipe( ialu_mem_imm );
-%}
-
-// ROL/ROR
-// ROL expand
-instruct rolI_eReg_imm1(rRegI dst, immI_1 shift, eFlagsReg cr) %{
-  effect(USE_DEF dst, USE shift, KILL cr);
-
-  format %{ "ROL    $dst, $shift" %}
-  opcode(0xD1, 0x0); /* Opcode D1 /0 */
-  ins_encode( OpcP, RegOpc( dst ));
-  ins_pipe( ialu_reg );
-%}
-
-instruct rolI_eReg_imm8(rRegI dst, immI8 shift, eFlagsReg cr) %{
-  effect(USE_DEF dst, USE shift, KILL cr);
-
-  format %{ "ROL    $dst, $shift" %}
-  opcode(0xC1, 0x0); /*Opcode /C1  /0  */
-  ins_encode( RegOpcImm(dst, shift) );
-  ins_pipe(ialu_reg);
-%}
-
-instruct rolI_eReg_CL(ncxRegI dst, eCXRegI shift, eFlagsReg cr) %{
-  effect(USE_DEF dst, USE shift, KILL cr);
-
-  format %{ "ROL    $dst, $shift" %}
-  opcode(0xD3, 0x0);    /* Opcode D3 /0 */
-  ins_encode(OpcP, RegOpc(dst));
-  ins_pipe( ialu_reg_reg );
-%}
-// end of ROL expand
-
-// ROL 32bit by one once
-instruct rolI_eReg_i1(rRegI dst, immI_1 lshift, immI_M1 rshift, eFlagsReg cr) %{
-  match(Set dst ( OrI (LShiftI dst lshift) (URShiftI dst rshift)));
-
-  expand %{
-    rolI_eReg_imm1(dst, lshift, cr);
-  %}
-%}
-
-// ROL 32bit var by imm8 once
-instruct rolI_eReg_i8(rRegI dst, immI8 lshift, immI8 rshift, eFlagsReg cr) %{
-  predicate(  0 == ((n->in(1)->in(2)->get_int() + n->in(2)->in(2)->get_int()) & 0x1f));
-  match(Set dst ( OrI (LShiftI dst lshift) (URShiftI dst rshift)));
-
-  expand %{
-    rolI_eReg_imm8(dst, lshift, cr);
-  %}
-%}
-
-// ROL 32bit var by var once
-instruct rolI_eReg_Var_C0(ncxRegI dst, eCXRegI shift, immI_0 zero, eFlagsReg cr) %{
-  match(Set dst ( OrI (LShiftI dst shift) (URShiftI dst (SubI zero shift))));
-
-  expand %{
-    rolI_eReg_CL(dst, shift, cr);
-  %}
-%}
-
-// ROL 32bit var by var once
-instruct rolI_eReg_Var_C32(ncxRegI dst, eCXRegI shift, immI_32 c32, eFlagsReg cr) %{
-  match(Set dst ( OrI (LShiftI dst shift) (URShiftI dst (SubI c32 shift))));
-
-  expand %{
-    rolI_eReg_CL(dst, shift, cr);
-  %}
-%}
-
-// ROR expand
-instruct rorI_eReg_imm1(rRegI dst, immI_1 shift, eFlagsReg cr) %{
-  effect(USE_DEF dst, USE shift, KILL cr);
-
-  format %{ "ROR    $dst, $shift" %}
-  opcode(0xD1,0x1);  /* Opcode D1 /1 */
-  ins_encode( OpcP, RegOpc( dst ) );
-  ins_pipe( ialu_reg );
-%}
-
-instruct rorI_eReg_imm8(rRegI dst, immI8 shift, eFlagsReg cr) %{
-  effect (USE_DEF dst, USE shift, KILL cr);
-
-  format %{ "ROR    $dst, $shift" %}
-  opcode(0xC1, 0x1); /* Opcode /C1 /1 ib */
-  ins_encode( RegOpcImm(dst, shift) );
-  ins_pipe( ialu_reg );
-%}
-
-instruct rorI_eReg_CL(ncxRegI dst, eCXRegI shift, eFlagsReg cr)%{
-  effect(USE_DEF dst, USE shift, KILL cr);
-
-  format %{ "ROR    $dst, $shift" %}
-  opcode(0xD3, 0x1);    /* Opcode D3 /1 */
-  ins_encode(OpcP, RegOpc(dst));
-  ins_pipe( ialu_reg_reg );
-%}
-// end of ROR expand
-
-// ROR right once
-instruct rorI_eReg_i1(rRegI dst, immI_1 rshift, immI_M1 lshift, eFlagsReg cr) %{
-  match(Set dst ( OrI (URShiftI dst rshift) (LShiftI dst lshift)));
-
-  expand %{
-    rorI_eReg_imm1(dst, rshift, cr);
-  %}
-%}
-
-// ROR 32bit by immI8 once
-instruct rorI_eReg_i8(rRegI dst, immI8 rshift, immI8 lshift, eFlagsReg cr) %{
-  predicate(  0 == ((n->in(1)->in(2)->get_int() + n->in(2)->in(2)->get_int()) & 0x1f));
-  match(Set dst ( OrI (URShiftI dst rshift) (LShiftI dst lshift)));
-
-  expand %{
-    rorI_eReg_imm8(dst, rshift, cr);
-  %}
-%}
-
-// ROR 32bit var by var once
-instruct rorI_eReg_Var_C0(ncxRegI dst, eCXRegI shift, immI_0 zero, eFlagsReg cr) %{
-  match(Set dst ( OrI (URShiftI dst shift) (LShiftI dst (SubI zero shift))));
-
-  expand %{
-    rorI_eReg_CL(dst, shift, cr);
-  %}
-%}
-
-// ROR 32bit var by var once
-instruct rorI_eReg_Var_C32(ncxRegI dst, eCXRegI shift, immI_32 c32, eFlagsReg cr) %{
-  match(Set dst ( OrI (URShiftI dst shift) (LShiftI dst (SubI c32 shift))));
-
-  expand %{
-    rorI_eReg_CL(dst, shift, cr);
-  %}
-%}
-
-// Xor Instructions
-// Xor Register with Register
-instruct xorI_eReg(rRegI dst, rRegI src, eFlagsReg cr) %{
-  match(Set dst (XorI dst src));
-  effect(KILL cr);
-
-  size(2);
-  format %{ "XOR    $dst,$src" %}
-  opcode(0x33);
-  ins_encode( OpcP, RegReg( dst, src) );
-  ins_pipe( ialu_reg_reg );
-%}
-
-// Xor Register with Immediate -1
-instruct xorI_eReg_im1(rRegI dst, immI_M1 imm) %{
-  match(Set dst (XorI dst imm));
-
-  size(2);
-  format %{ "NOT    $dst" %}
-  ins_encode %{
-     __ notl($dst$$Register);
-  %}
-  ins_pipe( ialu_reg );
-%}
-
-// Xor Register with Immediate
-instruct xorI_eReg_imm(rRegI dst, immI src, eFlagsReg cr) %{
-  match(Set dst (XorI dst src));
-  effect(KILL cr);
-
-  format %{ "XOR    $dst,$src" %}
-  opcode(0x81,0x06);  /* Opcode 81 /6 id */
-  // ins_encode( RegImm( dst, src) );
-  ins_encode( OpcSErm( dst, src ), Con8or32( src ) );
-  ins_pipe( ialu_reg );
-%}
-
-// Xor Register with Memory
-instruct xorI_eReg_mem(rRegI dst, memory src, eFlagsReg cr) %{
-  match(Set dst (XorI dst (LoadI src)));
-  effect(KILL cr);
-
-  ins_cost(150);
-  format %{ "XOR    $dst,$src" %}
-  opcode(0x33);
-  ins_encode( SetInstMark, OpcP, RegMem(dst, src), ClearInstMark );
-  ins_pipe( ialu_reg_mem );
-%}
-
-// Xor Memory with Register
-instruct xorI_mem_eReg(memory dst, rRegI src, eFlagsReg cr) %{
-  match(Set dst (StoreI dst (XorI (LoadI dst) src)));
-  effect(KILL cr);
-
-  ins_cost(150);
-  format %{ "XOR    $dst,$src" %}
-  opcode(0x31);  /* Opcode 31 /r */
-  ins_encode( SetInstMark, OpcP, RegMem( src, dst ), ClearInstMark );
-  ins_pipe( ialu_mem_reg );
-%}
-
-// Xor Memory with Immediate
-instruct xorI_mem_imm(memory dst, immI src, eFlagsReg cr) %{
-  match(Set dst (StoreI dst (XorI (LoadI dst) src)));
-  effect(KILL cr);
-
-  ins_cost(125);
-  format %{ "XOR    $dst,$src" %}
-  opcode(0x81,0x6);  /* Opcode 81 /6 id */
-  ins_encode( SetInstMark, OpcSE( src ), RMopc_Mem(secondary, dst ), Con8or32(src), ClearInstMark );
-  ins_pipe( ialu_mem_imm );
-%}
-
-//----------Convert Int to Boolean---------------------------------------------
-
-instruct movI_nocopy(rRegI dst, rRegI src) %{
-  effect( DEF dst, USE src );
-  format %{ "MOV    $dst,$src" %}
-  ins_encode( enc_Copy( dst, src) );
-  ins_pipe( ialu_reg_reg );
-%}
-
-instruct ci2b( rRegI dst, rRegI src, eFlagsReg cr ) %{
-  effect( USE_DEF dst, USE src, KILL cr );
-
-  size(4);
-  format %{ "NEG    $dst\n\t"
-            "ADC    $dst,$src" %}
-  ins_encode( neg_reg(dst),
-              OpcRegReg(0x13,dst,src) );
-  ins_pipe( ialu_reg_reg_long );
-%}
-
-instruct convI2B( rRegI dst, rRegI src, eFlagsReg cr ) %{
-  match(Set dst (Conv2B src));
-
-  expand %{
-    movI_nocopy(dst,src);
-    ci2b(dst,src,cr);
-  %}
-%}
-
-instruct movP_nocopy(rRegI dst, eRegP src) %{
-  effect( DEF dst, USE src );
-  format %{ "MOV    $dst,$src" %}
-  ins_encode( enc_Copy( dst, src) );
-  ins_pipe( ialu_reg_reg );
-%}
-
-instruct cp2b( rRegI dst, eRegP src, eFlagsReg cr ) %{
-  effect( USE_DEF dst, USE src, KILL cr );
-  format %{ "NEG    $dst\n\t"
-            "ADC    $dst,$src" %}
-  ins_encode( neg_reg(dst),
-              OpcRegReg(0x13,dst,src) );
-  ins_pipe( ialu_reg_reg_long );
-%}
-
-instruct convP2B( rRegI dst, eRegP src, eFlagsReg cr ) %{
-  match(Set dst (Conv2B src));
-
-  expand %{
-    movP_nocopy(dst,src);
-    cp2b(dst,src,cr);
-  %}
-%}
-
-instruct cmpLTMask(eCXRegI dst, ncxRegI p, ncxRegI q, eFlagsReg cr) %{
-  match(Set dst (CmpLTMask p q));
-  effect(KILL cr);
-  ins_cost(400);
-
-  // SETlt can only use low byte of EAX,EBX, ECX, or EDX as destination
-  format %{ "XOR    $dst,$dst\n\t"
-            "CMP    $p,$q\n\t"
-            "SETlt  $dst\n\t"
-            "NEG    $dst" %}
-  ins_encode %{
-    Register Rp = $p$$Register;
-    Register Rq = $q$$Register;
-    Register Rd = $dst$$Register;
-    Label done;
-    __ xorl(Rd, Rd);
-    __ cmpl(Rp, Rq);
-    __ setb(Assembler::less, Rd);
-    __ negl(Rd);
-  %}
-
-  ins_pipe(pipe_slow);
-%}
-
-instruct cmpLTMask0(rRegI dst, immI_0 zero, eFlagsReg cr) %{
-  match(Set dst (CmpLTMask dst zero));
-  effect(DEF dst, KILL cr);
-  ins_cost(100);
-
-  format %{ "SAR    $dst,31\t# cmpLTMask0" %}
-  ins_encode %{
-  __ sarl($dst$$Register, 31);
-  %}
-  ins_pipe(ialu_reg);
-%}
-
-/* better to save a register than avoid a branch */
-instruct cadd_cmpLTMask(rRegI p, rRegI q, rRegI y, eFlagsReg cr) %{
-  match(Set p (AddI (AndI (CmpLTMask p q) y) (SubI p q)));
-  effect(KILL cr);
-  ins_cost(400);
-  format %{ "SUB    $p,$q\t# cadd_cmpLTMask\n\t"
-            "JGE    done\n\t"
-            "ADD    $p,$y\n"
-            "done:  " %}
-  ins_encode %{
-    Register Rp = $p$$Register;
-    Register Rq = $q$$Register;
-    Register Ry = $y$$Register;
-    Label done;
-    __ subl(Rp, Rq);
-    __ jccb(Assembler::greaterEqual, done);
-    __ addl(Rp, Ry);
-    __ bind(done);
-  %}
-
-  ins_pipe(pipe_cmplt);
-%}
-
-/* better to save a register than avoid a branch */
-instruct and_cmpLTMask(rRegI p, rRegI q, rRegI y, eFlagsReg cr) %{
-  match(Set y (AndI (CmpLTMask p q) y));
-  effect(KILL cr);
-
-  ins_cost(300);
-
-  format %{ "CMPL     $p, $q\t# and_cmpLTMask\n\t"
-            "JLT      done\n\t"
-            "XORL     $y, $y\n"
-            "done:  " %}
-  ins_encode %{
-    Register Rp = $p$$Register;
-    Register Rq = $q$$Register;
-    Register Ry = $y$$Register;
-    Label done;
-    __ cmpl(Rp, Rq);
-    __ jccb(Assembler::less, done);
-    __ xorl(Ry, Ry);
-    __ bind(done);
-  %}
-
-  ins_pipe(pipe_cmplt);
-%}
-
-/* If I enable this, I encourage spilling in the inner loop of compress.
-instruct cadd_cmpLTMask_mem(ncxRegI p, ncxRegI q, memory y, eCXRegI tmp, eFlagsReg cr) %{
-  match(Set p (AddI (AndI (CmpLTMask p q) (LoadI y)) (SubI p q)));
-*/
-//----------Overflow Math Instructions-----------------------------------------
-
-instruct overflowAddI_eReg(eFlagsReg cr, eAXRegI op1, rRegI op2)
-%{
-  match(Set cr (OverflowAddI op1 op2));
-  effect(DEF cr, USE_KILL op1, USE op2);
-
-  format %{ "ADD    $op1, $op2\t# overflow check int" %}
-
-  ins_encode %{
-    __ addl($op1$$Register, $op2$$Register);
-  %}
-  ins_pipe(ialu_reg_reg);
-%}
-
-instruct overflowAddI_rReg_imm(eFlagsReg cr, eAXRegI op1, immI op2)
-%{
-  match(Set cr (OverflowAddI op1 op2));
-  effect(DEF cr, USE_KILL op1, USE op2);
-
-  format %{ "ADD    $op1, $op2\t# overflow check int" %}
-
-  ins_encode %{
-    __ addl($op1$$Register, $op2$$constant);
-  %}
-  ins_pipe(ialu_reg_reg);
-%}
-
-instruct overflowSubI_rReg(eFlagsReg cr, rRegI op1, rRegI op2)
-%{
-  match(Set cr (OverflowSubI op1 op2));
-
-  format %{ "CMP    $op1, $op2\t# overflow check int" %}
-  ins_encode %{
-    __ cmpl($op1$$Register, $op2$$Register);
-  %}
-  ins_pipe(ialu_reg_reg);
-%}
-
-instruct overflowSubI_rReg_imm(eFlagsReg cr, rRegI op1, immI op2)
-%{
-  match(Set cr (OverflowSubI op1 op2));
-
-  format %{ "CMP    $op1, $op2\t# overflow check int" %}
-  ins_encode %{
-    __ cmpl($op1$$Register, $op2$$constant);
-  %}
-  ins_pipe(ialu_reg_reg);
-%}
-
-instruct overflowNegI_rReg(eFlagsReg cr, immI_0 zero, eAXRegI op2)
-%{
-  match(Set cr (OverflowSubI zero op2));
-  effect(DEF cr, USE_KILL op2);
-
-  format %{ "NEG    $op2\t# overflow check int" %}
-  ins_encode %{
-    __ negl($op2$$Register);
-  %}
-  ins_pipe(ialu_reg_reg);
-%}
-
-instruct overflowMulI_rReg(eFlagsReg cr, eAXRegI op1, rRegI op2)
-%{
-  match(Set cr (OverflowMulI op1 op2));
-  effect(DEF cr, USE_KILL op1, USE op2);
-
-  format %{ "IMUL    $op1, $op2\t# overflow check int" %}
-  ins_encode %{
-    __ imull($op1$$Register, $op2$$Register);
-  %}
-  ins_pipe(ialu_reg_reg_alu0);
-%}
-
-instruct overflowMulI_rReg_imm(eFlagsReg cr, rRegI op1, immI op2, rRegI tmp)
-%{
-  match(Set cr (OverflowMulI op1 op2));
-  effect(DEF cr, TEMP tmp, USE op1, USE op2);
-
-  format %{ "IMUL    $tmp, $op1, $op2\t# overflow check int" %}
-  ins_encode %{
-    __ imull($tmp$$Register, $op1$$Register, $op2$$constant);
-  %}
-  ins_pipe(ialu_reg_reg_alu0);
-%}
-
-// Integer Absolute Instructions
-instruct absI_rReg(rRegI dst, rRegI src, rRegI tmp, eFlagsReg cr)
-%{
-  match(Set dst (AbsI src));
-  effect(TEMP dst, TEMP tmp, KILL cr);
-  format %{ "movl $tmp, $src\n\t"
-            "sarl $tmp, 31\n\t"
-            "movl $dst, $src\n\t"
-            "xorl $dst, $tmp\n\t"
-            "subl $dst, $tmp\n"
-          %}
-  ins_encode %{
-    __ movl($tmp$$Register, $src$$Register);
-    __ sarl($tmp$$Register, 31);
-    __ movl($dst$$Register, $src$$Register);
-    __ xorl($dst$$Register, $tmp$$Register);
-    __ subl($dst$$Register, $tmp$$Register);
-  %}
-
-  ins_pipe(ialu_reg_reg);
-%}
-
-//----------Long Instructions------------------------------------------------
-// Add Long Register with Register
-instruct addL_eReg(eRegL dst, eRegL src, eFlagsReg cr) %{
-  match(Set dst (AddL dst src));
-  effect(KILL cr);
-  ins_cost(200);
-  format %{ "ADD    $dst.lo,$src.lo\n\t"
-            "ADC    $dst.hi,$src.hi" %}
-  opcode(0x03, 0x13);
-  ins_encode( RegReg_Lo(dst, src), RegReg_Hi(dst,src) );
-  ins_pipe( ialu_reg_reg_long );
-%}
-
-// Add Long Register with Immediate
-instruct addL_eReg_imm(eRegL dst, immL src, eFlagsReg cr) %{
-  match(Set dst (AddL dst src));
-  effect(KILL cr);
-  format %{ "ADD    $dst.lo,$src.lo\n\t"
-            "ADC    $dst.hi,$src.hi" %}
-  opcode(0x81,0x00,0x02);  /* Opcode 81 /0, 81 /2 */
-  ins_encode( Long_OpcSErm_Lo( dst, src ), Long_OpcSErm_Hi( dst, src ) );
-  ins_pipe( ialu_reg_long );
-%}
-
-// Add Long Register with Memory
-instruct addL_eReg_mem(eRegL dst, load_long_memory mem, eFlagsReg cr) %{
-  match(Set dst (AddL dst (LoadL mem)));
-  effect(KILL cr);
-  ins_cost(125);
-  format %{ "ADD    $dst.lo,$mem\n\t"
-            "ADC    $dst.hi,$mem+4" %}
-  opcode(0x03, 0x13);
-  ins_encode( SetInstMark, OpcP, RegMem( dst, mem), OpcS, RegMem_Hi(dst,mem), ClearInstMark );
-  ins_pipe( ialu_reg_long_mem );
-%}
-
-// Subtract Long Register with Register.
-instruct subL_eReg(eRegL dst, eRegL src, eFlagsReg cr) %{
-  match(Set dst (SubL dst src));
-  effect(KILL cr);
-  ins_cost(200);
-  format %{ "SUB    $dst.lo,$src.lo\n\t"
-            "SBB    $dst.hi,$src.hi" %}
-  opcode(0x2B, 0x1B);
-  ins_encode( RegReg_Lo(dst, src), RegReg_Hi(dst,src) );
-  ins_pipe( ialu_reg_reg_long );
-%}
-
-// Subtract Long Register with Immediate
-instruct subL_eReg_imm(eRegL dst, immL src, eFlagsReg cr) %{
-  match(Set dst (SubL dst src));
-  effect(KILL cr);
-  format %{ "SUB    $dst.lo,$src.lo\n\t"
-            "SBB    $dst.hi,$src.hi" %}
-  opcode(0x81,0x05,0x03);  /* Opcode 81 /5, 81 /3 */
-  ins_encode( Long_OpcSErm_Lo( dst, src ), Long_OpcSErm_Hi( dst, src ) );
-  ins_pipe( ialu_reg_long );
-%}
-
-// Subtract Long Register with Memory
-instruct subL_eReg_mem(eRegL dst, load_long_memory mem, eFlagsReg cr) %{
-  match(Set dst (SubL dst (LoadL mem)));
-  effect(KILL cr);
-  ins_cost(125);
-  format %{ "SUB    $dst.lo,$mem\n\t"
-            "SBB    $dst.hi,$mem+4" %}
-  opcode(0x2B, 0x1B);
-  ins_encode( SetInstMark, OpcP, RegMem( dst, mem), OpcS, RegMem_Hi(dst,mem), ClearInstMark );
-  ins_pipe( ialu_reg_long_mem );
-%}
-
-instruct negL_eReg(eRegL dst, immL0 zero, eFlagsReg cr) %{
-  match(Set dst (SubL zero dst));
-  effect(KILL cr);
-  ins_cost(300);
-  format %{ "NEG    $dst.hi\n\tNEG    $dst.lo\n\tSBB    $dst.hi,0" %}
-  ins_encode( neg_long(dst) );
-  ins_pipe( ialu_reg_reg_long );
-%}
-
-// And Long Register with Register
-instruct andL_eReg(eRegL dst, eRegL src, eFlagsReg cr) %{
-  match(Set dst (AndL dst src));
-  effect(KILL cr);
-  format %{ "AND    $dst.lo,$src.lo\n\t"
-            "AND    $dst.hi,$src.hi" %}
-  opcode(0x23,0x23);
-  ins_encode( RegReg_Lo( dst, src), RegReg_Hi( dst, src) );
-  ins_pipe( ialu_reg_reg_long );
-%}
-
-// And Long Register with Immediate
-instruct andL_eReg_imm(eRegL dst, immL src, eFlagsReg cr) %{
-  match(Set dst (AndL dst src));
-  effect(KILL cr);
-  format %{ "AND    $dst.lo,$src.lo\n\t"
-            "AND    $dst.hi,$src.hi" %}
-  opcode(0x81,0x04,0x04);  /* Opcode 81 /4, 81 /4 */
-  ins_encode( Long_OpcSErm_Lo( dst, src ), Long_OpcSErm_Hi( dst, src ) );
-  ins_pipe( ialu_reg_long );
-%}
-
-// And Long Register with Memory
-instruct andL_eReg_mem(eRegL dst, load_long_memory mem, eFlagsReg cr) %{
-  match(Set dst (AndL dst (LoadL mem)));
-  effect(KILL cr);
-  ins_cost(125);
-  format %{ "AND    $dst.lo,$mem\n\t"
-            "AND    $dst.hi,$mem+4" %}
-  opcode(0x23, 0x23);
-  ins_encode( SetInstMark, OpcP, RegMem( dst, mem), OpcS, RegMem_Hi(dst,mem), ClearInstMark );
-  ins_pipe( ialu_reg_long_mem );
-%}
-
-// BMI1 instructions
-instruct andnL_eReg_eReg_eReg(eRegL dst, eRegL src1, eRegL src2, immL_M1 minus_1, eFlagsReg cr) %{
-  match(Set dst (AndL (XorL src1 minus_1) src2));
-  predicate(UseBMI1Instructions);
-  effect(KILL cr, TEMP dst);
-
-  format %{ "ANDNL  $dst.lo, $src1.lo, $src2.lo\n\t"
-            "ANDNL  $dst.hi, $src1.hi, $src2.hi"
-         %}
-
-  ins_encode %{
-    Register Rdst = $dst$$Register;
-    Register Rsrc1 = $src1$$Register;
-    Register Rsrc2 = $src2$$Register;
-    __ andnl(Rdst, Rsrc1, Rsrc2);
-    __ andnl(HIGH_FROM_LOW(Rdst), HIGH_FROM_LOW(Rsrc1), HIGH_FROM_LOW(Rsrc2));
-  %}
-  ins_pipe(ialu_reg_reg_long);
-%}
-
-instruct andnL_eReg_eReg_mem(eRegL dst, eRegL src1, memory src2, immL_M1 minus_1, eFlagsReg cr) %{
-  match(Set dst (AndL (XorL src1 minus_1) (LoadL src2) ));
-  predicate(UseBMI1Instructions);
-  effect(KILL cr, TEMP dst);
-
-  ins_cost(125);
-  format %{ "ANDNL  $dst.lo, $src1.lo, $src2\n\t"
-            "ANDNL  $dst.hi, $src1.hi, $src2+4"
-         %}
-
-  ins_encode %{
-    Register Rdst = $dst$$Register;
-    Register Rsrc1 = $src1$$Register;
-    Address src2_hi = Address::make_raw($src2$$base, $src2$$index, $src2$$scale, $src2$$disp + 4, relocInfo::none);
-
-    __ andnl(Rdst, Rsrc1, $src2$$Address);
-    __ andnl(HIGH_FROM_LOW(Rdst), HIGH_FROM_LOW(Rsrc1), src2_hi);
-  %}
-  ins_pipe(ialu_reg_mem);
-%}
-
-instruct blsiL_eReg_eReg(eRegL dst, eRegL src, immL0 imm_zero, eFlagsReg cr) %{
-  match(Set dst (AndL (SubL imm_zero src) src));
-  predicate(UseBMI1Instructions);
-  effect(KILL cr, TEMP dst);
-
-  format %{ "MOVL   $dst.hi, 0\n\t"
-            "BLSIL  $dst.lo, $src.lo\n\t"
-            "JNZ    done\n\t"
-            "BLSIL  $dst.hi, $src.hi\n"
-            "done:"
-         %}
-
-  ins_encode %{
-    Label done;
-    Register Rdst = $dst$$Register;
-    Register Rsrc = $src$$Register;
-    __ movl(HIGH_FROM_LOW(Rdst), 0);
-    __ blsil(Rdst, Rsrc);
-    __ jccb(Assembler::notZero, done);
-    __ blsil(HIGH_FROM_LOW(Rdst), HIGH_FROM_LOW(Rsrc));
-    __ bind(done);
-  %}
-  ins_pipe(ialu_reg);
-%}
-
-instruct blsiL_eReg_mem(eRegL dst, memory src, immL0 imm_zero, eFlagsReg cr) %{
-  match(Set dst (AndL (SubL imm_zero (LoadL src) ) (LoadL src) ));
-  predicate(UseBMI1Instructions);
-  effect(KILL cr, TEMP dst);
-
-  ins_cost(125);
-  format %{ "MOVL   $dst.hi, 0\n\t"
-            "BLSIL  $dst.lo, $src\n\t"
-            "JNZ    done\n\t"
-            "BLSIL  $dst.hi, $src+4\n"
-            "done:"
-         %}
-
-  ins_encode %{
-    Label done;
-    Register Rdst = $dst$$Register;
-    Address src_hi = Address::make_raw($src$$base, $src$$index, $src$$scale, $src$$disp + 4, relocInfo::none);
-
-    __ movl(HIGH_FROM_LOW(Rdst), 0);
-    __ blsil(Rdst, $src$$Address);
-    __ jccb(Assembler::notZero, done);
-    __ blsil(HIGH_FROM_LOW(Rdst), src_hi);
-    __ bind(done);
-  %}
-  ins_pipe(ialu_reg_mem);
-%}
-
-instruct blsmskL_eReg_eReg(eRegL dst, eRegL src, immL_M1 minus_1, eFlagsReg cr)
-%{
-  match(Set dst (XorL (AddL src minus_1) src));
-  predicate(UseBMI1Instructions);
-  effect(KILL cr, TEMP dst);
-
-  format %{ "MOVL    $dst.hi, 0\n\t"
-            "BLSMSKL $dst.lo, $src.lo\n\t"
-            "JNC     done\n\t"
-            "BLSMSKL $dst.hi, $src.hi\n"
-            "done:"
-         %}
-
-  ins_encode %{
-    Label done;
-    Register Rdst = $dst$$Register;
-    Register Rsrc = $src$$Register;
-    __ movl(HIGH_FROM_LOW(Rdst), 0);
-    __ blsmskl(Rdst, Rsrc);
-    __ jccb(Assembler::carryClear, done);
-    __ blsmskl(HIGH_FROM_LOW(Rdst), HIGH_FROM_LOW(Rsrc));
-    __ bind(done);
-  %}
-
-  ins_pipe(ialu_reg);
-%}
-
-instruct blsmskL_eReg_mem(eRegL dst, memory src, immL_M1 minus_1, eFlagsReg cr)
-%{
-  match(Set dst (XorL (AddL (LoadL src) minus_1) (LoadL src) ));
-  predicate(UseBMI1Instructions);
-  effect(KILL cr, TEMP dst);
-
-  ins_cost(125);
-  format %{ "MOVL    $dst.hi, 0\n\t"
-            "BLSMSKL $dst.lo, $src\n\t"
-            "JNC     done\n\t"
-            "BLSMSKL $dst.hi, $src+4\n"
-            "done:"
-         %}
-
-  ins_encode %{
-    Label done;
-    Register Rdst = $dst$$Register;
-    Address src_hi = Address::make_raw($src$$base, $src$$index, $src$$scale, $src$$disp + 4, relocInfo::none);
-
-    __ movl(HIGH_FROM_LOW(Rdst), 0);
-    __ blsmskl(Rdst, $src$$Address);
-    __ jccb(Assembler::carryClear, done);
-    __ blsmskl(HIGH_FROM_LOW(Rdst), src_hi);
-    __ bind(done);
-  %}
-
-  ins_pipe(ialu_reg_mem);
-%}
-
-instruct blsrL_eReg_eReg(eRegL dst, eRegL src, immL_M1 minus_1, eFlagsReg cr)
-%{
-  match(Set dst (AndL (AddL src minus_1) src) );
-  predicate(UseBMI1Instructions);
-  effect(KILL cr, TEMP dst);
-
-  format %{ "MOVL   $dst.hi, $src.hi\n\t"
-            "BLSRL  $dst.lo, $src.lo\n\t"
-            "JNC    done\n\t"
-            "BLSRL  $dst.hi, $src.hi\n"
-            "done:"
-  %}
-
-  ins_encode %{
-    Label done;
-    Register Rdst = $dst$$Register;
-    Register Rsrc = $src$$Register;
-    __ movl(HIGH_FROM_LOW(Rdst), HIGH_FROM_LOW(Rsrc));
-    __ blsrl(Rdst, Rsrc);
-    __ jccb(Assembler::carryClear, done);
-    __ blsrl(HIGH_FROM_LOW(Rdst), HIGH_FROM_LOW(Rsrc));
-    __ bind(done);
-  %}
-
-  ins_pipe(ialu_reg);
-%}
-
-instruct blsrL_eReg_mem(eRegL dst, memory src, immL_M1 minus_1, eFlagsReg cr)
-%{
-  match(Set dst (AndL (AddL (LoadL src) minus_1) (LoadL src) ));
-  predicate(UseBMI1Instructions);
-  effect(KILL cr, TEMP dst);
-
-  ins_cost(125);
-  format %{ "MOVL   $dst.hi, $src+4\n\t"
-            "BLSRL  $dst.lo, $src\n\t"
-            "JNC    done\n\t"
-            "BLSRL  $dst.hi, $src+4\n"
-            "done:"
-  %}
-
-  ins_encode %{
-    Label done;
-    Register Rdst = $dst$$Register;
-    Address src_hi = Address::make_raw($src$$base, $src$$index, $src$$scale, $src$$disp + 4, relocInfo::none);
-    __ movl(HIGH_FROM_LOW(Rdst), src_hi);
-    __ blsrl(Rdst, $src$$Address);
-    __ jccb(Assembler::carryClear, done);
-    __ blsrl(HIGH_FROM_LOW(Rdst), src_hi);
-    __ bind(done);
-  %}
-
-  ins_pipe(ialu_reg_mem);
-%}
-
-// Or Long Register with Register
-instruct orl_eReg(eRegL dst, eRegL src, eFlagsReg cr) %{
-  match(Set dst (OrL dst src));
-  effect(KILL cr);
-  format %{ "OR     $dst.lo,$src.lo\n\t"
-            "OR     $dst.hi,$src.hi" %}
-  opcode(0x0B,0x0B);
-  ins_encode( RegReg_Lo( dst, src), RegReg_Hi( dst, src) );
-  ins_pipe( ialu_reg_reg_long );
-%}
-
-// Or Long Register with Immediate
-instruct orl_eReg_imm(eRegL dst, immL src, eFlagsReg cr) %{
-  match(Set dst (OrL dst src));
-  effect(KILL cr);
-  format %{ "OR     $dst.lo,$src.lo\n\t"
-            "OR     $dst.hi,$src.hi" %}
-  opcode(0x81,0x01,0x01);  /* Opcode 81 /1, 81 /1 */
-  ins_encode( Long_OpcSErm_Lo( dst, src ), Long_OpcSErm_Hi( dst, src ) );
-  ins_pipe( ialu_reg_long );
-%}
-
-// Or Long Register with Memory
-instruct orl_eReg_mem(eRegL dst, load_long_memory mem, eFlagsReg cr) %{
-  match(Set dst (OrL dst (LoadL mem)));
-  effect(KILL cr);
-  ins_cost(125);
-  format %{ "OR     $dst.lo,$mem\n\t"
-            "OR     $dst.hi,$mem+4" %}
-  opcode(0x0B,0x0B);
-  ins_encode( SetInstMark, OpcP, RegMem( dst, mem), OpcS, RegMem_Hi(dst,mem), ClearInstMark );
-  ins_pipe( ialu_reg_long_mem );
-%}
-
-// Xor Long Register with Register
-instruct xorl_eReg(eRegL dst, eRegL src, eFlagsReg cr) %{
-  match(Set dst (XorL dst src));
-  effect(KILL cr);
-  format %{ "XOR    $dst.lo,$src.lo\n\t"
-            "XOR    $dst.hi,$src.hi" %}
-  opcode(0x33,0x33);
-  ins_encode( RegReg_Lo( dst, src), RegReg_Hi( dst, src) );
-  ins_pipe( ialu_reg_reg_long );
-%}
-
-// Xor Long Register with Immediate -1
-instruct xorl_eReg_im1(eRegL dst, immL_M1 imm) %{
-  match(Set dst (XorL dst imm));
-  format %{ "NOT    $dst.lo\n\t"
-            "NOT    $dst.hi" %}
-  ins_encode %{
-     __ notl($dst$$Register);
-     __ notl(HIGH_FROM_LOW($dst$$Register));
-  %}
-  ins_pipe( ialu_reg_long );
-%}
-
-// Xor Long Register with Immediate
-instruct xorl_eReg_imm(eRegL dst, immL src, eFlagsReg cr) %{
-  match(Set dst (XorL dst src));
-  effect(KILL cr);
-  format %{ "XOR    $dst.lo,$src.lo\n\t"
-            "XOR    $dst.hi,$src.hi" %}
-  opcode(0x81,0x06,0x06);  /* Opcode 81 /6, 81 /6 */
-  ins_encode( Long_OpcSErm_Lo( dst, src ), Long_OpcSErm_Hi( dst, src ) );
-  ins_pipe( ialu_reg_long );
-%}
-
-// Xor Long Register with Memory
-instruct xorl_eReg_mem(eRegL dst, load_long_memory mem, eFlagsReg cr) %{
-  match(Set dst (XorL dst (LoadL mem)));
-  effect(KILL cr);
-  ins_cost(125);
-  format %{ "XOR    $dst.lo,$mem\n\t"
-            "XOR    $dst.hi,$mem+4" %}
-  opcode(0x33,0x33);
-  ins_encode( SetInstMark, OpcP, RegMem( dst, mem), OpcS, RegMem_Hi(dst,mem), ClearInstMark );
-  ins_pipe( ialu_reg_long_mem );
-%}
-
-// Shift Left Long by 1
-instruct shlL_eReg_1(eRegL dst, immI_1 cnt, eFlagsReg cr) %{
-  predicate(UseNewLongLShift);
-  match(Set dst (LShiftL dst cnt));
-  effect(KILL cr);
-  ins_cost(100);
-  format %{ "ADD    $dst.lo,$dst.lo\n\t"
-            "ADC    $dst.hi,$dst.hi" %}
-  ins_encode %{
-    __ addl($dst$$Register,$dst$$Register);
-    __ adcl(HIGH_FROM_LOW($dst$$Register),HIGH_FROM_LOW($dst$$Register));
-  %}
-  ins_pipe( ialu_reg_long );
-%}
-
-// Shift Left Long by 2
-instruct shlL_eReg_2(eRegL dst, immI_2 cnt, eFlagsReg cr) %{
-  predicate(UseNewLongLShift);
-  match(Set dst (LShiftL dst cnt));
-  effect(KILL cr);
-  ins_cost(100);
-  format %{ "ADD    $dst.lo,$dst.lo\n\t"
-            "ADC    $dst.hi,$dst.hi\n\t"
-            "ADD    $dst.lo,$dst.lo\n\t"
-            "ADC    $dst.hi,$dst.hi" %}
-  ins_encode %{
-    __ addl($dst$$Register,$dst$$Register);
-    __ adcl(HIGH_FROM_LOW($dst$$Register),HIGH_FROM_LOW($dst$$Register));
-    __ addl($dst$$Register,$dst$$Register);
-    __ adcl(HIGH_FROM_LOW($dst$$Register),HIGH_FROM_LOW($dst$$Register));
-  %}
-  ins_pipe( ialu_reg_long );
-%}
-
-// Shift Left Long by 3
-instruct shlL_eReg_3(eRegL dst, immI_3 cnt, eFlagsReg cr) %{
-  predicate(UseNewLongLShift);
-  match(Set dst (LShiftL dst cnt));
-  effect(KILL cr);
-  ins_cost(100);
-  format %{ "ADD    $dst.lo,$dst.lo\n\t"
-            "ADC    $dst.hi,$dst.hi\n\t"
-            "ADD    $dst.lo,$dst.lo\n\t"
-            "ADC    $dst.hi,$dst.hi\n\t"
-            "ADD    $dst.lo,$dst.lo\n\t"
-            "ADC    $dst.hi,$dst.hi" %}
-  ins_encode %{
-    __ addl($dst$$Register,$dst$$Register);
-    __ adcl(HIGH_FROM_LOW($dst$$Register),HIGH_FROM_LOW($dst$$Register));
-    __ addl($dst$$Register,$dst$$Register);
-    __ adcl(HIGH_FROM_LOW($dst$$Register),HIGH_FROM_LOW($dst$$Register));
-    __ addl($dst$$Register,$dst$$Register);
-    __ adcl(HIGH_FROM_LOW($dst$$Register),HIGH_FROM_LOW($dst$$Register));
-  %}
-  ins_pipe( ialu_reg_long );
-%}
-
-// Shift Left Long by 1-31
-instruct shlL_eReg_1_31(eRegL dst, immI_1_31 cnt, eFlagsReg cr) %{
-  match(Set dst (LShiftL dst cnt));
-  effect(KILL cr);
-  ins_cost(200);
-  format %{ "SHLD   $dst.hi,$dst.lo,$cnt\n\t"
-            "SHL    $dst.lo,$cnt" %}
-  opcode(0xC1, 0x4, 0xA4);  /* 0F/A4, then C1 /4 ib */
-  ins_encode( move_long_small_shift(dst,cnt) );
-  ins_pipe( ialu_reg_long );
-%}
-
-// Shift Left Long by 32-63
-instruct shlL_eReg_32_63(eRegL dst, immI_32_63 cnt, eFlagsReg cr) %{
-  match(Set dst (LShiftL dst cnt));
-  effect(KILL cr);
-  ins_cost(300);
-  format %{ "MOV    $dst.hi,$dst.lo\n"
-          "\tSHL    $dst.hi,$cnt-32\n"
-          "\tXOR    $dst.lo,$dst.lo" %}
-  opcode(0xC1, 0x4);  /* C1 /4 ib */
-  ins_encode( move_long_big_shift_clr(dst,cnt) );
-  ins_pipe( ialu_reg_long );
-%}
-
-// Shift Left Long by variable
-instruct salL_eReg_CL(eRegL dst, eCXRegI shift, eFlagsReg cr) %{
-  match(Set dst (LShiftL dst shift));
-  effect(KILL cr);
-  ins_cost(500+200);
-  size(17);
-  format %{ "TEST   $shift,32\n\t"
-            "JEQ,s  small\n\t"
-            "MOV    $dst.hi,$dst.lo\n\t"
-            "XOR    $dst.lo,$dst.lo\n"
-    "small:\tSHLD   $dst.hi,$dst.lo,$shift\n\t"
-            "SHL    $dst.lo,$shift" %}
-  ins_encode( shift_left_long( dst, shift ) );
-  ins_pipe( pipe_slow );
-%}
-
-// Shift Right Long by 1-31
-instruct shrL_eReg_1_31(eRegL dst, immI_1_31 cnt, eFlagsReg cr) %{
-  match(Set dst (URShiftL dst cnt));
-  effect(KILL cr);
-  ins_cost(200);
-  format %{ "SHRD   $dst.lo,$dst.hi,$cnt\n\t"
-            "SHR    $dst.hi,$cnt" %}
-  opcode(0xC1, 0x5, 0xAC);  /* 0F/AC, then C1 /5 ib */
-  ins_encode( move_long_small_shift(dst,cnt) );
-  ins_pipe( ialu_reg_long );
-%}
-
-// Shift Right Long by 32-63
-instruct shrL_eReg_32_63(eRegL dst, immI_32_63 cnt, eFlagsReg cr) %{
-  match(Set dst (URShiftL dst cnt));
-  effect(KILL cr);
-  ins_cost(300);
-  format %{ "MOV    $dst.lo,$dst.hi\n"
-          "\tSHR    $dst.lo,$cnt-32\n"
-          "\tXOR    $dst.hi,$dst.hi" %}
-  opcode(0xC1, 0x5);  /* C1 /5 ib */
-  ins_encode( move_long_big_shift_clr(dst,cnt) );
-  ins_pipe( ialu_reg_long );
-%}
-
-// Shift Right Long by variable
-instruct shrL_eReg_CL(eRegL dst, eCXRegI shift, eFlagsReg cr) %{
-  match(Set dst (URShiftL dst shift));
-  effect(KILL cr);
-  ins_cost(600);
-  size(17);
-  format %{ "TEST   $shift,32\n\t"
-            "JEQ,s  small\n\t"
-            "MOV    $dst.lo,$dst.hi\n\t"
-            "XOR    $dst.hi,$dst.hi\n"
-    "small:\tSHRD   $dst.lo,$dst.hi,$shift\n\t"
-            "SHR    $dst.hi,$shift" %}
-  ins_encode( shift_right_long( dst, shift ) );
-  ins_pipe( pipe_slow );
-%}
-
-// Shift Right Long by 1-31
-instruct sarL_eReg_1_31(eRegL dst, immI_1_31 cnt, eFlagsReg cr) %{
-  match(Set dst (RShiftL dst cnt));
-  effect(KILL cr);
-  ins_cost(200);
-  format %{ "SHRD   $dst.lo,$dst.hi,$cnt\n\t"
-            "SAR    $dst.hi,$cnt" %}
-  opcode(0xC1, 0x7, 0xAC);  /* 0F/AC, then C1 /7 ib */
-  ins_encode( move_long_small_shift(dst,cnt) );
-  ins_pipe( ialu_reg_long );
-%}
-
-// Shift Right Long by 32-63
-instruct sarL_eReg_32_63( eRegL dst, immI_32_63 cnt, eFlagsReg cr) %{
-  match(Set dst (RShiftL dst cnt));
-  effect(KILL cr);
-  ins_cost(300);
-  format %{ "MOV    $dst.lo,$dst.hi\n"
-          "\tSAR    $dst.lo,$cnt-32\n"
-          "\tSAR    $dst.hi,31" %}
-  opcode(0xC1, 0x7);  /* C1 /7 ib */
-  ins_encode( move_long_big_shift_sign(dst,cnt) );
-  ins_pipe( ialu_reg_long );
-%}
-
-// Shift Right arithmetic Long by variable
-instruct sarL_eReg_CL(eRegL dst, eCXRegI shift, eFlagsReg cr) %{
-  match(Set dst (RShiftL dst shift));
-  effect(KILL cr);
-  ins_cost(600);
-  size(18);
-  format %{ "TEST   $shift,32\n\t"
-            "JEQ,s  small\n\t"
-            "MOV    $dst.lo,$dst.hi\n\t"
-            "SAR    $dst.hi,31\n"
-    "small:\tSHRD   $dst.lo,$dst.hi,$shift\n\t"
-            "SAR    $dst.hi,$shift" %}
-  ins_encode( shift_right_arith_long( dst, shift ) );
-  ins_pipe( pipe_slow );
-%}
-
-
-//----------Double Instructions------------------------------------------------
-// Double Math
-
-// Compare & branch
-
-// P6 version of float compare, sets condition codes in EFLAGS
-instruct cmpDPR_cc_P6(eFlagsRegU cr, regDPR src1, regDPR src2, eAXRegI rax) %{
-  predicate(VM_Version::supports_cmov() && UseSSE <=1);
-  match(Set cr (CmpD src1 src2));
-  effect(KILL rax);
-  ins_cost(150);
-  format %{ "FLD    $src1\n\t"
-            "FUCOMIP ST,$src2  // P6 instruction\n\t"
-            "JNP    exit\n\t"
-            "MOV    ah,1       // saw a NaN, set CF\n\t"
-            "SAHF\n"
-     "exit:\tNOP               // avoid branch to branch" %}
-  opcode(0xDF, 0x05); /* DF E8+i or DF /5 */
-  ins_encode( Push_Reg_DPR(src1),
-              OpcP, RegOpc(src2),
-              cmpF_P6_fixup );
-  ins_pipe( pipe_slow );
-%}
-
-instruct cmpDPR_cc_P6CF(eFlagsRegUCF cr, regDPR src1, regDPR src2) %{
-  predicate(VM_Version::supports_cmov() && UseSSE <=1);
-  match(Set cr (CmpD src1 src2));
-  ins_cost(150);
-  format %{ "FLD    $src1\n\t"
-            "FUCOMIP ST,$src2  // P6 instruction" %}
-  opcode(0xDF, 0x05); /* DF E8+i or DF /5 */
-  ins_encode( Push_Reg_DPR(src1),
-              OpcP, RegOpc(src2));
-  ins_pipe( pipe_slow );
-%}
-
-// Compare & branch
-instruct cmpDPR_cc(eFlagsRegU cr, regDPR src1, regDPR src2, eAXRegI rax) %{
-  predicate(UseSSE<=1);
-  match(Set cr (CmpD src1 src2));
-  effect(KILL rax);
-  ins_cost(200);
-  format %{ "FLD    $src1\n\t"
-            "FCOMp  $src2\n\t"
-            "FNSTSW AX\n\t"
-            "TEST   AX,0x400\n\t"
-            "JZ,s   flags\n\t"
-            "MOV    AH,1\t# unordered treat as LT\n"
-    "flags:\tSAHF" %}
-  opcode(0xD8, 0x3); /* D8 D8+i or D8 /3 */
-  ins_encode( Push_Reg_DPR(src1),
-              OpcP, RegOpc(src2),
-              fpu_flags);
-  ins_pipe( pipe_slow );
-%}
-
-// Compare vs zero into -1,0,1
-instruct cmpDPR_0(rRegI dst, regDPR src1, immDPR0 zero, eAXRegI rax, eFlagsReg cr) %{
-  predicate(UseSSE<=1);
-  match(Set dst (CmpD3 src1 zero));
-  effect(KILL cr, KILL rax);
-  ins_cost(280);
-  format %{ "FTSTD  $dst,$src1" %}
-  opcode(0xE4, 0xD9);
-  ins_encode( Push_Reg_DPR(src1),
-              OpcS, OpcP, PopFPU,
-              CmpF_Result(dst));
-  ins_pipe( pipe_slow );
-%}
-
-// Compare into -1,0,1
-instruct cmpDPR_reg(rRegI dst, regDPR src1, regDPR src2, eAXRegI rax, eFlagsReg cr) %{
-  predicate(UseSSE<=1);
-  match(Set dst (CmpD3 src1 src2));
-  effect(KILL cr, KILL rax);
-  ins_cost(300);
-  format %{ "FCMPD  $dst,$src1,$src2" %}
-  opcode(0xD8, 0x3); /* D8 D8+i or D8 /3 */
-  ins_encode( Push_Reg_DPR(src1),
-              OpcP, RegOpc(src2),
-              CmpF_Result(dst));
-  ins_pipe( pipe_slow );
-%}
-
-// float compare and set condition codes in EFLAGS by XMM regs
-instruct cmpD_cc(eFlagsRegU cr, regD src1, regD src2) %{
-  predicate(UseSSE>=2);
-  match(Set cr (CmpD src1 src2));
-  ins_cost(145);
-  format %{ "UCOMISD $src1,$src2\n\t"
-            "JNP,s   exit\n\t"
-            "PUSHF\t# saw NaN, set CF\n\t"
-            "AND     [rsp], #0xffffff2b\n\t"
-            "POPF\n"
-    "exit:" %}
-  ins_encode %{
-    __ ucomisd($src1$$XMMRegister, $src2$$XMMRegister);
-    emit_cmpfp_fixup(masm);
-  %}
-  ins_pipe( pipe_slow );
-%}
-
-instruct cmpD_ccCF(eFlagsRegUCF cr, regD src1, regD src2) %{
-  predicate(UseSSE>=2);
-  match(Set cr (CmpD src1 src2));
-  ins_cost(100);
-  format %{ "UCOMISD $src1,$src2" %}
-  ins_encode %{
-    __ ucomisd($src1$$XMMRegister, $src2$$XMMRegister);
-  %}
-  ins_pipe( pipe_slow );
-%}
-
-// float compare and set condition codes in EFLAGS by XMM regs
-instruct cmpD_ccmem(eFlagsRegU cr, regD src1, memory src2) %{
-  predicate(UseSSE>=2);
-  match(Set cr (CmpD src1 (LoadD src2)));
-  ins_cost(145);
-  format %{ "UCOMISD $src1,$src2\n\t"
-            "JNP,s   exit\n\t"
-            "PUSHF\t# saw NaN, set CF\n\t"
-            "AND     [rsp], #0xffffff2b\n\t"
-            "POPF\n"
-    "exit:" %}
-  ins_encode %{
-    __ ucomisd($src1$$XMMRegister, $src2$$Address);
-    emit_cmpfp_fixup(masm);
-  %}
-  ins_pipe( pipe_slow );
-%}
-
-instruct cmpD_ccmemCF(eFlagsRegUCF cr, regD src1, memory src2) %{
-  predicate(UseSSE>=2);
-  match(Set cr (CmpD src1 (LoadD src2)));
-  ins_cost(100);
-  format %{ "UCOMISD $src1,$src2" %}
-  ins_encode %{
-    __ ucomisd($src1$$XMMRegister, $src2$$Address);
-  %}
-  ins_pipe( pipe_slow );
-%}
-
-// Compare into -1,0,1 in XMM
-instruct cmpD_reg(xRegI dst, regD src1, regD src2, eFlagsReg cr) %{
-  predicate(UseSSE>=2);
-  match(Set dst (CmpD3 src1 src2));
-  effect(KILL cr);
-  ins_cost(255);
-  format %{ "UCOMISD $src1, $src2\n\t"
-            "MOV     $dst, #-1\n\t"
-            "JP,s    done\n\t"
-            "JB,s    done\n\t"
-            "SETNE   $dst\n\t"
-            "MOVZB   $dst, $dst\n"
-    "done:" %}
-  ins_encode %{
-    __ ucomisd($src1$$XMMRegister, $src2$$XMMRegister);
-    emit_cmpfp3(masm, $dst$$Register);
-  %}
-  ins_pipe( pipe_slow );
-%}
-
-// Compare into -1,0,1 in XMM and memory
-instruct cmpD_regmem(xRegI dst, regD src1, memory src2, eFlagsReg cr) %{
-  predicate(UseSSE>=2);
-  match(Set dst (CmpD3 src1 (LoadD src2)));
-  effect(KILL cr);
-  ins_cost(275);
-  format %{ "UCOMISD $src1, $src2\n\t"
-            "MOV     $dst, #-1\n\t"
-            "JP,s    done\n\t"
-            "JB,s    done\n\t"
-            "SETNE   $dst\n\t"
-            "MOVZB   $dst, $dst\n"
-    "done:" %}
-  ins_encode %{
-    __ ucomisd($src1$$XMMRegister, $src2$$Address);
-    emit_cmpfp3(masm, $dst$$Register);
-  %}
-  ins_pipe( pipe_slow );
-%}
-
-
-instruct subDPR_reg(regDPR dst, regDPR src) %{
-  predicate (UseSSE <=1);
-  match(Set dst (SubD dst src));
-
-  format %{ "FLD    $src\n\t"
-            "DSUBp  $dst,ST" %}
-  opcode(0xDE, 0x5); /* DE E8+i  or DE /5 */
-  ins_cost(150);
-  ins_encode( Push_Reg_DPR(src),
-              OpcP, RegOpc(dst) );
-  ins_pipe( fpu_reg_reg );
-%}
-
-instruct subDPR_reg_round(stackSlotD dst, regDPR src1, regDPR src2) %{
-  predicate (UseSSE <=1);
-  match(Set dst (RoundDouble (SubD src1 src2)));
-  ins_cost(250);
-
-  format %{ "FLD    $src2\n\t"
-            "DSUB   ST,$src1\n\t"
-            "FSTP_D $dst\t# D-round" %}
-  opcode(0xD8, 0x5);
-  ins_encode( Push_Reg_DPR(src2),
-              OpcP, RegOpc(src1), Pop_Mem_DPR(dst) );
-  ins_pipe( fpu_mem_reg_reg );
-%}
-
-
-instruct subDPR_reg_mem(regDPR dst, memory src) %{
-  predicate (UseSSE <=1);
-  match(Set dst (SubD dst (LoadD src)));
-  ins_cost(150);
-
-  format %{ "FLD    $src\n\t"
-            "DSUBp  $dst,ST" %}
-  opcode(0xDE, 0x5, 0xDD); /* DE C0+i */  /* LoadD  DD /0 */
-  ins_encode( SetInstMark, Opcode(tertiary), RMopc_Mem(0x00,src),
-              OpcP, RegOpc(dst), ClearInstMark );
-  ins_pipe( fpu_reg_mem );
-%}
-
-instruct absDPR_reg(regDPR1 dst, regDPR1 src) %{
-  predicate (UseSSE<=1);
-  match(Set dst (AbsD src));
-  ins_cost(100);
-  format %{ "FABS" %}
-  opcode(0xE1, 0xD9);
-  ins_encode( OpcS, OpcP );
-  ins_pipe( fpu_reg_reg );
-%}
-
-instruct negDPR_reg(regDPR1 dst, regDPR1 src) %{
-  predicate(UseSSE<=1);
-  match(Set dst (NegD src));
-  ins_cost(100);
-  format %{ "FCHS" %}
-  opcode(0xE0, 0xD9);
-  ins_encode( OpcS, OpcP );
-  ins_pipe( fpu_reg_reg );
-%}
-
-instruct addDPR_reg(regDPR dst, regDPR src) %{
-  predicate(UseSSE<=1);
-  match(Set dst (AddD dst src));
-  format %{ "FLD    $src\n\t"
-            "DADD   $dst,ST" %}
-  size(4);
-  ins_cost(150);
-  opcode(0xDE, 0x0); /* DE C0+i or DE /0*/
-  ins_encode( Push_Reg_DPR(src),
-              OpcP, RegOpc(dst) );
-  ins_pipe( fpu_reg_reg );
-%}
-
-
-instruct addDPR_reg_round(stackSlotD dst, regDPR src1, regDPR src2) %{
-  predicate(UseSSE<=1);
-  match(Set dst (RoundDouble (AddD src1 src2)));
-  ins_cost(250);
-
-  format %{ "FLD    $src2\n\t"
-            "DADD   ST,$src1\n\t"
-            "FSTP_D $dst\t# D-round" %}
-  opcode(0xD8, 0x0); /* D8 C0+i or D8 /0*/
-  ins_encode( Push_Reg_DPR(src2),
-              OpcP, RegOpc(src1), Pop_Mem_DPR(dst) );
-  ins_pipe( fpu_mem_reg_reg );
-%}
-
-
-instruct addDPR_reg_mem(regDPR dst, memory src) %{
-  predicate(UseSSE<=1);
-  match(Set dst (AddD dst (LoadD src)));
-  ins_cost(150);
-
-  format %{ "FLD    $src\n\t"
-            "DADDp  $dst,ST" %}
-  opcode(0xDE, 0x0, 0xDD); /* DE C0+i */  /* LoadD  DD /0 */
-  ins_encode( SetInstMark, Opcode(tertiary), RMopc_Mem(0x00,src),
-              OpcP, RegOpc(dst), ClearInstMark );
-  ins_pipe( fpu_reg_mem );
-%}
-
-// add-to-memory
-instruct addDPR_mem_reg(memory dst, regDPR src) %{
-  predicate(UseSSE<=1);
-  match(Set dst (StoreD dst (RoundDouble (AddD (LoadD dst) src))));
-  ins_cost(150);
-
-  format %{ "FLD_D  $dst\n\t"
-            "DADD   ST,$src\n\t"
-            "FST_D  $dst" %}
-  opcode(0xDD, 0x0);
-  ins_encode( SetInstMark, Opcode(0xDD), RMopc_Mem(0x00,dst),
-              Opcode(0xD8), RegOpc(src), ClearInstMark,
-              SetInstMark,
-              Opcode(0xDD), RMopc_Mem(0x03,dst),
-              ClearInstMark);
-  ins_pipe( fpu_reg_mem );
-%}
-
-instruct addDPR_reg_imm1(regDPR dst, immDPR1 con) %{
-  predicate(UseSSE<=1);
-  match(Set dst (AddD dst con));
-  ins_cost(125);
-  format %{ "FLD1\n\t"
-            "DADDp  $dst,ST" %}
-  ins_encode %{
-    __ fld1();
-    __ faddp($dst$$reg);
-  %}
-  ins_pipe(fpu_reg);
-%}
-
-instruct addDPR_reg_imm(regDPR dst, immDPR con) %{
-  predicate(UseSSE<=1 && _kids[1]->_leaf->getd() != 0.0 && _kids[1]->_leaf->getd() != 1.0 );
-  match(Set dst (AddD dst con));
-  ins_cost(200);
-  format %{ "FLD_D  [$constantaddress]\t# load from constant table: double=$con\n\t"
-            "DADDp  $dst,ST" %}
-  ins_encode %{
-    __ fld_d($constantaddress($con));
-    __ faddp($dst$$reg);
-  %}
-  ins_pipe(fpu_reg_mem);
-%}
-
-instruct addDPR_reg_imm_round(stackSlotD dst, regDPR src, immDPR con) %{
-  predicate(UseSSE<=1 && _kids[0]->_kids[1]->_leaf->getd() != 0.0 && _kids[0]->_kids[1]->_leaf->getd() != 1.0 );
-  match(Set dst (RoundDouble (AddD src con)));
-  ins_cost(200);
-  format %{ "FLD_D  [$constantaddress]\t# load from constant table: double=$con\n\t"
-            "DADD   ST,$src\n\t"
-            "FSTP_D $dst\t# D-round" %}
-  ins_encode %{
-    __ fld_d($constantaddress($con));
-    __ fadd($src$$reg);
-    __ fstp_d(Address(rsp, $dst$$disp));
-  %}
-  ins_pipe(fpu_mem_reg_con);
-%}
-
-instruct mulDPR_reg(regDPR dst, regDPR src) %{
-  predicate(UseSSE<=1);
-  match(Set dst (MulD dst src));
-  format %{ "FLD    $src\n\t"
-            "DMULp  $dst,ST" %}
-  opcode(0xDE, 0x1); /* DE C8+i or DE /1*/
-  ins_cost(150);
-  ins_encode( Push_Reg_DPR(src),
-              OpcP, RegOpc(dst) );
-  ins_pipe( fpu_reg_reg );
-%}
-
-// Strict FP instruction biases argument before multiply then
-// biases result to avoid double rounding of subnormals.
-//
-// scale arg1 by multiplying arg1 by 2^(-15360)
-// load arg2
-// multiply scaled arg1 by arg2
-// rescale product by 2^(15360)
-//
-instruct strictfp_mulDPR_reg(regDPR1 dst, regnotDPR1 src) %{
-  predicate( UseSSE<=1 && Compile::current()->has_method() );
-  match(Set dst (MulD dst src));
-  ins_cost(1);   // Select this instruction for all FP double multiplies
-
-  format %{ "FLD    StubRoutines::x86::_fpu_subnormal_bias1\n\t"
-            "DMULp  $dst,ST\n\t"
-            "FLD    $src\n\t"
-            "DMULp  $dst,ST\n\t"
-            "FLD    StubRoutines::x86::_fpu_subnormal_bias2\n\t"
-            "DMULp  $dst,ST\n\t" %}
-  opcode(0xDE, 0x1); /* DE C8+i or DE /1*/
-  ins_encode( strictfp_bias1(dst),
-              Push_Reg_DPR(src),
-              OpcP, RegOpc(dst),
-              strictfp_bias2(dst) );
-  ins_pipe( fpu_reg_reg );
-%}
-
-instruct mulDPR_reg_imm(regDPR dst, immDPR con) %{
-  predicate( UseSSE<=1 && _kids[1]->_leaf->getd() != 0.0 && _kids[1]->_leaf->getd() != 1.0 );
-  match(Set dst (MulD dst con));
-  ins_cost(200);
-  format %{ "FLD_D  [$constantaddress]\t# load from constant table: double=$con\n\t"
-            "DMULp  $dst,ST" %}
-  ins_encode %{
-    __ fld_d($constantaddress($con));
-    __ fmulp($dst$$reg);
-  %}
-  ins_pipe(fpu_reg_mem);
-%}
-
-
-instruct mulDPR_reg_mem(regDPR dst, memory src) %{
-  predicate( UseSSE<=1 );
-  match(Set dst (MulD dst (LoadD src)));
-  ins_cost(200);
-  format %{ "FLD_D  $src\n\t"
-            "DMULp  $dst,ST" %}
-  opcode(0xDE, 0x1, 0xDD); /* DE C8+i or DE /1*/  /* LoadD  DD /0 */
-  ins_encode( SetInstMark, Opcode(tertiary), RMopc_Mem(0x00,src),
-              OpcP, RegOpc(dst), ClearInstMark );
-  ins_pipe( fpu_reg_mem );
-%}
-
-//
-// Cisc-alternate to reg-reg multiply
-instruct mulDPR_reg_mem_cisc(regDPR dst, regDPR src, memory mem) %{
-  predicate( UseSSE<=1 );
-  match(Set dst (MulD src (LoadD mem)));
-  ins_cost(250);
-  format %{ "FLD_D  $mem\n\t"
-            "DMUL   ST,$src\n\t"
-            "FSTP_D $dst" %}
-  opcode(0xD8, 0x1, 0xD9); /* D8 C8+i */  /* LoadD D9 /0 */
-  ins_encode( SetInstMark, Opcode(tertiary), RMopc_Mem(0x00,mem),
-              OpcReg_FPR(src),
-              Pop_Reg_DPR(dst), ClearInstMark );
-  ins_pipe( fpu_reg_reg_mem );
-%}
-
-
-// MACRO3 -- addDPR a mulDPR
-// This instruction is a '2-address' instruction in that the result goes
-// back to src2.  This eliminates a move from the macro; possibly the
-// register allocator will have to add it back (and maybe not).
-instruct addDPR_mulDPR_reg(regDPR src2, regDPR src1, regDPR src0) %{
-  predicate( UseSSE<=1 );
-  match(Set src2 (AddD (MulD src0 src1) src2));
-  format %{ "FLD    $src0\t# ===MACRO3d===\n\t"
-            "DMUL   ST,$src1\n\t"
-            "DADDp  $src2,ST" %}
-  ins_cost(250);
-  opcode(0xDD); /* LoadD DD /0 */
-  ins_encode( Push_Reg_FPR(src0),
-              FMul_ST_reg(src1),
-              FAddP_reg_ST(src2) );
-  ins_pipe( fpu_reg_reg_reg );
-%}
-
-
-// MACRO3 -- subDPR a mulDPR
-instruct subDPR_mulDPR_reg(regDPR src2, regDPR src1, regDPR src0) %{
-  predicate( UseSSE<=1 );
-  match(Set src2 (SubD (MulD src0 src1) src2));
-  format %{ "FLD    $src0\t# ===MACRO3d===\n\t"
-            "DMUL   ST,$src1\n\t"
-            "DSUBRp $src2,ST" %}
-  ins_cost(250);
-  ins_encode( Push_Reg_FPR(src0),
-              FMul_ST_reg(src1),
-              Opcode(0xDE), Opc_plus(0xE0,src2));
-  ins_pipe( fpu_reg_reg_reg );
-%}
-
-
-instruct divDPR_reg(regDPR dst, regDPR src) %{
-  predicate( UseSSE<=1 );
-  match(Set dst (DivD dst src));
-
-  format %{ "FLD    $src\n\t"
-            "FDIVp  $dst,ST" %}
-  opcode(0xDE, 0x7); /* DE F8+i or DE /7*/
-  ins_cost(150);
-  ins_encode( Push_Reg_DPR(src),
-              OpcP, RegOpc(dst) );
-  ins_pipe( fpu_reg_reg );
-%}
-
-// Strict FP instruction biases argument before division then
-// biases result, to avoid double rounding of subnormals.
-//
-// scale dividend by multiplying dividend by 2^(-15360)
-// load divisor
-// divide scaled dividend by divisor
-// rescale quotient by 2^(15360)
-//
-instruct strictfp_divDPR_reg(regDPR1 dst, regnotDPR1 src) %{
-  predicate (UseSSE<=1);
-  match(Set dst (DivD dst src));
-  predicate( UseSSE<=1 && Compile::current()->has_method() );
-  ins_cost(01);
-
-  format %{ "FLD    StubRoutines::x86::_fpu_subnormal_bias1\n\t"
-            "DMULp  $dst,ST\n\t"
-            "FLD    $src\n\t"
-            "FDIVp  $dst,ST\n\t"
-            "FLD    StubRoutines::x86::_fpu_subnormal_bias2\n\t"
-            "DMULp  $dst,ST\n\t" %}
-  opcode(0xDE, 0x7); /* DE F8+i or DE /7*/
-  ins_encode( strictfp_bias1(dst),
-              Push_Reg_DPR(src),
-              OpcP, RegOpc(dst),
-              strictfp_bias2(dst) );
-  ins_pipe( fpu_reg_reg );
-%}
-
-instruct atanDPR_reg(regDPR dst, regDPR src) %{
-  predicate (UseSSE<=1);
-  match(Set dst(AtanD dst src));
-  format %{ "DATA   $dst,$src" %}
-  opcode(0xD9, 0xF3);
-  ins_encode( Push_Reg_DPR(src),
-              OpcP, OpcS, RegOpc(dst) );
-  ins_pipe( pipe_slow );
-%}
-
-instruct atanD_reg(regD dst, regD src, eFlagsReg cr) %{
-  predicate (UseSSE>=2);
-  match(Set dst(AtanD dst src));
-  effect(KILL cr); // Push_{Src|Result}D() uses "{SUB|ADD} ESP,8"
-  format %{ "DATA   $dst,$src" %}
-  opcode(0xD9, 0xF3);
-  ins_encode( Push_SrcD(src),
-              OpcP, OpcS, Push_ResultD(dst) );
-  ins_pipe( pipe_slow );
-%}
-
-instruct sqrtDPR_reg(regDPR dst, regDPR src) %{
-  predicate (UseSSE<=1);
-  match(Set dst (SqrtD src));
-  format %{ "DSQRT  $dst,$src" %}
-  opcode(0xFA, 0xD9);
-  ins_encode( Push_Reg_DPR(src),
-              OpcS, OpcP, Pop_Reg_DPR(dst) );
-  ins_pipe( pipe_slow );
-%}
-
-//-------------Float Instructions-------------------------------
-// Float Math
-
-// Code for float compare:
-//     fcompp();
-//     fwait(); fnstsw_ax();
-//     sahf();
-//     movl(dst, unordered_result);
-//     jcc(Assembler::parity, exit);
-//     movl(dst, less_result);
-//     jcc(Assembler::below, exit);
-//     movl(dst, equal_result);
-//     jcc(Assembler::equal, exit);
-//     movl(dst, greater_result);
-//   exit:
-
-// P6 version of float compare, sets condition codes in EFLAGS
-instruct cmpFPR_cc_P6(eFlagsRegU cr, regFPR src1, regFPR src2, eAXRegI rax) %{
-  predicate(VM_Version::supports_cmov() && UseSSE == 0);
-  match(Set cr (CmpF src1 src2));
-  effect(KILL rax);
-  ins_cost(150);
-  format %{ "FLD    $src1\n\t"
-            "FUCOMIP ST,$src2  // P6 instruction\n\t"
-            "JNP    exit\n\t"
-            "MOV    ah,1       // saw a NaN, set CF (treat as LT)\n\t"
-            "SAHF\n"
-     "exit:\tNOP               // avoid branch to branch" %}
-  opcode(0xDF, 0x05); /* DF E8+i or DF /5 */
-  ins_encode( Push_Reg_DPR(src1),
-              OpcP, RegOpc(src2),
-              cmpF_P6_fixup );
-  ins_pipe( pipe_slow );
-%}
-
-instruct cmpFPR_cc_P6CF(eFlagsRegUCF cr, regFPR src1, regFPR src2) %{
-  predicate(VM_Version::supports_cmov() && UseSSE == 0);
-  match(Set cr (CmpF src1 src2));
-  ins_cost(100);
-  format %{ "FLD    $src1\n\t"
-            "FUCOMIP ST,$src2  // P6 instruction" %}
-  opcode(0xDF, 0x05); /* DF E8+i or DF /5 */
-  ins_encode( Push_Reg_DPR(src1),
-              OpcP, RegOpc(src2));
-  ins_pipe( pipe_slow );
-%}
-
-
-// Compare & branch
-instruct cmpFPR_cc(eFlagsRegU cr, regFPR src1, regFPR src2, eAXRegI rax) %{
-  predicate(UseSSE == 0);
-  match(Set cr (CmpF src1 src2));
-  effect(KILL rax);
-  ins_cost(200);
-  format %{ "FLD    $src1\n\t"
-            "FCOMp  $src2\n\t"
-            "FNSTSW AX\n\t"
-            "TEST   AX,0x400\n\t"
-            "JZ,s   flags\n\t"
-            "MOV    AH,1\t# unordered treat as LT\n"
-    "flags:\tSAHF" %}
-  opcode(0xD8, 0x3); /* D8 D8+i or D8 /3 */
-  ins_encode( Push_Reg_DPR(src1),
-              OpcP, RegOpc(src2),
-              fpu_flags);
-  ins_pipe( pipe_slow );
-%}
-
-// Compare vs zero into -1,0,1
-instruct cmpFPR_0(rRegI dst, regFPR src1, immFPR0 zero, eAXRegI rax, eFlagsReg cr) %{
-  predicate(UseSSE == 0);
-  match(Set dst (CmpF3 src1 zero));
-  effect(KILL cr, KILL rax);
-  ins_cost(280);
-  format %{ "FTSTF  $dst,$src1" %}
-  opcode(0xE4, 0xD9);
-  ins_encode( Push_Reg_DPR(src1),
-              OpcS, OpcP, PopFPU,
-              CmpF_Result(dst));
-  ins_pipe( pipe_slow );
-%}
-
-// Compare into -1,0,1
-instruct cmpFPR_reg(rRegI dst, regFPR src1, regFPR src2, eAXRegI rax, eFlagsReg cr) %{
-  predicate(UseSSE == 0);
-  match(Set dst (CmpF3 src1 src2));
-  effect(KILL cr, KILL rax);
-  ins_cost(300);
-  format %{ "FCMPF  $dst,$src1,$src2" %}
-  opcode(0xD8, 0x3); /* D8 D8+i or D8 /3 */
-  ins_encode( Push_Reg_DPR(src1),
-              OpcP, RegOpc(src2),
-              CmpF_Result(dst));
-  ins_pipe( pipe_slow );
-%}
-
-// float compare and set condition codes in EFLAGS by XMM regs
-instruct cmpF_cc(eFlagsRegU cr, regF src1, regF src2) %{
-  predicate(UseSSE>=1);
-  match(Set cr (CmpF src1 src2));
-  ins_cost(145);
-  format %{ "UCOMISS $src1,$src2\n\t"
-            "JNP,s   exit\n\t"
-            "PUSHF\t# saw NaN, set CF\n\t"
-            "AND     [rsp], #0xffffff2b\n\t"
-            "POPF\n"
-    "exit:" %}
-  ins_encode %{
-    __ ucomiss($src1$$XMMRegister, $src2$$XMMRegister);
-    emit_cmpfp_fixup(masm);
-  %}
-  ins_pipe( pipe_slow );
-%}
-
-instruct cmpF_ccCF(eFlagsRegUCF cr, regF src1, regF src2) %{
-  predicate(UseSSE>=1);
-  match(Set cr (CmpF src1 src2));
-  ins_cost(100);
-  format %{ "UCOMISS $src1,$src2" %}
-  ins_encode %{
-    __ ucomiss($src1$$XMMRegister, $src2$$XMMRegister);
-  %}
-  ins_pipe( pipe_slow );
-%}
-
-// float compare and set condition codes in EFLAGS by XMM regs
-instruct cmpF_ccmem(eFlagsRegU cr, regF src1, memory src2) %{
-  predicate(UseSSE>=1);
-  match(Set cr (CmpF src1 (LoadF src2)));
-  ins_cost(165);
-  format %{ "UCOMISS $src1,$src2\n\t"
-            "JNP,s   exit\n\t"
-            "PUSHF\t# saw NaN, set CF\n\t"
-            "AND     [rsp], #0xffffff2b\n\t"
-            "POPF\n"
-    "exit:" %}
-  ins_encode %{
-    __ ucomiss($src1$$XMMRegister, $src2$$Address);
-    emit_cmpfp_fixup(masm);
-  %}
-  ins_pipe( pipe_slow );
-%}
-
-instruct cmpF_ccmemCF(eFlagsRegUCF cr, regF src1, memory src2) %{
-  predicate(UseSSE>=1);
-  match(Set cr (CmpF src1 (LoadF src2)));
-  ins_cost(100);
-  format %{ "UCOMISS $src1,$src2" %}
-  ins_encode %{
-    __ ucomiss($src1$$XMMRegister, $src2$$Address);
-  %}
-  ins_pipe( pipe_slow );
-%}
-
-// Compare into -1,0,1 in XMM
-instruct cmpF_reg(xRegI dst, regF src1, regF src2, eFlagsReg cr) %{
-  predicate(UseSSE>=1);
-  match(Set dst (CmpF3 src1 src2));
-  effect(KILL cr);
-  ins_cost(255);
-  format %{ "UCOMISS $src1, $src2\n\t"
-            "MOV     $dst, #-1\n\t"
-            "JP,s    done\n\t"
-            "JB,s    done\n\t"
-            "SETNE   $dst\n\t"
-            "MOVZB   $dst, $dst\n"
-    "done:" %}
-  ins_encode %{
-    __ ucomiss($src1$$XMMRegister, $src2$$XMMRegister);
-    emit_cmpfp3(masm, $dst$$Register);
-  %}
-  ins_pipe( pipe_slow );
-%}
-
-// Compare into -1,0,1 in XMM and memory
-instruct cmpF_regmem(xRegI dst, regF src1, memory src2, eFlagsReg cr) %{
-  predicate(UseSSE>=1);
-  match(Set dst (CmpF3 src1 (LoadF src2)));
-  effect(KILL cr);
-  ins_cost(275);
-  format %{ "UCOMISS $src1, $src2\n\t"
-            "MOV     $dst, #-1\n\t"
-            "JP,s    done\n\t"
-            "JB,s    done\n\t"
-            "SETNE   $dst\n\t"
-            "MOVZB   $dst, $dst\n"
-    "done:" %}
-  ins_encode %{
-    __ ucomiss($src1$$XMMRegister, $src2$$Address);
-    emit_cmpfp3(masm, $dst$$Register);
-  %}
-  ins_pipe( pipe_slow );
-%}
-
-// Spill to obtain 24-bit precision
-instruct subFPR24_reg(stackSlotF dst, regFPR src1, regFPR src2) %{
-  predicate(UseSSE==0 && Compile::current()->select_24_bit_instr());
-  match(Set dst (SubF src1 src2));
-
-  format %{ "FSUB   $dst,$src1 - $src2" %}
-  opcode(0xD8, 0x4); /* D8 E0+i or D8 /4 mod==0x3 ;; result in TOS */
-  ins_encode( Push_Reg_FPR(src1),
-              OpcReg_FPR(src2),
-              Pop_Mem_FPR(dst) );
-  ins_pipe( fpu_mem_reg_reg );
-%}
-//
-// This instruction does not round to 24-bits
-instruct subFPR_reg(regFPR dst, regFPR src) %{
-  predicate(UseSSE==0 && !Compile::current()->select_24_bit_instr());
-  match(Set dst (SubF dst src));
-
-  format %{ "FSUB   $dst,$src" %}
-  opcode(0xDE, 0x5); /* DE E8+i  or DE /5 */
-  ins_encode( Push_Reg_FPR(src),
-              OpcP, RegOpc(dst) );
-  ins_pipe( fpu_reg_reg );
-%}
-
-// Spill to obtain 24-bit precision
-instruct addFPR24_reg(stackSlotF dst, regFPR src1, regFPR src2) %{
-  predicate(UseSSE==0 && Compile::current()->select_24_bit_instr());
-  match(Set dst (AddF src1 src2));
-
-  format %{ "FADD   $dst,$src1,$src2" %}
-  opcode(0xD8, 0x0); /* D8 C0+i */
-  ins_encode( Push_Reg_FPR(src2),
-              OpcReg_FPR(src1),
-              Pop_Mem_FPR(dst) );
-  ins_pipe( fpu_mem_reg_reg );
-%}
-//
-// This instruction does not round to 24-bits
-instruct addFPR_reg(regFPR dst, regFPR src) %{
-  predicate(UseSSE==0 && !Compile::current()->select_24_bit_instr());
-  match(Set dst (AddF dst src));
-
-  format %{ "FLD    $src\n\t"
-            "FADDp  $dst,ST" %}
-  opcode(0xDE, 0x0); /* DE C0+i or DE /0*/
-  ins_encode( Push_Reg_FPR(src),
-              OpcP, RegOpc(dst) );
-  ins_pipe( fpu_reg_reg );
-%}
-
-instruct absFPR_reg(regFPR1 dst, regFPR1 src) %{
-  predicate(UseSSE==0);
-  match(Set dst (AbsF src));
-  ins_cost(100);
-  format %{ "FABS" %}
-  opcode(0xE1, 0xD9);
-  ins_encode( OpcS, OpcP );
-  ins_pipe( fpu_reg_reg );
-%}
-
-instruct negFPR_reg(regFPR1 dst, regFPR1 src) %{
-  predicate(UseSSE==0);
-  match(Set dst (NegF src));
-  ins_cost(100);
-  format %{ "FCHS" %}
-  opcode(0xE0, 0xD9);
-  ins_encode( OpcS, OpcP );
-  ins_pipe( fpu_reg_reg );
-%}
-
-// Cisc-alternate to addFPR_reg
-// Spill to obtain 24-bit precision
-instruct addFPR24_reg_mem(stackSlotF dst, regFPR src1, memory src2) %{
-  predicate(UseSSE==0 && Compile::current()->select_24_bit_instr());
-  match(Set dst (AddF src1 (LoadF src2)));
-
-  format %{ "FLD    $src2\n\t"
-            "FADD   ST,$src1\n\t"
-            "FSTP_S $dst" %}
-  opcode(0xD8, 0x0, 0xD9); /* D8 C0+i */  /* LoadF  D9 /0 */
-  ins_encode( SetInstMark, Opcode(tertiary), RMopc_Mem(0x00,src2),
-              OpcReg_FPR(src1),
-              Pop_Mem_FPR(dst), ClearInstMark );
-  ins_pipe( fpu_mem_reg_mem );
-%}
-//
-// Cisc-alternate to addFPR_reg
-// This instruction does not round to 24-bits
-instruct addFPR_reg_mem(regFPR dst, memory src) %{
-  predicate(UseSSE==0 && !Compile::current()->select_24_bit_instr());
-  match(Set dst (AddF dst (LoadF src)));
-
-  format %{ "FADD   $dst,$src" %}
-  opcode(0xDE, 0x0, 0xD9); /* DE C0+i or DE /0*/  /* LoadF  D9 /0 */
-  ins_encode( SetInstMark, Opcode(tertiary), RMopc_Mem(0x00,src),
-              OpcP, RegOpc(dst), ClearInstMark );
-  ins_pipe( fpu_reg_mem );
-%}
-
-// // Following two instructions for _222_mpegaudio
-// Spill to obtain 24-bit precision
-instruct addFPR24_mem_reg(stackSlotF dst, regFPR src2, memory src1 ) %{
-  predicate(UseSSE==0 && Compile::current()->select_24_bit_instr());
-  match(Set dst (AddF src1 src2));
-
-  format %{ "FADD   $dst,$src1,$src2" %}
-  opcode(0xD8, 0x0, 0xD9); /* D8 C0+i */  /* LoadF  D9 /0 */
-  ins_encode( SetInstMark, Opcode(tertiary), RMopc_Mem(0x00,src1),
-              OpcReg_FPR(src2),
-              Pop_Mem_FPR(dst), ClearInstMark );
-  ins_pipe( fpu_mem_reg_mem );
-%}
-
-// Cisc-spill variant
-// Spill to obtain 24-bit precision
-instruct addFPR24_mem_cisc(stackSlotF dst, memory src1, memory src2) %{
-  predicate(UseSSE==0 && Compile::current()->select_24_bit_instr());
-  match(Set dst (AddF src1 (LoadF src2)));
-
-  format %{ "FADD   $dst,$src1,$src2 cisc" %}
-  opcode(0xD8, 0x0, 0xD9); /* D8 C0+i */  /* LoadF  D9 /0 */
-  ins_encode( SetInstMark, Opcode(tertiary), RMopc_Mem(0x00,src2),
-              OpcP, RMopc_Mem(secondary,src1),
-              Pop_Mem_FPR(dst),
-              ClearInstMark);
-  ins_pipe( fpu_mem_mem_mem );
-%}
-
-// Spill to obtain 24-bit precision
-instruct addFPR24_mem_mem(stackSlotF dst, memory src1, memory src2) %{
-  predicate(UseSSE==0 && Compile::current()->select_24_bit_instr());
-  match(Set dst (AddF src1 src2));
-
-  format %{ "FADD   $dst,$src1,$src2" %}
-  opcode(0xD8, 0x0, 0xD9); /* D8 /0 */  /* LoadF  D9 /0 */
-  ins_encode( SetInstMark, Opcode(tertiary), RMopc_Mem(0x00,src2),
-              OpcP, RMopc_Mem(secondary,src1),
-              Pop_Mem_FPR(dst),
-              ClearInstMark);
-  ins_pipe( fpu_mem_mem_mem );
-%}
-
-
-// Spill to obtain 24-bit precision
-instruct addFPR24_reg_imm(stackSlotF dst, regFPR src, immFPR con) %{
-  predicate(UseSSE==0 && Compile::current()->select_24_bit_instr());
-  match(Set dst (AddF src con));
-  format %{ "FLD    $src\n\t"
-            "FADD_S [$constantaddress]\t# load from constant table: float=$con\n\t"
-            "FSTP_S $dst"  %}
-  ins_encode %{
-    __ fld_s($src$$reg - 1);  // FLD ST(i-1)
-    __ fadd_s($constantaddress($con));
-    __ fstp_s(Address(rsp, $dst$$disp));
-  %}
-  ins_pipe(fpu_mem_reg_con);
-%}
-//
-// This instruction does not round to 24-bits
-instruct addFPR_reg_imm(regFPR dst, regFPR src, immFPR con) %{
-  predicate(UseSSE==0 && !Compile::current()->select_24_bit_instr());
-  match(Set dst (AddF src con));
-  format %{ "FLD    $src\n\t"
-            "FADD_S [$constantaddress]\t# load from constant table: float=$con\n\t"
-            "FSTP   $dst"  %}
-  ins_encode %{
-    __ fld_s($src$$reg - 1);  // FLD ST(i-1)
-    __ fadd_s($constantaddress($con));
-    __ fstp_d($dst$$reg);
-  %}
-  ins_pipe(fpu_reg_reg_con);
-%}
-
-// Spill to obtain 24-bit precision
-instruct mulFPR24_reg(stackSlotF dst, regFPR src1, regFPR src2) %{
-  predicate(UseSSE==0 && Compile::current()->select_24_bit_instr());
-  match(Set dst (MulF src1 src2));
-
-  format %{ "FLD    $src1\n\t"
-            "FMUL   $src2\n\t"
-            "FSTP_S $dst"  %}
-  opcode(0xD8, 0x1); /* D8 C8+i or D8 /1 ;; result in TOS */
-  ins_encode( Push_Reg_FPR(src1),
-              OpcReg_FPR(src2),
-              Pop_Mem_FPR(dst) );
-  ins_pipe( fpu_mem_reg_reg );
-%}
-//
-// This instruction does not round to 24-bits
-instruct mulFPR_reg(regFPR dst, regFPR src1, regFPR src2) %{
-  predicate(UseSSE==0 && !Compile::current()->select_24_bit_instr());
-  match(Set dst (MulF src1 src2));
-
-  format %{ "FLD    $src1\n\t"
-            "FMUL   $src2\n\t"
-            "FSTP_S $dst"  %}
-  opcode(0xD8, 0x1); /* D8 C8+i */
-  ins_encode( Push_Reg_FPR(src2),
-              OpcReg_FPR(src1),
-              Pop_Reg_FPR(dst) );
-  ins_pipe( fpu_reg_reg_reg );
-%}
-
-
-// Spill to obtain 24-bit precision
-// Cisc-alternate to reg-reg multiply
-instruct mulFPR24_reg_mem(stackSlotF dst, regFPR src1, memory src2) %{
-  predicate(UseSSE==0 && Compile::current()->select_24_bit_instr());
-  match(Set dst (MulF src1 (LoadF src2)));
-
-  format %{ "FLD_S  $src2\n\t"
-            "FMUL   $src1\n\t"
-            "FSTP_S $dst"  %}
-  opcode(0xD8, 0x1, 0xD9); /* D8 C8+i or DE /1*/  /* LoadF D9 /0 */
-  ins_encode( SetInstMark, Opcode(tertiary), RMopc_Mem(0x00,src2),
-              OpcReg_FPR(src1),
-              Pop_Mem_FPR(dst), ClearInstMark );
-  ins_pipe( fpu_mem_reg_mem );
-%}
-//
-// This instruction does not round to 24-bits
-// Cisc-alternate to reg-reg multiply
-instruct mulFPR_reg_mem(regFPR dst, regFPR src1, memory src2) %{
-  predicate(UseSSE==0 && !Compile::current()->select_24_bit_instr());
-  match(Set dst (MulF src1 (LoadF src2)));
-
-  format %{ "FMUL   $dst,$src1,$src2" %}
-  opcode(0xD8, 0x1, 0xD9); /* D8 C8+i */  /* LoadF D9 /0 */
-  ins_encode( SetInstMark, Opcode(tertiary), RMopc_Mem(0x00,src2),
-              OpcReg_FPR(src1),
-              Pop_Reg_FPR(dst), ClearInstMark );
-  ins_pipe( fpu_reg_reg_mem );
-%}
-
-// Spill to obtain 24-bit precision
-instruct mulFPR24_mem_mem(stackSlotF dst, memory src1, memory src2) %{
-  predicate(UseSSE==0 && Compile::current()->select_24_bit_instr());
-  match(Set dst (MulF src1 src2));
-
-  format %{ "FMUL   $dst,$src1,$src2" %}
-  opcode(0xD8, 0x1, 0xD9); /* D8 /1 */  /* LoadF D9 /0 */
-  ins_encode( SetInstMark, Opcode(tertiary), RMopc_Mem(0x00,src2),
-              OpcP, RMopc_Mem(secondary,src1),
-              Pop_Mem_FPR(dst),
-              ClearInstMark );
-  ins_pipe( fpu_mem_mem_mem );
-%}
-
-// Spill to obtain 24-bit precision
-instruct mulFPR24_reg_imm(stackSlotF dst, regFPR src, immFPR con) %{
-  predicate(UseSSE==0 && Compile::current()->select_24_bit_instr());
-  match(Set dst (MulF src con));
-
-  format %{ "FLD    $src\n\t"
-            "FMUL_S [$constantaddress]\t# load from constant table: float=$con\n\t"
-            "FSTP_S $dst"  %}
-  ins_encode %{
-    __ fld_s($src$$reg - 1);  // FLD ST(i-1)
-    __ fmul_s($constantaddress($con));
-    __ fstp_s(Address(rsp, $dst$$disp));
-  %}
-  ins_pipe(fpu_mem_reg_con);
-%}
-//
-// This instruction does not round to 24-bits
-instruct mulFPR_reg_imm(regFPR dst, regFPR src, immFPR con) %{
-  predicate(UseSSE==0 && !Compile::current()->select_24_bit_instr());
-  match(Set dst (MulF src con));
-
-  format %{ "FLD    $src\n\t"
-            "FMUL_S [$constantaddress]\t# load from constant table: float=$con\n\t"
-            "FSTP   $dst"  %}
-  ins_encode %{
-    __ fld_s($src$$reg - 1);  // FLD ST(i-1)
-    __ fmul_s($constantaddress($con));
-    __ fstp_d($dst$$reg);
-  %}
-  ins_pipe(fpu_reg_reg_con);
-%}
-
-
-//
-// MACRO1 -- subsume unshared load into mulFPR
-// This instruction does not round to 24-bits
-instruct mulFPR_reg_load1(regFPR dst, regFPR src, memory mem1 ) %{
-  predicate(UseSSE==0 && !Compile::current()->select_24_bit_instr());
-  match(Set dst (MulF (LoadF mem1) src));
-
-  format %{ "FLD    $mem1    ===MACRO1===\n\t"
-            "FMUL   ST,$src\n\t"
-            "FSTP   $dst" %}
-  opcode(0xD8, 0x1, 0xD9); /* D8 C8+i or D8 /1 */  /* LoadF D9 /0 */
-  ins_encode( SetInstMark, Opcode(tertiary), RMopc_Mem(0x00,mem1),
-              OpcReg_FPR(src),
-              Pop_Reg_FPR(dst), ClearInstMark );
-  ins_pipe( fpu_reg_reg_mem );
-%}
-//
-// MACRO2 -- addFPR a mulFPR which subsumed an unshared load
-// This instruction does not round to 24-bits
-instruct addFPR_mulFPR_reg_load1(regFPR dst, memory mem1, regFPR src1, regFPR src2) %{
-  predicate(UseSSE==0 && !Compile::current()->select_24_bit_instr());
-  match(Set dst (AddF (MulF (LoadF mem1) src1) src2));
-  ins_cost(95);
-
-  format %{ "FLD    $mem1     ===MACRO2===\n\t"
-            "FMUL   ST,$src1  subsume mulFPR left load\n\t"
-            "FADD   ST,$src2\n\t"
-            "FSTP   $dst" %}
-  opcode(0xD9); /* LoadF D9 /0 */
-  ins_encode( SetInstMark, OpcP, RMopc_Mem(0x00,mem1),
-              FMul_ST_reg(src1),
-              FAdd_ST_reg(src2),
-              Pop_Reg_FPR(dst), ClearInstMark );
-  ins_pipe( fpu_reg_mem_reg_reg );
-%}
-
-// MACRO3 -- addFPR a mulFPR
-// This instruction does not round to 24-bits.  It is a '2-address'
-// instruction in that the result goes back to src2.  This eliminates
-// a move from the macro; possibly the register allocator will have
-// to add it back (and maybe not).
-instruct addFPR_mulFPR_reg(regFPR src2, regFPR src1, regFPR src0) %{
-  predicate(UseSSE==0 && !Compile::current()->select_24_bit_instr());
-  match(Set src2 (AddF (MulF src0 src1) src2));
-
-  format %{ "FLD    $src0     ===MACRO3===\n\t"
-            "FMUL   ST,$src1\n\t"
-            "FADDP  $src2,ST" %}
-  opcode(0xD9); /* LoadF D9 /0 */
-  ins_encode( Push_Reg_FPR(src0),
-              FMul_ST_reg(src1),
-              FAddP_reg_ST(src2) );
-  ins_pipe( fpu_reg_reg_reg );
-%}
-
-// MACRO4 -- divFPR subFPR
-// This instruction does not round to 24-bits
-instruct subFPR_divFPR_reg(regFPR dst, regFPR src1, regFPR src2, regFPR src3) %{
-  predicate(UseSSE==0 && !Compile::current()->select_24_bit_instr());
-  match(Set dst (DivF (SubF src2 src1) src3));
-
-  format %{ "FLD    $src2   ===MACRO4===\n\t"
-            "FSUB   ST,$src1\n\t"
-            "FDIV   ST,$src3\n\t"
-            "FSTP  $dst" %}
-  opcode(0xDE, 0x7); /* DE F8+i or DE /7*/
-  ins_encode( Push_Reg_FPR(src2),
-              subFPR_divFPR_encode(src1,src3),
-              Pop_Reg_FPR(dst) );
-  ins_pipe( fpu_reg_reg_reg_reg );
-%}
-
-// Spill to obtain 24-bit precision
-instruct divFPR24_reg(stackSlotF dst, regFPR src1, regFPR src2) %{
-  predicate(UseSSE==0 && Compile::current()->select_24_bit_instr());
-  match(Set dst (DivF src1 src2));
-
-  format %{ "FDIV   $dst,$src1,$src2" %}
-  opcode(0xD8, 0x6); /* D8 F0+i or DE /6*/
-  ins_encode( Push_Reg_FPR(src1),
-              OpcReg_FPR(src2),
-              Pop_Mem_FPR(dst) );
-  ins_pipe( fpu_mem_reg_reg );
-%}
-//
-// This instruction does not round to 24-bits
-instruct divFPR_reg(regFPR dst, regFPR src) %{
-  predicate(UseSSE==0 && !Compile::current()->select_24_bit_instr());
-  match(Set dst (DivF dst src));
-
-  format %{ "FDIV   $dst,$src" %}
-  opcode(0xDE, 0x7); /* DE F8+i or DE /7*/
-  ins_encode( Push_Reg_FPR(src),
-              OpcP, RegOpc(dst) );
-  ins_pipe( fpu_reg_reg );
-%}
-
-
-//----------Arithmetic Conversion Instructions---------------------------------
-// The conversions operations are all Alpha sorted.  Please keep it that way!
-
-instruct roundFloat_mem_reg(stackSlotF dst, regFPR src) %{
-  predicate(UseSSE==0);
-  match(Set dst (RoundFloat src));
-  ins_cost(125);
-  format %{ "FST_S  $dst,$src\t# F-round" %}
-  ins_encode( Pop_Mem_Reg_FPR(dst, src) );
-  ins_pipe( fpu_mem_reg );
-%}
-
-instruct roundDouble_mem_reg(stackSlotD dst, regDPR src) %{
-  predicate(UseSSE<=1);
-  match(Set dst (RoundDouble src));
-  ins_cost(125);
-  format %{ "FST_D  $dst,$src\t# D-round" %}
-  ins_encode( Pop_Mem_Reg_DPR(dst, src) );
-  ins_pipe( fpu_mem_reg );
-%}
-
-// Force rounding to 24-bit precision and 6-bit exponent
-instruct convDPR2FPR_reg(stackSlotF dst, regDPR src) %{
-  predicate(UseSSE==0);
-  match(Set dst (ConvD2F src));
-  format %{ "FST_S  $dst,$src\t# F-round" %}
-  expand %{
-    roundFloat_mem_reg(dst,src);
-  %}
-%}
-
-// Force rounding to 24-bit precision and 6-bit exponent
-instruct convDPR2F_reg(regF dst, regDPR src, eFlagsReg cr) %{
-  predicate(UseSSE==1);
-  match(Set dst (ConvD2F src));
-  effect( KILL cr );
-  format %{ "SUB    ESP,4\n\t"
-            "FST_S  [ESP],$src\t# F-round\n\t"
-            "MOVSS  $dst,[ESP]\n\t"
-            "ADD ESP,4" %}
-  ins_encode %{
-    __ subptr(rsp, 4);
-    if ($src$$reg != FPR1L_enc) {
-      __ fld_s($src$$reg-1);
-      __ fstp_s(Address(rsp, 0));
-    } else {
-      __ fst_s(Address(rsp, 0));
-    }
-    __ movflt($dst$$XMMRegister, Address(rsp, 0));
-    __ addptr(rsp, 4);
-  %}
-  ins_pipe( pipe_slow );
-%}
-
-// Force rounding double precision to single precision
-instruct convD2F_reg(regF dst, regD src) %{
-  predicate(UseSSE>=2);
-  match(Set dst (ConvD2F src));
-  format %{ "CVTSD2SS $dst,$src\t# F-round" %}
-  ins_encode %{
-    __ cvtsd2ss ($dst$$XMMRegister, $src$$XMMRegister);
-  %}
-  ins_pipe( pipe_slow );
-%}
-
-instruct convFPR2DPR_reg_reg(regDPR dst, regFPR src) %{
-  predicate(UseSSE==0);
-  match(Set dst (ConvF2D src));
-  format %{ "FST_S  $dst,$src\t# D-round" %}
-  ins_encode( Pop_Reg_Reg_DPR(dst, src));
-  ins_pipe( fpu_reg_reg );
-%}
-
-instruct convFPR2D_reg(stackSlotD dst, regFPR src) %{
-  predicate(UseSSE==1);
-  match(Set dst (ConvF2D src));
-  format %{ "FST_D  $dst,$src\t# D-round" %}
-  expand %{
-    roundDouble_mem_reg(dst,src);
-  %}
-%}
-
-instruct convF2DPR_reg(regDPR dst, regF src, eFlagsReg cr) %{
-  predicate(UseSSE==1);
-  match(Set dst (ConvF2D src));
-  effect( KILL cr );
-  format %{ "SUB    ESP,4\n\t"
-            "MOVSS  [ESP] $src\n\t"
-            "FLD_S  [ESP]\n\t"
-            "ADD    ESP,4\n\t"
-            "FSTP   $dst\t# D-round" %}
-  ins_encode %{
-    __ subptr(rsp, 4);
-    __ movflt(Address(rsp, 0), $src$$XMMRegister);
-    __ fld_s(Address(rsp, 0));
-    __ addptr(rsp, 4);
-    __ fstp_d($dst$$reg);
-  %}
-  ins_pipe( pipe_slow );
-%}
-
-instruct convF2D_reg(regD dst, regF src) %{
-  predicate(UseSSE>=2);
-  match(Set dst (ConvF2D src));
-  format %{ "CVTSS2SD $dst,$src\t# D-round" %}
-  ins_encode %{
-    __ cvtss2sd ($dst$$XMMRegister, $src$$XMMRegister);
-  %}
-  ins_pipe( pipe_slow );
-%}
-
-// Convert a double to an int.  If the double is a NAN, stuff a zero in instead.
-instruct convDPR2I_reg_reg( eAXRegI dst, eDXRegI tmp, regDPR src, eFlagsReg cr ) %{
-  predicate(UseSSE<=1);
-  match(Set dst (ConvD2I src));
-  effect( KILL tmp, KILL cr );
-  format %{ "FLD    $src\t# Convert double to int \n\t"
-            "FLDCW  trunc mode\n\t"
-            "SUB    ESP,4\n\t"
-            "FISTp  [ESP + #0]\n\t"
-            "FLDCW  std/24-bit mode\n\t"
-            "POP    EAX\n\t"
-            "CMP    EAX,0x80000000\n\t"
-            "JNE,s  fast\n\t"
-            "FLD_D  $src\n\t"
-            "CALL   d2i_wrapper\n"
-      "fast:" %}
-  ins_encode( Push_Reg_DPR(src), DPR2I_encoding(src) );
-  ins_pipe( pipe_slow );
-%}
-
-// Convert a double to an int.  If the double is a NAN, stuff a zero in instead.
-instruct convD2I_reg_reg( eAXRegI dst, eDXRegI tmp, regD src, eFlagsReg cr ) %{
-  predicate(UseSSE>=2);
-  match(Set dst (ConvD2I src));
-  effect( KILL tmp, KILL cr );
-  format %{ "CVTTSD2SI $dst, $src\n\t"
-            "CMP    $dst,0x80000000\n\t"
-            "JNE,s  fast\n\t"
-            "SUB    ESP, 8\n\t"
-            "MOVSD  [ESP], $src\n\t"
-            "FLD_D  [ESP]\n\t"
-            "ADD    ESP, 8\n\t"
-            "CALL   d2i_wrapper\n"
-      "fast:" %}
-  ins_encode %{
-    Label fast;
-    __ cvttsd2sil($dst$$Register, $src$$XMMRegister);
-    __ cmpl($dst$$Register, 0x80000000);
-    __ jccb(Assembler::notEqual, fast);
-    __ subptr(rsp, 8);
-    __ movdbl(Address(rsp, 0), $src$$XMMRegister);
-    __ fld_d(Address(rsp, 0));
-    __ addptr(rsp, 8);
-    __ call(RuntimeAddress(CAST_FROM_FN_PTR(address, StubRoutines::x86::d2i_wrapper())));
-    __ post_call_nop();
-    __ bind(fast);
-  %}
-  ins_pipe( pipe_slow );
-%}
-
-instruct convDPR2L_reg_reg( eADXRegL dst, regDPR src, eFlagsReg cr ) %{
-  predicate(UseSSE<=1);
-  match(Set dst (ConvD2L src));
-  effect( KILL cr );
-  format %{ "FLD    $src\t# Convert double to long\n\t"
-            "FLDCW  trunc mode\n\t"
-            "SUB    ESP,8\n\t"
-            "FISTp  [ESP + #0]\n\t"
-            "FLDCW  std/24-bit mode\n\t"
-            "POP    EAX\n\t"
-            "POP    EDX\n\t"
-            "CMP    EDX,0x80000000\n\t"
-            "JNE,s  fast\n\t"
-            "TEST   EAX,EAX\n\t"
-            "JNE,s  fast\n\t"
-            "FLD    $src\n\t"
-            "CALL   d2l_wrapper\n"
-      "fast:" %}
-  ins_encode( Push_Reg_DPR(src),  DPR2L_encoding(src) );
-  ins_pipe( pipe_slow );
-%}
-
-// XMM lacks a float/double->long conversion, so use the old FPU stack.
-instruct convD2L_reg_reg( eADXRegL dst, regD src, eFlagsReg cr ) %{
-  predicate (UseSSE>=2);
-  match(Set dst (ConvD2L src));
-  effect( KILL cr );
-  format %{ "SUB    ESP,8\t# Convert double to long\n\t"
-            "MOVSD  [ESP],$src\n\t"
-            "FLD_D  [ESP]\n\t"
-            "FLDCW  trunc mode\n\t"
-            "FISTp  [ESP + #0]\n\t"
-            "FLDCW  std/24-bit mode\n\t"
-            "POP    EAX\n\t"
-            "POP    EDX\n\t"
-            "CMP    EDX,0x80000000\n\t"
-            "JNE,s  fast\n\t"
-            "TEST   EAX,EAX\n\t"
-            "JNE,s  fast\n\t"
-            "SUB    ESP,8\n\t"
-            "MOVSD  [ESP],$src\n\t"
-            "FLD_D  [ESP]\n\t"
-            "ADD    ESP,8\n\t"
-            "CALL   d2l_wrapper\n"
-      "fast:" %}
-  ins_encode %{
-    Label fast;
-    __ subptr(rsp, 8);
-    __ movdbl(Address(rsp, 0), $src$$XMMRegister);
-    __ fld_d(Address(rsp, 0));
-    __ fldcw(ExternalAddress(StubRoutines::x86::addr_fpu_cntrl_wrd_trunc()));
-    __ fistp_d(Address(rsp, 0));
-    // Restore the rounding mode, mask the exception
-    if (Compile::current()->in_24_bit_fp_mode()) {
-      __ fldcw(ExternalAddress(StubRoutines::x86::addr_fpu_cntrl_wrd_24()));
-    } else {
-      __ fldcw(ExternalAddress(StubRoutines::x86::addr_fpu_cntrl_wrd_std()));
-    }
-    // Load the converted long, adjust CPU stack
-    __ pop(rax);
-    __ pop(rdx);
-    __ cmpl(rdx, 0x80000000);
-    __ jccb(Assembler::notEqual, fast);
-    __ testl(rax, rax);
-    __ jccb(Assembler::notEqual, fast);
-    __ subptr(rsp, 8);
-    __ movdbl(Address(rsp, 0), $src$$XMMRegister);
-    __ fld_d(Address(rsp, 0));
-    __ addptr(rsp, 8);
-    __ call(RuntimeAddress(CAST_FROM_FN_PTR(address, StubRoutines::x86::d2l_wrapper())));
-    __ post_call_nop();
-    __ bind(fast);
-  %}
-  ins_pipe( pipe_slow );
-%}
-
-// Convert a double to an int.  Java semantics require we do complex
-// manglations in the corner cases.  So we set the rounding mode to
-// 'zero', store the darned double down as an int, and reset the
-// rounding mode to 'nearest'.  The hardware stores a flag value down
-// if we would overflow or converted a NAN; we check for this and
-// and go the slow path if needed.
-instruct convFPR2I_reg_reg(eAXRegI dst, eDXRegI tmp, regFPR src, eFlagsReg cr ) %{
-  predicate(UseSSE==0);
-  match(Set dst (ConvF2I src));
-  effect( KILL tmp, KILL cr );
-  format %{ "FLD    $src\t# Convert float to int \n\t"
-            "FLDCW  trunc mode\n\t"
-            "SUB    ESP,4\n\t"
-            "FISTp  [ESP + #0]\n\t"
-            "FLDCW  std/24-bit mode\n\t"
-            "POP    EAX\n\t"
-            "CMP    EAX,0x80000000\n\t"
-            "JNE,s  fast\n\t"
-            "FLD    $src\n\t"
-            "CALL   d2i_wrapper\n"
-      "fast:" %}
-  // DPR2I_encoding works for FPR2I
-  ins_encode( Push_Reg_FPR(src), DPR2I_encoding(src) );
-  ins_pipe( pipe_slow );
-%}
-
-// Convert a float in xmm to an int reg.
-instruct convF2I_reg(eAXRegI dst, eDXRegI tmp, regF src, eFlagsReg cr ) %{
-  predicate(UseSSE>=1);
-  match(Set dst (ConvF2I src));
-  effect( KILL tmp, KILL cr );
-  format %{ "CVTTSS2SI $dst, $src\n\t"
-            "CMP    $dst,0x80000000\n\t"
-            "JNE,s  fast\n\t"
-            "SUB    ESP, 4\n\t"
-            "MOVSS  [ESP], $src\n\t"
-            "FLD    [ESP]\n\t"
-            "ADD    ESP, 4\n\t"
-            "CALL   d2i_wrapper\n"
-      "fast:" %}
-  ins_encode %{
-    Label fast;
-    __ cvttss2sil($dst$$Register, $src$$XMMRegister);
-    __ cmpl($dst$$Register, 0x80000000);
-    __ jccb(Assembler::notEqual, fast);
-    __ subptr(rsp, 4);
-    __ movflt(Address(rsp, 0), $src$$XMMRegister);
-    __ fld_s(Address(rsp, 0));
-    __ addptr(rsp, 4);
-    __ call(RuntimeAddress(CAST_FROM_FN_PTR(address, StubRoutines::x86::d2i_wrapper())));
-    __ post_call_nop();
-    __ bind(fast);
-  %}
-  ins_pipe( pipe_slow );
-%}
-
-instruct convFPR2L_reg_reg( eADXRegL dst, regFPR src, eFlagsReg cr ) %{
-  predicate(UseSSE==0);
-  match(Set dst (ConvF2L src));
-  effect( KILL cr );
-  format %{ "FLD    $src\t# Convert float to long\n\t"
-            "FLDCW  trunc mode\n\t"
-            "SUB    ESP,8\n\t"
-            "FISTp  [ESP + #0]\n\t"
-            "FLDCW  std/24-bit mode\n\t"
-            "POP    EAX\n\t"
-            "POP    EDX\n\t"
-            "CMP    EDX,0x80000000\n\t"
-            "JNE,s  fast\n\t"
-            "TEST   EAX,EAX\n\t"
-            "JNE,s  fast\n\t"
-            "FLD    $src\n\t"
-            "CALL   d2l_wrapper\n"
-      "fast:" %}
-  // DPR2L_encoding works for FPR2L
-  ins_encode( Push_Reg_FPR(src), DPR2L_encoding(src) );
-  ins_pipe( pipe_slow );
-%}
-
-// XMM lacks a float/double->long conversion, so use the old FPU stack.
-instruct convF2L_reg_reg( eADXRegL dst, regF src, eFlagsReg cr ) %{
-  predicate (UseSSE>=1);
-  match(Set dst (ConvF2L src));
-  effect( KILL cr );
-  format %{ "SUB    ESP,8\t# Convert float to long\n\t"
-            "MOVSS  [ESP],$src\n\t"
-            "FLD_S  [ESP]\n\t"
-            "FLDCW  trunc mode\n\t"
-            "FISTp  [ESP + #0]\n\t"
-            "FLDCW  std/24-bit mode\n\t"
-            "POP    EAX\n\t"
-            "POP    EDX\n\t"
-            "CMP    EDX,0x80000000\n\t"
-            "JNE,s  fast\n\t"
-            "TEST   EAX,EAX\n\t"
-            "JNE,s  fast\n\t"
-            "SUB    ESP,4\t# Convert float to long\n\t"
-            "MOVSS  [ESP],$src\n\t"
-            "FLD_S  [ESP]\n\t"
-            "ADD    ESP,4\n\t"
-            "CALL   d2l_wrapper\n"
-      "fast:" %}
-  ins_encode %{
-    Label fast;
-    __ subptr(rsp, 8);
-    __ movflt(Address(rsp, 0), $src$$XMMRegister);
-    __ fld_s(Address(rsp, 0));
-    __ fldcw(ExternalAddress(StubRoutines::x86::addr_fpu_cntrl_wrd_trunc()));
-    __ fistp_d(Address(rsp, 0));
-    // Restore the rounding mode, mask the exception
-    if (Compile::current()->in_24_bit_fp_mode()) {
-      __ fldcw(ExternalAddress(StubRoutines::x86::addr_fpu_cntrl_wrd_24()));
-    } else {
-      __ fldcw(ExternalAddress(StubRoutines::x86::addr_fpu_cntrl_wrd_std()));
-    }
-    // Load the converted long, adjust CPU stack
-    __ pop(rax);
-    __ pop(rdx);
-    __ cmpl(rdx, 0x80000000);
-    __ jccb(Assembler::notEqual, fast);
-    __ testl(rax, rax);
-    __ jccb(Assembler::notEqual, fast);
-    __ subptr(rsp, 4);
-    __ movflt(Address(rsp, 0), $src$$XMMRegister);
-    __ fld_s(Address(rsp, 0));
-    __ addptr(rsp, 4);
-    __ call(RuntimeAddress(CAST_FROM_FN_PTR(address, StubRoutines::x86::d2l_wrapper())));
-    __ post_call_nop();
-    __ bind(fast);
-  %}
-  ins_pipe( pipe_slow );
-%}
-
-instruct convI2DPR_reg(regDPR dst, stackSlotI src) %{
-  predicate( UseSSE<=1 );
-  match(Set dst (ConvI2D src));
-  format %{ "FILD   $src\n\t"
-            "FSTP   $dst" %}
-  opcode(0xDB, 0x0);  /* DB /0 */
-  ins_encode(Push_Mem_I(src), Pop_Reg_DPR(dst));
-  ins_pipe( fpu_reg_mem );
-%}
-
-instruct convI2D_reg(regD dst, rRegI src) %{
-  predicate( UseSSE>=2 && !UseXmmI2D );
-  match(Set dst (ConvI2D src));
-  format %{ "CVTSI2SD $dst,$src" %}
-  ins_encode %{
-    __ cvtsi2sdl ($dst$$XMMRegister, $src$$Register);
-  %}
-  ins_pipe( pipe_slow );
-%}
-
-instruct convI2D_mem(regD dst, memory mem) %{
-  predicate( UseSSE>=2 );
-  match(Set dst (ConvI2D (LoadI mem)));
-  format %{ "CVTSI2SD $dst,$mem" %}
-  ins_encode %{
-    __ cvtsi2sdl ($dst$$XMMRegister, $mem$$Address);
-  %}
-  ins_pipe( pipe_slow );
-%}
-
-instruct convXI2D_reg(regD dst, rRegI src)
-%{
-  predicate( UseSSE>=2 && UseXmmI2D );
-  match(Set dst (ConvI2D src));
-
-  format %{ "MOVD  $dst,$src\n\t"
-            "CVTDQ2PD $dst,$dst\t# i2d" %}
-  ins_encode %{
-    __ movdl($dst$$XMMRegister, $src$$Register);
-    __ cvtdq2pd($dst$$XMMRegister, $dst$$XMMRegister);
-  %}
-  ins_pipe(pipe_slow); // XXX
-%}
-
-instruct convI2DPR_mem(regDPR dst, memory mem) %{
-  predicate( UseSSE<=1 && !Compile::current()->select_24_bit_instr());
-  match(Set dst (ConvI2D (LoadI mem)));
-  format %{ "FILD   $mem\n\t"
-            "FSTP   $dst" %}
-  opcode(0xDB);      /* DB /0 */
-  ins_encode( SetInstMark, OpcP, RMopc_Mem(0x00,mem),
-              Pop_Reg_DPR(dst), ClearInstMark);
-  ins_pipe( fpu_reg_mem );
-%}
-
-// Convert a byte to a float; no rounding step needed.
-instruct conv24I2FPR_reg(regFPR dst, stackSlotI src) %{
-  predicate( UseSSE==0 && n->in(1)->Opcode() == Op_AndI && n->in(1)->in(2)->is_Con() && n->in(1)->in(2)->get_int() == 255 );
-  match(Set dst (ConvI2F src));
-  format %{ "FILD   $src\n\t"
-            "FSTP   $dst" %}
-
-  opcode(0xDB, 0x0);  /* DB /0 */
-  ins_encode(Push_Mem_I(src), Pop_Reg_FPR(dst));
-  ins_pipe( fpu_reg_mem );
-%}
-
-// In 24-bit mode, force exponent rounding by storing back out
-instruct convI2FPR_SSF(stackSlotF dst, stackSlotI src) %{
-  predicate( UseSSE==0 && Compile::current()->select_24_bit_instr());
-  match(Set dst (ConvI2F src));
-  ins_cost(200);
-  format %{ "FILD   $src\n\t"
-            "FSTP_S $dst" %}
-  opcode(0xDB, 0x0);  /* DB /0 */
-  ins_encode( Push_Mem_I(src),
-              Pop_Mem_FPR(dst));
-  ins_pipe( fpu_mem_mem );
-%}
-
-// In 24-bit mode, force exponent rounding by storing back out
-instruct convI2FPR_SSF_mem(stackSlotF dst, memory mem) %{
-  predicate( UseSSE==0 && Compile::current()->select_24_bit_instr());
-  match(Set dst (ConvI2F (LoadI mem)));
-  ins_cost(200);
-  format %{ "FILD   $mem\n\t"
-            "FSTP_S $dst" %}
-  opcode(0xDB);  /* DB /0 */
-  ins_encode( SetInstMark, OpcP, RMopc_Mem(0x00,mem),
-              Pop_Mem_FPR(dst), ClearInstMark);
-  ins_pipe( fpu_mem_mem );
-%}
-
-// This instruction does not round to 24-bits
-instruct convI2FPR_reg(regFPR dst, stackSlotI src) %{
-  predicate( UseSSE==0 && !Compile::current()->select_24_bit_instr());
-  match(Set dst (ConvI2F src));
-  format %{ "FILD   $src\n\t"
-            "FSTP   $dst" %}
-  opcode(0xDB, 0x0);  /* DB /0 */
-  ins_encode( Push_Mem_I(src),
-              Pop_Reg_FPR(dst));
-  ins_pipe( fpu_reg_mem );
-%}
-
-// This instruction does not round to 24-bits
-instruct convI2FPR_mem(regFPR dst, memory mem) %{
-  predicate( UseSSE==0 && !Compile::current()->select_24_bit_instr());
-  match(Set dst (ConvI2F (LoadI mem)));
-  format %{ "FILD   $mem\n\t"
-            "FSTP   $dst" %}
-  opcode(0xDB);      /* DB /0 */
-  ins_encode( SetInstMark, OpcP, RMopc_Mem(0x00,mem),
-              Pop_Reg_FPR(dst), ClearInstMark);
-  ins_pipe( fpu_reg_mem );
-%}
-
-// Convert an int to a float in xmm; no rounding step needed.
-instruct convI2F_reg(regF dst, rRegI src) %{
-  predicate( UseSSE==1 || ( UseSSE>=2 && !UseXmmI2F ));
-  match(Set dst (ConvI2F src));
-  format %{ "CVTSI2SS $dst, $src" %}
-  ins_encode %{
-    __ cvtsi2ssl ($dst$$XMMRegister, $src$$Register);
-  %}
-  ins_pipe( pipe_slow );
-%}
-
- instruct convXI2F_reg(regF dst, rRegI src)
-%{
-  predicate( UseSSE>=2 && UseXmmI2F );
-  match(Set dst (ConvI2F src));
-
-  format %{ "MOVD  $dst,$src\n\t"
-            "CVTDQ2PS $dst,$dst\t# i2f" %}
-  ins_encode %{
-    __ movdl($dst$$XMMRegister, $src$$Register);
-    __ cvtdq2ps($dst$$XMMRegister, $dst$$XMMRegister);
-  %}
-  ins_pipe(pipe_slow); // XXX
-%}
-
-instruct convI2L_reg( eRegL dst, rRegI src, eFlagsReg cr) %{
-  match(Set dst (ConvI2L src));
-  effect(KILL cr);
-  ins_cost(375);
-  format %{ "MOV    $dst.lo,$src\n\t"
-            "MOV    $dst.hi,$src\n\t"
-            "SAR    $dst.hi,31" %}
-  ins_encode(convert_int_long(dst,src));
-  ins_pipe( ialu_reg_reg_long );
-%}
-
-// Zero-extend convert int to long
-instruct convI2L_reg_zex(eRegL dst, rRegI src, immL_32bits mask, eFlagsReg flags ) %{
-  match(Set dst (AndL (ConvI2L src) mask) );
-  effect( KILL flags );
-  ins_cost(250);
-  format %{ "MOV    $dst.lo,$src\n\t"
-            "XOR    $dst.hi,$dst.hi" %}
-  opcode(0x33); // XOR
-  ins_encode(enc_Copy(dst,src), OpcP, RegReg_Hi2(dst,dst) );
-  ins_pipe( ialu_reg_reg_long );
-%}
-
-// Zero-extend long
-instruct zerox_long(eRegL dst, eRegL src, immL_32bits mask, eFlagsReg flags ) %{
-  match(Set dst (AndL src mask) );
-  effect( KILL flags );
-  ins_cost(250);
-  format %{ "MOV    $dst.lo,$src.lo\n\t"
-            "XOR    $dst.hi,$dst.hi\n\t" %}
-  opcode(0x33); // XOR
-  ins_encode(enc_Copy(dst,src), OpcP, RegReg_Hi2(dst,dst) );
-  ins_pipe( ialu_reg_reg_long );
-%}
-
-instruct convL2DPR_reg( stackSlotD dst, eRegL src, eFlagsReg cr) %{
-  predicate (UseSSE<=1);
-  match(Set dst (ConvL2D src));
-  effect( KILL cr );
-  format %{ "PUSH   $src.hi\t# Convert long to double\n\t"
-            "PUSH   $src.lo\n\t"
-            "FILD   ST,[ESP + #0]\n\t"
-            "ADD    ESP,8\n\t"
-            "FSTP_D $dst\t# D-round" %}
-  opcode(0xDF, 0x5);  /* DF /5 */
-  ins_encode(convert_long_double(src), Pop_Mem_DPR(dst));
-  ins_pipe( pipe_slow );
-%}
-
-instruct convL2D_reg( regD dst, eRegL src, eFlagsReg cr) %{
-  predicate (UseSSE>=2);
-  match(Set dst (ConvL2D src));
-  effect( KILL cr );
-  format %{ "PUSH   $src.hi\t# Convert long to double\n\t"
-            "PUSH   $src.lo\n\t"
-            "FILD_D [ESP]\n\t"
-            "FSTP_D [ESP]\n\t"
-            "MOVSD  $dst,[ESP]\n\t"
-            "ADD    ESP,8" %}
-  opcode(0xDF, 0x5);  /* DF /5 */
-  ins_encode(convert_long_double2(src), Push_ResultD(dst));
-  ins_pipe( pipe_slow );
-%}
-
-instruct convL2F_reg( regF dst, eRegL src, eFlagsReg cr) %{
-  predicate (UseSSE>=1);
-  match(Set dst (ConvL2F src));
-  effect( KILL cr );
-  format %{ "PUSH   $src.hi\t# Convert long to single float\n\t"
-            "PUSH   $src.lo\n\t"
-            "FILD_D [ESP]\n\t"
-            "FSTP_S [ESP]\n\t"
-            "MOVSS  $dst,[ESP]\n\t"
-            "ADD    ESP,8" %}
-  opcode(0xDF, 0x5);  /* DF /5 */
-  ins_encode(convert_long_double2(src), Push_ResultF(dst,0x8));
-  ins_pipe( pipe_slow );
-%}
-
-instruct convL2FPR_reg( stackSlotF dst, eRegL src, eFlagsReg cr) %{
-  match(Set dst (ConvL2F src));
-  effect( KILL cr );
-  format %{ "PUSH   $src.hi\t# Convert long to single float\n\t"
-            "PUSH   $src.lo\n\t"
-            "FILD   ST,[ESP + #0]\n\t"
-            "ADD    ESP,8\n\t"
-            "FSTP_S $dst\t# F-round" %}
-  opcode(0xDF, 0x5);  /* DF /5 */
-  ins_encode(convert_long_double(src), Pop_Mem_FPR(dst));
-  ins_pipe( pipe_slow );
-%}
-
-instruct convL2I_reg( rRegI dst, eRegL src ) %{
-  match(Set dst (ConvL2I src));
-  effect( DEF dst, USE src );
-  format %{ "MOV    $dst,$src.lo" %}
-  ins_encode(enc_CopyL_Lo(dst,src));
-  ins_pipe( ialu_reg_reg );
-%}
-
-instruct MoveF2I_stack_reg(rRegI dst, stackSlotF src) %{
-  match(Set dst (MoveF2I src));
-  effect( DEF dst, USE src );
-  ins_cost(100);
-  format %{ "MOV    $dst,$src\t# MoveF2I_stack_reg" %}
-  ins_encode %{
-    __ movl($dst$$Register, Address(rsp, $src$$disp));
-  %}
-  ins_pipe( ialu_reg_mem );
-%}
-
-instruct MoveFPR2I_reg_stack(stackSlotI dst, regFPR src) %{
-  predicate(UseSSE==0);
-  match(Set dst (MoveF2I src));
-  effect( DEF dst, USE src );
-
-  ins_cost(125);
-  format %{ "FST_S  $dst,$src\t# MoveF2I_reg_stack" %}
-  ins_encode( Pop_Mem_Reg_FPR(dst, src) );
-  ins_pipe( fpu_mem_reg );
-%}
-
-instruct MoveF2I_reg_stack_sse(stackSlotI dst, regF src) %{
-  predicate(UseSSE>=1);
-  match(Set dst (MoveF2I src));
-  effect( DEF dst, USE src );
-
-  ins_cost(95);
-  format %{ "MOVSS  $dst,$src\t# MoveF2I_reg_stack_sse" %}
-  ins_encode %{
-    __ movflt(Address(rsp, $dst$$disp), $src$$XMMRegister);
-  %}
-  ins_pipe( pipe_slow );
-%}
-
-instruct MoveF2I_reg_reg_sse(rRegI dst, regF src) %{
-  predicate(UseSSE>=2);
-  match(Set dst (MoveF2I src));
-  effect( DEF dst, USE src );
-  ins_cost(85);
-  format %{ "MOVD   $dst,$src\t# MoveF2I_reg_reg_sse" %}
-  ins_encode %{
-    __ movdl($dst$$Register, $src$$XMMRegister);
-  %}
-  ins_pipe( pipe_slow );
-%}
-
-instruct MoveI2F_reg_stack(stackSlotF dst, rRegI src) %{
-  match(Set dst (MoveI2F src));
-  effect( DEF dst, USE src );
-
-  ins_cost(100);
-  format %{ "MOV    $dst,$src\t# MoveI2F_reg_stack" %}
-  ins_encode %{
-    __ movl(Address(rsp, $dst$$disp), $src$$Register);
-  %}
-  ins_pipe( ialu_mem_reg );
-%}
-
-
-instruct MoveI2FPR_stack_reg(regFPR dst, stackSlotI src) %{
-  predicate(UseSSE==0);
-  match(Set dst (MoveI2F src));
-  effect(DEF dst, USE src);
-
-  ins_cost(125);
-  format %{ "FLD_S  $src\n\t"
-            "FSTP   $dst\t# MoveI2F_stack_reg" %}
-  opcode(0xD9);               /* D9 /0, FLD m32real */
-  ins_encode( SetInstMark, OpcP, RMopc_Mem_no_oop(0x00,src),
-              Pop_Reg_FPR(dst), ClearInstMark );
-  ins_pipe( fpu_reg_mem );
-%}
-
-instruct MoveI2F_stack_reg_sse(regF dst, stackSlotI src) %{
-  predicate(UseSSE>=1);
-  match(Set dst (MoveI2F src));
-  effect( DEF dst, USE src );
-
-  ins_cost(95);
-  format %{ "MOVSS  $dst,$src\t# MoveI2F_stack_reg_sse" %}
-  ins_encode %{
-    __ movflt($dst$$XMMRegister, Address(rsp, $src$$disp));
-  %}
-  ins_pipe( pipe_slow );
-%}
-
-instruct MoveI2F_reg_reg_sse(regF dst, rRegI src) %{
-  predicate(UseSSE>=2);
-  match(Set dst (MoveI2F src));
-  effect( DEF dst, USE src );
-
-  ins_cost(85);
-  format %{ "MOVD   $dst,$src\t# MoveI2F_reg_reg_sse" %}
-  ins_encode %{
-    __ movdl($dst$$XMMRegister, $src$$Register);
-  %}
-  ins_pipe( pipe_slow );
-%}
-
-instruct MoveD2L_stack_reg(eRegL dst, stackSlotD src) %{
-  match(Set dst (MoveD2L src));
-  effect(DEF dst, USE src);
-
-  ins_cost(250);
-  format %{ "MOV    $dst.lo,$src\n\t"
-            "MOV    $dst.hi,$src+4\t# MoveD2L_stack_reg" %}
-  opcode(0x8B, 0x8B);
-  ins_encode( SetInstMark, OpcP, RegMem(dst,src), OpcS, RegMem_Hi(dst,src), ClearInstMark);
-  ins_pipe( ialu_mem_long_reg );
-%}
-
-instruct MoveDPR2L_reg_stack(stackSlotL dst, regDPR src) %{
-  predicate(UseSSE<=1);
-  match(Set dst (MoveD2L src));
-  effect(DEF dst, USE src);
-
-  ins_cost(125);
-  format %{ "FST_D  $dst,$src\t# MoveD2L_reg_stack" %}
-  ins_encode( Pop_Mem_Reg_DPR(dst, src) );
-  ins_pipe( fpu_mem_reg );
-%}
-
-instruct MoveD2L_reg_stack_sse(stackSlotL dst, regD src) %{
-  predicate(UseSSE>=2);
-  match(Set dst (MoveD2L src));
-  effect(DEF dst, USE src);
-  ins_cost(95);
-  format %{ "MOVSD  $dst,$src\t# MoveD2L_reg_stack_sse" %}
-  ins_encode %{
-    __ movdbl(Address(rsp, $dst$$disp), $src$$XMMRegister);
-  %}
-  ins_pipe( pipe_slow );
-%}
-
-instruct MoveD2L_reg_reg_sse(eRegL dst, regD src, regD tmp) %{
-  predicate(UseSSE>=2);
-  match(Set dst (MoveD2L src));
-  effect(DEF dst, USE src, TEMP tmp);
-  ins_cost(85);
-  format %{ "MOVD   $dst.lo,$src\n\t"
-            "PSHUFLW $tmp,$src,0x4E\n\t"
-            "MOVD   $dst.hi,$tmp\t# MoveD2L_reg_reg_sse" %}
-  ins_encode %{
-    __ movdl($dst$$Register, $src$$XMMRegister);
-    __ pshuflw($tmp$$XMMRegister, $src$$XMMRegister, 0x4e);
-    __ movdl(HIGH_FROM_LOW($dst$$Register), $tmp$$XMMRegister);
-  %}
-  ins_pipe( pipe_slow );
-%}
-
-instruct MoveL2D_reg_stack(stackSlotD dst, eRegL src) %{
-  match(Set dst (MoveL2D src));
-  effect(DEF dst, USE src);
-
-  ins_cost(200);
-  format %{ "MOV    $dst,$src.lo\n\t"
-            "MOV    $dst+4,$src.hi\t# MoveL2D_reg_stack" %}
-  opcode(0x89, 0x89);
-  ins_encode( SetInstMark, OpcP, RegMem( src, dst ), OpcS, RegMem_Hi( src, dst ), ClearInstMark );
-  ins_pipe( ialu_mem_long_reg );
-%}
-
-
-instruct MoveL2DPR_stack_reg(regDPR dst, stackSlotL src) %{
-  predicate(UseSSE<=1);
-  match(Set dst (MoveL2D src));
-  effect(DEF dst, USE src);
-  ins_cost(125);
-
-  format %{ "FLD_D  $src\n\t"
-            "FSTP   $dst\t# MoveL2D_stack_reg" %}
-  opcode(0xDD);               /* DD /0, FLD m64real */
-  ins_encode( SetInstMark, OpcP, RMopc_Mem_no_oop(0x00,src),
-              Pop_Reg_DPR(dst), ClearInstMark );
-  ins_pipe( fpu_reg_mem );
-%}
-
-
-instruct MoveL2D_stack_reg_sse(regD dst, stackSlotL src) %{
-  predicate(UseSSE>=2 && UseXmmLoadAndClearUpper);
-  match(Set dst (MoveL2D src));
-  effect(DEF dst, USE src);
-
-  ins_cost(95);
-  format %{ "MOVSD  $dst,$src\t# MoveL2D_stack_reg_sse" %}
-  ins_encode %{
-    __ movdbl($dst$$XMMRegister, Address(rsp, $src$$disp));
-  %}
-  ins_pipe( pipe_slow );
-%}
-
-instruct MoveL2D_stack_reg_sse_partial(regD dst, stackSlotL src) %{
-  predicate(UseSSE>=2 && !UseXmmLoadAndClearUpper);
-  match(Set dst (MoveL2D src));
-  effect(DEF dst, USE src);
-
-  ins_cost(95);
-  format %{ "MOVLPD $dst,$src\t# MoveL2D_stack_reg_sse" %}
-  ins_encode %{
-    __ movdbl($dst$$XMMRegister, Address(rsp, $src$$disp));
-  %}
-  ins_pipe( pipe_slow );
-%}
-
-instruct MoveL2D_reg_reg_sse(regD dst, eRegL src, regD tmp) %{
-  predicate(UseSSE>=2);
-  match(Set dst (MoveL2D src));
-  effect(TEMP dst, USE src, TEMP tmp);
-  ins_cost(85);
-  format %{ "MOVD   $dst,$src.lo\n\t"
-            "MOVD   $tmp,$src.hi\n\t"
-            "PUNPCKLDQ $dst,$tmp\t# MoveL2D_reg_reg_sse" %}
-  ins_encode %{
-    __ movdl($dst$$XMMRegister, $src$$Register);
-    __ movdl($tmp$$XMMRegister, HIGH_FROM_LOW($src$$Register));
-    __ punpckldq($dst$$XMMRegister, $tmp$$XMMRegister);
-  %}
-  ins_pipe( pipe_slow );
-%}
-
-//----------------------------- CompressBits/ExpandBits ------------------------
-
-instruct compressBitsL_reg(eADXRegL dst, eBCXRegL src, eBDPRegL mask, eSIRegI rtmp, regF xtmp, eFlagsReg cr) %{
-  predicate(n->bottom_type()->isa_long());
-  match(Set dst (CompressBits src mask));
-  effect(TEMP rtmp, TEMP xtmp, KILL cr);
-  format %{ "compress_bits $dst, $src, $mask\t! using $rtmp and $xtmp as TEMP" %}
-  ins_encode %{
-    Label exit, partail_result;
-    // Parallely extract both upper and lower 32 bits of source into destination register pair.
-    // Merge the results of upper and lower destination registers such that upper destination
-    // results are contiguously laid out after the lower destination result.
-    __ pextl($dst$$Register, $src$$Register, $mask$$Register);
-    __ pextl(HIGH_FROM_LOW($dst$$Register), HIGH_FROM_LOW($src$$Register), HIGH_FROM_LOW($mask$$Register));
-    __ popcntl($rtmp$$Register, $mask$$Register);
-    // Skip merging if bit count of lower mask register is equal to 32 (register size).
-    __ cmpl($rtmp$$Register, 32);
-    __ jccb(Assembler::equal, exit);
-    // Due to constraint on number of GPRs on 32 bit target, using XMM register as potential spill slot.
-    __ movdl($xtmp$$XMMRegister, $rtmp$$Register);
-    // Shift left the contents of upper destination register by true bit count of lower mask register
-    // and merge with lower destination register.
-    __ shlxl($rtmp$$Register, HIGH_FROM_LOW($dst$$Register), $rtmp$$Register);
-    __ orl($dst$$Register, $rtmp$$Register);
-    __ movdl($rtmp$$Register, $xtmp$$XMMRegister);
-    // Zero out upper destination register if true bit count of lower 32 bit mask is zero
-    // since contents of upper destination have already been copied to lower destination
-    // register.
-    __ cmpl($rtmp$$Register, 0);
-    __ jccb(Assembler::greater, partail_result);
-    __ movl(HIGH_FROM_LOW($dst$$Register), 0);
-    __ jmp(exit);
-    __ bind(partail_result);
-    // Perform right shift over upper destination register to move out bits already copied
-    // to lower destination register.
-    __ subl($rtmp$$Register, 32);
-    __ negl($rtmp$$Register);
-    __ shrxl(HIGH_FROM_LOW($dst$$Register), HIGH_FROM_LOW($dst$$Register), $rtmp$$Register);
-    __ bind(exit);
-  %}
-  ins_pipe( pipe_slow );
-%}
-
-instruct expandBitsL_reg(eADXRegL dst, eBCXRegL src, eBDPRegL mask, eSIRegI rtmp, regF xtmp, eFlagsReg cr) %{
-  predicate(n->bottom_type()->isa_long());
-  match(Set dst (ExpandBits src mask));
-  effect(TEMP rtmp, TEMP xtmp, KILL cr);
-  format %{ "expand_bits $dst, $src, $mask\t! using $rtmp and $xtmp as TEMP" %}
-  ins_encode %{
-    // Extraction operation sequentially reads the bits from source register starting from LSB
-    // and lays them out into destination register at bit locations corresponding to true bits
-    // in mask register. Thus number of source bits read are equal to combined true bit count
-    // of mask register pair.
-    Label exit, mask_clipping;
-    __ pdepl($dst$$Register, $src$$Register, $mask$$Register);
-    __ pdepl(HIGH_FROM_LOW($dst$$Register), HIGH_FROM_LOW($src$$Register), HIGH_FROM_LOW($mask$$Register));
-    __ popcntl($rtmp$$Register, $mask$$Register);
-    // If true bit count of lower mask register is 32 then none of bit of lower source register
-    // will feed to upper destination register.
-    __ cmpl($rtmp$$Register, 32);
-    __ jccb(Assembler::equal, exit);
-    // Due to constraint on number of GPRs on 32 bit target, using XMM register as potential spill slot.
-    __ movdl($xtmp$$XMMRegister, $rtmp$$Register);
-    // Shift right the contents of lower source register to remove already consumed bits.
-    __ shrxl($rtmp$$Register, $src$$Register, $rtmp$$Register);
-    // Extract the bits from lower source register starting from LSB under the influence
-    // of upper mask register.
-    __ pdepl(HIGH_FROM_LOW($dst$$Register), $rtmp$$Register, HIGH_FROM_LOW($mask$$Register));
-    __ movdl($rtmp$$Register, $xtmp$$XMMRegister);
-    __ subl($rtmp$$Register, 32);
-    __ negl($rtmp$$Register);
-    __ movdl($xtmp$$XMMRegister, $mask$$Register);
-    __ movl($mask$$Register, HIGH_FROM_LOW($mask$$Register));
-    // Clear the set bits in upper mask register which have been used to extract the contents
-    // from lower source register.
-    __ bind(mask_clipping);
-    __ blsrl($mask$$Register, $mask$$Register);
-    __ decrementl($rtmp$$Register, 1);
-    __ jccb(Assembler::greater, mask_clipping);
-    // Starting from LSB extract the bits from upper source register under the influence of
-    // remaining set bits in upper mask register.
-    __ pdepl($rtmp$$Register, HIGH_FROM_LOW($src$$Register), $mask$$Register);
-    // Merge the partial results extracted from lower and upper source register bits.
-    __ orl(HIGH_FROM_LOW($dst$$Register), $rtmp$$Register);
-    __ movdl($mask$$Register, $xtmp$$XMMRegister);
-    __ bind(exit);
-  %}
-  ins_pipe( pipe_slow );
-%}
-
-// =======================================================================
-// Fast clearing of an array
-// Small non-constant length ClearArray for non-AVX512 targets.
-instruct rep_stos(eCXRegI cnt, eDIRegP base, regD tmp, eAXRegI zero, Universe dummy, eFlagsReg cr) %{
-  predicate(!((ClearArrayNode*)n)->is_large() && (UseAVX <= 2));
-  match(Set dummy (ClearArray cnt base));
-  effect(USE_KILL cnt, USE_KILL base, TEMP tmp, KILL zero, KILL cr);
-
-  format %{ $$template
-    $$emit$$"XOR    EAX,EAX\t# ClearArray:\n\t"
-    $$emit$$"CMP    InitArrayShortSize,rcx\n\t"
-    $$emit$$"JG     LARGE\n\t"
-    $$emit$$"SHL    ECX, 1\n\t"
-    $$emit$$"DEC    ECX\n\t"
-    $$emit$$"JS     DONE\t# Zero length\n\t"
-    $$emit$$"MOV    EAX,(EDI,ECX,4)\t# LOOP\n\t"
-    $$emit$$"DEC    ECX\n\t"
-    $$emit$$"JGE    LOOP\n\t"
-    $$emit$$"JMP    DONE\n\t"
-    $$emit$$"# LARGE:\n\t"
-    if (UseFastStosb) {
-       $$emit$$"SHL    ECX,3\t# Convert doublewords to bytes\n\t"
-       $$emit$$"REP STOSB\t# store EAX into [EDI++] while ECX--\n\t"
-    } else if (UseXMMForObjInit) {
-       $$emit$$"MOV     RDI,RAX\n\t"
-       $$emit$$"VPXOR    YMM0,YMM0,YMM0\n\t"
-       $$emit$$"JMPQ    L_zero_64_bytes\n\t"
-       $$emit$$"# L_loop:\t# 64-byte LOOP\n\t"
-       $$emit$$"VMOVDQU YMM0,(RAX)\n\t"
-       $$emit$$"VMOVDQU YMM0,0x20(RAX)\n\t"
-       $$emit$$"ADD     0x40,RAX\n\t"
-       $$emit$$"# L_zero_64_bytes:\n\t"
-       $$emit$$"SUB     0x8,RCX\n\t"
-       $$emit$$"JGE     L_loop\n\t"
-       $$emit$$"ADD     0x4,RCX\n\t"
-       $$emit$$"JL      L_tail\n\t"
-       $$emit$$"VMOVDQU YMM0,(RAX)\n\t"
-       $$emit$$"ADD     0x20,RAX\n\t"
-       $$emit$$"SUB     0x4,RCX\n\t"
-       $$emit$$"# L_tail:\t# Clearing tail bytes\n\t"
-       $$emit$$"ADD     0x4,RCX\n\t"
-       $$emit$$"JLE     L_end\n\t"
-       $$emit$$"DEC     RCX\n\t"
-       $$emit$$"# L_sloop:\t# 8-byte short loop\n\t"
-       $$emit$$"VMOVQ   XMM0,(RAX)\n\t"
-       $$emit$$"ADD     0x8,RAX\n\t"
-       $$emit$$"DEC     RCX\n\t"
-       $$emit$$"JGE     L_sloop\n\t"
-       $$emit$$"# L_end:\n\t"
-    } else {
-       $$emit$$"SHL    ECX,1\t# Convert doublewords to words\n\t"
-       $$emit$$"REP STOS\t# store EAX into [EDI++] while ECX--\n\t"
-    }
-    $$emit$$"# DONE"
-  %}
-  ins_encode %{
-    __ clear_mem($base$$Register, $cnt$$Register, $zero$$Register,
-                 $tmp$$XMMRegister, false, knoreg);
-  %}
-  ins_pipe( pipe_slow );
-%}
-
-// Small non-constant length ClearArray for AVX512 targets.
-instruct rep_stos_evex(eCXRegI cnt, eDIRegP base, legRegD tmp, kReg ktmp, eAXRegI zero, Universe dummy, eFlagsReg cr) %{
-  predicate(!((ClearArrayNode*)n)->is_large() && (UseAVX > 2));
-  match(Set dummy (ClearArray cnt base));
-  ins_cost(125);
-  effect(USE_KILL cnt, USE_KILL base, TEMP tmp, TEMP ktmp, KILL zero, KILL cr);
-
-  format %{ $$template
-    $$emit$$"XOR    EAX,EAX\t# ClearArray:\n\t"
-    $$emit$$"CMP    InitArrayShortSize,rcx\n\t"
-    $$emit$$"JG     LARGE\n\t"
-    $$emit$$"SHL    ECX, 1\n\t"
-    $$emit$$"DEC    ECX\n\t"
-    $$emit$$"JS     DONE\t# Zero length\n\t"
-    $$emit$$"MOV    EAX,(EDI,ECX,4)\t# LOOP\n\t"
-    $$emit$$"DEC    ECX\n\t"
-    $$emit$$"JGE    LOOP\n\t"
-    $$emit$$"JMP    DONE\n\t"
-    $$emit$$"# LARGE:\n\t"
-    if (UseFastStosb) {
-       $$emit$$"SHL    ECX,3\t# Convert doublewords to bytes\n\t"
-       $$emit$$"REP STOSB\t# store EAX into [EDI++] while ECX--\n\t"
-    } else if (UseXMMForObjInit) {
-       $$emit$$"MOV     RDI,RAX\n\t"
-       $$emit$$"VPXOR    YMM0,YMM0,YMM0\n\t"
-       $$emit$$"JMPQ    L_zero_64_bytes\n\t"
-       $$emit$$"# L_loop:\t# 64-byte LOOP\n\t"
-       $$emit$$"VMOVDQU YMM0,(RAX)\n\t"
-       $$emit$$"VMOVDQU YMM0,0x20(RAX)\n\t"
-       $$emit$$"ADD     0x40,RAX\n\t"
-       $$emit$$"# L_zero_64_bytes:\n\t"
-       $$emit$$"SUB     0x8,RCX\n\t"
-       $$emit$$"JGE     L_loop\n\t"
-       $$emit$$"ADD     0x4,RCX\n\t"
-       $$emit$$"JL      L_tail\n\t"
-       $$emit$$"VMOVDQU YMM0,(RAX)\n\t"
-       $$emit$$"ADD     0x20,RAX\n\t"
-       $$emit$$"SUB     0x4,RCX\n\t"
-       $$emit$$"# L_tail:\t# Clearing tail bytes\n\t"
-       $$emit$$"ADD     0x4,RCX\n\t"
-       $$emit$$"JLE     L_end\n\t"
-       $$emit$$"DEC     RCX\n\t"
-       $$emit$$"# L_sloop:\t# 8-byte short loop\n\t"
-       $$emit$$"VMOVQ   XMM0,(RAX)\n\t"
-       $$emit$$"ADD     0x8,RAX\n\t"
-       $$emit$$"DEC     RCX\n\t"
-       $$emit$$"JGE     L_sloop\n\t"
-       $$emit$$"# L_end:\n\t"
-    } else {
-       $$emit$$"SHL    ECX,1\t# Convert doublewords to words\n\t"
-       $$emit$$"REP STOS\t# store EAX into [EDI++] while ECX--\n\t"
-    }
-    $$emit$$"# DONE"
-  %}
-  ins_encode %{
-    __ clear_mem($base$$Register, $cnt$$Register, $zero$$Register,
-                 $tmp$$XMMRegister, false, $ktmp$$KRegister);
-  %}
-  ins_pipe( pipe_slow );
-%}
-
-// Large non-constant length ClearArray for non-AVX512 targets.
-instruct rep_stos_large(eCXRegI cnt, eDIRegP base, regD tmp, eAXRegI zero, Universe dummy, eFlagsReg cr) %{
-  predicate((UseAVX <= 2) && ((ClearArrayNode*)n)->is_large());
-  match(Set dummy (ClearArray cnt base));
-  effect(USE_KILL cnt, USE_KILL base, TEMP tmp, KILL zero, KILL cr);
-  format %{ $$template
-    if (UseFastStosb) {
-       $$emit$$"XOR    EAX,EAX\t# ClearArray:\n\t"
-       $$emit$$"SHL    ECX,3\t# Convert doublewords to bytes\n\t"
-       $$emit$$"REP STOSB\t# store EAX into [EDI++] while ECX--\n\t"
-    } else if (UseXMMForObjInit) {
-       $$emit$$"MOV     RDI,RAX\t# ClearArray:\n\t"
-       $$emit$$"VPXOR   YMM0,YMM0,YMM0\n\t"
-       $$emit$$"JMPQ    L_zero_64_bytes\n\t"
-       $$emit$$"# L_loop:\t# 64-byte LOOP\n\t"
-       $$emit$$"VMOVDQU YMM0,(RAX)\n\t"
-       $$emit$$"VMOVDQU YMM0,0x20(RAX)\n\t"
-       $$emit$$"ADD     0x40,RAX\n\t"
-       $$emit$$"# L_zero_64_bytes:\n\t"
-       $$emit$$"SUB     0x8,RCX\n\t"
-       $$emit$$"JGE     L_loop\n\t"
-       $$emit$$"ADD     0x4,RCX\n\t"
-       $$emit$$"JL      L_tail\n\t"
-       $$emit$$"VMOVDQU YMM0,(RAX)\n\t"
-       $$emit$$"ADD     0x20,RAX\n\t"
-       $$emit$$"SUB     0x4,RCX\n\t"
-       $$emit$$"# L_tail:\t# Clearing tail bytes\n\t"
-       $$emit$$"ADD     0x4,RCX\n\t"
-       $$emit$$"JLE     L_end\n\t"
-       $$emit$$"DEC     RCX\n\t"
-       $$emit$$"# L_sloop:\t# 8-byte short loop\n\t"
-       $$emit$$"VMOVQ   XMM0,(RAX)\n\t"
-       $$emit$$"ADD     0x8,RAX\n\t"
-       $$emit$$"DEC     RCX\n\t"
-       $$emit$$"JGE     L_sloop\n\t"
-       $$emit$$"# L_end:\n\t"
-    } else {
-       $$emit$$"XOR    EAX,EAX\t# ClearArray:\n\t"
-       $$emit$$"SHL    ECX,1\t# Convert doublewords to words\n\t"
-       $$emit$$"REP STOS\t# store EAX into [EDI++] while ECX--\n\t"
-    }
-    $$emit$$"# DONE"
-  %}
-  ins_encode %{
-    __ clear_mem($base$$Register, $cnt$$Register, $zero$$Register,
-                 $tmp$$XMMRegister, true, knoreg);
-  %}
-  ins_pipe( pipe_slow );
-%}
-
-// Large non-constant length ClearArray for AVX512 targets.
-instruct rep_stos_large_evex(eCXRegI cnt, eDIRegP base, legRegD tmp, kReg ktmp, eAXRegI zero, Universe dummy, eFlagsReg cr) %{
-  predicate((UseAVX > 2) && ((ClearArrayNode*)n)->is_large());
-  match(Set dummy (ClearArray cnt base));
-  effect(USE_KILL cnt, USE_KILL base, TEMP tmp, TEMP ktmp, KILL zero, KILL cr);
-  format %{ $$template
-    if (UseFastStosb) {
-       $$emit$$"XOR    EAX,EAX\t# ClearArray:\n\t"
-       $$emit$$"SHL    ECX,3\t# Convert doublewords to bytes\n\t"
-       $$emit$$"REP STOSB\t# store EAX into [EDI++] while ECX--\n\t"
-    } else if (UseXMMForObjInit) {
-       $$emit$$"MOV     RDI,RAX\t# ClearArray:\n\t"
-       $$emit$$"VPXOR   YMM0,YMM0,YMM0\n\t"
-       $$emit$$"JMPQ    L_zero_64_bytes\n\t"
-       $$emit$$"# L_loop:\t# 64-byte LOOP\n\t"
-       $$emit$$"VMOVDQU YMM0,(RAX)\n\t"
-       $$emit$$"VMOVDQU YMM0,0x20(RAX)\n\t"
-       $$emit$$"ADD     0x40,RAX\n\t"
-       $$emit$$"# L_zero_64_bytes:\n\t"
-       $$emit$$"SUB     0x8,RCX\n\t"
-       $$emit$$"JGE     L_loop\n\t"
-       $$emit$$"ADD     0x4,RCX\n\t"
-       $$emit$$"JL      L_tail\n\t"
-       $$emit$$"VMOVDQU YMM0,(RAX)\n\t"
-       $$emit$$"ADD     0x20,RAX\n\t"
-       $$emit$$"SUB     0x4,RCX\n\t"
-       $$emit$$"# L_tail:\t# Clearing tail bytes\n\t"
-       $$emit$$"ADD     0x4,RCX\n\t"
-       $$emit$$"JLE     L_end\n\t"
-       $$emit$$"DEC     RCX\n\t"
-       $$emit$$"# L_sloop:\t# 8-byte short loop\n\t"
-       $$emit$$"VMOVQ   XMM0,(RAX)\n\t"
-       $$emit$$"ADD     0x8,RAX\n\t"
-       $$emit$$"DEC     RCX\n\t"
-       $$emit$$"JGE     L_sloop\n\t"
-       $$emit$$"# L_end:\n\t"
-    } else {
-       $$emit$$"XOR    EAX,EAX\t# ClearArray:\n\t"
-       $$emit$$"SHL    ECX,1\t# Convert doublewords to words\n\t"
-       $$emit$$"REP STOS\t# store EAX into [EDI++] while ECX--\n\t"
-    }
-    $$emit$$"# DONE"
-  %}
-  ins_encode %{
-    __ clear_mem($base$$Register, $cnt$$Register, $zero$$Register,
-                 $tmp$$XMMRegister, true, $ktmp$$KRegister);
-  %}
-  ins_pipe( pipe_slow );
-%}
-
-// Small constant length ClearArray for AVX512 targets.
-instruct rep_stos_im(immI cnt, kReg ktmp, eRegP base, regD tmp, rRegI zero, Universe dummy, eFlagsReg cr)
-%{
-  predicate(!((ClearArrayNode*)n)->is_large() && (MaxVectorSize >= 32) && VM_Version::supports_avx512vl());
-  match(Set dummy (ClearArray cnt base));
-  ins_cost(100);
-  effect(TEMP tmp, TEMP zero, TEMP ktmp, KILL cr);
-  format %{ "clear_mem_imm $base , $cnt  \n\t" %}
-  ins_encode %{
-   __ clear_mem($base$$Register, $cnt$$constant, $zero$$Register, $tmp$$XMMRegister, $ktmp$$KRegister);
-  %}
-  ins_pipe(pipe_slow);
-%}
-
-instruct string_compareL(eDIRegP str1, eCXRegI cnt1, eSIRegP str2, eDXRegI cnt2,
-                         eAXRegI result, regD tmp1, eFlagsReg cr) %{
-  predicate(!VM_Version::supports_avx512vlbw() && ((StrCompNode*)n)->encoding() == StrIntrinsicNode::LL);
-  match(Set result (StrComp (Binary str1 cnt1) (Binary str2 cnt2)));
-  effect(TEMP tmp1, USE_KILL str1, USE_KILL str2, USE_KILL cnt1, USE_KILL cnt2, KILL cr);
-
-  format %{ "String Compare byte[] $str1,$cnt1,$str2,$cnt2 -> $result   // KILL $tmp1" %}
-  ins_encode %{
-    __ string_compare($str1$$Register, $str2$$Register,
-                      $cnt1$$Register, $cnt2$$Register, $result$$Register,
-                      $tmp1$$XMMRegister, StrIntrinsicNode::LL, knoreg);
-  %}
-  ins_pipe( pipe_slow );
-%}
-
-instruct string_compareL_evex(eDIRegP str1, eCXRegI cnt1, eSIRegP str2, eDXRegI cnt2,
-                              eAXRegI result, regD tmp1, kReg ktmp, eFlagsReg cr) %{
-  predicate(VM_Version::supports_avx512vlbw() && ((StrCompNode*)n)->encoding() == StrIntrinsicNode::LL);
-  match(Set result (StrComp (Binary str1 cnt1) (Binary str2 cnt2)));
-  effect(TEMP tmp1, TEMP ktmp, USE_KILL str1, USE_KILL str2, USE_KILL cnt1, USE_KILL cnt2, KILL cr);
-
-  format %{ "String Compare byte[] $str1,$cnt1,$str2,$cnt2 -> $result   // KILL $tmp1" %}
-  ins_encode %{
-    __ string_compare($str1$$Register, $str2$$Register,
-                      $cnt1$$Register, $cnt2$$Register, $result$$Register,
-                      $tmp1$$XMMRegister, StrIntrinsicNode::LL, $ktmp$$KRegister);
-  %}
-  ins_pipe( pipe_slow );
-%}
-
-instruct string_compareU(eDIRegP str1, eCXRegI cnt1, eSIRegP str2, eDXRegI cnt2,
-                         eAXRegI result, regD tmp1, eFlagsReg cr) %{
-  predicate(!VM_Version::supports_avx512vlbw() && ((StrCompNode*)n)->encoding() == StrIntrinsicNode::UU);
-  match(Set result (StrComp (Binary str1 cnt1) (Binary str2 cnt2)));
-  effect(TEMP tmp1, USE_KILL str1, USE_KILL str2, USE_KILL cnt1, USE_KILL cnt2, KILL cr);
-
-  format %{ "String Compare char[] $str1,$cnt1,$str2,$cnt2 -> $result   // KILL $tmp1" %}
-  ins_encode %{
-    __ string_compare($str1$$Register, $str2$$Register,
-                      $cnt1$$Register, $cnt2$$Register, $result$$Register,
-                      $tmp1$$XMMRegister, StrIntrinsicNode::UU, knoreg);
-  %}
-  ins_pipe( pipe_slow );
-%}
-
-instruct string_compareU_evex(eDIRegP str1, eCXRegI cnt1, eSIRegP str2, eDXRegI cnt2,
-                              eAXRegI result, regD tmp1, kReg ktmp, eFlagsReg cr) %{
-  predicate(VM_Version::supports_avx512vlbw() && ((StrCompNode*)n)->encoding() == StrIntrinsicNode::UU);
-  match(Set result (StrComp (Binary str1 cnt1) (Binary str2 cnt2)));
-  effect(TEMP tmp1, TEMP ktmp, USE_KILL str1, USE_KILL str2, USE_KILL cnt1, USE_KILL cnt2, KILL cr);
-
-  format %{ "String Compare char[] $str1,$cnt1,$str2,$cnt2 -> $result   // KILL $tmp1" %}
-  ins_encode %{
-    __ string_compare($str1$$Register, $str2$$Register,
-                      $cnt1$$Register, $cnt2$$Register, $result$$Register,
-                      $tmp1$$XMMRegister, StrIntrinsicNode::UU, $ktmp$$KRegister);
-  %}
-  ins_pipe( pipe_slow );
-%}
-
-instruct string_compareLU(eDIRegP str1, eCXRegI cnt1, eSIRegP str2, eDXRegI cnt2,
-                          eAXRegI result, regD tmp1, eFlagsReg cr) %{
-  predicate(!VM_Version::supports_avx512vlbw() && ((StrCompNode*)n)->encoding() == StrIntrinsicNode::LU);
-  match(Set result (StrComp (Binary str1 cnt1) (Binary str2 cnt2)));
-  effect(TEMP tmp1, USE_KILL str1, USE_KILL str2, USE_KILL cnt1, USE_KILL cnt2, KILL cr);
-
-  format %{ "String Compare byte[] $str1,$cnt1,$str2,$cnt2 -> $result   // KILL $tmp1" %}
-  ins_encode %{
-    __ string_compare($str1$$Register, $str2$$Register,
-                      $cnt1$$Register, $cnt2$$Register, $result$$Register,
-                      $tmp1$$XMMRegister, StrIntrinsicNode::LU, knoreg);
-  %}
-  ins_pipe( pipe_slow );
-%}
-
-instruct string_compareLU_evex(eDIRegP str1, eCXRegI cnt1, eSIRegP str2, eDXRegI cnt2,
-                               eAXRegI result, regD tmp1, kReg ktmp, eFlagsReg cr) %{
-  predicate(VM_Version::supports_avx512vlbw() && ((StrCompNode*)n)->encoding() == StrIntrinsicNode::LU);
-  match(Set result (StrComp (Binary str1 cnt1) (Binary str2 cnt2)));
-  effect(TEMP tmp1, TEMP ktmp, USE_KILL str1, USE_KILL str2, USE_KILL cnt1, USE_KILL cnt2, KILL cr);
-
-  format %{ "String Compare byte[] $str1,$cnt1,$str2,$cnt2 -> $result   // KILL $tmp1" %}
-  ins_encode %{
-    __ string_compare($str1$$Register, $str2$$Register,
-                      $cnt1$$Register, $cnt2$$Register, $result$$Register,
-                      $tmp1$$XMMRegister, StrIntrinsicNode::LU, $ktmp$$KRegister);
-  %}
-  ins_pipe( pipe_slow );
-%}
-
-instruct string_compareUL(eSIRegP str1, eDXRegI cnt1, eDIRegP str2, eCXRegI cnt2,
-                          eAXRegI result, regD tmp1, eFlagsReg cr) %{
-  predicate(!VM_Version::supports_avx512vlbw() && ((StrCompNode*)n)->encoding() == StrIntrinsicNode::UL);
-  match(Set result (StrComp (Binary str1 cnt1) (Binary str2 cnt2)));
-  effect(TEMP tmp1, USE_KILL str1, USE_KILL str2, USE_KILL cnt1, USE_KILL cnt2, KILL cr);
-
-  format %{ "String Compare byte[] $str1,$cnt1,$str2,$cnt2 -> $result   // KILL $tmp1" %}
-  ins_encode %{
-    __ string_compare($str2$$Register, $str1$$Register,
-                      $cnt2$$Register, $cnt1$$Register, $result$$Register,
-                      $tmp1$$XMMRegister, StrIntrinsicNode::UL, knoreg);
-  %}
-  ins_pipe( pipe_slow );
-%}
-
-instruct string_compareUL_evex(eSIRegP str1, eDXRegI cnt1, eDIRegP str2, eCXRegI cnt2,
-                               eAXRegI result, regD tmp1, kReg ktmp, eFlagsReg cr) %{
-  predicate(VM_Version::supports_avx512vlbw() && ((StrCompNode*)n)->encoding() == StrIntrinsicNode::UL);
-  match(Set result (StrComp (Binary str1 cnt1) (Binary str2 cnt2)));
-  effect(TEMP tmp1, TEMP ktmp, USE_KILL str1, USE_KILL str2, USE_KILL cnt1, USE_KILL cnt2, KILL cr);
-
-  format %{ "String Compare byte[] $str1,$cnt1,$str2,$cnt2 -> $result   // KILL $tmp1" %}
-  ins_encode %{
-    __ string_compare($str2$$Register, $str1$$Register,
-                      $cnt2$$Register, $cnt1$$Register, $result$$Register,
-                      $tmp1$$XMMRegister, StrIntrinsicNode::UL, $ktmp$$KRegister);
-  %}
-  ins_pipe( pipe_slow );
-%}
-
-// fast string equals
-instruct string_equals(eDIRegP str1, eSIRegP str2, eCXRegI cnt, eAXRegI result,
-                       regD tmp1, regD tmp2, eBXRegI tmp3, eFlagsReg cr) %{
-  predicate(!VM_Version::supports_avx512vlbw());
-  match(Set result (StrEquals (Binary str1 str2) cnt));
-  effect(TEMP tmp1, TEMP tmp2, USE_KILL str1, USE_KILL str2, USE_KILL cnt, KILL tmp3, KILL cr);
-
-  format %{ "String Equals $str1,$str2,$cnt -> $result    // KILL $tmp1, $tmp2, $tmp3" %}
-  ins_encode %{
-    __ arrays_equals(false, $str1$$Register, $str2$$Register,
-                     $cnt$$Register, $result$$Register, $tmp3$$Register,
-                     $tmp1$$XMMRegister, $tmp2$$XMMRegister, false /* char */, knoreg);
-  %}
-
-  ins_pipe( pipe_slow );
-%}
-
-instruct string_equals_evex(eDIRegP str1, eSIRegP str2, eCXRegI cnt, eAXRegI result,
-                            regD tmp1, regD tmp2, kReg ktmp, eBXRegI tmp3, eFlagsReg cr) %{
-  predicate(VM_Version::supports_avx512vlbw());
-  match(Set result (StrEquals (Binary str1 str2) cnt));
-  effect(TEMP tmp1, TEMP tmp2, TEMP ktmp, USE_KILL str1, USE_KILL str2, USE_KILL cnt, KILL tmp3, KILL cr);
-
-  format %{ "String Equals $str1,$str2,$cnt -> $result    // KILL $tmp1, $tmp2, $tmp3" %}
-  ins_encode %{
-    __ arrays_equals(false, $str1$$Register, $str2$$Register,
-                     $cnt$$Register, $result$$Register, $tmp3$$Register,
-                     $tmp1$$XMMRegister, $tmp2$$XMMRegister, false /* char */, $ktmp$$KRegister);
-  %}
-
-  ins_pipe( pipe_slow );
-%}
-
-
-// fast search of substring with known size.
-instruct string_indexof_conL(eDIRegP str1, eDXRegI cnt1, eSIRegP str2, immI int_cnt2,
-                             eBXRegI result, regD vec1, eAXRegI cnt2, eCXRegI tmp, eFlagsReg cr) %{
-  predicate(UseSSE42Intrinsics && (((StrIndexOfNode*)n)->encoding() == StrIntrinsicNode::LL));
-  match(Set result (StrIndexOf (Binary str1 cnt1) (Binary str2 int_cnt2)));
-  effect(TEMP vec1, USE_KILL str1, USE_KILL str2, USE_KILL cnt1, KILL cnt2, KILL tmp, KILL cr);
-
-  format %{ "String IndexOf byte[] $str1,$cnt1,$str2,$int_cnt2 -> $result   // KILL $vec1, $cnt1, $cnt2, $tmp" %}
-  ins_encode %{
-    int icnt2 = (int)$int_cnt2$$constant;
-    if (icnt2 >= 16) {
-      // IndexOf for constant substrings with size >= 16 elements
-      // which don't need to be loaded through stack.
-      __ string_indexofC8($str1$$Register, $str2$$Register,
-                          $cnt1$$Register, $cnt2$$Register,
-                          icnt2, $result$$Register,
-                          $vec1$$XMMRegister, $tmp$$Register, StrIntrinsicNode::LL);
-    } else {
-      // Small strings are loaded through stack if they cross page boundary.
-      __ string_indexof($str1$$Register, $str2$$Register,
-                        $cnt1$$Register, $cnt2$$Register,
-                        icnt2, $result$$Register,
-                        $vec1$$XMMRegister, $tmp$$Register, StrIntrinsicNode::LL);
-    }
-  %}
-  ins_pipe( pipe_slow );
-%}
-
-// fast search of substring with known size.
-instruct string_indexof_conU(eDIRegP str1, eDXRegI cnt1, eSIRegP str2, immI int_cnt2,
-                             eBXRegI result, regD vec1, eAXRegI cnt2, eCXRegI tmp, eFlagsReg cr) %{
-  predicate(UseSSE42Intrinsics && (((StrIndexOfNode*)n)->encoding() == StrIntrinsicNode::UU));
-  match(Set result (StrIndexOf (Binary str1 cnt1) (Binary str2 int_cnt2)));
-  effect(TEMP vec1, USE_KILL str1, USE_KILL str2, USE_KILL cnt1, KILL cnt2, KILL tmp, KILL cr);
-
-  format %{ "String IndexOf char[] $str1,$cnt1,$str2,$int_cnt2 -> $result   // KILL $vec1, $cnt1, $cnt2, $tmp" %}
-  ins_encode %{
-    int icnt2 = (int)$int_cnt2$$constant;
-    if (icnt2 >= 8) {
-      // IndexOf for constant substrings with size >= 8 elements
-      // which don't need to be loaded through stack.
-      __ string_indexofC8($str1$$Register, $str2$$Register,
-                          $cnt1$$Register, $cnt2$$Register,
-                          icnt2, $result$$Register,
-                          $vec1$$XMMRegister, $tmp$$Register, StrIntrinsicNode::UU);
-    } else {
-      // Small strings are loaded through stack if they cross page boundary.
-      __ string_indexof($str1$$Register, $str2$$Register,
-                        $cnt1$$Register, $cnt2$$Register,
-                        icnt2, $result$$Register,
-                        $vec1$$XMMRegister, $tmp$$Register, StrIntrinsicNode::UU);
-    }
-  %}
-  ins_pipe( pipe_slow );
-%}
-
-// fast search of substring with known size.
-instruct string_indexof_conUL(eDIRegP str1, eDXRegI cnt1, eSIRegP str2, immI int_cnt2,
-                             eBXRegI result, regD vec1, eAXRegI cnt2, eCXRegI tmp, eFlagsReg cr) %{
-  predicate(UseSSE42Intrinsics && (((StrIndexOfNode*)n)->encoding() == StrIntrinsicNode::UL));
-  match(Set result (StrIndexOf (Binary str1 cnt1) (Binary str2 int_cnt2)));
-  effect(TEMP vec1, USE_KILL str1, USE_KILL str2, USE_KILL cnt1, KILL cnt2, KILL tmp, KILL cr);
-
-  format %{ "String IndexOf char[] $str1,$cnt1,$str2,$int_cnt2 -> $result   // KILL $vec1, $cnt1, $cnt2, $tmp" %}
-  ins_encode %{
-    int icnt2 = (int)$int_cnt2$$constant;
-    if (icnt2 >= 8) {
-      // IndexOf for constant substrings with size >= 8 elements
-      // which don't need to be loaded through stack.
-      __ string_indexofC8($str1$$Register, $str2$$Register,
-                          $cnt1$$Register, $cnt2$$Register,
-                          icnt2, $result$$Register,
-                          $vec1$$XMMRegister, $tmp$$Register, StrIntrinsicNode::UL);
-    } else {
-      // Small strings are loaded through stack if they cross page boundary.
-      __ string_indexof($str1$$Register, $str2$$Register,
-                        $cnt1$$Register, $cnt2$$Register,
-                        icnt2, $result$$Register,
-                        $vec1$$XMMRegister, $tmp$$Register, StrIntrinsicNode::UL);
-    }
-  %}
-  ins_pipe( pipe_slow );
-%}
-
-instruct string_indexofL(eDIRegP str1, eDXRegI cnt1, eSIRegP str2, eAXRegI cnt2,
-                         eBXRegI result, regD vec1, eCXRegI tmp, eFlagsReg cr) %{
-  predicate(UseSSE42Intrinsics && (((StrIndexOfNode*)n)->encoding() == StrIntrinsicNode::LL));
-  match(Set result (StrIndexOf (Binary str1 cnt1) (Binary str2 cnt2)));
-  effect(TEMP vec1, USE_KILL str1, USE_KILL str2, USE_KILL cnt1, USE_KILL cnt2, KILL tmp, KILL cr);
-
-  format %{ "String IndexOf byte[] $str1,$cnt1,$str2,$cnt2 -> $result   // KILL all" %}
-  ins_encode %{
-    __ string_indexof($str1$$Register, $str2$$Register,
-                      $cnt1$$Register, $cnt2$$Register,
-                      (-1), $result$$Register,
-                      $vec1$$XMMRegister, $tmp$$Register, StrIntrinsicNode::LL);
-  %}
-  ins_pipe( pipe_slow );
-%}
-
-instruct string_indexofU(eDIRegP str1, eDXRegI cnt1, eSIRegP str2, eAXRegI cnt2,
-                         eBXRegI result, regD vec1, eCXRegI tmp, eFlagsReg cr) %{
-  predicate(UseSSE42Intrinsics && (((StrIndexOfNode*)n)->encoding() == StrIntrinsicNode::UU));
-  match(Set result (StrIndexOf (Binary str1 cnt1) (Binary str2 cnt2)));
-  effect(TEMP vec1, USE_KILL str1, USE_KILL str2, USE_KILL cnt1, USE_KILL cnt2, KILL tmp, KILL cr);
-
-  format %{ "String IndexOf char[] $str1,$cnt1,$str2,$cnt2 -> $result   // KILL all" %}
-  ins_encode %{
-    __ string_indexof($str1$$Register, $str2$$Register,
-                      $cnt1$$Register, $cnt2$$Register,
-                      (-1), $result$$Register,
-                      $vec1$$XMMRegister, $tmp$$Register, StrIntrinsicNode::UU);
-  %}
-  ins_pipe( pipe_slow );
-%}
-
-instruct string_indexofUL(eDIRegP str1, eDXRegI cnt1, eSIRegP str2, eAXRegI cnt2,
-                         eBXRegI result, regD vec1, eCXRegI tmp, eFlagsReg cr) %{
-  predicate(UseSSE42Intrinsics && (((StrIndexOfNode*)n)->encoding() == StrIntrinsicNode::UL));
-  match(Set result (StrIndexOf (Binary str1 cnt1) (Binary str2 cnt2)));
-  effect(TEMP vec1, USE_KILL str1, USE_KILL str2, USE_KILL cnt1, USE_KILL cnt2, KILL tmp, KILL cr);
-
-  format %{ "String IndexOf char[] $str1,$cnt1,$str2,$cnt2 -> $result   // KILL all" %}
-  ins_encode %{
-    __ string_indexof($str1$$Register, $str2$$Register,
-                      $cnt1$$Register, $cnt2$$Register,
-                      (-1), $result$$Register,
-                      $vec1$$XMMRegister, $tmp$$Register, StrIntrinsicNode::UL);
-  %}
-  ins_pipe( pipe_slow );
-%}
-
-instruct string_indexof_char(eDIRegP str1, eDXRegI cnt1, eAXRegI ch,
-                              eBXRegI result, regD vec1, regD vec2, regD vec3, eCXRegI tmp, eFlagsReg cr) %{
-  predicate(UseSSE42Intrinsics && (((StrIndexOfCharNode*)n)->encoding() == StrIntrinsicNode::U));
-  match(Set result (StrIndexOfChar (Binary str1 cnt1) ch));
-  effect(TEMP vec1, TEMP vec2, TEMP vec3, USE_KILL str1, USE_KILL cnt1, USE_KILL ch, TEMP tmp, KILL cr);
-  format %{ "StringUTF16 IndexOf char[] $str1,$cnt1,$ch -> $result   // KILL all" %}
-  ins_encode %{
-    __ string_indexof_char($str1$$Register, $cnt1$$Register, $ch$$Register, $result$$Register,
-                           $vec1$$XMMRegister, $vec2$$XMMRegister, $vec3$$XMMRegister, $tmp$$Register);
-  %}
-  ins_pipe( pipe_slow );
-%}
-
-instruct stringL_indexof_char(eDIRegP str1, eDXRegI cnt1, eAXRegI ch,
-                              eBXRegI result, regD vec1, regD vec2, regD vec3, eCXRegI tmp, eFlagsReg cr) %{
-  predicate(UseSSE42Intrinsics && (((StrIndexOfCharNode*)n)->encoding() == StrIntrinsicNode::L));
-  match(Set result (StrIndexOfChar (Binary str1 cnt1) ch));
-  effect(TEMP vec1, TEMP vec2, TEMP vec3, USE_KILL str1, USE_KILL cnt1, USE_KILL ch, TEMP tmp, KILL cr);
-  format %{ "StringLatin1 IndexOf char[] $str1,$cnt1,$ch -> $result   // KILL all" %}
-  ins_encode %{
-    __ stringL_indexof_char($str1$$Register, $cnt1$$Register, $ch$$Register, $result$$Register,
-                           $vec1$$XMMRegister, $vec2$$XMMRegister, $vec3$$XMMRegister, $tmp$$Register);
-  %}
-  ins_pipe( pipe_slow );
-%}
-
-
-// fast array equals
-instruct array_equalsB(eDIRegP ary1, eSIRegP ary2, eAXRegI result,
-                       regD tmp1, regD tmp2, eCXRegI tmp3, eBXRegI tmp4, eFlagsReg cr)
-%{
-  predicate(!VM_Version::supports_avx512vlbw() && ((AryEqNode*)n)->encoding() == StrIntrinsicNode::LL);
-  match(Set result (AryEq ary1 ary2));
-  effect(TEMP tmp1, TEMP tmp2, USE_KILL ary1, USE_KILL ary2, KILL tmp3, KILL tmp4, KILL cr);
-  //ins_cost(300);
-
-  format %{ "Array Equals byte[] $ary1,$ary2 -> $result   // KILL $tmp1, $tmp2, $tmp3, $tmp4" %}
-  ins_encode %{
-    __ arrays_equals(true, $ary1$$Register, $ary2$$Register,
-                     $tmp3$$Register, $result$$Register, $tmp4$$Register,
-                     $tmp1$$XMMRegister, $tmp2$$XMMRegister, false /* char */, knoreg);
-  %}
-  ins_pipe( pipe_slow );
-%}
-
-instruct array_equalsB_evex(eDIRegP ary1, eSIRegP ary2, eAXRegI result,
-                       regD tmp1, regD tmp2, kReg ktmp, eCXRegI tmp3, eBXRegI tmp4, eFlagsReg cr)
-%{
-  predicate(VM_Version::supports_avx512vlbw() && ((AryEqNode*)n)->encoding() == StrIntrinsicNode::LL);
-  match(Set result (AryEq ary1 ary2));
-  effect(TEMP tmp1, TEMP tmp2, TEMP ktmp, USE_KILL ary1, USE_KILL ary2, KILL tmp3, KILL tmp4, KILL cr);
-  //ins_cost(300);
-
-  format %{ "Array Equals byte[] $ary1,$ary2 -> $result   // KILL $tmp1, $tmp2, $tmp3, $tmp4" %}
-  ins_encode %{
-    __ arrays_equals(true, $ary1$$Register, $ary2$$Register,
-                     $tmp3$$Register, $result$$Register, $tmp4$$Register,
-                     $tmp1$$XMMRegister, $tmp2$$XMMRegister, false /* char */, $ktmp$$KRegister);
-  %}
-  ins_pipe( pipe_slow );
-%}
-
-instruct array_equalsC(eDIRegP ary1, eSIRegP ary2, eAXRegI result,
-                       regD tmp1, regD tmp2, eCXRegI tmp3, eBXRegI tmp4, eFlagsReg cr)
-%{
-  predicate(!VM_Version::supports_avx512vlbw() && ((AryEqNode*)n)->encoding() == StrIntrinsicNode::UU);
-  match(Set result (AryEq ary1 ary2));
-  effect(TEMP tmp1, TEMP tmp2, USE_KILL ary1, USE_KILL ary2, KILL tmp3, KILL tmp4, KILL cr);
-  //ins_cost(300);
-
-  format %{ "Array Equals char[] $ary1,$ary2 -> $result   // KILL $tmp1, $tmp2, $tmp3, $tmp4" %}
-  ins_encode %{
-    __ arrays_equals(true, $ary1$$Register, $ary2$$Register,
-                     $tmp3$$Register, $result$$Register, $tmp4$$Register,
-                     $tmp1$$XMMRegister, $tmp2$$XMMRegister, true /* char */, knoreg);
-  %}
-  ins_pipe( pipe_slow );
-%}
-
-instruct array_equalsC_evex(eDIRegP ary1, eSIRegP ary2, eAXRegI result,
-                            regD tmp1, regD tmp2, kReg ktmp, eCXRegI tmp3, eBXRegI tmp4, eFlagsReg cr)
-%{
-  predicate(VM_Version::supports_avx512vlbw() && ((AryEqNode*)n)->encoding() == StrIntrinsicNode::UU);
-  match(Set result (AryEq ary1 ary2));
-  effect(TEMP tmp1, TEMP tmp2, TEMP ktmp, USE_KILL ary1, USE_KILL ary2, KILL tmp3, KILL tmp4, KILL cr);
-  //ins_cost(300);
-
-  format %{ "Array Equals char[] $ary1,$ary2 -> $result   // KILL $tmp1, $tmp2, $tmp3, $tmp4" %}
-  ins_encode %{
-    __ arrays_equals(true, $ary1$$Register, $ary2$$Register,
-                     $tmp3$$Register, $result$$Register, $tmp4$$Register,
-                     $tmp1$$XMMRegister, $tmp2$$XMMRegister, true /* char */, $ktmp$$KRegister);
-  %}
-  ins_pipe( pipe_slow );
-%}
-
-instruct count_positives(eSIRegP ary1, eCXRegI len, eAXRegI result,
-                         regD tmp1, regD tmp2, eBXRegI tmp3, eFlagsReg cr)
-%{
-  predicate(!VM_Version::supports_avx512vlbw() || !VM_Version::supports_bmi2());
-  match(Set result (CountPositives ary1 len));
-  effect(TEMP tmp1, TEMP tmp2, USE_KILL ary1, USE_KILL len, KILL tmp3, KILL cr);
-
-  format %{ "countPositives byte[] $ary1,$len -> $result   // KILL $tmp1, $tmp2, $tmp3" %}
-  ins_encode %{
-    __ count_positives($ary1$$Register, $len$$Register,
-                       $result$$Register, $tmp3$$Register,
-                       $tmp1$$XMMRegister, $tmp2$$XMMRegister, knoreg, knoreg);
-  %}
-  ins_pipe( pipe_slow );
-%}
-
-instruct count_positives_evex(eSIRegP ary1, eCXRegI len, eAXRegI result,
-                              regD tmp1, regD tmp2, kReg ktmp1, kReg ktmp2, eBXRegI tmp3, eFlagsReg cr)
-%{
-  predicate(VM_Version::supports_avx512vlbw() && VM_Version::supports_bmi2());
-  match(Set result (CountPositives ary1 len));
-  effect(TEMP tmp1, TEMP tmp2, TEMP ktmp1, TEMP ktmp2, USE_KILL ary1, USE_KILL len, KILL tmp3, KILL cr);
-
-  format %{ "countPositives byte[] $ary1,$len -> $result   // KILL $tmp1, $tmp2, $tmp3" %}
-  ins_encode %{
-    __ count_positives($ary1$$Register, $len$$Register,
-                       $result$$Register, $tmp3$$Register,
-                       $tmp1$$XMMRegister, $tmp2$$XMMRegister, $ktmp1$$KRegister, $ktmp2$$KRegister);
-  %}
-  ins_pipe( pipe_slow );
-%}
-
-
-// fast char[] to byte[] compression
-instruct string_compress(eSIRegP src, eDIRegP dst, eDXRegI len, regD tmp1, regD tmp2,
-                         regD tmp3, regD tmp4, eCXRegI tmp5, eAXRegI result, eFlagsReg cr) %{
-  predicate(!VM_Version::supports_avx512vlbw() || !VM_Version::supports_bmi2());
-  match(Set result (StrCompressedCopy src (Binary dst len)));
-  effect(TEMP tmp1, TEMP tmp2, TEMP tmp3, TEMP tmp4, USE_KILL src, USE_KILL dst, USE_KILL len, KILL tmp5, KILL cr);
-
-  format %{ "String Compress $src,$dst -> $result    // KILL RAX, RCX, RDX" %}
-  ins_encode %{
-    __ char_array_compress($src$$Register, $dst$$Register, $len$$Register,
-                           $tmp1$$XMMRegister, $tmp2$$XMMRegister, $tmp3$$XMMRegister,
-                           $tmp4$$XMMRegister, $tmp5$$Register, $result$$Register,
-                           knoreg, knoreg);
-  %}
-  ins_pipe( pipe_slow );
-%}
-
-instruct string_compress_evex(eSIRegP src, eDIRegP dst, eDXRegI len, regD tmp1, regD tmp2,
-                              regD tmp3, regD tmp4, kReg ktmp1, kReg ktmp2, eCXRegI tmp5, eAXRegI result, eFlagsReg cr) %{
-  predicate(VM_Version::supports_avx512vlbw() && VM_Version::supports_bmi2());
-  match(Set result (StrCompressedCopy src (Binary dst len)));
-  effect(TEMP tmp1, TEMP tmp2, TEMP tmp3, TEMP tmp4, TEMP ktmp1, TEMP ktmp2, USE_KILL src, USE_KILL dst, USE_KILL len, KILL tmp5, KILL cr);
-
-  format %{ "String Compress $src,$dst -> $result    // KILL RAX, RCX, RDX" %}
-  ins_encode %{
-    __ char_array_compress($src$$Register, $dst$$Register, $len$$Register,
-                           $tmp1$$XMMRegister, $tmp2$$XMMRegister, $tmp3$$XMMRegister,
-                           $tmp4$$XMMRegister, $tmp5$$Register, $result$$Register,
-                           $ktmp1$$KRegister, $ktmp2$$KRegister);
-  %}
-  ins_pipe( pipe_slow );
-%}
-
-// fast byte[] to char[] inflation
-instruct string_inflate(Universe dummy, eSIRegP src, eDIRegP dst, eDXRegI len,
-                        regD tmp1, eCXRegI tmp2, eFlagsReg cr) %{
-  predicate(!VM_Version::supports_avx512vlbw() || !VM_Version::supports_bmi2());
-  match(Set dummy (StrInflatedCopy src (Binary dst len)));
-  effect(TEMP tmp1, TEMP tmp2, USE_KILL src, USE_KILL dst, USE_KILL len, KILL cr);
-
-  format %{ "String Inflate $src,$dst    // KILL $tmp1, $tmp2" %}
-  ins_encode %{
-    __ byte_array_inflate($src$$Register, $dst$$Register, $len$$Register,
-                          $tmp1$$XMMRegister, $tmp2$$Register, knoreg);
-  %}
-  ins_pipe( pipe_slow );
-%}
-
-instruct string_inflate_evex(Universe dummy, eSIRegP src, eDIRegP dst, eDXRegI len,
-                             regD tmp1, kReg ktmp, eCXRegI tmp2, eFlagsReg cr) %{
-  predicate(VM_Version::supports_avx512vlbw() && VM_Version::supports_bmi2());
-  match(Set dummy (StrInflatedCopy src (Binary dst len)));
-  effect(TEMP tmp1, TEMP tmp2, TEMP ktmp, USE_KILL src, USE_KILL dst, USE_KILL len, KILL cr);
-
-  format %{ "String Inflate $src,$dst    // KILL $tmp1, $tmp2" %}
-  ins_encode %{
-    __ byte_array_inflate($src$$Register, $dst$$Register, $len$$Register,
-                          $tmp1$$XMMRegister, $tmp2$$Register, $ktmp$$KRegister);
-  %}
-  ins_pipe( pipe_slow );
-%}
-
-// encode char[] to byte[] in ISO_8859_1
-instruct encode_iso_array(eSIRegP src, eDIRegP dst, eDXRegI len,
-                          regD tmp1, regD tmp2, regD tmp3, regD tmp4,
-                          eCXRegI tmp5, eAXRegI result, eFlagsReg cr) %{
-  predicate(!((EncodeISOArrayNode*)n)->is_ascii());
-  match(Set result (EncodeISOArray src (Binary dst len)));
-  effect(TEMP tmp1, TEMP tmp2, TEMP tmp3, TEMP tmp4, USE_KILL src, USE_KILL dst, USE_KILL len, KILL tmp5, KILL cr);
-
-  format %{ "Encode iso array $src,$dst,$len -> $result    // KILL ECX, EDX, $tmp1, $tmp2, $tmp3, $tmp4, ESI, EDI " %}
-  ins_encode %{
-    __ encode_iso_array($src$$Register, $dst$$Register, $len$$Register,
-                        $tmp1$$XMMRegister, $tmp2$$XMMRegister, $tmp3$$XMMRegister,
-                        $tmp4$$XMMRegister, $tmp5$$Register, $result$$Register, false);
-  %}
-  ins_pipe( pipe_slow );
-%}
-
-// encode char[] to byte[] in ASCII
-instruct encode_ascii_array(eSIRegP src, eDIRegP dst, eDXRegI len,
-                            regD tmp1, regD tmp2, regD tmp3, regD tmp4,
-                            eCXRegI tmp5, eAXRegI result, eFlagsReg cr) %{
-  predicate(((EncodeISOArrayNode*)n)->is_ascii());
-  match(Set result (EncodeISOArray src (Binary dst len)));
-  effect(TEMP tmp1, TEMP tmp2, TEMP tmp3, TEMP tmp4, USE_KILL src, USE_KILL dst, USE_KILL len, KILL tmp5, KILL cr);
-
-  format %{ "Encode ascii array $src,$dst,$len -> $result    // KILL ECX, EDX, $tmp1, $tmp2, $tmp3, $tmp4, ESI, EDI " %}
-  ins_encode %{
-    __ encode_iso_array($src$$Register, $dst$$Register, $len$$Register,
-                        $tmp1$$XMMRegister, $tmp2$$XMMRegister, $tmp3$$XMMRegister,
-                        $tmp4$$XMMRegister, $tmp5$$Register, $result$$Register, true);
-  %}
-  ins_pipe( pipe_slow );
-%}
-
-//----------Control Flow Instructions------------------------------------------
-// Signed compare Instructions
-instruct compI_eReg(eFlagsReg cr, rRegI op1, rRegI op2) %{
-  match(Set cr (CmpI op1 op2));
-  effect( DEF cr, USE op1, USE op2 );
-  format %{ "CMP    $op1,$op2" %}
-  opcode(0x3B);  /* Opcode 3B /r */
-  ins_encode( OpcP, RegReg( op1, op2) );
-  ins_pipe( ialu_cr_reg_reg );
-%}
-
-instruct compI_eReg_imm(eFlagsReg cr, rRegI op1, immI op2) %{
-  match(Set cr (CmpI op1 op2));
-  effect( DEF cr, USE op1 );
-  format %{ "CMP    $op1,$op2" %}
-  opcode(0x81,0x07);  /* Opcode 81 /7 */
-  // ins_encode( RegImm( op1, op2) );  /* Was CmpImm */
-  ins_encode( OpcSErm( op1, op2 ), Con8or32( op2 ) );
-  ins_pipe( ialu_cr_reg_imm );
-%}
-
-// Cisc-spilled version of cmpI_eReg
-instruct compI_eReg_mem(eFlagsReg cr, rRegI op1, memory op2) %{
-  match(Set cr (CmpI op1 (LoadI op2)));
-
-  format %{ "CMP    $op1,$op2" %}
-  ins_cost(500);
-  opcode(0x3B);  /* Opcode 3B /r */
-  ins_encode( SetInstMark, OpcP, RegMem( op1, op2), ClearInstMark );
-  ins_pipe( ialu_cr_reg_mem );
-%}
-
-instruct testI_reg( eFlagsReg cr, rRegI src, immI_0 zero ) %{
-  match(Set cr (CmpI src zero));
-  effect( DEF cr, USE src );
-
-  format %{ "TEST   $src,$src" %}
-  opcode(0x85);
-  ins_encode( OpcP, RegReg( src, src ) );
-  ins_pipe( ialu_cr_reg_imm );
-%}
-
-instruct testI_reg_imm( eFlagsReg cr, rRegI src, immI con, immI_0 zero ) %{
-  match(Set cr (CmpI (AndI src con) zero));
-
-  format %{ "TEST   $src,$con" %}
-  opcode(0xF7,0x00);
-  ins_encode( OpcP, RegOpc(src), Con32(con) );
-  ins_pipe( ialu_cr_reg_imm );
-%}
-
-instruct testI_reg_mem( eFlagsReg cr, rRegI src, memory mem, immI_0 zero ) %{
-  match(Set cr (CmpI (AndI src mem) zero));
-
-  format %{ "TEST   $src,$mem" %}
-  opcode(0x85);
-  ins_encode( SetInstMark, OpcP, RegMem( src, mem ), ClearInstMark );
-  ins_pipe( ialu_cr_reg_mem );
-%}
-
-// Unsigned compare Instructions; really, same as signed except they
-// produce an eFlagsRegU instead of eFlagsReg.
-instruct compU_eReg(eFlagsRegU cr, rRegI op1, rRegI op2) %{
-  match(Set cr (CmpU op1 op2));
-
-  format %{ "CMPu   $op1,$op2" %}
-  opcode(0x3B);  /* Opcode 3B /r */
-  ins_encode( OpcP, RegReg( op1, op2) );
-  ins_pipe( ialu_cr_reg_reg );
-%}
-
-instruct compU_eReg_imm(eFlagsRegU cr, rRegI op1, immI op2) %{
-  match(Set cr (CmpU op1 op2));
-
-  format %{ "CMPu   $op1,$op2" %}
-  opcode(0x81,0x07);  /* Opcode 81 /7 */
-  ins_encode( OpcSErm( op1, op2 ), Con8or32( op2 ) );
-  ins_pipe( ialu_cr_reg_imm );
-%}
-
-// // Cisc-spilled version of cmpU_eReg
-instruct compU_eReg_mem(eFlagsRegU cr, rRegI op1, memory op2) %{
-  match(Set cr (CmpU op1 (LoadI op2)));
-
-  format %{ "CMPu   $op1,$op2" %}
-  ins_cost(500);
-  opcode(0x3B);  /* Opcode 3B /r */
-  ins_encode( SetInstMark, OpcP, RegMem( op1, op2), ClearInstMark );
-  ins_pipe( ialu_cr_reg_mem );
-%}
-
-// // Cisc-spilled version of cmpU_eReg
-//instruct compU_mem_eReg(eFlagsRegU cr, memory op1, rRegI op2) %{
-//  match(Set cr (CmpU (LoadI op1) op2));
-//
-//  format %{ "CMPu   $op1,$op2" %}
-//  ins_cost(500);
-//  opcode(0x39);  /* Opcode 39 /r */
-//  ins_encode( OpcP, RegMem( op1, op2) );
-//%}
-
-instruct testU_reg( eFlagsRegU cr, rRegI src, immI_0 zero ) %{
-  match(Set cr (CmpU src zero));
-
-  format %{ "TESTu  $src,$src" %}
-  opcode(0x85);
-  ins_encode( OpcP, RegReg( src, src ) );
-  ins_pipe( ialu_cr_reg_imm );
-%}
-
-// Unsigned pointer compare Instructions
-instruct compP_eReg(eFlagsRegU cr, eRegP op1, eRegP op2) %{
-  match(Set cr (CmpP op1 op2));
-
-  format %{ "CMPu   $op1,$op2" %}
-  opcode(0x3B);  /* Opcode 3B /r */
-  ins_encode( OpcP, RegReg( op1, op2) );
-  ins_pipe( ialu_cr_reg_reg );
-%}
-
-instruct compP_eReg_imm(eFlagsRegU cr, eRegP op1, immP op2) %{
-  match(Set cr (CmpP op1 op2));
-
-  format %{ "CMPu   $op1,$op2" %}
-  opcode(0x81,0x07);  /* Opcode 81 /7 */
-  ins_encode( SetInstMark, OpcSErm( op1, op2 ), Con8or32( op2 ), ClearInstMark );
-  ins_pipe( ialu_cr_reg_imm );
-%}
-
-// // Cisc-spilled version of cmpP_eReg
-instruct compP_eReg_mem(eFlagsRegU cr, eRegP op1, memory op2) %{
-  match(Set cr (CmpP op1 (LoadP op2)));
-
-  format %{ "CMPu   $op1,$op2" %}
-  ins_cost(500);
-  opcode(0x3B);  /* Opcode 3B /r */
-  ins_encode( SetInstMark, OpcP, RegMem( op1, op2), ClearInstMark );
-  ins_pipe( ialu_cr_reg_mem );
-%}
-
-// // Cisc-spilled version of cmpP_eReg
-//instruct compP_mem_eReg(eFlagsRegU cr, memory op1, eRegP op2) %{
-//  match(Set cr (CmpP (LoadP op1) op2));
-//
-//  format %{ "CMPu   $op1,$op2" %}
-//  ins_cost(500);
-//  opcode(0x39);  /* Opcode 39 /r */
-//  ins_encode( OpcP, RegMem( op1, op2) );
-//%}
-
-// Compare raw pointer (used in out-of-heap check).
-// Only works because non-oop pointers must be raw pointers
-// and raw pointers have no anti-dependencies.
-instruct compP_mem_eReg( eFlagsRegU cr, eRegP op1, memory op2 ) %{
-  predicate( n->in(2)->in(2)->bottom_type()->reloc() == relocInfo::none );
-  match(Set cr (CmpP op1 (LoadP op2)));
-
-  format %{ "CMPu   $op1,$op2" %}
-  opcode(0x3B);  /* Opcode 3B /r */
-  ins_encode( SetInstMark, OpcP, RegMem( op1, op2), ClearInstMark );
-  ins_pipe( ialu_cr_reg_mem );
-%}
-
-//
-// This will generate a signed flags result. This should be ok
-// since any compare to a zero should be eq/neq.
-instruct testP_reg( eFlagsReg cr, eRegP src, immP0 zero ) %{
-  match(Set cr (CmpP src zero));
-
-  format %{ "TEST   $src,$src" %}
-  opcode(0x85);
-  ins_encode( OpcP, RegReg( src, src ) );
-  ins_pipe( ialu_cr_reg_imm );
-%}
-
-// Cisc-spilled version of testP_reg
-// This will generate a signed flags result. This should be ok
-// since any compare to a zero should be eq/neq.
-instruct testP_Reg_mem( eFlagsReg cr, memory op, immI_0 zero ) %{
-  match(Set cr (CmpP (LoadP op) zero));
-
-  format %{ "TEST   $op,0xFFFFFFFF" %}
-  ins_cost(500);
-  opcode(0xF7);               /* Opcode F7 /0 */
-  ins_encode( SetInstMark, OpcP, RMopc_Mem(0x00,op), Con_d32(0xFFFFFFFF), ClearInstMark );
-  ins_pipe( ialu_cr_reg_imm );
-%}
-
-// Yanked all unsigned pointer compare operations.
-// Pointer compares are done with CmpP which is already unsigned.
-
-//----------Max and Min--------------------------------------------------------
-// Min Instructions
-////
-//   *** Min and Max using the conditional move are slower than the
-//   *** branch version on a Pentium III.
-// // Conditional move for min
-//instruct cmovI_reg_lt( rRegI op2, rRegI op1, eFlagsReg cr ) %{
-//  effect( USE_DEF op2, USE op1, USE cr );
-//  format %{ "CMOVlt $op2,$op1\t! min" %}
-//  opcode(0x4C,0x0F);
-//  ins_encode( OpcS, OpcP, RegReg( op2, op1 ) );
-//  ins_pipe( pipe_cmov_reg );
-//%}
-//
-//// Min Register with Register (P6 version)
-//instruct minI_eReg_p6( rRegI op1, rRegI op2 ) %{
-//  predicate(VM_Version::supports_cmov() );
-//  match(Set op2 (MinI op1 op2));
-//  ins_cost(200);
-//  expand %{
-//    eFlagsReg cr;
-//    compI_eReg(cr,op1,op2);
-//    cmovI_reg_lt(op2,op1,cr);
-//  %}
-//%}
-
-// Min Register with Register (generic version)
-instruct minI_eReg(rRegI dst, rRegI src, eFlagsReg flags) %{
-  match(Set dst (MinI dst src));
-  effect(KILL flags);
-  ins_cost(300);
-
-  format %{ "MIN    $dst,$src" %}
-  opcode(0xCC);
-  ins_encode( min_enc(dst,src) );
-  ins_pipe( pipe_slow );
-%}
-
-// Max Register with Register
-//   *** Min and Max using the conditional move are slower than the
-//   *** branch version on a Pentium III.
-// // Conditional move for max
-//instruct cmovI_reg_gt( rRegI op2, rRegI op1, eFlagsReg cr ) %{
-//  effect( USE_DEF op2, USE op1, USE cr );
-//  format %{ "CMOVgt $op2,$op1\t! max" %}
-//  opcode(0x4F,0x0F);
-//  ins_encode( OpcS, OpcP, RegReg( op2, op1 ) );
-//  ins_pipe( pipe_cmov_reg );
-//%}
-//
-// // Max Register with Register (P6 version)
-//instruct maxI_eReg_p6( rRegI op1, rRegI op2 ) %{
-//  predicate(VM_Version::supports_cmov() );
-//  match(Set op2 (MaxI op1 op2));
-//  ins_cost(200);
-//  expand %{
-//    eFlagsReg cr;
-//    compI_eReg(cr,op1,op2);
-//    cmovI_reg_gt(op2,op1,cr);
-//  %}
-//%}
-
-// Max Register with Register (generic version)
-instruct maxI_eReg(rRegI dst, rRegI src, eFlagsReg flags) %{
-  match(Set dst (MaxI dst src));
-  effect(KILL flags);
-  ins_cost(300);
-
-  format %{ "MAX    $dst,$src" %}
-  opcode(0xCC);
-  ins_encode( max_enc(dst,src) );
-  ins_pipe( pipe_slow );
-%}
-
-// ============================================================================
-// Counted Loop limit node which represents exact final iterator value.
-// Note: the resulting value should fit into integer range since
-// counted loops have limit check on overflow.
-instruct loopLimit_eReg(eAXRegI limit, nadxRegI init, immI stride, eDXRegI limit_hi, nadxRegI tmp, eFlagsReg flags) %{
-  match(Set limit (LoopLimit (Binary init limit) stride));
-  effect(TEMP limit_hi, TEMP tmp, KILL flags);
-  ins_cost(300);
-
-  format %{ "loopLimit $init,$limit,$stride  # $limit = $init + $stride *( $limit - $init + $stride -1)/ $stride, kills $limit_hi" %}
-  ins_encode %{
-    int strd = (int)$stride$$constant;
-    assert(strd != 1 && strd != -1, "sanity");
-    int m1 = (strd > 0) ? 1 : -1;
-    // Convert limit to long (EAX:EDX)
-    __ cdql();
-    // Convert init to long (init:tmp)
-    __ movl($tmp$$Register, $init$$Register);
-    __ sarl($tmp$$Register, 31);
-    // $limit - $init
-    __ subl($limit$$Register, $init$$Register);
-    __ sbbl($limit_hi$$Register, $tmp$$Register);
-    // + ($stride - 1)
-    if (strd > 0) {
-      __ addl($limit$$Register, (strd - 1));
-      __ adcl($limit_hi$$Register, 0);
-      __ movl($tmp$$Register, strd);
-    } else {
-      __ addl($limit$$Register, (strd + 1));
-      __ adcl($limit_hi$$Register, -1);
-      __ lneg($limit_hi$$Register, $limit$$Register);
-      __ movl($tmp$$Register, -strd);
-    }
-    // signed division: (EAX:EDX) / pos_stride
-    __ idivl($tmp$$Register);
-    if (strd < 0) {
-      // restore sign
-      __ negl($tmp$$Register);
-    }
-    // (EAX) * stride
-    __ mull($tmp$$Register);
-    // + init (ignore upper bits)
-    __ addl($limit$$Register, $init$$Register);
-  %}
-  ins_pipe( pipe_slow );
-%}
-
-// ============================================================================
-// Branch Instructions
-// Jump Table
-instruct jumpXtnd(rRegI switch_val) %{
-  match(Jump switch_val);
-  ins_cost(350);
-  format %{  "JMP    [$constantaddress](,$switch_val,1)\n\t" %}
-  ins_encode %{
-    // Jump to Address(table_base + switch_reg)
-    Address index(noreg, $switch_val$$Register, Address::times_1);
-    __ jump(ArrayAddress($constantaddress, index), noreg);
-  %}
-  ins_pipe(pipe_jmp);
-%}
-
-// Jump Direct - Label defines a relative address from JMP+1
-instruct jmpDir(label labl) %{
-  match(Goto);
-  effect(USE labl);
-
-  ins_cost(300);
-  format %{ "JMP    $labl" %}
-  size(5);
-  ins_encode %{
-    Label* L = $labl$$label;
-    __ jmp(*L, false); // Always long jump
-  %}
-  ins_pipe( pipe_jmp );
-%}
-
-// Jump Direct Conditional - Label defines a relative address from Jcc+1
-instruct jmpCon(cmpOp cop, eFlagsReg cr, label labl) %{
-  match(If cop cr);
-  effect(USE labl);
-
-  ins_cost(300);
-  format %{ "J$cop    $labl" %}
-  size(6);
-  ins_encode %{
-    Label* L = $labl$$label;
-    __ jcc((Assembler::Condition)($cop$$cmpcode), *L, false); // Always long jump
-  %}
-  ins_pipe( pipe_jcc );
-%}
-
-// Jump Direct Conditional - Label defines a relative address from Jcc+1
-instruct jmpLoopEnd(cmpOp cop, eFlagsReg cr, label labl) %{
-  match(CountedLoopEnd cop cr);
-  effect(USE labl);
-
-  ins_cost(300);
-  format %{ "J$cop    $labl\t# Loop end" %}
-  size(6);
-  ins_encode %{
-    Label* L = $labl$$label;
-    __ jcc((Assembler::Condition)($cop$$cmpcode), *L, false); // Always long jump
-  %}
-  ins_pipe( pipe_jcc );
-%}
-
-// Jump Direct Conditional - using unsigned comparison
-instruct jmpConU(cmpOpU cop, eFlagsRegU cmp, label labl) %{
-  match(If cop cmp);
-  effect(USE labl);
-
-  ins_cost(300);
-  format %{ "J$cop,u  $labl" %}
-  size(6);
-  ins_encode %{
-    Label* L = $labl$$label;
-    __ jcc((Assembler::Condition)($cop$$cmpcode), *L, false); // Always long jump
-  %}
-  ins_pipe(pipe_jcc);
-%}
-
-instruct jmpConUCF(cmpOpUCF cop, eFlagsRegUCF cmp, label labl) %{
-  match(If cop cmp);
-  effect(USE labl);
-
-  ins_cost(200);
-  format %{ "J$cop,u  $labl" %}
-  size(6);
-  ins_encode %{
-    Label* L = $labl$$label;
-    __ jcc((Assembler::Condition)($cop$$cmpcode), *L, false); // Always long jump
-  %}
-  ins_pipe(pipe_jcc);
-%}
-
-instruct jmpConUCF2(cmpOpUCF2 cop, eFlagsRegUCF cmp, label labl) %{
-  match(If cop cmp);
-  effect(USE labl);
-
-  ins_cost(200);
-  format %{ $$template
-    if ($cop$$cmpcode == Assembler::notEqual) {
-      $$emit$$"JP,u   $labl\n\t"
-      $$emit$$"J$cop,u   $labl"
-    } else {
-      $$emit$$"JP,u   done\n\t"
-      $$emit$$"J$cop,u   $labl\n\t"
-      $$emit$$"done:"
-    }
-  %}
-  ins_encode %{
-    Label* l = $labl$$label;
-    if ($cop$$cmpcode == Assembler::notEqual) {
-      __ jcc(Assembler::parity, *l, false);
-      __ jcc(Assembler::notEqual, *l, false);
-    } else if ($cop$$cmpcode == Assembler::equal) {
-      Label done;
-      __ jccb(Assembler::parity, done);
-      __ jcc(Assembler::equal, *l, false);
-      __ bind(done);
-    } else {
-       ShouldNotReachHere();
-    }
-  %}
-  ins_pipe(pipe_jcc);
-%}
-
-// ============================================================================
-// The 2nd slow-half of a subtype check.  Scan the subklass's 2ndary superklass
-// array for an instance of the superklass.  Set a hidden internal cache on a
-// hit (cache is checked with exposed code in gen_subtype_check()).  Return
-// NZ for a miss or zero for a hit.  The encoding ALSO sets flags.
-instruct partialSubtypeCheck( eDIRegP result, eSIRegP sub, eAXRegP super, eCXRegI rcx, eFlagsReg cr ) %{
-  match(Set result (PartialSubtypeCheck sub super));
-  effect( KILL rcx, KILL cr );
-
-  ins_cost(1100);  // slightly larger than the next version
-  format %{ "MOV    EDI,[$sub+Klass::secondary_supers]\n\t"
-            "MOV    ECX,[EDI+ArrayKlass::length]\t# length to scan\n\t"
-            "ADD    EDI,ArrayKlass::base_offset\t# Skip to start of data; set NZ in case count is zero\n\t"
-            "REPNE SCASD\t# Scan *EDI++ for a match with EAX while CX-- != 0\n\t"
-            "JNE,s  miss\t\t# Missed: EDI not-zero\n\t"
-            "MOV    [$sub+Klass::secondary_super_cache],$super\t# Hit: update cache\n\t"
-            "XOR    $result,$result\t\t Hit: EDI zero\n\t"
-     "miss:\t" %}
-
-  opcode(0x1); // Force a XOR of EDI
-  ins_encode( enc_PartialSubtypeCheck() );
-  ins_pipe( pipe_slow );
-%}
-
-instruct partialSubtypeCheck_vs_Zero( eFlagsReg cr, eSIRegP sub, eAXRegP super, eCXRegI rcx, eDIRegP result, immP0 zero ) %{
-  match(Set cr (CmpP (PartialSubtypeCheck sub super) zero));
-  effect( KILL rcx, KILL result );
-
-  ins_cost(1000);
-  format %{ "MOV    EDI,[$sub+Klass::secondary_supers]\n\t"
-            "MOV    ECX,[EDI+ArrayKlass::length]\t# length to scan\n\t"
-            "ADD    EDI,ArrayKlass::base_offset\t# Skip to start of data; set NZ in case count is zero\n\t"
-            "REPNE SCASD\t# Scan *EDI++ for a match with EAX while CX-- != 0\n\t"
-            "JNE,s  miss\t\t# Missed: flags NZ\n\t"
-            "MOV    [$sub+Klass::secondary_super_cache],$super\t# Hit: update cache, flags Z\n\t"
-     "miss:\t" %}
-
-  opcode(0x0);  // No need to XOR EDI
-  ins_encode( enc_PartialSubtypeCheck() );
-  ins_pipe( pipe_slow );
-%}
-
-// ============================================================================
-// Branch Instructions -- short offset versions
-//
-// These instructions are used to replace jumps of a long offset (the default
-// match) with jumps of a shorter offset.  These instructions are all tagged
-// with the ins_short_branch attribute, which causes the ADLC to suppress the
-// match rules in general matching.  Instead, the ADLC generates a conversion
-// method in the MachNode which can be used to do in-place replacement of the
-// long variant with the shorter variant.  The compiler will determine if a
-// branch can be taken by the is_short_branch_offset() predicate in the machine
-// specific code section of the file.
-
-// Jump Direct - Label defines a relative address from JMP+1
-instruct jmpDir_short(label labl) %{
-  match(Goto);
-  effect(USE labl);
-
-  ins_cost(300);
-  format %{ "JMP,s  $labl" %}
-  size(2);
-  ins_encode %{
-    Label* L = $labl$$label;
-    __ jmpb(*L);
-  %}
-  ins_pipe( pipe_jmp );
-  ins_short_branch(1);
-%}
-
-// Jump Direct Conditional - Label defines a relative address from Jcc+1
-instruct jmpCon_short(cmpOp cop, eFlagsReg cr, label labl) %{
-  match(If cop cr);
-  effect(USE labl);
-
-  ins_cost(300);
-  format %{ "J$cop,s  $labl" %}
-  size(2);
-  ins_encode %{
-    Label* L = $labl$$label;
-    __ jccb((Assembler::Condition)($cop$$cmpcode), *L);
-  %}
-  ins_pipe( pipe_jcc );
-  ins_short_branch(1);
-%}
-
-// Jump Direct Conditional - Label defines a relative address from Jcc+1
-instruct jmpLoopEnd_short(cmpOp cop, eFlagsReg cr, label labl) %{
-  match(CountedLoopEnd cop cr);
-  effect(USE labl);
-
-  ins_cost(300);
-  format %{ "J$cop,s  $labl\t# Loop end" %}
-  size(2);
-  ins_encode %{
-    Label* L = $labl$$label;
-    __ jccb((Assembler::Condition)($cop$$cmpcode), *L);
-  %}
-  ins_pipe( pipe_jcc );
-  ins_short_branch(1);
-%}
-
-// Jump Direct Conditional - using unsigned comparison
-instruct jmpConU_short(cmpOpU cop, eFlagsRegU cmp, label labl) %{
-  match(If cop cmp);
-  effect(USE labl);
-
-  ins_cost(300);
-  format %{ "J$cop,us $labl" %}
-  size(2);
-  ins_encode %{
-    Label* L = $labl$$label;
-    __ jccb((Assembler::Condition)($cop$$cmpcode), *L);
-  %}
-  ins_pipe( pipe_jcc );
-  ins_short_branch(1);
-%}
-
-instruct jmpConUCF_short(cmpOpUCF cop, eFlagsRegUCF cmp, label labl) %{
-  match(If cop cmp);
-  effect(USE labl);
-
-  ins_cost(300);
-  format %{ "J$cop,us $labl" %}
-  size(2);
-  ins_encode %{
-    Label* L = $labl$$label;
-    __ jccb((Assembler::Condition)($cop$$cmpcode), *L);
-  %}
-  ins_pipe( pipe_jcc );
-  ins_short_branch(1);
-%}
-
-instruct jmpConUCF2_short(cmpOpUCF2 cop, eFlagsRegUCF cmp, label labl) %{
-  match(If cop cmp);
-  effect(USE labl);
-
-  ins_cost(300);
-  format %{ $$template
-    if ($cop$$cmpcode == Assembler::notEqual) {
-      $$emit$$"JP,u,s   $labl\n\t"
-      $$emit$$"J$cop,u,s   $labl"
-    } else {
-      $$emit$$"JP,u,s   done\n\t"
-      $$emit$$"J$cop,u,s  $labl\n\t"
-      $$emit$$"done:"
-    }
-  %}
-  size(4);
-  ins_encode %{
-    Label* l = $labl$$label;
-    if ($cop$$cmpcode == Assembler::notEqual) {
-      __ jccb(Assembler::parity, *l);
-      __ jccb(Assembler::notEqual, *l);
-    } else if ($cop$$cmpcode == Assembler::equal) {
-      Label done;
-      __ jccb(Assembler::parity, done);
-      __ jccb(Assembler::equal, *l);
-      __ bind(done);
-    } else {
-       ShouldNotReachHere();
-    }
-  %}
-  ins_pipe(pipe_jcc);
-  ins_short_branch(1);
-%}
-
-// ============================================================================
-// Long Compare
-//
-// Currently we hold longs in 2 registers.  Comparing such values efficiently
-// is tricky.  The flavor of compare used depends on whether we are testing
-// for LT, LE, or EQ.  For a simple LT test we can check just the sign bit.
-// The GE test is the negated LT test.  The LE test can be had by commuting
-// the operands (yielding a GE test) and then negating; negate again for the
-// GT test.  The EQ test is done by ORcc'ing the high and low halves, and the
-// NE test is negated from that.
-
-// Due to a shortcoming in the ADLC, it mixes up expressions like:
-// (foo (CmpI (CmpL X Y) 0)) and (bar (CmpI (CmpL X 0L) 0)).  Note the
-// difference between 'Y' and '0L'.  The tree-matches for the CmpI sections
-// are collapsed internally in the ADLC's dfa-gen code.  The match for
-// (CmpI (CmpL X Y) 0) is silently replaced with (CmpI (CmpL X 0L) 0) and the
-// foo match ends up with the wrong leaf.  One fix is to not match both
-// reg-reg and reg-zero forms of long-compare.  This is unfortunate because
-// both forms beat the trinary form of long-compare and both are very useful
-// on Intel which has so few registers.
-
-// Manifest a CmpL result in an integer register.  Very painful.
-// This is the test to avoid.
-instruct cmpL3_reg_reg(eSIRegI dst, eRegL src1, eRegL src2, eFlagsReg flags ) %{
-  match(Set dst (CmpL3 src1 src2));
-  effect( KILL flags );
-  ins_cost(1000);
-  format %{ "XOR    $dst,$dst\n\t"
-            "CMP    $src1.hi,$src2.hi\n\t"
-            "JLT,s  m_one\n\t"
-            "JGT,s  p_one\n\t"
-            "CMP    $src1.lo,$src2.lo\n\t"
-            "JB,s   m_one\n\t"
-            "JEQ,s  done\n"
-    "p_one:\tINC    $dst\n\t"
-            "JMP,s  done\n"
-    "m_one:\tDEC    $dst\n"
-     "done:" %}
-  ins_encode %{
-    Label p_one, m_one, done;
-    __ xorptr($dst$$Register, $dst$$Register);
-    __ cmpl(HIGH_FROM_LOW($src1$$Register), HIGH_FROM_LOW($src2$$Register));
-    __ jccb(Assembler::less,    m_one);
-    __ jccb(Assembler::greater, p_one);
-    __ cmpl($src1$$Register, $src2$$Register);
-    __ jccb(Assembler::below,   m_one);
-    __ jccb(Assembler::equal,   done);
-    __ bind(p_one);
-    __ incrementl($dst$$Register);
-    __ jmpb(done);
-    __ bind(m_one);
-    __ decrementl($dst$$Register);
-    __ bind(done);
-  %}
-  ins_pipe( pipe_slow );
-%}
-
-//======
-// Manifest a CmpL result in the normal flags.  Only good for LT or GE
-// compares.  Can be used for LE or GT compares by reversing arguments.
-// NOT GOOD FOR EQ/NE tests.
-instruct cmpL_zero_flags_LTGE( flagsReg_long_LTGE flags, eRegL src, immL0 zero ) %{
-  match( Set flags (CmpL src zero ));
-  ins_cost(100);
-  format %{ "TEST   $src.hi,$src.hi" %}
-  opcode(0x85);
-  ins_encode( OpcP, RegReg_Hi2( src, src ) );
-  ins_pipe( ialu_cr_reg_reg );
-%}
-
-// Manifest a CmpL result in the normal flags.  Only good for LT or GE
-// compares.  Can be used for LE or GT compares by reversing arguments.
-// NOT GOOD FOR EQ/NE tests.
-instruct cmpL_reg_flags_LTGE( flagsReg_long_LTGE flags, eRegL src1, eRegL src2, rRegI tmp ) %{
-  match( Set flags (CmpL src1 src2 ));
-  effect( TEMP tmp );
-  ins_cost(300);
-  format %{ "CMP    $src1.lo,$src2.lo\t! Long compare; set flags for low bits\n\t"
-            "MOV    $tmp,$src1.hi\n\t"
-            "SBB    $tmp,$src2.hi\t! Compute flags for long compare" %}
-  ins_encode( long_cmp_flags2( src1, src2, tmp ) );
-  ins_pipe( ialu_cr_reg_reg );
-%}
-
-// Long compares reg < zero/req OR reg >= zero/req.
-// Just a wrapper for a normal branch, plus the predicate test.
-instruct cmpL_LTGE(cmpOp cmp, flagsReg_long_LTGE flags, label labl) %{
-  match(If cmp flags);
-  effect(USE labl);
-  predicate( _kids[0]->_leaf->as_Bool()->_test._test == BoolTest::lt || _kids[0]->_leaf->as_Bool()->_test._test == BoolTest::ge );
-  expand %{
-    jmpCon(cmp,flags,labl);    // JLT or JGE...
-  %}
-%}
-
-//======
-// Manifest a CmpUL result in the normal flags.  Only good for LT or GE
-// compares.  Can be used for LE or GT compares by reversing arguments.
-// NOT GOOD FOR EQ/NE tests.
-instruct cmpUL_zero_flags_LTGE(flagsReg_ulong_LTGE flags, eRegL src, immL0 zero) %{
-  match(Set flags (CmpUL src zero));
-  ins_cost(100);
-  format %{ "TEST   $src.hi,$src.hi" %}
-  opcode(0x85);
-  ins_encode(OpcP, RegReg_Hi2(src, src));
-  ins_pipe(ialu_cr_reg_reg);
-%}
-
-// Manifest a CmpUL result in the normal flags.  Only good for LT or GE
-// compares.  Can be used for LE or GT compares by reversing arguments.
-// NOT GOOD FOR EQ/NE tests.
-instruct cmpUL_reg_flags_LTGE(flagsReg_ulong_LTGE flags, eRegL src1, eRegL src2, rRegI tmp) %{
-  match(Set flags (CmpUL src1 src2));
-  effect(TEMP tmp);
-  ins_cost(300);
-  format %{ "CMP    $src1.lo,$src2.lo\t! Unsigned long compare; set flags for low bits\n\t"
-            "MOV    $tmp,$src1.hi\n\t"
-            "SBB    $tmp,$src2.hi\t! Compute flags for unsigned long compare" %}
-  ins_encode(long_cmp_flags2(src1, src2, tmp));
-  ins_pipe(ialu_cr_reg_reg);
-%}
-
-// Unsigned long compares reg < zero/req OR reg >= zero/req.
-// Just a wrapper for a normal branch, plus the predicate test.
-instruct cmpUL_LTGE(cmpOpU cmp, flagsReg_ulong_LTGE flags, label labl) %{
-  match(If cmp flags);
-  effect(USE labl);
-  predicate(_kids[0]->_leaf->as_Bool()->_test._test == BoolTest::lt || _kids[0]->_leaf->as_Bool()->_test._test == BoolTest::ge);
-  expand %{
-    jmpCon(cmp, flags, labl);    // JLT or JGE...
-  %}
-%}
-
-// Compare 2 longs and CMOVE longs.
-instruct cmovLL_reg_LTGE(cmpOp cmp, flagsReg_long_LTGE flags, eRegL dst, eRegL src) %{
-  match(Set dst (CMoveL (Binary cmp flags) (Binary dst src)));
-  predicate(VM_Version::supports_cmov() && ( _kids[0]->_kids[0]->_leaf->as_Bool()->_test._test == BoolTest::lt || _kids[0]->_kids[0]->_leaf->as_Bool()->_test._test == BoolTest::ge ));
-  ins_cost(400);
-  format %{ "CMOV$cmp $dst.lo,$src.lo\n\t"
-            "CMOV$cmp $dst.hi,$src.hi" %}
-  opcode(0x0F,0x40);
-  ins_encode( enc_cmov(cmp), RegReg_Lo2( dst, src ), enc_cmov(cmp), RegReg_Hi2( dst, src ) );
-  ins_pipe( pipe_cmov_reg_long );
-%}
-
-instruct cmovLL_mem_LTGE(cmpOp cmp, flagsReg_long_LTGE flags, eRegL dst, load_long_memory src) %{
-  match(Set dst (CMoveL (Binary cmp flags) (Binary dst (LoadL src))));
-  predicate(VM_Version::supports_cmov() && ( _kids[0]->_kids[0]->_leaf->as_Bool()->_test._test == BoolTest::lt || _kids[0]->_kids[0]->_leaf->as_Bool()->_test._test == BoolTest::ge ));
-  ins_cost(500);
-  format %{ "CMOV$cmp $dst.lo,$src.lo\n\t"
-            "CMOV$cmp $dst.hi,$src.hi" %}
-  opcode(0x0F,0x40);
-  ins_encode( SetInstMark, enc_cmov(cmp), RegMem(dst, src), enc_cmov(cmp), RegMem_Hi(dst, src), ClearInstMark );
-  ins_pipe( pipe_cmov_reg_long );
-%}
-
-instruct cmovLL_reg_LTGE_U(cmpOpU cmp, flagsReg_ulong_LTGE flags, eRegL dst, eRegL src) %{
-  match(Set dst (CMoveL (Binary cmp flags) (Binary dst src)));
-  predicate(VM_Version::supports_cmov() && ( _kids[0]->_kids[0]->_leaf->as_Bool()->_test._test == BoolTest::lt || _kids[0]->_kids[0]->_leaf->as_Bool()->_test._test == BoolTest::ge ));
-  ins_cost(400);
-  expand %{
-    cmovLL_reg_LTGE(cmp, flags, dst, src);
-  %}
-%}
-
-instruct cmovLL_mem_LTGE_U(cmpOpU cmp, flagsReg_ulong_LTGE flags, eRegL dst, load_long_memory src) %{
-  match(Set dst (CMoveL (Binary cmp flags) (Binary dst (LoadL src))));
-  predicate(VM_Version::supports_cmov() && ( _kids[0]->_kids[0]->_leaf->as_Bool()->_test._test == BoolTest::lt || _kids[0]->_kids[0]->_leaf->as_Bool()->_test._test == BoolTest::ge ));
-  ins_cost(500);
-  expand %{
-    cmovLL_mem_LTGE(cmp, flags, dst, src);
-  %}
-%}
-
-// Compare 2 longs and CMOVE ints.
-instruct cmovII_reg_LTGE(cmpOp cmp, flagsReg_long_LTGE flags, rRegI dst, rRegI src) %{
-  predicate(VM_Version::supports_cmov() && ( _kids[0]->_kids[0]->_leaf->as_Bool()->_test._test == BoolTest::lt || _kids[0]->_kids[0]->_leaf->as_Bool()->_test._test == BoolTest::ge ));
-  match(Set dst (CMoveI (Binary cmp flags) (Binary dst src)));
-  ins_cost(200);
-  format %{ "CMOV$cmp $dst,$src" %}
-  opcode(0x0F,0x40);
-  ins_encode( enc_cmov(cmp), RegReg( dst, src ) );
-  ins_pipe( pipe_cmov_reg );
-%}
-
-instruct cmovII_mem_LTGE(cmpOp cmp, flagsReg_long_LTGE flags, rRegI dst, memory src) %{
-  predicate(VM_Version::supports_cmov() && ( _kids[0]->_kids[0]->_leaf->as_Bool()->_test._test == BoolTest::lt || _kids[0]->_kids[0]->_leaf->as_Bool()->_test._test == BoolTest::ge ));
-  match(Set dst (CMoveI (Binary cmp flags) (Binary dst (LoadI src))));
-  ins_cost(250);
-  format %{ "CMOV$cmp $dst,$src" %}
-  opcode(0x0F,0x40);
-  ins_encode( SetInstMark, enc_cmov(cmp), RegMem( dst, src ), ClearInstMark );
-  ins_pipe( pipe_cmov_mem );
-%}
-
-instruct cmovII_reg_LTGE_U(cmpOpU cmp, flagsReg_ulong_LTGE flags, rRegI dst, rRegI src) %{
-  predicate(VM_Version::supports_cmov() && ( _kids[0]->_kids[0]->_leaf->as_Bool()->_test._test == BoolTest::lt || _kids[0]->_kids[0]->_leaf->as_Bool()->_test._test == BoolTest::ge ));
-  match(Set dst (CMoveI (Binary cmp flags) (Binary dst src)));
-  ins_cost(200);
-  expand %{
-    cmovII_reg_LTGE(cmp, flags, dst, src);
-  %}
-%}
-
-instruct cmovII_mem_LTGE_U(cmpOpU cmp, flagsReg_ulong_LTGE flags, rRegI dst, memory src) %{
-  predicate(VM_Version::supports_cmov() && ( _kids[0]->_kids[0]->_leaf->as_Bool()->_test._test == BoolTest::lt || _kids[0]->_kids[0]->_leaf->as_Bool()->_test._test == BoolTest::ge ));
-  match(Set dst (CMoveI (Binary cmp flags) (Binary dst (LoadI src))));
-  ins_cost(250);
-  expand %{
-    cmovII_mem_LTGE(cmp, flags, dst, src);
-  %}
-%}
-
-// Compare 2 longs and CMOVE ptrs.
-instruct cmovPP_reg_LTGE(cmpOp cmp, flagsReg_long_LTGE flags, eRegP dst, eRegP src) %{
-  predicate(VM_Version::supports_cmov() && ( _kids[0]->_kids[0]->_leaf->as_Bool()->_test._test == BoolTest::lt || _kids[0]->_kids[0]->_leaf->as_Bool()->_test._test == BoolTest::ge ));
-  match(Set dst (CMoveP (Binary cmp flags) (Binary dst src)));
-  ins_cost(200);
-  format %{ "CMOV$cmp $dst,$src" %}
-  opcode(0x0F,0x40);
-  ins_encode( enc_cmov(cmp), RegReg( dst, src ) );
-  ins_pipe( pipe_cmov_reg );
-%}
-
-// Compare 2 unsigned longs and CMOVE ptrs.
-instruct cmovPP_reg_LTGE_U(cmpOpU cmp, flagsReg_ulong_LTGE flags, eRegP dst, eRegP src) %{
-  predicate(VM_Version::supports_cmov() && ( _kids[0]->_kids[0]->_leaf->as_Bool()->_test._test == BoolTest::lt || _kids[0]->_kids[0]->_leaf->as_Bool()->_test._test == BoolTest::ge ));
-  match(Set dst (CMoveP (Binary cmp flags) (Binary dst src)));
-  ins_cost(200);
-  expand %{
-    cmovPP_reg_LTGE(cmp,flags,dst,src);
-  %}
-%}
-
-// Compare 2 longs and CMOVE doubles
-instruct cmovDDPR_reg_LTGE(cmpOp cmp, flagsReg_long_LTGE flags, regDPR dst, regDPR src) %{
-  predicate( UseSSE<=1 && ( _kids[0]->_kids[0]->_leaf->as_Bool()->_test._test == BoolTest::lt || _kids[0]->_kids[0]->_leaf->as_Bool()->_test._test == BoolTest::ge ));
-  match(Set dst (CMoveD (Binary cmp flags) (Binary dst src)));
-  ins_cost(200);
-  expand %{
-    fcmovDPR_regS(cmp,flags,dst,src);
-  %}
-%}
-
-// Compare 2 longs and CMOVE doubles
-instruct cmovDD_reg_LTGE(cmpOp cmp, flagsReg_long_LTGE flags, regD dst, regD src) %{
-  predicate( UseSSE>=2 && ( _kids[0]->_kids[0]->_leaf->as_Bool()->_test._test == BoolTest::lt || _kids[0]->_kids[0]->_leaf->as_Bool()->_test._test == BoolTest::ge ));
-  match(Set dst (CMoveD (Binary cmp flags) (Binary dst src)));
-  ins_cost(200);
-  expand %{
-    fcmovD_regS(cmp,flags,dst,src);
-  %}
-%}
-
-instruct cmovFFPR_reg_LTGE(cmpOp cmp, flagsReg_long_LTGE flags, regFPR dst, regFPR src) %{
-  predicate( UseSSE==0 && ( _kids[0]->_kids[0]->_leaf->as_Bool()->_test._test == BoolTest::lt || _kids[0]->_kids[0]->_leaf->as_Bool()->_test._test == BoolTest::ge ));
-  match(Set dst (CMoveF (Binary cmp flags) (Binary dst src)));
-  ins_cost(200);
-  expand %{
-    fcmovFPR_regS(cmp,flags,dst,src);
-  %}
-%}
-
-instruct cmovFF_reg_LTGE(cmpOp cmp, flagsReg_long_LTGE flags, regF dst, regF src) %{
-  predicate( UseSSE>=1 && ( _kids[0]->_kids[0]->_leaf->as_Bool()->_test._test == BoolTest::lt || _kids[0]->_kids[0]->_leaf->as_Bool()->_test._test == BoolTest::ge ));
-  match(Set dst (CMoveF (Binary cmp flags) (Binary dst src)));
-  ins_cost(200);
-  expand %{
-    fcmovF_regS(cmp,flags,dst,src);
-  %}
-%}
-
-//======
-// Manifest a CmpL result in the normal flags.  Only good for EQ/NE compares.
-instruct cmpL_zero_flags_EQNE( flagsReg_long_EQNE flags, eRegL src, immL0 zero, rRegI tmp ) %{
-  match( Set flags (CmpL src zero ));
-  effect(TEMP tmp);
-  ins_cost(200);
-  format %{ "MOV    $tmp,$src.lo\n\t"
-            "OR     $tmp,$src.hi\t! Long is EQ/NE 0?" %}
-  ins_encode( long_cmp_flags0( src, tmp ) );
-  ins_pipe( ialu_reg_reg_long );
-%}
-
-// Manifest a CmpL result in the normal flags.  Only good for EQ/NE compares.
-instruct cmpL_reg_flags_EQNE( flagsReg_long_EQNE flags, eRegL src1, eRegL src2 ) %{
-  match( Set flags (CmpL src1 src2 ));
-  ins_cost(200+300);
-  format %{ "CMP    $src1.lo,$src2.lo\t! Long compare; set flags for low bits\n\t"
-            "JNE,s  skip\n\t"
-            "CMP    $src1.hi,$src2.hi\n\t"
-     "skip:\t" %}
-  ins_encode( long_cmp_flags1( src1, src2 ) );
-  ins_pipe( ialu_cr_reg_reg );
-%}
-
-// Long compare reg == zero/reg OR reg != zero/reg
-// Just a wrapper for a normal branch, plus the predicate test.
-instruct cmpL_EQNE(cmpOp cmp, flagsReg_long_EQNE flags, label labl) %{
-  match(If cmp flags);
-  effect(USE labl);
-  predicate( _kids[0]->_leaf->as_Bool()->_test._test == BoolTest::eq || _kids[0]->_leaf->as_Bool()->_test._test == BoolTest::ne );
-  expand %{
-    jmpCon(cmp,flags,labl);    // JEQ or JNE...
-  %}
-%}
-
-//======
-// Manifest a CmpUL result in the normal flags.  Only good for EQ/NE compares.
-instruct cmpUL_zero_flags_EQNE(flagsReg_ulong_EQNE flags, eRegL src, immL0 zero, rRegI tmp) %{
-  match(Set flags (CmpUL src zero));
-  effect(TEMP tmp);
-  ins_cost(200);
-  format %{ "MOV    $tmp,$src.lo\n\t"
-            "OR     $tmp,$src.hi\t! Unsigned long is EQ/NE 0?" %}
-  ins_encode(long_cmp_flags0(src, tmp));
-  ins_pipe(ialu_reg_reg_long);
-%}
-
-// Manifest a CmpUL result in the normal flags.  Only good for EQ/NE compares.
-instruct cmpUL_reg_flags_EQNE(flagsReg_ulong_EQNE flags, eRegL src1, eRegL src2) %{
-  match(Set flags (CmpUL src1 src2));
-  ins_cost(200+300);
-  format %{ "CMP    $src1.lo,$src2.lo\t! Unsigned long compare; set flags for low bits\n\t"
-            "JNE,s  skip\n\t"
-            "CMP    $src1.hi,$src2.hi\n\t"
-     "skip:\t" %}
-  ins_encode(long_cmp_flags1(src1, src2));
-  ins_pipe(ialu_cr_reg_reg);
-%}
-
-// Unsigned long compare reg == zero/reg OR reg != zero/reg
-// Just a wrapper for a normal branch, plus the predicate test.
-instruct cmpUL_EQNE(cmpOpU cmp, flagsReg_ulong_EQNE flags, label labl) %{
-  match(If cmp flags);
-  effect(USE labl);
-  predicate(_kids[0]->_leaf->as_Bool()->_test._test == BoolTest::eq || _kids[0]->_leaf->as_Bool()->_test._test == BoolTest::ne);
-  expand %{
-    jmpCon(cmp, flags, labl);    // JEQ or JNE...
-  %}
-%}
-
-// Compare 2 longs and CMOVE longs.
-instruct cmovLL_reg_EQNE(cmpOp cmp, flagsReg_long_EQNE flags, eRegL dst, eRegL src) %{
-  match(Set dst (CMoveL (Binary cmp flags) (Binary dst src)));
-  predicate(VM_Version::supports_cmov() && ( _kids[0]->_kids[0]->_leaf->as_Bool()->_test._test == BoolTest::eq || _kids[0]->_kids[0]->_leaf->as_Bool()->_test._test == BoolTest::ne ));
-  ins_cost(400);
-  format %{ "CMOV$cmp $dst.lo,$src.lo\n\t"
-            "CMOV$cmp $dst.hi,$src.hi" %}
-  opcode(0x0F,0x40);
-  ins_encode( enc_cmov(cmp), RegReg_Lo2( dst, src ), enc_cmov(cmp), RegReg_Hi2( dst, src ) );
-  ins_pipe( pipe_cmov_reg_long );
-%}
-
-instruct cmovLL_mem_EQNE(cmpOp cmp, flagsReg_long_EQNE flags, eRegL dst, load_long_memory src) %{
-  match(Set dst (CMoveL (Binary cmp flags) (Binary dst (LoadL src))));
-  predicate(VM_Version::supports_cmov() && ( _kids[0]->_kids[0]->_leaf->as_Bool()->_test._test == BoolTest::eq || _kids[0]->_kids[0]->_leaf->as_Bool()->_test._test == BoolTest::ne ));
-  ins_cost(500);
-  format %{ "CMOV$cmp $dst.lo,$src.lo\n\t"
-            "CMOV$cmp $dst.hi,$src.hi" %}
-  opcode(0x0F,0x40);
-  ins_encode( SetInstMark, enc_cmov(cmp), RegMem(dst, src), enc_cmov(cmp), RegMem_Hi(dst, src), ClearInstMark );
-  ins_pipe( pipe_cmov_reg_long );
-%}
-
-// Compare 2 longs and CMOVE ints.
-instruct cmovII_reg_EQNE(cmpOp cmp, flagsReg_long_EQNE flags, rRegI dst, rRegI src) %{
-  predicate(VM_Version::supports_cmov() && ( _kids[0]->_kids[0]->_leaf->as_Bool()->_test._test == BoolTest::eq || _kids[0]->_kids[0]->_leaf->as_Bool()->_test._test == BoolTest::ne ));
-  match(Set dst (CMoveI (Binary cmp flags) (Binary dst src)));
-  ins_cost(200);
-  format %{ "CMOV$cmp $dst,$src" %}
-  opcode(0x0F,0x40);
-  ins_encode( enc_cmov(cmp), RegReg( dst, src ) );
-  ins_pipe( pipe_cmov_reg );
-%}
-
-instruct cmovII_mem_EQNE(cmpOp cmp, flagsReg_long_EQNE flags, rRegI dst, memory src) %{
-  predicate(VM_Version::supports_cmov() && ( _kids[0]->_kids[0]->_leaf->as_Bool()->_test._test == BoolTest::eq || _kids[0]->_kids[0]->_leaf->as_Bool()->_test._test == BoolTest::ne ));
-  match(Set dst (CMoveI (Binary cmp flags) (Binary dst (LoadI src))));
-  ins_cost(250);
-  format %{ "CMOV$cmp $dst,$src" %}
-  opcode(0x0F,0x40);
-  ins_encode( SetInstMark, enc_cmov(cmp), RegMem( dst, src ), ClearInstMark );
-  ins_pipe( pipe_cmov_mem );
-%}
-
-instruct cmovII_reg_EQNE_U(cmpOpU cmp, flagsReg_ulong_EQNE flags, rRegI dst, rRegI src) %{
-  predicate(VM_Version::supports_cmov() && ( _kids[0]->_kids[0]->_leaf->as_Bool()->_test._test == BoolTest::eq || _kids[0]->_kids[0]->_leaf->as_Bool()->_test._test == BoolTest::ne ));
-  match(Set dst (CMoveI (Binary cmp flags) (Binary dst src)));
-  ins_cost(200);
-  expand %{
-    cmovII_reg_EQNE(cmp, flags, dst, src);
-  %}
-%}
-
-instruct cmovII_mem_EQNE_U(cmpOpU cmp, flagsReg_ulong_EQNE flags, rRegI dst, memory src) %{
-  predicate(VM_Version::supports_cmov() && ( _kids[0]->_kids[0]->_leaf->as_Bool()->_test._test == BoolTest::eq || _kids[0]->_kids[0]->_leaf->as_Bool()->_test._test == BoolTest::ne ));
-  match(Set dst (CMoveI (Binary cmp flags) (Binary dst (LoadI src))));
-  ins_cost(250);
-  expand %{
-    cmovII_mem_EQNE(cmp, flags, dst, src);
-  %}
-%}
-
-// Compare 2 longs and CMOVE ptrs.
-instruct cmovPP_reg_EQNE(cmpOp cmp, flagsReg_long_EQNE flags, eRegP dst, eRegP src) %{
-  predicate(VM_Version::supports_cmov() && ( _kids[0]->_kids[0]->_leaf->as_Bool()->_test._test == BoolTest::eq || _kids[0]->_kids[0]->_leaf->as_Bool()->_test._test == BoolTest::ne ));
-  match(Set dst (CMoveP (Binary cmp flags) (Binary dst src)));
-  ins_cost(200);
-  format %{ "CMOV$cmp $dst,$src" %}
-  opcode(0x0F,0x40);
-  ins_encode( enc_cmov(cmp), RegReg( dst, src ) );
-  ins_pipe( pipe_cmov_reg );
-%}
-
-// Compare 2 unsigned longs and CMOVE ptrs.
-instruct cmovPP_reg_EQNE_U(cmpOpU cmp, flagsReg_ulong_EQNE flags, eRegP dst, eRegP src) %{
-  predicate(VM_Version::supports_cmov() && ( _kids[0]->_kids[0]->_leaf->as_Bool()->_test._test == BoolTest::eq || _kids[0]->_kids[0]->_leaf->as_Bool()->_test._test == BoolTest::ne ));
-  match(Set dst (CMoveP (Binary cmp flags) (Binary dst src)));
-  ins_cost(200);
-  expand %{
-    cmovPP_reg_EQNE(cmp,flags,dst,src);
-  %}
-%}
-
-// Compare 2 longs and CMOVE doubles
-instruct cmovDDPR_reg_EQNE(cmpOp cmp, flagsReg_long_EQNE flags, regDPR dst, regDPR src) %{
-  predicate( UseSSE<=1 && ( _kids[0]->_kids[0]->_leaf->as_Bool()->_test._test == BoolTest::eq || _kids[0]->_kids[0]->_leaf->as_Bool()->_test._test == BoolTest::ne ));
-  match(Set dst (CMoveD (Binary cmp flags) (Binary dst src)));
-  ins_cost(200);
-  expand %{
-    fcmovDPR_regS(cmp,flags,dst,src);
-  %}
-%}
-
-// Compare 2 longs and CMOVE doubles
-instruct cmovDD_reg_EQNE(cmpOp cmp, flagsReg_long_EQNE flags, regD dst, regD src) %{
-  predicate( UseSSE>=2 && ( _kids[0]->_kids[0]->_leaf->as_Bool()->_test._test == BoolTest::eq || _kids[0]->_kids[0]->_leaf->as_Bool()->_test._test == BoolTest::ne ));
-  match(Set dst (CMoveD (Binary cmp flags) (Binary dst src)));
-  ins_cost(200);
-  expand %{
-    fcmovD_regS(cmp,flags,dst,src);
-  %}
-%}
-
-instruct cmovFFPR_reg_EQNE(cmpOp cmp, flagsReg_long_EQNE flags, regFPR dst, regFPR src) %{
-  predicate( UseSSE==0 && ( _kids[0]->_kids[0]->_leaf->as_Bool()->_test._test == BoolTest::eq || _kids[0]->_kids[0]->_leaf->as_Bool()->_test._test == BoolTest::ne ));
-  match(Set dst (CMoveF (Binary cmp flags) (Binary dst src)));
-  ins_cost(200);
-  expand %{
-    fcmovFPR_regS(cmp,flags,dst,src);
-  %}
-%}
-
-instruct cmovFF_reg_EQNE(cmpOp cmp, flagsReg_long_EQNE flags, regF dst, regF src) %{
-  predicate( UseSSE>=1 && ( _kids[0]->_kids[0]->_leaf->as_Bool()->_test._test == BoolTest::eq || _kids[0]->_kids[0]->_leaf->as_Bool()->_test._test == BoolTest::ne ));
-  match(Set dst (CMoveF (Binary cmp flags) (Binary dst src)));
-  ins_cost(200);
-  expand %{
-    fcmovF_regS(cmp,flags,dst,src);
-  %}
-%}
-
-//======
-// Manifest a CmpL result in the normal flags.  Only good for LE or GT compares.
-// Same as cmpL_reg_flags_LEGT except must negate src
-instruct cmpL_zero_flags_LEGT( flagsReg_long_LEGT flags, eRegL src, immL0 zero, rRegI tmp ) %{
-  match( Set flags (CmpL src zero ));
-  effect( TEMP tmp );
-  ins_cost(300);
-  format %{ "XOR    $tmp,$tmp\t# Long compare for -$src < 0, use commuted test\n\t"
-            "CMP    $tmp,$src.lo\n\t"
-            "SBB    $tmp,$src.hi\n\t" %}
-  ins_encode( long_cmp_flags3(src, tmp) );
-  ins_pipe( ialu_reg_reg_long );
-%}
-
-// Manifest a CmpL result in the normal flags.  Only good for LE or GT compares.
-// Same as cmpL_reg_flags_LTGE except operands swapped.  Swapping operands
-// requires a commuted test to get the same result.
-instruct cmpL_reg_flags_LEGT( flagsReg_long_LEGT flags, eRegL src1, eRegL src2, rRegI tmp ) %{
-  match( Set flags (CmpL src1 src2 ));
-  effect( TEMP tmp );
-  ins_cost(300);
-  format %{ "CMP    $src2.lo,$src1.lo\t! Long compare, swapped operands, use with commuted test\n\t"
-            "MOV    $tmp,$src2.hi\n\t"
-            "SBB    $tmp,$src1.hi\t! Compute flags for long compare" %}
-  ins_encode( long_cmp_flags2( src2, src1, tmp ) );
-  ins_pipe( ialu_cr_reg_reg );
-%}
-
-// Long compares reg < zero/req OR reg >= zero/req.
-// Just a wrapper for a normal branch, plus the predicate test
-instruct cmpL_LEGT(cmpOp_commute cmp, flagsReg_long_LEGT flags, label labl) %{
-  match(If cmp flags);
-  effect(USE labl);
-  predicate( _kids[0]->_leaf->as_Bool()->_test._test == BoolTest::gt || _kids[0]->_leaf->as_Bool()->_test._test == BoolTest::le );
-  ins_cost(300);
-  expand %{
-    jmpCon(cmp,flags,labl);    // JGT or JLE...
-  %}
-%}
-
-//======
-// Manifest a CmpUL result in the normal flags.  Only good for LE or GT compares.
-// Same as cmpUL_reg_flags_LEGT except must negate src
-instruct cmpUL_zero_flags_LEGT(flagsReg_ulong_LEGT flags, eRegL src, immL0 zero, rRegI tmp) %{
-  match(Set flags (CmpUL src zero));
-  effect(TEMP tmp);
-  ins_cost(300);
-  format %{ "XOR    $tmp,$tmp\t# Unsigned long compare for -$src < 0, use commuted test\n\t"
-            "CMP    $tmp,$src.lo\n\t"
-            "SBB    $tmp,$src.hi\n\t" %}
-  ins_encode(long_cmp_flags3(src, tmp));
-  ins_pipe(ialu_reg_reg_long);
-%}
-
-// Manifest a CmpUL result in the normal flags.  Only good for LE or GT compares.
-// Same as cmpUL_reg_flags_LTGE except operands swapped.  Swapping operands
-// requires a commuted test to get the same result.
-instruct cmpUL_reg_flags_LEGT(flagsReg_ulong_LEGT flags, eRegL src1, eRegL src2, rRegI tmp) %{
-  match(Set flags (CmpUL src1 src2));
-  effect(TEMP tmp);
-  ins_cost(300);
-  format %{ "CMP    $src2.lo,$src1.lo\t! Unsigned long compare, swapped operands, use with commuted test\n\t"
-            "MOV    $tmp,$src2.hi\n\t"
-            "SBB    $tmp,$src1.hi\t! Compute flags for unsigned long compare" %}
-  ins_encode(long_cmp_flags2( src2, src1, tmp));
-  ins_pipe(ialu_cr_reg_reg);
-%}
-
-// Unsigned long compares reg < zero/req OR reg >= zero/req.
-// Just a wrapper for a normal branch, plus the predicate test
-instruct cmpUL_LEGT(cmpOpU_commute cmp, flagsReg_ulong_LEGT flags, label labl) %{
-  match(If cmp flags);
-  effect(USE labl);
-  predicate(_kids[0]->_leaf->as_Bool()->_test._test == BoolTest::gt || _kids[0]->_leaf->as_Bool()->_test._test == BoolTest::le);
-  ins_cost(300);
-  expand %{
-    jmpCon(cmp, flags, labl);    // JGT or JLE...
-  %}
-%}
-
-// Compare 2 longs and CMOVE longs.
-instruct cmovLL_reg_LEGT(cmpOp_commute cmp, flagsReg_long_LEGT flags, eRegL dst, eRegL src) %{
-  match(Set dst (CMoveL (Binary cmp flags) (Binary dst src)));
-  predicate(VM_Version::supports_cmov() && ( _kids[0]->_kids[0]->_leaf->as_Bool()->_test._test == BoolTest::le || _kids[0]->_kids[0]->_leaf->as_Bool()->_test._test == BoolTest::gt ));
-  ins_cost(400);
-  format %{ "CMOV$cmp $dst.lo,$src.lo\n\t"
-            "CMOV$cmp $dst.hi,$src.hi" %}
-  opcode(0x0F,0x40);
-  ins_encode( enc_cmov(cmp), RegReg_Lo2( dst, src ), enc_cmov(cmp), RegReg_Hi2( dst, src ) );
-  ins_pipe( pipe_cmov_reg_long );
-%}
-
-instruct cmovLL_mem_LEGT(cmpOp_commute cmp, flagsReg_long_LEGT flags, eRegL dst, load_long_memory src) %{
-  match(Set dst (CMoveL (Binary cmp flags) (Binary dst (LoadL src))));
-  predicate(VM_Version::supports_cmov() && ( _kids[0]->_kids[0]->_leaf->as_Bool()->_test._test == BoolTest::le || _kids[0]->_kids[0]->_leaf->as_Bool()->_test._test == BoolTest::gt ));
-  ins_cost(500);
-  format %{ "CMOV$cmp $dst.lo,$src.lo\n\t"
-            "CMOV$cmp $dst.hi,$src.hi+4" %}
-  opcode(0x0F,0x40);
-  ins_encode( SetInstMark, enc_cmov(cmp), RegMem(dst, src), enc_cmov(cmp), RegMem_Hi(dst, src), ClearInstMark );
-  ins_pipe( pipe_cmov_reg_long );
-%}
-
-instruct cmovLL_reg_LEGT_U(cmpOpU_commute cmp, flagsReg_ulong_LEGT flags, eRegL dst, eRegL src) %{
-  match(Set dst (CMoveL (Binary cmp flags) (Binary dst src)));
-  predicate(VM_Version::supports_cmov() && ( _kids[0]->_kids[0]->_leaf->as_Bool()->_test._test == BoolTest::le || _kids[0]->_kids[0]->_leaf->as_Bool()->_test._test == BoolTest::gt ));
-  ins_cost(400);
-  expand %{
-    cmovLL_reg_LEGT(cmp, flags, dst, src);
-  %}
-%}
-
-instruct cmovLL_mem_LEGT_U(cmpOpU_commute cmp, flagsReg_ulong_LEGT flags, eRegL dst, load_long_memory src) %{
-  match(Set dst (CMoveL (Binary cmp flags) (Binary dst (LoadL src))));
-  predicate(VM_Version::supports_cmov() && ( _kids[0]->_kids[0]->_leaf->as_Bool()->_test._test == BoolTest::le || _kids[0]->_kids[0]->_leaf->as_Bool()->_test._test == BoolTest::gt ));
-  ins_cost(500);
-  expand %{
-    cmovLL_mem_LEGT(cmp, flags, dst, src);
-  %}
-%}
-
-// Compare 2 longs and CMOVE ints.
-instruct cmovII_reg_LEGT(cmpOp_commute cmp, flagsReg_long_LEGT flags, rRegI dst, rRegI src) %{
-  predicate(VM_Version::supports_cmov() && ( _kids[0]->_kids[0]->_leaf->as_Bool()->_test._test == BoolTest::le || _kids[0]->_kids[0]->_leaf->as_Bool()->_test._test == BoolTest::gt ));
-  match(Set dst (CMoveI (Binary cmp flags) (Binary dst src)));
-  ins_cost(200);
-  format %{ "CMOV$cmp $dst,$src" %}
-  opcode(0x0F,0x40);
-  ins_encode( enc_cmov(cmp), RegReg( dst, src ) );
-  ins_pipe( pipe_cmov_reg );
-%}
-
-instruct cmovII_mem_LEGT(cmpOp_commute cmp, flagsReg_long_LEGT flags, rRegI dst, memory src) %{
-  predicate(VM_Version::supports_cmov() && ( _kids[0]->_kids[0]->_leaf->as_Bool()->_test._test == BoolTest::le || _kids[0]->_kids[0]->_leaf->as_Bool()->_test._test == BoolTest::gt ));
-  match(Set dst (CMoveI (Binary cmp flags) (Binary dst (LoadI src))));
-  ins_cost(250);
-  format %{ "CMOV$cmp $dst,$src" %}
-  opcode(0x0F,0x40);
-  ins_encode( SetInstMark, enc_cmov(cmp), RegMem( dst, src ), ClearInstMark );
-  ins_pipe( pipe_cmov_mem );
-%}
-
-instruct cmovII_reg_LEGT_U(cmpOpU_commute cmp, flagsReg_ulong_LEGT flags, rRegI dst, rRegI src) %{
-  predicate(VM_Version::supports_cmov() && ( _kids[0]->_kids[0]->_leaf->as_Bool()->_test._test == BoolTest::le || _kids[0]->_kids[0]->_leaf->as_Bool()->_test._test == BoolTest::gt ));
-  match(Set dst (CMoveI (Binary cmp flags) (Binary dst src)));
-  ins_cost(200);
-  expand %{
-    cmovII_reg_LEGT(cmp, flags, dst, src);
-  %}
-%}
-
-instruct cmovII_mem_LEGT_U(cmpOpU_commute cmp, flagsReg_ulong_LEGT flags, rRegI dst, memory src) %{
-  predicate(VM_Version::supports_cmov() && ( _kids[0]->_kids[0]->_leaf->as_Bool()->_test._test == BoolTest::le || _kids[0]->_kids[0]->_leaf->as_Bool()->_test._test == BoolTest::gt ));
-  match(Set dst (CMoveI (Binary cmp flags) (Binary dst (LoadI src))));
-  ins_cost(250);
-  expand %{
-    cmovII_mem_LEGT(cmp, flags, dst, src);
-  %}
-%}
-
-// Compare 2 longs and CMOVE ptrs.
-instruct cmovPP_reg_LEGT(cmpOp_commute cmp, flagsReg_long_LEGT flags, eRegP dst, eRegP src) %{
-  predicate(VM_Version::supports_cmov() && ( _kids[0]->_kids[0]->_leaf->as_Bool()->_test._test == BoolTest::le || _kids[0]->_kids[0]->_leaf->as_Bool()->_test._test == BoolTest::gt ));
-  match(Set dst (CMoveP (Binary cmp flags) (Binary dst src)));
-  ins_cost(200);
-  format %{ "CMOV$cmp $dst,$src" %}
-  opcode(0x0F,0x40);
-  ins_encode( enc_cmov(cmp), RegReg( dst, src ) );
-  ins_pipe( pipe_cmov_reg );
-%}
-
-// Compare 2 unsigned longs and CMOVE ptrs.
-instruct cmovPP_reg_LEGT_U(cmpOpU_commute cmp, flagsReg_ulong_LEGT flags, eRegP dst, eRegP src) %{
-  predicate(VM_Version::supports_cmov() && ( _kids[0]->_kids[0]->_leaf->as_Bool()->_test._test == BoolTest::le || _kids[0]->_kids[0]->_leaf->as_Bool()->_test._test == BoolTest::gt ));
-  match(Set dst (CMoveP (Binary cmp flags) (Binary dst src)));
-  ins_cost(200);
-  expand %{
-    cmovPP_reg_LEGT(cmp,flags,dst,src);
-  %}
-%}
-
-// Compare 2 longs and CMOVE doubles
-instruct cmovDDPR_reg_LEGT(cmpOp_commute cmp, flagsReg_long_LEGT flags, regDPR dst, regDPR src) %{
-  predicate( UseSSE<=1 && ( _kids[0]->_kids[0]->_leaf->as_Bool()->_test._test == BoolTest::le || _kids[0]->_kids[0]->_leaf->as_Bool()->_test._test == BoolTest::gt ));
-  match(Set dst (CMoveD (Binary cmp flags) (Binary dst src)));
-  ins_cost(200);
-  expand %{
-    fcmovDPR_regS(cmp,flags,dst,src);
-  %}
-%}
-
-// Compare 2 longs and CMOVE doubles
-instruct cmovDD_reg_LEGT(cmpOp_commute cmp, flagsReg_long_LEGT flags, regD dst, regD src) %{
-  predicate( UseSSE>=2 && ( _kids[0]->_kids[0]->_leaf->as_Bool()->_test._test == BoolTest::le || _kids[0]->_kids[0]->_leaf->as_Bool()->_test._test == BoolTest::gt ));
-  match(Set dst (CMoveD (Binary cmp flags) (Binary dst src)));
-  ins_cost(200);
-  expand %{
-    fcmovD_regS(cmp,flags,dst,src);
-  %}
-%}
-
-instruct cmovFFPR_reg_LEGT(cmpOp_commute cmp, flagsReg_long_LEGT flags, regFPR dst, regFPR src) %{
-  predicate( UseSSE==0 && ( _kids[0]->_kids[0]->_leaf->as_Bool()->_test._test == BoolTest::le || _kids[0]->_kids[0]->_leaf->as_Bool()->_test._test == BoolTest::gt ));
-  match(Set dst (CMoveF (Binary cmp flags) (Binary dst src)));
-  ins_cost(200);
-  expand %{
-    fcmovFPR_regS(cmp,flags,dst,src);
-  %}
-%}
-
-
-instruct cmovFF_reg_LEGT(cmpOp_commute cmp, flagsReg_long_LEGT flags, regF dst, regF src) %{
-  predicate( UseSSE>=1 && ( _kids[0]->_kids[0]->_leaf->as_Bool()->_test._test == BoolTest::le || _kids[0]->_kids[0]->_leaf->as_Bool()->_test._test == BoolTest::gt ));
-  match(Set dst (CMoveF (Binary cmp flags) (Binary dst src)));
-  ins_cost(200);
-  expand %{
-    fcmovF_regS(cmp,flags,dst,src);
-  %}
-%}
-
-
-// ============================================================================
-// Procedure Call/Return Instructions
-// Call Java Static Instruction
-// Note: If this code changes, the corresponding ret_addr_offset() and
-//       compute_padding() functions will have to be adjusted.
-instruct CallStaticJavaDirect(method meth) %{
-  match(CallStaticJava);
-  effect(USE meth);
-
-  ins_cost(300);
-  format %{ "CALL,static " %}
-  opcode(0xE8); /* E8 cd */
-  ins_encode( pre_call_resets,
-              Java_Static_Call( meth ),
-              call_epilog,
-              post_call_FPU );
-  ins_pipe( pipe_slow );
-  ins_alignment(4);
-%}
-
-// Call Java Dynamic Instruction
-// Note: If this code changes, the corresponding ret_addr_offset() and
-//       compute_padding() functions will have to be adjusted.
-instruct CallDynamicJavaDirect(method meth) %{
-  match(CallDynamicJava);
-  effect(USE meth);
-
-  ins_cost(300);
-  format %{ "MOV    EAX,(oop)-1\n\t"
-            "CALL,dynamic" %}
-  opcode(0xE8); /* E8 cd */
-  ins_encode( pre_call_resets,
-              Java_Dynamic_Call( meth ),
-              call_epilog,
-              post_call_FPU );
-  ins_pipe( pipe_slow );
-  ins_alignment(4);
-%}
-
-// Call Runtime Instruction
-instruct CallRuntimeDirect(method meth) %{
-  match(CallRuntime );
-  effect(USE meth);
-
-  ins_cost(300);
-  format %{ "CALL,runtime " %}
-  opcode(0xE8); /* E8 cd */
-  // Use FFREEs to clear entries in float stack
-  ins_encode( pre_call_resets,
-              FFree_Float_Stack_All,
-              Java_To_Runtime( meth ),
-              post_call_FPU );
-  ins_pipe( pipe_slow );
-%}
-
-// Call runtime without safepoint
-instruct CallLeafDirect(method meth) %{
-  match(CallLeaf);
-  effect(USE meth);
-
-  ins_cost(300);
-  format %{ "CALL_LEAF,runtime " %}
-  opcode(0xE8); /* E8 cd */
-  ins_encode( pre_call_resets,
-              FFree_Float_Stack_All,
-              Java_To_Runtime( meth ),
-              Verify_FPU_For_Leaf, post_call_FPU );
-  ins_pipe( pipe_slow );
-%}
-
-instruct CallLeafNoFPDirect(method meth) %{
-  match(CallLeafNoFP);
-  effect(USE meth);
-
-  ins_cost(300);
-  format %{ "CALL_LEAF_NOFP,runtime " %}
-  opcode(0xE8); /* E8 cd */
-  ins_encode(pre_call_resets, Java_To_Runtime(meth));
-  ins_pipe( pipe_slow );
-%}
-
-
-// Return Instruction
-// Remove the return address & jump to it.
-instruct Ret() %{
-  match(Return);
-  format %{ "RET" %}
-  opcode(0xC3);
-  ins_encode(OpcP);
-  ins_pipe( pipe_jmp );
-%}
-
-// Tail Call; Jump from runtime stub to Java code.
-// Also known as an 'interprocedural jump'.
-// Target of jump will eventually return to caller.
-// TailJump below removes the return address.
-// Don't use ebp for 'jump_target' because a MachEpilogNode has already been
-// emitted just above the TailCall which has reset ebp to the caller state.
-instruct TailCalljmpInd(eRegP_no_EBP jump_target, eBXRegP method_ptr) %{
-  match(TailCall jump_target method_ptr);
-  ins_cost(300);
-  format %{ "JMP    $jump_target \t# EBX holds method" %}
-  opcode(0xFF, 0x4);  /* Opcode FF /4 */
-  ins_encode( OpcP, RegOpc(jump_target) );
-  ins_pipe( pipe_jmp );
-%}
-
-
-// Tail Jump; remove the return address; jump to target.
-// TailCall above leaves the return address around.
-instruct tailjmpInd(eRegP_no_EBP jump_target, eAXRegP ex_oop) %{
-  match( TailJump jump_target ex_oop );
-  ins_cost(300);
-  format %{ "POP    EDX\t# pop return address into dummy\n\t"
-            "JMP    $jump_target " %}
-  opcode(0xFF, 0x4);  /* Opcode FF /4 */
-  ins_encode( enc_pop_rdx,
-              OpcP, RegOpc(jump_target) );
-  ins_pipe( pipe_jmp );
-%}
-
-// Forward exception.
-instruct ForwardExceptionjmp()
-%{
-  match(ForwardException);
-
-  format %{ "JMP    forward_exception_stub" %}
-  ins_encode %{
-    __ jump(RuntimeAddress(StubRoutines::forward_exception_entry()), noreg);
-  %}
-  ins_pipe(pipe_jmp);
-%}
-
-// Create exception oop: created by stack-crawling runtime code.
-// Created exception is now available to this handler, and is setup
-// just prior to jumping to this handler.  No code emitted.
-instruct CreateException( eAXRegP ex_oop )
-%{
-  match(Set ex_oop (CreateEx));
-
-  size(0);
-  // use the following format syntax
-  format %{ "# exception oop is in EAX; no code emitted" %}
-  ins_encode();
-  ins_pipe( empty );
-%}
-
-
-// Rethrow exception:
-// The exception oop will come in the first argument position.
-// Then JUMP (not call) to the rethrow stub code.
-instruct RethrowException()
-%{
-  match(Rethrow);
-
-  // use the following format syntax
-  format %{ "JMP    rethrow_stub" %}
-  ins_encode(enc_rethrow);
-  ins_pipe( pipe_jmp );
-%}
-
-// inlined locking and unlocking
-
-instruct cmpFastLock(eFlagsReg cr, eRegP object, eBXRegP box, eAXRegI tmp, eRegP scr, eRegP thread) %{
-  predicate(LockingMode != LM_LIGHTWEIGHT);
-  match(Set cr (FastLock object box));
-  effect(TEMP tmp, TEMP scr, USE_KILL box, TEMP thread);
-  ins_cost(300);
-  format %{ "FASTLOCK $object,$box\t! kills $box,$tmp,$scr" %}
-  ins_encode %{
-    __ get_thread($thread$$Register);
-    __ fast_lock($object$$Register, $box$$Register, $tmp$$Register,
-                 $scr$$Register, noreg, noreg, $thread$$Register, nullptr);
-  %}
-  ins_pipe(pipe_slow);
-%}
-
-instruct cmpFastUnlock(eFlagsReg cr, eRegP object, eAXRegP box, eRegP tmp ) %{
-  predicate(LockingMode != LM_LIGHTWEIGHT);
-  match(Set cr (FastUnlock object box));
-  effect(TEMP tmp, USE_KILL box);
-  ins_cost(300);
-  format %{ "FASTUNLOCK $object,$box\t! kills $box,$tmp" %}
-  ins_encode %{
-    __ fast_unlock($object$$Register, $box$$Register, $tmp$$Register);
-  %}
-  ins_pipe(pipe_slow);
-%}
-
-instruct cmpFastLockLightweight(eFlagsReg cr, eRegP object, eBXRegP box, eAXRegI eax_reg, eRegP tmp, eRegP thread) %{
-  predicate(LockingMode == LM_LIGHTWEIGHT);
-  match(Set cr (FastLock object box));
-  effect(TEMP eax_reg, TEMP tmp, USE_KILL box, TEMP thread);
-  ins_cost(300);
-  format %{ "FASTLOCK $object,$box\t! kills $box,$eax_reg,$tmp" %}
-  ins_encode %{
-    __ get_thread($thread$$Register);
-    __ fast_lock_lightweight($object$$Register, $box$$Register, $eax_reg$$Register, $tmp$$Register, $thread$$Register);
-  %}
-  ins_pipe(pipe_slow);
-%}
-
-instruct cmpFastUnlockLightweight(eFlagsReg cr, eRegP object, eAXRegP eax_reg, eRegP tmp, eRegP thread) %{
-  predicate(LockingMode == LM_LIGHTWEIGHT);
-  match(Set cr (FastUnlock object eax_reg));
-  effect(TEMP tmp, USE_KILL eax_reg, TEMP thread);
-  ins_cost(300);
-  format %{ "FASTUNLOCK $object,$eax_reg\t! kills $eax_reg,$tmp" %}
-  ins_encode %{
-    __ get_thread($thread$$Register);
-    __ fast_unlock_lightweight($object$$Register, $eax_reg$$Register, $tmp$$Register, $thread$$Register);
-  %}
-  ins_pipe(pipe_slow);
-%}
-
-instruct mask_all_evexL_LT32(kReg dst, eRegL src) %{
-  predicate(Matcher::vector_length(n) <= 32);
-  match(Set dst (MaskAll src));
-  format %{ "mask_all_evexL_LE32 $dst, $src \t" %}
-  ins_encode %{
-    int mask_len = Matcher::vector_length(this);
-    __ vector_maskall_operation($dst$$KRegister, $src$$Register, mask_len);
-  %}
-  ins_pipe( pipe_slow );
-%}
-
-instruct mask_all_evexL_GT32(kReg dst, eRegL src, kReg ktmp) %{
-  predicate(Matcher::vector_length(n) > 32);
-  match(Set dst (MaskAll src));
-  effect(TEMP ktmp);
-  format %{ "mask_all_evexL_GT32 $dst, $src \t! using $ktmp as TEMP " %}
-  ins_encode %{
-    int mask_len = Matcher::vector_length(this);
-    __ vector_maskall_operation32($dst$$KRegister, $src$$Register, $ktmp$$KRegister, mask_len);
-  %}
-  ins_pipe( pipe_slow );
-%}
-
-instruct mask_all_evexI_GT32(kReg dst, rRegI src, kReg ktmp) %{
-  predicate(Matcher::vector_length(n) > 32);
-  match(Set dst (MaskAll src));
-  effect(TEMP ktmp);
-  format %{ "mask_all_evexI_GT32 $dst, $src \t! using $ktmp as TEMP" %}
-  ins_encode %{
-    int mask_len = Matcher::vector_length(this);
-    __ vector_maskall_operation32($dst$$KRegister, $src$$Register, $ktmp$$KRegister, mask_len);
-  %}
-  ins_pipe( pipe_slow );
-%}
-
-// ============================================================================
-// Safepoint Instruction
-instruct safePoint_poll_tls(eFlagsReg cr, eRegP_no_EBP poll) %{
-  match(SafePoint poll);
-  effect(KILL cr, USE poll);
-
-  format %{ "TSTL   #EAX,[$poll]\t! Safepoint: poll for GC" %}
-  ins_cost(125);
-  // EBP would need size(3)
-  size(2); /* setting an explicit size will cause debug builds to assert if size is incorrect */
-  ins_encode %{
-    __ set_inst_mark();
-    __ relocate(relocInfo::poll_type);
-    __ clear_inst_mark();
-    address pre_pc = __ pc();
-    __ testl(rax, Address($poll$$Register, 0));
-    address post_pc = __ pc();
-    guarantee(pre_pc[0] == 0x85, "must emit test-ax [reg]");
-  %}
-  ins_pipe(ialu_reg_mem);
-%}
-
-
-// ============================================================================
-// This name is KNOWN by the ADLC and cannot be changed.
-// The ADLC forces a 'TypeRawPtr::BOTTOM' output type
-// for this guy.
-instruct tlsLoadP(eRegP dst, eFlagsReg cr) %{
-  match(Set dst (ThreadLocal));
-  effect(DEF dst, KILL cr);
-
-  format %{ "MOV    $dst, Thread::current()" %}
-  ins_encode %{
-    Register dstReg = as_Register($dst$$reg);
-    __ get_thread(dstReg);
-  %}
-  ins_pipe( ialu_reg_fat );
-%}
-
-
-
-//----------PEEPHOLE RULES-----------------------------------------------------
-// These must follow all instruction definitions as they use the names
-// defined in the instructions definitions.
-//
-// peepmatch ( root_instr_name [preceding_instruction]* );
-//
-// peepconstraint %{
-// (instruction_number.operand_name relational_op instruction_number.operand_name
-//  [, ...] );
-// // instruction numbers are zero-based using left to right order in peepmatch
-//
-// peepreplace ( instr_name  ( [instruction_number.operand_name]* ) );
-// // provide an instruction_number.operand_name for each operand that appears
-// // in the replacement instruction's match rule
-//
-// ---------VM FLAGS---------------------------------------------------------
-//
-// All peephole optimizations can be turned off using -XX:-OptoPeephole
-//
-// Each peephole rule is given an identifying number starting with zero and
-// increasing by one in the order seen by the parser.  An individual peephole
-// can be enabled, and all others disabled, by using -XX:OptoPeepholeAt=#
-// on the command-line.
-//
-// ---------CURRENT LIMITATIONS----------------------------------------------
-//
-// Only match adjacent instructions in same basic block
-// Only equality constraints
-// Only constraints between operands, not (0.dest_reg == EAX_enc)
-// Only one replacement instruction
-//
-// ---------EXAMPLE----------------------------------------------------------
-//
-// // pertinent parts of existing instructions in architecture description
-// instruct movI(rRegI dst, rRegI src) %{
-//   match(Set dst (CopyI src));
-// %}
-//
-// instruct incI_eReg(rRegI dst, immI_1 src, eFlagsReg cr) %{
-//   match(Set dst (AddI dst src));
-//   effect(KILL cr);
-// %}
-//
-// // Change (inc mov) to lea
-// peephole %{
-//   // increment preceded by register-register move
-//   peepmatch ( incI_eReg movI );
-//   // require that the destination register of the increment
-//   // match the destination register of the move
-//   peepconstraint ( 0.dst == 1.dst );
-//   // construct a replacement instruction that sets
-//   // the destination to ( move's source register + one )
-//   peepreplace ( leaI_eReg_immI( 0.dst 1.src 0.src ) );
-// %}
-//
-// Implementation no longer uses movX instructions since
-// machine-independent system no longer uses CopyX nodes.
-//
-// peephole %{
-//   peepmatch ( incI_eReg movI );
-//   peepconstraint ( 0.dst == 1.dst );
-//   peepreplace ( leaI_eReg_immI( 0.dst 1.src 0.src ) );
-// %}
-//
-// peephole %{
-//   peepmatch ( decI_eReg movI );
-//   peepconstraint ( 0.dst == 1.dst );
-//   peepreplace ( leaI_eReg_immI( 0.dst 1.src 0.src ) );
-// %}
-//
-// peephole %{
-//   peepmatch ( addI_eReg_imm movI );
-//   peepconstraint ( 0.dst == 1.dst );
-//   peepreplace ( leaI_eReg_immI( 0.dst 1.src 0.src ) );
-// %}
-//
-// peephole %{
-//   peepmatch ( addP_eReg_imm movP );
-//   peepconstraint ( 0.dst == 1.dst );
-//   peepreplace ( leaP_eReg_immI( 0.dst 1.src 0.src ) );
-// %}
-
-// // Change load of spilled value to only a spill
-// instruct storeI(memory mem, rRegI src) %{
-//   match(Set mem (StoreI mem src));
-// %}
-//
-// instruct loadI(rRegI dst, memory mem) %{
-//   match(Set dst (LoadI mem));
-// %}
-//
-peephole %{
-  peepmatch ( loadI storeI );
-  peepconstraint ( 1.src == 0.dst, 1.mem == 0.mem );
-  peepreplace ( storeI( 1.mem 1.mem 1.src ) );
-%}
-
-//----------SMARTSPILL RULES---------------------------------------------------
-// These must follow all instruction definitions as they use the names
-// defined in the instructions definitions.
diff --git a/src/hotspot/os_cpu/bsd_x86/bsd_x86_32.S b/src/hotspot/os_cpu/bsd_x86/bsd_x86_32.S
deleted file mode 100644
index 7d8892bcd87..00000000000
--- a/src/hotspot/os_cpu/bsd_x86/bsd_x86_32.S
+++ /dev/null
@@ -1,525 +0,0 @@
-#
-# 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
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please 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 "defs.S.inc"
-
-        # NOTE WELL!  The _Copy functions are called directly
-        # from server-compiler-generated code via CallLeafNoFP,
-        # which means that they *must* either not use floating
-        # point or use it in the same manner as does the server
-        # compiler.
-
-        .text
-
-# Set fpu to 53 bit precision.  This happens too early to use a stub.
-        .p2align 4,,15
-DECLARE_FUNC(fixcw):
-        pushl    $0x27f
-        fldcw    0(%esp)
-        popl     %eax
-        ret
-
-        .p2align 4,,15
-DECLARE_FUNC(SpinPause):
-        rep
-        nop
-        movl    $1, %eax
-        ret
-
-        # Support for void Copy::arrayof_conjoint_bytes(void* from,
-        #                                               void* to,
-        #                                               size_t count)
-        #
-        .p2align 4,,15
-DECLARE_FUNC(_Copy_arrayof_conjoint_bytes):
-        pushl    %esi
-        movl     4+12(%esp),%ecx      # count
-        pushl    %edi
-        movl     8+ 4(%esp),%esi      # from
-        movl     8+ 8(%esp),%edi      # to
-        cmpl     %esi,%edi
-        leal     -1(%esi,%ecx),%eax   # from + count - 1
-        jbe      acb_CopyRight
-        cmpl     %eax,%edi
-        jbe      acb_CopyLeft
-        # copy from low to high
-acb_CopyRight:
-        cmpl     $3,%ecx
-        jbe      5f
-1:      movl     %ecx,%eax
-        shrl     $2,%ecx
-        jz       4f
-        cmpl     $32,%ecx
-        ja       3f
-        # copy aligned dwords
-        subl     %esi,%edi
-        .p2align 4,,15
-2:      movl     (%esi),%edx
-        movl     %edx,(%edi,%esi,1)
-        addl     $4,%esi
-        subl     $1,%ecx
-        jnz      2b
-        addl     %esi,%edi
-        jmp      4f
-        # copy aligned dwords
-3:      rep;     smovl
-4:      movl     %eax,%ecx
-5:      andl     $3,%ecx
-        jz       7f
-        # copy suffix
-        xorl     %eax,%eax
-6:      movb     (%esi,%eax,1),%dl
-        movb     %dl,(%edi,%eax,1)
-        addl     $1,%eax
-        subl     $1,%ecx
-        jnz      6b
-7:      popl     %edi
-        popl     %esi
-        ret
-acb_CopyLeft:
-        std
-        leal     -4(%edi,%ecx),%edi   # to + count - 4
-        movl     %eax,%esi            # from + count - 1
-        movl     %ecx,%eax
-        subl     $3,%esi              # from + count - 4
-        cmpl     $3,%ecx
-        jbe      5f
-1:      shrl     $2,%ecx
-        jz       4f
-        cmpl     $32,%ecx
-        jbe      2f                   # <= 32 dwords
-        rep;     smovl
-        jmp      4f
-        .space 8
-2:      subl     %esi,%edi
-        .p2align 4,,15
-3:      movl     (%esi),%edx
-        movl     %edx,(%edi,%esi,1)
-        subl     $4,%esi
-        subl     $1,%ecx
-        jnz      3b
-        addl     %esi,%edi
-4:      movl     %eax,%ecx
-5:      andl     $3,%ecx
-        jz       7f
-        subl     %esi,%edi
-        addl     $3,%esi
-6:      movb     (%esi),%dl
-        movb     %dl,(%edi,%esi,1)
-        subl     $1,%esi
-        subl     $1,%ecx
-        jnz      6b
-7:      cld
-        popl     %edi
-        popl     %esi
-        ret
-
-        # Support for void Copy::conjoint_jshorts_atomic(void* from,
-        #                                                void* to,
-        #                                                size_t count)
-        .p2align 4,,15
-DECLARE_FUNC(_Copy_conjoint_jshorts_atomic):
-        pushl    %esi
-        movl     4+12(%esp),%ecx      # count
-        pushl    %edi
-        movl     8+ 4(%esp),%esi      # from
-        movl     8+ 8(%esp),%edi      # to
-        cmpl     %esi,%edi
-        leal     -2(%esi,%ecx,2),%eax # from + count*2 - 2
-        jbe      cs_CopyRight
-        cmpl     %eax,%edi
-        jbe      cs_CopyLeft
-        # copy from low to high
-cs_CopyRight:
-        # align source address at dword address boundary
-        movl     %esi,%eax            # original from
-        andl     $3,%eax              # either 0 or 2
-        jz       1f                   # no prefix
-        # copy prefix
-        subl     $1,%ecx
-        jl       5f                   # zero count
-        movw     (%esi),%dx
-        movw     %dx,(%edi)
-        addl     %eax,%esi            # %eax == 2
-        addl     %eax,%edi
-1:      movl     %ecx,%eax            # word count less prefix
-        sarl     %ecx                 # dword count
-        jz       4f                   # no dwords to move
-        cmpl     $32,%ecx
-        jbe      2f                   # <= 32 dwords
-        # copy aligned dwords
-        rep;     smovl
-        jmp      4f
-        # copy aligned dwords
-2:      subl     %esi,%edi
-        .p2align 4,,15
-3:      movl     (%esi),%edx
-        movl     %edx,(%edi,%esi,1)
-        addl     $4,%esi
-        subl     $1,%ecx
-        jnz      3b
-        addl     %esi,%edi
-4:      andl     $1,%eax              # suffix count
-        jz       5f                   # no suffix
-        # copy suffix
-        movw     (%esi),%dx
-        movw     %dx,(%edi)
-5:      popl     %edi
-        popl     %esi
-        ret
-        # copy from high to low
-cs_CopyLeft:
-        std
-        leal     -4(%edi,%ecx,2),%edi # to + count*2 - 4
-        movl     %eax,%esi            # from + count*2 - 2
-        movl     %ecx,%eax
-        subl     $2,%esi              # from + count*2 - 4
-1:      sarl     %ecx                 # dword count
-        jz       4f                   # no dwords to move
-        cmpl     $32,%ecx
-        ja       3f                   # > 32 dwords
-        subl     %esi,%edi
-        .p2align 4,,15
-2:      movl     (%esi),%edx
-        movl     %edx,(%edi,%esi,1)
-        subl     $4,%esi
-        subl     $1,%ecx
-        jnz      2b
-        addl     %esi,%edi
-        jmp      4f
-3:      rep;     smovl
-4:      andl     $1,%eax              # suffix count
-        jz       5f                   # no suffix
-        # copy suffix
-        addl     $2,%esi
-        addl     $2,%edi
-        movw     (%esi),%dx
-        movw     %dx,(%edi)
-5:      cld
-        popl     %edi
-        popl     %esi
-        ret
-
-        # Support for void Copy::arrayof_conjoint_jshorts(void* from,
-        #                                                 void* to,
-        #                                                 size_t count)
-        .p2align 4,,15
-DECLARE_FUNC(_Copy_arrayof_conjoint_jshorts):
-        pushl    %esi
-        movl     4+12(%esp),%ecx      # count
-        pushl    %edi
-        movl     8+ 4(%esp),%esi      # from
-        movl     8+ 8(%esp),%edi      # to
-        cmpl     %esi,%edi
-        leal     -2(%esi,%ecx,2),%eax # from + count*2 - 2
-        jbe      acs_CopyRight
-        cmpl     %eax,%edi
-        jbe      acs_CopyLeft
-acs_CopyRight:
-        movl     %ecx,%eax            # word count
-        sarl     %ecx                 # dword count
-        jz       4f                   # no dwords to move
-        cmpl     $32,%ecx
-        jbe      2f                   # <= 32 dwords
-        # copy aligned dwords
-        rep;     smovl
-        jmp      4f
-        # copy aligned dwords
-        .space 5
-2:      subl     %esi,%edi
-        .p2align 4,,15
-3:      movl     (%esi),%edx
-        movl     %edx,(%edi,%esi,1)
-        addl     $4,%esi
-        subl     $1,%ecx
-        jnz      3b
-        addl     %esi,%edi
-4:      andl     $1,%eax              # suffix count
-        jz       5f                   # no suffix
-        # copy suffix
-        movw     (%esi),%dx
-        movw     %dx,(%edi)
-5:      popl     %edi
-        popl     %esi
-        ret
-acs_CopyLeft:
-        std
-        leal     -4(%edi,%ecx,2),%edi # to + count*2 - 4
-        movl     %eax,%esi            # from + count*2 - 2
-        movl     %ecx,%eax
-        subl     $2,%esi              # from + count*2 - 4
-        sarl     %ecx                 # dword count
-        jz       4f                   # no dwords to move
-        cmpl     $32,%ecx
-        ja       3f                   # > 32 dwords
-        subl     %esi,%edi
-        .p2align 4,,15
-2:      movl     (%esi),%edx
-        movl     %edx,(%edi,%esi,1)
-        subl     $4,%esi
-        subl     $1,%ecx
-        jnz      2b
-        addl     %esi,%edi
-        jmp      4f
-3:      rep;     smovl
-4:      andl     $1,%eax              # suffix count
-        jz       5f                   # no suffix
-        # copy suffix
-        addl     $2,%esi
-        addl     $2,%edi
-        movw     (%esi),%dx
-        movw     %dx,(%edi)
-5:      cld
-        popl     %edi
-        popl     %esi
-        ret
-
-        # Support for void Copy::conjoint_jints_atomic(void* from,
-        #                                              void* to,
-        #                                              size_t count)
-        # Equivalent to
-        #   arrayof_conjoint_jints
-        .p2align 4,,15
-DECLARE_FUNC(_Copy_conjoint_jints_atomic):
-DECLARE_FUNC(_Copy_arrayof_conjoint_jints):
-        pushl    %esi
-        movl     4+12(%esp),%ecx      # count
-        pushl    %edi
-        movl     8+ 4(%esp),%esi      # from
-        movl     8+ 8(%esp),%edi      # to
-        cmpl     %esi,%edi
-        leal     -4(%esi,%ecx,4),%eax # from + count*4 - 4
-        jbe      ci_CopyRight
-        cmpl     %eax,%edi
-        jbe      ci_CopyLeft
-ci_CopyRight:
-        cmpl     $32,%ecx
-        jbe      2f                   # <= 32 dwords
-        rep;     smovl
-        popl     %edi
-        popl     %esi
-        ret
-        .space 10
-2:      subl     %esi,%edi
-        jmp      4f
-        .p2align 4,,15
-3:      movl     (%esi),%edx
-        movl     %edx,(%edi,%esi,1)
-        addl     $4,%esi
-4:      subl     $1,%ecx
-        jge      3b
-        popl     %edi
-        popl     %esi
-        ret
-ci_CopyLeft:
-        std
-        leal     -4(%edi,%ecx,4),%edi # to + count*4 - 4
-        cmpl     $32,%ecx
-        ja       4f                   # > 32 dwords
-        subl     %eax,%edi            # eax == from + count*4 - 4
-        jmp      3f
-        .p2align 4,,15
-2:      movl     (%eax),%edx
-        movl     %edx,(%edi,%eax,1)
-        subl     $4,%eax
-3:      subl     $1,%ecx
-        jge      2b
-        cld
-        popl     %edi
-        popl     %esi
-        ret
-4:      movl     %eax,%esi            # from + count*4 - 4
-        rep;     smovl
-        cld
-        popl     %edi
-        popl     %esi
-        ret
-
-        # Support for void Copy::conjoint_jlongs_atomic(jlong* from,
-        #                                               jlong* to,
-        #                                               size_t count)
-        #
-        # 32-bit
-        #
-        # count treated as signed
-        #
-        # // if (from > to) {
-        #   while (--count >= 0) {
-        #     *to++ = *from++;
-        #   }
-        # } else {
-        #   while (--count >= 0) {
-        #     to[count] = from[count];
-        #   }
-        # }
-        .p2align 4,,15
-DECLARE_FUNC(_Copy_conjoint_jlongs_atomic):
-        movl     4+8(%esp),%ecx       # count
-        movl     4+0(%esp),%eax       # from
-        movl     4+4(%esp),%edx       # to
-        cmpl     %eax,%edx
-        jae      cla_CopyLeft
-cla_CopyRight:
-        subl     %eax,%edx
-        jmp      2f
-        .p2align 4,,15
-1:      fildll   (%eax)
-        fistpll  (%edx,%eax,1)
-        addl     $8,%eax
-2:      subl     $1,%ecx
-        jge      1b
-        ret
-        .p2align 4,,15
-3:      fildll   (%eax,%ecx,8)
-        fistpll  (%edx,%ecx,8)
-cla_CopyLeft:
-        subl     $1,%ecx
-        jge      3b
-        ret
-
-        # Support for void Copy::arrayof_conjoint_jshorts(void* from,
-        #                                                 void* to,
-        #                                                 size_t count)
-        .p2align 4,,15
-DECLARE_FUNC(_mmx_Copy_arrayof_conjoint_jshorts):
-        pushl    %esi
-        movl     4+12(%esp),%ecx
-        pushl    %edi
-        movl     8+ 4(%esp),%esi
-        movl     8+ 8(%esp),%edi
-        cmpl     %esi,%edi
-        leal     -2(%esi,%ecx,2),%eax
-        jbe      mmx_acs_CopyRight
-        cmpl     %eax,%edi
-        jbe      mmx_acs_CopyLeft
-mmx_acs_CopyRight:
-        movl     %ecx,%eax
-        sarl     %ecx
-        je       5f
-        cmpl     $33,%ecx
-        jae      3f
-1:      subl     %esi,%edi
-        .p2align 4,,15
-2:      movl     (%esi),%edx
-        movl     %edx,(%edi,%esi,1)
-        addl     $4,%esi
-        subl     $1,%ecx
-        jnz      2b
-        addl     %esi,%edi
-        jmp      5f
-3:      smovl # align to 8 bytes, we know we are 4 byte aligned to start
-        subl     $1,%ecx
-4:      .p2align 4,,15
-        movq     0(%esi),%mm0
-        addl     $64,%edi
-        movq     8(%esi),%mm1
-        subl     $16,%ecx
-        movq     16(%esi),%mm2
-        movq     %mm0,-64(%edi)
-        movq     24(%esi),%mm0
-        movq     %mm1,-56(%edi)
-        movq     32(%esi),%mm1
-        movq     %mm2,-48(%edi)
-        movq     40(%esi),%mm2
-        movq     %mm0,-40(%edi)
-        movq     48(%esi),%mm0
-        movq     %mm1,-32(%edi)
-        movq     56(%esi),%mm1
-        movq     %mm2,-24(%edi)
-        movq     %mm0,-16(%edi)
-        addl     $64,%esi
-        movq     %mm1,-8(%edi)
-        cmpl     $16,%ecx
-        jge      4b
-        emms
-        testl    %ecx,%ecx
-        ja       1b
-5:      andl     $1,%eax
-        je       7f
-6:      movw     (%esi),%dx
-        movw     %dx,(%edi)
-7:      popl     %edi
-        popl     %esi
-        ret
-mmx_acs_CopyLeft:
-        std
-        leal     -4(%edi,%ecx,2),%edi
-        movl     %eax,%esi
-        movl     %ecx,%eax
-        subl     $2,%esi
-        sarl     %ecx
-        je       4f
-        cmpl     $32,%ecx
-        ja       3f
-        subl     %esi,%edi
-        .p2align 4,,15
-2:      movl     (%esi),%edx
-        movl     %edx,(%edi,%esi,1)
-        subl     $4,%esi
-        subl     $1,%ecx
-        jnz      2b
-        addl     %esi,%edi
-        jmp      4f
-3:      rep;     smovl
-4:      andl     $1,%eax
-        je       6f
-        addl     $2,%esi
-        addl     $2,%edi
-5:      movw     (%esi),%dx
-        movw     %dx,(%edi)
-6:      cld
-        popl     %edi
-        popl     %esi
-        ret
-
-
-        # Support for int64_t Atomic::cmpxchg(int64_t compare_value,
-        #                                     volatile int64_t* dest,
-        #                                     int64_t exchange_value)
-        #
-        .p2align 4,,15
-DECLARE_FUNC(_Atomic_cmpxchg_long):
-                                   #  8(%esp) : return PC
-        pushl    %ebx              #  4(%esp) : old %ebx
-        pushl    %edi              #  0(%esp) : old %edi
-        movl     12(%esp), %ebx    # 12(%esp) : exchange_value (low)
-        movl     16(%esp), %ecx    # 16(%esp) : exchange_value (high)
-        movl     24(%esp), %eax    # 24(%esp) : compare_value (low)
-        movl     28(%esp), %edx    # 28(%esp) : compare_value (high)
-        movl     20(%esp), %edi    # 20(%esp) : dest
-        lock
-        cmpxchg8b (%edi)
-        popl     %edi
-        popl     %ebx
-        ret
-
-
-        # Support for int64_t Atomic::load and Atomic::store.
-        # void _Atomic_move_long(const volatile int64_t* src, volatile int64_t* dst)
-        .p2align 4,,15
-DECLARE_FUNC(_Atomic_move_long):
-        movl     4(%esp), %eax   # src
-        fildll    (%eax)
-        movl     8(%esp), %eax   # dest
-        fistpll   (%eax)
-        ret
diff --git a/src/hotspot/os_cpu/linux_x86/linux_x86_32.S b/src/hotspot/os_cpu/linux_x86/linux_x86_32.S
deleted file mode 100644
index 43a9a38e57f..00000000000
--- a/src/hotspot/os_cpu/linux_x86/linux_x86_32.S
+++ /dev/null
@@ -1,518 +0,0 @@
-#
-# 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
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please 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 "defs.S.inc"
-
-        # NOTE WELL!  The _Copy functions are called directly
-        # from server-compiler-generated code via CallLeafNoFP,
-        # which means that they *must* either not use floating
-        # point or use it in the same manner as does the server
-        # compiler.
-
-        .text
-
-        .p2align 4,,15
-DECLARE_FUNC(SpinPause):
-        rep
-        nop
-        movl    $1, %eax
-        ret
-
-        # Support for void Copy::arrayof_conjoint_bytes(void* from,
-        #                                               void* to,
-        #                                               size_t count)
-        #
-        .p2align 4,,15
-DECLARE_FUNC(_Copy_arrayof_conjoint_bytes):
-        pushl    %esi
-        movl     4+12(%esp),%ecx      # count
-        pushl    %edi
-        movl     8+ 4(%esp),%esi      # from
-        movl     8+ 8(%esp),%edi      # to
-        cmpl     %esi,%edi
-        leal     -1(%esi,%ecx),%eax   # from + count - 1
-        jbe      acb_CopyRight
-        cmpl     %eax,%edi
-        jbe      acb_CopyLeft
-        # copy from low to high
-acb_CopyRight:
-        cmpl     $3,%ecx
-        jbe      5f
-1:      movl     %ecx,%eax
-        shrl     $2,%ecx
-        jz       4f
-        cmpl     $32,%ecx
-        ja       3f
-        # copy aligned dwords
-        subl     %esi,%edi
-        .p2align 4,,15
-2:      movl     (%esi),%edx
-        movl     %edx,(%edi,%esi,1)
-        addl     $4,%esi
-        subl     $1,%ecx
-        jnz      2b
-        addl     %esi,%edi
-        jmp      4f
-        # copy aligned dwords
-3:      rep;     smovl
-4:      movl     %eax,%ecx
-5:      andl     $3,%ecx
-        jz       7f
-        # copy suffix
-        xorl     %eax,%eax
-6:      movb     (%esi,%eax,1),%dl
-        movb     %dl,(%edi,%eax,1)
-        addl     $1,%eax
-        subl     $1,%ecx
-        jnz      6b
-7:      popl     %edi
-        popl     %esi
-        ret
-acb_CopyLeft:
-        std
-        leal     -4(%edi,%ecx),%edi   # to + count - 4
-        movl     %eax,%esi            # from + count - 1
-        movl     %ecx,%eax
-        subl     $3,%esi              # from + count - 4
-        cmpl     $3,%ecx
-        jbe      5f
-1:      shrl     $2,%ecx
-        jz       4f
-        cmpl     $32,%ecx
-        jbe      2f                   # <= 32 dwords
-        rep;     smovl
-        jmp      4f
-        .space 8
-2:      subl     %esi,%edi
-        .p2align 4,,15
-3:      movl     (%esi),%edx
-        movl     %edx,(%edi,%esi,1)
-        subl     $4,%esi
-        subl     $1,%ecx
-        jnz      3b
-        addl     %esi,%edi
-4:      movl     %eax,%ecx
-5:      andl     $3,%ecx
-        jz       7f
-        subl     %esi,%edi
-        addl     $3,%esi
-6:      movb     (%esi),%dl
-        movb     %dl,(%edi,%esi,1)
-        subl     $1,%esi
-        subl     $1,%ecx
-        jnz      6b
-7:      cld
-        popl     %edi
-        popl     %esi
-        ret
-
-        # Support for void Copy::conjoint_jshorts_atomic(void* from,
-        #                                                void* to,
-        #                                                size_t count)
-        .p2align 4,,15
-DECLARE_FUNC(_Copy_conjoint_jshorts_atomic):
-        pushl    %esi
-        movl     4+12(%esp),%ecx      # count
-        pushl    %edi
-        movl     8+ 4(%esp),%esi      # from
-        movl     8+ 8(%esp),%edi      # to
-        cmpl     %esi,%edi
-        leal     -2(%esi,%ecx,2),%eax # from + count*2 - 2
-        jbe      cs_CopyRight
-        cmpl     %eax,%edi
-        jbe      cs_CopyLeft
-        # copy from low to high
-cs_CopyRight:
-        # align source address at dword address boundary
-        movl     %esi,%eax            # original from
-        andl     $3,%eax              # either 0 or 2
-        jz       1f                   # no prefix
-        # copy prefix
-        subl     $1,%ecx
-        jl       5f                   # zero count
-        movw     (%esi),%dx
-        movw     %dx,(%edi)
-        addl     %eax,%esi            # %eax == 2
-        addl     %eax,%edi
-1:      movl     %ecx,%eax            # word count less prefix
-        sarl     %ecx                 # dword count
-        jz       4f                   # no dwords to move
-        cmpl     $32,%ecx
-        jbe      2f                   # <= 32 dwords
-        # copy aligned dwords
-        rep;     smovl
-        jmp      4f
-        # copy aligned dwords
-2:      subl     %esi,%edi
-        .p2align 4,,15
-3:      movl     (%esi),%edx
-        movl     %edx,(%edi,%esi,1)
-        addl     $4,%esi
-        subl     $1,%ecx
-        jnz      3b
-        addl     %esi,%edi
-4:      andl     $1,%eax              # suffix count
-        jz       5f                   # no suffix
-        # copy suffix
-        movw     (%esi),%dx
-        movw     %dx,(%edi)
-5:      popl     %edi
-        popl     %esi
-        ret
-        # copy from high to low
-cs_CopyLeft:
-        std
-        leal     -4(%edi,%ecx,2),%edi # to + count*2 - 4
-        movl     %eax,%esi            # from + count*2 - 2
-        movl     %ecx,%eax
-        subl     $2,%esi              # from + count*2 - 4
-1:      sarl     %ecx                 # dword count
-        jz       4f                   # no dwords to move
-        cmpl     $32,%ecx
-        ja       3f                   # > 32 dwords
-        subl     %esi,%edi
-        .p2align 4,,15
-2:      movl     (%esi),%edx
-        movl     %edx,(%edi,%esi,1)
-        subl     $4,%esi
-        subl     $1,%ecx
-        jnz      2b
-        addl     %esi,%edi
-        jmp      4f
-3:      rep;     smovl
-4:      andl     $1,%eax              # suffix count
-        jz       5f                   # no suffix
-        # copy suffix
-        addl     $2,%esi
-        addl     $2,%edi
-        movw     (%esi),%dx
-        movw     %dx,(%edi)
-5:      cld
-        popl     %edi
-        popl     %esi
-        ret
-
-        # Support for void Copy::arrayof_conjoint_jshorts(void* from,
-        #                                                 void* to,
-        #                                                 size_t count)
-        .p2align 4,,15
-DECLARE_FUNC(_Copy_arrayof_conjoint_jshorts):
-        pushl    %esi
-        movl     4+12(%esp),%ecx      # count
-        pushl    %edi
-        movl     8+ 4(%esp),%esi      # from
-        movl     8+ 8(%esp),%edi      # to
-        cmpl     %esi,%edi
-        leal     -2(%esi,%ecx,2),%eax # from + count*2 - 2
-        jbe      acs_CopyRight
-        cmpl     %eax,%edi
-        jbe      acs_CopyLeft
-acs_CopyRight:
-        movl     %ecx,%eax            # word count
-        sarl     %ecx                 # dword count
-        jz       4f                   # no dwords to move
-        cmpl     $32,%ecx
-        jbe      2f                   # <= 32 dwords
-        # copy aligned dwords
-        rep;     smovl
-        jmp      4f
-        # copy aligned dwords
-        .space 5
-2:      subl     %esi,%edi
-        .p2align 4,,15
-3:      movl     (%esi),%edx
-        movl     %edx,(%edi,%esi,1)
-        addl     $4,%esi
-        subl     $1,%ecx
-        jnz      3b
-        addl     %esi,%edi
-4:      andl     $1,%eax              # suffix count
-        jz       5f                   # no suffix
-        # copy suffix
-        movw     (%esi),%dx
-        movw     %dx,(%edi)
-5:      popl     %edi
-        popl     %esi
-        ret
-acs_CopyLeft:
-        std
-        leal     -4(%edi,%ecx,2),%edi # to + count*2 - 4
-        movl     %eax,%esi            # from + count*2 - 2
-        movl     %ecx,%eax
-        subl     $2,%esi              # from + count*2 - 4
-        sarl     %ecx                 # dword count
-        jz       4f                   # no dwords to move
-        cmpl     $32,%ecx
-        ja       3f                   # > 32 dwords
-        subl     %esi,%edi
-        .p2align 4,,15
-2:      movl     (%esi),%edx
-        movl     %edx,(%edi,%esi,1)
-        subl     $4,%esi
-        subl     $1,%ecx
-        jnz      2b
-        addl     %esi,%edi
-        jmp      4f
-3:      rep;     smovl
-4:      andl     $1,%eax              # suffix count
-        jz       5f                   # no suffix
-        # copy suffix
-        addl     $2,%esi
-        addl     $2,%edi
-        movw     (%esi),%dx
-        movw     %dx,(%edi)
-5:      cld
-        popl     %edi
-        popl     %esi
-        ret
-
-        # Support for void Copy::conjoint_jints_atomic(void* from,
-        #                                              void* to,
-        #                                              size_t count)
-        # Equivalent to
-        #   arrayof_conjoint_jints
-        .p2align 4,,15
-DECLARE_FUNC(_Copy_conjoint_jints_atomic):
-DECLARE_FUNC(_Copy_arrayof_conjoint_jints):
-        pushl    %esi
-        movl     4+12(%esp),%ecx      # count
-        pushl    %edi
-        movl     8+ 4(%esp),%esi      # from
-        movl     8+ 8(%esp),%edi      # to
-        cmpl     %esi,%edi
-        leal     -4(%esi,%ecx,4),%eax # from + count*4 - 4
-        jbe      ci_CopyRight
-        cmpl     %eax,%edi
-        jbe      ci_CopyLeft
-ci_CopyRight:
-        cmpl     $32,%ecx
-        jbe      2f                   # <= 32 dwords
-        rep;     smovl
-        popl     %edi
-        popl     %esi
-        ret
-        .space 10
-2:      subl     %esi,%edi
-        jmp      4f
-        .p2align 4,,15
-3:      movl     (%esi),%edx
-        movl     %edx,(%edi,%esi,1)
-        addl     $4,%esi
-4:      subl     $1,%ecx
-        jge      3b
-        popl     %edi
-        popl     %esi
-        ret
-ci_CopyLeft:
-        std
-        leal     -4(%edi,%ecx,4),%edi # to + count*4 - 4
-        cmpl     $32,%ecx
-        ja       4f                   # > 32 dwords
-        subl     %eax,%edi            # eax == from + count*4 - 4
-        jmp      3f
-        .p2align 4,,15
-2:      movl     (%eax),%edx
-        movl     %edx,(%edi,%eax,1)
-        subl     $4,%eax
-3:      subl     $1,%ecx
-        jge      2b
-        cld
-        popl     %edi
-        popl     %esi
-        ret
-4:      movl     %eax,%esi            # from + count*4 - 4
-        rep;     smovl
-        cld
-        popl     %edi
-        popl     %esi
-        ret
-
-        # Support for void Copy::conjoint_jlongs_atomic(jlong* from,
-        #                                               jlong* to,
-        #                                               size_t count)
-        #
-        # 32-bit
-        #
-        # count treated as signed
-        /*
-        #
-        # if (from > to) {
-        #   while (--count >= 0) {
-        #     *to++ = *from++;
-        #   }
-        # } else {
-        #   while (--count >= 0) {
-        #     to[count] = from[count];
-        #   }
-        # }
-        */
-        .p2align 4,,15
-DECLARE_FUNC(_Copy_conjoint_jlongs_atomic):
-        movl     4+8(%esp),%ecx       # count
-        movl     4+0(%esp),%eax       # from
-        movl     4+4(%esp),%edx       # to
-        cmpl     %eax,%edx
-        jae      cla_CopyLeft
-cla_CopyRight:
-        subl     %eax,%edx
-        jmp      2f
-        .p2align 4,,15
-1:      fildll   (%eax)
-        fistpll  (%edx,%eax,1)
-        addl     $8,%eax
-2:      subl     $1,%ecx
-        jge      1b
-        ret
-        .p2align 4,,15
-3:      fildll   (%eax,%ecx,8)
-        fistpll  (%edx,%ecx,8)
-cla_CopyLeft:
-        subl     $1,%ecx
-        jge      3b
-        ret
-
-        # Support for void Copy::arrayof_conjoint_jshorts(void* from,
-        #                                                 void* to,
-        #                                                 size_t count)
-        .p2align 4,,15
-DECLARE_FUNC(_mmx_Copy_arrayof_conjoint_jshorts):
-        pushl    %esi
-        movl     4+12(%esp),%ecx
-        pushl    %edi
-        movl     8+ 4(%esp),%esi
-        movl     8+ 8(%esp),%edi
-        cmpl     %esi,%edi
-        leal     -2(%esi,%ecx,2),%eax
-        jbe      mmx_acs_CopyRight
-        cmpl     %eax,%edi
-        jbe      mmx_acs_CopyLeft
-mmx_acs_CopyRight:
-        movl     %ecx,%eax
-        sarl     %ecx
-        je       5f
-        cmpl     $33,%ecx
-        jae      3f
-1:      subl     %esi,%edi
-        .p2align 4,,15
-2:      movl     (%esi),%edx
-        movl     %edx,(%edi,%esi,1)
-        addl     $4,%esi
-        subl     $1,%ecx
-        jnz      2b
-        addl     %esi,%edi
-        jmp      5f
-3:      smovl # align to 8 bytes, we know we are 4 byte aligned to start
-        subl     $1,%ecx
-4:      .p2align 4,,15
-        movq     0(%esi),%mm0
-        addl     $64,%edi
-        movq     8(%esi),%mm1
-        subl     $16,%ecx
-        movq     16(%esi),%mm2
-        movq     %mm0,-64(%edi)
-        movq     24(%esi),%mm0
-        movq     %mm1,-56(%edi)
-        movq     32(%esi),%mm1
-        movq     %mm2,-48(%edi)
-        movq     40(%esi),%mm2
-        movq     %mm0,-40(%edi)
-        movq     48(%esi),%mm0
-        movq     %mm1,-32(%edi)
-        movq     56(%esi),%mm1
-        movq     %mm2,-24(%edi)
-        movq     %mm0,-16(%edi)
-        addl     $64,%esi
-        movq     %mm1,-8(%edi)
-        cmpl     $16,%ecx
-        jge      4b
-        emms
-        testl    %ecx,%ecx
-        ja       1b
-5:      andl     $1,%eax
-        je       7f
-6:      movw     (%esi),%dx
-        movw     %dx,(%edi)
-7:	popl     %edi
-        popl     %esi
-        ret
-mmx_acs_CopyLeft:
-        std
-        leal     -4(%edi,%ecx,2),%edi
-        movl     %eax,%esi
-        movl     %ecx,%eax
-        subl     $2,%esi
-        sarl     %ecx
-        je       4f
-        cmpl     $32,%ecx
-        ja       3f
-        subl     %esi,%edi
-        .p2align 4,,15
-2:      movl     (%esi),%edx
-        movl     %edx,(%edi,%esi,1)
-        subl     $4,%esi
-        subl     $1,%ecx
-        jnz      2b
-        addl     %esi,%edi
-        jmp      4f
-3:      rep;     smovl
-4:      andl     $1,%eax
-        je       6f
-        addl     $2,%esi
-        addl     $2,%edi
-5:      movw     (%esi),%dx
-        movw     %dx,(%edi)
-6:      cld
-        popl     %edi
-        popl     %esi
-        ret
-
-
-        # Support for jlong Atomic::cmpxchg(volatile jlong* dest,
-        #                                   jlong compare_value,
-        #                                   jlong exchange_value)
-        #
-        .p2align 4,,15
-DECLARE_FUNC(_Atomic_cmpxchg_long):
-                                   #  8(%esp) : return PC
-        pushl    %ebx              #  4(%esp) : old %ebx
-        pushl    %edi              #  0(%esp) : old %edi
-        movl     12(%esp), %ebx    # 12(%esp) : exchange_value (low)
-        movl     16(%esp), %ecx    # 16(%esp) : exchange_value (high)
-        movl     24(%esp), %eax    # 24(%esp) : compare_value (low)
-        movl     28(%esp), %edx    # 28(%esp) : compare_value (high)
-        movl     20(%esp), %edi    # 20(%esp) : dest
-        lock cmpxchg8b (%edi)
-        popl     %edi
-        popl     %ebx
-        ret
-
-
-        # Support for jlong Atomic::load and Atomic::store.
-        # void _Atomic_move_long(const volatile jlong* src, volatile jlong* dst)
-        .p2align 4,,15
-DECLARE_FUNC(_Atomic_move_long):
-        movl     4(%esp), %eax   # src
-        fildll    (%eax)
-        movl     8(%esp), %eax   # dest
-        fistpll   (%eax)
-        ret
diff --git a/src/hotspot/os_cpu/linux_x86/safefetch_linux_x86_32.S b/src/hotspot/os_cpu/linux_x86/safefetch_linux_x86_32.S
deleted file mode 100644
index 73f6cdf38c9..00000000000
--- a/src/hotspot/os_cpu/linux_x86/safefetch_linux_x86_32.S
+++ /dev/null
@@ -1,41 +0,0 @@
-#
-# Copyright (c) 2022 SAP SE. 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
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please 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 "defs.S.inc"
-
-    .text
-
-    # Support for int SafeFetch32(int* address, int defaultval);
-    #
-    #  8(%esp) : default value
-    #  4(%esp) : crash address
-    #  0(%esp) : return pc
-DECLARE_FUNC(SafeFetch32_impl):
-    movl 4(%esp),%ecx         # load address from stack
-DECLARE_FUNC(_SafeFetch32_fault):
-    movl (%ecx), %eax         # load target value, may fault
-    ret
-DECLARE_FUNC(_SafeFetch32_continuation):
-    movl 8(%esp),%eax         # load default value from stack
-    ret

From 059f190f4b0c7836b89ca2070400529e8d33790b Mon Sep 17 00:00:00 2001
From: Saranya Natarajan <saranya.natarajan@oracle.com>
Date: Wed, 26 Mar 2025 09:39:28 +0000
Subject: [PATCH 494/587] 8352490: Fatal error message for unhandled bytecode
 needs more detail

Reviewed-by: thartmann, chagedorn
---
 src/hotspot/share/ci/ciStreams.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/hotspot/share/ci/ciStreams.cpp b/src/hotspot/share/ci/ciStreams.cpp
index 259e72a3412..0859805b843 100644
--- a/src/hotspot/share/ci/ciStreams.cpp
+++ b/src/hotspot/share/ci/ciStreams.cpp
@@ -126,7 +126,7 @@ Bytecodes::Code ciBytecodeStream::next_wide_or_table(Bytecodes::Code bc) {
   }
 
   default:
-    fatal("unhandled bytecode");
+    fatal("unhandled bytecode : Current Method = %s, BCI = %d, OPCODE = %s (0x%X)", _method->name()->as_utf8(), cur_bci(), Bytecodes::name(bc), bc);
   }
   return bc;
 }

From bc5cde1b198baf6e2e36d370b0aaa907c8f35777 Mon Sep 17 00:00:00 2001
From: Severin Gehwolf <sgehwolf@openjdk.org>
Date: Wed, 26 Mar 2025 10:53:07 +0000
Subject: [PATCH 495/587] 8352692: Add support for extra jlink options

Reviewed-by: ihse, erikj
---
 make/Images.gmk                 |  4 ++++
 make/autoconf/jdk-options.m4    | 12 ++++++++++++
 make/autoconf/spec.gmk.template |  1 +
 3 files changed, 17 insertions(+)

diff --git a/make/Images.gmk b/make/Images.gmk
index 6c859fce7a5..3f2b34bc9c6 100644
--- a/make/Images.gmk
+++ b/make/Images.gmk
@@ -97,6 +97,10 @@ ifeq ($(JLINK_PRODUCE_LINKABLE_RUNTIME), true)
   JLINK_JDK_EXTRA_OPTS += --generate-linkable-runtime
 endif
 
+ifneq ($(JLINK_USER_EXTRA_FLAGS), )
+  JLINK_JDK_EXTRA_OPTS += $(JLINK_USER_EXTRA_FLAGS)
+endif
+
 $(eval $(call SetupExecute, jlink_jdk, \
     WARN := Creating jdk image, \
     DEPS := $(JDK_JMODS) $(BASE_RELEASE_FILE) \
diff --git a/make/autoconf/jdk-options.m4 b/make/autoconf/jdk-options.m4
index f8ce5392df9..7c14c60095e 100644
--- a/make/autoconf/jdk-options.m4
+++ b/make/autoconf/jdk-options.m4
@@ -620,6 +620,18 @@ AC_DEFUN_ONCE([JDKOPT_SETUP_JLINK_OPTIONS],
       DEFAULT_DESC: [enabled by default unless --enable-linkable-runtime is set],
       CHECKING_MSG: [if packaged modules are kept])
   AC_SUBST(JLINK_KEEP_PACKAGED_MODULES)
+
+  ################################################################################
+  #
+  # Extra jlink options to be (optionally) passed to the JDK build
+  #
+  UTIL_ARG_WITH(NAME: extra-jlink-flags, TYPE: string,
+      DEFAULT: [],
+      DESC: [extra flags to be passed to jlink during the build],
+      OPTIONAL: true)
+
+  JLINK_USER_EXTRA_FLAGS="$EXTRA_JLINK_FLAGS"
+  AC_SUBST(JLINK_USER_EXTRA_FLAGS)
 ])
 
 ################################################################################
diff --git a/make/autoconf/spec.gmk.template b/make/autoconf/spec.gmk.template
index 92ee1c93287..a30936d7d45 100644
--- a/make/autoconf/spec.gmk.template
+++ b/make/autoconf/spec.gmk.template
@@ -712,6 +712,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@
+JLINK_USER_EXTRA_FLAGS := @JLINK_USER_EXTRA_FLAGS@
 
 RCFLAGS := @RCFLAGS@
 

From b4dc364575b5a7e9dab5645f2fd6f377083531f0 Mon Sep 17 00:00:00 2001
From: Matthias Baesken <mbaesken@openjdk.org>
Date: Wed, 26 Mar 2025 12:31:28 +0000
Subject: [PATCH 496/587] 8346931: Replace divisions by zero in
 sharedRuntimeTrans.cpp

Reviewed-by: kbarrett, mdoerr
---
 .../share/runtime/sharedRuntimeTrans.cpp      | 33 +++++++++----------
 .../share/utilities/globalDefinitions_gcc.hpp |  3 --
 2 files changed, 15 insertions(+), 21 deletions(-)

diff --git a/src/hotspot/share/runtime/sharedRuntimeTrans.cpp b/src/hotspot/share/runtime/sharedRuntimeTrans.cpp
index 14285f1a370..ee44151e433 100644
--- a/src/hotspot/share/runtime/sharedRuntimeTrans.cpp
+++ b/src/hotspot/share/runtime/sharedRuntimeTrans.cpp
@@ -112,7 +112,6 @@ ln2_hi  =  6.93147180369123816490e-01,        /* 3fe62e42 fee00000 */
 
 static double zero = 0.0;
 
-ATTRIBUTE_NO_UBSAN
 static double __ieee754_log(double x) {
   double hfsq,f,s,z,R,w,t1,t2,dk;
   int k,hx,i,j;
@@ -126,8 +125,8 @@ static double __ieee754_log(double x) {
   k=0;
   if (hx < 0x00100000) {                   /* x < 2**-1022  */
     if (((hx&0x7fffffff)|lx)==0)
-      return -two54/zero;             /* log(+-0)=-inf */
-    if (hx<0) return (x-x)/zero;   /* log(-#) = NaN */
+      return -std::numeric_limits<double>::infinity();             /* log(+-0)=-inf */
+    if (hx<0) return std::numeric_limits<double>::quiet_NaN();   /* log(-#) = NaN */
     k -= 54; x *= two54; /* subnormal number, scale up x */
     hx = high(x);             /* high word of x */
   }
@@ -209,7 +208,6 @@ ivln10     =  4.34294481903251816668e-01, /* 0x3FDBCB7B, 0x1526E50E */
   log10_2hi  =  3.01029995663611771306e-01, /* 0x3FD34413, 0x509F6000 */
   log10_2lo  =  3.69423907715893078616e-13; /* 0x3D59FEF3, 0x11F12B36 */
 
-ATTRIBUTE_NO_UBSAN
 static double __ieee754_log10(double x) {
   double y,z;
   int i,k,hx;
@@ -223,8 +221,8 @@ static double __ieee754_log10(double x) {
   k=0;
   if (hx < 0x00100000) {                  /* x < 2**-1022  */
     if (((hx&0x7fffffff)|lx)==0)
-      return -two54/zero;             /* log(+-0)=-inf */
-    if (hx<0) return (x-x)/zero;        /* log(-#) = NaN */
+      return -std::numeric_limits<double>::infinity();             /* log(+-0)=-inf */
+    if (hx<0) return std::numeric_limits<double>::quiet_NaN(); /* log(-#) = NaN */
     k -= 54; x *= two54; /* subnormal number, scale up x */
     hx = high(x);                /* high word of x */
   }
@@ -516,14 +514,16 @@ static double __ieee754_pow(double x, double y) {
   if(lx==0) {
     if(ix==0x7ff00000||ix==0||ix==0x3ff00000){
       z = ax;                   /*x is +-0,+-inf,+-1*/
-      if(hy<0) z = one/z;       /* z = (1/|x|) */
+      if(hy<0) {
+        if (ix == 0) {
+          z = std::numeric_limits<double>::infinity();
+        } else {
+          z = one/z;       /* z = (1/|x|) */
+        }
+      }
       if(hx<0) {
         if(((ix-0x3ff00000)|yisint)==0) {
-#ifdef CAN_USE_NAN_DEFINE
-          z = NAN;
-#else
-          z = (z-z)/(z-z); /* (-1)**non-int is NaN */
-#endif
+          z = std::numeric_limits<double>::quiet_NaN();
         } else if(yisint==1)
           z = -1.0*z;           /* (x<0)**odd = -(|x|**odd) */
       }
@@ -534,12 +534,9 @@ static double __ieee754_pow(double x, double y) {
   n = (hx>>31)+1;
 
   /* (x<0)**(non-int) is NaN */
-  if((n|yisint)==0)
-#ifdef CAN_USE_NAN_DEFINE
-    return NAN;
-#else
-    return (x-x)/(x-x);
-#endif
+  if((n|yisint)==0) {
+    return std::numeric_limits<double>::quiet_NaN();
+  }
 
   s = one; /* s (sign of result -ve**odd) = -1 else = 1 */
   if((n|(yisint-1))==0) s = -one;/* (-ve)**(odd int) */
diff --git a/src/hotspot/share/utilities/globalDefinitions_gcc.hpp b/src/hotspot/share/utilities/globalDefinitions_gcc.hpp
index a2fbc3be363..94f37e7954e 100644
--- a/src/hotspot/share/utilities/globalDefinitions_gcc.hpp
+++ b/src/hotspot/share/utilities/globalDefinitions_gcc.hpp
@@ -81,9 +81,6 @@ inline int g_isnan(double f) { return isnan(f); }
 #error "missing platform-specific definition here"
 #endif
 
-#define CAN_USE_NAN_DEFINE 1
-
-
 // Checking for finiteness
 
 inline int g_isfinite(jfloat  f)                 { return isfinite(f); }

From 84d3dc75e4ebd1a4724b09842fd5a63900536dd1 Mon Sep 17 00:00:00 2001
From: Tobias Hartmann <thartmann@openjdk.org>
Date: Wed, 26 Mar 2025 12:32:52 +0000
Subject: [PATCH 497/587] 8352965: [BACKOUT] 8302459: Missing late inline
 cleanup causes compiler/vectorapi/VectorLogicalOpIdentityTest.java IR failure

Reviewed-by: chagedorn
---
 src/hotspot/share/opto/callGenerator.cpp      |   2 +-
 src/hotspot/share/opto/callnode.cpp           | 113 +++++++-----------
 src/hotspot/share/opto/callnode.hpp           |   1 -
 src/hotspot/share/opto/compile.cpp            |  11 --
 test/hotspot/jtreg/ProblemList.txt            |   1 +
 .../VectorGatherMaskFoldingTest.java          |  11 +-
 .../VectorLogicalOpIdentityTest.java          |   5 +-
 7 files changed, 51 insertions(+), 93 deletions(-)

diff --git a/src/hotspot/share/opto/callGenerator.cpp b/src/hotspot/share/opto/callGenerator.cpp
index 5f010d5c427..ec7117e3568 100644
--- a/src/hotspot/share/opto/callGenerator.cpp
+++ b/src/hotspot/share/opto/callGenerator.cpp
@@ -470,7 +470,7 @@ class LateInlineVirtualCallGenerator : public VirtualCallGenerator {
   virtual void do_late_inline();
 
   virtual void set_callee_method(ciMethod* m) {
-    assert(_callee == nullptr || _callee == m, "repeated inline attempt with different callee");
+    assert(_callee == nullptr, "repeated inlining attempt");
     _callee = m;
   }
 
diff --git a/src/hotspot/share/opto/callnode.cpp b/src/hotspot/share/opto/callnode.cpp
index bb30dcb2976..68efabea15c 100644
--- a/src/hotspot/share/opto/callnode.cpp
+++ b/src/hotspot/share/opto/callnode.cpp
@@ -1091,15 +1091,6 @@ void CallJavaNode::dump_compact_spec(outputStream* st) const {
 }
 #endif
 
-void CallJavaNode::register_for_late_inline() {
-  if (generator() != nullptr) {
-    Compile::current()->prepend_late_inline(generator());
-    set_generator(nullptr);
-  } else {
-    assert(false, "repeated inline attempt");
-  }
-}
-
 //=============================================================================
 uint CallStaticJavaNode::size_of() const { return sizeof(*this); }
 bool CallStaticJavaNode::cmp( const Node &n ) const {
@@ -1110,35 +1101,26 @@ bool CallStaticJavaNode::cmp( const Node &n ) const {
 Node* CallStaticJavaNode::Ideal(PhaseGVN* phase, bool can_reshape) {
   CallGenerator* cg = generator();
   if (can_reshape && cg != nullptr) {
-    if (cg->is_mh_late_inline()) {
-      assert(IncrementalInlineMH, "required");
-      assert(cg->call_node() == this, "mismatch");
-      assert(cg->method()->is_method_handle_intrinsic(), "required");
+    assert(IncrementalInlineMH, "required");
+    assert(cg->call_node() == this, "mismatch");
+    assert(cg->is_mh_late_inline(), "not virtual");
 
-      // Check whether this MH handle call becomes a candidate for inlining.
-      ciMethod* callee = cg->method();
-      vmIntrinsics::ID iid = callee->intrinsic_id();
-      if (iid == vmIntrinsics::_invokeBasic) {
-        if (in(TypeFunc::Parms)->Opcode() == Op_ConP) {
-          register_for_late_inline();
-        }
-      } else if (iid == vmIntrinsics::_linkToNative) {
-        // never retry
-      } else {
-        assert(callee->has_member_arg(), "wrong type of call?");
-        if (in(TypeFunc::Parms + callee->arg_size() - 1)->Opcode() == Op_ConP) {
-          register_for_late_inline();
-          phase->C->inc_number_of_mh_late_inlines();
-        }
+    // Check whether this MH handle call becomes a candidate for inlining.
+    ciMethod* callee = cg->method();
+    vmIntrinsics::ID iid = callee->intrinsic_id();
+    if (iid == vmIntrinsics::_invokeBasic) {
+      if (in(TypeFunc::Parms)->Opcode() == Op_ConP) {
+        phase->C->prepend_late_inline(cg);
+        set_generator(nullptr);
       }
+    } else if (iid == vmIntrinsics::_linkToNative) {
+      // never retry
     } else {
-      assert(IncrementalInline, "required");
-      assert(!cg->method()->is_method_handle_intrinsic(), "required");
-      if (phase->C->print_inlining()) {
-        phase->C->inline_printer()->record(cg->method(), cg->call_node()->jvms(), InliningResult::FAILURE,
-          "static call node changed: trying again");
+      assert(callee->has_member_arg(), "wrong type of call?");
+      if (in(TypeFunc::Parms + callee->arg_size() - 1)->Opcode() == Op_ConP) {
+        phase->C->prepend_late_inline(cg);
+        set_generator(nullptr);
       }
-      register_for_late_inline();
     }
   }
   return CallNode::Ideal(phase, can_reshape);
@@ -1207,46 +1189,39 @@ bool CallDynamicJavaNode::cmp( const Node &n ) const {
 Node* CallDynamicJavaNode::Ideal(PhaseGVN* phase, bool can_reshape) {
   CallGenerator* cg = generator();
   if (can_reshape && cg != nullptr) {
-    if (cg->is_virtual_late_inline()) {
-      assert(IncrementalInlineVirtual, "required");
-      assert(cg->call_node() == this, "mismatch");
+    assert(IncrementalInlineVirtual, "required");
+    assert(cg->call_node() == this, "mismatch");
+    assert(cg->is_virtual_late_inline(), "not virtual");
 
-      // Recover symbolic info for method resolution.
-      ciMethod* caller = jvms()->method();
-      ciBytecodeStream iter(caller);
-      iter.force_bci(jvms()->bci());
+    // Recover symbolic info for method resolution.
+    ciMethod* caller = jvms()->method();
+    ciBytecodeStream iter(caller);
+    iter.force_bci(jvms()->bci());
 
-      bool             not_used1;
-      ciSignature*     not_used2;
-      ciMethod*        orig_callee  = iter.get_method(not_used1, &not_used2);  // callee in the bytecode
-      ciKlass*         holder       = iter.get_declared_method_holder();
-      if (orig_callee->is_method_handle_intrinsic()) {
-        assert(_override_symbolic_info, "required");
-        orig_callee = method();
-        holder = method()->holder();
-      }
+    bool             not_used1;
+    ciSignature*     not_used2;
+    ciMethod*        orig_callee  = iter.get_method(not_used1, &not_used2);  // callee in the bytecode
+    ciKlass*         holder       = iter.get_declared_method_holder();
+    if (orig_callee->is_method_handle_intrinsic()) {
+      assert(_override_symbolic_info, "required");
+      orig_callee = method();
+      holder = method()->holder();
+    }
 
-      ciInstanceKlass* klass = ciEnv::get_instance_klass_for_declared_method_holder(holder);
+    ciInstanceKlass* klass = ciEnv::get_instance_klass_for_declared_method_holder(holder);
 
-      Node* receiver_node = in(TypeFunc::Parms);
-      const TypeOopPtr* receiver_type = phase->type(receiver_node)->isa_oopptr();
+    Node* receiver_node = in(TypeFunc::Parms);
+    const TypeOopPtr* receiver_type = phase->type(receiver_node)->isa_oopptr();
 
-      int  not_used3;
-      bool call_does_dispatch;
-      ciMethod* callee = phase->C->optimize_virtual_call(caller, klass, holder, orig_callee, receiver_type, true /*is_virtual*/,
-                                                         call_does_dispatch, not_used3);  // out-parameters
-      if (!call_does_dispatch) {
-        // Register for late inlining.
-        cg->set_callee_method(callee);
-        register_for_late_inline(); // MH late inlining prepends to the list, so do the same
-      }
-    } else {
-      assert(IncrementalInline, "required");
-      if (phase->C->print_inlining()) {
-        phase->C->inline_printer()->record(cg->method(), cg->call_node()->jvms(), InliningResult::FAILURE,
-          "dynamic call node changed: trying again");
-      }
-      register_for_late_inline();
+    int  not_used3;
+    bool call_does_dispatch;
+    ciMethod* callee = phase->C->optimize_virtual_call(caller, klass, holder, orig_callee, receiver_type, true /*is_virtual*/,
+                                                       call_does_dispatch, not_used3);  // out-parameters
+    if (!call_does_dispatch) {
+      // Register for late inlining.
+      cg->set_callee_method(callee);
+      phase->C->prepend_late_inline(cg); // MH late inlining prepends to the list, so do the same
+      set_generator(nullptr);
     }
   }
   return CallNode::Ideal(phase, can_reshape);
diff --git a/src/hotspot/share/opto/callnode.hpp b/src/hotspot/share/opto/callnode.hpp
index db857d4c6d1..fc03ab5163b 100644
--- a/src/hotspot/share/opto/callnode.hpp
+++ b/src/hotspot/share/opto/callnode.hpp
@@ -790,7 +790,6 @@ public:
   void  set_arg_escape(bool f)             { _arg_escape = f; }
   bool  arg_escape() const                 { return _arg_escape; }
   void copy_call_debug_info(PhaseIterGVN* phase, SafePointNode *sfpt);
-  void register_for_late_inline();
 
   DEBUG_ONLY( bool validate_symbolic_info() const; )
 
diff --git a/src/hotspot/share/opto/compile.cpp b/src/hotspot/share/opto/compile.cpp
index 8a059d0852f..56f57793fbb 100644
--- a/src/hotspot/share/opto/compile.cpp
+++ b/src/hotspot/share/opto/compile.cpp
@@ -2085,7 +2085,6 @@ bool Compile::inline_incrementally_one() {
   for (int i = 0; i < _late_inlines.length(); i++) {
     _late_inlines_pos = i+1;
     CallGenerator* cg = _late_inlines.at(i);
-    bool is_scheduled_for_igvn_before = C->igvn_worklist()->member(cg->call_node());
     bool does_dispatch = cg->is_virtual_late_inline() || cg->is_mh_late_inline();
     if (inlining_incrementally() || does_dispatch) { // a call can be either inlined or strength-reduced to a direct call
       cg->do_late_inline();
@@ -2096,16 +2095,6 @@ bool Compile::inline_incrementally_one() {
         _late_inlines_pos = i+1; // restore the position in case new elements were inserted
         print_method(PHASE_INCREMENTAL_INLINE_STEP, 3, cg->call_node());
         break; // process one call site at a time
-      } else {
-        bool is_scheduled_for_igvn_after = C->igvn_worklist()->member(cg->call_node());
-        if (!is_scheduled_for_igvn_before && is_scheduled_for_igvn_after) {
-          // Avoid potential infinite loop if node already in the IGVN list
-          assert(false, "scheduled for IGVN during inlining attempt");
-        } else {
-          // Ensure call node has not disappeared from IGVN worklist during a failed inlining attempt
-          assert(!is_scheduled_for_igvn_before || is_scheduled_for_igvn_after, "call node removed from IGVN list during inlining pass");
-          cg->call_node()->set_generator(cg);
-        }
       }
     } else {
       // Ignore late inline direct calls when inlining is not allowed.
diff --git a/test/hotspot/jtreg/ProblemList.txt b/test/hotspot/jtreg/ProblemList.txt
index d76f4b2d95b..6dd35997cac 100644
--- a/test/hotspot/jtreg/ProblemList.txt
+++ b/test/hotspot/jtreg/ProblemList.txt
@@ -56,6 +56,7 @@ compiler/c2/irTests/TestDuplicateBackedge.java 8318904 generic-all
 compiler/codecache/jmx/PoolsIndependenceTest.java 8264632 macosx-all
 
 compiler/vectorapi/reshape/TestVectorReinterpret.java 8320897,8348519 aix-ppc64,linux-ppc64le,linux-s390x
+compiler/vectorapi/VectorLogicalOpIdentityTest.java 8302459 linux-x64,windows-x64
 compiler/vectorapi/VectorRebracket128Test.java 8330538 generic-all
 
 compiler/jvmci/TestUncaughtErrorInCompileMethod.java 8309073 generic-all
diff --git a/test/hotspot/jtreg/compiler/vectorapi/VectorGatherMaskFoldingTest.java b/test/hotspot/jtreg/compiler/vectorapi/VectorGatherMaskFoldingTest.java
index 7e16c5e5e86..88175baf8e4 100644
--- a/test/hotspot/jtreg/compiler/vectorapi/VectorGatherMaskFoldingTest.java
+++ b/test/hotspot/jtreg/compiler/vectorapi/VectorGatherMaskFoldingTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024, 2025, 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
@@ -32,7 +32,7 @@ import java.nio.ByteOrder;
 
 /**
  * @test
- * @bug 8325520 8302459
+ * @bug 8325520
  * @library /test/lib /
  * @summary Don't allow folding of Load/Store vectors when using incompatible indices or masks
  * @modules jdk.incubator.vector
@@ -1398,12 +1398,7 @@ public class VectorGatherMaskFoldingTest {
     public static void main(String[] args) {
         TestFramework testFramework = new TestFramework();
         testFramework.setDefaultWarmup(10000)
-                     .addFlags("--add-modules=jdk.incubator.vector")
+                     .addFlags("--add-modules=jdk.incubator.vector", "-XX:+IgnoreUnrecognizedVMOptions", "-XX:+IncrementalInlineForceCleanup")
                      .start();
-        testFramework = new TestFramework();
-        testFramework.setDefaultWarmup(10000)
-                     .addFlags("--add-modules=jdk.incubator.vector", "-XX:-TieredCompilation")
-                     .start();
-
     }
 }
diff --git a/test/hotspot/jtreg/compiler/vectorapi/VectorLogicalOpIdentityTest.java b/test/hotspot/jtreg/compiler/vectorapi/VectorLogicalOpIdentityTest.java
index 1a2402222ed..426dec67019 100644
--- a/test/hotspot/jtreg/compiler/vectorapi/VectorLogicalOpIdentityTest.java
+++ b/test/hotspot/jtreg/compiler/vectorapi/VectorLogicalOpIdentityTest.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2022, 2023, Arm Limited. All rights reserved.
- * Copyright (c) 2023, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -41,7 +41,7 @@ import jdk.test.lib.Utils;
 
 /**
  * @test
- * @bug 8288294 8302459
+ * @bug 8288294
  * @key randomness
  * @library /test/lib /
  * @summary Add identity transformations for vector logic operations
@@ -761,6 +761,5 @@ public class VectorLogicalOpIdentityTest {
 
     public static void main(String[] args) {
         TestFramework.runWithFlags("--add-modules=jdk.incubator.vector");
-        TestFramework.runWithFlags("--add-modules=jdk.incubator.vector", "-XX:-TieredCompilation");
     }
 }

From c14bbea93e6701719b934dbd1711d26a91b50d7d Mon Sep 17 00:00:00 2001
From: Nizar Benalla <nbenalla@openjdk.org>
Date: Wed, 26 Mar 2025 12:45:44 +0000
Subject: [PATCH 498/587] 8352740: Introduce new factory method HtmlTree.IMG

Reviewed-by: liach, jjg
---
 .../doclets/formats/html/SearchWriter.java         |  7 +++----
 .../doclets/formats/html/TableOfContents.java      | 13 ++++---------
 .../formats/html/taglets/SnippetTaglet.java        |  7 +++----
 .../jdk/javadoc/internal/html/HtmlTree.java        | 14 ++++++++++++++
 4 files changed, 24 insertions(+), 17 deletions(-)

diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/SearchWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/SearchWriter.java
index 7d97dd71865..778e2625f32 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/SearchWriter.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/SearchWriter.java
@@ -143,10 +143,9 @@ public class SearchWriter extends HtmlDocletWriter {
                 .add(HtmlTree.SPAN(Text.of("link"))
                         .setId(HtmlId.of("page-search-link")))
                 .add(HtmlTree.BUTTON(HtmlId.of("page-search-copy"))
-                        .add(HtmlTree.of(HtmlTag.IMG)
-                                .put(HtmlAttr.SRC, pathToRoot.resolve(DocPaths.RESOURCE_FILES)
-                                        .resolve(DocPaths.CLIPBOARD_SVG).getPath())
-                                .put(HtmlAttr.ALT, copyUrlText))
+                        .add(HtmlTree.IMG(pathToRoot.resolve(DocPaths.RESOURCE_FILES)
+                                        .resolve(DocPaths.CLIPBOARD_SVG),
+                                copyUrlText))
                         .add(HtmlTree.SPAN(Text.of(copyText))
                                 .put(HtmlAttr.DATA_COPIED, copiedText))
                         .addStyle(HtmlStyles.copy)
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/TableOfContents.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/TableOfContents.java
index a53e42ceb52..6a3dff8a5d6 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/TableOfContents.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/TableOfContents.java
@@ -117,17 +117,12 @@ public class TableOfContents {
         content.add(listBuilder);
         content.add(HtmlTree.BUTTON(HtmlStyles.hideSidebar)
                 .add(HtmlTree.SPAN(writer.contents.hideSidebar).add(Entity.NO_BREAK_SPACE))
-                .add(HtmlTree.of(HtmlTag.IMG)
-                        .put(HtmlAttr.SRC, writer.pathToRoot.resolve(DocPaths.RESOURCE_FILES)
-                                .resolve(DocPaths.LEFT_SVG).getPath())
-                        .put(HtmlAttr.ALT, writer.contents.hideSidebar.toString())));
+                .add(HtmlTree.IMG(writer.pathToRoot.resolve(DocPaths.RESOURCE_FILES).resolve(DocPaths.LEFT_SVG),
+                        writer.contents.hideSidebar.toString())));
         content.add(HtmlTree.BUTTON(HtmlStyles.showSidebar)
-                .add(HtmlTree.of(HtmlTag.IMG)
-                        .put(HtmlAttr.SRC, writer.pathToRoot.resolve(DocPaths.RESOURCE_FILES)
-                                .resolve(DocPaths.RIGHT_SVG).getPath())
-                        .put(HtmlAttr.ALT, writer.contents.showSidebar.toString()))
+                .add(HtmlTree.IMG(writer.pathToRoot.resolve(DocPaths.RESOURCE_FILES)
+                        .resolve(DocPaths.RIGHT_SVG), writer.contents.showSidebar.toString()))
                 .add(HtmlTree.SPAN(Entity.NO_BREAK_SPACE).add(writer.contents.showSidebar)));
         return content;
     }
-
 }
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/taglets/SnippetTaglet.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/taglets/SnippetTaglet.java
index 37333552e10..b166f4588ce 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/taglets/SnippetTaglet.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/taglets/SnippetTaglet.java
@@ -194,10 +194,9 @@ public class SnippetTaglet extends BaseTaglet {
                 HtmlTree.of(HtmlTag.BUTTON)
                         .add(HtmlTree.SPAN(Text.of(copyText))
                                 .put(HtmlAttr.DATA_COPIED, copiedText))
-                        .add(HtmlTree.of(HtmlTag.IMG)
-                                .put(HtmlAttr.SRC, pathToRoot.resolve(DocPaths.RESOURCE_FILES)
-                                                             .resolve(DocPaths.CLIPBOARD_SVG).getPath())
-                                .put(HtmlAttr.ALT, copySnippetText))
+                        .add(HtmlTree.IMG(pathToRoot.resolve(DocPaths.RESOURCE_FILES)
+                                        .resolve(DocPaths.CLIPBOARD_SVG),
+                                copySnippetText))
                         .addStyle(HtmlStyles.copy)
                         .addStyle(HtmlStyles.snippetCopy)
                         .put(HtmlAttr.ARIA_LABEL, copySnippetText)
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/html/HtmlTree.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/html/HtmlTree.java
index ef34d83a75d..2d81a2914e6 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/html/HtmlTree.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/html/HtmlTree.java
@@ -38,6 +38,8 @@ import java.util.Map;
 import java.util.Objects;
 import java.util.function.Function;
 
+import jdk.javadoc.internal.doclets.toolkit.util.DocPath;
+
 /**
  * A tree node representing an HTML element, containing the name of the element,
  * a collection of attributes, and content.
@@ -1155,6 +1157,18 @@ public class HtmlTree extends Content {
         return WBR_INSTANCE;
     }
 
+    /**
+     * {@return an HTML {@code IMG} element}
+     *
+     * @param src the path of the image
+     * @param alt alternate text for the image
+     */
+    public static HtmlTree IMG(DocPath src, String alt) {
+        return new HtmlTree(HtmlTag.IMG)
+                .put(HtmlAttr.SRC, src.getPath())
+                .put(HtmlAttr.ALT, alt);
+    }
+
     @Override
     public boolean isEmpty() {
         return (!hasContent() && !hasAttrs());

From e2a461bddeade1666fe15fb17cba8c9f4c5e7dab Mon Sep 17 00:00:00 2001
From: Nizar Benalla <nbenalla@openjdk.org>
Date: Wed, 26 Mar 2025 12:59:25 +0000
Subject: [PATCH 499/587] 8351332: Line breaks in search tag descriptions
 corrupt JSON search index

Reviewed-by: hannesw, liach
---
 .../formats/html/HtmlDocletWriter.java        |  2 +-
 .../formats/html/taglets/IndexTaglet.java     |  4 +-
 .../formats/html/taglets/SpecTaglet.java      |  2 +-
 .../internal/doclets/toolkit/util/Utils.java  | 11 ++-
 .../TestIndexLineBreaks.java                  | 83 +++++++++++++++++++
 5 files changed, 97 insertions(+), 5 deletions(-)
 create mode 100644 test/langtools/jdk/javadoc/doclet/testIndexLineBreaks/TestIndexLineBreaks.java

diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlDocletWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlDocletWriter.java
index b83a60bbd81..448a68fd5a1 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlDocletWriter.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlDocletWriter.java
@@ -1890,7 +1890,7 @@ public abstract class HtmlDocletWriter {
         }
         // Generate index item
         if (!headingContent.isEmpty() && configuration.indexBuilder != null) {
-            String tagText = headingContent.replaceAll("\\s+", " ");
+            String tagText = utils.normalizeWhitespace(headingContent);
             IndexItem item = IndexItem.of(element, node, tagText,
                     getTagletWriterInstance(context).getHolderName(element),
                     "",
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/taglets/IndexTaglet.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/taglets/IndexTaglet.java
index 1ce2384067c..9e7c9acc7bb 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/taglets/IndexTaglet.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/taglets/IndexTaglet.java
@@ -58,10 +58,10 @@ public class IndexTaglet extends BaseTaglet {
         if (tagText.charAt(0) == '"' && tagText.charAt(tagText.length() - 1) == '"') {
             tagText = tagText.substring(1, tagText.length() - 1);
         }
-        tagText = tagText.replaceAll("\\s+", " ");
+        tagText = utils.normalizeWhitespace(tagText);
 
         Content desc = tagletWriter.htmlWriter.commentTagsToContent(element, indexTree.getDescription(), context.within(indexTree));
-        String descText = extractText(desc);
+        String descText = utils.normalizeWhitespace(extractText(desc));
 
         return tagletWriter.createAnchorAndSearchIndex(element, tagText, descText, tag);
     }
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/taglets/SpecTaglet.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/taglets/SpecTaglet.java
index 6baca04b667..82d37cfad8a 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/taglets/SpecTaglet.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/taglets/SpecTaglet.java
@@ -123,7 +123,7 @@ public class SpecTaglet extends BaseTaglet implements InheritableTaglet {
         List<? extends DocTree> specTreeLabel = specTree.getTitle();
         Content label = htmlWriter.commentTagsToContent(holder, specTreeLabel, tagletWriter.context.isFirstSentence);
         return getExternalSpecContent(holder, specTree, specTreeURL,
-                textOf(label).replaceAll("\\s+", " "), label);
+                utils.normalizeWhitespace(textOf(label)), label);
     }
 
     // this is here, for now, but might be a useful addition elsewhere,
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/Utils.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/Utils.java
index 0cdf04fb779..f82c6e5c0d6 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/Utils.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/Utils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -1132,6 +1132,15 @@ public class Utils {
         return result.toString();
     }
 
+    /**
+     * Replaces each group of one or more whitespace characters with a single canonical space
+     * @param s the string to be normalized
+     * @return normalized string
+     */
+    public String normalizeWhitespace(String s) {
+        return s.replaceAll("\\s+", " ");
+    }
+
     /**
      * Returns a locale independent lower cased String. That is, it
      * always uses US locale, this is a clone of the one in StringUtils.
diff --git a/test/langtools/jdk/javadoc/doclet/testIndexLineBreaks/TestIndexLineBreaks.java b/test/langtools/jdk/javadoc/doclet/testIndexLineBreaks/TestIndexLineBreaks.java
new file mode 100644
index 00000000000..1f9bbc5bc8e
--- /dev/null
+++ b/test/langtools/jdk/javadoc/doclet/testIndexLineBreaks/TestIndexLineBreaks.java
@@ -0,0 +1,83 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact 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 8351332
+ * @summary Line breaks in the description of `{@index}` tags may corrupt JSON search index
+ * @library /tools/lib ../../lib
+ * @modules jdk.javadoc/jdk.javadoc.internal.tool
+ * @build toolbox.ToolBox javadoc.tester.*
+ * @run main TestIndexLineBreaks
+ */
+
+import java.io.IOException;
+import java.nio.file.Path;
+
+import javadoc.tester.JavadocTester;
+import toolbox.ToolBox;
+
+public class TestIndexLineBreaks extends JavadocTester {
+
+    public static void main(String... args) throws Exception {
+        var tester = new TestIndexLineBreaks ();
+        tester.runTests();
+    }
+
+    ToolBox tb = new ToolBox();
+
+    @Test
+    public void test() throws IOException {
+        Path src = Path.of("src");
+        tb.writeJavaFiles(src,
+                """
+                            package p;
+                            public interface I {
+                                /**
+                                 *
+                                 * The {@index "phrase1
+                                 * phrase2" description1
+                                 * description2 }
+                                 */
+                                int a();
+                            }
+                        """);
+
+        javadoc("-d",
+                "out",
+                "-sourcepath",
+                src.toString(),
+                "p");
+
+        checkExit(Exit.OK);
+
+        checkOutput("tag-search-index.js", true,
+                """
+                        {"l":"phrase1 phrase2","h":"p.I.a()","d":"description1 description2 ","u":"p/I.html#phrase1phrase2"},{"l":"Search Tags","h":"","k":"18","u":"search-tags.html"}""");
+
+        checkOutput("tag-search-index.js", false,
+                """
+                        {"l":"phrase1 phrase2","h":"p.I.a()","d":"description1
+                        description2 ","u":"p/I.html#phrase1phrase2"},{"l":"Search Tags","h":"","k":"18","u":"search-tags.html"}""");
+    }
+}

From eef6aefc21dd85725bc5b2d770997b19eb95a25a Mon Sep 17 00:00:00 2001
From: Daniel Fuchs <dfuchs@openjdk.org>
Date: Wed, 26 Mar 2025 13:01:44 +0000
Subject: [PATCH 500/587] 8352623: MultiExchange should cancel exchange impl if
 responseFilters throws

Reviewed-by: djelinski
---
 .../jdk/internal/net/http/MultiExchange.java  |  7 +-
 .../java/net/httpclient/UnauthorizedTest.java | 92 ++++++++++---------
 2 files changed, 56 insertions(+), 43 deletions(-)

diff --git a/src/java.net.http/share/classes/jdk/internal/net/http/MultiExchange.java b/src/java.net.http/share/classes/jdk/internal/net/http/MultiExchange.java
index a7fe5f19e02..20120aad7d5 100644
--- a/src/java.net.http/share/classes/jdk/internal/net/http/MultiExchange.java
+++ b/src/java.net.http/share/classes/jdk/internal/net/http/MultiExchange.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@
 
 package jdk.internal.net.http;
 
+import java.io.IOError;
 import java.io.IOException;
 import java.lang.ref.WeakReference;
 import java.net.ConnectException;
@@ -440,7 +441,9 @@ class MultiExchange<T> implements Cancelable {
                         try {
                             // 3. apply response filters
                             newrequest = responseFilters(response);
-                        } catch (IOException e) {
+                        } catch (Throwable t) {
+                            IOException e = t instanceof IOException io ? io : new IOException(t);
+                            exch.exchImpl.cancel(e);
                             return failedFuture(e);
                         }
                         // 4. check filter result and repeat or continue
diff --git a/test/jdk/java/net/httpclient/UnauthorizedTest.java b/test/jdk/java/net/httpclient/UnauthorizedTest.java
index 389a79761dd..e2124f2a7ed 100644
--- a/test/jdk/java/net/httpclient/UnauthorizedTest.java
+++ b/test/jdk/java/net/httpclient/UnauthorizedTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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 8203882
+ * @bug 8203882 8352623
  * @summary (httpclient) Check that HttpClient throws IOException when
  *      receiving 401/407 with no WWW-Authenticate/Proxy-Authenticate
  *      header only in the case where an authenticator is configured
@@ -36,9 +36,6 @@
  *       UnauthorizedTest
  */
 
-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;
@@ -49,9 +46,8 @@ import javax.net.ssl.SSLContext;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
+import java.lang.ref.WeakReference;
 import java.net.Authenticator;
-import java.net.InetAddress;
-import java.net.InetSocketAddress;
 import java.net.URI;
 import java.net.http.HttpClient;
 import java.net.http.HttpRequest;
@@ -60,7 +56,6 @@ import java.net.http.HttpResponse.BodyHandlers;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.atomic.AtomicLong;
 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.Version.HTTP_1_1;
@@ -95,41 +90,45 @@ public class UnauthorizedTest implements HttpServerAdapters {
     static final int HTTP_OK = 200;
     static final String MESSAGE = "Unauthorized";
 
+    static WeakReference<HttpClient> ref(HttpClient client) {
+        return new WeakReference<>(client);
+    }
+
     @DataProvider(name = "all")
     public Object[][] positive() {
         return new Object[][] {
-                { httpURI   + "/server", UNAUTHORIZED, true, authClient},
-                { httpsURI  + "/server", UNAUTHORIZED, true, authClient},
-                { http2URI  + "/server", UNAUTHORIZED, true, authClient},
-                { https2URI + "/server", UNAUTHORIZED, true, authClient},
-                { httpURI   + "/proxy",  PROXY_UNAUTHORIZED, true, authClient},
-                { httpsURI  + "/proxy",  PROXY_UNAUTHORIZED, true, authClient},
-                { http2URI  + "/proxy",  PROXY_UNAUTHORIZED, true, authClient},
-                { https2URI + "/proxy",  PROXY_UNAUTHORIZED, true, authClient},
-                { httpURI   + "/server", UNAUTHORIZED, false, authClient},
-                { httpsURI  + "/server", UNAUTHORIZED, false, authClient},
-                { http2URI  + "/server", UNAUTHORIZED, false, authClient},
-                { https2URI + "/server", UNAUTHORIZED, false, authClient},
-                { httpURI   + "/proxy",  PROXY_UNAUTHORIZED, false, authClient},
-                { httpsURI  + "/proxy",  PROXY_UNAUTHORIZED, false, authClient},
-                { http2URI  + "/proxy",  PROXY_UNAUTHORIZED, false, authClient},
-                { https2URI + "/proxy",  PROXY_UNAUTHORIZED, false, authClient},
-                { httpURI   + "/server", UNAUTHORIZED, true, noAuthClient},
-                { httpsURI  + "/server", UNAUTHORIZED, true, noAuthClient},
-                { http2URI  + "/server", UNAUTHORIZED, true, noAuthClient},
-                { https2URI + "/server", UNAUTHORIZED, true, noAuthClient},
-                { httpURI   + "/proxy",  PROXY_UNAUTHORIZED, true, noAuthClient},
-                { httpsURI  + "/proxy",  PROXY_UNAUTHORIZED, true, noAuthClient},
-                { http2URI  + "/proxy",  PROXY_UNAUTHORIZED, true, noAuthClient},
-                { https2URI + "/proxy",  PROXY_UNAUTHORIZED, true, noAuthClient},
-                { httpURI   + "/server", UNAUTHORIZED, false, noAuthClient},
-                { httpsURI  + "/server", UNAUTHORIZED, false, noAuthClient},
-                { http2URI  + "/server", UNAUTHORIZED, false, noAuthClient},
-                { https2URI + "/server", UNAUTHORIZED, false, noAuthClient},
-                { httpURI   + "/proxy",  PROXY_UNAUTHORIZED, false, noAuthClient},
-                { httpsURI  + "/proxy",  PROXY_UNAUTHORIZED, false, noAuthClient},
-                { http2URI  + "/proxy",  PROXY_UNAUTHORIZED, false, noAuthClient},
-                { https2URI + "/proxy",  PROXY_UNAUTHORIZED, false, noAuthClient},
+                { httpURI   + "/server", UNAUTHORIZED, true, ref(authClient)},
+                { httpsURI  + "/server", UNAUTHORIZED, true, ref(authClient)},
+                { http2URI  + "/server", UNAUTHORIZED, true, ref(authClient)},
+                { https2URI + "/server", UNAUTHORIZED, true, ref(authClient)},
+                { httpURI   + "/proxy",  PROXY_UNAUTHORIZED, true, ref(authClient)},
+                { httpsURI  + "/proxy",  PROXY_UNAUTHORIZED, true, ref(authClient)},
+                { http2URI  + "/proxy",  PROXY_UNAUTHORIZED, true, ref(authClient)},
+                { https2URI + "/proxy",  PROXY_UNAUTHORIZED, true, ref(authClient)},
+                { httpURI   + "/server", UNAUTHORIZED, false, ref(authClient)},
+                { httpsURI  + "/server", UNAUTHORIZED, false, ref(authClient)},
+                { http2URI  + "/server", UNAUTHORIZED, false, ref(authClient)},
+                { https2URI + "/server", UNAUTHORIZED, false, ref(authClient)},
+                { httpURI   + "/proxy",  PROXY_UNAUTHORIZED, false, ref(authClient)},
+                { httpsURI  + "/proxy",  PROXY_UNAUTHORIZED, false, ref(authClient)},
+                { http2URI  + "/proxy",  PROXY_UNAUTHORIZED, false, ref(authClient)},
+                { https2URI + "/proxy",  PROXY_UNAUTHORIZED, false, ref(authClient)},
+                { httpURI   + "/server", UNAUTHORIZED, true, ref(noAuthClient)},
+                { httpsURI  + "/server", UNAUTHORIZED, true, ref(noAuthClient)},
+                { http2URI  + "/server", UNAUTHORIZED, true, ref(noAuthClient)},
+                { https2URI + "/server", UNAUTHORIZED, true, ref(noAuthClient)},
+                { httpURI   + "/proxy",  PROXY_UNAUTHORIZED, true, ref(noAuthClient)},
+                { httpsURI  + "/proxy",  PROXY_UNAUTHORIZED, true, ref(noAuthClient)},
+                { http2URI  + "/proxy",  PROXY_UNAUTHORIZED, true, ref(noAuthClient)},
+                { https2URI + "/proxy",  PROXY_UNAUTHORIZED, true, ref(noAuthClient)},
+                { httpURI   + "/server", UNAUTHORIZED, false, ref(noAuthClient)},
+                { httpsURI  + "/server", UNAUTHORIZED, false, ref(noAuthClient)},
+                { http2URI  + "/server", UNAUTHORIZED, false, ref(noAuthClient)},
+                { https2URI + "/server", UNAUTHORIZED, false, ref(noAuthClient)},
+                { httpURI   + "/proxy",  PROXY_UNAUTHORIZED, false, ref(noAuthClient)},
+                { httpsURI  + "/proxy",  PROXY_UNAUTHORIZED, false, ref(noAuthClient)},
+                { http2URI  + "/proxy",  PROXY_UNAUTHORIZED, false, ref(noAuthClient)},
+                { https2URI + "/proxy",  PROXY_UNAUTHORIZED, false, ref(noAuthClient)},
         };
     }
 
@@ -139,7 +138,8 @@ public class UnauthorizedTest implements HttpServerAdapters {
     };
 
     @Test(dataProvider = "all")
-    void test(String uriString, int code, boolean async, HttpClient client) throws Throwable {
+    void test(String uriString, int code, boolean async, WeakReference<HttpClient> clientRef) throws Throwable {
+        HttpClient client = clientRef.get();
         out.printf("%n---- starting (%s, %d, %s, %s) ----%n",
                 uriString, code, async ? "async" : "sync",
                 client.authenticator().isPresent() ? "authClient" : "noAuthClient");
@@ -223,10 +223,20 @@ public class UnauthorizedTest implements HttpServerAdapters {
 
     @AfterTest
     public void teardown() throws Exception {
+        // authClient.close();
+        // noAuthClient.close();
+        var TRACKER = ReferenceTracker.INSTANCE;
+        TRACKER.track(authClient);
+        TRACKER.track(noAuthClient);
+        authClient = noAuthClient = null;
+        System.gc();
+        var error = TRACKER.check(1000);
+
         httpTestServer.stop();
         httpsTestServer.stop();
         http2TestServer.stop();
         https2TestServer.stop();
+        if (error != null) throw error;
     }
 
     static class UnauthorizedHandler implements HttpTestHandler {

From 79bffe2f28f90986d45f4e91efc021290b4fc00a Mon Sep 17 00:00:00 2001
From: Roland Westrelin <roland@openjdk.org>
Date: Wed, 26 Mar 2025 14:37:53 +0000
Subject: [PATCH 501/587] 8349361: C2: RShiftL should support all applicable
 transformations that RShiftI does

Reviewed-by: epeter, chagedorn, jkarthikeyan
---
 src/hotspot/share/opto/mulnode.cpp            | 267 ++++++++++--------
 src/hotspot/share/opto/mulnode.hpp            |  29 +-
 src/hotspot/share/opto/node.hpp               |   1 +
 src/hotspot/share/opto/phaseX.cpp             |   4 +-
 src/hotspot/share/opto/type.cpp               |   4 +
 src/hotspot/share/opto/type.hpp               |   1 +
 .../irTests/RShiftINodeIdealizationTests.java |  80 +++++-
 .../irTests/RShiftLNodeIdealizationTests.java |  68 ++++-
 8 files changed, 317 insertions(+), 137 deletions(-)

diff --git a/src/hotspot/share/opto/mulnode.cpp b/src/hotspot/share/opto/mulnode.cpp
index e149662e199..c78b92c6af5 100644
--- a/src/hotspot/share/opto/mulnode.cpp
+++ b/src/hotspot/share/opto/mulnode.cpp
@@ -225,6 +225,18 @@ MulNode* MulNode::make(Node* in1, Node* in2, BasicType bt) {
   return nullptr;
 }
 
+MulNode* MulNode::make_and(Node* in1, Node* in2, BasicType bt) {
+  switch (bt) {
+    case T_INT:
+      return new AndINode(in1, in2);
+    case T_LONG:
+      return new AndLNode(in1, in2);
+    default:
+      fatal("Not implemented for %s", type2name(bt));
+  }
+  return nullptr;
+}
+
 
 //=============================================================================
 //------------------------------Ideal------------------------------------------
@@ -949,7 +961,7 @@ static bool const_shift_count(PhaseGVN* phase, Node* shiftNode, int* count) {
   return false;
 }
 
-static int maskShiftAmount(PhaseGVN* phase, Node* shiftNode, int nBits) {
+static int maskShiftAmount(PhaseGVN* phase, Node* shiftNode, uint nBits) {
   int count = 0;
   if (const_shift_count(phase, shiftNode, &count)) {
     int maskedShift = count & (nBits - 1);
@@ -1378,29 +1390,42 @@ const Type* LShiftLNode::Value(PhaseGVN* phase) const {
   return TypeLong::make( (jlong)r1->get_con() << (jint)shift );
 }
 
+RShiftNode* RShiftNode::make(Node* in1, Node* in2, BasicType bt) {
+  switch (bt) {
+    case T_INT:
+      return new RShiftINode(in1, in2);
+    case T_LONG:
+      return new RShiftLNode(in1, in2);
+    default:
+      fatal("Not implemented for %s", type2name(bt));
+  }
+  return nullptr;
+}
+
+
 //=============================================================================
 //------------------------------Identity---------------------------------------
-Node* RShiftINode::Identity(PhaseGVN* phase) {
+Node* RShiftNode::IdentityIL(PhaseGVN* phase, BasicType bt) {
   int count = 0;
   if (const_shift_count(phase, this, &count)) {
-    if ((count & (BitsPerJavaInteger - 1)) == 0) {
-      // Shift by a multiple of 32 does nothing
+    if ((count & (bits_per_java_integer(bt) - 1)) == 0) {
+      // Shift by a multiple of 32/64 does nothing
       return in(1);
     }
     // Check for useless sign-masking
-    if (in(1)->Opcode() == Op_LShiftI &&
+    if (in(1)->Opcode() == Op_LShift(bt) &&
         in(1)->req() == 3 &&
         in(1)->in(2) == in(2)) {
-      count &= BitsPerJavaInteger-1; // semantics of Java shifts
+      count &= bits_per_java_integer(bt) - 1; // semantics of Java shifts
       // Compute masks for which this shifting doesn't change
-      int lo = (-1 << (BitsPerJavaInteger - ((uint)count)-1)); // FFFF8000
-      int hi = ~lo;               // 00007FFF
-      const TypeInt* t11 = phase->type(in(1)->in(1))->isa_int();
+      jlong lo = (CONST64(-1) << (bits_per_java_integer(bt) - ((uint)count)-1)); // FFFF8000
+      jlong hi = ~lo;                                                            // 00007FFF
+      const TypeInteger* t11 = phase->type(in(1)->in(1))->isa_integer(bt);
       if (t11 == nullptr) {
         return this;
       }
       // Does actual value fit inside of mask?
-      if (lo <= t11->_lo && t11->_hi <= hi) {
+      if (lo <= t11->lo_as_long() && t11->hi_as_long() <= hi) {
         return in(1)->in(1);      // Then shifting is a nop
       }
     }
@@ -1408,39 +1433,62 @@ Node* RShiftINode::Identity(PhaseGVN* phase) {
   return this;
 }
 
-//------------------------------Ideal------------------------------------------
-Node *RShiftINode::Ideal(PhaseGVN *phase, bool can_reshape) {
+Node* RShiftINode::Identity(PhaseGVN* phase) {
+  return IdentityIL(phase, T_INT);
+}
+
+Node* RShiftNode::IdealIL(PhaseGVN* phase, bool can_reshape, BasicType bt) {
   // Inputs may be TOP if they are dead.
-  const TypeInt *t1 = phase->type(in(1))->isa_int();
-  if (!t1) return nullptr;        // Left input is an integer
-  const TypeInt *t3;  // type of in(1).in(2)
-  int shift = maskShiftAmount(phase, this, BitsPerJavaInteger);
+  const TypeInteger* t1 = phase->type(in(1))->isa_integer(bt);
+  if (t1 == nullptr) {
+    return NodeSentinel;        // Left input is an integer
+  }
+  int shift = maskShiftAmount(phase, this, bits_per_java_integer(bt));
   if (shift == 0) {
-    return nullptr;
+    return NodeSentinel;
   }
 
   // Check for (x & 0xFF000000) >> 24, whose mask can be made smaller.
+  // and convert to (x >> 24) & (0xFF000000 >> 24) = x >> 24
   // Such expressions arise normally from shift chains like (byte)(x >> 24).
-  const Node *mask = in(1);
-  if( mask->Opcode() == Op_AndI &&
-      (t3 = phase->type(mask->in(2))->isa_int()) &&
-      t3->is_con() ) {
-    Node *x = mask->in(1);
-    jint maskbits = t3->get_con();
-    // Convert to "(x >> shift) & (mask >> shift)"
-    Node *shr_nomask = phase->transform( new RShiftINode(mask->in(1), in(2)) );
-    return new AndINode(shr_nomask, phase->intcon( maskbits >> shift));
+  const Node* and_node = in(1);
+  if (and_node->Opcode() != Op_And(bt)) {
+    return nullptr;
   }
+  const TypeInteger* mask_t = phase->type(and_node->in(2))->isa_integer(bt);
+  if (mask_t != nullptr && mask_t->is_con()) {
+    jlong maskbits = mask_t->get_con_as_long(bt);
+    // Convert to "(x >> shift) & (mask >> shift)"
+    Node* shr_nomask = phase->transform(RShiftNode::make(and_node->in(1), in(2), bt));
+    return MulNode::make_and(shr_nomask, phase->integercon(maskbits >> shift, bt), bt);
+  }
+  return nullptr;
+}
+
+Node* RShiftINode::Ideal(PhaseGVN* phase, bool can_reshape) {
+  Node* progress = IdealIL(phase, can_reshape, T_INT);
+  if (progress == NodeSentinel) {
+    return nullptr;
+  }
+  if (progress != nullptr) {
+    return progress;
+  }
+  int shift = maskShiftAmount(phase, this, BitsPerJavaInteger);
+  assert(shift != 0, "handled by IdealIL");
 
   // Check for "(short[i] <<16)>>16" which simply sign-extends
   const Node *shl = in(1);
-  if( shl->Opcode() != Op_LShiftI ) return nullptr;
+  if (shl->Opcode() != Op_LShiftI) {
+    return nullptr;
+  }
 
-  if( shift == 16 &&
-      (t3 = phase->type(shl->in(2))->isa_int()) &&
-      t3->is_con(16) ) {
+  const TypeInt* left_shift_t = phase->type(shl->in(2))->isa_int();
+  if (left_shift_t == nullptr) {
+    return nullptr;
+  }
+  if (shift == 16 && left_shift_t->is_con(16)) {
     Node *ld = shl->in(1);
-    if( ld->Opcode() == Op_LoadS ) {
+    if (ld->Opcode() == Op_LoadS) {
       // Sign extension is just useless here.  Return a RShiftI of zero instead
       // returning 'ld' directly.  We cannot return an old Node directly as
       // that is the job of 'Identity' calls and Identity calls only work on
@@ -1458,9 +1506,7 @@ Node *RShiftINode::Ideal(PhaseGVN *phase, bool can_reshape) {
   }
 
   // Check for "(byte[i] <<24)>>24" which simply sign-extends
-  if( shift == 24 &&
-      (t3 = phase->type(shl->in(2))->isa_int()) &&
-      t3->is_con(24) ) {
+  if (shift == 24 && left_shift_t->is_con(24)) {
     Node *ld = shl->in(1);
     if (ld->Opcode() == Op_LoadB) {
       // Sign extension is just useless here
@@ -1473,46 +1519,66 @@ Node *RShiftINode::Ideal(PhaseGVN *phase, bool can_reshape) {
   return nullptr;
 }
 
-//------------------------------Value------------------------------------------
-// A RShiftINode shifts its input2 right by input1 amount.
-const Type* RShiftINode::Value(PhaseGVN* phase) const {
-  const Type *t1 = phase->type( in(1) );
-  const Type *t2 = phase->type( in(2) );
+const Type* RShiftNode::ValueIL(PhaseGVN* phase, BasicType bt) const {
+  const Type* t1 = phase->type(in(1));
+  const Type* t2 = phase->type(in(2));
   // Either input is TOP ==> the result is TOP
-  if( t1 == Type::TOP ) return Type::TOP;
-  if( t2 == Type::TOP ) return Type::TOP;
+  if (t1 == Type::TOP) {
+    return Type::TOP;
+  }
+  if (t2 == Type::TOP) {
+    return Type::TOP;
+  }
 
   // Left input is ZERO ==> the result is ZERO.
-  if( t1 == TypeInt::ZERO ) return TypeInt::ZERO;
+  if (t1 == TypeInteger::zero(bt)) {
+    return TypeInteger::zero(bt);
+  }
   // Shift by zero does nothing
-  if( t2 == TypeInt::ZERO ) return t1;
+  if (t2 == TypeInt::ZERO) {
+    return t1;
+  }
 
   // Either input is BOTTOM ==> the result is BOTTOM
-  if (t1 == Type::BOTTOM || t2 == Type::BOTTOM)
-    return TypeInt::INT;
+  if (t1 == Type::BOTTOM || t2 == Type::BOTTOM) {
+    return TypeInteger::bottom(bt);
+  }
 
-  const TypeInt *r1 = t1->is_int(); // Handy access
-  const TypeInt *r2 = t2->is_int(); // Handy access
+  const TypeInteger* r1 = t1->isa_integer(bt);
+  const TypeInt* r2 = t2->isa_int();
 
   // If the shift is a constant, just shift the bounds of the type.
-  // For example, if the shift is 31, we just propagate sign bits.
+  // For example, if the shift is 31/63, we just propagate sign bits.
   if (!r1->is_con() && r2->is_con()) {
     uint shift = r2->get_con();
-    shift &= BitsPerJavaInteger-1;  // semantics of Java shifts
-    // Shift by a multiple of 32 does nothing:
-    if (shift == 0)  return t1;
+    shift &= bits_per_java_integer(bt) - 1;  // semantics of Java shifts
+    // Shift by a multiple of 32/64 does nothing:
+    if (shift == 0) {
+      return t1;
+    }
     // Calculate reasonably aggressive bounds for the result.
     // This is necessary if we are to correctly type things
     // like (x<<24>>24) == ((byte)x).
-    jint lo = (jint)r1->_lo >> (jint)shift;
-    jint hi = (jint)r1->_hi >> (jint)shift;
+    jlong lo = r1->lo_as_long() >> (jint)shift;
+    jlong hi = r1->hi_as_long() >> (jint)shift;
     assert(lo <= hi, "must have valid bounds");
-    const TypeInt* ti = TypeInt::make(lo, hi, MAX2(r1->_widen,r2->_widen));
+#ifdef ASSERT
+   if (bt == T_INT) {
+     jint lo_verify = checked_cast<jint>(r1->lo_as_long()) >> (jint)shift;
+     jint hi_verify = checked_cast<jint>(r1->hi_as_long()) >> (jint)shift;
+     assert((checked_cast<jint>(lo) == lo_verify) && (checked_cast<jint>(hi) == hi_verify), "inconsistent");
+   }
+#endif
+    const TypeInteger* ti = TypeInteger::make(lo, hi, MAX2(r1->_widen,r2->_widen), bt);
 #ifdef ASSERT
     // Make sure we get the sign-capture idiom correct.
-    if (shift == BitsPerJavaInteger-1) {
-      if (r1->_lo >= 0) assert(ti == TypeInt::ZERO,    ">>31 of + is  0");
-      if (r1->_hi <  0) assert(ti == TypeInt::MINUS_1, ">>31 of - is -1");
+    if (shift == bits_per_java_integer(bt) - 1) {
+      if (r1->lo_as_long() >= 0) {
+        assert(ti == TypeInteger::zero(bt),    ">>31/63 of + is  0");
+      }
+      if (r1->hi_as_long() <  0) {
+        assert(ti == TypeInteger::minus_1(bt), ">>31/63 of - is -1");
+      }
     }
 #endif
     return ti;
@@ -1520,89 +1586,42 @@ const Type* RShiftINode::Value(PhaseGVN* phase) const {
 
   if (!r1->is_con() || !r2->is_con()) {
     // If the left input is non-negative the result must also be non-negative, regardless of what the right input is.
-    if (r1->_lo >= 0) {
-      return TypeInt::make(0, r1->_hi, MAX2(r1->_widen, r2->_widen));
+    if (r1->lo_as_long() >= 0) {
+      return TypeInteger::make(0, r1->hi_as_long(), MAX2(r1->_widen, r2->_widen), bt);
     }
 
     // Conversely, if the left input is negative then the result must be negative.
-    if (r1->_hi <= -1) {
-      return TypeInt::make(r1->_lo, -1, MAX2(r1->_widen, r2->_widen));
+    if (r1->hi_as_long() <= -1) {
+      return TypeInteger::make(r1->lo_as_long(), -1, MAX2(r1->_widen, r2->_widen), bt);
     }
 
-    return TypeInt::INT;
+    return TypeInteger::bottom(bt);
   }
 
   // Signed shift right
-  return TypeInt::make(r1->get_con() >> (r2->get_con() & 31));
+  return TypeInteger::make(r1->get_con_as_long(bt) >> (r2->get_con() & (bits_per_java_integer(bt) - 1)), bt);
+}
+
+const Type* RShiftINode::Value(PhaseGVN* phase) const {
+  return ValueIL(phase, T_INT);
 }
 
 //=============================================================================
 //------------------------------Identity---------------------------------------
 Node* RShiftLNode::Identity(PhaseGVN* phase) {
-  const TypeInt *ti = phase->type(in(2))->isa_int(); // Shift count is an int.
-  return (ti && ti->is_con() && (ti->get_con() & (BitsPerJavaLong - 1)) == 0) ? in(1) : this;
+  return IdentityIL(phase, T_LONG);
+}
+
+Node* RShiftLNode::Ideal(PhaseGVN *phase, bool can_reshape) {
+  Node* progress = IdealIL(phase, can_reshape, T_LONG);
+  if (progress == NodeSentinel) {
+    return nullptr;
+  }
+  return progress;
 }
 
-//------------------------------Value------------------------------------------
-// A RShiftLNode shifts its input2 right by input1 amount.
 const Type* RShiftLNode::Value(PhaseGVN* phase) const {
-  const Type *t1 = phase->type( in(1) );
-  const Type *t2 = phase->type( in(2) );
-  // Either input is TOP ==> the result is TOP
-  if( t1 == Type::TOP ) return Type::TOP;
-  if( t2 == Type::TOP ) return Type::TOP;
-
-  // Left input is ZERO ==> the result is ZERO.
-  if( t1 == TypeLong::ZERO ) return TypeLong::ZERO;
-  // Shift by zero does nothing
-  if( t2 == TypeInt::ZERO ) return t1;
-
-  // Either input is BOTTOM ==> the result is BOTTOM
-  if (t1 == Type::BOTTOM || t2 == Type::BOTTOM)
-    return TypeLong::LONG;
-
-  const TypeLong *r1 = t1->is_long(); // Handy access
-  const TypeInt  *r2 = t2->is_int (); // Handy access
-
-  // If the shift is a constant, just shift the bounds of the type.
-  // For example, if the shift is 63, we just propagate sign bits.
-  if (!r1->is_con() && r2->is_con()) {
-    uint shift = r2->get_con();
-    shift &= (2*BitsPerJavaInteger)-1;  // semantics of Java shifts
-    // Shift by a multiple of 64 does nothing:
-    if (shift == 0)  return t1;
-    // Calculate reasonably aggressive bounds for the result.
-    // This is necessary if we are to correctly type things
-    // like (x<<24>>24) == ((byte)x).
-    jlong lo = (jlong)r1->_lo >> (jlong)shift;
-    jlong hi = (jlong)r1->_hi >> (jlong)shift;
-    assert(lo <= hi, "must have valid bounds");
-    const TypeLong* tl = TypeLong::make(lo, hi, MAX2(r1->_widen,r2->_widen));
-    #ifdef ASSERT
-    // Make sure we get the sign-capture idiom correct.
-    if (shift == (2*BitsPerJavaInteger)-1) {
-      if (r1->_lo >= 0) assert(tl == TypeLong::ZERO,    ">>63 of + is 0");
-      if (r1->_hi < 0)  assert(tl == TypeLong::MINUS_1, ">>63 of - is -1");
-    }
-    #endif
-    return tl;
-  }
-
-  if (!r1->is_con() || !r2->is_con()) {
-    // If the left input is non-negative the result must also be non-negative, regardless of what the right input is.
-    if (r1->_lo >= 0) {
-      return TypeLong::make(0, r1->_hi, MAX2(r1->_widen, r2->_widen));
-    }
-
-    // Conversely, if the left input is negative then the result must be negative.
-    if (r1->_hi <= -1) {
-      return TypeLong::make(r1->_lo, -1, MAX2(r1->_widen, r2->_widen));
-    }
-
-    return TypeLong::LONG;
-  }
-
-  return TypeLong::make(r1->get_con() >> (r2->get_con() & 63));
+  return ValueIL(phase, T_LONG);
 }
 
 //=============================================================================
diff --git a/src/hotspot/share/opto/mulnode.hpp b/src/hotspot/share/opto/mulnode.hpp
index 65a2cd112ec..b736c17b300 100644
--- a/src/hotspot/share/opto/mulnode.hpp
+++ b/src/hotspot/share/opto/mulnode.hpp
@@ -82,6 +82,7 @@ public:
   virtual int min_opcode() const = 0;
 
   static MulNode* make(Node* in1, Node* in2, BasicType bt);
+  static MulNode* make_and(Node* in1, Node* in2, BasicType bt);
 
 protected:
   Node* AndIL_sum_and_mask(PhaseGVN* phase, BasicType bt);
@@ -318,28 +319,42 @@ class RotateRightNode : public TypeNode {
   virtual const Type* Value(PhaseGVN* phase) const;
 };
 
+
+class RShiftNode : public Node {
+ public:
+  RShiftNode(Node* in1, Node* in2) : Node(nullptr, in1, in2) {}
+  Node* IdealIL(PhaseGVN* phase, bool can_reshape, BasicType bt);
+  Node* IdentityIL(PhaseGVN* phase, BasicType bt);
+  const Type* ValueIL(PhaseGVN* phase, BasicType bt) const;
+  static RShiftNode* make(Node* in1, Node* in2, BasicType bt);
+};
+
 //------------------------------RShiftINode------------------------------------
 // Signed shift right
-class RShiftINode : public Node {
+class RShiftINode : public RShiftNode {
 public:
-  RShiftINode( Node *in1, Node *in2 ) : Node(nullptr,in1,in2) {}
+  RShiftINode(Node* in1, Node* in2) : RShiftNode(in1, in2) {}
   virtual int Opcode() const;
   virtual Node* Identity(PhaseGVN* phase);
-  virtual Node *Ideal(PhaseGVN *phase, bool can_reshape);
+
+  virtual Node* Ideal(PhaseGVN* phase, bool can_reshape);
   virtual const Type* Value(PhaseGVN* phase) const;
-  const Type *bottom_type() const { return TypeInt::INT; }
+
+  const Type* bottom_type() const { return TypeInt::INT; }
   virtual uint ideal_reg() const { return Op_RegI; }
 };
 
 //------------------------------RShiftLNode------------------------------------
 // Signed shift right
-class RShiftLNode : public Node {
+class RShiftLNode : public RShiftNode {
 public:
-  RShiftLNode( Node *in1, Node *in2 ) : Node(nullptr,in1,in2) {}
+  RShiftLNode(Node* in1, Node* in2) : RShiftNode(in1,in2) {}
   virtual int Opcode() const;
   virtual Node* Identity(PhaseGVN* phase);
+  virtual Node* Ideal(PhaseGVN *phase, bool can_reshape);
+
   virtual const Type* Value(PhaseGVN* phase) const;
-  const Type *bottom_type() const { return TypeLong::LONG; }
+  const Type* bottom_type() const { return TypeLong::LONG; }
   virtual uint ideal_reg() const { return Op_RegL; }
 };
 
diff --git a/src/hotspot/share/opto/node.hpp b/src/hotspot/share/opto/node.hpp
index 3efe4ca0825..562e090a41b 100644
--- a/src/hotspot/share/opto/node.hpp
+++ b/src/hotspot/share/opto/node.hpp
@@ -2064,6 +2064,7 @@ public:
 }
 
 Op_IL(Add)
+Op_IL(And)
 Op_IL(Sub)
 Op_IL(Mul)
 Op_IL(URShift)
diff --git a/src/hotspot/share/opto/phaseX.cpp b/src/hotspot/share/opto/phaseX.cpp
index 0369143c7b0..ad6d8b4112f 100644
--- a/src/hotspot/share/opto/phaseX.cpp
+++ b/src/hotspot/share/opto/phaseX.cpp
@@ -1611,10 +1611,10 @@ void PhaseIterGVN::add_users_of_use_to_worklist(Node* n, Node* use, Unique_Node_
     use->visit_uses(push_the_uses_to_worklist, is_boundary);
   }
   // If changed LShift inputs, check RShift users for useless sign-ext
-  if( use_op == Op_LShiftI ) {
+  if (use_op == Op_LShiftI || use_op == Op_LShiftL) {
     for (DUIterator_Fast i2max, i2 = use->fast_outs(i2max); i2 < i2max; i2++) {
       Node* u = use->fast_out(i2);
-      if (u->Opcode() == Op_RShiftI)
+      if (u->Opcode() == Op_RShiftI || u->Opcode() == Op_RShiftL)
         worklist.push(u);
     }
   }
diff --git a/src/hotspot/share/opto/type.cpp b/src/hotspot/share/opto/type.cpp
index fabcec48719..474145f2d06 100644
--- a/src/hotspot/share/opto/type.cpp
+++ b/src/hotspot/share/opto/type.cpp
@@ -1699,6 +1699,10 @@ const TypeInteger* TypeInteger::make(jlong lo, jlong hi, int w, BasicType bt) {
   return TypeLong::make(lo, hi, w);
 }
 
+const TypeInteger* TypeInteger::make(jlong con, BasicType bt) {
+  return make(con, con, WidenMin, bt);
+}
+
 jlong TypeInteger::get_con_as_long(BasicType bt) const {
   if (bt == T_INT) {
     return is_int()->get_con();
diff --git a/src/hotspot/share/opto/type.hpp b/src/hotspot/share/opto/type.hpp
index 6e17ef0db05..fe460cfb1d4 100644
--- a/src/hotspot/share/opto/type.hpp
+++ b/src/hotspot/share/opto/type.hpp
@@ -606,6 +606,7 @@ public:
   virtual short widen_limit() const { return _widen; }
 
   static const TypeInteger* make(jlong lo, jlong hi, int w, BasicType bt);
+  static const TypeInteger* make(jlong con, BasicType bt);
 
   static const TypeInteger* bottom(BasicType type);
   static const TypeInteger* zero(BasicType type);
diff --git a/test/hotspot/jtreg/compiler/c2/irTests/RShiftINodeIdealizationTests.java b/test/hotspot/jtreg/compiler/c2/irTests/RShiftINodeIdealizationTests.java
index e6501d3728a..bf500d42540 100644
--- a/test/hotspot/jtreg/compiler/c2/irTests/RShiftINodeIdealizationTests.java
+++ b/test/hotspot/jtreg/compiler/c2/irTests/RShiftINodeIdealizationTests.java
@@ -27,7 +27,7 @@ import compiler.lib.ir_framework.*;
 
 /*
  * @test
- * @bug 8320330
+ * @bug 8320330 8349361
  * @summary Test that RShiftINode optimizations are being performed as expected.
  * @library /test/lib /
  * @run driver compiler.c2.irTests.RShiftINodeIdealizationTests
@@ -37,7 +37,7 @@ public class RShiftINodeIdealizationTests {
         TestFramework.run();
     }
 
-    @Run(test = { "test1", "test2", "test3", "test4" })
+    @Run(test = { "test1", "test2", "test3", "test4", "test5", "test6", "test7", "test8", "test9", "test10" })
     public void runMethod() {
         int a = RunInfo.getRandom().nextInt();
         int b = RunInfo.getRandom().nextInt();
@@ -56,6 +56,10 @@ public class RShiftINodeIdealizationTests {
         assertResult(max, min);
         assertResult(min, min);
         assertResult(max, max);
+        assertResult(test7Min, b);
+        assertResult(test7Max, b);
+        assertResult(test7Min-1, b);
+        assertResult(test7Max+1, b);
     }
 
     @DontCompile
@@ -64,6 +68,15 @@ public class RShiftINodeIdealizationTests {
         Asserts.assertEQ(((x & 127) >> y) >= 0 ? 0 : 1, test2(x, y));
         Asserts.assertEQ(((-(x & 127) - 1) >> y) >= 0 ? 0 : 1, test3(x, y));
         Asserts.assertEQ((x >> 30) > 4 ? 0 : 1, test4(x, y));
+        Asserts.assertEQ((x & test5Mask) >> test5Shift, test5(x));
+        Asserts.assertEQ(x, test6(x));
+        int x7 = Integer.max(Integer.min(x, test7Max), test7Min);
+        Asserts.assertEQ(((x7 << test7Shift) >> test7Shift), test7(x));
+        int x8 = Integer.max(Integer.min(x, test7Max+1), test7Min);
+        Asserts.assertEQ((x8 << test7Shift) >> test7Shift, test8(x));
+        int x9 = Integer.max(Integer.min(x, test7Max), test7Min-1);
+        Asserts.assertEQ((x9 << test7Shift) >> test7Shift, test9(x));
+        Asserts.assertEQ((x7 << test7Shift) >> test10Shift, test10(x));
     }
 
     @Test
@@ -89,4 +102,67 @@ public class RShiftINodeIdealizationTests {
     public int test4(int x, int y) {
         return (x >> 30) > 4 ? 0 : 1;
     }
+
+    final static int test5Shift = RunInfo.getRandom().nextInt(1, 32);
+    final static int test5Mask = -1 << test5Shift;
+
+    @Test
+    @IR(counts = { IRNode.RSHIFT_I, "1" })
+    @IR(failOn = { IRNode.AND_I })
+    public int test5(int x) {
+        return (x & test5Mask) >> test5Shift;
+    }
+
+    final static int test6Shift = RunInfo.getRandom().nextInt(Integer.MAX_VALUE / 32) * 32 ;
+
+    @Test
+    @IR(failOn = { IRNode.RSHIFT_I })
+    public int test6(int x) {
+        return (x >> test6Shift);
+    }
+
+
+    // test that (x << shift) >> shift) is a nop if upper bits of x
+    // that are shifted left and then right + one bit are all ones or
+    // zeroes. For instance:
+    // shift = 15, min = 0xffff0000, max=0x0000ffff
+    // min << shift = 0x80000000, (min << shift) >> shift = 0xffff0000
+    // (min+1) << shift = 0x80008000, ((min+1) << shift) >> shift = 0xffff0001
+    // (max-1) << shift = 0x7fff0000, ((max-1) << shift) >> shift = 0x0000fffe
+    // max << shift = 0x7fff8000, (min << shift) >> shift = 0x0000ffff
+    // But:
+    // (min-1) << shift = 7fff8000, ((min-1) << shift) >> shift = 0x0000ffff != 0xfffeffff
+    // (max+1) << shift = 0x80000000, ((max+1) << shift) >> shift = 0xffff0000 != 0x00010000
+    final static int test7Shift = RunInfo.getRandom().nextInt(1, 32);
+    final static int test7Min = -1 << (32 - test7Shift - 1);
+    final static int test7Max = ~test7Min;
+
+    @Test
+    @IR(failOn = { IRNode.RSHIFT_I, IRNode.LSHIFT_I })
+    public int test7(int x) {
+        x = Integer.max(Integer.min(x, test7Max), test7Min);
+        return ((x << test7Shift) >> test7Shift);
+    }
+
+    @Test
+    @IR(counts = { IRNode.RSHIFT_I, "1", IRNode.LSHIFT_I, "1" })
+    public int test8(int x) {
+        x = Integer.max(Integer.min(x, test7Max+1), test7Min);
+        return ((x << test7Shift) >> test7Shift);
+    }
+
+    @Test
+    @IR(counts = { IRNode.RSHIFT_I, "1", IRNode.LSHIFT_I, "1" })
+    public int test9(int x) {
+        x = Integer.max(Integer.min(x, test7Max), test7Min-1);
+        return ((x << test7Shift) >> test7Shift);
+    }
+
+    final static int test10Shift = RunInfo.getRandom().nextInt(32);
+
+    @Test
+    public int test10(int x) {
+        x = Integer.max(Integer.min(x, test7Max), test7Min);
+        return ((x << test7Shift) >> test10Shift);
+    }
 }
diff --git a/test/hotspot/jtreg/compiler/c2/irTests/RShiftLNodeIdealizationTests.java b/test/hotspot/jtreg/compiler/c2/irTests/RShiftLNodeIdealizationTests.java
index 0a8d2bde0b1..02ee8063948 100644
--- a/test/hotspot/jtreg/compiler/c2/irTests/RShiftLNodeIdealizationTests.java
+++ b/test/hotspot/jtreg/compiler/c2/irTests/RShiftLNodeIdealizationTests.java
@@ -27,7 +27,7 @@ import compiler.lib.ir_framework.*;
 
 /*
  * @test
- * @bug 8320330
+ * @bug 8320330 8349361
  * @summary Test that RShiftLNode optimizations are being performed as expected.
  * @library /test/lib /
  * @run driver compiler.c2.irTests.RShiftLNodeIdealizationTests
@@ -37,7 +37,7 @@ public class RShiftLNodeIdealizationTests {
         TestFramework.run();
     }
 
-    @Run(test = { "test1", "test2", "test3", "test4" })
+    @Run(test = { "test1", "test2", "test3", "test4", "test5", "test6", "test7", "test8", "test9", "test10" })
     public void runMethod() {
         long a = RunInfo.getRandom().nextLong();
         long b = RunInfo.getRandom().nextLong();
@@ -56,6 +56,10 @@ public class RShiftLNodeIdealizationTests {
         assertResult(max, min);
         assertResult(min, min);
         assertResult(max, max);
+        assertResult(test7Min, b);
+        assertResult(test7Max, b);
+        assertResult(test7Min-1, b);
+        assertResult(test7Max+1, b);
     }
 
     @DontCompile
@@ -64,6 +68,15 @@ public class RShiftLNodeIdealizationTests {
         Asserts.assertEQ(((x & 127) >> y) >= 0 ? 0L : 1L, test2(x, y));
         Asserts.assertEQ(((-(x & 127) - 1) >> y) >= 0 ? 0L : 1L, test3(x, y));
         Asserts.assertEQ((x >> 62) > 4 ? 0L : 1L, test4(x, y));
+        Asserts.assertEQ((x & test5Mask) >> test5Shift, test5(x));
+        Asserts.assertEQ(x, test6(x));
+        long x7 = Long.max(Long.min(x, test7Max), test7Min);
+        Asserts.assertEQ(((x7 << test7Shift) >> test7Shift), test7(x));
+        long x8 = Long.max(Long.min(x, test7Max+1), test7Min);
+        Asserts.assertEQ((x8 << test7Shift) >> test7Shift, test8(x));
+        long x9 = Long.max(Long.min(x, test7Max), test7Min-1);
+        Asserts.assertEQ((x9 << test7Shift) >> test7Shift, test9(x));
+        Asserts.assertEQ(((x7 << test7Shift) >> test10Shift), test10(x));
     }
 
     @Test
@@ -89,4 +102,55 @@ public class RShiftLNodeIdealizationTests {
     public long test4(long x, long y) {
         return (x >> 62) > 4 ? 0L : 1L;
     }
+
+    final static int test5Shift = RunInfo.getRandom().nextInt(1, 64);
+    final static long test5Mask = -1L << test5Shift;
+
+    @Test
+    @IR(counts = { IRNode.RSHIFT_L, "1" })
+    @IR(failOn = { IRNode.AND_L })
+    public long test5(long x) {
+        return (x & test5Mask) >> test5Shift;
+    }
+
+    final static int test6Shift = RunInfo.getRandom().nextInt(Integer.MAX_VALUE / 64) * 64 ;
+
+    @Test
+    @IR(failOn = { IRNode.RSHIFT_L })
+    public long test6(long x) {
+        return (x >> test6Shift);
+    }
+
+    // See comment in RShiftINodeIdealizationTests
+    final static int test7Shift = RunInfo.getRandom().nextInt(1, 64);
+    final static long test7Min = -1L << (64 - test7Shift - 1);
+    final static long test7Max = ~test7Min;
+
+    @Test
+    @IR(failOn = { IRNode.RSHIFT_L, IRNode.LSHIFT_L })
+    public long test7(long x) {
+        x = Long.max(Long.min(x, test7Max), test7Min);
+        return ((x << test7Shift) >> test7Shift);
+    }
+
+    @Test
+    @IR(counts = { IRNode.RSHIFT_L, "1", IRNode.LSHIFT_L, "1" })
+    public long test8(long x) {
+        x = Long.max(Long.min(x, test7Max+1), test7Min);
+        return ((x << test7Shift) >> test7Shift);
+    }
+
+    @Test
+    @IR(counts = { IRNode.RSHIFT_L, "1", IRNode.LSHIFT_L, "1" })
+    public long test9(long x) {
+        x = Long.max(Long.min(x, test7Max), test7Min-1);
+        return ((x << test7Shift) >> test7Shift);
+    }
+
+    final static int test10Shift = RunInfo.getRandom().nextInt(64);
+    @Test
+    public long test10(long x) {
+        x = Long.max(Long.min(x, test7Max), test7Min);
+        return ((x << test7Shift) >> test10Shift);
+    }
 }

From a2a64dac1680e97dd9eb511ead951bf1be8121c6 Mon Sep 17 00:00:00 2001
From: Xiaolong Peng <xpeng@openjdk.org>
Date: Wed, 26 Mar 2025 15:38:16 +0000
Subject: [PATCH 502/587] 8352588: GenShen: Enabling JFR asserts when getting
 GCId

Reviewed-by: wkemper, ysr
---
 src/hotspot/share/gc/shenandoah/shenandoahControlThread.cpp | 5 ++---
 .../gc/shenandoah/shenandoahGenerationalControlThread.cpp   | 6 ++----
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/src/hotspot/share/gc/shenandoah/shenandoahControlThread.cpp b/src/hotspot/share/gc/shenandoah/shenandoahControlThread.cpp
index e0a6ff3a3b3..0b20b4ddf9f 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahControlThread.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahControlThread.cpp
@@ -135,6 +135,8 @@ void ShenandoahControlThread::run_service() {
       // GC is starting, bump the internal ID
       update_gc_id();
 
+      GCIdMark gc_id_mark;
+
       heuristics->cancel_trigger_request();
 
       heap->reset_bytes_allocated_since_gc_start();
@@ -299,7 +301,6 @@ void ShenandoahControlThread::service_concurrent_normal_cycle(GCCause::Cause cau
   ShenandoahHeap* heap = ShenandoahHeap::heap();
   if (check_cancellation_or_degen(ShenandoahGC::_degenerated_outside_cycle)) return;
 
-  GCIdMark gc_id_mark;
   ShenandoahGCSession session(cause, heap->global_generation());
 
   TraceCollectorStats tcs(heap->monitoring_support()->concurrent_collection_counters());
@@ -343,7 +344,6 @@ void ShenandoahControlThread::stop_service() {
 
 void ShenandoahControlThread::service_stw_full_cycle(GCCause::Cause cause) {
   ShenandoahHeap* const heap = ShenandoahHeap::heap();
-  GCIdMark gc_id_mark;
   ShenandoahGCSession session(cause, heap->global_generation());
 
   ShenandoahFullGC gc;
@@ -353,7 +353,6 @@ void ShenandoahControlThread::service_stw_full_cycle(GCCause::Cause cause) {
 void ShenandoahControlThread::service_stw_degenerated_cycle(GCCause::Cause cause, ShenandoahGC::ShenandoahDegenPoint point) {
   assert (point != ShenandoahGC::_degenerated_unset, "Degenerated point should be set");
   ShenandoahHeap* const heap = ShenandoahHeap::heap();
-  GCIdMark gc_id_mark;
   ShenandoahGCSession session(cause, heap->global_generation());
 
   ShenandoahDegenGC gc(point, heap->global_generation());
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahGenerationalControlThread.cpp b/src/hotspot/share/gc/shenandoah/shenandoahGenerationalControlThread.cpp
index e8b5bb40f0c..4d291ba50f7 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahGenerationalControlThread.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahGenerationalControlThread.cpp
@@ -233,6 +233,8 @@ void ShenandoahGenerationalControlThread::run_gc_cycle(const ShenandoahGCRequest
   // GC is starting, bump the internal ID
   update_gc_id();
 
+  GCIdMark gc_id_mark;
+
   _heap->reset_bytes_allocated_since_gc_start();
 
   MetaspaceCombinedStats meta_sizes = MetaspaceUtils::get_combined_statistics();
@@ -263,7 +265,6 @@ void ShenandoahGenerationalControlThread::run_gc_cycle(const ShenandoahGCRequest
       }
       case servicing_old: {
         assert(request.generation->is_old(), "Expected old generation here");
-        GCIdMark gc_id_mark;
         service_concurrent_old_cycle(request);
         break;
       }
@@ -386,7 +387,6 @@ void ShenandoahGenerationalControlThread::process_phase_timings() const {
 //      +--->  Global Degen +--------------------> Full <----+
 //
 void ShenandoahGenerationalControlThread::service_concurrent_normal_cycle(const ShenandoahGCRequest& request) {
-  GCIdMark gc_id_mark;
   log_info(gc, ergo)("Start GC cycle (%s)", request.generation->name());
   if (request.generation->is_old()) {
     service_concurrent_old_cycle(request);
@@ -621,7 +621,6 @@ bool ShenandoahGenerationalControlThread::check_cancellation_or_degen(Shenandoah
 }
 
 void ShenandoahGenerationalControlThread::service_stw_full_cycle(GCCause::Cause cause) {
-  GCIdMark gc_id_mark;
   ShenandoahGCSession session(cause, _heap->global_generation());
   maybe_set_aging_cycle();
   ShenandoahFullGC gc;
@@ -632,7 +631,6 @@ void ShenandoahGenerationalControlThread::service_stw_full_cycle(GCCause::Cause
 void ShenandoahGenerationalControlThread::service_stw_degenerated_cycle(const ShenandoahGCRequest& request) {
   assert(_degen_point != ShenandoahGC::_degenerated_unset, "Degenerated point should be set");
 
-  GCIdMark gc_id_mark;
   ShenandoahGCSession session(request.cause, request.generation);
 
   ShenandoahDegenGC gc(_degen_point, request.generation);

From 1d205f5f0704f251eb68165f3caf1e70d542ae63 Mon Sep 17 00:00:00 2001
From: Naoto Sato <naoto@openjdk.org>
Date: Wed, 26 Mar 2025 16:09:24 +0000
Subject: [PATCH 503/587] 8352716: (tz) Update Timezone Data to 2025b

Reviewed-by: coffeys, joehw
---
 src/java.base/share/data/tzdata/VERSION       |  2 +-
 src/java.base/share/data/tzdata/asia          | 12 ++-
 src/java.base/share/data/tzdata/northamerica  |  9 ++
 src/java.base/share/data/tzdata/southamerica  | 86 +++++++++++++++----
 .../java/util/TimeZone/TimeZoneData/VERSION   |  2 +-
 5 files changed, 92 insertions(+), 19 deletions(-)

diff --git a/src/java.base/share/data/tzdata/VERSION b/src/java.base/share/data/tzdata/VERSION
index 9c056fac345..4bd54efbcdc 100644
--- a/src/java.base/share/data/tzdata/VERSION
+++ b/src/java.base/share/data/tzdata/VERSION
@@ -21,4 +21,4 @@
 # or visit www.oracle.com if you need additional information or have any
 # questions.
 #
-tzdata2025a
+tzdata2025b
diff --git a/src/java.base/share/data/tzdata/asia b/src/java.base/share/data/tzdata/asia
index b0a6fa01d20..55b13134f9c 100644
--- a/src/java.base/share/data/tzdata/asia
+++ b/src/java.base/share/data/tzdata/asia
@@ -1523,6 +1523,16 @@ Zone Asia/Jayapura	9:22:48 -	LMT	1932 Nov
 # (UIT No. 143 17.XI.1977) and not 23 September (UIT No. 141 13.IX.1977).
 # UIT is the Operational Bulletin of International Telecommunication Union.
 
+# From Roozbeh Pournader (2025-03-18):
+# ... the exact time of Iran's transition from +0400 to +0330 ... was Friday
+# 1357/8/19 AP=1978-11-10. Here's a newspaper clip from the Ettela'at
+# newspaper, dated 1357/8/14 AP=1978-11-05, translated from Persian
+# (at https://w.wiki/DUEY):
+#	Following the government's decision about returning the official time
+#	to the previous status, the spokesperson for the Ministry of Energy
+#	announced today: At the hour 24 of Friday 19th of Aban (=1978-11-10),
+#	the country's time will be pulled back half an hour.
+#
 # From Roozbeh Pournader (2003-03-15):
 # This is an English translation of what I just found (originally in Persian).
 # The Gregorian dates in brackets are mine:
@@ -1650,7 +1660,7 @@ Rule	Iran	2021	2022	-	Sep	21	24:00	0	-
 Zone	Asia/Tehran	3:25:44	-	LMT	1916
 			3:25:44	-	TMT	1935 Jun 13 # Tehran Mean Time
 			3:30	Iran	%z	1977 Oct 20 24:00
-			4:00	Iran	%z	1979
+			4:00	Iran	%z	1978 Nov 10 24:00
 			3:30	Iran	%z
 
 
diff --git a/src/java.base/share/data/tzdata/northamerica b/src/java.base/share/data/tzdata/northamerica
index 0a54e63becc..21f178ee8cb 100644
--- a/src/java.base/share/data/tzdata/northamerica
+++ b/src/java.base/share/data/tzdata/northamerica
@@ -1634,6 +1634,15 @@ Zone America/Moncton	-4:19:08 -	LMT	1883 Dec  9
 # For more on Orillia, see: Daubs K. Bold attempt at daylight saving
 # time became a comic failure in Orillia. Toronto Star 2017-07-08.
 # https://www.thestar.com/news/insight/2017/07/08/bold-attempt-at-daylight-saving-time-became-a-comic-failure-in-orillia.html
+# From Paul Eggert (2025-03-20):
+# Also see the 1912-06-17 front page of The Evening Sunbeam,
+# reproduced in: Richardson M. "Daylight saving was a confusing
+# time in Orillia" in the 2025-03-15 Orillia Matters. Richardson writes,
+# "The first Sunday after the switch was made, [DST proponent and
+# Orillia mayor William Sword] Frost walked into church an hour late.
+# This became a symbol of the downfall of daylight saving in Orillia."
+# The mayor became known as "Daylight Bill".
+# https://www.orilliamatters.com/local-news/column-daylight-saving-was-a-confusing-time-in-orillia-10377529
 
 # From Mark Brader (2010-03-06):
 #
diff --git a/src/java.base/share/data/tzdata/southamerica b/src/java.base/share/data/tzdata/southamerica
index 0a5859600e8..ca3c338591f 100644
--- a/src/java.base/share/data/tzdata/southamerica
+++ b/src/java.base/share/data/tzdata/southamerica
@@ -1269,35 +1269,45 @@ Zone America/Rio_Branco	-4:31:12 -	LMT	1914
 # dates to 2014.
 # DST End: last Saturday of April 2014 (Sun 27 Apr 2014 03:00 UTC)
 # DST Start: first Saturday of September 2014 (Sun 07 Sep 2014 04:00 UTC)
-# http://www.diariooficial.interior.gob.cl//media/2014/02/19/do-20140219.pdf
+# From Tim Parenti (2025-03-22):
+# Decreto 307 of 2014 of the Ministry of the Interior and Public Security,
+# promulgated 2014-01-30 and published 2014-02-19:
+# https://www.diariooficial.interior.gob.cl/media/2014/02/19/do-20140219.pdf#page=1
+# https://www.bcn.cl/leychile/navegar?idNorma=1059557
 
 # From Eduardo Romero Urra (2015-03-03):
 # Today has been published officially that Chile will use the DST time
 # permanently until March 25 of 2017
-# http://www.diariooficial.interior.gob.cl/media/2015/03/03/1-large.jpg
-#
-# From Paul Eggert (2015-03-03):
-# For now, assume that the extension will persist indefinitely.
+# From Tim Parenti (2025-03-22):
+# Decreto 106 of 2015 of the Ministry of the Interior and Public Security,
+# promulgated 2015-01-27 and published 2015-03-03:
+# https://www.diariooficial.interior.gob.cl/media/2015/03/03/do-20150303.pdf#page=1
+# https://www.bcn.cl/leychile/navegar?idNorma=1075157
 
 # From Juan Correa (2016-03-18):
-# The decree regarding DST has been published in today's Official Gazette:
-# http://www.diariooficial.interior.gob.cl/versiones-anteriores/do/20160318/
-# http://www.leychile.cl/Navegar?idNorma=1088502
+# The decree regarding DST has been published in today's Official Gazette...
 # It does consider the second Saturday of May and August as the dates
 # for the transition; and it lists DST dates until 2019, but I think
 # this scheme will stick.
-#
 # From Paul Eggert (2016-03-18):
-# For now, assume the pattern holds for the indefinite future.
 # The decree says transitions occur at 24:00; in practice this appears
 # to mean 24:00 mainland time, not 24:00 local time, so that Easter
 # Island is always two hours behind the mainland.
+# From Tim Parenti (2025-03-22):
+# Decreto 253 of 2016 of the Ministry of the Interior and Public Security,
+# promulgated 2016-03-16 and published 2016-03-18.
+# https://www.diariooficial.interior.gob.cl/media/2016/03/18/do-20160318.pdf#page=1
+# https://www.bcn.cl/leychile/navegar?idNorma=1088502
 
 # From Juan Correa (2016-12-04):
 # Magallanes region ... will keep DST (UTC -3) all year round....
 # http://www.soychile.cl/Santiago/Sociedad/2016/12/04/433428/Bachelet-firmo-el-decreto-para-establecer-un-horario-unico-para-la-Region-de-Magallanes.aspx
-# From Deborah Goldsmith (2017-01-19):
-# http://www.diariooficial.interior.gob.cl/publicaciones/2017/01/17/41660/01/1169626.pdf
+# From Tim Parenti (2025-03-22), via Deborah Goldsmith (2017-01-19):
+# Decreto 1820 of 2016 of the Ministry of the Interior and Public Security,
+# promulgated 2016-12-02 and published 2017-01-17:
+# https://www.diariooficial.interior.gob.cl/publicaciones/2017/01/17/41660/01/1169626.pdf
+# https://www.bcn.cl/leychile/Navegar?idNorma=1099217
+# Model this as a change to standard offset effective 2016-12-04.
 
 # From Juan Correa (2018-08-13):
 # As of moments ago, the Ministry of Energy in Chile has announced the new
@@ -1316,13 +1326,20 @@ Zone America/Rio_Branco	-4:31:12 -	LMT	1914
 # https://twitter.com/MinEnergia/status/1029009354001973248
 # "We will keep the new time policy unchanged for at least the next 4 years."
 # So we extend the new rules on Saturdays at 24:00 mainland time indefinitely.
-# From Juan Correa (2019-02-04):
-# http://www.diariooficial.interior.gob.cl/publicaciones/2018/11/23/42212/01/1498738.pdf
+# From Tim Parenti (2025-03-22), via Juan Correa (2019-02-04):
+# Decreto 1286 of 2018 of the Ministry of the Interior and Public Security,
+# promulgated 2018-09-21 and published 2018-11-23:
+# https://www.diariooficial.interior.gob.cl/publicaciones/2018/11/23/42212/01/1498738.pdf
+# https://www.bcn.cl/leychile/Navegar?idNorma=1125760
 
 # From Juan Correa (2022-04-02):
 # I found there was a decree published last Thursday that will keep
-# Magallanes region to UTC -3 "indefinitely". The decree is available at
+# Magallanes region to UTC -3 "indefinitely".
+# From Tim Parenti (2025-03-22):
+# Decreto 143 of 2022 of the Ministry of the Interior and Public Security,
+# promulgated 2022-03-29 and published 2022-03-31:
 # https://www.diariooficial.interior.gob.cl/publicaciones/2022/03/31/43217-B/01/2108910.pdf
+# https://www.bcn.cl/leychile/Navegar?idNorma=1174342
 
 # From Juan Correa (2022-08-09):
 # the Internal Affairs Ministry (Ministerio del Interior) informed DST
@@ -1331,13 +1348,36 @@ Zone America/Rio_Branco	-4:31:12 -	LMT	1914
 # will keep UTC -3 "indefinitely"...  This is because on September 4th
 # we will have a voting whether to approve a new Constitution.
 #
-# From Eduardo Romero Urra (2022-08-17):
+# From Tim Parenti (2025-03-22), via Eduardo Romero Urra (2022-08-17):
+# Decreto 224 of 2022 of the Ministry of the Interior and Public Security,
+# promulgated 2022-07-14 and published 2022-08-13:
 # https://www.diariooficial.interior.gob.cl/publicaciones/2022/08/13/43327/01/2172567.pdf
+# https://www.bcn.cl/leychile/navegar?idNorma=1179983
 #
 # From Paul Eggert (2022-08-17):
 # Although the presidential decree stops at fall 2026, assume that
 # similar DST rules will continue thereafter.
 
+# From Paul Eggert (2025-01-15):
+# Diario Regional Aysén's Sebastián Martel reports that 94% of Aysén
+# citizens polled in November favored changing the rules from
+# -04/-03-with-DST to -03 all year...
+# https://www.diarioregionalaysen.cl/noticia/actualidad/2024/12/presentan-decision-que-gano-la-votacion-sobre-el-cambio-del-huso-horario-en-aysen
+#
+# From Yonathan Dossow (2025-03-20):
+# [T]oday we have more confirmation of the change.  [Aysén] region will keep
+# UTC-3 all year...
+# https://www.cnnchile.com/pais/region-de-aysen-mantendra-horario-de-verano-todo-el-ano_20250320/
+# https://www.latercera.com/nacional/noticia/tras-consulta-ciudadana-region-de-aysen-mantendra-el-horario-de-verano-durante-todo-el-ano/
+# https://x.com/min_interior/status/1902692504270672098
+#
+# From Tim Parenti (2025-03-22), via Eduardo Romero Urra (2025-03-20):
+# Decreto 93 of 2025 of the Ministry of the Interior and Public Security,
+# promulgated 2025-03-11 and published 2025-03-20:
+# https://www.diariooficial.interior.gob.cl/publicaciones/2025/03/20/44104/01/2624263.pdf
+# https://www.bcn.cl/leychile/Navegar?idNorma=1211955
+# Model this as a change to standard offset effective 2025-03-20.
+
 # Rule	NAME	FROM	TO	-	IN	ON	AT	SAVE	LETTER/S
 Rule	Chile	1927	1931	-	Sep	 1	0:00	1:00	-
 Rule	Chile	1928	1932	-	Apr	 1	0:00	0	-
@@ -1394,6 +1434,20 @@ Zone America/Santiago	-4:42:45 -	LMT	1890
 			-5:00	1:00	%z	1947 Mar 31 24:00
 			-5:00	-	%z	1947 May 21 23:00
 			-4:00	Chile	%z
+Zone America/Coyhaique	-4:48:16 -	LMT	1890
+			-4:42:45 -	SMT	1910 Jan 10
+			-5:00	-	%z	1916 Jul  1
+			-4:42:45 -	SMT	1918 Sep 10
+			-4:00	-	%z	1919 Jul  1
+			-4:42:45 -	SMT	1927 Sep  1
+			-5:00	Chile	%z	1932 Sep  1
+			-4:00	-	%z	1942 Jun  1
+			-5:00	-	%z	1942 Aug  1
+			-4:00	-	%z	1946 Aug 28 24:00
+			-5:00	1:00	%z	1947 Mar 31 24:00
+			-5:00	-	%z	1947 May 21 23:00
+			-4:00	Chile	%z	2025 Mar 20
+			-3:00	-	%z
 Zone America/Punta_Arenas -4:43:40 -	LMT	1890
 			-4:42:45 -	SMT	1910 Jan 10
 			-5:00	-	%z	1916 Jul  1
diff --git a/test/jdk/java/util/TimeZone/TimeZoneData/VERSION b/test/jdk/java/util/TimeZone/TimeZoneData/VERSION
index 5159b3786e3..750d9fae2b1 100644
--- a/test/jdk/java/util/TimeZone/TimeZoneData/VERSION
+++ b/test/jdk/java/util/TimeZone/TimeZoneData/VERSION
@@ -1 +1 @@
-tzdata2025a
+tzdata2025b

From 53926742c02480def6a42683fcaf284b99bcb0a1 Mon Sep 17 00:00:00 2001
From: Jiangli Zhou <jiangli@openjdk.org>
Date: Wed, 26 Mar 2025 16:16:38 +0000
Subject: [PATCH 504/587] 8352766: Problemlist hotspot tier1 tests requiring
 tools that are not included in static JDK

Reviewed-by: dholmes, ihse
---
 test/hotspot/jtreg/ProblemList-StaticJdk.txt | 34 ++++++++++++++++++++
 1 file changed, 34 insertions(+)
 create mode 100644 test/hotspot/jtreg/ProblemList-StaticJdk.txt

diff --git a/test/hotspot/jtreg/ProblemList-StaticJdk.txt b/test/hotspot/jtreg/ProblemList-StaticJdk.txt
new file mode 100644
index 00000000000..2ca0961bae0
--- /dev/null
+++ b/test/hotspot/jtreg/ProblemList-StaticJdk.txt
@@ -0,0 +1,34 @@
+# Require javac
+runtime/HiddenClasses/DefineHiddenClass.java            8346719 generic-all
+
+# Require jstack
+runtime/Thread/TestThreadDumpClassInitMonitor.java      8346719 generic-all
+runtime/Thread/TestThreadDumpSMRInfo.java               8346719 generic-all
+serviceability/tmtools/jstack/DaemonThreadTest.java     8346719 generic-all
+serviceability/tmtools/jstack/JstackThreadTest.java     8346719 generic-all
+serviceability/tmtools/jstack/SpreadLockTest.java       8346719 generic-all
+serviceability/tmtools/jstack/ThreadNamesTest.java      8346719 generic-all
+serviceability/tmtools/jstack/TraveledLockTest.java     8346719 generic-all
+serviceability/tmtools/jstack/WaitNotifyThreadTest.java 8346719 generic-all
+serviceability/tmtools/jstat/GcCapacityTest.java        8346719 generic-all
+serviceability/tmtools/jstat/GcCauseTest01.java         8346719 generic-all
+serviceability/tmtools/jstat/GcCauseTest02.java         8346719 generic-all
+serviceability/tmtools/jstat/GcCauseTest03.java         8346719 generic-all
+serviceability/tmtools/jstat/GcNewTest.java             8346719 generic-all
+serviceability/tmtools/jstat/GcTest01.java              8346719 generic-all
+serviceability/tmtools/jstat/GcTest02.java              8346719 generic-all
+
+# Require jcmd
+serviceability/HeapDump/DuplicateArrayClassesTest.java  8346719 generic-all
+serviceability/HeapDump/FieldsInInstanceTest.java       8346719 generic-all
+serviceability/attach/ConcAttachTest.java               8346719 generic-all
+serviceability/attach/RemovingUnixDomainSocketTest.java 8346719 generic-all
+serviceability/jvmti/vthread/HeapDump/VThreadInHeapDump.java#default            8346719 generic-all
+serviceability/jvmti/vthread/HeapDump/VThreadInHeapDump.java#no-vmcontinuations 8346719 generic-all
+
+# Require jhsdb
+serviceability/sa/ClhsdbCDSCore.java                    8346719 generic-all
+serviceability/sa/ClhsdbFindPC.java#no-xcomp-core       8346719 generic-all
+serviceability/sa/ClhsdbFindPC.java#xcomp-core          8346719 generic-all
+serviceability/sa/ClhsdbPmap.java#core                  8346719 generic-all
+serviceability/sa/ClhsdbPstack.java#core                8346719 generic-all

From c2a4fed98c4e17880dd40c19cb73072efea8c583 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Markus=20Gr=C3=B6nlund?= <mgronlun@openjdk.org>
Date: Wed, 26 Mar 2025 17:30:45 +0000
Subject: [PATCH 505/587] 8348907: Stress times out when is executed with ZGC

Reviewed-by: egahlin, aboldtch, eosterlund
---
 .../build/tools/jfr/GenerateJfrFiles.java     | 36 +++++++++++-
 src/hotspot/share/gc/z/zTracer.cpp            |  4 +-
 .../checkpoint/jfrCheckpointManager.cpp       |  4 ++
 .../checkpoint/jfrCheckpointManager.hpp       |  1 +
 .../jfr/recorder/checkpoint/types/jfrType.cpp | 17 ++++++
 .../jfr/recorder/checkpoint/types/jfrType.hpp |  8 +++
 .../checkpoint/types/jfrTypeManager.cpp       | 11 ++++
 .../checkpoint/types/jfrTypeManager.hpp       |  3 +-
 .../share/jfr/support/jfrThreadLocal.cpp      | 58 ++++++++++++++-----
 .../share/jfr/support/jfrThreadLocal.hpp      | 10 +++-
 10 files changed, 129 insertions(+), 23 deletions(-)

diff --git a/make/src/classes/build/tools/jfr/GenerateJfrFiles.java b/make/src/classes/build/tools/jfr/GenerateJfrFiles.java
index 7532a446aa1..09f3a9f5e3f 100644
--- a/make/src/classes/build/tools/jfr/GenerateJfrFiles.java
+++ b/make/src/classes/build/tools/jfr/GenerateJfrFiles.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -768,9 +768,10 @@ public class GenerateJfrFiles {
             out.write("#ifndef JFRFILES_JFREVENTCLASSES_HPP");
             out.write("#define JFRFILES_JFREVENTCLASSES_HPP");
             out.write("");
-            out.write("#include \"oops/klass.hpp\"");
             out.write("#include \"jfrfiles/jfrTypes.hpp\"");
             out.write("#include \"jfr/utilities/jfrTypes.hpp\"");
+            out.write("#include \"oops/klass.hpp\"");
+            out.write("#include \"runtime/thread.hpp\"");
             out.write("#include \"utilities/macros.hpp\"");
             out.write("#include \"utilities/ticks.hpp\"");
             out.write("#if INCLUDE_JFR");
@@ -789,6 +790,7 @@ public class GenerateJfrFiles {
             out.write(" */");
             out.write("");
             printTypes(out, metadata, false);
+            printHelpers(out, false);
             out.write("");
             out.write("");
             out.write("#else // !INCLUDE_JFR");
@@ -806,6 +808,7 @@ public class GenerateJfrFiles {
             out.write("};");
             out.write("");
             printTypes(out, metadata, true);
+            printHelpers(out, true);
             out.write("");
             out.write("");
             out.write("#endif // INCLUDE_JFR");
@@ -813,6 +816,35 @@ public class GenerateJfrFiles {
         }
     }
 
+    private static void printHelpers(Printer out, boolean empty) {
+        out.write("template <typename EventType>");
+        out.write("class JfrNonReentrant : public EventType {");
+        if (!empty) {
+            out.write(" private:");
+            out.write("  Thread* const _thread;");
+            out.write("  int32_t _previous_nesting;");
+        }
+        out.write(" public:");
+        out.write("  JfrNonReentrant(EventStartTime timing = TIMED)");
+        if (empty) {
+            out.write("  {}");
+        } else {
+            out.write("    : EventType(timing), _thread(Thread::current()), _previous_nesting(JfrThreadLocal::make_non_reentrant(_thread)) {}");
+            out.write("");
+            out.write("  JfrNonReentrant(Thread* thread, EventStartTime timing = TIMED)");
+            out.write("    : EventType(timing), _thread(thread), _previous_nesting(JfrThreadLocal::make_non_reentrant(_thread)) {}");
+        }
+        if (!empty) {
+          out.write("");
+          out.write("  ~JfrNonReentrant() {");
+          out.write("    if (_previous_nesting != -1) {");
+          out.write("      JfrThreadLocal::make_reentrant(_thread, _previous_nesting);");
+          out.write("    }");
+          out.write("  }");
+        }
+        out.write("}; ");
+    }
+
     private static void printTypes(Printer out, Metadata metadata, boolean empty) {
         for (TypeElement t : metadata.getStructs()) {
             printType(out, t, empty);
diff --git a/src/hotspot/share/gc/z/zTracer.cpp b/src/hotspot/share/gc/z/zTracer.cpp
index 6ab16f6c886..81bea81bb60 100644
--- a/src/hotspot/share/gc/z/zTracer.cpp
+++ b/src/hotspot/share/gc/z/zTracer.cpp
@@ -124,7 +124,7 @@ void ZTracer::initialize() {
 void ZTracer::send_stat_counter(const ZStatCounter& counter, uint64_t increment, uint64_t value) {
   NoSafepointVerifier nsv;
 
-  EventZStatisticsCounter e;
+  JfrNonReentrant<EventZStatisticsCounter> e;
   if (e.should_commit()) {
     e.set_id(counter.id());
     e.set_increment(increment);
@@ -136,7 +136,7 @@ void ZTracer::send_stat_counter(const ZStatCounter& counter, uint64_t increment,
 void ZTracer::send_stat_sampler(const ZStatSampler& sampler, uint64_t value) {
   NoSafepointVerifier nsv;
 
-  EventZStatisticsSampler e;
+  JfrNonReentrant<EventZStatisticsSampler> e;
   if (e.should_commit()) {
     e.set_id(sampler.id());
     e.set_value(value);
diff --git a/src/hotspot/share/jfr/recorder/checkpoint/jfrCheckpointManager.cpp b/src/hotspot/share/jfr/recorder/checkpoint/jfrCheckpointManager.cpp
index 26b5116a599..8dbc3d4fcea 100644
--- a/src/hotspot/share/jfr/recorder/checkpoint/jfrCheckpointManager.cpp
+++ b/src/hotspot/share/jfr/recorder/checkpoint/jfrCheckpointManager.cpp
@@ -677,6 +677,10 @@ void JfrCheckpointManager::write_checkpoint(Thread* thread, traceid tid /* 0 */,
   JfrTypeManager::write_checkpoint(thread, tid, vthread);
 }
 
+void JfrCheckpointManager::write_simplified_vthread_checkpoint(traceid vtid) {
+  JfrTypeManager::write_simplified_vthread_checkpoint(vtid);
+}
+
 class JfrNotifyClosure : public ThreadClosure {
  public:
   void do_thread(Thread* thread) {
diff --git a/src/hotspot/share/jfr/recorder/checkpoint/jfrCheckpointManager.hpp b/src/hotspot/share/jfr/recorder/checkpoint/jfrCheckpointManager.hpp
index 8a8582eb6f2..53fa064e267 100644
--- a/src/hotspot/share/jfr/recorder/checkpoint/jfrCheckpointManager.hpp
+++ b/src/hotspot/share/jfr/recorder/checkpoint/jfrCheckpointManager.hpp
@@ -108,6 +108,7 @@ class JfrCheckpointManager : public JfrCHeapObj {
  public:
   static JfrBlobHandle create_thread_blob(JavaThread* jt, traceid tid = 0, oop vthread = nullptr);
   static void write_checkpoint(Thread* t, traceid tid = 0, oop vthread = nullptr);
+  static void write_simplified_vthread_checkpoint(traceid vtid);
   size_t flush_type_set();
 
   friend class Jfr;
diff --git a/src/hotspot/share/jfr/recorder/checkpoint/types/jfrType.cpp b/src/hotspot/share/jfr/recorder/checkpoint/types/jfrType.cpp
index 01cad49e183..9179395a451 100644
--- a/src/hotspot/share/jfr/recorder/checkpoint/types/jfrType.cpp
+++ b/src/hotspot/share/jfr/recorder/checkpoint/types/jfrType.cpp
@@ -312,6 +312,23 @@ void JfrThreadConstant::serialize(JfrCheckpointWriter& writer) {
   // VirtualThread threadgroup already serialized invariant.
 }
 
+// This serializer is used when the vthread name cannot
+// be determined because we cannot access any oops.
+void JfrSimplifiedVirtualThreadConstant::serialize(JfrCheckpointWriter & writer) {
+  writer.write_key(_vtid);
+  // Write the null string categorically as the os name for virtual threads.
+  writer.write((const char*)nullptr); // os name
+  writer.write(0); // os id
+  // vthread name cannot be determined for this simplified version.
+  // This is because we cannot access any oops.
+  writer.write_empty_string();
+  writer.write(_vtid); // java tid
+  // java thread group - VirtualThread threadgroup reserved id 1
+  writer.write(1);
+  writer.write<bool>(true); // isVirtual
+  // VirtualThread threadgroup already serialized invariant.
+}
+
 void BytecodeConstant::serialize(JfrCheckpointWriter& writer) {
   static const u4 nof_entries = Bytecodes::number_of_codes;
   writer.write_count(nof_entries);
diff --git a/src/hotspot/share/jfr/recorder/checkpoint/types/jfrType.hpp b/src/hotspot/share/jfr/recorder/checkpoint/types/jfrType.hpp
index 680629aaa69..de35ecaf917 100644
--- a/src/hotspot/share/jfr/recorder/checkpoint/types/jfrType.hpp
+++ b/src/hotspot/share/jfr/recorder/checkpoint/types/jfrType.hpp
@@ -117,6 +117,14 @@ class JfrThreadConstant : public JfrSerializer {
   void serialize(JfrCheckpointWriter& writer);
 };
 
+class JfrSimplifiedVirtualThreadConstant : public JfrSerializer {
+ private:
+  traceid _vtid;
+ public:
+  JfrSimplifiedVirtualThreadConstant(traceid vtid) : _vtid(vtid) {}
+  void serialize(JfrCheckpointWriter & writer);
+};
+
 class BytecodeConstant : public JfrSerializer {
  public:
   void serialize(JfrCheckpointWriter& writer);
diff --git a/src/hotspot/share/jfr/recorder/checkpoint/types/jfrTypeManager.cpp b/src/hotspot/share/jfr/recorder/checkpoint/types/jfrTypeManager.cpp
index 334bdc40cb3..493942bade4 100644
--- a/src/hotspot/share/jfr/recorder/checkpoint/types/jfrTypeManager.cpp
+++ b/src/hotspot/share/jfr/recorder/checkpoint/types/jfrTypeManager.cpp
@@ -132,6 +132,17 @@ void JfrTypeManager::write_checkpoint(Thread* t, traceid tid /* 0 */, oop vthrea
   type_thread.serialize(writer);
 }
 
+void JfrTypeManager::write_simplified_vthread_checkpoint(traceid vtid) {
+  Thread* const current = Thread::current();
+  assert(current != nullptr, "invariant");
+  ResourceMark rm(current);
+  JfrCheckpointWriter writer(current, true, THREADS, JFR_VIRTUAL_THREADLOCAL);
+  // TYPE_THREAD and count is written later as part of vthread bulk serialization.
+  writer.set_count(1); // Only a logical marker for the checkpoint header.
+  JfrSimplifiedVirtualThreadConstant type_simple_vthread(vtid);
+  type_simple_vthread.serialize(writer);
+}
+
 class SerializerRegistrationGuard : public StackObj {
  private:
   static Semaphore _mutex_semaphore;
diff --git a/src/hotspot/share/jfr/recorder/checkpoint/types/jfrTypeManager.hpp b/src/hotspot/share/jfr/recorder/checkpoint/types/jfrTypeManager.hpp
index 90c314b0549..9e02aee0b03 100644
--- a/src/hotspot/share/jfr/recorder/checkpoint/types/jfrTypeManager.hpp
+++ b/src/hotspot/share/jfr/recorder/checkpoint/types/jfrTypeManager.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -41,6 +41,7 @@ class JfrTypeManager : public AllStatic {
   static void write_threads(JfrCheckpointWriter& writer);
   static JfrBlobHandle create_thread_blob(JavaThread* jt, traceid tid = 0, oop vthread = nullptr);
   static void write_checkpoint(Thread* t, traceid tid = 0, oop vthread = nullptr);
+  static void write_simplified_vthread_checkpoint(traceid vtid);
   static void write_static_types(JfrCheckpointWriter& writer);
 };
 
diff --git a/src/hotspot/share/jfr/support/jfrThreadLocal.cpp b/src/hotspot/share/jfr/support/jfrThreadLocal.cpp
index 0a14e23b87c..31fd9892a31 100644
--- a/src/hotspot/share/jfr/support/jfrThreadLocal.cpp
+++ b/src/hotspot/share/jfr/support/jfrThreadLocal.cpp
@@ -70,6 +70,7 @@ JfrThreadLocal::JfrThreadLocal() :
   _wallclock_time(os::javaTimeNanos()),
   _stackdepth(0),
   _entering_suspend_flag(0),
+  _non_reentrant_nesting(0),
   _vthread_epoch(0),
   _vthread_excluded(false),
   _jvm_thread_excluded(false),
@@ -365,28 +366,32 @@ typedef JfrOopTraceId<ThreadIdAccess> AccessThreadTraceId;
 void JfrThreadLocal::set_vthread_epoch(const JavaThread* jt, traceid tid, u2 epoch) {
   assert(jt != nullptr, "invariant");
   assert(is_vthread(jt), "invariant");
-  // To support event recursion, we update the native side first,
-  // this provides the terminating case.
+  assert(!is_non_reentrant(), "invariant");
+
   Atomic::store(&jt->jfr_thread_local()->_vthread_epoch, epoch);
-  /*
-  * The java side, i.e. the vthread object, can now be updated.
-  * Accessing the vthread object itself is a recursive case,
-  * because it can trigger additional events, e.g.
-  * loading the oop through load barriers.
-  * Note there is a potential problem with this solution:
-  * The recursive write hitting the terminating case will
-  * use the thread id _before_ the checkpoint is committed.
-  * Hence, the periodic thread can possibly flush that event
-  * to a segment that does not include an associated checkpoint.
-  * Considered rare and quite benign for now. The worst case is
-  * that thread information for that event is not resolvable, i.e. null.
-  */
+
   oop vthread = jt->vthread();
   assert(vthread != nullptr, "invariant");
+
   AccessThreadTraceId::set_epoch(vthread, epoch);
   JfrCheckpointManager::write_checkpoint(const_cast<JavaThread*>(jt), tid, vthread);
 }
 
+void JfrThreadLocal::set_vthread_epoch_checked(const JavaThread* jt, traceid tid, u2 epoch) {
+  assert(jt != nullptr, "invariant");
+  assert(is_vthread(jt), "invariant");
+
+  // If the event is marked as non reentrant, write only a simplified version of the vthread info.
+  // Essentially all the same info except the vthread name, because we cannot touch the oop.
+  // Since we cannot touch the oop, we also cannot update its vthread epoch.
+  if (is_non_reentrant()) {
+    JfrCheckpointManager::write_simplified_vthread_checkpoint(tid);
+    return;
+  }
+
+  set_vthread_epoch(jt, tid, epoch);
+}
+
 traceid JfrThreadLocal::vthread_id(const Thread* t) {
   assert(t != nullptr, "invariant");
   return Atomic::load(&t->jfr_thread_local()->_vthread_id);
@@ -416,7 +421,7 @@ traceid JfrThreadLocal::thread_id(const Thread* t) {
   if (!tl->is_vthread_excluded()) {
     const u2 current_epoch = AccessThreadTraceId::current_epoch();
     if (vthread_epoch(jt) != current_epoch) {
-      set_vthread_epoch(jt, tid, current_epoch);
+      set_vthread_epoch_checked(jt, tid, current_epoch);
     }
   }
   return tid;
@@ -480,6 +485,26 @@ bool JfrThreadLocal::is_vthread(const JavaThread* jt) {
   return Atomic::load_acquire(&jt->jfr_thread_local()->_vthread) && jt->last_continuation() != nullptr;
 }
 
+int32_t JfrThreadLocal::make_non_reentrant(Thread* t) {
+  assert(t != nullptr, "invariant");
+  if (!t->is_Java_thread() || !is_vthread(JavaThread::cast(t))) {
+    return -1;
+  }
+  return t->jfr_thread_local()->_non_reentrant_nesting++;
+}
+
+void JfrThreadLocal::make_reentrant(Thread* t, int32_t previous_nesting) {
+  assert(t->is_Java_thread() && is_vthread(JavaThread::cast(t)), "invariant");
+  assert(previous_nesting >= 0, "invariant");
+  t->jfr_thread_local()->_non_reentrant_nesting = previous_nesting;
+}
+
+bool JfrThreadLocal::is_non_reentrant() {
+  Thread* const current_thread = Thread::current();
+  assert(current_thread != nullptr, "invariant");
+  return current_thread->jfr_thread_local()->_non_reentrant_nesting > 0;
+}
+
 inline bool is_virtual(const JavaThread* jt, oop thread) {
   assert(jt != nullptr, "invariant");
   return thread != jt->threadObj();
@@ -493,6 +518,7 @@ void JfrThreadLocal::on_set_current_thread(JavaThread* jt, oop thread) {
     Atomic::release_store(&tl->_vthread, false);
     return;
   }
+  assert(tl->_non_reentrant_nesting == 0, "invariant");
   Atomic::store(&tl->_vthread_id, AccessThreadTraceId::id(thread));
   const u2 epoch_raw = AccessThreadTraceId::epoch(thread);
   const bool excluded = epoch_raw & excluded_bit;
diff --git a/src/hotspot/share/jfr/support/jfrThreadLocal.hpp b/src/hotspot/share/jfr/support/jfrThreadLocal.hpp
index d2f6ef8d5d5..5e25de56ec0 100644
--- a/src/hotspot/share/jfr/support/jfrThreadLocal.hpp
+++ b/src/hotspot/share/jfr/support/jfrThreadLocal.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -64,6 +64,7 @@ class JfrThreadLocal {
   jlong _wallclock_time;
   mutable u4 _stackdepth;
   volatile jint _entering_suspend_flag;
+  int32_t _non_reentrant_nesting;
   u2 _vthread_epoch;
   bool _vthread_excluded;
   bool _jvm_thread_excluded;
@@ -81,7 +82,8 @@ class JfrThreadLocal {
   static void set(bool* excluded_field, bool state);
   static traceid assign_thread_id(const Thread* t, JfrThreadLocal* tl);
   static traceid vthread_id(const Thread* t);
-  static void set_vthread_epoch(const JavaThread* jt, traceid id, u2 epoch);
+  static void set_vthread_epoch(const JavaThread* jt, traceid tid, u2 epoch);
+  static void set_vthread_epoch_checked(const JavaThread* jt, traceid tid, u2 epoch);
   static traceid jvm_thread_id(const JfrThreadLocal* tl);
   bool is_vthread_excluded() const;
   static void exclude_vthread(const JavaThread* jt);
@@ -89,6 +91,7 @@ class JfrThreadLocal {
   static bool is_jvm_thread_excluded(const Thread* t);
   static void exclude_jvm_thread(const Thread* t);
   static void include_jvm_thread(const Thread* t);
+  static bool is_non_reentrant();
 
  public:
   JfrThreadLocal();
@@ -266,6 +269,9 @@ class JfrThreadLocal {
     return _dead;
   }
 
+  static int32_t make_non_reentrant(Thread* thread);
+  static void make_reentrant(Thread* thread, int32_t previous_nesting);
+
   bool is_excluded() const;
   bool is_included() const;
   static bool is_excluded(const Thread* thread);

From 5672a934fa1b0b42ae9bb39b31579a27e3332c28 Mon Sep 17 00:00:00 2001
From: William Kemper <wkemper@openjdk.org>
Date: Wed, 26 Mar 2025 17:33:23 +0000
Subject: [PATCH 506/587] 8348400: GenShen:
 assert(ShenandoahHeap::heap()->is_full_gc_in_progress() ||
 (used_regions_size() <= _max_capacity)) failed: Cannot use more than capacity
 #

Reviewed-by: ysr
---
 .../share/gc/shenandoah/shenandoahFreeSet.cpp | 68 +++++++++++++++----
 .../share/gc/shenandoah/shenandoahFreeSet.hpp |  7 +-
 2 files changed, 60 insertions(+), 15 deletions(-)

diff --git a/src/hotspot/share/gc/shenandoah/shenandoahFreeSet.cpp b/src/hotspot/share/gc/shenandoah/shenandoahFreeSet.cpp
index 8a3eeb6a74d..9fa4978dfe7 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahFreeSet.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahFreeSet.cpp
@@ -931,7 +931,9 @@ HeapWord* ShenandoahFreeSet::try_allocate_from_mutator(ShenandoahAllocRequest& r
     ShenandoahHeapRegion* r = _heap->get_region(idx);
     if (can_allocate_from(r)) {
       if (req.is_old()) {
-        flip_to_old_gc(r);
+        if (!flip_to_old_gc(r)) {
+          continue;
+        }
       } else {
         flip_to_gc(r);
       }
@@ -1284,25 +1286,65 @@ void ShenandoahFreeSet::recycle_trash() {
   heap->parallel_heap_region_iterate(&closure);
 }
 
-void ShenandoahFreeSet::flip_to_old_gc(ShenandoahHeapRegion* r) {
-  size_t idx = r->index();
+bool ShenandoahFreeSet::flip_to_old_gc(ShenandoahHeapRegion* r) {
+  const size_t idx = r->index();
 
   assert(_partitions.partition_id_matches(idx, ShenandoahFreeSetPartitionId::Mutator), "Should be in mutator view");
   assert(can_allocate_from(r), "Should not be allocated");
 
   ShenandoahGenerationalHeap* gen_heap = ShenandoahGenerationalHeap::heap();
-  size_t region_capacity = alloc_capacity(r);
-  _partitions.move_from_partition_to_partition(idx, ShenandoahFreeSetPartitionId::Mutator,
-                                               ShenandoahFreeSetPartitionId::OldCollector, region_capacity);
-  _partitions.assert_bounds();
-  _heap->old_generation()->augment_evacuation_reserve(region_capacity);
+  const size_t region_capacity = alloc_capacity(r);
+
   bool transferred = gen_heap->generation_sizer()->transfer_to_old(1);
-  if (!transferred) {
-    log_warning(gc, free)("Forcing transfer of %zu to old reserve.", idx);
-    gen_heap->generation_sizer()->force_transfer_to_old(1);
+  if (transferred) {
+    _partitions.move_from_partition_to_partition(idx, ShenandoahFreeSetPartitionId::Mutator,
+                                                 ShenandoahFreeSetPartitionId::OldCollector, region_capacity);
+    _partitions.assert_bounds();
+    _heap->old_generation()->augment_evacuation_reserve(region_capacity);
+    return true;
   }
-  // We do not ensure that the region is no longer trash, relying on try_allocate_in(), which always comes next,
-  // to recycle trash before attempting to allocate anything in the region.
+
+  if (_heap->young_generation()->free_unaffiliated_regions() == 0 && _heap->old_generation()->free_unaffiliated_regions() > 0) {
+    // Old has free unaffiliated regions, but it couldn't use them for allocation (likely because they
+    // are trash and weak roots are in process). In this scenario, we aren't really stealing from the
+    // mutator (they have nothing to steal), but they do have a usable region in their partition. What
+    // we want to do here is swap that region from the mutator partition with one from the old collector
+    // partition.
+    // 1. Find a temporarily unusable trash region in the old collector partition
+    ShenandoahRightLeftIterator iterator(&_partitions, ShenandoahFreeSetPartitionId::OldCollector, true);
+    idx_t unusable_trash = -1;
+    for (unusable_trash = iterator.current(); iterator.has_next(); unusable_trash = iterator.next()) {
+      const ShenandoahHeapRegion* region = _heap->get_region(unusable_trash);
+      if (region->is_trash() && _heap->is_concurrent_weak_root_in_progress()) {
+        break;
+      }
+    }
+
+    if (unusable_trash != -1) {
+      const size_t unusable_capacity = alloc_capacity(unusable_trash);
+      // 2. Move the (temporarily) unusable trash region we found to the mutator partition
+      _partitions.move_from_partition_to_partition(unusable_trash,
+                                                   ShenandoahFreeSetPartitionId::OldCollector,
+                                                   ShenandoahFreeSetPartitionId::Mutator, unusable_capacity);
+
+      // 3. Move this usable region from the mutator partition to the old collector partition
+      _partitions.move_from_partition_to_partition(idx,
+                                                   ShenandoahFreeSetPartitionId::Mutator,
+                                                   ShenandoahFreeSetPartitionId::OldCollector, region_capacity);
+
+      _partitions.assert_bounds();
+
+      // 4. Do not adjust capacities for generations, we just swapped the regions that have already
+      // been accounted for. However, we should adjust the evacuation reserves as those may have changed.
+      shenandoah_assert_heaplocked();
+      const size_t reserve = _heap->old_generation()->get_evacuation_reserve();
+      _heap->old_generation()->set_evacuation_reserve(reserve - unusable_capacity + region_capacity);
+      return true;
+    }
+  }
+
+  // We can't take this region young because it has no free unaffiliated regions (transfer failed).
+  return false;
 }
 
 void ShenandoahFreeSet::flip_to_gc(ShenandoahHeapRegion* r) {
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahFreeSet.hpp b/src/hotspot/share/gc/shenandoah/shenandoahFreeSet.hpp
index d4754167236..80954af6d1a 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahFreeSet.hpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahFreeSet.hpp
@@ -323,9 +323,12 @@ private:
   //
   // Typical usage: During evacuation, the GC may find it needs more memory than had been reserved at the start of evacuation to
   // hold evacuated objects.  If this occurs and memory is still available in the Mutator's free set, we will flip a region from
-  // the Mutator free set into the Collector or OldCollector free set.
+  // the Mutator free set into the Collector or OldCollector free set. The conditions to move this region are checked by
+  // the caller, so the given region is always moved.
   void flip_to_gc(ShenandoahHeapRegion* r);
-  void flip_to_old_gc(ShenandoahHeapRegion* r);
+
+  // Return true if and only if the given region is successfully flipped to the old partition
+  bool flip_to_old_gc(ShenandoahHeapRegion* r);
 
   // Handle allocation for mutator.
   HeapWord* allocate_for_mutator(ShenandoahAllocRequest &req, bool &in_new_region);

From e83cccfed4463ddbec5493722355d65c4eb41646 Mon Sep 17 00:00:00 2001
From: Aleksey Shipilev <shade@openjdk.org>
Date: Wed, 26 Mar 2025 19:45:24 +0000
Subject: [PATCH 507/587] 8352948: Remove leftover runtime_x86_32.cpp after
 32-bit x86 removal

Reviewed-by: stefank, kvn
---
 src/hotspot/cpu/x86/runtime_x86_32.cpp | 332 -------------------------
 1 file changed, 332 deletions(-)
 delete mode 100644 src/hotspot/cpu/x86/runtime_x86_32.cpp

diff --git a/src/hotspot/cpu/x86/runtime_x86_32.cpp b/src/hotspot/cpu/x86/runtime_x86_32.cpp
deleted file mode 100644
index dd6611c6b9f..00000000000
--- a/src/hotspot/cpu/x86/runtime_x86_32.cpp
+++ /dev/null
@@ -1,332 +0,0 @@
-/*
- * Copyright (c) 1998, 2025, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- *
- */
-
-#ifdef COMPILER2
-#include "asm/macroAssembler.hpp"
-#include "asm/macroAssembler.inline.hpp"
-#include "code/vmreg.hpp"
-#include "compiler/oopMap.hpp"
-#include "interpreter/interpreter.hpp"
-#include "memory/resourceArea.hpp"
-#include "opto/runtime.hpp"
-#include "runtime/sharedRuntime.hpp"
-#include "runtime/stubRoutines.hpp"
-#include "runtime/vframeArray.hpp"
-#include "utilities/globalDefinitions.hpp"
-#include "vmreg_x86.inline.hpp"
-#endif
-
-
-#define __ masm->
-
-//------------------------------generate_uncommon_trap_blob--------------------
-UncommonTrapBlob* OptoRuntime::generate_uncommon_trap_blob() {
-  // allocate space for the code
-  ResourceMark rm;
-  // setup code generation tools
-  const char* name = OptoRuntime::stub_name(OptoStubId::uncommon_trap_id);
-  CodeBuffer   buffer(name, 512, 512);
-  MacroAssembler* masm = new MacroAssembler(&buffer);
-
-  enum frame_layout {
-    arg0_off,      // thread                     sp + 0 // Arg location for
-    arg1_off,      // unloaded_class_index       sp + 1 // calling C
-    arg2_off,      // exec_mode                  sp + 2
-    // The frame sender code expects that rbp will be in the "natural" place and
-    // will override any oopMap setting for it. We must therefore force the layout
-    // so that it agrees with the frame sender code.
-    rbp_off,       // callee saved register      sp + 3
-    return_off,    // slot for return address    sp + 4
-    framesize
-  };
-
-  address start = __ pc();
-
-  // Push self-frame.
-  __ subptr(rsp, return_off*wordSize);     // Epilog!
-
-  // rbp, is an implicitly saved callee saved register (i.e. the calling
-  // convention will save restore it in prolog/epilog) Other than that
-  // there are no callee save registers no that adapter frames are gone.
-  __ movptr(Address(rsp, rbp_off*wordSize), rbp);
-
-  // Clear the floating point exception stack
-  __ empty_FPU_stack();
-
-  // set last_Java_sp
-  __ get_thread(rdx);
-  __ set_last_Java_frame(rdx, noreg, noreg, nullptr, noreg);
-
-  // Call C code.  Need thread but NOT official VM entry
-  // crud.  We cannot block on this call, no GC can happen.  Call should
-  // capture callee-saved registers as well as return values.
-  __ movptr(Address(rsp, arg0_off*wordSize), rdx);
-  // argument already in ECX
-  __ movl(Address(rsp, arg1_off*wordSize),rcx);
-  __ movl(Address(rsp, arg2_off*wordSize), Deoptimization::Unpack_uncommon_trap);
-  __ call(RuntimeAddress(CAST_FROM_FN_PTR(address, Deoptimization::uncommon_trap)));
-
-  // Set an oopmap for the call site
-  OopMapSet *oop_maps = new OopMapSet();
-  OopMap* map =  new OopMap( framesize, 0 );
-  // No oopMap for rbp, it is known implicitly
-
-  oop_maps->add_gc_map( __ pc()-start, map);
-
-  __ get_thread(rcx);
-
-  __ reset_last_Java_frame(rcx, false);
-
-  // Load UnrollBlock into EDI
-  __ movptr(rdi, rax);
-
-#ifdef ASSERT
-  { Label L;
-    __ cmpptr(Address(rdi, Deoptimization::UnrollBlock::unpack_kind_offset()),
-            (int32_t)Deoptimization::Unpack_uncommon_trap);
-    __ jcc(Assembler::equal, L);
-    __ stop("OptoRuntime::generate_uncommon_trap_blob: expected Unpack_uncommon_trap");
-    __ bind(L);
-  }
-#endif
-
-  // Pop all the frames we must move/replace.
-  //
-  // Frame picture (youngest to oldest)
-  // 1: self-frame (no frame link)
-  // 2: deopting frame  (no frame link)
-  // 3: caller of deopting frame (could be compiled/interpreted).
-
-  // Pop self-frame.  We have no frame, and must rely only on EAX and ESP.
-  __ addptr(rsp,(framesize-1)*wordSize);     // Epilog!
-
-  // Pop deoptimized frame
-  __ movl2ptr(rcx, Address(rdi,Deoptimization::UnrollBlock::size_of_deoptimized_frame_offset()));
-  __ addptr(rsp, rcx);
-
-  // sp should be pointing at the return address to the caller (3)
-
-  // Pick up the initial fp we should save
-  // restore rbp before stack bang because if stack overflow is thrown it needs to be pushed (and preserved)
-  __ movptr(rbp, Address(rdi, Deoptimization::UnrollBlock::initial_info_offset()));
-
-#ifdef ASSERT
-  // Compilers generate code that bang the stack by as much as the
-  // interpreter would need. So this stack banging should never
-  // trigger a fault. Verify that it does not on non product builds.
-  __ movl(rbx, Address(rdi ,Deoptimization::UnrollBlock::total_frame_sizes_offset()));
-  __ bang_stack_size(rbx, rcx);
-#endif
-
-  // Load array of frame pcs into ECX
-  __ movl(rcx,Address(rdi,Deoptimization::UnrollBlock::frame_pcs_offset()));
-
-  __ pop(rsi); // trash the pc
-
-  // Load array of frame sizes into ESI
-  __ movptr(rsi,Address(rdi,Deoptimization::UnrollBlock::frame_sizes_offset()));
-
-  Address counter(rdi, Deoptimization::UnrollBlock::counter_temp_offset());
-
-  __ movl(rbx, Address(rdi, Deoptimization::UnrollBlock::number_of_frames_offset()));
-  __ movl(counter, rbx);
-
-  // Now adjust the caller's stack to make up for the extra locals
-  // but record the original sp so that we can save it in the skeletal interpreter
-  // frame and the stack walking of interpreter_sender will get the unextended sp
-  // value and not the "real" sp value.
-
-  Address sp_temp(rdi, Deoptimization::UnrollBlock::sender_sp_temp_offset());
-  __ movptr(sp_temp, rsp);
-  __ movl(rbx, Address(rdi, Deoptimization::UnrollBlock::caller_adjustment_offset()));
-  __ subptr(rsp, rbx);
-
-  // Push interpreter frames in a loop
-  Label loop;
-  __ bind(loop);
-  __ movptr(rbx, Address(rsi, 0));      // Load frame size
-  __ subptr(rbx, 2*wordSize);           // we'll push pc and rbp, by hand
-  __ pushptr(Address(rcx, 0));          // save return address
-  __ enter();                           // save old & set new rbp,
-  __ subptr(rsp, rbx);                  // Prolog!
-  __ movptr(rbx, sp_temp);              // sender's sp
-  // This value is corrected by layout_activation_impl
-  __ movptr(Address(rbp, frame::interpreter_frame_last_sp_offset * wordSize), NULL_WORD );
-  __ movptr(Address(rbp, frame::interpreter_frame_sender_sp_offset * wordSize), rbx); // Make it walkable
-  __ movptr(sp_temp, rsp);              // pass to next frame
-  __ addptr(rsi, wordSize);             // Bump array pointer (sizes)
-  __ addptr(rcx, wordSize);             // Bump array pointer (pcs)
-  __ decrementl(counter);             // decrement counter
-  __ jcc(Assembler::notZero, loop);
-  __ pushptr(Address(rcx, 0));            // save final return address
-
-  // Re-push self-frame
-  __ enter();                           // save old & set new rbp,
-  __ subptr(rsp, (framesize-2) * wordSize);   // Prolog!
-
-
-  // set last_Java_sp, last_Java_fp
-  __ get_thread(rdi);
-  __ set_last_Java_frame(rdi, noreg, rbp, nullptr, noreg);
-
-  // Call C code.  Need thread but NOT official VM entry
-  // crud.  We cannot block on this call, no GC can happen.  Call should
-  // restore return values to their stack-slots with the new SP.
-  __ movptr(Address(rsp,arg0_off*wordSize),rdi);
-  __ movl(Address(rsp,arg1_off*wordSize), Deoptimization::Unpack_uncommon_trap);
-  __ call(RuntimeAddress(CAST_FROM_FN_PTR(address, Deoptimization::unpack_frames)));
-  // Set an oopmap for the call site
-  oop_maps->add_gc_map( __ pc()-start, new OopMap( framesize, 0 ) );
-
-  __ get_thread(rdi);
-  __ reset_last_Java_frame(rdi, true);
-
-  // Pop self-frame.
-  __ leave();     // Epilog!
-
-  // Jump to interpreter
-  __ ret(0);
-
-  // -------------
-  // make sure all code is generated
-  masm->flush();
-
-   return UncommonTrapBlob::create(&buffer, oop_maps, framesize);
-}
-
-//------------------------------generate_exception_blob---------------------------
-// creates exception blob at the end
-// Using exception blob, this code is jumped from a compiled method.
-//
-// Given an exception pc at a call we call into the runtime for the
-// handler in this method. This handler might merely restore state
-// (i.e. callee save registers) unwind the frame and jump to the
-// exception handler for the nmethod if there is no Java level handler
-// for the nmethod.
-//
-// This code is entered with a jmp.
-//
-// Arguments:
-//   rax: exception oop
-//   rdx: exception pc
-//
-// Results:
-//   rax: exception oop
-//   rdx: exception pc in caller or ???
-//   destination: exception handler of caller
-//
-// Note: the exception pc MUST be at a call (precise debug information)
-//       Only register rax, rdx, rcx are not callee saved.
-//
-
-ExceptionBlob* OptoRuntime::generate_exception_blob() {
-
-  // Capture info about frame layout
-  enum layout {
-    thread_off,                 // last_java_sp
-    // The frame sender code expects that rbp will be in the "natural" place and
-    // will override any oopMap setting for it. We must therefore force the layout
-    // so that it agrees with the frame sender code.
-    rbp_off,
-    return_off,                 // slot for return address
-    framesize
-  };
-
-  // allocate space for the code
-  ResourceMark rm;
-  // setup code generation tools
-  const char* name = OptoRuntime::stub_name(OptoStubId::exception_id);
-  CodeBuffer   buffer(name, 512, 512);
-  MacroAssembler* masm = new MacroAssembler(&buffer);
-
-  OopMapSet *oop_maps = new OopMapSet();
-
-  address start = __ pc();
-
-  __ push(rdx);
-  __ subptr(rsp, return_off * wordSize);   // Prolog!
-
-  // rbp, location is implicitly known
-  __ movptr(Address(rsp,rbp_off  *wordSize), rbp);
-
-  // Store exception in Thread object. We cannot pass any arguments to the
-  // handle_exception call, since we do not want to make any assumption
-  // about the size of the frame where the exception happened in.
-  __ get_thread(rcx);
-  __ movptr(Address(rcx, JavaThread::exception_oop_offset()), rax);
-  __ movptr(Address(rcx, JavaThread::exception_pc_offset()),  rdx);
-
-  // This call does all the hard work.  It checks if an exception handler
-  // exists in the method.
-  // If so, it returns the handler address.
-  // If not, it prepares for stack-unwinding, restoring the callee-save
-  // registers of the frame being removed.
-  //
-  __ movptr(Address(rsp, thread_off * wordSize), rcx); // Thread is first argument
-  __ set_last_Java_frame(rcx, noreg, noreg, nullptr, noreg);
-
-  __ call(RuntimeAddress(CAST_FROM_FN_PTR(address, OptoRuntime::handle_exception_C)));
-
-  // No registers to map, rbp is known implicitly
-  oop_maps->add_gc_map( __ pc() - start,  new OopMap( framesize, 0 ));
-  __ get_thread(rcx);
-  __ reset_last_Java_frame(rcx, false);
-
-  // Restore callee-saved registers
-  __ movptr(rbp, Address(rsp, rbp_off * wordSize));
-
-  __ addptr(rsp, return_off * wordSize);   // Epilog!
-  __ pop(rdx); // Exception pc
-
-  // rax: exception handler for given <exception oop/exception pc>
-
-  // We have a handler in rax, (could be deopt blob)
-  // rdx - throwing pc, deopt blob will need it.
-
-  __ push(rax);
-
-  // Get the exception
-  __ movptr(rax, Address(rcx, JavaThread::exception_oop_offset()));
-  // Get the exception pc in case we are deoptimized
-  __ movptr(rdx, Address(rcx, JavaThread::exception_pc_offset()));
-#ifdef ASSERT
-  __ movptr(Address(rcx, JavaThread::exception_handler_pc_offset()), NULL_WORD);
-  __ movptr(Address(rcx, JavaThread::exception_pc_offset()), NULL_WORD);
-#endif
-  // Clear the exception oop so GC no longer processes it as a root.
-  __ movptr(Address(rcx, JavaThread::exception_oop_offset()), NULL_WORD);
-
-  __ pop(rcx);
-
-  // rax: exception oop
-  // rcx: exception handler
-  // rdx: exception pc
-  __ jmp (rcx);
-
-  // -------------
-  // make sure all code is generated
-  masm->flush();
-
-  return ExceptionBlob::create(&buffer, oop_maps, framesize);
-}

From 441bd1265650dc865897d5cb6a673edb89dd5cee Mon Sep 17 00:00:00 2001
From: Serguei Spitsyn <sspitsyn@openjdk.org>
Date: Wed, 26 Mar 2025 19:45:50 +0000
Subject: [PATCH 508/587] 8352812: remove useless class and function parameter
 in SuspendThread impl

Reviewed-by: lmesnik, cjplummer
---
 src/hotspot/share/prims/jvmtiEnv.cpp     | 12 ++++-----
 src/hotspot/share/prims/jvmtiEnvBase.cpp |  7 +++--
 src/hotspot/share/prims/jvmtiEnvBase.hpp |  3 +--
 src/hotspot/share/prims/jvmtiImpl.cpp    | 34 ------------------------
 src/hotspot/share/prims/jvmtiImpl.hpp    | 22 ---------------
 5 files changed, 10 insertions(+), 68 deletions(-)

diff --git a/src/hotspot/share/prims/jvmtiEnv.cpp b/src/hotspot/share/prims/jvmtiEnv.cpp
index aedd56817bf..fe1578aedf2 100644
--- a/src/hotspot/share/prims/jvmtiEnv.cpp
+++ b/src/hotspot/share/prims/jvmtiEnv.cpp
@@ -940,14 +940,14 @@ JvmtiEnv::SuspendThread(jthread thread) {
 
     // Do not use JvmtiVTMSTransitionDisabler in context of self suspend to avoid deadlocks.
     if (java_thread != current) {
-      err = suspend_thread(thread_oop, java_thread, /* single_suspend */ true, nullptr);
+      err = suspend_thread(thread_oop, java_thread, /* single_suspend */ true);
       return err;
     }
     // protect thread_oop as a safepoint can be reached in disabler destructor
     self_tobj = Handle(current, thread_oop);
   }
   // Do self suspend for current JavaThread.
-  err = suspend_thread(self_tobj(), current, /* single_suspend */ true, nullptr);
+  err = suspend_thread(self_tobj(), current, /* single_suspend */ true);
   return err;
 } /* end SuspendThread */
 
@@ -988,14 +988,14 @@ JvmtiEnv::SuspendThreadList(jint request_count, const jthread* request_list, jvm
         self_tobj = Handle(current, thread_oop);
         continue; // self suspend after all other suspends
       }
-      results[i] = suspend_thread(thread_oop, java_thread, /* single_suspend */ true, nullptr);
+      results[i] = suspend_thread(thread_oop, java_thread, /* single_suspend */ true);
     }
   }
   // Self suspend after all other suspends if necessary.
   // Do not use JvmtiVTMSTransitionDisabler in context of self suspend to avoid deadlocks.
   if (self_tobj() != nullptr) {
     // there should not be any error for current java_thread
-    results[self_idx] = suspend_thread(self_tobj(), current, /* single_suspend */ true, nullptr);
+    results[self_idx] = suspend_thread(self_tobj(), current, /* single_suspend */ true);
   }
   // per-thread suspend results returned via results parameter
   return JVMTI_ERROR_NONE;
@@ -1048,7 +1048,7 @@ JvmtiEnv::SuspendAllVirtualThreads(jint except_count, const jthread* except_list
           self_tobj = Handle(current, vt_oop);
           continue; // self suspend after all other suspends
         }
-        suspend_thread(vt_oop, java_thread, /* single_suspend */ false, nullptr);
+        suspend_thread(vt_oop, java_thread, /* single_suspend */ false);
       }
     }
     JvmtiVTSuspender::register_all_vthreads_suspend();
@@ -1065,7 +1065,7 @@ JvmtiEnv::SuspendAllVirtualThreads(jint except_count, const jthread* except_list
   // Self suspend after all other suspends if necessary.
   // Do not use JvmtiVTMSTransitionDisabler in context of self suspend to avoid deadlocks.
   if (self_tobj() != nullptr) {
-    suspend_thread(self_tobj(), current, /* single_suspend */ false, nullptr);
+    suspend_thread(self_tobj(), current, /* single_suspend */ false);
   }
   return JVMTI_ERROR_NONE;
 } /* end SuspendAllVirtualThreads */
diff --git a/src/hotspot/share/prims/jvmtiEnvBase.cpp b/src/hotspot/share/prims/jvmtiEnvBase.cpp
index b35c0d5c949..71b2c9d216e 100644
--- a/src/hotspot/share/prims/jvmtiEnvBase.cpp
+++ b/src/hotspot/share/prims/jvmtiEnvBase.cpp
@@ -1750,8 +1750,7 @@ JvmtiEnvBase::disable_virtual_threads_notify_jvmti() {
 
 // java_thread - protected by ThreadsListHandle
 jvmtiError
-JvmtiEnvBase::suspend_thread(oop thread_oop, JavaThread* java_thread, bool single_suspend,
-                             int* need_safepoint_p) {
+JvmtiEnvBase::suspend_thread(oop thread_oop, JavaThread* java_thread, bool single_suspend) {
   JavaThread* current = JavaThread::current();
   HandleMark hm(current);
   Handle thread_h(current, thread_oop);
@@ -1807,7 +1806,7 @@ JvmtiEnvBase::suspend_thread(oop thread_oop, JavaThread* java_thread, bool singl
     assert(single_suspend || thread_h()->is_a(vmClasses::BaseVirtualThread_klass()),
            "SuspendAllVirtualThreads should never suspend non-virtual threads");
     // Case of mounted virtual or attached carrier thread.
-    if (!JvmtiSuspendControl::suspend(java_thread)) {
+    if (!java_thread->java_suspend()) {
       // Thread is already suspended or in process of exiting.
       if (java_thread->is_exiting()) {
         // The thread was in the process of exiting.
@@ -1869,7 +1868,7 @@ JvmtiEnvBase::resume_thread(oop thread_oop, JavaThread* java_thread, bool single
     assert(single_resume || thread_h()->is_a(vmClasses::BaseVirtualThread_klass()),
            "ResumeAllVirtualThreads should never resume non-virtual threads");
     if (java_thread->is_suspended()) {
-      if (!JvmtiSuspendControl::resume(java_thread)) {
+      if (!java_thread->java_resume()) {
         return JVMTI_ERROR_THREAD_NOT_SUSPENDED;
       }
     }
diff --git a/src/hotspot/share/prims/jvmtiEnvBase.hpp b/src/hotspot/share/prims/jvmtiEnvBase.hpp
index ec4423e4a1c..5d6b5a2209e 100644
--- a/src/hotspot/share/prims/jvmtiEnvBase.hpp
+++ b/src/hotspot/share/prims/jvmtiEnvBase.hpp
@@ -90,8 +90,7 @@ class JvmtiEnvBase : public CHeapObj<mtInternal> {
   // It is unsafe to use this function when virtual threads are executed.
   static bool disable_virtual_threads_notify_jvmti();
 
-  static jvmtiError suspend_thread(oop thread_oop, JavaThread* java_thread, bool single_suspend,
-                                   int* need_safepoint_p);
+  static jvmtiError suspend_thread(oop thread_oop, JavaThread* java_thread, bool single_suspend);
   static jvmtiError resume_thread(oop thread_oop, JavaThread* java_thread, bool single_resume);
   static jvmtiError check_thread_list(jint count, const jthread* list);
   static bool is_in_thread_list(jint count, const jthread* list, oop jt_oop);
diff --git a/src/hotspot/share/prims/jvmtiImpl.cpp b/src/hotspot/share/prims/jvmtiImpl.cpp
index 1e8614e2122..9caea2de520 100644
--- a/src/hotspot/share/prims/jvmtiImpl.cpp
+++ b/src/hotspot/share/prims/jvmtiImpl.cpp
@@ -745,40 +745,6 @@ VM_VirtualThreadGetReceiver::VM_VirtualThreadGetReceiver(
     : VM_VirtualThreadGetOrSetLocal(env, vthread_h, caller_thread, depth, 0, self) {}
 
 
-/////////////////////////////////////////////////////////////////////////////////////////
-//
-// class JvmtiSuspendControl - see comments in jvmtiImpl.hpp
-//
-
-bool JvmtiSuspendControl::suspend(JavaThread *java_thread) {
-  return java_thread->java_suspend();
-}
-
-bool JvmtiSuspendControl::resume(JavaThread *java_thread) {
-  return java_thread->java_resume();
-}
-
-void JvmtiSuspendControl::print() {
-#ifndef PRODUCT
-  ResourceMark rm;
-  LogStreamHandle(Trace, jvmti) log_stream;
-  log_stream.print("Suspended Threads: [");
-  for (JavaThreadIteratorWithHandle jtiwh; JavaThread *thread = jtiwh.next(); ) {
-#ifdef JVMTI_TRACE
-    const char *name   = JvmtiTrace::safe_get_thread_name(thread);
-#else
-    const char *name   = "";
-#endif /*JVMTI_TRACE */
-    log_stream.print("%s(%c ", name, thread->is_suspended() ? 'S' : '_');
-    if (!thread->has_last_Java_frame()) {
-      log_stream.print("no stack");
-    }
-    log_stream.print(") ");
-  }
-  log_stream.print_cr("]");
-#endif
-}
-
 JvmtiDeferredEvent JvmtiDeferredEvent::compiled_method_load_event(
     nmethod* nm) {
   JvmtiDeferredEvent event = JvmtiDeferredEvent(TYPE_COMPILED_METHOD_LOAD);
diff --git a/src/hotspot/share/prims/jvmtiImpl.hpp b/src/hotspot/share/prims/jvmtiImpl.hpp
index 3a103cc8237..c359b2fcbc3 100644
--- a/src/hotspot/share/prims/jvmtiImpl.hpp
+++ b/src/hotspot/share/prims/jvmtiImpl.hpp
@@ -278,28 +278,6 @@ class VM_VirtualThreadGetReceiver : public VM_VirtualThreadGetOrSetLocal {
 };
 
 
-///////////////////////////////////////////////////////////////
-//
-// class JvmtiSuspendControl
-//
-// Convenience routines for suspending and resuming threads.
-//
-// All attempts by JVMTI to suspend and resume threads must go through the
-// JvmtiSuspendControl interface.
-//
-// methods return true if successful
-//
-class JvmtiSuspendControl : public AllStatic {
-public:
-  // suspend the thread, taking it to a safepoint
-  static bool suspend(JavaThread *java_thread);
-  // resume the thread
-  static bool resume(JavaThread *java_thread);
-
-  static void print();
-};
-
-
 /**
  * When a thread (such as the compiler thread or VM thread) cannot post a
  * JVMTI event itself because the event needs to be posted from a Java

From 1397ee56c0f281d99989058cd14016d9d7c7a240 Mon Sep 17 00:00:00 2001
From: Alexey Semenyuk <asemenyuk@openjdk.org>
Date: Wed, 26 Mar 2025 20:08:02 +0000
Subject: [PATCH 509/587] 8334322: Misleading values of keys in jpackage
 resource bundle

Reviewed-by: almatvee
---
 .../jpackage/internal/LinuxDebBundler.java    | 12 ++++++----
 .../jpackage/internal/LinuxRpmBundler.java    | 16 +++++++++-----
 .../resources/LinuxResources.properties       |  9 +++++---
 .../jdk/jpackage/internal/Arguments.java      | 22 ++++++++++++++++---
 test/jdk/tools/jpackage/share/ErrorTest.java  | 18 +++++++++++++++
 5 files changed, 61 insertions(+), 16 deletions(-)

diff --git a/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxDebBundler.java b/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxDebBundler.java
index 478ec078797..956e14dfb36 100644
--- a/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxDebBundler.java
+++ b/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxDebBundler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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,11 +83,15 @@ public class LinuxDebBundler extends LinuxPackageBundler {
             },
             (s, p) -> {
                 if (!DEB_PACKAGE_NAME_PATTERN.matcher(s).matches()) {
-                    throw new IllegalArgumentException(new ConfigException(
+                    try {
+                        throw new ConfigException(
                             MessageFormat.format(I18N.getString(
-                            "error.invalid-value-for-package-name"), s),
+                            "error.deb-invalid-value-for-package-name"), s),
                             I18N.getString(
-                            "error.invalid-value-for-package-name.advice")));
+                            "error.deb-invalid-value-for-package-name.advice"));
+                    } catch (ConfigException ex) {
+                        throw new IllegalArgumentException(ex);
+                    }
                 }
 
                 return s;
diff --git a/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxRpmBundler.java b/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxRpmBundler.java
index f65210553de..9c56d35ca75 100644
--- a/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxRpmBundler.java
+++ b/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxRpmBundler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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,11 +87,15 @@ public class LinuxRpmBundler extends LinuxPackageBundler {
             },
             (s, p) -> {
                 if (!RPM_PACKAGE_NAME_PATTERN.matcher(s).matches()) {
-                    String msgKey = "error.invalid-value-for-package-name";
-                    throw new IllegalArgumentException(
-                            new ConfigException(MessageFormat.format(
-                                    I18N.getString(msgKey), s),
-                                    I18N.getString(msgKey + ".advice")));
+                    try {
+                        throw new ConfigException(
+                            MessageFormat.format(I18N.getString(
+                            "error.rpm-invalid-value-for-package-name"), s),
+                            I18N.getString(
+                            "error.rpm-invalid-value-for-package-name.advice"));
+                    } catch (ConfigException ex) {
+                        throw new IllegalArgumentException(ex);
+                    }
                 }
 
                 return s;
diff --git a/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/resources/LinuxResources.properties b/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/resources/LinuxResources.properties
index 3b95c8e474e..3e60eb48f67 100644
--- a/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/resources/LinuxResources.properties
+++ b/src/jdk.jpackage/linux/classes/jdk/jpackage/internal/resources/LinuxResources.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2017, 2022, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved.
 # 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,8 +46,11 @@ error.tool-old-version.advice=Please install required packages
 
 error.invalid-install-dir=Invalid installation directory "{0}"
 
-error.invalid-value-for-package-name=Invalid value "{0}" for the bundle name.
-error.invalid-value-for-package-name.advice=Set the "linux-bundle-name" option to a valid Debian package name. Note that the package names must consist only of lower case letters (a-z), digits (0-9), plus (+) and minus (-) signs, and periods (.). They must be at least two characters long and must start with an alphanumeric character.
+error.deb-invalid-value-for-package-name=Invalid value "{0}" for the package name.
+error.deb-invalid-value-for-package-name.advice=Set the "--linux-package-name" option to a valid Debian package name. Note that the package names must consist only of lower case letters (a-z), digits (0-9), plus (+) and minus (-) signs, and periods (.). They must be at least two characters long and must start with a letter character.
+
+error.rpm-invalid-value-for-package-name=Invalid value "{0}" for the package name.
+error.rpm-invalid-value-for-package-name.advice=Set the "--linux-package-name" option to a valid RPM package name. Note that the package names must consist only of letters (a-z, A-Z), digits (0-9), plus (+) and minus (-) signs, periods (.) and underscores (_). They must be at least one character long and must start with a letter.
 
 message.icon-not-png=The specified icon "{0}" is not a PNG file and will not be used. The default icon will be used in it's place.
 message.test-for-tool=Test for [{0}]. Result: {1}
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/Arguments.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/Arguments.java
index 85af649470c..907798a735b 100644
--- a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/Arguments.java
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/Arguments.java
@@ -700,9 +700,7 @@ public class Arguments {
 
         Map<String, ? super Object> localParams = new HashMap<>(params);
         try {
-            bundler.validate(localParams);
-            Path result = bundler.execute(localParams,
-                    StandardBundlerParam.OUTPUT_DIR.fetchFrom(params));
+            Path result = executeBundler(bundler, params, localParams);
             if (result == null) {
                 throw new PackagerException("MSG_BundlerFailed",
                         bundler.getID(), bundler.getName());
@@ -737,6 +735,24 @@ public class Arguments {
         }
     }
 
+    private static Path executeBundler(Bundler bundler, Map<String, ? super Object> params,
+            Map<String, ? super Object> localParams) throws ConfigException, PackagerException {
+        try {
+            bundler.validate(localParams);
+            return bundler.execute(localParams, StandardBundlerParam.OUTPUT_DIR.fetchFrom(params));
+        } catch (ConfigException|PackagerException ex) {
+            throw ex;
+        } catch (RuntimeException ex) {
+            if (ex.getCause() instanceof ConfigException cfgEx) {
+                throw cfgEx;
+            } else if (ex.getCause() instanceof PackagerException pkgEx) {
+                throw pkgEx;
+            } else {
+                throw ex;
+            }
+        }
+    }
+
     static CLIOptions toCLIOption(String arg) {
         CLIOptions option;
         if ((option = argIds.get(arg)) == null) {
diff --git a/test/jdk/tools/jpackage/share/ErrorTest.java b/test/jdk/tools/jpackage/share/ErrorTest.java
index 0af215d7d43..59b0ccb4bd7 100644
--- a/test/jdk/tools/jpackage/share/ErrorTest.java
+++ b/test/jdk/tools/jpackage/share/ErrorTest.java
@@ -410,6 +410,7 @@ public final class ErrorTest {
     @ParameterSupplier("basic")
     @ParameterSupplier(value="testWindows", ifOS = WINDOWS)
     @ParameterSupplier(value="testMac", ifOS = MACOS)
+    @ParameterSupplier(value="testLinux", ifOS = LINUX)
     @ParameterSupplier(value="winOption", ifNotOS = WINDOWS)
     @ParameterSupplier(value="linuxOption", ifNotOS = LINUX)
     @ParameterSupplier(value="macOption", ifNotOS = MACOS)
@@ -585,6 +586,23 @@ public final class ErrorTest {
         cmd.execute(1);
     }
 
+    public static Collection<Object[]> testLinux() {
+        final List<TestSpec> testCases = new ArrayList<>();
+
+        testCases.addAll(Stream.of(
+                testSpec().type(PackageType.LINUX_DEB).addArgs("--linux-package-name", "#")
+                        .error("error.deb-invalid-value-for-package-name", "#")
+                        .error("error.deb-invalid-value-for-package-name.advice"),
+                testSpec().type(PackageType.LINUX_RPM).addArgs("--linux-package-name", "#")
+                        .error("error.rpm-invalid-value-for-package-name", "#")
+                        .error("error.rpm-invalid-value-for-package-name.advice")
+        ).map(TestSpec.Builder::create).filter(spec -> {
+            return spec.type().orElseThrow().isSupported();
+        }).toList());
+
+        return toTestArgs(testCases.stream());
+    }
+
     private static void duplicate(TestSpec.Builder builder, Consumer<TestSpec> accumulator, Consumer<TestSpec.Builder> mutator) {
         accumulator.accept(builder.create());
         mutator.accept(builder);

From 24833403b6b93ca464720f00de0e8bd5e1c140be Mon Sep 17 00:00:00 2001
From: Ioi Lam <iklam@openjdk.org>
Date: Thu, 27 Mar 2025 00:23:51 +0000
Subject: [PATCH 510/587] 8352579: Refactor CDS legacy optimization for lambda
 proxy classes

Reviewed-by: ccheung, matsaave
---
 src/hotspot/share/cds/aotArtifactFinder.cpp   |   7 +-
 src/hotspot/share/cds/archiveUtils.cpp        |   3 +-
 src/hotspot/share/cds/cdsConfig.cpp           |   6 +-
 src/hotspot/share/cds/cdsConfig.hpp           |   3 +
 src/hotspot/share/cds/classListParser.cpp     |   3 +-
 src/hotspot/share/cds/dynamicArchive.cpp      |   7 +-
 .../share/cds/lambdaProxyClassDictionary.cpp  | 441 ++++++++++++++++++
 .../share/cds/lambdaProxyClassDictionary.hpp  |  88 +++-
 src/hotspot/share/cds/metaspaceShared.cpp     |   6 +-
 src/hotspot/share/classfile/javaClasses.cpp   |   2 +-
 .../share/classfile/systemDictionary.cpp      |  35 +-
 .../share/classfile/systemDictionary.hpp      |   9 +-
 .../classfile/systemDictionaryShared.cpp      | 434 ++---------------
 .../classfile/systemDictionaryShared.hpp      |  43 +-
 src/hotspot/share/oops/instanceKlass.cpp      |   2 +-
 src/hotspot/share/prims/jvm.cpp               |  20 +-
 src/hotspot/share/runtime/mutexLocker.hpp     |   2 +-
 .../AOTClassLinkingVMOptions.java             |   4 +
 18 files changed, 607 insertions(+), 508 deletions(-)

diff --git a/src/hotspot/share/cds/aotArtifactFinder.cpp b/src/hotspot/share/cds/aotArtifactFinder.cpp
index 48f31635c63..e644a5e6f5f 100644
--- a/src/hotspot/share/cds/aotArtifactFinder.cpp
+++ b/src/hotspot/share/cds/aotArtifactFinder.cpp
@@ -27,6 +27,7 @@
 #include "cds/aotClassInitializer.hpp"
 #include "cds/dumpTimeClassInfo.inline.hpp"
 #include "cds/heapShared.hpp"
+#include "cds/lambdaProxyClassDictionary.hpp"
 #include "classfile/systemDictionaryShared.hpp"
 #include "logging/log.hpp"
 #include "memory/metaspaceClosure.hpp"
@@ -114,13 +115,13 @@ void AOTArtifactFinder::find_artifacts() {
         // All non-hidden classes are always included into the AOT cache
         add = true;
       } else {
-        if (!CDSConfig::is_dumping_invokedynamic()) {
+        if (CDSConfig::is_dumping_lambdas_in_legacy_mode()) {
           // Legacy support of lambda proxies -- these are always included into the AOT cache
-          if (SystemDictionaryShared::is_registered_lambda_proxy_class(ik)) {
+          if (LambdaProxyClassDictionary::is_registered_lambda_proxy_class(ik)) {
             add = true;
           }
         } else {
-          assert(!SystemDictionaryShared::is_registered_lambda_proxy_class(ik),
+          assert(!LambdaProxyClassDictionary::is_registered_lambda_proxy_class(ik),
                  "registered lambda proxies are only for legacy lambda proxy support");
         }
       }
diff --git a/src/hotspot/share/cds/archiveUtils.cpp b/src/hotspot/share/cds/archiveUtils.cpp
index 90eefd13d46..605a19a224c 100644
--- a/src/hotspot/share/cds/archiveUtils.cpp
+++ b/src/hotspot/share/cds/archiveUtils.cpp
@@ -31,6 +31,7 @@
 #include "cds/dynamicArchive.hpp"
 #include "cds/filemap.hpp"
 #include "cds/heapShared.hpp"
+#include "cds/lambdaProxyClassDictionary.hpp"
 #include "cds/metaspaceShared.hpp"
 #include "classfile/systemDictionaryShared.hpp"
 #include "classfile/vmClasses.hpp"
@@ -351,7 +352,7 @@ void ReadClosure::do_tag(int tag) {
 
 void ArchiveUtils::log_to_classlist(BootstrapInfo* bootstrap_specifier, TRAPS) {
   if (ClassListWriter::is_enabled()) {
-    if (SystemDictionaryShared::is_supported_invokedynamic(bootstrap_specifier)) {
+    if (LambdaProxyClassDictionary::is_supported_invokedynamic(bootstrap_specifier)) {
       const constantPoolHandle& pool = bootstrap_specifier->pool();
       if (SystemDictionaryShared::is_builtin_loader(pool->pool_holder()->class_loader_data())) {
         // Currently lambda proxy classes are supported only for the built-in loaders.
diff --git a/src/hotspot/share/cds/cdsConfig.cpp b/src/hotspot/share/cds/cdsConfig.cpp
index f714bdf9494..055b84ed284 100644
--- a/src/hotspot/share/cds/cdsConfig.cpp
+++ b/src/hotspot/share/cds/cdsConfig.cpp
@@ -648,12 +648,16 @@ void CDSConfig::log_reasons_for_not_dumping_heap() {
   log_info(cds)("Archived java heap is not supported: %s", reason);
 }
 
+// This is *Legacy* optimization for lambdas before JEP 483. May be removed in the future.
+bool CDSConfig::is_dumping_lambdas_in_legacy_mode() {
+  return !is_dumping_method_handles();
+}
+
 #if INCLUDE_CDS_JAVA_HEAP
 bool CDSConfig::are_vm_options_incompatible_with_dumping_heap() {
   return check_options_incompatible_with_dumping_heap() != nullptr;
 }
 
-
 bool CDSConfig::is_dumping_heap() {
   if (!(is_dumping_classic_static_archive() || is_dumping_final_static_archive())
       || are_vm_options_incompatible_with_dumping_heap()
diff --git a/src/hotspot/share/cds/cdsConfig.hpp b/src/hotspot/share/cds/cdsConfig.hpp
index 525184be21b..8a3a060e3c3 100644
--- a/src/hotspot/share/cds/cdsConfig.hpp
+++ b/src/hotspot/share/cds/cdsConfig.hpp
@@ -131,6 +131,9 @@ public:
   // Misc CDS features
   static bool allow_only_single_java_thread()                NOT_CDS_RETURN_(false);
 
+  // This is *Legacy* optimization for lambdas before JEP 483. May be removed in the future.
+  static bool is_dumping_lambdas_in_legacy_mode()            NOT_CDS_RETURN_(false);
+
   // optimized_module_handling -- can we skip some expensive operations related to modules?
   static bool is_using_optimized_module_handling()           { return CDS_ONLY(_is_using_optimized_module_handling) NOT_CDS(false); }
   static void stop_using_optimized_module_handling()         NOT_CDS_RETURN;
diff --git a/src/hotspot/share/cds/classListParser.cpp b/src/hotspot/share/cds/classListParser.cpp
index 133cfcc8738..10154265bec 100644
--- a/src/hotspot/share/cds/classListParser.cpp
+++ b/src/hotspot/share/cds/classListParser.cpp
@@ -26,6 +26,7 @@
 #include "cds/archiveUtils.hpp"
 #include "cds/classListParser.hpp"
 #include "cds/lambdaFormInvokers.hpp"
+#include "cds/lambdaProxyClassDictionary.hpp"
 #include "cds/metaspaceShared.hpp"
 #include "cds/unregisteredClasses.hpp"
 #include "classfile/classLoaderExt.hpp"
@@ -657,7 +658,7 @@ void ClassListParser::resolve_indy_impl(Symbol* class_name_symbol, TRAPS) {
       constantPoolHandle pool(THREAD, cp);
       BootstrapInfo bootstrap_specifier(pool, pool_index, indy_index);
       Handle bsm = bootstrap_specifier.resolve_bsm(CHECK);
-      if (!SystemDictionaryShared::is_supported_invokedynamic(&bootstrap_specifier)) {
+      if (!LambdaProxyClassDictionary::is_supported_invokedynamic(&bootstrap_specifier)) {
         log_debug(cds, lambda)("is_supported_invokedynamic check failed for cp_index %d", pool_index);
         continue;
       }
diff --git a/src/hotspot/share/cds/dynamicArchive.cpp b/src/hotspot/share/cds/dynamicArchive.cpp
index 095b443af66..9b1e99512c6 100644
--- a/src/hotspot/share/cds/dynamicArchive.cpp
+++ b/src/hotspot/share/cds/dynamicArchive.cpp
@@ -31,6 +31,7 @@
 #include "cds/cds_globals.hpp"
 #include "cds/cdsConfig.hpp"
 #include "cds/dynamicArchive.hpp"
+#include "cds/lambdaProxyClassDictionary.hpp"
 #include "cds/regeneratedClasses.hpp"
 #include "classfile/classLoader.hpp"
 #include "classfile/classLoaderData.inline.hpp"
@@ -159,8 +160,10 @@ public:
       ArchiveBuilder::serialize_dynamic_archivable_items(&wc);
     }
 
-    log_info(cds)("Adjust lambda proxy class dictionary");
-    SystemDictionaryShared::adjust_lambda_proxy_class_dictionary();
+    if (CDSConfig::is_dumping_lambdas_in_legacy_mode()) {
+      log_info(cds)("Adjust lambda proxy class dictionary");
+      LambdaProxyClassDictionary::adjust_dumptime_table();
+    }
 
     relocate_to_requested();
 
diff --git a/src/hotspot/share/cds/lambdaProxyClassDictionary.cpp b/src/hotspot/share/cds/lambdaProxyClassDictionary.cpp
index 91f677055a6..c0e31eea399 100644
--- a/src/hotspot/share/cds/lambdaProxyClassDictionary.cpp
+++ b/src/hotspot/share/cds/lambdaProxyClassDictionary.cpp
@@ -23,9 +23,15 @@
  */
 
 #include "cds/archiveBuilder.hpp"
+#include "cds/cdsConfig.hpp"
+#include "cds/cdsProtectionDomain.hpp"
 #include "cds/lambdaProxyClassDictionary.hpp"
 #include "classfile/systemDictionaryShared.hpp"
+#include "interpreter/bootstrapInfo.hpp"
+#include "jfr/jfrEvents.hpp"
+#include "memory/metaspaceClosure.hpp"
 #include "memory/resourceArea.hpp"
+#include "oops/klass.inline.hpp"
 
 DumpTimeLambdaProxyClassInfo::~DumpTimeLambdaProxyClassInfo() {
   if (_proxy_klasses != nullptr) {
@@ -82,3 +88,438 @@ void RunTimeLambdaProxyClassInfo::init(LambdaProxyClassKey& key, DumpTimeLambdaP
   ArchiveBuilder::current()->write_pointer_in_buffer(&_proxy_klass_head,
                                                      info._proxy_klasses->at(0));
 }
+
+DumpTimeLambdaProxyClassDictionary* LambdaProxyClassDictionary::_dumptime_table = nullptr;
+LambdaProxyClassDictionary LambdaProxyClassDictionary::_runtime_static_table; // for static CDS archive
+LambdaProxyClassDictionary LambdaProxyClassDictionary::_runtime_dynamic_table; // for dynamic CDS archive
+
+void LambdaProxyClassDictionary::dumptime_init() {
+  _dumptime_table = new (mtClass) DumpTimeLambdaProxyClassDictionary;
+}
+
+bool LambdaProxyClassDictionary::is_supported_invokedynamic(BootstrapInfo* bsi) {
+  LogTarget(Debug, cds, lambda) log;
+  if (bsi->arg_values() == nullptr || !bsi->arg_values()->is_objArray()) {
+    if (log.is_enabled()) {
+      LogStream log_stream(log);
+      log.print("bsi check failed");
+      log.print("    bsi->arg_values().not_null() %d", bsi->arg_values().not_null());
+      if (bsi->arg_values().not_null()) {
+        log.print("    bsi->arg_values()->is_objArray() %d", bsi->arg_values()->is_objArray());
+        bsi->print_msg_on(&log_stream);
+      }
+    }
+    return false;
+  }
+
+  Handle bsm = bsi->bsm();
+  if (bsm.is_null() || !java_lang_invoke_DirectMethodHandle::is_instance(bsm())) {
+    if (log.is_enabled()) {
+      log.print("bsm check failed");
+      log.print("    bsm.is_null() %d", bsm.is_null());
+      log.print("    java_lang_invoke_DirectMethodHandle::is_instance(bsm()) %d",
+        java_lang_invoke_DirectMethodHandle::is_instance(bsm()));
+    }
+    return false;
+  }
+
+  oop mn = java_lang_invoke_DirectMethodHandle::member(bsm());
+  Method* method = java_lang_invoke_MemberName::vmtarget(mn);
+  if (method->klass_name()->equals("java/lang/invoke/LambdaMetafactory") &&
+      method->name()->equals("metafactory") &&
+      method->signature()->equals("(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;"
+            "Ljava/lang/invoke/MethodType;Ljava/lang/invoke/MethodType;Ljava/lang/invoke/MethodHandle;"
+            "Ljava/lang/invoke/MethodType;)Ljava/lang/invoke/CallSite;")) {
+      return true;
+  } else {
+    if (log.is_enabled()) {
+      ResourceMark rm;
+      log.print("method check failed");
+      log.print("    klass_name() %s", method->klass_name()->as_C_string());
+      log.print("    name() %s", method->name()->as_C_string());
+      log.print("    signature() %s", method->signature()->as_C_string());
+    }
+  }
+
+  return false;
+}
+
+void LambdaProxyClassDictionary::add_lambda_proxy_class(InstanceKlass* caller_ik,
+                                                        InstanceKlass* lambda_ik,
+                                                        Symbol* invoked_name,
+                                                        Symbol* invoked_type,
+                                                        Symbol* method_type,
+                                                        Method* member_method,
+                                                        Symbol* instantiated_method_type,
+                                                        TRAPS) {
+  if (!CDSConfig::is_dumping_lambdas_in_legacy_mode()) {
+    // The lambda proxy classes will be stored as part of aot-resolved constant pool entries.
+    // There's no need to remember them in a separate table.
+    return;
+  }
+
+  if (CDSConfig::is_dumping_preimage_static_archive()) {
+    // Information about lambda proxies are recorded in FinalImageRecipes.
+    return;
+  }
+
+  assert(caller_ik->class_loader() == lambda_ik->class_loader(), "mismatched class loader");
+  assert(caller_ik->class_loader_data() == lambda_ik->class_loader_data(), "mismatched class loader data");
+  assert(java_lang_Class::class_data(lambda_ik->java_mirror()) == nullptr, "must not have class data");
+
+  MutexLocker ml(DumpTimeTable_lock, Mutex::_no_safepoint_check_flag);
+
+  lambda_ik->assign_class_loader_type();
+  lambda_ik->set_shared_classpath_index(caller_ik->shared_classpath_index());
+  InstanceKlass* nest_host = caller_ik->nest_host(CHECK);
+  assert(nest_host != nullptr, "unexpected nullptr nest_host");
+
+  DumpTimeClassInfo* info = SystemDictionaryShared::get_info_locked(lambda_ik);
+  if (info != nullptr && !lambda_ik->is_non_strong_hidden() &&
+      SystemDictionaryShared::is_builtin(lambda_ik) &&
+      SystemDictionaryShared::is_builtin(caller_ik)
+      // Don't include the lambda proxy if its nest host is not in the "linked" state.
+      && nest_host->is_linked()) {
+    // Set _is_registered_lambda_proxy in DumpTimeClassInfo so that the lambda_ik
+    // won't be excluded during dumping of shared archive.
+    info->_is_registered_lambda_proxy = true;
+    info->set_nest_host(nest_host);
+
+    LambdaProxyClassKey key(caller_ik,
+                            invoked_name,
+                            invoked_type,
+                            method_type,
+                            member_method,
+                            instantiated_method_type);
+    add_to_dumptime_table(key, lambda_ik);
+  }
+}
+
+bool LambdaProxyClassDictionary::is_registered_lambda_proxy_class(InstanceKlass* ik) {
+  DumpTimeClassInfo* info = SystemDictionaryShared::get_info_locked(ik);
+  bool result = (info != nullptr) ? info->_is_registered_lambda_proxy : false;
+  if (result) {
+    assert(CDSConfig::is_dumping_lambdas_in_legacy_mode(), "only used in legacy lambda proxy support");
+  }
+  return result;
+}
+
+void LambdaProxyClassDictionary::reset_registered_lambda_proxy_class(InstanceKlass* ik) {
+  DumpTimeClassInfo* info = SystemDictionaryShared::get_info_locked(ik);
+  if (info != nullptr) {
+    info->_is_registered_lambda_proxy = false;
+    info->set_excluded();
+  }
+}
+
+InstanceKlass* LambdaProxyClassDictionary::get_shared_nest_host(InstanceKlass* lambda_ik) {
+  assert(!CDSConfig::is_dumping_static_archive() && CDSConfig::is_using_archive(), "called at run time with CDS enabled only");
+  RunTimeClassInfo* record = RunTimeClassInfo::get_for(lambda_ik);
+  return record->nest_host();
+}
+
+InstanceKlass* LambdaProxyClassDictionary::load_shared_lambda_proxy_class(InstanceKlass* caller_ik,
+                                                                          Symbol* invoked_name,
+                                                                          Symbol* invoked_type,
+                                                                          Symbol* method_type,
+                                                                          Method* member_method,
+                                                                          Symbol* instantiated_method_type,
+                                                                          TRAPS)
+{
+  InstanceKlass* lambda_ik = find_lambda_proxy_class(caller_ik, invoked_name, invoked_type,
+                                                     method_type, member_method, instantiated_method_type);
+  if (lambda_ik == nullptr) {
+    return nullptr;
+  }
+  return load_and_init_lambda_proxy_class(lambda_ik, caller_ik, THREAD);
+}
+
+InstanceKlass* LambdaProxyClassDictionary::find_lambda_proxy_class(InstanceKlass* caller_ik,
+                                                                   Symbol* invoked_name,
+                                                                   Symbol* invoked_type,
+                                                                   Symbol* method_type,
+                                                                   Method* member_method,
+                                                                   Symbol* instantiated_method_type)
+{
+  assert(caller_ik != nullptr, "sanity");
+  assert(invoked_name != nullptr, "sanity");
+  assert(invoked_type != nullptr, "sanity");
+  assert(method_type != nullptr, "sanity");
+  assert(instantiated_method_type != nullptr, "sanity");
+
+  if (!caller_ik->is_shared()     ||
+      !invoked_name->is_shared()  ||
+      !invoked_type->is_shared()  ||
+      !method_type->is_shared()   ||
+      (member_method != nullptr && !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);
+  RunTimeLambdaProxyClassKey key =
+    RunTimeLambdaProxyClassKey::init_for_runtime(caller_ik, invoked_name, invoked_type,
+                                                 method_type, member_method, instantiated_method_type);
+
+  unsigned hash = key.hash();
+  // Try to retrieve the lambda proxy class from static archive.
+  const RunTimeLambdaProxyClassInfo* info = _runtime_static_table.lookup(&key, hash, 0);
+  InstanceKlass* proxy_klass = find_lambda_proxy_class(info);
+  if (proxy_klass == nullptr) {
+    if (info != nullptr && log_is_enabled(Debug, cds)) {
+      ResourceMark rm;
+      log_debug(cds)("Used all static archived lambda proxy classes for: %s %s%s",
+                     caller_ik->external_name(), invoked_name->as_C_string(), invoked_type->as_C_string());
+    }
+  } else {
+    return proxy_klass;
+  }
+
+  // Retrieving from static archive is unsuccessful, try dynamic archive.
+  info = _runtime_dynamic_table.lookup(&key, hash, 0);
+  proxy_klass = find_lambda_proxy_class(info);
+  if (proxy_klass == nullptr) {
+    if (info != nullptr && log_is_enabled(Debug, cds)) {
+      ResourceMark rm;
+      log_debug(cds)("Used all dynamic archived lambda proxy classes for: %s %s%s",
+                     caller_ik->external_name(), invoked_name->as_C_string(), invoked_type->as_C_string());
+    }
+  }
+  return proxy_klass;
+}
+
+InstanceKlass* LambdaProxyClassDictionary::find_lambda_proxy_class(const RunTimeLambdaProxyClassInfo* info) {
+  InstanceKlass* proxy_klass = nullptr;
+  if (info != nullptr) {
+    InstanceKlass* curr_klass = info->proxy_klass_head();
+    InstanceKlass* prev_klass = curr_klass;
+    if (curr_klass->lambda_proxy_is_available()) {
+      while (curr_klass->next_link() != nullptr) {
+        prev_klass = curr_klass;
+        curr_klass = InstanceKlass::cast(curr_klass->next_link());
+      }
+      assert(curr_klass->is_hidden(), "must be");
+      assert(curr_klass->lambda_proxy_is_available(), "must be");
+
+      prev_klass->set_next_link(nullptr);
+      proxy_klass = curr_klass;
+      proxy_klass->clear_lambda_proxy_is_available();
+      if (log_is_enabled(Debug, cds)) {
+        ResourceMark rm;
+        log_debug(cds)("Loaded lambda proxy: %s ", proxy_klass->external_name());
+      }
+    }
+  }
+  return proxy_klass;
+}
+
+InstanceKlass* LambdaProxyClassDictionary::load_and_init_lambda_proxy_class(InstanceKlass* lambda_ik,
+                                                                            InstanceKlass* caller_ik, TRAPS) {
+  Handle class_loader(THREAD, caller_ik->class_loader());
+  Handle protection_domain;
+  PackageEntry* pkg_entry = caller_ik->package();
+  if (caller_ik->class_loader() != nullptr) {
+    protection_domain = CDSProtectionDomain::init_security_info(class_loader, caller_ik, pkg_entry, CHECK_NULL);
+  }
+
+  InstanceKlass* shared_nest_host = get_shared_nest_host(lambda_ik);
+  assert(shared_nest_host != nullptr, "unexpected nullptr _nest_host");
+  assert(shared_nest_host->is_shared(), "nest host must be in CDS archive");
+
+  Klass* resolved_nest_host = SystemDictionary::resolve_or_fail(shared_nest_host->name(), class_loader, true, CHECK_NULL);
+  if (resolved_nest_host != shared_nest_host) {
+    // The dynamically resolved nest_host is not the same as the one we used during dump time,
+    // so we cannot use lambda_ik.
+    return nullptr;
+  }
+
+  {
+    InstanceKlass* loaded_lambda =
+      SystemDictionary::load_shared_class(lambda_ik, class_loader, protection_domain,
+                                          nullptr, pkg_entry, CHECK_NULL);
+    if (loaded_lambda != lambda_ik) {
+      // changed by JVMTI
+      return nullptr;
+    }
+  }
+
+  assert(shared_nest_host->is_same_class_package(lambda_ik),
+         "lambda proxy class and its nest host must be in the same package");
+  // The lambda proxy class and its nest host have the same class loader and class loader data,
+  // as verified in add_lambda_proxy_class()
+  assert(shared_nest_host->class_loader() == class_loader(), "mismatched class loader");
+  assert(shared_nest_host->class_loader_data() == ClassLoaderData::class_loader_data(class_loader()), "mismatched class loader data");
+  lambda_ik->set_nest_host(shared_nest_host);
+
+  // Ensures the nest host is the same as the lambda proxy's
+  // nest host recorded at dump time.
+  InstanceKlass* nest_host = caller_ik->nest_host(THREAD);
+  assert(nest_host == shared_nest_host, "mismatched nest host");
+
+  EventClassLoad class_load_start_event;
+
+  // Add to class hierarchy, and do possible deoptimizations.
+  lambda_ik->add_to_hierarchy(THREAD);
+  // But, do not add to dictionary.
+
+  lambda_ik->link_class(CHECK_NULL);
+  // notify jvmti
+  if (JvmtiExport::should_post_class_load()) {
+    JvmtiExport::post_class_load(THREAD, lambda_ik);
+  }
+  if (class_load_start_event.should_commit()) {
+    SystemDictionary::post_class_load_event(&class_load_start_event, lambda_ik, ClassLoaderData::class_loader_data(class_loader()));
+  }
+
+  lambda_ik->initialize(CHECK_NULL);
+
+  return lambda_ik;
+}
+
+void LambdaProxyClassDictionary::dumptime_classes_do(MetaspaceClosure* it) {
+  _dumptime_table->iterate_all([&] (LambdaProxyClassKey& key, DumpTimeLambdaProxyClassInfo& info) {
+    if (key.caller_ik()->is_loader_alive()) {
+      info.metaspace_pointers_do(it);
+      key.metaspace_pointers_do(it);
+    }
+  });
+}
+
+void LambdaProxyClassDictionary::add_to_dumptime_table(LambdaProxyClassKey& key,
+                                                       InstanceKlass* proxy_klass) {
+  assert_lock_strong(DumpTimeTable_lock);
+
+  bool created;
+  DumpTimeLambdaProxyClassInfo* info = _dumptime_table->put_if_absent(key, &created);
+  info->add_proxy_klass(proxy_klass);
+  if (created) {
+    ++_dumptime_table->_count;
+  }
+}
+
+class CopyLambdaProxyClassInfoToArchive : StackObj {
+  CompactHashtableWriter* _writer;
+  ArchiveBuilder* _builder;
+public:
+  CopyLambdaProxyClassInfoToArchive(CompactHashtableWriter* writer)
+  : _writer(writer), _builder(ArchiveBuilder::current()) {}
+  bool do_entry(LambdaProxyClassKey& key, DumpTimeLambdaProxyClassInfo& info) {
+    // In static dump, info._proxy_klasses->at(0) is already relocated to point to the archived class
+    // (not the original class).
+    ResourceMark rm;
+    log_info(cds,dynamic)("Archiving hidden %s", info._proxy_klasses->at(0)->external_name());
+    size_t byte_size = sizeof(RunTimeLambdaProxyClassInfo);
+    RunTimeLambdaProxyClassInfo* runtime_info =
+        (RunTimeLambdaProxyClassInfo*)ArchiveBuilder::ro_region_alloc(byte_size);
+    runtime_info->init(key, info);
+    unsigned int hash = runtime_info->hash();
+    u4 delta = _builder->any_to_offset_u4((void*)runtime_info);
+    _writer->add(hash, delta);
+    return true;
+  }
+};
+
+void LambdaProxyClassDictionary::write_dictionary(bool is_static_archive) {
+  LambdaProxyClassDictionary* dictionary = is_static_archive ? &_runtime_static_table : &_runtime_dynamic_table;
+  CompactHashtableStats stats;
+  dictionary->reset();
+  CompactHashtableWriter writer(_dumptime_table->_count, &stats);
+  CopyLambdaProxyClassInfoToArchive copy(&writer);
+  _dumptime_table->iterate(&copy);
+  writer.dump(dictionary, "lambda proxy class dictionary");
+}
+
+class AdjustLambdaProxyClassInfo : StackObj {
+public:
+  AdjustLambdaProxyClassInfo() {}
+  bool do_entry(LambdaProxyClassKey& key, DumpTimeLambdaProxyClassInfo& info) {
+    int len = info._proxy_klasses->length();
+    InstanceKlass* last_buff_k = nullptr;
+
+    for (int i = len - 1; i >= 0; i--) {
+      InstanceKlass* orig_k = info._proxy_klasses->at(i);
+      InstanceKlass* buff_k = ArchiveBuilder::current()->get_buffered_addr(orig_k);
+      assert(ArchiveBuilder::current()->is_in_buffer_space(buff_k), "must be");
+      buff_k->set_lambda_proxy_is_available();
+      buff_k->set_next_link(last_buff_k);
+      if (last_buff_k != nullptr) {
+        ArchivePtrMarker::mark_pointer(buff_k->next_link_addr());
+      }
+      last_buff_k = buff_k;
+    }
+
+    return true;
+  }
+};
+
+void LambdaProxyClassDictionary::adjust_dumptime_table() {
+  AdjustLambdaProxyClassInfo adjuster;
+  _dumptime_table->iterate(&adjuster);
+}
+
+class LambdaProxyClassDictionary::CleanupDumpTimeLambdaProxyClassTable: StackObj {
+ public:
+  bool do_entry(LambdaProxyClassKey& key, DumpTimeLambdaProxyClassInfo& info) {
+    assert_lock_strong(DumpTimeTable_lock);
+    InstanceKlass* caller_ik = key.caller_ik();
+    InstanceKlass* nest_host = caller_ik->nest_host_not_null();
+
+    // If the caller class and/or nest_host are excluded, the associated lambda proxy
+    // must also be excluded.
+    bool always_exclude = SystemDictionaryShared::check_for_exclusion(caller_ik, nullptr) ||
+                          SystemDictionaryShared::check_for_exclusion(nest_host, nullptr);
+
+    for (int i = info._proxy_klasses->length() - 1; i >= 0; i--) {
+      InstanceKlass* ik = info._proxy_klasses->at(i);
+      if (always_exclude || SystemDictionaryShared::check_for_exclusion(ik, nullptr)) {
+        LambdaProxyClassDictionary::reset_registered_lambda_proxy_class(ik);
+        info._proxy_klasses->remove_at(i);
+      }
+    }
+    return info._proxy_klasses->length() == 0 ? true /* delete the node*/ : false;
+  }
+};
+
+void LambdaProxyClassDictionary::cleanup_dumptime_table() {
+  assert_lock_strong(DumpTimeTable_lock);
+  CleanupDumpTimeLambdaProxyClassTable cleanup_proxy_classes;
+  _dumptime_table->unlink(&cleanup_proxy_classes);
+}
+
+class SharedLambdaDictionaryPrinter : StackObj {
+  outputStream* _st;
+  int _index;
+public:
+  SharedLambdaDictionaryPrinter(outputStream* st, int idx) : _st(st), _index(idx) {}
+
+  void do_value(const RunTimeLambdaProxyClassInfo* record) {
+    if (record->proxy_klass_head()->lambda_proxy_is_available()) {
+      ResourceMark rm;
+      Klass* k = record->proxy_klass_head();
+      while (k != nullptr) {
+        _st->print_cr("%4d: %s %s", _index++, k->external_name(),
+                      SystemDictionaryShared::loader_type_for_shared_class(k));
+        k = k->next_link();
+      }
+    }
+  }
+};
+
+void LambdaProxyClassDictionary::print_on(const char* prefix,
+                                          outputStream* st,
+                                          int start_index,
+                                          bool is_static_archive) {
+  LambdaProxyClassDictionary* dictionary = is_static_archive ? &_runtime_static_table : &_runtime_dynamic_table;
+  if (!dictionary->empty()) {
+    st->print_cr("%sShared Lambda Dictionary", prefix);
+    SharedLambdaDictionaryPrinter ldp(st, start_index);
+    dictionary->iterate(&ldp);
+  }
+}
+
+void LambdaProxyClassDictionary::print_statistics(outputStream* st,
+                                                        bool is_static_archive) {
+  LambdaProxyClassDictionary* dictionary = is_static_archive ? &_runtime_static_table : &_runtime_dynamic_table;
+  dictionary->print_table_statistics(st, "Lambda Shared Dictionary");
+}
diff --git a/src/hotspot/share/cds/lambdaProxyClassDictionary.hpp b/src/hotspot/share/cds/lambdaProxyClassDictionary.hpp
index bd163fc551d..814dda80827 100644
--- a/src/hotspot/share/cds/lambdaProxyClassDictionary.hpp
+++ b/src/hotspot/share/cds/lambdaProxyClassDictionary.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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,31 @@
 
 #ifndef SHARE_CDS_LAMBDAPROXYCLASSINFO_HPP
 #define SHARE_CDS_LAMBDAPROXYCLASSINFO_HPP
+
+#include "cds/archiveBuilder.hpp"
 #include "cds/metaspaceShared.hpp"
 #include "classfile/javaClasses.hpp"
+#include "memory/metaspaceClosure.hpp"
 #include "utilities/growableArray.hpp"
 #include "utilities/resourceHash.hpp"
 
+// This file contains *legacy* optimization for lambdas before JEP 483. May be removed in the future.
+//
+// The functionalties in this file are used only when CDSConfig::is_dumping_lambdas_in_legacy_mode()
+// returns true during the creation of a CDS archive.
+//
+// With the legacy optimization, generated lambda proxy classes (with names such as
+// java.util.ResourceBundle$Control$$Lambda/0x80000001d) are stored inside the CDS archive, accessible
+// by LambdaProxyClassDictionary::find_proxy_class(). This saves part of the time for resolving a
+// lambda call site (proxy class generation). However, a significant portion of the cost of
+// the lambda call site resolution still remains in the production run.
+//
+// In contrast, with JEP 483, the entire lambda call site (starting from the constant pool entry), is
+// resolved in the AOT cache assembly phase. No extra resolution is needed in the production run.
+
 class InstanceKlass;
 class Method;
+class MetaspaceClosure;
 class Symbol;
 class outputStream;
 
@@ -243,9 +261,75 @@ public:
   int _count;
 };
 
+// *Legacy* optimization for lambdas before JEP 483. May be removed in the future.
 class LambdaProxyClassDictionary : public OffsetCompactHashtable<
   RunTimeLambdaProxyClassKey*,
   const RunTimeLambdaProxyClassInfo*,
-  RunTimeLambdaProxyClassInfo::EQUALS> {};
+  RunTimeLambdaProxyClassInfo::EQUALS>
+{
+private:
+  class CleanupDumpTimeLambdaProxyClassTable;
+  static DumpTimeLambdaProxyClassDictionary* _dumptime_table;
+  static LambdaProxyClassDictionary _runtime_static_table; // for static CDS archive
+  static LambdaProxyClassDictionary _runtime_dynamic_table; // for dynamic CDS archive
+
+  static void add_to_dumptime_table(LambdaProxyClassKey& key,
+                                    InstanceKlass* proxy_klass);
+  static InstanceKlass* find_lambda_proxy_class(const RunTimeLambdaProxyClassInfo* info);
+  static InstanceKlass* find_lambda_proxy_class(InstanceKlass* caller_ik,
+                                                Symbol* invoked_name,
+                                                Symbol* invoked_type,
+                                                Symbol* method_type,
+                                                Method* member_method,
+                                                Symbol* instantiated_method_type);
+  static InstanceKlass* load_and_init_lambda_proxy_class(InstanceKlass* lambda_ik,
+                                                         InstanceKlass* caller_ik, TRAPS);
+  static void reset_registered_lambda_proxy_class(InstanceKlass* ik);
+  static InstanceKlass* get_shared_nest_host(InstanceKlass* lambda_ik);
+
+public:
+  static void dumptime_init();
+  static void dumptime_classes_do(MetaspaceClosure* it);
+  static void add_lambda_proxy_class(InstanceKlass* caller_ik,
+                                     InstanceKlass* lambda_ik,
+                                     Symbol* invoked_name,
+                                     Symbol* invoked_type,
+                                     Symbol* method_type,
+                                     Method* member_method,
+                                     Symbol* instantiated_method_type,
+                                     TRAPS);
+  static bool is_supported_invokedynamic(BootstrapInfo* bsi);
+  static bool is_registered_lambda_proxy_class(InstanceKlass* ik);
+  static InstanceKlass* load_shared_lambda_proxy_class(InstanceKlass* caller_ik,
+                                                       Symbol* invoked_name,
+                                                       Symbol* invoked_type,
+                                                       Symbol* method_type,
+                                                       Method* member_method,
+                                                       Symbol* instantiated_method_type,
+                                                       TRAPS);
+  static void write_dictionary(bool is_static_archive);
+  static void adjust_dumptime_table();
+  static void cleanup_dumptime_table();
+
+  static void reset_dictionary(bool is_static_archive) {
+    if (is_static_archive) {
+      _runtime_static_table.reset();
+    } else {
+      _runtime_dynamic_table.reset();
+    }
+  }
+
+  static void serialize(SerializeClosure* soc, bool is_static_archive) {
+    if (is_static_archive) {
+      _runtime_static_table.serialize_header(soc);
+    } else {
+      _runtime_dynamic_table.serialize_header(soc);
+    }
+  }
+
+  static void print_on(const char* prefix, outputStream* st,
+                       int start_index, bool is_static_archive);
+  static void print_statistics(outputStream* st,  bool is_static_archive);
+};
 
 #endif // SHARE_CDS_LAMBDAPROXYCLASSINFO_HPP
diff --git a/src/hotspot/share/cds/metaspaceShared.cpp b/src/hotspot/share/cds/metaspaceShared.cpp
index 0b9638dad1a..3677b3baf5f 100644
--- a/src/hotspot/share/cds/metaspaceShared.cpp
+++ b/src/hotspot/share/cds/metaspaceShared.cpp
@@ -43,6 +43,7 @@
 #include "cds/finalImageRecipes.hpp"
 #include "cds/heapShared.hpp"
 #include "cds/lambdaFormInvokers.hpp"
+#include "cds/lambdaProxyClassDictionary.hpp"
 #include "cds/metaspaceShared.hpp"
 #include "classfile/classLoaderDataGraph.hpp"
 #include "classfile/classLoaderDataShared.hpp"
@@ -661,7 +662,10 @@ void VM_PopulateDumpSharedSpace::doit() {
   AOTClassLocationConfig* cl_config;
   char* serialized_data = dump_read_only_tables(cl_config);
 
-  SystemDictionaryShared::adjust_lambda_proxy_class_dictionary();
+  if (CDSConfig::is_dumping_lambdas_in_legacy_mode()) {
+    log_info(cds)("Adjust lambda proxy class dictionary");
+    LambdaProxyClassDictionary::adjust_dumptime_table();
+  }
 
   // The vtable clones contain addresses of the current process.
   // We don't want to write these addresses into the archive.
diff --git a/src/hotspot/share/classfile/javaClasses.cpp b/src/hotspot/share/classfile/javaClasses.cpp
index fa97888360a..a2ad1dce5e4 100644
--- a/src/hotspot/share/classfile/javaClasses.cpp
+++ b/src/hotspot/share/classfile/javaClasses.cpp
@@ -5453,7 +5453,7 @@ bool JavaClasses::is_supported_for_archiving(oop obj) {
   Klass* klass = obj->klass();
 
   if (!CDSConfig::is_dumping_method_handles()) {
-    // These are supported by CDS only when CDSConfig::is_dumping_invokedynamic() is enabled.
+    // These are supported by CDS only when CDSConfig::is_dumping_method_handles() is enabled.
     if (klass == vmClasses::ResolvedMethodName_klass() ||
         klass == vmClasses::MemberName_klass()) {
       return false;
diff --git a/src/hotspot/share/classfile/systemDictionary.cpp b/src/hotspot/share/classfile/systemDictionary.cpp
index 811ba12a1e9..0ef4f0dcd18 100644
--- a/src/hotspot/share/classfile/systemDictionary.cpp
+++ b/src/hotspot/share/classfile/systemDictionary.cpp
@@ -1073,38 +1073,6 @@ bool SystemDictionary::check_shared_class_super_types(InstanceKlass* ik, Handle
   return true;
 }
 
-InstanceKlass* SystemDictionary::load_shared_lambda_proxy_class(InstanceKlass* ik,
-                                                                Handle class_loader,
-                                                                Handle protection_domain,
-                                                                PackageEntry* pkg_entry,
-                                                                TRAPS) {
-  InstanceKlass* shared_nest_host = SystemDictionaryShared::get_shared_nest_host(ik);
-  assert(shared_nest_host->is_shared(), "nest host must be in CDS archive");
-  Symbol* cn = shared_nest_host->name();
-  Klass *s = resolve_or_fail(cn, class_loader, true, CHECK_NULL);
-  if (s != shared_nest_host) {
-    // The dynamically resolved nest_host is not the same as the one we used during dump time,
-    // so we cannot use ik.
-    return nullptr;
-  } else {
-    assert(s->is_shared(), "must be");
-  }
-
-  InstanceKlass* loaded_ik = load_shared_class(ik, class_loader, protection_domain, nullptr, pkg_entry, CHECK_NULL);
-
-  if (loaded_ik != nullptr) {
-    assert(shared_nest_host->is_same_class_package(ik),
-           "lambda proxy class and its nest host must be in the same package");
-    // The lambda proxy class and its nest host have the same class loader and class loader data,
-    // as verified in SystemDictionaryShared::add_lambda_proxy_class()
-    assert(shared_nest_host->class_loader() == class_loader(), "mismatched class loader");
-    assert(shared_nest_host->class_loader_data() == class_loader_data(class_loader), "mismatched class loader data");
-    ik->set_nest_host(shared_nest_host);
-  }
-
-  return loaded_ik;
-}
-
 InstanceKlass* SystemDictionary::load_shared_class(InstanceKlass* ik,
                                                    Handle class_loader,
                                                    Handle protection_domain,
@@ -1112,6 +1080,7 @@ InstanceKlass* SystemDictionary::load_shared_class(InstanceKlass* ik,
                                                    PackageEntry* pkg_entry,
                                                    TRAPS) {
   assert(ik != nullptr, "sanity");
+  assert(ik->is_shared(), "sanity");
   assert(!ik->is_unshareable_info_restored(), "shared class can be restored only once");
   assert(Atomic::add(&ik->_shared_class_load_count, 1) == 1, "shared class loaded more than once");
   Symbol* class_name = ik->name();
@@ -1130,7 +1099,7 @@ InstanceKlass* SystemDictionary::load_shared_class(InstanceKlass* ik,
   InstanceKlass* new_ik = nullptr;
   // CFLH check is skipped for VM hidden classes (see KlassFactory::create_from_stream).
   // It will be skipped for shared VM hidden lambda proxy classes.
-  if (!SystemDictionaryShared::is_hidden_lambda_proxy(ik)) {
+  if (!ik->is_hidden()) {
     new_ik = KlassFactory::check_shared_class_file_load_hook(
       ik, class_name, class_loader, protection_domain, cfs, CHECK_NULL);
   }
diff --git a/src/hotspot/share/classfile/systemDictionary.hpp b/src/hotspot/share/classfile/systemDictionary.hpp
index 1ba5d70af9e..8cf2cd83b82 100644
--- a/src/hotspot/share/classfile/systemDictionary.hpp
+++ b/src/hotspot/share/classfile/systemDictionary.hpp
@@ -78,6 +78,7 @@ template <class E> class GrowableArray;
 class SystemDictionary : AllStatic {
   friend class AOTLinkedClassBulkLoader;
   friend class BootstrapInfo;
+  friend class LambdaProxyClassDictionary;
   friend class vmClasses;
 
  public:
@@ -325,16 +326,11 @@ private:
   static void restore_archived_method_handle_intrinsics_impl(TRAPS) NOT_CDS_RETURN;
 
 protected:
-  // Used by SystemDictionaryShared
+  // Used by SystemDictionaryShared and LambdaProxyClassDictionary
 
   static bool add_loader_constraint(Symbol* name, Klass* klass_being_linked,  Handle loader1,
                                     Handle loader2);
   static void post_class_load_event(EventClassLoad* event, const InstanceKlass* k, const ClassLoaderData* init_cld);
-  static InstanceKlass* load_shared_lambda_proxy_class(InstanceKlass* ik,
-                                                       Handle class_loader,
-                                                       Handle protection_domain,
-                                                       PackageEntry* pkg_entry,
-                                                       TRAPS);
   static InstanceKlass* load_shared_class(InstanceKlass* ik,
                                           Handle class_loader,
                                           Handle protection_domain,
@@ -345,6 +341,7 @@ protected:
   static InstanceKlass* find_or_define_instance_class(Symbol* class_name,
                                                       Handle class_loader,
                                                       InstanceKlass* k, TRAPS);
+
 public:
   static bool is_system_class_loader(oop class_loader);
   static bool is_platform_class_loader(oop class_loader);
diff --git a/src/hotspot/share/classfile/systemDictionaryShared.cpp b/src/hotspot/share/classfile/systemDictionaryShared.cpp
index 8b815cf9cb7..c4e061b8fa9 100644
--- a/src/hotspot/share/classfile/systemDictionaryShared.cpp
+++ b/src/hotspot/share/classfile/systemDictionaryShared.cpp
@@ -24,7 +24,6 @@
 
 #include "cds/aotClassLocation.hpp"
 #include "cds/archiveBuilder.hpp"
-#include "cds/archiveHeapLoader.hpp"
 #include "cds/archiveUtils.hpp"
 #include "cds/cdsConfig.hpp"
 #include "cds/cdsProtectionDomain.hpp"
@@ -34,6 +33,7 @@
 #include "cds/dynamicArchive.hpp"
 #include "cds/filemap.hpp"
 #include "cds/heapShared.hpp"
+#include "cds/lambdaProxyClassDictionary.hpp"
 #include "cds/metaspaceShared.hpp"
 #include "cds/runTimeClassInfo.hpp"
 #include "cds/unregisteredClasses.hpp"
@@ -51,7 +51,6 @@
 #include "classfile/verificationType.hpp"
 #include "classfile/vmClasses.hpp"
 #include "classfile/vmSymbols.hpp"
-#include "interpreter/bootstrapInfo.hpp"
 #include "jfr/jfrEvents.hpp"
 #include "logging/log.hpp"
 #include "logging/logStream.hpp"
@@ -81,7 +80,6 @@ SystemDictionaryShared::ArchiveInfo SystemDictionaryShared::_static_archive;
 SystemDictionaryShared::ArchiveInfo SystemDictionaryShared::_dynamic_archive;
 
 DumpTimeSharedClassTable* SystemDictionaryShared::_dumptime_table = nullptr;
-DumpTimeLambdaProxyClassDictionary* SystemDictionaryShared::_dumptime_lambda_proxy_class_dictionary = nullptr;
 
 // Used by NoClassLoadingMark
 DEBUG_ONLY(bool SystemDictionaryShared::_class_loading_may_happen = true;)
@@ -243,37 +241,11 @@ bool SystemDictionaryShared::is_jfr_event_class(InstanceKlass *k) {
   return false;
 }
 
-bool SystemDictionaryShared::is_registered_lambda_proxy_class(InstanceKlass* ik) {
-  DumpTimeClassInfo* info = _dumptime_table->get(ik);
-  bool result = (info != nullptr) ? info->_is_registered_lambda_proxy : false;
-  if (result) {
-    assert(!CDSConfig::is_dumping_invokedynamic(), "only used in legacy lambda proxy support");
-  }
-  return result;
-}
-
-void SystemDictionaryShared::reset_registered_lambda_proxy_class(InstanceKlass* ik) {
-  DumpTimeClassInfo* info = _dumptime_table->get(ik);
-  if (info != nullptr) {
-    info->_is_registered_lambda_proxy = false;
-    info->set_excluded();
-  }
-}
-
 bool SystemDictionaryShared::is_early_klass(InstanceKlass* ik) {
   DumpTimeClassInfo* info = _dumptime_table->get(ik);
   return (info != nullptr) ? info->is_early_klass() : false;
 }
 
-bool SystemDictionaryShared::is_hidden_lambda_proxy(InstanceKlass* ik) {
-  assert(ik->is_shared(), "applicable to only a shared class");
-  if (ik->is_hidden()) {
-    return true;
-  } else {
-    return false;
-  }
-}
-
 bool SystemDictionaryShared::check_for_exclusion_impl(InstanceKlass* k) {
   if (CDSConfig::is_dumping_final_static_archive() && k->is_shared_unregistered_class()
       && k->is_shared()) {
@@ -502,8 +474,7 @@ void SystemDictionaryShared::set_shared_class_misc_info(InstanceKlass* k, ClassF
 void SystemDictionaryShared::initialize() {
   if (CDSConfig::is_dumping_archive()) {
     _dumptime_table = new (mtClass) DumpTimeSharedClassTable;
-    _dumptime_lambda_proxy_class_dictionary =
-                      new (mtClass) DumpTimeLambdaProxyClassDictionary;
+    LambdaProxyClassDictionary::dumptime_init();
     if (CDSConfig::is_dumping_heap()) {
       HeapShared::init_dumping();
     }
@@ -587,8 +558,8 @@ void SystemDictionaryShared::validate_before_archiving(InstanceKlass* k) {
   guarantee(!info->is_excluded(), "Should not attempt to archive excluded class %s", name);
   if (is_builtin(k)) {
     if (k->is_hidden()) {
-      if (!CDSConfig::is_dumping_method_handles()) {
-        assert(is_registered_lambda_proxy_class(k), "unexpected hidden class %s", name);
+      if (CDSConfig::is_dumping_lambdas_in_legacy_mode()) {
+        assert(LambdaProxyClassDictionary::is_registered_lambda_proxy_class(k), "unexpected hidden class %s", name);
       }
     }
     guarantee(!k->is_shared_unregistered_class(),
@@ -705,7 +676,9 @@ void SystemDictionaryShared::finish_exclusion_checks() {
   });
 
   _dumptime_table->update_counts();
-  cleanup_lambda_proxy_class_dictionary();
+  if (CDSConfig::is_dumping_lambdas_in_legacy_mode()) {
+    LambdaProxyClassDictionary::cleanup_dumptime_table();
+  }
 }
 
 bool SystemDictionaryShared::is_excluded_class(InstanceKlass* k) {
@@ -741,7 +714,7 @@ bool SystemDictionaryShared::has_class_failed_verification(InstanceKlass* ik) {
   return (p == nullptr) ? false : p->failed_verification();
 }
 
-void SystemDictionaryShared::dumptime_classes_do(class MetaspaceClosure* it) {
+void SystemDictionaryShared::dumptime_classes_do(MetaspaceClosure* it) {
   assert_lock_strong(DumpTimeTable_lock);
 
   auto do_klass = [&] (InstanceKlass* k, DumpTimeClassInfo& info) {
@@ -754,13 +727,9 @@ void SystemDictionaryShared::dumptime_classes_do(class MetaspaceClosure* it) {
   };
   _dumptime_table->iterate_all_live_classes(do_klass);
 
-  auto do_lambda = [&] (LambdaProxyClassKey& key, DumpTimeLambdaProxyClassInfo& info) {
-    if (key.caller_ik()->is_loader_alive()) {
-      info.metaspace_pointers_do(it);
-      key.metaspace_pointers_do(it);
-    }
-  };
-  _dumptime_lambda_proxy_class_dictionary->iterate_all(do_lambda);
+  if (CDSConfig::is_dumping_lambdas_in_legacy_mode()) {
+    LambdaProxyClassDictionary::dumptime_classes_do(it);
+  }
 }
 
 bool SystemDictionaryShared::add_verification_constraint(InstanceKlass* k, Symbol* name,
@@ -795,198 +764,6 @@ void SystemDictionaryShared::add_enum_klass_static_field(InstanceKlass* ik, int
   info->add_enum_klass_static_field(root_index);
 }
 
-void SystemDictionaryShared::add_to_dump_time_lambda_proxy_class_dictionary(LambdaProxyClassKey& key,
-                                                           InstanceKlass* proxy_klass) {
-  assert_lock_strong(DumpTimeTable_lock);
-
-  bool created;
-  DumpTimeLambdaProxyClassInfo* info = _dumptime_lambda_proxy_class_dictionary->put_if_absent(key, &created);
-  info->add_proxy_klass(proxy_klass);
-  if (created) {
-    ++_dumptime_lambda_proxy_class_dictionary->_count;
-  }
-}
-
-void SystemDictionaryShared::add_lambda_proxy_class(InstanceKlass* caller_ik,
-                                                    InstanceKlass* lambda_ik,
-                                                    Symbol* invoked_name,
-                                                    Symbol* invoked_type,
-                                                    Symbol* method_type,
-                                                    Method* member_method,
-                                                    Symbol* instantiated_method_type,
-                                                    TRAPS) {
-  if (CDSConfig::is_dumping_invokedynamic()) {
-    // The lambda proxy classes will be stored as part of aot-resolved constant pool entries.
-    // There's no need to remember them in a separate table.
-    return;
-  }
-  if (CDSConfig::is_dumping_preimage_static_archive()) {
-    // Information about lambda proxies are recorded in FinalImageRecipes.
-    return;
-  }
-
-  assert(caller_ik->class_loader() == lambda_ik->class_loader(), "mismatched class loader");
-  assert(caller_ik->class_loader_data() == lambda_ik->class_loader_data(), "mismatched class loader data");
-  assert(java_lang_Class::class_data(lambda_ik->java_mirror()) == nullptr, "must not have class data");
-
-  MutexLocker ml(DumpTimeTable_lock, Mutex::_no_safepoint_check_flag);
-
-  lambda_ik->assign_class_loader_type();
-  lambda_ik->set_shared_classpath_index(caller_ik->shared_classpath_index());
-  InstanceKlass* nest_host = caller_ik->nest_host(CHECK);
-  assert(nest_host != nullptr, "unexpected nullptr nest_host");
-
-  DumpTimeClassInfo* info = _dumptime_table->get(lambda_ik);
-  if (info != nullptr && !lambda_ik->is_non_strong_hidden() && is_builtin(lambda_ik) && is_builtin(caller_ik)
-      // Don't include the lambda proxy if its nest host is not in the "linked" state.
-      && nest_host->is_linked()) {
-    // Set _is_registered_lambda_proxy in DumpTimeClassInfo so that the lambda_ik
-    // won't be excluded during dumping of shared archive.
-    info->_is_registered_lambda_proxy = true;
-    info->set_nest_host(nest_host);
-
-    LambdaProxyClassKey key(caller_ik,
-                            invoked_name,
-                            invoked_type,
-                            method_type,
-                            member_method,
-                            instantiated_method_type);
-    add_to_dump_time_lambda_proxy_class_dictionary(key, lambda_ik);
-  }
-}
-
-InstanceKlass* SystemDictionaryShared::get_shared_lambda_proxy_class(InstanceKlass* caller_ik,
-                                                                     Symbol* invoked_name,
-                                                                     Symbol* invoked_type,
-                                                                     Symbol* method_type,
-                                                                     Method* member_method,
-                                                                     Symbol* instantiated_method_type) {
-  if (CDSConfig::is_dumping_final_static_archive()) {
-    return nullptr;
-  }
-
-  assert(caller_ik != nullptr, "sanity");
-  assert(invoked_name != nullptr, "sanity");
-  assert(invoked_type != nullptr, "sanity");
-  assert(method_type != nullptr, "sanity");
-  assert(instantiated_method_type != nullptr, "sanity");
-
-  if (!caller_ik->is_shared()     ||
-      !invoked_name->is_shared()  ||
-      !invoked_type->is_shared()  ||
-      !method_type->is_shared()   ||
-      (member_method != nullptr && !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);
-  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);
-  InstanceKlass* proxy_klass = retrieve_lambda_proxy_class(info);
-  if (proxy_klass == nullptr) {
-    if (info != nullptr && log_is_enabled(Debug, cds)) {
-      ResourceMark rm;
-      log_debug(cds)("Used all static archived lambda proxy classes for: %s %s%s",
-                     caller_ik->external_name(), invoked_name->as_C_string(), invoked_type->as_C_string());
-    }
-  } else {
-    return proxy_klass;
-  }
-
-  // Retrieving from static archive is unsuccessful, try dynamic archive.
-  info = _dynamic_archive.lookup_lambda_proxy_class(&key);
-  proxy_klass = retrieve_lambda_proxy_class(info);
-  if (proxy_klass == nullptr) {
-    if (info != nullptr && log_is_enabled(Debug, cds)) {
-      ResourceMark rm;
-      log_debug(cds)("Used all dynamic archived lambda proxy classes for: %s %s%s",
-                     caller_ik->external_name(), invoked_name->as_C_string(), invoked_type->as_C_string());
-    }
-  }
-  return proxy_klass;
-}
-
-InstanceKlass* SystemDictionaryShared::retrieve_lambda_proxy_class(const RunTimeLambdaProxyClassInfo* info) {
-  InstanceKlass* proxy_klass = nullptr;
-  if (info != nullptr) {
-    InstanceKlass* curr_klass = info->proxy_klass_head();
-    InstanceKlass* prev_klass = curr_klass;
-    if (curr_klass->lambda_proxy_is_available()) {
-      while (curr_klass->next_link() != nullptr) {
-        prev_klass = curr_klass;
-        curr_klass = InstanceKlass::cast(curr_klass->next_link());
-      }
-      assert(curr_klass->is_hidden(), "must be");
-      assert(curr_klass->lambda_proxy_is_available(), "must be");
-
-      prev_klass->set_next_link(nullptr);
-      proxy_klass = curr_klass;
-      proxy_klass->clear_lambda_proxy_is_available();
-      if (log_is_enabled(Debug, cds)) {
-        ResourceMark rm;
-        log_debug(cds)("Loaded lambda proxy: %s ", proxy_klass->external_name());
-      }
-    }
-  }
-  return proxy_klass;
-}
-
-InstanceKlass* SystemDictionaryShared::get_shared_nest_host(InstanceKlass* lambda_ik) {
-  assert(!CDSConfig::is_dumping_static_archive() && CDSConfig::is_using_archive(), "called at run time with CDS enabled only");
-  RunTimeClassInfo* record = RunTimeClassInfo::get_for(lambda_ik);
-  return record->nest_host();
-}
-
-InstanceKlass* SystemDictionaryShared::prepare_shared_lambda_proxy_class(InstanceKlass* lambda_ik,
-                                                                         InstanceKlass* caller_ik, TRAPS) {
-  Handle class_loader(THREAD, caller_ik->class_loader());
-  Handle protection_domain;
-  PackageEntry* pkg_entry = caller_ik->package();
-  if (caller_ik->class_loader() != nullptr) {
-    protection_domain = CDSProtectionDomain::init_security_info(class_loader, caller_ik, pkg_entry, CHECK_NULL);
-  }
-
-  InstanceKlass* shared_nest_host = get_shared_nest_host(lambda_ik);
-  assert(shared_nest_host != nullptr, "unexpected nullptr _nest_host");
-
-  InstanceKlass* loaded_lambda =
-    SystemDictionary::load_shared_lambda_proxy_class(lambda_ik, class_loader, protection_domain, pkg_entry, CHECK_NULL);
-
-  if (loaded_lambda == nullptr) {
-    return nullptr;
-  }
-
-  // Ensures the nest host is the same as the lambda proxy's
-  // nest host recorded at dump time.
-  InstanceKlass* nest_host = caller_ik->nest_host(THREAD);
-  assert(nest_host == shared_nest_host, "mismatched nest host");
-
-  EventClassLoad class_load_start_event;
-
-  // Add to class hierarchy, and do possible deoptimizations.
-  loaded_lambda->add_to_hierarchy(THREAD);
-  // But, do not add to dictionary.
-
-  loaded_lambda->link_class(CHECK_NULL);
-  // notify jvmti
-  if (JvmtiExport::should_post_class_load()) {
-    JvmtiExport::post_class_load(THREAD, loaded_lambda);
-  }
-  if (class_load_start_event.should_commit()) {
-    SystemDictionary::post_class_load_event(&class_load_start_event, loaded_lambda, ClassLoaderData::class_loader_data(class_loader()));
-  }
-
-  loaded_lambda->initialize(CHECK_NULL);
-
-  return loaded_lambda;
-}
-
 void SystemDictionaryShared::check_verification_constraints(InstanceKlass* klass,
                                                             TRAPS) {
   assert(CDSConfig::is_using_archive(), "called at run time with CDS enabled only");
@@ -1176,53 +953,6 @@ void SystemDictionaryShared::copy_linking_constraints_from_preimage(InstanceKlas
   }
 }
 
-bool SystemDictionaryShared::is_supported_invokedynamic(BootstrapInfo* bsi) {
-  LogTarget(Debug, cds, lambda) log;
-  if (bsi->arg_values() == nullptr || !bsi->arg_values()->is_objArray()) {
-    if (log.is_enabled()) {
-      LogStream log_stream(log);
-      log.print("bsi check failed");
-      log.print("    bsi->arg_values().not_null() %d", bsi->arg_values().not_null());
-      if (bsi->arg_values().not_null()) {
-        log.print("    bsi->arg_values()->is_objArray() %d", bsi->arg_values()->is_objArray());
-        bsi->print_msg_on(&log_stream);
-      }
-    }
-    return false;
-  }
-
-  Handle bsm = bsi->bsm();
-  if (bsm.is_null() || !java_lang_invoke_DirectMethodHandle::is_instance(bsm())) {
-    if (log.is_enabled()) {
-      log.print("bsm check failed");
-      log.print("    bsm.is_null() %d", bsm.is_null());
-      log.print("    java_lang_invoke_DirectMethodHandle::is_instance(bsm()) %d",
-        java_lang_invoke_DirectMethodHandle::is_instance(bsm()));
-    }
-    return false;
-  }
-
-  oop mn = java_lang_invoke_DirectMethodHandle::member(bsm());
-  Method* method = java_lang_invoke_MemberName::vmtarget(mn);
-  if (method->klass_name()->equals("java/lang/invoke/LambdaMetafactory") &&
-      method->name()->equals("metafactory") &&
-      method->signature()->equals("(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;"
-            "Ljava/lang/invoke/MethodType;Ljava/lang/invoke/MethodType;Ljava/lang/invoke/MethodHandle;"
-            "Ljava/lang/invoke/MethodType;)Ljava/lang/invoke/CallSite;")) {
-      return true;
-  } else {
-    if (log.is_enabled()) {
-      ResourceMark rm;
-      log.print("method check failed");
-      log.print("    klass_name() %s", method->klass_name()->as_C_string());
-      log.print("    name() %s", method->name()->as_C_string());
-      log.print("    signature() %s", method->signature()->as_C_string());
-    }
-  }
-
-  return false;
-}
-
 unsigned int SystemDictionaryShared::hash_for_shared_dictionary(address ptr) {
   if (ArchiveBuilder::is_active()) {
     uintx offset = ArchiveBuilder::current()->any_to_offset(ptr);
@@ -1238,51 +968,6 @@ unsigned int SystemDictionaryShared::hash_for_shared_dictionary(address ptr) {
   }
 }
 
-class CopyLambdaProxyClassInfoToArchive : StackObj {
-  CompactHashtableWriter* _writer;
-  ArchiveBuilder* _builder;
-public:
-  CopyLambdaProxyClassInfoToArchive(CompactHashtableWriter* writer)
-  : _writer(writer), _builder(ArchiveBuilder::current()) {}
-  bool do_entry(LambdaProxyClassKey& key, DumpTimeLambdaProxyClassInfo& info) {
-    // In static dump, info._proxy_klasses->at(0) is already relocated to point to the archived class
-    // (not the original class).
-    ResourceMark rm;
-    log_info(cds,dynamic)("Archiving hidden %s", info._proxy_klasses->at(0)->external_name());
-    size_t byte_size = sizeof(RunTimeLambdaProxyClassInfo);
-    RunTimeLambdaProxyClassInfo* runtime_info =
-        (RunTimeLambdaProxyClassInfo*)ArchiveBuilder::ro_region_alloc(byte_size);
-    runtime_info->init(key, info);
-    unsigned int hash = runtime_info->hash();
-    u4 delta = _builder->any_to_offset_u4((void*)runtime_info);
-    _writer->add(hash, delta);
-    return true;
-  }
-};
-
-class AdjustLambdaProxyClassInfo : StackObj {
-public:
-  AdjustLambdaProxyClassInfo() {}
-  bool do_entry(LambdaProxyClassKey& key, DumpTimeLambdaProxyClassInfo& info) {
-    int len = info._proxy_klasses->length();
-    InstanceKlass* last_buff_k = nullptr;
-
-    for (int i = len - 1; i >= 0; i--) {
-      InstanceKlass* orig_k = info._proxy_klasses->at(i);
-      InstanceKlass* buff_k = ArchiveBuilder::current()->get_buffered_addr(orig_k);
-      assert(ArchiveBuilder::current()->is_in_buffer_space(buff_k), "must be");
-      buff_k->set_lambda_proxy_is_available();
-      buff_k->set_next_link(last_buff_k);
-      if (last_buff_k != nullptr) {
-        ArchivePtrMarker::mark_pointer(buff_k->next_link_addr());
-      }
-      last_buff_k = buff_k;
-    }
-
-    return true;
-  }
-};
-
 class CopySharedClassInfoToArchive : StackObj {
   CompactHashtableWriter* _writer;
   bool _is_builtin;
@@ -1321,15 +1006,6 @@ public:
   }
 };
 
-void SystemDictionaryShared::write_lambda_proxy_class_dictionary(LambdaProxyClassDictionary *dictionary) {
-  CompactHashtableStats stats;
-  dictionary->reset();
-  CompactHashtableWriter writer(_dumptime_lambda_proxy_class_dictionary->_count, &stats);
-  CopyLambdaProxyClassInfoToArchive copy(&writer);
-  _dumptime_lambda_proxy_class_dictionary->iterate(&copy);
-  writer.dump(dictionary, "lambda proxy class dictionary");
-}
-
 void SystemDictionaryShared::write_dictionary(RunTimeSharedDictionary* dictionary,
                                               bool is_builtin) {
   CompactHashtableStats stats;
@@ -1346,13 +1022,11 @@ void SystemDictionaryShared::write_to_archive(bool is_static_archive) {
 
   write_dictionary(&archive->_builtin_dictionary, true);
   write_dictionary(&archive->_unregistered_dictionary, false);
-
-  write_lambda_proxy_class_dictionary(&archive->_lambda_proxy_class_dictionary);
-}
-
-void SystemDictionaryShared::adjust_lambda_proxy_class_dictionary() {
-  AdjustLambdaProxyClassInfo adjuster;
-  _dumptime_lambda_proxy_class_dictionary->iterate(&adjuster);
+  if (CDSConfig::is_dumping_lambdas_in_legacy_mode()) {
+    LambdaProxyClassDictionary::write_dictionary(is_static_archive);
+  } else {
+    LambdaProxyClassDictionary::reset_dictionary(is_static_archive);
+  }
 }
 
 void SystemDictionaryShared::serialize_dictionary_headers(SerializeClosure* soc,
@@ -1361,7 +1035,7 @@ void SystemDictionaryShared::serialize_dictionary_headers(SerializeClosure* soc,
 
   archive->_builtin_dictionary.serialize_header(soc);
   archive->_unregistered_dictionary.serialize_header(soc);
-  archive->_lambda_proxy_class_dictionary.serialize_header(soc);
+  LambdaProxyClassDictionary::serialize(soc, is_static_archive);
 }
 
 void SystemDictionaryShared::serialize_vm_classes(SerializeClosure* soc) {
@@ -1430,7 +1104,7 @@ void SystemDictionaryShared::update_shared_entry(InstanceKlass* k, int id) {
   info->_id = id;
 }
 
-static const char* class_loader_name_for_shared(Klass* k) {
+const char* SystemDictionaryShared::loader_type_for_shared_class(Klass* k) {
   assert(k != nullptr, "Sanity");
   assert(k->is_shared(), "Must be");
   assert(k->is_instance_klass(), "Must be");
@@ -1457,7 +1131,7 @@ public:
   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()));
+        SystemDictionaryShared::loader_type_for_shared_class(record->klass()));
     if (record->klass()->array_klasses() != nullptr) {
       record->klass()->array_klasses()->cds_print_value_on(_st);
       _st->cr();
@@ -1466,55 +1140,34 @@ public:
   int index() const { return _index; }
 };
 
-class SharedLambdaDictionaryPrinter : StackObj {
-  outputStream* _st;
-  int _index;
-public:
-  SharedLambdaDictionaryPrinter(outputStream* st, int idx) : _st(st), _index(idx) {}
-
-  void do_value(const RunTimeLambdaProxyClassInfo* record) {
-    if (record->proxy_klass_head()->lambda_proxy_is_available()) {
-      ResourceMark rm;
-      Klass* k = record->proxy_klass_head();
-      while (k != nullptr) {
-        _st->print_cr("%4d: %s %s", _index++, k->external_name(),
-                      class_loader_name_for_shared(k));
-        k = k->next_link();
-      }
-    }
-  }
-};
-
 void SystemDictionaryShared::ArchiveInfo::print_on(const char* prefix,
-                                                   outputStream* st) {
+                                                   outputStream* st,
+                                                   bool is_static_archive) {
   st->print_cr("%sShared Dictionary", prefix);
   SharedDictionaryPrinter p(st);
   st->print_cr("%sShared Builtin Dictionary", prefix);
   _builtin_dictionary.iterate(&p);
   st->print_cr("%sShared Unregistered Dictionary", prefix);
   _unregistered_dictionary.iterate(&p);
-  if (!_lambda_proxy_class_dictionary.empty()) {
-    st->print_cr("%sShared Lambda Dictionary", prefix);
-    SharedLambdaDictionaryPrinter ldp(st, p.index());
-    _lambda_proxy_class_dictionary.iterate(&ldp);
-  }
+  LambdaProxyClassDictionary::print_on(prefix, st, p.index(), is_static_archive);
 }
 
 void SystemDictionaryShared::ArchiveInfo::print_table_statistics(const char* prefix,
-                                                                 outputStream* st) {
+                                                                 outputStream* st,
+                                                                 bool is_static_archive) {
   st->print_cr("%sArchve Statistics", prefix);
   _builtin_dictionary.print_table_statistics(st, "Builtin Shared Dictionary");
   _unregistered_dictionary.print_table_statistics(st, "Unregistered Shared Dictionary");
-  _lambda_proxy_class_dictionary.print_table_statistics(st, "Lambda Shared Dictionary");
+  LambdaProxyClassDictionary::print_statistics(st, is_static_archive);
 }
 
 void SystemDictionaryShared::print_shared_archive(outputStream* st, bool is_static) {
   if (CDSConfig::is_using_archive()) {
     if (is_static) {
-      _static_archive.print_on("", st);
+      _static_archive.print_on("", st, true);
     } else {
       if (DynamicArchive::is_mapped()) {
-        _dynamic_archive.print_on("Dynamic ", st);
+        _dynamic_archive.print_on("Dynamic ", st, false);
       }
     }
   }
@@ -1527,9 +1180,9 @@ void SystemDictionaryShared::print_on(outputStream* st) {
 
 void SystemDictionaryShared::print_table_statistics(outputStream* st) {
   if (CDSConfig::is_using_archive()) {
-    _static_archive.print_table_statistics("Static ", st);
+    _static_archive.print_table_statistics("Static ", st, true);
     if (DynamicArchive::is_mapped()) {
-      _dynamic_archive.print_table_statistics("Dynamic ", st);
+      _dynamic_archive.print_table_statistics("Dynamic ", st, false);
     }
   }
 }
@@ -1542,32 +1195,3 @@ bool SystemDictionaryShared::is_dumptime_table_empty() {
   }
   return false;
 }
-
-class CleanupDumpTimeLambdaProxyClassTable: StackObj {
- public:
-  bool do_entry(LambdaProxyClassKey& key, DumpTimeLambdaProxyClassInfo& info) {
-    assert_lock_strong(DumpTimeTable_lock);
-    InstanceKlass* caller_ik = key.caller_ik();
-    InstanceKlass* nest_host = caller_ik->nest_host_not_null();
-
-    // If the caller class and/or nest_host are excluded, the associated lambda proxy
-    // must also be excluded.
-    bool always_exclude = SystemDictionaryShared::check_for_exclusion(caller_ik, nullptr) ||
-                          SystemDictionaryShared::check_for_exclusion(nest_host, nullptr);
-
-    for (int i = info._proxy_klasses->length() - 1; i >= 0; i--) {
-      InstanceKlass* ik = info._proxy_klasses->at(i);
-      if (always_exclude || SystemDictionaryShared::check_for_exclusion(ik, nullptr)) {
-        SystemDictionaryShared::reset_registered_lambda_proxy_class(ik);
-        info._proxy_klasses->remove_at(i);
-      }
-    }
-    return info._proxy_klasses->length() == 0 ? true /* delete the node*/ : false;
-  }
-};
-
-void SystemDictionaryShared::cleanup_lambda_proxy_class_dictionary() {
-  assert_lock_strong(DumpTimeTable_lock);
-  CleanupDumpTimeLambdaProxyClassTable cleanup_proxy_classes;
-  _dumptime_lambda_proxy_class_dictionary->unlink(&cleanup_proxy_classes);
-}
diff --git a/src/hotspot/share/classfile/systemDictionaryShared.hpp b/src/hotspot/share/classfile/systemDictionaryShared.hpp
index c7f38880837..671eb69b8c6 100644
--- a/src/hotspot/share/classfile/systemDictionaryShared.hpp
+++ b/src/hotspot/share/classfile/systemDictionaryShared.hpp
@@ -28,7 +28,6 @@
 #include "cds/cds_globals.hpp"
 #include "cds/filemap.hpp"
 #include "cds/dumpTimeClassInfo.hpp"
-#include "cds/lambdaProxyClassDictionary.hpp"
 #include "cds/runTimeClassInfo.hpp"
 #include "classfile/classLoaderData.hpp"
 #include "classfile/packageEntry.hpp"
@@ -113,11 +112,8 @@ class ConstantPoolCache;
 class Dictionary;
 class DumpTimeClassInfo;
 class DumpTimeSharedClassTable;
-class LambdaProxyClassDictionary;
 class RunTimeClassInfo;
 class RunTimeSharedDictionary;
-class DumpTimeLambdaProxyClassDictionary;
-class LambdaProxyClassKey;
 
 class SharedClassLoadingMark {
  private:
@@ -137,25 +133,19 @@ class SharedClassLoadingMark {
 };
 
 class SystemDictionaryShared: public SystemDictionary {
-  friend class CleanupDumpTimeLambdaProxyClassTable;
+  friend class LambdaProxyClassDictionary;
 
   struct ArchiveInfo {
     RunTimeSharedDictionary _builtin_dictionary;
     RunTimeSharedDictionary _unregistered_dictionary;
-    LambdaProxyClassDictionary _lambda_proxy_class_dictionary;
 
-    const RunTimeLambdaProxyClassInfo* lookup_lambda_proxy_class(RunTimeLambdaProxyClassKey* key) {
-      return _lambda_proxy_class_dictionary.lookup(key, key->hash(), 0);
-    }
-
-    void print_on(const char* prefix, outputStream* st);
-    void print_table_statistics(const char* prefix, outputStream* st);
+    void print_on(const char* prefix, outputStream* st, bool is_static_archive);
+    void print_table_statistics(const char* prefix, outputStream* st, bool is_static_archive);
   };
 
 private:
 
   static DumpTimeSharedClassTable* _dumptime_table;
-  static DumpTimeLambdaProxyClassDictionary* _dumptime_lambda_proxy_class_dictionary;
 
   static ArchiveInfo _static_archive;
   static ArchiveInfo _dynamic_archive;
@@ -182,22 +172,16 @@ private:
 
   static void write_dictionary(RunTimeSharedDictionary* dictionary,
                                bool is_builtin);
-  static void write_lambda_proxy_class_dictionary(LambdaProxyClassDictionary* dictionary);
-  static void cleanup_lambda_proxy_class_dictionary();
-  static void reset_registered_lambda_proxy_class(InstanceKlass* ik);
   static bool is_jfr_event_class(InstanceKlass *k);
   static bool check_for_exclusion_impl(InstanceKlass* k);
   static void remove_dumptime_info(InstanceKlass* k) NOT_CDS_RETURN;
   static bool has_been_redefined(InstanceKlass* k);
-  static InstanceKlass* retrieve_lambda_proxy_class(const RunTimeLambdaProxyClassInfo* info) NOT_CDS_RETURN_(nullptr);
   DEBUG_ONLY(static bool _class_loading_may_happen;)
 
   static void copy_verification_constraints_from_preimage(InstanceKlass* klass);
   static void copy_linking_constraints_from_preimage(InstanceKlass* klass);
 
 public:
-  static bool is_registered_lambda_proxy_class(InstanceKlass* ik);
-  static bool is_hidden_lambda_proxy(InstanceKlass* ik);
   static bool is_early_klass(InstanceKlass* k);   // Was k loaded while JvmtiExport::is_early_phase()==true
   static bool has_archived_enum_objs(InstanceKlass* ik);
   static void set_has_archived_enum_objs(InstanceKlass* ik);
@@ -257,24 +241,6 @@ public:
   static void add_enum_klass_static_field(InstanceKlass* ik, int root_index);
   static void set_class_has_failed_verification(InstanceKlass* ik) NOT_CDS_RETURN;
   static bool has_class_failed_verification(InstanceKlass* ik) NOT_CDS_RETURN_(false);
-  static void add_lambda_proxy_class(InstanceKlass* caller_ik,
-                                     InstanceKlass* lambda_ik,
-                                     Symbol* invoked_name,
-                                     Symbol* invoked_type,
-                                     Symbol* method_type,
-                                     Method* member_method,
-                                     Symbol* instantiated_method_type, TRAPS) NOT_CDS_RETURN;
-  static void add_to_dump_time_lambda_proxy_class_dictionary(LambdaProxyClassKey& key,
-                                                             InstanceKlass* proxy_klass) NOT_CDS_RETURN;
-  static InstanceKlass* get_shared_lambda_proxy_class(InstanceKlass* caller_ik,
-                                                      Symbol* invoked_name,
-                                                      Symbol* invoked_type,
-                                                      Symbol* method_type,
-                                                      Method* member_method,
-                                                      Symbol* instantiated_method_type) NOT_CDS_RETURN_(nullptr);
-  static InstanceKlass* get_shared_nest_host(InstanceKlass* lambda_ik) NOT_CDS_RETURN_(nullptr);
-  static InstanceKlass* prepare_shared_lambda_proxy_class(InstanceKlass* lambda_ik,
-                                                          InstanceKlass* caller_ik, TRAPS) NOT_CDS_RETURN_(nullptr);
   static bool check_linking_constraints(Thread* current, InstanceKlass* klass) NOT_CDS_RETURN_(false);
   static void record_linking_constraint(Symbol* name, InstanceKlass* klass,
                                      Handle loader1, Handle loader2) NOT_CDS_RETURN;
@@ -295,16 +261,15 @@ public:
   static bool warn_excluded(InstanceKlass* k, const char* reason);
   static void dumptime_classes_do(class MetaspaceClosure* it);
   static void write_to_archive(bool is_static_archive = true);
-  static void adjust_lambda_proxy_class_dictionary();
   static void serialize_dictionary_headers(class SerializeClosure* soc,
                                            bool is_static_archive = true);
   static void serialize_vm_classes(class SerializeClosure* soc);
+  static const char* loader_type_for_shared_class(Klass* k);
   static void print() { return print_on(tty); }
   static void print_on(outputStream* st) NOT_CDS_RETURN;
   static void print_shared_archive(outputStream* st, bool is_static = true) NOT_CDS_RETURN;
   static void print_table_statistics(outputStream* st) NOT_CDS_RETURN;
   static bool is_dumptime_table_empty() NOT_CDS_RETURN_(true);
-  static bool is_supported_invokedynamic(BootstrapInfo* bsi) NOT_CDS_RETURN_(false);
   DEBUG_ONLY(static bool class_loading_may_happen() {return _class_loading_may_happen;})
 
 #ifdef ASSERT
diff --git a/src/hotspot/share/oops/instanceKlass.cpp b/src/hotspot/share/oops/instanceKlass.cpp
index 36b7b8778a0..a5afcb68299 100644
--- a/src/hotspot/share/oops/instanceKlass.cpp
+++ b/src/hotspot/share/oops/instanceKlass.cpp
@@ -2699,7 +2699,7 @@ void InstanceKlass::remove_unshareable_info() {
   _methods_jmethod_ids = nullptr;
   _jni_ids = nullptr;
   _oop_map_cache = nullptr;
-  if (CDSConfig::is_dumping_invokedynamic() && HeapShared::is_lambda_proxy_klass(this)) {
+  if (CDSConfig::is_dumping_method_handles() && HeapShared::is_lambda_proxy_klass(this)) {
     // keep _nest_host
   } else {
     // clear _nest_host to ensure re-load at runtime
diff --git a/src/hotspot/share/prims/jvm.cpp b/src/hotspot/share/prims/jvm.cpp
index a2e5d21f99b..3b05806dc37 100644
--- a/src/hotspot/share/prims/jvm.cpp
+++ b/src/hotspot/share/prims/jvm.cpp
@@ -29,6 +29,7 @@
 #include "cds/dynamicArchive.hpp"
 #include "cds/heapShared.hpp"
 #include "cds/lambdaFormInvokers.hpp"
+#include "cds/lambdaProxyClassDictionary.hpp"
 #include "classfile/classFileStream.hpp"
 #include "classfile/classLoader.inline.hpp"
 #include "classfile/classLoaderData.hpp"
@@ -3362,7 +3363,7 @@ JVM_ENTRY(void, JVM_RegisterLambdaProxyClassForArchiving(JNIEnv* env,
                                               jobject dynamicMethodType,
                                               jclass lambdaProxyClass))
 #if INCLUDE_CDS
-  if (!CDSConfig::is_dumping_archive()) {
+  if (!CDSConfig::is_dumping_archive() || !CDSConfig::is_dumping_lambdas_in_legacy_mode()) {
     return;
   }
 
@@ -3396,8 +3397,8 @@ JVM_ENTRY(void, JVM_RegisterLambdaProxyClassForArchiving(JNIEnv* env,
   Handle dynamic_method_type_oop(THREAD, JNIHandles::resolve_non_null(dynamicMethodType));
   Symbol* dynamic_method_type = java_lang_invoke_MethodType::as_signature(dynamic_method_type_oop(), true);
 
-  SystemDictionaryShared::add_lambda_proxy_class(caller_ik, lambda_ik, interface_method_name, factory_type,
-                                                 interface_method_type, m, dynamic_method_type, THREAD);
+  LambdaProxyClassDictionary::add_lambda_proxy_class(caller_ik, lambda_ik, interface_method_name, factory_type,
+                                                     interface_method_type, m, dynamic_method_type, THREAD);
 #endif // INCLUDE_CDS
 JVM_END
 
@@ -3436,14 +3437,11 @@ JVM_ENTRY(jclass, JVM_LookupLambdaProxyClassFromArchive(JNIEnv* env,
   Handle dynamic_method_type_oop(THREAD, JNIHandles::resolve_non_null(dynamicMethodType));
   Symbol* dynamic_method_type = java_lang_invoke_MethodType::as_signature(dynamic_method_type_oop(), true);
 
-  InstanceKlass* lambda_ik = SystemDictionaryShared::get_shared_lambda_proxy_class(caller_ik, interface_method_name, factory_type,
-                                                                                   interface_method_type, m, dynamic_method_type);
-  jclass jcls = nullptr;
-  if (lambda_ik != nullptr) {
-    InstanceKlass* loaded_lambda = SystemDictionaryShared::prepare_shared_lambda_proxy_class(lambda_ik, caller_ik, THREAD);
-    jcls = loaded_lambda == nullptr ? nullptr : (jclass) JNIHandles::make_local(THREAD, loaded_lambda->java_mirror());
-  }
-  return jcls;
+  InstanceKlass* loaded_lambda =
+    LambdaProxyClassDictionary::load_shared_lambda_proxy_class(caller_ik, interface_method_name, factory_type,
+                                                               interface_method_type, m, dynamic_method_type,
+                                                               CHECK_(nullptr));
+  return loaded_lambda == nullptr ? nullptr : (jclass) JNIHandles::make_local(THREAD, loaded_lambda->java_mirror());
 #else
   return nullptr;
 #endif // INCLUDE_CDS
diff --git a/src/hotspot/share/runtime/mutexLocker.hpp b/src/hotspot/share/runtime/mutexLocker.hpp
index aa8850b8b63..1913c64d6a6 100644
--- a/src/hotspot/share/runtime/mutexLocker.hpp
+++ b/src/hotspot/share/runtime/mutexLocker.hpp
@@ -122,7 +122,7 @@ extern Mutex*   NmtVirtualMemory_lock;           // guards NMT virtual memory up
 extern Mutex*   CDSClassFileStream_lock;         // FileMapInfo::open_stream_for_jvmti
 #endif
 extern Mutex*   DumpTimeTable_lock;              // SystemDictionaryShared::_dumptime_table
-extern Mutex*   CDSLambda_lock;                  // SystemDictionaryShared::get_shared_lambda_proxy_class
+extern Mutex*   CDSLambda_lock;                  // LambdaProxyClassDictionary::find_lambda_proxy_class
 extern Mutex*   DumpRegion_lock;                 // Symbol::operator new(size_t sz, int len)
 extern Mutex*   ClassListFile_lock;              // ClassListWriter()
 extern Mutex*   UnregisteredClassesTable_lock;   // UnregisteredClassesTableTable
diff --git a/test/hotspot/jtreg/runtime/cds/appcds/aotClassLinking/AOTClassLinkingVMOptions.java b/test/hotspot/jtreg/runtime/cds/appcds/aotClassLinking/AOTClassLinkingVMOptions.java
index 470bb699bc3..cb5da3a7bcf 100644
--- a/test/hotspot/jtreg/runtime/cds/appcds/aotClassLinking/AOTClassLinkingVMOptions.java
+++ b/test/hotspot/jtreg/runtime/cds/appcds/aotClassLinking/AOTClassLinkingVMOptions.java
@@ -84,6 +84,10 @@ public class AOTClassLinkingVMOptions {
         TestCommon.testDump(appJar, TestCommon.list("Hello"),
                             "-XX:+UnlockDiagnosticVMOptions", "-XX:+AOTClassLinking", "-XX:-AOTInvokeDynamicLinking");
 
+        testCase("Use the archive that was created with -XX:-AOTInvokeDynamicLinking.");
+        TestCommon.run("-cp", appJar, "Hello")
+            .assertNormalExit("Hello");
+
         testCase("Archived full module graph must be enabled at runtime (with -XX:-AOTInvokeDynamicLinking)");
         TestCommon.run("-cp", appJar, "-Djdk.module.validation=1", "Hello")
             .assertAbnormalExit("CDS archive has aot-linked classes." +

From 7853415217cc17179abf2e160ca735c936017f4e Mon Sep 17 00:00:00 2001
From: Robbin Ehn <rehn@openjdk.org>
Date: Thu, 27 Mar 2025 07:30:34 +0000
Subject: [PATCH 511/587] 8352218: RISC-V: Zvfh requires RVV

Reviewed-by: fyang, mli
---
 src/hotspot/cpu/riscv/vm_version_riscv.cpp |  43 +++++----
 src/hotspot/cpu/riscv/vm_version_riscv.hpp | 105 ++++++++++++---------
 2 files changed, 87 insertions(+), 61 deletions(-)

diff --git a/src/hotspot/cpu/riscv/vm_version_riscv.cpp b/src/hotspot/cpu/riscv/vm_version_riscv.cpp
index 36763b1e9d5..a0de9d767bf 100644
--- a/src/hotspot/cpu/riscv/vm_version_riscv.cpp
+++ b/src/hotspot/cpu/riscv/vm_version_riscv.cpp
@@ -220,6 +220,30 @@ void VM_Version::common_initialize() {
     warning("CRC32C intrinsics are not available on this CPU.");
     FLAG_SET_DEFAULT(UseCRC32CIntrinsics, false);
   }
+
+  // UseZvbb (depends on RVV).
+  if (UseZvbb && !UseRVV) {
+    warning("Cannot enable UseZvbb on cpu without RVV support.");
+    FLAG_SET_DEFAULT(UseZvbb, false);
+  }
+
+  // UseZvbc (depends on RVV).
+  if (UseZvbc && !UseRVV) {
+    warning("Cannot enable UseZvbc on cpu without RVV support.");
+    FLAG_SET_DEFAULT(UseZvbc, false);
+  }
+
+  // UseZvkn (depends on RVV).
+  if (UseZvkn && !UseRVV) {
+    warning("Cannot enable UseZvkn on cpu without RVV support.");
+    FLAG_SET_DEFAULT(UseZvkn, false);
+  }
+
+  // UseZvfh (depends on RVV)
+  if (UseZvfh && !UseRVV) {
+    warning("Cannot enable UseZvfh on cpu without RVV support.");
+    FLAG_SET_DEFAULT(UseZvfh, false);
+  }
 }
 
 #ifdef COMPILER2
@@ -345,20 +369,6 @@ void VM_Version::c2_initialize() {
     FLAG_SET_DEFAULT(UseChaCha20Intrinsics, false);
   }
 
-  // UseZvbb (depends on RVV).
-  if (UseZvbb && !UseRVV) {
-    FLAG_SET_DEFAULT(UseZvbb, false);
-    warning("Cannot enable UseZvbb on cpu without RVV support.");
-  }
-
-  // UseZvbc (depends on RVV).
-  if (UseZvbc && !UseRVV) {
-    if (!FLAG_IS_DEFAULT(UseZvbc)) {
-      warning("Cannot enable UseZvbc on cpu without RVV support.");
-    }
-    FLAG_SET_DEFAULT(UseZvbc, false);
-  }
-
   if (!AvoidUnalignedAccesses) {
     if (FLAG_IS_DEFAULT(UseMD5Intrinsics)) {
       FLAG_SET_DEFAULT(UseMD5Intrinsics, true);
@@ -383,11 +393,6 @@ void VM_Version::c2_initialize() {
     FLAG_SET_DEFAULT(UseSHA1Intrinsics, false);
   }
 
-  // UseZvkn (depends on RVV) and SHA-2.
-  if (UseZvkn && !UseRVV) {
-    FLAG_SET_DEFAULT(UseZvkn, false);
-    warning("Cannot enable Zvkn on cpu without RVV support.");
-  }
   // SHA-2, depends on Zvkn.
   if (UseSHA) {
     if (UseZvkn) {
diff --git a/src/hotspot/cpu/riscv/vm_version_riscv.hpp b/src/hotspot/cpu/riscv/vm_version_riscv.hpp
index 1db1371ec79..4214d6c53dc 100644
--- a/src/hotspot/cpu/riscv/vm_version_riscv.hpp
+++ b/src/hotspot/cpu/riscv/vm_version_riscv.hpp
@@ -73,11 +73,31 @@ class VM_Version : public Abstract_VM_Version {
     virtual void update_flag() = 0;
   };
 
-  #define UPDATE_DEFAULT(flag)             \
+  #define UPDATE_DEFAULT(flag)           \
+  void update_flag() {                   \
+    assert(enabled(), "Must be.");       \
+    if (FLAG_IS_DEFAULT(flag)) {         \
+      FLAG_SET_DEFAULT(flag, true);      \
+    } else {                             \
+      /* Sync CPU features with flags */ \
+      if (!flag) {                       \
+        disable_feature();               \
+      }                                  \
+    }                                    \
+  }                                      \
+
+  #define UPDATE_DEFAULT_DEP(flag, dep)    \
   void update_flag() {                     \
       assert(enabled(), "Must be.");       \
+      /* dep must be declared before */    \
+      assert((uintptr_t)(this) >           \
+             (uintptr_t)(&dep), "Invalid");\
       if (FLAG_IS_DEFAULT(flag)) {         \
-        FLAG_SET_DEFAULT(flag, true);      \
+        if (dep.enabled()) {               \
+          FLAG_SET_DEFAULT(flag, true);    \
+        } else {                           \
+          FLAG_SET_DEFAULT(flag, false);   \
+        }                                  \
       } else {                             \
         /* Sync CPU features with flags */ \
         if (!flag) {                       \
@@ -138,46 +158,47 @@ class VM_Version : public Abstract_VM_Version {
 
   #define RV_NO_FLAG_BIT (BitsPerWord+1) // nth_bit will return 0 on values larger than BitsPerWord
 
-  // declaration name  , extension name,    bit pos ,in str, mapped flag)
-  #define RV_FEATURE_FLAGS(decl)                                                                \
-  decl(ext_I           , "i"           ,    ('I' - 'A'), true , NO_UPDATE_DEFAULT)              \
-  decl(ext_M           , "m"           ,    ('M' - 'A'), true , NO_UPDATE_DEFAULT)              \
-  decl(ext_A           , "a"           ,    ('A' - 'A'), true , NO_UPDATE_DEFAULT)              \
-  decl(ext_F           , "f"           ,    ('F' - 'A'), true , NO_UPDATE_DEFAULT)              \
-  decl(ext_D           , "d"           ,    ('D' - 'A'), true , NO_UPDATE_DEFAULT)              \
-  decl(ext_C           , "c"           ,    ('C' - 'A'), true , UPDATE_DEFAULT(UseRVC))         \
-  decl(ext_Q           , "q"           ,    ('Q' - 'A'), true , NO_UPDATE_DEFAULT)              \
-  decl(ext_H           , "h"           ,    ('H' - 'A'), true , NO_UPDATE_DEFAULT)              \
-  decl(ext_V           , "v"           ,    ('V' - 'A'), true , UPDATE_DEFAULT(UseRVV))         \
-  decl(ext_Zicbom      , "Zicbom"      , RV_NO_FLAG_BIT, true , UPDATE_DEFAULT(UseZicbom))      \
-  decl(ext_Zicboz      , "Zicboz"      , RV_NO_FLAG_BIT, true , UPDATE_DEFAULT(UseZicboz))      \
-  decl(ext_Zicbop      , "Zicbop"      , RV_NO_FLAG_BIT, true , UPDATE_DEFAULT(UseZicbop))      \
-  decl(ext_Zba         , "Zba"         , RV_NO_FLAG_BIT, true , UPDATE_DEFAULT(UseZba))         \
-  decl(ext_Zbb         , "Zbb"         , RV_NO_FLAG_BIT, true , UPDATE_DEFAULT(UseZbb))         \
-  decl(ext_Zbc         , "Zbc"         , RV_NO_FLAG_BIT, true , NO_UPDATE_DEFAULT)              \
-  decl(ext_Zbs         , "Zbs"         , RV_NO_FLAG_BIT, true , UPDATE_DEFAULT(UseZbs))         \
-  decl(ext_Zbkb        , "Zbkb"        , RV_NO_FLAG_BIT, true , UPDATE_DEFAULT(UseZbkb))        \
-  decl(ext_Zcb         , "Zcb"         , RV_NO_FLAG_BIT, true , UPDATE_DEFAULT(UseZcb))         \
-  decl(ext_Zfa         , "Zfa"         , RV_NO_FLAG_BIT, true , UPDATE_DEFAULT(UseZfa))         \
-  decl(ext_Zfh         , "Zfh"         , RV_NO_FLAG_BIT, true , UPDATE_DEFAULT(UseZfh))         \
-  decl(ext_Zfhmin      , "Zfhmin"      , RV_NO_FLAG_BIT, true , UPDATE_DEFAULT(UseZfhmin))      \
-  decl(ext_Zicsr       , "Zicsr"       , RV_NO_FLAG_BIT, true , NO_UPDATE_DEFAULT)              \
-  decl(ext_Zicntr      , "Zicntr"      , RV_NO_FLAG_BIT, true , NO_UPDATE_DEFAULT)              \
-  decl(ext_Zifencei    , "Zifencei"    , RV_NO_FLAG_BIT, true , NO_UPDATE_DEFAULT)              \
-  decl(ext_Zic64b      , "Zic64b"      , RV_NO_FLAG_BIT, true , UPDATE_DEFAULT(UseZic64b))      \
-  decl(ext_Ztso        , "Ztso"        , RV_NO_FLAG_BIT, true , UPDATE_DEFAULT(UseZtso))        \
-  decl(ext_Zihintpause , "Zihintpause" , RV_NO_FLAG_BIT, true , UPDATE_DEFAULT(UseZihintpause)) \
-  decl(ext_Zacas       , "Zacas"       , RV_NO_FLAG_BIT, true , UPDATE_DEFAULT(UseZacas))       \
-  decl(ext_Zvbb        , "Zvbb"        , RV_NO_FLAG_BIT, true , UPDATE_DEFAULT(UseZvbb))        \
-  decl(ext_Zvbc        , "Zvbc"        , RV_NO_FLAG_BIT, true , UPDATE_DEFAULT(UseZvbc))        \
-  decl(ext_Zvfh        , "Zvfh"        , RV_NO_FLAG_BIT, true , UPDATE_DEFAULT(UseZvfh))        \
-  decl(ext_Zvkn        , "Zvkn"        , RV_NO_FLAG_BIT, true , UPDATE_DEFAULT(UseZvkn))        \
-  decl(ext_Zicond      , "Zicond"      , RV_NO_FLAG_BIT, true , UPDATE_DEFAULT(UseZicond))      \
-  decl(mvendorid       , "VendorId"    , RV_NO_FLAG_BIT, false, NO_UPDATE_DEFAULT)              \
-  decl(marchid         , "ArchId"      , RV_NO_FLAG_BIT, false, NO_UPDATE_DEFAULT)              \
-  decl(mimpid          , "ImpId"       , RV_NO_FLAG_BIT, false, NO_UPDATE_DEFAULT)              \
-  decl(unaligned_access, "Unaligned"   , RV_NO_FLAG_BIT, false, NO_UPDATE_DEFAULT)              \
-  decl(satp_mode       , "SATP"        , RV_NO_FLAG_BIT, false, NO_UPDATE_DEFAULT)              \
+  // Note: the order matters, depender should be after their dependee. E.g. ext_V before ext_Zvbb.
+  // declaration name  , extension name, bit pos       ,in str, mapped flag)
+  #define RV_FEATURE_FLAGS(decl)                                                                    \
+  decl(ext_I           , "i"           ,    ('I' - 'A'), true , NO_UPDATE_DEFAULT)                  \
+  decl(ext_M           , "m"           ,    ('M' - 'A'), true , NO_UPDATE_DEFAULT)                  \
+  decl(ext_A           , "a"           ,    ('A' - 'A'), true , NO_UPDATE_DEFAULT)                  \
+  decl(ext_F           , "f"           ,    ('F' - 'A'), true , NO_UPDATE_DEFAULT)                  \
+  decl(ext_D           , "d"           ,    ('D' - 'A'), true , NO_UPDATE_DEFAULT)                  \
+  decl(ext_C           , "c"           ,    ('C' - 'A'), true , UPDATE_DEFAULT(UseRVC))             \
+  decl(ext_Q           , "q"           ,    ('Q' - 'A'), true , NO_UPDATE_DEFAULT)                  \
+  decl(ext_H           , "h"           ,    ('H' - 'A'), true , NO_UPDATE_DEFAULT)                  \
+  decl(ext_V           , "v"           ,    ('V' - 'A'), true , UPDATE_DEFAULT(UseRVV))             \
+  decl(ext_Zicbom      , "Zicbom"      , RV_NO_FLAG_BIT, true , UPDATE_DEFAULT(UseZicbom))          \
+  decl(ext_Zicboz      , "Zicboz"      , RV_NO_FLAG_BIT, true , UPDATE_DEFAULT(UseZicboz))          \
+  decl(ext_Zicbop      , "Zicbop"      , RV_NO_FLAG_BIT, true , UPDATE_DEFAULT(UseZicbop))          \
+  decl(ext_Zba         , "Zba"         , RV_NO_FLAG_BIT, true , UPDATE_DEFAULT(UseZba))             \
+  decl(ext_Zbb         , "Zbb"         , RV_NO_FLAG_BIT, true , UPDATE_DEFAULT(UseZbb))             \
+  decl(ext_Zbc         , "Zbc"         , RV_NO_FLAG_BIT, true , NO_UPDATE_DEFAULT)                  \
+  decl(ext_Zbs         , "Zbs"         , RV_NO_FLAG_BIT, true , UPDATE_DEFAULT(UseZbs))             \
+  decl(ext_Zbkb        , "Zbkb"        , RV_NO_FLAG_BIT, true , UPDATE_DEFAULT(UseZbkb))            \
+  decl(ext_Zcb         , "Zcb"         , RV_NO_FLAG_BIT, true , UPDATE_DEFAULT(UseZcb))             \
+  decl(ext_Zfa         , "Zfa"         , RV_NO_FLAG_BIT, true , UPDATE_DEFAULT(UseZfa))             \
+  decl(ext_Zfh         , "Zfh"         , RV_NO_FLAG_BIT, true , UPDATE_DEFAULT(UseZfh))             \
+  decl(ext_Zfhmin      , "Zfhmin"      , RV_NO_FLAG_BIT, true , UPDATE_DEFAULT(UseZfhmin))          \
+  decl(ext_Zicsr       , "Zicsr"       , RV_NO_FLAG_BIT, true , NO_UPDATE_DEFAULT)                  \
+  decl(ext_Zicntr      , "Zicntr"      , RV_NO_FLAG_BIT, true , NO_UPDATE_DEFAULT)                  \
+  decl(ext_Zifencei    , "Zifencei"    , RV_NO_FLAG_BIT, true , NO_UPDATE_DEFAULT)                  \
+  decl(ext_Zic64b      , "Zic64b"      , RV_NO_FLAG_BIT, true , UPDATE_DEFAULT(UseZic64b))          \
+  decl(ext_Ztso        , "Ztso"        , RV_NO_FLAG_BIT, true , UPDATE_DEFAULT(UseZtso))            \
+  decl(ext_Zihintpause , "Zihintpause" , RV_NO_FLAG_BIT, true , UPDATE_DEFAULT(UseZihintpause))     \
+  decl(ext_Zacas       , "Zacas"       , RV_NO_FLAG_BIT, true , UPDATE_DEFAULT(UseZacas))           \
+  decl(ext_Zvbb        , "Zvbb"        , RV_NO_FLAG_BIT, true , UPDATE_DEFAULT_DEP(UseZvbb, ext_V)) \
+  decl(ext_Zvbc        , "Zvbc"        , RV_NO_FLAG_BIT, true , UPDATE_DEFAULT_DEP(UseZvbc, ext_V)) \
+  decl(ext_Zvfh        , "Zvfh"        , RV_NO_FLAG_BIT, true , UPDATE_DEFAULT_DEP(UseZvfh, ext_V)) \
+  decl(ext_Zvkn        , "Zvkn"        , RV_NO_FLAG_BIT, true , UPDATE_DEFAULT_DEP(UseZvkn, ext_V)) \
+  decl(ext_Zicond      , "Zicond"      , RV_NO_FLAG_BIT, true , UPDATE_DEFAULT(UseZicond))          \
+  decl(mvendorid       , "VendorId"    , RV_NO_FLAG_BIT, false, NO_UPDATE_DEFAULT)                  \
+  decl(marchid         , "ArchId"      , RV_NO_FLAG_BIT, false, NO_UPDATE_DEFAULT)                  \
+  decl(mimpid          , "ImpId"       , RV_NO_FLAG_BIT, false, NO_UPDATE_DEFAULT)                  \
+  decl(unaligned_access, "Unaligned"   , RV_NO_FLAG_BIT, false, NO_UPDATE_DEFAULT)                  \
+  decl(satp_mode       , "SATP"        , RV_NO_FLAG_BIT, false, NO_UPDATE_DEFAULT)                  \
 
   #define DECLARE_RV_FEATURE(NAME, PRETTY, BIT, FSTRING, FLAGF)        \
   struct NAME##RVFeatureValue : public RVFeatureValue {                \

From 10078111aff4e095276ceccd250a25851f33a2ab Mon Sep 17 00:00:00 2001
From: Robbin Ehn <rehn@openjdk.org>
Date: Thu, 27 Mar 2025 07:32:48 +0000
Subject: [PATCH 512/587] 8352897: RISC-V: Change default value for
 UseConservativeFence

Reviewed-by: luhenry, fyang
---
 src/hotspot/cpu/riscv/globals_riscv.hpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/hotspot/cpu/riscv/globals_riscv.hpp b/src/hotspot/cpu/riscv/globals_riscv.hpp
index a7d77d2c55d..3ef084d30fc 100644
--- a/src/hotspot/cpu/riscv/globals_riscv.hpp
+++ b/src/hotspot/cpu/riscv/globals_riscv.hpp
@@ -90,8 +90,7 @@ define_pd_global(intx, InlineSmallCode,          1000);
           "Size in bytes of a CPU cache line")                                   \
           range(wordSize, max_jint)                                              \
   product(bool, TraceTraps, false, "Trace all traps the signal handler")         \
-  /* For now we're going to be safe and add the I/O bits to userspace fences. */ \
-  product(bool, UseConservativeFence, true,                                      \
+  product(bool, UseConservativeFence, false,                                     \
           "Extend i for r and o for w in the pred/succ flags of fence")          \
   product(bool, AvoidUnalignedAccesses, true,                                    \
           "Avoid generating unaligned memory accesses")                          \

From 66b5dba690e7bd23054221cdc7f8394b0759876b Mon Sep 17 00:00:00 2001
From: Hannes Greule <hgreule@openjdk.org>
Date: Thu, 27 Mar 2025 07:39:34 +0000
Subject: [PATCH 513/587] 8350988: Consolidate Identity of self-inverse
 operations

Reviewed-by: epeter, vlivanov
---
 src/hotspot/share/opto/subnode.cpp            |  12 +-
 src/hotspot/share/opto/subnode.hpp            |  37 ++--
 .../c2/irTests/InvolutionIdentityTests.java   | 206 ++++++++++++++++++
 .../compiler/lib/ir_framework/IRNode.java     |  10 +
 4 files changed, 240 insertions(+), 25 deletions(-)
 create mode 100644 test/hotspot/jtreg/compiler/c2/irTests/InvolutionIdentityTests.java

diff --git a/src/hotspot/share/opto/subnode.cpp b/src/hotspot/share/opto/subnode.cpp
index 7ba6ac7a385..24d1f820ffb 100644
--- a/src/hotspot/share/opto/subnode.cpp
+++ b/src/hotspot/share/opto/subnode.cpp
@@ -2047,15 +2047,9 @@ const Type* ReverseLNode::Value(PhaseGVN* phase) const {
   return bottom_type();
 }
 
-Node* ReverseINode::Identity(PhaseGVN* phase) {
-  if (in(1)->Opcode() == Op_ReverseI) {
-    return in(1)->in(1);
-  }
-  return this;
-}
-
-Node* ReverseLNode::Identity(PhaseGVN* phase) {
-  if (in(1)->Opcode() == Op_ReverseL) {
+Node* InvolutionNode::Identity(PhaseGVN* phase) {
+  // Op ( Op x ) => x
+  if (in(1)->Opcode() == Opcode()) {
     return in(1)->in(1);
   }
   return this;
diff --git a/src/hotspot/share/opto/subnode.hpp b/src/hotspot/share/opto/subnode.hpp
index 1d8aa058424..0899a2c13fc 100644
--- a/src/hotspot/share/opto/subnode.hpp
+++ b/src/hotspot/share/opto/subnode.hpp
@@ -439,11 +439,18 @@ public:
   virtual uint ideal_reg() const { return Op_RegI; }
 };
 
+//------------------------------InvolutionNode----------------------------------
+// Represents a self-inverse operation, i.e., op(op(x)) = x for any x
+class InvolutionNode : public Node {
+public:
+  InvolutionNode(Node* in) : Node(nullptr, in) {}
+  virtual Node* Identity(PhaseGVN* phase);
+};
 
 //------------------------------NegNode----------------------------------------
-class NegNode : public Node {
+class NegNode : public InvolutionNode {
 public:
-  NegNode(Node* in1) : Node(nullptr, in1) {
+  NegNode(Node* in1) : InvolutionNode(in1) {
     init_class_id(Class_Neg);
   }
 };
@@ -556,9 +563,9 @@ public:
 
 //-------------------------------ReverseBytesINode--------------------------------
 // reverse bytes of an integer
-class ReverseBytesINode : public Node {
+class ReverseBytesINode : public InvolutionNode {
 public:
-  ReverseBytesINode(Node* in) : Node(nullptr, in) {}
+  ReverseBytesINode(Node* in) : InvolutionNode(in) {}
   virtual int Opcode() const;
   const Type* bottom_type() const { return TypeInt::INT; }
   virtual uint ideal_reg() const { return Op_RegI; }
@@ -566,9 +573,9 @@ public:
 
 //-------------------------------ReverseBytesLNode--------------------------------
 // reverse bytes of a long
-class ReverseBytesLNode : public Node {
+class ReverseBytesLNode : public InvolutionNode {
 public:
-  ReverseBytesLNode(Node* in) : Node(nullptr, in) {}
+  ReverseBytesLNode(Node* in) : InvolutionNode(in) {}
   virtual int Opcode() const;
   const Type* bottom_type() const { return TypeLong::LONG; }
   virtual uint ideal_reg() const { return Op_RegL; }
@@ -576,9 +583,9 @@ public:
 
 //-------------------------------ReverseBytesUSNode--------------------------------
 // reverse bytes of an unsigned short / char
-class ReverseBytesUSNode : public Node {
+class ReverseBytesUSNode : public InvolutionNode {
 public:
-  ReverseBytesUSNode(Node* in1) : Node(nullptr, in1) {}
+  ReverseBytesUSNode(Node* in1) : InvolutionNode(in1) {}
   virtual int Opcode() const;
   const Type* bottom_type() const { return TypeInt::CHAR; }
   virtual uint ideal_reg() const { return Op_RegI; }
@@ -586,9 +593,9 @@ public:
 
 //-------------------------------ReverseBytesSNode--------------------------------
 // reverse bytes of a short
-class ReverseBytesSNode : public Node {
+class ReverseBytesSNode : public InvolutionNode {
 public:
-  ReverseBytesSNode(Node* in) : Node(nullptr, in) {}
+  ReverseBytesSNode(Node* in) : InvolutionNode(in) {}
   virtual int Opcode() const;
   const Type* bottom_type() const { return TypeInt::SHORT; }
   virtual uint ideal_reg() const { return Op_RegI; }
@@ -596,25 +603,23 @@ public:
 
 //-------------------------------ReverseINode--------------------------------
 // reverse bits of an int
-class ReverseINode : public Node {
+class ReverseINode : public InvolutionNode {
 public:
-  ReverseINode(Node* in) : Node(nullptr, in) {}
+  ReverseINode(Node* in) : InvolutionNode(in) {}
   virtual int Opcode() const;
   const Type* bottom_type() const { return TypeInt::INT; }
   virtual uint ideal_reg() const { return Op_RegI; }
-  virtual Node* Identity(PhaseGVN* phase);
   virtual const Type* Value(PhaseGVN* phase) const;
 };
 
 //-------------------------------ReverseLNode--------------------------------
 // reverse bits of a long
-class ReverseLNode : public Node {
+class ReverseLNode : public InvolutionNode {
 public:
-  ReverseLNode(Node* in) : Node(nullptr, in) {}
+  ReverseLNode(Node* in) : InvolutionNode(in) {}
   virtual int Opcode() const;
   const Type* bottom_type() const { return TypeLong::LONG; }
   virtual uint ideal_reg() const { return Op_RegL; }
-  virtual Node* Identity(PhaseGVN* phase);
   virtual const Type* Value(PhaseGVN* phase) const;
 };
 
diff --git a/test/hotspot/jtreg/compiler/c2/irTests/InvolutionIdentityTests.java b/test/hotspot/jtreg/compiler/c2/irTests/InvolutionIdentityTests.java
new file mode 100644
index 00000000000..e1945c8a519
--- /dev/null
+++ b/test/hotspot/jtreg/compiler/c2/irTests/InvolutionIdentityTests.java
@@ -0,0 +1,206 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package compiler.c2.irTests;
+
+import compiler.lib.generators.Generator;
+import compiler.lib.generators.Generators;
+import compiler.lib.generators.RestrictableGenerator;
+import compiler.lib.ir_framework.DontCompile;
+import compiler.lib.ir_framework.IR;
+import compiler.lib.ir_framework.IRNode;
+import compiler.lib.ir_framework.Run;
+import compiler.lib.ir_framework.Test;
+import compiler.lib.ir_framework.TestFramework;
+import jdk.test.lib.Asserts;
+
+/*
+ * @test
+ * @bug 8350988
+ * @summary Test that Identity simplifications of Involution nodes are being performed as expected.
+ * @library /test/lib /
+ * @run driver compiler.c2.irTests.InvolutionIdentityTests
+ */
+public class InvolutionIdentityTests {
+
+    public static final RestrictableGenerator<Integer> GEN_CHAR = Generators.G.safeRestrict(Generators.G.ints(), Character.MIN_VALUE, Character.MAX_VALUE);
+    public static final RestrictableGenerator<Integer> GEN_SHORT = Generators.G.safeRestrict(Generators.G.ints(), Short.MIN_VALUE, Short.MAX_VALUE);
+    public static final RestrictableGenerator<Long> GEN_LONG = Generators.G.longs();
+    public static final RestrictableGenerator<Integer> GEN_INT = Generators.G.ints();
+    public static final Generator<Float> GEN_FLOAT = Generators.G.floats();
+    public static final Generator<Double> GEN_DOUBLE = Generators.G.doubles();
+
+    public static void main(String[] args) {
+        TestFramework.run();
+    }
+
+    @Run(test = {
+        "testI1", "testI2",
+        "testL1", "testL2",
+        "testS1",
+        "testUS1",
+        "testF1",
+        "testD1"
+    })
+    public void runMethod() {
+        int ai = GEN_INT.next();
+
+        int mini = Integer.MIN_VALUE;
+        int maxi = Integer.MAX_VALUE;
+
+        assertResultI(0);
+        assertResultI(ai);
+        assertResultI(mini);
+        assertResultI(maxi);
+
+        long al = GEN_LONG.next();
+
+        long minl = Long.MIN_VALUE;
+        long maxl = Long.MAX_VALUE;
+
+        assertResultL(0);
+        assertResultL(al);
+        assertResultL(minl);
+        assertResultL(maxl);
+
+        short as = GEN_SHORT.next().shortValue();
+
+        short mins = Short.MIN_VALUE;
+        short maxs = Short.MAX_VALUE;
+
+        assertResultS((short) 0);
+        assertResultS(as);
+        assertResultS(mins);
+        assertResultS(maxs);
+
+        char ac = (char) GEN_CHAR.next().intValue();
+
+        char minc = Character.MIN_VALUE;
+        char maxc = Character.MAX_VALUE;
+
+        assertResultUS((char) 0);
+        assertResultUS(ac);
+        assertResultUS(minc);
+        assertResultUS(maxc);
+
+        float af = GEN_FLOAT.next();
+        float inf = Float.POSITIVE_INFINITY;
+        float nanf = Float.NaN;
+
+        assertResultF(0f);
+        assertResultF(-0f);
+        assertResultF(af);
+        assertResultF(inf);
+        assertResultF(nanf);
+
+        double ad = GEN_DOUBLE.next();
+        double ind = Double.POSITIVE_INFINITY;
+        double nand = Double.NaN;
+
+        assertResultD(0d);
+        assertResultD(-0d);
+        assertResultD(ad);
+        assertResultD(ind);
+        assertResultD(nand);
+
+    }
+
+    @DontCompile
+    public void assertResultI(int a) {
+        Asserts.assertEQ(Integer.reverseBytes(Integer.reverseBytes(a)), testI1(a));
+        Asserts.assertEQ(Integer.reverse(Integer.reverse(a))          , testI2(a));
+    }
+
+    @DontCompile
+    public void assertResultL(long a) {
+        Asserts.assertEQ(Long.reverseBytes(Long.reverseBytes(a)), testL1(a));
+        Asserts.assertEQ(Long.reverse(Long.reverse(a))          , testL2(a));
+    }
+
+    @DontCompile
+    public void assertResultS(short a) {
+        Asserts.assertEQ(Short.reverseBytes(Short.reverseBytes(a)), testS1(a));
+    }
+
+    @DontCompile
+    public void assertResultUS(char a) {
+        Asserts.assertEQ(Character.reverseBytes(Character.reverseBytes(a)), testUS1(a));
+    }
+
+    @DontCompile
+    public void assertResultF(float a) {
+        Asserts.assertEQ(Float.floatToRawIntBits(-(-a)), Float.floatToRawIntBits(testF1(a)));
+    }
+
+    @DontCompile
+    public void assertResultD(double a) {
+        Asserts.assertEQ(Double.doubleToRawLongBits(-(-a)), Double.doubleToRawLongBits(testD1(a)));
+    }
+
+    @Test
+    @IR(failOn = {IRNode.REVERSE_BYTES_I})
+    public int testI1(int x) {
+        return Integer.reverseBytes(Integer.reverseBytes(x));
+    }
+
+    @Test
+    @IR(failOn = {IRNode.REVERSE_I})
+    public int testI2(int x) {
+        return Integer.reverse(Integer.reverse(x));
+    }
+
+    @Test
+    @IR(failOn = {IRNode.REVERSE_BYTES_L})
+    public long testL1(long x) {
+        return Long.reverseBytes(Long.reverseBytes(x));
+    }
+
+    @Test
+    @IR(failOn = {IRNode.REVERSE_L})
+    public long testL2(long x) {
+        return Long.reverse(Long.reverse(x));
+    }
+
+    @Test
+    @IR(failOn = {IRNode.REVERSE_BYTES_S})
+    public short testS1(short x) {
+        return Short.reverseBytes(Short.reverseBytes(x));
+    }
+
+    @Test
+    @IR(failOn = {IRNode.REVERSE_BYTES_US})
+    public char testUS1(char x) {
+        return Character.reverseBytes(Character.reverseBytes(x));
+    }
+
+    @Test
+    @IR(failOn = {IRNode.NEG_F})
+    public float testF1(float x) {
+        return -(-x);
+    }
+
+    @Test
+    @IR(failOn = {IRNode.NEG_D})
+    public double testD1(double x) {
+        return -(-x);
+    }
+}
diff --git a/test/hotspot/jtreg/compiler/lib/ir_framework/IRNode.java b/test/hotspot/jtreg/compiler/lib/ir_framework/IRNode.java
index adb8efc9097..ae9126d4395 100644
--- a/test/hotspot/jtreg/compiler/lib/ir_framework/IRNode.java
+++ b/test/hotspot/jtreg/compiler/lib/ir_framework/IRNode.java
@@ -1399,6 +1399,16 @@ public class IRNode {
         superWordNodes(MAX_REDUCTION_V, "MaxReductionV");
     }
 
+    public static final String NEG_F = PREFIX + "NEG_F" + POSTFIX;
+    static {
+        beforeMatchingNameRegex(NEG_F, "NegF");
+    }
+
+    public static final String NEG_D = PREFIX + "NEG_D" + POSTFIX;
+    static {
+        beforeMatchingNameRegex(NEG_D, "NegD");
+    }
+
     public static final String NEG_VF = VECTOR_PREFIX + "NEG_VF" + POSTFIX;
     static {
         vectorNode(NEG_VF, "NegVF", TYPE_FLOAT);

From 8a40498d79a18dcf91cf4979d34c3583a6c39322 Mon Sep 17 00:00:00 2001
From: Prasanta Sadhukhan <psadhukhan@openjdk.org>
Date: Thu, 27 Mar 2025 10:11:11 +0000
Subject: [PATCH 514/587] 8352678: Opensource few JMenuItem tests

Reviewed-by: abhiscxk
---
 .../jdk/javax/swing/JMenuItem/bug4207339.java |  67 ++++++++++
 .../jdk/javax/swing/JMenuItem/bug4327146.java | 114 ++++++++++++++++++
 .../jdk/javax/swing/JMenuItem/bug4402082.java |  81 +++++++++++++
 .../jdk/javax/swing/JMenuItem/bug6197830.java |  74 ++++++++++++
 4 files changed, 336 insertions(+)
 create mode 100644 test/jdk/javax/swing/JMenuItem/bug4207339.java
 create mode 100644 test/jdk/javax/swing/JMenuItem/bug4327146.java
 create mode 100644 test/jdk/javax/swing/JMenuItem/bug4402082.java
 create mode 100644 test/jdk/javax/swing/JMenuItem/bug6197830.java

diff --git a/test/jdk/javax/swing/JMenuItem/bug4207339.java b/test/jdk/javax/swing/JMenuItem/bug4207339.java
new file mode 100644
index 00000000000..e2e3ef4e3cd
--- /dev/null
+++ b/test/jdk/javax/swing/JMenuItem/bug4207339.java
@@ -0,0 +1,67 @@
+/*
+ * Copyright (c) 1999, 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact 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 4207339
+ * @summary Verifies HTML label support for MenuItems
+ * @library /java/awt/regtesthelpers
+ * @build PassFailJFrame
+ * @run main/manual bug4207339
+ */
+
+import javax.swing.JPanel;
+import javax.swing.JMenuItem;
+
+public class bug4207339 {
+
+    private static final String INSTRUCTIONS = """
+        This tests html support in menuItem.
+        A MenuItem will be shown.
+        If the MenuItem is showing "big" text bigger than rest
+        and "red" text in red color and the text are in multiple lines,
+        and text "Yo" in blue color,
+        then press Pass else press Fail.""";
+
+    public static void main(String[] args) throws Exception {
+        PassFailJFrame.builder()
+                .title("bug4207339 Instructions")
+                .instructions(INSTRUCTIONS)
+                .columns(35)
+                .splitUI(bug4207339::createTestUI)
+                .build()
+                .awaitAndCheck();
+    }
+
+    private static JPanel createTestUI() {
+        JPanel panel = new JPanel();
+        JMenuItem mi = new JMenuItem("<html><center>Is this text <font size=+3>big</font>" +
+                                     "and <font color=red>red</font>?" +
+                                     "<br>And on multiple lines?<br><br>" +
+                                     "<font size=+2 color=blue face=AvantGarde>Yo!</font>" +
+                                     "Then press <em><b>PASS</b>!</center></html>");
+        panel.add(mi);
+        return panel;
+    }
+
+}
diff --git a/test/jdk/javax/swing/JMenuItem/bug4327146.java b/test/jdk/javax/swing/JMenuItem/bug4327146.java
new file mode 100644
index 00000000000..88d2b9618f0
--- /dev/null
+++ b/test/jdk/javax/swing/JMenuItem/bug4327146.java
@@ -0,0 +1,114 @@
+/*
+ * Copyright (c) 2001, 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact 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 4327146
+ * @summary Tests menu width after removeAll()
+ * @key headful
+ * @run main bug4327146
+ */
+
+import java.awt.Dimension;
+import java.awt.Point;
+import java.awt.Rectangle;
+import java.awt.Robot;
+import java.awt.event.InputEvent;
+import javax.swing.JButton;
+import javax.swing.JFrame;
+import javax.swing.JMenu;
+import javax.swing.JMenuBar;
+import javax.swing.JMenuItem;
+import javax.swing.SwingUtilities;
+
+public class bug4327146 {
+    private static JButton b;
+    private static JMenu m;
+    private static JFrame frame;
+    private static volatile Point loc;
+    private static volatile Dimension dim;
+    private static volatile Rectangle old_popupBounds;
+    private static volatile Rectangle new_popupBounds;
+
+    public static void main(String[] args) throws Exception {
+        Robot robot = new Robot();
+        try {
+            SwingUtilities.invokeAndWait(() -> {
+                frame = new JFrame("bug4327146");
+                m = new JMenu("Menu");
+                m.add(new JMenuItem("I'm an ugly bug, fix me right now please!"));
+
+                JMenuBar mbar = new JMenuBar();
+                mbar.add(m);
+                frame.setJMenuBar(mbar);
+
+                b = new JButton("Cut");
+                b.addActionListener(e -> {
+                    m.removeAll();
+                    m.add(new JMenuItem("Fixed :)"));
+                });
+                mbar.add(b);
+                frame.pack();
+                frame.setLocationRelativeTo(null);
+                frame.setVisible(true);
+            });
+            robot.waitForIdle();
+            robot.delay(1000);
+            SwingUtilities.invokeAndWait(() -> {
+                loc = b.getLocationOnScreen();
+                dim = b.getSize();
+                m.doClick();
+            });
+            robot.waitForIdle();
+            robot.delay(500);
+            SwingUtilities.invokeAndWait(() -> {
+                old_popupBounds = m.getPopupMenu().getBounds();
+            });
+            robot.mouseMove(loc.x + dim.width / 2, loc.y + dim.height / 2);
+            robot.mousePress(InputEvent.BUTTON1_DOWN_MASK);
+            robot.mouseRelease(InputEvent.BUTTON1_DOWN_MASK);
+            robot.waitForIdle();
+            robot.delay(500);
+            SwingUtilities.invokeAndWait(() -> {
+                m.doClick();
+            });
+            robot.waitForIdle();
+            robot.delay(500);
+            SwingUtilities.invokeAndWait(() -> {
+                new_popupBounds = m.getPopupMenu().getBounds();
+            });
+            if (new_popupBounds.getWidth() >= old_popupBounds.getWidth()) {
+                System.out.println("before cut popup Bounds " + old_popupBounds);
+                System.out.println("after cut popupBounds " + new_popupBounds);
+                throw new RuntimeException("JMenu popup width is wrong");
+            }
+        } finally {
+            SwingUtilities.invokeAndWait(() -> {
+                if (frame != null) {
+                    frame.dispose();
+                }
+            });
+        }
+    }
+
+}
diff --git a/test/jdk/javax/swing/JMenuItem/bug4402082.java b/test/jdk/javax/swing/JMenuItem/bug4402082.java
new file mode 100644
index 00000000000..546a2d3218b
--- /dev/null
+++ b/test/jdk/javax/swing/JMenuItem/bug4402082.java
@@ -0,0 +1,81 @@
+/*
+ * Copyright (c) 2001, 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact 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 4402082
+ * @requires (os.family == "windows")
+ * @summary Tests that JMenuItem accelerator is rendered correctly.
+ * @library /java/awt/regtesthelpers
+ * @build PassFailJFrame
+ * @run main/manual bug4402082
+ */
+
+import java.awt.Container;
+import java.awt.GridLayout;
+import java.awt.event.KeyEvent;
+import javax.swing.JFrame;
+import javax.swing.JMenuItem;
+import javax.swing.KeyStroke;
+import javax.swing.UIManager;
+
+public class bug4402082 {
+
+    private static final String INSTRUCTIONS = """
+        You see three menu items, each having different look-and-feels.
+        Each menu item should display accelerator "F1" on its right side.
+        The accelerator should be fully visible. If it is partially
+        offscreen, or not visible at all, test fails.""";
+
+    public static void main(String[] args) throws Exception {
+        PassFailJFrame.builder()
+                .title("bug4402082 Instructions")
+                .instructions(INSTRUCTIONS)
+                .columns(35)
+                .testUI(bug4402082::createTestUI)
+                .build()
+                .awaitAndCheck();
+    }
+
+    static JMenuItem getMenuItem(String lnf) {
+        try {
+            UIManager.setLookAndFeel(lnf);
+        } catch (Exception exc) {
+            System.err.println("Could not load LookAndFeel: " + lnf);
+        }
+        JMenuItem mi = new JMenuItem("Bad Item");
+        mi.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_F1, 0));
+        return mi;
+    }
+
+    private static JFrame createTestUI() {
+        JFrame frame = new JFrame("bug4402082");
+        Container pane = frame.getContentPane();
+        pane.setLayout(new GridLayout(3,1));
+        pane.add(getMenuItem("javax.swing.plaf.metal.MetalLookAndFeel"));
+        pane.add(getMenuItem("com.sun.java.swing.plaf.motif.MotifLookAndFeel"));
+        pane.add(getMenuItem("com.sun.java.swing.plaf.windows.WindowsLookAndFeel"));
+        frame.pack();
+        return frame;
+    }
+}
diff --git a/test/jdk/javax/swing/JMenuItem/bug6197830.java b/test/jdk/javax/swing/JMenuItem/bug6197830.java
new file mode 100644
index 00000000000..58fd9a76e23
--- /dev/null
+++ b/test/jdk/javax/swing/JMenuItem/bug6197830.java
@@ -0,0 +1,74 @@
+/*
+ * Copyright (c) 2005, 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact 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 6197830
+ * @requires (os.family == "linux")
+ * @summary Fix for 4729669 does not work on Motif and GTK look and feels
+ * @library /java/awt/regtesthelpers
+ * @build PassFailJFrame
+ * @run main/manual bug6197830
+ */
+
+public class bug6197830 {
+
+    private static final String INSTRUCTIONS = """
+        Four windows should appear: Left-to-right and Right-to-left for
+        the two different Look and Feels (Motif and GTK).
+        Check that text on all the menu items of all menus is properly
+        vertically aligned.""";
+
+    public static void main(String[] args) throws Exception {
+        PassFailJFrame.builder()
+                .title("bug6197830 Instructions")
+                .instructions(INSTRUCTIONS)
+                .columns(35)
+                .testUI(bug6197830::createTestUI)
+                .position(PassFailJFrame.Position.TOP_LEFT_CORNER)
+                .build()
+                .awaitAndCheck();
+    }
+
+    private static List<JFrame> createTestUI() {
+        JFrame frame1 = MenuItemTest.doMenuItemTest(true,
+                            "com.sun.java.swing.plaf.motif.MotifLookAndFeel",
+                             20);
+        frame1.setLocation(300, 300);
+        JFrame frame2 = MenuItemTest.doMenuItemTest(false,
+                            "com.sun.java.swing.plaf.motif.MotifLookAndFeel",
+                             20);
+        frame2.setLocation((int)(frame1.getLocation().getX() + frame1.getWidth()
+                            + 100), 300);
+        JFrame frame3 = MenuItemTest.doMenuItemTest(true,
+                             "com.sun.java.swing.plaf.gtk.GTKLookAndFeel", 420);
+        frame3.setLocation(300, (int)(frame1.getLocation().getY()
+                                 + frame1.getHeight() + 100));
+        JFrame frame4 = MenuItemTest.doMenuItemTest(false,
+                             "com.sun.java.swing.plaf.gtk.GTKLookAndFeel", 420);
+        frame4.setLocation((int)(frame3.getLocation().getX() + frame3.getWidth()
+                            + 100),
+                           (int)frame3.getLocation().getY());
+        return List.of(frame1, frame2, frame3, frame4);
+    }
+}

From 4100dc9d4cdd5f0c202b2b2a32554e3aa4f15025 Mon Sep 17 00:00:00 2001
From: Frederic Thevenet <fthevenet@openjdk.org>
Date: Thu, 27 Mar 2025 10:16:59 +0000
Subject: [PATCH 515/587] 8350801: Add a code signing hook to the JDK build
 system

Reviewed-by: ihse, erikj
---
 make/autoconf/configure.ac           |  1 +
 make/autoconf/jdk-options.m4         | 23 +++++++++++++++++++++++
 make/autoconf/spec.gmk.template      |  3 +++
 make/autoconf/util.m4                | 12 ++++++++++--
 make/common/native/Link.gmk          |  4 ++++
 make/common/native/LinkMicrosoft.gmk |  4 ++++
 6 files changed, 45 insertions(+), 2 deletions(-)

diff --git a/make/autoconf/configure.ac b/make/autoconf/configure.ac
index 9eeded48fed..fffe17daad8 100644
--- a/make/autoconf/configure.ac
+++ b/make/autoconf/configure.ac
@@ -260,6 +260,7 @@ JDKOPT_ENABLE_DISABLE_CDS_ARCHIVE
 JDKOPT_ENABLE_DISABLE_CDS_ARCHIVE_COH
 JDKOPT_ENABLE_DISABLE_COMPATIBLE_CDS_ALIGNMENT
 JDKOPT_SETUP_MACOSX_SIGNING
+JDKOPT_SETUP_SIGNING_HOOK
 
 ################################################################################
 #
diff --git a/make/autoconf/jdk-options.m4 b/make/autoconf/jdk-options.m4
index 7c14c60095e..72e731e7ffc 100644
--- a/make/autoconf/jdk-options.m4
+++ b/make/autoconf/jdk-options.m4
@@ -965,6 +965,29 @@ AC_DEFUN([JDKOPT_SETUP_MACOSX_SIGNING],
   AC_SUBST(MACOSX_CODESIGN_MODE)
 ])
 
+################################################################################
+#
+# Setup a hook to invoke a script that runs for file produced by the native
+# compilation steps, after linking.
+# Parameter is the path to the script to be called.
+#
+AC_DEFUN([JDKOPT_SETUP_SIGNING_HOOK],
+[
+  UTIL_ARG_WITH(NAME: signing-hook, TYPE: executable,
+      OPTIONAL: true, DEFAULT: "",
+      DESC: [specify path to script used to code sign native binaries]
+  )
+
+  AC_MSG_CHECKING([for signing hook])
+  if test "x$SIGNING_HOOK" != x; then
+    UTIL_FIXUP_EXECUTABLE(SIGNING_HOOK)
+    AC_MSG_RESULT([$SIGNING_HOOK])
+  else
+    AC_MSG_RESULT([none])
+  fi
+  AC_SUBST(SIGNING_HOOK)
+])
+
 ################################################################################
 #
 # fallback linker
diff --git a/make/autoconf/spec.gmk.template b/make/autoconf/spec.gmk.template
index a30936d7d45..80c6dfc2ba2 100644
--- a/make/autoconf/spec.gmk.template
+++ b/make/autoconf/spec.gmk.template
@@ -479,6 +479,9 @@ MACOSX_VERSION_MAX := @MACOSX_VERSION_MAX@
 MACOSX_CODESIGN_MODE := @MACOSX_CODESIGN_MODE@
 MACOSX_CODESIGN_IDENTITY := @MACOSX_CODESIGN_IDENTITY@
 
+# The code signing hook configuration
+SIGNING_HOOK := @SIGNING_HOOK@
+
 # Toolchain type: gcc, clang, microsoft...
 TOOLCHAIN_TYPE := @TOOLCHAIN_TYPE@
 TOOLCHAIN_VERSION := @TOOLCHAIN_VERSION@
diff --git a/make/autoconf/util.m4 b/make/autoconf/util.m4
index 4d98d06355a..12c9c92b492 100644
--- a/make/autoconf/util.m4
+++ b/make/autoconf/util.m4
@@ -566,6 +566,14 @@ AC_DEFUN([UTIL_CHECK_TYPE_file],
   fi
 ])
 
+AC_DEFUN([UTIL_CHECK_TYPE_executable],
+[
+  # Check that the argument is an existing file that the user has execute access to.
+  if (test ! -x "$1") || (test ! -f "$1") ; then
+    FAILURE="File $1 does not exist or is not executable"
+  fi
+])
+
 AC_DEFUN([UTIL_CHECK_TYPE_directory],
 [
   # Check that the argument is an existing directory
@@ -648,7 +656,7 @@ AC_DEFUN([UTIL_CHECK_TYPE_features],
 # Arguments:
 #   NAME: The base name of this option (i.e. what follows --with-). Required.
 #   TYPE: The type of the value. Can be one of "string", "integer", "file",
-#     "directory", "literal", "multivalue" or "features". Required.
+#     "executable", "directory", "literal", "multivalue" or "features". Required.
 #   DEFAULT: The default value for this option. Can be any valid string.
 #     Required.
 #   OPTIONAL: If this feature can be disabled. Defaults to false. If true,
@@ -758,7 +766,7 @@ UTIL_DEFUN_NAMED([UTIL_ARG_WITH],
   # Need to assign since we can't expand ARG TYPE inside the m4 quoted if statement
   TEST_TYPE="ARG_TYPE"
   # Additional [] needed to keep m4 from mangling shell constructs.
-  [ if [[ ! "$TEST_TYPE" =~ ^(string|integer|file|directory|literal|multivalue|features)$ ]] ; then ]
+  [ if [[ ! "$TEST_TYPE" =~ ^(string|integer|file|executable|directory|literal|multivalue|features)$ ]] ; then ]
     AC_MSG_ERROR([Internal error: Argument TYPE to [UTIL_ARG_WITH] must be a valid type, was: 'ARG_TYPE'])
   fi
 
diff --git a/make/common/native/Link.gmk b/make/common/native/Link.gmk
index 7cf6c97b27c..e888edfcc4c 100644
--- a/make/common/native/Link.gmk
+++ b/make/common/native/Link.gmk
@@ -203,6 +203,10 @@ define CreateDynamicLibraryOrExecutable
 	      $(CODESIGN) -f -s $$($1_CODESIGN_OPTS) --entitlements \
 	          $$(call GetEntitlementsFile, $$@) $$@)
         endif
+        ifneq ($(SIGNING_HOOK), )
+	  $$(call ExecuteWithLog, $$($1_OBJECT_DIR)/$$($1_SAFE_NAME)_call_signing_hook, \
+	      $(SIGNING_HOOK) $$($1_TARGET))
+        endif
 
   # This is for IDE integration purposes only, and is not normally generated
   $1_LDFLAGS_FILE := $$(MAKESUPPORT_OUTPUTDIR)/compile-commands/$$($1_UNIQUE_NAME)-ldflags.txt
diff --git a/make/common/native/LinkMicrosoft.gmk b/make/common/native/LinkMicrosoft.gmk
index 55f8e5684e7..a53afba4001 100644
--- a/make/common/native/LinkMicrosoft.gmk
+++ b/make/common/native/LinkMicrosoft.gmk
@@ -117,6 +117,10 @@ define CreateDynamicLibraryOrExecutableMicrosoft
 	      -identity:"$$($1_NAME).exe, version=$$($1_MANIFEST_VERSION)" \
 	      -outputresource:$$@;#1
         endif
+        ifneq ($(SIGNING_HOOK), )
+	  $$(call ExecuteWithLog, $$($1_OBJECT_DIR)/$$($1_SAFE_NAME)_call_signing_hook, \
+	      $(SIGNING_HOOK) $$($1_TARGET))
+        endif
 endef
 
 ################################################################################

From 9a87e2134ef531a6906454186517d3eee2e487c2 Mon Sep 17 00:00:00 2001
From: Vladimir Petko <vpetko@openjdk.org>
Date: Thu, 27 Mar 2025 10:31:53 +0000
Subject: [PATCH 516/587] 8352800: [PPC] OpenJDK fails to build on PPC after
 JDK-8350106

Reviewed-by: rrich, shade
---
 src/hotspot/os_cpu/linux_ppc/javaThread_linux_ppc.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/hotspot/os_cpu/linux_ppc/javaThread_linux_ppc.cpp b/src/hotspot/os_cpu/linux_ppc/javaThread_linux_ppc.cpp
index 5b335f997f1..967b575bb52 100644
--- a/src/hotspot/os_cpu/linux_ppc/javaThread_linux_ppc.cpp
+++ b/src/hotspot/os_cpu/linux_ppc/javaThread_linux_ppc.cpp
@@ -24,6 +24,7 @@
  */
 
 #include "memory/metaspace.hpp"
+#include "os_linux.hpp"
 #include "runtime/frame.inline.hpp"
 #include "runtime/javaThread.hpp"
 

From b7ffd223e83e56259801534b634729c563e36c7b Mon Sep 17 00:00:00 2001
From: Aleksey Shipilev <shade@openjdk.org>
Date: Thu, 27 Mar 2025 11:24:48 +0000
Subject: [PATCH 517/587] 8352980: Purge infrastructure for FP-to-bits
 interpreter intrinsics after 32-bit x86 removal

Reviewed-by: kvn, vlivanov, coleenp
---
 .../templateInterpreterGenerator_aarch64.cpp  |  6 -----
 .../arm/templateInterpreterGenerator_arm.cpp  |  4 ----
 .../ppc/templateInterpreterGenerator_ppc.cpp  |  6 -----
 .../templateInterpreterGenerator_riscv.cpp    |  4 ----
 .../templateInterpreterGenerator_s390.cpp     |  4 ----
 .../templateInterpreterGenerator_x86_64.cpp   |  7 ------
 src/hotspot/share/compiler/compileBroker.cpp  | 24 -------------------
 .../share/interpreter/abstractInterpreter.cpp | 16 -------------
 .../share/interpreter/abstractInterpreter.hpp |  4 ----
 .../templateInterpreterGenerator.cpp          | 16 -------------
 .../templateInterpreterGenerator.hpp          |  4 ----
 11 files changed, 95 deletions(-)

diff --git a/src/hotspot/cpu/aarch64/templateInterpreterGenerator_aarch64.cpp b/src/hotspot/cpu/aarch64/templateInterpreterGenerator_aarch64.cpp
index b84e793a935..80c9437de6b 100644
--- a/src/hotspot/cpu/aarch64/templateInterpreterGenerator_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/templateInterpreterGenerator_aarch64.cpp
@@ -1800,12 +1800,6 @@ address TemplateInterpreterGenerator::generate_currentThread() {
   return entry_point;
 }
 
-// Not supported
-address TemplateInterpreterGenerator::generate_Float_intBitsToFloat_entry() { return nullptr; }
-address TemplateInterpreterGenerator::generate_Float_floatToRawIntBits_entry() { return nullptr; }
-address TemplateInterpreterGenerator::generate_Double_longBitsToDouble_entry() { return nullptr; }
-address TemplateInterpreterGenerator::generate_Double_doubleToRawLongBits_entry() { return nullptr; }
-
 //-----------------------------------------------------------------------------
 // Exceptions
 
diff --git a/src/hotspot/cpu/arm/templateInterpreterGenerator_arm.cpp b/src/hotspot/cpu/arm/templateInterpreterGenerator_arm.cpp
index 3f1cd1e23de..da226c09f3c 100644
--- a/src/hotspot/cpu/arm/templateInterpreterGenerator_arm.cpp
+++ b/src/hotspot/cpu/arm/templateInterpreterGenerator_arm.cpp
@@ -794,10 +794,6 @@ address TemplateInterpreterGenerator::generate_currentThread() { return nullptr;
 address TemplateInterpreterGenerator::generate_CRC32_update_entry() { return nullptr; }
 address TemplateInterpreterGenerator::generate_CRC32_updateBytes_entry(AbstractInterpreter::MethodKind kind) { return nullptr; }
 address TemplateInterpreterGenerator::generate_CRC32C_updateBytes_entry(AbstractInterpreter::MethodKind kind) { return nullptr; }
-address TemplateInterpreterGenerator::generate_Float_intBitsToFloat_entry() { return nullptr; }
-address TemplateInterpreterGenerator::generate_Float_floatToRawIntBits_entry() { return nullptr; }
-address TemplateInterpreterGenerator::generate_Double_longBitsToDouble_entry() { return nullptr; }
-address TemplateInterpreterGenerator::generate_Double_doubleToRawLongBits_entry() { return nullptr; }
 address TemplateInterpreterGenerator::generate_Float_float16ToFloat_entry() { return nullptr; }
 address TemplateInterpreterGenerator::generate_Float_floatToFloat16_entry() { return nullptr; }
 
diff --git a/src/hotspot/cpu/ppc/templateInterpreterGenerator_ppc.cpp b/src/hotspot/cpu/ppc/templateInterpreterGenerator_ppc.cpp
index 14d7155b9e2..b1ad3cd48bc 100644
--- a/src/hotspot/cpu/ppc/templateInterpreterGenerator_ppc.cpp
+++ b/src/hotspot/cpu/ppc/templateInterpreterGenerator_ppc.cpp
@@ -2009,12 +2009,6 @@ address TemplateInterpreterGenerator::generate_currentThread() {
   return entry_point;
 }
 
-// Not supported
-address TemplateInterpreterGenerator::generate_Float_intBitsToFloat_entry() { return nullptr; }
-address TemplateInterpreterGenerator::generate_Float_floatToRawIntBits_entry() { return nullptr; }
-address TemplateInterpreterGenerator::generate_Double_longBitsToDouble_entry() { return nullptr; }
-address TemplateInterpreterGenerator::generate_Double_doubleToRawLongBits_entry() { return nullptr; }
-
 // =============================================================================
 // Exceptions
 
diff --git a/src/hotspot/cpu/riscv/templateInterpreterGenerator_riscv.cpp b/src/hotspot/cpu/riscv/templateInterpreterGenerator_riscv.cpp
index 3787c5812eb..e96bd2e1f2a 100644
--- a/src/hotspot/cpu/riscv/templateInterpreterGenerator_riscv.cpp
+++ b/src/hotspot/cpu/riscv/templateInterpreterGenerator_riscv.cpp
@@ -938,10 +938,6 @@ address TemplateInterpreterGenerator::generate_CRC32C_updateBytes_entry(Abstract
 }
 
 // Not supported
-address TemplateInterpreterGenerator::generate_Float_intBitsToFloat_entry() { return nullptr; }
-address TemplateInterpreterGenerator::generate_Float_floatToRawIntBits_entry() { return nullptr; }
-address TemplateInterpreterGenerator::generate_Double_longBitsToDouble_entry() { return nullptr; }
-address TemplateInterpreterGenerator::generate_Double_doubleToRawLongBits_entry() { return nullptr; }
 address TemplateInterpreterGenerator::generate_Float_float16ToFloat_entry() { return nullptr; }
 address TemplateInterpreterGenerator::generate_Float_floatToFloat16_entry() { return nullptr; }
 
diff --git a/src/hotspot/cpu/s390/templateInterpreterGenerator_s390.cpp b/src/hotspot/cpu/s390/templateInterpreterGenerator_s390.cpp
index e549434dc12..841f4f9ca4b 100644
--- a/src/hotspot/cpu/s390/templateInterpreterGenerator_s390.cpp
+++ b/src/hotspot/cpu/s390/templateInterpreterGenerator_s390.cpp
@@ -2020,10 +2020,6 @@ address TemplateInterpreterGenerator::generate_currentThread() {
 }
 
 // Not supported
-address TemplateInterpreterGenerator::generate_Float_intBitsToFloat_entry() { return nullptr; }
-address TemplateInterpreterGenerator::generate_Float_floatToRawIntBits_entry() { return nullptr; }
-address TemplateInterpreterGenerator::generate_Double_longBitsToDouble_entry() { return nullptr; }
-address TemplateInterpreterGenerator::generate_Double_doubleToRawLongBits_entry() { return nullptr; }
 address TemplateInterpreterGenerator::generate_Float_float16ToFloat_entry() { return nullptr; }
 address TemplateInterpreterGenerator::generate_Float_floatToFloat16_entry() { return nullptr; }
 
diff --git a/src/hotspot/cpu/x86/templateInterpreterGenerator_x86_64.cpp b/src/hotspot/cpu/x86/templateInterpreterGenerator_x86_64.cpp
index af5c0fa94b1..f4ed1081c3b 100644
--- a/src/hotspot/cpu/x86/templateInterpreterGenerator_x86_64.cpp
+++ b/src/hotspot/cpu/x86/templateInterpreterGenerator_x86_64.cpp
@@ -497,10 +497,3 @@ address TemplateInterpreterGenerator::generate_currentThread() {
 
   return entry_point;
 }
-
-// Not supported
-address TemplateInterpreterGenerator::generate_Float_intBitsToFloat_entry() { return nullptr; }
-address TemplateInterpreterGenerator::generate_Float_floatToRawIntBits_entry() { return nullptr; }
-address TemplateInterpreterGenerator::generate_Double_longBitsToDouble_entry() { return nullptr; }
-address TemplateInterpreterGenerator::generate_Double_doubleToRawLongBits_entry() { return nullptr; }
-
diff --git a/src/hotspot/share/compiler/compileBroker.cpp b/src/hotspot/share/compiler/compileBroker.cpp
index bbdb3a536dd..588a9051b66 100644
--- a/src/hotspot/share/compiler/compileBroker.cpp
+++ b/src/hotspot/share/compiler/compileBroker.cpp
@@ -1444,30 +1444,6 @@ nmethod* CompileBroker::compile_method(const methodHandle& method, int osr_bci,
   // do the compilation
   if (method->is_native()) {
     if (!PreferInterpreterNativeStubs || method->is_method_handle_intrinsic()) {
-#if defined(IA32) && !defined(ZERO)
-      // The following native methods:
-      //
-      // java.lang.Float.intBitsToFloat
-      // java.lang.Float.floatToRawIntBits
-      // java.lang.Double.longBitsToDouble
-      // java.lang.Double.doubleToRawLongBits
-      //
-      // are called through the interpreter even if interpreter native stubs
-      // are not preferred (i.e., calling through adapter handlers is preferred).
-      // The reason is that on x86_32 signaling NaNs (sNaNs) are not preserved
-      // if the version of the methods from the native libraries is called.
-      // As the interpreter and the C2-intrinsified version of the methods preserves
-      // sNaNs, that would result in an inconsistent way of handling of sNaNs.
-      if ((UseSSE >= 1 &&
-          (method->intrinsic_id() == vmIntrinsics::_intBitsToFloat ||
-           method->intrinsic_id() == vmIntrinsics::_floatToRawIntBits)) ||
-          (UseSSE >= 2 &&
-           (method->intrinsic_id() == vmIntrinsics::_longBitsToDouble ||
-            method->intrinsic_id() == vmIntrinsics::_doubleToRawLongBits))) {
-        return nullptr;
-      }
-#endif // IA32 && !ZERO
-
       // To properly handle the appendix argument for out-of-line calls we are using a small trampoline that
       // pops off the appendix argument and jumps to the target (see gen_special_dispatch in SharedRuntime).
       //
diff --git a/src/hotspot/share/interpreter/abstractInterpreter.cpp b/src/hotspot/share/interpreter/abstractInterpreter.cpp
index 18cd9babf05..25e23a15a58 100644
--- a/src/hotspot/share/interpreter/abstractInterpreter.cpp
+++ b/src/hotspot/share/interpreter/abstractInterpreter.cpp
@@ -130,10 +130,6 @@ AbstractInterpreter::MethodKind AbstractInterpreter::method_kind(const methodHan
       // Use optimized stub code for CRC32C methods.
       case vmIntrinsics::_updateBytesCRC32C: return java_util_zip_CRC32C_updateBytes;
       case vmIntrinsics::_updateDirectByteBufferCRC32C: return java_util_zip_CRC32C_updateDirectByteBuffer;
-      case vmIntrinsics::_intBitsToFloat:    return java_lang_Float_intBitsToFloat;
-      case vmIntrinsics::_floatToRawIntBits: return java_lang_Float_floatToRawIntBits;
-      case vmIntrinsics::_longBitsToDouble:  return java_lang_Double_longBitsToDouble;
-      case vmIntrinsics::_doubleToRawLongBits: return java_lang_Double_doubleToRawLongBits;
       case vmIntrinsics::_float16ToFloat:    return java_lang_Float_float16ToFloat;
       case vmIntrinsics::_floatToFloat16:    return java_lang_Float_floatToFloat16;
       case vmIntrinsics::_currentThread:     return java_lang_Thread_currentThread;
@@ -224,14 +220,6 @@ vmIntrinsics::ID AbstractInterpreter::method_intrinsic(MethodKind kind) {
                                   : return vmIntrinsics::_updateDirectByteBufferCRC32C;
   case java_lang_Thread_currentThread
                                   : return vmIntrinsics::_currentThread;
-  case java_lang_Float_intBitsToFloat
-                                  : return vmIntrinsics::_intBitsToFloat;
-  case java_lang_Float_floatToRawIntBits
-                                  : return vmIntrinsics::_floatToRawIntBits;
-  case java_lang_Double_longBitsToDouble
-                                  : return vmIntrinsics::_longBitsToDouble;
-  case java_lang_Double_doubleToRawLongBits
-                                  : return vmIntrinsics::_doubleToRawLongBits;
   case java_lang_Float_float16ToFloat
                                   : return vmIntrinsics::_float16ToFloat;
   case java_lang_Float_floatToFloat16
@@ -331,10 +319,6 @@ void AbstractInterpreter::print_method_kind(MethodKind kind) {
     case java_util_zip_CRC32C_updateDirectByteBuffer: tty->print("java_util_zip_CRC32C_updateDirectByteByffer"); break;
     case java_lang_ref_reference_get          : tty->print("java_lang_ref_reference_get"); break;
     case java_lang_Thread_currentThread       : tty->print("java_lang_Thread_currentThread"); break;
-    case java_lang_Float_intBitsToFloat       : tty->print("java_lang_Float_intBitsToFloat"); break;
-    case java_lang_Float_floatToRawIntBits    : tty->print("java_lang_Float_floatToRawIntBits"); break;
-    case java_lang_Double_longBitsToDouble    : tty->print("java_lang_Double_longBitsToDouble"); break;
-    case java_lang_Double_doubleToRawLongBits : tty->print("java_lang_Double_doubleToRawLongBits"); break;
     case java_lang_Float_float16ToFloat       : tty->print("java_lang_Float_float16ToFloat"); break;
     case java_lang_Float_floatToFloat16       : tty->print("java_lang_Float_floatToFloat16"); break;
     default:
diff --git a/src/hotspot/share/interpreter/abstractInterpreter.hpp b/src/hotspot/share/interpreter/abstractInterpreter.hpp
index 55fb58021a0..cc1a66f442d 100644
--- a/src/hotspot/share/interpreter/abstractInterpreter.hpp
+++ b/src/hotspot/share/interpreter/abstractInterpreter.hpp
@@ -88,12 +88,8 @@ class AbstractInterpreter: AllStatic {
     java_util_zip_CRC32_updateByteBuffer,                       // implementation of java.util.zip.CRC32.updateByteBuffer()
     java_util_zip_CRC32C_updateBytes,                           // implementation of java.util.zip.CRC32C.updateBytes(crc, b[], off, end)
     java_util_zip_CRC32C_updateDirectByteBuffer,                // implementation of java.util.zip.CRC32C.updateDirectByteBuffer(crc, address, off, end)
-    java_lang_Float_intBitsToFloat,                             // implementation of java.lang.Float.intBitsToFloat()
-    java_lang_Float_floatToRawIntBits,                          // implementation of java.lang.Float.floatToRawIntBits()
     java_lang_Float_float16ToFloat,                             // implementation of java.lang.Float.float16ToFloat()
     java_lang_Float_floatToFloat16,                             // implementation of java.lang.Float.floatToFloat16()
-    java_lang_Double_longBitsToDouble,                          // implementation of java.lang.Double.longBitsToDouble()
-    java_lang_Double_doubleToRawLongBits,                       // implementation of java.lang.Double.doubleToRawLongBits()
     java_lang_Thread_currentThread,                             // implementation of java.lang.Thread.currentThread()
     number_of_method_entries,
     invalid = -1
diff --git a/src/hotspot/share/interpreter/templateInterpreterGenerator.cpp b/src/hotspot/share/interpreter/templateInterpreterGenerator.cpp
index e9f1e568a19..128c3f86479 100644
--- a/src/hotspot/share/interpreter/templateInterpreterGenerator.cpp
+++ b/src/hotspot/share/interpreter/templateInterpreterGenerator.cpp
@@ -232,11 +232,6 @@ void TemplateInterpreterGenerator::generate_all() {
   native_method_entry(java_util_zip_CRC32_updateBytes)
   native_method_entry(java_util_zip_CRC32_updateByteBuffer)
 
-  native_method_entry(java_lang_Float_intBitsToFloat)
-  native_method_entry(java_lang_Float_floatToRawIntBits)
-  native_method_entry(java_lang_Double_longBitsToDouble)
-  native_method_entry(java_lang_Double_doubleToRawLongBits)
-
 #undef native_method_entry
 
   // Bytecodes
@@ -487,17 +482,6 @@ address TemplateInterpreterGenerator::generate_intrinsic_entry(AbstractInterpret
                                            : entry_point = generate_Float_float16ToFloat_entry(); break;
   case Interpreter::java_lang_Float_floatToFloat16
                                            : entry_point = generate_Float_floatToFloat16_entry(); break;
-
-  // On x86_32 platforms, a special entry is generated for the following four methods.
-  // On other platforms the native entry is used to enter these methods.
-  case Interpreter::java_lang_Float_intBitsToFloat
-                                           : entry_point = generate_Float_intBitsToFloat_entry(); break;
-  case Interpreter::java_lang_Float_floatToRawIntBits
-                                           : entry_point = generate_Float_floatToRawIntBits_entry(); break;
-  case Interpreter::java_lang_Double_longBitsToDouble
-                                           : entry_point = generate_Double_longBitsToDouble_entry(); break;
-  case Interpreter::java_lang_Double_doubleToRawLongBits
-                                           : entry_point = generate_Double_doubleToRawLongBits_entry(); break;
   default:
     fatal("unexpected intrinsic method kind: %d", kind);
     break;
diff --git a/src/hotspot/share/interpreter/templateInterpreterGenerator.hpp b/src/hotspot/share/interpreter/templateInterpreterGenerator.hpp
index d3ddf2a830f..07a7ca6169d 100644
--- a/src/hotspot/share/interpreter/templateInterpreterGenerator.hpp
+++ b/src/hotspot/share/interpreter/templateInterpreterGenerator.hpp
@@ -99,10 +99,6 @@ class TemplateInterpreterGenerator: public AbstractInterpreterGenerator {
   address generate_CRC32_updateBytes_entry(AbstractInterpreter::MethodKind kind);
   address generate_CRC32C_updateBytes_entry(AbstractInterpreter::MethodKind kind);
   address generate_currentThread();
-  address generate_Float_intBitsToFloat_entry();
-  address generate_Float_floatToRawIntBits_entry();
-  address generate_Double_longBitsToDouble_entry();
-  address generate_Double_doubleToRawLongBits_entry();
   address generate_Float_float16ToFloat_entry();
   address generate_Float_floatToFloat16_entry();
 

From 0bfa636c7f43e31c53c6bae6ee859131bd45229f Mon Sep 17 00:00:00 2001
From: Boris Ulasevich <bulasevich@openjdk.org>
Date: Thu, 27 Mar 2025 11:31:20 +0000
Subject: [PATCH 518/587] 8352426: RelocIterator should correctly handle
 nullptr address of relocation data

Reviewed-by: dlong, vlivanov, kvn
---
 src/hotspot/share/code/relocInfo.cpp | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/hotspot/share/code/relocInfo.cpp b/src/hotspot/share/code/relocInfo.cpp
index 7aae32759dd..ad194c71bb2 100644
--- a/src/hotspot/share/code/relocInfo.cpp
+++ b/src/hotspot/share/code/relocInfo.cpp
@@ -116,6 +116,9 @@ void relocInfo::change_reloc_info_for_address(RelocIterator *itr, address pc, re
 // ----------------------------------------------------------------------------------------------------
 // Implementation of RelocIterator
 
+// A static dummy to serve as a safe pointer when there is no relocation info.
+static relocInfo dummy_relocInfo = relocInfo(relocInfo::none, 0);
+
 void RelocIterator::initialize(nmethod* nm, address begin, address limit) {
   initialize_misc();
 
@@ -127,8 +130,14 @@ void RelocIterator::initialize(nmethod* nm, address begin, address limit) {
   guarantee(nm != nullptr, "must be able to deduce nmethod from other arguments");
 
   _code    = nm;
-  _current = nm->relocation_begin() - 1;
-  _end     = nm->relocation_end();
+  if (nm->relocation_size() == 0) {
+    _current = &dummy_relocInfo - 1;
+    _end = &dummy_relocInfo;
+  } else {
+    assert(((nm->relocation_begin() != nullptr) && (nm->relocation_end() != nullptr)), "valid start and end pointer");
+    _current = nm->relocation_begin() - 1;
+    _end     = nm->relocation_end();
+  }
   _addr    = nm->content_begin();
 
   // Initialize code sections.
@@ -150,7 +159,7 @@ void RelocIterator::initialize(nmethod* nm, address begin, address limit) {
 RelocIterator::RelocIterator(CodeSection* cs, address begin, address limit) {
   initialize_misc();
   assert(((cs->locs_start() != nullptr) && (cs->locs_end() != nullptr)), "valid start and end pointer");
-  _current = cs->locs_start()-1;
+  _current = cs->locs_start() - 1;
   _end     = cs->locs_end();
   _addr    = cs->start();
   _code    = nullptr; // Not cb->blob();

From 927aeb2feeacddfb7267e4d211134f061a2566e4 Mon Sep 17 00:00:00 2001
From: Marc Chevalier <mchevalier@openjdk.org>
Date: Thu, 27 Mar 2025 11:36:14 +0000
Subject: [PATCH 519/587] 8352617: IR framework test
 TestCompileCommandFileWriter.java runs TestCompilePhaseCollector instead of
 itself

Reviewed-by: chagedorn, thartmann
---
 .../flag/TestCompileCommandFileWriter.java    | 24 ++++++++++---------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/test/hotspot/jtreg/testlibrary_tests/ir_framework/tests/flag/TestCompileCommandFileWriter.java b/test/hotspot/jtreg/testlibrary_tests/ir_framework/tests/flag/TestCompileCommandFileWriter.java
index de7cfec08bf..6ebc96d9a38 100644
--- a/test/hotspot/jtreg/testlibrary_tests/ir_framework/tests/flag/TestCompileCommandFileWriter.java
+++ b/test/hotspot/jtreg/testlibrary_tests/ir_framework/tests/flag/TestCompileCommandFileWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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,13 @@ import static compiler.lib.ir_framework.CompilePhase.*;
 
 /*
  * @test
- * @requires vm.debug == true & vm.flagless
+ * @requires vm.flagless
  * @summary Test compile command file writer.
  * @library /test/lib /testlibrary_tests /
  * @build jdk.test.whitebox.WhiteBox
  * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox
- * @run junit/othervm -Xbootclasspath/a:. -DSkipWhiteBoxInstall=true -XX:+IgnoreUnrecognizedVMOptions -XX:+UnlockDiagnosticVMOptions
- *                    -XX:+WhiteBoxAPI compiler.lib.ir_framework.flag.TestCompilePhaseCollector
+ * @run junit/othervm -Xbootclasspath/a:. -DSkipWhiteBoxInstall=true -XX:+UnlockDiagnosticVMOptions
+ *                    -XX:+WhiteBoxAPI compiler.lib.ir_framework.flag.TestCompileCommandFileWriter
  */
 public class TestCompileCommandFileWriter {
 
@@ -81,6 +81,8 @@ public class TestCompileCommandFileWriter {
     }
 
     private void check(Class<?> testClass, boolean findIdeal, boolean findOpto, CompilePhase... compilePhases) throws IOException {
+        var compilerDirectivesFlagBuilder = new CompilerDirectivesFlagBuilder(testClass);
+        compilerDirectivesFlagBuilder.build();
         try (Scanner scanner = new Scanner(Paths.get(FlagVM.TEST_VM_COMPILE_COMMANDS_FILE))) {
             boolean foundIdeal = false;
             boolean foundOpto = false;
@@ -132,14 +134,14 @@ public class TestCompileCommandFileWriter {
 
     static class OptoOnly1 {
         @Test
-        @IR(failOn = IRNode.ALLOC)
+        @IR(failOn = IRNode.FIELD_ACCESS)
         public void test() {
         }
     }
 
     static class OptoOnly2 {
         @Test
-        @IR(failOn = IRNode.ALLOC, phase = PRINT_OPTO_ASSEMBLY)
+        @IR(failOn = IRNode.FIELD_ACCESS, phase = PRINT_OPTO_ASSEMBLY)
         public void test() {
         }
     }
@@ -147,14 +149,14 @@ public class TestCompileCommandFileWriter {
     static class Both1 {
         @Test
         @IR(failOn = IRNode.STORE)
-        @IR(failOn = IRNode.ALLOC)
+        @IR(failOn = IRNode.FIELD_ACCESS)
         public void test() {
         }
     }
 
     static class Both2 {
         @Test
-        @IR(failOn = {IRNode.STORE, IRNode. ALLOC})
+        @IR(failOn = {IRNode.STORE, IRNode. FIELD_ACCESS})
         public void test() {
         }
     }
@@ -183,7 +185,7 @@ public class TestCompileCommandFileWriter {
 
     static class Mix2 {
         @Test
-        @IR(failOn = IRNode.ALLOC, phase = AFTER_PARSING)
+        @IR(failOn = IRNode.FIELD_ACCESS, phase = AFTER_PARSING)
         @IR(failOn = IRNode.STORE, phase = PRINT_OPTO_ASSEMBLY)
         public void test() {
         }
@@ -193,7 +195,7 @@ public class TestCompileCommandFileWriter {
         @Test
         @IR(failOn = IRNode.STORE, phase = AFTER_PARSING)
         @IR(failOn = IRNode.STORE, phase = PRINT_IDEAL)
-        @IR(failOn = IRNode.ALLOC, phase = PRINT_OPTO_ASSEMBLY)
+        @IR(failOn = IRNode.FIELD_ACCESS, phase = PRINT_OPTO_ASSEMBLY)
         public void test() {
         }
     }
@@ -201,7 +203,7 @@ public class TestCompileCommandFileWriter {
     static class Mix4 {
         @Test
         @IR(failOn = IRNode.STORE, phase = {AFTER_PARSING, PRINT_IDEAL})
-        @IR(failOn = IRNode.ALLOC, phase = PRINT_OPTO_ASSEMBLY)
+        @IR(failOn = IRNode.FIELD_ACCESS, phase = PRINT_OPTO_ASSEMBLY)
         public void test() {
         }
     }

From b9907801afaf4c613482ce3cb1b38262ce13df29 Mon Sep 17 00:00:00 2001
From: Varada M <varadam@openjdk.org>
Date: Thu, 27 Mar 2025 11:46:46 +0000
Subject: [PATCH 520/587] 8352393: AIX: Problem list
 serviceability/attach/AttachAPIv2/StreamingOutputTest.java

Reviewed-by: jsjolen, mdoerr
---
 test/hotspot/jtreg/ProblemList.txt | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/test/hotspot/jtreg/ProblemList.txt b/test/hotspot/jtreg/ProblemList.txt
index 6dd35997cac..0e71df4f27f 100644
--- a/test/hotspot/jtreg/ProblemList.txt
+++ b/test/hotspot/jtreg/ProblemList.txt
@@ -128,6 +128,8 @@ containers/docker/TestJcmdWithSideCar.java 8341518 linux-x64
 
 # :hotspot_serviceability
 
+serviceability/attach/AttachAPIv2/StreamingOutputTest.java 8352392 aix-ppc64
+
 serviceability/sa/sadebugd/DebugdConnectTest.java 8239062,8270326 macosx-x64,macosx-aarch64
 serviceability/sa/TestRevPtrsForInvokeDynamic.java 8241235 generic-all
 

From e2cd70aab69f2244667db91fec5f4e3038f64437 Mon Sep 17 00:00:00 2001
From: Aleksey Shipilev <shade@openjdk.org>
Date: Thu, 27 Mar 2025 11:59:37 +0000
Subject: [PATCH 521/587] 8351151: Clean up x86 template interpreter after
 32-bit x86 removal

Reviewed-by: coleenp, fparain, vlivanov
---
 .../cpu/aarch64/interp_masm_aarch64.cpp       |   3 -
 .../cpu/aarch64/interp_masm_aarch64.hpp       |   2 -
 src/hotspot/cpu/arm/interp_masm_arm.hpp       |   4 -
 src/hotspot/cpu/ppc/interp_masm_ppc.hpp       |   1 -
 src/hotspot/cpu/ppc/interp_masm_ppc_64.cpp    |   6 -
 src/hotspot/cpu/riscv/interp_masm_riscv.cpp   |   2 -
 src/hotspot/cpu/riscv/interp_masm_riscv.hpp   |   4 -
 src/hotspot/cpu/s390/interp_masm_s390.cpp     |   8 -
 src/hotspot/cpu/s390/interp_masm_s390.hpp     |   1 -
 src/hotspot/cpu/x86/interp_masm_x86.cpp       | 288 +-------
 src/hotspot/cpu/x86/interp_masm_x86.hpp       |  20 +-
 src/hotspot/cpu/x86/interpreterRT_x86.hpp     |   7 -
 .../x86/templateInterpreterGenerator_x86.cpp  | 305 +--------
 src/hotspot/cpu/x86/templateTable_x86.cpp     | 636 ++----------------
 .../templateInterpreterGenerator.cpp          |   1 -
 15 files changed, 125 insertions(+), 1163 deletions(-)

diff --git a/src/hotspot/cpu/aarch64/interp_masm_aarch64.cpp b/src/hotspot/cpu/aarch64/interp_masm_aarch64.cpp
index 9892de21a81..d5ba85da989 100644
--- a/src/hotspot/cpu/aarch64/interp_masm_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/interp_masm_aarch64.cpp
@@ -1401,9 +1401,6 @@ void InterpreterMacroAssembler::_interp_verify_oop(Register reg, TosState state,
   }
 }
 
-void InterpreterMacroAssembler::verify_FPU(int stack_depth, TosState state) { ; }
-
-
 void InterpreterMacroAssembler::notify_method_entry() {
   // Whenever JVMTI is interp_only_mode, method entry/exit events are sent to
   // track stack depth.  If it is possible to enter interp_only_mode we add
diff --git a/src/hotspot/cpu/aarch64/interp_masm_aarch64.hpp b/src/hotspot/cpu/aarch64/interp_masm_aarch64.hpp
index bc2070d283d..059d79c3cb9 100644
--- a/src/hotspot/cpu/aarch64/interp_masm_aarch64.hpp
+++ b/src/hotspot/cpu/aarch64/interp_masm_aarch64.hpp
@@ -303,8 +303,6 @@ class InterpreterMacroAssembler: public MacroAssembler {
   // only if +VerifyOops && state == atos
 #define interp_verify_oop(reg, state) _interp_verify_oop(reg, state, __FILE__, __LINE__);
   void _interp_verify_oop(Register reg, TosState state, const char* file, int line);
-  // only if +VerifyFPU  && (state == ftos || state == dtos)
-  void verify_FPU(int stack_depth, TosState state = ftos);
 
   typedef enum { NotifyJVMTI, SkipNotifyJVMTI } NotifyMethodExitMode;
 
diff --git a/src/hotspot/cpu/arm/interp_masm_arm.hpp b/src/hotspot/cpu/arm/interp_masm_arm.hpp
index 58eeda6fbbb..578e191719e 100644
--- a/src/hotspot/cpu/arm/interp_masm_arm.hpp
+++ b/src/hotspot/cpu/arm/interp_masm_arm.hpp
@@ -198,10 +198,6 @@ class InterpreterMacroAssembler: public MacroAssembler {
   // Debugging
   void interp_verify_oop(Register reg, TosState state, const char* file, int line);    // only if +VerifyOops && state == atos
 
-  void verify_FPU(int stack_depth, TosState state = ftos) {
-    // No VFP state verification is required for ARM
-  }
-
   // Object locking
   void lock_object  (Register lock_reg);
   void unlock_object(Register lock_reg);
diff --git a/src/hotspot/cpu/ppc/interp_masm_ppc.hpp b/src/hotspot/cpu/ppc/interp_masm_ppc.hpp
index 7277ac3bc1a..99ac037e4b7 100644
--- a/src/hotspot/cpu/ppc/interp_masm_ppc.hpp
+++ b/src/hotspot/cpu/ppc/interp_masm_ppc.hpp
@@ -265,7 +265,6 @@ class InterpreterMacroAssembler: public MacroAssembler {
   // Debugging
   void verify_oop(Register reg, TosState state = atos);    // only if +VerifyOops && state == atos
   void verify_oop_or_return_address(Register reg, Register rtmp); // for astore
-  void verify_FPU(int stack_depth, TosState state = ftos);
 
   typedef enum { NotifyJVMTI, SkipNotifyJVMTI } NotifyMethodExitMode;
 
diff --git a/src/hotspot/cpu/ppc/interp_masm_ppc_64.cpp b/src/hotspot/cpu/ppc/interp_masm_ppc_64.cpp
index 000e3cdf2d9..7a75dfd3de1 100644
--- a/src/hotspot/cpu/ppc/interp_masm_ppc_64.cpp
+++ b/src/hotspot/cpu/ppc/interp_masm_ppc_64.cpp
@@ -2381,12 +2381,6 @@ static bool verify_return_address(Method* m, int bci) {
   return false;
 }
 
-void InterpreterMacroAssembler::verify_FPU(int stack_depth, TosState state) {
-  if (VerifyFPU) {
-    unimplemented("verfiyFPU");
-  }
-}
-
 void InterpreterMacroAssembler::verify_oop_or_return_address(Register reg, Register Rtmp) {
   if (!VerifyOops) return;
 
diff --git a/src/hotspot/cpu/riscv/interp_masm_riscv.cpp b/src/hotspot/cpu/riscv/interp_masm_riscv.cpp
index c132f9cda7a..f1f9414d98a 100644
--- a/src/hotspot/cpu/riscv/interp_masm_riscv.cpp
+++ b/src/hotspot/cpu/riscv/interp_masm_riscv.cpp
@@ -1431,8 +1431,6 @@ void InterpreterMacroAssembler::profile_switch_case(Register index,
   }
 }
 
-void InterpreterMacroAssembler::verify_FPU(int stack_depth, TosState state) { ; }
-
 void InterpreterMacroAssembler::notify_method_entry() {
   // Whenever JVMTI is interp_only_mode, method entry/exit events are sent to
   // track stack depth.  If it is possible to enter interp_only_mode we add
diff --git a/src/hotspot/cpu/riscv/interp_masm_riscv.hpp b/src/hotspot/cpu/riscv/interp_masm_riscv.hpp
index f52f6ebc11e..b94140ea990 100644
--- a/src/hotspot/cpu/riscv/interp_masm_riscv.hpp
+++ b/src/hotspot/cpu/riscv/interp_masm_riscv.hpp
@@ -284,10 +284,6 @@ class InterpreterMacroAssembler: public MacroAssembler {
   void profile_return_type(Register mdp, Register ret, Register tmp);
   void profile_parameters_type(Register mdp, Register tmp1, Register tmp2, Register tmp3);
 
-  // Debugging
-  // only if +VerifyFPU  && (state == ftos || state == dtos)
-  void verify_FPU(int stack_depth, TosState state = ftos);
-
   typedef enum { NotifyJVMTI, SkipNotifyJVMTI } NotifyMethodExitMode;
 
   // support for jvmti/dtrace
diff --git a/src/hotspot/cpu/s390/interp_masm_s390.cpp b/src/hotspot/cpu/s390/interp_masm_s390.cpp
index cb335e40734..48f4c7293a2 100644
--- a/src/hotspot/cpu/s390/interp_masm_s390.cpp
+++ b/src/hotspot/cpu/s390/interp_masm_s390.cpp
@@ -93,8 +93,6 @@ void InterpreterMacroAssembler::dispatch_next(TosState state, int bcp_incr, bool
 // Dispatch value in Lbyte_code and increment Lbcp.
 
 void InterpreterMacroAssembler::dispatch_base(TosState state, address* table, bool generate_poll) {
-  verify_FPU(1, state);
-
 #ifdef ASSERT
   address reentry = nullptr;
   { Label OK;
@@ -2189,9 +2187,3 @@ void InterpreterMacroAssembler::pop_interpreter_frame(Register return_pc, Regist
   z_stg(Z_ARG3, _z_parent_ijava_frame_abi(return_pc), Z_SP);
 #endif
 }
-
-void InterpreterMacroAssembler::verify_FPU(int stack_depth, TosState state) {
-  if (VerifyFPU) {
-    unimplemented("verifyFPU");
-  }
-}
diff --git a/src/hotspot/cpu/s390/interp_masm_s390.hpp b/src/hotspot/cpu/s390/interp_masm_s390.hpp
index f94473b1700..2473463219c 100644
--- a/src/hotspot/cpu/s390/interp_masm_s390.hpp
+++ b/src/hotspot/cpu/s390/interp_masm_s390.hpp
@@ -313,7 +313,6 @@ class InterpreterMacroAssembler: public MacroAssembler {
   // Debugging
   void verify_oop(Register reg, TosState state = atos);    // Only if +VerifyOops && state == atos.
   void verify_oop_or_return_address(Register reg, Register rtmp); // for astore
-  void verify_FPU(int stack_depth, TosState state = ftos);
 
   // JVMTI helpers
   void skip_if_jvmti_mode(Label &Lskip, Register Rscratch = Z_R0);
diff --git a/src/hotspot/cpu/x86/interp_masm_x86.cpp b/src/hotspot/cpu/x86/interp_masm_x86.cpp
index 44087663a34..84a99060a3e 100644
--- a/src/hotspot/cpu/x86/interp_masm_x86.cpp
+++ b/src/hotspot/cpu/x86/interp_masm_x86.cpp
@@ -53,11 +53,7 @@ void InterpreterMacroAssembler::jump_to_entry(address entry) {
 void InterpreterMacroAssembler::profile_obj_type(Register obj, const Address& mdo_addr) {
   Label update, next, none;
 
-#ifdef _LP64
   assert_different_registers(obj, rscratch1, mdo_addr.base(), mdo_addr.index());
-#else
-  assert_different_registers(obj, mdo_addr.base(), mdo_addr.index());
-#endif
 
   interp_verify_oop(obj, atos);
 
@@ -72,9 +68,7 @@ void InterpreterMacroAssembler::profile_obj_type(Register obj, const Address& md
 
   bind(update);
   load_klass(obj, obj, rscratch1);
-#ifdef _LP64
   mov(rscratch1, obj);
-#endif
 
   xorptr(obj, mdo_addr);
   testptr(obj, TypeEntries::type_klass_mask);
@@ -89,7 +83,7 @@ void InterpreterMacroAssembler::profile_obj_type(Register obj, const Address& md
   jccb(Assembler::equal, none);
   cmpptr(mdo_addr, TypeEntries::null_seen);
   jccb(Assembler::equal, none);
-#ifdef _LP64
+
   // There is a chance that the checks above (re-reading profiling
   // data from memory) fail if another thread has just set the
   // profiling to this obj's klass
@@ -97,7 +91,6 @@ void InterpreterMacroAssembler::profile_obj_type(Register obj, const Address& md
   xorptr(obj, mdo_addr);
   testptr(obj, TypeEntries::type_klass_mask);
   jccb(Assembler::zero, next);
-#endif
 
   // different than before. Cannot keep accurate profile.
   orptr(mdo_addr, TypeEntries::type_unknown);
@@ -314,7 +307,6 @@ void InterpreterMacroAssembler::call_VM_base(Register oop_result,
   //       really make a difference for these runtime calls, since they are
   //       slow anyway. Btw., bcp must be saved/restored since it may change
   //       due to GC.
-  NOT_LP64(assert(java_thread == noreg , "not expecting a precomputed java thread");)
   save_bcp();
 #ifdef ASSERT
   {
@@ -335,7 +327,6 @@ 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) {
@@ -387,13 +378,6 @@ void InterpreterMacroAssembler::restore_after_resume(bool is_native) {
     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()) {
@@ -404,8 +388,7 @@ void InterpreterMacroAssembler::check_and_handle_popframe(Register java_thread)
     // don't want to reenter.
     // This method is only called just after the call into the vm in
     // call_VM_base, so the arg registers are available.
-    Register pop_cond = NOT_LP64(java_thread) // Not clear if any other register is available on 32 bit
-                        LP64_ONLY(c_rarg0);
+    Register pop_cond = c_rarg0;
     movl(pop_cond, Address(java_thread, JavaThread::popframe_condition_offset()));
     testl(pop_cond, JavaThread::popframe_pending_bit);
     jcc(Assembler::zero, L);
@@ -416,18 +399,15 @@ void InterpreterMacroAssembler::check_and_handle_popframe(Register java_thread)
     call_VM_leaf(CAST_FROM_FN_PTR(address, Interpreter::remove_activation_preserving_args_entry));
     jmp(rax);
     bind(L);
-    NOT_LP64(get_thread(java_thread);)
   }
 }
 
 void InterpreterMacroAssembler::load_earlyret_value(TosState state) {
-  Register thread = LP64_ONLY(r15_thread) NOT_LP64(rcx);
-  NOT_LP64(get_thread(thread);)
-  movptr(rcx, Address(thread, JavaThread::jvmti_thread_state_offset()));
+  movptr(rcx, Address(r15_thread, JavaThread::jvmti_thread_state_offset()));
   const Address tos_addr(rcx, JvmtiThreadState::earlyret_tos_offset());
   const Address oop_addr(rcx, JvmtiThreadState::earlyret_oop_offset());
   const Address val_addr(rcx, JvmtiThreadState::earlyret_value_offset());
-#ifdef _LP64
+
   switch (state) {
     case atos: movptr(rax, oop_addr);
                movptr(oop_addr, NULL_WORD);
@@ -443,41 +423,18 @@ void InterpreterMacroAssembler::load_earlyret_value(TosState state) {
     case vtos: /* nothing to do */                  break;
     default  : ShouldNotReachHere();
   }
-  // Clean up tos value in the thread object
-  movl(tos_addr, ilgl);
-  movl(val_addr, NULL_WORD);
-#else
-  const Address val_addr1(rcx, JvmtiThreadState::earlyret_value_offset()
-                             + in_ByteSize(wordSize));
-  switch (state) {
-    case atos: movptr(rax, oop_addr);
-               movptr(oop_addr, NULL_WORD);
-               interp_verify_oop(rax, state);         break;
-    case ltos:
-               movl(rdx, val_addr1);               // fall through
-    case btos:                                     // fall through
-    case ztos:                                     // fall through
-    case ctos:                                     // fall through
-    case stos:                                     // fall through
-    case itos: movl(rax, val_addr);                   break;
-    case ftos: load_float(val_addr);                  break;
-    case dtos: load_double(val_addr);                 break;
-    case vtos: /* nothing to do */                    break;
-    default  : ShouldNotReachHere();
-  }
-#endif // _LP64
+
   // Clean up tos value in the thread object
   movl(tos_addr, ilgl);
   movptr(val_addr, NULL_WORD);
-  NOT_LP64(movptr(val_addr1, NULL_WORD);)
 }
 
 
 void InterpreterMacroAssembler::check_and_handle_earlyret(Register java_thread) {
   if (JvmtiExport::can_force_early_return()) {
     Label L;
-    Register tmp = LP64_ONLY(c_rarg0) NOT_LP64(java_thread);
-    Register rthread = LP64_ONLY(r15_thread) NOT_LP64(java_thread);
+    Register tmp = c_rarg0;
+    Register rthread = r15_thread;
 
     movptr(tmp, Address(rthread, JavaThread::jvmti_thread_state_offset()));
     testptr(tmp, tmp);
@@ -492,18 +449,11 @@ void InterpreterMacroAssembler::check_and_handle_earlyret(Register java_thread)
 
     // Call Interpreter::remove_activation_early_entry() to get the address of the
     // same-named entrypoint in the generated interpreter code.
-    NOT_LP64(get_thread(java_thread);)
     movptr(tmp, Address(rthread, JavaThread::jvmti_thread_state_offset()));
-#ifdef _LP64
     movl(tmp, Address(tmp, JvmtiThreadState::earlyret_tos_offset()));
     call_VM_leaf(CAST_FROM_FN_PTR(address, Interpreter::remove_activation_early_entry), tmp);
-#else
-    pushl(Address(tmp, JvmtiThreadState::earlyret_tos_offset()));
-    call_VM_leaf(CAST_FROM_FN_PTR(address, Interpreter::remove_activation_early_entry), 1);
-#endif // _LP64
     jmp(rax);
     bind(L);
-    NOT_LP64(get_thread(java_thread);)
   }
 }
 
@@ -582,23 +532,6 @@ void InterpreterMacroAssembler::gen_subtype_check(Register Rsub_klass,
 }
 
 
-#ifndef _LP64
-void InterpreterMacroAssembler::f2ieee() {
-  if (IEEEPrecision) {
-    fstp_s(Address(rsp, 0));
-    fld_s(Address(rsp, 0));
-  }
-}
-
-
-void InterpreterMacroAssembler::d2ieee() {
-  if (IEEEPrecision) {
-    fstp_d(Address(rsp, 0));
-    fld_d(Address(rsp, 0));
-  }
-}
-#endif // _LP64
-
 // Java Expression Stack
 
 void InterpreterMacroAssembler::pop_ptr(Register r) {
@@ -637,7 +570,6 @@ void InterpreterMacroAssembler::pop_d(XMMRegister r) {
   addptr(rsp, 2 * Interpreter::stackElementSize);
 }
 
-#ifdef _LP64
 void InterpreterMacroAssembler::pop_i(Register r) {
   // XXX can't use pop currently, upper half non clean
   movl(r, Address(rsp, 0));
@@ -688,105 +620,6 @@ void InterpreterMacroAssembler::push(TosState state) {
   default  : ShouldNotReachHere();
   }
 }
-#else
-void InterpreterMacroAssembler::pop_i(Register r) {
-  pop(r);
-}
-
-void InterpreterMacroAssembler::pop_l(Register lo, Register hi) {
-  pop(lo);
-  pop(hi);
-}
-
-void InterpreterMacroAssembler::pop_f() {
-  fld_s(Address(rsp, 0));
-  addptr(rsp, 1 * wordSize);
-}
-
-void InterpreterMacroAssembler::pop_d() {
-  fld_d(Address(rsp, 0));
-  addptr(rsp, 2 * wordSize);
-}
-
-
-void InterpreterMacroAssembler::pop(TosState state) {
-  switch (state) {
-    case atos: pop_ptr(rax);                                 break;
-    case btos:                                               // fall through
-    case ztos:                                               // fall through
-    case ctos:                                               // fall through
-    case stos:                                               // fall through
-    case itos: pop_i(rax);                                   break;
-    case ltos: pop_l(rax, rdx);                              break;
-    case ftos:
-      if (UseSSE >= 1) {
-        pop_f(xmm0);
-      } else {
-        pop_f();
-      }
-      break;
-    case dtos:
-      if (UseSSE >= 2) {
-        pop_d(xmm0);
-      } else {
-        pop_d();
-      }
-      break;
-    case vtos: /* nothing to do */                           break;
-    default  : ShouldNotReachHere();
-  }
-  interp_verify_oop(rax, state);
-}
-
-
-void InterpreterMacroAssembler::push_l(Register lo, Register hi) {
-  push(hi);
-  push(lo);
-}
-
-void InterpreterMacroAssembler::push_f() {
-  // Do not schedule for no AGI! Never write beyond rsp!
-  subptr(rsp, 1 * wordSize);
-  fstp_s(Address(rsp, 0));
-}
-
-void InterpreterMacroAssembler::push_d() {
-  // Do not schedule for no AGI! Never write beyond rsp!
-  subptr(rsp, 2 * wordSize);
-  fstp_d(Address(rsp, 0));
-}
-
-
-void InterpreterMacroAssembler::push(TosState state) {
-  interp_verify_oop(rax, state);
-  switch (state) {
-    case atos: push_ptr(rax); break;
-    case btos:                                               // fall through
-    case ztos:                                               // fall through
-    case ctos:                                               // fall through
-    case stos:                                               // fall through
-    case itos: push_i(rax);                                    break;
-    case ltos: push_l(rax, rdx);                               break;
-    case ftos:
-      if (UseSSE >= 1) {
-        push_f(xmm0);
-      } else {
-        push_f();
-      }
-      break;
-    case dtos:
-      if (UseSSE >= 2) {
-        push_d(xmm0);
-      } else {
-        push_d();
-      }
-      break;
-    case vtos: /* nothing to do */                             break;
-    default  : ShouldNotReachHere();
-  }
-}
-#endif // _LP64
-
 
 // Helpers for swap and dup
 void InterpreterMacroAssembler::load_ptr(int n, Register val) {
@@ -821,9 +654,7 @@ void InterpreterMacroAssembler::jump_from_interpreted(Register method, Register
     // interp_only_mode if these events CAN be enabled.
     // interp_only is an int, on little endian it is sufficient to test the byte only
     // Is a cmpl faster?
-    LP64_ONLY(temp = r15_thread;)
-    NOT_LP64(get_thread(temp);)
-    cmpb(Address(temp, JavaThread::interp_only_mode_offset()), 0);
+    cmpb(Address(r15_thread, JavaThread::interp_only_mode_offset()), 0);
     jccb(Assembler::zero, run_compiled_code);
     jmp(Address(method, Method::interpreter_entry_offset()));
     bind(run_compiled_code);
@@ -846,7 +677,6 @@ void InterpreterMacroAssembler::dispatch_base(TosState state,
                                               address* table,
                                               bool verifyoop,
                                               bool generate_poll) {
-  verify_FPU(1, state);
   if (VerifyActivationFrameSize) {
     Label L;
     mov(rcx, rbp);
@@ -864,7 +694,6 @@ void InterpreterMacroAssembler::dispatch_base(TosState state,
   }
 
   address* const safepoint_table = Interpreter::safept_table(state);
-#ifdef _LP64
   Label no_safepoint, dispatch;
   if (table != safepoint_table && generate_poll) {
     NOT_PRODUCT(block_comment("Thread-local Safepoint poll"));
@@ -879,27 +708,6 @@ void InterpreterMacroAssembler::dispatch_base(TosState state,
   lea(rscratch1, ExternalAddress((address)table));
   bind(dispatch);
   jmp(Address(rscratch1, rbx, Address::times_8));
-
-#else
-  Address index(noreg, rbx, Address::times_ptr);
-  if (table != safepoint_table && generate_poll) {
-    NOT_PRODUCT(block_comment("Thread-local Safepoint poll"));
-    Label no_safepoint;
-    const Register thread = rcx;
-    get_thread(thread);
-    testb(Address(thread, JavaThread::polling_word_offset()), SafepointMechanism::poll_bit());
-
-    jccb(Assembler::zero, no_safepoint);
-    ArrayAddress dispatch_addr(ExternalAddress((address)safepoint_table), index);
-    jump(dispatch_addr, noreg);
-    bind(no_safepoint);
-  }
-
-  {
-    ArrayAddress dispatch_addr(ExternalAddress((address)table), index);
-    jump(dispatch_addr, noreg);
-  }
-#endif // _LP64
 }
 
 void InterpreterMacroAssembler::dispatch_only(TosState state, bool generate_poll) {
@@ -951,24 +759,19 @@ void InterpreterMacroAssembler::narrow(Register result) {
   bind(notBool);
   cmpl(rcx, T_BYTE);
   jcc(Assembler::notEqual, notByte);
-  LP64_ONLY(movsbl(result, result);)
-  NOT_LP64(shll(result, 24);)      // truncate upper 24 bits
-  NOT_LP64(sarl(result, 24);)      // and sign-extend byte
+  movsbl(result, result);
   jmp(done);
 
   bind(notByte);
   cmpl(rcx, T_CHAR);
   jcc(Assembler::notEqual, notChar);
-  LP64_ONLY(movzwl(result, result);)
-  NOT_LP64(andl(result, 0xFFFF);)  // truncate upper 16 bits
+  movzwl(result, result);
   jmp(done);
 
   bind(notChar);
   // cmpl(rcx, T_SHORT);  // all that's left
   // jcc(Assembler::notEqual, done);
-  LP64_ONLY(movswl(result, result);)
-  NOT_LP64(shll(result, 16);)      // truncate upper 16 bits
-  NOT_LP64(sarl(result, 16);)      // and sign-extend short
+  movswl(result, result);
 
   // Nothing to do for T_INT
   bind(done);
@@ -998,12 +801,9 @@ void InterpreterMacroAssembler::remove_activation(
   // result check if synchronized method
   Label unlocked, unlock, no_unlock;
 
-  const Register rthread = LP64_ONLY(r15_thread) NOT_LP64(rcx);
-  const Register robj    = LP64_ONLY(c_rarg1) NOT_LP64(rdx);
-  const Register rmon    = LP64_ONLY(c_rarg1) NOT_LP64(rcx);
-                              // monitor pointers need different register
-                              // because rdx may have the result in it
-  NOT_LP64(get_thread(rthread);)
+  const Register rthread = r15_thread;
+  const Register robj    = c_rarg1;
+  const Register rmon    = c_rarg1;
 
   // The below poll is for the stack watermark barrier. It allows fixing up frames lazily,
   // that would normally not be safe to use. Such bad returns into unsafe territory of
@@ -1016,7 +816,6 @@ void InterpreterMacroAssembler::remove_activation(
   push(state);
   set_last_Java_frame(rthread, noreg, rbp, (address)pc(), rscratch1);
   super_call_VM_leaf(CAST_FROM_FN_PTR(address, InterpreterRuntime::at_unwind), rthread);
-  NOT_LP64(get_thread(rthread);) // call_VM clobbered it, restore
   reset_last_Java_frame(rthread, true);
   pop(state);
   bind(fast_path);
@@ -1057,7 +856,6 @@ void InterpreterMacroAssembler::remove_activation(
   pop(state);
   if (throw_monitor_exception) {
     // Entry already unlocked, need to throw exception
-    NOT_LP64(empty_FPU_stack();)  // remove possible return value from FPU-stack, otherwise stack could overflow
     call_VM(noreg, CAST_FROM_FN_PTR(address,
                    InterpreterRuntime::throw_illegal_monitor_state_exception));
     should_not_reach_here();
@@ -1066,7 +864,6 @@ void InterpreterMacroAssembler::remove_activation(
     // install an illegal_monitor_state_exception.  Continue with
     // stack unrolling.
     if (install_monitor_exception) {
-      NOT_LP64(empty_FPU_stack();)
       call_VM(noreg, CAST_FROM_FN_PTR(address,
                      InterpreterRuntime::new_illegal_monitor_state_exception));
     }
@@ -1108,7 +905,6 @@ void InterpreterMacroAssembler::remove_activation(
 
     if (throw_monitor_exception) {
       // Throw exception
-      NOT_LP64(empty_FPU_stack();)
       MacroAssembler::call_VM(noreg,
                               CAST_FROM_FN_PTR(address, InterpreterRuntime::
                                    throw_illegal_monitor_state_exception));
@@ -1124,7 +920,6 @@ void InterpreterMacroAssembler::remove_activation(
       pop(state);
 
       if (install_monitor_exception) {
-        NOT_LP64(empty_FPU_stack();)
         call_VM(noreg, CAST_FROM_FN_PTR(address,
                                         InterpreterRuntime::
                                         new_illegal_monitor_state_exception));
@@ -1159,11 +954,9 @@ void InterpreterMacroAssembler::remove_activation(
          Address(rbp, frame::interpreter_frame_sender_sp_offset * wordSize));
   if (StackReservedPages > 0) {
     // testing if reserved zone needs to be re-enabled
-    Register rthread = LP64_ONLY(r15_thread) NOT_LP64(rcx);
+    Register rthread = r15_thread;
     Label no_reserved_zone_enabling;
 
-    NOT_LP64(get_thread(rthread);)
-
     // check if already enabled - if so no re-enabling needed
     assert(sizeof(StackOverflow::StackGuardState) == 4, "unexpected size");
     cmpl(Address(rthread, JavaThread::stack_guard_state_offset()), StackOverflow::stack_guard_enabled);
@@ -1209,8 +1002,7 @@ void InterpreterMacroAssembler::get_method_counters(Register method,
 // Kills:
 //      rax, rbx
 void InterpreterMacroAssembler::lock_object(Register lock_reg) {
-  assert(lock_reg == LP64_ONLY(c_rarg1) NOT_LP64(rdx),
-         "The argument is only for looks. It must be c_rarg1");
+  assert(lock_reg == c_rarg1, "The argument is only for looks. It must be c_rarg1");
 
   if (LockingMode == LM_MONITOR) {
     call_VM_preemptable(noreg,
@@ -1221,7 +1013,7 @@ void InterpreterMacroAssembler::lock_object(Register lock_reg) {
 
     const Register swap_reg = rax; // Must use rax for cmpxchg instruction
     const Register tmp_reg = rbx;
-    const Register obj_reg = LP64_ONLY(c_rarg3) NOT_LP64(rcx); // Will contain the oop
+    const Register obj_reg = c_rarg3; // Will contain the oop
     const Register rklass_decode_tmp = rscratch1;
 
     const int obj_offset = in_bytes(BasicObjectLock::obj_offset());
@@ -1239,13 +1031,8 @@ void InterpreterMacroAssembler::lock_object(Register lock_reg) {
     }
 
     if (LockingMode == LM_LIGHTWEIGHT) {
-#ifdef _LP64
       const Register thread = r15_thread;
       lightweight_lock(lock_reg, obj_reg, swap_reg, thread, tmp_reg, slow_case);
-#else
-      // Lacking registers and thread on x86_32. Always take slow path.
-      jmp(slow_case);
-#endif
     } else if (LockingMode == LM_LEGACY) {
       // Load immediate 1 into swap_reg %rax
       movl(swap_reg, 1);
@@ -1263,7 +1050,7 @@ void InterpreterMacroAssembler::lock_object(Register lock_reg) {
       cmpxchgptr(lock_reg, Address(obj_reg, oopDesc::mark_offset_in_bytes()));
       jcc(Assembler::zero, count_locking);
 
-      const int zero_bits = LP64_ONLY(7) NOT_LP64(3);
+      const int zero_bits = 7;
 
       // Fast check for recursive lock.
       //
@@ -1328,8 +1115,7 @@ void InterpreterMacroAssembler::lock_object(Register lock_reg) {
 //      rscratch1 (scratch reg)
 // rax, rbx, rcx, rdx
 void InterpreterMacroAssembler::unlock_object(Register lock_reg) {
-  assert(lock_reg == LP64_ONLY(c_rarg1) NOT_LP64(rdx),
-         "The argument is only for looks. It must be c_rarg1");
+  assert(lock_reg == c_rarg1, "The argument is only for looks. It must be c_rarg1");
 
   if (LockingMode == LM_MONITOR) {
     call_VM_leaf(CAST_FROM_FN_PTR(address, InterpreterRuntime::monitorexit), lock_reg);
@@ -1337,8 +1123,8 @@ void InterpreterMacroAssembler::unlock_object(Register lock_reg) {
     Label count_locking, done, slow_case;
 
     const Register swap_reg   = rax;  // Must use rax for cmpxchg instruction
-    const Register header_reg = LP64_ONLY(c_rarg2) NOT_LP64(rbx);  // Will contain the old oopMark
-    const Register obj_reg    = LP64_ONLY(c_rarg3) NOT_LP64(rcx);  // Will contain the oop
+    const Register header_reg = c_rarg2;  // Will contain the old oopMark
+    const Register obj_reg    = c_rarg3;  // Will contain the oop
 
     save_bcp(); // Save in case of exception
 
@@ -1355,12 +1141,7 @@ void InterpreterMacroAssembler::unlock_object(Register lock_reg) {
     movptr(Address(lock_reg, BasicObjectLock::obj_offset()), NULL_WORD);
 
     if (LockingMode == LM_LIGHTWEIGHT) {
-#ifdef _LP64
       lightweight_unlock(obj_reg, swap_reg, r15_thread, header_reg, slow_case);
-#else
-      // Lacking registers and thread on x86_32. Always take slow path.
-      jmp(slow_case);
-#endif
     } else if (LockingMode == LM_LEGACY) {
       // Load the old header from BasicLock structure
       movptr(header_reg, Address(swap_reg,
@@ -1436,8 +1217,8 @@ void InterpreterMacroAssembler::verify_method_data_pointer() {
   Label verify_continue;
   push(rax);
   push(rbx);
-  Register arg3_reg = LP64_ONLY(c_rarg3) NOT_LP64(rcx);
-  Register arg2_reg = LP64_ONLY(c_rarg2) NOT_LP64(rdx);
+  Register arg3_reg = c_rarg3;
+  Register arg2_reg = c_rarg2;
   push(arg3_reg);
   push(arg2_reg);
   test_method_data_pointer(arg3_reg, verify_continue); // If mdp is zero, continue
@@ -1895,8 +1676,6 @@ void InterpreterMacroAssembler::profile_typecheck(Register mdp, Register klass,
 
       // Record the object type.
       record_klass_in_profile(klass, mdp, reg2, false);
-      NOT_LP64(assert(reg2 == rdi, "we know how to fix this blown reg");)
-      NOT_LP64(restore_locals();)         // Restore EDI
     }
     update_mdp_by_constant(mdp, mdp_delta);
 
@@ -1964,14 +1743,6 @@ void InterpreterMacroAssembler::_interp_verify_oop(Register reg, TosState state,
   }
 }
 
-void InterpreterMacroAssembler::verify_FPU(int stack_depth, TosState state) {
-#ifndef _LP64
-  if ((state == ftos && UseSSE < 1) ||
-      (state == dtos && UseSSE < 2)) {
-    MacroAssembler::verify_FPU(stack_depth);
-  }
-#endif
-}
 
 // Jump if ((*counter_addr += increment) & mask) == 0
 void InterpreterMacroAssembler::increment_mask_and_jump(Address counter_addr, Address mask,
@@ -1992,11 +1763,10 @@ void InterpreterMacroAssembler::notify_method_entry() {
   // Whenever JVMTI is interp_only_mode, method entry/exit events are sent to
   // track stack depth.  If it is possible to enter interp_only_mode we add
   // the code to check if the event should be sent.
-  Register rthread = LP64_ONLY(r15_thread) NOT_LP64(rcx);
-  Register rarg = LP64_ONLY(c_rarg1) NOT_LP64(rbx);
+  Register rthread = r15_thread;
+  Register rarg = c_rarg1;
   if (JvmtiExport::can_post_interpreter_events()) {
     Label L;
-    NOT_LP64(get_thread(rthread);)
     movl(rdx, Address(rthread, JavaThread::interp_only_mode_offset()));
     testl(rdx, rdx);
     jcc(Assembler::zero, L);
@@ -2006,7 +1776,6 @@ void InterpreterMacroAssembler::notify_method_entry() {
   }
 
   if (DTraceMethodProbes) {
-    NOT_LP64(get_thread(rthread);)
     get_method(rarg);
     call_VM_leaf(CAST_FROM_FN_PTR(address, SharedRuntime::dtrace_method_entry),
                  rthread, rarg);
@@ -2014,7 +1783,6 @@ void InterpreterMacroAssembler::notify_method_entry() {
 
   // RedefineClasses() tracing support for obsolete method entry
   if (log_is_enabled(Trace, redefine, class, obsolete)) {
-    NOT_LP64(get_thread(rthread);)
     get_method(rarg);
     call_VM_leaf(
       CAST_FROM_FN_PTR(address, SharedRuntime::rc_trace_method_entry),
@@ -2028,8 +1796,8 @@ void InterpreterMacroAssembler::notify_method_exit(
   // Whenever JVMTI is interp_only_mode, method entry/exit events are sent to
   // track stack depth.  If it is possible to enter interp_only_mode we add
   // the code to check if the event should be sent.
-  Register rthread = LP64_ONLY(r15_thread) NOT_LP64(rcx);
-  Register rarg = LP64_ONLY(c_rarg1) NOT_LP64(rbx);
+  Register rthread = r15_thread;
+  Register rarg = c_rarg1;
   if (mode == NotifyJVMTI && JvmtiExport::can_post_interpreter_events()) {
     Label L;
     // Note: frame::interpreter_frame_result has a dependency on how the
@@ -2039,7 +1807,6 @@ void InterpreterMacroAssembler::notify_method_exit(
 
     // template interpreter will leave the result on the top of the stack.
     push(state);
-    NOT_LP64(get_thread(rthread);)
     movl(rdx, Address(rthread, JavaThread::interp_only_mode_offset()));
     testl(rdx, rdx);
     jcc(Assembler::zero, L);
@@ -2051,7 +1818,6 @@ void InterpreterMacroAssembler::notify_method_exit(
 
   if (DTraceMethodProbes) {
     push(state);
-    NOT_LP64(get_thread(rthread);)
     get_method(rarg);
     call_VM_leaf(CAST_FROM_FN_PTR(address, SharedRuntime::dtrace_method_exit),
                  rthread, rarg);
diff --git a/src/hotspot/cpu/x86/interp_masm_x86.hpp b/src/hotspot/cpu/x86/interp_masm_x86.hpp
index 5d9a9071f8a..e537e9efc96 100644
--- a/src/hotspot/cpu/x86/interp_masm_x86.hpp
+++ b/src/hotspot/cpu/x86/interp_masm_x86.hpp
@@ -53,8 +53,8 @@ class InterpreterMacroAssembler: public MacroAssembler {
 
  public:
   InterpreterMacroAssembler(CodeBuffer* code) : MacroAssembler(code),
-    _locals_register(LP64_ONLY(r14) NOT_LP64(rdi)),
-    _bcp_register(LP64_ONLY(r13) NOT_LP64(rsi)) {}
+    _locals_register(r14),
+    _bcp_register(r13) {}
 
   void jump_to_entry(address entry);
 
@@ -121,9 +121,6 @@ class InterpreterMacroAssembler: public MacroAssembler {
                                     Register cpool,  // the constant pool (corrupted on return)
                                     Register index); // the constant pool index (corrupted on return)
 
-  NOT_LP64(void f2ieee();)        // truncate ftos to 32bits
-  NOT_LP64(void d2ieee();)        // truncate dtos to 64bits
-
   // Expression stack
   void pop_ptr(Register r = rax);
   void pop_i(Register r = rax);
@@ -143,18 +140,8 @@ class InterpreterMacroAssembler: public MacroAssembler {
   void pop_f(XMMRegister r);
   void pop_d(XMMRegister r);
   void push_d(XMMRegister r);
-#ifdef _LP64
   void pop_l(Register r = rax);
   void push_l(Register r = rax);
-#else
-  void pop_l(Register lo = rax, Register hi = rdx);
-  void pop_f();
-  void pop_d();
-
-  void push_l(Register lo = rax, Register hi = rdx);
-  void push_d();
-  void push_f();
-#endif // _LP64
 
   void pop(Register r) { ((MacroAssembler*)this)->pop(r); }
   void push(Register r) { ((MacroAssembler*)this)->push(r); }
@@ -168,7 +155,6 @@ class InterpreterMacroAssembler: public MacroAssembler {
     lea(rsp, Address(rbp, rcx, Address::times_ptr));
     // null last_sp until next java call
     movptr(Address(rbp, frame::interpreter_frame_last_sp_offset * wordSize), NULL_WORD);
-    NOT_LP64(empty_FPU_stack());
   }
 
   // Helpers for swap and dup
@@ -273,8 +259,6 @@ class InterpreterMacroAssembler: public MacroAssembler {
   // only if +VerifyOops && state == atos
 #define interp_verify_oop(reg, state) _interp_verify_oop(reg, state, __FILE__, __LINE__);
   void _interp_verify_oop(Register reg, TosState state, const char* file, int line);
-  // only if +VerifyFPU  && (state == ftos || state == dtos)
-  void verify_FPU(int stack_depth, TosState state = ftos);
 
   typedef enum { NotifyJVMTI, SkipNotifyJVMTI } NotifyMethodExitMode;
 
diff --git a/src/hotspot/cpu/x86/interpreterRT_x86.hpp b/src/hotspot/cpu/x86/interpreterRT_x86.hpp
index e914b4947a1..6875280d9f5 100644
--- a/src/hotspot/cpu/x86/interpreterRT_x86.hpp
+++ b/src/hotspot/cpu/x86/interpreterRT_x86.hpp
@@ -33,7 +33,6 @@
 class SignatureHandlerGenerator: public NativeSignatureIterator {
  private:
   MacroAssembler* _masm;
-#ifdef AMD64
 #ifdef _WIN64
   unsigned int _num_args;
 #else
@@ -41,17 +40,11 @@ class SignatureHandlerGenerator: public NativeSignatureIterator {
   unsigned int _num_int_args;
 #endif // _WIN64
   int _stack_offset;
-#else
-  void move(int from_offset, int to_offset);
-  void box(int from_offset, int to_offset);
-#endif // AMD64
 
   void pass_int();
   void pass_long();
   void pass_float();
-#ifdef AMD64
   void pass_double();
-#endif // AMD64
   void pass_object();
 
  public:
diff --git a/src/hotspot/cpu/x86/templateInterpreterGenerator_x86.cpp b/src/hotspot/cpu/x86/templateInterpreterGenerator_x86.cpp
index d912518e4b0..ca285dad437 100644
--- a/src/hotspot/cpu/x86/templateInterpreterGenerator_x86.cpp
+++ b/src/hotspot/cpu/x86/templateInterpreterGenerator_x86.cpp
@@ -63,15 +63,11 @@
 // if too small.
 // Run with +PrintInterpreter to get the VM to print out the size.
 // Max size with JVMTI
-#ifdef AMD64
 int TemplateInterpreter::InterpreterCodeSize = JVMCI_ONLY(268) NOT_JVMCI(256) * 1024;
-#else
-int TemplateInterpreter::InterpreterCodeSize = 224 * 1024;
-#endif // AMD64
 
 // Global Register Names
-static const Register rbcp     = LP64_ONLY(r13) NOT_LP64(rsi);
-static const Register rlocals  = LP64_ONLY(r14) NOT_LP64(rdi);
+static const Register rbcp     = r13;
+static const Register rlocals  = r14;
 
 const int method_offset = frame::interpreter_frame_method_offset * wordSize;
 const int bcp_offset    = frame::interpreter_frame_bcp_offset    * wordSize;
@@ -120,12 +116,11 @@ address TemplateInterpreterGenerator::generate_ArrayIndexOutOfBounds_handler() {
   // Setup parameters.
   // ??? convention: expect aberrant index in register ebx/rbx.
   // Pass array to create more detailed exceptions.
-  Register rarg = NOT_LP64(rax) LP64_ONLY(c_rarg1);
   __ call_VM(noreg,
              CAST_FROM_FN_PTR(address,
                               InterpreterRuntime::
                               throw_ArrayIndexOutOfBoundsException),
-             rarg, rbx);
+             c_rarg1, rbx);
   return entry;
 }
 
@@ -133,8 +128,7 @@ address TemplateInterpreterGenerator::generate_ClassCastException_handler() {
   address entry = __ pc();
 
   // object is at TOS
-  Register rarg = NOT_LP64(rax) LP64_ONLY(c_rarg1);
-  __ pop(rarg);
+  __ pop(c_rarg1);
 
   // expression stack must be empty before entering the VM if an
   // exception happened
@@ -144,7 +138,7 @@ address TemplateInterpreterGenerator::generate_ClassCastException_handler() {
              CAST_FROM_FN_PTR(address,
                               InterpreterRuntime::
                               throw_ClassCastException),
-             rarg);
+             c_rarg1);
   return entry;
 }
 
@@ -153,28 +147,25 @@ address TemplateInterpreterGenerator::generate_exception_handler_common(
   assert(!pass_oop || message == nullptr, "either oop or message but not both");
   address entry = __ pc();
 
-  Register rarg = NOT_LP64(rax) LP64_ONLY(c_rarg1);
-  Register rarg2 = NOT_LP64(rbx) LP64_ONLY(c_rarg2);
-
   if (pass_oop) {
     // object is at TOS
-    __ pop(rarg2);
+    __ pop(c_rarg2);
   }
   // expression stack must be empty before entering the VM if an
   // exception happened
   __ empty_expression_stack();
   // setup parameters
-  __ lea(rarg, ExternalAddress((address)name));
+  __ lea(c_rarg1, ExternalAddress((address)name));
   if (pass_oop) {
     __ call_VM(rax, CAST_FROM_FN_PTR(address,
                                      InterpreterRuntime::
                                      create_klass_exception),
-               rarg, rarg2);
+               c_rarg1, c_rarg2);
   } else {
-    __ lea(rarg2, ExternalAddress((address)message));
+    __ lea(c_rarg2, ExternalAddress((address)message));
     __ call_VM(rax,
                CAST_FROM_FN_PTR(address, InterpreterRuntime::create_exception),
-               rarg, rarg2);
+               c_rarg1, c_rarg2);
   }
   // throw exception
   __ jump(RuntimeAddress(Interpreter::throw_exception_entry()));
@@ -184,30 +175,6 @@ address TemplateInterpreterGenerator::generate_exception_handler_common(
 address TemplateInterpreterGenerator::generate_return_entry_for(TosState state, int step, size_t index_size) {
   address entry = __ pc();
 
-#ifndef _LP64
-#ifdef COMPILER2
-  // The FPU stack is clean if UseSSE >= 2 but must be cleaned in other cases
-  if ((state == ftos && UseSSE < 1) || (state == dtos && UseSSE < 2)) {
-    for (int i = 1; i < 8; i++) {
-        __ ffree(i);
-    }
-  } else if (UseSSE < 2) {
-    __ empty_FPU_stack();
-  }
-#endif // COMPILER2
-  if ((state == ftos && UseSSE < 1) || (state == dtos && UseSSE < 2)) {
-    __ MacroAssembler::verify_FPU(1, "generate_return_entry_for compiled");
-  } else {
-    __ MacroAssembler::verify_FPU(0, "generate_return_entry_for compiled");
-  }
-
-  if (state == ftos) {
-    __ MacroAssembler::verify_FPU(UseSSE >= 1 ? 0 : 1, "generate_return_entry_for in interpreter");
-  } else if (state == dtos) {
-    __ MacroAssembler::verify_FPU(UseSSE >= 2 ? 0 : 1, "generate_return_entry_for in interpreter");
-  }
-#endif // _LP64
-
   // Restore stack bottom in case i2c adjusted stack
   __ movptr(rcx, Address(rbp, frame::interpreter_frame_last_sp_offset * wordSize));
   __ lea(rsp, Address(rbp, rcx, Address::times_ptr));
@@ -236,14 +203,11 @@ address TemplateInterpreterGenerator::generate_return_entry_for(TosState state,
     __ lea(rsp, Address(rsp, cache, Interpreter::stackElementScale()));
   }
 
-   const Register java_thread = NOT_LP64(rcx) LP64_ONLY(r15_thread);
    if (JvmtiExport::can_pop_frame()) {
-     NOT_LP64(__ get_thread(java_thread));
-     __ check_and_handle_popframe(java_thread);
+     __ check_and_handle_popframe(r15_thread);
    }
    if (JvmtiExport::can_force_early_return()) {
-     NOT_LP64(__ get_thread(java_thread));
-     __ check_and_handle_earlyret(java_thread);
+     __ check_and_handle_earlyret(r15_thread);
    }
 
   __ dispatch_next(state, step);
@@ -255,20 +219,11 @@ address TemplateInterpreterGenerator::generate_return_entry_for(TosState state,
 address TemplateInterpreterGenerator::generate_deopt_entry_for(TosState state, int step, address continuation) {
   address entry = __ pc();
 
-#ifndef _LP64
-  if (state == ftos) {
-    __ MacroAssembler::verify_FPU(UseSSE >= 1 ? 0 : 1, "generate_deopt_entry_for in interpreter");
-  } else if (state == dtos) {
-    __ MacroAssembler::verify_FPU(UseSSE >= 2 ? 0 : 1, "generate_deopt_entry_for in interpreter");
-  }
-#endif // _LP64
-
   // null last_sp until next java call
   __ movptr(Address(rbp, frame::interpreter_frame_last_sp_offset * wordSize), NULL_WORD);
   __ restore_bcp();
   __ restore_locals();
-  const Register thread = NOT_LP64(rcx) LP64_ONLY(r15_thread);
-  NOT_LP64(__ get_thread(thread));
+  const Register thread = r15_thread;
 #if INCLUDE_JVMCI
   // Check if we need to take lock at entry of synchronized method.  This can
   // only occur on method entry so emit it only for vtos with step 0.
@@ -319,46 +274,14 @@ address TemplateInterpreterGenerator::generate_result_handler_for(
   address entry = __ pc();
   switch (type) {
   case T_BOOLEAN: __ c2bool(rax);            break;
-#ifndef _LP64
-  case T_CHAR   : __ andptr(rax, 0xFFFF);    break;
-#else
   case T_CHAR   : __ movzwl(rax, rax);       break;
-#endif // _LP64
   case T_BYTE   : __ sign_extend_byte(rax);  break;
   case T_SHORT  : __ sign_extend_short(rax); break;
   case T_INT    : /* nothing to do */        break;
   case T_LONG   : /* nothing to do */        break;
   case T_VOID   : /* nothing to do */        break;
-#ifndef _LP64
-  case T_DOUBLE :
-  case T_FLOAT  :
-    { const Register t = InterpreterRuntime::SignatureHandlerGenerator::temp();
-      __ pop(t);                            // remove return address first
-      // Must return a result for interpreter or compiler. In SSE
-      // mode, results are returned in xmm0 and the FPU stack must
-      // be empty.
-      if (type == T_FLOAT && UseSSE >= 1) {
-        // Load ST0
-        __ fld_d(Address(rsp, 0));
-        // Store as float and empty fpu stack
-        __ fstp_s(Address(rsp, 0));
-        // and reload
-        __ movflt(xmm0, Address(rsp, 0));
-      } else if (type == T_DOUBLE && UseSSE >= 2 ) {
-        __ movdbl(xmm0, Address(rsp, 0));
-      } else {
-        // restore ST0
-        __ fld_d(Address(rsp, 0));
-      }
-      // and pop the temp
-      __ addptr(rsp, 2 * wordSize);
-      __ push(t);                           // restore return address
-    }
-    break;
-#else
   case T_FLOAT  : /* nothing to do */        break;
   case T_DOUBLE : /* nothing to do */        break;
-#endif // _LP64
 
   case T_OBJECT :
     // retrieve result from frame
@@ -467,12 +390,11 @@ void TemplateInterpreterGenerator::generate_counter_overflow(Label& do_continue)
   // of the verified entry point for the method or null if the
   // compilation did not complete (either went background or bailed
   // out).
-  Register rarg = NOT_LP64(rax) LP64_ONLY(c_rarg1);
-  __ movl(rarg, 0);
+  __ movl(c_rarg1, 0);
   __ call_VM(noreg,
              CAST_FROM_FN_PTR(address,
                               InterpreterRuntime::frequency_counter_overflow),
-             rarg);
+             c_rarg1);
 
   __ movptr(rbx, Address(rbp, method_offset));   // restore Method*
   // Preserve invariant that r13/r14 contain bcp/locals of sender frame
@@ -523,13 +445,8 @@ void TemplateInterpreterGenerator::generate_stack_overflow_check(void) {
   // the stack before the red zone
 
   Label after_frame_check_pop;
-  const Register thread = NOT_LP64(rsi) LP64_ONLY(r15_thread);
-#ifndef _LP64
-  __ push(thread);
-  __ get_thread(thread);
-#endif
 
-  const Address stack_limit(thread, JavaThread::stack_overflow_limit_offset());
+  const Address stack_limit(r15_thread, JavaThread::stack_overflow_limit_offset());
 
   // locals + overhead, in bytes
   __ mov(rax, rdx);
@@ -552,7 +469,6 @@ void TemplateInterpreterGenerator::generate_stack_overflow_check(void) {
   __ cmpptr(rsp, rax);
 
   __ jcc(Assembler::above, after_frame_check_pop);
-  NOT_LP64(__ pop(rsi));  // get saved bcp
 
   // Restore sender's sp as SP. This is necessary if the sender's
   // frame is an extended compiled frame (see gen_c2i_adapter())
@@ -568,7 +484,6 @@ void TemplateInterpreterGenerator::generate_stack_overflow_check(void) {
   __ jump(RuntimeAddress(SharedRuntime::throw_StackOverflowError_entry()));
   // all done with frame size check
   __ bind(after_frame_check_pop);
-  NOT_LP64(__ pop(rsi));
 
   // all done with frame size check
   __ bind(after_frame_check);
@@ -631,9 +546,8 @@ void TemplateInterpreterGenerator::lock_method() {
   __ subptr(monitor_block_top, entry_size / wordSize); // set new monitor block top
   // store object
   __ movptr(Address(rsp, BasicObjectLock::obj_offset()), rax);
-  const Register lockreg = NOT_LP64(rdx) LP64_ONLY(c_rarg1);
-  __ movptr(lockreg, rsp); // object address
-  __ lock_object(lockreg);
+  __ movptr(c_rarg1, rsp); // object address
+  __ lock_object(c_rarg1);
 }
 
 // Generate a fixed interpreter frame. This is identical setup for
@@ -728,19 +642,13 @@ address TemplateInterpreterGenerator::generate_Reference_get_entry(void) {
   // rdx: scratch
   // rdi: scratch
 
-  // Preserve the sender sp in case the load barrier
-  // calls the runtime
-  NOT_LP64(__ push(rsi));
-
   // Load the value of the referent field.
   const Address field_address(rax, referent_offset);
   __ load_heap_oop(rax, field_address, /*tmp1*/ rbx, /*tmp_thread*/ rdx, ON_WEAK_OOP_REF);
 
   // _areturn
-  const Register sender_sp = NOT_LP64(rsi) LP64_ONLY(r13);
-  NOT_LP64(__ pop(rsi));      // get sender sp
   __ pop(rdi);                // get return address
-  __ mov(rsp, sender_sp);     // set sp to sender sp
+  __ mov(rsp, r13);           // set sp to sender sp
   __ jmp(rdi);
   __ ret(0);
 
@@ -764,11 +672,7 @@ void TemplateInterpreterGenerator::bang_stack_shadow_pages(bool native_call) {
   const int page_size = (int)os::vm_page_size();
   const int n_shadow_pages = shadow_zone_size / page_size;
 
-  const Register thread = NOT_LP64(rsi) LP64_ONLY(r15_thread);
-#ifndef _LP64
-  __ push(thread);
-  __ get_thread(thread);
-#endif
+  const Register thread = r15_thread;
 
 #ifdef ASSERT
   Label L_good_limit;
@@ -800,10 +704,6 @@ void TemplateInterpreterGenerator::bang_stack_shadow_pages(bool native_call) {
   __ movptr(Address(thread, JavaThread::shadow_zone_growth_watermark()), rsp);
 
   __ bind(L_done);
-
-#ifndef _LP64
-  __ pop(thread);
-#endif
 }
 
 // Interpreter stub for calling a native method. (asm interpreter)
@@ -877,9 +777,7 @@ address TemplateInterpreterGenerator::generate_native_entry(bool synchronized) {
   // _do_not_unlock_if_synchronized to true. The remove_activation will
   // check this flag.
 
-  const Register thread1 = NOT_LP64(rax) LP64_ONLY(r15_thread);
-  NOT_LP64(__ get_thread(thread1));
-  const Address do_not_unlock_if_synchronized(thread1,
+  const Address do_not_unlock_if_synchronized(r15_thread,
         in_bytes(JavaThread::do_not_unlock_if_synchronized_offset()));
   __ movbool(do_not_unlock_if_synchronized, true);
 
@@ -895,7 +793,6 @@ address TemplateInterpreterGenerator::generate_native_entry(bool synchronized) {
   bang_stack_shadow_pages(true);
 
   // reset the _do_not_unlock_if_synchronized flag
-  NOT_LP64(__ get_thread(thread1));
   __ movbool(do_not_unlock_if_synchronized, false);
 
   // check for synchronized methods
@@ -937,26 +834,19 @@ address TemplateInterpreterGenerator::generate_native_entry(bool synchronized) {
 
   // work registers
   const Register method = rbx;
-  const Register thread = NOT_LP64(rdi) LP64_ONLY(r15_thread);
-  const Register t      = NOT_LP64(rcx) LP64_ONLY(r11);
+  const Register thread = r15_thread;
+  const Register t      = r11;
 
   // allocate space for parameters
   __ get_method(method);
   __ movptr(t, Address(method, Method::const_offset()));
   __ load_unsigned_short(t, Address(t, ConstMethod::size_of_parameters_offset()));
 
-#ifndef _LP64
-  __ shlptr(t, Interpreter::logStackElementSize); // Convert parameter count to bytes.
-  __ addptr(t, 2*wordSize);     // allocate two more slots for JNIEnv and possible mirror
-  __ subptr(rsp, t);
-  __ andptr(rsp, -(StackAlignmentInBytes)); // gcc needs 16 byte aligned stacks to do XMM intrinsics
-#else
   __ shll(t, Interpreter::logStackElementSize);
 
   __ subptr(rsp, t);
   __ subptr(rsp, frame::arg_reg_save_area_bytes); // windows
   __ andptr(rsp, -16); // must be 16 byte boundary (see amd64 ABI)
-#endif // _LP64
 
   // get signature handler
   {
@@ -978,7 +868,7 @@ address TemplateInterpreterGenerator::generate_native_entry(bool synchronized) {
          "adjust this code");
   assert(InterpreterRuntime::SignatureHandlerGenerator::to() == rsp,
          "adjust this code");
-  assert(InterpreterRuntime::SignatureHandlerGenerator::temp() == NOT_LP64(t) LP64_ONLY(rscratch1),
+  assert(InterpreterRuntime::SignatureHandlerGenerator::temp() == rscratch1,
          "adjust this code");
 
   // The generated handlers do not touch RBX (the method).
@@ -1007,13 +897,8 @@ address TemplateInterpreterGenerator::generate_native_entry(bool synchronized) {
     __ movptr(Address(rbp, frame::interpreter_frame_oop_temp_offset * wordSize),
             t);
     // pass handle to mirror
-#ifndef _LP64
-    __ lea(t, Address(rbp, frame::interpreter_frame_oop_temp_offset * wordSize));
-    __ movptr(Address(rsp, wordSize), t);
-#else
     __ lea(c_rarg1,
            Address(rbp, frame::interpreter_frame_oop_temp_offset * wordSize));
-#endif // _LP64
     __ bind(L);
   }
 
@@ -1034,16 +919,6 @@ address TemplateInterpreterGenerator::generate_native_entry(bool synchronized) {
   }
 
   // pass JNIEnv
-#ifndef _LP64
-   __ get_thread(thread);
-   __ lea(t, Address(thread, JavaThread::jni_environment_offset()));
-   __ movptr(Address(rsp, 0), t);
-
-   // set_last_Java_frame_before_call
-   // 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(thread, noreg, rbp, __ pc(), noreg);
-#else
    __ lea(c_rarg0, Address(r15_thread, JavaThread::jni_environment_offset()));
 
    // It is enough that the pc() points into the right code
@@ -1052,7 +927,6 @@ address TemplateInterpreterGenerator::generate_native_entry(bool synchronized) {
    // case of preemption on Object.wait.
    Label native_return;
    __ set_last_Java_frame(rsp, rbp, native_return, rscratch1);
-#endif // _LP64
 
   // change thread state
 #ifdef ASSERT
@@ -1088,39 +962,10 @@ address TemplateInterpreterGenerator::generate_native_entry(bool synchronized) {
   // pushes change or anything else is added to the stack then the code in
   // interpreter_frame_result must also change.
 
-#ifndef _LP64
-  // save potential result in ST(0) & rdx:rax
-  // (if result handler is the T_FLOAT or T_DOUBLE handler, result must be in ST0 -
-  // the check is necessary to avoid potential Intel FPU overflow problems by saving/restoring 'empty' FPU registers)
-  // It is safe to do this push because state is _thread_in_native and return address will be found
-  // via _last_native_pc and not via _last_jave_sp
-
-  // NOTE: the order of these push(es) is known to frame::interpreter_frame_result.
-  // If the order changes or anything else is added to the stack the code in
-  // interpreter_frame_result will have to be changed.
-
-  { Label L;
-    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_result_handler_offset)*wordSize),
-              float_handler.addr(), noreg);
-    __ jcc(Assembler::equal, push_double);
-    __ cmpptr(Address(rbp, (frame::interpreter_frame_result_handler_offset)*wordSize),
-              double_handler.addr(), noreg);
-    __ jcc(Assembler::notEqual, L);
-    __ bind(push_double);
-    __ push_d(); // FP values are returned using the FPU, so push FPU contents (even if UseSSE > 0).
-    __ bind(L);
-  }
-#else
   __ push(dtos);
-#endif // _LP64
-
   __ push(ltos);
 
   // change thread state
-  NOT_LP64(__ get_thread(thread));
   __ movl(Address(thread, JavaThread::thread_state_offset()),
           _thread_in_native_trans);
 
@@ -1130,12 +975,6 @@ address TemplateInterpreterGenerator::generate_native_entry(bool synchronized) {
                 Assembler::LoadLoad | Assembler::LoadStore |
                 Assembler::StoreLoad | Assembler::StoreStore));
   }
-#ifndef _LP64
-  if (AlwaysRestoreFPU) {
-    //  Make sure the control word is correct.
-    __ fldcw(ExternalAddress(StubRoutines::x86::addr_fpu_cntrl_wrd_std()));
-  }
-#endif // _LP64
 
   // check for safepoint operation in progress and/or pending suspend requests
   {
@@ -1155,13 +994,6 @@ address TemplateInterpreterGenerator::generate_native_entry(bool synchronized) {
     // preserved and correspond to the bcp/locals pointers. So we do a
     // runtime call by hand.
     //
-#ifndef _LP64
-    __ push(thread);
-    __ call(RuntimeAddress(CAST_FROM_FN_PTR(address,
-                                            JavaThread::check_special_condition_for_native_trans)));
-    __ increment(rsp, wordSize);
-    __ get_thread(thread);
-#else
     __ mov(c_rarg0, r15_thread);
     __ mov(r12, rsp); // remember sp (can only use r12 if not using call_VM)
     __ subptr(rsp, frame::arg_reg_save_area_bytes); // windows
@@ -1169,14 +1001,12 @@ address TemplateInterpreterGenerator::generate_native_entry(bool synchronized) {
     __ call(RuntimeAddress(CAST_FROM_FN_PTR(address, JavaThread::check_special_condition_for_native_trans)));
     __ mov(rsp, r12); // restore sp
     __ reinit_heapbase();
-#endif // _LP64
     __ bind(Continue);
   }
 
   // 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;
@@ -1192,7 +1022,6 @@ address TemplateInterpreterGenerator::generate_native_entry(bool synchronized) {
     // 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);
@@ -1234,10 +1063,6 @@ address TemplateInterpreterGenerator::generate_native_entry(bool synchronized) {
     __ jcc(Assembler::notEqual, no_reguard);
 
     __ pusha(); // XXX only save smashed registers
-#ifndef _LP64
-    __ call(RuntimeAddress(CAST_FROM_FN_PTR(address, SharedRuntime::reguard_yellow_pages)));
-    __ popa();
-#else
     __ mov(r12, rsp); // remember sp (can only use r12 if not using call_VM)
     __ subptr(rsp, frame::arg_reg_save_area_bytes); // windows
     __ andptr(rsp, -16); // align stack as required by ABI
@@ -1245,7 +1070,6 @@ address TemplateInterpreterGenerator::generate_native_entry(bool synchronized) {
     __ mov(rsp, r12); // restore sp
     __ popa(); // XXX only restore smashed registers
     __ reinit_heapbase();
-#endif // _LP64
 
     __ bind(no_reguard);
   }
@@ -1293,7 +1117,7 @@ address TemplateInterpreterGenerator::generate_native_entry(bool synchronized) {
                             (intptr_t)(frame::interpreter_frame_initial_sp_offset *
                                        wordSize - (int)sizeof(BasicObjectLock)));
 
-      const Register regmon = NOT_LP64(rdx) LP64_ONLY(c_rarg1);
+      const Register regmon = c_rarg1;
 
       // monitor expect in c_rarg1 for slow unlock path
       __ lea(regmon, monitor); // address of first monitor
@@ -1325,7 +1149,7 @@ address TemplateInterpreterGenerator::generate_native_entry(bool synchronized) {
   // restore potential result in ST0 & handle result
 
   __ pop(ltos);
-  LP64_ONLY( __ pop(dtos));
+  __ pop(dtos);
 
   __ movptr(t, Address(rbp,
                        (frame::interpreter_frame_result_handler_offset) * wordSize));
@@ -1454,9 +1278,7 @@ address TemplateInterpreterGenerator::generate_normal_entry(bool synchronized) {
   // _do_not_unlock_if_synchronized to true. The remove_activation
   // will check this flag.
 
-  const Register thread = NOT_LP64(rax) LP64_ONLY(r15_thread);
-  NOT_LP64(__ get_thread(thread));
-  const Address do_not_unlock_if_synchronized(thread,
+  const Address do_not_unlock_if_synchronized(r15_thread,
         in_bytes(JavaThread::do_not_unlock_if_synchronized_offset()));
   __ movbool(do_not_unlock_if_synchronized, true);
 
@@ -1474,7 +1296,6 @@ address TemplateInterpreterGenerator::generate_normal_entry(bool synchronized) {
   bang_stack_shadow_pages(false);
 
   // reset the _do_not_unlock_if_synchronized flag
-  NOT_LP64(__ get_thread(thread));
   __ movbool(do_not_unlock_if_synchronized, false);
 
   // check for synchronized methods
@@ -1541,15 +1362,14 @@ void TemplateInterpreterGenerator::generate_throw_exception() {
   // rdx: return address/pc that threw exception
   __ restore_bcp();    // r13/rsi points to call/send
   __ restore_locals();
-  LP64_ONLY(__ reinit_heapbase());  // restore r12 as heapbase.
+  __ reinit_heapbase();  // restore r12 as heapbase.
   // Entry point for exceptions thrown within interpreter code
   Interpreter::_throw_exception_entry = __ pc();
   // expression stack is undefined here
   // rax: exception
   // r13/rsi: exception bcp
   __ verify_oop(rax);
-  Register rarg = NOT_LP64(rax) LP64_ONLY(c_rarg1);
-  LP64_ONLY(__ mov(c_rarg1, rax));
+  __ mov(c_rarg1, rax);
 
   // expression stack must be empty before entering the VM in case of
   // an exception
@@ -1558,7 +1378,7 @@ void TemplateInterpreterGenerator::generate_throw_exception() {
   __ call_VM(rdx,
              CAST_FROM_FN_PTR(address,
                           InterpreterRuntime::exception_handler_for_exception),
-             rarg);
+             c_rarg1);
   // rax: exception handler entry point
   // rdx: preserved exception oop
   // r13/rsi: bcp for exception handler
@@ -1588,8 +1408,7 @@ void TemplateInterpreterGenerator::generate_throw_exception() {
   // indicating that we are currently handling popframe, so that
   // call_VMs that may happen later do not trigger new popframe
   // handling cycles.
-  const Register thread = NOT_LP64(rcx) LP64_ONLY(r15_thread);
-  NOT_LP64(__ get_thread(thread));
+  const Register thread = r15_thread;
   __ movl(rdx, Address(thread, JavaThread::popframe_condition_offset()));
   __ orl(rdx, JavaThread::popframe_processing_bit);
   __ movl(Address(thread, JavaThread::popframe_condition_offset()), rdx);
@@ -1606,10 +1425,9 @@ void TemplateInterpreterGenerator::generate_throw_exception() {
     // deoptimization blob's unpack entry because of the presence of
     // adapter frames in C2.
     Label caller_not_deoptimized;
-    Register rarg = NOT_LP64(rdx) LP64_ONLY(c_rarg1);
-    __ movptr(rarg, Address(rbp, frame::return_addr_offset * wordSize));
+    __ movptr(c_rarg1, Address(rbp, frame::return_addr_offset * wordSize));
     __ super_call_VM_leaf(CAST_FROM_FN_PTR(address,
-                               InterpreterRuntime::interpreter_contains), rarg);
+                               InterpreterRuntime::interpreter_contains), c_rarg1);
     __ testl(rax, rax);
     __ jcc(Assembler::notZero, caller_not_deoptimized);
 
@@ -1624,7 +1442,6 @@ void TemplateInterpreterGenerator::generate_throw_exception() {
     __ subptr(rlocals, rax);
     __ addptr(rlocals, wordSize);
     // Save these arguments
-    NOT_LP64(__ get_thread(thread));
     __ super_call_VM_leaf(CAST_FROM_FN_PTR(address,
                                            Deoptimization::
                                            popframe_preserve_args),
@@ -1637,7 +1454,6 @@ void TemplateInterpreterGenerator::generate_throw_exception() {
 
     // Inform deoptimization that it is responsible for restoring
     // these arguments
-    NOT_LP64(__ get_thread(thread));
     __ movl(Address(thread, JavaThread::popframe_condition_offset()),
             JavaThread::popframe_force_deopt_reexecution_bit);
 
@@ -1663,23 +1479,12 @@ void TemplateInterpreterGenerator::generate_throw_exception() {
   // maintain this kind of invariant all the time we call a small
   // fixup routine to move the mutated arguments onto the top of our
   // expression stack if necessary.
-#ifndef _LP64
-  __ mov(rax, rsp);
-  __ movptr(rbx, Address(rbp, frame::interpreter_frame_last_sp_offset * wordSize));
-  __ lea(rbx, Address(rbp, rbx, Address::times_ptr));
-  __ get_thread(thread);
-  // PC must point into interpreter here
-  __ set_last_Java_frame(thread, noreg, rbp, __ pc(), noreg);
-  __ super_call_VM_leaf(CAST_FROM_FN_PTR(address, InterpreterRuntime::popframe_move_outgoing_args), thread, rax, rbx);
-  __ get_thread(thread);
-#else
   __ mov(c_rarg1, rsp);
   __ movptr(c_rarg2, Address(rbp, frame::interpreter_frame_last_sp_offset * wordSize));
   __ lea(c_rarg2, Address(rbp, c_rarg2, Address::times_ptr));
   // PC must point into interpreter here
   __ set_last_Java_frame(noreg, rbp, __ pc(), rscratch1);
   __ super_call_VM_leaf(CAST_FROM_FN_PTR(address, InterpreterRuntime::popframe_move_outgoing_args), r15_thread, c_rarg1, c_rarg2);
-#endif
   __ reset_last_Java_frame(thread, true);
 
   // Restore the last_sp and null it out
@@ -1696,7 +1501,6 @@ void TemplateInterpreterGenerator::generate_throw_exception() {
   }
 
   // Clear the popframe condition flag
-  NOT_LP64(__ get_thread(thread));
   __ movl(Address(thread, JavaThread::popframe_condition_offset()),
           JavaThread::popframe_inactive);
 
@@ -1730,12 +1534,10 @@ void TemplateInterpreterGenerator::generate_throw_exception() {
 
   // preserve exception over this code sequence
   __ pop_ptr(rax);
-  NOT_LP64(__ get_thread(thread));
   __ movptr(Address(thread, JavaThread::vm_result_offset()), rax);
   // remove the activation (without doing throws on illegalMonitorExceptions)
   __ remove_activation(vtos, rdx, false, true, false);
   // restore exception
-  NOT_LP64(__ get_thread(thread));
   __ get_vm_result(rax, thread);
 
   // In between activations - previous activation type unknown yet
@@ -1771,9 +1573,7 @@ address TemplateInterpreterGenerator::generate_earlyret_entry_for(TosState state
   __ empty_expression_stack();
   __ load_earlyret_value(state);  // 32 bits returns value in rdx, so don't reuse
 
-  const Register thread = NOT_LP64(rcx) LP64_ONLY(r15_thread);
-  NOT_LP64(__ get_thread(thread));
-  __ movptr(rcx, Address(thread, JavaThread::jvmti_thread_state_offset()));
+  __ movptr(rcx, Address(r15_thread, JavaThread::jvmti_thread_state_offset()));
   Address cond_addr(rcx, JvmtiThreadState::earlyret_state_offset());
 
   // Clear the earlyret state
@@ -1804,21 +1604,12 @@ void TemplateInterpreterGenerator::set_vtos_entry_points(Template* t,
                                                          address& vep) {
   assert(t->is_valid() && t->tos_in() == vtos, "illegal template");
   Label L;
-#ifndef _LP64
-  fep = __ pc();     // ftos entry point
-      __ push(ftos);
-      __ jmpb(L);
-  dep = __ pc();     // dtos entry point
-      __ push(dtos);
-      __ jmpb(L);
-#else
   fep = __ pc();     // ftos entry point
       __ push_f(xmm0);
       __ jmpb(L);
   dep = __ pc();     // dtos entry point
       __ push_d(xmm0);
       __ jmpb(L);
-#endif // _LP64
   lep = __ pc();     // ltos entry point
       __ push_l();
       __ jmpb(L);
@@ -1837,19 +1628,6 @@ void TemplateInterpreterGenerator::set_vtos_entry_points(Template* t,
 address TemplateInterpreterGenerator::generate_trace_code(TosState state) {
   address entry = __ pc();
 
-#ifndef _LP64
-  // prepare expression stack
-  __ pop(rcx);          // pop return address so expression stack is 'pure'
-  __ push(state);       // save tosca
-
-  // pass tosca registers as arguments & call tracer
-  __ call_VM(noreg, CAST_FROM_FN_PTR(address, InterpreterRuntime::trace_bytecode), rcx, rax, rdx);
-  __ mov(rcx, rax);     // make sure return address is not destroyed by pop(state)
-  __ pop(state);        // restore tosca
-
-  // return
-  __ jmp(rcx);
-#else
   __ push(state);
   __ push(c_rarg0);
   __ push(c_rarg1);
@@ -1868,17 +1646,12 @@ address TemplateInterpreterGenerator::generate_trace_code(TosState state) {
   __ pop(c_rarg0);
   __ pop(state);
   __ ret(0);                                   // return from result handler
-#endif // _LP64
 
   return entry;
 }
 
 void TemplateInterpreterGenerator::count_bytecode() {
-  #ifndef _LP64
-  __ incrementl(ExternalAddress((address) &BytecodeCounter::_counter_value), rscratch1);
-  #else
   __ incrementq(ExternalAddress((address) &BytecodeCounter::_counter_value), rscratch1);
-  #endif
 }
 
 void TemplateInterpreterGenerator::histogram_bytecode(Template* t) {
@@ -1904,28 +1677,18 @@ void TemplateInterpreterGenerator::trace_bytecode(Template* t) {
 
   assert(Interpreter::trace_code(t->tos_in()) != nullptr,
          "entry must have been generated");
-#ifndef _LP64
-  __ call(RuntimeAddress(Interpreter::trace_code(t->tos_in())));
-#else
   __ mov(r12, rsp); // remember sp (can only use r12 if not using call_VM)
   __ andptr(rsp, -16); // align stack as required by ABI
   __ call(RuntimeAddress(Interpreter::trace_code(t->tos_in())));
   __ mov(rsp, r12); // restore sp
   __ reinit_heapbase();
-#endif // _LP64
 }
 
 
 void TemplateInterpreterGenerator::stop_interpreter_at() {
   Label L;
-  #ifndef _LP64
-  __ cmp32(ExternalAddress((address) &BytecodeCounter::_counter_value),
-           StopInterpreterAt,
-           rscratch1);
-  #else
   __ mov64(rscratch1, StopInterpreterAt);
   __ cmp64(rscratch1, ExternalAddress((address) &BytecodeCounter::_counter_value), rscratch2);
-  #endif
   __ jcc(Assembler::notEqual, L);
   __ int3();
   __ bind(L);
diff --git a/src/hotspot/cpu/x86/templateTable_x86.cpp b/src/hotspot/cpu/x86/templateTable_x86.cpp
index 55bdb52c442..b378bc431fa 100644
--- a/src/hotspot/cpu/x86/templateTable_x86.cpp
+++ b/src/hotspot/cpu/x86/templateTable_x86.cpp
@@ -51,8 +51,8 @@
 #define __ Disassembler::hook<InterpreterMacroAssembler>(__FILE__, __LINE__, _masm)->
 
 // Global Register Names
-static const Register rbcp     = LP64_ONLY(r13) NOT_LP64(rsi);
-static const Register rlocals  = LP64_ONLY(r14) NOT_LP64(rdi);
+static const Register rbcp     = r13;
+static const Register rlocals  = r14;
 
 // Address Computation: local variables
 static inline Address iaddress(int n) {
@@ -63,12 +63,6 @@ static inline Address laddress(int n) {
   return iaddress(n + 1);
 }
 
-#ifndef _LP64
-static inline Address haddress(int n) {
-  return iaddress(n + 0);
-}
-#endif
-
 static inline Address faddress(int n) {
   return iaddress(n);
 }
@@ -89,12 +83,6 @@ static inline Address laddress(Register r) {
   return Address(rlocals, r, Address::times_ptr, Interpreter::local_offset_in_bytes(1));
 }
 
-#ifndef _LP64
-static inline Address haddress(Register r)       {
-  return Address(rlocals, r, Interpreter::stackElementScale(), Interpreter::local_offset_in_bytes(0));
-}
-#endif
-
 static inline Address faddress(Register r) {
   return iaddress(r);
 }
@@ -156,10 +144,7 @@ static void do_oop_store(InterpreterMacroAssembler* _masm,
                          Register val,
                          DecoratorSet decorators = 0) {
   assert(val == noreg || val == rax, "parameter is just for looks");
-  __ store_heap_oop(dst, val,
-                    NOT_LP64(rdx) LP64_ONLY(rscratch2),
-                    NOT_LP64(rbx) LP64_ONLY(r9),
-                    NOT_LP64(rsi) LP64_ONLY(r8), decorators);
+  __ store_heap_oop(dst, val, rscratch2, r9, r8, decorators);
 }
 
 static void do_oop_load(InterpreterMacroAssembler* _masm,
@@ -285,10 +270,6 @@ void TemplateTable::lconst(int value) {
   } else {
     __ movl(rax, value);
   }
-#ifndef _LP64
-  assert(value >= 0, "check this code");
-  __ xorptr(rdx, rdx);
-#endif
 }
 
 
@@ -312,15 +293,7 @@ void TemplateTable::fconst(int value) {
       break;
     }
   } else {
-#ifdef _LP64
     ShouldNotReachHere();
-#else
-           if (value == 0) { __ fldz();
-    } else if (value == 1) { __ fld1();
-    } else if (value == 2) { __ fld1(); __ fld1(); __ faddp(); // should do a better solution here
-    } else                 { ShouldNotReachHere();
-    }
-#endif // _LP64
   }
 }
 
@@ -340,14 +313,7 @@ void TemplateTable::dconst(int value) {
       break;
     }
   } else {
-#ifdef _LP64
     ShouldNotReachHere();
-#else
-           if (value == 0) { __ fldz();
-    } else if (value == 1) { __ fld1();
-    } else                 { ShouldNotReachHere();
-    }
-#endif
   }
 }
 
@@ -365,7 +331,7 @@ void TemplateTable::sipush() {
 
 void TemplateTable::ldc(LdcType type) {
   transition(vtos, vtos);
-  Register rarg = NOT_LP64(rcx) LP64_ONLY(c_rarg1);
+  Register rarg = c_rarg1;
   Label call_ldc, notFloat, notClass, notInt, Done;
 
   if (is_ldc_wide(type)) {
@@ -433,7 +399,7 @@ void TemplateTable::fast_aldc(LdcType type) {
 
   Register result = rax;
   Register tmp = rdx;
-  Register rarg = NOT_LP64(rcx) LP64_ONLY(c_rarg1);
+  Register rarg = c_rarg1;
   int index_size = is_ldc_wide(type) ? sizeof(u2) : sizeof(u1);
 
   Label resolved;
@@ -496,7 +462,6 @@ void TemplateTable::ldc2_w() {
 
   // ltos
   __ movptr(rax, Address(rcx, rbx, Address::times_ptr, base_offset + 0 * wordSize));
-  NOT_LP64(__ movptr(rdx, Address(rcx, rbx, Address::times_ptr, base_offset + 1 * wordSize)));
   __ push(ltos);
   __ jmp(Done);
 
@@ -510,17 +475,10 @@ void TemplateTable::condy_helper(Label& Done) {
   const Register obj = rax;
   const Register off = rbx;
   const Register flags = rcx;
-  const Register rarg = NOT_LP64(rcx) LP64_ONLY(c_rarg1);
+  const Register rarg = c_rarg1;
   __ movl(rarg, (int)bytecode());
   call_VM(obj, CAST_FROM_FN_PTR(address, InterpreterRuntime::resolve_ldc), rarg);
-#ifndef _LP64
-  // borrow rdi from locals
-  __ get_thread(rdi);
-  __ get_vm_result_2(flags, rdi);
-  __ restore_locals();
-#else
   __ get_vm_result_2(flags, r15_thread);
-#endif
   // VMr = obj = base address to find primitive value to push
   // VMr2 = flags = (tos, off) using format of CPCE::_flags
   __ movl(off, flags);
@@ -595,7 +553,6 @@ void TemplateTable::condy_helper(Label& Done) {
       __ jccb(Assembler::notEqual, notLong);
       // ltos
       // Loading high word first because movptr clobbers rax
-      NOT_LP64(__ movptr(rdx, field.plus_disp(4)));
       __ movptr(rax, field);
       __ push(ltos);
       __ jmp(Done);
@@ -636,8 +593,8 @@ void TemplateTable::iload_internal(RewriteControl rc) {
   transition(vtos, itos);
   if (RewriteFrequentPairs && rc == may_rewrite) {
     Label rewrite, done;
-    const Register bc = LP64_ONLY(c_rarg3) NOT_LP64(rcx);
-    LP64_ONLY(assert(rbx != bc, "register damaged"));
+    const Register bc = c_rarg3;
+    assert(rbx != bc, "register damaged");
 
     // get next byte
     __ load_unsigned_byte(rbx,
@@ -693,7 +650,6 @@ void TemplateTable::lload() {
   transition(vtos, ltos);
   locals_index(rbx);
   __ movptr(rax, laddress(rbx));
-  NOT_LP64(__ movl(rdx, haddress(rbx)));
 }
 
 void TemplateTable::fload() {
@@ -731,7 +687,6 @@ void TemplateTable::wide_lload() {
   transition(vtos, ltos);
   locals_index_wide(rbx);
   __ movptr(rax, laddress(rbx));
-  NOT_LP64(__ movl(rdx, haddress(rbx)));
 }
 
 void TemplateTable::wide_fload() {
@@ -772,7 +727,7 @@ void TemplateTable::index_check_without_pop(Register array, Register index) {
   Label skip;
   __ jccb(Assembler::below, skip);
   // Pass array to create more detailed exceptions.
-  __ mov(NOT_LP64(rax) LP64_ONLY(c_rarg1), array);
+  __ mov(c_rarg1, array);
   __ jump(RuntimeAddress(Interpreter::_throw_ArrayIndexOutOfBoundsException_entry));
   __ bind(skip);
 }
@@ -793,7 +748,6 @@ void TemplateTable::laload() {
   // rax: index
   // rdx: array
   index_check(rdx, rax); // kills rbx
-  NOT_LP64(__ mov(rbx, rax));
   // rbx,: index
   __ access_load_at(T_LONG, IN_HEAP | IS_ARRAY, noreg /* ltos */,
                     Address(rdx, rbx, Address::times_8,
@@ -894,7 +848,6 @@ void TemplateTable::iload(int n) {
 void TemplateTable::lload(int n) {
   transition(vtos, ltos);
   __ movptr(rax, laddress(n));
-  NOT_LP64(__ movptr(rdx, haddress(n)));
 }
 
 void TemplateTable::fload(int n) {
@@ -946,8 +899,8 @@ void TemplateTable::aload_0_internal(RewriteControl rc) {
   if (RewriteFrequentPairs && rc == may_rewrite) {
     Label rewrite, done;
 
-    const Register bc = LP64_ONLY(c_rarg3) NOT_LP64(rcx);
-    LP64_ONLY(assert(rbx != bc, "register damaged"));
+    const Register bc = c_rarg3;
+    assert(rbx != bc, "register damaged");
 
     // get next byte
     __ load_unsigned_byte(rbx, at_bcp(Bytecodes::length_for(Bytecodes::_aload_0)));
@@ -1001,7 +954,6 @@ void TemplateTable::lstore() {
   transition(ltos, vtos);
   locals_index(rbx);
   __ movptr(laddress(rbx), rax);
-  NOT_LP64(__ movptr(haddress(rbx), rdx));
 }
 
 void TemplateTable::fstore() {
@@ -1032,33 +984,23 @@ void TemplateTable::wide_istore() {
 
 void TemplateTable::wide_lstore() {
   transition(vtos, vtos);
-  NOT_LP64(__ pop_l(rax, rdx));
-  LP64_ONLY(__ pop_l());
+  __ pop_l();
   locals_index_wide(rbx);
   __ movptr(laddress(rbx), rax);
-  NOT_LP64(__ movl(haddress(rbx), rdx));
 }
 
 void TemplateTable::wide_fstore() {
-#ifdef _LP64
   transition(vtos, vtos);
   __ pop_f(xmm0);
   locals_index_wide(rbx);
   __ movflt(faddress(rbx), xmm0);
-#else
-  wide_istore();
-#endif
 }
 
 void TemplateTable::wide_dstore() {
-#ifdef _LP64
   transition(vtos, vtos);
   __ pop_d(xmm0);
   locals_index_wide(rbx);
   __ movdbl(daddress(rbx), xmm0);
-#else
-  wide_lstore();
-#endif
 }
 
 void TemplateTable::wide_astore() {
@@ -1224,7 +1166,6 @@ void TemplateTable::istore(int n) {
 void TemplateTable::lstore(int n) {
   transition(ltos, vtos);
   __ movptr(laddress(n), rax);
-  NOT_LP64(__ movptr(haddress(n), rdx));
 }
 
 void TemplateTable::fstore(int n) {
@@ -1363,7 +1304,6 @@ void TemplateTable::iop2(Operation op) {
 
 void TemplateTable::lop2(Operation op) {
   transition(ltos, ltos);
-#ifdef _LP64
   switch (op) {
   case add  :                    __ pop_l(rdx); __ addptr(rax, rdx); break;
   case sub  : __ mov(rdx, rax);  __ pop_l(rax); __ subptr(rax, rdx); break;
@@ -1372,18 +1312,6 @@ void TemplateTable::lop2(Operation op) {
   case _xor :                    __ pop_l(rdx); __ xorptr(rax, rdx); break;
   default   : ShouldNotReachHere();
   }
-#else
-  __ pop_l(rbx, rcx);
-  switch (op) {
-    case add  : __ addl(rax, rbx); __ adcl(rdx, rcx); break;
-    case sub  : __ subl(rbx, rax); __ sbbl(rcx, rdx);
-                __ mov (rax, rbx); __ mov (rdx, rcx); break;
-    case _and : __ andl(rax, rbx); __ andl(rdx, rcx); break;
-    case _or  : __ orl (rax, rbx); __ orl (rdx, rcx); break;
-    case _xor : __ xorl(rax, rbx); __ xorl(rdx, rcx); break;
-    default   : ShouldNotReachHere();
-  }
-#endif
 }
 
 void TemplateTable::idiv() {
@@ -1411,21 +1339,12 @@ void TemplateTable::irem() {
 
 void TemplateTable::lmul() {
   transition(ltos, ltos);
-#ifdef _LP64
   __ pop_l(rdx);
   __ imulq(rax, rdx);
-#else
-  __ pop_l(rbx, rcx);
-  __ push(rcx); __ push(rbx);
-  __ push(rdx); __ push(rax);
-  __ lmul(2 * wordSize, 0);
-  __ addptr(rsp, 4 * wordSize);  // take off temporaries
-#endif
 }
 
 void TemplateTable::ldiv() {
   transition(ltos, ltos);
-#ifdef _LP64
   __ mov(rcx, rax);
   __ pop_l(rax);
   // generate explicit div0 check
@@ -1437,22 +1356,10 @@ void TemplateTable::ldiv() {
   //       needed), which may speed up this implementation for the common case.
   //       (see also JVM spec., p.243 & p.271)
   __ corrected_idivq(rcx); // kills rbx
-#else
-  __ pop_l(rbx, rcx);
-  __ push(rcx); __ push(rbx);
-  __ push(rdx); __ push(rax);
-  // check if y = 0
-  __ orl(rax, rdx);
-  __ jump_cc(Assembler::zero,
-             RuntimeAddress(Interpreter::_throw_ArithmeticException_entry));
-  __ call_VM_leaf(CAST_FROM_FN_PTR(address, SharedRuntime::ldiv));
-  __ addptr(rsp, 4 * wordSize);  // take off temporaries
-#endif
 }
 
 void TemplateTable::lrem() {
   transition(ltos, ltos);
-#ifdef _LP64
   __ mov(rcx, rax);
   __ pop_l(rax);
   __ testq(rcx, rcx);
@@ -1464,56 +1371,27 @@ void TemplateTable::lrem() {
   //       (see also JVM spec., p.243 & p.271)
   __ corrected_idivq(rcx); // kills rbx
   __ mov(rax, rdx);
-#else
-  __ pop_l(rbx, rcx);
-  __ push(rcx); __ push(rbx);
-  __ push(rdx); __ push(rax);
-  // check if y = 0
-  __ orl(rax, rdx);
-  __ jump_cc(Assembler::zero,
-             RuntimeAddress(Interpreter::_throw_ArithmeticException_entry));
-  __ call_VM_leaf(CAST_FROM_FN_PTR(address, SharedRuntime::lrem));
-  __ addptr(rsp, 4 * wordSize);
-#endif
 }
 
 void TemplateTable::lshl() {
   transition(itos, ltos);
   __ movl(rcx, rax);                             // get shift count
-  #ifdef _LP64
   __ pop_l(rax);                                 // get shift value
   __ shlq(rax);
-#else
-  __ pop_l(rax, rdx);                            // get shift value
-  __ lshl(rdx, rax);
-#endif
 }
 
 void TemplateTable::lshr() {
-#ifdef _LP64
   transition(itos, ltos);
   __ movl(rcx, rax);                             // get shift count
   __ pop_l(rax);                                 // get shift value
   __ sarq(rax);
-#else
-  transition(itos, ltos);
-  __ mov(rcx, rax);                              // get shift count
-  __ pop_l(rax, rdx);                            // get shift value
-  __ lshr(rdx, rax, true);
-#endif
 }
 
 void TemplateTable::lushr() {
   transition(itos, ltos);
-#ifdef _LP64
   __ movl(rcx, rax);                             // get shift count
   __ pop_l(rax);                                 // get shift value
   __ shrq(rax);
-#else
-  __ mov(rcx, rax);                              // get shift count
-  __ pop_l(rax, rdx);                            // get shift value
-  __ lshr(rdx, rax);
-#endif
 }
 
 void TemplateTable::fop2(Operation op) {
@@ -1545,46 +1423,16 @@ void TemplateTable::fop2(Operation op) {
       // double fmod(double x, double y) in math.h. The documentation of fmod states:
       // "If x or y is a NaN, a NaN is returned." without specifying what type of NaN
       // (signalling or quiet) is returned.
-      //
-      // On x86_32 platforms the FPU is used to perform the modulo operation. The
-      // reason is that on 32-bit Windows the sign of modulo operations diverges from
-      // what is considered the standard (e.g., -0.0f % -3.14f is 0.0f (and not -0.0f).
-      // The fprem instruction used on x86_32 is functionally equivalent to
-      // SharedRuntime::frem in that it returns a NaN.
-#ifdef _LP64
       __ movflt(xmm1, xmm0);
       __ pop_f(xmm0);
       __ call_VM_leaf(CAST_FROM_FN_PTR(address, SharedRuntime::frem), 2);
-#else // !_LP64
-      __ push_f(xmm0);
-      __ pop_f();
-      __ fld_s(at_rsp());
-      __ fremr(rax);
-      __ f2ieee();
-      __ pop(rax);  // pop second operand off the stack
-      __ push_f();
-      __ pop_f(xmm0);
-#endif // _LP64
       break;
     default:
       ShouldNotReachHere();
       break;
     }
   } else {
-#ifdef _LP64
     ShouldNotReachHere();
-#else // !_LP64
-    switch (op) {
-    case add: __ fadd_s (at_rsp());                break;
-    case sub: __ fsubr_s(at_rsp());                break;
-    case mul: __ fmul_s (at_rsp());                break;
-    case div: __ fdivr_s(at_rsp());                break;
-    case rem: __ fld_s  (at_rsp()); __ fremr(rax); break;
-    default : ShouldNotReachHere();
-    }
-    __ f2ieee();
-    __ pop(rax);  // pop second operand off the stack
-#endif // _LP64
   }
 }
 
@@ -1612,61 +1460,18 @@ void TemplateTable::dop2(Operation op) {
       break;
     case rem:
       // Similar to fop2(), the modulo operation is performed using the
-      // SharedRuntime::drem method (on x86_64 platforms) or using the
-      // FPU (on x86_32 platforms) for the same reasons as mentioned in fop2().
-#ifdef _LP64
+      // SharedRuntime::drem method on x86_64 platforms for the same reasons
+      // as mentioned in fop2().
       __ movdbl(xmm1, xmm0);
       __ pop_d(xmm0);
       __ call_VM_leaf(CAST_FROM_FN_PTR(address, SharedRuntime::drem), 2);
-#else // !_LP64
-      __ push_d(xmm0);
-      __ pop_d();
-      __ fld_d(at_rsp());
-      __ fremr(rax);
-      __ d2ieee();
-      __ pop(rax);
-      __ pop(rdx);
-      __ push_d();
-      __ pop_d(xmm0);
-#endif // _LP64
       break;
     default:
       ShouldNotReachHere();
       break;
     }
   } else {
-#ifdef _LP64
     ShouldNotReachHere();
-#else // !_LP64
-    switch (op) {
-    case add: __ fadd_d (at_rsp());                break;
-    case sub: __ fsubr_d(at_rsp());                break;
-    case mul: {
-      // strict semantics
-      __ fld_x(ExternalAddress(StubRoutines::x86::addr_fpu_subnormal_bias1()));
-      __ fmulp();
-      __ fmul_d (at_rsp());
-      __ fld_x(ExternalAddress(StubRoutines::x86::addr_fpu_subnormal_bias2()));
-      __ fmulp();
-      break;
-    }
-    case div: {
-      // strict semantics
-      __ fld_x(ExternalAddress(StubRoutines::x86::addr_fpu_subnormal_bias1()));
-      __ fmul_d (at_rsp());
-      __ fdivrp();
-      __ fld_x(ExternalAddress(StubRoutines::x86::addr_fpu_subnormal_bias2()));
-      __ fmulp();
-      break;
-    }
-    case rem: __ fld_d  (at_rsp()); __ fremr(rax); break;
-    default : ShouldNotReachHere();
-    }
-    __ d2ieee();
-    // Pop double precision number from rsp.
-    __ pop(rax);
-    __ pop(rdx);
-#endif // _LP64
   }
 }
 
@@ -1677,8 +1482,7 @@ void TemplateTable::ineg() {
 
 void TemplateTable::lneg() {
   transition(ltos, ltos);
-  LP64_ONLY(__ negq(rax));
-  NOT_LP64(__ lneg(rdx, rax));
+  __ negq(rax);
 }
 
 // Note: 'double' and 'long long' have 32-bits alignment on x86.
@@ -1702,8 +1506,7 @@ void TemplateTable::fneg() {
     static jlong *float_signflip  = double_quadword(&float_signflip_pool[1],  CONST64(0x8000000080000000),  CONST64(0x8000000080000000));
     __ xorps(xmm0, ExternalAddress((address) float_signflip), rscratch1);
   } else {
-    LP64_ONLY(ShouldNotReachHere());
-    NOT_LP64(__ fchs());
+    ShouldNotReachHere();
   }
 }
 
@@ -1714,11 +1517,7 @@ void TemplateTable::dneg() {
       double_quadword(&double_signflip_pool[1], CONST64(0x8000000000000000), CONST64(0x8000000000000000));
     __ xorpd(xmm0, ExternalAddress((address) double_signflip), rscratch1);
   } else {
-#ifdef _LP64
     ShouldNotReachHere();
-#else
-    __ fchs();
-#endif
   }
 }
 
@@ -1741,7 +1540,6 @@ void TemplateTable::wide_iinc() {
 }
 
 void TemplateTable::convert() {
-#ifdef _LP64
   // Checking
 #ifdef ASSERT
   {
@@ -1869,203 +1667,10 @@ void TemplateTable::convert() {
   default:
     ShouldNotReachHere();
   }
-#else // !_LP64
-  // Checking
-#ifdef ASSERT
-  { TosState tos_in  = ilgl;
-    TosState tos_out = ilgl;
-    switch (bytecode()) {
-      case Bytecodes::_i2l: // fall through
-      case Bytecodes::_i2f: // fall through
-      case Bytecodes::_i2d: // fall through
-      case Bytecodes::_i2b: // fall through
-      case Bytecodes::_i2c: // fall through
-      case Bytecodes::_i2s: tos_in = itos; break;
-      case Bytecodes::_l2i: // fall through
-      case Bytecodes::_l2f: // fall through
-      case Bytecodes::_l2d: tos_in = ltos; break;
-      case Bytecodes::_f2i: // fall through
-      case Bytecodes::_f2l: // fall through
-      case Bytecodes::_f2d: tos_in = ftos; break;
-      case Bytecodes::_d2i: // fall through
-      case Bytecodes::_d2l: // fall through
-      case Bytecodes::_d2f: tos_in = dtos; break;
-      default             : ShouldNotReachHere();
-    }
-    switch (bytecode()) {
-      case Bytecodes::_l2i: // fall through
-      case Bytecodes::_f2i: // fall through
-      case Bytecodes::_d2i: // fall through
-      case Bytecodes::_i2b: // fall through
-      case Bytecodes::_i2c: // fall through
-      case Bytecodes::_i2s: tos_out = itos; break;
-      case Bytecodes::_i2l: // fall through
-      case Bytecodes::_f2l: // fall through
-      case Bytecodes::_d2l: tos_out = ltos; break;
-      case Bytecodes::_i2f: // fall through
-      case Bytecodes::_l2f: // fall through
-      case Bytecodes::_d2f: tos_out = ftos; break;
-      case Bytecodes::_i2d: // fall through
-      case Bytecodes::_l2d: // fall through
-      case Bytecodes::_f2d: tos_out = dtos; break;
-      default             : ShouldNotReachHere();
-    }
-    transition(tos_in, tos_out);
-  }
-#endif // ASSERT
-
-  // Conversion
-  // (Note: use push(rcx)/pop(rcx) for 1/2-word stack-ptr manipulation)
-  switch (bytecode()) {
-    case Bytecodes::_i2l:
-      __ extend_sign(rdx, rax);
-      break;
-    case Bytecodes::_i2f:
-      if (UseSSE >= 1) {
-        __ cvtsi2ssl(xmm0, rax);
-      } else {
-        __ push(rax);          // store int on tos
-        __ fild_s(at_rsp());   // load int to ST0
-        __ f2ieee();           // truncate to float size
-        __ pop(rcx);           // adjust rsp
-      }
-      break;
-    case Bytecodes::_i2d:
-      if (UseSSE >= 2) {
-        __ cvtsi2sdl(xmm0, rax);
-      } else {
-      __ push(rax);          // add one slot for d2ieee()
-      __ push(rax);          // store int on tos
-      __ fild_s(at_rsp());   // load int to ST0
-      __ d2ieee();           // truncate to double size
-      __ pop(rcx);           // adjust rsp
-      __ pop(rcx);
-      }
-      break;
-    case Bytecodes::_i2b:
-      __ shll(rax, 24);      // truncate upper 24 bits
-      __ sarl(rax, 24);      // and sign-extend byte
-      LP64_ONLY(__ movsbl(rax, rax));
-      break;
-    case Bytecodes::_i2c:
-      __ andl(rax, 0xFFFF);  // truncate upper 16 bits
-      LP64_ONLY(__ movzwl(rax, rax));
-      break;
-    case Bytecodes::_i2s:
-      __ shll(rax, 16);      // truncate upper 16 bits
-      __ sarl(rax, 16);      // and sign-extend short
-      LP64_ONLY(__ movswl(rax, rax));
-      break;
-    case Bytecodes::_l2i:
-      /* nothing to do */
-      break;
-    case Bytecodes::_l2f:
-      // On 64-bit platforms, the cvtsi2ssq instruction is used to convert
-      // 64-bit long values to floats. On 32-bit platforms it is not possible
-      // to use that instruction with 64-bit operands, therefore the FPU is
-      // used to perform the conversion.
-      __ push(rdx);          // store long on tos
-      __ push(rax);
-      __ fild_d(at_rsp());   // load long to ST0
-      __ f2ieee();           // truncate to float size
-      __ pop(rcx);           // adjust rsp
-      __ pop(rcx);
-      if (UseSSE >= 1) {
-        __ push_f();
-        __ pop_f(xmm0);
-      }
-      break;
-    case Bytecodes::_l2d:
-      // On 32-bit platforms the FPU is used for conversion because on
-      // 32-bit platforms it is not not possible to use the cvtsi2sdq
-      // instruction with 64-bit operands.
-      __ push(rdx);          // store long on tos
-      __ push(rax);
-      __ fild_d(at_rsp());   // load long to ST0
-      __ d2ieee();           // truncate to double size
-      __ pop(rcx);           // adjust rsp
-      __ pop(rcx);
-      if (UseSSE >= 2) {
-        __ push_d();
-        __ pop_d(xmm0);
-      }
-      break;
-    case Bytecodes::_f2i:
-      // SharedRuntime::f2i does not differentiate between sNaNs and qNaNs
-      // as it returns 0 for any NaN.
-      if (UseSSE >= 1) {
-        __ push_f(xmm0);
-      } else {
-        __ push(rcx);          // reserve space for argument
-        __ fstp_s(at_rsp());   // pass float argument on stack
-      }
-      __ call_VM_leaf(CAST_FROM_FN_PTR(address, SharedRuntime::f2i), 1);
-      break;
-    case Bytecodes::_f2l:
-      // SharedRuntime::f2l does not differentiate between sNaNs and qNaNs
-      // as it returns 0 for any NaN.
-      if (UseSSE >= 1) {
-       __ push_f(xmm0);
-      } else {
-        __ push(rcx);          // reserve space for argument
-        __ fstp_s(at_rsp());   // pass float argument on stack
-      }
-      __ call_VM_leaf(CAST_FROM_FN_PTR(address, SharedRuntime::f2l), 1);
-      break;
-    case Bytecodes::_f2d:
-      if (UseSSE < 1) {
-        /* nothing to do */
-      } else if (UseSSE == 1) {
-        __ push_f(xmm0);
-        __ pop_f();
-      } else { // UseSSE >= 2
-        __ cvtss2sd(xmm0, xmm0);
-      }
-      break;
-    case Bytecodes::_d2i:
-      if (UseSSE >= 2) {
-        __ push_d(xmm0);
-      } else {
-        __ push(rcx);          // reserve space for argument
-        __ push(rcx);
-        __ fstp_d(at_rsp());   // pass double argument on stack
-      }
-      __ call_VM_leaf(CAST_FROM_FN_PTR(address, SharedRuntime::d2i), 2);
-      break;
-    case Bytecodes::_d2l:
-      if (UseSSE >= 2) {
-        __ push_d(xmm0);
-      } else {
-        __ push(rcx);          // reserve space for argument
-        __ push(rcx);
-        __ fstp_d(at_rsp());   // pass double argument on stack
-      }
-      __ call_VM_leaf(CAST_FROM_FN_PTR(address, SharedRuntime::d2l), 2);
-      break;
-    case Bytecodes::_d2f:
-      if (UseSSE <= 1) {
-        __ push(rcx);          // reserve space for f2ieee()
-        __ f2ieee();           // truncate to float size
-        __ pop(rcx);           // adjust rsp
-        if (UseSSE == 1) {
-          // The cvtsd2ss instruction is not available if UseSSE==1, therefore
-          // the conversion is performed using the FPU in this case.
-          __ push_f();
-          __ pop_f(xmm0);
-        }
-      } else { // UseSSE >= 2
-        __ cvtsd2ss(xmm0, xmm0);
-      }
-      break;
-    default             :
-      ShouldNotReachHere();
-  }
-#endif // _LP64
 }
 
 void TemplateTable::lcmp() {
   transition(ltos, itos);
-#ifdef _LP64
   Label done;
   __ pop_l(rdx);
   __ cmpq(rdx, rax);
@@ -2074,13 +1679,6 @@ void TemplateTable::lcmp() {
   __ setb(Assembler::notEqual, rax);
   __ movzbl(rax, rax);
   __ bind(done);
-#else
-
-  // y = rdx:rax
-  __ pop_l(rbx, rcx);             // get x = rcx:rbx
-  __ lcmp2int(rcx, rbx, rdx, rax);// rcx := cmp(x, y)
-  __ mov(rax, rcx);
-#endif
 }
 
 void TemplateTable::float_cmp(bool is_float, int unordered_result) {
@@ -2112,18 +1710,7 @@ void TemplateTable::float_cmp(bool is_float, int unordered_result) {
     }
     __ bind(done);
   } else {
-#ifdef _LP64
     ShouldNotReachHere();
-#else // !_LP64
-    if (is_float) {
-      __ fld_s(at_rsp());
-    } else {
-      __ fld_d(at_rsp());
-      __ pop(rdx);
-    }
-    __ pop(rcx);
-    __ fcmp2int(rax, unordered_result < 0);
-#endif // _LP64
   }
 }
 
@@ -2148,7 +1735,7 @@ void TemplateTable::branch(bool is_jsr, bool is_wide) {
   if (!is_wide) {
     __ sarl(rdx, 16);
   }
-  LP64_ONLY(__ movl2ptr(rdx, rdx));
+  __ movl2ptr(rdx, rdx);
 
   // Handle all the JSR stuff here, then exit.
   // It's much shorter and cleaner than intermingling with the non-JSR
@@ -2267,19 +1854,16 @@ void TemplateTable::branch(bool is_jsr, bool is_wide) {
       // it will be preserved in rbx.
       __ mov(rbx, rax);
 
-      NOT_LP64(__ get_thread(rcx));
-
       call_VM(noreg, CAST_FROM_FN_PTR(address, SharedRuntime::OSR_migration_begin));
 
       // rax is OSR buffer, move it to expected parameter location
-      LP64_ONLY(__ mov(j_rarg0, rax));
-      NOT_LP64(__ mov(rcx, rax));
+      __ mov(j_rarg0, rax);
       // We use j_rarg definitions here so that registers don't conflict as parameter
       // registers change across platforms as we are in the midst of a calling
       // sequence to the OSR nmethod and we don't want collision. These are NOT parameters.
 
-      const Register retaddr   = LP64_ONLY(j_rarg2) NOT_LP64(rdi);
-      const Register sender_sp = LP64_ONLY(j_rarg1) NOT_LP64(rdx);
+      const Register retaddr   = j_rarg2;
+      const Register sender_sp = j_rarg1;
 
       // pop the interpreter frame
       __ movptr(sender_sp, Address(rbp, frame::interpreter_frame_sender_sp_offset * wordSize)); // get sender sp
@@ -2350,8 +1934,7 @@ void TemplateTable::if_acmp(Condition cc) {
 void TemplateTable::ret() {
   transition(vtos, vtos);
   locals_index(rbx);
-  LP64_ONLY(__ movslq(rbx, iaddress(rbx))); // get return bci, compute return bcp
-  NOT_LP64(__ movptr(rbx, iaddress(rbx)));
+  __ movslq(rbx, iaddress(rbx)); // get return bci, compute return bcp
   __ profile_ret(rbx, rcx);
   __ get_method(rax);
   __ movptr(rbcp, Address(rax, Method::const_offset()));
@@ -2395,7 +1978,7 @@ void TemplateTable::tableswitch() {
   // continue execution
   __ bind(continue_execution);
   __ bswapl(rdx);
-  LP64_ONLY(__ movl2ptr(rdx, rdx));
+  __ movl2ptr(rdx, rdx);
   __ load_unsigned_byte(rbx, Address(rbcp, rdx, Address::times_1));
   __ addptr(rbcp, rdx);
   __ dispatch_only(vtos, true);
@@ -2485,8 +2068,6 @@ void TemplateTable::fast_binaryswitch() {
   const Register temp  = rsi;
 
   // Find array start
-  NOT_LP64(__ save_bcp());
-
   __ lea(array, at_bcp(3 * BytesPerInt)); // btw: should be able to
                                           // get rid of this
                                           // instruction (change
@@ -2543,10 +2124,7 @@ void TemplateTable::fast_binaryswitch() {
   __ movl(j , Address(array, i, Address::times_8, BytesPerInt));
   __ profile_switch_case(i, key, array);
   __ bswapl(j);
-  LP64_ONLY(__ movslq(j, j));
-
-  NOT_LP64(__ restore_bcp());
-  NOT_LP64(__ restore_locals());                           // restore rdi
+  __ movslq(j, j);
 
   __ load_unsigned_byte(rbx, Address(rbcp, j, Address::times_1));
   __ addptr(rbcp, j);
@@ -2557,10 +2135,7 @@ void TemplateTable::fast_binaryswitch() {
   __ profile_switch_default(i);
   __ movl(j, Address(array, -2 * BytesPerInt));
   __ bswapl(j);
-  LP64_ONLY(__ movslq(j, j));
-
-  NOT_LP64(__ restore_bcp());
-  NOT_LP64(__ restore_locals());
+  __ movslq(j, j);
 
   __ load_unsigned_byte(rbx, Address(rbcp, j, Address::times_1));
   __ addptr(rbcp, j);
@@ -2575,7 +2150,7 @@ void TemplateTable::_return(TosState state) {
 
   if (_desc->bytecode() == Bytecodes::_return_register_finalizer) {
     assert(state == vtos, "only valid state");
-    Register robj = LP64_ONLY(c_rarg1) NOT_LP64(rax);
+    Register robj = c_rarg1;
     __ movptr(robj, aaddress(0));
     __ load_klass(rdi, robj, rscratch1);
     __ testb(Address(rdi, Klass::misc_flags_offset()), KlassFlags::_misc_has_finalizer);
@@ -2590,13 +2165,7 @@ void TemplateTable::_return(TosState state) {
   if (_desc->bytecode() != Bytecodes::_return_register_finalizer) {
     Label no_safepoint;
     NOT_PRODUCT(__ block_comment("Thread-local Safepoint poll"));
-#ifdef _LP64
     __ testb(Address(r15_thread, JavaThread::polling_word_offset()), SafepointMechanism::poll_bit());
-#else
-    const Register thread = rdi;
-    __ get_thread(thread);
-    __ testb(Address(thread, JavaThread::polling_word_offset()), SafepointMechanism::poll_bit());
-#endif
     __ jcc(Assembler::zero, no_safepoint);
     __ push(state);
     __ push_cont_fastpath();
@@ -2694,7 +2263,7 @@ void TemplateTable::resolve_cache_and_index_for_method(int byte_no,
   if (VM_Version::supports_fast_class_init_checks() && bytecode() == Bytecodes::_invokestatic) {
     const Register method = temp;
     const Register klass  = temp;
-    const Register thread = LP64_ONLY(r15_thread) NOT_LP64(noreg);
+    const Register thread = r15_thread;
     assert(thread != noreg, "x86_32 not supported");
 
     __ movptr(method, Address(cache, in_bytes(ResolvedMethodEntry::method_offset())));
@@ -2821,12 +2390,8 @@ void TemplateTable::load_invokedynamic_entry(Register method) {
   {
     const address table_addr = (address) Interpreter::invoke_return_entry_table_for(code);
     ExternalAddress table(table_addr);
-#ifdef _LP64
     __ lea(rscratch1, table);
     __ movptr(index, Address(rscratch1, index, Address::times_ptr));
-#else
-    __ movptr(index, ArrayAddress(table, Address(noreg, index, Address::times_ptr)));
-#endif // _LP64
   }
 
   // push return address
@@ -2979,13 +2544,13 @@ void TemplateTable::pop_and_check_object(Register r) {
 void TemplateTable::getfield_or_static(int byte_no, bool is_static, RewriteControl rc) {
   transition(vtos, vtos);
 
-  const Register obj   = LP64_ONLY(c_rarg3) NOT_LP64(rcx);
+  const Register obj   = c_rarg3;
   const Register cache = rcx;
   const Register index = rdx;
   const Register off   = rbx;
   const Register tos_state   = rax;
   const Register flags = rdx;
-  const Register bc    = LP64_ONLY(c_rarg3) NOT_LP64(rcx); // uses same reg as obj, so don't mix them
+  const Register bc    = c_rarg3; // uses same reg as obj, so don't mix them
 
   resolve_cache_and_index_for_field(byte_no, cache, index);
   jvmti_post_field_access(cache, index, is_static, false);
@@ -3081,7 +2646,7 @@ void TemplateTable::getfield_or_static(int byte_no, bool is_static, RewriteContr
   __ access_load_at(T_LONG, IN_HEAP | MO_RELAXED, noreg /* ltos */, field, noreg, noreg);
   __ push(ltos);
   // Rewrite bytecode to be faster
-  LP64_ONLY(if (!is_static && rc == may_rewrite) patch_bytecode(Bytecodes::_fast_lgetfield, bc, rbx));
+  if (!is_static && rc == may_rewrite) patch_bytecode(Bytecodes::_fast_lgetfield, bc, rbx);
   __ jmp(Done);
 
   __ bind(notLong);
@@ -3141,9 +2706,9 @@ void TemplateTable::getstatic(int byte_no) {
 // The function may destroy various registers, just not the cache and index registers.
 void TemplateTable::jvmti_post_field_mod(Register cache, Register index, bool is_static) {
   // Cache is rcx and index is rdx
-  const Register entry = LP64_ONLY(c_rarg2) NOT_LP64(rax); // ResolvedFieldEntry
-  const Register obj = LP64_ONLY(c_rarg1) NOT_LP64(rbx);   // Object pointer
-  const Register value = LP64_ONLY(c_rarg3) NOT_LP64(rcx); // JValue object
+  const Register entry = c_rarg2; // ResolvedFieldEntry
+  const Register obj = c_rarg1;   // Object pointer
+  const Register value = c_rarg3; // JValue object
 
   if (JvmtiExport::can_post_field_modification()) {
     // Check to see if a field modification watch has been set before
@@ -3165,11 +2730,7 @@ void TemplateTable::jvmti_post_field_mod(Register cache, Register index, bool is
       // the object.  We don't know the size of the value, though; it
       // could be one or two words depending on its type. As a result,
       // we must find the type to determine where the object is.
-#ifndef _LP64
-      Label two_word, valsize_known;
-#endif
       __ load_unsigned_byte(value, Address(entry, in_bytes(ResolvedFieldEntry::type_offset())));
-#ifdef _LP64
       __ movptr(obj, at_tos_p1());  // initially assume a one word jvalue
       __ cmpl(value, ltos);
       __ cmovptr(Assembler::equal,
@@ -3177,22 +2738,6 @@ void TemplateTable::jvmti_post_field_mod(Register cache, Register index, bool is
       __ cmpl(value, dtos);
       __ cmovptr(Assembler::equal,
                  obj, at_tos_p2()); // dtos (two word jvalue)
-#else
-      __ mov(obj, rsp);
-      __ cmpl(value, ltos);
-      __ jccb(Assembler::equal, two_word);
-      __ cmpl(value, dtos);
-      __ jccb(Assembler::equal, two_word);
-      __ addptr(obj, Interpreter::expr_offset_in_bytes(1)); // one word jvalue (not ltos, dtos)
-      __ jmpb(valsize_known);
-
-      __ bind(two_word);
-      __ addptr(obj, Interpreter::expr_offset_in_bytes(2)); // two words jvalue
-
-      __ bind(valsize_known);
-      // setup object pointer
-      __ movptr(obj, Address(obj, 0));
-#endif
     }
 
     // object (tos)
@@ -3251,13 +2796,12 @@ void TemplateTable::putfield_or_static_helper(int byte_no, bool is_static, Rewri
 
   // field addresses
   const Address field(obj, off, Address::times_1, 0*wordSize);
-  NOT_LP64( const Address hi(obj, off, Address::times_1, 1*wordSize);)
 
   Label notByte, notBool, notInt, notShort, notChar,
         notLong, notFloat, notObj;
   Label Done;
 
-  const Register bc    = LP64_ONLY(c_rarg3) NOT_LP64(rcx);
+  const Register bc    = c_rarg3;
 
   // Test TOS state
   __ testl(tos_state, tos_state);
@@ -3360,11 +2904,9 @@ void TemplateTable::putfield_or_static_helper(int byte_no, bool is_static, Rewri
     if (!is_static) pop_and_check_object(obj);
     // MO_RELAXED: generate atomic store for the case of volatile field (important for x86_32)
     __ access_store_at(T_LONG, IN_HEAP | MO_RELAXED, field, noreg /* ltos*/, noreg, noreg, noreg);
-#ifdef _LP64
     if (!is_static && rc == may_rewrite) {
       patch_bytecode(Bytecodes::_fast_lputfield, bc, rbx, true, byte_no);
     }
-#endif // _LP64
     __ jmp(Done);
   }
 
@@ -3425,7 +2967,7 @@ void TemplateTable::putstatic(int byte_no) {
 
 void TemplateTable::jvmti_post_fast_field_mod() {
 
-  const Register scratch = LP64_ONLY(c_rarg3) NOT_LP64(rcx);
+  const Register scratch = c_rarg3;
 
   if (JvmtiExport::can_post_field_modification()) {
     // Check to see if a field modification watch has been set before
@@ -3456,14 +2998,12 @@ void TemplateTable::jvmti_post_fast_field_mod() {
     }
     __ mov(scratch, rsp);             // points to jvalue on the stack
     // access constant pool cache entry
-    LP64_ONLY(__ load_field_entry(c_rarg2, rax));
-    NOT_LP64(__ load_field_entry(rax, rdx));
+    __ load_field_entry(c_rarg2, rax);
     __ verify_oop(rbx);
     // rbx: object pointer copied above
     // c_rarg2: cache entry pointer
     // c_rarg3: jvalue object on the stack
-    LP64_ONLY(__ call_VM(noreg, CAST_FROM_FN_PTR(address, InterpreterRuntime::post_field_modification), rbx, c_rarg2, c_rarg3));
-    NOT_LP64(__ call_VM(noreg, CAST_FROM_FN_PTR(address, InterpreterRuntime::post_field_modification), rbx, rax, rcx));
+    __ call_VM(noreg, CAST_FROM_FN_PTR(address, InterpreterRuntime::post_field_modification), rbx, c_rarg2, c_rarg3);
 
     switch (bytecode()) {             // restore tos values
     case Bytecodes::_fast_aputfield: __ pop_ptr(rax); break;
@@ -3526,11 +3066,7 @@ void TemplateTable::fast_storefield_helper(Address field, Register rax) {
     do_oop_store(_masm, field, rax);
     break;
   case Bytecodes::_fast_lputfield:
-#ifdef _LP64
     __ access_store_at(T_LONG, IN_HEAP, field, noreg /* ltos */, noreg, noreg, noreg);
-#else
-  __ stop("should not be rewritten");
-#endif
     break;
   case Bytecodes::_fast_iputfield:
     __ access_store_at(T_INT, IN_HEAP, field, rax, noreg, noreg, noreg);
@@ -3570,15 +3106,13 @@ void TemplateTable::fast_accessfield(TosState state) {
     __ testl(rcx, rcx);
     __ jcc(Assembler::zero, L1);
     // access constant pool cache entry
-    LP64_ONLY(__ load_field_entry(c_rarg2, rcx));
-    NOT_LP64(__ load_field_entry(rcx, rdx));
+    __ load_field_entry(c_rarg2, rcx);
     __ verify_oop(rax);
     __ push_ptr(rax);  // save object pointer before call_VM() clobbers it
-    LP64_ONLY(__ mov(c_rarg1, rax));
+    __ mov(c_rarg1, rax);
     // c_rarg1: object pointer copied above
     // c_rarg2: cache entry pointer
-    LP64_ONLY(__ call_VM(noreg, CAST_FROM_FN_PTR(address, InterpreterRuntime::post_field_access), c_rarg1, c_rarg2));
-    NOT_LP64(__ call_VM(noreg, CAST_FROM_FN_PTR(address, InterpreterRuntime::post_field_access), rax, rcx));
+    __ call_VM(noreg, CAST_FROM_FN_PTR(address, InterpreterRuntime::post_field_access), c_rarg1, c_rarg2);
     __ pop_ptr(rax); // restore object pointer
     __ bind(L1);
   }
@@ -3599,11 +3133,7 @@ void TemplateTable::fast_accessfield(TosState state) {
     __ verify_oop(rax);
     break;
   case Bytecodes::_fast_lgetfield:
-#ifdef _LP64
     __ access_load_at(T_LONG, IN_HEAP, noreg /* ltos */, field, noreg, noreg);
-#else
-  __ stop("should not be rewritten");
-#endif
     break;
   case Bytecodes::_fast_igetfield:
     __ access_load_at(T_INT, IN_HEAP, rax, field, noreg, noreg);
@@ -3708,12 +3238,8 @@ void TemplateTable::prepare_invoke(Register cache, Register recv, Register flags
   {
     const address table_addr = (address) Interpreter::invoke_return_entry_table_for(code);
     ExternalAddress table(table_addr);
-#ifdef _LP64
     __ lea(rscratch1, table);
     __ movptr(flags, Address(rscratch1, flags, Address::times_ptr));
-#else
-    __ movptr(flags, ArrayAddress(table, Address(noreg, flags, Address::times_ptr)));
-#endif // _LP64
   }
 
   // push return address
@@ -3945,15 +3471,10 @@ void TemplateTable::invokeinterface(int byte_no) {
   __ restore_bcp();      // rbcp must be correct for exception handler   (was destroyed)
   __ restore_locals();   // make sure locals pointer is correct as well (was destroyed)
   // Pass arguments for generating a verbose error message.
-#ifdef _LP64
   recvKlass = c_rarg1;
   Register method    = c_rarg2;
   if (recvKlass != rdx) { __ movq(recvKlass, rdx); }
   if (method != rcx)    { __ movq(method, rcx);    }
-#else
-  recvKlass = rdx;
-  Register method    = rcx;
-#endif
   __ call_VM(noreg, CAST_FROM_FN_PTR(address, InterpreterRuntime::throw_AbstractMethodErrorVerbose),
              recvKlass, method);
   // The call_VM checks for exception, so we should never return here.
@@ -3965,7 +3486,9 @@ void TemplateTable::invokeinterface(int byte_no) {
   __ restore_bcp();      // rbcp must be correct for exception handler   (was destroyed)
   __ restore_locals();   // make sure locals pointer is correct as well (was destroyed)
   // Pass arguments for generating a verbose error message.
-  LP64_ONLY( if (recvKlass != rdx) { __ movq(recvKlass, rdx); } )
+  if (recvKlass != rdx) {
+    __ movq(recvKlass, rdx);
+  }
   __ call_VM(noreg, CAST_FROM_FN_PTR(address, InterpreterRuntime::throw_IncompatibleClassChangeErrorVerbose),
              recvKlass, rax);
   // the call_VM checks for exception, so we should never return here.
@@ -4048,13 +3571,8 @@ void TemplateTable::_new() {
 
   // make sure klass is initialized
   // init_state needs acquire, but x86 is TSO, and so we are already good.
-#ifdef _LP64
   assert(VM_Version::supports_fast_class_init_checks(), "must support fast class initialization checks");
   __ clinit_barrier(rcx, r15_thread, nullptr /*L_fast_path*/, &slow_case);
-#else
-  __ cmpb(Address(rcx, InstanceKlass::init_state_offset()), InstanceKlass::fully_initialized);
-  __ jcc(Assembler::notEqual, slow_case);
-#endif
 
   // get instance_size in InstanceKlass (scaled to a count of bytes)
   __ movl(rdx, Address(rcx, Klass::layout_helper_offset()));
@@ -4071,11 +3589,8 @@ void TemplateTable::_new() {
   //
   //  Go to slow path.
 
-  const Register thread = LP64_ONLY(r15_thread) NOT_LP64(rcx);
-
   if (UseTLAB) {
-    NOT_LP64(__ get_thread(thread);)
-    __ tlab_allocate(thread, rax, rdx, 0, rcx, rbx, slow_case);
+    __ tlab_allocate(r15_thread, rax, rdx, 0, rcx, rbx, slow_case);
     if (ZeroTLAB) {
       // the fields have been already cleared
       __ jmp(initialize_header);
@@ -4113,7 +3628,6 @@ void TemplateTable::_new() {
     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);
     }
@@ -4128,10 +3642,8 @@ void TemplateTable::_new() {
       __ 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
-#endif
       __ store_klass(rax, rcx, rscratch1);  // klass
     }
 
@@ -4151,12 +3663,9 @@ void TemplateTable::_new() {
   __ pop(rcx);   // restore stack pointer to what it was when we came in.
   __ bind(slow_case_no_pop);
 
-  Register rarg1 = LP64_ONLY(c_rarg1) NOT_LP64(rax);
-  Register rarg2 = LP64_ONLY(c_rarg2) NOT_LP64(rdx);
-
-  __ get_constant_pool(rarg1);
-  __ get_unsigned_2_byte_index_at_bcp(rarg2, 1);
-  call_VM(rax, CAST_FROM_FN_PTR(address, InterpreterRuntime::_new), rarg1, rarg2);
+  __ get_constant_pool(c_rarg1);
+  __ get_unsigned_2_byte_index_at_bcp(c_rarg2, 1);
+  call_VM(rax, CAST_FROM_FN_PTR(address, InterpreterRuntime::_new), c_rarg1, c_rarg2);
    __ verify_oop(rax);
 
   // continue
@@ -4165,22 +3674,18 @@ void TemplateTable::_new() {
 
 void TemplateTable::newarray() {
   transition(itos, atos);
-  Register rarg1 = LP64_ONLY(c_rarg1) NOT_LP64(rdx);
-  __ load_unsigned_byte(rarg1, at_bcp(1));
+  __ load_unsigned_byte(c_rarg1, at_bcp(1));
   call_VM(rax, CAST_FROM_FN_PTR(address, InterpreterRuntime::newarray),
-          rarg1, rax);
+          c_rarg1, rax);
 }
 
 void TemplateTable::anewarray() {
   transition(itos, atos);
 
-  Register rarg1 = LP64_ONLY(c_rarg1) NOT_LP64(rcx);
-  Register rarg2 = LP64_ONLY(c_rarg2) NOT_LP64(rdx);
-
-  __ get_unsigned_2_byte_index_at_bcp(rarg2, 1);
-  __ get_constant_pool(rarg1);
+  __ get_unsigned_2_byte_index_at_bcp(c_rarg2, 1);
+  __ get_constant_pool(c_rarg1);
   call_VM(rax, CAST_FROM_FN_PTR(address, InterpreterRuntime::anewarray),
-          rarg1, rarg2, rax);
+          c_rarg1, c_rarg2, rax);
 }
 
 void TemplateTable::arraylength() {
@@ -4207,14 +3712,7 @@ void TemplateTable::checkcast() {
   call_VM(noreg, CAST_FROM_FN_PTR(address, InterpreterRuntime::quicken_io_cc));
 
   // vm_result_2 has metadata result
-#ifndef _LP64
-  // borrow rdi from locals
-  __ get_thread(rdi);
-  __ get_vm_result_2(rax, rdi);
-  __ restore_locals();
-#else
   __ get_vm_result_2(rax, r15_thread);
-#endif
 
   __ pop_ptr(rdx); // restore receiver
   __ jmpb(resolved);
@@ -4271,14 +3769,7 @@ void TemplateTable::instanceof() {
   call_VM(noreg, CAST_FROM_FN_PTR(address, InterpreterRuntime::quicken_io_cc));
   // vm_result_2 has metadata result
 
-#ifndef _LP64
-  // borrow rdi from locals
-  __ get_thread(rdi);
-  __ get_vm_result_2(rax, rdi);
-  __ restore_locals();
-#else
   __ get_vm_result_2(rax, r15_thread);
-#endif
 
   __ pop_ptr(rdx); // restore receiver
   __ verify_oop(rdx);
@@ -4326,21 +3817,19 @@ void TemplateTable::_breakpoint() {
 
   transition(vtos, vtos);
 
-  Register rarg = LP64_ONLY(c_rarg1) NOT_LP64(rcx);
-
   // get the unpatched byte code
-  __ get_method(rarg);
+  __ get_method(c_rarg1);
   __ call_VM(noreg,
              CAST_FROM_FN_PTR(address,
                               InterpreterRuntime::get_original_bytecode_at),
-             rarg, rbcp);
+             c_rarg1, rbcp);
   __ mov(rbx, rax);  // why?
 
   // post the breakpoint event
-  __ get_method(rarg);
+  __ get_method(c_rarg1);
   __ call_VM(noreg,
              CAST_FROM_FN_PTR(address, InterpreterRuntime::_breakpoint),
-             rarg, rbcp);
+             c_rarg1, rbcp);
 
   // complete the execution of original bytecode
   __ dispatch_only_normal(vtos);
@@ -4386,9 +3875,9 @@ void TemplateTable::monitorenter() {
 
   Label allocated;
 
-  Register rtop = LP64_ONLY(c_rarg3) NOT_LP64(rcx);
-  Register rbot = LP64_ONLY(c_rarg2) NOT_LP64(rbx);
-  Register rmon = LP64_ONLY(c_rarg1) NOT_LP64(rdx);
+  Register rtop = c_rarg3;
+  Register rbot = c_rarg2;
+  Register rmon = c_rarg1;
 
   // initialize entry pointer
   __ xorl(rmon, rmon); // points to free slot or null
@@ -4484,8 +3973,8 @@ void TemplateTable::monitorexit() {
         rbp, frame::interpreter_frame_initial_sp_offset * wordSize);
   const int entry_size = frame::interpreter_frame_monitor_size_in_bytes();
 
-  Register rtop = LP64_ONLY(c_rarg1) NOT_LP64(rdx);
-  Register rbot = LP64_ONLY(c_rarg2) NOT_LP64(rbx);
+  Register rtop = c_rarg1;
+  Register rbot = c_rarg2;
 
   Label found;
 
@@ -4539,13 +4028,12 @@ void TemplateTable::wide() {
 void TemplateTable::multianewarray() {
   transition(vtos, atos);
 
-  Register rarg = LP64_ONLY(c_rarg1) NOT_LP64(rax);
   __ load_unsigned_byte(rax, at_bcp(3)); // get number of dimensions
   // last dim is on top of stack; we want address of first one:
   // first_addr = last_addr + (ndims - 1) * stackElementSize - 1*wordsize
   // the latter wordSize to point to the beginning of the array.
-  __ lea(rarg, Address(rsp, rax, Interpreter::stackElementScale(), -wordSize));
-  call_VM(rax, CAST_FROM_FN_PTR(address, InterpreterRuntime::multianewarray), rarg);
+  __ lea(c_rarg1, Address(rsp, rax, Interpreter::stackElementScale(), -wordSize));
+  call_VM(rax, CAST_FROM_FN_PTR(address, InterpreterRuntime::multianewarray), c_rarg1);
   __ load_unsigned_byte(rbx, at_bcp(3));
   __ lea(rsp, Address(rsp, rbx, Interpreter::stackElementScale()));  // get rid of counts
 }
diff --git a/src/hotspot/share/interpreter/templateInterpreterGenerator.cpp b/src/hotspot/share/interpreter/templateInterpreterGenerator.cpp
index 128c3f86479..1d3be066941 100644
--- a/src/hotspot/share/interpreter/templateInterpreterGenerator.cpp
+++ b/src/hotspot/share/interpreter/templateInterpreterGenerator.cpp
@@ -371,7 +371,6 @@ void TemplateInterpreterGenerator::generate_and_dispatch(Template* t, TosState t
   if (PrintBytecodePairHistogram)                                histogram_bytecode_pair(t);
   if (TraceBytecodes)                                            trace_bytecode(t);
   if (StopInterpreterAt > 0)                                     stop_interpreter_at();
-  __ verify_FPU(1, t->tos_in());
 #endif // !PRODUCT
   int step = 0;
   if (!t->does_dispatch()) {

From 41f3eea9b2b7bd74d5f125dedfe107ab5b0bed26 Mon Sep 17 00:00:00 2001
From: Alexey Ivanov <aivanov@openjdk.org>
Date: Thu, 27 Mar 2025 12:05:17 +0000
Subject: [PATCH 522/587] 8352624: Add missing {@code} to
 PassFailJFrame.Builder.splitUI

Reviewed-by: serb, honkar
---
 test/jdk/java/awt/regtesthelpers/PassFailJFrame.java | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/test/jdk/java/awt/regtesthelpers/PassFailJFrame.java b/test/jdk/java/awt/regtesthelpers/PassFailJFrame.java
index 5b825bb4c37..f7d9cd8840d 100644
--- a/test/jdk/java/awt/regtesthelpers/PassFailJFrame.java
+++ b/test/jdk/java/awt/regtesthelpers/PassFailJFrame.java
@@ -1714,7 +1714,7 @@ public final class PassFailJFrame {
          *
          * @throws IllegalStateException if a {@code PanelCreator} is
          *              already set
-         * @throws IllegalArgumentException if {panelCreator} is {@code null}
+         * @throws IllegalArgumentException if {@code panelCreator} is {@code null}
          */
         public Builder splitUI(PanelCreator panelCreator) {
             return splitUIRight(panelCreator);
@@ -1731,7 +1731,7 @@ public final class PassFailJFrame {
          *
          * @throws IllegalStateException if a {@code PanelCreator} is
          *              already set
-         * @throws IllegalArgumentException if {panelCreator} is {@code null}
+         * @throws IllegalArgumentException if {@code panelCreator} is {@code null}
          */
         public Builder splitUIRight(PanelCreator panelCreator) {
             return splitUI(panelCreator, JSplitPane.HORIZONTAL_SPLIT);
@@ -1748,7 +1748,7 @@ public final class PassFailJFrame {
          *
          * @throws IllegalStateException if a {@code PanelCreator} is
          *              already set
-         * @throws IllegalArgumentException if {panelCreator} is {@code null}
+         * @throws IllegalArgumentException if {@code panelCreator} is {@code null}
          */
         public Builder splitUIBottom(PanelCreator panelCreator) {
             return splitUI(panelCreator, JSplitPane.VERTICAL_SPLIT);
@@ -1764,7 +1764,7 @@ public final class PassFailJFrame {
          *
          * @throws IllegalStateException if a {@code PanelCreator} is
          *              already set
-         * @throws IllegalArgumentException if {panelCreator} is {@code null}
+         * @throws IllegalArgumentException if {@code panelCreator} is {@code null}
          */
         private Builder splitUI(PanelCreator panelCreator,
                                 int splitUIOrientation) {

From 89e5c42d909344d75266a203d7e6b6bb1ad4aea6 Mon Sep 17 00:00:00 2001
From: Casper Norrbin <cnorrbin@openjdk.org>
Date: Thu, 27 Mar 2025 14:28:47 +0000
Subject: [PATCH 523/587] 8294954: Remove superfluous ResourceMarks when using
 LogStream

Reviewed-by: dholmes, jsjolen
---
 src/hotspot/cpu/aarch64/downcallLinker_aarch64.cpp           | 2 --
 src/hotspot/cpu/aarch64/upcallLinker_aarch64.cpp             | 2 --
 src/hotspot/cpu/ppc/downcallLinker_ppc.cpp                   | 2 --
 src/hotspot/cpu/ppc/upcallLinker_ppc.cpp                     | 2 --
 src/hotspot/cpu/riscv/downcallLinker_riscv.cpp               | 2 --
 src/hotspot/cpu/riscv/upcallLinker_riscv.cpp                 | 2 --
 src/hotspot/cpu/s390/downcallLinker_s390.cpp                 | 2 --
 src/hotspot/cpu/s390/upcallLinker_s390.cpp                   | 2 --
 src/hotspot/cpu/x86/downcallLinker_x86_64.cpp                | 2 --
 src/hotspot/cpu/x86/upcallLinker_x86_64.cpp                  | 2 --
 src/hotspot/share/classfile/modules.cpp                      | 2 +-
 src/hotspot/share/classfile/verifier.cpp                     | 2 --
 src/hotspot/share/gc/g1/g1AllocRegion.cpp                    | 1 -
 src/hotspot/share/gc/g1/g1GCPhaseTimes.cpp                   | 1 -
 src/hotspot/share/gc/g1/g1HeapVerifier.cpp                   | 1 -
 src/hotspot/share/gc/g1/g1RemSet.cpp                         | 2 --
 src/hotspot/share/gc/shared/collectedHeap.cpp                | 1 -
 src/hotspot/share/gc/shared/referenceProcessorPhaseTimes.cpp | 1 -
 src/hotspot/share/gc/shared/taskqueue.inline.hpp             | 1 -
 src/hotspot/share/memory/metaspace.cpp                       | 1 -
 src/hotspot/share/oops/compressedOops.cpp                    | 1 -
 src/hotspot/share/oops/generateOopMap.cpp                    | 1 -
 src/hotspot/share/opto/runtime.cpp                           | 1 -
 src/hotspot/share/runtime/java.cpp                           | 1 -
 src/hotspot/share/runtime/safepoint.cpp                      | 2 --
 src/hotspot/share/runtime/vm_version.cpp                     | 1 -
 26 files changed, 1 insertion(+), 39 deletions(-)

diff --git a/src/hotspot/cpu/aarch64/downcallLinker_aarch64.cpp b/src/hotspot/cpu/aarch64/downcallLinker_aarch64.cpp
index 7febbaa63bb..f30b5d7cf2c 100644
--- a/src/hotspot/cpu/aarch64/downcallLinker_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/downcallLinker_aarch64.cpp
@@ -77,7 +77,6 @@ RuntimeStub* DowncallLinker::make_downcall_stub(BasicType* signature,
 #ifndef PRODUCT
   LogTarget(Trace, foreign, downcall) lt;
   if (lt.is_enabled()) {
-    ResourceMark rm;
     LogStream ls(lt);
     stub->print_on(&ls);
   }
@@ -191,7 +190,6 @@ void DowncallLinker::StubGenerator::generate() {
 #ifndef PRODUCT
   LogTarget(Trace, foreign, downcall) lt;
   if (lt.is_enabled()) {
-    ResourceMark rm;
     LogStream ls(lt);
     arg_shuffle.print_on(&ls);
   }
diff --git a/src/hotspot/cpu/aarch64/upcallLinker_aarch64.cpp b/src/hotspot/cpu/aarch64/upcallLinker_aarch64.cpp
index ac597bea07d..7a0e5aaf3b4 100644
--- a/src/hotspot/cpu/aarch64/upcallLinker_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/upcallLinker_aarch64.cpp
@@ -172,7 +172,6 @@ address UpcallLinker::make_upcall_stub(jobject receiver, Symbol* signature,
 #ifndef PRODUCT
   LogTarget(Trace, foreign, upcall) lt;
   if (lt.is_enabled()) {
-    ResourceMark rm;
     LogStream ls(lt);
     arg_shuffle.print_on(&ls);
   }
@@ -334,7 +333,6 @@ address UpcallLinker::make_upcall_stub(jobject receiver, Symbol* signature,
 
 #ifndef PRODUCT
   if (lt.is_enabled()) {
-    ResourceMark rm;
     LogStream ls(lt);
     blob->print_on(&ls);
   }
diff --git a/src/hotspot/cpu/ppc/downcallLinker_ppc.cpp b/src/hotspot/cpu/ppc/downcallLinker_ppc.cpp
index ad8640453e6..f12d25ac611 100644
--- a/src/hotspot/cpu/ppc/downcallLinker_ppc.cpp
+++ b/src/hotspot/cpu/ppc/downcallLinker_ppc.cpp
@@ -77,7 +77,6 @@ RuntimeStub* DowncallLinker::make_downcall_stub(BasicType* signature,
 #ifndef PRODUCT
   LogTarget(Trace, foreign, downcall) lt;
   if (lt.is_enabled()) {
-    ResourceMark rm;
     LogStream ls(lt);
     stub->print_on(&ls);
   }
@@ -174,7 +173,6 @@ void DowncallLinker::StubGenerator::generate() {
 #ifndef PRODUCT
   LogTarget(Trace, foreign, downcall) lt;
   if (lt.is_enabled()) {
-    ResourceMark rm;
     LogStream ls(lt);
     arg_shuffle.print_on(&ls);
   }
diff --git a/src/hotspot/cpu/ppc/upcallLinker_ppc.cpp b/src/hotspot/cpu/ppc/upcallLinker_ppc.cpp
index 872eee3b98e..5c7b0067c3a 100644
--- a/src/hotspot/cpu/ppc/upcallLinker_ppc.cpp
+++ b/src/hotspot/cpu/ppc/upcallLinker_ppc.cpp
@@ -167,7 +167,6 @@ address UpcallLinker::make_upcall_stub(jobject receiver, Symbol* signature,
 #ifndef PRODUCT
   LogTarget(Trace, foreign, upcall) lt;
   if (lt.is_enabled()) {
-    ResourceMark rm;
     LogStream ls(lt);
     arg_shuffle.print_on(&ls);
   }
@@ -351,7 +350,6 @@ address UpcallLinker::make_upcall_stub(jobject receiver, Symbol* signature,
 
 #ifndef PRODUCT
   if (lt.is_enabled()) {
-    ResourceMark rm;
     LogStream ls(lt);
     blob->print_on(&ls);
   }
diff --git a/src/hotspot/cpu/riscv/downcallLinker_riscv.cpp b/src/hotspot/cpu/riscv/downcallLinker_riscv.cpp
index 1edb30a36ea..d1278c419a0 100644
--- a/src/hotspot/cpu/riscv/downcallLinker_riscv.cpp
+++ b/src/hotspot/cpu/riscv/downcallLinker_riscv.cpp
@@ -78,7 +78,6 @@ RuntimeStub* DowncallLinker::make_downcall_stub(BasicType* signature,
 #ifndef PRODUCT
   LogTarget(Trace, foreign, downcall) lt;
   if (lt.is_enabled()) {
-    ResourceMark rm;
     LogStream ls(lt);
     stub->print_on(&ls);
   }
@@ -185,7 +184,6 @@ void DowncallLinker::StubGenerator::generate() {
 #ifndef PRODUCT
   LogTarget(Trace, foreign, downcall) lt;
   if (lt.is_enabled()) {
-    ResourceMark rm;
     LogStream ls(lt);
     arg_shuffle.print_on(&ls);
   }
diff --git a/src/hotspot/cpu/riscv/upcallLinker_riscv.cpp b/src/hotspot/cpu/riscv/upcallLinker_riscv.cpp
index fa6fe60b71e..0fccce171bb 100644
--- a/src/hotspot/cpu/riscv/upcallLinker_riscv.cpp
+++ b/src/hotspot/cpu/riscv/upcallLinker_riscv.cpp
@@ -173,7 +173,6 @@ address UpcallLinker::make_upcall_stub(jobject receiver, Symbol* signature,
 #ifndef PRODUCT
   LogTarget(Trace, foreign, upcall) lt;
   if (lt.is_enabled()) {
-    ResourceMark rm;
     LogStream ls(lt);
     arg_shuffle.print_on(&ls);
   }
@@ -354,7 +353,6 @@ address UpcallLinker::make_upcall_stub(jobject receiver, Symbol* signature,
 
 #ifndef PRODUCT
   if (lt.is_enabled()) {
-    ResourceMark rm;
     LogStream ls(lt);
     blob->print_on(&ls);
   }
diff --git a/src/hotspot/cpu/s390/downcallLinker_s390.cpp b/src/hotspot/cpu/s390/downcallLinker_s390.cpp
index ad375fb20ce..ccd8002da37 100644
--- a/src/hotspot/cpu/s390/downcallLinker_s390.cpp
+++ b/src/hotspot/cpu/s390/downcallLinker_s390.cpp
@@ -79,7 +79,6 @@ RuntimeStub* DowncallLinker::make_downcall_stub(BasicType* signature,
 #ifndef PRODUCT
   LogTarget(Trace, foreign, downcall) lt;
   if (lt.is_enabled()) {
-    ResourceMark rm;
     LogStream ls(lt);
     stub->print_on(&ls);
   }
@@ -157,7 +156,6 @@ void DowncallLinker::StubGenerator::generate() {
 #ifndef PRODUCT
   LogTarget(Trace, foreign, downcall) lt;
   if (lt.is_enabled()) {
-    ResourceMark rm;
     LogStream ls(lt);
     arg_shuffle.print_on(&ls);
   }
diff --git a/src/hotspot/cpu/s390/upcallLinker_s390.cpp b/src/hotspot/cpu/s390/upcallLinker_s390.cpp
index ab8bf771812..23ac80ddf48 100644
--- a/src/hotspot/cpu/s390/upcallLinker_s390.cpp
+++ b/src/hotspot/cpu/s390/upcallLinker_s390.cpp
@@ -157,7 +157,6 @@ address UpcallLinker::make_upcall_stub(jobject receiver, Symbol* signature,
 #ifndef PRODUCT
   LogTarget(Trace, foreign, upcall) lt;
   if (lt.is_enabled()) {
-    ResourceMark rm;
     LogStream ls(lt);
     arg_shuffle.print_on(&ls);
   }
@@ -290,7 +289,6 @@ address UpcallLinker::make_upcall_stub(jobject receiver, Symbol* signature,
 
 #ifndef PRODUCT
   if (lt.is_enabled()) {
-    ResourceMark rm;
     LogStream ls(lt);
     blob->print_on(&ls);
   }
diff --git a/src/hotspot/cpu/x86/downcallLinker_x86_64.cpp b/src/hotspot/cpu/x86/downcallLinker_x86_64.cpp
index 7f531ca56b1..15c311ffd39 100644
--- a/src/hotspot/cpu/x86/downcallLinker_x86_64.cpp
+++ b/src/hotspot/cpu/x86/downcallLinker_x86_64.cpp
@@ -75,7 +75,6 @@ RuntimeStub* DowncallLinker::make_downcall_stub(BasicType* signature,
 #ifndef PRODUCT
   LogTarget(Trace, foreign, downcall) lt;
   if (lt.is_enabled()) {
-    ResourceMark rm;
     LogStream ls(lt);
     stub->print_on(&ls);
   }
@@ -192,7 +191,6 @@ void DowncallLinker::StubGenerator::generate() {
 #ifndef PRODUCT
   LogTarget(Trace, foreign, downcall) lt;
   if (lt.is_enabled()) {
-    ResourceMark rm;
     LogStream ls(lt);
     arg_shuffle.print_on(&ls);
   }
diff --git a/src/hotspot/cpu/x86/upcallLinker_x86_64.cpp b/src/hotspot/cpu/x86/upcallLinker_x86_64.cpp
index 08884c99f9b..edc83fa7c56 100644
--- a/src/hotspot/cpu/x86/upcallLinker_x86_64.cpp
+++ b/src/hotspot/cpu/x86/upcallLinker_x86_64.cpp
@@ -220,7 +220,6 @@ address UpcallLinker::make_upcall_stub(jobject receiver, Symbol* signature,
 #ifndef PRODUCT
   LogTarget(Trace, foreign, upcall) lt;
   if (lt.is_enabled()) {
-    ResourceMark rm;
     LogStream ls(lt);
     arg_shuffle.print_on(&ls);
   }
@@ -387,7 +386,6 @@ address UpcallLinker::make_upcall_stub(jobject receiver, Symbol* signature,
 
 #ifndef PRODUCT
   if (lt.is_enabled()) {
-    ResourceMark rm;
     LogStream ls(lt);
     blob->print_on(&ls);
   }
diff --git a/src/hotspot/share/classfile/modules.cpp b/src/hotspot/share/classfile/modules.cpp
index 950ca699a8e..e20dea95579 100644
--- a/src/hotspot/share/classfile/modules.cpp
+++ b/src/hotspot/share/classfile/modules.cpp
@@ -934,7 +934,6 @@ jobject Modules::get_module(jclass clazz, TRAPS) {
 
   LogTarget(Debug,module) lt;
   if (lt.is_enabled()) {
-    ResourceMark rm(THREAD);
     LogStream ls(lt);
     Klass* klass = java_lang_Class::as_Klass(mirror);
     oop module_name = java_lang_Module::name(module);
@@ -945,6 +944,7 @@ jobject Modules::get_module(jclass clazz, TRAPS) {
       ls.print("get_module(): Unnamed Module");
     }
     if (klass != nullptr) {
+      ResourceMark rm(THREAD);
       ls.print_cr(" for class %s", klass->external_name());
     } else {
       ls.print_cr(" for primitive class");
diff --git a/src/hotspot/share/classfile/verifier.cpp b/src/hotspot/share/classfile/verifier.cpp
index 4434b06c0b8..d8f9b8589ef 100644
--- a/src/hotspot/share/classfile/verifier.cpp
+++ b/src/hotspot/share/classfile/verifier.cpp
@@ -745,7 +745,6 @@ void ClassVerifier::verify_method(const methodHandle& m, TRAPS) {
 
   LogTarget(Debug, verification) lt;
   if (lt.is_enabled()) {
-    ResourceMark rm(THREAD);
     LogStream ls(lt);
     stackmap_table.print_on(&ls);
   }
@@ -788,7 +787,6 @@ void ClassVerifier::verify_method(const methodHandle& m, TRAPS) {
 
       LogTarget(Debug, verification) lt;
       if (lt.is_enabled()) {
-        ResourceMark rm(THREAD);
         LogStream ls(lt);
         current_frame.print_on(&ls);
         lt.print("offset = %d,  opcode = %s", bci,
diff --git a/src/hotspot/share/gc/g1/g1AllocRegion.cpp b/src/hotspot/share/gc/g1/g1AllocRegion.cpp
index 47d7e3a6bff..29907cbc051 100644
--- a/src/hotspot/share/gc/g1/g1AllocRegion.cpp
+++ b/src/hotspot/share/gc/g1/g1AllocRegion.cpp
@@ -205,7 +205,6 @@ void G1AllocRegion::trace(const char* str, size_t min_word_size, size_t desired_
   bool detailed_info = log.is_trace();
 
   if ((actual_word_size == 0 && result == nullptr) || detailed_info) {
-    ResourceMark rm;
     LogStream ls_trace(log.trace());
     LogStream ls_debug(log.debug());
     outputStream* out = detailed_info ? &ls_trace : &ls_debug;
diff --git a/src/hotspot/share/gc/g1/g1GCPhaseTimes.cpp b/src/hotspot/share/gc/g1/g1GCPhaseTimes.cpp
index 6d98dc220ff..ebe77b2551d 100644
--- a/src/hotspot/share/gc/g1/g1GCPhaseTimes.cpp
+++ b/src/hotspot/share/gc/g1/g1GCPhaseTimes.cpp
@@ -335,7 +335,6 @@ void G1GCPhaseTimes::debug_phase_merge_remset() const {
     return;
   }
 
-  ResourceMark rm;
   LogStream ls(lt);
 
   WorkerDataArray<double>* phase = _gc_par_phases[MergeRS];
diff --git a/src/hotspot/share/gc/g1/g1HeapVerifier.cpp b/src/hotspot/share/gc/g1/g1HeapVerifier.cpp
index 6bec1094579..4227a90960b 100644
--- a/src/hotspot/share/gc/g1/g1HeapVerifier.cpp
+++ b/src/hotspot/share/gc/g1/g1HeapVerifier.cpp
@@ -366,7 +366,6 @@ void G1HeapVerifier::verify(VerifyOption vo) {
     // help us track down what went wrong. This is why we call
     // print_extended_on() instead of print_on().
     Log(gc, verify) log;
-    ResourceMark rm;
     LogStream ls(log.error());
     _g1h->print_extended_on(&ls);
 
diff --git a/src/hotspot/share/gc/g1/g1RemSet.cpp b/src/hotspot/share/gc/g1/g1RemSet.cpp
index beb73e7355a..a25fce2d006 100644
--- a/src/hotspot/share/gc/g1/g1RemSet.cpp
+++ b/src/hotspot/share/gc/g1/g1RemSet.cpp
@@ -1665,7 +1665,6 @@ void G1RemSet::print_periodic_summary_info(const char* header, uint period_count
 
     Log(gc, remset) log;
     log.trace("%s", header);
-    ResourceMark rm;
     LogStream ls(log.trace());
     _prev_period_summary.print_on(&ls, show_thread_times);
 
@@ -1678,7 +1677,6 @@ void G1RemSet::print_summary_info() {
   if (log.is_trace()) {
     log.trace(" Cumulative RS summary");
     G1RemSetSummary current;
-    ResourceMark rm;
     LogStream ls(log.trace());
     current.print_on(&ls, true /* show_thread_times*/);
   }
diff --git a/src/hotspot/share/gc/shared/collectedHeap.cpp b/src/hotspot/share/gc/shared/collectedHeap.cpp
index fba95931703..2175b58b694 100644
--- a/src/hotspot/share/gc/shared/collectedHeap.cpp
+++ b/src/hotspot/share/gc/shared/collectedHeap.cpp
@@ -560,7 +560,6 @@ void CollectedHeap::full_gc_dump(GCTimer* timer, bool before) {
   LogTarget(Trace, gc, classhisto) lt;
   if (lt.is_enabled()) {
     GCTraceTime(Trace, gc, classhisto) tm(before ? "Class Histogram (before full gc)" : "Class Histogram (after full gc)", timer);
-    ResourceMark rm;
     LogStream ls(lt);
     VM_GC_HeapInspection inspector(&ls, false /* ! full gc */);
     inspector.doit();
diff --git a/src/hotspot/share/gc/shared/referenceProcessorPhaseTimes.cpp b/src/hotspot/share/gc/shared/referenceProcessorPhaseTimes.cpp
index f4b30866d77..83eaccd9813 100644
--- a/src/hotspot/share/gc/shared/referenceProcessorPhaseTimes.cpp
+++ b/src/hotspot/share/gc/shared/referenceProcessorPhaseTimes.cpp
@@ -267,7 +267,6 @@ void ReferenceProcessorPhaseTimes::print_reference(ReferenceType ref_type, uint
 
   if (lt.is_enabled()) {
     LogStream ls(lt);
-    ResourceMark rm;
 
     int const ref_type_index = ref_type_2_index(ref_type);
 
diff --git a/src/hotspot/share/gc/shared/taskqueue.inline.hpp b/src/hotspot/share/gc/shared/taskqueue.inline.hpp
index 8e65cfd704f..d28d8c8b6f0 100644
--- a/src/hotspot/share/gc/shared/taskqueue.inline.hpp
+++ b/src/hotspot/share/gc/shared/taskqueue.inline.hpp
@@ -89,7 +89,6 @@ inline void GenericTaskQueueSet<T, MT>::print_and_reset_taskqueue_stats(const ch
     return;
   }
   Log(gc, task, stats) log;
-  ResourceMark rm;
   LogStream ls(log.trace());
 
   print_taskqueue_stats(&ls, label);
diff --git a/src/hotspot/share/memory/metaspace.cpp b/src/hotspot/share/memory/metaspace.cpp
index 99d1d027db0..e80e5b8a1e6 100644
--- a/src/hotspot/share/memory/metaspace.cpp
+++ b/src/hotspot/share/memory/metaspace.cpp
@@ -832,7 +832,6 @@ void Metaspace::global_initialize() {
     // Note: "cds" would be a better fit but keep this for backward compatibility.
     LogTarget(Info, gc, metaspace) lt;
     if (lt.is_enabled()) {
-      ResourceMark rm;
       LogStream ls(lt);
       CDS_ONLY(MetaspaceShared::print_on(&ls);)
       Metaspace::print_compressed_class_space(&ls);
diff --git a/src/hotspot/share/oops/compressedOops.cpp b/src/hotspot/share/oops/compressedOops.cpp
index 675b5b44f53..2c5f1631d85 100644
--- a/src/hotspot/share/oops/compressedOops.cpp
+++ b/src/hotspot/share/oops/compressedOops.cpp
@@ -69,7 +69,6 @@ void CompressedOops::initialize(const ReservedHeapSpace& heap_space) {
 
   LogTarget(Debug, gc, heap, coops) lt;
   if (lt.is_enabled()) {
-    ResourceMark rm;
     LogStream ls(lt);
     print_mode(&ls);
   }
diff --git a/src/hotspot/share/oops/generateOopMap.cpp b/src/hotspot/share/oops/generateOopMap.cpp
index e3119a24cef..a3db976046d 100644
--- a/src/hotspot/share/oops/generateOopMap.cpp
+++ b/src/hotspot/share/oops/generateOopMap.cpp
@@ -1279,7 +1279,6 @@ void GenerateOopMap::do_exception_edge(BytecodeStream* itr) {
 }
 
 void GenerateOopMap::report_monitor_mismatch(const char *msg) {
-  ResourceMark rm;
   LogStream ls(Log(monitormismatch)::info());
   ls.print("Monitor mismatch in method ");
   method()->print_short_name(&ls);
diff --git a/src/hotspot/share/opto/runtime.cpp b/src/hotspot/share/opto/runtime.cpp
index 4dfc5db577e..e32cedf6cee 100644
--- a/src/hotspot/share/opto/runtime.cpp
+++ b/src/hotspot/share/opto/runtime.cpp
@@ -1689,7 +1689,6 @@ JRT_ENTRY_NO_ASYNC(address, OptoRuntime::handle_exception_C_helper(JavaThread* c
 
   LogTarget(Info, exceptions) lt;
   if (lt.is_enabled()) {
-    ResourceMark rm;
     LogStream ls(lt);
     trace_exception(&ls, exception(), pc, "");
   }
diff --git a/src/hotspot/share/runtime/java.cpp b/src/hotspot/share/runtime/java.cpp
index 4aca8971cd8..bcf99c84ba4 100644
--- a/src/hotspot/share/runtime/java.cpp
+++ b/src/hotspot/share/runtime/java.cpp
@@ -476,7 +476,6 @@ void before_exit(JavaThread* thread, bool halt) {
   // Print GC/heap related information.
   Log(gc, heap, exit) log;
   if (log.is_info()) {
-    ResourceMark rm;
     LogStream ls_info(log.info());
     Universe::print_on(&ls_info);
     if (log.is_trace()) {
diff --git a/src/hotspot/share/runtime/safepoint.cpp b/src/hotspot/share/runtime/safepoint.cpp
index b2bc8364eb5..ab896290007 100644
--- a/src/hotspot/share/runtime/safepoint.cpp
+++ b/src/hotspot/share/runtime/safepoint.cpp
@@ -151,7 +151,6 @@ bool SafepointSynchronize::thread_not_running(ThreadSafepointState *cur_state) {
     // Robustness: asserted in the caller, but handle/tolerate it for release bits.
     LogTarget(Error, safepoint) lt;
     if (lt.is_enabled()) {
-      ResourceMark rm;
       LogStream ls(lt);
       ls.print("Illegal initial state detected: ");
       cur_state->print_on(&ls);
@@ -164,7 +163,6 @@ bool SafepointSynchronize::thread_not_running(ThreadSafepointState *cur_state) {
   }
   LogTarget(Trace, safepoint) lt;
   if (lt.is_enabled()) {
-    ResourceMark rm;
     LogStream ls(lt);
     cur_state->print_on(&ls);
   }
diff --git a/src/hotspot/share/runtime/vm_version.cpp b/src/hotspot/share/runtime/vm_version.cpp
index 7dff6ebfd09..7c5b7fe3f3e 100644
--- a/src/hotspot/share/runtime/vm_version.cpp
+++ b/src/hotspot/share/runtime/vm_version.cpp
@@ -32,7 +32,6 @@ void VM_Version_init() {
   guarantee(VM_Version::supports_cx8(), "Support for 64-bit atomic operations is required");
   if (log_is_enabled(Info, os, cpu)) {
     char buf[1024];
-    ResourceMark rm;
     LogStream ls(Log(os, cpu)::info());
     os::print_cpu_info(&ls, buf, sizeof(buf));
   }

From c50a0a1fc126a67528448b282bcfc375abfac142 Mon Sep 17 00:00:00 2001
From: Thomas Schatzl <tschatzl@openjdk.org>
Date: Thu, 27 Mar 2025 14:30:31 +0000
Subject: [PATCH 524/587] 8352508: [Redo] G1: Pinned regions with pinned
 objects only reachable by native code crash VM

Reviewed-by: ayang, iwalulya
---
 src/hotspot/share/gc/g1/g1ConcurrentMark.cpp  |   7 +-
 .../share/gc/g1/g1ParScanThreadState.cpp      |  10 +-
 .../share/gc/g1/g1ParScanThreadState.hpp      |   1 +
 src/hotspot/share/gc/g1/g1Policy.cpp          |   7 --
 src/hotspot/share/gc/g1/g1YoungCollector.cpp  |  34 +++++-
 .../gc/g1/pinnedobjs/TestPinnedEvacEmpty.java | 112 ++++++++++++++++++
 6 files changed, 156 insertions(+), 15 deletions(-)
 create mode 100644 test/hotspot/jtreg/gc/g1/pinnedobjs/TestPinnedEvacEmpty.java

diff --git a/src/hotspot/share/gc/g1/g1ConcurrentMark.cpp b/src/hotspot/share/gc/g1/g1ConcurrentMark.cpp
index 41878a20935..0b8e66f9043 100644
--- a/src/hotspot/share/gc/g1/g1ConcurrentMark.cpp
+++ b/src/hotspot/share/gc/g1/g1ConcurrentMark.cpp
@@ -1273,7 +1273,8 @@ class G1UpdateRegionLivenessAndSelectForRebuildTask : public WorkerTask {
         // The liveness of this humongous obj decided by either its allocation
         // time (allocated after conc-mark-start, i.e. live) or conc-marking.
         const bool is_live = _cm->top_at_mark_start(hr) == hr->bottom()
-                             || _cm->contains_live_object(hr->hrm_index());
+                          || _cm->contains_live_object(hr->hrm_index())
+                          || hr->has_pinned_objects();
         if (is_live) {
           const bool selected_for_rebuild = tracker->update_humongous_before_rebuild(hr);
           auto on_humongous_region = [&] (G1HeapRegion* hr) {
@@ -1291,7 +1292,9 @@ class G1UpdateRegionLivenessAndSelectForRebuildTask : public WorkerTask {
         uint region_idx = hr->hrm_index();
         hr->note_end_of_marking(_cm->top_at_mark_start(hr), _cm->live_bytes(region_idx), _cm->incoming_refs(region_idx));
 
-        if (hr->live_bytes() != 0) {
+        const bool is_live = hr->live_bytes() != 0
+                          || hr->has_pinned_objects();
+        if (is_live) {
           if (tracker->update_old_before_rebuild(hr)) {
             _num_selected_for_rebuild++;
           }
diff --git a/src/hotspot/share/gc/g1/g1ParScanThreadState.cpp b/src/hotspot/share/gc/g1/g1ParScanThreadState.cpp
index e8da6c50d87..298222b35b5 100644
--- a/src/hotspot/share/gc/g1/g1ParScanThreadState.cpp
+++ b/src/hotspot/share/gc/g1/g1ParScanThreadState.cpp
@@ -614,6 +614,12 @@ void G1ParScanThreadStateSet::record_unused_optional_region(G1HeapRegion* hr) {
   }
 }
 
+void G1ParScanThreadState::record_evacuation_failed_region(G1HeapRegion* r, uint worker_id, bool cause_pinned) {
+  if (_evac_failure_regions->record(worker_id, r->hrm_index(), cause_pinned)) {
+    G1HeapRegionPrinter::evac_failure(r);
+  }
+}
+
 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));
@@ -623,9 +629,7 @@ oop G1ParScanThreadState::handle_evacuation_failure_par(oop old, markWord m, siz
     // Forward-to-self succeeded. We are the "owner" of the object.
     G1HeapRegion* r = _g1h->heap_region_containing(old);
 
-    if (_evac_failure_regions->record(_worker_id, r->hrm_index(), cause_pinned)) {
-      G1HeapRegionPrinter::evac_failure(r);
-    }
+    record_evacuation_failed_region(r, _worker_id, cause_pinned);
 
     // Mark the failing object in the marking bitmap and later use the bitmap to handle
     // evacuation failure recovery.
diff --git a/src/hotspot/share/gc/g1/g1ParScanThreadState.hpp b/src/hotspot/share/gc/g1/g1ParScanThreadState.hpp
index f5dccaee9cf..eafd4c22d11 100644
--- a/src/hotspot/share/gc/g1/g1ParScanThreadState.hpp
+++ b/src/hotspot/share/gc/g1/g1ParScanThreadState.hpp
@@ -228,6 +228,7 @@ public:
   Tickspan trim_ticks() const;
   void reset_trim_ticks();
 
+  void record_evacuation_failed_region(G1HeapRegion* r, uint worker_id, bool cause_pinned);
   // An attempt to evacuate "obj" has failed; take necessary steps.
   oop handle_evacuation_failure_par(oop obj, markWord m, size_t word_sz, bool cause_pinned);
 
diff --git a/src/hotspot/share/gc/g1/g1Policy.cpp b/src/hotspot/share/gc/g1/g1Policy.cpp
index 8aaa47ba08f..c20e2c971a8 100644
--- a/src/hotspot/share/gc/g1/g1Policy.cpp
+++ b/src/hotspot/share/gc/g1/g1Policy.cpp
@@ -660,13 +660,6 @@ void G1Policy::record_concurrent_refinement_stats(size_t pending_cards,
 
 bool G1Policy::should_retain_evac_failed_region(uint index) const {
   size_t live_bytes = _g1h->region_at(index)->live_bytes();
-
-#ifdef ASSERT
-  G1HeapRegion* r = _g1h->region_at(index);
-  assert(live_bytes != 0,
-         "live bytes not set for %u used %zu garbage %zu cm-live %zu pinned %d",
-         index, r->used(), r->garbage_bytes(), live_bytes, r->has_pinned_objects());
-#endif
   size_t threshold = G1RetainRegionLiveThresholdPercent * G1HeapRegion::GrainBytes / 100;
   return live_bytes < threshold;
 }
diff --git a/src/hotspot/share/gc/g1/g1YoungCollector.cpp b/src/hotspot/share/gc/g1/g1YoungCollector.cpp
index 2223d667998..44803564de1 100644
--- a/src/hotspot/share/gc/g1/g1YoungCollector.cpp
+++ b/src/hotspot/share/gc/g1/g1YoungCollector.cpp
@@ -587,6 +587,30 @@ public:
 };
 
 class G1EvacuateRegionsBaseTask : public WorkerTask {
+
+  // All pinned regions in the collection set must be registered as failed
+  // regions as there is no guarantee that there is a reference reachable by
+  // Java code (i.e. only by native code) that adds it to the evacuation failed
+  // regions.
+  void record_pinned_regions(G1ParScanThreadState* pss, uint worker_id) {
+    class RecordPinnedRegionClosure : public G1HeapRegionClosure {
+      G1ParScanThreadState* _pss;
+      uint _worker_id;
+
+    public:
+      RecordPinnedRegionClosure(G1ParScanThreadState* pss, uint worker_id) : _pss(pss), _worker_id(worker_id) { }
+
+      bool do_heap_region(G1HeapRegion* r) {
+        if (r->has_pinned_objects()) {
+          _pss->record_evacuation_failed_region(r, _worker_id, true /* cause_pinned */);
+        }
+        return false;
+      }
+    } cl(pss, worker_id);
+
+    _g1h->collection_set_iterate_increment_from(&cl, worker_id);
+  }
+
 protected:
   G1CollectedHeap* _g1h;
   G1ParScanThreadStateSet* _per_thread_states;
@@ -594,8 +618,6 @@ protected:
   G1ScannerTasksQueueSet* _task_queues;
   TaskTerminator _terminator;
 
-  uint _num_workers;
-
   void evacuate_live_objects(G1ParScanThreadState* pss,
                              uint worker_id,
                              G1GCPhaseTimes::GCParPhases objcopy_phase,
@@ -631,6 +653,9 @@ protected:
 
   virtual void evacuate_live_objects(G1ParScanThreadState* pss, uint worker_id) = 0;
 
+private:
+  volatile bool _pinned_regions_recorded;
+
 public:
   G1EvacuateRegionsBaseTask(const char* name,
                             G1ParScanThreadStateSet* per_thread_states,
@@ -641,7 +666,7 @@ public:
     _per_thread_states(per_thread_states),
     _task_queues(task_queues),
     _terminator(num_workers, _task_queues),
-    _num_workers(num_workers)
+    _pinned_regions_recorded(false)
   { }
 
   void work(uint worker_id) {
@@ -653,6 +678,9 @@ public:
       G1ParScanThreadState* pss = _per_thread_states->state_for_worker(worker_id);
       pss->set_ref_discoverer(_g1h->ref_processor_stw());
 
+      if (!Atomic::cmpxchg(&_pinned_regions_recorded, false, true)) {
+        record_pinned_regions(pss, worker_id);
+      }
       scan_roots(pss, worker_id);
       evacuate_live_objects(pss, worker_id);
     }
diff --git a/test/hotspot/jtreg/gc/g1/pinnedobjs/TestPinnedEvacEmpty.java b/test/hotspot/jtreg/gc/g1/pinnedobjs/TestPinnedEvacEmpty.java
new file mode 100644
index 00000000000..2b7bc9a5624
--- /dev/null
+++ b/test/hotspot/jtreg/gc/g1/pinnedobjs/TestPinnedEvacEmpty.java
@@ -0,0 +1,112 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact 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 8351921 8352508
+ * @summary Test that pinned regions with no Java references into them
+ *          do not make the garbage collector reclaim that region.
+ *          This test simulates this behavior using Whitebox methods
+ *          to pin a Java object in a region with no other pinnable objects and
+*           lose the reference to it before the garbage collection.
+ * @requires vm.gc.G1
+ * @requires vm.debug
+ * @library /test/lib /
+ * @modules java.management
+ * @build jdk.test.whitebox.WhiteBox
+ * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox
+ * @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:+UseG1GC
+ *      -Xbootclasspath/a:. -Xlog:gc=debug,gc+ergo+cset=trace,gc+phases=debug -XX:G1HeapRegionSize=1m -Xms30m  gc.g1.pinnedobjs.TestPinnedEvacEmpty regular
+ *
+ * @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:+UseG1GC
+ *      -Xbootclasspath/a:. -Xlog:gc=debug,gc+ergo+cset=trace,gc+phases=debug -XX:G1HeapRegionSize=1m -Xms30m  gc.g1.pinnedobjs.TestPinnedEvacEmpty humongous
+ */
+
+package gc.g1.pinnedobjs;
+
+import gc.testlibrary.Helpers;
+
+import jdk.test.lib.Asserts;
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.process.ProcessTools;
+import jdk.test.whitebox.WhiteBox;
+
+public class TestPinnedEvacEmpty {
+
+    private static final WhiteBox wb = WhiteBox.getWhiteBox();
+
+    private static final int objSize = (int)wb.getObjectSize(new Object());
+
+    private static Object allocHumongous() {
+        final int M = 1024 * 1024;
+        // The target object to pin. Since it is humongous, it will always be in its
+        // own regions.
+        return new int[M];
+    }
+
+    private static Object allocRegular() {
+        // How many j.l.Object should we allocate when creating garbage.
+        final int numAllocations = 1024 * 1024 * 3 / objSize;
+
+        // Allocate garbage so that the target object will be in a new region.
+        for (int i = 0; i < numAllocations; i++) {
+          Object z = new Object();
+        }
+        int[] o = new int[100];  // The target object to pin.
+        // Further allocate garbage so that any additional allocations of potentially
+        // pinned objects can not be allocated in the same region as the target object.
+        for (int i = 0; i < numAllocations; i++) {
+          Object z = new Object();
+        }
+
+        Asserts.assertTrue(!wb.isObjectInOldGen(o), "should not be in old gen already");
+        return o;
+    }
+
+    public static void main(String[] args) throws Exception {
+        System.out.println("Testing " + args[0] + " objects...");
+
+        // Remove garbage from VM initialization.
+        wb.fullGC();
+
+        // Allocate target object according to arguments.
+        Object o = args[0].equals("regular") ? allocRegular() : allocHumongous();
+
+        // Pin the object.
+        wb.pinObject(o);
+
+        // And forget the (Java) reference to the int array. After this, the garbage
+        // collection should find a completely empty pinned region. The collector
+        // must not collect/free it.
+        o = null;
+
+        // Full collection should not crash the VM in case of "empty" pinned regions.
+        wb.fullGC();
+
+        // Do a young garbage collection to zap the data in the pinned region. This test
+        // achieves that by executing a concurrent cycle that both performs both a young
+        // garbage collection as well as checks that errorneous reclamation does not occur
+        // in the Remark pause.
+        wb.g1RunConcurrentGC();
+        System.out.println("Done");
+    }
+}

From 79824c344ee36bcf9f3434ccb3b44d2d24defc5c Mon Sep 17 00:00:00 2001
From: Jiangli Zhou <jiangli@openjdk.org>
Date: Thu, 27 Mar 2025 14:40:02 +0000
Subject: [PATCH 525/587] 8352184: Jtreg tests using
 CommandLineOptionTest.getVMTypeOption() and optionsvalidation.JVMOptionsUtils
 fail on static JDK

Reviewed-by: dholmes, shade
---
 .../share/runtime/abstract_vm_version.cpp     | 42 ++++++++++++-------
 .../optionsvalidation/JVMOptionsUtils.java    |  7 +++-
 ...stMutuallyExclusivePlatformPredicates.java |  4 +-
 test/lib/jdk/test/lib/Platform.java           |  6 ++-
 .../test/lib/cli/CommandLineOptionTest.java   | 10 +++--
 5 files changed, 45 insertions(+), 24 deletions(-)

diff --git a/src/hotspot/share/runtime/abstract_vm_version.cpp b/src/hotspot/share/runtime/abstract_vm_version.cpp
index 05cccd4fe45..763e441fe54 100644
--- a/src/hotspot/share/runtime/abstract_vm_version.cpp
+++ b/src/hotspot/share/runtime/abstract_vm_version.cpp
@@ -138,31 +138,41 @@ const char* Abstract_VM_Version::vm_vendor() {
 
 
 const char* Abstract_VM_Version::vm_info_string() {
+  const char* mode;
   switch (Arguments::mode()) {
     case Arguments::_int:
-      return CDSConfig::is_using_archive() ? "interpreted mode, sharing" : "interpreted mode";
+      mode = "interpreted mode";
+      break;
     case Arguments::_mixed:
-      if (CDSConfig::is_using_archive()) {
-        if (CompilationModeFlag::quick_only()) {
-          return "mixed mode, emulated-client, sharing";
-        } else {
-          return "mixed mode, sharing";
-         }
+      if (CompilationModeFlag::quick_only()) {
+        mode = "mixed mode, emulated-client";
       } else {
-        if (CompilationModeFlag::quick_only()) {
-          return "mixed mode, emulated-client";
-        } else {
-          return "mixed mode";
-        }
+        mode = "mixed mode";
       }
+      break;
     case Arguments::_comp:
       if (CompilationModeFlag::quick_only()) {
-         return CDSConfig::is_using_archive() ? "compiled mode, emulated-client, sharing" : "compiled mode, emulated-client";
+        mode = "compiled mode, emulated-client";
+      } else {
+        mode = "compiled mode";
       }
-      return CDSConfig::is_using_archive() ? "compiled mode, sharing" : "compiled mode";
+      break;
+    default:
+      ShouldNotReachHere();
   }
-  ShouldNotReachHere();
-  return "";
+
+  const char* static_info = ", static";
+  const char* sharing_info = ", sharing";
+  size_t len = strlen(mode) +
+               (is_vm_statically_linked() ? strlen(static_info) : 0) +
+               (CDSConfig::is_using_archive() ? strlen(sharing_info) : 0) +
+               1;
+  char* vm_info = NEW_C_HEAP_ARRAY(char, len, mtInternal);
+  // jio_snprintf places null character in the last character.
+  jio_snprintf(vm_info, len, "%s%s%s", mode,
+               is_vm_statically_linked() ? static_info : "",
+               CDSConfig::is_using_archive() ? sharing_info : "");
+  return vm_info;
 }
 
 // NOTE: do *not* use stringStream. this function is called by
diff --git a/test/hotspot/jtreg/runtime/CommandLine/OptionsValidation/common/optionsvalidation/JVMOptionsUtils.java b/test/hotspot/jtreg/runtime/CommandLine/OptionsValidation/common/optionsvalidation/JVMOptionsUtils.java
index 031d30bf2bd..ef74dc41846 100644
--- a/test/hotspot/jtreg/runtime/CommandLine/OptionsValidation/common/optionsvalidation/JVMOptionsUtils.java
+++ b/test/hotspot/jtreg/runtime/CommandLine/OptionsValidation/common/optionsvalidation/JVMOptionsUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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,10 @@ public class JVMOptionsUtils {
     private static Map<String, JVMOption> optionsAsMap;
 
     static {
-        if (Platform.isServer()) {
+        if (Platform.isStatic()) {
+            // -server|-client|-minimal flags are not supported on static JDK.
+            VMType = null;
+        } else if (Platform.isServer()) {
             VMType = "-server";
         } else if (Platform.isClient()) {
             VMType = "-client";
diff --git a/test/lib-test/jdk/test/lib/TestMutuallyExclusivePlatformPredicates.java b/test/lib-test/jdk/test/lib/TestMutuallyExclusivePlatformPredicates.java
index e78e200ac24..8047b81c1e6 100644
--- a/test/lib-test/jdk/test/lib/TestMutuallyExclusivePlatformPredicates.java
+++ b/test/lib-test/jdk/test/lib/TestMutuallyExclusivePlatformPredicates.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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 @@ public class TestMutuallyExclusivePlatformPredicates {
         VM_TYPE("isClient", "isServer", "isMinimal", "isZero", "isEmbedded"),
         MODE("isInt", "isMixed", "isComp"),
         IGNORED("isEmulatedClient", "isDebugBuild", "isFastDebugBuild", "isMusl",
-                "isSlowDebugBuild", "hasSA", "isRoot", "isTieredSupported",
+                "isStatic", "isSlowDebugBuild", "hasSA", "isRoot", "isTieredSupported",
                 "areCustomLoadersSupportedForCDS", "isDefaultCDSArchiveSupported",
                 "isHardenedOSX", "hasOSXPlistEntries", "isOracleLinux7", "isOnWayland");
 
diff --git a/test/lib/jdk/test/lib/Platform.java b/test/lib/jdk/test/lib/Platform.java
index 682d9c90685..75fdef048bc 100644
--- a/test/lib/jdk/test/lib/Platform.java
+++ b/test/lib/jdk/test/lib/Platform.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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,6 +70,10 @@ public class Platform {
         return vmName.contains("Embedded");
     }
 
+    public static boolean isStatic() {
+        return vmInfo.contains("static");
+    }
+
     public static boolean isEmulatedClient() {
         return vmInfo.contains(" emulated-client");
     }
diff --git a/test/lib/jdk/test/lib/cli/CommandLineOptionTest.java b/test/lib/jdk/test/lib/cli/CommandLineOptionTest.java
index 31cff4b8c25..57779b7d9fa 100644
--- a/test/lib/jdk/test/lib/cli/CommandLineOptionTest.java
+++ b/test/lib/jdk/test/lib/cli/CommandLineOptionTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -199,7 +199,9 @@ public abstract class CommandLineOptionTest {
             String wrongWarningMessage, ExitCode exitCode, String... options)
             throws Throwable {
         List<String> finalOptions = new ArrayList<>();
-        finalOptions.add(CommandLineOptionTest.getVMTypeOption());
+        if (!Platform.isStatic()) {
+            finalOptions.add(CommandLineOptionTest.getVMTypeOption());
+        }
         String extraFlagForEmulated = CommandLineOptionTest.getVMTypeOptionForEmulated();
         if (extraFlagForEmulated != null) {
             finalOptions.add(extraFlagForEmulated);
@@ -394,7 +396,9 @@ public abstract class CommandLineOptionTest {
             String expectedValue, String optionErrorString,
             String... additionalVMOpts) throws Throwable {
         List<String> finalOptions = new ArrayList<>();
-        finalOptions.add(CommandLineOptionTest.getVMTypeOption());
+        if (!Platform.isStatic()) {
+            finalOptions.add(CommandLineOptionTest.getVMTypeOption());
+        }
         String extraFlagForEmulated = CommandLineOptionTest.getVMTypeOptionForEmulated();
         if (extraFlagForEmulated != null) {
             finalOptions.add(extraFlagForEmulated);

From 50ac24eb0ff06d9b4fc52a6cafea63eb4d59cb95 Mon Sep 17 00:00:00 2001
From: Vladimir Ivanov <vaivanov@openjdk.org>
Date: Thu, 27 Mar 2025 14:58:07 +0000
Subject: [PATCH 526/587] 8351593: [JMH] test PhoneCode.Bulk reports NPE
 exception

Reviewed-by: redestad, drwhite
---
 .../java/util/stream/tasks/DataProviders.java |  43 ----
 .../tasks/DictionaryWordValue/Bulk.java       | 150 ------------
 .../DictionaryProblem.java                    | 101 --------
 .../tasks/DictionaryWordValue/Lambda.java     |  89 -------
 .../tasks/DictionaryWordValue/Xtras.java      |  32 ---
 .../util/stream/tasks/PhoneCode/Bulk.java     | 229 ------------------
 .../tasks/PhoneCode/PhoneCodeProblem.java     | 105 --------
 7 files changed, 749 deletions(-)
 delete mode 100644 test/micro/org/openjdk/bench/java/util/stream/tasks/DataProviders.java
 delete mode 100644 test/micro/org/openjdk/bench/java/util/stream/tasks/DictionaryWordValue/Bulk.java
 delete mode 100644 test/micro/org/openjdk/bench/java/util/stream/tasks/DictionaryWordValue/DictionaryProblem.java
 delete mode 100644 test/micro/org/openjdk/bench/java/util/stream/tasks/DictionaryWordValue/Lambda.java
 delete mode 100644 test/micro/org/openjdk/bench/java/util/stream/tasks/DictionaryWordValue/Xtras.java
 delete mode 100644 test/micro/org/openjdk/bench/java/util/stream/tasks/PhoneCode/Bulk.java
 delete mode 100644 test/micro/org/openjdk/bench/java/util/stream/tasks/PhoneCode/PhoneCodeProblem.java

diff --git a/test/micro/org/openjdk/bench/java/util/stream/tasks/DataProviders.java b/test/micro/org/openjdk/bench/java/util/stream/tasks/DataProviders.java
deleted file mode 100644
index 0cf21aaf433..00000000000
--- a/test/micro/org/openjdk/bench/java/util/stream/tasks/DataProviders.java
+++ /dev/null
@@ -1,43 +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.
- */
-
-package org.openjdk.bench.java.util.stream.tasks;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.util.stream.Stream;
-
-public class DataProviders {
-    public static Stream<String> dictionary() throws IOException {
-        BufferedReader r = new BufferedReader(new InputStreamReader(DataProviders.class.getResourceAsStream("cmudict-0.7b.txt")));
-        // Strip out the copyright notice and special chars
-        return r.lines().filter(w -> w.charAt(0) >= 'A' && w.charAt(0) <= 'Z').map(w -> w.substring(0, w.indexOf(" "))).onClose(() -> {
-            try {
-                r.close();
-            } catch (IOException e) {
-                // swallow
-            }
-        });
-    }
-}
diff --git a/test/micro/org/openjdk/bench/java/util/stream/tasks/DictionaryWordValue/Bulk.java b/test/micro/org/openjdk/bench/java/util/stream/tasks/DictionaryWordValue/Bulk.java
deleted file mode 100644
index b29d4e82e65..00000000000
--- a/test/micro/org/openjdk/bench/java/util/stream/tasks/DictionaryWordValue/Bulk.java
+++ /dev/null
@@ -1,150 +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.
- */
-package org.openjdk.bench.java.util.stream.tasks.DictionaryWordValue;
-
-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.Level;
-import org.openjdk.jmh.annotations.Mode;
-import org.openjdk.jmh.annotations.OutputTimeUnit;
-import org.openjdk.jmh.annotations.Scope;
-import org.openjdk.jmh.annotations.Setup;
-import org.openjdk.jmh.annotations.State;
-import org.openjdk.jmh.annotations.Warmup;
-
-import java.util.Arrays;
-import java.util.concurrent.RecursiveTask;
-import java.util.concurrent.TimeUnit;
-import java.util.function.BinaryOperator;
-import java.util.function.Function;
-
-
-/**
- * Bulk scenario: searching max "wordValue" through the dictionary (array of strings).
- */
-@BenchmarkMode(Mode.Throughput)
-@Warmup(iterations = 4, time = 2, timeUnit = TimeUnit.SECONDS)
-@Measurement(iterations = 4, time = 2, timeUnit = TimeUnit.SECONDS)
-@Fork(value = 3)
-@OutputTimeUnit(TimeUnit.SECONDS)
-@State(Scope.Benchmark)
-public class Bulk {
-
-    @Setup(Level.Trial)
-    public void loadData() {
-        // cause classload and problem initialization
-        DictionaryProblem.class.getName();
-    }
-
-    @Benchmark
-    public int hm_seq() {
-        int max = 0;
-        for (String s : DictionaryProblem.get()) {
-            int v = DictionaryProblem.wordValue(s);
-            if (v > max) {
-                max = v;
-            }
-        }
-        return max;
-    }
-
-    @Benchmark
-    public int hm_par() {
-        return new Task(DictionaryProblem.get(), 0, DictionaryProblem.get().length).invoke();
-    }
-
-    @Benchmark
-    public int bulk_seq_inner() {
-        return Arrays.stream(DictionaryProblem.get())
-                .map(new Function<String, Integer>() {
-                    @Override
-                    public Integer apply(String s) {
-                        return DictionaryProblem.wordValue(s);
-                    }
-                })
-                .reduce(0, new BinaryOperator<Integer>() {
-                    @Override
-                    public Integer apply(Integer l, Integer r) {
-                        return l > r ? l : r;
-                    }
-                });
-    }
-
-    @Benchmark
-    public int bulk_par_inner() {
-        return Arrays.stream(DictionaryProblem.get()).parallel()
-                .map(new Function<String, Integer>() {
-                    @Override
-                    public Integer apply(String s) {
-                        return DictionaryProblem.wordValue(s);
-                    }
-                })
-                .reduce(0, new BinaryOperator<Integer>() {
-                    @Override
-                    public Integer apply(Integer l, Integer r) {
-                        return l > r ? l : r;
-                    }
-                });
-    }
-
-
-    public static class Task extends RecursiveTask<Integer> {
-        private static final int FORK_LIMIT = 500;
-
-        private final String[] words;
-        private final int start, end;
-
-        Task(String[] w, int start, int end) {
-            this.words = w;
-            this.start = start;
-            this.end = end;
-        }
-
-        @Override
-        protected Integer compute() {
-            int size = end - start;
-            if (size > FORK_LIMIT) {
-                int mid = start + size / 2;
-                Task t1 = new Task(words, start, mid);
-                Task t2 = new Task(words, mid, end);
-                t1.fork();
-                Integer v2 = t2.invoke();
-                Integer v1 = t1.join();
-                return Math.max(v1, v2);
-            } else {
-                int max = 0;
-                for (int i = start; i < end; i++) {
-                    int v = DictionaryProblem.wordValue(words[i]);
-                    if (v > max) {
-                        max = v;
-                    }
-                }
-                return max;
-            }
-        }
-    }
-
-
-}
diff --git a/test/micro/org/openjdk/bench/java/util/stream/tasks/DictionaryWordValue/DictionaryProblem.java b/test/micro/org/openjdk/bench/java/util/stream/tasks/DictionaryWordValue/DictionaryProblem.java
deleted file mode 100644
index 8c3b215a3b5..00000000000
--- a/test/micro/org/openjdk/bench/java/util/stream/tasks/DictionaryWordValue/DictionaryProblem.java
+++ /dev/null
@@ -1,101 +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.
- */
-package org.openjdk.bench.java.util.stream.tasks.DictionaryWordValue;
-
-import org.openjdk.bench.java.util.stream.tasks.DataProviders;
-
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.List;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-
-public class DictionaryProblem {
-
-    private static final int DICTIONARY_REPEAT_RATE = 40;
-
-    private static final String[] dict;
-
-    static {
-        int size;
-        int idx = 0;
-        List<String> d = Collections.emptyList();
-        try (Stream<String> s = DataProviders.dictionary()) {
-            d = s.collect(Collectors.<String>toList());
-        } catch (Exception e) {
-            // ignore
-        }
-        size = d.size() * DICTIONARY_REPEAT_RATE;
-        dict = new String[size];
-        for (int i = 0; i < DICTIONARY_REPEAT_RATE; i++) {
-            d.sort(new IdxComparator(i));
-            for (String s : d) {
-                // copy the whole string
-                dict[idx++] = new String(s.toCharArray());
-            }
-        }
-        assert (idx == dict.length);
-    }
-
-    public static String[] get() {
-        return dict;
-    }
-
-    /**
-     * A word value is the sum of alphabet value of each characters in a word.
-     *
-     * @param word The word
-     * @return The word value
-     */
-    public static int wordValue(String word) {
-        char[] ar = word.toLowerCase().toCharArray();
-        int value = 0;
-        for (char c: ar) {
-            int v = c - 'a' + 1;
-            if (v < 1 || v > 26) {
-                // skip non-alphabet
-                continue;
-            }
-            value += (c - 'a' + 1);
-        }
-        return value;
-    }
-
-    static class IdxComparator implements Comparator<String> {
-        private final int index;
-
-        public IdxComparator(int i) {
-            index = i;
-        }
-
-        @Override
-        public int compare(String a, String b) {
-            if (a.length() > index && b.length() > index) {
-                return (a.charAt(index) - b.charAt(index));
-            } else {
-                return (a.length() - b.length());
-            }
-        }
-    }
-
-}
diff --git a/test/micro/org/openjdk/bench/java/util/stream/tasks/DictionaryWordValue/Lambda.java b/test/micro/org/openjdk/bench/java/util/stream/tasks/DictionaryWordValue/Lambda.java
deleted file mode 100644
index 4a60523b9a1..00000000000
--- a/test/micro/org/openjdk/bench/java/util/stream/tasks/DictionaryWordValue/Lambda.java
+++ /dev/null
@@ -1,89 +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.
- */
-package org.openjdk.bench.java.util.stream.tasks.DictionaryWordValue;
-
-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.Level;
-import org.openjdk.jmh.annotations.Mode;
-import org.openjdk.jmh.annotations.OutputTimeUnit;
-import org.openjdk.jmh.annotations.Scope;
-import org.openjdk.jmh.annotations.Setup;
-import org.openjdk.jmh.annotations.State;
-import org.openjdk.jmh.annotations.Warmup;
-
-import java.util.Arrays;
-import java.util.concurrent.TimeUnit;
-
-/**
- * Bulk scenario: searching max "wordValue" through the dictionary (array of strings).
- */
-@BenchmarkMode(Mode.Throughput)
-@Warmup(iterations = 4, time = 2, timeUnit = TimeUnit.SECONDS)
-@Measurement(iterations = 4, time = 2, timeUnit = TimeUnit.SECONDS)
-@Fork(value = 3)
-@OutputTimeUnit(TimeUnit.SECONDS)
-@State(Scope.Benchmark)
-public class Lambda {
-
-    @Setup(Level.Trial)
-    public void loadData() {
-        // cause classload and problem initialization
-        DictionaryProblem.class.getName();
-    }
-
-    public static Integer maxInt(Integer l, Integer r) {
-        return l > r ? l : r;
-    }
-
-    @Benchmark
-    public int bulk_seq_lambda() {
-        return Arrays.stream(DictionaryProblem.get())
-                .map(s -> DictionaryProblem.wordValue(s))
-                .reduce(0, (l, r) -> l > r ? l : r);
-    }
-
-    @Benchmark
-    public int bulk_seq_mref() {
-        return Arrays.stream(DictionaryProblem.get())
-                .map(DictionaryProblem::wordValue)
-                .reduce(0, Lambda::maxInt);
-    }
-
-    @Benchmark
-    public int bulk_par_lambda() {
-        return Arrays.stream(DictionaryProblem.get()).parallel()
-                .map(s -> DictionaryProblem.wordValue(s))
-                .reduce(0, (l, r) -> l > r ? l : r);
-    }
-
-    @Benchmark
-    public int bulk_par_mref() {
-        return Arrays.stream(DictionaryProblem.get()).parallel()
-                .map(DictionaryProblem::wordValue)
-                .reduce(0, Lambda::maxInt);
-    }
-
-}
diff --git a/test/micro/org/openjdk/bench/java/util/stream/tasks/DictionaryWordValue/Xtras.java b/test/micro/org/openjdk/bench/java/util/stream/tasks/DictionaryWordValue/Xtras.java
deleted file mode 100644
index 9f1c05857e2..00000000000
--- a/test/micro/org/openjdk/bench/java/util/stream/tasks/DictionaryWordValue/Xtras.java
+++ /dev/null
@@ -1,32 +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.
- */
-package org.openjdk.bench.java.util.stream.tasks.DictionaryWordValue;
-
-/**
- * Bulk scenario: searching max "wordValue" through the dictionary (array of strings).
- */
-public class Xtras {
-
-    // no workloads yet
-
-}
diff --git a/test/micro/org/openjdk/bench/java/util/stream/tasks/PhoneCode/Bulk.java b/test/micro/org/openjdk/bench/java/util/stream/tasks/PhoneCode/Bulk.java
deleted file mode 100644
index 7040092962e..00000000000
--- a/test/micro/org/openjdk/bench/java/util/stream/tasks/PhoneCode/Bulk.java
+++ /dev/null
@@ -1,229 +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.
- */
-
-package org.openjdk.bench.java.util.stream.tasks.PhoneCode;
-
-import org.openjdk.jmh.annotations.Benchmark;
-import org.openjdk.jmh.annotations.BenchmarkMode;
-import org.openjdk.jmh.annotations.Fork;
-import org.openjdk.jmh.annotations.Measurement;
-import org.openjdk.jmh.annotations.Mode;
-import org.openjdk.jmh.annotations.OutputTimeUnit;
-import org.openjdk.jmh.annotations.Scope;
-import org.openjdk.jmh.annotations.State;
-import org.openjdk.jmh.annotations.Warmup;
-
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.concurrent.TimeUnit;
-import java.util.function.Function;
-import java.util.stream.Collectors;
-import java.util.stream.IntStream;
-import java.util.stream.Stream;
-
-import static org.openjdk.bench.java.util.stream.tasks.PhoneCode.PhoneCodeProblem.wordsForNumber;
-
-/**
- * This benchmark compare various strategies solving the phone code problem.
- * The result should offer some insights on strength/drawbacks of underlying
- * implementation.
- */
-@BenchmarkMode(Mode.Throughput)
-@Warmup(iterations = 4, time = 2, timeUnit = TimeUnit.SECONDS)
-@Measurement(iterations = 4, time = 2, timeUnit = TimeUnit.SECONDS)
-@Fork(value = 3)
-@OutputTimeUnit(TimeUnit.MINUTES)
-@State(Scope.Benchmark)
-public class Bulk {
-    // several method choke up with 6-digit problem
-    private final static int SIZE = 5;
-    private Stream<String> join(String head,
-                                String tail,
-                                Function<String, Stream<String>> encoder)
-    {
-        Stream<String> s = wordsForNumber(head).stream();
-
-        if (! tail.isEmpty()) {
-            s = s.flatMap(h -> encoder.apply(tail).map(t -> h + " " + t));
-        }
-
-        return s;
-    }
-
-    private Stream<String> encode_par1(String number) {
-        return IntStream.range(1, number.length() + 1)
-                      .parallel()
-                      .boxed()
-                      .flatMap(i -> join(number.substring(0, i),
-                              number.substring(i),
-                              this::encode_par1));
-    }
-
-    private Stream<String> encode_par2(String number) {
-        return IntStream.range(1, number.length() + 1)
-                      .boxed()
-                      .parallel()
-                      .flatMap(i -> join(number.substring(0, i),
-                                         number.substring(i),
-                                         this::encode_par2));
-    }
-
-    private Stream<String> encode_ser(String number) {
-        return IntStream.range(1, number.length() + 1)
-                      .boxed()
-                      .flatMap(i -> join(number.substring(0, i),
-                                         number.substring(i),
-                                         this::encode_ser));
-    }
-
-    private Stream<String> encode_loop_concat(String number) {
-        if (number.isEmpty()) {
-            return Stream.empty();
-        }
-        // full number
-        Stream<String> s = wordsForNumber(number).stream();
-        // split
-        for (int i = 1; i < number.length(); i++) {
-            s = Stream.concat(s, join(number.substring(0, i),
-                                       number.substring(i),
-                                       this::encode_loop_concat));
-        }
-
-        return s;
-    }
-
-    private Collection<String> encode_loop_collect(String number) {
-        if (number.isEmpty()) {
-            return Collections.emptySet();
-        }
-
-        Collection<String> rv = new HashSet<>();
-
-        for (int i = 1; i <= number.length(); i++) {
-            join(number.substring(0, i),
-                 number.substring(i),
-                 s -> encode_loop_collect(s).stream()).forEach(rv::add);
-        }
-
-        return rv;
-    }
-
-    private Collection<String> encode_inline(String number) {
-        if (number.isEmpty()) {
-            return Collections.emptySet();
-        }
-
-        Collection<String> rv = new HashSet<>();
-
-        for (int i = 1; i < number.length(); i++) {
-            String front = number.substring(0, i);
-            String rest = number.substring(i);
-            wordsForNumber(front).stream()
-                .flatMap(h -> encode_inline(rest).stream().map(t -> h + " " + t))
-                .forEach(rv::add);
-        }
-
-        rv.addAll(wordsForNumber(number));
-
-        return rv;
-    }
-
-    @Benchmark
-    public int bulk_par_range_concurrent() {
-        // force collect
-        return PhoneCodeProblem.get(SIZE)
-                               .flatMap(this::encode_par1)
-                               .collect(Collectors.toConcurrentMap(
-                                    Function.identity(),
-                                    Function.identity(),
-                                    (l, r) -> l))
-                               .keySet()
-                               .size();
-    }
-
-    @Benchmark
-    public int bulk_par_boxed_range_concurrent() {
-        // force collect
-        return PhoneCodeProblem.get(SIZE)
-                               .flatMap(this::encode_par2)
-                               .collect(Collectors.toConcurrentMap(
-                                       Function.identity(),
-                                       Function.identity(),
-                                       (l, r) -> l))
-                               .keySet()
-                               .size();
-    }
-
-    @Benchmark
-    public int bulk_par_range() {
-        // force collect
-        return PhoneCodeProblem.get(SIZE)
-                               .flatMap(this::encode_par1)
-                               .collect(Collectors.toSet())
-                               .size();
-    }
-
-    @Benchmark
-    public int bulk_par_boxed_range() {
-        // force collect
-        return PhoneCodeProblem.get(SIZE)
-                               .flatMap(this::encode_par2)
-                               .collect(Collectors.toSet())
-                               .size();
-    }
-
-    @Benchmark
-    public int bulk_ser_range() {
-        // force collect
-        return PhoneCodeProblem.get(SIZE)
-                               .flatMap(this::encode_ser)
-                               .collect(Collectors.toSet())
-                               .size();
-    }
-
-    @Benchmark
-    public int bulk_ser_loop_concat() {
-        // force collect
-        return PhoneCodeProblem.get(SIZE)
-                               .flatMap(this::encode_loop_concat)
-                               .collect(Collectors.toSet())
-                               .size();
-    }
-
-    @Benchmark
-    public int bulk_ser_loop_collect() {
-        return PhoneCodeProblem.get(SIZE)
-                               .map(this::encode_loop_collect)
-                               .map(Collection::size)
-                               .reduce(0, Integer::sum);
-    }
-
-    @Benchmark
-    public int bulk_ser_inline() {
-        return PhoneCodeProblem.get(SIZE)
-                               .map(this::encode_inline)
-                               .map(Collection::size)
-                               .reduce(0, Integer::sum);
-    }
-}
diff --git a/test/micro/org/openjdk/bench/java/util/stream/tasks/PhoneCode/PhoneCodeProblem.java b/test/micro/org/openjdk/bench/java/util/stream/tasks/PhoneCode/PhoneCodeProblem.java
deleted file mode 100644
index 98458a662bb..00000000000
--- a/test/micro/org/openjdk/bench/java/util/stream/tasks/PhoneCode/PhoneCodeProblem.java
+++ /dev/null
@@ -1,105 +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.
- */
-
-package org.openjdk.bench.java.util.stream.tasks.PhoneCode;
-
-import org.openjdk.bench.java.util.stream.tasks.DataProviders;
-
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-
-/**
- * The phone coder problem is trying to find full list of possible
- * mnemonic combination of numbers.
- *
- * The solution is based on Martin Odersky's devoxx 2010 scala talk,
- * where numbers are not allowed in the result, which is not really
- * correct, but we don't care.
- */
-public class PhoneCodeProblem {
-    // Map Character 'A'-'Z' to digits "2"-"9", key is charCode
-    private static final Map<Integer, String> CHAR_CODE;
-    // Map a string of digits to a collection of dictionary words
-    private static final Map<String, List<String>> WORD_CODES;
-
-    static {
-        HashMap<String, String> mnemonics = new HashMap<>(8);
-        mnemonics.put("2", "ABC");
-        mnemonics.put("3", "DEF");
-        mnemonics.put("4", "GHI");
-        mnemonics.put("5", "JKL");
-        mnemonics.put("6", "MNO");
-        mnemonics.put("7", "PQRS");
-        mnemonics.put("8", "TUV");
-        mnemonics.put("9", "WXYZ");
-
-        CHAR_CODE = new ConcurrentHashMap<>();
-        mnemonics.entrySet().stream().forEach(e ->
-                e.getValue().chars().forEach(c ->
-                    { CHAR_CODE.put(c, e.getKey()); } ));
-
-        WORD_CODES = loadDictionary();
-        // System.out.println("Dictionary loaded with " + WORD_CODES.size() + " number entries");
-    }
-
-    // Convert a word to its number form
-    private static String wordToNumber(String word) {
-        return word.chars().mapToObj(CHAR_CODE::get)
-                           .reduce("", String::concat);
-    }
-
-    // Prepare number -> word lookup table
-    private static Map<String, List<String>> loadDictionary() {
-        try (Stream<String> s = DataProviders.dictionary()) {
-            return s.filter(w -> w.length() > 1)
-                    .filter(w -> w.matches("[a-zA-Z]*"))
-                    .map(String::toUpperCase)
-                    .collect(Collectors.groupingBy(PhoneCodeProblem::wordToNumber));
-        } catch (Exception ex) {
-            ex.printStackTrace(System.err);
-            return Collections.emptyMap();
-        }
-    }
-
-    public static Collection<String> wordsForNumber(String number) {
-        Collection<String> rv = WORD_CODES.get(number);
-        return (null == rv) ? Collections.emptySet() : rv;
-    }
-
-    public static Stream<String> get(int length) {
-        String digits[] = { "2", "3", "4", "5", "6", "7", "8", "9" };
-
-        Stream<String> s = Arrays.stream(digits);
-        for (int i = 1; i < length; i++) {
-            s = s.flatMap(d1 -> Arrays.stream(digits).map(d2 -> d1 + d2));
-        }
-        return s;
-    }
-}

From 2eeda64632621c31c6b0a9257ddec7ce9bc5eaec Mon Sep 17 00:00:00 2001
From: Calvin Cheung <ccheung@openjdk.org>
Date: Thu, 27 Mar 2025 15:34:56 +0000
Subject: [PATCH 527/587] 8325132: CDS: Make sure the ArchiveRelocationMode is
 always printed in the log

Reviewed-by: shade, iklam
---
 src/hotspot/share/cds/metaspaceShared.cpp             |  2 ++
 .../runtime/cds/appcds/ArchiveRelocationTest.java     |  9 ++++++---
 .../jtreg/runtime/cds/appcds/TestSerialGCWithCDS.java |  4 ++--
 .../dynamicArchive/DynamicArchiveRelocationTest.java  | 11 ++++++++---
 4 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/src/hotspot/share/cds/metaspaceShared.cpp b/src/hotspot/share/cds/metaspaceShared.cpp
index 3677b3baf5f..7ce423e6f87 100644
--- a/src/hotspot/share/cds/metaspaceShared.cpp
+++ b/src/hotspot/share/cds/metaspaceShared.cpp
@@ -1134,6 +1134,8 @@ void MetaspaceShared::initialize_runtime_shared_and_meta_spaces() {
     log_info(cds)("Core region alignment: %zu", static_mapinfo->core_region_alignment());
     dynamic_mapinfo = open_dynamic_archive();
 
+    log_info(cds)("ArchiveRelocationMode: %d", ArchiveRelocationMode);
+
     // First try to map at the requested address
     result = map_archives(static_mapinfo, dynamic_mapinfo, true);
     if (result == MAP_ARCHIVE_MMAP_FAILURE) {
diff --git a/test/hotspot/jtreg/runtime/cds/appcds/ArchiveRelocationTest.java b/test/hotspot/jtreg/runtime/cds/appcds/ArchiveRelocationTest.java
index 55d9b207da6..b89ad7e1180 100644
--- a/test/hotspot/jtreg/runtime/cds/appcds/ArchiveRelocationTest.java
+++ b/test/hotspot/jtreg/runtime/cds/appcds/ArchiveRelocationTest.java
@@ -61,8 +61,8 @@ public class ArchiveRelocationTest {
 
         String appJar = ClassFileInstaller.getJarPath("hello.jar");
         String mainClass = "Hello";
-        String forceRelocation = "-XX:ArchiveRelocationMode=1";
-        String runRelocArg  = run_reloc  ? forceRelocation : "-showversion";
+        String maybeRelocation = "-XX:ArchiveRelocationMode=0";
+        String runRelocArg  = run_reloc  ? "-showversion" : maybeRelocation;
         String logArg = "-Xlog:cds=debug,cds+reloc=debug,cds+heap";
         String unlockArg = "-XX:+UnlockDiagnosticVMOptions";
         String nmtArg = "-XX:NativeMemoryTracking=detail";
@@ -75,7 +75,10 @@ public class ArchiveRelocationTest {
         TestCommon.run("-cp", appJar, unlockArg, runRelocArg, logArg,  mainClass)
             .assertNormalExit(output -> {
                     if (run_reloc) {
-                        output.shouldContain("Try to map archive(s) at an alternative address");
+                        output.shouldContain("ArchiveRelocationMode == 1: always map archive(s) at an alternative address")
+                              .shouldContain("Try to map archive(s) at an alternative address");
+                    } else {
+                        output.shouldContain("ArchiveRelocationMode: 0");
                     }
                 });
     }
diff --git a/test/hotspot/jtreg/runtime/cds/appcds/TestSerialGCWithCDS.java b/test/hotspot/jtreg/runtime/cds/appcds/TestSerialGCWithCDS.java
index 7dbdc43f443..402ad0b8744 100644
--- a/test/hotspot/jtreg/runtime/cds/appcds/TestSerialGCWithCDS.java
+++ b/test/hotspot/jtreg/runtime/cds/appcds/TestSerialGCWithCDS.java
@@ -128,14 +128,14 @@ public class TestSerialGCWithCDS {
                               "Hello");
         out.shouldNotContain(errMsg);
 
-        System.out.println("2. Exec with " + execGC + " and test ArchiveRelocationMode");
+        System.out.println("2. Exec with " + execGC + " and test ArchiveRelocationMode=0");
         out = TestCommon.exec(helloJar,
                               execGC,
                               small1,
                               small2,
                               coops,
                               "-Xlog:cds,cds+heap",
-                              "-XX:ArchiveRelocationMode=1", // always relocate shared metadata
+                              "-XX:ArchiveRelocationMode=0", // may relocate shared metadata
                               "Hello");
         out.shouldNotContain(errMsg);
 
diff --git a/test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/DynamicArchiveRelocationTest.java b/test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/DynamicArchiveRelocationTest.java
index 8758a397001..9e59a334670 100644
--- a/test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/DynamicArchiveRelocationTest.java
+++ b/test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/DynamicArchiveRelocationTest.java
@@ -79,9 +79,9 @@ public class DynamicArchiveRelocationTest extends DynamicArchiveTestBase {
 
         String appJar = ClassFileInstaller.getJarPath("hello.jar");
         String mainClass = "Hello";
-        String forceRelocation = "-XX:ArchiveRelocationMode=1";
-        String dumpTopRelocArg  = dump_top_reloc  ? forceRelocation : "-showversion";
-        String runRelocArg      = run_reloc       ? forceRelocation : "-showversion";
+        String maybeRelocation = "-XX:ArchiveRelocationMode=0";
+        String dumpTopRelocArg  = dump_top_reloc  ? "-showversion" : maybeRelocation;
+        String runRelocArg      = run_reloc       ? "-showversion" : maybeRelocation;
         String logArg = "-Xlog:cds=debug,cds+reloc=debug";
 
         String baseArchiveName = getNewArchiveName("base");
@@ -89,6 +89,7 @@ public class DynamicArchiveRelocationTest extends DynamicArchiveTestBase {
 
         String runtimeMsg = "Try to map archive(s) at an alternative address";
         String unlockArg = "-XX:+UnlockDiagnosticVMOptions";
+        String relocationModeMsg = "ArchiveRelocationMode: 0";
 
         // (1) Dump base archive (static)
 
@@ -105,6 +106,8 @@ public class DynamicArchiveRelocationTest extends DynamicArchiveTestBase {
             .assertNormalExit(output -> {
                     if (dump_top_reloc) {
                         output.shouldContain(runtimeMsg);
+                    } else {
+                        output.shouldContain(relocationModeMsg);
                     }
                 });
 
@@ -116,6 +119,8 @@ public class DynamicArchiveRelocationTest extends DynamicArchiveTestBase {
             .assertNormalExit(output -> {
                     if (run_reloc) {
                         output.shouldContain(runtimeMsg);
+                    } else {
+                        output.shouldContain(relocationModeMsg);
                     }
                 });
     }

From dc5c4148c70ca43d0a69c326e14898adca2f0bae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joel=20Sikstr=C3=B6m?= <jsikstro@openjdk.org>
Date: Thu, 27 Mar 2025 15:49:12 +0000
Subject: [PATCH 528/587] 8352762: Use EXACTFMT instead of expanded version
 where applicable

Reviewed-by: dholmes, stuefe
---
 src/hotspot/os/linux/os_linux.cpp             | 47 +++++++------------
 src/hotspot/os/windows/os_windows.cpp         |  4 +-
 .../share/gc/epsilon/epsilonInitLogger.cpp    |  3 +-
 .../share/gc/parallel/parallelInitLogger.cpp  | 12 ++---
 src/hotspot/share/gc/shared/gcInitLogger.cpp  |  9 ++--
 src/hotspot/share/gc/z/zCollectedHeap.cpp     |  5 +-
 src/hotspot/share/memory/memoryReserver.cpp   |  6 +--
 src/hotspot/share/runtime/os.cpp              | 34 +++++++-------
 8 files changed, 50 insertions(+), 70 deletions(-)

diff --git a/src/hotspot/os/linux/os_linux.cpp b/src/hotspot/os/linux/os_linux.cpp
index 57b8a37baf2..35455b7b4ad 100644
--- a/src/hotspot/os/linux/os_linux.cpp
+++ b/src/hotspot/os/linux/os_linux.cpp
@@ -3775,10 +3775,9 @@ static bool hugetlbfs_sanity_check(size_t page_size) {
     munmap(p, page_size);
     return true;
   } else {
-      log_info(pagesize)("Large page size (%zu%s) failed sanity check, "
+      log_info(pagesize)("Large page size (" EXACTFMT ") failed sanity check, "
                          "checking if smaller large page sizes are usable",
-                         byte_size_in_exact_unit(page_size),
-                         exact_unit_for_byte_size(page_size));
+                         EXACTFMTARGS(page_size));
       for (size_t page_size_ = page_sizes.next_smaller(page_size);
           page_size_ > os::vm_page_size();
           page_size_ = page_sizes.next_smaller(page_size_)) {
@@ -3787,9 +3786,8 @@ static bool hugetlbfs_sanity_check(size_t page_size) {
         if (p != MAP_FAILED) {
           // Mapping succeeded, sanity check passed.
           munmap(p, page_size_);
-          log_info(pagesize)("Large page size (%zu%s) passed sanity check",
-                             byte_size_in_exact_unit(page_size_),
-                             exact_unit_for_byte_size(page_size_));
+          log_info(pagesize)("Large page size (" EXACTFMT ") passed sanity check",
+                             EXACTFMTARGS(page_size_));
           return true;
         }
       }
@@ -3986,26 +3984,21 @@ void os::Linux::large_page_init() {
        LargePageSizeInBytes == 0 ||
        LargePageSizeInBytes == default_large_page_size) {
      large_page_size = default_large_page_size;
-     log_info(pagesize)("Using the default large page size: %zu%s",
-                        byte_size_in_exact_unit(large_page_size),
-                        exact_unit_for_byte_size(large_page_size));
+     log_info(pagesize)("Using the default large page size: " EXACTFMT,
+                        EXACTFMTARGS(large_page_size));
     } else {
       if (all_large_pages.contains(LargePageSizeInBytes)) {
         large_page_size = LargePageSizeInBytes;
-        log_info(pagesize)("Overriding default large page size (%zu%s) "
-                           "using LargePageSizeInBytes: %zu%s",
-                           byte_size_in_exact_unit(default_large_page_size),
-                           exact_unit_for_byte_size(default_large_page_size),
-                           byte_size_in_exact_unit(large_page_size),
-                           exact_unit_for_byte_size(large_page_size));
+        log_info(pagesize)("Overriding default large page size (" EXACTFMT ") "
+                           "using LargePageSizeInBytes: " EXACTFMT,
+                           EXACTFMTARGS(default_large_page_size),
+                           EXACTFMTARGS(large_page_size));
       } else {
         large_page_size = default_large_page_size;
-        log_info(pagesize)("LargePageSizeInBytes is not a valid large page size (%zu%s) "
-                           "using the default large page size: %zu%s",
-                           byte_size_in_exact_unit(LargePageSizeInBytes),
-                           exact_unit_for_byte_size(LargePageSizeInBytes),
-                           byte_size_in_exact_unit(large_page_size),
-                           exact_unit_for_byte_size(large_page_size));
+        log_info(pagesize)("LargePageSizeInBytes is not a valid large page size (" EXACTFMT ") "
+                           "using the default large page size: " EXACTFMT,
+                           EXACTFMTARGS(LargePageSizeInBytes),
+                           EXACTFMTARGS(large_page_size));
       }
     }
 
@@ -4046,9 +4039,8 @@ static void log_on_commit_special_failure(char* req_addr, size_t bytes,
   assert(error == ENOMEM, "Only expect to fail if no memory is available");
 
   log_info(pagesize)("Failed to reserve and commit memory with given page size. req_addr: " PTR_FORMAT
-                     " size: %zu%s, page size: %zu%s, (errno = %d)",
-                     p2i(req_addr), byte_size_in_exact_unit(bytes), exact_unit_for_byte_size(bytes),
-                     byte_size_in_exact_unit(page_size), exact_unit_for_byte_size(page_size), error);
+                     " size: " EXACTFMT ", page size: " EXACTFMT ", (errno = %d)",
+                     p2i(req_addr), EXACTFMTARGS(bytes), EXACTFMTARGS(page_size), error);
 }
 
 static bool commit_memory_special(size_t bytes,
@@ -4075,11 +4067,8 @@ static bool commit_memory_special(size_t bytes,
     return false;
   }
 
-  log_debug(pagesize)("Commit special mapping: " PTR_FORMAT ", size=%zu%s, page size=%zu%s",
-                      p2i(addr), byte_size_in_exact_unit(bytes),
-                      exact_unit_for_byte_size(bytes),
-                      byte_size_in_exact_unit(page_size),
-                      exact_unit_for_byte_size(page_size));
+  log_debug(pagesize)("Commit special mapping: " PTR_FORMAT ", size=" EXACTFMT ", page size=" EXACTFMT,
+                      p2i(addr), EXACTFMTARGS(bytes), EXACTFMTARGS(page_size));
   assert(is_aligned(addr, page_size), "Must be");
   return true;
 }
diff --git a/src/hotspot/os/windows/os_windows.cpp b/src/hotspot/os/windows/os_windows.cpp
index 7ad9f80141c..06fe8a826cd 100644
--- a/src/hotspot/os/windows/os_windows.cpp
+++ b/src/hotspot/os/windows/os_windows.cpp
@@ -3409,8 +3409,8 @@ static char* find_aligned_address(size_t size, size_t alignment) {
 }
 
 static char* reserve_large_pages_aligned(size_t size, size_t alignment, bool exec) {
-  log_debug(pagesize)("Reserving large pages at an aligned address, alignment=%zu%s",
-                      byte_size_in_exact_unit(alignment), exact_unit_for_byte_size(alignment));
+  log_debug(pagesize)("Reserving large pages at an aligned address, alignment=" EXACTFMT,
+                      EXACTFMTARGS(alignment));
 
   // Will try to find a suitable address at most 20 times. The reason we need to try
   // multiple times is that between finding the aligned address and trying to commit
diff --git a/src/hotspot/share/gc/epsilon/epsilonInitLogger.cpp b/src/hotspot/share/gc/epsilon/epsilonInitLogger.cpp
index fec5110fba3..7869de1cd79 100644
--- a/src/hotspot/share/gc/epsilon/epsilonInitLogger.cpp
+++ b/src/hotspot/share/gc/epsilon/epsilonInitLogger.cpp
@@ -33,8 +33,7 @@
 void EpsilonInitLogger::print_gc_specific() {
   if (UseTLAB) {
     size_t max_tlab = EpsilonHeap::heap()->max_tlab_size() * HeapWordSize;
-    log_info(gc, init)("TLAB Size Max: %zu%s",
-                       byte_size_in_exact_unit(max_tlab), exact_unit_for_byte_size(max_tlab));
+    log_info(gc, init)("TLAB Size Max: " EXACTFMT, EXACTFMTARGS(max_tlab));
     if (EpsilonElasticTLAB) {
       log_info(gc, init)("TLAB Size Elasticity: %.2fx", EpsilonTLABElasticity);
     }
diff --git a/src/hotspot/share/gc/parallel/parallelInitLogger.cpp b/src/hotspot/share/gc/parallel/parallelInitLogger.cpp
index b6d1034f60a..b28f0385c51 100644
--- a/src/hotspot/share/gc/parallel/parallelInitLogger.cpp
+++ b/src/hotspot/share/gc/parallel/parallelInitLogger.cpp
@@ -28,12 +28,12 @@
 
 void ParallelInitLogger::print_heap() {
   log_info_p(gc, init)("Alignments:"
-                       " Space %zu%s,"
-                       " Generation %zu%s,"
-                       " Heap %zu%s",
-                       byte_size_in_exact_unit(SpaceAlignment), exact_unit_for_byte_size(SpaceAlignment),
-                       byte_size_in_exact_unit(GenAlignment), exact_unit_for_byte_size(GenAlignment),
-                       byte_size_in_exact_unit(HeapAlignment), exact_unit_for_byte_size(HeapAlignment));
+                       " Space " EXACTFMT ","
+                       " Generation " EXACTFMT ","
+                       " Heap " EXACTFMT,
+                       EXACTFMTARGS(SpaceAlignment),
+                       EXACTFMTARGS(GenAlignment),
+                       EXACTFMTARGS(HeapAlignment));
   GCInitLogger::print_heap();
 }
 
diff --git a/src/hotspot/share/gc/shared/gcInitLogger.cpp b/src/hotspot/share/gc/shared/gcInitLogger.cpp
index 0a327ea7dfe..f2d9fffdc11 100644
--- a/src/hotspot/share/gc/shared/gcInitLogger.cpp
+++ b/src/hotspot/share/gc/shared/gcInitLogger.cpp
@@ -90,12 +90,9 @@ void GCInitLogger::print_compressed_oops() {
 }
 
 void GCInitLogger::print_heap() {
-  log_info_p(gc, init)("Heap Min Capacity: %zu%s",
-                       byte_size_in_exact_unit(MinHeapSize), exact_unit_for_byte_size(MinHeapSize));
-  log_info_p(gc, init)("Heap Initial Capacity: %zu%s",
-                       byte_size_in_exact_unit(InitialHeapSize), exact_unit_for_byte_size(InitialHeapSize));
-  log_info_p(gc, init)("Heap Max Capacity: %zu%s",
-                       byte_size_in_exact_unit(MaxHeapSize), exact_unit_for_byte_size(MaxHeapSize));
+  log_info_p(gc, init)("Heap Min Capacity: " EXACTFMT, EXACTFMTARGS(MinHeapSize));
+  log_info_p(gc, init)("Heap Initial Capacity: " EXACTFMT, EXACTFMTARGS(InitialHeapSize));
+  log_info_p(gc, init)("Heap Max Capacity: " EXACTFMT, EXACTFMTARGS(MaxHeapSize));
 
   log_info_p(gc, init)("Pre-touch: %s", AlwaysPreTouch ? "Enabled" : "Disabled");
 }
diff --git a/src/hotspot/share/gc/z/zCollectedHeap.cpp b/src/hotspot/share/gc/z/zCollectedHeap.cpp
index c43090f9699..29111062529 100644
--- a/src/hotspot/share/gc/z/zCollectedHeap.cpp
+++ b/src/hotspot/share/gc/z/zCollectedHeap.cpp
@@ -362,10 +362,7 @@ void ZCollectedHeap::print_on_error(outputStream* st) const {
   st->print_cr("ZGC Globals:");
   st->print_cr(" Young Collection:   %s/%u", ZGeneration::young()->phase_to_string(), ZGeneration::young()->seqnum());
   st->print_cr(" Old Collection:     %s/%u", ZGeneration::old()->phase_to_string(), ZGeneration::old()->seqnum());
-  st->print_cr(" Offset Max:         %zu%s (" PTR_FORMAT ")",
-               byte_size_in_exact_unit(ZAddressOffsetMax),
-               exact_unit_for_byte_size(ZAddressOffsetMax),
-               ZAddressOffsetMax);
+  st->print_cr(" Offset Max:         " EXACTFMT " (" PTR_FORMAT ")", EXACTFMTARGS(ZAddressOffsetMax), ZAddressOffsetMax);
   st->print_cr(" Page Size Small:    %zuM", ZPageSizeSmall / M);
   st->print_cr(" Page Size Medium:   %zuM", ZPageSizeMedium / M);
   st->cr();
diff --git a/src/hotspot/share/memory/memoryReserver.cpp b/src/hotspot/share/memory/memoryReserver.cpp
index dad88ae97e5..43cc71355ff 100644
--- a/src/hotspot/share/memory/memoryReserver.cpp
+++ b/src/hotspot/share/memory/memoryReserver.cpp
@@ -130,9 +130,9 @@ ReservedSpace MemoryReserver::reserve_memory_special(char* requested_address,
                                                      size_t alignment,
                                                      size_t page_size,
                                                      bool exec) {
-  log_trace(pagesize)("Attempt special mapping: size: %zu%s, alignment: %zu%s",
-                      byte_size_in_exact_unit(size), exact_unit_for_byte_size(size),
-                      byte_size_in_exact_unit(alignment), exact_unit_for_byte_size(alignment));
+  log_trace(pagesize)("Attempt special mapping: size: " EXACTFMT ", alignment: " EXACTFMT,
+                      EXACTFMTARGS(size),
+                      EXACTFMTARGS(alignment));
 
   char* base = os::reserve_memory_special(size, alignment, page_size, requested_address, exec);
 
diff --git a/src/hotspot/share/runtime/os.cpp b/src/hotspot/share/runtime/os.cpp
index be9b0eef455..4eb0621ff8a 100644
--- a/src/hotspot/share/runtime/os.cpp
+++ b/src/hotspot/share/runtime/os.cpp
@@ -1810,8 +1810,6 @@ int os::create_binary_file(const char* path, bool rewrite_existing) {
   return ::open(path, oflags, S_IREAD | S_IWRITE);
 }
 
-#define trace_page_size_params(size) byte_size_in_exact_unit(size), exact_unit_for_byte_size(size)
-
 void os::trace_page_sizes(const char* str,
                           const size_t region_min_size,
                           const size_t region_max_size,
@@ -1820,17 +1818,17 @@ void os::trace_page_sizes(const char* str,
                           const size_t page_size) {
 
   log_info(pagesize)("%s: "
-                     " min=%zu%s"
-                     " max=%zu%s"
+                     " min=" EXACTFMT
+                     " max=" EXACTFMT
                      " base=" PTR_FORMAT
-                     " size=%zu%s"
-                     " page_size=%zu%s",
+                     " size=" EXACTFMT
+                     " page_size=" EXACTFMT,
                      str,
-                     trace_page_size_params(region_min_size),
-                     trace_page_size_params(region_max_size),
+                     EXACTFMTARGS(region_min_size),
+                     EXACTFMTARGS(region_max_size),
                      p2i(base),
-                     trace_page_size_params(size),
-                     trace_page_size_params(page_size));
+                     EXACTFMTARGS(size),
+                     EXACTFMTARGS(page_size));
 }
 
 void os::trace_page_sizes_for_requested_size(const char* str,
@@ -1841,17 +1839,17 @@ void os::trace_page_sizes_for_requested_size(const char* str,
                                              const size_t page_size) {
 
   log_info(pagesize)("%s:"
-                     " req_size=%zu%s"
-                     " req_page_size=%zu%s"
+                     " req_size=" EXACTFMT
+                     " req_page_size=" EXACTFMT
                      " base=" PTR_FORMAT
-                     " size=%zu%s"
-                     " page_size=%zu%s",
+                     " size=" EXACTFMT
+                     " page_size=" EXACTFMT,
                      str,
-                     trace_page_size_params(requested_size),
-                     trace_page_size_params(requested_page_size),
+                     EXACTFMTARGS(requested_size),
+                     EXACTFMTARGS(requested_page_size),
                      p2i(base),
-                     trace_page_size_params(size),
-                     trace_page_size_params(page_size));
+                     EXACTFMTARGS(size),
+                     EXACTFMTARGS(page_size));
 }
 
 

From 1bd0ce1f51760d2e57e94b19b83d3ee0fa4aebcd Mon Sep 17 00:00:00 2001
From: William Kemper <wkemper@openjdk.org>
Date: Thu, 27 Mar 2025 16:34:19 +0000
Subject: [PATCH 529/587] 8352918: Shenandoah: Verifier does not deactivate
 barriers as intended

Reviewed-by: kdnilsen, shade, ysr
---
 .../share/gc/shenandoah/shenandoahRootVerifier.cpp   | 12 +++++++++---
 .../share/gc/shenandoah/shenandoahRootVerifier.hpp   |  3 ++-
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/hotspot/share/gc/shenandoah/shenandoahRootVerifier.cpp b/src/hotspot/share/gc/shenandoah/shenandoahRootVerifier.cpp
index 3fbf3e8d6d5..4c7ae68fdbe 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahRootVerifier.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahRootVerifier.cpp
@@ -46,13 +46,19 @@
 
 ShenandoahGCStateResetter::ShenandoahGCStateResetter() :
   _heap(ShenandoahHeap::heap()),
-  _gc_state(_heap->gc_state()) {
+  _saved_gc_state(_heap->gc_state()),
+  _saved_gc_state_changed(_heap->_gc_state_changed) {
+  // Clear state to deactivate barriers. Indicate that state has changed
+  // so that verifier threads will use this value, rather than thread local
+  // values (which we are _not_ changing here).
   _heap->_gc_state.clear();
+  _heap->_gc_state_changed = true;
 }
 
 ShenandoahGCStateResetter::~ShenandoahGCStateResetter() {
-  _heap->_gc_state.set(_gc_state);
-  assert(_heap->gc_state() == _gc_state, "Should be restored");
+  _heap->_gc_state.set(_saved_gc_state);
+  _heap->_gc_state_changed = _saved_gc_state_changed;
+  assert(_heap->gc_state() == _saved_gc_state, "Should be restored");
 }
 
 void ShenandoahRootVerifier::roots_do(OopIterateClosure* oops) {
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahRootVerifier.hpp b/src/hotspot/share/gc/shenandoah/shenandoahRootVerifier.hpp
index da7ca864dbb..405c69c4160 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahRootVerifier.hpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahRootVerifier.hpp
@@ -32,7 +32,8 @@
 class ShenandoahGCStateResetter : public StackObj {
 private:
   ShenandoahHeap* const _heap;
-  const char _gc_state;
+  const char _saved_gc_state;
+  const bool _saved_gc_state_changed;
 
 public:
   ShenandoahGCStateResetter();

From b73663a2b4fe7049fc0990c1a1e51221640b4e29 Mon Sep 17 00:00:00 2001
From: Aleksey Shipilev <shade@openjdk.org>
Date: Thu, 27 Mar 2025 18:10:53 +0000
Subject: [PATCH 530/587] 8351155: C1/C2: Remove 32-bit x86 specific FP
 rounding support

Reviewed-by: vlivanov, kvn
---
 src/hotspot/cpu/aarch64/c1_Defs_aarch64.hpp   |  5 --
 .../cpu/aarch64/c1_LIRGenerator_aarch64.cpp   |  2 +-
 src/hotspot/cpu/aarch64/matcher_aarch64.hpp   |  3 -
 src/hotspot/cpu/arm/arm.ad                    | 12 ---
 src/hotspot/cpu/arm/c1_Defs_arm.hpp           |  5 --
 src/hotspot/cpu/arm/matcher_arm.hpp           |  3 -
 src/hotspot/cpu/ppc/c1_Defs_ppc.hpp           |  6 --
 src/hotspot/cpu/ppc/matcher_ppc.hpp           |  3 -
 src/hotspot/cpu/ppc/ppc.ad                    | 22 -----
 src/hotspot/cpu/riscv/c1_Defs_riscv.hpp       |  5 --
 .../cpu/riscv/c1_LIRGenerator_riscv.cpp       |  2 +-
 src/hotspot/cpu/riscv/matcher_riscv.hpp       |  3 -
 src/hotspot/cpu/s390/c1_Defs_s390.hpp         |  5 --
 src/hotspot/cpu/s390/matcher_s390.hpp         |  3 -
 src/hotspot/cpu/s390/s390.ad                  | 17 ----
 src/hotspot/cpu/x86/c1_Defs_x86.hpp           |  6 --
 src/hotspot/cpu/x86/c1_LIRGenerator_x86.cpp   |  6 +-
 src/hotspot/cpu/x86/c1_LinearScan_x86.cpp     | 10 ---
 src/hotspot/cpu/x86/matcher_x86.hpp           |  7 --
 src/hotspot/share/adlc/formssel.cpp           |  2 -
 src/hotspot/share/c1/c1_Canonicalizer.cpp     |  1 -
 src/hotspot/share/c1/c1_Canonicalizer.hpp     |  1 -
 src/hotspot/share/c1/c1_Defs.hpp              |  7 --
 src/hotspot/share/c1/c1_GraphBuilder.cpp      | 43 +---------
 src/hotspot/share/c1/c1_GraphBuilder.hpp      |  1 -
 src/hotspot/share/c1/c1_Instruction.hpp       | 27 ------
 .../share/c1/c1_InstructionPrinter.cpp        |  6 --
 .../share/c1/c1_InstructionPrinter.hpp        |  1 -
 src/hotspot/share/c1/c1_LIR.cpp               | 21 -----
 src/hotspot/share/c1/c1_LIR.hpp               | 21 -----
 src/hotspot/share/c1/c1_LIRAssembler.cpp      | 16 ----
 src/hotspot/share/c1/c1_LIRAssembler.hpp      |  1 -
 src/hotspot/share/c1/c1_LIRGenerator.cpp      | 40 ---------
 src/hotspot/share/c1/c1_LIRGenerator.hpp      |  2 -
 src/hotspot/share/c1/c1_LinearScan.cpp        |  2 -
 src/hotspot/share/c1/c1_Optimizer.cpp         |  2 -
 .../share/c1/c1_RangeCheckElimination.hpp     |  1 -
 src/hotspot/share/c1/c1_ValueMap.hpp          |  1 -
 .../share/gc/shared/c2/barrierSetC2.cpp       |  5 --
 src/hotspot/share/opto/classes.hpp            |  2 -
 src/hotspot/share/opto/convertnode.cpp        | 86 -------------------
 src/hotspot/share/opto/convertnode.hpp        | 26 ------
 src/hotspot/share/opto/doCall.cpp             |  2 -
 src/hotspot/share/opto/graphKit.cpp           | 45 ----------
 src/hotspot/share/opto/graphKit.hpp           |  9 --
 src/hotspot/share/opto/library_call.cpp       | 38 +++-----
 src/hotspot/share/opto/library_call.hpp       |  1 -
 src/hotspot/share/opto/parse2.cpp             | 46 +++-------
 48 files changed, 34 insertions(+), 547 deletions(-)

diff --git a/src/hotspot/cpu/aarch64/c1_Defs_aarch64.hpp b/src/hotspot/cpu/aarch64/c1_Defs_aarch64.hpp
index 5f65ef5f043..51887619ec1 100644
--- a/src/hotspot/cpu/aarch64/c1_Defs_aarch64.hpp
+++ b/src/hotspot/cpu/aarch64/c1_Defs_aarch64.hpp
@@ -32,11 +32,6 @@ enum {
   pd_hi_word_offset_in_bytes = BytesPerWord
 };
 
-// explicit rounding operations are required to implement the strictFP mode
-enum {
-  pd_strict_fp_requires_explicit_rounding = false
-};
-
 // FIXME: There are no callee-saved
 
 // registers
diff --git a/src/hotspot/cpu/aarch64/c1_LIRGenerator_aarch64.cpp b/src/hotspot/cpu/aarch64/c1_LIRGenerator_aarch64.cpp
index e85daed7324..5fee15c8400 100644
--- a/src/hotspot/cpu/aarch64/c1_LIRGenerator_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/c1_LIRGenerator_aarch64.cpp
@@ -407,7 +407,7 @@ void LIRGenerator::do_ArithmeticOp_FPU(ArithmeticOp* x) {
 
   arithmetic_op_fpu(x->op(), reg, left.result(), right.result());
 
-  set_result(x, round_item(reg));
+  set_result(x, reg);
 }
 
 // for  _ladd, _lmul, _lsub, _ldiv, _lrem
diff --git a/src/hotspot/cpu/aarch64/matcher_aarch64.hpp b/src/hotspot/cpu/aarch64/matcher_aarch64.hpp
index 447c5f57a8a..a6cd0557758 100644
--- a/src/hotspot/cpu/aarch64/matcher_aarch64.hpp
+++ b/src/hotspot/cpu/aarch64/matcher_aarch64.hpp
@@ -115,9 +115,6 @@
   // C code as the Java calling convention forces doubles to be aligned.
   static const bool misaligned_doubles_ok = true;
 
-  // Advertise here if the CPU requires explicit rounding operations to implement strictfp mode.
-  static const bool strict_fp_requires_explicit_rounding = false;
-
   // Are floats converted to double when stored to stack during
   // deoptimization?
   static constexpr bool float_in_double() { return false; }
diff --git a/src/hotspot/cpu/arm/arm.ad b/src/hotspot/cpu/arm/arm.ad
index 6a935c26d54..486d51ac463 100644
--- a/src/hotspot/cpu/arm/arm.ad
+++ b/src/hotspot/cpu/arm/arm.ad
@@ -4510,18 +4510,6 @@ instruct unnecessary_membar_volatile() %{
 %}
 
 //----------Register Move Instructions-----------------------------------------
-// instruct roundDouble_nop(regD dst) %{
-//   match(Set dst (RoundDouble dst));
-//   ins_pipe(empty);
-// %}
-
-
-// instruct roundFloat_nop(regF dst) %{
-//   match(Set dst (RoundFloat dst));
-//   ins_pipe(empty);
-// %}
-
-
 
 // Cast Index to Pointer for unsafe natives
 instruct castX2P(iRegX src, iRegP dst) %{
diff --git a/src/hotspot/cpu/arm/c1_Defs_arm.hpp b/src/hotspot/cpu/arm/c1_Defs_arm.hpp
index 32e0b029648..5145efd011a 100644
--- a/src/hotspot/cpu/arm/c1_Defs_arm.hpp
+++ b/src/hotspot/cpu/arm/c1_Defs_arm.hpp
@@ -31,11 +31,6 @@ enum {
   pd_hi_word_offset_in_bytes = BytesPerWord
 };
 
-// explicit rounding operations are required to implement the strictFP mode
-enum {
-  pd_strict_fp_requires_explicit_rounding = false
-};
-
 #ifdef __SOFTFP__
 #define SOFT(n) n
 #define VFP(n)
diff --git a/src/hotspot/cpu/arm/matcher_arm.hpp b/src/hotspot/cpu/arm/matcher_arm.hpp
index a4436b7eab4..66fe8ac330e 100644
--- a/src/hotspot/cpu/arm/matcher_arm.hpp
+++ b/src/hotspot/cpu/arm/matcher_arm.hpp
@@ -101,9 +101,6 @@
   // Java calling convention forces doubles to be aligned.
   static const bool misaligned_doubles_ok = false;
 
-  // Advertise here if the CPU requires explicit rounding operations to implement strictfp mode.
-  static const bool strict_fp_requires_explicit_rounding = false;
-
   // Are floats converted to double when stored to stack during deoptimization?
   // ARM does not handle callee-save floats.
   static constexpr bool float_in_double() {
diff --git a/src/hotspot/cpu/ppc/c1_Defs_ppc.hpp b/src/hotspot/cpu/ppc/c1_Defs_ppc.hpp
index 9044b9edd26..f322e548e21 100644
--- a/src/hotspot/cpu/ppc/c1_Defs_ppc.hpp
+++ b/src/hotspot/cpu/ppc/c1_Defs_ppc.hpp
@@ -38,12 +38,6 @@ enum {
 };
 
 
-// Explicit rounding operations are not required to implement the strictFP mode.
-enum {
-  pd_strict_fp_requires_explicit_rounding = false
-};
-
-
 // registers
 enum {
   pd_nof_cpu_regs_frame_map = 32,              // Number of registers used during code emission.
diff --git a/src/hotspot/cpu/ppc/matcher_ppc.hpp b/src/hotspot/cpu/ppc/matcher_ppc.hpp
index 441339b94c6..666bec9e0c8 100644
--- a/src/hotspot/cpu/ppc/matcher_ppc.hpp
+++ b/src/hotspot/cpu/ppc/matcher_ppc.hpp
@@ -115,9 +115,6 @@
   // Java calling convention forces doubles to be aligned.
   static const bool misaligned_doubles_ok = true;
 
-  // Advertise here if the CPU requires explicit rounding operations to implement strictfp mode.
-  static const bool strict_fp_requires_explicit_rounding = false;
-
   // Do floats take an entire double register or just half?
   //
   // A float occupies a ppc64 double register. For the allocator, a
diff --git a/src/hotspot/cpu/ppc/ppc.ad b/src/hotspot/cpu/ppc/ppc.ad
index acb98f8ea5c..022a70d52a2 100644
--- a/src/hotspot/cpu/ppc/ppc.ad
+++ b/src/hotspot/cpu/ppc/ppc.ad
@@ -9537,28 +9537,6 @@ instruct sqrtF_reg(regF dst, regF src) %{
   ins_pipe(pipe_class_default);
 %}
 
-instruct roundDouble_nop(regD dst) %{
-  match(Set dst (RoundDouble dst));
-  ins_cost(0);
-
-  format %{ " -- \t// RoundDouble not needed - empty" %}
-  size(0);
-  // PPC results are already "rounded" (i.e., normal-format IEEE).
-  ins_encode( /*empty*/ );
-  ins_pipe(pipe_class_default);
-%}
-
-instruct roundFloat_nop(regF dst) %{
-  match(Set dst (RoundFloat dst));
-  ins_cost(0);
-
-  format %{ " -- \t// RoundFloat not needed - empty" %}
-  size(0);
-  // PPC results are already "rounded" (i.e., normal-format IEEE).
-  ins_encode( /*empty*/ );
-  ins_pipe(pipe_class_default);
-%}
-
 
 // Multiply-Accumulate
 // src1 * src2 + src3
diff --git a/src/hotspot/cpu/riscv/c1_Defs_riscv.hpp b/src/hotspot/cpu/riscv/c1_Defs_riscv.hpp
index bce24380298..65113656601 100644
--- a/src/hotspot/cpu/riscv/c1_Defs_riscv.hpp
+++ b/src/hotspot/cpu/riscv/c1_Defs_riscv.hpp
@@ -32,11 +32,6 @@ enum {
   pd_hi_word_offset_in_bytes = BytesPerWord
 };
 
-// explicit rounding operations are required to implement the strictFP mode
-enum {
-  pd_strict_fp_requires_explicit_rounding = false
-};
-
 // registers
 enum {
   pd_nof_cpu_regs_frame_map = Register::number_of_registers,       // number of registers used during code emission
diff --git a/src/hotspot/cpu/riscv/c1_LIRGenerator_riscv.cpp b/src/hotspot/cpu/riscv/c1_LIRGenerator_riscv.cpp
index 3868c5ea829..b9ebd49779e 100644
--- a/src/hotspot/cpu/riscv/c1_LIRGenerator_riscv.cpp
+++ b/src/hotspot/cpu/riscv/c1_LIRGenerator_riscv.cpp
@@ -355,7 +355,7 @@ void LIRGenerator::do_ArithmeticOp_FPU(ArithmeticOp* x) {
   LIR_Opr reg = rlock(x);
   arithmetic_op_fpu(x->op(), reg, left.result(), right.result());
 
-  set_result(x, round_item(reg));
+  set_result(x, reg);
 }
 
 // for  _ladd, _lmul, _lsub, _ldiv, _lrem
diff --git a/src/hotspot/cpu/riscv/matcher_riscv.hpp b/src/hotspot/cpu/riscv/matcher_riscv.hpp
index ed1519ec150..1b490a07f92 100644
--- a/src/hotspot/cpu/riscv/matcher_riscv.hpp
+++ b/src/hotspot/cpu/riscv/matcher_riscv.hpp
@@ -114,9 +114,6 @@
   // C code as the Java calling convention forces doubles to be aligned.
   static const bool misaligned_doubles_ok = true;
 
-  // Advertise here if the CPU requires explicit rounding operations to implement strictfp mode.
-  static const bool strict_fp_requires_explicit_rounding = false;
-
   // Are floats converted to double when stored to stack during
   // deoptimization?
   static constexpr bool float_in_double() { return false; }
diff --git a/src/hotspot/cpu/s390/c1_Defs_s390.hpp b/src/hotspot/cpu/s390/c1_Defs_s390.hpp
index 6343a40bb06..31e0f85efcc 100644
--- a/src/hotspot/cpu/s390/c1_Defs_s390.hpp
+++ b/src/hotspot/cpu/s390/c1_Defs_s390.hpp
@@ -32,11 +32,6 @@ enum {
   pd_hi_word_offset_in_bytes = 0
 };
 
-// Explicit rounding operations are not required to implement the strictFP mode.
-enum {
-  pd_strict_fp_requires_explicit_rounding = false
-};
-
 // registers
 enum {
   pd_nof_cpu_regs_frame_map = 16,  // Number of registers used during code emission.
diff --git a/src/hotspot/cpu/s390/matcher_s390.hpp b/src/hotspot/cpu/s390/matcher_s390.hpp
index d8b1ae68f6f..e4c277c63a8 100644
--- a/src/hotspot/cpu/s390/matcher_s390.hpp
+++ b/src/hotspot/cpu/s390/matcher_s390.hpp
@@ -108,9 +108,6 @@
   // Java calling convention forces doubles to be aligned.
   static const bool misaligned_doubles_ok = true;
 
-  // Advertise here if the CPU requires explicit rounding operations to implement strictfp mode.
-  static const bool strict_fp_requires_explicit_rounding = false;
-
   // Do floats take an entire double register or just half?
   //
   // A float in resides in a zarch double register. When storing it by
diff --git a/src/hotspot/cpu/s390/s390.ad b/src/hotspot/cpu/s390/s390.ad
index d6ab89a61d2..fc7de7e70e9 100644
--- a/src/hotspot/cpu/s390/s390.ad
+++ b/src/hotspot/cpu/s390/s390.ad
@@ -5317,23 +5317,6 @@ instruct membar_storestore() %{
 
 
 //----------Register Move Instructions-----------------------------------------
-instruct roundDouble_nop(regD dst) %{
-  match(Set dst (RoundDouble dst));
-  ins_cost(0);
-  // TODO: s390 port size(FIXED_SIZE);
-  // z/Architecture results are already "rounded" (i.e., normal-format IEEE).
-  ins_encode();
-  ins_pipe(pipe_class_dummy);
-%}
-
-instruct roundFloat_nop(regF dst) %{
-  match(Set dst (RoundFloat dst));
-  ins_cost(0);
-  // TODO: s390 port size(FIXED_SIZE);
-  // z/Architecture results are already "rounded" (i.e., normal-format IEEE).
-  ins_encode();
-  ins_pipe(pipe_class_dummy);
-%}
 
 // Cast Long to Pointer for unsafe natives.
 instruct castX2P(iRegP dst, iRegL src) %{
diff --git a/src/hotspot/cpu/x86/c1_Defs_x86.hpp b/src/hotspot/cpu/x86/c1_Defs_x86.hpp
index 1125097ee05..1637789e798 100644
--- a/src/hotspot/cpu/x86/c1_Defs_x86.hpp
+++ b/src/hotspot/cpu/x86/c1_Defs_x86.hpp
@@ -31,12 +31,6 @@ enum {
   pd_hi_word_offset_in_bytes = BytesPerWord
 };
 
-// explicit rounding operations are required to implement the strictFP mode
-enum {
-  pd_strict_fp_requires_explicit_rounding = LP64_ONLY( false ) NOT_LP64 ( true )
-};
-
-
 // registers
 enum {
   pd_nof_cpu_regs_frame_map = NOT_LP64(8) LP64_ONLY(16),           // number of registers used during code emission
diff --git a/src/hotspot/cpu/x86/c1_LIRGenerator_x86.cpp b/src/hotspot/cpu/x86/c1_LIRGenerator_x86.cpp
index d0064b62dd8..107107a75b9 100644
--- a/src/hotspot/cpu/x86/c1_LIRGenerator_x86.cpp
+++ b/src/hotspot/cpu/x86/c1_LIRGenerator_x86.cpp
@@ -345,7 +345,7 @@ void LIRGenerator::do_NegateOp(NegateOp* x) {
 
   __ negate(value.result(), reg);
 
-  set_result(x, round_item(reg));
+  set_result(x, reg);
 }
 
 // for  _fadd, _fmul, _fsub, _fdiv, _frem
@@ -433,7 +433,7 @@ void LIRGenerator::do_ArithmeticOp_FPU(ArithmeticOp* x) {
     __ move(result_reg, result);
   } else {
     arithmetic_op_fpu(x->op(), reg, left.result(), right.result(), tmp);
-    set_result(x, round_item(reg));
+    set_result(x, reg);
   }
 #else
   if ((UseSSE >= 1 && x->op() == Bytecodes::_frem) || (UseSSE >= 2 && x->op() == Bytecodes::_drem)) {
@@ -454,7 +454,7 @@ void LIRGenerator::do_ArithmeticOp_FPU(ArithmeticOp* x) {
   } else {
     arithmetic_op_fpu(x->op(), reg, left.result(), right.result(), tmp);
   }
-  set_result(x, round_item(reg));
+  set_result(x, reg);
 #endif // _LP64
 }
 
diff --git a/src/hotspot/cpu/x86/c1_LinearScan_x86.cpp b/src/hotspot/cpu/x86/c1_LinearScan_x86.cpp
index 7c4da998db8..58816098435 100644
--- a/src/hotspot/cpu/x86/c1_LinearScan_x86.cpp
+++ b/src/hotspot/cpu/x86/c1_LinearScan_x86.cpp
@@ -624,16 +624,6 @@ void FpuStackAllocator::handle_op1(LIR_Op1* op1) {
       break;
     }
 
-    case lir_roundfp: {
-      assert(in->is_fpu_register() && !in->is_xmm_register(), "input must be in register");
-      assert(res->is_stack(), "result must be on stack");
-
-      insert_exchange(in);
-      new_in = to_fpu_stack_top(in);
-      pop_if_last_use(op1, in);
-      break;
-    }
-
     case lir_abs:
     case lir_sqrt:
     case lir_neg: {
diff --git a/src/hotspot/cpu/x86/matcher_x86.hpp b/src/hotspot/cpu/x86/matcher_x86.hpp
index b311f4144b2..51756903792 100644
--- a/src/hotspot/cpu/x86/matcher_x86.hpp
+++ b/src/hotspot/cpu/x86/matcher_x86.hpp
@@ -121,13 +121,6 @@
   // Java calling convention forces doubles to be aligned.
   static const bool misaligned_doubles_ok = true;
 
-  // Advertise here if the CPU requires explicit rounding operations to implement strictfp mode.
-#ifdef _LP64
-  static const bool strict_fp_requires_explicit_rounding = false;
-#else
-  static const bool strict_fp_requires_explicit_rounding = true;
-#endif
-
   // Are floats converted to double when stored to stack during deoptimization?
   // On x64 it is stored without conversion so we can use normal access.
   // On x32 it is stored with conversion only when FPU is used for floats.
diff --git a/src/hotspot/share/adlc/formssel.cpp b/src/hotspot/share/adlc/formssel.cpp
index 2edec13c0ff..7239031c898 100644
--- a/src/hotspot/share/adlc/formssel.cpp
+++ b/src/hotspot/share/adlc/formssel.cpp
@@ -4225,9 +4225,7 @@ int MatchRule::is_expensive() const {
         strcmp(opType,"FmaD") == 0 ||
         strcmp(opType,"FmaF") == 0 ||
         strcmp(opType,"FmaHF") == 0 ||
-        strcmp(opType,"RoundDouble")==0 ||
         strcmp(opType,"RoundDoubleMode")==0 ||
-        strcmp(opType,"RoundFloat")==0 ||
         strcmp(opType,"ReverseBytesI")==0 ||
         strcmp(opType,"ReverseBytesL")==0 ||
         strcmp(opType,"ReverseBytesUS")==0 ||
diff --git a/src/hotspot/share/c1/c1_Canonicalizer.cpp b/src/hotspot/share/c1/c1_Canonicalizer.cpp
index f5a1d14e694..573e1ac24d7 100644
--- a/src/hotspot/share/c1/c1_Canonicalizer.cpp
+++ b/src/hotspot/share/c1/c1_Canonicalizer.cpp
@@ -840,7 +840,6 @@ void Canonicalizer::do_Throw          (Throw*           x) {}
 void Canonicalizer::do_Base           (Base*            x) {}
 void Canonicalizer::do_OsrEntry       (OsrEntry*        x) {}
 void Canonicalizer::do_ExceptionObject(ExceptionObject* x) {}
-void Canonicalizer::do_RoundFP        (RoundFP*         x) {}
 void Canonicalizer::do_UnsafeGet      (UnsafeGet*       x) {}
 void Canonicalizer::do_UnsafePut      (UnsafePut*       x) {}
 void Canonicalizer::do_UnsafeGetAndSet(UnsafeGetAndSet* x) {}
diff --git a/src/hotspot/share/c1/c1_Canonicalizer.hpp b/src/hotspot/share/c1/c1_Canonicalizer.hpp
index 8c7651256e9..f1c99d4996c 100644
--- a/src/hotspot/share/c1/c1_Canonicalizer.hpp
+++ b/src/hotspot/share/c1/c1_Canonicalizer.hpp
@@ -88,7 +88,6 @@ class Canonicalizer: InstructionVisitor {
   virtual void do_Base           (Base*            x);
   virtual void do_OsrEntry       (OsrEntry*        x);
   virtual void do_ExceptionObject(ExceptionObject* x);
-  virtual void do_RoundFP        (RoundFP*         x);
   virtual void do_UnsafeGet      (UnsafeGet*       x);
   virtual void do_UnsafePut      (UnsafePut*       x);
   virtual void do_UnsafeGetAndSet(UnsafeGetAndSet* x);
diff --git a/src/hotspot/share/c1/c1_Defs.hpp b/src/hotspot/share/c1/c1_Defs.hpp
index 0e7b120ef8d..5803e1ce686 100644
--- a/src/hotspot/share/c1/c1_Defs.hpp
+++ b/src/hotspot/share/c1/c1_Defs.hpp
@@ -44,13 +44,6 @@ enum {
   hi_word_offset_in_bytes = pd_hi_word_offset_in_bytes
 };
 
-
-// the processor may require explicit rounding operations to implement the strictFP mode
-enum {
-  strict_fp_requires_explicit_rounding = pd_strict_fp_requires_explicit_rounding
-};
-
-
 // for debug info: a float value in a register may be saved in double precision by runtime stubs
 enum {
   float_saved_as_double = pd_float_saved_as_double
diff --git a/src/hotspot/share/c1/c1_GraphBuilder.cpp b/src/hotspot/share/c1/c1_GraphBuilder.cpp
index e918aa7d19a..b2750345a08 100644
--- a/src/hotspot/share/c1/c1_GraphBuilder.cpp
+++ b/src/hotspot/share/c1/c1_GraphBuilder.cpp
@@ -673,17 +673,6 @@ class MemoryBuffer: public CompilationResourceObj {
       return load;
     }
 
-    if (strict_fp_requires_explicit_rounding && load->type()->is_float_kind()) {
-#ifdef IA32
-      if (UseSSE < 2) {
-        // can't skip load since value might get rounded as a side effect
-        return load;
-      }
-#else
-      Unimplemented();
-#endif // IA32
-    }
-
     ciField* field = load->field();
     Value object   = load->obj();
     if (field->holder()->is_loaded() && !field->is_volatile()) {
@@ -1052,7 +1041,7 @@ void GraphBuilder::store_local(ValueStack* state, Value x, int index) {
     }
   }
 
-  state->store_local(index, round_fp(x));
+  state->store_local(index, x);
 }
 
 
@@ -1204,10 +1193,7 @@ void GraphBuilder::arithmetic_op(ValueType* type, Bytecodes::Code code, ValueSta
   Value y = pop(type);
   Value x = pop(type);
   Value res = new ArithmeticOp(code, x, y, state_before);
-  // Note: currently single-precision floating-point rounding on Intel is handled at the LIRGenerator level
-  res = append(res);
-  res = round_fp(res);
-  push(type, res);
+  push(type, append(res));
 }
 
 
@@ -2228,7 +2214,7 @@ void GraphBuilder::invoke(Bytecodes::Code code) {
   append_split(result);
 
   if (result_type != voidType) {
-    push(result_type, round_fp(result));
+    push(result_type, result);
   }
   if (profile_return() && result_type->is_object_kind()) {
     profile_return_type(result, target);
@@ -2356,29 +2342,6 @@ void GraphBuilder::throw_op(int bci) {
 }
 
 
-Value GraphBuilder::round_fp(Value fp_value) {
-  if (strict_fp_requires_explicit_rounding) {
-#ifdef IA32
-    // no rounding needed if SSE2 is used
-    if (UseSSE < 2) {
-      // Must currently insert rounding node for doubleword values that
-      // are results of expressions (i.e., not loads from memory or
-      // constants)
-      if (fp_value->type()->tag() == doubleTag &&
-          fp_value->as_Constant() == nullptr &&
-          fp_value->as_Local() == nullptr &&       // method parameters need no rounding
-          fp_value->as_RoundFP() == nullptr) {
-        return append(new RoundFP(fp_value));
-      }
-    }
-#else
-    Unimplemented();
-#endif // IA32
-  }
-  return fp_value;
-}
-
-
 Instruction* GraphBuilder::append_with_bci(Instruction* instr, int bci) {
   Canonicalizer canon(compilation(), instr, bci);
   Instruction* i1 = canon.canonical();
diff --git a/src/hotspot/share/c1/c1_GraphBuilder.hpp b/src/hotspot/share/c1/c1_GraphBuilder.hpp
index 270c344833e..9b9ee0072ad 100644
--- a/src/hotspot/share/c1/c1_GraphBuilder.hpp
+++ b/src/hotspot/share/c1/c1_GraphBuilder.hpp
@@ -266,7 +266,6 @@ class GraphBuilder {
   void monitorexit(Value x, int bci);
   void new_multi_array(int dimensions);
   void throw_op(int bci);
-  Value round_fp(Value fp_value);
 
   // stack/code manipulation helpers
   Instruction* append_with_bci(Instruction* instr, int bci);
diff --git a/src/hotspot/share/c1/c1_Instruction.hpp b/src/hotspot/share/c1/c1_Instruction.hpp
index e950afc981d..af22d5b8fc9 100644
--- a/src/hotspot/share/c1/c1_Instruction.hpp
+++ b/src/hotspot/share/c1/c1_Instruction.hpp
@@ -91,7 +91,6 @@ class         LookupSwitch;
 class       Return;
 class       Throw;
 class       Base;
-class   RoundFP;
 class   UnsafeOp;
 class     UnsafeGet;
 class     UnsafePut;
@@ -187,7 +186,6 @@ class InstructionVisitor: public StackObj {
   virtual void do_Base           (Base*            x) = 0;
   virtual void do_OsrEntry       (OsrEntry*        x) = 0;
   virtual void do_ExceptionObject(ExceptionObject* x) = 0;
-  virtual void do_RoundFP        (RoundFP*         x) = 0;
   virtual void do_UnsafeGet      (UnsafeGet*       x) = 0;
   virtual void do_UnsafePut      (UnsafePut*       x) = 0;
   virtual void do_UnsafeGetAndSet(UnsafeGetAndSet* x) = 0;
@@ -556,7 +554,6 @@ class Instruction: public CompilationResourceObj {
   virtual Return*           as_Return()          { return nullptr; }
   virtual Throw*            as_Throw()           { return nullptr; }
   virtual Base*             as_Base()            { return nullptr; }
-  virtual RoundFP*          as_RoundFP()         { return nullptr; }
   virtual ExceptionObject*  as_ExceptionObject() { return nullptr; }
   virtual UnsafeOp*         as_UnsafeOp()        { return nullptr; }
   virtual ProfileInvoke*    as_ProfileInvoke()   { return nullptr; }
@@ -2142,30 +2139,6 @@ LEAF(ExceptionObject, Instruction)
 };
 
 
-// Models needed rounding for floating-point values on Intel.
-// Currently only used to represent rounding of double-precision
-// values stored into local variables, but could be used to model
-// intermediate rounding of single-precision values as well.
-LEAF(RoundFP, Instruction)
- private:
-  Value _input;             // floating-point value to be rounded
-
- public:
-  RoundFP(Value input)
-  : Instruction(input->type()) // Note: should not be used for constants
-  , _input(input)
-  {
-    ASSERT_VALUES
-  }
-
-  // accessors
-  Value input() const                            { return _input; }
-
-  // generic
-  virtual void input_values_do(ValueVisitor* f)   { f->visit(&_input); }
-};
-
-
 BASE(UnsafeOp, Instruction)
  private:
   Value _object;                                 // Object to be fetched from or mutated
diff --git a/src/hotspot/share/c1/c1_InstructionPrinter.cpp b/src/hotspot/share/c1/c1_InstructionPrinter.cpp
index 35818188496..633c5e575c2 100644
--- a/src/hotspot/share/c1/c1_InstructionPrinter.cpp
+++ b/src/hotspot/share/c1/c1_InstructionPrinter.cpp
@@ -779,12 +779,6 @@ void InstructionPrinter::do_ExceptionObject(ExceptionObject* x) {
   output()->print("incoming exception");
 }
 
-
-void InstructionPrinter::do_RoundFP(RoundFP* x) {
-  output()->print("round_fp ");
-  print_value(x->input());
-}
-
 void InstructionPrinter::do_UnsafeGet(UnsafeGet* x) {
   print_unsafe_op(x, x->is_raw() ? "UnsafeGet (raw)" : "UnsafeGet");
   output()->put(')');
diff --git a/src/hotspot/share/c1/c1_InstructionPrinter.hpp b/src/hotspot/share/c1/c1_InstructionPrinter.hpp
index 0e5ba78bdc7..6bc31d3fe55 100644
--- a/src/hotspot/share/c1/c1_InstructionPrinter.hpp
+++ b/src/hotspot/share/c1/c1_InstructionPrinter.hpp
@@ -120,7 +120,6 @@ class InstructionPrinter: public InstructionVisitor {
   virtual void do_Base           (Base*            x);
   virtual void do_OsrEntry       (OsrEntry*        x);
   virtual void do_ExceptionObject(ExceptionObject* x);
-  virtual void do_RoundFP        (RoundFP*         x);
   virtual void do_UnsafeGet      (UnsafeGet*       x);
   virtual void do_UnsafePut      (UnsafePut*       x);
   virtual void do_UnsafeGetAndSet(UnsafeGetAndSet* x);
diff --git a/src/hotspot/share/c1/c1_LIR.cpp b/src/hotspot/share/c1/c1_LIR.cpp
index fc90530ec95..e11b59cd0a5 100644
--- a/src/hotspot/share/c1/c1_LIR.cpp
+++ b/src/hotspot/share/c1/c1_LIR.cpp
@@ -550,20 +550,6 @@ void LIR_OpVisitState::visit(LIR_Op* op) {
     }
 
 
-// LIR_OpRoundFP;
-    case lir_roundfp: {
-      assert(op->as_OpRoundFP() != nullptr, "must be");
-      LIR_OpRoundFP* opRoundFP = (LIR_OpRoundFP*)op;
-
-      assert(op->_info == nullptr, "info not used by this instruction");
-      assert(opRoundFP->_tmp->is_illegal(), "not used");
-      do_input(opRoundFP->_opr);
-      do_output(opRoundFP->_result);
-
-      break;
-    }
-
-
 // LIR_Op2
     case lir_cmp:
     case lir_cmp_l2i:
@@ -1731,7 +1717,6 @@ const char * LIR_Op::name() const {
      case lir_branch:                s = "branch";        break;
      case lir_cond_float_branch:     s = "flt_cond_br";   break;
      case lir_move:                  s = "move";          break;
-     case lir_roundfp:               s = "roundfp";       break;
      case lir_abs:                   s = "abs";           break;
      case lir_neg:                   s = "neg";           break;
      case lir_sqrt:                  s = "sqrt";          break;
@@ -1976,12 +1961,6 @@ void LIR_OpAllocObj::print_instr(outputStream* out) const {
   out->print("[lbl:" INTPTR_FORMAT "]", p2i(stub()->entry()));
 }
 
-void LIR_OpRoundFP::print_instr(outputStream* out) const {
-  _opr->print(out);         out->print(" ");
-  tmp()->print(out);        out->print(" ");
-  result_opr()->print(out); out->print(" ");
-}
-
 // LIR_Op2
 void LIR_Op2::print_instr(outputStream* out) const {
   if (code() == lir_cmp || code() == lir_branch || code() == lir_cond_float_branch) {
diff --git a/src/hotspot/share/c1/c1_LIR.hpp b/src/hotspot/share/c1/c1_LIR.hpp
index d9005c49c89..a4e0cc18daa 100644
--- a/src/hotspot/share/c1/c1_LIR.hpp
+++ b/src/hotspot/share/c1/c1_LIR.hpp
@@ -884,7 +884,6 @@ class      LIR_OpBranch;
 class      LIR_OpConvert;
 class      LIR_OpAllocObj;
 class      LIR_OpReturn;
-class      LIR_OpRoundFP;
 class    LIR_Op2;
 class    LIR_OpDelay;
 class    LIR_Op3;
@@ -938,7 +937,6 @@ enum LIR_Code {
       , lir_convert
       , lir_alloc_object
       , lir_monaddr
-      , lir_roundfp
       , lir_sqrt
       , lir_abs
       , lir_neg
@@ -1147,7 +1145,6 @@ class LIR_Op: public CompilationResourceObj {
   virtual LIR_OpLock* as_OpLock() { return nullptr; }
   virtual LIR_OpAllocArray* as_OpAllocArray() { return nullptr; }
   virtual LIR_OpAllocObj* as_OpAllocObj() { return nullptr; }
-  virtual LIR_OpRoundFP* as_OpRoundFP() { return nullptr; }
   virtual LIR_OpBranch* as_OpBranch() { return nullptr; }
   virtual LIR_OpReturn* as_OpReturn() { return nullptr; }
   virtual LIR_OpRTCall* as_OpRTCall() { return nullptr; }
@@ -1527,23 +1524,6 @@ class LIR_OpAllocObj : public LIR_Op1 {
 };
 
 
-// LIR_OpRoundFP
-class LIR_OpRoundFP : public LIR_Op1 {
- friend class LIR_OpVisitState;
-
- private:
-  LIR_Opr _tmp;
-
- public:
-  LIR_OpRoundFP(LIR_Opr reg, LIR_Opr stack_loc_temp, LIR_Opr result)
-    : LIR_Op1(lir_roundfp, reg, result)
-    , _tmp(stack_loc_temp) {}
-
-  LIR_Opr tmp() const                            { return _tmp; }
-  virtual LIR_OpRoundFP* as_OpRoundFP()          { return this; }
-  void print_instr(outputStream* out) const PRODUCT_RETURN;
-};
-
 // LIR_OpTypeCheck
 class LIR_OpTypeCheck: public LIR_Op {
  friend class LIR_OpVisitState;
@@ -2205,7 +2185,6 @@ class LIR_List: public CompilationResourceObj {
 
   // result is a stack location for old backend and vreg for UseLinearScan
   // stack_loc_temp is an illegal register for old backend
-  void roundfp(LIR_Opr reg, LIR_Opr stack_loc_temp, LIR_Opr result) { append(new LIR_OpRoundFP(reg, stack_loc_temp, result)); }
   void move(LIR_Opr src, LIR_Opr dst, CodeEmitInfo* info = nullptr) { append(new LIR_Op1(lir_move, src, dst, dst->type(), lir_patch_none, info)); }
   void move(LIR_Address* src, LIR_Opr dst, CodeEmitInfo* info = nullptr) { append(new LIR_Op1(lir_move, LIR_OprFact::address(src), dst, src->type(), lir_patch_none, info)); }
   void move(LIR_Opr src, LIR_Address* dst, CodeEmitInfo* info = nullptr) { append(new LIR_Op1(lir_move, src, LIR_OprFact::address(dst), dst->type(), lir_patch_none, info)); }
diff --git a/src/hotspot/share/c1/c1_LIRAssembler.cpp b/src/hotspot/share/c1/c1_LIRAssembler.cpp
index a5930ba54d8..4d50a863801 100644
--- a/src/hotspot/share/c1/c1_LIRAssembler.cpp
+++ b/src/hotspot/share/c1/c1_LIRAssembler.cpp
@@ -519,12 +519,6 @@ void LIR_Assembler::emit_op1(LIR_Op1* op) {
       }
       break;
 
-    case lir_roundfp: {
-      LIR_OpRoundFP* round_op = op->as_OpRoundFP();
-      roundfp_op(round_op->in_opr(), round_op->tmp(), round_op->result_opr(), round_op->pop_fpu_stack());
-      break;
-    }
-
     case lir_abs:
     case lir_sqrt:
     case lir_f2hf:
@@ -775,16 +769,6 @@ void LIR_Assembler::build_frame() {
 }
 
 
-void LIR_Assembler::roundfp_op(LIR_Opr src, LIR_Opr tmp, LIR_Opr dest, bool pop_fpu_stack) {
-  assert(strict_fp_requires_explicit_rounding, "not required");
-  assert((src->is_single_fpu() && dest->is_single_stack()) ||
-         (src->is_double_fpu() && dest->is_double_stack()),
-         "round_fp: rounds register -> stack location");
-
-  reg2stack (src, dest, src->type(), pop_fpu_stack);
-}
-
-
 void LIR_Assembler::move_op(LIR_Opr src, LIR_Opr dest, BasicType type, LIR_PatchCode patch_code, CodeEmitInfo* info, bool pop_fpu_stack, bool wide) {
   if (src->is_register()) {
     if (dest->is_register()) {
diff --git a/src/hotspot/share/c1/c1_LIRAssembler.hpp b/src/hotspot/share/c1/c1_LIRAssembler.hpp
index 34aa679daed..5b653b74ef5 100644
--- a/src/hotspot/share/c1/c1_LIRAssembler.hpp
+++ b/src/hotspot/share/c1/c1_LIRAssembler.hpp
@@ -215,7 +215,6 @@ class LIR_Assembler: public CompilationResourceObj {
 
   void logic_op(LIR_Code code, LIR_Opr left, LIR_Opr right, LIR_Opr dest);
 
-  void roundfp_op(LIR_Opr src, LIR_Opr tmp, LIR_Opr dest, bool pop_fpu_stack);
   void move_op(LIR_Opr src, LIR_Opr result, BasicType type,
                LIR_PatchCode patch_code, CodeEmitInfo* info, bool pop_fpu_stack, bool wide);
   void volatile_move_op(LIR_Opr src, LIR_Opr result, BasicType type, CodeEmitInfo* info);
diff --git a/src/hotspot/share/c1/c1_LIRGenerator.cpp b/src/hotspot/share/c1/c1_LIRGenerator.cpp
index 959e49749c5..214da537993 100644
--- a/src/hotspot/share/c1/c1_LIRGenerator.cpp
+++ b/src/hotspot/share/c1/c1_LIRGenerator.cpp
@@ -881,27 +881,6 @@ void LIRGenerator::arraycopy_helper(Intrinsic* x, int* flagsp, ciArrayKlass** ex
 }
 
 
-LIR_Opr LIRGenerator::round_item(LIR_Opr opr) {
-  assert(opr->is_register(), "why spill if item is not register?");
-
-  if (strict_fp_requires_explicit_rounding) {
-#ifdef IA32
-    if (UseSSE < 1 && opr->is_single_fpu()) {
-      LIR_Opr result = new_register(T_FLOAT);
-      set_vreg_flag(result, must_start_in_memory);
-      assert(opr->is_register(), "only a register can be spilled");
-      assert(opr->value_type()->is_float(), "rounding only for floats available");
-      __ roundfp(opr, LIR_OprFact::illegalOpr, result);
-      return result;
-    }
-#else
-    Unimplemented();
-#endif // IA32
-  }
-  return opr;
-}
-
-
 LIR_Opr LIRGenerator::force_to_spill(LIR_Opr value, BasicType t) {
   assert(type2size[t] == type2size[value->type()],
          "size mismatch: t=%s, value->type()=%s", type2name(t), type2name(value->type()));
@@ -2053,25 +2032,6 @@ void LIRGenerator::do_Throw(Throw* x) {
 }
 
 
-void LIRGenerator::do_RoundFP(RoundFP* x) {
-  assert(strict_fp_requires_explicit_rounding, "not required");
-
-  LIRItem input(x->input(), this);
-  input.load_item();
-  LIR_Opr input_opr = input.result();
-  assert(input_opr->is_register(), "why round if value is not in a register?");
-  assert(input_opr->is_single_fpu() || input_opr->is_double_fpu(), "input should be floating-point value");
-  if (input_opr->is_single_fpu()) {
-    set_result(x, round_item(input_opr)); // This code path not currently taken
-  } else {
-    LIR_Opr result = new_register(T_DOUBLE);
-    set_vreg_flag(result, must_start_in_memory);
-    __ roundfp(input_opr, LIR_OprFact::illegalOpr, result);
-    set_result(x, result);
-  }
-}
-
-
 void LIRGenerator::do_UnsafeGet(UnsafeGet* x) {
   BasicType type = x->basic_type();
   LIRItem src(x->object(), this);
diff --git a/src/hotspot/share/c1/c1_LIRGenerator.hpp b/src/hotspot/share/c1/c1_LIRGenerator.hpp
index 73bd883a746..e70bbd96189 100644
--- a/src/hotspot/share/c1/c1_LIRGenerator.hpp
+++ b/src/hotspot/share/c1/c1_LIRGenerator.hpp
@@ -233,7 +233,6 @@ class LIRGenerator: public InstructionVisitor, public BlockClosure {
 
   friend class LIRItem;
 
-  LIR_Opr round_item(LIR_Opr opr);
   LIR_Opr force_to_spill(LIR_Opr value, BasicType t);
 
   PhiResolverState& resolver_state() { return _resolver_state; }
@@ -579,7 +578,6 @@ class LIRGenerator: public InstructionVisitor, public BlockClosure {
   virtual void do_Base           (Base*            x);
   virtual void do_OsrEntry       (OsrEntry*        x);
   virtual void do_ExceptionObject(ExceptionObject* x);
-  virtual void do_RoundFP        (RoundFP*         x);
   virtual void do_UnsafeGet      (UnsafeGet*       x);
   virtual void do_UnsafePut      (UnsafePut*       x);
   virtual void do_UnsafeGetAndSet(UnsafeGetAndSet* x);
diff --git a/src/hotspot/share/c1/c1_LinearScan.cpp b/src/hotspot/share/c1/c1_LinearScan.cpp
index c099bb47d97..b0e2ff28c58 100644
--- a/src/hotspot/share/c1/c1_LinearScan.cpp
+++ b/src/hotspot/share/c1/c1_LinearScan.cpp
@@ -5888,7 +5888,6 @@ bool LinearScanWalker::activate_current() {
 
   } else if (allocator()->gen()->is_vreg_flag_set(cur->reg_num(), LIRGenerator::must_start_in_memory)) {
     // activating an interval that must start in a stack slot, but may get a register later
-    // used for lir_roundfp: rounding is done by store to stack and reload later
     TRACE_LINEAR_SCAN(4, tty->print_cr("      interval must start in stack slot -> split it before first use"));
     assert(cur->assigned_reg() == any_reg && cur->assigned_regHi() == any_reg, "register already assigned");
 
@@ -6770,7 +6769,6 @@ void LinearScanStatistic::collect(LinearScan* allocator) {
         case lir_push:
         case lir_pop:
         case lir_convert:
-        case lir_roundfp:
         case lir_cmove:           inc_counter(counter_misc_inst); break;
 
         default:                  inc_counter(counter_other_inst); break;
diff --git a/src/hotspot/share/c1/c1_Optimizer.cpp b/src/hotspot/share/c1/c1_Optimizer.cpp
index f8339b00049..721ad1d9ff5 100644
--- a/src/hotspot/share/c1/c1_Optimizer.cpp
+++ b/src/hotspot/share/c1/c1_Optimizer.cpp
@@ -577,7 +577,6 @@ public:
   void do_Base           (Base*            x);
   void do_OsrEntry       (OsrEntry*        x);
   void do_ExceptionObject(ExceptionObject* x);
-  void do_RoundFP        (RoundFP*         x);
   void do_UnsafeGet      (UnsafeGet*       x);
   void do_UnsafePut      (UnsafePut*       x);
   void do_UnsafeGetAndSet(UnsafeGetAndSet* x);
@@ -762,7 +761,6 @@ void NullCheckVisitor::do_Throw          (Throw*           x) { nce()->clear_las
 void NullCheckVisitor::do_Base           (Base*            x) {}
 void NullCheckVisitor::do_OsrEntry       (OsrEntry*        x) {}
 void NullCheckVisitor::do_ExceptionObject(ExceptionObject* x) { nce()->handle_ExceptionObject(x); }
-void NullCheckVisitor::do_RoundFP        (RoundFP*         x) {}
 void NullCheckVisitor::do_UnsafeGet      (UnsafeGet*       x) {}
 void NullCheckVisitor::do_UnsafePut      (UnsafePut*       x) {}
 void NullCheckVisitor::do_UnsafeGetAndSet(UnsafeGetAndSet* x) {}
diff --git a/src/hotspot/share/c1/c1_RangeCheckElimination.hpp b/src/hotspot/share/c1/c1_RangeCheckElimination.hpp
index 371dc59714b..833f5dd1e99 100644
--- a/src/hotspot/share/c1/c1_RangeCheckElimination.hpp
+++ b/src/hotspot/share/c1/c1_RangeCheckElimination.hpp
@@ -154,7 +154,6 @@ public:
     void do_Base           (Base*            x) { /* nothing to do */ };
     void do_OsrEntry       (OsrEntry*        x) { /* nothing to do */ };
     void do_ExceptionObject(ExceptionObject* x) { /* nothing to do */ };
-    void do_RoundFP        (RoundFP*         x) { /* nothing to do */ };
     void do_UnsafePut      (UnsafePut*       x) { /* nothing to do */ };
     void do_UnsafeGet      (UnsafeGet*       x) { /* nothing to do */ };
     void do_UnsafeGetAndSet(UnsafeGetAndSet* x) { /* nothing to do */ };
diff --git a/src/hotspot/share/c1/c1_ValueMap.hpp b/src/hotspot/share/c1/c1_ValueMap.hpp
index c36bb5559ba..12c372f27c8 100644
--- a/src/hotspot/share/c1/c1_ValueMap.hpp
+++ b/src/hotspot/share/c1/c1_ValueMap.hpp
@@ -203,7 +203,6 @@ class ValueNumberingVisitor: public InstructionVisitor {
   void do_Base           (Base*            x) { /* nothing to do */ }
   void do_OsrEntry       (OsrEntry*        x) { /* nothing to do */ }
   void do_ExceptionObject(ExceptionObject* x) { /* nothing to do */ }
-  void do_RoundFP        (RoundFP*         x) { /* nothing to do */ }
   void do_ProfileCall    (ProfileCall*     x) { /* nothing to do */ }
   void do_ProfileReturnType (ProfileReturnType*  x) { /* nothing to do */ }
   void do_ProfileInvoke  (ProfileInvoke*   x) { /* nothing to do */ };
diff --git a/src/hotspot/share/gc/shared/c2/barrierSetC2.cpp b/src/hotspot/share/gc/shared/c2/barrierSetC2.cpp
index b0082b6444d..92154e7a46e 100644
--- a/src/hotspot/share/gc/shared/c2/barrierSetC2.cpp
+++ b/src/hotspot/share/gc/shared/c2/barrierSetC2.cpp
@@ -149,11 +149,6 @@ Node* BarrierSetC2::store_at_resolved(C2Access& access, C2AccessValue& val) cons
     C2ParseAccess& parse_access = static_cast<C2ParseAccess&>(access);
 
     GraphKit* kit = parse_access.kit();
-    if (bt == T_DOUBLE) {
-      Node* new_val = kit->dprecision_rounding(val.node());
-      val.set_node(new_val);
-    }
-
     store = kit->store_to_memory(kit->control(), access.addr().node(), val.node(), bt,
                                  mo, requires_atomic_access, unaligned, mismatched,
                                  unsafe, access.barrier_data());
diff --git a/src/hotspot/share/opto/classes.hpp b/src/hotspot/share/opto/classes.hpp
index 41b621dfce9..a8d1a29250a 100644
--- a/src/hotspot/share/opto/classes.hpp
+++ b/src/hotspot/share/opto/classes.hpp
@@ -313,10 +313,8 @@ macro(ReverseI)
 macro(ReverseL)
 macro(ReverseV)
 macro(Root)
-macro(RoundDouble)
 macro(RoundDoubleMode)
 macro(RoundDoubleModeV)
-macro(RoundFloat)
 macro(RotateLeft)
 macro(RotateLeftV)
 macro(RotateRight)
diff --git a/src/hotspot/share/opto/convertnode.cpp b/src/hotspot/share/opto/convertnode.cpp
index bdfb211da83..3e99277d903 100644
--- a/src/hotspot/share/opto/convertnode.cpp
+++ b/src/hotspot/share/opto/convertnode.cpp
@@ -181,16 +181,6 @@ const Type* ConvD2INode::Value(PhaseGVN* phase) const {
   return TypeInt::make( SharedRuntime::d2i( td->getd() ) );
 }
 
-//------------------------------Ideal------------------------------------------
-// If converting to an int type, skip any rounding nodes
-Node *ConvD2INode::Ideal(PhaseGVN *phase, bool can_reshape) {
-  if (in(1)->Opcode() == Op_RoundDouble) {
-    set_req(1, in(1)->in(1));
-    return this;
-  }
-  return nullptr;
-}
-
 //------------------------------Identity---------------------------------------
 // Int's can be converted to doubles with no loss of bits.  Hence
 // converting an integer to a double and back to an integer is a NOP.
@@ -217,16 +207,6 @@ Node* ConvD2LNode::Identity(PhaseGVN* phase) {
   return this;
 }
 
-//------------------------------Ideal------------------------------------------
-// If converting to an int type, skip any rounding nodes
-Node *ConvD2LNode::Ideal(PhaseGVN *phase, bool can_reshape) {
-  if (in(1)->Opcode() == Op_RoundDouble) {
-    set_req(1, in(1)->in(1));
-    return this;
-  }
-  return nullptr;
-}
-
 //=============================================================================
 //------------------------------Value------------------------------------------
 const Type* ConvF2DNode::Value(PhaseGVN* phase) const {
@@ -300,16 +280,6 @@ Node* ConvF2INode::Identity(PhaseGVN* phase) {
   return this;
 }
 
-//------------------------------Ideal------------------------------------------
-// If converting to an int type, skip any rounding nodes
-Node *ConvF2INode::Ideal(PhaseGVN *phase, bool can_reshape) {
-  if (in(1)->Opcode() == Op_RoundFloat) {
-    set_req(1, in(1)->in(1));
-    return this;
-  }
-  return nullptr;
-}
-
 //=============================================================================
 //------------------------------Value------------------------------------------
 const Type* ConvF2LNode::Value(PhaseGVN* phase) const {
@@ -329,16 +299,6 @@ Node* ConvF2LNode::Identity(PhaseGVN* phase) {
   return this;
 }
 
-//------------------------------Ideal------------------------------------------
-// If converting to an int type, skip any rounding nodes
-Node *ConvF2LNode::Ideal(PhaseGVN *phase, bool can_reshape) {
-  if (in(1)->Opcode() == Op_RoundFloat) {
-    set_req(1, in(1)->in(1));
-    return this;
-  }
-  return nullptr;
-}
-
 //=============================================================================
 //------------------------------Value------------------------------------------
 const Type* ConvHF2FNode::Value(PhaseGVN* phase) const {
@@ -865,52 +825,6 @@ Node *ConvL2INode::Ideal(PhaseGVN *phase, bool can_reshape) {
   return nullptr;
 }
 
-
-
-//=============================================================================
-//------------------------------Identity---------------------------------------
-// Remove redundant roundings
-Node* RoundFloatNode::Identity(PhaseGVN* phase) {
-  assert(Matcher::strict_fp_requires_explicit_rounding, "should only generate for Intel");
-  // Do not round constants
-  if (phase->type(in(1))->base() == Type::FloatCon)  return in(1);
-  int op = in(1)->Opcode();
-  // Redundant rounding
-  if( op == Op_RoundFloat ) return in(1);
-  // Already rounded
-  if( op == Op_Parm ) return in(1);
-  if( op == Op_LoadF ) return in(1);
-  return this;
-}
-
-//------------------------------Value------------------------------------------
-const Type* RoundFloatNode::Value(PhaseGVN* phase) const {
-  return phase->type( in(1) );
-}
-
-//=============================================================================
-//------------------------------Identity---------------------------------------
-// Remove redundant roundings.  Incoming arguments are already rounded.
-Node* RoundDoubleNode::Identity(PhaseGVN* phase) {
-  assert(Matcher::strict_fp_requires_explicit_rounding, "should only generate for Intel");
-  // Do not round constants
-  if (phase->type(in(1))->base() == Type::DoubleCon)  return in(1);
-  int op = in(1)->Opcode();
-  // Redundant rounding
-  if( op == Op_RoundDouble ) return in(1);
-  // Already rounded
-  if( op == Op_Parm ) return in(1);
-  if( op == Op_LoadD ) return in(1);
-  if( op == Op_ConvF2D ) return in(1);
-  if( op == Op_ConvI2D ) return in(1);
-  return this;
-}
-
-//------------------------------Value------------------------------------------
-const Type* RoundDoubleNode::Value(PhaseGVN* phase) const {
-  return phase->type( in(1) );
-}
-
 //=============================================================================
 RoundDoubleModeNode* RoundDoubleModeNode::make(PhaseGVN& gvn, Node* arg, RoundDoubleModeNode::RoundingMode rmode) {
   ConINode* rm = gvn.intcon(rmode);
diff --git a/src/hotspot/share/opto/convertnode.hpp b/src/hotspot/share/opto/convertnode.hpp
index 64b2d2571b2..7035573589d 100644
--- a/src/hotspot/share/opto/convertnode.hpp
+++ b/src/hotspot/share/opto/convertnode.hpp
@@ -79,7 +79,6 @@ class ConvD2INode : public ConvertNode {
   virtual const Type* in_type() const { return Type::DOUBLE; }
   virtual const Type* Value(PhaseGVN* phase) const;
   virtual Node* Identity(PhaseGVN* phase);
-  virtual Node* Ideal(PhaseGVN* phase, bool can_reshape);
 };
 
 //------------------------------ConvD2LNode------------------------------------
@@ -91,7 +90,6 @@ class ConvD2LNode : public ConvertNode {
   virtual const Type* in_type() const { return Type::DOUBLE; }
   virtual const Type* Value(PhaseGVN* phase) const;
   virtual Node* Identity(PhaseGVN* phase);
-  virtual Node* Ideal(PhaseGVN* phase, bool can_reshape);
 };
 
 //------------------------------ConvF2DNode------------------------------------
@@ -124,7 +122,6 @@ public:
   virtual const Type* in_type() const { return TypeInt::FLOAT; }
   virtual const Type* Value(PhaseGVN* phase) const;
   virtual Node* Identity(PhaseGVN* phase);
-  virtual Node* Ideal(PhaseGVN* phase, bool can_reshape);
 };
 
 //------------------------------ConvF2LNode------------------------------------
@@ -136,7 +133,6 @@ public:
   virtual const Type* in_type() const { return TypeInt::FLOAT; }
   virtual const Type* Value(PhaseGVN* phase) const;
   virtual Node* Identity(PhaseGVN* phase);
-  virtual Node* Ideal(PhaseGVN* phase, bool can_reshape);
 };
 
 //------------------------------ConvHF2FNode------------------------------------
@@ -254,28 +250,6 @@ public:
   virtual uint  ideal_reg() const { return Op_RegI; }
 };
 
-//-----------------------------RoundFloatNode----------------------------------
-class RoundFloatNode: public Node {
-  public:
-  RoundFloatNode(Node* c, Node *in1): Node(c, in1) {}
-  virtual int   Opcode() const;
-  virtual const Type *bottom_type() const { return Type::FLOAT; }
-  virtual uint  ideal_reg() const { return Op_RegF; }
-  virtual Node* Identity(PhaseGVN* phase);
-  virtual const Type* Value(PhaseGVN* phase) const;
-};
-
-
-//-----------------------------RoundDoubleNode---------------------------------
-class RoundDoubleNode: public Node {
-  public:
-  RoundDoubleNode(Node* c, Node *in1): Node(c, in1) {}
-  virtual int   Opcode() const;
-  virtual const Type *bottom_type() const { return Type::DOUBLE; }
-  virtual uint  ideal_reg() const { return Op_RegD; }
-  virtual Node* Identity(PhaseGVN* phase);
-  virtual const Type* Value(PhaseGVN* phase) const;
-};
 
 //-----------------------------RoundDoubleModeNode-----------------------------
 class RoundDoubleModeNode: public Node {
diff --git a/src/hotspot/share/opto/doCall.cpp b/src/hotspot/share/opto/doCall.cpp
index f4b36674968..ad7b64f93f5 100644
--- a/src/hotspot/share/opto/doCall.cpp
+++ b/src/hotspot/share/opto/doCall.cpp
@@ -648,8 +648,6 @@ void Parse::do_call() {
   orig_callee = callee = nullptr;
 
   // ---------------------
-  // Round double arguments before call
-  round_double_arguments(cg->method());
 
   // Feed profiling data for arguments to the type system so it can
   // propagate it as speculative types
diff --git a/src/hotspot/share/opto/graphKit.cpp b/src/hotspot/share/opto/graphKit.cpp
index bb225eeabf5..5836ea579a2 100644
--- a/src/hotspot/share/opto/graphKit.cpp
+++ b/src/hotspot/share/opto/graphKit.cpp
@@ -2364,51 +2364,6 @@ void GraphKit::record_profiled_return_for_speculation() {
   }
 }
 
-void GraphKit::round_double_arguments(ciMethod* dest_method) {
-  if (Matcher::strict_fp_requires_explicit_rounding) {
-    // (Note:  TypeFunc::make has a cache that makes this fast.)
-    const TypeFunc* tf    = TypeFunc::make(dest_method);
-    int             nargs = tf->domain()->cnt() - TypeFunc::Parms;
-    for (int j = 0; j < nargs; j++) {
-      const Type *targ = tf->domain()->field_at(j + TypeFunc::Parms);
-      if (targ->basic_type() == T_DOUBLE) {
-        // If any parameters are doubles, they must be rounded before
-        // the call, dprecision_rounding does gvn.transform
-        Node *arg = argument(j);
-        arg = dprecision_rounding(arg);
-        set_argument(j, arg);
-      }
-    }
-  }
-}
-
-// rounding for strict float precision conformance
-Node* GraphKit::precision_rounding(Node* n) {
-  if (Matcher::strict_fp_requires_explicit_rounding) {
-#ifdef IA32
-    if (UseSSE == 0) {
-      return _gvn.transform(new RoundFloatNode(nullptr, n));
-    }
-#else
-    Unimplemented();
-#endif // IA32
-  }
-  return n;
-}
-
-// rounding for strict double precision conformance
-Node* GraphKit::dprecision_rounding(Node *n) {
-  if (Matcher::strict_fp_requires_explicit_rounding) {
-#ifdef IA32
-    if (UseSSE < 2) {
-      return _gvn.transform(new RoundDoubleNode(nullptr, n));
-    }
-#else
-    Unimplemented();
-#endif // IA32
-  }
-  return n;
-}
 
 //=============================================================================
 // Generate a fast path/slow path idiom.  Graph looks like:
diff --git a/src/hotspot/share/opto/graphKit.hpp b/src/hotspot/share/opto/graphKit.hpp
index b0150df04ed..d9a725fc10c 100644
--- a/src/hotspot/share/opto/graphKit.hpp
+++ b/src/hotspot/share/opto/graphKit.hpp
@@ -752,15 +752,6 @@ class GraphKit : public Phase {
   void final_sync(IdealKit& ideal);
 
   public:
-  // Helper function to round double arguments before a call
-  void round_double_arguments(ciMethod* dest_method);
-
-  // rounding for strict float precision conformance
-  Node* precision_rounding(Node* n);
-
-  // rounding for strict double precision conformance
-  Node* dprecision_rounding(Node* n);
-
   // Helper functions for fast/slow path codes
   Node* opt_iff(Node* region, Node* iff);
   Node* make_runtime_call(int flags,
diff --git a/src/hotspot/share/opto/library_call.cpp b/src/hotspot/share/opto/library_call.cpp
index 9e98c9883f7..3bb432ac607 100644
--- a/src/hotspot/share/opto/library_call.cpp
+++ b/src/hotspot/share/opto/library_call.cpp
@@ -1721,20 +1721,6 @@ bool LibraryCallKit::inline_string_char_access(bool is_store) {
   return true;
 }
 
-//--------------------------round_double_node--------------------------------
-// Round a double node if necessary.
-Node* LibraryCallKit::round_double_node(Node* n) {
-  if (Matcher::strict_fp_requires_explicit_rounding) {
-#ifdef IA32
-    if (UseSSE < 2) {
-      n = _gvn.transform(new RoundDoubleNode(nullptr, n));
-    }
-#else
-    Unimplemented();
-#endif // IA32
-  }
-  return n;
-}
 
 //------------------------------inline_math-----------------------------------
 // public static double Math.abs(double)
@@ -1743,7 +1729,7 @@ Node* LibraryCallKit::round_double_node(Node* n) {
 // public static double Math.log10(double)
 // public static double Math.round(double)
 bool LibraryCallKit::inline_double_math(vmIntrinsics::ID id) {
-  Node* arg = round_double_node(argument(0));
+  Node* arg = argument(0);
   Node* n = nullptr;
   switch (id) {
   case vmIntrinsics::_dabs:   n = new AbsDNode(                arg);  break;
@@ -1754,7 +1740,7 @@ bool LibraryCallKit::inline_double_math(vmIntrinsics::ID id) {
   case vmIntrinsics::_floor:  n = RoundDoubleModeNode::make(_gvn, arg, RoundDoubleModeNode::rmode_floor); break;
   case vmIntrinsics::_rint:   n = RoundDoubleModeNode::make(_gvn, arg, RoundDoubleModeNode::rmode_rint); break;
   case vmIntrinsics::_roundD: n = new RoundDNode(arg); break;
-  case vmIntrinsics::_dcopySign: n = CopySignDNode::make(_gvn, arg, round_double_node(argument(2))); break;
+  case vmIntrinsics::_dcopySign: n = CopySignDNode::make(_gvn, arg, argument(2)); break;
   case vmIntrinsics::_dsignum: n = SignumDNode::make(_gvn, arg); break;
   default:  fatal_unexpected_iid(id);  break;
   }
@@ -1788,8 +1774,8 @@ bool LibraryCallKit::runtime_math(const TypeFunc* call_type, address funcAddr, c
          "must be (DD)D or (D)D type");
 
   // Inputs
-  Node* a = round_double_node(argument(0));
-  Node* b = (call_type == OptoRuntime::Math_DD_D_Type()) ? round_double_node(argument(2)) : nullptr;
+  Node* a = argument(0);
+  Node* b = (call_type == OptoRuntime::Math_DD_D_Type()) ? argument(2) : nullptr;
 
   const TypePtr* no_memory_effects = nullptr;
   Node* trig = make_runtime_call(RC_LEAF, call_type, funcAddr, funcName,
@@ -1807,17 +1793,17 @@ bool LibraryCallKit::runtime_math(const TypeFunc* call_type, address funcAddr, c
 
 //------------------------------inline_math_pow-----------------------------
 bool LibraryCallKit::inline_math_pow() {
-  Node* exp = round_double_node(argument(2));
+  Node* exp = argument(2);
   const TypeD* d = _gvn.type(exp)->isa_double_constant();
   if (d != nullptr) {
     if (d->getd() == 2.0) {
       // Special case: pow(x, 2.0) => x * x
-      Node* base = round_double_node(argument(0));
+      Node* base = argument(0);
       set_result(_gvn.transform(new MulDNode(base, base)));
       return true;
     } else if (d->getd() == 0.5 && Matcher::match_rule_supported(Op_SqrtD)) {
       // Special case: pow(x, 0.5) => sqrt(x)
-      Node* base = round_double_node(argument(0));
+      Node* base = argument(0);
       Node* zero = _gvn.zerocon(T_DOUBLE);
 
       RegionNode* region = new RegionNode(3);
@@ -1963,8 +1949,8 @@ bool LibraryCallKit::inline_min_max(vmIntrinsics::ID id) {
     case vmIntrinsics::_minD_strict:
     case vmIntrinsics::_maxD_strict:
       assert(callee()->signature()->size() == 4, "minD/maxD has 2 parameters of size 2 each.");
-      a = round_double_node(argument(0));
-      b = round_double_node(argument(2));
+      a = argument(0);
+      b = argument(2);
       break;
     case vmIntrinsics::_minL:
     case vmIntrinsics::_maxL:
@@ -8483,9 +8469,9 @@ bool LibraryCallKit::inline_fma(vmIntrinsics::ID id) {
   case vmIntrinsics::_fmaD:
     assert(callee()->signature()->size() == 6, "fma has 3 parameters of size 2 each.");
     // no receiver since it is static method
-    a = round_double_node(argument(0));
-    b = round_double_node(argument(2));
-    c = round_double_node(argument(4));
+    a = argument(0);
+    b = argument(2);
+    c = argument(4);
     result = _gvn.transform(new FmaDNode(a, b, c));
     break;
   case vmIntrinsics::_fmaF:
diff --git a/src/hotspot/share/opto/library_call.hpp b/src/hotspot/share/opto/library_call.hpp
index 790c03be7ca..1f83e28932b 100644
--- a/src/hotspot/share/opto/library_call.hpp
+++ b/src/hotspot/share/opto/library_call.hpp
@@ -202,7 +202,6 @@ class LibraryCallKit : public GraphKit {
   bool inline_string_getCharsU();
   bool inline_string_copy(bool compress);
   bool inline_string_char_access(bool is_store);
-  Node* round_double_node(Node* n);
   bool runtime_math(const TypeFunc* call_type, address funcAddr, const char* funcName);
   bool inline_math_native(vmIntrinsics::ID id);
   bool inline_math(vmIntrinsics::ID id);
diff --git a/src/hotspot/share/opto/parse2.cpp b/src/hotspot/share/opto/parse2.cpp
index 6257a6b872d..1a4c3c91c4f 100644
--- a/src/hotspot/share/opto/parse2.cpp
+++ b/src/hotspot/share/opto/parse2.cpp
@@ -2062,19 +2062,19 @@ void Parse::do_one_bytecode() {
 
   // double stores
   case Bytecodes::_dstore_0:
-    set_pair_local( 0, dprecision_rounding(pop_pair()) );
+    set_pair_local( 0, pop_pair() );
     break;
   case Bytecodes::_dstore_1:
-    set_pair_local( 1, dprecision_rounding(pop_pair()) );
+    set_pair_local( 1, pop_pair() );
     break;
   case Bytecodes::_dstore_2:
-    set_pair_local( 2, dprecision_rounding(pop_pair()) );
+    set_pair_local( 2, pop_pair() );
     break;
   case Bytecodes::_dstore_3:
-    set_pair_local( 3, dprecision_rounding(pop_pair()) );
+    set_pair_local( 3, pop_pair() );
     break;
   case Bytecodes::_dstore:
-    set_pair_local( iter().get_index(), dprecision_rounding(pop_pair()) );
+    set_pair_local( iter().get_index(), pop_pair() );
     break;
 
   case Bytecodes::_pop:  dec_sp(1);   break;
@@ -2256,32 +2256,28 @@ void Parse::do_one_bytecode() {
     b = pop();
     a = pop();
     c = _gvn.transform( new SubFNode(a,b) );
-    d = precision_rounding(c);
-    push( d );
+    push(c);
     break;
 
   case Bytecodes::_fadd:
     b = pop();
     a = pop();
     c = _gvn.transform( new AddFNode(a,b) );
-    d = precision_rounding(c);
-    push( d );
+    push(c);
     break;
 
   case Bytecodes::_fmul:
     b = pop();
     a = pop();
     c = _gvn.transform( new MulFNode(a,b) );
-    d = precision_rounding(c);
-    push( d );
+    push(c);
     break;
 
   case Bytecodes::_fdiv:
     b = pop();
     a = pop();
     c = _gvn.transform( new DivFNode(nullptr,a,b) );
-    d = precision_rounding(c);
-    push( d );
+    push(c);
     break;
 
   case Bytecodes::_frem:
@@ -2331,8 +2327,6 @@ void Parse::do_one_bytecode() {
   case Bytecodes::_d2f:
     a = pop_pair();
     b = _gvn.transform( new ConvD2FNode(a));
-    // This breaks _227_mtrt (speed & correctness) and _222_mpegaudio (speed)
-    //b = _gvn.transform(new RoundFloatNode(nullptr, b) );
     push( b );
     break;
 
@@ -2340,11 +2334,6 @@ void Parse::do_one_bytecode() {
     if (Matcher::convL2FSupported()) {
       a = pop_pair();
       b = _gvn.transform( new ConvL2FNode(a));
-      // For x86_32.ad, FILD doesn't restrict precision to 24 or 53 bits.
-      // Rather than storing the result into an FP register then pushing
-      // out to memory to round, the machine instruction that implements
-      // ConvL2D is responsible for rounding.
-      // c = precision_rounding(b);
       push(b);
     } else {
       l2f();
@@ -2354,8 +2343,6 @@ void Parse::do_one_bytecode() {
   case Bytecodes::_l2d:
     a = pop_pair();
     b = _gvn.transform( new ConvL2DNode(a));
-    // For x86_32.ad, rounding is always necessary (see _l2f above).
-    // c = dprecision_rounding(b);
     push_pair(b);
     break;
 
@@ -2375,32 +2362,28 @@ void Parse::do_one_bytecode() {
     b = pop_pair();
     a = pop_pair();
     c = _gvn.transform( new SubDNode(a,b) );
-    d = dprecision_rounding(c);
-    push_pair( d );
+    push_pair(c);
     break;
 
   case Bytecodes::_dadd:
     b = pop_pair();
     a = pop_pair();
     c = _gvn.transform( new AddDNode(a,b) );
-    d = dprecision_rounding(c);
-    push_pair( d );
+    push_pair(c);
     break;
 
   case Bytecodes::_dmul:
     b = pop_pair();
     a = pop_pair();
     c = _gvn.transform( new MulDNode(a,b) );
-    d = dprecision_rounding(c);
-    push_pair( d );
+    push_pair(c);
     break;
 
   case Bytecodes::_ddiv:
     b = pop_pair();
     a = pop_pair();
     c = _gvn.transform( new DivDNode(nullptr,a,b) );
-    d = dprecision_rounding(c);
-    push_pair( d );
+    push_pair(c);
     break;
 
   case Bytecodes::_dneg:
@@ -2585,8 +2568,7 @@ void Parse::do_one_bytecode() {
   case Bytecodes::_i2f:
     a = pop();
     b = _gvn.transform( new ConvI2FNode(a) ) ;
-    c = precision_rounding(b);
-    push (b);
+    push(b);
     break;
 
   case Bytecodes::_i2d:

From 4ce9b4c72ef00d81fc07527a89d20cfa5400d673 Mon Sep 17 00:00:00 2001
From: Ioi Lam <iklam@openjdk.org>
Date: Thu, 27 Mar 2025 20:28:18 +0000
Subject: [PATCH 531/587] 8352435: Refactor CDS test library for execution and
 module packaging

Reviewed-by: ccheung, shade
---
 .../jtreg/runtime/cds/appcds/JarBuilder.java  | 283 +-------------
 .../AOTClassLinkingVMOptions.java             |  99 ++---
 .../jigsaw/modulepath/ExportModule.java       | 109 +++---
 test/lib/jdk/test/lib/cds/CDSAppTester.java   |  42 +-
 test/lib/jdk/test/lib/cds/CDSJarUtils.java    | 358 ++++++++++++++++++
 .../jdk/test/lib/cds/CDSModulePackager.java   | 164 ++++++++
 .../jdk/test/lib/cds/SimpleCDSAppTester.java  | 159 ++++++++
 7 files changed, 805 insertions(+), 409 deletions(-)
 create mode 100644 test/lib/jdk/test/lib/cds/CDSJarUtils.java
 create mode 100644 test/lib/jdk/test/lib/cds/CDSModulePackager.java
 create mode 100644 test/lib/jdk/test/lib/cds/SimpleCDSAppTester.java

diff --git a/test/hotspot/jtreg/runtime/cds/appcds/JarBuilder.java b/test/hotspot/jtreg/runtime/cds/appcds/JarBuilder.java
index 3afee0bb41f..9e4e58df3e7 100644
--- a/test/hotspot/jtreg/runtime/cds/appcds/JarBuilder.java
+++ b/test/hotspot/jtreg/runtime/cds/appcds/JarBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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,282 +22,27 @@
  *
  */
 
+import jdk.test.lib.cds.CDSJarUtils;
+
+
 /*
- * @summary Simple jar builder
- *   Input: jarName className1 className2 ...
- *     do not specify extensions, just the names
- *     E.g. prot_domain ProtDomainA ProtDomainB
- *   Output: A jar containing compiled classes, placed in a test classes folder
- * @library /open/test/lib
+ * This class is deprecated and should not be used by any new test cases. Use CDSJarUtils
+ * and jdk.test.lib.cds.CDSModulePackager instead.
  */
-
-import jdk.test.lib.JDKToolFinder;
-import jdk.test.lib.cds.CDSTestUtils;
-import jdk.test.lib.compiler.CompilerUtils;
-import jdk.test.lib.process.OutputAnalyzer;
-import jdk.test.lib.process.ProcessTools;
-import jdk.test.lib.helpers.ClassFileInstaller;
-import java.io.File;
-import java.nio.file.Path;
-import java.util.ArrayList;
-import java.util.spi.ToolProvider;
-
-public class JarBuilder {
-    // to turn DEBUG on via command line: -DJarBuilder.DEBUG=[true, TRUE]
-    private static final boolean DEBUG = Boolean.parseBoolean(System.getProperty("JarBuilder.DEBUG", "false"));
-    private static final String classDir = System.getProperty("test.classes");
-    private static final ToolProvider JAR = ToolProvider.findFirst("jar")
-        .orElseThrow(() -> new RuntimeException("ToolProvider for jar not found"));
-
-    public static String getJarFilePath(String jarName) {
-        return CDSTestUtils.getOutputDir() +  File.separator + jarName + ".jar";
-    }
-
-    // jar all files under dir, with manifest file man, with an optional versionArgs
-    // for generating a multi-release jar.
-    // The jar command is as follows:
-    // jar cmf \
-    //  <path to output jar> <path to the manifest file>\
-    //   -C <path to the base classes> .\
-    //    --release 9 -C <path to the versioned classes> .
-    // the last line begins with "--release" corresponds to the optional versionArgs.
-    public static String build(String jarName, File dir, String man, String ...versionArgs)
-        throws Exception {
-        ArrayList<String> args = new ArrayList<String>();
-        if (man != null) {
-            args.add("cfm");
-        } else {
-            args.add("cf");
-        }
-        String jarFile = getJarFilePath(jarName);
-        args.add(jarFile);
-        if (man != null) {
-            args.add(man);
-        }
-        args.add("-C");
-        args.add(dir.getAbsolutePath());
-        args.add(".");
-        for (String verArg : versionArgs) {
-            args.add(verArg);
-        }
-        createJar(args);
-        return jarFile;
-    }
-
-    public static String build(String jarName, String ...classNames)
-        throws Exception {
-
-        return createSimpleJar(classDir, getJarFilePath(jarName), classNames);
-    }
-
-    public static String build(boolean classesInWorkDir, String jarName, String ...classNames)
-        throws Exception {
-        if (classesInWorkDir) {
-            return createSimpleJar(".", getJarFilePath(jarName), classNames);
-        } else {
-            return build(jarName, classNames);
-        }
-    }
-
-
-    public static String buildWithManifest(String jarName, String manifest,
-        String jarClassesDir, String ...classNames) throws Exception {
-        String jarPath = getJarFilePath(jarName);
-        ArrayList<String> args = new ArrayList<String>();
-        args.add("cvfm");
-        args.add(jarPath);
-        args.add(System.getProperty("test.src") + File.separator + "test-classes"
-            + File.separator + manifest);
-        addClassArgs(args, jarClassesDir, classNames);
-        createJar(args);
-
-        return jarPath;
-    }
-
-
-    // Execute: jar uvf $jarFile -C $dir .
-    static void update(String jarFile, String dir) throws Exception {
-        String jarExe = JDKToolFinder.getJDKTool("jar");
-
-        ArrayList<String> args = new ArrayList<>();
-        args.add(jarExe);
-        args.add("uvf");
-        args.add(jarFile);
-        args.add("-C");
-        args.add(dir);
-        args.add(".");
-
-        executeProcess(args.toArray(new String[1]));
-    }
-
-    private static String createSimpleJar(String jarclassDir, String jarName,
-        String[] classNames) throws Exception {
-
-        ArrayList<String> args = new ArrayList<String>();
-        args.add("cf");
-        args.add(jarName);
-        addClassArgs(args, jarclassDir, classNames);
-        createJar(args);
-
-        return jarName;
-    }
-
-    private static void addClassArgs(ArrayList<String> args, String jarclassDir,
-        String[] classNames) {
-
-        for (String name : classNames) {
-            args.add("-C");
-            args.add(jarclassDir);
-            args.add(name + ".class");
-        }
-    }
-
+public class JarBuilder extends CDSJarUtils {
     public static void createModularJar(String jarPath,
-                                      String classesDir,
-                                      String mainClass) throws Exception {
-        ArrayList<String> argList = new ArrayList<String>();
-        argList.add("--create");
-        argList.add("--file=" + jarPath);
-        if (mainClass != null) {
-            argList.add("--main-class=" + mainClass);
-        }
-        argList.add("-C");
-        argList.add(classesDir);
-        argList.add(".");
-        createJar(argList);
+                                        String classesDir,
+                                        String mainClass) throws Exception {
+        createModularJarWithManifest(jarPath, classesDir, mainClass, null);
     }
 
     public static void createModularJarWithManifest(String jarPath,
                                                     String classesDir,
                                                     String mainClass,
                                                     String manifest) throws Exception {
-        ArrayList<String> argList = new ArrayList<String>();
-        argList.add("--create");
-        argList.add("--file=" + jarPath);
-        if (mainClass != null) {
-            argList.add("--main-class=" + mainClass);
-        }
-        argList.add("--manifest=" + manifest);
-        argList.add("-C");
-        argList.add(classesDir);
-        argList.add(".");
-        createJar(argList);
-    }
-
-    private static void createJar(ArrayList<String> args) {
-        if (DEBUG) printIterable("createJar args: ", args);
-
-        if (JAR.run(System.out, System.err, args.toArray(new String[1])) != 0) {
-            throw new RuntimeException("jar operation failed");
-        }
-    }
-
-    // Many AppCDS tests use the same simple "hello.jar" which contains
-    // simple Hello.class and does not specify additional attributes.
-    // For this common use case, use this method to get the jar path.
-    // The method will check if the jar already exists
-    // (created by another test or test run), and will create the jar
-    // if it does not exist
-    public static String getOrCreateHelloJar() throws Exception {
-        String jarPath = getJarFilePath("hello");
-
-        File jarFile = new File(jarPath);
-        if (jarFile.exists()) {
-            return jarPath;
-        } else {
-            return build("hello", "Hello");
-        }
-    }
-
-    public static void compile(String dstPath, String source, String... extraArgs) throws Exception {
-        ArrayList<String> args = new ArrayList<String>();
-        args.add(JDKToolFinder.getCompileJDKTool("javac"));
-        args.add("-d");
-        args.add(dstPath);
-        if (extraArgs != null) {
-            for (String s : extraArgs) {
-                args.add(s);
-            }
-        }
-        args.add(source);
-
-        if (DEBUG) printIterable("compile args: ", args);
-
-        ProcessBuilder pb = new ProcessBuilder(args);
-        OutputAnalyzer output = new OutputAnalyzer(pb.start());
-        output.shouldHaveExitValue(0);
-    }
-
-    public static void compileModule(Path src,
-                                     Path dest,
-                                     String modulePathArg // arg to --module-path
-                                     ) throws Exception {
-        boolean compiled = false;
-        if (modulePathArg == null) {
-            compiled = CompilerUtils.compile(src, dest);
-        } else {
-            compiled = CompilerUtils.compile(src, dest,
-                                           "--module-path", modulePathArg);
-        }
-        if (!compiled) {
-            throw new RuntimeException("module did not compile");
-        }
-    }
-
-    static final String keyTool = JDKToolFinder.getJDKTool("keytool");
-    static final String jarSigner = JDKToolFinder.getJDKTool("jarsigner");
-
-    public static void signJarWithDisabledAlgorithm(String jarName) throws Exception {
-        String keyName = "key_with_disabled_alg";
-        executeProcess(keyTool,
-            "-genkey", "-keystore", "./keystore", "-alias", keyName,
-            "-storepass", "abc123", "-keypass", "abc123", "-keyalg", "dsa",
-            "-sigalg", "SHA1withDSA", "-keysize", "512", "-dname", "CN=jvmtest2")
-            .shouldHaveExitValue(0);
-
-        doSigning(jarName, keyName);
-    }
-
-    public static void signJar(String jarName) throws Exception {
-        String keyName = "mykey";
-        executeProcess(keyTool,
-            "-genkey", "-keystore", "./keystore", "-alias", keyName,
-            "-storepass", "abc123", "-keypass", "abc123", "-keyalg", "dsa",
-            "-dname", "CN=jvmtest")
-            .shouldHaveExitValue(0);
-
-        doSigning(jarName, keyName);
-    }
-
-    private static void doSigning(String jarName, String keyName) throws Exception {
-        executeProcess(jarSigner,
-           "-keystore", "./keystore", "-storepass", "abc123", "-keypass",
-           "abc123", "-signedjar", getJarFilePath("signed_" + jarName),
-           getJarFilePath(jarName), keyName)
-           .shouldHaveExitValue(0);
-    }
-
-    private static OutputAnalyzer executeProcess(String... cmds)
-        throws Exception {
-
-        JarBuilder.printArray("executeProcess: ", cmds);
-        return ProcessTools.executeProcess(new ProcessBuilder(cmds));
-    }
-
-    // diagnostic
-    public static void printIterable(String msg, Iterable<String> l) {
-        StringBuilder sum = new StringBuilder();
-        for (String s : l) {
-            sum.append(s).append(' ');
-        }
-        System.out.println(msg + sum.toString());
-    }
-
-    public static void printArray(String msg, String[] l) {
-        StringBuilder sum = new StringBuilder();
-        for (String s : l) {
-            sum.append(s).append(' ');
-        }
-        System.out.println(msg + sum.toString());
+        CDSJarUtils.buildFromDirectory(jarPath, classesDir,
+                                       JarOptions.of()
+                                           .setMainClass(mainClass)
+                                           .setManifest(manifest));
     }
 }
diff --git a/test/hotspot/jtreg/runtime/cds/appcds/aotClassLinking/AOTClassLinkingVMOptions.java b/test/hotspot/jtreg/runtime/cds/appcds/aotClassLinking/AOTClassLinkingVMOptions.java
index cb5da3a7bcf..0fb72774ff4 100644
--- a/test/hotspot/jtreg/runtime/cds/appcds/aotClassLinking/AOTClassLinkingVMOptions.java
+++ b/test/hotspot/jtreg/runtime/cds/appcds/aotClassLinking/AOTClassLinkingVMOptions.java
@@ -40,6 +40,7 @@
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
+import jdk.test.lib.cds.CDSModulePackager;
 import jdk.test.lib.cds.CDSTestUtils;
 import jdk.test.lib.helpers.ClassFileInstaller;
 import jdk.test.lib.process.OutputAnalyzer;
@@ -105,92 +106,50 @@ public class AOTClassLinkingVMOptions {
     }
 
     static void modulePathTests() throws Exception {
-        CDSModulePathUtils.init();
+        String TEST_ROOT = System.getProperty("test.root");
+        Path SRC_DIR = Paths.get(TEST_ROOT, "runtime/cds/appcds/jigsaw/modulepath/src");
+
+        String MAIN_MODULE = "com.foos";
+        String MAIN_CLASS = "com.foos.Test";
+
+        String[] appClasses = {MAIN_CLASS};
+
+        CDSModulePackager modulePackager = new CDSModulePackager(SRC_DIR);
+        modulePackager.createModularJarWithMainClass(MAIN_MODULE, MAIN_CLASS);
+
+        String modulePath = modulePackager.getOutputDir().toString();
 
         testCase("Cannot use mis-matched module path");
-        String goodModulePath = CDSModulePathUtils.getModulesDir().toString();
-        TestCommon.testDump(null, CDSModulePathUtils.getAppClasses(),
-                            "--module-path", goodModulePath,
+        TestCommon.testDump(null, appClasses,
+                            "--module-path", modulePath,
                             "-XX:+AOTClassLinking",
-                            "-m", CDSModulePathUtils.MAIN_MODULE);
+                            "-m", MAIN_MODULE);
         TestCommon.run("-Xlog:cds",
-                       "--module-path", goodModulePath,
-                       "-m", CDSModulePathUtils.MAIN_MODULE)
+                       "--module-path", modulePath,
+                       "-m", MAIN_MODULE)
             .assertNormalExit("Using AOT-linked classes: true");
 
         TestCommon.run("-Xlog:cds",
-                       "--module-path", goodModulePath + "/bad",
-                       "-m", CDSModulePathUtils.MAIN_MODULE)
+                       "--module-path", modulePath + "/bad",
+                       "-m", MAIN_MODULE)
             .assertAbnormalExit("CDS archive has aot-linked classes. It cannot be used when archived full module graph is not used.");
 
         testCase("Cannot use mis-matched --add-modules");
-        TestCommon.testDump(null, CDSModulePathUtils.getAppClasses(),
-                            "--module-path", goodModulePath,
+        TestCommon.testDump(null, appClasses,
+                            "--module-path", modulePath,
                             "-XX:+AOTClassLinking",
-                            "--add-modules", CDSModulePathUtils.MAIN_MODULE);
+                            "--add-modules", MAIN_MODULE);
         TestCommon.run("-Xlog:cds",
-                       "--module-path", goodModulePath,
-                       "--add-modules", CDSModulePathUtils.MAIN_MODULE,
-                       CDSModulePathUtils.MAIN_CLASS)
+                       "--module-path", modulePath,
+                       "--add-modules", MAIN_MODULE,
+                       MAIN_CLASS)
             .assertNormalExit("Using AOT-linked classes: true");
 
         TestCommon.run("-Xlog:cds",
-                       "--module-path", goodModulePath + "/bad",
-                       "--add-modules", CDSModulePathUtils.TEST_MODULE,
-                       CDSModulePathUtils.MAIN_CLASS)
+                       "--module-path", modulePath,
+                       "--add-modules", "java.base",
+                       MAIN_CLASS)
             .assertAbnormalExit("Mismatched values for property jdk.module.addmods",
                                 "CDS archive has aot-linked classes. It cannot be used when archived full module graph is not used.");
     }
 }
-
-// TODO: enhance and move this class to jdk.test.lib.cds.CDSModulePathUtils
-
-class CDSModulePathUtils {
-    private static String TEST_SRC = System.getProperty("test.root");
-    private static Path USER_DIR = Paths.get(CDSTestUtils.getOutputDir());
-    private static Path SRC_DIR = Paths.get(TEST_SRC, "runtime/cds/appcds/jigsaw/modulepath/src");
-    private static Path MODS_DIR = Paths.get("mods");
-
-    public static String MAIN_MODULE = "com.bars";
-    public static String TEST_MODULE = "com.foos";
-
-    public static String MAIN_CLASS = "com.bars.Main";
-    public static String TEST_CLASS = "com.foos.Test";
-    private static String appClasses[] = {MAIN_CLASS, TEST_CLASS};
-
-    private static Path modulesDir;
-
-    // This directory contains all the modular jar files
-    //     $USER_DIR/modules/com.bars.jar
-    //     $USER_DIR/modules/com.foos.jar
-    static Path getModulesDir() {
-        return modulesDir;
-    }
-
-    static String[] getAppClasses() {
-        return appClasses;
-    }
-
-    static void init() throws Exception  {
-        JarBuilder.compileModule(SRC_DIR.resolve(TEST_MODULE),
-                                 MODS_DIR.resolve(TEST_MODULE),
-                                 null);
-        JarBuilder.compileModule(SRC_DIR.resolve(MAIN_MODULE),
-                                 MODS_DIR.resolve(MAIN_MODULE),
-                                 MODS_DIR.toString());
-
-        String PATH_LIBS = "modules";
-        modulesDir = Files.createTempDirectory(USER_DIR, PATH_LIBS);
-        Path mainJar = modulesDir.resolve(MAIN_MODULE + ".jar");
-        Path testJar = modulesDir.resolve(TEST_MODULE + ".jar");
-
-        // modylibs contains both modules com.foos.jar, com.bars.jar
-        // build com.foos.jar
-        String classes = MODS_DIR.resolve(TEST_MODULE).toString();
-        JarBuilder.createModularJar(testJar.toString(), classes, TEST_CLASS);
-
-        // build com.bars.jar
-        classes = MODS_DIR.resolve(MAIN_MODULE).toString();
-        JarBuilder.createModularJar(mainJar.toString(), classes, MAIN_CLASS);
-    }
-}
diff --git a/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/modulepath/ExportModule.java b/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/modulepath/ExportModule.java
index de8219224b9..82ad0ac4e3d 100644
--- a/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/modulepath/ExportModule.java
+++ b/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/modulepath/ExportModule.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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,13 @@
  * @summary Tests involve exporting a module from the module path to a jar in the -cp.
  */
 
-import java.io.File;
-import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 
+import jdk.test.lib.cds.CDSJarUtils;
+import jdk.test.lib.cds.CDSModulePackager;
 import jdk.test.lib.cds.CDSTestUtils;
-import jdk.test.lib.compiler.CompilerUtils;
 import jdk.test.lib.process.OutputAnalyzer;
-import jdk.test.lib.Asserts;
 
 public class ExportModule {
 
@@ -56,102 +54,93 @@ public class ExportModule {
     // unnamed module package name
     private static final String PKG_NAME = "com.nomodule";
 
+    // A "library" class used by both MODULAR_MAIN_CLASS and NON_MODULAR_MAIN_CLASS
+    private static final String LIB_CLASS = "org.astro.World";
+
     // the module main class
-    private static final String MAIN_CLASS = "com.greetings.Main";
-    private static final String APP_CLASS = "org.astro.World";
+    private static final String MODULAR_MAIN_CLASS = "com.greetings.Main";
 
     // unnamed module main class
-    private static final String UNNAMED_MAIN = "com.nomodule.Main";
+    private static final String NON_MODULAR_MAIN_CLASS = "com.nomodule.Main";
 
-    private static Path moduleDir = null;
+    private static Path moduleDir1 = null;
     private static Path moduleDir2 = null;
-    private static Path appJar = null;
-    private static Path appJar2 = null;
+    private static Path modularAppJar = null; // a modular jar file that contains MODULAR_MAIN_CLASS
+    private static Path nonModularAppJar = null; // a non-modular jar file that contains NON_MODULAR_MAIN_CLASS
 
-    public static void buildTestModule() throws Exception {
+    private static void buildJars() throws Exception {
+        moduleDir2 = Paths.get("module-path2");
+        CDSModulePackager modulePackager2 = new CDSModulePackager(SRC_DIR, moduleDir2);
+        modulePackager2.createModularJar(TEST_MODULE2);
 
-        // javac -d mods/$TESTMODULE src/$TESTMODULE/**
-        JarBuilder.compileModule(SRC_DIR.resolve(TEST_MODULE2),
-                                 MODS_DIR.resolve(TEST_MODULE2),
-                                 null);
-
-        // javac -d mods/$TESTMODULE --module-path MOD_DIR src/$TESTMODULE/**
-        JarBuilder.compileModule(SRC_DIR.resolve(TEST_MODULE1),
-                                 MODS_DIR.resolve(TEST_MODULE1),
-                                 MODS_DIR.toString());
-
-        moduleDir = Files.createTempDirectory(USER_DIR, "mlib");
-        Path jar = moduleDir.resolve(TEST_MODULE2 + ".jar");
-        String classes = MODS_DIR.resolve(TEST_MODULE2).toString();
-        JarBuilder.createModularJar(jar.toString(), classes, null);
-
-        moduleDir2 = Files.createTempDirectory(USER_DIR, "mlib2");
-        appJar = moduleDir2.resolve(TEST_MODULE1 + ".jar");
-        classes = MODS_DIR.resolve(TEST_MODULE1).toString();
-        JarBuilder.createModularJar(appJar.toString(), classes, MAIN_CLASS);
-
-        // build a non-modular jar containing the main class which
+        // build a *modular* jar containing the MODULAR_MAIN_CLASS which
         // requires the org.astro package
-        boolean compiled
-            = CompilerUtils.compile(SRC_DIR.resolve(PKG_NAME),
-                                    MODS_DIR.resolve(PKG_NAME),
-                                    "--module-path", MODS_DIR.toString(),
-                                    "--add-modules", TEST_MODULE2,
-                                    "--add-exports", "org.astro/org.astro=ALL-UNNAMED");
-        Asserts.assertTrue(compiled, "test package did not compile");
+        moduleDir1 = Paths.get("module-path1");
+        CDSModulePackager modulePackager1 = new CDSModulePackager(SRC_DIR, moduleDir1);
+        modulePackager1.addExtraModulePath("module-path2");
+        modularAppJar = modulePackager1.createModularJar(TEST_MODULE1);
 
-        appJar2 = moduleDir2.resolve(PKG_NAME + ".jar");
-        classes = MODS_DIR.resolve(PKG_NAME).toString();
-        JarBuilder.createModularJar(appJar2.toString(), classes, null);
+        // build a *non-modular* jar containing the NON_MODULAR_MAIN_CLASS which
+        // requires the org.astro package
+        nonModularAppJar = USER_DIR.resolve("non-modular.jar");
+
+        CDSJarUtils.buildFromSourceDirectory(nonModularAppJar.toString(), SRC_DIR.resolve(PKG_NAME).toString(),
+                                             "--module-path", moduleDir2.toString(),
+                                             "--add-modules", TEST_MODULE2,
+                                             "--add-exports", "org.astro/org.astro=ALL-UNNAMED");
     }
 
     public static void main(String... args) throws Exception {
-        // compile the modules and create the modular jar files
-        buildTestModule();
-        String appClasses[] = {MAIN_CLASS, APP_CLASS};
+        buildJars();
+
+        // (1) Modular JAR
+
+        String[] appClasses = {MODULAR_MAIN_CLASS, LIB_CLASS};
         // create an archive with the class in the org.astro module built in the
         // previous step and the main class from the modular jar in the -cp
         // note: the main class is in the modular jar in the -cp which requires
-        // the module in the --module-path
+        // the dependent module, org.astro, in the --module-path
         OutputAnalyzer output = TestCommon.createArchive(
-                                        appJar.toString(), appClasses,
-                                        "--module-path", moduleDir.toString(),
-                                        "--add-modules", TEST_MODULE2, MAIN_CLASS);
+                                        modularAppJar.toString(), appClasses,
+                                        "--module-path", moduleDir2.toString(),
+                                        "--add-modules", TEST_MODULE2, MODULAR_MAIN_CLASS);
         TestCommon.checkDump(output);
 
         // run it using the archive
         // both the main class and the class from the org.astro module should
         // be loaded from the archive
         TestCommon.run("-Xlog:class+load=trace",
-                              "-cp", appJar.toString(),
-                              "--module-path", moduleDir.toString(),
-                              "--add-modules", TEST_MODULE2, MAIN_CLASS)
+                              "-cp", modularAppJar.toString(),
+                              "--module-path", moduleDir2.toString(),
+                              "--add-modules", TEST_MODULE2, MODULAR_MAIN_CLASS)
             .assertNormalExit(
                 "[class,load] org.astro.World source: shared objects file",
                 "[class,load] com.greetings.Main source: shared objects file");
 
-        String appClasses2[] = {UNNAMED_MAIN, APP_CLASS};
+        // (2) Non-modular JAR
+
+        String[] appClasses2 = {NON_MODULAR_MAIN_CLASS, LIB_CLASS};
         // create an archive with the main class from a non-modular jar in the
         // -cp and the class from the org.astro module
         // note: the org.astro package needs to be exported to "ALL-UNNAMED"
         // module since the jar in the -cp is a non-modular jar and thus it is
         // unnmaed.
         output = TestCommon.createArchive(
-                                        appJar2.toString(), appClasses2,
-                                        "--module-path", moduleDir.toString(),
+                                        nonModularAppJar.toString(), appClasses2,
+                                        "--module-path", moduleDir2.toString(),
                                         "--add-modules", TEST_MODULE2,
                                         "--add-exports", "org.astro/org.astro=ALL-UNNAMED",
-                                        UNNAMED_MAIN);
+                                        NON_MODULAR_MAIN_CLASS);
         TestCommon.checkDump(output);
 
         // both the main class and the class from the org.astro module should
         // be loaded from the archive
         TestCommon.run("-Xlog:class+load=trace",
-                       "-cp", appJar2.toString(),
-                       "--module-path", moduleDir.toString(),
+                       "-cp", nonModularAppJar.toString(),
+                       "--module-path", moduleDir2.toString(),
                        "--add-modules", TEST_MODULE2,
                        "--add-exports", "org.astro/org.astro=ALL-UNNAMED",
-                       UNNAMED_MAIN)
+                       NON_MODULAR_MAIN_CLASS)
             .assertNormalExit(
                 "[class,load] org.astro.World source: shared objects file",
                 "[class,load] com.nomodule.Main source: shared objects file");
diff --git a/test/lib/jdk/test/lib/cds/CDSAppTester.java b/test/lib/jdk/test/lib/cds/CDSAppTester.java
index d9f28ed2455..11f10781555 100644
--- a/test/lib/jdk/test/lib/cds/CDSAppTester.java
+++ b/test/lib/jdk/test/lib/cds/CDSAppTester.java
@@ -131,6 +131,11 @@ abstract public class CDSAppTester {
         return null;
     }
 
+    // optional
+    public String modulepath(RunMode runMode) {
+        return null;
+    }
+
     // must override
     // main class, followed by arguments to the main class
     abstract public String[] appCommandLine(RunMode runMode);
@@ -194,16 +199,31 @@ abstract public class CDSAppTester {
         return output;
     }
 
+    private String[] addClassOrModulePath(RunMode runMode, String[] cmdLine) {
+        String cp = classpath(runMode);
+        if (cp == null) {
+            // Override the "-cp ...." added by Jtreg
+            cmdLine = StringArrayUtils.concat(cmdLine, "-Djava.class.path=");
+        } else {
+            cmdLine = StringArrayUtils.concat(cmdLine, "-cp", cp);
+        }
+        String mp = modulepath(runMode);
+        if (mp != null) {
+            cmdLine = StringArrayUtils.concat(cmdLine, "--module-path", mp);
+        }
+        return cmdLine;
+    }
+
     private OutputAnalyzer recordAOTConfiguration() throws Exception {
         RunMode runMode = RunMode.TRAINING;
         String[] cmdLine = StringArrayUtils.concat(vmArgs(runMode),
                                                    "-XX:AOTMode=record",
                                                    "-XX:AOTConfiguration=" + aotConfigurationFile,
-                                                   "-cp", classpath(runMode),
                                                    logToFile(aotConfigurationFileLog,
                                                              "class+load=debug",
                                                              "cds=debug",
                                                              "cds+class=debug"));
+        cmdLine = addClassOrModulePath(runMode, cmdLine);
         cmdLine = StringArrayUtils.concat(cmdLine, appCommandLine(runMode));
         return executeAndCheck(cmdLine, runMode, aotConfigurationFile, aotConfigurationFileLog);
     }
@@ -213,9 +233,9 @@ abstract public class CDSAppTester {
         String[] cmdLine = StringArrayUtils.concat(vmArgs(runMode),
                                                    "-Xshare:off",
                                                    "-XX:DumpLoadedClassList=" + classListFile,
-                                                   "-cp", classpath(runMode),
                                                    logToFile(classListFileLog,
                                                              "class+load=debug"));
+        cmdLine = addClassOrModulePath(runMode, cmdLine);
         cmdLine = StringArrayUtils.concat(cmdLine, appCommandLine(runMode));
         return executeAndCheck(cmdLine, runMode, classListFile, classListFileLog);
     }
@@ -228,12 +248,13 @@ abstract public class CDSAppTester {
                                                    "-Xshare:dump",
                                                    "-XX:SharedArchiveFile=" + staticArchiveFile,
                                                    "-XX:SharedClassListFile=" + classListFile,
-                                                   "-cp", classpath(runMode),
                                                    logToFile(staticArchiveFileLog,
                                                              "cds=debug",
                                                              "cds+class=debug",
                                                              "cds+heap=warning",
                                                              "cds+resolve=debug"));
+        cmdLine = addClassOrModulePath(runMode, cmdLine);
+        cmdLine = StringArrayUtils.concat(cmdLine, appCommandLine(runMode));
         return executeAndCheck(cmdLine, runMode, staticArchiveFile, staticArchiveFileLog);
     }
 
@@ -245,12 +266,13 @@ abstract public class CDSAppTester {
                                                    "-XX:AOTMode=create",
                                                    "-XX:AOTConfiguration=" + aotConfigurationFile,
                                                    "-XX:AOTCache=" + aotCacheFile,
-                                                   "-cp", classpath(runMode),
                                                    logToFile(aotCacheFileLog,
                                                              "cds=debug",
                                                              "cds+class=debug",
                                                              "cds+heap=warning",
                                                              "cds+resolve=debug"));
+        cmdLine = addClassOrModulePath(runMode, cmdLine);
+        cmdLine = StringArrayUtils.concat(cmdLine, appCommandLine(runMode));
         return executeAndCheck(cmdLine, runMode, aotCacheFile, aotCacheFileLog);
     }
 
@@ -290,12 +312,12 @@ abstract public class CDSAppTester {
           cmdLine = StringArrayUtils.concat(vmArgs(runMode),
                                             "-Xlog:cds",
                                             "-XX:ArchiveClassesAtExit=" + dynamicArchiveFile,
-                                            "-cp", classpath(runMode),
                                             logToFile(dynamicArchiveFileLog,
                                                       "cds=debug",
                                                       "cds+class=debug",
                                                       "cds+resolve=debug",
                                                       "class+load=debug"));
+          cmdLine = addClassOrModulePath(runMode, cmdLine);
         }
         if (baseArchive != null) {
             cmdLine = StringArrayUtils.concat(cmdLine, "-XX:SharedArchiveFile=" + baseArchive);
@@ -319,8 +341,8 @@ abstract public class CDSAppTester {
         String[] cmdLine = StringArrayUtils.concat(vmArgs(runMode),
                                                    "-XX:+UnlockDiagnosticVMOptions",
                                                    "-XX:VerifyArchivedFields=2", // make sure archived heap objects are good.
-                                                   "-cp", classpath(runMode),
                                                    logToFile(productionRunLog(), "cds"));
+        cmdLine = addClassOrModulePath(runMode, cmdLine);
 
         if (isStaticWorkflow()) {
             cmdLine = StringArrayUtils.concat(cmdLine, "-Xshare:on", "-XX:SharedArchiveFile=" + staticArchiveFile);
@@ -368,21 +390,21 @@ abstract public class CDSAppTester {
         }
     }
 
-    private void runStaticWorkflow() throws Exception {
+    public void runStaticWorkflow() throws Exception {
         this.workflow = Workflow.STATIC;
         createClassList();
         dumpStaticArchive();
         productionRun();
     }
 
-    private void runDynamicWorkflow() throws Exception {
+    public void runDynamicWorkflow() throws Exception {
         this.workflow = Workflow.DYNAMIC;
         dumpDynamicArchive();
         productionRun();
     }
 
-    // See JEP 485
-    private void runAOTWorkflow() throws Exception {
+    // See JEP 483
+    public void runAOTWorkflow() throws Exception {
         this.workflow = Workflow.AOT;
         recordAOTConfiguration();
         createAOTCache();
diff --git a/test/lib/jdk/test/lib/cds/CDSJarUtils.java b/test/lib/jdk/test/lib/cds/CDSJarUtils.java
new file mode 100644
index 00000000000..a7ae2b460e5
--- /dev/null
+++ b/test/lib/jdk/test/lib/cds/CDSJarUtils.java
@@ -0,0 +1,358 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please 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.cds;
+
+import jdk.test.lib.JDKToolFinder;
+import jdk.test.lib.StringArrayUtils;
+import jdk.test.lib.cds.CDSTestUtils;
+import jdk.test.lib.compiler.CompilerUtils;
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.process.ProcessTools;
+import jdk.test.lib.util.FileUtils;
+import java.io.File;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.ArrayList;
+import java.util.spi.ToolProvider;
+
+public class CDSJarUtils {
+    // to turn DEBUG on via command line: -DCDSJarUtils.DEBUG=[true, TRUE]
+    private static final boolean DEBUG = Boolean.parseBoolean(System.getProperty("CDSJarUtils.DEBUG", "false"));
+    private static final String classDir = System.getProperty("test.classes");
+    private static final ToolProvider JAR = ToolProvider.findFirst("jar")
+        .orElseThrow(() -> new RuntimeException("ToolProvider for jar not found"));
+
+    public static String getJarFilePath(String jarName) {
+        return CDSTestUtils.getOutputDir() +  File.separator + jarName + ".jar";
+    }
+
+    // jar all files under dir, with manifest file man, with an optional versionArgs
+    // for generating a multi-release jar.
+    // The jar command is as follows:
+    // jar cmf \
+    //  <path to output jar> <path to the manifest file>\
+    //   -C <path to the base classes> .\
+    //    --release 9 -C <path to the versioned classes> .
+    // the last line begins with "--release" corresponds to the optional versionArgs.
+    public static String build(String jarName, File dir, String man, String ...versionArgs)
+        throws Exception {
+        ArrayList<String> args = new ArrayList<String>();
+        if (man != null) {
+            args.add("cfm");
+        } else {
+            args.add("cf");
+        }
+        String jarFile = getJarFilePath(jarName);
+        args.add(jarFile);
+        if (man != null) {
+            args.add(man);
+        }
+        args.add("-C");
+        args.add(dir.getAbsolutePath());
+        args.add(".");
+        for (String verArg : versionArgs) {
+            args.add(verArg);
+        }
+        createJar(args);
+        return jarFile;
+    }
+
+    public static String build(String jarName, String ...classNames)
+        throws Exception {
+
+        return createSimpleJar(classDir, getJarFilePath(jarName), classNames);
+    }
+
+    public static String build(boolean classesInWorkDir, String jarName, String ...classNames)
+        throws Exception {
+        if (classesInWorkDir) {
+            return createSimpleJar(".", getJarFilePath(jarName), classNames);
+        } else {
+            return build(jarName, classNames);
+        }
+    }
+
+
+    public static String buildWithManifest(String jarName, String manifest,
+        String jarClassesDir, String ...classNames) throws Exception {
+        String jarPath = getJarFilePath(jarName);
+        ArrayList<String> args = new ArrayList<String>();
+        args.add("cvfm");
+        args.add(jarPath);
+        args.add(System.getProperty("test.src") + File.separator + "test-classes"
+            + File.separator + manifest);
+        addClassArgs(args, jarClassesDir, classNames);
+        createJar(args);
+
+        return jarPath;
+    }
+
+
+    // Execute: jar uvf $jarFile -C $dir .
+    public static void update(String jarFile, String dir) throws Exception {
+        String jarExe = JDKToolFinder.getJDKTool("jar");
+
+        ArrayList<String> args = new ArrayList<>();
+        args.add(jarExe);
+        args.add("uvf");
+        args.add(jarFile);
+        args.add("-C");
+        args.add(dir);
+        args.add(".");
+
+        executeProcess(args.toArray(new String[1]));
+    }
+
+    private static String createSimpleJar(String jarclassDir, String jarName,
+        String[] classNames) throws Exception {
+
+        ArrayList<String> args = new ArrayList<String>();
+        args.add("cf");
+        args.add(jarName);
+        addClassArgs(args, jarclassDir, classNames);
+        createJar(args);
+
+        return jarName;
+    }
+
+    private static void addClassArgs(ArrayList<String> args, String jarclassDir,
+        String[] classNames) {
+
+        for (String name : classNames) {
+            args.add("-C");
+            args.add(jarclassDir);
+            args.add(name + ".class");
+        }
+    }
+
+    /*
+     * This class is for passing extra options to the "jar" command-line tool
+     * for buildFromDirectory() and buildFromSourceDirectory().
+     *
+     * E.g.
+     *
+     * buildFromSourceDirectory("out.jar", "src", JarOptions.of().setMainClass("MyMainClass"),
+     *                          "--add-exports", "java.base/jdk.internal.misc=ALL-UNNAMED");
+     */
+    public static class JarOptions {
+        private String [] options;
+        private JarOptions() {}
+
+        public static JarOptions of(String... options) {
+            JarOptions jo = new JarOptions();
+            jo.options = options;
+            return jo;
+        }
+
+        public JarOptions setMainClass(String mainClass) {
+            if (mainClass != null) {
+                options = StringArrayUtils.concat(options, "--main-class=" + mainClass);
+            }
+            return this;
+        }
+        public JarOptions setManifest(String manifest) {
+            if (manifest != null) {
+                options = StringArrayUtils.concat(options, "--manifest=" + manifest);
+            }
+            return this;
+        }
+    }
+
+    public static void buildFromDirectory(String jarPath,
+                                          String classesDir) throws Exception {
+        buildFromDirectory(jarPath, classesDir, null);
+    }
+
+    public static void buildFromDirectory(String jarPath,
+                                          String classesDir,
+                                          JarOptions jarOptions) throws Exception {
+        ArrayList<String> argList = new ArrayList<String>();
+        argList.add("--create");
+        argList.add("--file=" + jarPath);
+        if (jarOptions != null) {
+            for (String s : jarOptions.options) {
+                argList.add(s);
+            }
+        }
+        argList.add("-C");
+        argList.add(classesDir);
+        argList.add(".");
+        createJar(argList);
+    }
+
+    public static void buildFromSourceDirectory(String jarName, String srcDir, String... extraJavacArgs) throws Exception  {
+        buildFromSourceDirectory(jarName, srcDir, null, extraJavacArgs);
+    }
+
+    /*
+     * Compile all source files under srcDir using javac with extraJavacArgs. Package
+     * all the classes into the specified JAR file
+     */
+    public static void buildFromSourceDirectory(String jarName, String srcDir, JarOptions jarOptions,
+                                                String... extraJavacArgs) throws Exception
+    {
+        System.out.print("Compiling " + srcDir + " into " + jarName);
+        if (extraJavacArgs.length > 0) {
+            System.out.print(" with");
+            for (String s : extraJavacArgs) {
+                System.out.print(" " + s);
+            }
+        }
+        System.out.println();
+
+        Path dst = Files.createTempDirectory(Paths.get(""), "tmp-classes");
+
+        if (!CompilerUtils.compile(Paths.get(srcDir), dst, extraJavacArgs)) {
+            throw new RuntimeException("Compilation of " + srcDir + " failed");
+        }
+
+        CDSJarUtils.buildFromDirectory(jarName, dst.toString(), jarOptions);
+
+        try {
+            // Remove temp files to avoid clutter
+            FileUtils.deleteFileTreeWithRetry(dst);
+        } catch (Exception e) {
+            // Might fail on Windows due to anti-virus. Just ignore
+        }
+    }
+
+    private static void createJar(ArrayList<String> args) {
+        if (DEBUG) printIterable("createJar args: ", args);
+
+        if (JAR.run(System.out, System.err, args.toArray(new String[1])) != 0) {
+            throw new RuntimeException("jar operation failed");
+        }
+    }
+
+    // Many AppCDS tests use the same simple "hello.jar" which contains
+    // simple Hello.class and does not specify additional attributes.
+    // For this common use case, use this method to get the jar path.
+    // The method will check if the jar already exists
+    // (created by another test or test run), and will create the jar
+    // if it does not exist
+    public static String getOrCreateHelloJar() throws Exception {
+        String jarPath = getJarFilePath("hello");
+
+        File jarFile = new File(jarPath);
+        if (jarFile.exists()) {
+            return jarPath;
+        } else {
+            return build("hello", "Hello");
+        }
+    }
+
+    public static void compile(String dstPath, String source, String... extraArgs) throws Exception {
+        ArrayList<String> args = new ArrayList<String>();
+        args.add(JDKToolFinder.getCompileJDKTool("javac"));
+        args.add("-d");
+        args.add(dstPath);
+        if (extraArgs != null) {
+            for (String s : extraArgs) {
+                args.add(s);
+            }
+        }
+        args.add(source);
+
+        if (DEBUG) printIterable("compile args: ", args);
+
+        ProcessBuilder pb = new ProcessBuilder(args);
+        OutputAnalyzer output = new OutputAnalyzer(pb.start());
+        output.shouldHaveExitValue(0);
+    }
+
+    public static void compileModule(Path src,
+                                     Path dest,
+                                     String modulePathArg // arg to --module-path
+                                     ) throws Exception {
+        boolean compiled = false;
+        if (modulePathArg == null) {
+            compiled = CompilerUtils.compile(src, dest);
+        } else {
+            compiled = CompilerUtils.compile(src, dest,
+                                           "--module-path", modulePathArg);
+        }
+        if (!compiled) {
+            throw new RuntimeException("module did not compile");
+        }
+    }
+
+    static final String keyTool = JDKToolFinder.getJDKTool("keytool");
+    static final String jarSigner = JDKToolFinder.getJDKTool("jarsigner");
+
+    public static void signJarWithDisabledAlgorithm(String jarName) throws Exception {
+        String keyName = "key_with_disabled_alg";
+        executeProcess(keyTool,
+            "-genkey", "-keystore", "./keystore", "-alias", keyName,
+            "-storepass", "abc123", "-keypass", "abc123", "-keyalg", "dsa",
+            "-sigalg", "SHA1withDSA", "-keysize", "512", "-dname", "CN=jvmtest2")
+            .shouldHaveExitValue(0);
+
+        doSigning(jarName, keyName);
+    }
+
+    public static void signJar(String jarName) throws Exception {
+        String keyName = "mykey";
+        executeProcess(keyTool,
+            "-genkey", "-keystore", "./keystore", "-alias", keyName,
+            "-storepass", "abc123", "-keypass", "abc123", "-keyalg", "dsa",
+            "-dname", "CN=jvmtest")
+            .shouldHaveExitValue(0);
+
+        doSigning(jarName, keyName);
+    }
+
+    private static void doSigning(String jarName, String keyName) throws Exception {
+        executeProcess(jarSigner,
+           "-keystore", "./keystore", "-storepass", "abc123", "-keypass",
+           "abc123", "-signedjar", getJarFilePath("signed_" + jarName),
+           getJarFilePath(jarName), keyName)
+           .shouldHaveExitValue(0);
+    }
+
+    private static OutputAnalyzer executeProcess(String... cmds)
+        throws Exception {
+
+        printArray("executeProcess: ", cmds);
+        return ProcessTools.executeProcess(new ProcessBuilder(cmds));
+    }
+
+    // diagnostic
+    public static void printIterable(String msg, Iterable<String> l) {
+        StringBuilder sum = new StringBuilder();
+        for (String s : l) {
+            sum.append(s).append(' ');
+        }
+        System.out.println(msg + sum.toString());
+    }
+
+    public static void printArray(String msg, String[] l) {
+        StringBuilder sum = new StringBuilder();
+        for (String s : l) {
+            sum.append(s).append(' ');
+        }
+        System.out.println(msg + sum.toString());
+    }
+}
diff --git a/test/lib/jdk/test/lib/cds/CDSModulePackager.java b/test/lib/jdk/test/lib/cds/CDSModulePackager.java
new file mode 100644
index 00000000000..c825ea9ec18
--- /dev/null
+++ b/test/lib/jdk/test/lib/cds/CDSModulePackager.java
@@ -0,0 +1,164 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please 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.cds;
+
+import java.io.File;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import jdk.test.lib.StringArrayUtils;
+import jdk.test.lib.cds.CDSJarUtils.JarOptions;
+
+
+/*
+ * CDSModulePackager compiles Java sources into a directory that you can pass as the argument for
+ * --module-path to the Java launcher.
+ *
+ * Here's an example for creating two modules from the directory ${test.src}/src
+ *
+ *     CDSModulePackager modulePackager = new CDSModulePackager("src");
+ *     String modulePath = modulePackager.getOutputDir().toString();
+ *
+ *     modulePackager.createModularJar("com.foos");
+ *     modulePackager.createModularJar("com.needsfoosaddexport",
+ *                                     "--add-exports",
+ *                                     "com.foos/com.foos.internal=com.needsfoosaddexport");
+ *
+ * Note that when compiling the second module, it will can access the classes from all
+ * modules that were previously compiled by the same CDSModulePackager.
+ *
+ * The source code should be arranged with the proper directory structure. E.g.
+ *
+ *     ${test.src}/src/com.foos/com/foos/Test.java
+ *     ${test.src}/src/com.foos/com/foos/internal/FoosInternal.java
+ *     ${test.src}/src/com.foos/module-info.java
+ *     ${test.src}/src/com.needsfoosaddexport/com/needsfoosaddexport/Main.java
+ *     ${test.src}/src/com.needsfoosaddexport/module-info.java
+ *
+ * By default, modulePath will be ${user.dir}/test-modules (i.e., in the Jtreg "scratch" directory.
+ * the output from the above would be
+ *
+ *     ${user.dir}/test-modules/com.foos.jar
+ *     ${user.dir}/test-modules/com.needsfoosaddexport.jar
+ *
+ * You can then use these JAR files with:
+ *
+ *     java --module-path test-modules -m com.foos/com.foos.Test
+ */
+public class CDSModulePackager {
+    private Path srcRoot;
+
+    // By default: ./test-modules in the scratch directory of the Jtreg test case.
+    private Path outputDir;
+
+    private String extraModulePaths;
+
+    // Create modules where the source code is located in ${test.src}/${srcRoot},
+    // where test.src is the directory that contains the current Jtreg test case.
+    //
+    // All modules will be packaged under ${outputDir}
+    public CDSModulePackager(String srcRoot, String outputDir) {
+        String testSrc = System.getProperty("test.src");
+        this.srcRoot = Paths.get(testSrc, srcRoot);
+        this.outputDir = Paths.get(outputDir);
+    }
+
+    public CDSModulePackager(String srcRoot) {
+        this(srcRoot, "test-modules");
+    }
+
+    public CDSModulePackager(Path srcRoot, Path outputDir) {
+        this.srcRoot = srcRoot;
+        this.outputDir = outputDir;
+    }
+
+    public CDSModulePackager(Path srcRoot) {
+        this(srcRoot, Paths.get("test-modules"));
+    }
+
+    public Path getOutputDir() {
+        return outputDir;
+    }
+
+    public void addExtraModulePath(String... extra) {
+        for (String s : extra) {
+            if (extraModulePaths == null) {
+                extraModulePaths = s;
+            } else {
+                extraModulePaths += File.pathSeparator + s;
+            }
+        }
+    }
+
+     public void addExtraModulePath(Path... extra) {
+        for (Path p : extra) {
+            if (extraModulePaths == null) {
+                extraModulePaths = p.toString();
+            } else {
+                extraModulePaths += File.pathSeparator + p.toString();
+            }
+        }
+    }
+
+    public Path createModularJar(String moduleName) throws Exception {
+       return createModularJarWithMainClass(moduleName, null, (JarOptions)null);
+    }
+
+    public Path createModularJar(String moduleName, String... javacOptions) throws Exception {
+       return createModularJarWithMainClass(moduleName, null, (JarOptions)null, javacOptions);
+    }
+
+    public Path createModularJarWithMainClass(String moduleName, String mainClass, String... javacOptions) throws Exception {
+        return createModularJarWithMainClass(moduleName, mainClass, (JarOptions)null, javacOptions);
+    }
+
+    // Compile all files under ${this.srcRoot}/${moduleName}.
+    public Path createModularJarWithMainClass(String moduleName, String mainClass, JarOptions jarOptions, String... javacOptions) throws Exception {
+        Path src = srcRoot.resolve(moduleName);
+
+        // We always include the outputDir in the --module-path, so that you can compile new modules
+        // that are dependent on modules already inside the outputDir.
+        String modulePath = outputDir.toString();
+        if (extraModulePaths != null) {
+            modulePath += File.pathSeparator + extraModulePaths;
+        }
+        if (javacOptions == null) {
+            javacOptions = new String[] {"--module-path", modulePath};
+        } else {
+            javacOptions = StringArrayUtils.concat(javacOptions, "--module-path", modulePath);
+        }
+
+        if (mainClass != null) {
+            if (jarOptions == null) {
+                jarOptions = JarOptions.of();
+            }
+            jarOptions.setMainClass(mainClass);
+        }
+
+        Path jarFile = outputDir.resolve(moduleName + ".jar");
+        CDSJarUtils.buildFromSourceDirectory(jarFile.toString(), src.toString(), jarOptions, javacOptions);
+
+        return jarFile;
+    }
+}
diff --git a/test/lib/jdk/test/lib/cds/SimpleCDSAppTester.java b/test/lib/jdk/test/lib/cds/SimpleCDSAppTester.java
new file mode 100644
index 00000000000..33d984ed505
--- /dev/null
+++ b/test/lib/jdk/test/lib/cds/SimpleCDSAppTester.java
@@ -0,0 +1,159 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please 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.cds;
+
+import java.io.File;
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.StringArrayUtils;
+
+import java.util.function.Consumer;
+
+/*
+ * A simpler way to use CDSAppTester. Example:
+ *
+ * SimpleCDSAppTester.of("moduleNeedsJdkAddExport")
+ *    .classpath(dummyJar)
+ *    .modulepath(modulePath)
+ *    .addVmArgs("--add-modules", "com.needsjdkaddexport",
+ *               "--add-exports", "java.base/jdk.internal.misc=com.needsjdkaddexport", "-Xlog:cds")
+ *    .appCommandLine("-m", "com.needsjdkaddexport/com.needsjdkaddexport.Main")
+ *    .setAssemblyChecker((OutputAnalyzer out) -> {
+ *           out.shouldContain("Full module graph = enabled");
+ *        })
+ *    .setProductionChecker((OutputAnalyzer out) -> {
+ *            out.shouldContain("use_full_module_graph = true; java.base");
+ *        })
+ *    .runStaticWorkflow()
+ *    .runAOTWorkflow();
+ */
+public class SimpleCDSAppTester {
+    private String name;
+    private Consumer<OutputAnalyzer> assemblyChecker;
+    private Consumer<OutputAnalyzer> productionChecker;
+    private String classpath;
+    private String modulepath;
+    private String[] appCommandLine;
+    private String[] vmArgs = new String[] {};
+
+    private SimpleCDSAppTester(String name) {
+        this.name = name;
+    }
+
+    public static SimpleCDSAppTester of(String name) {
+        return new SimpleCDSAppTester(name);
+    }
+
+    public SimpleCDSAppTester classpath(String... paths) {
+        this.classpath = null;
+        for (String p : paths) {
+            if (this.classpath == null) {
+                this.classpath = p;
+            } else {
+                this.classpath += File.pathSeparator + p;
+            }
+        }
+        return this;
+    }
+
+    public SimpleCDSAppTester modulepath(String... paths) {
+        this.modulepath = null;
+        for (String p : paths) {
+            if (this.modulepath == null) {
+                this.modulepath = p;
+            } else {
+                this.modulepath += File.pathSeparator + p;
+            }
+        }
+        return this;
+    }
+
+    public SimpleCDSAppTester addVmArgs(String... args) {
+        vmArgs = StringArrayUtils.concat(vmArgs, args);
+        return this;
+    }
+
+    public SimpleCDSAppTester appCommandLine(String... args) {
+        this.appCommandLine = args;
+        return this;
+    }
+
+    public SimpleCDSAppTester setAssemblyChecker(Consumer<OutputAnalyzer> checker) {
+        this.assemblyChecker = checker;
+        return this;
+    }
+
+    public SimpleCDSAppTester setProductionChecker(Consumer<OutputAnalyzer> checker) {
+        this.productionChecker = checker;
+        return this;
+    }
+
+    class Tester extends CDSAppTester {
+        public Tester(String name) {
+            super(name);
+        }
+
+        @Override
+        public String classpath(RunMode runMode) {
+            return SimpleCDSAppTester.this.classpath;
+        }
+
+        @Override
+        public String modulepath(RunMode runMode) {
+            return SimpleCDSAppTester.this.modulepath;
+        }
+
+        @Override
+        public String[] vmArgs(RunMode runMode) {
+            return SimpleCDSAppTester.this.vmArgs;
+        }
+
+        @Override
+        public String[] appCommandLine(RunMode runMode) {
+            return SimpleCDSAppTester.this.appCommandLine;
+        }
+
+        @Override
+        public void checkExecution(OutputAnalyzer out, RunMode runMode) throws Exception {
+            if (isDumping(runMode) && runMode != RunMode.TRAINING) {
+                if (assemblyChecker != null) {
+                    assemblyChecker.accept(out);
+                }
+            } else if (runMode.isProductionRun()) {
+                if (productionChecker != null) {
+                    productionChecker.accept(out);
+                }
+            }
+        }
+    }
+
+    public SimpleCDSAppTester runStaticWorkflow() throws Exception {
+        (new Tester(name)).runStaticWorkflow();
+        return this;
+    }
+
+    public SimpleCDSAppTester runAOTWorkflow() throws Exception {
+        (new Tester(name)).runAOTWorkflow();
+        return this;
+    }
+}

From 58ef4015b7313292a7c7634d3e00e3a904bbdc50 Mon Sep 17 00:00:00 2001
From: Justin Lu <jlu@openjdk.org>
Date: Thu, 27 Mar 2025 20:40:05 +0000
Subject: [PATCH 532/587] 5061061: SimpleDateFormat: unspecified behavior for
 reserved pattern letter

Reviewed-by: naoto, rriggs
---
 .../share/classes/java/text/SimpleDateFormat.java          | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/java.base/share/classes/java/text/SimpleDateFormat.java b/src/java.base/share/classes/java/text/SimpleDateFormat.java
index 9f2513eb4b8..ba73e5b5a86 100644
--- a/src/java.base/share/classes/java/text/SimpleDateFormat.java
+++ b/src/java.base/share/classes/java/text/SimpleDateFormat.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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,10 @@ import sun.util.locale.provider.TimeZoneNameUtility;
  * <p>
  * The following pattern letters are defined (all other characters from
  * {@code 'A'} to {@code 'Z'} and from {@code 'a'} to
- * {@code 'z'} are reserved):
+ * {@code 'z'} not in the table below are reserved). {@link #applyPattern(String)},
+ * {@link #applyLocalizedPattern(String)}, and the {@link #SimpleDateFormat(String)
+ * SimpleDateFormat constructors} throw {@code IllegalArgumentException} when
+ * passed a pattern containing an unquoted reserved character.
  * <blockquote>
  * <table class="striped">
  * <caption style="display:none">Chart shows pattern letters, date/time component, presentation, and examples.</caption>

From d5b12c82fe7c25ccfd70edf73b80824ad316e797 Mon Sep 17 00:00:00 2001
From: Daniel Gredler <dgredler@openjdk.org>
Date: Fri, 28 Mar 2025 00:34:41 +0000
Subject: [PATCH 533/587] 8352890: Remove unnecessary Windows version check in
 FileFontStrike

Reviewed-by: serb, prr
---
 .../share/classes/sun/font/FileFontStrike.java    | 15 +++------------
 .../windows/native/libfontmanager/lcdglyph.c      | 13 ++-----------
 2 files changed, 5 insertions(+), 23 deletions(-)

diff --git a/src/java.desktop/share/classes/sun/font/FileFontStrike.java b/src/java.desktop/share/classes/sun/font/FileFontStrike.java
index da291781c68..37910a41272 100644
--- a/src/java.desktop/share/classes/sun/font/FileFontStrike.java
+++ b/src/java.desktop/share/classes/sun/font/FileFontStrike.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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,19 +109,10 @@ public class FileFontStrike extends PhysicalStrike {
     NativeStrike[] nativeStrikes;
 
     static final int MAX_IMAGE_SIZE = OutlineTextRenderer.THRESHHOLD;
+
     /* Used only for communication to native layer */
     private int intPtSize;
 
-    /* Perform global initialisation needed for Windows native rasterizer */
-    private static native boolean initNative();
-    private static boolean isXPorLater = false;
-    static {
-        if (FontUtilities.isWindows && !FontUtilities.useJDKScaler &&
-            !GraphicsEnvironment.isHeadless()) {
-            isXPorLater = initNative();
-        }
-    }
-
     FileFontStrike(FileFont fileFont, FontStrikeDesc desc) {
         super(fileFont, desc);
         this.fileFont = fileFont;
@@ -212,7 +203,7 @@ public class FileFontStrike extends PhysicalStrike {
          * except that the advance returned by GDI is always overwritten by
          * the JDK rasteriser supplied one (see getGlyphImageFromWindows()).
          */
-        if (FontUtilities.isWindows && isXPorLater &&
+        if (FontUtilities.isWindows &&
             !FontUtilities.useJDKScaler &&
             !GraphicsEnvironment.isHeadless() &&
             !fileFont.useJavaRasterizer &&
diff --git a/src/java.desktop/windows/native/libfontmanager/lcdglyph.c b/src/java.desktop/windows/native/libfontmanager/lcdglyph.c
index 5e7015855b8..3e7bc6e7530 100644
--- a/src/java.desktop/windows/native/libfontmanager/lcdglyph.c
+++ b/src/java.desktop/windows/native/libfontmanager/lcdglyph.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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 @@
 #define MAX_GAMMA 220
 #define LCDLUTCOUNT (MAX_GAMMA-MIN_GAMMA+1)
 
-static unsigned char* igLUTable[LCDLUTCOUNT];
+static unsigned char* igLUTable[LCDLUTCOUNT] = { 0 };
 
 static unsigned char* getIGTable(int gamma) {
     int i, index;
@@ -122,15 +122,6 @@ static unsigned char* getIGTable(int gamma) {
     return igTable;
 }
 
-
-JNIEXPORT jboolean JNICALL
-    Java_sun_font_FileFontStrike_initNative(JNIEnv *env, jclass unused) {
-
-    memset(igLUTable, 0, sizeof igLUTable);
-
-    return JNI_TRUE;
-}
-
 #ifndef CLEARTYPE_QUALITY
 #define CLEARTYPE_QUALITY 5
 #endif

From f4428e89b7d9f00833a437f08fe0c0bbcec87a11 Mon Sep 17 00:00:00 2001
From: Cesar Soares Lucas <cslucas@openjdk.org>
Date: Fri, 28 Mar 2025 04:50:39 +0000
Subject: [PATCH 534/587] 8352920: Compilation failure: comparison of unsigned
 expression >= 0 is always true

Reviewed-by: dholmes
---
 src/hotspot/share/interpreter/bytecodeTracer.cpp | 2 ++
 src/hotspot/share/interpreter/bytecodeTracer.hpp | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/hotspot/share/interpreter/bytecodeTracer.cpp b/src/hotspot/share/interpreter/bytecodeTracer.cpp
index 4115a2bede5..798c0bfc7d8 100644
--- a/src/hotspot/share/interpreter/bytecodeTracer.cpp
+++ b/src/hotspot/share/interpreter/bytecodeTracer.cpp
@@ -178,6 +178,7 @@ class BytecodePrinter {
   }
 };
 
+#ifndef PRODUCT
 // We need a global instance to keep track of the states when the bytecodes
 // are executed. Access by multiple threads are controlled by ttyLocker.
 static BytecodePrinter _interpreter_printer;
@@ -193,6 +194,7 @@ void BytecodeTracer::trace_interpreter(const methodHandle& method, address bcp,
     _interpreter_printer.trace(method, bcp, tos, tos2, st);
   }
 }
+#endif
 
 void BytecodeTracer::print_method_codes(const methodHandle& method, int from, int to, outputStream* st, int flags) {
   BytecodePrinter method_printer(flags);
diff --git a/src/hotspot/share/interpreter/bytecodeTracer.hpp b/src/hotspot/share/interpreter/bytecodeTracer.hpp
index f870ffc415e..e7d7a360948 100644
--- a/src/hotspot/share/interpreter/bytecodeTracer.hpp
+++ b/src/hotspot/share/interpreter/bytecodeTracer.hpp
@@ -38,7 +38,7 @@ class outputStream;
 class BytecodeClosure;
 class BytecodeTracer: AllStatic {
  public:
-  static void trace_interpreter(const methodHandle& method, address bcp, uintptr_t tos, uintptr_t tos2, outputStream* st = tty);
+  NOT_PRODUCT(static void trace_interpreter(const methodHandle& method, address bcp, uintptr_t tos, uintptr_t tos2, outputStream* st = tty);)
   static void print_method_codes(const methodHandle& method, int from, int to, outputStream* st, int flags);
 };
 

From 2ea1557a0fdaf551d75365d1351bfbd73319dcfb Mon Sep 17 00:00:00 2001
From: SendaoYan <syan@openjdk.org>
Date: Fri, 28 Mar 2025 06:03:36 +0000
Subject: [PATCH 535/587] 8353005: AIX build broken after 8352481

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

diff --git a/make/autoconf/toolchain.m4 b/make/autoconf/toolchain.m4
index b3b473c9341..9013f9cf922 100644
--- a/make/autoconf/toolchain.m4
+++ b/make/autoconf/toolchain.m4
@@ -622,7 +622,7 @@ AC_DEFUN_ONCE([TOOLCHAIN_DETECT_TOOLCHAIN_CORE],
     LDCXX="$CXX"
     # Force use of lld, since that is what we expect when setting flags later on
     if test "x$TOOLCHAIN_TYPE" = xclang; then
-      if test "x$OPENJDK_BUILD_OS" != "xmacosx"; then
+      if test "x$OPENJDK_TARGET_OS" = xlinux; then
         LD="$LD -fuse-ld=lld"
         LDCXX="$LDCXX -fuse-ld=lld"
       fi

From cfc648bd17cc79b1c3e6f69d3559749e937261b2 Mon Sep 17 00:00:00 2001
From: Prasanta Sadhukhan <psadhukhan@openjdk.org>
Date: Fri, 28 Mar 2025 06:52:14 +0000
Subject: [PATCH 536/587] 8352677: Opensource JMenu tests - series2

Reviewed-by: abhiscxk
---
 test/jdk/javax/swing/JMenu/bug4187996.java |  74 +++++++++++
 test/jdk/javax/swing/JMenu/bug6471949.java | 134 +++++++++++++++++++
 test/jdk/javax/swing/JMenu/bug6513492.java | 148 +++++++++++++++++++++
 3 files changed, 356 insertions(+)
 create mode 100644 test/jdk/javax/swing/JMenu/bug4187996.java
 create mode 100644 test/jdk/javax/swing/JMenu/bug6471949.java
 create mode 100644 test/jdk/javax/swing/JMenu/bug6513492.java

diff --git a/test/jdk/javax/swing/JMenu/bug4187996.java b/test/jdk/javax/swing/JMenu/bug4187996.java
new file mode 100644
index 00000000000..f536a47c8a6
--- /dev/null
+++ b/test/jdk/javax/swing/JMenu/bug4187996.java
@@ -0,0 +1,74 @@
+/*
+ * Copyright (c) 2001, 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact 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 4187996
+ * @summary Tests that Metal submenus overlap menu
+ * @library /java/awt/regtesthelpers
+ * @build PassFailJFrame
+ * @run main/manual bug4187996
+ */
+
+import javax.swing.JFrame;
+import javax.swing.JMenu;
+import javax.swing.JMenuBar;
+import javax.swing.JMenuItem;
+import javax.swing.UIManager;
+
+public class bug4187996 {
+
+    private static final String INSTRUCTIONS = """
+        Open the menu "Menu", then "Submenu".
+        The submenu should be top-aligned with the menu,
+        and slightly overlap it horizontally. Otherwise test fails.""";
+
+    public static void main(String[] args) throws Exception {
+        UIManager.setLookAndFeel("javax.swing.plaf.metal.MetalLookAndFeel");
+        PassFailJFrame.builder()
+                .title("bug4187996 Instructions")
+                .instructions(INSTRUCTIONS)
+                .columns(35)
+                .testUI(bug4187996::createTestUI)
+                .build()
+                .awaitAndCheck();
+    }
+
+    private static JFrame createTestUI() {
+        JFrame frame = new JFrame("bug4187996");
+        JMenu submenu = new JMenu("Submenu");
+        submenu.add(new JMenuItem("Sub 1"));
+        submenu.add(new JMenuItem("Sub 2"));
+
+        JMenu menu = new JMenu("Menu");
+        menu.add(submenu);
+        menu.add(new JMenuItem("Item 1"));
+        menu.add(new JMenuItem("Item 2"));
+
+        JMenuBar mbar = new JMenuBar();
+        mbar.add(menu);
+        frame.setJMenuBar(mbar);
+        frame.setSize(300, 100);
+        return frame;
+    }
+}
diff --git a/test/jdk/javax/swing/JMenu/bug6471949.java b/test/jdk/javax/swing/JMenu/bug6471949.java
new file mode 100644
index 00000000000..d196502ed21
--- /dev/null
+++ b/test/jdk/javax/swing/JMenu/bug6471949.java
@@ -0,0 +1,134 @@
+/*
+ * Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact 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 6471949
+ * @summary JMenu should stay selected after escape is pressed
+ * @library /java/awt/regtesthelpers
+ * @build PassFailJFrame
+ * @run main/manual bug6471949
+*/
+
+import java.awt.event.ActionListener;
+import java.awt.event.ActionEvent;
+
+import javax.swing.JFrame;
+import javax.swing.JMenu;
+import javax.swing.JMenuBar;
+import javax.swing.JMenuItem;
+import javax.swing.JTextArea;
+import javax.swing.SwingUtilities;
+import javax.swing.UIManager;
+
+public class bug6471949 {
+
+    private static final String INSTRUCTIONS = """
+        Test the menu and its submenus for different LaF:
+
+        Click on "Menu" and then click on "Inner" submenu
+        and then click on "One more" submenu.
+
+        For Metal, Nimbus and Aqua Laf the Escape key hides the last open submenu,
+        Press Esc till the last menu "Inner" is closed.
+        If the last menu is closed then the menu button (in menubar) gets unselected.
+
+        For Windows Laf the Escape key hides the last open submenu
+        if the last menu is closed then the menu button remains selected,
+        until the Escape key is pressed again or any other key letter pressed.
+
+        For GTK and Motif menu, all open submenus must hide when the Escape key is pressed.
+
+        If everything works as described, the test passes and fails otherwise.""";
+
+    public static void main(String[] args) throws Exception {
+        PassFailJFrame.builder()
+                .title("bug6471949 Instructions")
+                .instructions(INSTRUCTIONS)
+                .columns(35)
+                .testUI(bug6471949::createTestUI)
+                .logArea()
+                .build()
+                .awaitAndCheck();
+    }
+
+    private static JFrame createTestUI() {
+
+        PassFailJFrame.log("Menu.cancelMode = " +
+                           UIManager.getString("Menu.cancelMode"));
+        PassFailJFrame.log("Menu.preserveTopLevelSelection = " +
+                            UIManager.getBoolean("Menu.preserveTopLevelSelection"));
+        PassFailJFrame.log("");
+
+        JFrame frame = new JFrame("bug6471949");
+        JMenuBar bar = new JMenuBar();
+        JMenu menu = new JMenu("Menu");
+        menu.setMnemonic('m');
+
+        JMenuItem item = new JMenuItem("Item");
+        menu.add(item);
+        JMenu inner = new JMenu("Inner");
+        inner.add(new JMenuItem("Test"));
+        JMenu oneMore = new JMenu("One more");
+        oneMore.add(new JMenuItem("Lala"));
+        inner.add(oneMore);
+        menu.add(inner);
+
+        JMenu lafMenu = new JMenu("Change LaF");
+
+        UIManager.LookAndFeelInfo[] lafs = UIManager.getInstalledLookAndFeels();
+        for (final UIManager.LookAndFeelInfo lafInfo : lafs) {
+            JMenuItem lafItem = new JMenuItem(lafInfo.getName());
+            lafItem.addActionListener(new ActionListener() {
+                public void actionPerformed(ActionEvent e) {
+                    setLaf(frame, lafInfo.getClassName());
+                }
+            });
+            lafMenu.add(lafItem);
+        }
+
+        frame.setJMenuBar(bar);
+        bar.add(menu);
+        bar.add(lafMenu);
+
+        JTextArea field = new JTextArea();
+        frame.add(field);
+        field.requestFocusInWindow();
+        frame.pack();
+        return frame;
+    }
+
+    private static void setLaf(JFrame frame, String laf) {
+        try {
+            UIManager.setLookAndFeel(laf);
+            SwingUtilities.updateComponentTreeUI(frame);
+            PassFailJFrame.log("Menu.cancelMode = " +
+                               UIManager.getString("Menu.cancelMode"));
+            PassFailJFrame.log("Menu.preserveTopLevelSelection = " +
+                               UIManager.getBoolean("Menu.preserveTopLevelSelection"));
+            PassFailJFrame.log("");
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+    }
+}
diff --git a/test/jdk/javax/swing/JMenu/bug6513492.java b/test/jdk/javax/swing/JMenu/bug6513492.java
new file mode 100644
index 00000000000..a84b93fe74b
--- /dev/null
+++ b/test/jdk/javax/swing/JMenu/bug6513492.java
@@ -0,0 +1,148 @@
+/*
+ * Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact 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 6513492
+* @summary Escape key needs to be pressed twice to remove focus from an empty/diabled Menu.
+* @library /java/awt/regtesthelpers
+* @build PassFailJFrame
+* @run main/manual bug6513492
+*/
+
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+
+import javax.swing.JFrame;
+import javax.swing.JMenu;
+import javax.swing.JMenuBar;
+import javax.swing.JMenuItem;
+import javax.swing.JTextArea;
+import javax.swing.SwingUtilities;
+import javax.swing.UIManager;
+
+public class bug6513492 {
+
+    private static final String INSTRUCTIONS = """
+        Test Menu for different LaF:
+
+        * For Windows Laf:
+            Click the editor
+            Click EmpyMenu, press Escape -> focus must go to the editor
+            Click EmpyMenu, press right arrow button, press Escape -> focus must go to the editor
+            Click SubMenuTest, highlight the first disabled submenu, press Escape
+                -> focus must stay at the topLevelMenu
+
+        * For Metal, Nimbus and Aqua Laf
+            Click the editor
+            Click SubMenuTest, highlight the EmptySubmenu, press Escape -> focus must go to the editor
+            Click SubMenuTest, highlight the EnabledItem, press Escape -> focus must go to the editor
+
+        * For GTK and Motif
+            Click the editor
+            Open any menu or submenu, press Escape -> focus must go to the editor.""";
+
+    public static void main(String[] args) throws Exception {
+        PassFailJFrame.builder()
+                .title("bug6513492 Instructions")
+                .instructions(INSTRUCTIONS)
+                .columns(35)
+                .testUI(bug6513492::createTestUI)
+                .logArea()
+                .build()
+                .awaitAndCheck();
+    }
+
+    private static JFrame createTestUI() {
+        PassFailJFrame.log("Menu.cancelMode = " +
+                            UIManager.getString("Menu.cancelMode"));
+        PassFailJFrame.log("Menu.preserveTopLevelSelection = " +
+                            UIManager.getBoolean("Menu.preserveTopLevelSelection"));
+        PassFailJFrame.log("");
+
+        JFrame frame = new JFrame("bug6513492");
+        JMenuBar bar = new JMenuBar();
+        bar.add(new JMenu("EmptyMenu"));
+
+        JMenu disabledMenu = new JMenu("NotEmpyButDisabled");
+        disabledMenu.add(new JMenuItem("item"));
+        disabledMenu.setEnabled(false);
+        bar.add(disabledMenu);
+
+        JMenu menu = new JMenu("SubMenuTest");
+        JMenu disabledSubmenu = new JMenu("Submenu");
+        disabledSubmenu.add(new JMenuItem("item"));
+        disabledSubmenu.setEnabled(false);
+        menu.add(disabledSubmenu);
+
+        JMenu enabledSubmenu = new JMenu("Submenu");
+        enabledSubmenu.add(new JMenuItem("item"));
+        menu.add(enabledSubmenu);
+
+        JMenu emptySubmenu = new JMenu("EmptySubmenu");
+        menu.add(emptySubmenu);
+
+        menu.add(new JMenuItem("EnabledItem"));
+        JMenuItem item = new JMenuItem("DisabledItem");
+        item.setEnabled(false);
+        menu.add(item);
+        bar.add(menu);
+
+        JMenu lafMenu = new JMenu("Change LaF");
+
+        UIManager.LookAndFeelInfo[] lafs = UIManager.getInstalledLookAndFeels();
+        for (final UIManager.LookAndFeelInfo lafInfo : lafs) {
+            JMenuItem lafItem = new JMenuItem(lafInfo.getName());
+            lafItem.addActionListener(new ActionListener() {
+                public void actionPerformed(ActionEvent e) {
+                    setLaf(frame, lafInfo.getClassName());
+                }
+            });
+            lafMenu.add(lafItem);
+        }
+
+        frame.setJMenuBar(bar);
+        bar.add(menu);
+        bar.add(lafMenu);
+
+        JTextArea field = new JTextArea("The editor");
+        frame.add(field);
+        field.requestFocusInWindow();
+        frame.pack();
+        return frame;
+    }
+
+    private static void setLaf(JFrame frame, String laf) {
+        try {
+            UIManager.setLookAndFeel(laf);
+            SwingUtilities.updateComponentTreeUI(frame);
+            PassFailJFrame.log("Menu.cancelMode = " +
+                               UIManager.getString("Menu.cancelMode"));
+            PassFailJFrame.log("Menu.preserveTopLevelSelection = " +
+                                UIManager.getBoolean("Menu.preserveTopLevelSelection"));
+            PassFailJFrame.log("");
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+    }
+}

From bac2aa44454982684e06854add1dbbb806fba363 Mon Sep 17 00:00:00 2001
From: Matthias Baesken <mbaesken@openjdk.org>
Date: Fri, 28 Mar 2025 08:13:31 +0000
Subject: [PATCH 537/587] 8352946: SEGV_BND signal code of SIGSEGV missing from
 our signal-code table

Reviewed-by: mdoerr, dholmes
---
 src/hotspot/os/posix/signals_posix.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/hotspot/os/posix/signals_posix.cpp b/src/hotspot/os/posix/signals_posix.cpp
index 2c0ab6732c1..5f5a2ccfa4a 100644
--- a/src/hotspot/os/posix/signals_posix.cpp
+++ b/src/hotspot/os/posix/signals_posix.cpp
@@ -49,6 +49,9 @@
 
 #include <signal.h>
 
+#if !defined(SEGV_BNDERR)
+#define SEGV_BNDERR 3
+#endif
 
 static const char* get_signal_name(int sig, char* out, size_t outlen);
 
@@ -969,6 +972,9 @@ static bool get_signal_code_description(const siginfo_t* si, enum_sigcode_desc_t
     { SIGFPE,  FPE_FLTSUB,   "FPE_FLTSUB",   "Subscript out of range." },
     { SIGSEGV, SEGV_MAPERR,  "SEGV_MAPERR",  "Address not mapped to object." },
     { SIGSEGV, SEGV_ACCERR,  "SEGV_ACCERR",  "Invalid permissions for mapped object." },
+#if defined(LINUX)
+    { SIGSEGV, SEGV_BNDERR,  "SEGV_BNDERR",  "Failed address bound checks." },
+#endif
 #if defined(AIX)
     // no explanation found what keyerr would be
     { SIGSEGV, SEGV_KEYERR,  "SEGV_KEYERR",  "key error" },

From ddf326b8e6e50403303b410635e4c26d7bf56aaa Mon Sep 17 00:00:00 2001
From: Matthias Baesken <mbaesken@openjdk.org>
Date: Fri, 28 Mar 2025 08:19:20 +0000
Subject: [PATCH 538/587] 8346888: [ubsan] block.cpp:1617:30: runtime error:
 9.97582e+36 is outside the range of representable values of type 'int'

Reviewed-by: kvn, dlong
---
 src/hotspot/share/opto/block.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/hotspot/share/opto/block.cpp b/src/hotspot/share/opto/block.cpp
index 8e49226c262..5d4ac471303 100644
--- a/src/hotspot/share/opto/block.cpp
+++ b/src/hotspot/share/opto/block.cpp
@@ -1613,7 +1613,8 @@ void PhaseBlockLayout::find_edges() {
           Block *target = b->non_connector_successor(j);
           float freq = b->_freq * b->succ_prob(j);
           int from_pct = (int) ((100 * freq) / b->_freq);
-          int to_pct = (int) ((100 * freq) / target->_freq);
+          float f_to_pct = (100 * freq) / target->_freq;
+          int to_pct = (f_to_pct < 100.0) ? (int)f_to_pct : 100;
           edges->append(new CFGEdge(b, target, freq, from_pct, to_pct));
         }
       }

From 8ef78323b1177782a645155fda19544fae24c279 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Manuel=20H=C3=A4ssig?= <manuel.hassig@oracle.com>
Date: Fri, 28 Mar 2025 08:53:37 +0000
Subject: [PATCH 539/587] 8350471: Unhandled compilation bailout in
 GraphKit::builtin_throw

Reviewed-by: thartmann, chagedorn, kvn
---
 src/hotspot/share/opto/graphKit.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/hotspot/share/opto/graphKit.cpp b/src/hotspot/share/opto/graphKit.cpp
index 5836ea579a2..bf6c4df626b 100644
--- a/src/hotspot/share/opto/graphKit.cpp
+++ b/src/hotspot/share/opto/graphKit.cpp
@@ -587,7 +587,7 @@ void GraphKit::builtin_throw(Deoptimization::DeoptReason reason) {
     default:
       break;
     }
-    if (failing()) { stop(); return; }  // exception allocation might fail
+    // If we have a preconstructed exception object, use it.
     if (ex_obj != nullptr) {
       if (env()->jvmti_can_post_on_exceptions()) {
         // check if we must post exception events, take uncommon trap if so

From 3e9a7a4aed168422473c941ff5626d0d65aaadfa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Manuel=20H=C3=A4ssig?= <manuel.hassig@oracle.com>
Date: Fri, 28 Mar 2025 08:58:43 +0000
Subject: [PATCH 540/587] 8353063: make/ide/vscode: Invalid Configuration
 Values

Reviewed-by: erikj, thartmann
---
 make/ide/vscode/hotspot/indexers/ccls-settings.txt   | 8 ++++----
 make/ide/vscode/hotspot/indexers/clangd-settings.txt | 8 ++++----
 make/ide/vscode/hotspot/indexers/rtags-settings.txt  | 8 ++++----
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/make/ide/vscode/hotspot/indexers/ccls-settings.txt b/make/ide/vscode/hotspot/indexers/ccls-settings.txt
index 53fad0df8d4..bacc49c6112 100644
--- a/make/ide/vscode/hotspot/indexers/ccls-settings.txt
+++ b/make/ide/vscode/hotspot/indexers/ccls-settings.txt
@@ -22,7 +22,7 @@
 		],
 
 		// Disable conflicting features from cpptools
-		"C_Cpp.autocomplete": "Disabled",
-		"C_Cpp.errorSquiggles": "Disabled",
-		"C_Cpp.formatting": "Disabled",
-		"C_Cpp.intelliSenseEngine": "Disabled",
+		"C_Cpp.autocomplete": "disabled",
+		"C_Cpp.errorSquiggles": "disabled",
+		"C_Cpp.formatting": "disabled",
+		"C_Cpp.intelliSenseEngine": "disabled",
diff --git a/make/ide/vscode/hotspot/indexers/clangd-settings.txt b/make/ide/vscode/hotspot/indexers/clangd-settings.txt
index 03339540291..2a5b5e4a8cb 100644
--- a/make/ide/vscode/hotspot/indexers/clangd-settings.txt
+++ b/make/ide/vscode/hotspot/indexers/clangd-settings.txt
@@ -11,7 +11,7 @@
 		],
 
 		// Disable conflicting features from cpptools
-		"C_Cpp.autocomplete": "Disabled",
-		"C_Cpp.errorSquiggles": "Disabled",
-		"C_Cpp.formatting": "Disabled",
-		"C_Cpp.intelliSenseEngine": "Disabled",
+		"C_Cpp.autocomplete": "disabled",
+		"C_Cpp.errorSquiggles": "disabled",
+		"C_Cpp.formatting": "disabled",
+		"C_Cpp.intelliSenseEngine": "disabled",
diff --git a/make/ide/vscode/hotspot/indexers/rtags-settings.txt b/make/ide/vscode/hotspot/indexers/rtags-settings.txt
index b19e6869b6c..75727ae17f1 100644
--- a/make/ide/vscode/hotspot/indexers/rtags-settings.txt
+++ b/make/ide/vscode/hotspot/indexers/rtags-settings.txt
@@ -8,7 +8,7 @@
 		"rtags.misc.compilationDatabaseDirectory": "{{OUTPUTDIR}}",
 
 		// Disable conflicting features from cpptools
-		"C_Cpp.autocomplete": "Disabled",
-		"C_Cpp.errorSquiggles": "Disabled",
-		"C_Cpp.formatting": "Disabled",
-		"C_Cpp.intelliSenseEngine": "Disabled",
+		"C_Cpp.autocomplete": "disabled",
+		"C_Cpp.errorSquiggles": "disabled",
+		"C_Cpp.formatting": "disabled",
+		"C_Cpp.intelliSenseEngine": "disabled",

From c0b61d3b8820a38a9757a1a3e69da43014d24439 Mon Sep 17 00:00:00 2001
From: Prasanta Sadhukhan <psadhukhan@openjdk.org>
Date: Fri, 28 Mar 2025 13:03:30 +0000
Subject: [PATCH 541/587] 8352680: Opensource few misc swing tests

Reviewed-by: abhiscxk
---
 test/jdk/javax/swing/JFrame/bug4614881.java   |  66 +++++++
 .../swing/JMenuItem/RightLeftOrientation.java | 166 ++++++++++++++++
 .../jdk/javax/swing/JMenuItem/bug4729669.java | 186 ++++++++++++++++++
 3 files changed, 418 insertions(+)
 create mode 100644 test/jdk/javax/swing/JFrame/bug4614881.java
 create mode 100644 test/jdk/javax/swing/JMenuItem/RightLeftOrientation.java
 create mode 100644 test/jdk/javax/swing/JMenuItem/bug4729669.java

diff --git a/test/jdk/javax/swing/JFrame/bug4614881.java b/test/jdk/javax/swing/JFrame/bug4614881.java
new file mode 100644
index 00000000000..bbefc1ebf3c
--- /dev/null
+++ b/test/jdk/javax/swing/JFrame/bug4614881.java
@@ -0,0 +1,66 @@
+/*
+ * Copyright (c) 2002, 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact 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 4614881
+ * @summary Ensure that client decorated frames can be brought to the front
+ *          via mouse click on the title pane.
+ * @library /java/awt/regtesthelpers
+ * @build PassFailJFrame
+ * @run main/manual bug4614881
+ */
+
+import java.awt.FlowLayout;
+import java.awt.Toolkit;
+import javax.swing.JDialog;
+import javax.swing.JFrame;
+
+public class bug4614881 {
+
+    private static final String INSTRUCTIONS = """
+        Select a native window so that it obscures the client decorated frame.
+        Select the decorated frame by clicking on the title pane.
+        If the decorated frame is brought to the front, then test passes else fails.""";
+
+    public static void main(String[] args) throws Exception {
+        PassFailJFrame.builder()
+                .title("bug4614881 Instructions")
+                .instructions(INSTRUCTIONS)
+                .columns(35)
+                .testUI(bug4614881::createTestUI)
+                .build()
+                .awaitAndCheck();
+    }
+
+    private static JFrame createTestUI() {
+        Toolkit.getDefaultToolkit().setDynamicLayout(true);
+        JFrame.setDefaultLookAndFeelDecorated(true);
+        JDialog.setDefaultLookAndFeelDecorated(true);
+        final JFrame frame = new JFrame("4614881 - Decorated Frame");
+        frame.setSize(600, 400);
+        frame.setResizable(false);
+        frame.getContentPane().setLayout(new FlowLayout());
+        return frame;
+    }
+}
diff --git a/test/jdk/javax/swing/JMenuItem/RightLeftOrientation.java b/test/jdk/javax/swing/JMenuItem/RightLeftOrientation.java
new file mode 100644
index 00000000000..6c7185b547a
--- /dev/null
+++ b/test/jdk/javax/swing/JMenuItem/RightLeftOrientation.java
@@ -0,0 +1,166 @@
+/*
+ * Copyright (c) 1999, 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact 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 4211052
+ * @requires (os.family == "windows")
+ * @summary
+ *     This test checks if menu items lay out correctly when their
+ *     ComponentOrientation property is set to RIGHT_TO_LEFT.
+ *     The tester is asked to compare left-to-right and
+ *     right-to-left menus and judge whether they are mirror images of each
+ *     other.
+ * @library /java/awt/regtesthelpers
+ * @build PassFailJFrame
+ * @run main/manual RightLeftOrientation
+ */
+
+import java.awt.Color;
+import java.awt.Component;
+import java.awt.ComponentOrientation;
+import java.awt.Font;
+import java.awt.Graphics;
+import java.awt.event.ActionEvent;
+import java.awt.event.KeyEvent;
+
+import javax.swing.Icon;
+import javax.swing.JCheckBoxMenuItem;
+import javax.swing.JFrame;
+import javax.swing.JMenu;
+import javax.swing.JMenuBar;
+import javax.swing.JMenuItem;
+import javax.swing.JRadioButtonMenuItem;
+import javax.swing.KeyStroke;
+import javax.swing.LookAndFeel;
+import javax.swing.SwingConstants;
+import javax.swing.UIManager;
+
+public class RightLeftOrientation {
+
+    private static final String INSTRUCTIONS = """
+        A menu bar is shown containing a menu for each look and feel.
+        A disabled menu means that the look and feel is not available for
+        testing in this environment.
+        Every effort should be made to run this test
+        in an environment that covers all look and feels.
+
+        Each menu is divided into two halves. The upper half is oriented
+        left-to-right and the lower half is oriented right-to-left.
+        For each menu, ensure that the lower half mirrors the upper half.
+
+        Note that when checking the positioning of the sub-menus, it
+        helps to position the frame away from the screen edges.""";
+
+    public static void main(String[] args) throws Exception {
+        PassFailJFrame.builder()
+                .title("RightLeftOrientation Instructions")
+                .instructions(INSTRUCTIONS)
+                .columns(35)
+                .testUI(RightLeftOrientation::createTestUI)
+                .build()
+                .awaitAndCheck();
+    }
+
+    private static JFrame createTestUI() {
+        JFrame frame = new JFrame("RightLeftOrientation");
+        JMenuBar menuBar = new JMenuBar();
+
+        menuBar.add(createMenu("javax.swing.plaf.metal.MetalLookAndFeel",
+                                "Metal"));
+        menuBar.add(createMenu("com.sun.java.swing.plaf.motif.MotifLookAndFeel",
+                                "Motif"));
+        menuBar.add(createMenu("com.sun.java.swing.plaf.windows.WindowsLookAndFeel",
+                                "Windows"));
+
+        frame.setJMenuBar(menuBar);
+        frame.pack();
+        return frame;
+    }
+
+
+    static JMenu createMenu(String laf, String name) {
+        JMenu menu = new JMenu(name);
+        try {
+            LookAndFeel save = UIManager.getLookAndFeel();
+            UIManager.setLookAndFeel(laf);
+            addMenuItems(menu, ComponentOrientation.LEFT_TO_RIGHT);
+            menu.addSeparator();
+            addMenuItems(menu, ComponentOrientation.RIGHT_TO_LEFT);
+            UIManager.setLookAndFeel(save);
+        } catch (Exception e) {
+            menu = new JMenu(name);
+            menu.setEnabled(false);
+        }
+        return menu;
+    }
+
+    static void addMenuItems(JMenu menu, ComponentOrientation o) {
+
+        JMenuItem menuItem;
+
+        menuItem = new JMenuItem("Menu Item");
+        menuItem.setComponentOrientation(o);
+        menu.add(menuItem);
+
+        menuItem = new JMenuItem("Text trails icon", new MyMenuItemIcon());
+        menuItem.setComponentOrientation(o);
+        menu.add(menuItem);
+
+        menuItem = new JMenuItem("Text leads icon", new MyMenuItemIcon());
+        menuItem.setComponentOrientation(o);
+        menuItem.setHorizontalTextPosition(SwingConstants.LEADING);
+        menu.add(menuItem);
+
+        menuItem = new JRadioButtonMenuItem("Radio Button Menu Item");
+        menuItem.setComponentOrientation(o);
+        menuItem.setSelected(true);
+        menuItem.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_1, ActionEvent.ALT_MASK));
+        menu.add(menuItem);
+
+        menuItem = new JCheckBoxMenuItem("Check box Menu Item");
+        menuItem.setComponentOrientation(o);
+        menuItem.setSelected(true);
+        menuItem.setFont( new Font("Serif",Font.PLAIN, 24) );
+        menuItem.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_2, ActionEvent.ALT_MASK));
+        menu.add(menuItem);
+
+        menuItem = new JMenu("Sub Menu");
+        menuItem.setComponentOrientation(o);
+        menuItem.add(new JMenuItem("Sub Menu One")).setComponentOrientation(o);
+        menuItem.add(new JMenuItem("Sub Menu Two")).setComponentOrientation(o);
+        menu.add(menuItem);
+    }
+
+
+    private static class MyMenuItemIcon implements Icon {
+        public void paintIcon(Component c, Graphics g, int x, int y) {
+            Color oldColor = g.getColor();
+            g.setColor(Color.orange);
+            g.fill3DRect(x, y, getIconWidth(), getIconHeight(), true);
+            g.setColor(oldColor);
+        }
+        public int getIconWidth() { return 15; }
+        public int getIconHeight() { return 15; }
+    }
+}
diff --git a/test/jdk/javax/swing/JMenuItem/bug4729669.java b/test/jdk/javax/swing/JMenuItem/bug4729669.java
new file mode 100644
index 00000000000..815558fc8fd
--- /dev/null
+++ b/test/jdk/javax/swing/JMenuItem/bug4729669.java
@@ -0,0 +1,186 @@
+/*
+ * Copyright (c) 2005, 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact 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 4729669
+ * @summary 1.4 REGRESSION: Text edge of different types of JMenuItems are not aligned
+ * @library /java/awt/regtesthelpers
+ * @build PassFailJFrame
+ * @run main/manual bug4729669
+ */
+
+import java.awt.Color;
+import java.awt.ComponentOrientation;
+import java.awt.Component;
+import java.awt.Graphics;
+import java.awt.event.ActionEvent;
+import java.awt.event.KeyEvent;
+
+import javax.swing.AbstractAction;
+import javax.swing.Icon;
+import javax.swing.JCheckBoxMenuItem;
+import javax.swing.JFrame;
+import javax.swing.JMenu;
+import javax.swing.JMenuBar;
+import javax.swing.JMenuItem;
+import javax.swing.JRadioButtonMenuItem;
+import javax.swing.KeyStroke;
+
+import java.util.List;
+
+public class bug4729669 {
+
+    private static final String INSTRUCTIONS = """
+        Two windows should appear: Left-to-right and Right-to-left.
+        Check that text on all the menu items of all menus
+        is properly vertically aligned.""";
+
+    public static void main(String[] args) throws Exception {
+        PassFailJFrame.builder()
+                .title("bug4729669 Instructions")
+                .instructions(INSTRUCTIONS)
+                .columns(35)
+                .testUI(bug4729669::createTestUI)
+                .position(PassFailJFrame.Position.TOP_LEFT_CORNER)
+                .logArea()
+                .build()
+                .awaitAndCheck();
+    }
+
+    private static List<JFrame> createTestUI() {
+        JFrame f1 = MenuItemTest.doMenuItemTest(true);
+        f1.setLocation(300, 300);
+        JFrame f2 = MenuItemTest.doMenuItemTest(false);
+        f2.setLocation(500, 300);
+        return List.of(f1, f2);
+    }
+}
+
+class MenuItemTest {
+    public static JFrame doMenuItemTest(boolean isLeft) {
+        JMenu menu = new JMenu("View");
+        menu.setMnemonic('V');
+
+        menu.add(new JMenuItem("Refresh"));
+        menu.add(new JMenuItem("Customize..."));
+        menu.add(new JCheckBoxMenuItem("Show Toolbar"));
+        menu.addSeparator();
+        menu.add(new JRadioButtonMenuItem("List"));
+        menu.add(new JRadioButtonMenuItem("Icons"));
+        JRadioButtonMenuItem rm2 = new JRadioButtonMenuItem("And icon.");
+        rm2.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_F1,
+                                                  KeyEvent.SHIFT_MASK));
+        menu.add(rm2);
+        JRadioButtonMenuItem mi3 = new JRadioButtonMenuItem("Radio w/icon");
+
+        Icon myIcon = new Icon() { // 10 pixel red
+            public void paintIcon(Component c, Graphics g, int x, int y) {
+                Color color = g.getColor();
+                g.setColor(Color.RED);
+                g.fillRect(x, y, 10, 10);
+                g.setColor(color);
+            }
+
+            public int getIconWidth() {
+                return 10;
+            }
+
+            public int getIconHeight() {
+                return 10;
+            }
+        };
+
+        Icon myIcon2 = new Icon() { // 15 pixel green
+            public void paintIcon(Component c, Graphics g, int x, int y) {
+                Color color = g.getColor();
+                g.setColor(Color.GREEN);
+                g.fillRect(x, y, 15, 10);
+                g.setColor(color);
+            }
+
+            public int getIconWidth() {
+                return 15;
+            }
+
+            public int getIconHeight() {
+                return 10;
+            }
+        };
+
+        rm2.setIcon(myIcon2);
+
+        mi3.setIcon(myIcon);
+        menu.add(mi3);
+        menu.add(new JMenuItem(myIcon2));
+
+        final JMenu menu2 = new JMenu("No nothing");
+        menu2.add("One").addActionListener(new AbstractAction() {
+            public void actionPerformed(ActionEvent e) {
+                PassFailJFrame.log("menu.width = " + menu2.getPopupMenu().getWidth());
+            }
+        });
+        menu2.add("Two").addActionListener(new AbstractAction() {
+            public void actionPerformed(ActionEvent e) {
+                PassFailJFrame.log("menu.width = " + menu2.getPopupMenu().getWidth());
+            }
+        });
+        menu2.add("Threeee").addActionListener(new AbstractAction() {
+            public void actionPerformed(ActionEvent e) {
+                PassFailJFrame.log("menu.width = " + menu2.getPopupMenu().getWidth());
+            }
+        });
+
+        JMenuItem mi4 = new JMenuItem("Item with icon");
+        mi4.setIcon(myIcon);
+        menu.addSeparator();
+        menu.add(mi4);
+        String title = "Menu Item Test " + (isLeft ? "(Left-to-right)" : "(Right-to-left)");
+        JFrame frame = new JFrame(title);
+
+        JMenuBar menuBar = new JMenuBar();
+        menuBar.add(menu);
+        menuBar.add(menu2);
+
+        JMenu someIcons = new JMenu("Some icons");
+        JMenuItem imi1 = new JMenuItem("Icon!");
+        imi1.setIcon(myIcon);
+        someIcons.add(imi1);
+        JMenuItem imi2 = new JMenuItem("Wide icon!");
+        imi2.setIcon(myIcon2);
+        someIcons.add(imi2);
+        someIcons.add(new JCheckBoxMenuItem("CheckBox"));
+        someIcons.add(new JRadioButtonMenuItem("RadioButton"));
+        menuBar.add(someIcons);
+        frame.setJMenuBar(menuBar);
+        ComponentOrientation co = (isLeft ?
+                ComponentOrientation.LEFT_TO_RIGHT :
+                ComponentOrientation.RIGHT_TO_LEFT);
+        frame.applyComponentOrientation(co);
+        frame.setSize(300, 300);
+        int frameX = isLeft ? 0 : 600;
+        frame.setLocation(frameX, 20);
+        return frame;
+    }
+
+}

From c0292203794bf3a8bfb02eac062e226ef2d07ee1 Mon Sep 17 00:00:00 2001
From: Zihao Lin <linzihao1999@outlook.com>
Date: Fri, 28 Mar 2025 13:19:23 +0000
Subject: [PATCH 542/587] 8352896: LambdaExpr02.java runs wrong test class

Reviewed-by: shade, jlahoda
---
 test/langtools/tools/javac/lambda/LambdaExpr02.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/langtools/tools/javac/lambda/LambdaExpr02.java b/test/langtools/tools/javac/lambda/LambdaExpr02.java
index d2fb358dbe3..d3526b54373 100644
--- a/test/langtools/tools/javac/lambda/LambdaExpr02.java
+++ b/test/langtools/tools/javac/lambda/LambdaExpr02.java
@@ -28,7 +28,7 @@
  *  basic test for simple lambda expressions in multiple scopes
  * @author  Brian Goetz
  * @author  Maurizio Cimadamore
- * @run main LambdaExpr01
+ * @run main LambdaExpr02
  */
 
 public class LambdaExpr02 {

From a269bef04cf3c9c8b731edcbf7618624f7571a2d Mon Sep 17 00:00:00 2001
From: Volodymyr Paprotski <vpaprotski@openjdk.org>
Date: Fri, 28 Mar 2025 15:20:31 +0000
Subject: [PATCH 543/587] 8350459: MontgomeryIntegerPolynomialP256 multiply
 intrinsic with AVX2 on x86_64

Reviewed-by: ascarpino, sviswanathan
---
 src/hotspot/cpu/x86/assembler_x86.cpp         |  45 ++
 src/hotspot/cpu/x86/assembler_x86.hpp         |   8 +
 src/hotspot/cpu/x86/macroAssembler_x86.cpp    |  77 +++
 src/hotspot/cpu/x86/macroAssembler_x86.hpp    |  10 +
 .../x86/stubGenerator_x86_64_poly_mont.cpp    | 557 +++++++++++++++---
 src/hotspot/cpu/x86/vm_version_x86.cpp        |   2 +-
 src/hotspot/share/classfile/vmIntrinsics.hpp  |   2 +-
 .../MontgomeryIntegerPolynomialP256.java      |  54 +-
 .../intpoly/MontgomeryPolynomialFuzzTest.java | 100 +++-
 9 files changed, 740 insertions(+), 115 deletions(-)

diff --git a/src/hotspot/cpu/x86/assembler_x86.cpp b/src/hotspot/cpu/x86/assembler_x86.cpp
index f90dfb2aa5b..48e482e71ae 100644
--- a/src/hotspot/cpu/x86/assembler_x86.cpp
+++ b/src/hotspot/cpu/x86/assembler_x86.cpp
@@ -3529,6 +3529,30 @@ void Assembler::vmovdqu(Address dst, XMMRegister src) {
   emit_operand(src, dst, 0);
 }
 
+// Move Aligned 256bit Vector
+void Assembler::vmovdqa(XMMRegister dst, Address src) {
+  assert(UseAVX > 0, "");
+  InstructionMark im(this);
+  InstructionAttr attributes(AVX_256bit, /* vex_w */ false, /* legacy_mode */ false, /* no_mask_reg */ true, /* uses_vl */ true);
+  attributes.set_address_attributes(/* tuple_type */ EVEX_FVM, /* input_size_in_bits */ EVEX_NObit);
+  vex_prefix(src, 0, dst->encoding(), VEX_SIMD_66, VEX_OPCODE_0F, &attributes);
+  emit_int8(0x6F);
+  emit_operand(dst, src, 0);
+}
+
+void Assembler::vmovdqa(Address dst, XMMRegister src) {
+  assert(UseAVX > 0, "");
+  InstructionMark im(this);
+  InstructionAttr attributes(AVX_256bit, /* vex_w */ false, /* legacy_mode */ false, /* no_mask_reg */ true, /* uses_vl */ true);
+  attributes.set_address_attributes(/* tuple_type */ EVEX_FVM, /* input_size_in_bits */ EVEX_NObit);
+  attributes.reset_is_clear_context();
+  // swap src<->dst for encoding
+  assert(src != xnoreg, "sanity");
+  vex_prefix(dst, 0, src->encoding(), VEX_SIMD_66, VEX_OPCODE_0F, &attributes);
+  emit_int8(0x7F);
+  emit_operand(src, dst, 0);
+}
+
 void Assembler::vpmaskmovd(XMMRegister dst, XMMRegister mask, Address src, int vector_len) {
   assert((VM_Version::supports_avx2() && vector_len == AVX_256bit), "");
   InstructionMark im(this);
@@ -3791,6 +3815,27 @@ void Assembler::evmovdquq(XMMRegister dst, KRegister mask, Address src, bool mer
   emit_operand(dst, src, 0);
 }
 
+// Move Aligned 512bit Vector
+void Assembler::evmovdqaq(XMMRegister dst, Address src, int vector_len) {
+  // Unmasked instruction
+  evmovdqaq(dst, k0, src, /*merge*/ false, vector_len);
+}
+
+void Assembler::evmovdqaq(XMMRegister dst, KRegister mask, Address src, bool merge, int vector_len) {
+  assert(VM_Version::supports_evex(), "");
+  InstructionMark im(this);
+  InstructionAttr attributes(vector_len, /* vex_w */ true, /* legacy_mode */ false, /* no_mask_reg */ false, /* uses_vl */ true);
+  attributes.set_address_attributes(/* tuple_type */ EVEX_FVM, /* input_size_in_bits */ EVEX_NObit);
+  attributes.set_embedded_opmask_register_specifier(mask);
+  attributes.set_is_evex_instruction();
+  if (merge) {
+    attributes.reset_is_clear_context();
+  }
+  vex_prefix(src, 0, dst->encoding(), VEX_SIMD_66, VEX_OPCODE_0F, &attributes);
+  emit_int8(0x6F);
+  emit_operand(dst, src, 0);
+}
+
 void Assembler::evmovntdquq(Address dst, XMMRegister src, int vector_len) {
   // Unmasked instruction
   evmovntdquq(dst, k0, src, /*merge*/ true, vector_len);
diff --git a/src/hotspot/cpu/x86/assembler_x86.hpp b/src/hotspot/cpu/x86/assembler_x86.hpp
index 4992661dce2..5e29961f49a 100644
--- a/src/hotspot/cpu/x86/assembler_x86.hpp
+++ b/src/hotspot/cpu/x86/assembler_x86.hpp
@@ -1758,6 +1758,10 @@ private:
   void vmovdqu(XMMRegister dst, Address src);
   void vmovdqu(XMMRegister dst, XMMRegister src);
 
+  // Move Aligned 256bit Vector
+  void vmovdqa(XMMRegister dst, Address src);
+  void vmovdqa(Address dst, XMMRegister src);
+
    // Move Unaligned 512bit Vector
   void evmovdqub(XMMRegister dst, XMMRegister src, int vector_len);
   void evmovdqub(XMMRegister dst, Address src, int vector_len);
@@ -1791,6 +1795,10 @@ private:
   void evmovdquq(XMMRegister dst, KRegister mask, Address src, bool merge, int vector_len);
   void evmovdquq(Address dst, KRegister mask, XMMRegister src, bool merge, int vector_len);
 
+  // Move Aligned 512bit Vector
+  void evmovdqaq(XMMRegister dst, Address src, int vector_len);
+  void evmovdqaq(XMMRegister dst, KRegister mask, Address src, bool merge, int vector_len);
+
   // Move lower 64bit to high 64bit in 128bit register
   void movlhps(XMMRegister dst, XMMRegister src);
 
diff --git a/src/hotspot/cpu/x86/macroAssembler_x86.cpp b/src/hotspot/cpu/x86/macroAssembler_x86.cpp
index 00f9358de67..c92ce2f283c 100644
--- a/src/hotspot/cpu/x86/macroAssembler_x86.cpp
+++ b/src/hotspot/cpu/x86/macroAssembler_x86.cpp
@@ -2720,6 +2720,60 @@ void MacroAssembler::vmovdqu(XMMRegister dst, AddressLiteral src, int vector_len
   }
 }
 
+void MacroAssembler::vmovdqu(XMMRegister dst, XMMRegister src, int vector_len) {
+  if (vector_len == AVX_512bit) {
+    evmovdquq(dst, src, AVX_512bit);
+  } else if (vector_len == AVX_256bit) {
+    vmovdqu(dst, src);
+  } else {
+    movdqu(dst, src);
+  }
+}
+
+void MacroAssembler::vmovdqu(Address dst, XMMRegister src, int vector_len) {
+  if (vector_len == AVX_512bit) {
+    evmovdquq(dst, src, AVX_512bit);
+  } else if (vector_len == AVX_256bit) {
+    vmovdqu(dst, src);
+  } else {
+    movdqu(dst, src);
+  }
+}
+
+void MacroAssembler::vmovdqu(XMMRegister dst, Address src, int vector_len) {
+  if (vector_len == AVX_512bit) {
+    evmovdquq(dst, src, AVX_512bit);
+  } else if (vector_len == AVX_256bit) {
+    vmovdqu(dst, src);
+  } else {
+    movdqu(dst, src);
+  }
+}
+
+void MacroAssembler::vmovdqa(XMMRegister dst, AddressLiteral src, Register rscratch) {
+  assert(rscratch != noreg || always_reachable(src), "missing");
+
+  if (reachable(src)) {
+    vmovdqa(dst, as_Address(src));
+  }
+  else {
+    lea(rscratch, src);
+    vmovdqa(dst, Address(rscratch, 0));
+  }
+}
+
+void MacroAssembler::vmovdqa(XMMRegister dst, AddressLiteral src, int vector_len, Register rscratch) {
+  assert(rscratch != noreg || always_reachable(src), "missing");
+
+  if (vector_len == AVX_512bit) {
+    evmovdqaq(dst, src, AVX_512bit, rscratch);
+  } else if (vector_len == AVX_256bit) {
+    vmovdqa(dst, src, rscratch);
+  } else {
+    movdqa(dst, src, rscratch);
+  }
+}
+
 void MacroAssembler::kmov(KRegister dst, Address src) {
   if (VM_Version::supports_avx512bw()) {
     kmovql(dst, src);
@@ -2844,6 +2898,29 @@ void MacroAssembler::evmovdquq(XMMRegister dst, AddressLiteral src, int vector_l
   }
 }
 
+void MacroAssembler::evmovdqaq(XMMRegister dst, KRegister mask, AddressLiteral src, bool merge, int vector_len, Register rscratch) {
+  assert(rscratch != noreg || always_reachable(src), "missing");
+
+  if (reachable(src)) {
+    Assembler::evmovdqaq(dst, mask, as_Address(src), merge, vector_len);
+  } else {
+    lea(rscratch, src);
+    Assembler::evmovdqaq(dst, mask, Address(rscratch, 0), merge, vector_len);
+  }
+}
+
+void MacroAssembler::evmovdqaq(XMMRegister dst, AddressLiteral src, int vector_len, Register rscratch) {
+  assert(rscratch != noreg || always_reachable(src), "missing");
+
+  if (reachable(src)) {
+    Assembler::evmovdqaq(dst, as_Address(src), vector_len);
+  } else {
+    lea(rscratch, src);
+    Assembler::evmovdqaq(dst, Address(rscratch, 0), vector_len);
+  }
+}
+
+
 void MacroAssembler::movdqa(XMMRegister dst, AddressLiteral src, Register rscratch) {
   assert(rscratch != noreg || always_reachable(src), "missing");
 
diff --git a/src/hotspot/cpu/x86/macroAssembler_x86.hpp b/src/hotspot/cpu/x86/macroAssembler_x86.hpp
index b6f229661a8..36ef3a69d49 100644
--- a/src/hotspot/cpu/x86/macroAssembler_x86.hpp
+++ b/src/hotspot/cpu/x86/macroAssembler_x86.hpp
@@ -1348,6 +1348,14 @@ public:
   void vmovdqu(XMMRegister dst, XMMRegister    src);
   void vmovdqu(XMMRegister dst, AddressLiteral src,                 Register rscratch = noreg);
   void vmovdqu(XMMRegister dst, AddressLiteral src, int vector_len, Register rscratch = noreg);
+  void vmovdqu(XMMRegister dst, XMMRegister    src, int vector_len);
+  void vmovdqu(XMMRegister dst, Address        src, int vector_len);
+  void vmovdqu(Address     dst, XMMRegister    src, int vector_len);
+
+  // AVX Aligned forms
+  using Assembler::vmovdqa;
+  void vmovdqa(XMMRegister dst, AddressLiteral src,                 Register rscratch = noreg);
+  void vmovdqa(XMMRegister dst, AddressLiteral src, int vector_len, Register rscratch = noreg);
 
   // AVX512 Unaligned
   void evmovdqu(BasicType type, KRegister kmask, Address     dst, XMMRegister src, bool merge, int vector_len);
@@ -1404,6 +1412,7 @@ public:
   void evmovdquq(XMMRegister dst, Address        src, int vector_len) { Assembler::evmovdquq(dst, src, vector_len); }
   void evmovdquq(Address     dst, XMMRegister    src, int vector_len) { Assembler::evmovdquq(dst, src, vector_len); }
   void evmovdquq(XMMRegister dst, AddressLiteral src, int vector_len, Register rscratch = noreg);
+  void evmovdqaq(XMMRegister dst, AddressLiteral src, int vector_len, Register rscratch = noreg);
 
   void evmovdquq(XMMRegister dst, KRegister mask, XMMRegister src, bool merge, int vector_len) {
     if (dst->encoding() != src->encoding() || mask != k0) {
@@ -1413,6 +1422,7 @@ public:
   void evmovdquq(Address     dst, KRegister mask, XMMRegister    src, bool merge, int vector_len) { Assembler::evmovdquq(dst, mask, src, merge, vector_len); }
   void evmovdquq(XMMRegister dst, KRegister mask, Address        src, bool merge, int vector_len) { Assembler::evmovdquq(dst, mask, src, merge, vector_len); }
   void evmovdquq(XMMRegister dst, KRegister mask, AddressLiteral src, bool merge, int vector_len, Register rscratch = noreg);
+  void evmovdqaq(XMMRegister dst, KRegister mask, AddressLiteral src, bool merge, int vector_len, Register rscratch = noreg);
 
   // Move Aligned Double Quadword
   void movdqa(XMMRegister dst, XMMRegister    src) { Assembler::movdqa(dst, src); }
diff --git a/src/hotspot/cpu/x86/stubGenerator_x86_64_poly_mont.cpp b/src/hotspot/cpu/x86/stubGenerator_x86_64_poly_mont.cpp
index b75162dbb47..a897fe2e694 100644
--- a/src/hotspot/cpu/x86/stubGenerator_x86_64_poly_mont.cpp
+++ b/src/hotspot/cpu/x86/stubGenerator_x86_64_poly_mont.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024, Intel Corporation. All rights reserved.
+ * Copyright (c) 2024, 2025, Intel Corporation. All rights reserved.
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -28,17 +28,17 @@
 
 #define __ _masm->
 
-ATTRIBUTE_ALIGNED(64) uint64_t MODULUS_P256[] = {
+ATTRIBUTE_ALIGNED(64) constexpr uint64_t MODULUS_P256[] = {
   0x000fffffffffffffULL, 0x00000fffffffffffULL,
   0x0000000000000000ULL, 0x0000001000000000ULL,
   0x0000ffffffff0000ULL, 0x0000000000000000ULL,
   0x0000000000000000ULL, 0x0000000000000000ULL
 };
-static address modulus_p256() {
-  return (address)MODULUS_P256;
+static address modulus_p256(int index = 0) {
+  return (address)&MODULUS_P256[index];
 }
 
-ATTRIBUTE_ALIGNED(64) uint64_t P256_MASK52[] = {
+ATTRIBUTE_ALIGNED(64) constexpr uint64_t P256_MASK52[] = {
   0x000fffffffffffffULL, 0x000fffffffffffffULL,
   0x000fffffffffffffULL, 0x000fffffffffffffULL,
   0xffffffffffffffffULL, 0xffffffffffffffffULL,
@@ -48,7 +48,7 @@ static address p256_mask52() {
   return (address)P256_MASK52;
 }
 
-ATTRIBUTE_ALIGNED(64) uint64_t SHIFT1R[] = {
+ATTRIBUTE_ALIGNED(64) constexpr uint64_t SHIFT1R[] = {
   0x0000000000000001ULL, 0x0000000000000002ULL,
   0x0000000000000003ULL, 0x0000000000000004ULL,
   0x0000000000000005ULL, 0x0000000000000006ULL,
@@ -58,7 +58,7 @@ static address shift_1R() {
   return (address)SHIFT1R;
 }
 
-ATTRIBUTE_ALIGNED(64) uint64_t SHIFT1L[] = {
+ATTRIBUTE_ALIGNED(64) constexpr uint64_t SHIFT1L[] = {
   0x0000000000000007ULL, 0x0000000000000000ULL,
   0x0000000000000001ULL, 0x0000000000000002ULL,
   0x0000000000000003ULL, 0x0000000000000004ULL,
@@ -68,6 +68,14 @@ static address shift_1L() {
   return (address)SHIFT1L;
 }
 
+ATTRIBUTE_ALIGNED(64) constexpr uint64_t MASKL5[] = {
+  0xFFFFFFFFFFFFFFFFULL, 0xFFFFFFFFFFFFFFFFULL,
+  0xFFFFFFFFFFFFFFFFULL, 0x0000000000000000ULL,
+};
+static address mask_limb5() {
+  return (address)MASKL5;
+}
+
 /**
  * Unrolled Word-by-Word Montgomery Multiplication
  * r = a * b * 2^-260 (mod P)
@@ -94,26 +102,25 @@ static address shift_1L() {
  *          B = replicate(bLimbs[i])                   |bi|bi|bi|bi|bi|bi|bi|bi|
  *                                                     +--+--+--+--+--+--+--+--+
  *                                                     +--+--+--+--+--+--+--+--+
+ *                                                     | 0| 0| 0|a5|a4|a3|a2|a1|
+ *          Acc1 += A *  B                            *|bi|bi|bi|bi|bi|bi|bi|bi|
  *                                               Acc1+=| 0| 0| 0|c5|c4|c3|c2|c1|
- *                                                    *| 0| 0| 0|a5|a4|a3|a2|a1|
- *          Acc1 += A *  B                             |bi|bi|bi|bi|bi|bi|bi|bi|
  *                                                     +--+--+--+--+--+--+--+--+
- *                                               Acc2+=| 0| 0| 0| 0| 0| 0| 0| 0|
- *                                                   *h| 0| 0| 0|a5|a4|a3|a2|a1|
- *          Acc2 += A *h B                             |bi|bi|bi|bi|bi|bi|bi|bi|
+ *                                                     | 0| 0| 0|a5|a4|a3|a2|a1|
+ *          Acc2 += A *h B                           *h|bi|bi|bi|bi|bi|bi|bi|bi|
+ *                                               Acc2+=| 0| 0| 0| d5|d4|d3|d2|d1|
  *                                                     +--+--+--+--+--+--+--+--+
  *          N = replicate(Acc1[0])                     |n0|n0|n0|n0|n0|n0|n0|n0|
  *                                                     +--+--+--+--+--+--+--+--+
  *                                                     +--+--+--+--+--+--+--+--+
- *                                               Acc1+=| 0| 0| 0|c5|c4|c3|c2|c1|
- *                                                    *| 0| 0| 0|m5|m4|m3|m2|m1|
- *          Acc1 += M *  N                             |n0|n0|n0|n0|n0|n0|n0|n0| Note: 52 low bits of Acc1[0] == 0 due to Montgomery!
+ *                                                     | 0| 0| 0|m5|m4|m3|m2|m1|
+ *          Acc1 += M *  N                            *|n0|n0|n0|n0|n0|n0|n0|n0|
+ *                                               Acc1+=| 0| 0| 0|c5|c4|c3|c2|c1| Note: 52 low bits of c1 == 0 due to Montgomery!
  *                                                     +--+--+--+--+--+--+--+--+
+ *                                                     | 0| 0| 0|m5|m4|m3|m2|m1|
+ *          Acc2 += M *h N                           *h|n0|n0|n0|n0|n0|n0|n0|n0|
  *                                               Acc2+=| 0| 0| 0|d5|d4|d3|d2|d1|
- *                                                   *h| 0| 0| 0|m5|m4|m3|m2|m1|
- *          Acc2 += M *h N                             |n0|n0|n0|n0|n0|n0|n0|n0|
  *                                                     +--+--+--+--+--+--+--+--+
- *          if (i == 4) break;
  *          // Combine high/low partial sums Acc1 + Acc2
  *                                                     +--+--+--+--+--+--+--+--+
  *          carry = Acc1[0] >> 52                      | 0| 0| 0| 0| 0| 0| 0|c1|
@@ -124,13 +131,35 @@ static address shift_1L() {
  *                                                     +--+--+--+--+--+--+--+--+
  *          Acc1 = Acc1 + Acc2
  *      ---- done
- *   // Last Carry round: Combine high/low partial sums Acc1<high_bits> + Acc1 + Acc2
- *   carry = Acc1 >> 52
- *   Acc1 = Acc1 shift one q element >>
- *   Acc1  = mask52(Acc1)
- *   Acc2  += carry
- *   Acc1 = Acc1 + Acc2
- *   output to rLimbs
+ *
+ * At this point the result in Acc1 can overflow by 1 Modulus and needs carry
+ * propagation. Subtract one modulus, carry-propagate both results and select
+ * (constant-time) the positive number of the two
+ *
+ * Carry = Acc1[0] >> 52
+ * Acc1L = Acc1[0] & mask52
+ * Acc1  = Acc1 shift one q element>>
+ * Acc1 += Carry
+ *
+ * Carry = Acc2[0] >> 52
+ * Acc2L = Acc2[0] & mask52
+ * Acc2  = Acc2 shift one q element>>
+ * Acc2 += Carry
+ *
+ * for col:=1 to 4
+ *   Carry = Acc2[col]>>52
+ *   Carry = Carry shift one q element<<
+ *   Acc2 += Carry
+ *
+ *   Carry = Acc1[col]>>52
+ *   Carry = Carry shift one q element<<
+ *   Acc1 += Carry
+ * done
+ *
+ * Acc1 &= mask52
+ * Acc2 &= mask52
+ * Mask = sign(Acc2)
+ * Result = select(Mask ? Acc1 or Acc2)
  */
 void montgomeryMultiply(const Register aLimbs, const Register bLimbs, const Register rLimbs, const Register tmp, MacroAssembler* _masm) {
   Register t0 = tmp;
@@ -145,26 +174,30 @@ void montgomeryMultiply(const Register aLimbs, const Register bLimbs, const Regi
   XMMRegister Acc1 = xmm10;
   XMMRegister Acc2 = xmm11;
   XMMRegister N    = xmm12;
-  XMMRegister carry = xmm13;
+  XMMRegister Carry = xmm13;
 
   // // Constants
-  XMMRegister modulus = xmm20;
-  XMMRegister shift1L = xmm21;
-  XMMRegister shift1R = xmm22;
-  XMMRegister mask52  = xmm23;
-  KRegister limb0    = k1;
-  KRegister allLimbs = k2;
+  XMMRegister modulus = xmm5;
+  XMMRegister shift1L = xmm6;
+  XMMRegister shift1R = xmm7;
+  XMMRegister Mask52  = xmm8;
+  KRegister allLimbs = k1;
+  KRegister limb0    = k2;
+  KRegister masks[] = {limb0, k3, k4, k5};
+
+  for (int i=0; i<4; i++) {
+    __ mov64(t0, 1ULL<<i);
+    __ kmovql(masks[i], t0);
+  }
 
-  __ mov64(t0, 0x1);
-  __ kmovql(limb0, t0);
   __ mov64(t0, 0x1f);
   __ kmovql(allLimbs, t0);
-  __ evmovdquq(shift1L, allLimbs, ExternalAddress(shift_1L()), false, Assembler::AVX_512bit, rscratch);
-  __ evmovdquq(shift1R, allLimbs, ExternalAddress(shift_1R()), false, Assembler::AVX_512bit, rscratch);
-  __ evmovdquq(mask52, allLimbs, ExternalAddress(p256_mask52()), false, Assembler::AVX_512bit, rscratch);
+  __ evmovdqaq(shift1L, allLimbs, ExternalAddress(shift_1L()), false, Assembler::AVX_512bit, rscratch);
+  __ evmovdqaq(shift1R, allLimbs, ExternalAddress(shift_1R()), false, Assembler::AVX_512bit, rscratch);
+  __ evmovdqaq(Mask52, allLimbs, ExternalAddress(p256_mask52()), false, Assembler::AVX_512bit, rscratch);
 
   // M = load(*modulus_p256)
-  __ evmovdquq(modulus, allLimbs, ExternalAddress(modulus_p256()), false, Assembler::AVX_512bit, rscratch);
+  __ evmovdqaq(modulus, allLimbs, ExternalAddress(modulus_p256()), false, Assembler::AVX_512bit, rscratch);
 
   // A = load(*aLimbs);  masked evmovdquq() can be slow. Instead load full 256bit, and compbine with 64bit
   __ evmovdquq(A, Address(aLimbs, 8), Assembler::AVX_256bit);
@@ -196,15 +229,13 @@ void montgomeryMultiply(const Register aLimbs, const Register bLimbs, const Regi
       // Acc2 += M *h N
       __ evpmadd52huq(Acc2, modulus, N, Assembler::AVX_512bit);
 
-      if (i == 4) break;
-
       // Combine high/low partial sums Acc1 + Acc2
 
       // carry = Acc1[0] >> 52
-      __ evpsrlq(carry, limb0, Acc1, 52, true, Assembler::AVX_512bit);
+      __ evpsrlq(Carry, limb0, Acc1, 52, true, Assembler::AVX_512bit);
 
       // Acc2[0] += carry
-      __ evpaddq(Acc2, limb0, carry, Acc2, true, Assembler::AVX_512bit);
+      __ evpaddq(Acc2, limb0, Carry, Acc2, true, Assembler::AVX_512bit);
 
       // Acc1 = Acc1 shift one q element >>
       __ evpermq(Acc1, allLimbs, shift1R, Acc1, false, Assembler::AVX_512bit);
@@ -213,26 +244,317 @@ void montgomeryMultiply(const Register aLimbs, const Register bLimbs, const Regi
       __ vpaddq(Acc1, Acc1, Acc2, Assembler::AVX_512bit);
   }
 
-  // Last Carry round: Combine high/low partial sums Acc1<high_bits> + Acc1 + Acc2
-  // carry = Acc1 >> 52
-  __ evpsrlq(carry, allLimbs, Acc1, 52, true, Assembler::AVX_512bit);
+  // At this point the result is in Acc1, but needs to be normailized to 52bit
+  // limbs (i.e. needs carry propagation) It can also overflow by 1 modulus.
+  // Subtract one modulus from Acc1 into Acc2 then carry propagate both
+  // simultaneously
 
-  // Acc1 = Acc1 shift one q element >>
+  XMMRegister Acc1L = A;
+  XMMRegister Acc2L = B;
+  __ vpsubq(Acc2, Acc1, modulus, Assembler::AVX_512bit);
+
+  // digit 0 carry out
+  // Also split Acc1 and Acc2 into two 256-bit vectors each {Acc1, Acc1L} and
+  // {Acc2, Acc2L} to use 256bit operations
+  __ evpsraq(Carry, limb0, Acc2, 52, false, Assembler::AVX_256bit);
+  __ evpandq(Acc2L, limb0, Acc2, Mask52, false, Assembler::AVX_256bit);
+  __ evpermq(Acc2, allLimbs, shift1R, Acc2, false, Assembler::AVX_512bit);
+  __ vpaddq(Acc2, Acc2, Carry, Assembler::AVX_256bit);
+
+  __ evpsraq(Carry, limb0, Acc1, 52, false, Assembler::AVX_256bit);
+  __ evpandq(Acc1L, limb0, Acc1, Mask52, false, Assembler::AVX_256bit);
   __ evpermq(Acc1, allLimbs, shift1R, Acc1, false, Assembler::AVX_512bit);
+  __ vpaddq(Acc1, Acc1, Carry, Assembler::AVX_256bit);
 
-  // Acc1  = mask52(Acc1)
-  __ evpandq(Acc1, Acc1, mask52, Assembler::AVX_512bit); // Clear top 12 bits
+ /* remaining digits carry
+  * Note1: Carry register contains just the carry for the particular
+  * column (zero-mask the rest) and gets progressively shifted left
+  * Note2: 'element shift' with vpermq is more expensive, so using vpalignr when
+  * possible. vpalignr shifts 'right' not left, so place the carry appropiately
+  *                               +--+--+--+--+    +--+--+--+--+         +--+--+
+  * vpalignr(X, X, X, 8):         |x4|x3|x2|x1| >> |x2|x1|x2|x1|         |x1|x2|
+  *                               +--+--+--+--+    +--+--+--+--+ >>      +--+--+
+  *                                     |          +--+--+--+--+   +--+--+
+  *                                     |          |x4|x3|x4|x3|   |x3|x4|
+  *                                     |          +--+--+--+--+   +--+--+
+  *                                     |                                vv
+  *                                     |                          +--+--+--+--+
+  *  (x3 and x1 is effectively shifted  +------------------------> |x3|x4|x1|x2|
+  *   left; zero-mask everything but one column of interest)       +--+--+--+--+
+  */
+  for (int i = 1; i<4; i++) {
+    __ evpsraq(Carry, masks[i-1], Acc2, 52, false, Assembler::AVX_256bit);
+    if (i == 1 || i == 3) {
+      __ vpalignr(Carry, Carry, Carry, 8, Assembler::AVX_256bit);
+    } else {
+      __ vpermq(Carry, Carry, 0b10010011, Assembler::AVX_256bit);
+    }
+    __ vpaddq(Acc2, Acc2, Carry, Assembler::AVX_256bit);
 
-  // Acc2 += carry
-  __ evpaddq(Acc2, allLimbs, carry, Acc2, true, Assembler::AVX_512bit);
+    __ evpsraq(Carry, masks[i-1], Acc1, 52, false, Assembler::AVX_256bit);
+    if (i == 1 || i == 3) {
+      __ vpalignr(Carry, Carry, Carry, 8, Assembler::AVX_256bit);
+    } else {
+      __ vpermq(Carry, Carry, 0b10010011, Assembler::AVX_256bit); //0b-2-1-0-3
+    }
+    __ vpaddq(Acc1, Acc1, Carry, Assembler::AVX_256bit);
+  }
 
-  // Acc1 = Acc1 + Acc2
-  __ vpaddq(Acc1, Acc1, Acc2, Assembler::AVX_512bit);
+  // Iff Acc2 is negative, then Acc1 contains the result.
+  // if Acc2 is negative, upper 12 bits will be set; arithmetic shift by 64 bits
+  // generates a mask from Acc2 sign bit
+  __ evpsraq(Carry, Acc2, 64, Assembler::AVX_256bit);
+  __ vpermq(Carry, Carry, 0b11111111, Assembler::AVX_256bit); //0b-3-3-3-3
+  __ evpandq(Acc1, Acc1, Mask52, Assembler::AVX_256bit);
+  __ evpandq(Acc2, Acc2, Mask52, Assembler::AVX_256bit);
+
+  // Acc2 = (Acc1 & Mask) | (Acc2 & !Mask)
+  __ vpandn(Acc2L, Carry, Acc2L, Assembler::AVX_256bit);
+  __ vpternlogq(Acc2L, 0xF8, Carry, Acc1L, Assembler::AVX_256bit); // A | B&C orAandBC
+  __ vpandn(Acc2, Carry, Acc2, Assembler::AVX_256bit);
+  __ vpternlogq(Acc2, 0xF8, Carry, Acc1, Assembler::AVX_256bit);
 
   // output to rLimbs (1 + 4 limbs)
-  __ movq(Address(rLimbs, 0), Acc1);
-  __ evpermq(Acc1, k0, shift1R, Acc1, true, Assembler::AVX_512bit);
-  __ evmovdquq(Address(rLimbs, 8), k0, Acc1, true, Assembler::AVX_256bit);
+  __ movq(Address(rLimbs, 0), Acc2L);
+  __ evmovdquq(Address(rLimbs, 8), Acc2, Assembler::AVX_256bit);
+
+  // Cleanup
+  // Zero out zmm0-zmm15, higher registers not used by intrinsic.
+  __ vzeroall();
+}
+
+/**
+ * Unrolled Word-by-Word Montgomery Multiplication
+ * r = a * b * 2^-260 (mod P)
+ *
+ * Use vpmadd52{l,h}uq multiply for upper four limbs and use
+ * scalar mulq for the lowest limb.
+ *
+ * One has to be careful with mulq vs vpmadd52 'crossovers'; mulq high/low
+ * is split as 40:64 bits vs 52:52 in the vector version. Shifts are required
+ * to line up values before addition (see following ascii art)
+ *
+ * Pseudocode:
+ *
+ *                                                     +--+--+--+--+  +--+
+ *   M = load(*modulus_p256)                           |m5|m4|m3|m2|  |m1|
+ *                                                     +--+--+--+--+  +--+
+ *   A = load(*aLimbs)                                 |a5|a4|a3|a2|  |a1|
+ *                                                     +--+--+--+--+  +--+
+ *   Acc1 = 0                                          | 0| 0| 0| 0|  | 0|
+ *                                                     +--+--+--+--+  +--+
+ *      ---- for i = 0 to 4
+ *                                                     +--+--+--+--+  +--+
+ *          Acc2 = 0                                   | 0| 0| 0| 0|  | 0|
+ *                                                     +--+--+--+--+  +--+
+ *          B = replicate(bLimbs[i])                   |bi|bi|bi|bi|  |bi|
+ *                                                     +--+--+--+--+  +--+
+ *                                                     +--+--+--+--+  +--+
+ *                                                     |a5|a4|a3|a2|  |a1|
+ *          Acc1 += A *  B                            *|bi|bi|bi|bi|  |bi|
+ *                                               Acc1+=|c5|c4|c3|c2|  |c1|
+ *                                                     +--+--+--+--+  +--+
+ *                                                     |a5|a4|a3|a2|  |a1|
+ *          Acc2 += A *h B                           *h|bi|bi|bi|bi|  |bi|
+ *                                               Acc2+=|d5|d4|d3|d2|  |d1|
+ *                                                     +--+--+--+--+  +--+
+ *          N = replicate(Acc1[0])                     |n0|n0|n0|n0|  |n0|
+ *                                                     +--+--+--+--+  +--+
+ *                                                     +--+--+--+--+  +--+
+ *                                                     |m5|m4|m3|m2|  |m1|
+ *          Acc1 += M *  N                            *|n0|n0|n0|n0|  |n0|
+ *                                               Acc1+=|c5|c4|c3|c2|  |c1| Note: 52 low bits of c1 == 0 due to Montgomery!
+ *                                                     +--+--+--+--+  +--+
+ *                                                     |m5|m4|m3|m2|  |m1|
+ *          Acc2 += M *h N                           *h|n0|n0|n0|n0|  |n0|
+ *                                               Acc2+=|d5|d4|d3|d2|  |d1|
+ *                                                     +--+--+--+--+  +--+
+ *          // Combine high/low partial sums Acc1 + Acc2
+ *                                                                    +--+
+ *          carry = Acc1[0] >> 52                                     |c1|
+ *                                                                    +--+
+ *          Acc2[0] += carry                                          |d1|
+ *                                                                    +--+
+ *                                                     +--+--+--+--+  +--+
+ *          Acc1 = Acc1 shift one q element>>          | 0|c5|c4|c3|  |c2|
+ *                                                    +|d5|d4|d3|d2|  |d1|
+ *          Acc1 = Acc1 + Acc2                   Acc1+=|c5|c4|c3|c2|  |c1|
+ *                                                     +--+--+--+--+  +--+
+ *      ---- done
+ *                                                     +--+--+--+--+  +--+
+ *   Acc2 = Acc1 - M                                   |d5|d4|d3|d2|  |d1|
+ *                                                     +--+--+--+--+  +--+
+ *   Carry propagate Acc2
+ *   Carry propagate Acc1
+ *   Mask = sign(Acc2)
+ *   Result = select(Mask ? Acc1 or Acc2)
+ *
+ * Acc1 can overflow by one modulus (hence Acc2); Either Acc1 or Acc2 contain
+ * the correct result. However, they both need carry propagation (i.e. normalize
+ * limbs down to 52 bits each).
+ *
+ * Carry propagation would require relatively expensive vector lane operations,
+ * so instead dump to memory and read as scalar registers
+ *
+ * Note: the order of reduce-then-propagate vs propagate-then-reduce is different
+ * in Java
+ */
+void montgomeryMultiplyAVX2(const Register aLimbs, const Register bLimbs, const Register rLimbs,
+  const Register tmp_rax, const Register tmp_rdx, const Register tmp1, const Register tmp2,
+  const Register tmp3, const Register tmp4, const Register tmp5, const Register tmp6,
+  const Register tmp7, MacroAssembler* _masm) {
+  Register rscratch = tmp1;
+
+  // Inputs
+  Register    a = tmp1;
+  XMMRegister A = xmm0;
+  XMMRegister B = xmm1;
+
+  // Intermediates
+  Register    acc1  = tmp2;
+  XMMRegister Acc1  = xmm3;
+  Register    acc2  = tmp3;
+  XMMRegister Acc2  = xmm4;
+  XMMRegister N     = xmm5;
+  XMMRegister Carry = xmm6;
+
+  // Constants
+  Register    modulus   = tmp4;
+  XMMRegister Modulus   = xmm7;
+  Register    mask52    = tmp5;
+  XMMRegister Mask52    = xmm8;
+  XMMRegister MaskLimb5 = xmm9;
+  XMMRegister Zero      = xmm10;
+
+  __ mov64(mask52, P256_MASK52[0]);
+  __ movq(Mask52, mask52);
+  __ vpbroadcastq(Mask52, Mask52, Assembler::AVX_256bit);
+  __ vmovdqa(MaskLimb5, ExternalAddress(mask_limb5()), Assembler::AVX_256bit, rscratch);
+  __ vpxor(Zero, Zero, Zero, Assembler::AVX_256bit);
+
+  // M = load(*modulus_p256)
+  __ movq(modulus, mask52);
+  __ vmovdqu(Modulus, ExternalAddress(modulus_p256(1)), Assembler::AVX_256bit, rscratch);
+
+  // A = load(*aLimbs);
+  __ movq(a, Address(aLimbs, 0));
+  __ vmovdqu(A, Address(aLimbs, 8)); //Assembler::AVX_256bit
+
+  // Acc1 = 0
+  __ vpxor(Acc1, Acc1, Acc1, Assembler::AVX_256bit);
+  for (int i = 0; i< 5; i++) {
+      // Acc2 = 0
+      __ vpxor(Acc2, Acc2, Acc2, Assembler::AVX_256bit);
+
+      // B = replicate(bLimbs[i])
+      __ movq(tmp_rax, Address(bLimbs, i*8)); //(b==rax)
+      __ vpbroadcastq(B, Address(bLimbs, i*8), Assembler::AVX_256bit);
+
+      // Acc1 += A * B
+      // Acc2 += A *h B
+      __ mulq(a); // rdx:rax = a*rax
+      if (i == 0) {
+        __ movq(acc1, tmp_rax);
+        __ movq(acc2, tmp_rdx);
+      } else {
+        // Careful with limb size/carries; from mulq, tmp_rax uses full 64 bits
+        __ xorq(acc2, acc2);
+        __ addq(acc1, tmp_rax);
+        __ adcq(acc2, tmp_rdx);
+      }
+      __ vpmadd52luq(Acc1, A, B, Assembler::AVX_256bit);
+      __ vpmadd52huq(Acc2, A, B, Assembler::AVX_256bit);
+
+      // N = replicate(Acc1[0])
+      if  (i != 0) {
+        __ movq(tmp_rax, acc1); // (n==rax)
+      }
+      __ andq(tmp_rax, mask52);
+      __ movq(N, acc1); // masking implicit in vpmadd52
+      __ vpbroadcastq(N, N, Assembler::AVX_256bit);
+
+      // Acc1 += M *  N
+      __ mulq(modulus); // rdx:rax = modulus*rax
+      __ vpmadd52luq(Acc1, Modulus, N, Assembler::AVX_256bit);
+      __ addq(acc1, tmp_rax); //carry flag set!
+
+      // Acc2 += M *h N
+      __ adcq(acc2, tmp_rdx);
+      __ vpmadd52huq(Acc2, Modulus, N, Assembler::AVX_256bit);
+
+      // Combine high/low partial sums Acc1 + Acc2
+
+      // carry = Acc1[0] >> 52
+      __ shrq(acc1, 52); // low 52 of acc1 ignored, is zero, because Montgomery
+
+      // Acc2[0] += carry
+      __ shlq(acc2, 12);
+      __ addq(acc2, acc1);
+
+      // Acc1 = Acc1 shift one q element >>
+      __ movq(acc1, Acc1);
+      __ vpermq(Acc1, Acc1, 0b11111001, Assembler::AVX_256bit);
+      __ vpand(Acc1, Acc1, MaskLimb5, Assembler::AVX_256bit);
+
+      // Acc1 = Acc1 + Acc2
+      __ addq(acc1, acc2);
+      __ vpaddq(Acc1, Acc1, Acc2, Assembler::AVX_256bit);
+  }
+
+  __ movq(acc2, acc1);
+  __ subq(acc2, modulus);
+  __ vpsubq(Acc2, Acc1, Modulus, Assembler::AVX_256bit);
+  __ vmovdqa(Address(rsp, 0), Acc2); //Assembler::AVX_256bit
+
+  // Carry propagate the subtraction result Acc2 first (since the last carry is
+  // used to select result). Careful, following registers overlap:
+  // acc1  = tmp2; acc2  = tmp3; mask52 = tmp5
+  // Note that Acc2 limbs are signed (i.e. result of a subtract with modulus)
+  // i.e. using signed shift is needed for correctness
+  Register limb[] = {acc2, tmp1, tmp4, tmp_rdx, tmp6};
+  Register carry = tmp_rax;
+  for (int i = 0; i<5; i++) {
+    if (i > 0) {
+      __ movq(limb[i], Address(rsp, -8+i*8));
+      __ addq(limb[i], carry);
+    }
+    __ movq(carry, limb[i]);
+    if (i==4) break;
+    __ sarq(carry, 52);
+  }
+  __ sarq(carry, 63);
+  __ notq(carry); //select
+  Register select = carry;
+  carry = tmp7;
+
+  // Now carry propagate the multiply result and (constant-time) select correct
+  // output digit
+  Register digit = acc1;
+  __ vmovdqa(Address(rsp, 0), Acc1); //Assembler::AVX_256bit
+
+  for (int i = 0; i<5; i++) {
+    if (i>0) {
+      __ movq(digit, Address(rsp, -8+i*8));
+      __ addq(digit, carry);
+    }
+    __ movq(carry, digit);
+    __ sarq(carry, 52);
+
+    // long dummyLimbs = maskValue & (a[i] ^ b[i]);
+    // a[i] = dummyLimbs ^ a[i];
+    __ xorq(limb[i], digit);
+    __ andq(limb[i], select);
+    __ xorq(digit, limb[i]);
+
+    __ andq(digit, mask52);
+    __ movq(Address(rLimbs, i*8), digit);
+  }
+
+  // Cleanup
+  // Zero out ymm0-ymm15.
+  __ vzeroall();
+  __ vpxor(Acc1, Acc1, Acc1, Assembler::AVX_256bit);
+  __ vmovdqa(Address(rsp, 0), Acc1); //Assembler::AVX_256bit
 }
 
 address StubGenerator::generate_intpoly_montgomeryMult_P256() {
@@ -242,13 +564,58 @@ address StubGenerator::generate_intpoly_montgomeryMult_P256() {
   address start = __ pc();
   __ enter();
 
-  // Register Map
-  const Register aLimbs  = c_rarg0; // rdi | rcx
-  const Register bLimbs  = c_rarg1; // rsi | rdx
-  const Register rLimbs  = c_rarg2; // rdx | r8
-  const Register tmp     = r9;
+  if (EnableX86ECoreOpts && UseAVX > 1) {
+    __ push(r12);
+    __ push(r13);
+    __ push(r14);
+    #ifdef _WIN64
+    __ push(rsi);
+    __ push(rdi);
+    #endif
+    __ push(rbp);
+    __ movq(rbp, rsp);
+  __ andq(rsp, -32);
+  __ subptr(rsp, 32);
 
-  montgomeryMultiply(aLimbs, bLimbs, rLimbs, tmp, _masm);
+    // Register Map
+    const Register aLimbs  = c_rarg0; // c_rarg0: rdi | rcx
+    const Register bLimbs  = rsi;     // c_rarg1: rsi | rdx
+    const Register rLimbs  = r8;      // c_rarg2: rdx | r8
+    const Register tmp1    = r9;
+    const Register tmp2    = r10;
+    const Register tmp3    = r11;
+    const Register tmp4    = r12;
+    const Register tmp5    = r13;
+    const Register tmp6    = r14;
+    #ifdef _WIN64
+    const Register tmp7    = rdi;
+    __ movq(bLimbs, c_rarg1); // free-up rdx
+    #else
+    const Register tmp7    = rcx;
+    __ movq(rLimbs, c_rarg2); // free-up rdx
+    #endif
+
+    montgomeryMultiplyAVX2(aLimbs, bLimbs, rLimbs, rax, rdx,
+                           tmp1, tmp2, tmp3, tmp4, tmp5, tmp6, tmp7, _masm);
+
+    __ movq(rsp, rbp);
+    __ pop(rbp);
+    #ifdef _WIN64
+    __ pop(rdi);
+    __ pop(rsi);
+    #endif
+    __ pop(r14);
+    __ pop(r13);
+    __ pop(r12);
+  } else {
+    // Register Map
+    const Register aLimbs  = c_rarg0; // rdi | rcx
+    const Register bLimbs  = c_rarg1; // rsi | rdx
+    const Register rLimbs  = c_rarg2; // rdx | r8
+    const Register tmp     = r9;
+
+    montgomeryMultiply(aLimbs, bLimbs, rLimbs, tmp, _masm);
+  }
 
   __ leave();
   __ ret(0);
@@ -259,17 +626,34 @@ address StubGenerator::generate_intpoly_montgomeryMult_P256() {
 // Must be:
 //  - constant time (i.e. no branches)
 //  - no-side channel (i.e. all memory must always be accessed, and in same order)
-void assign_avx(XMMRegister A, Address aAddr, XMMRegister B, Address bAddr, KRegister select, int vector_len, MacroAssembler* _masm) {
-  __ evmovdquq(A, aAddr, vector_len);
-  __ evmovdquq(B, bAddr, vector_len);
-  __ evmovdquq(A, select, B, true, vector_len);
-  __ evmovdquq(aAddr, A, vector_len);
-}
+void assign_avx(Register aBase, Register bBase, int offset, XMMRegister select, XMMRegister tmp, XMMRegister aTmp, int vector_len, MacroAssembler* _masm) {
+  if (vector_len == Assembler::AVX_512bit && UseAVX < 3) {
+    assign_avx(aBase, bBase, offset,      select, tmp, aTmp, Assembler::AVX_256bit, _masm);
+    assign_avx(aBase, bBase, offset + 32, select, tmp, aTmp, Assembler::AVX_256bit, _masm);
+    return;
+  }
+
+  Address aAddr = Address(aBase, offset);
+  Address bAddr = Address(bBase, offset);
 
-void assign_scalar(Address aAddr, Address bAddr, Register select, Register tmp, MacroAssembler* _masm) {
   // Original java:
   // long dummyLimbs = maskValue & (a[i] ^ b[i]);
   // a[i] = dummyLimbs ^ a[i];
+  __ vmovdqu(tmp, aAddr, vector_len);
+  __ vmovdqu(aTmp, tmp, vector_len);
+  __ vpxor(tmp, tmp, bAddr, vector_len);
+  __ vpand(tmp, tmp, select, vector_len);
+  __ vpxor(tmp, tmp, aTmp, vector_len);
+  __ vmovdqu(aAddr, tmp, vector_len);
+}
+
+void assign_scalar(Register aBase, Register bBase, int offset, Register select, Register tmp, MacroAssembler* _masm) {
+  // Original java:
+  // long dummyLimbs = maskValue & (a[i] ^ b[i]);
+  // a[i] = dummyLimbs ^ a[i];
+
+  Address aAddr = Address(aBase, offset);
+  Address bAddr = Address(bBase, offset);
 
   __ movq(tmp, aAddr);
   __ xorq(tmp, bAddr);
@@ -308,13 +692,18 @@ address StubGenerator::generate_intpoly_assign() {
   const Register length  = c_rarg3;
   XMMRegister A = xmm0;
   XMMRegister B = xmm1;
+  XMMRegister select = xmm2;
 
   Register tmp = r9;
-  KRegister select = k1;
   Label L_Length5, L_Length10, L_Length14, L_Length16, L_Length19, L_DefaultLoop, L_Done;
 
   __ negq(set);
-  __ kmovql(select, set);
+  if (UseAVX > 2) {
+    __ evpbroadcastq(select, set, Assembler::AVX_512bit);
+  } else {
+    __ movq(select, set);
+    __ vpbroadcastq(select, select, Assembler::AVX_256bit);
+  }
 
   // NOTE! Crypto code cannot branch on user input. However; allowed to branch on number of limbs;
   // Number of limbs is a constant in each IntegerPolynomial (i.e. this side-channel branch leaks
@@ -334,7 +723,7 @@ address StubGenerator::generate_intpoly_assign() {
   __ cmpl(length, 0);
   __ jcc(Assembler::lessEqual, L_Done);
   __ bind(L_DefaultLoop);
-  assign_scalar(Address(aLimbs, 0), Address(bLimbs, 0), set, tmp, _masm);
+  assign_scalar(aLimbs, bLimbs, 0, set, tmp, _masm);
   __ subl(length, 1);
   __ lea(aLimbs, Address(aLimbs,8));
   __ lea(bLimbs, Address(bLimbs,8));
@@ -343,31 +732,31 @@ address StubGenerator::generate_intpoly_assign() {
   __ jmp(L_Done);
 
   __ bind(L_Length5); // 1 + 4
-  assign_scalar(Address(aLimbs, 0), Address(bLimbs, 0), set, tmp, _masm);
-  assign_avx(A, Address(aLimbs, 8), B, Address(bLimbs, 8), select, Assembler::AVX_256bit, _masm);
+  assign_scalar(aLimbs, bLimbs, 0, set, tmp, _masm);
+  assign_avx   (aLimbs, bLimbs, 8, select, A, B, Assembler::AVX_256bit, _masm);
   __ jmp(L_Done);
 
   __ bind(L_Length10); // 2 + 8
-  assign_avx(A, Address(aLimbs, 0),  B, Address(bLimbs, 0),  select, Assembler::AVX_128bit, _masm);
-  assign_avx(A, Address(aLimbs, 16), B, Address(bLimbs, 16), select, Assembler::AVX_512bit, _masm);
+  assign_avx(aLimbs, bLimbs,  0, select, A, B, Assembler::AVX_128bit, _masm);
+  assign_avx(aLimbs, bLimbs, 16, select, A, B, Assembler::AVX_512bit, _masm);
   __ jmp(L_Done);
 
   __ bind(L_Length14); // 2 + 4 + 8
-  assign_avx(A, Address(aLimbs, 0),  B, Address(bLimbs, 0),  select, Assembler::AVX_128bit, _masm);
-  assign_avx(A, Address(aLimbs, 16), B, Address(bLimbs, 16), select, Assembler::AVX_256bit, _masm);
-  assign_avx(A, Address(aLimbs, 48), B, Address(bLimbs, 48), select, Assembler::AVX_512bit, _masm);
+  assign_avx(aLimbs, bLimbs,   0, select, A, B, Assembler::AVX_128bit, _masm);
+  assign_avx(aLimbs, bLimbs,  16, select, A, B, Assembler::AVX_256bit, _masm);
+  assign_avx(aLimbs, bLimbs,  48, select, A, B, Assembler::AVX_512bit, _masm);
   __ jmp(L_Done);
 
   __ bind(L_Length16); // 8 + 8
-  assign_avx(A, Address(aLimbs, 0),  B, Address(bLimbs, 0),  select, Assembler::AVX_512bit, _masm);
-  assign_avx(A, Address(aLimbs, 64), B, Address(bLimbs, 64), select, Assembler::AVX_512bit, _masm);
+  assign_avx(aLimbs, bLimbs,   0, select, A, B, Assembler::AVX_512bit, _masm);
+  assign_avx(aLimbs, bLimbs,  64, select, A, B, Assembler::AVX_512bit, _masm);
   __ jmp(L_Done);
 
   __ bind(L_Length19); // 1 + 2 + 8 + 8
-  assign_scalar(Address(aLimbs, 0), Address(bLimbs, 0), set, tmp, _masm);
-  assign_avx(A, Address(aLimbs, 8),  B, Address(bLimbs, 8),  select, Assembler::AVX_128bit, _masm);
-  assign_avx(A, Address(aLimbs, 24), B, Address(bLimbs, 24), select, Assembler::AVX_512bit, _masm);
-  assign_avx(A, Address(aLimbs, 88), B, Address(bLimbs, 88), select, Assembler::AVX_512bit, _masm);
+  assign_scalar(aLimbs, bLimbs,  0, set, tmp, _masm);
+  assign_avx   (aLimbs, bLimbs,  8, select, A, B, Assembler::AVX_128bit, _masm);
+  assign_avx   (aLimbs, bLimbs, 24, select, A, B, Assembler::AVX_512bit, _masm);
+  assign_avx   (aLimbs, bLimbs, 88, select, A, B, Assembler::AVX_512bit, _masm);
 
   __ bind(L_Done);
   __ leave();
diff --git a/src/hotspot/cpu/x86/vm_version_x86.cpp b/src/hotspot/cpu/x86/vm_version_x86.cpp
index 68fc4380a59..4b9c1c3416a 100644
--- a/src/hotspot/cpu/x86/vm_version_x86.cpp
+++ b/src/hotspot/cpu/x86/vm_version_x86.cpp
@@ -1406,7 +1406,7 @@ void VM_Version::get_processor_features() {
   }
 
 #ifdef _LP64
-  if (supports_avx512ifma() && supports_avx512vlbw()) {
+  if ((supports_avx512ifma() && supports_avx512vlbw()) || supports_avxifma()) {
     if (FLAG_IS_DEFAULT(UseIntPolyIntrinsics)) {
       FLAG_SET_DEFAULT(UseIntPolyIntrinsics, true);
     }
diff --git a/src/hotspot/share/classfile/vmIntrinsics.hpp b/src/hotspot/share/classfile/vmIntrinsics.hpp
index a5846ee3a19..93b67301b4b 100644
--- a/src/hotspot/share/classfile/vmIntrinsics.hpp
+++ b/src/hotspot/share/classfile/vmIntrinsics.hpp
@@ -532,7 +532,7 @@ class methodHandle;
   /* support for sun.security.util.math.intpoly.MontgomeryIntegerPolynomialP256 */                                      \
   do_class(sun_security_util_math_intpoly_MontgomeryIntegerPolynomialP256, "sun/security/util/math/intpoly/MontgomeryIntegerPolynomialP256")  \
   do_intrinsic(_intpoly_montgomeryMult_P256, sun_security_util_math_intpoly_MontgomeryIntegerPolynomialP256, intPolyMult_name, intPolyMult_signature, F_R) \
-  do_name(intPolyMult_name, "multImpl")                                                                                     \
+  do_name(intPolyMult_name, "mult")                                                                                     \
   do_signature(intPolyMult_signature, "([J[J[J)V")                                                                      \
                                                                                                                         \
   do_class(sun_security_util_math_intpoly_IntegerPolynomial, "sun/security/util/math/intpoly/IntegerPolynomial")        \
diff --git a/src/java.base/share/classes/sun/security/util/math/intpoly/MontgomeryIntegerPolynomialP256.java b/src/java.base/share/classes/sun/security/util/math/intpoly/MontgomeryIntegerPolynomialP256.java
index e50890bd976..954713bea5f 100644
--- a/src/java.base/share/classes/sun/security/util/math/intpoly/MontgomeryIntegerPolynomialP256.java
+++ b/src/java.base/share/classes/sun/security/util/math/intpoly/MontgomeryIntegerPolynomialP256.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2024, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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,14 +159,8 @@ public final class MontgomeryIntegerPolynomialP256 extends IntegerPolynomial
      * numAdds to reuse existing overflow logic.
      */
     @Override
-    protected void mult(long[] a, long[] b, long[] r) {
-        multImpl(a, b, r);
-        reducePositive(r);
-    }
-
-    @ForceInline
     @IntrinsicCandidate
-    private void multImpl(long[] a, long[] b, long[] r) {
+    protected void mult(long[] a, long[] b, long[] r) {
         long aa0 = a[0];
         long aa1 = a[1];
         long aa2 = a[2];
@@ -398,17 +392,43 @@ public final class MontgomeryIntegerPolynomialP256 extends IntegerPolynomial
         dd4 += Math.unsignedMultiplyHigh(n, modulus[4]) << shift1 | (n4 >>> shift2);
         d4 += n4 & LIMB_MASK;
 
+        // Final carry propagate
         c5 += d1 + dd0 + (d0 >>> BITS_PER_LIMB);
-        c6 += d2 + dd1;
-        c7 += d3 + dd2;
-        c8 += d4 + dd3;
-        c9 = dd4;
+        c6 += d2 + dd1 + (c5 >>> BITS_PER_LIMB);
+        c7 += d3 + dd2 + (c6 >>> BITS_PER_LIMB);
+        c8 += d4 + dd3 + (c7 >>> BITS_PER_LIMB);
+        c9 = dd4 + (c8 >>> BITS_PER_LIMB);
 
-        r[0] = c5;
-        r[1] = c6;
-        r[2] = c7;
-        r[3] = c8;
-        r[4] = c9;
+        c5 &= LIMB_MASK;
+        c6 &= LIMB_MASK;
+        c7 &= LIMB_MASK;
+        c8 &= LIMB_MASK;
+
+        // At this point, the result {c5, c6, c7, c8, c9} could overflow by
+        // one modulus. Subtract one modulus (with carry propagation), into
+        // {c0, c1, c2, c3, c4}. Note that in this calculation, limbs are
+        // signed
+        c0 = c5 - modulus[0];
+        c1 = c6 - modulus[1] + (c0 >> BITS_PER_LIMB);
+        c0 &= LIMB_MASK;
+        c2 = c7 - modulus[2] + (c1 >> BITS_PER_LIMB);
+        c1 &= LIMB_MASK;
+        c3 = c8 - modulus[3] + (c2 >> BITS_PER_LIMB);
+        c2 &= LIMB_MASK;
+        c4 = c9 - modulus[4] + (c3 >> BITS_PER_LIMB);
+        c3 &= LIMB_MASK;
+
+        // We now must select a result that is in range of [0,modulus). i.e.
+        // either {c0-4} or {c5-9}. Iff {c0-4} is negative, then {c5-9} contains
+        // the result. (After carry propagation) IF c4 is negative, {c0-4} is
+        // negative. Arithmetic shift by 64 bits generates a mask from c4 that
+        // can be used to select 'constant time' either {c0-4} or {c5-9}.
+        long mask = c4 >> 63;
+        r[0] = ((c5 & mask) | (c0 & ~mask));
+        r[1] = ((c6 & mask) | (c1 & ~mask));
+        r[2] = ((c7 & mask) | (c2 & ~mask));
+        r[3] = ((c8 & mask) | (c3 & ~mask));
+        r[4] = ((c9 & mask) | (c4 & ~mask));
     }
 
     @Override
diff --git a/test/jdk/com/sun/security/util/math/intpoly/MontgomeryPolynomialFuzzTest.java b/test/jdk/com/sun/security/util/math/intpoly/MontgomeryPolynomialFuzzTest.java
index 8c76a312f53..f2e91d71c21 100644
--- a/test/jdk/com/sun/security/util/math/intpoly/MontgomeryPolynomialFuzzTest.java
+++ b/test/jdk/com/sun/security/util/math/intpoly/MontgomeryPolynomialFuzzTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024, Intel Corporation. All rights reserved.
+ * Copyright (c) 2024, 2025, Intel Corporation. All rights reserved.
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,9 +23,8 @@
  */
 
 import java.util.Random;
-import sun.security.util.math.IntegerMontgomeryFieldModuloP;
-import sun.security.util.math.ImmutableIntegerModuloP;
 import java.math.BigInteger;
+import sun.security.util.math.*;
 import sun.security.util.math.intpoly.*;
 
 /*
@@ -35,7 +34,7 @@ import sun.security.util.math.intpoly.*;
  *          java.base/sun.security.util.math.intpoly
  * @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:-UseIntPolyIntrinsics
  *      MontgomeryPolynomialFuzzTest
- * @summary Unit test MontgomeryPolynomialFuzzTest.
+ * @summary Unit test MontgomeryPolynomialFuzzTest without intrinsic, plain java
  */
 
 /*
@@ -45,10 +44,11 @@ import sun.security.util.math.intpoly.*;
  *          java.base/sun.security.util.math.intpoly
  * @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+UseIntPolyIntrinsics
  *      MontgomeryPolynomialFuzzTest
- * @summary Unit test MontgomeryPolynomialFuzzTest.
+ * @summary Unit test MontgomeryPolynomialFuzzTest with intrinsic enabled
  */
 
-// This test case is NOT entirely deterministic, it uses a random seed for pseudo-random number generator
+// This test case is NOT entirely deterministic, it uses a random seed for
+// pseudo-random number generator
 // If a failure occurs, hardcode the seed to make the test case deterministic
 public class MontgomeryPolynomialFuzzTest {
     public static void main(String[] args) throws Exception {
@@ -60,15 +60,38 @@ public class MontgomeryPolynomialFuzzTest {
         System.out.println("Fuzz Success");
     }
 
-    private static void check(BigInteger reference,
+    private static void checkOverflow(String opMsg,
             ImmutableIntegerModuloP testValue, long seed) {
-        if (!reference.equals(testValue.asBigInteger())) {
-            throw new RuntimeException("SEED: " + seed);
+        long limbs[] = testValue.getLimbs();
+        BigInteger mod = MontgomeryIntegerPolynomialP256.ONE.MODULUS;
+        BigInteger ref = BigInteger.ZERO;
+        for (int i = 0; i<limbs.length; i++) {
+            ref.add(BigInteger.valueOf(limbs[i]).shiftLeft(i*52));
+        }
+        if (ref.compareTo(mod)!=-1) {
+            String msg = "Error while " + opMsg + System.lineSeparator()
+                + ref.toString(16) + " != " + mod.toString(16) + System.lineSeparator()
+                + "To reproduce, set SEED to [" + seed + "L]: ";
+            throw new RuntimeException(msg);
+        }
+    }
+
+    private static void check(String opMsg, BigInteger reference,
+            ImmutableIntegerModuloP testValue, long seed) {
+        BigInteger test = testValue.asBigInteger();
+        if (!reference.equals(test)) {
+            String msg = "Error while " + opMsg + System.lineSeparator()
+                + reference.toString(16) + " != " + test.toString(16)
+                + System.lineSeparator()+ "To reproduce, set SEED to ["
+                + seed + "L]: ";
+            throw new RuntimeException(msg);
         }
     }
 
     public static void run() throws Exception {
         Random rnd = new Random();
+        // To reproduce an error, fix the value of the seed to the value from
+        // the failure
         long seed = rnd.nextLong();
         rnd.setSeed(seed);
 
@@ -77,22 +100,75 @@ public class MontgomeryPolynomialFuzzTest {
         BigInteger r = BigInteger.ONE.shiftLeft(260).mod(P);
         BigInteger rInv = r.modInverse(P);
         BigInteger aRef = (new BigInteger(P.bitLength(), rnd)).mod(P);
+        BigInteger bRef = (new BigInteger(P.bitLength(), rnd)).mod(P);
+        SmallValue two = montField.getSmallValue(2);
+        SmallValue three = montField.getSmallValue(3);
+        SmallValue four = montField.getSmallValue(4);
 
         // Test conversion to montgomery domain
         ImmutableIntegerModuloP a = montField.getElement(aRef);
+        String msg = "converting "+aRef.toString(16) + " to montgomery domain";
         aRef = aRef.multiply(r).mod(P);
-        check(aRef, a, seed);
+        check(msg, aRef, a, seed);
+        checkOverflow(msg, a, seed);
+
+        ImmutableIntegerModuloP b = montField.getElement(bRef);
+        msg = "converting "+aRef.toString(16) + " to montgomery domain";
+        bRef = bRef.multiply(r).mod(P);
+        check(msg, bRef, b, seed);
+        checkOverflow(msg, b, seed);
 
         if (rnd.nextBoolean()) {
+            msg = "squaring "+aRef.toString(16);
             aRef = aRef.multiply(aRef).multiply(rInv).mod(P);
             a = a.multiply(a);
-            check(aRef, a, seed);
+            check(msg, aRef, a, seed);
+            checkOverflow(msg, a, seed);
         }
 
         if (rnd.nextBoolean()) {
+            msg = "doubling "+aRef.toString(16);
             aRef = aRef.add(aRef).mod(P);
             a = a.add(a);
-            check(aRef, a, seed);
+            check(msg, aRef, a, seed);
+        }
+
+        if (rnd.nextBoolean()) {
+            msg = "subtracting "+bRef.toString(16)+" from "+aRef.toString(16);
+            aRef = aRef.subtract(bRef).mod(P);
+            a = a.mutable().setDifference(b).fixed();
+            check(msg, aRef, a, seed);
+        }
+
+        if (rnd.nextBoolean()) {
+            msg = "multiplying "+bRef.toString(16)+" with "+aRef.toString(16);
+            aRef = aRef.multiply(bRef).multiply(rInv).mod(P);
+            a = a.multiply(b);
+            check(msg, aRef, a, seed);
+            checkOverflow(msg, a, seed);
+        }
+
+        if (rnd.nextBoolean()) {
+            msg = "multiplying "+aRef.toString(16)+" with constant 2";
+            aRef = aRef.multiply(BigInteger.valueOf(2)).mod(P);
+            a = a.mutable().setProduct(two).fixed();
+            check(msg, aRef, a, seed);
+        }
+
+        if (rnd.nextBoolean()) {
+            msg = "multiplying "+aRef.toString(16)+" with constant 3";
+            aRef = aRef.multiply(BigInteger.valueOf(3)).mod(P);
+            a = a.mutable().setProduct(three).fixed();
+            check(msg, aRef, a, seed);
+            checkOverflow(msg, a, seed);
+        }
+
+        if (rnd.nextBoolean()) {
+            msg = "multiplying "+aRef.toString(16)+" with constant 4";
+            aRef = aRef.multiply(BigInteger.valueOf(4)).mod(P);
+            a = a.mutable().setProduct(four).fixed();
+            check(msg, aRef, a, seed);
+            checkOverflow(msg, a, seed);
         }
     }
 }

From d8090337ee8ea763bca4e8e3baaf8ee4dd3d6214 Mon Sep 17 00:00:00 2001
From: Kevin Driver <kdriver@openjdk.org>
Date: Fri, 28 Mar 2025 15:27:26 +0000
Subject: [PATCH 544/587] 8341775: Duplicate manifest files are removed by
 jarsigner after signing

Reviewed-by: weijun, hchao
---
 .../sun/security/tools/jarsigner/Main.java    | 15 +++
 .../jarsigner/resources/jarsigner.properties  |  1 +
 src/jdk.jartool/share/man/jarsigner.md        |  6 +-
 .../tools/jarsigner/MultiManifest.java        | 97 +++++++++++++++++++
 4 files changed, 118 insertions(+), 1 deletion(-)
 create mode 100644 test/jdk/sun/security/tools/jarsigner/MultiManifest.java

diff --git a/src/jdk.jartool/share/classes/sun/security/tools/jarsigner/Main.java b/src/jdk.jartool/share/classes/sun/security/tools/jarsigner/Main.java
index ab5d8fc6842..763bafa8759 100644
--- a/src/jdk.jartool/share/classes/sun/security/tools/jarsigner/Main.java
+++ b/src/jdk.jartool/share/classes/sun/security/tools/jarsigner/Main.java
@@ -237,6 +237,7 @@ public class Main {
     private boolean badNetscapeCertType = false;
     private boolean signerSelfSigned = false;
     private boolean allAliasesFound = true;
+    private boolean hasMultipleManifests = false;
 
     private Throwable chainNotValidatedReason = null;
     private Throwable tsaChainNotValidatedReason = null;
@@ -1252,6 +1253,11 @@ public class Main {
                         rb.getString("The.full.keyAlgName.signing.key.is.considered.a.security.risk.and.is.disabled."),
                         fullDisplayKeyName(privateKey)));
             }
+
+            if (hasMultipleManifests) {
+                warnings.add(String.format(rb.getString("multiple.manifest.warning.")));
+            }
+
         } else {
             if ((legacyAlg & 1) != 0) {
                 warnings.add(String.format(
@@ -1965,6 +1971,15 @@ public class Main {
         Throwable failedCause = null;
         String failedMessage = null;
 
+        try (JarFile asJar = new JarFile(jarFile)) {
+            if (JUZFA.getManifestNum(asJar) > 1) {
+                hasMultipleManifests = true;
+            }
+        } catch (IOException ioe) {
+            // intentionally "eat" this, since we don't want to fail, if we
+            // cannot perform the multiple manifest check to output the warning
+        }
+
         try {
             Event.setReportListener(Event.ReporterCategory.ZIPFILEATTRS,
                     (t, o) -> externalFileAttributesDetected = true);
diff --git a/src/jdk.jartool/share/classes/sun/security/tools/jarsigner/resources/jarsigner.properties b/src/jdk.jartool/share/classes/sun/security/tools/jarsigner/resources/jarsigner.properties
index 6721dbc837b..0b28eec671d 100644
--- a/src/jdk.jartool/share/classes/sun/security/tools/jarsigner/resources/jarsigner.properties
+++ b/src/jdk.jartool/share/classes/sun/security/tools/jarsigner/resources/jarsigner.properties
@@ -96,6 +96,7 @@ jar.is.unsigned=jar is unsigned.
 jar.treated.unsigned=WARNING: Signature is either not parsable or not verifiable, and the jar will be treated as unsigned. For more information, re-run jarsigner with debug enabled (-J-Djava.security.debug=jar).
 jar.treated.unsigned.see.weak=The jar will be treated as unsigned, because it is signed with a weak algorithm that is now disabled.\n\nRe-run jarsigner with the -verbose option for more details.
 jar.treated.unsigned.see.weak.verbose=WARNING: The jar will be treated as unsigned, because it is signed with a weak algorithm that is now disabled by the security property:
+multiple.manifest.warning.=Duplicate manifest entries were detected in the jar file. JarSigner operated on only one, and the others have been discarded.
 jar.signed.=jar signed.
 jar.signed.with.signer.errors.=jar signed, with signer errors.
 jar.verified.=jar verified.
diff --git a/src/jdk.jartool/share/man/jarsigner.md b/src/jdk.jartool/share/man/jarsigner.md
index 9542c0fda60..fccdf0ecdc3 100644
--- a/src/jdk.jartool/share/man/jarsigner.md
+++ b/src/jdk.jartool/share/man/jarsigner.md
@@ -1,5 +1,5 @@
 ---
-# Copyright (c) 1998, 2024, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1998, 2025, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -922,6 +922,10 @@ hasExpiringCert
 hasExpiringTsaCert
 :   The timestamp will expire within one year on `YYYY-MM-DD`.
 
+hasMultipleManifests
+:   This JAR contained multiple manifest files. During signing, one of the files
+was selected, and the others were discarded.
+
 hasNonexistentEntries
 :   This JAR contains signed entries for files that do not exist.
 
diff --git a/test/jdk/sun/security/tools/jarsigner/MultiManifest.java b/test/jdk/sun/security/tools/jarsigner/MultiManifest.java
new file mode 100644
index 00000000000..8ea88697625
--- /dev/null
+++ b/test/jdk/sun/security/tools/jarsigner/MultiManifest.java
@@ -0,0 +1,97 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact 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 8341775
+ * @summary Print warning that duplicate manifest files are removed by jarsigner
+ *  after signing whether or not -verbose is passed
+ * @library /test/lib
+ */
+
+import jdk.test.lib.SecurityTools;
+
+import java.io.ByteArrayOutputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.jar.JarFile;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipOutputStream;
+
+public class MultiManifest {
+
+    private static final String META_INF = "META-INF/";
+
+    public static void main(String[] args) throws Exception {
+
+        writeMultiManifestJar();
+
+        SecurityTools.keytool("-keystore ks -storepass changeit "
+                + "-keypass changeit -alias a -dname CN=a -keyalg rsa "
+                + "-genkey -validity 300");
+
+        SecurityTools.jarsigner("-verbose -keystore ks -storepass changeit "
+                                + "MultiManifest.jar -signedjar MultiManifest.signed.jar a")
+                .shouldHaveExitValue(0)
+                .shouldContain("Duplicate manifest entries were detected")
+                .shouldContain("discarded");
+
+        SecurityTools.jarsigner("-keystore ks -storepass changeit "
+                                + "MultiManifest.jar -signedjar MultiManifest.signed.jar a")
+                 .shouldHaveExitValue(0)
+                 .shouldContain("Duplicate manifest entries were detected")
+                 .shouldContain("discarded");
+
+    }
+
+    public static void writeMultiManifestJar() throws IOException {
+        int locPosA, locPosB, cenPos;
+        var out = new ByteArrayOutputStream(1024);
+        try (var zos = new ZipOutputStream(out)) {
+            zos.putNextEntry(new ZipEntry(JarFile.MANIFEST_NAME));
+            zos.closeEntry();
+            locPosA = out.size();
+            zos.putNextEntry(new ZipEntry(META_INF + "AANIFEST.MF"));
+            zos.closeEntry();
+            locPosB = out.size();
+            zos.putNextEntry(new ZipEntry(META_INF + "BANIFEST.MF"));
+            zos.flush();
+            cenPos = out.size();
+        }
+        var template = out.toByteArray();
+        // ISO_8859_1 to keep the 8-bit value
+        var s = new String(template, StandardCharsets.ISO_8859_1);
+        // change META-INF/AANIFEST.MF to META-INF/MANIFEST.MF
+        var loc = s.indexOf("AANIFEST.MF", locPosA);
+        var cen = s.indexOf("AANIFEST.MF", cenPos);
+        template[loc] = template[cen] = (byte) 'M';
+        // change META-INF/BANIFEST.MF to META-INF/MANIFEST.MF
+        loc = s.indexOf("BANIFEST.MF", locPosB);
+        cen = s.indexOf("BANIFEST.MF", cenPos);
+        template[loc] = template[cen] = (byte) 'M';
+        Files.write(Path.of("MultiManifest.jar"), template);
+    }
+}

From da3bb06797f9550d204b2623481ef757ae941bbd Mon Sep 17 00:00:00 2001
From: Prasanta Sadhukhan <psadhukhan@openjdk.org>
Date: Fri, 28 Mar 2025 15:50:10 +0000
Subject: [PATCH 545/587] 8352685: Opensource JInternalFrame tests - series2

Reviewed-by: azvegint
---
 test/jdk/ProblemList.txt                      |   1 +
 .../swing/JInternalFrame/bug4130806.java      |  72 ++++++++++
 .../swing/JInternalFrame/bug4134077.java      | 132 ++++++++++++++++++
 .../swing/JInternalFrame/bug4193070.java      |  87 ++++++++++++
 .../swing/JInternalFrame/bug4225701.java      |  87 ++++++++++++
 5 files changed, 379 insertions(+)
 create mode 100644 test/jdk/javax/swing/JInternalFrame/bug4130806.java
 create mode 100644 test/jdk/javax/swing/JInternalFrame/bug4134077.java
 create mode 100644 test/jdk/javax/swing/JInternalFrame/bug4193070.java
 create mode 100644 test/jdk/javax/swing/JInternalFrame/bug4225701.java

diff --git a/test/jdk/ProblemList.txt b/test/jdk/ProblemList.txt
index db2fbdb0411..e3e1bcb8be1 100644
--- a/test/jdk/ProblemList.txt
+++ b/test/jdk/ProblemList.txt
@@ -780,6 +780,7 @@ javax/swing/JColorChooser/8065098/bug8065098.java 8065647 macosx-all
 javax/swing/JTabbedPane/4666224/bug4666224.java 8144124  macosx-all
 javax/swing/JTabbedPane/TestJTabbedPaneOpaqueColor.java 8345090 windows-all,linux-all
 javax/swing/SwingUtilities/TestTextPosInPrint.java 8227025 windows-all
+javax/swing/JInternalFrame/bug4134077.java 8184985 windows-all
 
 java/awt/event/MouseEvent/SpuriousExitEnter/SpuriousExitEnter_1.java 7131438,8022539 generic-all
 java/awt/event/MouseEvent/SpuriousExitEnter/SpuriousExitEnter_2.java 7131438,8022539 generic-all
diff --git a/test/jdk/javax/swing/JInternalFrame/bug4130806.java b/test/jdk/javax/swing/JInternalFrame/bug4130806.java
new file mode 100644
index 00000000000..10814740b2e
--- /dev/null
+++ b/test/jdk/javax/swing/JInternalFrame/bug4130806.java
@@ -0,0 +1,72 @@
+/*
+ * Copyright (c) 1999, 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact 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 4130806
+ * @summary JInternalFrame's setIcon(true) works correctly
+ * @library /java/awt/regtesthelpers
+ * @build PassFailJFrame
+ * @run main/manual bug4130806
+ */
+
+import javax.swing.JDesktopPane;
+import javax.swing.JFrame;
+import javax.swing.JInternalFrame;
+import java.beans.PropertyVetoException;
+
+public class bug4130806 {
+
+    private static final String INSTRUCTIONS = """
+        If an icon is visible for the iconified internalframe, the test passes.
+        Otherwise, the test fails.""";
+
+    public static void main(String[] args) throws Exception {
+        PassFailJFrame.builder()
+                .title("bug4130806 Instructions")
+                .instructions(INSTRUCTIONS)
+                .columns(35)
+                .testUI(bug4130806::createTestUI)
+                .build()
+                .awaitAndCheck();
+    }
+
+    private static JFrame createTestUI() {
+        JFrame frame = new JFrame("bug4130806");
+        JDesktopPane mDesktop = new JDesktopPane();
+        frame.add(mDesktop);
+        frame.pack();
+        JInternalFrame jif = new JInternalFrame("My Frame");
+        jif.setIconifiable(true);
+        mDesktop.add(jif);
+        jif.setBounds(50,50,100,100);
+        try {
+            jif.setIcon(true);
+        } catch (PropertyVetoException e) {
+            throw new RuntimeException("PropertyVetoException received");
+        }
+        jif.setVisible(true);
+        frame.setSize(200, 200);
+        return frame;
+    }
+}
diff --git a/test/jdk/javax/swing/JInternalFrame/bug4134077.java b/test/jdk/javax/swing/JInternalFrame/bug4134077.java
new file mode 100644
index 00000000000..db609d5a425
--- /dev/null
+++ b/test/jdk/javax/swing/JInternalFrame/bug4134077.java
@@ -0,0 +1,132 @@
+/*
+ * Copyright (c) 2000, 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact 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 4134077
+ * @requires (os.family == "windows")
+ * @summary Metal,Window:If JInternalFrame's title text is long last must be ellipsis
+ * @library /java/awt/regtesthelpers
+ * @build PassFailJFrame
+ * @run main/manual bug4134077
+ */
+
+import java.awt.BorderLayout;
+import java.awt.ComponentOrientation;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import javax.swing.JButton;
+import javax.swing.JDesktopPane;
+import javax.swing.JFrame;
+import javax.swing.JInternalFrame;
+import javax.swing.JPanel;
+import javax.swing.SwingUtilities;
+import javax.swing.UIManager;
+import javax.swing.UnsupportedLookAndFeelException;
+
+public class bug4134077 {
+
+    private static JFrame frame;
+
+    private static final String INSTRUCTIONS = """
+        Try to resize internal frame with diferrent combinations of
+        LookAndFeels and title pane's buttons and orientation.
+
+        The internal frame's title should clip if its too long to
+        be entierly visible (ends by "...")
+        and window can never be
+        smaller than the width of the first two letters of the title
+        plus "...".""";
+
+    public static void main(String[] args) throws Exception {
+        PassFailJFrame.builder()
+                .title("bug4134077 Instructions")
+                .instructions(INSTRUCTIONS)
+                .columns(35)
+                .testUI(bug4134077::createTestUI)
+                .build()
+                .awaitAndCheck();
+    }
+
+    private static void setLF(ActionEvent e) {
+        try {
+            UIManager.setLookAndFeel(((JButton)e.getSource()).getActionCommand());
+            SwingUtilities.updateComponentTreeUI(frame);
+        } catch (ClassNotFoundException | InstantiationException
+                 | UnsupportedLookAndFeelException
+                 | IllegalAccessException ex) {
+             throw new RuntimeException(ex);
+        }
+    }
+
+    private static JFrame createTestUI() {
+        frame = new JFrame("bug4134077");
+        JDesktopPane jdp = new JDesktopPane();
+        frame.add(jdp);
+
+        final JInternalFrame jif =
+                new JInternalFrame("Very Long Title For Internal Frame", true);
+        jdp.add(jif);
+        jif.setSize(150,150);
+        jif.setLocation(150, 50);
+        jif.setComponentOrientation(ComponentOrientation.LEFT_TO_RIGHT);
+        jif.setVisible(true);
+
+        JPanel p = new JPanel();
+
+        JButton metal = new JButton("Metal");
+        metal.setActionCommand("javax.swing.plaf.metal.MetalLookAndFeel");
+        metal.addActionListener((ActionEvent e) -> setLF(e));
+        p.add(metal);
+
+        JButton windows = new JButton("Windows");
+        windows.setActionCommand("com.sun.java.swing.plaf.windows.WindowsLookAndFeel");
+        windows.addActionListener((ActionEvent e) -> setLF(e));
+        p.add(windows);
+
+        JButton orientation = new JButton("Change orientation");
+        orientation.addActionListener(e -> {
+            jif.setComponentOrientation(
+                jif.getComponentOrientation() == ComponentOrientation.LEFT_TO_RIGHT
+                    ? ComponentOrientation.RIGHT_TO_LEFT
+                    : ComponentOrientation.LEFT_TO_RIGHT);
+        });
+        p.add(orientation);
+
+        JButton clo = new JButton("Closable");
+        clo.addActionListener(e -> jif.setClosable(!jif.isClosable()));
+        p.add(clo);
+
+        JButton ico = new JButton("Iconifiable");
+        ico.addActionListener(e -> jif.setIconifiable(!jif.isIconifiable()));
+        p.add(ico);
+
+        JButton max = new JButton("Maximizable");
+        max.addActionListener(e -> jif.setMaximizable(!jif.isMaximizable()));
+        p.add(max);
+
+        frame.add(p, BorderLayout.SOUTH);
+        frame.setSize(700, 300);
+        return frame;
+    }
+}
diff --git a/test/jdk/javax/swing/JInternalFrame/bug4193070.java b/test/jdk/javax/swing/JInternalFrame/bug4193070.java
new file mode 100644
index 00000000000..320b2e6e563
--- /dev/null
+++ b/test/jdk/javax/swing/JInternalFrame/bug4193070.java
@@ -0,0 +1,87 @@
+/*
+ * Copyright (c) 2000, 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact 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 4193070
+ * @summary Tests correct mouse pointer shape
+ * @requires (os.family != "mac")
+ * @library /java/awt/regtesthelpers
+ * @build PassFailJFrame
+ * @run main/manual bug4193070
+ */
+
+import java.awt.Dimension;
+import javax.swing.JDesktopPane;
+import javax.swing.JFrame;
+import javax.swing.JInternalFrame;
+
+public class bug4193070 {
+
+    private static final String INSTRUCTIONS = """
+        Two internal frame will be shown. Select any internal frame;
+        Move mouse pointer inside the selected internal frame,
+            then to border of internal frame.
+        Mouse pointer should take the shape of resize cursor.
+        Now slowly move the mouse back inside the internal frame.
+        If mouse pointer shape does not change back to
+            normal shape of mouse pointer, then test failed.
+        Now try fast resizing an internal frame.
+        Check that mouse pointer always has resize shape,
+            even when it goes over other internal frame.
+        If during resizing mouse pointer shape changes,
+            then test failed. Otherwise test succeded.""";
+
+    public static void main(String[] args) throws Exception {
+        PassFailJFrame.builder()
+                .title("bug4193070 Instructions")
+                .instructions(INSTRUCTIONS)
+                .columns(35)
+                .testUI(bug4193070::createTestUI)
+                .build()
+                .awaitAndCheck();
+    }
+
+    private static JFrame createTestUI() {
+        JFrame f = new JFrame("bug4193070");
+        JDesktopPane dp = new JDesktopPane();
+
+        JInternalFrame intFrm1 = new JInternalFrame();
+        intFrm1.setResizable(true);
+        dp.add(intFrm1);
+
+        JInternalFrame intFrm2 = new JInternalFrame();
+        intFrm2.setResizable(true);
+        dp.add(intFrm2);
+
+        f.setContentPane(dp);
+        f.setSize(new Dimension(500, 275));
+
+        intFrm1.setBounds(25, 25, 200, 200);
+        intFrm1.show();
+
+        intFrm2.setBounds(275, 25, 200, 200);
+        intFrm2.show();
+        return f;
+    }
+}
diff --git a/test/jdk/javax/swing/JInternalFrame/bug4225701.java b/test/jdk/javax/swing/JInternalFrame/bug4225701.java
new file mode 100644
index 00000000000..808ebb503ba
--- /dev/null
+++ b/test/jdk/javax/swing/JInternalFrame/bug4225701.java
@@ -0,0 +1,87 @@
+/*
+ * Copyright (c) 2000, 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact 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 4225701
+ * @summary Verifies MetalInternalFrameUI.installKeyboardActions
+ *          doesn't install listener
+ * @library /java/awt/regtesthelpers
+ * @build PassFailJFrame
+ * @run main/manual bug4225701
+ */
+
+import javax.swing.JDesktopPane;
+import javax.swing.JFrame;
+import javax.swing.JInternalFrame;
+
+public class bug4225701 {
+
+    private static final String INSTRUCTIONS = """
+        Give a focus to the internal frame "Frame 4" and press Ctrl-F4.
+        The "Frame 4" should be closed. Give a focus to the internal
+        frame "Frame 1" and press Ctrl-F4.
+        If "Frame 4" and "Frame 1" is not closed, then press Fail else press Pass.""";
+
+    public static void main(String[] args) throws Exception {
+         PassFailJFrame.builder()
+                .title("bug4225701 Instructions")
+                .instructions(INSTRUCTIONS)
+                .columns(35)
+                .testUI(bug4225701::createTestUI)
+                .build()
+                .awaitAndCheck();
+    }
+
+    private static JFrame createTestUI() {
+
+        JFrame frame = new JFrame("bug4225701");
+        JInternalFrame jif1 = new JInternalFrame("Frame 1", true, true, true, true);
+        JInternalFrame jif2 = new JInternalFrame("Frame 2", false);
+        JInternalFrame jif3 = new JInternalFrame("Frame 3", false);
+        JInternalFrame jif4 = new JInternalFrame("Frame 4", true, true, true, true);
+        JDesktopPane jdp = new JDesktopPane();
+
+        frame.setContentPane(jdp);
+
+        jdp.add(jif1);
+        jif1.setBounds(0, 150, 150, 150);
+        jif1.setVisible(true);
+
+        jdp.add(jif2);
+        jif2.setBounds(100, 100, 150, 150);
+        jif2.setVisible(true);
+
+        jdp.add(jif3);
+        jif3.setBounds(200, 50, 150, 150);
+        jif3.setVisible(true);
+
+        jdp.add(jif4);
+        jif4.setBounds(300, 0, 150, 150);
+        jif4.setVisible(true);
+
+        frame.setSize(500, 500);
+        return frame;
+    }
+
+}

From c70ad6a053c7407b19060559d9f39b8b836a55a1 Mon Sep 17 00:00:00 2001
From: Naoto Sato <naoto@openjdk.org>
Date: Fri, 28 Mar 2025 16:26:43 +0000
Subject: [PATCH 546/587] 8352906: stdout/err.encoding on Windows set by
 incorrect Win32 call

Reviewed-by: bpb, alanb
---
 .../windows/native/libjava/java_props_md.c    | 35 ++++++++++++-------
 1 file changed, 22 insertions(+), 13 deletions(-)

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 03d0acdae1e..f99abdec106 100644
--- a/src/java.base/windows/native/libjava/java_props_md.c
+++ b/src/java.base/windows/native/libjava/java_props_md.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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 @@
 #endif
 
 typedef void (WINAPI *PGNSI)(LPSYSTEM_INFO);
-static boolean SetupI18nProps(LCID lcid, char** language, char** script, char** country,
+static BOOL SetupI18nProps(LCID lcid, char** language, char** script, char** country,
                char** variant, char** encoding);
 
 #define PROPSIZE 9      // eight-letter + null terminator
@@ -128,7 +128,7 @@ getEncodingInternal(LCID lcid)
     return ret;
 }
 
-static char* getConsoleEncoding()
+static char* getConsoleEncoding(BOOL output)
 {
     size_t buflen = 16;
     char* buf = malloc(buflen);
@@ -136,13 +136,22 @@ static char* getConsoleEncoding()
     if (buf == NULL) {
         return NULL;
     }
-    cp = GetConsoleCP();
-    if (cp >= 874 && cp <= 950)
+    if (output) {
+        cp = GetConsoleOutputCP();
+    } else {
+        cp = GetConsoleCP();
+    }
+    if (cp >= 874 && cp <= 950) {
         snprintf(buf, buflen, "ms%d", cp);
-    else if (cp == 65001)
+    } else if (cp == 65001) {
         snprintf(buf, buflen, "UTF-8");
-    else
+    } else if (cp == 0) {
+        // Failed to get the console code page
+        free(buf);
+        buf = NULL;
+    } else {
         snprintf(buf, buflen, "cp%d", cp);
+    }
     return buf;
 }
 
@@ -221,7 +230,7 @@ getHomeFromShell32()
     return u_path;
 }
 
-static boolean
+static BOOL
 haveMMX(void)
 {
     return IsProcessorFeaturePresent(PF_MMX_INSTRUCTIONS_AVAILABLE);
@@ -251,7 +260,7 @@ cpu_isalist(void)
     return NULL;
 }
 
-static boolean
+static BOOL
 SetupI18nProps(LCID lcid, char** language, char** script, char** country,
                char** variant, char** encoding) {
     /* script */
@@ -343,8 +352,8 @@ GetJavaProperties(JNIEnv* env)
     /* OS properties */
     {
         char buf[100];
-        boolean is_workstation;
-        boolean is_64bit;
+        BOOL is_workstation;
+        BOOL is_64bit;
         DWORD platformId;
         {
             OSVERSIONINFOEX ver;
@@ -677,7 +686,7 @@ GetJavaProperties(JNIEnv* env)
             hStdOutErr = GetStdHandle(STD_OUTPUT_HANDLE);
             if (hStdOutErr != INVALID_HANDLE_VALUE &&
                 GetFileType(hStdOutErr) == FILE_TYPE_CHAR) {
-                sprops.stdout_encoding = getConsoleEncoding();
+                sprops.stdout_encoding = getConsoleEncoding(TRUE);
             }
             hStdOutErr = GetStdHandle(STD_ERROR_HANDLE);
             if (hStdOutErr != INVALID_HANDLE_VALUE &&
@@ -685,7 +694,7 @@ GetJavaProperties(JNIEnv* env)
                 if (sprops.stdout_encoding != NULL)
                     sprops.stderr_encoding = sprops.stdout_encoding;
                 else
-                    sprops.stderr_encoding = getConsoleEncoding();
+                    sprops.stderr_encoding = getConsoleEncoding(TRUE);
             }
         }
     }

From 3d2c3cd40ebce901d09a2479c267342e04e6f79c Mon Sep 17 00:00:00 2001
From: Daniel Gredler <dgredler@openjdk.org>
Date: Fri, 28 Mar 2025 17:22:33 +0000
Subject: [PATCH 547/587] 8352970: Remove unnecessary Windows version check in
 Win32ShellFolderManager2

Reviewed-by: prr, serb
---
 .../awt/shell/Win32ShellFolderManager2.java   |  5 +-
 .../FileDialog/FileSystemViewFilesTest.java   | 57 +++++++++++++++++++
 2 files changed, 59 insertions(+), 3 deletions(-)
 create mode 100644 test/jdk/java/awt/FileDialog/FileSystemViewFilesTest.java

diff --git a/src/java.desktop/windows/classes/sun/awt/shell/Win32ShellFolderManager2.java b/src/java.desktop/windows/classes/sun/awt/shell/Win32ShellFolderManager2.java
index 53653f07f34..d8bb2146798 100644
--- a/src/java.desktop/windows/classes/sun/awt/shell/Win32ShellFolderManager2.java
+++ b/src/java.desktop/windows/classes/sun/awt/shell/Win32ShellFolderManager2.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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 java.util.concurrent.ThreadFactory;
 import java.util.concurrent.ThreadPoolExecutor;
 import java.util.concurrent.TimeUnit;
 
-import sun.awt.OSInfo;
 import sun.awt.util.ThreadGroupUtils;
 import sun.util.logging.PlatformLogger;
 
@@ -291,7 +290,7 @@ final class Win32ShellFolderManager2 extends ShellFolderManager {
                 Win32ShellFolder2 drives = getDrives();
 
                 Win32ShellFolder2 recentFolder = getRecent();
-                if (recentFolder != null && OSInfo.getWindowsVersion().compareTo(OSInfo.WINDOWS_2000) >= 0) {
+                if (recentFolder != null) {
                     folders.add(recentFolder);
                 }
 
diff --git a/test/jdk/java/awt/FileDialog/FileSystemViewFilesTest.java b/test/jdk/java/awt/FileDialog/FileSystemViewFilesTest.java
new file mode 100644
index 00000000000..9a228386235
--- /dev/null
+++ b/test/jdk/java/awt/FileDialog/FileSystemViewFilesTest.java
@@ -0,0 +1,57 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact 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 8352970
+   @requires (os.family == "windows")
+   @summary Basic sanity test for FileSystemView.getChooserComboBoxFiles().
+  */
+
+import java.io.File;
+import java.util.Arrays;
+import javax.swing.filechooser.FileSystemView;
+
+public class FileSystemViewFilesTest {
+
+    public static void main(String[] args) throws Exception {
+
+        FileSystemView fsv = FileSystemView.getFileSystemView();
+        File[] roots = fsv.getRoots();
+        File desktop = Arrays.asList(roots).stream()
+            .filter(f -> f.getName().equals("Desktop"))
+            .findFirst()
+            .orElse(null);
+        if (desktop == null) {
+            System.out.println("No desktop available in " + roots.length + " roots");
+            return;
+        }
+
+        File[] chooserFiles = fsv.getChooserComboBoxFiles();
+        boolean found = Arrays.asList(chooserFiles).stream()
+            .anyMatch(f -> f.equals(desktop));
+        if (!found) {
+            throw new RuntimeException("Desktop not included in chooser combo box files.");
+        }
+    }
+
+}

From 895aabc4632a0b5e245aeceb6c2dcdb4b07f640e Mon Sep 17 00:00:00 2001
From: SendaoYan <syan@openjdk.org>
Date: Sun, 30 Mar 2025 13:05:31 +0000
Subject: [PATCH 548/587] =?UTF-8?q?8351233:=20[ASAN]=20avx2-emu-funcs.hpp:?=
 =?UTF-8?q?151:20:=20error:=20=E2=80=98D.82188=E2=80=99=20is=20used=20unin?=
 =?UTF-8?q?itialized?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Reviewed-by: vlivanov
---
 src/java.base/linux/native/libsimdsort/avx2-emu-funcs.hpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/java.base/linux/native/libsimdsort/avx2-emu-funcs.hpp b/src/java.base/linux/native/libsimdsort/avx2-emu-funcs.hpp
index 611f3f419bd..be3475ddf3a 100644
--- a/src/java.base/linux/native/libsimdsort/avx2-emu-funcs.hpp
+++ b/src/java.base/linux/native/libsimdsort/avx2-emu-funcs.hpp
@@ -127,9 +127,9 @@ void avx2_emu_mask_compressstoreu32(void *base_addr,
     T *leftStore = (T *)base_addr;
 
     int32_t shortMask = convert_avx2_mask_to_int(k);
-    const __m256i &perm = _mm256_loadu_si256(
+    const __m256i perm = _mm256_loadu_si256(
         (const __m256i *)avx2_compressstore_lut32_perm[shortMask].data());
-    const __m256i &left = _mm256_loadu_si256(
+    const __m256i left = _mm256_loadu_si256(
         (const __m256i *)avx2_compressstore_lut32_left[shortMask].data());
 
     typename vtype::reg_t temp = vtype::permutevar(reg, perm);
@@ -148,7 +148,7 @@ int avx2_double_compressstore32(void *left_addr, void *right_addr,
     T *rightStore = (T *)right_addr;
 
     int32_t shortMask = convert_avx2_mask_to_int(k);
-    const __m256i &perm = _mm256_loadu_si256(
+    const __m256i perm = _mm256_loadu_si256(
         (const __m256i *)avx2_compressstore_lut32_perm[shortMask].data());
 
     typename vtype::reg_t temp = vtype::permutevar(reg, perm);

From b9d7a75adee8a96cf47bbe73e3009102ceda9589 Mon Sep 17 00:00:00 2001
From: Zihao Lin <linzihao1999@outlook.com>
Date: Sun, 30 Mar 2025 13:14:52 +0000
Subject: [PATCH 549/587] 8352879: TestPeriod.java and TestGetContentType.java
 run wrong test class

Reviewed-by: mgronlun
---
 test/jdk/jdk/jfr/api/metadata/annotations/TestPeriod.java   | 2 +-
 .../api/metadata/settingdescriptor/TestGetContentType.java  | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/test/jdk/jdk/jfr/api/metadata/annotations/TestPeriod.java b/test/jdk/jdk/jfr/api/metadata/annotations/TestPeriod.java
index bf679b05bbf..c1f02a7cac2 100644
--- a/test/jdk/jdk/jfr/api/metadata/annotations/TestPeriod.java
+++ b/test/jdk/jdk/jfr/api/metadata/annotations/TestPeriod.java
@@ -34,7 +34,7 @@ import jdk.test.lib.jfr.Events;
  * @requires vm.flagless
  * @requires vm.hasJFR
  * @library /test/lib
- * @run main/othervm jdk.jfr.api.metadata.annotations.TestLabel
+ * @run main/othervm jdk.jfr.api.metadata.annotations.TestPeriod
  */
 public class TestPeriod {
 
diff --git a/test/jdk/jdk/jfr/api/metadata/settingdescriptor/TestGetContentType.java b/test/jdk/jdk/jfr/api/metadata/settingdescriptor/TestGetContentType.java
index ba8e25dd449..f0a3a19ba40 100644
--- a/test/jdk/jdk/jfr/api/metadata/settingdescriptor/TestGetContentType.java
+++ b/test/jdk/jdk/jfr/api/metadata/settingdescriptor/TestGetContentType.java
@@ -38,7 +38,7 @@ import jdk.test.lib.jfr.Events;
  * @requires vm.flagless
  * @requires vm.hasJFR
  * @library /test/lib /test/jdk
- * @run main/othervm jdk.jfr.api.metadata.settingdescriptor.TestGetDescription
+ * @run main/othervm jdk.jfr.api.metadata.settingdescriptor.TestGetContentType
  */
 public class TestGetContentType {
 
@@ -49,7 +49,7 @@ public class TestGetContentType {
         Asserts.assertNull(plain.getContentType());
 
         SettingDescriptor annotatedType = Events.getSetting(type, "annotatedType");
-        Asserts.assertNull(annotatedType.getContentType(), Timestamp.class.getName());
+        Asserts.assertEquals(annotatedType.getContentType(), Timestamp.class.getName());
 
         SettingDescriptor newName = Events.getSetting(type, "newName");
         Asserts.assertEquals(newName.getContentType(), Timespan.class.getName());
@@ -58,7 +58,7 @@ public class TestGetContentType {
         Asserts.assertNull(overridden.getContentType());
 
         SettingDescriptor protectedBase = Events.getSetting(type, "protectedBase");
-        Asserts.assertEquals(protectedBase.getContentType(), Frequency.class);
+        Asserts.assertEquals(protectedBase.getContentType(), Frequency.class.getName());
 
         SettingDescriptor publicBase = Events.getSetting(type, "publicBase");
         Asserts.assertEquals(publicBase.getContentType(), Timestamp.class.getName());

From 8cbadf78d04d0e3d1136a5582f281de099fc5e49 Mon Sep 17 00:00:00 2001
From: Rohit Arul Raj <rraj@openjdk.org>
Date: Sun, 30 Mar 2025 13:22:21 +0000
Subject: [PATCH 550/587] 8317976: Optimize SIMD sort for AMD Zen 4

Reviewed-by: psandoz, vlivanov
---
 src/hotspot/cpu/x86/matcher_x86.hpp          |  2 +-
 src/hotspot/cpu/x86/stubGenerator_x86_64.cpp |  6 +++---
 src/hotspot/cpu/x86/vm_version_x86.hpp       | 13 +++++++++++++
 3 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/src/hotspot/cpu/x86/matcher_x86.hpp b/src/hotspot/cpu/x86/matcher_x86.hpp
index 51756903792..78591989b5b 100644
--- a/src/hotspot/cpu/x86/matcher_x86.hpp
+++ b/src/hotspot/cpu/x86/matcher_x86.hpp
@@ -256,7 +256,7 @@
 
   // Is SIMD sort supported for this CPU?
   static bool supports_simd_sort(BasicType bt) {
-    if (VM_Version::supports_avx512dq()) {
+    if (VM_Version::supports_avx512_simd_sort()) {
       return true;
     }
     else if (VM_Version::supports_avx2() && !is_double_word_type(bt)) {
diff --git a/src/hotspot/cpu/x86/stubGenerator_x86_64.cpp b/src/hotspot/cpu/x86/stubGenerator_x86_64.cpp
index a27748ac472..7e63e6fb49b 100644
--- a/src/hotspot/cpu/x86/stubGenerator_x86_64.cpp
+++ b/src/hotspot/cpu/x86/stubGenerator_x86_64.cpp
@@ -4312,7 +4312,7 @@ void StubGenerator::generate_compiler_stubs() {
 
   // Load x86_64_sort library on supported hardware to enable SIMD sort and partition intrinsics
 
-  if (VM_Version::is_intel() && (VM_Version::supports_avx512dq() || VM_Version::supports_avx2())) {
+  if (VM_Version::supports_avx512dq() || VM_Version::supports_avx2()) {
     void *libsimdsort = nullptr;
     char ebuf_[1024];
     char dll_name_simd_sort[JVM_MAXPATHLEN];
@@ -4323,10 +4323,10 @@ void StubGenerator::generate_compiler_stubs() {
     if (libsimdsort != nullptr) {
       log_info(library)("Loaded library %s, handle " INTPTR_FORMAT, JNI_LIB_PREFIX "simdsort" JNI_LIB_SUFFIX, p2i(libsimdsort));
 
-      snprintf(ebuf_, sizeof(ebuf_), VM_Version::supports_avx512dq() ? "avx512_sort" : "avx2_sort");
+      snprintf(ebuf_, sizeof(ebuf_), VM_Version::supports_avx512_simd_sort() ? "avx512_sort" : "avx2_sort");
       StubRoutines::_array_sort = (address)os::dll_lookup(libsimdsort, ebuf_);
 
-      snprintf(ebuf_, sizeof(ebuf_), VM_Version::supports_avx512dq() ? "avx512_partition" : "avx2_partition");
+      snprintf(ebuf_, sizeof(ebuf_), VM_Version::supports_avx512_simd_sort() ? "avx512_partition" : "avx2_partition");
       StubRoutines::_array_partition = (address)os::dll_lookup(libsimdsort, ebuf_);
     }
   }
diff --git a/src/hotspot/cpu/x86/vm_version_x86.hpp b/src/hotspot/cpu/x86/vm_version_x86.hpp
index 9bd3116cf84..cc5c6c1c639 100644
--- a/src/hotspot/cpu/x86/vm_version_x86.hpp
+++ b/src/hotspot/cpu/x86/vm_version_x86.hpp
@@ -432,6 +432,8 @@ protected:
   enum Extended_Family {
     // AMD
     CPU_FAMILY_AMD_11H       = 0x11,
+    CPU_FAMILY_AMD_17H       = 0x17, /* Zen1 & Zen2 */
+    CPU_FAMILY_AMD_19H       = 0x19, /* Zen3 & Zen4 */
     // ZX
     CPU_FAMILY_ZX_CORE_F6    = 6,
     CPU_FAMILY_ZX_CORE_F7    = 7,
@@ -771,6 +773,17 @@ public:
   //
   static bool cpu_supports_evex()     { return (_cpu_features & CPU_AVX512F) != 0; }
 
+  static bool supports_avx512_simd_sort() {
+    if (supports_avx512dq()) {
+      // Disable AVX512 version of SIMD Sort on AMD Zen4 Processors.
+      if (is_amd() && cpu_family() == CPU_FAMILY_AMD_19H) {
+        return false;
+      }
+      return true;
+    }
+    return false;
+  }
+
   // Intel features
   static bool is_intel_family_core() { return is_intel() &&
                                        extended_cpu_family() == CPU_FAMILY_INTEL_CORE; }

From 59629f88e6fad9c1ff91be4cfea83f78f0ea503c Mon Sep 17 00:00:00 2001
From: Thomas Stuefe <stuefe@openjdk.org>
Date: Sun, 30 Mar 2025 16:42:38 +0000
Subject: [PATCH 551/587] 8351040: [REDO] Protection zone for easier detection
 of accidental zero-nKlass use

Reviewed-by: mbaesken, iklam
---
 src/hotspot/share/cds/archiveBuilder.cpp      |  14 +-
 src/hotspot/share/cds/archiveBuilder.hpp      |  13 +-
 src/hotspot/share/cds/archiveUtils.cpp        |  55 +++--
 src/hotspot/share/cds/dynamicArchive.cpp      |   1 -
 src/hotspot/share/cds/filemap.hpp             |   2 +-
 src/hotspot/share/cds/metaspaceShared.cpp     | 111 ++++++---
 src/hotspot/share/cds/metaspaceShared.hpp     |   1 +
 src/hotspot/share/include/cds.h               |   5 +-
 src/hotspot/share/memory/metaspace.cpp        |  41 ++--
 src/hotspot/share/oops/compressedKlass.cpp    |  37 ++-
 src/hotspot/share/oops/compressedKlass.hpp    |  11 +-
 .../share/oops/compressedKlass.inline.hpp     |   6 +-
 src/hotspot/share/prims/whitebox.cpp          |  12 +
 src/hotspot/share/runtime/os.cpp              |   6 +
 .../AccessZeroNKlassHitsProtectionZone.java   | 214 ++++++++++++++++++
 test/lib/jdk/test/whitebox/WhiteBox.java      |   4 +-
 16 files changed, 436 insertions(+), 97 deletions(-)
 create mode 100644 test/hotspot/jtreg/runtime/ErrorHandling/AccessZeroNKlassHitsProtectionZone.java

diff --git a/src/hotspot/share/cds/archiveBuilder.cpp b/src/hotspot/share/cds/archiveBuilder.cpp
index 48e843e473f..ba823afa238 100644
--- a/src/hotspot/share/cds/archiveBuilder.cpp
+++ b/src/hotspot/share/cds/archiveBuilder.cpp
@@ -153,7 +153,6 @@ void ArchiveBuilder::SourceObjList::relocate(int i, ArchiveBuilder* builder) {
 ArchiveBuilder::ArchiveBuilder() :
   _current_dump_region(nullptr),
   _buffer_bottom(nullptr),
-  _num_dump_regions_used(0),
   _requested_static_archive_bottom(nullptr),
   _requested_static_archive_top(nullptr),
   _requested_dynamic_archive_bottom(nullptr),
@@ -161,6 +160,7 @@ ArchiveBuilder::ArchiveBuilder() :
   _mapped_static_archive_bottom(nullptr),
   _mapped_static_archive_top(nullptr),
   _buffer_to_requested_delta(0),
+  _pz_region("pz", MAX_SHARED_DELTA), // protection zone -- used only during dumping; does NOT exist in cds archive.
   _rw_region("rw", MAX_SHARED_DELTA),
   _ro_region("ro", MAX_SHARED_DELTA),
   _ptrmap(mtClassShared),
@@ -323,8 +323,12 @@ address ArchiveBuilder::reserve_buffer() {
   _shared_rs = rs;
 
   _buffer_bottom = buffer_bottom;
-  _current_dump_region = &_rw_region;
-  _num_dump_regions_used = 1;
+
+  if (CDSConfig::is_dumping_static_archive()) {
+    _current_dump_region = &_pz_region;
+  } else {
+    _current_dump_region = &_rw_region;
+  }
   _current_dump_region->init(&_shared_rs, &_shared_vs);
 
   ArchivePtrMarker::initialize(&_ptrmap, &_shared_vs);
@@ -366,7 +370,8 @@ address ArchiveBuilder::reserve_buffer() {
   if (CDSConfig::is_dumping_static_archive()) {
     // We don't want any valid object to be at the very bottom of the archive.
     // See ArchivePtrMarker::mark_pointer().
-    rw_region()->allocate(16);
+    _pz_region.allocate(MetaspaceShared::protection_zone_size());
+    start_dump_region(&_rw_region);
   }
 
   return buffer_bottom;
@@ -544,7 +549,6 @@ ArchiveBuilder::FollowMode ArchiveBuilder::get_follow_mode(MetaspaceClosure::Ref
 void ArchiveBuilder::start_dump_region(DumpRegion* next) {
   current_dump_region()->pack(next);
   _current_dump_region = next;
-  _num_dump_regions_used ++;
 }
 
 char* ArchiveBuilder::ro_strdup(const char* s) {
diff --git a/src/hotspot/share/cds/archiveBuilder.hpp b/src/hotspot/share/cds/archiveBuilder.hpp
index e3efedd46f1..5913ae29c78 100644
--- a/src/hotspot/share/cds/archiveBuilder.hpp
+++ b/src/hotspot/share/cds/archiveBuilder.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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,6 @@ class ArchiveBuilder : public StackObj {
 protected:
   DumpRegion* _current_dump_region;
   address _buffer_bottom;                      // for writing the contents of rw/ro regions
-  int _num_dump_regions_used;
 
   // These are the addresses where we will request the static and dynamic archives to be
   // mapped at run time. If the request fails (due to ASLR), we will map the archives at
@@ -210,6 +209,12 @@ private:
   ReservedSpace _shared_rs;
   VirtualSpace _shared_vs;
 
+  // The "pz" region is used only during static dumps to reserve an unused space between SharedBaseAddress and
+  // the bottom of the rw region. During runtime, this space will be filled with a reserved area that disallows
+  // read/write/exec, so we can track for bad CompressedKlassPointers encoding.
+  // Note: this region does NOT exist in the cds archive.
+  DumpRegion _pz_region;
+
   DumpRegion _rw_region;
   DumpRegion _ro_region;
 
@@ -270,9 +275,6 @@ private:
 
 protected:
   virtual void iterate_roots(MetaspaceClosure* it) = 0;
-
-  static const int _total_dump_regions = 2;
-
   void start_dump_region(DumpRegion* next);
 
 public:
@@ -367,6 +369,7 @@ public:
   void remember_embedded_pointer_in_enclosing_obj(MetaspaceClosure::Ref* ref);
   static void serialize_dynamic_archivable_items(SerializeClosure* soc);
 
+  DumpRegion* pz_region() { return &_pz_region; }
   DumpRegion* rw_region() { return &_rw_region; }
   DumpRegion* ro_region() { return &_ro_region; }
 
diff --git a/src/hotspot/share/cds/archiveUtils.cpp b/src/hotspot/share/cds/archiveUtils.cpp
index 605a19a224c..217b30e401d 100644
--- a/src/hotspot/share/cds/archiveUtils.cpp
+++ b/src/hotspot/share/cds/archiveUtils.cpp
@@ -74,34 +74,39 @@ void ArchivePtrMarker::initialize(CHeapBitMap* ptrmap, VirtualSpace* vs) {
 }
 
 void ArchivePtrMarker::initialize_rw_ro_maps(CHeapBitMap* rw_ptrmap, CHeapBitMap* ro_ptrmap) {
-  address* rw_bottom = (address*)ArchiveBuilder::current()->rw_region()->base();
-  address* ro_bottom = (address*)ArchiveBuilder::current()->ro_region()->base();
+  address* buff_bottom = (address*)ArchiveBuilder::current()->buffer_bottom();
+  address* rw_bottom   = (address*)ArchiveBuilder::current()->rw_region()->base();
+  address* ro_bottom   = (address*)ArchiveBuilder::current()->ro_region()->base();
+
+  // The bit in _ptrmap that cover the very first word in the rw/ro regions.
+  size_t rw_start = rw_bottom - buff_bottom;
+  size_t ro_start = ro_bottom - buff_bottom;
+
+  // The number of bits used by the rw/ro ptrmaps. We might have lots of zero
+  // bits at the bottom and top of rw/ro ptrmaps, but these zeros will be
+  // removed by FileMapInfo::write_bitmap_region().
+  size_t rw_size = ArchiveBuilder::current()->rw_region()->used() / sizeof(address);
+  size_t ro_size = ArchiveBuilder::current()->ro_region()->used() / sizeof(address);
+
+  // The last (exclusive) bit in _ptrmap that covers the rw/ro regions.
+  // Note: _ptrmap is dynamically expanded only when an actual pointer is written, so
+  // it may not be as large as we want.
+  size_t rw_end = MIN2<size_t>(rw_start + rw_size, _ptrmap->size());
+  size_t ro_end = MIN2<size_t>(ro_start + ro_size, _ptrmap->size());
+
+  rw_ptrmap->initialize(rw_size);
+  ro_ptrmap->initialize(ro_size);
+
+  for (size_t rw_bit = rw_start; rw_bit < rw_end; rw_bit++) {
+    rw_ptrmap->at_put(rw_bit - rw_start, _ptrmap->at(rw_bit));
+  }
+
+  for(size_t ro_bit = ro_start; ro_bit < ro_end; ro_bit++) {
+    ro_ptrmap->at_put(ro_bit - ro_start, _ptrmap->at(ro_bit));
+  }
 
   _rw_ptrmap = rw_ptrmap;
   _ro_ptrmap = ro_ptrmap;
-
-  size_t rw_size = ArchiveBuilder::current()->rw_region()->used() / sizeof(address);
-  size_t ro_size = ArchiveBuilder::current()->ro_region()->used() / sizeof(address);
-  // ro_start is the first bit in _ptrmap that covers the pointer that would sit at ro_bottom.
-  // E.g., if rw_bottom = (address*)100
-  //          ro_bottom = (address*)116
-  //       then for 64-bit platform:
-  //          ro_start = ro_bottom - rw_bottom = (116 - 100) / sizeof(address) = 2;
-  size_t ro_start = ro_bottom - rw_bottom;
-
-  // Note: ptrmap is big enough only to cover the last pointer in ro_region.
-  // See ArchivePtrMarker::compact()
-  _rw_ptrmap->initialize(rw_size);
-  _ro_ptrmap->initialize(_ptrmap->size() - ro_start);
-
-  for (size_t rw_bit = 0; rw_bit < _rw_ptrmap->size(); rw_bit++) {
-    _rw_ptrmap->at_put(rw_bit, _ptrmap->at(rw_bit));
-  }
-
-  for(size_t ro_bit = ro_start; ro_bit < _ptrmap->size(); ro_bit++) {
-    _ro_ptrmap->at_put(ro_bit-ro_start, _ptrmap->at(ro_bit));
-  }
-  assert(_ptrmap->size() - ro_start == _ro_ptrmap->size(), "must be");
 }
 
 void ArchivePtrMarker::mark_pointer(address* ptr_loc) {
diff --git a/src/hotspot/share/cds/dynamicArchive.cpp b/src/hotspot/share/cds/dynamicArchive.cpp
index 9b1e99512c6..3cf1019d9ea 100644
--- a/src/hotspot/share/cds/dynamicArchive.cpp
+++ b/src/hotspot/share/cds/dynamicArchive.cpp
@@ -173,7 +173,6 @@ public:
 
     post_dump();
 
-    assert(_num_dump_regions_used == _total_dump_regions, "must be");
     verify_universe("After CDS dynamic dump");
   }
 
diff --git a/src/hotspot/share/cds/filemap.hpp b/src/hotspot/share/cds/filemap.hpp
index 095faba69f3..50af87a5da7 100644
--- a/src/hotspot/share/cds/filemap.hpp
+++ b/src/hotspot/share/cds/filemap.hpp
@@ -399,7 +399,7 @@ public:
   // The offset of the (exclusive) end of the last core region in this archive, relative to SharedBaseAddress
   size_t mapping_end_offset()  const { return last_core_region()->mapping_end_offset(); }
 
-  char* mapped_base()    const { return first_core_region()->mapped_base(); }
+  char* mapped_base()    const { return header()->mapped_base_address();    }
   char* mapped_end()     const { return last_core_region()->mapped_end();   }
 
   // Non-zero if the archive needs to be mapped a non-default location due to ASLR.
diff --git a/src/hotspot/share/cds/metaspaceShared.cpp b/src/hotspot/share/cds/metaspaceShared.cpp
index 7ce423e6f87..3ca107b81ed 100644
--- a/src/hotspot/share/cds/metaspaceShared.cpp
+++ b/src/hotspot/share/cds/metaspaceShared.cpp
@@ -149,6 +149,10 @@ size_t MetaspaceShared::core_region_alignment() {
   return os::cds_core_region_alignment();
 }
 
+size_t MetaspaceShared::protection_zone_size() {
+  return os::cds_core_region_alignment();
+}
+
 static bool shared_base_valid(char* shared_base) {
   // We check user input for SharedBaseAddress at dump time.
 
@@ -1253,6 +1257,7 @@ MapArchiveResult MetaspaceShared::map_archives(FileMapInfo* static_mapinfo, File
 
   ReservedSpace total_space_rs, archive_space_rs, class_space_rs;
   MapArchiveResult result = MAP_ARCHIVE_OTHER_FAILURE;
+  size_t prot_zone_size = 0;
   char* mapped_base_address = reserve_address_space_for_archives(static_mapinfo,
                                                                  dynamic_mapinfo,
                                                                  use_requested_addr,
@@ -1264,14 +1269,21 @@ MapArchiveResult MetaspaceShared::map_archives(FileMapInfo* static_mapinfo, File
     log_debug(cds)("Failed to reserve spaces (use_requested_addr=%u)", (unsigned)use_requested_addr);
   } else {
 
+    if (Metaspace::using_class_space()) {
+      prot_zone_size = protection_zone_size();
+    }
+
 #ifdef ASSERT
     // Some sanity checks after reserving address spaces for archives
     //  and class space.
     assert(archive_space_rs.is_reserved(), "Sanity");
     if (Metaspace::using_class_space()) {
+      assert(archive_space_rs.base() == mapped_base_address &&
+          archive_space_rs.size() > protection_zone_size(),
+          "Archive space must lead and include the protection zone");
       // Class space must closely follow the archive space. Both spaces
       //  must be aligned correctly.
-      assert(class_space_rs.is_reserved(),
+      assert(class_space_rs.is_reserved() && class_space_rs.size() > 0,
              "A class space should have been reserved");
       assert(class_space_rs.base() >= archive_space_rs.end(),
              "class space should follow the cds archive space");
@@ -1284,8 +1296,9 @@ MapArchiveResult MetaspaceShared::map_archives(FileMapInfo* static_mapinfo, File
     }
 #endif // ASSERT
 
-    log_info(cds)("Reserved archive_space_rs [" INTPTR_FORMAT " - " INTPTR_FORMAT "] (%zu) bytes",
-                   p2i(archive_space_rs.base()), p2i(archive_space_rs.end()), archive_space_rs.size());
+    log_info(cds)("Reserved archive_space_rs [" INTPTR_FORMAT " - " INTPTR_FORMAT "] (%zu) bytes%s",
+                   p2i(archive_space_rs.base()), p2i(archive_space_rs.end()), archive_space_rs.size(),
+                   (prot_zone_size > 0 ? " (includes protection zone)" : ""));
     log_info(cds)("Reserved class_space_rs   [" INTPTR_FORMAT " - " INTPTR_FORMAT "] (%zu) bytes",
                    p2i(class_space_rs.base()), p2i(class_space_rs.end()), class_space_rs.size());
 
@@ -1312,8 +1325,35 @@ MapArchiveResult MetaspaceShared::map_archives(FileMapInfo* static_mapinfo, File
         MemoryReserver::release(archive_space_rs);
         // Mark as not reserved
         archive_space_rs = {};
+        // The protection zone is part of the archive:
+        // See comment above, the Windows way of loading CDS is to mmap the individual
+        // parts of the archive into the address region we just vacated. The protection
+        // zone will not be mapped (and, in fact, does not exist as physical region in
+        // the archive). Therefore, after removing the archive space above, we must
+        // re-reserve the protection zone part lest something else gets mapped into that
+        // area later.
+        if (prot_zone_size > 0) {
+          assert(prot_zone_size >= os::vm_allocation_granularity(), "must be"); // not just page size!
+          char* p = os::attempt_reserve_memory_at(mapped_base_address, prot_zone_size,
+                                                  false, MemTag::mtClassShared);
+          assert(p == mapped_base_address || p == nullptr, "must be");
+          if (p == nullptr) {
+            log_debug(cds)("Failed to re-reserve protection zone");
+            return MAP_ARCHIVE_MMAP_FAILURE;
+          }
+        }
       }
     }
+
+    if (prot_zone_size > 0) {
+      os::commit_memory(mapped_base_address, prot_zone_size, false); // will later be protected
+      // Before mapping the core regions into the newly established address space, we mark
+      // start and the end of the future protection zone with canaries. That way we easily
+      // catch mapping errors (accidentally mapping data into the future protection zone).
+      *(mapped_base_address) = 'P';
+      *(mapped_base_address + prot_zone_size - 1) = 'P';
+    }
+
     MapArchiveResult static_result = map_archive(static_mapinfo, mapped_base_address, archive_space_rs);
     MapArchiveResult dynamic_result = (static_result == MAP_ARCHIVE_SUCCESS) ?
                                      map_archive(dynamic_mapinfo, mapped_base_address, archive_space_rs) : MAP_ARCHIVE_OTHER_FAILURE;
@@ -1357,38 +1397,40 @@ MapArchiveResult MetaspaceShared::map_archives(FileMapInfo* static_mapinfo, File
   if (result == MAP_ARCHIVE_SUCCESS) {
     SharedBaseAddress = (size_t)mapped_base_address;
 #ifdef _LP64
-        if (Metaspace::using_class_space()) {
-          // Set up ccs in metaspace.
-          Metaspace::initialize_class_space(class_space_rs);
+    if (Metaspace::using_class_space()) {
+      assert(prot_zone_size > 0 &&
+             *(mapped_base_address) == 'P' &&
+             *(mapped_base_address + prot_zone_size - 1) == 'P',
+             "Protection zone was overwritten?");
+      // Set up ccs in metaspace.
+      Metaspace::initialize_class_space(class_space_rs);
 
-          // Set up compressed Klass pointer encoding: the encoding range must
-          //  cover both archive and class space.
-          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 || 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
-            );
-          } 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();
-        }
+      // Set up compressed Klass pointer encoding: the encoding range must
+      //  cover both archive and class space.
+      const address encoding_base = (address)mapped_base_address;
+      const address klass_range_start = encoding_base + prot_zone_size;
+      const size_t klass_range_size = (address)class_space_rs.end() - klass_range_start;
+      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 (including protection zone), shift should be the shift used at archive generation time.
+        CompressedKlassPointers::initialize_for_given_encoding(
+          klass_range_start, klass_range_size,
+          encoding_base, ArchiveBuilder::precomputed_narrow_klass_shift() // precomputed encoding, see ArchiveBuilder
+        );
+      } else {
+        // Let JVM freely choose encoding base and shift
+        CompressedKlassPointers::initialize(klass_range_start, klass_range_size);
+      }
+      CompressedKlassPointers::establish_protection_zone(encoding_base, prot_zone_size);
+
+      // 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();
+    }
 #endif // _LP64
     log_info(cds)("initial optimized module handling: %s", CDSConfig::is_using_optimized_module_handling() ? "enabled" : "disabled");
     log_info(cds)("initial full module graph: %s", CDSConfig::is_using_full_module_graph() ? "enabled" : "disabled");
@@ -1470,7 +1512,6 @@ char* MetaspaceShared::reserve_address_space_for_archives(FileMapInfo* static_ma
   const size_t archive_space_alignment = core_region_alignment();
 
   // Size and requested location of the archive_space_rs (for both static and dynamic archives)
-  assert(static_mapinfo->mapping_base_offset() == 0, "Must be");
   size_t archive_end_offset  = (dynamic_mapinfo == nullptr) ? static_mapinfo->mapping_end_offset() : dynamic_mapinfo->mapping_end_offset();
   size_t archive_space_size = align_up(archive_end_offset, archive_space_alignment);
 
diff --git a/src/hotspot/share/cds/metaspaceShared.hpp b/src/hotspot/share/cds/metaspaceShared.hpp
index 6d5f273041a..27df816833c 100644
--- a/src/hotspot/share/cds/metaspaceShared.hpp
+++ b/src/hotspot/share/cds/metaspaceShared.hpp
@@ -139,6 +139,7 @@ public:
   // Alignment for the 2 core CDS regions (RW/RO) only.
   // (Heap region alignments are decided by GC).
   static size_t core_region_alignment();
+  static size_t protection_zone_size();
   static void rewrite_nofast_bytecodes_and_calculate_fingerprints(Thread* thread, InstanceKlass* ik);
   // print loaded classes names to file.
   static void dump_loaded_classes(const char* file_name, TRAPS);
diff --git a/src/hotspot/share/include/cds.h b/src/hotspot/share/include/cds.h
index 2a80dd68abd..8819e4c00be 100644
--- a/src/hotspot/share/include/cds.h
+++ b/src/hotspot/share/include/cds.h
@@ -70,7 +70,10 @@ 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 used for mapping the core regions. At that address the
+                              // zero nklass protection zone is established; following that (at offset
+                              // MetaspaceShared::protection_zone_size()) the lowest core region (rw for the
+                              // static archive) is is mapped.
   bool    _in_reserved_space; // Is this region in a ReservedSpace
 } CDSFileMapRegion;
 
diff --git a/src/hotspot/share/memory/metaspace.cpp b/src/hotspot/share/memory/metaspace.cpp
index e80e5b8a1e6..3615c3dc7ee 100644
--- a/src/hotspot/share/memory/metaspace.cpp
+++ b/src/hotspot/share/memory/metaspace.cpp
@@ -1,7 +1,7 @@
 /*
  * Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2017, 2021 SAP SE. All rights reserved.
- * Copyright (c) 2023, 2024, Red Hat, Inc. All rights reserved.
+ * Copyright (c) 2023, 2025, 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
@@ -37,6 +37,7 @@
 #include "memory/metaspace/chunkManager.hpp"
 #include "memory/metaspace/commitLimiter.hpp"
 #include "memory/metaspace/internalStats.hpp"
+#include "memory/metaspace/metachunk.hpp"
 #include "memory/metaspace/metaspaceCommon.hpp"
 #include "memory/metaspace/metaspaceContext.hpp"
 #include "memory/metaspace/metaspaceReporter.hpp"
@@ -804,29 +805,37 @@ void Metaspace::global_initialize() {
     // 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());
+
+    // After narrowKlass encoding scheme is decided: if the encoding base points to class space start,
+    // establish a protection zone. Accidentally decoding a zero nKlass ID and then using it will result
+    // in an immediate segmentation fault instead of a delayed error much later.
+    if (CompressedKlassPointers::base() == (address)rs.base()) {
+      // Let the protection zone be a whole commit granule. Otherwise, buddy allocator may later place neighboring
+      // chunks in the same granule, see that the granule is not yet committed, and commit it, which would replace
+      // the protection mapping and make the zone readable.
+      // Alternatively, we could commit the chunk right now, but that is a tiny bit more fiddly, since we are not
+      // fully set up yet at this point.
+      const size_t protzone_size = metaspace::Settings::commit_granule_bytes(); // granule size >= page size
+      const size_t protzone_wordsize = protzone_size / BytesPerWord;
+      const metaspace::chunklevel_t lvl = metaspace::chunklevel::level_fitting_word_size(protzone_wordsize);
+      metaspace::Metachunk* const chunk = MetaspaceContext::context_class()->cm()->get_chunk(lvl);
+      const address protzone = (address) chunk->base();
+      assert(protzone == (address)rs.base(), "The very first chunk should be located at the class space start?");
+      assert(chunk->word_size() == protzone_wordsize, "Weird chunk size");
+      CompressedKlassPointers::establish_protection_zone(protzone, protzone_size);
+    } else {
+      assert(CompressedKlassPointers::base() == nullptr, "Zero-based encoding expected");
+    }
+
   }
 
-#endif
+#endif // _LP64
 
   // Initialize non-class virtual space list, and its chunk manager:
   MetaspaceContext::initialize_nonclass_space_context();
 
   _tracer = new MetaspaceTracer();
 
-  // We must prevent the very first address of the ccs from being used to store
-  // metadata, since that address would translate to a narrow pointer of 0, and the
-  // VM does not distinguish between "narrow 0 as in null" and "narrow 0 as in start
-  //  of ccs".
-  // Before Elastic Metaspace that did not happen due to the fact that every Metachunk
-  // had a header and therefore could not allocate anything at offset 0.
-#ifdef _LP64
-  if (using_class_space()) {
-    // The simplest way to fix this is to allocate a tiny dummy chunk right at the
-    // start of ccs and do not use it for anything.
-    MetaspaceContext::context_class()->cm()->get_chunk(metaspace::chunklevel::HIGHEST_CHUNK_LEVEL);
-  }
-#endif
-
 #ifdef _LP64
   if (UseCompressedClassPointers) {
     // Note: "cds" would be a better fit but keep this for backward compatibility.
diff --git a/src/hotspot/share/oops/compressedKlass.cpp b/src/hotspot/share/oops/compressedKlass.cpp
index fc8c0513ca0..df639388a5e 100644
--- a/src/hotspot/share/oops/compressedKlass.cpp
+++ b/src/hotspot/share/oops/compressedKlass.cpp
@@ -42,6 +42,7 @@ 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;
+size_t CompressedKlassPointers::_protection_zone_size = 0;
 
 #ifdef _LP64
 
@@ -162,11 +163,6 @@ void CompressedKlassPointers::initialize_for_given_encoding(address addr, size_t
     vm_exit_during_initialization(ss.base());
   }
 
-  // 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");
-
   // Remember Klass range:
   _klass_range_start = addr;
   _klass_range_end = addr + len;
@@ -304,9 +300,40 @@ void CompressedKlassPointers::print_mode(outputStream* st) {
     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);
+    if (_protection_zone_size > 0) {
+      st->print_cr("Protection zone: " RANGEFMT, RANGEFMTARGS(_base, _protection_zone_size));
+    } else {
+      st->print_cr("No protection zone.");
+    }
   } else {
     st->print_cr("UseCompressedClassPointers off");
   }
 }
 
+// On AIX, we cannot mprotect archive space or class space since they are reserved with SystemV shm.
+static constexpr bool can_mprotect_archive_space = NOT_AIX(true) AIX_ONLY(false);
+
+// Protect a zone a the start of the encoding range
+void CompressedKlassPointers::establish_protection_zone(address addr, size_t size) {
+  assert(_protection_zone_size == 0, "just once");
+  assert(addr == base(), "Protection zone not at start of encoding range?");
+  assert(size > 0 && is_aligned(size, os::vm_page_size()), "Protection zone not page sized");
+  const bool rc = can_mprotect_archive_space && os::protect_memory((char*)addr, size, os::MEM_PROT_NONE, false);
+  log_info(metaspace)("%s Narrow Klass Protection zone " RANGEFMT,
+      (rc ? "Established" : "FAILED to establish "),
+      RANGEFMTARGS(addr, size));
+  if (!rc) {
+    // If we fail to establish the protection zone, we fill it with a clear pattern to make it
+    // stick out in register values (0x50 aka 'P', repeated)
+    os::commit_memory((char*)addr, size, false);
+    memset(addr, 'P', size);
+  }
+  _protection_zone_size = size;
+}
+
+bool CompressedKlassPointers::is_in_protection_zone(address addr) {
+  return _protection_zone_size > 0 ?
+      (addr >= base() && addr < base() + _protection_zone_size) : false;
+}
+
 #endif // _LP64
diff --git a/src/hotspot/share/oops/compressedKlass.hpp b/src/hotspot/share/oops/compressedKlass.hpp
index dd54c8130eb..4ce644d9cef 100644
--- a/src/hotspot/share/oops/compressedKlass.hpp
+++ b/src/hotspot/share/oops/compressedKlass.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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,6 +134,8 @@ class CompressedKlassPointers : public AllStatic {
   static narrowKlass _lowest_valid_narrow_klass_id;
   static narrowKlass _highest_valid_narrow_klass_id;
 
+  // Protection zone size (0 if not set up)
+  static size_t _protection_zone_size;
 
   // 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);
@@ -231,6 +233,7 @@ public:
   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);
@@ -258,6 +261,12 @@ public:
         is_aligned(addr, klass_alignment_in_bytes());
   }
 
+  // Protect a zone a the start of the encoding range
+  static void establish_protection_zone(address addr, size_t size);
+
+  // Returns true if address points into protection zone (for error reporting)
+  static bool is_in_protection_zone(address addr);
+
 #if defined(AARCH64) && !defined(ZERO)
   // Check that with the given base, shift and range, aarch64 code can encode and decode the klass pointer.
   static bool check_klass_decode_mode(address base, int shift, const size_t range);
diff --git a/src/hotspot/share/oops/compressedKlass.inline.hpp b/src/hotspot/share/oops/compressedKlass.inline.hpp
index 7c5da48a494..94a78ed1894 100644
--- a/src/hotspot/share/oops/compressedKlass.inline.hpp
+++ b/src/hotspot/share/oops/compressedKlass.inline.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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,10 @@ inline narrowKlass CompressedKlassPointers::encode_not_null_without_asserts(Klas
   return (narrowKlass)(pointer_delta(k, narrow_base, 1) >> shift);
 }
 
+inline Klass* CompressedKlassPointers::decode_not_null_without_asserts(narrowKlass v) {
+  return decode_not_null_without_asserts(v, base(), shift());
+}
+
 inline Klass* CompressedKlassPointers::decode_without_asserts(narrowKlass v) {
   return is_null(v) ? nullptr : decode_not_null_without_asserts(v, base(), shift());
 }
diff --git a/src/hotspot/share/prims/whitebox.cpp b/src/hotspot/share/prims/whitebox.cpp
index 4f57718f200..e6aa4b90ac4 100644
--- a/src/hotspot/share/prims/whitebox.cpp
+++ b/src/hotspot/share/prims/whitebox.cpp
@@ -325,6 +325,17 @@ WB_ENTRY(void, WB_ReadFromNoaccessArea(JNIEnv* env, jobject o))
                 *(vs.low_boundary() - rhs.noaccess_prefix() / 2 ));
 WB_END
 
+WB_ENTRY(void, WB_DecodeNKlassAndAccessKlass(JNIEnv* env, jobject o, jint nKlass))
+  assert(UseCompressedClassPointers, "Should only call for UseCompressedClassPointers");
+  const narrowKlass nk = (narrowKlass)nKlass;
+  const Klass* const k = CompressedKlassPointers::decode_not_null_without_asserts(nKlass);
+  printf("WB_DecodeNKlassAndAccessKlass: nk %u k " PTR_FORMAT "\n", nk, p2i(k));
+  printf("Will attempt to crash now...\n");
+  fflush(stdout); // flush now - we will crash below
+  // Access k by calling a virtual function - will result in loading the vtable from *k
+  k->print_on(tty);
+WB_END
+
 static jint wb_stress_virtual_space_resize(size_t reserved_space_size,
                                            size_t magnitude, size_t iterations) {
   size_t granularity = os::vm_allocation_granularity();
@@ -2733,6 +2744,7 @@ static JNINativeMethod methods[] = {
       (void*)&WB_GetCompressedOopsMaxHeapSize},
   {CC"printHeapSizes",     CC"()V",                   (void*)&WB_PrintHeapSizes    },
   {CC"readFromNoaccessArea",CC"()V",                  (void*)&WB_ReadFromNoaccessArea},
+  {CC"decodeNKlassAndAccessKlass",CC"(I)V",            (void*)&WB_DecodeNKlassAndAccessKlass},
   {CC"stressVirtualSpaceResize",CC"(JJJ)I",           (void*)&WB_StressVirtualSpaceResize},
 #if INCLUDE_CDS
   {CC"getCDSOffsetForName0", CC"(Ljava/lang/String;)I",  (void*)&WB_GetCDSOffsetForName},
diff --git a/src/hotspot/share/runtime/os.cpp b/src/hotspot/share/runtime/os.cpp
index 4eb0621ff8a..cbe40ca214b 100644
--- a/src/hotspot/share/runtime/os.cpp
+++ b/src/hotspot/share/runtime/os.cpp
@@ -1291,6 +1291,12 @@ void os::print_location(outputStream* st, intptr_t x, bool verbose) {
 
   bool accessible = is_readable_pointer(addr);
 
+  // Check if addr points into the narrow Klass protection zone
+  if (UseCompressedClassPointers && CompressedKlassPointers::is_in_protection_zone(addr)) {
+    st->print_cr(PTR_FORMAT " points into nKlass protection zone", p2i(addr));
+    return;
+  }
+
   // Check if addr is a JNI handle.
   if (align_down((intptr_t)addr, sizeof(intptr_t)) != 0 && accessible) {
     if (JNIHandles::is_global_handle((jobject) addr)) {
diff --git a/test/hotspot/jtreg/runtime/ErrorHandling/AccessZeroNKlassHitsProtectionZone.java b/test/hotspot/jtreg/runtime/ErrorHandling/AccessZeroNKlassHitsProtectionZone.java
new file mode 100644
index 00000000000..189f1c08916
--- /dev/null
+++ b/test/hotspot/jtreg/runtime/ErrorHandling/AccessZeroNKlassHitsProtectionZone.java
@@ -0,0 +1,214 @@
+/*
+ * Copyright (c) 2025, Red Hat, Inc.
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact 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=no_coh_no_cds
+ * @summary Test that dereferencing a Klass that is the result of a decode(0) crashes accessing the nKlass guard zone
+ * @library /test/lib
+ * @requires vm.bits == 64 & vm.debug == true & vm.flagless
+ * @requires os.family != "aix"
+ * @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 driver AccessZeroNKlassHitsProtectionZone no_coh_no_cds
+ */
+
+/*
+ * @test id=no_coh_cds
+ * @summary Test that dereferencing a Klass that is the result of a decode(0) crashes accessing the nKlass guard zone
+ * @requires vm.bits == 64 & vm.debug == true & vm.flagless
+ * @requires os.family != "aix"
+ * @library /test/lib
+ * @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 driver AccessZeroNKlassHitsProtectionZone no_coh_cds
+ */
+
+/*
+ * @test id=coh_no_cds
+ * @summary Test that dereferencing a Klass that is the result of a decode(0) crashes accessing the nKlass guard zone
+ * @requires vm.bits == 64 & vm.debug == true & vm.flagless
+ * @requires os.family != "aix"
+ * @library /test/lib
+ * @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 driver AccessZeroNKlassHitsProtectionZone coh_no_cds
+ */
+
+/*
+ * @test id=coh_cds
+ * @summary Test that dereferencing a Klass that is the result of a decode(0) crashes accessing the nKlass guard zone
+ * @requires vm.bits == 64 & vm.debug == true & vm.flagless
+ * @requires os.family != "aix"
+ * @library /test/lib
+ * @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 driver AccessZeroNKlassHitsProtectionZone coh_cds
+ */
+
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.process.ProcessTools;
+import jdk.test.whitebox.WhiteBox;
+import jtreg.SkippedException;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.regex.Pattern;
+
+// Test that dereferencing a Klass that is the result of a narrowKlass=0 will give us immediate crashes
+// that hit the protection zone at encoding base.
+public class AccessZeroNKlassHitsProtectionZone {
+
+    private static OutputAnalyzer run_test(boolean COH, boolean CDS, String forceBaseString) throws IOException, SkippedException {
+        ArrayList<String> args = new ArrayList<>();
+        args.add("-Xbootclasspath/a:.");
+        args.add("-XX:+UnlockDiagnosticVMOptions");
+        args.add("-XX:+WhiteBoxAPI");
+        args.add("-XX:CompressedClassSpaceSize=128m");
+        args.add("-Xmx128m");
+        args.add("-XX:-CreateCoredumpOnCrash");
+        args.add("-Xlog:metaspace*");
+        args.add("-Xlog:cds");
+        if (COH) {
+            args.add("-XX:+UnlockExperimentalVMOptions");
+            args.add("-XX:+UseCompactObjectHeaders");
+        }
+        if (CDS) {
+            args.add("-Xshare:on");
+        } else {
+            args.add("-Xshare:off");
+            args.add("-XX:CompressedClassSpaceBaseAddress=" + forceBaseString);
+        }
+        args.add(AccessZeroNKlassHitsProtectionZone.class.getName());
+        args.add("runwb");
+        ProcessBuilder pb = ProcessTools.createLimitedTestJavaProcessBuilder(args.toArray(new String[0]));
+
+        OutputAnalyzer output = new OutputAnalyzer(pb.start());
+        output.reportDiagnosticSummary();
+        return output;
+    }
+
+    private static void run_test(boolean COH, boolean CDS) throws IOException, SkippedException {
+        // Notes:
+        // We want to enforce zero-based encoding, to test the protection page in that case. For zero-based encoding,
+        // protection page is at address zero, no need to test that.
+        // If CDS is on, we never use zero-based, forceBase is ignored.
+        // If CDS is off, we use forceBase to (somewhat) reliably force the encoding base to beyond 32G,
+        // in order to prevent zero-based encoding. Since that may fail, we try several times.
+        OutputAnalyzer output = null;
+        long forceBase = -1;
+        if (CDS) {
+            output = run_test(COH, CDS, "");
+            // Not all distributions build COH archives. We tolerate that.
+            if (COH) {
+                String s = output.firstMatch("Specified shared archive file not found .*coh.jsa");
+                if (s != null) {
+                    throw new SkippedException("Failed to find COH archive, was it not built? Skipping test.");
+                }
+            }
+        } else {
+            long g4 = 0x1_0000_0000L;
+            long start = g4 * 8; // 32g
+            long step = g4;
+            long end = start + step * 16;
+            for (forceBase = start; forceBase < end; forceBase += step) {
+                String thisBaseString = String.format("0x%016X", forceBase).toLowerCase();
+                output = run_test(COH, CDS, thisBaseString);
+                if (output.contains("CompressedClassSpaceBaseAddress=" + thisBaseString + " given, but reserving class space failed.")) {
+                    // try next one
+                } else if (output.contains("Successfully forced class space address to " + thisBaseString)) {
+                    break;
+                } else {
+                    throw new RuntimeException("Unexpected");
+                }
+            }
+            if (forceBase >= end) {
+                throw new SkippedException("Failed to force ccs to any of the given bases. Skipping test.");
+            }
+        }
+
+        // Parse the encoding base from the output. In case of CDS, it depends on ASLR. Even in case of CDS=off, we want
+        // to double-check it is the force address.
+        String nKlassBaseString = output.firstMatch("Narrow klass base: 0x([0-9a-f]+)", 1);
+        if (nKlassBaseString == null) {
+            throw new RuntimeException("did not find Narrow klass base in log output");
+        }
+        long nKlassBase = Long.valueOf(nKlassBaseString, 16);
+
+        if (!CDS && nKlassBase != forceBase) {
+            throw new RuntimeException("Weird - we should have mapped at force base"); // .. otherwise we would have skipped out above
+        }
+        if (nKlassBase == 0) {
+            throw new RuntimeException("We should not be running zero-based at this point.");
+        }
+
+        // Calculate the expected crash address pattern. The precise crash address is unknown, but should be located
+        // in the lower part of the guard page following the encoding base. We just accept any address matching the
+        // upper 52 digits (leaving 4K = 12 bits = 4 nibbles of wiggle room)
+        String expectedCrashAddressString = nKlassBaseString.substring(0, nKlassBaseString.length() - 3);
+
+        // output from whitebox function: Klass* should point to encoding base
+        output.shouldMatch("WB_DecodeNKlassAndAccessKlass: nk 0 k 0x" + nKlassBaseString);
+
+        // Then, we should have crashed
+        output.shouldNotHaveExitValue(0);
+        output.shouldContain("# A fatal error has been detected");
+
+        // The hs-err file should contain a reference to the nKlass protection zone, like this:
+        // "RDI=0x0000000800000000 points into nKlass protection zone"
+        File hsErrFile = HsErrFileUtils.openHsErrFileFromOutput(output);
+
+        ArrayList<Pattern> hsErrPatternList = new ArrayList<>();
+        hsErrPatternList.add(Pattern.compile(".*(SIGBUS|SIGSEGV|EXCEPTION_ACCESS_VIOLATION).*"));
+
+        hsErrPatternList.add(Pattern.compile(".*siginfo:.*" + expectedCrashAddressString + ".*"));
+        hsErrPatternList.add(Pattern.compile(".*" + expectedCrashAddressString + ".*points into nKlass protection zone.*"));
+        Pattern[] hsErrPattern = hsErrPatternList.toArray(new Pattern[0]);
+        HsErrFileUtils.checkHsErrFileContent(hsErrFile, hsErrPattern, true);
+    }
+
+    enum Argument { runwb, no_coh_no_cds, no_coh_cds, coh_no_cds, coh_cds };
+    public static void main(String[] args) throws Exception {
+        if (args.length != 1) {
+            throw new RuntimeException("Expecting one argument");
+        }
+        Argument arg = Argument.valueOf(args[0]);
+        System.out.println(arg);
+        switch (arg) {
+            case runwb -> WhiteBox.getWhiteBox().decodeNKlassAndAccessKlass(0);
+            case no_coh_no_cds -> run_test(false, false);
+            case no_coh_cds -> run_test(false, true);
+            case coh_no_cds -> run_test(true, false);
+            case coh_cds -> run_test(true, true);
+        }
+    }
+}
diff --git a/test/lib/jdk/test/whitebox/WhiteBox.java b/test/lib/jdk/test/whitebox/WhiteBox.java
index be9bc646ce4..c45aecbced5 100644
--- a/test/lib/jdk/test/whitebox/WhiteBox.java
+++ b/test/lib/jdk/test/whitebox/WhiteBox.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -642,6 +642,8 @@ public class WhiteBox {
   // Tests on ReservedSpace/VirtualSpace classes
   public native int stressVirtualSpaceResize(long reservedSpaceSize, long magnitude, long iterations);
   public native void readFromNoaccessArea();
+
+  public native void decodeNKlassAndAccessKlass(int nKlass);
   public native long getThreadStackSize();
   public native long getThreadRemainingStackSize();
 

From 25925138b0a7d781d9293e52a8c9520329a85219 Mon Sep 17 00:00:00 2001
From: Christian Hagedorn <chagedorn@openjdk.org>
Date: Mon, 31 Mar 2025 07:38:53 +0000
Subject: [PATCH 552/587] 8350577: Fix missing Assertion Predicates when
 splitting loops

Reviewed-by: epeter, kvn
---
 src/hotspot/share/opto/loopTransform.cpp      |   27 +-
 src/hotspot/share/opto/loopnode.hpp           |    5 +-
 src/hotspot/share/opto/predicates.cpp         |   49 +-
 src/hotspot/share/opto/predicates.hpp         |    7 +-
 .../assertion/TestAssertionPredicates.java    | 1804 ++++++++++++++++-
 5 files changed, 1782 insertions(+), 110 deletions(-)

diff --git a/src/hotspot/share/opto/loopTransform.cpp b/src/hotspot/share/opto/loopTransform.cpp
index f491fa2fb10..7de53466e21 100644
--- a/src/hotspot/share/opto/loopTransform.cpp
+++ b/src/hotspot/share/opto/loopTransform.cpp
@@ -812,7 +812,7 @@ void PhaseIdealLoop::do_peeling(IdealLoopTree *loop, Node_List &old_new) {
   }
 
   // Step 5: Assertion Predicates initialization
-  if (counted_loop && UseLoopPredicate) {
+  if (counted_loop) {
     initialize_assertion_predicates_for_peeled_loop(new_head->as_CountedLoop(), head->as_CountedLoop(),
                                                     first_node_index_in_post_loop_body, old_new);
  }
@@ -1450,11 +1450,9 @@ void PhaseIdealLoop::insert_pre_post_loops(IdealLoopTree *loop, Node_List &old_n
   DEBUG_ONLY(const uint last_node_index_from_backedge_goo = Compile::current()->unique() - 1);
 
   DEBUG_ONLY(ensure_zero_trip_guard_proj(outer_main_head->in(LoopNode::EntryControl), true);)
-  if (UseLoopPredicate) {
-    initialize_assertion_predicates_for_main_loop(pre_head, main_head, first_node_index_in_pre_loop_body,
-                                                  last_node_index_in_pre_loop_body,
-                                                  DEBUG_ONLY(last_node_index_from_backedge_goo COMMA) old_new);
-  }
+  initialize_assertion_predicates_for_main_loop(pre_head, main_head, first_node_index_in_pre_loop_body,
+                                                last_node_index_in_pre_loop_body,
+                                                DEBUG_ONLY(last_node_index_from_backedge_goo COMMA) old_new);
 
   // Step B4: Shorten the pre-loop to run only 1 iteration (for now).
   // RCE and alignment may change this later.
@@ -1683,9 +1681,7 @@ Node *PhaseIdealLoop::insert_post_loop(IdealLoopTree* loop, Node_List& old_new,
   }
 
   DEBUG_ONLY(ensure_zero_trip_guard_proj(post_head->in(LoopNode::EntryControl), false);)
-  if (UseLoopPredicate) {
-    initialize_assertion_predicates_for_post_loop(main_head, post_head, first_node_index_in_cloned_loop_body);
-  }
+  initialize_assertion_predicates_for_post_loop(main_head, post_head, first_node_index_in_cloned_loop_body);
   return new_main_exit;
 }
 
@@ -1719,7 +1715,7 @@ void PhaseIdealLoop::initialize_assertion_predicates_for_peeled_loop(CountedLoop
                                                                      const uint first_node_index_in_cloned_loop_body,
                                                                      const Node_List& old_new) {
   const NodeInOriginalLoopBody node_in_original_loop_body(first_node_index_in_cloned_loop_body, old_new);
-  create_assertion_predicates_at_loop(peeled_loop_head, remaining_loop_head, node_in_original_loop_body, false);
+  create_assertion_predicates_at_loop(peeled_loop_head, remaining_loop_head, node_in_original_loop_body, true);
 }
 
 // Source Loop: Cloned   - pre_loop_head
@@ -1739,6 +1735,9 @@ void PhaseIdealLoop::initialize_assertion_predicates_for_main_loop(CountedLoopNo
 
 // Source Loop: Original - main_loop_head
 // Target Loop: Cloned   - post_loop_head
+//
+// The post loop is cloned before the pre loop. Do not kill the old Template Assertion Predicates, yet. We need to clone
+// from them when creating the pre loop. Only then we can kill them.
 void PhaseIdealLoop::initialize_assertion_predicates_for_post_loop(CountedLoopNode* main_loop_head,
                                                                    CountedLoopNode* post_loop_head,
                                                                    const uint first_node_index_in_cloned_loop_body) {
@@ -1749,9 +1748,9 @@ void PhaseIdealLoop::initialize_assertion_predicates_for_post_loop(CountedLoopNo
 void PhaseIdealLoop::create_assertion_predicates_at_loop(CountedLoopNode* source_loop_head,
                                                          CountedLoopNode* target_loop_head,
                                                          const NodeInLoopBody& _node_in_loop_body,
-                                                         const bool clone_template) {
+                                                         const bool kill_old_template) {
   CreateAssertionPredicatesVisitor create_assertion_predicates_visitor(target_loop_head, this, _node_in_loop_body,
-                                                                       clone_template);
+                                                                       kill_old_template);
   Node* source_loop_entry = source_loop_head->skip_strip_mined()->in(LoopNode::EntryControl);
   PredicateIterator predicate_iterator(source_loop_entry);
   predicate_iterator.for_each(create_assertion_predicates_visitor);
@@ -1760,11 +1759,11 @@ void PhaseIdealLoop::create_assertion_predicates_at_loop(CountedLoopNode* source
 void PhaseIdealLoop::create_assertion_predicates_at_main_or_post_loop(CountedLoopNode* source_loop_head,
                                                                       CountedLoopNode* target_loop_head,
                                                                       const NodeInLoopBody& _node_in_loop_body,
-                                                                      bool clone_template) {
+                                                                      const bool kill_old_template) {
   Node* old_target_loop_head_entry = target_loop_head->skip_strip_mined()->in(LoopNode::EntryControl);
   const uint node_index_before_new_assertion_predicate_nodes = C->unique();
   const bool need_to_rewire_old_target_loop_entry_dependencies = old_target_loop_head_entry->outcnt() > 1;
-  create_assertion_predicates_at_loop(source_loop_head, target_loop_head, _node_in_loop_body, clone_template);
+  create_assertion_predicates_at_loop(source_loop_head, target_loop_head, _node_in_loop_body, kill_old_template);
   if (need_to_rewire_old_target_loop_entry_dependencies) {
     rewire_old_target_loop_entry_dependency_to_new_entry(target_loop_head, old_target_loop_head_entry,
                                                          node_index_before_new_assertion_predicate_nodes);
diff --git a/src/hotspot/share/opto/loopnode.hpp b/src/hotspot/share/opto/loopnode.hpp
index b21f2f0348b..ef958ced8c3 100644
--- a/src/hotspot/share/opto/loopnode.hpp
+++ b/src/hotspot/share/opto/loopnode.hpp
@@ -993,10 +993,11 @@ private:
   void initialize_assertion_predicates_for_post_loop(CountedLoopNode* main_loop_head, CountedLoopNode* post_loop_head,
                                                      uint first_node_index_in_cloned_loop_body);
   void create_assertion_predicates_at_loop(CountedLoopNode* source_loop_head, CountedLoopNode* target_loop_head,
-                                           const NodeInLoopBody& _node_in_loop_body, bool clone_template);
+                                           const NodeInLoopBody& _node_in_loop_body, bool kill_old_template);
   void create_assertion_predicates_at_main_or_post_loop(CountedLoopNode* source_loop_head,
                                                         CountedLoopNode* target_loop_head,
-                                                        const NodeInLoopBody& _node_in_loop_body, bool clone_template);
+                                                        const NodeInLoopBody& _node_in_loop_body,
+                                                        bool kill_old_template);
   void rewire_old_target_loop_entry_dependency_to_new_entry(LoopNode* target_loop_head,
                                                             const Node* old_target_loop_entry,
                                                             uint node_index_before_new_assertion_predicate_nodes);
diff --git a/src/hotspot/share/opto/predicates.cpp b/src/hotspot/share/opto/predicates.cpp
index 52139335305..559d9a582e7 100644
--- a/src/hotspot/share/opto/predicates.cpp
+++ b/src/hotspot/share/opto/predicates.cpp
@@ -960,41 +960,24 @@ void Predicates::dump_for_loop(LoopNode* loop_node) {
 CreateAssertionPredicatesVisitor::CreateAssertionPredicatesVisitor(CountedLoopNode* target_loop_head,
                                                                    PhaseIdealLoop* phase,
                                                                    const NodeInLoopBody& node_in_loop_body,
-                                                                   const bool clone_template)
+                                                                   bool kill_old_template)
     : _init(target_loop_head->init_trip()),
       _stride(target_loop_head->stride()),
       _target_loop_head(target_loop_head),
       _old_target_loop_entry(target_loop_head->skip_strip_mined()->in(LoopNode::EntryControl)),
       _current_predicate_chain_head(target_loop_head->skip_strip_mined()), // Initially no predicates, yet.
       _phase(phase),
-      _has_hoisted_check_parse_predicates(false),
       _node_in_loop_body(node_in_loop_body),
-      _clone_template(clone_template) {}
-
-// Keep track of whether we are in the correct Predicate Block where Template Assertion Predicates can be found.
-// The PredicateIterator will always start at the loop entry and first visits the Loop Limit Check Predicate Block.
-void CreateAssertionPredicatesVisitor::visit(const ParsePredicate& parse_predicate) {
-  Deoptimization::DeoptReason deopt_reason = parse_predicate.head()->deopt_reason();
-  if (deopt_reason == Deoptimization::Reason_predicate ||
-      deopt_reason == Deoptimization::Reason_profile_predicate) {
-    _has_hoisted_check_parse_predicates = true;
-  }
-}
+      _kill_old_template(kill_old_template) {}
 
+// Clone Template Assertion Predicate and create an Initialized Assertion Predicate from it.
 void CreateAssertionPredicatesVisitor::visit(const TemplateAssertionPredicate& template_assertion_predicate) {
-  if (!_has_hoisted_check_parse_predicates) {
-    // Only process if we are in the correct Predicate Block.
-    return;
-  }
-  if (_clone_template) {
-    TemplateAssertionPredicate cloned_template_assertion_predicate =
-        clone_template_and_replace_init_input(template_assertion_predicate);
-    initialize_from_template(template_assertion_predicate, cloned_template_assertion_predicate.tail());
-    _current_predicate_chain_head = cloned_template_assertion_predicate.head();
-  } else {
-    InitializedAssertionPredicate initialized_assertion_predicate =
-        initialize_from_template(template_assertion_predicate, _old_target_loop_entry);
-    _current_predicate_chain_head = initialized_assertion_predicate.head();
+  TemplateAssertionPredicate cloned_template_assertion_predicate =
+      clone_template_and_replace_init_input(template_assertion_predicate);
+  initialize_from_template(template_assertion_predicate, cloned_template_assertion_predicate.tail());
+  _current_predicate_chain_head = cloned_template_assertion_predicate.head();
+  if (_kill_old_template) {
+    template_assertion_predicate.kill(_phase->igvn());
   }
 }
 
@@ -1110,18 +1093,11 @@ CloneUnswitchedLoopPredicatesVisitor::CloneUnswitchedLoopPredicatesVisitor(
     PhaseIdealLoop* phase)
     : _clone_predicate_to_true_path_loop(true_path_loop_head, node_in_true_path_loop_body, phase),
       _clone_predicate_to_false_path_loop(false_path_loop_head, node_in_false_path_loop_body, phase),
-      _phase(phase),
-      _has_hoisted_check_parse_predicates(false) {}
+      _phase(phase) {}
 
 // Keep track of whether we are in the correct Predicate Block where Template Assertion Predicates can be found.
 // The PredicateIterator will always start at the loop entry and first visits the Loop Limit Check Predicate Block.
 void CloneUnswitchedLoopPredicatesVisitor::visit(const ParsePredicate& parse_predicate) {
-  Deoptimization::DeoptReason deopt_reason = parse_predicate.head()->deopt_reason();
-  if (deopt_reason == Deoptimization::Reason_predicate ||
-      deopt_reason == Deoptimization::Reason_profile_predicate) {
-    _has_hoisted_check_parse_predicates = true;
-  }
-
   _clone_predicate_to_true_path_loop.clone_parse_predicate(parse_predicate, false);
   _clone_predicate_to_false_path_loop.clone_parse_predicate(parse_predicate, true);
   parse_predicate.kill(_phase->igvn());
@@ -1130,11 +1106,6 @@ void CloneUnswitchedLoopPredicatesVisitor::visit(const ParsePredicate& parse_pre
 // Clone the Template Assertion Predicate, which is currently found before the newly added unswitched loop selector,
 // to the true path and false path loop.
 void CloneUnswitchedLoopPredicatesVisitor::visit(const TemplateAssertionPredicate& template_assertion_predicate) {
-  if (!_has_hoisted_check_parse_predicates) {
-    // Only process if we are in the correct Predicate Block.
-    return;
-  }
-
   _clone_predicate_to_true_path_loop.clone_template_assertion_predicate(template_assertion_predicate);
   _clone_predicate_to_false_path_loop.clone_template_assertion_predicate(template_assertion_predicate);
   template_assertion_predicate.kill(_phase->igvn());
diff --git a/src/hotspot/share/opto/predicates.hpp b/src/hotspot/share/opto/predicates.hpp
index 90731bddccd..6019b8ab40d 100644
--- a/src/hotspot/share/opto/predicates.hpp
+++ b/src/hotspot/share/opto/predicates.hpp
@@ -1091,9 +1091,8 @@ class CreateAssertionPredicatesVisitor : public PredicateVisitor {
   Node* const _old_target_loop_entry;
   Node* _current_predicate_chain_head;
   PhaseIdealLoop* const _phase;
-  bool _has_hoisted_check_parse_predicates;
   const NodeInLoopBody& _node_in_loop_body;
-  const bool _clone_template;
+  const bool _kill_old_template;
 
   TemplateAssertionPredicate
   clone_template_and_replace_init_input(const TemplateAssertionPredicate& template_assertion_predicate) const;
@@ -1104,12 +1103,11 @@ class CreateAssertionPredicatesVisitor : public PredicateVisitor {
 
  public:
   CreateAssertionPredicatesVisitor(CountedLoopNode* target_loop_head, PhaseIdealLoop* phase,
-                                   const NodeInLoopBody& node_in_loop_body, bool clone_template);
+                                   const NodeInLoopBody& node_in_loop_body, bool kill_old_template);
   NONCOPYABLE(CreateAssertionPredicatesVisitor);
 
   using PredicateVisitor::visit;
 
-  void visit(const ParsePredicate& parse_predicate) override;
   void visit(const TemplateAssertionPredicate& template_assertion_predicate) override;
 };
 
@@ -1178,7 +1176,6 @@ class CloneUnswitchedLoopPredicatesVisitor : public PredicateVisitor {
   ClonePredicateToTargetLoop _clone_predicate_to_false_path_loop;
 
   PhaseIdealLoop* const _phase;
-  bool _has_hoisted_check_parse_predicates;
 
  public:
   CloneUnswitchedLoopPredicatesVisitor(LoopNode* true_path_loop_head,
diff --git a/test/hotspot/jtreg/compiler/predicates/assertion/TestAssertionPredicates.java b/test/hotspot/jtreg/compiler/predicates/assertion/TestAssertionPredicates.java
index c6c9325408e..ea8c627187d 100644
--- a/test/hotspot/jtreg/compiler/predicates/assertion/TestAssertionPredicates.java
+++ b/test/hotspot/jtreg/compiler/predicates/assertion/TestAssertionPredicates.java
@@ -24,103 +24,205 @@
 
 /*
  * @test id=Xbatch
- * @bug 8288981 8350579
+ * @bug 8288981 8350579 8350577
  * @summary Test all possible cases in which Assertion Predicates are required such that the graph is not left in a
  *          broken state to trigger assertions. Additional tests ensure the correctness of the implementation.
  *          All tests additionally -XX:+AbortVMOnCompilationFailure which would catch bad graphs as a result of missing
             or wrong Assertion Predicates where we simply bail out of C2 compilation.
  * @run main/othervm -Xbatch
  *                   -XX:+UnlockDiagnosticVMOptions -XX:+AbortVMOnCompilationFailure
- *                   -XX:CompileCommand=compileonly,compiler.predicates.TestAssertionPredicates::*
- *                   -XX:CompileCommand=dontinline,compiler.predicates.TestAssertionPredicates::*
- *                   compiler.predicates.TestAssertionPredicates Xbatch
+ *                   -XX:CompileCommand=compileonly,compiler.predicates.assertion.TestAssertionPredicates::*
+ *                   -XX:CompileCommand=dontinline,compiler.predicates.assertion.TestAssertionPredicates::*
+ *                   compiler.predicates.assertion.TestAssertionPredicates Xbatch
  */
 
 /*
  * @test id=NoTieredCompilation
- * @bug 8288981 8350579
-
+ * @bug 8288981 8350579 8350577
  * @run main/othervm -Xbatch -XX:-TieredCompilation
  *                   -XX:+UnlockDiagnosticVMOptions -XX:+AbortVMOnCompilationFailure
- *                   -XX:CompileCommand=compileonly,compiler.predicates.TestAssertionPredicates::*
- *                   -XX:CompileCommand=dontinline,compiler.predicates.TestAssertionPredicates::*
- *                   compiler.predicates.TestAssertionPredicates NoTieredCompilation
+ *                   -XX:CompileCommand=compileonly,compiler.predicates.assertion.TestAssertionPredicates::*
+ *                   -XX:CompileCommand=dontinline,compiler.predicates.assertion.TestAssertionPredicates::*
+ *                   compiler.predicates.assertion.TestAssertionPredicates NoTieredCompilation
  */
 
 /*
  * @test id=Xcomp
- * @bug 8288981 8350579
+ * @bug 8288981 8350579 8350577
  * @run main/othervm -Xcomp
  *                   -XX:+UnlockDiagnosticVMOptions -XX:+AbortVMOnCompilationFailure
- *                   -XX:CompileCommand=compileonly,compiler.predicates.TestAssertionPredicates::*
- *                   -XX:CompileCommand=dontinline,compiler.predicates.TestAssertionPredicates::*
- *                   -XX:CompileCommand=inline,compiler.predicates.TestAssertionPredicates::inline
- *                   compiler.predicates.TestAssertionPredicates Xcomp
+ *                   -XX:CompileCommand=compileonly,compiler.predicates.assertion.TestAssertionPredicates::*
+ *                   -XX:CompileCommand=dontinline,compiler.predicates.assertion.TestAssertionPredicates::*
+ *                   -XX:CompileCommand=inline,compiler.predicates.assertion.TestAssertionPredicates::inline
+ *                   compiler.predicates.assertion.TestAssertionPredicates Xcomp
+ */
+
+/*
+ * @test id=XcompNoTiered
+ * @bug 8288981 8350577
+ * @run main/othervm -Xcomp -XX:-TieredCompilation
+ *                   -XX:+UnlockDiagnosticVMOptions -XX:+AbortVMOnCompilationFailure
+ *                   -XX:CompileCommand=compileonly,compiler.predicates.assertion.TestAssertionPredicates::*
+ *                   -XX:CompileCommand=dontinline,compiler.predicates.assertion.TestAssertionPredicates::*
+ *                   -XX:CompileCommand=inline,compiler.predicates.assertion.TestAssertionPredicates::inline
+ *                   compiler.predicates.assertion.TestAssertionPredicates XcompNoTiered
  */
 
 /*
  * @test id=LoopMaxUnroll0
- * @bug 8288981 8350579
+ * @bug 8288981 8350579 8350577
  * @requires vm.compiler2.enabled
  * @run main/othervm -Xcomp -XX:LoopMaxUnroll=0
  *                   -XX:+UnlockDiagnosticVMOptions -XX:+AbortVMOnCompilationFailure
- *                   -XX:CompileCommand=compileonly,compiler.predicates.TestAssertionPredicates::*
- *                   -XX:CompileCommand=dontinline,compiler.predicates.TestAssertionPredicates::*
- *                   compiler.predicates.TestAssertionPredicates LoopMaxUnroll0
+ *                   -XX:CompileCommand=compileonly,compiler.predicates.assertion.TestAssertionPredicates::*
+ *                   -XX:CompileCommand=dontinline,compiler.predicates.assertion.TestAssertionPredicates::*
+ *                   compiler.predicates.assertion.TestAssertionPredicates LoopMaxUnroll0
+ */
+
+/*
+ * @test id=LoopMaxUnroll2
+ * @bug 8288981 8350577
+ * @requires vm.compiler2.enabled
+ * @run main/othervm -Xcomp -XX:LoopMaxUnroll=2
+ *                   -XX:+UnlockDiagnosticVMOptions -XX:+AbortVMOnCompilationFailure
+ *                   -XX:CompileCommand=compileonly,compiler.predicates.assertion.TestAssertionPredicates::*
+ *                   -XX:CompileCommand=dontinline,compiler.predicates.assertion.TestAssertionPredicates::*
+ *                   compiler.predicates.assertion.TestAssertionPredicates LoopMaxUnroll2
+ */
+
+/*
+ * @test id=LoopUnrollLimit40
+ * @bug 8288981 8350577
+ * @requires vm.compiler2.enabled
+ * @run main/othervm -Xcomp -XX:LoopUnrollLimit=40
+ *                   -XX:+UnlockDiagnosticVMOptions -XX:+AbortVMOnCompilationFailure
+ *                   -XX:CompileCommand=compileonly,compiler.predicates.assertion.TestAssertionPredicates::*
+ *                   -XX:CompileCommand=dontinline,compiler.predicates.assertion.TestAssertionPredicates::*
+ *                   compiler.predicates.assertion.TestAssertionPredicates LoopUnrollLimit40
+ */
+
+/*
+ * @test id=LoopUnrollLimit150
+ * @bug 8288981 8350577
+ * @requires vm.compiler2.enabled
+ * @run main/othervm -Xcomp -XX:LoopUnrollLimit=150
+ *                   -XX:+UnlockDiagnosticVMOptions -XX:+AbortVMOnCompilationFailure
+ *                   -XX:CompileCommand=compileonly,compiler.predicates.assertion.TestAssertionPredicates::*
+ *                   -XX:CompileCommand=dontinline,compiler.predicates.assertion.TestAssertionPredicates::*
+ *                   compiler.predicates.assertion.TestAssertionPredicates LoopUnrollLimit150
+ */
+
+/*
+ * @test id=UseProfiledLoopPredicateFalse
+ * @bug 8288981 8350577
+ * @requires vm.compiler2.enabled
+ * @run main/othervm -Xcomp -XX:-UseProfiledLoopPredicate
+ *                   -XX:+UnlockDiagnosticVMOptions -XX:+AbortVMOnCompilationFailure
+ *                   -XX:CompileCommand=compileonly,compiler.predicates.assertion.TestAssertionPredicates::*
+ *                   -XX:CompileCommand=dontinline,compiler.predicates.assertion.TestAssertionPredicates::*
+ *                   compiler.predicates.assertion.TestAssertionPredicates NoProfiledLoopPredicate
+ */
+
+/*
+ * @test id=DataUpdate
+ * @key randomness
+ * @bug 8288981 8350577
+ * @requires vm.compiler2.enabled
+ * @run main/othervm -Xcomp -XX:+UnlockDiagnosticVMOptions -XX:+StressGCM -XX:+AbortVMOnCompilationFailure
+ *                   -XX:CompileCommand=compileonly,compiler.predicates.assertion.TestAssertionPredicates::*
+ *                   -XX:CompileCommand=dontinline,compiler.predicates.assertion.TestAssertionPredicates::*
+ *                   compiler.predicates.assertion.TestAssertionPredicates DataUpdate
+ */
+
+/*
+ * @test id=CloneDown
+ * @bug 8288981 8350577
+ * @requires vm.compiler2.enabled
+ * @run main/othervm -Xcomp -XX:-BlockLayoutByFrequency -XX:+UnlockDiagnosticVMOptions -XX:+AbortVMOnCompilationFailure
+ *                   -XX:CompileCommand=compileonly,compiler.predicates.assertion.TestAssertionPredicates::*
+ *                   -XX:CompileCommand=dontinline,compiler.predicates.assertion.TestAssertionPredicates::*
+ *                   compiler.predicates.assertion.TestAssertionPredicates CloneDown
  */
 
 /*
  * @test id=StressXcomp
- * @bug 8288981 8350579
+ * @key randomness
+ * @bug 8288981 8350579 8350577
  * @requires vm.compiler2.enabled
  * @run main/othervm -Xcomp -XX:+UnlockDiagnosticVMOptions -XX:+StressIGVN -XX:+StressGCM -XX:+AbortVMOnCompilationFailure
- *                   -XX:CompileCommand=compileonly,compiler.predicates.TestAssertionPredicates::*
- *                   -XX:CompileCommand=dontinline,compiler.predicates.TestAssertionPredicates::*
- *                   compiler.predicates.TestAssertionPredicates Stress
+ *                   -XX:CompileCommand=compileonly,compiler.predicates.assertion.TestAssertionPredicates::*
+ *                   -XX:CompileCommand=dontinline,compiler.predicates.assertion.TestAssertionPredicates::*
+ *                   compiler.predicates.assertion.TestAssertionPredicates Stress
  */
 
 /*
  * @test id=StressXbatch
- * @bug 8288981 8350579
+ * @key randomness
+ * @bug 8288981 8350579 8350577
  * @requires vm.compiler2.enabled
  * @run main/othervm -Xbatch -XX:+UnlockDiagnosticVMOptions -XX:+StressIGVN -XX:+StressGCM -XX:+AbortVMOnCompilationFailure
- *                   -XX:CompileCommand=compileonly,compiler.predicates.TestAssertionPredicates::*
- *                   -XX:CompileCommand=dontinline,compiler.predicates.TestAssertionPredicates::*
- *                   compiler.predicates.TestAssertionPredicates Stress
+ *                   -XX:CompileCommand=compileonly,compiler.predicates.assertion.TestAssertionPredicates::*
+ *                   -XX:CompileCommand=dontinline,compiler.predicates.assertion.TestAssertionPredicates::*
+ *                   compiler.predicates.assertion.TestAssertionPredicates Stress
  */
 
 /*
- * @test id=NoLoopPredication
- * @bug 8288981 8350579
+ * @test id=NoLoopPredicationXcomp
+ * @bug 8288981 8350577
+ * @requires vm.compiler2.enabled
+ * @run main/othervm -Xcomp -XX:-UseLoopPredicate
+ *                   -XX:+UnlockDiagnosticVMOptions -XX:+AbortVMOnCompilationFailure
+ *                   -XX:CompileCommand=compileonly,compiler.predicates.assertion.TestAssertionPredicates::*
+ *                   -XX:CompileCommand=dontinline,compiler.predicates.assertion.TestAssertionPredicates::*
+ *                   compiler.predicates.assertion.TestAssertionPredicates NoLoopPredication
+ */
+
+/*
+ * @test id=NoLoopPredicationXbatch
+ * @bug 8288981 8350579 8350577
  * @requires vm.compiler2.enabled
  * @run main/othervm -Xbatch -XX:-UseLoopPredicate
  *                   -XX:+UnlockDiagnosticVMOptions -XX:+AbortVMOnCompilationFailure
- *                   -XX:CompileCommand=compileonly,compiler.predicates.TestAssertionPredicates::*
- *                   -XX:CompileCommand=dontinline,compiler.predicates.TestAssertionPredicates::*
- *                   compiler.predicates.TestAssertionPredicates NoLoopPredication
+ *                   -XX:CompileCommand=compileonly,compiler.predicates.assertion.TestAssertionPredicates::*
+ *                   -XX:CompileCommand=dontinline,compiler.predicates.assertion.TestAssertionPredicates::*
+ *                   compiler.predicates.assertion.TestAssertionPredicates NoLoopPredication
  */
 
 /*
  * @test id=NoFlags
- * @bug 8288981 8350579
- * @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+AbortVMOnCompilationFailure
- *                    compiler.predicates.TestAssertionPredicates NoFlags
+ * @bug 8288981 8350579 8350577
+ * @run main compiler.predicates.assertion.TestAssertionPredicates NoFlags
  */
 
-package compiler.predicates;
+package compiler.predicates.assertion;
 
 public class TestAssertionPredicates {
     static int[] iArrShort = new int[10];
     static int[] iArr = new int[200];
     static int[] iArr2 = new int[200];
     static int[] iArr3 = new int[300];
+    static int[] iArrNull = null;
+    static int[][] iArr2D = new int[10][10];
     static short[] sArr = new short[10];
+    static float[] fArr = new float[10];
+    static float[][] fArr2D = new float[10][10];
 
-    static boolean flag;
+    static boolean flag, flag2, flagTrue = true;
+    static boolean flagFalse, flagFalse2;
     static int iFld = 34;
     static int iFld2, iFld3;
+    static long lFld, lFldOne = 1;
     static float fFld;
+    static short sFld;
     static short five = 5;
+    static byte byFld;
+    volatile byte byFldVol;
+
+    static class Foo {
+        int iFld;
+    }
+
+    static Foo foo = new Foo();
 
 
     public static void main(String[] args) {
@@ -140,32 +242,553 @@ public class TestAssertionPredicates {
                     test8332501();
                 }
             }
+            case "NoProfiledLoopPredicate" -> testWithPartialPeelingFirst();
             case "LoopMaxUnroll0" -> {
+                testPeeling();
+                testPeelingTwice();
+                testPeelingThreeTimes();
+                testUnswitchingThenPeeling();
+                testPeelingThenUnswitchingThenPeeling();
+                testPeelingThenUnswitchingThenPeelingThenPreMainPost();
                 testDyingRuntimePredicate();
                 testDyingNegatedRuntimePredicate();
             }
+            case "LoopMaxUnroll2" -> {
+                testPeelMainLoopAfterUnrollingThenPreMainPost();
+                testPeelMainLoopAfterUnrolling2();
+            }
+            case "LoopUnrollLimit40" -> testPeelMainLoopAfterUnrollingThenPreMainPostThenUnrolling();
+            case "LoopUnrollLimit150" -> {
+                testUnrolling8();
+                testUnrolling16();
+                testPeelingUnrolling16();
+            }
             case "Xcomp" -> {
+                testPreMainPost();
+                testUnrolling2();
+                testUnrolling4();
+                testPeelingThenPreMainPost();
+                testUnswitchingThenPeelingThenPreMainPost();
                 testDyingInitializedAssertionPredicate();
+                test8288981();
+                test8288941();
+                testRemovingParsePredicatesThenMissingTemplates();
+                iFld = -1;
+                test8292507();
+                TestAssertionPredicates t = new TestAssertionPredicates();
+                t.test8296077();
+                test8308504No2();
+                test8307131();
+                test8308392No1();
+                iFld = -50000;
+                test8308392No2();
+                test8308392No3();
+                test8308392No4();
+                test8308392No5();
+                test8308392No6();
+                test8308392No7();
+                iFld = 0;
+                test8308392No8();
+                runTest8308392No9();
+                test8308392No10();
+                testSplitIfCloneDownWithOpaqueAssertionPredicate();
+            }
+            case "XcompNoTiered" -> {
+                TestAssertionPredicates t = new TestAssertionPredicates();
+                for (int i = 0; i < 10; i++) {
+                    t.test8308504();
+                    test8308504No2();
+                }
+            }
+            case "DataUpdate" -> {
+                for (int i = 0; i < 10; i++) {
+                    // The following tests create large arrays. Limit the number of invocations to reduce the time spent.
+                    flag = !flag;
+                    testDataUpdateUnswitchingPeelingUnroll();
+                    testDataUpdateUnswitchUnroll();
+                    testDataUpdateUnroll();
+                    testDataUpdatePeelingUnroll();
+                }
+            }
+            case "CloneDown" -> {
+                for (int i = 0; i < 100; i++) {
+                    // The following tests create large arrays. Limit the number of invocations to reduce the time spent.
+                    testTrySplitUpNonOpaqueExpressionNode();
+                    testTrySplitUpOpaqueLoopInit();
+                }
             }
             case "NoLoopPredication", "NoFlags", "Stress" -> {
-                for (int i = 0; i < 10000; i++) {
-                    runAllTests();
-                }
+                runAllFastTests();
             }
             default -> throw new RuntimeException("invalid arg");
         }
     }
 
-    static void runAllTests() {
-        testTemplateAssertionPredicateNotRemovedHalt();
-        testTemplateAssertionPredicateNotRemovedMalformedGraph();
-        testDyingRuntimePredicate();
-        testDyingNegatedRuntimePredicate();
-        testDyingInitializedAssertionPredicate();
-        test8305428();
-        test8305428No2();
-        test8320920();
-        test8332501();
+    // Runs almost all tests except for the heavy ones like the testData*() tests.
+    static void runAllFastTests() {
+        for (int i = 0; i < 10000; i++) {
+            testPeeling();
+            testPeelingTwice();
+            testPeelingThreeTimes();
+            testUnswitchingThenPeeling();
+            testPeelingThenUnswitchingThenPeeling();
+            testPeelingThenUnswitchingThenPeelingThenPreMainPost();
+            testDyingRuntimePredicate();
+            testDyingNegatedRuntimePredicate();
+            testPeelMainLoopAfterUnrollingThenPreMainPost();
+            testPeelMainLoopAfterUnrolling2();
+            testUnrolling8();
+            testUnrolling16();
+            testPeelingUnrolling16();
+            testPreMainPost();
+            testUnrolling2();
+            testUnrolling4();
+            testPeelingThenPreMainPost();
+            testUnswitchingThenPeelingThenPreMainPost();
+            testDyingInitializedAssertionPredicate();
+            test8288981();
+            test8288941();
+            testRemovingParsePredicatesThenMissingTemplates();
+            iFld = -1;
+            test8292507();
+            test8307131();
+            test8308392No1();
+            iFld = -50000;
+            test8308392No2();
+            test8308392No3();
+            test8308392No4();
+            test8308392No5();
+            test8308392No6();
+            test8308392No7();
+            iFld = 0;
+            test8308392No8();
+            runTest8308392No9();
+            test8308392No10();
+            testSplitIfCloneDownWithOpaqueAssertionPredicate();
+            testTemplateAssertionPredicateNotRemovedHalt();
+            testTemplateAssertionPredicateNotRemovedMalformedGraph();
+            testDyingRuntimePredicate();
+            testDyingNegatedRuntimePredicate();
+            testDyingInitializedAssertionPredicate();
+            test8305428();
+            test8305428No2();
+            test8320920();
+            test8332501();
+            test8308504();
+            test8308504No2();
+            testBackToBackLoopLimitCheckPredicate();
+            testTrySplitUpNonOpaqueExpressionNode();
+            testTrySplitUpOpaqueLoopInit();
+        }
+    }
+
+        // -Xcomp -XX:CompileCommand=compileonly,Test*::*
+    static void testPreMainPost() {
+        int x = 0;
+        for (int i = 1; i > five; i -= 2) {
+            x = iArr[i];
+            if (x == i) {
+                iFld = 34;
+            }
+        }
+    }
+
+    // -Xcomp -XX:CompileCommand=compileonly,Test*::*
+    static void testUnrolling2() {
+        for (int i = 3; i > five; i -= 2) {
+            int x = 0;
+            x = iArr[i];
+            if (x == i) {
+                iFld = 34;
+            }
+        }
+    }
+
+    // -Xcomp -XX:CompileCommand=compileonly,Test*::*
+    static void testUnrolling4() {
+        int x = 0;
+        for (int i = 7; i > five; i -= 2) {
+            x = iArr[i];
+            if (x == i) {
+                iFld = 34;
+            }
+        }
+    }
+
+    // -Xcomp -XX:LoopUnrollLimit=150 -XX:CompileCommand=compileonly,Test*::*
+    static void testUnrolling8() {
+        int x = 0;
+        for (int i = 15; i > five; i -= 2) {
+            x = iArr[i];
+            if (x == i) {
+                iFld = 34;
+            }
+        }
+    }
+
+    // -Xcomp -XX:LoopUnrollLimit=150 -XX:CompileCommand=compileonly,Test*::*
+    static void testUnrolling16() {
+        int x = 0;
+        for (int i = 31; i > five; i -= 2) {
+            x = iArr[i];
+            if (x == i) {
+                iFld = 34;
+            }
+        }
+    }
+
+    // -Xcomp -XX:LoopUnrollLimit=150 -XX:CompileCommand=compileonly,Test*::*
+    // Loop is first peeled and then unrolled.
+    static void testPeelingUnrolling16() {
+        int three = 0;
+        int limit = 2;
+        long l1 = 34L;
+        long l2 = 35L;
+        long l3 = 36L;
+        long l4 = 37L;
+
+        for (; limit < 4; limit *= 2);
+        for (int i = 2; i < limit; i++) {
+            three = 33;
+        }
+
+        for (int i = 33; i > five; i -= 2) {
+            int x = iArr[i];
+            if (x == i) {
+                iFld += 34;
+            }
+
+            if (i > three) {
+                // DivLs add 30 to the loop body count and we hit LoopUnrollLimit.
+                // After CCP, these statements are folded away and we can unroll this loop.
+                l1 /= lFld;
+                l2 /= lFld;
+                l3 /= lFld;
+                l4 /= lFld;
+            }
+
+            if (flag) {
+                return;
+            }
+        }
+    }
+
+    // -Xcomp -XX:LoopMaxUnroll=0 -XX:CompileCommand=compileonly,Test*::*
+    static void testPeeling() {
+        for (int i = 1; i > five; i -= 2) {
+            int arrLoad = iArr[i];
+
+            if (flag) {
+                return;
+            }
+
+            if (arrLoad == i) {
+                iFld = 34;
+            }
+        }
+    }
+
+    // -Xcomp -XX:LoopMaxUnroll=0 -XX:CompileCommand=compileonly,Test*::*
+    private static void testPeelingTwice() {
+        for (int i = 3; i > five; i -= 2) {
+            int arrLoad = iArr[i];
+
+            if (flag) {
+                iFld2 = 3;
+                return;
+            }
+
+            if (i < 2 && flag2) {
+                return;
+            }
+
+            if (arrLoad == i) {
+                iFld = 34;
+            }
+        }
+    }
+
+    // -Xcomp -XX:LoopMaxUnroll=0 -XX:CompileCommand=compileonly,Test*::*
+    private static void testPeelingThreeTimes() {
+        for (int i = 5; i > five; i -= 2) {
+            int arrLoad = iArr[i];
+
+            if (iFld2 == 4) {
+                iFld2 = 20;
+                return;
+            }
+
+            if (i < 4 && iFld2 == 3) {
+                iFld2 = 42;
+                return;
+            }
+
+            if (i < 2 && iFld2 == 2) {
+                iFld2 = 52;
+                return;
+            }
+
+            if (arrLoad == i) {
+                iFld = 34;
+            }
+        }
+    }
+
+    // -Xcomp -XX:LoopMaxUnroll=0 -XX:CompileCommand=compileonly,Test*::*
+    static void testUnswitchingThenPeeling() {
+        for (int i = 1; i > five; i -= 2) {
+            iFld = iArr[i];
+
+            if (flag2) {
+                iFld2 = 24;
+            }
+
+            if (flag) {
+                return;
+            }
+
+            if (iFld == i) {
+                iFld = 34;
+            }
+        }
+    }
+
+    // -Xcomp -XX:CompileCommand=compileonly,Test*::test* -XX:LoopMaxUnroll=0
+    static void testPeelingThenUnswitchingThenPeeling() {
+        int zero = 34;
+        int limit = 2;
+
+        for (; limit < 4; limit *= 2);
+        for (int i = 2; i < limit; i++) {
+            zero = 0;
+        }
+
+        for (int i = 3; i > five; i -= 2) {
+            iFld = iArr[i];
+            if (iFld == i) {
+                fFld = 324;
+            }
+
+            if (flag) { // 1) Triggers loop peeling
+                return;
+            }
+
+            int k = iFld2 + i * zero; // loop variant before CCP
+
+            if (k == 34) { // 2) After CCP loop invariant -> triggers loop unswitching
+                iFld = 3;
+
+            } else {
+                iFld = iArr2[i]; // 3) After loop unswitching, triggers loop peeling again.
+            }
+        }
+    }
+
+    // -Xcomp -XX:CompileCommand=compileonly,Test*::test* -XX:LoopMaxUnroll=0
+    static void testPeelingThenUnswitchingThenPeelingThenPreMainPost() {
+        int zero = 34;
+        int limit = 2;
+
+        for (; limit < 4; limit *= 2);
+        for (int i = 2; i < limit; i++) {
+            zero = 0;
+        }
+
+        for (int i = 5; i > five; i -= 2) {
+            iFld = iArr[i];
+            if (iFld == i) {
+                fFld = 324;
+            }
+
+            if (flag) { // 1) Triggers loop peeling
+                return;
+            }
+
+            int k = iFld2 + i * zero; // loop variant before CCP
+
+            if (k == 34) { // 2) After CCP loop invariant -> triggers loop unswitching
+                iFld = 3;
+
+            } else {
+                iFld = iArr2[i]; // 3) After loop unswitching, triggers loop peeling again, then pre/main/post
+            }
+        }
+    }
+
+    // -Xcomp -XX:CompileCommand=compileonly,Test*::*
+    static void testPeelingThenPreMainPost() {
+        int three = 0;
+        int limit = 2;
+        long l1 = 34L;
+        long l2 = 35L;
+
+        for (; limit < 4; limit *= 2);
+        for (int i = 2; i < limit; i++) {
+            three = 3;
+        }
+
+        for (int i = 3; i > five; i -= 2) {
+            iFld = iArr[i];
+            if (iFld == i) {
+                iFld = 34;
+            }
+
+            if (i > three) {
+                // DivLs add 30 to the loop body count and we hit LoopUnrollLimit.
+                // After CCP, these statements are folded away and we can unroll this loop.
+                l1 /= lFld;
+                l2 /= lFld;
+            }
+
+            if (flag) {
+                return;
+            }
+        }
+    }
+
+    // -Xcomp -XX:CompileCommand=compileonly,Test*::*
+    static void testUnswitchingThenPeelingThenPreMainPost() {
+        int three = 0;
+        int limit = 2;
+        long l1 = 34L;
+        long l2 = 35L;
+
+        for (; limit < 4; limit *= 2);
+        for (int i = 2; i < limit; i++) {
+            three = 3;
+        }
+
+        for (int i = 3; i > five; i -= 2) {
+            iFld = iArr[i];
+            if (iFld == i) {
+                iFld = 34;
+            }
+
+            if (i > three) {
+                // DivLs add 30 to the loop body count and we hit LoopUnrollLimit.
+                // After CCP, these statements are folded away and we can unroll this loop.
+                l1 /= lFld;
+                l2 /= lFld;
+            }
+
+            if (flag2) {
+                iFld2 = 34;
+            }
+
+            if (flag) {
+                return;
+            }
+        }
+    }
+
+      // -XX:-UseProfiledLoopPredicate -Xcomp -XX:CompileCommand=compileonly,Test*::test*
+    static void testWithPartialPeelingFirst() {
+        int i = 3;
+
+        if (i > five) {
+            while (true) {
+
+                // Found as loop head in ciTypeFlow, but both path inside loop -> head not cloned.
+                // As a result, this head has the safepoint as backedge instead of the loop exit test
+                // and we cannot create a counted loop (yet). We first need to partial peel.
+                if (flag) {
+                }
+
+                // Loop exit test.
+                if (i <= five) {
+                    break;
+                }
+                // <-- Partial Peeling CUT -->
+                // Safepoint
+                iFld = iArr[i];
+                if (iFld == i) {
+                    fFld = 324;
+                }
+                i--;
+            }
+        }
+    }
+
+    // -Xcomp -XX:CompileCommand=compileonly,Test*::test* -XX:LoopUnrollLimit=40
+    static void testPeelMainLoopAfterUnrollingThenPreMainPostThenUnrolling() {
+        int zero = 34;
+        int limit = 2;
+
+        for (; limit < 4; limit *= 2);
+        for (int i = 2; i < limit; i++) {
+            zero = 0;
+        }
+
+        // 1) Pre/Main/Post
+        // 2) Unroll
+        // 3) Peel main loop
+        // 4) Pre/Main/Post peeled main loop
+        // 5) Unroll new main loop
+        for (int i = 13; i > five; i -= 2) {
+            iFld = iArr[i];
+            if (iFld == i) {
+                fFld = 324;
+            }
+            if (i < 13) { // Always true and folded in main loop because of executing pre-loop at least once -> i = [min_short..11]
+
+                int k = iFld2 + i * zero; // Loop variant before CCP
+                if (k  == 40) { // After CCP: Loop Invariant -> Triggers Loop Peeling of main loop
+                    return;
+                }
+            }
+        }
+    }
+
+    // -Xcomp -XX:CompileCommand=compileonly,Test*::test* -XX:LoopMaxUnroll=2
+    static void testPeelMainLoopAfterUnrollingThenPreMainPost() {
+        int zero = 34;
+        int limit = 2;
+
+        for (; limit < 4; limit *= 2);
+        for (int i = 2; i < limit; i++) {
+            zero = 0;
+        }
+
+        for (int i = 9; i > five; i -= 2) {
+            iFld = iArr[i];
+            if (iFld == i) {
+                fFld = 324;
+            }
+            if (i < 9) { // Always true and folded in main loop because of executing pre-loop at least once -> i = [min_short..7]
+                int k = iFld2 + i * zero; // Loop variant before CCP
+                if (k  == 40) { // 2) After CCP: Loop Invariant -> Triggers Loop Peeling of main loop
+                    return;
+                } else {
+                    iFld3 = iArr2[i]; // After Peeling Main Loop: Check can be eliminated with Range Check Elimination -> 3) apply Pre/Main/Post and then 4) Range Check Elimination
+                }
+            }
+        }
+    }
+
+    // -Xcomp -XX:CompileCommand=compileonly,Test*::test* -XX:LoopMaxUnroll=2
+    static void testPeelMainLoopAfterUnrolling2() {
+        int zero = 34;
+        int limit = 2;
+
+        for (; limit < 4; limit *= 2);
+        for (int i = 2; i < limit; i++) {
+            zero = 0;
+        }
+
+        for (int i = 7; i > five; i -= 2) {
+            iFld = iArr[i];
+            if (iFld == i) {
+                fFld = 324;
+            }
+            if (i < 7) { // Always true and folded in main loop because of executing pre-loop at least once -> i = [min_short..5]
+
+                int k = iFld2 + i * zero; // Loop variant before CCP
+                if (k  == 40) { // 2) After CCP: Loop Invariant -> Triggers Loop Peeling of main loop
+                    return;
+                }
+
+            }
+        }
     }
 
     // Corresponds to JDK-8305428.
@@ -397,7 +1020,299 @@ public class TestAssertionPredicates {
         }
     }
 
-    /**
+    /*
+     * Tests to verify correct data dependencies update when splitting loops for which we created Hoisted Predicates.
+     * If they are not updated correctly, we could wrongly execute an out-of-bounds load resulting in a segfault.
+     */
+
+    // -Xcomp -XX:CompileCommand=compileonly,Test*::test* -XX:+StressGCM -XX:CompileCommand=dontinline,*::dontInline
+    static void testDataUpdateUnswitchingPeelingUnroll() {
+        long l1 = 34L;
+        long l2 = 566L;
+
+        int hundred = 0;
+        for (int i = 0; i < 8; i++) {
+            if ((i % 2) == 0) {
+                hundred = 100;
+            }
+        }
+
+        Foo[] fooArr;
+        int limit;
+        if (flag) {
+            limit = 3;
+            fooArr = new Foo[20000001];
+        } else {
+            limit = 5;
+            fooArr = new Foo[40000001];
+        }
+        for (int i = 0; i < limit; i++) {
+            fooArr[10000000 * i] = foo;
+        }
+        // 9) This loop is not optimized in any way because we have a call inside the loop. This loop is only required
+        //    to trigger a crash.
+        // 10) During GCM with StressGCM, we could schedule the LoadN from the main loop before checking if we should
+        //     enter the main loop. When 'flag' is true, we only have an array of size 20000001. We then perform
+        //     the LoadN[3*10000000] and crash when the memory is unmapped.
+        for (float f = 0; f < 1.6f; f += 0.5f) {
+            // 2) Loop is unswitched
+            // 3) Both loop are peeled (we focus on one of those since both are almost identical except for the
+            //    unswitched condition):
+            //      Peeled iteration [i = 0]
+            //      Loop [i = 1..4, stride = 1]
+            // 4) Loop unroll policy now returns true.
+            //    Peeled iteration [i = 0]
+            //    - Loop is pre-main-posted
+            //        Loop-pre[i = 1..4, stride = 1]
+            //        Loop-main[i = 2..4, stride = 1]
+            //        Loop-post[i = 2..4, stride = 1]
+            //    - Loop is unrolled once
+            //        Loop-pre[i = 1..4, stride = 1]
+            //        Loop-main[i = 2..4, stride = 2]
+            //        Loop-post[i = 2..4, stride = 1]
+            // 5) During IGVN, we find that the backedge is never taken for main loop (we would over-iteratre) and it
+            //    collapses to a single iteration.
+            // 6) After loop opts, the pre-loop is removed.
+            for (int i = 0; i < limit; i++) {
+                // 1) Hoisted with a Hoisted Range Check Predicate
+                // 7) The 'i = 1' value is propagated to the single main loop iteration and we have the following
+                //    fixed-index accesses:
+                //      LoadN[2*10000000];
+                //      LoadN[3*10000000];
+                // 8) Without explicitly pinning the LoadN from the main loop at the main loop entry (i.e. below the
+                //    zero trip guard), they are still pinned below the Hoisted Range Check Predicate before the loop.
+                fooArr[i * 10000000].iFld += 34;
+                if (flagFalse) {
+                    return; //Enables peeling
+                }
+
+                // 3) hundred only known to be 100 after second loop opts -> becomes dead.
+                //    The expense statements are folded away and we can unroll this loop because we are below the
+                //    LoopUnrollLimit again.
+                if (i > hundred) {
+                    // DivLs add 30 to the loop body count and we hit LoopUnrollLimit -> loop not unrolled
+                    l1 /= lFld;
+                    l2 /= lFld;
+                }
+
+                if (flagFalse2) { // Loop invariant -> enables Loop Unswitching
+                    iFld += 34;
+                }
+
+
+            }
+            dontInline(); // Ensure that float loop is not peeled
+        }
+    }
+
+    // -Xcomp -XX:CompileCommand=compileonly,Test*::test* -XX:+StressGCM -XX:CompileCommand=dontinline,*::dontInline
+    static void testDataUpdateUnswitchUnroll() {
+        long l1 = 34L;
+        long l2 = 566L;
+
+        int hundred = 0;
+        for (int i = 0; i < 4; i++) {
+            if ((i % 2) == 0) {
+                hundred = 100;
+            }
+        }
+
+        Foo[] fooArr;
+        int limit;
+        if (flag) {
+            limit = 2;
+            fooArr = new Foo[10000001];
+        } else {
+            limit = 3;
+            fooArr = new Foo[20000001];
+        }
+        for (int i = 0; i < limit; i++) {
+            fooArr[10000000 * i] = foo;
+        }
+        // 9) This loop is not optimized in any way because we have a call inside the loop. This loop is only required
+        //    to trigger a crash.
+        // 10) During GCM with StressGCM, we could schedule the LoadN from the main loop before checking if we should
+        //     enter the main loop. When 'flag' is true, we only have an array of size 10000001. We then perform
+        //     the LoadN[2*10000000] and crash when the memory is unmapped.
+        for (float f = 0; f < 1.6f; f += 0.5f) {
+            // 2) Loop is unswitched
+            // 4) Loop unroll policy now returns true.
+            //    - Loop is pre-main-posted
+            //        Loop-pre[i = 0..2, stride = 1]
+            //        Loop-main[i = 1..2, stride = 1]
+            //        Loop-post[i = 1..2, stride = 1]
+            //    - Loop is unrolled once
+            //        Loop-pre[i = 0..2, stride = 1]
+            //        Loop-main[i = 1..2, stride = 2]
+            //        Loop-post[i = 1..2, stride = 1]
+            // 5) During IGVN, we find that the backedge is never taken for main loop and it collapses to a single
+            //    iteration.
+            // 6) After loop opts, the pre-loop is removed.
+            for (int i = 0; i < limit; i++) {
+                // 1) Hoisted with a Hoisted Range Check Predicate
+                // 7) The 'i = 1' value is propagated to the single main loop iteration and we have the following
+                //    fixed-index accesses:
+                //      LoadN[1*10000000];
+                //      LoadN[2*10000000];
+                // 8) Without explicitly pinning the LoadN from the main loop at the main loop entry (i.e. below the
+                //    zero trip guard), they are still pinned below the Hoisted Range Check Predicate before the loop.
+                fooArr[i * 10000000].iFld += 34;
+
+                // 3) hundred only known to be 100 after second loop opts -> becomes dead.
+                //    The expense statements are folded away and we can unroll this loop because we are below the
+                //    LoopUnrollLimit again.
+                if (i > hundred) {
+                    // DivLs add 30 to the loop body count and we hit LoopUnrollLimit -> loop not unrolled
+                    l1 /= lFld;
+                    l2 /= lFld;
+                }
+
+                if (flag) { // invariant -> enabled Loop Unswitching
+                    iFld = 34;
+                }
+            }
+            dontInline(); // Ensure that float loop is not peeled
+        }
+    }
+
+    // -Xcomp -XX:CompileCommand=compileonly,Test*::test* -XX:+StressGCM -XX:CompileCommand=dontinline,*::dontInline
+    static void testDataUpdateUnroll() {
+        long l1 = 34L;
+        long l2 = 566L;
+
+        int hundred = 0;
+        for (int i = 0; i < 4; i++) {
+            if ((i % 2) == 0) {
+                hundred = 100;
+            }
+        }
+
+        Foo[] fooArr;
+        int limit;
+        if (flag) {
+            limit = 2;
+            fooArr = new Foo[10000001];
+        } else {
+            limit = 3;
+            fooArr = new Foo[20000001];
+        }
+        for (int i = 0; i < limit; i++) {
+            fooArr[10000000 * i] = foo;
+        }
+        // 8) This loop is not optimized in any way because we have a call inside the loop. This loop is only required
+        //    to trigger a crash.
+        // 9) During GCM with StressGCM, we could schedule the LoadN from the main loop before checking if we should
+        //    enter the main loop. When 'flag' is true, we only have an array of size 10000001. We then perform
+        //    the LoadN[2*10000000] and crash when the memory is unmapped.
+        for (float f = 0; f < 1.6f; f += 0.5f) {
+            // 3) Loop unroll policy now returns true.
+            //    - Loop is pre-main-posted
+            //        Loop-pre[i = 0..2, stride = 1]
+            //        Loop-main[i = 1..2, stride = 1]
+            //        Loop-post[i = 1..2, stride = 1]
+            //    - Loop is unrolled once
+            //        Loop-pre[i = 0..2, stride = 1]
+            //        Loop-main[i = 1..2, stride = 2]
+            //        Loop-post[i = 1..2, stride = 1]
+            // 4) During IGVN, we find that the backedge is never taken for main loop and it collapses to a single
+            //    iteration.
+            // 5) After loop opts, the pre-loop is removed.
+            for (int i = 0; i < limit; i++) {
+                // 1) Hoisted with a Hoisted Range Check Predicate
+                // 6) The 'i = 1' value is propagated to the single main loop iteration and we have the following
+                //    fixed-index accesses:
+                //      LoadN[1*10000000];
+                //      LoadN[2*10000000];
+                // 7) Without explicitly pinning the LoadN from the main loop at the main loop entry (i.e. below the
+                //    zero trip guard), they are still pinned below the Hoisted Range Check Predicate before the loop.
+                fooArr[i * 10000000].iFld += 34;
+
+                // 2) hundred only known to be 100 after second loop opts -> becomes dead.
+                //    The expense statements are folded away and we can unroll this loop because we are below the
+                //    LoopUnrollLimit again.
+                if (i > hundred) {
+                    // DivLs add 30 to the loop body count and we hit LoopUnrollLimit -> loop not unrolled
+                    l1 /= lFld;
+                    l2 /= lFld;
+                }
+            }
+            dontInline(); // Ensure that float loop is not peeled
+        }
+    }
+
+    // -Xcomp -XX:CompileCommand=compileonly,Test*::test* -XX:+StressGCM -XX:CompileCommand=dontinline,*::dontInline
+    static void testDataUpdatePeelingUnroll() {
+        long l1 = 34L;
+        long l2 = 566L;
+
+        int hundred = 0;
+        for (int i = 0; i < 4; i++) {
+            if ((i % 2) == 0) {
+                hundred = 100;
+            }
+        }
+
+        Foo[] fooArr;
+        int limit;
+        if (flag) {
+            limit = 3;
+            fooArr = new Foo[20000001];
+        } else {
+            limit = 5;
+            fooArr = new Foo[40000001];
+        }
+        for (int i = 0; i < limit; i++) {
+            fooArr[10000000 * i] = foo;
+        }
+        // 9) This loop is not optimized in any way because we have a call inside the loop. This loop is only required
+        //    to trigger a crash.
+        // 10) During GCM with StressGCM, we could schedule the LoadN from the main loop before checking if we should
+        //     enter the main loop. When 'flag' is true, we only have an array of size 20000001. We then perform
+        //     the LoadN[3*10000000] and crash when the memory is unmapped.
+        for (float f = 0; f < 1.6f; f += 0.5f) {
+            // 2) Loop is peeled:
+            //      Peeled iteration [i = 0]
+            //      Loop [i = 1..4, stride = 1]
+            // 4) Loop unroll policy now returns true.
+            //    Peeled iteration [i = 0]
+            //    - Loop is pre-main-posted
+            //        Loop-pre[i = 1..4, stride = 1]
+            //        Loop-main[i = 2..4, stride = 1]
+            //        Loop-post[i = 2..4, stride = 1]
+            //    - Loop is unrolled once
+            //        Loop-pre[i = 1..4, stride = 1]
+            //        Loop-main[i = 2..4, stride = 2]
+            //        Loop-post[i = 2..4, stride = 1]
+            // 5) During IGVN, we find that the backedge is never taken for main loop (we would over-iteratre) and it
+            //    collapses to a single iteration.
+            // 6) After loop opts, the pre-loop is removed.
+            for (int i = 0; i < limit; i++) {
+                // 1) Hoisted with a Hoisted Range Check Predicate
+                // 7) The 'i = 1' value is propagated to the single main loop iteration and we have the following
+                //    fixed-index accesses:
+                //      LoadN[2*10000000];
+                //      LoadN[3*10000000];
+                // 8) Without explicitly pinning the LoadN from the main loop at the main loop entry (i.e. below the
+                //    zero trip guard), they are still pinned below the Hoisted Range Check Predicate before the loop.
+                fooArr[i * 10000000].iFld += 34;
+                if (flagFalse) {
+                    return; // Enables peeling
+                }
+
+                // 3) hundred only known to be 100 after second loop opts -> becomes dead.
+                //    The expense statements are folded away and we can unroll this loop because we are below the
+                //    LoopUnrollLimit again.
+                if (i > hundred) {
+                    // DivLs add 30 to the loop body count and we hit LoopUnrollLimit -> loop not unrolled
+                    l1 /= lFld;
+                    l2 /= lFld;
+                }
+            }
+            dontInline(); // Ensure that float loop is not peeled
+        }
+    }
+
+    /*
      * Tests collected in JBS and duplicated issues
      */
 
@@ -468,4 +1383,793 @@ public class TestAssertionPredicates {
             iArr[i] = 34;
         } while (++i < 150);
     }
+
+        // -Xcomp -XX:CompileCommand=compileonly,Test*::*
+    static void test8288981() {
+        int x = 1;
+        // Sufficiently many iterations to trigger OSR
+        for (int j = 0; j < 50_000; j++) {
+            for (int i = 1; i > x; --i) {
+                float v = fArr[0] + fFld;
+                fArr2D[i + 1][x] = v;
+                iFld += v;
+            }
+        }
+    }
+
+    // -Xcomp -XX:CompileCommand=compileonly,Test*::*
+    static void test8292507() {
+        int i = iFld, j, iArr[] = new int[40];
+        while (i > 0) {
+            for (j = i; 1 > j; ++j) {
+                try {
+                    iArr[j] = 0;
+                    iArr[1] = iFld = 0;
+                } catch (ArithmeticException a_e) {
+                }
+                switch (i) {
+                    case 4:
+                    case 43:
+                        iFld2 = j;
+                }
+
+            }
+        }
+    }
+
+    // -Xcomp -XX:CompileCommand=compileonly,Test*::*
+    static void test8307131() {
+        int i21 = 6, i, i23 = 3, y, iArr2[] = new int[40];
+        for (i = 50000; 3 < i; i--) {
+            for (y = 2; y > i; y--) {
+                try {
+                    i21 = i23 / 416 / iArr2[y];
+                } catch (ArithmeticException a_e) {
+                }
+                i23 -= 3;
+            }
+        }
+        i21 -= 2;
+    }
+
+    void test8296077() {
+        int i4 = 4, iArr1[] = new int[10];
+        float f2;
+        for (f2 = 7; f2 > 4; --f2) {}
+
+        float f4 = five;
+        while (f4 < 50000) {
+            for (int i7 = (int) f4; 1 > i7; i7++) {
+                iArr1[i7] = 5;
+                if (i4 != 0) {
+                    return;
+                }
+                byFldVol = 2;
+                try {
+                    iArr1[(int) f4] = i4 = iArr1[(int) f4 + 1] % iArr1[(int) f2];
+                } catch (ArithmeticException a_e) {
+                }
+            }
+            f4++;
+        }
+    }
+
+    static void test8308392No1() {
+        int i10, i16;
+        try {
+            for (i10 = 61; i10 < 50000 ; i10++) {
+                for (i16 = 2; i16 > i10; i16--) {
+                    sFld *= iArr2D[i16][i16] = byFld *= sFld;
+                }
+            }
+        } catch (NegativeArraySizeException exc3) {
+        }
+    }
+
+    static void test8308392No2() {
+        try {
+            int j, k, i19 = 8;
+
+            for (int i = 0; i < 10; i++) {
+                for (j = 2; j < 3; ) {
+                    if (flagTrue) {
+                        iFld++;
+                        iFld2 = 34 / iFld; // Will eventually divide by zero and break infinite loop.
+                    }
+                    for (k = 2; k > j; --k) {
+                        i19 *= fArr2D[k][j] += i;
+                    }
+                }
+            }
+
+        } catch (ArithmeticException e) {
+            // Expected
+        }
+    }
+    static void test8308392No3() {
+        int i18, i19, i21, i22 = 1, iArr2[][] = new int[40][];
+        double dArr[] = new double[40];
+
+        i18 = 1;
+        for (i19 = 5; i19 < 50000; i19++) {
+            for (i21 = i18; i21 < 4; ++i21) {
+                switch (i19) {
+                    case 4:
+                        iArr2[i21 - 1][i18] = 3;
+                        try {
+                            iFld = 2 % iFld;
+                            iFld = i22;
+                        } catch (ArithmeticException a_e) {
+                        }
+                        break;
+                    case 45:
+                        i22 += dArr[i22];
+                }
+            }
+        }
+    }
+
+    static void test8308392No4() {
+        int i20, i22 = 6, i25;
+        for (i20 = 50000; i20 > 3; i20--) {
+            for (i25 = 1; i25 > i22; i25--) {
+                iArr2D[i25 + 1][i22] += fFld -= iFld;
+            }
+        }
+    }
+
+    static void test8308392No5() {
+        float f1;
+        int i20, i23, i25 = 5, i26 = 4, i27;
+        long lArr[][] = new long[10][10];
+        for (f1 = 40; f1 > 3; --f1) {
+            for (i20 = 2; 11 > i20; i20++) {
+                for (i23 = 1; i23 < 11; ) {
+                    i23++;
+                    for (i27 = (int) f1; i27 < 1; ++i27) {
+                        iFld = 3;
+                        lArr[i27][i25] = 5;
+                        if (flag) {
+                            i26 += i25;
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    static void test8308392No6() {
+        int i, i1, i2, i23 = 7, i24;
+        double dArr1[][] = new double[10][];
+        boolean bArr[] = new boolean[10];
+        for (i = 9; i < 88; i++) {
+            i2 = 1;
+            do {
+                i1 = Short.reverseBytes((short) 0);
+                for (i24 = 1; i2 < i24; --i24) {
+                    i1 %= dArr1[i24 + 1][i];
+                    switch (i23) {
+                        case 0:
+                            bArr[i] = false;
+                    }
+                }
+                i2++;
+            } while (i2 < 50000);
+        }
+    }
+
+    static void test8308392No7() {
+        int i16 = 2, i17 = 1, i18, i20, i21, i23;
+        double d2 = 86.53938;
+        long lArr[][] = new long[10][];
+        for (i18 = 1; i18 < 10; i18++) {
+            i20 = 1;
+            while (i20 < 5000) {
+                for (i21 = i23 = 1; i23 > i20; --i23) {
+                    d2 *= i16 >>= lArr[i23 + 1][i20] >>= i17;
+                }
+                i20++;
+            }
+        }
+    }
+    static void test8308392No8() {
+        int i21, i22, i25 = 1, i26 = 032, i28;
+        i21 = iFld;
+        while (--i21 > 0) {
+            for (i22 = 2; i22 < 71; i22++) {
+                for (i28 = 2; i28 > i21; --i28) {
+                    i25 %= i26;
+                    iArr2D[i28][1] ^= 5;
+                }
+            }
+            i21--;
+        }
+    }
+
+    static void runTest8308392No9() {
+        try {
+            test8308392No9();
+        } catch (ArithmeticException | ArrayIndexOutOfBoundsException e) {
+            // Expected.
+        }
+    }
+
+    static void test8308392No9() {
+        for (int i20 = 60; ; i20--) {
+            for (int i22 = 2; i22 > i20; --i22) {
+                fFld += 5;
+                iFld = iFld / 9 / iArr[i22];
+            }
+        }
+    }
+
+    static void test8308392No10() {
+        int i14, i16 = -27148, i18, i21;
+        for (i14 = 21; i16 < 9; ++i16) {
+            for (i18 = 2; i14 < i18; i18--) {
+                iArr2D[i18][i18] -= lFld = i18;
+            }
+            for (i21 = 1; i21 < 2; i21++) {}
+        }
+    }
+
+    // -Xcomp -XX:-TieredCompilation
+    static void test8308504() {
+        int iArr[][] = new int[400][400];
+        for (int i16 = 294; i16 > 6; --i16) {
+            for (int i21 = 1; i21 < 87; ++i21) {
+                for (int i23 = 2; i23 > i21; i23--) {
+                    switch (118) {
+                        case 118:
+                            iFld *= 3.4f;
+                            iArr[i23][i16] *= 5;
+                    }
+                }
+            }
+        }
+        System.nanoTime(); // Unloaded, triggers deopt
+    }
+
+    // -Xcomp -XX:-TieredCompilation
+    static void test8308504No2() {
+        int iArr[][] = new int[400][400];
+        for (int i = 294; i > 6; i--) {
+            for (int j = 1; j < 87; j++) {
+                for (int k = 2; k > j; k--) {
+                    iFld *= 3.4f;
+                    iArr[k][i] *= 5;
+                }
+            }
+        }
+        Math.pow(2, 3); // Unloaded, triggers deopt
+    }
+
+    static void testSplitIfCloneDownWithOpaqueAssertionPredicate() {
+        int p = 0, j;
+        if (flag) {
+            iArr[3] = 3;
+            dontInline();
+        }
+        int i = 1;
+        while (++i < 4) {
+            if (flag) {
+                p = 8;
+            }
+            iArr[i - 1] = 4;
+            for (j = 1; j < 3; ++j) {
+                iArr[j] = 34;
+            }
+        }
+        long n = p;
+    }
+
+    static void testTrySplitUpNonOpaqueExpressionNode() {
+        int zero = 34;
+        int limit = 2;
+        for (; limit < 4; limit *= 2);
+        for (int i = 2; i < limit; i++) {
+            flag = !flag;
+            flag2 = !flag2;
+            iFld = flag ? 50 : -50;
+            zero = 0;
+        }
+
+        for (int t = 0; t < 100; t++) {
+            // 4) Graph looks like this now:
+            // Split If is applied because the graph has the following shape:
+            //
+            //        Region  # **REGION**
+            //          |
+            //   NULL  Phi[new int[100], iArr2]  # 'iArr'
+            //     \  /
+            //     CmpU   \
+            //      |     |
+            //     Bool   | # Hoisted NullCheck from 2b)
+            //      |     |
+            //     If     /
+            //
+            //
+            // We find that we can split the If through the Region because we have a Phi input for the condition CmpU
+            //
+            // 5) We apply Split-If to split the If through the region. This requires that we also handle all the Phi nodes
+            //    belonging to the region to split through. We need to empty the block ('--- BLOCK start/end ---') by
+            //    checking all users of the Phi* node. This is done removing all user of the
+            //    phi nodes belonging to the Region to split the If through. phi nodes.
+            //    This requires that we split up all users of the phi recursively through the phi. The new users of the Phis
+            //    are then revisited again since Split-If is applied iteratively for all nodes. We stop the "splitting up"
+            //    when a user of a Phi node has its get_ctrl() at a different node than the region to split through.
+            //
+            //    We have the following graph before Split If:
+            //
+            //        Region  # **REGION**
+            //                 |
+            //                Phi
+            //                 |
+            //               LoadUB  # 'flag2'loaded either from the merged memory state of the region
+            //                 |
+            //                CmpI
+            //                 |
+            //                Bool
+            //                 |
+            //               CmoveI  # From 1)
+            //                 |
+            //              ConvI2L
+            //                 |
+            //                AddL   # First node part of Template Assertion Predicate expression of 3b).
+            //                 |
+            //               CmpUL
+            //                 |
+            //  OpaqueTemplateAssertionPredicate
+            //
+            // 6) We start applying Split If and iteratively split users of Phi nodes up. We find that all nodes including
+            //    the AddL, can be split through the new phis because they have their get_ctrl() set to the REGION.
+            //    Why isnt the control of the AddL not set to the latest control (which we usually do when having the
+            //    same loop depth) at 3b) where the Template Assertion Predicate Expression node belongs to?
+            //    The reason is that during build_loop_late_post_work(), we skip all predicates to not interfere with
+            //    Loop Predication, including the NullCheck from 2b) . Thus, we move late control up to REGION because the
+            //    if/else is already removed with a CMove in 1).
+            //
+            // 7) When splitting the AddL node, have the following graph:
+            //
+             //     Region    # **REGION**
+            //        |
+            //        |   OpaqueLoopInit
+            //        |        |
+            //       Phi    ConvI2L
+            //         \    /
+            //          AddL
+            //
+            //    We find that it's part of a Template Assertion Predicate Expression. We do not want to split such a node
+            //    to not introduce a Phi node within the expression which would mess with pattern matching to find the
+            //    OpaqueLoop* nodes from the Template Assertion Predicate If. As a solution, we "clone down" the Template
+            //    Assertion Predicate Expression by creating a clone of the entire Template Assertion Predicate Expression.
+            //    We then feed the Phi for the new Region, after splitting the If, into the AddL as part of the
+            //    Template Assertion Predicate Expression.
+            //
+            //    Note: When trying to split AddL, we first try to split its inputs, i.e. ConvI2L. But ConvI2L has its
+            //          get_ctrl() outside of the outer "for (t = ...)" loop because the OpaqueLoopInit node has a constant
+            //          as input and thus build_loop_late_post_work() will make sure that late control does not have a
+            //          deeper nesting than early. In testTrySplitUpOpaqueLoopInit(), we remove the outer loop and
+            //          therefore try to split up the OpaqueLoopInit node first which will initiate the "clone down".
+
+            int[] iArr;
+            if (flag) {
+                iArr = new int[100];
+            } else {
+                dontInline();
+                iArr = iArr2;
+            }
+
+            // **REGION**
+            // - Phi[new int[100], iArr2] = Phi[DecodeN[int:100], DecodeN[n>=0]] # 'iArr'
+            // - Phi[flag, flag]  # 'flag' -> once loaded from the if-branch and once from the else-branch related memory
+
+            // --- BLOCK start ---
+
+            // 1) Replaced with CMove:
+            //     a = CMove(flag, 3, 4)
+            //
+            //    Note: Even though we run with -Xcomp where we don't know the frequency, we still cmove because of
+            //          -XX:-BlockLayoutByFrequency
+            int a;
+            if (flag2) {
+                a = 4;
+            } else {
+                a = 3;
+            }
+            // --- BLOCK end ---
+
+            // 2b) Hoisted Check Predicate: NullCheck(iArr)
+            // 3b) Hoisted Check Predicate: RangeCheck(iArr) + TAPs(iArr)
+            for (int i = 0; i < 100; i++) {
+                // 2a) Null check hoisted with a Hoisted Check Predicate -> put at 2b)
+                // 3a) Range check hoisted with a Hoisted Check Predicate + Template Assertion Predicates -> put at 3b)
+                iArr[i + a] = 34;
+                // 8) After CCP, we find that this condition equals to "0 < iFld". Since this is loop-invariant and
+                //    a loop-exit, we apply Loop Peeling which verifies that we do not have a Template Assertion
+                //    Predicate with a Phi node.
+                if (i * zero < iFld) {
+                    return;
+                }
+            }
+        }
+    }
+
+    // Same as test above but this time the "clone down" is initiated when trying to split up an OpaqueLoopInitNode.
+    static void testTrySplitUpOpaqueLoopInit() {
+            int zero = 34;
+        int limit = 2;
+        for (; limit < 4; limit *= 2);
+        for (int i = 2; i < limit; i++) {
+            zero = 0;
+        }
+
+        // 4) Graph looks like this now:
+        // Split If is applied because the graph has the following shape:
+        //
+        //        Region  # **REGION**
+        //          |
+        //   NULL  Phi[new int[100], iArr2]  # 'iArr'
+        //     \  /
+        //     CmpU   \
+        //      |     |
+        //     Bool   | # Hoisted NullCheck from 2b)
+        //      |     |
+        //     If     /
+        //
+        //
+        // We find that we can split the If through the Region because we have a Phi input for the condition CmpU
+        //
+        // 5) We apply Split-If to split the If through the region. This requires that we also handle all the Phi nodes
+        //    belonging to the region to split through. We need to empty the block ('--- BLOCK start/end ---') by
+        //    checking all users of the Phi* node. This is done removing all user of the
+        //    phi nodes belonging to the Region to split the If through. phi nodes.
+        //    This requires that we split up all users of the phi recursively through the phi. The new users of the Phis
+        //    are then revisited again since Split-If is applied iteratively for all nodes. We stop the "splitting up"
+        //    when a user of a Phi node has its get_ctrl() at a different node than the region to split through.
+        //
+        //    We have the following graph before Split If:
+        //
+        //        Region  # **REGION**
+        //                 |
+        //                Phi
+        //                 |
+        //               LoadUB  # 'flag2'loaded either from the merged memory state of the region
+        //                 |
+        //                CmpI
+        //                 |
+        //                Bool
+        //                 |
+        //               CmoveI  # From 1)
+        //                 |
+        //              ConvI2L
+        //                 |
+        //                AddL   # First node part of Template Assertion Predicate expression of 3b).
+        //                 |
+        //               CmpUL
+        //                 |
+        //  OpaqueTemplateAssertionPredicate
+        //
+        // 6) We start applying Split If and iteratively split users of Phi nodes up. We find that all nodes including
+        //    the AddL, can be split through the new phis because they have their get_ctrl() set to the REGION.
+        //    Why isnt the control of the AddL not set to the latest control (which we usually do when having the
+        //    same loop depth) at 3b) where the Template Assertion Predicate Expression node belongs to?
+        //    The reason is that during build_loop_late_post_work(), we skip all predicates to not interfere with
+        //    Loop Predication, including the NullCheck from 2b) . Thus, we move late control up to REGION because the
+        //    if/else is already removed with a CMove in 1).
+        //
+        // 7) When splitting the AddL node, have the following graph:
+        //
+         //     Region    # **REGION**
+        //        |
+        //        |   OpaqueLoopInit
+        //        |        |
+        //       Phi    ConvI2L
+        //         \    /
+        //          AddL
+        //
+        //    We find that it's part of a Template Assertion Predicate Expression. We do not want to split such a node
+        //    to not introduce a Phi node within the expression which would mess with pattern matching to find the
+        //    OpaqueLoop* nodes from the Template Assertion Predicate If. As a solution, we "clone down" the Template
+        //    Assertion Predicate Expression by creating a clone of the entire Template Assertion Predicate Expression.
+        //    We then feed the Phi for the new Region, after splitting the If, into the AddL as part of the
+        //    Template Assertion Predicate Expression.
+        //
+        //    Note: The difference to testTrySplitUpNonOpaqueExpressionNode() above is that when trying to split AddL,
+        //          we first split up its inputs recursively if they also have get_ctrl() at the region to split through.
+        //          This is the case for ConvI2L and OpaqueLoopInit. Therefore, the split of OpaqueLoopInit will
+        //          initiate the "clone down".
+
+        int[] iArr;
+        if (flag) {
+            iArr = new int[100];
+        } else {
+            dontInline();
+            iArr = iArr2;
+        }
+
+        // **REGION**
+        // - Phi[new int[100], iArr2] = Phi[DecodeN[int:100], DecodeN[n>=0]] # 'iArr'
+        // - Phi[flag, flag]  # 'flag' -> once loaded from the if-branch and once from the else-branch related memory
+
+        // --- BLOCK start ---
+
+        // 1) Replaced with CMove:
+        //     a = CMove(flag, 3, 4)
+        //
+        //    Note: Even though we run with -Xcomp where we don't know the frequency, we still cmove because of
+        //          -XX:-BlockLayoutByFrequency
+        int a;
+        if (flag2) {
+            a = 4;
+        } else {
+            a = 3;
+        }
+        // --- BLOCK end ---
+
+        // 2b) Hoisted Check Predicate: NullCheck(iArr)
+        // 3b) Hoisted Check Predicate: RangeCheck(iArr) + TAPs(iArr)
+        for (int i = 0; i < 100; i++) {
+            // 2a) Null check hoisted with a Hoisted Check Predicate -> put at 2b)
+            // 3a) Range check hoisted with a Hoisted Check Predicate + Template Assertion Predicates -> put at 3b)
+            iArr[i + a] = 34;
+            // 8) After CCP, we find that this condition equals to "0 < iFld". Since this is loop-invariant and
+            //    a loop-exit, we apply Loop Peeling which verifies that we do not have a Template Assertion
+            //    Predicate with a Phi node.
+            if (i * zero < iFld) {
+                return;
+            }
+        }
+    }
+
+    static void testBackToBackLoopLimitCheckPredicate() {
+        int i = 34;
+        if (flag) {}
+        while (i < 50) {
+            i++;
+        }
+        for (int j = 0; j < 4; j++) {
+            iArr[j] += 34;
+        }
+    }
+
+   // -Xcomp -XX:CompileCommand=compileonly,Test*::*
+    static int test8288941() {
+        int e = 8, g = 5, j;
+        int h = 1;
+        while (++h < 100000) {
+            for (j = 1; j > h; j--) {
+                try {
+                    iFld = 0;
+                    g = iArr[1] / e;
+                } catch (ArithmeticException ae) {
+                }
+                iArr[j + 1] = 4;
+                if (e == 9) {
+                    iFld2 = 3;
+                }
+            }
+        }
+        return g;
+    }
+
+    // JDK-8288941, -Xcomp -XX:CompileCommand=compileonly,Test::test
+    static void testRemovingParsePredicatesThenMissingTemplates() {
+        int one = 34;
+
+        int limit = 2;
+        for (; limit < 4; limit *= 2);
+        for (int i = 2; i < limit; i++) {
+            one = 1; // Only known to be 1 after CCP.
+        }
+
+        long l1 = 34L;
+        long l2 = 566L;
+
+        // 10) After IGVN, the StoreF has lost most of its out edges due to the removal of the MergeMems into the UCTs
+        //     of the Parse Predicates.
+        // 11) policy_maximally_unroll() now returns true and we can maximally unroll this loop.
+        int j;
+        for (j = 0; j < 4; j++) {
+            // 1) StoreF has a huge number of MergeMem uses for the UCTs of all the loops further down. As a result,
+            //    policy_maximally_unroll() will return false because est_loop_unroll_sz() -> est_loop_flow_merge_sz()
+            //    counts all out edges to nodes outside the loop to estimate the cost of merging nodes when cloning the
+            //    loop. This count is larger then the unroll limit and we do not apply MaxUnroll.
+            // Note: This is a store to a float array to not interfere with the int array store in the next loop below.
+            fArr[j] = 34;
+
+            // 2) DivLs add 30 to the loop body count and we hit LoopUnrollLimit which avoids normal Loop unrolling and
+            //    thus pre/main/post loop creation. Therefore, we currently cannot split this loop in any way.
+            l1 /= lFldOne;
+            l2 /= lFldOne;
+        }
+
+
+        long l3 = 34L;
+        long l4 = 566L;
+        // 13) Since the DivL nodes are now removed, the LoopUnrollLimit is not reached and we can finally pre/main/post
+        //     and unroll this loop - with Template Assertion Predicates above but no more Parse Predicates!
+        // 14) We currently do not clone/update/establish Template Assertion Predicates once Parse Predicates are removed.
+        //     Therefore, we create pre/main/post loops without Template Assertion Predicates and without Initialized
+        //     Assertion Predicates.
+        int x = 0;
+        for (int i = 1; i > five; i -= 2) {
+
+            // 3)  Loop Predication will hoist the range check out of the loop together with a Template Assertion Predicate.
+            // 15) After pre/main/post: the CastII for the array index get the new iv type [-1..-32767] and is replaced by
+            //     top. Data dies but there is no Intialized Assertion Predicate above the main loop and we are left with
+            //     a broken graph. We assert when running with -XX:+AbortVMOnCompilationFailure due to a malformed graph.
+            int arrLoad = iArr[i];
+            if (arrLoad == i) {
+                iFld = 34;
+            }
+
+            // 4)  This check is non-loop invariant, so Loop Unswitching cannot be applied, either.
+            // 12) After maximally unrolling the loop above, we know that j == 4 and thus "j+(i*-1) = 4+[-1..32767] < 3" is
+            //     always false. The branch is cleaned up in the next IGVN round which also removes the expensive DivL nodes.
+            if (j+(i*-1) < 3) {
+
+                // 5) As above: We hit the LoopUnrollLimit which avoids normal Loop unrolling and thus pre/main/post loop
+                //    creation. Therefore, we currently cannot split this loop in any way.
+                l3 /= lFldOne;
+                l4 /= lFldOne;
+            }
+        }
+
+        // Many non-counted loops that are not optimized but all have Parse Predicates with UCTs + a safepoint in the loop body.
+        // The StoreF from the loop above will be merged with a MergeMem into all these UCTs.
+        //
+        // 6) After CCP, we find that 'one' is 1. Therefore, all loops will only iterate for a single iteration and the loop
+        //    backedges die. These are cleaned up in the next round of IGVN.
+        // 7) In the next loop opts phase after CCP, we find that all these Parse Predicates above the loops are now useless.
+        //    We mark them as such but will only clean them up in the next round of IGVN.
+        // 8) Since we do not apply any major loop optimization like loop splitting, we remove the remaining Parse Predicates
+        //    (see "PredicatesOff" when running with -XX:+TraceLoopOpts). We set major progress again to see if we can continue
+        //    to apply more loop optimizations.
+        // 9) IGVN runs and cleans up all the Parse Predicates and its UCTs.
+        for (int i = 0; i < one; i++) {
+           if (i < 2) {
+               i++;
+           }
+        }
+        for (int i = 0; i < one; i++) {
+           if (i < 2) {
+               i++;
+           }
+        }
+        for (int i = 0; i < one; i++) {
+           if (i < 2) {
+               i++;
+           }
+        }
+        for (int i = 0; i < one; i++) {
+           if (i < 2) {
+               i++;
+           }
+        }
+        for (int i = 0; i < one; i++) {
+           if (i < 2) {
+               i++;
+           }
+        }
+        for (int i = 0; i < one; i++) {
+           if (i < 2) {
+               i++;
+           }
+        }
+        for (int i = 0; i < one; i++) {
+           if (i < 2) {
+               i++;
+           }
+        }
+        for (int i = 0; i < one; i++) {
+           if (i < 2) {
+               i++;
+           }
+        }
+        for (int i = 0; i < one; i++) {
+           if (i < 2) {
+               i++;
+           }
+        }
+        for (int i = 0; i < one; i++) {
+           if (i < 2) {
+               i++;
+           }
+        }
+        for (int i = 0; i < one; i++) {
+           if (i < 2) {
+               i++;
+           }
+        }
+        for (int i = 0; i < one; i++) {
+           if (i < 2) {
+               i++;
+           }
+        }
+        for (int i = 0; i < one; i++) {
+           if (i < 2) {
+               i++;
+           }
+        }
+        for (int i = 0; i < one; i++) {
+           if (i < 2) {
+               i++;
+           }
+        }
+        for (int i = 0; i < one; i++) {
+           if (i < 2) {
+               i++;
+           }
+        }
+        for (int i = 0; i < one; i++) {
+           if (i < 2) {
+               i++;
+           }
+        }
+        for (int i = 0; i < one; i++) {
+           if (i < 2) {
+               i++;
+           }
+        }
+        for (int i = 0; i < one; i++) {
+           if (i < 2) {
+               i++;
+           }
+        }
+        for (int i = 0; i < one; i++) {
+           if (i < 2) {
+               i++;
+           }
+        }
+        for (int i = 0; i < one; i++) {
+           if (i < 2) {
+               i++;
+           }
+        }
+        for (int i = 0; i < one; i++) {
+           if (i < 2) {
+               i++;
+           }
+        }
+        for (int i = 0; i < one; i++) {
+           if (i < 2) {
+               i++;
+           }
+        }
+        for (int i = 0; i < one; i++) {
+           if (i < 2) {
+               i++;
+           }
+        }
+        for (int i = 0; i < one; i++) {
+           if (i < 2) {
+               i++;
+           }
+        }
+        for (int i = 0; i < one; i++) {
+           if (i < 2) {
+               i++;
+           }
+        }
+        for (int i = 0; i < one; i++) {
+           if (i < 2) {
+               i++;
+           }
+        }
+        for (int i = 0; i < one; i++) {
+           if (i < 2) {
+               i++;
+           }
+        }
+        for (int i = 0; i < one; i++) {
+           if (i < 2) {
+               i++;
+           }
+        }
+    }
+
+    // Not inlined.
+    static void dontInline() {
+    }
 }

From 23e3b3ff6ab17a71b16fdf2e61548a7413ddb6d4 Mon Sep 17 00:00:00 2001
From: Aleksey Shipilev <shade@openjdk.org>
Date: Mon, 31 Mar 2025 08:16:10 +0000
Subject: [PATCH 553/587] 8351156: C1: Remove FPU stack support after 32-bit
 x86 removal

Reviewed-by: vlivanov, kvn
---
 .../cpu/aarch64/c1_FpuStackSim_aarch64.cpp    |   30 -
 .../cpu/aarch64/c1_FpuStackSim_aarch64.hpp    |   32 -
 .../cpu/aarch64/c1_LIRAssembler_aarch64.cpp   |   18 +-
 .../cpu/aarch64/c1_LIRAssembler_aarch64.hpp   |    2 -
 .../cpu/aarch64/c1_LinearScan_aarch64.cpp     |   31 -
 src/hotspot/cpu/arm/c1_FpuStackSim_arm.cpp    |   25 -
 src/hotspot/cpu/arm/c1_FpuStackSim_arm.hpp    |   30 -
 src/hotspot/cpu/arm/c1_LIRAssembler_arm.cpp   |    6 +-
 src/hotspot/cpu/arm/c1_LinearScan_arm.cpp     |   31 -
 src/hotspot/cpu/ppc/c1_FpuStackSim_ppc.hpp    |   32 -
 src/hotspot/cpu/ppc/c1_LIRAssembler_ppc.cpp   |    6 +-
 src/hotspot/cpu/ppc/c1_LinearScan_ppc.cpp     |   33 -
 .../cpu/riscv/c1_FpuStackSim_riscv.cpp        |   30 -
 .../cpu/riscv/c1_FpuStackSim_riscv.hpp        |   32 -
 .../cpu/riscv/c1_LIRAssembler_arith_riscv.cpp |    2 +-
 .../cpu/riscv/c1_LIRAssembler_riscv.cpp       |   14 +-
 src/hotspot/cpu/riscv/c1_LinearScan_riscv.cpp |   32 -
 src/hotspot/cpu/s390/c1_FpuStackSim_s390.hpp  |   32 -
 src/hotspot/cpu/s390/c1_LIRAssembler_s390.cpp |    6 +-
 src/hotspot/cpu/s390/c1_LinearScan_s390.cpp   |   32 -
 src/hotspot/cpu/x86/c1_FpuStackSim_x86.cpp    |  200 ---
 src/hotspot/cpu/x86/c1_FpuStackSim_x86.hpp    |   72 --
 src/hotspot/cpu/x86/c1_FrameMap_x86.cpp       |    4 -
 src/hotspot/cpu/x86/c1_FrameMap_x86.hpp       |    2 -
 src/hotspot/cpu/x86/c1_LIRAssembler_x86.cpp   |  393 +-----
 src/hotspot/cpu/x86/c1_LIRAssembler_x86.hpp   |    9 -
 src/hotspot/cpu/x86/c1_LIRGenerator_x86.cpp   |   77 +-
 src/hotspot/cpu/x86/c1_LinearScan_x86.cpp     | 1113 -----------------
 src/hotspot/cpu/x86/c1_LinearScan_x86.hpp     |   74 --
 src/hotspot/cpu/x86/c1_MacroAssembler_x86.cpp |    6 -
 src/hotspot/share/c1/c1_FpuStackSim.hpp       |   37 -
 src/hotspot/share/c1/c1_Instruction.hpp       |    4 -
 src/hotspot/share/c1/c1_LIR.cpp               |    6 -
 src/hotspot/share/c1/c1_LIR.hpp               |   23 +-
 src/hotspot/share/c1/c1_LIRAssembler.cpp      |   25 +-
 src/hotspot/share/c1/c1_LIRAssembler.hpp      |    8 +-
 src/hotspot/share/c1/c1_LinearScan.cpp        |   70 +-
 src/hotspot/share/c1/c1_LinearScan.hpp        |   17 -
 src/hotspot/share/c1/c1_globals.hpp           |    6 -
 39 files changed, 47 insertions(+), 2555 deletions(-)
 delete mode 100644 src/hotspot/cpu/aarch64/c1_FpuStackSim_aarch64.cpp
 delete mode 100644 src/hotspot/cpu/aarch64/c1_FpuStackSim_aarch64.hpp
 delete mode 100644 src/hotspot/cpu/aarch64/c1_LinearScan_aarch64.cpp
 delete mode 100644 src/hotspot/cpu/arm/c1_FpuStackSim_arm.cpp
 delete mode 100644 src/hotspot/cpu/arm/c1_FpuStackSim_arm.hpp
 delete mode 100644 src/hotspot/cpu/arm/c1_LinearScan_arm.cpp
 delete mode 100644 src/hotspot/cpu/ppc/c1_FpuStackSim_ppc.hpp
 delete mode 100644 src/hotspot/cpu/ppc/c1_LinearScan_ppc.cpp
 delete mode 100644 src/hotspot/cpu/riscv/c1_FpuStackSim_riscv.cpp
 delete mode 100644 src/hotspot/cpu/riscv/c1_FpuStackSim_riscv.hpp
 delete mode 100644 src/hotspot/cpu/riscv/c1_LinearScan_riscv.cpp
 delete mode 100644 src/hotspot/cpu/s390/c1_FpuStackSim_s390.hpp
 delete mode 100644 src/hotspot/cpu/s390/c1_LinearScan_s390.cpp
 delete mode 100644 src/hotspot/cpu/x86/c1_FpuStackSim_x86.cpp
 delete mode 100644 src/hotspot/cpu/x86/c1_FpuStackSim_x86.hpp
 delete mode 100644 src/hotspot/cpu/x86/c1_LinearScan_x86.cpp
 delete mode 100644 src/hotspot/share/c1/c1_FpuStackSim.hpp

diff --git a/src/hotspot/cpu/aarch64/c1_FpuStackSim_aarch64.cpp b/src/hotspot/cpu/aarch64/c1_FpuStackSim_aarch64.cpp
deleted file mode 100644
index 158af57603c..00000000000
--- a/src/hotspot/cpu/aarch64/c1_FpuStackSim_aarch64.cpp
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Copyright (c) 2005, 2025, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2014, Red Hat Inc. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- *
- */
-
-//--------------------------------------------------------
-//               FpuStackSim
-//--------------------------------------------------------
-
-// No FPU stack on AARCH64
diff --git a/src/hotspot/cpu/aarch64/c1_FpuStackSim_aarch64.hpp b/src/hotspot/cpu/aarch64/c1_FpuStackSim_aarch64.hpp
deleted file mode 100644
index e1cfcf3de6c..00000000000
--- a/src/hotspot/cpu/aarch64/c1_FpuStackSim_aarch64.hpp
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright (c) 2005, 2019, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2014, Red Hat Inc. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- *
- */
-
-#ifndef CPU_AARCH64_C1_FPUSTACKSIM_AARCH64_HPP
-#define CPU_AARCH64_C1_FPUSTACKSIM_AARCH64_HPP
-
-// No FPU stack on AARCH64
-class FpuStackSim;
-
-#endif // CPU_AARCH64_C1_FPUSTACKSIM_AARCH64_HPP
diff --git a/src/hotspot/cpu/aarch64/c1_LIRAssembler_aarch64.cpp b/src/hotspot/cpu/aarch64/c1_LIRAssembler_aarch64.cpp
index 0c11d26a476..9730e75f266 100644
--- a/src/hotspot/cpu/aarch64/c1_LIRAssembler_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/c1_LIRAssembler_aarch64.cpp
@@ -584,14 +584,14 @@ void LIR_Assembler::const2stack(LIR_Opr src, LIR_Opr dest) {
         __ str(zr, frame_map()->address_for_slot(dest->single_stack_ix()));
       else {
         const2reg(src, FrameMap::rscratch1_opr, lir_patch_none, nullptr);
-        reg2stack(FrameMap::rscratch1_opr, dest, c->type(), false);
+        reg2stack(FrameMap::rscratch1_opr, dest, c->type());
       }
     }
     break;
   case T_ADDRESS:
     {
       const2reg(src, FrameMap::rscratch1_opr, lir_patch_none, nullptr);
-      reg2stack(FrameMap::rscratch1_opr, dest, c->type(), false);
+      reg2stack(FrameMap::rscratch1_opr, dest, c->type());
     }
   case T_INT:
   case T_FLOAT:
@@ -716,7 +716,7 @@ void LIR_Assembler::reg2reg(LIR_Opr src, LIR_Opr dest) {
   }
 }
 
-void LIR_Assembler::reg2stack(LIR_Opr src, LIR_Opr dest, BasicType type, bool pop_fpu_stack) {
+void LIR_Assembler::reg2stack(LIR_Opr src, LIR_Opr dest, BasicType type) {
   precond(src->is_register() && dest->is_stack());
 
   uint const c_sz32 = sizeof(uint32_t);
@@ -752,7 +752,7 @@ void LIR_Assembler::reg2stack(LIR_Opr src, LIR_Opr dest, BasicType type, bool po
 }
 
 
-void LIR_Assembler::reg2mem(LIR_Opr src, LIR_Opr dest, BasicType type, LIR_PatchCode patch_code, CodeEmitInfo* info, bool pop_fpu_stack, bool wide) {
+void LIR_Assembler::reg2mem(LIR_Opr src, LIR_Opr dest, BasicType type, LIR_PatchCode patch_code, CodeEmitInfo* info, bool wide) {
   LIR_Address* to_addr = dest->as_address_ptr();
   PatchingStub* patch = nullptr;
   Register compressed_src = rscratch1;
@@ -905,7 +905,7 @@ void LIR_Assembler::stack2stack(LIR_Opr src, LIR_Opr dest, BasicType type) {
     temp = FrameMap::rscratch1_opr;
 
   stack2reg(src, temp, src->type());
-  reg2stack(temp, dest, dest->type(), false);
+  reg2stack(temp, dest, dest->type());
 }
 
 
@@ -1598,7 +1598,7 @@ void LIR_Assembler::cmove(LIR_Condition condition, LIR_Opr opr1, LIR_Opr opr2, L
     __ csel(result->as_register(), opr1->as_register(), opr2->as_register(), acond);
 }
 
-void LIR_Assembler::arith_op(LIR_Code code, LIR_Opr left, LIR_Opr right, LIR_Opr dest, CodeEmitInfo* info, bool pop_fpu_stack) {
+void LIR_Assembler::arith_op(LIR_Code code, LIR_Opr left, LIR_Opr right, LIR_Opr dest, CodeEmitInfo* info) {
   assert(info == nullptr, "should never be used, idiv/irem and ldiv/lrem not handled by this method");
 
   if (left->is_single_cpu()) {
@@ -1769,9 +1769,6 @@ void LIR_Assembler::arith_op(LIR_Code code, LIR_Opr left, LIR_Opr right, LIR_Opr
   }
 }
 
-void LIR_Assembler::arith_fpu_implementation(LIR_Code code, int left_index, int right_index, int dest_index, bool pop_fpu_stack) { Unimplemented(); }
-
-
 void LIR_Assembler::intrinsic_op(LIR_Code code, LIR_Opr value, LIR_Opr tmp, LIR_Opr dest, LIR_Op* op) {
   switch(code) {
   case lir_abs : __ fabsd(dest->as_double_reg(), value->as_double_reg()); break;
@@ -2849,8 +2846,7 @@ void LIR_Assembler::rt_call(LIR_Opr result, address dest, const LIR_OprList* arg
 
 void LIR_Assembler::volatile_move_op(LIR_Opr src, LIR_Opr dest, BasicType type, CodeEmitInfo* info) {
   if (dest->is_address() || src->is_address()) {
-    move_op(src, dest, type, lir_patch_none, info,
-            /*pop_fpu_stack*/false, /*wide*/false);
+    move_op(src, dest, type, lir_patch_none, info, /*wide*/false);
   } else {
     ShouldNotReachHere();
   }
diff --git a/src/hotspot/cpu/aarch64/c1_LIRAssembler_aarch64.hpp b/src/hotspot/cpu/aarch64/c1_LIRAssembler_aarch64.hpp
index d3cf6c9187d..12b941fc4f7 100644
--- a/src/hotspot/cpu/aarch64/c1_LIRAssembler_aarch64.hpp
+++ b/src/hotspot/cpu/aarch64/c1_LIRAssembler_aarch64.hpp
@@ -33,8 +33,6 @@ friend class ArrayCopyStub;
 
   int array_element_size(BasicType type) const;
 
-  void arith_fpu_implementation(LIR_Code code, int left_index, int right_index, int dest_index, bool pop_fpu_stack);
-
   // helper functions which checks for overflow and sets bailout if it
   // occurs.  Always returns a valid embeddable pointer but in the
   // bailout case the pointer won't be to unique storage.
diff --git a/src/hotspot/cpu/aarch64/c1_LinearScan_aarch64.cpp b/src/hotspot/cpu/aarch64/c1_LinearScan_aarch64.cpp
deleted file mode 100644
index d99916ecb88..00000000000
--- a/src/hotspot/cpu/aarch64/c1_LinearScan_aarch64.cpp
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Copyright (c) 2005, 2025, Oracle and/or its affiliates. All rights reserved. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please 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 "c1/c1_Instruction.hpp"
-#include "c1/c1_LinearScan.hpp"
-#include "utilities/bitMap.inline.hpp"
-
-void LinearScan::allocate_fpu_stack() {
-  // No FPU stack on AArch64
-}
diff --git a/src/hotspot/cpu/arm/c1_FpuStackSim_arm.cpp b/src/hotspot/cpu/arm/c1_FpuStackSim_arm.cpp
deleted file mode 100644
index 287f4e412d7..00000000000
--- a/src/hotspot/cpu/arm/c1_FpuStackSim_arm.cpp
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * 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.
- *
- */
-
-// Nothing needed here
diff --git a/src/hotspot/cpu/arm/c1_FpuStackSim_arm.hpp b/src/hotspot/cpu/arm/c1_FpuStackSim_arm.hpp
deleted file mode 100644
index 74e5ebc81b7..00000000000
--- a/src/hotspot/cpu/arm/c1_FpuStackSim_arm.hpp
+++ /dev/null
@@ -1,30 +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.
- *
- */
-
-#ifndef CPU_ARM_C1_FPUSTACKSIM_ARM_HPP
-#define CPU_ARM_C1_FPUSTACKSIM_ARM_HPP
-
-// Nothing needed here
-
-#endif // CPU_ARM_C1_FPUSTACKSIM_ARM_HPP
diff --git a/src/hotspot/cpu/arm/c1_LIRAssembler_arm.cpp b/src/hotspot/cpu/arm/c1_LIRAssembler_arm.cpp
index 14a51bf4b13..66c7b916f1f 100644
--- a/src/hotspot/cpu/arm/c1_LIRAssembler_arm.cpp
+++ b/src/hotspot/cpu/arm/c1_LIRAssembler_arm.cpp
@@ -454,7 +454,7 @@ void LIR_Assembler::reg2reg(LIR_Opr src, LIR_Opr dest) {
   }
 }
 
-void LIR_Assembler::reg2stack(LIR_Opr src, LIR_Opr dest, BasicType type, bool pop_fpu_stack) {
+void LIR_Assembler::reg2stack(LIR_Opr src, LIR_Opr dest, BasicType type) {
   assert(src->is_register(), "should not call otherwise");
   assert(dest->is_stack(), "should not call otherwise");
 
@@ -493,7 +493,7 @@ void LIR_Assembler::reg2stack(LIR_Opr src, LIR_Opr dest, BasicType type, bool po
 
 void LIR_Assembler::reg2mem(LIR_Opr src, LIR_Opr dest, BasicType type,
                             LIR_PatchCode patch_code, CodeEmitInfo* info,
-                            bool pop_fpu_stack, bool wide) {
+                            bool wide) {
   LIR_Address* to_addr = dest->as_address_ptr();
   Register base_reg = to_addr->base()->as_pointer_register();
   const bool needs_patching = (patch_code != lir_patch_none);
@@ -1512,7 +1512,7 @@ static int reg_size(LIR_Opr op) {
 }
 #endif
 
-void LIR_Assembler::arith_op(LIR_Code code, LIR_Opr left, LIR_Opr right, LIR_Opr dest, CodeEmitInfo* info, bool pop_fpu_stack) {
+void LIR_Assembler::arith_op(LIR_Code code, LIR_Opr left, LIR_Opr right, LIR_Opr dest, CodeEmitInfo* info) {
   assert(info == nullptr, "unused on this code path");
   assert(dest->is_register(), "wrong items state");
 
diff --git a/src/hotspot/cpu/arm/c1_LinearScan_arm.cpp b/src/hotspot/cpu/arm/c1_LinearScan_arm.cpp
deleted file mode 100644
index f1d6c6a0ff9..00000000000
--- a/src/hotspot/cpu/arm/c1_LinearScan_arm.cpp
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Copyright (c) 2008, 2025, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please 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 "c1/c1_Instruction.hpp"
-#include "c1/c1_LinearScan.hpp"
-#include "utilities/bitMap.inline.hpp"
-
-void LinearScan::allocate_fpu_stack() {
-  // No FPU stack on ARM
-}
diff --git a/src/hotspot/cpu/ppc/c1_FpuStackSim_ppc.hpp b/src/hotspot/cpu/ppc/c1_FpuStackSim_ppc.hpp
deleted file mode 100644
index 84d180a9b03..00000000000
--- a/src/hotspot/cpu/ppc/c1_FpuStackSim_ppc.hpp
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright (c) 2005, 2019, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2012, 2015 SAP SE. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- *
- */
-
-#ifndef CPU_PPC_C1_FPUSTACKSIM_PPC_HPP
-#define CPU_PPC_C1_FPUSTACKSIM_PPC_HPP
-
-// No FPU stack on PPC.
-class FpuStackSim;
-
-#endif // CPU_PPC_C1_FPUSTACKSIM_PPC_HPP
diff --git a/src/hotspot/cpu/ppc/c1_LIRAssembler_ppc.cpp b/src/hotspot/cpu/ppc/c1_LIRAssembler_ppc.cpp
index cae192982d5..c678f409c49 100644
--- a/src/hotspot/cpu/ppc/c1_LIRAssembler_ppc.cpp
+++ b/src/hotspot/cpu/ppc/c1_LIRAssembler_ppc.cpp
@@ -1203,7 +1203,7 @@ void LIR_Assembler::stack2reg(LIR_Opr src, LIR_Opr dest, BasicType type) {
 }
 
 
-void LIR_Assembler::reg2stack(LIR_Opr from_reg, LIR_Opr dest, BasicType type, bool pop_fpu_stack) {
+void LIR_Assembler::reg2stack(LIR_Opr from_reg, LIR_Opr dest, BasicType type) {
   Address addr;
   if (dest->is_single_word()) {
     addr = frame_map()->address_for_slot(dest->single_stack_ix());
@@ -1246,7 +1246,7 @@ void LIR_Assembler::reg2reg(LIR_Opr from_reg, LIR_Opr to_reg) {
 
 
 void LIR_Assembler::reg2mem(LIR_Opr from_reg, LIR_Opr dest, BasicType type,
-                            LIR_PatchCode patch_code, CodeEmitInfo* info, bool pop_fpu_stack,
+                            LIR_PatchCode patch_code, CodeEmitInfo* info,
                             bool wide) {
   assert(type != T_METADATA, "store of metadata ptr not supported");
   LIR_Address* addr = dest->as_address_ptr();
@@ -1617,7 +1617,7 @@ void LIR_Assembler::cmove(LIR_Condition condition, LIR_Opr opr1, LIR_Opr opr2, L
 
 
 void LIR_Assembler::arith_op(LIR_Code code, LIR_Opr left, LIR_Opr right, LIR_Opr dest,
-                             CodeEmitInfo* info, bool pop_fpu_stack) {
+                             CodeEmitInfo* info) {
   assert(info == nullptr, "unused on this code path");
   assert(left->is_register(), "wrong items state");
   assert(dest->is_register(), "wrong items state");
diff --git a/src/hotspot/cpu/ppc/c1_LinearScan_ppc.cpp b/src/hotspot/cpu/ppc/c1_LinearScan_ppc.cpp
deleted file mode 100644
index d6ceab8b27b..00000000000
--- a/src/hotspot/cpu/ppc/c1_LinearScan_ppc.cpp
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright (c) 2005, 2025, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2012, 2015 SAP SE. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please 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 "c1/c1_Instruction.hpp"
-#include "c1/c1_LinearScan.hpp"
-#include "utilities/bitMap.inline.hpp"
-
-void LinearScan::allocate_fpu_stack() {
-  Unimplemented();
-  // No FPU stack on PPC
-}
diff --git a/src/hotspot/cpu/riscv/c1_FpuStackSim_riscv.cpp b/src/hotspot/cpu/riscv/c1_FpuStackSim_riscv.cpp
deleted file mode 100644
index e3a2606c532..00000000000
--- a/src/hotspot/cpu/riscv/c1_FpuStackSim_riscv.cpp
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Copyright (c) 2005, 2017, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2020, 2022, Huawei Technologies Co., Ltd. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- *
- */
-
-//--------------------------------------------------------
-//               FpuStackSim
-//--------------------------------------------------------
-
-// No FPU stack on RISCV
diff --git a/src/hotspot/cpu/riscv/c1_FpuStackSim_riscv.hpp b/src/hotspot/cpu/riscv/c1_FpuStackSim_riscv.hpp
deleted file mode 100644
index 7bc3d311501..00000000000
--- a/src/hotspot/cpu/riscv/c1_FpuStackSim_riscv.hpp
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright (c) 2005, 2019, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2020, 2022, Huawei Technologies Co., Ltd. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- *
- */
-
-#ifndef CPU_RISCV_C1_FPUSTACKSIM_RISCV_HPP
-#define CPU_RISCV_C1_FPUSTACKSIM_RISCV_HPP
-
-// No FPU stack on RISCV
-class FpuStackSim;
-
-#endif // CPU_RISCV_C1_FPUSTACKSIM_RISCV_HPP
diff --git a/src/hotspot/cpu/riscv/c1_LIRAssembler_arith_riscv.cpp b/src/hotspot/cpu/riscv/c1_LIRAssembler_arith_riscv.cpp
index 6d53282bba5..787868d4c38 100644
--- a/src/hotspot/cpu/riscv/c1_LIRAssembler_arith_riscv.cpp
+++ b/src/hotspot/cpu/riscv/c1_LIRAssembler_arith_riscv.cpp
@@ -265,7 +265,7 @@ void LIR_Assembler::arith_op_double_fpu(LIR_Code code, LIR_Opr left, LIR_Opr rig
 }
 
 void LIR_Assembler::arith_op(LIR_Code code, LIR_Opr left, LIR_Opr right, LIR_Opr dest,
-                             CodeEmitInfo* info, bool pop_fpu_stack) {
+                             CodeEmitInfo* info) {
   assert(info == nullptr, "should never be used, idiv/irem and ldiv/lrem not handled by this method");
 
   if (left->is_single_cpu()) {
diff --git a/src/hotspot/cpu/riscv/c1_LIRAssembler_riscv.cpp b/src/hotspot/cpu/riscv/c1_LIRAssembler_riscv.cpp
index c6af2de3cd4..08d35c2831a 100644
--- a/src/hotspot/cpu/riscv/c1_LIRAssembler_riscv.cpp
+++ b/src/hotspot/cpu/riscv/c1_LIRAssembler_riscv.cpp
@@ -498,12 +498,12 @@ void LIR_Assembler::const2stack(LIR_Opr src, LIR_Opr dest) {
         __ sd(zr, frame_map()->address_for_slot(dest->single_stack_ix()));
       } else {
         const2reg(src, FrameMap::t1_opr, lir_patch_none, nullptr);
-        reg2stack(FrameMap::t1_opr, dest, c->type(), false);
+        reg2stack(FrameMap::t1_opr, dest, c->type());
       }
       break;
     case T_ADDRESS:   // fall through
       const2reg(src, FrameMap::t1_opr, lir_patch_none, nullptr);
-      reg2stack(FrameMap::t1_opr, dest, c->type(), false);
+      reg2stack(FrameMap::t1_opr, dest, c->type());
     case T_INT:       // fall through
     case T_FLOAT:
       if (c->as_jint_bits() == 0) {
@@ -620,7 +620,7 @@ void LIR_Assembler::reg2reg(LIR_Opr src, LIR_Opr dest) {
   }
 }
 
-void LIR_Assembler::reg2stack(LIR_Opr src, LIR_Opr dest, BasicType type, bool pop_fpu_stack) {
+void LIR_Assembler::reg2stack(LIR_Opr src, LIR_Opr dest, BasicType type) {
   precond(src->is_register() && dest->is_stack());
 
   uint const c_sz32 = sizeof(uint32_t);
@@ -653,7 +653,7 @@ void LIR_Assembler::reg2stack(LIR_Opr src, LIR_Opr dest, BasicType type, bool po
   }
 }
 
-void LIR_Assembler::reg2mem(LIR_Opr src, LIR_Opr dest, BasicType type, LIR_PatchCode patch_code, CodeEmitInfo* info, bool pop_fpu_stack, bool wide) {
+void LIR_Assembler::reg2mem(LIR_Opr src, LIR_Opr dest, BasicType type, LIR_PatchCode patch_code, CodeEmitInfo* info, bool wide) {
   LIR_Address* to_addr = dest->as_address_ptr();
   // t0 was used as tmp reg in as_Address, so we use t1 as compressed_src
   Register compressed_src = t1;
@@ -772,7 +772,7 @@ void LIR_Assembler::stack2stack(LIR_Opr src, LIR_Opr dest, BasicType type) {
   }
 
   stack2reg(src, temp, src->type());
-  reg2stack(temp, dest, dest->type(), false);
+  reg2stack(temp, dest, dest->type());
 }
 
 void LIR_Assembler::mem2reg(LIR_Opr src, LIR_Opr dest, BasicType type, LIR_PatchCode patch_code, CodeEmitInfo* info, bool wide) {
@@ -891,12 +891,10 @@ void LIR_Assembler::cmove(LIR_Condition condition, LIR_Opr opr1, LIR_Opr opr2, L
 
   Label done;
   move_op(opr2, result, type, lir_patch_none, nullptr,
-          false,   // pop_fpu_stack
           false);  // wide
   __ j(done);
   __ bind(label);
   move_op(opr1, result, type, lir_patch_none, nullptr,
-          false,   // pop_fpu_stack
           false);  // wide
   __ bind(done);
 }
@@ -1868,7 +1866,7 @@ void LIR_Assembler::rt_call(LIR_Opr result, address dest, const LIR_OprList* arg
 
 void LIR_Assembler::volatile_move_op(LIR_Opr src, LIR_Opr dest, BasicType type, CodeEmitInfo* info) {
   if (dest->is_address() || src->is_address()) {
-    move_op(src, dest, type, lir_patch_none, info, /* pop_fpu_stack */ false, /* wide */ false);
+    move_op(src, dest, type, lir_patch_none, info, /* wide */ false);
   } else {
     ShouldNotReachHere();
   }
diff --git a/src/hotspot/cpu/riscv/c1_LinearScan_riscv.cpp b/src/hotspot/cpu/riscv/c1_LinearScan_riscv.cpp
deleted file mode 100644
index 8a6dfbbdf1e..00000000000
--- a/src/hotspot/cpu/riscv/c1_LinearScan_riscv.cpp
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright (c) 2005, 2025, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2020, 2022, Huawei Technologies Co., Ltd. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- *
- */
-
-#include "c1/c1_Instruction.hpp"
-#include "c1/c1_LinearScan.hpp"
-#include "utilities/bitMap.inline.hpp"
-
-void LinearScan::allocate_fpu_stack() {
-  // No FPU stack on RISCV
-}
diff --git a/src/hotspot/cpu/s390/c1_FpuStackSim_s390.hpp b/src/hotspot/cpu/s390/c1_FpuStackSim_s390.hpp
deleted file mode 100644
index 9a13f6ec70c..00000000000
--- a/src/hotspot/cpu/s390/c1_FpuStackSim_s390.hpp
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2016 SAP SE. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- *
- */
-
-#ifndef CPU_S390_C1_FPUSTACKSIM_S390_HPP
-#define CPU_S390_C1_FPUSTACKSIM_S390_HPP
-
-// No FPU stack on ZARCH_64
-class FpuStackSim;
-
-#endif // CPU_S390_C1_FPUSTACKSIM_S390_HPP
diff --git a/src/hotspot/cpu/s390/c1_LIRAssembler_s390.cpp b/src/hotspot/cpu/s390/c1_LIRAssembler_s390.cpp
index 48bd5c3afde..8df38d1658b 100644
--- a/src/hotspot/cpu/s390/c1_LIRAssembler_s390.cpp
+++ b/src/hotspot/cpu/s390/c1_LIRAssembler_s390.cpp
@@ -1016,7 +1016,7 @@ void LIR_Assembler::stack2reg(LIR_Opr src, LIR_Opr dest, BasicType type) {
   }
 }
 
-void LIR_Assembler::reg2stack(LIR_Opr src, LIR_Opr dest, BasicType type, bool pop_fpu_stack) {
+void LIR_Assembler::reg2stack(LIR_Opr src, LIR_Opr dest, BasicType type) {
   assert(src->is_register(), "should not call otherwise");
   assert(dest->is_stack(), "should not call otherwise");
 
@@ -1074,7 +1074,7 @@ void LIR_Assembler::reg2reg(LIR_Opr from_reg, LIR_Opr to_reg) {
 }
 
 void LIR_Assembler::reg2mem(LIR_Opr from, LIR_Opr dest_opr, BasicType type,
-                            LIR_PatchCode patch_code, CodeEmitInfo* info, bool pop_fpu_stack,
+                            LIR_PatchCode patch_code, CodeEmitInfo* info,
                             bool wide) {
   assert(type != T_METADATA, "store of metadata ptr not supported");
   LIR_Address* addr = dest_opr->as_address_ptr();
@@ -1501,7 +1501,7 @@ void LIR_Assembler::cmove(LIR_Condition condition, LIR_Opr opr1, LIR_Opr opr2, L
 }
 
 void LIR_Assembler::arith_op(LIR_Code code, LIR_Opr left, LIR_Opr right, LIR_Opr dest,
-                             CodeEmitInfo* info, bool pop_fpu_stack) {
+                             CodeEmitInfo* info) {
   assert(info == nullptr, "should never be used, idiv/irem and ldiv/lrem not handled by this method");
 
   if (left->is_single_cpu()) {
diff --git a/src/hotspot/cpu/s390/c1_LinearScan_s390.cpp b/src/hotspot/cpu/s390/c1_LinearScan_s390.cpp
deleted file mode 100644
index a5edd65ada8..00000000000
--- a/src/hotspot/cpu/s390/c1_LinearScan_s390.cpp
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright (c) 2016, 2025, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2016 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 "c1/c1_LinearScan.hpp"
-#include "utilities/debug.hpp"
-
-void LinearScan::allocate_fpu_stack() {
-  // No FPU stack on ZARCH_64.
-  ShouldNotCallThis();
-}
diff --git a/src/hotspot/cpu/x86/c1_FpuStackSim_x86.cpp b/src/hotspot/cpu/x86/c1_FpuStackSim_x86.cpp
deleted file mode 100644
index 878c94c99da..00000000000
--- a/src/hotspot/cpu/x86/c1_FpuStackSim_x86.cpp
+++ /dev/null
@@ -1,200 +0,0 @@
-/*
- * Copyright (c) 2005, 2025, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please 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 "c1/c1_FpuStackSim.hpp"
-#include "c1/c1_FrameMap.hpp"
-#include "utilities/growableArray.hpp"
-#include "utilities/ostream.hpp"
-
-//--------------------------------------------------------
-//               FpuStackSim
-//--------------------------------------------------------
-
-// This class maps the FPU registers to their stack locations; it computes
-// the offsets between individual registers and simulates the FPU stack.
-
-const int EMPTY = -1;
-
-int FpuStackSim::regs_at(int i) const {
-  assert(i >= 0 && i < FrameMap::nof_fpu_regs, "out of bounds");
-  return _regs[i];
-}
-
-void FpuStackSim::set_regs_at(int i, int val) {
-  assert(i >= 0 && i < FrameMap::nof_fpu_regs, "out of bounds");
-  _regs[i] = val;
-}
-
-void FpuStackSim::dec_stack_size() {
-  _stack_size--;
-  assert(_stack_size >= 0, "FPU stack underflow");
-}
-
-void FpuStackSim::inc_stack_size() {
-  _stack_size++;
-  assert(_stack_size <= FrameMap::nof_fpu_regs, "FPU stack overflow");
-}
-
-FpuStackSim::FpuStackSim(Compilation* compilation)
- : _compilation(compilation)
-{
-  _stack_size = 0;
-  for (int i = 0; i < FrameMap::nof_fpu_regs; i++) {
-    set_regs_at(i, EMPTY);
-  }
-}
-
-
-void FpuStackSim::pop() {
-  if (TraceFPUStack) { tty->print("FPU-pop "); print(); tty->cr(); }
-  set_regs_at(tos_index(), EMPTY);
-  dec_stack_size();
-}
-
-void FpuStackSim::pop(int rnr) {
-  if (TraceFPUStack) { tty->print("FPU-pop %d", rnr); print(); tty->cr(); }
-  assert(regs_at(tos_index()) == rnr, "rnr is not on TOS");
-  set_regs_at(tos_index(), EMPTY);
-  dec_stack_size();
-}
-
-
-void FpuStackSim::push(int rnr) {
-  if (TraceFPUStack) { tty->print("FPU-push %d", rnr); print(); tty->cr(); }
-  assert(regs_at(stack_size()) == EMPTY, "should be empty");
-  set_regs_at(stack_size(), rnr);
-  inc_stack_size();
-}
-
-
-void FpuStackSim::swap(int offset) {
-  if (TraceFPUStack) { tty->print("FPU-swap %d", offset); print(); tty->cr(); }
-  int t = regs_at(tos_index() - offset);
-  set_regs_at(tos_index() - offset, regs_at(tos_index()));
-  set_regs_at(tos_index(), t);
-}
-
-
-int FpuStackSim::offset_from_tos(int rnr) const {
-  for (int i = tos_index(); i >= 0; i--) {
-    if (regs_at(i) == rnr) {
-      return tos_index() - i;
-    }
-  }
-  assert(false, "FpuStackSim: register not found");
-  BAILOUT_("FpuStackSim: register not found", 0);
-}
-
-
-int FpuStackSim::get_slot(int tos_offset) const {
-  return regs_at(tos_index() - tos_offset);
-}
-
-void FpuStackSim::set_slot(int tos_offset, int rnr) {
-  set_regs_at(tos_index() - tos_offset, rnr);
-}
-
-void FpuStackSim::rename(int old_rnr, int new_rnr) {
-  if (TraceFPUStack) { tty->print("FPU-rename %d %d", old_rnr, new_rnr); print(); tty->cr(); }
-  if (old_rnr == new_rnr)
-    return;
-  bool found = false;
-  for (int i = 0; i < stack_size(); i++) {
-    assert(regs_at(i) != new_rnr, "should not see old occurrences of new_rnr on the stack");
-    if (regs_at(i) == old_rnr) {
-      set_regs_at(i, new_rnr);
-      found = true;
-    }
-  }
-  assert(found, "should have found at least one instance of old_rnr");
-}
-
-
-bool FpuStackSim::contains(int rnr) {
-  for (int i = 0; i < stack_size(); i++) {
-    if (regs_at(i) == rnr) {
-      return true;
-    }
-  }
-  return false;
-}
-
-bool FpuStackSim::is_empty() {
-#ifdef ASSERT
-  if (stack_size() == 0) {
-    for (int i = 0; i < FrameMap::nof_fpu_regs; i++) {
-      assert(regs_at(i) == EMPTY, "must be empty");
-    }
-  }
-#endif
-  return stack_size() == 0;
-}
-
-
-bool FpuStackSim::slot_is_empty(int tos_offset) {
-  return (regs_at(tos_index() - tos_offset) == EMPTY);
-}
-
-
-void FpuStackSim::clear() {
-  if (TraceFPUStack) { tty->print("FPU-clear"); print(); tty->cr(); }
-  for (int i = tos_index(); i >= 0; i--) {
-    set_regs_at(i, EMPTY);
-  }
-  _stack_size = 0;
-}
-
-
-intArray* FpuStackSim::write_state() {
-  intArray* res = new intArray(1 + FrameMap::nof_fpu_regs);
-  res->append(stack_size());
-  for (int i = 0; i < FrameMap::nof_fpu_regs; i++) {
-    res->append(regs_at(i));
-  }
-  return res;
-}
-
-
-void FpuStackSim::read_state(intArray* fpu_stack_state) {
-  _stack_size = fpu_stack_state->at(0);
-  for (int i = 0; i < FrameMap::nof_fpu_regs; i++) {
-    set_regs_at(i, fpu_stack_state->at(1 + i));
-  }
-}
-
-
-#ifndef PRODUCT
-void FpuStackSim::print() {
-  tty->print(" N=%d[", stack_size());\
-  for (int i = 0; i < stack_size(); i++) {
-    int reg = regs_at(i);
-    if (reg != EMPTY) {
-      tty->print("%d", reg);
-    } else {
-      tty->print("_");
-    }
-  };
-  tty->print(" ]");
-}
-#endif
diff --git a/src/hotspot/cpu/x86/c1_FpuStackSim_x86.hpp b/src/hotspot/cpu/x86/c1_FpuStackSim_x86.hpp
deleted file mode 100644
index 405aebe9a75..00000000000
--- a/src/hotspot/cpu/x86/c1_FpuStackSim_x86.hpp
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Copyright (c) 2005, 2019, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- *
- */
-
-#ifndef CPU_X86_C1_FPUSTACKSIM_X86_HPP
-#define CPU_X86_C1_FPUSTACKSIM_X86_HPP
-
-//  Simulates the FPU stack and maintains mapping [fpu-register -> stack offset]
-//  FPU registers are described as numbers from 0..nof_fpu_regs-1
-
-class Compilation;
-
-class FpuStackSim {
- private:
-  Compilation* _compilation;
-  int          _stack_size;
-  int          _regs[FrameMap::nof_fpu_regs];
-
-  int tos_index() const                        { return _stack_size - 1; }
-
-  int regs_at(int i) const;
-  void set_regs_at(int i, int val);
-  void dec_stack_size();
-  void inc_stack_size();
-
-  // unified bailout support
-  Compilation*  compilation() const              { return _compilation; }
-  void          bailout(const char* msg) const   { compilation()->bailout(msg); }
-  bool          bailed_out() const               { return compilation()->bailed_out(); }
-
- public:
-  FpuStackSim(Compilation* compilation);
-  void pop ();
-  void pop (int rnr);                          // rnr must be on tos
-  void push(int rnr);
-  void swap(int offset);                       // exchange tos with tos + offset
-  int offset_from_tos(int rnr) const;          // return the offset of the topmost instance of rnr from TOS
-  int  get_slot(int tos_offset) const;         // return the entry at the given offset from TOS
-  void set_slot(int tos_offset, int rnr);      // set the entry at the given offset from TOS
-  void rename(int old_rnr, int new_rnr);       // rename all instances of old_rnr to new_rnr
-  bool contains(int rnr);                      // debugging support only
-  bool is_empty();
-  bool slot_is_empty(int tos_offset);
-  int stack_size() const                       { return _stack_size; }
-  void clear();
-  intArray* write_state();
-  void read_state(intArray* fpu_stack_state);
-
-  void print() PRODUCT_RETURN;
-};
-
-#endif // CPU_X86_C1_FPUSTACKSIM_X86_HPP
diff --git a/src/hotspot/cpu/x86/c1_FrameMap_x86.cpp b/src/hotspot/cpu/x86/c1_FrameMap_x86.cpp
index cff2be393bc..e3c78792602 100644
--- a/src/hotspot/cpu/x86/c1_FrameMap_x86.cpp
+++ b/src/hotspot/cpu/x86/c1_FrameMap_x86.cpp
@@ -108,8 +108,6 @@ LIR_Opr FrameMap::rcx_metadata_opr;
 
 LIR_Opr FrameMap::long0_opr;
 LIR_Opr FrameMap::long1_opr;
-LIR_Opr FrameMap::fpu0_float_opr;
-LIR_Opr FrameMap::fpu0_double_opr;
 LIR_Opr FrameMap::xmm0_float_opr;
 LIR_Opr FrameMap::xmm0_double_opr;
 
@@ -194,8 +192,6 @@ void FrameMap::initialize() {
   long0_opr = LIR_OprFact::double_cpu(3 /*eax*/, 4 /*edx*/);
   long1_opr = LIR_OprFact::double_cpu(2 /*ebx*/, 5 /*ecx*/);
 #endif // _LP64
-  fpu0_float_opr   = LIR_OprFact::single_fpu(0);
-  fpu0_double_opr  = LIR_OprFact::double_fpu(0);
   xmm0_float_opr   = LIR_OprFact::single_xmm(0);
   xmm0_double_opr  = LIR_OprFact::double_xmm(0);
 
diff --git a/src/hotspot/cpu/x86/c1_FrameMap_x86.hpp b/src/hotspot/cpu/x86/c1_FrameMap_x86.hpp
index f2bedcb1d27..ce892efbed2 100644
--- a/src/hotspot/cpu/x86/c1_FrameMap_x86.hpp
+++ b/src/hotspot/cpu/x86/c1_FrameMap_x86.hpp
@@ -112,8 +112,6 @@
 
   static LIR_Opr long0_opr;
   static LIR_Opr long1_opr;
-  static LIR_Opr fpu0_float_opr;
-  static LIR_Opr fpu0_double_opr;
   static LIR_Opr xmm0_float_opr;
   static LIR_Opr xmm0_double_opr;
 
diff --git a/src/hotspot/cpu/x86/c1_LIRAssembler_x86.cpp b/src/hotspot/cpu/x86/c1_LIRAssembler_x86.cpp
index de1fa1a9cc6..ed16f81cba1 100644
--- a/src/hotspot/cpu/x86/c1_LIRAssembler_x86.cpp
+++ b/src/hotspot/cpu/x86/c1_LIRAssembler_x86.cpp
@@ -161,24 +161,6 @@ address LIR_Assembler::double_constant(double d) {
   }
 }
 
-#ifndef _LP64
-void LIR_Assembler::fpop() {
-  __ fpop();
-}
-
-void LIR_Assembler::fxch(int i) {
-  __ fxch(i);
-}
-
-void LIR_Assembler::fld(int i) {
-  __ fld_s(i);
-}
-
-void LIR_Assembler::ffree(int i) {
-  __ ffree(i);
-}
-#endif // !_LP64
-
 void LIR_Assembler::breakpoint() {
   __ int3();
 }
@@ -602,52 +584,28 @@ void LIR_Assembler::const2reg(LIR_Opr src, LIR_Opr dest, LIR_PatchCode patch_cod
 
     case T_FLOAT: {
       if (dest->is_single_xmm()) {
-        if (LP64_ONLY(UseAVX <= 2 &&) c->is_zero_float()) {
+        if (UseAVX <= 2 && c->is_zero_float()) {
           __ xorps(dest->as_xmm_float_reg(), dest->as_xmm_float_reg());
         } else {
           __ movflt(dest->as_xmm_float_reg(),
                    InternalAddress(float_constant(c->as_jfloat())));
         }
       } else {
-#ifndef _LP64
-        assert(dest->is_single_fpu(), "must be");
-        assert(dest->fpu_regnr() == 0, "dest must be TOS");
-        if (c->is_zero_float()) {
-          __ fldz();
-        } else if (c->is_one_float()) {
-          __ fld1();
-        } else {
-          __ fld_s (InternalAddress(float_constant(c->as_jfloat())));
-        }
-#else
         ShouldNotReachHere();
-#endif // !_LP64
       }
       break;
     }
 
     case T_DOUBLE: {
       if (dest->is_double_xmm()) {
-        if (LP64_ONLY(UseAVX <= 2 &&) c->is_zero_double()) {
+        if (UseAVX <= 2 && c->is_zero_double()) {
           __ xorpd(dest->as_xmm_double_reg(), dest->as_xmm_double_reg());
         } else {
           __ movdbl(dest->as_xmm_double_reg(),
                     InternalAddress(double_constant(c->as_jdouble())));
         }
       } else {
-#ifndef _LP64
-        assert(dest->is_double_fpu(), "must be");
-        assert(dest->fpu_regnrLo() == 0, "dest must be TOS");
-        if (c->is_zero_double()) {
-          __ fldz();
-        } else if (c->is_one_double()) {
-          __ fld1();
-        } else {
-          __ fld_d (InternalAddress(double_constant(c->as_jdouble())));
-        }
-#else
         ShouldNotReachHere();
-#endif // !_LP64
       }
       break;
     }
@@ -841,23 +799,6 @@ void LIR_Assembler::reg2reg(LIR_Opr src, LIR_Opr dest) {
     }
 #endif // LP64
 
-#ifndef _LP64
-    // special moves from fpu-register to xmm-register
-    // necessary for method results
-  } else if (src->is_single_xmm() && !dest->is_single_xmm()) {
-    __ movflt(Address(rsp, 0), src->as_xmm_float_reg());
-    __ fld_s(Address(rsp, 0));
-  } else if (src->is_double_xmm() && !dest->is_double_xmm()) {
-    __ movdbl(Address(rsp, 0), src->as_xmm_double_reg());
-    __ fld_d(Address(rsp, 0));
-  } else if (dest->is_single_xmm() && !src->is_single_xmm()) {
-    __ fstp_s(Address(rsp, 0));
-    __ movflt(dest->as_xmm_float_reg(), Address(rsp, 0));
-  } else if (dest->is_double_xmm() && !src->is_double_xmm()) {
-    __ fstp_d(Address(rsp, 0));
-    __ movdbl(dest->as_xmm_double_reg(), Address(rsp, 0));
-#endif // !_LP64
-
     // move between xmm-registers
   } else if (dest->is_single_xmm()) {
     assert(src->is_single_xmm(), "must match");
@@ -866,19 +807,12 @@ void LIR_Assembler::reg2reg(LIR_Opr src, LIR_Opr dest) {
     assert(src->is_double_xmm(), "must match");
     __ movdbl(dest->as_xmm_double_reg(), src->as_xmm_double_reg());
 
-#ifndef _LP64
-    // move between fpu-registers (no instruction necessary because of fpu-stack)
-  } else if (dest->is_single_fpu() || dest->is_double_fpu()) {
-    assert(src->is_single_fpu() || src->is_double_fpu(), "must match");
-    assert(src->fpu() == dest->fpu(), "currently should be nothing to do");
-#endif // !_LP64
-
   } else {
     ShouldNotReachHere();
   }
 }
 
-void LIR_Assembler::reg2stack(LIR_Opr src, LIR_Opr dest, BasicType type, bool pop_fpu_stack) {
+void LIR_Assembler::reg2stack(LIR_Opr src, LIR_Opr dest, BasicType type) {
   assert(src->is_register(), "should not call otherwise");
   assert(dest->is_stack(), "should not call otherwise");
 
@@ -907,27 +841,13 @@ void LIR_Assembler::reg2stack(LIR_Opr src, LIR_Opr dest, BasicType type, bool po
     Address dst_addr = frame_map()->address_for_slot(dest->double_stack_ix());
     __ movdbl(dst_addr, src->as_xmm_double_reg());
 
-#ifndef _LP64
-  } else if (src->is_single_fpu()) {
-    assert(src->fpu_regnr() == 0, "argument must be on TOS");
-    Address dst_addr = frame_map()->address_for_slot(dest->single_stack_ix());
-    if (pop_fpu_stack)     __ fstp_s (dst_addr);
-    else                   __ fst_s  (dst_addr);
-
-  } else if (src->is_double_fpu()) {
-    assert(src->fpu_regnrLo() == 0, "argument must be on TOS");
-    Address dst_addr = frame_map()->address_for_slot(dest->double_stack_ix());
-    if (pop_fpu_stack)     __ fstp_d (dst_addr);
-    else                   __ fst_d  (dst_addr);
-#endif // !_LP64
-
   } else {
     ShouldNotReachHere();
   }
 }
 
 
-void LIR_Assembler::reg2mem(LIR_Opr src, LIR_Opr dest, BasicType type, LIR_PatchCode patch_code, CodeEmitInfo* info, bool pop_fpu_stack, bool wide) {
+void LIR_Assembler::reg2mem(LIR_Opr src, LIR_Opr dest, BasicType type, LIR_PatchCode patch_code, CodeEmitInfo* info, bool wide) {
   LIR_Address* to_addr = dest->as_address_ptr();
   PatchingStub* patch = nullptr;
   Register compressed_src = rscratch1;
@@ -954,36 +874,14 @@ void LIR_Assembler::reg2mem(LIR_Opr src, LIR_Opr dest, BasicType type, LIR_Patch
   int null_check_here = code_offset();
   switch (type) {
     case T_FLOAT: {
-#ifdef _LP64
       assert(src->is_single_xmm(), "not a float");
       __ movflt(as_Address(to_addr), src->as_xmm_float_reg());
-#else
-      if (src->is_single_xmm()) {
-        __ movflt(as_Address(to_addr), src->as_xmm_float_reg());
-      } else {
-        assert(src->is_single_fpu(), "must be");
-        assert(src->fpu_regnr() == 0, "argument must be on TOS");
-        if (pop_fpu_stack)      __ fstp_s(as_Address(to_addr));
-        else                    __ fst_s (as_Address(to_addr));
-      }
-#endif // _LP64
       break;
     }
 
     case T_DOUBLE: {
-#ifdef _LP64
       assert(src->is_double_xmm(), "not a double");
       __ movdbl(as_Address(to_addr), src->as_xmm_double_reg());
-#else
-      if (src->is_double_xmm()) {
-        __ movdbl(as_Address(to_addr), src->as_xmm_double_reg());
-      } else {
-        assert(src->is_double_fpu(), "must be");
-        assert(src->fpu_regnrLo() == 0, "argument must be on TOS");
-        if (pop_fpu_stack)      __ fstp_d(as_Address(to_addr));
-        else                    __ fst_d (as_Address(to_addr));
-      }
-#endif // _LP64
       break;
     }
 
@@ -1100,18 +998,6 @@ void LIR_Assembler::stack2reg(LIR_Opr src, LIR_Opr dest, BasicType type) {
     Address src_addr = frame_map()->address_for_slot(src->double_stack_ix());
     __ movdbl(dest->as_xmm_double_reg(), src_addr);
 
-#ifndef _LP64
-  } else if (dest->is_single_fpu()) {
-    assert(dest->fpu_regnr() == 0, "dest must be TOS");
-    Address src_addr = frame_map()->address_for_slot(src->single_stack_ix());
-    __ fld_s(src_addr);
-
-  } else if (dest->is_double_fpu()) {
-    assert(dest->fpu_regnrLo() == 0, "dest must be TOS");
-    Address src_addr = frame_map()->address_for_slot(src->double_stack_ix());
-    __ fld_d(src_addr);
-#endif // _LP64
-
   } else {
     ShouldNotReachHere();
   }
@@ -1194,13 +1080,7 @@ void LIR_Assembler::mem2reg(LIR_Opr src, LIR_Opr dest, BasicType type, LIR_Patch
       if (dest->is_single_xmm()) {
         __ movflt(dest->as_xmm_float_reg(), from_addr);
       } else {
-#ifndef _LP64
-        assert(dest->is_single_fpu(), "must be");
-        assert(dest->fpu_regnr() == 0, "dest must be TOS");
-        __ fld_s(from_addr);
-#else
         ShouldNotReachHere();
-#endif // !LP64
       }
       break;
     }
@@ -1209,13 +1089,7 @@ void LIR_Assembler::mem2reg(LIR_Opr src, LIR_Opr dest, BasicType type, LIR_Patch
       if (dest->is_double_xmm()) {
         __ movdbl(dest->as_xmm_double_reg(), from_addr);
       } else {
-#ifndef _LP64
-        assert(dest->is_double_fpu(), "must be");
-        assert(dest->fpu_regnrLo() == 0, "dest must be TOS");
-        __ fld_d(from_addr);
-#else
         ShouldNotReachHere();
-#endif // !LP64
       }
       break;
     }
@@ -1457,8 +1331,6 @@ void LIR_Assembler::emit_opConvert(LIR_OpConvert* op) {
       __ sign_extend_short(dest->as_register());
       break;
 
-
-#ifdef _LP64
     case Bytecodes::_f2d:
       __ cvtss2sd(dest->as_xmm_double_reg(), src->as_xmm_float_reg());
       break;
@@ -1498,74 +1370,6 @@ void LIR_Assembler::emit_opConvert(LIR_OpConvert* op) {
     case Bytecodes::_d2l:
       __ convert_d2l(dest->as_register_lo(), src->as_xmm_double_reg());
       break;
-#else
-    case Bytecodes::_f2d:
-    case Bytecodes::_d2f:
-      if (dest->is_single_xmm()) {
-        __ cvtsd2ss(dest->as_xmm_float_reg(), src->as_xmm_double_reg());
-      } else if (dest->is_double_xmm()) {
-        __ cvtss2sd(dest->as_xmm_double_reg(), src->as_xmm_float_reg());
-      } else {
-        assert(src->fpu() == dest->fpu(), "register must be equal");
-        // do nothing (float result is rounded later through spilling)
-      }
-      break;
-
-    case Bytecodes::_i2f:
-    case Bytecodes::_i2d:
-      if (dest->is_single_xmm()) {
-        __ cvtsi2ssl(dest->as_xmm_float_reg(), src->as_register());
-      } else if (dest->is_double_xmm()) {
-        __ cvtsi2sdl(dest->as_xmm_double_reg(), src->as_register());
-      } else {
-        assert(dest->fpu() == 0, "result must be on TOS");
-        __ movl(Address(rsp, 0), src->as_register());
-        __ fild_s(Address(rsp, 0));
-      }
-      break;
-
-    case Bytecodes::_l2f:
-    case Bytecodes::_l2d:
-      assert(!dest->is_xmm_register(), "result in xmm register not supported (no SSE instruction present)");
-      assert(dest->fpu() == 0, "result must be on TOS");
-      __ movptr(Address(rsp, 0),          src->as_register_lo());
-      __ movl(Address(rsp, BytesPerWord), src->as_register_hi());
-      __ fild_d(Address(rsp, 0));
-      // float result is rounded later through spilling
-      break;
-
-    case Bytecodes::_f2i:
-    case Bytecodes::_d2i:
-      if (src->is_single_xmm()) {
-        __ cvttss2sil(dest->as_register(), src->as_xmm_float_reg());
-      } else if (src->is_double_xmm()) {
-        __ cvttsd2sil(dest->as_register(), src->as_xmm_double_reg());
-      } else {
-        assert(src->fpu() == 0, "input must be on TOS");
-        __ fldcw(ExternalAddress(StubRoutines::x86::addr_fpu_cntrl_wrd_trunc()));
-        __ fist_s(Address(rsp, 0));
-        __ movl(dest->as_register(), Address(rsp, 0));
-        __ fldcw(ExternalAddress(StubRoutines::x86::addr_fpu_cntrl_wrd_std()));
-      }
-      // IA32 conversion instructions do not match JLS for overflow, underflow and NaN -> fixup in stub
-      assert(op->stub() != nullptr, "stub required");
-      __ cmpl(dest->as_register(), 0x80000000);
-      __ jcc(Assembler::equal, *op->stub()->entry());
-      __ bind(*op->stub()->continuation());
-      break;
-
-    case Bytecodes::_f2l:
-    case Bytecodes::_d2l:
-      assert(!src->is_xmm_register(), "input in xmm register not supported (no SSE instruction present)");
-      assert(src->fpu() == 0, "input must be on TOS");
-      assert(dest == FrameMap::long0_opr, "runtime stub places result in these registers");
-
-      // instruction sequence too long to inline it here
-      {
-        __ call(RuntimeAddress(Runtime1::entry_for(C1StubId::fpu2long_stub_id)));
-      }
-      break;
-#endif // _LP64
 
     default: ShouldNotReachHere();
   }
@@ -2032,7 +1836,7 @@ void LIR_Assembler::cmove(LIR_Condition condition, LIR_Opr opr1, LIR_Opr opr2, L
 }
 
 
-void LIR_Assembler::arith_op(LIR_Code code, LIR_Opr left, LIR_Opr right, LIR_Opr dest, CodeEmitInfo* info, bool pop_fpu_stack) {
+void LIR_Assembler::arith_op(LIR_Code code, LIR_Opr left, LIR_Opr right, LIR_Opr dest, CodeEmitInfo* info) {
   assert(info == nullptr, "should never be used, idiv/irem and ldiv/lrem not handled by this method");
 
   if (left->is_single_cpu()) {
@@ -2213,80 +2017,6 @@ void LIR_Assembler::arith_op(LIR_Code code, LIR_Opr left, LIR_Opr right, LIR_Opr
       }
     }
 
-#ifndef _LP64
-  } else if (left->is_single_fpu()) {
-    assert(dest->is_single_fpu(),  "fpu stack allocation required");
-
-    if (right->is_single_fpu()) {
-      arith_fpu_implementation(code, left->fpu_regnr(), right->fpu_regnr(), dest->fpu_regnr(), pop_fpu_stack);
-
-    } else {
-      assert(left->fpu_regnr() == 0, "left must be on TOS");
-      assert(dest->fpu_regnr() == 0, "dest must be on TOS");
-
-      Address raddr;
-      if (right->is_single_stack()) {
-        raddr = frame_map()->address_for_slot(right->single_stack_ix());
-      } else if (right->is_constant()) {
-        address const_addr = float_constant(right->as_jfloat());
-        assert(const_addr != nullptr, "incorrect float/double constant maintenance");
-        // hack for now
-        raddr = __ as_Address(InternalAddress(const_addr));
-      } else {
-        ShouldNotReachHere();
-      }
-
-      switch (code) {
-        case lir_add: __ fadd_s(raddr); break;
-        case lir_sub: __ fsub_s(raddr); break;
-        case lir_mul: __ fmul_s(raddr); break;
-        case lir_div: __ fdiv_s(raddr); break;
-        default:      ShouldNotReachHere();
-      }
-    }
-
-  } else if (left->is_double_fpu()) {
-    assert(dest->is_double_fpu(),  "fpu stack allocation required");
-
-    if (code == lir_mul || code == lir_div) {
-      // Double values require special handling for strictfp mul/div on x86
-      __ fld_x(ExternalAddress(StubRoutines::x86::addr_fpu_subnormal_bias1()));
-      __ fmulp(left->fpu_regnrLo() + 1);
-    }
-
-    if (right->is_double_fpu()) {
-      arith_fpu_implementation(code, left->fpu_regnrLo(), right->fpu_regnrLo(), dest->fpu_regnrLo(), pop_fpu_stack);
-
-    } else {
-      assert(left->fpu_regnrLo() == 0, "left must be on TOS");
-      assert(dest->fpu_regnrLo() == 0, "dest must be on TOS");
-
-      Address raddr;
-      if (right->is_double_stack()) {
-        raddr = frame_map()->address_for_slot(right->double_stack_ix());
-      } else if (right->is_constant()) {
-        // hack for now
-        raddr = __ as_Address(InternalAddress(double_constant(right->as_jdouble())));
-      } else {
-        ShouldNotReachHere();
-      }
-
-      switch (code) {
-        case lir_add: __ fadd_d(raddr); break;
-        case lir_sub: __ fsub_d(raddr); break;
-        case lir_mul: __ fmul_d(raddr); break;
-        case lir_div: __ fdiv_d(raddr); break;
-        default: ShouldNotReachHere();
-      }
-    }
-
-    if (code == lir_mul || code == lir_div) {
-      // Double values require special handling for strictfp mul/div on x86
-      __ fld_x(ExternalAddress(StubRoutines::x86::addr_fpu_subnormal_bias2()));
-      __ fmulp(dest->fpu_regnrLo() + 1);
-    }
-#endif // !_LP64
-
   } else if (left->is_single_stack() || left->is_address()) {
     assert(left == dest, "left and dest must be equal");
 
@@ -2328,64 +2058,6 @@ void LIR_Assembler::arith_op(LIR_Code code, LIR_Opr left, LIR_Opr right, LIR_Opr
   }
 }
 
-#ifndef _LP64
-void LIR_Assembler::arith_fpu_implementation(LIR_Code code, int left_index, int right_index, int dest_index, bool pop_fpu_stack) {
-  assert(pop_fpu_stack  || (left_index     == dest_index || right_index     == dest_index), "invalid LIR");
-  assert(!pop_fpu_stack || (left_index - 1 == dest_index || right_index - 1 == dest_index), "invalid LIR");
-  assert(left_index == 0 || right_index == 0, "either must be on top of stack");
-
-  bool left_is_tos = (left_index == 0);
-  bool dest_is_tos = (dest_index == 0);
-  int non_tos_index = (left_is_tos ? right_index : left_index);
-
-  switch (code) {
-    case lir_add:
-      if (pop_fpu_stack)       __ faddp(non_tos_index);
-      else if (dest_is_tos)    __ fadd (non_tos_index);
-      else                     __ fadda(non_tos_index);
-      break;
-
-    case lir_sub:
-      if (left_is_tos) {
-        if (pop_fpu_stack)     __ fsubrp(non_tos_index);
-        else if (dest_is_tos)  __ fsub  (non_tos_index);
-        else                   __ fsubra(non_tos_index);
-      } else {
-        if (pop_fpu_stack)     __ fsubp (non_tos_index);
-        else if (dest_is_tos)  __ fsubr (non_tos_index);
-        else                   __ fsuba (non_tos_index);
-      }
-      break;
-
-    case lir_mul:
-      if (pop_fpu_stack)       __ fmulp(non_tos_index);
-      else if (dest_is_tos)    __ fmul (non_tos_index);
-      else                     __ fmula(non_tos_index);
-      break;
-
-    case lir_div:
-      if (left_is_tos) {
-        if (pop_fpu_stack)     __ fdivrp(non_tos_index);
-        else if (dest_is_tos)  __ fdiv  (non_tos_index);
-        else                   __ fdivra(non_tos_index);
-      } else {
-        if (pop_fpu_stack)     __ fdivp (non_tos_index);
-        else if (dest_is_tos)  __ fdivr (non_tos_index);
-        else                   __ fdiva (non_tos_index);
-      }
-      break;
-
-    case lir_rem:
-      assert(left_is_tos && dest_is_tos && right_index == 1, "must be guaranteed by FPU stack allocation");
-      __ fremr(noreg);
-      break;
-
-    default:
-      ShouldNotReachHere();
-  }
-}
-#endif // _LP64
-
 
 void LIR_Assembler::intrinsic_op(LIR_Code code, LIR_Opr value, LIR_Opr tmp, LIR_Opr dest, LIR_Op* op) {
   if (value->is_double_xmm()) {
@@ -2407,15 +2079,6 @@ void LIR_Assembler::intrinsic_op(LIR_Code code, LIR_Opr value, LIR_Opr tmp, LIR_
       default      : ShouldNotReachHere();
     }
 
-#ifndef _LP64
-  } else if (value->is_double_fpu()) {
-    assert(value->fpu_regnrLo() == 0 && dest->fpu_regnrLo() == 0, "both must be on TOS");
-    switch(code) {
-      case lir_abs   : __ fabs() ; break;
-      case lir_sqrt  : __ fsqrt(); break;
-      default      : ShouldNotReachHere();
-    }
-#endif // !_LP64
   } else if (code == lir_f2hf) {
     __ flt_to_flt16(dest->as_register(), value->as_xmm_float_reg(), tmp->as_xmm_float_reg());
   } else if (code == lir_hf2f) {
@@ -2733,13 +2396,6 @@ void LIR_Assembler::comp_op(LIR_Condition condition, LIR_Opr opr1, LIR_Opr opr2,
       ShouldNotReachHere();
     }
 
-#ifndef _LP64
-  } else if(opr1->is_single_fpu() || opr1->is_double_fpu()) {
-    assert(opr1->is_fpu_register() && opr1->fpu() == 0, "currently left-hand side must be on TOS (relax this restriction)");
-    assert(opr2->is_fpu_register(), "both must be registers");
-    __ fcmp(noreg, opr2->fpu(), op->fpu_pop_count() > 0, op->fpu_pop_count() > 1);
-#endif // LP64
-
   } else if (opr1->is_address() && opr2->is_constant()) {
     LIR_Const* c = opr2->as_constant_ptr();
 #ifdef _LP64
@@ -2782,16 +2438,7 @@ void LIR_Assembler::comp_fl2i(LIR_Code code, LIR_Opr left, LIR_Opr right, LIR_Op
       __ cmpsd2int(left->as_xmm_double_reg(), right->as_xmm_double_reg(), dst->as_register(), code == lir_ucmp_fd2i);
 
     } else {
-#ifdef _LP64
       ShouldNotReachHere();
-#else
-      assert(left->is_single_fpu() || left->is_double_fpu(), "must be");
-      assert(right->is_single_fpu() || right->is_double_fpu(), "must match");
-
-      assert(left->fpu() == 0, "left must be on TOS");
-      __ fcmp2int(dst->as_register(), code == lir_ucmp_fd2i, right->fpu(),
-                  op->fpu_pop_count() > 0, op->fpu_pop_count() > 1);
-#endif // LP64
     }
   } else {
     assert(code == lir_cmp_l2i, "check");
@@ -3804,13 +3451,6 @@ void LIR_Assembler::negate(LIR_Opr left, LIR_Opr dest, LIR_Opr tmp) {
     __ xorpd(dest->as_xmm_double_reg(),
              ExternalAddress((address)double_signflip_pool),
              rscratch1);
-#ifndef _LP64
-  } else if (left->is_single_fpu() || left->is_double_fpu()) {
-    assert(left->fpu() == 0, "arg must be on TOS");
-    assert(dest->fpu() == 0, "dest must be TOS");
-    __ fchs();
-#endif // !_LP64
-
   } else {
     ShouldNotReachHere();
   }
@@ -3879,29 +3519,6 @@ void LIR_Assembler::volatile_move_op(LIR_Opr src, LIR_Opr dest, BasicType type,
     } else {
       ShouldNotReachHere();
     }
-
-#ifndef _LP64
-  } else if (src->is_double_fpu()) {
-    assert(src->fpu_regnrLo() == 0, "must be TOS");
-    if (dest->is_double_stack()) {
-      __ fistp_d(frame_map()->address_for_slot(dest->double_stack_ix()));
-    } else if (dest->is_address()) {
-      __ fistp_d(as_Address(dest->as_address_ptr()));
-    } else {
-      ShouldNotReachHere();
-    }
-
-  } else if (dest->is_double_fpu()) {
-    assert(dest->fpu_regnrLo() == 0, "must be TOS");
-    if (src->is_double_stack()) {
-      __ fild_d(frame_map()->address_for_slot(src->double_stack_ix()));
-    } else if (src->is_address()) {
-      __ fild_d(as_Address(src->as_address_ptr()));
-    } else {
-      ShouldNotReachHere();
-    }
-#endif // !_LP64
-
   } else {
     ShouldNotReachHere();
   }
diff --git a/src/hotspot/cpu/x86/c1_LIRAssembler_x86.hpp b/src/hotspot/cpu/x86/c1_LIRAssembler_x86.hpp
index 7dae8ba8a5e..c8f97cece6d 100644
--- a/src/hotspot/cpu/x86/c1_LIRAssembler_x86.hpp
+++ b/src/hotspot/cpu/x86/c1_LIRAssembler_x86.hpp
@@ -58,13 +58,4 @@ public:
   void store_parameter(jobject c,   int offset_from_esp_in_words);
   void store_parameter(Metadata* c, int offset_from_esp_in_words);
 
-#ifndef _LP64
-  void arith_fpu_implementation(LIR_Code code, int left_index, int right_index, int dest_index, bool pop_fpu_stack);
-
-  void fpop();
-  void fxch(int i);
-  void fld(int i);
-  void ffree(int i);
-#endif // !_LP64
-
 #endif // CPU_X86_C1_LIRASSEMBLER_X86_HPP
diff --git a/src/hotspot/cpu/x86/c1_LIRGenerator_x86.cpp b/src/hotspot/cpu/x86/c1_LIRGenerator_x86.cpp
index 107107a75b9..fe6d6a58b00 100644
--- a/src/hotspot/cpu/x86/c1_LIRGenerator_x86.cpp
+++ b/src/hotspot/cpu/x86/c1_LIRGenerator_x86.cpp
@@ -92,13 +92,8 @@ LIR_Opr LIRGenerator::result_register_for(ValueType* type, bool callee) {
     case intTag:     opr = FrameMap::rax_opr;          break;
     case objectTag:  opr = FrameMap::rax_oop_opr;      break;
     case longTag:    opr = FrameMap::long0_opr;        break;
-#ifdef _LP64
     case floatTag:   opr = FrameMap::xmm0_float_opr;   break;
     case doubleTag:  opr = FrameMap::xmm0_double_opr;  break;
-#else
-    case floatTag:   opr = UseSSE >= 1 ? FrameMap::xmm0_float_opr  : FrameMap::fpu0_float_opr;  break;
-    case doubleTag:  opr = UseSSE >= 2 ? FrameMap::xmm0_double_opr : FrameMap::fpu0_double_opr;  break;
-#endif // _LP64
     case addressTag:
     default: ShouldNotReachHere(); return LIR_OprFact::illegalOpr;
   }
@@ -870,62 +865,6 @@ void LIRGenerator::do_LibmIntrinsic(Intrinsic* x) {
     value.load_item_force(cc->at(0));
   }
 
-#ifndef _LP64
-  LIR_Opr tmp = FrameMap::fpu0_double_opr;
-  result_reg = tmp;
-  switch(x->id()) {
-    case vmIntrinsics::_dexp:
-      if (StubRoutines::dexp() != nullptr) {
-        __ call_runtime_leaf(StubRoutines::dexp(), getThreadTemp(), result_reg, cc->args());
-      } else {
-        __ call_runtime_leaf(CAST_FROM_FN_PTR(address, SharedRuntime::dexp), getThreadTemp(), result_reg, cc->args());
-      }
-      break;
-    case vmIntrinsics::_dlog:
-      if (StubRoutines::dlog() != nullptr) {
-        __ call_runtime_leaf(StubRoutines::dlog(), getThreadTemp(), result_reg, cc->args());
-      } else {
-        __ call_runtime_leaf(CAST_FROM_FN_PTR(address, SharedRuntime::dlog), getThreadTemp(), result_reg, cc->args());
-      }
-      break;
-    case vmIntrinsics::_dlog10:
-      if (StubRoutines::dlog10() != nullptr) {
-       __ call_runtime_leaf(StubRoutines::dlog10(), getThreadTemp(), result_reg, cc->args());
-      } else {
-        __ call_runtime_leaf(CAST_FROM_FN_PTR(address, SharedRuntime::dlog10), getThreadTemp(), result_reg, cc->args());
-      }
-      break;
-    case vmIntrinsics::_dpow:
-      if (StubRoutines::dpow() != nullptr) {
-        __ call_runtime_leaf(StubRoutines::dpow(), getThreadTemp(), result_reg, cc->args());
-      } else {
-        __ call_runtime_leaf(CAST_FROM_FN_PTR(address, SharedRuntime::dpow), getThreadTemp(), result_reg, cc->args());
-      }
-      break;
-    case vmIntrinsics::_dsin:
-      if (VM_Version::supports_sse2() && StubRoutines::dsin() != nullptr) {
-        __ call_runtime_leaf(StubRoutines::dsin(), getThreadTemp(), result_reg, cc->args());
-      } else {
-        __ call_runtime_leaf(CAST_FROM_FN_PTR(address, SharedRuntime::dsin), getThreadTemp(), result_reg, cc->args());
-      }
-      break;
-    case vmIntrinsics::_dcos:
-      if (VM_Version::supports_sse2() && StubRoutines::dcos() != nullptr) {
-        __ call_runtime_leaf(StubRoutines::dcos(), getThreadTemp(), result_reg, cc->args());
-      } else {
-        __ call_runtime_leaf(CAST_FROM_FN_PTR(address, SharedRuntime::dcos), getThreadTemp(), result_reg, cc->args());
-      }
-      break;
-    case vmIntrinsics::_dtan:
-      if (StubRoutines::dtan() != nullptr) {
-        __ call_runtime_leaf(StubRoutines::dtan(), getThreadTemp(), result_reg, cc->args());
-      } else {
-        __ call_runtime_leaf(CAST_FROM_FN_PTR(address, SharedRuntime::dtan), getThreadTemp(), result_reg, cc->args());
-      }
-      break;
-    default:  ShouldNotReachHere();
-  }
-#else
   switch (x->id()) {
     case vmIntrinsics::_dexp:
       if (StubRoutines::dexp() != nullptr) {
@@ -984,7 +923,7 @@ void LIRGenerator::do_LibmIntrinsic(Intrinsic* x) {
       break;
     default:  ShouldNotReachHere();
   }
-#endif // _LP64
+
   __ move(result_reg, calc_result);
 }
 
@@ -1274,20 +1213,6 @@ void LIRGenerator::do_vectorizedMismatch(Intrinsic* x) {
   __ move(result_reg, result);
 }
 
-#ifndef _LP64
-// _i2l, _i2f, _i2d, _l2i, _l2f, _l2d, _f2i, _f2l, _f2d, _d2i, _d2l, _d2f
-// _i2b, _i2c, _i2s
-static LIR_Opr fixed_register_for(BasicType type) {
-  switch (type) {
-    case T_FLOAT:  return FrameMap::fpu0_float_opr;
-    case T_DOUBLE: return FrameMap::fpu0_double_opr;
-    case T_INT:    return FrameMap::rax_opr;
-    case T_LONG:   return FrameMap::long0_opr;
-    default:       ShouldNotReachHere(); return LIR_OprFact::illegalOpr;
-  }
-}
-#endif
-
 void LIRGenerator::do_Convert(Convert* x) {
 #ifdef _LP64
   LIRItem value(x->value(), this);
diff --git a/src/hotspot/cpu/x86/c1_LinearScan_x86.cpp b/src/hotspot/cpu/x86/c1_LinearScan_x86.cpp
deleted file mode 100644
index 58816098435..00000000000
--- a/src/hotspot/cpu/x86/c1_LinearScan_x86.cpp
+++ /dev/null
@@ -1,1113 +0,0 @@
-/*
- * Copyright (c) 2005, 2025, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please 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 "c1/c1_Instruction.hpp"
-#include "c1/c1_LinearScan.hpp"
-#include "utilities/bitMap.inline.hpp"
-
-
-#ifdef _LP64
-void LinearScan::allocate_fpu_stack() {
-  // No FPU stack used on x86-64
-}
-#else
-//----------------------------------------------------------------------
-// Allocation of FPU stack slots (Intel x86 only)
-//----------------------------------------------------------------------
-
-void LinearScan::allocate_fpu_stack() {
-  // First compute which FPU registers are live at the start of each basic block
-  // (To minimize the amount of work we have to do if we have to merge FPU stacks)
-  if (ComputeExactFPURegisterUsage) {
-    Interval* intervals_in_register, *intervals_in_memory;
-    create_unhandled_lists(&intervals_in_register, &intervals_in_memory, is_in_fpu_register, nullptr);
-
-    // ignore memory intervals by overwriting intervals_in_memory
-    // the dummy interval is needed to enforce the walker to walk until the given id:
-    // without it, the walker stops when the unhandled-list is empty -> live information
-    // beyond this point would be incorrect.
-    Interval* dummy_interval = new Interval(any_reg);
-    dummy_interval->add_range(max_jint - 2, max_jint - 1);
-    dummy_interval->set_next(Interval::end());
-    intervals_in_memory = dummy_interval;
-
-    IntervalWalker iw(this, intervals_in_register, intervals_in_memory);
-
-    const int num_blocks = block_count();
-    for (int i = 0; i < num_blocks; i++) {
-      BlockBegin* b = block_at(i);
-
-      // register usage is only needed for merging stacks -> compute only
-      // when more than one predecessor.
-      // the block must not have any spill moves at the beginning (checked by assertions)
-      // spill moves would use intervals that are marked as handled and so the usage bit
-      // would been set incorrectly
-
-      // NOTE: the check for number_of_preds > 1 is necessary. A block with only one
-      //       predecessor may have spill moves at the begin of the block.
-      //       If an interval ends at the current instruction id, it is not possible
-      //       to decide if the register is live or not at the block begin -> the
-      //       register information would be incorrect.
-      if (b->number_of_preds() > 1) {
-        int id = b->first_lir_instruction_id();
-        ResourceBitMap regs(FrameMap::nof_fpu_regs);
-
-        iw.walk_to(id);   // walk after the first instruction (always a label) of the block
-        assert(iw.current_position() == id, "did not walk completely to id");
-
-        // Only consider FPU values in registers
-        Interval* interval = iw.active_first(fixedKind);
-        while (interval != Interval::end()) {
-          int reg = interval->assigned_reg();
-          assert(reg >= pd_first_fpu_reg && reg <= pd_last_fpu_reg, "no fpu register");
-          assert(interval->assigned_regHi() == -1, "must not have hi register (doubles stored in one register)");
-          assert(interval->from() <= id && id < interval->to(), "interval out of range");
-
-#ifndef PRODUCT
-          if (TraceFPURegisterUsage) {
-            tty->print("fpu reg %d is live because of ", reg - pd_first_fpu_reg); interval->print();
-          }
-#endif
-
-          regs.set_bit(reg - pd_first_fpu_reg);
-          interval = interval->next();
-        }
-
-        b->set_fpu_register_usage(regs);
-
-#ifndef PRODUCT
-        if (TraceFPURegisterUsage) {
-          tty->print("FPU regs for block %d, LIR instr %d): ", b->block_id(), id); regs.print_on(tty); tty->cr();
-        }
-#endif
-      }
-    }
-  }
-
-  FpuStackAllocator alloc(ir()->compilation(), this);
-  _fpu_stack_allocator = &alloc;
-  alloc.allocate();
-  _fpu_stack_allocator = nullptr;
-}
-
-
-FpuStackAllocator::FpuStackAllocator(Compilation* compilation, LinearScan* allocator)
-  : _compilation(compilation)
-  , _allocator(allocator)
-  , _lir(nullptr)
-  , _pos(-1)
-  , _sim(compilation)
-  , _temp_sim(compilation)
-{}
-
-void FpuStackAllocator::allocate() {
-  int num_blocks = allocator()->block_count();
-  for (int i = 0; i < num_blocks; i++) {
-    // Set up to process block
-    BlockBegin* block = allocator()->block_at(i);
-    intArray* fpu_stack_state = block->fpu_stack_state();
-
-#ifndef PRODUCT
-    if (TraceFPUStack) {
-      tty->cr();
-      tty->print_cr("------- Begin of new Block %d -------", block->block_id());
-    }
-#endif
-
-    assert(fpu_stack_state != nullptr ||
-           block->end()->as_Base() != nullptr ||
-           block->is_set(BlockBegin::exception_entry_flag),
-           "FPU stack state must be present due to linear-scan order for FPU stack allocation");
-    // note: exception handler entries always start with an empty fpu stack
-    //       because stack merging would be too complicated
-
-    if (fpu_stack_state != nullptr) {
-      sim()->read_state(fpu_stack_state);
-    } else {
-      sim()->clear();
-    }
-
-#ifndef PRODUCT
-    if (TraceFPUStack) {
-      tty->print("Reading FPU state for block %d:", block->block_id());
-      sim()->print();
-      tty->cr();
-    }
-#endif
-
-    allocate_block(block);
-    CHECK_BAILOUT();
-  }
-}
-
-void FpuStackAllocator::allocate_block(BlockBegin* block) {
-  bool processed_merge = false;
-  LIR_OpList* insts = block->lir()->instructions_list();
-  set_lir(block->lir());
-  set_pos(0);
-
-
-  // Note: insts->length() may change during loop
-  while (pos() < insts->length()) {
-    LIR_Op* op = insts->at(pos());
-    _debug_information_computed = false;
-
-#ifndef PRODUCT
-    if (TraceFPUStack) {
-      op->print();
-    }
-    check_invalid_lir_op(op);
-#endif
-
-    LIR_OpBranch* branch = op->as_OpBranch();
-    LIR_Op1* op1 = op->as_Op1();
-    LIR_Op2* op2 = op->as_Op2();
-    LIR_OpCall* opCall = op->as_OpCall();
-
-    if (branch != nullptr && branch->block() != nullptr) {
-      if (!processed_merge) {
-        // propagate stack at first branch to a successor
-        processed_merge = true;
-        bool required_merge = merge_fpu_stack_with_successors(block);
-
-        assert(!required_merge || branch->cond() == lir_cond_always, "splitting of critical edges should prevent FPU stack mismatches at cond branches");
-      }
-
-    } else if (op1 != nullptr) {
-      handle_op1(op1);
-    } else if (op2 != nullptr) {
-      handle_op2(op2);
-    } else if (opCall != nullptr) {
-      handle_opCall(opCall);
-    }
-
-    compute_debug_information(op);
-
-    set_pos(1 + pos());
-  }
-
-  // Propagate stack when block does not end with branch
-  if (!processed_merge) {
-    merge_fpu_stack_with_successors(block);
-  }
-}
-
-
-void FpuStackAllocator::compute_debug_information(LIR_Op* op) {
-  if (!_debug_information_computed && op->id() != -1 && allocator()->has_info(op->id())) {
-    visitor.visit(op);
-
-    // exception handling
-    if (allocator()->compilation()->has_exception_handlers()) {
-      XHandlers* xhandlers = visitor.all_xhandler();
-      int n = xhandlers->length();
-      for (int k = 0; k < n; k++) {
-        allocate_exception_handler(xhandlers->handler_at(k));
-      }
-    } else {
-      assert(visitor.all_xhandler()->length() == 0, "missed exception handler");
-    }
-
-    // compute debug information
-    int n = visitor.info_count();
-    assert(n > 0, "should not visit operation otherwise");
-
-    for (int j = 0; j < n; j++) {
-      CodeEmitInfo* info = visitor.info_at(j);
-      // Compute debug information
-      allocator()->compute_debug_info(info, op->id());
-    }
-  }
-  _debug_information_computed = true;
-}
-
-void FpuStackAllocator::allocate_exception_handler(XHandler* xhandler) {
-  if (!sim()->is_empty()) {
-    LIR_List* old_lir = lir();
-    int old_pos = pos();
-    intArray* old_state = sim()->write_state();
-
-#ifndef PRODUCT
-    if (TraceFPUStack) {
-      tty->cr();
-      tty->print_cr("------- begin of exception handler -------");
-    }
-#endif
-
-    if (xhandler->entry_code() == nullptr) {
-      // need entry code to clear FPU stack
-      LIR_List* entry_code = new LIR_List(_compilation);
-      entry_code->jump(xhandler->entry_block());
-      xhandler->set_entry_code(entry_code);
-    }
-
-    LIR_OpList* insts = xhandler->entry_code()->instructions_list();
-    set_lir(xhandler->entry_code());
-    set_pos(0);
-
-    // Note: insts->length() may change during loop
-    while (pos() < insts->length()) {
-      LIR_Op* op = insts->at(pos());
-
-#ifndef PRODUCT
-      if (TraceFPUStack) {
-        op->print();
-      }
-      check_invalid_lir_op(op);
-#endif
-
-      switch (op->code()) {
-        case lir_move:
-          assert(op->as_Op1() != nullptr, "must be LIR_Op1");
-          assert(pos() != insts->length() - 1, "must not be last operation");
-
-          handle_op1((LIR_Op1*)op);
-          break;
-
-        case lir_branch:
-          assert(op->as_OpBranch()->cond() == lir_cond_always, "must be unconditional branch");
-          assert(pos() == insts->length() - 1, "must be last operation");
-
-          // remove all remaining dead registers from FPU stack
-          clear_fpu_stack(LIR_OprFact::illegalOpr);
-          break;
-
-        default:
-          // other operations not allowed in exception entry code
-          ShouldNotReachHere();
-      }
-
-      set_pos(pos() + 1);
-    }
-
-#ifndef PRODUCT
-    if (TraceFPUStack) {
-      tty->cr();
-      tty->print_cr("------- end of exception handler -------");
-    }
-#endif
-
-    set_lir(old_lir);
-    set_pos(old_pos);
-    sim()->read_state(old_state);
-  }
-}
-
-
-int FpuStackAllocator::fpu_num(LIR_Opr opr) {
-  assert(opr->is_fpu_register() && !opr->is_xmm_register(), "shouldn't call this otherwise");
-  return opr->is_single_fpu() ? opr->fpu_regnr() : opr->fpu_regnrLo();
-}
-
-int FpuStackAllocator::tos_offset(LIR_Opr opr) {
-  return sim()->offset_from_tos(fpu_num(opr));
-}
-
-
-LIR_Opr FpuStackAllocator::to_fpu_stack(LIR_Opr opr) {
-  assert(opr->is_fpu_register() && !opr->is_xmm_register(), "shouldn't call this otherwise");
-
-  int stack_offset = tos_offset(opr);
-  if (opr->is_single_fpu()) {
-    return LIR_OprFact::single_fpu(stack_offset)->make_fpu_stack_offset();
-  } else {
-    assert(opr->is_double_fpu(), "shouldn't call this otherwise");
-    return LIR_OprFact::double_fpu(stack_offset)->make_fpu_stack_offset();
-  }
-}
-
-LIR_Opr FpuStackAllocator::to_fpu_stack_top(LIR_Opr opr, bool dont_check_offset) {
-  assert(opr->is_fpu_register() && !opr->is_xmm_register(), "shouldn't call this otherwise");
-  assert(dont_check_offset || tos_offset(opr) == 0, "operand is not on stack top");
-
-  int stack_offset = 0;
-  if (opr->is_single_fpu()) {
-    return LIR_OprFact::single_fpu(stack_offset)->make_fpu_stack_offset();
-  } else {
-    assert(opr->is_double_fpu(), "shouldn't call this otherwise");
-    return LIR_OprFact::double_fpu(stack_offset)->make_fpu_stack_offset();
-  }
-}
-
-
-
-void FpuStackAllocator::insert_op(LIR_Op* op) {
-  lir()->insert_before(pos(), op);
-  set_pos(1 + pos());
-}
-
-
-void FpuStackAllocator::insert_exchange(int offset) {
-  if (offset > 0) {
-    LIR_Op1* fxch_op = new LIR_Op1(lir_fxch, LIR_OprFact::intConst(offset), LIR_OprFact::illegalOpr);
-    insert_op(fxch_op);
-    sim()->swap(offset);
-
-#ifndef PRODUCT
-    if (TraceFPUStack) {
-      tty->print("Exchanged register: %d         New state: ", sim()->get_slot(0)); sim()->print(); tty->cr();
-    }
-#endif
-
-  }
-}
-
-void FpuStackAllocator::insert_exchange(LIR_Opr opr) {
-  insert_exchange(tos_offset(opr));
-}
-
-
-void FpuStackAllocator::insert_free(int offset) {
-  // move stack slot to the top of stack and then pop it
-  insert_exchange(offset);
-
-  LIR_Op* fpop = new LIR_Op0(lir_fpop_raw);
-  insert_op(fpop);
-  sim()->pop();
-
-#ifndef PRODUCT
-    if (TraceFPUStack) {
-      tty->print("Inserted pop                   New state: "); sim()->print(); tty->cr();
-    }
-#endif
-}
-
-
-void FpuStackAllocator::insert_free_if_dead(LIR_Opr opr) {
-  if (sim()->contains(fpu_num(opr))) {
-    int res_slot = tos_offset(opr);
-    insert_free(res_slot);
-  }
-}
-
-void FpuStackAllocator::insert_free_if_dead(LIR_Opr opr, LIR_Opr ignore) {
-  if (fpu_num(opr) != fpu_num(ignore) && sim()->contains(fpu_num(opr))) {
-    int res_slot = tos_offset(opr);
-    insert_free(res_slot);
-  }
-}
-
-void FpuStackAllocator::insert_copy(LIR_Opr from, LIR_Opr to) {
-  int offset = tos_offset(from);
-  LIR_Op1* fld = new LIR_Op1(lir_fld, LIR_OprFact::intConst(offset), LIR_OprFact::illegalOpr);
-  insert_op(fld);
-
-  sim()->push(fpu_num(to));
-
-#ifndef PRODUCT
-  if (TraceFPUStack) {
-    tty->print("Inserted copy (%d -> %d)         New state: ", fpu_num(from), fpu_num(to)); sim()->print(); tty->cr();
-  }
-#endif
-}
-
-void FpuStackAllocator::do_rename(LIR_Opr from, LIR_Opr to) {
-  sim()->rename(fpu_num(from), fpu_num(to));
-}
-
-void FpuStackAllocator::do_push(LIR_Opr opr) {
-  sim()->push(fpu_num(opr));
-}
-
-void FpuStackAllocator::pop_if_last_use(LIR_Op* op, LIR_Opr opr) {
-  assert(op->fpu_pop_count() == 0, "fpu_pop_count already set");
-  assert(tos_offset(opr) == 0, "can only pop stack top");
-
-  if (opr->is_last_use()) {
-    op->set_fpu_pop_count(1);
-    sim()->pop();
-  }
-}
-
-void FpuStackAllocator::pop_always(LIR_Op* op, LIR_Opr opr) {
-  assert(op->fpu_pop_count() == 0, "fpu_pop_count already set");
-  assert(tos_offset(opr) == 0, "can only pop stack top");
-
-  op->set_fpu_pop_count(1);
-  sim()->pop();
-}
-
-void FpuStackAllocator::clear_fpu_stack(LIR_Opr preserve) {
-  int result_stack_size = (preserve->is_fpu_register() && !preserve->is_xmm_register() ? 1 : 0);
-  while (sim()->stack_size() > result_stack_size) {
-    assert(!sim()->slot_is_empty(0), "not allowed");
-
-    if (result_stack_size == 0 || sim()->get_slot(0) != fpu_num(preserve)) {
-      insert_free(0);
-    } else {
-      // move "preserve" to bottom of stack so that all other stack slots can be popped
-      insert_exchange(sim()->stack_size() - 1);
-    }
-  }
-}
-
-
-void FpuStackAllocator::handle_op1(LIR_Op1* op1) {
-  LIR_Opr in  = op1->in_opr();
-  LIR_Opr res = op1->result_opr();
-
-  LIR_Opr new_in  = in;  // new operands relative to the actual fpu stack top
-  LIR_Opr new_res = res;
-
-  // Note: this switch is processed for all LIR_Op1, regardless if they have FPU-arguments,
-  //       so checks for is_float_kind() are necessary inside the cases
-  switch (op1->code()) {
-
-    case lir_return: {
-      // FPU-Stack must only contain the (optional) fpu return value.
-      // All remaining dead values are popped from the stack
-      // If the input operand is a fpu-register, it is exchanged to the bottom of the stack
-
-      clear_fpu_stack(in);
-      if (in->is_fpu_register() && !in->is_xmm_register()) {
-        new_in = to_fpu_stack_top(in);
-      }
-
-      break;
-    }
-
-    case lir_move: {
-      if (in->is_fpu_register() && !in->is_xmm_register()) {
-        if (res->is_xmm_register()) {
-          // move from fpu register to xmm register (necessary for operations that
-          // are not available in the SSE instruction set)
-          insert_exchange(in);
-          new_in = to_fpu_stack_top(in);
-          pop_always(op1, in);
-
-        } else if (res->is_fpu_register() && !res->is_xmm_register()) {
-          // move from fpu-register to fpu-register:
-          // * input and result register equal:
-          //   nothing to do
-          // * input register is last use:
-          //   rename the input register to result register -> input register
-          //   not present on fpu-stack afterwards
-          // * input register not last use:
-          //   duplicate input register to result register to preserve input
-          //
-          // Note: The LIR-Assembler does not produce any code for fpu register moves,
-          //       so input and result stack index must be equal
-
-          if (fpu_num(in) == fpu_num(res)) {
-            // nothing to do
-          } else if (in->is_last_use()) {
-            insert_free_if_dead(res);//, in);
-            do_rename(in, res);
-          } else {
-            insert_free_if_dead(res);
-            insert_copy(in, res);
-          }
-          new_in = to_fpu_stack(res);
-          new_res = new_in;
-
-        } else {
-          // move from fpu-register to memory
-          // input operand must be on top of stack
-
-          insert_exchange(in);
-
-          // create debug information here because afterwards the register may have been popped
-          compute_debug_information(op1);
-
-          new_in = to_fpu_stack_top(in);
-          pop_if_last_use(op1, in);
-        }
-
-      } else if (res->is_fpu_register() && !res->is_xmm_register()) {
-        // move from memory/constant to fpu register
-        // result is pushed on the stack
-
-        insert_free_if_dead(res);
-
-        // create debug information before register is pushed
-        compute_debug_information(op1);
-
-        do_push(res);
-        new_res = to_fpu_stack_top(res);
-      }
-      break;
-    }
-
-    case lir_convert: {
-      Bytecodes::Code bc = op1->as_OpConvert()->bytecode();
-      switch (bc) {
-        case Bytecodes::_d2f:
-        case Bytecodes::_f2d:
-          assert(res->is_fpu_register(), "must be");
-          assert(in->is_fpu_register(), "must be");
-
-          if (!in->is_xmm_register() && !res->is_xmm_register()) {
-            // this is quite the same as a move from fpu-register to fpu-register
-            // Note: input and result operands must have different types
-            if (fpu_num(in) == fpu_num(res)) {
-              // nothing to do
-              new_in = to_fpu_stack(in);
-            } else if (in->is_last_use()) {
-              insert_free_if_dead(res);//, in);
-              new_in = to_fpu_stack(in);
-              do_rename(in, res);
-            } else {
-              insert_free_if_dead(res);
-              insert_copy(in, res);
-              new_in = to_fpu_stack_top(in, true);
-            }
-            new_res = to_fpu_stack(res);
-          }
-
-          break;
-
-        case Bytecodes::_i2f:
-        case Bytecodes::_l2f:
-        case Bytecodes::_i2d:
-        case Bytecodes::_l2d:
-          assert(res->is_fpu_register(), "must be");
-          if (!res->is_xmm_register()) {
-            insert_free_if_dead(res);
-            do_push(res);
-            new_res = to_fpu_stack_top(res);
-          }
-          break;
-
-        case Bytecodes::_f2i:
-        case Bytecodes::_d2i:
-          assert(in->is_fpu_register(), "must be");
-          if (!in->is_xmm_register()) {
-            insert_exchange(in);
-            new_in = to_fpu_stack_top(in);
-
-            // TODO: update registers of stub
-          }
-          break;
-
-        case Bytecodes::_f2l:
-        case Bytecodes::_d2l:
-          assert(in->is_fpu_register(), "must be");
-          if (!in->is_xmm_register()) {
-            insert_exchange(in);
-            new_in = to_fpu_stack_top(in);
-            pop_always(op1, in);
-          }
-          break;
-
-        case Bytecodes::_i2l:
-        case Bytecodes::_l2i:
-        case Bytecodes::_i2b:
-        case Bytecodes::_i2c:
-        case Bytecodes::_i2s:
-          // no fpu operands
-          break;
-
-        default:
-          ShouldNotReachHere();
-      }
-      break;
-    }
-
-    case lir_abs:
-    case lir_sqrt:
-    case lir_neg: {
-      assert(in->is_fpu_register(), "must be");
-      assert(res->is_fpu_register(), "must be");
-      assert(in->is_last_use(), "old value gets destroyed");
-
-      insert_free_if_dead(res, in);
-      insert_exchange(in);
-      do_rename(in, res);
-
-      new_in = to_fpu_stack_top(res);
-      new_res = new_in;
-
-      break;
-    }
-
-    default: {
-      assert(!in->is_float_kind() && !res->is_float_kind(), "missed a fpu-operation");
-    }
-  }
-
-  op1->set_in_opr(new_in);
-  op1->set_result_opr(new_res);
-}
-
-void FpuStackAllocator::handle_op2(LIR_Op2* op2) {
-  LIR_Opr left  = op2->in_opr1();
-  if (!left->is_float_kind()) {
-    return;
-  }
-  if (left->is_xmm_register()) {
-    return;
-  }
-
-  LIR_Opr right = op2->in_opr2();
-  LIR_Opr res   = op2->result_opr();
-  LIR_Opr new_left  = left;  // new operands relative to the actual fpu stack top
-  LIR_Opr new_right = right;
-  LIR_Opr new_res   = res;
-
-  assert(!left->is_xmm_register() && !right->is_xmm_register() && !res->is_xmm_register(), "not for xmm registers");
-
-  switch (op2->code()) {
-    case lir_cmp:
-    case lir_cmp_fd2i:
-    case lir_ucmp_fd2i:
-    case lir_assert: {
-      assert(left->is_fpu_register(), "invalid LIR");
-      assert(right->is_fpu_register(), "invalid LIR");
-
-      // the left-hand side must be on top of stack.
-      // the right-hand side is never popped, even if is_last_use is set
-      insert_exchange(left);
-      new_left = to_fpu_stack_top(left);
-      new_right = to_fpu_stack(right);
-      pop_if_last_use(op2, left);
-      break;
-    }
-
-    case lir_mul:
-    case lir_div: {
-      if (res->is_double_fpu()) {
-        assert(op2->tmp1_opr()->is_fpu_register(), "strict operations need temporary fpu stack slot");
-        insert_free_if_dead(op2->tmp1_opr());
-        assert(sim()->stack_size() <= 7, "at least one stack slot must be free");
-      }
-      // fall-through: continue with the normal handling of lir_mul and lir_div
-    }
-    case lir_add:
-    case lir_sub: {
-      assert(left->is_fpu_register(), "must be");
-      assert(res->is_fpu_register(), "must be");
-      assert(left->is_equal(res), "must be");
-
-      // either the left-hand or the right-hand side must be on top of stack
-      // (if right is not a register, left must be on top)
-      if (!right->is_fpu_register()) {
-        insert_exchange(left);
-        new_left = to_fpu_stack_top(left);
-      } else {
-        // no exchange necessary if right is already on top of stack
-        if (tos_offset(right) == 0) {
-          new_left = to_fpu_stack(left);
-          new_right = to_fpu_stack_top(right);
-        } else {
-          insert_exchange(left);
-          new_left = to_fpu_stack_top(left);
-          new_right = to_fpu_stack(right);
-        }
-
-        if (right->is_last_use()) {
-          op2->set_fpu_pop_count(1);
-
-          if (tos_offset(right) == 0) {
-            sim()->pop();
-          } else {
-            // if left is on top of stack, the result is placed in the stack
-            // slot of right, so a renaming from right to res is necessary
-            assert(tos_offset(left) == 0, "must be");
-            sim()->pop();
-            do_rename(right, res);
-          }
-        }
-      }
-      new_res = to_fpu_stack(res);
-
-      break;
-    }
-
-    case lir_rem: {
-      assert(left->is_fpu_register(), "must be");
-      assert(right->is_fpu_register(), "must be");
-      assert(res->is_fpu_register(), "must be");
-      assert(left->is_equal(res), "must be");
-
-      // Must bring both operands to top of stack with following operand ordering:
-      // * fpu stack before rem: ... right left
-      // * fpu stack after rem:  ... left
-      if (tos_offset(right) != 1) {
-        insert_exchange(right);
-        insert_exchange(1);
-      }
-      insert_exchange(left);
-      assert(tos_offset(right) == 1, "check");
-      assert(tos_offset(left) == 0, "check");
-
-      new_left = to_fpu_stack_top(left);
-      new_right = to_fpu_stack(right);
-
-      op2->set_fpu_pop_count(1);
-      sim()->pop();
-      do_rename(right, res);
-
-      new_res = to_fpu_stack_top(res);
-      break;
-    }
-
-    default: {
-      assert(false, "missed a fpu-operation");
-    }
-  }
-
-  op2->set_in_opr1(new_left);
-  op2->set_in_opr2(new_right);
-  op2->set_result_opr(new_res);
-}
-
-void FpuStackAllocator::handle_opCall(LIR_OpCall* opCall) {
-  LIR_Opr res = opCall->result_opr();
-
-  // clear fpu-stack before call
-  // it may contain dead values that could not have been removed by previous operations
-  clear_fpu_stack(LIR_OprFact::illegalOpr);
-  assert(sim()->is_empty(), "fpu stack must be empty now");
-
-  // compute debug information before (possible) fpu result is pushed
-  compute_debug_information(opCall);
-
-  if (res->is_fpu_register() && !res->is_xmm_register()) {
-    do_push(res);
-    opCall->set_result_opr(to_fpu_stack_top(res));
-  }
-}
-
-#ifndef PRODUCT
-void FpuStackAllocator::check_invalid_lir_op(LIR_Op* op) {
-  switch (op->code()) {
-    case lir_fpop_raw:
-    case lir_fxch:
-    case lir_fld:
-      assert(false, "operations only inserted by FpuStackAllocator");
-      break;
-
-    default:
-      break;
-  }
-}
-#endif
-
-
-void FpuStackAllocator::merge_insert_add(LIR_List* instrs, FpuStackSim* cur_sim, int reg) {
-  LIR_Op1* move = new LIR_Op1(lir_move, LIR_OprFact::doubleConst(0), LIR_OprFact::double_fpu(reg)->make_fpu_stack_offset());
-
-  instrs->instructions_list()->push(move);
-
-  cur_sim->push(reg);
-  move->set_result_opr(to_fpu_stack(move->result_opr()));
-
-  #ifndef PRODUCT
-    if (TraceFPUStack) {
-      tty->print("Added new register: %d         New state: ", reg); cur_sim->print(); tty->cr();
-    }
-  #endif
-}
-
-void FpuStackAllocator::merge_insert_xchg(LIR_List* instrs, FpuStackSim* cur_sim, int slot) {
-  assert(slot > 0, "no exchange necessary");
-
-  LIR_Op1* fxch = new LIR_Op1(lir_fxch, LIR_OprFact::intConst(slot));
-  instrs->instructions_list()->push(fxch);
-  cur_sim->swap(slot);
-
-  #ifndef PRODUCT
-    if (TraceFPUStack) {
-      tty->print("Exchanged register: %d         New state: ", cur_sim->get_slot(slot)); cur_sim->print(); tty->cr();
-    }
-  #endif
-}
-
-void FpuStackAllocator::merge_insert_pop(LIR_List* instrs, FpuStackSim* cur_sim) {
-  int reg = cur_sim->get_slot(0);
-
-  LIR_Op* fpop = new LIR_Op0(lir_fpop_raw);
-  instrs->instructions_list()->push(fpop);
-  cur_sim->pop(reg);
-
-  #ifndef PRODUCT
-    if (TraceFPUStack) {
-      tty->print("Removed register: %d           New state: ", reg); cur_sim->print(); tty->cr();
-    }
-  #endif
-}
-
-bool FpuStackAllocator::merge_rename(FpuStackSim* cur_sim, FpuStackSim* sux_sim, int start_slot, int change_slot) {
-  int reg = cur_sim->get_slot(change_slot);
-
-  for (int slot = start_slot; slot >= 0; slot--) {
-    int new_reg = sux_sim->get_slot(slot);
-
-    if (!cur_sim->contains(new_reg)) {
-      cur_sim->set_slot(change_slot, new_reg);
-
-      #ifndef PRODUCT
-        if (TraceFPUStack) {
-          tty->print("Renamed register %d to %d       New state: ", reg, new_reg); cur_sim->print(); tty->cr();
-        }
-      #endif
-
-      return true;
-    }
-  }
-  return false;
-}
-
-
-void FpuStackAllocator::merge_fpu_stack(LIR_List* instrs, FpuStackSim* cur_sim, FpuStackSim* sux_sim) {
-#ifndef PRODUCT
-  if (TraceFPUStack) {
-    tty->cr();
-    tty->print("before merging: pred: "); cur_sim->print(); tty->cr();
-    tty->print("                 sux: "); sux_sim->print(); tty->cr();
-  }
-
-  int slot;
-  for (slot = 0; slot < cur_sim->stack_size(); slot++) {
-    assert(!cur_sim->slot_is_empty(slot), "not handled by algorithm");
-  }
-  for (slot = 0; slot < sux_sim->stack_size(); slot++) {
-    assert(!sux_sim->slot_is_empty(slot), "not handled by algorithm");
-  }
-#endif
-
-  // size difference between cur and sux that must be resolved by adding or removing values form the stack
-  int size_diff = cur_sim->stack_size() - sux_sim->stack_size();
-
-  if (!ComputeExactFPURegisterUsage) {
-    // add slots that are currently free, but used in successor
-    // When the exact FPU register usage is computed, the stack does
-    // not contain dead values at merging -> no values must be added
-
-    int sux_slot = sux_sim->stack_size() - 1;
-    while (size_diff < 0) {
-      assert(sux_slot >= 0, "slot out of bounds -> error in algorithm");
-
-      int reg = sux_sim->get_slot(sux_slot);
-      if (!cur_sim->contains(reg)) {
-        merge_insert_add(instrs, cur_sim, reg);
-        size_diff++;
-
-        if (sux_slot + size_diff != 0) {
-          merge_insert_xchg(instrs, cur_sim, sux_slot + size_diff);
-        }
-      }
-     sux_slot--;
-    }
-  }
-
-  assert(cur_sim->stack_size() >= sux_sim->stack_size(), "stack size must be equal or greater now");
-  assert(size_diff == cur_sim->stack_size() - sux_sim->stack_size(), "must be");
-
-  // stack merge algorithm:
-  // 1) as long as the current stack top is not in the right location (that means
-  //    it should not be on the stack top), exchange it into the right location
-  // 2) if the stack top is right, but the remaining stack is not ordered correctly,
-  //    the stack top is exchanged away to get another value on top ->
-  //    now step 1) can be continued
-  // the stack can also contain unused items -> these items are removed from stack
-
-  int finished_slot = sux_sim->stack_size() - 1;
-  while (finished_slot >= 0 || size_diff > 0) {
-    while (size_diff > 0 || (cur_sim->stack_size() > 0 && cur_sim->get_slot(0) != sux_sim->get_slot(0))) {
-      int reg = cur_sim->get_slot(0);
-      if (sux_sim->contains(reg)) {
-        int sux_slot = sux_sim->offset_from_tos(reg);
-        merge_insert_xchg(instrs, cur_sim, sux_slot + size_diff);
-
-      } else if (!merge_rename(cur_sim, sux_sim, finished_slot, 0)) {
-        assert(size_diff > 0, "must be");
-
-        merge_insert_pop(instrs, cur_sim);
-        size_diff--;
-      }
-      assert(cur_sim->stack_size() == 0 || cur_sim->get_slot(0) != reg, "register must have been changed");
-    }
-
-    while (finished_slot >= 0 && cur_sim->get_slot(finished_slot) == sux_sim->get_slot(finished_slot)) {
-      finished_slot--;
-    }
-
-    if (finished_slot >= 0) {
-      int reg = cur_sim->get_slot(finished_slot);
-
-      if (sux_sim->contains(reg) || !merge_rename(cur_sim, sux_sim, finished_slot, finished_slot)) {
-        assert(sux_sim->contains(reg) || size_diff > 0, "must be");
-        merge_insert_xchg(instrs, cur_sim, finished_slot);
-      }
-      assert(cur_sim->get_slot(finished_slot) != reg, "register must have been changed");
-    }
-  }
-
-#ifndef PRODUCT
-  if (TraceFPUStack) {
-    tty->print("after merging:  pred: "); cur_sim->print(); tty->cr();
-    tty->print("                 sux: "); sux_sim->print(); tty->cr();
-    tty->cr();
-  }
-#endif
-  assert(cur_sim->stack_size() == sux_sim->stack_size(), "stack size must be equal now");
-}
-
-
-void FpuStackAllocator::merge_cleanup_fpu_stack(LIR_List* instrs, FpuStackSim* cur_sim, BitMap& live_fpu_regs) {
-#ifndef PRODUCT
-  if (TraceFPUStack) {
-    tty->cr();
-    tty->print("before cleanup: state: "); cur_sim->print(); tty->cr();
-    tty->print("                live:  "); live_fpu_regs.print_on(tty); tty->cr();
-  }
-#endif
-
-  int slot = 0;
-  while (slot < cur_sim->stack_size()) {
-    int reg = cur_sim->get_slot(slot);
-    if (!live_fpu_regs.at(reg)) {
-      if (slot != 0) {
-        merge_insert_xchg(instrs, cur_sim, slot);
-      }
-      merge_insert_pop(instrs, cur_sim);
-    } else {
-      slot++;
-    }
-  }
-
-#ifndef PRODUCT
-  if (TraceFPUStack) {
-    tty->print("after cleanup:  state: "); cur_sim->print(); tty->cr();
-    tty->print("                live:  "); live_fpu_regs.print_on(tty); tty->cr();
-    tty->cr();
-  }
-
-  // check if fpu stack only contains live registers
-  for (unsigned int i = 0; i < live_fpu_regs.size(); i++) {
-    if (live_fpu_regs.at(i) != cur_sim->contains(i)) {
-      tty->print_cr("mismatch between required and actual stack content");
-      break;
-    }
-  }
-#endif
-}
-
-
-bool FpuStackAllocator::merge_fpu_stack_with_successors(BlockBegin* block) {
-#ifndef PRODUCT
-  if (TraceFPUStack) {
-    tty->print_cr("Propagating FPU stack state for B%d at LIR_Op position %d to successors:",
-                  block->block_id(), pos());
-    sim()->print();
-    tty->cr();
-  }
-#endif
-
-  bool changed = false;
-  int number_of_sux = block->number_of_sux();
-
-  if (number_of_sux == 1 && block->sux_at(0)->number_of_preds() > 1) {
-    // The successor has at least two incoming edges, so a stack merge will be necessary
-    // If this block is the first predecessor, cleanup the current stack and propagate it
-    // If this block is not the first predecessor, a stack merge will be necessary
-
-    BlockBegin* sux = block->sux_at(0);
-    intArray* state = sux->fpu_stack_state();
-    LIR_List* instrs = new LIR_List(_compilation);
-
-    if (state != nullptr) {
-      // Merge with a successors that already has a FPU stack state
-      // the block must only have one successor because critical edges must been split
-      FpuStackSim* cur_sim = sim();
-      FpuStackSim* sux_sim = temp_sim();
-      sux_sim->read_state(state);
-
-      merge_fpu_stack(instrs, cur_sim, sux_sim);
-
-    } else {
-      // propagate current FPU stack state to successor without state
-      // clean up stack first so that there are no dead values on the stack
-      if (ComputeExactFPURegisterUsage) {
-        FpuStackSim* cur_sim = sim();
-        ResourceBitMap live_fpu_regs = block->sux_at(0)->fpu_register_usage();
-        assert(live_fpu_regs.size() == FrameMap::nof_fpu_regs, "missing register usage");
-
-        merge_cleanup_fpu_stack(instrs, cur_sim, live_fpu_regs);
-      }
-
-      intArray* state = sim()->write_state();
-      if (TraceFPUStack) {
-        tty->print_cr("Setting FPU stack state of B%d (merge path)", sux->block_id());
-        sim()->print(); tty->cr();
-      }
-      sux->set_fpu_stack_state(state);
-    }
-
-    if (instrs->instructions_list()->length() > 0) {
-      lir()->insert_before(pos(), instrs);
-      set_pos(instrs->instructions_list()->length() + pos());
-      changed = true;
-    }
-
-  } else {
-    // Propagate unmodified Stack to successors where a stack merge is not necessary
-    intArray* state = sim()->write_state();
-    for (int i = 0; i < number_of_sux; i++) {
-      BlockBegin* sux = block->sux_at(i);
-
-#ifdef ASSERT
-      for (int j = 0; j < sux->number_of_preds(); j++) {
-        assert(block == sux->pred_at(j), "all critical edges must be broken");
-      }
-
-      // check if new state is same
-      if (sux->fpu_stack_state() != nullptr) {
-        intArray* sux_state = sux->fpu_stack_state();
-        assert(state->length() == sux_state->length(), "overwriting existing stack state");
-        for (int j = 0; j < state->length(); j++) {
-          assert(state->at(j) == sux_state->at(j), "overwriting existing stack state");
-        }
-      }
-#endif
-#ifndef PRODUCT
-      if (TraceFPUStack) {
-        tty->print_cr("Setting FPU stack state of B%d", sux->block_id());
-        sim()->print(); tty->cr();
-      }
-#endif
-
-      sux->set_fpu_stack_state(state);
-    }
-  }
-
-#ifndef PRODUCT
-  // assertions that FPU stack state conforms to all successors' states
-  intArray* cur_state = sim()->write_state();
-  for (int i = 0; i < number_of_sux; i++) {
-    BlockBegin* sux = block->sux_at(i);
-    intArray* sux_state = sux->fpu_stack_state();
-
-    assert(sux_state != nullptr, "no fpu state");
-    assert(cur_state->length() == sux_state->length(), "incorrect length");
-    for (int i = 0; i < cur_state->length(); i++) {
-      assert(cur_state->at(i) == sux_state->at(i), "element not equal");
-    }
-  }
-#endif
-
-  return changed;
-}
-#endif // _LP64
diff --git a/src/hotspot/cpu/x86/c1_LinearScan_x86.hpp b/src/hotspot/cpu/x86/c1_LinearScan_x86.hpp
index e40de213e7a..8669c9ab8a1 100644
--- a/src/hotspot/cpu/x86/c1_LinearScan_x86.hpp
+++ b/src/hotspot/cpu/x86/c1_LinearScan_x86.hpp
@@ -88,78 +88,4 @@ inline bool LinearScanWalker::pd_init_regs_for_alloc(Interval* cur) {
   return false;
 }
 
-
-class FpuStackAllocator {
- private:
-  Compilation* _compilation;
-  LinearScan* _allocator;
-
-  LIR_OpVisitState visitor;
-
-  LIR_List* _lir;
-  int _pos;
-  FpuStackSim _sim;
-  FpuStackSim _temp_sim;
-
-  bool _debug_information_computed;
-
-  LinearScan*   allocator()                      { return _allocator; }
-  Compilation*  compilation() const              { return _compilation; }
-
-  // unified bailout support
-  void          bailout(const char* msg) const   { compilation()->bailout(msg); }
-  bool          bailed_out() const               { return compilation()->bailed_out(); }
-
-  int pos() { return _pos; }
-  void set_pos(int pos) { _pos = pos; }
-  LIR_Op* cur_op() { return lir()->instructions_list()->at(pos()); }
-  LIR_List* lir() { return _lir; }
-  void set_lir(LIR_List* lir) { _lir = lir; }
-  FpuStackSim* sim() { return &_sim; }
-  FpuStackSim* temp_sim() { return &_temp_sim; }
-
-  int fpu_num(LIR_Opr opr);
-  int tos_offset(LIR_Opr opr);
-  LIR_Opr to_fpu_stack_top(LIR_Opr opr, bool dont_check_offset = false);
-
-  // Helper functions for handling operations
-  void insert_op(LIR_Op* op);
-  void insert_exchange(int offset);
-  void insert_exchange(LIR_Opr opr);
-  void insert_free(int offset);
-  void insert_free_if_dead(LIR_Opr opr);
-  void insert_free_if_dead(LIR_Opr opr, LIR_Opr ignore);
-  void insert_copy(LIR_Opr from, LIR_Opr to);
-  void do_rename(LIR_Opr from, LIR_Opr to);
-  void do_push(LIR_Opr opr);
-  void pop_if_last_use(LIR_Op* op, LIR_Opr opr);
-  void pop_always(LIR_Op* op, LIR_Opr opr);
-  void clear_fpu_stack(LIR_Opr preserve);
-  void handle_op1(LIR_Op1* op1);
-  void handle_op2(LIR_Op2* op2);
-  void handle_opCall(LIR_OpCall* opCall);
-  void compute_debug_information(LIR_Op* op);
-  void allocate_exception_handler(XHandler* xhandler);
-  void allocate_block(BlockBegin* block);
-
-#ifndef PRODUCT
-  void check_invalid_lir_op(LIR_Op* op);
-#endif
-
-  // Helper functions for merging of fpu stacks
-  void merge_insert_add(LIR_List* instrs, FpuStackSim* cur_sim, int reg);
-  void merge_insert_xchg(LIR_List* instrs, FpuStackSim* cur_sim, int slot);
-  void merge_insert_pop(LIR_List* instrs, FpuStackSim* cur_sim);
-  bool merge_rename(FpuStackSim* cur_sim, FpuStackSim* sux_sim, int start_slot, int change_slot);
-  void merge_fpu_stack(LIR_List* instrs, FpuStackSim* cur_sim, FpuStackSim* sux_sim);
-  void merge_cleanup_fpu_stack(LIR_List* instrs, FpuStackSim* cur_sim, BitMap& live_fpu_regs);
-  bool merge_fpu_stack_with_successors(BlockBegin* block);
-
- public:
-  LIR_Opr to_fpu_stack(LIR_Opr opr); // used by LinearScan for creation of debug information
-
-  FpuStackAllocator(Compilation* compilation, LinearScan* allocator);
-  void allocate();
-};
-
 #endif // CPU_X86_C1_LINEARSCAN_X86_HPP
diff --git a/src/hotspot/cpu/x86/c1_MacroAssembler_x86.cpp b/src/hotspot/cpu/x86/c1_MacroAssembler_x86.cpp
index e3c8792decd..238a1bd048a 100644
--- a/src/hotspot/cpu/x86/c1_MacroAssembler_x86.cpp
+++ b/src/hotspot/cpu/x86/c1_MacroAssembler_x86.cpp
@@ -332,12 +332,6 @@ void C1_MacroAssembler::build_frame(int frame_size_in_bytes, int bang_size_in_by
   if (PreserveFramePointer) {
     mov(rbp, rsp);
   }
-#if !defined(_LP64) && defined(COMPILER2)
-  if (UseSSE < 2 && !CompilerConfig::is_c1_only_no_jvmci()) {
-    // c2 leaves fpu stack dirty. Clean it on entry
-    empty_FPU_stack();
-  }
-#endif // !_LP64 && COMPILER2
   decrement(rsp, frame_size_in_bytes); // does not emit code for frame_size == 0
 
   BarrierSetAssembler* bs = BarrierSet::barrier_set()->barrier_set_assembler();
diff --git a/src/hotspot/share/c1/c1_FpuStackSim.hpp b/src/hotspot/share/c1/c1_FpuStackSim.hpp
deleted file mode 100644
index 3fcf1103eb5..00000000000
--- a/src/hotspot/share/c1/c1_FpuStackSim.hpp
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright (c) 2005, 2019, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- *
- */
-
-#ifndef SHARE_C1_C1_FPUSTACKSIM_HPP
-#define SHARE_C1_C1_FPUSTACKSIM_HPP
-
-#include "c1/c1_FrameMap.hpp"
-#include "utilities/macros.hpp"
-
-// Provides location for forward declaration of this class, which is
-// only implemented on Intel
-class FpuStackSim;
-
-#include CPU_HEADER(c1_FpuStackSim)
-
-#endif // SHARE_C1_C1_FPUSTACKSIM_HPP
diff --git a/src/hotspot/share/c1/c1_Instruction.hpp b/src/hotspot/share/c1/c1_Instruction.hpp
index af22d5b8fc9..6b5838f6062 100644
--- a/src/hotspot/share/c1/c1_Instruction.hpp
+++ b/src/hotspot/share/c1/c1_Instruction.hpp
@@ -1607,7 +1607,6 @@ LEAF(BlockBegin, StateSplit)
   ResourceBitMap _live_kill;                     // set of registers defined in this block
 
   ResourceBitMap _fpu_register_usage;
-  intArray*      _fpu_stack_state;               // For x86 FPU code generation with UseLinearScan
   int            _first_lir_instruction_id;      // ID of first LIR instruction in this block
   int            _last_lir_instruction_id;       // ID of last LIR instruction in this block
 
@@ -1654,7 +1653,6 @@ LEAF(BlockBegin, StateSplit)
   , _live_gen()
   , _live_kill()
   , _fpu_register_usage()
-  , _fpu_stack_state(nullptr)
   , _first_lir_instruction_id(-1)
   , _last_lir_instruction_id(-1)
   {
@@ -1682,7 +1680,6 @@ LEAF(BlockBegin, StateSplit)
   ResourceBitMap& live_gen()                     { return _live_gen;       }
   ResourceBitMap& live_kill()                    { return _live_kill;      }
   ResourceBitMap& fpu_register_usage()           { return _fpu_register_usage; }
-  intArray* fpu_stack_state() const              { return _fpu_stack_state;    }
   int first_lir_instruction_id() const           { return _first_lir_instruction_id; }
   int last_lir_instruction_id() const            { return _last_lir_instruction_id; }
   int total_preds() const                        { return _total_preds; }
@@ -1705,7 +1702,6 @@ LEAF(BlockBegin, StateSplit)
   void set_live_gen (const ResourceBitMap& map)  { _live_gen = map;  }
   void set_live_kill(const ResourceBitMap& map)  { _live_kill = map; }
   void set_fpu_register_usage(const ResourceBitMap& map) { _fpu_register_usage = map; }
-  void set_fpu_stack_state(intArray* state)      { _fpu_stack_state = state;  }
   void set_first_lir_instruction_id(int id)      { _first_lir_instruction_id = id;  }
   void set_last_lir_instruction_id(int id)       { _last_lir_instruction_id = id;  }
   void increment_total_preds(int n = 1)          { _total_preds += n; }
diff --git a/src/hotspot/share/c1/c1_LIR.cpp b/src/hotspot/share/c1/c1_LIR.cpp
index e11b59cd0a5..e6ba03554cb 100644
--- a/src/hotspot/share/c1/c1_LIR.cpp
+++ b/src/hotspot/share/c1/c1_LIR.cpp
@@ -403,7 +403,6 @@ void LIR_OpVisitState::visit(LIR_Op* op) {
   switch (op->code()) {
 
 // LIR_Op0
-    case lir_fpop_raw:                 // result and info always invalid
     case lir_breakpoint:               // result and info always invalid
     case lir_membar:                   // result and info always invalid
     case lir_membar_acquire:           // result and info always invalid
@@ -443,8 +442,6 @@ void LIR_OpVisitState::visit(LIR_Op* op) {
 
 
 // LIR_Op1
-    case lir_fxch:           // input always valid, result and info always invalid
-    case lir_fld:            // input always valid, result and info always invalid
     case lir_push:           // input always valid, result and info always invalid
     case lir_pop:            // input always valid, result and info always invalid
     case lir_leal:           // input and result always valid, info always invalid
@@ -1702,12 +1699,9 @@ const char * LIR_Op::name() const {
      case lir_on_spin_wait:          s = "on_spin_wait";  break;
      case lir_std_entry:             s = "std_entry";     break;
      case lir_osr_entry:             s = "osr_entry";     break;
-     case lir_fpop_raw:              s = "fpop_raw";      break;
      case lir_breakpoint:            s = "breakpoint";    break;
      case lir_get_thread:            s = "get_thread";    break;
      // LIR_Op1
-     case lir_fxch:                  s = "fxch";          break;
-     case lir_fld:                   s = "fld";           break;
      case lir_push:                  s = "push";          break;
      case lir_pop:                   s = "pop";           break;
      case lir_null_check:            s = "null_check";    break;
diff --git a/src/hotspot/share/c1/c1_LIR.hpp b/src/hotspot/share/c1/c1_LIR.hpp
index a4e0cc18daa..0de69e658a3 100644
--- a/src/hotspot/share/c1/c1_LIR.hpp
+++ b/src/hotspot/share/c1/c1_LIR.hpp
@@ -43,7 +43,6 @@ class LIR_Op;
 class ciType;
 class ValueType;
 class LIR_OpVisitState;
-class FpuStackSim;
 
 //---------------------------------------------------------------------
 //                 LIR Operands
@@ -236,9 +235,8 @@ class LIR_Opr {
     , virtual_bits   = 1
     , is_xmm_bits    = 1
     , last_use_bits  = 1
-    , is_fpu_stack_offset_bits = 1        // used in assertion checking on x86 for FPU stack slot allocation
     , non_data_bits  = kind_bits + type_bits + size_bits + destroys_bits + virtual_bits
-                       + is_xmm_bits + last_use_bits + is_fpu_stack_offset_bits
+                       + is_xmm_bits + last_use_bits
     , data_bits      = BitsPerInt - non_data_bits
     , reg_bits       = data_bits / 2      // for two registers in one value encoding
   };
@@ -249,8 +247,7 @@ class LIR_Opr {
     , size_shift     = type_shift     + type_bits
     , destroys_shift = size_shift     + size_bits
     , last_use_shift = destroys_shift + destroys_bits
-    , is_fpu_stack_offset_shift = last_use_shift + last_use_bits
-    , virtual_shift  = is_fpu_stack_offset_shift + is_fpu_stack_offset_bits
+    , virtual_shift = last_use_shift + last_use_bits
     , is_xmm_shift   = virtual_shift + virtual_bits
     , data_shift     = is_xmm_shift + is_xmm_bits
     , reg1_shift = data_shift
@@ -268,12 +265,11 @@ class LIR_Opr {
     , type_mask      = right_n_bits(type_bits) << type_shift
     , size_mask      = right_n_bits(size_bits) << size_shift
     , last_use_mask  = right_n_bits(last_use_bits) << last_use_shift
-    , is_fpu_stack_offset_mask = right_n_bits(is_fpu_stack_offset_bits) << is_fpu_stack_offset_shift
     , virtual_mask   = right_n_bits(virtual_bits) << virtual_shift
     , is_xmm_mask    = right_n_bits(is_xmm_bits) << is_xmm_shift
     , pointer_mask   = right_n_bits(pointer_bits)
     , lower_reg_mask = right_n_bits(reg_bits)
-    , no_type_mask   = (int)(~(type_mask | last_use_mask | is_fpu_stack_offset_mask))
+    , no_type_mask   = (int)(~(type_mask | last_use_mask))
   };
 
   uint32_t data() const                          { return (uint32_t)value() >> data_shift; }
@@ -426,9 +422,7 @@ class LIR_Opr {
   BasicType type_register() const  { assert(is_register() || is_stack(), "type check"); return as_BasicType(type_field_valid());  }
 
   bool is_last_use() const         { assert(is_register(), "only works for registers"); return (value() & last_use_mask) != 0; }
-  bool is_fpu_stack_offset() const { assert(is_register(), "only works for registers"); return (value() & is_fpu_stack_offset_mask) != 0; }
   LIR_Opr make_last_use()          { assert(is_register(), "only works for registers"); return (LIR_Opr)(value() | last_use_mask); }
-  LIR_Opr make_fpu_stack_offset()  { assert(is_register(), "only works for registers"); return (LIR_Opr)(value() | is_fpu_stack_offset_mask); }
 
 
   int single_stack_ix() const  { assert(is_single_stack() && !is_virtual(), "type check"); return (int)data(); }
@@ -912,7 +906,6 @@ enum LIR_Code {
       , lir_nop
       , lir_std_entry
       , lir_osr_entry
-      , lir_fpop_raw
       , lir_breakpoint
       , lir_rtcall
       , lir_membar
@@ -926,8 +919,6 @@ enum LIR_Code {
       , lir_on_spin_wait
   , end_op0
   , begin_op1
-      , lir_fxch
-      , lir_fld
       , lir_push
       , lir_pop
       , lir_null_check
@@ -1070,7 +1061,6 @@ class LIR_Op: public CompilationResourceObj {
   unsigned short _flags;
   CodeEmitInfo* _info;
   int           _id;     // value id for register allocation
-  int           _fpu_pop_count;
   Instruction*  _source; // for debugging
 
   static void print_condition(outputStream* out, LIR_Condition cond) PRODUCT_RETURN;
@@ -1090,7 +1080,6 @@ class LIR_Op: public CompilationResourceObj {
     , _flags(0)
     , _info(nullptr)
     , _id(-1)
-    , _fpu_pop_count(0)
     , _source(nullptr) {}
 
   LIR_Op(LIR_Code code, LIR_Opr result, CodeEmitInfo* info)
@@ -1104,7 +1093,6 @@ class LIR_Op: public CompilationResourceObj {
     , _flags(0)
     , _info(info)
     , _id(-1)
-    , _fpu_pop_count(0)
     , _source(nullptr) {}
 
   CodeEmitInfo* info() const                  { return _info;   }
@@ -1125,11 +1113,6 @@ class LIR_Op: public CompilationResourceObj {
   int id()             const                  { return _id;     }
   void set_id(int id)                         { _id = id; }
 
-  // FPU stack simulation helpers -- only used on Intel
-  void set_fpu_pop_count(int count)           { assert(count >= 0 && count <= 1, "currently only 0 and 1 are valid"); _fpu_pop_count = count; }
-  int  fpu_pop_count() const                  { return _fpu_pop_count; }
-  bool pop_fpu_stack()                        { return _fpu_pop_count > 0; }
-
   Instruction* source() const                 { return _source; }
   void set_source(Instruction* ins)           { _source = ins; }
 
diff --git a/src/hotspot/share/c1/c1_LIRAssembler.cpp b/src/hotspot/share/c1/c1_LIRAssembler.cpp
index 4d50a863801..7cf414ae7dc 100644
--- a/src/hotspot/share/c1/c1_LIRAssembler.cpp
+++ b/src/hotspot/share/c1/c1_LIRAssembler.cpp
@@ -485,19 +485,6 @@ void LIR_Assembler::emit_call(LIR_OpJavaCall* op) {
   if (op->is_method_handle_invoke()) {
     compilation()->set_has_method_handle_invokes(true);
   }
-
-#if defined(IA32) && defined(COMPILER2)
-  // C2 leave fpu stack dirty clean it
-  if (UseSSE < 2 && !CompilerConfig::is_c1_only_no_jvmci()) {
-    int i;
-    for ( i = 1; i <= 7 ; i++ ) {
-      ffree(i);
-    }
-    if (!op->result_opr()->is_float_kind()) {
-      ffree(0);
-    }
-  }
-#endif // IA32 && COMPILER2
 }
 
 
@@ -514,7 +501,7 @@ void LIR_Assembler::emit_op1(LIR_Op1* op) {
         volatile_move_op(op->in_opr(), op->result_opr(), op->type(), op->info());
       } else {
         move_op(op->in_opr(), op->result_opr(), op->type(),
-                op->patch_code(), op->info(), op->pop_fpu_stack(),
+                op->patch_code(), op->info(),
                 op->move_kind() == lir_move_wide);
       }
       break;
@@ -717,14 +704,12 @@ void LIR_Assembler::emit_op2(LIR_Op2* op) {
     case lir_mul:
     case lir_div:
     case lir_rem:
-      assert(op->fpu_pop_count() < 2, "");
       arith_op(
         op->code(),
         op->in_opr1(),
         op->in_opr2(),
         op->result_opr(),
-        op->info(),
-        op->fpu_pop_count() == 1);
+        op->info());
       break;
 
     case lir_logic_and:
@@ -769,16 +754,16 @@ void LIR_Assembler::build_frame() {
 }
 
 
-void LIR_Assembler::move_op(LIR_Opr src, LIR_Opr dest, BasicType type, LIR_PatchCode patch_code, CodeEmitInfo* info, bool pop_fpu_stack, bool wide) {
+void LIR_Assembler::move_op(LIR_Opr src, LIR_Opr dest, BasicType type, LIR_PatchCode patch_code, CodeEmitInfo* info, bool wide) {
   if (src->is_register()) {
     if (dest->is_register()) {
       assert(patch_code == lir_patch_none && info == nullptr, "no patching and info allowed here");
       reg2reg(src,  dest);
     } else if (dest->is_stack()) {
       assert(patch_code == lir_patch_none && info == nullptr, "no patching and info allowed here");
-      reg2stack(src, dest, type, pop_fpu_stack);
+      reg2stack(src, dest, type);
     } else if (dest->is_address()) {
-      reg2mem(src, dest, type, patch_code, info, pop_fpu_stack, wide);
+      reg2mem(src, dest, type, patch_code, info, wide);
     } else {
       ShouldNotReachHere();
     }
diff --git a/src/hotspot/share/c1/c1_LIRAssembler.hpp b/src/hotspot/share/c1/c1_LIRAssembler.hpp
index 5b653b74ef5..a4c5fd61d4c 100644
--- a/src/hotspot/share/c1/c1_LIRAssembler.hpp
+++ b/src/hotspot/share/c1/c1_LIRAssembler.hpp
@@ -166,11 +166,11 @@ class LIR_Assembler: public CompilationResourceObj {
   void const2reg  (LIR_Opr src, LIR_Opr dest, LIR_PatchCode patch_code, CodeEmitInfo* info);
   void const2stack(LIR_Opr src, LIR_Opr dest);
   void const2mem  (LIR_Opr src, LIR_Opr dest, BasicType type, CodeEmitInfo* info, bool wide);
-  void reg2stack  (LIR_Opr src, LIR_Opr dest, BasicType type, bool pop_fpu_stack);
+  void reg2stack  (LIR_Opr src, LIR_Opr dest, BasicType type);
   void reg2reg    (LIR_Opr src, LIR_Opr dest);
   void reg2mem    (LIR_Opr src, LIR_Opr dest, BasicType type,
                    LIR_PatchCode patch_code, CodeEmitInfo* info,
-                   bool pop_fpu_stack, bool wide);
+                   bool wide);
   void stack2reg  (LIR_Opr src, LIR_Opr dest, BasicType type);
   void stack2stack(LIR_Opr src, LIR_Opr dest, BasicType type);
   void mem2reg    (LIR_Opr src, LIR_Opr dest, BasicType type,
@@ -206,7 +206,7 @@ class LIR_Assembler: public CompilationResourceObj {
   void emit_profile_type(LIR_OpProfileType* op);
   void emit_delay(LIR_OpDelay* op);
 
-  void arith_op(LIR_Code code, LIR_Opr left, LIR_Opr right, LIR_Opr dest, CodeEmitInfo* info, bool pop_fpu_stack);
+  void arith_op(LIR_Code code, LIR_Opr left, LIR_Opr right, LIR_Opr dest, CodeEmitInfo* info);
   void arithmetic_idiv(LIR_Code code, LIR_Opr left, LIR_Opr right, LIR_Opr temp, LIR_Opr result, CodeEmitInfo* info);
   void intrinsic_op(LIR_Code code, LIR_Opr value, LIR_Opr temp, LIR_Opr dest, LIR_Op* op);
 #ifdef ASSERT
@@ -216,7 +216,7 @@ class LIR_Assembler: public CompilationResourceObj {
   void logic_op(LIR_Code code, LIR_Opr left, LIR_Opr right, LIR_Opr dest);
 
   void move_op(LIR_Opr src, LIR_Opr result, BasicType type,
-               LIR_PatchCode patch_code, CodeEmitInfo* info, bool pop_fpu_stack, bool wide);
+               LIR_PatchCode patch_code, CodeEmitInfo* info, bool wide);
   void volatile_move_op(LIR_Opr src, LIR_Opr result, BasicType type, CodeEmitInfo* info);
   void comp_mem_op(LIR_Opr src, LIR_Opr result, BasicType type, CodeEmitInfo* info);  // info set for null exceptions
   void comp_fl2i(LIR_Code code, LIR_Opr left, LIR_Opr right, LIR_Opr result, LIR_Op2* op);
diff --git a/src/hotspot/share/c1/c1_LinearScan.cpp b/src/hotspot/share/c1/c1_LinearScan.cpp
index b0e2ff28c58..57c592f3506 100644
--- a/src/hotspot/share/c1/c1_LinearScan.cpp
+++ b/src/hotspot/share/c1/c1_LinearScan.cpp
@@ -91,9 +91,6 @@ LinearScan::LinearScan(IR* ir, LIRGenerator* gen, FrameMap* frame_map)
  , _has_call(0)
  , _interval_in_loop(0)  // initialized later with correct length
  , _scope_value_cache(0) // initialized later with correct length
-#ifdef IA32
- , _fpu_stack_allocator(nullptr)
-#endif
 {
   assert(this->ir() != nullptr,          "check if valid");
   assert(this->compilation() != nullptr, "check if valid");
@@ -1868,15 +1865,12 @@ void LinearScan::resolve_exception_entry(BlockBegin* block, int reg_num, MoveRes
   int reg = interval->assigned_reg();
   int regHi = interval->assigned_regHi();
 
-  if ((reg < nof_regs && interval->always_in_memory()) ||
-      (use_fpu_stack_allocation() && reg >= pd_first_fpu_reg && reg <= pd_last_fpu_reg)) {
+  if ((reg < nof_regs && interval->always_in_memory())) {
     // the interval is split to get a short range that is located on the stack
-    // in the following two cases:
+    // in the following case:
     // * the interval started in memory (e.g. method parameter), but is currently in a register
     //   this is an optimization for exception handling that reduces the number of moves that
     //   are necessary for resolving the states when an exception uses this exception handler
-    // * the interval would be on the fpu stack at the begin of the exception handler
-    //   this is not allowed because of the complicated fpu stack handling on Intel
 
     // range that will be spilled to memory
     int from_op_id = block->first_lir_instruction_id();
@@ -2665,17 +2659,9 @@ int LinearScan::append_scope_value_for_operand(LIR_Opr opr, GrowableArray<ScopeV
 #endif
 
   } else if (opr->is_single_fpu()) {
-#ifdef IA32
-    // the exact location of fpu stack values is only known
-    // during fpu stack allocation, so the stack allocator object
-    // must be present
-    assert(use_fpu_stack_allocation(), "should not have float stack values without fpu stack allocation (all floats must be SSE2)");
-    assert(_fpu_stack_allocator != nullptr, "must be present");
-    opr = _fpu_stack_allocator->to_fpu_stack(opr);
-#elif defined(AMD64)
+#if defined(AMD64)
     assert(false, "FPU not used on x86-64");
 #endif
-
     Location::Type loc_type = float_saved_as_double ? Location::float_in_dbl : Location::normal;
     VMReg rname = frame_map()->fpu_regname(opr->fpu_regnr());
 #ifndef __SOFTFP__
@@ -2778,16 +2764,6 @@ int LinearScan::append_scope_value_for_operand(LIR_Opr opr, GrowableArray<ScopeV
       // name for the other half.  *first and *second must represent the
       // least and most significant words, respectively.
 
-#ifdef IA32
-      // the exact location of fpu stack values is only known
-      // during fpu stack allocation, so the stack allocator object
-      // must be present
-      assert(use_fpu_stack_allocation(), "should not have float stack values without fpu stack allocation (all floats must be SSE2)");
-      assert(_fpu_stack_allocator != nullptr, "must be present");
-      opr = _fpu_stack_allocator->to_fpu_stack(opr);
-
-      assert(opr->fpu_regnrLo() == opr->fpu_regnrHi(), "assumed in calculation (only fpu_regnrLo is used)");
-#endif
 #ifdef AMD64
       assert(false, "FPU not used on x86-64");
 #endif
@@ -3021,15 +2997,9 @@ void LinearScan::assign_reg_num(LIR_OpList* instructions, IntervalWalker* iw) {
       compute_oop_map(iw, visitor, op);
 
       // compute debug information
-      if (!use_fpu_stack_allocation()) {
-        // compute debug information if fpu stack allocation is not needed.
-        // when fpu stack allocation is needed, the debug information can not
-        // be computed here because the exact location of fpu operands is not known
-        // -> debug information is created inside the fpu stack allocator
-        int n = visitor.info_count();
-        for (int k = 0; k < n; k++) {
-          compute_debug_info(visitor.info_at(k), op_id);
-        }
+      int n = visitor.info_count();
+      for (int k = 0; k < n; k++) {
+        compute_debug_info(visitor.info_at(k), op_id);
       }
     }
 
@@ -3126,14 +3096,6 @@ void LinearScan::do_linear_scan() {
   NOT_PRODUCT(print_lir(2, "LIR after assignment of register numbers:"));
   NOT_PRODUCT(LinearScanStatistic::compute(this, _stat_after_asign));
 
-  { TIME_LINEAR_SCAN(timer_allocate_fpu_stack);
-
-    if (use_fpu_stack_allocation()) {
-      allocate_fpu_stack(); // Only has effect on Intel
-      NOT_PRODUCT(print_lir(2, "LIR after FPU stack allocation:"));
-    }
-  }
-
 #ifndef RISCV
   // Disable these optimizations on riscv temporarily, because it does not
   // work when the comparison operands are bound to branches or cmoves.
@@ -6007,20 +5969,6 @@ bool EdgeMoveOptimizer::operations_different(LIR_Op* op1, LIR_Op* op2) {
       // these moves are exactly equal and can be optimized
       return false;
     }
-
-  } else if (op1->code() == lir_fxch && op2->code() == lir_fxch) {
-    assert(op1->as_Op1() != nullptr, "fxch must be LIR_Op1");
-    assert(op2->as_Op1() != nullptr, "fxch must be LIR_Op1");
-    LIR_Op1* fxch1 = (LIR_Op1*)op1;
-    LIR_Op1* fxch2 = (LIR_Op1*)op2;
-    if (fxch1->in_opr()->as_jint() == fxch2->in_opr()->as_jint()) {
-      // equal FPU stack operations can be optimized
-      return false;
-    }
-
-  } else if (op1->code() == lir_fpop_raw && op2->code() == lir_fpop_raw) {
-    // equal FPU stack operations can be optimized
-    return false;
   }
 
   // no optimization possible
@@ -6540,7 +6488,6 @@ const char* LinearScanStatistic::counter_name(int counter_idx) {
     case counter_throw:           return "throw";
     case counter_unwind:          return "unwind";
     case counter_typecheck:       return "type+null-checks";
-    case counter_fpu_stack:       return "fpu-stack";
     case counter_misc_inst:       return "other instructions";
     case counter_other_inst:      return "misc. instructions";
 
@@ -6761,10 +6708,6 @@ void LinearScanStatistic::collect(LinearScan* allocator) {
         case lir_checkcast:
         case lir_store_check:     inc_counter(counter_typecheck); break;
 
-        case lir_fpop_raw:
-        case lir_fxch:
-        case lir_fld:             inc_counter(counter_fpu_stack); break;
-
         case lir_nop:
         case lir_push:
         case lir_pop:
@@ -6817,7 +6760,6 @@ const char* LinearScanTimers::timer_name(int idx) {
     case timer_sort_intervals_after:     return "Sort Intervals After";
     case timer_eliminate_spill_moves:    return "Spill optimization";
     case timer_assign_reg_num:           return "Assign Reg Num";
-    case timer_allocate_fpu_stack:       return "Allocate FPU Stack";
     case timer_optimize_lir:             return "Optimize LIR";
     default: ShouldNotReachHere();       return "";
   }
diff --git a/src/hotspot/share/c1/c1_LinearScan.hpp b/src/hotspot/share/c1/c1_LinearScan.hpp
index 4e8adef3c7d..7a56f3e92f4 100644
--- a/src/hotspot/share/c1/c1_LinearScan.hpp
+++ b/src/hotspot/share/c1/c1_LinearScan.hpp
@@ -25,7 +25,6 @@
 #ifndef SHARE_C1_C1_LINEARSCAN_HPP
 #define SHARE_C1_C1_LINEARSCAN_HPP
 
-#include "c1/c1_FpuStackSim.hpp"
 #include "c1/c1_FrameMap.hpp"
 #include "c1/c1_IR.hpp"
 #include "c1/c1_Instruction.hpp"
@@ -177,15 +176,6 @@ class LinearScan : public CompilationResourceObj {
   int           num_loops() const                { return ir()->num_loops(); }
   bool          is_interval_in_loop(int interval, int loop) const { return _interval_in_loop.at(interval, loop); }
 
-  // handling of fpu stack allocation (platform dependent, needed for debug information generation)
-#ifdef IA32
-  FpuStackAllocator* _fpu_stack_allocator;
-  bool use_fpu_stack_allocation() const          { return UseSSE < 2 && has_fpu_registers(); }
-#else
-  bool use_fpu_stack_allocation() const          { return false; }
-#endif
-
-
   // access to interval list
   int           interval_count() const           { return _intervals.length(); }
   Interval*     interval_at(int reg_num) const   { return _intervals.at(reg_num); }
@@ -357,12 +347,6 @@ class LinearScan : public CompilationResourceObj {
   void assign_reg_num(LIR_OpList* instructions, IntervalWalker* iw);
   void assign_reg_num();
 
-
-  // Phase 8: fpu stack allocation
-  // (Used only on x86 when fpu operands are present)
-  void allocate_fpu_stack();
-
-
   // helper functions for printing state
 #ifndef PRODUCT
   static void print_bitmap(BitMap& bitmap);
@@ -953,7 +937,6 @@ class LinearScanTimers : public StackObj {
     timer_sort_intervals_after,
     timer_eliminate_spill_moves,
     timer_assign_reg_num,
-    timer_allocate_fpu_stack,
     timer_optimize_lir,
 
     number_of_timers
diff --git a/src/hotspot/share/c1/c1_globals.hpp b/src/hotspot/share/c1/c1_globals.hpp
index 72306585355..ec01bc7a790 100644
--- a/src/hotspot/share/c1/c1_globals.hpp
+++ b/src/hotspot/share/c1/c1_globals.hpp
@@ -280,12 +280,6 @@
           "Maximum size of a compiled method.")                             \
           range(0, 1*M)                                                     \
                                                                             \
-  develop(bool, TraceFPUStack, false,                                       \
-          "Trace emulation of the FPU stack (intel only)")                  \
-                                                                            \
-  develop(bool, TraceFPURegisterUsage, false,                               \
-          "Trace usage of FPU registers at start of blocks (intel only)")   \
-                                                                            \
   develop(intx, InstructionCountCutoff, 37000,                              \
           "If GraphBuilder adds this many instructions, bails out")         \
           range(0, max_jint)                                                \

From 79d0c94b5c915b4be32e5febf90a148e20f3c112 Mon Sep 17 00:00:00 2001
From: David Linus Briemann <david.briemann@sap.com>
Date: Mon, 31 Mar 2025 08:53:31 +0000
Subject: [PATCH 554/587] 8352114: New test
 runtime/interpreter/CountBytecodesTest.java is failing

Reviewed-by: dholmes, mdoerr
---
 .../hotspot/jtreg/runtime/interpreter/CountBytecodesTest.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/hotspot/jtreg/runtime/interpreter/CountBytecodesTest.java b/test/hotspot/jtreg/runtime/interpreter/CountBytecodesTest.java
index f62627e4536..4415e3faf67 100644
--- a/test/hotspot/jtreg/runtime/interpreter/CountBytecodesTest.java
+++ b/test/hotspot/jtreg/runtime/interpreter/CountBytecodesTest.java
@@ -29,7 +29,7 @@
  * @summary Test the output for CountBytecodes and validate that the counter
  *          does not overflow for more than 2^32 bytecodes counted.
  * @library /test/lib
- * @run main/othervm/timeout=300 CountBytecodesTest
+ * @run driver/timeout=300 CountBytecodesTest
  */
 
 import java.util.regex.Matcher;
@@ -61,7 +61,7 @@ public class CountBytecodesTest {
                 // while maintaining execution of more than 2^32 bytecodes.
             }
         } else {
-            OutputAnalyzer output = ProcessTools.executeTestJava("-Xint", "-XX:+CountBytecodes", "CountBytecodesTest", "test");
+            OutputAnalyzer output = ProcessTools.executeLimitedTestJava("-Xint", "-XX:+CountBytecodes", "CountBytecodesTest", "test");
             output.shouldHaveExitValue(0);
 
             // Output format: [BytecodeCounter::counter_value = 38676232802]

From 6fbaa066ce45b70f1c288d1245b03fe18ceba126 Mon Sep 17 00:00:00 2001
From: Aleksey Shipilev <shade@openjdk.org>
Date: Mon, 31 Mar 2025 10:01:23 +0000
Subject: [PATCH 555/587] 8353176: C1: x86 patching stub always calls
 Thread::current()

Reviewed-by: mdoerr, kvn, vlivanov
---
 src/hotspot/cpu/x86/c1_CodeStubs_x86.cpp | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/src/hotspot/cpu/x86/c1_CodeStubs_x86.cpp b/src/hotspot/cpu/x86/c1_CodeStubs_x86.cpp
index 71d2898f45c..80365878061 100644
--- a/src/hotspot/cpu/x86/c1_CodeStubs_x86.cpp
+++ b/src/hotspot/cpu/x86/c1_CodeStubs_x86.cpp
@@ -360,17 +360,11 @@ void PatchingStub::emit_code(LIR_Assembler* ce) {
     }
     assert(_obj != noreg, "must be a valid register");
     Register tmp = rax;
-    Register tmp2 = rbx;
     __ push(tmp);
-    __ push(tmp2);
-    // Load without verification to keep code size small. We need it because
-    // begin_initialized_entry_offset has to fit in a byte. Also, we know it's not null.
-    __ movptr(tmp2, Address(_obj, java_lang_Class::klass_offset()));
-    __ get_thread(tmp);
-    __ cmpptr(tmp, Address(tmp2, InstanceKlass::init_thread_offset()));
-    __ pop(tmp2);
-    __ pop(tmp);
-    __ jcc(Assembler::notEqual, call_patch);
+    __ movptr(tmp, Address(_obj, java_lang_Class::klass_offset()));
+    __ cmpptr(r15_thread, Address(tmp, InstanceKlass::init_thread_offset()));
+    __ pop(tmp); // pop it right away, no matter which path we take
+    __ jccb(Assembler::notEqual, call_patch);
 
     // access_field patches may execute the patched code before it's
     // copied back into place so we need to jump back into the main

From 22f630cb20b4e846f63cf5799cd2c50437d4dcad Mon Sep 17 00:00:00 2001
From: Aleksey Shipilev <shade@openjdk.org>
Date: Mon, 31 Mar 2025 10:30:23 +0000
Subject: [PATCH 556/587] 8352415: x86: Tighten up template interpreter method
 entry code

Reviewed-by: adinn, jsjolen
---
 .../x86/templateInterpreterGenerator_x86.cpp  | 42 ++++++++++++-------
 1 file changed, 26 insertions(+), 16 deletions(-)

diff --git a/src/hotspot/cpu/x86/templateInterpreterGenerator_x86.cpp b/src/hotspot/cpu/x86/templateInterpreterGenerator_x86.cpp
index ca285dad437..efbdac8244d 100644
--- a/src/hotspot/cpu/x86/templateInterpreterGenerator_x86.cpp
+++ b/src/hotspot/cpu/x86/templateInterpreterGenerator_x86.cpp
@@ -561,32 +561,42 @@ void TemplateInterpreterGenerator::lock_method() {
 //      rdx: cp cache
 void TemplateInterpreterGenerator::generate_fixed_frame(bool native_call) {
   // initialize fixed part of activation frame
-  __ push(rax);        // save return address
-  __ enter();          // save old & set new rbp
+  __ push(rax);         // save return address
+  __ enter();           // save old & set new rbp
   __ push(rbcp);        // set sender sp
-  __ push(NULL_WORD); // leave last_sp as null
-  __ movptr(rbcp, Address(rbx, Method::const_offset()));      // get ConstMethod*
-  __ lea(rbcp, Address(rbcp, ConstMethod::codes_offset())); // get codebase
+
+  // Resolve ConstMethod* -> ConstantPool*.
+  // Get codebase, while we still have ConstMethod*.
+  // Save ConstantPool* in rax for later use.
+  __ movptr(rax, Address(rbx, Method::const_offset()));
+  __ lea(rbcp, Address(rax, ConstMethod::codes_offset()));
+  __ movptr(rax, Address(rax, ConstMethod::constants_offset()));
+
+  __ push(NULL_WORD);  // leave last_sp as null
   __ push(rbx);        // save Method*
-  // Get mirror and store it in the frame as GC root for this Method*
-  __ load_mirror(rdx, rbx, rscratch2);
+
+  // Get mirror and store it in the frame as GC root for this Method*.
+  // rax is still ConstantPool*, resolve ConstantPool* -> InstanceKlass* -> Java mirror.
+  __ movptr(rdx, Address(rax, ConstantPool::pool_holder_offset()));
+  __ movptr(rdx, Address(rdx, in_bytes(Klass::java_mirror_offset())));
+  __ resolve_oop_handle(rdx, rscratch2);
   __ push(rdx);
+
   if (ProfileInterpreter) {
     Label method_data_continue;
     __ movptr(rdx, Address(rbx, in_bytes(Method::method_data_offset())));
     __ testptr(rdx, rdx);
-    __ jcc(Assembler::zero, method_data_continue);
+    __ jccb(Assembler::zero, method_data_continue);
     __ addptr(rdx, in_bytes(MethodData::data_offset()));
     __ bind(method_data_continue);
     __ push(rdx);      // set the mdp (method data pointer)
   } else {
-    __ push(0);
+    __ push(NULL_WORD);
   }
 
-  __ movptr(rdx, Address(rbx, Method::const_offset()));
-  __ movptr(rdx, Address(rdx, ConstMethod::constants_offset()));
-  __ movptr(rdx, Address(rdx, ConstantPool::cache_offset()));
-  __ push(rdx); // set constant pool cache
+  // rax is still ConstantPool*, set the constant pool cache
+  __ movptr(rdx, Address(rax, ConstantPool::cache_offset()));
+  __ push(rdx);
 
   __ movptr(rax, rlocals);
   __ subptr(rax, rbp);
@@ -594,7 +604,7 @@ void TemplateInterpreterGenerator::generate_fixed_frame(bool native_call) {
   __ push(rax); // set relativized rlocals, see frame::interpreter_frame_locals()
 
   if (native_call) {
-    __ push(0); // no bcp
+    __ push(NULL_WORD); // no bcp
   } else {
     __ push(rbcp); // set bcp
   }
@@ -1242,11 +1252,11 @@ address TemplateInterpreterGenerator::generate_normal_entry(bool synchronized) {
   {
     Label exit, loop;
     __ testl(rdx, rdx);
-    __ jcc(Assembler::lessEqual, exit); // do nothing if rdx <= 0
+    __ jccb(Assembler::lessEqual, exit); // do nothing if rdx <= 0
     __ bind(loop);
     __ push(NULL_WORD); // initialize local variables
     __ decrementl(rdx); // until everything initialized
-    __ jcc(Assembler::greater, loop);
+    __ jccb(Assembler::greater, loop);
     __ bind(exit);
   }
 

From 804a8fa4e96a32be2b38c2d0906dc5861a292007 Mon Sep 17 00:00:00 2001
From: Ivan Walulya <iwalulya@openjdk.org>
Date: Mon, 31 Mar 2025 11:15:47 +0000
Subject: [PATCH 557/587] 8352765: G1CollectedHeap::expand_and_allocate() may
 fail to allocate even after heap expansion succeeds

Reviewed-by: tschatzl, manc
---
 src/hotspot/share/gc/g1/g1Policy.cpp | 38 ++++++++++++++++------------
 1 file changed, 22 insertions(+), 16 deletions(-)

diff --git a/src/hotspot/share/gc/g1/g1Policy.cpp b/src/hotspot/share/gc/g1/g1Policy.cpp
index c20e2c971a8..deb67656a41 100644
--- a/src/hotspot/share/gc/g1/g1Policy.cpp
+++ b/src/hotspot/share/gc/g1/g1Policy.cpp
@@ -340,41 +340,47 @@ uint G1Policy::calculate_young_target_length(uint desired_young_length) const {
                               _reserve_regions,
                               max_to_eat_into_reserve);
 
+    uint survivor_regions_count = _g1h->survivor_regions_count();
+    uint desired_eden_length = desired_young_length - survivor_regions_count;
+    uint allocated_eden_length = allocated_young_length - survivor_regions_count;
+
     if (_free_regions_at_end_of_collection <= _reserve_regions) {
       // Fully eat (or already eating) into the reserve, hand back at most absolute_min_length regions.
-      uint receiving_young = MIN3(_free_regions_at_end_of_collection,
-                                  desired_young_length,
+      uint receiving_eden = MIN3(_free_regions_at_end_of_collection,
+                                  desired_eden_length,
                                   max_to_eat_into_reserve);
+      // Ensure that we provision for at least one Eden region.
+      receiving_eden = MAX2(receiving_eden, 1u);
       // We could already have allocated more regions than what we could get
       // above.
-      receiving_additional_eden = allocated_young_length < receiving_young ?
-                                  receiving_young - allocated_young_length : 0;
+      receiving_additional_eden = allocated_eden_length < receiving_eden ?
+                                  receiving_eden - allocated_eden_length : 0;
 
       log_trace(gc, ergo, heap)("Young target length: Fully eat into reserve "
-                                "receiving young %u receiving additional eden %u",
-                                receiving_young,
-                                receiving_additional_eden);
-    } else if (_free_regions_at_end_of_collection < (desired_young_length + _reserve_regions)) {
+                                "receiving eden %u receiving additional eden %u",
+                                receiving_eden, receiving_additional_eden);
+    } else if (_free_regions_at_end_of_collection < (desired_eden_length + _reserve_regions)) {
       // Partially eat into the reserve, at most max_to_eat_into_reserve regions.
       uint free_outside_reserve = _free_regions_at_end_of_collection - _reserve_regions;
-      assert(free_outside_reserve < desired_young_length,
+      assert(free_outside_reserve < desired_eden_length,
              "must be %u %u",
-             free_outside_reserve, desired_young_length);
+             free_outside_reserve, desired_eden_length);
 
-      uint receiving_within_reserve = MIN2(desired_young_length - free_outside_reserve,
+      uint receiving_within_reserve = MIN2(desired_eden_length - free_outside_reserve,
                                            max_to_eat_into_reserve);
-      uint receiving_young = free_outside_reserve + receiving_within_reserve;
+      uint receiving_eden = free_outside_reserve + receiving_within_reserve;
+
       // Again, we could have already allocated more than we could get.
-      receiving_additional_eden = allocated_young_length < receiving_young ?
-                                  receiving_young - allocated_young_length : 0;
+      receiving_additional_eden = allocated_eden_length < receiving_eden ?
+                                  receiving_eden - allocated_eden_length : 0;
 
       log_trace(gc, ergo, heap)("Young target length: Partially eat into reserve "
                                 "free outside reserve %u "
                                 "receiving within reserve %u "
-                                "receiving young %u "
+                                "receiving eden %u "
                                 "receiving additional eden %u",
                                 free_outside_reserve, receiving_within_reserve,
-                                receiving_young, receiving_additional_eden);
+                                receiving_eden, receiving_additional_eden);
     } else {
       // No need to use the reserve.
       receiving_additional_eden = desired_young_length - allocated_young_length;

From c9c3c1536880d81ab84d5cb55f4fd0fe3bbf60a2 Mon Sep 17 00:00:00 2001
From: Serhiy Sachkov <serhiy.sachkov@oracle.com>
Date: Mon, 31 Mar 2025 12:09:48 +0000
Subject: [PATCH 558/587] 8330598: java/net/httpclient/Http1ChunkedTest.java
 fails with java.util.MissingFormatArgumentException: Format specifier '%s'

Reviewed-by: dfuchs
---
 test/jdk/java/net/httpclient/Http1ChunkedTest.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/jdk/java/net/httpclient/Http1ChunkedTest.java b/test/jdk/java/net/httpclient/Http1ChunkedTest.java
index 2df4c9e854d..f51ccf9fd38 100644
--- a/test/jdk/java/net/httpclient/Http1ChunkedTest.java
+++ b/test/jdk/java/net/httpclient/Http1ChunkedTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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,7 @@ public class Http1ChunkedTest {
                         }
                     }
                     if (!received) {
-                        System.out.printf("%s: Unexpected headers received: dropping request.%n");
+                        System.out.printf("%s: Unexpected headers received: dropping request.%n", name);
                         continue;
                     }
                     OutputStream os = serverConn.getOutputStream();

From d4d18350f367a18813d0d418169e852c1530418e Mon Sep 17 00:00:00 2001
From: Alexander Zvegintsev <azvegint@openjdk.org>
Date: Mon, 31 Mar 2025 12:36:37 +0000
Subject: [PATCH 559/587] 8352860: Open source events tests batch0

Reviewed-by: psadhukhan
---
 test/jdk/java/awt/event/ClickEventsTest.java  | 133 ++++++++++++++
 .../awt/event/WindowActivatedEventTest.java   | 169 ++++++++++++++++++
 2 files changed, 302 insertions(+)
 create mode 100644 test/jdk/java/awt/event/ClickEventsTest.java
 create mode 100644 test/jdk/java/awt/event/WindowActivatedEventTest.java

diff --git a/test/jdk/java/awt/event/ClickEventsTest.java b/test/jdk/java/awt/event/ClickEventsTest.java
new file mode 100644
index 00000000000..936100ac950
--- /dev/null
+++ b/test/jdk/java/awt/event/ClickEventsTest.java
@@ -0,0 +1,133 @@
+/*
+ * Copyright (c) 2000, 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact 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 4087762
+  @summary Sometimes click events are missing when you click the color components alternately.
+  @key headful
+  @library /test/jdk/java/awt/regtesthelpers
+  @build Util
+  @run main ClickEventsTest
+*/
+
+import java.awt.Color;
+import java.awt.Component;
+import java.awt.Dimension;
+import java.awt.EventQueue;
+import java.awt.Frame;
+import java.awt.Graphics;
+import java.awt.Robot;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
+import java.util.concurrent.BrokenBarrierException;
+import java.util.concurrent.CyclicBarrier;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
+
+import test.java.awt.regtesthelpers.Util;
+
+public class ClickEventsTest {
+    static Frame frame;
+    static ColorComponent redComponent;
+    static ColorComponent blueComponent;
+    static Robot robot;
+
+    public static void main(String[] args) throws Exception {
+        try {
+            EventQueue.invokeAndWait(ClickEventsTest::createAndShowGUI);
+            test();
+        } finally {
+            EventQueue.invokeAndWait(() -> {
+                if (frame != null) {
+                    frame.dispose();
+                }
+            });
+        }
+    }
+
+    private static void test() throws Exception {
+        robot = new Robot();
+        robot.waitForIdle();
+        robot.delay(500);
+
+        for (int i = 0; i < 10; i++) {
+            redComponent.clickAndCheck();
+            blueComponent.clickAndCheck();
+        }
+    }
+
+    private static void createAndShowGUI() {
+        frame = new Frame("ClickEventsTest");
+        redComponent = new ColorComponent(Color.RED);
+        blueComponent = new ColorComponent(Color.BLUE);
+
+        frame.add("North", redComponent);
+        frame.add("South", blueComponent);
+
+        frame.pack();
+        frame.setLocationRelativeTo(null);
+        frame.setVisible(true);
+    }
+
+    static class ColorComponent extends Component {
+        public Color myColor;
+
+        private final CyclicBarrier barrier = new CyclicBarrier(2);
+
+        private final MouseAdapter mouseAdapter = new MouseAdapter() {
+            public void mouseClicked(MouseEvent event) {
+                System.out.println(myColor + " area clicked");
+                try {
+                    barrier.await(1, TimeUnit.SECONDS);
+                } catch (InterruptedException | BrokenBarrierException | TimeoutException e) {
+                    throw new RuntimeException(e);
+                }
+            }
+        };
+
+        public ColorComponent(Color c) {
+            myColor = c;
+            addMouseListener(mouseAdapter);
+        }
+
+        public Dimension getPreferredSize() {
+            return new Dimension(200, 100);
+        }
+
+        public void paint(Graphics g) {
+            g.setColor(myColor);
+            g.fillRect(0, 0, 200, 100);
+        }
+
+        public void clickAndCheck() throws InterruptedException, BrokenBarrierException {
+            barrier.reset();
+            Util.clickOnComp(this, robot);
+            try {
+                barrier.await(1, TimeUnit.SECONDS);
+            } catch (TimeoutException e) {
+                throw new RuntimeException(myColor + " was not clicked");
+            }
+        }
+    }
+}
diff --git a/test/jdk/java/awt/event/WindowActivatedEventTest.java b/test/jdk/java/awt/event/WindowActivatedEventTest.java
new file mode 100644
index 00000000000..5ced411e64a
--- /dev/null
+++ b/test/jdk/java/awt/event/WindowActivatedEventTest.java
@@ -0,0 +1,169 @@
+/*
+ * Copyright (c) 1999, 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact 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 4219344
+ * @summary tests that WINDOW_ACTIVATED events are generated properly
+ * @key headful
+ * @library /test/jdk/java/awt/regtesthelpers
+ * @build Util
+ * @run main WindowActivatedEventTest
+ */
+
+import test.java.awt.regtesthelpers.Util;
+
+import java.awt.Dialog;
+import java.awt.EventQueue;
+import java.awt.Frame;
+import java.awt.Robot;
+import java.awt.Window;
+import java.awt.event.WindowEvent;
+import java.awt.event.WindowAdapter;
+import java.lang.reflect.InvocationTargetException;
+import java.util.Arrays;
+import java.util.concurrent.atomic.AtomicInteger;
+
+public class WindowActivatedEventTest {
+
+    static Robot robot;
+    static Frame frame;
+    static Dialog dialog;
+
+    public static void main(String[] args) throws Exception {
+        robot = new Robot();
+
+        try {
+            EventQueue.invokeAndWait(WindowActivatedEventTest::createAndShowGUI);
+            robot.waitForIdle();
+            robot.delay(500);
+
+            Util.clickOnComp(dialog, robot);
+
+            robot.waitForIdle();
+            robot.delay(500);
+
+            for (int i = 0; i < 3 ; i++) {
+                clickAndCheck(frame);
+                clickAndCheck(dialog);
+            }
+        } finally {
+            EventQueue.invokeAndWait(() -> {
+                if (frame != null) {
+                    frame.dispose();
+                }
+                if (dialog != null) {
+                    dialog.dispose();
+                }
+            });
+        }
+    }
+
+    private static void clickAndCheck(Window windowToFocus)
+            throws InterruptedException, InvocationTargetException {
+        Window oppositeWindow = (windowToFocus == frame) ? dialog : frame;
+
+        System.out.println("Clicking on " + windowToFocus);
+
+        EventQueue.invokeAndWait(() -> {
+            if (windowToFocus.isFocused() || !oppositeWindow.isFocused()) {
+                throw new RuntimeException("%s isFocused %b, %s isFocused %b".formatted(
+                        windowToFocus.getName(), windowToFocus.isFocused(),
+                        oppositeWindow.getName(), oppositeWindow.isFocused()
+                ));
+            }
+        });
+
+        WindowEventLogger windowLogger = WindowEventLogger.getFromWindow(windowToFocus);
+        WindowEventLogger oppositeWindowLogger = WindowEventLogger.getFromWindow(oppositeWindow);
+
+        windowLogger.resetCounters();
+        oppositeWindowLogger.resetCounters();
+
+        Util.clickOnComp(windowToFocus, robot);
+
+        robot.delay(500);
+
+        int windowActivatedCount = windowLogger.activatedCount.get();
+        int windowDeactivatedCount = windowLogger.deactivatedCount.get();
+        int oppositeWindowActivatedCount = oppositeWindowLogger.activatedCount.get();
+        int oppositeWindowDeactivatedCount = oppositeWindowLogger.deactivatedCount.get();
+
+        if (windowActivatedCount != 1
+                || windowDeactivatedCount != 0
+                || oppositeWindowActivatedCount != 0
+                || oppositeWindowDeactivatedCount != 1) {
+            throw new RuntimeException(
+                    "Invalid activated/deactivated count: %s (%d/%d) / %s (%d/%d)"
+                    .formatted(
+                            windowToFocus.getName(),
+                            windowActivatedCount,
+                            windowDeactivatedCount,
+                            oppositeWindow.getName(),
+                            oppositeWindowActivatedCount,
+                            oppositeWindowDeactivatedCount
+                    ));
+        }
+    }
+
+    private static void createAndShowGUI() {
+        frame = new Frame("frame WindowActivatedEventTest");
+        dialog = new Dialog(frame, "dialog WindowActivatedEventTest");
+
+        frame.addWindowListener(new WindowEventLogger());
+        dialog.addWindowListener(new WindowEventLogger());
+
+        frame.setBounds(400, 0, 200, 200);
+        frame.setVisible(true);
+
+        dialog.setBounds(400, 200, 200, 200);
+        dialog.setVisible(true);
+    }
+
+    private static class WindowEventLogger extends WindowAdapter {
+        final AtomicInteger activatedCount = new AtomicInteger(0);
+        final AtomicInteger deactivatedCount = new AtomicInteger(0);
+
+        public void windowActivated(WindowEvent e) {
+            activatedCount.incrementAndGet();
+            System.out.println(e);
+        }
+
+        public void windowDeactivated(WindowEvent e) {
+            deactivatedCount.incrementAndGet();
+            System.out.println(e);
+        }
+
+        public void resetCounters() {
+            activatedCount.set(0);
+            deactivatedCount.set(0);
+        }
+
+        public static WindowEventLogger getFromWindow(Window window) {
+            return (WindowEventLogger) Arrays
+                    .stream(window.getWindowListeners())
+                    .filter(listener -> listener instanceof WindowEventLogger)
+                    .findFirst().get();
+        }
+    }
+}

From bbd5b174c50346152a624317b6bd76ec48f7e551 Mon Sep 17 00:00:00 2001
From: Hai-May Chao <hchao@openjdk.org>
Date: Mon, 31 Mar 2025 15:04:48 +0000
Subject: [PATCH 560/587] 8339280: jarsigner -verify performs cross-checking
 between CEN and LOC

Reviewed-by: mullan, weijun, lancea
---
 .../sun/security/tools/jarsigner/Main.java    | 148 ++++++++++++++++++
 .../jarsigner/resources/jarsigner.properties  |  14 ++
 src/jdk.jartool/share/man/jarsigner.md        |   5 +
 .../tools/jarsigner/VerifyJarEntryName.java   | 136 ++++++++++++++++
 4 files changed, 303 insertions(+)
 create mode 100644 test/jdk/sun/security/tools/jarsigner/VerifyJarEntryName.java

diff --git a/src/jdk.jartool/share/classes/sun/security/tools/jarsigner/Main.java b/src/jdk.jartool/share/classes/sun/security/tools/jarsigner/Main.java
index 763bafa8759..015668fcbc4 100644
--- a/src/jdk.jartool/share/classes/sun/security/tools/jarsigner/Main.java
+++ b/src/jdk.jartool/share/classes/sun/security/tools/jarsigner/Main.java
@@ -28,6 +28,8 @@ package sun.security.tools.jarsigner;
 import java.io.*;
 import java.net.UnknownHostException;
 import java.net.URLClassLoader;
+import java.nio.file.Files;
+import java.nio.file.Path;
 import java.security.cert.CertPathValidatorException;
 import java.security.cert.PKIXBuilderParameters;
 import java.security.spec.ECParameterSpec;
@@ -242,6 +244,8 @@ public class Main {
     private Throwable chainNotValidatedReason = null;
     private Throwable tsaChainNotValidatedReason = null;
 
+    private List<String> crossChkWarnings = new ArrayList<>();
+
     PKIXBuilderParameters pkixParameters;
     Set<X509Certificate> trustedCerts = new HashSet<>();
 
@@ -1103,6 +1107,7 @@ public class Main {
                 }
             }
             System.out.println();
+            crossCheckEntries(jarName);
 
             if (!anySigned) {
                 if (disabledAlgFound) {
@@ -1129,6 +1134,143 @@ public class Main {
         }
     }
 
+    private void crossCheckEntries(String jarName) throws Exception {
+        Set<String> locEntries = new HashSet<>();
+
+        try (JarFile jarFile = new JarFile(jarName);
+             JarInputStream jis = new JarInputStream(
+                     Files.newInputStream(Path.of(jarName)))) {
+
+            Manifest cenManifest = jarFile.getManifest();
+            Manifest locManifest = jis.getManifest();
+            compareManifest(cenManifest, locManifest);
+
+            JarEntry locEntry;
+            while ((locEntry = jis.getNextJarEntry()) != null) {
+                String entryName = locEntry.getName();
+                locEntries.add(entryName);
+
+                JarEntry cenEntry = jarFile.getJarEntry(entryName);
+                if (cenEntry == null) {
+                    crossChkWarnings.add(String.format(rb.getString(
+                            "entry.1.present.when.reading.jarinputstream.but.missing.via.jarfile"),
+                            entryName));
+                    continue;
+                }
+
+                try {
+                    readEntry(jis);
+                } catch (SecurityException e) {
+                    crossChkWarnings.add(String.format(rb.getString(
+                            "signature.verification.failed.on.entry.1.when.reading.via.jarinputstream"),
+                            entryName));
+                    continue;
+                }
+
+                try (InputStream cenInputStream = jarFile.getInputStream(cenEntry)) {
+                    if (cenInputStream == null) {
+                        crossChkWarnings.add(String.format(rb.getString(
+                                "entry.1.present.in.jarfile.but.unreadable"),
+                                entryName));
+                        continue;
+                    } else {
+                        try {
+                            readEntry(cenInputStream);
+                        } catch (SecurityException e) {
+                            crossChkWarnings.add(String.format(rb.getString(
+                                    "signature.verification.failed.on.entry.1.when.reading.via.jarfile"),
+                                    entryName));
+                            continue;
+                        }
+                    }
+                }
+
+                compareSigners(cenEntry, locEntry);
+            }
+
+            jarFile.stream()
+                    .map(JarEntry::getName)
+                    .filter(n -> !locEntries.contains(n) && !n.equals(JarFile.MANIFEST_NAME))
+                    .forEach(n -> crossChkWarnings.add(String.format(rb.getString(
+                            "entry.1.present.when.reading.jarfile.but.missing.via.jarinputstream"), n)));
+        }
+    }
+
+    private void readEntry(InputStream is) throws IOException {
+        is.transferTo(OutputStream.nullOutputStream());
+    }
+
+    private void compareManifest(Manifest cenManifest, Manifest locManifest) {
+        if (cenManifest == null) {
+            crossChkWarnings.add(rb.getString(
+                    "manifest.missing.when.reading.jarfile"));
+            return;
+        }
+        if (locManifest == null) {
+            crossChkWarnings.add(rb.getString(
+                    "manifest.missing.when.reading.jarinputstream"));
+            return;
+        }
+
+        Attributes cenMainAttrs = cenManifest.getMainAttributes();
+        Attributes locMainAttrs = locManifest.getMainAttributes();
+
+        for (Object key : cenMainAttrs.keySet()) {
+            Object cenValue = cenMainAttrs.get(key);
+            Object locValue = locMainAttrs.get(key);
+
+            if (locValue == null) {
+                crossChkWarnings.add(String.format(rb.getString(
+                        "manifest.attribute.1.present.when.reading.jarfile.but.missing.via.jarinputstream"),
+                        key));
+            } else if (!cenValue.equals(locValue)) {
+                crossChkWarnings.add(String.format(rb.getString(
+                        "manifest.attribute.1.differs.jarfile.value.2.jarinputstream.value.3"),
+                        key, cenValue, locValue));
+            }
+        }
+
+        for (Object key : locMainAttrs.keySet()) {
+            if (!cenMainAttrs.containsKey(key)) {
+                crossChkWarnings.add(String.format(rb.getString(
+                        "manifest.attribute.1.present.when.reading.jarinputstream.but.missing.via.jarfile"),
+                        key));
+            }
+        }
+    }
+
+    private void compareSigners(JarEntry cenEntry, JarEntry locEntry) {
+        CodeSigner[] cenSigners = cenEntry.getCodeSigners();
+        CodeSigner[] locSigners = locEntry.getCodeSigners();
+
+        boolean cenHasSigners = cenSigners != null;
+        boolean locHasSigners = locSigners != null;
+
+        if (cenHasSigners && locHasSigners) {
+            if (!Arrays.equals(cenSigners, locSigners)) {
+                crossChkWarnings.add(String.format(rb.getString(
+                        "codesigners.different.for.entry.1.when.reading.jarfile.and.jarinputstream"),
+                        cenEntry.getName()));
+            }
+        } else if (cenHasSigners) {
+            crossChkWarnings.add(String.format(rb.getString(
+                    "entry.1.is.signed.in.jarfile.but.is.not.signed.in.jarinputstream"),
+                    cenEntry.getName()));
+        } else if (locHasSigners) {
+            crossChkWarnings.add(String.format(rb.getString(
+                    "entry.1.is.signed.in.jarinputstream.but.is.not.signed.in.jarfile"),
+                    locEntry.getName()));
+        }
+    }
+
+    private void displayCrossChkWarnings() {
+        System.out.println();
+        // First is a summary warning
+        System.out.println(rb.getString("jar.contains.internal.inconsistencies.result.in.different.contents.via.jarfile.and.jarinputstream"));
+        // each warning message with prefix "- "
+        crossChkWarnings.forEach(warning -> System.out.println("- " + warning));
+    }
+
     private void displayMessagesAndResult(boolean isSigning) {
         String result;
         List<String> errors = new ArrayList<>();
@@ -1360,6 +1502,9 @@ public class Main {
                 System.out.println(rb.getString("Warning."));
                 warnings.forEach(System.out::println);
             }
+            if (!crossChkWarnings.isEmpty()) {
+                displayCrossChkWarnings();
+            }
         } else {
             if (!errors.isEmpty() || !warnings.isEmpty()) {
                 System.out.println();
@@ -1367,6 +1512,9 @@ public class Main {
                 errors.forEach(System.out::println);
                 warnings.forEach(System.out::println);
             }
+            if (!crossChkWarnings.isEmpty()) {
+                displayCrossChkWarnings();
+            }
         }
 
         if (!isSigning && (!errors.isEmpty() || !warnings.isEmpty())) {
diff --git a/src/jdk.jartool/share/classes/sun/security/tools/jarsigner/resources/jarsigner.properties b/src/jdk.jartool/share/classes/sun/security/tools/jarsigner/resources/jarsigner.properties
index 0b28eec671d..b490d386e59 100644
--- a/src/jdk.jartool/share/classes/sun/security/tools/jarsigner/resources/jarsigner.properties
+++ b/src/jdk.jartool/share/classes/sun/security/tools/jarsigner/resources/jarsigner.properties
@@ -208,3 +208,17 @@ Cannot.find.environment.variable.=Cannot find environment variable:\u0020
 Cannot.find.file.=Cannot find file:\u0020
 event.ocsp.check=Contacting OCSP server at %s ...
 event.crl.check=Downloading CRL from %s ...
+manifest.missing.when.reading.jarfile=Manifest is missing when reading via JarFile
+manifest.missing.when.reading.jarinputstream=Manifest is missing when reading via JarInputStream
+manifest.attribute.1.present.when.reading.jarfile.but.missing.via.jarinputstream=Manifest main attribute %s is present when reading via JarFile but missing when reading via JarInputStream
+manifest.attribute.1.present.when.reading.jarinputstream.but.missing.via.jarfile=Manifest main attribute %s is present when reading via JarInputStream but missing when reading via JarFile
+manifest.attribute.1.differs.jarfile.value.2.jarinputstream.value.3=Manifest main attribute %1$s differs: JarFile value = %2$s, JarInputStream value = %3$s
+entry.1.present.when.reading.jarinputstream.but.missing.via.jarfile=Entry %s is present when reading via JarInputStream but missing when reading via JarFile
+entry.1.present.when.reading.jarfile.but.missing.via.jarinputstream=Entry %s is present when reading via JarFile but missing when reading via JarInputStream
+entry.1.present.in.jarfile.but.unreadable=Entry %s is present in JarFile but unreadable
+codesigners.different.for.entry.1.when.reading.jarfile.and.jarinputstream=Code signers are different for entry %s when reading from JarFile and JarInputStream
+entry.1.is.signed.in.jarfile.but.is.not.signed.in.jarinputstream=Entry %s is signed in JarFile but is not signed in JarInputStream
+entry.1.is.signed.in.jarinputstream.but.is.not.signed.in.jarfile=Entry %s is signed in JarInputStream but is not signed in JarFile
+jar.contains.internal.inconsistencies.result.in.different.contents.via.jarfile.and.jarinputstream=This JAR file contains internal inconsistencies that may result in different contents when reading via JarFile and JarInputStream:
+signature.verification.failed.on.entry.1.when.reading.via.jarinputstream=Signature verification failed on entry %s when reading via JarInputStream
+signature.verification.failed.on.entry.1.when.reading.via.jarfile=Signature verification failed on entry %s when reading via JarFile
diff --git a/src/jdk.jartool/share/man/jarsigner.md b/src/jdk.jartool/share/man/jarsigner.md
index fccdf0ecdc3..2c921775505 100644
--- a/src/jdk.jartool/share/man/jarsigner.md
+++ b/src/jdk.jartool/share/man/jarsigner.md
@@ -929,6 +929,11 @@ was selected, and the others were discarded.
 hasNonexistentEntries
 :   This JAR contains signed entries for files that do not exist.
 
+internalInconsistenciesDetected
+:   This JAR contains internal inconsistencies detected during verification
+    that may result in different contents when reading via JarFile
+    and JarInputStream.
+
 legacyAlg
 :   An algorithm used is considered a security risk but not disabled.
 
diff --git a/test/jdk/sun/security/tools/jarsigner/VerifyJarEntryName.java b/test/jdk/sun/security/tools/jarsigner/VerifyJarEntryName.java
new file mode 100644
index 00000000000..faa3ab7b897
--- /dev/null
+++ b/test/jdk/sun/security/tools/jarsigner/VerifyJarEntryName.java
@@ -0,0 +1,136 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact 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 8339280
+ * @summary Test that jarsigner -verify emits a warning when the filename of
+ *     an entry in the LOC is changed
+ * @library /test/lib
+ * @run junit VerifyJarEntryName
+ */
+
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import java.io.FileOutputStream;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.jar.JarFile;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipOutputStream;
+
+import jdk.test.lib.SecurityTools;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+public class VerifyJarEntryName {
+
+    private static final Path ORIGINAL_JAR = Path.of("test.jar");
+    private static final Path MODIFIED_JAR = Path.of("modified_test.jar");
+
+    @BeforeAll
+    static void setup() throws Exception {
+        try (FileOutputStream fos = new FileOutputStream(ORIGINAL_JAR.toFile());
+             ZipOutputStream zos = new ZipOutputStream(fos)) {
+            zos.putNextEntry(new ZipEntry(JarFile.MANIFEST_NAME));
+            zos.write("Manifest-Version: 1.0\nCreated-By: Test\n".
+                    getBytes(StandardCharsets.UTF_8));
+            zos.closeEntry();
+
+            // Add hello.txt file
+            ZipEntry textEntry = new ZipEntry("hello.txt");
+            zos.putNextEntry(textEntry);
+            zos.write("hello".getBytes(StandardCharsets.UTF_8));
+            zos.closeEntry();
+        }
+
+        SecurityTools.keytool("-genkeypair -keystore ks -storepass changeit "
+                + "-alias mykey -keyalg rsa -dname CN=me ");
+
+        SecurityTools.jarsigner("-keystore ks -storepass changeit "
+                        + ORIGINAL_JAR + " mykey")
+                .shouldHaveExitValue(0);
+    }
+
+    @BeforeEach
+    void cleanup() throws Exception {
+        Files.deleteIfExists(MODIFIED_JAR);
+    }
+
+    /*
+     * Modify a single byte in "MANIFEST.MF" filename in LOC, and
+     * validate that jarsigner -verify emits a warning message.
+     */
+    @Test
+    void verifyManifestEntryName() throws Exception {
+        modifyJarEntryName(ORIGINAL_JAR, MODIFIED_JAR, "MANIFEST.MF");
+        SecurityTools.jarsigner("-verify -verbose " + MODIFIED_JAR)
+                .shouldContain("This JAR file contains internal " +
+                        "inconsistencies that may result in different " +
+                        "contents when reading via JarFile and JarInputStream:")
+                .shouldContain("- Manifest is missing when " +
+                        "reading via JarInputStream")
+                .shouldHaveExitValue(0);
+    }
+
+    /*
+     * Modify a single byte in signature filename in LOC, and
+     * validate that jarsigner -verify emits a warning message.
+     */
+    @Test
+    void verifySignatureEntryName() throws Exception {
+        modifyJarEntryName(ORIGINAL_JAR, MODIFIED_JAR, "MYKEY.SF");
+        SecurityTools.jarsigner("-verify -verbose " + MODIFIED_JAR)
+                .shouldContain("This JAR file contains internal " +
+                        "inconsistencies that may result in different " +
+                        "contents when reading via JarFile and JarInputStream:")
+                .shouldContain("- Entry XETA-INF/MYKEY.SF is present when reading " +
+                        "via JarInputStream but missing when reading via JarFile")
+                .shouldHaveExitValue(0);
+    }
+
+    /*
+     * Validate that jarsigner -verify on a valid JAR works without
+     * emitting warnings about internal inconsistencies.
+     */
+    @Test
+    void verifyOriginalJar() throws Exception {
+        SecurityTools.jarsigner("-verify -verbose " + ORIGINAL_JAR)
+                .shouldNotContain("This JAR file contains internal " +
+                        "inconsistencies that may result in different contents when " +
+                        "reading via JarFile and JarInputStream:")
+                .shouldHaveExitValue(0);
+    }
+
+    private void modifyJarEntryName(Path origJar, Path modifiedJar,
+            String entryName) throws Exception {
+        byte[] jarBytes = Files.readAllBytes(origJar);
+        var jarString = new String(jarBytes, StandardCharsets.UTF_8);
+        var pos = jarString.indexOf(entryName);
+        assertTrue(pos != -1, entryName + " is not present in the JAR");
+        jarBytes[pos] = 'X';
+        Files.write(modifiedJar, jarBytes);
+    }
+}

From b7ca76ef4bfc640668492e655acc6d755411a92f Mon Sep 17 00:00:00 2001
From: SendaoYan <syan@openjdk.org>
Date: Mon, 31 Mar 2025 15:45:23 +0000
Subject: [PATCH 561/587] 8353235: Test
 jdk/jfr/api/metadata/annotations/TestPeriod.java fails with
 IllegalArgumentException

Reviewed-by: egahlin
---
 test/jdk/jdk/jfr/api/metadata/annotations/TestPeriod.java | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/test/jdk/jdk/jfr/api/metadata/annotations/TestPeriod.java b/test/jdk/jdk/jfr/api/metadata/annotations/TestPeriod.java
index c1f02a7cac2..0a839aab081 100644
--- a/test/jdk/jdk/jfr/api/metadata/annotations/TestPeriod.java
+++ b/test/jdk/jdk/jfr/api/metadata/annotations/TestPeriod.java
@@ -26,6 +26,7 @@ package jdk.jfr.api.metadata.annotations;
 import jdk.jfr.Event;
 import jdk.jfr.EventType;
 import jdk.jfr.Period;
+import jdk.jfr.FlightRecorder;
 import jdk.test.lib.Asserts;
 import jdk.test.lib.jfr.Events;
 
@@ -44,6 +45,7 @@ public class TestPeriod {
 
     public static void main(String[] args) throws Exception {
         EventType periodicEvent = EventType.getEventType(PeriodicEvent.class);
+        FlightRecorder.addPeriodicEvent(PeriodicEvent.class, () -> {});
         String defaultValue = Events.getSetting(periodicEvent, Period.NAME).getDefaultValue();
         Asserts.assertEQ(defaultValue, "47 s", "Incorrect default value for period");
     }

From 7a2e198e9fec54158020a49165c1f4a4518e28d8 Mon Sep 17 00:00:00 2001
From: Artur Barashev <abarashev@openjdk.org>
Date: Mon, 31 Mar 2025 15:48:03 +0000
Subject: [PATCH 562/587] 8352277: java.security documentation: incorrect regex
 syntax describing "usage" algorithm constraint

Reviewed-by: mullan, hchao, ascarpino
---
 src/java.base/share/conf/security/java.security | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/java.base/share/conf/security/java.security b/src/java.base/share/conf/security/java.security
index 693d19438f6..ab2556e9c54 100644
--- a/src/java.base/share/conf/security/java.security
+++ b/src/java.base/share/conf/security/java.security
@@ -535,7 +535,10 @@ sun.security.krb5.maxReferrals=5
 #       denyAfter YYYY-MM-DD
 #
 #   UsageConstraint:
-#       usage [TLSServer] [TLSClient] [SignedJAR]
+#       usage UsageType { UsageType }
+#
+#   UsageType:
+#       TLSServer | TLSClient | SignedJAR
 #
 #   IncludeProperty:
 #       include <security property>
@@ -598,9 +601,9 @@ sun.security.krb5.maxReferrals=5
 #       use the following:  "RSA keySize == 2048 & denyAfter 2020-02-03"
 #
 #   UsageConstraint:
-#     usage [TLSServer] [TLSClient] [SignedJAR]
+#     usage UsageType { UsageType }
 #       This constraint prohibits the specified algorithm for
-#       a specified usage.  This should be used when disabling an algorithm
+#       a specified UsageType.  This should be used when disabling an algorithm
 #       for all usages is not practical. 'TLSServer' restricts the algorithm
 #       in TLS server certificate chains when server authentication is
 #       performed. 'TLSClient' restricts the algorithm in TLS client

From e4e62789c7c89bd094480ca3fe19c123a34f9625 Mon Sep 17 00:00:00 2001
From: Anthony Scarpino <ascarpino@openjdk.org>
Date: Mon, 31 Mar 2025 15:59:30 +0000
Subject: [PATCH 563/587] 8346129: Simplify EdDSA & XDH curve name usage

Reviewed-by: weijun, abarashev
---
 .../provider/certpath/AlgorithmChecker.java   |   6 +-
 .../util/DisabledAlgorithmConstraints.java    |  43 +++--
 .../classes/sun/security/util/KeyUtil.java    |  16 ++
 .../DisabledAlgorithmPermits.java             | 175 ++++++++++++++++++
 4 files changed, 218 insertions(+), 22 deletions(-)
 create mode 100644 test/jdk/sun/security/util/AlgorithmConstraints/DisabledAlgorithmPermits.java

diff --git a/src/java.base/share/classes/sun/security/provider/certpath/AlgorithmChecker.java b/src/java.base/share/classes/sun/security/provider/certpath/AlgorithmChecker.java
index 7ce31492b4b..f127ac65cc7 100644
--- a/src/java.base/share/classes/sun/security/provider/certpath/AlgorithmChecker.java
+++ b/src/java.base/share/classes/sun/security/provider/certpath/AlgorithmChecker.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -37,6 +37,7 @@ import java.util.*;
 
 import sun.security.util.Debug;
 import sun.security.util.DisabledAlgorithmConstraints;
+import sun.security.util.KeyUtil;
 import sun.security.validator.Validator;
 import sun.security.x509.AlgorithmId;
 import sun.security.x509.X509CertImpl;
@@ -206,7 +207,8 @@ public final class AlgorithmChecker extends PKIXCertPathChecker {
                 CertPathConstraintsParameters cp =
                     new CertPathConstraintsParameters(trustedPubKey, variant,
                         anchor, date);
-                dac.permits(trustedPubKey.getAlgorithm(), cp, true);
+                dac.permits(KeyUtil.getAlgorithm(trustedPubKey),
+                    cp, true);
             }
             // Check the signature algorithm and parameters against constraints
             CertPathConstraintsParameters cp =
diff --git a/src/java.base/share/classes/sun/security/util/DisabledAlgorithmConstraints.java b/src/java.base/share/classes/sun/security/util/DisabledAlgorithmConstraints.java
index 7612242733e..be5239f9fca 100644
--- a/src/java.base/share/classes/sun/security/util/DisabledAlgorithmConstraints.java
+++ b/src/java.base/share/classes/sun/security/util/DisabledAlgorithmConstraints.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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 java.security.Key;
 import java.security.cert.CertPathValidatorException;
 import java.security.cert.CertPathValidatorException.BasicReason;
 import java.security.interfaces.ECKey;
-import java.security.interfaces.XECKey;
 import java.security.spec.AlgorithmParameterSpec;
 import java.security.spec.InvalidParameterSpecException;
 import java.security.spec.MGF1ParameterSpec;
-import java.security.spec.NamedParameterSpec;
 import java.security.spec.PSSParameterSpec;
 import java.time.DateTimeException;
 import java.time.Instant;
 import java.time.ZoneId;
 import java.time.ZonedDateTime;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -254,7 +251,7 @@ public class DisabledAlgorithmConstraints extends AbstractAlgorithmConstraints {
         if (checkKey) {
             // Check if named curves in the key are disabled.
             for (Key key : cp.getKeys()) {
-                for (String curve : getNamedCurveFromKey(key)) {
+                for (String curve : getNamedParametersFromKey(key)) {
                     if (!cachedCheckAlgorithm(curve)) {
                         throw new CertPathValidatorException(
                             "Algorithm constraints check failed on disabled " +
@@ -267,17 +264,23 @@ public class DisabledAlgorithmConstraints extends AbstractAlgorithmConstraints {
         algorithmConstraints.permits(algorithm, cp, checkKey);
     }
 
-    private static List<String> getNamedCurveFromKey(Key key) {
-        if (key instanceof ECKey) {
-            NamedCurve nc = CurveDB.lookup(((ECKey)key).getParams());
-            return (nc == null ? List.of()
-                               : Arrays.asList(nc.getNameAndAliases()));
-        } else if (key instanceof XECKey) {
-            return List.of(
-                ((NamedParameterSpec)((XECKey)key).getParams()).getName());
-        } else {
-            return List.of();
-        }
+    private static List<String> getNamedParametersFromKey(Key key) {
+        return switch (key) {
+            case ECKey ecKey -> {
+                NamedCurve nc = CurveDB.lookup(ecKey.getParams());
+                if (nc == null) {
+                    yield List.of();
+                }
+                yield List.of(nc.getNameAndAliases());
+            }
+            default -> {
+                String n = KeyUtil.getAlgorithm(key);
+                if (n.equalsIgnoreCase(key.getAlgorithm())) {
+                    yield List.of(n);
+                }
+                yield List.of(key.getAlgorithm(), n);
+            }
+        };
     }
 
     // Check algorithm constraints with key and algorithm
@@ -301,12 +304,12 @@ public class DisabledAlgorithmConstraints extends AbstractAlgorithmConstraints {
         }
 
         // check the key algorithm
-        if (!permits(primitives, key.getAlgorithm(), null)) {
+        if (!permits(primitives, KeyUtil.getAlgorithm(key), null)) {
             return false;
         }
 
         // If this is an elliptic curve, check if it is disabled
-        for (String curve : getNamedCurveFromKey(key)) {
+        for (String curve : getNamedParametersFromKey(key)) {
             if (!permits(primitives, curve, null)) {
                 return false;
             }
@@ -460,7 +463,7 @@ public class DisabledAlgorithmConstraints extends AbstractAlgorithmConstraints {
 
         // Check if KeySizeConstraints permit the specified key
         public boolean permits(Key key) {
-            List<Constraint> list = getConstraints(key.getAlgorithm());
+            List<Constraint> list = getConstraints(KeyUtil.getAlgorithm(key));
             if (list == null) {
                 return true;
             }
@@ -514,7 +517,7 @@ public class DisabledAlgorithmConstraints extends AbstractAlgorithmConstraints {
 
             if (checkKey) {
                 for (Key key : cp.getKeys()) {
-                    algorithms.add(key.getAlgorithm());
+                    algorithms.add(KeyUtil.getAlgorithm(key));
                 }
             }
 
diff --git a/src/java.base/share/classes/sun/security/util/KeyUtil.java b/src/java.base/share/classes/sun/security/util/KeyUtil.java
index 224167653f7..2c9416c0983 100644
--- a/src/java.base/share/classes/sun/security/util/KeyUtil.java
+++ b/src/java.base/share/classes/sun/security/util/KeyUtil.java
@@ -174,6 +174,22 @@ public final class KeyUtil {
         return -1;
     }
 
+    /**
+     * If the key is a sub-algorithm of a larger group of algorithms, this
+     * method will return that sub-algorithm.  For example, key.getAlgorithm()
+     * returns "EdDSA", but the underlying key may be "Ed448".  For
+     * DisabledAlgorithmConstraints (DAC), this distinction is important.
+     * "EdDSA" means all curves for DAC, but when using it with
+     * KeyPairGenerator, "EdDSA" means "Ed25519".
+     */
+    public static String getAlgorithm(Key key) {
+        if (key instanceof AsymmetricKey ak &&
+            ak.getParams() instanceof NamedParameterSpec nps) {
+            return nps.getName();
+        }
+        return key.getAlgorithm();
+    }
+
     /**
      * Returns whether the key is valid or not.
      * <P>
diff --git a/test/jdk/sun/security/util/AlgorithmConstraints/DisabledAlgorithmPermits.java b/test/jdk/sun/security/util/AlgorithmConstraints/DisabledAlgorithmPermits.java
new file mode 100644
index 00000000000..913aa1266f4
--- /dev/null
+++ b/test/jdk/sun/security/util/AlgorithmConstraints/DisabledAlgorithmPermits.java
@@ -0,0 +1,175 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import sun.security.util.DisabledAlgorithmConstraints;
+
+import java.security.CryptoPrimitive;
+import java.security.KeyPairGenerator;
+import java.security.PrivateKey;
+import java.security.Security;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Objects;
+import java.util.Set;
+
+/*
+ * @test
+ * @bug 8346129
+ * @modules java.base/sun.security.util
+ * @summary Check DisabledAlgorithmConstraints using EdDSA & XDH against
+ * permit(Set<CryptoPrimitive>, String, AP) and
+ * permit(Set<CryptoPrimitive>, Key).  Results will differ based
+ * on method used.  The first method only can compare the String with the
+ * algorithms.  The second can check the algorithm and NamedParameterSpec
+ * while results in more 'false' cases.
+ *
+ * @run main/othervm DisabledAlgorithmPermits Ed25519
+ * @run main/othervm DisabledAlgorithmPermits Ed448
+ * @run main/othervm DisabledAlgorithmPermits EdDSA
+ * @run main/othervm DisabledAlgorithmPermits X25519
+ * @run main/othervm DisabledAlgorithmPermits X448
+ * @run main/othervm DisabledAlgorithmPermits XDH
+ */
+
+public class DisabledAlgorithmPermits {
+    public static void main(String[] args) throws Exception {
+        String algorithm = args[0];
+        Security.setProperty("x", algorithm);
+
+        // Expected table are the expected results from the test
+        List<TestCase> expected = switch (algorithm) {
+            case "Ed25519" ->
+                Arrays.asList(
+                    new TestCase("EdDSA", true),
+                    new TestCase("Ed25519", false),
+                    new TestCase("Ed448", true),
+                    new TestCase("X448", true),
+                    new TestCase(1,"EdDSA", false),
+                    new TestCase(1,"Ed25519", false),
+                    new TestCase(1,"Ed448", true),
+                    new TestCase(1,"X448", true));
+            case "Ed448" ->
+                Arrays.asList(
+                    new TestCase("EdDSA", true),
+                    new TestCase("Ed25519", true),
+                    new TestCase("Ed448", false),
+                    new TestCase("X448", true),
+                    new TestCase(1,"EdDSA", true),
+                    new TestCase(1,"Ed25519", true),
+                    new TestCase(1,"Ed448", false),
+                    new TestCase(1,"X448", true));
+            case "EdDSA" ->
+                Arrays.asList(
+                    new TestCase("EdDSA", false),
+                    new TestCase("Ed25519", true),
+                    new TestCase("Ed448", true),
+                    new TestCase("X448", true),
+                    new TestCase(1,"EdDSA", false),
+                    new TestCase(1,"Ed25519", false),
+                    new TestCase(1,"Ed448", false),
+                    new TestCase(1,"X448", true));
+            case "X25519" ->
+                Arrays.asList(
+                    new TestCase("XDH", true),
+                    new TestCase("X25519", false),
+                    new TestCase("X448", true),
+                    new TestCase("Ed448", true),
+                    new TestCase(1, "XDH", false),
+                    new TestCase(1, "X25519", false),
+                    new TestCase(1, "X448", true),
+                    new TestCase(1, "Ed448", true));
+            case "X448" ->
+                Arrays.asList(
+                    new TestCase("XDH", true),
+                    new TestCase("X25519", true),
+                    new TestCase("X448", false),
+                    new TestCase("Ed448", true),
+                    new TestCase(1, "XDH", true),
+                    new TestCase(1, "X25519", true),
+                    new TestCase(1, "X448", false),
+                    new TestCase(1, "Ed448", true));
+            case "XDH" ->
+                Arrays.asList(
+                    new TestCase("XDH", false),
+                    new TestCase("X25519", true),
+                    new TestCase("X448", true),
+                    new TestCase("Ed448", true),
+                    new TestCase(1, "XDH", false),
+                    new TestCase(1, "X25519", false),
+                    new TestCase(1, "X448", false),
+                    new TestCase(1, "Ed448", true));
+            default -> null;
+        };
+
+        Objects.requireNonNull(expected, "algorithm being tested " +
+            algorithm + " not in expected table");
+        System.out.println("---");
+        var dac = new DisabledAlgorithmConstraints("x");
+        System.out.println("disabled algorithms = " + Security.getProperty("x"));
+
+        // Using only testType 0, this tests that permit(Set<>, String, null)
+        // will check only the algorithm against the disabled list
+        expected.stream().filter(n->n.testType == 0).forEach(tc -> {
+            boolean r = dac.permits(Set.of(CryptoPrimitive.SIGNATURE),
+                    tc.testAlgo, null);
+            System.out.print("\tpermits(Set.of(CryptoPrimitive.SIGNATURE), \"" +
+                tc.testAlgo + "\", null): " + r + " : " );
+            if (r != tc.expected) {
+                System.out.println("failed.");
+                throw new AssertionError("failed.  Expected " +
+                    tc.expected);
+            }
+            System.out.println("pass");
+        });
+
+        // Using only testType 1, this tests permit(Set<>, Key) that will look
+        // at both the key.getAlgorithm() and the key.getParams().getName()
+        // against the disabled list
+        expected.stream().filter(n->n.testType == 1).forEach(tc -> {
+            PrivateKey k;
+            try {
+                k = KeyPairGenerator.getInstance(tc.testAlgo).generateKeyPair().
+                    getPrivate();
+            } catch (Exception e) {
+                throw new RuntimeException(e);
+            }
+            boolean r = dac.permits(Set.of(CryptoPrimitive.SIGNATURE), k);
+            System.out.print("\tpermits(Set.of(CryptoPrimitive.SIGNATURE), " +
+                tc.testAlgo + " privkey): " + r + " : " );
+            if (r != tc.expected) {
+                System.out.println("failed.");
+                throw new AssertionError("failed.  Expected " +
+                    tc.expected);
+            }
+            System.out.println("pass");
+        });
+        System.out.println("---");
+    }
+
+    record TestCase(int testType, String testAlgo, boolean expected) {
+        TestCase(String testAlgo, boolean expected) {
+            this(0, testAlgo, expected);
+        }
+    }
+}
+

From cd5a43a98030a534babb01cfc4521e7e9bc89b91 Mon Sep 17 00:00:00 2001
From: Alexander Zvegintsev <azvegint@openjdk.org>
Date: Mon, 31 Mar 2025 16:39:44 +0000
Subject: [PATCH 564/587] 8353126: Open source events tests batch1

Reviewed-by: honkar, kizune
---
 .../MouseEvent/DragToLightweightTest.java     | 146 +++++++++++++++
 .../awt/event/MouseEvent/MouseEnterTest.java  | 175 ++++++++++++++++++
 2 files changed, 321 insertions(+)
 create mode 100644 test/jdk/java/awt/event/MouseEvent/DragToLightweightTest.java
 create mode 100644 test/jdk/java/awt/event/MouseEvent/MouseEnterTest.java

diff --git a/test/jdk/java/awt/event/MouseEvent/DragToLightweightTest.java b/test/jdk/java/awt/event/MouseEvent/DragToLightweightTest.java
new file mode 100644
index 00000000000..7549c42beeb
--- /dev/null
+++ b/test/jdk/java/awt/event/MouseEvent/DragToLightweightTest.java
@@ -0,0 +1,146 @@
+/*
+ * Copyright (c) 2001, 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact 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 4417964
+ * @summary tests that drag events continue to arrive to heavyweight
+ *          when the mouse is moved to lightweight while dragging.
+ * @key headful
+ * @library /lib/client /java/awt/regtesthelpers
+ * @build ExtendedRobot Util
+ * @run main DragToLightweightTest
+*/
+
+import java.awt.Color;
+import java.awt.Container;
+import java.awt.Dimension;
+import java.awt.EventQueue;
+import java.awt.FlowLayout;
+import java.awt.Frame;
+import java.awt.Graphics;
+import java.awt.HeadlessException;
+import java.awt.Point;
+import java.awt.Rectangle;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+
+import test.java.awt.regtesthelpers.Util;
+
+public class DragToLightweightTest {
+
+    private static final CountDownLatch latch = new CountDownLatch(1);
+    private static volatile MouseTest mouseTest;
+
+    public static void main(String[] args) throws Exception {
+
+        EventQueue.invokeAndWait(() -> mouseTest = new MouseTest());
+
+        try {
+            test();
+        } finally {
+            EventQueue.invokeAndWait(() -> {
+                if (mouseTest != null) {
+                    mouseTest.dispose();
+                }
+            });
+        }
+    }
+
+    private static void test() throws Exception {
+        ExtendedRobot robot = new ExtendedRobot();
+        robot.waitForIdle();
+        robot.delay(500);
+
+        Rectangle componentBounds = mouseTest.getLightweightComponentBounds();
+
+        robot.dragAndDrop(
+                componentBounds.x + componentBounds.width / 2, componentBounds.y + componentBounds.height + 30,
+                componentBounds.x + componentBounds.width / 2, componentBounds.y + 2 * componentBounds.height / 3
+        );
+
+        if (!latch.await(5, TimeUnit.SECONDS)) {
+            throw new RuntimeException("The test failed: no mouse release event received");
+        }
+
+        System.out.println("Mouse release event received, the test PASSED");
+    }
+
+    private static class MouseTest extends Frame {
+
+        final Foo foo;
+
+        public MouseTest() throws HeadlessException {
+            super("DragToLightweightTest");
+
+            setLayout(new FlowLayout());
+
+            addMouseListener(new MouseAdapter() {
+                @Override
+                public void mouseReleased(MouseEvent e) {
+                    System.out.println("mouseReleased");
+                    latch.countDown();
+                }
+            });
+
+            // Create a Component that will be a child of the Frame and add
+            // a MouseListener to it.
+            foo = new Foo();
+            foo.setBackground(Color.red);
+
+            System.out.println(foo.getPreferredSize());
+            foo.setPreferredSize(new Dimension(350, 200));
+            System.out.println(foo.getPreferredSize());
+
+            foo.addMouseListener(new DummyAdapter());
+
+            add(foo);
+
+            setSize(400, 400);
+            setLocationRelativeTo(null);
+            setVisible(true);
+        }
+
+        public Rectangle getLightweightComponentBounds() throws Exception {
+            return Util.invokeOnEDT(() -> {
+                Point locationOnScreen = foo.getLocationOnScreen();
+                Dimension size = foo.getSize();
+                return new Rectangle(locationOnScreen.x, locationOnScreen.y, size.width, size.height);
+            });
+        }
+
+        private static class Foo extends Container {
+            public void paint(Graphics g) {
+                g.setColor(getBackground());
+                g.fillRect(0, 0, getWidth(), getHeight());
+                g.setColor(Color.white);
+                g.drawString(getBounds().toString(), 5, 20);
+                super.paint(g);
+            }
+        }
+
+        private static class DummyAdapter extends MouseAdapter {}
+    }
+}
diff --git a/test/jdk/java/awt/event/MouseEvent/MouseEnterTest.java b/test/jdk/java/awt/event/MouseEvent/MouseEnterTest.java
new file mode 100644
index 00000000000..c5203acfdd8
--- /dev/null
+++ b/test/jdk/java/awt/event/MouseEvent/MouseEnterTest.java
@@ -0,0 +1,175 @@
+/*
+ * Copyright (c) 2002, 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact 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 4095172
+ * @summary Test for no proper mouse coordinates on MOUSE_ENTER/MOUSE_EXIT events for Win boxes.
+ * @key headful
+ * @library /lib/client /java/awt/regtesthelpers
+ * @build ExtendedRobot Util
+ * @run main MouseEnterTest
+ */
+
+import java.awt.EventQueue;
+import java.awt.Frame;
+import java.awt.Point;
+import java.awt.Rectangle;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
+import java.util.ArrayList;
+
+import test.java.awt.regtesthelpers.Util;
+
+public class MouseEnterTest {
+    private static Frame frame;
+    private static final TestMouseAdapter mouseAdapter = new TestMouseAdapter();
+
+    public static void main(String[] args) throws Exception {
+        EventQueue.invokeAndWait(MouseEnterTest::initAndShowGUI);
+        try {
+            test();
+        } finally {
+            EventQueue.invokeAndWait(() -> {
+                if (frame != null) {
+                    frame.dispose();
+                }
+            });
+        }
+    }
+
+    private static void initAndShowGUI() {
+        frame = new Frame("MouseEnterTest");
+        frame.setLayout(null);
+        frame.setSize(300, 200);
+        frame.setLocationRelativeTo(null);
+        frame.addMouseListener(mouseAdapter);
+        frame.setVisible(true);
+    }
+
+    private static void test() throws Exception {
+        ExtendedRobot robot = new ExtendedRobot();
+        robot.waitForIdle();
+        robot.delay(500);
+
+        Rectangle bounds = Util.invokeOnEDT(frame::getBounds);
+
+        java.util.List<Point> points = getBorderGlidePoints(bounds);
+        for (int i = 0; i < points.size(); i += 2) {
+            Point p1 = points.get(i);
+            Point p2 = points.get(i + 1);
+
+            System.out.println("\n------------------\n");
+
+            System.out.printf("%s > %s > %s\n", p1, p2, p1);
+            robot.glide(p1, p2);
+            robot.waitForIdle();
+            robot.glide(p2, p1);
+            robot.waitForIdle();
+            robot.delay(200);
+            mouseAdapter.testEvents();
+
+            System.out.println("\n------------------\n");
+
+            System.out.printf("%s > %s > %s\n", p2, p1, p2);
+            robot.glide(p2, p1);
+            robot.waitForIdle();
+            robot.glide(p1, p2);
+            robot.waitForIdle();
+            robot.delay(200);
+            mouseAdapter.testEvents();
+        }
+    }
+
+    private static java.util.List<Point> getBorderGlidePoints(Rectangle bounds) {
+        java.util.List<Point> list = new ArrayList<>();
+
+        int d = 10;
+
+        // left
+        list.add(new Point(bounds.x - d, bounds.y + bounds.height / 2));
+        list.add(new Point(bounds.x + d, bounds.y + bounds.height / 2));
+
+        // right
+        list.add(new Point(bounds.x + bounds.width - d, bounds.y + bounds.height / 2));
+        list.add(new Point(bounds.x + bounds.width + d, bounds.y + bounds.height / 2));
+
+        // top
+        list.add(new Point(bounds.x + bounds.width / 2, bounds.y - d));
+        list.add(new Point(bounds.x + bounds.width / 2, bounds.y + d));
+
+        // bottom
+        list.add(new Point(bounds.x + bounds.width / 2, bounds.y + bounds.height - d));
+        list.add(new Point(bounds.x + bounds.width / 2, bounds.y + bounds.height + d));
+
+        return list;
+    }
+
+    private static final class TestMouseAdapter extends MouseAdapter {
+        private static final int THRESHOLD = 5;
+        private volatile MouseEvent lastEnteredEvent = null;
+        private volatile MouseEvent lastExitedEvent = null;
+
+        @Override
+        public void mouseEntered(MouseEvent e) {
+            System.out.println("MouseEntered " + e);
+            lastEnteredEvent = e;
+        }
+
+        @Override
+        public void mouseExited(MouseEvent e) {
+            System.out.println("MouseExited " + e);
+            lastExitedEvent = e;
+        }
+
+        public void testEvents() {
+            if (lastEnteredEvent == null || lastExitedEvent == null) {
+                throw new RuntimeException("Missing lastEnteredEvent or lastExitedEvent");
+            }
+
+            System.out.println("\nTesting:");
+            System.out.println(lastEnteredEvent);
+            System.out.println(lastExitedEvent);
+            System.out.println();
+
+            int diffX = Math.abs(lastEnteredEvent.getX() - lastExitedEvent.getX());
+            int diffScreenX = Math.abs(lastEnteredEvent.getY() - lastExitedEvent.getY());
+            int diffY = Math.abs(lastEnteredEvent.getXOnScreen() - lastExitedEvent.getXOnScreen());
+            int diffScreenY = Math.abs(lastEnteredEvent.getYOnScreen() - lastExitedEvent.getYOnScreen());
+
+            System.out.printf("THRESHOLD %d, diffX %d diffScreenX %d " +
+                            "diffY %d diffScreenY %d\n",
+                    THRESHOLD,
+                    diffX, diffScreenX,
+                    diffY, diffScreenY
+            );
+
+            if (diffX > THRESHOLD
+                || diffScreenX > THRESHOLD
+                || diffY > THRESHOLD
+                || diffScreenY > THRESHOLD) {
+                throw new RuntimeException("Mouse enter vs exit event is too different");
+            }
+        }
+    }
+}

From 9c06dcb4396c3307d625663d92c0e11d794a56ea Mon Sep 17 00:00:00 2001
From: Artur Barashev <abarashev@openjdk.org>
Date: Mon, 31 Mar 2025 16:45:40 +0000
Subject: [PATCH 565/587] 8349583: Add mechanism to disable signature schemes
 based on their TLS scope

Reviewed-by: mullan, ascarpino
---
 .../security/ssl/CertSignAlgsExtension.java   |  49 ++--
 .../sun/security/ssl/CertificateRequest.java  |  57 +++-
 .../sun/security/ssl/HandshakeContext.java    |   5 +-
 .../security/ssl/PostHandshakeContext.java    |   4 +-
 .../security/ssl/PreSharedKeyExtension.java   |  22 +-
 .../security/ssl/SSLAlgorithmConstraints.java |  34 +--
 .../classes/sun/security/ssl/SSLScope.java    |  55 ++++
 .../sun/security/ssl/SSLSessionImpl.java      |   6 +-
 .../classes/sun/security/ssl/ServerHello.java |  27 +-
 .../security/ssl/SessionTicketExtension.java  |  10 +-
 .../ssl/SignatureAlgorithmsExtension.java     |  18 +-
 .../sun/security/ssl/SignatureScheme.java     |  96 ++++---
 .../util/DisabledAlgorithmConstraints.java    |  62 ++++-
 .../share/conf/security/java.security         |  29 ++-
 .../net/ssl/templates/SSLEngineTemplate.java  |  75 +++++-
 .../AbstractCheckSignatureSchemes.java        | 246 ++++++++++++++++++
 .../DisableSignatureSchemePerScopeDTLS12.java |  58 +++++
 .../DisableSignatureSchemePerScopeTLS12.java  | 149 +++++++++++
 .../DisableSignatureSchemePerScopeTLS13.java  | 103 ++++++++
 .../MixingTLSUsageConstraintsWithNonTLS.java  |  56 ++++
 .../SigSchemePropOrdering.java                | 234 +----------------
 21 files changed, 1047 insertions(+), 348 deletions(-)
 create mode 100644 src/java.base/share/classes/sun/security/ssl/SSLScope.java
 create mode 100644 test/jdk/sun/security/ssl/SignatureScheme/AbstractCheckSignatureSchemes.java
 create mode 100644 test/jdk/sun/security/ssl/SignatureScheme/DisableSignatureSchemePerScopeDTLS12.java
 create mode 100644 test/jdk/sun/security/ssl/SignatureScheme/DisableSignatureSchemePerScopeTLS12.java
 create mode 100644 test/jdk/sun/security/ssl/SignatureScheme/DisableSignatureSchemePerScopeTLS13.java
 create mode 100644 test/jdk/sun/security/ssl/SignatureScheme/MixingTLSUsageConstraintsWithNonTLS.java

diff --git a/src/java.base/share/classes/sun/security/ssl/CertSignAlgsExtension.java b/src/java.base/share/classes/sun/security/ssl/CertSignAlgsExtension.java
index ee20f8f0faa..2772ecff337 100644
--- a/src/java.base/share/classes/sun/security/ssl/CertSignAlgsExtension.java
+++ b/src/java.base/share/classes/sun/security/ssl/CertSignAlgsExtension.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,8 @@
 
 package sun.security.ssl;
 
+import static sun.security.ssl.SignatureScheme.CERTIFICATE_SCOPE;
+
 import java.io.IOException;
 import java.nio.ByteBuffer;
 import java.util.List;
@@ -97,26 +99,27 @@ final class CertSignAlgsExtension {
             }
 
             // Produce the extension.
-            if (chc.localSupportedSignAlgs == null) {
-                chc.localSupportedSignAlgs =
-                    SignatureScheme.getSupportedAlgorithms(
-                            chc.sslConfig,
-                            chc.algorithmConstraints, chc.activeProtocols);
+            if (chc.localSupportedCertSignAlgs == null) {
+                chc.localSupportedCertSignAlgs =
+                        SignatureScheme.getSupportedAlgorithms(
+                                chc.sslConfig,
+                                chc.algorithmConstraints, chc.activeProtocols,
+                                CERTIFICATE_SCOPE);
             }
 
             int vectorLen = SignatureScheme.sizeInRecord() *
-                    chc.localSupportedSignAlgs.size();
+                    chc.localSupportedCertSignAlgs.size();
             byte[] extData = new byte[vectorLen + 2];
             ByteBuffer m = ByteBuffer.wrap(extData);
             Record.putInt16(m, vectorLen);
-            for (SignatureScheme ss : chc.localSupportedSignAlgs) {
+            for (SignatureScheme ss : chc.localSupportedCertSignAlgs) {
                 Record.putInt16(m, ss.id);
             }
 
             // Update the context.
             chc.handshakeExtensions.put(
                     SSLExtension.CH_SIGNATURE_ALGORITHMS_CERT,
-                    new SignatureSchemesSpec(chc.localSupportedSignAlgs));
+                    new SignatureSchemesSpec(chc.localSupportedCertSignAlgs));
 
             return extData;
         }
@@ -191,7 +194,9 @@ final class CertSignAlgsExtension {
                     SignatureScheme.getSupportedAlgorithms(
                             shc.sslConfig,
                             shc.algorithmConstraints, shc.negotiatedProtocol,
-                            spec.signatureSchemes);
+                            spec.signatureSchemes,
+                            CERTIFICATE_SCOPE);
+
             shc.peerRequestedCertSignSchemes = schemes;
             shc.handshakeSession.setPeerSupportedSignatureAlgorithms(schemes);
 
@@ -240,24 +245,28 @@ final class CertSignAlgsExtension {
             }
 
             // Produce the extension.
-            List<SignatureScheme> sigAlgs =
-                    SignatureScheme.getSupportedAlgorithms(
-                            shc.sslConfig,
-                            shc.algorithmConstraints,
-                            List.of(shc.negotiatedProtocol));
+            if (shc.localSupportedCertSignAlgs == null) {
+                shc.localSupportedCertSignAlgs =
+                        SignatureScheme.getSupportedAlgorithms(
+                                shc.sslConfig,
+                                shc.algorithmConstraints,
+                                List.of(shc.negotiatedProtocol),
+                                CERTIFICATE_SCOPE);
+            }
 
-            int vectorLen = SignatureScheme.sizeInRecord() * sigAlgs.size();
+            int vectorLen = SignatureScheme.sizeInRecord()
+                    * shc.localSupportedCertSignAlgs.size();
             byte[] extData = new byte[vectorLen + 2];
             ByteBuffer m = ByteBuffer.wrap(extData);
             Record.putInt16(m, vectorLen);
-            for (SignatureScheme ss : sigAlgs) {
+            for (SignatureScheme ss : shc.localSupportedCertSignAlgs) {
                 Record.putInt16(m, ss.id);
             }
 
             // Update the context.
             shc.handshakeExtensions.put(
                     SSLExtension.CR_SIGNATURE_ALGORITHMS_CERT,
-                    new SignatureSchemesSpec(shc.localSupportedSignAlgs));
+                    new SignatureSchemesSpec(shc.localSupportedCertSignAlgs));
 
             return extData;
         }
@@ -331,7 +340,9 @@ final class CertSignAlgsExtension {
                     SignatureScheme.getSupportedAlgorithms(
                             chc.sslConfig,
                             chc.algorithmConstraints, chc.negotiatedProtocol,
-                            spec.signatureSchemes);
+                            spec.signatureSchemes,
+                            CERTIFICATE_SCOPE);
+
             chc.peerRequestedCertSignSchemes = schemes;
             chc.handshakeSession.setPeerSupportedSignatureAlgorithms(schemes);
         }
diff --git a/src/java.base/share/classes/sun/security/ssl/CertificateRequest.java b/src/java.base/share/classes/sun/security/ssl/CertificateRequest.java
index f7ca92633ab..062d4d77a58 100644
--- a/src/java.base/share/classes/sun/security/ssl/CertificateRequest.java
+++ b/src/java.base/share/classes/sun/security/ssl/CertificateRequest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,9 @@
 
 package sun.security.ssl;
 
+import static sun.security.ssl.SignatureScheme.CERTIFICATE_SCOPE;
+import static sun.security.ssl.SignatureScheme.HANDSHAKE_SCOPE;
+
 import java.io.IOException;
 import java.nio.ByteBuffer;
 import java.security.PrivateKey;
@@ -396,7 +399,6 @@ final class CertificateRequest {
                         iae);
             }
 
-
             if (clientAlias == null) {
                 if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
                     SSLLogger.warning("No available client authentication");
@@ -632,15 +634,32 @@ final class CertificateRequest {
         public byte[] produce(ConnectionContext context,
                 HandshakeMessage message) throws IOException {
             // The producing happens in server side only.
-            ServerHandshakeContext shc = (ServerHandshakeContext)context;
+            ServerHandshakeContext shc = (ServerHandshakeContext) context;
+
             if (shc.localSupportedSignAlgs == null) {
                 shc.localSupportedSignAlgs =
-                    SignatureScheme.getSupportedAlgorithms(
-                            shc.sslConfig,
-                            shc.algorithmConstraints, shc.activeProtocols);
+                        SignatureScheme.getSupportedAlgorithms(
+                                shc.sslConfig,
+                                shc.algorithmConstraints, shc.activeProtocols,
+                                HANDSHAKE_SCOPE);
             }
 
-            if (shc.localSupportedSignAlgs.isEmpty()) {
+            if (shc.localSupportedCertSignAlgs == null) {
+                shc.localSupportedCertSignAlgs =
+                        SignatureScheme.getSupportedAlgorithms(
+                                shc.sslConfig,
+                                shc.algorithmConstraints, shc.activeProtocols,
+                                CERTIFICATE_SCOPE);
+            }
+
+            // According to TLSv1.2 RFC, CertificateRequest message must
+            // contain signature schemes supported for both:
+            // handshake signatures and certificate signatures.
+            List<SignatureScheme> certReqSignAlgs =
+                    new ArrayList<>(shc.localSupportedSignAlgs);
+            certReqSignAlgs.retainAll(shc.localSupportedCertSignAlgs);
+
+            if (certReqSignAlgs.isEmpty()) {
                 throw shc.conContext.fatal(Alert.HANDSHAKE_FAILURE,
                     "No supported signature algorithm");
             }
@@ -649,7 +668,7 @@ final class CertificateRequest {
                     shc.sslContext.getX509TrustManager().getAcceptedIssuers();
             T12CertificateRequestMessage crm = new T12CertificateRequestMessage(
                     shc, caCerts, shc.negotiatedCipherSuite.keyExchange,
-                    shc.localSupportedSignAlgs);
+                    certReqSignAlgs);
             if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
                 SSLLogger.fine(
                     "Produced CertificateRequest handshake message", crm);
@@ -730,19 +749,29 @@ final class CertificateRequest {
             chc.handshakeProducers.put(SSLHandshake.CERTIFICATE.id,
                     SSLHandshake.CERTIFICATE);
 
-            List<SignatureScheme> sss =
+            List<SignatureScheme> signAlgs =
                     SignatureScheme.getSupportedAlgorithms(
                             chc.sslConfig,
                             chc.algorithmConstraints, chc.negotiatedProtocol,
-                            crm.algorithmIds);
-            if (sss.isEmpty()) {
+                            crm.algorithmIds,
+                            HANDSHAKE_SCOPE);
+
+            List<SignatureScheme> signCertAlgs =
+                    SignatureScheme.getSupportedAlgorithms(
+                            chc.sslConfig,
+                            chc.algorithmConstraints, chc.negotiatedProtocol,
+                            crm.algorithmIds,
+                            CERTIFICATE_SCOPE);
+
+            if (signAlgs.isEmpty() || signCertAlgs.isEmpty()) {
                 throw chc.conContext.fatal(Alert.HANDSHAKE_FAILURE,
                         "No supported signature algorithm");
             }
 
-            chc.peerRequestedSignatureSchemes = sss;
-            chc.peerRequestedCertSignSchemes = sss;     // use the same schemes
-            chc.handshakeSession.setPeerSupportedSignatureAlgorithms(sss);
+            chc.peerRequestedSignatureSchemes = signAlgs;
+            chc.peerRequestedCertSignSchemes = signCertAlgs;
+            chc.handshakeSession.setPeerSupportedSignatureAlgorithms(signCertAlgs);
+
             try {
                 chc.peerSupportedAuthorities = crm.getAuthorities();
             } catch (IllegalArgumentException iae) {
diff --git a/src/java.base/share/classes/sun/security/ssl/HandshakeContext.java b/src/java.base/share/classes/sun/security/ssl/HandshakeContext.java
index fe62c82a2be..8455ddfc65d 100644
--- a/src/java.base/share/classes/sun/security/ssl/HandshakeContext.java
+++ b/src/java.base/share/classes/sun/security/ssl/HandshakeContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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 @@ abstract class HandshakeContext implements ConnectionContext {
     // consolidated parameters
     final List<ProtocolVersion>             activeProtocols;
     final List<CipherSuite>                 activeCipherSuites;
-    final AlgorithmConstraints              algorithmConstraints;
+    final SSLAlgorithmConstraints           algorithmConstraints;
     final ProtocolVersion                   maximumActiveProtocol;
 
     // output stream
@@ -127,6 +127,7 @@ abstract class HandshakeContext implements ConnectionContext {
 
     // SignatureScheme
     List<SignatureScheme>                   localSupportedSignAlgs;
+    List<SignatureScheme>                   localSupportedCertSignAlgs;
     List<SignatureScheme>                   peerRequestedSignatureSchemes;
     List<SignatureScheme>                   peerRequestedCertSignSchemes;
 
diff --git a/src/java.base/share/classes/sun/security/ssl/PostHandshakeContext.java b/src/java.base/share/classes/sun/security/ssl/PostHandshakeContext.java
index e0af48719d2..b06549b40e3 100644
--- a/src/java.base/share/classes/sun/security/ssl/PostHandshakeContext.java
+++ b/src/java.base/share/classes/sun/security/ssl/PostHandshakeContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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,7 @@ final class PostHandshakeContext extends HandshakeContext {
                 "Post-handshake not supported in " + negotiatedProtocol.name);
         }
 
-        this.localSupportedSignAlgs = new ArrayList<>(
+        this.localSupportedCertSignAlgs = new ArrayList<>(
             context.conSession.getLocalSupportedSignatureSchemes());
 
         // Add the potential post-handshake consumers.
diff --git a/src/java.base/share/classes/sun/security/ssl/PreSharedKeyExtension.java b/src/java.base/share/classes/sun/security/ssl/PreSharedKeyExtension.java
index 43214841987..9e843a0e4a5 100644
--- a/src/java.base/share/classes/sun/security/ssl/PreSharedKeyExtension.java
+++ b/src/java.base/share/classes/sun/security/ssl/PreSharedKeyExtension.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -42,6 +42,7 @@ import sun.security.ssl.SessionTicketExtension.SessionTicketSpec;
 import sun.security.util.HexDumpEncoder;
 
 import static sun.security.ssl.SSLExtension.*;
+import static sun.security.ssl.SignatureScheme.CERTIFICATE_SCOPE;
 
 /**
  * Pack of the "pre_shared_key" extension.
@@ -440,15 +441,16 @@ final class PreSharedKeyExtension {
             result = false;
         }
 
-        // Make sure that the server handshake context's localSupportedSignAlgs
-        // field is populated.  This is particularly important when
-        // client authentication was used in an initial session, and it is
-        // now being resumed.
-        if (shc.localSupportedSignAlgs == null) {
-            shc.localSupportedSignAlgs =
+        // Make sure that the server handshake context's
+        // localSupportedCertSignAlgs field is populated.  This is particularly
+        // important when client authentication was used in an initial session,
+        // and it is now being resumed.
+        if (shc.localSupportedCertSignAlgs == null) {
+            shc.localSupportedCertSignAlgs =
                     SignatureScheme.getSupportedAlgorithms(
                             shc.sslConfig,
-                            shc.algorithmConstraints, shc.activeProtocols);
+                            shc.algorithmConstraints, shc.activeProtocols,
+                            CERTIFICATE_SCOPE);
         }
 
         // Validate the required client authentication.
@@ -470,7 +472,7 @@ final class PreSharedKeyExtension {
             Collection<SignatureScheme> sessionSigAlgs =
                 s.getLocalSupportedSignatureSchemes();
             if (result &&
-                !shc.localSupportedSignAlgs.containsAll(sessionSigAlgs)) {
+                !shc.localSupportedCertSignAlgs.containsAll(sessionSigAlgs)) {
 
                 if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
                     SSLLogger.fine("Can't resume. Session uses different " +
@@ -664,7 +666,7 @@ final class PreSharedKeyExtension {
             // Make sure the list of supported signature algorithms matches
             Collection<SignatureScheme> sessionSigAlgs =
                 chc.resumingSession.getLocalSupportedSignatureSchemes();
-            if (!chc.localSupportedSignAlgs.containsAll(sessionSigAlgs)) {
+            if (!chc.localSupportedCertSignAlgs.containsAll(sessionSigAlgs)) {
                 if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
                     SSLLogger.fine("Existing session uses different " +
                         "signature algorithms");
diff --git a/src/java.base/share/classes/sun/security/ssl/SSLAlgorithmConstraints.java b/src/java.base/share/classes/sun/security/ssl/SSLAlgorithmConstraints.java
index c226e3dee8d..88cdfbca5ff 100644
--- a/src/java.base/share/classes/sun/security/ssl/SSLAlgorithmConstraints.java
+++ b/src/java.base/share/classes/sun/security/ssl/SSLAlgorithmConstraints.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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,11 @@ import static sun.security.util.DisabledAlgorithmConstraints.*;
  */
 final class SSLAlgorithmConstraints implements AlgorithmConstraints {
 
-    private static final AlgorithmConstraints tlsDisabledAlgConstraints =
+    private static final DisabledAlgorithmConstraints tlsDisabledAlgConstraints =
             new DisabledAlgorithmConstraints(PROPERTY_TLS_DISABLED_ALGS,
                     new SSLAlgorithmDecomposer());
 
-    private static final AlgorithmConstraints x509DisabledAlgConstraints =
+    private static final DisabledAlgorithmConstraints x509DisabledAlgConstraints =
             new DisabledAlgorithmConstraints(PROPERTY_CERTPATH_DISABLED_ALGS,
                     new SSLAlgorithmDecomposer(true));
 
@@ -56,11 +56,11 @@ final class SSLAlgorithmConstraints implements AlgorithmConstraints {
     private final boolean enabledX509DisabledAlgConstraints;
 
     // the default algorithm constraints
-    static final AlgorithmConstraints DEFAULT =
+    static final SSLAlgorithmConstraints DEFAULT =
                         new SSLAlgorithmConstraints(null, true);
 
     // the default SSL only algorithm constraints
-    static final AlgorithmConstraints DEFAULT_SSL_ONLY =
+    static final SSLAlgorithmConstraints DEFAULT_SSL_ONLY =
                         new SSLAlgorithmConstraints(null, false);
 
     private SSLAlgorithmConstraints(AlgorithmConstraints userSpecifiedConstraints,
@@ -84,11 +84,11 @@ final class SSLAlgorithmConstraints implements AlgorithmConstraints {
      * @param userSpecifiedConstraints additional constraints to check
      * @return a SSLAlgorithmConstraints instance
      */
-    static AlgorithmConstraints wrap(AlgorithmConstraints userSpecifiedConstraints) {
+    static SSLAlgorithmConstraints wrap(AlgorithmConstraints userSpecifiedConstraints) {
         return wrap(userSpecifiedConstraints, true);
     }
 
-    private static AlgorithmConstraints wrap(
+    private static SSLAlgorithmConstraints wrap(
             AlgorithmConstraints userSpecifiedConstraints,
             boolean withDefaultCertPathConstraints) {
         if (nullIfDefault(userSpecifiedConstraints) == null) {
@@ -199,22 +199,22 @@ final class SSLAlgorithmConstraints implements AlgorithmConstraints {
 
         if (peerSpecifiedConstraints != null) {
             permitted = peerSpecifiedConstraints.permits(
-                                    primitives, algorithm, parameters);
+                    primitives, algorithm, parameters);
         }
 
         if (permitted && userSpecifiedConstraints != null) {
             permitted = userSpecifiedConstraints.permits(
-                                    primitives, algorithm, parameters);
+                    primitives, algorithm, parameters);
         }
 
         if (permitted) {
             permitted = tlsDisabledAlgConstraints.permits(
-                                    primitives, algorithm, parameters);
+                    primitives, algorithm, parameters);
         }
 
         if (permitted && enabledX509DisabledAlgConstraints) {
             permitted = x509DisabledAlgConstraints.permits(
-                                    primitives, algorithm, parameters);
+                    primitives, algorithm, parameters);
         }
 
         return permitted;
@@ -252,27 +252,31 @@ final class SSLAlgorithmConstraints implements AlgorithmConstraints {
 
         if (peerSpecifiedConstraints != null) {
             permitted = peerSpecifiedConstraints.permits(
-                                    primitives, algorithm, key, parameters);
+                    primitives, algorithm, key, parameters);
         }
 
         if (permitted && userSpecifiedConstraints != null) {
             permitted = userSpecifiedConstraints.permits(
-                                    primitives, algorithm, key, parameters);
+                    primitives, algorithm, key, parameters);
         }
 
         if (permitted) {
             permitted = tlsDisabledAlgConstraints.permits(
-                                    primitives, algorithm, key, parameters);
+                    primitives, algorithm, key, parameters);
         }
 
         if (permitted && enabledX509DisabledAlgConstraints) {
             permitted = x509DisabledAlgConstraints.permits(
-                                    primitives, algorithm, key, parameters);
+                    primitives, algorithm, key, parameters);
         }
 
         return permitted;
     }
 
+    // Checks if algorithm is disabled for the given TLS scopes.
+    boolean permits(String algorithm, Set<SSLScope> scopes) {
+        return tlsDisabledAlgConstraints.permits(algorithm, scopes);
+    }
 
     private static class SupportedSignatureAlgorithmConstraints
                                     implements AlgorithmConstraints {
diff --git a/src/java.base/share/classes/sun/security/ssl/SSLScope.java b/src/java.base/share/classes/sun/security/ssl/SSLScope.java
new file mode 100644
index 00000000000..d2f4dfc14a3
--- /dev/null
+++ b/src/java.base/share/classes/sun/security/ssl/SSLScope.java
@@ -0,0 +1,55 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute 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.ssl;
+
+/*
+ * Scopes defining different parts of TLS protocol.
+ */
+
+public enum SSLScope {
+    // Handshake signature scope as in signature_algorithms extension.
+    HANDSHAKE_SIGNATURE("HandshakeSignature"),
+
+    // Certificate signature scope as in signature_algorithms_cert extension.
+    CERTIFICATE_SIGNATURE("CertificateSignature");
+
+    private final String name;
+
+    SSLScope(String name) {
+        this.name = name;
+    }
+
+    // Note: the SSLScope name is case-insensitive.
+    public static SSLScope nameOf(String scopeName) {
+        for (SSLScope scope : SSLScope.values()) {
+            if (scope.name.equalsIgnoreCase(scopeName)) {
+                return scope;
+            }
+        }
+
+        return null;
+    }
+}
diff --git a/src/java.base/share/classes/sun/security/ssl/SSLSessionImpl.java b/src/java.base/share/classes/sun/security/ssl/SSLSessionImpl.java
index f02709bc31d..2e7d99ee293 100644
--- a/src/java.base/share/classes/sun/security/ssl/SSLSessionImpl.java
+++ b/src/java.base/share/classes/sun/security/ssl/SSLSessionImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -195,10 +195,10 @@ final class SSLSessionImpl extends ExtendedSSLSession {
         this.sessionId = id;
         this.host = hc.conContext.transport.getPeerHost();
         this.port = hc.conContext.transport.getPeerPort();
-        this.localSupportedSignAlgs = hc.localSupportedSignAlgs == null ?
+        this.localSupportedSignAlgs = hc.localSupportedCertSignAlgs == null ?
                 Collections.emptySet() :
                 Collections.unmodifiableCollection(
-                        new ArrayList<>(hc.localSupportedSignAlgs));
+                        new ArrayList<>(hc.localSupportedCertSignAlgs));
         this.serverNameIndication = hc.negotiatedServerName;
         this.requestedServerNames = List.copyOf(hc.getRequestedServerNames());
         if (hc.sslConfig.isClientMode) {
diff --git a/src/java.base/share/classes/sun/security/ssl/ServerHello.java b/src/java.base/share/classes/sun/security/ssl/ServerHello.java
index 3ec66e0f0f2..f19964dd5c7 100644
--- a/src/java.base/share/classes/sun/security/ssl/ServerHello.java
+++ b/src/java.base/share/classes/sun/security/ssl/ServerHello.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,9 @@
 
 package sun.security.ssl;
 
+import static sun.security.ssl.SignatureScheme.CERTIFICATE_SCOPE;
+import static sun.security.ssl.SignatureScheme.HANDSHAKE_SCOPE;
+
 import java.io.IOException;
 import java.nio.ByteBuffer;
 import java.security.AlgorithmConstraints;
@@ -273,7 +276,16 @@ final class ServerHello {
                     shc.localSupportedSignAlgs =
                         SignatureScheme.getSupportedAlgorithms(
                                 shc.sslConfig,
-                                shc.algorithmConstraints, shc.activeProtocols);
+                                shc.algorithmConstraints, shc.activeProtocols,
+                                HANDSHAKE_SCOPE);
+                }
+
+                if (shc.localSupportedCertSignAlgs == null) {
+                    shc.localSupportedCertSignAlgs =
+                            SignatureScheme.getSupportedAlgorithms(
+                                    shc.sslConfig,
+                                    shc.algorithmConstraints, shc.activeProtocols,
+                                    CERTIFICATE_SCOPE);
                 }
 
                 SSLSessionImpl session =
@@ -514,7 +526,16 @@ final class ServerHello {
                     shc.localSupportedSignAlgs =
                         SignatureScheme.getSupportedAlgorithms(
                                 shc.sslConfig,
-                                shc.algorithmConstraints, shc.activeProtocols);
+                                shc.algorithmConstraints, shc.activeProtocols,
+                                HANDSHAKE_SCOPE);
+                }
+
+                if (shc.localSupportedCertSignAlgs == null) {
+                    shc.localSupportedCertSignAlgs =
+                            SignatureScheme.getSupportedAlgorithms(
+                                    shc.sslConfig,
+                                    shc.algorithmConstraints, shc.activeProtocols,
+                                    CERTIFICATE_SCOPE);
                 }
 
                 SSLSessionImpl session =
diff --git a/src/java.base/share/classes/sun/security/ssl/SessionTicketExtension.java b/src/java.base/share/classes/sun/security/ssl/SessionTicketExtension.java
index e143dcb302e..60f630ccbd2 100644
--- a/src/java.base/share/classes/sun/security/ssl/SessionTicketExtension.java
+++ b/src/java.base/share/classes/sun/security/ssl/SessionTicketExtension.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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 @@ import javax.net.ssl.SSLSessionContext;
 
 import static sun.security.ssl.SSLExtension.CH_SESSION_TICKET;
 import static sun.security.ssl.SSLExtension.SH_SESSION_TICKET;
+import static sun.security.ssl.SignatureScheme.CERTIFICATE_SCOPE;
 
 import sun.security.ssl.SSLExtension.ExtensionConsumer;
 import sun.security.ssl.SSLExtension.SSLExtensionSpec;
@@ -352,11 +353,12 @@ final class SessionTicketExtension {
                 return new byte[0];
             }
 
-            if (chc.localSupportedSignAlgs == null) {
-                chc.localSupportedSignAlgs =
+            if (chc.localSupportedCertSignAlgs == null) {
+                chc.localSupportedCertSignAlgs =
                         SignatureScheme.getSupportedAlgorithms(
                                 chc.sslConfig,
-                                chc.algorithmConstraints, chc.activeProtocols);
+                                chc.algorithmConstraints, chc.activeProtocols,
+                                CERTIFICATE_SCOPE);
             }
 
             return chc.resumingSession.getPskIdentity();
diff --git a/src/java.base/share/classes/sun/security/ssl/SignatureAlgorithmsExtension.java b/src/java.base/share/classes/sun/security/ssl/SignatureAlgorithmsExtension.java
index d27914094fd..2b36d35e78d 100644
--- a/src/java.base/share/classes/sun/security/ssl/SignatureAlgorithmsExtension.java
+++ b/src/java.base/share/classes/sun/security/ssl/SignatureAlgorithmsExtension.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,8 @@
 
 package sun.security.ssl;
 
+import static sun.security.ssl.SignatureScheme.HANDSHAKE_SCOPE;
+
 import java.io.IOException;
 import java.nio.ByteBuffer;
 import java.text.MessageFormat;
@@ -189,7 +191,8 @@ final class SignatureAlgorithmsExtension {
                 chc.localSupportedSignAlgs =
                     SignatureScheme.getSupportedAlgorithms(
                             chc.sslConfig,
-                            chc.algorithmConstraints, chc.activeProtocols);
+                            chc.algorithmConstraints, chc.activeProtocols,
+                            HANDSHAKE_SCOPE);
             }
 
             int vectorLen = SignatureScheme.sizeInRecord() *
@@ -278,7 +281,9 @@ final class SignatureAlgorithmsExtension {
                     SignatureScheme.getSupportedAlgorithms(
                             shc.sslConfig,
                             shc.algorithmConstraints, shc.negotiatedProtocol,
-                            spec.signatureSchemes);
+                            spec.signatureSchemes,
+                            HANDSHAKE_SCOPE);
+
             if (sss == null || sss.isEmpty()) {
                 throw shc.conContext.fatal(Alert.HANDSHAKE_FAILURE,
                         "No supported signature algorithm");
@@ -416,7 +421,8 @@ final class SignatureAlgorithmsExtension {
                     SignatureScheme.getSupportedAlgorithms(
                             shc.sslConfig,
                             shc.algorithmConstraints,
-                            List.of(shc.negotiatedProtocol));
+                            List.of(shc.negotiatedProtocol),
+                            HANDSHAKE_SCOPE);
 
             int vectorLen = SignatureScheme.sizeInRecord() * sigAlgs.size();
             byte[] extData = new byte[vectorLen + 2];
@@ -506,7 +512,9 @@ final class SignatureAlgorithmsExtension {
                     SignatureScheme.getSupportedAlgorithms(
                             chc.sslConfig,
                             chc.algorithmConstraints, chc.negotiatedProtocol,
-                            spec.signatureSchemes);
+                            spec.signatureSchemes,
+                            HANDSHAKE_SCOPE);
+
             if (sss == null || sss.isEmpty()) {
                 throw chc.conContext.fatal(Alert.HANDSHAKE_FAILURE,
                         "No supported signature algorithm");
diff --git a/src/java.base/share/classes/sun/security/ssl/SignatureScheme.java b/src/java.base/share/classes/sun/security/ssl/SignatureScheme.java
index 4db3f31bae8..00b6b0593f5 100644
--- a/src/java.base/share/classes/sun/security/ssl/SignatureScheme.java
+++ b/src/java.base/share/classes/sun/security/ssl/SignatureScheme.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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 java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
-import java.util.EnumSet;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
@@ -218,10 +217,17 @@ enum SignatureScheme {
         }
     }
 
-    // performance optimization
-    private static final Set<CryptoPrimitive> SIGNATURE_PRIMITIVE_SET =
-        Collections.unmodifiableSet(EnumSet.of(CryptoPrimitive.SIGNATURE));
+    // Handshake signature scope.
+    static final Set<SSLScope> HANDSHAKE_SCOPE =
+            Set.of(SSLScope.HANDSHAKE_SIGNATURE);
 
+    // Certificate signature scope.
+    static final Set<SSLScope> CERTIFICATE_SCOPE =
+            Set.of(SSLScope.CERTIFICATE_SIGNATURE);
+
+    // Non-TLS specific SIGNATURE CryptoPrimitive.
+    private static final Set<CryptoPrimitive> SIGNATURE_PRIMITIVE_SET =
+            Set.of(CryptoPrimitive.SIGNATURE);
 
     SignatureScheme(int id, String name,
             String algorithm, String keyAlgorithm,
@@ -355,24 +361,25 @@ enum SignatureScheme {
         return 2;
     }
 
-    private boolean isPermitted(AlgorithmConstraints constraints) {
-        return constraints.permits(SIGNATURE_PRIMITIVE_SET,
-                        this.name, null) &&
-               constraints.permits(SIGNATURE_PRIMITIVE_SET,
-                        this.keyAlgorithm, null) &&
-               constraints.permits(SIGNATURE_PRIMITIVE_SET,
-                        this.algorithm, (signAlgParams != null ?
-                                signAlgParams.parameters : null)) &&
-                        (namedGroup == null ||
-                            namedGroup.isPermitted(constraints));
+    private boolean isPermitted(
+            SSLAlgorithmConstraints constraints, Set<SSLScope> scopes) {
+        return constraints.permits(this.name, scopes)
+                && constraints.permits(this.keyAlgorithm, scopes)
+                && constraints.permits(this.algorithm, scopes)
+                && constraints.permits(SIGNATURE_PRIMITIVE_SET, this.name, null)
+                && constraints.permits(SIGNATURE_PRIMITIVE_SET, this.keyAlgorithm, null)
+                && constraints.permits(SIGNATURE_PRIMITIVE_SET, this.algorithm,
+                (signAlgParams != null ? signAlgParams.parameters : null))
+                && (namedGroup == null || namedGroup.isPermitted(constraints));
     }
 
     // Get local supported algorithm collection complying to algorithm
-    // constraints.
+    // constraints and SSL scopes.
     static List<SignatureScheme> getSupportedAlgorithms(
             SSLConfiguration config,
-            AlgorithmConstraints constraints,
-            List<ProtocolVersion> activeProtocols) {
+            SSLAlgorithmConstraints constraints,
+            List<ProtocolVersion> activeProtocols,
+            Set<SSLScope> scopes) {
         List<SignatureScheme> supported = new LinkedList<>();
 
         List<SignatureScheme> schemesToCheck =
@@ -392,14 +399,14 @@ enum SignatureScheme {
 
             boolean isMatch = false;
             for (ProtocolVersion pv : activeProtocols) {
-                if (ss.supportedProtocols.contains(pv)) {
+                if (ss.isSupportedProtocol(pv, scopes)) {
                     isMatch = true;
                     break;
                 }
             }
 
             if (isMatch) {
-                if (ss.isPermitted(constraints)) {
+                if (ss.isPermitted(constraints, scopes)) {
                     supported.add(ss);
                 } else if (SSLLogger.isOn &&
                         SSLLogger.isOn("ssl,handshake,verbose")) {
@@ -418,8 +425,10 @@ enum SignatureScheme {
 
     static List<SignatureScheme> getSupportedAlgorithms(
             SSLConfiguration config,
-            AlgorithmConstraints constraints,
-            ProtocolVersion protocolVersion, int[] algorithmIds) {
+            SSLAlgorithmConstraints constraints,
+            ProtocolVersion protocolVersion,
+            int[] algorithmIds,
+            Set<SSLScope> scopes) {
         List<SignatureScheme> supported = new LinkedList<>();
         for (int ssid : algorithmIds) {
             SignatureScheme ss = SignatureScheme.valueOf(ssid);
@@ -429,11 +438,9 @@ enum SignatureScheme {
                             "Unsupported signature scheme: " +
                             SignatureScheme.nameOf(ssid));
                 }
-            } else if (ss.isAvailable &&
-                    ss.supportedProtocols.contains(protocolVersion) &&
-                    (config.signatureSchemes == null ||
-                        Utilities.contains(config.signatureSchemes, ss.name)) &&
-                    ss.isPermitted(constraints)) {
+            } else if ((config.signatureSchemes == null
+                        || Utilities.contains(config.signatureSchemes, ss.name))
+                    && ss.isAllowed(constraints, protocolVersion, scopes)) {
                 supported.add(ss);
             } else {
                 if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
@@ -447,16 +454,14 @@ enum SignatureScheme {
     }
 
     static SignatureScheme getPreferableAlgorithm(
-            AlgorithmConstraints constraints,
+            SSLAlgorithmConstraints constraints,
             List<SignatureScheme> schemes,
             String keyAlgorithm,
             ProtocolVersion version) {
 
         for (SignatureScheme ss : schemes) {
-            if (ss.isAvailable &&
-                    ss.handshakeSupportedProtocols.contains(version) &&
-                    keyAlgorithm.equalsIgnoreCase(ss.keyAlgorithm) &&
-                    ss.isPermitted(constraints)) {
+            if (keyAlgorithm.equalsIgnoreCase(ss.keyAlgorithm)
+                    && ss.isAllowed(constraints, version, HANDSHAKE_SCOPE)) {
                 return ss;
             }
         }
@@ -466,7 +471,7 @@ enum SignatureScheme {
 
     static Map.Entry<SignatureScheme, Signature> getSignerOfPreferableAlgorithm(
             SSLConfiguration sslConfig,
-            AlgorithmConstraints constraints,
+            SSLAlgorithmConstraints constraints,
             List<SignatureScheme> schemes,
             X509Possession x509Possession,
             ProtocolVersion version) {
@@ -482,10 +487,9 @@ enum SignatureScheme {
             keySize = Integer.MAX_VALUE;
         }
         for (SignatureScheme ss : schemes) {
-            if (ss.isAvailable && (keySize >= ss.minimalKeySize) &&
-                    ss.handshakeSupportedProtocols.contains(version) &&
+            if (keySize >= ss.minimalKeySize &&
                     keyAlgorithm.equalsIgnoreCase(ss.keyAlgorithm) &&
-                    ss.isPermitted(constraints)) {
+                    ss.isAllowed(constraints, version, HANDSHAKE_SCOPE)) {
                 if ((ss.namedGroup != null) && (ss.namedGroup.spec ==
                         NamedGroupSpec.NAMED_GROUP_ECDHE)) {
                     ECParameterSpec params =
@@ -545,6 +549,26 @@ enum SignatureScheme {
         return null;
     }
 
+    // Returns true if this signature scheme is supported for the given
+    // protocol version and SSL scopes.
+    private boolean isSupportedProtocol(
+            ProtocolVersion version, Set<SSLScope> scopes) {
+        if (scopes != null && scopes.equals(HANDSHAKE_SCOPE)) {
+            return this.handshakeSupportedProtocols.contains(version);
+        } else {
+            return this.supportedProtocols.contains(version);
+        }
+    }
+
+    // Returns true if this signature scheme is available, supported and
+    // permitted for the given constraints, protocol version and SSL scopes.
+    private boolean isAllowed(SSLAlgorithmConstraints constraints,
+            ProtocolVersion version, Set<SSLScope> scopes) {
+        return isAvailable
+                && isSupportedProtocol(version, scopes)
+                && isPermitted(constraints, scopes);
+    }
+
     static String[] getAlgorithmNames(Collection<SignatureScheme> schemes) {
         if (schemes != null) {
             ArrayList<String> names = new ArrayList<>(schemes.size());
diff --git a/src/java.base/share/classes/sun/security/util/DisabledAlgorithmConstraints.java b/src/java.base/share/classes/sun/security/util/DisabledAlgorithmConstraints.java
index be5239f9fca..54417092a7c 100644
--- a/src/java.base/share/classes/sun/security/util/DisabledAlgorithmConstraints.java
+++ b/src/java.base/share/classes/sun/security/util/DisabledAlgorithmConstraints.java
@@ -25,6 +25,7 @@
 
 package sun.security.util;
 
+import sun.security.ssl.SSLScope;
 import sun.security.validator.Validator;
 
 import java.lang.ref.SoftReference;
@@ -44,6 +45,7 @@ import java.time.ZoneId;
 import java.time.ZonedDateTime;
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
@@ -180,6 +182,12 @@ public class DisabledAlgorithmConstraints extends AbstractAlgorithmConstraints {
         return true;
     }
 
+    // Checks if algorithm is disabled for the given TLS scopes.
+    public boolean permits(String algorithm, Set<SSLScope> scopes) {
+        List<Constraint> list = algorithmConstraints.getConstraints(algorithm);
+        return list == null || list.stream().allMatch(c -> c.permits(scopes));
+    }
+
     /*
      * Checks if the key algorithm has been disabled or constraints have been
      * placed on the key.
@@ -435,7 +443,7 @@ public class DisabledAlgorithmConstraints extends AbstractAlgorithmConstraints {
                         denyAfterLimit = true;
                     } else if (entry.startsWith("usage")) {
                         String[] s = (entry.substring(5)).trim().split(" ");
-                        c = new UsageConstraint(algorithm, s);
+                        c = new UsageConstraint(algorithm, s, propertyName);
                         if (debug != null) {
                             debug.println("Constraints usage length is " + s.length);
                         }
@@ -606,6 +614,17 @@ public class DisabledAlgorithmConstraints extends AbstractAlgorithmConstraints {
             return true;
         }
 
+        /**
+         * Check if the algorithm constraint permits the given TLS scopes.
+         *
+         * @param scopes TLS scopes
+         * @return 'true' if TLS scopes are allowed,
+         *         'false' otherwise.
+         */
+        public boolean permits(Set<SSLScope> scopes) {
+            return true;
+        }
+
         /**
          * Check if an algorithm constraint is permitted with a given
          * ConstraintsParameters.
@@ -783,14 +802,49 @@ public class DisabledAlgorithmConstraints extends AbstractAlgorithmConstraints {
 
     /*
      * The usage constraint is for the "usage" keyword.  It checks against the
-     * variant value in ConstraintsParameters.
+     * variant value in ConstraintsParameters and against TLS scopes.
      */
     private static class UsageConstraint extends Constraint {
         String[] usages;
+        Set<SSLScope> scopes;
 
-        UsageConstraint(String algorithm, String[] usages) {
+        UsageConstraint(
+                String algorithm, String[] usages, String propertyName) {
             this.algorithm = algorithm;
-            this.usages = usages;
+
+            // Support TLS scopes only for jdk.tls.disabledAlgorithms property.
+            if (PROPERTY_TLS_DISABLED_ALGS.equals(propertyName)) {
+                for (String usage : usages) {
+                    SSLScope scope = SSLScope.nameOf(usage);
+
+                    if (scope != null) {
+                        if (this.scopes == null) {
+                            this.scopes = new HashSet<>(usages.length);
+                        }
+                        this.scopes.add(scope);
+                    } else {
+                        this.usages = usages;
+                    }
+                }
+
+                if (this.scopes != null && this.usages != null) {
+                    throw new IllegalArgumentException(
+                            "Can't mix TLS protocol specific constraints"
+                            + " with other usage constraints");
+                }
+
+            } else {
+                this.usages = usages;
+            }
+        }
+
+        @Override
+        public boolean permits(Set<SSLScope> scopes) {
+            if (this.scopes == null || scopes == null) {
+                return true;
+            }
+
+            return Collections.disjoint(this.scopes, scopes);
         }
 
         @Override
diff --git a/src/java.base/share/conf/security/java.security b/src/java.base/share/conf/security/java.security
index ab2556e9c54..82a57dfed6f 100644
--- a/src/java.base/share/conf/security/java.security
+++ b/src/java.base/share/conf/security/java.security
@@ -732,11 +732,30 @@ http.auth.digest.disabledAlgorithms = MD5, SHA-1
 # This is in addition to the jdk.certpath.disabledAlgorithms property above.
 #
 # See the specification of "jdk.certpath.disabledAlgorithms" for the
-# syntax of the disabled algorithm string. Additionally, TLS cipher suites
-# can be disabled with this property using one or more "*" wildcard characters.
-# For example, "TLS_RSA_*" disables all cipher suites that start with
-# "TLS_RSA_". Only cipher suites starting with "TLS_" are allowed to have
-# wildcard characters.
+# syntax of the disabled algorithm string.
+#
+# Additional TLS-specific syntax supported by this property:
+#
+#   - TLS cipher suites can be disabled with this property using one or more
+#     "*" wildcard characters. For example, "TLS_RSA_*" disables all cipher
+#     suites that start with "TLS_RSA_". Only cipher suites starting with
+#     "TLS_" are allowed to have wildcard characters.
+#
+#   - TLS protocol specific usage constraints are supported by this property:
+#
+#     UsageConstraint:
+#         usage UsageType { UsageType }
+#
+#     UsageType:
+#         HandshakeSignature | CertificateSignature
+#
+#     HandshakeSignature restricts the use of the algorithm in TLS handshake
+#     signatures. CertificateSignature restricts the use of the algorithm in
+#     certificate signatures. An algorithm with this constraint cannot include
+#     other usage types defined in the jdk.certpath.disabledAlgorithms
+#     property. The usage type follows the keyword and more than one usage type
+#     can be specified with a whitespace delimiter.
+#     Example: "rsa_pkcs1_sha1 usage HandshakeSignature"
 #
 # Note: The algorithm restrictions do not apply to trust anchors or
 # self-signed certificates.
diff --git a/test/jdk/javax/net/ssl/templates/SSLEngineTemplate.java b/test/jdk/javax/net/ssl/templates/SSLEngineTemplate.java
index 9c044f32ebf..2c1cfaa44ef 100644
--- a/test/jdk/javax/net/ssl/templates/SSLEngineTemplate.java
+++ b/test/jdk/javax/net/ssl/templates/SSLEngineTemplate.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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,8 @@
  * @build SSLContextTemplate
  * @run main/othervm SSLEngineTemplate
  */
+
+import java.util.Objects;
 import javax.net.ssl.*;
 import javax.net.ssl.SSLEngineResult.HandshakeStatus;
 import java.nio.ByteBuffer;
@@ -264,4 +266,75 @@ public class SSLEngineTemplate extends SSLContextTemplate {
         a.limit(a.capacity());
         b.limit(b.capacity());
     }
+
+    /**
+     * Given a TLS record containing one or more handshake messages, return
+     * the specific handshake message as a ByteBuffer (a slice of the record)
+     *
+     * @param tlsRecord A ByteBuffer containing a TLS record.  It is
+     *         assumed that the position of the ByteBuffer is on the
+     *         first byte of the TLS record header.
+     * @param hsMsgId The message identifier for the handshake message
+     *         being sought.
+     *         <a
+     *         href="https://datatracker.ietf.org/doc/html/rfc8446#appendix-B.3">
+     *         Message Identifiers
+     *         </a>
+     * @param isDtls Indicates whether DTLS protocol being used.
+     * @return a ByteBuffer containing the TLS handshake message.
+     *         The position of the returned ByteBuffer will be on the
+     *         first byte of the TLS handshake message data,
+     *         immediately following the handshake header.
+     *         If the message is not found, null will be returned.
+     * @throws SSLException if the incoming ByteBuffer does not contain
+     *         a well-formed TLS message.
+     */
+    protected static ByteBuffer extractHandshakeMsg(
+            ByteBuffer tlsRecord, int hsMsgId, boolean isDtls)
+            throws SSLException {
+        Objects.requireNonNull(tlsRecord);
+        tlsRecord.mark();
+
+        // Process the TLS record header
+        int type = Byte.toUnsignedInt(tlsRecord.get());
+        int ver_major = Byte.toUnsignedInt(tlsRecord.get());
+        int ver_minor = Byte.toUnsignedInt(tlsRecord.get());
+        // Skip DTLS-specific bytes
+        if (isDtls) {
+            tlsRecord.position(tlsRecord.position() + 8);
+        }
+        int recLen = Short.toUnsignedInt(tlsRecord.getShort());
+
+        if (recLen > tlsRecord.remaining()) {
+            throw new SSLException("Incomplete record in buffer: " +
+                                   "Record length = " + recLen
+                                   + ", Remaining = " +
+                                   tlsRecord.remaining());
+        }
+
+        while (tlsRecord.hasRemaining()) {
+            // Grab the handshake message header.
+            int msgHdr = tlsRecord.getInt();
+            int msgType = (msgHdr >> 24) & 0x000000FF;
+            int msgLen = msgHdr & 0x00FFFFFF;
+            // Skip DTLS-specific bytes
+            if (isDtls) {
+                tlsRecord.position(tlsRecord.position() + 8);
+            }
+
+            if (msgType == hsMsgId) {
+                // Slice the buffer such that it contains the entire
+                // handshake message (less the handshake header).
+                ByteBuffer buf = tlsRecord.slice(tlsRecord.position(), msgLen);
+                tlsRecord.reset();
+                return buf;
+            } else {
+                // Skip to the next handshake message, if there is one
+                tlsRecord.position(tlsRecord.position() + msgLen);
+            }
+        }
+
+        tlsRecord.reset();
+        return null;
+    }
 }
diff --git a/test/jdk/sun/security/ssl/SignatureScheme/AbstractCheckSignatureSchemes.java b/test/jdk/sun/security/ssl/SignatureScheme/AbstractCheckSignatureSchemes.java
new file mode 100644
index 00000000000..df70db86fec
--- /dev/null
+++ b/test/jdk/sun/security/ssl/SignatureScheme/AbstractCheckSignatureSchemes.java
@@ -0,0 +1,246 @@
+/*
+ * Copyright (c) 2021, 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please 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.ByteBuffer;
+import java.util.AbstractMap.SimpleImmutableEntry;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import javax.net.ssl.SSLEngine;
+import javax.net.ssl.SSLException;
+
+/**
+ * This is not a test. Actual tests are implemented by concrete subclasses.
+ * The abstract class AbstractCheckSignatureSchemes provides a base framework
+ * for checking TLS signature schemes.
+ */
+
+public abstract class AbstractCheckSignatureSchemes extends SSLEngineTemplate {
+
+    // Helper map to correlate integral SignatureScheme identifiers to
+    // their IANA string name counterparts.
+    protected static final Map<Integer, String> sigSchemeMap = Map.ofEntries(
+            new SimpleImmutableEntry(0x0401, "rsa_pkcs1_sha256"),
+            new SimpleImmutableEntry(0x0501, "rsa_pkcs1_sha384"),
+            new SimpleImmutableEntry(0x0601, "rsa_pkcs1_sha512"),
+            new SimpleImmutableEntry(0x0403, "ecdsa_secp256r1_sha256"),
+            new SimpleImmutableEntry(0x0503, "ecdsa_secp384r1_sha384"),
+            new SimpleImmutableEntry(0x0603, "ecdsa_secp521r1_sha512"),
+            new SimpleImmutableEntry(0x0804, "rsa_pss_rsae_sha256"),
+            new SimpleImmutableEntry(0x0805, "rsa_pss_rsae_sha384"),
+            new SimpleImmutableEntry(0x0806, "rsa_pss_rsae_sha512"),
+            new SimpleImmutableEntry(0x0807, "ed25519"),
+            new SimpleImmutableEntry(0x0808, "ed448"),
+            new SimpleImmutableEntry(0x0809, "rsa_pss_pss_sha256"),
+            new SimpleImmutableEntry(0x080a, "rsa_pss_pss_sha384"),
+            new SimpleImmutableEntry(0x080b, "rsa_pss_pss_sha512"),
+            new SimpleImmutableEntry(0x0101, "rsa_md5"),
+            new SimpleImmutableEntry(0x0201, "rsa_pkcs1_sha1"),
+            new SimpleImmutableEntry(0x0202, "dsa_sha1"),
+            new SimpleImmutableEntry(0x0203, "ecdsa_sha1"),
+            new SimpleImmutableEntry(0x0301, "rsa_sha224"),
+            new SimpleImmutableEntry(0x0302, "dsa_sha224"),
+            new SimpleImmutableEntry(0x0303, "ecdsa_sha224"),
+            new SimpleImmutableEntry(0x0402, "rsa_pkcs1_sha256"));
+
+    // Other useful TLS definitions for these tests
+    protected static final int TLS_HS_CLI_HELLO = 1;
+    protected static final int TLS_HS_CERT_REQ = 13;
+    protected static final int SIG_ALGS_EXT = 13;
+    protected static final int SIG_ALGS_CERT_EXT = 50;
+
+    protected AbstractCheckSignatureSchemes() throws Exception {
+        super();
+    }
+
+    // Returns the protocol for test to use.
+    abstract String getProtocol();
+
+    protected boolean isDtls() {
+        return getProtocol().startsWith("DTLS");
+    }
+
+    @Override
+    protected SSLEngine configureClientEngine(SSLEngine clientEngine) {
+        clientEngine.setUseClientMode(true);
+        clientEngine.setEnabledProtocols(new String[]{getProtocol()});
+        return clientEngine;
+    }
+
+    @Override
+    protected SSLEngine configureServerEngine(SSLEngine serverEngine) {
+        serverEngine.setUseClientMode(false);
+        serverEngine.setWantClientAuth(true);
+        serverEngine.setEnabledProtocols(new String[]{getProtocol()});
+        return serverEngine;
+    }
+
+    @Override
+    protected ContextParameters getServerContextParameters() {
+        return new ContextParameters(getProtocol(), "PKIX", "NewSunX509");
+    }
+
+    @Override
+    protected ContextParameters getClientContextParameters() {
+        return new ContextParameters(getProtocol(), "PKIX", "NewSunX509");
+    }
+
+    protected ByteBuffer extractHandshakeMsg(ByteBuffer tlsRecord, int hsMsgId)
+            throws SSLException {
+        return extractHandshakeMsg(tlsRecord, hsMsgId, isDtls());
+    }
+
+    /**
+     * Parses the ClientHello message and extracts from it a list of
+     * SignatureScheme values in string form.  It is assumed that the provided
+     * ByteBuffer has its position set at the first byte of the ClientHello
+     * message body (AFTER the handshake header) and contains the entire
+     * hello message.  Upon successful completion of this method the ByteBuffer
+     * will have its position reset to the initial offset in the buffer.
+     * If an exception is thrown the position at the time of the exception
+     * will be preserved.
+     *
+     * @param data    The ByteBuffer containing the ClientHello bytes.
+     * @param extCode Code of the TLS extension from which to extract
+     *                signature schemes.
+     * @return        A List of the signature schemes in string form.
+     */
+    protected List<String> getSigSchemesCliHello(
+            ByteBuffer data, int extCode) {
+        Objects.requireNonNull(data);
+        data.mark();
+
+        // Skip over the protocol version and client random
+        data.position(data.position() + 34);
+
+        // Jump past the session ID (if there is one)
+        int sessLen = Byte.toUnsignedInt(data.get());
+        if (sessLen != 0) {
+            data.position(data.position() + sessLen);
+        }
+
+        // Skip DTLS-specific opaque cookie if any
+        if (isDtls()) {
+            int cookieLen = Byte.toUnsignedInt(data.get());
+            if (cookieLen != 0) {
+                data.position(data.position() + cookieLen);
+            }
+        }
+
+        // Jump past the cipher suites
+        int csLen = Short.toUnsignedInt(data.getShort());
+        if (csLen != 0) {
+            data.position(data.position() + csLen);
+        }
+
+        // ...and the compression
+        int compLen = Byte.toUnsignedInt(data.get());
+        if (compLen != 0) {
+            data.position(data.position() + compLen);
+        }
+
+        // Now for the fun part.  Go through the extensions and look
+        // for the two status request exts.
+        List<String> extSigAlgs = getSigSchemesFromExt(data, extCode);
+
+        // We should be at the end of the ClientHello
+        data.reset();
+        return extSigAlgs;
+    }
+
+    /**
+     * Parses the CertificateRequest message and extracts from it a list of
+     * SignatureScheme values in string form.  It is assumed that the provided
+     * ByteBuffer has its position set at the first byte of the
+     * CertificateRequest message body (AFTER the handshake header) and
+     * contains the entire CR message.  Upon successful completion of this
+     * method the ByteBuffer will have its position reset to the initial
+     * offset in the buffer.
+     * If an exception is thrown the position at the time of the exception
+     * will be preserved.
+     *
+     * @param data The ByteBuffer containing the CertificateRequest bytes
+     *
+     * @return A List of the signature schemes in string form.  If no
+     * signature_algorithms extension is present in the CertificateRequest
+     * then an empty list will be returned.
+     */
+    protected List<String> getSigSchemesCertReq(ByteBuffer data) {
+        Objects.requireNonNull(data);
+        data.mark();
+
+        // Jump past the certificate types
+        int certTypeLen = Byte.toUnsignedInt(data.get());
+        if (certTypeLen != 0) {
+            data.position(data.position() + certTypeLen);
+        }
+
+        // Collect the SignatureAndHashAlgorithms
+        List<String> extSigAlgs = new ArrayList();
+        int sigSchemeLen = Short.toUnsignedInt(data.getShort());
+        for (int ssOff = 0; ssOff < sigSchemeLen; ssOff += 2) {
+            String schemeName = sigSchemeMap.get(
+                    Short.toUnsignedInt(data.getShort()));
+            if (schemeName != null) {
+                extSigAlgs.add(schemeName);
+            }
+        }
+
+        data.reset();
+        return extSigAlgs;
+    }
+
+    /**
+     * Gets signatures schemes from the given TLS extension.
+     * The buffer should be positioned at the start of the extension.
+     */
+    protected List<String> getSigSchemesFromExt(
+            ByteBuffer data, int extCode) {
+
+        List<String> extSigAlgs = new ArrayList<>();
+        data.getShort(); // read length
+
+        while (data.hasRemaining()) {
+            int extType = Short.toUnsignedInt(data.getShort());
+            int extLen = Short.toUnsignedInt(data.getShort());
+            if (extType == extCode) {
+                // Start processing signature algorithms
+                int sigSchemeLen = Short.toUnsignedInt(data.getShort());
+                for (int ssOff = 0; ssOff < sigSchemeLen; ssOff += 2) {
+                    String schemeName = sigSchemeMap.get(
+                            Short.toUnsignedInt(data.getShort()));
+                    if (schemeName != null) {
+                        extSigAlgs.add(schemeName);
+                    }
+                }
+            } else {
+                // Not the extension we're looking for.  Skip past the
+                // extension data
+                data.position(data.position() + extLen);
+            }
+        }
+
+        return extSigAlgs;
+    }
+}
diff --git a/test/jdk/sun/security/ssl/SignatureScheme/DisableSignatureSchemePerScopeDTLS12.java b/test/jdk/sun/security/ssl/SignatureScheme/DisableSignatureSchemePerScopeDTLS12.java
new file mode 100644
index 00000000000..55f1002e894
--- /dev/null
+++ b/test/jdk/sun/security/ssl/SignatureScheme/DisableSignatureSchemePerScopeDTLS12.java
@@ -0,0 +1,58 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact 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 8349583
+ * @summary Add mechanism to disable signature schemes based on their TLS scope.
+ *          This test only covers DTLS 1.2.
+ * @library /javax/net/ssl/templates
+ *          /test/lib
+ * @run main/othervm DisableSignatureSchemePerScopeDTLS12
+ */
+
+import java.security.Security;
+
+public class DisableSignatureSchemePerScopeDTLS12
+        extends DisableSignatureSchemePerScopeTLS12 {
+
+    protected DisableSignatureSchemePerScopeDTLS12() throws Exception {
+        super();
+    }
+
+    public static void main(String[] args) throws Exception {
+        Security.setProperty(
+                "jdk.tls.disabledAlgorithms", DISABLED_CONSTRAINTS);
+        new DisableSignatureSchemePerScopeDTLS12().run();
+    }
+
+    @Override
+    protected String getProtocol() {
+        return "DTLSv1.2";
+    }
+
+    // No CertificateRequest in DTLS server flight.
+    @Override
+    protected void checkCertificateRequest() {
+    }
+}
diff --git a/test/jdk/sun/security/ssl/SignatureScheme/DisableSignatureSchemePerScopeTLS12.java b/test/jdk/sun/security/ssl/SignatureScheme/DisableSignatureSchemePerScopeTLS12.java
new file mode 100644
index 00000000000..e2ee9f0889a
--- /dev/null
+++ b/test/jdk/sun/security/ssl/SignatureScheme/DisableSignatureSchemePerScopeTLS12.java
@@ -0,0 +1,149 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact 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 8349583
+ * @summary Add mechanism to disable signature schemes based on their TLS scope.
+ *          This test only covers TLS 1.2.
+ * @library /javax/net/ssl/templates
+ *          /test/lib
+ * @run main/othervm DisableSignatureSchemePerScopeTLS12
+ */
+
+import static jdk.test.lib.Asserts.assertFalse;
+import static jdk.test.lib.Asserts.assertTrue;
+
+import java.security.Security;
+import java.util.List;
+
+public class DisableSignatureSchemePerScopeTLS12 extends
+        AbstractCheckSignatureSchemes {
+
+    // Disabled for Handshake scope.
+    protected static final String HANDSHAKE_DISABLED_SIG = "rsa_pss_rsae_sha384";
+
+    // Disabled for Certificate scope.
+    protected static final String CERTIFICATE_DISABLED_SIG = "ecdsa_secp384r1_sha384";
+
+    // jdk.tls.disabledAlgorithms value
+    // We differ from "HandshakeSignature" and "CertificateSignature" specified
+    // in java.security to check case-insensitive matching.
+    protected static final String DISABLED_CONSTRAINTS =
+            HANDSHAKE_DISABLED_SIG + " usage HandShakesignature, "
+            + CERTIFICATE_DISABLED_SIG + " usage certificateSignature";
+
+    protected DisableSignatureSchemePerScopeTLS12() throws Exception {
+        super();
+    }
+
+    public static void main(String[] args) throws Exception {
+        Security.setProperty(
+                "jdk.tls.disabledAlgorithms", DISABLED_CONSTRAINTS);
+        new DisableSignatureSchemePerScopeTLS12().run();
+    }
+
+    protected String getProtocol() {
+        return "TLSv1.2";
+    }
+
+    // Run things in TLS handshake order.
+    protected void run() throws Exception {
+
+        // Produce client_hello
+        clientEngine.wrap(clientOut, cTOs);
+        cTOs.flip();
+
+        checkClientHello();
+
+        // Consume client_hello.
+        serverEngine.unwrap(cTOs, serverIn);
+        runDelegatedTasks(serverEngine);
+
+        // Produce server_hello.
+        serverEngine.wrap(serverOut, sTOc);
+        sTOc.flip();
+
+        checkCertificateRequest();
+    }
+
+    protected void checkClientHello() throws Exception {
+        // --- Check signature_algorithms extension ---
+
+        // Get signature_algorithms extension signature schemes.
+        List<String> sigAlgsSS = getSigSchemesCliHello(
+                extractHandshakeMsg(cTOs, TLS_HS_CLI_HELLO),
+                SIG_ALGS_EXT);
+
+        // signature_algorithms extension MUST NOT contain disabled
+        // handshake signature scheme.
+        assertFalse(sigAlgsSS.contains(HANDSHAKE_DISABLED_SIG),
+                "Signature Scheme " + HANDSHAKE_DISABLED_SIG
+                + " present in ClientHello's signature_algorithms extension");
+
+        // signature_algorithms extension MUST contain disabled
+        // certificate signature scheme.
+        assertTrue(sigAlgsSS.contains(CERTIFICATE_DISABLED_SIG),
+                "Signature Scheme " + CERTIFICATE_DISABLED_SIG
+                + " isn't present in ClientHello's"
+                + " signature_algorithms extension");
+
+        // --- Check signature_algorithms_cert extension ---
+
+        // Get signature_algorithms_cert extension signature schemes.
+        List<String> sigAlgsCertSS = getSigSchemesCliHello(
+                extractHandshakeMsg(cTOs, TLS_HS_CLI_HELLO),
+                SIG_ALGS_CERT_EXT);
+
+        // signature_algorithms_cert extension MUST contain disabled
+        // handshake signature scheme.
+        assertTrue(sigAlgsCertSS.contains(HANDSHAKE_DISABLED_SIG),
+                "Signature Scheme " + HANDSHAKE_DISABLED_SIG
+                + " isn't present in ClientHello's"
+                + " signature_algorithms extension");
+
+        // signature_algorithms_cert extension MUST NOT contain disabled
+        // certificate signature scheme.
+        assertFalse(sigAlgsCertSS.contains(CERTIFICATE_DISABLED_SIG),
+                "Signature Scheme " + CERTIFICATE_DISABLED_SIG
+                + " present in ClientHello's signature_algorithms extension");
+    }
+
+    protected void checkCertificateRequest() throws Exception {
+        // Get CertificateRequest message signature schemes.
+        List<String> sigAlgsCertSS = getSigSchemesCertReq(
+                extractHandshakeMsg(sTOc, TLS_HS_CERT_REQ));
+
+        // TLSv1.2 CertificateRequest message MUST NOT contain both:
+        // disabled handshake signature scheme and disabled
+        // certificate signature scheme
+
+        assertFalse(sigAlgsCertSS.contains(HANDSHAKE_DISABLED_SIG),
+                "Signature Scheme " + HANDSHAKE_DISABLED_SIG
+                + " present in CertificateRequest");
+
+        assertFalse(sigAlgsCertSS.contains(CERTIFICATE_DISABLED_SIG),
+                "Signature Scheme " + CERTIFICATE_DISABLED_SIG
+                + " present in CertificateRequest");
+    }
+}
diff --git a/test/jdk/sun/security/ssl/SignatureScheme/DisableSignatureSchemePerScopeTLS13.java b/test/jdk/sun/security/ssl/SignatureScheme/DisableSignatureSchemePerScopeTLS13.java
new file mode 100644
index 00000000000..5d5d445cb45
--- /dev/null
+++ b/test/jdk/sun/security/ssl/SignatureScheme/DisableSignatureSchemePerScopeTLS13.java
@@ -0,0 +1,103 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact 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 8349583
+ * @summary Add mechanism to disable signature schemes based on their TLS scope.
+ *          This test only covers TLS 1.3.
+ * @library /javax/net/ssl/templates
+ *          /test/lib
+ * @run main/othervm DisableSignatureSchemePerScopeTLS13
+ */
+
+
+import static jdk.test.lib.Asserts.assertFalse;
+import static jdk.test.lib.Asserts.assertTrue;
+
+import java.security.Security;
+import java.util.List;
+
+public class DisableSignatureSchemePerScopeTLS13
+        extends DisableSignatureSchemePerScopeTLS12 {
+
+    // Signature schemes not supported in TLSv1.3 only for the handshake.
+    // This is regardless of jdk.tls.disabledAlgorithms configuration.
+    List<String> NOT_SUPPORTED_FOR_HANDSHAKE = List.of(
+            "rsa_pkcs1_sha1",
+            "rsa_pkcs1_sha256",
+            "rsa_pkcs1_sha384",
+            "rsa_pkcs1_sha512"
+    );
+
+    protected DisableSignatureSchemePerScopeTLS13() throws Exception {
+        super();
+    }
+
+    public static void main(String[] args) throws Exception {
+        Security.setProperty(
+                "jdk.tls.disabledAlgorithms", DISABLED_CONSTRAINTS);
+        new DisableSignatureSchemePerScopeTLS13().run();
+    }
+
+    @Override
+    protected String getProtocol() {
+        return "TLSv1.3";
+    }
+
+    @Override
+    protected void checkClientHello() throws Exception {
+        super.checkClientHello();
+
+        // Get signature_algorithms extension signature schemes.
+        List<String> sigAlgsSS = getSigSchemesCliHello(
+                extractHandshakeMsg(cTOs, TLS_HS_CLI_HELLO),
+                SIG_ALGS_EXT);
+
+        // Should not be present in signature_algorithms extension.
+        NOT_SUPPORTED_FOR_HANDSHAKE.forEach(ss ->
+                assertFalse(sigAlgsSS.contains(ss),
+                        "Signature Scheme " + ss
+                        + " present in ClientHello's signature_algorithms extension"));
+
+        // Get signature_algorithms_cert extension signature schemes.
+        List<String> sigAlgsCertSS = getSigSchemesCliHello(
+                extractHandshakeMsg(cTOs, TLS_HS_CLI_HELLO),
+                SIG_ALGS_CERT_EXT);
+
+        // Should be present in signature_algorithms_cert extension.
+        NOT_SUPPORTED_FOR_HANDSHAKE.forEach(ss ->
+                assertTrue(sigAlgsCertSS.contains(ss),
+                        "Signature Scheme " + ss
+                        + " isn't present in ClientHello's"
+                        + " signature_algorithms extension"));
+    }
+
+    // TLSv1.3 sends CertificateRequest signature schemes in
+    // signature_algorithms and signature_algorithms_cert extensions. Same as
+    // ClientHello, but they are encrypted. So we skip CertificateRequest
+    // signature schemes verification for TLSv1.3.
+    @Override
+    protected void checkCertificateRequest() {
+    }
+}
diff --git a/test/jdk/sun/security/ssl/SignatureScheme/MixingTLSUsageConstraintsWithNonTLS.java b/test/jdk/sun/security/ssl/SignatureScheme/MixingTLSUsageConstraintsWithNonTLS.java
new file mode 100644
index 00000000000..3dc811ca66c
--- /dev/null
+++ b/test/jdk/sun/security/ssl/SignatureScheme/MixingTLSUsageConstraintsWithNonTLS.java
@@ -0,0 +1,56 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact 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 8349583
+ * @summary Add mechanism to disable signature schemes based on their TLS scope
+ * @library /javax/net/ssl/templates
+ *          /test/lib
+ * @run main/othervm MixingTLSUsageConstraintsWithNonTLS
+ */
+
+import static jdk.test.lib.Asserts.assertEquals;
+import static jdk.test.lib.Asserts.assertTrue;
+import static jdk.test.lib.Utils.runAndCheckException;
+
+import java.security.Security;
+
+public class MixingTLSUsageConstraintsWithNonTLS extends SSLSocketTemplate {
+
+    public static void main(String[] args) throws Exception {
+        Security.setProperty("jdk.tls.disabledAlgorithms",
+                "rsa_pkcs1_sha1 usage handshakeSignature certificateSignature TLSServer");
+
+        runAndCheckException(
+                () -> new MixingTLSUsageConstraintsWithNonTLS().run(),
+                e -> {
+                    assertTrue(e instanceof ExceptionInInitializerError);
+                    assertTrue(
+                            e.getCause() instanceof IllegalArgumentException);
+                    assertEquals(e.getCause().getMessage(),
+                            "Can't mix TLS protocol specific constraints"
+                                    + " with other usage constraints");
+                });
+    }
+}
diff --git a/test/jdk/sun/security/ssl/SignatureScheme/SigSchemePropOrdering.java b/test/jdk/sun/security/ssl/SignatureScheme/SigSchemePropOrdering.java
index 6c6583bf81f..b7719e6af19 100644
--- a/test/jdk/sun/security/ssl/SignatureScheme/SigSchemePropOrdering.java
+++ b/test/jdk/sun/security/ssl/SignatureScheme/SigSchemePropOrdering.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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,48 +34,14 @@
  * @run main/othervm SigSchemePropOrdering
  */
 
-import java.nio.ByteBuffer;
-import java.util.*;
-import java.util.AbstractMap.SimpleImmutableEntry;
-import javax.net.ssl.SSLEngine;
-import javax.net.ssl.SSLException;
+import java.util.Arrays;
+import java.util.List;
 
-public class SigSchemePropOrdering extends SSLEngineTemplate {
-
-    // Helper map to correlate integral SignatureScheme identifiers to
-    // their IANA string name counterparts.
-    static final Map<Integer, String> sigSchemeMap = Map.ofEntries(
-            new SimpleImmutableEntry(0x0401, "rsa_pkcs1_sha256"),
-            new SimpleImmutableEntry(0x0501, "rsa_pkcs1_sha384"),
-            new SimpleImmutableEntry(0x0601, "rsa_pkcs1_sha512"),
-            new SimpleImmutableEntry(0x0403, "ecdsa_secp256r1_sha256"),
-            new SimpleImmutableEntry(0x0503, "ecdsa_secp384r1_sha384"),
-            new SimpleImmutableEntry(0x0603, "ecdsa_secp521r1_sha512"),
-            new SimpleImmutableEntry(0x0804, "rsa_pss_rsae_sha256"),
-            new SimpleImmutableEntry(0x0805, "rsa_pss_rsae_sha384"),
-            new SimpleImmutableEntry(0x0806, "rsa_pss_rsae_sha512"),
-            new SimpleImmutableEntry(0x0807, "ed25519"),
-            new SimpleImmutableEntry(0x0808, "ed448"),
-            new SimpleImmutableEntry(0x0809, "rsa_pss_pss_sha256"),
-            new SimpleImmutableEntry(0x080a, "rsa_pss_pss_sha384"),
-            new SimpleImmutableEntry(0x080b, "rsa_pss_pss_sha512"),
-            new SimpleImmutableEntry(0x0101, "rsa_md5"),
-            new SimpleImmutableEntry(0x0201, "rsa_pkcs1_sha1"),
-            new SimpleImmutableEntry(0x0202, "dsa_sha1"),
-            new SimpleImmutableEntry(0x0203, "ecdsa_sha1"),
-            new SimpleImmutableEntry(0x0301, "rsa_sha224"),
-            new SimpleImmutableEntry(0x0302, "dsa_sha224"),
-            new SimpleImmutableEntry(0x0303, "ecdsa_sha224"),
-            new SimpleImmutableEntry(0x0402, "rsa_pkcs1_sha256"));
-
-    // Other useful TLS definitions for these tests
-    private static final int TLS_HS_CLI_HELLO = 1;
-    private static final int TLS_HS_CERT_REQ = 13;
-    private static final int HELLO_EXT_SIG_ALGS = 13;
+public class SigSchemePropOrdering extends AbstractCheckSignatureSchemes {
 
     private static final String SIG_SCHEME_STR =
             "rsa_pkcs1_sha256,rsa_pss_rsae_sha256,rsa_pss_pss_sha256," +
-            "ed448,ed25519,ecdsa_secp256r1_sha256";
+                    "ed448,ed25519,ecdsa_secp256r1_sha256";
 
     SigSchemePropOrdering() throws Exception {
         super();
@@ -88,18 +54,8 @@ public class SigSchemePropOrdering extends SSLEngineTemplate {
         new SigSchemePropOrdering().run();
     }
 
-    @Override
-    protected SSLEngine configureClientEngine(SSLEngine clientEngine) {
-        clientEngine.setUseClientMode(true);
-        clientEngine.setEnabledProtocols(new String[] { "TLSv1.2" });
-        return clientEngine;
-    }
-
-    @Override
-    protected SSLEngine configureServerEngine(SSLEngine serverEngine) {
-        serverEngine.setUseClientMode(false);
-        serverEngine.setWantClientAuth(true);
-        return serverEngine;
+    protected String getProtocol() {
+        return "TLSv1.2";
     }
 
     private void run() throws Exception {
@@ -112,7 +68,8 @@ public class SigSchemePropOrdering extends SSLEngineTemplate {
         cTOs.flip();
 
         List<String> actualSS = getSigSchemesCliHello(
-                extractHandshakeMsg(cTOs, TLS_HS_CLI_HELLO));
+                extractHandshakeMsg(cTOs, TLS_HS_CLI_HELLO),
+                SIG_ALGS_EXT);
 
         // Make sure the ordering is correct
         if (!expectedSS.equals(actualSS)) {
@@ -155,177 +112,4 @@ public class SigSchemePropOrdering extends SSLEngineTemplate {
                     "FAIL: Expected and Actual values differ.");
         }
     }
-
-    /**
-     * Given a TLS record containing one or more handshake messages, return
-     * the specific handshake message as a ByteBuffer (a slice of the record)
-     *
-     * @param tlsRecord a ByteBuffer containing a TLS record.  It is assumed
-     *      that the position of the ByteBuffer is on the first byte of the TLS
-     *      record header.
-     * @param hsMsgId the message identifier for the handshake message being
-     *      sought.
-     *
-     * @return a ByteBuffer containing the TLS handshake message.  The position
-     *      of the returned ByteBuffer will be on the first byte of the TLS
-     *      handshake message data, immediately following the handshake header.
-     *      If the message is not found, null will be returned.
-     *
-     * @throws SSLException if the incoming ByteBuffer does not contain a
-     *      well-formed TLS message.
-     */
-    private static ByteBuffer extractHandshakeMsg(ByteBuffer tlsRecord,
-            int hsMsgId) throws SSLException {
-        Objects.requireNonNull(tlsRecord);
-        tlsRecord.mark();
-
-        // Process the TLS record header
-        int type = Byte.toUnsignedInt(tlsRecord.get());
-        int ver_major = Byte.toUnsignedInt(tlsRecord.get());
-        int ver_minor = Byte.toUnsignedInt(tlsRecord.get());
-        int recLen = Short.toUnsignedInt(tlsRecord.getShort());
-
-        // Simple sanity checks
-        if (type != 22) {
-            throw new SSLException("Not a handshake: Type = " + type);
-        } else if (recLen > tlsRecord.remaining()) {
-            throw new SSLException("Incomplete record in buffer: " +
-                    "Record length = " + recLen + ", Remaining = " +
-                    tlsRecord.remaining());
-        }
-
-        while (tlsRecord.hasRemaining()) {
-            // Grab the handshake message header.
-            int msgHdr = tlsRecord.getInt();
-            int msgType = (msgHdr >> 24) & 0x000000FF;
-            int msgLen = msgHdr & 0x00FFFFFF;
-
-            if (msgType == hsMsgId) {
-                // Slice the buffer such that it contains the entire
-                // handshake message (less the handshake header).
-                ByteBuffer buf = tlsRecord.slice(tlsRecord.position(), msgLen);
-                tlsRecord.reset();
-                return buf;
-            } else {
-                // Skip to the next handshake message, if there is one
-                tlsRecord.position(tlsRecord.position() + msgLen);
-            }
-        }
-
-        tlsRecord.reset();
-        return null;
-    }
-
-
-    /**
-     * Parses the ClientHello message and extracts from it a list of
-     * SignatureScheme values in string form.  It is assumed that the provided
-     * ByteBuffer has its position set at the first byte of the ClientHello
-     * message body (AFTER the handshake header) and contains the entire
-     * hello message.  Upon successful completion of this method the ByteBuffer
-     * will have its position reset to the initial offset in the buffer.
-     * If an exception is thrown the position at the time of the exception
-     * will be preserved.
-     *
-     * @param data the ByteBuffer containing the ClientHello bytes
-     *
-     * @return A List of the signature schemes in string form.  If no
-     * signature_algorithms extension is present in the client hello then
-     * an empty list will be returned.
-     */
-    private static List<String> getSigSchemesCliHello(ByteBuffer data) {
-        Objects.requireNonNull(data);
-        data.mark();
-
-        // Skip over the protocol version and client random
-        data.position(data.position() + 34);
-
-        // Jump past the session ID (if there is one)
-        int sessLen = Byte.toUnsignedInt(data.get());
-        if (sessLen != 0) {
-            data.position(data.position() + sessLen);
-        }
-
-        // Jump past the cipher suites
-        int csLen = Short.toUnsignedInt(data.getShort());
-        if (csLen != 0) {
-            data.position(data.position() + csLen);
-        }
-
-        // ...and the compression
-        int compLen = Byte.toUnsignedInt(data.get());
-        if (compLen != 0) {
-            data.position(data.position() + compLen);
-        }
-
-        // Now for the fun part.  Go through the extensions and look
-        // for the two status request exts.
-        List<String> extSigAlgs = new ArrayList();
-        int extsLen = Short.toUnsignedInt(data.getShort());
-        while (data.hasRemaining()) {
-            int extType = Short.toUnsignedInt(data.getShort());
-            int extLen = Short.toUnsignedInt(data.getShort());
-            if (extType == HELLO_EXT_SIG_ALGS) {
-                // Start processing signature algorithms
-                int sigSchemeLen = Short.toUnsignedInt(data.getShort());
-                for (int ssOff = 0; ssOff < sigSchemeLen; ssOff += 2) {
-                    String schemeName = sigSchemeMap.get(
-                            Short.toUnsignedInt(data.getShort()));
-                    if (schemeName != null) {
-                        extSigAlgs.add(schemeName);
-                    }
-                }
-            } else {
-                // Not the extension we're looking for.  Skip past the
-                // extension data
-                data.position(data.position() + extLen);
-            }
-        }
-
-        // We should be at the end of the ClientHello
-        data.reset();
-        return extSigAlgs;
-    }
-
-    /**
-     * Parses the CertificateRequest message and extracts from it a list of
-     * SignatureScheme values in string form.  It is assumed that the provided
-     * ByteBuffer has its position set at the first byte of the
-     * CertificateRequest message body (AFTER the handshake header) and
-     * contains the entire CR message.  Upon successful completion of this
-     * method the ByteBuffer will have its position reset to the initial
-     * offset in the buffer.
-     * If an exception is thrown the position at the time of the exception
-     * will be preserved.
-     *
-     * @param data the ByteBuffer containing the CertificateRequest bytes
-     *
-     * @return A List of the signature schemes in string form.  If no
-     * signature_algorithms extension is present in the CertificateRequest
-     * then an empty list will be returned.
-     */
-    private static List<String> getSigSchemesCertReq(ByteBuffer data) {
-        Objects.requireNonNull(data);
-        data.mark();
-
-        // Jump past the certificate types
-        int certTypeLen = Byte.toUnsignedInt(data.get());
-        if (certTypeLen != 0) {
-            data.position(data.position() + certTypeLen);
-        }
-
-        // Collect the SignatureAndHashAlgorithms
-        List<String> extSigAlgs = new ArrayList();
-        int sigSchemeLen = Short.toUnsignedInt(data.getShort());
-        for (int ssOff = 0; ssOff < sigSchemeLen; ssOff += 2) {
-            String schemeName = sigSchemeMap.get(
-                    Short.toUnsignedInt(data.getShort()));
-            if (schemeName != null) {
-                extSigAlgs.add(schemeName);
-            }
-        }
-
-        data.reset();
-        return extSigAlgs;
-    }
 }

From 4247744266c7885dde52977de7646f766a9ad043 Mon Sep 17 00:00:00 2001
From: Naoto Sato <naoto@openjdk.org>
Date: Mon, 31 Mar 2025 16:46:57 +0000
Subject: [PATCH 566/587] 8351435: Change the default Console implementation
 back to the built-in one in `java.base` module

Co-authored-by: Jan Lahoda <jlahoda@openjdk.org>
Reviewed-by: alanb
---
 .../jdk/internal/io/JdkConsoleProvider.java   |  4 +-
 .../java/io/Console/ConsolePromptTest.java    | 90 ++++++++++++-------
 .../java/io/Console/DefaultCharsetTest.java   | 14 +--
 test/jdk/java/io/Console/LocaleTest.java      |  5 +-
 .../java/io/Console/ModuleSelectionTest.java  |  6 +-
 test/jdk/java/io/Console/consolePrompt.exp    | 30 +++++++
 test/jdk/java/io/IO/IO.java                   | 11 +--
 .../jline/JLineConsoleProviderTest.java       |  6 +-
 .../jdk/internal/jline/RedirectedStdOut.java  |  8 +-
 9 files changed, 114 insertions(+), 60 deletions(-)
 create mode 100644 test/jdk/java/io/Console/consolePrompt.exp

diff --git a/src/java.base/share/classes/jdk/internal/io/JdkConsoleProvider.java b/src/java.base/share/classes/jdk/internal/io/JdkConsoleProvider.java
index 26e59c84e23..4ac196d67ff 100644
--- a/src/java.base/share/classes/jdk/internal/io/JdkConsoleProvider.java
+++ b/src/java.base/share/classes/jdk/internal/io/JdkConsoleProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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 @@ public interface JdkConsoleProvider {
     /**
      * The module name of the JdkConsole default provider.
      */
-    String DEFAULT_PROVIDER_MODULE_NAME = "jdk.internal.le";
+    String DEFAULT_PROVIDER_MODULE_NAME = "java.base";
 
     /**
      * {@return the Console instance, or {@code null} if not available}
diff --git a/test/jdk/java/io/Console/ConsolePromptTest.java b/test/jdk/java/io/Console/ConsolePromptTest.java
index 3cab25b5a1c..1e4f73b65d2 100644
--- a/test/jdk/java/io/Console/ConsolePromptTest.java
+++ b/test/jdk/java/io/Console/ConsolePromptTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2024, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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,68 +23,90 @@
 
 /**
  * @test
- * @bug 8331681
+ * @bug 8331681 8351435
  * @summary Verify the java.base's console provider handles the prompt correctly.
  * @library /test/lib
- * @run main/othervm --limit-modules java.base ConsolePromptTest
- * @run main/othervm -Djdk.console=java.base ConsolePromptTest
  */
 
+import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
-import java.util.Objects;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+import java.util.ArrayList;
+import java.util.List;
 
 import jdk.test.lib.process.OutputAnalyzer;
 import jdk.test.lib.process.ProcessTools;
+import jtreg.SkippedException;
 
 public class ConsolePromptTest {
 
+    private static final List<List<String>> VARIANTS = List.of(
+        List.of("--limit-modules", "java.base"),
+        List.of("-Djdk.console=java.base")
+    );
+
     public static void main(String... args) throws Throwable {
         for (Method m : ConsolePromptTest.class.getDeclaredMethods()) {
             if (m.getName().startsWith("test")) {
-                m.invoke(new ConsolePromptTest());
+                for (List<String> variant : VARIANTS) {
+                    try {
+                        m.invoke(new ConsolePromptTest(variant));
+                    } catch (InvocationTargetException e) {
+                        if (e.getCause() instanceof SkippedException se) {
+                            throw se;
+                        } else {
+                            throw e;
+                        }
+                    }
+                }
             }
         }
     }
 
+    private final List<String> extraParams;
+
+    public ConsolePromptTest(List<String> extraParams) {
+        this.extraParams = extraParams;
+    }
+
     void testCorrectOutputReadLine() throws Exception {
-        doRunConsoleTest("testCorrectOutputReadLine", "inp", "%s");
+        doRunConsoleTest("testCorrectOutputReadLine");
     }
 
     void testCorrectOutputReadPassword() throws Exception {
-        doRunConsoleTest("testCorrectOutputReadPassword", "inp", "%s");
+        doRunConsoleTest("testCorrectOutputReadPassword");
     }
 
-    void doRunConsoleTest(String testName,
-                          String input,
-                          String expectedOut) throws Exception {
-        ProcessBuilder builder =
-                ProcessTools.createTestJavaProcessBuilder(ConsoleTest.class.getName(),
-                                                          testName);
-        OutputAnalyzer output = ProcessTools.executeProcess(builder, input);
-
-        output.waitFor();
-
-        if (output.getExitValue() != 0) {
-            throw new AssertionError("Unexpected return value: " + output.getExitValue() +
-                                     ", actualOut: " + output.getStdout() +
-                                     ", actualErr: " + output.getStderr());
+    void doRunConsoleTest(String testName) throws Exception {
+        // check "expect" command availability
+        var expect = Paths.get("/usr/bin/expect");
+        if (!Files.exists(expect) || !Files.isExecutable(expect)) {
+            throw new SkippedException("'expect' command not found. Test ignored.");
         }
 
-        String actualOut = output.getStdout();
+        // invoking "expect" command
+        var testSrc = System.getProperty("test.src", ".");
+        var jdkDir = System.getProperty("test.jdk");
 
-        if (!Objects.equals(expectedOut, actualOut)) {
-            throw new AssertionError("Unexpected stdout content. " +
-                                     "Expected: '" + expectedOut + "'" +
-                                     ", got: '" + actualOut + "'");
-        }
+        List<String> command = new ArrayList<>();
 
-        String expectedErr = "";
-        String actualErr = output.getStderr();
+        command.add("expect");
+        command.add("-n");
+        command.add(testSrc + "/consolePrompt.exp");
+        command.add("%s");
+        command.add(jdkDir + "/bin/java");
+        command.addAll(extraParams);
+        command.add("-cp");
+        command.add(System.getProperty("java.class.path"));
+        command.add(ConsoleTest.class.getName());
+        command.add(testName);
 
-        if (!Objects.equals(expectedErr, actualErr)) {
-            throw new AssertionError("Unexpected stderr content. " +
-                                     "Expected: '" + expectedErr + "'" +
-                                     ", got: '" + actualErr + "'");
+        OutputAnalyzer output = ProcessTools.executeProcess(command.toArray(String[]::new));
+        output.reportDiagnosticSummary();
+        var eval = output.getExitValue();
+        if (eval != 0) {
+            throw new RuntimeException("Test failed. Exit value from 'expect' command: " + eval);
         }
     }
 
diff --git a/test/jdk/java/io/Console/DefaultCharsetTest.java b/test/jdk/java/io/Console/DefaultCharsetTest.java
index 0b17217e109..0fca8a3cc3f 100644
--- a/test/jdk/java/io/Console/DefaultCharsetTest.java
+++ b/test/jdk/java/io/Console/DefaultCharsetTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2024, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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,15 @@ import static org.junit.jupiter.api.Assertions.*;
 
 /**
  * @test
- * @bug 8341975
+ * @bug 8341975 8351435
  * @summary Tests the default charset. It should honor `stdout.encoding`
  *          which should be the same as System.out.charset()
  * @modules jdk.internal.le
- * @run junit/othervm -Dstdout.encoding=UTF-8 DefaultCharsetTest
- * @run junit/othervm -Dstdout.encoding=ISO-8859-1 DefaultCharsetTest
- * @run junit/othervm -Dstdout.encoding=US-ASCII DefaultCharsetTest
- * @run junit/othervm -Dstdout.encoding=foo DefaultCharsetTest
- * @run junit/othervm DefaultCharsetTest
+ * @run junit/othervm -Djdk.console=jdk.internal.le -Dstdout.encoding=UTF-8 DefaultCharsetTest
+ * @run junit/othervm -Djdk.console=jdk.internal.le -Dstdout.encoding=ISO-8859-1 DefaultCharsetTest
+ * @run junit/othervm -Djdk.console=jdk.internal.le -Dstdout.encoding=US-ASCII DefaultCharsetTest
+ * @run junit/othervm -Djdk.console=jdk.internal.le -Dstdout.encoding=foo DefaultCharsetTest
+ * @run junit/othervm -Djdk.console=jdk.internal.le DefaultCharsetTest
  */
 public class DefaultCharsetTest {
     @Test
diff --git a/test/jdk/java/io/Console/LocaleTest.java b/test/jdk/java/io/Console/LocaleTest.java
index 1fe725a3ab4..1cab84a9af7 100644
--- a/test/jdk/java/io/Console/LocaleTest.java
+++ b/test/jdk/java/io/Console/LocaleTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2024, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -31,7 +31,7 @@ import jdk.test.lib.process.ProcessTools;
 
 /**
  * @test
- * @bug 8330276
+ * @bug 8330276 8351435
  * @summary Tests Console methods that have Locale as an argument
  * @library /test/lib
  * @modules jdk.internal.le jdk.localedata
@@ -57,6 +57,7 @@ public class LocaleTest {
         if (args.length == 0) {
             // no arg will launch the child process that actually perform tests
             var pb = ProcessTools.createTestJavaProcessBuilder(
+                    "-Djdk.console=jdk.internal.le",
                     "LocaleTest", "dummy");
             var input = new File(System.getProperty("test.src", "."), "input.txt");
             pb.redirectInput(input);
diff --git a/test/jdk/java/io/Console/ModuleSelectionTest.java b/test/jdk/java/io/Console/ModuleSelectionTest.java
index ab3a9babba3..d9885699ebf 100644
--- a/test/jdk/java/io/Console/ModuleSelectionTest.java
+++ b/test/jdk/java/io/Console/ModuleSelectionTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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,11 @@
 
 /**
  * @test
- * @bug 8295803 8299689
+ * @bug 8295803 8299689 8351435
  * @summary Tests System.console() returns correct Console (or null) from the expected
  *          module.
  * @modules java.base/java.io:+open
- * @run main/othervm ModuleSelectionTest jdk.internal.le
+ * @run main/othervm ModuleSelectionTest java.base
  * @run main/othervm -Djdk.console=jdk.internal.le ModuleSelectionTest jdk.internal.le
  * @run main/othervm -Djdk.console=java.base ModuleSelectionTest java.base
  * @run main/othervm --limit-modules java.base ModuleSelectionTest java.base
diff --git a/test/jdk/java/io/Console/consolePrompt.exp b/test/jdk/java/io/Console/consolePrompt.exp
new file mode 100644
index 00000000000..dc69bdd8681
--- /dev/null
+++ b/test/jdk/java/io/Console/consolePrompt.exp
@@ -0,0 +1,30 @@
+#
+# Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please 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 java [lrange $argv 1 end]
+set expected [lindex $argv 0]
+
+eval spawn $java
+expect -- "$expected"
+send -- "\n"
+expect eof
diff --git a/test/jdk/java/io/IO/IO.java b/test/jdk/java/io/IO/IO.java
index e4da1742030..adbe3e6d8f6 100644
--- a/test/jdk/java/io/IO/IO.java
+++ b/test/jdk/java/io/IO/IO.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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,10 @@ import static org.junit.jupiter.api.Assertions.*;
 
 /*
  * @test
- * @bug 8305457 8342936
+ * @bug 8305457 8342936 8351435
  * @summary java.io.IO tests
  * @library /test/lib
+ * @modules jdk.internal.le
  * @run junit IO
  */
 @ExtendWith(IO.TimingExtension.class)
@@ -152,7 +153,7 @@ public class IO {
 
         public static Stream<Arguments> args() {
             // cross product: consoles x prompts
-            return Stream.of(null, "gibberish").flatMap(console -> Stream.of(null, "?", "%s", PROMPT_NONE)
+            return Stream.of("jdk.internal.le", "gibberish").flatMap(console -> Stream.of(null, "?", "%s", PROMPT_NONE)
                     .map(prompt -> new String[]{console, prompt}).map(Arguments::of));
         }
     }
@@ -162,7 +163,7 @@ public class IO {
     public void printTest(String mode) throws Exception {
         var file = Path.of(System.getProperty("test.src", "."), "Output.java")
                 .toAbsolutePath().toString();
-        var pb = ProcessTools.createTestJavaProcessBuilder("--enable-preview", file, mode);
+        var pb = ProcessTools.createTestJavaProcessBuilder("-Djdk.console=jdk.internal.le", "--enable-preview", file, mode);
         OutputAnalyzer output = ProcessTools.executeProcess(pb);
         assertEquals(0, output.getExitValue());
         assertTrue(output.getStderr().isEmpty());
@@ -195,7 +196,7 @@ public class IO {
                     }
                     """);
         }
-        var pb = ProcessTools.createTestJavaProcessBuilder("--enable-preview", file.toString());
+        var pb = ProcessTools.createTestJavaProcessBuilder("-Djdk.console=jdk.internal.le", "--enable-preview", file.toString());
         OutputAnalyzer output = ProcessTools.executeProcess(pb);
         assertEquals(0, output.getExitValue());
         assertTrue(output.getStderr().isEmpty());
diff --git a/test/jdk/jdk/internal/jline/JLineConsoleProviderTest.java b/test/jdk/jdk/internal/jline/JLineConsoleProviderTest.java
index 5e69cdf4f4b..a32f81b7a97 100644
--- a/test/jdk/jdk/internal/jline/JLineConsoleProviderTest.java
+++ b/test/jdk/jdk/internal/jline/JLineConsoleProviderTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2024, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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 8331535
+ * @bug 8331535 8351435
  * @summary Verify the jdk.internal.le's console provider works properly.
  * @modules jdk.internal.le
  * @library /test/lib
@@ -58,7 +58,7 @@ public class JLineConsoleProviderTest {
                           String input,
                           String expectedOut) throws Exception {
         ProcessBuilder builder =
-                ProcessTools.createTestJavaProcessBuilder(ConsoleTest.class.getName(),
+                ProcessTools.createTestJavaProcessBuilder("-Djdk.console=jdk.internal.le", ConsoleTest.class.getName(),
                                                           testName);
         OutputAnalyzer output = ProcessTools.executeProcess(builder, input);
 
diff --git a/test/jdk/jdk/internal/jline/RedirectedStdOut.java b/test/jdk/jdk/internal/jline/RedirectedStdOut.java
index fb614e3d754..71419f96c73 100644
--- a/test/jdk/jdk/internal/jline/RedirectedStdOut.java
+++ b/test/jdk/jdk/internal/jline/RedirectedStdOut.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2024, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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 8330998
+ * @bug 8330998 8351435
  * @summary Verify that even if the stdout is redirected java.io.Console will
  *          use it for writing.
  * @modules jdk.internal.le
@@ -61,7 +61,7 @@ public class RedirectedStdOut {
     //this test is weaker, but more reliable:
     void runRedirectAllTest() throws Exception {
         ProcessBuilder builder =
-                ProcessTools.createTestJavaProcessBuilder(ConsoleTest.class.getName());
+                ProcessTools.createTestJavaProcessBuilder("-Djdk.console=jdk.internal.le", ConsoleTest.class.getName());
         OutputAnalyzer output = ProcessTools.executeProcess(builder);
 
         output.waitFor();
@@ -153,7 +153,7 @@ public class RedirectedStdOut {
         System.setOut(new PrintStream(new ByteArrayOutputStream()));
 
         ProcessBuilder builder =
-            ProcessTools.createTestJavaProcessBuilder(ConsoleTest.class.getName());
+            ProcessTools.createTestJavaProcessBuilder("-Djdk.console=jdk.internal.le", ConsoleTest.class.getName());
 
         builder.inheritIO();
         builder.redirectOutput(stdout.toFile());

From 3e96f5cbcad2cb61b68e2ae6440085b80b6cc287 Mon Sep 17 00:00:00 2001
From: Koushik Thirupattur <koushik.thirupattur@oracle.com>
Date: Mon, 31 Mar 2025 16:54:12 +0000
Subject: [PATCH 567/587] 8351366: Remove the java.security.debug=scl option

Reviewed-by: hchao, mullan
---
 .../classes/java/security/SecureClassLoader.java  | 15 +--------------
 .../share/classes/sun/security/util/Debug.java    |  3 +--
 2 files changed, 2 insertions(+), 16 deletions(-)

diff --git a/src/java.base/share/classes/java/security/SecureClassLoader.java b/src/java.base/share/classes/java/security/SecureClassLoader.java
index 577b0f081ec..8a6ba76e211 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, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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 java.security;
 
-import sun.security.util.Debug;
-
 import java.util.Map;
 import java.util.Objects;
 import java.util.concurrent.ConcurrentHashMap;
@@ -181,13 +179,6 @@ public class SecureClassLoader extends ClassLoader {
         return new Permissions(); // ProtectionDomain defers the binding
     }
 
-    /*
-     * holder class for the static field "debug" to delay its initialization
-     */
-    private static class DebugHolder {
-        private static final Debug debug = Debug.getInstance("scl");
-    }
-
     /*
      * Returned cached ProtectionDomain for the specified CodeSource.
      */
@@ -209,10 +200,6 @@ public class SecureClassLoader extends ClassLoader {
                         = SecureClassLoader.this.getPermissions(key.cs);
                 ProtectionDomain pd = new ProtectionDomain(
                         key.cs, perms, SecureClassLoader.this, null);
-                if (DebugHolder.debug != null) {
-                    DebugHolder.debug.println(" getPermissions " + pd);
-                    DebugHolder.debug.println("");
-                }
                 return pd;
             }
         });
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 59bc810ca57..74d33c036ef 100644
--- a/src/java.base/share/classes/sun/security/util/Debug.java
+++ b/src/java.base/share/classes/sun/security/util/Debug.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -104,7 +104,6 @@ public class Debug {
         System.err.println("pkcs12        PKCS12 KeyStore debugging");
         System.err.println("properties    Security property and configuration file debugging");
         System.err.println("sunpkcs11     SunPKCS11 provider debugging");
-        System.err.println("scl           permissions SecureClassLoader assigns");
         System.err.println("securerandom  SecureRandom");
         System.err.println("ts            timestamping");
         System.err.println("x509          X.509 certificate debugging");

From 4d1de46cb882bade5781255b646f623b55d7180f Mon Sep 17 00:00:00 2001
From: Xiaolong Peng <xpeng@openjdk.org>
Date: Mon, 31 Mar 2025 18:13:31 +0000
Subject: [PATCH 568/587] 8352185: Shenandoah: Invalid logic for remembered set
 verification 8345399: GenShen: Error: Verify init-mark remembered set
 violation; clean card should be dirty

Reviewed-by: ysr, kdnilsen, wkemper
---
 .../gc/shenandoah/shenandoahConcurrentGC.cpp  | 12 ++++--
 .../share/gc/shenandoah/shenandoahFullGC.cpp  |  3 ++
 .../gc/shenandoah/shenandoahVerifier.cpp      | 40 +++++++++++--------
 .../gc/shenandoah/shenandoahVerifier.hpp      |  4 +-
 4 files changed, 35 insertions(+), 24 deletions(-)

diff --git a/src/hotspot/share/gc/shenandoah/shenandoahConcurrentGC.cpp b/src/hotspot/share/gc/shenandoah/shenandoahConcurrentGC.cpp
index c2d33c396da..7b9aafad149 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahConcurrentGC.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahConcurrentGC.cpp
@@ -684,10 +684,6 @@ void ShenandoahConcurrentGC::op_init_mark() {
   assert(!heap->has_forwarded_objects(), "No forwarded objects on this path");
 
   if (heap->mode()->is_generational()) {
-    if (_generation->is_young()) {
-      ShenandoahGCPhase phase(ShenandoahPhaseTimings::init_swap_rset);
-      _generation->swap_card_tables();
-    }
 
     if (_generation->is_global()) {
       heap->old_generation()->cancel_gc();
@@ -698,6 +694,14 @@ void ShenandoahConcurrentGC::op_init_mark() {
       ShenandoahGCPhase phase(ShenandoahPhaseTimings::init_transfer_satb);
       heap->old_generation()->transfer_pointers_from_satb();
     }
+    {
+      // After we swap card table below, the write-table is all clean, and the read table holds
+      // cards dirty prior to the start of GC. Young and bootstrap collection will update
+      // the write card table as a side effect of remembered set scanning. Global collection will
+      // update the card table as a side effect of global marking of old objects.
+      ShenandoahGCPhase phase(ShenandoahPhaseTimings::init_swap_rset);
+      _generation->swap_card_tables();
+    }
   }
 
   if (ShenandoahVerify) {
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahFullGC.cpp b/src/hotspot/share/gc/shenandoah/shenandoahFullGC.cpp
index 91a71adbe1c..621a7233606 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahFullGC.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahFullGC.cpp
@@ -1157,6 +1157,9 @@ void ShenandoahFullGC::phase5_epilog() {
 
     heap->free_set()->finish_rebuild(young_cset_regions, old_cset_regions, num_old);
 
+    // Set mark incomplete because the marking bitmaps have been reset except pinned regions.
+    heap->global_generation()->set_mark_incomplete();
+
     heap->clear_cancelled_gc(true /* clear oom handler */);
   }
 
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahVerifier.cpp b/src/hotspot/share/gc/shenandoah/shenandoahVerifier.cpp
index a5772e1e52d..1d9895b700b 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahVerifier.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahVerifier.cpp
@@ -1055,9 +1055,15 @@ void ShenandoahVerifier::verify_generic(VerifyOption vo) {
 }
 
 void ShenandoahVerifier::verify_before_concmark() {
-    verify_at_safepoint(
+  VerifyRememberedSet verify_remembered_set = _verify_remembered_before_marking;
+  if (_heap->mode()->is_generational() &&
+      !_heap->old_generation()->is_mark_complete()) {
+    // Before marking in generational mode, remembered set can't be verified w/o complete old marking.
+    verify_remembered_set = _verify_remembered_disable;
+  }
+  verify_at_safepoint(
           "Before Mark",
-          _verify_remembered_before_marking,
+          verify_remembered_set,
                                        // verify read-only remembered set from bottom() to top()
           _verify_forwarded_none,      // UR should have fixed up
           _verify_marked_disable,      // do not verify marked: lots ot time wasted checking dead allocations
@@ -1114,9 +1120,14 @@ void ShenandoahVerifier::verify_before_evacuation() {
 }
 
 void ShenandoahVerifier::verify_before_update_refs() {
+  VerifyRememberedSet verify_remembered_set = _verify_remembered_before_updating_references;
+  if (_heap->mode()->is_generational() &&
+      !_heap->old_generation()->is_mark_complete()) {
+    verify_remembered_set = _verify_remembered_disable;
+  }
   verify_at_safepoint(
           "Before Updating References",
-          _verify_remembered_before_updating_references,  // verify read-write remembered set
+          verify_remembered_set,        // verify read-write remembered set
           _verify_forwarded_allow,     // forwarded references allowed
           _verify_marked_complete,     // bitmaps might be stale, but alloc-after-mark should be well
           _verify_cset_forwarded,      // all cset refs are fully forwarded
@@ -1276,17 +1287,14 @@ public:
   void do_oop(oop* p)       override { work(p); }
 };
 
-ShenandoahMarkingContext* ShenandoahVerifier::get_marking_context_for_old() {
-  shenandoah_assert_generations_reconciled();
-  if (_heap->old_generation()->is_mark_complete() || _heap->gc_generation()->is_global()) {
-    return _heap->complete_marking_context();
-  }
-  return nullptr;
-}
-
 template<typename Scanner>
-void ShenandoahVerifier::help_verify_region_rem_set(Scanner* scanner, ShenandoahHeapRegion* r, ShenandoahMarkingContext* ctx,
+void ShenandoahVerifier::help_verify_region_rem_set(Scanner* scanner, ShenandoahHeapRegion* r,
                                                     HeapWord* registration_watermark, const char* message) {
+  shenandoah_assert_generations_reconciled();
+  ShenandoahOldGeneration* old_gen = _heap->old_generation();
+  assert(old_gen->is_mark_complete() || old_gen->is_parsable(), "Sanity");
+
+  ShenandoahMarkingContext* ctx = old_gen->is_mark_complete() ?old_gen->complete_marking_context() : nullptr;
   ShenandoahVerifyRemSetClosure<Scanner> check_interesting_pointers(scanner, message);
   HeapWord* from = r->bottom();
   HeapWord* obj_addr = from;
@@ -1357,7 +1365,6 @@ void ShenandoahVerifier::verify_rem_set_before_mark() {
   shenandoah_assert_safepoint();
   shenandoah_assert_generational();
 
-  ShenandoahMarkingContext* ctx = get_marking_context_for_old();
   ShenandoahOldGeneration* old_generation = _heap->old_generation();
 
   log_debug(gc)("Verifying remembered set at %s mark", old_generation->is_doing_mixed_evacuations() ? "mixed" : "young");
@@ -1366,7 +1373,7 @@ void ShenandoahVerifier::verify_rem_set_before_mark() {
   for (size_t i = 0, n = _heap->num_regions(); i < n; ++i) {
     ShenandoahHeapRegion* r = _heap->get_region(i);
     if (r->is_old() && r->is_active()) {
-      help_verify_region_rem_set(scanner, r, ctx, r->end(), "Verify init-mark remembered set violation");
+      help_verify_region_rem_set(scanner, r, r->end(), "Verify init-mark remembered set violation");
     }
   }
 }
@@ -1379,7 +1386,7 @@ void ShenandoahVerifier::verify_rem_set_after_full_gc() {
   for (size_t i = 0, n = _heap->num_regions(); i < n; ++i) {
     ShenandoahHeapRegion* r = _heap->get_region(i);
     if (r->is_old() && !r->is_cset()) {
-      help_verify_region_rem_set(&scanner, r, nullptr, r->top(), "Remembered set violation at end of Full GC");
+      help_verify_region_rem_set(&scanner, r, r->top(), "Remembered set violation at end of Full GC");
     }
   }
 }
@@ -1392,12 +1399,11 @@ void ShenandoahVerifier::verify_rem_set_before_update_ref() {
   shenandoah_assert_safepoint();
   shenandoah_assert_generational();
 
-  ShenandoahMarkingContext* ctx = get_marking_context_for_old();
   ShenandoahWriteTableScanner scanner(_heap->old_generation()->card_scan());
   for (size_t i = 0, n = _heap->num_regions(); i < n; ++i) {
     ShenandoahHeapRegion* r = _heap->get_region(i);
     if (r->is_old() && !r->is_cset()) {
-      help_verify_region_rem_set(&scanner, r, ctx, r->get_update_watermark(), "Remembered set violation at init-update-references");
+      help_verify_region_rem_set(&scanner, r, r->get_update_watermark(), "Remembered set violation at init-update-references");
     }
   }
 }
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahVerifier.hpp b/src/hotspot/share/gc/shenandoah/shenandoahVerifier.hpp
index a6076ed176b..aba6379e022 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahVerifier.hpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahVerifier.hpp
@@ -229,14 +229,12 @@ public:
   void verify_before_rebuilding_free_set();
 private:
   template<typename Scanner>
-  void help_verify_region_rem_set(Scanner* scanner, ShenandoahHeapRegion* r, ShenandoahMarkingContext* ctx,
+  void help_verify_region_rem_set(Scanner* scanner, ShenandoahHeapRegion* r,
                                   HeapWord* update_watermark, const char* message);
 
   void verify_rem_set_before_mark();
   void verify_rem_set_before_update_ref();
   void verify_rem_set_after_full_gc();
-
-  ShenandoahMarkingContext* get_marking_context_for_old();
 };
 
 #endif // SHARE_GC_SHENANDOAH_SHENANDOAHVERIFIER_HPP

From fe8bd7562180222b14f8a4fda5d29edf57f97668 Mon Sep 17 00:00:00 2001
From: Ian Graves <igraves@openjdk.org>
Date: Mon, 31 Mar 2025 18:28:30 +0000
Subject: [PATCH 569/587] 8351290: Clarify integral only for vector operators

Reviewed-by: liach, psandoz
---
 .../classes/jdk/incubator/vector/VectorOperators.java  | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/VectorOperators.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/VectorOperators.java
index fa70d65c742..c5fe6dd4441 100644
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/VectorOperators.java
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/VectorOperators.java
@@ -452,23 +452,23 @@ public abstract class VectorOperators {
     public static final Unary ABS = unary("ABS", "abs", VectorSupport.VECTOR_OP_ABS, VO_ALL);
     /** Produce {@code -a}. */
     public static final Unary NEG = unary("NEG", "-a", VectorSupport.VECTOR_OP_NEG, VO_ALL|VO_SPECIAL);
-    /** Produce {@code bitCount(a)}
+    /** Produce {@code bitCount(a)}. Integral only.
      * @since 19
      */
     public static final Unary BIT_COUNT = unary("BIT_COUNT", "bitCount", VectorSupport.VECTOR_OP_BIT_COUNT, VO_NOFP);
-    /** Produce {@code numberOfTrailingZeros(a)}
+    /** Produce {@code numberOfTrailingZeros(a)}. Integral only.
      * @since 19
      */
     public static final Unary TRAILING_ZEROS_COUNT = unary("TRAILING_ZEROS_COUNT", "numberOfTrailingZeros", VectorSupport.VECTOR_OP_TZ_COUNT, VO_NOFP);
-    /** Produce {@code numberOfLeadingZeros(a)}
+    /** Produce {@code numberOfLeadingZeros(a)}. Integral only.
      * @since 19
      */
     public static final Unary LEADING_ZEROS_COUNT = unary("LEADING_ZEROS_COUNT", "numberOfLeadingZeros", VectorSupport.VECTOR_OP_LZ_COUNT, VO_NOFP);
-    /** Produce {@code reverse(a)}
+    /** Produce {@code reverse(a)}. Integral only.
      * @since 19
      */
     public static final Unary REVERSE = unary("REVERSE", "reverse", VectorSupport.VECTOR_OP_REVERSE, VO_NOFP);
-    /** Produce {@code reverseBytes(a)}
+    /** Produce {@code reverseBytes(a)}. Integral only.
      * @since 19
      */
     public static final Unary REVERSE_BYTES = unary("REVERSE_BYTES", "reverseBytes", VectorSupport.VECTOR_OP_REVERSE_BYTES, VO_NOFP);

From 8b0602dbed2f7ced190ec81753defab8a4bc316d Mon Sep 17 00:00:00 2001
From: Doug Lea <dl@openjdk.org>
Date: Mon, 31 Mar 2025 19:23:59 +0000
Subject: [PATCH 570/587] 8319447: Improve performance of delayed task handling

Reviewed-by: vklang, alanb
---
 .../util/concurrent/CompletableFuture.java    | 257 +++-----
 .../java/util/concurrent/DelayScheduler.java  | 568 ++++++++++++++++
 .../java/util/concurrent/ForkJoinPool.java    | 614 +++++++++++++++---
 .../java/util/concurrent/ForkJoinTask.java    | 125 ++--
 .../util/concurrent/SubmissionPublisher.java  |  18 +-
 .../util/concurrent/ThreadLocalRandom.java    |  47 +-
 .../util/concurrent/atomic/Striped64.java     |  26 +-
 .../access/JavaUtilConcurrentTLRAccess.java   |   2 +
 ...tableFutureOrTimeoutExceptionallyTest.java |  33 +-
 .../concurrent/tck/CompletableFutureTest.java |  13 +-
 .../concurrent/tck/ForkJoinPool20Test.java    | 430 ++++++++++++
 .../tck/SubmissionPublisherTest.java          |   5 +-
 12 files changed, 1765 insertions(+), 373 deletions(-)
 create mode 100644 src/java.base/share/classes/java/util/concurrent/DelayScheduler.java

diff --git a/src/java.base/share/classes/java/util/concurrent/CompletableFuture.java b/src/java.base/share/classes/java/util/concurrent/CompletableFuture.java
index d6904944050..7503c154ddb 100644
--- a/src/java.base/share/classes/java/util/concurrent/CompletableFuture.java
+++ b/src/java.base/share/classes/java/util/concurrent/CompletableFuture.java
@@ -46,6 +46,7 @@ import java.util.function.Consumer;
 import java.util.function.Function;
 import java.util.function.Supplier;
 import java.util.Objects;
+import static java.util.concurrent.DelayScheduler.ScheduledForkJoinTask;
 
 /**
  * A {@link Future} that may be explicitly completed (setting its
@@ -69,18 +70,15 @@ import java.util.Objects;
  * a completion method.
  *
  * <li>All <em>async</em> methods without an explicit Executor
- * argument are performed using the {@link ForkJoinPool#commonPool()}
- * (unless it does not support a parallelism level of at least two, in
- * which case, a new Thread is created to run each task).  This may be
- * overridden for non-static methods in subclasses by defining method
- * {@link #defaultExecutor()}. To simplify monitoring, debugging,
- * and tracking, all generated asynchronous tasks are instances of the
- * marker interface {@link AsynchronousCompletionTask}.  Operations
- * with time-delays can use adapter methods defined in this class, for
- * example: {@code supplyAsync(supplier, delayedExecutor(timeout,
- * timeUnit))}.  To support methods with delays and timeouts, this
- * class maintains at most one daemon thread for triggering and
- * cancelling actions, not for running them.
+ * argument, as well as those involving delays are performed using the
+ * {@link ForkJoinPool#commonPool()}.  The default async Executor may
+ * be overridden for non-static methods in subclasses by defining
+ * method {@link #defaultExecutor()}. To simplify monitoring,
+ * debugging, and tracking, all generated asynchronous tasks are
+ * instances of the marker interface {@link
+ * AsynchronousCompletionTask}.  Operations with time-delays can use
+ * adapter methods defined in this class, for example: {@code
+ * supplyAsync(supplier, delayedExecutor(timeout, timeUnit))}.
  *
  * <li>All CompletionStage methods are implemented independently of
  * other public methods, so the behavior of one method is not impacted
@@ -473,34 +471,11 @@ public class CompletableFuture<T> implements Future<T>, CompletionStage<T> {
     public static interface AsynchronousCompletionTask {
     }
 
-    private static final boolean USE_COMMON_POOL =
-        (ForkJoinPool.getCommonPoolParallelism() > 1);
-
     /**
-     * Default executor -- ForkJoinPool.commonPool() unless it cannot
-     * support parallelism.
+     * Default Executor
      */
-    private static final Executor ASYNC_POOL = USE_COMMON_POOL ?
-        ForkJoinPool.commonPool() : new ThreadPerTaskExecutor();
-
-    /** Fallback if ForkJoinPool.commonPool() cannot support parallelism */
-    private static final class ThreadPerTaskExecutor implements Executor {
-        public void execute(Runnable r) {
-            Objects.requireNonNull(r);
-            new Thread(r).start();
-        }
-    }
-
-    /**
-     * Null-checks user executor argument, and translates uses of
-     * commonPool to ASYNC_POOL in case parallelism disabled.
-     */
-    static Executor screenExecutor(Executor e) {
-        if (!USE_COMMON_POOL && e == ForkJoinPool.commonPool())
-            return ASYNC_POOL;
-        if (e == null) throw new NullPointerException();
-        return e;
-    }
+    private static final ForkJoinPool ASYNC_POOL =
+        ForkJoinPool.asyncCommonPool(); // ensures minimal parallelism
 
     // Modes for Completion.tryFire. Signedness matters.
     static final int SYNC   =  0;
@@ -702,8 +677,8 @@ public class CompletableFuture<T> implements Future<T>, CompletionStage<T> {
 
     private <V> CompletableFuture<V> uniApplyStage(
         Executor e, Function<? super T,? extends V> f) {
-        if (f == null) throw new NullPointerException();
         Object r;
+        Objects.requireNonNull(f);
         if ((r = result) != null)
             return uniApplyNow(r, e, f);
         CompletableFuture<V> d = newIncompleteFuture();
@@ -775,8 +750,8 @@ public class CompletableFuture<T> implements Future<T>, CompletionStage<T> {
 
     private CompletableFuture<Void> uniAcceptStage(Executor e,
                                                    Consumer<? super T> f) {
-        if (f == null) throw new NullPointerException();
         Object r;
+        Objects.requireNonNull(f);
         if ((r = result) != null)
             return uniAcceptNow(r, e, f);
         CompletableFuture<Void> d = newIncompleteFuture();
@@ -843,8 +818,8 @@ public class CompletableFuture<T> implements Future<T>, CompletionStage<T> {
     }
 
     private CompletableFuture<Void> uniRunStage(Executor e, Runnable f) {
-        if (f == null) throw new NullPointerException();
         Object r;
+        Objects.requireNonNull(f);
         if ((r = result) != null)
             return uniRunNow(r, e, f);
         CompletableFuture<Void> d = newIncompleteFuture();
@@ -924,7 +899,7 @@ public class CompletableFuture<T> implements Future<T>, CompletionStage<T> {
 
     private CompletableFuture<T> uniWhenCompleteStage(
         Executor e, BiConsumer<? super T, ? super Throwable> f) {
-        if (f == null) throw new NullPointerException();
+        Objects.requireNonNull(f);
         CompletableFuture<T> d = newIncompleteFuture();
         Object r;
         if ((r = result) == null)
@@ -987,7 +962,7 @@ public class CompletableFuture<T> implements Future<T>, CompletionStage<T> {
 
     private <V> CompletableFuture<V> uniHandleStage(
         Executor e, BiFunction<? super T, Throwable, ? extends V> f) {
-        if (f == null) throw new NullPointerException();
+        Objects.requireNonNull(f);
         CompletableFuture<V> d = newIncompleteFuture();
         Object r;
         if ((r = result) == null)
@@ -1045,7 +1020,7 @@ public class CompletableFuture<T> implements Future<T>, CompletionStage<T> {
 
     private CompletableFuture<T> uniExceptionallyStage(
         Executor e, Function<Throwable, ? extends T> f) {
-        if (f == null) throw new NullPointerException();
+        Objects.requireNonNull(f);
         CompletableFuture<T> d = newIncompleteFuture();
         Object r;
         if ((r = result) == null)
@@ -1105,7 +1080,7 @@ public class CompletableFuture<T> implements Future<T>, CompletionStage<T> {
 
     private CompletableFuture<T> uniComposeExceptionallyStage(
         Executor e, Function<Throwable, ? extends CompletionStage<T>> f) {
-        if (f == null) throw new NullPointerException();
+        Objects.requireNonNull(f);
         CompletableFuture<T> d = newIncompleteFuture();
         Object r, s; Throwable x;
         if ((r = result) == null)
@@ -1212,7 +1187,7 @@ public class CompletableFuture<T> implements Future<T>, CompletionStage<T> {
 
     private <V> CompletableFuture<V> uniComposeStage(
         Executor e, Function<? super T, ? extends CompletionStage<V>> f) {
-        if (f == null) throw new NullPointerException();
+        Objects.requireNonNull(f);
         CompletableFuture<V> d = newIncompleteFuture();
         Object r, s; Throwable x;
         if ((r = result) == null)
@@ -1823,7 +1798,7 @@ public class CompletableFuture<T> implements Future<T>, CompletionStage<T> {
 
     static <U> CompletableFuture<U> asyncSupplyStage(Executor e,
                                                      Supplier<U> f) {
-        if (f == null) throw new NullPointerException();
+        Objects.requireNonNull(f);
         CompletableFuture<U> d = new CompletableFuture<U>();
         e.execute(new AsyncSupply<U>(d, f));
         return d;
@@ -1859,7 +1834,7 @@ public class CompletableFuture<T> implements Future<T>, CompletionStage<T> {
     }
 
     static CompletableFuture<Void> asyncRunStage(Executor e, Runnable f) {
-        if (f == null) throw new NullPointerException();
+        Objects.requireNonNull(f);
         CompletableFuture<Void> d = new CompletableFuture<Void>();
         e.execute(new AsyncRun(d, f));
         return d;
@@ -2048,7 +2023,7 @@ public class CompletableFuture<T> implements Future<T>, CompletionStage<T> {
      */
     public static <U> CompletableFuture<U> supplyAsync(Supplier<U> supplier,
                                                        Executor executor) {
-        return asyncSupplyStage(screenExecutor(executor), supplier);
+        return asyncSupplyStage(Objects.requireNonNull(executor), supplier);
     }
 
     /**
@@ -2076,7 +2051,7 @@ public class CompletableFuture<T> implements Future<T>, CompletionStage<T> {
      */
     public static CompletableFuture<Void> runAsync(Runnable runnable,
                                                    Executor executor) {
-        return asyncRunStage(screenExecutor(executor), runnable);
+        return asyncRunStage(Objects.requireNonNull(executor), runnable);
     }
 
     /**
@@ -2241,7 +2216,7 @@ public class CompletableFuture<T> implements Future<T>, CompletionStage<T> {
      * to transition to a completed state, else {@code false}
      */
     public boolean completeExceptionally(Throwable ex) {
-        if (ex == null) throw new NullPointerException();
+        Objects.requireNonNull(ex);
         boolean triggered = internalComplete(new AltResult(ex));
         postComplete();
         return triggered;
@@ -2259,7 +2234,7 @@ public class CompletableFuture<T> implements Future<T>, CompletionStage<T> {
 
     public <U> CompletableFuture<U> thenApplyAsync(
         Function<? super T,? extends U> fn, Executor executor) {
-        return uniApplyStage(screenExecutor(executor), fn);
+        return uniApplyStage(Objects.requireNonNull(executor), fn);
     }
 
     public CompletableFuture<Void> thenAccept(Consumer<? super T> action) {
@@ -2272,7 +2247,7 @@ public class CompletableFuture<T> implements Future<T>, CompletionStage<T> {
 
     public CompletableFuture<Void> thenAcceptAsync(Consumer<? super T> action,
                                                    Executor executor) {
-        return uniAcceptStage(screenExecutor(executor), action);
+        return uniAcceptStage(Objects.requireNonNull(executor), action);
     }
 
     public CompletableFuture<Void> thenRun(Runnable action) {
@@ -2285,7 +2260,7 @@ public class CompletableFuture<T> implements Future<T>, CompletionStage<T> {
 
     public CompletableFuture<Void> thenRunAsync(Runnable action,
                                                 Executor executor) {
-        return uniRunStage(screenExecutor(executor), action);
+        return uniRunStage(Objects.requireNonNull(executor), action);
     }
 
     public <U,V> CompletableFuture<V> thenCombine(
@@ -2303,7 +2278,7 @@ public class CompletableFuture<T> implements Future<T>, CompletionStage<T> {
     public <U,V> CompletableFuture<V> thenCombineAsync(
         CompletionStage<? extends U> other,
         BiFunction<? super T,? super U,? extends V> fn, Executor executor) {
-        return biApplyStage(screenExecutor(executor), other, fn);
+        return biApplyStage(Objects.requireNonNull(executor), other, fn);
     }
 
     public <U> CompletableFuture<Void> thenAcceptBoth(
@@ -2321,7 +2296,7 @@ public class CompletableFuture<T> implements Future<T>, CompletionStage<T> {
     public <U> CompletableFuture<Void> thenAcceptBothAsync(
         CompletionStage<? extends U> other,
         BiConsumer<? super T, ? super U> action, Executor executor) {
-        return biAcceptStage(screenExecutor(executor), other, action);
+        return biAcceptStage(Objects.requireNonNull(executor), other, action);
     }
 
     public CompletableFuture<Void> runAfterBoth(CompletionStage<?> other,
@@ -2337,7 +2312,7 @@ public class CompletableFuture<T> implements Future<T>, CompletionStage<T> {
     public CompletableFuture<Void> runAfterBothAsync(CompletionStage<?> other,
                                                      Runnable action,
                                                      Executor executor) {
-        return biRunStage(screenExecutor(executor), other, action);
+        return biRunStage(Objects.requireNonNull(executor), other, action);
     }
 
     public <U> CompletableFuture<U> applyToEither(
@@ -2353,7 +2328,7 @@ public class CompletableFuture<T> implements Future<T>, CompletionStage<T> {
     public <U> CompletableFuture<U> applyToEitherAsync(
         CompletionStage<? extends T> other, Function<? super T, U> fn,
         Executor executor) {
-        return orApplyStage(screenExecutor(executor), other, fn);
+        return orApplyStage(Objects.requireNonNull(executor), other, fn);
     }
 
     public CompletableFuture<Void> acceptEither(
@@ -2369,7 +2344,7 @@ public class CompletableFuture<T> implements Future<T>, CompletionStage<T> {
     public CompletableFuture<Void> acceptEitherAsync(
         CompletionStage<? extends T> other, Consumer<? super T> action,
         Executor executor) {
-        return orAcceptStage(screenExecutor(executor), other, action);
+        return orAcceptStage(Objects.requireNonNull(executor), other, action);
     }
 
     public CompletableFuture<Void> runAfterEither(CompletionStage<?> other,
@@ -2385,7 +2360,7 @@ public class CompletableFuture<T> implements Future<T>, CompletionStage<T> {
     public CompletableFuture<Void> runAfterEitherAsync(CompletionStage<?> other,
                                                        Runnable action,
                                                        Executor executor) {
-        return orRunStage(screenExecutor(executor), other, action);
+        return orRunStage(Objects.requireNonNull(executor), other, action);
     }
 
     public <U> CompletableFuture<U> thenCompose(
@@ -2401,7 +2376,7 @@ public class CompletableFuture<T> implements Future<T>, CompletionStage<T> {
     public <U> CompletableFuture<U> thenComposeAsync(
         Function<? super T, ? extends CompletionStage<U>> fn,
         Executor executor) {
-        return uniComposeStage(screenExecutor(executor), fn);
+        return uniComposeStage(Objects.requireNonNull(executor), fn);
     }
 
     public CompletableFuture<T> whenComplete(
@@ -2416,7 +2391,7 @@ public class CompletableFuture<T> implements Future<T>, CompletionStage<T> {
 
     public CompletableFuture<T> whenCompleteAsync(
         BiConsumer<? super T, ? super Throwable> action, Executor executor) {
-        return uniWhenCompleteStage(screenExecutor(executor), action);
+        return uniWhenCompleteStage(Objects.requireNonNull(executor), action);
     }
 
     public <U> CompletableFuture<U> handle(
@@ -2431,7 +2406,7 @@ public class CompletableFuture<T> implements Future<T>, CompletionStage<T> {
 
     public <U> CompletableFuture<U> handleAsync(
         BiFunction<? super T, Throwable, ? extends U> fn, Executor executor) {
-        return uniHandleStage(screenExecutor(executor), fn);
+        return uniHandleStage(Objects.requireNonNull(executor), fn);
     }
 
     /**
@@ -2461,7 +2436,7 @@ public class CompletableFuture<T> implements Future<T>, CompletionStage<T> {
      */
     public CompletableFuture<T> exceptionallyAsync(
         Function<Throwable, ? extends T> fn, Executor executor) {
-        return uniExceptionallyStage(screenExecutor(executor), fn);
+        return uniExceptionallyStage(Objects.requireNonNull(executor), fn);
     }
 
     /**
@@ -2486,7 +2461,7 @@ public class CompletableFuture<T> implements Future<T>, CompletionStage<T> {
     public CompletableFuture<T> exceptionallyComposeAsync(
         Function<Throwable, ? extends CompletionStage<T>> fn,
         Executor executor) {
-        return uniComposeExceptionallyStage(screenExecutor(executor), fn);
+        return uniComposeExceptionallyStage(Objects.requireNonNull(executor), fn);
     }
 
     /* ------------- Arbitrary-arity constructions -------------- */
@@ -2652,8 +2627,7 @@ public class CompletableFuture<T> implements Future<T>, CompletionStage<T> {
      * @throws NullPointerException if the exception is null
      */
     public void obtrudeException(Throwable ex) {
-        if (ex == null) throw new NullPointerException();
-        result = new AltResult(ex);
+        result = new AltResult(Objects.requireNonNull(ex));
         postComplete();
     }
 
@@ -2784,9 +2758,8 @@ public class CompletableFuture<T> implements Future<T>, CompletionStage<T> {
      */
     public CompletableFuture<T> completeAsync(Supplier<? extends T> supplier,
                                               Executor executor) {
-        if (supplier == null || executor == null)
-            throw new NullPointerException();
-        executor.execute(new AsyncSupply<T>(this, supplier));
+        executor.execute(new AsyncSupply<T>(
+                             this, Objects.requireNonNull(supplier)));
         return this;
     }
 
@@ -2817,11 +2790,8 @@ public class CompletableFuture<T> implements Future<T>, CompletionStage<T> {
      * @since 9
      */
     public CompletableFuture<T> orTimeout(long timeout, TimeUnit unit) {
-        if (unit == null)
-            throw new NullPointerException();
-        if (result == null)
-            whenComplete(new Canceller(Delayer.delay(new Timeout(this),
-                                                     timeout, unit)));
+        arrangeTimeout(unit.toNanos(timeout), // Implicit null-check of unit
+                       new Timeout<T>(this, null, true));
         return this;
     }
 
@@ -2839,15 +2809,53 @@ public class CompletableFuture<T> implements Future<T>, CompletionStage<T> {
      */
     public CompletableFuture<T> completeOnTimeout(T value, long timeout,
                                                   TimeUnit unit) {
-        if (unit == null)
-            throw new NullPointerException();
-        if (result == null)
-            whenComplete(new Canceller(Delayer.delay(
-                                           new DelayedCompleter<T>(this, value),
-                                           timeout, unit)));
+        arrangeTimeout(unit.toNanos(timeout),
+                       new Timeout<T>(this, value, false));
         return this;
     }
 
+    /** Action to complete (possibly exceptionally) on timeout */
+    static final class Timeout<U> implements Runnable {
+        final CompletableFuture<U> f;
+        final U value;
+        final boolean exceptional;
+        Timeout(CompletableFuture<U> f, U value, boolean exceptional) {
+            this.f = f; this.value = value; this.exceptional = exceptional;
+        }
+        public void run() {
+            if (f != null && !f.isDone()) {
+                if (exceptional)
+                    f.completeExceptionally(new TimeoutException());
+                else
+                    f.complete(value);
+            }
+        }
+    }
+
+    /** Action to cancel unneeded timeouts */
+    static final class Canceller implements BiConsumer<Object, Throwable> {
+        final Future<?> f;
+        Canceller(Future<?> f) { this.f = f; }
+        public void accept(Object ignore, Throwable ex) {
+            if (f != null) // currently never null
+                f.cancel(false);
+        }
+    }
+
+    /**
+     * Schedules a timeout action, as well as whenComplete handling to
+     * cancel the action if not needed.
+     */
+    private <U> void arrangeTimeout(long nanoDelay, Timeout<U> onTimeout) {
+        ForkJoinPool e = ASYNC_POOL;
+        if (result == null) {
+            ScheduledForkJoinTask<Void> t =  new ScheduledForkJoinTask<Void>(
+                nanoDelay, 0L, true, onTimeout, null, e);
+            whenComplete(new Canceller(t));
+            e.scheduleDelayedTask(t);
+        }
+    }
+
     /**
      * Returns a new Executor that submits a task to the given base
      * executor after the given delay (or no delay if non-positive).
@@ -2863,9 +2871,8 @@ public class CompletableFuture<T> implements Future<T>, CompletionStage<T> {
      */
     public static Executor delayedExecutor(long delay, TimeUnit unit,
                                            Executor executor) {
-        if (unit == null || executor == null)
-            throw new NullPointerException();
-        return new DelayedExecutor(delay, unit, executor);
+        return new DelayedExecutor(unit.toNanos(delay), // implicit null check
+                                   Objects.requireNonNull(executor));
     }
 
     /**
@@ -2881,9 +2888,8 @@ public class CompletableFuture<T> implements Future<T>, CompletionStage<T> {
      * @since 9
      */
     public static Executor delayedExecutor(long delay, TimeUnit unit) {
-        if (unit == null)
-            throw new NullPointerException();
-        return new DelayedExecutor(delay, unit, ASYNC_POOL);
+        return new DelayedExecutor(unit.toNanos(delay), // implicit null check
+                                   ASYNC_POOL);
     }
 
     /**
@@ -2910,8 +2916,7 @@ public class CompletableFuture<T> implements Future<T>, CompletionStage<T> {
      * @since 9
      */
     public static <U> CompletableFuture<U> failedFuture(Throwable ex) {
-        if (ex == null) throw new NullPointerException();
-        return new CompletableFuture<U>(new AltResult(ex));
+        return new CompletableFuture<U>(new AltResult(Objects.requireNonNull(ex)));
     }
 
     /**
@@ -2925,48 +2930,23 @@ public class CompletableFuture<T> implements Future<T>, CompletionStage<T> {
      * @since 9
      */
     public static <U> CompletionStage<U> failedStage(Throwable ex) {
-        if (ex == null) throw new NullPointerException();
-        return new MinimalStage<U>(new AltResult(ex));
-    }
-
-    /**
-     * Singleton delay scheduler, used only for starting and
-     * cancelling tasks.
-     */
-    static final class Delayer {
-        static ScheduledFuture<?> delay(Runnable command, long delay,
-                                        TimeUnit unit) {
-            return delayer.schedule(command, delay, unit);
-        }
-
-        static final class DaemonThreadFactory implements ThreadFactory {
-            public Thread newThread(Runnable r) {
-                Thread t = new Thread(r);
-                t.setDaemon(true);
-                t.setName("CompletableFutureDelayScheduler");
-                return t;
-            }
-        }
-
-        static final ScheduledThreadPoolExecutor delayer;
-        static {
-            (delayer = new ScheduledThreadPoolExecutor(
-                1, new DaemonThreadFactory())).
-                setRemoveOnCancelPolicy(true);
-        }
+        return new MinimalStage<U>(new AltResult(Objects.requireNonNull(ex)));
     }
 
     // Little class-ified lambdas to better support monitoring
 
     static final class DelayedExecutor implements Executor {
-        final long delay;
-        final TimeUnit unit;
+        final long nanoDelay;
         final Executor executor;
-        DelayedExecutor(long delay, TimeUnit unit, Executor executor) {
-            this.delay = delay; this.unit = unit; this.executor = executor;
+        DelayedExecutor(long nanoDelay, Executor executor) {
+            this.nanoDelay = nanoDelay; this.executor = executor;
         }
         public void execute(Runnable r) {
-            Delayer.delay(new TaskSubmitter(executor, r), delay, unit);
+            ForkJoinPool e = ASYNC_POOL;  // Use immediate mode to relay task
+            e.scheduleDelayedTask(
+                new ScheduledForkJoinTask<Void>(
+                    nanoDelay, 0L, true,
+                    new TaskSubmitter(executor, r), null, e));
         }
     }
 
@@ -2981,37 +2961,6 @@ public class CompletableFuture<T> implements Future<T>, CompletionStage<T> {
         public void run() { executor.execute(action); }
     }
 
-    /** Action to completeExceptionally on timeout */
-    static final class Timeout implements Runnable {
-        final CompletableFuture<?> f;
-        Timeout(CompletableFuture<?> f) { this.f = f; }
-        public void run() {
-            if (f != null && !f.isDone())
-                f.completeExceptionally(new TimeoutException());
-        }
-    }
-
-    /** Action to complete on timeout */
-    static final class DelayedCompleter<U> implements Runnable {
-        final CompletableFuture<U> f;
-        final U u;
-        DelayedCompleter(CompletableFuture<U> f, U u) { this.f = f; this.u = u; }
-        public void run() {
-            if (f != null)
-                f.complete(u);
-        }
-    }
-
-    /** Action to cancel unneeded timeouts */
-    static final class Canceller implements BiConsumer<Object, Throwable> {
-        final Future<?> f;
-        Canceller(Future<?> f) { this.f = f; }
-        public void accept(Object ignore, Throwable ex) {
-            if (f != null && !f.isDone())
-                f.cancel(false);
-        }
-    }
-
     /**
      * A subclass that just throws UOE for most non-CompletionStage methods.
      */
diff --git a/src/java.base/share/classes/java/util/concurrent/DelayScheduler.java b/src/java.base/share/classes/java/util/concurrent/DelayScheduler.java
new file mode 100644
index 00000000000..358d3b69f1e
--- /dev/null
+++ b/src/java.base/share/classes/java/util/concurrent/DelayScheduler.java
@@ -0,0 +1,568 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, the following notice accompanied the original version of this
+ * file:
+ *
+ * Written by Doug Lea with assistance from members of JCP JSR-166
+ * Expert Group and released to the public domain, as explained at
+ * http://creativecommons.org/publicdomain/zero/1.0/
+ */
+
+package java.util.concurrent;
+
+import java.util.Arrays;
+import jdk.internal.misc.Unsafe;
+import static java.util.concurrent.TimeUnit.NANOSECONDS;
+
+/**
+ * An add-on for ForkJoinPools that provides scheduling for
+ * delayed and periodic tasks
+ */
+final class DelayScheduler extends Thread {
+
+    /*
+     * A DelayScheduler maintains a 4-ary heap (see
+     * https://en.wikipedia.org/wiki/D-ary_heap) based on trigger
+     * times (field ScheduledForkJoinTask.when) along with a pending
+     * queue of tasks submitted by other threads. When enabled (their
+     * delays elapse), tasks are relayed to the pool, or run directly
+     * if task.isImmediate.  Immediate mode is designed for internal
+     * jdk usages in which the (non-blocking) action is to cancel,
+     * unblock or differently relay another async task (in some cases,
+     * this relies on user code to trigger async tasks).  If
+     * processing encounters resource failures (possible when growing
+     * heap or ForkJoinPool WorkQueue arrays), tasks are cancelled.
+     *
+     * To reduce memory contention, the heap is maintained solely via
+     * local variables in method loop() (forcing noticeable code
+     * sprawl), recording only the current heap size when blocked to
+     * allow method canShutDown to conservatively check emptiness, and
+     * to report approximate current size for monitoring.
+     *
+     * The pending queue uses a design similar to ForkJoinTask.Aux
+     * queues: Incoming requests prepend (Treiber-stack-style) to the
+     * pending list. The scheduler thread takes and nulls out the
+     * entire list per step to process them as a batch. The pending
+     * queue may encounter contention and retries among requesters,
+     * but much less so versus the scheduler. It is possible to use
+     * multiple pending queues to reduce this form of contention but
+     * it doesn't seem worthwhile even under heavy loads.
+     *
+     * The implementation relies on the scheduler being a non-virtual
+     * final Thread subclass.  Field "active" records whether the
+     * scheduler may have any pending tasks (and/or shutdown actions)
+     * to process, otherwise parking either indefinitely or until the
+     * next task deadline. Incoming pending tasks ensure active
+     * status, unparking if necessary. The scheduler thread sets
+     * status to inactive when there is apparently no work, and then
+     * rechecks before actually parking.  The active field takes on a
+     * negative value on termination, as a sentinel used in pool
+     * termination checks as well as to suppress reactivation after
+     * terminating.
+     *
+     * We avoid the need for auxilliary data structures by embedding
+     * pending queue links, heap indices, and pool references inside
+     * ScheduledForkJoinTasks. (We use the same structure for both
+     * Runnable and Callable versions, since including an extra field
+     * in either case doesn't hurt -- it seems mildly preferable for
+     * these objects to be larger than other kinds of tasks to reduce
+     * false sharing during possibly frequent bookkeeping updates.) To
+     * reduce GC pressure and memory retention, these are nulled out
+     * as soon as possible.
+     *
+     * The implementation is designed to accommodate usages in which
+     * many or even most tasks are cancelled before executing (which
+     * is typical with IO-based timeouts). The use of a 4-ary heap (in
+     * which each element has up to 4 children) improves locality, and
+     * reduces the need for array movement and memory writes compared
+     * to a standard binary heap, at the expense of more expensive
+     * replace() operations (with about half the writes but twice the
+     * reads).  Especially in the presence of cancellations, this is
+     * often faster because the replace method removes cancelled tasks
+     * seen while performing sift-down operations, in which case these
+     * elements are not further recorded or accessed, even before
+     * processing the removal request generated by method
+     * ScheduledForkJoinTask.cancel() (which is then a no-op or not
+     * generated at all).
+     *
+     * To ensure that comparisons do not encounter integer wraparound
+     * errors, times are offset with the most negative possible value
+     * (nanoTimeOffset) determined during static initialization.
+     * Negative delays are screened out before use.
+     *
+     * Upon noticing pool shutdown, delayed and/or periodic tasks are
+     * purged according to pool configuration and policy; the
+     * scheduler then tries to terminate the pool if the heap is
+     * empty. The asynchronicity of these steps with respect to pool
+     * runState weakens guarantees about exactly when purged tasks
+     * report isCancelled to callers (they do not run, but there may
+     * be a lag setting their status).
+     */
+
+    ForkJoinPool pool;               // read once and detached upon starting
+    volatile ScheduledForkJoinTask<?> pending; // submitted adds and removes
+    volatile int active;             // 0: inactive, -1: stopped, +1: running
+    int restingSize;                 // written only before parking
+    volatile int cancelDelayedTasksOnShutdown; // policy control
+    int pad0, pad1, pad2, pad3, pad4, pad5, pad6, pad7;
+    int pad8, pad9, padA, padB, padC, padD, padE; // reduce false sharing
+
+    private static final int INITIAL_HEAP_CAPACITY = 1 << 6;
+    private static final int POOL_STOPPING = 1; // must match ForkJoinPool
+    static final long nanoTimeOffset = // Most negative possible time base
+        Math.min(System.nanoTime(), 0L) + Long.MIN_VALUE;
+
+    private static final Unsafe U;     // for atomic operations
+    private static final long ACTIVE;
+    private static final long PENDING;
+    static {
+        U = Unsafe.getUnsafe();
+        Class<DelayScheduler> klass = DelayScheduler.class;
+        ACTIVE = U.objectFieldOffset(klass, "active");
+        PENDING = U.objectFieldOffset(klass, "pending");
+    }
+
+    DelayScheduler(ForkJoinPool p, String name) {
+        super(name);
+        setDaemon(true);
+        pool = p;
+    }
+
+    /**
+     * Returns System.nanoTime() with nanoTimeOffset
+     */
+    static final long now() {
+        return nanoTimeOffset + System.nanoTime();
+    }
+
+    /**
+     * Ensures the scheduler is not parked unless stopped.
+     * Returns negative if already stopped
+     */
+    final int signal() {
+        int state;
+        if ((state = active) == 0 && U.getAndBitwiseOrInt(this, ACTIVE, 1) == 0)
+            U.unpark(this);
+        return state;
+    }
+
+    /**
+     * Inserts the task (if nonnull) to pending queue, to add,
+     * remove, or ignore depending on task status when processed.
+     */
+    final void pend(ScheduledForkJoinTask<?> task) {
+        ScheduledForkJoinTask<?> f = pending;
+        if (task != null) {
+            do {} while (
+                f != (f = (ScheduledForkJoinTask<?>)
+                      U.compareAndExchangeReference(
+                          this, PENDING, task.nextPending = f, task)));
+            signal();
+        }
+    }
+
+    /**
+     * Returns true if (momentarily) inactive and heap is empty
+     */
+    final boolean canShutDown() {
+        return (active <= 0 && restingSize <= 0);
+    }
+
+    /**
+     * Returns the number of elements in heap when last idle
+     */
+    final int lastStableSize() {
+        return (active < 0) ? 0 : restingSize;
+    }
+
+    /**
+     * Turns on cancelDelayedTasksOnShutdown policy
+     */
+    final void  cancelDelayedTasksOnShutdown() {
+        cancelDelayedTasksOnShutdown = 1;
+        signal();
+    }
+
+    /**
+     * Sets up and runs scheduling loop
+     */
+    public final void run() {
+        ForkJoinPool p = pool;
+        pool = null;   // detach
+        if (p == null) // failed initialization
+            active = -1;
+        else {
+            try {
+                loop(p);
+            } finally {
+                restingSize = 0;
+                active = -1;
+                p.tryStopIfShutdown(this);
+            }
+        }
+    }
+
+    /**
+     * After initialization, repeatedly:
+     * 1. If apparently no work,
+     *    if active, set tentatively inactive,
+     *    else park until next trigger time, or indefinitely if none
+     * 2. Process pending tasks in batches, to add or remove from heap
+     * 3. Check for shutdown, either exiting or preparing for shutdown when empty
+     * 4. Trigger all enabled tasks by submitting them to pool or run if immediate
+     */
+    private void loop(ForkJoinPool p) {
+        if (p != null) {                           // currently always true
+            ScheduledForkJoinTask<?>[] h =         // heap array
+                new ScheduledForkJoinTask<?>[INITIAL_HEAP_CAPACITY];
+            int cap = h.length, n = 0, prevRunStatus = 0; // n is heap size
+            long parkTime = 0L;                    // zero for untimed park
+            for (;;) {                             // loop until stopped
+                ScheduledForkJoinTask<?> q, t; int runStatus;
+                if ((q = pending) == null) {
+                    restingSize = n;
+                    if (active != 0)               // deactivate and recheck
+                        U.compareAndSetInt(this, ACTIVE, 1, 0);
+                    else {
+                        Thread.interrupted();      // clear before park
+                        U.park(false, parkTime);
+                    }
+                    q = pending;
+                }
+
+                while (q != null &&                // process pending tasks
+                       (t = (ScheduledForkJoinTask<?>)
+                        U.getAndSetReference(this, PENDING, null)) != null) {
+                    ScheduledForkJoinTask<?> next;
+                    do {
+                        int i;
+                        if ((next = t.nextPending) != null)
+                            t.nextPending = null;
+                        if ((i = t.heapIndex) >= 0) {
+                            t.heapIndex = -1;      // remove cancelled task
+                            if (i < cap && h[i] == t)
+                                n = replace(h, i, n);
+                        }
+                        else if (n >= cap || n < 0)
+                            t.trySetCancelled();   // couldn't resize
+                        else {
+                            long d = t.when;       // add and sift up
+                            if (t.status >= 0) {
+                                ScheduledForkJoinTask<?> parent;
+                                int k = n++, pk, newCap;
+                                while (k > 0 &&
+                                       (parent = h[pk = (k - 1) >>> 2]) != null &&
+                                       (parent.when > d)) {
+                                    parent.heapIndex = k;
+                                    h[k] = parent;
+                                    k = pk;
+                                }
+                                t.heapIndex = k;
+                                h[k] = t;
+                                if (n >= cap && (newCap = cap << 1) > cap) {
+                                    ScheduledForkJoinTask<?>[] a = null;
+                                    try {          // try to resize
+                                        a = Arrays.copyOf(h, newCap);
+                                    } catch (Error | RuntimeException ex) {
+                                    }
+                                    if (a != null && a.length == newCap) {
+                                        cap = newCap;
+                                        h = a;     // else keep using old array
+                                    }
+                                }
+                            }
+                        }
+                    } while ((t = next) != null);
+                    q = pending;
+                }
+
+                if ((runStatus = p.shutdownStatus(this)) != 0) {
+                    if ((n = tryStop(p, h, n, runStatus, prevRunStatus)) < 0)
+                        break;
+                    prevRunStatus = runStatus;
+                }
+
+                parkTime = 0L;
+                if (n > 0 && h.length > 0) {    // submit enabled tasks
+                    long now = now();
+                    do {
+                        ScheduledForkJoinTask<?> f; int stat;
+                        if ((f = h[0]) != null) {
+                            long d = f.when - now;
+                            if ((stat = f.status) >= 0 && d > 0L) {
+                                parkTime = d;
+                                break;
+                            }
+                            f.heapIndex = -1;
+                            if (stat < 0)
+                                ;               // already cancelled
+                            else if (f.isImmediate)
+                                f.doExec();
+                            else {
+                                try {
+                                    p.executeEnabledScheduledTask(f);
+                                }
+                                catch (Error | RuntimeException ex) {
+                                    f.trySetCancelled();
+                                }
+                            }
+                        }
+                    } while ((n = replace(h, 0, n)) > 0);
+                }
+            }
+        }
+    }
+
+    /**
+     * Replaces removed heap element at index k, along with other
+     * cancelled nodes found while doing so.
+     * @return current heap size
+     */
+    private static int replace(ScheduledForkJoinTask<?>[] h, int k, int n) {
+        if (h != null && h.length >= n) { // hoist checks
+            while (k >= 0 && n > k) {
+                int alsoReplace = -1;  // non-negative if cancelled task seen
+                ScheduledForkJoinTask<?> t = null, u;
+                long d = 0L;
+                while (--n > k) {      // find uncancelled replacement
+                    if ((u = h[n]) != null) {
+                        h[n] = null;
+                        d = u.when;
+                        if (u.status >= 0) {
+                            t = u;
+                            break;
+                        }
+                        u.heapIndex = -1;
+                    }
+                }
+                if (t != null) {       // sift down
+                    for (int cs; (cs = (k << 2) + 1) < n; ) {
+                        ScheduledForkJoinTask<?> leastChild = null, c;
+                        int leastIndex = 0;
+                        long leastValue = Long.MAX_VALUE;
+                        for (int ck = cs, j = 4;;) { // at most 4 children
+                            if ((c = h[ck]) == null)
+                                break;
+                            long cd = c.when;
+                            if (c.status < 0 && alsoReplace < 0) {
+                                alsoReplace = ck;    // at most once per pass
+                                c.heapIndex = -1;
+                            }
+                            else if (leastChild == null || cd < leastValue) {
+                                leastValue = cd;
+                                leastIndex = ck;
+                                leastChild = c;
+                            }
+                            if (--j == 0 || ++ck >= n)
+                                break;
+                        }
+                        if (leastChild == null || d <= leastValue)
+                            break;
+                        leastChild.heapIndex = k;
+                        h[k] = leastChild;
+                        k = leastIndex;
+                    }
+                    t.heapIndex = k;
+                }
+                h[k] = t;
+                k = alsoReplace;
+            }
+        }
+        return n;
+    }
+
+    /**
+     * Call only when pool run status is nonzero. Possibly cancels
+     * tasks and stops during pool shutdown and termination. If called
+     * when shutdown but not stopping, removes tasks according to
+     * policy if not already done so, and if not empty or pool not
+     * terminating, returns.  Otherwise, cancels all tasks in heap and
+     * pending queue.
+     * @return negative if stop, else current heap size.
+     */
+    private int tryStop(ForkJoinPool p, ScheduledForkJoinTask<?>[] h, int n,
+                        int runStatus, int prevRunStatus) {
+        if ((runStatus & POOL_STOPPING) == 0) {
+            if (n > 0) {
+                if (cancelDelayedTasksOnShutdown != 0) {
+                    cancelAll(h, n);
+                    n = 0;
+                }
+                else if (prevRunStatus == 0 && h != null && h.length >= n) {
+                    ScheduledForkJoinTask<?> t; int stat; // remove periodic tasks
+                    for (int i = n - 1; i >= 0; --i) {
+                        if ((t = h[i]) != null &&
+                            ((stat = t.status) < 0 || t.nextDelay != 0L)) {
+                            t.heapIndex = -1;
+                            if (stat >= 0)
+                                t.trySetCancelled();
+                            n = replace(h, i, n);
+                        }
+                    }
+                }
+            }
+            if (n > 0 || p == null || !p.tryStopIfShutdown(this))
+                return n;       // check for quiescent shutdown
+        }
+        if (n > 0)
+            cancelAll(h, n);
+        for (ScheduledForkJoinTask<?> a = (ScheduledForkJoinTask<?>)
+                 U.getAndSetReference(this, PENDING, null);
+             a != null; a = a.nextPending)
+            a.trySetCancelled(); // clear pending requests
+        return -1;
+    }
+
+    private static void cancelAll(ScheduledForkJoinTask<?>[] h, int n) {
+        if (h != null && h.length >= n) {
+            ScheduledForkJoinTask<?> t;
+            for (int i = 0; i < n; ++i) {
+                if ((t = h[i]) != null) {
+                    h[i] = null;
+                    t.heapIndex = -1;
+                    t.trySetCancelled();
+                }
+            }
+        }
+    }
+
+    /**
+     * Task class for DelayScheduler operations
+     */
+    @SuppressWarnings("serial")    // Not designed to be serializable
+    static final class ScheduledForkJoinTask<T>
+        extends ForkJoinTask.InterruptibleTask<T>
+        implements ScheduledFuture<T> {
+        ForkJoinPool pool;         // nulled out after use
+        Runnable runnable;         // at most one of runnable or callable nonnull
+        Callable<? extends T> callable;
+        T result;
+        ScheduledForkJoinTask<?> nextPending; // for DelayScheduler pending queue
+        long when;                  // nanoTime-based trigger time
+        final long nextDelay;       // 0: once; <0: fixedDelay; >0: fixedRate
+        int heapIndex;              // if non-negative, index on heap
+        final boolean isImmediate;  // run by scheduler vs submitted when ready
+
+        /**
+         * Creates a new ScheduledForkJoinTask
+         * @param delay initial delay, in nanoseconds
+         * @param nextDelay 0 for one-shot, negative for fixed delay,
+         *        positive for fixed rate, in nanoseconds
+         * @param isImmediate if action is to be performed
+         *        by scheduler versus submitting to a WorkQueue
+         * @param runnable action (null if implementing callable version)
+         * @param callable function (null if implementing runnable versions)
+         * @param pool the pool for resubmissions and cancellations
+         *        (disabled if null)
+         */
+        public ScheduledForkJoinTask(long delay, long nextDelay,
+                                     boolean isImmediate, Runnable runnable,
+                                     Callable<T> callable, ForkJoinPool pool) {
+            this.when = DelayScheduler.now() + Math.max(delay, 0L);
+            this.heapIndex = -1;
+            this.nextDelay = nextDelay;
+            this.isImmediate = isImmediate;
+            this.runnable = runnable;
+            this.callable = callable;
+            this.pool = pool;
+        }
+
+        public void schedule() { // relay to pool, to allow independent use
+            ForkJoinPool p;
+            if ((p = pool) != null) // else already run
+                p.scheduleDelayedTask(this);
+        }
+
+        // InterruptibleTask methods
+        public final T getRawResult() { return result; }
+        public final void setRawResult(T v) { result = v; }
+        final Object adaptee() { return (runnable != null) ? runnable : callable; }
+
+        final T compute() throws Exception {
+            Callable<? extends T> c; Runnable r;
+            T res = null;
+            if ((r = runnable) != null)
+                r.run();
+            else if ((c = callable) != null)
+                res = c.call();
+            return res;
+        }
+
+        final boolean postExec() {       // possibly resubmit
+            long d; ForkJoinPool p; DelayScheduler ds;
+            if ((d = nextDelay) != 0L && // is periodic
+                status >= 0 &&           // not abnormally completed
+                (p = pool) != null && (ds = p.delayScheduler) != null) {
+                if (p.shutdownStatus(ds) == 0) {
+                    heapIndex = -1;
+                    if (d < 0L)
+                        when = DelayScheduler.now() - d;
+                    else
+                        when += d;
+                    ds.pend(this);
+                    return false;
+                }
+                trySetCancelled();       // pool is shutdown
+            }
+            pool = null;                 // reduce memory retention
+            runnable = null;
+            callable = null;
+            return true;
+        }
+
+        public final boolean cancel(boolean mayInterruptIfRunning) {
+            int s; ForkJoinPool p; DelayScheduler ds;
+            if ((s = trySetCancelled()) < 0)
+                return ((s & (ABNORMAL | THROWN)) == ABNORMAL);
+            if ((p = pool) != null &&
+                !interruptIfRunning(mayInterruptIfRunning)) {
+                pool = null;
+                runnable = null;
+                callable = null;
+                if (heapIndex >= 0 && nextPending == null &&
+                    (ds = p.delayScheduler) != null)
+                    ds.pend(this);      // for heap cleanup
+            }
+            return true;
+        }
+
+
+        // ScheduledFuture methods
+        public final long getDelay(TimeUnit unit) {
+            return unit.convert(when - DelayScheduler.now(), NANOSECONDS);
+        }
+        public int compareTo(Delayed other) { // never used internally
+            long diff = (other instanceof ScheduledForkJoinTask<?> t) ?
+                when - t.when : // avoid nanoTime calls and conversions
+                getDelay(NANOSECONDS) - other.getDelay(NANOSECONDS);
+            return (diff < 0) ? -1 : (diff > 0) ? 1 : 0;
+        }
+    }
+
+}
+
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 61e9f0e3ffa..ec46f61291d 100644
--- a/src/java.base/share/classes/java/util/concurrent/ForkJoinPool.java
+++ b/src/java.base/share/classes/java/util/concurrent/ForkJoinPool.java
@@ -42,6 +42,7 @@ import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
 import java.util.Objects;
+import java.util.function.Consumer;
 import java.util.function.Predicate;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.locks.LockSupport;
@@ -50,6 +51,7 @@ import jdk.internal.access.JavaUtilConcurrentFJPAccess;
 import jdk.internal.access.SharedSecrets;
 import jdk.internal.misc.Unsafe;
 import jdk.internal.vm.SharedThreadContainer;
+import static java.util.concurrent.DelayScheduler.ScheduledForkJoinTask;
 
 /**
  * An {@link ExecutorService} for running {@link ForkJoinTask}s.
@@ -133,11 +135,34 @@ import jdk.internal.vm.SharedThreadContainer;
  *  </tr>
  * </table>
  *
+ * <p>Additionally, this class supports {@link
+ * ScheduledExecutorService} methods to delay or periodically execute
+ * tasks, as well as method {@link #submitWithTimeout} to cancel tasks
+ * that take too long. The scheduled functions or actions may create
+ * and invoke other {@linkplain ForkJoinTask ForkJoinTasks}. Delayed
+ * actions become <em>enabled</em> and behave as ordinary submitted
+ * tasks when their delays elapse.  Scheduling methods return
+ * {@linkplain ForkJoinTask ForkJoinTasks} that implement the {@link
+ * ScheduledFuture} interface. Resource exhaustion encountered after
+ * initial submission results in task cancellation. When time-based
+ * methods are used, shutdown policies match the default policies of
+ * class {@link ScheduledThreadPoolExecutor}: upon {@link #shutdown},
+ * existing periodic tasks will not re-execute, and the pool
+ * terminates when quiescent and existing delayed tasks
+ * complete. Method {@link #cancelDelayedTasksOnShutdown} may be used
+ * to disable all delayed tasks upon shutdown, and method {@link
+ * #shutdownNow} may be used to instead unconditionally initiate pool
+ * termination. Monitoring methods such as {@link #getQueuedTaskCount}
+ * do not include scheduled tasks that are not yet enabled to execute,
+ * which are reported separately by method {@link
+ * #getDelayedTaskCount}.
+ *
  * <p>The parameters used to construct the common pool may be controlled by
  * setting the following {@linkplain System#getProperty system properties}:
  * <ul>
  * <li>{@systemProperty java.util.concurrent.ForkJoinPool.common.parallelism}
- * - the parallelism level, a non-negative integer
+ * - the parallelism level, a non-negative integer. Usage is discouraged.
+ *   Use {@link #setParallelism} instead.
  * <li>{@systemProperty java.util.concurrent.ForkJoinPool.common.threadFactory}
  * - the class name of a {@link ForkJoinWorkerThreadFactory}.
  * The {@linkplain ClassLoader#getSystemClassLoader() system class loader}
@@ -155,10 +180,11 @@ import jdk.internal.vm.SharedThreadContainer;
  * {@linkplain Thread#getContextClassLoader() thread context class loader}.
  *
  * Upon any error in establishing these settings, default parameters
- * are used. It is possible to disable or limit the use of threads in
- * the common pool by setting the parallelism property to zero, and/or
- * using a factory that may return {@code null}. However doing so may
- * cause unjoined tasks to never be executed.
+ * are used. It is possible to disable use of threads by using a
+ * factory that may return {@code null}, in which case some tasks may
+ * never execute. While possible, it is strongly discouraged to set
+ * the parallelism property to zero, which may be internally
+ * overridden in the presence of intrinsically async tasks.
  *
  * @implNote This implementation restricts the maximum number of
  * running threads to 32767. Attempts to create pools with greater
@@ -171,7 +197,8 @@ import jdk.internal.vm.SharedThreadContainer;
  * @since 1.7
  * @author Doug Lea
  */
-public class ForkJoinPool extends AbstractExecutorService {
+public class ForkJoinPool extends AbstractExecutorService
+    implements ScheduledExecutorService {
 
     /*
      * Implementation Overview
@@ -215,6 +242,7 @@ public class ForkJoinPool extends AbstractExecutorService {
      * 3. Completion-based tasks (mainly CountedCompleters)
      * 4. CommonPool and parallelStream support
      * 5. InterruptibleTasks for externally submitted tasks
+     * 6. Support ScheduledExecutorService methods
      *
      * Most changes involve adaptions of base algorithms using
      * combinations of static and dynamic bitwise mode settings (both
@@ -359,18 +387,18 @@ public class ForkJoinPool extends AbstractExecutorService {
      * WorkQueues are also used in a similar way for tasks submitted
      * to the pool. We cannot mix these tasks in the same queues used
      * by workers. Instead, we randomly associate submission queues
-     * with submitting threads, using a form of hashing.  The
-     * ThreadLocalRandom probe value serves as a hash code for
-     * choosing existing queues, and may be randomly repositioned upon
-     * contention with other submitters.  In essence, submitters act
-     * like workers except that they are restricted to executing local
-     * tasks that they submitted (or when known, subtasks thereof).
-     * Insertion of tasks in shared mode requires a lock. We use only
-     * a simple spinlock (as one role of field "phase") because
-     * submitters encountering a busy queue move to a different
-     * position to use or create other queues.  They (spin) block when
-     * registering new queues, or indirectly elsewhere, by revisiting
-     * later.
+     * with submitting threads (or carriers when using VirtualThreads)
+     * using a form of hashing.  The ThreadLocalRandom probe value
+     * serves as a hash code for choosing existing queues, and may be
+     * randomly repositioned upon contention with other submitters.
+     * In essence, submitters act like workers except that they are
+     * restricted to executing local tasks that they submitted (or
+     * when known, subtasks thereof).  Insertion of tasks in shared
+     * mode requires a lock. We use only a simple spinlock (as one
+     * role of field "phase") because submitters encountering a busy
+     * queue move to a different position to use or create other
+     * queues.  They (spin) block when registering new queues, or
+     * indirectly elsewhere, by revisiting later.
      *
      * Management
      * ==========
@@ -826,7 +854,13 @@ public class ForkJoinPool extends AbstractExecutorService {
      * fashion or use CountedCompleters (as is true for jdk
      * parallelStreams). Support infiltrates several methods,
      * including those that retry helping steps until we are sure that
-     * none apply if there are no workers.
+     * none apply if there are no workers. To deal with conflicting
+     * requirements, uses of the commonPool that require async because
+     * caller-runs need not apply, ensure threads are enabled (by
+     * setting parallelism) via method asyncCommonPool before
+     * proceeding. (In principle, overriding zero parallelism needs to
+     * ensure at least one worker, but due to other backward
+     * compatibility contraints, ensures two.)
      *
      * As a more appropriate default in managed environments, unless
      * overridden by system properties, we use workers of subclass
@@ -851,7 +885,8 @@ public class ForkJoinPool extends AbstractExecutorService {
      * To comply with ExecutorService specs, we use subclasses of
      * abstract class InterruptibleTask for tasks that require
      * stronger interruption and cancellation guarantees.  External
-     * submitters never run these tasks, even if in the common pool.
+     * submitters never run these tasks, even if in the common pool
+     * (as indicated by ForkJoinTask.noUserHelp status bit).
      * InterruptibleTasks include a "runner" field (implemented
      * similarly to FutureTask) to support cancel(true).  Upon pool
      * shutdown, runners are interrupted so they can cancel. Since
@@ -880,6 +915,27 @@ public class ForkJoinPool extends AbstractExecutorService {
      * writing, virtual thread bodies are by default run as some form
      * of InterruptibleTask.
      *
+     * DelayScheduler
+     * ================
+     *
+     * This class supports ScheduledExecutorService methods by
+     * creating and starting a DelayScheduler on first use of these
+     * methods (via startDelayScheduler). The scheduler operates
+     * independently in its own thread, relaying tasks to the pool to
+     * execute when their delays elapse (see method
+     * executeEnabledScheduledTask).  The only other interactions with
+     * the delayScheduler are to control shutdown and maintain
+     * shutdown-related policies in methods quiescent() and
+     * tryTerminate(). In particular, processing must deal with cases
+     * in which tasks are submitted before shutdown, but not enabled
+     * until afterwards, in which case they must bypass some screening
+     * to be allowed to run. Conversely, the DelayScheduler checks
+     * runState status and when enabled, completes termination, using
+     * only methods shutdownStatus and tryStopIfShutdown. All of these
+     * methods are final and have signatures referencing
+     * DelaySchedulers, so cannot conflict with those of any existing
+     * FJP subclasses.
+     *
      * Memory placement
      * ================
      *
@@ -950,7 +1006,9 @@ public class ForkJoinPool extends AbstractExecutorService {
      * Nearly all explicit checks lead to bypass/return, not exception
      * throws, because they may legitimately arise during shutdown. A
      * few unusual loop constructions encourage (with varying
-     * effectiveness) JVMs about where (not) to place safepoints.
+     * effectiveness) JVMs about where (not) to place safepoints. All
+     * public methods screen arguments (mainly null checks) before
+     * creating or executing tasks.
      *
      * There is a lot of representation-level coupling among classes
      * ForkJoinPool, ForkJoinWorkerThread, and ForkJoinTask.  The
@@ -1045,6 +1103,7 @@ public class ForkJoinPool extends AbstractExecutorService {
     static final int DROPPED          = 1 << 16;  // removed from ctl counts
     static final int UNCOMPENSATE     = 1 << 16;  // tryCompensate return
     static final int IDLE             = 1 << 16;  // phase seqlock/version count
+    static final int MIN_QUEUES_SIZE  = 1 << 4;   // ensure external slots
 
     /*
      * Bits and masks for ctl and bounds are packed with 4 16 bit subfields:
@@ -1214,7 +1273,7 @@ public class ForkJoinPool extends AbstractExecutorService {
         /**
          * Pushes a task. Called only by owner or if already locked
          *
-         * @param task the task. Caller must ensure non-null.
+         * @param task the task; no-op if null
          * @param pool the pool to signal if was previously empty, else null
          * @param internal if caller owns this queue
          * @throws RejectedExecutionException if array could not be resized
@@ -1222,7 +1281,9 @@ public class ForkJoinPool extends AbstractExecutorService {
         final void push(ForkJoinTask<?> task, ForkJoinPool pool,
                         boolean internal) {
             int s = top, b = base, m, cap, room; ForkJoinTask<?>[] a;
-            if ((a = array) != null && (cap = a.length) > 0) { // else disabled
+            if ((a = array) != null && (cap = a.length) > 0 && // else disabled
+                task != null) {
+                int pk = task.noUserHelp() + 1;             // prev slot offset
                 if ((room = (m = cap - 1) - (s - b)) >= 0) {
                     top = s + 1;
                     long pos = slotOffset(m & s);
@@ -1237,10 +1298,7 @@ public class ForkJoinPool extends AbstractExecutorService {
                     unlockPhase();
                 if (room < 0)
                     throw new RejectedExecutionException("Queue capacity exceeded");
-                if ((room == 0 ||        // pad for InterruptibleTasks
-                     a[m & (s - ((internal || task == null ||
-                                  task.getClass().getSuperclass() !=
-                                  interruptibleTaskClass) ? 1 : 2))] == null) &&
+                if ((room == 0 || a[m & (s - pk)] == null) &&
                     pool != null)
                     pool.signalWork();   // may have appeared empty
             }
@@ -1579,11 +1637,6 @@ public class ForkJoinPool extends AbstractExecutorService {
      */
     static volatile RuntimePermission modifyThreadPermission;
 
-    /**
-     * Cached for faster type tests.
-     */
-    static final Class<?> interruptibleTaskClass;
-
     /**
      * For VirtualThread intrinsics
      */
@@ -1596,12 +1649,15 @@ public class ForkJoinPool extends AbstractExecutorService {
     final UncaughtExceptionHandler ueh;  // per-worker UEH
     final SharedThreadContainer container;
     final String workerNamePrefix;       // null for common pool
+    final String poolName;
+    volatile DelayScheduler delayScheduler;  // lazily constructed
     WorkQueue[] queues;                  // main registry
     volatile long runState;              // versioned, lockable
     final long keepAlive;                // milliseconds before dropping if idle
     final long config;                   // static configuration bits
     volatile long stealCount;            // collects worker nsteals
     volatile long threadIds;             // for worker thread names
+
     @jdk.internal.vm.annotation.Contended("fjpctl") // segregate
     volatile long ctl;                   // main pool control
     @jdk.internal.vm.annotation.Contended("fjpctl") // colocate
@@ -1885,6 +1941,7 @@ public class ForkJoinPool extends AbstractExecutorService {
             long phaseSum = 0L;
             boolean swept = false;
             for (long e, prevRunState = 0L; ; prevRunState = e) {
+                DelayScheduler ds;
                 long c = ctl;
                 if (((e = runState) & STOP) != 0L)
                     return 1;                             // terminating
@@ -1907,6 +1964,8 @@ public class ForkJoinPool extends AbstractExecutorService {
                 }
                 else if ((e & SHUTDOWN) == 0)
                     return 0;
+                else if ((ds = delayScheduler) != null && !ds.canShutDown())
+                    return 0;
                 else if (compareAndSetCtl(c, c) && casRunState(e, e | STOP))
                     return 1;                             // enable termination
                 else
@@ -1957,15 +2016,13 @@ public class ForkJoinPool extends AbstractExecutorService {
                             }
                             else {
                                 boolean propagate;
-                                int nb = q.base = b + 1;
+                                int nb = q.base = b + 1, prevSrc = src;
                                 w.nsteals = ++nsteals;
-                                w.source = j;             // volatile
+                                w.source = src = j;       // volatile
                                 rescan = true;
+                                int nh = t.noUserHelp();
                                 if (propagate =
-                                    ((src != (src = j) ||
-                                      t.getClass().getSuperclass() ==
-                                      interruptibleTaskClass) &&
-                                     a[nb & m] != null))
+                                    (prevSrc != src || nh != 0) && a[nb & m] != null)
                                     signalWork();
                                 w.topLevelExec(t, fifo);
                                 if ((b = q.base) != nb && !propagate)
@@ -2004,8 +2061,8 @@ public class ForkJoinPool extends AbstractExecutorService {
             ((e & SHUTDOWN) != 0L && ac == 0 && quiescent() > 0) ||
             (qs = queues) == null || (n = qs.length) <= 0)
             return IDLE;                      // terminating
-        int prechecks = Math.min(ac, 2);      // reactivation threshold
-        for (int k = Math.max(n << 2, SPIN_WAITS << 1);;) {
+        int k = Math.max(n << 2, SPIN_WAITS << 1);
+        for (int prechecks = k / n;;) {       // reactivation threshold
             WorkQueue q; int cap; ForkJoinTask<?>[] a; long c;
             if (w.phase == activePhase)
                 return activePhase;
@@ -2014,7 +2071,7 @@ public class ForkJoinPool extends AbstractExecutorService {
             if ((q = qs[k & (n - 1)]) == null)
                 Thread.onSpinWait();
             else if ((a = q.array) != null && (cap = a.length) > 0 &&
-                     a[q.base & (cap - 1)] != null && --prechecks < 0 &&
+                     a[q.base & (cap - 1)] != null && --prechecks <= 0 &&
                      (int)(c = ctl) == activePhase &&
                      compareAndSetCtl(c, (sp & LMASK) | ((c + RC_UNIT) & UMASK)))
                 return w.phase = activePhase; // reactivate
@@ -2513,37 +2570,45 @@ public class ForkJoinPool extends AbstractExecutorService {
      * Finds and locks a WorkQueue for an external submitter, or
      * throws RejectedExecutionException if shutdown or terminating.
      * @param r current ThreadLocalRandom.getProbe() value
-     * @param isSubmit false if this is for a common pool fork
+     * @param rejectOnShutdown true if RejectedExecutionException
+     *        should be thrown when shutdown (else only if terminating)
      */
-    private WorkQueue submissionQueue(int r) {
-        if (r == 0) {
+    private WorkQueue submissionQueue(int r, boolean rejectOnShutdown) {
+        int reuse;                                   // nonzero if prefer create
+        if ((reuse = r) == 0) {
             ThreadLocalRandom.localInit();           // initialize caller's probe
             r = ThreadLocalRandom.getProbe();
         }
-        for (;;) {
-            int n, i, id; WorkQueue[] qs; WorkQueue q, w = null;
+        for (int probes = 0; ; ++probes) {
+            int n, i, id; WorkQueue[] qs; WorkQueue q;
             if ((qs = queues) == null)
                 break;
             if ((n = qs.length) <= 0)
                 break;
             if ((q = qs[i = (id = r & EXTERNAL_ID_MASK) & (n - 1)]) == null) {
-                if (w == null)
-                    w = new WorkQueue(null, id, 0, false);
+                WorkQueue w = new WorkQueue(null, id, 0, false);
                 w.phase = id;
-                long isShutdown = lockRunState() & SHUTDOWN;
-                if (isShutdown == 0L && queues == qs && qs[i] == null) {
-                    q = qs[i] = w;                   // else retry
-                    w = null;
-                }
+                boolean reject = ((lockRunState() & SHUTDOWN) != 0 &&
+                                  rejectOnShutdown);
+                if (!reject && queues == qs && qs[i] == null)
+                    q = qs[i] = w;                   // else lost race to install
                 unlockRunState();
                 if (q != null)
                     return q;
-                if (isShutdown != 0L)
+                if (reject)
                     break;
+                reuse = 0;
             }
-            else if (!q.tryLockPhase())              // move index
+            if (reuse == 0 || !q.tryLockPhase()) {   // move index
+                if (reuse == 0) {
+                    if (probes >= n >> 1)
+                        reuse = r;                   // stop prefering free slot
+                }
+                else if (q != null)
+                    reuse = 0;                       // probe on collision
                 r = ThreadLocalRandom.advanceProbe(r);
-            else if ((runState & SHUTDOWN) != 0L) {
+            }
+            else if (rejectOnShutdown && (runState & SHUTDOWN) != 0L) {
                 q.unlockPhase();                     // check while q lock held
                 break;
             }
@@ -2553,7 +2618,7 @@ public class ForkJoinPool extends AbstractExecutorService {
         throw new RejectedExecutionException();
     }
 
-    private void poolSubmit(boolean signalIfEmpty, ForkJoinTask<?> task) {
+    private <T> ForkJoinTask<T> poolSubmit(boolean signalIfEmpty, ForkJoinTask<T> task) {
         Thread t; ForkJoinWorkerThread wt; WorkQueue q; boolean internal;
         if (((t = JLA.currentCarrierThread()) instanceof ForkJoinWorkerThread) &&
             (wt = (ForkJoinWorkerThread)t).pool == this) {
@@ -2562,21 +2627,22 @@ public class ForkJoinPool extends AbstractExecutorService {
         }
         else {                     // find and lock queue
             internal = false;
-            q = submissionQueue(ThreadLocalRandom.getProbe());
+            q = submissionQueue(ThreadLocalRandom.getProbe(), true);
         }
         q.push(task, signalIfEmpty ? this : null, internal);
+        return task;
     }
 
     /**
      * Returns queue for an external submission, bypassing call to
      * submissionQueue if already established and unlocked.
      */
-    final WorkQueue externalSubmissionQueue() {
+    final WorkQueue externalSubmissionQueue(boolean rejectOnShutdown) {
         WorkQueue[] qs; WorkQueue q; int n;
         int r = ThreadLocalRandom.getProbe();
         return (((qs = queues) != null && (n = qs.length) > 0 &&
                  (q = qs[r & EXTERNAL_ID_MASK & (n - 1)]) != null && r != 0 &&
-                 q.tryLockPhase()) ? q : submissionQueue(r));
+                 q.tryLockPhase()) ? q : submissionQueue(r, rejectOnShutdown));
     }
 
     /**
@@ -2700,14 +2766,20 @@ public class ForkJoinPool extends AbstractExecutorService {
             }
         }
         else if ((isShutdown = (e & SHUTDOWN)) != 0L || enable) {
+            long quiet; DelayScheduler ds;
             if (isShutdown == 0L)
                 getAndBitwiseOrRunState(SHUTDOWN);
-            if (quiescent() > 0)
+            if ((quiet = quiescent()) > 0)
                 now = true;
+            else if (quiet == 0 && (ds = delayScheduler) != null)
+                ds.signal();
         }
 
         if (now) {
+            DelayScheduler ds;
             releaseWaiters();
+            if ((ds = delayScheduler) != null)
+                ds.signal();
             for (;;) {
                 if (((e = runState) & CLEANED) == 0L) {
                     boolean clean = cleanQueues();
@@ -2718,6 +2790,8 @@ public class ForkJoinPool extends AbstractExecutorService {
                     break;
                 if (ctl != 0L) // else loop if didn't finish cleaning
                     break;
+                if ((ds = delayScheduler) != null && ds.signal() >= 0)
+                    break;
                 if ((e & CLEANED) != 0L) {
                     e |= TERMINATED;
                     if ((getAndBitwiseOrRunState(TERMINATED) & TERMINATED) == 0L) {
@@ -2888,12 +2962,9 @@ public class ForkJoinPool extends AbstractExecutorService {
      * event-style asynchronous tasks.  For default value, use {@code
      * false}.
      *
-     * @param corePoolSize the number of threads to keep in the pool
-     * (unless timed out after an elapsed keep-alive). Normally (and
-     * by default) this is the same value as the parallelism level,
-     * but may be set to a larger value to reduce dynamic overhead if
-     * tasks regularly block. Using a smaller value (for example
-     * {@code 0}) has the same effect as the default.
+     * @param corePoolSize ignored: used in previous releases of this
+     * class but no longer applicable. Using {@code 0} maintains
+     * compatibility across releases.
      *
      * @param maximumPoolSize the maximum number of threads allowed.
      * When the maximum is reached, attempts to replace blocked
@@ -2957,7 +3028,8 @@ public class ForkJoinPool extends AbstractExecutorService {
             throw new IllegalArgumentException();
         if (factory == null || unit == null)
             throw new NullPointerException();
-        int size = 1 << (33 - Integer.numberOfLeadingZeros(p - 1));
+        int size = Math.max(MIN_QUEUES_SIZE,
+                            1 << (33 - Integer.numberOfLeadingZeros(p - 1)));
         this.parallelism = p;
         this.factory = factory;
         this.ueh = handler;
@@ -2971,6 +3043,7 @@ public class ForkJoinPool extends AbstractExecutorService {
         this.queues = new WorkQueue[size];
         String pid = Integer.toString(getAndAddPoolIds(1) + 1);
         String name = "ForkJoinPool-" + pid;
+        this.poolName = name;
         this.workerNamePrefix = name + "-worker-";
         this.container = SharedThreadContainer.create(name);
     }
@@ -2980,6 +3053,7 @@ public class ForkJoinPool extends AbstractExecutorService {
      * overridden by system properties
      */
     private ForkJoinPool(byte forCommonPoolOnly) {
+        String name = "ForkJoinPool.commonPool";
         ForkJoinWorkerThreadFactory fac = defaultForkJoinWorkerThreadFactory;
         UncaughtExceptionHandler handler = null;
         int maxSpares = DEFAULT_COMMON_MAX_SPARES;
@@ -3013,7 +3087,9 @@ public class ForkJoinPool extends AbstractExecutorService {
         if (preset == 0)
             pc = Math.max(1, Runtime.getRuntime().availableProcessors() - 1);
         int p = Math.min(pc, MAX_CAP);
-        int size = (p == 0) ? 1 : 1 << (33 - Integer.numberOfLeadingZeros(p-1));
+        int size = Math.max(MIN_QUEUES_SIZE,
+                            (p == 0) ? 1 :
+                            1 << (33 - Integer.numberOfLeadingZeros(p-1)));
         this.parallelism = p;
         this.config = ((preset & LMASK) | (((long)maxSpares) << TC_SHIFT) |
                        (1L << RC_SHIFT));
@@ -3022,8 +3098,9 @@ public class ForkJoinPool extends AbstractExecutorService {
         this.keepAlive = DEFAULT_KEEPALIVE;
         this.saturate = null;
         this.workerNamePrefix = null;
+        this.poolName = name;
         this.queues = new WorkQueue[size];
-        this.container = SharedThreadContainer.create("ForkJoinPool.commonPool");
+        this.container = SharedThreadContainer.create(name);
     }
 
     /**
@@ -3044,6 +3121,16 @@ public class ForkJoinPool extends AbstractExecutorService {
         return common;
     }
 
+    /**
+     * Package-private access to commonPool overriding zero parallelism
+     */
+    static ForkJoinPool asyncCommonPool() {
+        ForkJoinPool cp; int p;
+        if ((p = (cp = common).parallelism) == 0)
+            U.compareAndSetInt(cp, PARALLELISM, 0, 2);
+        return cp;
+    }
+
     // Execution methods
 
     /**
@@ -3064,8 +3151,7 @@ public class ForkJoinPool extends AbstractExecutorService {
      *         scheduled for execution
      */
     public <T> T invoke(ForkJoinTask<T> task) {
-        Objects.requireNonNull(task);
-        poolSubmit(true, task);
+        poolSubmit(true, Objects.requireNonNull(task));
         try {
             return task.join();
         } catch (RuntimeException | Error unchecked) {
@@ -3084,8 +3170,7 @@ public class ForkJoinPool extends AbstractExecutorService {
      *         scheduled for execution
      */
     public void execute(ForkJoinTask<?> task) {
-        Objects.requireNonNull(task);
-        poolSubmit(true, task);
+        poolSubmit(true,  Objects.requireNonNull(task));
     }
 
     // AbstractExecutorService methods
@@ -3098,7 +3183,7 @@ public class ForkJoinPool extends AbstractExecutorService {
     @Override
     @SuppressWarnings("unchecked")
     public void execute(Runnable task) {
-        poolSubmit(true, (task instanceof ForkJoinTask<?>)
+        poolSubmit(true, (Objects.requireNonNull(task) instanceof ForkJoinTask<?>)
                    ? (ForkJoinTask<Void>) task // avoid re-wrap
                    : new ForkJoinTask.RunnableExecuteAction(task));
     }
@@ -3118,9 +3203,7 @@ public class ForkJoinPool extends AbstractExecutorService {
      *         scheduled for execution
      */
     public <T> ForkJoinTask<T> submit(ForkJoinTask<T> task) {
-        Objects.requireNonNull(task);
-        poolSubmit(true, task);
-        return task;
+        return poolSubmit(true,  Objects.requireNonNull(task));
     }
 
     /**
@@ -3130,12 +3213,12 @@ public class ForkJoinPool extends AbstractExecutorService {
      */
     @Override
     public <T> ForkJoinTask<T> submit(Callable<T> task) {
-        ForkJoinTask<T> t =
+        Objects.requireNonNull(task);
+        return poolSubmit(
+            true,
             (Thread.currentThread() instanceof ForkJoinWorkerThread) ?
             new ForkJoinTask.AdaptedCallable<T>(task) :
-            new ForkJoinTask.AdaptedInterruptibleCallable<T>(task);
-        poolSubmit(true, t);
-        return t;
+            new ForkJoinTask.AdaptedInterruptibleCallable<T>(task));
     }
 
     /**
@@ -3145,12 +3228,12 @@ public class ForkJoinPool extends AbstractExecutorService {
      */
     @Override
     public <T> ForkJoinTask<T> submit(Runnable task, T result) {
-        ForkJoinTask<T> t =
+        Objects.requireNonNull(task);
+        return poolSubmit(
+            true,
             (Thread.currentThread() instanceof ForkJoinWorkerThread) ?
             new ForkJoinTask.AdaptedRunnable<T>(task, result) :
-            new ForkJoinTask.AdaptedInterruptibleRunnable<T>(task, result);
-        poolSubmit(true, t);
-        return t;
+            new ForkJoinTask.AdaptedInterruptibleRunnable<T>(task, result));
     }
 
     /**
@@ -3161,13 +3244,14 @@ public class ForkJoinPool extends AbstractExecutorService {
     @Override
     @SuppressWarnings("unchecked")
     public ForkJoinTask<?> submit(Runnable task) {
-        ForkJoinTask<?> f = (task instanceof ForkJoinTask<?>) ?
+        Objects.requireNonNull(task);
+        return poolSubmit(
+            true,
+            (task instanceof ForkJoinTask<?>) ?
             (ForkJoinTask<Void>) task : // avoid re-wrap
             ((Thread.currentThread() instanceof ForkJoinWorkerThread) ?
              new ForkJoinTask.AdaptedRunnable<Void>(task, null) :
-             new ForkJoinTask.AdaptedInterruptibleRunnable<Void>(task, null));
-        poolSubmit(true, f);
-        return f;
+             new ForkJoinTask.AdaptedInterruptibleRunnable<Void>(task, null)));
     }
 
     /**
@@ -3189,7 +3273,7 @@ public class ForkJoinPool extends AbstractExecutorService {
      */
     public <T> ForkJoinTask<T> externalSubmit(ForkJoinTask<T> task) {
         Objects.requireNonNull(task);
-        externalSubmissionQueue().push(task, this, false);
+        externalSubmissionQueue(true).push(task, this, false);
         return task;
     }
 
@@ -3210,9 +3294,7 @@ public class ForkJoinPool extends AbstractExecutorService {
      * @since 19
      */
     public <T> ForkJoinTask<T> lazySubmit(ForkJoinTask<T> task) {
-        Objects.requireNonNull(task);
-        poolSubmit(false, task);
-        return task;
+        return poolSubmit(false,  Objects.requireNonNull(task));
     }
 
     /**
@@ -3350,6 +3432,322 @@ public class ForkJoinPool extends AbstractExecutorService {
             .invokeAny(tasks, this, true, unit.toNanos(timeout));
     }
 
+    // Support for delayed tasks
+
+    /**
+     * Returns STOP and SHUTDOWN status (zero if neither), masking or
+     * truncating out other bits.
+     */
+    final int shutdownStatus(DelayScheduler ds) {
+        return (int)(runState & (SHUTDOWN | STOP));
+    }
+
+    /**
+     * Tries to stop and possibly terminate if already enabled, return success.
+     */
+    final boolean tryStopIfShutdown(DelayScheduler ds) {
+        return (tryTerminate(false, false) & STOP) != 0L;
+    }
+
+    /**
+     *  Creates and starts DelayScheduler
+     */
+    private DelayScheduler startDelayScheduler() {
+        DelayScheduler ds;
+        if ((ds = delayScheduler) == null) {
+            boolean start = false;
+            String name = poolName + "-delayScheduler";
+            if (workerNamePrefix == null)
+                asyncCommonPool();  // override common parallelism zero
+            lockRunState();
+            try {
+                if ((ds = delayScheduler) == null) {
+                    ds = delayScheduler = new DelayScheduler(this, name);
+                    start = true;
+                }
+            } finally {
+                unlockRunState();
+            }
+            if (start) { // start outside of lock
+                // exceptions on start passed to (external) callers
+                SharedThreadContainer ctr;
+                if ((ctr = container) != null)
+                    ctr.start(ds);
+                else
+                    ds.start();
+            }
+        }
+        return ds;
+    }
+
+    /**
+     * Arranges execution of a ScheduledForkJoinTask whose delay has
+     * elapsed
+     */
+    final void executeEnabledScheduledTask(ScheduledForkJoinTask<?> task) {
+        externalSubmissionQueue(false).push(task, this, false);
+    }
+
+    /**
+     * Arranges delayed execution of a ScheduledForkJoinTask via the
+     * DelayScheduler, creating and starting it if necessary.
+     * @return the task
+     */
+    final <T> ScheduledForkJoinTask<T> scheduleDelayedTask(ScheduledForkJoinTask<T> task) {
+        DelayScheduler ds;
+        if (((ds = delayScheduler) == null &&
+             (ds = startDelayScheduler()) == null) ||
+            (runState & SHUTDOWN) != 0L)
+            throw new RejectedExecutionException();
+        ds.pend(task);
+        return task;
+    }
+
+    /**
+     * Submits a one-shot task that becomes enabled after the given
+     * delay.  At that point it will execute unless explicitly
+     * cancelled, or fail to execute (eventually reporting
+     * cancellation) when encountering resource exhaustion, or the
+     * pool is {@link #shutdownNow}, or is {@link #shutdown} when
+     * otherwise quiescent and {@link #cancelDelayedTasksOnShutdown}
+     * is in effect.
+     *
+     * @param command the task to execute
+     * @param delay the time from now to delay execution
+     * @param unit the time unit of the delay parameter
+     * @return a ForkJoinTask implementing the ScheduledFuture
+     *         interface, whose {@code get()} method will return
+     *         {@code null} upon normal completion.
+     * @throws RejectedExecutionException if the pool is shutdown or
+     *         submission encounters resource exhaustion.
+     * @throws NullPointerException if command or unit is null
+     * @since 25
+     */
+    public ScheduledFuture<?> schedule(Runnable command,
+                                       long delay, TimeUnit unit) {
+        return scheduleDelayedTask(
+            new ScheduledForkJoinTask<Void>(
+                unit.toNanos(delay), 0L, false, // implicit null check of unit
+                Objects.requireNonNull(command), null, this));
+    }
+
+    /**
+     * Submits a value-returning one-shot task that becomes enabled
+     * after the given delay. At that point it will execute unless
+     * explicitly cancelled, or fail to execute (eventually reporting
+     * cancellation) when encountering resource exhaustion, or the
+     * pool is {@link #shutdownNow}, or is {@link #shutdown} when
+     * otherwise quiescent and {@link #cancelDelayedTasksOnShutdown}
+     * is in effect.
+     *
+     * @param callable the function to execute
+     * @param delay the time from now to delay execution
+     * @param unit the time unit of the delay parameter
+     * @param <V> the type of the callable's result
+     * @return a ForkJoinTask implementing the ScheduledFuture
+     *         interface, whose {@code get()} method will return the
+     *         value from the callable upon normal completion.
+     * @throws RejectedExecutionException if the pool is shutdown or
+     *         submission encounters resource exhaustion.
+     * @throws NullPointerException if command or unit is null
+     * @since 25
+     */
+    public <V> ScheduledFuture<V> schedule(Callable<V> callable,
+                                           long delay, TimeUnit unit) {
+        return scheduleDelayedTask(
+            new ScheduledForkJoinTask<V>(
+                unit.toNanos(delay), 0L, false, null,  // implicit null check of unit
+                Objects.requireNonNull(callable), this));
+    }
+
+    /**
+     * Submits a periodic action that becomes enabled first after the
+     * given initial delay, and subsequently with the given period;
+     * that is, executions will commence after
+     * {@code initialDelay}, then {@code initialDelay + period}, then
+     * {@code initialDelay + 2 * period}, and so on.
+     *
+     * <p>The sequence of task executions continues indefinitely until
+     * one of the following exceptional completions occur:
+     * <ul>
+     * <li>The task is {@linkplain Future#cancel explicitly cancelled}
+     * <li>Method {@link #shutdownNow} is called
+     * <li>Method {@link #shutdown} is called and the pool is
+     * otherwise quiescent, in which case existing executions continue
+     * but subsequent executions do not.
+     * <li>An execution or the task encounters resource exhaustion.
+     * <li>An execution of the task throws an exception.  In this case
+     * calling {@link Future#get() get} on the returned future will throw
+     * {@link ExecutionException}, holding the exception as its cause.
+     * </ul>
+     * Subsequent executions are suppressed.  Subsequent calls to
+     * {@link Future#isDone isDone()} on the returned future will
+     * return {@code true}.
+     *
+     * <p>If any execution of this task takes longer than its period, then
+     * subsequent executions may start late, but will not concurrently
+     * execute.
+     * @param command the task to execute
+     * @param initialDelay the time to delay first execution
+     * @param period the period between successive executions
+     * @param unit the time unit of the initialDelay and period parameters
+     * @return a ForkJoinTask implementing the ScheduledFuture
+     *         interface.  The future's {@link Future#get() get()}
+     *         method will never return normally, and will throw an
+     *         exception upon task cancellation or abnormal
+     *         termination of a task execution.
+     * @throws RejectedExecutionException if the pool is shutdown or
+     *         submission encounters resource exhaustion.
+     * @throws NullPointerException if command or unit is null
+     * @throws IllegalArgumentException if period less than or equal to zero
+     * @since 25
+     */
+    public ScheduledFuture<?> scheduleAtFixedRate(Runnable command,
+                                                  long initialDelay,
+                                                  long period, TimeUnit unit) {
+        if (period <= 0L)
+            throw new IllegalArgumentException();
+        return scheduleDelayedTask(
+            new ScheduledForkJoinTask<Void>(
+                unit.toNanos(initialDelay),  // implicit null check of unit
+                unit.toNanos(period), false,
+                Objects.requireNonNull(command), null, this));
+    }
+
+    /**
+     * Submits a periodic action that becomes enabled first after the
+     * given initial delay, and subsequently with the given delay
+     * between the termination of one execution and the commencement of
+     * the next.
+     * <p>The sequence of task executions continues indefinitely until
+     * one of the following exceptional completions occur:
+     * <ul>
+     * <li>The task is {@linkplain Future#cancel explicitly cancelled}
+     * <li>Method {@link #shutdownNow} is called
+     * <li>Method {@link #shutdown} is called and the pool is
+     * otherwise quiescent, in which case existing executions continue
+     * but subsequent executions do not.
+     * <li>An execution or the task encounters resource exhaustion.
+     * <li>An execution of the task throws an exception.  In this case
+     * calling {@link Future#get() get} on the returned future will throw
+     * {@link ExecutionException}, holding the exception as its cause.
+     * </ul>
+     * Subsequent executions are suppressed.  Subsequent calls to
+     * {@link Future#isDone isDone()} on the returned future will
+     * return {@code true}.
+     * @param command the task to execute
+     * @param initialDelay the time to delay first execution
+     * @param delay the delay between the termination of one
+     * execution and the commencement of the next
+     * @param unit the time unit of the initialDelay and delay parameters
+     * @return a ForkJoinTask implementing the ScheduledFuture
+     *         interface.  The future's {@link Future#get() get()}
+     *         method will never return normally, and will throw an
+     *         exception upon task cancellation or abnormal
+     *         termination of a task execution.
+     * @throws RejectedExecutionException if the pool is shutdown or
+     *         submission encounters resource exhaustion.
+     * @throws NullPointerException if command or unit is null
+     * @throws IllegalArgumentException if delay less than or equal to zero
+     * @since 25
+     */
+    public ScheduledFuture<?> scheduleWithFixedDelay(Runnable command,
+                                                     long initialDelay,
+                                                     long delay, TimeUnit unit) {
+        if (delay <= 0L)
+            throw new IllegalArgumentException();
+        return scheduleDelayedTask(
+            new ScheduledForkJoinTask<Void>(
+                unit.toNanos(initialDelay),  // implicit null check of unit
+                -unit.toNanos(delay), false, // negative for fixed delay
+                Objects.requireNonNull(command), null, this));
+    }
+
+    /**
+     * Body of a task performed on timeout of another task
+     */
+    static final class TimeoutAction<V> implements Runnable {
+        // set after construction, nulled after use
+        ForkJoinTask.CallableWithTimeout<V> task;
+        Consumer<? super ForkJoinTask<V>> action;
+        TimeoutAction(Consumer<? super ForkJoinTask<V>> action) {
+            this.action = action;
+        }
+        public void run() {
+            ForkJoinTask.CallableWithTimeout<V> t = task;
+            Consumer<? super ForkJoinTask<V>> a = action;
+            task = null;
+            action = null;
+            if (t != null && t.status >= 0) {
+                if (a == null)
+                    t.cancel(true);
+                else {
+                    a.accept(t);
+                    t.interruptIfRunning(true);
+                }
+            }
+        }
+    }
+
+    /**
+     * Submits a task executing the given function, cancelling the
+     * task or performing a given timeoutAction if not completed
+     * within the given timeout period. If the optional {@code
+     * timeoutAction} is null, the task is cancelled (via {@code
+     * cancel(true)}.  Otherwise, the action is applied and the task
+     * may be interrupted if running. Actions may include {@link
+     * ForkJoinTask#complete} to set a replacement value or {@link
+     * ForkJoinTask#completeExceptionally} to throw an appropriate
+     * exception. Note that these can succeed only if the task has
+     * not already completed when the timeoutAction executes.
+     *
+     * @param callable the function to execute
+     * @param <V> the type of the callable's result
+     * @param timeout the time to wait before cancelling if not completed
+     * @param timeoutAction if nonnull, an action to perform on
+     *        timeout, otherwise the default action is to cancel using
+     *        {@code cancel(true)}.
+     * @param unit the time unit of the timeout parameter
+     * @return a Future that can be used to extract result or cancel
+     * @throws RejectedExecutionException if the task cannot be
+     *         scheduled for execution
+     * @throws NullPointerException if callable or unit is null
+     * @since 25
+     */
+    public <V> ForkJoinTask<V> submitWithTimeout(Callable<V> callable,
+                                                 long timeout, TimeUnit unit,
+                                                 Consumer<? super ForkJoinTask<V>> timeoutAction) {
+        ForkJoinTask.CallableWithTimeout<V> task; TimeoutAction<V> onTimeout;
+        Objects.requireNonNull(callable);
+        ScheduledForkJoinTask<Void> timeoutTask =
+            new ScheduledForkJoinTask<Void>(
+                unit.toNanos(timeout), 0L, true,
+                onTimeout = new TimeoutAction<V>(timeoutAction), null, this);
+        onTimeout.task = task =
+            new ForkJoinTask.CallableWithTimeout<V>(callable, timeoutTask);
+        scheduleDelayedTask(timeoutTask);
+        return poolSubmit(true, task);
+    }
+
+    /**
+     * Arranges that scheduled tasks that are not executing and have
+     * not already been enabled for execution will not be executed and
+     * will be cancelled upon {@link #shutdown} (unless this pool is
+     * the {@link #commonPool()} which never shuts down). This method
+     * may be invoked either before {@link #shutdown} to take effect
+     * upon the next call, or afterwards to cancel such tasks, which
+     * may then allow termination. Note that subsequent executions of
+     * periodic tasks are always disabled upon shutdown, so this
+     * method applies meaningfully only to non-periodic tasks.
+     * @since 25
+     */
+    public void cancelDelayedTasksOnShutdown() {
+        DelayScheduler ds;
+        if ((ds = delayScheduler) != null ||
+            (ds = startDelayScheduler()) != null)
+            ds.cancelDelayedTasksOnShutdown();
+    }
+
     /**
      * Returns the factory used for constructing new workers.
      *
@@ -3485,14 +3883,16 @@ public class ForkJoinPool extends AbstractExecutorService {
      * to the pool that have not begun executing). This value is only
      * an approximation, obtained by iterating across all threads in
      * the pool. This method may be useful for tuning task
-     * granularities.
+     * granularities.The returned count does not include scheduled
+     * tasks that are not yet ready to execute, which are reported
+     * separately by method {@link getDelayedTaskCount}.
      *
      * @return the number of queued tasks
      * @see ForkJoinWorkerThread#getQueuedTaskCount()
      */
     public long getQueuedTaskCount() {
         WorkQueue[] qs; WorkQueue q;
-        int count = 0;
+        long count = 0;
         if ((runState & TERMINATED) == 0L && (qs = queues) != null) {
             for (int i = 1; i < qs.length; i += 2) {
                 if ((q = qs[i]) != null)
@@ -3521,6 +3921,20 @@ public class ForkJoinPool extends AbstractExecutorService {
         return count;
     }
 
+    /**
+     * Returns an estimate of the number of delayed (including
+     * periodic) tasks scheduled in this pool that are not yet ready
+     * to submit for execution. The returned value is inaccurate while
+     * delayed tasks are being processed.
+     *
+     * @return an estimate of the number of delayed tasks
+     * @since 25
+     */
+    public long getDelayedTaskCount() {
+        DelayScheduler ds;
+        return ((ds = delayScheduler) == null ? 0 : ds.lastStableSize());
+    }
+
     /**
      * Returns {@code true} if there are any tasks submitted to this
      * pool that have not yet begun executing.
@@ -3584,6 +3998,7 @@ public class ForkJoinPool extends AbstractExecutorService {
      */
     public String toString() {
         // Use a single pass through queues to collect counts
+        DelayScheduler ds;
         long e = runState;
         long st = stealCount;
         long qt = 0L, ss = 0L; int rc = 0;
@@ -3603,7 +4018,8 @@ public class ForkJoinPool extends AbstractExecutorService {
                 }
             }
         }
-
+        String delayed = ((ds = delayScheduler) == null ? "" :
+                          ", delayed = " + ds.lastStableSize());
         int pc = parallelism;
         long c = ctl;
         int tc = (short)(c >>> TC_SHIFT);
@@ -3623,6 +4039,7 @@ public class ForkJoinPool extends AbstractExecutorService {
             ", steals = " + st +
             ", tasks = " + qt +
             ", submissions = " + ss +
+            delayed +
             "]";
     }
 
@@ -3948,6 +4365,7 @@ public class ForkJoinPool extends AbstractExecutorService {
 
     @Override
     protected <T> RunnableFuture<T> newTaskFor(Runnable runnable, T value) {
+        Objects.requireNonNull(runnable);
         return (Thread.currentThread() instanceof ForkJoinWorkerThread) ?
             new ForkJoinTask.AdaptedRunnable<T>(runnable, value) :
             new ForkJoinTask.AdaptedInterruptibleRunnable<T>(runnable, value);
@@ -3955,6 +4373,7 @@ public class ForkJoinPool extends AbstractExecutorService {
 
     @Override
     protected <T> RunnableFuture<T> newTaskFor(Callable<T> callable) {
+        Objects.requireNonNull(callable);
         return (Thread.currentThread() instanceof ForkJoinWorkerThread) ?
             new ForkJoinTask.AdaptedCallable<T>(callable) :
             new ForkJoinTask.AdaptedInterruptibleCallable<T>(callable);
@@ -3982,7 +4401,6 @@ public class ForkJoinPool extends AbstractExecutorService {
         if ((scale & (scale - 1)) != 0)
             throw new Error("array index scale not a power of two");
 
-        interruptibleTaskClass = ForkJoinTask.InterruptibleTask.class;
         Class<?> dep = LockSupport.class; // ensure loaded
         // allow access to non-public methods
         JLA = SharedSecrets.getJavaLangAccess();
diff --git a/src/java.base/share/classes/java/util/concurrent/ForkJoinTask.java b/src/java.base/share/classes/java/util/concurrent/ForkJoinTask.java
index ec91e33975d..5f2dcb30d41 100644
--- a/src/java.base/share/classes/java/util/concurrent/ForkJoinTask.java
+++ b/src/java.base/share/classes/java/util/concurrent/ForkJoinTask.java
@@ -273,6 +273,8 @@ public abstract class ForkJoinTask<V> implements Future<V>, Serializable {
     static final int ABNORMAL       = 1 << 16;
     static final int THROWN         = 1 << 17;
     static final int HAVE_EXCEPTION = DONE | ABNORMAL | THROWN;
+    static final int NUH_BIT        = 24;      // no external caller helping
+    static final int NO_USER_HELP   = 1 << NUH_BIT;
     static final int MARKER         = 1 << 30; // utility marker
     static final int SMASK          = 0xffff;  // short bits for tags
     static final int UNCOMPENSATE   = 1 << 16; // helpJoin sentinel
@@ -292,6 +294,12 @@ public abstract class ForkJoinTask<V> implements Future<V>, Serializable {
     private boolean casStatus(int c, int v) {
         return U.compareAndSetInt(this, STATUS, c, v);
     }
+    final int noUserHelp() {     // nonvolatile read; return 0 or 1
+        return (U.getInt(this, STATUS) & NO_USER_HELP) >>> NUH_BIT;
+    }
+    final void setNoUserHelp() { // for use in constructors only
+        U.putInt(this, STATUS, NO_USER_HELP);
+    }
 
     // Support for waiting and signalling
 
@@ -330,14 +338,9 @@ public abstract class ForkJoinTask<V> implements Future<V>, Serializable {
      */
     final int trySetCancelled() {
         int s;
-        for (;;) {
-            if ((s = status) < 0)
-                break;
-            if (casStatus(s, s | (DONE | ABNORMAL))) {
-                signalWaiters();
-                break;
-            }
-        }
+        if ((s = status) >= 0 &&
+            (s = getAndBitwiseOrStatus(DONE | ABNORMAL)) >= 0)
+            signalWaiters();
         return s;
     }
 
@@ -481,7 +484,7 @@ public abstract class ForkJoinTask<V> implements Future<V>, Serializable {
      */
     private int awaitDone(boolean interruptible, long deadline) {
         ForkJoinWorkerThread wt; ForkJoinPool p; ForkJoinPool.WorkQueue q;
-        Thread t; boolean internal; int s;
+        Thread t; boolean internal; int s, ss;
         if (internal =
             (t = Thread.currentThread()) instanceof ForkJoinWorkerThread) {
             p = (wt = (ForkJoinWorkerThread)t).pool;
@@ -492,7 +495,7 @@ public abstract class ForkJoinTask<V> implements Future<V>, Serializable {
         return (((s = (p == null) ? 0 :
                   ((this instanceof CountedCompleter) ?
                    p.helpComplete(this, q, internal) :
-                   (this instanceof InterruptibleTask) && !internal ? status :
+                   !internal && ((ss = status) & NO_USER_HELP) != 0 ? ss :
                    p.helpJoin(this, q, internal))) < 0)) ? s :
             awaitDone(internal ? p : null, s, interruptible, deadline);
     }
@@ -642,7 +645,7 @@ public abstract class ForkJoinTask<V> implements Future<V>, Serializable {
             p = wt.pool;
         }
         else
-            q = (p = ForkJoinPool.common).externalSubmissionQueue();
+            q = (p = ForkJoinPool.common).externalSubmissionQueue(false);
         q.push(this, p, internal);
         return this;
     }
@@ -1160,7 +1163,7 @@ public abstract class ForkJoinTask<V> implements Future<V>, Serializable {
      */
     public void reinitialize() {
         aux = null;
-        status = 0;
+        status &= NO_USER_HELP;
     }
 
     /**
@@ -1414,7 +1417,8 @@ public abstract class ForkJoinTask<V> implements Future<V>, Serializable {
      * @return the task
      */
     public static ForkJoinTask<?> adapt(Runnable runnable) {
-        return new AdaptedRunnableAction(runnable);
+        return new AdaptedRunnableAction(
+            Objects.requireNonNull(runnable));
     }
 
     /**
@@ -1428,7 +1432,8 @@ public abstract class ForkJoinTask<V> implements Future<V>, Serializable {
      * @return the task
      */
     public static <T> ForkJoinTask<T> adapt(Runnable runnable, T result) {
-        return new AdaptedRunnable<T>(runnable, result);
+        return new AdaptedRunnable<T>(
+            Objects.requireNonNull(runnable), result);
     }
 
     /**
@@ -1442,7 +1447,8 @@ public abstract class ForkJoinTask<V> implements Future<V>, Serializable {
      * @return the task
      */
     public static <T> ForkJoinTask<T> adapt(Callable<? extends T> callable) {
-        return new AdaptedCallable<T>(callable);
+        return new AdaptedCallable<T>(
+            Objects.requireNonNull(callable));
     }
 
     /**
@@ -1460,7 +1466,8 @@ public abstract class ForkJoinTask<V> implements Future<V>, Serializable {
      * @since 19
      */
     public static <T> ForkJoinTask<T> adaptInterruptible(Callable<? extends T> callable) {
-        return new AdaptedInterruptibleCallable<T>(callable);
+        return new AdaptedInterruptibleCallable<T>(
+            Objects.requireNonNull(callable));
     }
 
     /**
@@ -1479,7 +1486,8 @@ public abstract class ForkJoinTask<V> implements Future<V>, Serializable {
      * @since 22
      */
     public static <T> ForkJoinTask<T> adaptInterruptible(Runnable runnable, T result) {
-        return new AdaptedInterruptibleRunnable<T>(runnable, result);
+        return new AdaptedInterruptibleRunnable<T>(
+            Objects.requireNonNull(runnable), result);
     }
 
     /**
@@ -1497,7 +1505,8 @@ public abstract class ForkJoinTask<V> implements Future<V>, Serializable {
      * @since 22
      */
     public static ForkJoinTask<?> adaptInterruptible(Runnable runnable) {
-        return new AdaptedInterruptibleRunnable<Void>(runnable, null);
+        return new AdaptedInterruptibleRunnable<Void>(
+            Objects.requireNonNull(runnable), null);
     }
 
     // Serialization support
@@ -1556,7 +1565,6 @@ public abstract class ForkJoinTask<V> implements Future<V>, Serializable {
         @SuppressWarnings("serial") // Conditionally serializable
         T result;
         AdaptedRunnable(Runnable runnable, T result) {
-            Objects.requireNonNull(runnable);
             this.runnable = runnable;
             this.result = result; // OK to set this even before completion
         }
@@ -1578,7 +1586,6 @@ public abstract class ForkJoinTask<V> implements Future<V>, Serializable {
         @SuppressWarnings("serial") // Conditionally serializable
         final Runnable runnable;
         AdaptedRunnableAction(Runnable runnable) {
-            Objects.requireNonNull(runnable);
             this.runnable = runnable;
         }
         public final Void getRawResult() { return null; }
@@ -1601,7 +1608,6 @@ public abstract class ForkJoinTask<V> implements Future<V>, Serializable {
         @SuppressWarnings("serial") // Conditionally serializable
         T result;
         AdaptedCallable(Callable<? extends T> callable) {
-            Objects.requireNonNull(callable);
             this.callable = callable;
         }
         public final T getRawResult() { return result; }
@@ -1636,6 +1642,9 @@ public abstract class ForkJoinTask<V> implements Future<V>, Serializable {
     abstract static class InterruptibleTask<T> extends ForkJoinTask<T>
         implements RunnableFuture<T> {
         transient volatile Thread runner;
+        InterruptibleTask() {
+            setNoUserHelp();
+        }
         abstract T compute() throws Exception;
         public final boolean exec() {
             Thread.interrupted();
@@ -1655,20 +1664,29 @@ public abstract class ForkJoinTask<V> implements Future<V>, Serializable {
             } finally {
                 runner = null;
             }
+            return postExec();
+        }
+        boolean postExec() { // cleanup and return completion status to doExec
             return true;
         }
+        final boolean interruptIfRunning(boolean enabled) {
+             Thread t;
+             if ((t = runner) == null) // return false if not running
+                 return false;
+             if (enabled) {
+                 try {
+                     t.interrupt();
+                 } catch (Throwable ignore) {
+                 }
+             }
+             return true;
+        }
         public boolean cancel(boolean mayInterruptIfRunning) {
-            Thread t;
-            if (trySetCancelled() >= 0) {
-                if (mayInterruptIfRunning && (t = runner) != null) {
-                    try {
-                        t.interrupt();
-                    } catch (Throwable ignore) {
-                    }
-                }
-                return true;
-            }
-            return isCancelled();
+            int s;
+            if ((s = trySetCancelled()) < 0)
+                return ((s & (ABNORMAL | THROWN)) == ABNORMAL);
+            interruptIfRunning(mayInterruptIfRunning);
+            return true;
         }
         public final void run() { quietlyInvoke(); }
         Object adaptee() { return null; } // for printing and diagnostics
@@ -1690,7 +1708,6 @@ public abstract class ForkJoinTask<V> implements Future<V>, Serializable {
         @SuppressWarnings("serial") // Conditionally serializable
         T result;
         AdaptedInterruptibleCallable(Callable<? extends T> callable) {
-            Objects.requireNonNull(callable);
             this.callable = callable;
         }
         public final T getRawResult() { return result; }
@@ -1709,7 +1726,6 @@ public abstract class ForkJoinTask<V> implements Future<V>, Serializable {
         @SuppressWarnings("serial") // Conditionally serializable
         final T result;
         AdaptedInterruptibleRunnable(Runnable runnable, T result) {
-            Objects.requireNonNull(runnable);
             this.runnable = runnable;
             this.result = result;
         }
@@ -1727,7 +1743,6 @@ public abstract class ForkJoinTask<V> implements Future<V>, Serializable {
         @SuppressWarnings("serial") // Conditionally serializable
         final Runnable runnable;
         RunnableExecuteAction(Runnable runnable) {
-            Objects.requireNonNull(runnable);
             this.runnable = runnable;
         }
         public final Void getRawResult() { return null; }
@@ -1793,9 +1808,11 @@ public abstract class ForkJoinTask<V> implements Future<V>, Serializable {
                 throw new NullPointerException();
             InvokeAnyTask<T> t = null; // list of submitted tasks
             try {
-                for (Callable<T> c : tasks)
+                for (Callable<T> c : tasks) {
+                    Objects.requireNonNull(c);
                     pool.execute((ForkJoinTask<?>)
                                  (t = new InvokeAnyTask<T>(c, this, t)));
+                }
                 return timed ? get(nanos, TimeUnit.NANOSECONDS) : get();
             } finally {
                 for (; t != null; t = t.pred)
@@ -1822,7 +1839,6 @@ public abstract class ForkJoinTask<V> implements Future<V>, Serializable {
         final InvokeAnyTask<T> pred; // to traverse on cancellation
         InvokeAnyTask(Callable<T> callable, InvokeAnyRoot<T> root,
                       InvokeAnyTask<T> pred) {
-            Objects.requireNonNull(callable);
             this.callable = callable;
             this.root = root;
             this.pred = pred;
@@ -1857,4 +1873,39 @@ public abstract class ForkJoinTask<V> implements Future<V>, Serializable {
         public final void setRawResult(Void v) { }
         final Object adaptee() { return callable; }
     }
+
+    /**
+     * Adapter for Callable-based interruptible tasks with timeout actions.
+     */
+    @SuppressWarnings("serial") // Conditionally serializable
+    static final class CallableWithTimeout<T> extends InterruptibleTask<T> {
+        Callable<? extends T> callable; // nulled out after use
+        ForkJoinTask<?> timeoutAction;
+        T result;
+        CallableWithTimeout(Callable<? extends T> callable,
+                            ForkJoinTask<?> timeoutAction) {
+            this.callable = callable;
+            this.timeoutAction = timeoutAction;
+        }
+        public final T getRawResult() { return result; }
+        public final void setRawResult(T v) { result = v; }
+        final Object adaptee() { return callable; }
+        final T compute() throws Exception {
+            Callable<? extends T> c;
+            return ((c = callable) != null) ? c.call() : null;
+        }
+        final boolean postExec() {       // cancel timeout action
+            ForkJoinTask<?> t;
+            callable = null;
+            if ((t = timeoutAction) != null) {
+                timeoutAction = null;
+                try {
+                    t.cancel(false);
+                } catch (Error | RuntimeException ex) {
+                }
+            }
+            return true;
+        }
+    }
+
 }
diff --git a/src/java.base/share/classes/java/util/concurrent/SubmissionPublisher.java b/src/java.base/share/classes/java/util/concurrent/SubmissionPublisher.java
index 388241b115d..3a8f3746637 100644
--- a/src/java.base/share/classes/java/util/concurrent/SubmissionPublisher.java
+++ b/src/java.base/share/classes/java/util/concurrent/SubmissionPublisher.java
@@ -206,22 +206,6 @@ public class SubmissionPublisher<T> implements Publisher<T>,
             (n >= BUFFER_CAPACITY_LIMIT) ? BUFFER_CAPACITY_LIMIT : n + 1;
     }
 
-    // default Executor setup; nearly the same as CompletableFuture
-
-    /**
-     * Default executor -- ForkJoinPool.commonPool() unless it cannot
-     * support parallelism.
-     */
-    private static final Executor ASYNC_POOL =
-        (ForkJoinPool.getCommonPoolParallelism() > 1) ?
-        ForkJoinPool.commonPool() : new ThreadPerTaskExecutor();
-
-    /** Fallback if ForkJoinPool.commonPool() cannot support parallelism */
-    private static final class ThreadPerTaskExecutor implements Executor {
-        ThreadPerTaskExecutor() {}      // prevent access constructor creation
-        public void execute(Runnable r) { new Thread(r).start(); }
-    }
-
     /**
      * Clients (BufferedSubscriptions) are maintained in a linked list
      * (via their "next" fields). This works well for publish loops.
@@ -316,7 +300,7 @@ public class SubmissionPublisher<T> implements Publisher<T>,
      * Flow.Subscriber#onNext(Object) onNext}.
      */
     public SubmissionPublisher() {
-        this(ASYNC_POOL, Flow.defaultBufferSize(), null);
+        this(ForkJoinPool.asyncCommonPool(), Flow.defaultBufferSize(), null);
     }
 
     /**
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 19eb3122947..3713d616a3a 100644
--- a/src/java.base/share/classes/java/util/concurrent/ThreadLocalRandom.java
+++ b/src/java.base/share/classes/java/util/concurrent/ThreadLocalRandom.java
@@ -45,6 +45,7 @@ import java.util.concurrent.atomic.AtomicLong;
 import java.util.stream.DoubleStream;
 import java.util.stream.IntStream;
 import java.util.stream.LongStream;
+import jdk.internal.access.JavaLangAccess;
 import jdk.internal.access.JavaUtilConcurrentTLRAccess;
 import jdk.internal.access.SharedSecrets;
 import jdk.internal.util.random.RandomSupport;
@@ -158,11 +159,19 @@ public final class ThreadLocalRandom extends Random {
      * rely on (static) atomic generators to initialize the values.
      */
     static final void localInit() {
-        int p = probeGenerator.addAndGet(PROBE_INCREMENT);
-        int probe = (p == 0) ? 1 : p; // skip 0
         long seed = RandomSupport.mixMurmur64(seeder.getAndAdd(SEEDER_INCREMENT));
-        Thread t = Thread.currentThread();
+        Thread t = Thread.currentThread(), carrier;
         U.putLong(t, SEED, seed);
+        int probe = 0; // if virtual, share probe with carrier
+        if ((carrier = JLA.currentCarrierThread()) != t &&
+            (probe = U.getInt(carrier, PROBE)) == 0) {
+            seed = RandomSupport.mixMurmur64(seeder.getAndAdd(SEEDER_INCREMENT));
+            U.putLong(carrier, SEED, seed);
+        }
+        if (probe == 0 && (probe = probeGenerator.addAndGet(PROBE_INCREMENT)) == 0)
+            probe = 1; // skip 0
+        if (carrier != t)
+            U.putInt(carrier, PROBE, probe);
         U.putInt(t, PROBE, probe);
     }
 
@@ -233,16 +242,18 @@ public final class ThreadLocalRandom extends Random {
      * the classes that use them. Briefly, a thread's "probe" value is
      * a non-zero hash code that (probably) does not collide with
      * other existing threads with respect to any power of two
-     * collision space. When it does collide, it is pseudo-randomly
-     * adjusted (using a Marsaglia XorShift). The nextSecondarySeed
-     * method is used in the same contexts as ThreadLocalRandom, but
-     * only for transient usages such as random adaptive spin/block
-     * sequences for which a cheap RNG suffices and for which it could
-     * in principle disrupt user-visible statistical properties of the
-     * main ThreadLocalRandom if we were to use it.
+     * collision space, based on carrier threads in the case of
+     * VirtualThreads to reduce the expected collision rate. When it
+     * does collide, it is pseudo-randomly adjusted (using a Marsaglia
+     * XorShift). The nextSecondarySeed method is used in the same
+     * contexts as ThreadLocalRandom, but only for transient usages
+     * such as random adaptive spin/block sequences for which a cheap
+     * RNG suffices and for which it could in principle disrupt
+     * user-visible statistical properties of the main
+     * ThreadLocalRandom if we were to use it.
      *
-     * Note: Because of package-protection issues, versions of some
-     * these methods also appear in some subpackage classes.
+     * Note: jdk SharedSecrets are used enable use in jdk classes
+     * outside this package.
      */
 
     /**
@@ -251,7 +262,7 @@ public final class ThreadLocalRandom extends Random {
      * can be used to force initialization on zero return.
      */
     static final int getProbe() {
-        return U.getInt(Thread.currentThread(), PROBE);
+        return U.getInt(JLA.currentCarrierThread(), PROBE);
     }
 
     /**
@@ -262,7 +273,7 @@ public final class ThreadLocalRandom extends Random {
         probe ^= probe << 13;   // xorshift
         probe ^= probe >>> 17;
         probe ^= probe << 5;
-        U.putInt(Thread.currentThread(), PROBE, probe);
+        U.putInt(JLA.currentCarrierThread(), PROBE, probe);
         return probe;
     }
 
@@ -378,6 +389,8 @@ public final class ThreadLocalRandom extends Random {
         = new AtomicLong(RandomSupport.mixMurmur64(System.currentTimeMillis()) ^
                          RandomSupport.mixMurmur64(System.nanoTime()));
 
+    private static final JavaLangAccess JLA = SharedSecrets.getJavaLangAccess();
+
     // used by ScopedValue
     private static class Access {
         static {
@@ -386,6 +399,12 @@ public final class ThreadLocalRandom extends Random {
                     public int nextSecondaryThreadLocalRandomSeed() {
                         return nextSecondarySeed();
                     }
+                    public int getThreadLocalRandomProbe() {
+                        return getProbe();
+                    }
+                    public int advanceThreadLocalRandomProbe(int r) {
+                        return advanceProbe(r);
+                    }
                 }
             );
         }
diff --git a/src/java.base/share/classes/java/util/concurrent/atomic/Striped64.java b/src/java.base/share/classes/java/util/concurrent/atomic/Striped64.java
index ad230f62ab6..e743947a6ff 100644
--- a/src/java.base/share/classes/java/util/concurrent/atomic/Striped64.java
+++ b/src/java.base/share/classes/java/util/concurrent/atomic/Striped64.java
@@ -43,6 +43,8 @@ import java.util.Arrays;
 import java.util.concurrent.ThreadLocalRandom;
 import java.util.function.DoubleBinaryOperator;
 import java.util.function.LongBinaryOperator;
+import jdk.internal.access.SharedSecrets;
+import jdk.internal.access.JavaUtilConcurrentTLRAccess;
 
 /**
  * A package-local class holding common representation and mechanics
@@ -188,24 +190,18 @@ abstract class Striped64 extends Number {
     }
 
     /**
-     * Returns the probe value for the current thread.
-     * Duplicated from ThreadLocalRandom because of packaging restrictions.
+     * Returns the ThreadLocalRandom probe value for the current carrier thread.
      */
     static final int getProbe() {
-        return (int) THREAD_PROBE.get(Thread.currentThread());
+        return TLR.getThreadLocalRandomProbe();
     }
 
     /**
      * Pseudo-randomly advances and records the given probe value for the
-     * given thread.
-     * Duplicated from ThreadLocalRandom because of packaging restrictions.
+     * given carrier thread.
      */
     static final int advanceProbe(int probe) {
-        probe ^= probe << 13;   // xorshift
-        probe ^= probe >>> 17;
-        probe ^= probe << 5;
-        THREAD_PROBE.set(Thread.currentThread(), probe);
-        return probe;
+        return TLR.advanceThreadLocalRandomProbe(probe);
     }
 
     /**
@@ -371,21 +367,17 @@ abstract class Striped64 extends Number {
         }
     }
 
+    private static final JavaUtilConcurrentTLRAccess TLR =
+        SharedSecrets.getJavaUtilConcurrentTLRAccess();
+
     // VarHandle mechanics
     private static final VarHandle BASE;
     private static final VarHandle CELLSBUSY;
-    private static final VarHandle THREAD_PROBE;
     static {
         MethodHandles.Lookup l1 = MethodHandles.lookup();
 
         BASE = MhUtil.findVarHandle(l1, "base", long.class);
         CELLSBUSY = MhUtil.findVarHandle(l1, "cellsBusy", int.class);
-        try {
-            MethodHandles.Lookup l2 = MethodHandles.privateLookupIn(Thread.class, l1);
-            THREAD_PROBE = MhUtil.findVarHandle(l2, "threadLocalRandomProbe", int.class);
-        } catch (ReflectiveOperationException e) {
-            throw new ExceptionInInitializerError(e);
-        }
     }
 
 }
diff --git a/src/java.base/share/classes/jdk/internal/access/JavaUtilConcurrentTLRAccess.java b/src/java.base/share/classes/jdk/internal/access/JavaUtilConcurrentTLRAccess.java
index 5683146e721..29434e823a4 100644
--- a/src/java.base/share/classes/jdk/internal/access/JavaUtilConcurrentTLRAccess.java
+++ b/src/java.base/share/classes/jdk/internal/access/JavaUtilConcurrentTLRAccess.java
@@ -27,4 +27,6 @@ package jdk.internal.access;
 
 public interface JavaUtilConcurrentTLRAccess {
     int nextSecondaryThreadLocalRandomSeed();
+    int getThreadLocalRandomProbe();
+    int advanceThreadLocalRandomProbe(int r);
 }
diff --git a/test/jdk/java/util/concurrent/CompletableFuture/CompletableFutureOrTimeoutExceptionallyTest.java b/test/jdk/java/util/concurrent/CompletableFuture/CompletableFutureOrTimeoutExceptionallyTest.java
index 9c6b5b6e5cd..210a791aad0 100644
--- a/test/jdk/java/util/concurrent/CompletableFuture/CompletableFutureOrTimeoutExceptionallyTest.java
+++ b/test/jdk/java/util/concurrent/CompletableFuture/CompletableFutureOrTimeoutExceptionallyTest.java
@@ -30,39 +30,25 @@
  */
 
 import java.time.Duration;
-import java.util.concurrent.BlockingQueue;
+import java.util.concurrent.ForkJoinPool;
 import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.ScheduledThreadPoolExecutor;
 import java.util.concurrent.TimeUnit;
 
 import org.junit.jupiter.api.Test;
-import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 class CompletableFutureOrTimeoutExceptionallyTest {
-    static final BlockingQueue<Runnable> delayerQueue;
-    static {
-        try {
-            var delayerClass = Class.forName("java.util.concurrent.CompletableFuture$Delayer",
-                                             true,
-                                             CompletableFuture.class.getClassLoader());
-            var delayerField = delayerClass.getDeclaredField("delayer");
-            delayerField.setAccessible(true);
-            delayerQueue = ((ScheduledThreadPoolExecutor)delayerField.get(null)).getQueue();
-        } catch (Throwable t) {
-            throw new ExceptionInInitializerError(t);
-        }
-    }
-
+    // updated February 2025 to adapt to CompletableFuture DelayScheduler changes
     /**
      * Test that orTimeout task is cancelled if the CompletableFuture is completed Exceptionally
      */
     @Test
     void testOrTimeoutWithCompleteExceptionallyDoesNotLeak() throws InterruptedException {
-        assertTrue(delayerQueue.peek() == null);
+        ForkJoinPool delayer = ForkJoinPool.commonPool();
+        assertEquals(delayer.getDelayedTaskCount(), 0);
         var future = new CompletableFuture<>().orTimeout(12, TimeUnit.HOURS);
-        assertTrue(delayerQueue.peek() != null);
         future.completeExceptionally(new RuntimeException("This is fine"));
-        while (delayerQueue.peek() != null) {
+        while (delayer.getDelayedTaskCount() > 0) {
             Thread.sleep(100);
         };
     }
@@ -72,12 +58,13 @@ class CompletableFutureOrTimeoutExceptionallyTest {
      */
     @Test
     void testCompleteOnTimeoutWithCompleteExceptionallyDoesNotLeak() throws InterruptedException {
-        assertTrue(delayerQueue.peek() == null);
+        ForkJoinPool delayer = ForkJoinPool.commonPool();
+        assertEquals(delayer.getDelayedTaskCount(), 0);
         var future = new CompletableFuture<>().completeOnTimeout(null, 12, TimeUnit.HOURS);
-        assertTrue(delayerQueue.peek() != null);
         future.completeExceptionally(new RuntimeException("This is fine"));
-        while (delayerQueue.peek() != null) {
+        while (delayer.getDelayedTaskCount() > 0) {
             Thread.sleep(100);
         };
     }
+
 }
diff --git a/test/jdk/java/util/concurrent/tck/CompletableFutureTest.java b/test/jdk/java/util/concurrent/tck/CompletableFutureTest.java
index 60da228d175..de3d1dd1050 100644
--- a/test/jdk/java/util/concurrent/tck/CompletableFutureTest.java
+++ b/test/jdk/java/util/concurrent/tck/CompletableFutureTest.java
@@ -32,6 +32,7 @@
  * http://creativecommons.org/publicdomain/zero/1.0/
  */
 
+import static java.util.concurrent.TimeUnit.NANOSECONDS;
 import static java.util.concurrent.TimeUnit.MILLISECONDS;
 import static java.util.concurrent.TimeUnit.SECONDS;
 import static java.util.concurrent.CompletableFuture.completedFuture;
@@ -101,7 +102,7 @@ public class CompletableFutureTest extends JSR166TestCase {
         assertNull(result);
 
         try {
-            f.get(randomExpiredTimeout(), randomTimeUnit());
+            f.get(1, NANOSECONDS);
             shouldThrow();
         }
         catch (TimeoutException success) {}
@@ -658,8 +659,6 @@ public class CompletableFutureTest extends JSR166TestCase {
         }
     }
 
-    static final boolean defaultExecutorIsCommonPool
-        = ForkJoinPool.getCommonPoolParallelism() > 1;
 
     /**
      * Permits the testing of parallel code for the 3 different
@@ -750,8 +749,7 @@ public class CompletableFutureTest extends JSR166TestCase {
         },
         ASYNC {
             public void checkExecutionMode() {
-                mustEqual(defaultExecutorIsCommonPool,
-                             (ForkJoinPool.commonPool() == ForkJoinTask.getPool()));
+                mustEqual(ForkJoinPool.commonPool(), ForkJoinTask.getPool());
             }
             public CompletableFuture<Void> runAsync(Runnable a) {
                 return CompletableFuture.runAsync(a);
@@ -3794,10 +3792,7 @@ public class CompletableFutureTest extends JSR166TestCase {
         CompletableFuture<Item> f = new CompletableFuture<>();
         Executor e = f.defaultExecutor();
         Executor c = ForkJoinPool.commonPool();
-        if (ForkJoinPool.getCommonPoolParallelism() > 1)
-            assertSame(e, c);
-        else
-            assertNotSame(e, c);
+        assertSame(e, c);
     }
 
     /**
diff --git a/test/jdk/java/util/concurrent/tck/ForkJoinPool20Test.java b/test/jdk/java/util/concurrent/tck/ForkJoinPool20Test.java
index b35ab064d53..cfde352abdd 100644
--- a/test/jdk/java/util/concurrent/tck/ForkJoinPool20Test.java
+++ b/test/jdk/java/util/concurrent/tck/ForkJoinPool20Test.java
@@ -31,13 +31,35 @@
  * http://creativecommons.org/publicdomain/zero/1.0/
  */
 
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.List;
+import java.util.concurrent.BlockingQueue;
+import java.util.concurrent.Callable;
+import java.util.concurrent.CancellationException;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.ExecutorService;
 import java.util.concurrent.ForkJoinPool;
 import java.util.concurrent.ForkJoinTask;
 import java.util.concurrent.ForkJoinWorkerThread;
 import java.util.concurrent.Future;
 import java.util.concurrent.RejectedExecutionException;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.ScheduledFuture;
+import java.util.concurrent.ThreadFactory;
+import java.util.concurrent.ThreadLocalRandom;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.atomic.AtomicLong;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.concurrent.locks.LockSupport;
+import java.util.stream.Stream;
+import static java.util.concurrent.TimeUnit.MILLISECONDS;
+import static java.util.concurrent.TimeUnit.NANOSECONDS;
+import static java.util.concurrent.TimeUnit.SECONDS;
 
 import junit.framework.Test;
 import junit.framework.TestSuite;
@@ -216,4 +238,412 @@ public class ForkJoinPool20Test extends JSR166TestCase {
         }
         return worker;
     }
+
+    // additions for ScheduledExecutorService
+
+
+    /**
+     * delayed schedule of callable successfully executes after delay
+     */
+    public void testSchedule1() throws Exception {
+        final ForkJoinPool p = new ForkJoinPool(2);
+        try (PoolCleaner cleaner = cleaner(p)) {
+            final long startTime = System.nanoTime();
+            final CountDownLatch done = new CountDownLatch(1);
+            Callable<Boolean> task = new CheckedCallable<>() {
+                public Boolean realCall() {
+                    done.countDown();
+                    assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
+                    return Boolean.TRUE;
+                }};
+            Future<Boolean> f = p.schedule(task, timeoutMillis(), MILLISECONDS);
+            assertSame(Boolean.TRUE, f.get());
+            assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
+            assertEquals(0L, done.getCount());
+        }
+    }
+
+    /**
+     * delayed schedule of callable successfully executes after delay
+     * even if shutdown.
+     */
+    public void testSchedule1b() throws Exception {
+        final ForkJoinPool p = new ForkJoinPool(2);
+        try (PoolCleaner cleaner = cleaner(p)) {
+            final long startTime = System.nanoTime();
+            final CountDownLatch done = new CountDownLatch(1);
+            Callable<Boolean> task = new CheckedCallable<>() {
+                public Boolean realCall() {
+                    done.countDown();
+                    assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
+                    return Boolean.TRUE;
+                }};
+            Future<Boolean> f = p.schedule(task, timeoutMillis(), MILLISECONDS);
+            p.shutdown();
+            assertSame(Boolean.TRUE, f.get());
+            assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
+            assertEquals(0L, done.getCount());
+        }
+    }
+
+    /**
+     * delayed schedule of runnable successfully executes after delay
+     */
+    public void testSchedule3() throws Exception {
+        final ForkJoinPool p = new ForkJoinPool(2);
+        try (PoolCleaner cleaner = cleaner(p)) {
+            final long startTime = System.nanoTime();
+            final CountDownLatch done = new CountDownLatch(1);
+            Runnable task = new CheckedRunnable() {
+                public void realRun() {
+                    done.countDown();
+                    assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
+                }};
+            Future<?> f = p.schedule(task, timeoutMillis(), MILLISECONDS);
+            await(done);
+            assertNull(f.get(LONG_DELAY_MS, MILLISECONDS));
+            assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
+        }
+    }
+
+    /**
+     * scheduleAtFixedRate executes runnable after given initial delay
+     */
+    public void testSchedule4() throws Exception {
+        final ForkJoinPool p = new ForkJoinPool(2);
+        try (PoolCleaner cleaner = cleaner(p)) {
+            final long startTime = System.nanoTime();
+            final CountDownLatch done = new CountDownLatch(1);
+            Runnable task = new CheckedRunnable() {
+                public void realRun() {
+                    done.countDown();
+                    assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
+                }};
+            ScheduledFuture<?> f =
+                p.scheduleAtFixedRate(task, timeoutMillis(),
+                                      LONG_DELAY_MS, MILLISECONDS);
+            await(done);
+            assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
+            f.cancel(true);
+        }
+    }
+
+    /**
+     * scheduleAtFixedRate with 0 initial delay re-rexecutes
+     */
+    public void testSchedule4a() throws Exception {
+        final ForkJoinPool p = new ForkJoinPool(2);
+        try (PoolCleaner cleaner = cleaner(p)) {
+            final long startTime = System.nanoTime();
+            final CountDownLatch done = new CountDownLatch(2);
+            Runnable task = new Runnable() {
+                public void run() {
+                    done.countDown();
+                }};
+            ScheduledFuture<?> f =
+                p.scheduleAtFixedRate(task, 0L, timeoutMillis(),
+                                      MILLISECONDS);
+            await(done);
+            f.cancel(true);
+            assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
+        }
+    }
+
+    /**
+     * scheduleWithFixedDelay executes runnable after given initial delay
+     */
+    public void testSchedule5() throws Exception {
+        final ForkJoinPool p = new ForkJoinPool(2);
+        try (PoolCleaner cleaner = cleaner(p)) {
+            final long startTime = System.nanoTime();
+            final CountDownLatch done = new CountDownLatch(1);
+            Runnable task = new CheckedRunnable() {
+                public void realRun() {
+                    done.countDown();
+                    assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
+                }};
+            ScheduledFuture<?> f =
+                p.scheduleWithFixedDelay(task, timeoutMillis(),
+                                         LONG_DELAY_MS, MILLISECONDS);
+            await(done);
+            assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
+            f.cancel(true);
+        }
+    }
+
+    /**
+     * scheduleWithFixedDelay with 0 initial delay re-rexecutes
+     */
+    public void testSchedule5a() throws Exception {
+        final ForkJoinPool p = new ForkJoinPool(2);
+        try (PoolCleaner cleaner = cleaner(p)) {
+            final long startTime = System.nanoTime();
+            final CountDownLatch done = new CountDownLatch(2);
+            Runnable task = new Runnable() {
+                public void run() {
+                    done.countDown();
+                }};
+            ScheduledFuture<?> f =
+                p.scheduleWithFixedDelay(task, 0L, timeoutMillis(),
+                                         MILLISECONDS);
+            await(done);
+            assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
+            f.cancel(true);
+        }
+    }
+
+    static class RunnableCounter implements Runnable {
+        AtomicInteger count = new AtomicInteger(0);
+        public void run() { count.getAndIncrement(); }
+    }
+
+    /**
+     * scheduleAtFixedRate executes series of tasks at given rate.
+     * Eventually, it must hold that:
+     *   cycles - 1 <= elapsedMillis/delay < cycles
+     * Additionally, periodic tasks are not run after shutdown.
+     */
+    public void testFixedRateSequence() throws InterruptedException {
+        final ForkJoinPool p = new ForkJoinPool(4);
+        try (PoolCleaner cleaner = cleaner(p)) {
+            for (int delay = 1; delay <= LONG_DELAY_MS; delay *= 3) {
+                final long startTime = System.nanoTime();
+                final int cycles = 8;
+                final CountDownLatch done = new CountDownLatch(cycles);
+                final Runnable task = new CheckedRunnable() {
+                    public void realRun() { done.countDown(); }};
+                final ScheduledFuture<?> periodicTask =
+                    p.scheduleAtFixedRate(task, 0, delay, MILLISECONDS);
+                final int totalDelayMillis = (cycles - 1) * delay;
+                await(done, totalDelayMillis + LONG_DELAY_MS);
+                final long elapsedMillis = millisElapsedSince(startTime);
+                assertTrue(elapsedMillis >= totalDelayMillis);
+                if (elapsedMillis <= cycles * delay)
+                    return;
+                periodicTask.cancel(true); // retry with longer delay
+            }
+            fail("unexpected execution rate");
+        }
+    }
+    /**
+     * scheduleWithFixedDelay executes series of tasks with given
+     * period.  Eventually, it must hold that each task starts at
+     * least delay and at most 2 * delay after the termination of the
+     * previous task. Additionally, periodic tasks are not run after
+     * shutdown.
+     */
+    public void testFixedDelaySequence() throws InterruptedException {
+        final ForkJoinPool p = new ForkJoinPool(1);
+        try (PoolCleaner cleaner = cleaner(p)) {
+            for (int delay = 1; delay <= LONG_DELAY_MS; delay *= 3) {
+                final long startTime = System.nanoTime();
+                final AtomicLong previous = new AtomicLong(startTime);
+                final AtomicBoolean tryLongerDelay = new AtomicBoolean(false);
+                final int cycles = 8;
+                final CountDownLatch done = new CountDownLatch(cycles);
+                final int d = delay;
+                final Runnable task = new CheckedRunnable() {
+                    public void realRun() {
+                        long now = System.nanoTime();
+                        long elapsedMillis
+                            = NANOSECONDS.toMillis(now - previous.get());
+                        if (elapsedMillis >= (done.getCount() == cycles ? d : 2 * d))
+                                tryLongerDelay.set(true);
+                        previous.set(now);
+                        assertTrue(done.getCount() > 0);
+                        done.countDown();
+                    }};
+                final ScheduledFuture<?> periodicTask =
+                    p.scheduleWithFixedDelay(task, 0, delay, MILLISECONDS);
+                final int totalDelayMillis = (cycles - 1) * delay;
+                await(done, totalDelayMillis + cycles * LONG_DELAY_MS);
+                final long elapsedMillis = millisElapsedSince(startTime);
+                assertTrue(elapsedMillis >= totalDelayMillis);
+                if (!tryLongerDelay.get())
+                    return;
+                periodicTask.cancel(true); // retry with longer delay
+            }
+            fail("unexpected execution rate");
+        }
+    }
+
+    /**
+     * Submitting null tasks throws NullPointerException
+     */
+    public void testNullTaskSubmission() {
+        final ForkJoinPool p = new ForkJoinPool(1);
+        try (PoolCleaner cleaner = cleaner(p)) {
+            assertNullTaskSubmissionThrowsNullPointerException(p);
+        }
+    }
+
+    /**
+     * Submitted tasks are rejected when shutdown
+     */
+    public void testSubmittedTasksRejectedWhenShutdown() throws InterruptedException {
+        final ForkJoinPool p = new ForkJoinPool(4);
+        final ThreadLocalRandom rnd = ThreadLocalRandom.current();
+        final CountDownLatch threadsStarted = new CountDownLatch(p.getParallelism());
+        final CountDownLatch done = new CountDownLatch(1);
+        final Runnable r = () -> {
+            threadsStarted.countDown();
+            for (;;) {
+                try {
+                    done.await();
+                    return;
+                } catch (InterruptedException shutdownNowDeliberatelyIgnored) {}
+            }};
+        final Callable<Boolean> c = () -> {
+            threadsStarted.countDown();
+            for (;;) {
+                try {
+                    done.await();
+                    return Boolean.TRUE;
+                } catch (InterruptedException shutdownNowDeliberatelyIgnored) {}
+            }};
+
+        try (PoolCleaner cleaner = cleaner(p, done)) {
+            for (int i = p.getParallelism(); i-- > 0; ) {
+                switch (rnd.nextInt(4)) {
+                case 0: p.execute(r); break;
+                case 1: assertFalse(p.submit(r).isDone()); break;
+                case 2: assertFalse(p.submit(r, Boolean.TRUE).isDone()); break;
+                case 3: assertFalse(p.submit(c).isDone()); break;
+                }
+            }
+
+            await(threadsStarted);
+            p.shutdown();
+            done.countDown();   // release blocking tasks
+            assertTrue(p.awaitTermination(LONG_DELAY_MS, MILLISECONDS));
+        }
+    }
+
+    /**
+     * A fixed delay task with overflowing period should not prevent a
+     * one-shot task from executing.
+     * https://bugs.openjdk.org/browse/JDK-8051859
+     */
+    @SuppressWarnings("FutureReturnValueIgnored")
+    public void testScheduleWithFixedDelay_overflow() throws Exception {
+        final CountDownLatch delayedDone = new CountDownLatch(1);
+        final CountDownLatch immediateDone = new CountDownLatch(1);
+        final ForkJoinPool p = new ForkJoinPool(2);
+        try (PoolCleaner cleaner = cleaner(p)) {
+            final Runnable delayed = () -> {
+                delayedDone.countDown();
+                p.submit(() -> immediateDone.countDown());
+            };
+            p.scheduleWithFixedDelay(delayed, 0L, Long.MAX_VALUE, SECONDS);
+            await(delayedDone);
+            await(immediateDone);
+        }
+    }
+
+    /**
+     * shutdownNow cancels tasks that were not run
+     */
+    public void testShutdownNow_delayedTasks() throws InterruptedException {
+        final ForkJoinPool p = new ForkJoinPool(2);
+        List<ScheduledFuture<?>> tasks = new ArrayList<>();
+        for (int i = 0; i < 3; i++) {
+            Runnable r = new NoOpRunnable();
+            tasks.add(p.schedule(r, 9, SECONDS));
+            tasks.add(p.scheduleAtFixedRate(r, 9, 9, SECONDS));
+            tasks.add(p.scheduleWithFixedDelay(r, 9, 9, SECONDS));
+        }
+        p.shutdownNow();
+        assertTrue(p.awaitTermination(LONG_DELAY_MS, MILLISECONDS));
+        for (ScheduledFuture<?> task : tasks) {
+            assertTrue(task.isDone());
+        }
+        assertTrue(p.isTerminated());
+    }
+
+    /**
+     * submitWithTimeout (eventually) cancels task after timeout
+     */
+    public void testSubmitWithTimeoutCancels() throws InterruptedException {
+        final ForkJoinPool p = ForkJoinPool.commonPool();
+        Callable<Boolean> c = new Callable<Boolean>() {
+            public Boolean call() throws Exception {
+                Thread.sleep(LONGER_DELAY_MS); return Boolean.TRUE; }};
+        ForkJoinTask<?> task = p.submitWithTimeout(c, 1, NANOSECONDS, null);
+        Thread.sleep(timeoutMillis());
+        assertTrue(task.isCancelled());
+    }
+
+    static final class SubmitWithTimeoutException extends RuntimeException {}
+
+    /**
+     * submitWithTimeout using complete completes after timeout
+     */
+    public void testSubmitWithCompleterTimeoutCompletes() throws InterruptedException {
+        final ForkJoinPool p = ForkJoinPool.commonPool();
+        Callable<Item> c = new Callable<Item>() {
+            public Item call() throws Exception {
+                Thread.sleep(LONGER_DELAY_MS); return one; }};
+        ForkJoinTask<Item> task = p.submitWithTimeout(
+            c, 1, NANOSECONDS,
+            (ForkJoinTask<Item> t) ->
+            t.complete(two));
+        Thread.sleep(timeoutMillis());
+        assertEquals(task.join(), two);
+    }
+
+    /**
+     * submitWithTimeout using completeExceptionally throws after timeout
+     */
+    public void testSubmitWithTimeoutThrows() throws InterruptedException {
+        final ForkJoinPool p = ForkJoinPool.commonPool();
+        Callable<Boolean> c = new Callable<Boolean>() {
+            public Boolean call() throws Exception {
+                Thread.sleep(LONGER_DELAY_MS); return Boolean.TRUE; }};
+        ForkJoinTask<Boolean> task = p.submitWithTimeout(
+            c, 1, NANOSECONDS,
+            (ForkJoinTask<Boolean> t) ->
+            t.completeExceptionally(new SubmitWithTimeoutException()));
+        Thread.sleep(timeoutMillis());
+        try {
+            task.join();
+            shouldThrow();
+        }
+        catch (Exception ex) {
+            assertTrue(ex instanceof SubmitWithTimeoutException);
+        }
+    }
+
+    /**
+     * submitWithTimeout doesn't cancel if completed before timeout
+     */
+    public void testSubmitWithTimeout_NoTimeout() throws InterruptedException {
+        final ForkJoinPool p = ForkJoinPool.commonPool();
+        Callable<Boolean> c = new Callable<Boolean>() {
+            public Boolean call() throws Exception {
+                return Boolean.TRUE; }};
+        ForkJoinTask<?> task = p.submitWithTimeout(c, LONGER_DELAY_MS, MILLISECONDS, null);
+        Thread.sleep(timeoutMillis());
+        assertFalse(task.isCancelled());
+        assertEquals(task.join(), Boolean.TRUE);
+    }
+
+    /**
+     * A delayed task completes (possibly abnormally) if shutdown after
+     * calling cancelDelayedTasksOnShutdown()
+     */
+    public void testCancelDelayedTasksOnShutdown() throws Exception {
+        final ForkJoinPool p = new ForkJoinPool(2);
+        p.cancelDelayedTasksOnShutdown();
+        try (PoolCleaner cleaner = cleaner(p)) {
+            Callable<Boolean> task = new CheckedCallable<>() {
+                public Boolean realCall() {
+                    return Boolean.TRUE;
+                }};
+            Future<Boolean> f = p.schedule(task, LONGER_DELAY_MS, MILLISECONDS);
+            p.shutdown();
+            assertTrue(p.awaitTermination(LONG_DELAY_MS, MILLISECONDS));
+            assertTrue(f.isDone());
+        }
+    }
+
 }
diff --git a/test/jdk/java/util/concurrent/tck/SubmissionPublisherTest.java b/test/jdk/java/util/concurrent/tck/SubmissionPublisherTest.java
index c47e66c6727..9f87ff5cf64 100644
--- a/test/jdk/java/util/concurrent/tck/SubmissionPublisherTest.java
+++ b/test/jdk/java/util/concurrent/tck/SubmissionPublisherTest.java
@@ -178,10 +178,7 @@ public class SubmissionPublisherTest extends JSR166TestCase {
         checkInitialState(p);
         assertEquals(p.getMaxBufferCapacity(), Flow.defaultBufferSize());
         Executor e = p.getExecutor(), c = ForkJoinPool.commonPool();
-        if (ForkJoinPool.getCommonPoolParallelism() > 1)
-            assertSame(e, c);
-        else
-            assertNotSame(e, c);
+        assertSame(e, c);
     }
 
     /**

From 5eee32d04b6f4c4bf0de78c295d6d6feab523ea3 Mon Sep 17 00:00:00 2001
From: Ioi Lam <iklam@openjdk.org>
Date: Mon, 31 Mar 2025 20:43:21 +0000
Subject: [PATCH 571/587] 8352768: CDS test MethodHandleTest.java failed in
 -Xcomp mode

Reviewed-by: dholmes, shade, vlivanov
---
 src/hotspot/share/cds/aotClassInitializer.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/hotspot/share/cds/aotClassInitializer.cpp b/src/hotspot/share/cds/aotClassInitializer.cpp
index 28e20acdc79..297f8109eb4 100644
--- a/src/hotspot/share/cds/aotClassInitializer.cpp
+++ b/src/hotspot/share/cds/aotClassInitializer.cpp
@@ -303,6 +303,7 @@ bool AOTClassInitializer::can_archive_initialized_mirror(InstanceKlass* ik) {
       {"java/lang/invoke/MethodHandles"},
       {"java/lang/invoke/SimpleMethodHandle"},
       {"java/lang/invoke/StringConcatFactory"},
+      {"java/lang/invoke/VarHandleGuards"},
       {"java/util/Collections"},
       {"java/util/stream/Collectors"},
       {"jdk/internal/constant/ConstantUtils"},

From acd4da49a01760599ec4c325ff6c56f53ba5cc9c Mon Sep 17 00:00:00 2001
From: Hai-May Chao <hchao@openjdk.org>
Date: Mon, 31 Mar 2025 21:39:11 +0000
Subject: [PATCH 572/587] 8353299: VerifyJarEntryName.java test fails

Reviewed-by: mullan
---
 .../tools/jarsigner/VerifyJarEntryName.java      | 16 ----------------
 1 file changed, 16 deletions(-)

diff --git a/test/jdk/sun/security/tools/jarsigner/VerifyJarEntryName.java b/test/jdk/sun/security/tools/jarsigner/VerifyJarEntryName.java
index faa3ab7b897..f5589484f3d 100644
--- a/test/jdk/sun/security/tools/jarsigner/VerifyJarEntryName.java
+++ b/test/jdk/sun/security/tools/jarsigner/VerifyJarEntryName.java
@@ -95,22 +95,6 @@ public class VerifyJarEntryName {
                 .shouldHaveExitValue(0);
     }
 
-    /*
-     * Modify a single byte in signature filename in LOC, and
-     * validate that jarsigner -verify emits a warning message.
-     */
-    @Test
-    void verifySignatureEntryName() throws Exception {
-        modifyJarEntryName(ORIGINAL_JAR, MODIFIED_JAR, "MYKEY.SF");
-        SecurityTools.jarsigner("-verify -verbose " + MODIFIED_JAR)
-                .shouldContain("This JAR file contains internal " +
-                        "inconsistencies that may result in different " +
-                        "contents when reading via JarFile and JarInputStream:")
-                .shouldContain("- Entry XETA-INF/MYKEY.SF is present when reading " +
-                        "via JarInputStream but missing when reading via JarFile")
-                .shouldHaveExitValue(0);
-    }
-
     /*
      * Validate that jarsigner -verify on a valid JAR works without
      * emitting warnings about internal inconsistencies.

From 52f56e608e65f876dc7403ad6240ef13945b2480 Mon Sep 17 00:00:00 2001
From: Alexey Semenyuk <asemenyuk@openjdk.org>
Date: Mon, 31 Mar 2025 22:07:14 +0000
Subject: [PATCH 573/587] 8353196: [macos] Contents of ".jpackage.xml" file are
 wrong when building .pkg from unsigned app image

Reviewed-by: almatvee
---
 .../jpackage/internal/MacAppImageBuilder.java |  5 ++
 .../internal/MacBaseInstallerBundler.java     |  6 +--
 .../internal/AbstractAppImageBuilder.java     |  8 +++-
 .../jdk/jpackage/test/JPackageCommand.java    | 48 ++++++++++++++-----
 .../helpers/jdk/jpackage/test/MacHelper.java  | 27 +++++++++++
 5 files changed, 77 insertions(+), 17 deletions(-)

diff --git a/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacAppImageBuilder.java b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacAppImageBuilder.java
index dea7f4c4e2e..02860b61e4f 100644
--- a/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacAppImageBuilder.java
+++ b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacAppImageBuilder.java
@@ -266,6 +266,11 @@ public class MacAppImageBuilder extends AbstractAppImageBuilder {
         Files.copy(in, dstFile);
     }
 
+    @Override
+    protected boolean withAppImageFile(Map<String, ? super Object> params) {
+        return !withPackageFile;
+    }
+
     @Override
     public void prepareApplicationFiles(Map<String, ? super Object> params)
             throws IOException {
diff --git a/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacBaseInstallerBundler.java b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacBaseInstallerBundler.java
index 1947cc0afda..a536019512a 100644
--- a/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacBaseInstallerBundler.java
+++ b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacBaseInstallerBundler.java
@@ -173,11 +173,11 @@ public abstract class MacBaseInstallerBundler extends AbstractBundler {
             FileUtils.copyRecursive(predefinedImage, appDir,
                     LinkOption.NOFOLLOW_LINKS);
 
-            // Create PackageFile if predefined app image is not signed
-            if (!StandardBundlerParam.isRuntimeInstaller(params) &&
-                    !AppImageFile.load(predefinedImage).isSigned()) {
+            // Alter app image if predefined app image is not signed
+            if (!AppImageFile.load(predefinedImage).isSigned()) {
                 new PackageFile(APP_NAME.fetchFrom(params)).save(
                         ApplicationLayout.macAppImage().resolveAt(appDir));
+                Files.deleteIfExists(AppImageFile.getPathInAppImage(appDir));
                 // We need to re-sign app image after adding ".package" to it.
                 // We only do this if app image was not signed which means it is
                 // signed with ad-hoc signature. App bundles with ad-hoc
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/AbstractAppImageBuilder.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/AbstractAppImageBuilder.java
index b523e43f5aa..9575e6ccb03 100644
--- a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/AbstractAppImageBuilder.java
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/AbstractAppImageBuilder.java
@@ -66,6 +66,10 @@ public abstract class AbstractAppImageBuilder {
     public abstract void prepareApplicationFiles(
             Map<String, ? super Object> params) throws IOException;
 
+    protected boolean withAppImageFile(Map<String, ? super Object> params) {
+        return true;
+    }
+
     protected void writeCfgFile(Map<String, ? super Object> params) throws
             IOException {
         new CfgFile().initFromParams(params).create(root);
@@ -96,7 +100,9 @@ public abstract class AbstractAppImageBuilder {
                     appLayout.appDirectory().toAbsolutePath(), excludes);
         }
 
-        AppImageFile.save(root, params);
+        if (withAppImageFile(params)) {
+            AppImageFile.save(root, params);
+        }
 
         List<String> items = APP_CONTENT.fetchFrom(params);
         for (String item : items) {
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 d72e84bfab1..fc5adf7fdea 100644
--- a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/JPackageCommand.java
+++ b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/JPackageCommand.java
@@ -374,7 +374,7 @@ public class JPackageCommand extends CommandArguments<JPackageCommand> {
             String dirName;
             if (!TKit.isOSX()) {
                 dirName = name();
-            } else if (hasArgument("--app-image") && hasArgument("--mac-sign")) {
+            } else if (MacHelper.signPredefinedAppImage(this)) {
                 // Request to sign external app image, not to build a new one
                 dirName = getArgumentValue("--app-image");
             } else {
@@ -936,6 +936,27 @@ public class JPackageCommand extends CommandArguments<JPackageCommand> {
         return this;
     }
 
+    private boolean expectAppImageFile() {
+        if (isRuntime()) {
+            return false;
+        }
+
+        if (TKit.isOSX()) {
+            if (MacHelper.signPredefinedAppImage(this)) {
+                // Request to sign external app image, ".jpackage.xml" file should exist.
+                return true;
+            }
+
+            if (!isImagePackageType() && hasArgument("--app-image")) {
+                // Build native macOS package from an external app image.
+                // If the external app image is signed, ".jpackage.xml" file should be kept, otherwise removed.
+                return AppImageFile.load(Path.of(getArgumentValue("--app-image"))).macSigned();
+            }
+        }
+
+        return isImagePackageType();
+    }
+
     private void assertAppImageFile() {
         Path appImageDir = Path.of("");
         if (isImagePackageType() && hasArgument("--app-image")) {
@@ -943,31 +964,26 @@ public class JPackageCommand extends CommandArguments<JPackageCommand> {
         }
 
         final Path lookupPath = AppImageFile.getPathInAppImage(appImageDir);
-        if (isRuntime() || (!isImagePackageType() && !TKit.isOSX())) {
+        if (!expectAppImageFile()) {
             assertFileInAppImage(lookupPath, null);
-        } else if (!TKit.isOSX()) {
-            assertFileInAppImage(lookupPath, lookupPath);
         } else {
             assertFileInAppImage(lookupPath, lookupPath);
 
-            // If file exist validated important values based on arguments
-            // Exclude validation when we generating packages from predefined
-            // app images, since we do not know if image is signed or not.
-            if (isImagePackageType() || !hasArgument("--app-image")) {
+            if (TKit.isOSX()) {
                 final Path rootDir = isImagePackageType() ? outputBundle() :
                         pathToUnpackedPackageFile(appInstallationDirectory());
 
                 AppImageFile aif = AppImageFile.load(rootDir);
 
-                boolean expectedValue = hasArgument("--mac-sign");
+                boolean expectedValue = MacHelper.appImageSigned(this);
                 boolean actualValue = aif.macSigned();
-                TKit.assertEquals(Boolean.toString(expectedValue), Boolean.toString(actualValue),
-                    "Check for unexptected value in app image file for <signed>");
+                TKit.assertEquals(expectedValue, actualValue,
+                    "Check for unexpected value of <signed> property in app image file");
 
                 expectedValue = hasArgument("--mac-app-store");
                 actualValue = aif.macAppStore();
-                TKit.assertEquals(Boolean.toString(expectedValue), Boolean.toString(actualValue),
-                    "Check for unexptected value in app image file for <app-store>");
+                TKit.assertEquals(expectedValue, actualValue,
+                    "Check for unexpected value of <app-store> property in app image file");
             }
         }
     }
@@ -1037,11 +1053,17 @@ public class JPackageCommand extends CommandArguments<JPackageCommand> {
     }
 
     JPackageCommand winMsiLogFile(Path v) {
+        if (!TKit.isWindows()) {
+            throw new UnsupportedOperationException();
+        }
         this.winMsiLogFile = v;
         return this;
     }
 
     public Optional<Path> winMsiLogFile() {
+        if (!TKit.isWindows()) {
+            throw new UnsupportedOperationException();
+        }
         return Optional.ofNullable(winMsiLogFile);
     }
 
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 23d0ec80f1d..4ecc0b81811 100644
--- a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/MacHelper.java
+++ b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/MacHelper.java
@@ -33,6 +33,7 @@ import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Objects;
 import java.util.Optional;
 import java.util.Set;
 import java.util.regex.Pattern;
@@ -149,6 +150,32 @@ public final class MacHelper {
                 .collect(Collectors.joining()))).get();
     }
 
+    public static boolean signPredefinedAppImage(JPackageCommand cmd) {
+        Objects.requireNonNull(cmd);
+        if (!TKit.isOSX()) {
+            throw new UnsupportedOperationException();
+        }
+        return cmd.hasArgument("--mac-sign") && cmd.hasArgument("--app-image");
+    }
+
+    public static boolean appImageSigned(JPackageCommand cmd) {
+        Objects.requireNonNull(cmd);
+        if (!TKit.isOSX()) {
+            throw new UnsupportedOperationException();
+        }
+
+        if (Optional.ofNullable(cmd.getArgumentValue("--app-image")).map(Path::of).map(AppImageFile::load).map(AppImageFile::macSigned).orElse(false)) {
+            // The external app image is signed, so the app image is signed too.
+            return true;
+        }
+
+        if (!cmd.hasArgument("--mac-sign")) {
+            return false;
+        }
+
+        return (cmd.hasArgument("--mac-signing-key-user-name") || cmd.hasArgument("--mac-app-image-sign-identity"));
+    }
+
     static PackageHandlers createDmgPackageHandlers() {
         return new PackageHandlers(MacHelper::installDmg, MacHelper::uninstallDmg, MacHelper::unpackDmg);
     }

From 1077265953e6f0918f8f7625ad311f28453c893a Mon Sep 17 00:00:00 2001
From: Alexey Semenyuk <asemenyuk@openjdk.org>
Date: Mon, 31 Mar 2025 22:16:05 +0000
Subject: [PATCH 574/587] 8353321: [macos] ErrorTest.testAppContentWarning test
 case requires signing environment

Reviewed-by: almatvee
---
 .../helpers/jdk/jpackage/test/MacSign.java    |  2 +-
 .../tools/jpackage/macosx/MacSignTest.java    | 86 +++++++++++++++++++
 .../jpackage/macosx/base/SigningBase.java     | 37 ++++++--
 test/jdk/tools/jpackage/share/ErrorTest.java  | 29 -------
 4 files changed, 116 insertions(+), 38 deletions(-)
 create mode 100644 test/jdk/tools/jpackage/macosx/MacSignTest.java

diff --git a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/MacSign.java b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/MacSign.java
index 1efae8a055c..1d5dd16fe37 100644
--- a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/MacSign.java
+++ b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/MacSign.java
@@ -287,7 +287,7 @@ public final class MacSign {
             }
 
             public Builder addCert(CertificateRequest v) {
-                certs.add(v);
+                certs.add(Objects.requireNonNull(v));
                 return this;
             }
 
diff --git a/test/jdk/tools/jpackage/macosx/MacSignTest.java b/test/jdk/tools/jpackage/macosx/MacSignTest.java
new file mode 100644
index 00000000000..4313f1900e2
--- /dev/null
+++ b/test/jdk/tools/jpackage/macosx/MacSignTest.java
@@ -0,0 +1,86 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.io.IOException;
+import java.nio.file.Files;
+import java.util.ArrayList;
+import java.util.List;
+import jdk.jpackage.test.Annotations.Test;
+import jdk.jpackage.test.CannedFormattedString;
+import jdk.jpackage.test.JPackageCommand;
+import jdk.jpackage.test.JPackageStringBundle;
+import jdk.jpackage.test.MacHelper;
+import jdk.jpackage.test.TKit;
+
+/*
+ * @test
+ * @summary jpackage with --mac-sign
+ * @library /test/jdk/tools/jpackage/helpers
+ * @library base
+ * @build SigningBase
+ * @build jdk.jpackage.test.*
+ * @build MacSignTest
+ * @requires (jpackage.test.MacSignTests == "run")
+ * @run main/othervm/timeout=720 -Xmx512m jdk.jpackage.test.Main
+ *  --jpt-run=MacSignTest
+ *  --jpt-before-run=SigningBase.verifySignTestEnvReady
+ */
+public class MacSignTest {
+
+    @Test
+    public static void testAppContentWarning() throws IOException {
+
+        // Create app content directory with the name known to fail signing.
+        // This will trigger jpackage exit with status code "1".
+        final var appContent = TKit.createTempDirectory("app-content").resolve("foo.1");
+        Files.createDirectory(appContent);
+        Files.createFile(appContent.resolve("file"));
+
+        final List<CannedFormattedString> expectedStrings = new ArrayList<>();
+        expectedStrings.add(JPackageStringBundle.MAIN.cannedFormattedString("message.codesign.failed.reason.app.content"));
+
+        final var xcodeWarning = JPackageStringBundle.MAIN.cannedFormattedString("message.codesign.failed.reason.xcode.tools");
+        if (!MacHelper.isXcodeDevToolsInstalled()) {
+            expectedStrings.add(xcodeWarning);
+        }
+
+        // --app-content and --type app-image
+        // Expect `message.codesign.failed.reason.app.content` message in the log.
+        // This is not a fatal error, just a warning.
+        // To make jpackage fail, specify bad additional content.
+        final var cmd = JPackageCommand.helloAppImage()
+                .ignoreDefaultVerbose(true)
+                .validateOutput(expectedStrings.toArray(CannedFormattedString[]::new))
+                .addArguments("--app-content", appContent)
+                .addArguments("--mac-sign")
+                .addArguments("--mac-signing-keychain", SigningBase.StandardKeychain.MAIN.spec().keychain().name())
+                .addArguments("--mac-app-image-sign-identity", SigningBase.StandardCertificateRequest.APP_IMAGE.spec().name());
+
+        if (MacHelper.isXcodeDevToolsInstalled()) {
+            // Check there is no warning about missing xcode command line developer tools.
+            cmd.validateOutput(TKit.assertTextStream(xcodeWarning.getValue()).negate());
+        }
+
+        cmd.execute(1);
+    }
+}
diff --git a/test/jdk/tools/jpackage/macosx/base/SigningBase.java b/test/jdk/tools/jpackage/macosx/base/SigningBase.java
index d188a57dbd8..e3237197c74 100644
--- a/test/jdk/tools/jpackage/macosx/base/SigningBase.java
+++ b/test/jdk/tools/jpackage/macosx/base/SigningBase.java
@@ -63,12 +63,33 @@ import jdk.jpackage.test.TKit;
 
 public class SigningBase {
 
-    enum StandardKeychain {
-        MAIN(DEFAULT_KEYCHAIN,
-                cert().userName(DEV_NAMES[CertIndex.ASCII_INDEX.value()]).create(),
-                cert().type(CertificateType.INSTALLER).userName(DEV_NAMES[CertIndex.ASCII_INDEX.value()]).create(),
-                cert().userName(DEV_NAMES[CertIndex.UNICODE_INDEX.value()]).create(),
-                cert().type(CertificateType.INSTALLER).userName(DEV_NAMES[CertIndex.UNICODE_INDEX.value()]).create());
+    public enum StandardCertificateRequest {
+        APP_IMAGE(cert().userName(DEV_NAMES[CertIndex.ASCII_INDEX.value()])),
+        INSTALLER(cert().type(CertificateType.INSTALLER).userName(DEV_NAMES[CertIndex.ASCII_INDEX.value()])),
+        APP_IMAGE_UNICODE(cert().userName(DEV_NAMES[CertIndex.UNICODE_INDEX.value()])),
+        INSTALLER_UNICODE(cert().type(CertificateType.INSTALLER).userName(DEV_NAMES[CertIndex.UNICODE_INDEX.value()]));
+
+        StandardCertificateRequest(CertificateRequest.Builder specBuilder) {
+            this.spec = specBuilder.create();
+        }
+
+        public CertificateRequest spec() {
+            return spec;
+        }
+
+        private static CertificateRequest.Builder cert() {
+            return new CertificateRequest.Builder();
+        }
+
+        private final CertificateRequest spec;
+    }
+
+    public enum StandardKeychain {
+        MAIN(DEFAULT_KEYCHAIN, StandardCertificateRequest.values());
+
+        StandardKeychain(String keychainName, StandardCertificateRequest... certs) {
+            this(keychainName, certs[0].spec(), Stream.of(certs).skip(1).map(StandardCertificateRequest::spec).toArray(CertificateRequest[]::new));
+        }
 
         StandardKeychain(String keychainName, CertificateRequest cert, CertificateRequest... otherCerts) {
             final var builder = keychain(keychainName).addCert(cert);
@@ -76,7 +97,7 @@ public class SigningBase {
             this.spec = builder.create();
         }
 
-        KeychainWithCertsSpec spec() {
+        public KeychainWithCertsSpec spec() {
             return spec;
         }
 
@@ -92,7 +113,7 @@ public class SigningBase {
             return Stream.of(values()).map(StandardKeychain::spec).toList();
         }
 
-        final KeychainWithCertsSpec spec;
+        private final KeychainWithCertsSpec spec;
     }
 
     public static void setUp() {
diff --git a/test/jdk/tools/jpackage/share/ErrorTest.java b/test/jdk/tools/jpackage/share/ErrorTest.java
index 59b0ccb4bd7..9590115a2a1 100644
--- a/test/jdk/tools/jpackage/share/ErrorTest.java
+++ b/test/jdk/tools/jpackage/share/ErrorTest.java
@@ -47,7 +47,6 @@ import jdk.jpackage.test.Annotations.Test;
 import jdk.jpackage.test.CannedFormattedString;
 import jdk.jpackage.test.JPackageCommand;
 import jdk.jpackage.test.JPackageStringBundle;
-import jdk.jpackage.test.MacHelper;
 import jdk.jpackage.test.PackageType;
 import jdk.jpackage.test.TKit;
 
@@ -558,34 +557,6 @@ public final class ErrorTest {
         return toTestArgs(testCases.stream());
     }
 
-    @Test(ifOS = MACOS)
-    public static void testAppContentWarning() {
-        // --app-content and --type app-image
-        // Expect `message.codesign.failed.reason.app.content` message in the log.
-        // This is not a fatal error, just a warning.
-        // To make jpackage fail, specify invalid signing identity.
-        final var cmd = JPackageCommand.helloAppImage()
-                .addArguments("--app-content", TKit.TEST_SRC_ROOT.resolve("apps/dukeplug.png"))
-                .addArguments("--mac-sign", "--mac-app-image-sign-identity", "foo");
-
-        final List<CannedFormattedString> expectedStrings = new ArrayList<>();
-        expectedStrings.add(JPackageStringBundle.MAIN.cannedFormattedString("message.codesign.failed.reason.app.content"));
-
-        final var xcodeWarning = JPackageStringBundle.MAIN.cannedFormattedString("message.codesign.failed.reason.xcode.tools");
-        if (!MacHelper.isXcodeDevToolsInstalled()) {
-            expectedStrings.add(xcodeWarning);
-        }
-
-        defaultInit(cmd, expectedStrings);
-
-        if (MacHelper.isXcodeDevToolsInstalled()) {
-            // Check there is no warning about missing xcode command line developer tools.
-            cmd.validateOutput(TKit.assertTextStream(xcodeWarning.getValue()).negate());
-        }
-
-        cmd.execute(1);
-    }
-
     public static Collection<Object[]> testLinux() {
         final List<TestSpec> testCases = new ArrayList<>();
 

From a83760a6f204837b737b82801ee9eca2988317cf Mon Sep 17 00:00:00 2001
From: Ioi Lam <iklam@openjdk.org>
Date: Mon, 31 Mar 2025 23:35:48 +0000
Subject: [PATCH 575/587] 8352092: -XX:AOTMode=record crashes with
 InstanceKlass in allocated state

Reviewed-by: dholmes, coleenp
---
 src/hotspot/share/cds/metaspaceShared.cpp | 62 +++++++++++------------
 1 file changed, 31 insertions(+), 31 deletions(-)

diff --git a/src/hotspot/share/cds/metaspaceShared.cpp b/src/hotspot/share/cds/metaspaceShared.cpp
index 3ca107b81ed..ac43af3826a 100644
--- a/src/hotspot/share/cds/metaspaceShared.cpp
+++ b/src/hotspot/share/cds/metaspaceShared.cpp
@@ -692,25 +692,27 @@ void VM_PopulateDumpSharedSpace::doit() {
   _map_info->header()->set_class_location_config(cl_config);
 }
 
-class CollectCLDClosure : public CLDClosure {
-  GrowableArray<ClassLoaderData*> _loaded_cld;
-  GrowableArray<OopHandle> _loaded_cld_handles; // keep the CLDs alive
-  Thread* _current_thread;
+class CollectClassesForLinking : public KlassClosure {
+  GrowableArray<OopHandle> _mirrors;
+
 public:
-  CollectCLDClosure(Thread* thread) : _current_thread(thread) {}
-  ~CollectCLDClosure() {
-    for (int i = 0; i < _loaded_cld_handles.length(); i++) {
-      _loaded_cld_handles.at(i).release(Universe::vm_global());
+  ~CollectClassesForLinking() {
+    for (int i = 0; i < _mirrors.length(); i++) {
+      _mirrors.at(i).release(Universe::vm_global());
     }
   }
+
   void do_cld(ClassLoaderData* cld) {
     assert(cld->is_alive(), "must be");
-    _loaded_cld.append(cld);
-    _loaded_cld_handles.append(OopHandle(Universe::vm_global(), cld->holder()));
   }
 
-  int nof_cld() const                { return _loaded_cld.length(); }
-  ClassLoaderData* cld_at(int index) { return _loaded_cld.at(index); }
+  void do_klass(Klass* k) {
+    if (k->is_instance_klass()) {
+      _mirrors.append(OopHandle(Universe::vm_global(), k->java_mirror()));
+    }
+  }
+
+  const GrowableArray<OopHandle>* mirrors() const { return &_mirrors; }
 };
 
 // Check if we can eagerly link this class at dump time, so we can avoid the
@@ -751,28 +753,26 @@ void MetaspaceShared::link_shared_classes(bool jcmd_request, TRAPS) {
     LambdaFormInvokers::regenerate_holder_classes(CHECK);
   }
 
-  // Collect all loaded ClassLoaderData.
-  CollectCLDClosure collect_cld(THREAD);
-  {
-    // ClassLoaderDataGraph::loaded_cld_do requires ClassLoaderDataGraph_lock.
-    // We cannot link the classes while holding this lock (or else we may run into deadlock).
-    // Therefore, we need to first collect all the CLDs, and then link their classes after
-    // releasing the lock.
-    MutexLocker lock(ClassLoaderDataGraph_lock);
-    ClassLoaderDataGraph::loaded_cld_do(&collect_cld);
-  }
 
   while (true) {
+    CollectClassesForLinking collect_classes;
+    {
+      // ClassLoaderDataGraph::loaded_classes_do_keepalive() requires ClassLoaderDataGraph_lock.
+      // We cannot link the classes while holding this lock (or else we may run into deadlock).
+      // Therefore, we need to first collect all the classes, keeping them alive by
+      // holding onto their java_mirrors in global OopHandles. We then link the classes after
+      // releasing the lock.
+      MutexLocker lock(ClassLoaderDataGraph_lock);
+      ClassLoaderDataGraph::loaded_classes_do_keepalive(&collect_classes);
+    }
+
     bool has_linked = false;
-    for (int i = 0; i < collect_cld.nof_cld(); i++) {
-      ClassLoaderData* cld = collect_cld.cld_at(i);
-      for (Klass* klass = cld->klasses(); klass != nullptr; klass = klass->next_link()) {
-        if (klass->is_instance_klass()) {
-          InstanceKlass* ik = InstanceKlass::cast(klass);
-          if (may_be_eagerly_linked(ik)) {
-            has_linked |= link_class_for_cds(ik, CHECK);
-          }
-        }
+    const GrowableArray<OopHandle>* mirrors = collect_classes.mirrors();
+    for (int i = 0; i < mirrors->length(); i++) {
+      OopHandle mirror = mirrors->at(i);
+      InstanceKlass* ik = InstanceKlass::cast(java_lang_Class::as_Klass(mirror.resolve()));
+      if (may_be_eagerly_linked(ik)) {
+        has_linked |= link_class_for_cds(ik, CHECK);
       }
     }
 

From 860a789e9153448345f19d70dd07e294a0b62223 Mon Sep 17 00:00:00 2001
From: Fei Yang <fyang@openjdk.org>
Date: Tue, 1 Apr 2025 01:39:22 +0000
Subject: [PATCH 576/587] 8353219: RISC-V: Fix client builds after JDK-8345298

Reviewed-by: fjiang, rehn
---
 src/hotspot/cpu/riscv/stubGenerator_riscv.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/hotspot/cpu/riscv/stubGenerator_riscv.cpp b/src/hotspot/cpu/riscv/stubGenerator_riscv.cpp
index e0157b0e599..4527a32926f 100644
--- a/src/hotspot/cpu/riscv/stubGenerator_riscv.cpp
+++ b/src/hotspot/cpu/riscv/stubGenerator_riscv.cpp
@@ -6151,6 +6151,8 @@ class StubGenerator: public StubCodeGenerator {
     return start;
   }
 
+#endif // COMPILER2_OR_JVMCI
+
   // x10 = input (float16)
   // f10 = result (float)
   // t1  = temporary register
@@ -6249,8 +6251,6 @@ class StubGenerator: public StubCodeGenerator {
     return entry;
   }
 
-#endif // COMPILER2_OR_JVMCI
-
 #ifdef COMPILER2
 
 static const int64_t right_2_bits = right_n_bits(2);

From 8b4e190bc8aa5499f96dbe2de01cf34ddcdb67a7 Mon Sep 17 00:00:00 2001
From: David Holmes <dholmes@openjdk.org>
Date: Tue, 1 Apr 2025 05:42:52 +0000
Subject: [PATCH 577/587] 8353349: ProblemList
 runtime/cds/appcds/SignedJar.java

Reviewed-by: iklam, jpai
---
 test/hotspot/jtreg/ProblemList.txt | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/test/hotspot/jtreg/ProblemList.txt b/test/hotspot/jtreg/ProblemList.txt
index 0e71df4f27f..dbacefa1f30 100644
--- a/test/hotspot/jtreg/ProblemList.txt
+++ b/test/hotspot/jtreg/ProblemList.txt
@@ -103,6 +103,8 @@ gc/shenandoah/TestEvilSyncBug.java#generational 8345501 generic-all
 
 # :hotspot_runtime
 
+runtime/cds/appcds/SignedJar.java 8353330 generic-all
+
 runtime/jni/terminatedThread/TestTerminatedThread.java 8317789 aix-ppc64
 runtime/handshake/HandshakeSuspendExitTest.java 8294313 generic-all
 runtime/Monitor/SyncOnValueBasedClassTest.java 8340995 linux-s390x

From ad48846edd894073d89839a2771271553b4e27cd Mon Sep 17 00:00:00 2001
From: SendaoYan <syan@openjdk.org>
Date: Tue, 1 Apr 2025 06:25:07 +0000
Subject: [PATCH 578/587] 8350386: Test TestCodeCacheFull.java fails with
 option -XX:-UseCodeCacheFlushing

Reviewed-by: tschatzl
---
 test/jdk/jdk/jfr/event/compiler/TestCodeCacheFull.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/test/jdk/jdk/jfr/event/compiler/TestCodeCacheFull.java b/test/jdk/jdk/jfr/event/compiler/TestCodeCacheFull.java
index ba72d251372..3d9cd083204 100644
--- a/test/jdk/jdk/jfr/event/compiler/TestCodeCacheFull.java
+++ b/test/jdk/jdk/jfr/event/compiler/TestCodeCacheFull.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -36,6 +36,7 @@ import jdk.test.whitebox.code.BlobType;
 /**
  * @test TestCodeCacheFull
  * @requires vm.hasJFR
+ * @requires vm.opt.UseCodeCacheFlushing == null | vm.opt.UseCodeCacheFlushing == true
  *
  * @library /test/lib
  * @modules jdk.jfr

From 196334fc395c63e59167ccd85415d8e1d2bcb705 Mon Sep 17 00:00:00 2001
From: Joachim Kern <jkern@openjdk.org>
Date: Tue, 1 Apr 2025 08:09:53 +0000
Subject: [PATCH 579/587] 8352046: Test testEcoFriendly() in jdk tools launcher
 ExecutionEnvironment.java for AIX and Linux/musl is brittle

Reviewed-by: clanger, mbaesken
---
 .../tools/launcher/ExecutionEnvironment.java  | 74 +++++--------------
 1 file changed, 19 insertions(+), 55 deletions(-)

diff --git a/test/jdk/tools/launcher/ExecutionEnvironment.java b/test/jdk/tools/launcher/ExecutionEnvironment.java
index 571946caf2a..8a10756021e 100644
--- a/test/jdk/tools/launcher/ExecutionEnvironment.java
+++ b/test/jdk/tools/launcher/ExecutionEnvironment.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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,49 +24,27 @@
 /*
  * @test
  * @bug 4780570 4731671 6354700 6367077 6670965 4882974
- * @summary Checks for LD_LIBRARY_PATH and execution  on *nixes
- * @requires os.family != "windows" & !vm.musl & os.family != "aix"
+ * @summary Checks for LD_LIBRARY_PATH and execution on *nixes
+ * @requires os.family != "windows"
  * @library /test/lib
  * @modules jdk.compiler
  *          jdk.zipfs
- * @compile -XDignore.symbol.file ExecutionEnvironment.java
- * @run main/othervm -DexpandedLdLibraryPath=false ExecutionEnvironment
- */
-
-/*
- * @test
- * @bug 4780570 4731671 6354700 6367077 6670965 4882974
- * @summary Checks for LD_LIBRARY_PATH and execution  on *nixes
- * @requires os.family == "aix" | vm.musl
- * @library /test/lib
- * @modules jdk.compiler
- *          jdk.zipfs
- * @compile -XDignore.symbol.file ExecutionEnvironment.java
- * @run main/othervm -DexpandedLdLibraryPath=true ExecutionEnvironment
+ * @run main/othervm ExecutionEnvironment
  */
 
 /*
  * This tests for various things as follows:
  * Ensures that:
- *   1. uneccessary execs do not occur
+ *   1. unneccessary execs do not occur
  *   2. the environment is pristine,  users environment variable wrt.
  *      LD_LIBRARY_PATH if set are not modified in any way.
  *   3. the correct vm is chosen with -server and -client options
- *   4. the VM on Solaris correctly interprets the LD_LIBRARY_PATH32
- *      and LD_LIBRARY_PATH64 variables if set by the user, ie.
- *      i. on 32 bit systems:
- *         a. if LD_LIBRARY_PATH32 is set it will override LD_LIBRARY_PATH
- *         b. LD_LIBRARY_PATH64 is ignored if set
- *      ii. on 64 bit systems:
- *            a. if LD_LIBRARY_PATH64 is set it will override LD_LIBRARY_PATH
- *            b. LD_LIBRARY_PATH32 is ignored if set
- *   5. no extra symlink exists on Solaris ie.
+ *   4. no extra symlink exists i.e.
  *      lib/$arch/libjvm.so -> client/libjvm.so
  * TODO:
- *      a. perhaps we need to add a test to audit all environment variables are
- *         in pristine condition after the launch, there may be a few that the
- *         launcher may add as implementation details.
- *      b. add a pldd for solaris to ensure only one libjvm.so is linked
+ *      perhaps we need to add a test to audit all environment variables are
+ *      in pristine condition after the launch, there may be a few that the
+ *      launcher may add as implementation details.
  */
 
 import jdk.test.lib.Platform;
@@ -83,7 +61,7 @@ public class ExecutionEnvironment extends TestHelper {
     static final String LD_LIBRARY_PATH_32 = LD_LIBRARY_PATH + "_32";
     static final String LD_LIBRARY_PATH_64 = LD_LIBRARY_PATH + "_64";
 
-    // Note: these paths need not exist on the filesytem
+    // Note: these paths need not exist on the filesystem
     static final String LD_LIBRARY_PATH_VALUE    = "/Bridge/On/The/River/Kwai";
     static final String LD_LIBRARY_PATH_32_VALUE = "/Lawrence/Of/Arabia";
     static final String LD_LIBRARY_PATH_64_VALUE = "/A/Passage/To/India";
@@ -131,8 +109,9 @@ public class ExecutionEnvironment extends TestHelper {
         System.err.println(tr);
         throw new RuntimeException(message);
     }
+
     /*
-     * tests if the launcher pollutes the LD_LIBRARY_PATH variables ie. there
+     * tests if the launcher pollutes the LD_LIBRARY_PATH variables i.e. there
      * should not be any new variables or pollution/mutations of any kind, the
      * environment should be pristine.
      */
@@ -153,19 +132,21 @@ public class ExecutionEnvironment extends TestHelper {
 
         for (String x : LD_PATH_STRINGS) {
             if (!tr.contains(x)) {
-                if (IS_EXPANDED_LD_LIBRARY_PATH && x.startsWith(LD_LIBRARY_PATH)) {
+                if ((Platform.isAix() || Platform.isMusl()) && x.startsWith(LD_LIBRARY_PATH)) {
                     // AIX does not support the '-rpath' linker options so the
                     // launchers have to prepend the jdk library path to 'LIBPATH'.
                     // The musl library loader requires LD_LIBRARY_PATH to be set in
                     // order to correctly resolve the dependency libjava.so has on libjvm.so.
+                    String jvmroot = System.getProperty("java.home");
                     String libPath = LD_LIBRARY_PATH + "=" +
-                        System.getenv(LD_LIBRARY_PATH) +
-                        System.getProperty("path.separator") + LD_LIBRARY_PATH_VALUE;
+                        jvmroot + "/lib/server" + System.getProperty("path.separator") +
+                        jvmroot + "/lib" + System.getProperty("path.separator") +
+                        jvmroot + "/../lib" + System.getProperty("path.separator") +
+                        LD_LIBRARY_PATH_VALUE;
                     if (!tr.matches(libPath)) {
                         flagError(tr, "FAIL: did not get <" + libPath + ">");
                     }
-                }
-                else {
+                } else {
                     flagError(tr, "FAIL: did not get <" + x + ">");
                 }
             }
@@ -215,23 +196,6 @@ public class ExecutionEnvironment extends TestHelper {
         }
     }
 
-    private void verifyJavaLibraryPathOverride(TestResult tr,
-            boolean is32Bit) {
-        // make sure the 32/64 bit value exists
-        if (!tr.matches("java.library.path=.*" +
-                (is32Bit ? LD_LIBRARY_PATH_32_VALUE : LD_LIBRARY_PATH_64_VALUE) + ".*")) {
-            flagError(tr, "verifyJavaLibraryPathOverride: " +
-                " java.library.path does not contain " +
-                    (is32Bit ? LD_LIBRARY_PATH_32_VALUE : LD_LIBRARY_PATH_64_VALUE));
-
-        }
-        // make sure the generic value is absent
-        if (!tr.notMatches("java.library.path=.*" + LD_LIBRARY_PATH_VALUE + ".*")) {
-            flagError(tr, "verifyJavaLibraryPathOverride: " +
-                    " java.library.path contains " + LD_LIBRARY_PATH_VALUE);
-        }
-    }
-
     /*
      * ensures we have indeed exec'ed the correct vm of choice if it exists
      */

From aff5aa72bbf4ecea614339483581093a67efa265 Mon Sep 17 00:00:00 2001
From: Afshin Zafari <azafari@openjdk.org>
Date: Tue, 1 Apr 2025 08:25:53 +0000
Subject: [PATCH 580/587] 8350566: NMT: add size parameter to
 MemTracker::record_virtual_memory_tag

Reviewed-by: jsjolen, gziemski
---
 src/hotspot/share/cds/metaspaceShared.cpp                | 7 +++----
 src/hotspot/share/gc/g1/g1RegionToSpaceMapper.cpp        | 2 +-
 src/hotspot/share/gc/parallel/parMarkBitMap.cpp          | 2 +-
 src/hotspot/share/gc/parallel/psParallelCompact.cpp      | 2 +-
 src/hotspot/share/gc/shared/cardTable.cpp                | 2 +-
 src/hotspot/share/gc/shenandoah/shenandoahCardTable.cpp  | 3 ++-
 .../share/gc/shenandoah/shenandoahCollectionSet.cpp      | 2 +-
 src/hotspot/share/gc/shenandoah/shenandoahHeap.cpp       | 8 ++++----
 .../share/jfr/recorder/storage/jfrVirtualMemory.cpp      | 2 +-
 src/hotspot/share/memory/metaspace.cpp                   | 2 +-
 src/hotspot/share/memory/metaspace/virtualSpaceNode.cpp  | 2 +-
 src/hotspot/share/nmt/memTracker.hpp                     | 9 +++++++--
 src/hotspot/share/nmt/virtualMemoryTracker.cpp           | 2 +-
 src/hotspot/share/nmt/virtualMemoryTracker.hpp           | 2 +-
 14 files changed, 26 insertions(+), 21 deletions(-)

diff --git a/src/hotspot/share/cds/metaspaceShared.cpp b/src/hotspot/share/cds/metaspaceShared.cpp
index ac43af3826a..277c6ce90e7 100644
--- a/src/hotspot/share/cds/metaspaceShared.cpp
+++ b/src/hotspot/share/cds/metaspaceShared.cpp
@@ -1532,7 +1532,7 @@ char* MetaspaceShared::reserve_address_space_for_archives(FileMapInfo* static_ma
       assert(base_address == nullptr ||
              (address)archive_space_rs.base() == base_address, "Sanity");
       // Register archive space with NMT.
-      MemTracker::record_virtual_memory_tag(archive_space_rs.base(), mtClassShared);
+      MemTracker::record_virtual_memory_tag(archive_space_rs, mtClassShared);
       return archive_space_rs.base();
     }
     return nullptr;
@@ -1605,9 +1605,8 @@ char* MetaspaceShared::reserve_address_space_for_archives(FileMapInfo* static_ma
       release_reserved_spaces(total_space_rs, archive_space_rs, class_space_rs);
       return nullptr;
     }
-    // NMT: fix up the space tags
-    MemTracker::record_virtual_memory_tag(archive_space_rs.base(), mtClassShared);
-    MemTracker::record_virtual_memory_tag(class_space_rs.base(), mtClass);
+    MemTracker::record_virtual_memory_tag(archive_space_rs, mtClassShared);
+    MemTracker::record_virtual_memory_tag(class_space_rs, mtClass);
   } else {
     if (use_archive_base_addr && base_address != nullptr) {
       total_space_rs = MemoryReserver::reserve((char*) base_address,
diff --git a/src/hotspot/share/gc/g1/g1RegionToSpaceMapper.cpp b/src/hotspot/share/gc/g1/g1RegionToSpaceMapper.cpp
index 33a9df79349..1710ceaf73a 100644
--- a/src/hotspot/share/gc/g1/g1RegionToSpaceMapper.cpp
+++ b/src/hotspot/share/gc/g1/g1RegionToSpaceMapper.cpp
@@ -47,7 +47,7 @@ G1RegionToSpaceMapper::G1RegionToSpaceMapper(ReservedSpace rs,
   guarantee(is_power_of_2(page_size), "must be");
   guarantee(is_power_of_2(region_granularity), "must be");
 
-  MemTracker::record_virtual_memory_tag((address)rs.base(), mem_tag);
+  MemTracker::record_virtual_memory_tag(rs, mem_tag);
 }
 
 // Used to manually signal a mapper to handle a set of regions as committed.
diff --git a/src/hotspot/share/gc/parallel/parMarkBitMap.cpp b/src/hotspot/share/gc/parallel/parMarkBitMap.cpp
index f1d309807b5..f33d7f93f1d 100644
--- a/src/hotspot/share/gc/parallel/parMarkBitMap.cpp
+++ b/src/hotspot/share/gc/parallel/parMarkBitMap.cpp
@@ -59,7 +59,7 @@ ParMarkBitMap::initialize(MemRegion covered_region)
   os::trace_page_sizes("Mark Bitmap", raw_bytes, raw_bytes,
                        rs.base(), rs.size(), used_page_sz);
 
-  MemTracker::record_virtual_memory_tag((address)rs.base(), mtGC);
+  MemTracker::record_virtual_memory_tag(rs, mtGC);
 
   _virtual_space = new PSVirtualSpace(rs, page_sz);
 
diff --git a/src/hotspot/share/gc/parallel/psParallelCompact.cpp b/src/hotspot/share/gc/parallel/psParallelCompact.cpp
index 9f51aba080e..99b975c282a 100644
--- a/src/hotspot/share/gc/parallel/psParallelCompact.cpp
+++ b/src/hotspot/share/gc/parallel/psParallelCompact.cpp
@@ -256,7 +256,7 @@ ParallelCompactData::create_vspace(size_t count, size_t element_size)
   os::trace_page_sizes("Parallel Compact Data", raw_bytes, raw_bytes, rs.base(),
                        rs.size(), page_sz);
 
-  MemTracker::record_virtual_memory_tag((address)rs.base(), mtGC);
+  MemTracker::record_virtual_memory_tag(rs, mtGC);
 
   PSVirtualSpace* vspace = new PSVirtualSpace(rs, page_sz);
 
diff --git a/src/hotspot/share/gc/shared/cardTable.cpp b/src/hotspot/share/gc/shared/cardTable.cpp
index fbfc07a4e09..3236d73933c 100644
--- a/src/hotspot/share/gc/shared/cardTable.cpp
+++ b/src/hotspot/share/gc/shared/cardTable.cpp
@@ -87,7 +87,7 @@ void CardTable::initialize(void* region0_start, void* region1_start) {
                                   "card marking array");
   }
 
-  MemTracker::record_virtual_memory_tag((address)rs.base(), mtGC);
+  MemTracker::record_virtual_memory_tag(rs, mtGC);
 
   os::trace_page_sizes("Card Table", num_bytes, num_bytes,
                        rs.base(), rs.size(), _page_size);
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahCardTable.cpp b/src/hotspot/share/gc/shenandoah/shenandoahCardTable.cpp
index b3284051ee7..00f11938489 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahCardTable.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahCardTable.cpp
@@ -1,4 +1,5 @@
 /*
+ * Copyright (c) 2025, 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.
  *
@@ -83,7 +84,7 @@ void ShenandoahCardTable::initialize(const ReservedSpace& card_table) {
     vm_exit_during_initialization("Could not reserve enough space for the card marking array");
   }
 
-  MemTracker::record_virtual_memory_tag((address)card_table.base(), mtGC);
+  MemTracker::record_virtual_memory_tag(card_table, mtGC);
 
   os::trace_page_sizes("Card Table", _byte_map_size, _byte_map_size,
                        card_table.base(), card_table.size(), _page_size);
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahCollectionSet.cpp b/src/hotspot/share/gc/shenandoah/shenandoahCollectionSet.cpp
index c27b790fbf7..1d353163463 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahCollectionSet.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahCollectionSet.cpp
@@ -63,7 +63,7 @@ ShenandoahCollectionSet::ShenandoahCollectionSet(ShenandoahHeap* heap, ReservedS
   // subsystem for mapping not-yet-written-to pages to a single physical backing page,
   // but this is not guaranteed, and would confuse NMT and other memory accounting tools.
 
-  MemTracker::record_virtual_memory_tag(_map_space.base(), mtGC);
+  MemTracker::record_virtual_memory_tag(_map_space, mtGC);
 
   size_t page_size = os::vm_page_size();
 
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahHeap.cpp b/src/hotspot/share/gc/shenandoah/shenandoahHeap.cpp
index e38e1636fd1..32acb42c765 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahHeap.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahHeap.cpp
@@ -303,7 +303,7 @@ jint ShenandoahHeap::initialize() {
                                           bitmap_size_orig, bitmap_page_size,
                                           bitmap.base(),
                                           bitmap.size(), bitmap.page_size());
-  MemTracker::record_virtual_memory_tag(bitmap.base(), mtGC);
+  MemTracker::record_virtual_memory_tag(bitmap, mtGC);
   _bitmap_region = MemRegion((HeapWord*) bitmap.base(), bitmap.size() / HeapWordSize);
   _bitmap_region_special = bitmap.special();
 
@@ -327,7 +327,7 @@ jint ShenandoahHeap::initialize() {
       os::commit_memory_or_exit(verify_bitmap.base(), verify_bitmap.size(), bitmap_page_size, false,
                                 "Cannot commit verification bitmap memory");
     }
-    MemTracker::record_virtual_memory_tag(verify_bitmap.base(), mtGC);
+    MemTracker::record_virtual_memory_tag(verify_bitmap, mtGC);
     MemRegion verify_bitmap_region = MemRegion((HeapWord *) verify_bitmap.base(), verify_bitmap.size() / HeapWordSize);
     _verification_bit_map.initialize(_heap_region, verify_bitmap_region);
     _verifier = new ShenandoahVerifier(this, &_verification_bit_map);
@@ -341,7 +341,7 @@ jint ShenandoahHeap::initialize() {
                                           bitmap_size_orig, aux_bitmap_page_size,
                                           aux_bitmap.base(),
                                           aux_bitmap.size(), aux_bitmap.page_size());
-  MemTracker::record_virtual_memory_tag(aux_bitmap.base(), mtGC);
+  MemTracker::record_virtual_memory_tag(aux_bitmap, mtGC);
   _aux_bitmap_region = MemRegion((HeapWord*) aux_bitmap.base(), aux_bitmap.size() / HeapWordSize);
   _aux_bitmap_region_special = aux_bitmap.special();
   _aux_bit_map.initialize(_heap_region, _aux_bitmap_region);
@@ -359,7 +359,7 @@ jint ShenandoahHeap::initialize() {
                                           region_storage_size_orig, region_page_size,
                                           region_storage.base(),
                                           region_storage.size(), region_storage.page_size());
-  MemTracker::record_virtual_memory_tag(region_storage.base(), mtGC);
+  MemTracker::record_virtual_memory_tag(region_storage, mtGC);
   if (!region_storage.special()) {
     os::commit_memory_or_exit(region_storage.base(), region_storage_size, region_page_size, false,
                               "Cannot commit region memory");
diff --git a/src/hotspot/share/jfr/recorder/storage/jfrVirtualMemory.cpp b/src/hotspot/share/jfr/recorder/storage/jfrVirtualMemory.cpp
index c91da007521..97f2b8a1990 100644
--- a/src/hotspot/share/jfr/recorder/storage/jfrVirtualMemory.cpp
+++ b/src/hotspot/share/jfr/recorder/storage/jfrVirtualMemory.cpp
@@ -119,7 +119,7 @@ bool JfrVirtualMemorySegment::initialize(size_t reservation_size_request_bytes)
                               _rs.base(),
                               _rs.size(),
                               os::vm_page_size());
-  MemTracker::record_virtual_memory_tag((address)_rs.base(), mtTracing);
+  MemTracker::record_virtual_memory_tag(_rs, mtTracing);
   assert(is_aligned(_rs.base(), os::vm_page_size()), "invariant");
   assert(is_aligned(_rs.size(), os::vm_page_size()), "invariant");
 
diff --git a/src/hotspot/share/memory/metaspace.cpp b/src/hotspot/share/memory/metaspace.cpp
index 3615c3dc7ee..04e5d807f32 100644
--- a/src/hotspot/share/memory/metaspace.cpp
+++ b/src/hotspot/share/memory/metaspace.cpp
@@ -797,7 +797,7 @@ void Metaspace::global_initialize() {
     }
 
     // Mark class space as such
-    MemTracker::record_virtual_memory_tag((address)rs.base(), mtClass);
+    MemTracker::record_virtual_memory_tag(rs, mtClass);
 
     // Initialize space
     Metaspace::initialize_class_space(rs);
diff --git a/src/hotspot/share/memory/metaspace/virtualSpaceNode.cpp b/src/hotspot/share/memory/metaspace/virtualSpaceNode.cpp
index 500649dc926..66644c805a9 100644
--- a/src/hotspot/share/memory/metaspace/virtualSpaceNode.cpp
+++ b/src/hotspot/share/memory/metaspace/virtualSpaceNode.cpp
@@ -260,7 +260,7 @@ VirtualSpaceNode* VirtualSpaceNode::create_node(size_t word_size,
   if (!rs.is_reserved()) {
     vm_exit_out_of_memory(word_size * BytesPerWord, OOM_MMAP_ERROR, "Failed to reserve memory for metaspace");
   }
-  MemTracker::record_virtual_memory_tag(rs.base(), mtMetaspace);
+  MemTracker::record_virtual_memory_tag(rs, mtMetaspace);
   assert_is_aligned(rs.base(), chunklevel::MAX_CHUNK_BYTE_SIZE);
   InternalStats::inc_num_vsnodes_births();
   return new VirtualSpaceNode(rs, true, limiter, reserve_words_counter, commit_words_counter);
diff --git a/src/hotspot/share/nmt/memTracker.hpp b/src/hotspot/share/nmt/memTracker.hpp
index 38b97dba69c..981e991a41e 100644
--- a/src/hotspot/share/nmt/memTracker.hpp
+++ b/src/hotspot/share/nmt/memTracker.hpp
@@ -25,6 +25,7 @@
 #ifndef SHARE_NMT_MEMTRACKER_HPP
 #define SHARE_NMT_MEMTRACKER_HPP
 
+#include "memory/reservedSpace.hpp"
 #include "nmt/mallocTracker.hpp"
 #include "nmt/nmtCommon.hpp"
 #include "nmt/memoryFileTracker.hpp"
@@ -220,12 +221,16 @@ class MemTracker : AllStatic {
     }
   }
 
-  static inline void record_virtual_memory_tag(void* addr, MemTag mem_tag) {
+  static inline void record_virtual_memory_tag(const ReservedSpace& rs, MemTag mem_tag) {
+    record_virtual_memory_tag(rs.base(), rs.size(), mem_tag);
+  }
+
+  static inline void record_virtual_memory_tag(void* addr, size_t size, MemTag mem_tag) {
     assert_post_init();
     if (!enabled()) return;
     if (addr != nullptr) {
       NmtVirtualMemoryLocker nvml;
-      VirtualMemoryTracker::set_reserved_region_tag((address)addr, mem_tag);
+      VirtualMemoryTracker::set_reserved_region_type((address)addr, size, mem_tag);
     }
   }
 
diff --git a/src/hotspot/share/nmt/virtualMemoryTracker.cpp b/src/hotspot/share/nmt/virtualMemoryTracker.cpp
index d5cba7ad82d..9e5d0a18c10 100644
--- a/src/hotspot/share/nmt/virtualMemoryTracker.cpp
+++ b/src/hotspot/share/nmt/virtualMemoryTracker.cpp
@@ -413,7 +413,7 @@ bool VirtualMemoryTracker::add_reserved_region(address base_addr, size_t size,
   }
 }
 
-void VirtualMemoryTracker::set_reserved_region_tag(address addr, MemTag mem_tag) {
+void VirtualMemoryTracker::set_reserved_region_type(address addr, size_t size, MemTag mem_tag) {
   assert(addr != nullptr, "Invalid address");
   assert(_reserved_regions != nullptr, "Sanity check");
   MemTracker::assert_locked();
diff --git a/src/hotspot/share/nmt/virtualMemoryTracker.hpp b/src/hotspot/share/nmt/virtualMemoryTracker.hpp
index 0b31bf5daa3..74d299e6637 100644
--- a/src/hotspot/share/nmt/virtualMemoryTracker.hpp
+++ b/src/hotspot/share/nmt/virtualMemoryTracker.hpp
@@ -386,7 +386,7 @@ class VirtualMemoryTracker : AllStatic {
   static bool remove_uncommitted_region (address base_addr, size_t size);
   static bool remove_released_region    (address base_addr, size_t size);
   static bool remove_released_region    (ReservedMemoryRegion* rgn);
-  static void set_reserved_region_tag   (address addr, MemTag mem_tag);
+  static void set_reserved_region_type  (address addr, size_t size, MemTag mem_tag);
 
   // Given an existing memory mapping registered with NMT, split the mapping in
   //  two. The newly created two mappings will be registered under the call

From f25f701652900d02858c905f4cd0bb43208c13d5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Markus=20Gr=C3=B6nlund?= <mgronlun@openjdk.org>
Date: Tue, 1 Apr 2025 09:17:44 +0000
Subject: [PATCH 581/587] 8353226: JFR: emit old object samples must be
 transitive closure complete for segment

Reviewed-by: egahlin
---
 .../checkpoint/objectSampleCheckpoint.cpp     | 20 +++++++++--
 .../jfr/recorder/stacktrace/jfrStackTrace.cpp |  2 ++
 .../jfr/recorder/stacktrace/jfrStackTrace.hpp |  2 +-
 .../stacktrace/jfrStackTraceRepository.cpp    | 36 +++++++++++++++++++
 .../stacktrace/jfrStackTraceRepository.hpp    |  5 ++-
 5 files changed, 61 insertions(+), 4 deletions(-)

diff --git a/src/hotspot/share/jfr/leakprofiler/checkpoint/objectSampleCheckpoint.cpp b/src/hotspot/share/jfr/leakprofiler/checkpoint/objectSampleCheckpoint.cpp
index 112469b9888..bd3ab03045f 100644
--- a/src/hotspot/share/jfr/leakprofiler/checkpoint/objectSampleCheckpoint.cpp
+++ b/src/hotspot/share/jfr/leakprofiler/checkpoint/objectSampleCheckpoint.cpp
@@ -256,7 +256,7 @@ void StackTraceBlobInstaller::install(ObjectSample* sample) {
   writer.write_type(TYPE_STACKTRACE);
   writer.write_count(1);
   ObjectSampleCheckpoint::write_stacktrace(stack_trace, writer);
-  blob = writer.copy();
+  blob = stack_trace->should_write() ? writer.copy() : writer.move();
   _cache.put(sample, blob);
   sample->set_stacktrace(blob);
 }
@@ -362,9 +362,17 @@ static void write_thread_blob(const ObjectSample* sample, JfrCheckpointWriter& w
   }
 }
 
+static GrowableArray<traceid>* _stacktrace_ids = nullptr;
+
 static void write_stacktrace_blob(const ObjectSample* sample, JfrCheckpointWriter& writer) {
+  assert(_stacktrace_ids != nullptr, "invariant");
   if (sample->has_stacktrace()) {
     write_blob(sample->stacktrace(), writer);
+    return;
+  }
+  const traceid stacktrace_id = sample->stack_trace_id();
+  if (stacktrace_id != 0) {
+    _stacktrace_ids->append(stacktrace_id);
   }
 }
 
@@ -402,7 +410,15 @@ void ObjectSampleCheckpoint::write(const ObjectSampler* sampler, EdgeStore* edge
   assert(sampler != nullptr, "invariant");
   assert(edge_store != nullptr, "invariant");
   assert(thread != nullptr, "invariant");
-  write_sample_blobs(sampler, emit_all, thread);
+  {
+    ResourceMark rm(thread);
+    _stacktrace_ids = new GrowableArray<traceid>(JfrOptionSet::old_object_queue_size());
+    write_sample_blobs(sampler, emit_all, thread);
+    if (_stacktrace_ids->is_nonempty()) {
+      _stacktrace_ids->sort(sort_traceid);
+      JfrStackTraceRepository::write_leak_profiler(_stacktrace_ids, thread);
+    }
+  }
   // write reference chains
   if (!edge_store->is_empty()) {
     JfrCheckpointWriter writer(thread);
diff --git a/src/hotspot/share/jfr/recorder/stacktrace/jfrStackTrace.cpp b/src/hotspot/share/jfr/recorder/stacktrace/jfrStackTrace.cpp
index cbe686fa910..f7e62858d22 100644
--- a/src/hotspot/share/jfr/recorder/stacktrace/jfrStackTrace.cpp
+++ b/src/hotspot/share/jfr/recorder/stacktrace/jfrStackTrace.cpp
@@ -102,7 +102,9 @@ void JfrStackTrace::write(JfrChunkWriter& sw) const {
 }
 
 void JfrStackTrace::write(JfrCheckpointWriter& cpw) const {
+  assert(!_written, "invariant");
   write_stacktrace(cpw, _id, _reached_root, _nr_of_frames, _frames);
+  _written = true;
 }
 
 bool JfrStackFrame::equals(const JfrStackFrame& rhs) const {
diff --git a/src/hotspot/share/jfr/recorder/stacktrace/jfrStackTrace.hpp b/src/hotspot/share/jfr/recorder/stacktrace/jfrStackTrace.hpp
index 8b2ca022443..6a7b750752c 100644
--- a/src/hotspot/share/jfr/recorder/stacktrace/jfrStackTrace.hpp
+++ b/src/hotspot/share/jfr/recorder/stacktrace/jfrStackTrace.hpp
@@ -82,7 +82,6 @@ class JfrStackTrace : public JfrCHeapObj {
 
   const JfrStackTrace* next() const { return _next; }
 
-  bool should_write() const { return !_written; }
   void write(JfrChunkWriter& cw) const;
   void write(JfrCheckpointWriter& cpw) const;
   bool equals(const JfrStackTrace& rhs) const;
@@ -107,6 +106,7 @@ class JfrStackTrace : public JfrCHeapObj {
  public:
   traceid hash() const { return _hash; }
   traceid id() const { return _id; }
+  bool should_write() const { return !_written; }
 };
 
 #endif // SHARE_JFR_RECORDER_STACKTRACE_JFRSTACKTRACE_HPP
diff --git a/src/hotspot/share/jfr/recorder/stacktrace/jfrStackTraceRepository.cpp b/src/hotspot/share/jfr/recorder/stacktrace/jfrStackTraceRepository.cpp
index c5909d49b9e..b75ac95e27f 100644
--- a/src/hotspot/share/jfr/recorder/stacktrace/jfrStackTraceRepository.cpp
+++ b/src/hotspot/share/jfr/recorder/stacktrace/jfrStackTraceRepository.cpp
@@ -27,7 +27,10 @@
 #include "jfr/recorder/repository/jfrChunkWriter.hpp"
 #include "jfr/recorder/stacktrace/jfrStackTraceRepository.hpp"
 #include "jfr/support/jfrThreadLocal.hpp"
+#include "jfr/utilities/jfrPredicate.hpp"
+#include "jfr/utilities/jfrRelation.hpp"
 #include "runtime/mutexLocker.hpp"
+#include "utilities/growableArray.hpp"
 
 /*
  * There are two separate repository instances.
@@ -242,3 +245,36 @@ traceid JfrStackTraceRepository::next_id() {
   MutexLocker lock(JfrStacktrace_lock, Mutex::_no_safepoint_check_flag);
   return ++_next_id;
 }
+
+static inline bool should_write(const JfrStackTrace* stacktrace, GrowableArray<traceid>* leakp_set) {
+  assert(stacktrace != nullptr, "invariant");
+  return stacktrace->should_write() && JfrPredicate<traceid, compare_traceid>::test(leakp_set, stacktrace->id());
+}
+
+void JfrStackTraceRepository::write_leak_profiler(GrowableArray<traceid>* leakp_set, Thread* t) {
+  assert(leakp_set != nullptr, "invariant");
+  assert(leakp_set->is_nonempty(), "invariant");
+  assert(t != nullptr, "invariant");
+
+  JfrCheckpointWriter writer(t);
+  writer.write_type(TYPE_STACKTRACE);
+  const int64_t count_offset = writer.reserve(sizeof(u4)); // Don't know how many yet
+
+  int count = 0;
+  const JfrStackTraceRepository& repo = leak_profiler_instance();
+
+  for (u4 i = 0; i < TABLE_SIZE; ++i) {
+    const JfrStackTrace* stacktrace = repo._table[i];
+    while (stacktrace != nullptr) {
+      if (should_write(stacktrace, leakp_set)) {
+        stacktrace->write(writer);
+        ++count;
+      }
+      stacktrace = stacktrace->next();
+    }
+  }
+
+  assert(count > 0, "invariant");
+  assert(count <= leakp_set->length(), "invariant");
+  writer.write_count(count, count_offset);
+}
diff --git a/src/hotspot/share/jfr/recorder/stacktrace/jfrStackTraceRepository.hpp b/src/hotspot/share/jfr/recorder/stacktrace/jfrStackTraceRepository.hpp
index 5e2ba316588..427aff0eb9a 100644
--- a/src/hotspot/share/jfr/recorder/stacktrace/jfrStackTraceRepository.hpp
+++ b/src/hotspot/share/jfr/recorder/stacktrace/jfrStackTraceRepository.hpp
@@ -30,9 +30,11 @@
 #include "jfr/utilities/jfrTypes.hpp"
 
 class JavaThread;
-class JfrCheckpointWriter;
 class JfrChunkWriter;
 
+template <typename>
+class GrowableArray;
+
 class JfrStackTraceRepository : public JfrCHeapObj {
   friend class JfrDeprecatedEdge;
   friend class JfrRecorder;
@@ -62,6 +64,7 @@ class JfrStackTraceRepository : public JfrCHeapObj {
 
   static const JfrStackTrace* lookup_for_leak_profiler(traceid hash, traceid id);
   static void record_for_leak_profiler(JavaThread* thread, int skip = 0);
+  static void write_leak_profiler(GrowableArray<traceid>* leakp_set, Thread* t);
   static void clear_leak_profiler();
 
   static traceid next_id();

From 85a0baf0cb3366d6c16f9aadee123862117f5338 Mon Sep 17 00:00:00 2001
From: Leo Korinth <lkorinth@openjdk.org>
Date: Tue, 1 Apr 2025 10:50:46 +0000
Subject: [PATCH 582/587] 8352719: Add an equals sign to the modules statement

Reviewed-by: weijun
---
 .../sun/security/krb5/auto/TEST.properties    | 24 +++++++++----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/test/jdk/sun/security/krb5/auto/TEST.properties b/test/jdk/sun/security/krb5/auto/TEST.properties
index a3941f6dc04..402754f2f3c 100644
--- a/test/jdk/sun/security/krb5/auto/TEST.properties
+++ b/test/jdk/sun/security/krb5/auto/TEST.properties
@@ -1,12 +1,12 @@
-modules java.base/jdk.internal.misc \
-        java.base/sun.security.util \
-        java.security.jgss/sun.security.jgss \
-        java.security.jgss/sun.security.jgss.krb5 \
-        java.security.jgss/sun.security.krb5:+open \
-        java.security.jgss/sun.security.krb5.internal:+open \
-        java.security.jgss/sun.security.krb5.internal.ccache \
-        java.security.jgss/sun.security.krb5.internal.rcache \
-        java.security.jgss/sun.security.krb5.internal.crypto \
-        java.security.jgss/sun.security.krb5.internal.ktab \
-        jdk.security.auth \
-        jdk.security.jgss
+modules = java.base/jdk.internal.misc \
+          java.base/sun.security.util \
+          java.security.jgss/sun.security.jgss \
+          java.security.jgss/sun.security.jgss.krb5 \
+          java.security.jgss/sun.security.krb5:+open \
+          java.security.jgss/sun.security.krb5.internal:+open \
+          java.security.jgss/sun.security.krb5.internal.ccache \
+          java.security.jgss/sun.security.krb5.internal.rcache \
+          java.security.jgss/sun.security.krb5.internal.crypto \
+          java.security.jgss/sun.security.krb5.internal.ktab \
+          jdk.security.auth \
+          jdk.security.jgss

From 6801eb87042742b8d760b79900b2bdff97c321b1 Mon Sep 17 00:00:00 2001
From: Leo Korinth <lkorinth@openjdk.org>
Date: Tue, 1 Apr 2025 10:54:17 +0000
Subject: [PATCH 583/587] 8352709: Remove bad timing annotations from
 WhileOpTest.java

Reviewed-by: jpai
---
 .../test/org/openjdk/tests/java/util/stream/WhileOpTest.java   | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/test/jdk/java/util/stream/test/org/openjdk/tests/java/util/stream/WhileOpTest.java b/test/jdk/java/util/stream/test/org/openjdk/tests/java/util/stream/WhileOpTest.java
index ce318bdd890..78663b6433c 100644
--- a/test/jdk/java/util/stream/test/org/openjdk/tests/java/util/stream/WhileOpTest.java
+++ b/test/jdk/java/util/stream/test/org/openjdk/tests/java/util/stream/WhileOpTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
  * 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 java.util.stream.TestData;
 /*
  * @test
  * @bug 8071597 8193856
- * @run main/timeout=240
  */
 @Test
 public class WhileOpTest extends OpTestCase {

From cef5610b5d4f7c5c2ceda46995ef3a0d961294e5 Mon Sep 17 00:00:00 2001
From: Patrick Zhang <qpzhang@openjdk.org>
Date: Tue, 1 Apr 2025 11:47:13 +0000
Subject: [PATCH 584/587] 8353272: One instance of STATIC_LIB_CFLAGS was missed
 in JDK-8345683

Reviewed-by: erikj
---
 make/common/native/Flags.gmk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/make/common/native/Flags.gmk b/make/common/native/Flags.gmk
index 747e090b816..307f6380e8b 100644
--- a/make/common/native/Flags.gmk
+++ b/make/common/native/Flags.gmk
@@ -122,7 +122,7 @@ define SetupCompilerFlags
     $1_EXTRA_CXXFLAGS += $$($1_CXXFLAGS_$(OPENJDK_TARGET_OS)_release)
   endif
   ifeq ($(STATIC_LIBS), true)
-    $1_EXTRA_CXXFLAGS += $$(STATIC_LIB_CFLAGS)
+    $1_EXTRA_CXXFLAGS += -DSTATIC_BUILD=1
   endif
 
   # If no C++ flags are explicitly set, default to using the C flags.

From 1809138b1c992b352eceab3e0e963b0577aafabb Mon Sep 17 00:00:00 2001
From: Patrick Zhang <qpzhang@openjdk.org>
Date: Tue, 1 Apr 2025 11:47:32 +0000
Subject: [PATCH 585/587] 8352284: EXTRA_CFLAGS incorrectly applied to
 BUILD_LIBJVM src/hotspot C++ source files

Reviewed-by: erikj
---
 make/hotspot/lib/JvmFlags.gmk | 1 -
 1 file changed, 1 deletion(-)

diff --git a/make/hotspot/lib/JvmFlags.gmk b/make/hotspot/lib/JvmFlags.gmk
index 97538da74c7..57b632ee532 100644
--- a/make/hotspot/lib/JvmFlags.gmk
+++ b/make/hotspot/lib/JvmFlags.gmk
@@ -91,7 +91,6 @@ JVM_CFLAGS += \
     $(JVM_CFLAGS_TARGET_DEFINES) \
     $(JVM_CFLAGS_FEATURES) \
     $(JVM_CFLAGS_INCLUDES) \
-    $(EXTRA_CFLAGS) \
     #
 
 ifneq ($(HOTSPOT_OVERRIDE_LIBPATH), )

From 2a31f69a55b64358a347b2cbc2c4df1890dd6840 Mon Sep 17 00:00:00 2001
From: Alan Bateman <alanb@openjdk.org>
Date: Tue, 1 Apr 2025 12:42:02 +0000
Subject: [PATCH 586/587] 8353331: Test
 ForkJoinPool20Test::testFixedDelaySequence is failing

Reviewed-by: dl, vklang
---
 test/jdk/java/util/concurrent/tck/ForkJoinPool20Test.java | 1 -
 1 file changed, 1 deletion(-)

diff --git a/test/jdk/java/util/concurrent/tck/ForkJoinPool20Test.java b/test/jdk/java/util/concurrent/tck/ForkJoinPool20Test.java
index cfde352abdd..41dd82300e2 100644
--- a/test/jdk/java/util/concurrent/tck/ForkJoinPool20Test.java
+++ b/test/jdk/java/util/concurrent/tck/ForkJoinPool20Test.java
@@ -450,7 +450,6 @@ public class ForkJoinPool20Test extends JSR166TestCase {
                         if (elapsedMillis >= (done.getCount() == cycles ? d : 2 * d))
                                 tryLongerDelay.set(true);
                         previous.set(now);
-                        assertTrue(done.getCount() > 0);
                         done.countDown();
                     }};
                 final ScheduledFuture<?> periodicTask =

From a1ab1d8de411aace21decd133e7e74bb97f27897 Mon Sep 17 00:00:00 2001
From: David Holmes <dholmes@openjdk.org>
Date: Tue, 1 Apr 2025 12:59:49 +0000
Subject: [PATCH 587/587] 8353449: [BACKOUT] One instance of STATIC_LIB_CFLAGS
 was missed in JDK-8345683

Reviewed-by: alanb, ihse
---
 make/common/native/Flags.gmk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/make/common/native/Flags.gmk b/make/common/native/Flags.gmk
index 307f6380e8b..747e090b816 100644
--- a/make/common/native/Flags.gmk
+++ b/make/common/native/Flags.gmk
@@ -122,7 +122,7 @@ define SetupCompilerFlags
     $1_EXTRA_CXXFLAGS += $$($1_CXXFLAGS_$(OPENJDK_TARGET_OS)_release)
   endif
   ifeq ($(STATIC_LIBS), true)
-    $1_EXTRA_CXXFLAGS += -DSTATIC_BUILD=1
+    $1_EXTRA_CXXFLAGS += $$(STATIC_LIB_CFLAGS)
   endif
 
   # If no C++ flags are explicitly set, default to using the C flags.